From ff93c957cdaa0f2cc72429d7c1ab94bc8dd32eed Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 14 Sep 2022 19:05:29 +0200
Subject: [PATCH 0001/1461] dashboard config api first steps

---
 application/controllers/dashboard/Config.php  | 136 ++++++++++++++++++
 .../dashboard/Dashboard_Override_model.php    |  26 ++++
 .../dashboard/Dashboard_Preset_model.php      |  26 ++++
 3 files changed, 188 insertions(+)
 create mode 100644 application/controllers/dashboard/Config.php
 create mode 100644 application/models/dashboard/Dashboard_Override_model.php
 create mode 100644 application/models/dashboard/Dashboard_Preset_model.php

diff --git a/application/controllers/dashboard/Config.php b/application/controllers/dashboard/Config.php
new file mode 100644
index 000000000..30c066467
--- /dev/null
+++ b/application/controllers/dashboard/Config.php
@@ -0,0 +1,136 @@
+<?php
+defined('BASEPATH') || exit('No direct script access allowed');
+/**
+ * Description of Config
+ *
+ * @author bambi
+ */
+class Config extends Auth_Controller
+{
+	public function __construct()
+	{
+		parent::__construct(
+			array(
+				'index' => 'basis/mitarbeiter:r',
+				'dummy' => 'basis/mitarbeiter:r',
+			)
+		);
+		
+		$this->load->model('dashboard/Dashboard_Preset_model', 'DashboardPresetModel');
+		$this->load->model('dashboard/Dashboard_Override_model', 'DashboardOverrideModel');
+	}
+	
+	public function index() 
+	{
+		$res_presets = $this->DashboardPresetModel->getPresets(1, 'ma0080');
+		$defaultconfig = array();
+		
+		if( isSuccess($res_presets) && hasData($res_presets) ) 
+		{
+			$presets = getData($res_presets);
+			foreach ($presets as $presetobj)
+			{
+				if( null !== ($preset = json_decode($presetobj->preset, true)) )
+				{
+					$defaultconfig = array_replace_recursive($defaultconfig, 
+						$preset);
+				}
+			}
+		}
+		
+		$res_userconfig = $this->DashboardOverrideModel->getOverride(1, 'ma0080');
+		$mergedconfig = array();
+		if( isSuccess($res_userconfig) && hasData($res_userconfig) ) 
+		{
+			$data = getData($res_userconfig);
+			if( null !== ($userconfig = json_decode($data[0]->override, true)) )
+			{
+				$mergedconfig = array_replace_recursive($defaultconfig, $userconfig);
+			}
+		}
+/*
+		header('Content-Type: text/plain');
+		print_r($defaultconfig);
+		print_r($userconfig);
+		print_r($mergedconfig);
+		die();
+*/
+/*
+		$ret = array(
+			'defaultconfig' => $defaultconfig,
+			'userconfig' => $userconfig,
+			'mergedconfig' => $mergedconfig
+		);
+		$this->outputJsonSuccess($ret);
+ */
+		$this->outputJsonSuccess($mergedconfig);
+	}
+	
+	public function dummy() 
+	{
+		$defaultconfig = array(
+			'title' => 'CIS Dashboard',
+			'widgets' => array(
+				'd39ba153ac9e60a21ed694cc3728f4dd' => array(
+					'title' => 'test1',
+					'type' => 'kpi',
+					'config' => array(),
+					'place' => array(
+						'row' => 1,
+						'col' => 3,
+						'width' => 1,
+						'height' => 1
+					)
+				),
+				'c6c526b78a0e4bc3a0b67e00f983fc33' => array(
+					'title' => 'test2',
+					'type' => 'url',
+					'config' => array(),
+					'place' => array(
+						'row' => 3,
+						'col' => 1,
+						'width' => 1,
+						'height' => 1
+					)
+				),
+				'3f1ebb24bdaa2b82fbdacf7d55977412' => array(
+					'title' => 'test3',
+					'type' => 'chart',
+					'config' => array(),
+					'place' => array(
+						'row' => 2,
+						'col' => 1,
+						'width' => 3,
+						'height' => 3
+					)
+				)
+			)
+		);
+		
+		$userconfig = array(
+			'widgets' => array(
+				'd39ba153ac9e60a21ed694cc3728f4dd' => array(
+					'modifier' => 'bold',
+					'visible' => false,
+					'place' => array(
+						'width' => 2,
+						'height' => 2
+					)
+				),
+				'c6c526b78a0e4bc3a0b67e00f983fc33' => array(
+					'type' => 'test'
+				)
+			)
+		);
+		
+		$merged = array_replace_recursive($defaultconfig, $userconfig);
+		
+		$ret = array(
+			'defaultconfig' => $defaultconfig,
+			'userconfig' => $userconfig,
+			'merged' => $merged
+		);
+		
+		$this->outputJsonSuccess($ret);
+	}
+}
diff --git a/application/models/dashboard/Dashboard_Override_model.php b/application/models/dashboard/Dashboard_Override_model.php
new file mode 100644
index 000000000..d7a12bb42
--- /dev/null
+++ b/application/models/dashboard/Dashboard_Override_model.php
@@ -0,0 +1,26 @@
+<?php
+class Dashboard_Override_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'dashboard.tbl_dashboard_benutzer_override';
+		$this->pk = 'override_id';
+	}
+
+
+	/**
+	 * Get Overrides of given uid.
+	 * @param integer dashboard_id
+	 * @param string $uid
+	 * @return array
+	 */
+	public function getOverride($dashboard_id, $uid)
+	{
+		return $this->loadWhere(array('dashboard_id' => $dashboard_id, 'uid'=> $uid));
+	}
+}
diff --git a/application/models/dashboard/Dashboard_Preset_model.php b/application/models/dashboard/Dashboard_Preset_model.php
new file mode 100644
index 000000000..444869fe6
--- /dev/null
+++ b/application/models/dashboard/Dashboard_Preset_model.php
@@ -0,0 +1,26 @@
+<?php
+class Dashboard_Preset_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'dashboard.tbl_dashboard_preset';
+		$this->pk = 'preset_id';
+	}
+
+
+	/**
+	 * Get Presets of given uid.
+	 * @param integer dashboard_id
+	 * @param string $uid
+	 * @return array
+	 */
+	public function getPresets($dashboard_id, $uid)
+	{
+		return $this->loadWhere(array('dashboard_id' => $dashboard_id, 'funktion_kurzbz'=> null));
+	}
+}

From 5c9c4b7e2dd4041d5db9bb157d97d76d73ec3d90 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 16 Sep 2022 10:46:29 +0200
Subject: [PATCH 0002/1461] store configs as json in database and merge them

---
 application/controllers/dashboard/Config.php  | 63 ++++--------
 .../libraries/dashboard/DashboardLib.php      | 97 +++++++++++++++++++
 .../models/dashboard/Dashboard_model.php      | 25 +++++
 3 files changed, 143 insertions(+), 42 deletions(-)
 create mode 100644 application/libraries/dashboard/DashboardLib.php
 create mode 100644 application/models/dashboard/Dashboard_model.php

diff --git a/application/controllers/dashboard/Config.php b/application/controllers/dashboard/Config.php
index 30c066467..5c6ad8040 100644
--- a/application/controllers/dashboard/Config.php
+++ b/application/controllers/dashboard/Config.php
@@ -11,61 +11,40 @@ class Config extends Auth_Controller
 	{
 		parent::__construct(
 			array(
-				'index' => 'basis/mitarbeiter:r',
-				'dummy' => 'basis/mitarbeiter:r',
+				'index'			=> 'basis/mitarbeiter:r',
+				'dummy'			=> 'basis/mitarbeiter:r',
+				'genWidgetId'	=> 'basis/mitarbeiter:r'
 			)
 		);
 		
-		$this->load->model('dashboard/Dashboard_Preset_model', 'DashboardPresetModel');
-		$this->load->model('dashboard/Dashboard_Override_model', 'DashboardOverrideModel');
+		$this->load->library('dashboard/DashboardLib', null, 'DashboardLib');
 	}
 	
 	public function index() 
 	{
-		$res_presets = $this->DashboardPresetModel->getPresets(1, 'ma0080');
-		$defaultconfig = array();
+		$dashboard_kurzbz = $this->input->get('db');
+		$uid = $this->input->get('uid');
 		
-		if( isSuccess($res_presets) && hasData($res_presets) ) 
-		{
-			$presets = getData($res_presets);
-			foreach ($presets as $presetobj)
-			{
-				if( null !== ($preset = json_decode($presetobj->preset, true)) )
-				{
-					$defaultconfig = array_replace_recursive($defaultconfig, 
-						$preset);
-				}
-			}
+		$dashboard = $this->DashboardLib->getDashboardByKurzbz($dashboard_kurzbz);
+		if(!$dashboard) {
+			$this->outputJsonError(array(
+				'error' => 'Dashboard ' . $dashboard_kurzbz . ' not found.'
+			));
 		}
 		
-		$res_userconfig = $this->DashboardOverrideModel->getOverride(1, 'ma0080');
-		$mergedconfig = array();
-		if( isSuccess($res_userconfig) && hasData($res_userconfig) ) 
-		{
-			$data = getData($res_userconfig);
-			if( null !== ($userconfig = json_decode($data[0]->override, true)) )
-			{
-				$mergedconfig = array_replace_recursive($defaultconfig, $userconfig);
-			}
-		}
-/*
-		header('Content-Type: text/plain');
-		print_r($defaultconfig);
-		print_r($userconfig);
-		print_r($mergedconfig);
-		die();
-*/
-/*
-		$ret = array(
-			'defaultconfig' => $defaultconfig,
-			'userconfig' => $userconfig,
-			'mergedconfig' => $mergedconfig
-		);
-		$this->outputJsonSuccess($ret);
- */
+		$mergedconfig = $this->DashboardLib->getMergedConfig($dashboard->dashboard_id, $uid);
 		$this->outputJsonSuccess($mergedconfig);
 	}
 	
+	public function genWidgetId() 
+	{
+		$dashboard_kurzbz = $this->input->get('db');
+		$widgetid = $this->DashboardLib->generateWidgetId($dashboard_kurzbz);
+		$this->outputJsonSuccess(array(
+			'widgetid' => $widgetid['widgetid']
+		));
+	}
+	
 	public function dummy() 
 	{
 		$defaultconfig = array(
diff --git a/application/libraries/dashboard/DashboardLib.php b/application/libraries/dashboard/DashboardLib.php
new file mode 100644
index 000000000..a5a39a3c6
--- /dev/null
+++ b/application/libraries/dashboard/DashboardLib.php
@@ -0,0 +1,97 @@
+<?php
+defined('BASEPATH') || exit('No direct script access allowed');
+/**
+ * Description of DashboardLib
+ *
+ * @author bambi
+ */
+class DashboardLib
+{
+	const WIDGET_ID_RANDOM_BYTES = 16;
+	const DEFAULT_DASHBOARD_KURZBZ = 'fhcomplete';
+	
+	private $_ci; // CI instance
+	
+	public function __construct($params=null)
+	{
+		// Loads CI instance
+		$this->_ci =& get_instance();
+		
+		$this->_ci->load->model('dashboard/Dashboard_model', 'DashboardModel');
+		$this->_ci->load->model('dashboard/Dashboard_Preset_model', 'DashboardPresetModel');
+		$this->_ci->load->model('dashboard/Dashboard_Override_model', 'DashboardOverrideModel');
+	}
+
+	public function generateWidgetId($dashboard_kurzbz='') 
+	{
+		$dashboard_kurzbz = (!empty($dashboard_kurzbz)) ? $dashboard_kurzbz 
+			: self::DEFAULT_DASHBOARD_KURZBZ;
+		$widgetid_input = time() . '_' . $dashboard_kurzbz . '_' 
+			. bin2hex(random_bytes(self::WIDGET_ID_RANDOM_BYTES));
+		$widgetid = md5($widgetid_input);
+		return array(
+			'widgetid' => $widgetid,
+			'widgetid_input' => $widgetid_input
+		);
+	}
+	
+	public function getDashboardByKurzbz($dashboard_kurzbz) 
+	{
+		$dashboard = null;
+		$result = $this->_ci->DashboardModel->getDashboardByKurzbz($dashboard_kurzbz);
+		if( isSuccess($result) && ($dashboards = getData($result)) ) 
+		{
+			$dashboard = $dashboards[0];
+		}
+		return $dashboard;
+	}
+	
+	public function getMergedConfig($dashboard_id, $uid) 
+	{
+		$defaultconfig = $this->getDefaultConfig($dashboard_id, $uid);
+		$userconfig = $this->getUserConfig($dashboard_id, $uid);
+		
+		$mergedconfig = array_replace_recursive($defaultconfig, $userconfig);
+		
+		return $mergedconfig;
+	}
+	
+	public function getDefaultConfig($dashboard_id, $uid)
+	{
+		$res_presets = $this->_ci->DashboardPresetModel->getPresets($dashboard_id, $uid);
+		$defaultconfig = array();
+		
+		if( isSuccess($res_presets) && hasData($res_presets) ) 
+		{
+			$presets = getData($res_presets);
+			foreach ($presets as $presetobj)
+			{
+				if( null !== ($preset = json_decode($presetobj->preset, true)) )
+				{
+					$defaultconfig = array_replace_recursive($defaultconfig, 
+						$preset);
+				}
+			}
+		}
+		
+		return $defaultconfig;
+	}
+	
+	public function getUserConfig($dashboard_id, $uid)
+	{
+		$res_userconfig = $this->_ci->DashboardOverrideModel->getOverride($dashboard_id, $uid);
+		$userconfig = array();
+		
+		if( isSuccess($res_userconfig) && hasData($res_userconfig) ) 
+		{
+			$data = getData($res_userconfig);
+			if( null !== ($decodedconfig = json_decode($data[0]->override, true)) )
+			{
+				$userconfig = $decodedconfig;
+			}
+		}
+		
+		return $userconfig;
+	}
+	
+}
diff --git a/application/models/dashboard/Dashboard_model.php b/application/models/dashboard/Dashboard_model.php
new file mode 100644
index 000000000..88946ed83
--- /dev/null
+++ b/application/models/dashboard/Dashboard_model.php
@@ -0,0 +1,25 @@
+<?php
+class Dashboard_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'dashboard.tbl_dashboard';
+		$this->pk = 'dashboard_id';
+	}
+
+
+	/**
+	 * Get Dashboard by kurzbz.
+	 * @param string dashboard_kurzbz
+	 * @return array
+	 */
+	public function getDashboardByKurzbz($dashboard_kurzbz)
+	{
+		return $this->loadWhere(array('dashboard_kurzbz' => $dashboard_kurzbz));
+	}
+}

From fb7f445e22787dcdf5b941c0fdf9fda804886a77 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 21 Sep 2022 11:38:16 +0200
Subject: [PATCH 0003/1461] progress on api endpoints to add and remove presets
 and overrides

---
 application/controllers/dashboard/Config.php  | 135 +++++++++++++++++-
 .../libraries/dashboard/DashboardLib.php      |  91 ++++++++++++
 .../dashboard/Dashboard_Preset_model.php      |  45 +++++-
 3 files changed, 265 insertions(+), 6 deletions(-)

diff --git a/application/controllers/dashboard/Config.php b/application/controllers/dashboard/Config.php
index 5c6ad8040..0253942a4 100644
--- a/application/controllers/dashboard/Config.php
+++ b/application/controllers/dashboard/Config.php
@@ -11,9 +11,13 @@ class Config extends Auth_Controller
 	{
 		parent::__construct(
 			array(
-				'index'			=> 'basis/mitarbeiter:r',
-				'dummy'			=> 'basis/mitarbeiter:r',
-				'genWidgetId'	=> 'basis/mitarbeiter:r'
+				'index'							=> 'dashboard/benutzer:r',
+				'dummy'							=> 'dashboard/benutzer:r',
+				'genWidgetId'					=> 'dashboard/benutzer:rw',
+				'addWidgetToPreset'				=> 'dashboard/admin:rw',
+				'removeWidgetFromPreset'		=> 'dashboard/admin:rw',
+				'addWidgetToUserOverride'		=> 'dashboard/benutzer:rw',
+				'removeWidgetFromUserOverride'	=> 'dashboard/benutzer:rw'
 			)
 		);
 		
@@ -27,7 +31,8 @@ class Config extends Auth_Controller
 		
 		$dashboard = $this->DashboardLib->getDashboardByKurzbz($dashboard_kurzbz);
 		if(!$dashboard) {
-			$this->outputJsonError(array(
+			http_response_code(404);
+			$this->terminateWithJsonError(array(
 				'error' => 'Dashboard ' . $dashboard_kurzbz . ' not found.'
 			));
 		}
@@ -45,6 +50,128 @@ class Config extends Auth_Controller
 		));
 	}
 	
+	public function addWidgetToPreset() 
+	{
+		$input = json_decode($this->input->raw_input_stream);
+		$dashboard_kurzbz = $input->db;
+		$funktion_kurzbz = $input->funktion_kurzbz;
+		
+		$preset = $this->DashboardLib->getPresetOrCreateEmptyPreset($dashboard_kurzbz, $funktion_kurzbz);		
+		
+		$preset_decoded = json_decode($preset->preset, true);
+		$widgetid = $this->DashboardLib->generateWidgetId($dashboard_kurzbz);
+		
+		$preset_decoded['widgets'][$widgetid['widgetid']] = $input->widget;
+		
+		$preset->preset = json_encode($preset_decoded);
+				
+		$result = $this->DashboardLib->insertOrUpdatePreset($preset);
+		if( isError($result) ) {
+			http_response_code(500);
+			$this->terminateWithJsonError('preset could not be saved');
+		}
+		
+		$this->outputJsonSuccess(array('msg' => 'preset successfully stored.'));
+	}
+	
+	public function removeWidgetFromPreset()
+	{
+		$input = json_decode($this->input->raw_input_stream);
+		$dashboard_kurzbz = $input->db;
+		$funktion_kurzbz = $input->funktion_kurzbz;
+		$widgetid = $input->widgetid;
+				
+		$preset = $this->DashboardLib->getPreset($dashboard_kurzbz, $funktion_kurzbz);
+		if( $preset === null ) {
+			http_response_code(404);
+			$this->terminateWithJsonError('preset for dashboard ' 
+				. $dashboard_kurzbz . ' and funktion ' . $funktion_kurzbz 
+				. ' not found.');
+		}
+		
+		$preset_decoded = json_decode($preset->preset, true);
+		
+		if( isset($preset_decoded['widgets'][$widgetid]) )
+		{
+			unset($preset_decoded['widgets'][$widgetid]);
+		}
+		else
+		{
+			http_response_code(404);
+			$this->terminateWithJsonError('widgetid ' . $widgetid . ' not found');
+		}
+		
+		$preset->preset = json_encode($preset_decoded);
+		$result = $this->DashboardLib->insertOrUpdatePreset($preset);
+		if( isError($result) ) 
+		{
+			http_response_code(500);
+			$this->terminateWithJsonError('failed to remove widget');	
+		}
+		$this->outputJsonSuccess(array('msg' => 'preset successfully updated.'));
+	}
+
+	public function addWidgetToUserOverride() 
+	{
+		$input = json_decode($this->input->raw_input_stream);
+		$dashboard_kurzbz = $input->db;
+		$uid = $input->uid;
+		
+		$override = $this->DashboardLib->getOverrideOrCreateEmptyOverride($dashboard_kurzbz, $uid);		
+		
+		$override_decoded = json_decode($override->override, true);
+		$widgetid = isset($input->widgetid) ? array('widgetid' => $input->widgetid) 
+			: $this->DashboardLib->generateWidgetId($dashboard_kurzbz);
+		
+		$override_decoded['widgets'][$widgetid['widgetid']] = $input->widget;
+		
+		$override->override = json_encode($override_decoded);
+				
+		$result = $this->DashboardLib->insertOrUpdateOverride($override);
+		if( isError($result) ) {
+			http_response_code(500);
+			$this->terminateWithJsonError('override could not be saved');
+		}
+		
+		$this->outputJsonSuccess(array('msg' => 'override successfully stored.'));
+	}
+	
+	public function removeWidgetFromUserOverride()
+	{
+		$input = json_decode($this->input->raw_input_stream);
+		$dashboard_kurzbz = $input->db;
+		$uid = $input->uid;
+		$widgetid = $input->widgetid;
+		
+		$override = $this->DashboardLib->getOverride($dashboard_kurzbz, $uid);
+		if( empty($override) ) {
+			http_response_code(404);
+			$this->terminateWithJsonError('userconfig for dashboard ' 
+				. $dashboard_kurzbz . ' not found.');
+		}
+		
+		$override_decoded = json_decode($override->override, true);
+		
+		if( array_key_exists($widgetid, $override_decoded['widgets']) )
+		{
+			unset($override_decoded['widgets'][$widgetid]);
+		}
+		else
+		{
+			http_response_code(404);
+			$this->terminateWithJsonError('widgetid ' . $widgetid . ' not found');
+		}
+		
+		$override->override = json_encode($override_decoded);
+		$result = $this->DashboardLib->insertOrUpdateOverride($override, $uid);
+		if( isError($result) ) 
+		{
+			http_response_code(500);
+			$this->terminateWithJsonError('failed to remove widget');	
+		}
+		$this->outputJsonSuccess(array('msg' => 'override successfully updated.'));
+	}
+	
 	public function dummy() 
 	{
 		$defaultconfig = array(
diff --git a/application/libraries/dashboard/DashboardLib.php b/application/libraries/dashboard/DashboardLib.php
index a5a39a3c6..f4edb6490 100644
--- a/application/libraries/dashboard/DashboardLib.php
+++ b/application/libraries/dashboard/DashboardLib.php
@@ -94,4 +94,95 @@ class DashboardLib
 		return $userconfig;
 	}
 	
+	public function getOverrideOrCreateEmptyOverride($dashboard_kurzbz, $uid) 
+	{
+		$override = $this->getOverride($dashboard_kurzbz, $uid);
+		if( null !== $override ) {
+			return $override;			
+		}
+		
+		$dashboard = $this->getDashboardByKurzbz($dashboard_kurzbz);
+		
+		$emptyoverride = new stdClass();
+		$emptyoverride->dashboard_id = $dashboard->dashboard_id;
+		$emptyoverride->uid = $uid;
+		$emptyoverride->override = '{"widgets": {}}';
+		
+		return $emptyoverride;
+	}
+	
+	public function getPresetOrCreateEmptyPreset($dashboard_kurzbz, $funktion_kurzbz) 
+	{
+		$preset = $this->getPreset($dashboard_kurzbz, $funktion_kurzbz);
+		if( null !== $preset ) {
+			return $preset;			
+		}
+		
+		$dashboard = $this->getDashboardByKurzbz($dashboard_kurzbz);
+		
+		$emptypreset = new stdClass();
+		$emptypreset->dashboard_id = $dashboard->dashboard_id;
+		$emptypreset->funktion_kurzbz = $funktion_kurzbz;
+		$emptypreset->preset = '{"widgets": {}}';
+		
+		return $emptypreset;
+	}
+	
+	public function getPreset($dashboard_kurzbz, $funktion_kurzbz) 
+	{
+		$dashboard = $this->getDashboardByKurzbz($dashboard_kurzbz);
+		$preset = null;
+		
+		$result = $this->_ci->DashboardPresetModel
+			->getPresetByDashboardAndFunktion($dashboard->dashboard_id, $funktion_kurzbz);
+		
+		if( isSuccess($result) && hasData($result) && ($presets = getData($result)) ) 
+		{
+			$preset = $presets[0];
+		}
+		
+		return $preset;
+	}
+
+	public function getOverride($dashboard_kurzbz, $uid) 
+	{
+		$dashboard = $this->getDashboardByKurzbz($dashboard_kurzbz);
+		$override = null;
+		
+		$result = $this->_ci->DashboardOverrideModel
+			->getOverride($dashboard->dashboard_id, $uid);
+		
+		if( isSuccess($result) && hasData($result) && ($overrides = getData($result)) ) 
+		{
+			$override = $overrides[0];
+		}
+		
+		return $override;
+	}
+	
+	public function insertOrUpdatePreset($preset) 
+	{
+		if( isset($preset->preset_id) && $preset->preset_id > 0 ) 
+		{
+			$result = $this->_ci->DashboardPresetModel->update($preset->preset_id, $preset);
+		} else 
+		{
+			$result = $this->_ci->DashboardPresetModel->insert($preset);
+		}
+		
+		return $result;
+	}
+	
+	public function insertOrUpdateOverride($override) 
+	{
+		if( isset($override->override_id) && $override->override_id > 0 ) 
+		{
+			$result = $this->_ci->DashboardOverrideModel->update($override->override_id, $override);
+		} else 
+		{
+			$result = $this->_ci->DashboardOverrideModel->insert($override);
+		}
+		
+		return $result;
+	}	
 }
diff --git a/application/models/dashboard/Dashboard_Preset_model.php b/application/models/dashboard/Dashboard_Preset_model.php
index 444869fe6..c899195d4 100644
--- a/application/models/dashboard/Dashboard_Preset_model.php
+++ b/application/models/dashboard/Dashboard_Preset_model.php
@@ -12,7 +12,6 @@ class Dashboard_Preset_model extends DB_Model
 		$this->pk = 'preset_id';
 	}
 
-
 	/**
 	 * Get Presets of given uid.
 	 * @param integer dashboard_id
@@ -21,6 +20,48 @@ class Dashboard_Preset_model extends DB_Model
 	 */
 	public function getPresets($dashboard_id, $uid)
 	{
-		return $this->loadWhere(array('dashboard_id' => $dashboard_id, 'funktion_kurzbz'=> null));
+		// TODO: get Funktionen for uid and load all preset for all funktionen for uid
+		//return $this->loadWhere(array('dashboard_id' => $dashboard_id, 'funktion_kurzbz'=> null));
+		$sql = <<<EOSQL
+			SELECT 
+				* 
+			FROM 
+				dashboard.tbl_dashboard_preset 
+			WHERE 
+				dashboard_id = ? 
+			AND (
+					funktion_kurzbz IN (
+						SELECT 
+							DISTINCT funktion_kurzbz 
+						FROM 
+							public.tbl_benutzerfunktion 
+						WHERE 
+							uid = ? 
+						AND 
+							NOW()::date 
+						BETWEEN 
+							COALESCE(datum_von, '1970-01-01') 
+						AND 
+							COALESCE(datum_bis, '2170-12-31')
+					) 
+					OR 
+						funktion_kurzbz IS NULL
+				) 
+			ORDER BY 
+				funktion_kurzbz DESC
+EOSQL;
+		
+		return $this->execQuery($sql, array($dashboard_id, $uid));
+	}
+	
+	/**
+	 * Get Preset by Dashboard and Funktion
+	 * @param integer dashboard_id
+	 * @param string funktion_kurzbz
+	 * @return array
+	 */
+	public function getPresetByDashboardAndFunktion($dashboard_id, $funktion_kurzbz) 
+	{
+		return $this->loadWhere(array('dashboard_id' => $dashboard_id, 'funktion_kurzbz' => $funktion_kurzbz));
 	}
 }

From 252abeafcbe870735aedb2dcfb4d1dd389a6e67b Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 28 Sep 2022 15:26:45 +0200
Subject: [PATCH 0004/1461] dummy config changed to test function level in
 config

---
 application/controllers/dashboard/Config.php | 84 +++++++++++---------
 1 file changed, 45 insertions(+), 39 deletions(-)

diff --git a/application/controllers/dashboard/Config.php b/application/controllers/dashboard/Config.php
index 0253942a4..6ace1f464 100644
--- a/application/controllers/dashboard/Config.php
+++ b/application/controllers/dashboard/Config.php
@@ -177,37 +177,41 @@ class Config extends Auth_Controller
 		$defaultconfig = array(
 			'title' => 'CIS Dashboard',
 			'widgets' => array(
-				'd39ba153ac9e60a21ed694cc3728f4dd' => array(
-					'title' => 'test1',
-					'type' => 'kpi',
-					'config' => array(),
-					'place' => array(
-						'row' => 1,
-						'col' => 3,
-						'width' => 1,
-						'height' => 1
-					)
+				'nofunction' => array(
+					'd39ba153ac9e60a21ed694cc3728f4dd' => array(
+						'title' => 'test1',
+						'type' => 'kpi',
+						'config' => array(),
+						'place' => array(
+							'row' => 1,
+							'col' => 3,
+							'width' => 1,
+							'height' => 1
+						)
+					),
+					'c6c526b78a0e4bc3a0b67e00f983fc33' => array(
+						'title' => 'test2',
+						'type' => 'url',
+						'config' => array(),
+						'place' => array(
+							'row' => 3,
+							'col' => 1,
+							'width' => 1,
+							'height' => 1
+						)
+					),
 				),
-				'c6c526b78a0e4bc3a0b67e00f983fc33' => array(
-					'title' => 'test2',
-					'type' => 'url',
-					'config' => array(),
-					'place' => array(
-						'row' => 3,
-						'col' => 1,
-						'width' => 1,
-						'height' => 1
-					)
-				),
-				'3f1ebb24bdaa2b82fbdacf7d55977412' => array(
-					'title' => 'test3',
-					'type' => 'chart',
-					'config' => array(),
-					'place' => array(
-						'row' => 2,
-						'col' => 1,
-						'width' => 3,
-						'height' => 3
+				'leitung' => array(
+					'3f1ebb24bdaa2b82fbdacf7d55977412' => array(
+						'title' => 'test3',
+						'type' => 'chart',
+						'config' => array(),
+						'place' => array(
+							'row' => 2,
+							'col' => 1,
+							'width' => 3,
+							'height' => 3
+						)
 					)
 				)
 			)
@@ -215,16 +219,18 @@ class Config extends Auth_Controller
 		
 		$userconfig = array(
 			'widgets' => array(
-				'd39ba153ac9e60a21ed694cc3728f4dd' => array(
-					'modifier' => 'bold',
-					'visible' => false,
-					'place' => array(
-						'width' => 2,
-						'height' => 2
+				'nofunction' => array(
+					'd39ba153ac9e60a21ed694cc3728f4dd' => array(
+						'modifier' => 'bold',
+						'visible' => false,
+						'place' => array(
+							'width' => 2,
+							'height' => 2
+						)
+					),
+					'c6c526b78a0e4bc3a0b67e00f983fc33' => array(
+						'type' => 'test'
 					)
-				),
-				'c6c526b78a0e4bc3a0b67e00f983fc33' => array(
-					'type' => 'test'
 				)
 			)
 		);

From ad369bbe4465ae0a43f43be7cac90169807b186c Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 28 Sep 2022 16:53:48 +0200
Subject: [PATCH 0005/1461] add dashboard schema and tables create script

---
 system/dashboard/dbupdate_dashboard.php | 429 ++++++++++++++++++++++++
 system/dbupdate_3.3.php                 |   3 +
 2 files changed, 432 insertions(+)
 create mode 100644 system/dashboard/dbupdate_dashboard.php

diff --git a/system/dashboard/dbupdate_dashboard.php b/system/dashboard/dbupdate_dashboard.php
new file mode 100644
index 000000000..3e73de3b9
--- /dev/null
+++ b/system/dashboard/dbupdate_dashboard.php
@@ -0,0 +1,429 @@
+<?php
+/* Copyright (C) 2017 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 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors: Harald Bamberger <harald.bamberger@technikum-wien.at>,
+ *
+ * Beschreibung:
+ * Dashboard DB Aenderungen
+ */
+
+if (($result = $db->db_query("SELECT schema_name FROM information_schema.schemata WHERE schema_name='dashboard'")))
+{
+	if ($db->db_num_rows($result) == 0)
+	{
+		$qry = <<<EODASHBOARDSQL
+		
+--
+-- Name: dashboard; Type: SCHEMA; Schema: -; Owner: fhcomplete
+--
+
+CREATE SCHEMA dashboard;
+
+
+ALTER SCHEMA dashboard OWNER TO fhcomplete;
+
+SET default_tablespace = '';
+
+SET default_with_oids = false;
+
+--
+-- Name: tbl_dashboard; Type: TABLE; Schema: dashboard; Owner: fhcomplete
+--
+
+CREATE TABLE dashboard.tbl_dashboard (
+    dashboard_id integer NOT NULL,
+    dashboard_kurzbz character varying(32) NOT NULL,
+    beschreibung text
+);
+
+
+ALTER TABLE dashboard.tbl_dashboard OWNER TO fhcomplete;
+
+--
+-- Name: tbl_dashboard_benutzer_override; Type: TABLE; Schema: dashboard; Owner: fhcomplete
+--
+
+CREATE TABLE dashboard.tbl_dashboard_benutzer_override (
+    override_id integer NOT NULL,
+    dashboard_id integer NOT NULL,
+    uid character varying(32) NOT NULL,
+    override jsonb NOT NULL
+);
+
+
+ALTER TABLE dashboard.tbl_dashboard_benutzer_override OWNER TO fhcomplete;
+
+--
+-- Name: tbl_dashboard_benutzer_override_override_id_seq; Type: SEQUENCE; Schema: dashboard; Owner: fhcomplete
+--
+
+CREATE SEQUENCE dashboard.tbl_dashboard_benutzer_override_override_id_seq
+    AS integer
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE dashboard.tbl_dashboard_benutzer_override_override_id_seq OWNER TO fhcomplete;
+
+--
+-- Name: tbl_dashboard_benutzer_override_override_id_seq; Type: SEQUENCE OWNED BY; Schema: dashboard; Owner: fhcomplete
+--
+
+ALTER SEQUENCE dashboard.tbl_dashboard_benutzer_override_override_id_seq OWNED BY dashboard.tbl_dashboard_benutzer_override.override_id;
+
+
+--
+-- Name: tbl_dashboard_dashboard_id_seq; Type: SEQUENCE; Schema: dashboard; Owner: fhcomplete
+--
+
+CREATE SEQUENCE dashboard.tbl_dashboard_dashboard_id_seq
+    AS integer
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE dashboard.tbl_dashboard_dashboard_id_seq OWNER TO fhcomplete;
+
+--
+-- Name: tbl_dashboard_dashboard_id_seq; Type: SEQUENCE OWNED BY; Schema: dashboard; Owner: fhcomplete
+--
+
+ALTER SEQUENCE dashboard.tbl_dashboard_dashboard_id_seq OWNED BY dashboard.tbl_dashboard.dashboard_id;
+
+
+--
+-- Name: tbl_dashboard_preset; Type: TABLE; Schema: dashboard; Owner: fhcomplete
+--
+
+CREATE TABLE dashboard.tbl_dashboard_preset (
+    preset_id integer NOT NULL,
+    dashboard_id integer NOT NULL,
+    funktion_kurzbz character varying(16),
+    preset jsonb NOT NULL
+);
+
+
+ALTER TABLE dashboard.tbl_dashboard_preset OWNER TO fhcomplete;
+
+--
+-- Name: tbl_dashboard_preset_preset_id_seq; Type: SEQUENCE; Schema: dashboard; Owner: fhcomplete
+--
+
+CREATE SEQUENCE dashboard.tbl_dashboard_preset_preset_id_seq
+    AS integer
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE dashboard.tbl_dashboard_preset_preset_id_seq OWNER TO fhcomplete;
+
+--
+-- Name: tbl_dashboard_preset_preset_id_seq; Type: SEQUENCE OWNED BY; Schema: dashboard; Owner: fhcomplete
+--
+
+ALTER SEQUENCE dashboard.tbl_dashboard_preset_preset_id_seq OWNED BY dashboard.tbl_dashboard_preset.preset_id;
+
+
+--
+-- Name: tbl_dashboard_widget; Type: TABLE; Schema: dashboard; Owner: fhcomplete
+--
+
+CREATE TABLE dashboard.tbl_dashboard_widget (
+    dashboard_id integer NOT NULL,
+    widget_id integer NOT NULL
+);
+
+
+ALTER TABLE dashboard.tbl_dashboard_widget OWNER TO fhcomplete;
+
+--
+-- Name: tbl_widget; Type: TABLE; Schema: dashboard; Owner: fhcomplete
+--
+
+CREATE TABLE dashboard.tbl_widget (
+    widget_id integer NOT NULL,
+    widget_kurzbz character varying(32) NOT NULL,
+    beschreibung text
+);
+
+
+ALTER TABLE dashboard.tbl_widget OWNER TO fhcomplete;
+
+--
+-- Name: tbl_widget_widget_id_seq; Type: SEQUENCE; Schema: dashboard; Owner: fhcomplete
+--
+
+CREATE SEQUENCE dashboard.tbl_widget_widget_id_seq
+    AS integer
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE dashboard.tbl_widget_widget_id_seq OWNER TO fhcomplete;
+
+--
+-- Name: tbl_widget_widget_id_seq; Type: SEQUENCE OWNED BY; Schema: dashboard; Owner: fhcomplete
+--
+
+ALTER SEQUENCE dashboard.tbl_widget_widget_id_seq OWNED BY dashboard.tbl_widget.widget_id;
+
+
+--
+-- Name: tbl_dashboard dashboard_id; Type: DEFAULT; Schema: dashboard; Owner: fhcomplete
+--
+
+ALTER TABLE ONLY dashboard.tbl_dashboard ALTER COLUMN dashboard_id SET DEFAULT nextval('dashboard.tbl_dashboard_dashboard_id_seq'::regclass);
+
+
+--
+-- Name: tbl_dashboard_benutzer_override override_id; Type: DEFAULT; Schema: dashboard; Owner: fhcomplete
+--
+
+ALTER TABLE ONLY dashboard.tbl_dashboard_benutzer_override ALTER COLUMN override_id SET DEFAULT nextval('dashboard.tbl_dashboard_benutzer_override_override_id_seq'::regclass);
+
+
+--
+-- Name: tbl_dashboard_preset preset_id; Type: DEFAULT; Schema: dashboard; Owner: fhcomplete
+--
+
+ALTER TABLE ONLY dashboard.tbl_dashboard_preset ALTER COLUMN preset_id SET DEFAULT nextval('dashboard.tbl_dashboard_preset_preset_id_seq'::regclass);
+
+
+--
+-- Name: tbl_widget widget_id; Type: DEFAULT; Schema: dashboard; Owner: fhcomplete
+--
+
+ALTER TABLE ONLY dashboard.tbl_widget ALTER COLUMN widget_id SET DEFAULT nextval('dashboard.tbl_widget_widget_id_seq'::regclass);
+
+
+--
+-- Name: tbl_dashboard_benutzer_override tbl_dashboard_benutzer_override_pkey; Type: CONSTRAINT; Schema: dashboard; Owner: fhcomplete
+--
+
+ALTER TABLE ONLY dashboard.tbl_dashboard_benutzer_override
+    ADD CONSTRAINT tbl_dashboard_benutzer_override_pkey PRIMARY KEY (override_id);
+
+
+--
+-- Name: tbl_dashboard_benutzer_override tbl_dashboard_benutzer_override_uk1; Type: CONSTRAINT; Schema: dashboard; Owner: fhcomplete
+--
+
+ALTER TABLE ONLY dashboard.tbl_dashboard_benutzer_override
+    ADD CONSTRAINT tbl_dashboard_benutzer_override_uk1 UNIQUE (dashboard_id, uid);
+
+
+--
+-- Name: tbl_dashboard tbl_dashboard_kurz_bz_key; Type: CONSTRAINT; Schema: dashboard; Owner: fhcomplete
+--
+
+ALTER TABLE ONLY dashboard.tbl_dashboard
+    ADD CONSTRAINT tbl_dashboard_kurz_bz_key UNIQUE (dashboard_kurzbz);
+
+
+--
+-- Name: tbl_dashboard tbl_dashboard_pkey; Type: CONSTRAINT; Schema: dashboard; Owner: fhcomplete
+--
+
+ALTER TABLE ONLY dashboard.tbl_dashboard
+    ADD CONSTRAINT tbl_dashboard_pkey PRIMARY KEY (dashboard_id);
+
+
+--
+-- Name: tbl_dashboard_preset tbl_dashboard_preset_pkey; Type: CONSTRAINT; Schema: dashboard; Owner: fhcomplete
+--
+
+ALTER TABLE ONLY dashboard.tbl_dashboard_preset
+    ADD CONSTRAINT tbl_dashboard_preset_pkey PRIMARY KEY (preset_id);
+
+
+--
+-- Name: tbl_dashboard_preset tbl_dashboard_preset_uk1; Type: CONSTRAINT; Schema: dashboard; Owner: fhcomplete
+--
+
+ALTER TABLE ONLY dashboard.tbl_dashboard_preset
+    ADD CONSTRAINT tbl_dashboard_preset_uk1 UNIQUE (dashboard_id, funktion_kurzbz);
+
+
+--
+-- Name: tbl_dashboard_widget tbl_dashboard_widget_pkey; Type: CONSTRAINT; Schema: dashboard; Owner: fhcomplete
+--
+
+ALTER TABLE ONLY dashboard.tbl_dashboard_widget
+    ADD CONSTRAINT tbl_dashboard_widget_pkey PRIMARY KEY (dashboard_id, widget_id);
+
+
+--
+-- Name: tbl_widget tbl_widget_pkey; Type: CONSTRAINT; Schema: dashboard; Owner: fhcomplete
+--
+
+ALTER TABLE ONLY dashboard.tbl_widget
+    ADD CONSTRAINT tbl_widget_pkey PRIMARY KEY (widget_id);
+
+
+--
+-- Name: tbl_widget tbl_widget_widget_kurzbz_key; Type: CONSTRAINT; Schema: dashboard; Owner: fhcomplete
+--
+
+ALTER TABLE ONLY dashboard.tbl_widget
+    ADD CONSTRAINT tbl_widget_widget_kurzbz_key UNIQUE (widget_kurzbz);
+
+
+--
+-- Name: tbl_dashboard_benutzer_override tbl_dashboard_benutzer_override_fk1; Type: FK CONSTRAINT; Schema: dashboard; Owner: fhcomplete
+--
+
+ALTER TABLE ONLY dashboard.tbl_dashboard_benutzer_override
+    ADD CONSTRAINT tbl_dashboard_benutzer_override_fk1 FOREIGN KEY (dashboard_id) REFERENCES dashboard.tbl_dashboard(dashboard_id) ON UPDATE CASCADE ON DELETE RESTRICT;
+
+
+--
+-- Name: tbl_dashboard_benutzer_override tbl_dashboard_benutzer_override_fk2; Type: FK CONSTRAINT; Schema: dashboard; Owner: fhcomplete
+--
+
+ALTER TABLE ONLY dashboard.tbl_dashboard_benutzer_override
+    ADD CONSTRAINT tbl_dashboard_benutzer_override_fk2 FOREIGN KEY (uid) REFERENCES public.tbl_benutzer(uid) ON UPDATE CASCADE ON DELETE RESTRICT;
+
+
+--
+-- Name: tbl_dashboard_preset tbl_dashboard_preset_fk1; Type: FK CONSTRAINT; Schema: dashboard; Owner: fhcomplete
+--
+
+ALTER TABLE ONLY dashboard.tbl_dashboard_preset
+    ADD CONSTRAINT tbl_dashboard_preset_fk1 FOREIGN KEY (dashboard_id) REFERENCES dashboard.tbl_dashboard(dashboard_id) ON UPDATE CASCADE ON DELETE RESTRICT;
+
+
+--
+-- Name: tbl_dashboard_preset tbl_dashboard_preset_fk2; Type: FK CONSTRAINT; Schema: dashboard; Owner: fhcomplete
+--
+
+ALTER TABLE ONLY dashboard.tbl_dashboard_preset
+    ADD CONSTRAINT tbl_dashboard_preset_fk2 FOREIGN KEY (funktion_kurzbz) REFERENCES public.tbl_funktion(funktion_kurzbz) ON UPDATE CASCADE ON DELETE RESTRICT;
+
+
+--
+-- Name: tbl_dashboard_widget tbl_dashboard_widget_fk1; Type: FK CONSTRAINT; Schema: dashboard; Owner: fhcomplete
+--
+
+ALTER TABLE ONLY dashboard.tbl_dashboard_widget
+    ADD CONSTRAINT tbl_dashboard_widget_fk1 FOREIGN KEY (dashboard_id) REFERENCES dashboard.tbl_dashboard(dashboard_id) ON UPDATE CASCADE ON DELETE RESTRICT;
+
+
+--
+-- Name: tbl_dashboard_widget tbl_dashboard_widget_fk2; Type: FK CONSTRAINT; Schema: dashboard; Owner: fhcomplete
+--
+
+ALTER TABLE ONLY dashboard.tbl_dashboard_widget
+    ADD CONSTRAINT tbl_dashboard_widget_fk2 FOREIGN KEY (widget_id) REFERENCES dashboard.tbl_widget(widget_id) ON UPDATE CASCADE ON DELETE RESTRICT;
+
+
+--
+-- Name: SCHEMA dashboard; Type: ACL; Schema: -; Owner: fhcomplete
+--
+
+GRANT USAGE ON SCHEMA dashboard TO web;
+GRANT USAGE ON SCHEMA dashboard TO vilesci;
+
+
+--
+-- Name: TABLE tbl_dashboard; Type: ACL; Schema: dashboard; Owner: fhcomplete
+--
+
+GRANT SELECT ON TABLE dashboard.tbl_dashboard TO web;
+GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE dashboard.tbl_dashboard TO vilesci;
+
+
+--
+-- Name: TABLE tbl_dashboard_benutzer_override; Type: ACL; Schema: dashboard; Owner: fhcomplete
+--
+
+GRANT SELECT,INSERT,UPDATE ON TABLE dashboard.tbl_dashboard_benutzer_override TO web;
+GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE dashboard.tbl_dashboard_benutzer_override TO vilesci;
+
+
+--
+-- Name: SEQUENCE tbl_dashboard_benutzer_override_override_id_seq; Type: ACL; Schema: dashboard; Owner: fhcomplete
+--
+
+GRANT ALL ON SEQUENCE dashboard.tbl_dashboard_benutzer_override_override_id_seq TO vilesci;
+
+
+--
+-- Name: SEQUENCE tbl_dashboard_dashboard_id_seq; Type: ACL; Schema: dashboard; Owner: fhcomplete
+--
+
+GRANT ALL ON SEQUENCE dashboard.tbl_dashboard_dashboard_id_seq TO vilesci;
+
+
+--
+-- Name: TABLE tbl_dashboard_preset; Type: ACL; Schema: dashboard; Owner: fhcomplete
+--
+
+GRANT SELECT ON TABLE dashboard.tbl_dashboard_preset TO web;
+GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE dashboard.tbl_dashboard_preset TO vilesci;
+
+
+--
+-- Name: SEQUENCE tbl_dashboard_preset_preset_id_seq; Type: ACL; Schema: dashboard; Owner: fhcomplete
+--
+
+GRANT ALL ON SEQUENCE dashboard.tbl_dashboard_preset_preset_id_seq TO vilesci;
+
+
+--
+-- Name: TABLE tbl_dashboard_widget; Type: ACL; Schema: dashboard; Owner: fhcomplete
+--
+
+GRANT SELECT ON TABLE dashboard.tbl_dashboard_widget TO web;
+
+
+--
+-- Name: TABLE tbl_widget; Type: ACL; Schema: dashboard; Owner: fhcomplete
+--
+
+GRANT SELECT ON TABLE dashboard.tbl_widget TO web;
+
+
+--
+-- Name: SEQUENCE tbl_widget_widget_id_seq; Type: ACL; Schema: dashboard; Owner: fhcomplete
+--
+
+GRANT ALL ON SEQUENCE dashboard.tbl_widget_widget_id_seq TO vilesci;
+		
+EODASHBOARDSQL;
+	
+		if (!$db->db_query($qry))
+		{
+			echo '<strong>Schema Dashboard: '.$db->db_last_error().'</strong><br>';
+		}
+		else
+		{
+			echo '<br>Neues Schema dashboard hinzugefuegt';
+		}
+	}
+}
diff --git a/system/dbupdate_3.3.php b/system/dbupdate_3.3.php
index b29171f86..fc5e95b35 100644
--- a/system/dbupdate_3.3.php
+++ b/system/dbupdate_3.3.php
@@ -6521,6 +6521,9 @@ if($result = @$db->db_query("SELECT * FROM information_schema.role_table_grants
 	}
 }
 
+// add Dashboard Schema and Tables
+include __DIR__ . '/dashboard/dbupdate_dashboard.php';
+
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
 

From d14608ed28b22323e99ee65162f5cdb111f89090 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 3 Oct 2022 07:59:11 +0200
Subject: [PATCH 0006/1461] level funktion_kurzbz added to presets and
 overrides

---
 application/controllers/dashboard/Config.php  | 24 ++++++-------
 .../libraries/dashboard/DashboardLib.php      | 36 +++++++++++++++++--
 2 files changed, 44 insertions(+), 16 deletions(-)

diff --git a/application/controllers/dashboard/Config.php b/application/controllers/dashboard/Config.php
index 6ace1f464..c03bcdbf3 100644
--- a/application/controllers/dashboard/Config.php
+++ b/application/controllers/dashboard/Config.php
@@ -61,7 +61,8 @@ class Config extends Auth_Controller
 		$preset_decoded = json_decode($preset->preset, true);
 		$widgetid = $this->DashboardLib->generateWidgetId($dashboard_kurzbz);
 		
-		$preset_decoded['widgets'][$widgetid['widgetid']] = $input->widget;
+		$this->DashboardLib->addWidgetToWidgets($preset_decoded['widgets'], 
+			$funktion_kurzbz, $input->widget, $widgetid['widgetid']);
 		
 		$preset->preset = json_encode($preset_decoded);
 				
@@ -91,11 +92,8 @@ class Config extends Auth_Controller
 		
 		$preset_decoded = json_decode($preset->preset, true);
 		
-		if( isset($preset_decoded['widgets'][$widgetid]) )
-		{
-			unset($preset_decoded['widgets'][$widgetid]);
-		}
-		else
+		if( $this->DashboardLib->removeWidgetFromWidgets($preset_decoded['widgets'], 
+			$funktion_kurzbz, $widgetid) )
 		{
 			http_response_code(404);
 			$this->terminateWithJsonError('widgetid ' . $widgetid . ' not found');
@@ -115,6 +113,7 @@ class Config extends Auth_Controller
 	{
 		$input = json_decode($this->input->raw_input_stream);
 		$dashboard_kurzbz = $input->db;
+		$funktion_kurzbz = $input->funktion_kurzbz;
 		$uid = $input->uid;
 		
 		$override = $this->DashboardLib->getOverrideOrCreateEmptyOverride($dashboard_kurzbz, $uid);		
@@ -122,8 +121,9 @@ class Config extends Auth_Controller
 		$override_decoded = json_decode($override->override, true);
 		$widgetid = isset($input->widgetid) ? array('widgetid' => $input->widgetid) 
 			: $this->DashboardLib->generateWidgetId($dashboard_kurzbz);
-		
-		$override_decoded['widgets'][$widgetid['widgetid']] = $input->widget;
+
+		$this->DashboardLib->addWidgetToWidgets($override_decoded['widgets'], 
+			$funktion_kurzbz, $input->widget, $widgetid['widgetid']);
 		
 		$override->override = json_encode($override_decoded);
 				
@@ -140,6 +140,7 @@ class Config extends Auth_Controller
 	{
 		$input = json_decode($this->input->raw_input_stream);
 		$dashboard_kurzbz = $input->db;
+		$funktion_kurzbz = $input->funktion_kurzbz;
 		$uid = $input->uid;
 		$widgetid = $input->widgetid;
 		
@@ -152,11 +153,8 @@ class Config extends Auth_Controller
 		
 		$override_decoded = json_decode($override->override, true);
 		
-		if( array_key_exists($widgetid, $override_decoded['widgets']) )
-		{
-			unset($override_decoded['widgets'][$widgetid]);
-		}
-		else
+		if( !$this->DashboardLib->removeWidgetFromWidgets($override_decoded['widgets'], 
+			$funktion_kurzbz, $widgetid) )
 		{
 			http_response_code(404);
 			$this->terminateWithJsonError('widgetid ' . $widgetid . ' not found');
diff --git a/application/libraries/dashboard/DashboardLib.php b/application/libraries/dashboard/DashboardLib.php
index f4edb6490..ba8469bfd 100644
--- a/application/libraries/dashboard/DashboardLib.php
+++ b/application/libraries/dashboard/DashboardLib.php
@@ -9,6 +9,8 @@ class DashboardLib
 {
 	const WIDGET_ID_RANDOM_BYTES = 16;
 	const DEFAULT_DASHBOARD_KURZBZ = 'fhcomplete';
+	const SECTION_IF_FUNKTION_KURZBZ_IS_NULL = 'general';
+	const USEROVERRIDE_SECTION = 'custom';
 	
 	private $_ci; // CI instance
 	
@@ -106,7 +108,7 @@ class DashboardLib
 		$emptyoverride = new stdClass();
 		$emptyoverride->dashboard_id = $dashboard->dashboard_id;
 		$emptyoverride->uid = $uid;
-		$emptyoverride->override = '{"widgets": {}}';
+		$emptyoverride->override = '{"widgets": {"' . self::USEROVERRIDE_SECTION . '": {}}}';
 		
 		return $emptyoverride;
 	}
@@ -123,7 +125,8 @@ class DashboardLib
 		$emptypreset = new stdClass();
 		$emptypreset->dashboard_id = $dashboard->dashboard_id;
 		$emptypreset->funktion_kurzbz = $funktion_kurzbz;
-		$emptypreset->preset = '{"widgets": {}}';
+		$section = ($funktion_kurzbz !== null) ? $funktion_kurzbz : self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL;
+		$emptypreset->preset = '{"widgets": {"' . $funktion_kurzbz . '": {}}}';
 		
 		return $emptypreset;
 	}
@@ -184,5 +187,32 @@ class DashboardLib
 		}
 		
 		return $result;
-	}	
+	}
+
+	public function addWidgetToWidgets(&$widgets, $section, $widget, $widgetid) 
+	{
+		$section = ($section !== null) ? $section : self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL;
+		if( !isset($widgets[$section]) || !is_array($widgets[$section]) ) 
+		{
+			$widgets[$section] = array();
+		}
+		
+		$widgets[$section][$widgetid] = $widget;
+	}
+	
+	public function removeWidgetFromWidgets(&$widgets, $section, $widgetid) 
+	{
+		$section = ($section !== null) ? $section : self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL;		
+		if(isset($widgets[$section]) && isset($widgets[$section][$widgetid]) ) 
+		{
+			unset($widgets[$section][$widgetid]);
+			if(empty($widgets[$section])) {
+				unset($widgets[$section]);
+			}
+			return true;
+		}
+		else {
+			return false;
+		}
+	}
 }

From 90e006feb5957978feb7ea224cbd06ad9a5b5647 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 4 Oct 2022 08:22:27 +0200
Subject: [PATCH 0007/1461] allow widgets array for add operations

---
 application/controllers/dashboard/Config.php  | 21 ++++++++----------
 .../libraries/dashboard/DashboardLib.php      | 22 ++++++++++++++-----
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/application/controllers/dashboard/Config.php b/application/controllers/dashboard/Config.php
index c03bcdbf3..60225fa11 100644
--- a/application/controllers/dashboard/Config.php
+++ b/application/controllers/dashboard/Config.php
@@ -14,9 +14,9 @@ class Config extends Auth_Controller
 				'index'							=> 'dashboard/benutzer:r',
 				'dummy'							=> 'dashboard/benutzer:r',
 				'genWidgetId'					=> 'dashboard/benutzer:rw',
-				'addWidgetToPreset'				=> 'dashboard/admin:rw',
+				'addWidgetsToPreset'			=> 'dashboard/admin:rw',
 				'removeWidgetFromPreset'		=> 'dashboard/admin:rw',
-				'addWidgetToUserOverride'		=> 'dashboard/benutzer:rw',
+				'addWidgetsToUserOverride'		=> 'dashboard/benutzer:rw',
 				'removeWidgetFromUserOverride'	=> 'dashboard/benutzer:rw'
 			)
 		);
@@ -46,11 +46,11 @@ class Config extends Auth_Controller
 		$dashboard_kurzbz = $this->input->get('db');
 		$widgetid = $this->DashboardLib->generateWidgetId($dashboard_kurzbz);
 		$this->outputJsonSuccess(array(
-			'widgetid' => $widgetid['widgetid']
+			'widgetid' => $widgetid
 		));
 	}
 	
-	public function addWidgetToPreset() 
+	public function addWidgetsToPreset() 
 	{
 		$input = json_decode($this->input->raw_input_stream);
 		$dashboard_kurzbz = $input->db;
@@ -59,10 +59,9 @@ class Config extends Auth_Controller
 		$preset = $this->DashboardLib->getPresetOrCreateEmptyPreset($dashboard_kurzbz, $funktion_kurzbz);		
 		
 		$preset_decoded = json_decode($preset->preset, true);
-		$widgetid = $this->DashboardLib->generateWidgetId($dashboard_kurzbz);
 		
-		$this->DashboardLib->addWidgetToWidgets($preset_decoded['widgets'], 
-			$funktion_kurzbz, $input->widget, $widgetid['widgetid']);
+		$this->DashboardLib->addWidgetsToWidgets($preset_decoded['widgets'], 
+			$dashboard_kurzbz, $funktion_kurzbz, $input->widgets);
 		
 		$preset->preset = json_encode($preset_decoded);
 				
@@ -109,7 +108,7 @@ class Config extends Auth_Controller
 		$this->outputJsonSuccess(array('msg' => 'preset successfully updated.'));
 	}
 
-	public function addWidgetToUserOverride() 
+	public function addWidgetsToUserOverride() 
 	{
 		$input = json_decode($this->input->raw_input_stream);
 		$dashboard_kurzbz = $input->db;
@@ -119,11 +118,9 @@ class Config extends Auth_Controller
 		$override = $this->DashboardLib->getOverrideOrCreateEmptyOverride($dashboard_kurzbz, $uid);		
 		
 		$override_decoded = json_decode($override->override, true);
-		$widgetid = isset($input->widgetid) ? array('widgetid' => $input->widgetid) 
-			: $this->DashboardLib->generateWidgetId($dashboard_kurzbz);
 
-		$this->DashboardLib->addWidgetToWidgets($override_decoded['widgets'], 
-			$funktion_kurzbz, $input->widget, $widgetid['widgetid']);
+		$this->DashboardLib->addWidgetsToWidgets($override_decoded['widgets'], 
+			$dashboard_kurzbz, $funktion_kurzbz, $input->widgets);
 		
 		$override->override = json_encode($override_decoded);
 				
diff --git a/application/libraries/dashboard/DashboardLib.php b/application/libraries/dashboard/DashboardLib.php
index ba8469bfd..3f189fc03 100644
--- a/application/libraries/dashboard/DashboardLib.php
+++ b/application/libraries/dashboard/DashboardLib.php
@@ -31,10 +31,7 @@ class DashboardLib
 		$widgetid_input = time() . '_' . $dashboard_kurzbz . '_' 
 			. bin2hex(random_bytes(self::WIDGET_ID_RANDOM_BYTES));
 		$widgetid = md5($widgetid_input);
-		return array(
-			'widgetid' => $widgetid,
-			'widgetid_input' => $widgetid_input
-		);
+		return $widgetid;
 	}
 	
 	public function getDashboardByKurzbz($dashboard_kurzbz) 
@@ -131,11 +128,12 @@ class DashboardLib
 		return $emptypreset;
 	}
 	
-	public function getPreset($dashboard_kurzbz, $funktion_kurzbz) 
+	public function getPreset($dashboard_kurzbz, $section) 
 	{
 		$dashboard = $this->getDashboardByKurzbz($dashboard_kurzbz);
 		$preset = null;
 		
+		$funktion_kurzbz = ($section === self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL) ? null : $section;
 		$result = $this->_ci->DashboardPresetModel
 			->getPresetByDashboardAndFunktion($dashboard->dashboard_id, $funktion_kurzbz);
 		
@@ -189,6 +187,18 @@ class DashboardLib
 		return $result;
 	}
 
+	public function addWidgetsToWidgets(&$widgets, $dashboard_kurzbz, $section, $addwigets)
+	{
+		foreach ($addwigets as $widget)
+		{
+			if(!isset($widget->widgetid))
+			{
+				$widget->widgetid = $this->generateWidgetId($dashboard_kurzbz);
+			}
+			$this->addWidgetToWidgets($widgets, $section, $widget, $widget->widgetid);
+		}
+	}
+	
 	public function addWidgetToWidgets(&$widgets, $section, $widget, $widgetid) 
 	{
 		$section = ($section !== null) ? $section : self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL;
@@ -206,7 +216,7 @@ class DashboardLib
 		if(isset($widgets[$section]) && isset($widgets[$section][$widgetid]) ) 
 		{
 			unset($widgets[$section][$widgetid]);
-			if(empty($widgets[$section])) {
+			if(empty($widgets[$section]) && $section !== self::USEROVERRIDE_SECTION) {
 				unset($widgets[$section]);
 			}
 			return true;

From 4f3e8dcb3c8ccfceac18b3eac4f7297c5b25f20b Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 5 Oct 2022 10:43:43 +0200
Subject: [PATCH 0008/1461] Basic VUE Components & Test WidgetController

---
 application/controllers/dashboard/Config.php  |   2 +-
 application/controllers/dashboard/Widget.php  | 162 +++++++
 public/css/components/dashboard.css           |  16 +
 public/js/components/Dashboard/Dashboard.js   | 170 +++++++
 public/js/components/Dashboard/Item.js        | 138 ++++++
 public/js/components/Dashboard/Section.js     | 417 ++++++++++++++++++
 .../js/components/DashboardWidget/Abstract.js |  12 +
 .../js/components/DashboardWidget/Default.js  |  14 +
 .../Dashboard/CachedWidgetLoader.js           |  29 ++
 9 files changed, 959 insertions(+), 1 deletion(-)
 create mode 100644 application/controllers/dashboard/Widget.php
 create mode 100644 public/css/components/dashboard.css
 create mode 100644 public/js/components/Dashboard/Dashboard.js
 create mode 100644 public/js/components/Dashboard/Item.js
 create mode 100644 public/js/components/Dashboard/Section.js
 create mode 100644 public/js/components/DashboardWidget/Abstract.js
 create mode 100644 public/js/components/DashboardWidget/Default.js
 create mode 100644 public/js/composables/Dashboard/CachedWidgetLoader.js

diff --git a/application/controllers/dashboard/Config.php b/application/controllers/dashboard/Config.php
index 60225fa11..ae177091e 100644
--- a/application/controllers/dashboard/Config.php
+++ b/application/controllers/dashboard/Config.php
@@ -130,7 +130,7 @@ class Config extends Auth_Controller
 			$this->terminateWithJsonError('override could not be saved');
 		}
 		
-		$this->outputJsonSuccess(array('msg' => 'override successfully stored.'));
+		$this->outputJsonSuccess(array('msg' => 'override successfully stored.', 'data' => $override_decoded));
 	}
 	
 	public function removeWidgetFromUserOverride()
diff --git a/application/controllers/dashboard/Widget.php b/application/controllers/dashboard/Widget.php
new file mode 100644
index 000000000..f1f0614d7
--- /dev/null
+++ b/application/controllers/dashboard/Widget.php
@@ -0,0 +1,162 @@
+<?php
+defined('BASEPATH') || exit('No direct script access allowed');
+/**
+ * Description of Widget
+ *
+ * @author chris
+ */
+class Widget extends Auth_Controller
+{
+	private $demoData = [
+		[
+			"id" => 1,
+			"name" => 'Widget 1',
+			"description" => 'Das ist ein Test Widget',
+			"icon" => 'https://upload.wikimedia.org/wikipedia/commons/8/8a/Farben-Testbild.svg',
+			"file" => 'DashboardWidget/Widget1.js',
+			"arguments" => [
+				"test" => 2
+			],
+			"size" => [
+				"width" => [ "max" => 3 ],
+				"height" => [ "max" => 3 ]
+			]
+		]
+	];
+
+	public function __construct()
+	{
+		parent::__construct(
+			array(
+				'index'							=> 'dashboard/benutzer:r',
+				'getWidgetsForDashboard'		=> 'dashboard/benutzer:rw',
+				'addWidgetToUserOverride'		=> 'dashboard/benutzer:rw',
+				'updateWidgetsToUserOverride'	=> 'dashboard/benutzer:rw',
+				'removeWidgetFromUserOverride'	=> 'dashboard/benutzer:rw'
+			)
+		);
+		
+		$this->load->library('dashboard/DashboardLib', null, 'DashboardLib');
+	}
+	
+	public function index() 
+	{
+		$widget_id = $this->input->get('id');
+
+		foreach ($this->demoData as $widget) {
+			if ($widget["id"] == $widget_id)
+				return $this->outputJsonSuccess($widget);
+		}
+		return $this->outputJsonSuccess([
+			"id" => 0,
+			"name" => 'Widget Not Found',
+			"file" => 'DashboardWidget/Default.js',
+			"arguments" => [
+				"className" => 'alert-danger',
+				"title" => 'Widget Not Found',
+				"msg" => 'The widget with the id ' . $widget_id . ' could not be found'
+			],
+			"size" => [
+				"width" => 1,
+				"height" => 1
+			]
+		]);
+	}
+	
+	public function getWidgetsForDashboard() 
+	{
+		$db = $this->input->get('db');
+
+		$this->outputJsonSuccess($this->demoData);
+	}
+	
+	public function addWidgetToUserOverride() 
+	{
+		$input = json_decode($this->input->raw_input_stream);
+		$dashboard_kurzbz = $input->db;
+		$uid = $input->uid;
+		$funktion = $input->funktion;
+		
+		$override = $this->DashboardLib->getOverrideOrCreateEmptyOverride($dashboard_kurzbz, $uid);		
+		
+		$override_decoded = json_decode($override->override, true);
+		$widgetid = isset($input->widgetid) ? array('widgetid' => $input->widgetid) 
+			: $this->DashboardLib->generateWidgetId($dashboard_kurzbz);
+		
+		$override_decoded[$funktion][$widgetid['widgetid']] = $input->widget;
+		
+		$override->override = json_encode($override_decoded);
+				
+		$result = $this->DashboardLib->insertOrUpdateOverride($override);
+		if( isError($result) ) {
+			http_response_code(500);
+			$this->terminateWithJsonError('override could not be saved');
+		}
+		
+		$this->outputJsonSuccess($widgetid['widgetid']);
+	}
+	
+	public function updateWidgetsToUserOverride() 
+	{
+		$input = json_decode($this->input->raw_input_stream, true);
+		$dashboard_kurzbz = $input['db'];
+		$uid = $input['uid'];
+		$funktion = $input['funktion'];
+
+		$override = $this->DashboardLib->getOverrideOrCreateEmptyOverride($dashboard_kurzbz, $uid);		
+		
+		$override_decoded = json_decode($override->override, true);
+		if ($override_decoded[$funktion])
+			$override_decoded[$funktion] = array_replace_recursive($override_decoded[$funktion], $input['widgets']);
+		else
+			$override_decoded[$funktion] = $input['widgets'];
+		
+		$override->override = json_encode($override_decoded);
+				
+		$result = $this->DashboardLib->insertOrUpdateOverride($override);
+		if( isError($result) ) {
+			http_response_code(500);
+			$this->terminateWithJsonError('override could not be saved');
+		}
+		
+		$this->outputJsonSuccess(['msg' => 'override successfully updated.']);
+	}
+	
+	public function removeWidgetFromUserOverride()
+	{
+		$input = json_decode($this->input->raw_input_stream);
+		$dashboard_kurzbz = $input->db;
+		$uid = $input->uid;
+		$funktion = $input->funktion;
+		$widgetid = $input->widgetid;
+		
+		$override = $this->DashboardLib->getOverride($dashboard_kurzbz, $uid);
+		if( empty($override) ) {
+			http_response_code(404);
+			$this->terminateWithJsonError('userconfig for dashboard ' 
+				. $dashboard_kurzbz . ' not found.');
+		}
+		
+		$override_decoded = json_decode($override->override, true);
+		
+		if( array_key_exists($widgetid, $override_decoded[$funktion]) )
+		{
+			unset($override_decoded[$funktion][$widgetid]);
+		}
+		else
+		{
+			http_response_code(404);
+			$this->terminateWithJsonError('widgetid ' . $widgetid . ' not found in funktion ' . $funktion);
+		}
+		
+		$override->override = json_encode($override_decoded);
+		$result = $this->DashboardLib->insertOrUpdateOverride($override, $uid);
+		if( isError($result) ) 
+		{
+			http_response_code(500);
+			$this->terminateWithJsonError('failed to remove widget');	
+		}
+		$this->outputJsonSuccess(array('msg' => 'override successfully updated.'));
+	}
+	
+}
diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
new file mode 100644
index 000000000..91379200c
--- /dev/null
+++ b/public/css/components/dashboard.css
@@ -0,0 +1,16 @@
+.alert-danger .form-check-input:checked {
+	border-color: #842029;
+	background-color: #842029;
+}
+
+.draganddropcontainer {
+	grid-template-columns:repeat(4,1fr);
+	gap: 1rem;
+	place-items: stretch;
+	place-content: stretch;
+}
+@media(max-width: 577px) {
+	.draganddropcontainer {
+		grid-template-columns:repeat(2,1fr);
+	}
+}
diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js
new file mode 100644
index 000000000..04976da9c
--- /dev/null
+++ b/public/js/components/Dashboard/Dashboard.js
@@ -0,0 +1,170 @@
+import DashboardSection from "./Section.js";
+import CachedWidgetLoader from "../../composables/Dashboard/CachedWidgetLoader.js";
+
+export default {
+	props: [
+		"dashboard",
+		"apiurl"
+	],
+	data: () => ({
+		sections: [],
+		widgets: [],
+		isLoading: 0,
+		tmpCreate: null,
+	}),
+	components: {
+		DashboardSection
+	},
+	computed: {
+		listReady() {
+			return this.widgets.length && !this.isLoading;
+		}
+	},
+	methods: {
+		widgetAdd(section_name, widget) {
+			if (!this.widgets.length) {
+				axios.get(this.apiurl + '/Widget/getWidgetsForDashboard', {params:{
+					db: this.dashboard
+				}}).then(res => {
+					//console.log(res.data.retval);
+					this.widgets = res.data.retval;
+				}).catch(err => console.error('ERROR:', err));
+			}
+			this.tmpCreate = {section_name,widget};
+			this.listModal.show();
+		},
+		widgetCreate(widget) {
+			this.isLoading = 1;
+			this.tmpCreate.widget.widget = widget;
+			axios.post(this.apiurl + '/Config/addWidgetsToUserOverride', {
+				db: this.dashboard,
+				uid: 'ma0168',
+				funktion_kurzbz: this.tmpCreate.section_name,
+				widgets: [this.tmpCreate.widget]
+			}).then(result => {
+				let newId = 0;
+				let sec = result.data.retval.data.widgets[this.tmpCreate.section_name];
+				for (var i in sec) {
+					newId = i;
+					break;
+				}
+				console.log(newId);
+				this.tmpCreate.widget.id = newId;
+				this.sections.forEach(section => {
+					if (section.name == this.tmpCreate.section_name)
+						section.widgets.push(this.tmpCreate.widget);
+				});
+			}).catch(error => {
+				console.error('ERROR: ', error);
+				alert('ERROR: ' + error.response.data.retval);
+			}).finally(() => {
+				this.listModal.hide();
+				this.isLoading = 0;
+			});
+		},
+		widgetUpdate(section_name, payload) {
+			payload = payload[section_name];
+			for (var k in payload) {
+				for (var i in this.sections) {
+					if (this.sections[i].name == section_name) {
+						for (var wid in this.sections[i].widgets) {
+							if (this.sections[i].widgets[wid].id == k) {
+								payload[k] = {...this.sections[i].widgets[wid], ...payload[k]};
+								break;
+							}
+						}
+						break;
+					}
+				}
+				payload[k].widgetid = k;
+			}
+			return axios.post(this.apiurl + '/Config/addWidgetsToUserOverride', {
+				db: this.dashboard,
+				uid: 'ma0168',
+				funktion_kurzbz: section_name,
+				widgets: payload
+			}).then(result => {
+				this.sections.forEach(section => {
+					if (section.name == section_name) {
+						section.widgets.forEach((widget, i) => {
+							if (payload[widget.id]) {
+								// TODO(chris): revert placement on failure
+								delete payload[widget.id].place; // TODO(chris): find out why overwriting place bugs out
+								section.widgets[i] = {...widget, ...payload[widget.id]};
+							}
+						});
+					}
+				});
+			}).catch(error => {
+				console.error('ERROR: ', error);
+				alert('ERROR: ' + error.response.data.retval);
+			});
+		},
+		widgetRemove(section_name, id) {
+			axios.post(this.apiurl + '/Config/removeWidgetFromUserOverride', {
+				db: this.dashboard,
+				uid: 'ma0168',
+				funktion_kurzbz: section_name,
+				widgetid: id
+			}).then(result => {
+				this.sections.forEach(section => {
+					if (section.name == section_name)
+						section.widgets = section.widgets.filter(widget => widget.id != id);
+				});
+			}).catch(error => {
+				console.error('ERROR: ', error);
+				alert('ERROR: ' + error.response.data.retval);
+			});
+		}
+	},
+	created() {
+		CachedWidgetLoader.setPath(this.apiurl + '/Widget');
+		axios.get(this.apiurl + '/Config', {params:{
+			db: this.dashboard,
+			uid: 'ma0168'
+		}}).then(res => {
+			//console.log(res.data.retval);
+			for (var name in res.data.retval.widgets) {
+				let widgets = [];
+				for (var wid in res.data.retval.widgets[name]) {
+					res.data.retval.widgets[name][wid].id = wid;
+					widgets.push(res.data.retval.widgets[name][wid]);
+				}
+				this.sections.push({
+					name: name,
+					widgets: widgets
+				});
+			}
+		}).catch(err => console.error('ERROR:', err));
+	},
+	mounted() {
+		this.listModal = new bootstrap.Modal(this.$refs.widgetlist);
+	},
+	template: `<div class="core-dashboard">
+		<dashboard-section v-for="section in sections" :key="section.name" :name="section.name" :widgets="section.widgets" @widgetAdd="widgetAdd" @widgetUpdate="widgetUpdate" @widgetRemove="widgetRemove"></dashboard-section>
+		<div ref="widgetlist" class="modal" tabindex="-1">
+			<div class="modal-dialog">
+				<div class="modal-content">
+					<div class="modal-header">
+						<h5 class="modal-title">Create new widget</h5>
+						<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+					</div>
+					<div class="modal-body">
+						<div v-if="listReady" class="row">
+							<div v-for="widget in widgets" :v-key="widget.id" class="col">
+								<div class="card h-100" @click="widgetCreate(widget.id)">
+									<img class="card-img-top" :src="widget.icon" :alt="'pictogram for ' + widget.name">
+									<div class="card-body">
+										<h5 class="card-title">{{ widget.name }}</h5>
+										<p class="card-text">{{ widget.description }}</p>
+									</div>
+								</div>
+							</div>
+						</div>
+						<div v-else class="text-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>`
+}
\ No newline at end of file
diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
new file mode 100644
index 000000000..4434311ff
--- /dev/null
+++ b/public/js/components/Dashboard/Item.js
@@ -0,0 +1,138 @@
+import CachedWidgetLoader from "../../composables/Dashboard/CachedWidgetLoader.js";
+
+export default {
+	components: {},
+	data: () => ({
+		component: '',
+		arguments: null,
+		configModal: null,
+		target: false,
+		widget: null,
+		tmpConfig: {},
+		isLoading: false,
+		hasConfig: true
+	}),
+	emits: [
+		"change",
+		"remove",
+		"dragstart",
+		"resizestart",
+	],
+	props: [
+		"id",
+		"config",
+		"width",
+		"height",
+		"custom",
+		"hidden",
+		"editMode"
+	],
+	computed: {
+		isResizeable() {
+			if (!this.widget)
+				return false;
+			return this.widget.size.width.max || this.widget.size.height.max;
+		},
+		ready() {
+			return this.component && this.arguments !== null
+		}
+	},
+	methods: {
+		mouseDown(e) {
+			this.target = e.target;
+		},
+		startDrag(e) {
+			if (this.$refs.dragHandle.contains(this.target)) {
+				this.$emit('dragstart', e);
+			} else if (this.isResizeable && this.$refs.resizeHandle.contains(this.target)) {
+				if (this.isResizeable)
+					this.$emit('resizestart', e);
+				else
+					e.preventDefault();
+			} else {
+				e.preventDefault();
+			}
+		},
+		openConfig() {
+			this.tmpConfig = {...this.arguments};
+			this.configModal.show();
+		},
+		setConfig(hasConfig) {
+			this.hasConfig = hasConfig;
+		},
+		changeConfig() {
+			this.isLoading = true;
+			let config = {...this.tmpConfig};
+			this.sendChangeConfig(config);
+		},
+		changeConfigManually() {
+			let config = {...this.arguments};
+			this.sendChangeConfig(config);
+		},
+		sendChangeConfig(config) {
+			for (var k in config) {
+				if (this.widget.arguments[k] == config[k]) {
+					delete config[k];
+				}
+			}
+			this.$emit('change', config);
+		}
+	},
+	watch: {
+		config() {
+			this.arguments = {...this.widget.arguments, ...this.config};
+			this.tmpConfig = {...this.arguments};
+			this.configModal.hide();
+			this.isLoading = false;
+		}
+	},
+	async created() {
+		this.widget = await CachedWidgetLoader.loadWidget(this.id);
+		let component = (await import('../' + this.widget.file)).default;
+		this.$options.components['widget' + this.widget.id] = component;
+		this.component = 'widget' + this.widget.id;
+		this.arguments = {...this.widget.arguments, ...this.config};
+		this.tmpConfig = {...this.arguments};
+	},
+	mounted() {
+		this.configModal = new bootstrap.Modal(this.$refs.config);
+	},
+	template: `<div v-if="!hidden || editMode" :class="'dashboard-item card overflow-hidden ' + (arguments ? arguments.className : '')" @mousedown="mouseDown($event)" @dragstart="startDrag($event)" :draggable="!!editMode">
+		<div v-if="editMode && widget" class="card-header d-flex">
+			<span ref="dragHandle" class="col-auto pe-3"><i class="fa-solid fa-grip-vertical"></i></span>
+			<span class="col">{{ widget.name }}</span>
+			<a v-if="hasConfig" class="col-auto ps-1" href="#" @click.prevent="openConfig"><i class="fa-solid fa-gear"></i></a>
+			<a v-if="custom" class="col-auto ps-1" href="#" @click.prevent="$emit('remove')">
+				<i class="fa-solid fa-trash"></i>
+			</a>
+			<div v-else class="col-auto ps-1 form-switch">
+				<input class="form-check-input ms-0" type="checkbox" role="switch" id="flexSwitchCheckChecked" :checked="!hidden" @input="$emit('remove', hidden)">
+			</div>
+		</div>
+		<div v-if="ready" class="card-body overflow-hidden">
+			<component :is="component" :config="arguments" :width="width" :height="height" @setConfig="setConfig" @change="changeConfigManually"></component>
+		</div>
+		<div v-else class="card-body overflow-hidden text-center d-flex flex-column justify-content-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></div>
+		<div ref="config" class="modal" tabindex="-1">
+			<div class="modal-dialog">
+				<div class="modal-content">
+					<div class="modal-header">
+						<h5 v-if="widget" class="modal-title">Config for {{ widget.name }}</h5>
+						<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+					</div>
+					<div class="modal-body">
+						<component v-if="ready && !isLoading" :is="component" :config="tmpConfig" @change="changeConfig" :configMode="true"></component>
+						<div v-else class="text-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></div>
+					</div>
+					<div class="modal-footer">
+						<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
+						<button type="button" class="btn btn-primary" @click="changeConfig">Save changes</button>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div v-if="editMode && isResizeable" class="card-footer d-flex justify-content-end p-0">
+			<span ref="resizeHandle" class="col-auto ps-1" @dragstart.prevent="$emit('resize')"><i class="fa-solid fa-up-right-and-down-left-from-center"></i></span>
+		</div>
+	</div>`
+}
\ No newline at end of file
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
new file mode 100644
index 000000000..9ea40fdc1
--- /dev/null
+++ b/public/js/components/Dashboard/Section.js
@@ -0,0 +1,417 @@
+import DashboardItem from "./Item.js";
+import CachedWidgetLoader from "../../composables/Dashboard/CachedWidgetLoader.js";
+
+// TODO(chris): handle overflow (moving outside the box)
+export default {
+	data: () => ({
+		gridWidth: 0,
+		containerRect: {top:0,left:0},
+		changeHeight: 1,
+		movedObjects: [],
+		editMode: 0,
+		gridXLast: 0,
+		gridYLast: 0,
+	}),
+	props: [
+		"name",
+		"widgets"
+	],
+	emits: [
+		"widgetAdd",
+		"widgetUpdate",
+		"widgetRemove"
+	],
+	components: {
+		DashboardItem
+	},
+	computed: {
+		items() {
+			this.widgets.forEach((item,i) => item.index = i);
+			return this.widgets;
+		},
+		itemCoords() {
+			if (!this.gridWidth)
+				return [];
+			let itemCoords = this.items.map(item => item.place[this.gridWidth] || this.createItemPlacement(item));
+			// TODO(chris): verify positions & sizes
+			let occupiers = [];
+			let wrongPlacedItems = [];
+			let gridWidth = this.gridWidth;
+			this.items.forEach(item => {
+				let x = item._x !== undefined ? item._x : itemCoords[item.index].x;
+				let y = item._y !== undefined ? item._y : itemCoords[item.index].y;
+				let w = item._w !== undefined ? item._w : itemCoords[item.index].w;
+				let h = item._h !== undefined ? item._h : itemCoords[item.index].h;
+				// TODO(chris): check with and height params here?
+				for (var i = 0; i < w; i++) {
+					for (var j = 0; j < h; j++) {
+						var c = (y+j-1) * gridWidth + (x+i-1);
+						// NOTE(chris): check for overlaping items
+						if (occupiers[c] !== undefined) {
+							//console.log('try to add ' + item.index + ' to ' + x + '/' + y + ', but ' + occupiers[c] + ' is already there');
+							// NOTE(chris): remove possible other entries of this item
+							for (var c2 = c; c2; c2--)
+								if (occupiers[c2] == item.index)
+									occupiers[c2] = undefined;
+							wrongPlacedItems.push(item);
+							return;
+						}
+						occupiers[c] = item.index;
+					}
+				}
+			});
+			wrongPlacedItems.forEach(item => {
+				let w = item._w !== undefined ? item._w : itemCoords[item.index].w;
+				let h = item._h !== undefined ? item._h : itemCoords[item.index].h;
+				for (var c = 0; c < occupiers.length + gridWidth; c++) {
+					if (occupiers[c] === undefined) {
+						var occupied = false;
+						for (var i = 0; i < w; i++) {
+							for (var j = 0; j < h; j++) {
+								if (occupiers[c + i + j * gridWidth] !== undefined) {
+									i = w;
+									occupied = true;
+									break;
+								}
+							}
+						}
+						if (!occupied) {
+							item.place[gridWidth].x = c%gridWidth + 1;
+							item.place[gridWidth].y = Math.floor(c/gridWidth) + 1;
+							for (var i = 0; i < w; i++) {
+								for (var j = 0; j < h; j++) {
+									occupiers[c + i + j * gridWidth] = item.index;
+								}
+							}
+							return;
+						}
+					}
+				}
+			});
+			return itemCoords;
+		},
+		gridHeight() {
+			if (!this.gridWidth || !this.changeHeight)
+				return 0;
+			let minH = 0;
+			this.itemCoords.forEach((item,i) => minH = Math.max(minH, (!this.editMode && this.items[i].hidden) ? 0 : item.y + item.h - 1));
+			// TODO(chris): the extraline should only be present if all slots are occupied
+			return minH + this.editMode;
+		},
+		gridOccupiers() {
+			let occupiers = [];
+			let gridWidth = this.gridWidth;
+			this.items.forEach(item => {
+				let x = item._x !== undefined ? item._x : this.itemCoords[item.index].x;
+				let y = item._y !== undefined ? item._y : this.itemCoords[item.index].y;
+				let w = item._w !== undefined ? item._w : this.itemCoords[item.index].w;
+				let h = item._h !== undefined ? item._h : this.itemCoords[item.index].h;
+				for (var i = 0; i < w; i++) {
+					for (var j = 0; j < h; j++) {
+						var c = (y+j-1) * gridWidth + (x+i-1);
+						occupiers[c] = item.index;
+					}
+				}
+			});
+			return occupiers;
+		}
+	},
+	methods: {
+		addWidget(evt) {
+			if (evt.target != this.$refs.container || !this.editMode)
+				return;
+			const rect = this.containerRect;
+			const gridX = Math.floor(this.gridWidth * (evt.clientX - rect.left) / this.$refs.container.clientWidth) + 1;
+			const gridY = Math.floor(this.gridHeight * (evt.clientY - rect.top) / this.$refs.container.clientHeight) + 1;
+			if (this.gridOccupiers[gridY * this.gridWidth + gridX] === undefined) {
+				let widget = { widget: 1, config: {}, place: {}, custom: 1 };
+				widget.place[this.gridWidth] = {
+					x: gridX,
+					y: gridY,
+					w: 1,
+					h: 1
+				};
+				this.$emit('widgetAdd', this.name, widget);
+			}
+		},
+		createItemPlacement(item) {
+			// TODO(chris): create correct default placement if it is not there
+			item.place[this.gridWidth] = {x:1,y:1,w:1,h:1};
+			/*var freeList = [], nextId = 0;
+			this.items.forEach(item => {
+				if (!item.place[this.gridWidth]) {
+					if (!this.gridWidth) {
+						item.place[this.gridWidth] = {x:1,y:nextId++,w:1,h:1};
+					} else {
+						// TODO(chris): IMPLEMENT widths & heights
+						if (freeList[nextId])
+							while (freeList[++nextId]);
+						freeList[nextId] = 1;
+						item.place[this.gridWidth] = {x:(nextId%this.gridWidth)+1,y:Math.floor(nextId/this.gridWidth)+1,w:1,h:1};
+					}
+				}
+			});*/
+			return item.place[this.gridWidth];
+		},
+		startDrag(evt, item) {
+			this.gridXLast = -1;
+			this.gridYLast = -1;
+			item._x = this.itemCoords[item.index].x;
+			item._y = this.itemCoords[item.index].y;
+
+			evt.dataTransfer.dropEffect = 'move';
+			evt.dataTransfer.effectAllowed = 'move';
+			evt.dataTransfer.setData('itemAction', 'm');
+			evt.dataTransfer.setData('itemId', item.index);
+			evt.dataTransfer.setData('itemW', this.itemCoords[item.index].w);
+			evt.dataTransfer.setData('itemH', this.itemCoords[item.index].h);
+		},
+		startResize(evt, item) {
+			this.gridXLast = -1;
+			this.gridYLast = -1;
+			item._w = this.itemCoords[item.index].w;
+			item._h = this.itemCoords[item.index].h;
+
+			evt.dataTransfer.setDragImage(evt.target, -99999, -99999);
+			evt.dataTransfer.dropEffect = 'move';
+			evt.dataTransfer.effectAllowed = 'move';
+			evt.dataTransfer.setData('itemAction', 'r');
+			evt.dataTransfer.setData('itemId', item.index);
+			evt.dataTransfer.setData('itemX', this.itemCoords[item.index].x);
+			evt.dataTransfer.setData('itemY', this.itemCoords[item.index].y);
+		},
+		occupyFields(id, x, y, w, h) {
+			var c;
+			while ((c = this.movedObjects.pop())) {
+				if (this.items[c]._y !== undefined) {
+					this.items[c].place[this.gridWidth].y = this.items[c]._y;
+					this.items[c]._y = undefined;
+				}
+			}
+			var move = {};
+			move[id] = this.items[id];
+			this.getOccupiedItems(x,y,w,h,move);
+			h = y + h;
+			y = 0;
+			for (x in move) {
+				if (x != id) {
+					c = move[x]._y !== undefined ? move[x]._y : this.itemCoords[x].y;
+					if (c < h)
+						y = Math.max(h-c, y);
+				}
+			}
+			for (x in move) {
+				if (x != id) {
+					this.movedObjects.push(x);
+					if (move[x]._y === undefined) {
+						move[x]._y = this.itemCoords[x].y;
+					}
+					move[x].place[this.gridWidth].y = move[x]._y + y;
+				}
+			}
+		},
+		getOccupiedItems(x, y, w, h, move) {
+			var i, j, c;
+			for (i = 0; i < w; i++) {
+				for (j = 0; j < h; j++) {
+					c = (y+j-1) * this.gridWidth + (x+i-1);
+					if (this.gridOccupiers[c] !== undefined && !move[this.gridOccupiers[c]]) {
+						move[this.gridOccupiers[c]] = this.items[this.gridOccupiers[c]];
+						c = this.itemCoords[this.gridOccupiers[c]];
+						this.getOccupiedItems(c.x, c.y + 1, c.w, c.h, move);
+					}
+				}
+			}
+		},
+		onDragOver(evt) {
+			let id, x, y, w, h;
+			const action = evt.dataTransfer.getData('itemAction');
+			const rect = this.containerRect;
+			const gridX = Math.floor(this.gridWidth * (evt.clientX - rect.left) / this.$refs.container.clientWidth);
+			const gridY = Math.floor(this.gridHeight * (evt.clientY - rect.top) / this.$refs.container.clientHeight);
+
+			if (this.gridXLast == gridX && this.gridYLast == gridY)
+				return;
+			this.gridXLast = gridX;
+			this.gridYLast = gridY;
+
+			if (action == 'm') {
+				x = gridX + 1;
+				y = gridY + 1;
+				w = parseInt(evt.dataTransfer.getData('itemW'));
+				h = parseInt(evt.dataTransfer.getData('itemH'));
+
+				if (x + w > this.gridWidth + 1)
+					x = this.gridWidth + 1 - w;
+
+				id = evt.dataTransfer.getData('itemID');
+				this.occupyFields(id, x, y, w, h);
+
+				this.itemCoords[id].x = x;
+				this.itemCoords[id].y = y;
+			} else if (action == 'r') {
+				x = parseInt(evt.dataTransfer.getData('itemX'));
+				y = parseInt(evt.dataTransfer.getData('itemY'));
+				w = gridX + 2 - x;
+				h = gridY + 2 - y;
+				w = Math.max(1, w);
+				h = Math.max(1, h);
+
+				if (x + w > this.gridWidth + 1)
+					w = this.gridWidth + 1 - x;
+
+				id = evt.dataTransfer.getData('itemID');
+				let widget = CachedWidgetLoader.getWidget(this.items[id].widget);
+				if (widget) {
+					let minmaxW = widget.size.width;
+					if (minmaxW.max)
+						minmaxW.min = minmaxW.min || 1;
+					else
+						minmaxW = {min:minmaxW,max:minmaxW};
+					if (w < minmaxW.min)
+						w = minmaxW.min;
+					if (w > minmaxW.max)
+						w = minmaxW.max;
+					
+					let minmaxH = widget.size.height;
+					if (minmaxH.max)
+						minmaxH.min = minmaxH.min || 1;
+					else
+						minmaxH = {min:minmaxH,max:minmaxH};
+					if (h < minmaxH.min)
+						h = minmaxH.min;
+					if (h > minmaxH.max)
+						h = minmaxH.max;
+				}
+
+				this.occupyFields(id, x, y, w, h);
+				
+				this.itemCoords[id].w = w;
+				this.itemCoords[id].h = h;
+			}
+		},
+		onDrop(evt) {
+			let id = 0;
+			let update = {};
+			while ((id = this.movedObjects.pop())) {
+				if (this.items[id]._y !== undefined) {
+					if (this.itemCoords[id].y != this.items[id]._y) {
+						update[this.items[id].id] = {place:{}};
+						update[this.items[id].id].place[this.gridWidth] = {y:this.itemCoords[id].y};
+					}
+					this.items[id]._y = undefined;
+				}
+			}
+			
+			id = evt.dataTransfer.getData('itemId');
+			
+			const action = evt.dataTransfer.getData('itemAction');
+			update[this.items[id].id] = {place:{}};
+			update[this.items[id].id].place[this.gridWidth] = {};
+
+			if (action == 'm') {
+				if (this.items[id]._x !== undefined) {
+					if (this.itemCoords[id].x != this.items[id]._x) {
+						update[this.items[id].id].place[this.gridWidth].x = this.itemCoords[id].x;
+					}
+					this.items[id]._x = undefined;
+				}
+				if (this.items[id]._y !== undefined) {
+					if (this.itemCoords[id].y != this.items[id]._y) {
+						update[this.items[id].id].place[this.gridWidth].y = this.itemCoords[id].y;
+					}
+					this.items[id]._y = undefined;
+				}
+			} else if (action == 'r') {
+				update[this.items[id].id].place[this.gridWidth].w = this.itemCoords[id].w;
+				update[this.items[id].id].place[this.gridWidth].h = this.itemCoords[id].h;
+			}
+
+			if (update[this.items[id].id].place[this.gridWidth].x === undefined && 
+				update[this.items[id].id].place[this.gridWidth].y === undefined && 
+				update[this.items[id].id].place[this.gridWidth].w === undefined && 
+				update[this.items[id].id].place[this.gridWidth].h === undefined) {
+				delete update[this.items[id].id].place[this.gridWidth];
+			}
+
+			this.updatePreset(update);
+
+			// TODO(chris): find better way to trigger change for gridHeight
+			this.changeHeight++
+		},
+		removeWidget(item, revert) {
+			if (item.custom) {
+				if (confirm('Are you sure you want to delete this widget?')) {
+					this.$emit('widgetRemove', this.name, item.id);
+				}
+			} else {
+				let update = {};
+				update[item.id] = { hidden: !revert };
+				this.updatePreset(update);
+			}
+		},
+		saveConfig(config, item) {
+			let payload = {};
+			payload[item.id] = { config };console.log(payload);
+			this.updatePreset(payload);
+		},
+		updatePreset(update) {
+			let payload = {};
+			payload[this.name] = update;
+			this.$emit('widgetUpdate', this.name, payload);
+		}
+	},
+	mounted() {
+		let self = this;
+		let cont = self.$refs.container;
+		self.gridWidth = window.getComputedStyle(cont).getPropertyValue('grid-template-columns').split(" ").length;
+		self.containerRect = cont.getBoundingClientRect();
+		
+		window.addEventListener('resize', () => {
+			for (const child of cont.children) {
+				child.style.display = 'none';
+			}
+			self.gridWidth = window.getComputedStyle(cont).getPropertyValue('grid-template-columns').split(" ").length;
+			self.containerRect = cont.getBoundingClientRect();
+			for (const child of cont.children) {
+				child.style.display = '';
+			}
+		});
+	},
+	template: `<div class="dashboard-section">
+		<h3 class="d-flex">
+			<span class="col">{{name}}</span>
+			<button class="col-auto btn" @click.prevent="editMode = editMode ? 0 : 1"><i class="fa-solid fa-gear"></i></button>
+		</h3>
+		<div class="position-relative" :style="'height:0;padding-bottom:' + (gridHeight * 100/gridWidth) + '%'">
+			<div ref="container" 
+				class="position-absolute top-0 left-0 w-100 h-100 draganddropcontainer" 
+				:style="'display:grid;grid-template-rows:repeat('+gridHeight+',1fr)'" 
+				@click="addWidget($event)" 
+				@drop="onDrop($event, 1)" 
+				@dragover.prevent="onDragOver" 
+				@dragenter.prevent>
+				
+				<dashboard-item 
+					v-for="item in items" 
+					:key="item.id" 
+					:id="item.widget" 
+					:config="item.config" 
+					:custom="item.custom" 
+					:hidden="item.hidden" 
+					:editMode="editMode" 
+					:x="itemCoords[item.index] ? itemCoords[item.index].x : -1" 
+					:y="itemCoords[item.index] ? itemCoords[item.index].y : -1" 
+					:style="itemCoords[item.index] ? {'grid-column-start':itemCoords[item.index].x,'grid-column-end':itemCoords[item.index].x+itemCoords[item.index].w,'grid-row-start':itemCoords[item.index].y,'grid-row-end':itemCoords[item.index].y+itemCoords[item.index].h} : {}" 
+					:width="itemCoords[item.index] ? itemCoords[item.index].w : 0" 
+					:height="itemCoords[item.index] ? itemCoords[item.index].h : 0" 
+					@dragstart="startDrag($event, item)" 
+					@resizestart="startResize($event, item)" 
+					@change="saveConfig($event, item)"
+					@remove="removeWidget(item, $event)">
+				</dashboard-item>
+
+			</div>
+		</div>
+	</div>`
+}
\ No newline at end of file
diff --git a/public/js/components/DashboardWidget/Abstract.js b/public/js/components/DashboardWidget/Abstract.js
new file mode 100644
index 000000000..8d0416e28
--- /dev/null
+++ b/public/js/components/DashboardWidget/Abstract.js
@@ -0,0 +1,12 @@
+export default {
+	props: [
+		"config",
+		"width",
+		"height",
+		"setConfig",
+		"configMode"
+	],
+	emits: [
+		"change" // TODO(chris): do we need this?
+	]
+}
diff --git a/public/js/components/DashboardWidget/Default.js b/public/js/components/DashboardWidget/Default.js
new file mode 100644
index 000000000..29e3880dd
--- /dev/null
+++ b/public/js/components/DashboardWidget/Default.js
@@ -0,0 +1,14 @@
+import AbstractWidget from './Abstract';
+
+export default {
+	mixins: [
+		AbstractWidget
+	],
+	created() {
+		this.$emit('setConfig', false)
+	},
+	template: `<div class="dashboard-widget-default">
+	    <h5 class="card-title">{{ config.title }}</h5>
+	    <p class="card-text">{{ config.msg }}</p>
+	</div>`
+}
\ No newline at end of file
diff --git a/public/js/composables/Dashboard/CachedWidgetLoader.js b/public/js/composables/Dashboard/CachedWidgetLoader.js
new file mode 100644
index 000000000..df9ff6abe
--- /dev/null
+++ b/public/js/composables/Dashboard/CachedWidgetLoader.js
@@ -0,0 +1,29 @@
+let __widgets = {};
+let __widgetsStarted = {};
+let __path = '';
+
+export default {
+	getWidget(id) {
+		return __widgets[id];
+	},
+	loadWidget(id) {
+		if (__widgets[id])
+			return Promise.resolve(__widgets[id]);
+		if (__widgetsStarted[id])
+			return __widgetsStarted[id];
+		if (!__path)
+			return Promise.reject('Widget could not be loaded because there is no path yet!');
+
+		__widgetsStarted[id] = new Promise((resolve, reject) => {
+			axios.get(__path, {params:{id}}).then(res => {
+				__widgets[id] = res.data.retval;
+				__widgetsStarted[id] = undefined;
+				resolve(__widgets[id]);
+			}).catch(error => reject(error.response.data.retval.error));
+		});
+		return __widgetsStarted[id];
+	},
+	setPath(path) {
+		__path = path;
+	}
+}
\ No newline at end of file

From a3ad8eb337702dd320abe163815d767e1d7af64c Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 11 Oct 2022 15:41:43 +0200
Subject: [PATCH 0009/1461] dashboard.tbl_widget new fields

---
 system/dashboard/dbupdate_dashboard.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/system/dashboard/dbupdate_dashboard.php b/system/dashboard/dbupdate_dashboard.php
index 3e73de3b9..8f3c8ba9a 100644
--- a/system/dashboard/dbupdate_dashboard.php
+++ b/system/dashboard/dbupdate_dashboard.php
@@ -166,7 +166,9 @@ ALTER TABLE dashboard.tbl_dashboard_widget OWNER TO fhcomplete;
 CREATE TABLE dashboard.tbl_widget (
     widget_id integer NOT NULL,
     widget_kurzbz character varying(32) NOT NULL,
-    beschreibung text
+    beschreibung text,
+    arguments jsonb NOT NULL,
+    setup jsonb NOT NULL
 );
 
 

From 39bbcac217037fecdb555ac731c29ef3008e8236 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 12 Oct 2022 08:58:48 +0200
Subject: [PATCH 0010/1461] Widget controller & model & table

---
 application/controllers/dashboard/Widget.php  | 44 +++++++++++--------
 .../dashboard/Dashboard_Widget_model.php      | 24 ++++++++++
 public/js/components/Dashboard/Dashboard.js   | 14 +++---
 public/js/components/Dashboard/Item.js        | 12 ++---
 public/js/components/Dashboard/Section.js     |  4 +-
 .../Dashboard/CachedWidgetLoader.js           |  2 +
 6 files changed, 68 insertions(+), 32 deletions(-)
 create mode 100644 application/models/dashboard/Dashboard_Widget_model.php

diff --git a/application/controllers/dashboard/Widget.php b/application/controllers/dashboard/Widget.php
index f1f0614d7..6f5bd6a6c 100644
--- a/application/controllers/dashboard/Widget.php
+++ b/application/controllers/dashboard/Widget.php
@@ -37,37 +37,43 @@ class Widget extends Auth_Controller
 		);
 		
 		$this->load->library('dashboard/DashboardLib', null, 'DashboardLib');
+		$this->load->model('dashboard/Dashboard_Widget_model', 'DashboardWidgetModel');
 	}
 	
 	public function index() 
 	{
 		$widget_id = $this->input->get('id');
 
-		foreach ($this->demoData as $widget) {
-			if ($widget["id"] == $widget_id)
-				return $this->outputJsonSuccess($widget);
-		}
-		return $this->outputJsonSuccess([
-			"id" => 0,
-			"name" => 'Widget Not Found',
-			"file" => 'DashboardWidget/Default.js',
-			"arguments" => [
-				"className" => 'alert-danger',
-				"title" => 'Widget Not Found',
-				"msg" => 'The widget with the id ' . $widget_id . ' could not be found'
-			],
-			"size" => [
-				"width" => 1,
-				"height" => 1
-			]
-		]);
+		$widget = $this->DashboardWidgetModel->load($widget_id);
+
+		if (isError($widget) || !getData($widget))
+			return $this->outputJsonSuccess([
+				"widget_id" => 0,
+				"widget_kurzbz" => "notfound",
+				"arguments" => json_encode([
+					"className" => 'alert-danger',
+					"title" => 'Widget Not Found',
+					"msg" => 'The widget with the id ' . $widget_id . ' could not be found'
+				]),
+				"setup" => json_encode([
+					"name" => 'Widget Not Found',
+					"file" => 'DashboardWidget/Default.js',
+					"width" => 1,
+					"height" => 1
+				])
+			]);
+		return $this->outputJsonSuccess(current(getData($widget)));
 	}
 	
 	public function getWidgetsForDashboard() 
 	{
 		$db = $this->input->get('db');
+		$result = $this->DashboardWidgetModel->getAllForDashboard($db);
 
-		$this->outputJsonSuccess($this->demoData);
+		if (isError($result))
+			return $this->outputJsonError(getError($result));
+
+		$this->outputJsonSuccess(getData($result));
 	}
 	
 	public function addWidgetToUserOverride() 
diff --git a/application/models/dashboard/Dashboard_Widget_model.php b/application/models/dashboard/Dashboard_Widget_model.php
new file mode 100644
index 000000000..59aadf8f8
--- /dev/null
+++ b/application/models/dashboard/Dashboard_Widget_model.php
@@ -0,0 +1,24 @@
+<?php
+class Dashboard_Widget_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'dashboard.tbl_widget';
+		$this->pk = 'widget_id';
+	}
+
+	public function getAllForDashboard($db)
+	{
+		$this->addSelect($this->dbTable . '.*');
+		$this->addJoin('dashboard.tbl_dashboard_widget', 'widget_id');
+		$this->addJoin('dashboard.tbl_dashboard', 'dashboard_id');
+
+		return $this->loadWhere(['dashboard_kurzbz' => $db]);
+	}
+
+}
diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js
index 04976da9c..345ebd9b1 100644
--- a/public/js/components/Dashboard/Dashboard.js
+++ b/public/js/components/Dashboard/Dashboard.js
@@ -27,6 +27,10 @@ export default {
 					db: this.dashboard
 				}}).then(res => {
 					//console.log(res.data.retval);
+					res.data.retval.forEach(widget => {
+						widget.arguments = JSON.parse(widget.arguments);
+						widget.setup = JSON.parse(widget.setup);
+					});
 					this.widgets = res.data.retval;
 				}).catch(err => console.error('ERROR:', err));
 			}
@@ -151,12 +155,12 @@ export default {
 					</div>
 					<div class="modal-body">
 						<div v-if="listReady" class="row">
-							<div v-for="widget in widgets" :v-key="widget.id" class="col">
-								<div class="card h-100" @click="widgetCreate(widget.id)">
-									<img class="card-img-top" :src="widget.icon" :alt="'pictogram for ' + widget.name">
+							<div v-for="widget in widgets" :v-key="widget.widget_id" class="col">
+								<div class="card h-100" @click="widgetCreate(widget.widget_id)">
+									<img class="card-img-top" :src="widget.setup.icon" :alt="'pictogram for ' + (widget.setup.name || widget.widget_kurzbz)">
 									<div class="card-body">
-										<h5 class="card-title">{{ widget.name }}</h5>
-										<p class="card-text">{{ widget.description }}</p>
+										<h5 class="card-title">{{ widget.setup.name || widget.widget_kurzbz }}</h5>
+										<p class="card-text">{{ widget.beschreibung }}</p>
 									</div>
 								</div>
 							</div>
diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index 4434311ff..7f3f41fb8 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -31,7 +31,7 @@ export default {
 		isResizeable() {
 			if (!this.widget)
 				return false;
-			return this.widget.size.width.max || this.widget.size.height.max;
+			return this.widget.setup.width.max || this.widget.setup.height.max;
 		},
 		ready() {
 			return this.component && this.arguments !== null
@@ -88,9 +88,9 @@ export default {
 	},
 	async created() {
 		this.widget = await CachedWidgetLoader.loadWidget(this.id);
-		let component = (await import('../' + this.widget.file)).default;
-		this.$options.components['widget' + this.widget.id] = component;
-		this.component = 'widget' + this.widget.id;
+		let component = (await import('../' + this.widget.setup.file)).default;
+		this.$options.components['widget' + this.widget.widget_id] = component;
+		this.component = 'widget' + this.widget.widget_id;
 		this.arguments = {...this.widget.arguments, ...this.config};
 		this.tmpConfig = {...this.arguments};
 	},
@@ -100,7 +100,7 @@ export default {
 	template: `<div v-if="!hidden || editMode" :class="'dashboard-item card overflow-hidden ' + (arguments ? arguments.className : '')" @mousedown="mouseDown($event)" @dragstart="startDrag($event)" :draggable="!!editMode">
 		<div v-if="editMode && widget" class="card-header d-flex">
 			<span ref="dragHandle" class="col-auto pe-3"><i class="fa-solid fa-grip-vertical"></i></span>
-			<span class="col">{{ widget.name }}</span>
+			<span class="col">{{ widget.setup.name }}</span>
 			<a v-if="hasConfig" class="col-auto ps-1" href="#" @click.prevent="openConfig"><i class="fa-solid fa-gear"></i></a>
 			<a v-if="custom" class="col-auto ps-1" href="#" @click.prevent="$emit('remove')">
 				<i class="fa-solid fa-trash"></i>
@@ -117,7 +117,7 @@ export default {
 			<div class="modal-dialog">
 				<div class="modal-content">
 					<div class="modal-header">
-						<h5 v-if="widget" class="modal-title">Config for {{ widget.name }}</h5>
+						<h5 v-if="widget" class="modal-title">Config for {{ widget.setup.name }}</h5>
 						<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
 					</div>
 					<div class="modal-body">
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 9ea40fdc1..382c83c7a 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -263,7 +263,7 @@ export default {
 				id = evt.dataTransfer.getData('itemID');
 				let widget = CachedWidgetLoader.getWidget(this.items[id].widget);
 				if (widget) {
-					let minmaxW = widget.size.width;
+					let minmaxW = widget.setup.width;
 					if (minmaxW.max)
 						minmaxW.min = minmaxW.min || 1;
 					else
@@ -273,7 +273,7 @@ export default {
 					if (w > minmaxW.max)
 						w = minmaxW.max;
 					
-					let minmaxH = widget.size.height;
+					let minmaxH = widget.setup.height;
 					if (minmaxH.max)
 						minmaxH.min = minmaxH.min || 1;
 					else
diff --git a/public/js/composables/Dashboard/CachedWidgetLoader.js b/public/js/composables/Dashboard/CachedWidgetLoader.js
index df9ff6abe..e0eb39710 100644
--- a/public/js/composables/Dashboard/CachedWidgetLoader.js
+++ b/public/js/composables/Dashboard/CachedWidgetLoader.js
@@ -16,6 +16,8 @@ export default {
 
 		__widgetsStarted[id] = new Promise((resolve, reject) => {
 			axios.get(__path, {params:{id}}).then(res => {
+				res.data.retval.arguments = JSON.parse(res.data.retval.arguments);
+				res.data.retval.setup = JSON.parse(res.data.retval.setup);
 				__widgets[id] = res.data.retval;
 				__widgetsStarted[id] = undefined;
 				resolve(__widgets[id]);

From a468338ead459cfb694db93aa2bac107c6443e85 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 12 Oct 2022 09:08:24 +0200
Subject: [PATCH 0011/1461] Configurable CSS classes to Default Widget

---
 public/js/components/DashboardWidget/Default.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/public/js/components/DashboardWidget/Default.js b/public/js/components/DashboardWidget/Default.js
index 29e3880dd..859528ca5 100644
--- a/public/js/components/DashboardWidget/Default.js
+++ b/public/js/components/DashboardWidget/Default.js
@@ -4,10 +4,15 @@ export default {
 	mixins: [
 		AbstractWidget
 	],
+	computed: {
+		css() {
+			return ['dashboard-widget-default', this.config.css];
+		}
+	},
 	created() {
 		this.$emit('setConfig', false)
 	},
-	template: `<div class="dashboard-widget-default">
+	template: `<div :class="css">
 	    <h5 class="card-title">{{ config.title }}</h5>
 	    <p class="card-text">{{ config.msg }}</p>
 	</div>`

From c7c89138339a20e0e25066c3eac7fddd61adb35e Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Tue, 11 Oct 2022 14:18:39 +0200
Subject: [PATCH 0012/1461] =?UTF-8?q?Adapted=20Dashboard=20DB=20Update:=20?=
 =?UTF-8?q?Berechtigungen=20erg=C3=A4nzt=20/=20Typspezifikation=20entfernt?=
 =?UTF-8?q?.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

. Berechtigungen ergänzt:
  - dashboard/benutzer
  - dashboard/admin

. Typspezifikation entfernt in Create Sequence
  - war nicht mit PHPSQL 9.6.2 kompatibel.
---
 system/dashboard/dbupdate_dashboard.php | 41 ++++++++++++++++++++++---
 system/dbupdate_3.3.php                 |  7 ++++-
 2 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/system/dashboard/dbupdate_dashboard.php b/system/dashboard/dbupdate_dashboard.php
index 3e73de3b9..a8ef842e1 100644
--- a/system/dashboard/dbupdate_dashboard.php
+++ b/system/dashboard/dbupdate_dashboard.php
@@ -72,7 +72,6 @@ ALTER TABLE dashboard.tbl_dashboard_benutzer_override OWNER TO fhcomplete;
 --
 
 CREATE SEQUENCE dashboard.tbl_dashboard_benutzer_override_override_id_seq
-    AS integer
     START WITH 1
     INCREMENT BY 1
     NO MINVALUE
@@ -94,7 +93,6 @@ ALTER SEQUENCE dashboard.tbl_dashboard_benutzer_override_override_id_seq OWNED B
 --
 
 CREATE SEQUENCE dashboard.tbl_dashboard_dashboard_id_seq
-    AS integer
     START WITH 1
     INCREMENT BY 1
     NO MINVALUE
@@ -130,7 +128,6 @@ ALTER TABLE dashboard.tbl_dashboard_preset OWNER TO fhcomplete;
 --
 
 CREATE SEQUENCE dashboard.tbl_dashboard_preset_preset_id_seq
-    AS integer
     START WITH 1
     INCREMENT BY 1
     NO MINVALUE
@@ -177,7 +174,6 @@ ALTER TABLE dashboard.tbl_widget OWNER TO fhcomplete;
 --
 
 CREATE SEQUENCE dashboard.tbl_widget_widget_id_seq
-    AS integer
     START WITH 1
     INCREMENT BY 1
     NO MINVALUE
@@ -427,3 +423,40 @@ EODASHBOARDSQL;
 		}
 	}
 }
+
+// Add permission: dashboard/admin
+if($result = @$db->db_query("SELECT 1 FROM system.tbl_berechtigung WHERE berechtigung_kurzbz = 'dashboard/admin';"))
+{
+    if($db->db_num_rows($result) == 0)
+    {
+        $qry = "INSERT INTO system.tbl_berechtigung(berechtigung_kurzbz, beschreibung) VALUES('dashboard/admin', 'Adminberechtigung');";
+
+        if(!$db->db_query($qry))
+        {
+            echo '<strong>system.tbl_berechtigung '.$db->db_last_error().'</strong><br>';
+        }
+        else
+        {
+            echo 'system.tbl_berechtigung: Added permission for dashboard/admin<br>';
+        }
+    }
+}
+
+// Add permission: dashboard/benutzer
+if($result = @$db->db_query("SELECT 1 FROM system.tbl_berechtigung WHERE berechtigung_kurzbz = 'dashboard/benutzer';"))
+{
+    if($db->db_num_rows($result) == 0)
+    {
+        $qry = "INSERT INTO system.tbl_berechtigung(berechtigung_kurzbz, beschreibung) VALUES('dashboard/benutzer', 'Benutzerberechtigung');";
+
+        if(!$db->db_query($qry))
+        {
+            echo '<strong>system.tbl_berechtigung '.$db->db_last_error().'</strong><br>';
+        }
+        else
+        {
+            echo 'system.tbl_berechtigung: Added permission for dashboard/benutzer<br>';
+        }
+    }
+}
+
diff --git a/system/dbupdate_3.3.php b/system/dbupdate_3.3.php
index fc5e95b35..190b06a4e 100644
--- a/system/dbupdate_3.3.php
+++ b/system/dbupdate_3.3.php
@@ -6521,7 +6521,7 @@ if($result = @$db->db_query("SELECT * FROM information_schema.role_table_grants
 	}
 }
 
-// add Dashboard Schema and Tables
+// add Dashboard Schema, Tables and Permissions
 include __DIR__ . '/dashboard/dbupdate_dashboard.php';
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
@@ -6618,6 +6618,11 @@ $tabellen=array(
 	"campus.tbl_zeitsperretyp"  => array("zeitsperretyp_kurzbz","beschreibung","farbe"),
 	"campus.tbl_zeitwunsch"  => array("stunde","mitarbeiter_uid","tag","gewicht","updateamum","updatevon","insertamum","insertvon", "zeitwunsch_id", "zeitwunsch_gueltigkeit_id"),
 	"campus.tbl_zeitwunsch_gueltigkeit"  => array("zeitwunsch_gueltigkeit_id","mitarbeiter_uid","von","bis","insertamum","insertvon", "updateamum","updatevon"),
+	"dashboard.tbl_dashboard" => array("dashboard_id", "dashboard_kurzbz", "beschreibung"),
+	"dashboard.tbl_dashboard_benutzer_override" => array("override_id", "dashboard_id", "uid", "override"),
+	"dashboard.tbl_dashboard_preset" => array("preset_id", "dashboard_id", "funktion_kurzbz", "preset"),
+	"dashboard.tbl_dashboard_widget" => array("dashboard_id", "widget_id"),
+	"dashboard.tbl_widget" => array("widget_id", "widget_kurzbz", "beschreibung"),
 	"fue.tbl_aktivitaet"  => array("aktivitaet_kurzbz","beschreibung","sort"),
 	"fue.tbl_aufwandstyp" => array("aufwandstyp_kurzbz","bezeichnung"),
 	"fue.tbl_projekt"  => array("projekt_kurzbz","nummer","titel","beschreibung","beginn","ende","oe_kurzbz","budget","farbe","aufwandstyp_kurzbz","ressource_id","anzahl_ma","aufwand_pt","projekt_id","projekttyp_kurzbz","zeitaufzeichnung"),

From dd4d71bd7d3cd5370ae5a9a02f1f0fdf233baa88 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 12 Oct 2022 10:29:52 +0200
Subject: [PATCH 0013/1461] Bug: Deepmerge on update

---
 public/js/components/Dashboard/Dashboard.js |  6 ++--
 public/js/composables/ObjectUtils.js        | 31 +++++++++++++++++++++
 2 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 public/js/composables/ObjectUtils.js

diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js
index 345ebd9b1..1b7183576 100644
--- a/public/js/components/Dashboard/Dashboard.js
+++ b/public/js/components/Dashboard/Dashboard.js
@@ -1,5 +1,6 @@
 import DashboardSection from "./Section.js";
 import CachedWidgetLoader from "../../composables/Dashboard/CachedWidgetLoader.js";
+import ObjectUtils from "../../composables/ObjectUtils.js";
 
 export default {
 	props: [
@@ -52,7 +53,6 @@ export default {
 					newId = i;
 					break;
 				}
-				console.log(newId);
 				this.tmpCreate.widget.id = newId;
 				this.sections.forEach(section => {
 					if (section.name == this.tmpCreate.section_name)
@@ -73,7 +73,7 @@ export default {
 					if (this.sections[i].name == section_name) {
 						for (var wid in this.sections[i].widgets) {
 							if (this.sections[i].widgets[wid].id == k) {
-								payload[k] = {...this.sections[i].widgets[wid], ...payload[k]};
+								payload[k] = ObjectUtils.mergeDeep(this.sections[i].widgets[wid], payload[k]);
 								break;
 							}
 						}
@@ -82,7 +82,7 @@ export default {
 				}
 				payload[k].widgetid = k;
 			}
-			return axios.post(this.apiurl + '/Config/addWidgetsToUserOverride', {
+			axios.post(this.apiurl + '/Config/addWidgetsToUserOverride', {
 				db: this.dashboard,
 				uid: 'ma0168',
 				funktion_kurzbz: section_name,
diff --git a/public/js/composables/ObjectUtils.js b/public/js/composables/ObjectUtils.js
new file mode 100644
index 000000000..348d18843
--- /dev/null
+++ b/public/js/composables/ObjectUtils.js
@@ -0,0 +1,31 @@
+export default {
+	/**
+	* Performs a deep merge of objects and returns new object. Does not modify
+	* objects (immutable) and merges arrays via concatenation.
+	*
+	* @param {...object} objects - Objects to merge
+	* @returns {object} New object with merged key/values
+	*/
+	mergeDeep(...objects) {
+		const isObject = obj => obj && typeof obj === 'object';
+		
+		return objects.reduce((prev, obj) => {
+			Object.keys(obj).forEach(key => {
+				const pVal = prev[key];
+				const oVal = obj[key];
+				
+				if (Array.isArray(pVal) && Array.isArray(oVal)) {
+					prev[key] = pVal.concat(...oVal);
+				}
+				else if (isObject(pVal) && isObject(oVal)) {
+					prev[key] = this.mergeDeep(pVal, oVal);
+				}
+				else {
+					prev[key] = oVal;
+				}
+			});
+			
+			return prev;
+		}, {});
+	}
+}
\ No newline at end of file

From 6570c958b3690b7b7b92de46015724bedd99e94a Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 12 Oct 2022 15:50:40 +0200
Subject: [PATCH 0014/1461] Bug: DataTransfer in Chrome

---
 public/js/components/Dashboard/Section.js | 39 +++++++++++++----------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 382c83c7a..2a531c45e 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -11,6 +11,7 @@ export default {
 		editMode: 0,
 		gridXLast: 0,
 		gridYLast: 0,
+		dataTransfer: {}
 	}),
 	props: [
 		"name",
@@ -161,10 +162,12 @@ export default {
 
 			evt.dataTransfer.dropEffect = 'move';
 			evt.dataTransfer.effectAllowed = 'move';
-			evt.dataTransfer.setData('itemAction', 'm');
-			evt.dataTransfer.setData('itemId', item.index);
-			evt.dataTransfer.setData('itemW', this.itemCoords[item.index].w);
-			evt.dataTransfer.setData('itemH', this.itemCoords[item.index].h);
+			this.dataTransfer = {
+				action: 'm',
+				id: item.index,
+				w: this.itemCoords[item.index].w,
+				h: this.itemCoords[item.index].h
+			}
 		},
 		startResize(evt, item) {
 			this.gridXLast = -1;
@@ -175,10 +178,12 @@ export default {
 			evt.dataTransfer.setDragImage(evt.target, -99999, -99999);
 			evt.dataTransfer.dropEffect = 'move';
 			evt.dataTransfer.effectAllowed = 'move';
-			evt.dataTransfer.setData('itemAction', 'r');
-			evt.dataTransfer.setData('itemId', item.index);
-			evt.dataTransfer.setData('itemX', this.itemCoords[item.index].x);
-			evt.dataTransfer.setData('itemY', this.itemCoords[item.index].y);
+			this.dataTransfer = {
+				action: 'r',
+				id: item.index,
+				x: this.itemCoords[item.index].x,
+				y: this.itemCoords[item.index].y
+			}
 		},
 		occupyFields(id, x, y, w, h) {
 			var c;
@@ -225,7 +230,7 @@ export default {
 		},
 		onDragOver(evt) {
 			let id, x, y, w, h;
-			const action = evt.dataTransfer.getData('itemAction');
+			const action = this.dataTransfer.action;
 			const rect = this.containerRect;
 			const gridX = Math.floor(this.gridWidth * (evt.clientX - rect.left) / this.$refs.container.clientWidth);
 			const gridY = Math.floor(this.gridHeight * (evt.clientY - rect.top) / this.$refs.container.clientHeight);
@@ -238,20 +243,20 @@ export default {
 			if (action == 'm') {
 				x = gridX + 1;
 				y = gridY + 1;
-				w = parseInt(evt.dataTransfer.getData('itemW'));
-				h = parseInt(evt.dataTransfer.getData('itemH'));
+				w = parseInt(this.dataTransfer.w);
+				h = parseInt(this.dataTransfer.h);
 
 				if (x + w > this.gridWidth + 1)
 					x = this.gridWidth + 1 - w;
 
-				id = evt.dataTransfer.getData('itemID');
+				id = this.dataTransfer.id;
 				this.occupyFields(id, x, y, w, h);
 
 				this.itemCoords[id].x = x;
 				this.itemCoords[id].y = y;
 			} else if (action == 'r') {
-				x = parseInt(evt.dataTransfer.getData('itemX'));
-				y = parseInt(evt.dataTransfer.getData('itemY'));
+				x = parseInt(this.dataTransfer.x);
+				y = parseInt(this.dataTransfer.y);
 				w = gridX + 2 - x;
 				h = gridY + 2 - y;
 				w = Math.max(1, w);
@@ -260,7 +265,7 @@ export default {
 				if (x + w > this.gridWidth + 1)
 					w = this.gridWidth + 1 - x;
 
-				id = evt.dataTransfer.getData('itemID');
+				id = this.dataTransfer.id;
 				let widget = CachedWidgetLoader.getWidget(this.items[id].widget);
 				if (widget) {
 					let minmaxW = widget.setup.width;
@@ -303,9 +308,9 @@ export default {
 				}
 			}
 			
-			id = evt.dataTransfer.getData('itemId');
+			id = this.dataTransfer.id;
 			
-			const action = evt.dataTransfer.getData('itemAction');
+			const action = this.dataTransfer.action;
 			update[this.items[id].id] = {place:{}};
 			update[this.items[id].id].place[this.gridWidth] = {};
 

From fd2aa8a1bbb3bbd87534e3917d1bf10279914b14 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 13 Oct 2022 08:43:08 +0200
Subject: [PATCH 0015/1461] Cleanup & uid from AuthLib

---
 application/controllers/dashboard/Config.php | 82 ++----------------
 application/controllers/dashboard/Widget.php | 89 --------------------
 public/js/components/Dashboard/Dashboard.js  |  6 +-
 3 files changed, 6 insertions(+), 171 deletions(-)

diff --git a/application/controllers/dashboard/Config.php b/application/controllers/dashboard/Config.php
index ae177091e..f7736f329 100644
--- a/application/controllers/dashboard/Config.php
+++ b/application/controllers/dashboard/Config.php
@@ -22,13 +22,14 @@ class Config extends Auth_Controller
 		);
 		
 		$this->load->library('dashboard/DashboardLib', null, 'DashboardLib');
+		$this->load->library('AuthLib', null, 'AuthLib');
 	}
 	
 	public function index() 
 	{
 		$dashboard_kurzbz = $this->input->get('db');
-		$uid = $this->input->get('uid');
-		
+		$uid = $this->AuthLib->getAuthObj()->username;
+
 		$dashboard = $this->DashboardLib->getDashboardByKurzbz($dashboard_kurzbz);
 		if(!$dashboard) {
 			http_response_code(404);
@@ -113,7 +114,7 @@ class Config extends Auth_Controller
 		$input = json_decode($this->input->raw_input_stream);
 		$dashboard_kurzbz = $input->db;
 		$funktion_kurzbz = $input->funktion_kurzbz;
-		$uid = $input->uid;
+		$uid = $this->AuthLib->getAuthObj()->username;
 		
 		$override = $this->DashboardLib->getOverrideOrCreateEmptyOverride($dashboard_kurzbz, $uid);		
 		
@@ -138,7 +139,7 @@ class Config extends Auth_Controller
 		$input = json_decode($this->input->raw_input_stream);
 		$dashboard_kurzbz = $input->db;
 		$funktion_kurzbz = $input->funktion_kurzbz;
-		$uid = $input->uid;
+		$uid = $this->AuthLib->getAuthObj()->username;
 		$widgetid = $input->widgetid;
 		
 		$override = $this->DashboardLib->getOverride($dashboard_kurzbz, $uid);
@@ -167,77 +168,4 @@ class Config extends Auth_Controller
 		$this->outputJsonSuccess(array('msg' => 'override successfully updated.'));
 	}
 	
-	public function dummy() 
-	{
-		$defaultconfig = array(
-			'title' => 'CIS Dashboard',
-			'widgets' => array(
-				'nofunction' => array(
-					'd39ba153ac9e60a21ed694cc3728f4dd' => array(
-						'title' => 'test1',
-						'type' => 'kpi',
-						'config' => array(),
-						'place' => array(
-							'row' => 1,
-							'col' => 3,
-							'width' => 1,
-							'height' => 1
-						)
-					),
-					'c6c526b78a0e4bc3a0b67e00f983fc33' => array(
-						'title' => 'test2',
-						'type' => 'url',
-						'config' => array(),
-						'place' => array(
-							'row' => 3,
-							'col' => 1,
-							'width' => 1,
-							'height' => 1
-						)
-					),
-				),
-				'leitung' => array(
-					'3f1ebb24bdaa2b82fbdacf7d55977412' => array(
-						'title' => 'test3',
-						'type' => 'chart',
-						'config' => array(),
-						'place' => array(
-							'row' => 2,
-							'col' => 1,
-							'width' => 3,
-							'height' => 3
-						)
-					)
-				)
-			)
-		);
-		
-		$userconfig = array(
-			'widgets' => array(
-				'nofunction' => array(
-					'd39ba153ac9e60a21ed694cc3728f4dd' => array(
-						'modifier' => 'bold',
-						'visible' => false,
-						'place' => array(
-							'width' => 2,
-							'height' => 2
-						)
-					),
-					'c6c526b78a0e4bc3a0b67e00f983fc33' => array(
-						'type' => 'test'
-					)
-				)
-			)
-		);
-		
-		$merged = array_replace_recursive($defaultconfig, $userconfig);
-		
-		$ret = array(
-			'defaultconfig' => $defaultconfig,
-			'userconfig' => $userconfig,
-			'merged' => $merged
-		);
-		
-		$this->outputJsonSuccess($ret);
-	}
 }
diff --git a/application/controllers/dashboard/Widget.php b/application/controllers/dashboard/Widget.php
index 6f5bd6a6c..6f900fcc9 100644
--- a/application/controllers/dashboard/Widget.php
+++ b/application/controllers/dashboard/Widget.php
@@ -76,93 +76,4 @@ class Widget extends Auth_Controller
 		$this->outputJsonSuccess(getData($result));
 	}
 	
-	public function addWidgetToUserOverride() 
-	{
-		$input = json_decode($this->input->raw_input_stream);
-		$dashboard_kurzbz = $input->db;
-		$uid = $input->uid;
-		$funktion = $input->funktion;
-		
-		$override = $this->DashboardLib->getOverrideOrCreateEmptyOverride($dashboard_kurzbz, $uid);		
-		
-		$override_decoded = json_decode($override->override, true);
-		$widgetid = isset($input->widgetid) ? array('widgetid' => $input->widgetid) 
-			: $this->DashboardLib->generateWidgetId($dashboard_kurzbz);
-		
-		$override_decoded[$funktion][$widgetid['widgetid']] = $input->widget;
-		
-		$override->override = json_encode($override_decoded);
-				
-		$result = $this->DashboardLib->insertOrUpdateOverride($override);
-		if( isError($result) ) {
-			http_response_code(500);
-			$this->terminateWithJsonError('override could not be saved');
-		}
-		
-		$this->outputJsonSuccess($widgetid['widgetid']);
-	}
-	
-	public function updateWidgetsToUserOverride() 
-	{
-		$input = json_decode($this->input->raw_input_stream, true);
-		$dashboard_kurzbz = $input['db'];
-		$uid = $input['uid'];
-		$funktion = $input['funktion'];
-
-		$override = $this->DashboardLib->getOverrideOrCreateEmptyOverride($dashboard_kurzbz, $uid);		
-		
-		$override_decoded = json_decode($override->override, true);
-		if ($override_decoded[$funktion])
-			$override_decoded[$funktion] = array_replace_recursive($override_decoded[$funktion], $input['widgets']);
-		else
-			$override_decoded[$funktion] = $input['widgets'];
-		
-		$override->override = json_encode($override_decoded);
-				
-		$result = $this->DashboardLib->insertOrUpdateOverride($override);
-		if( isError($result) ) {
-			http_response_code(500);
-			$this->terminateWithJsonError('override could not be saved');
-		}
-		
-		$this->outputJsonSuccess(['msg' => 'override successfully updated.']);
-	}
-	
-	public function removeWidgetFromUserOverride()
-	{
-		$input = json_decode($this->input->raw_input_stream);
-		$dashboard_kurzbz = $input->db;
-		$uid = $input->uid;
-		$funktion = $input->funktion;
-		$widgetid = $input->widgetid;
-		
-		$override = $this->DashboardLib->getOverride($dashboard_kurzbz, $uid);
-		if( empty($override) ) {
-			http_response_code(404);
-			$this->terminateWithJsonError('userconfig for dashboard ' 
-				. $dashboard_kurzbz . ' not found.');
-		}
-		
-		$override_decoded = json_decode($override->override, true);
-		
-		if( array_key_exists($widgetid, $override_decoded[$funktion]) )
-		{
-			unset($override_decoded[$funktion][$widgetid]);
-		}
-		else
-		{
-			http_response_code(404);
-			$this->terminateWithJsonError('widgetid ' . $widgetid . ' not found in funktion ' . $funktion);
-		}
-		
-		$override->override = json_encode($override_decoded);
-		$result = $this->DashboardLib->insertOrUpdateOverride($override, $uid);
-		if( isError($result) ) 
-		{
-			http_response_code(500);
-			$this->terminateWithJsonError('failed to remove widget');	
-		}
-		$this->outputJsonSuccess(array('msg' => 'override successfully updated.'));
-	}
-	
 }
diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js
index 1b7183576..7bc31be27 100644
--- a/public/js/components/Dashboard/Dashboard.js
+++ b/public/js/components/Dashboard/Dashboard.js
@@ -43,7 +43,6 @@ export default {
 			this.tmpCreate.widget.widget = widget;
 			axios.post(this.apiurl + '/Config/addWidgetsToUserOverride', {
 				db: this.dashboard,
-				uid: 'ma0168',
 				funktion_kurzbz: this.tmpCreate.section_name,
 				widgets: [this.tmpCreate.widget]
 			}).then(result => {
@@ -84,7 +83,6 @@ export default {
 			}
 			axios.post(this.apiurl + '/Config/addWidgetsToUserOverride', {
 				db: this.dashboard,
-				uid: 'ma0168',
 				funktion_kurzbz: section_name,
 				widgets: payload
 			}).then(result => {
@@ -107,7 +105,6 @@ export default {
 		widgetRemove(section_name, id) {
 			axios.post(this.apiurl + '/Config/removeWidgetFromUserOverride', {
 				db: this.dashboard,
-				uid: 'ma0168',
 				funktion_kurzbz: section_name,
 				widgetid: id
 			}).then(result => {
@@ -124,8 +121,7 @@ export default {
 	created() {
 		CachedWidgetLoader.setPath(this.apiurl + '/Widget');
 		axios.get(this.apiurl + '/Config', {params:{
-			db: this.dashboard,
-			uid: 'ma0168'
+			db: this.dashboard
 		}}).then(res => {
 			//console.log(res.data.retval);
 			for (var name in res.data.retval.widgets) {

From a71ead0a851161d2235892045c91eae411d2aab0 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 13 Oct 2022 14:38:03 +0200
Subject: [PATCH 0016/1461] Ajax update: better data consistency

---
 public/js/components/Dashboard/Dashboard.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js
index 7bc31be27..8cd234812 100644
--- a/public/js/components/Dashboard/Dashboard.js
+++ b/public/js/components/Dashboard/Dashboard.js
@@ -73,6 +73,10 @@ export default {
 						for (var wid in this.sections[i].widgets) {
 							if (this.sections[i].widgets[wid].id == k) {
 								payload[k] = ObjectUtils.mergeDeep(this.sections[i].widgets[wid], payload[k]);
+								// NOTE(chris): remove internal props
+								for (var prop in {_x:1,_y:1,_w:1,_h:1,index:1,id:1})
+									if (payload[k][prop])
+										delete payload[k][prop];
 								break;
 							}
 						}
@@ -90,14 +94,15 @@ export default {
 					if (section.name == section_name) {
 						section.widgets.forEach((widget, i) => {
 							if (payload[widget.id]) {
-								// TODO(chris): revert placement on failure
-								delete payload[widget.id].place; // TODO(chris): find out why overwriting place bugs out
-								section.widgets[i] = {...widget, ...payload[widget.id]};
+								payload[widget.id].id = widget.id;
+								payload[widget.id].index = widget.index;
+								section.widgets[i] = payload[widget.id];
 							}
 						});
 					}
 				});
 			}).catch(error => {
+				// TODO(chris): revert placement on failure
 				console.error('ERROR: ', error);
 				alert('ERROR: ' + error.response.data.retval);
 			});

From 680787d881bdf66f3f88cd13806ca3647b6aa61b Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 13 Oct 2022 14:44:33 +0200
Subject: [PATCH 0017/1461] Don't move out of bounds on Drag&Drop

---
 public/js/components/Dashboard/Section.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 2a531c45e..27ac148d4 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -241,8 +241,8 @@ export default {
 			this.gridYLast = gridY;
 
 			if (action == 'm') {
-				x = gridX + 1;
-				y = gridY + 1;
+				x = Math.max(gridX + 1, 1);
+				y = Math.max(gridY + 1, 1);
 				w = parseInt(this.dataTransfer.w);
 				h = parseInt(this.dataTransfer.h);
 

From ecbc6d8e3dda0c1ebfafd2948cb8440847e492bc Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Mon, 17 Oct 2022 13:37:08 +0200
Subject: [PATCH 0018/1461] Added Dashboard Controller & View

---
 .../controllers/dashboard/Dashboard.php       | 55 +++++++++++++++++++
 application/views/dashboard/dashboard.php     | 31 +++++++++++
 public/js/apps/Dashboard.js                   | 16 ++++++
 3 files changed, 102 insertions(+)
 create mode 100644 application/controllers/dashboard/Dashboard.php
 create mode 100644 application/views/dashboard/dashboard.php
 create mode 100644 public/js/apps/Dashboard.js

diff --git a/application/controllers/dashboard/Dashboard.php b/application/controllers/dashboard/Dashboard.php
new file mode 100644
index 000000000..2769bb8e5
--- /dev/null
+++ b/application/controllers/dashboard/Dashboard.php
@@ -0,0 +1,55 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ */
+class Dashboard extends Auth_Controller
+{
+    private $_uid;  // uid of the logged user
+
+    /**
+     * Constructor
+     */
+    public function __construct()
+    {
+        // Set required permissions
+        parent::__construct(
+            array(
+                'index' => 'user:r',
+            )
+        );
+
+        $this->load->library('AuthLib');
+        $this->load->library('WidgetLib');
+
+        $this->_setAuthUID(); // sets property uid
+
+        $this->setControllerId(); // sets the controller id
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    // Public methods
+	public function index()
+	{
+		$this->load->view('dashboard/dashboard.php', []);
+	}
+    // TODO löschen
+    public function test(){
+        echo "<pre>"; print_r('in Dashboard Test function'); echo "</pre>";
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    // Private methods
+
+    /**
+     * Retrieve the UID of the logged user and checks if it is valid
+     */
+    private function _setAuthUID()
+    {
+        $this->_uid = getAuthUID();
+
+        if (!$this->_uid) show_error('User authentification failed');
+    }
+
+}
diff --git a/application/views/dashboard/dashboard.php b/application/views/dashboard/dashboard.php
new file mode 100644
index 000000000..3518d769a
--- /dev/null
+++ b/application/views/dashboard/dashboard.php
@@ -0,0 +1,31 @@
+<?php
+$this->load->view('templates/FHC-Header',
+	array(
+		'title' => 'FH-Complete',
+		'bootstrap5' => true,
+		'fontawesome6' => true,
+		'axios027' => true,
+		'restclient' => true,
+		'vue3' => true,
+		'customJSModules' => ['public/js/apps/Dashboard.js'],
+		'customCSSs' => [
+			'public/css/components/dashboard.css'
+		],
+		'navigationcomponent' => true
+	)
+);
+?>
+
+	<div id="main">
+
+		<core-navigation-cmpt :add-side-menu-entries="appSideMenuEntries"></core-navigation-cmpt>
+
+		<div id="content">
+			<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
+				<h1 class="h2">Dashboard</h1>
+			</div>
+			<core-dashboard dashboard="CIS" apiurl="<?= site_url('dashboard'); ?>"></core-dashboard>
+		</div>
+	</div>
+
+<?php $this->load->view('templates/FHC-Footer'); ?>
diff --git a/public/js/apps/Dashboard.js b/public/js/apps/Dashboard.js
new file mode 100644
index 000000000..54a73441c
--- /dev/null
+++ b/public/js/apps/Dashboard.js
@@ -0,0 +1,16 @@
+import {CoreNavigationCmpt} from '../components/navigation/Navigation.js';
+import CoreDashboard from '../components/Dashboard/Dashboard.js';
+
+Vue.createApp({
+  data: () => ({
+      appSideMenuEntries: {}
+    }),
+  components: {
+    CoreNavigationCmpt,
+    CoreDashboard
+    /*,
+    "CoreFilterCmpt": CoreFilterCmpt,
+    "verticalsplit": verticalsplit,
+    "searchbar": searchbar*/
+  }
+}).mount('#main');

From 065dd1d081fee316681469d4339ae15e7089ac7b Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Mon, 17 Oct 2022 13:38:07 +0200
Subject: [PATCH 0019/1461] Added FHTW illustration image

---
 .../fh_technikum_wien_illustration_klein.png    | Bin 0 -> 72696 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 skin/images/fh_technikum_wien_illustration_klein.png

diff --git a/skin/images/fh_technikum_wien_illustration_klein.png b/skin/images/fh_technikum_wien_illustration_klein.png
new file mode 100644
index 0000000000000000000000000000000000000000..cd9c7d18f71ebea41a7e8fc753ec4e78d0368751
GIT binary patch
literal 72696
zcmeFYXH=6<+b<djz4zXGhtNCHdv8%%Xd=>k=n#<JktPT#ASx|EDN+*%ASxmty@P;s
z5ReWh{-5W4&R%Ejz0dpQoKHJhS-J1Iues)G^P8D#=1w&;(Iq8fA_4#ar22YV761S?
z7y!VsAi%?vh|#{}$NUlc>)j6m0Enso{;&Yg$`}9u+#^pba4^`|NYT~LN6gvH&&6E~
z>f?{01^|@Rp#ILTUhcshF76(lzA9V?9X(teo^C2!wlc;N#{Qb_k397v0^KbmOsrfZ
zyj&IBxYSfRl%a|k20re=&Kyu5Z{HwAs0!CVd=)X*e~ZPrIQ}6C_EO<e|Jxu3*w~Ci
z(=X7SLsm>e)Kx-4l0!~G3?wTpEh{0yAt@m#Aub^!4w4iF$tp@nD}v-W{{7*?v=-?0
zP|-q5=ihB%?o_xQ1qb^pii?MZg^7hpiTMS3h=UXq6vQPY#U&+0F%+Uf;l9DnP*L9?
z?*HPT<sRf3=;<Hq>F3Mwm!q?bUr4YD7e>;5so>-PAGW?h|27lGVB%0`e{qnQ#9x*E
zi_qBke^2V;^B?M<VC_&$EB}`Ff66$>D%{^)+`>J`FC@^_T|3m>H<<gs8gp~~PhJ0z
zK<|Gvb#oPW_jdQekOg4`1O2Bd|3`koenF4?{ug@u=kb5E@mJIgbaxK+3$*g{^ZqYK
znf(_R4oQ%hB!_^lr>~n|SdidfiT+)|UCTMxU4`qf*F-@Qq7pJzAUQ>8DMd*MVF^h^
z35kD^8e`(X%{kclzenun=J_!Eze8$ltf=oB6zuHl>aMS)!i5n^%+u3NQBGb~QqEmY
zN>t{dtF)+sytJ#Rvx|(3sGEeOl(eLbl)^(PnSbQM)YtNJ4f$)nzxDqWwr+l|7#{zz
zkfJ-tT~fx`-Az<dRz^ZpQbAf))Y)C(p{S&UyR(b5f*eT7<v-j^13fW4$JzUT<oZ`C
zHw;G?S2=mmLphMByo`jasEo9<o2ZM6i@d0;jEt+hq?EjZq?{ZVhnuV7L%%>DXH1-U
z`Z#;Ii~IX}aB=+K(rEg5`vn^NxnXQB^*@&DYigPW`aSgY#ykkJ(AD73*VdE;Dagu-
zN{WI0hCN0MjJkTBK^Py0|GOhux(EFG%G;CUpXgL{cKzEaRJdIKMuWQ>*T0KB|0ibt
z?<w>zwqcLlF--qAQSvXcAisyfVa|c>>K+)E{J%z_`2R}yAm`Bkz3BhF2>Jg|^naVx
z^^vo$hdTyg#ku|}BmNhQ{^b<$|EItHdG<fx)_;*>!0_+oe^3~6^B){{_r<Ud#Gtf)
zhixPPi?&{0OWg`uw);G+lXl|cZO_3=A|e~BIspO!flx}~v;`Vtzn+stSEDKEe6WR|
z@BXmyfy%Rn)Gq8-Fb69u8aSlSMCthY7CO0GvS1RgX})<8C7aykG5o-5@@w5`U277L
zkkuQrml{uqXoXH#6(>XR|8wv7=na9*-|~M5*ekif|Gs=e6rGU<vHnjrkPyuJUmUF7
zd>{NjmHsi=|1rcrG4=m%MEqJR?RC1_B-@HLzm&=O+!OMmeQEqI)uLn|=-QU6Ac5l(
z)3>27_u_s>Fz<LaD0%I^e>UQ^FQrF1b^lUL^s`*+!uJ@53cCr*yRL@q!l?(_m7imo
z8oKPmaPqcyJV$M!E9|C30l2K3g<)in`<np8SKY5=QZH}MXUrE+k5rOE&I(>{R_;WC
zGoHU-m!O$8L+enLYItK~zFdf0h&*}#DFLxm$49#&`;dK9+38>sWt<3#)gvQiEX0R~
z5z?t#nZ>@~p>>biHZt0^aetpz(9O?NOZKL>&DTb>v84k!8&~-<4tmE|`31tCMrv#M
zdy?0$C<rE;l4nl^3EuvxlUCF04;z)ItEarD^Zo6ciKj9dL6fU>zg4~-SXjnBkai3s
zuS6KNH_)w(EAzjzQD5k=Y^YtiEWH{Bhix%gMb(D1OvwC*@v=6Jw$m=Mj%pMhJ2z_H
z2@ASvK6t#axk0ubR^K6+`TWtiFE`W9W6;CXkh2eqHtx*dYAf_S%dTcCrWT-2uWTGY
zL|FLQt~13no>ppCL^f%KnCqxT>5>acL}<f>te{vf6ny%9Akb{v2_u;|p7(=GC7yyM
z_{j{Q@#W2<a;$RPa>LjP{hrMJM6b$VldNySw^Yl7%K^)tMgwem70L0samjK0TX&{F
zVcTeee_@o<UyQoMS;Q&|<@I7qh>u4CjPe3|o6Ilo2p~LgT6p-SciA__wA3-Yt-H)m
zttumhsv`hHP{~Jps7N#$Zn?po6HI^96`8+P<^c+L{DkvuV=0#1>yea`=$#WrtPJ2E
z(<#|bZ53h5NYm<Dl_x{f30ntiTX*EuJ*HJ7O|m!d{(;ikR17?Vee}Mo*)(xoa^fOF
ze<U8@b|(@VD1F7JbFl~@E|gSB*Z&k~q*dOl^@#8^uhIj2jKjn47k(E3!#aP~iqnF`
z@wOz=kd<UzBAmuIT*q_m1s4{I_T@E4iR3+N()ko9`3Jz4n_V*!R2%s6FEAgvXkrXo
zC#&_nu`*x14zl%GU9?_d5)g{kS~V=T+9mN$;I%Gw#vYBYwlb8MX{T+Y1ZxSuFW$tr
zf%G0f5+9j+s*%^q_$1NK%jicEPzexO-4xH8;BL`^O<hL|c4?81{(Y+qn9oj~S=(wI
z6tJrNr`1>Lm{v~+B}2Y9y7B@qL*TE10IZ0Ci!T=547dGw?`zbNe~LwRff?8XK=D4I
zkEE6#*NX+d0{4OYcpCuXxR1pGojEzR(g(l#6__pkVhd~STL%)o4Iy?Azq*J8fZ-P=
z{h7}vXDdIFbtTll?0w!Jblc5631={z{Ok0U@N|r=e@W>{yjTjXg1Arm8AsBnCK3Wj
z%elV9DUEOT(rx-A6ZW!!w`K5(0lUOe#foQibk4oa1jU)vkf8Vu33cd8SN+TRh4i2#
zb9qAVC;HQqG#2kg#}C#d80RSFPz9O;KV`j4&8C|RGH(uQB>s$4Kl+G>Rf=r=3-sXH
zzXP6X;({msAEzuE5|`@BdVT##DhP*GteKzkFS@FcI=aCm7b>_goR|-iAD4<8o&Kb(
zD;6Kl(8iXZGZ#N6aS_=<A05HDGIa8hyw)`m_L64cRzYx%E1G@gaL$cLH%aH`z^&=n
z?DQQd%8x1Yrs!;+O8D=n9BGA9t5KmLPxl>p`(?<6>_NWHfhoju+&^V;mb<x6YFhJ<
zZP`gQi+r%kOT<QH{|O;7bxZuGbFPSWICdLjE$60lZ-AO?XQSD2$w@dM+txHEGArwa
zm+Kt}88bZ{n-J`K|3M2&{z}c*9X(`gllA;|{oO=~72YjI^Iy1s$NiDq{CDv;h3~!B
zU&u^+%{vK`A6iyoN-+MTQjUDrJL8k(moPLHS{#+xOMDHQzVd?zok=^^9U#*$uB|q)
z>tdoFXP(?XdE#CLsqd2K7s$A2)w^Riq5R@4-|fU-wdNj$eXdh$fa~_4a>M~M87WWx
zYi=2A!C&mp-z*Vfa2QN&QO7^F^z7Xu()`+Ti1{Vp`qj!b2Sl3BIsZ^Ym8h02h?bEC
zZ-p5C!;6#8>8$GD3{IDj*@fgF${w6!&f3FgNj?|}tkdaaJC{3DUxq%Q5TSH?U>Nfr
zqa)PuB?eL^86*{d(F<=)jjHSDRwVi5aJ3#Vj(HR`+!yIXH27kD^9xXx!&@SaRN0Rs
zJvsv{!U&m)d6Z$PlP=4O-ggCt{rdwycl#d$C#f^=vd~qYu_B|`*$cSEdJYDh`pQ&u
z@iOW-UUJ>Oe-#w}N5QNVHlE-e))rER(s$mpsW%rX^XHeBbc1*hY*{>NIBT3rfW#<J
zfB+keJz2p8{^crvJN3L6x{y@u-DO^{vIJtwuPR#3p(=g7bO4A+COmNeU_OlJEs%`+
z_GKaP!>TPtxkm|qVX6=QPQtRs##7Fgwh`D}etRdriwFhsk;^%|{=R~);I!GtTR$O=
zH+;YnD`lg<pGCL{W=RR*Doiu(vw+{yv@Uz5eNb(6Y5c5=`(4ARx4dyNBoZ>QgP5ih
zv+Y>~T(g{$7n+4cNBe;Dg(7SJPBQ`Gvan{+#l0n?0+z6PWR(F)3a!W#;PO#p4_2Xo
z5s(aJQ3je$dI%s3{zx_FxsXmcrM$d-a`UbG7y2?DP|IHA8c6sD>h)v=tkS|-7-Nin
z*Qk%&u`IF2ZXwBs>jvyLYC}o<P~|yiO}A+5Iby?_ETcPin2JIp@RnYlybZRf8ujGS
zyZl-E`?>!}L?Vs@lc8aLy&<TkQ*Bx<ALe#B$Br-i6~ro!f376{1~=>`f#6bGCsy(P
z+n8wQ^aAR%t*!BtOoY#{718PUT7g$>;(d-Oa?Y<LfRP6a8GEJW_yh*&H?JjM66kVy
zrSnT{wKeo3dMt8&n9Gw*`<{0(0a+6Fkbwo>z8O6X*$YNSoop`;lcF9?G}PM}>EDzk
zS;yRfR?0K?YHkVb$I~xmamjET)8rs>&TkiQki(LmPP4ZsfAQzhz@-5kZ&lxK?u0Sk
znoS{KHj(QP;z~8A9Dnd0Y#hw!h(qVXbxPsSaLBZ5q|7NkVBT{Vw+DJR^dUQ!*ZL)a
zV)HECLH5cMRb0jppSJ^)=OrHrYGF(uI(ZsHzd!wttL&rsj9B)O={w#=?Y@Q;r@j93
zQ}_Ax88ZkAe{<JLv@@>+bjd}F`B?heUGHZaSNQltCP!YceL1=+J@Wv?khAw!@fIa5
z<lcrBnRTe~eb#l=kRfzhwUloj-9#jAU$Qy!pD(h*4sOb6KwsI6Zb}TCYfeR;aQBPU
z*>okq;ucC88V&X=F)IwkIv-fUrp%mbbPE!%Lm}XErGnp>zoQQ2;Q?bBE{ADp06U*q
zwmDjNn`jESG%%$`3gs>LUdqW@!oJ2eY}+`&z~+a9xLX93CvrQ2R`rSgDP|(DPC@Di
z{PyBgg%r7(I6c<X>gMZFZT8L-wnX~FF8|9i{U3vx5jgoUB?Qec6Qf=>h-lt#I@x;(
zkMtZD@{1wwdVn{d?%Pd~h_>R^>Z2@1JK!qw9ukDix-YZlGr1(ZD&-a{i>H;-mO45P
z+f=cm08p7i4wbB>{_Hj5@1hQl_VJlV(JDBGl7p5|x5fBsha%^>7JQ~}%()G&l|K$V
zp^LM$Q1R2_&GD^k-nVxjrBHkF-)6X#V|`{ZBOsjU7copGk*mHxt5{-P9}<S79;Z-t
zE^yd>!e7=uUAd(%BHD&;YD8}FGu{q1K^dJ{0REh7sMyli!qNyZ!86gnX{V8A7Uzhj
zmATeVk6~rJKRFtW`tzw8Hx)8bGUAtF?L6qL->(iH`z`35fYW_Ie6$)SV<YtqNgP&7
zLDT`U{-ISDF;B~%{SBBL>hkK2qA+ki)7t86*`v*Ll=3l&w?Z+U!uf-zwd%tsEoxh=
z=?_Zw&GT4%6PF4+4%=F|5Rkz4xKB851&kiH_MUmq1&dxx$55Yhs+d}+(8*&P3i8)n
zB7;7WB8%d_97S(GHo2dtx*pnd|1vgKd2_E!b?)`fG?tn$znR+7`cOl~K-FF7_1F2N
zilX_o_n0+^IK@dJgf)}C&K#;S&t#f+p_P~a+P#=#A$yOJ&P+r$9pu?wacWB23OJ9s
zjN|`h>oQh=pH-H;*YXXk;lUhh)Gha~7x`p1!m>6da9Q+-C1Zj_{O7&*F=mRgB;qly
z2rXBBqbmHh6TuPZz)(@gbFp5$-(hBLCq*EJTE@Xu4|n`BS&tx*ka!LEXqA}I4KuyR
zHm>UR+yx)g;JTk47`9wmTEy!JjeUM0Oz;0z^-@PIVqmDyTn{ztEVV4K+={%9mA)g?
zAgIBZH5lUrVK<7C>l+zdKxPNn*LwZBBAqoz`_5Fq3qUc)u^vU0P{X74=h^eeuxR80
z3AIJuheNYEY1M?uA^PCI!wdf}QIsOfx!cxNMSM0S_Z*<Cu56l-7@5ep6(nin$ChqQ
zcYtTotF$K!58h!1(^|j8|3&}Y?SZ?X4O@(JCEcK+=fU<Vj}5K^_O;X2nK8oZapTDh
ztKmJ>+${0Fky93L&0xmDBoXA<9Z_d-5s0Yv(;xki?7@MVgT4cUBsqrgykB#I8ocuw
z#Hm&)fuAWM7Bfvzx^5vBbr~(Li`jToV+F4zyi~tucU#1#>LQ*JLfnupd7s~Foy#J(
zXPz^Ci(#0vbWA%Kr7}X7zb;~KU)1|OyR1NT)fLK+I+3M-H3z!6lOTE<t7<CVfA&Z<
z#)Pfc;;!THb+f^HtCzhIiHlTqR|0g2g9y+si1+btjiL=@ylcK_WGF8`gm5ahW`wKG
z_nO*9<`n$y&;>@I$W^I1^UeVAnW|2Qq{=REEO9VSc)TV<^axuOcW%|lq#}R(h(tU%
z%r!7r#YSO+YAzCvQ=Op>uKvJW_&Rf-YF~m#^N6I!sdX*PSLg9s#C3)Y*|g*@n1c3z
z!D*%CO?%VV&zg2WUUF*{rWiw9CT1=}Cn)Qz`S|+@m1=rMex9yVy|+5EIbSS$GWd|#
z$R-qJ@y8Zo_pMX-`P)DIAi^*C0ZZwGUo=EyA_(%gHj#OqWDlr5clX|G0T<!2E}BMd
zI;$QJbwvbOlX=7Zs=jjsuX^woQK%ZJBY*Qul3P4^^VZC{{zWT}aI0E7t+?bMWUf&7
z=+zmu^2)-}?_GMj-yis$`gx88j9Rkr7t24}Coe4BX^dnBI!XVU8vXdL1+0L2%!_)E
zML#Eni11T%yl3m4`qlcL6jKa)JpJz*#DmA|-Y1>+6~#J>MbTsRAECe|K>ka+@l8|G
zQ{Q;{@6n*}X|<a>S{hmXUg8ax<p<xrQ-Hq)WF=ZZZujnX>BFp*C|>2ikV<a|B>_Il
zft(h)$-Ln{_NUlWmJ1T^X^by_Wcg5@@4lV6UTTZp-N<vVP-MUl9SHMR7XEzihW4~b
z1l^%@Ow0y0eXBeh%?49=TD3X&u_BhCi=3Cd2WU78m)L@t+-wGB{pS1M{?Sg@lQ_6c
z_-kqFz3b(zW1XZjd$QW2`K}%_1kIfLjY{+qBUHhWp$AZw#9yBdS3FXltl-Gp!Qt|L
zLd$snpiefK7j-Gf=jc~?2(VAnzY75q1=Gf4*~*xVuby~5h5DqakcahIG=ipgL=QFt
ziAI{dESxqV`t;z{Ly2Kf8MgR~{KNMJbJ1OC8tc=a<$L7bFn*Mi6}dL`{l4gk{hE*V
zWfx-y|EOrjQF7JBEM;ApJvlk_)$sVS*5%il=tFCGz|9p1)lQzjYWQO4n|E}ggkS`q
z*2vCTfX}%D68Mpt&xspO6T@>#^_^d^v&FA(WHTCS2^VOdaDZkK(K?=BjPTjv4f&(<
zXw`4>ck0Wm(<VDn*OKM&dzO=O34df#JL3GR$)WTYkBOMY4&6>|MHbpaMbG@Y;($4P
zf;I=(ZfXhig*G@lCTSj&ouz63B_SiU&aaE0I|fJP2K|bi!>kx<Yk_QM!M=X5dzmY>
z$T|}~OWEa#zDPk@u!^AtyYC=cRIZNS!Rvm3)xf>Fhr1S{v%tLX6?9XgFQkr#x7c4<
zj(+}B&wca50((+@vS80v$#n4L+l$TFvclxRaHa_QtJ<Fz=NobF-K-^$Q*fU}SW@6f
zm~z5qRY$wPdxcZ;+n|we(T6$+wI^!>lHNPbIBJ#0AgqoOuHiA_A-YzLC)OH%gp(FV
zBuUN%8XoB?d!}O^RAku2bNn|{wc`=nzBd}Z?pwg}4_Sj_$@z$d;Xv=FSNtqQtMMB`
zj>W%HGGa#cJtjx=Uq&X;7L$CipzLN;3nO=V+g|}cbE?E&j*$;MbCmzJt8{b)XPHxT
zNEn)=g|2{E@skD-(r4J)sZ(^|g7@TPPzB0lhI1>$ZW_bS4_)<pgN=}%OYjSUt&_@E
zv%xR$ubcI?ADN=wTrG~~Rw<s6t}BquF@0?1y8lY_BTNI<TqnT3zB4V-eD-uFELD~*
zk92SHb6MQbgox4fq5&sm6n6H-4Gm@~esn#Nb)r&nq<8rt|AZ9HoZursfLRK^+eOhl
zUa<dNoLmLgQ%CL_R$N%gzN2+q1{cVKgT}+>EbM|GQ%_P5<=&n`H{Vl|F`N^2o-g1;
z;hwJvot|H0;|uBuK;zXw(J@bBO0y?YVqb*>E?M{U(KM_^zHY%^hNQ<1QZLUwc~Qx2
zN1NSS{ecgx<RUX$FYmuQIDQ}uG9TJo73(ARVzhIG1#!qeE!R*FwOQ5<W$Wf|g$%82
z^E{0yj`;1cKltq}`5GK&-;4!KEmGf3%p5j?KKLOro2W{`*Yw;WJK%Y4r0qKd!K39~
zV3RL_O^)|Rs+XT>+|n9;egAId)Zy!$HZ(=_%Od1{f|Xw~U-mKYv{D53_3mz>T=JZY
z^#NsZ$~s}Cl4VDj>+b?3c99omFY8l_qj#9T2zENy&A{RZgM^iPc9X2LT@R0yNJrGd
zCo>D6^=<ScsR~$MShe<hc`!k>DQfcsvhK2h__4PQRMx+tJ!d8(Yr{T}7}2XJ0#pnL
zdd8#>_D^|cxu3Z7?w%;nW-o!J!M8F{xrJ1f@oxi&){QXBB|512BB`nGmD$fnBAYHz
z0CBu8i09L`h^qBKqup<=q6{6A%0%2d^)z0B{jY2X{I8X}M532y@;@s-J3E5fqg*42
z`S|G}k-bjUri}R@R0%9~E0u=0KjB=ZII9oaXpk7a4Sl>WE0ZbfXt#Fe8_QzgBHju0
z$*9H}N65Ko&K3HFxNgeERr%WCc2wGj{3rwy7$Rs`>pophbW(L7&DvXzXFeQ3J;<wU
zNqLh1<TY>3Or2jvP?z^GA!PVSI$XJARii_37qz3?8<Hh1A^>yK!-LG@N}#tfFAaQu
zZ-$bU*D`@<=AtuugMP@KhcEI*JDNuOPtHF)GB@h<efcS<MEA-`e9RUD*+jJ(aJm&j
z7ZI7hS)@jUN+PL$HrmlXwij<PtS0ELM70tTv0J%y&;vKWuCD!FK~GiQ>slCDMB1OY
zBfopkUucnc6Hz4F*RdCU=+?~pq?oPqT)dZhT>MZgR;4gl+Q5;lAH4$genHMhc8APg
zudWl!r>TY-j|vM;24SN0%iGun_P(m4KyO!I%fc+NTCMK#!l}|Yg7&<<5t+EoPIL7A
z^E8p6>Ysj|O;Y6G7@`2G8$)a(^Udha$>Cr&3ajJ8%GogD-GythR-=JqXAF&?Tf1&o
zI;0h+7Vm!E4`59asV9dSrBJPi9QRDfpJ^K*oKvBpmsQ4E<QBy1u1iAZf9`drGG_B;
zR|-}^@Xesgd6(A|i(lvU)aiT&4tDxfK0e(PEPqMhG-g6nSYz?!*gnhfjy<6d+h@#7
zmAo}~Bq+Qsb8Z|VQ{dmJ@x*u35N2H($A%(T5q;fSdc<`mS5~-M59N=+<Fi<%U+&sE
zRyAr8LlMt0f}{U*(!ZB8nO#^<@<Q4`bHj;DS(H}vH;^Yo*0$NpLq8QoQcIG3boXC{
zSv<A3J~dY!Vok8-_Cw>X30vI68drpOeJpO^fMt;l_CF{&t>KRNfby&1+SNUyg4GD>
z*_PkBakPAyWu|U;D^GZmeRzD$@#MjgvT}EiafKuq+M=QFP$QBA7b~1a93XWh7Ry)Y
zUDsed!W~$lYT&nkOEjOUvgMf6xQBObv=CR(*idHG-i&&H`$Hf8*x4HB285HPXz@fo
zTxH{lv8G`)5bV_EVQ#QyK-!Nr5#THMpgBZNnbP|Nc2hHl_<@amBi>?IcCge>tkC&`
z{?b?TzFSYk5aH6%8y^%@0n}3<@GE(?eE9HDlni#Zd$(OAQTFByRQcHcRjc_MKH=<7
zL|!;A9dW`hF4e-m-YF4_TO=ps{Ju~J^gQLy0(rJxD5jXEPXkxgmv<=cxDj<=Vr+<0
z>PR{?H8z#q1HDBNR`i)?ZT3y|7qhM6I~{Yro5G0#tRGR1w_VCCr}`mZBKOC_L;7rS
z+=72>-3tx|o$5B(rbP4pNt|XY1|VLdbAlIxkWv)yai%op@#b^$N<^OaDt)kOJ8Ey5
z&E9HF`EajbpiZCHib;x{fxOfHFfirjaP?2yvI|Y@z`JH%+zGK<gNfKi_Q6XhZA_~7
zUV5cyKtktoC(Ab1(^%$n0T&!}U*^<$4)E0Q(b}>3b`U;X938{Rf`ecm(@Tj*6454|
zjBDHTfoc%t(rj~pNI)`CsIhAsNW#peI)y*p>t3sd{j=0Lj(u-6M|GR_<kYqvte!~b
zaSa$RCcC>HBjogT)4(Y2N{QxG1)8W+Z<urS8%cxKJlT9)r@XsOE1Pca)O+nl?HWaJ
z`RPF_&JI14ZASa49Dh8-uqudy42Legm^-*AMfh+v9O&Xc9zDDxxL7bBwNiWPu9$Y$
z3YFX5NcrUR`FG{hZh9X%soVBQd6B5+a|C?q8JN6O0F|cTkB7o>?o{a<Ms%<p-i?*8
zmHq2*^S<MkiaYPGZ%lgheP}+72Hy;S(RN*^R=C&SdO7MTBmP}Ny!q8v^X;azgAi@(
zRO6#0>1<M28yDful^G_#*Lc+}zkm3WtA7QuX|=O@5wXR!CC_s=^*77iziSq;3>!6`
zS_n1$0k%yC)i!q2oVEzf`8(F{SyV&@JBF>9@7slsZtHhB6nLF?O=i<Y?-Q<Xy~>C=
z&tkL6iD*v4*~y01^aS}jIOpLaBiHR?oM9G`L;M<1lu+%6fLM|v(&ayr;Zz9F;R=Up
zIb|Qm2B1d$npgb2DzylY<SBP0ceqM3%aTgGntIiv36PzOU<>dg{wiClm$jCYZ%}=;
zYQue)bwdYGo@BKE=4!rMOg2JWCVWn;H5~e;21i(JtmM?SI^qLh<Z0M(vL-7kg7?r1
z4M`bvyK4Co$4DWCGx7%pnTW8-NLJ+F!^Z!zjna&(*CHwW#6brU-0!EdC2n~9@tmQ<
zaF^dj91{DTjH0x<Kb$v4ZevIYRf=doN|nXgX-4{4S3P;FNlq{sG@Wv*RIMGNnc~3n
zr&p*^C6(bhY9sYYFc%x%{+DYb)7Q;Jq7EUA1d~hfryh-CH{mL1eOPqPe!@9WLJu9U
zp_KAztvrN_ZDhGn%c>E3pTb^zbw+@o-(Xpj=A$lQSuKd4#S4=lDTF0$a{GCeo-mT{
z@*!9g*TA@a)z2P>@uI0=;dykL^Ca_JF7e-eD9EQ~L-#uG5!z5Q#V`YQ0SMkFM1ees
z6M181k2mmhSBCqzQ!Z$j66`ql@rMl$u76KHZy>OlYZAwXH4DjtAq5j4pDbR=@OeNK
zAlSVfS$eoCM-v(PJY&!Cp$qqpve_!t@|Ue3?DCTl)ONvvt6lw|En>-w<l^K*-fi=V
zxPu5+sYMkwR;@?3P9);|GLZz|s7oMv346}xc?$P*MIwJ`3Ao@qtUas8QnNuQL-r$>
z3H~%s-CLhEQZ`F86gx{nhP2l5xcL6@(QzcFBh>Fj*t>d>=RulVtz^pPru~2XE#W@4
z-G{@2S{E83H_uBhV_h$wB5*^^iZkRu`G*~aQ>Owkjt!`v0S}S&P13JB7~#To=$~~N
zHG*XlpQj0G+xgbC@AMvM1v(iM7&2w`x?T`nFJ4oRFw1?A_gJ&&8E^^N8>RUZvW)xN
zq*D)8og?G+wAy`#H1O25a!MGQq2tnbw1Bwu4vV_MH^Z63rG9b+_pz9{Ix0N5%99zr
zIHeGVr}in&)<Bu#2gO?NW(#>p`(ER4zlohHT#h`Ew>jA0R1F+DtUU4dY&^v7eP;l7
zOi;m+<6$(kgB2XSQDCUW;$L<6>7jL9dH**xKfoz*8VI#o4W?YewZX}CnZ-fMr{u@C
z>IdJuCOsle5uU;)v|+1{aG&fEerwH`4BXUUfmxd!<WG~j2>OH2;ykyn73bnkbzs&@
z6-n~?FqN_BXhI3~SJbO?nC%E0m)Gs^%~U;$y8UXFyBuDY{Q1zI#A`{&@lz@jKnqOX
zK!UVi71~5{uf$q-9Km_TOBK|S1DP0j;p?$<GEYg>Q5Cjw&!}*K7_Ul_IBt$ttcW)z
z=$@g-jKGv-N0NE5gi)eAPkzhbJ6(=)Ts&e$x3L+w@d+T|q!iftkBq?PqE`-q)<wy?
zn+5sf-X^tr{d;=`5uB(?UcS8%ceplFHZ6r3-Pd~&EVV;)X;2eshPSmQk_tEsywkSm
z^Bgi7L|0u>q=FzYfnx?jdlsgW3z>MiuaG_<X)M&6spTyyjpc%0_i9lz!8jis?5_`N
z#$ldOBbWySG@|PzouL%aOI$A0<89N0u;%?BO*`g$-egRfGL$BhqAi26b#rEKII#-3
zMDfbe784(f;}()8a>&Pv-*n_bWPZ$9e>}B>HNV60@?!x$qVi9Ow0uKo=(f(WY?K1j
z7KuA&Ijp7QdBk<-nJQPM|JznQN`ZSrh9ZqDm0Y7NaT;q?47Ej}25bt^hBrOcYeiVm
z7h~I}PP{a&iqO&Q#Hv*vs7}4H==@$rdi3)+5n|5fmD;LNreW+tPyXp~bD_@fE)H-{
zZbe^!Sq)c|+@UerwK&cxl@z(z`s=s>$;rq9%<Wi8MoUqgxlF9CQ@p1l+#y8?%|QwV
zAJKa!gvi@a?u&6TmV1KGq$O>5t6a-`&vrlAJ3T0q1N=cVKaIv68OmF+<^+#mJE1>n
z?OZMbVa>J=Czg307#9A1W(1FTg-vJc{C0Lna+)!FR5~RACz6{KwY^=y#YWk#E6d+T
zTKuHA0<}7TYlp*2`x0(-Q^o|+SE(<Ey`>guN1&LpKBT8Scheu{d944<)i9Op0&TJk
zO67;QU$QNmq%c2Wd+|{C>J=yWgFSNR3rWH>;aq}Gx^%pT%t!9YjT6&NkLk+O`+*}C
z6R`P3T;-n!w5Z2UPJ|;tux83{wx>+XrVbQ!oh1ueWrP9Bhw|tmp4-|I5eXwSeq4US
zv@~}^{5jF#nFZq*(4PZMkE6Q+Prgf@YYW?>5<yr1w_fgqXLZHx!1spBUM)Q6;^uV}
zK98Ml!A<dU3%tZPARdg+g3HnxQS9O(<ZOa`coEohAZ0vd+<-SmVq%^$5{`*iqa~+a
zA#E84U*0B%CMv>0gbv-&BOGM8*=N8)jd{-E)K%qO_4DEpQ78H<eWN~$8eqKfI8+%J
zpfc7>u?d`dN7GYJk5j8%qDNesm00{Vl`vH~-sf=xYI`j`ZikcYGt&WQGj4lA(y21P
z?80=53VxZ!iZ!7;$0IwK^|h)(kY2h22<4gTNL8nth)O*jojKk#ft1z~a%Isn@$+}F
z;gJ|n)zyH^y9wtA97SCm^^Uc?xoU}Z)1Yr2P5S&0J9=UY|22T;Rprgn4TRT-yqsao
zPg18yuvi#z9y(D*IZ&K&ZN%+Y7M5LW>%y6`nt2G7T!vO#<n#N;z?U*iAd=}gE_0L=
z#TNk$2jzQg*Wh;c{CUNCT|>;Ka%7z=4A(}mj4TQ_@ka#>u~!@f2mOi))tmQr`r9U&
znYXZ%A|N6{;kcjgIc4ML6jO~|Vr7yeR`0kg?;`*XY?wn8FN(y404<U#u3lE!+Vz^S
z@Yjp?UR(FL2VA*_1fkBab}4esxSLxE4~0_XzLa|d<TS78&Y#m9FWfhXofJULQcN?u
zlr5XlD6OP&+M25nBQRSqAE|8b&Bupz+{CXpIanFO3Uq^8-Qa2t%3B_vooQNNim+4C
zW#g3kF%{-G!aeDfAsEoiyZo~%(7tqr;zq-OFvf7iFg7JYQl4q`UR5eZY1I)J#w%x=
zQY;2yeMRR~hw*6ehu2(2l>M&nybY!B<`}S!toVkL+UVM_S068<BEDI2PzX;{d~3*m
zEZ%=X*<*K$;6*+5{gv}|tQ!<e*<D$Lvm<LHw3I_InF&^D*Yf8cvrmb|l1pu?QP-Z1
zFD?#0mcg1^_2HV9*N2zqiryp<#^i6LDLK#^3d5{p>(`f<FUQGUJYMF4(-fJe^=&lC
zG`;geAwy=$Y-qO~teG|05gmX0!`<|!kmhqo+o{*ZQ9cR7dZB0@Z;^6xS!_Ih4Ft9!
z6FuN;C9`iB`jtKpzrCKo<_wIP6+H(VpI_p^CY<O#iszpzPl7gag#AMEwP31GyJN}a
zja>p#A?vc>4y>Acon-e`=_!`(&D-<oye-GzqYYX3A;F;<#nR`xGqH$nJa4#UMAhVH
z1ot00Wtf}DA}&g(wFe6=94Dt~1iaJ_kUNY-`@s=G4l1?ka9P+iEdpP5d)~ojqUuHJ
zs316QRgA^+77yhee)gcVJVe}dmtfxY71+;yJBRKxzqTo>eTm6Gtt`e<{s(2<czhVQ
zY~_~k4@|nj3<@y$0+F_v!WPM?sK0~shPbM%(0G!NnJcn0@VZn6*N4ZA67#(NLRFIl
zHBsRLpGM2J1of=N87YcnZf?BY)j&0_$5k4Wzx-vP%>ag-g7S17iiCO}!em6>W8INW
zgWHX{ySTt%KzgFZ=L4IJ-mUVw{sd!U6x;}UP7Tv9EitXYO-|oWWAm15K+3t~;KURJ
ztRB}=qGb4sGR(&XGgTA~=s0i|tFI%lu`Ef_t_vk~as6%s&g>B;(|nH)uSRcBtjmXv
z=shDp5{QZQEy(OU2Goso=@HuWoxN@X#^vhSY3`;iq0Euclwk>VW=Gq~YKL&MIpv!v
z?CX7Hf}>z<c)R?ELV`(mBt=TJF<jA%l6c3EqQca=0zV)xC2z&w__-t?zs3|RfhR_I
z)oOVkk2{P556E65Pv~OlUGtl^;74-RZz^hp`E}{ITc9j@3PkxU2v)$pXBDeB(a6u^
zWys>X?mjIn)LfLG*n(3#ABulyA-G7ylE9Er%@CV-&TFIoClNxbxhqiHH{dEbGs)=f
z@C>;DOn2)**u|GnoDmhCBJqgRuH@-zA8%*8WFE4v|3Xyti2nMBJMdX`yqPY%o2(Oe
z5cOCWz8z!y(^Hpa_?9B|X56hHbSc30q5deX9{oL$cc+NSrD>a0g55SayM$wl6V~8V
z39daa^X1f!M_oMN<|Tvl<3jNB3sqFEkV5&>QBo9B&bM&!!|_Xx#>_N$If$hc^-+Gn
z?76LDbYrA8oDM6NCdw#Fsf7eei0+9Z$JJ7U*il{)X3_>w$l9}KGUV*<SQei+h_@M`
zCpZ_t#C<stN!IE3gn#1Yf1FC{yxXHI$J<XX=D)8<Y+sXtiyTXXH1mLeR4hn~duI`%
za3D(hk@qrs7bEB1#<)jOtOlSRaOCtK00OAVp8KmcPn~1H*dU~}K8#vqiyhxP`vWzd
zy?55st9qtykt|09hXTKBykjHS$9yQx*1|e3axsel%wCic5DHURyvqz0ZFY1>4MQIc
zI@9^~na``~h&E6|!e+#)MsyK3Uzy?Nzdhc_6+5JLm30$!N<TlA^VSXGJ5)&%7?g89
z9qsThE6ujh8djw~zj$mPW*3~8Pj`mQmpFSRyt%-|C7fI5o4c}eXLqSesyiGjeCWJ8
z5h8o&Y9s<Qb^Ew;r#fBeQfm=Sz6N?`l8f1ovk`t5Q^He9VqRp`wv(Gi!6{Ba+Bjr+
zez9j7jlPV5!WMCB*&@;|wvN*+2G4rM?sV78aQsXM%h4l8)if(?bgP@&o7IY8ePivF
zptn()mpAu2e>tTs6_lJvJk=&v#<|vxA<wExfh;he^sP-Ff8eUV$aP`ck`1~yxvupf
zS)JynGpS}0Z*uQVJ=w>i_OdrJ-iE*D(Pxk_7GaTtoqXumhszQ)^saeO-}LrBg9l%%
zydzHp&z_K7`~K~!57*AtnXW~;a>f@=aM|=LY!Ks$hpRope8U~)JUOZiemsGi!yW<c
zWyyzS1%t1?sGK_PZUwTLR)qe^y$P631%VB^r5uHImW?+{-;BuSWS>zf4;&vUL5a2X
za`~^Wh02q`tb~)v@qRT9RblsV6&TXS!A5y)SgWL5-B<{jL%Edvs-FexzJTV1>(Y2}
ze1xXX*Ti#a|N9?}5K3vFCY;^jx8+ODz{|NWAvN{GR?EjoX8{|c?quL|v29{Pn_DlP
z6EvF_2VHp2a~E~-iJ4JqLYrvzFQr(_SKXwm1&rQFd#s^YNmK}nvG)}3<HIS6oMk?-
zJSKK?ilCgVKa0eg8WI|NCZ(~a(A;A6VdCxUCkju95d054S5%qKozNx}Bd>SbiO$K%
zC=rVBI>}sn<N@;j_wvv_zitQC@)Al`(WADl2-Gu@013wvenW4^H^^XWbe&OI#r_CT
zB?q!j1)oU$sY)TPVG5+@o!DThTeKgwfEC<r^fZ259)Z?$RylCTgI~tf?WR7pRmP37
z_D>R-Xe-SNO5842GBj@|7&qH_my*kAOo1qZnBFgtWMZb~o}*C3vlneMU&Stw7p-;B
z9z7jRn`V|5q3!@gCSs0;>cdWX_{QWOI;J!XXk9iKz^w0{C#lMn-?#T(bU#gC$ehmY
zy$ax=?9lVhB#ba2D9?j3QD<Dig?4pBQoHkK2d;62QQPV>Nym?UrY@CfJUv*L9(ovs
zwhjbc2tYUlf8vwnU5gy@teO}>5Bh(GQMQoVox9{f>d8=wbaPr6=tUCV%AWwJ-YQj@
z5WjKE5nq{*hj40-MijRA@BKES5Pb^q;grTz3bI!9D7<q!AnLQz1}8Goc)%rHYr8wK
zGEL6p1Gia}{UK$FI(YBY9fezK2>;Fe%>CvQQHZB74xDAR@98VO8k=~sraDl+Nh5(x
zy%Amwhl!!jFvqH_{>YDsaoE>WT-0OE%sKXAv4gaRT~ZX4Y?~No>}?A!os1}j3vtTY
z&-n;^bz^sVcI|T0L!sqwjudt6LxRn%tnlm<Pb&PiVtLJYBbRRaP0SH4t6?8R9GS_Y
zpKd%E(lN2LO48KjV026V;)G<EacT<3OMp)zJuZ{CrC=iIIYqjAcJ~a@i0h#T93Bs0
zEm1H#)Ty5p(?Qtccq#bjEk|<wG1?<ffEsu%GZAW$6WS;kX<p1Q6YiD~970+CxKyF}
z-qr~FD;6;GZa}D0YiW;oq-P*Lg{dm==Rd)arLSl149)GUw_k;d<^tf;;Z3<WO&cBv
z=SM=Y32NrL73k4YdG8g7oT(ivrVv^BxnP>_kK?jql|nJad~VE+_rgnhTGaMX_#D3-
z92S>4TAV|QI^&7;FG|3mySj3mkF8(tv$)8y8jfyp%oZB;Vk&Ez!y+~6-AXo<E*5hU
zfz9G>DG#-%5lj_pe&QZHkhv})zVUTWI*&>Gc{s+OJGiUvR28W7$x4d5{E{EE)UnP9
zrxD9i6x8cO#~oBleEpOUChQXdj5nX!|I9{^4dPzetYOW)JMkKi86mXE+b)Yc=WcOz
z_UT7GuH2p{Kev1AtC^b4am!&?#3oMftq<RxQ(_o=!$dr9o(Jh-f(px8-BoV?AP3z)
z45Sf9Q3H@tC1LOBAyh#HPe~rzW$99*4DPajzXFlT+ppf6dF_*I<z3A(_n6P|h4@qG
zhbN?y1SvyEPKx9&2M@aC#S`0j^S_y%eoX=kG0!{k71ff1^;&Vfh(%C}6vdungADU$
z3&t!nOw-c(@Ip>s+zqZ<V8*w)+ocRKs!dET?{rXsY>D^Wv#Guvd(Q4w)8DuW|Gp#h
z)dWAdS#teK7*XA+Spjn`W)%Qo*O~@$pIu1?kV|mav2}`2XBX}m;|brux7Ynsj!L8%
z=Qw=|#BrMjgZJ-;HKSRlKXt$M#mud;32ZbMjMXxYc1HG#0T}~qHO$;T`l9NQaf7$2
zXcv*0E@EOlUwjpk>fIA@U)Y5G>suyS)WNVoii0|LJR$`&trQ)UmO<P5TAG-HO}(8w
zazwmJ_Ey<oIBNZgF8p%k`E*A-dqTcy5y=Ai8TRKM&P9Hg7%5Py9B>JF<b5l0q(768
zOsBIS2{G*}(ojx4=R&vIVV1S~N5~qE#XP>*CD*Ik9Xp1P2fXrx$=Lwiw`zuIGu1D*
zaZ$gIzHzC!3X8;_^Z7rhO(;>cDS;HcdIs#IJ1UjV6~E7nW4PCNMX|ip6g}@q)ri6(
z(@+2Ggjkq9vB5E1-)T00kY#<8>Cl3kV43tiUPZjUB8FFuxtZk7Au|Dvd8k^>KZDc&
z{b&`|IXwrG08?>7y0_&~Uz3)h5Alh!j7Byl-+rxZqFK}UUQHqOUJ+&+x!=++=t`C-
zFOffx`{P(1xdBnIxPGS<Xlg>=$#SlH^XkD_hMzvVn{hY3m?%SI7jQBng2il1Z)qt`
zFsUQ|Vx1YMr>IM|Cl1)Vzv`h0k-PiI)j-w$0B!tJtLlKjX1pVJz?B+8ue}R2`ikyG
ze)`mxbbcQkH+cH{YsWG1SeQ{&x`!Yn5@mJYJzS!}gP&IX_c%1HB4c+gbol}7iAB&r
zavEf!@>FsvDMt@@G!G|UL}p_1tt5`xxpL)v_QJK15ySFTmnp4cMx^z?`)V=aftei^
zj%;NQhU$v=%;R|kFs4hhC^?b}Tj#BudFpdHw&pBSRw;4NC9uVIQ;8h<?o1&E=PR??
zr?sgD0cy$97MPTPNpHgFA*_EcPKvjM;)s8_ii1uT<K%DV6i)X#ab2pHy(m0#I*w$g
zRK9oYoC}nH*mxoDVA5h=tK>w$t4b6_G5sK|G+xTTuFR2Igi`R2nW0G1Iic)EBMRr$
znJhT>^JeN}LwT$K*~NO=j%67wxFq&0^EP`Xp-t=ysmuwwz>K%HKuZM9h62i3;M;&j
z`c-;AJapI<PH;!DoJNJZ#5=@8>!onQ`XoRK3@&*u*wd5;7Zs2SC1Ls(7s&>lOmp`$
zO{dy<j`z2yL=@V^P7%R-4penEu5E(;a5O4V`Gfuolp{18Fc)Z?+;-3Sg2*fV*jN55
z5`knuNi{vU@arPbT}|EMm3I!?`sll+4enqh!8RE#O9&KjFfztuy6m{v(Ax{K(l|`4
zJk!*XWvpZwv>^32P7$x4dzgOxwEWonOQ^@<x+)J?Y@Fq_GXbA{hl}7P6yp6*(0TED
z0tK;@CmuQzsl9T@JA4xWA4-7#+<`#sQUj(tISFh&5w;!-jD4NMnR=?hhRIF1_ms|w
zQ`Swor&Zts=QK0$eUh!GE8zy-{K`Gm`VxhZgo6t`Iak7y)8a%?j<?r#E)#^463frG
zu8hG8ALF9dns2G<e7A8s?=P^8+;JaW$&e*iO_Nc7;CW6!g^FM*Rr`ud=lu52UZmOS
z9%jq#G!e1@<E~-1J$aYoQoy%$mU1qeWfDz?-sG`q;V?b$M~BH0ubwdmNDlFKTP2+U
zyz!0{N|fVW9is_XSMXrgi$iS0QI!2LP0?TOZ*}rsRGBelaaW%!m(LffN7)|w<gI{)
z*A17vIxG|?WDCbNQr^dB|5Q7XG}2V8IiDNQ+ySF|{Bx$X*MTz4KI~L=E-YVuwk53v
zkfD71;V8PPem0~qj<_aBu({dH@q7g382Nmwz2H-Sk0CL73mKWi4R2-Wi#BIT>JsAz
zGFN+b0VCUQ)mOJIVq2cbgA&#_$<${7wK)6v6E>T`aqam9%<ivHe(cnvlpCo4X)?GH
z)2p5`t#H*A#tsUXhkP<hspnF0c#WpDWgQtmyH&~)vwJNH+q=Uw;ef?L)ZO=G+PM_W
zR04C-d6E*TeVX^?`lB%4Z!Hd;FI!n;_@Uan`3i;1#r|ScU#URCRrk3X=tb;+IJGBT
zZ{&_&DG`d3B;VUD(~n$by+D4LSAO|42CtT>#?W{O`6cLU3{J-v!J$x`&}0T7hGK$G
z)W~QqUy5hxz_CTrfG}<Nv$+FICW6&VUqH5(s@MlH3!35fWNEoExX%PmmD2io^oB0C
zi43ANc=@7Bg&&-+$EYC@{;A8M0u`@w>`&YZ>ATYg@7cVWn{<LrXh+L<KOz0yino_m
zjj^H-)DR7LECl&Yf<unogWo+L(laH7x)eq~N+o>jX~lgIf+OtoRSiE1mn;8VI?GtQ
zM7g?ugH^q(fU;EMn(Um14y%yR=3SBcbkYt@iaJG4!MU;x`}ccr3prO^)Z6KF@)R|~
zZjykYg`Zp6Q9D0w@z?c#TTm;A?PWnGW^F4`ijcQM74XMR=G&9RF!vCbQm{E7nNw^4
zMRVY(ETA|^fD&q`Y_R3WjxFR(CGWU%VERao8mpiB1S*#`Om4gv(7i0}trvwDA#_V!
zQwredn{)*))v!v5Lv^t&5s83Z{ZLS0aCwo!u&HW13t^c6^}wFx+=$*+SQ|-X`*02z
zb1vXXMNvCw-mtKjRc{EamS5<iKPyt!dPs$OU%$99|GJUbC4W~?fuvS@e1qfp0tT@U
zE>sH?kXwf~1w~h*ny_Z()s5g`sR%vzwwxsFt7jG;q$X_v7e8%Uq)J^d?~41kMzAPZ
zK|sBCdWr355l*eAbRJC;u$V&P+l{M;$x9g$29ftg)if7(V)@UZ4|9k!m^V45?~m<+
zCEMSpL?<R$67Mp8kpklkeR6yz=u+O<*7&BjmJ3{M@Zk9p>q`Ol+T6t4pGUJ0^4&M@
zg%_b@{Zx|h%E9+w>{1@_0HC(n_x{t6so7^qaxSGc?V)IAFFwE=N9N#SoTlF5`}6Kb
zB+j)X8e5=7F)cF3MmGC?UvmRHPVJ9ux+*i0{-dcDF8yM}$qo+7<S&OEVw585Do{UT
zZ-DV06T*QfbRb^mt-hgA%D1QI1au404E$aVcHViUlO6D<o~|iN%ZcBKnF;9n0RvZ@
zCi&I$cX+D!pblKr=MiQ=C;968K;(cOZ#Tj9(9K(ZgFxk+5f|oXSDf9VM-C#+FGNw;
z4;Z4=GWrLvG?iNvaSVf{Bc=-iI97#H0?w<wHG*D@bd!uztRFOD#R%6LvWd?&sMSo`
zyeFL$xTfl4>R)W~IvoF*$G<Ax^lqDG))3A_Xv2-gE{4yf!enR`8qZKRvv|l<)uVn*
zt9$tk(UoFrSeDY|n0zr?EZl~-Db`5>h7;k`9yu)GxLEKRClniSvN>@YUN~x}L#<vJ
z(yoY|&%Du|KCppVk1&`R>+F}dcyaXPu~F4U`%8?d;K+T>D<K3MN7h2z$qDH~T=$x8
zG%%U)%tcMUDej@YgSw`Vv>trLVgb$G{)_iJ(z<!U&BsiO6*0(fRQYf%7t>A#Z$XfJ
zL3kFVfyMh+vd+BC0{$VBbn+n*CuN9n7kif7MXE~FkgBf#=TK5=AWvj1voLJJ-@Aao
z#`fk{Hs&=Y`Sby@^X>!KG=YoOTVCg;W&(W2=Lt(|L&!)yvWLb310R9Z>A9E}qjW`N
zmPi}7?BehyF9lSxx`d7&U4>7l&%qyhY+?3;n)@ihusd4x+dZOsb(qY%qng&0Pa_F>
zJeu0OW4VFS8$Ie#I$DB0+8mJv(fCl6(9!D`Xtf7WO6*Sjx%)mMM_wtWuL3h(NNy4E
zIFbh_ezRAVk{WGqo7|bqozI5J%cRa#V0R1m-~WOAdSV8$habhVD&u(`lVDvT*TM_d
zTI;=S2{z{Dxb=BOw^=YyGl=sgKV&Xt(-V=F3Z<V<l)<bf53mX$H~NlW%Y{Bm&tx`p
zgR8MeIXAVUfQLjzf#n5Z-mED~oMHtNP+Ql?`f`do8=mkHlB_s+JVQKL)96m>o}A5;
zwl^!CMf#l<f6!kn5z0cFFO=C02OILiEzff2^>J1VVPWr#-y~wr+I`L(T14(*a&o#j
zJ0D0Eb%)PeWg^t!Wa{611d_$&SqJ;56WzEcnGrOb29&LYDiiq5Ok_E{M9El6L@kD{
zxz3H%cAO1)ZA{`4+4Tul3anIf)e4VTP&6~65dO}UdnQUj?6QeHv)g74#>1AaLwH^<
zb}1wo4>tJMNH<NYJyrxEFY8*KJ)!@-!$C(Ridiq)x-%(_Vp8``MT6c9p#~*!2Nw(w
z@~Xe**(vxu<sdGLuh|zUnUL|(tw_PKQ0-Z=+LhM9*+d_vZ+00c5;kg!aVp}QtKoql
zZ4UoQOBn8<&hk_WIpA*Yo$t-zo-u!O-!@ep5H3{3$0|rE!Xq{~(4TS+`lizMq4)z(
zg!7!uzY1;4wTN#&(VI@O45X^j^v0xB(fn3L)m=L9-@gYn%1RXUcYUV&cFTM%)^}mm
z90!FSBRwwGKX!k=%D*McKWE4St6{rjp-U)YUs$ym*)XLT#V#*UuopO3S75~ej#veY
zLTOGhC)6&gzK<bUAzZ6Ed94m>>P|uLt7;Ai=^)wT?4Mk=s-Nb_=$%L0gEP&|>Yxdm
z9(ev=BwckpUH|_VS4~|#-Q81H4bxMb+GXO(P0lsluDTeen*}pd7ZcN$tBp-e*ELKt
z)Ac)_@9%FsF5c(7;#qGz`!hoC2b5SLi*^WUh5CYDcIfFHa~p9JJ_Q|1oVw9&!J7qk
z-NaklTG45#(uezmZ3~;2uo8#~^|906aKS(KkOUQ~sJ9*|Vi{9D?c@^@RLtWkXdBmd
zUg!(wQ4W+-E8$<8)3<;v<6KU{_%LE+8sgsT#z6sQiIk?-bK=&0Nneh#ZlQ&{nH!(2
zJN(e&KI5bg&i8>g_w)N@y8isjZi-QYY4JJZ$VDf8pEmna;K6xH_a@WFE6A`v@lSDy
zzR{Xh;_Kb7?-{{zoT9tkgl^9Ri`Yq71lEhJ$$WNdtzJr=-geNt8qWt)rI>*#fR#JH
zt|5%9pLr;*)<h#e>>m=AsX$dV${gX5-{<i0u2zQzZW_TF@m-J7=f$?ky>ll2h<yT2
z4UulPCXYvLm1YP6FKTT5OvUAa!Pu514>TX2Qm+kk&QMY^_Ou>-Dd{JCSAtZ5QAVV5
zcFcaJ#y`zG@6ZQ{kz+$G)NdbsZqH%Y2%)pjS$P32#?TOvgA%_&*dq4YDe&mupCeZI
zJ&4VdZ;eBU)2lo<J*f*~_^+^SAFknG+qW~6SPOUXoh_g+NzYW!g?=l7=R|a{+M_TH
z-j~I;*uvl@5b3*md6S|0m952Z_Vl+=&K{_lA!;;)KIh(Uv@#yE-^1_5m1Z2!Nm1%k
zY@SeJXi8t8)bPoY`VeJ~d=vJB=PI2ITsa<qBcXwzjdwsL-V~{Z>y<S#Vr{!#Mb7Jm
zvXQZf9|=*JL{^PE9y;<lKjOi^Z2q)$DlIY^3V!J$z2qcDFq(bdR1kfg46q5eu_65R
zm;R2egbO=tG?mXdMhRs{3)0q9!1*{=bZ02Pn_%RO`pdjZtpXe}efu)r8Rzw&6)yC5
zuKg{1@$RFX47O^db!5BLY?q4C>6uewe}24f|A~b`FLbh=p8H!0?Hp@d%PfPvzA+Vr
zA)OL8mgFKdCvJ^tG^V-!=u*$aBV(FZnxH>uo)wrP-)<!H&ctqBn%X|7dl3duE8E)n
zEkRnSF0Gx-6=}G~<xhT4MQ@<NS}lH&ZDS901M5+c!rT~p)VQx`4|R1MO1j-KnmzID
zeqW&7e3NzGHkAl?x!akNNX^R3|D`CkNW>=3L&^|f+I+0F54|~iekev$_UQt0`Y)IW
zqhc(#0FQLP`Wvpcn?n^IdrsWw|0Po}HIwq*XvF;ll8H?YHdi&ETCYV)J#8~R<x(Q=
zUv<?)4aq{y+4J5hlOK7kw1QKl4Lt3iv-sYIdP<Lu6<h}e$$=`aZ+xlQ(@G^75A|4%
zcl!2;vp(yEkfFG-Y>#p6+@`aMU4UHzj!@@J?s1J31^yUAk2_YZiV*XQtS4FaC%EVj
z(!bOteirlP#M&>n_*su}wcWQ7r774ED35Cen1A9430<rX+SJ`$NvZHPdlvMDB0ZP7
zb`pe~cH(nw#bbs!?9LxmOKTRVTmi7iG=68+{FW$sj+Myq24CW-J;J^CNE)MWk>^9@
z70N8$eei-e>aH5awWH1N!TP|vjpRre_QZK2N|-atzHWENqxqJQx$-A6o{=S%ypJEJ
z=Z36z{H-T7yk6v}mFmMMg#%9Xm-i)H3)C~BZK*jq@q>`CX&hK-smlnO$C)0}kZVe+
z)e=iW@6j#oPA*Bfg+tXkSYFxqaibDE%*%FqUtYT$;}Nhb+%T>2=G3cQA9pX>Y^(<^
zp&Q{;H;HXDJ<x|0mE^<oGTVv>fi;u}<OW_6XlFb(8}|Dp1~igiME+XtQOY-bPoiyR
zn8xNW_+X5qVcralS1k-QX9T~s&ewmL$HD0O!{elW?miNX`#Z-6P5k|G^c4~3<*I5r
z9`o;qv1Wpsyn~mrV3jlo{lVc<WYS|naapxCLGD{&17np42xCA?By62#JPxi@`5vs2
zs!YqSn>{m>=*9dEU=T9F%WvD6i(S-Fe;XV7Ppu9>3LLjwM>1^^6RH__0m7IUQp^-$
zsv$JkPP2*oUwNSym=1!am=GL$6LdTH4nL%rHn)Q)QcD{<xU0j0<;WDKYB1x5vLf(}
z2cjGzb^q?0ZSgjPwS_vls4D+L8Zk^f&=U_~zb@=CcSL!v$4Np^$bS1<aXv}z*ZN<G
zfDZpS@pVLTq58VOQk)%?0=3bQ;#Iv`cuc_O5}P?3?38!N7r{v$jiZ-*)+r{3R*|no
z*diU?csx2Vi#G8RD%J^Q5~2CM#*zG(Iv=;|0oR73ml*aDOsl1<=0&6RA7caoN@-_V
z2=33l6ji8ASjw=j<!<!P)m9HEd6OlVi<S~<7*5W;V&dKbpYR7EHLud~hervkv*T5b
zNX)I>w%91Tx4%Y7RWMSbi}ZRp21@ujJ#n3hMlz1sN23JT)_^(5l}`FIaT8{I1E1G>
zzLKg7Y5bfN)j!MfUVf(Qa^u7B#lll<^TvMHKZDdCYrlj@{r!Btf2=+;a7&RJuo%xU
z-VY$spWH*g>E;X^7!HzssIEFmg!yW+5aG<LxkqKZIdqUdZC)U*NpUeIUH!dx9H}j7
z(Mj%8eD@dpP0G?p!0745<2JP=Jbpgg9ng+YJYB#hp>*kp1<8>Sl4dBerLE^m@Dy<=
z(^wN!7n6FWjmjujIdqB_|H=UkY-f);|AHX|t8}|~vF&vydO55lg4uPK!v%sVMPjo+
z6{q3)K@a))>DyWL%EP9$+NBAwYcs?8-iXcm@uac-k0Gp8exq@u4?*xpm$#Je$XDa0
zVdemktdgXv1WKK34*X_AQ@L8FytoSeAZPO<5-Tq<ev`6-C*SNKnif!T1c(mIFZz>9
z9z7(RpWPLg{Q7>($mujK5WK}!+0m*oxb*3l-!!P=PgduvXokEVO%{UPdrY98x$)1h
zM-QJ>a*3?rAhVsu;WPQZ9F2>lXmA7S)$sft0=8cM(vNVzI{Xw*9<><O^;3f-f42G+
zK8)910Tt+cl~BINGyp7{C-B|x`Suw{92oZ6et1h<J0G;+ySA<-#0tf1Ud&FmD>QGh
zzJ8F^tbY0<KPKH)1=y?2gr{Lq4aykYTxmgN|9Ne$;J+b({CvVvj`P*?s4p3Fr8R)o
zb<#{l&Ydqf_8`UM-WdQCW<{?%(GQ%tDPU!PkX8DHG#)JqgtAk-$@<EkMbCoMK&vTV
zgvp-_1l98_Qosx4Qc8bN12*`n5bIa?VfSLzEOvs50rAQErBB{blJe|@8{K<{TF%c)
zzH>IZHmgwLq^y8x<*){iW{EpdxE0}L&MQf1*{-?<15}vMCd-2C9U4?28v&em7BXD5
zE%PglU_0zp<T<W{4z|ATj9v82LML9xsH51!<nsf1P@?JCAoND=K9(rgWMh)=GXP@W
ztRIpVr`~_lBORhO<lyqn9Uw906==`7B<SqRG5%htN#4L*YKvJA)^Rq*PYP*~^RjRe
zACY+$NNnhSqXx^MHNv^e_q(Rdsu3n&TLc~5$5ePR<!wm18K4@YAY_u{G$|evfhnuV
zpPTo@wBYI<(ERN%04C~-2`ItXflX?M9A6;c=N3v8Jqn^I`)nbom#~4Kod_|q_gri6
z2P%ov-vb*jDLwzQXiJfr7)ax<<%s(CqhT+kkk4@Xho;(dm$bc$^R}09n`;0F=*ef|
zGf=WB3n@#MMQET^E1~zlx3Ey$BRg2VhCaPLWqG*0b_{7P!)o4uCIm-&VELJZnf<fb
zB_SidfA3gGf)pgIsiyHsFS`=GxW9d0gu6HW>}npLSx%Ajj`!(J>I!wsg*9*pMgI69
z?MyS#Y!ETSxb7DdAtyjt0&lgpSI7c1<_<Slk&1F{JGwP7unBk`{3cUc;=A>5tq<07
zMS*MM@kqC8N&oyAb6#=xCKcMX(><I)FI~><IW|Te#k4JqzPS&Y6H2YwtNqxgf!PSC
z7LLobh?I*r!foQ($G8qKLh)bopT4>N5_WzX?)P){(&i)<R(O(<1=^W_2Bq`6X!vAI
zMdN5Eo^$(2-tb_inMnw|S}<i!&#?Z4a6?k@ZaeR^KmKcuU)ZUys{xc@I2;fAb)>fG
zmMEA?Y^yKvP#tnG>#VErPuJLVK^7$3pA6>L4Z(SSQJh%nF#T21TLl+u3KK{2JDsea
z2~hoz1%x7TB*r1M0i=G*1%l^n$&6V>c~MkjkFHf#<g9;l6(Fbd<J4ISW}Ok3)0%F{
zEV2GC^&eE)|8iBf-ttufb5`xxl{)Y)$GQcVsDXtec<Y{iib&FQPaU{pomtwoikAmO
z9|5aXnX~j*SZ=d^A2lCG(MX8}coQ$2$4ODgVN$Iph|Pz2P&wtUj@)LzjXGBhC_#wZ
z3{zO^*Dq~v0JNco`<5ML*78;tB6%eVZoPN8_AZW8@>{#r%h<GXwWS&}Kvr_VC)A+F
zioZ(&Z^mfc6_cldcH&29{>rQdhpY2>3QxB(*+kPEwaSxMXz`UJqfU6x%HAWWt$?DI
zFjjEoF9!j_h`*aySmn|ze%w4Gph#g!|G2}u7!lR6M4|NSi;8A;gFJ?9W+(WbjRZfn
zq-hapjNG@g7EjN9q5k0USJEmmV>F1VleAE}B7D9k(IYG;RC=-a@}cjO#GBqzXnTut
zvYISY@DN3G0JUC|EKx@Vd&kX3YoErBXQ8Snn^*^Hk67P#s_C@CqCoqvY;3hnHp_fd
zJ)yB;6}?Pk!-y$(6QFpyFO-dI&y&o2@_3eFrM-(ll$hS-!38KQf*f>9)GPQ{p6d7k
zFCud-$+#fa|H-s!h_T?1FEb)D{2(HL@=(xyUP>-XiZjec$;g+-MH@NxxJ@|pjscU+
z>wFRc%k)4kk%c@t-L=5Iro}#IT!;*y?oYgY!3DkHq`*8KFXK8jOSNC8K<bI4BDVyx
zF*1g?;!Ft5T8>`g5(kcCw3?6{Cid_w9$K(}(+4$eFVs+(4c<0Ri)>+1vTNalCQYMo
zB^a?Y`U<qc-#u`C#?v_7K~EJtTDCoje@T{yKeuy<=;vkc*(dpB>;7T@0|1c!wS-X9
z``@RRi&c}aUV~3(l%N>%N33-kJA^Bi7=qk(b@l;aYXgMYSKDh;5*HuN!~>$31^)4B
z2+c6ZhMgIv*J7#0(zjw=vza{WKC70*Q!XRZB})64m9SZ@SA1ScNVk|GC=n>}vfj-}
z;kSg411czp4AoR(2acN19UJ^abR5ArL;p7j^D!QlIVT`Tg}*++<$y~6VF;<c_F~~>
zt$ftUt|<2#vs3-A{W#DN#fEoF(N=NsBv;iORH4_buTqJgA%xJlZ5d8cF5jlJO|IAg
zqdHTZwcuH)^RB2!?~oj|41%Ch<vbI^3E?`O*Tp@2ocR5r+O-n5Ur!^$0l$%z<=NX_
zPsCj>Nq9}<ISxifl-T_C#-!`nlYiOmI7YoKH|8K=e(`=>+unG@0q7w)oI-SnVcAX2
zhY3?AMO5B~e?;M~Z^f2!-F6G{9ecsymysjBJb71<8QJpsaj1w&1$XV@+!crH(2608
z!_HNgF;{Zh*XIg%y2yMm1M%&eWJ$f}$k5u)AGe8sUfqD>Z}R4Pmn2tXD#H}PjPr&~
z{B2$BA!wITN+;}@SkGE$JZ5}~Oj-eV-mCo?#fW@HOGKDFdi#OWqdA^TGI_nVA8D|u
zM90zL-4m&Dvvnt+(BIsXWK3@a{$r~TF;CtrJ8CCKMJ!Trj|b}M@Mw=R$}6*Ey%Q%k
z7iO+Bh&;-5WqWgl`}{@2@6M5){G7xGE)=pf0iOWuS-_-HSsk8Ns7??(0P@j;_3)sB
z$n?&uW18oFn;cIAHTx(zvV_7tN(OgETXwQ2f|rQ7L?N4cL1@bcDU5R5w)7tRUG0JL
z>o#7&M=g%tLNl}Qe#b_{y&YG^x{9QButDpVz?E5hIAML}_B0vnzKbadFyHuCUsjr<
z*)HvWJxxvj5U*w{9&$jLSE4gt5r$dszb}Of@|jD$hu~tfA)GsdU2?;%7mk3s0LhNW
z3|M;3jsK@7i9)?t1R;;p^E_>q%t^V=#)e$K-{!mwH59A}B>k^%C#+OJ$k0(U&O0v_
z0YdX;k7HlmD&e@jv_m`p82cnXh14d&Hm6uEWD!&YXqKxtXUHB#I6NgMqNkG79uMab
z!|@#JuY*&S|Bs6Qw)fsUZG+~JOU24QbtU#IQVb_{@aN`Pe_}r&wSPi02*U0oiCL?-
z|MH)NK3D9|70nrZ#K}GP;wHhvfSV6<`T~=c2Q3`0ud71ylcnFqfp*+6)m`TsFTV6^
z?Q^GD`rk8;Og86Y=KP+$HfPP#Or|GhKK|pE5OwAFnPs@_fcqUB;1z?_cQe-gG*A*N
zo)@>@`)o=R-LhvRfWG7z@>r<*Dc2|BJzPn;G0o?EBw3~I<0o9zSyOLbm(Lzn`68x1
zuyrL4oPw`7{J0^i<Az|x6%no#gI;Bg1zts)g#-qSX4RGT^zBBM!0r@;P*Ah3=2$F@
z8pxa(c((TKSm6hkh??iN&zj7cAlh}-T$H=#c1G}{?;;>HVLJ((W0`-!ihungiSb(#
zClu!Wm(_jEblZ+7_p<br0Z8~Rj1W_Xg6}bBAcAD>e+y^hhlUwrL&2RM|IP8@QRf{P
zo!#7XNu+kmA(s-}ysj^CM^ZbU9-EhFJR0P#8jgpVsB4;N3PFDdRnR_IO+hZ!VruO4
z^QQ7#?3r;xSjz4(iS?^0BpUn70(flo=q#xJ-t(Cla`VLo;57k;@T0a`YVqvi^!W1g
z6Yu*G6<(*ORXm^g#JiPM@j2+73`aw8y{ITg<|48pwQMP`AB*B8okqagsVeBN)~A<~
zVN|-^=C<E?bEghWEX{1RC`o>OL#BHFNwMqF1D-^3@NlpW$`Zh;d9W*QKMm@B_17Ew
zanC*bb-b>YRWgZ@EmftTEYtz@<+dxL-BG-cbE{1oMf>l8afoc%w5vFYxkt$3gZ)0n
z-IS;lL-jce%pYSJQZLJQ7SzuM*^)evLzbM--ix6c`8&#a`*Byr8sy&Z5ib03T_gNN
zUQbNgh#Q=xrgfgW5X(ih`h!}wj)BNtvDaG1C7xP06g=-|ooLcy6_vD`UHKG{ifo)f
z-oexCn<|>Ppo<^Ek^(4y@thDTOcS76She-T4AjL_FH@)7DV|e{jH_QKex12yWd5e|
z6ZX4<<S;ZI@Kz=S2+J^>Qd@W}9z>jr!vru*QWYonvZpS4zv1hlI&gj(VVS!&BR5+}
zCQ!=B3%92}aN8(|dL565w&0&lxy8+(1B!k^H$BwQUZ<tky-|Xb`xJARor8%eMZi8_
zPF2~UiF$k{(N&aFle)JA?D`4WI@g*uKZ<dZA_D^XY!W_to<#+iHr^<*6J51ckfVdR
z4-<jOM!eULc^M~69BvJixBFjNo;f!zD^{AVYqBdqtHTykg(DKFn2Gs@g$e_=ECErA
zKr`9agWZS9{xa>vXHgIw=F|i3iW%G@>IFVYYqqP|l1ar-9h9rn-%{0Nnr2E0=Gw9h
zqAgHDNW_HhsToMF5)bX_6h&9Jdb@va!AdFl)c(nrFcPoq-S={=72iE=fCW)Kb?$~S
z-s~4m1U`>ncmBK;_Jr(Iq&UVvr5eL?+sHNtONz+JSeg}_vGL+c{!=U-kg}@O`a0s9
z&NKWom=ppqLy+rK99XBt+;zJh{<5BaPE{%P{*$a&e|IvxD=#r>iU6&^z>L^?dRH%A
zZG!*O(vg{%AObV2aeePTJ!X*c=sUgBX&2#II)Ihv`Ll@)O-|hiBBjPPuH;wTs!L{z
zbongHbV39>tpqzXz894OB6$xFvJiUaaqgo~k<}m$@$_!q5b%-h<U;%K$H`Qlr+~bo
zZOlR9XHb1V_bpxsBfNd*%K>1R-L7$C1qzmYEjb0-<>PpDN6H0)cb%%&3a`CAz4Sjl
z8%*C|EC0aH`RT=YCtTw^f83Xq%&MAR=+PPPAJb01@sDe@2@*Z7!|Q)b{xTq6^KLMx
z|9oIJIx@0<sx9}dFa-t}8htQQU8!9UbN7U8lWD;0oRIr2!bqH~_~xg7nB?P6r@Ep5
z#YU2o>|@X-u{_^g*eyB0oqfWX1%x;YwZWhF3>L|u9ao?1YC;$l=}x$zV*QA`B;D=?
zgd30O4nUabzU1+H>tMr5q5pP9?u0+W2{L<p0-k`&Mz}fst*a&hL|F}Yo=H;;SJ>~{
zY%}<9sB19e_{SX8C0uyvowv#BI7^Wgieo9<c}g}UP5S{knL1P2XfTBy=oPv<J{Nit
z@OshdEE+bIt(V$=Atk{c?6@KOK4qFx3t;zu=vR9C*zbD@RWc(^tanQr1CKdzS>qk2
z@;tOrf35#)sf8$T)0YN`i)ZUncEtlQ+8Rz_e5q;G_I@#XYi4vue&wS;*i4$pTju=N
zLWdVTXa$-Is_aHis63%+fyhzdF3GWW<y@Px!M}d4(O&WMsHC;@3gh7u;5#nP)VdT)
z&!thKqu$}MOx_|u-Mnr21<dJB_$Y7;LG5JrR+a@Xa64npOA`j+%qs@qn!y57U!1IM
ztDNnJ#x~b^lM9h+AADtbrVN4k*;jv*?{V8>FT9fIS-|jZzhb0em4P;CNIYBKdGJcW
zX8enH)3Pu^h6pac-&30_=XImQmeUb82ezm7a;%e_vo?G{dI-VBl8Nb(-ubM|vQdi+
zoyjfs?4d$uO_AlgOb=*Psr>QfoDKP<xhrEWnSqnV@#D=Ak|d$o73CysT^=&|X(fhL
zkgq*nYiM+PHY1Au5<Yt41X=pdey_ImhZ>k0r7VVstIb+<{UM?s#83?^XdNAR&(+@G
zQD`t}-}8HXq)$RKt9Yc`L5Ow!VO5}AV^B8isQ$6`ndO5ze$BcRtBO=R@h-*M*W+Xf
z=Xyp!X8Xdv0qvU)3uk2M(ZLa#I>%m(h%1Tm)?&vf=+1FsJj{3TmMzCUrT;X3CmPmH
z)bGWlZ(?lHIa<gR@%T%(Co#R+?pvzPKEmB_G@GB^V^E^>Y#3o&IF#^+4QVU=tB}6m
z0FJjI_c1{AP;F=_;$qnzqEK?q72oivfV02faw!&;S+k?u^~~$tz_HY(Z5shmuOg_G
zHT$h;`S$dF-~z6FD$DveyAeDX6PBjy=U>P*Es;ba(48)KECJAP>m}J31`d(fH7(%U
zVq_`XF6&YOEC@O)<lq_*-;isSBoCb(C!Lu!JF~YLUK{&76-D)d9J8u^Is{j*tkHnF
zQW1QIbDPjios$}92YFwMwFd#V1W)ymKG(5nCqop_KuqIdPZ#3y61;?W^TIi>$dN>g
zqPu-Iv;mhG*_O9FgWU^C67!qP^Ehj-x=q0@+}yPdu+8TUXRMIOO*25k6B3)-7%UbL
zNNRa~E@>ZM_|}e00v1@i$`38lQM2zVIOwbK&|kz&MC=_RqJCRN$8j|htmp5)s9pQ%
zUU2YQ!F(`N7JnxLMz_3U7M<^K(1Y(a^jXQ{$FEX?5Zoo$i0VSZRI-1%(qz8k&&hpy
z2+NP#05XGp)9m?Ul2-~`a&?{fdSnc^7D4RM#lsnL;;}0RvqdFc4PE;>`7pttz-OH}
z%-&;B19A{K1U;Tn+aZbh^AOhHb;?RQTO!cT6PBG9L?a3L%#SK3RW;(oTZ0jq%-@QM
zukSItgzG0~ETJO$Bv@d_cWMiqN3w0NOFiMzevgipy^9*2!-<i@mf*^QHZlxbT(MzX
z2jLL`_3VFmIJ-@vS%%`Hkv_%mYpBGq#Tmz;(h$*u{xZ&`ir)r0gAujpfzT5Djin@I
zaq;ggUyl|}GGXNePro#rV0oZPc1(Qt3^7Gv!6nQ4V<jr;*U`p!Uh)i%g+x$c1g`>9
zaa{_Ga+ZAO%DS2;B2|N>5G|al%u8j2bMrv^?JbMP4?To0B^GaGu`5nWvHSOSW;L<-
z(<s+7U+JuUeVScC`)MAuC1-lI-h>rg{?_o~)=v#(^$CS$0`1cA1!%vpm(!2HWgD)<
zYq>u^VNG;2z{CM<IC4Ru=L}!oGY>V4oZ*c!m^eNKjdKN36eOAOE!uSa0?@U&X1dpL
zvi%r4$^vIMewb+s;pz#N50+I@;pGVkDucG?Er~!Crn=UvNgRC+2P5qvp>H0!n+d&E
zk&WoQ*NpF?V7{pQ%U8v9kG#*#b#UOJmOXW5MRXSKSpX-p7IJvDTuXIVXFip+ROo?H
zc>RI}<Hv;}z<i$c3;UU(Dx%hcAG|Qy@8?81QP!Nyz=m!i#d^9|uVCGhVSAJNKN@pz
z*<<|YL|0~@g-kPm%R2i)!K)4v3a;r_eAlNL{tU@JEPL;+JFP*}qmB41`rNi)eosi=
zbJ76VS#8cZED$HTrqkJ8OFeX@5BBIc9XJj9(ZniAQ^^KiLg`tQKXy37cD{+>Y1iE0
zdA(q;iGGEN|KzW!^k(X_3I}%U1c>7K51{7-%xh9O{pP_Qe5~ZP4MquWwM47pW_rrw
zMX+z9EkP=gybV2nZD<eFdJtypFMa$)7BAhM@#l?x5(0P>C07_x2-&&*hQW7#uP+6R
zh!??Xs38?jF5|jQe8=$ye<tk+{&k4cv(>h|dS3c7VCQYf+F$L1VkKqjP3>*dm_(^6
z7oa!Y5%S)bym`gFLBQ1X0Z?RrdWX+(s;;1#eB4Ap5r4=c`=`^`FQ6H(A}y;5c!P!W
zf7sf;+O<|B*E9DsqiV!TuK3Na9Xzf~%Wo~B60sCpvFFe<j}nAbPiw$TGWfTWv}>og
zeP^D+==oMsCjDEExVA6r&B_a-PzG2+XlBEEz5b6mU8A3fKL^Q;-z?HF#jag{R&2hL
z#C36ODIymjUNQ+V@#n`_m9*Ag!f_>1T25-GW@N0N<=<ASA*S}_NS|fd?ahw4YEI*#
z@y1@T6Lw5@Ai*~S(kP3BM*t_&c6>oMs(ZqZ^cN^6Pk0cC(L?3AlkRGs!yhwlGt+On
zfbaN;imoaEyTtpeiM0FfZwJ1Y89%q}-tJ1%s93~~eEqkkS*2A*ia4Q0stkSUp0=B>
z{vK&z9Kv>P1T3{p?ZQ~v0#^{%t-zLa8_nRA8CB&b5nAYSE$j`RO~Pv`L#ls9pdH|6
z2h)amtBA8|T7RXC!Mwl17n^@O%oM@a!(R<o(g*69Jkxvj6ZjO+XjPyPO3&H%cE0u*
z3gmAm-u=2Z=_hwZE&vPbhb5=A-#a6a)z>(NTa*@)&980${p3p5My!o{rOJ}2O9U&+
zRI~H;EoNExi>Fl71pJdU<EwtJ)#8qJ2I3618r$p59((d0B6l?dJeX2;IEwzLi+2~o
zpV%-@nry0lqs7`_SP&JzIjW|)wo9dVieL?HAMsuMcbmP5vzYdxc<pp8F;ajb*AGTd
zAquCFKiW<}(w+t5>;KVmIOuzNUPQsoe>Pgy0#4tUKROO&kZmaoTN0<r|Bw_m^OVD=
zT8XX3pp}!ncaAS&ed~5a?_@bfcO4J;?H%u;%`@wH>&)lepdFBV(O1d!g4`V>42V{0
zRhje^{g56hApD{23?O2}H{y}S>SQz_AZ)8<Zj0t`9^@-$K9vLh6wmp&#KS4@a{7JT
zYY@aDfmgG0nAG}~qo0BIVf^OU1V;zYdjOo(`=_c2VZ)ls8y~Z7RX)QjPPaFLabiVQ
zIswx78g~gNK%A;L?JF;45BlJ67(hpsH%~HPQypdXW%q1ISSV8~>^$*rXdv3B5fyGK
zsg)*?>8Qw%D*lG6iDVdE=W;e$C4y4gx50-Fn0v?Y%5cl%z@>$ppGcBb^BzCI($(s`
z{G{J3M!0bXph%gz%S{Zs{P3LJ_9kw=fB_0#IlMb_jQ+}}sefDrV6PmOEG!J^Ve+1i
zT5hHJF@uB4Xq4Mqn9RvjE=QU1$gYQgYX(d_SpR^HriDt+&KVo>nX-}#{o%p}#hB$~
z5HrInnG1_9pfR1nT{G9GuI9zMmhWnqde&TAT87z5fht&aiIMOblh>X9{3&537{c<t
z^)AsFLg8nt^gnmpe4D-%;W<S7%$eELI?XrcQ8v^%g)5F$$>U2?HnZ`!yfS+c8Z1`N
zYOb=Md|xkB%Z)qX^9AEeURffjj$QFH*|xFm9gjeRs_+9*wCl}PG3sIh*<ueItaa3J
zox#qRCt+yedUWY>kOAs1!9RWZz<<g!t*$}%XgvEUvW}>|w0***7%Vo+5xu!V*cnv<
z!Jp5hUD8Y1l;0n8$r%}>t~!6vFh3=Qn93#R_$a34$H;7V(pwR!V#35AcuM#%4nhUx
zJXdl5cL&2qKTaa33)-TA2Az>%`Rf>FyQ?p)s47p2V41}~zyA)ftifZ&bLYWY#0$eO
z%a0?jXtvIY!(!v6&J-J#bx?Vpgp`hlL@OT+tgEao-U|N7Sl;o}`DHBf^h*3CkFc*S
z^f_K!JjD2qgvAG<LjilgjgY*}biWOtUdyCev`oT*wS`t>eO6ExW$rBN*&(El5F5sP
z_^)LeznxnKi`SVrm7fKCo;_6(l4Q{P_KC(y^vLns(nCJz$ynf#6RmmVo}kbD<h@3V
zFDHV?KqTWkx5J!~sOqKKMo>kyO8M{&Z&EDee!ewJ0>eK8VEz(p>X+G)vgRWb&f9i7
z3EiWvq+iDUqq>VMHKK{Q@fxc4;A~34%7+x5!LAy<0a@P5n(b8sGg-7+ryn`_9MpRJ
zdI@@|OD-mvXUF=qPJ2&3)b4NOH<S2*XILG3f;USS?l1S$5sij+*&`KGtBLkwnk5@9
z977ubMj$Umnc%u8wk`Q`Rk7vsyZ6t4rTsRVJ+`pbBjb(!jYYZIR)dWbBBlTfNU=5s
zX2Gw{q9-7^nEN8R3io?85&n-x#)dNh4U#yIcsCh@5j+2%An85WHuYRUBQ`2CtRc7Z
zYuF#fdfctK`K6Sybxn!cSH2}j1N;PyI1jm*_b9u6E_LQvOj><?{tD2HWB9=b8Mbqz
zwbPgjI&{zyO{H--2ymUz{66Gs{q!gi)cMxK&X0Hf_BjFK#LJmE#z@vT^SVRBAn6yM
zsYdcG;M)#c>Hh)r?J04`DU9g~G3M)t1p{8N*^<b46Y?(FCkZ(UD4LSiB%xHn_(aaw
zm#}FaH8!aufh<{DJf0e5Hqq$`Kvwp>w)QrX+GIkRC5>&6V3KTdjSFp%rZ6pm78;`U
zP3bajR_3J8-X$9%zj@s->Ek}{=fYH6s=27l2mM-$o=ZaxKG;$qW1f7KeYqIFSLE4M
zvh$dw51ZO@nJ?yDNL9Jfl5ob6VxvM|wm!$^B0@2bXD;&)`CWCRWXu4fuMX%>7ucJW
zL0^^4T@DZ#%(E%z1Hnn^7q2NXGCED_zf*UMUEwr()0KTYOvu3{P{@H_&#CQmjy)vz
z&L*8mANtk7zlPqBd)@xw?BL3(315TWqAtx;Uky}8bdqtLuWh>RW+s!qxiKS9g@#hv
z@vzUp>ePc5HP>yi1pfqRRWiBx!pB0B^WZLlkdpg&1q6T=B!1W9WEi0P?jDlqp&la4
z(#!b7KR1Ggx6{LXzJw3Eh^^wzD*jf!ozp-)4#$ShXt~Fcd1{1^V<{if0;FJg{+OKz
z=7zC=<cNEyJZihImJ2#2g)rM+i=7ePm_n2by=kk#17s--rC&uvN$8~$9J3r7+m%YM
z9SkeI9ZQ2+I4pW3s4l_-&T>ZgsL(=kMa%V3aItP~P;laX+Hr5Hrs3G#yFRMb;@Hcp
z34FxV5TP55e)A`6fc6zm)P$F4AIO0Z6O-$sESO>q08Blva3%6!b(p6!bm2;dR}EI<
zcm<}{-c%DY+kbPaIT2<R4LJwWw0c^n(K!hW-&uJSILx#9eh2Ah!^FG!|C^DwV_`o5
z4WR_8so;}46Cdwd#BKRl%8F{i^y-^?a;uJGn)xRT=F7#t>L|+$y7=qecsV^24nNHJ
zm=dN-s*AeBtu}tZr_!@vezN#7KBMm&CCyu9$=S!LyAIDvI4A9Y9SMvs2Uxpqy6#3c
ze<nw}Mzwj!_Aw{2)(*iRZTE}KfcW@BjkuKY;Y5FAD_4ie4-Ou!=h%v_c!tu(`MPe;
zv~WRd2*OhQQ^)*l^I!cMatAj=|ESPLjW3_aV)`XNhALx5WNo6^OHhlKD3*=)sj&4s
zR@@`&3nm8DHU=UUcTGSs6pL#cd#*z$%wecjFtx9C4>MG$!ss!PyC775l5N72?deTr
zIJ_dgYjy$gBBZ(#WtOLRFjtA+r#QMGv&l`qVPZa7wxOzIAVYuINkOtokOcBKDsI1Z
zz!p%#lUXz-4t(6W&&nQD<aAoev5`+(@<G21p$Hl=iv2W4u^;}tNZ6UuLreu!wE~$6
zQwjR1NpH~6e~mBNJMeaun*n9{zxH3Jh87P#^nd9s<Ro+&e~b)<M~ssa)B|wwhg$%7
za@i|CdBu)aOQY!18h!rhD3GE|DnEvIayo*(h5%vqO!h7X^AOU8R?CUr=WxN_ee)HR
z(n}7-3s4^XZAV9Jo*yPf0W4ZAd^qW-dVHNRyQp2}@p>=iQK=d58oZqwy0^V}kEW_U
zQaP1xh4?t|O>-$E=g57RJb++`SKSFQ)w0!cs*m#PA3qdCKFvXre|+NckhB);L*u1r
zPe>8t<;HL#Yh&V&i<?1yP<jMbjPNrk;E4&eW3(4EuNv(+2z}7@LhRf2Q>&z;i!&E@
z7i+4@_DHw)4%A_iEpB-n+#jPxM?kG9#PrmPYS)BuuyY4zUs&qH5@^BI8qXMehC^1H
z0ruLm)>*vUI^r%Shj1h^pc6CF^5A>oG3vMTEiT4e#QM_Z_$5;R20Ck#a6*K3GoEJv
zHj?$kRe=JLt2<tjUn%hMKZ^g&UTx%@ODXs{o)imQ=l3uNdTURqD!u2&YymE)tr#P%
z;>JQM`M`im4ksM&4CHcGWsCor9pSllTYm@`aq#qNEtR$u?alhAqyy%iLjgsD2TE)8
zTwmK>{g`U2fCwbTGn&b8kwx7;HK5rX?5uu+9~spnx%(EM(Ke->SUfAoFoD#}t=<ih
zIq=dWBzDlxSo>4sX~chyQ?{s_D4$xETYEy@%tb(hCb}f~R+_^870aA`0t>!ty3e`A
zStc{FSh^1@#u~^U$(!r%8(B-G=#ghU>rbY|k067qG;Zp-L}FckaE}2Mq<S}Nresr9
z-|)2m^l5%sqoSIe{lTpG+99Jgxa#G;cIa$vdHW#vquQ0d!>z%%eBrr8abgUK)Qy~{
zYEa9to9lJEg=RB;<Ix=c)TJcuyxeB$KgC*gbRiUbAyn|FvSS-4$+5Ubs@e}Q`+}IE
zQ8j^V`xA2XP<SvoW=tyhIuxlCtx?agnv7sy`#hDsR(M?q=oE1z8EL9?sTuIudG?fA
zp#^c=9VAB-EBBcYNgGbj9PxqZ=RJZu@}mdt5|=J3yMVaix=BqV<k2|)k>{Q<Qk+Z7
zO${Z`m%A2eG{|OXgsXx$Z&^Vn0L*ik9k?=9Q>HO3K)%SGg2!HGL*iaGey931DKrDE
zh&l>Ux3#3HY)dHwl)*;<{ECbT--lg46X#bqFms<#0cxGcN5t_@%jZ*84W<HJX#8j@
z>CvuV(Q`Tyx)L%}9oCUlE<vMH&`pPNe;LfgMLfVT&YfozWv4RgqtV)BoO{4We%TP)
z<qYJ+0JC&9dz_3u%5t)&5t;x5Mw(&-5LG6#>qy{koX&eWYM4FmzBjQg%;7Gcou}<K
z{11sM&=ly%50u@cC#Zj(qVFZHJLosd+Y;-DtW5ZSF(al3YYDQH3<%rt=hZwk<l{qz
zJ8&gHFAOYZ>a47nT@%fVKK;Q-&^dj+5^NMSz}~NBxw#t1DOdN(<Hs`adz{GhJ42_M
zgI&W}u=iPL&oO=7I|(pcB~n(~-ly+dU$M-yRqe9;vD&9i4`rtk8ONTBB2!k0?#Kn4
zWs0&p*u{>x-C<|yf)5{yW&&x4Lw9WAM=Ck2cU0IOYRU%N0$h7}F9izAIeVqciSl2r
z-IM);&@>+i3Ysv6r?SO~{s7RqOqJa%i8<o)KW^H5i`{$=-n>@mz_*WBv7%kZi2VkJ
zCOhiN*b}}_j$T|?r>>kf*v8Cr+b%W1V0~0cOMn$jJ9p=B|8Ewytw9U*nb}CvR8~xd
z8iHs4Vc~~VmuSK{<>A4|(R=f1LbU5tF_kwoT5!h1Q^~N8++5T~+e>rq_oDvbd?2vQ
z`lrrA$d;pOw{AtUH^1xE$}O!=I_*H$0Q5VAVOAr}?9FK%OH%s^2UoglYF|ws)#c`6
zO_q=5H|1B=zd}9#{E!6`A^6l-^5)ocheXQgSEQ<WQ<7h${peWKssz}qPm?M*$rz#D
zjSiXR5+m5&05wd~p2EC#6ypb_qzx4ow-mjSqMi5KOZ-ae=Qz)_d;qxpx!hmK2sgmV
z8`VNu;y@LQhM~UvhxAC>U#ynec1$=MYW*TB<jU@anT1gUlTV*({Q?6!%!`%mu1J9}
z;Q%>}RCAuYox3*Db6deneD;1&6&)ad>SWZ*j@1pJ#HME;b9D{(3Sto94uTeXKF;``
zgK=n>s(qEb@@Q*7MQB{3PToK6EvLUg!s7Lm*kOc2E%Wg-=jf2@McG{AohO?A>Fyi;
zbSaR^Q|s!!1Xw!`iTNy{n-r$DD|*D`y&tArv6{MoJGf44zzAS2-X%M-BHI028EnGC
ze<`3{!(suOER$CWmpf*E<)eSBltn?d{Dj7L5j#2(bK${Zu{wiN^7$xu{GllRepIum
z*S8WzuzzNM8Svzv7o0@R*xJ`sRu_WYGcW5wdXv==%}-uZXnbdWB?|a>WTE&Gp~xH_
zI7rr!UHdQL-@feGt=A-8q=pU?3!MOPl+bD}EJa((o)yg!tGg{m%ch$M|9!e6anwo>
zyewnwGJN_A;1j9O$z?stYd$uRuU|`7cM>L}<9`m@#HH8;w=lkY9$5kQf1;<cRIMU(
z`|7tmeR^uBdmO8PY?qp~luCMwT#~<?V@<(tUtGB}{1KXMF&}_38-C}2zx!y;w+H!#
z!rYJI!!-|Jp30Ov5~A%iEu2He!*HW%m%DK9Gpv0+x{JPSVa6N-iAFTRPeZ86CR})+
z6Hb4p_-vpFezpuq8I|#XDvn;Al|-a}>8d<wKRT!`4gjE#Z!n&x?7EwU<VS&~_t|6{
ziwB05AUwUp<9J6ClO6nL2{4&|wPv}S02gv&uqK6@IB6?3qiDTz1KIdBo7)VwEY13|
z(|_BgkI@9Y564o_<|3-f4{e)E@wpHdh>(Z}Q_=ovh{%P!Ts`d?+FLm^C(%o#vPI!O
zRuzr>m#ji+C2pVf<6<WCHWet>a}8Nx%TRk;k?-^Dtp}94zxO07Kjn)xliAaMcr8j@
zX<7nUnYd7`B3pC#>D5X#>n6}~Uv4j|<XWFIS8%1QQx1;4Y98TkY*N?p%gwQsl4-e>
zq~0VbqII9xTvEl8LWxX)4boID{vG57L4mL@bs9%{WquESqU>I(zKW0~AmlFU=9Dt*
z9(!`^`_-&w{QN4mOQS>*Y@+&+gU{}H1-jhGXw8d4&bS2Jl2|9_^z)z>;&LVI8utqb
zg2eS<(N0hvck1B;j_aM&j;#r0H$cN*V6P33>4y|p^12<Lo8MbRFPT^3!2N?-?+&`F
zG16H^%ZeNwh=~-DD2QNvyZO?l%J4|5QyYru$lWb*N(1#ba-R6S!1!MA<fixw)aN*m
zu(k^F%-QQ6#vGFNue?iT?!Vz=6+t;D*%P})vL+p0FN`<=!U)%ch=#w!Oyg+dKj$I&
z)zD=d(Wy3BiqJK#?168WwH}o$q{=@ycY<>HMXsctyn)Hg!S-_EdjRjH5XvkKK({vE
zhO1fS={Bt7R{#MUS47Nub2M0;6;-NMQjfIJK#;v5Aw$$B^$}IeT0j8!G5WNZk2DTP
zaVUS949@V9qEW8BB}Z;r2&kwBg(&NvrtZr!Y(VmUJIj`qJ5c}?h9#|i5jeJ3Lr{Ra
zA{#`BsyY<4_*BK+y&VTmN-?fL)XY@tm_%La-2D%5lfC1761^ihB%2v7H7@S8&0Z$q
zsweJxJYJ2QRxd!9O}w_u+LK2=z8S8m-M8$={YXV*Tp~1=!KFF#*qb{TPPBA?9~aKF
z^kf9#3+!=ttji@}qQ*!Xm6~0a8SH>1H+01Zw=;6a=#U8M|2T%zHY)WhvhHjdinLvw
zff_Xc!jtDc67j(=Hgxy!kt&bcwEbMzf4Ms1)f(TJgrI;)|JsNsdHgmI$;nudbgmT5
z`*e|}@^4N%2riVRBbMdh5IX-|Iz1D3v%Cu?FLC1gIm2*5@B_YbL92$^I7rOb8us7P
z_5HoV$LD0rYzCFhC{SXzM$#5vN2)>02A<{~i?Wfs1MaJb<E7wmA~EpMKfsj(Op%QP
z`VW)!iwnn<t<vZZU-#HCRUdF8G)b8&J>WC3f{>75fggnB2t~~WfeN{rcN=2M|Nm8M
z_`9D`szfkmGY)gu^V%)yXDiJnGQQs}d7zr1z#f9@U&dj8PCW7}ebB_UVITinrYi|N
z_FscEa~3cUWWA^VSOdoF?UEfe{fSm~q;I?^IHBdL0CvNcb8qg;H}_$P-zL|d)?Qds
zW&LE+T+ay{Sz{axe<?OE2NGs=QwZeI<Oyb;RZP3lS+U#Iy_7!WTT%MYD`-f&_hTBg
z1Nn2#&^YjFh{()MTI0p9&e9BLQD6oeaU<xAxX*KhyAr-=e#4a?beW}bpAayRV&D94
zu%}=QVZb^eD>$m@+9*09<Z!c)n?|(j#iuU-vlC){Fv>#Y1_G*;pvK59Ao8W$P5y}K
zq|h$Elf+~bBmyJ=i!l6w;pBWIFL*g)j}o}lPx$x)0G-G}<J8(7VFSGJov_;@2SC8!
z*f{iz53EgU6YE2ak=<(9r&2J&sMO}I&;I|*L>>tdNKe+mz#pl`t;o;H{!y7Re4RBH
zggMEBJq@!-OYmaByw{0K%;AZ9kIPK4Ob(C7{QK7-CNk&gUPC82v`G<3(rpvJ!b<)o
zd*(smG4UyJ>yz>I85?Kar@(cj0MJUeoY>85*KmeAljx;HA@er7lR=uH;_WAVIZigu
zd95=*K|j%Ow-@2?cu&plN%3a?^Lq<%(xmpX9nbt%d^A0_J=9U};GQAi`HJ?Ad~f+8
z^-J9K42wl75ga(X`B+DZ$1LFa$Xk8DY?r1?aLy?kex47gtJ%^&bpW?gsP`+iJ#YQs
zOJ#eQFse35?!EW&6+lCUH2_ImH?7p{-M9lw9KABVy6Z7wUE>8tkCpDVF+<9LF@L@o
zd9ETtf=?7)k@$+nhw&#cnEEIaUmF2TZpZx&Cae$a1y^<Yzi-m<6Y7Y}>2{K=<WNwn
zZ*dA%FTmTS9TupB$B%alp@@ge0TS*p9YH-IAg(X;C%Dpk@j0$|WPp>icLOihLMg7G
z5Us+&_N6f0e;l+UKqXG6pd)x8<;9F`^I4)RNg4s7QD3&jt<p+OfV88?HzPB>?YBs4
zO<yS-Y5;yPO9B@qLf8X1&S_2ok0h7b-F>foULz|cuRzLwywzM4kY%985<Q(T*kvOa
zDHUK>ET-ow*1bVEtH1$0ak_p@)L1^pjP+s}@b>qvN+S7X1&Ax*G|4s{3jZze=6?6H
zns;$oVu4Za_YkQP67b{n<tIOfOMI^;q5pln2Hq9CB3$t|xba{cV?{ZB6Ki{1-r+aX
zbr94>a&EB0wetqHzS%)@{`A&~{0p(R|FaSml-2$Zqvx_neAntfEIQiKO^bk9vA`t6
zJPO81#Cb)Bs-f-d`@Qvz9z=>1<+-I~?y{ylqK{{u7azree|DevN5DjO3FwJoG8=BF
zFMF@MD1#V@c67K#-+pB{l~5qSo&m(cddo8BxpczMfJgGyhX6QMVReT4w}Cx9`9{@{
zSGscnxJt1dxVRB+eLEI_$&bjkqtx_*BEnS*xSLCEA5OXh640OHwy_X_de8?N@$qn~
z1rGbZpvNett9oXy=7Ke^dohIrq14%G*QCvem0KVx#UM0e##ELHLalwV%pB|*X~15c
z;qgtZ=Zn+{a1fzqubA*twcD1B8vncZi+e*|U)xH@E2-ev6G+yLb!dRIlJ6!f-{-ei
zoPWPHGtp&LfI7DqsrpvhQAGbI4<^G>apGX4k3-o%-n39pQP373Hcq}3wy06@Zl#Dl
z1^+gNe389MWvPycV(eY)V1t`C!J!bQSi&yki*IW3c>UK#V)I4$l$D0db(ALweHXVk
zBszVL?$0hu#3bb<5=OUq+QXJt#g`8FJ6UQnu`kY7L)bBQ|2371(1>F7UB07WB;{M}
zb`L&i;Iv!`OLGz%RizZ?67e++R=I1<IE4Bf4!j(B5nsi#UK&IN5FhcP&xVz^aM449
zL+^7WSos1TH!5Dq3a+aP*QI?~FvW6%`3Ik_)%4aj-&(j;a6v_@IZrlY3{XR?GXnLd
zn^WfpUh>6rv(UZJ7?#VD)r*Lc)3pAzws-SoZq|(BB2=6AM$;YWo-XeKwl%BppT8)&
zOjiWt$5sbS|JljUU44Ui9kPb%qqd7*hXYZ&)jgaP^mDk(vi^9-zauK|w5-VUo>$j&
z6!9T6kK18mK8xv`6k6`<Vs4DdyAMfe{xEj+?7W3F2-W*?$xlS+>ICEGm;Dv4C7Q3=
zlJ8(sjPPkJuP6gmm@PN;N4in=xHz67W|Zil@x1O$_PW#L;B1aCoVGl~OjBzg%QWoZ
zqJ4YF$4GosO`nff_f?Y4>r+c0>vX3_XBQrDzp?ZACTNHLB9?V|@_v?$yo}+nUz4dZ
z!M`FH$sg5!AAkC}0*i#rm_O?AuAe;a-v2AW$+KSeYDvesyySx#5VuHqZN3Jx6EsH5
z+&fREt?AX30WL~<GG+Zt&W@??Q3&19V+)p$7M0W!fCP+dVhB+?JT=|O?#iWZ0<=;M
z!GfF0*JOrG{{#*@5wG4ujUSc)863B50mSAGES2Dbgny;~<}d14O_bxGE(R78ED7iE
zVKHwF!L?<(Tjwko5&hjUy58d!V7QK5wtu|>LvZsZW2k94ifBi&d~7V6YyOLj>3Fk~
zi;TxadMD)WO$;}ZF*n+h!0Bu-3;;7Z)ev*vP(pXy4jgCK`q@h6T7s%+DE0IOOlGmZ
z>S}S}7En--_k#?fN^I$Up>XQmy+H>jd8@9%E=`EerVQ=Hk>$T{Kt?8F>dUT#`)fJ6
zign5^M|*taCMs&sC~^a}F8Yd$aS3$u&CY(8!e}j|>0qxe<K6ua=6?V{>GG@w=JB*D
z&DQ{R`zepvUEKkgjiv`d*h001h36#ZwW=pQOVwM!TOkZPbZER6JHQ3sKt>F<5F%$@
ze-m|eMxc)>>Wkgz+)0KJye<D&0c6G1L_nC!Tmpnn;Iv-!STkr)zypl<UrWG?TN0L(
zQL265vvuygA#h;y-;t1Ngd<bdaxC+M{8?>3Wifr`1w!cxaSF)Vc&9=sC_)tKfyZU~
zh>H(;KpleTLWSW|Ei34(HqFvNxq95u&pea(geKg<K_7v|(a9{V-Ymrxk)5QY>CG>c
zf!qy3lU#CC+zJ)KfoCuFb(I($yy8bE=V<>bbyhVl!Yt$HfSKzQmo<7Sam}k*MFQQT
zOw~1vD*TaNv8vfj*SN0m7Fk}GtG%D<M=9|<Sv6eJ{JYFTmGO-M!|W#T4zxzq9$nMA
zr^u4b5Tv%wisS98Ss{3Drd8EZBLG+QtABS@fv#40w8!7%_`;x5zc-iVHo=DiQ#!fZ
zJ|}|@p&P|(`8q4c`8*0#5vszDDeCC|l~C<~@Qqywh5Uhr{&yI)TpKO!*Uz*<zWRfN
z<KA96WZE77?z{&q^v4P-*^t*~K(NYkEG%-(ErcB_ldBxHl+fH5hIS7dc;<XV^)uOV
zuh0gysH3<C#J3oB<szP`iS#KP*#fBs>s91E#&zjZalz+;SlaR71$Bg3M>P$vVUNWQ
z174ZhHHs9G`LT0FUBIxr`oe!e)<#8~se<@d;u}~ydqpu3>FA?NTFl+k#2o8_EUMCl
z7@TYJR@(!i?c!Erc6^AbY@^D(oSdPDeCZM4cz2P|uSG!LZr^W;m|=%l0mE0Y8X5eV
zy$vA)Vl*Zv`QJJ4pl_-8QjXC>_I|vlCR)LHD<9u%J8lO4W_OhY^tMv2h8IHoBHFmY
zI&buNcYR+x|169u*(tIFj^mp-vH6;Ap!LUEp;K@{Nx+#8B|7ak7+z4Bt1}G*SSo*R
z(nDxw@3`$O_v0NzLfDw+@s%hRBAdx*=4YRrqR3R)@jIprUTpu&a;yR-=`r5Mu1KxK
zuJX!Y#EBo;C_?SWu07c#ufJ#4Cm`v9Qmu`XJ4?NddY&E!c+PN=8+ge%+?ZC(fDDVf
zJLYo^Od)j*e@ffDJ#JJ^2KxU1%|J50&mblt&cSi89?8p>QP^O$RS|B9y$D}|4G>Wt
zk3_XUqaeNsoCxt?2A@Rys)qzC|E(jlB<xhghBz?fr{v7$_2bdAWY4<;Uj|+dk;yOB
zSrQMoAz0<Q4}ti+>|vDw{{x(bY<E);tfK4-lwiF!a~i5GfS*8|ELf6`UyhBSCzr2u
zMRSav^YPrWPjP)s1gq3+01OlyB5|UeDkg<6h=(LD1^x<Lq=<*h*S4M!taME^5;Pu%
z$2c}~vgb`w1q(%7CeJBXkSFTxdxF*K8pdK0adff`-3dEOEt84QRhV#H12L}`1gmk(
zI<VK>6iiqSpzu0<8apY?0{&yNQrOToTv)^PtWkp1;(LswuuIzmYgIN*^U^bzJYIuU
zve#i^(@;;J6RgsC8jgwmG+;j*`9F_Z{}}d!odIzk=;t^fX}6hQiuR*v{;suMSFQ&H
zt9$BmD%RxGRj{rJ)?|4Q$KrS#4G=3k2e%_w9oQD=B|%)25$8c1gH>#A0ao;!V3F$Y
zpi=|LDDoZl0l~u87r&L*3ws^D8)9h}i}Q(yA46;^I1L8^ZR&Ahht)xAk`)>79_%*S
zieTmK?*#F!3|@{CP@fF^x|e}QLA(=_qpfA4`$>`=S}zDz{&h2mPs;fn`$_ygk*6EF
zAXsTs*g|%k_$V+K#SHo3|95dtMX+8#1nUUwcriMIzv8r33meY42JecG%Uj9_Rwx?Z
ztSj+m@9?58-4d)sRBD$v444XWg50<502FZ_aB(L73S1J&US>TdSVh}DvOUBhNXLkn
zD#zvnOGjov{7d3el~RbT0fJTfO{B$aFYGjPASOgfwHQkg*AdK;bP>c1loO%6iM9l*
z1!9xb)=}7qes^GaD*Om=EyN{wJ)4PG*?8^ifMB&Mxe3w)h{LdYaWXch?~jex@58FT
z%YfN9X4Z49Dyr*Gt1;`IV9{bccEp>TX*gBRD2Soy;5)HErsrrW#p(sYYJM5pVIg)z
zs7q_7A2yq%wZobqSewhyPn-0r`9$8?IiMZE0$7YCChu{XI1%_`dRSg7M?>!+!OCC%
zNF=MDd(gD-trEe?%fAU50}g<AkHin#FU|n*8Nt_p>#$35)AZPlC!w%J?Co`ZY$jNF
z+hY*lfOr{jKM^NO`du#wR*qM?-?0nc?R`>kK`#jwrEz?h9ASQ2S%vy};GA+@U3d|`
z4#lVCGzN=-{|3G-;+cwIm9F*qNwD??zK?glR|4<P;HHLmF2`+nhyKRAr8Wd>Hn#P6
zdHKgo&GwmH5Uj@bHwTVT#PPrpnb<0wc?WP&CjN<SjFuJS({Qcpo?z7~NSl*Q@d9`>
zj)OHuB4i2AY;2R3q)FxW`jlWb)C0gK*ckjU#9;*EByE=3cnBNOpAXC=VwS|x)??O)
zmPBU<q@37IgV=#Q%z@LV+<+tAUkP#BdP1<8iH(ib#{pBZ#4C>qKRA_LgpKJh!Rcvc
z&_=UT*Z!&ztX5_B0FA@<?eVT^ZSF@j&EY*FSl#x&4x3<!TTNS3t9l(1th8RocO*WR
znxPyJRO%pW9cmw(fbm}7r9P(v{}Vq0-fZ!FyoRQTxn1`tfKCmdlL5)d6^fg(S_CWq
z;lCk1ATbx>4b*Zfwe%u97C1M(y!VxR+5>|1UEo6ye*r!$#lm!nr9TZ5soNa~e1nMN
zCEbq=(SP3yf|b`j4SO2yE4T~AXMjKD$9qAr@?%E`zJP-cE&<K}zA0GQgD?$~uw?Fy
zZa@AYr{uY|B3REmf;AfAdzlyan-T9PZP3bfH-y<)i0!LBke6sfu;yYH_%{{T=<Dd}
z{&YjIT&A$W+8Q`I9J^~u=IjZ1+vjGs;kp8HDad+Buo@79B__*8>c;@P$%fa<F{$|v
z#05e#DM>`u0KqEGuXR}?Ar8gqWDdnD+(Ai#br-(hmtz8PTQ3M!!+-`j#KBa=R4nmI
zd1PZL=uT|ZJsr3laev!3)-J(nRW^VzNC)F!wv+L-Y?zKeg4d<rQgcdbXut0WR(F+k
zjV38pHw3G9<O<*uz*)@|uO9^K3lLwFco$BqQb(`=GBt)%sNpa8rtj{$`sG~(+eDlV
zu{q*(z#n?tc|5IjGB6q0XQlqEHo?ljkCW}4Qd}(F1F^hVoNINY*cx#dDYizbRYV7!
zT^qZ<0^&!&rc(R>IGL0~u?vEgev0vuz5#I@a393S5r6Il!OF|*EjR<k5m-%gs^AB!
zK(O+9#{-`N-jdq-8Hz8aKDHxRdEJA7kBa!P98cv|#Oc`cv$^exVAb_!9TTiAfNukD
zgt$M0_XB?`Uvz^PVYxp`uub0Q@)B(b)&jf<I4NKA*FvDtQ4q)C9q@sfoqkqgV)8qP
z^D?O>nOjc@R@3!MHC4}XIQ`9rLV}owB|HBSTm|vy8YWo9_X4{TF-5XrJ9caUcvj+G
zY;1i6jx>I6F9=p+hX!FAuF0SyuxfFOROV3}Q|fY@Ec$wK3C+4ESnbMggC$&h0-wQ~
z_g6HX*R5)8JtSCC(|q4U+=Dl82R9z*4Z-Tl?{RhTC7kT{M>q&&1A>nBck3SPzL`qa
zmAf22$QR>8l)ZxJpdTyfh!stXN*`e^HadJ``YZ$9RqjDTE`8gvxeAX>M>M4=EaMzt
zGvGtO+i(Qj(|Xv)+i;AsaoA<~Pgsif>K>k-<2t;v9fNm?|A%AFd>R`b_ZGJSZ^gDQ
zp9fxvC7GAvm%l44#gea)c=CS)+r=%z60I(R*i~3Z7>r}gEyhxxci@TsZ{3|(GC3Vg
z%3IeBh5{>Fk;yfPdvH$E<8ZLXU2*7=$AB}jr2aW<#Qk9kGO)hmTHOCbajv%Um=xa*
zycXZTM{sC?-(acXc5A6`x8gPD)mWl6056bV#`oj(c-@!}Jb~wyGw_@-ycg{(!}d&P
zU<Zg1SY>=Xo_9L1o$1B+elNyz_Q@nii}ehP@H+5Wd~Fvtm1xa{Ho}=sjv!AJw7x)?
z5Uv`z+6b@B-&);ntSN#8ehJ@-<3atX>1edxn`1A+ji^!5tbt?&c+rF+1wgORFP4{O
zR!tp~B1x~xpI+g&*!}o_aFWQmcz2N3v;rH$j%szX2s)xOk<c#N{vO^<eHl0fi|#+#
z!#>`QC;wej|Ne+4p5~oP*O-SV)-7>x(bH2u&cb@^-XbT9!*O8O5qJ^$S-DUbd!LK(
z<UbOR&xe8g@q~DI`_n3{MVyMs#fPydei&_1Yqh|k6q9)eJtJ5TrgpBzxz*MMZo`tg
zY50A89B(8#f&ZeGpqERqGsmv$rklOST)eq@DJB`);W54#d+YrQZ{Qxowk+>w?OoeS
zY{z#dCO@0u4f@e|O-kW*xDY=_4`EgANjUIkZ`Q|0aWwspVLP@BFll}h@DChX=PTHL
zZ6$slevRk2u`TLb7uX*d1o}@QPfefJ6YgQa53uBNDVEOu06z;onEM;o*xr1)fGCL7
zs#X8iRMTI&zlLtEa1E&lDT&gLg7}Y!e<zW7=~%R~#X1^il26Hy1$2<9jvyb7jV*Vg
z7Q>|H2r@d=pA{NX1Rd-F(=Dq_>aT-_?{(^>@frLUhiUjF4wSeY8+PA}$w`YoI%Zh=
zz@th0Ul_R$0lp!p^?4lIY5k^!ijX#5gcE>o;`=o}gO5S{wF?ztle#UvibEhy!MpW-
z5<i9b5;a@1wkpE9tE;a&zAN~UQlUoGZE;RpFTythpM}^}@BoVc!qStH0diOBi%LaU
zd|fRS;rsEfa1d}7#Al@P?y1W-ST6^@fg_l2Cfg1y#j)xBl(*EWU?nY8gjWlOi#Q^r
z6(W8o_`YCfyZfW2v1lHTRg8mmF2vTrp6R^b2TT$Cx8SuD$%Ai{xCSp=|G-hc*R_hU
zxlCQ%r7`qNya_fKKN=#Jcz4JNerE&c;V=wW_koI#RZNvL%6*I}z~M+c;Aa$w+i)72
z3lLXP=NX^BTV1Kd%EttD%$bIz@&^Fhq%zB}0sVAL3NNS8&bVn_YP`V4W4$R0*hJ%W
zS`o{vW%<8jRqUa_OCgRxI)Eae?0xw8{TJRi%<r~uy+N5s<<COT=}cF+1AC_)(6ZU}
zzy^!@i6|zCn1hpC?oofNqcJGpSYR&1e$>2G^62cPGGZ=f+_QRo0eNpCV`Vmo<tv9k
zw4PepUzhun|Lp<6$`^?Lhxi#pKbhgb8)9R;%WLi<qBHAHR*OjATmtF{R{m!s#CLJ}
znY%OiAmY3p5Ud<~KzuuMyqvobC*c>Vrv$5f{hyFH1*c{B3l2?jbMFXN0K8G~3nj@#
zy5=o_kK)Mov;Tj4=N%_WRekYqRrk#7E-WmtAUQ`xl$<1IlqfEebCj%rh)9$lL6IO)
zvIHfAARrke2@6Y38-XP+apTN%z26_Fs=K<os=BJDyQgRO9Y1ZeJ(cT)bMHO(KJ61r
zu!3t|-N0`!&Itd9n}Bn?iZT(FU^Sdz{Q~%_gx_3)JOp1y^`8iWwYCQrgR?R)9cg`j
z=xet=Ln-zT1!w9t4ux`p)rlsrEsU1cS=ce=S4NAK&uf(Nd^Pemf6xqq6*2C=1kM-0
z=Kg+f0;5dPyXNFjXzO-km>YTf1|w;~jmGdSIL`s^4*-Hywk^JX$rv_61sqpIq23;2
z%$wjmh~DQj#$V>9Z2#sEtnz=W_RSA~4Z+z6l|ER)Ki5=5vK|BH88A=bFYgw*`RH>*
zYp~`(D-o=RBp1t3(sO-=JcJJcPhofoe+7@|8|*W|dH}6?xkA-nq6t<v>NiIh&!=P0
zkHUtVV)zNgqyQ$NXv9BIhV5t37nl*A6L)>}U<fb;!>+*1Q5&>_2CEXIkn4B_^ib#2
z&!xdXgb)26Lu}4a6su{p@|nFezmAddV_aY89zA_E34cd}{T0X>-3H%-QV9oxCnXkj
zQ1Xv}ozMU=0lBSTB7HHpS5PQzWq<#>Q9AE7SuX@Q7rpBPkTvicvSey$s>0+7G`ToH
zm}SpEnt_psWN(+^dR{;t!=WfVvk7XOFC$NgMPsoknv8Bi!s5k&eMuMATLHC|XZ(LJ
zi{9DX{=fY(q~@_^L;P=;|L+fh6Hw@RZR9~YhEjpXy(m=|?=xbI>bWSh=J_7*acGJt
zAbrpT6ml7YGLQd>Bmn>P_x}XxoOY$O9$&j7&@cTS=~V}#(i|tEFybMIP)tGN&ZWQ(
zDE!zecxbG;2uUWEMDJh|RAT2VU{B;Z{RGWvk0I^xdMM<b7T@~&p62g6A8HT3K<{}7
zYWI)(+kQZ)9jsLE4aQ(qRIZ^M(NoZ3D8w42h5iJEKleuS_-rUddp*+r-b56Ms|Q7k
zrXfcIg=|4%R-e%-f(07b=0y6VuTi7bML1<|a0+t$C%MbMMjbV?c+znc9xQk{9H((_
zB_%vmB=kq9A+Jhl&8#vQ<5qbVd<-QW*?AKYrF9W8c^+9P>D-Va9$E!nBFKBtWLdR{
zcM4pIG*LUD(C^cT^lg>2QwTFqR|<>g3uvJGlmC4e>ez=<TW~oU>AdFmuVFf}R;D5s
z`F!!aTBN`#i1a>$bS*0(0z4tbz6%1kq4v8t#cVa+LnN!m-)@-y{Z)<Q&4$LgZ_6mV
z@Ej#VwJYkM*P`}zFBJs_vm%CEfymJK(BJ07e>N4@w+JNy`2cF$laOJtF$%q`gGknA
zX!5-V*q&^n?f%9~$QaugkrRLE72ZV2E_WdB-N$Hh-V;smt;95>EBm8=ox>3k+71z(
zK`6xbBofenj3((L@%6VE@EPg@M<5c~iF9jwqb$fDqjB#Q|GM5nnzCIed5f}Qkbh5)
zrrbVAih4f9wo{Rze+<$>g8E+H5p=SKIj}ea&3%bkW@*t%f(2>}3n5E!48<6ysVGLz
zBnOtL^gV^(AtJUgSz#P{ysqjawid6VfpG-ISbu8FK!V_RPzrc0Jc9_`w#cjX9vYC-
zl89G;4bdd`F`9VZ#;=~85w|1DWfL?}{u{M}YT<D?=?*-7Vb6j=o`8FhZtweOaJ$ey
z_JyP);13{A#v+Ia9*0Q5Lqw$LS|nmgH0h5-#AXBZ467H6t;U?lyF1a}Z#Sfkxj(ec
zP)cE=VgC2z8pjQm>G&2BJ=QlP$-%s+4Xl8~&y!HXMx(O)y8LVU!2kEW$N-8WpF=4R
zqYOnt?bpFPjxsNo@Q<-GntZoJ;rOqSL3Ak!qedEXZHjkMTi6bbQwt#v^Fv5LejW1Q
zeT~MD!%?WQ)%XmJKZm0+WDsgMd!quHtDv^?5~bQ<*HRx5dJEn6u84qkps2(j(0IH(
zBA=sCA9)ICYPTX?veBCU_Y>8BikvG)AR-b%s%Xn^f!DyyD6ykDKaQvW^qfXb=Ur$X
zxgaqJmI19MSOL~RgTS+B;;$U|#uM^zIT&zE<?EY_tliWILT|?8aGX?)A;2K&%ZRIm
zhmo~Yh8m*#ZZv@{i$aZ0kj^XhFGM2tL0+g&5eZ2<@V<;DzSWU6c^~TZo2T4Aj7L$2
zUX2pr`wYKeWC_K06s&0(CZoOnC&<8g3w8QAkd=8L3j5qoY4AwGhsb)#p=Y!hB5WTZ
zjX`^*A-5OiLm`1Nh|F(~$o!Kj_RXOzudk73;xI%QZYph3><e>1u}b$mlnkvT1dHPq
zwJT2YAo&IIrYwa#1$Uzf^j-gR6s5w9iHI4G1EbJi@2@z9jj!0Q%m0Lh&Vf->Nh-fU
z-jZEWNs@(78-5jejUPnD?Q3Y#-I)Fx`|H6+$V;>*uqYzeTceQE5-2<KHAF0)M&ZY`
z=^rclZA66jLgVrfN+Hnq(0CapLeHZ1wjHJLcN!Svs5lpeQ0GN`VpH@y97Oc~jY6-V
zAcA@<GI}b*;OqLw{D4YCPnD}vUl?s|{G^nIpmEwO@C#N`Hum%l{n^QOL=*ho;2fx*
zif{4*YP*0xLoV7nkXhGcPzdVe`p%c_R0gMf?Zj#fK?DB}(SZFPauKH~TX8KKppHco
z$22q`rNxV=gRX@-?t`eFRy{;(B(k`dLzzT>MT5>sl<Tc}(0~yh6bfj9tt39*q5Bzx
z2D#;sJNg~c>#VLt1a=+d0zc2chHDXVun@XXHs+^jg4iFm$GcPRe;gvo$DzJ82#IEk
zsOSN+QSxTa<Nx=RvTdu4*??e`k&=|d@+(L)HW-EFN2AH>J2Y|C43|fctbkB`;NM)}
zWt|9R2?v4Z=!?+4!Ee4-D|USN2({In(8Rk0(l&j7h}R?NxsO7|$lA5;qs{OQGMtV;
z9-|>>O!_nO?EDUS?t2i)JQs~mvqc@O$tX|?f$o6b|J?rdoQq!KK4^ZKgx=jF$kVef
zrS_W!U;6u=h&+Asp#HcU3OO!-q!CY|zVjZ^Q0<Av#_F(LbQ4?E|E?fd6)nAb-(bH;
z@pyJP(&{#jV;zpXjNP?1OpE@uVva-&>2l!I&~tj9kjE%y;QWZX307vzKp}=xkk~M5
zST8jkNLofHzz1lee;rxc2cd~zDvEQb!JiO0ITv-hsldS*F7<gd0IZ1yya$mLxmku|
z1b7#@%@;%y!)a&&I1fw*8lXJN31q?lBo#Hi9(h97Lmq>h(L{R^=?1Q6(Ihn&s$ug}
z^vqxIf1j0cBJw63iL@s}Nxx|8eyBg4jf||p=$%KPtk-uTg8*bCbmPlg9aJ&TAWf%R
zQa}X+tZZ>x#|fxR>e2aL<TV+JJete+zfDE=omOzXkpDf=|6US}FOw>^o5%kS6RbeU
zUJ4tg%K{&dYE^BGCifLk(aSH9NA4N)E}ui>B&%kqztN3K8=QoqBSX+V9FIJJ2cYq3
zGV-!sj{0wZX)V7(-lUU}5jPyQi(L@W8ivN?|DyIg0eSfkBfB_!BJ#)_Mk!-+MKspG
zg2I?rA!9wlFpBISyCCv9Ch^SGyY7bG)##Mho{R*MV;#sNkM&<0c0~H0V1WkNJy9$<
z7@!|Rnv5<0f6?bkQToS7q+AE;dMgu9&8=n8pjtZ<E+dNBgC<uiyYXGh$>kM@Xq=C%
zxKBtYMlT@m!Q9A_xzykH=NT^hf0SyvOhMX%SCOkaD?Ubr|Arz$6L{EeKoda4YW8@9
zyjls*?7v9&wG<ktPV=wz2GVIEzD9%hyp*yPZ$+MrQz%V_vjPrA&+ZIF(mRpPBn@^%
zhS8O1FrN<*w5r8<15_-M6eh)U6S6d8w61efDo|S$ig%s5>bg%x{cIWJ9lZp3CSE}k
z&aX*s4~zT92ngR2s2x={-ryLOAwrL=i{n<~ZRC~R7<qM8Mj3FusBgT4-tnV|h%Mj8
z^YsTtp|NliL|B$VMC%pQhi^rm*N>6mwGT0cpId~F&=`Cu^7M2d(z8D@X4gaoY2QTe
z<~1~4??iUN{~MG@=CWwKU61s|es@G+(5%=2&Fy`MLuICUUlG)!yuMKfg!Uj<pb`d~
zAur6e`0;cPXHi+D{zG(-_*wsa8#Rp7Fa*occ&Q4DR-hXZs|As3^l7wILIYvac&|W2
zZz#|i(vo?|vR)X4@$N;IX_~6ZU!iBe7$Qu!q363{`fKNTM6%XF6Xrvd1oBxCc$qp;
zO8wesa;<#d1uC=zHQwr2<n0@bCXOwUHT4|nJ#Y6Q{lVghtes48k<{qIbTbKdLY|XL
z(L^v83N!a4?c`%4)SiNxWlN%T=+BdOs=)8jgcInx<|0()BqAU9NJNb1N0Z02$_+F;
zS7|%5;9b;?=0*m^TZnXifxMsl0&`Tf$tC^k3eLL-(S&Ip0LS6WkY;QFM8?VtjRusO
z8HKWEe}XLe)e!+3>i_<hf8GZW0jM`qtv@ju5&Iocn^*v4!aaz_m#fkE@D1wAN7DE*
z2wCwuaypDadaf=szWxz;B}X8lI3A6ekD)nfGqRP6n2wClio&K&lrLg#L`2s>Mts`y
zbfGb`Vfv;9>#vSP{kdwK=nL9~V1WeRD<R#?tLUW{BBo3Sb^O6-Fld$d_$^BMn_ZA4
ze>@@)S;UF4Ft`|#sJ#l{S4Ee8qhkAsD7)|{$o2dNV&!Sb==&(?U}ZGuKZc0pkJ8-%
zpowJ-R6w=cKSm&s&kBP=m_v|Pty0`;2z7|`C1aV6tlQyekR6OXZy%ruBn>8@Hjqb_
z@p9<i$5SQNAJEtY>DO*WM07C};`=(qzN?^T60FI#GHRRSGMs-4H1MB}yhEp`$fOxc
zw7@+`oH!qO))qjMN3-z=y0<Pwta4~_{00&6z~ekWFgY}HEktw%;e4q7gbPb9Kup$T
zgX{Udhzy+7(fw?ILW~Qe5XxvoBJV<NA$vA=|Kk&6NbZd${y9-wy9TxKpbWxvGzR_w
zNh10){k#|Tr!$cza30i7wnW;+!N`F84{CQ4kyh<!Wc+2DE2EoK4vn2TWW;}i`t!|b
zS)hd?_bO$)-<9balCI4-mD%R?!a;4lq2WPjFM<W~T+NRj-`uDJJccZ+v8YpbqsjkF
zWIbo{VhMHik@5cbqJGP}99g4tA^k*_uv)|wX=$94L5tv8I!)NaSB|HV`*$B?>3oay
zZfP(IS#=wu_b>{1ZWd3uKPXLjbu>78NV_(Yn9B7ja0k^B^PKeEYjhhTkip6U7bDNe
z`J~fm6p&@S6uQ?}P)F_ce{Yv{#<F4+M5rD{{cdGMzTZ#U$;Z;j+c6Toqm7W|Ju1Wb
z7eS;YIL-o;FTOelKKbz5e-3#eUO?n;8Ds#p8r^7;UIT@ujz*KqC#WwDMFcRwB1At^
zpNN%BbMsRpYqFs<OYo4_@K~hX8G<JCn~_KHN@SQ!^ncrx1{s_!#<z%=9EA+&!H7_u
zjflzdh^Y5c%EsK1lo_Q>#OKHhcRU&k=RyQ=FGPSANB8h7nlIl%5u^R7ReB_vynK$l
zwkskswKtk;*7lG4A!_UQAwx45|8_#-$hVpAu<E*?&PAN#u%rKdP2yH{pxp=-C@#Jb
zr3{5m)OjC8;fbSACq4k_2Qrmv0C4K7AvWIs4#&I4p|s(v(L{YkJqHF&5?=a76Qt5!
zfho(ji^8=?*mxFl_kTfpGWZx0RsI5L0LCG!d|28GMT7IIC{*a6vJx*)XN{?f(C&FC
zc0P{2S7LvGQuyE!<jMLJSzN27JjRnq-!U(;fOkZpv1dqEX}%q>Bnpv?M3cvcXrdXF
zV&8d@uI)WE`R;&1)Q@MphO-dqSOJAQwnT$ArKP=`dC{{4jR)O`!0d^LePe{QeZx11
zsLzQ!LRTXa{+RB<fF{H!g7rPB$<*AySB|4n6P2HwWBMBMOoQoYLO&cC6|<qT91ox|
z;znd}eu&139mqCbv<rGszdae<*KEiTJC+hzz8{hNaVU#>1np6z_<a<$I0*HjK}f)T
z7z%@}gRb{o)Q2u6iVHYUU4N<!A0aK)?v%WMJ0N3tab#$|jmFVm`sZu_j32&i7|A*s
zy~A2H^)jO!2^MIu+!<NX>!Mii{%DZ87?H255yxJ*vI!)99E0Q3MX-WFa8Z4gHMafG
z1bP4>KWVF_`%v90*YVP3HWiRJVHNbO_D*q<6A*cL3X#E=NUt%t4Gs8*pvmkjGzr!s
zcVRr?U+)G;!1*L4fqcFAHJZrZLDusZ{x$XmpP~-ei3X&V5&0TLsd{lOe1W`$b0f=b
z2qJ1<q3pY1eZ0nIU>-DBjzRalBeGJTNU`r=B*6WQQn`kO$Q};Z2~AkXBP)49<UxzV
zRP-EgMU#546xH7|p0iar15I`gCEeN}|1&;f`}wF^i;rRWL^BFO24#z5SW{8L!hVRH
z4@Z;f6Nnh!f!h5TWVmcex^gn@h*yzOw;Af&OQHK7iRP$(qVeNX|G)PqRL`*=;UUlZ
z#i)NSh2Fu&$UAo^QO?ioO#NHb=MP0*zz*cSz8<xM#t6s*a@CmdAc$jJTyv{B(5?h4
z8G5dHWM#y~d=pUD5Htf>q~&WQmT(WU;J-!|`~lgo$|L7gCd$R)Unop+HF9mfhR8+|
zK1CMB8c1953KAU-OL@-AP{%w8O@iH&mOe;}Cy_O^secVmQxeG6gV)iZy#x~0UxIX5
zC(`$F8W$sv<>qK2xdoA@<49ki^>%c>OQYhtXHZ(&XO%u)Un9_oCXFu;sX73K<L*qk
z|0(F%{0g;&Eae&ktbj=Dt*BiOMIo3nR8%DR28G^MLmsQWNhi2(IYO8HHoC@uI4yw2
z;IR?A4I>c4mkuyD2?Pr?vblJzTVb^tlMuPs4UNqUqj&QPGMev4_y0O-ck44y=OMkf
ztC3-_ATmOCLZP|UkjG{WYO4>R5;|G*tj)x96rl)e88(7oRiYPpua8AhleZJMP6G#j
zapyiCDZn=Vch)g06$Vhl_TP5NE!d4nPiBE-9|WOaQ5LtZa+`jENY3dfTzE&;D=U#K
zr^W}6C+h&zX<cMt{f*jU#ut!<u^XDCz9L%@)iV&m_$v|;e~Vn^S?~zD?#+;g=UGYu
z`B)@W;2)2Y4~C;b?+i4EoJZfwC_IEbZOfp+=xjvdE+>6P)fgmx?m`ycD#-F3jjGP~
z2TnwN=x9o{tgcMC?-BmKCnG&%Ckl&ZK?mw5Zz5x14dfxMa@9wads+>Vz$K6<yKNBk
zPJ`xw(4{Yl?s<&=qwfvpjflexLk3Y8b4UDE26?d{7nuOoFPMltqdTI0xCCnd<57Qj
z0*zxMQFdIz%ipvRpCN;4KQt~3MdRC5h;05J@`TSo;m1>vRHDW6aB=>~A>-uss!gH^
z%yy_w+9ouy7Gxqkz-#E^IvRzuzi#9~0}LR773gouNXBGj1=iZLR8PnF^|Tx>^Xf-v
za9bpN4Kd4Z`~g{JJD`a;t%j%GLGe{YnD+NS-AId43pb&O?NsE6_>S~irWq);bv`6$
zyc&g3)2xpe#>0q|Zh;1*=aE+{)}vKpnWIU_n=%+p{D&dpdo9^S`cW8-Na+wnEOzyO
zdxZ2^lHEv4xF{N^-bF+$_`MY&g@ce6;S5UEuhZ7D+8tTF7ocZ42O?@&ZOWjX9zZDz
z^M$AlV@j&biJm(_ujy|>5sV5RrJ|=52#moXYcSC3M2*A4C|`#VG^thoRs}<#$LjxQ
z5`poko&OBo<ML>d`v#Hrr%}6j4wdE@$SWsIM&sKtXp9?z#NcP5rg9AO=oe4~;x8!F
z*gWBUd4pKj|GqEf-j^W~`~Wgu-$U||Lul1|^4vyOZ{G+-J(_|6L$Hi-p}I!YCsY+1
zH5K0uh8!L_JkvqJbYe{27lUSgOQVS(bTJeDQ)rTZ8ciIH&S;AA%3Os8;p_a*DAG0j
zQ;_H9exzl3mGq?WbL2T%4!MB;g~9<@Ez$oV&CeES;C&Wl?W88B6_}1D{!XOl*$xRA
z@1k}nwHBtKf{a5E$yx-t!pETcPHFKds;<2Ns%XBOe~c$cS12|sc0z>}FGJzZdC;>-
z6PMl!J-@%B>s|yAweOO4iooiqo&3%JbW+1><~UW0!H1nhepn2`Ik=IM+$JI*Grh*4
z*TnkBmqL?iunu9MVXXEbNc<iqQ^SyFI?;m_M&9*s8ePDl@puO%0&I->)5>T(GDwQ>
z9C{8<AVM+_i=GB3p!+!$5v`$UEIJzX%RNwd@jFCBuR;cIodvZkP~8x=MTYW6DfV96
zzmAQO7xDn)bzBh<l-JR?_$G>M>_TZ7sK&rCjnrL1X?eE>iSMg100@>5u`(_ZE#yne
zvNkl-8slP2zWDJ>9?x|6M9anCkaG+53_W8><uNN_I?@^)gGAxaQFA>k$1l84lK}3A
z2+{D0--B$bRnX-1I_dzm*yJRX1+xm8a9=>yN!qNKcTs~~3+YUrMlt@Z1LA)WDclO(
z+Y5-i^u<E@Gn%mWLxk;BG+_Uv5628}Gb)F%CbH<RNALY~<Yh^NPY}_W0}-})&_Me+
z(tGvQqTQHMEvpyMV7WKyKeez9BFz6r<ZpRI)ILnwDFQ>0$Mk>59shk48cnU63X!bY
zk=O03@ZVj)#gJ1)If4-*g=f0Y@PLAG@Q7XH8RVtOh5o!EdI#$RM^x-LnCf*1U215s
z0vP{TIk$0Ql@?(X^6;#UjK!(Q6Ep*bpx;6v;d@XfV>^h*`-0aI!Q33Z<0a7e{Q@#J
zZ${+nbJTwiq~1cW)s1p%WXP7oM5d{Z@c;T4>ibtB^0z!9{_CO0&HHE`xyk?U7m%Ub
zjyMMOr!Q)4STEX|U^y6{EJczlkTthXdDt)*zrwdx8cqXJ<zUD;g{)qzafl#Qu0&od
zZ1oqUH(CY_78@sRYzQ(P6OZ{G5_f-&ETBrfj3%-DQ9;aZN~?t@;bla!c0wVnPtkyv
z7SAIRvlW`i-$J6-tX9|qsPp~|=@(w7zU6nqxEh6Nc0>sYPa*Qq2yfB<(EC^jSwz1_
zMB)~*k<6RX#Jd7|24^FS_Exf2mi{psKp#Pa$d8cKIw4`706}?$r;+8o7JB~gWV{BD
z$n{$!DE)<htheeo4vtvX9AI)(5Ug--$vKdB40)$SwkkiVtIj1|58xSxf=QMC`=I~*
zJD)ACf{dhH9EDux^6z4HG?0ZWYX`NZQhTrrKH+qlBYM|}+8qCwe^dt<cn2Z^;-V1s
zs;F(Bi%9>MD3fs?24>OIFvg?M`!CSF%!|gWyU;yfh9W87q4snv^{*Yd0*W}K!7qT9
zV$6~PiZ+~!#=!ZIk+?CM3;I+evWQ}7hK9AdEoh?m3fi1t35i42Dai9Ok>cXel_A1t
z7=i^~Grg>_{sl#L;ut+vfLBqY`v;ovE{NaMU(yFJX$trhP2iUyA@>_ZF9doOB81nW
z8bu>Xw|vg+=$ZZwm3Wv&I$c+Q2aq+kJDQk3M%s(4-kAF+B^K0Mq_h%uqGzxXsx@>k
zBG0=w;MgA_%euq=ULTQ(k;r09i?>n8U<j)Hwk{%r?@+re#}eqCUPhs%jr{#zO>y2u
zQF6u`sGV<#h`{q1u06me=)IqVJh(%VSF|1sMHcc9N+Hd!;x-O?bq+&^W5_#R<fp?8
zd`{WnAn|>{q&~tFWX+%A$mm(bzn6ai-x_$xzwS8^!3u{615a`quVWb+t;cF+__gBL
z8~Wex7XPScVo*CBf{52ms6Stg%H#y=`t3q#f$V{bFVJ{(02&8pN8{;bC~NU_RB~qq
zGNw*PdeG>(z0^<x>BT)MuVXc2<oT%C0=`7vt{MKdHU^E;Uv1=nH%)&91A<^B;vLlJ
zdeIAAHOtNphP<1}i#6W=j)^U&a>wt2CdebuBpT`2Q8rLw81qwL7?@*`*Th5d?<lcy
zFY;uqj6x5=VxMX1Sp6Rw@NYvT?JY{;$TYYS5zC{{An_g2Af!N9&}0&RuMUZx_n^*#
zr9K`<A+S{`RXF|vy_>$G7ikgZN1huGk;PBZvq+0+h>S0YEUx!aS&pelx3y?!+u<lg
zITn$kpCi)!c#8APg(j#8D0I3DDlPF~(oQj0z~Ap-)Fu}}B)wi7g*;%Vf|-uv1Rms?
zRiTr}fQLgKkB;n~>>>&#Gub#3)o;5Lc`8Twzi))v;r9_Kg>r(m0Gh16&T_IKRM_EU
z3l)ZYo&h|gPc!vg5$|AK<arMlV%;71-1lU9D8u(KG!M*)ik{wwLX0<|XE+|U?Tx4@
z(P(>2MF#q@$fGqF$rH{%&*Mnc-wVj=e<2!wDpx!Sl9AFB<PGN4TN1ab#<nQT`_GK~
zRl_ljX7)!T4{@rHd%YOw1Pf%vE{0s~FOn_{2B<@;EJEr5_G8p=mx$ZIbyKx~>yUS#
z!$0N@)tfl}6~<oMhp0o1Ko;8%k;mj%G^j)ok5QDgF9)IlJB`=oTSR77^#A+6$U~Av
zk9GmN-!qXXVg`w8_Ep`p=kFiJo+u0FA^Ij<e+hY)mPN$i0z_<1qA_b--iyTDE2F{h
zFNlC$OtxqEAC&gJDAGXej|kCaD2d{8M5+!#ge*;&kQ@p_eu?y7haqptKQdfb7^k83
zxH5XCn~+_v6<|F?7SBT-w2x6c2)q(~uDon;=yasaY@u4|JoMgwhA;3pYJ-oUacpta
zJ|>0sSpa#!GFM5Ku_lt0G&+Szl?U|t-nobp84ZQ;$y)^0rh0j-HPEw)iWq#0LWKvQ
zIbj}TC_ID0Rga=JGa7k%)?wfiE`#I=rz1i-2hyt^g(5q<ATQOo=viJ3W(Onzc_RLh
zWh%vABCX`u>g_5~_EL63ZTOpv_Y{rBmS@<8CM=CpiJ5_51=t$JfNwyJEhQu>cm2fb
z%1;G?#a9#7a5A;@SOF#?vEo%|B8>FDIq@FR8UD2_8EWW%MP7_ih<IF2w3q5{$nps)
zV828<ozNS|TH4nC{s=wuv@nz^nP2Z;?`K4ohNyamy;K+X{1y$CbD;3o14M^O)8aie
zD9n%E%V}s}`3va<>q!`eiY*RD&ut&{4DTmfq16wNmu(30h8~1MaKA$nM%pEtjziD&
zI7E5}QGZ3_?U1o^l7AiZq5G-_3nEedljvTD`^OA2XNRK((g1>`|L<}OMU$pQ2-a(x
z9Gc2@MCAEqq%Hb7wEg@jd7>^D6e`R)<*KQ$dR0PwD0mLNo)brU8VZx_75gzk>5h`u
zdKuI%gyh%tB{CFtMMiNC3JE=j+SAkiHn*WUV-vEiPSLJ-6B&tHAY)`PO2YZgko@BZ
zXs#?r<jXKS0*_Y--@^~zI8pm<MfwnAGK$sP8*;QD0@Lutohvaj5iHO|u{#nNH{``e
zkgNhV(odbDJ3gv4R36XS-~W$|Dz{95ufbUY${OAzq)XTl5tnXctyE$<S`c(qG%3GD
z`Udwe)Nz9)O=h4By|nlSS(ytXq4~{-C{>8q%brz%YJwGr-`7MU%pah^<$n6M$nvMi
zlQTOaS-(P)-L*7EL^}zE%!VLO;<89T@dla<vfw%t?tL4DbJHLQ)t-$8;=yDxO3JVd
zy7s$}2WGAe*Aa!Yknyn^N<P>CoG+2*BFH$L$N%rFB_bkWaLD1&=@k0Aq=6p>WerLO
zRDj_$V4>W6C{*Y;fv3u$$0t<<zr;kv^w~5724uu1hluunLz^#-et$B&e=YbPxE~`A
z_;1i0aR>5>?v1>@zegeM87LC+M`{#39zb{>ja?(q+%-SaR^FLn-wu?iSqk$-h3cxE
z3g1Iv$s6mq-il+#oU?u$jmGm2YHZhM%xnY;^g>rhF2M1~yU|Ge2ZhV>!5V^5AE!+7
zP-!y;c}&I8;VU8+tq!W##I~&W36s6@!RAgB|GpN96CWm8@c9xVBZnX&(T&{7X>bmj
zoUccrj<IADqEAGF+lt7O^AH;JqP%&%R96q4OzFAZhMvXFC=B{G3eEL}XiY%{MLUtp
zeS6d?@1b#p_5OxDnHwW--i@g9pG<5*KzIst0Om42`KU49{2X~sf>j2Fqx-7IGvXjZ
z{x0%Xt&NEM*L55V)aIrl(tf;u%zuaeJ|uLV0l`YWu2d}qp~4QlR)z|Flu?T_{2wdd
z{XC>7GMa>-)pWWAjDenlLr+0<yK0n|NWyHCG8`L;75(q0f#BkTvMM9P8#*zwm?;l$
zu7F>v%>VZ~$m4x88uNaH2;6bV06Y?nMZu!aC(<5ETQvfoAt}V9vR|X8nLw*`RV{a8
z1yt6-;n6q-o#}&{$i}lBiyhFs*mTT{1Pf$=%!}CfH}rA+rwT9DzNmrL6bA;2N~<1M
zP@yN%1N{+l<3=E{MUSUk<Q%p0erWRhKDzEBW3~;}8N3;ZLth{rIhjtW68A?auKyom
z?<W#(AY!%w8n9nPUZ|xi?!R)8*lw!lgj@V`?~JV0p!jKD3lv^}LYsS`f%bLeeaj;F
zPr_r!i@7B72AzUD7}rqy+6~E}jZM&VxD7qqCDDCMO4ug}dm)1JE41v%QYh?F4^~E@
z)0@zJ&q*jzBNVb5irzPfY&48q={!QG6NC!;4ZX-)un^^KdtNe>Xo!PBUMypvyPzi1
zM{iXg=_>z8opt46yin_)%Y8HS+Xkr3Rv849$B594Esy$B;02u%^@-(>0reizGoFX~
z%j~Fa{@&mI_lVd{K|0Fc&^I|k8zPd89OVCT6KXBeUH%SsMp2Q*bfw0H2UkP9=c0xj
ztp;XRf(6P3TL^hYMxhs;6^kItIs9&?qt3b*vTS1E5G=<Nt}PhZ-aa5<8JEBki};ME
zqR?o}VD%jG^!yPOwR@B3QVl`aa5Xf*yp6I@(%@Y*!2T3@cg7=9l10<-B(hw0K%({0
z$kK3)$lH*L?RyfAe+vrd?Scr=TgdaYbj<c?alL=sZP7&kU!?zPROR(?C~VP%tmf^|
zwLeL*@^BRe=pdSKtctAghtb5e3bIHmg~Ms_W3;5lwMf4)1ZBh3gE<hHf64#%$|yWq
z41-muAm>2g8&DXsZaq>QJREY4q0>n$kJ3=YoM$R(?<PbPhSNt6Ru~<whufH{*xw*R
zJOUXUqw#Bdk$yq+D6ET~LD-?V7VuJ)20L^c6<(__mZDVRVh}RqUPbM0Dljc#Y#xO|
z*6Sd0u{I)Lff4W~iatDm42>l+-(|ZXdO0dkB;>zn44I1F@5N}mtISL!^bFUbtgJ(w
zaM0q;rtH{#!BHsk5w*a2!!a`xtN@!MQt=NW7Bn{CFU1l0@|H)nhe8D&9l-etX;0Rs
zECsck{Tp0dr%<b&6)4LpGMmitMe{NHk3k*3t8$+h{2u9jx{=o?ZvDBD$T~Y1WhPE1
zec15dh}a(Ce|pg1lLdDn5_163R!w&l_N|PW_Yle~jJfZB_}8;LI>vkc@%vf<`d^5o
zu1~3!)_5{xvDQF0@(j$4p22YB)_)&`Ds!O$$94SdGXIzP5ea$`O(Ywl3G3xLuVsjT
zyqEp!S_zTBX>}ei2*YfTNY#%il`AMisMQam<b9Zn2I!HZU~uSidg*XHyc#4c=;c{a
zGPPolzZBKQV24m%c(iU9w2Y4H1lQ2#&sa)^%RK1a+=SZ46Ud7`Ea{pe48zqalJDXl
zm#18lRdHWVQpV$Al%A>I_sx6A2ni9_#P|6eO5#`<&7B*eWS9jJ=@^R)ncI=5e4y9h
z0_i)~L*(&5<hdV##=9WN=rTmO0y)lN=%wA%_tTq_z`Zfp85zkf!K^^AK%%yNP}n7E
z-LE);^%@#DUZE)B4z_bfBbGh_5xA(MN^#}XjAo1_(i#X5+v&%kcUZ39auWA?4^3!?
zqLL1ih+nAqazx;6L7inJ=`~FkA>wx#8hkz=dnNWO5kWWug(51K1*-C3B}{lXA`-h7
zvV_MV>um9i*Hnq85Yb)<S+qBxXL@)aj~m8qh|H~w+T@)C8V8{=%JVmLpF1Fr;1hi~
z_tA(z{t}U)RsCzI2V0}b>}>xNgrp-;%H%bmHa?qAN`}!if~C(Orx%y_<*M{I@cbb(
z%Bd3f@dzrv$4(k^Qy#u`Q5fsv=*_diGxF4RxE@~h`mXh23~C?4P?Cd#yaltNe*6_8
z{6`VHszX`dU7GR;!9r*Zc#`_C1SMI=aypsQgZf7$nN5qwQK)bwG}dj747wGOXLk%T
zp8tvZ&p;+z<I%XXJ-Uy@(VX}?G63&IM$;%%4&zhmTlJwF20uL55bxDWs12o!%Jdnt
z3c&(d;A^4mx-pc6n?!^nNLB%ff*(YK#MSz_IOso%8r+d+U85=(92E>r4m*rNA-Swo
z&I6B5RaRq)QW2M;fjn62?`En+<RI_Wo+xZM2MQaejbC>oBDW+Wb`K$~QC9EKX~?5h
zdEQ<^Z8#{dQ3Kbb0e&w;kjEicc3<85uOR}lIBG8!qGxvseG8R@F$$cYqEOl5q2KeA
zhX@w}{^K~@)rWJfkJ{IH{$~&gWT*y~L?rJ%RI_J6;I|p}zYKZdF8BXE7mcc|69Lu7
zGYodC4I|fYWxd8>nwO`?<nWA}=~Jj}jn6~*`e?&Y-)v}6#7?(>+gP>P%}5sTGP;Kg
z(6})S)oh!BN}ha-Jm|kCdMsER_3N;=D$qLqFYe?u>UGVH##vDGVXFV%%lp?-LVeDX
zZZy9A3K6&;Bcu6E|G#ghRP^*3Br#}o0#++A0nLZoqj$X+(kG8W_g$}apaciB4soB4
z6yPXe8V>LDQ6!%lvl77q=~3oKL}m&VnP3s5WHK7ek4O5IeGpLyXU*J=GVuOPLW;ec
zTp!T4pqz!G-e|%*4GNz|>WWfmEWSeNx;vr_v!qbqNHj1Vib@!ClU~<04rR%0j0Vp!
zD3dJ<@%V^p&081suQY!>N+sSKP2OW^4AGiEX~E_zQCNB!B3zXoxC|)k-My6bNKl=`
zJQ<%XEBqa+&5Oc(NUQb)dT&dh%H#E*gOVk`2qJAiBfTf)r)VNP2(`=8{NI}vA`IZ+
z(BYSE@Qf=@G=?7IGTr2vZt@fevV5~4#jBW&a)LEC85Vj@17jSm)95x_Z*~+iJinmi
zUH%4z(l$U|%Uw{Y`wysXj6+(dAaihe00&;ul^MXS?;j^1Mp-Z?8fyZN%F>jI-!6cR
z#&Y!ikpzX0H%EkPUUc98MPu&W=zd;9C0o{}x{z|~;F!L8iGmd-evZbFQ~P{P5gNNb
zVpkebHX;LNHG&0lU49RFQeMYjh_V>?D{o}e{6B4qtg;1=t9}y7st9ly3S-@93>#LK
zY|sF$wFP5(ZqV5m&v-B0{xwE=gi0Znnxn;?XaKqfg#w=>zQXvWXacwmxx@cQV&T;?
zJccIhgONo$jcm)tRN{7I9lt^SOXggM2ETogreZ9zHj}b5)8I=)L<ga^aWK-*{GALW
zPOUNW{e>H9j_P5ko+;ua)IZik;`;R|Ef19y2ch<PFtX~GMB&sl7>XvKdy!XQDCL#q
z=K#LT7MRQa@qjM3m%LlR1Eza<rg?dKLxihI=%8HC9u!!uH|w(sf%Y`-m}V3dT?ZKe
zuSEQ9I(nB|p|NxuWV{`Y$i~IUyYms{WJ(&s7_UN&TL}7c5F%WbV0}XwBGm+|9+Y3i
z9uyZx21GdjfwZ6tATRFTsI1AE$as7Q>AcQEV^Jekk;sO|gyQ-J<4D-<`9oN`)lq6;
z1@x{jXvD$NVpb$r0X9ZeeQ!hAT0o?wKLZ%<ca%@SSqycQhbdoQ?Ih$Cd5n@JR)n-z
zv0kiT36OfcC!Z5j62Xwlixt2_Bx7AP0DXk?1yPuatbw(Wb^R`K{ins{XcD>5-|r(d
z;AX`?k)`+@B85*8@$6IL8suR*09l<A5Ybww&f^7`f!anV@&x@1k+^&5+wwkP#AOkd
zBfcqYjoQ&^$m2E_^%v@07kMQvLte@*vMs2(FY-=p>R;D(6f3qDy}6w<F+>=^ppph1
zcueW-q}$|hG0h}aATrrS^*V$F>R9Nx7CPO)4;KVK`~LB{{Ze3lfIL?|BA?s6sD9dP
zXbd<MMFj4s*kgHunphDq(Ursl1P16h|9cTcs^;?l9Zj&Zm?+ifUPHge9^_+W+^vTU
zG0^z`9%}oKA_Md#)GxEF^w2jn)S;OYh7zf2gsE7KBay-PdP9zu60<VF0$J7vA`inq
zV@fGZ!4C<B!U4PZ`<_YpVz_%Di~BX?B`c!1p1tvW&sJHv1rL#gDxxF}mzNZZc%K@?
z%yl!BPJ9N1-OfPExr`>B2t0?}?Y}~vsHsF(jgLYBHTs2-ckti-xwF=*dL0cuo1uy5
zH8eQaON_2W9)p9BEB`|zT(3728OC{NP~Qg$E?-5HMr{3{lw(V*YqSQIK>EA;{OcG_
zDGZkt-$P!f|DwrbIZ9rvG*}q5r>hVln~k!icFJzAlO~XjI2crjv&qCNzyfGoelPUf
zBFOXeRU=R28HWznBky_?8h>jOk)g6LB1}FKPxJuFpoH>_;qM_&aJ>Te<tVR=KM(4A
zKSGHz6Jz(RWuQhAyDrpVS0$a-_F^=KjYf087U+JDLGS!H6n33~`swfKV{ON_fwDeo
zX9@P5WbH;H%0^_wtWK~%nGruhSy^uxLzgrw#a{CjWtywv@0Xwsv?;QtgY3G^kwx?o
z(4}fv!H1*{`!V&E4)_3ABq`eA7SEokm7avi(|2evN^-4Ug0vO4qelEJ>FZ5RL|U8m
z&_MbY@+M^!{6FlU^Oxv-euz9Mb7nkFfGZFgI>^7ikCBHmqT+sLT#LdMJNVc46bf_x
zEPC^rvtObIt5_ST{Pq6@dD50dp}_5_KLquENFTHg3i<qmQV1puPC)H=LDZ)z76Gqn
zw_P-tY}7&vjryPzMQ7+Y4^6nknsLIxxgM30Nhr8i*GI<YZ_)U$PU(!*?OB^Upf+hJ
z3DTh?a8E2|>jcHVt3OLoY%h+B`dmP;zJWT5_a}SIHucZ3F`5^qP&@njc_fA(g658m
zQBuz)=-sb`bWH{ktWk(`KZb}{R9(aNgrU~+tA>;P6@{=gnoqJsSsDUMu!N_P$74R!
z8NyzauL%*X3Qy8Y=*7K-NL8?C@d~Kpj-w305;~EM<r5M;QL!lvW2rIl8Y3@Q9T<a3
z100NMT78SGt0+uIx`Q>4rs+MhrNjOgS+Dyc58-zxxu6O)G9>?r-s54EYaHsGBLkv!
zFd`unk!!yZMC&dT(%cYD0RKWB$vvw#O}ytEBxg~Cuq(2Jk3t^AMM<xXs>BG?Uw(@g
z&z%>AeA41asEwV82>qgz3XjHNFq&{$O0ZgpamY9bFS^}@-tifcd-MUGap=kw7?dke
z@R~9moQ({xr@@)0n79)%Vk@%$wm=(&GYHp1<3YWN4NFnd5(Y->c;uOH#(H!=L;dkF
zG#0&v=7*ox*l!BTx;!0u^ut-Zuc3bO6V(3KLUj!1K+pIMH0L~k#=fO!CxnguJ{_bk
z9Dxkbk+n8#G%Ud?;UnZaeijj?Z9~6*uYA)ocfd5%*#C?=M4&gB8@c<RuH4s&COaRZ
z&KQBjVxyxG$%`tnPzKj2)SEGMIU*TPp#bYZ6u%C92h~;81H6DNhQlZoDIF2BZ4|CX
z1ISta=X2!gDMN}f6c-~ez^TYX(u-<3)r-r~V0M^)Jrj{9>U#<Mq{S0x;9Lb+*4H5d
zab(K<tNl~{zfH;Yz9I_6-iW-6vr~UPn3eov{Sy(YxyZi2^Iwn^{v}H8NFWboBlB#C
zY_udqX#6mm>zJB_M;nOkDH%4P@W$u<zZ<^pU%|Kx&K2m)71ETDs0TYC!y!#wq;=7l
z`e~?#|AgAaI|)lts&y53lD<U*|E<J5<DN(I__GP+M$1}g-Ok$(NvefEAbG+s(Kr*8
zaPz#s-KuE3+z1(iiz3h0Xr$x26NPExl9rl_K9j1@aq1V~?}@MJYc(vvs>XV#q27%=
zDeq80CSn#~{tYU3a0sRBnZd|49;)Bu#F2y1lth<VFpj8Vqg8Nl@%(ZTbq%6lqfptl
zNQ^oKd5Ge0F%s<Fg(l+X$YxcYfChzUQRjFl<Ng6oL1f}`q=A}*GI{F7#fWGffeP$>
zf^<WDD8W#~%gFj&8hNwMM;fM+fv!-S3$MKd)gi(>(BpdsI#C$>HUIZj(fv=U<N9Vt
z<nI;#8dgW8I=;?ujExXEItnEetWLH<k3s0T=^}TKuQ}&<<Qy+dR-28HC?Vof^lVo_
z&*?MZnnp+RJWt6mLvm_DO;Vcu02#3Nm;YRKwh>f&8dlJL(He*v^{=3;29{ZhQrlmg
zq)>K!@7qOL)s=Oi4o4pT6Od=C79K?N!I!9iB&`rpKw8RUQK+yJjnTKFXLl8H6nu&d
ztX&wWMNgdsEll)hF%+(Cd3X>k!HUB{D4XRbBrqIbxj~HR{7w|+TL8V?4%D#@F5fJY
zpp8KjcZ?@0b`%L*+%+>04GuXe3i~pM{tFSu%aK;<IV4by!enHHt&KcAqmidCEj~en
zZY^ZlK2hH#GX=fR1%O9Tsf6*=m$?|=BIHdu8j+085s{fEX{VGJgRHK3kw^3t<Ow{7
zQjyKd(Lel3rz0=G4k#SBm;d=8^?L%2MPZr|h@h>6Ds!hr2kK9cBCqb8D4`%NX7g_`
zD9+f_I#>aMJ~Ml+r!^Ay63#<)qyB}S`2;i;ZA<;S!dUcr4tdvONWQm`)!oCGj5J1D
z0;eXd88`-ctO5csC&hl|%obTEFqsE+Aww_76kL{)bYmFhi%Dlg^mzmA>4p)1y8(G7
zH$aBo;x*3jHR`h$`1@X-xOE9VDAMpNBzKtuW#it9#?hM)S^ofy;oCE?i=HMS$k0sG
z?==gSV8!E7)JZz^?R1n<k=>+F+jtb}y9-SM{_-G>TRtdMMRnfyzpJv}v`6glJ`v44
zDFyPTUOiSN4n|h>f~ceZE@9i}5CJ?22{NZrTaQqLf#;2coyBKUr#ImfG+8Z=2J(L+
zYk7@&4(8*0<W)HeS(#s;5(SO$Xno-ycL?%g9SP=3L{`IT{C<jR5fhNN@eWE$7S+4{
z)|SZfJ;(nHCVR2IoslPQ2PA^uhHM1s97<&)f+eL|La+b|#$h(MhfcRZp*iFu4o@Pl
zN09w=1A5O_)?bD?{$q^8pj^SPjpa7{_{j6Q7Yc1{7u;lpNB^hD2ngEuT!@@Gz?isU
zFo9$(g66qEG`}1oSc8#AH#$U^c6_OhMr=r_zF$<<+9*mw_Hn3x)xuGz&m4&6m#ngc
z?@<5Q50ScgQJ;JY8JTw?qwQTZ?`=-wR-b4*vJL(FqG(jVz!I!vJb_}`qfsYMTTl};
znH-B6@Pd@3`3Hkn83Iq#;u){87kOw>?H5?&ZoH-|3tmLe=Oo~dNN~S$!uA)S3GyDK
zM|he9VrcyAOMeI(M0FMC4M?b-pMZCePGTK2$UcukkZIRhjKT$I;5-IRBA?SZqBRYb
zPv}B}?P$vTZU?38GtfQ#7ljLspuVWj5-99&KbjO4CMM}10YO3Ee;{wwV6utemqvsB
zv6MW!!_fUq&Uh_#!{Cr}4YTLE>qs|iI1ZsyH>#n~5<xIqzNd<@HxSn&J<?s^EEVI0
zS`{V9Oh7dX-$X=dIMKyRlQfxutRN^dx)5qp!B{@7YLC8Q57hUTNAIahVuC!(KSX`v
zendEH;a)V4bR$D?`#xOb7ifLiUD3R>5F#S4`q%s*8gpJl5r>UwJFbw5)Gvs_!{_zW
zMYh{RYfF59I?KzbWBxS5zJEgQ?#Yxy^TdP*1A?_!9oP5~8A?2eWEGOUVp(wpy6!KK
z^_jF*VP)8G463&kah+x8p_-L0hP)}Sq3oNicoqp=w?UzUw-FiWi*Wrfh)5iZG-{ut
zFkhp>Iv1eHAxu;%-J!=LEn%{NHySzr9AnY*-56zd#n%do#!+Y@SPl`{12XP^EShA;
zpnDCL5t$2VPFkYD3Q+J|W^;QO<TgzRo`{fUDhLz(tr_Q0ZL9)axdLAE?(=Yz3^O`m
zn`IH1*dJxcbt96$5(=9NVYy9w$j+nW5t|>4<=;mJTeTK3>wTARz6K&H@A&5$j>fzw
z<Lv<Cl{%GlhR4U~xm<<3PW2|KRN^BPD%=Tqx0XZ^iVsoEzDJND|1vV9*KW{x>qk1l
zyI+6JJeg6qRpXN$mSClWhjc(!qmFP)hJBw#llW_;pMsZE#<qJ=*kkd^0~lnXB@m*_
zHMATIIj7J_EA@Rexa^1G-bp1Lpj4#vNR%KjnToJsMPbJoRJYe}(IDxe0sA)U^BCQW
z$i&{r<M;_888tIA6YwYGb^9%PCSN1Vy-`|+aLuZ`@yj&$WBo^U9`gW1WRF0T;1Z-0
z<c6^v@;LkjWlSxIh-_LciYBOYfD??~$9PKGwqfXf&xqQ&S&-OW3qUtXqZEq>t<n)l
zsN9q=j%OSO=X!B5B9n%Oit7FQSpz-RqDLxX&CF$xhv_Rl2tGmHt)CfV&aXVC6D{gm
zn(~q!b0OlsJW>55np_P>p0q#*wMo=QsI7OR!o8r-`aGzB^4mn$x%(R;EI&m?Oqy)J
z{ZWW7SYD_Ry3a7iq5Iqld4N_xWAxX^aC!!LxSmDQkRLbr{EfnaR3%lk7M5UT!+vOR
z`!gb2X)%_BWgbHKl=KBU!}ySlUKitM73QeBbVD4jMw+BYkkImW<k5-4g@|<AiwM%Q
zgves(%4Ycg47b^#h*$((sLhbasNQ-(*C9{SZxBhGj>4aP!P$tYoq#(0H;BCTk!Tfl
zEud#od#Rjw1XZN3K-TdfL<Y0sEHsgL$kIMBdGjh9iNZp&qY3aVf682vQWfrDKu=sn
z$!2~Ej?3VDur^^Uy;xPDkHABGMKjK()guf;^1Wc{slu5WizAQJW#O||cnMaaye8O7
zC_Hu~>B_DwODQ@KlsovyKW>r-Ex-n7OgSBqyX{a><0+`GtO*3KW_^F3|5hC1C+Hsk
zg%TAi@f;d=ru)~nVT$Xz1wFrcP~>3a6#LYRw<)cUI2)3IoQB5U(~xItDjM^Dg9usk
zk(^ODFVaHyTX+yG!Kw#Ab=`eX!>Z#MIv5kRJ}+Mo86tFw^7@2YSaW5)3WGz=DI^`Y
zUQ9t6v@MWeaw?I<GmH2Rg$>t1R^S-?Y{QV(E(j5ZD_l=UBx@)lXmcV$bfSL^^_FA!
zvwxnm(Eu`yvgJPN!dd<?e}^&}zd>G}I*C@*`*LId5|801)bK3wh%Jx2SXsS8>!G%L
zJev4cq<pEDT9^;%;Lb-A*^<CJq27@Ly8Sx~M9(dUXB@hm0<-6ODR`|USdlmq*aL^o
zCg|NM7>B|6Ub=FgUx2g;ClT@43T18YXG~<tg|Cr;8phqo06LG_$uf&m3U4p#e}93z
zV`<vxzfk6@i-^PgsN}>Ih-^KF`pzGb2mDRS^^gG$LB{#nC>&RbZ;@W?M&va<HpR6~
zK;z}#5xF@##XgO|C{*|ECrIzPIvO+Q@PB_3jp+}fv93Rgo*v|XKim)JF2WM5`tT^4
z1eQgE{SxVSHGT$M<N!T^`s$O6M&zQdkXFv=i}NE9|3T#EBIF%<7Kv5k@GK&jN24(8
z6krFxk-m#`IAMa-gADAjhwKdWEN({w&l{92(~%kl6y6(#2E9v=hw&G694n0fL-%na
z8gK)mm1=1qgA=8Vsah&0g}&}IWSOsrJOXQyt`KAxdGw5*L}9)8$gT_77d_Vnknp!C
z_zm4b2PM)sjFLC2<tX4VTfT?9+nTyq3Fio&^JQ@x^a&1lI1K6NA@7=I>aiX`8Nycr
zt5<kt%V2{4iG^K^w41jP$^wpP_roc9s+K~8%^;6|nuULdB3)(}Z=x}3IO;d|BC@pw
zVSQLNE<(%b?2RN1xrl9cM`5^gQ2oF(*b^B>#{vJN2?-E2@FFs7S4VTu1}Mb15b}hN
zMr8UNlmrk}IJG{+H_L;8hnr*=q=qF}^<x~RIx1sH)*FT3V2n$QSZ)lpLVeL5(V)ab
z5_yR^oR-na)nDa34URx=<@u0SE2*Rd$dfTAil5&B-08@>@+IX2s~ffWe8v9XqCsaR
zMADw7l!cQO-yqGy;>gQ#3v!vq=`hmbOf<lrjGoVT$Rdxcke>vHibzhvyZnWJu9N)F
zaOz8A{skgEyCFTu#)z<`#at*$@hYTOTa?g*R}q%#ptNXozj?4gUaU^1m)UYX6mXgv
zC`?g6^B7<sV;IzEjg&E}jpaIq!TFwMjtwC1&%KBo%o+Tc;*7_k@!@%*lY<--LJJIs
z70^UK2(_a$Ng)3t2t`KEum3|?!z=p#ex>}+RWI=oWRS0f#;K?=`vMdu9D&G5n(F;m
zBCp)isDG><yQSk~<q28fA%p8T=$Q;bUdsEBSMGY`NSKILKG~JVuTC&GB6ojj@NqN4
z60E+V2W78ahb*zfYwwcCg2$l&rpmG@irk|I-3k8p;<e9TjV6W)!x)7u$P>_jIu7X|
z;_xlXYFXdk?r*5$bcePH!iIT>v|e9B*6sF4XEc%e-RKigCg_h*h~Z%r9{6#c#|v;8
zy8cs<<vImfdXe5pC;APgd1))6nqRk|wmJ{>Y1M|Kd%p!)*j@gAXThF`EU$z-09E0T
zie6$U^@+LZM}h_FFGF$#9AhYWsvp&?PYwJ<*TW@=YLq%ZAd=OUE6`O8i`Hg+bz&Qo
zTvA4Qs{97kr~f(9WsL_0RjA|_K<y@|fweRuSpJe^W^{@Su|p9t+pz4Ss<DgzeRJer
z%P}5##zrH9bAyO&o<PxzK_~>dR*K^WWb96V{}U3oZoUH+B;$C1QfB!Qs5az-sPEs1
z?r$P8wss(E#<fGGUUGl`FaPfI)%OvWU^NDNqopk_Bq@D5whtE(TWqujKJ>q%thiKg
zFy!5)E|n4BER=5jF`Do%PTriS(0v_?2FGxgO+dDS6#mN0!vJ?9VsM=QnU1_t_23nx
zJ=hQp1TUkyUUffv^vF*^-nr9|^*0?otEx<~h?+lnLb{KNzYa!;2d|;f!5YZ>RL@#|
zha)f5%IN-gC0cJ1hr!4zc^wLE&5b+&RR|_kS441qO5U+K>1TrFA<vG3Db{Ig3c*Pi
ztvJqseH`d)Mld9pg9qn(aPTO2Agxs6KgdhH0Hva`We|6Al<DVZH~Lr=wdYE$R**0h
zXss4TUecvdNd4oe^Hg9Y8b2Pxkgp!Yi!5cj|9y1DRmUB-8ztx5ggm(iM{M(jf6aFy
z`NUxn+eBeURK@*F<V~vd@Rwg+Ylzla=y{JvW5B*hW-}a-)5npg>kbsg9fM>UTarCn
z_7LEy=Jd*Jv!f+gjl+4UG3-ywq#*>0Jx8|c@&0$#7<B=qB4;YqP;phbc;ublxNB=9
zCL&$bUdTe6LhWU1{)9>Zd=dJsH~g*UpLp%(B9d_fBEn;l2B{uAfh^md5NR2Y#H(}F
zc|6d4oQ%9ery<e!G&E3_d9*4?R?IkgG)geo1$m8@N7|39SO#gVE=1389<nc6w7q{V
z>mY)fCTU<R^uAw21`O!^^_vC@q>FMf<lN>GtdyUihFs;^cMXGQ9P*A~a7Tesk>sX)
zzCk*kZGhiLO>2%DJHai6$XR$vl*(eF3!`x1(qs!~Z;w3c70c?BUCW(_G@OS#^l7mh
z(x6?6LW5D*(ck7G(r2$<g1qaiqA_Ik#H|}mw5qwt=0sPvpM*4SyCDh3!pLDU3P}&{
zr&RRxJY;Mo@s>GIB<K8kFTIhl1go)l5Ov-kp-CW;C}~KJBw2nsv9oB^;A6DBPC~`v
z&&XD3z6wF8(8a4oR2qfr(S&(Fa_8Pna#r0mU{WY_5<Cn)e3Ytm>QqF6mqRJhPa+p~
zy~4}eQD)IWlsrS{l4Ld3Mh_xdooKK=0a?gr;(O~V-cC`}=imQIh)A7>i0NP?Mz05F
zpag?XRGcv?%{&Pm=o#IKCWkpmSF+?%)F!S$lS7bdKZx?WMlFW{@~%ghTcBWQxb`XY
zN91!~`c}6s5e4HgB;QL%u0U^d#r-d$ayX}>P*N3Q#=yzQGqolqQTq2NC*#9VsQ-sV
ztS_sB#}=hn#{b-1{&U&2T!Xy2zoWKiK8!!2(AW_ufhumB%~AIH8>ADmzv6HAI5PTc
z8#R4>wdJ100863qBh7MM6Oo7e=g5#-0vX{G(7iu_910`R*i@Oow3q*VNA`<vJS@R#
zJc31=$Dl@0QJ=(b!NnRLWtffzgnH6iKc_+289BGt*JHH=Q;`>FOZ2S1A$|C63?fNy
zk$vficabM$Yot$_fGo&*iP04(6Y%#a#MeW1GE#{i|9G9q#eM?1=gpyPEOdZE=zU#+
zw1JC~F5No{YofvKL^OdfPxi|2+aMwQcIf@?mtvm<k(T6OG+FJdpNn_fML!d)0G+Pa
zTz^jbPf+WpX<jVQXf-6?OJsqW#^P#}g?1lNx>6^WWQ|3O8Sjk7khv+9X!stQ?<S(Q
zTp3QRh0hSt-<GP{N@dq_Gb$*0DDsr2#a(C|+6ZaUq6#KIggiX+Awrp?VGUz5l-+nq
zs;$#iNiRp>Gl<4+{`bi89a3RDYS%wQ(Sa3^R`pv%NS{XG)@RW>KZ1TP%@BqqSk1u<
z<et3=WsMvf{-YuAwL~_uuc(h;jiUkU-UVwFb~wGQB3J<)M8eODQTT2owMF}%q7HXA
z@{l}9c9MBN8nli?owJ9&)x7#6@)%u&1oht_%d0QwLF8&M(&zm;d2_me2OOv9^~s9M
zQK)4!3cJ)(tnWrjYfcVA@3$6qMH65Fc?Cm);bLo?o08t8-%#+El*u_Q^Y+%luTeW|
znitD64xPCILppl=+E`7+!6-}=T@2JAjtD%1LgIfzUgaQ^y$otZ-=WOCH{wri;-oh(
zB2UxNz^_ZBzv}(phlK09kzBT+5^o^md@3@SSB=<aA`-tph{nhmqowMadQq4^9nv;w
z19-kBE*`s5U3|4(yp0UujnK1N8R=I+NgqoC|JT%_!x>-+R&%i%s-<)>5!OSD74|t1
zsk;WJ)^a)TQMRCT{V+h@>Fuw{<1l2I&4ox~)k3Hh&+S{3&b$HApiMxvrn2HfL<BBF
z@9KT(FU2q&k+tuk0rqMX;@YOp<Asm=Dhic`k)ym0)-?Qb4+<;$<3er5yfqr!4@86F
z2FRMug7uN6ZWnaFBS=?e{u)HeE=J+oPpdaEe?%U}r!rns!{Hf+u40(5EeO_m00!q$
zjS|iI^m;B``2wAOsIZCJGSE1XL&T;EjuWw;F@X68>VLCS(qAnNeCacX`Ki)VrN&*z
z0Q(cA%)ux;>0kfP{Qpji@6b4Q54!KT#q764l7TBpx9Y;yWLY+*IL0Ql?I77887}J2
zS-g2!FbX|~wUMwN+F*PLU<p?9aW?8?hal^!3=t%29Q6^UalmW_24x?}O8=6l*QMKZ
zNcYuhKbG(^8e~pD<qIYfEJ@)bqFX<SJW<CXQu{603C#@jo|Zy{^<m_JthW;JXQ*)C
z(#Sf!2Z=S;O?!Zdr{6_%=3ea;P2$JG*^w9UK6H(PNSAJ2iOZ44;30IKX%?_u7G)Rh
zjYREnnNp7<ZOd-xowNnof?AbuH1c9~*4nUM1P0gaojo|v>|(11jRUI!mqZ0eU6+dA
zinxeUA!1Ni@MF~0yGW|y?wDF(vdd5s%1wyqg!V1_*UPAVuSXW|k+2;y6mLWXA_^y>
zG45B0jD_S4W!JwDy60@`^2I#^<M>{yR7cs||Be#4HweXtzAy2W^!o*tV6_JKAr`*|
z3IT=+URJfzvD8-(bAtc9Sh~#vZ<xWu#WOhyCQrf3)9ZE6Yx3<7`Upxoj7K4>tEfGv
zor}C*4<oYh7}*Q3jz!+9O%S;njmSg2;g>OJAYKEJxc~asRb$Pr)XzWNhS3A!zQ}4`
zAKmXS$-Y$1Pf%+0fyk=go^*rUz9_5f6C`MTAYz*zAg|h5NTYI7#%pT|T*olObD81g
z$kn4+X%5c!zb|j*Nj#(C#Itquw8H!vhe*UBz&^E4SR`6=q6CXEe!<qIfC*r}=Wmc^
z9l|7>jEL6#NbeYj_s|&jL!CdedV3sxheX>a5MK=VUSz;6i~7kAN`ERE&YSu_WLb2*
zIt-hQSOwS%CH~Y?7N!QONc9FpFGJLCumr1hco%7mCi<TZf<IJvu_mC{a@C|6WD&+#
zje#q?2AK%XrKO%d(}CyZ={0!@CWq%YiGK22MPVZH`0Rlu<muEFw116Ko7YDc@cU#-
zoeuCQ(t#a}mZF%B1eW#U1vD6Mf!@=bNTU=}_bl~0$WepPL{tS|6ji{!3TYbVB0hsD
z2^S)l{EH|{t8!V9INaf%`wXO`h#G+RKy`~oqP~-$n`td_j-l7&=rwLT^%Wd>vGz8`
zbTzA9l`)2b2ZM4wbhsV`)AVWNUZk_R8nu=3dyXc!!McNQ``=5TF?b1N<aS5xR61zz
ze@Pz>K_SBz2r{^%o5Dn-9UP9z5~Nxd%g6P|d%rCrg+n8@8G{Jrv#7sRhAy{4-n-;`
zjzTcic>X<S$h`3P{Tb57HW*cNU?As6ld0G;Sc27BOhZ=qttjMiP{cOl(0j=mCj1z=
z!xxYKb0DqH;Te~L$x$#lOo&i9Bx=0+8#f@4cOYngfZ8>u!bM7dhX&Sd>p1u2$Qr&7
z2`MKMlR};n|3Oyg?kIEeLzF2~m3p1hhh>sBEt0F!7AI0#_i`2LBaJ^o8JveBD|J&O
z=&yzEBLcjGzt2fA+g*VM%X3hOrET2)p#CzWAcLftny2iaq8F<<YZMmYVsIJK(L>Jh
znz>eCfKySQe+d{;UZ6B`%v#+44m?$hAtJI2sdR;2+HATVP$t{E6f49>;w$8(orc<f
zmNjSp=O23xBz;&uVjF{u_VbXJ_nZ*Z*^s`7%#B-b+USCaOeU9z$<%bJyjB4YL`K?Y
zS&r6hSc26*7=b31%P1}(P;9~D{qKb{9y7AosD>X0V??YBxnk%qA(OFPF&#a-O;O0`
zODZxnWAG<rK|YQM+7o0C8x~Ne;UY*+aUasuEtl~)Vch6n*HI`NXfm2eQlj|&9RK=i
z;m3%;pMgl$l1L|#6@NtH(lKb#NNY77jl58=A`yO+mTDOC>>YqYL&w)~eN9KfxXdWz
z;#LmmZyW>c4Ng~|ia*qFO?bv3?|KZ*_crMqRp;Ca_4&Xn6++c}SQiogV7=1Wks-4@
zF{1e@#Mi{C#7|HOlTS&mPc<E7<&Hr_VDYpkK*>+@p|R^N;`OD!Mq}i$h>#9PeJV{B
zZ!{9kw?zEX|9+z8mNm(2&<0|a#M_d7aqO1C60H8i8A!-@7@GJ41k2u3mm4spFkuX)
z085q{qpVD0!YkOd<%EzGkDx*0Jd}0zDy3yH;_wx+Ha9?4?EA!vN0aa&8tB(U1K!&x
zbkUa;>@PsV<TFs#<P4Mrl@<=w9v&CUM93E*G8NQItLNT-fIMHnL&DniNT;oE&|rTa
zGA!1oIujB!DSn0C?V_X;$+sLi$1uaoF~f6kjMua<TpvDv@h|m?W<LwhbLq+z{7_-j
zy;$I|6f$yd50kHm?D-E+*sK!`dV^5gUyM{CI)5@xudn+)@{CQSY+j8tVwXcCZyaTs
zsZ`hyjd}MFzt-TbC{nT>y5|Bi2(!T<u5f5t?1l`n`jPJZOQZK2zf4^}!4j<g#XU&q
zya8GgWG*B)o<@CD*`G!+?+t2gIFsPlXn+c`g3{=$o<y$e<Iw>14e--C&i!B1vG+%s
zhspH4u;@u>@V^?7t}m%h(~j%2;om!ful&&97XGyzhP*;+Kwb5*{($ry!TM<FiWaKU
z@^sWDS0#Rd>EEDddMA26_15reI$X!l?YR{E)fL(lN1)}A1~>C0!QBt(=*ErLhc*&l
zqc*i8$`+2ppHX=5c_g>^*5B9l_dTZesT^<$KFNx^ud?44MSX94%-_RU9cA0TPP&Dh
z!#K?UoJoB7gEx?&G8$<#vzA*CQakY?u?ks|QY!mW`nI$mYKrxE<C_Xgu=*cwBjMsC
zG@&ksQu&vTFR2iVmnkicP>-m4AmUB*%zlkLE1w{jeJz|rX-&O*k-$4^SQaGI9*oLy
zoQ>Y&_H`U5z!W5&T?l0w-iQXt&HTTAO?4W6rO15}(ra9ZJV%cqYyQeQu4f7Kj88=&
zzEvqz$F7AF5$S&%5yzKew!0f;e;$n{zqUt@=VDBo)Nzmg_|k*sW)uQ=#wG6<2IYG3
z46X3cJ&U9P|A%4oU~r7kkFEp!*l~CY5iJ*aIxYwP49*_4pQB66svA-0K_S3JDD&LJ
z5{1oClFPG{`gdAfjD+30p?=j7u}u#$)Hja!TeG1xUL9`A7<o=xUn`8=k*>AvU<p=x
zU@{^JcOt^IoH2Y?x#n2GxOmCI@J<xM*#(h}muNtB_W^?Qkfr(-61QJNZRNn1D0aUo
z(q?>s)<CNVzeR)V)95|EfKs#T#Ybp8t`!lX`H%mZ2PHIABCNss5_ydFL-)50vf#7g
z*QjKLhltksDfgQlJ%=-prM(5w8nH!@Ze?3EAg4Wkzrk@-#eGI0U#Bdkr8pAU!{7{V
zvap_laT$~^(2*<Pc`bP|mm*K^gM_khD@fMo$k<sLc~NIW{rq6$!MYxWt82qe?aKKE
zwd)^|uE6Lokm2(mBw@&cM^VUgdH=kN#cWqqf3YSUlsV`*_3E$oLi1W$V=P3lGM#5A
zGK`xZ4zCB6V6_)^MCr(LQsp*wir-FrXa5jb#IIz$2nw})PJNkk0}-F1B@}i>9eg_J
z2CYZXv-&Ms`)?AJ1q9RK6ZEXtL4*0L$b~;=9mfjr1|m!A`PaBK)z)g*{sU>auJNxS
z%TgTy0t@_4C~UbRaf{<tV|^6n{yv&y;ugK#4jBWVp+T}yOKCI}E*?Fe%M8yYmwwXi
zFI?z<U(vjJ>-re~dvLxN$8j(%S*4NvP>3zQXsEoS*CQk2d3;|N$_D;B@?b9;yLTAr
z-}eW|U|x^-`c+{ZfI^ygP+F`wE#61{=WWzS8|SSm)J?8H{rlgU_AtnEmF=9qklx(W
z>^2^wr%Qw-SnY>X(O|F^iqS_STKn-HdZ){R`4D+@u0)+Y&2kDe3vNNWtXt8b^#ID&
ztA(@u?Vdsf1RtWlqOZ>)g0UO2puZ-*96?(A7ZII(s9p-f0eV8?(%}>rNzRPJ(4ajh
z(znHFrlN2bny~(f^n`KMtIt98gDys1zR7i7Ys=vRGYUBho-<Ge&qIOT4Gd}av{Nt+
z`CNg)9X*)Vc(Fj4v4aVDX(Gza?1hZiD^bR7FpKYr`qDc{uS88!=cb-u-$gaMwxy~}
zLF6%hgLID9k}bgn<Q-lG5y?j=Eg4fkdh0ID0HvB=*=kbNcfS2m)FRDtTrI}{86##n
z+>0ijO^I1qJ;<7=8004Se_bSG1{{Fg(7!?xXV%4#2P%3{Y<_(-_)H>QNr$fxDcT4T
zjEU5*XS)f7%T7m2YXs{i_667apUUybK=G|dW$4wya1_?N2;J`zq+hRXF5nfEIB)=^
z^z2G>BJz1GDk2)UEKd8vff=6aUwKUpyEW`{soylNZpGs%cn+QUUh;0QLWRwDCKQkd
zYHgGl5{Elc+x#o#U1xpdae6=XO}Yl~bwYvHrKlS!`;79BzdKcR$s)ZWr=zg$1w^dD
zngV;FKKNHk-pkskdanK`Qa?uy#<-}J8KU7pof(U3&}P-!!>|OaeepW7s-~bY-<sur
zHc=hmQ^e$#EN&y*hV((-AriJn<1e>u@f0eja2E2Ij3Qlz=HtkFbpoX#rS)VRf(FZZ
zk<Q|u{xz&p=dl1PE3>=!`95`yiF;E@VP6S_Nz-CGr1_c$wYxYW{f`mx`ytI;{I#hl
z7?*C7Yv=62C>(^s=22C^8w^b;L%Mo#99mI;6y&-8IdBAyvqwNKGhk_8C^+)CR*GLM
zKNxVla+4+=Pobj32ca>D>WF?BE=2wDR1~7migS?H>~P@rG#40&zP0b&kOwbKZ9XA*
zmf5bhEvvVOVF^}y;~TVw);(w~zEFHVGDW->c}bQjZRJ~A@`U{WX%DWasf%y6B~CzM
z&^+q=X}wZsA#(II@+>|~ePP2dfSnMrGHCgi+o&@Mq2kRugt7=Tbn0P9D0>YOm@kYn
zSkvMn6zcoCzwfx1?G8X0u8*MX#&<KEqivAG(CayL7hGJ&qjj2(KD&8*0kCsT3v^MK
zAgeIn(x}ZHsBFRY$VkY7Zc6I~-cxgH1K?%RWZjRvy2qo;S|71&;yM)4{5AE}cKR3c
zVnt`<8dK>7j7I(3_$Q=aGOL8_obEtm_<ovs&lbTFtbu{;(BN?`T4BA2hyr_G5vmaE
z4|(CgAA_>Gc0!Z>_ZxYkZH{-4j_C+WB^}mHvELV{zSw4H5T1yV5$eIqNSiSNrD=ao
z#>~Ztbp@fKFT1sE_}x%jSs6WpqcdE>!iXdthQiN#CTx2xn&3}E_uKZ$@Hn`xVY-*2
z$8#0Y7(gFHa(_<W5-w81GY*3~dg;h{c*fO0)%?$iz(ZhOA^XDY6Or+=4XLtO9eH`u
zS9|{_(hHq|yi2ukC+aWzQ_C2R_N1+j%Cq#r6;)SjTiM_F#?+^&KRmb%(%ZHzEWsK$
zI1#z|e~T=lIE<&Fo>K$~`wv>G<UN$7c2r|7alqgr<T-i`iN~)YU0-+@_#P6hpNw=}
zThw_Cw<2%OA5chcG9o>RP*wgaxJ0bg7c*XUA`ABhqzjpgY-!v(Bh8A7(&KN7*={&m
z5@atlQJkFN9Bqr~h1@`8h*u(VdtEC|7PP%V9leq(wI);uYHMFpv7Ao8!9u@8?fWt^
zW{;#eCf4xSIVMXu?J7jBE=0*HweS$qmhD7R!c#O>Cu%9G80#z&^}Vt^kVi1Rmpb5P
z+0M5#N^WS&@(cki!5Ub&1$i8{L?s#KhAILzo(dtm6WxNRq0V~}3L8Fv!e_GzCLxd1
zFOUfJ9pcybs>B&c*YzxVZV!@uaqa-8Bd@|8i1fTgLS^R!?T=UfkI2z#TU5ef1C&C3
zNXBcu7P<b<M+4kPG23l|JaaAzr)HfT+71qW{VOkr>ohye*0k{5zKB4~)#&FF1<yEi
z<U9uDl~q_v+SI5Il2t5D#M*QsTETK-)!|JPB0L<8i96N4%giL}ugF-wn)qapFrGtR
z_f1i4y);-7aKSuO=3UA{t^#ByStF>Yzh@`l`=c>0u6S`<z!I#1hfzpSTtFmYRVeER
z<B2Fq;Ko-YJ_A`h8zRz`rV9GZgxk>bS{e<mkCASr`_EC>a8ndE{FwT^G~c2y+e*lj
z^(^u-MQXhwhN7~cBHnTby3f0jUTO}q)ty=j-QQk_geHX(e}_DM|3I0DQAJS)9302c
z<GJ*BF1djva1Y};<mvo-tFjmi#$`}Pfn2W8N-x%z$bc9@?2<UK;~|Iy{Rw%Q*Noe!
z4B1H5nf~Wy($y$@1NEiVNaq;}#NQ*+UQjHuy|N+5tDRnS?qolSkKGvnhMOf=0~24O
zjIV#AMMJ}(rSWJvh^obh6TBZUqH+TNL0K<Zvd9Ju!ggvfy!vjRX-Ft}G9p`_k-ip9
zP^9!kq|5r8`ihi-LYAwe;;3sQUC7y$8%2bC9psh=s-}&tQNh*i5g|;{OGROSv{cW>
zh}b7B!2BRe9ykQ8CNR^$^$AwNxP8$6wgvV<*|2Hq!u1(}(`0a`1n;e(rVhw}I1&}`
z+$eG@C*B2yN{QToJV@zE+XOYTVuf&Jp0X2BsPJw|geVE)k=J}l)E5VpZlr44P0-j;
z%Hpg0!5jawQ)%D=vRFG&AdKuW_t_DVYrDmrD`5%Nz{XF}8g4fLXZZc>8Pp}JydRP3
zof3Ne;~j#+Rxh9lb-*JSe>@bn2<LzKm=kHM?n2ea&qlRq-b9&)X>g{0jQ>$8Qo2B$
zmwXq}Fdd5)ke-gJRu@q*rWS9f;tgL5+=tS&2l@Y<1$Ur9>}(_e{xW8}rIBEMGi32!
z7PH-eg#*m+@_yNY0qem6xDlKg25wOO_2&PtU?7(((3$V8Clu5dT&VlyQDc}dl1n9f
zoqmqIKobZPnm8CrnT6?^$dRazK8y^iTKF7g{tiOXi%_Vy?1Vo-S<i8}9vM#Qkp7kJ
zh4h)zQ|}REG-g8(TD?2-o-KwYSOXu&Az|T(C<HJTi9DB%+SsjKn&dK6&S6oMJ$D1D
zVKg8iFO`F5Tnaw9irLIiB2&Nh|Jxu<)VV27_ZcFoo1tg+5%p&qg2EKDqk^SZBGLGo
zQ02vPDJNJfAx+s{C<HNrY?Y2zLWF4t6gvKG!nPw&vcy;<I{jaU^9%?$h?vjta*^)C
z0f;?;tw<LNZwNdO26y)0x?U?og;3I0j)~nOnPjbo$jrFZXUut7NXb4(Tl);@%1cZ}
zhVK{1;902R?|J{Xhs%Bqdzv&~{0-ISN`cf2XcOR;%=xX^eZp;By*&&|ux1Y2fChp+
z(WKr>M2Ij$0lqhpH|99xUVj-4Fef56b=xDD6bnAF3QJlO5bm(=AfkB$TE=1$A{%M&
zFq*uAY{M@Q>8b})kT`jHR950SlyV>3iv#3<p3pFO8PaSFBKul|N203iZz00;M8dWg
zAtCXfkrr@9#&Zn_IF6y$Cs^`d^?P;pK7P0b%rxMJ)(Px2)eP$BE$XdX`1v6+R349i
z$x)*B;%KorFh7Q8Q}YJb%c9BJ8HL_oA)UwELlTi!QL@u=p}(!}e}@QG*{HV)(tKWo
z#)<QjPZfA<Yu?N9NbC9cS{s(3KC-<g%E)YcSb{b4U?d7FP4~YS0LS;<$b+L4|6G=1
zo{OxZ^^s2N6r@#p9O-%576$2N>gm1}PKuzU!$>56znSzkcFsUV^+lv_dw}}04c|fa
zsy?PX`zRRw!dKk^JnT5k$WU>-1BEuvM@3oJA>P$L8_M1}3{4KdNqdrkh@4~SF65Zu
z7Z`0-Xswz5L!O<@QTuEOJmb=t_vq~Cg+fcGo*q>1Zv&FN(eX8{CZj};wTQ?}j6Ytc
z*w;3|lgO}HGUYx$^7nb0(#jB<Ap#cXaoZLc0_F&$&peWvMwp)|nanD8_y6OSl-Dj4
zml#ToU@_|fu@ZzOSTh$Uq0aetq(6vA1FlOy@)Rm((22rMbD~Z;8HKKXRL?<Mft(Xl
zupk>Ip~+|`|1%xfHRZmaA<_F*$jkFFeOvhX3lstlkVpME?0uU?$b(s31E>mXqI=pD
zO(JI{Y`X?}?@OSz*4Bmo8UY8G=H>nH@_^P~g>eUZk2kmSq@D+ZItsY?LaX&yZ=uAC
z-;h)up|}K26~-cM(+H%uB$ekb{o>Fd0{8+7XI5trM?bC&koRjOT9a{klGhO36fMIB
zGN@KV#`4>w(V4|#XW+@q#bJ$;m53gQ#=o|$-X4Y}STiT~M0H$lrf(XcN*E-NTp4xd
z%TZmOQ7C=*P$EK;{f%7uYRg5$cz$k2-m7boc=mD9>sTJ}xBUaEYW@i|vxg$n67rPi
z-2}sKy?TTbP}uPS6cT(sVcWy~zu$)hw&`^#0~iIP0;4m9`l=jz0vln>f~|_x83V3U
zU~p%T@AzoxQ~d|hHQr3p3KouulM6kK4675+M4t}X2*etwEW<?7XL@dfjOusLczj;M
zwyPm;I{r<KM9DY{przRs%W|<k@<{WWy?T3gY)3uI@bnWb!J2t-3|chwWMr*28t<XC
zvgSoZVKiDyc{0kN+o}oYtP2hzSy_D#rDB9-@Q^TdS)_e>pV(SEkvJXc*j_?9iTjAv
zwPm{E+M`wZ;Rd66TW6v$!B0shX*VIS=!vv>c({>Jd4?R_CP&VJ)@hbn^0^aDsx6(c
z3Z6?o=h4}jel6ez;#j0Bd;@vptC38IZuXCHIcdi@r{*y$u_7wV@F~)crMb2}k(^-&
zMNd?jjtnIC=%RWhkWWxl;!Xd&>qMR*{@h#p-`Uo;O(pFr!_w&9+P*wP086lDZd`{#
zK06>6_mC!?=TX$jh9WP=f~ZE<SIA;qs!8Wfg@7hyEf86w@bP=db2kWyyx$>xsPuF6
zyf#Oo)Sw1e6;jxEL5Q$wshluOIak~mn2N-)D<R?(hXs(3b{7<mIJ5R8%{<6Ch8~ln
z$K?ECy)zwl1J*M*i?vc{ueAz$a2&7IUMzqOfp5Wiz0T0ypMXn&e}hT4u(V6bYg6?h
z>azrr1AI&+5sWWtdIU0nE&&dX`1|JC-+4MlH?T6&m_1F3WxGPy6OCzKr{1He98H@w
zU;wk9{~v8#y*&&|ux5TdkA&5;p^UT@n|Q9ts0#8AkPH466gGSVd1`(|-{Smr!{Co`
zj!9)SDV5wI!o=!ALU4n02U{S^Y6>D;7i74shmiN`50r|O)|+h@ds`Jm@oZEa^$rw*
zcrD?WKSf!oQ;?_f$vUrXz`{Y{!9oF`HDR<Cf9^x+{^`Zr4M0$;VNm~gu>h9wKk;Je
zWRi6#Dy;hoX%bhAe>~S@@!BkkJmwRLvbCZ~)|tq|b}7mN4`WOJSV_j%FHv&N4Mde^
zi9Y96z@4dyQnA2m!c|0LcZ%W7fdNafW(|CbvV|T;6KaYzw)%{>P@R<_XqlF+k*8!D
z5?S7lNX70*m^pjoQ5uMVWc8uZpM=EVN1`QR=0hER49em;2w9O|k&P&wjt1$M{p0<c
z^yM&OnIM!VGE_U~B{b;ni;5^F;Z!7^y&ieGzDRjJGZj2wT5k@ASn>1BfL{V@8dx%u
zKcSDGf^q1`7s%%e;I-U~^%*Kbvm5Hq(MTp)TOx7zhmayYJ3GnhK_28`!1$tOE&Peb
zpU_xzHsv1Yji@YD5q*f0kPPDgsO_;{1dZ|6)!42af#)tgh5`$tq^bb}OR#1wY=m@D
zx6-oZa2!xve>CbOhxz|K9Ia`0Eh1yzpn>XTq;EJ5g{0CgQ;`ye2xUU$Hq{;fP(%z*
zLxWc*8hk2o1sV*WK}6{m(tGSaMK1iUQC8olh{V-Gz!@v8((uCF+aQ9pAPU!BlW;r-
zX;l7z2HCw*T*FL>pghBLFNf>UvhZ0yd>%sWt)*TpP*!1AM=y?Rz_ffidK~FU&qr$)
zMk6*fYyeh3eed1kPe~uoKVJIm!l}sES`?AFw77zjAV0_oo);yvBtw^WEz)MKTNXO4
zCUrq5@tM?D77)d3*xCQSJL``9iG1x%EM_tshC*3?LyHveoVax#5b~bnQP$a1MDQ*S
zZ8jUy0WF1=i&&CUmFa+-eCvN+Mq0Ax(SY_QB0iZB<MOGrLU%!4x8bO;-EXL^Gx!FD
z)_#VF>@?)1OPgVHKk_!6iq`cz!oQBk{J-ZZ=ZC><gn#P-Ciq100{<A-AkS42et;^m
z=aC*`RLX0fDd9SX8D5TF<Ib%5t1y0v+SoEkU)T~D99+jRsH>N0(>q17TKlZeLpsPO
z(U?>1sSSEo{ADfd@Aoh&gHRj6J*FcXU!e%Zrzj-(qg3aRApcwBiQWP&V{>Q3#YElP
zVB}Rlw#GSjL3REz!pY{|F(#<qo~Si#H&_qWtcfd8(aI6@z5YoVjB$#e5GGS3FI7Ex
z3d&}?0co_hLe|<~M7lOb7T6;w3uaFgwt5i>K>vrVr+=csU@KCt0T^ohfr%C@r?Dj}
zL2wfqco#v-Gkl%qxIXUn@8NR)-kwZ*T|Q3sw|@mC5!{W4(<hV@!JL2X;S9i!{Cyus
z<Z5SXldC;Y==K%l@*kDqT4zeQzzi=pGc53&29G0s&TXwev1c4Qa=qkRzgA&@T~L1?
z6DxX8c6(1kn$u0l62giXt4HB8MC4W?d7Z&Z+=mR;A0s1oN>Tq5e4-I}^lE9IRw7e*
zhD^jVj5UF4TNl7i`lN>?ShFskL4;*qL~>TB_dr2c@l5O}G!<0}_qR{oNXH^#^?#`3
z#HvV`JrC;GHzDhD3erIR9_g3fMi%90WR+it2*x_V9N`oA9bgg?`fiPctM{X@<`0lo
z>BF=a9D#%VYg`-=pGx6r5<Wqe=ay)Y{1y$AV?)~n`AK1d^$jYDxF8yoYZU{%5|P$3
z(KG5d<#9W~GY-=VxqctcTR3g(jQUkG6Ja9Z8HYigJ-E4+7a$F=0yuL3563116v<E}
z0R!Y+*$gepeq!pgW+Pb>k<qyh8W+>zIpp=q6Pc(IdH$`?xcyneaX0e6vz7VqGSiNr
zUSKwzR~x_*tXUf$A+que3b$=v&p|x2=3jz|HwEdILY|jCg#o@rV*P87s$nw}+L#j&
ziovLC!o5fnwF3(AJ&nl6muMZYJ5bnfgn#itjjDCg;E_}jISXDyUb#OY;puxQJew8|
z`qy<X(y<MX*v1Kccc8&&Su`leVHomS?T4OG`iWsChl^o`=Q7>PlXJ5dsvV$s8r5}c
zxfaV92M6h~`Ux`-x!eS0(N)7xiwr%CJl$s?PkTBzA&OfYV-W$~7#Wjk@hZB%_5A;?
zg-xgo{Z(J$o@gxoB=uDU;{0r3-~&*YbU;*Z55p2H3s9%K9L494PrH*tX+h;0n1-yU
zVm+5yLh~dTQ}lriL2Wo(XKNw~<=qJ!g|tLLrpt;*lz9;fFD`=y!+#+6`H}wi=>?nF
za60m21qAOe8TbD^^5TUp#z2$R6MCM%LLR>)tcwP%`Ox#ZE914y)X4eztDb^Ou5ZS`
zK*I<W?)p)yPwW|oe7-<OzPBDPM<ehW3YDJ->=?UM^2!ibA^qfaz=o-dzGl1KH;~7E
zE3y^$d=D9*KLjQa)?hoP(kb@?YKI56C(B~;#Q`d_Z*@Bc=#pGk<Zcn*V5Gab6m`Je
z)9mCp2B$_vPULEK5Wy;n(jCWCYPD*jV*Bs>@7bWt!0G{(_D#;<w`pi#dL!bn^C6P<
zY^IB;4-=4{U?1RW|9dB7{iZ>&$X>-$Hz2vHsjU?|4tdh<pmw>2SrU$8m|n=ykd-V4
z7M@35l3T%9w$&#$2D&;6^m=)W*K)x-NH4iMS{7?Lg6zObI9?J7JOw4|Jchi;>5>Lq
zqhr?glz|d{)<WUG>xuN3m5qM^CL&|<15|f!QA*=zfMpToOUgJLjy&Mk*SgU1OUm4z
zmI4OhI9Fudu^nJNSQcSihDsyshC)XjNgJ#Cnlw{TK&rYb|KK`a+`50&=d13Vll||(
z6~A}mSFKN}_xg<1kgG7RLE*l~QNhvMsJ@R_gg9+kj#G+vaR(w-zrm8LSa>+h@N%i!
z=1hiPAn)#Ktv<2(xM5I7HzhH4j3%mCA9=E$0p0;8A1{1QY#Vzbz0<o$x{wZmcPy&n
zdv))A9*x&~5W9R#<TZYc2+~yKP5)lSwp;k$BNMLl7ykD{3ENa(O7`wF;HtNWVF{K+
zC7whJelCo(Q_Ixa!L7ZR@^t?@l0e8$U}CA70lcEdtL!t?-=uPZ>1l+P1<D|*Z#5<(
zH~ZFTP@76h?MCR10$p2o@IwsAS`=BVJ0Q#V&l#_EmO;4wRo3N|W)i%F5=Cz9kK*#4
z=a6$fa{W_)G{CxO9C;;niz4TV4gGC^G;K<fNk#4qxS4WHo<#NY_D9l(2t>Bw87RqV
zG}2Hl8T#9nlrpO04zUN)sAlUR**#c$Fu<y}hhYhpMHJpgZsd{30!vujSK?GRc?p`p
zgB3}zR13$8B|;(1RoroB*Oe48g^G0-+n8j5vKEJ;@a%QSo3=>Y#uX9S;9p52*UwRC
z@)P9Nf4=T3odw`x=<!^wKM17O(ac<*5lAn%Rv#Z{T`-`v3f+ELt1!SaNRM_+>=w1N
z0GCGNQyO8pkIW?NAv8uG2AmVRxX>pSE1*(0V}RxS;bdJ(b@$@1Hp=2okL+Z5c4X)e
z$nYRof@Kj8gF4YwNXU3h(uOrcg^3<4{QYxI^q}H8hMeOOVJuBYB?X37{63j#uNDq%
zpAB{>(tj+7NbU(y8&y1oz=IX6mRI@rvrzakC@lL;qb_!4h2t1zm>h-v5n8tkUh_Y<
z1Z}F7AI~^AuA#HDhg5;@=3pZ74($yb60gBdjD7VWW9f&$J?T#C-*2|;)%#F_!m%is
zCJWX?B<*cvjO9qqP+Y_RPDikeQzBQ{Ji>kvY;#ZRTVT>BJ!a_<#3B{;N5v}tjFwM`
zgzThPFIJ)l3*^P}YGflij=?D>T2qj#yK)4cOoa!lbe(NavR*_X+CQMWRO3<Yt0LU;
zyA2*%FO+rvJn~c>k2G}$HsM-lT1@ZFx4}Bh{r(w&$ie#k@eT@}OFkcj3L_-~E%@*d
z>O+?xgEJb*#Nk7f{ksitVTN;OB_y|^<fPw|eJQlfQRVmB5GlMfVcR{?xI3=qQ9UOs
zCkbPJMEd%zc1K@f36@0~T!iYP?1eH7s}?pj_yj0=|3nX#gR%*|l+97+DOwX96iX76
z5w946g-_D@%_>fd(-G173}p;mT>j^(Q7a$%Wo1Nazwdvtx$<XWxImBRGOduqZGSS}
zY`l%yUd!uZ1uzCWJ9@G#klYNMgR%;rL4}T^k*r0136&c-9F>nrhirvNK~>fFMdQcO
zS$0Hg7ycE=Lw>5CBE2?0N45Flk+c|f`ukZ6Wm*qdSb}Ad7LOt!<T5C&cZtZYqB~Cw
z50=PPMxE4#DE+yE>h;5>5D_8_pUsI0N46Q>NACFjQTT8w62ylQWO@e0{`NzI`O_$L
z`d0HVbLN5Tcue>5%qR-nXZg=gXid7!`}k<<f-zdFu%APPpi(ODBT;xflF7q8s7Bpi
z$dbXEon&1D9D>$aJS@wOhyb3BiZn+puQe34hv@PQhInF?4IBI4*~&n)87#rF$bxYw
z<@gO$D`$(!4Pr>rG}QGX305Inhg<=80*Nrkp?WS)2WR&&CGK3oc1|&KaX{cIG_d^#
zX)W%dq&w?D9>VFspU|>5CnExCkrA$AnAV%8*EryS@zsU1@MkQlwRCfTy%WzkbmV)r
zj835C=?|`{v1cw4y*K{Gk^4J<a|v3J;WkQIrrO9(vMvLDjiL_+WZ4nP6HY?o&QUsl
z@ozx^)_Wr^GW{89Z+ajDw0e6OmS9<AMK2O!UylmW9Z|VKMD3vIXo!gn+oh_crMfLQ
zq151o&?3;ABd^YC{(*u|uryBsk~0_E5aE&z8>1yEMj(C1mnfX`YvkHLt$!|YW`M(t
zSzFv5g`H7oEFqh?xiH41tFuQWqyI`bOhw`M%~3JYXw)V{$03c=^Qe4EI%FqV=K;S%
zS$KP7*%7U9aRl<VogDgoFQf~dk@0w0u`SuE)VC#UC3lN@u@|Zla{<bbNwSi<5%n2V
z`G;D<c4P#cg|cHN`{(uD#tw)`iA*^ra8FMLa<$APgI`|4Nc!IPsx0Atl)ij1(#HG&
zE!h1gBAo-;;_FYij-l6If6$#Z>tDs;eN=DhCMp(7ZxuWbT-VUi*-Ov#j{fYdqmbtF
zT5w(@(vw5!`r@0>j;IXI1aO8BTHzuQr7<oo{tp#+z8)F6SxC!8DC_t-U=WxSz*!Tx
zFv|tRBK}^MM(thsKUCivXRH}}#xltkCHuaw!=S|2WewStWh_aSvG0+s_#j42mSLtr
zq%cELp)m<X86uQr6q5aWeO}*x;rrY7{nPp7oO|whp8MSQdCqg+mnVzfty&zVJ}$SH
zvT0-6b(k#BmsG#uBebv!wcEYUA)Ni@^V2uHXL1lNFi#v!roi%^*LViQ!dWf>d-hy*
z?gKWz^Biy;?AfOajR+uT5R@)F25!BPOp!d`6%1zA-8MHnS5FsY-gDnQAS@~FsZrWI
z@9Z@%bbEc_>*+QbrEIm&v5!+PZ*Vy{-!6Cq<Fht~9l8|;NP}C<t2e0<7tOfxw+hV-
z>uTce*h%fu16ydhy&RT%1HVj6V{#N|Y(?s+ms22N*@vK0lVtM&O%`!WIW1)DG_9V$
z4T15A_@TvUJ5V`4hc2*}bh}w_A1LptHF|G+*7eky6eJ(6(@9iQMBtXDlAl6F>x!5T
zWpotCGONx-+p-RJesY(N)H?i+-Pq+Fi*GixG|o@N^AFYq_J4gN{XXRdrATi@jAOkn
z%WEC==uH0Wbzhg1C;8rkJh^6G>}+TA%pm=m`JXVI24b(`a1-XBJvY=bTBaw{o`;4L
z^S6b=drcT+x2F=tib`*>EqD~X96KZ7dXqNZ#TSIn3AgE%JM;507uUfyi~Viq0QhRo
z-p7{1XnJF+q95eXQs%gA>m|<%Wc5pf<thAXp5VXcn9O@a?q&<pl8L>dpQPt|5E2rd
zEW8hCs0sB$;d?Zed(2S~mCYQ&j0Ru+zH*2xryLNyDAG~q=$A*{>}jceqlt4l2?e<@
zyTB1*$Tk(EB?7B=X*h*!D-OHQI^rzP=qs}n8`a75+nQb=tcF`YS4aG?w13NUa-uh9
zP{1NG$|K1$O__5yUh#Rn;>U?_jWd>L81epv(9#>rdGMjJ)w~?=lT;IZ$rbLcBN3*=
zq6jJ(b;brg0;+fKe{X^BrF(Z*ID5-COrqJzX7QYS;*TV1)vu{3UVx@j0#|d=Y6KVz
z86&e0m>ichakPp6(v6m!*5+o{gz`{-o85R@{qynr1rl4GX&c)@C8#Chhm^B>)Ktcd
zze49-?_hEA7EEMNxpYO}wFIxbp$@OTbxah@yn9zfk30|?I<eZt+*giLxkY2}B!>HK
z#h95m$6wtPQj3{MBWwkOU#7an==Xj|2wu%kqakYjkVp6ZmbeYzlnggmZ*y|i^deC~
z8bmL#MBZPD&x*xS6N$POE9$cp+7{IZ^GZ8#R9i4w+U9RK9#JS<BJ@{^H-MJg#+tn#
zW7Z0RNC5xMm8l-vasMt{pztJ9p(C@>-pF$QDsEyJB*23exxVeJzQNHr7iIPD8n>+6
zBk%m_;0L#bQfanVL$?2p1edvV3I#n@V0rf5=ArCLSGw5mNL>ki!*^Ygpd<5(yFs1{
z-BUA$lM)tUhP-e!Pm>+!1hV-p9S+C=pS6?&zAR)Is^#1iQR2$^T3}SQ600UXV*Qh(
zgA}Vu!9G>O>{0JUcl<OqY6DL0$JT09C#{@YOrOay8~F1fClt#$_y1Bex0c|s)lD|u
z=5B>pLo|NkxR6_q+1rUPJF*aUU{In}BJ%mtgf+3(=G7dF%Ps3{1SL{ikmtDqpPfEW
zy4fvL*A~RZpql~E6hD(R{*hNNEDnw&@aSXh6uZ*7hF>qr&eeK4J(Wx~iCAU}em7jb
zn-fwasPn2nqPBlarGMqo^w2bZ&M5u5v|wf^xh%jU`)%OJ3rphjwq8X{U0o(D%v!Q3
ziAw!LG?$+9P5#szJW1Gte2D4J(KGrng!9D}x65y^Zs;^R9LM}#<RHl&Ex8|40nyxn
zkwUK?<d0T*@Cu0#sDU}>6AdBwmch!xn31Ix9w~XGcagButWK!#Ed1D-Ey-@>Ewm5_
zhC<cNNu@l--g9;Pn-Y5Svsxl&t5i$KOO&q1k?8(tSuwjU+=8rT``vbkgsx~20V8UI
zXupNBDlD0oS2O5<K16eWBM}=8!;df|Ub$Q+?<C*3{1JjZcZFq*0=1T2`U(L<&vbcZ
zTb+Z{9^Ivyem=6yRHWJP)7taS32-_8m`&iZp2_hc7khPbyt$%v&nTx$I#sN8hm0!r
z8B*1HBo33U0gcf7yHfTnCiW}})S>cle+u2!osc%X1uW-rR0<mH-R)?EuUI6p_4i*a
zi`v+`2KKRK!9a9??2^;|r9<t}r1%TIiL)H(smh#H9$&RuCOPA<0)@u6p)x_-`B9P~
z-h2x2l4FpM=7b55r<rG~++&EGj~Br7-1>|cWZ<9VH@wnSneP;SpX5zpN=y$jbO=-q
zpQY=5?bmg`b*5=`8J@DLy8q9r(EPWqjQ9Y=3y17(wje9oxgg`EDajCC-kPwyxu1mZ
z5y1)dw^yaHDX?_Wu}Yb>Rz86A1X>2tFFI^vdNzAyEmZ(z9YG=>1);C=Wk$_YGgrg-
z{jUe>IKyQfPebMx%&W(oo1)(@9`1@5yQDwA3ko$C5Amq?pW|NOfj;bXB%Yq<kz45D
zde<|Qu`0Q;9~ga?oa|jr4zM+KYlDGvk%E`!Dk`#?ZjW0=CtxvsstQ%1irSMIY%IK>
zn{99prTTTs+rtELI>F^-_6eCAnT3i?e~*8`zD2W0N_%b{u{H|CGRq8C?mnN@-V^M|
z*a4635kzZ#uF0P@4>*4ktewK+k&a5CP#UC!z!NZb1m7CvVo03_N+i1uw^!xfLRstA
zjPUiz*Y>H$_d6ZIUU{kWP@S%>X(<QRcf)QR*A@B%eGILwDv~(f5nhOVQW}FSq+I@8
z{>PQwaqT$GVd!o<nITNz<We!xu|HaivT?W7OB2PeR!6+iW$Hre$Hq*FcrAy84H_MV
zpWm1sE_itgC~;7rI@JO@lhi$>wkuY8Un(TO^UczT*NKD%9FZ<myh+L%#boQfoc*Zb
zpC2{|3nT{a)@A?(7w$BAA?vq{e_BJiv6s6YKSI;xlLOp!4y2;7B11m>#x)!|y@rbD
zET4M3Jb}$voesg!LLcy*5&g3mo7UT3T^~BG8>l}Si@W+cGp@0FN1|vvIj0_T=fSq0
z^7|-!T`$~?NSd9qQ+h79z_!rv^Kpfj)#G%RG;hZK`B`_(55?^RbYb3<8<im8OJ#iz
ztN_np`d#&P4Td+;Y2T;72H#${zlkImY#4mF<cGR|aMBny@;kF=DkbbQ>ku;NA5r87
zxbZY`h#$(%?d;HY4VFf)H(z)Q9JLrX&)@J2|KM}D3@W+zPk{3F>^xI#Up!86eSHaB
zBoG`@Qnh3Dt@z3ky(=_70yi<G6y=rRx8rLC&(&14c<n=JC1?%-&wQdeH}r~2SuHOU
zTL0=HARXxyE?BZ+yVon_!r#iAm|LdzW0?j%h3SZQ?l}5vkPv>`;mpdPSIxo2MIsJa
zTbabKLh6y*h1f7avO~%yR^^Pp@xPPq?fb<L?74>}Nt-&}q;+t6(_IHthRvN@1~X2{
z`$H<56_;`}xM!~C<<7%;nwrZ9d%RZ#KJjQ7L<~(y21?*%T-$d0hMkM5e62u>CZK&^
zMR&fO8LUg{4Hv+9$kL~#_fhqYYxWH-`Qu2wJWJ=6e_qNP>C}u;DUXs5jCHWxL8(V9
z(oOhQ7EP*#OFA972KFc*xfL#9i>-3`%PVm;lfm4tr)ahMF*%vZ#`wd%a<V{WBtKqz
z8q@AF99M|fcP_wp^L}NFcD<ZBplKA4gwWX2Vt-HGkWD9p>T(9KoVV@RCm#)khL8p$
zC1b-LVqv3pI?fDSH8$7uzCd?aj$w=|ibO>f4|oE!0fB<sh>tH3*5w|Qdp<ldYcG1T
z$-`AjD!$t>V&j1M!4q2+8ko&&XgO-JOWAXpeVt#OLKSaGKA1C7(q)MBO<c7?DbIFR
z1F2=VZPFoXa`c1RuW*ave|DW`-Dml|My@#9ic)sDA+{c;V^vn(KaR9V)FX|ECq_<A
zTf40?@iM1hmAHOhtLQa30j0Tjry|1Uf@-zN6F0GkvR4($2C%5!T1ZyQ3Se(9z5DLw
zilOF;ZO)xXgGLvigJ^G7j`L3+@y}{WRwr>*!d3DeI03sqB_fG&S<(}|M@=iGS)RH{
zgfDhqx%&IiTuNF;NG%Q$$s%%Fy%Bl9gXebf_->VEoU&7CzoEa!&#$Wg2L>6Q?kg4+
zqYC*#p7pz?b7o~JFkr3hYMoO3ZwLf`dZa7vF|qGEPAZLP{}?Nf{pSUbEmri<sv3yA
z`1-yjVv$8Ao|C{R@VIQcd!R6LBo4>S$9{+th1QF9(nA_vKD|cuW_=wQ?q1-22O`EK
z$Z;Sn#k$J>qSQDJJEgkQNE9FrS`=1`Y@Zr^_=~K4akE-g85sM4i_)oPm0mu=tcsJ?
zGdw;J6vOgNY(<i4DoB>1e$Jn!j9CLdb*o1GY?x7d^S67QmDUuFcE&=MRt6XQ$Q&@D
z19IwYc;JJ+PkkpqgF5J`^v84>%S#~_Nm>iKam(u?L&f6;<u@*XLg;Zmf@yjvN_e*`
zV}y$93?|H5H@A!8wDt9*uMeibg}65>H+39$At5g!0+|s%nHK|wfNrD^YN*)feru~Q
zK(5xqXi?yumkt1~8llKGN1dVy@Mbi)H{rYSY9C5x+#`p|+g_1|ffHW26IA3^C9B(D
z+^31NILGCRm`&dVdMwuguNG!;V(s*|HdcTUfC1$C&+~W*hnpo`vk=OA==gwU`!p@j
zb>lovdyDU#%z-LC;#<P-0))aMgMD){UkUZ8cSFjfc<4>1)0W}kQ<LN2;&`16){J)4
z(!A#OkZc=3*vriJHDv!Cz5LWQ5N&%0Zi?=%GQ2|<b}r0`qvXpq{zEQ+3gJ%>7<N$c
zZ0pEHlB68-mGh(%fZU9}3|9GnZ$wTG3e?N|xB36}|JUSy?*n<qEJdHW(;Y?uJv{)I
M;MS%sFt3#V07s59*Z=?k

literal 0
HcmV?d00001


From 67f1094a97dd7def5bd1711568410afa289b36a4 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Mon, 17 Oct 2022 13:40:18 +0200
Subject: [PATCH 0020/1461] Added Modal Component

---
 public/js/components/Base/Modal.js | 38 ++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 public/js/components/Base/Modal.js

diff --git a/public/js/components/Base/Modal.js b/public/js/components/Base/Modal.js
new file mode 100644
index 000000000..ad3785e62
--- /dev/null
+++ b/public/js/components/Base/Modal.js
@@ -0,0 +1,38 @@
+export default {
+    name: "BaseModal",
+    props: [
+        "id",
+        "cModalClass",      // optional: add custom classes to modal class
+        "cModalDialogClass" // optional: add custom classes to modal-dialog class
+    ],
+    onMounted()
+    {
+        const modal = new bootstrap.Modal(this.$refs.modal, {})
+        modal.show();
+    },
+    template: `
+    <div class="modal fade"
+        ref="modal"
+        :class="this.cModalClass"
+        :id="this.id"
+        :aria-labelledby="this.id + '_label'" aria-hidden="true" tabindex="-1">       
+            <div class="modal-dialog" :class="this.cModalDialogClass">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h5 class="modal-title" :id="this.id + '_label'">
+                        <slot name="title"></slot>
+                    </h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                </div>
+                <div class="modal-body">
+                    <slot name="body"></slot>
+                </div>
+                <div class="modal-footer">
+                    <slot name="footer">
+                        <button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal">Abbrechen</button><!-- default -->
+                    </slot>
+                </div>
+            </div>
+        </div>
+    </div>`
+}

From 8983a0e82126d147bae020de4114997ccc1dfa10 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 24 Oct 2022 11:01:27 +0200
Subject: [PATCH 0021/1461] Bootstrap Modal (+ Alert,Confirm,Prompt)

---
 public/js/components/Bootstrap/Alert.js   |  44 +++++++++
 public/js/components/Bootstrap/Confirm.js |  22 +++++
 public/js/components/Bootstrap/Modal.js   | 103 ++++++++++++++++++++++
 public/js/components/Bootstrap/Prompt.js  |  36 ++++++++
 4 files changed, 205 insertions(+)
 create mode 100644 public/js/components/Bootstrap/Alert.js
 create mode 100644 public/js/components/Bootstrap/Confirm.js
 create mode 100644 public/js/components/Bootstrap/Modal.js
 create mode 100644 public/js/components/Bootstrap/Prompt.js

diff --git a/public/js/components/Bootstrap/Alert.js b/public/js/components/Bootstrap/Alert.js
new file mode 100644
index 000000000..b261eeaef
--- /dev/null
+++ b/public/js/components/Bootstrap/Alert.js
@@ -0,0 +1,44 @@
+import BsModal from './Modal.js';
+
+export default {
+	components: {
+		BsModal
+	},
+	mixins: [
+		BsModal
+	],
+	props: {
+		dialogClass: {
+			type: [String,Array,Object],
+			default: 'modal-dialog-centered'
+		},
+		/*
+		 * NOTE(chris): 
+		 * Hack to expose in "emits" declared events to $props which we use 
+		 * in the v-bind directive to forward all events.
+		 * @see: https://github.com/vuejs/core/issues/3432
+		*/
+		onHideBsModal: Function,
+		onHiddenBsModal: Function,
+		onHidePreventedBsModal: Function,
+		onShowBsModal: Function,
+		onShownBsModal: Function
+	},
+	data: () => ({
+		result: true
+	}),
+	mounted() {
+		this.modal = this.$refs.modalContainer.modal;
+	},
+	popup(msg, options) {
+		return BsModal.popup.bind(this)(msg, options);
+	},
+	template: `<bs-modal ref="modalContainer" class="bootstrap-alert" v-bind="$props">
+		<template v-slot:default>
+			<slot></slot>
+		</template>
+		<template v-slot:footer>
+			<button type="button" class="btn btn-primary" data-bs-dismiss="modal">OK</button>
+		</template>
+	</bs-modal>`
+}
diff --git a/public/js/components/Bootstrap/Confirm.js b/public/js/components/Bootstrap/Confirm.js
new file mode 100644
index 000000000..1c609d457
--- /dev/null
+++ b/public/js/components/Bootstrap/Confirm.js
@@ -0,0 +1,22 @@
+import BsAlert from './Alert';
+
+export default {
+	mixins: [
+		BsAlert
+	],
+	data: () => ({
+		result: false
+	}),
+	popup(msg, options) {
+		return BsAlert.popup.bind(this)(msg, options);
+	},
+	template: `<bs-modal ref="modalContainer" class="bootstrap-confirm" v-bind="$props">
+		<template v-slot:default>
+			<slot></slot>
+		</template>
+		<template v-slot:footer>
+			<button type="button" class="btn btn-primary" @click="result=true;this.hide()">OK</button>
+			<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
+		</template>
+	</bs-modal>`
+}
diff --git a/public/js/components/Bootstrap/Modal.js b/public/js/components/Bootstrap/Modal.js
new file mode 100644
index 000000000..c99aabb58
--- /dev/null
+++ b/public/js/components/Bootstrap/Modal.js
@@ -0,0 +1,103 @@
+export default {
+	data: () => ({
+		modal: null
+	}),
+	props: {
+		backdrop: {
+			type: [Boolean,String],
+			default: true,
+			validator(value) {
+				return ['static', true, false].includes(value);
+			}
+		},
+		focus: {
+			type: Boolean,
+			default: true
+		},
+		keyboard: {
+			type: Boolean,
+			default: true
+		},
+		noCloseBtn: Boolean,
+		dialogClass: [String,Array,Object]
+	},
+	emits: [
+		"hideBsModal",
+		"hiddenBsModal",
+		"hidePreventedBsModal",
+		"showBsModal",
+		"shownBsModal"
+	],
+	methods: {
+		dispose() {
+			return this.modal.dispose();
+		},
+		handleUpdate() {
+			return this.modal.handleUpdate();
+		},
+		hide() {
+			return this.modal.hide();
+		},
+		show(relatedTarget) {
+			return this.modal.show(relatedTarget);
+		},
+		toggle() {
+			return this.modal.toggle();
+		}
+	},
+	mounted() {
+		this.modal = new bootstrap.Modal(this.$refs.modal, {
+			backdrop: this.backdrop,
+			focus: this.focus,
+			keyboard: this.keyboard
+		});
+	},
+	popup(body, options, title, footer) {
+		const BsModal = this;
+		return new Promise((resolve,reject) => {
+			const instance = Vue.createApp({
+				setup() {
+					return () => Vue.h(BsModal, {...{
+						class: 'fade'
+					},...options, ...{
+						ref: 'modal',
+						'onHidden.bs.modal': instance.unmount
+					}}, {
+						title: () => title,
+						default: () => body,
+						footer: () => footer
+					});
+				},
+				mounted() {
+					this.$refs.modal.show();
+				},
+				beforeUnmount() {
+					if (this.$refs.modal)
+						this.$refs.modal.result !== false ? resolve(this.$refs.modal.result) : reject();
+				},
+				unmounted() {
+					wrapper.parentElement.removeChild(wrapper);
+				}
+			});
+			const wrapper = document.createElement("div");
+			instance.mount(wrapper);
+			document.body.appendChild(wrapper);
+		});
+	},
+	template: `<div ref="modal" class="bootstrap-modal modal" tabindex="-1" @[\`hide.bs.modal\`]="$emit('hideBsModal')" @[\`hidden.bs.modal\`]="$emit('hiddenBsModal')" @[\`hidePrevented.bs.modal\`]="$emit('hidePreventedBsModal')" @[\`show.bs.modal\`]="$emit('showBsModal')" @[\`shown.bs.modal\`]="$emit('shownBsModal')">
+		<div class="modal-dialog" :class="dialogClass">
+			<div class="modal-content">
+				<div v-if="$slots.title" class="modal-header">
+					<h5 class="modal-title"><slot name="title"/></h5>
+					<button v-if="!noCloseBtn" type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+				</div>
+				<div class="modal-body">
+					<slot></slot>
+				</div>
+				<div v-if="$slots.footer" class="modal-footer">
+					<slot name="footer"/>
+				</div>
+			</div>
+		</div>
+	</div>`
+}
diff --git a/public/js/components/Bootstrap/Prompt.js b/public/js/components/Bootstrap/Prompt.js
new file mode 100644
index 000000000..c056d4237
--- /dev/null
+++ b/public/js/components/Bootstrap/Prompt.js
@@ -0,0 +1,36 @@
+import BsAlert from './Alert';
+
+export default {
+	mixins: [
+		BsAlert
+	],
+	props: {
+		placeholder: String,
+		default: String
+	},
+	data: () => ({
+		value: '',
+		result: false
+	}),
+	created() {
+		if (this.default)
+			this.value = this.default;
+	},
+	popup(msg, options) {
+		if (typeof options === 'string')
+			options = { default: options };
+		return BsAlert.popup.bind(this)(msg, options);
+	},
+	template: `<bs-modal ref="modalContainer" class="bootstrap-prompt" v-bind="$props">
+		<template v-slot:default>
+			<slot></slot>
+			<div>
+				<input ref="input" type="text" class="form-control" :placeholder="placeholder" v-model="value">
+			</div>
+		</template>
+		<template v-slot:footer>
+			<button type="button" class="btn btn-primary" @click="result=value;this.hide()">OK</button>
+			<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
+		</template>
+	</bs-modal>`
+}

From 4aa7b9854a0a8b39787735808792dc1be95c01e8 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 24 Oct 2022 15:08:10 +0200
Subject: [PATCH 0022/1461] setConfig is an emit not a prop

---
 public/js/components/DashboardWidget/Abstract.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/DashboardWidget/Abstract.js b/public/js/components/DashboardWidget/Abstract.js
index 8d0416e28..29773a164 100644
--- a/public/js/components/DashboardWidget/Abstract.js
+++ b/public/js/components/DashboardWidget/Abstract.js
@@ -3,10 +3,10 @@ export default {
 		"config",
 		"width",
 		"height",
-		"setConfig",
 		"configMode"
 	],
 	emits: [
+		"setConfig",
 		"change" // TODO(chris): do we need this?
 	]
 }

From a3722273e9c9ccabbdc45e9955c5761fcb2caa4f Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 24 Oct 2022 15:44:12 +0200
Subject: [PATCH 0023/1461] use Bootstrap modals

---
 public/js/components/Dashboard/Dashboard.js   | 97 ++++++-------------
 public/js/components/Dashboard/Item.js        | 54 +++++------
 public/js/components/Dashboard/Section.js     | 23 +++--
 .../js/components/Dashboard/Widget/Picker.js  | 54 +++++++++++
 4 files changed, 127 insertions(+), 101 deletions(-)
 create mode 100644 public/js/components/Dashboard/Widget/Picker.js

diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js
index 8cd234812..8b58b6efc 100644
--- a/public/js/components/Dashboard/Dashboard.js
+++ b/public/js/components/Dashboard/Dashboard.js
@@ -1,4 +1,5 @@
 import DashboardSection from "./Section.js";
+import DashboardWidgetPicker from "./Widget/Picker.js";
 import CachedWidgetLoader from "../../composables/Dashboard/CachedWidgetLoader.js";
 import ObjectUtils from "../../composables/ObjectUtils.js";
 
@@ -9,21 +10,15 @@ export default {
 	],
 	data: () => ({
 		sections: [],
-		widgets: [],
-		isLoading: 0,
-		tmpCreate: null,
+		widgets: null
 	}),
 	components: {
-		DashboardSection
-	},
-	computed: {
-		listReady() {
-			return this.widgets.length && !this.isLoading;
-		}
+		DashboardSection,
+		DashboardWidgetPicker
 	},
 	methods: {
 		widgetAdd(section_name, widget) {
-			if (!this.widgets.length) {
+			if (this.widgets === null) {
 				axios.get(this.apiurl + '/Widget/getWidgetsForDashboard', {params:{
 					db: this.dashboard
 				}}).then(res => {
@@ -35,34 +30,32 @@ export default {
 					this.widgets = res.data.retval;
 				}).catch(err => console.error('ERROR:', err));
 			}
-			this.tmpCreate = {section_name,widget};
-			this.listModal.show();
-		},
-		widgetCreate(widget) {
-			this.isLoading = 1;
-			this.tmpCreate.widget.widget = widget;
-			axios.post(this.apiurl + '/Config/addWidgetsToUserOverride', {
-				db: this.dashboard,
-				funktion_kurzbz: this.tmpCreate.section_name,
-				widgets: [this.tmpCreate.widget]
-			}).then(result => {
-				let newId = 0;
-				let sec = result.data.retval.data.widgets[this.tmpCreate.section_name];
-				for (var i in sec) {
-					newId = i;
-					break;
-				}
-				this.tmpCreate.widget.id = newId;
+			this.$refs.widgetpicker.getWidget().then(widget_id => {
+				widget.widget = widget_id;
+				let loading = {...widget};
+				loading.loading = true;
 				this.sections.forEach(section => {
-					if (section.name == this.tmpCreate.section_name)
-						section.widgets.push(this.tmpCreate.widget);
+					if (section.name == section_name)
+						section.widgets.push(loading);
+				});
+				
+				axios.post(this.apiurl + '/Config/addWidgetsToUserOverride', {
+					db: this.dashboard,
+					funktion_kurzbz: section_name,
+					widgets: [widget]
+				}).then(result => {
+					let newId = Object.keys(result.data.retval.data.widgets[section_name]).pop();
+					widget.id = newId;
+					this.sections.forEach(section => {
+						if (section.name == section_name) {
+							section.widgets.splice(section.widgets.indexOf(loading),1);
+							section.widgets.push(widget);
+						}
+					});
+				}).catch(error => {
+					console.error('ERROR: ', error);
+					alert('ERROR: ' + error.response.data.retval);
 				});
-			}).catch(error => {
-				console.error('ERROR: ', error);
-				alert('ERROR: ' + error.response.data.retval);
-			}).finally(() => {
-				this.listModal.hide();
-				this.isLoading = 0;
 			});
 		},
 		widgetUpdate(section_name, payload) {
@@ -89,7 +82,7 @@ export default {
 				db: this.dashboard,
 				funktion_kurzbz: section_name,
 				widgets: payload
-			}).then(result => {
+			}).then(() => {
 				this.sections.forEach(section => {
 					if (section.name == section_name) {
 						section.widgets.forEach((widget, i) => {
@@ -112,7 +105,7 @@ export default {
 				db: this.dashboard,
 				funktion_kurzbz: section_name,
 				widgetid: id
-			}).then(result => {
+			}).then(() => {
 				this.sections.forEach(section => {
 					if (section.name == section_name)
 						section.widgets = section.widgets.filter(widget => widget.id != id);
@@ -142,34 +135,8 @@ export default {
 			}
 		}).catch(err => console.error('ERROR:', err));
 	},
-	mounted() {
-		this.listModal = new bootstrap.Modal(this.$refs.widgetlist);
-	},
 	template: `<div class="core-dashboard">
 		<dashboard-section v-for="section in sections" :key="section.name" :name="section.name" :widgets="section.widgets" @widgetAdd="widgetAdd" @widgetUpdate="widgetUpdate" @widgetRemove="widgetRemove"></dashboard-section>
-		<div ref="widgetlist" class="modal" tabindex="-1">
-			<div class="modal-dialog">
-				<div class="modal-content">
-					<div class="modal-header">
-						<h5 class="modal-title">Create new widget</h5>
-						<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-					</div>
-					<div class="modal-body">
-						<div v-if="listReady" class="row">
-							<div v-for="widget in widgets" :v-key="widget.widget_id" class="col">
-								<div class="card h-100" @click="widgetCreate(widget.widget_id)">
-									<img class="card-img-top" :src="widget.setup.icon" :alt="'pictogram for ' + (widget.setup.name || widget.widget_kurzbz)">
-									<div class="card-body">
-										<h5 class="card-title">{{ widget.setup.name || widget.widget_kurzbz }}</h5>
-										<p class="card-text">{{ widget.beschreibung }}</p>
-									</div>
-								</div>
-							</div>
-						</div>
-						<div v-else class="text-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></div>
-					</div>
-				</div>
-			</div>
-		</div>
+		<dashboard-widget-picker ref="widgetpicker" :widgets="widgets"></dashboard-widget-picker>
 	</div>`
 }
\ No newline at end of file
diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index 7f3f41fb8..2c20bee64 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -1,11 +1,13 @@
+import BsModal from "../Bootstrap/Modal.js";
 import CachedWidgetLoader from "../../composables/Dashboard/CachedWidgetLoader.js";
 
 export default {
-	components: {},
+	components: {
+		BsModal
+	},
 	data: () => ({
 		component: '',
 		arguments: null,
-		configModal: null,
 		target: false,
 		widget: null,
 		tmpConfig: {},
@@ -25,7 +27,8 @@ export default {
 		"height",
 		"custom",
 		"hidden",
-		"editMode"
+		"editMode",
+		"loading"
 	],
 	computed: {
 		isResizeable() {
@@ -55,7 +58,7 @@ export default {
 		},
 		openConfig() {
 			this.tmpConfig = {...this.arguments};
-			this.configModal.show();
+			this.$refs.config.show();
 		},
 		setConfig(hasConfig) {
 			this.hasConfig = hasConfig;
@@ -82,7 +85,7 @@ export default {
 		config() {
 			this.arguments = {...this.widget.arguments, ...this.config};
 			this.tmpConfig = {...this.arguments};
-			this.configModal.hide();
+			this.$refs.config.hide();
 			this.isLoading = false;
 		}
 	},
@@ -94,10 +97,12 @@ export default {
 		this.arguments = {...this.widget.arguments, ...this.config};
 		this.tmpConfig = {...this.arguments};
 	},
-	mounted() {
-		this.configModal = new bootstrap.Modal(this.$refs.config);
-	},
-	template: `<div v-if="!hidden || editMode" :class="'dashboard-item card overflow-hidden ' + (arguments ? arguments.className : '')" @mousedown="mouseDown($event)" @dragstart="startDrag($event)" :draggable="!!editMode">
+	template: `<div v-if="loading">
+		<div class="d-flex justify-content-center align-items-center h-100">
+			<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
+		</div>
+	</div>
+	<div v-else-if="!hidden || editMode" :class="'dashboard-item card overflow-hidden ' + (arguments ? arguments.className : '')" @mousedown="mouseDown($event)" @dragstart="startDrag($event)" :draggable="!!editMode">
 		<div v-if="editMode && widget" class="card-header d-flex">
 			<span ref="dragHandle" class="col-auto pe-3"><i class="fa-solid fa-grip-vertical"></i></span>
 			<span class="col">{{ widget.setup.name }}</span>
@@ -113,24 +118,19 @@ export default {
 			<component :is="component" :config="arguments" :width="width" :height="height" @setConfig="setConfig" @change="changeConfigManually"></component>
 		</div>
 		<div v-else class="card-body overflow-hidden text-center d-flex flex-column justify-content-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></div>
-		<div ref="config" class="modal" tabindex="-1">
-			<div class="modal-dialog">
-				<div class="modal-content">
-					<div class="modal-header">
-						<h5 v-if="widget" class="modal-title">Config for {{ widget.setup.name }}</h5>
-						<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-					</div>
-					<div class="modal-body">
-						<component v-if="ready && !isLoading" :is="component" :config="tmpConfig" @change="changeConfig" :configMode="true"></component>
-						<div v-else class="text-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></div>
-					</div>
-					<div class="modal-footer">
-						<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
-						<button type="button" class="btn btn-primary" @click="changeConfig">Save changes</button>
-					</div>
-				</div>
-			</div>
-		</div>
+		<bs-modal ref="config">
+			<template v-slot:title>
+				{{ widget ? 'Config for ' + widget.setup.name : '' }}
+			</template>
+			<template v-slot:default>
+				<component v-if="ready && !isLoading" :is="component" :config="tmpConfig" @change="changeConfig" :configMode="true"></component>
+				<div v-else class="text-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></div>
+			</template>
+			<template v-slot:footer>
+				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
+				<button type="button" class="btn btn-primary" @click="changeConfig">Save changes</button>
+			</template>
+		</bs-modal>
 		<div v-if="editMode && isResizeable" class="card-footer d-flex justify-content-end p-0">
 			<span ref="resizeHandle" class="col-auto ps-1" @dragstart.prevent="$emit('resize')"><i class="fa-solid fa-up-right-and-down-left-from-center"></i></span>
 		</div>
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 27ac148d4..7b2662709 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -1,3 +1,4 @@
+import BsConfirm from "../Bootstrap/Confirm.js";
 import DashboardItem from "./Item.js";
 import CachedWidgetLoader from "../../composables/Dashboard/CachedWidgetLoader.js";
 
@@ -14,6 +15,7 @@ export default {
 		dataTransfer: {}
 	}),
 	props: [
+		"adminMode",
 		"name",
 		"widgets"
 	],
@@ -66,9 +68,9 @@ export default {
 				let h = item._h !== undefined ? item._h : itemCoords[item.index].h;
 				for (var c = 0; c < occupiers.length + gridWidth; c++) {
 					if (occupiers[c] === undefined) {
-						var occupied = false;
-						for (var i = 0; i < w; i++) {
-							for (var j = 0; j < h; j++) {
+						var occupied = false, i, j;
+						for (i = 0; i < w; i++) {
+							for (j = 0; j < h; j++) {
 								if (occupiers[c + i + j * gridWidth] !== undefined) {
 									i = w;
 									occupied = true;
@@ -79,8 +81,8 @@ export default {
 						if (!occupied) {
 							item.place[gridWidth].x = c%gridWidth + 1;
 							item.place[gridWidth].y = Math.floor(c/gridWidth) + 1;
-							for (var i = 0; i < w; i++) {
-								for (var j = 0; j < h; j++) {
+							for (i = 0; i < w; i++) {
+								for (j = 0; j < h; j++) {
 									occupiers[c + i + j * gridWidth] = item.index;
 								}
 							}
@@ -295,7 +297,7 @@ export default {
 				this.itemCoords[id].h = h;
 			}
 		},
-		onDrop(evt) {
+		onDrop() {
 			let id = 0;
 			let update = {};
 			while ((id = this.movedObjects.pop())) {
@@ -346,9 +348,7 @@ export default {
 		},
 		removeWidget(item, revert) {
 			if (item.custom) {
-				if (confirm('Are you sure you want to delete this widget?')) {
-					this.$emit('widgetRemove', this.name, item.id);
-				}
+				BsConfirm.popup('Are you sure you want to delete this widget?').then(() => this.$emit('widgetRemove', this.name, item.id));
 			} else {
 				let update = {};
 				update[item.id] = { hidden: !revert };
@@ -366,6 +366,10 @@ export default {
 			this.$emit('widgetUpdate', this.name, payload);
 		}
 	},
+	created() {
+		if (this.adminMode)
+			this.editMode = 1;
+	},
 	mounted() {
 		let self = this;
 		let cont = self.$refs.container;
@@ -401,6 +405,7 @@ export default {
 					v-for="item in items" 
 					:key="item.id" 
 					:id="item.widget" 
+					:loading="item.loading"
 					:config="item.config" 
 					:custom="item.custom" 
 					:hidden="item.hidden" 
diff --git a/public/js/components/Dashboard/Widget/Picker.js b/public/js/components/Dashboard/Widget/Picker.js
new file mode 100644
index 000000000..871d48a2d
--- /dev/null
+++ b/public/js/components/Dashboard/Widget/Picker.js
@@ -0,0 +1,54 @@
+import BsModal from "../../Bootstrap/Modal.js";
+
+export default {
+	components: {
+		BsModal
+	},
+	props: [
+		"widgets"
+	],
+	data: () => ({
+		callbacks: {}
+	}),
+	methods: {
+		getWidget() {
+			return new Promise((resolve,reject) => {
+				this.callbacks = {resolve,reject};
+				this.$refs.modal.show();
+			});
+		},
+		close() {
+			if (this.callbacks.reject)
+				this.callbacks.reject();
+			this.callbacks = {};
+		},
+		pick(widget_id) {
+			if (this.callbacks.resolve)
+				this.callbacks.resolve(widget_id);
+			this.callbacks = {};
+			this.$refs.modal.hide();
+		}
+	},
+	template: `<div class="dashboard-widget-picker">
+		<bs-modal ref="modal" class="fade" :dialog-class="{'modal-fullscreen-sm-down': 1, 'modal-dialog modal-xl': widgets && widgets.length > 5}" @hiddenBsModal="close">
+			<template v-slot:title>Create new widget</template>
+			<template v-slot:default>
+				<div v-if="widgets" class="row">
+					<div v-if="!widgets.length">
+						No Widgets available
+					</div>
+					<div v-for="widget in widgets" :key="widget.widget_id" class="col-sm-6 col-md-4 col-lg-3 col-xl-2">
+						<div class="card h-100" @click="pick(widget.widget_id)">
+							<img class="card-img-top" :src="widget.setup.icon" :alt="'pictogram for ' + (widget.setup.name || widget.widget_kurzbz)">
+							<div class="card-body">
+								<h5 class="card-title">{{ widget.setup.name || widget.widget_kurzbz }}</h5>
+								<p class="card-text">{{ widget.beschreibung }}</p>
+							</div>
+						</div>
+					</div>
+				</div>
+				<div v-else class="text-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></div>
+			</template>
+		</bs-modal>
+	</div>`
+}

From a65d297997d4b0e6d2ab87d3f03642d7ecf5a392 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 24 Oct 2022 16:01:02 +0200
Subject: [PATCH 0024/1461] use FHC_JS_DATA_STORAGE_OBJECT for apiurl

---
 public/js/components/Dashboard/Dashboard.js       | 15 +++++++++------
 .../composables/Dashboard/CachedWidgetLoader.js   |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js
index 8b58b6efc..b36e11bde 100644
--- a/public/js/components/Dashboard/Dashboard.js
+++ b/public/js/components/Dashboard/Dashboard.js
@@ -4,17 +4,21 @@ import CachedWidgetLoader from "../../composables/Dashboard/CachedWidgetLoader.j
 import ObjectUtils from "../../composables/ObjectUtils.js";
 
 export default {
+	components: {
+		DashboardSection,
+		DashboardWidgetPicker
+	},
 	props: [
-		"dashboard",
-		"apiurl"
+		"dashboard"
 	],
 	data: () => ({
 		sections: [],
 		widgets: null
 	}),
-	components: {
-		DashboardSection,
-		DashboardWidgetPicker
+	computed: {
+		apiurl() {
+			return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/dashboard';
+		}
 	},
 	methods: {
 		widgetAdd(section_name, widget) {
@@ -117,7 +121,6 @@ export default {
 		}
 	},
 	created() {
-		CachedWidgetLoader.setPath(this.apiurl + '/Widget');
 		axios.get(this.apiurl + '/Config', {params:{
 			db: this.dashboard
 		}}).then(res => {
diff --git a/public/js/composables/Dashboard/CachedWidgetLoader.js b/public/js/composables/Dashboard/CachedWidgetLoader.js
index e0eb39710..3ebe6ddcb 100644
--- a/public/js/composables/Dashboard/CachedWidgetLoader.js
+++ b/public/js/composables/Dashboard/CachedWidgetLoader.js
@@ -1,6 +1,6 @@
 let __widgets = {};
 let __widgetsStarted = {};
-let __path = '';
+let __path = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/dashboard/Widget';
 
 export default {
 	getWidget(id) {

From 10437147677f6b0efeee0e2a989c56f0a5db25ac Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 25 Oct 2022 09:51:20 +0200
Subject: [PATCH 0025/1461] adminMode in Sections

---
 public/js/components/Dashboard/Section.js | 31 ++++++++++++++---------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 7b2662709..2f4772504 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -4,16 +4,14 @@ import CachedWidgetLoader from "../../composables/Dashboard/CachedWidgetLoader.j
 
 // TODO(chris): handle overflow (moving outside the box)
 export default {
-	data: () => ({
-		gridWidth: 0,
-		containerRect: {top:0,left:0},
-		changeHeight: 1,
-		movedObjects: [],
-		editMode: 0,
-		gridXLast: 0,
-		gridYLast: 0,
-		dataTransfer: {}
-	}),
+	components: {
+		DashboardItem
+	},
+	inject: {
+		adminMode: {
+			default: false
+		}
+	},
 	props: [
 		"adminMode",
 		"name",
@@ -24,8 +22,17 @@ export default {
 		"widgetUpdate",
 		"widgetRemove"
 	],
-	components: {
-		DashboardItem
+	data() {
+		return {
+			gridWidth: 0,
+			containerRect: {top:0,left:0},
+			changeHeight: 1,
+			movedObjects: [],
+			editMode: this.adminMode ? 1 : 0,
+			gridXLast: 0,
+			gridYLast: 0,
+			dataTransfer: {}
+		}
 	},
 	computed: {
 		items() {

From 699b76f4cb2aa625f6e087a138cb858fa5f36bae Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Tue, 25 Oct 2022 12:54:35 +0200
Subject: [PATCH 0026/1461] Added general used methods and computed property to
 Abstract Mixin Component . apiurl: returns app root and ci router from
 FHC_JS_DATA_OBJECT . formatDateTime: returns human readable date time .
 getDate: returns human readable date

---
 .../js/components/DashboardWidget/Abstract.js | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/public/js/components/DashboardWidget/Abstract.js b/public/js/components/DashboardWidget/Abstract.js
index 8d0416e28..40cf7ce4f 100644
--- a/public/js/components/DashboardWidget/Abstract.js
+++ b/public/js/components/DashboardWidget/Abstract.js
@@ -8,5 +8,23 @@ export default {
 	],
 	emits: [
 		"change" // TODO(chris): do we need this?
-	]
+	],
+	computed: {
+		apiurl() {
+			const app_root = FHC_JS_DATA_STORAGE_OBJECT.app_root;
+			const ci_router = FHC_JS_DATA_STORAGE_OBJECT.ci_router;
+			return app_root + ci_router;
+		}
+	},
+	methods: {
+		formatDateTime: function(dateTime) {
+			const dt = new Date(dateTime);
+			return dt.getDate() + '.' + dt.getMonth() + '.' + dt.getFullYear() + ' | '
+				+ dt.getHours() + ':' + dt.getMinutes();
+		},
+		getDate: function(dateTime){
+			const dt = new Date(dateTime);
+			return dt.getDate() + '.' + dt.getMonth() + '.' + dt.getFullYear();
+		}
+	}
 }

From c5d3f474577afe46d7b6387553581a900a7247cd Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Tue, 25 Oct 2022 12:55:49 +0200
Subject: [PATCH 0027/1461] Merged Modal Component, adapted body padding there

---
 public/js/components/Bootstrap/Modal.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Bootstrap/Modal.js b/public/js/components/Bootstrap/Modal.js
index c99aabb58..9eb1c6559 100644
--- a/public/js/components/Bootstrap/Modal.js
+++ b/public/js/components/Bootstrap/Modal.js
@@ -91,7 +91,7 @@ export default {
 					<h5 class="modal-title"><slot name="title"/></h5>
 					<button v-if="!noCloseBtn" type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
 				</div>
-				<div class="modal-body">
+				<div class="modal-body px-4 py-5">
 					<slot></slot>
 				</div>
 				<div v-if="$slots.footer" class="modal-footer">

From fdc52ae47dba14edc35b4242bc602f8920ea0838 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Tue, 25 Oct 2022 12:57:27 +0200
Subject: [PATCH 0028/1461] Added Offcanvas Component

---
 public/js/components/Base/Offcanvas.js | 32 ++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 public/js/components/Base/Offcanvas.js

diff --git a/public/js/components/Base/Offcanvas.js b/public/js/components/Base/Offcanvas.js
new file mode 100644
index 000000000..4db2592a6
--- /dev/null
+++ b/public/js/components/Base/Offcanvas.js
@@ -0,0 +1,32 @@
+export default {
+    name: "BaseOffcanvas",
+    props: [
+    "id",
+    "cOffcanvasClass",      // optional: add custom classes to offcanvas class
+    "closeFunc"
+    ],
+    computed: {
+        OffcanvasClass() {
+            return this.cOffcanvasClass || 'offcanvas-end'; // default: slide in from right to left
+        }
+    },
+    template: `
+    <div class="offcanvas"
+        :class="this.OffcanvasClass"
+        :id="this.id"
+        :aria-labelledby="this.id + '_label'"
+        tabindex="-1"
+        data-bs-backdrop="false">
+        <div class="offcanvas-header">
+            <h5 class="offcanvas-title" :id="this.id + '_label'">
+                <slot name="title"></slot>
+            </h5>
+        <button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" @click="closeFunc" aria-label="Close"></button>
+        </div>
+        <div class="offcanvas-body">
+            <div>
+                <slot name="body"></slot>
+            </div>
+        </div>
+    </div>`
+}

From ae05b34cbf7a17635e53bae9c18910eba0b475b4 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Tue, 25 Oct 2022 12:58:14 +0200
Subject: [PATCH 0029/1461] Removed test function

---
 application/controllers/dashboard/Dashboard.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/application/controllers/dashboard/Dashboard.php b/application/controllers/dashboard/Dashboard.php
index 2769bb8e5..64ca2543e 100644
--- a/application/controllers/dashboard/Dashboard.php
+++ b/application/controllers/dashboard/Dashboard.php
@@ -34,10 +34,6 @@ class Dashboard extends Auth_Controller
 	{
 		$this->load->view('dashboard/dashboard.php', []);
 	}
-    // TODO löschen
-    public function test(){
-        echo "<pre>"; print_r('in Dashboard Test function'); echo "</pre>";
-    }
 
     // -----------------------------------------------------------------------------------------------------------------
     // Private methods

From aaf64a759be6c1173f077bf4824c15ffb6fb493d Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Tue, 25 Oct 2022 12:59:03 +0200
Subject: [PATCH 0030/1461] Added Widgets to Widget Controller

---
 application/controllers/dashboard/Widget.php | 56 ++++++++++++++++++--
 1 file changed, 53 insertions(+), 3 deletions(-)

diff --git a/application/controllers/dashboard/Widget.php b/application/controllers/dashboard/Widget.php
index 6f900fcc9..aaa13587b 100644
--- a/application/controllers/dashboard/Widget.php
+++ b/application/controllers/dashboard/Widget.php
@@ -21,8 +21,58 @@ class Widget extends Auth_Controller
 				"width" => [ "max" => 3 ],
 				"height" => [ "max" => 3 ]
 			]
-		]
-	];
+        ],
+        [
+            "id" => 2,
+            "name" => 'News',
+            "description" => 'Das ist ein News Widget',
+            "icon" => '../../skin/images/fh_technikum_wien_illustration_klein.png',
+            "file" => 'DashboardWidget/News.js',
+            "arguments" => [],
+            "size" => [
+                "width" => ["min" => 1, "max" => 4],
+                "height" => ["min" => 1, "max" => 2]
+            ],
+        ],
+        [
+            "id" => 3,
+            "name" => 'URL',
+            "description" => 'Das ist ein URL Widget',
+            "icon" => '../../skin/images/fh_technikum_wien_illustration_klein.png',
+            "file" => 'Widgets/Url.js',
+            "arguments" => [],
+            "size" => [
+                "width" => 1,
+                "height" => ["min" => 1, "max" => 2]
+            ]
+        ],
+        [
+            "id" => 4,
+            "name" => 'Ampel',
+            "description" => 'Das ist ein Ampel Widget',
+            "icon" => '../../skin/images/fh_technikum_wien_illustration_klein.png',
+            "file" => 'Widgets/Ampel.js',
+            "arguments" => [],
+            "size" => [
+                "width" => 1,
+                "height" => ["min" => 1, "max" => 2]
+            ]
+        ],
+        [
+            "id" => 5,
+            "name" => 'KPI',
+            "description" => 'Das ist ein KPI Widget',
+            "icon" => '../../skin/images/fh_technikum_wien_illustration_klein.png',
+            "file" => 'Widgets/Kpi.js',
+            "arguments" => [
+                "source" => 'random'
+            ],
+            "size" => [
+                "width" => 1,
+                "height" => 1
+            ]
+        ],
+    ];
 
 	public function __construct()
 	{
@@ -75,5 +125,5 @@ class Widget extends Auth_Controller
 
 		$this->outputJsonSuccess(getData($result));
 	}
-	
+
 }

From 7f1cc966f0f73467bb95d740436ad59dcc5df4ad Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Tue, 25 Oct 2022 13:00:43 +0200
Subject: [PATCH 0031/1461] Added API Controller to perform API calls

---
 application/controllers/dashboard/Api.php | 78 +++++++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 application/controllers/dashboard/Api.php

diff --git a/application/controllers/dashboard/Api.php b/application/controllers/dashboard/Api.php
new file mode 100644
index 000000000..c6ac21463
--- /dev/null
+++ b/application/controllers/dashboard/Api.php
@@ -0,0 +1,78 @@
+<?php
+defined('BASEPATH') || exit('No direct script access allowed');
+
+class Api extends Auth_Controller
+{
+    public function __construct()
+    {
+        parent::__construct(
+            array(
+                'index'		=> 'dashboard/admin:rw',
+                'getNews'	=> 'dashboard/admin:rw',
+                'getAmpeln'	=> 'dashboard/admin:rw',
+            )
+        );
+
+        $this->load->library('AuthLib', null, 'AuthLib');
+
+        $this->_setAuthUID();
+    }
+
+    public function index()
+    {
+        echo 'Dashboard API Controller';
+    }
+
+    /**
+     * Get News.
+     */
+    public function getNews()
+    {
+        $limit =  $this->input->get('limit');
+
+        $this->load->model('content/News_model', 'NewsModel');
+
+        $result = $this->NewsModel->getAll($limit);
+
+        if(hasData($result))
+        {
+
+            $this->outputJson(getData($result), REST_Controller::HTTP_OK);
+        }
+        else
+        {
+            $this->terminateWithJsonError('fehler entdeckt');
+        }
+    }
+
+
+    /**
+     * Get Ampeln.
+     */
+    public function getAmpeln(){
+
+        $this->load->model('content/Ampel_model', 'AmpelModel');
+        $result = $this->AmpelModel->getByUser($this->_uid);
+
+        if(hasData($result))
+        {
+
+            $this->outputJson(getData($result), REST_Controller::HTTP_OK);
+        }
+        else
+        {
+            $this->terminateWithJsonError('fehler entdeckt');
+        }
+
+    }
+
+    /**
+     * Retrieve the UID of the logged user and checks if it is valid
+     */
+    private function _setAuthUID()
+    {
+        $this->_uid = getAuthUID();
+
+        if (!$this->_uid) show_error('User authentification failed');
+    }
+}

From 1d6c5b42576ece9e91fcc7a28f09411157e01341 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Tue, 25 Oct 2022 14:17:32 +0200
Subject: [PATCH 0032/1461] Added Url Widget

---
 application/models/content/News_model.php   | 14 ++++
 public/js/components/DashboardWidget/Url.js | 84 +++++++++++++++++++++
 2 files changed, 98 insertions(+)
 create mode 100644 public/js/components/DashboardWidget/Url.js

diff --git a/application/models/content/News_model.php b/application/models/content/News_model.php
index 8d636d808..7d475081d 100644
--- a/application/models/content/News_model.php
+++ b/application/models/content/News_model.php
@@ -11,4 +11,18 @@ class News_model extends DB_Model
 		$this->dbTable = 'campus.tbl_news';
 		$this->pk = 'news_id';
 	}
+
+    public function getAll($limit = null)
+    {
+        // TODO check ob über content table. Aktuell sind die news texte NULL, deshalb über content table holen.
+//        $this->addJoin('campus.tbl_content', 'content_id');
+//        $this->addJoin('campus.tbl_contentsprache', 'content_id');
+
+        return $this->loadWhere('
+            text IS NOT NULL
+            AND datum <= NOW() AND (datum_bis IS NULL OR datum_bis >= now()::date)
+            ORDER BY datum DESC
+            LIMIT '. $this->escape($limit)
+        );
+    }
 }
diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
new file mode 100644
index 000000000..f374b7ed8
--- /dev/null
+++ b/public/js/components/DashboardWidget/Url.js
@@ -0,0 +1,84 @@
+import AbstractWidget from './Abstract';
+
+export default {
+    name: 'WidgetsUrl',
+    data: () => ({
+        links: []
+    }),
+    mixins: [
+        AbstractWidget
+    ],
+    computed: {
+        tagName() {
+            return this.config.tag !== undefined && this.config.tag.length > 0 ? this.config.tag : 'Meine Urls';
+        }
+    },
+    methods: {
+        addLink(){
+            let linkId = this.links.length;
+
+            this.links.push({
+                id: linkId,
+                tag: this.config.tag,
+                title: this.title,
+                url: this.url
+                })
+        },
+        removeLink(linkId){
+            let indexToRemove = this.links.findIndex((obj => obj.id === linkId));
+            this.links.splice(indexToRemove, 1);
+        }
+    },
+    created() {
+        this.links = TEST_LINKS;
+        // this.links = TEST_KEINE_LINKS;
+    },
+    template: `
+    <div class="widgets-url w-100 h-100">
+        <div v-if="configMode">
+            <div class="mb-3">
+
+                <header><b>Neuer Link</b></header><br>
+                <div>
+                    <input class="form-control form-control-sm" placeholder="Titel" type="text" v-model="title" name="title" maxlength="50" required>
+                    <input class="form-control form-control-sm mt-2" type="url" placeholder="URL" v-model="url" name="url" required>
+                    <button class="btn btn-outline-secondary btn-sm w-100 mt-2" @click="addLink()" type="button">Link speichern</button>
+                </div>
+            </div>
+        </div>
+        <div class="d-flex flex-column justify-content-between">
+            <header><b>{{ widgetTag }}</b></header>
+            <div v-for="link in links" :key="link.id" class="d-flex mt-2">
+                <a target="_blank" :href="link.url"><i class="fa fa-solid fa-arrow-up-right-from-square"></i> {{ link.title }}</a>
+                <a class="ms-auto" href="#" @click.prevent="removeLink(link.id)" v-show="configMode"><i class="fa fa-regular fa-trash-can"></i></a>
+            </div>
+        </div>
+    </div>`
+}
+const TEST_KEINE_LINKS = [];
+const TEST_LINKS = [
+    {
+        id: 0,
+        tag: 'Zeitverwaltung',
+        title: 'Zeitverwaltung' + 'link 0',
+        url: 'https://www.technikum-wien.at'
+    },
+    {
+        id: 1,
+        tag: 'Zeitverwaltung',
+        title: 'Zeitverwaltung' + 'link 1',
+        url: 'https://www.technikum-wien.at'
+    },
+    {
+        id: 2,
+        tag: 'Zeitverwaltung',
+        title: 'Zeitverwaltung' + 'link 2',
+        url: 'https://www.technikum-wien.at'
+    },
+    {
+        id: 3,
+        tag: 'Zeitverwaltung',
+        title: 'Zeitverwaltung' + 'link 3',
+        url: 'https://www.technikum-wien.at'
+    }
+];
\ No newline at end of file

From 71699f6e7482043dcb2e9a810ba0729d38b96308 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Tue, 25 Oct 2022 14:17:52 +0200
Subject: [PATCH 0033/1461] Added Ampel Widget

---
 public/js/components/DashboardWidget/Ampel.js | 345 ++++++++++++++++++
 1 file changed, 345 insertions(+)
 create mode 100644 public/js/components/DashboardWidget/Ampel.js

diff --git a/public/js/components/DashboardWidget/Ampel.js b/public/js/components/DashboardWidget/Ampel.js
new file mode 100644
index 000000000..c26e5d3e0
--- /dev/null
+++ b/public/js/components/DashboardWidget/Ampel.js
@@ -0,0 +1,345 @@
+import AbstractWidget from './Abstract';
+import BaseOffcanvas from '../Base/Offcanvas';
+
+export default {
+    name: 'WidgetsAmpel',
+    components: { BaseOffcanvas },
+    data: () => ({
+        filter: '',
+        source: '',
+        ampeln: []
+    }),
+    mixins: [
+        AbstractWidget
+    ],
+    computed: {
+        widgetAmpeln () {
+            return this.ampeln.slice(0, 2);  // show only newest 2 ampeln
+        },
+        offcanvasAmpeln ()
+        {
+            switch(this.filter)
+            {
+                case 'verpflichtend': return this.ampeln.filter(item => item.verpflichtend);
+                case 'ueberfaellig': return this.ampeln.filter(item => (new Date() > new Date(item.deadline)) && !item.bestaetigt);
+                default: return this.ampeln;
+            }
+        },
+        count () {
+            return {
+                verpflichtend: this.ampeln.filter(item => item.verpflichtend).length,
+                ueberfaellig: this.ampeln.filter(item => (new Date() > new Date(item.deadline)) && !item.bestaetigt).length,
+                alle: this.ampeln.length
+            }
+        }
+    },
+    methods: {
+        closeOffcanvasAmpeln()
+        {
+            for (let i = 0; i < this.offcanvasAmpeln.length; i++)
+            {
+                let ampelId = this.offcanvasAmpeln[i].ampel_id;
+                this.$refs['ampelCollapse_' + ampelId][0].classList.remove('show');
+            }
+        },
+        openOffcanvasAmpel(ampelId){
+            // Close earlier opened Ampeln
+            this.closeOffcanvasAmpeln();
+
+            // Show given Ampel
+            this.$refs['ampelCollapse_' + ampelId][0].classList.add('show');
+        },
+        closeOffcanvas(){
+            this.filter = '';
+        },
+        confirm(ampelId){
+            let indexToRemove = this.ampeln.findIndex((obj => obj.ampel_id === ampelId));
+            this.ampeln.splice(indexToRemove, 1);
+        },
+        changeDisplay(){
+            this.filter = '';
+            if (this.source == 'offen')
+            {
+                this.ampeln = TEST_OFFENE_AMPELN;
+            }
+
+            if (this.source == 'alle')
+            {
+                this.ampeln = TEST_ALLE_AMPELN;
+                // axios
+                //     .get(this.apiurl + '/dashboard/Api/getAmpeln')
+                //     .then(res => { this.ampeln = res.data })
+                //     .catch(err => { console.error('ERROR: ', err.response.data) });
+            }
+        },
+        validateBtnTxt(buttontext){
+            return buttontext == null ? 'Bestätigen' : buttontext;
+        }
+    },
+    created() {
+        this.$emit('setConfig', false);
+        this.ampeln = TEST_OFFENE_AMPELN;
+    },
+    template: `
+    <div class="widgets-ampel w-100 h-100">
+        <div class="d-flex flex-column justify-content-between">
+            <div class="d-flex">
+                <header class="me-auto"><b>Neueste Ampeln</b></header>
+                <div class="mb-2 text-danger"><a href="#allAmpelOffcanvas" data-bs-toggle="offcanvas">Alle Ampeln</a></div>
+            </div>
+            <div class="d-flex justify-content-end">
+                <a v-if="count.ueberfaellig > 0" href="#allAmpelOffcanvas" data-bs-toggle="offcanvas" @click="filter = 'ueberfaellig'" class="text-decoration-none"><span class="badge bg-danger me-1"><i class="fa fa-solid fa-bolt"></i> Überfällig: <b>{{ count.ueberfaellig }}</b></span></a>
+            </div>
+            <div v-for="ampel in widgetAmpeln" :key="ampel.ampel_id" class="mt-2">
+                <div class="card">
+                    <div class="card-body">
+                        <div class="position-relative">
+                            <div class="d-flex">
+                                <div class="text-muted small me-auto"><small>Deadline: {{ getDate(ampel.deadline) }}</small></div>
+                                <div v-if="(new Date() > new Date(ampel.deadline)) && !ampel.bestaetigt "><span class="badge bg-danger"><i class="fa fa-solid fa-bolt"></i></span></div>
+                                <div v-if="ampel.verpflichtend"><span class="badge bg-warning ms-1"><i class="fa fa-solid fa-triangle-exclamation"></i></span></div>
+                                <div v-if="ampel.bestaetigt"><span class="badge bg-success ms-1"><i class="fa fa-solid fa-circle-check"></i></span></div>
+                            </div>
+                        </div>
+                        <a href="#allAmpelOffcanvas" data-bs-toggle="offcanvas" class="stretched-link" @click="openOffcanvasAmpel(ampel.ampel_id)">{{ ampel.kurzbz }}</a><br>
+                    </div>
+                </div>
+            </div>
+            <div v-if="ampeln.length == 0" class="card card-body mt-4 p-4 text-center">
+                <span class="text-success h2"><i class="fa fa-solid fa-circle-check"></i></span>
+                <span class="text-success h5">Super!</span><br>
+                <span class="small">Keine offenen Ampeln.</span>
+            </div>
+        </div>
+    </div>
+
+    <!-- All Ampeln Offcanvas -->
+    <BaseOffcanvas id="allAmpelOffcanvas" :closeFunc="closeOffcanvas">
+        <template #title><header><b>Alle meine Ampeln</b></header></template>
+        <template #body>
+            <div class="d-flex justify-content-evenly">
+                <div class="form-check form-check-inline form-control-sm">
+                <input class="form-check-input" type="radio" v-model="source" id="offen" value="offen" @change="changeDisplay" checked>
+                <label class="form-check-label" for="offen">Offene Ampeln</label>
+            </div>
+            <div class="form-check form-check-inline form-control-sm">
+                <input class="form-check-input" type="radio" v-model="source" id="alle" value="alle" @change="changeDisplay">
+                <label class="form-check-label" for="alle">Alle Ampeln</label>
+            </div>
+            </div>
+            <div class="col"><button class="btn btn-light w-100" @click="filter = ''"><small>Alle: <b>{{ count.alle }}</b></small></button></div>
+            <div class="row row-cols-2 g-2 mt-1">
+                <div class="col"><button class="btn btn-danger w-100"  @click="filter = 'ueberfaellig'"><i class="fa fa-solid fa-bolt me-2"></i><small>Überfällig: <b>{{ count.ueberfaellig }}</b></small></button></div>
+                <div class="col"><button class="btn btn-warning w-100" @click="filter = 'verpflichtend'"><i class="fa fa-solid fa-triangle-exclamation me-2"></i><small>Pflicht: <b>{{ count.verpflichtend }}</b></small></button></div>
+            </div>
+            <div v-for="ampel in offcanvasAmpeln" :key="ampel.ampel_id" class="mt-2">
+                <ul class="list-group">
+                <li class="list-group-item small">
+                <div class="position-relative"><!-- prevents streched-link from stretching outside this parent element -->
+                    <div class="d-flex">
+                        <span class="small text-muted me-auto"><small>Deadline: {{ getDate(ampel.deadline) }}</small></span>
+                        <div v-if="(new Date() > new Date(ampel.deadline)) && !ampel.bestaetigt"><span class="badge bg-danger"><i class="fa fa-solid fa-bolt"></span></div>
+                        <div v-if="ampel.verpflichtend"><span class="badge bg-warning ms-1"><i class="fa fa-solid fa-triangle-exclamation"></span></div>
+                        <div v-if="ampel.bestaetigt"><span class="badge bg-success ms-1"><i class="fa fa-solid fa-circle-check"></i></span></div>
+                    </div>
+                    <a :href="'#ampelCollapse_' + ampel.ampel_id" data-bs-toggle="collapse" class="stretched-link">{{ ampel.kurzbz }}</a><br>
+                </div>
+                <div class="collapse my-3" :id="'ampelCollapse_' + ampel.ampel_id" :ref="'ampelCollapse_' + ampel.ampel_id">
+                    {{ ampel.beschreibung[0] }}
+                    <div class="d-flex justify-content-end mt-3">
+                        <button class="btn btn-sm btn-primary" :class="{disabled: ampel.bestaetigt}" @click="confirm(ampel.ampel_id)">{{ validateBtnTxt(ampel.buttontext[0]) }}</button>
+                    </div>
+                </div>
+                </li>
+                </ul>
+            </div>
+        </template>
+    </BaseOffcanvas>`
+}
+
+const TEST_ALLE_AMPELN = [
+    {
+        ampel_id: 0,
+        kurzbz: 'Ampeltitel 1',
+        deadline: '2022-12-31',
+        verfallszeit: 10,
+        verpflichtend: false,
+        bestaetigt: false,
+        buttontext: ['Bestätigen', 'Confirm'],
+        insertamum: '2022-09-21 15:25:00',
+        beschreibung: [
+            '1-Deutscher Text Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod.',
+            '1-Englischer Text Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod.'
+        ]
+    },
+    {
+        ampel_id: 1,
+        kurzbz: 'Ampeltitel 2 kann auch etwas länger sein',
+        deadline: '2023-10-03',
+        verfallszeit: 20,
+        verpflichtend: true,
+        bestaetigt: false,
+        buttontext: ['Gelesen', 'Read'],
+        insertamum: '2022-09-21 15:25:00',
+        beschreibung: [
+            '2-Deutscher Text Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod.',
+            '2-Englischer Text Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod.'
+        ]
+    },
+    {
+        ampel_id: 2,
+        kurzbz: 'Ampeltitel 3',
+        deadline: '2022-10-31',
+        verfallszeit: null,		// Dauerampel, Bis zur Bestätigung
+        verpflichtend: false,
+        bestaetigt: true,
+        buttontext: ['Bestätigen', 'Confirm'],
+        insertamum: '2022-09-21 15:25:00',
+        beschreibung: [
+            '3-Deutscher Text Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod.',
+            '3-Englischer Text Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod.'
+        ]
+    },
+    {
+        ampel_id: 3,
+        kurzbz: 'Ampeltitel 4',
+        deadline: '2022-10-31',
+        verfallszeit: 40,
+        verpflichtend: false,
+        bestaetigt: true,
+        buttontext: ['Bestätigen', 'Confirm'],
+        insertamum: '2022-09-21 15:25:00',
+        beschreibung: [
+            'Deutscher Text Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod.',
+            'Englischer Text Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod.'
+        ]
+    },
+    {
+        ampel_id: 4,
+        kurzbz: 'Ampeltitel 5',
+        deadline: '2022-10-31',
+        verfallszeit: 10,
+        verpflichtend: false,
+        bestaetigt: true,
+        buttontext: ['Bestätigen', 'Confirm'],
+        insertamum: '2022-09-21 15:25:00',
+        beschreibung: [
+            'Deutscher Text Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod.',
+            'Englischer Text Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod.'
+        ]
+    },
+    {
+        ampel_id: 5,
+        kurzbz: 'Ampeltitel 6',
+        deadline: '2022-10-31',
+        verfallszeit: 40,
+        verpflichtend: false,
+        bestaetigt: true,
+        buttontext: ['Bestätigen', 'Confirm'],
+        insertamum: '2022-09-21 15:25:00',
+        beschreibung: [
+            'Deutscher Text Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod.',
+            'Englischer Text Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod.'
+        ]
+    },
+    {
+        ampel_id: 6,
+        kurzbz: 'Ampeltitel 7',
+        deadline: '2020-12-31',
+        verfallszeit: 10,
+        verpflichtend: false,
+        bestaetigt: true,
+        buttontext: ['Bestätigen', 'Confirm'],
+        insertamum: '2022-09-21 15:25:00',
+        beschreibung: [
+            'Deutscher Text Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod.',
+            'Englischer Text Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod.'
+        ]
+    },{
+        ampel_id: 7,
+        kurzbz: 'Ampeltitel 8',
+        deadline: '2022-09-25',
+        verfallszeit: 40,
+        verpflichtend: false,
+        bestaetigt: false,
+        buttontext: ['Bestätigen', 'Confirm'],
+        insertamum: '2022-09-21 15:25:00',
+        beschreibung: [
+            'Deutscher Text Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod.',
+            'Englischer Text Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod.'
+        ]
+    },
+    {
+        ampel_id: 8,
+        kurzbz: 'Ampeltitel 9',
+        deadline: '2022-10-01',
+        verfallszeit: 10,
+        verpflichtend: false,
+        bestaetigt: false,
+        buttontext: ['Bestätigen', 'Confirm'],
+        insertamum: '2022-09-21 15:25:00',
+        beschreibung: [
+            'Deutscher Text Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod.',
+            'Englischer Text Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod.'
+        ]
+    }
+]
+
+const TEST_OFFENE_AMPELN = [
+    {
+        ampel_id: 0,
+        kurzbz: 'Ampeltitel 1',
+        deadline: '2022-12-31',
+        verfallszeit: 10,
+        verpflichtend: false,
+        bestaetigt: false,
+        buttontext: ['Bestätigen', 'Confirm'],
+        insertamum: '2022-09-21 15:25:00',
+        beschreibung: [
+            '1-Deutscher Text Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod.',
+            '1-Englischer Text Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod.'
+        ]
+    },
+    {
+        ampel_id: 1,
+        kurzbz: 'Ampeltitel 2 kann auch etwas länger sein',
+        deadline: '2023-10-03',
+        verfallszeit: 20,
+        verpflichtend: true,
+        bestaetigt: false,
+        buttontext: ['Gelesen', 'Read'],
+        insertamum: '2022-09-21 15:25:00',
+        beschreibung: [
+            '2-Deutscher Text Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod.',
+            '2-Englischer Text Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod.'
+        ]
+    },
+    {
+        ampel_id: 7,
+        kurzbz: 'Ampeltitel 8',
+        deadline: '2022-09-25',
+        verfallszeit: 40,
+        verpflichtend: false,
+        bestaetigt: false,
+        buttontext: ['Bestätigen', 'Confirm'],
+        insertamum: '2022-09-21 15:25:00',
+        beschreibung: [
+            'Deutscher Text Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod.',
+            'Englischer Text Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod.'
+        ]
+    },
+    {
+        ampel_id: 8,
+        kurzbz: 'Ampeltitel 9',
+        deadline: '2022-10-01',
+        verfallszeit: 10,
+        verpflichtend: false,
+        bestaetigt: false,
+        buttontext: ['Bestätigen', 'Confirm'],
+        insertamum: '2022-09-21 15:25:00',
+        beschreibung: [
+            'Deutscher Text Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod.',
+            'Englischer Text Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod.'
+        ]
+    }
+];
\ No newline at end of file

From bc723b22f4897700381a4759a7ef9ad8ce8a988d Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Tue, 25 Oct 2022 14:20:29 +0200
Subject: [PATCH 0034/1461] Added getAll() to News Model

---
 application/models/content/News_model.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/application/models/content/News_model.php b/application/models/content/News_model.php
index 7d475081d..472eb2e56 100644
--- a/application/models/content/News_model.php
+++ b/application/models/content/News_model.php
@@ -12,12 +12,13 @@ class News_model extends DB_Model
 		$this->pk = 'news_id';
 	}
 
+    /**
+     * Get all News ordered by date. (most actual on top)
+     * @param null $limit   Amount of news.
+     * @return array
+     */
     public function getAll($limit = null)
     {
-        // TODO check ob über content table. Aktuell sind die news texte NULL, deshalb über content table holen.
-//        $this->addJoin('campus.tbl_content', 'content_id');
-//        $this->addJoin('campus.tbl_contentsprache', 'content_id');
-
         return $this->loadWhere('
             text IS NOT NULL
             AND datum <= NOW() AND (datum_bis IS NULL OR datum_bis >= now()::date)

From a1ccd392f520952603a9aa174da9a17978363109 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Tue, 25 Oct 2022 14:28:25 +0200
Subject: [PATCH 0035/1461] Added News Widget

---
 public/js/components/DashboardWidget/News.js | 115 +++++++++++++++++++
 1 file changed, 115 insertions(+)
 create mode 100644 public/js/components/DashboardWidget/News.js

diff --git a/public/js/components/DashboardWidget/News.js b/public/js/components/DashboardWidget/News.js
new file mode 100644
index 000000000..6b5fc73d1
--- /dev/null
+++ b/public/js/components/DashboardWidget/News.js
@@ -0,0 +1,115 @@
+import AbstractWidget from './Abstract';
+import BsModal from '../Bootstrap/Modal';
+const MAX_LOADED_NEWS = 10;
+
+export default {
+	name: 'WidgetsNews',
+	components: { BsModal },
+	data: () => ({
+		allNewsList: [],
+		singleNews: {}
+	}),
+	mixins: [
+		AbstractWidget
+	],
+	computed: {
+		newsList(){
+			//Return news amount depending on widget width and size
+			let quantity = this.width;
+
+			if (this.width === 1) {
+				quantity = this.height === 1 ? 4 : 10;
+			}
+
+			return this.allNewsList.slice(0, quantity);
+		}
+	},
+	created(){
+		axios
+			.get(this.apiurl + '/dashboard/Api/getNews', {params: {limit: MAX_LOADED_NEWS}})
+			.then(res => { this.allNewsList = res.data })
+			.catch(err => { console.error('ERROR: ', err.response.data) });
+
+		this.$emit('setConfig', false);
+	},
+	methods: {
+		setSingleNews(singleNews){
+			this.singleNews = singleNews;
+			this.$refs.newsModal.show();
+		}
+	},
+	template: `<div class="widgets-news w-100 h-100">
+      <div class="d-flex flex-column h-100">
+      <div class="d-flex">
+        <header><b>Top News</b></header>
+        <a href="#allNewsModal" data-bs-toggle="modal" class="ms-auto mb-2">
+          <i class="fa fa-arrow-up-right-from-square me-1"></i>Alle News</a>
+      </div>
+      <div v-if="width == 1">
+        <div v-for="news in newsList" :key="news.id" class="mt-2">
+          <div class="card">
+            <div class="card-body">
+              <a href="#newsModal" class="stretched-link" @click="setSingleNews(news)">{{ news.betreff }}</a><br>
+              <span class="small text-muted">{{ formatDateTime(news.insertamum) }}</span>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div v-else-if="width > 1 && height === 1" class="h-100" :class="'row row-cols-' + width">
+        <div v-for="news in newsList" :key="news.id">
+            <div class="card h-100">
+				<div class="card-body">
+				  <a href="#newsModal" class="card-title h5 stretched-link" @click="setSingleNews(news)">{{ news.betreff }}</a><br>
+				  <span class="small text-muted">{{ formatDateTime(news.insertamum) }} </span>
+				  <p class="card-text pt-3" style="overflow: hidden; display: -webkit-box; -webkit-line-clamp: 5; -webkit-box-orient: vertical;">{{ news.text }}</p>
+				</div>       
+            </div>
+          </div>
+ 		</div>
+       <div v-else class="h-100" :class="'row row-cols-' + width">
+        <div v-for="news in newsList" :key="news.id">
+            <div class="card h-100">
+                <img src="../../skin/images/fh_technikum_wien_illustration_klein.png" class="card-img-top">
+                <div class="card-footer"><span class="card-subtitle small text-muted">{{ formatDateTime(news.insertamum) }}</span></div>
+                <div class="card-body">
+                  <a href="#newsModal" class="card-title h5 stretched-link" @click="setSingleNews(news)">{{ news.betreff }}</a><br>
+                  <p class="card-text pt-3">{{ news.text }}</p>
+                </div>
+            </div>
+          </div>
+      </div>
+</div>
+</div>
+
+  <!-- News Modal -->
+  <BsModal ref="newsModal" id="newsModal" dialog-class="modal-lg">
+    <template #title>
+      <div class="row">
+        <div class="col-5"><img src="../../skin/images/fh_technikum_wien_illustration_klein.png" class="img-fluid rounded-start"></div>
+        <div class="col-7 d-flex align-items-end">
+          <p>{{ singleNews.betreff }}<br><small class="text-muted">{{ formatDateTime(singleNews.insertamum) }}</small></p>
+        </div>
+      </div>
+    </template>
+    <template #default>{{ singleNews.text }}</template>
+  </BsModal>
+
+  <!-- All News Modal -->
+  <BsModal ref="allNewsModal" id="allNewsModal" dialog-class="modal-fullscreen">
+    <template #title>Alle News</template>
+    <template #default>
+    <div class="row row-cols-5 g-4 h-100 px-5">
+     <div v-for="news in allNewsList" :key="news.id">
+            <div class="card h-100">
+                <img src="../../skin/images/fh_technikum_wien_illustration_klein.png" class="card-img-top">
+                <div class="card-footer"><span class="card-subtitle small">{{ formatDateTime(news.insertamum) }}</span></div>
+                <div class="card-body">
+                  <a href="" class="card-title h5 stretched-link" @click="setSingleNews1(news)">{{ news.betreff }}</a><br>
+                  <p class="card-text">{{ news.text }}</p>
+                </div>
+            </div>
+          </div>
+          </div>
+	</template>
+  </BsModal>`
+}
\ No newline at end of file

From 630c1bc2bc96f6123649ce9f096fd67397b23ee0 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Tue, 25 Oct 2022 14:35:38 +0200
Subject: [PATCH 0036/1461] Changed to display 4 Ampeln in Widget

---
 public/js/components/DashboardWidget/Ampel.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/DashboardWidget/Ampel.js b/public/js/components/DashboardWidget/Ampel.js
index c26e5d3e0..9f0918aa7 100644
--- a/public/js/components/DashboardWidget/Ampel.js
+++ b/public/js/components/DashboardWidget/Ampel.js
@@ -14,7 +14,7 @@ export default {
     ],
     computed: {
         widgetAmpeln () {
-            return this.ampeln.slice(0, 2);  // show only newest 2 ampeln
+            return this.ampeln.slice(0, 4);  // show only newest 4 ampeln
         },
         offcanvasAmpeln ()
         {

From be6ad8ce2a96058f2ea69d4b99f5bbb370603001 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 28 Oct 2022 12:39:19 +0200
Subject: [PATCH 0037/1461] cleanup

---
 public/js/components/Bootstrap/Modal.js     | 13 +++++++------
 public/js/components/Dashboard/Dashboard.js |  1 -
 public/js/components/Dashboard/Section.js   |  5 -----
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/public/js/components/Bootstrap/Modal.js b/public/js/components/Bootstrap/Modal.js
index c99aabb58..0e5472477 100644
--- a/public/js/components/Bootstrap/Modal.js
+++ b/public/js/components/Bootstrap/Modal.js
@@ -46,11 +46,12 @@ export default {
 		}
 	},
 	mounted() {
-		this.modal = new bootstrap.Modal(this.$refs.modal, {
-			backdrop: this.backdrop,
-			focus: this.focus,
-			keyboard: this.keyboard
-		});
+		if (this.$refs.modal)
+			this.modal = new bootstrap.Modal(this.$refs.modal, {
+				backdrop: this.backdrop,
+				focus: this.focus,
+				keyboard: this.keyboard
+			});
 	},
 	popup(body, options, title, footer) {
 		const BsModal = this;
@@ -80,8 +81,8 @@ export default {
 				}
 			});
 			const wrapper = document.createElement("div");
-			instance.mount(wrapper);
 			document.body.appendChild(wrapper);
+			instance.mount(wrapper);
 		});
 	},
 	template: `<div ref="modal" class="bootstrap-modal modal" tabindex="-1" @[\`hide.bs.modal\`]="$emit('hideBsModal')" @[\`hidden.bs.modal\`]="$emit('hiddenBsModal')" @[\`hidePrevented.bs.modal\`]="$emit('hidePreventedBsModal')" @[\`show.bs.modal\`]="$emit('showBsModal')" @[\`shown.bs.modal\`]="$emit('shownBsModal')">
diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js
index b36e11bde..de995439f 100644
--- a/public/js/components/Dashboard/Dashboard.js
+++ b/public/js/components/Dashboard/Dashboard.js
@@ -1,6 +1,5 @@
 import DashboardSection from "./Section.js";
 import DashboardWidgetPicker from "./Widget/Picker.js";
-import CachedWidgetLoader from "../../composables/Dashboard/CachedWidgetLoader.js";
 import ObjectUtils from "../../composables/ObjectUtils.js";
 
 export default {
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 2f4772504..17689363a 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -13,7 +13,6 @@ export default {
 		}
 	},
 	props: [
-		"adminMode",
 		"name",
 		"widgets"
 	],
@@ -373,10 +372,6 @@ export default {
 			this.$emit('widgetUpdate', this.name, payload);
 		}
 	},
-	created() {
-		if (this.adminMode)
-			this.editMode = 1;
-	},
 	mounted() {
 		let self = this;
 		let cont = self.$refs.container;

From 92ec7f44ef3d2eb1352c353ac8c1c7dfb029b132 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 28 Oct 2022 12:40:57 +0200
Subject: [PATCH 0038/1461] Update Dashboard Endpoints for Admin GUI

---
 application/controllers/dashboard/Config.php  | 55 +++++++++++-
 .../controllers/dashboard/Dashboard.php       | 87 +++++++++++++++++++
 application/controllers/dashboard/Widget.php  | 79 +++++++++++------
 .../dashboard/Dashboard_Widget_model.php      | 14 +--
 application/models/dashboard/Widget_model.php | 33 +++++++
 5 files changed, 228 insertions(+), 40 deletions(-)
 create mode 100644 application/controllers/dashboard/Dashboard.php
 create mode 100644 application/models/dashboard/Widget_model.php

diff --git a/application/controllers/dashboard/Config.php b/application/controllers/dashboard/Config.php
index f7736f329..c5b912e1f 100644
--- a/application/controllers/dashboard/Config.php
+++ b/application/controllers/dashboard/Config.php
@@ -17,12 +17,16 @@ class Config extends Auth_Controller
 				'addWidgetsToPreset'			=> 'dashboard/admin:rw',
 				'removeWidgetFromPreset'		=> 'dashboard/admin:rw',
 				'addWidgetsToUserOverride'		=> 'dashboard/benutzer:rw',
-				'removeWidgetFromUserOverride'	=> 'dashboard/benutzer:rw'
+				'removeWidgetFromUserOverride'	=> 'dashboard/benutzer:rw',
+				'Funktionen'					=> 'dashboard/admin:r',
+				'Preset'						=> 'dashboard/admin:r',
+				'PresetBatch'					=> 'dashboard/admin:r'
 			)
 		);
 		
 		$this->load->library('dashboard/DashboardLib', null, 'DashboardLib');
 		$this->load->library('AuthLib', null, 'AuthLib');
+		$this->load->model('ressource/Funktion_model', 'FunktionModel');
 	}
 	
 	public function index() 
@@ -91,9 +95,8 @@ class Config extends Auth_Controller
 		}
 		
 		$preset_decoded = json_decode($preset->preset, true);
-		
-		if( $this->DashboardLib->removeWidgetFromWidgets($preset_decoded['widgets'], 
-			$funktion_kurzbz, $widgetid) )
+		if (!$this->DashboardLib->removeWidgetFromWidgets($preset_decoded['widgets'], 
+			$funktion_kurzbz, $widgetid))
 		{
 			http_response_code(404);
 			$this->terminateWithJsonError('widgetid ' . $widgetid . ' not found');
@@ -168,4 +171,48 @@ class Config extends Auth_Controller
 		$this->outputJsonSuccess(array('msg' => 'override successfully updated.'));
 	}
 	
+	public function Funktionen()
+	{
+		$funktionen = $this->FunktionModel->load();
+
+		if (isError($funktionen)) {
+			http_response_code(404);
+			$this->terminateWithJsonError([
+				'error' => getError($funktionen)
+			]);
+		}
+		
+		return $this->outputJsonSuccess(getData($funktionen) ?: []);
+	}
+	
+	public function Preset()
+	{
+		$db = $this->input->get('db');
+		$funktion = $this->input->get('funktion');
+
+		$conf = $this->DashboardLib->getPreset($db, $funktion);
+
+		if (!$conf)
+			return $this->outputJsonSuccess(['widgets' => [$funktion => []]]);
+
+		return $this->outputJsonSuccess(json_decode($conf->preset, true));
+	}
+	
+	public function PresetBatch()
+	{
+		$db = $this->input->get('db');
+		$funktionen = $this->input->get('funktionen');
+		$result = [];
+
+		foreach ($funktionen as $funktion) {
+			$conf = $this->DashboardLib->getPreset($db, $funktion);
+			if ($conf)
+				$result[$funktion] = json_decode($conf->preset, true)['widgets'][$funktion];
+			else
+				$result[$funktion] = [];
+		}
+
+		return $this->outputJsonSuccess($result);
+	}
+	
 }
diff --git a/application/controllers/dashboard/Dashboard.php b/application/controllers/dashboard/Dashboard.php
new file mode 100644
index 000000000..8cf37d579
--- /dev/null
+++ b/application/controllers/dashboard/Dashboard.php
@@ -0,0 +1,87 @@
+<?php
+defined('BASEPATH') || exit('No direct script access allowed');
+/**
+ * Description of Widget
+ *
+ * @author chris
+ */
+class Dashboard extends Auth_Controller
+{
+	public function __construct()
+	{
+		parent::__construct(
+			array(
+				'index'							=> 'dashboard/admin:r',
+				'Create'						=> 'dashboard/admin:rw',
+				'Update'						=> 'dashboard/admin:rw',
+				'Delete'						=> 'dashboard/admin:rw'
+			)
+		);
+		
+		$this->load->library('dashboard/DashboardLib', null, 'DashboardLib');
+		$this->load->model('dashboard/Dashboard_model', 'DashboardModel');
+	}
+	
+	public function index() 
+	{
+		$result = $this->DashboardModel->load();
+
+		if (isError($result)) {
+			http_response_code(404);
+			$this->terminateWithJsonError([
+				'error' => getError($result)
+			]);
+		}
+		
+		return $this->outputJsonSuccess(getData($result) ?: []);
+	}
+	
+	public function Create() 
+	{
+		$input = $this->getPostJSON();
+
+		$result = $this->DashboardModel->insert($input);
+
+		if (isError($result)) {
+			http_response_code(404);
+			$this->terminateWithJsonError([
+				'error' => getError($result)
+			]);
+		}
+		
+		return $this->outputJsonSuccess(getData($result) ?: []);
+	}
+	
+	public function Update() 
+	{
+		$input = $this->getPostJSON();
+
+		$result = $this->DashboardModel->update($input->dashboard_id, $input);
+
+		if (isError($result)) {
+			http_response_code(404);
+			$this->terminateWithJsonError([
+				'error' => getError($result)
+			]);
+		}
+		
+		return $this->outputJsonSuccess(getData($result) ?: []);
+	}
+	
+	public function Delete() 
+	{
+		$input = $this->getPostJSON();
+
+		$result = $this->DashboardModel->delete($input->dashboard_id);
+
+		if (isError($result)) {
+			http_response_code(404);
+			$this->terminateWithJsonError([
+				'error' => getError($result)
+			]);
+		}
+		
+		return $this->outputJsonSuccess(getData($result) ?: []);
+	}
+	
+}
diff --git a/application/controllers/dashboard/Widget.php b/application/controllers/dashboard/Widget.php
index 6f900fcc9..9a878fa36 100644
--- a/application/controllers/dashboard/Widget.php
+++ b/application/controllers/dashboard/Widget.php
@@ -7,36 +7,19 @@ defined('BASEPATH') || exit('No direct script access allowed');
  */
 class Widget extends Auth_Controller
 {
-	private $demoData = [
-		[
-			"id" => 1,
-			"name" => 'Widget 1',
-			"description" => 'Das ist ein Test Widget',
-			"icon" => 'https://upload.wikimedia.org/wikipedia/commons/8/8a/Farben-Testbild.svg',
-			"file" => 'DashboardWidget/Widget1.js',
-			"arguments" => [
-				"test" => 2
-			],
-			"size" => [
-				"width" => [ "max" => 3 ],
-				"height" => [ "max" => 3 ]
-			]
-		]
-	];
-
 	public function __construct()
 	{
 		parent::__construct(
 			array(
 				'index'							=> 'dashboard/benutzer:r',
+				'getAll'						=> 'dashboard/admin:r',
 				'getWidgetsForDashboard'		=> 'dashboard/benutzer:rw',
-				'addWidgetToUserOverride'		=> 'dashboard/benutzer:rw',
-				'updateWidgetsToUserOverride'	=> 'dashboard/benutzer:rw',
-				'removeWidgetFromUserOverride'	=> 'dashboard/benutzer:rw'
+				'setAllowed'					=> 'dashboard/admin:rw'
 			)
 		);
 		
 		$this->load->library('dashboard/DashboardLib', null, 'DashboardLib');
+		$this->load->model('dashboard/Widget_model', 'WidgetModel');
 		$this->load->model('dashboard/Dashboard_Widget_model', 'DashboardWidgetModel');
 	}
 	
@@ -44,7 +27,7 @@ class Widget extends Auth_Controller
 	{
 		$widget_id = $this->input->get('id');
 
-		$widget = $this->DashboardWidgetModel->load($widget_id);
+		$widget = $this->WidgetModel->load($widget_id);
 
 		if (isError($widget) || !getData($widget))
 			return $this->outputJsonSuccess([
@@ -65,15 +48,61 @@ class Widget extends Auth_Controller
 		return $this->outputJsonSuccess(current(getData($widget)));
 	}
 	
-	public function getWidgetsForDashboard() 
+	public function getAll() 
 	{
-		$db = $this->input->get('db');
-		$result = $this->DashboardWidgetModel->getAllForDashboard($db);
+		$dashboard_id = $this->input->get('dashboard_id');
+		$result = $this->WidgetModel->getWithAllowedForDashboard($dashboard_id);
 
 		if (isError($result))
 			return $this->outputJsonError(getError($result));
 
-		$this->outputJsonSuccess(getData($result));
+		$this->outputJsonSuccess(getData($result) ?: []);
 	}
 	
+	public function getWidgetsForDashboard() 
+	{
+		$db = $this->input->get('db');
+		$result = $this->WidgetModel->getForDashboard($db);
+
+		if (isError($result)) {
+			http_response_code(404);
+			$this->terminateWithJsonError([
+				'error' => getError($result)
+			]);
+		}
+
+		$this->outputJsonSuccess(getData($result) ?: []);
+	}
+	
+	public function setAllowed() {
+		$input = $this->getPostJSON();
+
+		$dashboard_id = $input->dashboard_id;
+		$widget_id = $input->widget_id;
+		$action = $input->action;
+
+		if ($action == 'add') {
+			$result = $this->DashboardWidgetModel->insert([
+				'dashboard_id' => $dashboard_id, 
+				'widget_id' => $widget_id
+			]);
+		} elseif ($action == 'delete') {
+			$result = $this->DashboardWidgetModel->delete([
+				'dashboard_id' => $dashboard_id, 
+				'widget_id' => $widget_id
+			]);
+		} else {
+			http_response_code(404); // TODO(chris): 400?
+			$this->terminateWithJsonError([
+				'error' => 'action value invalid'
+			]);
+		}
+		if (isError($result)) {
+			http_response_code(404);
+			$this->terminateWithJsonError([
+				'error' => getError($result)
+			]);
+		}
+		return $this->outputJsonSuccess(getData($result));
+	}
 }
diff --git a/application/models/dashboard/Dashboard_Widget_model.php b/application/models/dashboard/Dashboard_Widget_model.php
index 59aadf8f8..eb4540cd9 100644
--- a/application/models/dashboard/Dashboard_Widget_model.php
+++ b/application/models/dashboard/Dashboard_Widget_model.php
@@ -8,17 +8,9 @@ class Dashboard_Widget_model extends DB_Model
 	public function __construct()
 	{
 		parent::__construct();
-		$this->dbTable = 'dashboard.tbl_widget';
-		$this->pk = 'widget_id';
-	}
-
-	public function getAllForDashboard($db)
-	{
-		$this->addSelect($this->dbTable . '.*');
-		$this->addJoin('dashboard.tbl_dashboard_widget', 'widget_id');
-		$this->addJoin('dashboard.tbl_dashboard', 'dashboard_id');
-
-		return $this->loadWhere(['dashboard_kurzbz' => $db]);
+		$this->dbTable = 'dashboard.tbl_dashboard_widget';
+		$this->pk = ['dashboard_id', 'widget_id'];
+		$this->hasSequence = false;
 	}
 
 }
diff --git a/application/models/dashboard/Widget_model.php b/application/models/dashboard/Widget_model.php
new file mode 100644
index 000000000..4e5a31502
--- /dev/null
+++ b/application/models/dashboard/Widget_model.php
@@ -0,0 +1,33 @@
+<?php
+class Widget_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'dashboard.tbl_widget';
+		$this->pk = 'widget_id';
+	}
+
+	public function getWithAllowedForDashboard($dashboard_id)
+	{
+		$this->addSelect($this->dbTable . '.*');
+		$this->addSelect('CASE WHEN dashboard_id = ? THEN 1 ELSE 0 END AS allowed', false);
+		$this->addJoin('dashboard.tbl_dashboard_widget', 'widget_id', 'LEFT');
+
+		return $this->execQuery($this->db->get_compiled_select($this->dbTable), [$dashboard_id]);
+	}
+
+	public function getForDashboard($db)
+	{
+		$this->addSelect($this->dbTable . '.*');
+		$this->addJoin('dashboard.tbl_dashboard_widget', 'widget_id');
+		$this->addJoin('dashboard.tbl_dashboard', 'dashboard_id');
+
+		return $this->loadWhere(['dashboard_kurzbz' => $db]);
+	}
+
+}

From 8fd61edaab723decda442bd2cfab6ee177c0a70e Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 28 Oct 2022 12:41:25 +0200
Subject: [PATCH 0039/1461] Admin Components

---
 public/js/components/Dashboard/Admin.js       | 113 +++++++++++++
 public/js/components/Dashboard/Admin/Edit.js  |  38 +++++
 .../js/components/Dashboard/Admin/Presets.js  | 159 ++++++++++++++++++
 .../js/components/Dashboard/Admin/Widgets.js  |  45 +++++
 4 files changed, 355 insertions(+)
 create mode 100644 public/js/components/Dashboard/Admin.js
 create mode 100644 public/js/components/Dashboard/Admin/Edit.js
 create mode 100644 public/js/components/Dashboard/Admin/Presets.js
 create mode 100644 public/js/components/Dashboard/Admin/Widgets.js

diff --git a/public/js/components/Dashboard/Admin.js b/public/js/components/Dashboard/Admin.js
new file mode 100644
index 000000000..775cd87d6
--- /dev/null
+++ b/public/js/components/Dashboard/Admin.js
@@ -0,0 +1,113 @@
+import BsPrompt from "../Bootstrap/Prompt.js";
+import DashboardAdminEdit from "./Admin/Edit.js";
+import DashboardAdminWidgets from "./Admin/Widgets.js";
+import DashboardAdminPresets from "./Admin/Presets.js";
+
+export default {
+	components: {
+		DashboardAdminEdit,
+		DashboardAdminWidgets,
+		DashboardAdminPresets
+	},
+	provide() {
+		return {
+			adminMode: true
+		};
+	},
+	data() {
+		return {
+			dashboards: [],
+			current: -1,
+			widgets: []
+		};
+	},
+	computed: {
+		apiurl() {
+			return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/dashboard';
+		},
+		dashboard() {
+			return this.dashboards.find(el => el.dashboard_id == this.current);
+		}
+	},
+	methods: {
+		dashboardAdd() {
+			let _name = '';
+			BsPrompt.popup('New Dashboard name').then(
+				name => {
+					_name = name;
+					return axios.post(this.apiurl + '/Dashboard/Create', {
+						dashboard_kurzbz: name
+					})
+				}
+			).then(res => {
+				let newDashboard = {
+					dashboard_id: res.data.retval,
+					dashboard_kurzbz: _name,
+					beschreibung: ''
+				};
+				this.dashboards.push(newDashboard);
+				this.current = newDashboard.dashboard_id;
+			}).catch(err => err !== undefined ? console.error('ERROR:', err) : 0);
+		},
+		dashboardUpdate(dashboard) {
+			// TODO(chris): Loading or message
+			axios.post(this.apiurl + '/Dashboard/Update', dashboard).then(() => {
+				let old = this.dashboards.find(el => el.dashboard_id == dashboard.dashboard_id);
+				old.dashboard_kurzbz = dashboard.dashboard_kurzbz;
+				old.beschreibung = dashboard.beschreibung;
+			}).catch(err => console.error('ERROR:', err));
+		},
+		dashboardDelete(dashboard_id) {
+			axios.post(this.apiurl + '/Dashboard/Delete', {dashboard_id}).then(() => {
+				this.current = -1;
+				this.dashboards = this.dashboards.filter(el => el.dashboard_id != dashboard_id);
+			}).catch(err => console.error('ERROR:', err));
+		},
+		assignWidgets(widgets) {
+			this.widgets = widgets;
+			/*while (this.widgets.length)
+				this.widgets.pop();
+			for (var i in widgets)
+				this.widgets.push(widgets[i]);*/
+		}
+	},
+	created() {
+		axios.get(this.apiurl + '/Dashboard').then(res => {
+			//console.log(res.data.retval);
+			this.dashboards = res.data.retval;
+		}).catch(err => console.error('ERROR:', err));
+	},
+	template: `<div class="dashboard-admin">
+		<div class="input-group">
+			<label for="dashbaord-select" class="input-group-text">Dashboard:</label>
+			<select id="dashbaord-select" class="form-select" v-model="current">
+				<option v-for="dashboard in dashboards" :key="dashboard.dashboard_id" :value="dashboard.dashboard_id">{{dashboard.dashboard_kurzbz}}</option>
+			</select>
+			<button class="btn btn-outline-secondary" type="button" @click="dashboardAdd"><i class="fa-solid fa-plus"></i></button>
+		</div>
+		<div v-if="dashboard">
+			<ul class="nav nav-tabs mt-3" role="tablist">
+				<li class="nav-item" role="presentation">
+					<button class="nav-link" id="edit-tab" data-bs-toggle="tab" data-bs-target="#edit" type="button" role="tab" aria-controls="edit" aria-selected="false">Edit</button>
+				</li>
+				<li class="nav-item" role="presentation">
+					<button class="nav-link active" id="widgets-tab" data-bs-toggle="tab" data-bs-target="#widgets" type="button" role="tab" aria-controls="widgets" aria-selected="true">Widgets</button>
+				</li>
+				<li class="nav-item" role="presentation">
+					<button class="nav-link" id="presets-tab" data-bs-toggle="tab" data-bs-target="#presets" type="button" role="tab" aria-controls="presets" aria-selected="false">Presets</button>
+				</li>
+			</ul>
+			<div class="tab-content pt-3">
+				<div class="tab-pane fade" id="edit" role="tabpanel" aria-labelledby="edit-tab">
+					<dashboard-admin-edit v-bind="dashboard" :key="dashboard.dashboard_id" @change="dashboardUpdate($event)" @delete="dashboardDelete($event)"></dashboard-admin-edit>
+				</div>
+				<div class="tab-pane fade show active" id="widgets" role="tabpanel" aria-labelledby="widgets-tab">
+					<dashboard-admin-widgets :key="dashboard.dashboard_id" :dashboard_id="dashboard.dashboard_id" :widgets="widgets" @change="test" @assign-widgets="assignWidgets"></dashboard-admin-widgets>
+				</div>
+				<div class="tab-pane fade" id="presets" role="tabpanel" aria-labelledby="presets-tab">
+					<dashboard-admin-presets :dashboard="dashboard.dashboard_kurzbz" :widgets="widgets"></dashboard-admin-presets>
+				</div>
+			</div>
+		</div>
+	</div>`
+}
diff --git a/public/js/components/Dashboard/Admin/Edit.js b/public/js/components/Dashboard/Admin/Edit.js
new file mode 100644
index 000000000..ec841a9ad
--- /dev/null
+++ b/public/js/components/Dashboard/Admin/Edit.js
@@ -0,0 +1,38 @@
+import BsConfirm from '../../Bootstrap/Confirm.js';
+
+export default {
+	emits: [
+		"change",
+		"delete"
+	],
+	props: {
+		dashboard_id: Number,
+		dashboard_kurzbz: String,
+		beschreibung: String
+	},
+	data() {
+		return {
+			kurzbz: this.dashboard_kurzbz,
+			desc: this.beschreibung
+		}
+	},
+	methods: {
+		sendDelete() {
+			BsConfirm.popup('Sure?').then(() => this.$emit('delete', this.dashboard_id)).catch();
+		}
+	},
+	template: `<div class="dashboard-admin-edit px-3">
+		<div class="mb-3">
+			<label for="dashboard-admin-edit-kurzbz">Kurz Bezeichnung</label>
+			<input id="dashboard-admin-edit-kurzbz" type="text" class="form-control" v-model="kurzbz">
+		</div>
+		<div class="mb-3">
+			<label for="dashboard-admin-edit-beschreibung">Beschreibung</label>
+			<textarea id="dashboard-admin-edit-beschreibung" class="form-control" v-model="desc"></textarea>
+		</div>
+		<div>
+			<button class="btn btn-danger" @click="sendDelete">Delete</button>
+			<button class="btn btn-primary" @click="$emit('change', {dashboard_id,dashboard_kurzbz:kurzbz,beschreibung:desc})">Update</button>
+		</div>
+	</div>`
+}
diff --git a/public/js/components/Dashboard/Admin/Presets.js b/public/js/components/Dashboard/Admin/Presets.js
new file mode 100644
index 000000000..19052171f
--- /dev/null
+++ b/public/js/components/Dashboard/Admin/Presets.js
@@ -0,0 +1,159 @@
+import DashboardSection from "../Section.js";
+import DashboardWidgetPicker from "../Widget/Picker.js";
+import ObjectUtils from "../../../composables/ObjectUtils.js";
+
+export default {
+	components: {
+		DashboardSection,
+		DashboardWidgetPicker
+	},
+	props: {
+		dashboard: String,
+		widgets: Array
+	},
+	data: () => ({
+		funktionen: {},
+		sections: [],
+	}),
+	computed: {
+		apiurl() {
+			return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/dashboard';
+		},
+		pickerWidgets() {
+			return this.widgets.filter(widget => widget.allowed);
+		}
+	},
+	methods: {
+		widgetAdd(section_name, widget) {
+			this.$refs.widgetpicker.getWidget().then(widget_id => {
+				widget.widget = widget_id;
+				let loading = {...widget};
+				loading.loading = true;
+				this.sections.forEach(section => {
+					if (section.name == section_name)
+						section.widgets.push(loading);
+				});
+				
+				axios.post(this.apiurl + '/Config/addWidgetsToPreset', {
+					db: this.dashboard,
+					funktion_kurzbz: section_name,
+					widgets: [widget]
+				}).then(result => {
+					let newId = Object.keys(result.data.retval.data.widgets[section_name]).pop();
+					widget.id = newId;
+					this.sections.forEach(section => {
+						if (section.name == section_name) {
+							section.widgets.splice(section.widgets.indexOf(loading),1);
+							section.widgets.push(widget);
+						}
+					});
+				}).catch(error => {
+					console.error('ERROR: ', error);
+					alert('ERROR: ' + error.response.data.retval);
+				});
+			});
+		},
+		widgetUpdate(section_name, payload) {
+			payload = payload[section_name];
+			for (var k in payload) {
+				for (var i in this.sections) {
+					if (this.sections[i].name == section_name) {
+						for (var wid in this.sections[i].widgets) {
+							if (this.sections[i].widgets[wid].id == k) {
+								payload[k] = ObjectUtils.mergeDeep(this.sections[i].widgets[wid], payload[k]);
+								// NOTE(chris): remove internal props
+								for (var prop in {_x:1,_y:1,_w:1,_h:1,index:1,id:1})
+									if (payload[k][prop])
+										delete payload[k][prop];
+								break;
+							}
+						}
+						break;
+					}
+				}
+				payload[k].widgetid = k;
+				delete payload[k].custom;
+			}
+			axios.post(this.apiurl + '/Config/addWidgetsToPreset', {
+				db: this.dashboard,
+				funktion_kurzbz: section_name,
+				widgets: payload
+			}).then(() => {
+				this.sections.forEach(section => {
+					if (section.name == section_name) {
+						section.widgets.forEach((widget, i) => {
+							if (payload[widget.id]) {
+								payload[widget.id].id = widget.id;
+								payload[widget.id].index = widget.index;
+								section.widgets[i] = payload[widget.id];
+								section.widgets[i].custom = 1;
+							}
+						});
+					}
+				});
+			}).catch(error => {
+				// TODO(chris): revert placement on failure
+				console.error('ERROR: ', error);
+				alert('ERROR: ' + error.response.data.retval);
+			});
+		},
+		widgetRemove(section_name, id) {
+			axios.post(this.apiurl + '/Config/removeWidgetFromPreset', {
+				db: this.dashboard,
+				funktion_kurzbz: section_name,
+				widgetid: id
+			}).then(() => {
+				this.sections.forEach(section => {
+					if (section.name == section_name)
+						section.widgets = section.widgets.filter(widget => widget.id != id);
+				});
+			}).catch(error => {
+				console.error('ERROR: ', error);
+				alert('ERROR: ' + error.response.data.retval);
+			});
+		},
+		loadSections(evt) {
+			let funktionen = Array.from(evt.target.querySelectorAll("option:checked"),e=>e.value);
+			this.sections = [];
+			axios.get(this.apiurl + '/Config/PresetBatch', {params: {
+				db: this.dashboard,
+				funktionen
+			}}).then(res => {
+				for (var section in res.data.retval) {
+					let widgets = [];
+					for (var wid in res.data.retval[section]) {
+						res.data.retval[section][wid].id = wid;
+						res.data.retval[section][wid].custom = 1;
+						widgets.push(res.data.retval[section][wid]);
+					}
+					this.sections.push({
+						name: section,
+						widgets
+					});
+				}
+			}).catch(err => console.error('ERROR:', err));
+		}
+	},
+	created() {
+		axios.get(this.apiurl + '/Config/Funktionen').then(res => {
+			//console.log(res.data.retval);
+			this.funktionen = {general: 'GENERAL'};
+			res.data.retval.forEach(funktion => {
+				this.funktionen[funktion.funktion_kurzbz] = funktion.beschreibung;
+			});
+		}).catch(err => console.error('ERROR:', err));
+	},
+	template: `<div class="dashboard-admin-presets">
+		<div class="row">
+			<div class="col-3">
+				<select class="form-control" multiple @input="loadSections">
+					<option v-for="name,id in funktionen" :key="id" :value="id">{{ name }}</option>
+				</select>
+			</div>
+			<div class="col-9">
+				<dashboard-section v-for="section in sections" :key="section.name" :name="section.name" :widgets="section.widgets" @widget-add="widgetAdd" @widget-update="widgetUpdate" @widget-remove="widgetRemove"></dashboard-section>
+			</div>
+		</div>
+		<dashboard-widget-picker ref="widgetpicker" :widgets="pickerWidgets"></dashboard-widget-picker>
+	</div>`
+}
diff --git a/public/js/components/Dashboard/Admin/Widgets.js b/public/js/components/Dashboard/Admin/Widgets.js
new file mode 100644
index 000000000..34b7b482c
--- /dev/null
+++ b/public/js/components/Dashboard/Admin/Widgets.js
@@ -0,0 +1,45 @@
+export default {
+	emits: [
+		"change",
+		"assignWidgets"
+	],
+	props: {
+		dashboard_id: Number,
+		widgets: Array
+	},
+	computed: {
+		apiurl() {
+			return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/dashboard';
+		}
+	},
+	methods: {
+		sendChange(widget_id) {
+			let allow = !this.widgets.find(el => el.widget_id == widget_id).allowed;
+			axios.post(this.apiurl + '/Widget/setAllowed', {
+				dashboard_id: this.dashboard_id,
+				widget_id,
+				action: allow ? 'add' : 'delete'
+			}).catch(err => console.error('ERROR: ' + err));
+		}
+	},
+	created() {
+		axios.get(this.apiurl + '/Widget/getAll', {
+			params:{
+				dashboard_id: this.dashboard_id
+			}
+		}).then(
+			result => {
+				this.$emit('assignWidgets', result.data.retval.map(el => ({
+					...el,
+					...{setup:JSON.parse(el.setup),arguments:JSON.parse(el.arguments),allowed:!!el.allowed}
+				})));
+			}
+		).catch(err => console.error('ERROR:', err));
+	},
+	template: `<div class="dashboard-admin-widgets">
+		<div v-for="widget in widgets" :key="widget.widget_id" class="form-check form-switch">
+			<input class="form-check-input" type="checkbox" role="switch" :id="'dashboard-admin-widgets-' + widget.widget_id" v-model="widget.allowed" @input.prevent="sendChange(widget.widget_id)">
+			<label class="form-check-label" :for="'dashboard-admin-widgets-' + widget.widget_id">{{(widget.setup && widget.setup.name) || widget.widget_kurzbz}}</label>
+		</div>
+	</div>`
+}

From c78c7313883fcf77ac2510d41e7da4a07bfeefab Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 3 Nov 2022 10:27:39 +0100
Subject: [PATCH 0040/1461] renamed Dashboard Controller to DashboardDemo and
 used view to dashboard_demo

---
 .../dashboard/{Dashboard.php => DashboardDemo.php}            | 4 ++--
 .../views/dashboard/{dashboard.php => dashboard_demo.php}     | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename application/controllers/dashboard/{Dashboard.php => DashboardDemo.php} (91%)
 rename application/views/dashboard/{dashboard.php => dashboard_demo.php} (100%)

diff --git a/application/controllers/dashboard/Dashboard.php b/application/controllers/dashboard/DashboardDemo.php
similarity index 91%
rename from application/controllers/dashboard/Dashboard.php
rename to application/controllers/dashboard/DashboardDemo.php
index 64ca2543e..7088c44b9 100644
--- a/application/controllers/dashboard/Dashboard.php
+++ b/application/controllers/dashboard/DashboardDemo.php
@@ -4,7 +4,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 /**
  */
-class Dashboard extends Auth_Controller
+class DashboardDemo extends Auth_Controller
 {
     private $_uid;  // uid of the logged user
 
@@ -32,7 +32,7 @@ class Dashboard extends Auth_Controller
     // Public methods
 	public function index()
 	{
-		$this->load->view('dashboard/dashboard.php', []);
+		$this->load->view('dashboard/dashboard_demo.php', []);
 	}
 
     // -----------------------------------------------------------------------------------------------------------------
diff --git a/application/views/dashboard/dashboard.php b/application/views/dashboard/dashboard_demo.php
similarity index 100%
rename from application/views/dashboard/dashboard.php
rename to application/views/dashboard/dashboard_demo.php

From 3764df610229add0d305af1bc848cd4300d48d12 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 3 Nov 2022 11:24:29 +0100
Subject: [PATCH 0041/1461] Add widget to preset bugfix

---
 application/controllers/dashboard/Config.php    | 2 +-
 public/js/components/Dashboard/Admin/Presets.js | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/application/controllers/dashboard/Config.php b/application/controllers/dashboard/Config.php
index c5b912e1f..213781b74 100644
--- a/application/controllers/dashboard/Config.php
+++ b/application/controllers/dashboard/Config.php
@@ -76,7 +76,7 @@ class Config extends Auth_Controller
 			$this->terminateWithJsonError('preset could not be saved');
 		}
 		
-		$this->outputJsonSuccess(array('msg' => 'preset successfully stored.'));
+		$this->outputJsonSuccess(array('msg' => 'preset successfully stored.', 'data' => $preset_decoded));
 	}
 	
 	public function removeWidgetFromPreset()
diff --git a/public/js/components/Dashboard/Admin/Presets.js b/public/js/components/Dashboard/Admin/Presets.js
index 19052171f..5052d157a 100644
--- a/public/js/components/Dashboard/Admin/Presets.js
+++ b/public/js/components/Dashboard/Admin/Presets.js
@@ -27,6 +27,7 @@ export default {
 		widgetAdd(section_name, widget) {
 			this.$refs.widgetpicker.getWidget().then(widget_id => {
 				widget.widget = widget_id;
+				delete widget.custom;
 				let loading = {...widget};
 				loading.loading = true;
 				this.sections.forEach(section => {
@@ -41,6 +42,7 @@ export default {
 				}).then(result => {
 					let newId = Object.keys(result.data.retval.data.widgets[section_name]).pop();
 					widget.id = newId;
+					widget.custom = 1;
 					this.sections.forEach(section => {
 						if (section.name == section_name) {
 							section.widgets.splice(section.widgets.indexOf(loading),1);

From 935881dce2b4094f360b20775d91a4b879079cc4 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 3 Nov 2022 11:28:25 +0100
Subject: [PATCH 0042/1461] icon & cursor

---
 public/css/components/dashboard.css    | 11 +++++++++++
 public/js/components/Dashboard/Item.js | 12 ++++++------
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
index 91379200c..25d33adcd 100644
--- a/public/css/components/dashboard.css
+++ b/public/css/components/dashboard.css
@@ -14,3 +14,14 @@
 		grid-template-columns:repeat(2,1fr);
 	}
 }
+
+.mirror-x {
+	transform: scaleX(-1);
+}
+
+.cursor-nw-resize {
+	cursor: nw-resize;
+}
+.cursor-move {
+	cursor: move;
+}
\ No newline at end of file
diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index 2c20bee64..7d7639362 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -103,14 +103,14 @@ export default {
 		</div>
 	</div>
 	<div v-else-if="!hidden || editMode" :class="'dashboard-item card overflow-hidden ' + (arguments ? arguments.className : '')" @mousedown="mouseDown($event)" @dragstart="startDrag($event)" :draggable="!!editMode">
-		<div v-if="editMode && widget" class="card-header d-flex">
-			<span ref="dragHandle" class="col-auto pe-3"><i class="fa-solid fa-grip-vertical"></i></span>
+		<div v-if="editMode && widget" class="card-header d-flex ps-0 pe-2">
+			<span ref="dragHandle" class="col-auto mx-2 px-2 cursor-move"><i class="fa-solid fa-grip-vertical"></i></span>
 			<span class="col">{{ widget.setup.name }}</span>
-			<a v-if="hasConfig" class="col-auto ps-1" href="#" @click.prevent="openConfig"><i class="fa-solid fa-gear"></i></a>
-			<a v-if="custom" class="col-auto ps-1" href="#" @click.prevent="$emit('remove')">
+			<a v-if="hasConfig" class="col-auto px-1" href="#" @click.prevent="openConfig"><i class="fa-solid fa-gear"></i></a>
+			<a v-if="custom" class="col-auto px-1" href="#" @click.prevent="$emit('remove')">
 				<i class="fa-solid fa-trash"></i>
 			</a>
-			<div v-else class="col-auto ps-1 form-switch">
+			<div v-else class="col-auto px-1 form-switch">
 				<input class="form-check-input ms-0" type="checkbox" role="switch" id="flexSwitchCheckChecked" :checked="!hidden" @input="$emit('remove', hidden)">
 			</div>
 		</div>
@@ -132,7 +132,7 @@ export default {
 			</template>
 		</bs-modal>
 		<div v-if="editMode && isResizeable" class="card-footer d-flex justify-content-end p-0">
-			<span ref="resizeHandle" class="col-auto ps-1" @dragstart.prevent="$emit('resize')"><i class="fa-solid fa-up-right-and-down-left-from-center"></i></span>
+			<span ref="resizeHandle" class="col-auto px-1 cursor-nw-resize" @dragstart.prevent="$emit('resize')"><i class="fa-solid fa-up-right-and-down-left-from-center mirror-x"></i></span>
 		</div>
 	</div>`
 }
\ No newline at end of file

From 55959ccd41595de5553d590fb49c16ab28727d1f Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 3 Nov 2022 11:33:52 +0100
Subject: [PATCH 0043/1461] modal size

---
 public/js/components/Dashboard/Widget/Picker.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Dashboard/Widget/Picker.js b/public/js/components/Dashboard/Widget/Picker.js
index 871d48a2d..26fbdaac7 100644
--- a/public/js/components/Dashboard/Widget/Picker.js
+++ b/public/js/components/Dashboard/Widget/Picker.js
@@ -30,7 +30,7 @@ export default {
 		}
 	},
 	template: `<div class="dashboard-widget-picker">
-		<bs-modal ref="modal" class="fade" :dialog-class="{'modal-fullscreen-sm-down': 1, 'modal-dialog modal-xl': widgets && widgets.length > 5}" @hiddenBsModal="close">
+		<bs-modal ref="modal" class="fade" :dialog-class="{'modal-fullscreen-sm-down': 1, 'modal-xl': widgets && widgets.length > 0}" @hiddenBsModal="close">
 			<template v-slot:title>Create new widget</template>
 			<template v-slot:default>
 				<div v-if="widgets" class="row">

From 0d65ae5b85942a419f6335b8b62f7f2df4940f38 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 3 Nov 2022 11:37:13 +0100
Subject: [PATCH 0044/1461] widget icons absolute path

---
 public/js/components/Dashboard/Widget/Picker.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/public/js/components/Dashboard/Widget/Picker.js b/public/js/components/Dashboard/Widget/Picker.js
index 26fbdaac7..c96e3bc7b 100644
--- a/public/js/components/Dashboard/Widget/Picker.js
+++ b/public/js/components/Dashboard/Widget/Picker.js
@@ -27,6 +27,11 @@ export default {
 				this.callbacks.resolve(widget_id);
 			this.callbacks = {};
 			this.$refs.modal.hide();
+		},
+		path(src) {
+			if (src[0] == '/')
+				return FHC_JS_DATA_STORAGE_OBJECT.app_root + src;
+			return src;
 		}
 	},
 	template: `<div class="dashboard-widget-picker">
@@ -39,7 +44,7 @@ export default {
 					</div>
 					<div v-for="widget in widgets" :key="widget.widget_id" class="col-sm-6 col-md-4 col-lg-3 col-xl-2">
 						<div class="card h-100" @click="pick(widget.widget_id)">
-							<img class="card-img-top" :src="widget.setup.icon" :alt="'pictogram for ' + (widget.setup.name || widget.widget_kurzbz)">
+							<img class="card-img-top" :src="path(widget.setup.icon)" :alt="'pictogram for ' + (widget.setup.name || widget.widget_kurzbz)">
 							<div class="card-body">
 								<h5 class="card-title">{{ widget.setup.name || widget.widget_kurzbz }}</h5>
 								<p class="card-text">{{ widget.beschreibung }}</p>

From 0e7343acfb5f8cdac4a671c3a4eaf4f2a504ab9b Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 8 Nov 2022 14:46:44 +0100
Subject: [PATCH 0045/1461] bug: uncaught promise on widget-picker abort

---
 public/js/components/Dashboard/Admin/Presets.js | 2 +-
 public/js/components/Dashboard/Dashboard.js     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Dashboard/Admin/Presets.js b/public/js/components/Dashboard/Admin/Presets.js
index 5052d157a..44ff2f854 100644
--- a/public/js/components/Dashboard/Admin/Presets.js
+++ b/public/js/components/Dashboard/Admin/Presets.js
@@ -53,7 +53,7 @@ export default {
 					console.error('ERROR: ', error);
 					alert('ERROR: ' + error.response.data.retval);
 				});
-			});
+			}).catch(() => {});
 		},
 		widgetUpdate(section_name, payload) {
 			payload = payload[section_name];
diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js
index de995439f..2f2aa4d79 100644
--- a/public/js/components/Dashboard/Dashboard.js
+++ b/public/js/components/Dashboard/Dashboard.js
@@ -59,7 +59,7 @@ export default {
 					console.error('ERROR: ', error);
 					alert('ERROR: ' + error.response.data.retval);
 				});
-			});
+			}).catch(() => {});
 		},
 		widgetUpdate(section_name, payload) {
 			payload = payload[section_name];

From a5749a5ea26f1b1cac467069fddfb6f25cf1aec7 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 8 Nov 2022 14:47:44 +0100
Subject: [PATCH 0046/1461] bug: wrong check for empty fields when adding new
 widgets (coordinates are based on 0,0 not 1,1)

---
 public/js/components/Dashboard/Section.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 17689363a..250a26a7b 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -130,8 +130,8 @@ export default {
 			if (evt.target != this.$refs.container || !this.editMode)
 				return;
 			const rect = this.containerRect;
-			const gridX = Math.floor(this.gridWidth * (evt.clientX - rect.left) / this.$refs.container.clientWidth) + 1;
-			const gridY = Math.floor(this.gridHeight * (evt.clientY - rect.top) / this.$refs.container.clientHeight) + 1;
+			const gridX = Math.floor(this.gridWidth * (evt.clientX - rect.left) / this.$refs.container.clientWidth);
+			const gridY = Math.floor(this.gridHeight * (evt.clientY - rect.top) / this.$refs.container.clientHeight);
 			if (this.gridOccupiers[gridY * this.gridWidth + gridX] === undefined) {
 				let widget = { widget: 1, config: {}, place: {}, custom: 1 };
 				widget.place[this.gridWidth] = {

From d7c2362a0e7d4f2fd6784f6e849812cc179e6eb4 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 22 Nov 2022 14:39:33 +0100
Subject: [PATCH 0047/1461] double widgets bug

---
 application/models/dashboard/Widget_model.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/models/dashboard/Widget_model.php b/application/models/dashboard/Widget_model.php
index 4e5a31502..554c7dea6 100644
--- a/application/models/dashboard/Widget_model.php
+++ b/application/models/dashboard/Widget_model.php
@@ -15,8 +15,8 @@ class Widget_model extends DB_Model
 	public function getWithAllowedForDashboard($dashboard_id)
 	{
 		$this->addSelect($this->dbTable . '.*');
-		$this->addSelect('CASE WHEN dashboard_id = ? THEN 1 ELSE 0 END AS allowed', false);
-		$this->addJoin('dashboard.tbl_dashboard_widget', 'widget_id', 'LEFT');
+		$this->addSelect('CASE WHEN dashboard_id IS NULL THEN 0 ELSE 1 END AS allowed', false);
+		$this->db->join('dashboard.tbl_dashboard_widget dw', $this->dbTable . '.widget_id=dw.widget_id AND dashboard_id = ?', 'LEFT', false);
 
 		return $this->execQuery($this->db->get_compiled_select($this->dbTable), [$dashboard_id]);
 	}

From d51a95a8a09dcadbbd11393135206f4513696ca6 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 24 Nov 2022 11:48:46 +0100
Subject: [PATCH 0048/1461] test controller & views

---
 application/controllers/Test.php | 63 ++++++++++++++++++++++++++++++++
 application/views/test/Admin.php | 32 ++++++++++++++++
 application/views/test/Test.php  | 32 ++++++++++++++++
 public/js/apps/Test.js           | 19 ++++++++++
 4 files changed, 146 insertions(+)
 create mode 100644 application/controllers/Test.php
 create mode 100644 application/views/test/Admin.php
 create mode 100644 application/views/test/Test.php
 create mode 100644 public/js/apps/Test.js

diff --git a/application/controllers/Test.php b/application/controllers/Test.php
new file mode 100644
index 000000000..497f12f85
--- /dev/null
+++ b/application/controllers/Test.php
@@ -0,0 +1,63 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ */
+class Test extends Auth_Controller
+{
+    private $_uid;  // uid of the logged user
+
+    /**
+     * Constructor
+     */
+    public function __construct()
+    {
+        // Set required permissions
+        parent::__construct(
+            array(
+                'index' => 'dashboard/benutzer:r',
+                'db' => 'dashboard/benutzer:r',
+                'admin' => 'dashboard/admin:r',
+            )
+        );
+
+        $this->load->library('AuthLib');
+
+        $this->_setAuthUID(); // sets property uid
+
+        $this->setControllerId(); // sets the controller id
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    // Public methods
+	public function index()
+	{
+		$this->load->view('test/Test.php', ['dashboard' => 'CIS']);
+	}
+
+    // Public methods
+    public function db($dashboard)
+    {
+        $this->load->view('test/Test.php', ['dashboard' => $dashboard]);
+    }
+
+    public function admin()
+    {
+        $this->load->view('test/Admin.php', []);
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    // Private methods
+
+    /**
+     * Retrieve the UID of the logged user and checks if it is valid
+     */
+    private function _setAuthUID()
+    {
+        $this->_uid = getAuthUID();
+
+        if (!$this->_uid) show_error('User authentification failed');
+    }
+
+}
diff --git a/application/views/test/Admin.php b/application/views/test/Admin.php
new file mode 100644
index 000000000..837f6411b
--- /dev/null
+++ b/application/views/test/Admin.php
@@ -0,0 +1,32 @@
+<?php
+$this->load->view('templates/FHC-Header',
+	array(
+		'title' => 'FH-Complete',
+		'bootstrap5' => true,
+		'fontawesome6' => true,
+		'axios027' => true,
+		'restclient' => true,
+		'vue3' => true,
+		'customJSModules' => ['public/js/apps/Test.js'],
+		'customCSSs' => [
+			'public/css/components/dashboard.css'
+		],
+		'navigationcomponent' => true
+	)
+);
+?>
+
+	<div id="main">
+		<core-navigation-cmpt :add-side-menu-entries="appSideMenuEntries"></core-navigation-cmpt>
+
+		<div id="content">
+			<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
+				<h1 class="h2">Dashboard</h1>
+			</div>
+
+			<dashboard-admin/>
+
+		</div>
+	</div>
+
+<?php $this->load->view('templates/FHC-Footer'); ?>
diff --git a/application/views/test/Test.php b/application/views/test/Test.php
new file mode 100644
index 000000000..d297bf4ec
--- /dev/null
+++ b/application/views/test/Test.php
@@ -0,0 +1,32 @@
+<?php
+$this->load->view('templates/FHC-Header',
+	array(
+		'title' => 'FH-Complete',
+		'bootstrap5' => true,
+		'fontawesome6' => true,
+		'axios027' => true,
+		'restclient' => true,
+		'vue3' => true,
+		'customJSModules' => ['public/js/apps/Test.js'],
+		'customCSSs' => [
+			'public/css/components/dashboard.css'
+		],
+		'navigationcomponent' => true
+	)
+);
+?>
+
+	<div id="main">
+		<core-navigation-cmpt :add-side-menu-entries="appSideMenuEntries"></core-navigation-cmpt>
+
+		<div id="content">
+			<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
+				<h1 class="h2">Dashboard</h1>
+			</div>
+
+			<core-dashboard dashboard="<?= $dashboard; ?>"/>
+
+		</div>
+	</div>
+
+<?php $this->load->view('templates/FHC-Footer'); ?>
diff --git a/public/js/apps/Test.js b/public/js/apps/Test.js
new file mode 100644
index 000000000..cdf3e78f3
--- /dev/null
+++ b/public/js/apps/Test.js
@@ -0,0 +1,19 @@
+import {CoreNavigationCmpt} from '../components/navigation/Navigation.js';
+import CoreDashboard from '../components/Dashboard/Dashboard.js';
+import DashboardAdmin from '../components/Dashboard/Admin.js';
+
+Vue.createApp({
+  data: () => ({
+      appSideMenuEntries: {}
+    }),
+  components: {
+    CoreNavigationCmpt,
+    DashboardAdmin,
+    CoreDashboard/*,
+    "CoreFilterCmpt": CoreFilterCmpt,
+    "verticalsplit": verticalsplit,
+    "searchbar": searchbar*/
+  },
+  mounted() {
+  }
+}).mount('#main');

From 3e178928315a0afab2bcae909dec6ee467d284db Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 24 Nov 2022 11:50:09 +0100
Subject: [PATCH 0049/1461] fixed path to news placeholder image

---
 public/js/components/DashboardWidget/News.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/public/js/components/DashboardWidget/News.js b/public/js/components/DashboardWidget/News.js
index 6b5fc73d1..830af955e 100644
--- a/public/js/components/DashboardWidget/News.js
+++ b/public/js/components/DashboardWidget/News.js
@@ -22,7 +22,10 @@ export default {
 			}
 
 			return this.allNewsList.slice(0, quantity);
-		}
+		},
+                placeHolderImgURL: function() {
+                    return FHC_JS_DATA_STORAGE_OBJECT.app_root + 'skin/images/fh_technikum_wien_illustration_klein.png';
+                }
 	},
 	created(){
 		axios
@@ -69,7 +72,7 @@ export default {
        <div v-else class="h-100" :class="'row row-cols-' + width">
         <div v-for="news in newsList" :key="news.id">
             <div class="card h-100">
-                <img src="../../skin/images/fh_technikum_wien_illustration_klein.png" class="card-img-top">
+                <img :src="placeHolderImgURL" class="card-img-top">
                 <div class="card-footer"><span class="card-subtitle small text-muted">{{ formatDateTime(news.insertamum) }}</span></div>
                 <div class="card-body">
                   <a href="#newsModal" class="card-title h5 stretched-link" @click="setSingleNews(news)">{{ news.betreff }}</a><br>
@@ -85,7 +88,7 @@ export default {
   <BsModal ref="newsModal" id="newsModal" dialog-class="modal-lg">
     <template #title>
       <div class="row">
-        <div class="col-5"><img src="../../skin/images/fh_technikum_wien_illustration_klein.png" class="img-fluid rounded-start"></div>
+        <div class="col-5"><img :src="placeHolderImgURL" class="img-fluid rounded-start"></div>
         <div class="col-7 d-flex align-items-end">
           <p>{{ singleNews.betreff }}<br><small class="text-muted">{{ formatDateTime(singleNews.insertamum) }}</small></p>
         </div>
@@ -101,7 +104,7 @@ export default {
     <div class="row row-cols-5 g-4 h-100 px-5">
      <div v-for="news in allNewsList" :key="news.id">
             <div class="card h-100">
-                <img src="../../skin/images/fh_technikum_wien_illustration_klein.png" class="card-img-top">
+                <img :src="placeHolderImgURL" class="card-img-top">
                 <div class="card-footer"><span class="card-subtitle small">{{ formatDateTime(news.insertamum) }}</span></div>
                 <div class="card-body">
                   <a href="" class="card-title h5 stretched-link" @click="setSingleNews1(news)">{{ news.betreff }}</a><br>
@@ -112,4 +115,4 @@ export default {
           </div>
 	</template>
   </BsModal>`
-}
\ No newline at end of file
+}

From 3e0aa849d4dcd71832847920026a12a58043fca9 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 24 Nov 2022 11:52:01 +0100
Subject: [PATCH 0050/1461] bugfixes & "+" background

---
 application/controllers/dashboard/Config.php  |  8 ++-
 .../js/components/Dashboard/Admin/Presets.js  | 13 +++-
 public/js/components/Dashboard/Section.js     | 71 ++++++++++++++-----
 3 files changed, 73 insertions(+), 19 deletions(-)

diff --git a/application/controllers/dashboard/Config.php b/application/controllers/dashboard/Config.php
index 213781b74..b9c4c6c31 100644
--- a/application/controllers/dashboard/Config.php
+++ b/application/controllers/dashboard/Config.php
@@ -207,7 +207,13 @@ class Config extends Auth_Controller
 		foreach ($funktionen as $funktion) {
 			$conf = $this->DashboardLib->getPreset($db, $funktion);
 			if ($conf)
-				$result[$funktion] = json_decode($conf->preset, true)['widgets'][$funktion];
+			{
+				$preset = json_decode($conf->preset, true);
+				if (!isset($preset['widgets']) || !isset($preset['widgets'][$funktion]))
+					$result[$funktion] = [];
+				else
+					$result[$funktion] = $preset['widgets'][$funktion];
+			}
 			else
 				$result[$funktion] = [];
 		}
diff --git a/public/js/components/Dashboard/Admin/Presets.js b/public/js/components/Dashboard/Admin/Presets.js
index 44ff2f854..a86de1966 100644
--- a/public/js/components/Dashboard/Admin/Presets.js
+++ b/public/js/components/Dashboard/Admin/Presets.js
@@ -14,6 +14,7 @@ export default {
 	data: () => ({
 		funktionen: {},
 		sections: [],
+		tmpLoading: ''
 	}),
 	computed: {
 		apiurl() {
@@ -117,10 +118,14 @@ export default {
 		loadSections(evt) {
 			let funktionen = Array.from(evt.target.querySelectorAll("option:checked"),e=>e.value);
 			this.sections = [];
+			this.tmpLoading = funktionen.join('###');
 			axios.get(this.apiurl + '/Config/PresetBatch', {params: {
 				db: this.dashboard,
 				funktionen
 			}}).then(res => {
+				if (this.tmpLoading !== funktionen.join('###'))
+					return; // NOTE(chris): prevent race condition
+				
 				for (var section in res.data.retval) {
 					let widgets = [];
 					for (var wid in res.data.retval[section]) {
@@ -145,10 +150,16 @@ export default {
 			});
 		}).catch(err => console.error('ERROR:', err));
 	},
+	watch: {
+		dashboard() {
+			// TODO(chris): this should be done without a watcher
+			this.loadSections({target:this.$refs.funktionenList});
+		}
+	},
 	template: `<div class="dashboard-admin-presets">
 		<div class="row">
 			<div class="col-3">
-				<select class="form-control" multiple @input="loadSections">
+				<select ref="funktionenList" style="height:30em" class="form-control" multiple @input="loadSections">
 					<option v-for="name,id in funktionen" :key="id" :value="id">{{ name }}</option>
 				</select>
 			</div>
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 250a26a7b..84bcdd58e 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -24,13 +24,16 @@ export default {
 	data() {
 		return {
 			gridWidth: 0,
-			containerRect: {top:0,left:0},
 			changeHeight: 1,
 			movedObjects: [],
 			editMode: this.adminMode ? 1 : 0,
-			gridXLast: 0,
-			gridYLast: 0,
-			dataTransfer: {}
+			gridXLast: -1, // NOTE(chris): 0 based
+			gridYLast: -1,
+			dragging: 0,
+			dataTransfer: {},
+			gridAddFound: false,
+			gridXAdd: -1, // NOTE(chris): 0 based
+			gridYAdd: -1
 		}
 	},
 	computed: {
@@ -38,7 +41,7 @@ export default {
 			this.widgets.forEach((item,i) => item.index = i);
 			return this.widgets;
 		},
-		itemCoords() {
+		itemCoords() { // NOTE(chris): 1 based
 			if (!this.gridWidth)
 				return [];
 			let itemCoords = this.items.map(item => item.place[this.gridWidth] || this.createItemPlacement(item));
@@ -103,11 +106,13 @@ export default {
 			if (!this.gridWidth || !this.changeHeight)
 				return 0;
 			let minH = 0;
-			this.itemCoords.forEach((item,i) => minH = Math.max(minH, (!this.editMode && this.items[i].hidden) ? 0 : item.y + item.h - 1));
+			this.itemCoords.forEach((item,i) => minH = Math.max(minH, (!this.editMode && this.items[i].hidden) ? 0 : item.y - 1 + item.h));
 			// TODO(chris): the extraline should only be present if all slots are occupied
-			return minH + this.editMode;
+			if (minH == 0 && this.editMode)
+				return 1;
+			return minH + this.editMode*this.dragging;
 		},
-		gridOccupiers() {
+		gridOccupiers() { // NOTE(chris): 0 based
 			let occupiers = [];
 			let gridWidth = this.gridWidth;
 			this.items.forEach(item => {
@@ -123,20 +128,26 @@ export default {
 				}
 			});
 			return occupiers;
+		},
+		cssBg() {
+			if (!this.editMode || this.dragging || !this.gridAddFound)
+				return 'transparent';
+			let x = this.gridXAdd, y = this.gridYAdd, h = this.gridHeight-1 || 1, w = this.gridWidth-1 || 1;
+			return `url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="-500 -500 1448 1512"><path fill="lightgray" d="M64 32C28.7 32 0 60.7 0 96V416c0 35.3 28.7 64 64 64H384c35.3 0 64-28.7 64-64V96c0-35.3-28.7-64-64-64H64zM200 344V280H136c-13.3 0-24-10.7-24-24s10.7-24 24-24h64V168c0-13.3 10.7-24 24-24s24 10.7 24 24v64h64c13.3 0 24 10.7 24 24s-10.7 24-24 24H248v64c0 13.3-10.7 24-24 24s-24-10.7-24-24z"/></svg>')` + (100 * x/w) + '% ' + (100 * y/h) + '%/' + (100/this.gridWidth) + '% ' + (100/this.gridHeight) + '% no-repeat;cursor:pointer';
 		}
 	},
 	methods: {
 		addWidget(evt) {
 			if (evt.target != this.$refs.container || !this.editMode)
 				return;
-			const rect = this.containerRect;
+			const rect = this.$refs.container.getBoundingClientRect();
 			const gridX = Math.floor(this.gridWidth * (evt.clientX - rect.left) / this.$refs.container.clientWidth);
 			const gridY = Math.floor(this.gridHeight * (evt.clientY - rect.top) / this.$refs.container.clientHeight);
 			if (this.gridOccupiers[gridY * this.gridWidth + gridX] === undefined) {
 				let widget = { widget: 1, config: {}, place: {}, custom: 1 };
 				widget.place[this.gridWidth] = {
-					x: gridX,
-					y: gridY,
+					x: gridX+1,
+					y: gridY+1,
 					w: 1,
 					h: 1
 				};
@@ -162,7 +173,29 @@ export default {
 			});*/
 			return item.place[this.gridWidth];
 		},
+		onMouseMove(evt) {
+			if (!this.editMode || this.dragging) {
+				this.gridXAdd = this.gridYAdd = -1;
+				return;
+			}
+			
+			const rect = this.$refs.container.getBoundingClientRect();
+			const gridX = Math.floor(this.gridWidth * (evt.clientX - rect.left) / this.$refs.container.clientWidth);
+			const gridY = Math.floor(this.gridHeight * (evt.clientY - rect.top) / this.$refs.container.clientHeight);
+
+			if (this.gridXAdd == gridX && this.gridYAdd == gridY)
+				return;
+			// TODO(chris): only mark it when its not occupied
+			this.gridXAdd = gridX;
+			this.gridYAdd = gridY;
+			this.gridAddFound = (this.gridOccupiers[gridX + gridY * this.gridWidth] === undefined);
+		},
+		onMouseLeave() {
+			this.gridXAdd = this.gridYAdd = -1;
+			this.gridAddFound = false;
+		},
 		startDrag(evt, item) {
+			this.dragging = 1;
 			this.gridXLast = -1;
 			this.gridYLast = -1;
 			item._x = this.itemCoords[item.index].x;
@@ -178,6 +211,7 @@ export default {
 			}
 		},
 		startResize(evt, item) {
+			this.dragging = 1;
 			this.gridXLast = -1;
 			this.gridYLast = -1;
 			item._w = this.itemCoords[item.index].w;
@@ -239,7 +273,7 @@ export default {
 		onDragOver(evt) {
 			let id, x, y, w, h;
 			const action = this.dataTransfer.action;
-			const rect = this.containerRect;
+			const rect = this.$refs.container.getBoundingClientRect();
 			const gridX = Math.floor(this.gridWidth * (evt.clientX - rect.left) / this.$refs.container.clientWidth);
 			const gridY = Math.floor(this.gridHeight * (evt.clientY - rect.top) / this.$refs.container.clientHeight);
 
@@ -304,6 +338,9 @@ export default {
 			}
 		},
 		onDrop() {
+			this.dragging = 0;
+			this.gridXLast = -1;
+			this.gridYLast = -1;
 			let id = 0;
 			let update = {};
 			while ((id = this.movedObjects.pop())) {
@@ -376,14 +413,12 @@ export default {
 		let self = this;
 		let cont = self.$refs.container;
 		self.gridWidth = window.getComputedStyle(cont).getPropertyValue('grid-template-columns').split(" ").length;
-		self.containerRect = cont.getBoundingClientRect();
 		
 		window.addEventListener('resize', () => {
 			for (const child of cont.children) {
 				child.style.display = 'none';
 			}
 			self.gridWidth = window.getComputedStyle(cont).getPropertyValue('grid-template-columns').split(" ").length;
-			self.containerRect = cont.getBoundingClientRect();
 			for (const child of cont.children) {
 				child.style.display = '';
 			}
@@ -394,14 +429,16 @@ export default {
 			<span class="col">{{name}}</span>
 			<button class="col-auto btn" @click.prevent="editMode = editMode ? 0 : 1"><i class="fa-solid fa-gear"></i></button>
 		</h3>
-		<div class="position-relative" :style="'height:0;padding-bottom:' + (gridHeight * 100/gridWidth) + '%'">
+		<div :h="gridHeight" :w="gridWidth" class="position-relative" :style="'height:0;padding-bottom:' + (gridHeight * 100/gridWidth) + '%'">
 			<div ref="container" 
 				class="position-absolute top-0 left-0 w-100 h-100 draganddropcontainer" 
-				:style="'display:grid;grid-template-rows:repeat('+gridHeight+',1fr)'" 
+				:style="'display:grid;grid-template-rows:repeat('+gridHeight+',1fr);background:'+cssBg" 
 				@click="addWidget($event)" 
 				@drop="onDrop($event, 1)" 
 				@dragover.prevent="onDragOver" 
-				@dragenter.prevent>
+				@dragenter.prevent
+				@mousemove="onMouseMove"
+				@mouseleave="onMouseLeave">
 				
 				<dashboard-item 
 					v-for="item in items" 

From 4758fcb4137f3ccf52d0465ded8ef8cd0e6d68ed Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 24 Nov 2022 11:52:09 +0100
Subject: [PATCH 0051/1461] access rights

---
 application/controllers/dashboard/Widget.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/controllers/dashboard/Widget.php b/application/controllers/dashboard/Widget.php
index 9a878fa36..07c57ea73 100644
--- a/application/controllers/dashboard/Widget.php
+++ b/application/controllers/dashboard/Widget.php
@@ -11,9 +11,9 @@ class Widget extends Auth_Controller
 	{
 		parent::__construct(
 			array(
-				'index'							=> 'dashboard/benutzer:r',
+				'index'							=> ['dashboard/benutzer:r', 'dashboard/admin:r'],
 				'getAll'						=> 'dashboard/admin:r',
-				'getWidgetsForDashboard'		=> 'dashboard/benutzer:rw',
+				'getWidgetsForDashboard'		=> ['dashboard/benutzer:rw', 'dashboard/admin:r'],
 				'setAllowed'					=> 'dashboard/admin:rw'
 			)
 		);

From 266ba7523f3f4232fd81480b7129c10a3bf1fc6a Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 29 Nov 2022 08:48:50 +0100
Subject: [PATCH 0052/1461] s&d

---
 application/config/routes.php                 |    2 +
 application/controllers/cis/Cms.php           |  120 ++
 application/controllers/cis/Dashboard.php     |   35 +
 application/models/content/Content_model.php  |  163 +++
 .../models/content/Contentgruppe_model.php    |   46 +
 .../models/content/Contentsprache_model.php   |   28 +
 application/views/cis/Dashboard.php           |   17 +
 application/views/cis/Error.php               |   18 +
 application/views/cis/cms/Content.php         |   17 +
 application/views/templates/CIS-Footer.php    |   21 +
 application/views/templates/CIS-Header.php    |  161 +++
 .../views/templates/CIS-Menu/Entry.php        |   39 +
 .../views/templates/CIS-Menu/EntryBase.php    |   25 +
 .../views/templates/CIS-Menu/EntryInclude.php |    4 +
 public/css/Cis4/Cis.css                       |  117 ++
 public/css/Cis4/Cms.css                       | 1002 +++++++++++++++++
 public/js/apps/Cis.js                         |    7 +
 public/js/apps/Dashboard/Admin.js             |   12 +
 public/js/apps/Dashboard/Fhc.js               |   10 +
 system/dbupdate_3.4.php                       |    2 +
 system/dbupdate_3.4/25999_cis4_cms.php        |   17 +
 21 files changed, 1863 insertions(+)
 create mode 100644 application/controllers/cis/Cms.php
 create mode 100644 application/controllers/cis/Dashboard.php
 create mode 100644 application/views/cis/Dashboard.php
 create mode 100644 application/views/cis/Error.php
 create mode 100644 application/views/cis/cms/Content.php
 create mode 100644 application/views/templates/CIS-Footer.php
 create mode 100644 application/views/templates/CIS-Header.php
 create mode 100644 application/views/templates/CIS-Menu/Entry.php
 create mode 100644 application/views/templates/CIS-Menu/EntryBase.php
 create mode 100644 application/views/templates/CIS-Menu/EntryInclude.php
 create mode 100644 public/css/Cis4/Cis.css
 create mode 100644 public/css/Cis4/Cms.css
 create mode 100644 public/js/apps/Cis.js
 create mode 100644 public/js/apps/Dashboard/Admin.js
 create mode 100644 public/js/apps/Dashboard/Fhc.js
 create mode 100644 system/dbupdate_3.4/25999_cis4_cms.php

diff --git a/application/config/routes.php b/application/config/routes.php
index 15da5698f..0dc1ecc73 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -61,6 +61,8 @@ $route['api/v1/organisation/[O|o]rganisationseinheit/(:any)'] = 'api/v1/organisa
 $route['api/v1/ressource/[B|b]etriebsmittelperson/(:any)'] = 'api/v1/ressource/betriebsmittelperson2/$1';
 $route['api/v1/system/[S|s]prache/(:any)'] = 'api/v1/system/sprache2/$1';
 
+$route['cis'] = 'cis/dashboard';
+
 // load routes from extensions
 $subdir = 'application/config/extensions';
 $dirlist = scandir($subdir);
diff --git a/application/controllers/cis/Cms.php b/application/controllers/cis/Cms.php
new file mode 100644
index 000000000..4698bc462
--- /dev/null
+++ b/application/controllers/cis/Cms.php
@@ -0,0 +1,120 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * 
+ */
+class Cms extends Auth_Controller
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct(
+			array(
+				'content' => 'user:r'
+			)
+		);
+
+		// Loads WidgetLib
+		$this->load->library('WidgetLib');
+
+		// Load Models
+		$this->load->model('content/Content_model', 'ContentModel');
+		$this->load->model('content/Contentgruppe_model', 'ContentgruppeModel');
+		$this->load->model('content/Template_model', 'TemplateModel');
+		if (defined('LOG_CONTENT') && LOG_CONTENT)
+			$this->load->model('system/Webservicelog_model', 'WebservicelogModel');
+
+		// Loads phrases system
+		$this->loadPhrases(
+			array()
+		);
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * @param int		$content_id
+	 * @param int		$version
+	 * @param string	$sprache
+	 * @param boolean	$sichtbar
+	 * 
+	 * @return void
+	 */
+	public function content($content_id, $version = null, $sprache = null, $sichtbar = true)
+	{
+		if(!is_numeric($content_id))
+			return $this->load->view('cis/Error.php', ['error' => 'ContentID ist ungueltig']);
+
+		if ($sprache === null)
+			$sprache = getUserLanguage();
+		
+		$islocked = $this->ContentgruppeModel->loadWhere(['content_id' => $content_id]);
+		if (isError($islocked))
+			return $this->load->view('cis/Error.php', ['error' => getError($islocked)]);
+		
+		if (getData($islocked)) {
+			$uid = getAuthUID();
+			$isberechtigt = $this->ContentgruppeModel->berechtigt($content_id, $uid);
+			if (isError($isberechtigt))
+				return $this->load->view('cis/Error.php', ['error' => getError($isberechtigt)]);
+
+			if (!getData($isberechtigt))
+				return $this->load->view('cis/Error.php', ['error' => 'global/keineBerechtigungFuerDieseSeite']);
+		}
+
+		$content = $this->ContentModel->getContent($content_id, $sprache, $version, $sichtbar, true);
+
+		if (isError($content))
+			return $this->load->view('cis/Error.php', ['error' => getError($content)]);
+
+		// Legt einen Logeintrag für die Klickstatistik an
+		if (defined('LOG_CONTENT') && LOG_CONTENT)
+		{
+			// Nur eingeloggte User werden geloggt, das sonst auch alle Infoscreenaufrufe und dgl. mitgeloggt werden
+			if (isLogged())
+			{
+				$request_data = 'content_id=' . $content_id;
+				if ($version !== null)
+					$request_data .= '&version=' . $version;
+				if ($sichtbar !== true)
+					$request_data .= '&sichtbar=' . $sichtbar;
+				$this->WebservicelogModel->insert([
+					'webservicetyp_kurzbz' => 'content',
+					'request_id' => $content_id,
+					'beschreibung' => 'content',
+					'request_data' => $request_data . '&sprache=' . $sprache,
+					'execute_time' => 'now()',
+					'execute_user' => getAuthUID()
+				]);
+			}
+		}
+
+		$content = getData($content);
+
+		//XSLT Vorlage laden
+		$template = $this->TemplateModel->load($content->template_kurzbz);
+		if (isError($template))
+			return $this->load->view('cis/Error.php', ['error' => getError($template)]);
+		$template = current(getData($template));
+
+		$XML = new \DOMDocument();
+		$XML->loadXML($content->content);
+
+		$xsltemplate = new \DOMDocument();
+		$xsltemplate->loadXML($template->xslt_xhtml_c4);
+
+		//Transformation
+		$processor = new \XSLTProcessor();
+		$processor->importStylesheet($xsltemplate);
+
+		$content = $processor->transformToXML($XML);
+		$content = str_replace('dms.php', APP_ROOT . 'cms/dms.php', $content);
+
+		$this->load->view('cis/cms/Content.php', ['content' => $content]);
+	}
+}
diff --git a/application/controllers/cis/Dashboard.php b/application/controllers/cis/Dashboard.php
new file mode 100644
index 000000000..d81536bec
--- /dev/null
+++ b/application/controllers/cis/Dashboard.php
@@ -0,0 +1,35 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * 
+ */
+class Dashboard extends Auth_Controller
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct(
+			array(
+				'index' => 'user:r'
+			)
+		);
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * @return void
+	 */
+	public function index()
+	{
+		$this->load->view('cis/Dashboard.php');
+	}
+
+	
+
+}
diff --git a/application/models/content/Content_model.php b/application/models/content/Content_model.php
index ee4315ebd..f36425169 100644
--- a/application/models/content/Content_model.php
+++ b/application/models/content/Content_model.php
@@ -11,4 +11,167 @@ class Content_model extends DB_Model
 		$this->dbTable = 'campus.tbl_content';
 		$this->pk = 'content_id';
 	}
+
+	/**
+	 * Laedt den Content in der angegebenen Sprache
+	 * Sollte der Content in dieser Sprache nicht vorhanden sein, wird der Content in der Default Sprache geladen
+	 * 
+	 * @param integer			$content_id
+	 * @param string			$sprache optional
+	 * @param integer			$version optional
+	 * @param boolean | null	$sichtbar optional
+	 * 
+	 * @return stdClass
+	 */
+	public function getContent($content_id, $sprache=DEFAULT_LANGUAGE, $version=null, $sichtbar=null, $load_default_language=false)
+	{
+		$this->load->model('content/Contentsprache_model', 'ContentspracheModel');
+		$spracheExists = $this->ContentspracheModel->exists($content_id, $sprache, $version, $sichtbar);
+		if (isError($spracheExists))
+			return $spracheExists;
+
+		if(!getData($spracheExists))
+		{
+			if($load_default_language)
+				$sprache = DEFAULT_LANGUAGE;
+			else
+				return error('Der Content existiert in dieser Sprache nicht ');
+		}
+
+		$condition = ['content_id' => $content_id, 'sprache' => $sprache];
+
+		if ($sichtbar === true || $sichtbar === false)
+			$condition['sichtbar'] = $sichtbar;
+		if ($version)
+			$condition['version'] = $version;
+
+		$this->addSelect(['*', 'tbl_contentsprache.insertamum', 'tbl_contentsprache.insertvon', 'tbl_contentsprache.updateamum', 'tbl_contentsprache.updatevon']);
+		$this->addJoin('campus.tbl_contentsprache', 'content_id');
+		$this->addOrder('version', 'DESC');
+		$this->addLimit(1);
+
+		$result = $this->loadWhere($condition);
+
+		if (isError($result))
+			return $result;
+		if (!getData($result))
+			return error('Dieser Eintrag wurde nicht gefunden');
+
+		return success(current(getData($result)));
+	}
+
+	/**
+	 * Laedt alle Content Eintraege unterhalb eines Contents
+	 * (Ohne Newseintraege)
+	 * 
+	 * @param integer			$root_content_id
+	 * @param string			$uid
+	 * @param string			$sprache optional
+	 * 
+	 * @return stdClass			on success an array with menu objects
+	 */
+	public function getMenu($root_content_id, $uid, $sprache=DEFAULT_LANGUAGE)
+	{
+		$sql = "
+		SELECT 
+			c.content_id, 
+			c.template_kurzbz, 
+			s.titel,
+			s.content, 
+			"./*c.oe_kurzbz, 
+			s.sprache,
+			s.contentsprache_id, 
+			s.version, 
+			s.sichtbar, 
+			s.reviewvon, 
+			s.reviewamum,
+			s.updateamum, 
+			s.updatevon, 
+			s.insertamum, 
+			s.insertvon, */"
+			c.menu_open, 
+			c.aktiv, 
+			"./*s.gesperrt_uid, 
+			c.beschreibung,*/"
+			k.child_content_id,
+			k.sort FROM (
+				SELECT 
+					c.content_id, 
+					s.contentsprache_id
+				FROM 
+					campus.tbl_content c
+				JOIN (SELECT s5.content_id, s5.contentsprache_id FROM (SELECT content_id, sprache, MAX(version) AS version FROM (SELECT c1.content_id, COALESCE(s1.sprache, ?) AS sprache FROM campus.tbl_content c1 LEFT JOIN campus.tbl_contentsprache s1 ON c1.content_id=s1.content_id AND s1.sprache=? WHERE sichtbar=true) s2 LEFT JOIN campus.tbl_contentsprache s3 USING(content_id, sprache) WHERE sichtbar=true GROUP BY content_id, sprache) s4 LEFT JOIN campus.tbl_contentsprache s5 USING(content_id, sprache, version) WHERE version IS NOT NULL) t USING (content_id)
+				JOIN 
+					campus.tbl_contentsprache s USING (contentsprache_id) 
+				WHERE
+					c.template_kurzbz<>'news'
+				AND
+					c.content_id IN (
+						WITH RECURSIVE childs(content_id, child_content_id) as 
+						(
+							SELECT content_id, child_content_id FROM campus.tbl_contentchild 
+							WHERE content_id=?
+							UNION ALL
+							SELECT cc.child_content_id, null FROM campus.tbl_contentchild cc, childs
+							WHERE cc.content_id=childs.content_id
+						)
+						SELECT content_id
+						FROM childs
+						GROUP BY content_id
+					)
+				GROUP BY c.content_id, 
+					s.contentsprache_id
+			) m
+			JOIN 
+				campus.tbl_content c USING(content_id)
+			JOIN 
+				campus.tbl_contentsprache s USING(contentsprache_id)
+			LEFT JOIN 
+				campus.tbl_contentchild k ON(m.content_id=k.content_id)
+			ORDER BY content_id, sort";
+
+		#DEFAULT_LANGUAGE, $sprache, $root_content_id
+		$result = $this->execQuery($sql, [DEFAULT_LANGUAGE, $sprache, $root_content_id]);
+
+		if (isError($result))
+			return $result;
+
+		$contents = getData($result) ?? [];
+		$result = [];
+		foreach ($contents as $content) {
+			if (!isset($result[$content->content_id])) {
+				$result[$content->content_id] = clone($content);
+				unset($result[$content->content_id]->child_content_id);
+				unset($result[$content->content_id]->sort);
+				$result[$content->content_id]->childs = [];
+			}
+			if ($content->child_content_id !== null)
+				$result[$content->content_id]->childs[] = $content->child_content_id;
+		}
+		foreach ($result as $content) {
+			foreach ($content->childs as $k => $v) {
+				if (isset($result[$v])) {
+					$content->childs[$k] = $result[$v];
+				} else {
+					unset($content->childs[$k]);
+				}
+			}
+		}
+
+		return success($result[$root_content_id]);
+
+		# !LOCKED ||
+		$berechtigt = "SELECT 
+					1
+				FROM 
+					campus.tbl_contentgruppe 
+					JOIN public.vw_gruppen USING(gruppe_kurzbz) 
+				WHERE
+					(tbl_contentgruppe.content_id=$content_id
+						OR NOT EXISTS (SELECT 1 FROM campus.tbl_contentgruppe WHERE content_id=$content_id))
+					AND vw_gruppen.uid=$uid";
+
+		
+	}
+
 }
diff --git a/application/models/content/Contentgruppe_model.php b/application/models/content/Contentgruppe_model.php
index 03efc87b1..23dc897a1 100644
--- a/application/models/content/Contentgruppe_model.php
+++ b/application/models/content/Contentgruppe_model.php
@@ -11,4 +11,50 @@ class Contentgruppe_model extends DB_Model
 		$this->dbTable = 'campus.tbl_contentgruppe';
 		$this->pk = array('gruppe_kurzbz', 'content_id');
 	}
+
+	/**
+	 * Prueft ob der Zugriff auf den Content eingeschraenkt ist auf
+	 * eine bestimmte Benutzergruppe
+	 * 
+	 * @param int			$content_id
+	 * 
+	 * @return stdClass		success(true) wenn eingeschraenkt sonst success(false)
+	 */
+	public function islocked($content_id)
+	{
+		$islocked = $this->loadWhere(['content_id' => $content_id]);
+
+		if (isError($islocked))
+			return $islocked;
+		return success(!!getData($islocked));
+	}
+	
+	/**
+	 * Prueft ob ein User die Berechtigung fuer das Anzeigen des 
+	 * Contents besitzt
+	 * 
+	 * @param int			$content_id	ID des Contents
+	 * @param string		$uid		User der versucht auf den Content zuzugreifen
+	 * 
+	 * @return stdClass
+	 */
+	public function berechtigt($content_id, $uid)
+	{
+		$islocked = $this->islocked($content_id);
+		if (isError($islocked))
+			return $islocked;
+		
+		$condition = ['uid' => $uid];
+		if (getData($islocked)) {
+			$condition['content_id'] = $content_id;
+		}
+		$this->addJoin('public.vw_gruppen', 'gruppe_kurzbz');
+
+		$result = $this->loadWhere($condition);
+
+		if (isError($result))
+			return $result;
+		return success(!!getData($result));
+	}
+	
 }
diff --git a/application/models/content/Contentsprache_model.php b/application/models/content/Contentsprache_model.php
index eb7e257b2..80b053e28 100644
--- a/application/models/content/Contentsprache_model.php
+++ b/application/models/content/Contentsprache_model.php
@@ -11,4 +11,32 @@ class Contentsprache_model extends DB_Model
 		$this->dbTable = 'campus.tbl_contentsprache';
 		$this->pk = 'contentsprache_id';
 	}
+
+	/**
+	 * Prueft ob der Content in der angegeben Sprache vorhanden ist
+	 * 
+	 * @param int				$content_id
+	 * @param string			$sprache
+	 * @param int | null		$version (optional)
+	 * @param boolean | null	$sichtbar (optional)
+	 * @return stdClass
+	 */
+	public function exists($content_id, $sprache, $version=null, $sichtbar=null)
+	{
+		$condition = ['content_id' => $content_id, 'sprache' => $sprache];
+
+		if ($version)
+			$condition['version'] = $version;
+
+		if ($sichtbar !== null)
+			$condition['sichtbar'] = $sichtbar;
+
+		$result = $this->loadWhere($condition);
+		
+		if (isError($result))
+			return $result;
+
+		return success(!!getData($result));
+	}
+	
 }
diff --git a/application/views/cis/Dashboard.php b/application/views/cis/Dashboard.php
new file mode 100644
index 000000000..48e9f1dc9
--- /dev/null
+++ b/application/views/cis/Dashboard.php
@@ -0,0 +1,17 @@
+<?php
+$includesArray = array(
+	'customJSModules' => ['public/js/apps/Dashboard/Fhc.js'],
+	'customCSSs' => [
+		'public/css/components/dashboard.css'
+	],
+);
+
+$this->load->view('templates/CIS-Header', $includesArray);
+?>
+
+<div id="content">
+	<fhc-dashboard dashboard="CIS"/>
+</div>
+
+<?php $this->load->view('templates/CIS-Footer', $includesArray); ?>
+
diff --git a/application/views/cis/Error.php b/application/views/cis/Error.php
new file mode 100644
index 000000000..7b6a6beb2
--- /dev/null
+++ b/application/views/cis/Error.php
@@ -0,0 +1,18 @@
+<?php
+	$includesArray = array(
+		'title' => 'FH-Complete',
+		'bootstrap5' => true,
+		'fontawesome6' => true,
+	);
+
+	$this->load->view('templates/FHC-Header', $includesArray);
+?>
+
+	<div id="wrapper">
+		<div class="alert alert-primary" role="alert">
+			<?= $error; ?>
+		</div>
+	</div>
+
+<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
+
diff --git a/application/views/cis/cms/Content.php b/application/views/cis/cms/Content.php
new file mode 100644
index 000000000..b8f0aa45a
--- /dev/null
+++ b/application/views/cis/cms/Content.php
@@ -0,0 +1,17 @@
+<?php
+$includesArray = array(
+	'customCSSs' => [
+		'public/css/Cis4/Cms.css',
+		#'skin/style.css.php'
+	]
+);
+
+$this->load->view('templates/CIS-Header', $includesArray);
+?>
+
+<div id="cms">
+	<?= $content; ?>
+</div>
+
+<?php $this->load->view('templates/CIS-Footer', $includesArray); ?>
+
diff --git a/application/views/templates/CIS-Footer.php b/application/views/templates/CIS-Footer.php
new file mode 100644
index 000000000..24fcc8b98
--- /dev/null
+++ b/application/views/templates/CIS-Footer.php
@@ -0,0 +1,21 @@
+<?php
+$includesArray = array(
+	'title' => $title ?? 'FH-Complete',
+	'vue3' => true,
+	'bootstrap5' => true,
+	'fontawesome6' => true,
+	'axios027' => true,
+	'customJSModules' => array_merge([
+		'public/js/apps/Cis.js'
+	], $customJSModules ?? []),
+	'customCSSs' => array_merge([
+		'public/css/Cis4/Cis.css'
+	], $customCSSs ?? [])
+);
+?>
+
+		</main>
+	</div>
+</div>
+
+<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
\ No newline at end of file
diff --git a/application/views/templates/CIS-Header.php b/application/views/templates/CIS-Header.php
new file mode 100644
index 000000000..7b5c78c3f
--- /dev/null
+++ b/application/views/templates/CIS-Header.php
@@ -0,0 +1,161 @@
+<?php
+$includesArray = array(
+	'title' => $title ?? 'FH-Complete',
+	'vue3' => true,
+	'bootstrap5' => true,
+	'fontawesome6' => true,
+	'axios027' => true,
+	'customJSModules' => array_merge([
+		'public/js/apps/Cis.js'
+	], $customJSModules ?? []),
+	'customCSSs' => array_merge([
+		'public/css/Cis4/Cis.css'
+	], $customCSSs ?? [])
+);
+
+$this->load->view('templates/FHC-Header', $includesArray);
+
+
+$ci =& get_instance(); // get CI instance
+$ci->load->model('content/Content_model', 'ContentModel');
+$result = $ci->ContentModel->getMenu(6739, null);
+$menu = getData($result) ?? (object)['childs' => []];
+
+?>
+
+<div id="cis4">
+	<header>
+		<div id="cis-navigation-top" class="navbar navbar-expand-lg fixed-top navbar-dark bg-primary p-0">
+			<button class="navbar-toggler border-0" type="button" data-bs-toggle="offcanvas" data-bs-target="#cis-navigation-top-offcanvas">
+				<span class="navbar-toggler-icon"></span>
+			</button>
+			<a class="navbar-brand col-auto col-lg-2 px-3 py-0 m-0" href="<?= site_url('cis'); ?>">
+				<img src="<?= base_url('/public/images/logo-300x160.png'); ?>" width="90">
+			</a>
+			<div id="cis-navigation-top-offcanvas" class="offcanvas offcanvas-start align-items-stretch mt-lg-0 w-100 px-3 px-lg-0 d-flex flex-column flex-lg-row bg-dark border-0 pt-3 pt-lg-0" tabindex="-1" data-bs-backdrop="false">
+				<fhc-searchbar class="fhc-searchbar w-100" :searchoptions="{types:[],actions:{}}" :searchfunction="search"></fhc-searchbar>
+				<ul class="navbar-nav flex-grow-1">
+					<!-- TODO(chris): foreach menu -->
+					<li class="nav-item d-lg-none">
+						<a class="nav-link" href="#">Mein CIS</a>
+					</li>
+					<li class="nav-item d-lg-none">
+						<a class="nav-link" href="#">FHTW Campus</a>
+					</li>
+					<li class="nav-item d-lg-none">
+						<a class="nav-link" href="#">FHTW Services</a>
+					</li>
+					<li class="nav-item d-lg-none">
+						<a class="nav-link" href="<?= site_url('cis/cms/content/10012'); ?>">COVID 19</a>
+					</li>
+					<li class="nav-item">
+						<div class="dropdown pe-lg-3">
+							<a class="nav-link" href="#" id="dropdown01" data-bs-toggle="dropdown" data-bs-reference="parent" aria-expanded="false">
+								<img src="<?= base_url('/cis/public/bild.php?src=person&person_id=' . getAuthPersonId()); ?>" class="avatar rounded-circle" width="45" height="45"/>
+							</a>
+							<ul class="dropdown-menu dropdown-menu-dark dropdown-menu-end m-0" aria-labelledby="dropdown01">
+								<!-- TODO(chris): foreach menu -->
+								<li><a class="dropdown-item" href="#" id="menu-profil">Profil</a></li>
+								<li><a class="dropdown-item" href="#">Ampeln</a></li>
+								<li><hr class="dropdown-divider"></li>
+								<li><a class="dropdown-item" href="#">Logout</a></li>
+							</ul>
+						</div>
+					</li>
+				</ul>
+			</div>
+		</div>
+	</header>
+
+	<div class="container-fluid px-0 flex-grow-1 row mx-0">
+		<nav id="cis-navigation-left" class="d-none d-lg-block position-sticky col-lg-2 px-0 bg-secondary">
+			<div class="btn btn-dark text-muted rounded-0 w-100 text-start"><small>MAIN MENU</small></div>
+			<?php foreach($menu->childs as $entry)
+				$this->load->view('templates/CIS-Menu/Entry', ['entry' => $entry, 'menu_id' => 'menu']);
+			?>
+		</nav>
+		<!--nav class="list-group list-group-flush d-none d-lg-block position-sticky col-lg-2 px-0">
+				< !-- Separator with title -- >
+				<div class="list-group-item sidebar-separator-title text-muted d-flex align-items-center menu-collapsed">
+					<small>MAIN MENU</small>
+				</div>
+				< !-- /end Separator -- >
+				<a href="#submenu1" data-bs-toggle="collapse" aria-expanded="true" class="bg-primary text-white list-group-item list-group-item-action flex-column align-items-start">
+					<div class="d-flex w-100 justify-content-start align-items-center">
+						<i class="fa fa-user fa-fw me-3"></i>
+						<span class="menu-collapsed">Mein CIS</span>
+					</div>
+				</a>
+				<div id='submenu1' class="collapse show sidebar-submenu">
+					<a href="#" class="list-group-item list-group-item-action list-group-item-dark active" id="menu-mein-bereich">
+						<span class="menu-collapsed">Mein Bereich</span>
+					</a>
+					<a href="#" class="list-group-item list-group-item-action list-group-item-dark">
+						<span class="menu-collapsed">Studium</span>
+					</a>
+					<a href="#" class="list-group-item list-group-item-action list-group-item-dark" id="menu-lvplan">
+						<span class="menu-collapsed">LV Plan</span>
+					</a>
+					<a href="#" class="list-group-item list-group-item-action list-group-item-dark">
+						<span class="menu-collapsed">Campus Life</span>
+					</a>
+				</div>
+				<a href="#submenu2" data-bs-toggle="collapse" aria-expanded="false" class="bg-primary text-white list-group-item list-group-item-action flex-column align-items-start">
+					<div class="d-flex w-100 justify-content-start align-items-center">
+						<i class="fa fa-user fa-fw me-3"></i>
+						<span class="menu-collapsed">FHTW Hochschule</span>
+					</div>
+				</a>
+				<div id='submenu2' class="collapse sidebar-submenu">
+					<a href="#" class="list-group-item list-group-item-action list-group-item-dark" id="menu-organisation">
+						<span class="menu-collapsed">Organisation</span>
+					</a>
+					<a href="#" class="list-group-item list-group-item-action list-group-item-dark">
+						<span class="menu-collapsed">Studiengänge</span>
+					</a>
+					<a href="#" class="list-group-item list-group-item-action list-group-item-dark">
+						<span class="menu-collapsed">Forschung & Entwicklung</span>
+					</a>
+					<a href="#" class="list-group-item list-group-item-action list-group-item-dark">
+						<span class="menu-collapsed">Technikum Wien Acadamy</span>
+					</a>
+				</div>
+				<a href="#submenu3" data-bs-toggle="collapse" aria-expanded="false" class="bg-primary text-white list-group-item flex-column align-items-start">
+					<div class="d-flex w-100 justify-content-start align-items-center">
+						<i class="fa fa-user fa-fw me-3"></i>
+						<span class="menu-collapsed">FHTW Services</span>
+					</div>
+				</a>
+				<div id='submenu3' class="collapse sidebar-submenu">
+					<a href="#" class="list-group-item list-group-item-action list-group-item-dark">
+						<span class="menu-collapsed">Teaching & Learning Center</span>
+					</a>
+					<a href="#" class="list-group-item list-group-item-action list-group-item-dark">
+						<span class="menu-collapsed">International Office</span>
+					</a>
+					<a href="#" class="list-group-item list-group-item-action list-group-item-dark">
+						<span class="menu-collapsed">Bibliothek</span>
+					</a>
+					<a href="#" class="list-group-item list-group-item-action list-group-item-dark">
+						<span class="menu-collapsed">IT-Services</span>
+					</a>
+				</div>
+				<a href="#submenu4" data-bs-toggle="collapse" aria-expanded="false" class="bg-primary text-white list-group-item flex-column align-items-start">
+					<div class="d-flex w-100 justify-content-start align-items-center">
+						<i class="fa fa-user fa-fw me-3"></i>
+						<span class="menu-collapsed">Links & Downloads</span>
+					</div>
+				</a>
+				<div class="list-group-item sidebar-separator-title text-muted d-flex align-items-center menu-collapsed">
+					<small>AKTUELL</small>
+				</div>
+				<a href="<?= site_url('cis/cms/content/10012'); ?>" class="bg-primary text-white list-group-item">
+					<div class="d-flex w-100 justify-content-start align-items-center">
+						<i class="fa fa-medkit fa-fw me-3"></i>
+						<span class="menu-collapsed">COVID 19</span>
+					</div>
+				</a>
+				<div class="list-group-item sidebar-separator menu-collapsed"></div>
+			</ul>
+		</nav-->
+		<main class="ms-sm-auto col-lg-10 px-md-4 p-4 overflow-hidden">
\ No newline at end of file
diff --git a/application/views/templates/CIS-Menu/Entry.php b/application/views/templates/CIS-Menu/Entry.php
new file mode 100644
index 000000000..01e5ab67f
--- /dev/null
+++ b/application/views/templates/CIS-Menu/Entry.php
@@ -0,0 +1,39 @@
+<?php
+$menu_id .= '-' . $entry->content_id;
+
+switch ($entry->template_kurzbz) {
+	case 'redirect': {
+		$url = '';
+		$target = '';
+		$xml = new DOMDocument();
+		if($entry->content!='')
+		{
+			$xml->loadXML($entry->content);
+			if ($xml->getElementsByTagName('url')->item(0))
+				$url = $xml->getElementsByTagName('url')->item(0)->nodeValue;
+			// TODO(chris): get params
+			if (isset($params) && is_array($params))
+				foreach ($params as $key=>$value)
+					$url = str_replace('$' . $key, addslashes($value), $url);
+			if ($xml->getElementsByTagName('target')->item(0))
+				$target = $xml->getElementsByTagName('target')->item(0)->nodeValue;
+
+			if (strpos($url, '../') === 0)
+				$url = APP_ROOT . substr($url, 3);
+		}
+		if ($target == 'content')
+			$target = '';
+
+		$this->load->view('templates/CIS-Menu/EntryBase', ['entry' => $entry, 'menu_id' => $menu_id, 'link' => $url, 'target' => $target]);
+		break;
+	}
+	case 'include': {
+		$this->load->view('templates/CIS-Menu/EntryInclude', ['entry' => $entry, 'menu_id' => $menu_id . '-' . $entry->content_id]);
+		break;
+	}
+	default: {
+		$this->load->view('templates/CIS-Menu/EntryBase', ['entry' => $entry, 'menu_id' => $menu_id, 'link' => APP_ROOT . 'index.ci.php/cis/cms/content/' . $entry->content_id]);
+		break;
+	}
+}
+?>
diff --git a/application/views/templates/CIS-Menu/EntryBase.php b/application/views/templates/CIS-Menu/EntryBase.php
new file mode 100644
index 000000000..610c1e580
--- /dev/null
+++ b/application/views/templates/CIS-Menu/EntryBase.php
@@ -0,0 +1,25 @@
+<?php if ($entry->childs) { ?>
+	<?php if (substr($link, 0, 1) == '#') { ?>
+		<a href="#<?= $menu_id; ?>" data-bs-toggle="collapse" aria-expanded="<?= $entry->menu_open ? 'true' : 'false'; ?>" class="btn btn-default rounded-0 w-100 text-start dropdown-toggle btn-level-<?= substr_count($menu_id, '-'); ?><?= $entry->menu_open ? '' : ' collapsed'; ?>">
+			<span><?= htmlspecialchars($entry->titel); ?></span>
+		</a>
+	<?php } else { ?>
+		<div class="btn-group w-100">
+			<a<?= $link ? ' href="' . $link . '"' : ''; ?><?= $target ? ' target="' . $target . '"' : ''; ?> class="btn btn-default rounded-0 text-start btn-level-<?= substr_count($menu_id, '-'); ?>">
+				<?= htmlspecialchars($entry->titel); ?>
+			</a>
+			<a href="#<?= $menu_id; ?>" data-bs-toggle="collapse" aria-expanded="<?= $entry->menu_open ? 'true' : 'false'; ?>"class="btn btn-default rounded-0 dropdown-toggle dropdown-toggle-split flex-grow-0<?= $entry->menu_open ? '' : ' collapsed'; ?>" >
+				<span class="visually-hidden">Toggle Dropdown</span>
+			</a>
+		</div>
+	<?php } ?>
+	<ul id="<?= $menu_id; ?>" class="nav w-100 collapse<?= $entry->menu_open ? ' show' : ''; ?>">
+		<?php foreach ($entry->childs as $child) 
+			$this->load->view('templates/CIS-Menu/Entry', ['entry' => $child, 'menu_id' => $menu_id]);
+		?>
+	</ul>
+<?php } else { ?>
+	<a<?= $link ? ' href="' . $link . '"' : ''; ?><?= $target ? ' target="' . $target . '"' : ''; ?> class="btn btn-default rounded-0 w-100 text-start btn-level-<?= substr_count($menu_id, '-'); ?>">
+		<?= htmlspecialchars($entry->titel); ?>
+	</a>
+<?php } ?>
diff --git a/application/views/templates/CIS-Menu/EntryInclude.php b/application/views/templates/CIS-Menu/EntryInclude.php
new file mode 100644
index 000000000..0fd9f7b16
--- /dev/null
+++ b/application/views/templates/CIS-Menu/EntryInclude.php
@@ -0,0 +1,4 @@
+
+<div>
+	INCLUDE
+</div>
diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
new file mode 100644
index 000000000..0e6a93d5f
--- /dev/null
+++ b/public/css/Cis4/Cis.css
@@ -0,0 +1,117 @@
+@import '../components/searchbar.css';
+
+#cis-navigation-top .fhc-searchbar > .input-group {
+	margin: 0!important;
+}
+#cis-navigation-top .fhc-searchbar > .input-group > * {
+	border-radius: 0!important;
+}
+
+.avatar {
+	object-fit: cover;
+	height: 45px;
+	width: 45px;
+}
+
+#cis4 {
+	min-height: 100vh;
+	display: flex;
+	flex-direction: column;
+}
+#cis4 > header {
+	height: 48px;
+}
+/*body {
+	padding-top: 48px;
+}*/
+#cis-navigation-top.navbar-expand-lg .offcanvas {
+	margin-top: 48px;
+}
+@media (min-width: 992px) {
+	#cis4 > header {
+		height: 61px;
+	}
+	/*body {
+		padding-top: 61px;
+	}*/
+	#cis-navigation-top.navbar-expand-lg .offcanvas {
+		background-color: transparent!important;
+		position: initial;
+	}
+}
+
+#cis-navigation-left {
+	--fhc-menu-level-1-bg: #0d6efd;
+	--fhc-menu-level-1-color: #fff;
+	--fhc-menu-level-1-border: #0d6efd;
+	--fhc-menu-level-1-hover-bg: #0b5ed7;
+	--fhc-menu-level-1-hover-color: #fff;
+	--fhc-menu-level-1-hover-border: #0a58ca;
+	--fhc-menu-level-2-bg: #6c757d;
+	--fhc-menu-level-2-color: #fff;
+	--fhc-menu-level-2-border: #6c757d;
+	--fhc-menu-level-2-hover-bg: #5c636a;
+	--fhc-menu-level-2-hover-color: #fff;
+	--fhc-menu-level-2-hover-border: #565e64;
+	--fhc-menu-level-3-bg: #212529;
+	--fhc-menu-level-3-color: #fff;
+	--fhc-menu-level-3-border: #212529;
+	--fhc-menu-level-3-hover-bg: #1c1f23;
+	--fhc-menu-level-3-hover-color: #fff;
+	--fhc-menu-level-3-hover-border: #1a1e21;
+}
+#cis-navigation-left .btn-level-1,
+#cis-navigation-left .btn-level-1 + .btn {
+	color: var(--fhc-menu-level-1-color);
+	border-color: var(--fhc-menu-level-1-border);
+	background-color: var(--fhc-menu-level-1-bg);
+}
+#cis-navigation-left .btn-level-1:hover,
+#cis-navigation-left .btn-level-1:focus,
+#cis-navigation-left .btn-level-1 + .btn:hover,
+#cis-navigation-left .btn-level-1 + .btn:focus {
+	color: var(--fhc-menu-level-1-hover-color);
+	border-color: var(--fhc-menu-level-1-hover-border);
+	background-color: var(--fhc-menu-level-1-hover-bg);
+}
+#cis-navigation-left .btn-level-2,
+#cis-navigation-left .btn-level-2 + .btn {
+	color: var(--fhc-menu-level-2-color);
+	border-color: var(--fhc-menu-level-2-border);
+	background-color: var(--fhc-menu-level-2-bg);
+}
+#cis-navigation-left .btn-level-2:hover,
+#cis-navigation-left .btn-level-2:focus,
+#cis-navigation-left .btn-level-2 + .btn:hover,
+#cis-navigation-left .btn-level-2 + .btn:focus {
+	color: var(--fhc-menu-level-2-hover-color);
+	border-color: var(--fhc-menu-level-2-hover-border);
+	background-color: var(--fhc-menu-level-2-hover-bg);
+}
+#cis-navigation-left .btn-level-3,
+#cis-navigation-left .btn-level-3 + .btn {
+	color: var(--fhc-menu-level-3-color);
+	border-color: var(--fhc-menu-level-3-border);
+	background-color: var(--fhc-menu-level-3-bg);
+}
+#cis-navigation-left .btn-level-3:hover,
+#cis-navigation-left .btn-level-3:focus,
+#cis-navigation-left .btn-level-3 + .btn:hover,
+#cis-navigation-left .btn-level-3 + .btn:focus {
+	color: var(--fhc-menu-level-3-hover-color);
+	border-color: var(--fhc-menu-level-3-hover-border);
+	background-color: var(--fhc-menu-level-3-hover-bg);
+}
+
+#cis-navigation-left .btn.dropdown-toggle {
+	padding-right: .5625rem;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+}
+#cis-navigation-left .dropdown-toggle:after {
+	transition: all .2s ease-in-out;
+}
+#cis-navigation-left .dropdown-toggle.collapsed:after {
+	transform: rotate(-90deg);
+}
\ No newline at end of file
diff --git a/public/css/Cis4/Cms.css b/public/css/Cis4/Cms.css
new file mode 100644
index 000000000..b35d04d6b
--- /dev/null
+++ b/public/css/Cis4/Cms.css
@@ -0,0 +1,1002 @@
+/* Allgemein */
+#cms {
+	background-color: white;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 13px;
+	width: 100%;
+	height: 100%;
+	margin:0px;
+	border-width:0px;
+	border-style:none;
+	padding:0px;
+}
+#cms.main /* Workaround fuer Farbverlauf im IE statt ShadowBox */ {
+	background-color: white;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 13px;
+	height: 100%;
+	width: 100%;
+	margin:0px;
+	border-width: 2px;
+	border-style: none;
+	padding:0px;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#cccccc',endColorstr='#ffffff');
+}
+#cms iframe {
+	margin:0px;
+	padding:0px;
+	height: 100%;
+
+	 /* border-width:1px;
+	border-style:solid;  */
+}
+#cms textarea {
+	font-family: Arial, Helvetica, sans-serif;
+}
+#cms form {
+	font-family: Arial, Helvetica, sans-serif;
+}
+#cms p {
+	margin-top: 0px;
+}
+#cms hr {
+	color:#CCCCCC;
+	height:1px;
+}
+#cms ul {
+	padding-left: 0px;
+	padding-top: 2px;
+	padding-bottom: 2px;
+	margin-left: 6px;
+}
+#cms ol {
+	padding-left: 13px;
+	padding-top: 2px;
+	padding-bottom: 2px;
+	margin-left: 6px;
+}
+#cms ul li {
+	list-style-image:url(images/square_blue.png);
+	padding-left: 0px;
+	padding-top: 2px;
+	padding-bottom: 2px;
+	margin-left: 6px;
+}
+#cms li.ui-menu-item {
+	list-style-image:none;
+}
+#cms .btn-testtool {
+	width: 200px;
+	margin-top: 20px;
+}
+#cms #menue {
+	bottom: 2%;
+	width: 17%;
+	height: 81%;
+	z-index: 10;
+	padding: 0px;
+	margin: 0px;
+}
+#cms #menue {
+	position:absolute;
+}
+
+#cms #content {
+	bottom: 2%;
+	width:81%;
+	height:81%;
+	z-index: 10;
+	left:18%;
+	padding: 0px;
+	margin: 0px;
+}
+#cms #content /* Hack für IE8 */ {
+	*width: 75\%;
+	*left: 21\%;
+}
+#cms #content {
+	position:absolute;
+}
+
+/*   Druckausgabe */
+@media print
+{
+	#cms #menue {
+		display:none;
+	}
+	#cms #content {
+	width:98%;
+	z-index: 10;
+	left:1%;
+	}
+}
+#cms input.TextBox {
+	background-color: White;
+}
+/*
+==== Formularfelder und Buttons ====
+*/
+
+/* Such-Feld CIS-Suche */
+#cms input.search input.text {
+	background-color: #E9ECEE;
+	border-width: 1px;
+	border-style:solid;
+	border-color: #A5AFB6;
+}
+#cms #globalsearch {
+	background-color: #E9ECEE;
+	border-width: 1px;
+	border-style:solid;
+	border-color: #A5AFB6;
+	height: 25px;
+}
+/* Login-Button CIS-Seite */
+#cms input.cis_login {
+	cursor: pointer;
+	color: #666666;
+	border: 1px solid #A5AFB6;
+	background-color: #E9ECEE;
+	width: 150px;
+	height: 35px;
+	font-size: 20px;
+}
+#cms #GlobalMenu {
+	margin-top: 3px;
+	text-align: right;
+}
+#cms .home_logo {
+	background-image:url(styles/tw/TWLogo_klein.jpg);
+	background-repeat: no-repeat;
+	width:170px;
+	height:53px;
+}
+
+#cms div.tip {
+	position: absolute;
+	display: none;
+	width: 300px;
+	background-color: #f7f7ee;
+	padding: 3px 7px 4px 6px;
+	border: 1px solid #336;
+	background-color: #f7f7ee;
+	text-align: left;
+}
+#cms #header {
+	vertical-align:middle;
+}
+
+/*
+==== Links ====
+*/
+#cms a /*allgmeiner Link, Hauptmenuelinks*/ {
+	color: #0086CC; /*tw-blau*/
+	text-decoration: none;
+	cursor: pointer;
+}
+#cms a:hover /*link ohne Item-Definition*/ {
+	color: #0086CC; /*tw-blau*/
+	text-decoration: underline;
+}
+#cms a.ItemTesttool {
+	color: #000;
+	line-height: 25px;
+	display:block;
+	padding: 5px 10px 5px 10px;
+}
+
+#cms a.ItemTesttool.navButton {
+	background-color: #0a629c;
+	color: white;
+	padding: 10px;
+}
+#cms a.ItemTesttoolAktiv {
+	color: #000;
+	line-height: 25px;
+	display:block;
+	padding: 5px 10px 5px 10px;
+	text-decoration: none;
+}
+#cms a.ItemTesttoolBeendet {
+	color: #C7C8C9;
+	line-height: 25px;
+	display:block;
+	padding: 5px 10px 5px 10px;
+	cursor: default;
+	text-decoration: none;
+}
+#cms a:hover.ItemTesttool {
+	color: #000;
+	line-height: 25px;
+	text-decoration: none;
+	padding: 5px 10px 5px 10px;
+}
+#cms a:hover.ItemTesttool.navButton {
+	background-color: steelblue;
+	color: white;
+	padding: 10px;
+}
+#cms a.HyperItem /* ? */ {
+	color: Black; text-decoration: none;
+	font-weight: bold;
+}
+#cms a:hover.HyperItem /* ? */ {
+	color: #008381; text-decoration: none;
+	font-weight: bold;
+}
+#cms a[onClick]:hover.Item /* ? */ {
+	color: Black; text-decoration: none;
+}
+#cms a:hover.Item /*allgemeine Links, Hauptmenuelink*/ {
+	color: #0086CC; /*tw-blau*/
+	text-decoration: underline;
+}
+#cms a.Item2 /* zB in den Lehrveranstaltungen (Buttons) verwendet bei den Lektoren */ {
+	color: Black; text-decoration: none;
+}
+#cms a:hover.Item2 /* zB in den Lehrveranstaltungen (Buttons) verwendet bei den Lektoren */ {
+	color: #008381; text-decoration: none;
+}
+#cms a.MenuItem /* Hauptmenuelink zum aufklappen */ {
+	color: #0086CC; text-decoration: none;
+	font-weight: bold;
+}
+#cms a:hover.MenuItem /* Hauptmenuelink zum aufklappen */ {
+	color: #0086CC; /*tw-blau*/
+	text-decoration: none;
+	font-weight: bold;
+}
+#cms a:focus.MenuItem /* Hauptmenuelink zum aufklappen */ {
+	color: #0086CC; /*tw-blau*/
+	text-decoration: none;
+	font-weight: bold;
+}
+#cms A.stpl_detail {
+	font-size:x-small;
+	color:#000000;
+	text-decoration:none;
+}
+#cms A.stpl_detail:hover {	
+	font-size:x-small;
+	color:#000000;
+	text-decoration:underline;
+	/*cursor:hand;*/
+}
+#cms a.head {
+   color:#ffffff;
+}
+#cms a.head:hover {
+	color:#000000;
+}
+
+
+/*
+==== Tables ====
+*/
+#cms TABLE {
+	font-size: 13px;
+}
+#cms TABLE.header {
+	width:100%;
+	height:100%;
+	/* background-image:url(../skin/images/header.png); */
+	/* background-repeat:no-repeat; */
+	background-color: white;
+	position: relative;
+}
+#cms TABLE.header_content {
+	height: 13%;
+	width: 100%;
+	position: absolute;
+	z-index:4;
+}
+/* Firefox Hack, da er den absolute-Wert der position als einziger nicht richtig dargestellt hat*/
+#cms @-moz-document url-prefix() {
+    TABLE.header_content
+    #cms {
+        height: 13%;
+		width: 100%;
+		position: relative;
+		z-index:4;
+    }
+}
+#cms TABLE.cmstable /* Die Haupttable aller CMS-Contentseiten */ {
+	margin: 0px;
+	padding: 0px;
+	border: none;
+	width: 100%;
+}
+#cms TABLE.tabcontent {
+	margin: 0px;
+	padding: 0px;
+	border-style: none;
+	width: 100%;
+	background-color: white;
+	vertical-align: top;
+	border-spacing:0;
+}
+#cms TABLE.menue {
+	margin: 0px;
+	padding: 0px;
+	border-style: none;
+	width: 100%;
+}
+#cms TABLE.menue TD {
+	padding-bottom: 2px;
+	padding-top: 2px;
+}
+#cms TABLE.tabcontent2 {
+	margin: 0px;
+	padding: 0px;
+	border-style: none;
+}
+#cms TABLE.tabborder {
+	width: 100%;
+	/*border: 1px solid black; foo*/
+}
+#cms TABLE#tabterm {
+	margin:auto;
+}
+
+#cms .well {
+	background-color: white;
+	border: 2px solid #add4ea;
+}
+#cms td.rand /* Seitenraender des CIS */ {
+	font-size: 11px;
+	padding-top: 0px;
+	padding-left: 6px;
+	width: 3%;
+	height: 100%;
+	vertical-align: middle;
+}
+#cms td.boxshadow /* Farbverlauf im Hintergrund der CIS*/ {
+	position: relative;
+	width:94%;
+	height: 100%;
+	box-shadow: 0px 100px 0px 0px #FFFFFF, /* Unterer weisser Rand bei sehr kleinen Aufloesungen */
+				0px 0px 5px 5px #888, /* schmaler dunkler Schatten */
+				/*0px 300px 5px 5px #888, /* schmaler dunkler Schatten unten bei sehr kleinen Aufloesungen*/
+				20px 20px 70px 30px #DDDDDD, /* heller Verlauf rechts */
+				-20px 20px 70px 30px #DDDDDD; /* heller Verlauf links */
+}
+#cms td.ContentHeader {
+	background-color: #A5AFB6; /*#DCE4EF;*/
+	font-weight: bold;
+	height: 19px;
+}
+#cms td.ContentHeader2 {
+	color: #0086CC; /*tw-blau */
+	font-weight: normal;
+}
+#cms td.ContentHeader3 {
+	color: #0086CC;; /*tw-blau */
+	font-weight: bold;
+}
+#cms td.MarkLine {
+	background-color: #F2F2F2; /*wie EEEEEE; also grau fast weiss */
+}
+#cms td.HeaderTesttool /*fuer die Button-Optik beim Testtool*/ {
+	color: #FFFFFF;
+	background-color: #00639C;
+	white-space:nowrap;
+	line-height: 25px;
+	box-shadow: inset 0 0 2px #FFFFFF;
+	padding: 10px;
+	width: 170px;
+}
+#cms td.HeaderTesttoolSTG /*fuer die Button-Optik der Quereinstiegs-Studiengänge beim Testtool*/ {
+	color: white;
+	border: 2px solid #73a9d6;
+	padding: 10px;
+	max-width: 100px;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: normal;
+}
+#cms td.Inaktiv  /*fuer Inaktive Items bei der Raumbeschreibung */ {
+  background-color: #F2F2F2; /*wie EEEEEE; also grau fast weiss */
+  color: #CFCFCF;
+  text-decoration: line-through;
+}
+#cms td.ItemTesttool /*fuer die Button-Optik beim Testtool*/ {
+	color: #000;
+	white-space: initial;
+	box-shadow: inset 0 0 2px #00639C;
+	width: 170px;
+	display: inline-block;
+}
+#cms td:hover.ItemTesttool {
+	color: #000;
+	white-space: initial;
+	box-shadow: inset 0px 0px 2px 2px #00639C;
+	width: 170px;
+	display: inline-block;
+}
+#cms td.ItemTesttoolAktiv /*fuer die Button-Optik beim Testtool*/ {
+	color: #000;
+	white-space: initial;
+	box-shadow: 0px 0px 2px 2px #00639C;
+}
+#cms td.ItemTesttoolBeendet /*fuer die Button-Optik beim Testtool*/ {
+	background-color: #FFFFFF;
+	white-space: initial;
+	box-shadow: inset 0px 0px 2px 2px #EAECED;
+}
+#cms td:hover.ItemTesttoolBeendet {
+	color: #EAECED;
+	background-color: #FFFFFF;
+	white-space: initial;
+	box-shadow: inset 0px 0px 2px 2px #EAECED;
+}
+#cms div.TesttoolTitle /* Ueberschrift auf den Titelfolien */ {
+	font-size: 400%;
+	font-family: Helvetica, Arial, sans-serif;
+	text-transform: uppercase;
+	color: #FFFFFF;
+	white-space: nowrap;
+	text-shadow: -1px 0 #00639C, 0 1px #00639C, 1px 0 #00639C, 0 -1px #00639C;
+	margin: 0 0 20px 0;
+}
+#cms td.tdwidth10 {
+	width: 5px;
+	/* width: 10px; */
+}
+#cms td.tdwidth30 {
+	width: 30px;
+}
+#cms td.tdgreen {
+	background-color: #CCFFCC;
+}
+#cms td.tdborder {
+	text-align: center;
+	border:2px solid black;
+	background-color: #ffffff;
+}
+#cms td.tdwrap {
+	white-space: nowrap;
+	color: #0086CC;
+}
+#cms td.tdvertical /* Für Ausrichtung der Icons bei der LV-Übersicht */ {
+	vertical-align: top;
+	padding: 10px 0 10px 0;
+	width: 33.33%;
+	/* height: 100px; */
+}
+#cms td.menubox /* Navigationsboxen in den CIS-Contentseiten */ {
+	width: 20%;
+	height: 10px;
+	background-color: #eeeeee;
+	padding: 20px 15px 20px 15px;
+	vertical-align: middle;
+}
+#cms td.menubox p {
+	line-height: 110%;
+}
+#cms td.cmscontent {
+	vertical-align: top;
+	padding-right: 25px;
+	padding-left: 0px;
+}
+#cms td.teambox {
+	vertical-align: top;
+	padding-top: 20px;
+}
+#cms TR.liste {
+	background-color: #D3DCE3; /*grau wie #DDDDDD*/
+}
+#cms TR.liste0 {
+	background-color: #FFFFFF; /*wei�*/
+}
+#cms TR.liste1 {
+	background-color: #EEEEEE; /*grau fast wei�*/
+}
+#cms TR.tryellow {
+	background-color: #FFFF99;
+}
+
+/* private/profile/zeitsperre.php */
+#cms TABLE#zeitsperren {
+	/*border: 1px solid black; foo*/
+	width:100%;
+}
+#cms TABLE#zeitsperren TH {
+	background-color: #DDDDDD; /*hellgrau*/
+}
+#cms TABLE#zeitsperren TH.feiertag {
+	background-color: #FFFF00; /*grelles gelb*/
+}
+#cms TABLE#zeitsperren TD.feiertag {
+	background-color: #FFFF22; /*bissi helleres gelb*/
+}
+#cms TABLE#zeitsperren TD {
+	background-color: #EEEEEE; /*grau fast wei�*/
+}
+
+/*
+==== Stundenplan ====
+*/
+
+#cms TABLE.stdplan {
+	margin: 0px;
+	padding: 0px;
+	/* border: 1px solid; */
+	width: 100%;
+	background-color: white;
+	vertical-align: top;
+	border-spacing:1;
+}
+#cms TABLE.stdplan TH {
+	background-color: #A5AFB6;
+}
+#cms TABLE.stdplan TD {
+	background-color: #E9ECEE;
+}
+
+/*reservation delete-"x"*/
+#cms TABLE.stdplan div.reservdelete {
+	text-align: right;
+	margin-bottom:-4px;
+	padding-top: 2px;
+	padding-right: 2px;
+}
+
+#cms .row-even { /*liste1*/
+ background-color:#f2f2f2;
+}
+
+#cms .row-odd { /*liste0*/
+  background-color:#ffffff;
+}
+
+/*lecturer reservation rows*/
+#cms td.lecturercell {
+	border: 1px solid;
+}
+
+#cms td.lecturercell div.lecturercellname {
+	width: 95%;
+	float: left;
+}
+
+#cms td.lecturercell div.lecturercelldelete {
+	width: 5%;
+	float: left;
+	text-align: right;
+	cursor: pointer;
+}
+
+/*
+==== Fonts ====
+*/
+
+#cms h1 {
+	color: black;
+	padding: 0px;
+	padding-bottom: 20px;
+	/* padding-left: 10px; */
+	/* width:20%; */
+	margin:0px;
+	white-space:nowrap;
+	font-size: 20px;
+	/* letter-spacing: 2px;
+	border-bottom:solid 1px #0086CC;*/
+	font-weight:normal;
+}
+#cms h1 td {
+	color: #ffffff;
+	background-color: #009e84;
+}
+#cms h2 {
+	margin: 0px;
+	padding-top: 0px;
+	padding-bottom: 15px;
+	/* padding-left: 10px; */
+	font-weight: bold;
+	font-size: 15px;
+}
+#cms h3 {
+	margin: 0px;
+	padding-top: 0px; /* 20px */
+	padding-bottom: 2px;
+	font-weight: bold;
+	font-size:13px;
+}
+#cms h4 {
+	margin: 0px;
+	padding: 0px;
+	text-decoration: underline;
+	font-weight: normal;
+	font-size:13px;
+}
+#cms .error {
+	color: #ff0000;
+}
+#cms #news .news {
+	width: 99%;
+	background-color: #A5AFB6; /* grauvariante A5AFB6 */
+}
+#cms #news .news .titel table {
+	padding: 3px 10px 3px 10px;
+	color: #ffffff;
+	font-weight: 500;
+	border-collapse: initial;
+}
+#cms #news .news .text {
+	background-color: #E9ECEE; /* grauvariante E9ECEE */
+	padding: 10px;
+}
+
+/* Margin von ersten und letzten P tag entfernen, da sonst
+   breite Raender entstehen koenne*/
+#cms #news .news .text p:first-child {
+	margin-top:0px;
+
+}
+#cms #news .news .text p:last-child {
+	margin-bottom:0px;
+}
+
+/*
+==== Images ====
+*/
+#cms img.testtoolfrage {
+	max-width:400px;
+	max-height:300px;
+}
+#cms img.testtoolvorschlag {
+	max-width:200px;
+	max-height:150px;
+}
+#cms img {
+	border: 0;
+}
+#cms img.lvplanbutton {
+	border:0;
+	vertical-align: bottom;
+}
+#cms img#layout {
+	border: 1px solid #AAAAAA;
+}
+#cms img.lv {
+	width: 40px;
+	height: 40px;
+	padding-bottom: 5px;
+}
+#cms /*img.header_left {
+	position: absolute;
+	left: 0px;
+	z-index: 1;
+	max-width: 100%;
+	height: 16%;
+}
+#cms img.header_right {
+	position: absolute;
+	right: 0px;
+	z-index: 2;
+	max-width: 100%;
+	height: 16%;
+}*/
+#cms img.header_logo {
+	position: absolute;
+	left: 16px;
+	top: 3%;
+	z-index: 5000;
+	height: 8%;
+}
+#cms img.screenshot_boxshadow {
+	border: 1px solid grey;
+	box-shadow: 0px 0px 5px 5px #888888;
+	margin-left: 10px;
+}
+#cms a:hover img.screenshot_boxshadow {
+	border: 1px solid grey;
+	box-shadow: 0px 0px 5px 5px #0086CC;
+	margin-left: 10px;
+}
+/*
+==== Farben ====
+*/
+
+#cms .grey {
+	color: #999999;
+}
+#cms #bgcolor0 {
+	background-color: #CC0000;
+}
+#cms #bgcolor1 {
+	background-color: #FF2200;
+}
+#cms #bgcolor2 {
+	background-color: #FF9922;
+}
+#cms #bgcolor3 {
+	background-color: #FFFF55;
+}
+#cms #bgcolor4 {
+	background-color: #88FF88;
+}
+#cms #bgcolor5 {
+	background-color: #AAFFAA;
+}
+#cms #bgcolor6 {
+	background-color: #CCFFCC;
+}
+#cms .studentnote {
+	font-weight:bold;
+}
+#cms .benotungstool_tabs {
+	border-top: 1px solid gray;
+	border-left: 1px solid gray;
+	border-right: 1px solid gray;
+	text-align: center;
+}
+#cms .benotungstool_tabs_active {
+	border-top: 2px solid gray;
+	border-left: 2px solid gray;
+	border-right: 2px solid gray;
+	background-color: #eeeeee;
+	text-align: center;
+}
+#cms .benotungstool_subtab {
+	border-top: 1px solid gray;
+	border-bottom: 1px solid gray;
+}
+#cms .ok {
+	color: green;
+}
+#cms .ausblenden {display:none;}
+#cms .einblenden {display:block;}
+
+/* Inaktive Elemente in einem DropDown */
+#cms option.inactive {
+	text-decoration:line-through;
+}
+
+/* Difference Engine */
+#cms .diffchange-inline {
+	background-color: yellow;
+}
+#cms .diff-deletedline {
+	background-color: lightgray;
+}
+#cms .diff-marker {
+	background-color: none;
+}
+#cms .diff-addedline {
+	background-color: lightgreen;
+}
+
+#cms .suchmarker {
+	font-weight: bold;
+	text-decoration: underline;
+	font-size: medium;
+}
+#cms .suchergebnis:hover {
+	background-color: #EEEEEE;
+}
+#cms .suchergebnis a {
+	font-weight: bold;
+}
+#cms .suchergebnis {
+	padding-bottom: 15px;
+}
+#cms .suchicon {
+	margin:0px;
+	height: 14px;
+}
+#cms .suchicon:hover {
+	cursor:pointer;
+	cursor:hand;
+}
+
+/*
+==== Kalender-Jump-Effekt im LV-Plan ====
+*/
+#cms div.hoverbox div.preview div.hoverbox_inhalt {
+	display:none;
+	vertical-align: top;
+}
+#cms div.preview {
+	position: relative;
+	vertical-align: top;
+}
+#cms div.hoverbox div.preview:hover div.hoverbox_inhalt {
+	display: block;
+	position: absolute;
+	top: 15px;
+	left: -190px;
+	z-index: 2;
+	border:1px;
+	border-color:grey;
+	background-color:white;
+}
+#cms table.hoverbox {
+	border:1px;
+	border-style:solid;
+	border-color:grey;
+	padding: 5px;
+}
+
+/*
+==== Gestaltung des Hauptmenues ====
+*/
+
+#cms ul.menu {
+	padding:0;
+	margin:0;
+	font-family:Arial, Helvetica, sans-serif;
+	color:#0086CC;
+	font-size:13px;
+	line-height:15px;
+	width:200px;
+	list-style-type:none;
+}
+#cms #menu {
+	padding:0;
+	margin:0;
+	font-family:Arial, Helvetica, sans-serif;
+	color:#0086CC;
+	font-size:13px;
+	line-height:18px;
+	width:200px;
+	list-style-type:none;
+}
+#cms #menu a {
+	display:block;
+	padding:0 0 0 5px;
+	outline:none;
+	text-decoration:none;
+}
+#cms #menu li {
+	margin:0 0 0 10px;
+	padding: 5px 0 0 0;
+	display:block;
+	border:1px solid #FFFFFF;
+}
+#cms #menu a.selected {
+	padding:0 0 0 5px;
+}
+#cms #menu a:hover {
+	text-decoration: underline;
+}
+#cms #menu a.leaf {
+	color: #616B71;
+	padding-left: 5px;
+}
+
+
+/* LV Angebot im Studienplan */
+#cms .angebot {
+	border: 1px solid #edd400;
+}
+
+/* Empfehlung im Studienplan */
+#cms .empfehlung {
+	border: 1px solid green;
+}
+
+/*
+==== Menubox-Effekt am Seitenrand. Nettes Feature aber dzt. nicht sinnvoll einsetzbar ====
+*/
+
+#cms.bewerbung table,
+#cms.anwesenheit table {
+	border-collapse: collapse;
+	width: 100%;
+}
+
+#cms.bewerbung table.reihungstest,
+#cms.anwesenheit table {
+	table-layout: fixed;
+}
+
+#cms.bewerbung table th,
+#cms.bewerbung table td,
+#cms.anwesenheit table th,
+#cms.anwesenheit table td {
+	padding: 3px;
+	border: 1px solid black;
+	text-align: center;
+}
+
+#cms.bewerbung table.reihungstest td:nth-child(5) {
+	text-align: left;
+}
+
+#cms.bewerbung .ui-tabs-vertical .ui-tabs-panel {
+	width: 75em;
+}
+
+#cms.bewerbung table.reihungstest th:nth-child(1),
+#cms.bewerbung table.reihungstest th:nth-child(2),
+#cms.bewerbung table.reihungstest th:nth-child(3),
+#cms.bewerbung table.reihungstest th:nth-child(4),
+#cms.bewerbung table.reihungstest th:nth-child(6) {
+	width: 10%;
+}
+
+#cms.bewerbung table.reihungstest th:nth-child(5) {
+	width: 50%;
+}
+
+#cms.anwesenheit {
+	padding-bottom: 20px;
+}
+
+#cms.anwesenheit div.lv {
+	margin: 10px;
+	padding-top: 10px;
+	padding-left: 10px;
+	background-color: #f2f8ff;
+	border: 1px solid #2353b2;
+}
+
+#cms.anwesenheit div.lv + div.lv {
+/*	border-top: 1px dashed rgb(193,193,193);*/
+}
+
+#cms.anwesenheit div.lv > div {
+	width: 300px;
+	display: inline-block;
+	vertical-align: middle;
+}
+
+#cms.anwesenheit div.progress-wrapper {
+	border: 1px solid black;
+}
+
+#cms.anwesenheit div.progress {
+	height: 20px;
+}
+
+#cms.anwesenheit div.progress.green {
+	background-color: #008000;
+}
+
+#cms.anwesenheit div.progress.yellow {
+	background-color: #ffa500;
+}
+
+#cms.anwesenheit div.progress.red {
+	background-color: #dc143c;
+}
+
+#cms.anwesenheit span.fehlstunden-details {
+	cursor: pointer;
+	font-weight: bold;
+}
+
+#cms.anwesenheit table {
+	margin: 5px;
+}
+
+#cms.anwesenheit form {
+	margin: 10px;
+}
+
+#cms div.header_logo {
+	position: absolute;
+	left: 16px;
+	top: 3%;
+	z-index: 5000;
+
+	background-image:url(styles/tw/logo_250x130.png);
+	background-repeat: no-repeat;
+	width:170px;
+	height:51px;
+	background-size: contain;
+}
+
+#cms td.headerbar {
+	background-image: url(styles/tw/header.png);
+	background-position: top;
+	background-repeat: repeat-x;"
+}
+
+#cms div.cis_logo {
+	background-image:url(styles/tw/cis_logo_text_400x78.png);
+	background-repeat: no-repeat;
+	width: 400px;
+	height: 78px;
+}
diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js
new file mode 100644
index 000000000..09896e521
--- /dev/null
+++ b/public/js/apps/Cis.js
@@ -0,0 +1,7 @@
+import FhcSearchbar from "../components/searchbar/searchbar.js";
+
+Vue.createApp({
+    components: {
+        FhcSearchbar
+    }
+}).mount('#cis-navigation-top');
\ No newline at end of file
diff --git a/public/js/apps/Dashboard/Admin.js b/public/js/apps/Dashboard/Admin.js
new file mode 100644
index 000000000..05734fb28
--- /dev/null
+++ b/public/js/apps/Dashboard/Admin.js
@@ -0,0 +1,12 @@
+import {CoreNavigationCmpt} from '../../components/navigation/Navigation.js';
+import DashboardAdmin from '../../components/Dashboard/Admin.js';
+
+Vue.createApp({
+  data: () => ({
+      appSideMenuEntries: {}
+    }),
+  components: {
+    CoreNavigationCmpt,
+    DashboardAdmin
+  }
+}).mount('#main');
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
new file mode 100644
index 000000000..661d6ebb2
--- /dev/null
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -0,0 +1,10 @@
+import FhcDashboard from '../../components/Dashboard/Dashboard.js';
+
+Vue.createApp({
+  data: () => ({
+      appSideMenuEntries: {}
+    }),
+  components: {
+    FhcDashboard
+  }
+}).mount('#content');
diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index 28366d073..8e4c19d40 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -350,6 +350,8 @@ $tabellen=array(
 	"wawi.tbl_aufteilung_default"  => array("aufteilung_id","kostenstelle_id","oe_kurzbz","anteil","insertamum","insertvon","updateamum","updatevon"),
 );
 
+require_once('dbupdate_3.4/25999_cis4_cms.php');
+
 $tabs=array_keys($tabellen);
 //print_r($tabs);
 $i=0;
diff --git a/system/dbupdate_3.4/25999_cis4_cms.php b/system/dbupdate_3.4/25999_cis4_cms.php
new file mode 100644
index 000000000..5ff40d1d0
--- /dev/null
+++ b/system/dbupdate_3.4/25999_cis4_cms.php
@@ -0,0 +1,17 @@
+<?php
+if (! defined('DB_NAME')) exit('No direct script access allowed');
+
+// Add index to system.tbl_log
+if(!$result = @$db->db_query("SELECT xslt_xhtml_c4 FROM campus.tbl_template LIMIT 1"))
+{
+	$qry = "ALTER TABLE campus.tbl_template ADD COLUMN xslt_xhtml_c4 xml;";
+
+	if(!$db->db_query($qry))
+		echo '<strong>campus.tbl_template: '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>campus.tbl_template: Spalte xslt_xhtml_c4 hinzugefuegt';
+
+	// TODO(chris): add default values
+}
+
+$tabellen['campus.tbl_template'][] = 'xslt_xhtml_c4';

From c56b774d1d6291d387c74acea5b4b1cd6b9eb36a Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 15 Dec 2022 09:42:28 +0100
Subject: [PATCH 0053/1461] 3 Versions

---
 application/config/routes.php                 |   3 +-
 application/controllers/CisHmvc.php           | 286 ++++++++++++
 application/controllers/CisHmvc/Cms.php       | 100 +++++
 application/controllers/CisHtml/Cms.php       |  70 +++
 application/controllers/CisHtml/Dashboard.php |  35 ++
 application/controllers/CisVue/Cms.php        |  70 +++
 .../controllers/{cis => CisVue}/Dashboard.php |   2 +-
 application/controllers/cis/Cms.php           | 120 -----
 application/controllers/components/CisVue.php |  43 ++
 application/libraries/CisHmvc/Loader.php      | 420 ++++++++++++++++++
 application/libraries/CmsLib.php              | 275 ++++++++++++
 application/models/content/Content_model.php  |  45 +-
 application/models/content/News_model.php     |  91 ++++
 .../models/organisation/Studiengang_model.php |  49 +-
 .../models/person/Benutzerfunktion_model.php  |  32 ++
 .../Cis/Cms/News/Xml/Address/Detailed.php     |  11 +
 .../views/Cis/Cms/News/Xml/Address/Short.php  |   6 +
 .../views/Cis/Cms/News/Xml/NewsExtras.php     |  46 ++
 application/views/CisHmvc/Cms/Content.php     |  18 +
 application/views/CisHmvc/Cms/Legacy.php      |  23 +
 application/views/{cis => CisHmvc}/Error.php  |   0
 application/views/CisHtml/Cms/Content.php     |  17 +
 application/views/CisHtml/Dashboard.php       |  19 +
 application/views/CisHtml/Error.php           |  18 +
 .../views/{cis/cms => CisVue/Cms}/Content.php |   4 +-
 .../views/{cis => CisVue}/Dashboard.php       |   6 +-
 application/views/templates/CIS-Header.php    | 161 -------
 .../views/templates/CISHMVC-Footer.php        |   1 +
 .../views/templates/CISHMVC-Header.php        |  37 ++
 .../views/templates/CISHMVC-Menu/Entry.php    |  37 ++
 .../{CIS-Footer.php => CISHTML-Footer.php}    |   4 +-
 .../views/templates/CISHTML-Header.php        |  60 +++
 .../{CIS-Menu => CISHTML-Menu}/Entry.php      |  10 +-
 .../{CIS-Menu => CISHTML-Menu}/EntryBase.php  |   2 +-
 .../EntryInclude.php                          |   0
 application/views/templates/CISVUE-Footer.php |  19 +
 application/views/templates/CISVUE-Header.php |  23 +
 cis.php                                       | 316 +++++++++++++
 public/css/Cis4/Cis.css                       | 391 +++++++++++-----
 public/css/Cis4/Cms.css                       |  37 +-
 public/css/Cis4/Legacy.css                    |   4 +
 public/js/apps/Cis.js                         |  71 ++-
 public/js/components/Cis/Menu.js              |  57 +++
 public/js/components/Cis/Menu/Entry.js        | 114 +++++
 public/js/components/Cis/Navigation/Left.js   |  88 ++++
 public/js/components/Cis/Navigation/Top.js    |  63 +++
 public/js/components/Cis/Navigation/User.js   |  22 +
 system/dbupdate_3.4/25999_cis4_cms.php        |  13 +
 48 files changed, 2909 insertions(+), 430 deletions(-)
 create mode 100644 application/controllers/CisHmvc.php
 create mode 100644 application/controllers/CisHmvc/Cms.php
 create mode 100644 application/controllers/CisHtml/Cms.php
 create mode 100644 application/controllers/CisHtml/Dashboard.php
 create mode 100644 application/controllers/CisVue/Cms.php
 rename application/controllers/{cis => CisVue}/Dashboard.php (91%)
 delete mode 100644 application/controllers/cis/Cms.php
 create mode 100644 application/controllers/components/CisVue.php
 create mode 100644 application/libraries/CisHmvc/Loader.php
 create mode 100644 application/libraries/CmsLib.php
 create mode 100644 application/views/Cis/Cms/News/Xml/Address/Detailed.php
 create mode 100644 application/views/Cis/Cms/News/Xml/Address/Short.php
 create mode 100644 application/views/Cis/Cms/News/Xml/NewsExtras.php
 create mode 100644 application/views/CisHmvc/Cms/Content.php
 create mode 100644 application/views/CisHmvc/Cms/Legacy.php
 rename application/views/{cis => CisHmvc}/Error.php (100%)
 create mode 100644 application/views/CisHtml/Cms/Content.php
 create mode 100644 application/views/CisHtml/Dashboard.php
 create mode 100644 application/views/CisHtml/Error.php
 rename application/views/{cis/cms => CisVue/Cms}/Content.php (53%)
 rename application/views/{cis => CisVue}/Dashboard.php (58%)
 delete mode 100644 application/views/templates/CIS-Header.php
 create mode 100644 application/views/templates/CISHMVC-Footer.php
 create mode 100644 application/views/templates/CISHMVC-Header.php
 create mode 100644 application/views/templates/CISHMVC-Menu/Entry.php
 rename application/views/templates/{CIS-Footer.php => CISHTML-Footer.php} (94%)
 create mode 100644 application/views/templates/CISHTML-Header.php
 rename application/views/templates/{CIS-Menu => CISHTML-Menu}/Entry.php (60%)
 rename application/views/templates/{CIS-Menu => CISHTML-Menu}/EntryBase.php (93%)
 rename application/views/templates/{CIS-Menu => CISHTML-Menu}/EntryInclude.php (100%)
 create mode 100644 application/views/templates/CISVUE-Footer.php
 create mode 100644 application/views/templates/CISVUE-Header.php
 create mode 100644 cis.php
 create mode 100644 public/css/Cis4/Legacy.css
 create mode 100644 public/js/components/Cis/Menu.js
 create mode 100644 public/js/components/Cis/Menu/Entry.js
 create mode 100644 public/js/components/Cis/Navigation/Left.js
 create mode 100644 public/js/components/Cis/Navigation/Top.js
 create mode 100644 public/js/components/Cis/Navigation/User.js

diff --git a/application/config/routes.php b/application/config/routes.php
index 0dc1ecc73..63f9ab61e 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -61,7 +61,8 @@ $route['api/v1/organisation/[O|o]rganisationseinheit/(:any)'] = 'api/v1/organisa
 $route['api/v1/ressource/[B|b]etriebsmittelperson/(:any)'] = 'api/v1/ressource/betriebsmittelperson2/$1';
 $route['api/v1/system/[S|s]prache/(:any)'] = 'api/v1/system/sprache2/$1';
 
-$route['cis'] = 'cis/dashboard';
+$route['CisHtml'] = 'CisHtml/dashboard';
+$route['CisVue'] = 'CisVue/dashboard';
 
 // load routes from extensions
 $subdir = 'application/config/extensions';
diff --git a/application/controllers/CisHmvc.php b/application/controllers/CisHmvc.php
new file mode 100644
index 000000000..4d981d1e6
--- /dev/null
+++ b/application/controllers/CisHmvc.php
@@ -0,0 +1,286 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * 
+ */
+class CisHmvc extends FHC_Controller
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->load->library('AuthLib');
+		$this->load->library('PermissionLib');
+
+		$this->load->model('content/Content_model', 'ContentModel');
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * @param string $method
+	 * 
+	 * @return void
+	 */
+	public function _remap($method)
+	{
+		$this->index();
+	}
+
+	/**
+	 * @return void
+	 */
+	public function index()
+	{
+		$path = explode('/', uri_string());
+		array_shift($path); // NOTE(chris): remove cis4/
+		
+		$menu = $this->ContentModel->getMenu(6739, get_uid());
+		if (isError($menu)) {
+			// TODO(chris): Error Handling
+			return $this->load->view('CisHmvc/Error', ['error' => getError($menu)]);
+		}
+		$menu = getData($menu) ?? (object)['childs' => []];
+
+		$menu = $this->convertMenu($menu->childs, $path, APP_ROOT . 'index.ci.php/CisHmvc');
+		$current = ['childs' => $menu];
+		$params = $path;
+		
+		foreach ($path as $key) {
+			if (!isset($current['childs'][$key])) {
+				if ($current['childs'] == $menu)
+					$current = null;
+				break;
+			}
+			$current = $current['childs'][$key];
+			array_shift($params);
+		}
+		if (!$current) {
+			return $this->notfound();
+		}
+		switch ($current['orig']->template_kurzbz) {
+			case 'redirect': {
+				list ($url, $target) = $this->getRedirectUrlAndTarget($current['orig']->content);
+				if (substr($url, 0, 1) == '#')
+				{
+					$controller = 'CisHmvc';
+					$action = 'notfound';
+					break;
+				}
+				if ($target)
+				{
+					$controller = 'CisHmvc';
+					$action = 'redirect';
+					array_unshift($params, $url);
+					break;
+				}
+				if (preg_match('/^(\.\.\/|\.\/)*index\.ci\.php\/(.*)$/', $url, $matches))
+				{
+					list ($controller, $action, $p) = $this->getControllerMethodAndParamsFromUrl($matches[2]);
+					if (!$controller)
+					{
+						$controller = 'CisHmvc';
+						$action = 'notfound';
+					}
+					else
+					{
+						while (count($p))
+							array_unshift($params, array_pop($p));
+					}
+					break;
+				}
+				if (preg_match('/^(\.\.\/|\.\/)*(addons|cms|cis)\/(.*)$/', $url, $matches))
+				{
+					$controller = 'CisHmvc/Cms';
+					$action = 'legacy';
+					array_unshift($params, $matches[2] . "/" . $matches[3]);
+					break;
+				}
+				
+				$controller = 'CisHmvc/cms';
+				$action = 'debug';
+				array_unshift($params, $current['orig']);
+				break;
+			}
+			case 'contentohnetitel':
+			case 'contentmittitel': {
+				$controller = 'CisHmvc/cms';
+				$action = 'content';
+				array_unshift($params, $current['orig']->content_id);
+				break;
+			}
+			default: {
+				$controller = 'CisHmvc/cms';
+				$action = 'debug';
+				array_unshift($params, $current['orig']);
+				break;
+			}
+		}
+
+		$className = ucfirst(basename($controller));
+		$path = APPPATH . 'controllers/' . dirname($controller) . '/' . $className . '.php';
+
+		#var_dump(is_loaded());
+		require_once $path;
+		foreach (is_loaded() as $k => $v)
+			if (!in_array($k, ['benchmark','hooks','config','log','utf8','uri','router','output','security','input','lang','loader']))
+				unset(is_loaded()[$k]);
+		
+		$this->router->directory = dirname($controller) . '/';
+		$this->router->class = $className;
+		$this->router->method = $action;
+
+		#var_dump($this->router->method);
+		$controller = new $className();
+		// NOTE(chris): this is needed because we loaded it in this controller and it can't be loaded twice
+		$controller->ContentModel = $this->ContentModel;
+
+		$this->load->library('CisHmvc/Loader', [$menu, $this->load], 'Cis4Loader');
+		$controller->load = $controller->Cis4Loader;
+		call_user_func_array(array(&$controller, $action), $params);
+	}
+
+	/**
+	 * @return void
+	 */
+	public function notfound()
+	{
+		set_status_header(404);
+		$this->load->view('CisHmvc/Error', ['error' => '404: Site Not Found']);
+	}
+
+	/**
+	 * @param uri_string	$url
+	 * 
+	 * @return void
+	 */
+	public function redirect($url)
+	{
+		redirect($url);
+	}
+
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Protected methods (move to lib?)
+
+	protected function getControllerMethodAndParamsFromUrl($url) {
+		$segments = explode('/', $url);
+		$path = '';
+		while ($possibleController = array_shift($segments)) {
+			if (file_exists(APPPATH . 'controllers/' . $path . ucfirst($possibleController) . '.php'))
+				return [$path . $possibleController, array_shift($segments) ?: 'index', $segments];
+			$path .= $possibleController . '/';
+		}
+		return [null, null, null];
+	}
+
+	protected function getRedirectUrlAndTarget($content) {
+		if (!$content)
+			return ['#', ''];
+
+		$url = '';
+		$target = '';
+
+		$xml = new DOMDocument();
+		$xml->loadXML($content);
+		if ($xml->getElementsByTagName('url')->item(0))
+			$url = $xml->getElementsByTagName('url')->item(0)->nodeValue;
+		// TODO(chris): get params
+		if (strpos($url, '$') !== FALSE)
+			var_dump($url);
+		if (isset($params) && is_array($params))
+			foreach ($params as $key=>$value)
+				$url = str_replace('$' . $key, addslashes($value), $url);
+		if ($xml->getElementsByTagName('target')->item(0))
+			$target = $xml->getElementsByTagName('target')->item(0)->nodeValue;
+
+		if (!$url)
+			$url = '#';
+
+		if (substr($url, 0, 1) == '#')
+			$target = '';
+		
+		if ($target == 'content' || $target == '_self')
+			$target = '';
+
+		return [$url, $target];
+	}
+
+	protected function convertMenu($items, $path, $path_prefix) {
+		$menu = [];
+		$current_path = array_shift($path);
+		foreach ($items as $item)
+		{
+			$entry = [];
+			$entry['template_kurzbz'] = 'cis';
+			$entry['content_id'] = $item->content_id;
+			$entry['titel'] = $item->titel;
+
+			$slug = $this->createSlug($item->titel);
+
+			$entry['active'] = ($slug == $current_path);
+			$entry['menu_open'] = $entry['active'];
+			$entry['url'] = $path_prefix . '/' . $slug;
+			$entry['target'] = '';
+
+			$entry['childs'] = $this->convertMenu($item->childs, $path, $entry['url']);
+			
+			if ($entry['active'])
+				$entry['orig'] = $item;
+
+			// TODO(chris): rewrite external and hash urls
+			if ($item->template_kurzbz == 'redirect')
+			{
+				list ($url, $target) = $this->getRedirectUrlAndTarget($item->content);
+				
+				if (substr($url, 0, 1) == '#')
+				{
+					$entry['url'] = $url;
+				}
+				elseif ($target)
+				{
+					$entry['url'] = $url;
+					$entry['target'] = $target;
+				}
+				/*elseif (substr($url, 0, 7) != '../cis/' && substr($url, 0, 7) != '../cms/' && substr($url, 0, 10) != '../addons/' && substr($url, 0, 16) != '../index.ci.php/' && substr($url, 0, 1) != '?')
+				{
+					var_dump($entry['url']);
+				}*/
+			}
+
+			$menu[$slug] = $entry;
+		}
+		return $menu;
+	}
+
+	/**
+	 * Function used to create a slug associated to an "ugly" string.
+	 *
+	 * @param string $text the string to transform.
+	 *
+	 * @return string the resulting slug.
+	 */
+	protected function createSlug($text) {
+		$table = [
+			'Š'=>'S', 'š'=>'s', 'Đ'=>'Dj', 'đ'=>'dj', 'Ž'=>'Z', 'ž'=>'z', 'Č'=>'C', 'č'=>'c', 'Ć'=>'C', 'ć'=>'c',
+			'À'=>'A', 'Á'=>'A', 'Â'=>'A', 'Ã'=>'A', 'Ä'=>'Ae', 'Å'=>'A', 'Æ'=>'A', 'Ç'=>'C', 'È'=>'E', 'É'=>'E',
+			'Ê'=>'E', 'Ë'=>'E', 'Ì'=>'I', 'Í'=>'I', 'Î'=>'I', 'Ï'=>'I', 'Ñ'=>'N', 'Ò'=>'O', 'Ó'=>'O', 'Ô'=>'O',
+			'Õ'=>'O', 'Ö'=>'Oe', 'Ø'=>'O', 'Ù'=>'U', 'Ú'=>'U', 'Û'=>'U', 'Ü'=>'Ue', 'Ý'=>'Y', 'Þ'=>'B', 'ß'=>'Ss',
+			'à'=>'a', 'á'=>'a', 'â'=>'a', 'ã'=>'a', 'ä'=>'ae', 'å'=>'a', 'æ'=>'a', 'ç'=>'c', 'è'=>'e', 'é'=>'e',
+			'ê'=>'e', 'ë'=>'e', 'ì'=>'i', 'í'=>'i', 'î'=>'i', 'ï'=>'i', 'ð'=>'o', 'ñ'=>'n', 'ò'=>'o', 'ó'=>'o',
+			'ô'=>'o', 'õ'=>'o', 'ö'=>'oe', 'ø'=>'o', 'ù'=>'u', 'ú'=>'u', 'û'=>'u', 'ü'=>'ue', 'ý'=>'y', 'ý'=>'y', 'þ'=>'b',
+			'ÿ'=>'y', 'Ŕ'=>'R', 'ŕ'=>'r', '/' => '-', ' ' => '-'
+		];
+		$text = preg_replace(['/\s{2,}/', '/[\t\n]/'], ' ', $text);
+		$text = preg_replace('~[^\pL\d]+~u', '-', $text);
+		$text = strtr($text, $table);
+		$text = preg_replace('~^[^a-z]~i', '', $text);
+		return strtolower($text);
+	}
+
+}
diff --git a/application/controllers/CisHmvc/Cms.php b/application/controllers/CisHmvc/Cms.php
new file mode 100644
index 000000000..267543908
--- /dev/null
+++ b/application/controllers/CisHmvc/Cms.php
@@ -0,0 +1,100 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * 
+ */
+class Cms extends Auth_Controller
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct(
+			array(
+				'debug' => 'user:r',
+				'legacy' => 'user:r',
+				'content' => 'user:r',
+				'news' => 'user:r'
+			)
+		);
+
+		// Loads WidgetLib
+		$this->load->library('CmsLib');
+		#$this->load->library('WidgetLib');
+
+		// Loads phrases system
+		$this->loadPhrases([
+			'global'
+		]);
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * @param stdClass	$content
+	 * 
+	 * @return void
+	 */
+	public function debug($content)
+	{
+		$msg = $content->template_kurzbz . ' not yet implemented';
+		if ($content->template_kurzbz == 'redirect') {
+			$msg .= '<pre class="card p-1 mt-3">' . htmlentities($content->content) . '</pre>';
+		}
+		$this->load->view('CisHmvc/Error', ['error' => $msg]);
+	}
+
+	/**
+	 * @param string	$url
+	 * 
+	 * @return void
+	 */
+	public function legacy($url)
+	{
+		$msg = $url;
+		$this->load->view('CisHmvc/Cms/Legacy', ['url' => $url]);
+	}
+
+	/**
+	 * @param int		$content_id
+	 * @param int		$version
+	 * @param string	$sprache
+	 * @param boolean	$sichtbar
+	 * 
+	 * @return void
+	 */
+	public function content($content_id, $version = null, $sprache = null, $sichtbar = true)
+	{
+		$content = $this->cmslib->getContent($content_id, $version, $sprache, $sichtbar);
+
+		if (isError($content))
+			return $this->load->view('CisHmvc/Error', ['error' => getError($content)]);
+
+		$this->load->view('CisHmvc/Cms/Content', ['content' => getData($content)]);
+	}
+
+	/**
+	 * @param boolean			$infoscreen
+	 * @param string | null		$studiengang_kz
+	 * @param int | null		$semester
+	 * @param boolean			$mischen
+	 * @param string			$titel
+	 * @param boolean			$edit
+	 * @param boolean			$sichtbar
+	 * 
+	 * @return void
+	 */
+	public function news($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
+	{
+		$news = $this->cmslib->getNews($infoscreen, $studiengang_kz, $semester, $mischen, $titel, $edit, $sichtbar);
+
+		if (isError($news))
+			return $this->load->view('CisHmvc/Error', ['error' => getError($news)]);
+
+		$this->load->view('CisHmvc/Cms/Content', ['content' => getData($news)]);
+	}
+}
diff --git a/application/controllers/CisHtml/Cms.php b/application/controllers/CisHtml/Cms.php
new file mode 100644
index 000000000..9ec22bea0
--- /dev/null
+++ b/application/controllers/CisHtml/Cms.php
@@ -0,0 +1,70 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * 
+ */
+class Cms extends Auth_Controller
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'content' => 'user:r',
+			'news' => 'user:r'
+		]);
+
+		// Loads Libraries
+		$this->load->library('CmsLib');
+
+		// Loads phrases system
+		$this->loadPhrases([
+			'global'
+		]);
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * @param int		$content_id
+	 * @param int		$version
+	 * @param string	$sprache
+	 * @param boolean	$sichtbar
+	 * 
+	 * @return void
+	 */
+	public function content($content_id, $version = null, $sprache = null, $sichtbar = true)
+	{
+		$content = $this->cmslib->getContent($content_id, $version, $sprache, $sichtbar);
+
+		if (isError($content))
+			return $this->load->view('CisHtml/Error', ['error' => getError($content)]);
+
+		$this->load->view('CisHtml/Cms/Content', ['content' => getData($content)]);
+	}
+
+	/**
+	 * @param boolean			$infoscreen
+	 * @param string | null		$studiengang_kz
+	 * @param int | null		$semester
+	 * @param boolean			$mischen
+	 * @param string			$titel
+	 * @param boolean			$edit
+	 * @param boolean			$sichtbar
+	 * 
+	 * @return void
+	 */
+	public function news($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
+	{
+		$news = $this->cmslib->getNews($infoscreen, $studiengang_kz, $semester, $mischen, $titel, $edit, $sichtbar);
+
+		if (isError($news))
+			return $this->load->view('CisHtml/Error', ['error' => getError($news)]);
+
+		$this->load->view('CisHtml/Cms/Content', ['content' => getData($news)]);
+	}
+}
diff --git a/application/controllers/CisHtml/Dashboard.php b/application/controllers/CisHtml/Dashboard.php
new file mode 100644
index 000000000..aa2d45a7d
--- /dev/null
+++ b/application/controllers/CisHtml/Dashboard.php
@@ -0,0 +1,35 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * 
+ */
+class Dashboard extends Auth_Controller
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct(
+			array(
+				'index' => 'user:r'
+			)
+		);
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * @return void
+	 */
+	public function index()
+	{
+		$this->load->view('CisHtml/Dashboard.php');
+	}
+
+	
+
+}
diff --git a/application/controllers/CisVue/Cms.php b/application/controllers/CisVue/Cms.php
new file mode 100644
index 000000000..9ec22bea0
--- /dev/null
+++ b/application/controllers/CisVue/Cms.php
@@ -0,0 +1,70 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * 
+ */
+class Cms extends Auth_Controller
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'content' => 'user:r',
+			'news' => 'user:r'
+		]);
+
+		// Loads Libraries
+		$this->load->library('CmsLib');
+
+		// Loads phrases system
+		$this->loadPhrases([
+			'global'
+		]);
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * @param int		$content_id
+	 * @param int		$version
+	 * @param string	$sprache
+	 * @param boolean	$sichtbar
+	 * 
+	 * @return void
+	 */
+	public function content($content_id, $version = null, $sprache = null, $sichtbar = true)
+	{
+		$content = $this->cmslib->getContent($content_id, $version, $sprache, $sichtbar);
+
+		if (isError($content))
+			return $this->load->view('CisHtml/Error', ['error' => getError($content)]);
+
+		$this->load->view('CisHtml/Cms/Content', ['content' => getData($content)]);
+	}
+
+	/**
+	 * @param boolean			$infoscreen
+	 * @param string | null		$studiengang_kz
+	 * @param int | null		$semester
+	 * @param boolean			$mischen
+	 * @param string			$titel
+	 * @param boolean			$edit
+	 * @param boolean			$sichtbar
+	 * 
+	 * @return void
+	 */
+	public function news($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
+	{
+		$news = $this->cmslib->getNews($infoscreen, $studiengang_kz, $semester, $mischen, $titel, $edit, $sichtbar);
+
+		if (isError($news))
+			return $this->load->view('CisHtml/Error', ['error' => getError($news)]);
+
+		$this->load->view('CisHtml/Cms/Content', ['content' => getData($news)]);
+	}
+}
diff --git a/application/controllers/cis/Dashboard.php b/application/controllers/CisVue/Dashboard.php
similarity index 91%
rename from application/controllers/cis/Dashboard.php
rename to application/controllers/CisVue/Dashboard.php
index d81536bec..0b964fe21 100644
--- a/application/controllers/cis/Dashboard.php
+++ b/application/controllers/CisVue/Dashboard.php
@@ -27,7 +27,7 @@ class Dashboard extends Auth_Controller
 	 */
 	public function index()
 	{
-		$this->load->view('cis/Dashboard.php');
+		$this->load->view('CisVue/Dashboard.php');
 	}
 
 	
diff --git a/application/controllers/cis/Cms.php b/application/controllers/cis/Cms.php
deleted file mode 100644
index 4698bc462..000000000
--- a/application/controllers/cis/Cms.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * 
- */
-class Cms extends Auth_Controller
-{
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct(
-			array(
-				'content' => 'user:r'
-			)
-		);
-
-		// Loads WidgetLib
-		$this->load->library('WidgetLib');
-
-		// Load Models
-		$this->load->model('content/Content_model', 'ContentModel');
-		$this->load->model('content/Contentgruppe_model', 'ContentgruppeModel');
-		$this->load->model('content/Template_model', 'TemplateModel');
-		if (defined('LOG_CONTENT') && LOG_CONTENT)
-			$this->load->model('system/Webservicelog_model', 'WebservicelogModel');
-
-		// Loads phrases system
-		$this->loadPhrases(
-			array()
-		);
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * @param int		$content_id
-	 * @param int		$version
-	 * @param string	$sprache
-	 * @param boolean	$sichtbar
-	 * 
-	 * @return void
-	 */
-	public function content($content_id, $version = null, $sprache = null, $sichtbar = true)
-	{
-		if(!is_numeric($content_id))
-			return $this->load->view('cis/Error.php', ['error' => 'ContentID ist ungueltig']);
-
-		if ($sprache === null)
-			$sprache = getUserLanguage();
-		
-		$islocked = $this->ContentgruppeModel->loadWhere(['content_id' => $content_id]);
-		if (isError($islocked))
-			return $this->load->view('cis/Error.php', ['error' => getError($islocked)]);
-		
-		if (getData($islocked)) {
-			$uid = getAuthUID();
-			$isberechtigt = $this->ContentgruppeModel->berechtigt($content_id, $uid);
-			if (isError($isberechtigt))
-				return $this->load->view('cis/Error.php', ['error' => getError($isberechtigt)]);
-
-			if (!getData($isberechtigt))
-				return $this->load->view('cis/Error.php', ['error' => 'global/keineBerechtigungFuerDieseSeite']);
-		}
-
-		$content = $this->ContentModel->getContent($content_id, $sprache, $version, $sichtbar, true);
-
-		if (isError($content))
-			return $this->load->view('cis/Error.php', ['error' => getError($content)]);
-
-		// Legt einen Logeintrag für die Klickstatistik an
-		if (defined('LOG_CONTENT') && LOG_CONTENT)
-		{
-			// Nur eingeloggte User werden geloggt, das sonst auch alle Infoscreenaufrufe und dgl. mitgeloggt werden
-			if (isLogged())
-			{
-				$request_data = 'content_id=' . $content_id;
-				if ($version !== null)
-					$request_data .= '&version=' . $version;
-				if ($sichtbar !== true)
-					$request_data .= '&sichtbar=' . $sichtbar;
-				$this->WebservicelogModel->insert([
-					'webservicetyp_kurzbz' => 'content',
-					'request_id' => $content_id,
-					'beschreibung' => 'content',
-					'request_data' => $request_data . '&sprache=' . $sprache,
-					'execute_time' => 'now()',
-					'execute_user' => getAuthUID()
-				]);
-			}
-		}
-
-		$content = getData($content);
-
-		//XSLT Vorlage laden
-		$template = $this->TemplateModel->load($content->template_kurzbz);
-		if (isError($template))
-			return $this->load->view('cis/Error.php', ['error' => getError($template)]);
-		$template = current(getData($template));
-
-		$XML = new \DOMDocument();
-		$XML->loadXML($content->content);
-
-		$xsltemplate = new \DOMDocument();
-		$xsltemplate->loadXML($template->xslt_xhtml_c4);
-
-		//Transformation
-		$processor = new \XSLTProcessor();
-		$processor->importStylesheet($xsltemplate);
-
-		$content = $processor->transformToXML($XML);
-		$content = str_replace('dms.php', APP_ROOT . 'cms/dms.php', $content);
-
-		$this->load->view('cis/cms/Content.php', ['content' => $content]);
-	}
-}
diff --git a/application/controllers/components/CisVue.php b/application/controllers/components/CisVue.php
new file mode 100644
index 000000000..b1a33ff69
--- /dev/null
+++ b/application/controllers/components/CisVue.php
@@ -0,0 +1,43 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the FilterCmptLib (back-end)
+ * Provides data to the ajax get calls about the filter component
+ * Listens to ajax post calls to change the filter data
+ * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
+ * NOTE: extends the FHC_Controller instead of the Auth_Controller because the FilterCmpt has its
+ * 	own permissions check
+ */
+class CisVue extends Auth_Controller
+{
+
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'Menu' => 'user:r'
+		]);
+
+		// Loads authentication library and starts authentication
+		$this->load->library('AuthLib');
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 */
+	public function Menu()
+	{
+		$this->load->model('content/Content_model', 'ContentModel');
+		$result = $this->ContentModel->getMenu(6739, get_uid());
+		$menu = getData($result) ?? (object)['childs' => []];
+
+		$this->outputJsonSuccess($menu);
+	}
+
+}
diff --git a/application/libraries/CisHmvc/Loader.php b/application/libraries/CisHmvc/Loader.php
new file mode 100644
index 000000000..9bb93a7b2
--- /dev/null
+++ b/application/libraries/CisHmvc/Loader.php
@@ -0,0 +1,420 @@
+<?php
+defined('BASEPATH') || exit('No direct script access allowed');
+/**
+ * Description of Cis4Loader
+ *
+ * @author chris
+ */
+class Loader extends CI_Loader
+{
+
+	const OVERWRITE_PARAMS = [
+		'vue3' => true,
+		'bootstrap5' => true,
+		'bootstrap3' => false,
+		'fontawesome6' => true,
+		'fontawesome4' => false,
+		'axios027' => true,
+		'customJSModules' => [
+			'public/js/apps/Cis.js'
+		],
+		'customCSSs' => [
+			'public/css/Cis4/Cis.css'
+		]
+	];
+	protected $coreOptions = null;
+	protected $loader = null;
+
+	public function __construct($params)
+	{
+		$this->loader = $params[1];
+		$this->coreOptions = ['menu' => $params[0]];
+	}
+
+	/**
+	 * View Loader
+	 *
+	 * Loads "view" files.
+	 *
+	 * @param	string	$view	View name
+	 * @param	array	$vars	An associative array of data
+	 *				to be extracted for use in the view
+	 * @param	bool	$return	Whether to return the view output
+	 *				or leave it to the Output class
+	 * @return	object|string
+	 */
+	public function view($view, $vars = array(), $return = FALSE)
+	{
+		if ($view == 'templates/FHC-Header' || $view == 'templates/FHC-Footer')
+		{
+			$overwrittenParams = array_merge($vars, self::OVERWRITE_PARAMS);
+			foreach (['customJSModules', 'customCSSs'] as $key)
+				if (isset($vars[$key]))
+					$overwrittenParams[$key] = array_merge(self::OVERWRITE_PARAMS[$key], $vars[$key]);
+
+			if ($view == 'templates/FHC-Header')
+			{
+				$view1 = $view;
+				$param1 = $overwrittenParams;
+				$view2 = 'templates/CISHMVC-Header';
+				$param2 = $this->coreOptions;
+			}
+			else
+			{
+				$view1 = 'templates/CISHMVC-Footer';
+				$param1 = $this->coreOptions;
+				$view2 = $view;
+				$param2 = $overwrittenParams;
+			}
+
+			if ($return)
+				return $this->loader->view($view1, $param1, $return) . $this->loader->view($view2, $param2, $return);
+
+			$this->loader->view($view1, $param1, $return);
+			$this->loader->view($view2, $param2, $return);
+		}
+		else
+		{
+			return $this->loader->view($view, $vars, $return);
+		}
+	}
+	
+	/**
+	 * Initializer
+	 *
+	 * @todo	Figure out a way to move this to the constructor
+	 *		without breaking *package_path*() methods.
+	 * @uses	CI_Loader::_ci_autoloader()
+	 * @used-by	CI_Controller::__construct()
+	 * @return	void
+	 */
+	public function initialize()
+	{
+		$this->loader->initialize();
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Is Loaded
+	 *
+	 * A utility method to test if a class is in the self::$_ci_classes array.
+	 *
+	 * @used-by	Mainly used by Form Helper function _get_validation_object().
+	 *
+	 * @param 	string		$class	Class name to check for
+	 * @return 	string|bool	Class object name if loaded or FALSE
+	 */
+	public function is_loaded($class)
+	{
+		return $this->loader->is_loaded($class);
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Library Loader
+	 *
+	 * Loads and instantiates libraries.
+	 * Designed to be called from application controllers.
+	 *
+	 * @param	mixed	$library	Library name
+	 * @param	array	$params		Optional parameters to pass to the library class constructor
+	 * @param	string	$object_name	An optional object name to assign to
+	 * @return	object
+	 */
+	public function library($library, $params = NULL, $object_name = NULL)
+	{
+		$this->loader->library($library, $params, $object_name);
+		return $this;
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Model Loader
+	 *
+	 * Loads and instantiates models.
+	 *
+	 * @param	mixed	$model		Model name
+	 * @param	string	$name		An optional object name to assign to
+	 * @param	bool	$db_conn	An optional database connection configuration to initialize
+	 * @return	object
+	 */
+	public function model($model, $name = '', $db_conn = FALSE)
+	{
+		$this->loader->model($model, $name, $db_conn);
+		return $this;
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Database Loader
+	 *
+	 * @param	mixed	$params		Database configuration options
+	 * @param	bool	$return 	Whether to return the database object
+	 * @param	bool	$query_builder	Whether to enable Query Builder
+	 *					(overrides the configuration setting)
+	 *
+	 * @return	object|bool	Database object if $return is set to TRUE,
+	 *					FALSE on failure, CI_Loader instance in any other case
+	 */
+	public function database($params = '', $return = FALSE, $query_builder = NULL)
+	{
+		$res = $this->loader->database($params, $return, $query_builder);
+		return $res == $this->loader ? $this : $res;
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Load the Database Utilities Class
+	 *
+	 * @param	object	$db	Database object
+	 * @param	bool	$return	Whether to return the DB Utilities class object or not
+	 * @return	object
+	 */
+	public function dbutil($db = NULL, $return = FALSE)
+	{
+		$res = $this->loader->dbutil($db, $return);
+		return $res === $this->loader ? $this : $res;
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Load the Database Forge Class
+	 *
+	 * @param	object	$db	Database object
+	 * @param	bool	$return	Whether to return the DB Forge class object or not
+	 * @return	object
+	 */
+	public function dbforge($db = NULL, $return = FALSE)
+	{
+		$res = $this->loader->dbforge($db, $return);
+		return $res === $this->loader ? $this : $res;
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Generic File Loader
+	 *
+	 * @param	string	$path	File path
+	 * @param	bool	$return	Whether to return the file output
+	 * @return	object|string
+	 */
+	public function file($path, $return = FALSE)
+	{
+		$res = $this->loader->file($path, $return);
+		return $res === $this->loader ? $this : $res;
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Set Variables
+	 *
+	 * Once variables are set they become available within
+	 * the controller class and its "view" files.
+	 *
+	 * @param	array|object|string	$vars
+	 *					An associative array or object containing values
+	 *					to be set, or a value's name if string
+	 * @param 	string	$val	Value to set, only used if $vars is a string
+	 * @return	object
+	 */
+	public function vars($vars, $val = '')
+	{
+		$res = $this->loader->vars($vars, $val);
+		return $res === $this->loader ? $this : $res;
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Clear Cached Variables
+	 *
+	 * Clears the cached variables.
+	 *
+	 * @return	CI_Loader
+	 */
+	public function clear_vars()
+	{
+		$this->loader->clear_vars();
+		return $this;
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Get Variable
+	 *
+	 * Check if a variable is set and retrieve it.
+	 *
+	 * @param	string	$key	Variable name
+	 * @return	mixed	The variable or NULL if not found
+	 */
+	public function get_var($key)
+	{
+		return $this->loader->get_var($key);
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Get Variables
+	 *
+	 * Retrieves all loaded variables.
+	 *
+	 * @return	array
+	 */
+	public function get_vars()
+	{
+		return $this->loader->get_vars();
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Helper Loader
+	 *
+	 * @param	string|string[]	$helpers	Helper name(s)
+	 * @return	object
+	 */
+	public function helper($helpers = array())
+	{
+		$this->loader->helper($helpers);
+		return $this;
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Load Helpers
+	 *
+	 * An alias for the helper() method in case the developer has
+	 * written the plural form of it.
+	 *
+	 * @uses	CI_Loader::helper()
+	 * @param	string|string[]	$helpers	Helper name(s)
+	 * @return	object
+	 */
+	public function helpers($helpers = array())
+	{
+		return $this->helper($helpers);
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Language Loader
+	 *
+	 * Loads language files.
+	 *
+	 * @param	string|string[]	$files	List of language file names to load
+	 * @param	string		Language name
+	 * @return	object
+	 */
+	public function language($files, $lang = '')
+	{
+		$this->loader->language($files, $lang);
+		return $this;
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Config Loader
+	 *
+	 * Loads a config file (an alias for CI_Config::load()).
+	 *
+	 * @uses	CI_Config::load()
+	 * @param	string	$file			Configuration file name
+	 * @param	bool	$use_sections		Whether configuration values should be loaded into their own section
+	 * @param	bool	$fail_gracefully	Whether to just return FALSE or display an error message
+	 * @return	bool	TRUE if the file was loaded correctly or FALSE on failure
+	 */
+	public function config($file, $use_sections = FALSE, $fail_gracefully = FALSE)
+	{
+		return $this->loader->config($file, $use_sections, $fail_gracefully);
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Driver Loader
+	 *
+	 * Loads a driver library.
+	 *
+	 * @param	string|string[]	$library	Driver name(s)
+	 * @param	array		$params		Optional parameters to pass to the driver
+	 * @param	string		$object_name	An optional object name to assign to
+	 *
+	 * @return	object|bool	Object or FALSE on failure if $library is a string
+	 *				and $object_name is set. CI_Loader instance otherwise.
+	 */
+	public function driver($library, $params = NULL, $object_name = NULL)
+	{
+		$res = $this->loader->driver($library, $params, $object_name);
+		return $res === $this->loader ? $this : $res;
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Add Package Path
+	 *
+	 * Prepends a parent path to the library, model, helper and config
+	 * path arrays.
+	 *
+	 * @see	CI_Loader::$_ci_library_paths
+	 * @see	CI_Loader::$_ci_model_paths
+	 * @see CI_Loader::$_ci_helper_paths
+	 * @see CI_Config::$_config_paths
+	 *
+	 * @param	string	$path		Path to add
+	 * @param 	bool	$view_cascade	(default: TRUE)
+	 * @return	object
+	 */
+	public function add_package_path($path, $view_cascade = TRUE)
+	{
+		$this->loader->add_package_path($path, $view_cascade);
+		return $this;
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Get Package Paths
+	 *
+	 * Return a list of all package paths.
+	 *
+	 * @param	bool	$include_base	Whether to include BASEPATH (default: FALSE)
+	 * @return	array
+	 */
+	public function get_package_paths($include_base = FALSE)
+	{
+		return $this->loader->get_package_paths($include_base);
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Remove Package Path
+	 *
+	 * Remove a path from the library, model, helper and/or config
+	 * path arrays if it exists. If no path is provided, the most recently
+	 * added path will be removed removed.
+	 *
+	 * @param	string	$path	Path to remove
+	 * @return	object
+	 */
+	public function remove_package_path($path = '')
+	{
+		$this->remove_package_path($path);
+		return $this;
+	}
+
+}
diff --git a/application/libraries/CmsLib.php b/application/libraries/CmsLib.php
new file mode 100644
index 000000000..896b15a1b
--- /dev/null
+++ b/application/libraries/CmsLib.php
@@ -0,0 +1,275 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * TODO(chris): NEWS: edit & delete button links and confirm
+ * TODO(chris): NEWS: news_infoscreen xlst
+ */
+class CmsLib
+{
+	/**
+	 * @var object
+	 */
+	protected $ci;
+
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		$this->ci =& get_instance();
+
+		// Load Models
+		$this->ci->load->model('content/Content_model', 'ContentModel');
+		$this->ci->load->model('content/Contentgruppe_model', 'ContentgruppeModel');
+		$this->ci->load->model('content/Template_model', 'TemplateModel');
+		if (defined('LOG_CONTENT') && LOG_CONTENT)
+			$this->ci->load->model('system/Webservicelog_model', 'WebservicelogModel');
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * @param int		$content_id
+	 * @param int		$version
+	 * @param string	$sprache
+	 * @param boolean	$sichtbar
+	 * 
+	 * @return void
+	 */
+	public function getContent($content_id, $version = null, $sprache = null, $sichtbar = true)
+	{
+		if(!is_numeric($content_id))
+			return error('ContentID ist ungueltig');
+
+		if ($sprache === null)
+			$sprache = getUserLanguage();
+		
+		$islocked = $this->ci->ContentgruppeModel->loadWhere(['content_id' => $content_id]);
+		if (isError($islocked))
+			return $islocked;
+		
+		if (getData($islocked)) {
+			$uid = getAuthUID();
+			$isberechtigt = $this->ci->ContentgruppeModel->berechtigt($content_id, $uid);
+			if (isError($isberechtigt))
+				return $isberechtigt;
+
+			if (!getData($isberechtigt))
+				return error('global/keineBerechtigungFuerDieseSeite');
+		}
+		#$this->load->model('content/Content_model', 'ContentModel');
+		$content = $this->ci->ContentModel->getContent($content_id, $sprache, $version, $sichtbar, true);
+
+		if (isError($content))
+			return $content;
+
+		// Legt einen Logeintrag für die Klickstatistik an
+		if (defined('LOG_CONTENT') && LOG_CONTENT)
+		{
+			// Nur eingeloggte User werden geloggt, das sonst auch alle Infoscreenaufrufe und dgl. mitgeloggt werden
+			if (isLogged())
+			{
+				$request_data = 'content_id=' . $content_id;
+				if ($version !== null)
+					$request_data .= '&version=' . $version;
+				if ($sichtbar !== true)
+					$request_data .= '&sichtbar=' . $sichtbar;
+				$this->ci->WebservicelogModel->insert([
+					'webservicetyp_kurzbz' => 'content',
+					'request_id' => $content_id,
+					'beschreibung' => 'content',
+					'request_data' => $request_data . '&sprache=' . $sprache,
+					'execute_time' => 'now()',
+					'execute_user' => getAuthUID()
+				]);
+			}
+		}
+
+		$content = getData($content);
+
+		//XSLT Vorlage laden
+		$template = $this->ci->TemplateModel->load($content->template_kurzbz);
+		if (isError($template))
+			return $template;
+		$template = current(getData($template));
+
+		$XML = new \DOMDocument();
+		$XML->loadXML($content->content);
+
+		$xsltemplate = new \DOMDocument();
+		$xsltemplate->loadXML($template->xslt_xhtml_c4);
+
+		//Transformation
+		$processor = new \XSLTProcessor();
+		$processor->importStylesheet($xsltemplate);
+
+		$content = $processor->transformToXML($XML);
+		$content = str_replace('dms.php', APP_ROOT . 'cms/dms.php', $content);
+
+		return success($content);
+	}
+
+	/**
+	 * @param stdClass		$stg_obj
+	 * 
+	 * @return stdClass
+	 */
+	protected function getNewsExtras($stg_obj, $semester)
+	{
+		$this->ci->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
+
+		$stg_ltg = $this->ci->StudiengangModel->getLeitungDetailed($stg_obj->studiengang_kz);
+		if (isError($stg_ltg))
+			return $stg_ltg;
+		$stg_ltg = getData($stg_ltg) ?: [];
+
+		$gf_ltg = $this->ci->BenutzerfunktionModel->getBenutzerFunktionenDetailed('gLtg', $stg_obj->oe_kurzbz);
+		if (isError($gf_ltg))
+			return $gf_ltg;
+		$gf_ltg = getData($gf_ltg) ?: [];
+
+		$stv_ltg = $this->ci->BenutzerfunktionModel->getBenutzerFunktionenDetailed('stvLtg', $stg_obj->oe_kurzbz);
+		if (isError($stv_ltg))
+			return $stv_ltg;
+		$stv_ltg = getData($stv_ltg) ?: [];
+
+		$ass = $this->ci->BenutzerfunktionModel->getBenutzerFunktionenDetailed('ass', $stg_obj->oe_kurzbz);
+		if (isError($ass))
+			return $ass;
+		$ass = getData($ass) ?: [];
+
+		$hochschulvertr = $this->ci->BenutzerfunktionModel->getBenutzerFunktionenDetailed('hsv');
+		if (isError($hochschulvertr))
+			return $hochschulvertr;
+		$hochschulvertr = getData($hochschulvertr) ?: [];
+
+		$stdv = $this->ci->BenutzerfunktionModel->getBenutzerFunktionenDetailed('stdv', $stg_obj->oe_kurzbz);
+		if (isError($stdv))
+			return $stdv;
+		$stdv = getData($stdv) ?: [];
+
+		$jahrgangsvertr = $this->ci->BenutzerfunktionModel->getBenutzerFunktionenDetailed('jgv', $stg_obj->oe_kurzbz, $semester);
+		if (isError($jahrgangsvertr))
+			return $jahrgangsvertr;
+		$jahrgangsvertr = getData($jahrgangsvertr) ?: [];
+
+		return success($this->ci->load->view('Cis/Cms/News/Xml/NewsExtras', [
+			'studiengang' => $stg_obj,
+			'semester' => $semester,
+			'stg_ltg' => $stg_ltg,
+			'gf_ltg' => $gf_ltg,
+			'stv_ltg' => $stv_ltg,
+			'ass' => $ass,
+			'hochschulvertr' => $hochschulvertr,
+			'stdv' => $stdv,
+			'jahrgangsvertr' => $jahrgangsvertr
+		], true));
+	}
+
+	/**
+	 * @param boolean			$infoscreen
+	 * @param string | null		$studiengang_kz
+	 * @param int | null		$semester
+	 * @param boolean			$mischen
+	 * @param string			$titel
+	 * @param boolean			$edit
+	 * @param boolean			$sichtbar
+	 * 
+	 * @return void
+	 */
+	public function getNews($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
+	{
+		$this->ci->load->model('crm/Student_model', 'StudentModel');
+		$this->ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
+
+		if (!$infoscreen && ($studiengang_kz === null || $semester === null))
+		{
+			//Zum anzeigen der Studiengang-Details neben den News
+			$student = $this->ci->StudentModel->loadWhere(['student_uid' => get_uid()]);
+			if (isError($student))
+				return $student;
+			if (getData($student)) {
+				$student = current(getData($student));
+				if ($studiengang_kz === null)
+					$studiengang_kz = $student->studiengang_kz;
+				if ($semester === null)
+					$semester = $student->semester;
+			}
+		}
+		$all = $edit;
+
+		$xml = '<?xml version="1.0" encoding="UTF-8"?><content>';
+
+		$this->ci->load->model('content/News_model', 'NewsModel');
+		$news = $this->ci->NewsModel->getNewsWithContent(getSprache(), $studiengang_kz, $semester, null, $sichtbar, 0, 0, $all, $mischen);
+
+		if (isError($news))
+			return $news;
+
+		$news = getData($news);
+		foreach ($news as $newsobj) {
+			if ($studiengang_kz && $edit && !$newsobj->studiengang_kz)
+				continue;
+			$date = new \DateTime($newsobj->datum);
+			$datum = '<datum><![CDATA[' . $date->format('d.m.Y') . ']]></datum>';
+			$datum .= '<datumdetail><![CDATA[' . $date->format('Y-m-d H:i') . ']]></datumdetail>';
+			$id = $edit ? '<news_id><![CDATA[' . $newsobj->news_id . ']]></news_id>' : '';
+			$xml .= "<newswrapper>" . $newsobj->content . $datum . $id . "</newswrapper>";
+		}
+
+		if ($studiengang_kz != 0)
+		{
+			$stg_obj = $this->ci->StudiengangModel->load($studiengang_kz);
+			if (isError($stg_obj))
+				return $stg_obj;
+			$stg_obj = current(getData($stg_obj) ?: []);
+
+			if ($stg_obj)
+			{
+				if (!$edit && !$infoscreen)
+				{
+					$extras = $this->getNewsExtras($stg_obj, $semester);
+					if (isError($extras))
+						return $extras;
+					$xml .= getData($extras);
+				}
+				$xml .= '<studiengang_bezeichnung><![CDATA[' . $stg_obj->bezeichnung . ']]></studiengang_bezeichnung>';
+			}
+		}
+
+		if ($titel != '')
+		{
+			$xml .= '<news_titel>' . $titel . '</news_titel>';
+		}
+
+		$xml .= '</content>';
+
+		//XSLT Vorlage laden
+		$template = $this->ci->TemplateModel->load($infoscreen ? 'news_infoscreen' : 'news');
+		if (isError($template))
+			return $template;
+		$template = current(getData($template));
+
+		$XML = new \DOMDocument();
+		$XML->loadXML($xml);
+		
+		$xsltemplate = new \DOMDocument();
+		$xsltemplate->loadXML($template->xslt_xhtml_c4);
+
+		//Transformation
+		$processor = new \XSLTProcessor();
+		$processor->importStylesheet($xsltemplate);
+
+		$content = $processor->transformToDoc($XML);
+		$content->formatOutput = true;
+
+		$content = $content->saveHTML();
+		$content = str_replace('dms.php', APP_ROOT . 'cms/dms.php', $content);
+
+		return success($content);
+	}
+}
diff --git a/application/models/content/Content_model.php b/application/models/content/Content_model.php
index f36425169..c0d3c52f5 100644
--- a/application/models/content/Content_model.php
+++ b/application/models/content/Content_model.php
@@ -78,21 +78,8 @@ class Content_model extends DB_Model
 			c.template_kurzbz, 
 			s.titel,
 			s.content, 
-			"./*c.oe_kurzbz, 
-			s.sprache,
-			s.contentsprache_id, 
-			s.version, 
-			s.sichtbar, 
-			s.reviewvon, 
-			s.reviewamum,
-			s.updateamum, 
-			s.updatevon, 
-			s.insertamum, 
-			s.insertvon, */"
 			c.menu_open, 
 			c.aktiv, 
-			"./*s.gesperrt_uid, 
-			c.beschreibung,*/"
 			k.child_content_id,
 			k.sort FROM (
 				SELECT 
@@ -128,10 +115,23 @@ class Content_model extends DB_Model
 				campus.tbl_contentsprache s USING(contentsprache_id)
 			LEFT JOIN 
 				campus.tbl_contentchild k ON(m.content_id=k.content_id)
+			WHERE EXISTS (
+				SELECT 1 
+				FROM campus.tbl_contentgruppe 
+				JOIN public.vw_gruppen USING(gruppe_kurzbz) 
+				WHERE (
+					tbl_contentgruppe.content_id=c.content_id
+					OR NOT EXISTS (
+						SELECT 1 
+						FROM campus.tbl_contentgruppe 
+						WHERE content_id=c.content_id
+					)
+				)
+				AND vw_gruppen.uid=?
+			)
 			ORDER BY content_id, sort";
 
-		#DEFAULT_LANGUAGE, $sprache, $root_content_id
-		$result = $this->execQuery($sql, [DEFAULT_LANGUAGE, $sprache, $root_content_id]);
+		$result = $this->execQuery($sql, [DEFAULT_LANGUAGE, $sprache, $root_content_id, $uid]);
 
 		if (isError($result))
 			return $result;
@@ -158,20 +158,7 @@ class Content_model extends DB_Model
 			}
 		}
 
-		return success($result[$root_content_id]);
-
-		# !LOCKED ||
-		$berechtigt = "SELECT 
-					1
-				FROM 
-					campus.tbl_contentgruppe 
-					JOIN public.vw_gruppen USING(gruppe_kurzbz) 
-				WHERE
-					(tbl_contentgruppe.content_id=$content_id
-						OR NOT EXISTS (SELECT 1 FROM campus.tbl_contentgruppe WHERE content_id=$content_id))
-					AND vw_gruppen.uid=$uid";
-
-		
+		return success(isset($result[$root_content_id]) ? $result[$root_content_id] : null);
 	}
 
 }
diff --git a/application/models/content/News_model.php b/application/models/content/News_model.php
index 472eb2e56..904b512f1 100644
--- a/application/models/content/News_model.php
+++ b/application/models/content/News_model.php
@@ -26,4 +26,95 @@ class News_model extends DB_Model
             LIMIT '. $this->escape($limit)
         );
     }
+
+    /**
+     * @param string            $sprache
+     * @param string            $studiengang_kz
+     * @param integer | null    $semester
+     * @param string            $fachbereich_kurzbz
+     * @param boolean           $sichtbar
+     * @param integer           $maxalter
+     * @param integer           $maxnews
+     * @param boolean           $all
+     * @param boolean           $mischen
+     * 
+     * TODO(chris): this is not a good function -> the params are all over the place
+     * 
+     * @return stdObj
+     */
+    public function getNewsWithContent($sprache, $studiengang_kz, $semester, $fachbereich_kurzbz = null, $sichtbar = true, $maxalter = 0, $maxnews = 0, $all = false, $mischen = true)
+    {
+        $studiengang_kz = trim($studiengang_kz);
+        $fachbereich_kurzbz = trim($fachbereich_kurzbz);
+
+        $where = [];
+        $params = [];
+        if (trim($maxalter) != '0')
+        {
+            $where[] = "(now()-datum) < interval ? days";
+            $params[] = $maxalter;
+        }
+        if (!$all)
+        {
+            $where[] = "datum <= now()";
+            $where[] = "(datum_bis >= now()::date OR datum_bis IS NULL)";
+        }
+        if ($fachbereich_kurzbz != '*')
+        {
+            if ($fachbereich_kurzbz == '')
+            {
+                $where[] = "fachbereich_kurzbz IS NULL";
+            }
+            else
+            {
+                $where[] = "fachbereich_kurzbz = ?";
+                $params[] = $fachbereich_kurzbz;
+            }
+        }
+        if ($studiengang_kz == '0')
+        {
+            $where[] = "studiengang_kz = ?";
+            $params[] = $studiengang_kz;
+            if ($semester === NULL)
+                $where[] = "semester IS NULL";
+            elseif ($semester === 0)
+                $where[] = "semester = 0";
+        }
+        elseif ($studiengang_kz != '')
+        {
+            $add = $mischen === true ? " OR (studiengang_kz = 0 AND semester IS NULL)" : "";
+            $where[] = "((studiengang_kz = ? AND semester = ?) OR (studiengang_kz = ? AND semester = 0) OR (studiengang_kz = 0 AND semester = ?)" . $add . ")";
+            $params[] = $studiengang_kz;
+            $params[] = $semester;
+            $params[] = $studiengang_kz;
+            $params[] = $semester;
+        }
+        $this->addJoin('campus.tbl_contentsprache cs', 'content_id');
+        
+        $where[] = "cs.sichtbar = " . ($sichtbar ? "true" : "false");
+        
+        $where[] = "cs.sprache = (CASE WHEN EXISTS(SELECT 1 FROM campus.tbl_contentsprache cs2 WHERE cs2.content_id=" . $this->dbTable . ".content_id AND sprache=?) THEN ? ELSE ? END)";
+        $params[] = $sprache;
+        $params[] = $sprache;
+        $params[] = DEFAULT_LANGUAGE;
+        
+        $where[] = "cs.version = (SELECT MAX(version) FROM campus.tbl_contentsprache cs3 WHERE cs3.content_id=" . $this->dbTable . ".content_id AND cs3.sprache = (CASE WHEN EXISTS(SELECT 1 FROM campus.tbl_contentsprache cs2 WHERE cs2.content_id=" . $this->dbTable . ".content_id AND sprache=?) THEN ? ELSE ? END))";
+        $params[] = $sprache;
+        $params[] = $sprache;
+        $params[] = DEFAULT_LANGUAGE;
+
+        $where = implode(" AND ", $where);
+
+        $this->addOrder('datum', 'DESC');
+        if ($maxnews)
+            $this->addLimit($maxnews);
+
+
+        $this->db->where($where, NULL, FALSE);
+
+        $sql = $this->db->get_compiled_select($this->dbTable);
+
+        return $this->execQuery($sql, $params);
+    }
+
 }
diff --git a/application/models/organisation/Studiengang_model.php b/application/models/organisation/Studiengang_model.php
index e848cb4c2..4fb520430 100644
--- a/application/models/organisation/Studiengang_model.php
+++ b/application/models/organisation/Studiengang_model.php
@@ -457,7 +457,7 @@ class Studiengang_model extends DB_Model
 	 */
 	public function getLeitung($studiengang_kz = null)
 	{
-		$this->addSelect('uid, studiengang_kz, oe_kurzbz, vorname, nachname, email');
+		$this->addSelect('uid, studiengang_kz, oe_kurzbz, vorname, nachname, email, titelpre, titelpost, alias');
 		$this->addJoin('public.tbl_benutzerfunktion', 'oe_kurzbz');
 		$this->addJoin('public.tbl_benutzer', 'uid');
 		$this->addJoin('public.tbl_person', 'person_id');
@@ -493,6 +493,53 @@ class Studiengang_model extends DB_Model
 		return $this->loadWhere($condition);
 	}
 
+	/**
+	 * Get Studiengangsleitung/en of Studiengang/Studiengaenge. With Details
+	 *
+	 * @param null $studiengang_kz Numeric or Array
+	 * @return array
+	 */
+	public function getLeitungDetailed($studiengang_kz = null)
+	{
+		$this->addSelect('studiengang_kz, email, f.oe_kurzbz, b.uid, b.alias, b.aktiv, p.vorname, p.nachname, p.titelpre, p.titelpost, m.telefonklappe, k.kontakt, o.planbezeichnung');
+		$this->addJoin('public.tbl_benutzerfunktion f', 'oe_kurzbz');
+		$this->addJoin('public.tbl_benutzer b', 'uid');
+		$this->addJoin('public.tbl_person p', 'person_id');
+		$this->addJoin('public.tbl_mitarbeiter m', 'mitarbeiter_uid=uid', 'LEFT');
+		$this->addJoin('public.tbl_kontakt k', 'k.standort_id=m.standort_id AND kontakttyp=\'telefon\'', 'LEFT');
+		$this->addJoin('public.tbl_ort o', 'ort_kurzbz', 'LEFT');
+
+		if (!is_numeric($studiengang_kz) && !is_array($studiengang_kz))
+		{
+			return error('Studiengangskennzahl ungültig');
+		}
+
+		if (is_null($studiengang_kz))
+		{
+			$condition = '
+			funktion_kurzbz = \'Leitung\'
+			AND ( datum_von <= NOW() OR datum_von IS NULL )
+			AND ( datum_bis >= NOW() OR datum_bis IS NULL )
+			';
+		}
+		elseif (is_numeric($studiengang_kz) || is_array($studiengang_kz))
+		{
+			if (is_array($studiengang_kz))
+			{
+				$studiengang_kz = array_map(array($this,'escape'), $studiengang_kz);
+				$studiengang_kz = implode(', ', $studiengang_kz);
+			}
+			$condition =  '
+			funktion_kurzbz = \'Leitung\'
+			AND ( datum_von <= NOW() OR datum_von IS NULL )
+			AND ( datum_bis >= NOW() OR datum_bis IS NULL )
+			AND studiengang_kz IN (' . $studiengang_kz. ')';
+			;
+		}
+
+		return $this->loadWhere($condition);
+	}
+
 	public function getStudiengaengeWithOrgForm($typ, $semester)
 	{
 		$query = "SELECT DISTINCT (UPPER(so.studiengangkurzbzlang || ':' || sp.orgform_kurzbz)) AS Studiengang
diff --git a/application/models/person/Benutzerfunktion_model.php b/application/models/person/Benutzerfunktion_model.php
index 27f9b6184..887021f20 100644
--- a/application/models/person/Benutzerfunktion_model.php
+++ b/application/models/person/Benutzerfunktion_model.php
@@ -147,6 +147,38 @@ class Benutzerfunktion_model extends DB_Model
 		return $this->execQuery($query, $parametersArray);
 	}
 
+	/**
+	 * Gets all Benutzer with details for a given Benutzerfunktion and optionally specified Oe and semester
+	 * 
+	 * @param string			$funktion_kurzbz
+	 * @param string			$oe_kurzbz
+	 * @param integer | null	$semester
+	 * @return array|null
+	 */
+	public function getBenutzerFunktionenDetailed($funktion_kurzbz, $oe_kurzbz = null, $semester = null)
+	{
+		$this->addSelect($this->dbTable . '.funktion_kurzbz, ' . $this->dbTable . '.oe_kurzbz, ' . $this->dbTable . '.semester, ' . $this->dbTable . '.bezeichnung, f.beschreibung, b.uid, b.alias, b.aktiv, p.vorname, p.nachname, p.titelpre, p.titelpost, m.telefonklappe, k.kontakt, o.planbezeichnung');
+		$this->addJoin('public.tbl_funktion f', 'funktion_kurzbz');
+		$this->addJoin('public.tbl_benutzer b', 'uid');
+		$this->addJoin('public.tbl_person p', 'person_id');
+		$this->addJoin('public.tbl_mitarbeiter m', 'mitarbeiter_uid=uid', 'LEFT');
+		$this->addJoin('public.tbl_kontakt k', 'k.standort_id=m.standort_id AND kontakttyp=\'telefon\'', 'LEFT');
+		$this->addJoin('public.tbl_ort o', 'ort_kurzbz', 'LEFT');
+
+		$this->addOrder('LOWER(uid)');
+
+		$where = [$this->dbTable . '.funktion_kurzbz' => $funktion_kurzbz];
+		if ($oe_kurzbz !== null)
+			$where[$this->dbTable . '.oe_kurzbz'] = $oe_kurzbz;
+		if ($semester !== null)
+			$where[$this->dbTable . '.semester'] = $semester;
+
+		$this->db->where('(' . $this->dbTable . '.datum_bis >= NOW() OR ' . $this->dbTable . '.datum_bis IS NULL)', NULL, FALSE);
+		$this->db->where('(' . $this->dbTable . '.datum_von <= NOW() OR ' . $this->dbTable . '.datum_von IS NULL)', NULL, FALSE);
+
+		return $this->loadWhere($where);
+	}
+
     /**
      * Get active Studiengangsleitung(en) of the user by UID.
      * @param $uid
diff --git a/application/views/Cis/Cms/News/Xml/Address/Detailed.php b/application/views/Cis/Cms/News/Xml/Address/Detailed.php
new file mode 100644
index 000000000..934b5ba93
--- /dev/null
+++ b/application/views/Cis/Cms/News/Xml/Address/Detailed.php
@@ -0,0 +1,11 @@
+<?php if ($obj->aktiv) { ?>
+	<uid><![CDATA[ <?= $obj->uid; ?>]]></uid>
+	<name><![CDATA[ <?= $obj->titelpre . ' ' . $obj->vorname . ' ' . $obj->nachname . ' ' . $obj->titelpost; ?>]]></name>
+	<email><![CDATA[<?= $obj->alias ?: $obj->uid; ?>@<?= DOMAIN; ?>]]></email>
+	<?php if ($obj->telefonklappe !== null) { ?>
+		<telefon><![CDATA[<?= $obj->kontakt ?: ''; ?> - <?= $obj->telefonklappe; ?>]]></telefon>
+	<?php } ?>
+	<?php if ($obj->planbezeichnung) { ?>
+		<ort><![CDATA[<?= $obj->planbezeichnung; ?>]]></ort>
+	<?php } ?>
+<?php } ?>
\ No newline at end of file
diff --git a/application/views/Cis/Cms/News/Xml/Address/Short.php b/application/views/Cis/Cms/News/Xml/Address/Short.php
new file mode 100644
index 000000000..61888fb7e
--- /dev/null
+++ b/application/views/Cis/Cms/News/Xml/Address/Short.php
@@ -0,0 +1,6 @@
+<?php if ($obj->aktiv) { ?>
+	<uid><![CDATA[ <?= $obj->uid; ?>]]></uid>
+	<email><![CDATA[<?= $obj->uid; ?>@<?= DOMAIN; ?>]]></email>
+	
+	<name><![CDATA[ <?= $obj->titelpre . ' ' . $obj->vorname . ' ' . $obj->nachname . ' ' . $obj->titelpost; ?><?php if ($obj->bezeichnung != '' && $obj->bezeichnung != $obj->beschreibung) echo ' (' . $obj->bezeichnung . ')'; ?>]]></name>
+<?php } ?>
diff --git a/application/views/Cis/Cms/News/Xml/NewsExtras.php b/application/views/Cis/Cms/News/Xml/NewsExtras.php
new file mode 100644
index 000000000..b3b86e567
--- /dev/null
+++ b/application/views/Cis/Cms/News/Xml/NewsExtras.php
@@ -0,0 +1,46 @@
+<stg_extras>
+	<stg_kz><?= $studiengang->studiengang_kz; ?></stg_kz>
+	<stg_ltg_name><![CDATA[<?= $this->p->t('global', 'studiengangsleitung'); ?>]]></stg_ltg_name>';
+	<?php foreach ($stg_ltg as $item) { ?>
+		<stg_ltg> <?php $this->view('Cis/Cms/News/Xml/Address/Detailed', ['obj' => $item]); ?></stg_ltg>
+	<?php } ?>
+	<gf_ltg_name><![CDATA[<?= $this->p->t('global', 'geschaeftsfuehrendeltg'); ?>]]></gf_ltg_name>';
+	<?php foreach ($gf_ltg as $item) { ?>
+		<gf_ltg> <?php $this->view('Cis/Cms/News/Xml/Address/Detailed', ['obj' => $item]); ?></gf_ltg>
+	<?php } ?>
+	<stv_ltg_name><![CDATA[<?= $this->p->t('global', 'stellvertreter'); ?>]]></stv_ltg_name>';
+	<?php foreach ($stv_ltg as $item) { ?>
+		<stv_ltg> <?php $this->view('Cis/Cms/News/Xml/Address/Detailed', ['obj' => $item]); ?></stv_ltg>
+	<?php } ?>
+	<ass_name><![CDATA[<?= $this->p->t('global', 'sekretariat'); ?>]]></ass_name>';
+	<?php foreach ($ass as $item) { ?>
+		<ass> <?php $this->view('Cis/Cms/News/Xml/Address/Detailed', ['obj' => $item]); ?></ass>
+	<?php } ?>
+
+	<zusatzinfo><![CDATA[<?= $studiengang->zusatzinfo_html; ?>]]></zusatzinfo>
+	
+	<hochschulvertr_name><![CDATA[<?= $this->p->t('global', 'hochschulvertretung'); ?>]]></hochschulvertr_name>';
+	<?php foreach ($hochschulvertr as $item) { ?>
+		<hochschulvertr> <?php $this->view('Cis/Cms/News/Xml/Address/Short', ['obj' => $item]); ?></hochschulvertr>
+	<?php } ?>
+
+	<stdv_name><![CDATA[<?= $this->p->t('global', 'studentenvertreter'); ?> <?= strtoupper($studiengang->oe_kurzbz); ?>]]></stdv_name>';
+	<?php foreach ($stdv as $item) { ?>
+		<stdv> <?php $this->view('Cis/Cms/News/Xml/Address/Short', ['obj' => $item]); ?></stdv>
+	<?php } ?>
+
+	<jahrgangsvertr_name><![CDATA[<?= $this->p->t('global', 'jahrgangsvertretung'); ?><?= $semester; ?> <?= $this->p->t('global', 'semester'); ?>]]></jahrgangsvertr_name>';
+	<?php foreach ($jahrgangsvertr as $item) { ?>
+		<jahrgangsvertr> <?php $this->view('Cis/Cms/News/Xml/Address/Short', ['obj' => $item]); ?></jahrgangsvertr>
+	<?php } ?>
+
+	<?php if (defined("CIS_EXT_MENU") && CIS_EXT_MENU) { ?>
+		<cis_ext_menu>
+			<download_name><![CDATA[<?= $this->p->t('global', 'allgemeinerdownload'); ?>]]></download_name>
+			<kurzbz><![CDATA[<?= strtolower($studiengang->typ . $studiengang->kurzbz); ?>]]></kurzbz>
+			<kurzbzlang><![CDATA[<?= strtolower($studiengang->kurzbzlang); ?>]]></kurzbzlang>
+			<stg_kz><![CDATA[<?= $studiengang->studiengang_kz; ?>]]></stg_kz>
+		</cis_ext_menu>';
+	<?php } ?>
+
+</stg_extras>
diff --git a/application/views/CisHmvc/Cms/Content.php b/application/views/CisHmvc/Cms/Content.php
new file mode 100644
index 000000000..e96060e51
--- /dev/null
+++ b/application/views/CisHmvc/Cms/Content.php
@@ -0,0 +1,18 @@
+<?php
+$includesArray = array(
+	'title' => 'FH-Complete',
+	'customCSSs' => [
+		'public/css/Cis4/Cms.css',
+		#'skin/style.css.php'
+	]
+);
+
+$this->load->view('templates/FHC-Header', $includesArray);
+?>
+
+<div id="cms">
+	<?= $content; ?>
+</div>
+
+<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
+
diff --git a/application/views/CisHmvc/Cms/Legacy.php b/application/views/CisHmvc/Cms/Legacy.php
new file mode 100644
index 000000000..3013cded8
--- /dev/null
+++ b/application/views/CisHmvc/Cms/Legacy.php
@@ -0,0 +1,23 @@
+<?php
+$includesArray = array(
+	'title' => 'FH-Complete',
+	'customCSSs' => [
+		'public/css/Cis4/Legacy.css'
+	]
+);
+
+$this->load->view('templates/FHC-Header', $includesArray);
+?>
+
+<script type="text/javascript">
+	function resizeIframe(obj) {
+		// NOTE(chris): this only works on sites on the same domain which is always the case in this template
+		obj.style.height = (obj.contentWindow.document.scrollingElement.scrollHeight) + 'px';
+		// TODO(chris): add trigger on window.resize
+	}
+</script>
+
+<iframe src="<?= base_url($url); ?>" onload="resizeIframe(this)"></iframe>
+
+<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
+
diff --git a/application/views/cis/Error.php b/application/views/CisHmvc/Error.php
similarity index 100%
rename from application/views/cis/Error.php
rename to application/views/CisHmvc/Error.php
diff --git a/application/views/CisHtml/Cms/Content.php b/application/views/CisHtml/Cms/Content.php
new file mode 100644
index 000000000..8742720b7
--- /dev/null
+++ b/application/views/CisHtml/Cms/Content.php
@@ -0,0 +1,17 @@
+<?php
+$includesArray = array(
+	'customCSSs' => [
+		'public/css/Cis4/Cms.css',
+		#'skin/style.css.php'
+	]
+);
+
+$this->load->view('templates/CISHTML-Header', $includesArray);
+?>
+
+<div id="cms">
+	<?= $content; ?>
+</div>
+
+<?php $this->load->view('templates/CISHTML-Footer', $includesArray); ?>
+
diff --git a/application/views/CisHtml/Dashboard.php b/application/views/CisHtml/Dashboard.php
new file mode 100644
index 000000000..adb038a35
--- /dev/null
+++ b/application/views/CisHtml/Dashboard.php
@@ -0,0 +1,19 @@
+<?php
+$includesArray = array(
+	'customJSModules' => ['public/js/apps/Dashboard/Fhc.js'],
+	'customCSSs' => [
+		'public/css/components/dashboard.css'
+	],
+);
+
+$this->load->view('templates/CISHTML-Header', $includesArray);
+?>
+
+<div id="content">
+	<h2>Dashboard</h2>
+	<hr>
+	<fhc-dashboard dashboard="CIS"/>
+</div>
+
+<?php $this->load->view('templates/CISHTML-Footer', $includesArray); ?>
+
diff --git a/application/views/CisHtml/Error.php b/application/views/CisHtml/Error.php
new file mode 100644
index 000000000..7b6a6beb2
--- /dev/null
+++ b/application/views/CisHtml/Error.php
@@ -0,0 +1,18 @@
+<?php
+	$includesArray = array(
+		'title' => 'FH-Complete',
+		'bootstrap5' => true,
+		'fontawesome6' => true,
+	);
+
+	$this->load->view('templates/FHC-Header', $includesArray);
+?>
+
+	<div id="wrapper">
+		<div class="alert alert-primary" role="alert">
+			<?= $error; ?>
+		</div>
+	</div>
+
+<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
+
diff --git a/application/views/cis/cms/Content.php b/application/views/CisVue/Cms/Content.php
similarity index 53%
rename from application/views/cis/cms/Content.php
rename to application/views/CisVue/Cms/Content.php
index b8f0aa45a..fafe1a593 100644
--- a/application/views/cis/cms/Content.php
+++ b/application/views/CisVue/Cms/Content.php
@@ -6,12 +6,12 @@ $includesArray = array(
 	]
 );
 
-$this->load->view('templates/CIS-Header', $includesArray);
+$this->load->view('templates/CISVUE-Header', $includesArray);
 ?>
 
 <div id="cms">
 	<?= $content; ?>
 </div>
 
-<?php $this->load->view('templates/CIS-Footer', $includesArray); ?>
+<?php $this->load->view('templates/CISVUE-Footer', $includesArray); ?>
 
diff --git a/application/views/cis/Dashboard.php b/application/views/CisVue/Dashboard.php
similarity index 58%
rename from application/views/cis/Dashboard.php
rename to application/views/CisVue/Dashboard.php
index 48e9f1dc9..06c2620cc 100644
--- a/application/views/cis/Dashboard.php
+++ b/application/views/CisVue/Dashboard.php
@@ -6,12 +6,14 @@ $includesArray = array(
 	],
 );
 
-$this->load->view('templates/CIS-Header', $includesArray);
+$this->load->view('templates/CISVUE-Header', $includesArray);
 ?>
 
 <div id="content">
+	<h2>Dashboard</h2>
+	<hr>
 	<fhc-dashboard dashboard="CIS"/>
 </div>
 
-<?php $this->load->view('templates/CIS-Footer', $includesArray); ?>
+<?php $this->load->view('templates/CISVUE-Footer', $includesArray); ?>
 
diff --git a/application/views/templates/CIS-Header.php b/application/views/templates/CIS-Header.php
deleted file mode 100644
index 7b5c78c3f..000000000
--- a/application/views/templates/CIS-Header.php
+++ /dev/null
@@ -1,161 +0,0 @@
-<?php
-$includesArray = array(
-	'title' => $title ?? 'FH-Complete',
-	'vue3' => true,
-	'bootstrap5' => true,
-	'fontawesome6' => true,
-	'axios027' => true,
-	'customJSModules' => array_merge([
-		'public/js/apps/Cis.js'
-	], $customJSModules ?? []),
-	'customCSSs' => array_merge([
-		'public/css/Cis4/Cis.css'
-	], $customCSSs ?? [])
-);
-
-$this->load->view('templates/FHC-Header', $includesArray);
-
-
-$ci =& get_instance(); // get CI instance
-$ci->load->model('content/Content_model', 'ContentModel');
-$result = $ci->ContentModel->getMenu(6739, null);
-$menu = getData($result) ?? (object)['childs' => []];
-
-?>
-
-<div id="cis4">
-	<header>
-		<div id="cis-navigation-top" class="navbar navbar-expand-lg fixed-top navbar-dark bg-primary p-0">
-			<button class="navbar-toggler border-0" type="button" data-bs-toggle="offcanvas" data-bs-target="#cis-navigation-top-offcanvas">
-				<span class="navbar-toggler-icon"></span>
-			</button>
-			<a class="navbar-brand col-auto col-lg-2 px-3 py-0 m-0" href="<?= site_url('cis'); ?>">
-				<img src="<?= base_url('/public/images/logo-300x160.png'); ?>" width="90">
-			</a>
-			<div id="cis-navigation-top-offcanvas" class="offcanvas offcanvas-start align-items-stretch mt-lg-0 w-100 px-3 px-lg-0 d-flex flex-column flex-lg-row bg-dark border-0 pt-3 pt-lg-0" tabindex="-1" data-bs-backdrop="false">
-				<fhc-searchbar class="fhc-searchbar w-100" :searchoptions="{types:[],actions:{}}" :searchfunction="search"></fhc-searchbar>
-				<ul class="navbar-nav flex-grow-1">
-					<!-- TODO(chris): foreach menu -->
-					<li class="nav-item d-lg-none">
-						<a class="nav-link" href="#">Mein CIS</a>
-					</li>
-					<li class="nav-item d-lg-none">
-						<a class="nav-link" href="#">FHTW Campus</a>
-					</li>
-					<li class="nav-item d-lg-none">
-						<a class="nav-link" href="#">FHTW Services</a>
-					</li>
-					<li class="nav-item d-lg-none">
-						<a class="nav-link" href="<?= site_url('cis/cms/content/10012'); ?>">COVID 19</a>
-					</li>
-					<li class="nav-item">
-						<div class="dropdown pe-lg-3">
-							<a class="nav-link" href="#" id="dropdown01" data-bs-toggle="dropdown" data-bs-reference="parent" aria-expanded="false">
-								<img src="<?= base_url('/cis/public/bild.php?src=person&person_id=' . getAuthPersonId()); ?>" class="avatar rounded-circle" width="45" height="45"/>
-							</a>
-							<ul class="dropdown-menu dropdown-menu-dark dropdown-menu-end m-0" aria-labelledby="dropdown01">
-								<!-- TODO(chris): foreach menu -->
-								<li><a class="dropdown-item" href="#" id="menu-profil">Profil</a></li>
-								<li><a class="dropdown-item" href="#">Ampeln</a></li>
-								<li><hr class="dropdown-divider"></li>
-								<li><a class="dropdown-item" href="#">Logout</a></li>
-							</ul>
-						</div>
-					</li>
-				</ul>
-			</div>
-		</div>
-	</header>
-
-	<div class="container-fluid px-0 flex-grow-1 row mx-0">
-		<nav id="cis-navigation-left" class="d-none d-lg-block position-sticky col-lg-2 px-0 bg-secondary">
-			<div class="btn btn-dark text-muted rounded-0 w-100 text-start"><small>MAIN MENU</small></div>
-			<?php foreach($menu->childs as $entry)
-				$this->load->view('templates/CIS-Menu/Entry', ['entry' => $entry, 'menu_id' => 'menu']);
-			?>
-		</nav>
-		<!--nav class="list-group list-group-flush d-none d-lg-block position-sticky col-lg-2 px-0">
-				< !-- Separator with title -- >
-				<div class="list-group-item sidebar-separator-title text-muted d-flex align-items-center menu-collapsed">
-					<small>MAIN MENU</small>
-				</div>
-				< !-- /end Separator -- >
-				<a href="#submenu1" data-bs-toggle="collapse" aria-expanded="true" class="bg-primary text-white list-group-item list-group-item-action flex-column align-items-start">
-					<div class="d-flex w-100 justify-content-start align-items-center">
-						<i class="fa fa-user fa-fw me-3"></i>
-						<span class="menu-collapsed">Mein CIS</span>
-					</div>
-				</a>
-				<div id='submenu1' class="collapse show sidebar-submenu">
-					<a href="#" class="list-group-item list-group-item-action list-group-item-dark active" id="menu-mein-bereich">
-						<span class="menu-collapsed">Mein Bereich</span>
-					</a>
-					<a href="#" class="list-group-item list-group-item-action list-group-item-dark">
-						<span class="menu-collapsed">Studium</span>
-					</a>
-					<a href="#" class="list-group-item list-group-item-action list-group-item-dark" id="menu-lvplan">
-						<span class="menu-collapsed">LV Plan</span>
-					</a>
-					<a href="#" class="list-group-item list-group-item-action list-group-item-dark">
-						<span class="menu-collapsed">Campus Life</span>
-					</a>
-				</div>
-				<a href="#submenu2" data-bs-toggle="collapse" aria-expanded="false" class="bg-primary text-white list-group-item list-group-item-action flex-column align-items-start">
-					<div class="d-flex w-100 justify-content-start align-items-center">
-						<i class="fa fa-user fa-fw me-3"></i>
-						<span class="menu-collapsed">FHTW Hochschule</span>
-					</div>
-				</a>
-				<div id='submenu2' class="collapse sidebar-submenu">
-					<a href="#" class="list-group-item list-group-item-action list-group-item-dark" id="menu-organisation">
-						<span class="menu-collapsed">Organisation</span>
-					</a>
-					<a href="#" class="list-group-item list-group-item-action list-group-item-dark">
-						<span class="menu-collapsed">Studiengänge</span>
-					</a>
-					<a href="#" class="list-group-item list-group-item-action list-group-item-dark">
-						<span class="menu-collapsed">Forschung & Entwicklung</span>
-					</a>
-					<a href="#" class="list-group-item list-group-item-action list-group-item-dark">
-						<span class="menu-collapsed">Technikum Wien Acadamy</span>
-					</a>
-				</div>
-				<a href="#submenu3" data-bs-toggle="collapse" aria-expanded="false" class="bg-primary text-white list-group-item flex-column align-items-start">
-					<div class="d-flex w-100 justify-content-start align-items-center">
-						<i class="fa fa-user fa-fw me-3"></i>
-						<span class="menu-collapsed">FHTW Services</span>
-					</div>
-				</a>
-				<div id='submenu3' class="collapse sidebar-submenu">
-					<a href="#" class="list-group-item list-group-item-action list-group-item-dark">
-						<span class="menu-collapsed">Teaching & Learning Center</span>
-					</a>
-					<a href="#" class="list-group-item list-group-item-action list-group-item-dark">
-						<span class="menu-collapsed">International Office</span>
-					</a>
-					<a href="#" class="list-group-item list-group-item-action list-group-item-dark">
-						<span class="menu-collapsed">Bibliothek</span>
-					</a>
-					<a href="#" class="list-group-item list-group-item-action list-group-item-dark">
-						<span class="menu-collapsed">IT-Services</span>
-					</a>
-				</div>
-				<a href="#submenu4" data-bs-toggle="collapse" aria-expanded="false" class="bg-primary text-white list-group-item flex-column align-items-start">
-					<div class="d-flex w-100 justify-content-start align-items-center">
-						<i class="fa fa-user fa-fw me-3"></i>
-						<span class="menu-collapsed">Links & Downloads</span>
-					</div>
-				</a>
-				<div class="list-group-item sidebar-separator-title text-muted d-flex align-items-center menu-collapsed">
-					<small>AKTUELL</small>
-				</div>
-				<a href="<?= site_url('cis/cms/content/10012'); ?>" class="bg-primary text-white list-group-item">
-					<div class="d-flex w-100 justify-content-start align-items-center">
-						<i class="fa fa-medkit fa-fw me-3"></i>
-						<span class="menu-collapsed">COVID 19</span>
-					</div>
-				</a>
-				<div class="list-group-item sidebar-separator menu-collapsed"></div>
-			</ul>
-		</nav-->
-		<main class="ms-sm-auto col-lg-10 px-md-4 p-4 overflow-hidden">
\ No newline at end of file
diff --git a/application/views/templates/CISHMVC-Footer.php b/application/views/templates/CISHMVC-Footer.php
new file mode 100644
index 000000000..0f4bf453e
--- /dev/null
+++ b/application/views/templates/CISHMVC-Footer.php
@@ -0,0 +1 @@
+</main>
diff --git a/application/views/templates/CISHMVC-Header.php b/application/views/templates/CISHMVC-Header.php
new file mode 100644
index 000000000..f9302d902
--- /dev/null
+++ b/application/views/templates/CISHMVC-Header.php
@@ -0,0 +1,37 @@
+<header id="cis-header" class="navbar-dark">
+	<button id="nav-main-btn" class="navbar-toggler" type="button" data-bs-toggle="offcanvas" data-bs-target="#nav-main" aria-controls="nav-main" aria-expanded="false" aria-label="Toggle navigation">
+		<span class="navbar-toggler-icon"></span>
+	</button>
+	<a id="nav-logo" href="<?= site_url('CisHmvc'); ?>">
+		<img src="<?= base_url('/public/images/logo-300x160.png'); ?>" alt="Logo">
+	</a>
+	<nav id="nav-main" class="offcanvas offcanvas-start bg-dark" tabindex="-1" aria-labelledby="nav-main-btn" data-bs-backdrop="false">
+		<div id="nav-main-toggle" class="position-static d-none d-lg-block bg-dark">
+			<button type="button" class="btn bg-dark text-light rounded-0 p-1 d-flex align-items-center" data-bs-toggle="collapse" data-bs-target="#nav-main-menu" aria-expanded="true" aria-controls="nav-main-menu">
+				<i class="fa fa-arrow-circle-left"></i>
+			</button>
+		</div>
+		<div class="offcanvas-body p-0">
+			<fhc-searchbar id="nav-search" class="fhc-searchbar w-100" :searchoptions="searchbaroptions" :searchfunction="searchfunction"></fhc-searchbar>
+			<button id="nav-user-btn" class="btn btn-link rounded-0" type="button" data-bs-toggle="collapse" data-bs-target="#nav-user-menu" aria-expanded="false" aria-controls="nav-user-menu">
+				<img src="<?= base_url('/cis/public/bild.php?src=person&person_id=' . getAuthPersonId()); ?>" class="avatar rounded-circle"/>
+			</button>
+			<ul id="nav-user-menu" class="collapse list-unstyled" aria-labelledby="nav-user-btn">
+				<li><a class="btn btn-level-2 rounded-0 d-block" href="#" id="menu-profil">Profil</a></li>
+				<li><a class="btn btn-level-2 rounded-0 d-block" href="#">Ampeln</a></li>
+				<li><hr class="dropdown-divider"></li>
+				<li><a class="btn btn-level-2 rounded-0 d-block" href="#">Logout</a></li>
+			</ul>
+			<div id="nav-main-menu" class="collapse collapse-horizontal show">
+				<div>
+				<?php 
+					foreach($menu as $entry) {
+					$this->load->view('templates/CISHMVC-Menu/Entry', ['entry' => $entry, 'menu_id' => 'menu']);
+				}
+				?>
+				</div>
+			</div>
+		</div>
+	</nav>
+</header>
+<main id="cis-main" class="flex-grow-1 overflow-scroll p-4">
diff --git a/application/views/templates/CISHMVC-Menu/Entry.php b/application/views/templates/CISHMVC-Menu/Entry.php
new file mode 100644
index 000000000..9242ba595
--- /dev/null
+++ b/application/views/templates/CISHMVC-Menu/Entry.php
@@ -0,0 +1,37 @@
+<?php
+if (is_array($entry) && isset($entry['content_id']))
+	$entry = (object)$entry;
+$menu_id .= '-' . $entry->content_id;
+
+// TODO(chris): remove! DEBUG
+#$entry->menu_open = false;
+
+$link = $entry->url;
+$target = $entry->target;
+
+?>
+<?php if ($entry->childs) { ?>
+	<?php if (substr($link, 0, 1) == '#') { ?>
+		<a href="#<?= $menu_id; ?>" data-bs-toggle="collapse" aria-expanded="<?= $entry->menu_open ? 'true' : 'false'; ?>" class="btn btn-default rounded-0 w-100 text-start dropdown-toggle btn-level-<?= substr_count($menu_id, '-'); ?><?= $entry->menu_open ? '' : ' collapsed'; ?>">
+			<span><?= htmlspecialchars($entry->titel); ?></span>
+		</a>
+	<?php } else { ?>
+		<div class="btn-group w-100">
+			<a<?= $link ? ' href="' . $link . '"' : ''; ?><?= $target ? ' target="' . $target . '"' : ''; ?> class="btn btn-default rounded-0 text-start btn-level-<?= substr_count($menu_id, '-'); ?>">
+				<?= htmlspecialchars($entry->titel); ?>
+			</a>
+			<a href="#<?= $menu_id; ?>" data-bs-toggle="collapse" aria-expanded="<?= $entry->menu_open ? 'true' : 'false'; ?>"class="btn btn-default rounded-0 dropdown-toggle dropdown-toggle-split flex-grow-0<?= $entry->menu_open ? '' : ' collapsed'; ?>" >
+				<span class="visually-hidden">Toggle Dropdown</span>
+			</a>
+		</div>
+	<?php } ?>
+	<ul id="<?= $menu_id; ?>" class="nav w-100 collapse<?= $entry->menu_open ? ' show' : ''; ?>">
+		<?php foreach ($entry->childs as $child) 
+			$this->load->view('templates/CISHMVC-Menu/Entry', ['entry' => $child, 'menu_id' => $menu_id]);
+		?>
+	</ul>
+<?php } else { ?>
+	<a<?= $link ? ' href="' . $link . '"' : ''; ?><?= $target ? ' target="' . $target . '"' : ''; ?> class="btn btn-default rounded-0 w-100 text-start btn-level-<?= substr_count($menu_id, '-'); ?>">
+		<?= htmlspecialchars($entry->titel); ?>
+	</a>
+<?php } ?>
diff --git a/application/views/templates/CIS-Footer.php b/application/views/templates/CISHTML-Footer.php
similarity index 94%
rename from application/views/templates/CIS-Footer.php
rename to application/views/templates/CISHTML-Footer.php
index 24fcc8b98..e36b7ddcd 100644
--- a/application/views/templates/CIS-Footer.php
+++ b/application/views/templates/CISHTML-Footer.php
@@ -14,8 +14,6 @@ $includesArray = array(
 );
 ?>
 
-		</main>
-	</div>
-</div>
+</main>
 
 <?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
\ No newline at end of file
diff --git a/application/views/templates/CISHTML-Header.php b/application/views/templates/CISHTML-Header.php
new file mode 100644
index 000000000..af175a95d
--- /dev/null
+++ b/application/views/templates/CISHTML-Header.php
@@ -0,0 +1,60 @@
+<?php
+$includesArray = array(
+	'title' => $title ?? 'FH-Complete',
+	'vue3' => true,
+	'bootstrap5' => true,
+	'fontawesome6' => true,
+	'axios027' => true,
+	'customJSModules' => array_merge([
+		'public/js/apps/Cis.js'
+	], $customJSModules ?? []),
+	'customCSSs' => array_merge([
+		'public/css/Cis4/Cis.css'
+	], $customCSSs ?? [])
+);
+
+$this->load->view('templates/FHC-Header', $includesArray);
+
+if (!isset($menu)) {
+	$ci =& get_instance(); // get CI instance
+	$ci->load->model('content/Content_model', 'ContentModel');
+	$result = $ci->ContentModel->getMenu(6739, get_uid());
+	$menu = getData($result) ?? (object)['childs' => []];
+}
+?>
+
+<header id="cis-header" class="navbar-dark">
+	<button id="nav-main-btn" class="navbar-toggler" type="button" data-bs-toggle="offcanvas" data-bs-target="#nav-main" aria-controls="nav-main" aria-expanded="false" aria-label="Toggle navigation">
+		<span class="navbar-toggler-icon"></span>
+	</button>
+	<a id="nav-logo" href="<?= site_url('CisHtml'); ?>">
+		<img src="<?= base_url('/public/images/logo-300x160.png'); ?>" alt="Logo">
+	</a>
+	<nav id="nav-main" class="offcanvas offcanvas-start bg-dark" tabindex="-1" aria-labelledby="nav-main-btn" data-bs-backdrop="false">
+		<div id="nav-main-toggle" class="position-static d-none d-lg-block bg-dark">
+			<button type="button" class="btn bg-dark text-light rounded-0 p-1 d-flex align-items-center" data-bs-toggle="collapse" data-bs-target="#nav-main-menu" aria-expanded="true" aria-controls="nav-main-menu">
+				<i class="fa fa-arrow-circle-left"></i>
+			</button>
+		</div>
+		<div class="offcanvas-body p-0">
+			<fhc-searchbar id="nav-search" class="fhc-searchbar w-100" :searchoptions="searchbaroptions" :searchfunction="searchfunction"></fhc-searchbar>
+			<button id="nav-user-btn" class="btn btn-link rounded-0" type="button" data-bs-toggle="collapse" data-bs-target="#nav-user-menu" aria-expanded="false" aria-controls="nav-user-menu">
+				<img src="<?= base_url('/cis/public/bild.php?src=person&person_id=' . getAuthPersonId()); ?>" class="avatar rounded-circle"/>
+			</button>
+			<ul id="nav-user-menu" class="collapse list-unstyled" aria-labelledby="nav-user-btn">
+				<li><a class="btn btn-level-2 rounded-0 d-block" href="#" id="menu-profil">Profil</a></li>
+				<li><a class="btn btn-level-2 rounded-0 d-block" href="#">Ampeln</a></li>
+				<li><hr class="dropdown-divider"></li>
+				<li><a class="btn btn-level-2 rounded-0 d-block" href="#">Logout</a></li>
+			</ul>
+			<div id="nav-main-menu" class="collapse collapse-horizontal show">
+				<div>
+				<?php foreach($menu->childs as $entry)
+					$this->load->view('templates/CISHTML-Menu/Entry', ['entry' => $entry, 'menu_id' => 'menu']);
+				?>
+				</div>
+			</div>
+		</div>
+	</nav>
+</header>
+<main id="cis-main" class="flex-grow-1 overflow-scroll p-4">
diff --git a/application/views/templates/CIS-Menu/Entry.php b/application/views/templates/CISHTML-Menu/Entry.php
similarity index 60%
rename from application/views/templates/CIS-Menu/Entry.php
rename to application/views/templates/CISHTML-Menu/Entry.php
index 01e5ab67f..2f9c7e60f 100644
--- a/application/views/templates/CIS-Menu/Entry.php
+++ b/application/views/templates/CISHTML-Menu/Entry.php
@@ -1,4 +1,6 @@
 <?php
+if (is_array($entry) && isset($entry['content_id']))
+	$entry = (object)$entry;
 $menu_id .= '-' . $entry->content_id;
 
 switch ($entry->template_kurzbz) {
@@ -6,7 +8,7 @@ switch ($entry->template_kurzbz) {
 		$url = '';
 		$target = '';
 		$xml = new DOMDocument();
-		if($entry->content!='')
+		if($entry->content != '')
 		{
 			$xml->loadXML($entry->content);
 			if ($xml->getElementsByTagName('url')->item(0))
@@ -24,15 +26,15 @@ switch ($entry->template_kurzbz) {
 		if ($target == 'content')
 			$target = '';
 
-		$this->load->view('templates/CIS-Menu/EntryBase', ['entry' => $entry, 'menu_id' => $menu_id, 'link' => $url, 'target' => $target]);
+		$this->load->view('templates/CISHTML-Menu/EntryBase', ['entry' => $entry, 'menu_id' => $menu_id, 'link' => $url, 'target' => $target]);
 		break;
 	}
 	case 'include': {
-		$this->load->view('templates/CIS-Menu/EntryInclude', ['entry' => $entry, 'menu_id' => $menu_id . '-' . $entry->content_id]);
+		$this->load->view('templates/CISHTML-Menu/EntryInclude', ['entry' => $entry, 'menu_id' => $menu_id]);
 		break;
 	}
 	default: {
-		$this->load->view('templates/CIS-Menu/EntryBase', ['entry' => $entry, 'menu_id' => $menu_id, 'link' => APP_ROOT . 'index.ci.php/cis/cms/content/' . $entry->content_id]);
+		$this->load->view('templates/CISHTML-Menu/EntryBase', ['entry' => $entry, 'menu_id' => $menu_id, 'link' => APP_ROOT . 'index.ci.php/CisHtml/Cms/content/' . $entry->content_id]);
 		break;
 	}
 }
diff --git a/application/views/templates/CIS-Menu/EntryBase.php b/application/views/templates/CISHTML-Menu/EntryBase.php
similarity index 93%
rename from application/views/templates/CIS-Menu/EntryBase.php
rename to application/views/templates/CISHTML-Menu/EntryBase.php
index 610c1e580..16caa4c78 100644
--- a/application/views/templates/CIS-Menu/EntryBase.php
+++ b/application/views/templates/CISHTML-Menu/EntryBase.php
@@ -15,7 +15,7 @@
 	<?php } ?>
 	<ul id="<?= $menu_id; ?>" class="nav w-100 collapse<?= $entry->menu_open ? ' show' : ''; ?>">
 		<?php foreach ($entry->childs as $child) 
-			$this->load->view('templates/CIS-Menu/Entry', ['entry' => $child, 'menu_id' => $menu_id]);
+			$this->load->view('templates/CISHTML-Menu/Entry', ['entry' => $child, 'menu_id' => $menu_id]);
 		?>
 	</ul>
 <?php } else { ?>
diff --git a/application/views/templates/CIS-Menu/EntryInclude.php b/application/views/templates/CISHTML-Menu/EntryInclude.php
similarity index 100%
rename from application/views/templates/CIS-Menu/EntryInclude.php
rename to application/views/templates/CISHTML-Menu/EntryInclude.php
diff --git a/application/views/templates/CISVUE-Footer.php b/application/views/templates/CISVUE-Footer.php
new file mode 100644
index 000000000..e36b7ddcd
--- /dev/null
+++ b/application/views/templates/CISVUE-Footer.php
@@ -0,0 +1,19 @@
+<?php
+$includesArray = array(
+	'title' => $title ?? 'FH-Complete',
+	'vue3' => true,
+	'bootstrap5' => true,
+	'fontawesome6' => true,
+	'axios027' => true,
+	'customJSModules' => array_merge([
+		'public/js/apps/Cis.js'
+	], $customJSModules ?? []),
+	'customCSSs' => array_merge([
+		'public/css/Cis4/Cis.css'
+	], $customCSSs ?? [])
+);
+?>
+
+</main>
+
+<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
\ No newline at end of file
diff --git a/application/views/templates/CISVUE-Header.php b/application/views/templates/CISVUE-Header.php
new file mode 100644
index 000000000..c3c093028
--- /dev/null
+++ b/application/views/templates/CISVUE-Header.php
@@ -0,0 +1,23 @@
+<?php
+$includesArray = array(
+	'title' => $title ?? 'FH-Complete',
+	'vue3' => true,
+	'bootstrap5' => true,
+	'fontawesome6' => true,
+	'axios027' => true,
+	'customJSModules' => array_merge([
+		'public/js/apps/Cis.js'
+	], $customJSModules ?? []),
+	'customCSSs' => array_merge([
+		'public/css/Cis4/Cis.css'
+	], $customCSSs ?? [])
+);
+
+$this->load->view('templates/FHC-Header', $includesArray);
+
+?>
+
+<header id="cis-header" class="navbar-dark">
+	<cis-menu root-url="<?= site_url('CisVue'); ?>" logo-url="<?= base_url('/public/images/logo-300x160.png'); ?>" avatar-url="<?= base_url('/cis/public/bild.php?src=person&person_id=' . getAuthPersonId()); ?>" :searchbaroptions="searchbaroptions" :searchfunction="searchfunction" />
+</header>
+<main id="cis-main" class="flex-grow-1 overflow-scroll p-4">
diff --git a/cis.php b/cis.php
new file mode 100644
index 000000000..fbb182185
--- /dev/null
+++ b/cis.php
@@ -0,0 +1,316 @@
+<?php
+/**
+ * CodeIgniter
+ *
+ * An open source application development framework for PHP
+ *
+ * This content is released under the MIT License (MIT)
+ *
+ * Copyright (c) 2014 - 2015, British Columbia Institute of Technology
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @package	CodeIgniter
+ * @author	EllisLab Dev Team
+ * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/)
+ * @copyright	Copyright (c) 2014 - 2015, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	http://codeigniter.com
+ * @since	Version 1.0.0
+ * @filesource
+ */
+
+/*
+ *---------------------------------------------------------------
+ * APPLICATION ENVIRONMENT
+ *---------------------------------------------------------------
+ *
+ * You can load different configurations depending on your
+ * current environment. Setting the environment also influences
+ * things like logging and error reporting.
+ *
+ * This can be set to anything, but default usage is:
+ *
+ *     development
+ *     testing
+ *     production
+ *
+ * NOTE: If you change these, also change the error_reporting() code below
+ *
+ */
+
+// Loads FHC config files
+require_once 'config/global.config.inc.php';
+require_once 'config/cis.config.inc.php';
+
+// Check if the CI_ENVIRONMENT constants is set and eventually use it to set the CI_ENV environment variable
+if (defined('CI_ENVIRONMENT')) $_SERVER['CI_ENV'] = CI_ENVIRONMENT;
+
+// If the CI_ENV environment variable is not set then use "development" as default
+define('ENVIRONMENT', isset($_SERVER['CI_ENV']) ? $_SERVER['CI_ENV'] : 'development');
+
+/*
+ *---------------------------------------------------------------
+ * ERROR REPORTING
+ *---------------------------------------------------------------
+ *
+ * Different environments will require different levels of error reporting.
+ * By default development will show errors but testing and live will hide them.
+ */
+switch (ENVIRONMENT)
+{
+	case 'development':
+		error_reporting(-1);
+		ini_set('display_errors', 1);
+	break;
+
+	case 'testing':
+	case 'production':
+		ini_set('display_errors', 0);
+		if (version_compare(PHP_VERSION, '5.3', '>='))
+		{
+			error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED);
+		}
+		else
+		{
+			error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_USER_NOTICE);
+		}
+	break;
+
+	default:
+		header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
+		echo 'The application environment is not set correctly.';
+		exit(1); // EXIT_ERROR
+}
+
+/*
+ *---------------------------------------------------------------
+ * SYSTEM FOLDER NAME
+ *---------------------------------------------------------------
+ *
+ * This variable must contain the name of your "system" folder.
+ * Include the path if the folder is not in the same directory
+ * as this file.
+ *
+ */
+	$system_path = dirname(__FILE__).'/vendor/codeigniter/framework/system';
+
+/*
+ *---------------------------------------------------------------
+ * APPLICATION FOLDER NAME
+ *---------------------------------------------------------------
+ *
+ * If you want this front controller to use a different "application"
+ * folder than the default one you can set its name here. The folder
+ * can also be renamed or relocated anywhere on your server. If
+ * you do, use a full server path. For more info please see the user guide:
+ * http://codeigniter.com/user_guide/general/managing_apps.html
+ *
+ * NO TRAILING SLASH!
+ *
+ */
+	$application_folder = dirname(__FILE__).'/application';
+
+/*
+ *---------------------------------------------------------------
+ * VIEW FOLDER NAME
+ *---------------------------------------------------------------
+ *
+ * If you want to move the view folder out of the application
+ * folder set the path to the folder here. The folder can be renamed
+ * and relocated anywhere on your server. If blank, it will default
+ * to the standard location inside your application folder. If you
+ * do move this, use the full server path to this folder.
+ *
+ * NO TRAILING SLASH!
+ */
+	$view_folder = '';
+
+
+/*
+ * --------------------------------------------------------------------
+ * DEFAULT CONTROLLER
+ * --------------------------------------------------------------------
+ *
+ * Normally you will set your default controller in the routes.php file.
+ * You can, however, force a custom routing by hard-coding a
+ * specific controller class/function here. For most applications, you
+ * WILL NOT set your routing here, but it's an option for those
+ * special instances where you might want to override the standard
+ * routing in a specific front controller that shares a common CI installation.
+ *
+ * IMPORTANT: If you set the routing here, NO OTHER controller will be
+ * callable. In essence, this preference limits your application to ONE
+ * specific controller. Leave the function name blank if you need
+ * to call functions dynamically via the URI.
+ *
+ * Un-comment the $routing array below to use this feature
+ *
+ */
+	// The directory name, relative to the "controllers" folder.  Leave blank
+	// if your controller is not in a sub-folder within the "controllers" folder
+	// $routing['directory'] = '';
+
+	// The controller class file name.  Example:  mycontroller
+	// $routing['controller'] = '';
+
+	// The controller function you wish to be called.
+	// $routing['function']	= '';
+
+
+/*
+ * -------------------------------------------------------------------
+ *  CUSTOM CONFIG VALUES
+ * -------------------------------------------------------------------
+ *
+ * The $assign_to_config array below will be passed dynamically to the
+ * config class when initialized. This allows you to set custom config
+ * items or override any default config values found in the config.php file.
+ * This can be handy as it permits you to share one application between
+ * multiple front controller files, with each file containing different
+ * config values.
+ *
+ * Un-comment the $assign_to_config array below to use this feature
+ *
+ */
+	// $assign_to_config['name_of_config_item'] = 'value of config item';
+
+
+
+// --------------------------------------------------------------------
+// END OF USER CONFIGURABLE SETTINGS.  DO NOT EDIT BELOW THIS LINE
+// --------------------------------------------------------------------
+
+/*
+ * ---------------------------------------------------------------
+ *  Resolve the system path for increased reliability
+ * ---------------------------------------------------------------
+ */
+
+	// Set the current directory correctly for CLI requests
+	if (defined('STDIN'))
+	{
+		chdir(dirname(__FILE__));
+	}
+
+	if (($_temp = realpath($system_path)) !== FALSE)
+	{
+		$system_path = $_temp.'/';
+	}
+	else
+	{
+		// Ensure there's a trailing slash
+		$system_path = rtrim($system_path, '/').'/';
+	}
+
+	// Is the system path correct?
+	if ( ! is_dir($system_path))
+	{
+		header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
+		echo 'Your system folder path does not appear to be set correctly. Please open the following file and correct this: '.pathinfo(__FILE__, PATHINFO_BASENAME);
+		exit(3); // EXIT_CONFIG
+	}
+
+/*
+ * -------------------------------------------------------------------
+ *  Now that we know the path, set the main path constants
+ * -------------------------------------------------------------------
+ */
+	// The name of THIS file
+	define('SELF', pathinfo(__FILE__, PATHINFO_BASENAME));
+
+	// Path to the system folder
+	define('BASEPATH', str_replace('\\', '/', $system_path));
+
+	// Path to the front controller (this file)
+	define('FHCPATH', dirname(__FILE__).'/');
+
+	// Name of the "system folder"
+	define('SYSDIR', trim(strrchr(trim(BASEPATH, '/'), '/'), '/'));
+
+
+	// The path to the "application" folder
+	if (is_dir($application_folder))
+	{
+		if (($_temp = realpath($application_folder)) !== FALSE)
+		{
+			$application_folder = $_temp;
+		}
+
+		define('APPPATH', $application_folder.DIRECTORY_SEPARATOR);
+	}
+	else
+	{
+		if ( ! is_dir(BASEPATH.$application_folder.DIRECTORY_SEPARATOR))
+		{
+			header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
+			echo 'Your application folder path does not appear to be set correctly. Please open the following file and correct this: '.SELF;
+			exit(3); // EXIT_CONFIG
+		}
+
+		define('APPPATH', BASEPATH.$application_folder.DIRECTORY_SEPARATOR);
+	}
+
+	// The path to the "views" folder
+	if ( ! is_dir($view_folder))
+	{
+		if ( ! empty($view_folder) && is_dir(APPPATH.$view_folder.DIRECTORY_SEPARATOR))
+		{
+			$view_folder = APPPATH.$view_folder;
+		}
+		elseif ( ! is_dir(APPPATH.'views'.DIRECTORY_SEPARATOR))
+		{
+			header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
+			echo 'Your view folder path does not appear to be set correctly. Please open the following file and correct this: '.SELF;
+			exit(3); // EXIT_CONFIG
+		}
+		else
+		{
+			$view_folder = APPPATH.'views';
+		}
+	}
+
+	if (($_temp = realpath($view_folder)) !== FALSE)
+	{
+		$view_folder = $_temp.DIRECTORY_SEPARATOR;
+	}
+	else
+	{
+		$view_folder = rtrim($view_folder, '/\\').DIRECTORY_SEPARATOR;
+	}
+
+	define('VIEWPATH', $view_folder);
+
+/*
+ * --------------------------------------------------------------------
+ * LOAD THE BOOTSTRAP FILE
+ * --------------------------------------------------------------------
+ *
+ * And away we go...
+ *
+ */
+
+// ... and the vendor autoload
+include_once 'vendor/autoload.php';
+
+// Autoload custom controllers, models, etc that are present in the application/core directory
+require_once 'application/config/core_includes.php';
+
+// Now the bootstrap file
+require_once BASEPATH.'core/CodeIgniter.php';
diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index 0e6a93d5f..599403665 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -1,117 +1,304 @@
+/* variables */
 @import '../components/searchbar.css';
-
-#cis-navigation-top .fhc-searchbar > .input-group {
-	margin: 0!important;
-}
-#cis-navigation-top .fhc-searchbar > .input-group > * {
-	border-radius: 0!important;
-}
-
-.avatar {
-	object-fit: cover;
-	height: 45px;
-	width: 45px;
-}
-
-#cis4 {
-	min-height: 100vh;
-	display: flex;
-	flex-direction: column;
-}
-#cis4 > header {
-	height: 48px;
-}
-/*body {
-	padding-top: 48px;
-}*/
-#cis-navigation-top.navbar-expand-lg .offcanvas {
-	margin-top: 48px;
+:root {
+  --fhc-cis-primary: #00649c;
+  --fhc-cis-header-px: 1rem;
+  --fhc-cis-header-py: .5rem;
+  --fhc-cis-main-px: 1rem;
+  --fhc-cis-main-py: 1rem;
+  --fhc-cis-menu-lvl-1-bg: #00649c;
+  --fhc-cis-menu-lvl-1-color: #fff;
+  --fhc-cis-menu-lvl-1-bg-hover: #005585;
+  --fhc-cis-menu-lvl-1-color-hover: #fff;
+  --fhc-cis-menu-lvl-2-bg: #343a40;
+  --fhc-cis-menu-lvl-2-color: #fff;
+  --fhc-cis-menu-lvl-2-bg-hover: #2c3136;
+  --fhc-cis-menu-lvl-2-color-hover: #fff;
+  --fhc-cis-menu-lvl-3-bg: #72777A;
+  --fhc-cis-menu-lvl-3-color: #fff;
+  --fhc-cis-menu-lvl-3-bg-hover: #616568;
+  --fhc-cis-menu-lvl-3-color-hover: #fff;
+  --fhc-cis-menu-lvl-4-bg: #ced4da;
+  --fhc-cis-menu-lvl-4-color: #000;
+  --fhc-cis-menu-lvl-4-bg-hover: #d5dae0;
+  --fhc-cis-menu-lvl-4-color-hover: #000;
+  --fhc-cis-menu-lvl-5-bg: #e9ecef;
+  --fhc-cis-menu-lvl-5-color: #000;
+  --fhc-cis-menu-lvl-5-bg-hover: #eceff1;
+  --fhc-cis-menu-lvl-5-color-hover: #000;
 }
 @media (min-width: 992px) {
-	#cis4 > header {
-		height: 61px;
-	}
-	/*body {
-		padding-top: 61px;
-	}*/
-	#cis-navigation-top.navbar-expand-lg .offcanvas {
-		background-color: transparent!important;
-		position: initial;
-	}
+  :root {
+    --fhc-cis-menu-width: 300px;
+    --fhc-cis-header-height: 60px;
+    --fhc-cis-menu-bg: #72777A;
+  }
+}
+@media (max-width: 991.98px) {
+  :root {
+    --fhc-cis-menu-width: 400px;
+    --fhc-cis-header-height: 40px;
+    --fhc-cis-menu-bg: #343a40;
+  }
 }
 
-#cis-navigation-left {
-	--fhc-menu-level-1-bg: #0d6efd;
-	--fhc-menu-level-1-color: #fff;
-	--fhc-menu-level-1-border: #0d6efd;
-	--fhc-menu-level-1-hover-bg: #0b5ed7;
-	--fhc-menu-level-1-hover-color: #fff;
-	--fhc-menu-level-1-hover-border: #0a58ca;
-	--fhc-menu-level-2-bg: #6c757d;
-	--fhc-menu-level-2-color: #fff;
-	--fhc-menu-level-2-border: #6c757d;
-	--fhc-menu-level-2-hover-bg: #5c636a;
-	--fhc-menu-level-2-hover-color: #fff;
-	--fhc-menu-level-2-hover-border: #565e64;
-	--fhc-menu-level-3-bg: #212529;
-	--fhc-menu-level-3-color: #fff;
-	--fhc-menu-level-3-border: #212529;
-	--fhc-menu-level-3-hover-bg: #1c1f23;
-	--fhc-menu-level-3-hover-color: #fff;
-	--fhc-menu-level-3-hover-border: #1a1e21;
+/* buttons */
+#cis-header .btn-level-1,
+#cis-header .btn-level-1 + .btn,
+#cis-nav .btn-level-1,
+#cis-nav .btn-level-1 + .btn {
+  color: var(--fhc-cis-menu-lvl-1-color);
+  /* border-color: var(--fhc-cis-menu-lvl-1-border); */
+  background-color: var(--fhc-cis-menu-lvl-1-bg);
 }
-#cis-navigation-left .btn-level-1,
-#cis-navigation-left .btn-level-1 + .btn {
-	color: var(--fhc-menu-level-1-color);
-	border-color: var(--fhc-menu-level-1-border);
-	background-color: var(--fhc-menu-level-1-bg);
+#cis-header .btn-level-1:hover, #cis-header .btn-level-1:focus,
+#cis-header .btn-level-1 + .btn:hover,
+#cis-header .btn-level-1 + .btn:focus,
+#cis-nav .btn-level-1:hover,
+#cis-nav .btn-level-1:focus,
+#cis-nav .btn-level-1 + .btn:hover,
+#cis-nav .btn-level-1 + .btn:focus {
+  color: var(--fhc-cis-menu-lvl-1-color-hover);
+  /* border-color: var(--fhc-cis-menu-lvl-1-border-hover); */
+  background-color: var(--fhc-cis-menu-lvl-1-bg-hover);
 }
-#cis-navigation-left .btn-level-1:hover,
-#cis-navigation-left .btn-level-1:focus,
-#cis-navigation-left .btn-level-1 + .btn:hover,
-#cis-navigation-left .btn-level-1 + .btn:focus {
-	color: var(--fhc-menu-level-1-hover-color);
-	border-color: var(--fhc-menu-level-1-hover-border);
-	background-color: var(--fhc-menu-level-1-hover-bg);
+#cis-header .btn-level-2,
+#cis-header .btn-level-2 + .btn,
+#cis-nav .btn-level-2,
+#cis-nav .btn-level-2 + .btn {
+  color: var(--fhc-cis-menu-lvl-2-color);
+  /* border-color: var(--fhc-cis-menu-lvl-2-border); */
+  background-color: var(--fhc-cis-menu-lvl-2-bg);
 }
-#cis-navigation-left .btn-level-2,
-#cis-navigation-left .btn-level-2 + .btn {
-	color: var(--fhc-menu-level-2-color);
-	border-color: var(--fhc-menu-level-2-border);
-	background-color: var(--fhc-menu-level-2-bg);
+#cis-header .btn-level-2:hover, #cis-header .btn-level-2:focus,
+#cis-header .btn-level-2 + .btn:hover,
+#cis-header .btn-level-2 + .btn:focus,
+#cis-nav .btn-level-2:hover,
+#cis-nav .btn-level-2:focus,
+#cis-nav .btn-level-2 + .btn:hover,
+#cis-nav .btn-level-2 + .btn:focus {
+  color: var(--fhc-cis-menu-lvl-2-color-hover);
+  /* border-color: var(--fhc-cis-menu-lvl-2-border-hover); */
+  background-color: var(--fhc-cis-menu-lvl-2-bg-hover);
 }
-#cis-navigation-left .btn-level-2:hover,
-#cis-navigation-left .btn-level-2:focus,
-#cis-navigation-left .btn-level-2 + .btn:hover,
-#cis-navigation-left .btn-level-2 + .btn:focus {
-	color: var(--fhc-menu-level-2-hover-color);
-	border-color: var(--fhc-menu-level-2-hover-border);
-	background-color: var(--fhc-menu-level-2-hover-bg);
+#cis-header .btn-level-3,
+#cis-header .btn-level-3 + .btn,
+#cis-nav .btn-level-3,
+#cis-nav .btn-level-3 + .btn {
+  color: var(--fhc-cis-menu-lvl-3-color);
+  /* border-color: var(--fhc-cis-menu-lvl-3-border); */
+  background-color: var(--fhc-cis-menu-lvl-3-bg);
 }
-#cis-navigation-left .btn-level-3,
-#cis-navigation-left .btn-level-3 + .btn {
-	color: var(--fhc-menu-level-3-color);
-	border-color: var(--fhc-menu-level-3-border);
-	background-color: var(--fhc-menu-level-3-bg);
+#cis-header .btn-level-3:hover, #cis-header .btn-level-3:focus,
+#cis-header .btn-level-3 + .btn:hover,
+#cis-header .btn-level-3 + .btn:focus,
+#cis-nav .btn-level-3:hover,
+#cis-nav .btn-level-3:focus,
+#cis-nav .btn-level-3 + .btn:hover,
+#cis-nav .btn-level-3 + .btn:focus {
+  color: var(--fhc-cis-menu-lvl-3-color-hover);
+  /* border-color: var(--fhc-cis-menu-lvl-3-border-hover); */
+  background-color: var(--fhc-cis-menu-lvl-3-bg-hover);
 }
-#cis-navigation-left .btn-level-3:hover,
-#cis-navigation-left .btn-level-3:focus,
-#cis-navigation-left .btn-level-3 + .btn:hover,
-#cis-navigation-left .btn-level-3 + .btn:focus {
-	color: var(--fhc-menu-level-3-hover-color);
-	border-color: var(--fhc-menu-level-3-hover-border);
-	background-color: var(--fhc-menu-level-3-hover-bg);
+#cis-header .btn-level-4,
+#cis-header .btn-level-4 + .btn,
+#cis-nav .btn-level-4,
+#cis-nav .btn-level-4 + .btn {
+  color: var(--fhc-cis-menu-lvl-4-color);
+  /* border-color: var(--fhc-cis-menu-lvl-4-border); */
+  background-color: var(--fhc-cis-menu-lvl-4-bg);
+}
+#cis-header .btn-level-4:hover, #cis-header .btn-level-4:focus,
+#cis-header .btn-level-4 + .btn:hover,
+#cis-header .btn-level-4 + .btn:focus,
+#cis-nav .btn-level-4:hover,
+#cis-nav .btn-level-4:focus,
+#cis-nav .btn-level-4 + .btn:hover,
+#cis-nav .btn-level-4 + .btn:focus {
+  color: var(--fhc-cis-menu-lvl-4-color-hover);
+  /* border-color: var(--fhc-cis-menu-lvl-4-border-hover); */
+  background-color: var(--fhc-cis-menu-lvl-4-bg-hover);
+}
+#cis-header .btn-level-5,
+#cis-header .btn-level-5 + .btn,
+#cis-nav .btn-level-5,
+#cis-nav .btn-level-5 + .btn {
+  color: var(--fhc-cis-menu-lvl-5-color);
+  /* border-color: var(--fhc-cis-menu-lvl-5-border); */
+  background-color: var(--fhc-cis-menu-lvl-5-bg);
+}
+#cis-header .btn-level-5:hover, #cis-header .btn-level-5:focus,
+#cis-header .btn-level-5 + .btn:hover,
+#cis-header .btn-level-5 + .btn:focus,
+#cis-nav .btn-level-5:hover,
+#cis-nav .btn-level-5:focus,
+#cis-nav .btn-level-5 + .btn:hover,
+#cis-nav .btn-level-5 + .btn:focus {
+  color: var(--fhc-cis-menu-lvl-5-color-hover);
+  /* border-color: var(--fhc-cis-menu-lvl-5-border-hover); */
+  background-color: var(--fhc-cis-menu-lvl-5-bg-hover);
+}
+#cis-header .btn.dropdown-toggle,
+#cis-nav .btn.dropdown-toggle {
+  padding-right: 0.5625rem;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+#cis-header .btn.dropdown-toggle:after,
+#cis-nav .btn.dropdown-toggle:after {
+  transition: all 0.2s ease-in-out;
+}
+#cis-header .btn.dropdown-toggle.collapsed:after,
+#cis-nav .btn.dropdown-toggle.collapsed:after {
+  transform: rotate(-90deg);
 }
 
-#cis-navigation-left .btn.dropdown-toggle {
-	padding-right: .5625rem;
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
+/* searchbar */
+#nav-search {
+  z-index: 1;
 }
-#cis-navigation-left .dropdown-toggle:after {
-	transition: all .2s ease-in-out;
+#nav-search.me-3 {
+  margin: 0 !important;
 }
-#cis-navigation-left .dropdown-toggle.collapsed:after {
-	transform: rotate(-90deg);
-}
\ No newline at end of file
+#nav-search > .input-group {
+  margin: 0 !important;
+}
+#nav-search > .input-group > * {
+  border-radius: 0 !important;
+}
+#nav-search .searchbar_results {
+  top: 100% !important;
+  left: 0;
+  right: 0 !important;
+  width: 100% !important;
+}
+
+/* desktop */
+@media (min-width: 992px) {
+  body {
+    display: flex;
+    padding-top: var(--fhc-cis-header-height);
+    width: 100vw;
+    /* overflow: visible !important; */
+  }
+  #cis-header nav {
+    position: initial;
+    transform: none;
+    width: auto;
+    visibility: visible !important;
+    height: 100%;
+    transition: none;
+    border-right: none;
+    min-height: calc(100vh - var(--fhc-cis-header-height));
+  }
+  #nav-main-btn {
+    display: none;
+  }
+  #nav-logo {
+    position: fixed;
+    top: 0;
+    left: 0;
+    height: var(--fhc-cis-header-height);
+    width: var(--fhc-cis-menu-width);
+    background-color: var(--fhc-cis-primary);
+    padding: var(--fhc-cis-header-py) var(--fhc-cis-header-px);
+    z-index: 2;
+  }
+  #nav-logo img {
+    object-fit: contain;
+    object-position: left;
+    width: 100%;
+    height: 100%;
+  }
+  #nav-main-toggle {
+    width: 0;
+    z-index: 1;
+  }
+  #nav-main-toggle .fa-arrow-circle-left {
+    transition: all 0.5s ease-in-out;
+  }
+  #nav-main-toggle .collapsed .fa-arrow-circle-left {
+    transform: scaleX(-1);
+  }
+  #nav-search {
+    position: fixed;
+    top: 0;
+    left: var(--fhc-cis-menu-width);
+    height: var(--fhc-cis-header-height);
+    right: calc(var(--fhc-cis-header-height) + 2 * var(--fhc-cis-header-px) - 2 * var(--fhc-cis-header-py));
+    width: auto !important;
+  }
+  #nav-user-btn {
+    position: fixed;
+    top: 0;
+    right: 0;
+    border-width: 0;
+    padding: var(--fhc-cis-header-py) var(--fhc-cis-header-px);
+    background-color: var(--fhc-cis-primary);
+  }
+  #nav-user-btn img {
+    object-fit: cover;
+    height: calc(var(--fhc-cis-header-height) - 2 * var(--fhc-cis-header-py));
+    width: calc(var(--fhc-cis-header-height) - 2 * var(--fhc-cis-header-py));
+  }
+  #nav-user-menu {
+    position: absolute;
+    top: var(--fhc-cis-header-height);
+    right: 0;
+    min-width: var(--fhc-cis-menu-width);
+    background-color: var(--fhc-cis-menu-lvl-2-bg);
+  }
+  #nav-main-menu {
+    height: 100%;
+    background-color: var(--fhc-cis-menu-bg);
+  }
+  #nav-main-menu > div {
+    width: var(--fhc-cis-menu-width);
+  }
+}
+/* mobile */
+@media (max-width: 991.98px) {
+  #cis-main {
+    padding-left: var(--fhc-cis-main-px);
+  }
+  #cis-header {
+    background-color: var(--fhc-cis-primary);
+    height: var(--fhc-cis-header-height);
+    position: fixed;
+    width: 100vw;
+    display: flex;
+    justify-content: space-between;
+    z-index: 1;
+  }
+  #cis-header nav {
+    top: var(--fhc-cis-header-height);
+    background-color: var(--fhc-cis-menu-bg);
+    border-right: none;
+    min-height: calc(100vh - var(--fhc-cis-header-height));
+  }
+  #nav-logo img {
+    height: var(--fhc-cis-header-height);
+    width: auto;
+  }
+  #nav-search {
+    position: relative;
+  }
+  #nav-user-btn {
+    width: 100%;
+  }
+  #nav-user-btn img {
+    object-fit: cover;
+    height: 1.5rem;
+    width: 1.5rem;
+  }
+  #nav-user-menu {
+    position: relative !important;
+    transform: none !important;
+  }
+  #nav-main-menu {
+    display: block;
+  }
+}
+
+/*# sourceMappingURL=Cis.css.map */
diff --git a/public/css/Cis4/Cms.css b/public/css/Cis4/Cms.css
index b35d04d6b..6091ee720 100644
--- a/public/css/Cis4/Cms.css
+++ b/public/css/Cis4/Cms.css
@@ -1,3 +1,38 @@
+
+/* New */
+#cms article.news-list-item img {
+	max-width: 100%;
+	height: auto;
+}
+#cms article.news-list-item footer > a:last-child {
+	margin-inline-end: 0 !important;
+}
+#cms article.news-list-item footer > a:first-child {
+	margin-inline-start: 0 !important;
+}
+#cms a.btn-outline-primary {
+	color: var(--fhc-cis-primary);
+	border-color: var(--fhc-cis-primary);
+}
+#cms a.btn-outline-primary:hover,
+#cms a.btn-outline-primary:focus {
+	color: #fff;
+	background-color: var(--fhc-cis-primary);
+	border-color: var(--fhc-cis-primary);
+}
+#cms a.btn-primary {
+	color: var(--fhc-cis-menu-lvl-1-color);
+	background-color: var(--fhc-cis-menu-lvl-1-bg);
+	border-color: var(--fhc-cis-menu-lvl-1-bg);
+}
+#cms a.btn-primary:hover,
+#cms a.btn-primary:focus {
+	color: var(--fhc-cis-menu-lvl-1-color-hover);
+	background-color: var(--fhc-cis-menu-lvl-1-bg-hover);
+	border-color: var(--fhc-cis-menu-lvl-1-bg-hover);
+	text-decoration: none;
+}
+
 /* Allgemein */
 #cms {
 	background-color: white;
@@ -56,7 +91,7 @@
 	margin-left: 6px;
 }
 #cms ul li {
-	list-style-image:url(images/square_blue.png);
+	list-style-image:url(../../../skin/images/square_blue.png);
 	padding-left: 0px;
 	padding-top: 2px;
 	padding-bottom: 2px;
diff --git a/public/css/Cis4/Legacy.css b/public/css/Cis4/Legacy.css
new file mode 100644
index 000000000..055abba45
--- /dev/null
+++ b/public/css/Cis4/Legacy.css
@@ -0,0 +1,4 @@
+iframe {
+	width: 100%;
+	min-height: 100%;
+}
\ No newline at end of file
diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js
index 09896e521..7b11c2cfa 100644
--- a/public/js/apps/Cis.js
+++ b/public/js/apps/Cis.js
@@ -1,7 +1,74 @@
 import FhcSearchbar from "../components/searchbar/searchbar.js";
+import CisMenu from "../components/Cis/Menu.js";
+
+import fhcapifactory from "./api/fhcapifactory.js";
+Vue.$fhcapi = fhcapifactory;
 
 Vue.createApp({
+    data: function() {
+        return {
+            searchbaroptions: {
+                types: [
+                    "mitarbeiter",
+                    "raum",
+                    "organisationunit"
+                ],
+                actions: {
+                    employee: {
+                        defaultaction: {
+                            type: "function",
+                            action: function(data) {
+                                alert('employee defaultaction ' + JSON.stringify(data));
+                            }
+                        },
+                        childactions: []
+                    },
+                    raum: {
+                        defaultaction: {
+                            type: "function",
+                            action: function(data) { 
+                                alert('raum defaultaction ' + JSON.stringify(data));
+                            }
+                        },
+                        childactions: [
+                            {
+                                label: "Rauminformation",
+                                icon: "fas fa-info-circle",
+                                type: "link",
+                                action: function(data) {
+                                    return data.infolink;
+                                }
+                            },
+                            {
+                                label: "Raumreservierung",
+                                icon: "fas fa-bookmark",
+                                type: "link",
+                                action: function(data) {
+                                    return data.booklink;
+                                }
+                            }
+                        ]
+                    },
+                    organisationunit: {
+                        defaultaction: {
+                            type: "function",
+                            action: function(data) {
+                                alert('organisationunit defaultaction ' + JSON.stringify(data));
+                            }
+                        },
+                        childactions: []
+                    }
+                }
+            }
+        };
+    },
+    methods: {
+        searchfunction: function(searchsettings) {
+            return Vue.$fhcapi.Search.search(searchsettings);
+        }
+    },
     components: {
-        FhcSearchbar
+        FhcSearchbar,
+        CisMenu
     }
-}).mount('#cis-navigation-top');
\ No newline at end of file
+}).mount('#cis-header');
\ No newline at end of file
diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js
new file mode 100644
index 000000000..7a75886c6
--- /dev/null
+++ b/public/js/components/Cis/Menu.js
@@ -0,0 +1,57 @@
+import CisMenuEntry from "./Menu/Entry.js";
+import FhcSearchbar from "../searchbar/searchbar.js";
+
+export default {
+    components: {
+        CisMenuEntry,
+        FhcSearchbar
+    },
+    props: {
+        rootUrl: String,
+        logoUrl: String,
+        avatarUrl: String,
+        searchbaroptions: Object,
+        searchfunction: Function
+    },
+    data: () => {
+        return {
+            entries: []
+        };
+    },
+    created() {
+        axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/CisVue/Menu').then(res => {
+            this.entries = res.data.retval.childs;
+        });
+    },
+    template: `
+    <button id="nav-main-btn" class="navbar-toggler" type="button" data-bs-toggle="offcanvas" data-bs-target="#nav-main" aria-controls="nav-main" aria-expanded="false" aria-label="Toggle navigation">
+        <span class="navbar-toggler-icon"></span>
+    </button>
+    <a id="nav-logo" :href="rootUrl">
+        <img :src="logoUrl" alt="Logo">
+    </a>
+    <nav id="nav-main" class="offcanvas offcanvas-start bg-dark" tabindex="-1" aria-labelledby="nav-main-btn" data-bs-backdrop="false">
+        <div id="nav-main-toggle" class="position-static d-none d-lg-block bg-dark">
+            <button type="button" class="btn bg-dark text-light rounded-0 p-1 d-flex align-items-center" data-bs-toggle="collapse" data-bs-target="#nav-main-menu" aria-expanded="true" aria-controls="nav-main-menu">
+                <i class="fa fa-arrow-circle-left"></i>
+            </button>
+        </div>
+        <div class="offcanvas-body p-0">
+            <fhc-searchbar id="nav-search" class="fhc-searchbar w-100" :searchoptions="searchbaroptions" :searchfunction="searchfunction"></fhc-searchbar>
+            <button id="nav-user-btn" class="btn btn-link rounded-0" type="button" data-bs-toggle="collapse" data-bs-target="#nav-user-menu" aria-expanded="false" aria-controls="nav-user-menu">
+                <img :src="avatarUrl" class="avatar rounded-circle"/>
+            </button>
+            <ul id="nav-user-menu" class="collapse list-unstyled" aria-labelledby="nav-user-btn">
+                <li><a class="btn btn-level-2 rounded-0 d-block" href="#" id="menu-profil">Profil</a></li>
+                <li><a class="btn btn-level-2 rounded-0 d-block" href="#">Ampeln</a></li>
+                <li><hr class="dropdown-divider"></li>
+                <li><a class="btn btn-level-2 rounded-0 d-block" href="#">Logout</a></li>
+            </ul>
+            <div id="nav-main-menu" class="collapse collapse-horizontal show">
+                <div>
+                    <cis-menu-entry v-for="entry in entries" :key="entry.content_id" :entry="entry" />
+                </div>
+            </div>
+        </div>
+    </nav>`
+};
\ No newline at end of file
diff --git a/public/js/components/Cis/Menu/Entry.js b/public/js/components/Cis/Menu/Entry.js
new file mode 100644
index 000000000..0299e00a4
--- /dev/null
+++ b/public/js/components/Cis/Menu/Entry.js
@@ -0,0 +1,114 @@
+export default {
+    name: 'CisMenuEntry',
+    props: {
+        entry: Object,
+        level: {
+            type: Number,
+            default: 1
+        }
+    },
+    data: () => {
+        return {
+            collapse: null
+        }
+    },
+    computed: {
+        link() {
+            if (this.entry.template_kurzbz == 'redirect') {
+                if (!this.entry.content)
+                    return '';
+                let xmlDoc = (new DOMParser()).parseFromString(this.entry.content,"text/xml");
+                let url = xmlDoc.getElementsByTagName('url')[0];
+                if (!url)
+                    return '';
+                // TODO(chris): replace get params
+                url = url.childNodes[0].nodeValue + "";
+                url = url.replace(/^\.\.\//, FHC_JS_DATA_STORAGE_OBJECT.app_root);
+                return url;
+            }
+            return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/CisVue/Cms/content/' + this.entry.content_id;
+        },
+        target() {
+            if (this.entry.template_kurzbz == 'redirect') {
+                if (!this.entry.content)
+                    return '';
+                let xmlDoc = (new DOMParser()).parseFromString(this.entry.content,"text/xml");
+                let target = xmlDoc.getElementsByTagName('target')[0];
+                if (!target)
+                    return '';
+                
+                target = target.childNodes[0].nodeValue + "";
+                if (target == 'content' || target == '_self')
+                    target = "";
+                return target;
+            }
+            return ''
+        },
+        hasChilds() {
+            return this.entry.childs && this.entry.childs.length !== 0;
+        }
+    },
+    methods: {
+        toggleCollapse(evt) {
+            if (this.collapse !== null) {
+                this.entry.menu_open = !this.entry.menu_open;
+                this.collapse.toggle(evt.target);
+            }
+        }
+    },
+    mounted() {
+        if (this.$refs.children) {
+            if (this.entry.menu_open)
+                this.$refs.children.className += ' show';
+            this.collapse = new bootstrap.Collapse(this.$refs.children, { toggle: false });
+        }
+    },
+    template: `
+    <div v-if="entry.template_kurzbz == 'include'">
+        INCLUDE
+    </div>
+    <template v-else>
+        <template v-if="hasChilds">
+            <a v-if="link.substr(0, 1) == '#'" 
+                @click.prevent="toggleCollapse" 
+                :aria-expanded="entry.menu_open" 
+                :href="link" 
+                :class="{
+                    'btn btn-default rounded-0 w-100 text-start dropdown-toggle': true,
+                    ['btn-level-' + level]: true,
+                    collapsed: !entry.menu_open
+                }">
+                <span>{{ entry.titel }}</span>
+            </a>
+            <div v-else class="btn-group w-100">
+                <a :href="link" :target="target" 
+                    :class="{
+                        'btn btn-default rounded-0 text-start': true,
+                        ['btn-level-' + level]: true
+                    }">
+                    {{ entry.titel }}
+                </a>
+                <button @click.prevent="toggleCollapse" :aria-expanded="entry.menu_open" 
+                    :class="{
+                        'btn btn-default rounded-0 dropdown-toggle dropdown-toggle-split flex-grow-0': true,
+                        collapsed: !entry.menu_open
+                    }">
+                    <span class="visually-hidden">Toggle Dropdown</span>
+                </button>
+            </div>
+            <ul ref="children" 
+                class="nav w-100 collapse">
+                <cis-menu-entry v-for="child in entry.childs" :key="child" :entry="child" :level="level + 1"/>
+            </ul>
+        </template>
+        <a v-else 
+            :href="link" 
+            :target="target" 
+            :class="{
+                'btn btn-default rounded-0 w-100 text-start': true, 
+                ['btn-level-' + level]: true
+            }">
+            {{ entry.titel }}
+        </a>
+    </template>`
+};
\ No newline at end of file
diff --git a/public/js/components/Cis/Navigation/Left.js b/public/js/components/Cis/Navigation/Left.js
new file mode 100644
index 000000000..fa70b2307
--- /dev/null
+++ b/public/js/components/Cis/Navigation/Left.js
@@ -0,0 +1,88 @@
+export default {
+    template: `
+    <div id="sidebar-container" class="d-none d-lg-block position-sticky">
+        <ul class="list-group list-group-flush">
+            <!-- Separator with title -->
+            <li class="list-group-item sidebar-separator-title text-muted d-flex align-items-center menu-collapsed">
+                <small>MAIN MENU</small>
+            </li>
+            <!-- /end Separator -->
+            <a href="#submenu1" data-bs-toggle="collapse" aria-expanded="true" class="bg-primary list-group-item list-group-item-action flex-column align-items-start">
+                <div class="d-flex w-100 justify-content-start align-items-center">
+                    <i class="fa fa-user fa-fw me-3"></i>
+                    <span class="menu-collapsed">Mein CIS</span>
+                </div>
+            </a>
+            <div id='submenu1' class="collapse show sidebar-submenu">
+                <a href="#" class="list-group-item list-group-item-action list-group-item-dark text-white active" id="menu-mein-bereich">
+                    <span class="menu-collapsed">Mein Bereich</span>
+                </a>
+                <a href="#" class="list-group-item list-group-item-action list-group-item-dark text-white">
+                    <span class="menu-collapsed">Studium</span>
+                </a>
+                <a href="#" class="list-group-item list-group-item-action list-group-item-dark text-white" id="menu-lvplan">
+                    <span class="menu-collapsed">LV Plan</span>
+                </a>
+                <a href="#" class="list-group-item list-group-item-action list-group-item-dark text-white">
+                    <span class="menu-collapsed">Campus Life</span>
+                </a>
+            </div>
+            <a href="#submenu2" data-bs-toggle="collapse" aria-expanded="false" class="bg-primary list-group-item list-group-item-action flex-column align-items-start">
+                <div class="d-flex w-100 justify-content-start align-items-center">
+                    <i class="fa fa-user fa-fw me-3"></i>
+                    <span class="menu-collapsed">FHTW Hochschule</span>
+                </div>
+            </a>
+            <div id='submenu2' class="collapse sidebar-submenu">
+                <a href="#" class="list-group-item list-group-item-action list-group-item-dark text-white" id="menu-organisation">
+                    <span class="menu-collapsed">Organisation</span>
+                </a>
+                <a href="#" class="list-group-item list-group-item-action list-group-item-dark text-white">
+                    <span class="menu-collapsed">Studiengänge</span>
+                </a>
+                <a href="#" class="list-group-item list-group-item-action list-group-item-dark text-white">
+                    <span class="menu-collapsed">Forschung & Entwicklung</span>
+                </a>
+                <a href="#" class="list-group-item list-group-item-action list-group-item-dark text-white">
+                    <span class="menu-collapsed">Technikum Wien Acadamy</span>
+                </a>
+            </div>
+            <a href="#submenu3" data-bs-toggle="collapse" aria-expanded="false" class="bg-primary list-group-item flex-column align-items-start">
+                <div class="d-flex w-100 justify-content-start align-items-center">
+                    <i class="fa fa-user fa-fw me-3"></i>
+                    <span class="menu-collapsed">FHTW Services</span>
+                </div>
+            </a>
+            <div id='submenu3' class="collapse sidebar-submenu">
+                <a href="#" class="list-group-item list-group-item-action list-group-item-dark text-white">
+                    <span class="menu-collapsed">Teaching & Learning Center</span>
+                </a>
+                <a href="#" class="list-group-item list-group-item-action list-group-item-dark text-white">
+                    <span class="menu-collapsed">International Office</span>
+                </a>
+                <a href="#" class="list-group-item list-group-item-action list-group-item-dark text-white">
+                    <span class="menu-collapsed">Bibliothek</span>
+                </a>
+                <a href="#" class="list-group-item list-group-item-action list-group-item-dark text-white">
+                    <span class="menu-collapsed">IT-Services</span>
+                </a>
+            </div>
+            <a href="#submenu4" data-bs-toggle="collapse" aria-expanded="false" class="bg-primary list-group-item flex-column align-items-start">
+                <div class="d-flex w-100 justify-content-start align-items-center">
+                    <i class="fa fa-user fa-fw me-3"></i>
+                    <span class="menu-collapsed">Links & Downloads</span>
+                </div>
+            </a>
+            <li class="list-group-item sidebar-separator-title text-muted d-flex align-items-center menu-collapsed">
+                <small>AKTUELL</small>
+            </li>
+            <a href="#" class="bg-primary list-group-item">
+                <div class="d-flex w-100 justify-content-start align-items-center">
+                    <i class="fa fa-medkit fa-fw me-3"></i>
+                    <span class="menu-collapsed">COVID 19</span>
+                </div>
+            </a>
+            <li class="list-group-item sidebar-separator menu-collapsed"></li>
+        </ul>
+    </div>`
+};
\ No newline at end of file
diff --git a/public/js/components/Cis/Navigation/Top.js b/public/js/components/Cis/Navigation/Top.js
new file mode 100644
index 000000000..9df1fefa1
--- /dev/null
+++ b/public/js/components/Cis/Navigation/Top.js
@@ -0,0 +1,63 @@
+import FhcSearchbar from "../../searchbar/searchbar.js";
+import CisNavigationUser from "./User.js";
+
+export default {
+    components: {
+        FhcSearchbar,
+        CisNavigationUser
+    },
+    data: () => {
+        return {
+            nav: null
+        }
+    },
+    computed: {
+        rootUrl() {
+            return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/cis';
+        },
+        logoImg() {
+            return FHC_JS_DATA_STORAGE_OBJECT.app_root + 'public/images/logo-300x160.png';
+        }
+    },
+    methods: {
+        openNav() {
+            if (this.nav)
+                this.nav.toggle();
+        },
+        async search() {
+            return {data: {data: []}};
+        }
+    },
+    mounted() {
+        this.nav = new bootstrap.Offcanvas(this.$refs.nav, {backdrop: false});
+    },
+    template: `
+    <div class="cis-navigation-top navbar navbar-expand-lg fixed-top navbar-dark bg-primary p-0">
+        <button class="navbar-toggler border-0" type="button" @click="openNav">
+            <span class="navbar-toggler-icon"></span>
+        </button>
+        <a class="navbar-brand col-auto col-lg-2 px-3 py-0 m-0" :href="rootUrl">
+            <img :src="logoImg" width="90">
+        </a>
+        <div ref="nav" class="offcanvas offcanvas-start align-items-stretch mt-lg-0 w-100 px-3 px-lg-0 d-flex flex-column flex-lg-row bg-dark" tabindex="-1">
+            <fhc-searchbar class="fhc-searchbar w-100 me-0" :searchoptions="{types:[],actions:{}}" :searchfunction="search"></fhc-searchbar>
+            <ul class="navbar-nav flex-grow-1">
+                <li class="nav-item d-lg-none">
+                    <a class="nav-link" href="#">Mein CIS</a>
+                </li>
+                <li class="nav-item d-lg-none">
+                    <a class="nav-link" href="#">FHTW Campus</a>
+                </li>
+                <li class="nav-item d-lg-none">
+                    <a class="nav-link" href="#">FHTW Services</a>
+                </li>
+                <li class="nav-item d-lg-none">
+                    <a class="nav-link" href="#">COVID 19</a>
+                </li>
+                <li class="nav-item">
+                    <cis-navigation-user></cis-navigation-user>
+                </li>
+            </ul>
+        </div>
+    </div>`
+};
diff --git a/public/js/components/Cis/Navigation/User.js b/public/js/components/Cis/Navigation/User.js
new file mode 100644
index 000000000..4cf78d422
--- /dev/null
+++ b/public/js/components/Cis/Navigation/User.js
@@ -0,0 +1,22 @@
+export default {
+  data: () => {
+    return {
+      imgSrc: FHC_JS_DATA_STORAGE_OBJECT.app_root + '/cis/public/bild.php'
+    }
+  },
+  created() {
+    axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/cis/navigation/user').then(res => {this.imgSrc += '?src=person&person_id=' + res.data.retval});
+  },
+  template: `
+  <div class="dropdown dropstart">
+    <a class="dropdown-toggle nav-link" href="#" id="dropdown01" data-bs-toggle="dropdown" aria-expanded="false">
+      <img :src="imgSrc" class="avatar rounded-circle" width="45" height="45"/>
+    </a>
+    <ul class="dropdown-menu dropdown-menu-dark m-0" aria-labelledby="dropdown01">
+      <li><a class="dropdown-item" href="#" id="menu-profil">Profil</a></li>
+      <li><a class="dropdown-item" href="#">Ampeln</a></li>
+      <li><hr class="dropdown-divider"></li>
+      <li><a class="dropdown-item" href="#">Logout</a></li>
+    </ul>
+  </div>`
+};
\ No newline at end of file
diff --git a/system/dbupdate_3.4/25999_cis4_cms.php b/system/dbupdate_3.4/25999_cis4_cms.php
index 5ff40d1d0..7f7fda4c8 100644
--- a/system/dbupdate_3.4/25999_cis4_cms.php
+++ b/system/dbupdate_3.4/25999_cis4_cms.php
@@ -12,6 +12,19 @@ if(!$result = @$db->db_query("SELECT xslt_xhtml_c4 FROM campus.tbl_template LIMI
 		echo '<br>campus.tbl_template: Spalte xslt_xhtml_c4 hinzugefuegt';
 
 	// TODO(chris): add default values
+	$qry = "";
+	$qry .= "UPDATE campus.tbl_template SET xslt_xhtml_c4='" . '<xsl:stylesheet version="1.0" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"><xsl:template match="content"><h1><xsl:value-of select="titel" /></h1><xsl:value-of select="inhalt" disable-output-escaping="yes" /></xsl:template></xsl:stylesheet>' . "' WHERE template_kurzbz='contentmittitel';";
+	$qry .= "UPDATE campus.tbl_template SET xslt_xhtml_c4='" . '<xsl:stylesheet version="1.0" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"><xsl:template match="content"><xsl:value-of select="inhalt" disable-output-escaping="yes" /></xsl:template></xsl:stylesheet>' . "' WHERE template_kurzbz='contentohnetitel';";
+	$qry .= "UPDATE campus.tbl_template SET xslt_xhtml_c4='" . '<xsl:stylesheet version="1.0" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"><xsl:template match="content"><script type="text/javascript">window.location.href='<xsl:value-of select="url" />';</script><div class="alert alert-primary" role="alert">Sie werden automatisch weitergeleitet. Sollte dies nicht der Fall sein, klicken sie bitte <xsl:variable name="url" select="url"></xsl:variable><a href="{url}">hier</a></div></xsl:template></xsl:stylesheet>' . "' WHERE template_kurzbz='redirect';";
+	$qry .= "UPDATE campus.tbl_template SET xslt_xhtml_c4='" . '<xsl:stylesheet version="1.0" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"><xsl:template match="content"><div class="alert alert-danger" role="alert">Diese Seite sollte nicht direkt aufgerufen werden!</div></xsl:template></xsl:stylesheet>' . "' WHERE template_kurzbz='include';";
+	$qry .= "UPDATE campus.tbl_template SET xslt_xhtml_c4='" . '<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"><xsl:output encoding="UTF-8" omit-xml-declaration="yes" indent="yes"/><xsl:template match="/"><h1>News</h1><div class="row"><xsl:choose><xsl:when test="content/stg_extras"><div class="news-list col-9" aria-role="feed"><xsl:call-template name="content"/></div><aside class="col-3"><xsl:apply-templates select="content/stg_extras" /></aside></xsl:when><xsl:otherwise><div class="news-list col" aria-role="feed"><xsl:call-template name="content"/></div></xsl:otherwise></xsl:choose></div></xsl:template><xsl:template name="content"><xsl:choose><xsl:when test="content/news"><xsl:apply-templates select="content/news" /></xsl:when><xsl:when test="content/newswrapper"><xsl:apply-templates select="content/newswrapper" /></xsl:when><xsl:when test="newswrapper"><xsl:apply-templates select="newswrapper" /></xsl:when><xsl:otherwise><xsl:apply-templates select="news" /></xsl:otherwise></xsl:choose></xsl:template><xsl:template name="PreventSelfClosure"><xsl:value-of select="\'\'" /></xsl:template><xsl:template match="newswrapper"><xsl:apply-templates select="news"><xsl:with-param name="datum" select="datum" /><xsl:with-param name="datumdetail" select="datumdetail" /><xsl:with-param name="news_id" select="news_id" /></xsl:apply-templates></xsl:template><xsl:template match="news"><xsl:param name="datum" select="datum"/><xsl:param name="datumdetail" select="datumdetail"/><xsl:param name="news_id" select="news_id"/><article class="news-list-item card mb-3"><header class="card-header d-flex justify-content-between align-items-center"><h5 class="mb-0"><xsl:value-of select="betreff"/></h5><div class="d-flex flex-wrap justify-content-end"><address class="fw-bold small mb-0"><xsl:value-of select="verfasser"/></address><xsl:if test="$datum"><time class="small text-end w-100" datetime="{$datumdetail}"><xsl:value-of select="$datum"/></time></xsl:if></div></header><xsl:if test="text"><xsl:if test="text != \'\'"><div class="card-body"><div class="card-text"><xsl:value-of select="text" disable-output-escaping="yes" /></div></div></xsl:if></xsl:if><xsl:if test="$news_id"><footer class="card-footer d-flex justify-content-end"><a class="btn btn-outline-primary btn-sm mx-1" href="newsverwaltung.php?news_id={$news_id}" target="_blank" aria-label="Edit"><i class="fa fa-pencil" aria-hidden="true" title="Edit"></i></a><a class="btn btn-outline-primary btn-sm mx-1" href="#" data-confirm="Soll dieser Eintrag wirklich gelöscht werden?" data-href="newsverwaltung.php?news_id={$news_id}&amp;action=delete" target="_blank" aria-label="Delete" onclick="return confdel();"><i class="fa fa-trash" aria-hidden="true" title="Delete"></i></a></footer></xsl:if></article></xsl:template><xsl:template match="stg_extras"><dl><xsl:if test="stg_ltg"><dt><xsl:value-of select="stg_ltg_name"/></dt><xsl:apply-templates select="stg_ltg" /></xsl:if><xsl:if test="gf_ltg"><dt><xsl:value-of select="gf_ltg_name"/></dt><xsl:apply-templates select="gf_ltg" /></xsl:if><xsl:if test="stv_ltg"><dt><xsl:value-of select="stv_ltg_name"/></dt><xsl:apply-templates select="stv_ltg"/></xsl:if><xsl:if test="ass"><dt><xsl:value-of select="ass_name"/></dt><xsl:apply-templates select="ass"/></xsl:if></dl><xsl:value-of select="zusatzinfo" disable-output-escaping="yes"/><dl>	<xsl:if test="hochschulvertr"><dt><xsl:value-of select="hochschulvertr_name"/></dt><xsl:apply-templates select="hochschulvertr"/></xsl:if><xsl:if test="stdv"><dt><xsl:value-of select="stdv_name"/></dt><xsl:apply-templates select="stdv"/></xsl:if><xsl:if test="jahrgangsvertr"><dt><xsl:value-of select="jahrgangsvertr_name"/></dt><xsl:apply-templates select="jahrgangsvertr"/></xsl:if></dl><xsl:apply-templates select="cis_ext_menu"/></xsl:template><xsl:template name="person_linked_name"><xsl:variable name="uid" select="uid"/><a href="../cis/private/profile/index.php?uid={$uid}"><xsl:value-of select="name"/></a></xsl:template><xsl:template name="person"><xsl:param name="ass" select="ass"/><xsl:variable name="phone" select="telefon"/><xsl:variable name="mail" select="email"/><dd><address class="mb-0"><xsl:if test="$ass"><xsl:if test="bezeichnung != \'Assistenz\'"><h6><xsl:value-of select="bezeichnung"/></h6></xsl:if></xsl:if><xsl:call-template name="person_linked_name"/><br/><i class="fa fa-phone" title="Telefon" aria-hidden="true"></i><span class="sr-only">Telefon</span>: <a href="tel:{translate($phone, translate($phone,\'+1234567890\',\'\'),\'\')}"><xsl:value-of select="telefon"/></a><br/><i class="fa fa-home" title="Raum" aria-hidden="true"></i><span class="sr-only">Raum</span>: <xsl:value-of select="ort"/><br/><i class="fa fa-envelope" title="E-mail" aria-hidden="true"></i><span class="sr-only">E-mail</span>: <a href="mailto:{$mail}"><xsl:value-of select="email"/></a></address></dd></xsl:template><xsl:template name="person_short"><dd><address class="mb-0"><xsl:call-template name="person_linked_name"/></address></dd></xsl:template><xsl:template match="stg_ltg"><xsl:call-template name="person"/></xsl:template><xsl:template match="gf_ltg"><xsl:call-template name="person"/></xsl:template><xsl:template match="stv_ltg"><xsl:call-template name="person"/></xsl:template><xsl:template match="ass"><xsl:call-template name="person"><xsl:with-param name="ass" select="1"/></xsl:call-template></xsl:template><xsl:template match="hochschulvertr"><xsl:call-template name="person_short"/></xsl:template><xsl:template match="stdv"><xsl:call-template name="person_short"/></xsl:template><xsl:template match="jahrgangsvertr"><xsl:call-template name="person_short"/></xsl:template><xsl:template match="cis_ext_menu"><xsl:variable name="kurzbz" select="kurzbz"></xsl:variable><xsl:variable name="stg_kz" select="stg_kz"></xsl:variable><p><a class="btn btn-primary" href="https://moodle.technikum-wien.at/course/view.php?idnumber=dl{$stg_kz}" target="_blank"><xsl:value-of select="download_name"/></a></p></xsl:template></xsl:stylesheet>' . "' WHERE template_kurzbz='news';";
+
+	$qry .= "UPDATE campus.tbl_template SET xslt_xhtml_c4=xslt_xhtml WHERE xslt_xhtml_c4 IS NULL";
+
+	if(!$db->db_query($qry))
+		echo '<strong>campus.tbl_template: '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>campus.tbl_template: Spalte xslt_xhtml_c4 Defaultwerte eingefügt';
 }
 
 $tabellen['campus.tbl_template'][] = 'xslt_xhtml_c4';

From 085ed750caffb8367c71223988cc513d10d96bd3 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 16 Dec 2022 11:34:39 +0100
Subject: [PATCH 0054/1461] using cis.php and routing news

---
 application/views/templates/CISHTML-Menu/Entry.php | 4 +++-
 cis.php                                            | 1 +
 public/js/components/Cis/Menu/Entry.js             | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/application/views/templates/CISHTML-Menu/Entry.php b/application/views/templates/CISHTML-Menu/Entry.php
index 2f9c7e60f..35246b07b 100644
--- a/application/views/templates/CISHTML-Menu/Entry.php
+++ b/application/views/templates/CISHTML-Menu/Entry.php
@@ -20,6 +20,8 @@ switch ($entry->template_kurzbz) {
 			if ($xml->getElementsByTagName('target')->item(0))
 				$target = $xml->getElementsByTagName('target')->item(0)->nodeValue;
 
+			if (strpos($url, '../cms/news.php') === 0)
+				$url = APP_ROOT . 'cis.php/CisHtml/Cms/news' . substr($url, 15);
 			if (strpos($url, '../') === 0)
 				$url = APP_ROOT . substr($url, 3);
 		}
@@ -34,7 +36,7 @@ switch ($entry->template_kurzbz) {
 		break;
 	}
 	default: {
-		$this->load->view('templates/CISHTML-Menu/EntryBase', ['entry' => $entry, 'menu_id' => $menu_id, 'link' => APP_ROOT . 'index.ci.php/CisHtml/Cms/content/' . $entry->content_id]);
+		$this->load->view('templates/CISHTML-Menu/EntryBase', ['entry' => $entry, 'menu_id' => $menu_id, 'link' => APP_ROOT . 'cis.php/CisHtml/Cms/content/' . $entry->content_id]);
 		break;
 	}
 }
diff --git a/cis.php b/cis.php
index fbb182185..725a4017f 100644
--- a/cis.php
+++ b/cis.php
@@ -190,6 +190,7 @@ switch (ENVIRONMENT)
  *
  */
 	// $assign_to_config['name_of_config_item'] = 'value of config item';
+$assign_to_config['index_page'] = 'cis.php';
 
 
 
diff --git a/public/js/components/Cis/Menu/Entry.js b/public/js/components/Cis/Menu/Entry.js
index 0299e00a4..93bfc2819 100644
--- a/public/js/components/Cis/Menu/Entry.js
+++ b/public/js/components/Cis/Menu/Entry.js
@@ -23,6 +23,7 @@ export default {
                     return '';
                 // TODO(chris): replace get params
                 url = url.childNodes[0].nodeValue + "";
+                url = url.replace(/^\.\.\/cms\/news\.php/, FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/CisVue/Cms/news');
                 url = url.replace(/^\.\.\//, FHC_JS_DATA_STORAGE_OBJECT.app_root);
                 return url;
             }

From 4335c2da804b88b3dbe07217bfdb367a21974b80 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 16 Dec 2022 11:36:33 +0100
Subject: [PATCH 0055/1461] add Dashboard to HMVC

---
 application/controllers/CisHmvc.php           | 119 +++++++++++-------
 application/controllers/CisHmvc/Dashboard.php |  33 +++++
 application/views/CisHmvc/Dashboard.php       |  20 +++
 3 files changed, 127 insertions(+), 45 deletions(-)
 create mode 100644 application/controllers/CisHmvc/Dashboard.php
 create mode 100644 application/views/CisHmvc/Dashboard.php

diff --git a/application/controllers/CisHmvc.php b/application/controllers/CisHmvc.php
index 4d981d1e6..a704e8952 100644
--- a/application/controllers/CisHmvc.php
+++ b/application/controllers/CisHmvc.php
@@ -37,6 +37,7 @@ class CisHmvc extends FHC_Controller
 	 */
 	public function index()
 	{
+		// TODO(chris): CI can't handle empty ("//") parameters
 		$path = explode('/', uri_string());
 		array_shift($path); // NOTE(chris): remove cis4/
 		
@@ -63,62 +64,90 @@ class CisHmvc extends FHC_Controller
 		if (!$current) {
 			return $this->notfound();
 		}
-		switch ($current['orig']->template_kurzbz) {
-			case 'redirect': {
-				list ($url, $target) = $this->getRedirectUrlAndTarget($current['orig']->content);
-				if (substr($url, 0, 1) == '#')
-				{
-					$controller = 'CisHmvc';
-					$action = 'notfound';
-					break;
-				}
-				if ($target)
-				{
-					$controller = 'CisHmvc';
-					$action = 'redirect';
-					array_unshift($params, $url);
-					break;
-				}
-				if (preg_match('/^(\.\.\/|\.\/)*index\.ci\.php\/(.*)$/', $url, $matches))
-				{
-					list ($controller, $action, $p) = $this->getControllerMethodAndParamsFromUrl($matches[2]);
-					if (!$controller)
+		if (!$path)
+		{
+			$controller = 'CisHmvc/Dashboard';
+			$action = 'index';
+		}
+		else
+		{
+			switch ($current['orig']->template_kurzbz) {
+				case 'redirect': {
+					list ($url, $target) = $this->getRedirectUrlAndTarget($current['orig']->content);
+					if (substr($url, 0, 1) == '#')
 					{
 						$controller = 'CisHmvc';
 						$action = 'notfound';
+						break;
 					}
-					else
+					if ($target)
 					{
-						while (count($p))
-							array_unshift($params, array_pop($p));
+						$controller = 'CisHmvc';
+						$action = 'redirect';
+						array_unshift($params, $url);
+						break;
 					}
+					if (preg_match('/^(\.\.\/|\.\/)*index\.ci\.php\/(.*)$/', $url, $matches))
+					{
+						list ($controller, $action, $p) = $this->getControllerMethodAndParamsFromUrl($matches[2]);
+						if (!$controller)
+						{
+							$controller = 'CisHmvc';
+							$action = 'notfound';
+						}
+						else
+						{
+							while (count($p))
+								array_unshift($params, array_pop($p));
+						}
+						break;
+					}
+					if (preg_match('/^(\.\.\/|\.\/)*cms\/news\.php(.*)$/', $url, $matches))
+					{
+						$controller = 'CisHmvc/Cms';
+						$action = 'news';
+						$p = parse_url($url . '?infoscreen=0', PHP_URL_QUERY);
+						if ($p)
+						{
+							parse_str($p, $p);
+							$params += array_values(array_merge([
+								'infoscreen' => false,
+								'studiengang_kz' => null,
+								'semester' => null,
+								'mischen' => true,
+								'titel' => '',
+								'edit' => false,
+								'sichtbar' => true
+							], $p));
+						}
+						break;
+					}
+					if (preg_match('/^(\.\.\/|\.\/)*(addons|cms|cis)\/(.*)$/', $url, $matches))
+					{
+						$controller = 'CisHmvc/Cms';
+						$action = 'legacy';
+						array_unshift($params, $matches[2] . "/" . $matches[3]);
+						break;
+					}
+					
+					$controller = 'CisHmvc/cms';
+					$action = 'debug';
+					array_unshift($params, $current['orig']);
 					break;
 				}
-				if (preg_match('/^(\.\.\/|\.\/)*(addons|cms|cis)\/(.*)$/', $url, $matches))
-				{
+				case 'contentohnetitel':
+				case 'contentmittitel': {
 					$controller = 'CisHmvc/Cms';
-					$action = 'legacy';
-					array_unshift($params, $matches[2] . "/" . $matches[3]);
+					$action = 'content';
+					array_unshift($params, $current['orig']->content_id);
+					break;
+				}
+				default: {
+					$controller = 'CisHmvc/Cms';
+					$action = 'debug';
+					array_unshift($params, $current['orig']);
 					break;
 				}
-				
-				$controller = 'CisHmvc/cms';
-				$action = 'debug';
-				array_unshift($params, $current['orig']);
-				break;
-			}
-			case 'contentohnetitel':
-			case 'contentmittitel': {
-				$controller = 'CisHmvc/cms';
-				$action = 'content';
-				array_unshift($params, $current['orig']->content_id);
-				break;
-			}
-			default: {
-				$controller = 'CisHmvc/cms';
-				$action = 'debug';
-				array_unshift($params, $current['orig']);
-				break;
 			}
 		}
 
diff --git a/application/controllers/CisHmvc/Dashboard.php b/application/controllers/CisHmvc/Dashboard.php
new file mode 100644
index 000000000..f188cc2e2
--- /dev/null
+++ b/application/controllers/CisHmvc/Dashboard.php
@@ -0,0 +1,33 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * 
+ */
+class Dashboard extends Auth_Controller
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct(
+			array(
+				'index' => 'user:r'
+			)
+		);
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * @return void
+	 */
+	public function index()
+	{
+		$this->load->view('CisHmvc/Dashboard.php');
+	}
+
+}
diff --git a/application/views/CisHmvc/Dashboard.php b/application/views/CisHmvc/Dashboard.php
new file mode 100644
index 000000000..46d769a38
--- /dev/null
+++ b/application/views/CisHmvc/Dashboard.php
@@ -0,0 +1,20 @@
+<?php
+	$includesArray = array(
+		'title' => 'FH-Complete',
+		'customJSModules' => ['public/js/apps/Dashboard/Fhc.js'],
+		'customCSSs' => [
+			'public/css/components/dashboard.css'
+		],
+	);
+
+	$this->load->view('templates/FHC-Header', $includesArray);
+?>
+
+<div id="content">
+	<h2>Dashboard</h2>
+	<hr>
+	<fhc-dashboard dashboard="CIS"/>
+</div>
+
+<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
+

From 00c52e4880a2f00a5215e37910b7fbde2dbe814b Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 16 Dec 2022 11:43:35 +0100
Subject: [PATCH 0056/1461] cleanup

---
 public/js/apps/Cis.js                       |  8 +-
 public/js/components/Cis/Navigation/Left.js | 88 ---------------------
 public/js/components/Cis/Navigation/Top.js  | 63 ---------------
 public/js/components/Cis/Navigation/User.js | 22 ------
 4 files changed, 4 insertions(+), 177 deletions(-)
 delete mode 100644 public/js/components/Cis/Navigation/Left.js
 delete mode 100644 public/js/components/Cis/Navigation/Top.js
 delete mode 100644 public/js/components/Cis/Navigation/User.js

diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js
index 7b11c2cfa..0e1461a0f 100644
--- a/public/js/apps/Cis.js
+++ b/public/js/apps/Cis.js
@@ -5,6 +5,10 @@ import fhcapifactory from "./api/fhcapifactory.js";
 Vue.$fhcapi = fhcapifactory;
 
 Vue.createApp({
+    components: {
+        FhcSearchbar,
+        CisMenu
+    },
     data: function() {
         return {
             searchbaroptions: {
@@ -66,9 +70,5 @@ Vue.createApp({
         searchfunction: function(searchsettings) {
             return Vue.$fhcapi.Search.search(searchsettings);
         }
-    },
-    components: {
-        FhcSearchbar,
-        CisMenu
     }
 }).mount('#cis-header');
\ No newline at end of file
diff --git a/public/js/components/Cis/Navigation/Left.js b/public/js/components/Cis/Navigation/Left.js
deleted file mode 100644
index fa70b2307..000000000
--- a/public/js/components/Cis/Navigation/Left.js
+++ /dev/null
@@ -1,88 +0,0 @@
-export default {
-    template: `
-    <div id="sidebar-container" class="d-none d-lg-block position-sticky">
-        <ul class="list-group list-group-flush">
-            <!-- Separator with title -->
-            <li class="list-group-item sidebar-separator-title text-muted d-flex align-items-center menu-collapsed">
-                <small>MAIN MENU</small>
-            </li>
-            <!-- /end Separator -->
-            <a href="#submenu1" data-bs-toggle="collapse" aria-expanded="true" class="bg-primary list-group-item list-group-item-action flex-column align-items-start">
-                <div class="d-flex w-100 justify-content-start align-items-center">
-                    <i class="fa fa-user fa-fw me-3"></i>
-                    <span class="menu-collapsed">Mein CIS</span>
-                </div>
-            </a>
-            <div id='submenu1' class="collapse show sidebar-submenu">
-                <a href="#" class="list-group-item list-group-item-action list-group-item-dark text-white active" id="menu-mein-bereich">
-                    <span class="menu-collapsed">Mein Bereich</span>
-                </a>
-                <a href="#" class="list-group-item list-group-item-action list-group-item-dark text-white">
-                    <span class="menu-collapsed">Studium</span>
-                </a>
-                <a href="#" class="list-group-item list-group-item-action list-group-item-dark text-white" id="menu-lvplan">
-                    <span class="menu-collapsed">LV Plan</span>
-                </a>
-                <a href="#" class="list-group-item list-group-item-action list-group-item-dark text-white">
-                    <span class="menu-collapsed">Campus Life</span>
-                </a>
-            </div>
-            <a href="#submenu2" data-bs-toggle="collapse" aria-expanded="false" class="bg-primary list-group-item list-group-item-action flex-column align-items-start">
-                <div class="d-flex w-100 justify-content-start align-items-center">
-                    <i class="fa fa-user fa-fw me-3"></i>
-                    <span class="menu-collapsed">FHTW Hochschule</span>
-                </div>
-            </a>
-            <div id='submenu2' class="collapse sidebar-submenu">
-                <a href="#" class="list-group-item list-group-item-action list-group-item-dark text-white" id="menu-organisation">
-                    <span class="menu-collapsed">Organisation</span>
-                </a>
-                <a href="#" class="list-group-item list-group-item-action list-group-item-dark text-white">
-                    <span class="menu-collapsed">Studiengänge</span>
-                </a>
-                <a href="#" class="list-group-item list-group-item-action list-group-item-dark text-white">
-                    <span class="menu-collapsed">Forschung & Entwicklung</span>
-                </a>
-                <a href="#" class="list-group-item list-group-item-action list-group-item-dark text-white">
-                    <span class="menu-collapsed">Technikum Wien Acadamy</span>
-                </a>
-            </div>
-            <a href="#submenu3" data-bs-toggle="collapse" aria-expanded="false" class="bg-primary list-group-item flex-column align-items-start">
-                <div class="d-flex w-100 justify-content-start align-items-center">
-                    <i class="fa fa-user fa-fw me-3"></i>
-                    <span class="menu-collapsed">FHTW Services</span>
-                </div>
-            </a>
-            <div id='submenu3' class="collapse sidebar-submenu">
-                <a href="#" class="list-group-item list-group-item-action list-group-item-dark text-white">
-                    <span class="menu-collapsed">Teaching & Learning Center</span>
-                </a>
-                <a href="#" class="list-group-item list-group-item-action list-group-item-dark text-white">
-                    <span class="menu-collapsed">International Office</span>
-                </a>
-                <a href="#" class="list-group-item list-group-item-action list-group-item-dark text-white">
-                    <span class="menu-collapsed">Bibliothek</span>
-                </a>
-                <a href="#" class="list-group-item list-group-item-action list-group-item-dark text-white">
-                    <span class="menu-collapsed">IT-Services</span>
-                </a>
-            </div>
-            <a href="#submenu4" data-bs-toggle="collapse" aria-expanded="false" class="bg-primary list-group-item flex-column align-items-start">
-                <div class="d-flex w-100 justify-content-start align-items-center">
-                    <i class="fa fa-user fa-fw me-3"></i>
-                    <span class="menu-collapsed">Links & Downloads</span>
-                </div>
-            </a>
-            <li class="list-group-item sidebar-separator-title text-muted d-flex align-items-center menu-collapsed">
-                <small>AKTUELL</small>
-            </li>
-            <a href="#" class="bg-primary list-group-item">
-                <div class="d-flex w-100 justify-content-start align-items-center">
-                    <i class="fa fa-medkit fa-fw me-3"></i>
-                    <span class="menu-collapsed">COVID 19</span>
-                </div>
-            </a>
-            <li class="list-group-item sidebar-separator menu-collapsed"></li>
-        </ul>
-    </div>`
-};
\ No newline at end of file
diff --git a/public/js/components/Cis/Navigation/Top.js b/public/js/components/Cis/Navigation/Top.js
deleted file mode 100644
index 9df1fefa1..000000000
--- a/public/js/components/Cis/Navigation/Top.js
+++ /dev/null
@@ -1,63 +0,0 @@
-import FhcSearchbar from "../../searchbar/searchbar.js";
-import CisNavigationUser from "./User.js";
-
-export default {
-    components: {
-        FhcSearchbar,
-        CisNavigationUser
-    },
-    data: () => {
-        return {
-            nav: null
-        }
-    },
-    computed: {
-        rootUrl() {
-            return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/cis';
-        },
-        logoImg() {
-            return FHC_JS_DATA_STORAGE_OBJECT.app_root + 'public/images/logo-300x160.png';
-        }
-    },
-    methods: {
-        openNav() {
-            if (this.nav)
-                this.nav.toggle();
-        },
-        async search() {
-            return {data: {data: []}};
-        }
-    },
-    mounted() {
-        this.nav = new bootstrap.Offcanvas(this.$refs.nav, {backdrop: false});
-    },
-    template: `
-    <div class="cis-navigation-top navbar navbar-expand-lg fixed-top navbar-dark bg-primary p-0">
-        <button class="navbar-toggler border-0" type="button" @click="openNav">
-            <span class="navbar-toggler-icon"></span>
-        </button>
-        <a class="navbar-brand col-auto col-lg-2 px-3 py-0 m-0" :href="rootUrl">
-            <img :src="logoImg" width="90">
-        </a>
-        <div ref="nav" class="offcanvas offcanvas-start align-items-stretch mt-lg-0 w-100 px-3 px-lg-0 d-flex flex-column flex-lg-row bg-dark" tabindex="-1">
-            <fhc-searchbar class="fhc-searchbar w-100 me-0" :searchoptions="{types:[],actions:{}}" :searchfunction="search"></fhc-searchbar>
-            <ul class="navbar-nav flex-grow-1">
-                <li class="nav-item d-lg-none">
-                    <a class="nav-link" href="#">Mein CIS</a>
-                </li>
-                <li class="nav-item d-lg-none">
-                    <a class="nav-link" href="#">FHTW Campus</a>
-                </li>
-                <li class="nav-item d-lg-none">
-                    <a class="nav-link" href="#">FHTW Services</a>
-                </li>
-                <li class="nav-item d-lg-none">
-                    <a class="nav-link" href="#">COVID 19</a>
-                </li>
-                <li class="nav-item">
-                    <cis-navigation-user></cis-navigation-user>
-                </li>
-            </ul>
-        </div>
-    </div>`
-};
diff --git a/public/js/components/Cis/Navigation/User.js b/public/js/components/Cis/Navigation/User.js
deleted file mode 100644
index 4cf78d422..000000000
--- a/public/js/components/Cis/Navigation/User.js
+++ /dev/null
@@ -1,22 +0,0 @@
-export default {
-  data: () => {
-    return {
-      imgSrc: FHC_JS_DATA_STORAGE_OBJECT.app_root + '/cis/public/bild.php'
-    }
-  },
-  created() {
-    axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/cis/navigation/user').then(res => {this.imgSrc += '?src=person&person_id=' + res.data.retval});
-  },
-  template: `
-  <div class="dropdown dropstart">
-    <a class="dropdown-toggle nav-link" href="#" id="dropdown01" data-bs-toggle="dropdown" aria-expanded="false">
-      <img :src="imgSrc" class="avatar rounded-circle" width="45" height="45"/>
-    </a>
-    <ul class="dropdown-menu dropdown-menu-dark m-0" aria-labelledby="dropdown01">
-      <li><a class="dropdown-item" href="#" id="menu-profil">Profil</a></li>
-      <li><a class="dropdown-item" href="#">Ampeln</a></li>
-      <li><hr class="dropdown-divider"></li>
-      <li><a class="dropdown-item" href="#">Logout</a></li>
-    </ul>
-  </div>`
-};
\ No newline at end of file

From c5b996f35eb6183f9cb07548b4a960a07a6d18a4 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 16 Dec 2022 13:41:16 +0100
Subject: [PATCH 0057/1461] use vue for cms for link correction

---
 application/views/CisHmvc/Cms/Content.php |  1 +
 application/views/CisHtml/Cms/Content.php |  1 +
 application/views/CisVue/Cms/Content.php  |  1 +
 public/js/apps/Cis/Cms.js                 | 23 +++++++++++++++++++++++
 system/dbupdate_3.4/25999_cis4_cms.php    |  4 ++--
 5 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 public/js/apps/Cis/Cms.js

diff --git a/application/views/CisHmvc/Cms/Content.php b/application/views/CisHmvc/Cms/Content.php
index e96060e51..4a11d9f93 100644
--- a/application/views/CisHmvc/Cms/Content.php
+++ b/application/views/CisHmvc/Cms/Content.php
@@ -1,6 +1,7 @@
 <?php
 $includesArray = array(
 	'title' => 'FH-Complete',
+	'customJSModules' => ['public/js/apps/Cis/Cms.js'],
 	'customCSSs' => [
 		'public/css/Cis4/Cms.css',
 		#'skin/style.css.php'
diff --git a/application/views/CisHtml/Cms/Content.php b/application/views/CisHtml/Cms/Content.php
index 8742720b7..e750ea5a5 100644
--- a/application/views/CisHtml/Cms/Content.php
+++ b/application/views/CisHtml/Cms/Content.php
@@ -1,5 +1,6 @@
 <?php
 $includesArray = array(
+	'customJSModules' => ['public/js/apps/Cis/Cms.js'],
 	'customCSSs' => [
 		'public/css/Cis4/Cms.css',
 		#'skin/style.css.php'
diff --git a/application/views/CisVue/Cms/Content.php b/application/views/CisVue/Cms/Content.php
index fafe1a593..a88a1fc93 100644
--- a/application/views/CisVue/Cms/Content.php
+++ b/application/views/CisVue/Cms/Content.php
@@ -1,5 +1,6 @@
 <?php
 $includesArray = array(
+	'customJSModules' => ['public/js/apps/Cis/Cms.js'],
 	'customCSSs' => [
 		'public/css/Cis4/Cms.css',
 		#'skin/style.css.php'
diff --git a/public/js/apps/Cis/Cms.js b/public/js/apps/Cis/Cms.js
new file mode 100644
index 000000000..c28f96049
--- /dev/null
+++ b/public/js/apps/Cis/Cms.js
@@ -0,0 +1,23 @@
+import BsConfirm from "../../components/Bootstrap/Confirm.js";
+
+Vue.createApp({
+    components: {
+        BsConfirm
+    },
+    mounted() {
+    	document.querySelectorAll('#cms [data-confirm]').forEach(el => {
+            el.addEventListener('click', evt => {
+                evt.preventDefault();
+                BsConfirm.popup(el.dataset.confirm).then(() => {
+                    Axios.get(el.href).then(res => {
+                        // TODO(chris): check for success then show message and/or reload
+                        location = location;
+                    }).catch(err => console.error('ERROR:', err));
+                }).catch(()=>{});
+            });
+        });
+        document.querySelectorAll('#cms [data-href]').forEach(el => {
+            el.href = el.dataset.href.replace(/^ROOT\//, FHC_JS_DATA_STORAGE_OBJECT.app_root);
+        });
+    }
+}).mount('#cms');
\ No newline at end of file
diff --git a/system/dbupdate_3.4/25999_cis4_cms.php b/system/dbupdate_3.4/25999_cis4_cms.php
index 7f7fda4c8..f16b07dc4 100644
--- a/system/dbupdate_3.4/25999_cis4_cms.php
+++ b/system/dbupdate_3.4/25999_cis4_cms.php
@@ -15,9 +15,9 @@ if(!$result = @$db->db_query("SELECT xslt_xhtml_c4 FROM campus.tbl_template LIMI
 	$qry = "";
 	$qry .= "UPDATE campus.tbl_template SET xslt_xhtml_c4='" . '<xsl:stylesheet version="1.0" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"><xsl:template match="content"><h1><xsl:value-of select="titel" /></h1><xsl:value-of select="inhalt" disable-output-escaping="yes" /></xsl:template></xsl:stylesheet>' . "' WHERE template_kurzbz='contentmittitel';";
 	$qry .= "UPDATE campus.tbl_template SET xslt_xhtml_c4='" . '<xsl:stylesheet version="1.0" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"><xsl:template match="content"><xsl:value-of select="inhalt" disable-output-escaping="yes" /></xsl:template></xsl:stylesheet>' . "' WHERE template_kurzbz='contentohnetitel';";
-	$qry .= "UPDATE campus.tbl_template SET xslt_xhtml_c4='" . '<xsl:stylesheet version="1.0" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"><xsl:template match="content"><script type="text/javascript">window.location.href='<xsl:value-of select="url" />';</script><div class="alert alert-primary" role="alert">Sie werden automatisch weitergeleitet. Sollte dies nicht der Fall sein, klicken sie bitte <xsl:variable name="url" select="url"></xsl:variable><a href="{url}">hier</a></div></xsl:template></xsl:stylesheet>' . "' WHERE template_kurzbz='redirect';";
+	$qry .= "UPDATE campus.tbl_template SET xslt_xhtml_c4='" . '<xsl:stylesheet version="1.0" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"><xsl:template match="content"><script type="text/javascript">window.location.href=\\\'<xsl:value-of select="url" />\\\';</script><div class="alert alert-primary" role="alert">Sie werden automatisch weitergeleitet. Sollte dies nicht der Fall sein, klicken sie bitte <xsl:variable name="url" select="url"></xsl:variable><a href="{url}">hier</a></div></xsl:template></xsl:stylesheet>' . "' WHERE template_kurzbz='redirect';";
 	$qry .= "UPDATE campus.tbl_template SET xslt_xhtml_c4='" . '<xsl:stylesheet version="1.0" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"><xsl:template match="content"><div class="alert alert-danger" role="alert">Diese Seite sollte nicht direkt aufgerufen werden!</div></xsl:template></xsl:stylesheet>' . "' WHERE template_kurzbz='include';";
-	$qry .= "UPDATE campus.tbl_template SET xslt_xhtml_c4='" . '<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"><xsl:output encoding="UTF-8" omit-xml-declaration="yes" indent="yes"/><xsl:template match="/"><h1>News</h1><div class="row"><xsl:choose><xsl:when test="content/stg_extras"><div class="news-list col-9" aria-role="feed"><xsl:call-template name="content"/></div><aside class="col-3"><xsl:apply-templates select="content/stg_extras" /></aside></xsl:when><xsl:otherwise><div class="news-list col" aria-role="feed"><xsl:call-template name="content"/></div></xsl:otherwise></xsl:choose></div></xsl:template><xsl:template name="content"><xsl:choose><xsl:when test="content/news"><xsl:apply-templates select="content/news" /></xsl:when><xsl:when test="content/newswrapper"><xsl:apply-templates select="content/newswrapper" /></xsl:when><xsl:when test="newswrapper"><xsl:apply-templates select="newswrapper" /></xsl:when><xsl:otherwise><xsl:apply-templates select="news" /></xsl:otherwise></xsl:choose></xsl:template><xsl:template name="PreventSelfClosure"><xsl:value-of select="\'\'" /></xsl:template><xsl:template match="newswrapper"><xsl:apply-templates select="news"><xsl:with-param name="datum" select="datum" /><xsl:with-param name="datumdetail" select="datumdetail" /><xsl:with-param name="news_id" select="news_id" /></xsl:apply-templates></xsl:template><xsl:template match="news"><xsl:param name="datum" select="datum"/><xsl:param name="datumdetail" select="datumdetail"/><xsl:param name="news_id" select="news_id"/><article class="news-list-item card mb-3"><header class="card-header d-flex justify-content-between align-items-center"><h5 class="mb-0"><xsl:value-of select="betreff"/></h5><div class="d-flex flex-wrap justify-content-end"><address class="fw-bold small mb-0"><xsl:value-of select="verfasser"/></address><xsl:if test="$datum"><time class="small text-end w-100" datetime="{$datumdetail}"><xsl:value-of select="$datum"/></time></xsl:if></div></header><xsl:if test="text"><xsl:if test="text != \'\'"><div class="card-body"><div class="card-text"><xsl:value-of select="text" disable-output-escaping="yes" /></div></div></xsl:if></xsl:if><xsl:if test="$news_id"><footer class="card-footer d-flex justify-content-end"><a class="btn btn-outline-primary btn-sm mx-1" href="newsverwaltung.php?news_id={$news_id}" target="_blank" aria-label="Edit"><i class="fa fa-pencil" aria-hidden="true" title="Edit"></i></a><a class="btn btn-outline-primary btn-sm mx-1" href="#" data-confirm="Soll dieser Eintrag wirklich gelöscht werden?" data-href="newsverwaltung.php?news_id={$news_id}&amp;action=delete" target="_blank" aria-label="Delete" onclick="return confdel();"><i class="fa fa-trash" aria-hidden="true" title="Delete"></i></a></footer></xsl:if></article></xsl:template><xsl:template match="stg_extras"><dl><xsl:if test="stg_ltg"><dt><xsl:value-of select="stg_ltg_name"/></dt><xsl:apply-templates select="stg_ltg" /></xsl:if><xsl:if test="gf_ltg"><dt><xsl:value-of select="gf_ltg_name"/></dt><xsl:apply-templates select="gf_ltg" /></xsl:if><xsl:if test="stv_ltg"><dt><xsl:value-of select="stv_ltg_name"/></dt><xsl:apply-templates select="stv_ltg"/></xsl:if><xsl:if test="ass"><dt><xsl:value-of select="ass_name"/></dt><xsl:apply-templates select="ass"/></xsl:if></dl><xsl:value-of select="zusatzinfo" disable-output-escaping="yes"/><dl>	<xsl:if test="hochschulvertr"><dt><xsl:value-of select="hochschulvertr_name"/></dt><xsl:apply-templates select="hochschulvertr"/></xsl:if><xsl:if test="stdv"><dt><xsl:value-of select="stdv_name"/></dt><xsl:apply-templates select="stdv"/></xsl:if><xsl:if test="jahrgangsvertr"><dt><xsl:value-of select="jahrgangsvertr_name"/></dt><xsl:apply-templates select="jahrgangsvertr"/></xsl:if></dl><xsl:apply-templates select="cis_ext_menu"/></xsl:template><xsl:template name="person_linked_name"><xsl:variable name="uid" select="uid"/><a href="../cis/private/profile/index.php?uid={$uid}"><xsl:value-of select="name"/></a></xsl:template><xsl:template name="person"><xsl:param name="ass" select="ass"/><xsl:variable name="phone" select="telefon"/><xsl:variable name="mail" select="email"/><dd><address class="mb-0"><xsl:if test="$ass"><xsl:if test="bezeichnung != \'Assistenz\'"><h6><xsl:value-of select="bezeichnung"/></h6></xsl:if></xsl:if><xsl:call-template name="person_linked_name"/><br/><i class="fa fa-phone" title="Telefon" aria-hidden="true"></i><span class="sr-only">Telefon</span>: <a href="tel:{translate($phone, translate($phone,\'+1234567890\',\'\'),\'\')}"><xsl:value-of select="telefon"/></a><br/><i class="fa fa-home" title="Raum" aria-hidden="true"></i><span class="sr-only">Raum</span>: <xsl:value-of select="ort"/><br/><i class="fa fa-envelope" title="E-mail" aria-hidden="true"></i><span class="sr-only">E-mail</span>: <a href="mailto:{$mail}"><xsl:value-of select="email"/></a></address></dd></xsl:template><xsl:template name="person_short"><dd><address class="mb-0"><xsl:call-template name="person_linked_name"/></address></dd></xsl:template><xsl:template match="stg_ltg"><xsl:call-template name="person"/></xsl:template><xsl:template match="gf_ltg"><xsl:call-template name="person"/></xsl:template><xsl:template match="stv_ltg"><xsl:call-template name="person"/></xsl:template><xsl:template match="ass"><xsl:call-template name="person"><xsl:with-param name="ass" select="1"/></xsl:call-template></xsl:template><xsl:template match="hochschulvertr"><xsl:call-template name="person_short"/></xsl:template><xsl:template match="stdv"><xsl:call-template name="person_short"/></xsl:template><xsl:template match="jahrgangsvertr"><xsl:call-template name="person_short"/></xsl:template><xsl:template match="cis_ext_menu"><xsl:variable name="kurzbz" select="kurzbz"></xsl:variable><xsl:variable name="stg_kz" select="stg_kz"></xsl:variable><p><a class="btn btn-primary" href="https://moodle.technikum-wien.at/course/view.php?idnumber=dl{$stg_kz}" target="_blank"><xsl:value-of select="download_name"/></a></p></xsl:template></xsl:stylesheet>' . "' WHERE template_kurzbz='news';";
+	$qry .= "UPDATE campus.tbl_template SET xslt_xhtml_c4='" . '<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"><xsl:output encoding="UTF-8" omit-xml-declaration="yes" indent="yes"/><xsl:template match="/"><h1>News</h1><div class="row"><xsl:choose><xsl:when test="content/stg_extras"><div class="news-list col-9" aria-role="feed"><xsl:call-template name="content"/></div><aside class="col-3"><xsl:apply-templates select="content/stg_extras" /></aside></xsl:when><xsl:otherwise><div class="news-list col" aria-role="feed"><xsl:call-template name="content"/></div></xsl:otherwise></xsl:choose></div></xsl:template><xsl:template name="content"><xsl:choose><xsl:when test="content/news"><xsl:apply-templates select="content/news" /></xsl:when><xsl:when test="content/newswrapper"><xsl:apply-templates select="content/newswrapper" /></xsl:when><xsl:when test="newswrapper"><xsl:apply-templates select="newswrapper" /></xsl:when><xsl:otherwise><xsl:apply-templates select="news" /></xsl:otherwise></xsl:choose></xsl:template><xsl:template match="newswrapper"><xsl:apply-templates select="news"><xsl:with-param name="datum" select="datum" /><xsl:with-param name="datumdetail" select="datumdetail" /><xsl:with-param name="news_id" select="news_id" /></xsl:apply-templates></xsl:template><xsl:template match="news"><xsl:param name="datum" select="datum"/><xsl:param name="datumdetail" select="datumdetail"/><xsl:param name="news_id" select="news_id"/><article class="news-list-item card mb-3"><header class="card-header d-flex justify-content-between align-items-center"><h5 class="mb-0"><xsl:value-of select="betreff"/></h5><div class="d-flex flex-wrap justify-content-end"><address class="fw-bold small mb-0"><xsl:value-of select="verfasser"/></address><xsl:if test="$datum"><time class="small text-end w-100" datetime="{$datumdetail}"><xsl:value-of select="$datum"/></time></xsl:if></div></header><xsl:if test="text"><xsl:if test="text != \\\'\\\'"><div class="card-body"><div class="card-text"><xsl:value-of select="text" disable-output-escaping="yes" /></div></div></xsl:if></xsl:if><xsl:if test="$news_id"><footer class="card-footer d-flex justify-content-end"><a class="btn btn-outline-primary btn-sm mx-1" href="#" data-href="newsverwaltung.php?news_id={$news_id}" target="_blank" aria-label="Edit"><i class="fa fa-pencil" aria-hidden="true" title="Edit"></i></a><a class="btn btn-outline-primary btn-sm mx-1" href="#" data-confirm="Soll dieser Eintrag wirklich gelöscht werden?" data-href="newsverwaltung.php?news_id={$news_id}&amp;action=delete" target="_blank" aria-label="Delete"><i class="fa fa-trash" aria-hidden="true" title="Delete"></i></a></footer></xsl:if></article></xsl:template><xsl:template match="stg_extras"><dl><xsl:if test="stg_ltg"><dt><xsl:value-of select="stg_ltg_name"/></dt><xsl:apply-templates select="stg_ltg" /></xsl:if><xsl:if test="gf_ltg"><dt><xsl:value-of select="gf_ltg_name"/></dt><xsl:apply-templates select="gf_ltg" /></xsl:if><xsl:if test="stv_ltg"><dt><xsl:value-of select="stv_ltg_name"/></dt><xsl:apply-templates select="stv_ltg"/></xsl:if><xsl:if test="ass"><dt><xsl:value-of select="ass_name"/></dt><xsl:apply-templates select="ass"/></xsl:if></dl><xsl:value-of select="zusatzinfo" disable-output-escaping="yes"/><dl>	<xsl:if test="hochschulvertr"><dt><xsl:value-of select="hochschulvertr_name"/></dt><xsl:apply-templates select="hochschulvertr"/></xsl:if><xsl:if test="stdv"><dt><xsl:value-of select="stdv_name"/></dt><xsl:apply-templates select="stdv"/></xsl:if><xsl:if test="jahrgangsvertr"><dt><xsl:value-of select="jahrgangsvertr_name"/></dt><xsl:apply-templates select="jahrgangsvertr"/></xsl:if></dl><xsl:apply-templates select="cis_ext_menu"/></xsl:template><xsl:template name="person_linked_name"><xsl:variable name="uid" select="uid"/><a href="../cis/private/profile/index.php?uid={$uid}"><xsl:value-of select="name"/></a></xsl:template><xsl:template name="person"><xsl:param name="ass" select="ass"/><xsl:variable name="phone" select="telefon"/><xsl:variable name="mail" select="email"/><dd><address class="mb-0"><xsl:if test="$ass"><xsl:if test="bezeichnung != \\\'Assistenz\\\'"><h6><xsl:value-of select="bezeichnung"/></h6></xsl:if></xsl:if><xsl:call-template name="person_linked_name"/><br/><i class="fa fa-phone" title="Telefon" aria-hidden="true"></i><span class="sr-only">Telefon</span>: <a href="tel:{translate($phone, translate($phone,\\\'+1234567890\\\',\\\'\\\'),\\\'\\\')}"><xsl:value-of select="telefon"/></a><br/><i class="fa fa-home" title="Raum" aria-hidden="true"></i><span class="sr-only">Raum</span>: <xsl:value-of select="ort"/><br/><i class="fa fa-envelope" title="E-mail" aria-hidden="true"></i><span class="sr-only">E-mail</span>: <a href="mailto:{$mail}"><xsl:value-of select="email"/></a></address></dd></xsl:template><xsl:template name="person_short"><dd><address class="mb-0"><xsl:call-template name="person_linked_name"/></address></dd></xsl:template><xsl:template match="stg_ltg"><xsl:call-template name="person"/></xsl:template><xsl:template match="gf_ltg"><xsl:call-template name="person"/></xsl:template><xsl:template match="stv_ltg"><xsl:call-template name="person"/></xsl:template><xsl:template match="ass"><xsl:call-template name="person"><xsl:with-param name="ass" select="1"/></xsl:call-template></xsl:template><xsl:template match="hochschulvertr"><xsl:call-template name="person_short"/></xsl:template><xsl:template match="stdv"><xsl:call-template name="person_short"/></xsl:template><xsl:template match="jahrgangsvertr"><xsl:call-template name="person_short"/></xsl:template><xsl:template match="cis_ext_menu"><xsl:variable name="kurzbz" select="kurzbz"></xsl:variable><xsl:variable name="stg_kz" select="stg_kz"></xsl:variable><p><a class="btn btn-primary" href="https://moodle.technikum-wien.at/course/view.php?idnumber=dl{$stg_kz}" target="_blank"><xsl:value-of select="download_name"/></a></p></xsl:template></xsl:stylesheet>' . "' WHERE template_kurzbz='news';";
 
 	$qry .= "UPDATE campus.tbl_template SET xslt_xhtml_c4=xslt_xhtml WHERE xslt_xhtml_c4 IS NULL";
 

From ebc7b5a3d9eacf9db5a6db494d194f052c8cb7ae Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 16 Jan 2023 10:31:02 +0100
Subject: [PATCH 0058/1461] Login/Logout

---
 application/controllers/Cis/Auth.php          | 78 +++++++++++++++++++
 application/controllers/components/CisVue.php |  7 +-
 application/views/Cis/Login.php               | 42 ++++++++++
 .../views/templates/CISHMVC-Header.php        |  2 +-
 .../views/templates/CISHTML-Header.php        |  2 +-
 application/views/templates/CISVUE-Header.php |  2 +-
 public/css/Cis4/Cis.css                       |  5 +-
 public/js/components/Bootstrap/Modal.js       | 14 ++--
 public/js/components/Cis/Menu.js              |  3 +-
 9 files changed, 139 insertions(+), 16 deletions(-)
 create mode 100644 application/controllers/Cis/Auth.php
 create mode 100644 application/views/Cis/Login.php

diff --git a/application/controllers/Cis/Auth.php b/application/controllers/Cis/Auth.php
new file mode 100644
index 000000000..e2308cab2
--- /dev/null
+++ b/application/controllers/Cis/Auth.php
@@ -0,0 +1,78 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+ 
+/**
+ * 
+ */
+class Auth extends FHC_Controller
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+
+		// Load Helpers
+		$this->load->helper('form');
+		$this->load->helper('hlp_authentication');
+
+		// Loads phrases system
+		$this->loadPhrases([
+			'global'
+		]);
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * @return void
+	 */
+	public function login()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('username', 'Username', 'required|trim|callback_validation');
+		$this->form_validation->set_rules('password', 'Password', 'required|trim');
+
+
+		if ($this->form_validation->run())
+		{
+			redirect($this->authlib->getLandingPage('/CisVue/Dashboard'));
+		}
+		else
+		{
+			$this->load->view('Cis/Login');
+		}
+	}
+
+	/**
+	 * @return boolean
+	 */
+	public function validation()
+	{
+		$username = $this->input->post('username');
+		$password = $this->input->post('password');
+
+		$this->load->library('AuthLib', [false]); // without authentication otherwise loooooop!
+
+		$login = $this->authlib->loginLDAP($username, $password);
+		if (isSuccess($login))
+			return true;
+		$this->form_validation->set_message('validation', 'Incorrect username/password.');
+		return false;
+	}
+
+	/**
+	 * @return void
+	 */
+	public function logout()
+	{
+		$this->load->library('AuthLib');
+		$this->authlib->logout();
+		redirect('/Cis/Auth/login', 'refresh');
+	}
+
+}
diff --git a/application/controllers/components/CisVue.php b/application/controllers/components/CisVue.php
index b1a33ff69..dc172db76 100644
--- a/application/controllers/components/CisVue.php
+++ b/application/controllers/components/CisVue.php
@@ -3,12 +3,7 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 /**
- * This controller operates between (interface) the JS (GUI) and the FilterCmptLib (back-end)
- * Provides data to the ajax get calls about the filter component
- * Listens to ajax post calls to change the filter data
- * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
- * NOTE: extends the FHC_Controller instead of the Auth_Controller because the FilterCmpt has its
- * 	own permissions check
+ *
  */
 class CisVue extends Auth_Controller
 {
diff --git a/application/views/Cis/Login.php b/application/views/Cis/Login.php
new file mode 100644
index 000000000..68490e67e
--- /dev/null
+++ b/application/views/Cis/Login.php
@@ -0,0 +1,42 @@
+<?php
+	$includesArray = array(
+		'title' => 'FH-Complete',
+		'bootstrap5' => true,
+		'fontawesome6' => true
+	);
+
+	$this->load->view('templates/FHC-Header', $includesArray);
+?>
+
+	<div id="login-form" class="login-form container">
+		<div class="row justify-content-center">
+			<div class="col-md-9 col-lg-7 col-xl-6">
+				<?= form_open('Cis/Auth/login'); ?>
+					<p class="text-center">
+						<img src="<?php echo base_url('public/images/logo-300x160.png'); ?>" >
+					</p>
+
+					<br>
+
+					<?= validation_errors('<div class="alert alert-danger" role="alert">', '</div>'); ?>
+
+					<div class="mb-3">
+						<?= form_input(['name' => 'username', 'class' => 'form-control', 'placeholder' => 'Username', 'required' => true]); ?>
+					</div>
+
+					<div class="mb-3">
+						<?= form_password(['name' => 'password', 'class' => 'form-control', 'placeholder' => 'Password', 'required' => true]); ?>
+					</div>
+
+					<div class="d-grid mb-3">
+						<?= form_button(['type' => 'submit', 'class' => 'btn btn-primary'], 'Log in'); ?>
+					</div>
+
+					<p class="text-center"><a href="#">Forgot Password?</a></p>
+				<?= form_close(); ?>
+			</div>
+		</div>
+	</div>
+
+<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
+
diff --git a/application/views/templates/CISHMVC-Header.php b/application/views/templates/CISHMVC-Header.php
index f9302d902..2acf5f414 100644
--- a/application/views/templates/CISHMVC-Header.php
+++ b/application/views/templates/CISHMVC-Header.php
@@ -20,7 +20,7 @@
 				<li><a class="btn btn-level-2 rounded-0 d-block" href="#" id="menu-profil">Profil</a></li>
 				<li><a class="btn btn-level-2 rounded-0 d-block" href="#">Ampeln</a></li>
 				<li><hr class="dropdown-divider"></li>
-				<li><a class="btn btn-level-2 rounded-0 d-block" href="#">Logout</a></li>
+				<li><a class="btn btn-level-2 rounded-0 d-block" href="<?= site_url('Cis/Auth/logout'); ?>">Logout</a></li>
 			</ul>
 			<div id="nav-main-menu" class="collapse collapse-horizontal show">
 				<div>
diff --git a/application/views/templates/CISHTML-Header.php b/application/views/templates/CISHTML-Header.php
index af175a95d..63d325d52 100644
--- a/application/views/templates/CISHTML-Header.php
+++ b/application/views/templates/CISHTML-Header.php
@@ -45,7 +45,7 @@ if (!isset($menu)) {
 				<li><a class="btn btn-level-2 rounded-0 d-block" href="#" id="menu-profil">Profil</a></li>
 				<li><a class="btn btn-level-2 rounded-0 d-block" href="#">Ampeln</a></li>
 				<li><hr class="dropdown-divider"></li>
-				<li><a class="btn btn-level-2 rounded-0 d-block" href="#">Logout</a></li>
+				<li><a class="btn btn-level-2 rounded-0 d-block" href="<?= site_url('Cis/Auth/logout'); ?>">Logout</a></li>
 			</ul>
 			<div id="nav-main-menu" class="collapse collapse-horizontal show">
 				<div>
diff --git a/application/views/templates/CISVUE-Header.php b/application/views/templates/CISVUE-Header.php
index c3c093028..9d66914d7 100644
--- a/application/views/templates/CISVUE-Header.php
+++ b/application/views/templates/CISVUE-Header.php
@@ -18,6 +18,6 @@ $this->load->view('templates/FHC-Header', $includesArray);
 ?>
 
 <header id="cis-header" class="navbar-dark">
-	<cis-menu root-url="<?= site_url('CisVue'); ?>" logo-url="<?= base_url('/public/images/logo-300x160.png'); ?>" avatar-url="<?= base_url('/cis/public/bild.php?src=person&person_id=' . getAuthPersonId()); ?>" :searchbaroptions="searchbaroptions" :searchfunction="searchfunction" />
+	<cis-menu root-url="<?= site_url('CisVue'); ?>" logo-url="<?= base_url('/public/images/logo-300x160.png'); ?>" avatar-url="<?= base_url('/cis/public/bild.php?src=person&person_id=' . getAuthPersonId()); ?>" logout-url="<?= site_url('Cis/Auth/logout'); ?>" :searchbaroptions="searchbaroptions" :searchfunction="searchfunction" />
 </header>
 <main id="cis-main" class="flex-grow-1 overflow-scroll p-4">
diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index 599403665..6d7735ffd 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -182,6 +182,9 @@
     width: 100vw;
     /* overflow: visible !important; */
   }
+  #cis-header {
+    z-index: 10;
+  }
   #cis-header nav {
     position: initial;
     transform: none;
@@ -269,7 +272,7 @@
     width: 100vw;
     display: flex;
     justify-content: space-between;
-    z-index: 1;
+    z-index: 10;
   }
   #cis-header nav {
     top: var(--fhc-cis-header-height);
diff --git a/public/js/components/Bootstrap/Modal.js b/public/js/components/Bootstrap/Modal.js
index a74e6daa0..237351b10 100644
--- a/public/js/components/Bootstrap/Modal.js
+++ b/public/js/components/Bootstrap/Modal.js
@@ -19,7 +19,11 @@ export default {
 			default: true
 		},
 		noCloseBtn: Boolean,
-		dialogClass: [String,Array,Object]
+		dialogClass: [String,Array,Object],
+		bodyClass: {
+			type: [String,Array,Object],
+			default: 'px-4 py-5'
+		}
 	},
 	emits: [
 		"hideBsModal",
@@ -64,9 +68,9 @@ export default {
 						ref: 'modal',
 						'onHidden.bs.modal': instance.unmount
 					}}, {
-						title: () => title,
-						default: () => body,
-						footer: () => footer
+						title: title ? () => title : undefined,
+						default: body ? () => body : undefined,
+						footer: footer ? () => footer : undefined
 					});
 				},
 				mounted() {
@@ -92,7 +96,7 @@ export default {
 					<h5 class="modal-title"><slot name="title"/></h5>
 					<button v-if="!noCloseBtn" type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
 				</div>
-				<div class="modal-body px-4 py-5">
+				<div class="modal-body" :class="bodyClass">
 					<slot></slot>
 				</div>
 				<div v-if="$slots.footer" class="modal-footer">
diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js
index 7a75886c6..99023032d 100644
--- a/public/js/components/Cis/Menu.js
+++ b/public/js/components/Cis/Menu.js
@@ -10,6 +10,7 @@ export default {
         rootUrl: String,
         logoUrl: String,
         avatarUrl: String,
+        logoutUrl: String,
         searchbaroptions: Object,
         searchfunction: Function
     },
@@ -45,7 +46,7 @@ export default {
                 <li><a class="btn btn-level-2 rounded-0 d-block" href="#" id="menu-profil">Profil</a></li>
                 <li><a class="btn btn-level-2 rounded-0 d-block" href="#">Ampeln</a></li>
                 <li><hr class="dropdown-divider"></li>
-                <li><a class="btn btn-level-2 rounded-0 d-block" href="#">Logout</a></li>
+                <li><a class="btn btn-level-2 rounded-0 d-block" :href="logoutUrl">Logout</a></li>
             </ul>
             <div id="nav-main-menu" class="collapse collapse-horizontal show">
                 <div>

From 2f2f19306bbf45baa4fe2e7f0cfdab3ec4ac5fdf Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 16 Jan 2023 10:32:24 +0100
Subject: [PATCH 0059/1461] MyLv

---
 application/controllers/Cis/MyLv.php          |  36 +++
 .../controllers/components/Cis/Mylv.php       | 216 ++++++++++++++++++
 .../controllers/components/Phrasen.php        |  23 ++
 .../Lehreinheitmitarbeiter_model.php          |  34 +++
 .../education/Lehrveranstaltung_model.php     | 170 ++++++++++++++
 .../models/education/Pruefung_model.php       |  30 +++
 .../Organisationseinheit_model.php            |  14 ++
 .../organisation/Studiensemester_model.php    |  18 ++
 application/models/system/Sprache_model.php   |  15 ++
 application/views/Cis/MyLv.php                |  82 +++++++
 public/js/apps/Cis/MyLv/Student.js            |   7 +
 public/js/components/Cis/Mylv/Semester.js     |  44 ++++
 .../Cis/Mylv/Semester/Studiengang.js          |  45 ++++
 .../Cis/Mylv/Semester/Studiengang/Lv.js       |  89 ++++++++
 .../Cis/Mylv/Semester/Studiengang/Lv/Info.js  | 187 +++++++++++++++
 .../Semester/Studiengang/Lv/Pruefungen.js     |  72 ++++++
 public/js/components/Cis/Mylv/Student.js      | 116 ++++++++++
 public/js/mixins/Phrasen.js                   |  69 ++++++
 system/phrasesupdate.php                      | 180 +++++++++++++++
 19 files changed, 1447 insertions(+)
 create mode 100644 application/controllers/Cis/MyLv.php
 create mode 100644 application/controllers/components/Cis/Mylv.php
 create mode 100644 application/controllers/components/Phrasen.php
 create mode 100644 application/views/Cis/MyLv.php
 create mode 100644 public/js/apps/Cis/MyLv/Student.js
 create mode 100644 public/js/components/Cis/Mylv/Semester.js
 create mode 100644 public/js/components/Cis/Mylv/Semester/Studiengang.js
 create mode 100644 public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
 create mode 100644 public/js/components/Cis/Mylv/Semester/Studiengang/Lv/Info.js
 create mode 100644 public/js/components/Cis/Mylv/Semester/Studiengang/Lv/Pruefungen.js
 create mode 100644 public/js/components/Cis/Mylv/Student.js
 create mode 100644 public/js/mixins/Phrasen.js

diff --git a/application/controllers/Cis/MyLv.php b/application/controllers/Cis/MyLv.php
new file mode 100644
index 000000000..bcd06aee7
--- /dev/null
+++ b/application/controllers/Cis/MyLv.php
@@ -0,0 +1,36 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * 
+ */
+class MyLv extends Auth_Controller
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'index' => 'student/anrechnung_beantragen:r' // TODO(chris): permissions?
+		]);
+
+		// Loads phrases system
+		$this->loadPhrases([
+			'global'
+		]);
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * @return void
+	 */
+	public function index()
+	{
+		$this->load->view('Cis/MyLv');
+	}
+
+}
diff --git a/application/controllers/components/Cis/Mylv.php b/application/controllers/components/Cis/Mylv.php
new file mode 100644
index 000000000..b911b5357
--- /dev/null
+++ b/application/controllers/components/Cis/Mylv.php
@@ -0,0 +1,216 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the FilterCmptLib (back-end)
+ * Provides data to the ajax get calls about the filter component
+ * Listens to ajax post calls to change the filter data
+ * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
+ * NOTE: extends the FHC_Controller instead of the Auth_Controller because the FilterCmpt has its
+ * 	own permissions check
+ */
+class Mylv extends Auth_Controller
+{
+
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'Student' => 'student/anrechnung_beantragen:r', // TODO(chris): permissions?
+			'Studiensemester' => 'student/anrechnung_beantragen:r', // TODO(chris): permissions?
+			'Lvs' => 'student/anrechnung_beantragen:r', // TODO(chris): permissions?
+			'Info' => 'student/anrechnung_beantragen:r', // TODO(chris): permissions?
+			'Pruefungen' => 'student/anrechnung_beantragen:r' // TODO(chris): permissions?
+		]);
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 */
+	public function Student()
+	{
+		$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+
+		$result = $this->LehrveranstaltungModel->getLvsByStudentWithGrades(get_uid());
+
+		if (isError($result))
+			return $this->outputJsonError(getError($result));
+
+		$this->outputJsonSuccess(getData($result));
+	}
+
+	/**
+	 */
+	public function Studiensemester()
+	{
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
+		$result = $this->StudiensemesterModel->getWhereStudentHasLvs(get_uid());
+
+		if (isError($result))
+			return $this->outputJsonError(getError($result));
+
+		$this->outputJsonSuccess(getData($result));
+	}
+
+	/**
+	 */
+	public function Lvs($studiensemester_kurzbz)
+	{
+		$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+
+		$result = $this->LehrveranstaltungModel->getLvsByStudentWithGrades(get_uid(), $studiensemester_kurzbz, getUserLanguage());
+
+		if (isError($result))
+			return $this->outputJsonError(getError($result));
+
+		$this->outputJsonSuccess(getData($result));
+	}
+
+	/**
+	 */
+	public function Info($studiensemester_kurzbz, $lehrveranstaltung_id)
+	{
+		$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+		$result = $this->LehrveranstaltungModel->load($lehrveranstaltung_id);
+
+		if (isError($result))
+			return $this->outputJsonError(getError($result));
+		$lv = current(getData($result) ?: []);
+
+		if (!$lv)
+			return $this->outputJsonError('Could\'t find Lehrveranstaltung with id: ' . $lehrveranstaltung_id);
+
+
+		$this->load->model('education/Lehreinheitmitarbeiter_model', 'LehreinheitmitarbeiterModel');
+
+		$result = $this->LehreinheitmitarbeiterModel->getForLv($lehrveranstaltung_id, $studiensemester_kurzbz);
+
+		if (isError($result))
+			return $this->outputJsonError(getError($result));
+
+		$lvinfo = [];
+		$lvinfo['lektoren'] = getData($result) ?: [];
+
+		$kollisionsfreie_user = unserialize(KOLLISIONSFREIE_USER);
+		$lvinfo['lektoren'] = array_values(array_filter($lvinfo['lektoren'], function ($v) use ($kollisionsfreie_user) {
+			return !in_array($v->uid, $kollisionsfreie_user);
+		}));
+
+		$lvinfo['lvLeitung'] = array_values(array_filter($lvinfo['lektoren'], function ($v) {
+			return $v->lehrfunktion_kurzbz == 'LV-Leitung';
+		}));
+
+
+		$this->load->model('organisation/Organisationseinheit_model', 'OrganisationseinheitModel');
+		$result = $this->OrganisationseinheitModel->getWithType($lv->oe_kurzbz);
+
+		if (isError($result))
+			return $this->outputJsonError(getError($result));
+
+		$lvinfo['oe'] = current(getData($result) ?: []);
+
+
+		$this->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
+		$result = $this->BenutzerfunktionModel->getBenutzerFunktionenDetailed('Leitung', $lv->oe_kurzbz);
+
+		if (isError($result))
+			return $this->outputJsonError(getError($result));
+
+		$lvinfo['oeLeitung'] = getData($result) ?: [];
+
+
+		$result = $this->LehrveranstaltungModel->getKoordinator($lehrveranstaltung_id, $studiensemester_kurzbz);
+
+		if (isError($result))
+			return $this->outputJsonError(getError($result));
+
+		$lvinfo['koordinator'] = getData($result) ?: [];
+
+		if (defined('ACTIVE_ADDONS') && in_array('lvinfo', explode(';', ACTIVE_ADDONS)) && file_exists(FHCPATH . 'addons/lvinfo/include/lvinfo.class.php'))
+		{
+			require_once(FHCPATH . 'addons/lvinfo/include/lvinfo.class.php');
+			$lvinfoObj = new lvinfo();
+			$lvinfoObj->loadLVinfo($lehrveranstaltung_id, $studiensemester_kurzbz, null, true);
+			if (is_array($lvinfoObj->result))
+			{
+				$oldP = property_exists($this, 'p') ? $this->p : null;
+				$result = [];
+				$lvinfos = $lvinfoObj->result;
+				$lvinfoSet = new lvinfo();
+				$lvinfoSet->load_lvinfo_set($studiensemester_kurzbz);
+				foreach ($lvinfos as $lvi)
+				{
+					$this->p = null;
+					$this->loadPhrases('ui', $lvi->sprache);
+					$result[$lvi->sprache] = [];
+					foreach ($lvinfoSet->result as $set)
+					{
+						$key = $set->lvinfo_set_kurzbz;
+						if (!isset($lvi->data[$key]))
+							continue;
+						$info['header'] = $set->lvinfo_set_bezeichnung[$lvi->sprache];
+						if (isset($set->einleitungstext[$lvi->sprache]))
+							$info['subheader'] = $set->einleitungstext[$lvi->sprache];
+						switch ($set->lvinfo_set_typ)
+						{
+							case 'boolean':
+								$info['body'] = $this->p->t('ui', $lvi->data[$key] === true ? 'ja' : 'nein');
+								break;
+							case 'array':
+								$info['body'] = array_map('htmlspecialchars', $lvi->data[$key]);
+								break;
+							case 'editor':
+								$info['body'] = $lvi->data[$key];
+								break;
+							default:
+								$info['body'] = htmlspecialchars($lvi->data[$key]);
+						}
+						if ($info['body'])
+							$result[$lvi->sprache][] = $info;
+					}
+				}
+				if ($result)
+				{
+					$lvinfo['lvinfo'] = $result;
+					$lvinfo['lvinfoDefaultLang'] = getUserLanguage();
+
+					$this->load->model('system/Sprache_model', 'SpracheModel');
+					$result = $this->SpracheModel->loadMultiple(array_keys($result));
+					if (!isError($result))
+					{
+						$result = getData($result);
+						$lvinfo['sprachen'] = [];
+						foreach ($result as $sprache) {
+							$lvinfo['sprachen'][$sprache->sprache] = $sprache;
+						}
+					}
+				}
+				$this->p = $oldP;
+			}
+		}
+
+
+		$this->outputJsonSuccess($lvinfo);
+	}
+
+	/**
+	 */
+	public function Pruefungen($lehrveranstaltung_id)
+	{
+		$this->load->model('education/Pruefung_model', 'PruefungModel');
+
+		$result = $this->PruefungModel->getByStudentAndLv(get_uid(), $lehrveranstaltung_id, getUserLanguage());
+
+		if (isError($result))
+			return $this->outputJsonError(getError($result));
+
+		$this->outputJsonSuccess(getData($result));
+	}
+
+}
diff --git a/application/controllers/components/Phrasen.php b/application/controllers/components/Phrasen.php
new file mode 100644
index 000000000..ba0280aab
--- /dev/null
+++ b/application/controllers/components/Phrasen.php
@@ -0,0 +1,23 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ *
+ */
+class Phrasen extends FHC_Controller
+{
+	
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * @param string $module
+	 */
+	public function LoadModule($module)
+	{
+		$this->load->library('PhrasesLib', [$module], 'pj');
+		$this->outputJsonSuccess(json_decode($this->pj->getJSON()));
+	}
+
+}
diff --git a/application/models/education/Lehreinheitmitarbeiter_model.php b/application/models/education/Lehreinheitmitarbeiter_model.php
index dd5c7c858..ae1ac55d2 100644
--- a/application/models/education/Lehreinheitmitarbeiter_model.php
+++ b/application/models/education/Lehreinheitmitarbeiter_model.php
@@ -41,4 +41,38 @@ class Lehreinheitmitarbeiter_model extends DB_Model
            return error ('Incorrect parameter type');
        }
     }
+
+    /**
+     * @param integer       $lehrveranstaltung_id
+     * @param string        $studiensemester_kurzbz
+     * 
+     * @return stdClass
+     */
+    public function getForLv($lehrveranstaltung_id, $studiensemester_kurzbz)
+    {
+        $this->addSelect('ma.uid, ma.vorname, ma.nachname, ma.titelpre, ma.titelpost, lehrfunktion_kurzbz');
+        $this->addGroupBy('ma.uid, ma.vorname, ma.nachname, ma.titelpre, ma.titelpost, lehrfunktion_kurzbz');
+
+        $this->addJoin('lehre.tbl_lehreinheit le', 'lehreinheit_id');
+        $this->addJoin('campus.vw_mitarbeiter ma', $this->dbTable . '.mitarbeiter_uid=ma.uid');
+
+        $this->addOrder('nachname');
+        $this->addOrder('vorname');
+
+        if (defined('CIS_LV_LEKTORINNENZUTEILUNG_VERTRAGSPRUEFUNG_VON') && CIS_LV_LEKTORINNENZUTEILUNG_VERTRAGSPRUEFUNG_VON != '')
+        {
+            $this->addJoin('(SELECT vertrag_id, CASE WHEN vertragsstatus_kurzbz=\'storno\' THEN 0 WHEN vertragsstatus_kurzbz=\'erteilt\' THEN 1 ELSE 2 END AS vertragsstatus_kurzbz FROM lehre.tbl_vertrag_vertragsstatus) v', 'vertrag_id', 'LEFT');
+            $having = $this->db->compile_binds('(EXISTS (SELECT 1 FROM public.tbl_studiensemester WHERE studiensemester_kurzbz=? AND tbl_studiensemester.start < (SELECT start FROM public.tbl_studiensemester stsem WHERE stsem.studiensemester_kurzbz=?)) OR MIN(vertragsstatus_kurzbz)=1)', [
+                $studiensemester_kurzbz,
+                CIS_LV_LEKTORINNENZUTEILUNG_VERTRAGSPRUEFUNG_VON
+            ]);
+            $this->db->having($having);
+        }
+
+        return $this->loadWhere([
+            'lehrveranstaltung_id' => $lehrveranstaltung_id,
+            'studiensemester_kurzbz' => $studiensemester_kurzbz
+        ]);
+    }
+
 }
diff --git a/application/models/education/Lehrveranstaltung_model.php b/application/models/education/Lehrveranstaltung_model.php
index f54443955..b85699073 100644
--- a/application/models/education/Lehrveranstaltung_model.php
+++ b/application/models/education/Lehrveranstaltung_model.php
@@ -231,6 +231,104 @@ class Lehrveranstaltung_model extends DB_Model
 		return $this->execQuery($qry, $params);
 	}
 
+	/**
+	 * Gets Lehrveranstaltungen of a student with grades if available
+	 * 
+	 * @param string		$student_uid
+	 * @param string		$studiensemester_kurzbz
+	 * @param string|null	$sprache
+	 * 
+	 * @return stdClass
+	 */
+	public function getLvsByStudentWithGrades($student_uid, $studiensemester_kurzbz, $sprache = null)
+	{
+		if ($sprache) {
+			$sprache_qry = $this->db->compile_binds('SELECT index FROM public.tbl_sprache WHERE sprache = ?', [$sprache]);
+			$bezeichnung = 'bezeichnung_mehrsprachig[(' . $sprache_qry . ')]';
+			$sgbezeichnung = $sprache == 'English' ? 'COALESCE(sg.english, sg.bezeichnung)' : 'sg.bezeichnung';
+			$lvbezeichnung = $sprache == 'English' ? 'COALESCE(v.bezeichnung_english, v.bezeichnung)' : 'v.bezeichnung';
+		} else {
+			$bezeichnung = 'bezeichnung';
+			$sgbezeichnung = 'sg.bezeichnung';
+			$lvbezeichnung = 'v.bezeichnung';
+		}
+
+		$this->addDistinct();
+		// TODO(chris): selects
+		/*
+		semester (?)
+		module
+		bezeichnung
+		sg_bezeichnung
+		studiengang_kuerzel
+		lvnote
+		znote
+		studiengang_kz
+		lehrveranstaltung_id
+		benotung
+		lvinfo
+		farbe
+
+		sprache (?)
+		ects (?)
+		incoming (?)
+		orgform_kurzbz (?)
+		*/
+		// TODO(chris): module or kf
+		#$this->addSelect($this->dbTable . '.*');
+		$this->addSelect('v.*');
+		$this->addSelect($this->dbTable . '.benotung');
+		$this->addSelect($this->dbTable . '.lvinfo');
+		$this->addSelect($this->dbTable . '.farbe');
+		$this->addSelect($this->dbTable . '.incoming');
+		$this->addSelect($this->dbTable . '.orgform_kurzbz');
+		$this->addSelect('v.studiengang_kz');
+		$this->addSelect('v.lehrveranstaltung_id');
+		$this->addSelect('v.semester');
+		
+		$this->addSelect('v.sprache');
+		$this->addSelect('v.ects');
+
+		#$this->addSelect('splv.module');
+		$this->addSelect($lvbezeichnung . ' AS bezeichnung');
+		$this->addSelect($sgbezeichnung . ' AS sg_bezeichnung');
+		$this->addSelect('UPPER(sg.typ::VARCHAR(1) || sg.kurzbz) AS studiengang_kuerzel');
+
+		$this->addSelect('COALESCE(gnn.' . $bezeichnung . ', gnn.bezeichnung, gn.note::text) AS lvnote');
+		$this->addSelect('COALESCE(znn.' . $bezeichnung . ', znn.bezeichnung, zn.note::text) AS znote');
+
+		$this->addJoin('campus.vw_student_lehrveranstaltung v', 'lehrveranstaltung_id');
+		$this->addJoin('public.tbl_studiengang sg', $this->dbTable . '.studiengang_kz = sg.studiengang_kz');
+		$this->db->where("v.lehreverzeichnis<>''");
+
+		$this->addJoin('campus.tbl_lvgesamtnote gn', 'gn.lehrveranstaltung_id=v.lehrveranstaltung_id AND gn.student_uid=v.uid AND gn.studiensemester_kurzbz=v.studiensemester_kurzbz', 'LEFT');
+		$this->addJoin('lehre.tbl_note gnn', 'gn.note=gnn.note', 'LEFT');
+
+		$this->addJoin('lehre.tbl_zeugnisnote zn', 'zn.lehrveranstaltung_id=v.lehrveranstaltung_id AND zn.student_uid=v.uid AND zn.studiensemester_kurzbz=v.studiensemester_kurzbz', 'LEFT');
+		$this->addJoin('lehre.tbl_note znn', 'zn.note=znn.note', 'LEFT');
+
+		/*if (!defined("CIS_PROFIL_STUDIENPLAN_MODULE_AUSBLENDEN") || !CIS_PROFIL_STUDIENPLAN_MODULE_AUSBLENDEN) {
+			$modulebezeichnung = str_replace('v.', 'm.', $lvbezeichnung);
+			$modulesql = '
+				LEFT JOIN lehre.tbl_studienplan_lehrveranstaltung p ON(lv.studienplan_lehrveranstaltung_id_parent=p.studienplan_lehrveranstaltung_id)
+				LEFT JOIN lehre.tbl_lehrveranstaltung m ON(m.lehrveranstaltung_id = p.lehrveranstaltung_id)';
+		} else {
+			$modulebezeichnung = 'NULL';
+			$modulesql = '';
+		}
+
+		$this->addJoin('(
+			SELECT lv.lehrveranstaltung_id, sps.studiensemester_kurzbz, so.studiengang_kz, lv.semester, ' . $modulebezeichnung . ' AS module
+			FROM lehre.tbl_studienplan_lehrveranstaltung lv
+			LEFT JOIN lehre.tbl_studienplan sp ON(sp.studienplan_id=lv.studienplan_id)
+			JOIN lehre.tbl_studienplan_semester sps ON(sp.studienplan_id=sps.studienplan_id AND sps.semester=lv.semester)
+			JOIN lehre.tbl_studienordnung so ON(so.studienordnung_id=sp.studienordnung_id)
+			' . $modulesql . '
+		) splv', 'splv.lehrveranstaltung_id=v.lehrveranstaltung_id AND splv.studiensemester_kurzbz=v.studiensemester_kurzbz AND splv.studiengang_kz=v.studiengang_kz', 'LEFT');*/
+
+		return $this->loadWhere(['v.uid' => $student_uid, 'v.lehre' => true, 'v.studiensemester_kurzbz' => $studiensemester_kurzbz]);
+	}
+
 	/**
 	 * Gets valid Lehrveranstaltungen with incoming places for a Studiensemester.
 	 * Only
@@ -471,4 +569,76 @@ class Lehrveranstaltung_model extends DB_Model
 
         return $this->execQuery($qry, array($student_uid));
     }
+
+    /**
+     * @param integer		$lehrveranstaltung_id
+     * @param string		$studiensemester_kurzbz
+     * 
+     * @return stdClass
+     */
+    public function getKoordinator($lehrveranstaltung_id, $studiensemester_kurzbz = null)
+    {
+		$binds = [
+			$lehrveranstaltung_id,
+			$lehrveranstaltung_id,
+			$lehrveranstaltung_id,
+			$lehrveranstaltung_id
+		];
+    	$qry = "
+			SELECT 
+				a.uid, vorname, nachname, titelpre, titelpost
+			FROM (
+				SELECT
+					koordinator as uid
+				FROM
+					lehre.tbl_lehrveranstaltung
+				WHERE
+					lehrveranstaltung_id = ?
+				UNION
+				SELECT
+					uid
+				FROM
+					lehre.tbl_lehreinheit
+					JOIN lehre.tbl_lehrveranstaltung AS lehrfach ON(tbl_lehreinheit.lehrfach_id = lehrfach.lehrveranstaltung_id)
+					JOIN public.tbl_fachbereich ON(lehrfach.oe_kurzbz=tbl_fachbereich.oe_kurzbz)
+					JOIN public.tbl_benutzerfunktion ON(tbl_fachbereich.fachbereich_kurzbz=tbl_benutzerfunktion.fachbereich_kurzbz)
+				WHERE
+					tbl_benutzerfunktion.funktion_kurzbz='fbk'
+				AND (tbl_benutzerfunktion.datum_von IS null OR tbl_benutzerfunktion.datum_von <= now())
+				AND (tbl_benutzerfunktion.datum_bis IS null OR tbl_benutzerfunktion.datum_bis >= now())
+				AND tbl_lehreinheit.lehrveranstaltung_id = ?
+				AND tbl_benutzerfunktion.oe_kurzbz = (
+					SELECT
+						tbl_studiengang.oe_kurzbz
+					FROM
+						lehre.tbl_lehrveranstaltung
+						JOIN public.tbl_studiengang USING(studiengang_kz)
+					WHERE lehrveranstaltung_id = ?
+				)
+				AND EXISTS (
+					SELECT
+						lehrveranstaltung_id
+					FROM
+						lehre.tbl_lehrveranstaltung
+					WHERE
+						lehrveranstaltung_id = ?
+						AND koordinator IS null
+				)
+		";
+
+		if ($studiensemester_kurzbz !== null)
+		{
+			$qry .= " AND tbl_lehreinheit.studiensemester_kurzbz = ?";
+			$binds[] = $studiensemester_kurzbz;
+		}
+		
+		$qry .= "
+			) AS a
+			JOIN campus.vw_mitarbeiter ON(a.uid=vw_mitarbeiter.uid)
+			WHERE vw_mitarbeiter.aktiv
+		";
+
+		return $this->execQuery($qry, $binds);
+	}
+
 }
diff --git a/application/models/education/Pruefung_model.php b/application/models/education/Pruefung_model.php
index e3776c4ad..48a6f4f3c 100644
--- a/application/models/education/Pruefung_model.php
+++ b/application/models/education/Pruefung_model.php
@@ -36,4 +36,34 @@ class Pruefung_model extends DB_Model
 
 		return $this->execQuery($qry, array($person_id, $studiensemester_kurzbz));
 	}
+
+	/**
+	 * Gets Pruefungen of a student for a Lehrveranstaltung.
+	 * 
+	 * @param string		$uid
+	 * @param string		$lehrveranstaltung_id
+	 * @param string|null	$lehrveranstaltung_id
+	 * 
+	 * @return object
+	 */
+	public function getByStudentAndLv($uid, $lehrveranstaltung_id, $sprache = null)
+	{
+		$this->dbTable = 'lehre.tbl_pruefung';
+
+		if ($sprache) {
+			$sprache_qry = $this->db->compile_binds('SELECT index FROM public.tbl_sprache WHERE sprache = ?', [$sprache]);
+			$bezeichnung = 'bezeichnung_mehrsprachig[(' . $sprache_qry . ')]';
+		} else {
+			$bezeichnung = 'bezeichnung';
+		}
+
+		$this->addSelect($this->dbTable . '.pruefung_id, ' . $this->dbTable . '.pruefungstyp_kurzbz, ' . $this->dbTable . '.datum, COALESCE(n.' . $bezeichnung . ', n.note::text) AS note');
+
+		$this->addJoin('lehre.tbl_lehreinheit le', 'lehreinheit_id');
+		$this->addJoin('lehre.tbl_lehrveranstaltung lv', 'lehrveranstaltung_id');
+		$this->addJoin('lehre.tbl_note n', 'note');
+
+		return $this->loadWhere(['lehrveranstaltung_id' => $lehrveranstaltung_id, 'student_uid' => $uid]);
+	}
+
 }
diff --git a/application/models/organisation/Organisationseinheit_model.php b/application/models/organisation/Organisationseinheit_model.php
index bec4aee47..86523cab9 100644
--- a/application/models/organisation/Organisationseinheit_model.php
+++ b/application/models/organisation/Organisationseinheit_model.php
@@ -188,4 +188,18 @@ class Organisationseinheit_model extends DB_Model
         }
         return $this->loadWhere($condition);
     }
+
+    /**
+     * @param string $oe_kurzbz
+     * 
+     * @return stdClass
+     */
+    public function getWithType($oe_kurzbz)
+    {
+    	$this->addSelect($this->dbTable . '.*, t.bezeichnung AS organisationseinheittyp');
+    	$this->addJoin('public.tbl_organisationseinheittyp t', 'organisationseinheittyp_kurzbz');
+
+    	return $this->load($oe_kurzbz);
+    }
+
 }
diff --git a/application/models/organisation/Studiensemester_model.php b/application/models/organisation/Studiensemester_model.php
index bb9b94c92..a7333260d 100644
--- a/application/models/organisation/Studiensemester_model.php
+++ b/application/models/organisation/Studiensemester_model.php
@@ -204,4 +204,22 @@ class Studiensemester_model extends DB_Model
 
 		return $this->execQuery($query, array($studiensemester_kurzbz));
 	}
+
+	/**
+	 * @param string		$student_uid
+	 * 
+	 * @return StdClass
+	 */
+	public function getWhereStudentHasLvs($student_uid)
+	{
+		$this->addDistinct();
+		$this->addSelect($this->dbTable . '.*');
+
+		$this->addJoin('campus.vw_student_lehrveranstaltung v', 'studiensemester_kurzbz');
+		$this->db->where("v.lehreverzeichnis<>''");
+
+		$this->addOrder($this->dbTable . '.start');
+		
+		return $this->loadWhere(['uid' => $student_uid, 'v.lehre' => true]);
+	}
 }
diff --git a/application/models/system/Sprache_model.php b/application/models/system/Sprache_model.php
index 202157a83..fb12b91e9 100644
--- a/application/models/system/Sprache_model.php
+++ b/application/models/system/Sprache_model.php
@@ -11,4 +11,19 @@ class Sprache_model extends DB_Model
 		$this->dbTable = 'public.tbl_sprache';
 		$this->pk = 'sprache';
 	}
+
+	/**
+	 * @param array		$sprachen
+	 * 
+	 * @return stdClass
+	 */
+	public function loadMultiple($sprachen)
+	{
+		$this->db->where_in('sprache', $sprachen);
+
+		$this->addOrder('index');
+
+		return $this->load();
+	}
+
 }
diff --git a/application/views/Cis/MyLv.php b/application/views/Cis/MyLv.php
new file mode 100644
index 000000000..8786fd866
--- /dev/null
+++ b/application/views/Cis/MyLv.php
@@ -0,0 +1,82 @@
+<?php
+$includesArray = array(
+	'customJSModules' => ['public/js/apps/Cis/MyLv/Student.js'],
+	'customCSSs' => [
+		'public/css/components/dashboard.css'
+	]
+);
+
+$this->load->view('templates/CISHTML-Header', $includesArray);
+?>
+
+<div id="content">
+	<h2>MyLv</h2>
+	<hr>
+	<mylv-student></mylv-student>
+	<?php $studiengaenge = [];foreach ($studiengaenge as $studiengang) { ?>
+		<h3><?= $studiengang['bezeichnung'] . ' - ' . $studiengang['studiengang_kz']; ?></h3>
+		<?php foreach ($studiengang['semester'] as $semester) { ?>
+			<h4><?= implode(",", array_keys($semester['studiensemester_kurzbz'])); ?>, <?= $semester['semester']; ?>.Semester</h4>
+			<?php foreach ($semester['lvs'] as $lv) { ?>
+				<!-- lehrveranstaltung_id: <?= $lv->lehrveranstaltung_id; ?><br>
+				kurzbz: <?= $lv->kurzbz; ?><br> -->
+				bezeichnung: <?= $lv->bezeichnung; ?><br>
+				<!-- studiengang_kz: <?= $lv->studiengang_kz; ?><br>
+				semester: <?= $lv->semester; ?><br>
+				sprache: <?= $lv->sprache; ?><br>
+				ects: <?= $lv->ects; ?><br>
+				semesterstunden: <?= $lv->semesterstunden; ?><br>
+				anmerkung: <?= $lv->anmerkung; ?><br>
+				lehre: <?= $lv->lehre; ?><br>
+				lehreverzeichnis: <?= $lv->lehreverzeichnis; ?><br>
+				aktiv: <?= $lv->aktiv; ?><br>
+				planfaktor: <?= $lv->planfaktor; ?><br>
+				planlektoren: <?= $lv->planlektoren; ?><br>
+				planpersonalkosten: <?= $lv->planpersonalkosten; ?><br>
+				plankostenprolektor: <?= $lv->plankostenprolektor; ?><br>
+				ext_id: <?= $lv->ext_id; ?><br>
+				sort: <?= $lv->sort; ?><br>
+				zeugnis: <?= $lv->zeugnis; ?><br>
+				koordinator: <?= $lv->koordinator; ?><br>
+				projektarbeit: <?= $lv->projektarbeit; ?><br>
+				lehrform_kurzbz: <?= $lv->lehrform_kurzbz; ?><br>
+				bezeichnung_english: <?= $lv->bezeichnung_english; ?><br>
+				orgform_kurzbz: <?= $lv->orgform_kurzbz; ?><br>
+				incoming: <?= $lv->incoming; ?><br>
+				lehrtyp_kurzbz: <?= $lv->lehrtyp_kurzbz; ?><br>
+				oe_kurzbz: <?= $lv->oe_kurzbz; ?><br>
+				raumtyp_kurzbz: <?= $lv->raumtyp_kurzbz; ?><br>
+				anzahlsemester: <?= $lv->anzahlsemester; ?><br>
+				semesterwochen: <?= $lv->semesterwochen; ?><br>
+				lvnr: <?= $lv->lvnr; ?><br>
+				semester_alternativ: <?= $lv->semester_alternativ; ?><br>
+				farbe: <?= $lv->farbe; ?><br>
+				old_lehrfach_id: <?= $lv->old_lehrfach_id; ?><br>
+				sws: <?= $lv->sws; ?><br>
+				lvs: <?= $lv->lvs; ?><br>
+				alvs: <?= $lv->alvs; ?><br>
+				lvps: <?= $lv->lvps; ?><br>
+				las: <?= $lv->las; ?><br>
+				benotung: <?= $lv->benotung; ?><br>
+				lvinfo: <?= $lv->lvinfo; ?><br>
+				lehrauftrag: <?= $lv->lehrauftrag; ?><br>
+				lehrmodus_kurzbz: <?= $lv->lehrmodus_kurzbz; ?><br>
+				lehrveranstaltung_template_id: <?= $lv->lehrveranstaltung_template_id; ?><br>
+				uid: <?= $lv->uid; ?><br>
+				lehreinheit_id: <?= $lv->lehreinheit_id; ?><br> -->
+				studiensemester_kurzbz: <?= $lv->studiensemester_kurzbz; ?><br>
+				<!-- lehrfach_id: <?= $lv->lehrfach_id; ?><br>
+				stundenblockung: <?= $lv->stundenblockung; ?><br>
+				wochenrythmus: <?= $lv->wochenrythmus; ?><br>
+				start_kw: <?= $lv->start_kw; ?><br>
+				raumtyp: <?= $lv->raumtyp; ?><br>
+				raumtypalternativ: <?= $lv->raumtypalternativ; ?><br>
+				lv_lehrform_kurzbz: <?= $lv->lv_lehrform_kurzbz; ?><br> -->
+			<?php } ?>
+			<hr>
+		<?php } ?>
+		<hr>
+	<?php } ?>
+</div>
+
+<?php $this->load->view('templates/CISHTML-Footer', $includesArray); ?>
diff --git a/public/js/apps/Cis/MyLv/Student.js b/public/js/apps/Cis/MyLv/Student.js
new file mode 100644
index 000000000..27c340a2c
--- /dev/null
+++ b/public/js/apps/Cis/MyLv/Student.js
@@ -0,0 +1,7 @@
+import MylvStudent from "../../../components/Cis/Mylv/Student.js";
+
+Vue.createApp({
+	components: {
+		MylvStudent
+	}
+}).mount('#content');
\ No newline at end of file
diff --git a/public/js/components/Cis/Mylv/Semester.js b/public/js/components/Cis/Mylv/Semester.js
new file mode 100644
index 000000000..58d1d442e
--- /dev/null
+++ b/public/js/components/Cis/Mylv/Semester.js
@@ -0,0 +1,44 @@
+import MylvSemesterStudiengang from "./Semester/Studiengang.js";
+
+export default {
+	components: {
+		MylvSemesterStudiengang
+	},
+	provide() {
+		return {
+			studien_semester: this.semester
+		}
+	},
+	props: {
+		semester: String,
+		lvs: Array
+	},
+	computed: {
+		ready() { return this.lvs !== null; },
+		studiengaenge() {
+			return [... new Map(
+				this.lvs
+				.map(lv => [
+					lv.studiengang_kz + '#' + lv.semester, 
+					{
+						studiengang_kz: lv.studiengang_kz, 
+						bezeichnung: lv.sg_bezeichnung, 
+						kuerzel: lv.studiengang_kuerzel, 
+						semester: lv.semester
+					}
+				])
+			).values()].sort((a, b) => a.bezeichnung.toLowerCase() == b.bezeichnung.toLowerCase() ? a.semester > b.semester : a.bezeichnung.toLowerCase() > b.bezeichnung.toLowerCase());
+		},
+	},
+	methods: {
+		lvsForStudiengang(studiengang) {
+			return this.lvs.filter(lv => lv.studiengang_kz == studiengang.studiengang_kz && lv.semester == studiengang.semester);
+		}
+	},
+	template: `<div class="mylv-semester" v-if="ready">
+		<mylv-semester-studiengang v-for="studiengang in studiengaenge" :key="studiengang.studiengang_kz" v-bind="studiengang" :lvs="lvsForStudiengang(studiengang)"/>
+	</div>
+	<div class="mylv-semester text-center" v-else>
+		<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
+	</div>`
+};
\ No newline at end of file
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang.js b/public/js/components/Cis/Mylv/Semester/Studiengang.js
new file mode 100644
index 000000000..4f1eaa45d
--- /dev/null
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang.js
@@ -0,0 +1,45 @@
+import MylvSemesterStudiengangLv from "./Studiengang/Lv.js";
+import Phrasen from "../../../../mixins/Phrasen.js";
+
+export default {
+	components: {
+		MylvSemesterStudiengangLv
+	},
+	mixins: [
+		Phrasen
+	],
+	props: {
+		bezeichnung: String,
+		kuerzel: String,
+		semester: Number,
+		lvs: Array
+	},
+	computed: {
+		lehrveranstaltungen() {
+			return [... new Map(
+				this.lvs
+				.map(lv => [
+					lv.lehrveranstaltung_id, 
+					lv
+				])
+			).values()]
+		}
+	},
+	methods: {
+		note(lv) {
+			return lv.benotung ? lv.znote || lv.lvnote || null : null;
+		}
+	},
+	template: `<div class="card mb-3">
+		<div class="card-body">
+			<h4 class="card-title mb-3">{{bezeichnung}} - {{kuerzel}}
+				<small>{{semester}}.{{p.t('lehre/semester')}}</small>
+			</h4>
+			<div class="row">
+				<div v-for="lv in lehrveranstaltungen" :key="lv.lehrveranstaltung_id" class="col-sm-4 mb-3">
+					<mylv-semester-studiengang-lv v-bind="lv" class="text-center h-100"></mylv-semester-studiengang-lv>
+				</div>
+			</div>
+		</div>
+	</div>`
+};
\ No newline at end of file
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
new file mode 100644
index 000000000..5efe5d36b
--- /dev/null
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
@@ -0,0 +1,89 @@
+import LvPruefungen from "./Lv/Pruefungen.js";
+import LvInfo from "./Lv/Info.js";
+
+// TODO(chris): L10n
+
+export default {
+	inject: ['studien_semester'],
+	props: {
+		lehrveranstaltung_id: Number,
+		bezeichnung: String,
+		module: String,
+		farbe: String,
+		lvinfo: Boolean,
+		benotung: Boolean,
+		lvnote: String,
+		znote: String,
+		studiengang_kuerzel: String,
+		semester: String,
+		orgform_kurzbz: String,
+		sprache: String,
+		ects: Number,
+		incoming: Number
+	},
+	data: () => {
+		return {
+			pruefungen: null,
+			info: null
+		}
+	},
+	computed: {
+		bodyStyle() {
+			const bodyStyle = {};
+			if (this.farbe)
+				bodyStyle['background-color'] = '#' + this.farbe;
+			return bodyStyle;
+		},
+		grade() {
+			return this.benotung ? this.znote || this.lvnote || null : null;
+		}
+	},
+	methods: {
+		openPruefungen() {
+			if (!this.pruefungen) {
+				this.pruefungen = true;
+				LvPruefungen.popup({
+					lehrveranstaltung_id: this.lehrveranstaltung_id, 
+					bezeichnung: this.bezeichnung
+				}).then(() => this.pruefungen = false).catch(() => this.pruefungen = false);
+			}
+		},
+		openInfos() {
+			if (!this.info) {
+				this.info = true;
+				// TODO(chris): load all this params on ajax?
+				LvInfo.popup({
+					lehrveranstaltung_id: this.lehrveranstaltung_id, 
+					bezeichnung: this.bezeichnung,
+					studiengang_kuerzel: this.studiengang_kuerzel,
+					semester: this.semester,
+					studien_semester: this.studien_semester,
+					orgform_kurzbz: this.orgform_kurzbz,
+					sprache: this.sprache,
+					ects: this.ects,
+					incoming: this.incoming
+				}).then(() => this.info = false).catch(() => this.info = false);
+			}
+		}
+	},
+	template: `<div class="mylv-semester-studiengang-lv card">
+		<div v-if="module" class="card-header">
+			{{module}}
+		</div>
+		<div class="card-body" :style="bodyStyle">
+			<h5 class="card-title">{{bezeichnung}}</h5>
+		</div>
+		<div class="card-footer">
+			<div class="row">
+				<a href="#" class="col-auto text-start text-decoration-none" @click.prevent="openPruefungen">
+					{{ grade || '-' }}
+				</a>
+				<div v-if="lvinfo" class="col text-end">
+					<a class="card-link" href="#" @click.prevent="openInfos">
+						<i class="fa fa-info-circle" aria-hidden="true"></i>
+					</a>
+				</div>
+			</div>
+		</div>
+	</div>`
+};
\ No newline at end of file
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv/Info.js b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv/Info.js
new file mode 100644
index 000000000..935e1e0c0
--- /dev/null
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv/Info.js
@@ -0,0 +1,187 @@
+import BsModal from '../../../../../Bootstrap/Modal.js';
+import Phrasen from '../../../../../../mixins/Phrasen.js';
+
+const infos = {};
+
+export default {
+	components: {
+		BsModal
+	},
+	mixins: [
+		BsModal,
+		Phrasen
+	],
+	props: {
+		lehrveranstaltung_id: Number,
+		bezeichnung: String,
+		studiengang_kuerzel: String,
+		semester: Number,
+		studien_semester: String,
+		orgform_kurzbz: String,
+		sprache: String,
+		ects: Number,
+		incoming: Number,
+		/*
+		 * NOTE(chris): 
+		 * Hack to expose in "emits" declared events to $props which we use 
+		 * in the v-bind directive to forward all events.
+		 * @see: https://github.com/vuejs/core/issues/3432
+		*/
+		onHideBsModal: Function,
+		onHiddenBsModal: Function,
+		onHidePreventedBsModal: Function,
+		onShowBsModal: Function,
+		onShownBsModal: Function
+	},
+	data: () => ({
+		result: true,
+		info: null
+	}),
+	computed: {
+		lektorNames() {
+			return this.info.lektoren.map(e => ((e.titelpre || '') + ' ' + (e.vorname || '') + ' ' + (e.nachname || '') + ' ' + (e.titelpost || '')).trim());
+		},
+		lvLeitung() {
+			return this.info.lvLeitung && this.info.lvLeitung.length ? this.info.lvLeitung.map(e => ((e.titelpre || '') + ' ' + (e.vorname || '') + ' ' + (e.nachname || '') + ' ' + (e.titelpost || '')).trim()) : null;
+		},
+		oe() {
+			return this.info.oe.organisationseinheittyp ? (this.info.oe.organisationseinheittyp + ' ' + this.info.oe.bezeichnung) : '';
+		},
+		oeLeitung() {
+			if (!this.info.oeLeitung || !this.info.oeLeitung.length)
+				return ['-'];
+			return this.info.oeLeitung.map(e => ((e.titelpre || '') + ' ' + (e.vorname || '') + ' ' + (e.nachname || '') + ' ' + (e.titelpost || '')).trim());
+		},
+		koordinator() {
+			if (!this.info.koordinator || !this.info.koordinator.length)
+				return null;
+			return this.info.koordinator.map(e => ((e.titelpre || '') + ' ' + (e.vorname || '') + ' ' + (e.nachname || '') + ' ' + (e.titelpost || '')).trim());
+		},
+		currentLang() {
+			if (!this.info)
+				return null;
+			if (this.info.lastLang)
+				return this.info.lastLang;
+			if (!this.info.lvinfo)
+				return null;
+			return this.info.lvinfoDefaultLang && this.info.lvinfo[this.info.lvinfoDefaultLang] ? this.info.lvinfoDefaultLang : Object.keys(this.info.lvinfo).shift();
+		}
+	},
+	created() {
+		if (infos[this.lehrveranstaltung_id]) {
+			this.info = infos[this.lehrveranstaltung_id];
+		} else {
+			axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/Cis/Mylv/Info/' + this.studien_semester + '/' + this.lehrveranstaltung_id).then(res => {
+				this.info = infos[this.lehrveranstaltung_id] = res.data.retval || [];
+			}).catch(() => this.info = {});
+		}
+	},
+	mounted() {
+		this.modal = this.$refs.modalContainer.modal;
+	},
+	popup(options) {
+		return BsModal.popup.bind(this)(null, options);
+	},
+	template: `<bs-modal ref="modalContainer" class="bootstrap-alert" v-bind="$props" body-class="" dialog-class="modal-fullscreen">
+		<template v-slot:title>
+			{{p.t('lvinfo/lehrveranstaltungsinformationen')}}
+		</template>
+		<template v-slot:default>
+			<div v-if="!info" class="text-center">
+				<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
+			</div>
+			<table v-else class="table table-hover">
+				<tbody>
+					<tr>
+						<th>{{p.t('lehre/lehrveranstaltung')}}</th>
+						<td>{{bezeichnung}}</td>
+					</tr>
+					<tr>
+						<th>{{p.t('lehre/studiengang')}}</th>
+						<td>{{studiengang_kuerzel}}</td>
+					</tr>
+					<tr>
+						<th>{{p.t('lehre/semester')}}</th>
+						<td>{{semester}}</td>
+					</tr>
+					<tr>
+						<th>{{p.t('lehre/studiensemester')}}</th>
+						<td>{{studien_semester}}</td>
+					</tr>
+					<tr>
+						<th>{{p.t('lehre/organisationsform')}}</th>
+						<td>{{orgform_kurzbz}}</td>
+					</tr>
+					<tr>
+						<th>{{p.t('lehre/lehrbeauftragter')}}</th>
+						<td>
+							<ul v-if="lektorNames.length" class="list-unstyled mb-0">
+								<li v-for="name in lektorNames" :key="name">
+									<!-- TODO(chris): link? -->
+									{{name}}
+								</li>
+							</ul>
+							<template v-else>
+								{{p.t('lehre/keinLektorZugeordnet')}}
+							</template>
+						</td>
+					</tr>
+					<tr v-if="lvLeitung">
+						<th>{{p.t('lehre/lvleitung')}}</th>
+						<td>
+							<ul class="list-unstyled mb-0">
+								<li v-for="name in lvLeitung" :key="name">
+									<!-- TODO(chris): link? -->
+									{{name}}
+								</li>
+							</ul>
+						</td>
+					</tr>
+					<tr>
+						<th>{{p.t('global/sprache')}}</th>
+						<td>{{sprache}}</td>
+					</tr>
+					<tr>
+						<th>{{p.t('lehre/ects')}}</th>
+						<td>{{ects}}</td>
+					</tr>
+					<tr>
+						<th>{{p.t('lehre/incomingplaetze')}}</th>
+						<td>{{incoming}}</td>
+					</tr>
+					<tr>
+						<th>{{p.t('lehre/organisationseinheit')}}</th>
+						<td>
+							{{oe}} <br>
+							(
+							<i>{{p.t('global/leitung')}}: </i>{{oeLeitung.join(', ')}}
+							<template v-if="koordinator">
+								<i>{{p.t('global/koordination')}}: </i>{{koordinator.join(', ')}}
+							</template>
+							)
+						</td>
+					</tr>
+				</tbody>
+			</table>
+			<div v-if="info && info.lvinfo">
+				<div v-if="Object.keys(info.lvinfo).length > 1" class="text-end">
+					<div class="btn-group" role="group" :title="p.t('global/verfuegbareSprachen')" :aria-label="p.t('global/verfuegbareSprachen')">
+						<template v-for="lang in info.sprachen" :key="lang.index">
+							<button v-if="info.lvinfo[lang.sprache]" type="button" class="btn btn-outline-primary" :class="lang.sprache == currentLang ? 'active' : ''" @click.prevent="info.lastLang = lang.sprache"><img class="d-block" :src="'data:image/gif;base64, ' + lang.flagge" :alt="lang.bezeichnung[lang.index]"></button>
+						</template>
+					</div>
+				</div>
+				<template v-for="i in info.lvinfo[currentLang]" :key="info">
+					<h4>{{i.header}}</h4>
+					<h6 v-if="i.subheader">{{i.subheader}}</h6>
+					<ul v-if="Array.isArray(i.body)">
+						<li v-for="e in i.body" :key="e">{{e}}</li>
+					</ul>
+					<p v-else>
+						{{i.body}}
+					</p>
+				</template>
+			</div>
+		</template>
+	</bs-modal>`
+}
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv/Pruefungen.js b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv/Pruefungen.js
new file mode 100644
index 000000000..b41b58664
--- /dev/null
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv/Pruefungen.js
@@ -0,0 +1,72 @@
+import BsModal from '../../../../../Bootstrap/Modal.js';
+
+const pruefungen = {};
+
+export default {
+	components: {
+		BsModal
+	},
+	mixins: [
+		BsModal
+	],
+	props: {
+		lehrveranstaltung_id: Number,
+		bezeichnung: String,
+		/*
+		 * NOTE(chris): 
+		 * Hack to expose in "emits" declared events to $props which we use 
+		 * in the v-bind directive to forward all events.
+		 * @see: https://github.com/vuejs/core/issues/3432
+		*/
+		onHideBsModal: Function,
+		onHiddenBsModal: Function,
+		onHidePreventedBsModal: Function,
+		onShowBsModal: Function,
+		onShownBsModal: Function
+	},
+	data: () => ({
+		result: true,
+		pruefungen: null
+	}),
+	created() {
+		if (pruefungen[this.lehrveranstaltung_id])
+			this.pruefungen = pruefungen[this.lehrveranstaltung_id];
+		else
+			axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/Cis/Mylv/Pruefungen/' + this.lehrveranstaltung_id).then(res => {
+				this.pruefungen = pruefungen[this.lehrveranstaltung_id] = res.data.retval || [];
+			});
+	},
+	mounted() {
+		this.modal = this.$refs.modalContainer.modal;
+	},
+	popup(options) {
+		return BsModal.popup.bind(this)(null, options);
+	},
+	template: `<bs-modal ref="modalContainer" class="bootstrap-alert" v-bind="$props" body-class="">
+		<template v-slot:title>
+			Prüfungen: {{bezeichnung}}
+		</template>
+		<template v-slot:default>
+			<div v-if="!pruefungen" class="text-center">
+				<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
+			</div>
+			<p v-else-if="!pruefungen.length" class="alert alert-info mb-0">
+				Keine Prüfungen vorhanden!
+			</p>
+			<table v-else class="table table-hover">
+				<thead>
+					<td>&nbsp;</td>
+					<td>Datum</td>
+					<td class="text-end">Note</td>
+				</thead>
+				<tbody>
+					<tr v-for="pruefung in pruefungen" :key="pruefung.pruefung_id">
+						<th>{{pruefung.pruefungstyp_kurzbz}}</th>
+						<td>{{pruefung.datum}}</td>
+						<td class="text-end">{{pruefung.note}}</td>
+					</tr>
+				</tbody>
+			</table>
+		</template>
+	</bs-modal>`
+}
diff --git a/public/js/components/Cis/Mylv/Student.js b/public/js/components/Cis/Mylv/Student.js
new file mode 100644
index 000000000..125422b01
--- /dev/null
+++ b/public/js/components/Cis/Mylv/Student.js
@@ -0,0 +1,116 @@
+import MylvSemester from "./Semester.js";
+import Phrasen from "../../../mixins/Phrasen.js";
+
+// TODO(chris): phrase: global/studiensemester_auswaehlen
+// TODO(chris): phrase: next & prev +aria-label
+
+export default {
+	components: {
+		MylvSemester
+	},
+	mixins: [
+		Phrasen
+	],
+	data: () => {
+		return {
+			firstLoad: true,
+			studiensemester: null,
+			lvs: {},
+			currentSemester: null
+		};
+	},
+	computed: {
+		ready() {
+			return this.studiensemester !== null && (!this.firstLoad || this.current.lvs !== null);
+		},
+		current() {
+			if (this.currentSemester === null)
+				return { semester: null, lvs: null };
+			if (this.lvs[this.currentSemester] === undefined) {
+				this.lvs[this.currentSemester] = {
+					semester: this.currentSemester, 
+					lvs: null
+				};
+				axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/Cis/Mylv/Lvs/' + this.currentSemester).then(res => {
+					this.lvs[this.currentSemester].lvs = res.data.retval;
+					this.firstLoad = false;
+				});
+			}
+			return this.lvs[this.currentSemester];
+		},
+		nearestSem() {
+			let now = Date.now();
+			let nearestSem = null;
+			let nearestSemDiff = 0;
+			this.studiensemester.forEach(sem => {
+				let start = new Date(sem.start);
+				let end = new Date(sem.ende);
+				if (now >= start && now <= end) {
+					nearestSem = sem.studiensemester_kurzbz;
+					nearestSemDiff = 0;
+					return;
+				}
+				let diff = Math.min(Math.abs(now - start), Math.abs(now - end));
+				if (nearestSem === null || diff < nearestSemDiff) {
+					nearestSem = sem.studiensemester_kurzbz;
+					nearestSemDiff = diff;
+				}
+
+			});
+			return nearestSem;
+		},
+		currentIsFirst() {
+			return this.studiensemester[0].studiensemester_kurzbz == this.currentSemester;
+		},
+		currentIsLast() {
+			return this.studiensemester[this.studiensemester.length-1].studiensemester_kurzbz == this.currentSemester;
+		}
+	},
+	methods: {
+		prevSem() {
+			this.$refs.studiensemester.selectedIndex--;
+			this.$refs.studiensemester.dispatchEvent(new Event('change', { bubbles: true }));
+		},
+		nextSem() {
+			this.$refs.studiensemester.selectedIndex++;
+			this.$refs.studiensemester.dispatchEvent(new Event('change', { bubbles: true }));
+		},
+		setHash(val) {
+			location.hash = val;
+		}
+	},
+	created() {
+		axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/Cis/Mylv/Studiensemester').then(res => {
+			this.studiensemester = res.data.retval;
+			const hash = location.hash.substring(1);
+			if (hash && this.studiensemester.filter(s => s.studiensemester_kurzbz == hash).length)
+				this.currentSemester = hash;
+			else
+				this.currentSemester = this.nearestSem;
+		});
+	},
+	template: `<div class="mylv-student" v-if="ready">
+		<div class="row justify-content-center mb-3">
+			<div class="col-auto d-none">
+				<label class="col-form-label">{{p.t('lehre/studiensemester')}}</label>
+			</div>
+			<div class="col-auto">
+				<div class="input-group">
+					<button class="btn btn-outline-secondary" type="button" :disabled="currentIsFirst" @click="prevSem">
+						<i class="fa fa-caret-left" aria-hidden="true"></i>
+					</button>
+					<select ref="studiensemester" v-model="currentSemester" class="form-select" :aria-label="p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
+						<option v-for="semester in studiensemester" :key="semester.studiensemester_kurzbz">{{semester.studiensemester_kurzbz}}</option>
+					</select>
+					<button class="btn btn-outline-secondary" type="button" :disabled="currentIsLast" @click="nextSem">
+						<i class="fa fa-caret-right" aria-hidden="true"></i>
+					</button>
+				</div>
+			</div>
+		</div>
+		<mylv-semester v-bind="current"/>
+	</div>
+	<div class="mylv-student text-center" v-else>
+		<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
+	</div>`
+};
\ No newline at end of file
diff --git a/public/js/mixins/Phrasen.js b/public/js/mixins/Phrasen.js
new file mode 100644
index 000000000..2d9876ac9
--- /dev/null
+++ b/public/js/mixins/Phrasen.js
@@ -0,0 +1,69 @@
+const categories = {};
+const loadingModules = {};
+
+function extractCategory(obj, category) {
+	return obj.filter(e => e.category == category).reduce((res, elem) => {
+		if (!res[elem.phrase])
+			res[elem.phrase] = elem.text;
+		return res;
+	}, {});
+}
+function loadLazy(category, val) {
+	// NOTE(chris): load module if it's not loaded yet
+	if (loadingModules[category]) {
+		loadingModules[category].push(val);
+		if (categories[category]) // NOTE(chris): this is for safety in case the loading finished the moment before the val was pushed into the array
+			while (loadingModules[category].length)
+				Vue.triggerRef(loadingModules[category].pop());
+		return Vue.unref(val);
+	}
+	loadingModules[category] = [val];
+
+	axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/Phrasen/LoadModule/' + category).then(res => {
+		if (res.data.retval)
+			categories[category] = extractCategory(res.data.retval, category);
+		else
+			categories[category] = {};
+
+		while (loadingModules[category].length)
+			Vue.triggerRef(loadingModules[category].pop());
+	}).catch(err => console.error(err));
+}
+
+export default {
+	data: () => {
+		return {
+			p: {
+				t(category, phrase, params) {
+					if (params === undefined && (
+						(Array.isArray(category) && category.length == 2) || 
+						(category.split && category.split('/').length == 2))
+						) {
+						params = phrase;
+						[category, phrase] = category.split ? category.split('/') : category;
+					}
+					if (phrase === undefined) {
+						console.error('invalid input');
+						return '';
+					}
+					if (!categories[category]) {
+						if (window.FHC_JS_PHRASES_STORAGE_OBJECT !== undefined)
+							categories[category] = extractCategory(FHC_JS_PHRASES_STORAGE_OBJECT, category);
+						
+						if (!categories[category] || Object.keys(categories[category]).length === 0) {
+							let val = Vue.ref('');
+							loadLazy(category, val);
+							return Vue.unref(val);
+						}
+					}
+					let result = categories[category][phrase];
+					if (!result)
+						return '<< PHRASE ' + phrase + '>>';
+					if (params)
+						return result.replace(/\{([^}]*)\}/g, (match, p1) => params[p1] || match);
+					return result;
+				}
+			}
+		}
+	}
+}
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 8ac09cee0..624aee0bd 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -17137,6 +17137,186 @@ array(
 				'insertvon' => 'system'
 			)
 		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lvinfo',
+		'phrase' => 'lehrveranstaltungsinformationen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Lehrveranstaltungsinformationen",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Course Information",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'keinLektorZugeordnet',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Aktuell ist dieser Lehrveranstaltung noch kein Lektor zugeordnet",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "ENG Aktuell ist dieser Lehrveranstaltung noch kein Lektor zugeordnet",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'incomingplaetze',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Incomingplätze",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Places Available for Incoming Students",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'lehrbeauftragter',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Lehrbeauftragte*r",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Lecturer(s)",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'lvleitung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "LV-Leiter*in",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Head of Course",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'leitung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Leitung",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Head",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'koordination',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Koordination",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Coordination",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'sprache',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Sprache",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Language",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'verfuegbareSprachen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Verfügbare Sprachen",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Available languages",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
 	)
 );
 

From 559e4d2bc0c74cbed22a4a2c4c00f542f7c132fe Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 16 Jan 2023 11:22:53 +0100
Subject: [PATCH 0060/1461] cleanup

---
 application/controllers/Cis/MyLv.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/application/controllers/Cis/MyLv.php b/application/controllers/Cis/MyLv.php
index bcd06aee7..eae0a3a39 100644
--- a/application/controllers/Cis/MyLv.php
+++ b/application/controllers/Cis/MyLv.php
@@ -15,11 +15,6 @@ class MyLv extends Auth_Controller
 		parent::__construct([
 			'index' => 'student/anrechnung_beantragen:r' // TODO(chris): permissions?
 		]);
-
-		// Loads phrases system
-		$this->loadPhrases([
-			'global'
-		]);
 	}
 
 	// -----------------------------------------------------------------------------------------------------------------

From 2e126692f20577eab89252f26e28503c2603381e Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 16 Jan 2023 11:38:24 +0100
Subject: [PATCH 0061/1461] MyLv: Permissions & notFound fallback

---
 application/controllers/Cis/MyLv.php          |  2 +-
 .../controllers/components/Cis/Mylv.php       | 10 +++++-----
 public/js/components/Cis/Mylv/Student.js      | 14 ++++++++-----
 system/phrasesupdate.php                      | 20 +++++++++++++++++++
 4 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/application/controllers/Cis/MyLv.php b/application/controllers/Cis/MyLv.php
index eae0a3a39..fe7eb298c 100644
--- a/application/controllers/Cis/MyLv.php
+++ b/application/controllers/Cis/MyLv.php
@@ -13,7 +13,7 @@ class MyLv extends Auth_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'index' => 'student/anrechnung_beantragen:r' // TODO(chris): permissions?
+			'index' => ['student/anrechnung_beantragen:r','user:r'] // TODO(chris): permissions?
 		]);
 	}
 
diff --git a/application/controllers/components/Cis/Mylv.php b/application/controllers/components/Cis/Mylv.php
index b911b5357..f357b17cb 100644
--- a/application/controllers/components/Cis/Mylv.php
+++ b/application/controllers/components/Cis/Mylv.php
@@ -19,11 +19,11 @@ class Mylv extends Auth_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'Student' => 'student/anrechnung_beantragen:r', // TODO(chris): permissions?
-			'Studiensemester' => 'student/anrechnung_beantragen:r', // TODO(chris): permissions?
-			'Lvs' => 'student/anrechnung_beantragen:r', // TODO(chris): permissions?
-			'Info' => 'student/anrechnung_beantragen:r', // TODO(chris): permissions?
-			'Pruefungen' => 'student/anrechnung_beantragen:r' // TODO(chris): permissions?
+			'Student' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
+			'Studiensemester' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
+			'Lvs' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
+			'Info' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
+			'Pruefungen' => ['student/anrechnung_beantragen:r','user:r'] // TODO(chris): permissions?
 		]);
 	}
 
diff --git a/public/js/components/Cis/Mylv/Student.js b/public/js/components/Cis/Mylv/Student.js
index 125422b01..ffe5c05cf 100644
--- a/public/js/components/Cis/Mylv/Student.js
+++ b/public/js/components/Cis/Mylv/Student.js
@@ -25,14 +25,14 @@ export default {
 		},
 		current() {
 			if (this.currentSemester === null)
-				return { semester: null, lvs: null };
+				return { semester: null, lvs: [] };
 			if (this.lvs[this.currentSemester] === undefined) {
 				this.lvs[this.currentSemester] = {
 					semester: this.currentSemester, 
 					lvs: null
 				};
 				axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/Cis/Mylv/Lvs/' + this.currentSemester).then(res => {
-					this.lvs[this.currentSemester].lvs = res.data.retval;
+					this.lvs[this.currentSemester].lvs = res.data.retval || [];
 					this.firstLoad = false;
 				});
 			}
@@ -81,7 +81,7 @@ export default {
 	},
 	created() {
 		axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/Cis/Mylv/Studiensemester').then(res => {
-			this.studiensemester = res.data.retval;
+			this.studiensemester = res.data.retval || [];
 			const hash = location.hash.substring(1);
 			if (hash && this.studiensemester.filter(s => s.studiensemester_kurzbz == hash).length)
 				this.currentSemester = hash;
@@ -89,8 +89,9 @@ export default {
 				this.currentSemester = this.nearestSem;
 		});
 	},
-	template: `<div class="mylv-student" v-if="ready">
-		<div class="row justify-content-center mb-3">
+	template: `
+	<div class="mylv-student" v-if="ready">
+		<div v-if="currentSemester" class="row justify-content-center mb-3">
 			<div class="col-auto d-none">
 				<label class="col-form-label">{{p.t('lehre/studiensemester')}}</label>
 			</div>
@@ -108,6 +109,9 @@ export default {
 				</div>
 			</div>
 		</div>
+		<div class="alert alert-danger" role="alert" v-else>
+			{{p.t('lehre/noLvFound')}}
+		</div>
 		<mylv-semester v-bind="current"/>
 	</div>
 	<div class="mylv-student text-center" v-else>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 624aee0bd..16a5c77ab 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -17238,6 +17238,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'noLvFound',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Keine Lehrveranstaltungen gefunden",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "No LVs found",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'global',

From 034bed65803a97563127dd02502802899f7dab32 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 16 Jan 2023 11:40:40 +0100
Subject: [PATCH 0062/1461] cleanup

---
 application/views/Cis/MyLv.php | 69 +---------------------------------
 1 file changed, 1 insertion(+), 68 deletions(-)

diff --git a/application/views/Cis/MyLv.php b/application/views/Cis/MyLv.php
index 8786fd866..3dc7c494d 100644
--- a/application/views/Cis/MyLv.php
+++ b/application/views/Cis/MyLv.php
@@ -1,9 +1,6 @@
 <?php
 $includesArray = array(
-	'customJSModules' => ['public/js/apps/Cis/MyLv/Student.js'],
-	'customCSSs' => [
-		'public/css/components/dashboard.css'
-	]
+	'customJSModules' => ['public/js/apps/Cis/MyLv/Student.js']
 );
 
 $this->load->view('templates/CISHTML-Header', $includesArray);
@@ -13,70 +10,6 @@ $this->load->view('templates/CISHTML-Header', $includesArray);
 	<h2>MyLv</h2>
 	<hr>
 	<mylv-student></mylv-student>
-	<?php $studiengaenge = [];foreach ($studiengaenge as $studiengang) { ?>
-		<h3><?= $studiengang['bezeichnung'] . ' - ' . $studiengang['studiengang_kz']; ?></h3>
-		<?php foreach ($studiengang['semester'] as $semester) { ?>
-			<h4><?= implode(",", array_keys($semester['studiensemester_kurzbz'])); ?>, <?= $semester['semester']; ?>.Semester</h4>
-			<?php foreach ($semester['lvs'] as $lv) { ?>
-				<!-- lehrveranstaltung_id: <?= $lv->lehrveranstaltung_id; ?><br>
-				kurzbz: <?= $lv->kurzbz; ?><br> -->
-				bezeichnung: <?= $lv->bezeichnung; ?><br>
-				<!-- studiengang_kz: <?= $lv->studiengang_kz; ?><br>
-				semester: <?= $lv->semester; ?><br>
-				sprache: <?= $lv->sprache; ?><br>
-				ects: <?= $lv->ects; ?><br>
-				semesterstunden: <?= $lv->semesterstunden; ?><br>
-				anmerkung: <?= $lv->anmerkung; ?><br>
-				lehre: <?= $lv->lehre; ?><br>
-				lehreverzeichnis: <?= $lv->lehreverzeichnis; ?><br>
-				aktiv: <?= $lv->aktiv; ?><br>
-				planfaktor: <?= $lv->planfaktor; ?><br>
-				planlektoren: <?= $lv->planlektoren; ?><br>
-				planpersonalkosten: <?= $lv->planpersonalkosten; ?><br>
-				plankostenprolektor: <?= $lv->plankostenprolektor; ?><br>
-				ext_id: <?= $lv->ext_id; ?><br>
-				sort: <?= $lv->sort; ?><br>
-				zeugnis: <?= $lv->zeugnis; ?><br>
-				koordinator: <?= $lv->koordinator; ?><br>
-				projektarbeit: <?= $lv->projektarbeit; ?><br>
-				lehrform_kurzbz: <?= $lv->lehrform_kurzbz; ?><br>
-				bezeichnung_english: <?= $lv->bezeichnung_english; ?><br>
-				orgform_kurzbz: <?= $lv->orgform_kurzbz; ?><br>
-				incoming: <?= $lv->incoming; ?><br>
-				lehrtyp_kurzbz: <?= $lv->lehrtyp_kurzbz; ?><br>
-				oe_kurzbz: <?= $lv->oe_kurzbz; ?><br>
-				raumtyp_kurzbz: <?= $lv->raumtyp_kurzbz; ?><br>
-				anzahlsemester: <?= $lv->anzahlsemester; ?><br>
-				semesterwochen: <?= $lv->semesterwochen; ?><br>
-				lvnr: <?= $lv->lvnr; ?><br>
-				semester_alternativ: <?= $lv->semester_alternativ; ?><br>
-				farbe: <?= $lv->farbe; ?><br>
-				old_lehrfach_id: <?= $lv->old_lehrfach_id; ?><br>
-				sws: <?= $lv->sws; ?><br>
-				lvs: <?= $lv->lvs; ?><br>
-				alvs: <?= $lv->alvs; ?><br>
-				lvps: <?= $lv->lvps; ?><br>
-				las: <?= $lv->las; ?><br>
-				benotung: <?= $lv->benotung; ?><br>
-				lvinfo: <?= $lv->lvinfo; ?><br>
-				lehrauftrag: <?= $lv->lehrauftrag; ?><br>
-				lehrmodus_kurzbz: <?= $lv->lehrmodus_kurzbz; ?><br>
-				lehrveranstaltung_template_id: <?= $lv->lehrveranstaltung_template_id; ?><br>
-				uid: <?= $lv->uid; ?><br>
-				lehreinheit_id: <?= $lv->lehreinheit_id; ?><br> -->
-				studiensemester_kurzbz: <?= $lv->studiensemester_kurzbz; ?><br>
-				<!-- lehrfach_id: <?= $lv->lehrfach_id; ?><br>
-				stundenblockung: <?= $lv->stundenblockung; ?><br>
-				wochenrythmus: <?= $lv->wochenrythmus; ?><br>
-				start_kw: <?= $lv->start_kw; ?><br>
-				raumtyp: <?= $lv->raumtyp; ?><br>
-				raumtypalternativ: <?= $lv->raumtypalternativ; ?><br>
-				lv_lehrform_kurzbz: <?= $lv->lv_lehrform_kurzbz; ?><br> -->
-			<?php } ?>
-			<hr>
-		<?php } ?>
-		<hr>
-	<?php } ?>
 </div>
 
 <?php $this->load->view('templates/CISHTML-Footer', $includesArray); ?>

From d1f69d469681a2377f241563a977c8b6845c1ac0 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 6 Feb 2023 08:42:42 +0100
Subject: [PATCH 0063/1461] MyLV Verbesserungen & cleanup

---
 application/controllers/components/Cis/Mylv.php  |  7 +------
 .../models/education/Lehrveranstaltung_model.php |  6 +++++-
 application/models/education/Pruefung_model.php  |  3 ++-
 .../organisation/Studiensemester_model.php       |  1 +
 public/css/Cis4/Cis.css                          |  3 +++
 .../components/Cis/Mylv/Semester/Studiengang.js  |  2 +-
 .../Cis/Mylv/Semester/Studiengang/Lv.js          | 16 +++++++++++-----
 .../Cis/Mylv/Semester/Studiengang/Lv/Info.js     |  4 ++--
 8 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/application/controllers/components/Cis/Mylv.php b/application/controllers/components/Cis/Mylv.php
index f357b17cb..60203a37c 100644
--- a/application/controllers/components/Cis/Mylv.php
+++ b/application/controllers/components/Cis/Mylv.php
@@ -3,12 +3,7 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 /**
- * This controller operates between (interface) the JS (GUI) and the FilterCmptLib (back-end)
- * Provides data to the ajax get calls about the filter component
- * Listens to ajax post calls to change the filter data
- * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
- * NOTE: extends the FHC_Controller instead of the Auth_Controller because the FilterCmpt has its
- * 	own permissions check
+ * 
  */
 class Mylv extends Auth_Controller
 {
diff --git a/application/models/education/Lehrveranstaltung_model.php b/application/models/education/Lehrveranstaltung_model.php
index b85699073..fddfad198 100644
--- a/application/models/education/Lehrveranstaltung_model.php
+++ b/application/models/education/Lehrveranstaltung_model.php
@@ -276,7 +276,7 @@ class Lehrveranstaltung_model extends DB_Model
 		*/
 		// TODO(chris): module or kf
 		#$this->addSelect($this->dbTable . '.*');
-		$this->addSelect('v.*');
+		#$this->addSelect('v.*');
 		$this->addSelect($this->dbTable . '.benotung');
 		$this->addSelect($this->dbTable . '.lvinfo');
 		$this->addSelect($this->dbTable . '.farbe');
@@ -288,6 +288,7 @@ class Lehrveranstaltung_model extends DB_Model
 		
 		$this->addSelect('v.sprache');
 		$this->addSelect('v.ects');
+		$this->addSelect('znn.positiv');
 
 		#$this->addSelect('splv.module');
 		$this->addSelect($lvbezeichnung . ' AS bezeichnung');
@@ -297,6 +298,7 @@ class Lehrveranstaltung_model extends DB_Model
 		$this->addSelect('COALESCE(gnn.' . $bezeichnung . ', gnn.bezeichnung, gn.note::text) AS lvnote');
 		$this->addSelect('COALESCE(znn.' . $bezeichnung . ', znn.bezeichnung, zn.note::text) AS znote');
 
+		// TODO(chris): Potentielle Anpassung "Eine UID"
 		$this->addJoin('campus.vw_student_lehrveranstaltung v', 'lehrveranstaltung_id');
 		$this->addJoin('public.tbl_studiengang sg', $this->dbTable . '.studiengang_kz = sg.studiengang_kz');
 		$this->db->where("v.lehreverzeichnis<>''");
@@ -307,6 +309,8 @@ class Lehrveranstaltung_model extends DB_Model
 		$this->addJoin('lehre.tbl_zeugnisnote zn', 'zn.lehrveranstaltung_id=v.lehrveranstaltung_id AND zn.student_uid=v.uid AND zn.studiensemester_kurzbz=v.studiensemester_kurzbz', 'LEFT');
 		$this->addJoin('lehre.tbl_note znn', 'zn.note=znn.note', 'LEFT');
 
+		$this->addOrder('bezeichnung');
+
 		/*if (!defined("CIS_PROFIL_STUDIENPLAN_MODULE_AUSBLENDEN") || !CIS_PROFIL_STUDIENPLAN_MODULE_AUSBLENDEN) {
 			$modulebezeichnung = str_replace('v.', 'm.', $lvbezeichnung);
 			$modulesql = '
diff --git a/application/models/education/Pruefung_model.php b/application/models/education/Pruefung_model.php
index 48a6f4f3c..6e542b870 100644
--- a/application/models/education/Pruefung_model.php
+++ b/application/models/education/Pruefung_model.php
@@ -42,12 +42,13 @@ class Pruefung_model extends DB_Model
 	 * 
 	 * @param string		$uid
 	 * @param string		$lehrveranstaltung_id
-	 * @param string|null	$lehrveranstaltung_id
+	 * @param string|null	$sprache
 	 * 
 	 * @return object
 	 */
 	public function getByStudentAndLv($uid, $lehrveranstaltung_id, $sprache = null)
 	{
+		// TODO(chris): Potentielle Anpassung "Eine UID"
 		$this->dbTable = 'lehre.tbl_pruefung';
 
 		if ($sprache) {
diff --git a/application/models/organisation/Studiensemester_model.php b/application/models/organisation/Studiensemester_model.php
index a7333260d..608c48f4d 100644
--- a/application/models/organisation/Studiensemester_model.php
+++ b/application/models/organisation/Studiensemester_model.php
@@ -215,6 +215,7 @@ class Studiensemester_model extends DB_Model
 		$this->addDistinct();
 		$this->addSelect($this->dbTable . '.*');
 
+		// TODO(chris): Potentielle Anpassung "Eine UID"
 		$this->addJoin('campus.vw_student_lehrveranstaltung v', 'studiensemester_kurzbz');
 		$this->db->where("v.lehreverzeichnis<>''");
 
diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index 6d7735ffd..007555c61 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -265,6 +265,9 @@
   #cis-main {
     padding-left: var(--fhc-cis-main-px);
   }
+  #cis-main > :first-child {
+    margin-top: var(--fhc-cis-header-height);
+  }
   #cis-header {
     background-color: var(--fhc-cis-primary);
     height: var(--fhc-cis-header-height);
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang.js b/public/js/components/Cis/Mylv/Semester/Studiengang.js
index 4f1eaa45d..56605d308 100644
--- a/public/js/components/Cis/Mylv/Semester/Studiengang.js
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang.js
@@ -36,7 +36,7 @@ export default {
 				<small>{{semester}}.{{p.t('lehre/semester')}}</small>
 			</h4>
 			<div class="row">
-				<div v-for="lv in lehrveranstaltungen" :key="lv.lehrveranstaltung_id" class="col-sm-4 mb-3">
+				<div v-for="lv in lehrveranstaltungen" :key="lv.lehrveranstaltung_id" class="col-sm-4 col-md-3 mb-3">
 					<mylv-semester-studiengang-lv v-bind="lv" class="text-center h-100"></mylv-semester-studiengang-lv>
 				</div>
 			</div>
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
index 5efe5d36b..dd6c57b30 100644
--- a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
@@ -1,9 +1,13 @@
 import LvPruefungen from "./Lv/Pruefungen.js";
 import LvInfo from "./Lv/Info.js";
+import Phrasen from "../../../../../mixins/Phrasen.js";
 
 // TODO(chris): L10n
 
 export default {
+	mixins: [
+		Phrasen
+	],
 	inject: ['studien_semester'],
 	props: {
 		lehrveranstaltung_id: Number,
@@ -19,7 +23,8 @@ export default {
 		orgform_kurzbz: String,
 		sprache: String,
 		ects: Number,
-		incoming: Number
+		incoming: Number,
+		positiv: Boolean
 	},
 	data: () => {
 		return {
@@ -28,7 +33,7 @@ export default {
 		}
 	},
 	computed: {
-		bodyStyle() {
+		bodyStyle() {return {};
 			const bodyStyle = {};
 			if (this.farbe)
 				bodyStyle['background-color'] = '#' + this.farbe;
@@ -70,13 +75,14 @@ export default {
 		<div v-if="module" class="card-header">
 			{{module}}
 		</div>
-		<div class="card-body" :style="bodyStyle">
-			<h5 class="card-title">{{bezeichnung}}</h5>
+		<div class="card-body d-flex justify-content-center align-items-center" :style="bodyStyle">
+			<h6 class="card-title">{{bezeichnung}}</h6>
 		</div>
 		<div class="card-footer">
 			<div class="row">
 				<a href="#" class="col-auto text-start text-decoration-none" @click.prevent="openPruefungen">
-					{{ grade || '-' }}
+					<i class="fa fa-check text-success" v-if="positiv"></i>
+					{{ grade || p.t('lehre/noGrades') }}
 				</a>
 				<div v-if="lvinfo" class="col text-end">
 					<a class="card-link" href="#" @click.prevent="openInfos">
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv/Info.js b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv/Info.js
index 935e1e0c0..f3f284b31 100644
--- a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv/Info.js
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv/Info.js
@@ -82,7 +82,7 @@ export default {
 	popup(options) {
 		return BsModal.popup.bind(this)(null, options);
 	},
-	template: `<bs-modal ref="modalContainer" class="bootstrap-alert" v-bind="$props" body-class="" dialog-class="modal-fullscreen">
+	template: `<bs-modal ref="modalContainer" class="bootstrap-alert" v-bind="$props" body-class="" dialog-class="modal-lg">
 		<template v-slot:title>
 			{{p.t('lvinfo/lehrveranstaltungsinformationen')}}
 		</template>
@@ -167,7 +167,7 @@ export default {
 				<div v-if="Object.keys(info.lvinfo).length > 1" class="text-end">
 					<div class="btn-group" role="group" :title="p.t('global/verfuegbareSprachen')" :aria-label="p.t('global/verfuegbareSprachen')">
 						<template v-for="lang in info.sprachen" :key="lang.index">
-							<button v-if="info.lvinfo[lang.sprache]" type="button" class="btn btn-outline-primary" :class="lang.sprache == currentLang ? 'active' : ''" @click.prevent="info.lastLang = lang.sprache"><img class="d-block" :src="'data:image/gif;base64, ' + lang.flagge" :alt="lang.bezeichnung[lang.index]"></button>
+							<button v-if="info.lvinfo[lang.sprache]" type="button" class="btn btn-outline-primary" :class="lang.sprache == currentLang ? 'active' : ''" @click.prevent="info.lastLang = lang.sprache">{{lang.bezeichnung[lang.index-1]}}</button>
 						</template>
 					</div>
 				</div>

From 0f60ab2a544912a4cbe7c47168e409bda860fb2a Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 6 Feb 2023 08:43:43 +0100
Subject: [PATCH 0064/1461] Stundenplan & Calendar

---
 application/controllers/Cis/Stundenplan.php   |  31 ++++
 .../components/Cis/Stundenplan.php            |  68 ++++++++
 .../models/ressource/Reservierung_model.php   |  21 +++
 .../models/ressource/Stundenplan_model.php    |  21 +++
 application/views/Cis/Stundenplan.php         |  16 ++
 public/css/components/calendar.css            | 160 +++++++++++++++++
 public/js/apps/Cis/Stundenplan.js             |  53 ++++++
 public/js/components/Calendar/Abstract.js     |  17 ++
 public/js/components/Calendar/Calendar.js     | 131 ++++++++++++++
 public/js/components/Calendar/Header.js       |  23 +++
 public/js/components/Calendar/Minimized.js    |  29 ++++
 public/js/components/Calendar/Month.js        |  69 ++++++++
 public/js/components/Calendar/Month/Page.js   |  75 ++++++++
 public/js/components/Calendar/Months.js       |  34 ++++
 public/js/components/Calendar/Pane.js         |  55 ++++++
 public/js/components/Calendar/Week.js         |  48 ++++++
 public/js/components/Calendar/Week/Page.js    | 115 +++++++++++++
 public/js/components/Calendar/Weeks.js        |  39 +++++
 public/js/components/Calendar/Years.js        |  59 +++++++
 public/js/components/Calendar/Years/Page.js   |  29 ++++
 public/js/composables/CalendarDate.js         | 161 ++++++++++++++++++
 21 files changed, 1254 insertions(+)
 create mode 100644 application/controllers/Cis/Stundenplan.php
 create mode 100644 application/controllers/components/Cis/Stundenplan.php
 create mode 100644 application/views/Cis/Stundenplan.php
 create mode 100644 public/css/components/calendar.css
 create mode 100644 public/js/apps/Cis/Stundenplan.js
 create mode 100644 public/js/components/Calendar/Abstract.js
 create mode 100644 public/js/components/Calendar/Calendar.js
 create mode 100644 public/js/components/Calendar/Header.js
 create mode 100644 public/js/components/Calendar/Minimized.js
 create mode 100644 public/js/components/Calendar/Month.js
 create mode 100644 public/js/components/Calendar/Month/Page.js
 create mode 100644 public/js/components/Calendar/Months.js
 create mode 100644 public/js/components/Calendar/Pane.js
 create mode 100644 public/js/components/Calendar/Week.js
 create mode 100644 public/js/components/Calendar/Week/Page.js
 create mode 100644 public/js/components/Calendar/Weeks.js
 create mode 100644 public/js/components/Calendar/Years.js
 create mode 100644 public/js/components/Calendar/Years/Page.js
 create mode 100644 public/js/composables/CalendarDate.js

diff --git a/application/controllers/Cis/Stundenplan.php b/application/controllers/Cis/Stundenplan.php
new file mode 100644
index 000000000..1f1eca42e
--- /dev/null
+++ b/application/controllers/Cis/Stundenplan.php
@@ -0,0 +1,31 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * 
+ */
+class Stundenplan extends Auth_Controller
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'index' => ['student/anrechnung_beantragen:r','user:r'] // TODO(chris): permissions?
+		]);
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * @return void
+	 */
+	public function index()
+	{
+		$this->load->view('Cis/Stundenplan');
+	}
+
+}
diff --git a/application/controllers/components/Cis/Stundenplan.php b/application/controllers/components/Cis/Stundenplan.php
new file mode 100644
index 000000000..2b35e11ca
--- /dev/null
+++ b/application/controllers/components/Cis/Stundenplan.php
@@ -0,0 +1,68 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * 
+ */
+class Stundenplan extends Auth_Controller
+{
+
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'index' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
+			'Reservierungen' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
+			'Stunden' => ['student/anrechnung_beantragen:r','user:r'] // TODO(chris): permissions?
+		]);
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 */
+	public function index()
+	{
+		$this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+
+		$result = $this->StundenplanModel->loadForUid(get_uid());
+
+		if (isError($result))
+			return $this->outputJsonError(getError($result));
+
+		$this->outputJsonSuccess(getData($result));
+	}
+
+	/**
+	 */
+	public function Reservierungen()
+	{
+		$this->load->model('ressource/Reservierung_model', 'ReservierungModel');
+
+		$result = $this->ReservierungModel->loadForUid(get_uid());
+
+		if (isError($result))
+			return $this->outputJsonError(getError($result));
+
+		$this->outputJsonSuccess(getData($result));
+	}
+
+	/**
+	 */
+	public function Stunden()
+	{
+		$this->load->model('ressource/Stunde_model', 'StundeModel');
+
+		$result = $this->StundeModel->load();
+
+		if (isError($result))
+			return $this->outputJsonError(getError($result));
+
+		$this->outputJsonSuccess(getData($result));
+	}
+
+}
diff --git a/application/models/ressource/Reservierung_model.php b/application/models/ressource/Reservierung_model.php
index 37d0cb376..7a3d1a4a4 100644
--- a/application/models/ressource/Reservierung_model.php
+++ b/application/models/ressource/Reservierung_model.php
@@ -11,4 +11,25 @@ class Reservierung_model extends DB_Model
 		$this->dbTable = 'campus.tbl_reservierung';
 		$this->pk = 'reservierung_id';
 	}
+
+	/**
+	 * @param $uid
+	 * 
+	 * @return stdClass
+	 */
+	public function loadForUid($uid)
+	{
+		$this->addSelect('r.*');
+		$this->db->join('public.tbl_benutzergruppe bg', 'r.gruppe_kurzbz=bg.gruppe_kurzbz AND bg.uid=?', 'LEFT', false);
+		$this->addJoin('public.tbl_studiensemester ss1', 'bg.studiensemester_kurzbz=ss1.studiensemester_kurzbz AND ss1.start<=r.datum AND ss1.ende>=r.datum', 'LEFT');
+		$this->db->join('public.tbl_studentlehrverband slv', "r.studiengang_kz=slv.studiengang_kz AND slv.student_uid=? AND (slv.semester=r.semester OR r.semester IS NULL) AND (slv.verband=r.verband OR r.verband IS NULL OR r.verband='' OR r.verband='0') AND (slv.gruppe=r.gruppe OR r.gruppe IS NULL OR r.gruppe='' OR r.gruppe='0') AND r.gruppe_kurzbz IS NULL", 'LEFT', false);
+		$this->addJoin('public.tbl_studiensemester ss2', 'slv.studiensemester_kurzbz=ss2.studiensemester_kurzbz AND ss2.start<=r.datum AND ss2.ende>=r.datum', 'LEFT');
+		$this->db->or_where('ss1.studiensemester_kurzbz IS NOT NULL', null, false);
+		$this->db->or_where('ss2.studiensemester_kurzbz IS NOT NULL', null, false);
+		
+		$query = $this->db->get_compiled_select('campus.vw_reservierung r');
+		
+		return $this->execQuery($query, [$uid, $uid]);
+	}
+
 }
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index be3d520b5..5ec6ea302 100644
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -11,4 +11,25 @@ class Stundenplan_model extends DB_Model
 		$this->dbTable = 'lehre.tbl_stundenplan';
 		$this->pk = 'stundenplan_id';
 	}
+
+	/**
+	 * @param string $uid
+	 * 
+	 * @return stdClass
+	 */
+	public function loadForUid($uid)
+	{
+		$this->addSelect('sp.*');
+		$this->db->join('public.tbl_benutzergruppe bg', 'sp.gruppe_kurzbz=bg.gruppe_kurzbz AND bg.uid=?', 'LEFT', false);
+		$this->addJoin('public.tbl_studiensemester ss1', 'bg.studiensemester_kurzbz=ss1.studiensemester_kurzbz AND ss1.start<=sp.datum AND ss1.ende>=sp.datum', 'LEFT');
+		$this->db->join('public.tbl_studentlehrverband slv', "sp.studiengang_kz=slv.studiengang_kz AND slv.student_uid=? AND (slv.semester=sp.semester OR sp.semester IS NULL) AND (slv.verband=sp.verband OR sp.verband IS NULL OR sp.verband='' OR sp.verband='0') AND (slv.gruppe=sp.gruppe OR sp.gruppe IS NULL OR sp.gruppe='' OR sp.gruppe='0') AND sp.gruppe_kurzbz IS NULL", 'LEFT', false);
+		$this->addJoin('public.tbl_studiensemester ss2', 'slv.studiensemester_kurzbz=ss2.studiensemester_kurzbz AND ss2.start<=sp.datum AND ss2.ende>=sp.datum', 'LEFT');
+		$this->db->or_where('ss1.studiensemester_kurzbz IS NOT NULL', null, false);
+		$this->db->or_where('ss2.studiensemester_kurzbz IS NOT NULL', null, false);
+		
+		$query = $this->db->get_compiled_select('lehre.vw_stundenplan sp');
+		
+		return $this->execQuery($query, [$uid, $uid]);
+	}
+
 }
diff --git a/application/views/Cis/Stundenplan.php b/application/views/Cis/Stundenplan.php
new file mode 100644
index 000000000..f4b3dbc15
--- /dev/null
+++ b/application/views/Cis/Stundenplan.php
@@ -0,0 +1,16 @@
+<?php
+$includesArray = array(
+	'customJSModules' => ['public/js/apps/Cis/Stundenplan.js'],
+	'customCSSs' => ['public/css/components/calendar.css']
+);
+
+$this->load->view('templates/CISHTML-Header', $includesArray);
+?>
+
+<div id="content">
+	<h2>Stundenplan</h2>
+	<hr>
+	<fhc-calendar :events="events" initial-mode="week" show-weeks></fhc-calendar>
+</div>
+
+<?php $this->load->view('templates/CISHTML-Footer', $includesArray); ?>
diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
new file mode 100644
index 000000000..f401f9cb7
--- /dev/null
+++ b/public/css/components/calendar.css
@@ -0,0 +1,160 @@
+.fhc-calendar-week-page-header {
+  background-color: #e9ecef;
+}
+
+.fhc-calendar-months .col-4,
+.fhc-calendar-years .col-4 {
+  padding: 0.1875em 0;
+}
+.show-weeks .fhc-calendar-months .col-4,
+.show-weeks .fhc-calendar-years .col-4 {
+  padding: 0.1875em 0.25em;
+}
+.fhc-calendar-months .col-4 button,
+.fhc-calendar-years .col-4 button {
+  aspect-ratio: 28/18;
+}
+
+.fhc-calendar-month-page {
+  display: grid;
+  grid-template-columns: repeat(7, 1fr);
+  grid-template-rows: 1.5em repeat(6, 1fr);
+}
+.fhc-calendar-month-page.show-weeks {
+  grid-template-columns: 1.5em repeat(7, 1fr);
+  grid-template-rows: 1.5em repeat(6, 1fr);
+}
+
+.fhc-calendar-month-page-weekday,
+.fhc-calendar-month-page-day {
+  color: inherit;
+}
+
+.fhc-calendar-week .carousel-item {
+  padding: 0.75em;
+}
+
+.fhc-calendar-week-page {
+  aspect-ratio: 7/6;
+  min-height: 0;
+}
+.fhc-calendar-week-page > div {
+  transform: translate(-0.75em, -0.75em);
+  width: calc(100% + 1.5em);
+  height: calc(100% + 1.5em);
+}
+.fhc-calendar-week-page > div > div {
+  padding-left: 3em;
+}
+.fhc-calendar-week-page .events {
+  display: grid;
+  grid-template-columns: 3em repeat(7, 1fr);
+  margin-left: -3em;
+  min-height: 266.6666666667%;
+  background-image: linear-gradient(#f8f9fa calc(100% / 24 - .5px), #dee2e6 calc(100% / 24 - .5px), #dee2e6 calc(100% / 24 + .5px), #f8f9fa calc(100% / 24 + .5px), #f8f9fa calc(200% / 24 - .5px), #dee2e6 calc(200% / 24 - .5px), #dee2e6 calc(200% / 24 + .5px), #f8f9fa calc(200% / 24 + .5px), #f8f9fa calc(300% / 24 - .5px), #dee2e6 calc(300% / 24 - .5px), #dee2e6 calc(300% / 24 + .5px), #f8f9fa calc(300% / 24 + .5px), #f8f9fa calc(400% / 24 - .5px), #dee2e6 calc(400% / 24 - .5px), #dee2e6 calc(400% / 24 + .5px), #f8f9fa calc(400% / 24 + .5px), #f8f9fa calc(500% / 24 - .5px), #dee2e6 calc(500% / 24 - .5px), #dee2e6 calc(500% / 24 + .5px), #f8f9fa calc(500% / 24 + .5px), #f8f9fa calc(600% / 24 - .5px), #dee2e6 calc(600% / 24 - .5px), #dee2e6 calc(600% / 24 + .5px), #f8f9fa calc(600% / 24 + .5px), #f8f9fa calc(700% / 24 - .5px), #dee2e6 calc(700% / 24 - .5px), #dee2e6 calc(700% / 24 + .5px), #f8f9fa calc(700% / 24 + .5px), #f8f9fa calc(800% / 24 - .5px), #dee2e6 calc(800% / 24 - .5px), #dee2e6 calc(800% / 24 + .5px), #fff calc(800% / 24 + .5px), #fff calc(900% / 24 - .5px), #dee2e6 calc(900% / 24 - .5px), #dee2e6 calc(900% / 24 + .5px), #fff calc(900% / 24 + .5px), #fff calc(1000% / 24 - .5px), #dee2e6 calc(1000% / 24 - .5px), #dee2e6 calc(1000% / 24 + .5px), #fff calc(1000% / 24 + .5px), #fff calc(1100% / 24 - .5px), #dee2e6 calc(1100% / 24 - .5px), #dee2e6 calc(1100% / 24 + .5px), #fff calc(1100% / 24 + .5px), #fff calc(1200% / 24 - .5px), #dee2e6 calc(1200% / 24 - .5px), #dee2e6 calc(1200% / 24 + .5px), #fff calc(1200% / 24 + .5px), #fff calc(1300% / 24 - .5px), #dee2e6 calc(1300% / 24 - .5px), #dee2e6 calc(1300% / 24 + .5px), #fff calc(1300% / 24 + .5px), #fff calc(1400% / 24 - .5px), #dee2e6 calc(1400% / 24 - .5px), #dee2e6 calc(1400% / 24 + .5px), #fff calc(1400% / 24 + .5px), #fff calc(1500% / 24 - .5px), #dee2e6 calc(1500% / 24 - .5px), #dee2e6 calc(1500% / 24 + .5px), #fff calc(1500% / 24 + .5px), #fff calc(1600% / 24 - .5px), #dee2e6 calc(1600% / 24 - .5px), #dee2e6 calc(1600% / 24 + .5px), #fff calc(1600% / 24 + .5px), #fff calc(1700% / 24 - .5px), #dee2e6 calc(1700% / 24 - .5px), #dee2e6 calc(1700% / 24 + .5px), #f8f9fa calc(1700% / 24 + .5px), #f8f9fa calc(1800% / 24 - .5px), #dee2e6 calc(1800% / 24 - .5px), #dee2e6 calc(1800% / 24 + .5px), #f8f9fa calc(1800% / 24 + .5px), #f8f9fa calc(1900% / 24 - .5px), #dee2e6 calc(1900% / 24 - .5px), #dee2e6 calc(1900% / 24 + .5px), #f8f9fa calc(1900% / 24 + .5px), #f8f9fa calc(2000% / 24 - .5px), #dee2e6 calc(2000% / 24 - .5px), #dee2e6 calc(2000% / 24 + .5px), #f8f9fa calc(2000% / 24 + .5px), #f8f9fa calc(2100% / 24 - .5px), #dee2e6 calc(2100% / 24 - .5px), #dee2e6 calc(2100% / 24 + .5px), #f8f9fa calc(2100% / 24 + .5px), #f8f9fa calc(2200% / 24 - .5px), #dee2e6 calc(2200% / 24 - .5px), #dee2e6 calc(2200% / 24 + .5px), #f8f9fa calc(2200% / 24 + .5px), #f8f9fa calc(2300% / 24 - .5px), #dee2e6 calc(2300% / 24 - .5px), #dee2e6 calc(2300% / 24 + .5px), #f8f9fa calc(2300% / 24 + .5px));
+}
+.fhc-calendar-week-page .events .day {
+  gap: 1px;
+}
+.fhc-calendar-week-page .events .hours, .fhc-calendar-week-page .events .day {
+  display: grid;
+}
+
+.fhc-calendar-lg .fhc-calendar-month-page-day,
+.fhc-calendar-lg .fhc-calendar-month-page-weekday,
+.fhc-calendar-md .fhc-calendar-month-page-day,
+.fhc-calendar-md .fhc-calendar-month-page-weekday {
+  border: solid 1px #dee2e6;
+}
+.fhc-calendar-lg .fhc-calendar-month-page-day,
+.fhc-calendar-md .fhc-calendar-month-page-day {
+  aspect-ratio: 1;
+  display: flex;
+  flex-direction: column;
+}
+.fhc-calendar-lg .fhc-calendar-month-page-day.active,
+.fhc-calendar-md .fhc-calendar-month-page-day.active {
+  border-color: var(--bs-secondary);
+}
+.fhc-calendar-lg .fhc-calendar-month-page-day .events,
+.fhc-calendar-md .fhc-calendar-month-page-day .events {
+  display: block;
+  overflow: scroll;
+  font-size: 0.7em;
+}
+.fhc-calendar-lg .fhc-calendar-month-page-day .events span,
+.fhc-calendar-md .fhc-calendar-month-page-day .events span {
+  display: block;
+  margin: 0.2em;
+  padding: 0.1em 0.4em;
+  border-radius: 0.1em;
+}
+.fhc-calendar-lg .fhc-calendar-years .col-4,
+.fhc-calendar-md .fhc-calendar-years .col-4 {
+  padding: 0.09375em 0;
+}
+.show-weeks .fhc-calendar-lg .fhc-calendar-years .col-4,
+.show-weeks .fhc-calendar-md .fhc-calendar-years .col-4 {
+  padding: 0.09375em 0.25em;
+}
+.fhc-calendar-lg .fhc-calendar-years .col-4 button,
+.fhc-calendar-md .fhc-calendar-years .col-4 button {
+  aspect-ratio: 28/9;
+}
+
+.fhc-calendar-xs {
+  font-size: 0.6em;
+}
+
+.fhc-calendar-sm .fhc-calendar-month-page {
+  font-size: 0.8em;
+}
+
+.fhc-calendar-sm .fhc-calendar-month-page-weekday,
+.fhc-calendar-xs .fhc-calendar-month-page-weekday {
+  font-style: italic;
+  display: flex;
+  align-items: center;
+  justify-content: end;
+}
+.fhc-calendar-sm .fhc-calendar-month-page-day,
+.fhc-calendar-xs .fhc-calendar-month-page-day {
+  position: relative;
+  aspect-ratio: 1;
+}
+.fhc-calendar-sm .fhc-calendar-month-page-day.active .no,
+.fhc-calendar-xs .fhc-calendar-month-page-day.active .no {
+  background-color: rgba(var(--bs-info-rgb), 0.25);
+  border-radius: 50%;
+  font-weight: bold;
+}
+.fhc-calendar-sm .fhc-calendar-month-page-day:not(.active):hover .no,
+.fhc-calendar-xs .fhc-calendar-month-page-day:not(.active):hover .no {
+  background-color: rgba(var(--bs-secondary-rgb), 0.25);
+  border-radius: 50%;
+}
+.fhc-calendar-sm .fhc-calendar-month-page-day .no,
+.fhc-calendar-xs .fhc-calendar-month-page-day .no {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 80%;
+  height: 80%;
+  margin: 10%;
+}
+.fhc-calendar-sm .fhc-calendar-month-page-day .events,
+.fhc-calendar-xs .fhc-calendar-month-page-day .events {
+  position: absolute;
+  bottom: 0;
+  left: 10%;
+  width: 80%;
+  height: 10%;
+  overflow: hidden;
+  display: flex;
+}
+.fhc-calendar-sm .fhc-calendar-month-page-day .events span,
+.fhc-calendar-xs .fhc-calendar-month-page-day .events span {
+  overflow: hidden;
+}
+
+/*# sourceMappingURL=calendar.css.map */
diff --git a/public/js/apps/Cis/Stundenplan.js b/public/js/apps/Cis/Stundenplan.js
new file mode 100644
index 000000000..eaa75bca3
--- /dev/null
+++ b/public/js/apps/Cis/Stundenplan.js
@@ -0,0 +1,53 @@
+import FhcCalendar from "../../components/Calendar/Calendar.js";
+
+const app = Vue.createApp({
+	components: {
+		FhcCalendar
+	},
+	data() {
+		return {
+			stunden: [],
+			events: null
+		}
+	},
+	created() {
+		axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/Cis/Stundenplan/Stunden').then(res => {
+			res.data.retval.forEach(std => {
+				this.stunden[std.stunde] = std; // TODO(chris): geht besser
+			});
+			axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/Cis/Stundenplan').then(res => {
+				let events;
+				if (res.data.retval && res.data.retval.forEach) {
+					res.data.retval.forEach((el, i) => {
+						el.id = i;
+						el.color = '#' + (el.farbe || 'CCCCCC');
+						el.start = new Date(el.datum + ' ' + this.stunden[el.stunde].beginn);
+						el.end = new Date(el.datum + ' ' + this.stunden[el.stunde].ende);
+						el.title = el.lehrfach;
+						if (el.lehrform)
+							el.title += '-' + el.lehrform;
+					});
+					events = res.data.retval;
+				}
+				// TODO(chris): do we need that
+				axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/Cis/Stundenplan/Reservierungen').then(res => {
+					if (res.data.retval && res.data.retval.forEach) {
+						res.data.retval.forEach((el, i) => {
+							el.id = i + events.length;
+							el.color = '#CCCCCC';
+							el.start = new Date(el.datum + ' ' + this.stunden[el.stunde].beginn);
+							el.end = new Date(el.datum + ' ' + this.stunden[el.stunde].ende);
+							el.title = el.lehrfach;
+							if (el.lehrform)
+								el.title += '-' + el.lehrform;
+						});
+						events = [...events, ...res.data.retval];
+					}
+					this.events = events;
+				});
+			});
+		});
+	}
+});
+app.config.unwrapInjectedRef = true;
+app.mount('#content');
\ No newline at end of file
diff --git a/public/js/components/Calendar/Abstract.js b/public/js/components/Calendar/Abstract.js
new file mode 100644
index 000000000..07eb03933
--- /dev/null
+++ b/public/js/components/Calendar/Abstract.js
@@ -0,0 +1,17 @@
+import CalendarHeader from './Header';
+
+export default {
+	components: {
+		CalendarHeader
+	},
+	inject: [
+		'date',
+		'focusDate',
+		'size'
+	],
+	emits: [
+		'update:mode',
+		'change:range',
+		'input'
+	]
+}
diff --git a/public/js/components/Calendar/Calendar.js b/public/js/components/Calendar/Calendar.js
new file mode 100644
index 000000000..73e11fa20
--- /dev/null
+++ b/public/js/components/Calendar/Calendar.js
@@ -0,0 +1,131 @@
+import CalendarMonth from './Month.js';
+import CalendarMonths from './Months.js';
+import CalendarYears from './Years.js';
+import CalendarWeek from './Week.js';
+import CalendarWeeks from './Weeks.js';
+import CalendarMinimized from './Minimized.js';
+import CalendarDate from '../../composables/CalendarDate.js';
+
+// TODO(chris): week/month toggle
+
+export default {
+	components: {
+		CalendarMonth,
+		CalendarMonths,
+		CalendarYears,
+		CalendarWeek,
+		CalendarWeeks,
+		CalendarMinimized
+	},
+	provide() {
+		return {
+			date: this.date,
+			focusDate: this.focusDate,
+			size: Vue.computed({ get: () => this.size, set: v => this.size = v}),
+			events: Vue.computed(() => this.eventsPerDay),
+			minimized: Vue.computed({ get: () => this.minimized, set: v => this.$emit('update:minimized',v) }),
+			showWeeks: this.showWeeks,
+			noMonthView: this.noMonthView,
+			noWeekView: this.noWeekView,
+			eventsAreNull: Vue.computed(() => this.events === null)
+		};
+	},
+	props: {
+		events: Array,
+		showWeeks: {
+			type: Boolean,
+			default: true
+		},
+		initialMode: {
+			type: String,
+			default: 'month'
+		},
+		minimized: Boolean,
+		noWeekView: Boolean,
+		noMonthView: Boolean
+	},
+	emits: [
+		'select:day',
+		'select:event',
+		'change:range',
+		'update:minimized'
+	],
+	data() {
+		return {
+			header: '',
+			prevMode: null,
+			currMode: null,
+			date: new CalendarDate(),
+			focusDate: new CalendarDate(),
+			size: 0
+		}
+	},
+	computed: {
+		sizeClass() {
+			return 'fhc-calendar-' + ['xs','sm','md','lg'][this.size];
+		},
+		mode: {
+			get() { return this.minimized ? 'minimized' : this.currMode; },
+			set(v) {
+				if (!v && this.prevMode) {
+					this.currMode = this.prevMode;
+					this.prevMode = null;
+				} else {
+					this.prevMode = this.currMode;
+					this.currMode = v;
+				}
+			}
+		},
+		eventsPerDay() {
+			if (!this.events)
+				return {};
+			return this.events.reduce((result, event) => {
+				let days = Math.ceil((event.end - event.start) / 86400000) || 1;
+				while (days-- > 0) {
+					let day = (new Date(event.start.getFullYear(), event.start.getMonth(), event.start.getDate() + days)).toDateString();
+					if (!result[day])
+						result[day] = [];
+					result[day].push(event);
+				}
+				return result;
+			}, {});
+		}
+	},
+	methods: {
+		handleInput(day) {
+			this.$emit(day[0], day[1]);
+		}
+	},
+	created() {
+		const allowedInitialModes = ['years'];
+		if (!this.noWeekView)
+			allowedInitialModes.push('week');
+		if (!this.noMonthView)
+			allowedInitialModes.push('month');
+		this.mode = allowedInitialModes[allowedInitialModes.indexOf(this.initialMode)] || allowedInitialModes.pop();
+		this.date.set(new Date(2023,0,1));
+		this.focusDate.set(this.date);
+	},
+	mounted() {
+		if (this.$refs.container) {
+			new ResizeObserver(entries => {
+				for (const entry of entries) {
+					let w = entry.contentBoxSize ? entry.contentBoxSize[0].inlineSize : entry.contentRect.width;
+					// TODO(chris): rework sizing
+					if (w > 600)
+						this.size = 3;
+					else if (w > 350)
+						this.size = 2;
+					else if (w > 250)
+						this.size = 1;
+					else
+						this.size = 0;
+				}
+			}).observe(this.$refs.container);
+		}
+	},
+	template: `
+	<div ref="container" class="fhc-calendar card" :class="sizeClass">
+		<component :is="'calendar-' + mode" @update:mode="mode=$event" @change:range="$emit('change:range',$event)" @input="handleInput" />
+	</div>`
+}
diff --git a/public/js/components/Calendar/Header.js b/public/js/components/Calendar/Header.js
new file mode 100644
index 000000000..0ead55215
--- /dev/null
+++ b/public/js/components/Calendar/Header.js
@@ -0,0 +1,23 @@
+export default {
+	inject: [
+		'eventsAreNull',
+		'size'
+	],
+	props: {
+		title: String
+	},
+	emits: [
+		'prev',
+		'next',
+		'click'
+	],
+	template: `
+	<div class="calendar-header card-header btn-group w-100">
+		<button class="btn btn-outline-secondary border-0 flex-grow-0" :class="{'btn-sm': !this.size}" @click="$emit('prev')"><i class="fa fa-chevron-left"></i></button>
+		<button class="btn btn-link link-secondary text-decoration-none" :class="{'btn-sm': !this.size}" @click="$emit('click')">
+			{{ title }}
+			<i v-if="eventsAreNull" class="fa fa-spinner fa-pulse"></i>
+		</button>
+		<button class="btn btn-outline-secondary border-0 flex-grow-0" :class="{'btn-sm': !this.size}" @click="$emit('next')"><i class="fa fa-chevron-right"></i></button>
+	</div>`
+}
diff --git a/public/js/components/Calendar/Minimized.js b/public/js/components/Calendar/Minimized.js
new file mode 100644
index 000000000..dac648324
--- /dev/null
+++ b/public/js/components/Calendar/Minimized.js
@@ -0,0 +1,29 @@
+import CalendarAbstract from './Abstract.js';
+
+export default {
+	mixins: [
+		CalendarAbstract
+	],
+	inject: [
+		'size',
+		'minimized',
+		'date'
+	],
+	data() {
+		return {
+			start: 0
+		}
+	},
+	methods: {
+		maximize() {
+			// NOTE(chris): set "app.config.unwrapInjectedRef = true" for this to work
+			this.minimized = false;
+		}
+	},
+	template: `
+	<div class="fhc-calendar-minimized">
+		<div class="card-header d-grid">
+			<button class="btn btn-link link-secondary text-decoration-none" @click="maximize">{{ date.format({dateStyle: ['long','full','full','full'][this.size]}) }}</button>
+		</div>
+	</div>`
+}
diff --git a/public/js/components/Calendar/Month.js b/public/js/components/Calendar/Month.js
new file mode 100644
index 000000000..a86ce10b6
--- /dev/null
+++ b/public/js/components/Calendar/Month.js
@@ -0,0 +1,69 @@
+import CalendarAbstract from './Abstract.js';
+import CalendarPane from './Pane.js';
+import CalendarMonthPage from './Month/Page.js';
+
+export default {
+	mixins: [
+		CalendarAbstract
+	],
+	components: {
+		CalendarMonthPage,
+		CalendarPane
+	},
+	data() {
+		return {
+			syncOnNextChange: false
+		}
+	},
+	computed: {
+		title() {
+			return this.focusDate.format({month: ['short','long','long','long'][this.size], year: 'numeric'});
+		}
+	},
+	methods: {
+		paneChanged(dir) {
+			if (this.syncOnNextChange) {
+				this.syncOnNextChange = false;
+				this.focusDate.set(this.date);
+			} else {
+				this.focusDate.m += dir;
+			}
+			this.$emit('change:range', {
+				start: new Date(this.focusDate.y, this.focusDate.m, 1), 
+				end: new Date(this.focusDate.y, this.focusDate.m+1, 0)
+			});
+		},
+		prev() {
+			this.$refs.pane.prev();
+		},
+		next() {
+			this.$refs.pane.next();
+		},
+		selectDay(day) {
+			let m = day.getMonth();
+			if (this.focusDate.m != m) {
+				this.syncOnNextChange = true;
+				if (this.focusDate.m-1 == m || (m == 11 && !this.focusDate.m))
+					this.$refs.pane.prev();
+				else
+					this.$refs.pane.next();
+			} else {
+				this.focusDate.set(this.date);
+			}
+			this.$emit('input', ['select:day',day])
+		}
+	},
+	created() {
+		this.$emit('change:range', {
+			start: new Date(this.focusDate.y, this.focusDate.m, 1), 
+			end: new Date(this.focusDate.y, this.focusDate.m+1, 0)
+		});
+	},
+	template: `
+	<div class="fhc-calendar-month">
+		<calendar-header :title="title" @prev="prev" @next="next" @click="$emit('update:mode', 'months')" />
+		<calendar-pane ref="pane" v-slot="slot" @slid="paneChanged">
+			<calendar-month-page :year="focusDate.y" :month="focusDate.m+slot.offset" @update:mode="$emit('update:mode', $event)" @page:back="prev" @page:forward="next" @input="selectDay" />
+		</calendar-pane>
+	</div>`
+}
diff --git a/public/js/components/Calendar/Month/Page.js b/public/js/components/Calendar/Month/Page.js
new file mode 100644
index 000000000..5cb9cdc53
--- /dev/null
+++ b/public/js/components/Calendar/Month/Page.js
@@ -0,0 +1,75 @@
+import CalendarDate from '../../../composables/CalendarDate.js';
+
+export default {
+	inject: [
+		'date',
+		'focusDate',
+		'size',
+		'events',
+		'showWeeks',
+		'noWeekView'
+	],
+	props: {
+		year: Number,
+		month: Number
+	},
+	emits: [
+		'update:mode',
+		'page:back',
+		'page:forward',
+		'input'
+	],
+	computed: {
+		weeks() {
+			let firstDayOfMonth = new CalendarDate(this.year, this.month, 1);
+			let startDay = firstDayOfMonth.firstDayOfCalendarMonth;
+			let endDay = firstDayOfMonth.lastDayOfCalendarMonth;
+
+			let res = [];
+			let week = {no:0,y:0,days:[]};
+			while (startDay <= endDay) {
+				week.days.push(new Date(startDay));
+				if (week.days.length == 7) {
+					let d = new CalendarDate(week.days[res.length ? 0 : 6]);
+					week.no = d.w;
+					week.y = d.y;
+					res.push(week);
+					week = {no:0,y:0,days:[]};
+				}
+				startDay.setDate(startDay.getDate() + 1);
+			}
+			return res;
+		}
+	},
+	methods: {
+		selectDay(day) {
+			this.date.set(day);
+			this.$emit('input', day);
+		},
+		changeToWeek(week) {
+			if (!this.noWeekView) {
+				if (!this.focusDate.isInWeek(week.no, week.y))
+					this.focusDate.set(week.days[0]);
+				this.$emit('update:mode', 'week');
+			}
+		}
+	},
+	template: `
+	<div class="fhc-calendar-month-page" :class="{'show-weeks': showWeeks}">
+		<div v-if="showWeeks" class="bg-light fw-bold border-top border-bottom text-center"></div>
+		<div v-for="day in weeks[0].days" :key="day" class="bg-light fw-bold border-top border-bottom text-center">
+			{{day.toLocaleString(undefined, {weekday: size < 1 ? 'narrow' : (size < 3 ? 'short' : 'long')})}}
+		</div>
+		<template v-for="week in weeks" :key="week.no">
+			<a href="#" v-if="showWeeks" class="fhc-calendar-month-page-weekday text-decoration-none text-end opacity-25" @click.prevent="changeToWeek(week)">{{week.no}}</a>
+			<a href="#" v-for="day in week.days" :key="day" class="fhc-calendar-month-page-day text-decoration-none overflow-hidden" :class="{active:date.compare(day),'opacity-50':day.getMonth() != month}" @click.prevent="selectDay(day)">
+				<span class="no">{{day.getDate()}}</span>
+				<span v-if="events[day.toDateString()] && events[day.toDateString()].length" class="events">
+					<span v-for="event in events[day.toDateString()]" :key="event.id" style="color:white" :style="{'background-color': event.color}">
+						{{event.title}}
+					</span>
+				</span>
+			</a>
+		</template>
+	</div>`
+}
diff --git a/public/js/components/Calendar/Months.js b/public/js/components/Calendar/Months.js
new file mode 100644
index 000000000..7dcb96d87
--- /dev/null
+++ b/public/js/components/Calendar/Months.js
@@ -0,0 +1,34 @@
+import CalendarAbstract from './Abstract.js';
+
+export default {
+	mixins: [
+		CalendarAbstract
+	],
+	inject: [
+		'size'
+	],
+	data() {
+		return {
+			monthIndices: [...Array(12).keys()]
+		}
+	},
+	computed: {
+		title() {
+			return this.focusDate.format({year: 'numeric'});
+		},
+		months() {
+			return this.monthIndices.map(i => (new Date(0, i, 1)).toLocaleString(undefined, {month: this.size < 2 ? 'short' : 'long'}));
+		}
+	},
+	template: `
+	<div class="fhc-calendar-months">
+		<calendar-header :title="title" @prev="focusDate.y--" @next="focusDate.y++" @click="$emit('update:mode', 'years')" />
+		<div class="d-flex flex-wrap">
+			<div v-for="(month, key) in months" :key="key" class="d-grid col-4">
+				<button @click="focusDate.m = key; $emit('update:mode', 'month')" class="btn btn-outline-secondary" :class="{'border-0': key != focusDate.m}">
+					{{month}}
+				</button>
+			</div>
+		</div>
+	</div>`
+}
diff --git a/public/js/components/Calendar/Pane.js b/public/js/components/Calendar/Pane.js
new file mode 100644
index 000000000..bbc21af0c
--- /dev/null
+++ b/public/js/components/Calendar/Pane.js
@@ -0,0 +1,55 @@
+export default {
+	emits: [
+		'slid'
+	],
+	data() {
+		return {
+			carousel: null,
+			queue: 0,
+			offset: 0
+		}
+	},
+	computed: {
+		offsets() {
+			return [...Array(3).keys()].map(i => (3+i-this.offset)%3-1);
+		}
+	},
+	methods: {
+		prev() {
+			if (!this.queue--)
+				this.carousel.prev();
+		},
+		next() {
+			if (!this.queue++)
+				this.carousel.next();
+		},
+		slid(evt) {
+			let dir = evt.direction == 'left' ? 1 : -1;
+			this.queue -= dir;
+			this.$emit('slid', dir);
+			this.offset = (3+this.offset+dir)%3;
+			if (this.queue) {
+				if (this.queue > 0)
+					this.carousel.next();
+				else
+					this.carousel.prev();
+			}
+		}
+	},
+	mounted() {
+		if (this.$refs.carousel) {
+			this.$refs.carousel.children[0].children[1].classList.add('active');
+			this.carousel = new window.bootstrap.Carousel(this.$refs.carousel, {
+				interval: false
+			});
+		}
+	},
+	template: `
+	<div ref="carousel" class="calendar-pane carousel slide" @[\`slid.bs.carousel\`]="slid" :data-queue="queue">
+		<div class="carousel-inner">
+			<div v-for="i in [...Array(3).keys()]" :key="i" class="carousel-item">
+				<slot :index="i" :offset="offsets[i]" />
+			</div>
+		</div>
+	</div>`
+}
diff --git a/public/js/components/Calendar/Week.js b/public/js/components/Calendar/Week.js
new file mode 100644
index 000000000..ca91382f5
--- /dev/null
+++ b/public/js/components/Calendar/Week.js
@@ -0,0 +1,48 @@
+import CalendarAbstract from './Abstract.js';
+import CalendarPane from './Pane.js';
+import CalendarWeekPage from './Week/Page.js';
+
+export default {
+	mixins: [
+		CalendarAbstract
+	],
+	components: {
+		CalendarWeekPage,
+		CalendarPane
+	},
+	computed: {
+		title() {
+			return this.focusDate.format({year: 'numeric'}) + ' KW ' + this.focusDate.w;
+		}
+	},
+	methods: {
+		paneChanged(dir) {
+			this.focusDate.d += dir * 7;
+			this.emitRangeChanged();
+		},
+		emitRangeChanged() {
+			let start = this.focusDate.firstDayOfWeek;
+			let end = this.focusDate.lastDayOfWeek;
+			this.$emit('change:range', { start, end });
+		},
+		prev() {
+			this.$refs.pane.prev();
+		},
+		next() {
+			this.$refs.pane.next();
+		},
+		selectEvent(event) {
+			this.$emit('input', ['select:event',event]);
+		}
+	},
+	created() {
+		this.emitRangeChanged();
+	},
+	template: `
+	<div class="fhc-calendar-week">
+		<calendar-header :title="title" @prev="prev" @next="next" @click="$emit('update:mode', 'weeks')" />
+		<calendar-pane ref="pane" v-slot="slot" @slid="paneChanged">
+			<calendar-week-page :year="focusDate.y" :week="focusDate.w+slot.offset" @update:mode="$emit('update:mode', $event)" @page:back="prev" @page:forward="next" @input="selectEvent" />
+		</calendar-pane>
+	</div>`
+}
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
new file mode 100644
index 000000000..47d48b7f7
--- /dev/null
+++ b/public/js/components/Calendar/Week/Page.js
@@ -0,0 +1,115 @@
+import CalendarDate from '../../../composables/CalendarDate.js';
+
+function ggt(m,n) { return n==0 ? m : ggt(n, m%n); }
+function kgv(m,n) { return (m*n) / ggt(m,n); }
+
+export default {
+	inject: [
+		'date',
+		'focusDate',
+		'size',
+		'events',
+		'noMonthView'
+	],
+	props: {
+		year: Number,
+		week: Number
+	},
+	emits: [
+		'update:mode',
+		'page:back',
+		'page:forward',
+		'input'
+	],
+	data() {
+		return {
+			hours: [...Array(24).keys()]
+		};
+	},
+	computed: {
+		days() {
+			let tmpDate = new CalendarDate(this.year, 1, 1); // NOTE(chris): somewhere in the middle of the year
+			tmpDate.w = this.week;
+			let startDay = tmpDate.firstDayOfWeek;
+			let result = [];
+			for (let i = 0; i < 7; i++) {
+				result.push(new Date(startDay.getFullYear(), startDay.getMonth(), startDay.getDate() + i));
+			}
+			return result;
+		},
+		eventsPerDayAndHour() {
+			const res = {};
+			this.days.forEach(day => {
+				let key = day.toDateString();
+				
+				let nextDay = new Date(day);
+				nextDay.setDate(nextDay.getDate()+1);
+				nextDay.setMilliseconds(nextDay.getMilliseconds()-1);
+				let d = {events:[],lanes:1};
+				if (this.events[key]) {
+					this.events[key].forEach(evt => {
+						let event = {orig:evt,lane:1,maxLane:1,start: evt.start < day ? day : evt.start, end: evt.end > nextDay ? nextDay : evt.end,shared:[],setSharedMaxRecursive(doneItems) {
+							this.maxLane = Math.max(doneItems[0].maxLane, this.maxLane);
+							doneItems.push(this);
+							this.shared.filter(other => !doneItems.includes(other)).forEach(i => i.setSharedMaxRecursive(doneItems));
+						}};
+						event.shared = d.events.filter(other => other.start < event.end && other.end > event.start);
+						event.shared.forEach(other => other.shared.push(event));
+						let occupiedLanes = event.shared.map(other => other.lane);
+						while (occupiedLanes.includes(event.lane))
+							event.lane++;
+						event.maxLane = Math.max(...[event.lane], ...occupiedLanes);
+						if (event.maxLane > 1) {
+							event.setSharedMaxRecursive([event]);
+						}
+						d.events.push(event);
+					});
+					d.lanes = d.events.map(e => e.maxLane).reduce((res, i) => kgv(res, i), 1);
+				}
+				res[key] = d;
+			});
+			return res;
+		},
+		smallestTimeFrame() {
+			return [30,15,10,5][this.size];
+		}
+	},
+	methods: {
+		changeToMonth(day) {
+			if (!this.noMonthView) {
+				this.date.set(day);
+				this.focusDate.set(day);
+				this.$emit('update:mode', 'month');
+			}
+		},
+		dateToMinutesOfDay(day) {
+			return Math.floor((day.getHours() * 60 + day.getMinutes()) / this.smallestTimeFrame) + 1;
+		}
+	},
+	mounted() {
+		setTimeout(() => this.$refs.eventcontainer.scrollTop = this.$refs.eventcontainer.scrollHeight / 3 + 1, 0);
+	},
+	template: `
+	<div class="fhc-calendar-week-page">
+		<div class="d-flex flex-column border-top">
+			<div class="fhc-calendar-week-page-header border-2 border-bottom text-center d-flex">
+				<div v-for="day in days" :key="day" class="flex-grow-1" :title="day.toLocaleString(undefined, {dateStyle:'short'})">
+					<div class="fw-bold">{{day.toLocaleString(undefined, {weekday: size < 2 ? 'narrow' : (size < 3 ? 'short' : 'long')})}}</div>
+					<a href="#" class="small text-secondary text-decoration-none" @click.prevent="changeToMonth(day)">{{day.toLocaleString(undefined, [{day:'numeric',month:'numeric'},{day:'numeric',month:'numeric'},{day:'numeric',month:'numeric'},{dateStyle:'short'}][this.size])}}</a>
+				</div>
+			</div>
+			<div ref="eventcontainer" class="flex-grow-1 overflow-auto">
+				<div class="events">
+					<div class="hours">
+						<div v-for="hour in hours" :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
+					</div>
+					<div v-for="day in eventsPerDayAndHour" :key="day" class="day border-start" :style="{'grid-template-columns': 'repeat(' + day.lanes + ', 1fr)', 'grid-template-rows': 'repeat(' + (1440 / smallestTimeFrame) + ', 1fr)'}">
+						<a href="#" v-for="event in day.events" :key="event" class="small rounded overflow-hidden text-decoration-none text-dark" :style="{'grid-column-start': 1+(event.lane-1)*day.lanes/event.maxLane, 'grid-column-end': 1+event.lane*day.lanes/event.maxLane, 'grid-row-start': dateToMinutesOfDay(event.start), 'grid-row-end': dateToMinutesOfDay(event.end), '--test': dateToMinutesOfDay(event.end), background: event.orig.color}" @click.prevent="$emit('input', event.orig)">
+							{{event.orig.title}}
+						</a>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>`
+}
diff --git a/public/js/components/Calendar/Weeks.js b/public/js/components/Calendar/Weeks.js
new file mode 100644
index 000000000..1ec8545bc
--- /dev/null
+++ b/public/js/components/Calendar/Weeks.js
@@ -0,0 +1,39 @@
+import CalendarAbstract from './Abstract.js';
+
+export default {
+	mixins: [
+		CalendarAbstract
+	],
+	inject: [
+		'size',
+		'focusDate'
+	],
+	data() {
+		return {
+			weeks: [...Array(this.focusDate.numWeeks).keys()].map(i => i+1)
+		}
+	},
+	computed: {
+		title() {
+			return this.focusDate.format({year: 'numeric'});
+		}
+	},
+	methods: {
+		setWeek(week) {
+			// TODO(chris): test is there a week jump on year select? => yes there is if the same month/day are in different weeks ... should we prevent that?
+			this.focusDate.w = week;
+			this.$emit('update:mode', 'week');
+		}
+	},
+	template: `
+	<div class="fhc-calendar-weeks">
+		<calendar-header :title="title" @prev="focusDate.y--" @next="focusDate.y++" @click="$emit('update:mode', 'years')" />
+		<div class="d-flex flex-wrap">
+			<div v-for="(week, key) in weeks" :key="key" class="d-grid col-2">
+				<button @click="setWeek(week)" class="btn btn-outline-secondary" :class="{'border-0': week != focusDate.w}">
+					{{week}}
+				</button>
+			</div>
+		</div>
+	</div>`
+}
diff --git a/public/js/components/Calendar/Years.js b/public/js/components/Calendar/Years.js
new file mode 100644
index 000000000..a372f748d
--- /dev/null
+++ b/public/js/components/Calendar/Years.js
@@ -0,0 +1,59 @@
+import CalendarAbstract from './Abstract.js';
+import CalendarPane from './Pane.js';
+import CalendarYearsPage from './Years/Page.js';
+
+export default {
+	mixins: [
+		CalendarAbstract
+	],
+	components: {
+		CalendarYearsPage,
+		CalendarPane
+	},
+	inject: [
+		'size'
+	],
+	data() {
+		return {
+			start: 0
+		}
+	},
+	computed: {
+		range() {
+			switch (this.size) {
+			case 3:
+			// eslint-disable-next-line
+			case 2:
+				return 24;
+			}
+			return 12;
+		},
+		end() {
+			return this.start + this.range - 1;
+		},
+		title() {
+			return this.start + ' - ' + this.end;
+		}
+	},
+	methods: {
+		paneChanged(dir) {
+			this.start += this.range * dir;
+		},
+		prev() {
+			this.$refs.pane.prev();
+		},
+		next() {
+			this.$refs.pane.next();
+		}
+	},
+	created() {
+		this.start = this.focusDate.y - this.focusDate.y%this.range;
+	},
+	template: `
+	<div class="fhc-calendar-years">
+		<calendar-header :title="title" @prev="prev" @next="next" @click="$emit('update:mode')" />
+		<calendar-pane ref="pane" v-slot="slot" @slid="paneChanged">
+			<calendar-years-page :data-test="slot.index" :start="start+range*slot.offset" :end="start+range*slot.offset+range" @update:mode="$emit('update:mode')"/>
+		</calendar-pane>
+	</div>`
+}
diff --git a/public/js/components/Calendar/Years/Page.js b/public/js/components/Calendar/Years/Page.js
new file mode 100644
index 000000000..b65471f82
--- /dev/null
+++ b/public/js/components/Calendar/Years/Page.js
@@ -0,0 +1,29 @@
+export default {
+	inject: [
+		'focusDate'
+	],
+	props: {
+		start: Number,
+		end: Number
+	},
+	emits: [
+		'update:mode'
+	],
+	data() {
+		return {
+		}
+	},
+	computed: {
+		years() {
+			return [...Array(this.end - this.start).keys()].map(i => i + this.start);
+		}
+	},
+	template: `
+	<div class="fhc-calendar-years-page d-flex flex-wrap">
+		<div v-for="year in years" :key="year" class="d-grid col-4">
+			<button class="btn btn-outline-secondary" :class="{'border-0': year != focusDate.y}" @click="focusDate.y = year; $emit('update:mode')">
+				{{year}}
+			</button>
+		</div>
+	</div>`
+}
diff --git a/public/js/composables/CalendarDate.js b/public/js/composables/CalendarDate.js
new file mode 100644
index 000000000..1b311739c
--- /dev/null
+++ b/public/js/composables/CalendarDate.js
@@ -0,0 +1,161 @@
+class CalendarDate {
+	constructor(y, m, d) {
+		this.weekStart = CalendarDate.getWeekStart();
+		this.set(y, m, d);
+		this._clean();
+	}
+	get y() { return this._y }
+	set y(v) { this._y = v; this._clean() }
+	get m() { return this._m }
+	set m(v) { this._m = v; this._clean() }
+	get d() { return this._d }
+	set d(v) { this._d = v; this._clean() }
+	/**
+	 * @see https://www.smart-rechner.de/kalenderwochen/rechner.php
+	 */
+	get w() {
+		if (this._w === null) {
+			if (this.weekStart == 1 && this._m == 11 && this._d > 28 && this.wd <= this._d-29) {
+				this._w = 1;
+			} else if (this.weekStart == 1 && this._m == 0 && this._d < 4 && 3-this.wd <= -this._d) {
+				let weekStartOfTheYear = new Date(this.y-1, 0, this.weekStart == 1 ? 4 : 1);
+				weekStartOfTheYear.setDate(weekStartOfTheYear.getDate() - (weekStartOfTheYear.getDay() + 7 - this.weekStart)%7);
+				this._w = Math.ceil((Math.floor((new Date(this.y, this.m, this.d) - weekStartOfTheYear) / 86400000) + 1) / 7);
+			} else {
+				let weekStartOfTheYear = new Date(this.y, 0, this.weekStart == 1 ? 4 : 1);
+				weekStartOfTheYear.setDate(weekStartOfTheYear.getDate() - (weekStartOfTheYear.getDay() + 7 - this.weekStart)%7);
+				this._w = Math.ceil((Math.floor((new Date(this.y, this.m, this.d) - weekStartOfTheYear) / 86400000) + 1) / 7);
+			}
+		}
+		return this._w;
+	}
+	set w(v) {
+		if (this.w != v) {
+			let lw = this.numWeeks;
+			
+			this.d += (v - this.w) * 7;
+
+			if (v > 0 && v <= lw && this.w != v) {
+				if (this.weekStart != 1) {
+					if (this.w == 1) {
+						this.set(this.firstDayOfWeek);
+					} else {
+						this.set(this.lastDayOfWeek);
+					}
+				}
+				if (this.w != v) {
+					console.error('couldn\'t set the week', this, v);
+				}
+			}
+		}
+	}
+	get wd() {
+		if (this._wd === null) {
+			this._wd = ((new Date(this.y, this.m, this.d)).getDay()+7-this.weekStart)%7;
+		}
+		return this._wd;
+	}
+	get firstDayOfWeek() {
+		let firstDayOfWeek = new Date(this.y, this.m, this.d);
+		firstDayOfWeek.setDate(this.d -(firstDayOfWeek.getDay()+7-this.weekStart)%7);
+		return firstDayOfWeek;
+	}
+	get cdFirstDayOfWeek() {
+		return new CalendarDate(this.firstDayOfWeek);
+	}
+	get lastDayOfWeek() {
+		let lastDayOfWeek = new Date(this.y, this.m, this.d);
+		lastDayOfWeek.setDate(this.d -(lastDayOfWeek.getDay()+7-this.weekStart)%7 +6);
+		return lastDayOfWeek;
+	}
+	get cdLastDayOfWeek() {
+		return new CalendarDate(this.lastDayOfWeek);
+	}
+	get firstDayOfCalendarMonth() {
+		let firstDayOfMonth = new Date(this.y, this.m, 1);
+		return new Date(this.y, this.m, 1-(firstDayOfMonth.getDay() + 7 - this.weekStart)%7);
+	}
+	get cdFirstDayOfCalendarMonth() {
+		let firstDayOfMonth = new Date(this.y, this.m, 1);
+		return new CalendarDate(this.y, this.m, 1-(firstDayOfMonth.getDay() + 7 - this.weekStart)%7);
+	}
+	get lastDayOfCalendarMonth() {
+		let lastDayOfMonth = new Date(this.y, this.m+1, 0);
+		return new Date(lastDayOfMonth.getFullYear(), lastDayOfMonth.getMonth(), lastDayOfMonth.getDate()+6-(lastDayOfMonth.getDay() + 7 - this.weekStart)%7);
+	}
+	get cdLastDayOfCalendarMonth() {
+		let lastDayOfMonth = new Date(this.y, this.m+1, 0);
+		return new CalendarDate(lastDayOfMonth.getFullYear(), lastDayOfMonth.getMonth(), lastDayOfMonth.getDate()+6-(lastDayOfMonth.getDay() + 7 - this.weekStart)%7);
+	}
+	get numWeeks() {
+		return (new CalendarDate(this.y+1,0,this.weekStart == 1 ? -3 : 0)).w;
+	}
+	set(y,m,d,noClean) {
+		if (y !== undefined && (m === undefined || m === true) && d === undefined) {
+			if (Object.prototype.toString.call(y) === '[object Date]')
+				return this.set(y.getFullYear(), y.getMonth(), y.getDate(), m);
+			if (y.y !== undefined && y.m !== undefined && y.d !== undefined)
+				return this.set(y.y, y.m, y.d, m);
+		}
+		[this._y,this._m,this._d] = [y || 0, m || 0, d || 0];
+		if (!noClean)
+			this._clean();
+	}
+	_clean() {
+		this.set(new Date(this._y, this._m, this._d), true);
+		this._w = null;
+		this._wd = null;
+	}
+	format(options) {
+		return (new Date(this._y, this._m, this._d)).toLocaleString(undefined, options);
+	}
+	compare(d) {
+		if (Object.prototype.toString.call(d) === '[object Date]')
+			return (this.y === d.getFullYear() && this.m === d.getMonth() && this.d === d.getDate());
+		return (this.y === d.y && this.m === d.m && this.d === d.d);
+	}
+	isInWeek(w, y) {
+		if (this.y == y && this.w == w)
+			return true;
+		if (this.weekStart == 1)
+			return false;
+		let edgeDay = this.cdFirstDayOfWeek;console.log(edgeDay);
+		if (edgeDay.y == y && edgeDay.w == w)
+			return true;
+		edgeDay = this.cdLastDayOfWeek;
+		if (edgeDay.y == y && edgeDay.w == w)
+			return true;
+		return false;
+	}
+	setLocale(locale) {
+		this.weekStart = CalendarDate.getWeekStart(locale);
+	}
+}
+/**
+ * Returns the weekday number (Date.getDay()) on which the week starts depending on the locale.
+ * This can be Saturday(6), Sunday(0) or Monday(1)
+ * 
+ * @see https://stackoverflow.com/questions/53382465/how-can-i-determine-if-week-starts-on-monday-or-sunday-based-on-locale-in-pure-j
+ * 
+ * @param string locale
+ * 
+ * @return integer
+ */
+CalendarDate.getWeekStart = function(locale) {
+	locale = locale || navigator.language;
+	const parts = locale.match(/^([a-z]{2,3})(?:-([a-z]{3})(?=$|-))?(?:-([a-z]{4})(?=$|-))?(?:-([a-z]{2}|\d{3})(?=$|-))?/i);
+	const regionSat = 'AEAFBHDJDZEGIQIRJOKWLYOMQASDSY'.match(/../g);
+	const regionSun = 'AGARASAUBDBRBSBTBWBZCACNCODMDOETGTGUHKHNIDILINJMJPKEKHKRLAMHMMMOMTMXMZNINPPAPEPHPKPRPTPYSASGSVTHTTTWUMUSVEVIWSYEZAZW'.match(/../g);
+	const languageSat = ['ar','arq','arz','fa'];
+	const languageSun = 'amasbndzengnguhehiidjajvkmknkolomhmlmrmtmyneomorpapssdsmsnsutatethtnurzhzu'.match(/../g);
+
+	return (
+		parts[4] ? (
+			regionSun.includes(parts[4]) ? 0 :
+			regionSat.includes(parts[4]) ? 6 : 1) : (
+			languageSun.includes(parts[1]) ? 0 :
+			languageSat.includes(parts[1]) ? 6 : 1));
+}
+
+
+export default CalendarDate
\ No newline at end of file

From 7e2d63e3fe9b7d4a1c5ec8cb37f92a624c137275 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 6 Feb 2023 08:53:32 +0100
Subject: [PATCH 0065/1461] Css cleanup

---
 public/css/Cis4/Cis.css            | 2 --
 public/css/components/calendar.css | 2 --
 2 files changed, 4 deletions(-)

diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index 007555c61..810a55956 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -306,5 +306,3 @@
     display: block;
   }
 }
-
-/*# sourceMappingURL=Cis.css.map */
diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index f401f9cb7..e753480d5 100644
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -156,5 +156,3 @@
 .fhc-calendar-xs .fhc-calendar-month-page-day .events span {
   overflow: hidden;
 }
-
-/*# sourceMappingURL=calendar.css.map */

From 13b898179e5e8dff904ae99aaf3993f0bd7ea3b1 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 6 Feb 2023 09:46:32 +0100
Subject: [PATCH 0066/1461] Widget classes

---
 public/js/components/Dashboard/Item.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index 7d7639362..d64b8d2e7 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -102,7 +102,7 @@ export default {
 			<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
 		</div>
 	</div>
-	<div v-else-if="!hidden || editMode" :class="'dashboard-item card overflow-hidden ' + (arguments ? arguments.className : '')" @mousedown="mouseDown($event)" @dragstart="startDrag($event)" :draggable="!!editMode">
+	<div v-else-if="!hidden || editMode" class="dashboard-item card overflow-hidden" :class="arguments ? arguments.className : ''" @mousedown="mouseDown($event)" @dragstart="startDrag($event)" :draggable="!!editMode">
 		<div v-if="editMode && widget" class="card-header d-flex ps-0 pe-2">
 			<span ref="dragHandle" class="col-auto mx-2 px-2 cursor-move"><i class="fa-solid fa-grip-vertical"></i></span>
 			<span class="col">{{ widget.setup.name }}</span>
@@ -114,7 +114,7 @@ export default {
 				<input class="form-check-input ms-0" type="checkbox" role="switch" id="flexSwitchCheckChecked" :checked="!hidden" @input="$emit('remove', hidden)">
 			</div>
 		</div>
-		<div v-if="ready" class="card-body overflow-hidden">
+		<div v-if="ready" class="card-body overflow-hidden" :class="arguments ? arguments.bodyClass : ''">
 			<component :is="component" :config="arguments" :width="width" :height="height" @setConfig="setConfig" @change="changeConfigManually"></component>
 		</div>
 		<div v-else class="card-body overflow-hidden text-center d-flex flex-column justify-content-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></div>

From 9f7220679685bb89d143d555aef3ba0dde4d5565 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 6 Feb 2023 11:44:36 +0100
Subject: [PATCH 0067/1461] Stundenplan Widget Basic

---
 public/css/components/dashboard.css           |  2 +
 public/js/apps/Dashboard/Admin.js             |  6 +-
 public/js/apps/Dashboard/Fhc.js               |  6 +-
 .../components/DashboardWidget/Stundenplan.js | 55 +++++++++++++++++++
 4 files changed, 65 insertions(+), 4 deletions(-)
 create mode 100644 public/js/components/DashboardWidget/Stundenplan.js

diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
index 25d33adcd..b16f5f07b 100644
--- a/public/css/components/dashboard.css
+++ b/public/css/components/dashboard.css
@@ -1,3 +1,5 @@
+@import './calendar.css';
+
 .alert-danger .form-check-input:checked {
 	border-color: #842029;
 	background-color: #842029;
diff --git a/public/js/apps/Dashboard/Admin.js b/public/js/apps/Dashboard/Admin.js
index 05734fb28..426a2fce4 100644
--- a/public/js/apps/Dashboard/Admin.js
+++ b/public/js/apps/Dashboard/Admin.js
@@ -1,7 +1,7 @@
 import {CoreNavigationCmpt} from '../../components/navigation/Navigation.js';
 import DashboardAdmin from '../../components/Dashboard/Admin.js';
 
-Vue.createApp({
+const app = Vue.createApp({
   data: () => ({
       appSideMenuEntries: {}
     }),
@@ -9,4 +9,6 @@ Vue.createApp({
     CoreNavigationCmpt,
     DashboardAdmin
   }
-}).mount('#main');
+});
+app.config.unwrapInjectedRef = true;
+app.mount('#main');
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index 661d6ebb2..ebcbb4b78 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -1,10 +1,12 @@
 import FhcDashboard from '../../components/Dashboard/Dashboard.js';
 
-Vue.createApp({
+const app = Vue.createApp({
   data: () => ({
       appSideMenuEntries: {}
     }),
   components: {
     FhcDashboard
   }
-}).mount('#content');
+});
+app.config.unwrapInjectedRef = true;
+app.mount('#content');
diff --git a/public/js/components/DashboardWidget/Stundenplan.js b/public/js/components/DashboardWidget/Stundenplan.js
new file mode 100644
index 000000000..ea2af1a07
--- /dev/null
+++ b/public/js/components/DashboardWidget/Stundenplan.js
@@ -0,0 +1,55 @@
+import AbstractWidget from './Abstract';
+import FhcCalendar from '../Calendar/Calendar';
+
+export default {
+	mixins: [
+		AbstractWidget
+	],
+	components: {
+		FhcCalendar
+	},
+	data() {
+		return {
+			minimized: true,
+			events: null,
+			currentDay: new Date()
+		}
+	},
+	computed: {
+		currentEvents() {
+			return (this.events || []).filter(evt => evt.end > this.currentDay && evt.start <= this.currentDay);
+		}
+	},
+	methods: {
+		selectDay(day) {
+			this.minimized = true;
+		}
+	},
+	created() {
+		axios
+			.get(this.apiurl + '/components/Cis/Stundenplan')
+			.then(res => {
+				res.data.retval.forEach((el, i) => {
+					el.id = i;
+					el.color = '#' + (el.farbe || 'CCCCCC');
+					el.start = new Date(el.datum + ' ' + this.stunden[el.stunde].beginn);
+					el.end = new Date(el.datum + ' ' + this.stunden[el.stunde].ende);
+					el.title = el.lehrfach;
+					if (el.lehrform)
+						el.title += '-' + el.lehrform;
+				});
+				this.events = res.data.retval || [];
+			})
+			.catch(err => { console.error('ERROR: ', err.response.data) });
+	},
+	template: `
+	<div class="dashboard-widget-stundenplan" v-if="configMode">
+		config
+	</div>
+	<div class="dashboard-widget-stundenplan" v-else>
+		<fhc-calendar class="border-0" @select:day="selectDay" v-model:minimized="minimized" :events="events" no-week-view :show-weeks="false" />
+		<div v-show="minimized">
+			{{currentEvents}}
+		</div>
+	</div>`
+}
\ No newline at end of file

From 280890a00d17a552f52c581706d964459b4bca07 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 24 Feb 2023 11:57:54 +0100
Subject: [PATCH 0068/1461] Stundenplan Widget

---
 public/js/components/Calendar/Abstract.js     |  2 +-
 public/js/components/Calendar/Calendar.js     | 13 +++-
 public/js/components/Calendar/Header.js       | 24 ++++++-
 public/js/components/Calendar/Minimized.js    |  5 +-
 .../components/DashboardWidget/Stundenplan.js | 71 +++++++++++++------
 5 files changed, 86 insertions(+), 29 deletions(-)

diff --git a/public/js/components/Calendar/Abstract.js b/public/js/components/Calendar/Abstract.js
index 07eb03933..94af02091 100644
--- a/public/js/components/Calendar/Abstract.js
+++ b/public/js/components/Calendar/Abstract.js
@@ -1,4 +1,4 @@
-import CalendarHeader from './Header';
+import CalendarHeader from './Header.js';
 
 export default {
 	components: {
diff --git a/public/js/components/Calendar/Calendar.js b/public/js/components/Calendar/Calendar.js
index 73e11fa20..7ade4df60 100644
--- a/public/js/components/Calendar/Calendar.js
+++ b/public/js/components/Calendar/Calendar.js
@@ -27,11 +27,16 @@ export default {
 			showWeeks: this.showWeeks,
 			noMonthView: this.noMonthView,
 			noWeekView: this.noWeekView,
-			eventsAreNull: Vue.computed(() => this.events === null)
+			eventsAreNull: Vue.computed(() => this.events === null),
+			classHeader: this.classHeader
 		};
 	},
 	props: {
 		events: Array,
+		initialDate: {
+			type: [Date, String],
+			default: new Date()
+		},
 		showWeeks: {
 			type: Boolean,
 			default: true
@@ -40,6 +45,10 @@ export default {
 			type: String,
 			default: 'month'
 		},
+		classHeader: {
+			type: [String,Object,Array],
+			default: ''
+		},
 		minimized: Boolean,
 		noWeekView: Boolean,
 		noMonthView: Boolean
@@ -103,7 +112,7 @@ export default {
 		if (!this.noMonthView)
 			allowedInitialModes.push('month');
 		this.mode = allowedInitialModes[allowedInitialModes.indexOf(this.initialMode)] || allowedInitialModes.pop();
-		this.date.set(new Date(2023,0,1));
+		this.date.set(new Date(this.initialDate));
 		this.focusDate.set(this.date);
 	},
 	mounted() {
diff --git a/public/js/components/Calendar/Header.js b/public/js/components/Calendar/Header.js
index 0ead55215..17882aa81 100644
--- a/public/js/components/Calendar/Header.js
+++ b/public/js/components/Calendar/Header.js
@@ -1,7 +1,8 @@
 export default {
 	inject: [
 		'eventsAreNull',
-		'size'
+		'size',
+		'classHeader'
 	],
 	props: {
 		title: String
@@ -11,9 +12,26 @@ export default {
 		'next',
 		'click'
 	],
+	computed: {
+		myClassHeader() {
+			// TODO(chris): + {'btn-sm': !this.size}
+			let c = this.classHeader;
+			if (Array.isArray(c)) {
+				if (!this.size)
+					c.push('btn-sm');
+			} else if (typeof c === 'string' || c instanceof String) {
+				if (!this.size)
+					c += ' btn-sm';
+			} else {
+				c['btn-sm'] = !this.size;
+			}
+
+			return c;
+		}
+	},
 	template: `
-	<div class="calendar-header card-header btn-group w-100">
-		<button class="btn btn-outline-secondary border-0 flex-grow-0" :class="{'btn-sm': !this.size}" @click="$emit('prev')"><i class="fa fa-chevron-left"></i></button>
+	<div class="calendar-header card-header btn-group w-100" :class="classHeader">
+		<button class="btn btn-outline-secondary border-0 flex-grow-0" :class="{'btn-sm':!this.size}" @click="$emit('prev')"><i class="fa fa-chevron-left"></i></button>
 		<button class="btn btn-link link-secondary text-decoration-none" :class="{'btn-sm': !this.size}" @click="$emit('click')">
 			{{ title }}
 			<i v-if="eventsAreNull" class="fa fa-spinner fa-pulse"></i>
diff --git a/public/js/components/Calendar/Minimized.js b/public/js/components/Calendar/Minimized.js
index dac648324..d92d2ffbc 100644
--- a/public/js/components/Calendar/Minimized.js
+++ b/public/js/components/Calendar/Minimized.js
@@ -7,7 +7,8 @@ export default {
 	inject: [
 		'size',
 		'minimized',
-		'date'
+		'date',
+		'classHeader'
 	],
 	data() {
 		return {
@@ -22,7 +23,7 @@ export default {
 	},
 	template: `
 	<div class="fhc-calendar-minimized">
-		<div class="card-header d-grid">
+		<div class="card-header d-grid" :class="classHeader">
 			<button class="btn btn-link link-secondary text-decoration-none" @click="maximize">{{ date.format({dateStyle: ['long','full','full','full'][this.size]}) }}</button>
 		</div>
 	</div>`
diff --git a/public/js/components/DashboardWidget/Stundenplan.js b/public/js/components/DashboardWidget/Stundenplan.js
index ea2af1a07..b74095b32 100644
--- a/public/js/components/DashboardWidget/Stundenplan.js
+++ b/public/js/components/DashboardWidget/Stundenplan.js
@@ -1,8 +1,10 @@
-import AbstractWidget from './Abstract';
-import FhcCalendar from '../Calendar/Calendar';
+import Phrasen from '../../mixins/Phrasen.js';
+import AbstractWidget from './Abstract.js';
+import FhcCalendar from '../Calendar/Calendar.js';
 
 export default {
 	mixins: [
+		Phrasen,
 		AbstractWidget
 	],
 	components: {
@@ -10,6 +12,7 @@ export default {
 	},
 	data() {
 		return {
+			stunden: [],
 			minimized: true,
 			events: null,
 			currentDay: new Date()
@@ -17,39 +20,65 @@ export default {
 	},
 	computed: {
 		currentEvents() {
-			return (this.events || []).filter(evt => evt.end > this.currentDay && evt.start <= this.currentDay);
+			return (this.events || []).filter(evt => evt.end < this.dayAfterCurrentDay && evt.start >= this.currentDay);
+		},
+		dayAfterCurrentDay() {
+			let currentDay = new Date(this.currentDay);
+			currentDay.setDate(currentDay.getDate() + 1);
+			return currentDay;
 		}
 	},
 	methods: {
 		selectDay(day) {
+			this.currentDay = day;
 			this.minimized = true;
 		}
 	},
 	created() {
+		this.$emit('setConfig', false);
 		axios
-			.get(this.apiurl + '/components/Cis/Stundenplan')
-			.then(res => {
-				res.data.retval.forEach((el, i) => {
-					el.id = i;
-					el.color = '#' + (el.farbe || 'CCCCCC');
-					el.start = new Date(el.datum + ' ' + this.stunden[el.stunde].beginn);
-					el.end = new Date(el.datum + ' ' + this.stunden[el.stunde].ende);
-					el.title = el.lehrfach;
-					if (el.lehrform)
-						el.title += '-' + el.lehrform;
+			.get(this.apiurl + '/components/Cis/Stundenplan/Stunden').then(res => {
+				res.data.retval.forEach(std => {
+					this.stunden[std.stunde] = std; // TODO(chris): geht besser
 				});
-				this.events = res.data.retval || [];
+				axios
+					.get(this.apiurl + '/components/Cis/Stundenplan')
+					.then(res => {
+						res.data.retval.forEach((el, i) => {
+							el.id = i;
+							el.color = '#' + (el.farbe || 'CCCCCC');
+							el.start = new Date(el.datum + ' ' + this.stunden[el.stunde].beginn);
+							el.end = new Date(el.datum + ' ' + this.stunden[el.stunde].ende);
+							el.title = el.lehrfach;
+							if (el.lehrform)
+								el.title += '-' + el.lehrform;
+						});
+						this.events = res.data.retval || [];
+					})
+					.catch(err => { console.log(err);console.error('ERROR: ', err.response.data) });
 			})
 			.catch(err => { console.error('ERROR: ', err.response.data) });
 	},
 	template: `
-	<div class="dashboard-widget-stundenplan" v-if="configMode">
-		config
-	</div>
-	<div class="dashboard-widget-stundenplan" v-else>
-		<fhc-calendar class="border-0" @select:day="selectDay" v-model:minimized="minimized" :events="events" no-week-view :show-weeks="false" />
-		<div v-show="minimized">
-			{{currentEvents}}
+	<div class="dashboard-widget-stundenplan d-flex flex-column h-100">
+		<fhc-calendar :initial-date="currentDay" class="border-0" class-header="p-0" @select:day="selectDay" v-model:minimized="minimized" :events="events" no-week-view :show-weeks="false" />
+		<div v-show="minimized" class="flex-grow-1 overflow-scroll">
+			<div v-if="events === null" class="d-flex h-100 justify-content-center align-items-center">
+				<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
+			</div>
+			<div v-else-if="currentEvents.length" class="list-group list-group-flush">
+				<div class="" v-for="evt in currentEvents" :key="evt.id" class="list-group-item small" :style="{'background-color':evt.color}">
+					<b>{{evt.title}}</b>
+					<br>
+					<small class="d-flex w-100 justify-content-between">
+						<span>{{evt.ort_kurzbz}}</span>
+						<span>{{evt.start.toLocaleTimeString(undefined, {hour:'numeric',minute:'numeric'})}}-{{evt.end.toLocaleTimeString(undefined, {hour:'numeric',minute:'numeric'})}}</span>
+					</small>
+				</div>
+			</div>
+			<div v-else class="d-flex h-100 justify-content-center align-items-center fst-italic text-center">
+				{{ p.t('lehre/noLvFound') }}
+			</div>
 		</div>
 	</div>`
 }
\ No newline at end of file

From 555b8f4e6bec913a460a9d34942db48e5a7828f4 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 24 Feb 2023 11:59:27 +0100
Subject: [PATCH 0069/1461] access rights

---
 application/controllers/dashboard/Api.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/controllers/dashboard/Api.php b/application/controllers/dashboard/Api.php
index c6ac21463..8a9d24c4f 100644
--- a/application/controllers/dashboard/Api.php
+++ b/application/controllers/dashboard/Api.php
@@ -8,8 +8,8 @@ class Api extends Auth_Controller
         parent::__construct(
             array(
                 'index'		=> 'dashboard/admin:rw',
-                'getNews'	=> 'dashboard/admin:rw',
-                'getAmpeln'	=> 'dashboard/admin:rw',
+                'getNews'	=> 'dashboard/benutzer:r',
+                'getAmpeln'	=> 'dashboard/benutzer:r',
             )
         );
 

From f9975eb530a29f7d9ea59be4ba38dbb7f64df397 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 10 Mar 2023 09:28:04 +0100
Subject: [PATCH 0070/1461] Code Quality

---
 application/controllers/CisHmvc.php           |  8 ++++---
 application/controllers/CisHmvc/Cms.php       |  1 -
 .../controllers/components/Cis/Mylv.php       |  4 +++-
 application/libraries/CmsLib.php              | 18 ++++++++------
 .../templates/CISHTML-Menu/EntryBase.php      | 24 +++++++++++++++----
 application/views/templates/CISVUE-Footer.php |  2 +-
 application/views/templates/CISVUE-Header.php |  8 ++++++-
 7 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/application/controllers/CisHmvc.php b/application/controllers/CisHmvc.php
index a704e8952..a4a370997 100644
--- a/application/controllers/CisHmvc.php
+++ b/application/controllers/CisHmvc.php
@@ -2,6 +2,8 @@
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
+use \DOMDocument as DOMDocument;
+
 /**
  * 
  */
@@ -220,8 +222,8 @@ class CisHmvc extends FHC_Controller
 		if ($xml->getElementsByTagName('url')->item(0))
 			$url = $xml->getElementsByTagName('url')->item(0)->nodeValue;
 		// TODO(chris): get params
-		if (strpos($url, '$') !== FALSE)
-			var_dump($url);
+		/*if (strpos($url, '$') !== FALSE)
+			var_dump($url);*/
 		if (isset($params) && is_array($params))
 			foreach ($params as $key=>$value)
 				$url = str_replace('$' . $key, addslashes($value), $url);
@@ -302,7 +304,7 @@ class CisHmvc extends FHC_Controller
 			'Õ'=>'O', 'Ö'=>'Oe', 'Ø'=>'O', 'Ù'=>'U', 'Ú'=>'U', 'Û'=>'U', 'Ü'=>'Ue', 'Ý'=>'Y', 'Þ'=>'B', 'ß'=>'Ss',
 			'à'=>'a', 'á'=>'a', 'â'=>'a', 'ã'=>'a', 'ä'=>'ae', 'å'=>'a', 'æ'=>'a', 'ç'=>'c', 'è'=>'e', 'é'=>'e',
 			'ê'=>'e', 'ë'=>'e', 'ì'=>'i', 'í'=>'i', 'î'=>'i', 'ï'=>'i', 'ð'=>'o', 'ñ'=>'n', 'ò'=>'o', 'ó'=>'o',
-			'ô'=>'o', 'õ'=>'o', 'ö'=>'oe', 'ø'=>'o', 'ù'=>'u', 'ú'=>'u', 'û'=>'u', 'ü'=>'ue', 'ý'=>'y', 'ý'=>'y', 'þ'=>'b',
+			'ô'=>'o', 'õ'=>'o', 'ö'=>'oe', 'ø'=>'o', 'ù'=>'u', 'ú'=>'u', 'û'=>'u', 'ü'=>'ue', /*'ý'=>'y', duplicate? => see quality check*/'ý'=>'y', 'þ'=>'b',
 			'ÿ'=>'y', 'Ŕ'=>'R', 'ŕ'=>'r', '/' => '-', ' ' => '-'
 		];
 		$text = preg_replace(['/\s{2,}/', '/[\t\n]/'], ' ', $text);
diff --git a/application/controllers/CisHmvc/Cms.php b/application/controllers/CisHmvc/Cms.php
index 267543908..44dc6cdb4 100644
--- a/application/controllers/CisHmvc/Cms.php
+++ b/application/controllers/CisHmvc/Cms.php
@@ -55,7 +55,6 @@ class Cms extends Auth_Controller
 	 */
 	public function legacy($url)
 	{
-		$msg = $url;
 		$this->load->view('CisHmvc/Cms/Legacy', ['url' => $url]);
 	}
 
diff --git a/application/controllers/components/Cis/Mylv.php b/application/controllers/components/Cis/Mylv.php
index 60203a37c..a8baee753 100644
--- a/application/controllers/components/Cis/Mylv.php
+++ b/application/controllers/components/Cis/Mylv.php
@@ -149,7 +149,9 @@ class Mylv extends Auth_Controller
 						$key = $set->lvinfo_set_kurzbz;
 						if (!isset($lvi->data[$key]))
 							continue;
-						$info['header'] = $set->lvinfo_set_bezeichnung[$lvi->sprache];
+						$info = [
+							'header' => $set->lvinfo_set_bezeichnung[$lvi->sprache]
+						];
 						if (isset($set->einleitungstext[$lvi->sprache]))
 							$info['subheader'] = $set->einleitungstext[$lvi->sprache];
 						switch ($set->lvinfo_set_typ)
diff --git a/application/libraries/CmsLib.php b/application/libraries/CmsLib.php
index 896b15a1b..4e27b94af 100644
--- a/application/libraries/CmsLib.php
+++ b/application/libraries/CmsLib.php
@@ -2,6 +2,10 @@
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
+use \DateTime as DateTime;
+use \DOMDocument as DOMDocument;
+use \XSLTProcessor as XSLTProcessor;
+
 /**
  * TODO(chris): NEWS: edit & delete button links and confirm
  * TODO(chris): NEWS: news_infoscreen xlst
@@ -97,14 +101,14 @@ class CmsLib
 			return $template;
 		$template = current(getData($template));
 
-		$XML = new \DOMDocument();
+		$XML = new DOMDocument();
 		$XML->loadXML($content->content);
 
-		$xsltemplate = new \DOMDocument();
+		$xsltemplate = new DOMDocument();
 		$xsltemplate->loadXML($template->xslt_xhtml_c4);
 
 		//Transformation
-		$processor = new \XSLTProcessor();
+		$processor = new XSLTProcessor();
 		$processor->importStylesheet($xsltemplate);
 
 		$content = $processor->transformToXML($XML);
@@ -214,7 +218,7 @@ class CmsLib
 		foreach ($news as $newsobj) {
 			if ($studiengang_kz && $edit && !$newsobj->studiengang_kz)
 				continue;
-			$date = new \DateTime($newsobj->datum);
+			$date = new DateTime($newsobj->datum);
 			$datum = '<datum><![CDATA[' . $date->format('d.m.Y') . ']]></datum>';
 			$datum .= '<datumdetail><![CDATA[' . $date->format('Y-m-d H:i') . ']]></datumdetail>';
 			$id = $edit ? '<news_id><![CDATA[' . $newsobj->news_id . ']]></news_id>' : '';
@@ -254,14 +258,14 @@ class CmsLib
 			return $template;
 		$template = current(getData($template));
 
-		$XML = new \DOMDocument();
+		$XML = new DOMDocument();
 		$XML->loadXML($xml);
 		
-		$xsltemplate = new \DOMDocument();
+		$xsltemplate = new DOMDocument();
 		$xsltemplate->loadXML($template->xslt_xhtml_c4);
 
 		//Transformation
-		$processor = new \XSLTProcessor();
+		$processor = new XSLTProcessor();
 		$processor->importStylesheet($xsltemplate);
 
 		$content = $processor->transformToDoc($XML);
diff --git a/application/views/templates/CISHTML-Menu/EntryBase.php b/application/views/templates/CISHTML-Menu/EntryBase.php
index 16caa4c78..de6dcaf95 100644
--- a/application/views/templates/CISHTML-Menu/EntryBase.php
+++ b/application/views/templates/CISHTML-Menu/EntryBase.php
@@ -1,25 +1,39 @@
 <?php if ($entry->childs) { ?>
 	<?php if (substr($link, 0, 1) == '#') { ?>
-		<a href="#<?= $menu_id; ?>" data-bs-toggle="collapse" aria-expanded="<?= $entry->menu_open ? 'true' : 'false'; ?>" class="btn btn-default rounded-0 w-100 text-start dropdown-toggle btn-level-<?= substr_count($menu_id, '-'); ?><?= $entry->menu_open ? '' : ' collapsed'; ?>">
+		<a 
+			href="#<?= $menu_id; ?>" 
+			data-bs-toggle="collapse" 
+			aria-expanded="<?= $entry->menu_open ? 'true' : 'false'; ?>" 
+			class="btn btn-default rounded-0 w-100 text-start dropdown-toggle btn-level-<?= substr_count($menu_id, '-'); ?><?= $entry->menu_open ? '' : ' collapsed'; ?>">
 			<span><?= htmlspecialchars($entry->titel); ?></span>
 		</a>
 	<?php } else { ?>
 		<div class="btn-group w-100">
-			<a<?= $link ? ' href="' . $link . '"' : ''; ?><?= $target ? ' target="' . $target . '"' : ''; ?> class="btn btn-default rounded-0 text-start btn-level-<?= substr_count($menu_id, '-'); ?>">
+			<a 
+				class="btn btn-default rounded-0 text-start btn-level-<?= substr_count($menu_id, '-'); ?>"
+				<?= $link ? ' href="' . $link . '"' : ''; ?>
+				<?= $target ? ' target="' . $target . '"' : ''; ?>>
 				<?= htmlspecialchars($entry->titel); ?>
 			</a>
-			<a href="#<?= $menu_id; ?>" data-bs-toggle="collapse" aria-expanded="<?= $entry->menu_open ? 'true' : 'false'; ?>"class="btn btn-default rounded-0 dropdown-toggle dropdown-toggle-split flex-grow-0<?= $entry->menu_open ? '' : ' collapsed'; ?>" >
+			<a 
+				href="#<?= $menu_id; ?>" 
+				data-bs-toggle="collapse" 
+				aria-expanded="<?= $entry->menu_open ? 'true' : 'false'; ?>"
+				class="btn btn-default rounded-0 dropdown-toggle dropdown-toggle-split flex-grow-0<?= $entry->menu_open ? '' : ' collapsed'; ?>">
 				<span class="visually-hidden">Toggle Dropdown</span>
 			</a>
 		</div>
 	<?php } ?>
 	<ul id="<?= $menu_id; ?>" class="nav w-100 collapse<?= $entry->menu_open ? ' show' : ''; ?>">
-		<?php foreach ($entry->childs as $child) 
+		<?php foreach ($entry->childs as $child)
 			$this->load->view('templates/CISHTML-Menu/Entry', ['entry' => $child, 'menu_id' => $menu_id]);
 		?>
 	</ul>
 <?php } else { ?>
-	<a<?= $link ? ' href="' . $link . '"' : ''; ?><?= $target ? ' target="' . $target . '"' : ''; ?> class="btn btn-default rounded-0 w-100 text-start btn-level-<?= substr_count($menu_id, '-'); ?>">
+	<a 
+		class="btn btn-default rounded-0 w-100 text-start btn-level-<?= substr_count($menu_id, '-'); ?>"
+		<?= $link ? ' href="' . $link . '"' : ''; ?>
+		<?= $target ? ' target="' . $target . '"' : ''; ?>>
 		<?= htmlspecialchars($entry->titel); ?>
 	</a>
 <?php } ?>
diff --git a/application/views/templates/CISVUE-Footer.php b/application/views/templates/CISVUE-Footer.php
index e36b7ddcd..d7c1de24c 100644
--- a/application/views/templates/CISVUE-Footer.php
+++ b/application/views/templates/CISVUE-Footer.php
@@ -16,4 +16,4 @@ $includesArray = array(
 
 </main>
 
-<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
\ No newline at end of file
+<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
diff --git a/application/views/templates/CISVUE-Header.php b/application/views/templates/CISVUE-Header.php
index 9d66914d7..bd4afa012 100644
--- a/application/views/templates/CISVUE-Header.php
+++ b/application/views/templates/CISVUE-Header.php
@@ -18,6 +18,12 @@ $this->load->view('templates/FHC-Header', $includesArray);
 ?>
 
 <header id="cis-header" class="navbar-dark">
-	<cis-menu root-url="<?= site_url('CisVue'); ?>" logo-url="<?= base_url('/public/images/logo-300x160.png'); ?>" avatar-url="<?= base_url('/cis/public/bild.php?src=person&person_id=' . getAuthPersonId()); ?>" logout-url="<?= site_url('Cis/Auth/logout'); ?>" :searchbaroptions="searchbaroptions" :searchfunction="searchfunction" />
+	<cis-menu 
+		root-url="<?= site_url('CisVue'); ?>" 
+		logo-url="<?= base_url('/public/images/logo-300x160.png'); ?>" 
+		avatar-url="<?= base_url('/cis/public/bild.php?src=person&person_id=' . getAuthPersonId()); ?>" 
+		logout-url="<?= site_url('Cis/Auth/logout'); ?>" 
+		:searchbaroptions="searchbaroptions" 
+		:searchfunction="searchfunction" />
 </header>
 <main id="cis-main" class="flex-grow-1 overflow-scroll p-4">

From 91e43bbc076afde26875db1e48c1ae0632cbd209 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 10 Mar 2023 09:28:57 +0100
Subject: [PATCH 0071/1461] Documents first draft

---
 application/controllers/Cis/Documents.php     | 134 ++++++++++++++++++
 application/models/crm/Konto_model.php        |  29 ++++
 .../models/crm/Prestudentstatus_model.php     |  71 ++++++++++
 application/views/Cis/Documents.php           |  99 +++++++++++++
 system/dbupdate_3.4/dbupdate_dashboard.php    |   2 +-
 system/phrasesupdate.php                      |  60 ++++++++
 6 files changed, 394 insertions(+), 1 deletion(-)
 create mode 100644 application/controllers/Cis/Documents.php
 create mode 100644 application/views/Cis/Documents.php

diff --git a/application/controllers/Cis/Documents.php b/application/controllers/Cis/Documents.php
new file mode 100644
index 000000000..98327e6f6
--- /dev/null
+++ b/application/controllers/Cis/Documents.php
@@ -0,0 +1,134 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * 
+ */
+class Documents extends Auth_Controller
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'index' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
+			'Semester' => ['student/anrechnung_beantragen:r','user:r'] // TODO(chris): permissions?
+		]);
+
+		$this->loadPhrases([
+			'global',
+			'tools'
+		]);
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * @param string		$stsem
+	 * @return void
+	 */
+	public function index($stsem = null)
+	{
+		return $this->Semester($stsem);
+	}
+
+	/**
+	 * @param string		$stsem
+	 * @return void
+	 */
+	public function Semester($stsem = null)
+	{
+		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
+		$this->load->model('crm/Konto_model', 'KontoModel');
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+
+		$uid = getAuthUID();
+		$studiengaenge = [];
+
+		$stati = $this->PrestudentstatusModel->loadWhereUid($uid, null, true);
+		if (isError($stati))
+			return $this->view->load('errors/html/error_db.php', [
+				'heading' => 'Database Error',
+				'message' => getError($stati)
+			]);
+		$stati = getData($stati);
+		if (!$stati)
+			return $this->view->load('errors/html/error_general.php', [
+				'heading' => 'User ist kein Student',
+				'message' => 'Es konnten keine Studiensemester gefunden werden in denen der User als Student inskripiert ist'
+			]);
+
+		$stsemArray = [];
+		foreach ($stati as $status) {
+			if (!isset($studiengaenge[$status->studiengang_kz])) {
+				$stg = $this->StudiengangModel->load($status->studiengang_kz);
+				if (isError($stg))
+					return $this->view->load('errors/html/error_db.php', [
+						'heading' => 'Database Error',
+						'message' => getError($stg)
+					]); 
+				$stg = getData($stg);
+				if (!$stg)
+					return $this->view->load('errors/html/error_db.php', [
+						'heading' => 'Database Error',
+						'message' => 'No Studiengang found for studiengang_kz ' . $status->studiengang_kz
+					]);
+				$studiengaenge[$status->studiengang_kz] = current($stg);
+			}
+			if (!isset($stsemArray[$status->studiensemester_kurzbz]))
+				$stsemArray[$status->studiensemester_kurzbz] = [];
+			// TODO(chris): maybe just use prestudent_id?
+			$stsemArray[$status->studiensemester_kurzbz][] = $status;
+		}
+
+		$hasSemester = true;
+		$inskriptionsbestaetigungen = [];
+		
+		if ($stsem && !isset($stsemArray[$stsem])) {
+			$hasSemester = false;
+		} else {
+			if (!$stsem)
+				$stsem = end($stsemArray);
+
+			#$stsemArray[$stsem] = array_unique($stsemArray[$stsem]);
+			
+			$buchungstypen = implode('\',\'', defined("CIS_DOKUMENTE_STUDIENBEITRAG_TYPEN") ? unserialize(CIS_DOKUMENTE_STUDIENBEITRAG_TYPEN) : []);
+
+			foreach ($stsemArray[$stsem] as $status) {
+				// NOTE(chris): multiple prestudentstatus for prestudent and semester
+				if (isset($inskriptionsbestaetigungen[$status->studiengang_kz]))
+					continue;
+				
+				$inskriptionsbestaetigungen[$status->studiengang_kz] = (boolean) getData($this->KontoModel->checkStudienbeitragFromPrestudent($status->prestudent_id, $stsem, $buchungstypen));
+			}
+		}
+
+		
+		// TODO(chris): in array stsem stsemArray:
+		// TODO(chris): - inskriptionsbestaetigung (konto)
+		// TODO(chris): - CIS_DOKUMENTE_STUDIENBUCHLBATT_DRUCKEN? studienbuchblatt
+		// TODO(chris): - CIS_DOKUMENTE_STUDIENERFOLGSBESTAETIGUNG_DRUCKEN? studienerfolgsbestaetigung
+		// TODO(chris): else: msg
+
+		// TODO(chris): CIS_DOKUMENTE_SELFSERVICE?: ...abschlussdokumente (akte)
+
+		$stsemArray = array_keys($stsemArray);
+		if (!$hasSemester)
+			array_unshift($stsemArray, $stsem);
+
+		$this->load->view('Cis/Documents', [
+			'uid' => $uid,
+			'stsem' => $stsem,
+			'stsemArray' => $stsemArray,
+			'hasSemester' => $hasSemester,
+			'studiengaenge' => $studiengaenge,
+			'inskriptionsbestaetigungen' => $inskriptionsbestaetigungen,
+			'studienbuchblatt' => defined('CIS_DOKUMENTE_STUDIENBUCHLBATT_DRUCKEN') && CIS_DOKUMENTE_STUDIENBUCHLBATT_DRUCKEN,
+			'studienerfolgsbestaetigung' => defined('CIS_DOKUMENTE_STUDIENERFOLGSBESTAETIGUNG_DRUCKEN') && CIS_DOKUMENTE_STUDIENERFOLGSBESTAETIGUNG_DRUCKEN
+		]);
+	}
+
+}
diff --git a/application/models/crm/Konto_model.php b/application/models/crm/Konto_model.php
index 4b2a259c9..31cb31551 100644
--- a/application/models/crm/Konto_model.php
+++ b/application/models/crm/Konto_model.php
@@ -123,4 +123,33 @@ class Konto_model extends DB_Model
 
 		return $this->execQuery($query);
 	}
+
+	/**
+	 * @param integer		$prestudent_id
+	 * @param string		$stsem
+	 * @param array			$buchungstypen
+	 * 
+	 * @return stdClass
+	 */
+	public function checkStudienbeitragFromPrestudent($prestudent_id, $stsem, $buchungstypen)
+	{
+		$this->addSelect($this->dbTable . '.buchungsnr');
+		$this->addSelect($this->dbTable . '.buchungsdatum');
+
+		$this->addJoin('public.tbl_prestudent s', $this->dbTable . '.person_id=s.person_id AND ' . $this->dbTable . '.studiengang_kz=s.studiengang_kz');
+
+		$this->db->where_in('buchungstyp_kurzbz', $buchungstypen);
+		$this->db->where('0 >= (
+			SELECT sum(betrag)
+			FROM ' . $this->dbTable . ' skonto
+			WHERE skonto.buchungsnr = ' . $this->dbTable . '.buchungsnr_verweis
+			OR skonto.buchungsnr_verweis = ' . $this->dbTable . '.buchungsnr_verweis
+		)', null, false);
+
+		return $this->loadWhere([
+			'prestudent_id' => $prestudent_id,
+			'studiensemester_kurzbz' => $stsem
+		]);
+	}
+
 }
diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php
index f39a41fda..859e9a375 100644
--- a/application/models/crm/Prestudentstatus_model.php
+++ b/application/models/crm/Prestudentstatus_model.php
@@ -13,6 +13,77 @@ class Prestudentstatus_model extends DB_Model
 		$this->hasSequence = false;
 	}
 
+	/**
+	 * loadWhereUid
+	 * 
+	 * loads all rows for a student_uid
+	 * 
+	 * @param string			$uid
+	 * @param array 			$where Optional. Default empty array
+	 * @param boolean 			$withPrestudent Optional. Default true
+	 * 
+	 * @return stdClass
+	 */
+	public function loadWhereUid($uid, $where = null, $withPrestudent = false)
+	{
+		$this->addSelect($this->dbTable . '.*');
+		$this->addJoin('public.tbl_student', 'prestudent_id');
+
+		if ($withPrestudent) {
+			$this->addJoin('public.tbl_prestudent s', 'prestudent_id');
+			$this->addSelect('s.aufmerksamdurch_kurzbz');
+			$this->addSelect('s.person_id');
+			$this->addSelect('s.studiengang_kz');
+			$this->addSelect('s.berufstaetigkeit_code');
+			$this->addSelect('s.ausbildungcode');
+			$this->addSelect('s.zgv_code');
+			$this->addSelect('s.zgvort');
+			$this->addSelect('s.zgvdatum');
+			$this->addSelect('s.zgvmas_code');
+			$this->addSelect('s.zgvmaort');
+			$this->addSelect('s.zgvmadatum');
+			$this->addSelect('s.aufnahmeschluessel');
+			$this->addSelect('s.facheinschlberuf');
+			$this->addSelect('s.reihungstest_id');
+			$this->addSelect('s.anmeldungreihungstest');
+			$this->addSelect('s.reihungstestangetreten');
+			$this->addSelect('s.rt_gesamtpunkte');
+			$this->addSelect('s.bismelden');
+			$this->addSelect('s.dual');
+			$this->addSelect('s.rt_punkte1');
+			$this->addSelect('s.rt_punkte2');
+			$this->addSelect('s.ausstellungsstaat');
+			$this->addSelect('s.rt_punkte3');
+			$this->addSelect('s.zgvdoktor_code');
+			$this->addSelect('s.zgvdoktorort');
+			$this->addSelect('s.zgvdoktordatum');
+			$this->addSelect('s.mentor');
+			$this->addSelect('s.zgvnation');
+			$this->addSelect('s.zgvmanation');
+			$this->addSelect('s.zgvdoktornation');
+			$this->addSelect('s.gsstudientyp_kurzbz');
+			$this->addSelect('s.aufnahmegruppe_kurzbz');
+			$this->addSelect('s.udf_values');
+			$this->addSelect('s.priorisierung');
+			$this->addSelect('s.foerderrelevant');
+			$this->addSelect('s.standort_code');
+			$this->addSelect('s.zgv_erfuellt');
+			$this->addSelect('s.zgvmas_erfuellt');
+			$this->addSelect('s.zgvdoktor_erfuellt');
+		}
+
+
+		$this->addOrder('datum');
+		$this->addOrder('insertamum');
+
+		if (!$where)
+			$where = [];
+
+		$where['student_uid'] = $uid;
+
+		return $this->loadWhere($where);
+	}
+
 	/**
 	 * getLastStatus
 	 */
diff --git a/application/views/Cis/Documents.php b/application/views/Cis/Documents.php
new file mode 100644
index 000000000..f927bc053
--- /dev/null
+++ b/application/views/Cis/Documents.php
@@ -0,0 +1,99 @@
+<?php
+$includesArray = array();
+
+$this->load->view('templates/CISHTML-Header', $includesArray);
+?>
+
+<div id="content">
+	<h2>Documents</h2>
+	<hr>
+	<div class="mb-3">
+		<select class="form-select" onchange="location = this.value">
+			<?php foreach ($stsemArray as $sem) { ?>
+				<option value="<?= site_url('Cis/Documents/Semester/' . $sem); ?>"<?= $sem == $stsem ? ' selected': ''; ?>>
+					<?= $sem; ?>
+				</option>
+			<?php } ?>
+		</select>
+	</div>
+
+	<?php if ($hasSemester) { ?>
+		<h3><?= $this->p->t('tools', 'inskriptionsbestaetigung'); ?></h3>
+		<ul class="list-unstyled">
+			<?php foreach ($inskriptionsbestaetigungen as $stg => $hasPaid) { ?>
+				<?php if (count($studiengaenge) != 1) { ?>
+					<li>
+						<b><?= $studiengaenge[$stg]->bezeichnung; ?></b>
+					</li>
+				<?php } ?>
+				<?php if ($hasPaid) { ?>
+					<li>
+						<a class="text-decoration-none" target="_blank" href="<?= base_url('cis/private/pdfExport.php?xsl=Inskription&xml=student.rdf.php&ss=' . $stsem . '&uid=' . $uid . '&xsl_stg_kz=' . $stg); ?>">
+							<img class="align-baseline" src="<?= base_url('skin/images/pdfpic.gif'); ?>" alt="PDF"> <?= $this->p->t('tools', 'inskriptionsbestaetigung') . ' ' . $stsem; ?>
+						</a>
+					</li>
+				<?php } else { ?>
+					<li class="text-danger">
+						<?= $this->p->t('tools', 'studienbeitragFuerSSNochNichtBezahlt', ['stsem' => $stsem]); ?>
+					</li>
+				<?php } ?>
+			<?php } ?>
+		</ul>
+		<?php if ($studienbuchblatt) { ?>
+			<h3><?= $this->p->t('tools', 'studienbuchblatt'); ?></h3>
+			<ul class="list-unstyled">
+				<?php foreach ($inskriptionsbestaetigungen as $stg => $hasPaid) { ?>
+					<?php if (count($studiengaenge) != 1) { ?>
+						<li>
+							<b><?= $studiengaenge[$stg]->bezeichnung; ?></b>
+						</li>
+					<?php } ?>
+					<?php if ($hasPaid) { ?>
+						<li>
+							<?php /* TODO(chris): studiengang_kz? */ ?>
+							<a class="text-decoration-none" target="_blank" href="<?= base_url('cis/private/pdfExport.php?xsl=Studienblatt&xml=studienblatt.xml.php&ss=' . $stsem . '&uid=' . $uid); ?>">
+								<img class="align-baseline" src="<?= base_url('skin/images/pdfpic.gif'); ?>" alt="PDF"> <?= $this->p->t('tools', 'studienbuchblatt') . ' ' . $stsem; ?>
+							</a>
+						</li>
+					<?php } else { ?>
+						<li class="text-danger">
+							<?= $this->p->t('tools', 'studienbeitragFuerSSNochNichtBezahlt', ['stsem' => $stsem]); ?>
+						</li>
+					<?php } ?>
+				<?php } ?>
+			</ul>
+		<?php } ?>
+		<?php if ($studienerfolgsbestaetigung) { ?>
+			<h3><?= $this->p->t('tools', 'studienerfolgsbestaetigung'); ?></h3>
+			<ul class="list-unstyled">
+				<?php foreach ($studiengaenge as $stg => $bezeichnung) { ?>
+					<?php if (count($studiengaenge) != 1) { ?>
+						<li>
+							<b><?= $bezeichnung; ?></b>
+						</li>
+					<?php } ?>
+					<?php foreach (['' => '&typ=finanzamt', ' (' . $this->p->t('tools', 'vorlageWohnsitzfinanzamt') . ')' => ''] as $finanz_bez => $finanz_param) { ?>
+						<?php foreach (['de' => [$this->p->t('public', 'deutsch'), 'Studienerfolg'], 'en' => [$this->p->t('public', 'englisch'), 'StudienerfolgEng']] as $lang_kurz => $lang) { ?>
+							<?php foreach ([$stsem => $stsem, $this->p->t('tools', 'alleStudiensemester') => 'alle&all=1'] as $sem_bez => $sem_param) { ?>
+								<li>
+									<a class="text-decoration-none" target="_blank" href="<?= base_url('cis/private/pdfExport.php?xsl=' . $lang[1] . '&xml=studienerfolg.rdf.php&ss=' . $sem_param . '&uid=' . $uid . $finanz_param); ?>">
+										<img class="align-baseline" src="<?= base_url('skin/images/pdfpic.gif'); ?>" alt="PDF"> <?= $this->p->t('tools', 'studienerfolgsbestaetigung') . ' ' . $sem_bez . ' ' . $lang[0] . $finanz_bez; ?>
+									</a>
+								</li>
+								<?php /* TODO(chris): Finanzamt $this->p->t('tools/vorlageWohnsitzfinanzamt') */ ?>
+							<?php } ?>
+						<?php } ?>
+					<?php } ?>
+				<?php } ?>
+			</ul>
+		<?php } ?>
+	<?php } else { ?>
+		<div class="alert alert-danger" role="alert">
+			<?= $this->p->t('tools', 'keinStatusImStudiensemester', ['stsem' => $stsem]); ?>
+		</div>
+	<?php } ?>
+	TODO(chris): IMPLEMENT!
+	
+</div>
+
+<?php $this->load->view('templates/CISHTML-Footer', $includesArray); ?>
diff --git a/system/dbupdate_3.4/dbupdate_dashboard.php b/system/dbupdate_3.4/dbupdate_dashboard.php
index 22c2ef4cf..dcd0e6600 100644
--- a/system/dbupdate_3.4/dbupdate_dashboard.php
+++ b/system/dbupdate_3.4/dbupdate_dashboard.php
@@ -25,7 +25,7 @@ if (! defined('DB_NAME')) exit('No direct script access allowed');
 if (($result = $db->db_query("SELECT schema_name FROM information_schema.schemata WHERE schema_name='dashboard'")))
 {
 	if ($db->db_num_rows($result) == 0)
-	{
+	{// TODO(chris): Rechte "Web"?
 		$qry = <<<EODASHBOARDSQL
 		
 --
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 16a5c77ab..78807f26d 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -17337,6 +17337,66 @@ array(
 				'insertvon' => 'system'
 			)
 		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'tools',
+		'phrase' => 'keinStatusImStudiensemester',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Für das übergebene Studiensemester {stsem} existiert kein Status. Bitte wählen Sie ein gültiges Studiensemester aus dem DropDown.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No status found for {stsem}. Please select a valid semester from the dropdown.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'tools',
+		'phrase' => 'inskriptionsbestaetigung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Studienbestätigung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Enrollment Confirmation',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'tools',
+		'phrase' => 'studienbeitragFuerSSNochNichtBezahlt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Studienbeitrag für das {stsem} noch nicht bezahlt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'tuition fee for semester {stsem} not yet paid',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
 	)
 );
 

From 83c0413815e5580956a21c520a889924bb9b2eeb Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 10 Mar 2023 10:29:54 +0100
Subject: [PATCH 0072/1461] code quality

---
 application/controllers/Test.php              |   1 -
 application/controllers/dashboard/Api.php     | 116 +++++++++---------
 application/controllers/dashboard/Config.php  |  48 +++-----
 .../controllers/dashboard/Dashboard.php       |   9 +-
 .../controllers/dashboard/DashboardDemo.php   |   1 -
 application/controllers/dashboard/Widget.php  |  13 +-
 .../libraries/dashboard/DashboardLib.php      |  53 ++++----
 application/models/content/News_model.php     |  27 ++--
 .../dashboard/Dashboard_Preset_model.php      |   2 +-
 .../dashboard/Dashboard_Widget_model.php      |   1 -
 application/models/dashboard/Widget_model.php |   1 -
 .../views/dashboard/dashboard_demo.php        |   3 +-
 application/views/test/Admin.php              |   3 +-
 application/views/test/Test.php               |   3 +-
 14 files changed, 135 insertions(+), 146 deletions(-)

diff --git a/application/controllers/Test.php b/application/controllers/Test.php
index 497f12f85..bbb759606 100644
--- a/application/controllers/Test.php
+++ b/application/controllers/Test.php
@@ -59,5 +59,4 @@ class Test extends Auth_Controller
 
         if (!$this->_uid) show_error('User authentification failed');
     }
-
 }
diff --git a/application/controllers/dashboard/Api.php b/application/controllers/dashboard/Api.php
index c6ac21463..3473afe61 100644
--- a/application/controllers/dashboard/Api.php
+++ b/application/controllers/dashboard/Api.php
@@ -3,76 +3,74 @@ defined('BASEPATH') || exit('No direct script access allowed');
 
 class Api extends Auth_Controller
 {
-    public function __construct()
-    {
-        parent::__construct(
-            array(
-                'index'		=> 'dashboard/admin:rw',
-                'getNews'	=> 'dashboard/admin:rw',
-                'getAmpeln'	=> 'dashboard/admin:rw',
-            )
-        );
+	public function __construct()
+	{
+		parent::__construct(
+			array(
+				'index'		=> 'dashboard/admin:rw',
+				'getNews'	=> 'dashboard/admin:rw',
+				'getAmpeln'	=> 'dashboard/admin:rw',
+			)
+		);
 
-        $this->load->library('AuthLib', null, 'AuthLib');
+		$this->load->library('AuthLib', null, 'AuthLib');
 
-        $this->_setAuthUID();
-    }
+		$this->_setAuthUID();
+	}
 
-    public function index()
-    {
-        echo 'Dashboard API Controller';
-    }
+	public function index()
+	{
+		echo 'Dashboard API Controller';
+	}
 
-    /**
-     * Get News.
-     */
-    public function getNews()
-    {
-        $limit =  $this->input->get('limit');
+	/**
+	 * Get News.
+	 */
+	public function getNews()
+	{
+		$limit =  $this->input->get('limit');
 
-        $this->load->model('content/News_model', 'NewsModel');
+		$this->load->model('content/News_model', 'NewsModel');
 
-        $result = $this->NewsModel->getAll($limit);
+		$result = $this->NewsModel->getAll($limit);
 
-        if(hasData($result))
-        {
-
-            $this->outputJson(getData($result), REST_Controller::HTTP_OK);
-        }
-        else
-        {
-            $this->terminateWithJsonError('fehler entdeckt');
-        }
-    }
+		if (hasData($result))
+		{
+			$this->outputJson(getData($result), REST_Controller::HTTP_OK);
+		}
+		else
+		{
+			$this->terminateWithJsonError('fehler entdeckt');
+		}
+	}
 
 
-    /**
-     * Get Ampeln.
-     */
-    public function getAmpeln(){
+	/**
+	 * Get Ampeln.
+	 */
+	public function getAmpeln()
+	{
 
-        $this->load->model('content/Ampel_model', 'AmpelModel');
-        $result = $this->AmpelModel->getByUser($this->_uid);
+		$this->load->model('content/Ampel_model', 'AmpelModel');
+		$result = $this->AmpelModel->getByUser($this->_uid);
 
-        if(hasData($result))
-        {
+		if (hasData($result))
+		{
+			$this->outputJson(getData($result), REST_Controller::HTTP_OK);
+		}
+		else
+		{
+			$this->terminateWithJsonError('fehler entdeckt');
+		}
+	}
 
-            $this->outputJson(getData($result), REST_Controller::HTTP_OK);
-        }
-        else
-        {
-            $this->terminateWithJsonError('fehler entdeckt');
-        }
+	/**
+	 * Retrieve the UID of the logged user and checks if it is valid
+	 */
+	private function _setAuthUID()
+	{
+		$this->_uid = getAuthUID();
 
-    }
-
-    /**
-     * Retrieve the UID of the logged user and checks if it is valid
-     */
-    private function _setAuthUID()
-    {
-        $this->_uid = getAuthUID();
-
-        if (!$this->_uid) show_error('User authentification failed');
-    }
+		if (!$this->_uid) show_error('User authentification failed');
+	}
 }
diff --git a/application/controllers/dashboard/Config.php b/application/controllers/dashboard/Config.php
index b9c4c6c31..444597ce5 100644
--- a/application/controllers/dashboard/Config.php
+++ b/application/controllers/dashboard/Config.php
@@ -29,7 +29,7 @@ class Config extends Auth_Controller
 		$this->load->model('ressource/Funktion_model', 'FunktionModel');
 	}
 	
-	public function index() 
+	public function index()
 	{
 		$dashboard_kurzbz = $this->input->get('db');
 		$uid = $this->AuthLib->getAuthObj()->username;
@@ -46,7 +46,7 @@ class Config extends Auth_Controller
 		$this->outputJsonSuccess($mergedconfig);
 	}
 	
-	public function genWidgetId() 
+	public function genWidgetId()
 	{
 		$dashboard_kurzbz = $this->input->get('db');
 		$widgetid = $this->DashboardLib->generateWidgetId($dashboard_kurzbz);
@@ -55,23 +55,22 @@ class Config extends Auth_Controller
 		));
 	}
 	
-	public function addWidgetsToPreset() 
+	public function addWidgetsToPreset()
 	{
 		$input = json_decode($this->input->raw_input_stream);
 		$dashboard_kurzbz = $input->db;
 		$funktion_kurzbz = $input->funktion_kurzbz;
 		
-		$preset = $this->DashboardLib->getPresetOrCreateEmptyPreset($dashboard_kurzbz, $funktion_kurzbz);		
+		$preset = $this->DashboardLib->getPresetOrCreateEmptyPreset($dashboard_kurzbz, $funktion_kurzbz);
 		
 		$preset_decoded = json_decode($preset->preset, true);
 		
-		$this->DashboardLib->addWidgetsToWidgets($preset_decoded['widgets'], 
-			$dashboard_kurzbz, $funktion_kurzbz, $input->widgets);
+		$this->DashboardLib->addWidgetsToWidgets($preset_decoded['widgets'], $dashboard_kurzbz, $funktion_kurzbz, $input->widgets);
 		
 		$preset->preset = json_encode($preset_decoded);
 				
 		$result = $this->DashboardLib->insertOrUpdatePreset($preset);
-		if( isError($result) ) {
+		if (isError($result)) {
 			http_response_code(500);
 			$this->terminateWithJsonError('preset could not be saved');
 		}
@@ -87,16 +86,13 @@ class Config extends Auth_Controller
 		$widgetid = $input->widgetid;
 				
 		$preset = $this->DashboardLib->getPreset($dashboard_kurzbz, $funktion_kurzbz);
-		if( $preset === null ) {
+		if ($preset === null) {
 			http_response_code(404);
-			$this->terminateWithJsonError('preset for dashboard ' 
-				. $dashboard_kurzbz . ' and funktion ' . $funktion_kurzbz 
-				. ' not found.');
+			$this->terminateWithJsonError('preset for dashboard ' . $dashboard_kurzbz . ' and funktion ' . $funktion_kurzbz . ' not found.');
 		}
 		
 		$preset_decoded = json_decode($preset->preset, true);
-		if (!$this->DashboardLib->removeWidgetFromWidgets($preset_decoded['widgets'], 
-			$funktion_kurzbz, $widgetid))
+		if (!$this->DashboardLib->removeWidgetFromWidgets($preset_decoded['widgets'], $funktion_kurzbz, $widgetid))
 		{
 			http_response_code(404);
 			$this->terminateWithJsonError('widgetid ' . $widgetid . ' not found');
@@ -104,32 +100,31 @@ class Config extends Auth_Controller
 		
 		$preset->preset = json_encode($preset_decoded);
 		$result = $this->DashboardLib->insertOrUpdatePreset($preset);
-		if( isError($result) ) 
+		if (isError($result))
 		{
 			http_response_code(500);
-			$this->terminateWithJsonError('failed to remove widget');	
+			$this->terminateWithJsonError('failed to remove widget');
 		}
 		$this->outputJsonSuccess(array('msg' => 'preset successfully updated.'));
 	}
 
-	public function addWidgetsToUserOverride() 
+	public function addWidgetsToUserOverride()
 	{
 		$input = json_decode($this->input->raw_input_stream);
 		$dashboard_kurzbz = $input->db;
 		$funktion_kurzbz = $input->funktion_kurzbz;
 		$uid = $this->AuthLib->getAuthObj()->username;
 		
-		$override = $this->DashboardLib->getOverrideOrCreateEmptyOverride($dashboard_kurzbz, $uid);		
+		$override = $this->DashboardLib->getOverrideOrCreateEmptyOverride($dashboard_kurzbz, $uid);
 		
 		$override_decoded = json_decode($override->override, true);
 
-		$this->DashboardLib->addWidgetsToWidgets($override_decoded['widgets'], 
-			$dashboard_kurzbz, $funktion_kurzbz, $input->widgets);
+		$this->DashboardLib->addWidgetsToWidgets($override_decoded['widgets'], $dashboard_kurzbz, $funktion_kurzbz, $input->widgets);
 		
 		$override->override = json_encode($override_decoded);
 				
 		$result = $this->DashboardLib->insertOrUpdateOverride($override);
-		if( isError($result) ) {
+		if (isError($result)) {
 			http_response_code(500);
 			$this->terminateWithJsonError('override could not be saved');
 		}
@@ -146,16 +141,14 @@ class Config extends Auth_Controller
 		$widgetid = $input->widgetid;
 		
 		$override = $this->DashboardLib->getOverride($dashboard_kurzbz, $uid);
-		if( empty($override) ) {
+		if (empty($override)) {
 			http_response_code(404);
-			$this->terminateWithJsonError('userconfig for dashboard ' 
-				. $dashboard_kurzbz . ' not found.');
+			$this->terminateWithJsonError('userconfig for dashboard ' . $dashboard_kurzbz . ' not found.');
 		}
 		
 		$override_decoded = json_decode($override->override, true);
 		
-		if( !$this->DashboardLib->removeWidgetFromWidgets($override_decoded['widgets'], 
-			$funktion_kurzbz, $widgetid) )
+		if (!$this->DashboardLib->removeWidgetFromWidgets($override_decoded['widgets'], $funktion_kurzbz, $widgetid))
 		{
 			http_response_code(404);
 			$this->terminateWithJsonError('widgetid ' . $widgetid . ' not found');
@@ -163,10 +156,10 @@ class Config extends Auth_Controller
 		
 		$override->override = json_encode($override_decoded);
 		$result = $this->DashboardLib->insertOrUpdateOverride($override, $uid);
-		if( isError($result) ) 
+		if (isError($result))
 		{
 			http_response_code(500);
-			$this->terminateWithJsonError('failed to remove widget');	
+			$this->terminateWithJsonError('failed to remove widget');
 		}
 		$this->outputJsonSuccess(array('msg' => 'override successfully updated.'));
 	}
@@ -220,5 +213,4 @@ class Config extends Auth_Controller
 
 		return $this->outputJsonSuccess($result);
 	}
-	
 }
diff --git a/application/controllers/dashboard/Dashboard.php b/application/controllers/dashboard/Dashboard.php
index 8cf37d579..e827a0c7c 100644
--- a/application/controllers/dashboard/Dashboard.php
+++ b/application/controllers/dashboard/Dashboard.php
@@ -22,7 +22,7 @@ class Dashboard extends Auth_Controller
 		$this->load->model('dashboard/Dashboard_model', 'DashboardModel');
 	}
 	
-	public function index() 
+	public function index()
 	{
 		$result = $this->DashboardModel->load();
 
@@ -36,7 +36,7 @@ class Dashboard extends Auth_Controller
 		return $this->outputJsonSuccess(getData($result) ?: []);
 	}
 	
-	public function Create() 
+	public function Create()
 	{
 		$input = $this->getPostJSON();
 
@@ -52,7 +52,7 @@ class Dashboard extends Auth_Controller
 		return $this->outputJsonSuccess(getData($result) ?: []);
 	}
 	
-	public function Update() 
+	public function Update()
 	{
 		$input = $this->getPostJSON();
 
@@ -68,7 +68,7 @@ class Dashboard extends Auth_Controller
 		return $this->outputJsonSuccess(getData($result) ?: []);
 	}
 	
-	public function Delete() 
+	public function Delete()
 	{
 		$input = $this->getPostJSON();
 
@@ -83,5 +83,4 @@ class Dashboard extends Auth_Controller
 		
 		return $this->outputJsonSuccess(getData($result) ?: []);
 	}
-	
 }
diff --git a/application/controllers/dashboard/DashboardDemo.php b/application/controllers/dashboard/DashboardDemo.php
index 7088c44b9..9822fafc5 100644
--- a/application/controllers/dashboard/DashboardDemo.php
+++ b/application/controllers/dashboard/DashboardDemo.php
@@ -47,5 +47,4 @@ class DashboardDemo extends Auth_Controller
 
         if (!$this->_uid) show_error('User authentification failed');
     }
-
 }
diff --git a/application/controllers/dashboard/Widget.php b/application/controllers/dashboard/Widget.php
index 07c57ea73..0da6fe8da 100644
--- a/application/controllers/dashboard/Widget.php
+++ b/application/controllers/dashboard/Widget.php
@@ -23,7 +23,7 @@ class Widget extends Auth_Controller
 		$this->load->model('dashboard/Dashboard_Widget_model', 'DashboardWidgetModel');
 	}
 	
-	public function index() 
+	public function index()
 	{
 		$widget_id = $this->input->get('id');
 
@@ -48,7 +48,7 @@ class Widget extends Auth_Controller
 		return $this->outputJsonSuccess(current(getData($widget)));
 	}
 	
-	public function getAll() 
+	public function getAll()
 	{
 		$dashboard_id = $this->input->get('dashboard_id');
 		$result = $this->WidgetModel->getWithAllowedForDashboard($dashboard_id);
@@ -59,7 +59,7 @@ class Widget extends Auth_Controller
 		$this->outputJsonSuccess(getData($result) ?: []);
 	}
 	
-	public function getWidgetsForDashboard() 
+	public function getWidgetsForDashboard()
 	{
 		$db = $this->input->get('db');
 		$result = $this->WidgetModel->getForDashboard($db);
@@ -74,7 +74,8 @@ class Widget extends Auth_Controller
 		$this->outputJsonSuccess(getData($result) ?: []);
 	}
 	
-	public function setAllowed() {
+	public function setAllowed()
+	{
 		$input = $this->getPostJSON();
 
 		$dashboard_id = $input->dashboard_id;
@@ -83,12 +84,12 @@ class Widget extends Auth_Controller
 
 		if ($action == 'add') {
 			$result = $this->DashboardWidgetModel->insert([
-				'dashboard_id' => $dashboard_id, 
+				'dashboard_id' => $dashboard_id,
 				'widget_id' => $widget_id
 			]);
 		} elseif ($action == 'delete') {
 			$result = $this->DashboardWidgetModel->delete([
-				'dashboard_id' => $dashboard_id, 
+				'dashboard_id' => $dashboard_id,
 				'widget_id' => $widget_id
 			]);
 		} else {
diff --git a/application/libraries/dashboard/DashboardLib.php b/application/libraries/dashboard/DashboardLib.php
index 3f189fc03..b9062fdce 100644
--- a/application/libraries/dashboard/DashboardLib.php
+++ b/application/libraries/dashboard/DashboardLib.php
@@ -1,5 +1,8 @@
 <?php
 defined('BASEPATH') || exit('No direct script access allowed');
+
+use \stdClass as stdClass;
+
 /**
  * Description of DashboardLib
  *
@@ -14,7 +17,7 @@ class DashboardLib
 	
 	private $_ci; // CI instance
 	
-	public function __construct($params=null)
+	public function __construct($params = null)
 	{
 		// Loads CI instance
 		$this->_ci =& get_instance();
@@ -24,25 +27,24 @@ class DashboardLib
 		$this->_ci->load->model('dashboard/Dashboard_Override_model', 'DashboardOverrideModel');
 	}
 
-	public function generateWidgetId($dashboard_kurzbz='') 
+	public function generateWidgetId($dashboard_kurzbz = '')
 	{
-		$dashboard_kurzbz = (!empty($dashboard_kurzbz)) ? $dashboard_kurzbz 
-			: self::DEFAULT_DASHBOARD_KURZBZ;
-		$widgetid_input = time() . '_' . $dashboard_kurzbz . '_' 
-			. bin2hex(random_bytes(self::WIDGET_ID_RANDOM_BYTES));
+		$dashboard_kurzbz = (!empty($dashboard_kurzbz)) ? $dashboard_kurzbz : self::DEFAULT_DASHBOARD_KURZBZ;
+		$widgetid_input = time() . '_' . $dashboard_kurzbz . '_' . bin2hex(random_bytes(self::WIDGET_ID_RANDOM_BYTES));
 		$widgetid = md5($widgetid_input);
 		return $widgetid;
 	}
 	
 	public function getDashboardByKurzbz($dashboard_kurzbz) 
 	{
-		$dashboard = null;
 		$result = $this->_ci->DashboardModel->getDashboardByKurzbz($dashboard_kurzbz);
-		if( isSuccess($result) && ($dashboards = getData($result)) ) 
+
+		if (hasData($result)) 
 		{
-			$dashboard = $dashboards[0];
+			return current(getData($result))
 		}
-		return $dashboard;
+
+		return null;
 	}
 	
 	public function getMergedConfig($dashboard_id, $uid) 
@@ -60,12 +62,13 @@ class DashboardLib
 		$res_presets = $this->_ci->DashboardPresetModel->getPresets($dashboard_id, $uid);
 		$defaultconfig = array();
 		
-		if( isSuccess($res_presets) && hasData($res_presets) ) 
+		if (hasData($res_presets))
 		{
 			$presets = getData($res_presets);
 			foreach ($presets as $presetobj)
 			{
-				if( null !== ($preset = json_decode($presetobj->preset, true)) )
+				$preset = json_decode($presetobj->preset, true);
+				if (null !== $preset)
 				{
 					$defaultconfig = array_replace_recursive($defaultconfig, 
 						$preset);
@@ -79,18 +82,18 @@ class DashboardLib
 	public function getUserConfig($dashboard_id, $uid)
 	{
 		$res_userconfig = $this->_ci->DashboardOverrideModel->getOverride($dashboard_id, $uid);
-		$userconfig = array();
 		
-		if( isSuccess($res_userconfig) && hasData($res_userconfig) ) 
+		if (hasData($res_userconfig))
 		{
 			$data = getData($res_userconfig);
-			if( null !== ($decodedconfig = json_decode($data[0]->override, true)) )
+			$decodedconfig = json_decode(current($data)->override, true);
+			if (null !==  $decodedconfig)
 			{
-				$userconfig = $decodedconfig;
+				return $decodedconfig;
 			}
 		}
 		
-		return $userconfig;
+		return [];
 	}
 	
 	public function getOverrideOrCreateEmptyOverride($dashboard_kurzbz, $uid) 
@@ -123,7 +126,7 @@ class DashboardLib
 		$emptypreset->dashboard_id = $dashboard->dashboard_id;
 		$emptypreset->funktion_kurzbz = $funktion_kurzbz;
 		$section = ($funktion_kurzbz !== null) ? $funktion_kurzbz : self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL;
-		$emptypreset->preset = '{"widgets": {"' . $funktion_kurzbz . '": {}}}';
+		$emptypreset->preset = '{"widgets": {"' . $section . '": {}}}';
 		
 		return $emptypreset;
 	}
@@ -131,34 +134,32 @@ class DashboardLib
 	public function getPreset($dashboard_kurzbz, $section) 
 	{
 		$dashboard = $this->getDashboardByKurzbz($dashboard_kurzbz);
-		$preset = null;
 		
 		$funktion_kurzbz = ($section === self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL) ? null : $section;
 		$result = $this->_ci->DashboardPresetModel
 			->getPresetByDashboardAndFunktion($dashboard->dashboard_id, $funktion_kurzbz);
 		
-		if( isSuccess($result) && hasData($result) && ($presets = getData($result)) ) 
+		if (hasData($result)) 
 		{
-			$preset = $presets[0];
+			return current(getData($result));
 		}
 		
-		return $preset;
+		return null;
 	}
 
 	public function getOverride($dashboard_kurzbz, $uid) 
 	{
 		$dashboard = $this->getDashboardByKurzbz($dashboard_kurzbz);
-		$override = null;
 		
 		$result = $this->_ci->DashboardOverrideModel
 			->getOverride($dashboard->dashboard_id, $uid);
 		
-		if( isSuccess($result) && hasData($result) && ($overrides = getData($result)) ) 
+		if (hasData($result)) 
 		{
-			$override = $overrides[0];
+			return current(getData($result));
 		}
 		
-		return $override;
+		return null;
 	}
 	
 	public function insertOrUpdatePreset($preset) 
diff --git a/application/models/content/News_model.php b/application/models/content/News_model.php
index 472eb2e56..ce42aa2db 100644
--- a/application/models/content/News_model.php
+++ b/application/models/content/News_model.php
@@ -12,18 +12,17 @@ class News_model extends DB_Model
 		$this->pk = 'news_id';
 	}
 
-    /**
-     * Get all News ordered by date. (most actual on top)
-     * @param null $limit   Amount of news.
-     * @return array
-     */
-    public function getAll($limit = null)
-    {
-        return $this->loadWhere('
-            text IS NOT NULL
-            AND datum <= NOW() AND (datum_bis IS NULL OR datum_bis >= now()::date)
-            ORDER BY datum DESC
-            LIMIT '. $this->escape($limit)
-        );
-    }
+	/**
+	 * Get all News ordered by date. (most actual on top)
+	 * @param null $limit   Amount of news.
+	 * @return array
+	 */
+	public function getAll($limit = null)
+	{
+		return $this->loadWhere('
+			text IS NOT NULL
+			AND datum <= NOW() AND (datum_bis IS NULL OR datum_bis >= now()::date)
+			ORDER BY datum DESC
+			LIMIT '. $this->escape($limit));
+	}
 }
diff --git a/application/models/dashboard/Dashboard_Preset_model.php b/application/models/dashboard/Dashboard_Preset_model.php
index c899195d4..ca10ce98a 100644
--- a/application/models/dashboard/Dashboard_Preset_model.php
+++ b/application/models/dashboard/Dashboard_Preset_model.php
@@ -60,7 +60,7 @@ EOSQL;
 	 * @param string funktion_kurzbz
 	 * @return array
 	 */
-	public function getPresetByDashboardAndFunktion($dashboard_id, $funktion_kurzbz) 
+	public function getPresetByDashboardAndFunktion($dashboard_id, $funktion_kurzbz)
 	{
 		return $this->loadWhere(array('dashboard_id' => $dashboard_id, 'funktion_kurzbz' => $funktion_kurzbz));
 	}
diff --git a/application/models/dashboard/Dashboard_Widget_model.php b/application/models/dashboard/Dashboard_Widget_model.php
index eb4540cd9..9e0a4c200 100644
--- a/application/models/dashboard/Dashboard_Widget_model.php
+++ b/application/models/dashboard/Dashboard_Widget_model.php
@@ -12,5 +12,4 @@ class Dashboard_Widget_model extends DB_Model
 		$this->pk = ['dashboard_id', 'widget_id'];
 		$this->hasSequence = false;
 	}
-
 }
diff --git a/application/models/dashboard/Widget_model.php b/application/models/dashboard/Widget_model.php
index 554c7dea6..b1160e28f 100644
--- a/application/models/dashboard/Widget_model.php
+++ b/application/models/dashboard/Widget_model.php
@@ -29,5 +29,4 @@ class Widget_model extends DB_Model
 
 		return $this->loadWhere(['dashboard_kurzbz' => $db]);
 	}
-
 }
diff --git a/application/views/dashboard/dashboard_demo.php b/application/views/dashboard/dashboard_demo.php
index 3518d769a..8efc230b7 100644
--- a/application/views/dashboard/dashboard_demo.php
+++ b/application/views/dashboard/dashboard_demo.php
@@ -1,5 +1,6 @@
 <?php
-$this->load->view('templates/FHC-Header',
+$this->load->view(
+	'templates/FHC-Header',
 	array(
 		'title' => 'FH-Complete',
 		'bootstrap5' => true,
diff --git a/application/views/test/Admin.php b/application/views/test/Admin.php
index 837f6411b..c5fa8b64c 100644
--- a/application/views/test/Admin.php
+++ b/application/views/test/Admin.php
@@ -1,5 +1,6 @@
 <?php
-$this->load->view('templates/FHC-Header',
+$this->load->view(
+	'templates/FHC-Header',
 	array(
 		'title' => 'FH-Complete',
 		'bootstrap5' => true,
diff --git a/application/views/test/Test.php b/application/views/test/Test.php
index d297bf4ec..328b45fba 100644
--- a/application/views/test/Test.php
+++ b/application/views/test/Test.php
@@ -1,5 +1,6 @@
 <?php
-$this->load->view('templates/FHC-Header',
+$this->load->view(
+	'templates/FHC-Header',
 	array(
 		'title' => 'FH-Complete',
 		'bootstrap5' => true,

From 2238b872c60949b7b21d547830e64393014ee155 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 13 Mar 2023 09:01:45 +0100
Subject: [PATCH 0073/1461] Documents Self Service

---
 application/controllers/Cis/Documents.php |  15 ++-
 application/models/crm/Akte_model.php     |  51 +++++++
 application/views/Cis/Documents.php       | 156 +++++++++++++---------
 public/css/Cis4/Cis.css                   |  41 ++++++
 4 files changed, 200 insertions(+), 63 deletions(-)

diff --git a/application/controllers/Cis/Documents.php b/application/controllers/Cis/Documents.php
index 98327e6f6..20380ca5a 100644
--- a/application/controllers/Cis/Documents.php
+++ b/application/controllers/Cis/Documents.php
@@ -106,6 +106,18 @@ class Documents extends Auth_Controller
 			}
 		}
 
+		$selfservice = null;
+		if (!defined('CIS_DOKUMENTE_SELFSERVICE') || CIS_DOKUMENTE_SELFSERVICE) {
+			$this->load->model('crm/Akte_model', 'AkteModel');
+			$result = $this->AkteModel->getArchiv(getAuthPersonId(), null, true);
+			if (isError($result))
+				return $this->view->load('errors/html/error_db.php', [
+					'heading' => 'Database Error',
+					'message' => getError($result)
+				]);
+			$selfservice = getData($result) ?: [];
+		}
+
 		
 		// TODO(chris): in array stsem stsemArray:
 		// TODO(chris): - inskriptionsbestaetigung (konto)
@@ -127,7 +139,8 @@ class Documents extends Auth_Controller
 			'studiengaenge' => $studiengaenge,
 			'inskriptionsbestaetigungen' => $inskriptionsbestaetigungen,
 			'studienbuchblatt' => defined('CIS_DOKUMENTE_STUDIENBUCHLBATT_DRUCKEN') && CIS_DOKUMENTE_STUDIENBUCHLBATT_DRUCKEN,
-			'studienerfolgsbestaetigung' => defined('CIS_DOKUMENTE_STUDIENERFOLGSBESTAETIGUNG_DRUCKEN') && CIS_DOKUMENTE_STUDIENERFOLGSBESTAETIGUNG_DRUCKEN
+			'studienerfolgsbestaetigung' => defined('CIS_DOKUMENTE_STUDIENERFOLGSBESTAETIGUNG_DRUCKEN') && CIS_DOKUMENTE_STUDIENERFOLGSBESTAETIGUNG_DRUCKEN,
+			'selfservice' => $selfservice
 		]);
 	}
 
diff --git a/application/models/crm/Akte_model.php b/application/models/crm/Akte_model.php
index fe9db5330..0246ef866 100644
--- a/application/models/crm/Akte_model.php
+++ b/application/models/crm/Akte_model.php
@@ -190,4 +190,55 @@ class Akte_model extends DB_Model
 
 		return success($dokumente->retval);
 	}
+
+	/**
+	 * Liefert die Archivdokumente einer Person
+	 *
+	 * @param integer				$person_id
+	 * @param boolean|null			$signiert			Wenn true werden nur Dokumente geliefert die digital signiert wurden.
+	 * @param boolean|null			$stud_selfservice	Wenn true werden nur Dokumente geliefert die Studierende selbst herunterladen duerfen.
+	 *
+	 * @return stdClass
+	 */
+	public function getArchiv($person_id, $signiert = null, $stud_selfservice = null)
+	{
+		$this->addSelect('akte_id');
+		$this->addSelect('person_id');
+		$this->addSelect('dokument_kurzbz');
+		$this->addSelect('mimetype');
+		$this->addSelect('erstelltam');
+		$this->addSelect('gedruckt');
+		$this->addSelect('titel_intern');
+		$this->addSelect('anmerkung_intern');
+		$this->addSelect('titel');
+		$this->addSelect('bezeichnung');
+		$this->addSelect('updateamum');
+		$this->addSelect('insertamum');
+		$this->addSelect('updatevon');
+		$this->addSelect('insertvon');
+		$this->addSelect('uid');
+		$this->addSelect('dms_id');
+		$this->addSelect('anmerkung');
+		$this->addSelect('nachgereicht');
+		$this->addSelect('CASE WHEN inhalt is not null THEN true ELSE false END as inhalt_vorhanden', false);
+		$this->addSelect('nachgereicht_am');
+		$this->addSelect('ausstellungsnation');
+		$this->addSelect('formal_geprueft_amum');
+		$this->addSelect('archiv');
+		$this->addSelect('signiert');
+		$this->addSelect('stud_selfservice');
+		$this->addSelect('akzeptiertamum');
+
+		if ($signiert !== null)
+			$this->db->where('signiert', (boolean)$signiert);
+		if ($stud_selfservice !== null)
+			$this->db->where('stud_selfservice', (boolean)$stud_selfservice);
+
+		$this->addOrder('erstelltam', 'DESC');
+
+		return $this->loadWhere([
+			'person_id' => $person_id,
+			'archiv' => true
+		]);
+	}
 }
diff --git a/application/views/Cis/Documents.php b/application/views/Cis/Documents.php
index f927bc053..480fabe85 100644
--- a/application/views/Cis/Documents.php
+++ b/application/views/Cis/Documents.php
@@ -5,95 +5,127 @@ $this->load->view('templates/CISHTML-Header', $includesArray);
 ?>
 
 <div id="content">
-	<h2>Documents</h2>
-	<hr>
-	<div class="mb-3">
-		<select class="form-select" onchange="location = this.value">
-			<?php foreach ($stsemArray as $sem) { ?>
-				<option value="<?= site_url('Cis/Documents/Semester/' . $sem); ?>"<?= $sem == $stsem ? ' selected': ''; ?>>
-					<?= $sem; ?>
-				</option>
-			<?php } ?>
-		</select>
+	<div class="fhc-header">
+		<h1><?= $this->p->t('global', 'dokumente'); ?><small><?= $this->p->t('tools', 'bestaetigungenZeugnisse'); ?></small></h1>
+	</div>
+	
+	<div class="row mb-3 justify-content-end">
+		<div class="col-auto">
+			<select class="form-select" onchange="location = this.value">
+				<?php foreach ($stsemArray as $sem) { ?>
+					<option value="<?= site_url('Cis/Documents/Semester/' . $sem); ?>"<?= $sem == $stsem ? ' selected': ''; ?>>
+						<?= $sem; ?>
+					</option>
+				<?php } ?>
+			</select>
+		</div>
 	</div>
 
 	<?php if ($hasSemester) { ?>
-		<h3><?= $this->p->t('tools', 'inskriptionsbestaetigung'); ?></h3>
-		<ul class="list-unstyled">
-			<?php foreach ($inskriptionsbestaetigungen as $stg => $hasPaid) { ?>
-				<?php if (count($studiengaenge) != 1) { ?>
-					<li>
-						<b><?= $studiengaenge[$stg]->bezeichnung; ?></b>
-					</li>
-				<?php } ?>
-				<?php if ($hasPaid) { ?>
-					<li>
-						<a class="text-decoration-none" target="_blank" href="<?= base_url('cis/private/pdfExport.php?xsl=Inskription&xml=student.rdf.php&ss=' . $stsem . '&uid=' . $uid . '&xsl_stg_kz=' . $stg); ?>">
-							<img class="align-baseline" src="<?= base_url('skin/images/pdfpic.gif'); ?>" alt="PDF"> <?= $this->p->t('tools', 'inskriptionsbestaetigung') . ' ' . $stsem; ?>
-						</a>
-					</li>
-				<?php } else { ?>
-					<li class="text-danger">
-						<?= $this->p->t('tools', 'studienbeitragFuerSSNochNichtBezahlt', ['stsem' => $stsem]); ?>
-					</li>
-				<?php } ?>
-			<?php } ?>
-		</ul>
-		<?php if ($studienbuchblatt) { ?>
-			<h3><?= $this->p->t('tools', 'studienbuchblatt'); ?></h3>
-			<ul class="list-unstyled">
+		<div class="card mb-3">
+			<h3 class="card-header h5"><?= $this->p->t('tools', 'inskriptionsbestaetigung'); ?></h3>
+			<ul class="list-group list-group-flush">
 				<?php foreach ($inskriptionsbestaetigungen as $stg => $hasPaid) { ?>
 					<?php if (count($studiengaenge) != 1) { ?>
-						<li>
-							<b><?= $studiengaenge[$stg]->bezeichnung; ?></b>
+						<li class="list-group-item fw-bold">
+							<?= $studiengaenge[$stg]->bezeichnung; ?>
 						</li>
 					<?php } ?>
 					<?php if ($hasPaid) { ?>
-						<li>
-							<?php /* TODO(chris): studiengang_kz? */ ?>
-							<a class="text-decoration-none" target="_blank" href="<?= base_url('cis/private/pdfExport.php?xsl=Studienblatt&xml=studienblatt.xml.php&ss=' . $stsem . '&uid=' . $uid); ?>">
-								<img class="align-baseline" src="<?= base_url('skin/images/pdfpic.gif'); ?>" alt="PDF"> <?= $this->p->t('tools', 'studienbuchblatt') . ' ' . $stsem; ?>
+						<li class="list-group-item">
+							<a class="text-decoration-none" target="_blank" href="<?= base_url('cis/private/pdfExport.php?xsl=Inskription&xml=student.rdf.php&ss=' . $stsem . '&uid=' . $uid . '&xsl_stg_kz=' . $stg); ?>">
+								<img class="align-baseline" src="<?= base_url('skin/images/pdfpic.gif'); ?>" alt="PDF"> <?= $this->p->t('tools', 'inskriptionsbestaetigung') . ' ' . $stsem; ?>
 							</a>
 						</li>
 					<?php } else { ?>
-						<li class="text-danger">
+						<li class="list-group-item list-group-item-danger">
 							<?= $this->p->t('tools', 'studienbeitragFuerSSNochNichtBezahlt', ['stsem' => $stsem]); ?>
 						</li>
 					<?php } ?>
 				<?php } ?>
 			</ul>
+		</div>
+		<?php if ($studienbuchblatt) { ?>
+			<div class="card mb-3">
+				<h3 class="card-header h5"><?= $this->p->t('tools', 'studienbuchblatt'); ?></h3>
+				<ul class="list-group list-group-flush">
+					<?php foreach ($inskriptionsbestaetigungen as $stg => $hasPaid) { ?>
+						<?php if (count($studiengaenge) != 1) { ?>
+							<li class="list-group-item fw-bold">
+								<?= $studiengaenge[$stg]->bezeichnung; ?>
+							</li>
+						<?php } ?>
+						<?php if ($hasPaid) { ?>
+							<li class="list-group-item">
+								<?php /* TODO(chris): studiengang_kz? */ ?>
+								<a class="text-decoration-none" target="_blank" href="<?= base_url('cis/private/pdfExport.php?xsl=Studienblatt&xml=studienblatt.xml.php&ss=' . $stsem . '&uid=' . $uid); ?>">
+									<img class="align-baseline" src="<?= base_url('skin/images/pdfpic.gif'); ?>" alt="PDF"> <?= $this->p->t('tools', 'studienbuchblatt') . ' ' . $stsem; ?>
+								</a>
+							</li>
+						<?php } else { ?>
+							<li class="list-group-item list-group-item-danger">
+								<?= $this->p->t('tools', 'studienbeitragFuerSSNochNichtBezahlt', ['stsem' => $stsem]); ?>
+							</li>
+						<?php } ?>
+					<?php } ?>
+				</ul>
+			</div>
 		<?php } ?>
 		<?php if ($studienerfolgsbestaetigung) { ?>
-			<h3><?= $this->p->t('tools', 'studienerfolgsbestaetigung'); ?></h3>
-			<ul class="list-unstyled">
-				<?php foreach ($studiengaenge as $stg => $bezeichnung) { ?>
-					<?php if (count($studiengaenge) != 1) { ?>
-						<li>
-							<b><?= $bezeichnung; ?></b>
-						</li>
-					<?php } ?>
-					<?php foreach (['' => '&typ=finanzamt', ' (' . $this->p->t('tools', 'vorlageWohnsitzfinanzamt') . ')' => ''] as $finanz_bez => $finanz_param) { ?>
-						<?php foreach (['de' => [$this->p->t('public', 'deutsch'), 'Studienerfolg'], 'en' => [$this->p->t('public', 'englisch'), 'StudienerfolgEng']] as $lang_kurz => $lang) { ?>
-							<?php foreach ([$stsem => $stsem, $this->p->t('tools', 'alleStudiensemester') => 'alle&all=1'] as $sem_bez => $sem_param) { ?>
-								<li>
-									<a class="text-decoration-none" target="_blank" href="<?= base_url('cis/private/pdfExport.php?xsl=' . $lang[1] . '&xml=studienerfolg.rdf.php&ss=' . $sem_param . '&uid=' . $uid . $finanz_param); ?>">
-										<img class="align-baseline" src="<?= base_url('skin/images/pdfpic.gif'); ?>" alt="PDF"> <?= $this->p->t('tools', 'studienerfolgsbestaetigung') . ' ' . $sem_bez . ' ' . $lang[0] . $finanz_bez; ?>
-									</a>
-								</li>
-								<?php /* TODO(chris): Finanzamt $this->p->t('tools/vorlageWohnsitzfinanzamt') */ ?>
+			<div class="card mb-3">
+				<h3 class="card-header h5"><?= $this->p->t('tools', 'studienerfolgsbestaetigung'); ?></h3>
+				<ul class="list-group list-group-flush">
+					<?php foreach ($studiengaenge as $stg => $bezeichnung) { ?>
+						<?php if (count($studiengaenge) != 1) { ?>
+							<li class="list-group-item fw-bold">
+								<?= $bezeichnung; ?>
+							</li>
+						<?php } ?>
+						<?php foreach (['' => '&typ=finanzamt', ' (' . $this->p->t('tools', 'vorlageWohnsitzfinanzamt') . ')' => ''] as $finanz_bez => $finanz_param) { ?>
+							<?php foreach (['de' => [$this->p->t('public', 'deutsch'), 'Studienerfolg'], 'en' => [$this->p->t('public', 'englisch'), 'StudienerfolgEng']] as $lang_kurz => $lang) { ?>
+								<?php foreach ([$stsem => $stsem, $this->p->t('tools', 'alleStudiensemester') => 'alle&all=1'] as $sem_bez => $sem_param) { ?>
+									<li class="list-group-item">
+										<a class="text-decoration-none" target="_blank" href="<?= base_url('cis/private/pdfExport.php?xsl=' . $lang[1] . '&xml=studienerfolg.rdf.php&ss=' . $sem_param . '&uid=' . $uid . $finanz_param); ?>">
+											<img class="align-baseline" src="<?= base_url('skin/images/pdfpic.gif'); ?>" alt="PDF"> <?= $this->p->t('tools', 'studienerfolgsbestaetigung') . ' ' . $sem_bez . ' ' . $lang[0] . $finanz_bez; ?>
+										</a>
+									</li>
+								<?php } ?>
 							<?php } ?>
 						<?php } ?>
 					<?php } ?>
-				<?php } ?>
-			</ul>
+				</ul>
+			</div>
 		<?php } ?>
 	<?php } else { ?>
 		<div class="alert alert-danger" role="alert">
 			<?= $this->p->t('tools', 'keinStatusImStudiensemester', ['stsem' => $stsem]); ?>
 		</div>
 	<?php } ?>
-	TODO(chris): IMPLEMENT!
-	
+
+	<?php if ($selfservice !== null) { ?>
+		<div class="card mb-3">
+			<h3 class="card-header h5"><?= $this->p->t('tools', 'abschlussdokumente'); ?></h3>
+			<ul class="list-group list-group-flush">
+				<?php if (count($selfservice)) { ?>
+					<li class="list-group-item list-group-item-warning">
+						<?= $this->p->t('tools', 'warnungDruckDigitaleSignatur'); ?>
+					</li>
+					<?php foreach ($selfservice as $row) { ?>
+						<li class="list-group-item">
+							<a class="text-decoration-none" target="_blank" href="<?= base_url('dokumente.php?action=download&id='.$row->akte_id.'&uid='.$uid); ?>">
+								<?php /* TODO(chris): datum & link */ ?>
+								<img class="align-baseline" src="<?= base_url('skin/images/pdfpic.gif'); ?>" alt="PDF"> <?= $row->bezeichnung; ?>
+							</a>
+						</li>
+					<?php } ?>
+				<?php } else { ?>
+					<li class="list-group-item list-group-item-danger">
+						<?= $this->p->t('tools', 'nochKeineAbschlussdokumenteVorhanden'); ?>
+					</li>
+				<?php } ?>
+			</ul>
+		</div>
+	<?php } ?>
 </div>
 
 <?php $this->load->view('templates/CISHTML-Footer', $includesArray); ?>
diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index 810a55956..c698ff6e5 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -306,3 +306,44 @@
     display: block;
   }
 }
+/* Typography */
+.fhc-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: end;
+  border-bottom: 1px solid #dee2e6;
+  margin: 1rem 0;
+}
+.fhc-header > h1 {
+  font-size: calc(1.3rem + 0.6vw);
+}
+@media (min-width: 1200px) {
+  .fhc-header > h1 {
+    font-size: 1.75rem;
+  }
+}
+.fhc-header > h1 > small {
+  color: #6c757d;
+  font-size: 1rem;
+}
+.fhc-header > h1 > small:before {
+  content: " | ";
+}
+.fhc-header > a {
+  margin-bottom: 0.5rem;
+  text-decoration: none;
+}
+.fhc-header > a:after {
+  color: var(--bs-body-color);
+  content: "\f059";
+  -moz-osx-font-smoothing: grayscale;
+  -webkit-font-smoothing: antialiased;
+  display: var(--fa-display, inline-block);
+  font-style: normal;
+  font-variant: normal;
+  line-height: 1;
+  text-rendering: auto;
+  font-family: var(--fa-style-family, "Font Awesome 6 Free");
+  font-weight: var(--fa-style, 900);
+  margin-inline-start: 0.5rem;
+}

From 6b6392deb4b1529b46cebdd70a86880efdf8dbda Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 13 Mar 2023 09:02:46 +0100
Subject: [PATCH 0074/1461] Missing ;

---
 application/libraries/dashboard/DashboardLib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/libraries/dashboard/DashboardLib.php b/application/libraries/dashboard/DashboardLib.php
index b9062fdce..3abeea48d 100644
--- a/application/libraries/dashboard/DashboardLib.php
+++ b/application/libraries/dashboard/DashboardLib.php
@@ -41,7 +41,7 @@ class DashboardLib
 
 		if (hasData($result)) 
 		{
-			return current(getData($result))
+			return current(getData($result));
 		}
 
 		return null;

From 9e11dfb668674d95289a79f13508ca84aa9ef0a4 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 14 Mar 2023 11:00:36 +0100
Subject: [PATCH 0075/1461] code quality

---
 .../libraries/dashboard/DashboardLib.php      | 55 ++++++++++---------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/application/libraries/dashboard/DashboardLib.php b/application/libraries/dashboard/DashboardLib.php
index 3abeea48d..1c503c25c 100644
--- a/application/libraries/dashboard/DashboardLib.php
+++ b/application/libraries/dashboard/DashboardLib.php
@@ -17,7 +17,7 @@ class DashboardLib
 	
 	private $_ci; // CI instance
 	
-	public function __construct($params = null)
+	public function __construct()
 	{
 		// Loads CI instance
 		$this->_ci =& get_instance();
@@ -35,11 +35,11 @@ class DashboardLib
 		return $widgetid;
 	}
 	
-	public function getDashboardByKurzbz($dashboard_kurzbz) 
+	public function getDashboardByKurzbz($dashboard_kurzbz)
 	{
 		$result = $this->_ci->DashboardModel->getDashboardByKurzbz($dashboard_kurzbz);
 
-		if (hasData($result)) 
+		if (hasData($result))
 		{
 			return current(getData($result));
 		}
@@ -47,7 +47,7 @@ class DashboardLib
 		return null;
 	}
 	
-	public function getMergedConfig($dashboard_id, $uid) 
+	public function getMergedConfig($dashboard_id, $uid)
 	{
 		$defaultconfig = $this->getDefaultConfig($dashboard_id, $uid);
 		$userconfig = $this->getUserConfig($dashboard_id, $uid);
@@ -70,8 +70,7 @@ class DashboardLib
 				$preset = json_decode($presetobj->preset, true);
 				if (null !== $preset)
 				{
-					$defaultconfig = array_replace_recursive($defaultconfig, 
-						$preset);
+					$defaultconfig = array_replace_recursive($defaultconfig, $preset);
 				}
 			}
 		}
@@ -96,11 +95,11 @@ class DashboardLib
 		return [];
 	}
 	
-	public function getOverrideOrCreateEmptyOverride($dashboard_kurzbz, $uid) 
+	public function getOverrideOrCreateEmptyOverride($dashboard_kurzbz, $uid)
 	{
 		$override = $this->getOverride($dashboard_kurzbz, $uid);
-		if( null !== $override ) {
-			return $override;			
+		if (null !== $override) {
+			return $override;
 		}
 		
 		$dashboard = $this->getDashboardByKurzbz($dashboard_kurzbz);
@@ -113,11 +112,11 @@ class DashboardLib
 		return $emptyoverride;
 	}
 	
-	public function getPresetOrCreateEmptyPreset($dashboard_kurzbz, $funktion_kurzbz) 
+	public function getPresetOrCreateEmptyPreset($dashboard_kurzbz, $funktion_kurzbz)
 	{
 		$preset = $this->getPreset($dashboard_kurzbz, $funktion_kurzbz);
-		if( null !== $preset ) {
-			return $preset;			
+		if (null !== $preset) {
+			return $preset;
 		}
 		
 		$dashboard = $this->getDashboardByKurzbz($dashboard_kurzbz);
@@ -131,7 +130,7 @@ class DashboardLib
 		return $emptypreset;
 	}
 	
-	public function getPreset($dashboard_kurzbz, $section) 
+	public function getPreset($dashboard_kurzbz, $section)
 	{
 		$dashboard = $this->getDashboardByKurzbz($dashboard_kurzbz);
 		
@@ -139,7 +138,7 @@ class DashboardLib
 		$result = $this->_ci->DashboardPresetModel
 			->getPresetByDashboardAndFunktion($dashboard->dashboard_id, $funktion_kurzbz);
 		
-		if (hasData($result)) 
+		if (hasData($result))
 		{
 			return current(getData($result));
 		}
@@ -147,14 +146,14 @@ class DashboardLib
 		return null;
 	}
 
-	public function getOverride($dashboard_kurzbz, $uid) 
+	public function getOverride($dashboard_kurzbz, $uid)
 	{
 		$dashboard = $this->getDashboardByKurzbz($dashboard_kurzbz);
 		
 		$result = $this->_ci->DashboardOverrideModel
 			->getOverride($dashboard->dashboard_id, $uid);
 		
-		if (hasData($result)) 
+		if (hasData($result))
 		{
 			return current(getData($result));
 		}
@@ -162,12 +161,13 @@ class DashboardLib
 		return null;
 	}
 	
-	public function insertOrUpdatePreset($preset) 
+	public function insertOrUpdatePreset($preset)
 	{
-		if( isset($preset->preset_id) && $preset->preset_id > 0 ) 
+		if (isset($preset->preset_id) && $preset->preset_id > 0)
 		{
 			$result = $this->_ci->DashboardPresetModel->update($preset->preset_id, $preset);
-		} else 
+		}
+		else
 		{
 			$result = $this->_ci->DashboardPresetModel->insert($preset);
 		}
@@ -175,12 +175,13 @@ class DashboardLib
 		return $result;
 	}
 	
-	public function insertOrUpdateOverride($override) 
+	public function insertOrUpdateOverride($override)
 	{
-		if( isset($override->override_id) && $override->override_id > 0 ) 
+		if (isset($override->override_id) && $override->override_id > 0)
 		{
 			$result = $this->_ci->DashboardOverrideModel->update($override->override_id, $override);
-		} else 
+		}
+		else
 		{
 			$result = $this->_ci->DashboardOverrideModel->insert($override);
 		}
@@ -200,10 +201,10 @@ class DashboardLib
 		}
 	}
 	
-	public function addWidgetToWidgets(&$widgets, $section, $widget, $widgetid) 
+	public function addWidgetToWidgets(&$widgets, $section, $widget, $widgetid)
 	{
 		$section = ($section !== null) ? $section : self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL;
-		if( !isset($widgets[$section]) || !is_array($widgets[$section]) ) 
+		if (!isset($widgets[$section]) || !is_array($widgets[$section]))
 		{
 			$widgets[$section] = array();
 		}
@@ -211,10 +212,10 @@ class DashboardLib
 		$widgets[$section][$widgetid] = $widget;
 	}
 	
-	public function removeWidgetFromWidgets(&$widgets, $section, $widgetid) 
+	public function removeWidgetFromWidgets(&$widgets, $section, $widgetid)
 	{
-		$section = ($section !== null) ? $section : self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL;		
-		if(isset($widgets[$section]) && isset($widgets[$section][$widgetid]) ) 
+		$section = ($section !== null) ? $section : self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL;
+		if (isset($widgets[$section]) && isset($widgets[$section][$widgetid]))
 		{
 			unset($widgets[$section][$widgetid]);
 			if(empty($widgets[$section]) && $section !== self::USEROVERRIDE_SECTION) {

From 7e518c3978326faf76c3acbc55fef810357de421 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 24 Mar 2023 11:26:16 +0100
Subject: [PATCH 0076/1461] Documents

---
 application/controllers/Cis/Documents.php | 161 ++++++----
 application/views/Cis/Documents.php       | 305 ++++++++++++-------
 public/js/apps/Cis/Documents.js           |  93 ++++++
 system/phrasesupdate.php                  | 352 +++++++++++++++++++++-
 4 files changed, 728 insertions(+), 183 deletions(-)
 create mode 100644 public/js/apps/Cis/Documents.js

diff --git a/application/controllers/Cis/Documents.php b/application/controllers/Cis/Documents.php
index 20380ca5a..094ade296 100644
--- a/application/controllers/Cis/Documents.php
+++ b/application/controllers/Cis/Documents.php
@@ -14,9 +14,12 @@ class Documents extends Auth_Controller
 	{
 		parent::__construct([
 			'index' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
-			'Semester' => ['student/anrechnung_beantragen:r','user:r'] // TODO(chris): permissions?
+			'student' => ['admin:r'],
+			'download' => ['student/anrechnung_beantragen:r','user:r'] // TODO(chris): permissions?
 		]);
 
+		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
+
 		$this->loadPhrases([
 			'global',
 			'tools'
@@ -27,121 +30,151 @@ class Documents extends Auth_Controller
 	// Public methods
 
 	/**
-	 * @param string		$stsem
 	 * @return void
 	 */
-	public function index($stsem = null)
+	public function index()
 	{
-		return $this->Semester($stsem);
+		return $this->showDocuments(getAuthUID());
 	}
 
 	/**
-	 * @param string		$stsem
+	 * @param string		$uid		Administratoren dürfen die UID als Parameter übergeben um die Dokumente von anderen Personen anzuzeigen
 	 * @return void
 	 */
-	public function Semester($stsem = null)
+	public function student($uid)
+	{
+		return $this->showDocuments($uid);
+	}
+
+	/**
+	 * @param string		$uid
+	 * @return void
+	 */
+	protected function showDocuments($uid)
 	{
-		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
 		$this->load->model('crm/Konto_model', 'KontoModel');
 		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
 
-		$uid = getAuthUID();
 		$studiengaenge = [];
 
 		$stati = $this->PrestudentstatusModel->loadWhereUid($uid, null, true);
 		if (isError($stati))
-			return $this->view->load('errors/html/error_db.php', [
+			return $this->load->view('errors/html/error_db.php', [
 				'heading' => 'Database Error',
 				'message' => getError($stati)
 			]);
 		$stati = getData($stati);
 		if (!$stati)
-			return $this->view->load('errors/html/error_general.php', [
+			return $this->load->view('errors/html/error_general.php', [
 				'heading' => 'User ist kein Student',
 				'message' => 'Es konnten keine Studiensemester gefunden werden in denen der User als Student inskripiert ist'
 			]);
 
-		$stsemArray = [];
+		$stgs = [];
+		$buchungstypen = implode('\',\'', defined("CIS_DOKUMENTE_STUDIENBEITRAG_TYPEN") ? unserialize(CIS_DOKUMENTE_STUDIENBEITRAG_TYPEN) : []);
+		$person_ids = [];
 		foreach ($stati as $status) {
-			if (!isset($studiengaenge[$status->studiengang_kz])) {
+			$person_ids[] = $status->person_id;
+
+			if (!isset($stgs[$status->studiengang_kz])) {
 				$stg = $this->StudiengangModel->load($status->studiengang_kz);
 				if (isError($stg))
-					return $this->view->load('errors/html/error_db.php', [
+					return $this->load->view('errors/html/error_db.php', [
 						'heading' => 'Database Error',
 						'message' => getError($stg)
 					]); 
 				$stg = getData($stg);
 				if (!$stg)
-					return $this->view->load('errors/html/error_db.php', [
+					return $this->load->view('errors/html/error_db.php', [
 						'heading' => 'Database Error',
 						'message' => 'No Studiengang found for studiengang_kz ' . $status->studiengang_kz
 					]);
-				$studiengaenge[$status->studiengang_kz] = current($stg);
+				$stgs[$status->studiengang_kz] = current($stg);
+				$stgs[$status->studiengang_kz]->studiensemester = [];
 			}
-			if (!isset($stsemArray[$status->studiensemester_kurzbz]))
-				$stsemArray[$status->studiensemester_kurzbz] = [];
-			// TODO(chris): maybe just use prestudent_id?
-			$stsemArray[$status->studiensemester_kurzbz][] = $status;
-		}
-
-		$hasSemester = true;
-		$inskriptionsbestaetigungen = [];
-		
-		if ($stsem && !isset($stsemArray[$stsem])) {
-			$hasSemester = false;
-		} else {
-			if (!$stsem)
-				$stsem = end($stsemArray);
-
-			#$stsemArray[$stsem] = array_unique($stsemArray[$stsem]);
-			
-			$buchungstypen = implode('\',\'', defined("CIS_DOKUMENTE_STUDIENBEITRAG_TYPEN") ? unserialize(CIS_DOKUMENTE_STUDIENBEITRAG_TYPEN) : []);
-
-			foreach ($stsemArray[$stsem] as $status) {
-				// NOTE(chris): multiple prestudentstatus for prestudent and semester
-				if (isset($inskriptionsbestaetigungen[$status->studiengang_kz]))
-					continue;
-				
-				$inskriptionsbestaetigungen[$status->studiengang_kz] = (boolean) getData($this->KontoModel->checkStudienbeitragFromPrestudent($status->prestudent_id, $stsem, $buchungstypen));
+			if (!isset($stgs[$status->studiengang_kz]->studiensemester[$status->studiensemester_kurzbz])) {
+				$stgs[$status->studiengang_kz]->studiensemester[$status->studiensemester_kurzbz] = new stdClass();
+				$stgs[$status->studiengang_kz]->studiensemester[$status->studiensemester_kurzbz]->inskriptionsbestaetigung = (boolean) getData($this->KontoModel->checkStudienbeitragFromPrestudent($status->prestudent_id, $status->studiensemester_kurzbz, $buchungstypen));
 			}
 		}
+		$person_ids = array_unique($person_ids);
 
 		$selfservice = null;
 		if (!defined('CIS_DOKUMENTE_SELFSERVICE') || CIS_DOKUMENTE_SELFSERVICE) {
 			$this->load->model('crm/Akte_model', 'AkteModel');
-			$result = $this->AkteModel->getArchiv(getAuthPersonId(), null, true);
-			if (isError($result))
-				return $this->view->load('errors/html/error_db.php', [
-					'heading' => 'Database Error',
-					'message' => getError($result)
-				]);
-			$selfservice = getData($result) ?: [];
+			$selfservice = [];
+			foreach ($person_ids as $person_id) {
+				$result = $this->AkteModel->getArchiv($person_id, null, true);
+				if (isError($result))
+					return $this->load->view('errors/html/error_db.php', [
+						'heading' => 'Database Error',
+						'message' => getError($result)
+					]);
+				$selfservice = array_merge($selfservice, getData($result) ?: []);
+			}
 		}
 
 		
-		// TODO(chris): in array stsem stsemArray:
-		// TODO(chris): - inskriptionsbestaetigung (konto)
-		// TODO(chris): - CIS_DOKUMENTE_STUDIENBUCHLBATT_DRUCKEN? studienbuchblatt
-		// TODO(chris): - CIS_DOKUMENTE_STUDIENERFOLGSBESTAETIGUNG_DRUCKEN? studienerfolgsbestaetigung
-		// TODO(chris): else: msg
-
-		// TODO(chris): CIS_DOKUMENTE_SELFSERVICE?: ...abschlussdokumente (akte)
-
-		$stsemArray = array_keys($stsemArray);
-		if (!$hasSemester)
-			array_unshift($stsemArray, $stsem);
-
 		$this->load->view('Cis/Documents', [
+			'stgs' => $stgs,
 			'uid' => $uid,
-			'stsem' => $stsem,
-			'stsemArray' => $stsemArray,
-			'hasSemester' => $hasSemester,
-			'studiengaenge' => $studiengaenge,
-			'inskriptionsbestaetigungen' => $inskriptionsbestaetigungen,
 			'studienbuchblatt' => defined('CIS_DOKUMENTE_STUDIENBUCHLBATT_DRUCKEN') && CIS_DOKUMENTE_STUDIENBUCHLBATT_DRUCKEN,
 			'studienerfolgsbestaetigung' => defined('CIS_DOKUMENTE_STUDIENERFOLGSBESTAETIGUNG_DRUCKEN') && CIS_DOKUMENTE_STUDIENERFOLGSBESTAETIGUNG_DRUCKEN,
 			'selfservice' => $selfservice
 		]);
 	}
 
+	/**
+	 * @param integer		$akte_id
+	 * @param string		$uid		(optional) Administratoren dürfen die UID als Parameter übergeben um die Dokumente von anderen Personen anzuzeigen
+	 *
+	 * @return void
+	 */
+	public function download($akte_id, $uid = null)
+	{
+		if (!is_numeric($akte_id))
+			return show_404();
+
+		$this->load->model('crm/Akte_model', 'AkteModel');
+		$result = $this->AkteModel->load($akte_id);
+		if (isError($result))
+			return show_error(getError($result));
+		$akte = getData($result);
+		if (!$akte)
+			return show_404();
+		$akte = current($akte);
+
+		$admin_access = false;
+		if ($uid !== null && $this->permissionlib->isBerechtigt('admin')) {
+			$stati = $this->PrestudentstatusModel->loadWhereUid($uid, null, true);
+			if (hasData($stati)) {
+				$person_ids = array_map(function ($status) {
+					return $status->person_id;
+				}, getData($stati));
+				$person_ids = array_unique($person_ids);
+				if (count($person_ids) == 1 && current($person_ids) == $akte->person_id) {
+					$admin_access = true;
+				}
+			}
+		}
+
+		if (!$admin_access && ($akte->person_id != getAuthPersonId() || !$akte->stud_selfservice))
+			return show_error('Forbidden', 403);
+
+		// NOTE(chris): Log bei einem Download vom Becheid
+		if (isset($akte->dokument_kurzbz) && ($akte->dokument_kurzbz === 'Bescheid' || $akte->dokument_kurzbz === 'BescheidEng')) {
+			$this->load->model('system/Webservicelog_model', 'WebservicelogModel');
+			$this->WebservicelogModel->insert([
+				'webservicetyp_kurzbz' => 'content',
+				'request_id' => (isset($akte->akte_id) && !empty($akte->akte_id)) ? $akte->akte_id : NULL,
+				'beschreibung' => 'Bescheidbestaetigungsdownload',
+				'request_data' => $_SERVER['QUERY_STRING'],
+				'execute_time' => date('c'),
+				'execute_user' => getAuthUID()
+			]);
+		}
+
+		$this->output->set_content_type($akte->mimetype);
+		$this->output->set_output(base64_decode($akte->inhalt));
+	}
 }
diff --git a/application/views/Cis/Documents.php b/application/views/Cis/Documents.php
index 480fabe85..1e7b0ea48 100644
--- a/application/views/Cis/Documents.php
+++ b/application/views/Cis/Documents.php
@@ -1,131 +1,210 @@
 <?php
-$includesArray = array();
+$includesArray = array(
+	'tabulator5' => true,
+	'customJSModules' => ['public/js/apps/Cis/Documents.js']
+);
 
 $this->load->view('templates/CISHTML-Header', $includesArray);
 ?>
 
 <div id="content">
 	<div class="fhc-header">
-		<h1><?= $this->p->t('global', 'dokumente'); ?><small><?= $this->p->t('tools', 'bestaetigungenZeugnisse'); ?></small></h1>
-	</div>
-	
-	<div class="row mb-3 justify-content-end">
-		<div class="col-auto">
-			<select class="form-select" onchange="location = this.value">
-				<?php foreach ($stsemArray as $sem) { ?>
-					<option value="<?= site_url('Cis/Documents/Semester/' . $sem); ?>"<?= $sem == $stsem ? ' selected': ''; ?>>
-						<?= $sem; ?>
-					</option>
-				<?php } ?>
-			</select>
-		</div>
+		<h1><?= $this->p->t('tools', 'dokumente'); ?><small><?= $this->p->t('tools', 'bestaetigungenZeugnisse'); ?></small></h1>
 	</div>
 
-	<?php if ($hasSemester) { ?>
-		<div class="card mb-3">
-			<h3 class="card-header h5"><?= $this->p->t('tools', 'inskriptionsbestaetigung'); ?></h3>
-			<ul class="list-group list-group-flush">
-				<?php foreach ($inskriptionsbestaetigungen as $stg => $hasPaid) { ?>
-					<?php if (count($studiengaenge) != 1) { ?>
-						<li class="list-group-item fw-bold">
-							<?= $studiengaenge[$stg]->bezeichnung; ?>
-						</li>
+	<div class="row">
+		<div class="col<?= $selfservice ? '-8' : ''; ?>">
+			<div class="fhc-table mb-3">
+				<div class="fhc-table-header d-flex align-items-center mb-2 gap-2">
+					<h3 class="h5 col m-0"><?= $this->p->t('tools', 'inskriptionsbestaetigung'); ?><?= $studienbuchblatt ? ' & ' . $this->p->t('tools', 'studienbuchblatt') : ''; ?></h3>
+					<?php if (count($stgs) != 1) { ?>
+						<div class="col-auto">
+							<select class="form-select" @input="changeFilter('inscriptiontable', 'Stg', $event)">
+								<option value="">Alle</option>
+								<?php foreach ($stgs as $stg) { ?>
+									<option value="<?= $stg->bezeichnung; ?>">
+										<?= $stg->bezeichnung; ?>
+									</option>
+								<?php } ?>
+							</select>
+						</div>
 					<?php } ?>
-					<?php if ($hasPaid) { ?>
-						<li class="list-group-item">
-							<a class="text-decoration-none" target="_blank" href="<?= base_url('cis/private/pdfExport.php?xsl=Inskription&xml=student.rdf.php&ss=' . $stsem . '&uid=' . $uid . '&xsl_stg_kz=' . $stg); ?>">
-								<img class="align-baseline" src="<?= base_url('skin/images/pdfpic.gif'); ?>" alt="PDF"> <?= $this->p->t('tools', 'inskriptionsbestaetigung') . ' ' . $stsem; ?>
-							</a>
-						</li>
-					<?php } else { ?>
-						<li class="list-group-item list-group-item-danger">
-							<?= $this->p->t('tools', 'studienbeitragFuerSSNochNichtBezahlt', ['stsem' => $stsem]); ?>
-						</li>
-					<?php } ?>
-				<?php } ?>
-			</ul>
-		</div>
-		<?php if ($studienbuchblatt) { ?>
-			<div class="card mb-3">
-				<h3 class="card-header h5"><?= $this->p->t('tools', 'studienbuchblatt'); ?></h3>
-				<ul class="list-group list-group-flush">
-					<?php foreach ($inskriptionsbestaetigungen as $stg => $hasPaid) { ?>
-						<?php if (count($studiengaenge) != 1) { ?>
-							<li class="list-group-item fw-bold">
-								<?= $studiengaenge[$stg]->bezeichnung; ?>
-							</li>
-						<?php } ?>
-						<?php if ($hasPaid) { ?>
-							<li class="list-group-item">
-								<?php /* TODO(chris): studiengang_kz? */ ?>
-								<a class="text-decoration-none" target="_blank" href="<?= base_url('cis/private/pdfExport.php?xsl=Studienblatt&xml=studienblatt.xml.php&ss=' . $stsem . '&uid=' . $uid); ?>">
-									<img class="align-baseline" src="<?= base_url('skin/images/pdfpic.gif'); ?>" alt="PDF"> <?= $this->p->t('tools', 'studienbuchblatt') . ' ' . $stsem; ?>
-								</a>
-							</li>
-						<?php } else { ?>
-							<li class="list-group-item list-group-item-danger">
-								<?= $this->p->t('tools', 'studienbeitragFuerSSNochNichtBezahlt', ['stsem' => $stsem]); ?>
-							</li>
-						<?php } ?>
-					<?php } ?>
-				</ul>
-			</div>
-		<?php } ?>
-		<?php if ($studienerfolgsbestaetigung) { ?>
-			<div class="card mb-3">
-				<h3 class="card-header h5"><?= $this->p->t('tools', 'studienerfolgsbestaetigung'); ?></h3>
-				<ul class="list-group list-group-flush">
-					<?php foreach ($studiengaenge as $stg => $bezeichnung) { ?>
-						<?php if (count($studiengaenge) != 1) { ?>
-							<li class="list-group-item fw-bold">
-								<?= $bezeichnung; ?>
-							</li>
-						<?php } ?>
-						<?php foreach (['' => '&typ=finanzamt', ' (' . $this->p->t('tools', 'vorlageWohnsitzfinanzamt') . ')' => ''] as $finanz_bez => $finanz_param) { ?>
-							<?php foreach (['de' => [$this->p->t('public', 'deutsch'), 'Studienerfolg'], 'en' => [$this->p->t('public', 'englisch'), 'StudienerfolgEng']] as $lang_kurz => $lang) { ?>
-								<?php foreach ([$stsem => $stsem, $this->p->t('tools', 'alleStudiensemester') => 'alle&all=1'] as $sem_bez => $sem_param) { ?>
-									<li class="list-group-item">
-										<a class="text-decoration-none" target="_blank" href="<?= base_url('cis/private/pdfExport.php?xsl=' . $lang[1] . '&xml=studienerfolg.rdf.php&ss=' . $sem_param . '&uid=' . $uid . $finanz_param); ?>">
-											<img class="align-baseline" src="<?= base_url('skin/images/pdfpic.gif'); ?>" alt="PDF"> <?= $this->p->t('tools', 'studienerfolgsbestaetigung') . ' ' . $sem_bez . ' ' . $lang[0] . $finanz_bez; ?>
-										</a>
-									</li>
+					<div class="col-auto">
+						<select class="form-select" @input="changeFilter('inscriptiontable', 'Stsem', $event)">
+							<option value="">Alle</option>
+							<?php foreach ($stsemArray as $sem) { ?>
+								<option value="<?= $sem; ?>">
+									<?= $sem; ?>
+								</option>
+							<?php } ?>
+						</select>
+					</div>
+				</div>
+				<table ref="inscriptiontable">
+					<thead>
+						<tr>
+							<th tabulator-formatter="html">Dokument</th>
+							<?php if (count($stgs) != 1) { ?>
+								<th tabulator-field="Stg">Studiengang</th>
+							<?php } ?>
+							<th tabulator-field="Stsem">Studiensemester</th>
+						</tr>
+					</thead>
+					<tbody>
+						<?php foreach ($stgs as $stg) { ?>
+							<?php foreach ($stg->studiensemester as $stsem => $sem) { ?>
+								<?php if (true && $sem->inskriptionsbestaetigung) { ?>
+									<tr>
+										<td>
+												<a class="text-decoration-none" target="_blank" href="<?= base_url('cis/private/pdfExport.php?xsl=Inskription&xml=student.rdf.php&ss=' . $stsem . '&uid=' . $uid . '&xsl_stg_kz=' . $stg->studiengang_kz); ?>">
+													<img class="align-baseline" src="<?= base_url('skin/images/pdfpic.gif'); ?>" alt="PDF"> <?= $this->p->t('tools', 'inskriptionsbestaetigung'); ?>
+												</a>
+										</td>
+										<?php if (count($stgs) != 1) { ?>
+											<td><?= $stg->bezeichnung; ?></td>
+										<?php } ?>
+										<td><?= $stsem; ?></td>
+									</tr>
+									<?php if ($studienbuchblatt) { ?>
+										<tr>
+											<td>
+												<a class="text-decoration-none" target="_blank" href="<?= base_url('cis/private/pdfExport.php?xsl=Studienblatt&xml=studienblatt.xml.php&ss=' . $stsem . '&uid=' . $uid); ?>">
+													<img class="align-baseline" src="<?= base_url('skin/images/pdfpic.gif'); ?>" alt="PDF"> <?= $this->p->t('tools', 'studienbuchblatt'); ?>
+												</a>
+											</td>
+											<?php if (count($stgs) != 1) { ?>
+												<td><?= $stg->bezeichnung; ?></td>
+											<?php } ?>
+											<td><?= $stsem; ?></td>
+										</tr>
+									<?php } ?>
 								<?php } ?>
 							<?php } ?>
 						<?php } ?>
-					<?php } ?>
-				</ul>
+					</tbody>
+				</table>
+			</div>
+			<?php if ($studienerfolgsbestaetigung) { ?>
+				<div class="fhc-table mb-3">
+					<div class="fhc-table-header d-flex align-items-center mb-2 gap-2">
+						<h3 class="h5 col m-0"><?= $this->p->t('tools', 'studienerfolgsbestaetigung'); ?></h3>
+						<?php if (count($stgs) != 1) { ?>
+							<div class="col-auto">
+								<select class="form-select" @input="changeFilter('studienerfolgsbestaetigungtable', 'Stg', $event)">
+									<option value="">Alle</option>
+									<?php foreach ($stgs as $stg) { ?>
+										<option value="<?= $stg->bezeichnung; ?>">
+											<?= $stg->bezeichnung; ?>
+										</option>
+									<?php } ?>
+								</select>
+							</div>
+						<?php } ?>
+						<div class="col-auto">
+							<select class="form-select" @input="changeFilter('studienerfolgsbestaetigungtable', 'Stsem', $event)">
+								<option value="">Alle</option>
+								<option value="<?= $this->p->t('tools', 'alleStudiensemester'); ?>"><?= $this->p->t('tools', 'alleStudiensemester'); ?></option>
+								<?php foreach ($stsemArray as $sem) { ?>
+									<option value="<?= $sem; ?>">
+										<?= $sem; ?>
+									</option>
+								<?php } ?>
+							</select>
+						</div>
+						<div class="col-auto">
+							<select class="form-select" @input="changeFilter('studienerfolgsbestaetigungtable', 'Lang', $event)">
+								<option value="">Alle</option>
+								<option value="<?= $this->p->t('global', 'deutsch'); ?>"><?= $this->p->t('global', 'deutsch'); ?></option>
+								<option value="<?= $this->p->t('global', 'englisch'); ?>"><?= $this->p->t('global', 'englisch'); ?></option>
+							</select>
+						</div>
+					</div>
+					<table ref="studienerfolgsbestaetigungtable">
+						<thead>
+							<tr>
+								<th tabulator-formatter="html">Dokument</th>
+								<?php if (count($stgs) != 1) { ?>
+									<th tabulator-field="Stg">Studiengang</th>
+								<?php } ?>
+								<th tabulator-field="Stsem">Studiensemester</th>
+								<th tabulator-field="Lang">Sprache</th>
+								<th tabulator-field="Finance" tabulator-formatter="tickCross"><?= $this->p->t('tools', 'vorlageWohnsitzfinanzamt'); ?></th>
+							</tr>
+						</thead>
+						<tbody>
+							<?php foreach (['Studienerfolg' => $this->p->t('global', 'deutsch'), 'StudienerfolgEng' => $this->p->t('global', 'englisch')] as $lang_xsl => $lang) { ?>
+								<?php foreach ([true, false] as $finance) { ?>
+									<?php foreach ($stgs as $stg) { ?>
+										<tr>
+											<td>
+												<a class="text-decoration-none" target="_blank" href="<?= base_url('cis/private/pdfExport.php?xsl=' . $lang_xsl . '&xml=studienerfolg.rdf.php&ss=alle&all=1&uid=' . $uid . ($finance ? '&typ=finanzamt' : '')); ?>">
+													<img class="align-baseline" src="<?= base_url('skin/images/pdfpic.gif'); ?>" alt="PDF"> <?= $this->p->t('tools', 'studienerfolgsbestaetigung'); ?>
+												</a>
+											</td>
+											<?php if (count($stgs) != 1) { ?>
+												<td><?= $stg->bezeichnung; ?></td>
+											<?php } ?>
+											<td><?= $this->p->t('tools', 'alleStudiensemester'); ?></td>
+											<td><?= $lang; ?></td>
+											<td><?= $finance; ?></td>
+										</tr>
+										<?php foreach ($stg->studiensemester as $stsem => $sem) { ?>
+											<tr>
+												<td>
+													<a class="text-decoration-none" target="_blank" href="<?= base_url('cis/private/pdfExport.php?xsl=' . $lang_xsl . '&xml=studienerfolg.rdf.php&ss=' . $stsem . '&uid=' . $uid . ($finance ? '&typ=finanzamt' : '')); ?>">
+														<img class="align-baseline" src="<?= base_url('skin/images/pdfpic.gif'); ?>" alt="PDF"> <?= $this->p->t('tools', 'studienerfolgsbestaetigung'); ?>
+													</a>
+												</td>
+												<?php if (count($stgs) != 1) { ?>
+													<td><?= $stg->bezeichnung; ?></td>
+												<?php } ?>
+												<td><?= $stsem; ?></td>
+												<td><?= $lang; ?></td>
+												<td><?= $finance; ?></td>
+											</tr>
+										<?php } ?>
+									<?php } ?>
+								<?php } ?>
+							<?php } ?>
+						</tbody>
+					</table>
+				</div>
+			<?php } ?>
+			<?php if ($selfservice !== null) { ?>
+				<div class="fhc-table mb-3">
+					<div class="fhc-table-header d-flex align-items-center mb-2 gap-2">
+						<h3 class="h5 col m-0"><?= $this->p->t('tools', 'abschlussdokumente'); ?></h3>
+					</div>
+					<table ref="abschlussdokumentetable">
+						<thead>
+							<tr>
+								<th tabulator-formatter="html">Dokument</th>
+								<th tabulator-field="Date">Datum</th>
+							</tr>
+						</thead>
+						<tbody>
+							<?php foreach ($selfservice as $row) { ?>
+								<tr>
+									<td>
+										<a class="text-decoration-none" target="_blank" href="<?= site_url('Cis/Documents/download/' . $row->akte_id . ($row->person_id != getAuthPersonId() ? '/' . $uid : '')); ?>">
+										<img class="align-baseline" src="<?= base_url('skin/images/pdfpic.gif'); ?>" alt="PDF"> <?= $row->bezeichnung; ?>
+									</a>
+									<td><?= (new DateTime($row->erstelltam))->format('d.m.Y'); ?></td>
+								</tr>
+							<?php } ?>
+						</tbody>
+					</table>
+				</div>
+			<?php } ?>
+		</div>
+		<?php if ($selfservice) { ?>
+			<div class="col-4">
+				<div class="alert alert-warning" role="alert">
+					<?= $this->p->t('tools', 'warnungDruckDigitaleSignatur'); ?>
+				</div>
 			</div>
 		<?php } ?>
-	<?php } else { ?>
-		<div class="alert alert-danger" role="alert">
-			<?= $this->p->t('tools', 'keinStatusImStudiensemester', ['stsem' => $stsem]); ?>
-		</div>
-	<?php } ?>
-
-	<?php if ($selfservice !== null) { ?>
-		<div class="card mb-3">
-			<h3 class="card-header h5"><?= $this->p->t('tools', 'abschlussdokumente'); ?></h3>
-			<ul class="list-group list-group-flush">
-				<?php if (count($selfservice)) { ?>
-					<li class="list-group-item list-group-item-warning">
-						<?= $this->p->t('tools', 'warnungDruckDigitaleSignatur'); ?>
-					</li>
-					<?php foreach ($selfservice as $row) { ?>
-						<li class="list-group-item">
-							<a class="text-decoration-none" target="_blank" href="<?= base_url('dokumente.php?action=download&id='.$row->akte_id.'&uid='.$uid); ?>">
-								<?php /* TODO(chris): datum & link */ ?>
-								<img class="align-baseline" src="<?= base_url('skin/images/pdfpic.gif'); ?>" alt="PDF"> <?= $row->bezeichnung; ?>
-							</a>
-						</li>
-					<?php } ?>
-				<?php } else { ?>
-					<li class="list-group-item list-group-item-danger">
-						<?= $this->p->t('tools', 'nochKeineAbschlussdokumenteVorhanden'); ?>
-					</li>
-				<?php } ?>
-			</ul>
-		</div>
-	<?php } ?>
+	</div>
 </div>
 
 <?php $this->load->view('templates/CISHTML-Footer', $includesArray); ?>
diff --git a/public/js/apps/Cis/Documents.js b/public/js/apps/Cis/Documents.js
new file mode 100644
index 000000000..d484c06db
--- /dev/null
+++ b/public/js/apps/Cis/Documents.js
@@ -0,0 +1,93 @@
+import Phrasen from '../../mixins/Phrasen.js';
+//import {TabulatorFull as Tabulator} from '../../../../vendor/olifolkerd/tabulator5/dist/js/tabulator_esm.min.js';
+//import CssLib from '../../helpers/CssLib.js';
+//CssLib.import('../../vendor/olifolkerd/tabulator5/dist/css/tabulator_bootstrap5.min.css');
+
+const app = Vue.createApp({
+	mixins: [
+		Phrasen
+	],
+	data() {
+		return {
+			inscriptiontable: null,
+			inscriptiontableFilters: {},
+			studienerfolgsbestaetigungtable: null,
+			studienerfolgsbestaetigungtableFilters: {},
+			abschlussdokumentetable: null
+		};
+	},
+	computed: {
+		inscriptiontableFilter() {
+			const filter = [];
+			for (var k in this.inscriptiontableFilters)
+				if (this.inscriptiontableFilters[k])
+					filter.push({
+						field: k,
+						type: '=',
+						value: this.inscriptiontableFilters[k]
+				});
+			return filter;
+		},
+		inscriptiontableEmpty() {
+			// NOTE(chris): empty result on filter
+			if (this.inscriptiontableFilters.Stsem)
+				return this.p.t('tools', 'studienbeitragFuerSSNochNichtBezahlt', {stsem: this.inscriptiontableFilters.Stsem});
+			if (this.inscriptiontableFilters.Stg)
+				return this.p.t('tools', 'studienbeitragFuerStgNochNichtBezahlt', {stsem: this.inscriptiontableFilters.Stg});
+			
+			return this.p.t('tools', 'studienbeitragNochNichtBezahlt');
+		},
+		studienerfolgsbestaetigungtableFilter() {
+			const filter = [];
+			for (var k in this.studienerfolgsbestaetigungtableFilters)
+				if (this.studienerfolgsbestaetigungtableFilters[k])
+					filter.push({
+						field: k,
+						type: '=',
+						value: this.studienerfolgsbestaetigungtableFilters[k]
+				});
+			return filter;
+		}
+	},
+	methods: {
+		changeFilter(table, field, evt) {
+			this[table + 'Filters'][field] = evt.target.value;
+			this[table].clearFilter();
+			if (this[table + 'Filter'].length)
+				this[table].setFilter(this[table + 'Filter']);
+		}
+	},
+	mounted() {
+		this.inscriptiontable = new Tabulator(this.$refs.inscriptiontable, {
+			layout: 'fitDataStretch',
+			placeholder: this.p.t('tools', 'studienbeitragNochNichtBezahlt')
+		});
+		this.studienerfolgsbestaetigungtable = new Tabulator(this.$refs.studienerfolgsbestaetigungtable, {
+			layout: 'fitDataStretch'
+		});
+		this.abschlussdokumentetable = new Tabulator(this.$refs.abschlussdokumentetable, {
+			layout: 'fitDataStretch',
+			placeholder: this.p.t('tools', 'nochKeineAbschlussdokumenteVorhanden')
+		});
+
+		// NOTE(chris): empty result on filter
+		const div = Vue.h(
+			'div',
+			{
+				class: 'position-absolute top-0 left-0 w-100 h-100 d-flex justify-content-center align-items-center fw-bold text-muted'
+			},
+			[
+				this.inscriptiontableEmpty
+			]
+		);
+		this.inscriptiontable.on('dataSorted', (sorters, rows) => {
+			if (!rows.length) {
+				div.children = [this.inscriptiontableEmpty];
+				Vue.render(div, this.inscriptiontable.element.querySelector('.tabulator-tableholder'));
+			} else {
+				Vue.render(null, this.inscriptiontable.element.querySelector('.tabulator-tableholder'));
+			}
+		});
+	}
+});
+app.mount('#content');
\ No newline at end of file
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 78807f26d..cf344aa52 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -17318,6 +17318,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'englisch',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Englisch",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "English",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'deutsch',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Deutsch",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "German",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'global',
@@ -17341,18 +17381,78 @@ array(
 	array(
 		'app' => 'core',
 		'category' => 'tools',
-		'phrase' => 'keinStatusImStudiensemester',
+		'phrase' => 'dokumente',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Für das übergebene Studiensemester {stsem} existiert kein Status. Bitte wählen Sie ein gültiges Studiensemester aus dem DropDown.',
+				'text' => 'Dokumente',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'No status found for {stsem}. Please select a valid semester from the dropdown.',
+				'text' => 'Documents',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'tools',
+		'phrase' => 'dokument',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Dokument',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Document',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'tools',
+		'phrase' => 'erstelldatum',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Erstelldatum',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Creation date',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'tools',
+		'phrase' => 'bestaetigungenZeugnisse',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bestätigungen/Zeugnisse',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Certificates/Transcripts',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -17381,18 +17481,258 @@ array(
 	array(
 		'app' => 'core',
 		'category' => 'tools',
-		'phrase' => 'studienbeitragFuerSSNochNichtBezahlt',
+		'phrase' => 'studienbeitragFuerSSBezahlt',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Studienbeitrag für das {stsem} noch nicht bezahlt',
+				'text' => 'Studienbeitrag für das %1$s bezahlt',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'tuition fee for semester {stsem} not yet paid',
+				'text' => 'tuition fee for semester %1$s paid',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'tools',
+		'phrase' => 'studienbeitragFuerSSNochNichtBezahlt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Studienbeitrag für das %1$s noch nicht bezahlt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'tuition fee for semester %1$s not yet paid',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'tools',
+		'phrase' => 'studienbeitragFuerStgNochNichtBezahlt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Studienbeitrag für %1$s noch nicht bezahlt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'tuition fee for %1$s not yet paid',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'tools',
+		'phrase' => 'studienbeitragNochNichtBezahlt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Studienbeitrag noch nicht bezahlt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'tuition fee not yet paid',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'tools',
+		'phrase' => 'studienerfolgsbestaetigung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Studienerfolgsbestätigung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Student progress report',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'tools',
+		'phrase' => 'studiensemesterAuswaehlen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bitte wählen Sie das entsprechende Studiensemester aus',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Please select the corresponding semester',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'tools',
+		'phrase' => 'vorlageWohnsitzfinanzamt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'zur Vorlage beim Wohnsitzfinanzamt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'for submission to local tax office',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'tools',
+		'phrase' => 'studienbuchblatt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Studienbuchblatt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Student Record', //Noch zu übersetzen
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'tools',
+		'phrase' => 'alleStudiensemester',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Alle Studiensemester',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'All semester',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'tools',
+		'phrase' => 'abschlussdokumente',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Abschlussdokumente/Zeugnisse',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Final documents/Transcripts',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'tools',
+		'phrase' => 'nochKeineAbschlussdokumenteVorhanden',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Noch keine Abschlussdokumente vorhanden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No final documents available yet',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'tools',
+		'phrase' => 'keinStatusImStudiensemester',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Für das übergebene Studiensemester %1$s existiert kein Status. Bitte wählen Sie ein gültiges Studiensemester aus dem DropDown.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No status found for %1$s. Please select a valid semester from the dropdown.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'tools',
+		'phrase' => 'warnungDruckDigitaleSignatur',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '<b>Hinweis!</b> Digital signierte Dokumente werden in manchen Browsern und PDF-Readern nicht korrekt angezeigt. <br/>Bitte verwenden Sie den <a href="https://get.adobe.com/de/reader/" target="_blank">Adobe Acrobat Reader</a>, wenn Sie das Dokument ausdrucken möchten.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '<b>Note!</b> Digitally signed documents are not displayed correctly in some browsers and PDF readers. <br/>Please use the <a href="https://get.adobe.com/de/reader/" target="_blank">Adobe Acrobat Reader</a> if you want to print the document.',
 				'description' => '',
 				'insertvon' => 'system'
 			)

From e2cf663f8811bfbe72358f37dc6476ba31d001b5 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 31 Mar 2023 09:21:09 +0200
Subject: [PATCH 0077/1461] Default Menu

---
 application/controllers/components/CisVue.php |  2 +-
 application/models/content/Content_model.php  | 58 +++++++++++++++++++
 .../views/templates/CISHTML-Header.php        |  2 +-
 3 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/application/controllers/components/CisVue.php b/application/controllers/components/CisVue.php
index dc172db76..b8b7f98cc 100644
--- a/application/controllers/components/CisVue.php
+++ b/application/controllers/components/CisVue.php
@@ -29,7 +29,7 @@ class CisVue extends Auth_Controller
 	public function Menu()
 	{
 		$this->load->model('content/Content_model', 'ContentModel');
-		$result = $this->ContentModel->getMenu(6739, get_uid());
+		$result = $this->ContentModel->getMenu(defined('CIS4_MENU_ENTRY') ? CIS4_MENU_ENTRY : null, get_uid());
 		$menu = getData($result) ?? (object)['childs' => []];
 
 		$this->outputJsonSuccess($menu);
diff --git a/application/models/content/Content_model.php b/application/models/content/Content_model.php
index c0d3c52f5..97d1837be 100644
--- a/application/models/content/Content_model.php
+++ b/application/models/content/Content_model.php
@@ -72,6 +72,64 @@ class Content_model extends DB_Model
 	 */
 	public function getMenu($root_content_id, $uid, $sprache=DEFAULT_LANGUAGE)
 	{
+		if ($root_content_id === null) {
+			$res = json_decode('{
+				"content_id": 1000000,
+				"template_kurzbz": "contentmittitel",
+				"titel": "CIS4",
+				"content": "<content></content>",
+				"menu_open": true,
+				"aktiv": true,
+				"childs": [
+					{
+						"content_id": 1000001,
+						"template_kurzbz": "redirect",
+						"titel": "News",
+						"content": "<content><url><![CDATA[../cis.php/CisHtml/Cms/news]]></url><target><![CDATA[]]></target></content>",
+						"menu_open": false,
+						"aktiv": true,
+						"childs": []
+					},
+					{
+						"content_id": 1000002,
+						"template_kurzbz": "redirect",
+						"titel": "COVID-19",
+						"content": "<content><url><![CDATA[../cis.php/CisHtml/Cms/content/10012]]></url><target><![CDATA[]]></target></content>",
+						"menu_open": false,
+						"aktiv": true,
+						"childs": []
+					},
+					{
+						"content_id": 1000003,
+						"template_kurzbz": "redirect",
+						"titel": "Meine LV",
+						"content": "<content><url><![CDATA[../cis.php/Cis/MyLv]]></url><target><![CDATA[]]></target></content>",
+						"menu_open": false,
+						"aktiv": true,
+						"childs": []
+					},
+					{
+						"content_id": 1000004,
+						"template_kurzbz": "redirect",
+						"titel": "Stundenplan",
+						"content": "<content><url><![CDATA[../cis.php/Cis/Stundenplan]]></url><target><![CDATA[]]></target></content>",
+						"menu_open": false,
+						"aktiv": true,
+						"childs": []
+					},
+					{
+						"content_id": 1000005,
+						"template_kurzbz": "redirect",
+						"titel": "Dokumente",
+						"content": "<content><url><![CDATA[../cis.php/Cis/Documents]]></url><target><![CDATA[]]></target></content>",
+						"menu_open": false,
+						"aktiv": true,
+						"childs": []
+					}
+				]
+			}');
+			return success($res);
+		}
 		$sql = "
 		SELECT 
 			c.content_id, 
diff --git a/application/views/templates/CISHTML-Header.php b/application/views/templates/CISHTML-Header.php
index 63d325d52..1a997e2c5 100644
--- a/application/views/templates/CISHTML-Header.php
+++ b/application/views/templates/CISHTML-Header.php
@@ -18,7 +18,7 @@ $this->load->view('templates/FHC-Header', $includesArray);
 if (!isset($menu)) {
 	$ci =& get_instance(); // get CI instance
 	$ci->load->model('content/Content_model', 'ContentModel');
-	$result = $ci->ContentModel->getMenu(6739, get_uid());
+	$result = $ci->ContentModel->getMenu(defined('CIS4_MENU_ENTRY') ? CIS4_MENU_ENTRY : null, get_uid());
 	$menu = getData($result) ?? (object)['childs' => []];
 }
 ?>

From 2a59fad2fcf88f0f689ac68e3620603eec079b3d Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 31 Mar 2023 09:21:52 +0200
Subject: [PATCH 0078/1461] CMS loading speedup

---
 public/js/apps/Cis/Cms.js | 37 +++++++++++++++++--------------------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/public/js/apps/Cis/Cms.js b/public/js/apps/Cis/Cms.js
index c28f96049..8f006ec27 100644
--- a/public/js/apps/Cis/Cms.js
+++ b/public/js/apps/Cis/Cms.js
@@ -1,23 +1,20 @@
 import BsConfirm from "../../components/Bootstrap/Confirm.js";
 
 Vue.createApp({
-    components: {
-        BsConfirm
-    },
-    mounted() {
-    	document.querySelectorAll('#cms [data-confirm]').forEach(el => {
-            el.addEventListener('click', evt => {
-                evt.preventDefault();
-                BsConfirm.popup(el.dataset.confirm).then(() => {
-                    Axios.get(el.href).then(res => {
-                        // TODO(chris): check for success then show message and/or reload
-                        location = location;
-                    }).catch(err => console.error('ERROR:', err));
-                }).catch(()=>{});
-            });
-        });
-        document.querySelectorAll('#cms [data-href]').forEach(el => {
-            el.href = el.dataset.href.replace(/^ROOT\//, FHC_JS_DATA_STORAGE_OBJECT.app_root);
-        });
-    }
-}).mount('#cms');
\ No newline at end of file
+	mounted() {
+		document.querySelectorAll('#cms [data-confirm]').forEach(el => {
+			el.addEventListener('click', evt => {
+				evt.preventDefault();
+				BsConfirm.popup(el.dataset.confirm).then(() => {
+					Axios.get(el.href).then(res => {
+						// TODO(chris): check for success then show message and/or reload
+						location = location;
+					}).catch(err => console.error('ERROR:', err));
+				}).catch(()=>{});
+			});
+		});
+		document.querySelectorAll('#cms [data-href]').forEach(el => {
+			el.href = el.dataset.href.replace(/^ROOT\//, FHC_JS_DATA_STORAGE_OBJECT.app_root);
+		});
+	}
+}).mount('#cms [data-confirm], #cms [data-href]');

From 95458c193c731ffd1c6ed783e2b25aa185353254 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 31 Mar 2023 14:50:56 +0200
Subject: [PATCH 0079/1461] CIS4 Entry & View titles

---
 application/config/routes.php           | 2 +-
 application/views/Cis/Documents.php     | 1 +
 application/views/Cis/MyLv.php          | 1 +
 application/views/Cis/Stundenplan.php   | 1 +
 application/views/CisHtml/Dashboard.php | 1 +
 cis.php                                 | 1 +
 6 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/application/config/routes.php b/application/config/routes.php
index 63f9ab61e..f872dc145 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -50,7 +50,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 | Examples: my-controller/index -> my_controller/index
 |   my-controller/my-method -> my_controller/my_method
 */
-$route['default_controller'] = 'Vilesci';
+$route['default_controller'] = defined('CIS4') && CIS4 ? 'Cis4' : 'Vilesci';
 $route['translate_uri_dashes'] = FALSE;
 
 // Class name conflicts
diff --git a/application/views/Cis/Documents.php b/application/views/Cis/Documents.php
index 1e7b0ea48..191558d86 100644
--- a/application/views/Cis/Documents.php
+++ b/application/views/Cis/Documents.php
@@ -1,5 +1,6 @@
 <?php
 $includesArray = array(
+	'title' => 'Documents',
 	'tabulator5' => true,
 	'customJSModules' => ['public/js/apps/Cis/Documents.js']
 );
diff --git a/application/views/Cis/MyLv.php b/application/views/Cis/MyLv.php
index 3dc7c494d..ff03f3b51 100644
--- a/application/views/Cis/MyLv.php
+++ b/application/views/Cis/MyLv.php
@@ -1,5 +1,6 @@
 <?php
 $includesArray = array(
+	'title' => 'MyLv',
 	'customJSModules' => ['public/js/apps/Cis/MyLv/Student.js']
 );
 
diff --git a/application/views/Cis/Stundenplan.php b/application/views/Cis/Stundenplan.php
index f4b3dbc15..cb8f8a712 100644
--- a/application/views/Cis/Stundenplan.php
+++ b/application/views/Cis/Stundenplan.php
@@ -1,5 +1,6 @@
 <?php
 $includesArray = array(
+	'title' => 'Stundenplan',
 	'customJSModules' => ['public/js/apps/Cis/Stundenplan.js'],
 	'customCSSs' => ['public/css/components/calendar.css']
 );
diff --git a/application/views/CisHtml/Dashboard.php b/application/views/CisHtml/Dashboard.php
index adb038a35..1b023191e 100644
--- a/application/views/CisHtml/Dashboard.php
+++ b/application/views/CisHtml/Dashboard.php
@@ -1,5 +1,6 @@
 <?php
 $includesArray = array(
+	'title' => 'Dashboard',
 	'customJSModules' => ['public/js/apps/Dashboard/Fhc.js'],
 	'customCSSs' => [
 		'public/css/components/dashboard.css'
diff --git a/cis.php b/cis.php
index 725a4017f..76f23d043 100644
--- a/cis.php
+++ b/cis.php
@@ -58,6 +58,7 @@
 // Loads FHC config files
 require_once 'config/global.config.inc.php';
 require_once 'config/cis.config.inc.php';
+define('CIS4', true);
 
 // Check if the CI_ENVIRONMENT constants is set and eventually use it to set the CI_ENV environment variable
 if (defined('CI_ENVIRONMENT')) $_SERVER['CI_ENV'] = CI_ENVIRONMENT;

From 4f43b79ed5bd7daa43f0ba02092bd19cd3331e9d Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 14 Apr 2023 12:50:07 +0200
Subject: [PATCH 0080/1461] default controller

---
 application/controllers/Cis4.php | 35 ++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 application/controllers/Cis4.php

diff --git a/application/controllers/Cis4.php b/application/controllers/Cis4.php
new file mode 100644
index 000000000..bbb0bd672
--- /dev/null
+++ b/application/controllers/Cis4.php
@@ -0,0 +1,35 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * 
+ */
+class Cis4 extends Auth_Controller
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct(
+			array(
+				'index' => 'user:r'
+			)
+		);
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * @return void
+	 */
+	public function index()
+	{
+		$this->load->view('CisHtml/Dashboard.php');
+	}
+
+	
+
+}

From 2780ec5636a9612ac994f304285f1edc90d3290c Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 5 May 2023 14:27:33 +0200
Subject: [PATCH 0081/1461] Dashboard Admin Demo

---
 .../controllers/dashboard/DashboardDemo.php   |  8 +++++
 .../libraries/dashboard/DashboardLib.php      |  2 ++
 .../views/dashboard/dashboard_demo_admin.php  | 32 +++++++++++++++++++
 public/js/apps/Dashboard.js                   |  4 ---
 public/js/apps/{Test.js => DashboardAdmin.js} |  7 +---
 system/dbupdate_3.4/dbupdate_dashboard.php    |  2 ++
 6 files changed, 45 insertions(+), 10 deletions(-)
 create mode 100644 application/views/dashboard/dashboard_demo_admin.php
 rename public/js/apps/{Test.js => DashboardAdmin.js} (58%)

diff --git a/application/controllers/dashboard/DashboardDemo.php b/application/controllers/dashboard/DashboardDemo.php
index 9822fafc5..90eb017b8 100644
--- a/application/controllers/dashboard/DashboardDemo.php
+++ b/application/controllers/dashboard/DashboardDemo.php
@@ -17,6 +17,7 @@ class DashboardDemo extends Auth_Controller
         parent::__construct(
             array(
                 'index' => 'user:r',
+                'admin' => 'dashboard/admin:rw'
             )
         );
 
@@ -35,6 +36,13 @@ class DashboardDemo extends Auth_Controller
 		$this->load->view('dashboard/dashboard_demo.php', []);
 	}
 
+    // -----------------------------------------------------------------------------------------------------------------
+    // Public methods
+    public function admin()
+    {
+        $this->load->view('dashboard/dashboard_demo_admin.php', []);
+    }
+
     // -----------------------------------------------------------------------------------------------------------------
     // Private methods
 
diff --git a/application/libraries/dashboard/DashboardLib.php b/application/libraries/dashboard/DashboardLib.php
index 1c503c25c..edea7c310 100644
--- a/application/libraries/dashboard/DashboardLib.php
+++ b/application/libraries/dashboard/DashboardLib.php
@@ -114,6 +114,8 @@ class DashboardLib
 	
 	public function getPresetOrCreateEmptyPreset($dashboard_kurzbz, $funktion_kurzbz)
 	{
+		if ($funktion_kurzbz === self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL)
+			$funktion_kurzbz = null;
 		$preset = $this->getPreset($dashboard_kurzbz, $funktion_kurzbz);
 		if (null !== $preset) {
 			return $preset;
diff --git a/application/views/dashboard/dashboard_demo_admin.php b/application/views/dashboard/dashboard_demo_admin.php
new file mode 100644
index 000000000..0d92146a8
--- /dev/null
+++ b/application/views/dashboard/dashboard_demo_admin.php
@@ -0,0 +1,32 @@
+<?php
+$this->load->view(
+	'templates/FHC-Header',
+	array(
+		'title' => 'FH-Complete',
+		'bootstrap5' => true,
+		'fontawesome6' => true,
+		'axios027' => true,
+		'restclient' => true,
+		'vue3' => true,
+		'customJSModules' => ['public/js/apps/DashboardAdmin.js'],
+		'customCSSs' => [
+			'public/css/components/dashboard.css'
+		],
+		'navigationcomponent' => true
+	)
+);
+?>
+
+	<div id="main">
+
+		<core-navigation-cmpt :add-side-menu-entries="appSideMenuEntries"></core-navigation-cmpt>
+
+		<div id="content">
+			<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
+				<h1 class="h2">Dashboard</h1>
+			</div>
+			<dashboard-admin dashboard="CIS" apiurl="<?= site_url('dashboard'); ?>"></dashboard-admin>
+		</div>
+	</div>
+
+<?php $this->load->view('templates/FHC-Footer'); ?>
diff --git a/public/js/apps/Dashboard.js b/public/js/apps/Dashboard.js
index 54a73441c..e56425a6d 100644
--- a/public/js/apps/Dashboard.js
+++ b/public/js/apps/Dashboard.js
@@ -8,9 +8,5 @@ Vue.createApp({
   components: {
     CoreNavigationCmpt,
     CoreDashboard
-    /*,
-    "CoreFilterCmpt": CoreFilterCmpt,
-    "verticalsplit": verticalsplit,
-    "searchbar": searchbar*/
   }
 }).mount('#main');
diff --git a/public/js/apps/Test.js b/public/js/apps/DashboardAdmin.js
similarity index 58%
rename from public/js/apps/Test.js
rename to public/js/apps/DashboardAdmin.js
index cdf3e78f3..fed16f577 100644
--- a/public/js/apps/Test.js
+++ b/public/js/apps/DashboardAdmin.js
@@ -1,5 +1,4 @@
 import {CoreNavigationCmpt} from '../components/navigation/Navigation.js';
-import CoreDashboard from '../components/Dashboard/Dashboard.js';
 import DashboardAdmin from '../components/Dashboard/Admin.js';
 
 Vue.createApp({
@@ -8,11 +7,7 @@ Vue.createApp({
     }),
   components: {
     CoreNavigationCmpt,
-    DashboardAdmin,
-    CoreDashboard/*,
-    "CoreFilterCmpt": CoreFilterCmpt,
-    "verticalsplit": verticalsplit,
-    "searchbar": searchbar*/
+    DashboardAdmin
   },
   mounted() {
   }
diff --git a/system/dbupdate_3.4/dbupdate_dashboard.php b/system/dbupdate_3.4/dbupdate_dashboard.php
index 22c2ef4cf..e1e611e4e 100644
--- a/system/dbupdate_3.4/dbupdate_dashboard.php
+++ b/system/dbupdate_3.4/dbupdate_dashboard.php
@@ -399,6 +399,7 @@ GRANT ALL ON SEQUENCE dashboard.tbl_dashboard_preset_preset_id_seq TO vilesci;
 --
 
 GRANT SELECT ON TABLE dashboard.tbl_dashboard_widget TO web;
+GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE dashboard.tbl_dashboard_widget TO vilesci;
 
 
 --
@@ -406,6 +407,7 @@ GRANT SELECT ON TABLE dashboard.tbl_dashboard_widget TO web;
 --
 
 GRANT SELECT ON TABLE dashboard.tbl_widget TO web;
+GRANT SELECT,INSERT,UPDATE ON TABLE dashboard.tbl_widget TO vilesci;
 
 
 --

From d54868070f421489c6d881ebbdfaa181985ab805 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 8 May 2023 12:39:25 +0200
Subject: [PATCH 0082/1461] 29006: Dashboard verbesserungen

---
 application/controllers/dashboard/Config.php  |  12 +-
 .../controllers/dashboard/Dashboard.php       |  12 +-
 public/css/components/dashboard.css           |  21 +-
 public/js/components/Dashboard/Admin.js       |   6 +-
 .../js/components/Dashboard/Admin/Presets.js  |   5 +-
 public/js/components/Dashboard/Dashboard.js   |   9 +-
 public/js/components/Dashboard/Item.js        |   9 +-
 public/js/components/Dashboard/Section.js     | 472 +++---------------
 public/js/components/Drop/Grid.js             | 377 ++++++++++++++
 public/js/components/Drop/Grid/Item.js        |  71 +++
 public/js/composables/GridLogic.js            | 208 ++++++++
 11 files changed, 774 insertions(+), 428 deletions(-)
 create mode 100644 public/js/components/Drop/Grid.js
 create mode 100644 public/js/components/Drop/Grid/Item.js
 create mode 100644 public/js/composables/GridLogic.js

diff --git a/application/controllers/dashboard/Config.php b/application/controllers/dashboard/Config.php
index 444597ce5..2c0cf5fca 100644
--- a/application/controllers/dashboard/Config.php
+++ b/application/controllers/dashboard/Config.php
@@ -18,9 +18,9 @@ class Config extends Auth_Controller
 				'removeWidgetFromPreset'		=> 'dashboard/admin:rw',
 				'addWidgetsToUserOverride'		=> 'dashboard/benutzer:rw',
 				'removeWidgetFromUserOverride'	=> 'dashboard/benutzer:rw',
-				'Funktionen'					=> 'dashboard/admin:r',
-				'Preset'						=> 'dashboard/admin:r',
-				'PresetBatch'					=> 'dashboard/admin:r'
+				'funktionen'					=> 'dashboard/admin:r',
+				'preset'						=> 'dashboard/admin:r',
+				'presetBatch'					=> 'dashboard/admin:r'
 			)
 		);
 		
@@ -164,7 +164,7 @@ class Config extends Auth_Controller
 		$this->outputJsonSuccess(array('msg' => 'override successfully updated.'));
 	}
 	
-	public function Funktionen()
+	public function funktionen()
 	{
 		$funktionen = $this->FunktionModel->load();
 
@@ -178,7 +178,7 @@ class Config extends Auth_Controller
 		return $this->outputJsonSuccess(getData($funktionen) ?: []);
 	}
 	
-	public function Preset()
+	public function preset()
 	{
 		$db = $this->input->get('db');
 		$funktion = $this->input->get('funktion');
@@ -191,7 +191,7 @@ class Config extends Auth_Controller
 		return $this->outputJsonSuccess(json_decode($conf->preset, true));
 	}
 	
-	public function PresetBatch()
+	public function presetBatch()
 	{
 		$db = $this->input->get('db');
 		$funktionen = $this->input->get('funktionen');
diff --git a/application/controllers/dashboard/Dashboard.php b/application/controllers/dashboard/Dashboard.php
index e827a0c7c..3773a6d73 100644
--- a/application/controllers/dashboard/Dashboard.php
+++ b/application/controllers/dashboard/Dashboard.php
@@ -12,9 +12,9 @@ class Dashboard extends Auth_Controller
 		parent::__construct(
 			array(
 				'index'							=> 'dashboard/admin:r',
-				'Create'						=> 'dashboard/admin:rw',
-				'Update'						=> 'dashboard/admin:rw',
-				'Delete'						=> 'dashboard/admin:rw'
+				'create'						=> 'dashboard/admin:rw',
+				'update'						=> 'dashboard/admin:rw',
+				'delete'						=> 'dashboard/admin:rw'
 			)
 		);
 		
@@ -36,7 +36,7 @@ class Dashboard extends Auth_Controller
 		return $this->outputJsonSuccess(getData($result) ?: []);
 	}
 	
-	public function Create()
+	public function create()
 	{
 		$input = $this->getPostJSON();
 
@@ -52,7 +52,7 @@ class Dashboard extends Auth_Controller
 		return $this->outputJsonSuccess(getData($result) ?: []);
 	}
 	
-	public function Update()
+	public function update()
 	{
 		$input = $this->getPostJSON();
 
@@ -68,7 +68,7 @@ class Dashboard extends Auth_Controller
 		return $this->outputJsonSuccess(getData($result) ?: []);
 	}
 	
-	public function Delete()
+	public function delete()
 	{
 		$input = $this->getPostJSON();
 
diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
index 25d33adcd..cef8e4b28 100644
--- a/public/css/components/dashboard.css
+++ b/public/css/components/dashboard.css
@@ -1,17 +1,24 @@
+.empty-tile-hover {
+	height: 100%;
+	width: 100%;
+	background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="-500 -500 1448 1512"><path fill="lightgray" d="M64 32C28.7 32 0 60.7 0 96V416c0 35.3 28.7 64 64 64H384c35.3 0 64-28.7 64-64V96c0-35.3-28.7-64-64-64H64zM200 344V280H136c-13.3 0-24-10.7-24-24s10.7-24 24-24h64V168c0-13.3 10.7-24 24-24s24 10.7 24 24v64h64c13.3 0 24 10.7 24 24s-10.7 24-24 24H248v64c0 13.3-10.7 24-24 24s-24-10.7-24-24z"/></svg>');
+	background-repeat: no-repeat;
+	background-position: center;
+	background-size: cover;
+	cursor:pointer;
+}
+
 .alert-danger .form-check-input:checked {
 	border-color: #842029;
 	background-color: #842029;
 }
 
-.draganddropcontainer {
-	grid-template-columns:repeat(4,1fr);
-	gap: 1rem;
-	place-items: stretch;
-	place-content: stretch;
+:root {
+	--fhc-dashboard-grid-size: 4;
 }
 @media(max-width: 577px) {
-	.draganddropcontainer {
-		grid-template-columns:repeat(2,1fr);
+	:root {
+		--fhc-dashboard-grid-size: 2;
 	}
 }
 
diff --git a/public/js/components/Dashboard/Admin.js b/public/js/components/Dashboard/Admin.js
index 775cd87d6..b92609ad7 100644
--- a/public/js/components/Dashboard/Admin.js
+++ b/public/js/components/Dashboard/Admin.js
@@ -35,7 +35,7 @@ export default {
 			BsPrompt.popup('New Dashboard name').then(
 				name => {
 					_name = name;
-					return axios.post(this.apiurl + '/Dashboard/Create', {
+					return axios.post(this.apiurl + '/Dashboard/create', {
 						dashboard_kurzbz: name
 					})
 				}
@@ -51,14 +51,14 @@ export default {
 		},
 		dashboardUpdate(dashboard) {
 			// TODO(chris): Loading or message
-			axios.post(this.apiurl + '/Dashboard/Update', dashboard).then(() => {
+			axios.post(this.apiurl + '/Dashboard/update', dashboard).then(() => {
 				let old = this.dashboards.find(el => el.dashboard_id == dashboard.dashboard_id);
 				old.dashboard_kurzbz = dashboard.dashboard_kurzbz;
 				old.beschreibung = dashboard.beschreibung;
 			}).catch(err => console.error('ERROR:', err));
 		},
 		dashboardDelete(dashboard_id) {
-			axios.post(this.apiurl + '/Dashboard/Delete', {dashboard_id}).then(() => {
+			axios.post(this.apiurl + '/Dashboard/delete', {dashboard_id}).then(() => {
 				this.current = -1;
 				this.dashboards = this.dashboards.filter(el => el.dashboard_id != dashboard_id);
 			}).catch(err => console.error('ERROR:', err));
diff --git a/public/js/components/Dashboard/Admin/Presets.js b/public/js/components/Dashboard/Admin/Presets.js
index a86de1966..63e010014 100644
--- a/public/js/components/Dashboard/Admin/Presets.js
+++ b/public/js/components/Dashboard/Admin/Presets.js
@@ -29,6 +29,7 @@ export default {
 			this.$refs.widgetpicker.getWidget().then(widget_id => {
 				widget.widget = widget_id;
 				delete widget.custom;
+				widget.preset = 1;
 				let loading = {...widget};
 				loading.loading = true;
 				this.sections.forEach(section => {
@@ -119,7 +120,7 @@ export default {
 			let funktionen = Array.from(evt.target.querySelectorAll("option:checked"),e=>e.value);
 			this.sections = [];
 			this.tmpLoading = funktionen.join('###');
-			axios.get(this.apiurl + '/Config/PresetBatch', {params: {
+			axios.get(this.apiurl + '/Config/presetBatch', {params: {
 				db: this.dashboard,
 				funktionen
 			}}).then(res => {
@@ -142,7 +143,7 @@ export default {
 		}
 	},
 	created() {
-		axios.get(this.apiurl + '/Config/Funktionen').then(res => {
+		axios.get(this.apiurl + '/Config/funktionen').then(res => {
 			//console.log(res.data.retval);
 			this.funktionen = {general: 'GENERAL'};
 			res.data.retval.forEach(funktion => {
diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js
index 2f2aa4d79..c87ad9b65 100644
--- a/public/js/components/Dashboard/Dashboard.js
+++ b/public/js/components/Dashboard/Dashboard.js
@@ -70,7 +70,7 @@ export default {
 							if (this.sections[i].widgets[wid].id == k) {
 								payload[k] = ObjectUtils.mergeDeep(this.sections[i].widgets[wid], payload[k]);
 								// NOTE(chris): remove internal props
-								for (var prop in {_x:1,_y:1,_w:1,_h:1,index:1,id:1})
+								for (var prop in {_x:1,_y:1,_w:1,_h:1,index:1,id:1,preset:1})
 									if (payload[k][prop])
 										delete payload[k][prop];
 								break;
@@ -126,14 +126,19 @@ export default {
 			//console.log(res.data.retval);
 			for (var name in res.data.retval.widgets) {
 				let widgets = [];
+				let remove = [];
 				for (var wid in res.data.retval.widgets[name]) {
 					res.data.retval.widgets[name][wid].id = wid;
-					widgets.push(res.data.retval.widgets[name][wid]);
+					if (res.data.retval.widgets[name][wid].custom || res.data.retval.widgets[name][wid].preset)
+						widgets.push(res.data.retval.widgets[name][wid]);
+					else
+						remove.push(wid);
 				}
 				this.sections.push({
 					name: name,
 					widgets: widgets
 				});
+				remove.forEach(wid => this.widgetRemove(name, wid));
 			}
 		}).catch(err => console.error('ERROR:', err));
 	},
diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index 7d7639362..0e10a669d 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -97,14 +97,15 @@ export default {
 		this.arguments = {...this.widget.arguments, ...this.config};
 		this.tmpConfig = {...this.arguments};
 	},
-	template: `<div v-if="loading">
+	template: `
+	<div v-if="loading">
 		<div class="d-flex justify-content-center align-items-center h-100">
 			<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
 		</div>
 	</div>
-	<div v-else-if="!hidden || editMode" :class="'dashboard-item card overflow-hidden ' + (arguments ? arguments.className : '')" @mousedown="mouseDown($event)" @dragstart="startDrag($event)" :draggable="!!editMode">
+	<div v-else-if="!hidden || editMode" :class="'dashboard-item card overflow-hidden h-100 ' + (arguments && arguments.className ? arguments.className : '')">
 		<div v-if="editMode && widget" class="card-header d-flex ps-0 pe-2">
-			<span ref="dragHandle" class="col-auto mx-2 px-2 cursor-move"><i class="fa-solid fa-grip-vertical"></i></span>
+			<span drag-action="move" class="col-auto mx-2 px-2 cursor-move"><i class="fa-solid fa-grip-vertical"></i></span>
 			<span class="col">{{ widget.setup.name }}</span>
 			<a v-if="hasConfig" class="col-auto px-1" href="#" @click.prevent="openConfig"><i class="fa-solid fa-gear"></i></a>
 			<a v-if="custom" class="col-auto px-1" href="#" @click.prevent="$emit('remove')">
@@ -132,7 +133,7 @@ export default {
 			</template>
 		</bs-modal>
 		<div v-if="editMode && isResizeable" class="card-footer d-flex justify-content-end p-0">
-			<span ref="resizeHandle" class="col-auto px-1 cursor-nw-resize" @dragstart.prevent="$emit('resize')"><i class="fa-solid fa-up-right-and-down-left-from-center mirror-x"></i></span>
+			<span drag-action="resize" class="col-auto px-1 cursor-nw-resize"><i class="fa-solid fa-up-right-and-down-left-from-center mirror-x"></i></span>
 		</div>
 	</div>`
 }
\ No newline at end of file
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 84bcdd58e..868672a50 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -1,14 +1,16 @@
 import BsConfirm from "../Bootstrap/Confirm.js";
+import DropGrid from '../Drop/Grid.js'
 import DashboardItem from "./Item.js";
 import CachedWidgetLoader from "../../composables/Dashboard/CachedWidgetLoader.js";
 
-// TODO(chris): handle overflow (moving outside the box)
 export default {
 	components: {
+		DropGrid,
 		DashboardItem
 	},
 	inject: {
 		adminMode: {
+			type: Boolean,
 			default: false
 		}
 	},
@@ -23,371 +25,43 @@ export default {
 	],
 	data() {
 		return {
-			gridWidth: 0,
-			changeHeight: 1,
-			movedObjects: [],
-			editMode: this.adminMode ? 1 : 0,
-			gridXLast: -1, // NOTE(chris): 0 based
-			gridYLast: -1,
-			dragging: 0,
-			dataTransfer: {},
-			gridAddFound: false,
-			gridXAdd: -1, // NOTE(chris): 0 based
-			gridYAdd: -1
+			gridWidth: 1,
+			editMode: this.adminMode
 		}
 	},
 	computed: {
 		items() {
-			this.widgets.forEach((item,i) => item.index = i);
-			return this.widgets;
-		},
-		itemCoords() { // NOTE(chris): 1 based
-			if (!this.gridWidth)
-				return [];
-			let itemCoords = this.items.map(item => item.place[this.gridWidth] || this.createItemPlacement(item));
-			// TODO(chris): verify positions & sizes
-			let occupiers = [];
-			let wrongPlacedItems = [];
-			let gridWidth = this.gridWidth;
-			this.items.forEach(item => {
-				let x = item._x !== undefined ? item._x : itemCoords[item.index].x;
-				let y = item._y !== undefined ? item._y : itemCoords[item.index].y;
-				let w = item._w !== undefined ? item._w : itemCoords[item.index].w;
-				let h = item._h !== undefined ? item._h : itemCoords[item.index].h;
-				// TODO(chris): check with and height params here?
-				for (var i = 0; i < w; i++) {
-					for (var j = 0; j < h; j++) {
-						var c = (y+j-1) * gridWidth + (x+i-1);
-						// NOTE(chris): check for overlaping items
-						if (occupiers[c] !== undefined) {
-							//console.log('try to add ' + item.index + ' to ' + x + '/' + y + ', but ' + occupiers[c] + ' is already there');
-							// NOTE(chris): remove possible other entries of this item
-							for (var c2 = c; c2; c2--)
-								if (occupiers[c2] == item.index)
-									occupiers[c2] = undefined;
-							wrongPlacedItems.push(item);
-							return;
-						}
-						occupiers[c] = item.index;
-					}
-				}
+			return this.widgets.map(item => {
+				return {...item, ...(item.place[this.gridWidth] || {})};
 			});
-			wrongPlacedItems.forEach(item => {
-				let w = item._w !== undefined ? item._w : itemCoords[item.index].w;
-				let h = item._h !== undefined ? item._h : itemCoords[item.index].h;
-				for (var c = 0; c < occupiers.length + gridWidth; c++) {
-					if (occupiers[c] === undefined) {
-						var occupied = false, i, j;
-						for (i = 0; i < w; i++) {
-							for (j = 0; j < h; j++) {
-								if (occupiers[c + i + j * gridWidth] !== undefined) {
-									i = w;
-									occupied = true;
-									break;
-								}
-							}
-						}
-						if (!occupied) {
-							item.place[gridWidth].x = c%gridWidth + 1;
-							item.place[gridWidth].y = Math.floor(c/gridWidth) + 1;
-							for (i = 0; i < w; i++) {
-								for (j = 0; j < h; j++) {
-									occupiers[c + i + j * gridWidth] = item.index;
-								}
-							}
-							return;
-						}
-					}
-				}
-			});
-			return itemCoords;
-		},
-		gridHeight() {
-			if (!this.gridWidth || !this.changeHeight)
-				return 0;
-			let minH = 0;
-			this.itemCoords.forEach((item,i) => minH = Math.max(minH, (!this.editMode && this.items[i].hidden) ? 0 : item.y - 1 + item.h));
-			// TODO(chris): the extraline should only be present if all slots are occupied
-			if (minH == 0 && this.editMode)
-				return 1;
-			return minH + this.editMode*this.dragging;
-		},
-		gridOccupiers() { // NOTE(chris): 0 based
-			let occupiers = [];
-			let gridWidth = this.gridWidth;
-			this.items.forEach(item => {
-				let x = item._x !== undefined ? item._x : this.itemCoords[item.index].x;
-				let y = item._y !== undefined ? item._y : this.itemCoords[item.index].y;
-				let w = item._w !== undefined ? item._w : this.itemCoords[item.index].w;
-				let h = item._h !== undefined ? item._h : this.itemCoords[item.index].h;
-				for (var i = 0; i < w; i++) {
-					for (var j = 0; j < h; j++) {
-						var c = (y+j-1) * gridWidth + (x+i-1);
-						occupiers[c] = item.index;
-					}
-				}
-			});
-			return occupiers;
-		},
-		cssBg() {
-			if (!this.editMode || this.dragging || !this.gridAddFound)
-				return 'transparent';
-			let x = this.gridXAdd, y = this.gridYAdd, h = this.gridHeight-1 || 1, w = this.gridWidth-1 || 1;
-			return `url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="-500 -500 1448 1512"><path fill="lightgray" d="M64 32C28.7 32 0 60.7 0 96V416c0 35.3 28.7 64 64 64H384c35.3 0 64-28.7 64-64V96c0-35.3-28.7-64-64-64H64zM200 344V280H136c-13.3 0-24-10.7-24-24s10.7-24 24-24h64V168c0-13.3 10.7-24 24-24s24 10.7 24 24v64h64c13.3 0 24 10.7 24 24s-10.7 24-24 24H248v64c0 13.3-10.7 24-24 24s-24-10.7-24-24z"/></svg>')` + (100 * x/w) + '% ' + (100 * y/h) + '%/' + (100/this.gridWidth) + '% ' + (100/this.gridHeight) + '% no-repeat;cursor:pointer';
 		}
 	},
 	methods: {
-		addWidget(evt) {
-			if (evt.target != this.$refs.container || !this.editMode)
-				return;
-			const rect = this.$refs.container.getBoundingClientRect();
-			const gridX = Math.floor(this.gridWidth * (evt.clientX - rect.left) / this.$refs.container.clientWidth);
-			const gridY = Math.floor(this.gridHeight * (evt.clientY - rect.top) / this.$refs.container.clientHeight);
-			if (this.gridOccupiers[gridY * this.gridWidth + gridX] === undefined) {
-				let widget = { widget: 1, config: {}, place: {}, custom: 1 };
-				widget.place[this.gridWidth] = {
-					x: gridX+1,
-					y: gridY+1,
-					w: 1,
-					h: 1
-				};
-				this.$emit('widgetAdd', this.name, widget);
+		checkResizeLimit(item, w, h) {
+			// NOTE(chris): widgets needs to be loaded for this to work
+			let widget = CachedWidgetLoader.getWidget(item.widget);
+			if (widget) {
+				let minmaxW = widget.setup.width;
+				if (minmaxW.max)
+					minmaxW.min = minmaxW.min || 1;
+				else
+					minmaxW = {min:minmaxW,max:minmaxW};
+				if (w < minmaxW.min)
+					w = minmaxW.min;
+				if (w > minmaxW.max)
+					w = minmaxW.max;
+
+				let minmaxH = widget.setup.height;
+				if (minmaxH.max)
+					minmaxH.min = minmaxH.min || 1;
+				else
+					minmaxH = {min:minmaxH,max:minmaxH};
+				if (h < minmaxH.min)
+					h = minmaxH.min;
+				if (h > minmaxH.max)
+					h = minmaxH.max;
 			}
-		},
-		createItemPlacement(item) {
-			// TODO(chris): create correct default placement if it is not there
-			item.place[this.gridWidth] = {x:1,y:1,w:1,h:1};
-			/*var freeList = [], nextId = 0;
-			this.items.forEach(item => {
-				if (!item.place[this.gridWidth]) {
-					if (!this.gridWidth) {
-						item.place[this.gridWidth] = {x:1,y:nextId++,w:1,h:1};
-					} else {
-						// TODO(chris): IMPLEMENT widths & heights
-						if (freeList[nextId])
-							while (freeList[++nextId]);
-						freeList[nextId] = 1;
-						item.place[this.gridWidth] = {x:(nextId%this.gridWidth)+1,y:Math.floor(nextId/this.gridWidth)+1,w:1,h:1};
-					}
-				}
-			});*/
-			return item.place[this.gridWidth];
-		},
-		onMouseMove(evt) {
-			if (!this.editMode || this.dragging) {
-				this.gridXAdd = this.gridYAdd = -1;
-				return;
-			}
-			
-			const rect = this.$refs.container.getBoundingClientRect();
-			const gridX = Math.floor(this.gridWidth * (evt.clientX - rect.left) / this.$refs.container.clientWidth);
-			const gridY = Math.floor(this.gridHeight * (evt.clientY - rect.top) / this.$refs.container.clientHeight);
-
-			if (this.gridXAdd == gridX && this.gridYAdd == gridY)
-				return;
-			// TODO(chris): only mark it when its not occupied
-			this.gridXAdd = gridX;
-			this.gridYAdd = gridY;
-			this.gridAddFound = (this.gridOccupiers[gridX + gridY * this.gridWidth] === undefined);
-		},
-		onMouseLeave() {
-			this.gridXAdd = this.gridYAdd = -1;
-			this.gridAddFound = false;
-		},
-		startDrag(evt, item) {
-			this.dragging = 1;
-			this.gridXLast = -1;
-			this.gridYLast = -1;
-			item._x = this.itemCoords[item.index].x;
-			item._y = this.itemCoords[item.index].y;
-
-			evt.dataTransfer.dropEffect = 'move';
-			evt.dataTransfer.effectAllowed = 'move';
-			this.dataTransfer = {
-				action: 'm',
-				id: item.index,
-				w: this.itemCoords[item.index].w,
-				h: this.itemCoords[item.index].h
-			}
-		},
-		startResize(evt, item) {
-			this.dragging = 1;
-			this.gridXLast = -1;
-			this.gridYLast = -1;
-			item._w = this.itemCoords[item.index].w;
-			item._h = this.itemCoords[item.index].h;
-
-			evt.dataTransfer.setDragImage(evt.target, -99999, -99999);
-			evt.dataTransfer.dropEffect = 'move';
-			evt.dataTransfer.effectAllowed = 'move';
-			this.dataTransfer = {
-				action: 'r',
-				id: item.index,
-				x: this.itemCoords[item.index].x,
-				y: this.itemCoords[item.index].y
-			}
-		},
-		occupyFields(id, x, y, w, h) {
-			var c;
-			while ((c = this.movedObjects.pop())) {
-				if (this.items[c]._y !== undefined) {
-					this.items[c].place[this.gridWidth].y = this.items[c]._y;
-					this.items[c]._y = undefined;
-				}
-			}
-			var move = {};
-			move[id] = this.items[id];
-			this.getOccupiedItems(x,y,w,h,move);
-			h = y + h;
-			y = 0;
-			for (x in move) {
-				if (x != id) {
-					c = move[x]._y !== undefined ? move[x]._y : this.itemCoords[x].y;
-					if (c < h)
-						y = Math.max(h-c, y);
-				}
-			}
-			for (x in move) {
-				if (x != id) {
-					this.movedObjects.push(x);
-					if (move[x]._y === undefined) {
-						move[x]._y = this.itemCoords[x].y;
-					}
-					move[x].place[this.gridWidth].y = move[x]._y + y;
-				}
-			}
-		},
-		getOccupiedItems(x, y, w, h, move) {
-			var i, j, c;
-			for (i = 0; i < w; i++) {
-				for (j = 0; j < h; j++) {
-					c = (y+j-1) * this.gridWidth + (x+i-1);
-					if (this.gridOccupiers[c] !== undefined && !move[this.gridOccupiers[c]]) {
-						move[this.gridOccupiers[c]] = this.items[this.gridOccupiers[c]];
-						c = this.itemCoords[this.gridOccupiers[c]];
-						this.getOccupiedItems(c.x, c.y + 1, c.w, c.h, move);
-					}
-				}
-			}
-		},
-		onDragOver(evt) {
-			let id, x, y, w, h;
-			const action = this.dataTransfer.action;
-			const rect = this.$refs.container.getBoundingClientRect();
-			const gridX = Math.floor(this.gridWidth * (evt.clientX - rect.left) / this.$refs.container.clientWidth);
-			const gridY = Math.floor(this.gridHeight * (evt.clientY - rect.top) / this.$refs.container.clientHeight);
-
-			if (this.gridXLast == gridX && this.gridYLast == gridY)
-				return;
-			this.gridXLast = gridX;
-			this.gridYLast = gridY;
-
-			if (action == 'm') {
-				x = Math.max(gridX + 1, 1);
-				y = Math.max(gridY + 1, 1);
-				w = parseInt(this.dataTransfer.w);
-				h = parseInt(this.dataTransfer.h);
-
-				if (x + w > this.gridWidth + 1)
-					x = this.gridWidth + 1 - w;
-
-				id = this.dataTransfer.id;
-				this.occupyFields(id, x, y, w, h);
-
-				this.itemCoords[id].x = x;
-				this.itemCoords[id].y = y;
-			} else if (action == 'r') {
-				x = parseInt(this.dataTransfer.x);
-				y = parseInt(this.dataTransfer.y);
-				w = gridX + 2 - x;
-				h = gridY + 2 - y;
-				w = Math.max(1, w);
-				h = Math.max(1, h);
-
-				if (x + w > this.gridWidth + 1)
-					w = this.gridWidth + 1 - x;
-
-				id = this.dataTransfer.id;
-				let widget = CachedWidgetLoader.getWidget(this.items[id].widget);
-				if (widget) {
-					let minmaxW = widget.setup.width;
-					if (minmaxW.max)
-						minmaxW.min = minmaxW.min || 1;
-					else
-						minmaxW = {min:minmaxW,max:minmaxW};
-					if (w < minmaxW.min)
-						w = minmaxW.min;
-					if (w > minmaxW.max)
-						w = minmaxW.max;
-					
-					let minmaxH = widget.setup.height;
-					if (minmaxH.max)
-						minmaxH.min = minmaxH.min || 1;
-					else
-						minmaxH = {min:minmaxH,max:minmaxH};
-					if (h < minmaxH.min)
-						h = minmaxH.min;
-					if (h > minmaxH.max)
-						h = minmaxH.max;
-				}
-
-				this.occupyFields(id, x, y, w, h);
-				
-				this.itemCoords[id].w = w;
-				this.itemCoords[id].h = h;
-			}
-		},
-		onDrop() {
-			this.dragging = 0;
-			this.gridXLast = -1;
-			this.gridYLast = -1;
-			let id = 0;
-			let update = {};
-			while ((id = this.movedObjects.pop())) {
-				if (this.items[id]._y !== undefined) {
-					if (this.itemCoords[id].y != this.items[id]._y) {
-						update[this.items[id].id] = {place:{}};
-						update[this.items[id].id].place[this.gridWidth] = {y:this.itemCoords[id].y};
-					}
-					this.items[id]._y = undefined;
-				}
-			}
-			
-			id = this.dataTransfer.id;
-			
-			const action = this.dataTransfer.action;
-			update[this.items[id].id] = {place:{}};
-			update[this.items[id].id].place[this.gridWidth] = {};
-
-			if (action == 'm') {
-				if (this.items[id]._x !== undefined) {
-					if (this.itemCoords[id].x != this.items[id]._x) {
-						update[this.items[id].id].place[this.gridWidth].x = this.itemCoords[id].x;
-					}
-					this.items[id]._x = undefined;
-				}
-				if (this.items[id]._y !== undefined) {
-					if (this.itemCoords[id].y != this.items[id]._y) {
-						update[this.items[id].id].place[this.gridWidth].y = this.itemCoords[id].y;
-					}
-					this.items[id]._y = undefined;
-				}
-			} else if (action == 'r') {
-				update[this.items[id].id].place[this.gridWidth].w = this.itemCoords[id].w;
-				update[this.items[id].id].place[this.gridWidth].h = this.itemCoords[id].h;
-			}
-
-			if (update[this.items[id].id].place[this.gridWidth].x === undefined && 
-				update[this.items[id].id].place[this.gridWidth].y === undefined && 
-				update[this.items[id].id].place[this.gridWidth].w === undefined && 
-				update[this.items[id].id].place[this.gridWidth].h === undefined) {
-				delete update[this.items[id].id].place[this.gridWidth];
-			}
-
-			this.updatePreset(update);
-
-			// TODO(chris): find better way to trigger change for gridHeight
-			this.changeHeight++
+			return [w, h];
 		},
 		removeWidget(item, revert) {
 			if (item.custom) {
@@ -400,9 +74,32 @@ export default {
 		},
 		saveConfig(config, item) {
 			let payload = {};
-			payload[item.id] = { config };console.log(payload);
+			payload[item.id] = { config };
 			this.updatePreset(payload);
 		},
+		updatePositions(updated) {
+			let result = {};
+			updated.forEach(update => {
+				let item = {...update.item};
+				if (!item.place[this.gridWidth])
+					item.place[this.gridWidth] = {x: 0, y: 0, w: 1, h: 1};
+				delete item.x;
+				delete item.y;
+				delete item.w;
+				delete item.h;
+				if (update.x !== undefined)
+					item.place[this.gridWidth].x = update.x;
+				if (update.y !== undefined)
+					item.place[this.gridWidth].y = update.y;
+				if (update.w !== undefined)
+					item.place[this.gridWidth].w = update.w;
+				if (update.h !== undefined)
+					item.place[this.gridWidth].h = update.h;
+
+				result[item.id] = item;
+			});
+			this.updatePreset(result);
+		},
 		updatePreset(update) {
 			let payload = {};
 			payload[this.name] = update;
@@ -412,55 +109,34 @@ export default {
 	mounted() {
 		let self = this;
 		let cont = self.$refs.container;
-		self.gridWidth = window.getComputedStyle(cont).getPropertyValue('grid-template-columns').split(" ").length;
+		self.gridWidth = parseInt(window.getComputedStyle(cont).getPropertyValue('--fhc-dashboard-grid-size'));
 		
 		window.addEventListener('resize', () => {
-			for (const child of cont.children) {
-				child.style.display = 'none';
-			}
-			self.gridWidth = window.getComputedStyle(cont).getPropertyValue('grid-template-columns').split(" ").length;
-			for (const child of cont.children) {
-				child.style.display = '';
-			}
+			self.gridWidth = parseInt(window.getComputedStyle(cont).getPropertyValue('--fhc-dashboard-grid-size'));
 		});
 	},
-	template: `<div class="dashboard-section">
+	template: `
+	<div class="dashboard-section" ref="container">
 		<h3 class="d-flex">
 			<span class="col">{{name}}</span>
-			<button class="col-auto btn" @click.prevent="editMode = editMode ? 0 : 1"><i class="fa-solid fa-gear"></i></button>
+			<button class="col-auto btn" @click.prevent="editMode = !editMode"><i class="fa-solid fa-gear"></i></button>
 		</h3>
-		<div :h="gridHeight" :w="gridWidth" class="position-relative" :style="'height:0;padding-bottom:' + (gridHeight * 100/gridWidth) + '%'">
-			<div ref="container" 
-				class="position-absolute top-0 left-0 w-100 h-100 draganddropcontainer" 
-				:style="'display:grid;grid-template-rows:repeat('+gridHeight+',1fr);background:'+cssBg" 
-				@click="addWidget($event)" 
-				@drop="onDrop($event, 1)" 
-				@dragover.prevent="onDragOver" 
-				@dragenter.prevent
-				@mousemove="onMouseMove"
-				@mouseleave="onMouseLeave">
-				
-				<dashboard-item 
-					v-for="item in items" 
-					:key="item.id" 
-					:id="item.widget" 
+		<drop-grid v-model:cols="gridWidth" :items="items" :active="editMode" :resize-limit="checkResizeLimit" :margin-for-extra-row=".01" @rearrange-items="updatePositions">
+			<template v-slot="item">
+				<dashboard-item
+					:id="item.widget"
 					:loading="item.loading"
-					:config="item.config" 
-					:custom="item.custom" 
-					:hidden="item.hidden" 
-					:editMode="editMode" 
-					:x="itemCoords[item.index] ? itemCoords[item.index].x : -1" 
-					:y="itemCoords[item.index] ? itemCoords[item.index].y : -1" 
-					:style="itemCoords[item.index] ? {'grid-column-start':itemCoords[item.index].x,'grid-column-end':itemCoords[item.index].x+itemCoords[item.index].w,'grid-row-start':itemCoords[item.index].y,'grid-row-end':itemCoords[item.index].y+itemCoords[item.index].h} : {}" 
-					:width="itemCoords[item.index] ? itemCoords[item.index].w : 0" 
-					:height="itemCoords[item.index] ? itemCoords[item.index].h : 0" 
-					@dragstart="startDrag($event, item)" 
-					@resizestart="startResize($event, item)" 
+					:config="item.config"
+					:custom="item.custom"
+					:hidden="item.hidden"
+					:editMode="editMode"
 					@change="saveConfig($event, item)"
 					@remove="removeWidget(item, $event)">
 				</dashboard-item>
-
-			</div>
-		</div>
+			</template>
+			<template #empty-tile-hover="{x,y}">
+				<div class="empty-tile-hover" @click="$emit('widgetAdd', name, { widget: 1, config: {}, place: {[gridWidth]: {x,y,w:1,h:1}}, custom: 1 })"></div>
+			</template>
+		</drop-grid>
 	</div>`
-}
\ No newline at end of file
+}
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
new file mode 100644
index 000000000..62e4c15ea
--- /dev/null
+++ b/public/js/components/Drop/Grid.js
@@ -0,0 +1,377 @@
+// TODO(chris): Comments
+
+import GridItem from './Grid/Item.js';
+import GridLogic from '../../composables/GridLogic.js';
+
+const MODE_IDLE = 0;
+const MODE_MOVE = 1;
+const MODE_RESIZE = 2;
+
+export default {
+	components: {
+		GridItem
+	},
+	inject: {
+	},
+	props: {
+		cols: Number,
+		items: Array,
+		resizeLimit: Function,
+		active: {
+			type: Boolean,
+			default: true
+		},
+		marginForExtraRow: {
+			type: Number,
+			default: 0
+		}
+	},
+	emits: [
+		"rearrangeItems",
+		"newItem"
+	],
+	data() {
+		return {
+			x: -1,
+			y: -1,
+			mode: MODE_IDLE,
+			grid: null,
+			dragGrid: null,
+			permUpdates: [],
+			positionUpdates: null,
+			fixedPositionUpdates: null,
+			draggedOffset: [0,0],
+			draggedItem: null,
+			additionalRow: null
+		}
+	},
+	computed: {
+		rows() {
+			if ((this.mode == MODE_MOVE || this.mode == MODE_RESIZE) && this.dragGrid)
+				return this.dragGrid.h;
+			return this.grid ? this.grid.h : 1;
+		},
+		gridStyle() {
+			const addH = this.active ? this.marginForExtraRow : 0;
+			return {
+				'--fhc-dg-row-height': 100/(this.rows + addH) + '%',
+				'--fhc-dg-col-width': 100/this.cols + '%',
+				'padding-bottom': 100 * (this.rows + addH)/this.cols + '%'
+			}
+		},
+		indexedItems() {
+			return this.items.map(
+				(item, index) => {
+					return {
+						index: index,
+						x: item.x,
+						y: item.y,
+						w: item.w,
+						h: item.h,
+						weight: item.weight || 0,
+						data: item
+					}
+				}
+			);
+		},
+		prePlacedItems() {
+			if (!this.fixedPositionUpdates)
+				return this.indexedItems;
+			return this.indexedItems.map(item => {
+				if (!this.fixedPositionUpdates[item.index])
+					return item;
+				return {
+					index: item.index,
+					weight: item.weight,
+					data: item.data,
+					x: this.fixedPositionUpdates[item.index].x === undefined ? item.x : this.fixedPositionUpdates[item.index].x,
+					y: this.fixedPositionUpdates[item.index].y === undefined ? item.y : this.fixedPositionUpdates[item.index].y,
+					w: this.fixedPositionUpdates[item.index].w === undefined ? item.w : this.fixedPositionUpdates[item.index].w,
+					h: this.fixedPositionUpdates[item.index].h === undefined ? item.h : this.fixedPositionUpdates[item.index].h
+				};
+			});
+		},
+		placedItems() {
+			if (!this.positionUpdates)
+				return this.prePlacedItems;
+			return this.prePlacedItems.map(item => {
+				if (!this.positionUpdates[item.index])
+					return item;
+				return {
+					index: item.index,
+					weight: item.weight,
+					data: item.data,
+					x: this.positionUpdates[item.index].x === undefined ? item.x : this.positionUpdates[item.index].x,
+					y: this.positionUpdates[item.index].y === undefined ? item.y : this.positionUpdates[item.index].y,
+					w: this.positionUpdates[item.index].w === undefined ? item.w : this.positionUpdates[item.index].w,
+					h: this.positionUpdates[item.index].h === undefined ? item.h : this.positionUpdates[item.index].h
+				};
+			});
+		},
+		showEmptyTileHover() {
+			if (!this.active || !this.grid || this.mode != MODE_IDLE || this.x < 0 || this.y < 0 || this.x >= this.cols || this.y >= this.rows)
+				return false;
+			return this.grid.isFreeSlot(this.x, this.y);
+		}
+	},
+	watch: {
+		active(active) {
+			if (!active)
+				this.dragCancel();
+		},
+		cols() {
+			this.dragCancel();
+		},
+		indexedItems: {
+			handler(value) {
+				this.dragCancel();
+
+				const updated = this.createNewGrid(value);
+
+				this.fixedPositionUpdates = updated;
+				if (updated.length)
+					this.$emit('rearrangeItems', updated.filter(v => v));
+			},
+			immediate: true,
+			deep: true
+		}
+	},
+	methods: {
+		createNewGrid(items) {
+			this.grid = new GridLogic(this.cols);
+			const result = [];
+			[...items].sort((a, b) => a.weight > b.weight).forEach(item => {
+				if (item.x + item.w > this.cols) {
+					let targetW = this.cols-item.x,
+						targetX = undefined;
+					if (this.resizeLimit) {
+						[targetW] = this.resizeLimit(item.data, targetW, item.h);
+					}
+					if (targetW < 1)
+						targetW = 1;
+					if (targetW > this.cols)
+						targetW = this.cols;
+					if (item.x + targetW > this.cols) {
+						targetX = this.cols - targetW;
+					}
+					if (targetW == item.w)
+						targetW = undefined;
+					result[item.index] = {
+						item: item.data,
+						x: targetX,
+						w: targetW
+					};
+				}
+				item.frame = this.grid.getItemFrame(item);
+				this.convertGridResultToUpdate(this.grid.add(item), result, items);
+			});
+			this.grid.clearWeights();
+			return result;
+		},
+		convertGridResultToUpdate(input, output, baseArray) {
+			if (!input)
+				return;
+			if (!baseArray)
+				baseArray = this.indexedItems;
+			input.forEach(item => {
+				let result = {
+					item: baseArray[item.index].data
+				};
+				if (item.x !== undefined)
+					result.x = item.x;
+				if (item.y !== undefined)
+					result.y = item.y;
+				if (item.w !== undefined)
+					result.w = item.w;
+				if (item.h !== undefined)
+					result.h = item.h;
+				output[item.index] = result;
+			});
+		},
+		mouseLeave() {
+			if (this.mode == MODE_IDLE) {
+				this.x = -1;
+				this.y = -1;
+				if (this.additionalRow !== null) {
+					this.grid.h = this.additionalRow;
+					this.additionalRow = null;
+				}
+			}
+		},
+		updateCursor(evt) {
+			if (!this.active) {
+				this.x = this.y = -1;
+				return false;
+			}
+			const addH = this.active ? this.marginForExtraRow : 0;
+			const rect = this.$refs.container.getBoundingClientRect();
+
+			if (!evt.clientX && !evt.clientY && evt.touches) {
+				evt.clientX = evt.touches[0].clientX;
+				evt.clientY = evt.touches[0].clientY;
+			}
+
+			const gridX = Math.floor(this.cols * (evt.clientX - rect.left) / this.$refs.container.clientWidth);
+			const gridY = Math.floor((this.rows + addH) * (evt.clientY - rect.top) / this.$refs.container.clientHeight);
+			if (this.x == gridX && this.y == gridY)
+				return false;
+			
+			if (this.mode == MODE_IDLE) {
+				if (this.additionalRow === null && this.y == this.rows-1 && gridY == this.rows) {
+					this.additionalRow = this.grid.h;
+					this.grid.h += 1;
+				} else if (this.additionalRow !== null && gridY != this.rows - 1) {
+					this.grid.h = this.additionalRow;
+					this.additionalRow = null;
+				}
+			}
+			
+			this.x = gridX;
+			this.y = gridY;
+
+			return true;
+		},
+		_dragStart(evt) {
+			if (evt.dataTransfer) {
+				evt.dataTransfer.setDragImage(evt.target, -99999, -99999);
+				evt.dataTransfer.dropEffect = 'move';
+				evt.dataTransfer.effectAllowed = 'move';
+			}
+		},
+		startMove(evt, item) {
+			if (!this.active)
+				return;
+			this._dragStart(evt);
+			this.mode = MODE_MOVE;
+			this.updateCursor(evt);
+			this.draggedItem = item;
+			this.draggedOffset = [item.x - this.x, item.y - this.y];
+		},
+		startResize(evt, item) {
+			if (!this.active)
+				return;
+			this._dragStart(evt);
+			this.mode = MODE_RESIZE;
+			this.draggedItem = item;
+		},
+		dragOver(evt) {
+			if (!this.active)
+				return this.dragCancel();
+			if (this.updateCursor(evt)) {
+				switch(this.mode) {
+					case MODE_MOVE: {
+						evt.preventDefault();
+						this.dragGrid = new GridLogic(this.grid);
+						let x = this.x + this.draggedOffset[0];
+						let y = this.y + this.draggedOffset[1];
+						if (x < 0) {
+							this.draggedOffset[0] -= x;
+							x = 0;
+						} else if (x + this.draggedItem.w > this.cols) {
+							this.draggedOffset[0] += this.cols - this.draggedItem.w - x;
+							x = this.cols - this.draggedItem.w;
+						}
+						if (y < 0) {
+							this.draggedOffset[1] -= y;
+							y = 0;
+						}
+
+						this.positionUpdates = this.dragGrid.move(this.draggedItem, x, y);
+						break;
+					}
+					case MODE_RESIZE: {
+						evt.preventDefault();
+						this.dragGrid = new GridLogic(this.grid);
+						let w = Math.min(this.cols - this.draggedItem.x, Math.max(1, this.x - this.draggedItem.x + 1));
+						let h = Math.max(1, this.y - this.draggedItem.y + 1);
+						if (this.resizeLimit)
+							[w, h] = this.resizeLimit(this.draggedItem.data, w, h);
+						this.positionUpdates = this.dragGrid.resize(this.draggedItem, w, h);
+						break;
+					}
+				}
+			}
+		},
+		dragCancel() {
+			this.mode = MODE_IDLE;
+			this.positionUpdates = null;
+			this.draggedOffset = [0,0],
+			this.draggedItem = null;
+		},
+		dragEnd() {
+			if (this.mode == MODE_IDLE)
+				return;
+			if (!this.active || this.x < 0 || this.y < 0 || this.x >= this.cols)
+				return this.dragCancel();
+			this.mode = MODE_IDLE;
+			let updated = [];
+			this.convertGridResultToUpdate(this.positionUpdates, updated);
+			updated = this._updateFixedPositions(updated);
+			if (updated.length)
+				this.$emit('rearrangeItems', updated.filter(v => v));
+		},
+		_updateFixedPositions(updated) {
+			updated.forEach((item, index) => {
+				if (!this.fixedPositionUpdates[index])
+					this.fixedPositionUpdates[index] = item;
+				else
+					this.fixedPositionUpdates[index] = {...this.fixedPositionUpdates[index], ...item};
+			});
+			let additionalUpdates = this.createNewGrid(this.prePlacedItems);
+			if (additionalUpdates.length) {
+				// NOTE(chris): this should never happen but it's here for safety
+				additionalUpdates.forEach((item, index) => updated[index] = item);
+				return this._updateFixedPositions(updated);
+			}
+			return updated;
+		},
+		emptyTileClicked() {
+			this.$emit('newItem', this.x, this.y);
+		}
+	},
+	template: `
+	<div
+		ref="container"
+		class="drop-grid position-relative h-0"
+		:style="gridStyle"
+		@touchmove="dragOver"
+		@touchend="dragCancel"
+		@dragover.prevent="dragOver"
+		@drop="dragEnd"
+		@mousemove="updateCursor"
+		@mouseleave="mouseLeave">
+		<grid-item
+			v-for="item in placedItems"
+			:key="item.id"
+			:item="item"
+			@start-move="startMove"
+			@start-resize="startResize"
+			@end-drag="dragCancel"
+			@drop-drag="dragEnd"
+			class="position-absolute"
+			:active="active"
+			:style="{
+				top: 'calc(' + item.y + ' * var(--fhc-dg-row-height))',
+				left: 'calc(' + item.x + ' * var(--fhc-dg-col-width))',
+				width: 'calc(' + item.w + ' * var(--fhc-dg-col-width))',
+				height: 'calc(' + item.h + ' * var(--fhc-dg-row-height))'
+			}">
+			<template v-slot="item">
+				<slot v-bind="item.data"></slot>
+			</template>
+		</grid-item>
+		<div
+			v-if="showEmptyTileHover"
+			class="position-absolute d-flex justify-content-center align-items-center"
+			:style="{
+				cursor: 'pointer',
+				top: 'calc(' + y + ' * var(--fhc-dg-row-height))',
+				left: 'calc(' + x + ' * var(--fhc-dg-col-width))',
+				width: 'var(--fhc-dg-col-width)',
+				height: 'var(--fhc-dg-row-height)'
+			}"
+			@click="emptyTileClicked">
+			<slot v-bind="{x,y}" name="empty-tile-hover"></slot>
+		</div>
+	</div>`
+}
diff --git a/public/js/components/Drop/Grid/Item.js b/public/js/components/Drop/Grid/Item.js
new file mode 100644
index 000000000..47eec85ee
--- /dev/null
+++ b/public/js/components/Drop/Grid/Item.js
@@ -0,0 +1,71 @@
+export default {
+	components: {
+	},
+	inject: {
+	},
+	props: {
+		item: Object,
+		active: Boolean
+	},
+	emits: [
+		"startMove",
+		"startResize",
+		"endDrag",
+		"dropDrag"
+	],
+	data() {
+		return {
+			dragAction: '',
+			dragging: false
+		}
+	},
+	computed: {
+	},
+	methods: {
+		registerDragAction(evt) {
+			if (evt.target.hasAttribute('drag-action')) {
+				this.dragAction = evt.target.getAttribute('drag-action');
+			} else {
+				let parent = evt.target.closest('[drag-action]');
+				if (parent) {
+					this.dragAction = parent.getAttribute('drag-action');
+				} else {
+					this.dragAction = '';
+				}
+			}
+		},
+		tryDragStart(evt, item) {
+			let dragAction = this.dragAction || evt.target.getAttribute('drag-action');
+			if (dragAction) {
+				this.dragging = true;
+				if (dragAction == 'move')
+					return this.$emit('startMove', evt, item);
+				else if (dragAction == 'resize')
+					return this.$emit('startResize', evt, item);
+			}
+			evt.preventDefault();
+		},
+		touchDragEnd(evt) {
+			if (!this.dragging)
+				return evt.preventDefault();
+			this.dragging = false;
+			this.$emit('dropDrag', evt);
+		},
+		test(evt) {
+			let dragAction = this.dragAction || evt.target.getAttribute('drag-action');
+			if (dragAction) {
+				this.dragging = true;
+			}
+		}
+	},
+	template: `
+	<div class="drop-grid-item"
+		@mousedown="registerDragAction"
+		@touchstart="tryDragStart($event, item)"
+		@touchend="touchDragEnd"
+		@dragstart="tryDragStart($event, item)"
+		@dragend="$emit('endDrag', $event)"
+		:draggable="active">
+		<slot v-bind="item"></slot>
+	</div>`
+}
diff --git a/public/js/composables/GridLogic.js b/public/js/composables/GridLogic.js
new file mode 100644
index 000000000..10aa2909c
--- /dev/null
+++ b/public/js/composables/GridLogic.js
@@ -0,0 +1,208 @@
+// TODO(chris): Comments
+
+const DIR_UP = 0;
+const DIR_LEFT = 1;
+const DIR_RIGHT = 2;
+const DIR_DOWN = 3;
+
+class GridLogic {
+	constructor(w) {
+		if (w.w) {
+			this.w = w.w;
+			this.h = w.h;
+			this.data = [...w.data];
+			this.grid = [...w.grid];
+		} else {
+			this.w = w;
+			this.h = 1;
+			this.data = [];
+			this.grid = [];
+		}
+	}
+	isFreeSlot(x, y) {
+		const i = y*this.w + x;
+		return !this.grid[i] && this.grid[i] !== 0;
+	}
+	add(item, prefer) {
+		let occupiers = this.getItemsInFrame(item.frame);
+
+		if (!occupiers.length) {
+			item.frame.forEach(f => this.grid[f] = item.index);
+			this.data[item.index] = item;
+			this.h = Math.max(this.h, item.y + item.h);
+			return [];
+		} else {
+			const intermGrid = new GridLogic(this);
+			
+			item.frame.forEach(f => intermGrid.grid[f] = -1);
+
+			const possiblities = intermGrid.tryMoving(occupiers, prefer);
+			if (possiblities.length) {
+				const bestOption = possiblities.sort((a,b) => {
+					if (a.cost === undefined)
+						a.cost = a.moves.reduce((a, v) => a * v.cost, 1);
+					if (b.cost === undefined)
+						b.cost = b.moves.reduce((a, v) => a * v.cost, 1);
+					return a.cost > b.cost;
+				});
+				const result = [];
+				bestOption[0].moves.forEach(move => {
+					const currItem = {...this.data[move.index]};
+					currItem.x += move.x;
+					currItem.y += move.y;
+					currItem.frame = this.getItemFrame(currItem);
+					this.h = Math.max(this.h, currItem.y + currItem.h);
+					this.remove(currItem);
+					currItem.frame.forEach(f => this.grid[f] = currItem.index);
+					this.data[move.index] = currItem;
+					result[move.index] = {
+						index: currItem.index,
+						x: currItem.x,
+						y: currItem.y
+					};
+				});
+				item.frame.forEach(f => this.grid[f] = item.index);
+				this.data[item.index] = item;
+				return result;
+			} else {
+				console.error('FATAL', "can't arrange item on grid");
+			}
+		}
+	}
+	move(item, x, y) {
+		if (item.x == x && item.y == y)
+			return [];
+		this.remove(item);
+
+		let prefer = undefined;
+		if (item.x == x) {
+			if (y-item.y > 0)
+				prefer = DIR_UP;
+			else
+				prefer = DIR_DOWN;
+		} else if (item.y == y) {
+			if (x-item.x > 0)
+				prefer = DIR_LEFT;
+			else
+				prefer = DIR_RIGHT;
+		}
+
+		const currItem = {...item};
+		currItem.x = x;
+		currItem.y = y;
+		currItem.frame = this.getItemFrame(currItem);
+		
+		const updates = this.add(currItem, prefer);
+		updates[item.index] = {index: item.index, x, y};
+		return updates;
+	}
+	resize(item, w, h) {
+		if (item.w == w && item.h == h)
+			return [];
+		this.remove(item);
+
+		const currItem = {...item};
+		currItem.w = w;
+		currItem.h = h;
+		currItem.frame = this.getItemFrame(currItem);
+		
+		const updates = this.add(currItem);
+		updates[item.index] = {index: item.index, w, h};
+		return updates;
+	}
+	tryMoving(index, prefer) {
+		if (Array.isArray(index)) {
+			index.forEach(i => this.remove({index:i}));
+			let possiblities = [{grid: this, moves: []}];
+			index.forEach(i => {
+				let newPoss = [];
+				possiblities.forEach(possiblity => {
+					possiblity.grid.tryMoving(i, prefer).forEach(p => {
+						possiblity.moves
+						p.moves = [...p.moves, ...possiblity.moves];
+						newPoss.push(p)
+					});
+				});
+				possiblities = newPoss;
+			});
+			return possiblities;
+		}
+		const directions = [DIR_UP, DIR_DOWN, DIR_LEFT, DIR_RIGHT];
+
+		this.remove({index});
+
+		const weight = 1 + .2*(this.data[index].weight || 0);
+
+		return directions.reduce((result, dir) => {
+			let res = this.tryMovingInDirection(dir, index, 1, (prefer === dir ? .5 : 1 + dir*.1) * weight);
+			if (!res)
+				return result;
+			return [...result, ...res];
+		}, []).filter(p => p);
+	}
+	tryMovingInDirection(dir, index, amount, cost) {
+		const move = {index, x:0, y: 0, cost: cost};
+		let targetframe;
+		switch(dir) {
+			case DIR_UP:
+				if (this.data[index].y - amount < 0)
+					return false;
+				targetframe = this.data[index].frame.map(i => i-this.w*amount);
+				move.y = -amount;
+				break;
+			case DIR_DOWN:
+				if (this.data[index].y + this.data[index].h + amount > this.h)
+					cost += .4;
+				targetframe = this.data[index].frame.map(i => i+this.w*amount);
+				move.y = amount;
+				break;
+			case DIR_LEFT:
+				if (this.data[index].x - amount < 0)
+					return false;
+				targetframe = this.data[index].frame.map(i => i-amount);
+				move.x = -amount;
+				break;
+			case DIR_RIGHT:
+				if (this.data[index].x + this.data[index].w + amount > this.w)
+					return false;
+				targetframe = this.data[index].frame.map(i => i+amount);
+				move.x = amount;
+				break;
+		}
+
+		const occupiers = this.getItemsInFrame(targetframe);
+		if (occupiers.includes(-1)) {
+			return this.tryMovingInDirection(dir, index, amount+1, cost);
+		}
+		
+		const intermGrid = new GridLogic(this);
+		targetframe.forEach(f => intermGrid.grid[f] = -1);
+		
+		if (!occupiers.length) {
+			return [{grid: intermGrid, moves: [move]}];
+		}
+		const possiblities = intermGrid.tryMoving(occupiers).map(possiblity => possiblity.moves.unshift(move) && possiblity);
+		return possiblities.length ? possiblities : false;
+	}
+	clearWeights() {
+		this.data.forEach(item => item.weight = undefined);
+	}
+	getItemsInFrame(frame) {
+		return frame.map(i => this.grid[i]).filter((v,i,a) => (v || v === 0) && a.indexOf(v) === i);
+	}
+	remove(item) {
+		this.grid = this.grid.map(i => i != item.index ? i : undefined);
+	}
+	getItemFrame(item) {
+		const frame = [];
+		for (let i = 0; i < item.w; i++)
+			for (let j = 0; j < item.h; j++)
+				frame.push(i + item.x + (j + item.y) * this.w);
+		return frame;
+	}
+	debug() {
+		return this.grid;
+	}
+}
+
+export default GridLogic;
\ No newline at end of file

From f0d0c0837a2de5e916149b61d86dd3282075553e Mon Sep 17 00:00:00 2001
From: KarpAlex <karpen_ko@hotmail.com>
Date: Sat, 17 Jun 2023 20:51:33 +0200
Subject: [PATCH 0083/1461] added Filter for Software Management

---
 system/filtersupdate.php | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/system/filtersupdate.php b/system/filtersupdate.php
index 241e44f2f..8652f4316 100644
--- a/system/filtersupdate.php
+++ b/system/filtersupdate.php
@@ -1256,6 +1256,30 @@ $filters = array(
 			}
 		',
 		'oe_kurzbz' => null,
+	),
+	array(
+		'app' => 'core',
+		'dataset_name' => 'softwareManagement',
+		'filter_kurzbz' => 'SoftwareManagement',
+		'description' => '{Software Verwaltung}',
+		'sort' => 1,
+		'default_filter' => true,
+		'filter' => '
+			{
+				"name": "SoftwareManagement",
+				"columns": [
+					{"name": "Software Kurzbezeichnung"},
+					{"name": "Version"},
+					{"name": "Beschreibung"},
+					{"name": "Hersteller"},
+					{"name": "Betriebssystem"},
+					{"name": "Aktiv"},
+					{"name": "Softwarestatus Kurzbezeichnung"}
+				],
+				"filters": []
+			}
+		',
+		'oe_kurzbz' => null,
 	)
 );
 

From 7356b17688cf0356bcc8012aaa8aebde87068aab Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Mon, 3 Jul 2023 09:37:32 +0200
Subject: [PATCH 0084/1461] Added SW-ID column to SW-Table

---
 system/filtersupdate.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/system/filtersupdate.php b/system/filtersupdate.php
index 8652f4316..d226e9996 100644
--- a/system/filtersupdate.php
+++ b/system/filtersupdate.php
@@ -1268,6 +1268,7 @@ $filters = array(
 			{
 				"name": "SoftwareManagement",
 				"columns": [
+					{"name": "ID"},
 					{"name": "Software Kurzbezeichnung"},
 					{"name": "Version"},
 					{"name": "Beschreibung"},

From 71e86cfcdeb93ce26184e58f5065837a2d964d60 Mon Sep 17 00:00:00 2001
From: KarpAlex <karpen_ko@hotmail.com>
Date: Mon, 3 Jul 2023 11:45:15 +0200
Subject: [PATCH 0085/1461] filter.js bugfixes: saving customfilter, and set
 columns before data (necessary e.g. for nested tabulator)

---
 public/js/components/filter/Filter.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index 2bf878e5a..3b5760f93 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -194,8 +194,8 @@ export const CoreFilterCmpt = {
 			}
 		},
 		_updateTabulator() {
-			this.tabulator.setData(this.filteredData);
 			this.tabulator.setColumns(this.filteredColumns);
+			this.tabulator.setData(this.filteredData);
 		},
 		/**
 		 *
@@ -371,7 +371,7 @@ export const CoreFilterCmpt = {
 			this.startFetchCmpt(
 				CoreFilterAPIs.saveCustomFilter,
 				{
-					customFilterName: this.$refscustomFilterName.value
+					customFilterName: this.$refs.customFilterName.value
 				},
 				this.getFilter
 			);

From fc147f577ab8fe529bad4ced7bd9d8f022bf649e Mon Sep 17 00:00:00 2001
From: KarpAlex <karpen_ko@hotmail.com>
Date: Tue, 4 Jul 2023 12:17:15 +0200
Subject: [PATCH 0086/1461] filter.js: fix for nested tabulator: set columns
 before set data, filtersupdate: renamed columns

---
 public/js/components/filter/Filter.js |  2 +-
 system/filtersupdate.php              | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index 776405614..9c53afdef 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -226,9 +226,9 @@ export const CoreFilterCmpt = {
 			}
 		},
 		_updateTabulator() {
+			this.tabulator.setColumns(this.filteredColumns);
 			this.tabulator.setData(this.filteredData);
 			this.tabulatorHasSelector = this.filteredColumns.filter(el => el.formatter == 'rowSelection').length;
-			this.tabulator.setColumns(this.filteredColumns);
 		},
 		/**
 		 *
diff --git a/system/filtersupdate.php b/system/filtersupdate.php
index 8652f4316..1c303ad43 100644
--- a/system/filtersupdate.php
+++ b/system/filtersupdate.php
@@ -1268,13 +1268,12 @@ $filters = array(
 			{
 				"name": "SoftwareManagement",
 				"columns": [
-					{"name": "Software Kurzbezeichnung"},
-					{"name": "Version"},
-					{"name": "Beschreibung"},
-					{"name": "Hersteller"},
-					{"name": "Betriebssystem"},
-					{"name": "Aktiv"},
-					{"name": "Softwarestatus Kurzbezeichnung"}
+					{"name": "software_kurzbz"},
+					{"name": "version"},
+					{"name": "beschreibung"},
+					{"name": "hersteller"},
+					{"name": "os"},
+					{"name": "aktiv"}
 				],
 				"filters": []
 			}

From 539efcb6ecfeb0d9e54d9a4d07949964b268bb87 Mon Sep 17 00:00:00 2001
From: KarpAlex <karpen_ko@hotmail.com>
Date: Thu, 6 Jul 2023 12:03:38 +0200
Subject: [PATCH 0087/1461] added Modal.js to Bootstrap components

---
 public/js/components/Bootstrap/Modal.js | 109 ++++++++++++++++++++++++
 1 file changed, 109 insertions(+)
 create mode 100644 public/js/components/Bootstrap/Modal.js

diff --git a/public/js/components/Bootstrap/Modal.js b/public/js/components/Bootstrap/Modal.js
new file mode 100644
index 000000000..90cec2d50
--- /dev/null
+++ b/public/js/components/Bootstrap/Modal.js
@@ -0,0 +1,109 @@
+export default {
+	data: () => ({
+		modal: null
+	}),
+	props: {
+		backdrop: {
+			type: [Boolean,String],
+			default: true,
+			validator(value) {
+				return ['static', true, false].includes(value);
+			}
+		},
+		focus: {
+			type: Boolean,
+			default: true
+		},
+		keyboard: {
+			type: Boolean,
+			default: true
+		},
+		noCloseBtn: Boolean,
+		dialogClass: [String,Array,Object]
+	},
+	emits: [
+		"hideBsModal",
+		"hiddenBsModal",
+		"hidePreventedBsModal",
+		"showBsModal",
+		"shownBsModal"
+	],
+	methods: {
+		dispose() {
+			return this.modal.dispose();
+		},
+		handleUpdate() {
+			return this.modal.handleUpdate();
+		},
+		hide() {
+			return this.modal.hide();
+		},
+		show(relatedTarget) {
+			return this.modal.show(relatedTarget);
+		},
+		toggle() {
+			return this.modal.toggle();
+		}
+	},
+	mounted() {
+		if(this.$refs.modal)
+		{
+			this.modal = new bootstrap.Modal(this.$refs.modal, {
+				backdrop: this.backdrop,
+				focus: this.focus,
+				keyboard: this.keyboard
+			});
+		}
+	},
+	popup(body, options, title, footer) {
+		const BsModal = this,
+			slots = {};
+		if (body !== undefined)
+			slots.default = () => body;
+		if (title !== undefined)
+			slots.title = () => title;
+		if (footer !== undefined)
+			slots.footer = () => footer;
+		return new Promise((resolve,reject) => {
+			const instance = Vue.createApp({
+				setup() {
+					return () => Vue.h(BsModal, {...{
+						class: 'fade'
+					},...options, ...{
+						ref: 'modal',
+						'onHidden.bs.modal': instance.unmount
+					}}, slots);
+				},
+				mounted() {
+					this.$refs.modal.show();
+				},
+				beforeUnmount() {
+					if (this.$refs.modal)
+						this.$refs.modal.result !== false ? resolve(this.$refs.modal.result) : reject();
+				},
+				unmounted() {
+					wrapper.parentElement.removeChild(wrapper);
+				}
+			});
+			const wrapper = document.createElement("div");
+			instance.mount(wrapper);
+			document.body.appendChild(wrapper);
+		});
+	},
+	template: `<div ref="modal" class="bootstrap-modal modal" tabindex="-1" @[\`hide.bs.modal\`]="$emit('hideBsModal')" @[\`hidden.bs.modal\`]="$emit('hiddenBsModal')" @[\`hidePrevented.bs.modal\`]="$emit('hidePreventedBsModal')" @[\`show.bs.modal\`]="$emit('showBsModal')" @[\`shown.bs.modal\`]="$emit('shownBsModal')">
+		<div class="modal-dialog" :class="dialogClass">
+			<div class="modal-content">
+				<div v-if="$slots.title" class="modal-header">
+					<h5 class="modal-title"><slot name="title"/></h5>
+					<button v-if="!noCloseBtn" type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+				</div>
+				<div class="modal-body">
+					<slot></slot>
+				</div>
+				<div v-if="$slots.footer" class="modal-footer">
+					<slot name="footer"/>
+				</div>
+			</div>
+		</div>
+	</div>`
+}

From 3e4703408b7e0a6fb31bb0fa97bae2264cdde5e4 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 10 Jul 2023 08:42:48 +0200
Subject: [PATCH 0088/1461] directories from variables

---
 cis.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/cis.php b/cis.php
index 76f23d043..276af93f1 100644
--- a/cis.php
+++ b/cis.php
@@ -192,6 +192,7 @@ switch (ENVIRONMENT)
  */
 	// $assign_to_config['name_of_config_item'] = 'value of config item';
 $assign_to_config['index_page'] = 'cis.php';
+$assign_to_config['base_url'] = APP_ROOT;
 
 
 
@@ -312,7 +313,7 @@ $assign_to_config['index_page'] = 'cis.php';
 include_once 'vendor/autoload.php';
 
 // Autoload custom controllers, models, etc that are present in the application/core directory
-require_once 'application/config/core_includes.php';
+require_once $application_folder . 'config/core_includes.php';
 
 // Now the bootstrap file
-require_once BASEPATH.'core/CodeIgniter.php';
+require_once BASEPATH . 'core/CodeIgniter.php';

From 1416e91af747569e533dedb4a925ad23b27d7a69 Mon Sep 17 00:00:00 2001
From: KarpAlex <karpen_ko@hotmail.com>
Date: Tue, 11 Jul 2023 15:58:48 +0200
Subject: [PATCH 0089/1461] Issues: Behebung parameter are included in
 identification of an issue

---
 application/libraries/IssuesLib.php       | 36 +++++++++++++----------
 application/models/system/Issue_model.php | 15 +++++++++-
 2 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/application/libraries/IssuesLib.php b/application/libraries/IssuesLib.php
index 9b3a9de6e..f38303b3c 100644
--- a/application/libraries/IssuesLib.php
+++ b/application/libraries/IssuesLib.php
@@ -246,7 +246,27 @@ class IssuesLib
 				$fehlertext = vsprintf($fehlertextVorlage, $fehlertext_params);
 			}
 
-			$openIssuesCountRes = $this->_ci->IssueModel->getOpenIssueCount($fehlercode, $person_id, $oe_kurzbz, $fehlercode_extern);
+			if (isset($resolution_params))
+			{
+				if (is_array($resolution_params))
+				{
+					foreach ($resolution_params as $resolution_key => $resolution_param)
+					{
+						if (!is_string($resolution_key))
+							return error("Invalid parameter for resolution, must be an associative array");
+					}
+				}
+				else
+					return error("Invalid parameters for resolution");
+			}
+
+			$openIssuesCountRes = $this->_ci->IssueModel->getOpenIssueCount(
+				$fehlercode,
+				$person_id,
+				$oe_kurzbz,
+				$fehlercode_extern,
+				$resolution_params
+			);
 
 			if (hasData($openIssuesCountRes))
 			{
@@ -256,20 +276,6 @@ class IssuesLib
 
 				if ($openIssueCount == 0)
 				{
-					if (isset($resolution_params))
-					{
-						if (is_array($resolution_params))
-						{
-							foreach ($resolution_params as $resolution_key => $resolution_param)
-							{
-								if (!is_string($resolution_key))
-									return error("Invalid parameter for resolution, must be an associative array");
-							}
-						}
-						else
-							return error("Invalid parameters for resolution");
-					}
-
 					// insert new issue
 					return $this->_ci->IssueModel->insert(
 						array(
diff --git a/application/models/system/Issue_model.php b/application/models/system/Issue_model.php
index ab1f9ba6e..3d39e9879 100644
--- a/application/models/system/Issue_model.php
+++ b/application/models/system/Issue_model.php
@@ -59,7 +59,7 @@ class Issue_model extends DB_Model
 	 * @param string $fehlercode_extern if provided, only issues with this external fehlercode are counted (for identifying issues from external systems).
 	 * @return Object success with number of issues or error
 	 */
-	public function getOpenIssueCount($fehlercode, $person_id = null, $oe_kurzbz = null, $fehlercode_extern = null)
+	public function getOpenIssueCount($fehlercode, $person_id = null, $oe_kurzbz = null, $fehlercode_extern = null, $behebung_parameter = null)
 	{
 		$params = array($fehlercode);
 		// issue exists for a fehlercode (or fehlercode_extern), person_id, oe_kurzbz, if not verarbeitet yet
@@ -85,6 +85,19 @@ class Issue_model extends DB_Model
 			$params[] = $oe_kurzbz;
 		}
 
+		if (isset($behebung_parameter) && !isEmptyArray($behebung_parameter))
+		{
+			// convert array to JSON string for postgres
+			$behebung_parameter_string = json_encode($behebung_parameter);
+
+			if ($behebung_parameter_string)
+			{
+				// check if jsonb value is equal to the passed parameters array (if value contains array and array contains value)
+				$qry .= ' AND behebung_parameter @> ? AND behebung_parameter <@ ?';
+				$params = array_merge($params, array($behebung_parameter_string, $behebung_parameter_string));
+			}
+		}
+
 		return $this->execQuery($qry, $params);
 	}
 }

From 5f3e393ed1039c0a754c3645a98443103cd6312f Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 12 Jul 2023 09:12:03 +0200
Subject: [PATCH 0090/1461] Default menu: correct paths

---
 application/models/content/Content_model.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/application/models/content/Content_model.php b/application/models/content/Content_model.php
index 97d1837be..1d97713cf 100644
--- a/application/models/content/Content_model.php
+++ b/application/models/content/Content_model.php
@@ -85,7 +85,7 @@ class Content_model extends DB_Model
 						"content_id": 1000001,
 						"template_kurzbz": "redirect",
 						"titel": "News",
-						"content": "<content><url><![CDATA[../cis.php/CisHtml/Cms/news]]></url><target><![CDATA[]]></target></content>",
+						"content": "<content><url><![CDATA[' . site_url('/CisHtml/Cms/news') . ']]></url><target><![CDATA[]]></target></content>",
 						"menu_open": false,
 						"aktiv": true,
 						"childs": []
@@ -94,7 +94,7 @@ class Content_model extends DB_Model
 						"content_id": 1000002,
 						"template_kurzbz": "redirect",
 						"titel": "COVID-19",
-						"content": "<content><url><![CDATA[../cis.php/CisHtml/Cms/content/10012]]></url><target><![CDATA[]]></target></content>",
+						"content": "<content><url><![CDATA[' . site_url('/CisHtml/Cms/content/10012') . ']]></url><target><![CDATA[]]></target></content>",
 						"menu_open": false,
 						"aktiv": true,
 						"childs": []
@@ -103,7 +103,7 @@ class Content_model extends DB_Model
 						"content_id": 1000003,
 						"template_kurzbz": "redirect",
 						"titel": "Meine LV",
-						"content": "<content><url><![CDATA[../cis.php/Cis/MyLv]]></url><target><![CDATA[]]></target></content>",
+						"content": "<content><url><![CDATA[' . site_url('/Cis/MyLv') . ']]></url><target><![CDATA[]]></target></content>",
 						"menu_open": false,
 						"aktiv": true,
 						"childs": []
@@ -112,7 +112,7 @@ class Content_model extends DB_Model
 						"content_id": 1000004,
 						"template_kurzbz": "redirect",
 						"titel": "Stundenplan",
-						"content": "<content><url><![CDATA[../cis.php/Cis/Stundenplan]]></url><target><![CDATA[]]></target></content>",
+						"content": "<content><url><![CDATA[' . site_url('/Cis/Stundenplan') . ']]></url><target><![CDATA[]]></target></content>",
 						"menu_open": false,
 						"aktiv": true,
 						"childs": []
@@ -121,7 +121,7 @@ class Content_model extends DB_Model
 						"content_id": 1000005,
 						"template_kurzbz": "redirect",
 						"titel": "Dokumente",
-						"content": "<content><url><![CDATA[../cis.php/Cis/Documents]]></url><target><![CDATA[]]></target></content>",
+						"content": "<content><url><![CDATA[' . site_url('/Cis/Documents') . ']]></url><target><![CDATA[]]></target></content>",
 						"menu_open": false,
 						"aktiv": true,
 						"childs": []

From c5db083a84b684a25d0ad33c3b7dd9590b3d9b4e Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 12 Jul 2023 15:32:52 +0200
Subject: [PATCH 0091/1461] Correct paths

---
 application/views/templates/CISHTML-Header.php     | 2 +-
 application/views/templates/CISHTML-Menu/Entry.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/views/templates/CISHTML-Header.php b/application/views/templates/CISHTML-Header.php
index 1a997e2c5..fe2d69b28 100644
--- a/application/views/templates/CISHTML-Header.php
+++ b/application/views/templates/CISHTML-Header.php
@@ -27,7 +27,7 @@ if (!isset($menu)) {
 	<button id="nav-main-btn" class="navbar-toggler" type="button" data-bs-toggle="offcanvas" data-bs-target="#nav-main" aria-controls="nav-main" aria-expanded="false" aria-label="Toggle navigation">
 		<span class="navbar-toggler-icon"></span>
 	</button>
-	<a id="nav-logo" href="<?= site_url('CisHtml'); ?>">
+	<a id="nav-logo" href="<?= site_url(''); ?>">
 		<img src="<?= base_url('/public/images/logo-300x160.png'); ?>" alt="Logo">
 	</a>
 	<nav id="nav-main" class="offcanvas offcanvas-start bg-dark" tabindex="-1" aria-labelledby="nav-main-btn" data-bs-backdrop="false">
diff --git a/application/views/templates/CISHTML-Menu/Entry.php b/application/views/templates/CISHTML-Menu/Entry.php
index 35246b07b..3226ff9b7 100644
--- a/application/views/templates/CISHTML-Menu/Entry.php
+++ b/application/views/templates/CISHTML-Menu/Entry.php
@@ -21,7 +21,7 @@ switch ($entry->template_kurzbz) {
 				$target = $xml->getElementsByTagName('target')->item(0)->nodeValue;
 
 			if (strpos($url, '../cms/news.php') === 0)
-				$url = APP_ROOT . 'cis.php/CisHtml/Cms/news' . substr($url, 15);
+				$url = site_url('/CisHtml/Cms/news' . substr($url, 15));
 			if (strpos($url, '../') === 0)
 				$url = APP_ROOT . substr($url, 3);
 		}
@@ -36,7 +36,7 @@ switch ($entry->template_kurzbz) {
 		break;
 	}
 	default: {
-		$this->load->view('templates/CISHTML-Menu/EntryBase', ['entry' => $entry, 'menu_id' => $menu_id, 'link' => APP_ROOT . 'cis.php/CisHtml/Cms/content/' . $entry->content_id]);
+		$this->load->view('templates/CISHTML-Menu/EntryBase', ['entry' => $entry, 'menu_id' => $menu_id, 'link' => site_url('/CisHtml/Cms/content/' . $entry->content_id)]);
 		break;
 	}
 }

From b0c9231d144d5df993d674d9af53d89d52c2e29f Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 14 Jul 2023 09:02:25 +0200
Subject: [PATCH 0092/1461] Hmvc: Safer Code

---
 .../views/templates/CISHMVC-Header.php        | 38 ++++++++++-----
 .../views/templates/CISHMVC-Menu/Entry.php    | 48 +++++++++++++------
 2 files changed, 59 insertions(+), 27 deletions(-)

diff --git a/application/views/templates/CISHMVC-Header.php b/application/views/templates/CISHMVC-Header.php
index 2acf5f414..a9b429217 100644
--- a/application/views/templates/CISHMVC-Header.php
+++ b/application/views/templates/CISHMVC-Header.php
@@ -1,3 +1,11 @@
+<?php
+	if (!isset($menu)) {
+		$menu = [];
+		if (property_exists($this->router, 'menu') && $this->router->menu && property_exists($this->router->menu, 'children')) {
+			$menu = $this->router->menu->children;
+		}
+	}
+?>
 <header id="cis-header" class="navbar-dark">
 	<button id="nav-main-btn" class="navbar-toggler" type="button" data-bs-toggle="offcanvas" data-bs-target="#nav-main" aria-controls="nav-main" aria-expanded="false" aria-label="Toggle navigation">
 		<span class="navbar-toggler-icon"></span>
@@ -6,11 +14,13 @@
 		<img src="<?= base_url('/public/images/logo-300x160.png'); ?>" alt="Logo">
 	</a>
 	<nav id="nav-main" class="offcanvas offcanvas-start bg-dark" tabindex="-1" aria-labelledby="nav-main-btn" data-bs-backdrop="false">
-		<div id="nav-main-toggle" class="position-static d-none d-lg-block bg-dark">
-			<button type="button" class="btn bg-dark text-light rounded-0 p-1 d-flex align-items-center" data-bs-toggle="collapse" data-bs-target="#nav-main-menu" aria-expanded="true" aria-controls="nav-main-menu">
-				<i class="fa fa-arrow-circle-left"></i>
-			</button>
-		</div>
+		<?php if ($menu) { ?>
+			<div id="nav-main-toggle" class="position-static d-none d-lg-block bg-dark">
+				<button type="button" class="btn bg-dark text-light rounded-0 p-1 d-flex align-items-center" data-bs-toggle="collapse" data-bs-target="#nav-main-menu" aria-expanded="true" aria-controls="nav-main-menu">
+					<i class="fa fa-arrow-circle-left"></i>
+				</button>
+			</div>
+		<?php } ?>
 		<div class="offcanvas-body p-0">
 			<fhc-searchbar id="nav-search" class="fhc-searchbar w-100" :searchoptions="searchbaroptions" :searchfunction="searchfunction"></fhc-searchbar>
 			<button id="nav-user-btn" class="btn btn-link rounded-0" type="button" data-bs-toggle="collapse" data-bs-target="#nav-user-menu" aria-expanded="false" aria-controls="nav-user-menu">
@@ -22,15 +32,17 @@
 				<li><hr class="dropdown-divider"></li>
 				<li><a class="btn btn-level-2 rounded-0 d-block" href="<?= site_url('Cis/Auth/logout'); ?>">Logout</a></li>
 			</ul>
-			<div id="nav-main-menu" class="collapse collapse-horizontal show">
-				<div>
-				<?php 
-					foreach($menu as $entry) {
-					$this->load->view('templates/CISHMVC-Menu/Entry', ['entry' => $entry, 'menu_id' => 'menu']);
-				}
-				?>
+			<?php if ($menu) { ?>
+				<div id="nav-main-menu" class="collapse collapse-horizontal show">
+					<div>
+						<?php
+								foreach ($menu as $entry) {
+									$this->load->view('templates/CISHMVC-Menu/Entry', ['entry' => $entry, 'menu_id' => 'menu']);
+								}
+						?>
+					</div>
 				</div>
-			</div>
+			<?php } ?>
 		</div>
 	</nav>
 </header>
diff --git a/application/views/templates/CISHMVC-Menu/Entry.php b/application/views/templates/CISHMVC-Menu/Entry.php
index 9242ba595..58d8ce84d 100644
--- a/application/views/templates/CISHMVC-Menu/Entry.php
+++ b/application/views/templates/CISHMVC-Menu/Entry.php
@@ -1,37 +1,57 @@
 <?php
 if (is_array($entry) && isset($entry['content_id']))
 	$entry = (object)$entry;
-$menu_id .= '-' . $entry->content_id;
+
+if (!isset($content_id))
+	$content_id = $entry->content_id;
+
+if (!isset($path))
+	$path = '';
+
+$menu_id .= '-' . $content_id;
 
 // TODO(chris): remove! DEBUG
 #$entry->menu_open = false;
 
-$link = $entry->url;
-$target = $entry->target;
+if (property_exists($entry, 'path')) {
+	$lang = getUserLanguage();
+	$link = $path . '/' . $entry->path[$lang];
+	$active = in_array($content_id, $this->router->breadcrumb);
+	$menu_open = $active ? true : (property_exists($entry, 'menu_open') ? $entry->menu_open : false);
+	$target = '';
+	$title = htmlspecialchars($entry->sprache[$lang]->titel);
+} else {
+	$link = $entry->url;
+	$active = false;
+	$menu_open = $entry->menu_open;
+	$target = $entry->target;
+	$title = htmlspecialchars($entry->titel);
+	$entry->children = $entry->childs;
+}
 
 ?>
-<?php if ($entry->childs) { ?>
+<?php if ($entry->children) { ?>
 	<?php if (substr($link, 0, 1) == '#') { ?>
-		<a href="#<?= $menu_id; ?>" data-bs-toggle="collapse" aria-expanded="<?= $entry->menu_open ? 'true' : 'false'; ?>" class="btn btn-default rounded-0 w-100 text-start dropdown-toggle btn-level-<?= substr_count($menu_id, '-'); ?><?= $entry->menu_open ? '' : ' collapsed'; ?>">
-			<span><?= htmlspecialchars($entry->titel); ?></span>
+		<a href="#<?= $menu_id; ?>" data-bs-toggle="collapse" aria-expanded="<?= $menu_open ? 'true' : 'false'; ?>" class="btn btn-default rounded-0 w-100 text-start dropdown-toggle btn-level-<?= substr_count($menu_id, '-'); ?><?= $menu_open ? '' : ' collapsed'; ?><?= $active ? ' active' : ''; ?>">
+			<span><?= $title; ?></span>
 		</a>
 	<?php } else { ?>
 		<div class="btn-group w-100">
-			<a<?= $link ? ' href="' . $link . '"' : ''; ?><?= $target ? ' target="' . $target . '"' : ''; ?> class="btn btn-default rounded-0 text-start btn-level-<?= substr_count($menu_id, '-'); ?>">
-				<?= htmlspecialchars($entry->titel); ?>
+			<a<?= $link ? ' href="' . $link . '"' : ''; ?><?= $target ? ' target="' . $target . '"' : ''; ?> class="btn btn-default rounded-0 text-start btn-level-<?= substr_count($menu_id, '-'); ?><?= $active ? ' active' : ''; ?>">
+				<?= $title; ?>
 			</a>
-			<a href="#<?= $menu_id; ?>" data-bs-toggle="collapse" aria-expanded="<?= $entry->menu_open ? 'true' : 'false'; ?>"class="btn btn-default rounded-0 dropdown-toggle dropdown-toggle-split flex-grow-0<?= $entry->menu_open ? '' : ' collapsed'; ?>" >
+			<a href="#<?= $menu_id; ?>" data-bs-toggle="collapse" aria-expanded="<?= $menu_open ? 'true' : 'false'; ?>"class="btn btn-default rounded-0 dropdown-toggle dropdown-toggle-split flex-grow-0<?= $menu_open ? '' : ' collapsed'; ?><?= $active ? ' active' : ''; ?>" >
 				<span class="visually-hidden">Toggle Dropdown</span>
 			</a>
 		</div>
 	<?php } ?>
-	<ul id="<?= $menu_id; ?>" class="nav w-100 collapse<?= $entry->menu_open ? ' show' : ''; ?>">
-		<?php foreach ($entry->childs as $child) 
-			$this->load->view('templates/CISHMVC-Menu/Entry', ['entry' => $child, 'menu_id' => $menu_id]);
+	<ul id="<?= $menu_id; ?>" class="nav w-100 collapse<?= $menu_open ? ' show' : ''; ?>">
+		<?php foreach ($entry->children as $id => $child) 
+			$this->load->view('templates/CISHMVC-Menu/Entry', ['content_id' => $id, 'entry' => $child, 'menu_id' => $menu_id, 'path' => $path]);
 		?>
 	</ul>
 <?php } else { ?>
-	<a<?= $link ? ' href="' . $link . '"' : ''; ?><?= $target ? ' target="' . $target . '"' : ''; ?> class="btn btn-default rounded-0 w-100 text-start btn-level-<?= substr_count($menu_id, '-'); ?>">
-		<?= htmlspecialchars($entry->titel); ?>
+	<a<?= $link ? ' href="' . $link . '"' : ''; ?><?= $target ? ' target="' . $target . '"' : ''; ?> class="btn btn-default rounded-0 w-100 text-start btn-level-<?= substr_count($menu_id, '-'); ?><?= $active ? ' active' : ''; ?>">
+		<?= $title; ?>
 	</a>
 <?php } ?>

From dc21662fc97ea165b936f4016d850db222bfcd8f Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 14 Jul 2023 13:01:01 +0200
Subject: [PATCH 0093/1461] Add missing SQL Rights for web

---
 system/dbupdate_3.4/dbupdate_dashboard.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/system/dbupdate_3.4/dbupdate_dashboard.php b/system/dbupdate_3.4/dbupdate_dashboard.php
index e1e611e4e..566d4bc63 100644
--- a/system/dbupdate_3.4/dbupdate_dashboard.php
+++ b/system/dbupdate_3.4/dbupdate_dashboard.php
@@ -369,6 +369,7 @@ GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE dashboard.tbl_dashboard_benutzer_over
 -- Name: SEQUENCE tbl_dashboard_benutzer_override_override_id_seq; Type: ACL; Schema: dashboard; Owner: fhcomplete
 --
 
+GRANT ALL ON SEQUENCE dashboard.tbl_dashboard_benutzer_override_override_id_seq TO web;
 GRANT ALL ON SEQUENCE dashboard.tbl_dashboard_benutzer_override_override_id_seq TO vilesci;
 
 

From d88ff104a318950ca55cccb2a7f22cd6f2ab1804 Mon Sep 17 00:00:00 2001
From: KarpAlex <karpenko@technikum-wien.at>
Date: Tue, 18 Jul 2023 19:11:10 +0200
Subject: [PATCH 0094/1461] filter component: added property
 tabulatorAdditionalColumns for displaying additional columns not in filter

---
 public/js/components/filter/Filter.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index fbd9ee268..2a0791537 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -55,6 +55,7 @@ export const CoreFilterCmpt = {
 		},
 		tabulatorOptions: Object,
 		tabulatorEvents: Array,
+		tabulatorAdditionalColumns: Array,
 		tableOnly: Boolean,
 		reload: Boolean,
 		download: {
@@ -137,7 +138,10 @@ export const CoreFilterCmpt = {
 				{
 					// If the column has to be displayed or not
 					col.visible = selectedFields.indexOf(col.field) >= 0;
-					if (col.formatter == 'rowSelection')
+					if (
+						col.formatter == 'rowSelection'
+						|| (this.tabulatorAdditionalColumns && this.tabulatorAdditionalColumns.indexOf(col.title) >= 0)
+					)
 						col.visible = true;
 
 					if (col.hasOwnProperty('resizable'))

From 7b96f9992928dfbf3feee0247c0cb4d99fff1d1a Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 19 Jul 2023 10:59:39 +0200
Subject: [PATCH 0095/1461] Access Rights Api Controller

---
 application/controllers/dashboard/Api.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/controllers/dashboard/Api.php b/application/controllers/dashboard/Api.php
index 3473afe61..422bf0675 100644
--- a/application/controllers/dashboard/Api.php
+++ b/application/controllers/dashboard/Api.php
@@ -8,8 +8,8 @@ class Api extends Auth_Controller
 		parent::__construct(
 			array(
 				'index'		=> 'dashboard/admin:rw',
-				'getNews'	=> 'dashboard/admin:rw',
-				'getAmpeln'	=> 'dashboard/admin:rw',
+				'getNews'	=> 'dashboard/benutzer:r',
+                'getAmpeln'	=> 'dashboard/benutzer:r',
 			)
 		);
 

From 72169b26c3f7eace2ed8891e988fc98b6abb6995 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 19 Jul 2023 11:06:01 +0200
Subject: [PATCH 0096/1461] separate class attribute and property for easier
 readability

---
 public/js/components/Dashboard/Item.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index 0e10a669d..43e03ebc7 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -103,7 +103,7 @@ export default {
 			<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
 		</div>
 	</div>
-	<div v-else-if="!hidden || editMode" :class="'dashboard-item card overflow-hidden h-100 ' + (arguments && arguments.className ? arguments.className : '')">
+	<div v-else-if="!hidden || editMode" class="dashboard-item card overflow-hidden h-100" :class="arguments && arguments.className ? arguments.className : ''">
 		<div v-if="editMode && widget" class="card-header d-flex ps-0 pe-2">
 			<span drag-action="move" class="col-auto mx-2 px-2 cursor-move"><i class="fa-solid fa-grip-vertical"></i></span>
 			<span class="col">{{ widget.setup.name }}</span>

From 0fd53dc3ac995df679100467617e12a5cec4ef3b Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 19 Jul 2023 11:10:01 +0200
Subject: [PATCH 0097/1461] spaces to tabs

---
 application/models/content/News_model.php | 192 +++++++++++-----------
 1 file changed, 96 insertions(+), 96 deletions(-)

diff --git a/application/models/content/News_model.php b/application/models/content/News_model.php
index 904b512f1..3199a0ac3 100644
--- a/application/models/content/News_model.php
+++ b/application/models/content/News_model.php
@@ -12,109 +12,109 @@ class News_model extends DB_Model
 		$this->pk = 'news_id';
 	}
 
-    /**
-     * Get all News ordered by date. (most actual on top)
-     * @param null $limit   Amount of news.
-     * @return array
-     */
-    public function getAll($limit = null)
-    {
-        return $this->loadWhere('
-            text IS NOT NULL
-            AND datum <= NOW() AND (datum_bis IS NULL OR datum_bis >= now()::date)
-            ORDER BY datum DESC
-            LIMIT '. $this->escape($limit)
-        );
-    }
+	/**
+	 * Get all News ordered by date. (most actual on top)
+	 * @param null $limit   Amount of news.
+	 * @return array
+	 */
+	public function getAll($limit = null)
+	{
+		return $this->loadWhere('
+			text IS NOT NULL
+			AND datum <= NOW() AND (datum_bis IS NULL OR datum_bis >= now()::date)
+			ORDER BY datum DESC
+			LIMIT '. $this->escape($limit)
+		);
+	}
 
-    /**
-     * @param string            $sprache
-     * @param string            $studiengang_kz
-     * @param integer | null    $semester
-     * @param string            $fachbereich_kurzbz
-     * @param boolean           $sichtbar
-     * @param integer           $maxalter
-     * @param integer           $maxnews
-     * @param boolean           $all
-     * @param boolean           $mischen
-     * 
-     * TODO(chris): this is not a good function -> the params are all over the place
-     * 
-     * @return stdObj
-     */
-    public function getNewsWithContent($sprache, $studiengang_kz, $semester, $fachbereich_kurzbz = null, $sichtbar = true, $maxalter = 0, $maxnews = 0, $all = false, $mischen = true)
-    {
-        $studiengang_kz = trim($studiengang_kz);
-        $fachbereich_kurzbz = trim($fachbereich_kurzbz);
+	/**
+	 * @param string            $sprache
+	 * @param string            $studiengang_kz
+	 * @param integer | null    $semester
+	 * @param string            $fachbereich_kurzbz
+	 * @param boolean           $sichtbar
+	 * @param integer           $maxalter
+	 * @param integer           $maxnews
+	 * @param boolean           $all
+	 * @param boolean           $mischen
+	 * 
+	 * TODO(chris): this is not a good function -> the params are all over the place
+	 * 
+	 * @return stdObj
+	 */
+	public function getNewsWithContent($sprache, $studiengang_kz, $semester, $fachbereich_kurzbz = null, $sichtbar = true, $maxalter = 0, $maxnews = 0, $all = false, $mischen = true)
+	{
+		$studiengang_kz = trim($studiengang_kz);
+		$fachbereich_kurzbz = trim($fachbereich_kurzbz);
 
-        $where = [];
-        $params = [];
-        if (trim($maxalter) != '0')
-        {
-            $where[] = "(now()-datum) < interval ? days";
-            $params[] = $maxalter;
-        }
-        if (!$all)
-        {
-            $where[] = "datum <= now()";
-            $where[] = "(datum_bis >= now()::date OR datum_bis IS NULL)";
-        }
-        if ($fachbereich_kurzbz != '*')
-        {
-            if ($fachbereich_kurzbz == '')
-            {
-                $where[] = "fachbereich_kurzbz IS NULL";
-            }
-            else
-            {
-                $where[] = "fachbereich_kurzbz = ?";
-                $params[] = $fachbereich_kurzbz;
-            }
-        }
-        if ($studiengang_kz == '0')
-        {
-            $where[] = "studiengang_kz = ?";
-            $params[] = $studiengang_kz;
-            if ($semester === NULL)
-                $where[] = "semester IS NULL";
-            elseif ($semester === 0)
-                $where[] = "semester = 0";
-        }
-        elseif ($studiengang_kz != '')
-        {
-            $add = $mischen === true ? " OR (studiengang_kz = 0 AND semester IS NULL)" : "";
-            $where[] = "((studiengang_kz = ? AND semester = ?) OR (studiengang_kz = ? AND semester = 0) OR (studiengang_kz = 0 AND semester = ?)" . $add . ")";
-            $params[] = $studiengang_kz;
-            $params[] = $semester;
-            $params[] = $studiengang_kz;
-            $params[] = $semester;
-        }
-        $this->addJoin('campus.tbl_contentsprache cs', 'content_id');
-        
-        $where[] = "cs.sichtbar = " . ($sichtbar ? "true" : "false");
-        
-        $where[] = "cs.sprache = (CASE WHEN EXISTS(SELECT 1 FROM campus.tbl_contentsprache cs2 WHERE cs2.content_id=" . $this->dbTable . ".content_id AND sprache=?) THEN ? ELSE ? END)";
-        $params[] = $sprache;
-        $params[] = $sprache;
-        $params[] = DEFAULT_LANGUAGE;
-        
-        $where[] = "cs.version = (SELECT MAX(version) FROM campus.tbl_contentsprache cs3 WHERE cs3.content_id=" . $this->dbTable . ".content_id AND cs3.sprache = (CASE WHEN EXISTS(SELECT 1 FROM campus.tbl_contentsprache cs2 WHERE cs2.content_id=" . $this->dbTable . ".content_id AND sprache=?) THEN ? ELSE ? END))";
-        $params[] = $sprache;
-        $params[] = $sprache;
-        $params[] = DEFAULT_LANGUAGE;
+		$where = [];
+		$params = [];
+		if (trim($maxalter) != '0')
+		{
+			$where[] = "(now()-datum) < interval ? days";
+			$params[] = $maxalter;
+		}
+		if (!$all)
+		{
+			$where[] = "datum <= now()";
+			$where[] = "(datum_bis >= now()::date OR datum_bis IS NULL)";
+		}
+		if ($fachbereich_kurzbz != '*')
+		{
+			if ($fachbereich_kurzbz == '')
+			{
+				$where[] = "fachbereich_kurzbz IS NULL";
+			}
+			else
+			{
+				$where[] = "fachbereich_kurzbz = ?";
+				$params[] = $fachbereich_kurzbz;
+			}
+		}
+		if ($studiengang_kz == '0')
+		{
+			$where[] = "studiengang_kz = ?";
+			$params[] = $studiengang_kz;
+			if ($semester === NULL)
+				$where[] = "semester IS NULL";
+			elseif ($semester === 0)
+				$where[] = "semester = 0";
+		}
+		elseif ($studiengang_kz != '')
+		{
+			$add = $mischen === true ? " OR (studiengang_kz = 0 AND semester IS NULL)" : "";
+			$where[] = "((studiengang_kz = ? AND semester = ?) OR (studiengang_kz = ? AND semester = 0) OR (studiengang_kz = 0 AND semester = ?)" . $add . ")";
+			$params[] = $studiengang_kz;
+			$params[] = $semester;
+			$params[] = $studiengang_kz;
+			$params[] = $semester;
+		}
+		$this->addJoin('campus.tbl_contentsprache cs', 'content_id');
+		
+		$where[] = "cs.sichtbar = " . ($sichtbar ? "true" : "false");
+		
+		$where[] = "cs.sprache = (CASE WHEN EXISTS(SELECT 1 FROM campus.tbl_contentsprache cs2 WHERE cs2.content_id=" . $this->dbTable . ".content_id AND sprache=?) THEN ? ELSE ? END)";
+		$params[] = $sprache;
+		$params[] = $sprache;
+		$params[] = DEFAULT_LANGUAGE;
+		
+		$where[] = "cs.version = (SELECT MAX(version) FROM campus.tbl_contentsprache cs3 WHERE cs3.content_id=" . $this->dbTable . ".content_id AND cs3.sprache = (CASE WHEN EXISTS(SELECT 1 FROM campus.tbl_contentsprache cs2 WHERE cs2.content_id=" . $this->dbTable . ".content_id AND sprache=?) THEN ? ELSE ? END))";
+		$params[] = $sprache;
+		$params[] = $sprache;
+		$params[] = DEFAULT_LANGUAGE;
 
-        $where = implode(" AND ", $where);
+		$where = implode(" AND ", $where);
 
-        $this->addOrder('datum', 'DESC');
-        if ($maxnews)
-            $this->addLimit($maxnews);
+		$this->addOrder('datum', 'DESC');
+		if ($maxnews)
+			$this->addLimit($maxnews);
 
 
-        $this->db->where($where, NULL, FALSE);
+		$this->db->where($where, NULL, FALSE);
 
-        $sql = $this->db->get_compiled_select($this->dbTable);
+		$sql = $this->db->get_compiled_select($this->dbTable);
 
-        return $this->execQuery($sql, $params);
-    }
+		return $this->execQuery($sql, $params);
+	}
 
 }

From 0beabe0f4acf5fd366f58b6a0f06f616d0f17610 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 19 Jul 2023 11:11:52 +0200
Subject: [PATCH 0098/1461] spaces to tabs

---
 application/controllers/dashboard/Api.php | 112 +++++++++++-----------
 1 file changed, 56 insertions(+), 56 deletions(-)

diff --git a/application/controllers/dashboard/Api.php b/application/controllers/dashboard/Api.php
index 8a9d24c4f..c66f181dc 100644
--- a/application/controllers/dashboard/Api.php
+++ b/application/controllers/dashboard/Api.php
@@ -3,76 +3,76 @@ defined('BASEPATH') || exit('No direct script access allowed');
 
 class Api extends Auth_Controller
 {
-    public function __construct()
-    {
-        parent::__construct(
-            array(
-                'index'		=> 'dashboard/admin:rw',
-                'getNews'	=> 'dashboard/benutzer:r',
-                'getAmpeln'	=> 'dashboard/benutzer:r',
-            )
-        );
+	public function __construct()
+	{
+		parent::__construct(
+			array(
+				'index'		=> 'dashboard/admin:rw',
+				'getNews'	=> 'dashboard/benutzer:r',
+				'getAmpeln'	=> 'dashboard/benutzer:r',
+			)
+		);
 
-        $this->load->library('AuthLib', null, 'AuthLib');
+		$this->load->library('AuthLib', null, 'AuthLib');
 
-        $this->_setAuthUID();
-    }
+		$this->_setAuthUID();
+	}
 
-    public function index()
-    {
-        echo 'Dashboard API Controller';
-    }
+	public function index()
+	{
+		echo 'Dashboard API Controller';
+	}
 
-    /**
-     * Get News.
-     */
-    public function getNews()
-    {
-        $limit =  $this->input->get('limit');
+	/**
+	 * Get News.
+	 */
+	public function getNews()
+	{
+		$limit =  $this->input->get('limit');
 
-        $this->load->model('content/News_model', 'NewsModel');
+		$this->load->model('content/News_model', 'NewsModel');
 
-        $result = $this->NewsModel->getAll($limit);
+		$result = $this->NewsModel->getAll($limit);
 
-        if(hasData($result))
-        {
+		if(hasData($result))
+		{
 
-            $this->outputJson(getData($result), REST_Controller::HTTP_OK);
-        }
-        else
-        {
-            $this->terminateWithJsonError('fehler entdeckt');
-        }
-    }
+			$this->outputJson(getData($result), REST_Controller::HTTP_OK);
+		}
+		else
+		{
+			$this->terminateWithJsonError('fehler entdeckt');
+		}
+	}
 
 
-    /**
-     * Get Ampeln.
-     */
-    public function getAmpeln(){
+	/**
+	 * Get Ampeln.
+	 */
+	public function getAmpeln(){
 
-        $this->load->model('content/Ampel_model', 'AmpelModel');
-        $result = $this->AmpelModel->getByUser($this->_uid);
+		$this->load->model('content/Ampel_model', 'AmpelModel');
+		$result = $this->AmpelModel->getByUser($this->_uid);
 
-        if(hasData($result))
-        {
+		if(hasData($result))
+		{
 
-            $this->outputJson(getData($result), REST_Controller::HTTP_OK);
-        }
-        else
-        {
-            $this->terminateWithJsonError('fehler entdeckt');
-        }
+			$this->outputJson(getData($result), REST_Controller::HTTP_OK);
+		}
+		else
+		{
+			$this->terminateWithJsonError('fehler entdeckt');
+		}
 
-    }
+	}
 
-    /**
-     * Retrieve the UID of the logged user and checks if it is valid
-     */
-    private function _setAuthUID()
-    {
-        $this->_uid = getAuthUID();
+	/**
+	 * Retrieve the UID of the logged user and checks if it is valid
+	 */
+	private function _setAuthUID()
+	{
+		$this->_uid = getAuthUID();
 
-        if (!$this->_uid) show_error('User authentification failed');
-    }
+		if (!$this->_uid) show_error('User authentification failed');
+	}
 }

From ffd12e8ddf0b61e3a95c4c9690c8ba89189f4dd5 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 19 Jul 2023 11:17:17 +0200
Subject: [PATCH 0099/1461] Access Rights

---
 application/controllers/Cis4.php        | 12 ++++++------
 application/controllers/CisHtml/Cms.php |  9 ++++-----
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/application/controllers/Cis4.php b/application/controllers/Cis4.php
index bbb0bd672..20e620102 100644
--- a/application/controllers/Cis4.php
+++ b/application/controllers/Cis4.php
@@ -5,18 +5,18 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 /**
  * 
  */
-class Cis4 extends Auth_Controller
+class Cis4 extends FHC_Controller
 {
 	/**
 	 * Constructor
 	 */
 	public function __construct()
 	{
-		parent::__construct(
-			array(
-				'index' => 'user:r'
-			)
-		);
+		parent::__construct();
+
+		// Loads Libraries
+		$this->load->library('AuthLib');
+		$this->load->library('PermissionLib');
 	}
 
 	// -----------------------------------------------------------------------------------------------------------------
diff --git a/application/controllers/CisHtml/Cms.php b/application/controllers/CisHtml/Cms.php
index 9ec22bea0..fa6f0e980 100644
--- a/application/controllers/CisHtml/Cms.php
+++ b/application/controllers/CisHtml/Cms.php
@@ -5,19 +5,18 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 /**
  * 
  */
-class Cms extends Auth_Controller
+class Cms extends FHC_Controller
 {
 	/**
 	 * Constructor
 	 */
 	public function __construct()
 	{
-		parent::__construct([
-			'content' => 'user:r',
-			'news' => 'user:r'
-		]);
+		parent::__construct();
 
 		// Loads Libraries
+		$this->load->library('AuthLib');
+		$this->load->library('PermissionLib');
 		$this->load->library('CmsLib');
 
 		// Loads phrases system

From 2046b6c2a894727e6cdbc83902a23574d16fdd5e Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 25 Jul 2023 10:38:48 +0200
Subject: [PATCH 0100/1461] Menu Entry: Studierendenantrag

---
 application/controllers/Cis4.php             | 3 ---
 application/models/content/Content_model.php | 9 +++++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/application/controllers/Cis4.php b/application/controllers/Cis4.php
index 20e620102..2f2ad6604 100644
--- a/application/controllers/Cis4.php
+++ b/application/controllers/Cis4.php
@@ -29,7 +29,4 @@ class Cis4 extends FHC_Controller
 	{
 		$this->load->view('CisHtml/Dashboard.php');
 	}
-
-	
-
 }
diff --git a/application/models/content/Content_model.php b/application/models/content/Content_model.php
index 1d97713cf..e83cffa2f 100644
--- a/application/models/content/Content_model.php
+++ b/application/models/content/Content_model.php
@@ -125,6 +125,15 @@ class Content_model extends DB_Model
 						"menu_open": false,
 						"aktiv": true,
 						"childs": []
+					},
+					{
+						"content_id": 1000006,
+						"template_kurzbz": "redirect",
+						"titel": "Studierendenstatus",
+						"content": "<content><url><![CDATA[' . site_url('/lehre/Studierendenantrag') . ']]></url><target><![CDATA[]]></target></content>",
+						"menu_open": false,
+						"aktiv": true,
+						"childs": []
 					}
 				]
 			}');

From ace3bd673611366039c2ebddd0b360cfd3b8ceaf Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 27 Jul 2023 10:57:53 +0200
Subject: [PATCH 0101/1461] Verbesserungen

---
 application/controllers/Cis/Pub.php           | 167 ++++++++++++++++++
 application/controllers/CisVue/Cms.php        |   9 +-
 application/controllers/components/CisVue.php |  10 +-
 application/views/lehre/Antrag/Create.php     |   6 +-
 .../views/lehre/Antrag/Student/List.php       |   4 +-
 .../lehre/Antrag/Wiederholung/Student.php     |   2 +-
 .../views/templates/CISHMVC-Header.php        |  11 +-
 .../views/templates/CISHTML-Header.php        |   7 +-
 application/views/templates/CISVUE-Header.php |  10 +-
 application/views/templates/FHC-Header.php    |   2 +-
 public/css/Cis4/Cis.css                       |  14 ++
 public/css/cis4.css                           |   0
 12 files changed, 221 insertions(+), 21 deletions(-)
 create mode 100644 application/controllers/Cis/Pub.php
 create mode 100644 public/css/cis4.css

diff --git a/application/controllers/Cis/Pub.php b/application/controllers/Cis/Pub.php
new file mode 100644
index 000000000..34a71b85d
--- /dev/null
+++ b/application/controllers/Cis/Pub.php
@@ -0,0 +1,167 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+ 
+/**
+ * 
+ */
+class Pub extends FHC_Controller
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+
+		// Load Libraries
+		$this->load->library('AuthLib');
+		$this->load->library('PermissionLib');
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * @param string	$source [person|akte]
+	 * @param integer	$id
+	 * @return void
+	 */
+	public function bild($source, $id)
+	{
+		$this->load->model('person/Person_model', 'PersonModel');
+
+		$person_id_user = '';
+		$serverzugriff = false;
+
+		// Wenn das Bild direkt aufgerufen wird, ist eine Authentifizierung erforderlich
+		// Wenn es vom Server selbst aufgerufen wird, ist keine Auth. notwendig
+		// (z.B. fuer die Erstellung von PDFs)
+		if ($_SERVER['REMOTE_ADDR'] != $_SERVER['SERVER_ADDR']) {
+			// Wenn Session gesetzt ist, keine Abfrage, da diese Personen noch keine UID haben
+			
+			if (isset($_SESSION['incoming/user'])) { // Von Incomingtool
+				$result = $this->PersonModel->loadWhere([
+					'zugangscode' => $_SESSION['incoming/user']
+				]);
+				if (hasData($result))
+					$person_id_user = current(getData($result))->person_id;
+			} elseif (isset($_SESSION['prestudent/user'])) { // Von Prestudententool
+				$result = $this->PersonModel->loadWhere([
+					'zugangscode' => $_SESSION['prestudent/user']
+				]);
+				if (hasData($result))
+					$person_id_user = current(getData($result))->person_id;
+			} elseif (isset($_SESSION['bewerbung/personId'])) { // Von Bewerbungstool
+				$person_id_user = $_SESSION['bewerbung/personId'];
+			} else {
+				$person_id_user = getAuthPersonId();
+			}
+		} else {
+			$serverzugriff = true;
+		}
+
+		// Default Bild (Dummy Profilbild)
+		$cTmpHEX = base64_encode(file_get_contents(FHCPATH . 'skin/images/profilbild_dummy.jpg'));
+
+		if ($source == 'person' && $id) {
+			$foto_gesperrt = false;
+			// Person laden und Fotosperre überprüfen
+			$result = $this->PersonModel->load($id);
+			if (hasData($result)) {
+				$person = current(getData($result));
+				if ($person->foto_sperre) {
+					// Wenn der User selbst darauf zugreift darf er das Bild sehen
+					$foto_gesperrt = ($person_id_user != $id);
+				} elseif (!$person_id_user && !$serverzugriff) {
+					$foto_gesperrt = true;
+				}
+
+				if ($person->foto && !$foto_gesperrt) {
+					$cTmpHEX = base64_decode($person->foto);
+				}
+			}
+		}
+		if($source == 'akte' && $id != '')
+		{
+			$this->load->model('crm/Akte_model', 'AkteModel');
+
+			$this->AkteModel->addJoin('public.tbl_person', 'person_id');
+			$result = $this->AkteModel->loadWhere([
+				'person_id' => $id,
+				'dokument_kurzbz' => 'Lichtbil'
+			]);
+
+			if (hasData($result)) {
+				$foto_gesperrt = false;
+
+				$akte = current(getData($result));
+				if ($akte->foto_sperre) {
+					// Wenn der User selbst darauf zugreift darf er das Bild sehen
+					$foto_gesperrt = ($person_id_user != $id);
+				} elseif (!$person_id_user && !$serverzugriff) {
+					$foto_gesperrt = true;
+				}
+
+				// Wenn das Foto nicht im Inhalt steht wird aus aus dem DMS geladen
+				if (!$akte->inhalt && $akte->dms_id) {
+					$this->load->model('content/Dms_model', 'DmsModel');
+					$this->load->model('content/DmsVersion_model', 'DmsVersionModel');
+
+					$this->DmsModel->addJoin('campus.tbl_dms_version', 'dms_id');
+					$this->DmsModel->addOrder('version', 'DESC');
+					$this->DmsModel->addLimit(1);
+					$result = $this->DmsModel->load($akte->dms_id);
+
+					if (!hasData($result))
+						die('Kein Dokument vorhanden');
+
+					$dms = current(getData($result));
+
+					$filename = DMS_PATH . $dms->filename;
+
+					$this->DmsVersionModel->update([
+						'dms_id' => $dms->dms_id,
+						'version' => $dms->version
+					], [
+						'letzterzugriff' => date('c')
+					]);
+
+					if (file_exists($filename)) {
+						if ($handle = fopen($filename, "r")) {
+							while (!feof($handle)) {
+								$akte->inhalt .= fread($handle, 8192);
+							}
+							fclose($handle);
+						} else {
+							echo 'Fehler: Datei konnte nicht geoeffnet werden';
+						}
+					} else {
+						echo 'Die Datei existiert nicht';
+					}
+				}
+
+				if ($akte->inhalt && !$foto_gesperrt) {
+					$cTmpHEX = $akte->inhalt;
+				}
+
+			}
+		}
+
+		// die bilder werden, sofern es funktioniert, in jpg umgewandelt da es sonst zu fehlern beim erstellen
+		// von pdfs kommen kann.
+
+		$im = @imagecreatefromstring(base64_decode($cTmpHEX));
+		if ($im) {
+			@ob_clean();
+			header("Content-type: image/jpeg");
+			exit(imagejpeg($im));
+		} else {
+			// bei manchen Bildern funktioniert die konvertierung nicht
+			// diese werden dann einfach so angezeigt.
+			@ob_clean();
+			header("Content-type: image/gif");
+			exit($cTmpHEX);
+		}
+	}
+}
diff --git a/application/controllers/CisVue/Cms.php b/application/controllers/CisVue/Cms.php
index 9ec22bea0..fa6f0e980 100644
--- a/application/controllers/CisVue/Cms.php
+++ b/application/controllers/CisVue/Cms.php
@@ -5,19 +5,18 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 /**
  * 
  */
-class Cms extends Auth_Controller
+class Cms extends FHC_Controller
 {
 	/**
 	 * Constructor
 	 */
 	public function __construct()
 	{
-		parent::__construct([
-			'content' => 'user:r',
-			'news' => 'user:r'
-		]);
+		parent::__construct();
 
 		// Loads Libraries
+		$this->load->library('AuthLib');
+		$this->load->library('PermissionLib');
 		$this->load->library('CmsLib');
 
 		// Loads phrases system
diff --git a/application/controllers/components/CisVue.php b/application/controllers/components/CisVue.php
index b8b7f98cc..537537f08 100644
--- a/application/controllers/components/CisVue.php
+++ b/application/controllers/components/CisVue.php
@@ -5,7 +5,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 /**
  *
  */
-class CisVue extends Auth_Controller
+class CisVue extends FHC_Controller
 {
 
 	/**
@@ -13,12 +13,14 @@ class CisVue extends Auth_Controller
 	 */
 	public function __construct()
 	{
-		parent::__construct([
-			'Menu' => 'user:r'
-		]);
+		parent::__construct();
 
 		// Loads authentication library and starts authentication
 		$this->load->library('AuthLib');
+		$this->load->library('PermissionLib');
+
+		if (!isLogged())
+			show_404();
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
diff --git a/application/views/lehre/Antrag/Create.php b/application/views/lehre/Antrag/Create.php
index 87c9c3af6..e1b80958c 100644
--- a/application/views/lehre/Antrag/Create.php
+++ b/application/views/lehre/Antrag/Create.php
@@ -18,13 +18,13 @@ $sitesettings = array(
 );
 
 $this->load->view(
-	'templates/FHC-Header',
+	'templates/CISHTML-Header',
 	$sitesettings
 );
 ?>
 
 <div id="wrapper">
-	<div class="fhc-header">
+	<div class="fhc-header hide-in-frame">
 		<h1 class="h2"><?= $this->p->t('studierendenantrag', 'antrag_header'); ?></h1>
 	</div>
 
@@ -49,6 +49,6 @@ $this->load->view(
 
 <?php
 $this->load->view(
-	'templates/FHC-Footer',
+	'templates/CISHTML-Footer',
 	$sitesettings
 );
diff --git a/application/views/lehre/Antrag/Student/List.php b/application/views/lehre/Antrag/Student/List.php
index 52242d7d6..c7b6676b9 100644
--- a/application/views/lehre/Antrag/Student/List.php
+++ b/application/views/lehre/Antrag/Student/List.php
@@ -17,7 +17,7 @@ $sitesettings = array(
 );
 
 $this->load->view(
-	'templates/FHC-Header',
+	'templates/CISHTML-Header',
 	$sitesettings
 );
 ?>
@@ -131,6 +131,6 @@ $this->load->view(
 
 <?php
 $this->load->view(
-	'templates/FHC-Footer',
+	'templates/CISHTML-Footer',
 	$sitesettings
 );
diff --git a/application/views/lehre/Antrag/Wiederholung/Student.php b/application/views/lehre/Antrag/Wiederholung/Student.php
index 9c2db040e..5a9fc2fb4 100644
--- a/application/views/lehre/Antrag/Wiederholung/Student.php
+++ b/application/views/lehre/Antrag/Wiederholung/Student.php
@@ -26,7 +26,7 @@ $this->load->view(
 ?>
 
 <div id="wrapper" class="overflow-hidden">
-	<div class="fhc-header" v-if="notinframe">
+	<div class="fhc-header hide-in-frame" v-if="notinframe">
 		<h1 class="h2"><?= $this->p->t('studierendenantrag', 'title_lvzuweisen', ['name' => $antrag->name]);?></h1>
 	</div>
 	<div class="fhc-container row mt-3">
diff --git a/application/views/templates/CISHMVC-Header.php b/application/views/templates/CISHMVC-Header.php
index a9b429217..7e4b8cea3 100644
--- a/application/views/templates/CISHMVC-Header.php
+++ b/application/views/templates/CISHMVC-Header.php
@@ -6,11 +6,17 @@
 		}
 	}
 ?>
+
+<script type="text/javascript">
+	if (window.self !== window.top)
+		document.body.classList.add("in-frame");
+</script>
+
 <header id="cis-header" class="navbar-dark">
 	<button id="nav-main-btn" class="navbar-toggler" type="button" data-bs-toggle="offcanvas" data-bs-target="#nav-main" aria-controls="nav-main" aria-expanded="false" aria-label="Toggle navigation">
 		<span class="navbar-toggler-icon"></span>
 	</button>
-	<a id="nav-logo" href="<?= site_url('CisHmvc'); ?>">
+	<a id="nav-logo" href="<?= site_url(''); ?>">
 		<img src="<?= base_url('/public/images/logo-300x160.png'); ?>" alt="Logo">
 	</a>
 	<nav id="nav-main" class="offcanvas offcanvas-start bg-dark" tabindex="-1" aria-labelledby="nav-main-btn" data-bs-backdrop="false">
@@ -24,7 +30,7 @@
 		<div class="offcanvas-body p-0">
 			<fhc-searchbar id="nav-search" class="fhc-searchbar w-100" :searchoptions="searchbaroptions" :searchfunction="searchfunction"></fhc-searchbar>
 			<button id="nav-user-btn" class="btn btn-link rounded-0" type="button" data-bs-toggle="collapse" data-bs-target="#nav-user-menu" aria-expanded="false" aria-controls="nav-user-menu">
-				<img src="<?= base_url('/cis/public/bild.php?src=person&person_id=' . getAuthPersonId()); ?>" class="avatar rounded-circle"/>
+				<img src="<?= site_url('Cis/Pub/bild/person/' . getAuthPersonId()); ?>" class="avatar rounded-circle"/>
 			</button>
 			<ul id="nav-user-menu" class="collapse list-unstyled" aria-labelledby="nav-user-btn">
 				<li><a class="btn btn-level-2 rounded-0 d-block" href="#" id="menu-profil">Profil</a></li>
@@ -46,4 +52,5 @@
 		</div>
 	</nav>
 </header>
+
 <main id="cis-main" class="flex-grow-1 overflow-scroll p-4">
diff --git a/application/views/templates/CISHTML-Header.php b/application/views/templates/CISHTML-Header.php
index fe2d69b28..2ae90bda8 100644
--- a/application/views/templates/CISHTML-Header.php
+++ b/application/views/templates/CISHTML-Header.php
@@ -23,6 +23,10 @@ if (!isset($menu)) {
 }
 ?>
 
+<script type="text/javascript">
+	if (window.self !== window.top)
+		document.body.classList.add("in-frame");
+</script>
 <header id="cis-header" class="navbar-dark">
 	<button id="nav-main-btn" class="navbar-toggler" type="button" data-bs-toggle="offcanvas" data-bs-target="#nav-main" aria-controls="nav-main" aria-expanded="false" aria-label="Toggle navigation">
 		<span class="navbar-toggler-icon"></span>
@@ -39,7 +43,7 @@ if (!isset($menu)) {
 		<div class="offcanvas-body p-0">
 			<fhc-searchbar id="nav-search" class="fhc-searchbar w-100" :searchoptions="searchbaroptions" :searchfunction="searchfunction"></fhc-searchbar>
 			<button id="nav-user-btn" class="btn btn-link rounded-0" type="button" data-bs-toggle="collapse" data-bs-target="#nav-user-menu" aria-expanded="false" aria-controls="nav-user-menu">
-				<img src="<?= base_url('/cis/public/bild.php?src=person&person_id=' . getAuthPersonId()); ?>" class="avatar rounded-circle"/>
+				<img src="<?= site_url('Cis/Pub/bild/person/' . getAuthPersonId()); ?>" class="avatar rounded-circle"/>
 			</button>
 			<ul id="nav-user-menu" class="collapse list-unstyled" aria-labelledby="nav-user-btn">
 				<li><a class="btn btn-level-2 rounded-0 d-block" href="#" id="menu-profil">Profil</a></li>
@@ -57,4 +61,5 @@ if (!isset($menu)) {
 		</div>
 	</nav>
 </header>
+
 <main id="cis-main" class="flex-grow-1 overflow-scroll p-4">
diff --git a/application/views/templates/CISVUE-Header.php b/application/views/templates/CISVUE-Header.php
index bd4afa012..b65e02e13 100644
--- a/application/views/templates/CISVUE-Header.php
+++ b/application/views/templates/CISVUE-Header.php
@@ -17,13 +17,19 @@ $this->load->view('templates/FHC-Header', $includesArray);
 
 ?>
 
+<script type="text/javascript">
+	if (window.self !== window.top)
+		document.body.classList.add("in-frame");
+</script>
+
 <header id="cis-header" class="navbar-dark">
 	<cis-menu 
-		root-url="<?= site_url('CisVue'); ?>" 
+		root-url="<?= site_url(''); ?>" 
 		logo-url="<?= base_url('/public/images/logo-300x160.png'); ?>" 
-		avatar-url="<?= base_url('/cis/public/bild.php?src=person&person_id=' . getAuthPersonId()); ?>" 
+		avatar-url="<?= site_url('Cis/Pub/bild/person/' . getAuthPersonId()); ?>" 
 		logout-url="<?= site_url('Cis/Auth/logout'); ?>" 
 		:searchbaroptions="searchbaroptions" 
 		:searchfunction="searchfunction" />
 </header>
+
 <main id="cis-main" class="flex-grow-1 overflow-scroll p-4">
diff --git a/application/views/templates/FHC-Header.php b/application/views/templates/FHC-Header.php
index b87a6e6d0..c891f432f 100644
--- a/application/views/templates/FHC-Header.php
+++ b/application/views/templates/FHC-Header.php
@@ -119,7 +119,7 @@
 			if ($widgets === true) generateCSSsInclude('public/css/Widgets.css');
 
 			// CIS
-			if ($cis === true) generateCSSsInclude('public/css/cis_bs5.css');
+			if ($cis === true) generateCSSsInclude(defined('CIS4') ? 'public/css/cis4.css' : 'public/css/cis_bs5.css');
 
 			// Eventually required CSS
 			generateCSSsInclude($customCSSs); // Eventually required CSS
diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index c698ff6e5..0ed8ecf62 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -174,6 +174,15 @@
   width: 100% !important;
 }
 
+/* frame */
+.in-frame {
+  --fhc-cis-header-height: 0;
+}
+.in-frame #cis-header,
+.in-frame .hide-in-frame {
+  display: none;
+}
+
 /* desktop */
 @media (min-width: 992px) {
   body {
@@ -218,11 +227,16 @@
     width: 0;
     z-index: 1;
   }
+  #nav-main-toggle .btn,
   #nav-main-toggle .fa-arrow-circle-left {
     transition: all 0.5s ease-in-out;
   }
+  #nav-main-toggle .collapsed.btn {
+    background-color: transparent !important;
+  }
   #nav-main-toggle .collapsed .fa-arrow-circle-left {
     transform: scaleX(-1);
+    color: var(--bs-dark);
   }
   #nav-search {
     position: fixed;
diff --git a/public/css/cis4.css b/public/css/cis4.css
new file mode 100644
index 000000000..e69de29bb

From 7dee77a6af72f9a94cc490e44d85c7fc7eaafdb1 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 27 Jul 2023 11:42:03 +0200
Subject: [PATCH 0102/1461] Code Quality

---
 application/controllers/Cis/Auth.php          |  3 +-
 application/controllers/Cis/Documents.php     | 18 ++++--
 application/controllers/Cis/MyLv.php          |  3 +-
 application/controllers/Cis/Pub.php           |  6 +-
 application/controllers/Cis/Stundenplan.php   |  3 +-
 application/controllers/Cis4.php              |  2 +-
 application/controllers/CisHmvc.php           | 30 +++++-----
 application/controllers/CisHmvc/Cms.php       | 10 ++--
 application/controllers/CisHmvc/Dashboard.php |  3 +-
 application/controllers/CisHtml/Cms.php       |  6 +-
 application/controllers/CisHtml/Dashboard.php |  5 +-
 application/controllers/CisVue/Cms.php        |  6 +-
 application/controllers/CisVue/Dashboard.php  |  5 +-
 application/models/content/Content_model.php  | 55 ++++++++++++++++---
 .../views/templates/CISHMVC-Header.php        | 16 +++---
 .../views/templates/CISHMVC-Menu/Entry.php    |  2 +-
 .../views/templates/CISHTML-Footer.php        |  2 +-
 .../views/templates/CISHTML-Menu/Entry.php    | 17 +++---
 18 files changed, 113 insertions(+), 79 deletions(-)

diff --git a/application/controllers/Cis/Auth.php b/application/controllers/Cis/Auth.php
index e2308cab2..59dab1568 100644
--- a/application/controllers/Cis/Auth.php
+++ b/application/controllers/Cis/Auth.php
@@ -3,7 +3,7 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
  
 /**
- * 
+ *
  */
 class Auth extends FHC_Controller
 {
@@ -74,5 +74,4 @@ class Auth extends FHC_Controller
 		$this->authlib->logout();
 		redirect('/Cis/Auth/login', 'refresh');
 	}
-
 }
diff --git a/application/controllers/Cis/Documents.php b/application/controllers/Cis/Documents.php
index 094ade296..31f441634 100644
--- a/application/controllers/Cis/Documents.php
+++ b/application/controllers/Cis/Documents.php
@@ -2,8 +2,10 @@
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
+use \stdClass as stdClass;
+
 /**
- * 
+ *
  */
 class Documents extends Auth_Controller
 {
@@ -55,8 +57,6 @@ class Documents extends Auth_Controller
 		$this->load->model('crm/Konto_model', 'KontoModel');
 		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
 
-		$studiengaenge = [];
-
 		$stati = $this->PrestudentstatusModel->loadWhereUid($uid, null, true);
 		if (isError($stati))
 			return $this->load->view('errors/html/error_db.php', [
@@ -82,7 +82,7 @@ class Documents extends Auth_Controller
 					return $this->load->view('errors/html/error_db.php', [
 						'heading' => 'Database Error',
 						'message' => getError($stg)
-					]); 
+					]);
 				$stg = getData($stg);
 				if (!$stg)
 					return $this->load->view('errors/html/error_db.php', [
@@ -94,7 +94,13 @@ class Documents extends Auth_Controller
 			}
 			if (!isset($stgs[$status->studiengang_kz]->studiensemester[$status->studiensemester_kurzbz])) {
 				$stgs[$status->studiengang_kz]->studiensemester[$status->studiensemester_kurzbz] = new stdClass();
-				$stgs[$status->studiengang_kz]->studiensemester[$status->studiensemester_kurzbz]->inskriptionsbestaetigung = (boolean) getData($this->KontoModel->checkStudienbeitragFromPrestudent($status->prestudent_id, $status->studiensemester_kurzbz, $buchungstypen));
+				$stgs[$status->studiengang_kz]->studiensemester[$status->studiensemester_kurzbz]->inskriptionsbestaetigung = (boolean)getData(
+					$this->KontoModel->checkStudienbeitragFromPrestudent(
+						$status->prestudent_id,
+						$status->studiensemester_kurzbz,
+						$buchungstypen
+					)
+				);
 			}
 		}
 		$person_ids = array_unique($person_ids);
@@ -166,7 +172,7 @@ class Documents extends Auth_Controller
 			$this->load->model('system/Webservicelog_model', 'WebservicelogModel');
 			$this->WebservicelogModel->insert([
 				'webservicetyp_kurzbz' => 'content',
-				'request_id' => (isset($akte->akte_id) && !empty($akte->akte_id)) ? $akte->akte_id : NULL,
+				'request_id' => (isset($akte->akte_id) && !empty($akte->akte_id)) ? $akte->akte_id : null,
 				'beschreibung' => 'Bescheidbestaetigungsdownload',
 				'request_data' => $_SERVER['QUERY_STRING'],
 				'execute_time' => date('c'),
diff --git a/application/controllers/Cis/MyLv.php b/application/controllers/Cis/MyLv.php
index fe7eb298c..f815f26f8 100644
--- a/application/controllers/Cis/MyLv.php
+++ b/application/controllers/Cis/MyLv.php
@@ -3,7 +3,7 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 /**
- * 
+ *
  */
 class MyLv extends Auth_Controller
 {
@@ -27,5 +27,4 @@ class MyLv extends Auth_Controller
 	{
 		$this->load->view('Cis/MyLv');
 	}
-
 }
diff --git a/application/controllers/Cis/Pub.php b/application/controllers/Cis/Pub.php
index 34a71b85d..099d093f7 100644
--- a/application/controllers/Cis/Pub.php
+++ b/application/controllers/Cis/Pub.php
@@ -3,7 +3,7 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
  
 /**
- * 
+ *
  */
 class Pub extends FHC_Controller
 {
@@ -128,7 +128,8 @@ class Pub extends FHC_Controller
 					]);
 
 					if (file_exists($filename)) {
-						if ($handle = fopen($filename, "r")) {
+						$handle = fopen($filename, "r");
+						if ($handle) {
 							while (!feof($handle)) {
 								$akte->inhalt .= fread($handle, 8192);
 							}
@@ -144,7 +145,6 @@ class Pub extends FHC_Controller
 				if ($akte->inhalt && !$foto_gesperrt) {
 					$cTmpHEX = $akte->inhalt;
 				}
-
 			}
 		}
 
diff --git a/application/controllers/Cis/Stundenplan.php b/application/controllers/Cis/Stundenplan.php
index 1f1eca42e..80fb2130a 100644
--- a/application/controllers/Cis/Stundenplan.php
+++ b/application/controllers/Cis/Stundenplan.php
@@ -3,7 +3,7 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 /**
- * 
+ *
  */
 class Stundenplan extends Auth_Controller
 {
@@ -27,5 +27,4 @@ class Stundenplan extends Auth_Controller
 	{
 		$this->load->view('Cis/Stundenplan');
 	}
-
 }
diff --git a/application/controllers/Cis4.php b/application/controllers/Cis4.php
index 2f2ad6604..68ab1c60d 100644
--- a/application/controllers/Cis4.php
+++ b/application/controllers/Cis4.php
@@ -3,7 +3,7 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 /**
- * 
+ *
  */
 class Cis4 extends FHC_Controller
 {
diff --git a/application/controllers/CisHmvc.php b/application/controllers/CisHmvc.php
index a4a370997..640f7f640 100644
--- a/application/controllers/CisHmvc.php
+++ b/application/controllers/CisHmvc.php
@@ -5,7 +5,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 use \DOMDocument as DOMDocument;
 
 /**
- * 
+ *
  */
 class CisHmvc extends FHC_Controller
 {
@@ -26,7 +26,7 @@ class CisHmvc extends FHC_Controller
 
 	/**
 	 * @param string $method
-	 * 
+	 *
 	 * @return void
 	 */
 	public function _remap($method)
@@ -74,7 +74,7 @@ class CisHmvc extends FHC_Controller
 		else
 		{
 			switch ($current['orig']->template_kurzbz) {
-				case 'redirect': {
+				case 'redirect':
 					list ($url, $target) = $this->getRedirectUrlAndTarget($current['orig']->content);
 					if (substr($url, 0, 1) == '#')
 					{
@@ -136,20 +136,17 @@ class CisHmvc extends FHC_Controller
 					$action = 'debug';
 					array_unshift($params, $current['orig']);
 					break;
-				}
 				case 'contentohnetitel':
-				case 'contentmittitel': {
+				case 'contentmittitel':
 					$controller = 'CisHmvc/Cms';
 					$action = 'content';
 					array_unshift($params, $current['orig']->content_id);
 					break;
-				}
-				default: {
+				default:
 					$controller = 'CisHmvc/Cms';
 					$action = 'debug';
 					array_unshift($params, $current['orig']);
 					break;
-				}
 			}
 		}
 
@@ -187,7 +184,7 @@ class CisHmvc extends FHC_Controller
 
 	/**
 	 * @param uri_string	$url
-	 * 
+	 *
 	 * @return void
 	 */
 	public function redirect($url)
@@ -199,7 +196,8 @@ class CisHmvc extends FHC_Controller
 	// -----------------------------------------------------------------------------------------------------------------
 	// Protected methods (move to lib?)
 
-	protected function getControllerMethodAndParamsFromUrl($url) {
+	protected function getControllerMethodAndParamsFromUrl($url)
+	{
 		$segments = explode('/', $url);
 		$path = '';
 		while ($possibleController = array_shift($segments)) {
@@ -210,7 +208,8 @@ class CisHmvc extends FHC_Controller
 		return [null, null, null];
 	}
 
-	protected function getRedirectUrlAndTarget($content) {
+	protected function getRedirectUrlAndTarget($content)
+	{
 		if (!$content)
 			return ['#', ''];
 
@@ -225,7 +224,7 @@ class CisHmvc extends FHC_Controller
 		/*if (strpos($url, '$') !== FALSE)
 			var_dump($url);*/
 		if (isset($params) && is_array($params))
-			foreach ($params as $key=>$value)
+			foreach ($params as $key => $value)
 				$url = str_replace('$' . $key, addslashes($value), $url);
 		if ($xml->getElementsByTagName('target')->item(0))
 			$target = $xml->getElementsByTagName('target')->item(0)->nodeValue;
@@ -242,7 +241,8 @@ class CisHmvc extends FHC_Controller
 		return [$url, $target];
 	}
 
-	protected function convertMenu($items, $path, $path_prefix) {
+	protected function convertMenu($items, $path, $path_prefix)
+	{
 		$menu = [];
 		$current_path = array_shift($path);
 		foreach ($items as $item)
@@ -296,7 +296,8 @@ class CisHmvc extends FHC_Controller
 	 *
 	 * @return string the resulting slug.
 	 */
-	protected function createSlug($text) {
+	protected function createSlug($text)
+	{
 		$table = [
 			'Š'=>'S', 'š'=>'s', 'Đ'=>'Dj', 'đ'=>'dj', 'Ž'=>'Z', 'ž'=>'z', 'Č'=>'C', 'č'=>'c', 'Ć'=>'C', 'ć'=>'c',
 			'À'=>'A', 'Á'=>'A', 'Â'=>'A', 'Ã'=>'A', 'Ä'=>'Ae', 'Å'=>'A', 'Æ'=>'A', 'Ç'=>'C', 'È'=>'E', 'É'=>'E',
@@ -313,5 +314,4 @@ class CisHmvc extends FHC_Controller
 		$text = preg_replace('~^[^a-z]~i', '', $text);
 		return strtolower($text);
 	}
-
 }
diff --git a/application/controllers/CisHmvc/Cms.php b/application/controllers/CisHmvc/Cms.php
index 44dc6cdb4..7f2a03a0f 100644
--- a/application/controllers/CisHmvc/Cms.php
+++ b/application/controllers/CisHmvc/Cms.php
@@ -3,7 +3,7 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 /**
- * 
+ *
  */
 class Cms extends Auth_Controller
 {
@@ -36,7 +36,7 @@ class Cms extends Auth_Controller
 
 	/**
 	 * @param stdClass	$content
-	 * 
+	 *
 	 * @return void
 	 */
 	public function debug($content)
@@ -50,7 +50,7 @@ class Cms extends Auth_Controller
 
 	/**
 	 * @param string	$url
-	 * 
+	 *
 	 * @return void
 	 */
 	public function legacy($url)
@@ -63,7 +63,7 @@ class Cms extends Auth_Controller
 	 * @param int		$version
 	 * @param string	$sprache
 	 * @param boolean	$sichtbar
-	 * 
+	 *
 	 * @return void
 	 */
 	public function content($content_id, $version = null, $sprache = null, $sichtbar = true)
@@ -84,7 +84,7 @@ class Cms extends Auth_Controller
 	 * @param string			$titel
 	 * @param boolean			$edit
 	 * @param boolean			$sichtbar
-	 * 
+	 *
 	 * @return void
 	 */
 	public function news($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
diff --git a/application/controllers/CisHmvc/Dashboard.php b/application/controllers/CisHmvc/Dashboard.php
index f188cc2e2..2d95fb652 100644
--- a/application/controllers/CisHmvc/Dashboard.php
+++ b/application/controllers/CisHmvc/Dashboard.php
@@ -3,7 +3,7 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 /**
- * 
+ *
  */
 class Dashboard extends Auth_Controller
 {
@@ -29,5 +29,4 @@ class Dashboard extends Auth_Controller
 	{
 		$this->load->view('CisHmvc/Dashboard.php');
 	}
-
 }
diff --git a/application/controllers/CisHtml/Cms.php b/application/controllers/CisHtml/Cms.php
index fa6f0e980..96057559f 100644
--- a/application/controllers/CisHtml/Cms.php
+++ b/application/controllers/CisHtml/Cms.php
@@ -3,7 +3,7 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 /**
- * 
+ *
  */
 class Cms extends FHC_Controller
 {
@@ -33,7 +33,7 @@ class Cms extends FHC_Controller
 	 * @param int		$version
 	 * @param string	$sprache
 	 * @param boolean	$sichtbar
-	 * 
+	 *
 	 * @return void
 	 */
 	public function content($content_id, $version = null, $sprache = null, $sichtbar = true)
@@ -54,7 +54,7 @@ class Cms extends FHC_Controller
 	 * @param string			$titel
 	 * @param boolean			$edit
 	 * @param boolean			$sichtbar
-	 * 
+	 *
 	 * @return void
 	 */
 	public function news($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
diff --git a/application/controllers/CisHtml/Dashboard.php b/application/controllers/CisHtml/Dashboard.php
index aa2d45a7d..243f16e1e 100644
--- a/application/controllers/CisHtml/Dashboard.php
+++ b/application/controllers/CisHtml/Dashboard.php
@@ -3,7 +3,7 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 /**
- * 
+ *
  */
 class Dashboard extends Auth_Controller
 {
@@ -29,7 +29,4 @@ class Dashboard extends Auth_Controller
 	{
 		$this->load->view('CisHtml/Dashboard.php');
 	}
-
-	
-
 }
diff --git a/application/controllers/CisVue/Cms.php b/application/controllers/CisVue/Cms.php
index fa6f0e980..96057559f 100644
--- a/application/controllers/CisVue/Cms.php
+++ b/application/controllers/CisVue/Cms.php
@@ -3,7 +3,7 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 /**
- * 
+ *
  */
 class Cms extends FHC_Controller
 {
@@ -33,7 +33,7 @@ class Cms extends FHC_Controller
 	 * @param int		$version
 	 * @param string	$sprache
 	 * @param boolean	$sichtbar
-	 * 
+	 *
 	 * @return void
 	 */
 	public function content($content_id, $version = null, $sprache = null, $sichtbar = true)
@@ -54,7 +54,7 @@ class Cms extends FHC_Controller
 	 * @param string			$titel
 	 * @param boolean			$edit
 	 * @param boolean			$sichtbar
-	 * 
+	 *
 	 * @return void
 	 */
 	public function news($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
diff --git a/application/controllers/CisVue/Dashboard.php b/application/controllers/CisVue/Dashboard.php
index 0b964fe21..ec58c6735 100644
--- a/application/controllers/CisVue/Dashboard.php
+++ b/application/controllers/CisVue/Dashboard.php
@@ -3,7 +3,7 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 /**
- * 
+ *
  */
 class Dashboard extends Auth_Controller
 {
@@ -29,7 +29,4 @@ class Dashboard extends Auth_Controller
 	{
 		$this->load->view('CisVue/Dashboard.php');
 	}
-
-	
-
 }
diff --git a/application/models/content/Content_model.php b/application/models/content/Content_model.php
index e83cffa2f..9bc3ab03d 100644
--- a/application/models/content/Content_model.php
+++ b/application/models/content/Content_model.php
@@ -15,15 +15,15 @@ class Content_model extends DB_Model
 	/**
 	 * Laedt den Content in der angegebenen Sprache
 	 * Sollte der Content in dieser Sprache nicht vorhanden sein, wird der Content in der Default Sprache geladen
-	 * 
+	 *
 	 * @param integer			$content_id
 	 * @param string			$sprache optional
 	 * @param integer			$version optional
 	 * @param boolean | null	$sichtbar optional
-	 * 
+	 *
 	 * @return stdClass
 	 */
-	public function getContent($content_id, $sprache=DEFAULT_LANGUAGE, $version=null, $sichtbar=null, $load_default_language=false)
+	public function getContent($content_id, $sprache = DEFAULT_LANGUAGE, $version = null, $sichtbar = null, $load_default_language = false)
 	{
 		$this->load->model('content/Contentsprache_model', 'ContentspracheModel');
 		$spracheExists = $this->ContentspracheModel->exists($content_id, $sprache, $version, $sichtbar);
@@ -45,7 +45,13 @@ class Content_model extends DB_Model
 		if ($version)
 			$condition['version'] = $version;
 
-		$this->addSelect(['*', 'tbl_contentsprache.insertamum', 'tbl_contentsprache.insertvon', 'tbl_contentsprache.updateamum', 'tbl_contentsprache.updatevon']);
+		$this->addSelect([
+			'*',
+			'tbl_contentsprache.insertamum',
+			'tbl_contentsprache.insertvon',
+			'tbl_contentsprache.updateamum',
+			'tbl_contentsprache.updatevon'
+		]);
 		$this->addJoin('campus.tbl_contentsprache', 'content_id');
 		$this->addOrder('version', 'DESC');
 		$this->addLimit(1);
@@ -63,14 +69,14 @@ class Content_model extends DB_Model
 	/**
 	 * Laedt alle Content Eintraege unterhalb eines Contents
 	 * (Ohne Newseintraege)
-	 * 
+	 *
 	 * @param integer			$root_content_id
 	 * @param string			$uid
 	 * @param string			$sprache optional
-	 * 
+	 *
 	 * @return stdClass			on success an array with menu objects
 	 */
-	public function getMenu($root_content_id, $uid, $sprache=DEFAULT_LANGUAGE)
+	public function getMenu($root_content_id, $uid, $sprache = DEFAULT_LANGUAGE)
 	{
 		if ($root_content_id === null) {
 			$res = json_decode('{
@@ -154,7 +160,39 @@ class Content_model extends DB_Model
 					s.contentsprache_id
 				FROM 
 					campus.tbl_content c
-				JOIN (SELECT s5.content_id, s5.contentsprache_id FROM (SELECT content_id, sprache, MAX(version) AS version FROM (SELECT c1.content_id, COALESCE(s1.sprache, ?) AS sprache FROM campus.tbl_content c1 LEFT JOIN campus.tbl_contentsprache s1 ON c1.content_id=s1.content_id AND s1.sprache=? WHERE sichtbar=true) s2 LEFT JOIN campus.tbl_contentsprache s3 USING(content_id, sprache) WHERE sichtbar=true GROUP BY content_id, sprache) s4 LEFT JOIN campus.tbl_contentsprache s5 USING(content_id, sprache, version) WHERE version IS NOT NULL) t USING (content_id)
+				JOIN (
+					SELECT
+						s5.content_id,
+						s5.contentsprache_id
+					FROM (
+						SELECT
+							content_id,
+							sprache,
+							MAX(version) AS version
+						FROM (
+							SELECT
+								c1.content_id,
+								COALESCE(s1.sprache, ?) AS sprache
+							FROM
+								campus.tbl_content c1
+							LEFT JOIN
+								campus.tbl_contentsprache s1 ON c1.content_id=s1.content_id AND s1.sprache=?
+							WHERE
+								sichtbar=true
+						) s2
+						LEFT JOIN
+							campus.tbl_contentsprache s3 USING(content_id, sprache)
+						WHERE
+							sichtbar=true
+						GROUP BY
+							content_id,
+							sprache
+					) s4
+					LEFT JOIN
+						campus.tbl_contentsprache s5 USING(content_id, sprache, version)
+					WHERE
+						version IS NOT NULL
+				) t USING (content_id)
 				JOIN 
 					campus.tbl_contentsprache s USING (contentsprache_id) 
 				WHERE
@@ -227,5 +265,4 @@ class Content_model extends DB_Model
 
 		return success(isset($result[$root_content_id]) ? $result[$root_content_id] : null);
 	}
-
 }
diff --git a/application/views/templates/CISHMVC-Header.php b/application/views/templates/CISHMVC-Header.php
index 7e4b8cea3..cb454d77e 100644
--- a/application/views/templates/CISHMVC-Header.php
+++ b/application/views/templates/CISHMVC-Header.php
@@ -1,10 +1,10 @@
 <?php
-	if (!isset($menu)) {
-		$menu = [];
-		if (property_exists($this->router, 'menu') && $this->router->menu && property_exists($this->router->menu, 'children')) {
-			$menu = $this->router->menu->children;
-		}
+if (!isset($menu)) {
+	$menu = [];
+	if (property_exists($this->router, 'menu') && $this->router->menu && property_exists($this->router->menu, 'children')) {
+		$menu = $this->router->menu->children;
 	}
+}
 ?>
 
 <script type="text/javascript">
@@ -42,9 +42,9 @@
 				<div id="nav-main-menu" class="collapse collapse-horizontal show">
 					<div>
 						<?php
-								foreach ($menu as $entry) {
-									$this->load->view('templates/CISHMVC-Menu/Entry', ['entry' => $entry, 'menu_id' => 'menu']);
-								}
+						foreach ($menu as $entry) {
+							$this->load->view('templates/CISHMVC-Menu/Entry', ['entry' => $entry, 'menu_id' => 'menu']);
+						}
 						?>
 					</div>
 				</div>
diff --git a/application/views/templates/CISHMVC-Menu/Entry.php b/application/views/templates/CISHMVC-Menu/Entry.php
index 58d8ce84d..4604d4267 100644
--- a/application/views/templates/CISHMVC-Menu/Entry.php
+++ b/application/views/templates/CISHMVC-Menu/Entry.php
@@ -46,7 +46,7 @@ if (property_exists($entry, 'path')) {
 		</div>
 	<?php } ?>
 	<ul id="<?= $menu_id; ?>" class="nav w-100 collapse<?= $menu_open ? ' show' : ''; ?>">
-		<?php foreach ($entry->children as $id => $child) 
+		<?php foreach ($entry->children as $id => $child)
 			$this->load->view('templates/CISHMVC-Menu/Entry', ['content_id' => $id, 'entry' => $child, 'menu_id' => $menu_id, 'path' => $path]);
 		?>
 	</ul>
diff --git a/application/views/templates/CISHTML-Footer.php b/application/views/templates/CISHTML-Footer.php
index e36b7ddcd..d7c1de24c 100644
--- a/application/views/templates/CISHTML-Footer.php
+++ b/application/views/templates/CISHTML-Footer.php
@@ -16,4 +16,4 @@ $includesArray = array(
 
 </main>
 
-<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
\ No newline at end of file
+<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
diff --git a/application/views/templates/CISHTML-Menu/Entry.php b/application/views/templates/CISHTML-Menu/Entry.php
index 3226ff9b7..bd66fce37 100644
--- a/application/views/templates/CISHTML-Menu/Entry.php
+++ b/application/views/templates/CISHTML-Menu/Entry.php
@@ -4,7 +4,7 @@ if (is_array($entry) && isset($entry['content_id']))
 $menu_id .= '-' . $entry->content_id;
 
 switch ($entry->template_kurzbz) {
-	case 'redirect': {
+	case 'redirect':
 		$url = '';
 		$target = '';
 		$xml = new DOMDocument();
@@ -15,7 +15,7 @@ switch ($entry->template_kurzbz) {
 				$url = $xml->getElementsByTagName('url')->item(0)->nodeValue;
 			// TODO(chris): get params
 			if (isset($params) && is_array($params))
-				foreach ($params as $key=>$value)
+				foreach ($params as $key => $value)
 					$url = str_replace('$' . $key, addslashes($value), $url);
 			if ($xml->getElementsByTagName('target')->item(0))
 				$target = $xml->getElementsByTagName('target')->item(0)->nodeValue;
@@ -30,14 +30,15 @@ switch ($entry->template_kurzbz) {
 
 		$this->load->view('templates/CISHTML-Menu/EntryBase', ['entry' => $entry, 'menu_id' => $menu_id, 'link' => $url, 'target' => $target]);
 		break;
-	}
-	case 'include': {
+	case 'include':
 		$this->load->view('templates/CISHTML-Menu/EntryInclude', ['entry' => $entry, 'menu_id' => $menu_id]);
 		break;
-	}
-	default: {
-		$this->load->view('templates/CISHTML-Menu/EntryBase', ['entry' => $entry, 'menu_id' => $menu_id, 'link' => site_url('/CisHtml/Cms/content/' . $entry->content_id)]);
+	default:
+		$this->load->view('templates/CISHTML-Menu/EntryBase', [
+			'entry' => $entry,
+			'menu_id' => $menu_id,
+			'link' => site_url('/CisHtml/Cms/content/' . $entry->content_id)
+		]);
 		break;
-	}
 }
 ?>

From 44182af5fa2cbb4641a7d33fff48f0e51faa01d0 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Mon, 31 Jul 2023 09:30:45 +0200
Subject: [PATCH 0103/1461] Formatted Tabulator Header: Abstaende vergroessert

 Abstand Titel zu Actionbuttons und zwischen Actionbuttons untereinander vergroessert
---
 public/js/components/filter/Filter.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index 2a0791537..240410677 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -507,7 +507,7 @@ export const CoreFilterCmpt = {
 
 		<div class="row" v-if="title != null && title != ''">
 			<div class="col-lg-12">
-				<h3 class="page-header">
+				<h3 class="page-header mt-1 mb-4">
 					{{ title }}
 				</h3>
 			</div>
@@ -516,7 +516,7 @@ export const CoreFilterCmpt = {
 		<div :id="'filterCollapsables' + idExtra">
 
 			<div class="d-flex flex-row justify-content-between flex-wrap">
-				<div v-if="newBtnShow || reload || $slots.actions" class="d-flex gap-2 align-items-baseline flex-wrap">
+				<div v-if="newBtnShow || reload || $slots.actions" class="d-flex gap-3 align-items-baseline flex-wrap">
 					<button v-if="newBtnShow" class="btn btn-outline-secondary" :class="newBtnClass" :title="newBtnLabel ? undefined : 'New'" :aria-label="newBtnLabel ? undefined : 'New'" @click="$emit('click:new', $event)" :disabled="newBtnDisabled">
 						<span class="fa-solid fa-plus" aria-hidden="true"></span>
 						{{ newBtnLabel }}
@@ -524,7 +524,7 @@ export const CoreFilterCmpt = {
 					<button v-if="reload" class="btn btn-outline-secondary" aria-label="Reload" @click="reloadTable">
 						<span class="fa-solid fa-rotate-right" aria-hidden="true"></span>
 					</button>
-					<span v-if="$slots.actions && tabulatorHasSelector">Mit {{selectedData.length}} ausgewählten: </span>
+					<span v-if="$slots.actions && tabulatorHasSelector">Mit {{selectedData.length}} ausgewählten:</span>
 					<slot name="actions" v-bind="tabulatorHasSelector ? selectedData : []"></slot>
 				</div>
 				<div class="d-flex gap-1 align-items-baseline flex-grow-1 justify-content-end">

From b70011436e57ee5236bd25c941fb99b547501dec Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Wed, 2 Aug 2023 13:39:47 +0200
Subject: [PATCH 0104/1461] Added column 'softwarestatus_kurzbz' to
 filtersupdate

---
 system/filtersupdate.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/filtersupdate.php b/system/filtersupdate.php
index 1c303ad43..872e2b95b 100644
--- a/system/filtersupdate.php
+++ b/system/filtersupdate.php
@@ -1273,7 +1273,8 @@ $filters = array(
 					{"name": "beschreibung"},
 					{"name": "hersteller"},
 					{"name": "os"},
-					{"name": "aktiv"}
+					{"name": "aktiv"},
+					{"name": "softwarestatus_kurzbz"}
 				],
 				"filters": []
 			}

From 553f2feaa4495ae9be80dd967fd47403db3b6048 Mon Sep 17 00:00:00 2001
From: KarpAlex <karpenko@technikum-wien.at>
Date: Wed, 2 Aug 2023 16:22:10 +0200
Subject: [PATCH 0105/1461] filter component: enabled nested tabulator

---
 public/js/components/filter/Filter.js | 66 ++++++++++++++++++++++++++-
 1 file changed, 65 insertions(+), 1 deletion(-)

diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index 240410677..93bb69274 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -65,7 +65,9 @@ export const CoreFilterCmpt = {
 		newBtnShow: Boolean,
 		newBtnClass: [String, Array, Object],
 		newBtnDisabled: Boolean,
-		newBtnLabel: String
+		newBtnLabel: String,
+		idField: String,
+		parentIdField: String
 	},
 	data: function() {
 		return {
@@ -198,6 +200,13 @@ export const CoreFilterCmpt = {
 			if (tabulatorOptions.columns && tabulatorOptions.columns.filter(el => el.formatter == 'rowSelection').length)
 				this.tabulatorHasSelector = true;
 
+			if (this.idField) {
+				// enable nested tabulator if parent Id given
+				if (this.parentIdField) tabulatorOptions.dataTree = true;
+				// set tabulator index
+				tabulatorOptions.index = this.idField;
+			}
+
 			// Start the tabulator with the build options
 			this.tabulator = new Tabulator(
 				this.$refs.table,
@@ -214,6 +223,32 @@ export const CoreFilterCmpt = {
 			this.tabulator.on("rowSelectionChanged", data => {
 				this.selectedData = data;
 			});
+			// if nested tabulator, restructure data
+			if (this.parentIdField && this.idField) {
+				this.tabulator.on("dataLoading", data => {
+					let toDelete = [];
+
+					// loop through all data
+					for (let childIdx = 0; childIdx < data.length; childIdx++)
+					{
+						let child = data[childIdx];
+
+						// if it has parent id, it is a child
+						if (child[this.parentIdField])
+						{
+							// append the child on the right place. If parent found, mark original sw child on 0 level for deleting
+							if (this.appendChild(data, child)) toDelete.push(childIdx);
+						}
+					}
+
+					// delete the marked children from 0 level
+					for (let counter = 0; counter < toDelete.length; counter++)
+					{
+						// decrease index by counter as index of data array changes after every deletion
+						data.splice(toDelete[counter] - counter, 1);
+					}
+				});
+			}
 			if (this.tableOnly) {
 				this.tabulator.on('tableBuilt', () => {
 					const cols = this.tabulator.getColumns();
@@ -479,6 +514,35 @@ export const CoreFilterCmpt = {
 				},
 				this.getFilter
 			);
+		},
+		// append child to it's parent
+		appendChild(data, child) {
+			// get parent id
+			let parentId = child[this.parentIdField];
+
+			// loop thorugh all data
+			for (let parentIdx = 0; parentIdx < data.length; parentIdx++)
+			{
+				let parent = data[parentIdx];
+
+				// if it's the parent
+				if (parent[this.idField] == parentId)
+				{
+					// create children array if not done yet
+					if (!parent._children) parent._children = [];
+
+					// append the child
+					parent._children.push(child);
+
+					// parent found
+					return true;
+				}
+				// search children for parents
+				else if (parent._children) this.appendChild(parent._children, child);
+			}
+
+			// parent not found
+			return false;
 		}
 	},
 	beforeCreate() {

From 2f001987f34379aac2605c8803c91b3a47b88424 Mon Sep 17 00:00:00 2001
From: KarpAlex <karpenko@technikum-wien.at>
Date: Wed, 2 Aug 2023 19:14:58 +0200
Subject: [PATCH 0106/1461] Filter.js additional columns: additional columns
 are displayed based on field name, not title

---
 public/js/components/filter/Filter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index 93bb69274..4c54c94fc 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -142,7 +142,7 @@ export const CoreFilterCmpt = {
 					col.visible = selectedFields.indexOf(col.field) >= 0;
 					if (
 						col.formatter == 'rowSelection'
-						|| (this.tabulatorAdditionalColumns && this.tabulatorAdditionalColumns.indexOf(col.title) >= 0)
+						|| (this.tabulatorAdditionalColumns && this.tabulatorAdditionalColumns.indexOf(col.field) >= 0)
 					)
 						col.visible = true;
 

From 4e17be39f65bc5e4e043c2b15a7674520d0eb727 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Thu, 3 Aug 2023 09:44:28 +0200
Subject: [PATCH 0107/1461] Added column 'actions' to filtersupdate

---
 system/filtersupdate.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/filtersupdate.php b/system/filtersupdate.php
index 872e2b95b..741f09ef6 100644
--- a/system/filtersupdate.php
+++ b/system/filtersupdate.php
@@ -1274,7 +1274,8 @@ $filters = array(
 					{"name": "hersteller"},
 					{"name": "os"},
 					{"name": "aktiv"},
-					{"name": "softwarestatus_kurzbz"}
+					{"name": "softwarestatus_kurzbz"},
+					{"name": "actions"}
 				],
 				"filters": []
 			}

From 56230e3752ad01c52b7c33d7a1f971f9b52498a6 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Thu, 3 Aug 2023 09:45:45 +0200
Subject: [PATCH 0108/1461] Changed button-color of Tabulators Header-'ADD
 Button' to primary color

---
 public/js/components/filter/Filter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index 240410677..72eae8123 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -517,7 +517,7 @@ export const CoreFilterCmpt = {
 
 			<div class="d-flex flex-row justify-content-between flex-wrap">
 				<div v-if="newBtnShow || reload || $slots.actions" class="d-flex gap-3 align-items-baseline flex-wrap">
-					<button v-if="newBtnShow" class="btn btn-outline-secondary" :class="newBtnClass" :title="newBtnLabel ? undefined : 'New'" :aria-label="newBtnLabel ? undefined : 'New'" @click="$emit('click:new', $event)" :disabled="newBtnDisabled">
+					<button v-if="newBtnShow" class="btn btn-primary" :class="newBtnClass" :title="newBtnLabel ? undefined : 'New'" :aria-label="newBtnLabel ? undefined : 'New'" @click="$emit('click:new', $event)" :disabled="newBtnDisabled">
 						<span class="fa-solid fa-plus" aria-hidden="true"></span>
 						{{ newBtnLabel }}
 					</button>

From 4a2cdaf52ae7d3d6eb5a53c314de9fa2f6202e05 Mon Sep 17 00:00:00 2001
From: KarpAlex <karpenko@technikum-wien.at>
Date: Fri, 4 Aug 2023 14:46:53 +0200
Subject: [PATCH 0109/1461] added primevue autocomplete

---
 application/views/templates/FHC-Footer.php | 3 ++-
 composer.json                              | 2 +-
 public/js/components/filter/API.js         | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/application/views/templates/FHC-Footer.php b/application/views/templates/FHC-Footer.php
index c461dd8b0..f360861e5 100644
--- a/application/views/templates/FHC-Footer.php
+++ b/application/views/templates/FHC-Footer.php
@@ -107,7 +107,7 @@
 	if ($tinymce5 === true) generateJSsInclude('vendor/tinymce/tinymce5/tinymce.min.js');
 
 	// Vue 3 JS
-	if ($vue3 === true) 
+	if ($vue3 === true)
 	{
 		generateJSsInclude('vendor/vuejs/vuejs3/vue.global.prod.js');
 		generateJSsInclude('vendor/vuejs/vuerouter4/vue-router.global.js');
@@ -122,6 +122,7 @@
 		generateJSsInclude('vendor/npm-asset/primevue/column/column.min.js');
 		generateJSsInclude('vendor/npm-asset/primevue/calendar/calendar.min.js');
 		generateJSsInclude('vendor/npm-asset/primevue/skeleton/skeleton.min.js');
+		generateJSsInclude('vendor/npm-asset/primevue/autocomplete/autocomplete.min.js');
 	}
 
 	// --------------------------------------------------------------------------------------------------------
diff --git a/composer.json b/composer.json
index 825ed5625..840a53124 100644
--- a/composer.json
+++ b/composer.json
@@ -400,7 +400,7 @@
 		"nategood/httpful": "0.2.*",
 		"netcarver/textile": "3.7.*",
 		"nicolaskruchten/pivottable": "2.23.0",
-		"npm-asset/primevue": "3.15.*",
+		"npm-asset/primevue": "3.29.*",
 		"npm-asset/primeicons": "5.0.0",
 
 		"olifolkerd/tabulator4": "4.9.*",
diff --git a/public/js/components/filter/API.js b/public/js/components/filter/API.js
index ff09c452d..cc3f229b4 100644
--- a/public/js/components/filter/API.js
+++ b/public/js/components/filter/API.js
@@ -17,7 +17,7 @@
 
 import {CoreRESTClient} from '../../RESTClient.js';
 
-// 
+//
 const CORE_FILTER_CMPT_TIMEOUT = 7000;
 
 /**

From b7a3d2dcb4cc89c7f6e37d3cc1367267ddcc9b07 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Wed, 9 Aug 2023 10:57:06 +0200
Subject: [PATCH 0110/1461] Removed column 'actions' from filtersupdate

---
 system/filtersupdate.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/system/filtersupdate.php b/system/filtersupdate.php
index 741f09ef6..872e2b95b 100644
--- a/system/filtersupdate.php
+++ b/system/filtersupdate.php
@@ -1274,8 +1274,7 @@ $filters = array(
 					{"name": "hersteller"},
 					{"name": "os"},
 					{"name": "aktiv"},
-					{"name": "softwarestatus_kurzbz"},
-					{"name": "actions"}
+					{"name": "softwarestatus_kurzbz"}
 				],
 				"filters": []
 			}

From e1c23fc6fa80032da7b5455e837bb030634a9871 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Thu, 10 Aug 2023 11:34:54 +0200
Subject: [PATCH 0111/1461] Added Filter ImageVerwaltung

---
 system/filtersupdate.php | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/system/filtersupdate.php b/system/filtersupdate.php
index 872e2b95b..0fe7e11c5 100644
--- a/system/filtersupdate.php
+++ b/system/filtersupdate.php
@@ -1280,6 +1280,30 @@ $filters = array(
 			}
 		',
 		'oe_kurzbz' => null,
+	),
+	array(
+		'app' => 'core',
+		'dataset_name' => 'imageVerwaltung',
+		'filter_kurzbz' => 'ImageVerwaltung',
+		'description' => '{Image Verwaltung}',
+		'sort' => 1,
+		'default_filter' => true,
+		'filter' => '
+			{
+				"name": "ImageVerwaltung",
+				"columns": [
+					{"name": "bezeichnung"},
+					{"name": "betriebssystem"},
+					{"name": "verfuegbarkeit_start"},
+					{"name": "verfuegbarkeit_ende"},
+					{"name": "anmerkung"},
+					{"name": "ort_count"},
+					{"name": "software_count"}
+				],
+				"filters": []
+			}
+		',
+		'oe_kurzbz' => null,
 	)
 );
 

From 13f71502e64a9b523bd85d2016f1d6c6b0c2373c Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 23 Aug 2023 10:28:55 +0200
Subject: [PATCH 0112/1461] 1st draft

---
 .../controllers/Studentenverwaltung.php       | 19 ++++
 .../components/Studentenverwaltung.php        | 60 +++++++++++++
 application/views/Studentenverwaltung.php     | 53 +++++++++++
 public/css/Studentenverwaltung.css            | 60 +++++++++++++
 public/js/apps/Studentenverwaltung.js         | 88 +++++++++++++++++++
 .../components/Studienverwaltung/Details.js   |  9 ++
 .../js/components/Studienverwaltung/List.js   | 69 +++++++++++++++
 .../components/Studienverwaltung/Verband.js   | 68 ++++++++++++++
 8 files changed, 426 insertions(+)
 create mode 100644 application/controllers/Studentenverwaltung.php
 create mode 100644 application/controllers/components/Studentenverwaltung.php
 create mode 100644 application/views/Studentenverwaltung.php
 create mode 100644 public/css/Studentenverwaltung.css
 create mode 100644 public/js/apps/Studentenverwaltung.js
 create mode 100644 public/js/components/Studienverwaltung/Details.js
 create mode 100644 public/js/components/Studienverwaltung/List.js
 create mode 100644 public/js/components/Studienverwaltung/Verband.js

diff --git a/application/controllers/Studentenverwaltung.php b/application/controllers/Studentenverwaltung.php
new file mode 100644
index 000000000..dded0ffdd
--- /dev/null
+++ b/application/controllers/Studentenverwaltung.php
@@ -0,0 +1,19 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Studentenverwaltung extends FHC_Controller
+{
+	public function __construct()
+	{
+		parent::__construct();
+	}
+
+	/**
+	 * @return void
+	 */
+	public function index()
+	{
+		$this->load->view('Studentenverwaltung');
+	}
+}
diff --git a/application/controllers/components/Studentenverwaltung.php b/application/controllers/components/Studentenverwaltung.php
new file mode 100644
index 000000000..d03c7e350
--- /dev/null
+++ b/application/controllers/components/Studentenverwaltung.php
@@ -0,0 +1,60 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Studentenverwaltung extends FHC_Controller
+{
+	public function __construct()
+	{
+		// TODO(chris): access!
+		parent::__construct();
+	}
+
+	/**
+	 * @return void
+	 */
+	public function index()
+	{
+		// TODO(chris): load stgs (this is just for testing)
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+		$result = $this->StudiengangModel->loadWhere(['aktiv' => true]);
+		if (isError($result))
+			return $this->outputJson($result);
+		if (!hasData($result))
+			return $this->outputJsonSuccess([]);
+		$list = getData($result);
+		$list[] = [
+			'name' => 'International',
+			'children' => [
+				[
+					'name' => 'Incoming',
+					'leaf' => true
+				],
+				[
+					'name' => 'Outgoing',
+					'leaf' => true
+				],
+				[
+					'name' => 'Gemeinsame Studien',
+					'leaf' => true
+				]
+			]
+		];
+		$this->outputJsonSuccess($list);
+	}
+
+	/**
+	 * @param integer		$studiengang_kz
+	 * @return void
+	 */
+	public function getStudiengang($studiengang_kz)
+	{
+		// TODO(chris): load stgSemester + prestudent
+		$this->outputJson([
+			[
+				'key' => 2,
+				'name' => 'PreStudent'
+			]
+		]);
+	}
+}
diff --git a/application/views/Studentenverwaltung.php b/application/views/Studentenverwaltung.php
new file mode 100644
index 000000000..20a89f8e8
--- /dev/null
+++ b/application/views/Studentenverwaltung.php
@@ -0,0 +1,53 @@
+<?php
+	$includesArray = array(
+		'title' => 'Studentenverwaltung',
+		'axios027' => true,
+		'bootstrap5' => true,
+		'fontawesome6' => true,
+		'vue3' => true,
+		'primevue3' => true,
+		'filtercomponent' => true,
+		'tabulator5' => true,
+		'phrases' => [],
+		'customCSSs' => [
+			'public/css/Studentenverwaltung.css'
+		],
+		'customJSModules' => [
+			'public/js/apps/Studentenverwaltung.js'
+		]
+	);
+
+	$this->load->view('templates/FHC-Header', $includesArray);
+?>
+
+	<div id="main">
+		<header class="navbar navbar-expand-lg navbar-dark bg-dark flex-md-nowrap p-0 shadow">
+			<a class="navbar-brand col-md-4 col-lg-3 col-xl-2 me-0 px-3" href="<?= site_url('Studentenverwaltung'); ?>">FHC 4.0</a>
+			<button class="navbar-toggler d-md-none m-1 collapsed" type="button" data-bs-toggle="offcanvas" data-bs-target="#sidebarMenu" aria-controls="sidebarMenu" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button>
+			<fhc-searchbar :searchoptions="searchbaroptions" :searchfunction="searchfunction" class="searchbar w-100"></fhc-searchbar>
+		</header>
+		
+		<div class="container-fluid overflow-hidden">
+			<div class="row h-100">
+				<nav id="sidebarMenu" class="bg-light offcanvas offcanvas-start col-md p-md-0 h-100">
+					<div class="offcanvas-header justify-content-end px-1 d-md-none">
+						<button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" aria-label="Close"></button>
+					</div>
+					<stv-verband></stv-verband>
+				</nav>
+				<main class="col-md-8 ms-sm-auto col-lg-9 col-xl-10">
+					<vertical-split>
+						<template #top>
+							<stv-list v-model:selected="selected"></stv-list>
+						</template>
+						<template #bottom>
+							<stv-details :student="lastSelected"></stv-details>
+						</template>
+					</vertical-split>
+				</main>
+			</div>
+		</div>
+	</div>
+
+<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
+
diff --git a/public/css/Studentenverwaltung.css b/public/css/Studentenverwaltung.css
new file mode 100644
index 000000000..ccc5b0694
--- /dev/null
+++ b/public/css/Studentenverwaltung.css
@@ -0,0 +1,60 @@
+@import './components/searchbar.css';
+@import './components/verticalsplit.css';
+
+.searchbar {
+	margin-right: 0!important;
+}
+.searchbar > .input-group {
+	margin-right: 0!important;
+}
+.searchbar > .input-group > * {
+	border-radius: 0!important;
+}
+
+#main {
+	display: flex;
+	flex-direction: column;
+	height: 100vh;
+}
+#main > header {
+	flex: 0 0 auto;
+}
+#main > div {
+	flex: 1 1 auto;
+}
+
+@media (min-width: 768px) {
+	#sidebarMenu {
+		visibility: visible!important;
+		transform: none;
+		position: inherit;
+		z-index: 1;
+	}
+}
+
+
+@media (max-width: 769px) {
+	.stv-verband {
+		max-height: calc(100% - 3rem);
+		overflow: auto;
+	}
+}
+.stv-verband .p-treetable-tbody > tr > td {
+	display: flex;
+	padding-top: .25rem!important;
+	padding-bottom: .25rem!important;
+}
+.stv-verband .p-treetable-tbody > tr > td > button {
+	flex: 0 0 auto;
+}
+.stv-verband .p-treetable-tbody > tr > td > span {
+	flex: 1 1 auto;
+}
+
+.stv-list {
+	display: flex;
+	flex-direction: column;
+}
+.stv-list > #filterTableDataset {
+	flex: 1 1 auto;
+}
\ No newline at end of file
diff --git a/public/js/apps/Studentenverwaltung.js b/public/js/apps/Studentenverwaltung.js
new file mode 100644
index 000000000..bdec5d033
--- /dev/null
+++ b/public/js/apps/Studentenverwaltung.js
@@ -0,0 +1,88 @@
+/**
+ * Copyright (C) 2022 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import FhcSearchbar from "../components/searchbar/searchbar.js";
+import StvVerband from "../components/Studienverwaltung/Verband.js";
+import StvList from "../components/Studienverwaltung/List.js";
+import StvStudent from "../components/Studienverwaltung/Student.js";
+import VerticalSplit from "../components/verticalsplit/verticalsplit.js";
+import fhcapifactory from "./api/fhcapifactory.js";
+
+Vue.$fhcapi = fhcapifactory;
+
+const app = Vue.createApp({
+	components: {
+		FhcSearchbar,
+		StvVerband,
+		StvList,
+		StvStudent,
+		VerticalSplit
+	},
+	data() {
+		return {
+			selected: [],
+			searchbaroptions: {
+				types: [
+					"person",
+					"student",
+					"prestudent"
+				],
+				actions: {
+					person: {
+						defaultaction: {
+							type: "link",
+							action: function(data) { 
+								return data.profil;
+							}
+						},
+						childactions: [
+							{
+								"label": "testchildaction1",
+								"icon": "fas fa-check-circle",
+								"type": "function",
+								"action": function(data) { 
+									alert('person testchildaction 01 ' + JSON.stringify(data)); 
+								}
+							},
+							{
+								"label": "testchildaction2",
+								"icon": "fas fa-file-csv",
+								"type": "function",
+								"action": function(data) { 
+									alert('person testchildaction 02 ' + JSON.stringify(data)); 
+								}
+							}
+						]
+					}
+				}
+			},
+		}
+	},
+	computed: {
+		lastSelected() {
+			return this.selected[this.selected.length - 1];
+		}
+	},
+	methods: {
+		searchfunction(searchsettings) {
+			return Vue.$fhcapi.Search.search(searchsettings);  
+		}
+	}
+});
+
+app.use(primevue.config.default).mount('#main');
+
diff --git a/public/js/components/Studienverwaltung/Details.js b/public/js/components/Studienverwaltung/Details.js
new file mode 100644
index 000000000..f119b34e4
--- /dev/null
+++ b/public/js/components/Studienverwaltung/Details.js
@@ -0,0 +1,9 @@
+export default {
+	props: {
+		student: Object
+	},
+	template: `
+	<div class="stv-details h-100 pb-3">
+		{{student}}
+	</div>`
+};
\ No newline at end of file
diff --git a/public/js/components/Studienverwaltung/List.js b/public/js/components/Studienverwaltung/List.js
new file mode 100644
index 000000000..9a32914b7
--- /dev/null
+++ b/public/js/components/Studienverwaltung/List.js
@@ -0,0 +1,69 @@
+import {CoreFilterCmpt} from "../filter/Filter.js";
+
+export default {
+	components: {
+		CoreFilterCmpt
+	},
+	props: {
+		selected: Array
+	},
+	emits: [
+		'update:selected'
+	],
+	data() {
+		return {
+			tabulatorOptions: {
+				columns:[ //Define Table Columns
+					{title:"Name", field:"name", width:150},
+					{title:"Age", field:"age", hozAlign:"left", formatter:"progress"},
+					{title:"Favourite Color", field:"col"},
+					{title:"Date Of Birth", field:"dob", sorter:"date", hozAlign:"center"},
+				],
+				data: [
+					{id:1, name:"Oli Bob", age:"12", col:"red", dob:""},
+					{id:2, name:"Mary May", age:"1", col:"blue", dob:"14/05/1982"},
+					{id:3, name:"Christine Lobowski", age:"42", col:"green", dob:"22/05/1982"},
+					{id:4, name:"Brendon Philips", age:"125", col:"orange", dob:"01/08/1980"},
+					{id:5, name:"Margret Marmajuke", age:"16", col:"yellow", dob:"31/01/1999"},
+					{id:6, name:"Oli Bob", age:"12", col:"red", dob:""},
+					{id:7, name:"Mary May", age:"1", col:"blue", dob:"14/05/1982"},
+					{id:8, name:"Christine Lobowski", age:"42", col:"green", dob:"22/05/1982"},
+					{id:9, name:"Brendon Philips", age:"125", col:"orange", dob:"01/08/1980"}
+				],
+
+				height: 'auto',
+				selectable: true
+			},
+			tabulatorEvents: [
+				{
+					event: 'rowSelectionChanged',
+					handler: this.rowSelectionChanged
+				}
+			]
+		}
+	},
+	methods: {
+		actionNewPrestudent() {
+			console.log('actionNewPrestudent');
+		},
+		rowSelectionChanged(data) {
+			this.$emit('update:selected', data);
+		}
+	},
+	mounted() {
+	},
+	template: `
+	<div class="stv-list h-100 pt-3">
+		<core-filter-cmpt
+			:tabulator-options="tabulatorOptions"
+			:tabulator-events="tabulatorEvents"
+			table-only
+			:side-menu="false"
+			reload
+			new-btn-show
+			new-btn-label="Prestudent"
+			@click:new="actionNewPrestudent"
+		>
+		</core-filter-cmpt>
+	</div>`
+};
\ No newline at end of file
diff --git a/public/js/components/Studienverwaltung/Verband.js b/public/js/components/Studienverwaltung/Verband.js
new file mode 100644
index 000000000..e7abbbcd4
--- /dev/null
+++ b/public/js/components/Studienverwaltung/Verband.js
@@ -0,0 +1,68 @@
+import {CoreRESTClient} from '../../RESTClient.js';
+
+export default {
+	components: {
+		TreeTable: primevue.treetable,
+		TreeColumn: primevue.column
+	},
+	data() {
+		return {
+			loading: true,
+			nodes: []
+		}
+	},
+	methods: {
+		onExpandTreeNode(node) {
+			if (!node.children) {
+				let url = '';
+				if (node.data.studiengang_kz) {
+					url = "getStudiengang/" + node.data.studiengang_kz;
+				}
+
+				if (url) {
+					this.loading = true;
+					CoreRESTClient
+						.get("components/Studentenverwaltung/" + url)
+						.then(result => {
+							const subNodes = result.data.map(this.mapResultToTreeData);
+							node.children = subNodes;
+							this.loading = false;
+						});
+				}
+			}
+		},
+		mapResultToTreeData(el) {
+			const cp = {
+				data: el
+			};
+			if (el.studiengang_kz !== undefined) {
+				// TODO(chris): scrolling doesn't work
+				cp.key = el.studiengang_kz;
+				cp.data.name = el.bezeichnung;
+				cp.leaf = false;
+			}
+			if (el.children)
+				cp.children = el.children.map(this.mapResultToTreeData);
+			else
+				cp.leaf = el.leaf || false;
+			return cp;
+		}
+	},
+	mounted() {
+		CoreRESTClient
+			.get("components/Studentenverwaltung")
+			.then(result => result.data)
+			.then(result => {
+				if(CoreRESTClient.isError(result)) {
+					console.error(CoreRESTClient.getError(result));
+				} else if (CoreRESTClient.hasData(result)) {
+					this.nodes = CoreRESTClient.getData(result).map(this.mapResultToTreeData);
+				}
+				this.loading = false;
+			});
+	},
+	template: `
+	<tree-table class="stv-verband p-treetable-sm" :value="nodes" lazy @node-expand="onExpandTreeNode" scrollable scroll-height="flex">
+		<tree-column field="name" header="Verband" expander></tree-column>
+	</tree-table>`
+};
\ No newline at end of file

From 1009f73109a9280dda22b988d41296599100b6c1 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 31 Aug 2023 08:26:16 +0200
Subject: [PATCH 0113/1461] improvements

---
 .../components/Studentenverwaltung.php        | 91 ++++++++++++++++++-
 application/views/Studentenverwaltung.php     |  4 +-
 public/js/apps/Studentenverwaltung.js         |  7 +-
 .../js/components/Studienverwaltung/List.js   | 32 +++----
 .../components/Studienverwaltung/Verband.js   | 13 ++-
 5 files changed, 123 insertions(+), 24 deletions(-)

diff --git a/application/controllers/components/Studentenverwaltung.php b/application/controllers/components/Studentenverwaltung.php
index d03c7e350..63fb7118c 100644
--- a/application/controllers/components/Studentenverwaltung.php
+++ b/application/controllers/components/Studentenverwaltung.php
@@ -17,7 +17,22 @@ class Studentenverwaltung extends FHC_Controller
 	{
 		// TODO(chris): load stgs (this is just for testing)
 		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-		$result = $this->StudiengangModel->loadWhere(['aktiv' => true]);
+
+		$this->StudiengangModel->addJoin('public.tbl_lehrverband v', 'studiengang_kz');
+		
+		$this->StudiengangModel->addDistinct();
+		$this->StudiengangModel->addSelect('v.studiengang_kz');
+		$this->StudiengangModel->addSelect('tbl_studiengang.bezeichnung');
+		$this->StudiengangModel->addSelect('kurzbzlang');
+		$this->StudiengangModel->addSelect('erhalter_kz');
+		$this->StudiengangModel->addSelect('typ');
+		$this->StudiengangModel->addSelect('kurzbz');
+		
+		$this->StudiengangModel->addOrder('erhalter_kz');
+		$this->StudiengangModel->addOrder('typ');
+		$this->StudiengangModel->addOrder('kurzbz');
+
+		$result = $this->StudiengangModel->loadWhere(['v.aktiv' => true]);
 		if (isError($result))
 			return $this->outputJson($result);
 		if (!hasData($result))
@@ -57,4 +72,78 @@ class Studentenverwaltung extends FHC_Controller
 			]
 		]);
 	}
+
+	/**
+	 * @param integer		$studiengang_kz
+	 * @return void
+	 */
+	public function getStudents($studiengang_kz = null)
+	{
+		// TODO(chris): stdSem?
+		$stdSem='SS2023';
+
+		// TODO(chris): load students filtered by the params
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+		$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
+		$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id');
+		$this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid');
+		$this->PrestudentModel->addJoin('public.tbl_studentlehrverband v', 'v.student_uid=s.student_uid AND v.studiensemester_kurzbz=' . $this->PrestudentModel->escape($stdSem));
+
+		$this->PrestudentModel->addSelect('p.person_id');
+		$this->PrestudentModel->addSelect('s.prestudent_id');
+		$this->PrestudentModel->addSelect('b.uid');
+		$this->PrestudentModel->addSelect('titelpre');
+		$this->PrestudentModel->addSelect('titelpost');
+		$this->PrestudentModel->addSelect('vorname');
+		$this->PrestudentModel->addSelect('wahlname');
+		$this->PrestudentModel->addSelect('vornamen');
+		$this->PrestudentModel->addSelect('geschlecht');
+		$this->PrestudentModel->addSelect('nachname');
+		$this->PrestudentModel->addSelect('gebdatum');
+		$this->PrestudentModel->addSelect('tbl_prestudent.anmerkung');
+		$this->PrestudentModel->addSelect('ersatzkennzeichen');
+		$this->PrestudentModel->addSelect('svnr');
+		$this->PrestudentModel->addSelect('s.matrikelnr');
+		$this->PrestudentModel->addSelect('p.anmerkung AS anmerkungen');
+		$this->PrestudentModel->addSelect('v.semester');
+		$this->PrestudentModel->addSelect('v.verband');
+		$this->PrestudentModel->addSelect('v.gruppe');
+		$this->PrestudentModel->addSelect('tbl_prestudent.studiengang_kz');
+		$this->PrestudentModel->addSelect('aufmerksamdurch_kurzbz');
+		$this->PrestudentModel->addSelect('mentor');
+		$this->PrestudentModel->addSelect('b.aktiv AS bnaktiv');
+		$this->PrestudentModel->addSelect("(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung LIMIT 1) AS email_privat", false);
+		$this->PrestudentModel->addSelect("(SELECT rt_gesamtpunkte AS punkte FROM public.tbl_prestudent WHERE prestudent_id=s.prestudent_id) AS punkte", false);
+		$this->PrestudentModel->addSelect('tbl_prestudent.dual');
+		$this->PrestudentModel->addSelect('tbl_prestudent.reihungstest_id');
+		$this->PrestudentModel->addSelect('tbl_prestudent.anmeldungreihungstest');
+		$this->PrestudentModel->addSelect('p.matr_nr');
+		$this->PrestudentModel->addSelect('tbl_prestudent.gsstudientyp_kurzbz');
+		$this->PrestudentModel->addSelect('tbl_prestudent.aufnahmegruppe_kurzbz');
+		$this->PrestudentModel->addSelect('tbl_prestudent.priorisierung');
+		$this->PrestudentModel->addSelect('p.zugangscode');
+		$this->PrestudentModel->addSelect('p.bpk');
+
+		$this->PrestudentModel->addOrder('nachname');
+		$this->PrestudentModel->addOrder('vorname');
+
+		// TODO(chris): do we need that? do we want that?
+		if ($studiengang_kz === null)
+			$this->PrestudentModel->addLimit(1000);
+		
+		if ($studiengang_kz !== null)
+			$result = $this->PrestudentModel->loadWhere([
+				'tbl_prestudent.studiengang_kz' => $studiengang_kz
+			]);
+		else
+			$result = $this->PrestudentModel->load();
+		
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->outputJson(getError($result));
+		} else {
+			$this->outputJson(getData($result));
+		}
+	}
 }
diff --git a/application/views/Studentenverwaltung.php b/application/views/Studentenverwaltung.php
index 20a89f8e8..96cf0974d 100644
--- a/application/views/Studentenverwaltung.php
+++ b/application/views/Studentenverwaltung.php
@@ -33,12 +33,12 @@
 					<div class="offcanvas-header justify-content-end px-1 d-md-none">
 						<button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" aria-label="Close"></button>
 					</div>
-					<stv-verband></stv-verband>
+					<stv-verband @select-verband="onSelectVerband"></stv-verband>
 				</nav>
 				<main class="col-md-8 ms-sm-auto col-lg-9 col-xl-10">
 					<vertical-split>
 						<template #top>
-							<stv-list v-model:selected="selected"></stv-list>
+							<stv-list ref="stvList" v-model:selected="selected"></stv-list>
 						</template>
 						<template #bottom>
 							<stv-details :student="lastSelected"></stv-details>
diff --git a/public/js/apps/Studentenverwaltung.js b/public/js/apps/Studentenverwaltung.js
index bdec5d033..9507ba3f5 100644
--- a/public/js/apps/Studentenverwaltung.js
+++ b/public/js/apps/Studentenverwaltung.js
@@ -18,7 +18,7 @@
 import FhcSearchbar from "../components/searchbar/searchbar.js";
 import StvVerband from "../components/Studienverwaltung/Verband.js";
 import StvList from "../components/Studienverwaltung/List.js";
-import StvStudent from "../components/Studienverwaltung/Student.js";
+import StvDetails from "../components/Studienverwaltung/Details.js";
 import VerticalSplit from "../components/verticalsplit/verticalsplit.js";
 import fhcapifactory from "./api/fhcapifactory.js";
 
@@ -29,7 +29,7 @@ const app = Vue.createApp({
 		FhcSearchbar,
 		StvVerband,
 		StvList,
-		StvStudent,
+		StvDetails,
 		VerticalSplit
 	},
 	data() {
@@ -78,6 +78,9 @@ const app = Vue.createApp({
 		}
 	},
 	methods: {
+		onSelectVerband(link) {
+			this.$refs.stvList.updateUrl(link);
+		},
 		searchfunction(searchsettings) {
 			return Vue.$fhcapi.Search.search(searchsettings);  
 		}
diff --git a/public/js/components/Studienverwaltung/List.js b/public/js/components/Studienverwaltung/List.js
index 9a32914b7..a74512d7e 100644
--- a/public/js/components/Studienverwaltung/List.js
+++ b/public/js/components/Studienverwaltung/List.js
@@ -1,4 +1,5 @@
 import {CoreFilterCmpt} from "../filter/Filter.js";
+import {CoreRESTClient} from '../../RESTClient.js';
 
 export default {
 	components: {
@@ -13,22 +14,16 @@ export default {
 	data() {
 		return {
 			tabulatorOptions: {
-				columns:[ //Define Table Columns
-					{title:"Name", field:"name", width:150},
-					{title:"Age", field:"age", hozAlign:"left", formatter:"progress"},
-					{title:"Favourite Color", field:"col"},
-					{title:"Date Of Birth", field:"dob", sorter:"date", hozAlign:"center"},
-				],
-				data: [
-					{id:1, name:"Oli Bob", age:"12", col:"red", dob:""},
-					{id:2, name:"Mary May", age:"1", col:"blue", dob:"14/05/1982"},
-					{id:3, name:"Christine Lobowski", age:"42", col:"green", dob:"22/05/1982"},
-					{id:4, name:"Brendon Philips", age:"125", col:"orange", dob:"01/08/1980"},
-					{id:5, name:"Margret Marmajuke", age:"16", col:"yellow", dob:"31/01/1999"},
-					{id:6, name:"Oli Bob", age:"12", col:"red", dob:""},
-					{id:7, name:"Mary May", age:"1", col:"blue", dob:"14/05/1982"},
-					{id:8, name:"Christine Lobowski", age:"42", col:"green", dob:"22/05/1982"},
-					{id:9, name:"Brendon Philips", age:"125", col:"orange", dob:"01/08/1980"}
+				ajaxURL: CoreRESTClient._generateRouterURI("components/Studentenverwaltung/getStudents"),
+				
+				//autoColumns: true,
+				columns:[
+					{title:"UID", field:"uid"},
+					{title:"TitelPre", field:"titelpre"},
+					{title:"Nachname", field:"nachname"},
+					{title:"Vorname", field:"vorname"},
+					{title:"Wahlname", field:"wahlname", visible:false},
+					// TODO(chris): IMPLEMENT!
 				],
 
 				height: 'auto',
@@ -48,6 +43,10 @@ export default {
 		},
 		rowSelectionChanged(data) {
 			this.$emit('update:selected', data);
+		},
+		updateUrl(url) {
+			this.$refs.table.tabulator.setData(CoreRESTClient._generateRouterURI(url));
+			console.log(CoreRESTClient._generateRouterURI(url));
 		}
 	},
 	mounted() {
@@ -55,6 +54,7 @@ export default {
 	template: `
 	<div class="stv-list h-100 pt-3">
 		<core-filter-cmpt
+			ref="table"
 			:tabulator-options="tabulatorOptions"
 			:tabulator-events="tabulatorEvents"
 			table-only
diff --git a/public/js/components/Studienverwaltung/Verband.js b/public/js/components/Studienverwaltung/Verband.js
index e7abbbcd4..630e583a2 100644
--- a/public/js/components/Studienverwaltung/Verband.js
+++ b/public/js/components/Studienverwaltung/Verband.js
@@ -5,6 +5,9 @@ export default {
 		TreeTable: primevue.treetable,
 		TreeColumn: primevue.column
 	},
+	emits: [
+		'selectVerband'
+	],
 	data() {
 		return {
 			loading: true,
@@ -31,15 +34,19 @@ export default {
 				}
 			}
 		},
+		onSelectTreeNode(node) {
+			if (node.link)
+				this.$emit('selectVerband', node.link);
+		},
 		mapResultToTreeData(el) {
 			const cp = {
 				data: el
 			};
 			if (el.studiengang_kz !== undefined) {
-				// TODO(chris): scrolling doesn't work
 				cp.key = el.studiengang_kz;
-				cp.data.name = el.bezeichnung;
+				cp.data.name = el.kurzbzlang + ' (' + (el.typ + el.kurzbz).toUpperCase() + ') - ' + el.bezeichnung;
 				cp.leaf = false;
+				cp.link = 'components/Studentenverwaltung/getStudents/' + el.studiengang_kz;
 			}
 			if (el.children)
 				cp.children = el.children.map(this.mapResultToTreeData);
@@ -62,7 +69,7 @@ export default {
 			});
 	},
 	template: `
-	<tree-table class="stv-verband p-treetable-sm" :value="nodes" lazy @node-expand="onExpandTreeNode" scrollable scroll-height="flex">
+	<tree-table class="stv-verband p-treetable-sm" :value="nodes" lazy @node-expand="onExpandTreeNode" selection-mode="single" @node-select="onSelectTreeNode" scrollable scroll-height="flex">
 		<tree-column field="name" header="Verband" expander></tree-column>
 	</tree-table>`
 };
\ No newline at end of file

From bd92777b96076e4e5b3cb2b90df9b1b6c656a1e4 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 4 Sep 2023 16:52:46 +0200
Subject: [PATCH 0114/1461] improvements 2

---
 application/config/routes.php                 |   2 +
 .../components/Studentenverwaltung.php        | 149 ------
 .../controllers/components/stv/Students.php   | 343 ++++++++++++++
 .../controllers/components/stv/Verband.php    | 429 ++++++++++++++++++
 application/views/Studentenverwaltung.php     |  27 +-
 public/js/apps/Studentenverwaltung.js         |  82 +---
 .../js/components/Studienverwaltung/List.js   |  69 ---
 .../js/components/Stv/Studentenverwaltung.js  | 117 +++++
 .../Stv/Studentenverwaltung/Details.js        |  30 ++
 .../Studentenverwaltung/Details/Details.js    |  87 ++++
 .../Studentenverwaltung/Details/Notizen.js}   |   4 +-
 .../Stv/Studentenverwaltung/List.js           | 114 +++++
 .../Studentenverwaltung}/Verband.js           |  41 +-
 13 files changed, 1158 insertions(+), 336 deletions(-)
 delete mode 100644 application/controllers/components/Studentenverwaltung.php
 create mode 100644 application/controllers/components/stv/Students.php
 create mode 100644 application/controllers/components/stv/Verband.php
 delete mode 100644 public/js/components/Studienverwaltung/List.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Details.js
 rename public/js/components/{Studienverwaltung/Details.js => Stv/Studentenverwaltung/Details/Notizen.js} (51%)
 create mode 100644 public/js/components/Stv/Studentenverwaltung/List.js
 rename public/js/components/{Studienverwaltung => Stv/Studentenverwaltung}/Verband.js (53%)

diff --git a/application/config/routes.php b/application/config/routes.php
index 15da5698f..a5bd3a7c8 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -61,6 +61,8 @@ $route['api/v1/organisation/[O|o]rganisationseinheit/(:any)'] = 'api/v1/organisa
 $route['api/v1/ressource/[B|b]etriebsmittelperson/(:any)'] = 'api/v1/ressource/betriebsmittelperson2/$1';
 $route['api/v1/system/[S|s]prache/(:any)'] = 'api/v1/system/sprache2/$1';
 
+$route['studentenverwaltung/(:any)'] = 'Studentenverwaltung/index';
+
 // load routes from extensions
 $subdir = 'application/config/extensions';
 $dirlist = scandir($subdir);
diff --git a/application/controllers/components/Studentenverwaltung.php b/application/controllers/components/Studentenverwaltung.php
deleted file mode 100644
index 63fb7118c..000000000
--- a/application/controllers/components/Studentenverwaltung.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class Studentenverwaltung extends FHC_Controller
-{
-	public function __construct()
-	{
-		// TODO(chris): access!
-		parent::__construct();
-	}
-
-	/**
-	 * @return void
-	 */
-	public function index()
-	{
-		// TODO(chris): load stgs (this is just for testing)
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-
-		$this->StudiengangModel->addJoin('public.tbl_lehrverband v', 'studiengang_kz');
-		
-		$this->StudiengangModel->addDistinct();
-		$this->StudiengangModel->addSelect('v.studiengang_kz');
-		$this->StudiengangModel->addSelect('tbl_studiengang.bezeichnung');
-		$this->StudiengangModel->addSelect('kurzbzlang');
-		$this->StudiengangModel->addSelect('erhalter_kz');
-		$this->StudiengangModel->addSelect('typ');
-		$this->StudiengangModel->addSelect('kurzbz');
-		
-		$this->StudiengangModel->addOrder('erhalter_kz');
-		$this->StudiengangModel->addOrder('typ');
-		$this->StudiengangModel->addOrder('kurzbz');
-
-		$result = $this->StudiengangModel->loadWhere(['v.aktiv' => true]);
-		if (isError($result))
-			return $this->outputJson($result);
-		if (!hasData($result))
-			return $this->outputJsonSuccess([]);
-		$list = getData($result);
-		$list[] = [
-			'name' => 'International',
-			'children' => [
-				[
-					'name' => 'Incoming',
-					'leaf' => true
-				],
-				[
-					'name' => 'Outgoing',
-					'leaf' => true
-				],
-				[
-					'name' => 'Gemeinsame Studien',
-					'leaf' => true
-				]
-			]
-		];
-		$this->outputJsonSuccess($list);
-	}
-
-	/**
-	 * @param integer		$studiengang_kz
-	 * @return void
-	 */
-	public function getStudiengang($studiengang_kz)
-	{
-		// TODO(chris): load stgSemester + prestudent
-		$this->outputJson([
-			[
-				'key' => 2,
-				'name' => 'PreStudent'
-			]
-		]);
-	}
-
-	/**
-	 * @param integer		$studiengang_kz
-	 * @return void
-	 */
-	public function getStudents($studiengang_kz = null)
-	{
-		// TODO(chris): stdSem?
-		$stdSem='SS2023';
-
-		// TODO(chris): load students filtered by the params
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-
-		$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
-		$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id');
-		$this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid');
-		$this->PrestudentModel->addJoin('public.tbl_studentlehrverband v', 'v.student_uid=s.student_uid AND v.studiensemester_kurzbz=' . $this->PrestudentModel->escape($stdSem));
-
-		$this->PrestudentModel->addSelect('p.person_id');
-		$this->PrestudentModel->addSelect('s.prestudent_id');
-		$this->PrestudentModel->addSelect('b.uid');
-		$this->PrestudentModel->addSelect('titelpre');
-		$this->PrestudentModel->addSelect('titelpost');
-		$this->PrestudentModel->addSelect('vorname');
-		$this->PrestudentModel->addSelect('wahlname');
-		$this->PrestudentModel->addSelect('vornamen');
-		$this->PrestudentModel->addSelect('geschlecht');
-		$this->PrestudentModel->addSelect('nachname');
-		$this->PrestudentModel->addSelect('gebdatum');
-		$this->PrestudentModel->addSelect('tbl_prestudent.anmerkung');
-		$this->PrestudentModel->addSelect('ersatzkennzeichen');
-		$this->PrestudentModel->addSelect('svnr');
-		$this->PrestudentModel->addSelect('s.matrikelnr');
-		$this->PrestudentModel->addSelect('p.anmerkung AS anmerkungen');
-		$this->PrestudentModel->addSelect('v.semester');
-		$this->PrestudentModel->addSelect('v.verband');
-		$this->PrestudentModel->addSelect('v.gruppe');
-		$this->PrestudentModel->addSelect('tbl_prestudent.studiengang_kz');
-		$this->PrestudentModel->addSelect('aufmerksamdurch_kurzbz');
-		$this->PrestudentModel->addSelect('mentor');
-		$this->PrestudentModel->addSelect('b.aktiv AS bnaktiv');
-		$this->PrestudentModel->addSelect("(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung LIMIT 1) AS email_privat", false);
-		$this->PrestudentModel->addSelect("(SELECT rt_gesamtpunkte AS punkte FROM public.tbl_prestudent WHERE prestudent_id=s.prestudent_id) AS punkte", false);
-		$this->PrestudentModel->addSelect('tbl_prestudent.dual');
-		$this->PrestudentModel->addSelect('tbl_prestudent.reihungstest_id');
-		$this->PrestudentModel->addSelect('tbl_prestudent.anmeldungreihungstest');
-		$this->PrestudentModel->addSelect('p.matr_nr');
-		$this->PrestudentModel->addSelect('tbl_prestudent.gsstudientyp_kurzbz');
-		$this->PrestudentModel->addSelect('tbl_prestudent.aufnahmegruppe_kurzbz');
-		$this->PrestudentModel->addSelect('tbl_prestudent.priorisierung');
-		$this->PrestudentModel->addSelect('p.zugangscode');
-		$this->PrestudentModel->addSelect('p.bpk');
-
-		$this->PrestudentModel->addOrder('nachname');
-		$this->PrestudentModel->addOrder('vorname');
-
-		// TODO(chris): do we need that? do we want that?
-		if ($studiengang_kz === null)
-			$this->PrestudentModel->addLimit(1000);
-		
-		if ($studiengang_kz !== null)
-			$result = $this->PrestudentModel->loadWhere([
-				'tbl_prestudent.studiengang_kz' => $studiengang_kz
-			]);
-		else
-			$result = $this->PrestudentModel->load();
-		
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			$this->outputJson(getError($result));
-		} else {
-			$this->outputJson(getData($result));
-		}
-	}
-}
diff --git a/application/controllers/components/stv/Students.php b/application/controllers/components/stv/Students.php
new file mode 100644
index 000000000..4d00a1f54
--- /dev/null
+++ b/application/controllers/components/stv/Students.php
@@ -0,0 +1,343 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Students extends FHC_Controller
+{
+	public function __construct()
+	{
+		// TODO(chris): access!
+		parent::__construct();
+	}
+
+	/**
+	 * Remap calls:
+	 * /													=> return []
+	 * /inout												=> return []
+	 * /inout/incoming										=> getIncoming
+	 * /inout/outgoing										=> getOutgoing
+	 * /inout/gemeinsamestudien								=> getGemeinsamestudien
+	 * /(studiengang_kz)									=> getStudents
+	 * /(studiengang_kz)/prestudent							=> getPrestudents
+	 * /(studiengang_kz)/prestudent/*						=> getPrestudents
+	 * /(studiengang_kz)/(semester)							=> getStudents
+	 * /(studiengang_kz)/(semester)/grp/(gruppe_kurzbz)		=> getStudents
+	 * /(studiengang_kz)/(semester)/(verband)				=> getStudents
+	 * /(studiengang_kz)/(semester)/(verband)/(gruppe)		=> getStudents
+	 * /(studiengang_kz)/(org_form)							=> getStudents
+	 * /(studiengang_kz)/(org_form)/prestudent				=> getPrestudents
+	 * /(studiengang_kz)/(org_form)/prestudent/*			=> getPrestudents
+	 * /(studiengang_kz)/(org_form)/(semester)				=> getStudents
+	 * /(studiengang_kz)/(org_form)/(semester)/grp/(gruppe_kurzbz)
+	 * 														=> getStudents
+	 * /(studiengang_kz)/(org_form)/(semester)/(verband)	=> getStudents
+	 * /(studiengang_kz)/(org_form)/(semester)/(verband)/(gruppe)
+	 * 														=> getStudents
+	 * /uid/(student_uid)									=> getStudent
+	 *
+	 * @param string		$method
+	 * @param array			$params				(optional)
+	 *
+	 * @return void
+	 */
+	public function _remap($method, $params = [])
+	{
+		if ($method == '' || $method == 'index')
+			return $this->outputJson([]);
+
+		if ($method == 'inout') {
+			if (!count($params))
+				return $this->outputJson([]);
+			switch ($params[0]) {
+				case 'incoming':
+					return $this->getIncoming();
+				case 'outgoing':
+					return $this->getOutgoing();
+				case 'gemeinsamestudien':
+					return $this->getGemeinsamestudien();
+				default:
+					return show_404();
+			}
+		}
+
+		$count = count($params);
+		if (!$count)
+			return $this->getStudents($method);
+
+		if ($method == 'uid' && $count == 1)
+			return $this->getStudent($params[0]);
+
+		if (is_numeric($params[0])) {
+			$sem = $params[0];
+			if ($count == 3 && $params[1] == 'grp') {
+				$g = $params[2];
+				$ver = null;
+				$grp = null;
+			} else {
+				$g = null;
+				$ver = $count > 1 ? $params[1] : null;
+				$grp = $count > 2 ? $params[2] : null;
+			}
+			return $this->getStudents($method, $sem, $ver, $grp, $g);
+		} elseif ($params[0] == 'prestudent') {
+			if ($count == 1)
+				return $this->getPrestudents($method);
+			if ($count == 2)
+				return $this->getPrestudents($method, $params[1]);
+			return $this->getPrestudents($method, $params[1], $params[$count-1]);
+		} else {
+			$org = $params[0];
+			if ($count > 1 && $params[1] == 'prestudent') {
+				if ($count == 2)
+					return $this->getPrestudents(null, null, $org);
+				if ($count == 3)
+					return $this->getPrestudents($params[2], null, $org);
+				return $this->getPrestudents($params[2], $params[$count-1], $org);
+			}
+			$sem = $count > 1 ? $params[1] : null;
+			if ($count == 4 && $params[2] == 'grp') {
+				$g = $params[3];
+				$ver = null;
+				$grp = null;
+			} else {
+				$g = null;
+				$ver = $count > 2 ? $params[2] : null;
+				$grp = $count > 3 ? $params[3] : null;
+			}
+
+			return $this->getStudents($method, $sem, $ver, $grp, $g, $org);
+		}
+		
+		show_404();
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function getIncoming()
+	{
+		// TODO(chris): IMPLEMENT!
+		$this->outputJson([]);
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function getOutgoing()
+	{
+		// TODO(chris): IMPLEMENT!
+		$this->outputJson([]);
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function getGemeinsamestudien()
+	{
+		// TODO(chris): IMPLEMENT!
+		$this->outputJson([]);
+	}
+
+	/**
+	 * @param integer		$studiengang_kz
+	 * @param string		$studiensemester_kurzbz			(optional)
+	 * @param string		$filter							(optional)
+	 * @param string		$orgform_kurzbz					(optional)
+	 *
+	 * @return void
+	 */
+	protected function getPrestudents($studiengang_kz, $studiensemester_kurzbz = null, $filter = null, $orgform_kurzbz = null)
+	{
+		// TODO(chris): @see: prestudent.class::loadInteressentenUndBewerber
+		// TODO(chris): IMPLEMENT!
+		$this->outputJson([]);
+	}
+
+	/**
+	 * @param integer		$studiengang_kz
+	 * @param integer		$semester						(optional)
+	 * @param string		$verband						(optional)
+	 * @param integer		$gruppe							(optional)
+	 * @param string		$gruppe_kurzbz					(optional)
+	 * @param string		$orgform_kurzbz					(optional)
+	 *
+	 * @return void
+	 */
+	protected function getStudents($studiengang_kz, $semester = null, $verband = null, $gruppe = null, $gruppe_kurzbz = null, $orgform_kurzbz = null)
+	{
+		// TODO(chris): stdSem from Variable
+		$studiensemester_kurzbz='SS2023';
+		
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+		$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
+		$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id');
+		$this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid');
+		$this->PrestudentModel->addJoin(
+			'public.tbl_studentlehrverband v',
+			'v.student_uid=s.student_uid AND v.studiensemester_kurzbz=' . $this->PrestudentModel->escape($studiensemester_kurzbz)
+		);
+
+		$this->PrestudentModel->addSelect('p.person_id');
+		$this->PrestudentModel->addSelect('s.prestudent_id');
+		$this->PrestudentModel->addSelect('b.uid');
+		$this->PrestudentModel->addSelect('titelpre');
+		$this->PrestudentModel->addSelect('titelpost');
+		$this->PrestudentModel->addSelect('vorname');
+		$this->PrestudentModel->addSelect('wahlname');
+		$this->PrestudentModel->addSelect('vornamen');
+		$this->PrestudentModel->addSelect('geschlecht');
+		$this->PrestudentModel->addSelect('nachname');
+		$this->PrestudentModel->addSelect('gebdatum');
+		$this->PrestudentModel->addSelect('tbl_prestudent.anmerkung');
+		$this->PrestudentModel->addSelect('ersatzkennzeichen');
+		$this->PrestudentModel->addSelect('svnr');
+		$this->PrestudentModel->addSelect('s.matrikelnr');
+		$this->PrestudentModel->addSelect('p.anmerkung AS anmerkungen');
+		$this->PrestudentModel->addSelect('v.semester');
+		$this->PrestudentModel->addSelect('v.verband');
+		$this->PrestudentModel->addSelect('v.gruppe');
+		$this->PrestudentModel->addSelect('tbl_prestudent.studiengang_kz');
+		$this->PrestudentModel->addSelect('aufmerksamdurch_kurzbz');
+		$this->PrestudentModel->addSelect('mentor');
+		$this->PrestudentModel->addSelect('b.aktiv AS bnaktiv');
+		$this->PrestudentModel->addSelect(
+			"(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung LIMIT 1) AS email_privat",
+			false
+		);
+		$this->PrestudentModel->addSelect(
+			"(SELECT rt_gesamtpunkte AS punkte FROM public.tbl_prestudent WHERE prestudent_id=s.prestudent_id) AS punkte",
+			false
+		);
+		$this->PrestudentModel->addSelect('tbl_prestudent.dual');
+		$this->PrestudentModel->addSelect('tbl_prestudent.reihungstest_id');
+		$this->PrestudentModel->addSelect('tbl_prestudent.anmeldungreihungstest');
+		$this->PrestudentModel->addSelect('p.matr_nr');
+		$this->PrestudentModel->addSelect('tbl_prestudent.gsstudientyp_kurzbz');
+		$this->PrestudentModel->addSelect('tbl_prestudent.aufnahmegruppe_kurzbz');
+		$this->PrestudentModel->addSelect('tbl_prestudent.priorisierung');
+		$this->PrestudentModel->addSelect('p.zugangscode');
+		$this->PrestudentModel->addSelect('p.bpk');
+
+		$this->PrestudentModel->addOrder('nachname');
+		$this->PrestudentModel->addOrder('vorname');
+
+
+		$where = [];
+
+		if ($gruppe_kurzbz !== null) {
+			$this->PrestudentModel->addJoin('public.tbl_benutzergruppe g', 'uid');
+			$where['g.gruppe_kurzbz'] = $gruppe_kurzbz;
+			$where['g.studiensemester_kurzbz'] = $studiensemester_kurzbz;
+		} else {
+			$where['v.studiengang_kz'] = $studiengang_kz;
+
+			if ($semester !== null)
+				$where['v.semester'] = $semester;
+
+			if ($verband !== null)
+				$where['v.verband'] = $verband;
+
+			if ($gruppe !== null)
+				$where['v.gruppe'] = $gruppe;
+	
+			if (!$verband && !$gruppe && $orgform_kurzbz !== null) {
+				$this->PrestudentModel->db->where(
+					"(
+						SELECT orgform_kurzbz 
+						FROM public.tbl_prestudentstatus 
+						WHERE prestudent_id=tbl_prestudent.prestudent_id 
+						AND studiensemester_kurzbz=" . $this->PrestudentModel->escape($studiensemester_kurzbz) . " 
+						ORDER BY datum DESC, insertamum DESC, ext_id DESC LIMIT 1
+					)",
+					$this->PrestudentModel->escape($orgform_kurzbz),
+					false
+				);
+			}
+
+		}
+
+		$result = $this->PrestudentModel->loadWhere($where);
+		
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->outputJson(getError($result));
+		} else {
+			$this->outputJson(getData($result) ?: []);
+		}
+	}
+	/**
+	 * @param string		$student_uid
+	 *
+	 * @return void
+	 */
+	protected function getStudent($student_uid)
+	{
+		// TODO(chris): stdSem from Variable
+		$studiensemester_kurzbz='SS2023';
+
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+		$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
+		$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id');
+		$this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid');
+		$this->PrestudentModel->addJoin(
+			'public.tbl_studentlehrverband v',
+			'v.student_uid=s.student_uid AND v.studiensemester_kurzbz=' . $this->PrestudentModel->escape($studiensemester_kurzbz)
+		);
+
+		$this->PrestudentModel->addSelect('p.person_id');
+		$this->PrestudentModel->addSelect('s.prestudent_id');
+		$this->PrestudentModel->addSelect('b.uid');
+		$this->PrestudentModel->addSelect('titelpre');
+		$this->PrestudentModel->addSelect('titelpost');
+		$this->PrestudentModel->addSelect('vorname');
+		$this->PrestudentModel->addSelect('wahlname');
+		$this->PrestudentModel->addSelect('vornamen');
+		$this->PrestudentModel->addSelect('geschlecht');
+		$this->PrestudentModel->addSelect('nachname');
+		$this->PrestudentModel->addSelect('gebdatum');
+		$this->PrestudentModel->addSelect('tbl_prestudent.anmerkung');
+		$this->PrestudentModel->addSelect('ersatzkennzeichen');
+		$this->PrestudentModel->addSelect('svnr');
+		$this->PrestudentModel->addSelect('s.matrikelnr');
+		$this->PrestudentModel->addSelect('p.anmerkung AS anmerkungen');
+		$this->PrestudentModel->addSelect('v.semester');
+		$this->PrestudentModel->addSelect('v.verband');
+		$this->PrestudentModel->addSelect('v.gruppe');
+		$this->PrestudentModel->addSelect('tbl_prestudent.studiengang_kz');
+		$this->PrestudentModel->addSelect('aufmerksamdurch_kurzbz');
+		$this->PrestudentModel->addSelect('mentor');
+		$this->PrestudentModel->addSelect('b.aktiv AS bnaktiv');
+		$this->PrestudentModel->addSelect(
+			"(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung LIMIT 1) AS email_privat",
+			false
+		);
+		$this->PrestudentModel->addSelect(
+			"(SELECT rt_gesamtpunkte AS punkte FROM public.tbl_prestudent WHERE prestudent_id=s.prestudent_id) AS punkte",
+			false
+		);
+		$this->PrestudentModel->addSelect('tbl_prestudent.dual');
+		$this->PrestudentModel->addSelect('tbl_prestudent.reihungstest_id');
+		$this->PrestudentModel->addSelect('tbl_prestudent.anmeldungreihungstest');
+		$this->PrestudentModel->addSelect('p.matr_nr');
+		$this->PrestudentModel->addSelect('tbl_prestudent.gsstudientyp_kurzbz');
+		$this->PrestudentModel->addSelect('tbl_prestudent.aufnahmegruppe_kurzbz');
+		$this->PrestudentModel->addSelect('tbl_prestudent.priorisierung');
+		$this->PrestudentModel->addSelect('p.zugangscode');
+		$this->PrestudentModel->addSelect('p.bpk');
+
+		$where = [];
+
+		$result = $this->PrestudentModel->loadWhere([
+			's.student_uid' => $student_uid
+		]);
+		
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->outputJson(getError($result));
+		} else {
+			$this->outputJson(getData($result) ?: []);
+		}
+	}
+}
diff --git a/application/controllers/components/stv/Verband.php b/application/controllers/components/stv/Verband.php
new file mode 100644
index 000000000..70ccf55f2
--- /dev/null
+++ b/application/controllers/components/stv/Verband.php
@@ -0,0 +1,429 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Verband extends FHC_Controller
+{
+	public function __construct()
+	{
+		// TODO(chris): access!
+		parent::__construct();
+		
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+	}
+
+	/**
+	 * Remap calls:
+	 * /
+	 * /(studiengang_kz)									=> getStudiengang
+	 * /(studiengang_kz)/(semester)							=> getSemester
+	 * /(studiengang_kz)/(semester)/(verband)				=> getVerband
+	 * /(studiengang_kz)/(org_form)							=> getStudiengang
+	 * /(studiengang_kz)/(org_form)/(semester)				=> getSemester
+	 * /(studiengang_kz)/(org_form)/(semester)/(verband)	=> getVerband
+	 *
+	 * @param string		$method
+	 * @param array			$params				(optional)
+	 *
+	 * @return void
+	 */
+	public function _remap($method, $params = [])
+	{
+		if ($method == '' || $method == 'index')
+			return $this->getBase();
+
+		$count = count($params);
+		if (!$count)
+			return $this->getStudiengang($method);
+
+		if ($count == 1) {
+			if (is_numeric($params[0]))
+				return $this->getSemester($method, $params[0]);
+			else
+				return $this->getStudiengang($method, $params[0]);
+		}
+		if ($count == 2) {
+			if (is_numeric($params[0]))
+				return $this->getVerband($method, $params[0], $params[1]);
+			else
+				return $this->getSemester($method, $params[1], $params[0]);
+		}
+		if ($count == 3 && !is_numeric($params[0]) && is_numeric($params[1]) && !is_numeric($params[2]))
+			return $this->getVerband($method, $params[1], $params[2], $params[0]);
+
+		show_404();
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function getBase()
+	{
+		$this->StudiengangModel->addJoin('public.tbl_lehrverband v', 'studiengang_kz');
+		
+		$this->StudiengangModel->addDistinct();
+		$this->StudiengangModel->addSelect("v.studiengang_kz AS link");
+		$this->StudiengangModel->addSelect("CONCAT(kurzbzlang, ' (', UPPER(CONCAT(typ, kurzbz)), ') - ', tbl_studiengang.bezeichnung) AS name", false);
+		$this->StudiengangModel->addSelect('erhalter_kz');
+		$this->StudiengangModel->addSelect('typ');
+		$this->StudiengangModel->addSelect('kurzbz');
+		
+		$this->StudiengangModel->addOrder('erhalter_kz');
+		$this->StudiengangModel->addOrder('typ');
+		$this->StudiengangModel->addOrder('kurzbz');
+
+		$result = $this->StudiengangModel->loadWhere(['v.aktiv' => true]);
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson(getError($result));
+		}
+
+		$list = getData($result) ?: [];
+		$list[] = [
+			'name' => 'International',
+			'link' => 'inout',
+			'children' => [
+				[
+					'name' => 'Incoming',
+					'link' => 'inout/incoming',
+					'leaf' => true
+				],
+				[
+					'name' => 'Outgoing',
+					'link' => 'inout/outgoing',
+					'leaf' => true
+				],
+				[
+					'name' => 'Gemeinsame Studien',
+					'link' => 'inout/gemeinsamestudien',
+					'leaf' => true
+				]
+			]
+		];
+		$this->outputJson($list);
+	}
+
+	/**
+	 * @param integer		$studiengang_kz
+	 * @param string		$orgform			(optional)
+	 *
+	 * @return void
+	 */
+	protected function getStudiengang($studiengang_kz, $org_form = null)
+	{
+		$link = $studiengang_kz . '/';
+		if ($org_form !== null)
+			$link .= $org_form . '/';
+
+		$this->StudiengangModel->addJoin('public.tbl_lehrverband v', 'studiengang_kz');
+		
+		$this->StudiengangModel->addDistinct();
+		$this->StudiengangModel->addSelect("CONCAT(" . $this->StudiengangModel->escape($link) . ", semester) AS link", false);
+		$this->StudiengangModel->addSelect("CONCAT(UPPER(CONCAT(typ, kurzbz)), '-', semester, (SELECT CASE WHEN bezeichnung IS NULL OR bezeichnung='' THEN ''::TEXT ELSE CONCAT(' (', bezeichnung, ')') END FROM public.tbl_lehrverband WHERE studiengang_kz=v.studiengang_kz AND semester=v.semester ORDER BY verband, gruppe LIMIT 1)) AS name", false);
+
+		$this->StudiengangModel->addSelect('semester');
+		
+		$this->StudiengangModel->addOrder('semester');
+
+		if ($org_form !== null) {
+			$this->StudiengangModel->db->group_start();
+			$this->StudiengangModel->db->where('v.semester', 0);
+			$this->StudiengangModel->db->or_where('v.orgform_kurzbz', $org_form);
+			$this->StudiengangModel->db->group_end();
+		}
+
+		$result = $this->StudiengangModel->loadWhere([
+			'v.studiengang_kz' => $studiengang_kz,
+			'v.aktiv' => true
+		]);
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson(getError($result));
+		}
+
+		$list = getData($result) ?: [];
+		array_unshift($list, [
+			'name' => 'PreStudent',
+			'link' => $link . 'prestudent',
+			'children' => $this->getStdSem($link . 'prestudent/')
+		]);
+
+		if ($org_form === null) {
+			// NOTE(chris): if mischform show orgforms
+			$result = $this->StudiengangModel->load($studiengang_kz);
+			if (isError($result)) {
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return $this->outputJson(getError($result));
+			}
+			if (hasData($result)) {
+				if (current(getData($result))->mischform) {
+					$this->load->model('organisation/Studienordnung_model', 'StudienordnungModel');
+
+					$this->StudienordnungModel->addDistinct();
+					$this->StudienordnungModel->addSelect("CONCAT(studiengang_kz, '/', p.orgform_kurzbz) AS link");
+					$this->StudienordnungModel->addSelect("p.orgform_kurzbz AS name");
+
+					// TODO(chris): semester for gruppe_kurzbz <- what did i mean by that?
+
+					$this->StudienordnungModel->addJoin('lehre.tbl_studienplan p', 'studienordnung_id');
+
+					$result = $this->StudienordnungModel->loadWhere([
+						'aktiv' => true,
+						'studiengang_kz' => $studiengang_kz,
+						'p.orgform_kurzbz !=' => 'DDP'
+					]);
+					if (isError($result)) {
+						$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+						return $this->outputJson(getError($result));
+					}
+
+					if (hasData($result))
+						$list = array_merge($list, getData($result));
+				}
+			}
+
+		}
+		$this->outputJson($list);
+	}
+
+	/**
+	 * @param integer		$studiengang_kz
+	 * @param integer		$semester
+	 * @param string		$orgform
+	 *
+	 * @return void
+	 */
+	protected function getSemester($studiengang_kz, $semester, $org_form = null)
+	{
+		$link = $studiengang_kz . '/';
+		if ($org_form !== null)
+			$link .= $org_form . '/';
+		$link .= $semester . '/';
+
+
+		$this->load->model('organisation/Gruppe_model', 'GruppeModel');
+
+		$this->GruppeModel->addDistinct();
+		$this->GruppeModel->addSelect("CONCAT(" . $this->GruppeModel->escape($link . 'grp/') . ", gruppe_kurzbz) AS link", false);
+		$this->GruppeModel->addSelect("CONCAT(gruppe_kurzbz, ' (', bezeichnung, ')') AS name", false);
+		$this->GruppeModel->addSelect("TRUE AS leaf", false);
+
+		$this->GruppeModel->addSelect('sort');
+		$this->GruppeModel->addSelect('gruppe_kurzbz');
+
+		$this->GruppeModel->addOrder('sort');
+		$this->GruppeModel->addOrder('gruppe_kurzbz');
+
+		$where = [
+			'studiengang_kz' => $studiengang_kz,
+			'semester' => $semester,
+			'lehre' => true,
+			'sichtbar' => true,
+			'aktiv' => true,
+			'direktinskription' => false
+		];
+
+		if ($org_form !== null)
+			$where['orgform_kurzbz'] = $org_form;
+
+		$result = $this->GruppeModel->loadWhere($where);
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson(getError($result));
+		}
+
+		$list = getData($result) ?: [];
+
+
+		$this->StudiengangModel->addJoin('public.tbl_lehrverband v', 'studiengang_kz');
+		
+		$this->StudiengangModel->addSelect("CONCAT(" . $this->StudiengangModel->escape($link) . ", verband) AS link", false);
+		$this->StudiengangModel->addSelect("CONCAT(UPPER(CONCAT(typ, kurzbz)), '-', semester, verband, (SELECT CASE WHEN bezeichnung IS NULL OR bezeichnung='' THEN ''::TEXT ELSE CONCAT(' (', bezeichnung, ')') END FROM public.tbl_lehrverband WHERE studiengang_kz=v.studiengang_kz AND semester=v.semester AND verband=v.verband ORDER BY gruppe LIMIT 1)) AS name", false);
+		$this->StudiengangModel->addSelect("CASE WHEN MAX(gruppe)='' OR MAX(gruppe)=' ' THEN TRUE ELSE FALSE END AS leaf");
+
+		$this->StudiengangModel->addSelect('verband');
+		
+		$this->StudiengangModel->addOrder('verband');
+
+		$this->StudiengangModel->addGroupBy('link, name, verband');
+		
+		$where = [
+			'v.studiengang_kz' => $studiengang_kz,
+			'v.semester' => $semester,
+			'v.verband !=' => '',
+			'v.aktiv' => true
+		];
+
+		if ($org_form !== null && $semester) // NOTE(chris): on semester 0 show all?
+			$where['v.orgform_kurzbz'] = $org_form;
+
+		$result = $this->StudiengangModel->loadWhere($where);
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson(getError($result));
+		}
+
+		$list = array_merge($list, getData($result) ?: []);
+
+		$this->outputJson($list);
+	}
+
+	/**
+	 * @param integer		$studiengang_kz
+	 * @param integer		$semester
+	 * @param integer		$verband
+	 * @param string		$orgform
+	 *
+	 * @return void
+	 */
+	protected function getVerband($studiengang_kz, $semester, $verband, $org_form = null)
+	{
+		$link = $studiengang_kz . '/';
+		if ($org_form !== null)
+			$link .= $org_form . '/';
+		$link .= $semester . '/'. $verband . '/';
+
+
+		$this->StudiengangModel->addJoin('public.tbl_lehrverband v', 'studiengang_kz');
+		
+		$this->StudiengangModel->addDistinct();
+		$this->StudiengangModel->addSelect("CONCAT(" . $this->StudiengangModel->escape($link) . ", gruppe) AS link", false);
+		$this->StudiengangModel->addSelect("CONCAT(UPPER(CONCAT(typ, kurzbz)), '-', semester, verband, gruppe, (SELECT CASE WHEN bezeichnung IS NULL OR bezeichnung='' THEN ''::TEXT ELSE CONCAT(' (', bezeichnung, ')') END FROM public.tbl_lehrverband WHERE studiengang_kz=v.studiengang_kz AND semester=v.semester AND verband=v.verband AND gruppe=v.gruppe ORDER BY gruppe LIMIT 1)) AS name", false);
+		$this->StudiengangModel->addSelect("TRUE AS leaf", false);
+
+		$this->StudiengangModel->addSelect('gruppe');
+		
+		$this->StudiengangModel->addOrder('gruppe');
+
+		$where = [
+			'v.studiengang_kz' => $studiengang_kz,
+			'v.semester' => $semester,
+			'v.verband' => $verband,
+			'v.gruppe !=' => '',
+			'v.aktiv' => true
+		];
+
+		if ($org_form !== null && $semester) // NOTE(chris): on semester 0 show all?
+			$where['v.orgform_kurzbz'] = $org_form;
+
+		$result = $this->StudiengangModel->loadWhere($where);
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson(getError($result));
+		}
+
+		$list = getData($result) ?: [];
+
+		$this->outputJson($list);
+	}
+
+	/**
+	 * @param string		$link
+	 *
+	 * @return array
+	 */
+	protected function getStdSem($link)
+	{
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
+		/**
+		 * TODO(chris): filter with variable:
+		 * - $number_displayed_past_studiensemester from Variable
+		 * - then: $stsem_obj->getPlusMinus(NULL, $number_displayed_past_studiensemester, 'ende ASC');
+		 */
+		$result = $this->StudiensemesterModel->load();
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->outputJson(getError($result));
+			exit;
+		}
+
+		$studiensemester = getData($result) ?: [];
+		$result = [];
+
+		foreach ($studiensemester as $sem) {
+			$semlink = $link . $sem->studiensemester_kurzbz;
+			$intlink = $semlink . '/interessenten';
+			$result[] = [
+				'name' => $sem->studiensemester_kurzbz,
+				'link' => $semlink,
+				'children' => [
+					[
+						'name' => 'Interessenten',
+						'link' => $intlink,
+						'children' => [
+							[
+								'name' => 'Bewerbung nicht abgeschickt',
+								'link' => $intlink . '/bewerbungnichtabgeschickt',
+								'leaf' => true
+							],
+							[
+								'name' => 'Bewerbung abgeschickt, Status unbestätigt',
+								'link' => $intlink . '/bewerbungabgeschickt',
+								'leaf' => true
+							],
+							[
+								'name' => 'ZGV erfüllt',
+								'link' => $intlink . '/zgv',
+								'leaf' => true
+							],
+							[
+								'name' => 'Status bestätigt',
+								'link' => $intlink . '/statusbestaetigt',
+								'children' => [
+									[
+										'name' => 'Nicht zum Reihungstest angemeldet',
+										'link' => $intlink . '/statusbestaetigt/reihungstestnichtangemeldet',
+										'leaf' => true
+									],
+									[
+										'name' => 'Reihungstest angemeldet',
+										'link' => $intlink . '/statusbestaetigt/reihungstestangemeldet',
+										'leaf' => true
+									]
+								]
+							],
+							[
+								'name' => 'Nicht zum Reihungstest angemeldet',
+								'link' => $intlink . '/reihungstestnichtangemeldet',
+								'leaf' => true
+							],
+							[
+								'name' => 'Reihungstest angemeldet',
+								'link' => $intlink . '/reihungstestangemeldet',
+								'leaf' => true
+							]
+						]
+					],
+					[
+						'name' => 'Bewerber',
+						'link' => $semlink . '/bewerber',
+						'leaf' => true
+					],
+					[
+						'name' => 'Aufgenommen',
+						'link' => $semlink . '/aufgenommen',
+						'leaf' => true
+					],
+					[
+						'name' => 'Warteliste',
+						'link' => $semlink . '/warteliste',
+						'leaf' => true
+					],
+					[
+						'name' => 'Absage',
+						'link' => $semlink . '/absage',
+						'leaf' => true
+					],
+					[
+						'name' => 'Incoming',
+						'link' => $semlink . '/incoming',
+						'leaf' => true
+					]
+				]
+			];
+		}
+
+		return $result;
+	}
+}
diff --git a/application/views/Studentenverwaltung.php b/application/views/Studentenverwaltung.php
index 96cf0974d..f156ed32a 100644
--- a/application/views/Studentenverwaltung.php
+++ b/application/views/Studentenverwaltung.php
@@ -21,32 +21,7 @@
 ?>
 
 	<div id="main">
-		<header class="navbar navbar-expand-lg navbar-dark bg-dark flex-md-nowrap p-0 shadow">
-			<a class="navbar-brand col-md-4 col-lg-3 col-xl-2 me-0 px-3" href="<?= site_url('Studentenverwaltung'); ?>">FHC 4.0</a>
-			<button class="navbar-toggler d-md-none m-1 collapsed" type="button" data-bs-toggle="offcanvas" data-bs-target="#sidebarMenu" aria-controls="sidebarMenu" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button>
-			<fhc-searchbar :searchoptions="searchbaroptions" :searchfunction="searchfunction" class="searchbar w-100"></fhc-searchbar>
-		</header>
-		
-		<div class="container-fluid overflow-hidden">
-			<div class="row h-100">
-				<nav id="sidebarMenu" class="bg-light offcanvas offcanvas-start col-md p-md-0 h-100">
-					<div class="offcanvas-header justify-content-end px-1 d-md-none">
-						<button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" aria-label="Close"></button>
-					</div>
-					<stv-verband @select-verband="onSelectVerband"></stv-verband>
-				</nav>
-				<main class="col-md-8 ms-sm-auto col-lg-9 col-xl-10">
-					<vertical-split>
-						<template #top>
-							<stv-list ref="stvList" v-model:selected="selected"></stv-list>
-						</template>
-						<template #bottom>
-							<stv-details :student="lastSelected"></stv-details>
-						</template>
-					</vertical-split>
-				</main>
-			</div>
-		</div>
+		<router-view></router-view>
 	</div>
 
 <?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
diff --git a/public/js/apps/Studentenverwaltung.js b/public/js/apps/Studentenverwaltung.js
index 9507ba3f5..2fc79fbdb 100644
--- a/public/js/apps/Studentenverwaltung.js
+++ b/public/js/apps/Studentenverwaltung.js
@@ -15,77 +15,25 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import FhcSearchbar from "../components/searchbar/searchbar.js";
-import StvVerband from "../components/Studienverwaltung/Verband.js";
-import StvList from "../components/Studienverwaltung/List.js";
-import StvDetails from "../components/Studienverwaltung/Details.js";
-import VerticalSplit from "../components/verticalsplit/verticalsplit.js";
+import FhcStudentenverwaltung from "../components/Stv/Studentenverwaltung.js";
 import fhcapifactory from "./api/fhcapifactory.js";
 
 Vue.$fhcapi = fhcapifactory;
 
-const app = Vue.createApp({
-	components: {
-		FhcSearchbar,
-		StvVerband,
-		StvList,
-		StvDetails,
-		VerticalSplit
-	},
-	data() {
-		return {
-			selected: [],
-			searchbaroptions: {
-				types: [
-					"person",
-					"student",
-					"prestudent"
-				],
-				actions: {
-					person: {
-						defaultaction: {
-							type: "link",
-							action: function(data) { 
-								return data.profil;
-							}
-						},
-						childactions: [
-							{
-								"label": "testchildaction1",
-								"icon": "fas fa-check-circle",
-								"type": "function",
-								"action": function(data) { 
-									alert('person testchildaction 01 ' + JSON.stringify(data)); 
-								}
-							},
-							{
-								"label": "testchildaction2",
-								"icon": "fas fa-file-csv",
-								"type": "function",
-								"action": function(data) { 
-									alert('person testchildaction 02 ' + JSON.stringify(data)); 
-								}
-							}
-						]
-					}
-				}
-			},
-		}
-	},
-	computed: {
-		lastSelected() {
-			return this.selected[this.selected.length - 1];
-		}
-	},
-	methods: {
-		onSelectVerband(link) {
-			this.$refs.stvList.updateUrl(link);
-		},
-		searchfunction(searchsettings) {
-			return Vue.$fhcapi.Search.search(searchsettings);  
-		}
-	}
+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}/studentenverwaltung`, component: FhcStudentenverwaltung },
+		{ path: `/${ciPath}/studentenverwaltung/:id`, component: FhcStudentenverwaltung }
+	]
 });
 
-app.use(primevue.config.default).mount('#main');
+const app = Vue.createApp();
+
+app
+	.use(router)
+	.use(primevue.config.default)
+	.mount('#main');
 
diff --git a/public/js/components/Studienverwaltung/List.js b/public/js/components/Studienverwaltung/List.js
deleted file mode 100644
index a74512d7e..000000000
--- a/public/js/components/Studienverwaltung/List.js
+++ /dev/null
@@ -1,69 +0,0 @@
-import {CoreFilterCmpt} from "../filter/Filter.js";
-import {CoreRESTClient} from '../../RESTClient.js';
-
-export default {
-	components: {
-		CoreFilterCmpt
-	},
-	props: {
-		selected: Array
-	},
-	emits: [
-		'update:selected'
-	],
-	data() {
-		return {
-			tabulatorOptions: {
-				ajaxURL: CoreRESTClient._generateRouterURI("components/Studentenverwaltung/getStudents"),
-				
-				//autoColumns: true,
-				columns:[
-					{title:"UID", field:"uid"},
-					{title:"TitelPre", field:"titelpre"},
-					{title:"Nachname", field:"nachname"},
-					{title:"Vorname", field:"vorname"},
-					{title:"Wahlname", field:"wahlname", visible:false},
-					// TODO(chris): IMPLEMENT!
-				],
-
-				height: 'auto',
-				selectable: true
-			},
-			tabulatorEvents: [
-				{
-					event: 'rowSelectionChanged',
-					handler: this.rowSelectionChanged
-				}
-			]
-		}
-	},
-	methods: {
-		actionNewPrestudent() {
-			console.log('actionNewPrestudent');
-		},
-		rowSelectionChanged(data) {
-			this.$emit('update:selected', data);
-		},
-		updateUrl(url) {
-			this.$refs.table.tabulator.setData(CoreRESTClient._generateRouterURI(url));
-			console.log(CoreRESTClient._generateRouterURI(url));
-		}
-	},
-	mounted() {
-	},
-	template: `
-	<div class="stv-list h-100 pt-3">
-		<core-filter-cmpt
-			ref="table"
-			:tabulator-options="tabulatorOptions"
-			:tabulator-events="tabulatorEvents"
-			table-only
-			:side-menu="false"
-			reload
-			new-btn-show
-			new-btn-label="Prestudent"
-			@click:new="actionNewPrestudent"
-		>
-		</core-filter-cmpt>
-	</div>`
-};
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
new file mode 100644
index 000000000..d28672f17
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -0,0 +1,117 @@
+/**
+ * Copyright (C) 2022 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import FhcSearchbar from "../searchbar/searchbar.js";
+import VerticalSplit from "../verticalsplit/verticalsplit.js";
+import StvVerband from "./Studentenverwaltung/Verband.js";
+import StvList from "./Studentenverwaltung/List.js";
+import StvDetails from "./Studentenverwaltung/Details.js";
+
+
+export default {
+	components: {
+		FhcSearchbar,
+		StvVerband,
+		StvList,
+		StvDetails,
+		VerticalSplit
+	},
+	data() {
+		return {
+			selected: [],
+			searchbaroptions: {
+				types: [
+					"person",
+					"student",
+					"prestudent"
+				],
+				actions: {
+					person: {
+						defaultaction: {
+							type: "link",
+							action: function(data) { 
+								return data.profil;
+							}
+						},
+						childactions: [
+							{
+								"label": "testchildaction1",
+								"icon": "fas fa-check-circle",
+								"type": "function",
+								"action": function(data) { 
+									alert('person testchildaction 01 ' + JSON.stringify(data)); 
+								}
+							},
+							{
+								"label": "testchildaction2",
+								"icon": "fas fa-file-csv",
+								"type": "function",
+								"action": function(data) { 
+									alert('person testchildaction 02 ' + JSON.stringify(data)); 
+								}
+							}
+						]
+					}
+				}
+			},
+		}
+	},
+	computed: {
+		lastSelected() {
+			return this.selected[this.selected.length - 1];
+		}
+	},
+	methods: {
+		onSelectVerband(link) {
+			this.$refs.stvList.updateUrl(link);
+		},
+		searchfunction(searchsettings) {
+			return Vue.$fhcapi.Search.search(searchsettings);  
+		}
+	},
+	mounted() {
+		if (this.$route.params.id) {
+			this.$refs.stvList.updateUrl('components/stv/students/uid/' + this.$route.params.id);
+		}
+	},
+	template: `
+	<header class="navbar navbar-expand-lg navbar-dark bg-dark flex-md-nowrap p-0 shadow">
+		<a class="navbar-brand col-md-4 col-lg-3 col-xl-2 me-0 px-3" href="<?= site_url('Studentenverwaltung'); ?>">FHC 4.0</a>
+		<button class="navbar-toggler d-md-none m-1 collapsed" type="button" data-bs-toggle="offcanvas" data-bs-target="#sidebarMenu" aria-controls="sidebarMenu" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button>
+		<fhc-searchbar :searchoptions="searchbaroptions" :searchfunction="searchfunction" class="searchbar w-100"></fhc-searchbar>
+	</header>
+	<div class="container-fluid overflow-hidden">
+		<div class="row h-100">
+			<nav id="sidebarMenu" class="bg-light offcanvas offcanvas-start col-md p-md-0 h-100">
+				<div class="offcanvas-header justify-content-end px-1 d-md-none">
+					<button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" aria-label="Close"></button>
+				</div>
+				<stv-verband @select-verband="onSelectVerband"></stv-verband>
+			</nav>
+			<main class="col-md-8 ms-sm-auto col-lg-9 col-xl-10">
+				<vertical-split>
+					<template #top>
+						<stv-list ref="stvList" v-model:selected="selected"></stv-list>
+					</template>
+					<template #bottom>
+						<stv-details :student="lastSelected"></stv-details>
+					</template>
+				</vertical-split>
+			</main>
+		</div>
+	</div>`
+};
diff --git a/public/js/components/Stv/Studentenverwaltung/Details.js b/public/js/components/Stv/Studentenverwaltung/Details.js
new file mode 100644
index 000000000..6072cb3b3
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details.js
@@ -0,0 +1,30 @@
+import DetailsDetails from './Details/Details.js';
+import DetailsNotizen from './Details/Notizen.js';
+
+export default {
+	components: {
+		DetailsDetails,
+		DetailsNotizen
+	},
+	props: {
+		student: Object
+	},
+	data() {
+		return {
+			component: 'DetailsDetails',
+			tabs: {
+				DetailsDetails: 'Details',
+				DetailsNotizen: 'Notizen'
+			}
+		}
+	},
+	template: `
+	<div class="stv-details h-100 pb-3">
+		<ul class="nav nav-tabs">
+			<li v-for="(title, comp) in tabs" class="nav-item" :key="comp">
+				<a class="nav-link" :class="{active: comp == component}" :aria-current="comp == component ? 'page' : ''" href="#" @click="component=comp">{{title}}</a>
+			</li>
+		</ul>
+		<component :is="component" :student="student"></component>
+	</div>`
+};
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
new file mode 100644
index 000000000..ece956b64
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
@@ -0,0 +1,87 @@
+export default {
+	props: {
+		student: Object
+	},
+	data() {
+		return {
+			person_id: '',
+			bpk: '',
+			anrede: '',
+			titelpre: '',
+			titelpost: '',
+			nachname: '',
+			vorname: '',
+			vornamen: '',
+			wahlname: '',
+			gebdatum: '',
+			gebort: '',
+			gebnation: ''
+		}
+	},
+	watch: {
+		student(n) {
+			this.person_id = n.person_id;
+			this.bpk = n.bpk;
+			this.anrede = n.anrede;
+			this.titelpre = n.titelpre;
+			this.titelpost = n.titelpost;
+			this.nachname = n.nachname;
+			this.vorname = n.vorname;
+			this.vornamen = n.vornamen;
+			this.wahlname = n.wahlname;
+			this.gebdatum = n.gebdatum;
+			// TODO(chris): gebdatum > datepicker
+			// TODO(chris): gebort & getnation?
+		}
+	},
+	template: `
+	<div class="stv-details-details h-100 pb-3">
+		<fieldset>
+			<legend>Person</legend>
+			<div class="row mb-3">
+				<label for="stv-details-person_id" class="col-sm-1 col-form-label">Person ID</label>
+				<div class="col-sm-3">
+					<input id="stv-details-person_id" type="text" class="form-control" v-model="person_id">
+				</div>
+				<label for="stv-details-bpk" class="col-sm-1 col-form-label">BPK</label>
+				<div class="col-sm-3">
+					<input id="stv-details-bpk" type="text" class="form-control" v-model="bpk">
+				</div>
+			</div>
+			<div class="row mb-3">
+				<label for="stv-details-anrede" class="col-sm-1 col-form-label">Anrede</label>
+				<div class="col-sm-3">
+					<input id="stv-details-anrede" type="text" class="form-control" v-model="anrede">
+				</div>
+				<label for="stv-details-titelpre" class="col-sm-1 col-form-label">Titel Pre</label>
+				<div class="col-sm-3">
+					<input id="stv-details-titelpre" type="text" class="form-control" v-model="titelpre">
+				</div>
+				<label for="stv-details-titelpost" class="col-sm-1 col-form-label">Titel Post</label>
+				<div class="col-sm-3">
+					<input id="stv-details-titelpost" type="text" class="form-control" v-model="titelpost">
+				</div>
+			</div>
+			<div class="row mb-3">
+				<label for="stv-details-wahlname" class="col-sm-1 col-form-label">Wahlname</label>
+				<div class="col-sm-3">
+					<input id="stv-details-wahlname" type="text" class="form-control" v-model="wahlname">
+				</div>
+			</div>
+			<div class="row mb-3">
+				<label for="stv-details-gebdatum" class="col-sm-1 col-form-label">Geburtsdatum</label>
+				<div class="col-sm-3">
+					<input id="stv-details-gebdatum" type="text" class="form-control" v-model="gebdatum">
+				</div>
+				<label for="stv-details-gebort" class="col-sm-1 col-form-label">Geburtsort</label>
+				<div class="col-sm-3">
+					<input id="stv-details-gebort" type="text" class="form-control" v-model="gebort">
+				</div>
+				<label for="stv-details-gebnation" class="col-sm-1 col-form-label">Geburtsnation</label>
+				<div class="col-sm-3">
+					<input id="stv-details-gebnation" type="text" class="form-control" v-model="gebnation">
+				</div>
+			</div>
+		</fieldset>
+	</div>`
+};
\ No newline at end of file
diff --git a/public/js/components/Studienverwaltung/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
similarity index 51%
rename from public/js/components/Studienverwaltung/Details.js
rename to public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
index f119b34e4..f94468b4c 100644
--- a/public/js/components/Studienverwaltung/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
@@ -3,7 +3,7 @@ export default {
 		student: Object
 	},
 	template: `
-	<div class="stv-details h-100 pb-3">
-		{{student}}
+	<div class="stv-details-details h-100 pb-3">
+		NOT YET IMPLEMENTED
 	</div>`
 };
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
new file mode 100644
index 000000000..c6eb097d2
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -0,0 +1,114 @@
+import {CoreFilterCmpt} from "../../filter/Filter.js";
+import {CoreRESTClient} from '../../../RESTClient.js';
+
+export default {
+	components: {
+		CoreFilterCmpt
+	},
+	props: {
+		selected: Array
+	},
+	emits: [
+		'update:selected'
+	],
+	data() {
+		return {
+			tabulatorOptions: {
+				columns:[
+					{title:"UID", field:"uid"},
+					{title:"TitelPre", field:"titelpre"},
+					{title:"Nachname", field:"nachname"},
+					{title:"Vorname", field:"vorname"},
+					{title:"Wahlname", field:"wahlname", visible:false},
+					{title:"Vornamen", field:"vornamen", visible:false},
+					{title:"TitelPost", field:"titelpost"},
+					{title:"SVNR", field:"svnr"},
+					{title:"Ersatzkennzeichen", field:"ersatzkennzeichen"},
+					{title:"Geburtsdatum", field:"geburtsdatum_iso"},
+					{title:"Geschlecht", field:"geschlecht"},
+					{title:"Sem.", field:"semester"},
+					{title:"Verb.", field:"verband"},
+					{title:"Grp.", field:"gruppe"},
+					{title:"Studiengang", field:"studiengang"},
+					{title:"Studiengang_kz", field:"studiengang_kz", visible:false},
+					{title:"Personenkennzeichen", field:"matrikelnummer"},
+					{title:"PersonID", field:"person_id"},
+					{title:"Status", field:"status"},
+					{title:"Status Datum", field:"status_datum_iso", visible:false},
+					{title:"Status Bestaetigung", field:"status_bestaetigung_iso", visible:false},
+					{title:"Status Datum ISO", field:"status_datum_iso", visible:false},
+					{title:"Status Bestaetigung ISO", field:"status_bestaetigung_iso", visible:false},
+					{title:"EMail (Privat)", field:"mail_privat", visible:false},
+					{title:"EMail (Intern)", field:"mail_intern", visible:false},
+					{title:"Anmerkungen", field:"anmerkungen", visible:false},
+					{title:"AnmerkungPre", field:"anmerkungpre", visible:false},
+					{title:"OrgForm", field:"orgform"},
+					{title:"Aufmerksamdurch", field:"orgform", visible:false},
+					{title:"Gesamtpunkte", field:"punkte", visible:false},
+					{title:"Aufnahmegruppe", field:"aufnahmegruppe_kurzbz", visible:false},
+					{title:"Dual", field:"dual_bezeichnung", visible:false},
+					{title:"Matrikelnummer", field:"matr_nr", visible:false},
+					{title:"Studienplan", field:"studienplan_bezeichnung"},
+					{title:"PreStudentInnenID", field:"prestudent_id"},
+					{title:"Priorität", field:"priorisierung_realtiv"},
+					{title:"Mentor", field:"mentor", visible:false},
+					{title:"Aktiv", field:"aktiv", visible:false},
+					{title:"GeburtsdatumISO", field:"geburtsdatum_iso", visible:false},
+				],
+
+				layout: 'fitDataFill',
+				layoutColumnsOnNewData: false,
+				height: 'auto',
+				selectable: true,
+				//persistence: true
+			},
+			tabulatorEvents: [
+				{
+					event: 'rowSelectionChanged',
+					handler: this.rowSelectionChanged
+				}
+			]
+		}
+	},
+	methods: {
+		actionNewPrestudent() {
+			console.log('actionNewPrestudent');
+		},
+		rowSelectionChanged(data) {
+			this.$emit('update:selected', data);
+		},
+		updateUrl(url) {
+			this.$refs.table.tabulator.on("dataProcessed", () => {
+				let rows = this.$refs.table.tabulator.getRows();
+				if (rows.length && rows.length == 1) {
+					console.log();
+					this.$refs.table.tabulator.selectRow();
+				}
+			});
+			
+			if (!this.$refs.table.tableBuilt)
+				this.$refs.table.tabulator.on("tableBuilt", () => {
+					this.$refs.table.tabulator.setData(CoreRESTClient._generateRouterURI(url));
+				});
+			else
+				this.$refs.table.tabulator.setData(CoreRESTClient._generateRouterURI(url));
+		}
+	},
+	mounted() {
+	},
+	template: `
+	<div class="stv-list h-100 pt-3">
+		<core-filter-cmpt
+			ref="table"
+			:tabulator-options="tabulatorOptions"
+			:tabulator-events="tabulatorEvents"
+			table-only
+			:side-menu="false"
+			reload
+			new-btn-show
+			new-btn-label="Prestudent"
+			@click:new="actionNewPrestudent"
+		>
+		</core-filter-cmpt>
+	</div>`
+};
\ No newline at end of file
diff --git a/public/js/components/Studienverwaltung/Verband.js b/public/js/components/Stv/Studentenverwaltung/Verband.js
similarity index 53%
rename from public/js/components/Studienverwaltung/Verband.js
rename to public/js/components/Stv/Studentenverwaltung/Verband.js
index 630e583a2..b670d0875 100644
--- a/public/js/components/Studienverwaltung/Verband.js
+++ b/public/js/components/Stv/Studentenverwaltung/Verband.js
@@ -1,4 +1,4 @@
-import {CoreRESTClient} from '../../RESTClient.js';
+import {CoreRESTClient} from '../../../RESTClient.js';
 
 export default {
 	components: {
@@ -17,55 +17,50 @@ export default {
 	methods: {
 		onExpandTreeNode(node) {
 			if (!node.children) {
-				let url = '';
-				if (node.data.studiengang_kz) {
-					url = "getStudiengang/" + node.data.studiengang_kz;
-				}
-
-				if (url) {
+				if (node.data.link) {
 					this.loading = true;
 					CoreRESTClient
-						.get("components/Studentenverwaltung/" + url)
+						.get("components/stv/verband/" + node.data.link)
+						.then(result => result.data)
 						.then(result => {
-							const subNodes = result.data.map(this.mapResultToTreeData);
+							const subNodes = result.map(this.mapResultToTreeData);
 							node.children = subNodes;
 							this.loading = false;
+						})
+						.catch(error => {
+							console.error(error);
 						});
 				}
 			}
 		},
 		onSelectTreeNode(node) {
-			if (node.link)
-				this.$emit('selectVerband', node.link);
+			if (node.data.link)
+				this.$emit('selectVerband', 'components/stv/students/' + node.data.link);
 		},
 		mapResultToTreeData(el) {
 			const cp = {
+				key: ("" + el.link).replace('/', '-'),
 				data: el
 			};
-			if (el.studiengang_kz !== undefined) {
-				cp.key = el.studiengang_kz;
-				cp.data.name = el.kurzbzlang + ' (' + (el.typ + el.kurzbz).toUpperCase() + ') - ' + el.bezeichnung;
-				cp.leaf = false;
-				cp.link = 'components/Studentenverwaltung/getStudents/' + el.studiengang_kz;
-			}
+
 			if (el.children)
 				cp.children = el.children.map(this.mapResultToTreeData);
 			else
 				cp.leaf = el.leaf || false;
+
 			return cp;
 		}
 	},
 	mounted() {
 		CoreRESTClient
-			.get("components/Studentenverwaltung")
+			.get("components/stv/verband")
 			.then(result => result.data)
 			.then(result => {
-				if(CoreRESTClient.isError(result)) {
-					console.error(CoreRESTClient.getError(result));
-				} else if (CoreRESTClient.hasData(result)) {
-					this.nodes = CoreRESTClient.getData(result).map(this.mapResultToTreeData);
-				}
+				this.nodes = result.map(this.mapResultToTreeData);
 				this.loading = false;
+			})
+			.catch(error => {
+				console.error(error);
 			});
 	},
 	template: `

From fa3a718ad4e0e8859e5e453ef327277e2d6b012f Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Thu, 21 Sep 2023 14:40:05 +0200
Subject: [PATCH 0115/1461] Added getAutocompleteSuggestions method to OE Model

Get OEs by eventQuery string. Use with autocomplete event queries.
---
 .../organisation/Organisationseinheit_model.php  | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/application/models/organisation/Organisationseinheit_model.php b/application/models/organisation/Organisationseinheit_model.php
index bec4aee47..4a64ee055 100644
--- a/application/models/organisation/Organisationseinheit_model.php
+++ b/application/models/organisation/Organisationseinheit_model.php
@@ -188,4 +188,20 @@ class Organisationseinheit_model extends DB_Model
         }
         return $this->loadWhere($condition);
     }
+
+	/**
+	 * Get OEs by eventQuery string. Use with autocomplete event queries.
+	 * @param $eventQuery String
+	 * @return array
+	 */
+	public function getAutocompleteSuggestions($eventQuery)
+	{
+		$this->addSelect('oe_kurzbz');
+		$this->addSelect('organisationseinheittyp_kurzbz, oe_kurzbz, bezeichnung, aktiv, lehre');
+		$this->addOrder('organisationseinheittyp_kurzbz, bezeichnung');
+
+		return $this->loadWhere("
+			oe_kurzbz ILIKE '%". $this->escapeLike($eventQuery). "%'
+		");
+	}
 }

From 4e11e12c9962fad6bf6d7f574f2922ed97e2fcef Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Thu, 21 Sep 2023 14:40:50 +0200
Subject: [PATCH 0116/1461] Removed aktiv column from SoftwareManagement Filter

Not used anymore.
---
 system/filtersupdate.php | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/system/filtersupdate.php b/system/filtersupdate.php
index 0fe7e11c5..909dfc601 100644
--- a/system/filtersupdate.php
+++ b/system/filtersupdate.php
@@ -1273,7 +1273,6 @@ $filters = array(
 					{"name": "beschreibung"},
 					{"name": "hersteller"},
 					{"name": "os"},
-					{"name": "aktiv"},
 					{"name": "softwarestatus_kurzbz"}
 				],
 				"filters": []
@@ -1304,6 +1303,30 @@ $filters = array(
 			}
 		',
 		'oe_kurzbz' => null,
+	),
+	array(
+		'app' => 'core',
+		'dataset_name' => 'lizenzserverVerwaltung',
+		'filter_kurzbz' => 'LizenzserverVerwaltung',
+		'description' => '{Lizenzserver Verwaltung}',
+		'sort' => 1,
+		'default_filter' => true,
+		'filter' => '
+			{
+				"name": "LizenzserverVerwaltung",
+				"columns": [
+					{"name": "lizenzserver_kurzbz"},
+					{"name": "bezeichnung"},
+					{"name": "macadresse"},
+					{"name": "ipadresse"},
+					{"name": "ansprechpartner"},
+					{"name": "anmerkung"},
+					{"name": "location"}
+				],
+				"filters": []
+			}
+		',
+		'oe_kurzbz' => null,
 	)
 );
 

From 9eeaeb2a14412dba8a225f42743ef98aabb788ac Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 27 Sep 2023 09:16:42 +0200
Subject: [PATCH 0117/1461] Details Person

---
 .../controllers/components/stv/Student.php    |  94 ++++++
 application/views/Studentenverwaltung.php     |   3 +-
 composer.json                                 |  26 +-
 public/css/components/vue-datepicker.css      |   2 +
 public/js/components/Form/Upload/Image.js     |  62 ++++
 .../Studentenverwaltung/Details/Details.js    | 275 ++++++++++++++----
 .../Stv/Studentenverwaltung/List.js           |   1 -
 public/js/components/vueDatepicker.js.php     |  12 +
 8 files changed, 409 insertions(+), 66 deletions(-)
 create mode 100644 application/controllers/components/stv/Student.php
 create mode 100644 public/css/components/vue-datepicker.css
 create mode 100644 public/js/components/Form/Upload/Image.js
 create mode 100644 public/js/components/vueDatepicker.js.php

diff --git a/application/controllers/components/stv/Student.php b/application/controllers/components/stv/Student.php
new file mode 100644
index 000000000..6268f22e0
--- /dev/null
+++ b/application/controllers/components/stv/Student.php
@@ -0,0 +1,94 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Student extends FHC_Controller
+{
+	public function __construct()
+	{
+		// TODO(chris): access!
+		parent::__construct();
+	}
+
+	public function getPerson($person_id)
+	{
+		$this->load->model('person/Person_model', 'PersonModel');
+
+		$result = $this->PersonModel->load($person_id);
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->outputJson(getError($result));
+		} elseif (!hasData($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_NOT_FOUND);
+			$this->outputJson('NOT FOUND');
+		} else {
+			$this->outputJson(current(getData($result)));
+		}
+	}
+
+	public function getStudent($student_uid)
+	{
+		// TODO(chris): this is wrong
+		$this->load->model('crm/Student_model', 'StudentModel');
+
+		$result = $this->StudentModel->load([$student_uid]);
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->outputJson(getError($result));
+		} elseif (!hasData($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_NOT_FOUND);
+			$this->outputJson('NOT FOUND');
+		} else {
+			$this->outputJson(current(getData($result)));
+		}
+	}
+
+	public function getNations()
+	{
+		$this->load->model('codex/Nation_model', 'NationModel');
+
+		$this->NationModel->addOrder('kurztext');
+
+		$result = $this->NationModel->load();
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->outputJson(getError($result));
+		} else {
+			$this->outputJson(getData($result) ?: []);
+		}
+	}
+
+	public function getSprachen()
+	{
+		$this->load->model('system/Sprache_model', 'SpracheModel');
+
+		$this->SpracheModel->addOrder('sprache');
+
+		$result = $this->SpracheModel->load();
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->outputJson(getError($result));
+		} else {
+			$this->outputJson(getData($result) ?: []);
+		}
+	}
+
+	public function getGeschlechter()
+	{
+		$this->load->model('person/Geschlecht_model', 'GeschlechtModel');
+
+		$this->GeschlechtModel->addOrder('sort');
+		$this->GeschlechtModel->addOrder('geschlecht');
+
+		$this->GeschlechtModel->addSelect('*');
+		$this->GeschlechtModel->addSelect("bezeichnung_mehrsprachig[(SELECT index FROM public.tbl_sprache WHERE sprache=" . $this->GeschlechtModel->escape(DEFAULT_LANGUAGE) . " LIMIT 1)] AS bezeichnung");
+
+		$result = $this->GeschlechtModel->load();
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->outputJson(getError($result));
+		} else {
+			$this->outputJson(getData($result) ?: []);
+		}
+	}
+}
diff --git a/application/views/Studentenverwaltung.php b/application/views/Studentenverwaltung.php
index f156ed32a..ff6f5bfae 100644
--- a/application/views/Studentenverwaltung.php
+++ b/application/views/Studentenverwaltung.php
@@ -10,7 +10,8 @@
 		'tabulator5' => true,
 		'phrases' => [],
 		'customCSSs' => [
-			'public/css/Studentenverwaltung.css'
+			'public/css/Studentenverwaltung.css',
+			'public/css/components/vue-datepicker.css'
 		],
 		'customJSModules' => [
 			'public/js/apps/Studentenverwaltung.js'
diff --git a/composer.json b/composer.json
index 825ed5625..a2fd38d68 100644
--- a/composer.json
+++ b/composer.json
@@ -26,6 +26,28 @@
 		"wiki": "https://wiki.fhcomplete.info/doku.php"
 	},
 	"repositories": [
+		{
+			"type": "package",
+			"package": {
+				"name": "vuepic/vue-datepicker-js",
+				"version": "4.0.0",
+				"dist": {
+					"url": "https://unpkg.com/@vuepic/vue-datepicker@4.0.0/dist/vue-datepicker.iife.js",
+					"type": "file"
+				}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+				"name": "vuepic/vue-datepicker-css",
+				"version": "4.0.0",
+				"dist": {
+					"url": "https://unpkg.com/@vuepic/vue-datepicker@4.0.0/dist/main.css",
+					"type": "file"
+				}
+			}
+		},
 		{
 			"type": "package",
 			"package": {
@@ -420,7 +442,9 @@
 		"twbs/bootstrap5": "5.1.*",
 
 		"vuejs/vuejs3": "3.2.33",
-		"vuejs/vuerouter4": "4.1.3"
+		"vuejs/vuerouter4": "4.1.3",
+		"vuepic/vue-datepicker-js": "4.*",
+		"vuepic/vue-datepicker-css": "4.*"
 	},
 	"config": {
 		"bin-dir": "vendor/bin"
diff --git a/public/css/components/vue-datepicker.css b/public/css/components/vue-datepicker.css
new file mode 100644
index 000000000..0dd87bb0c
--- /dev/null
+++ b/public/css/components/vue-datepicker.css
@@ -0,0 +1,2 @@
+@import '../../../vendor/vuepic/vue-datepicker-css/main.css';
+
diff --git a/public/js/components/Form/Upload/Image.js b/public/js/components/Form/Upload/Image.js
new file mode 100644
index 000000000..99128f9c5
--- /dev/null
+++ b/public/js/components/Form/Upload/Image.js
@@ -0,0 +1,62 @@
+export default {
+	emits: [
+		'update:modelValue'
+	],
+	props: {
+		modelValue: String
+	},
+	computed: {
+		valueAsBase64DataString() {
+			if (!this.modelValue || this.modelValue.substring(0, 10) == 'data:image')
+				return this.modelValue;
+			return 'data:image/jpeg;charset=utf-8;base64,' + this.modelValue;
+		}
+	},
+	methods: {
+		openUploadDialog() {
+			this.$refs.fileInput.click();
+		},
+		pickFile() {
+			let file = this.$refs.fileInput.files;
+			if (file && file[0]) {
+				let reader = new FileReader();
+				reader.onload = e => {
+					this.$emit('update:modelValue', e.target.result);
+				}
+				reader.readAsDataURL(file[0]);
+			}
+		},
+		deleteImage() {
+			this.$emit('update:modelValue', '');
+		}
+	},
+	template: `
+	<div class="form-upload-image">
+		<template v-if="modelValue">
+			<img class="img-thumbnail" :src="valueAsBase64DataString" />
+			<div class="fotobutton">
+				<div class="d-grid gap-2 d-md-flex">
+					<button type="button" class="btn btn-outline-dark btn-sm" @click="deleteImage">
+						<i class="fa fa-close"></i>
+					</button>
+					<button type="button" class="btn btn-outline-dark btn-sm" @click="openUploadDialog">
+						<i class="fa fa-pen"></i>
+					</button>
+				</div>
+			</div>
+		</template>
+		<template v-else>
+			<slot #placeholder>
+				<svg class="bd-placeholder-img img-thumbnail" xmlns="http://www.w3.org/2000/svg" role="img" aria-label="A generic square placeholder image with a white border around it, making it resemble a photograph taken with an old instant camera: 200x200" preserveAspectRatio="xMidYMid slice" focusable="false"><title>A generic square placeholder image with a white border around it, making it resemble a photograph taken with an old instant camera</title><rect width="100%" height="100%" fill="#868e96"></rect><text x="50%" y="50%" fill="#dee2e6" dy=".3em"></text></svg>
+				<div class="fotobutton-visible">
+					<div class="d-grid gap-2 d-md-flex">
+						<button type="button" class="btn btn-outline-dark btn-sm" @click="openUploadDialog">
+							<i class="fa fa-pen"></i>
+						</button>
+					</div>
+				</div>
+			</slot>
+		</template>
+		<input class="d-none" type="file" ref="fileInput" @input="pickFile" accept="image/*">
+	</div>`
+}
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
index ece956b64..f6d7d6b40 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
@@ -1,86 +1,235 @@
+import VueDatePicker from '../../../vueDatepicker.js.php';
+import FormUploadImage from '../../../Form/Upload/Image.js';
+import {CoreRESTClient} from '../../../../RESTClient.js';
+
 export default {
+	components: {
+		VueDatePicker,
+		FormUploadImage
+	},
 	props: {
 		student: Object
 	},
 	data() {
 		return {
-			person_id: '',
-			bpk: '',
-			anrede: '',
-			titelpre: '',
-			titelpost: '',
-			nachname: '',
-			vorname: '',
-			vornamen: '',
-			wahlname: '',
-			gebdatum: '',
-			gebort: '',
-			gebnation: ''
+			nations: [],
+			sprachen: [],
+			geschlechter: [],
+			familienstaende: {
+				"": "--keine Auswahl--",
+				"g": "geschieden",
+				"l": "ledig",
+				"v": "verheiratet",
+				"w": "verwitwet"
+			},
+			person: null,
+			studentIn: null
 		}
 	},
 	watch: {
 		student(n) {
-			this.person_id = n.person_id;
-			this.bpk = n.bpk;
-			this.anrede = n.anrede;
-			this.titelpre = n.titelpre;
-			this.titelpost = n.titelpost;
-			this.nachname = n.nachname;
-			this.vorname = n.vorname;
-			this.vornamen = n.vornamen;
-			this.wahlname = n.wahlname;
-			this.gebdatum = n.gebdatum;
-			// TODO(chris): gebdatum > datepicker
-			// TODO(chris): gebort & getnation?
+			CoreRESTClient
+				.get('components/stv/Student/getPerson/' + this.student.person_id)
+				.then(result => result.data)
+				.then(result => {
+					this.person = result;
+					if (!this.person.familienstand)
+						this.person.familienstand = '';
+				})
+				.catch(err => {
+					console.error(err.response.data || err.message);
+				});
+			CoreRESTClient
+				.get('components/stv/Student/getStudent/' + this.student.uid)
+				.then(result => result.data)
+				.then(result => {
+					// TODO(chris): IMPLEMENT HERE!
+					console.log(result);
+					this.studentIn = result;
+				})
+				.catch(err => {
+					console.error(err.response.data || err.message);
+				});
 		}
 	},
+	created() {
+		CoreRESTClient
+			.get('components/stv/Student/getNations')
+			.then(result => {
+				this.nations = result.data;
+			})
+			.catch(err => {
+				console.error(err.response.data || err.message);
+			});
+		CoreRESTClient
+			.get('components/stv/Student/getSprachen')
+			.then(result => {
+				this.sprachen = result.data;
+			})
+			.catch(err => {
+				console.error(err.response.data || err.message);
+			});
+		CoreRESTClient
+			.get('components/stv/Student/getGeschlechter')
+			.then(result => {
+				this.geschlechter = result.data;
+			})
+			.catch(err => {
+				console.error(err.response.data || err.message);
+			});
+	},
 	template: `
 	<div class="stv-details-details h-100 pb-3">
 		<fieldset>
 			<legend>Person</legend>
-			<div class="row mb-3">
-				<label for="stv-details-person_id" class="col-sm-1 col-form-label">Person ID</label>
-				<div class="col-sm-3">
-					<input id="stv-details-person_id" type="text" class="form-control" v-model="person_id">
+			<template v-if="person">
+				<div class="row mb-3">
+					<label for="stv-details-person_id" class="col-sm-1 col-form-label">Person ID</label>
+					<div class="col-sm-3">
+						<input id="stv-details-person_id" type="text" class="form-control" v-model="person.person_id">
+					</div>
+					<label for="stv-details-bpk" class="col-sm-1 col-form-label">BPK</label>
+					<div class="col-sm-3">
+						<input id="stv-details-bpk" type="text" class="form-control" v-model="person.bpk">
+					</div>
 				</div>
-				<label for="stv-details-bpk" class="col-sm-1 col-form-label">BPK</label>
-				<div class="col-sm-3">
-					<input id="stv-details-bpk" type="text" class="form-control" v-model="bpk">
+				<div class="row mb-3">
+					<label for="stv-details-anrede" class="col-sm-1 col-form-label">Anrede</label>
+					<div class="col-sm-3">
+						<input id="stv-details-anrede" type="text" class="form-control" v-model="person.anrede">
+					</div>
+					<label for="stv-details-titelpre" class="col-sm-1 col-form-label">Titel Pre</label>
+					<div class="col-sm-3">
+						<input id="stv-details-titelpre" type="text" class="form-control" v-model="person.titelpre">
+					</div>
+					<label for="stv-details-titelpost" class="col-sm-1 col-form-label">Titel Post</label>
+					<div class="col-sm-3">
+						<input id="stv-details-titelpost" type="text" class="form-control" v-model="person.titelpost">
+					</div>
 				</div>
+				<div class="row mb-3">
+					<label for="stv-details-nachname" class="col-sm-1 col-form-label">Nachname</label>
+					<div class="col-sm-3">
+						<input id="stv-details-nachname" type="text" class="form-control" v-model="person.nachname">
+					</div>
+					<label for="stv-details-vorname" class="col-sm-1 col-form-label">Vorname</label>
+					<div class="col-sm-3">
+						<input id="stv-details-vorname" type="text" class="form-control" v-model="person.vorname">
+					</div>
+					<label for="stv-details-vornamen" class="col-sm-1 col-form-label">Vornamen</label>
+					<div class="col-sm-3">
+						<input id="stv-details-vornamen" type="text" class="form-control" v-model="person.vornamen">
+					</div>
+				</div>
+				<div class="row mb-3">
+					<label for="stv-details-wahlname" class="col-sm-1 col-form-label">Wahlname</label>
+					<div class="col-sm-3">
+						<input id="stv-details-wahlname" type="text" class="form-control" v-model="person.wahlname">
+					</div>
+				</div>
+				<div class="row mb-3">
+					<label for="dp-input-stv-details-gebdatum" class="col-sm-1 col-form-label">Geburtsdatum</label>
+					<div class="col-sm-3">
+						<vue-date-picker uid="stv-details-gebdatum" v-model="person.gebdatum" :clearable="false" no-today auto-apply :enable-time-picker="false" format="dd.MM.yyyy" preview-format="dd.MM.yyyy"></vue-date-picker>
+					</div>
+					<label for="stv-details-gebort" class="col-sm-1 col-form-label">Geburtsort</label>
+					<div class="col-sm-3">
+						<input id="stv-details-gebort" type="text" class="form-control" v-model="person.gebort">
+					</div>
+					<label for="stv-details-geburtsnation" class="col-sm-1 col-form-label">Geburtsnation</label>
+					<div class="col-sm-3">
+						<select id="stv-details-geburtsnation" class="form-control" v-model="person.geburtsnation">
+							<option value="">-- keine Auswahl --</option>
+							<!-- TODO(chris): gesperrte nationen können nicht ausgewählt werden! Um das zu realisieren müsste man ein pseudo select machen -->
+							<option v-for="nation in nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
+						</select>
+					</div>
+				</div>
+				<div class="row mb-3">
+					<label for="stv-details-svnr" class="col-sm-1 col-form-label">SVNR</label>
+					<div class="col-sm-3">
+						<input id="stv-details-svnr" type="text" class="form-control" v-model="person.svnr">
+					</div>
+					<label for="stv-details-ersatzkennzeichen" class="col-sm-1 col-form-label">Ersatzkennzeichen</label>
+					<div class="col-sm-3">
+						<input id="stv-details-ersatzkennzeichen" type="text" class="form-control" v-model="person.ersatzkennzeichen">
+					</div>
+				</div>
+				<div class="row mb-3">
+					<label for="stv-details-staatsbuergerschaft" class="col-sm-1 col-form-label">Staatsbürgerschaft</label>
+					<div class="col-sm-3">
+						<select id="stv-details-staatsbuergerschaft" class="form-control" v-model="person.staatsbuergerschaft">
+							<option value="">-- keine Auswahl --</option>
+							<!-- TODO(chris): gesperrte nationen können nicht ausgewählt werden! Um das zu realisieren müsste man ein pseudo select machen -->
+							<option v-for="nation in nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
+						</select>
+					</div>
+					<label for="stv-details-matr_nr" class="col-sm-1 col-form-label">Matrikelnummer</label>
+					<div class="col-sm-3">
+						<input id="stv-details-matr_nr" type="text" class="form-control" v-model="person.matr_nr">
+					</div>
+					<label for="stv-details-sprache" class="col-sm-1 col-form-label">Sprache</label>
+					<div class="col-sm-3">
+						<select id="stv-details-sprache" class="form-control" v-model="person.sprache">
+							<option v-for="sprache in sprachen" :key="sprache.sprache" :value="sprache.sprache">{{sprache.sprache}}</option>
+						</select>
+					</div>
+				</div>
+				<div class="row mb-3">
+					<label for="stv-details-geschlecht" class="col-sm-1 col-form-label">Geschlecht</label>
+					<div class="col-sm-3">
+						<select id="stv-details-geschlecht" class="form-control" v-model="person.geschlecht">
+							<option v-for="geschlecht in geschlechter" :key="geschlecht.geschlecht" :value="geschlecht.geschlecht">{{geschlecht.bezeichnung}}</option>
+						</select>
+					</div>
+					<label for="stv-details-familienstand" class="col-sm-1 col-form-label">Familienstand</label>
+					<div class="col-sm-3">
+						<select id="stv-details-familienstand" class="form-control" v-model="person.familienstand">
+							<option v-for="(bezeichnung, key) in familienstaende" :key="key" :value="key">{{bezeichnung}}</option>
+						</select>
+					</div>
+				</div>
+				<div class="row mb-3">
+					<label for="stv-details-foto" class="col-sm-1 col-form-label">Foto</label>
+					<div class="col-sm-3">
+						<form-upload-image id="stv-details-foto" v-model="person.foto"></form-upload-image>
+					</div>
+					<label for="stv-details-anmerkung" class="col-sm-1 col-form-label">Anmerkung</label>
+					<div class="col-sm-3">
+						<textarea id="stv-details-anmerkung" class="form-control" v-text="anmerkung"></textarea>
+					</div>
+					<label for="stv-details-homepage" class="col-sm-1 col-form-label">Homepage</label>
+					<div class="col-sm-3">
+						<input id="stv-details-homepage" type="text" class="form-control" v-model="person.homepage">
+					</div>
+				</div>
+			</template>
+			<div v-else>
+				Loading...
 			</div>
-			<div class="row mb-3">
-				<label for="stv-details-anrede" class="col-sm-1 col-form-label">Anrede</label>
-				<div class="col-sm-3">
-					<input id="stv-details-anrede" type="text" class="form-control" v-model="anrede">
-				</div>
-				<label for="stv-details-titelpre" class="col-sm-1 col-form-label">Titel Pre</label>
-				<div class="col-sm-3">
-					<input id="stv-details-titelpre" type="text" class="form-control" v-model="titelpre">
-				</div>
-				<label for="stv-details-titelpost" class="col-sm-1 col-form-label">Titel Post</label>
-				<div class="col-sm-3">
-					<input id="stv-details-titelpost" type="text" class="form-control" v-model="titelpost">
-				</div>
-			</div>
-			<div class="row mb-3">
-				<label for="stv-details-wahlname" class="col-sm-1 col-form-label">Wahlname</label>
-				<div class="col-sm-3">
-					<input id="stv-details-wahlname" type="text" class="form-control" v-model="wahlname">
-				</div>
-			</div>
-			<div class="row mb-3">
-				<label for="stv-details-gebdatum" class="col-sm-1 col-form-label">Geburtsdatum</label>
-				<div class="col-sm-3">
-					<input id="stv-details-gebdatum" type="text" class="form-control" v-model="gebdatum">
-				</div>
-				<label for="stv-details-gebort" class="col-sm-1 col-form-label">Geburtsort</label>
-				<div class="col-sm-3">
-					<input id="stv-details-gebort" type="text" class="form-control" v-model="gebort">
-				</div>
-				<label for="stv-details-gebnation" class="col-sm-1 col-form-label">Geburtsnation</label>
-				<div class="col-sm-3">
-					<input id="stv-details-gebnation" type="text" class="form-control" v-model="gebnation">
+		</fieldset>
+		<fieldset>
+			<legend>StudentIn</legend>
+			<template v-if="studentIn">
+				<div class="row mb-3">
+					<label for="stv-details-student_uid" class="col-sm-1 col-form-label">UID</label>
+					<div class="col-sm-3">
+						<input id="stv-details-student_uid" type="text" class="form-control" v-model="studentIn.student_uid">
+					</div>
+					<label for="stv-details-personenkennzeichen" class="col-sm-1 col-form-label">Personenkennzeichen</label>
+					<div class="col-sm-3">
+						<input id="stv-details-personenkennzeichen" type="text" class="form-control" v-model="studentIn.personenkennzeichen">
+					</div>
+					<label for="stv-details-aktiv" class="col-sm-1 col-form-label">Aktiv</label>
+					<div class="col-sm-3">
+						<div class="form-check">
+							<input id="stv-details-aktiv" type="checkbox" class="form-check-input" v-model="studentIn.aktiv">
+						</div>
+					</div>
 				</div>
+			</template>
+			<div v-else>
+				Loading...
 			</div>
 		</fieldset>
 	</div>`
diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index c6eb097d2..61631029e 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -81,7 +81,6 @@ export default {
 			this.$refs.table.tabulator.on("dataProcessed", () => {
 				let rows = this.$refs.table.tabulator.getRows();
 				if (rows.length && rows.length == 1) {
-					console.log();
 					this.$refs.table.tabulator.selectRow();
 				}
 			});
diff --git a/public/js/components/vueDatepicker.js.php b/public/js/components/vueDatepicker.js.php
new file mode 100644
index 000000000..d92bd4a33
--- /dev/null
+++ b/public/js/components/vueDatepicker.js.php
@@ -0,0 +1,12 @@
+<?php
+
+if(file_exists("../../../vendor/vuepic/vue-datepicker-js/vue-datepicker.iife.js"))
+{
+	header('Content-Type: application/javascript');
+	echo file_get_contents("../../../vendor/vuepic/vue-datepicker-js/vue-datepicker.iife.js");
+	echo "export default VueDatePicker";
+}
+else
+{
+	header('HTTP/1.0 404 Not Found');
+}
\ No newline at end of file

From 41ff43046486f6ad3484e0156a0bcc15f353765c Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 28 Sep 2023 08:45:54 +0200
Subject: [PATCH 0118/1461] Detailsicht StudentIn, Speichern

---
 .../controllers/components/stv/Student.php    | 163 ++++++++++++++++--
 .../controllers/components/stv/Students.php   |   3 +-
 .../Stv/Studentenverwaltung/Details.js        |  20 ++-
 .../Studentenverwaltung/Details/Details.js    | 105 +++++++----
 4 files changed, 231 insertions(+), 60 deletions(-)

diff --git a/application/controllers/components/stv/Student.php b/application/controllers/components/stv/Student.php
index 6268f22e0..2aaf00c9c 100644
--- a/application/controllers/components/stv/Student.php
+++ b/application/controllers/components/stv/Student.php
@@ -10,28 +10,27 @@ class Student extends FHC_Controller
 		parent::__construct();
 	}
 
-	public function getPerson($person_id)
+	public function get($prestudent_id)
 	{
-		$this->load->model('person/Person_model', 'PersonModel');
+		// TODO(chris): stdSem from Variable
+		$studiensemester_kurzbz='SS2023';
 
-		$result = $this->PersonModel->load($person_id);
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			$this->outputJson(getError($result));
-		} elseif (!hasData($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_NOT_FOUND);
-			$this->outputJson('NOT FOUND');
-		} else {
-			$this->outputJson(current(getData($result)));
-		}
-	}
-
-	public function getStudent($student_uid)
-	{
-		// TODO(chris): this is wrong
 		$this->load->model('crm/Student_model', 'StudentModel');
 
-		$result = $this->StudentModel->load([$student_uid]);
+		$this->StudentModel->addSelect('p.*');
+		$this->StudentModel->addSelect('tbl_student.student_uid');
+		$this->StudentModel->addSelect('matrikelnr');
+		$this->StudentModel->addSelect('b.aktiv');
+		$this->StudentModel->addSelect('v.semester');
+		$this->StudentModel->addSelect('v.verband');
+		$this->StudentModel->addSelect('v.gruppe');
+		$this->StudentModel->addSelect('b.alias');
+
+		$this->StudentModel->addJoin('public.tbl_benutzer b', 'student_uid = uid');
+		$this->StudentModel->addJoin('public.tbl_studentlehrverband v', 'b.uid = v.student_uid AND v.studiensemester_kurzbz = ' . $this->StudentModel->escape($studiensemester_kurzbz), 'LEFT');
+		$this->StudentModel->addJoin('public.tbl_person p', 'person_id');
+
+		$result = $this->StudentModel->loadWhere(['prestudent_id' => $prestudent_id]);
 		if (isError($result)) {
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 			$this->outputJson(getError($result));
@@ -90,5 +89,133 @@ class Student extends FHC_Controller
 		} else {
 			$this->outputJson(getData($result) ?: []);
 		}
+	}
+	public function save($prestudent_id)
+	{
+		// TODO(chris): stdSem from Variable
+		$studiensemester_kurzbz='SS2023';
+
+		$this->load->model('person/Person_model', 'PersonModel');
+		$this->load->model('crm/Student_model', 'StudentModel');
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
+
+		$data = json_decode(utf8_encode($this->input->raw_input_stream), true);
+
+		$result = $this->StudentModel->loadWhere(['prestudent_id' =>$prestudent_id]);
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson(getError($result));
+		} elseif (!hasData($result)) {
+			$uid = null;
+		} else {
+			$student = current(getData($result));
+			$uid = $student->student_uid;
+		}
+
+		$result = $this->PrestudentModel->loadWhere(['prestudent_id' =>$prestudent_id]);
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson(getError($result));
+		} elseif (!hasData($result)) {
+			$person_id= null;
+		} else {
+			$person = current(getData($result));
+			$person_id = $person->person_id;
+		}
+
+		$array_allowed_props = ['verband','semester','gruppe'];
+		$update = array();
+		foreach ($array_allowed_props as $prop)
+		{
+			if(isset($data[$prop])){
+				$update[$prop] = $data[$prop];
+			}
+		}
+		//TODO(chris): form validation verband
+		if (count($update))
+		{
+			if($uid === null)
+			{
+				$this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST);
+				return $this->outputJson("Kein/e StudentIn vorhanden!");
+			}
+			$this->StudentlehrverbandModel->update([
+				'studiensemester_kurzbz' => $studiensemester_kurzbz,
+				'student_uid' => $uid],
+				$update
+			);
+		}
+
+		$array_allowed_props = [
+			'anrede',
+			'bpk',
+			'titelpre',
+			'titelpost',
+			'nachname',
+			'vorname',
+			'vornamen',
+			'wahlname',
+			'geburtsdatum',
+			'gebort',
+			'geburtsnation',
+			'svnr',
+			'ersatzkennzeichen',
+			'staatsbuergerschaft',
+			'matr_nr',
+			'sprache',
+			'geschlecht',
+			'familienstand',
+			'foto',
+			'anmerkung',
+			'homepage'
+		];
+		$update = array();
+		foreach ($array_allowed_props as $prop)
+		{
+			if(isset($data[$prop])){
+				$update[$prop] = $data[$prop];
+			}
+		}
+
+		if (count($update))
+		{
+			if($person_id === null)
+			{
+				$this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST);
+				return $this->outputJson("Keine Person vorhanden!");
+			}
+			$this->PersonModel->update(
+				$person_id,
+				$update
+			);
+		}
+
+
+		$array_allowed_props = ['matrikelnr'];
+		$update = array();
+		foreach ($array_allowed_props as $prop)
+		{
+			if(isset($data[$prop])){
+				$update[$prop] = $data[$prop];
+			}
+		}
+		if (count($update))
+		{
+			if ($uid === null) {
+				$this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST);
+				return $this->outputJson("Kein/e StudentIn vorhanden!");
+			}
+			$this->StudentModel->update(
+				[$uid],
+				$update
+			);
+		}
+
+
+
+
+
+
 	}
 }
diff --git a/application/controllers/components/stv/Students.php b/application/controllers/components/stv/Students.php
index 4d00a1f54..a0394d12e 100644
--- a/application/controllers/components/stv/Students.php
+++ b/application/controllers/components/stv/Students.php
@@ -283,7 +283,8 @@ class Students extends FHC_Controller
 		$this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid');
 		$this->PrestudentModel->addJoin(
 			'public.tbl_studentlehrverband v',
-			'v.student_uid=s.student_uid AND v.studiensemester_kurzbz=' . $this->PrestudentModel->escape($studiensemester_kurzbz)
+			'v.student_uid=s.student_uid AND v.studiensemester_kurzbz=' . $this->PrestudentModel->escape($studiensemester_kurzbz),
+			'LEFT'
 		);
 
 		$this->PrestudentModel->addSelect('p.person_id');
diff --git a/public/js/components/Stv/Studentenverwaltung/Details.js b/public/js/components/Stv/Studentenverwaltung/Details.js
index 6072cb3b3..871cfeccb 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details.js
@@ -18,13 +18,21 @@ export default {
 			}
 		}
 	},
+	computed: {
+		hasNoStudent() {
+			return !this.student || (Object.keys(this.student).length === 0 && this.student.constructor === Object);
+		}
+	},
 	template: `
 	<div class="stv-details h-100 pb-3">
-		<ul class="nav nav-tabs">
-			<li v-for="(title, comp) in tabs" class="nav-item" :key="comp">
-				<a class="nav-link" :class="{active: comp == component}" :aria-current="comp == component ? 'page' : ''" href="#" @click="component=comp">{{title}}</a>
-			</li>
-		</ul>
-		<component :is="component" :student="student"></component>
+		<div v-if="hasNoStudent" class="justify-content-center d-flex h-100 align-items-center">Bitte StudentIn auswählen!</div>
+		<template v-else>		
+			<ul class="nav nav-tabs">
+				<li v-for="(title, comp) in tabs" class="nav-item" :key="comp">
+					<a class="nav-link" :class="{active: comp == component}" :aria-current="comp == component ? 'page' : ''" href="#" @click="component=comp">{{title}}</a>
+				</li>
+			</ul>
+			<component :is="component" :student="student"></component>
+		</template>
 	</div>`
 };
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
index f6d7d6b40..87cf9ac6e 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
@@ -22,25 +22,30 @@ export default {
 				"v": "verheiratet",
 				"w": "verwitwet"
 			},
-			person: null,
+			data: null,
 			studentIn: null
 		}
 	},
 	watch: {
 		student(n) {
+			this.updateStudent(n);
+		}
+	},
+	methods: {
+		updateStudent(n) {
 			CoreRESTClient
-				.get('components/stv/Student/getPerson/' + this.student.person_id)
+				.get('components/stv/Student/get/' + n.prestudent_id)
 				.then(result => result.data)
 				.then(result => {
-					this.person = result;
-					if (!this.person.familienstand)
-						this.person.familienstand = '';
+					this.data = result;
+					if (!this.data.familienstand)
+						this.data.familienstand = '';
 				})
 				.catch(err => {
 					console.error(err.response.data || err.message);
 				});
-			CoreRESTClient
-				.get('components/stv/Student/getStudent/' + this.student.uid)
+			/*CoreRESTClient
+				.get('components/stv/Student/getStudent/' + n.uid)
 				.then(result => result.data)
 				.then(result => {
 					// TODO(chris): IMPLEMENT HERE!
@@ -49,7 +54,11 @@ export default {
 				})
 				.catch(err => {
 					console.error(err.response.data || err.message);
-				});
+				});*/
+		},
+		save() {
+			CoreRESTClient
+				.post('components/stv/Student/save/' + this.student.prestudent_id, this.data)
 		}
 	},
 	created() {
@@ -77,68 +86,71 @@ export default {
 			.catch(err => {
 				console.error(err.response.data || err.message);
 			});
+		this.updateStudent(this.student);
 	},
+	//TODO(chris): Felder student_uid, person_id sperren, Personenkz
+	//TODO(chris): Logik Feld Zugangscode
 	template: `
 	<div class="stv-details-details h-100 pb-3">
 		<fieldset>
 			<legend>Person</legend>
-			<template v-if="person">
+			<template v-if="data">
 				<div class="row mb-3">
 					<label for="stv-details-person_id" class="col-sm-1 col-form-label">Person ID</label>
 					<div class="col-sm-3">
-						<input id="stv-details-person_id" type="text" class="form-control" v-model="person.person_id">
+						<input id="stv-details-person_id" type="text" class="form-control" v-model="data.person_id">
 					</div>
 					<label for="stv-details-bpk" class="col-sm-1 col-form-label">BPK</label>
 					<div class="col-sm-3">
-						<input id="stv-details-bpk" type="text" class="form-control" v-model="person.bpk">
+						<input id="stv-details-bpk" type="text" class="form-control" v-model="data.bpk">
 					</div>
 				</div>
 				<div class="row mb-3">
 					<label for="stv-details-anrede" class="col-sm-1 col-form-label">Anrede</label>
 					<div class="col-sm-3">
-						<input id="stv-details-anrede" type="text" class="form-control" v-model="person.anrede">
+						<input id="stv-details-anrede" type="text" class="form-control" v-model="data.anrede">
 					</div>
 					<label for="stv-details-titelpre" class="col-sm-1 col-form-label">Titel Pre</label>
 					<div class="col-sm-3">
-						<input id="stv-details-titelpre" type="text" class="form-control" v-model="person.titelpre">
+						<input id="stv-details-titelpre" type="text" class="form-control" v-model="data.titelpre">
 					</div>
 					<label for="stv-details-titelpost" class="col-sm-1 col-form-label">Titel Post</label>
 					<div class="col-sm-3">
-						<input id="stv-details-titelpost" type="text" class="form-control" v-model="person.titelpost">
+						<input id="stv-details-titelpost" type="text" class="form-control" v-model="data.titelpost">
 					</div>
 				</div>
 				<div class="row mb-3">
 					<label for="stv-details-nachname" class="col-sm-1 col-form-label">Nachname</label>
 					<div class="col-sm-3">
-						<input id="stv-details-nachname" type="text" class="form-control" v-model="person.nachname">
+						<input id="stv-details-nachname" type="text" class="form-control" v-model="data.nachname">
 					</div>
 					<label for="stv-details-vorname" class="col-sm-1 col-form-label">Vorname</label>
 					<div class="col-sm-3">
-						<input id="stv-details-vorname" type="text" class="form-control" v-model="person.vorname">
+						<input id="stv-details-vorname" type="text" class="form-control" v-model="data.vorname">
 					</div>
 					<label for="stv-details-vornamen" class="col-sm-1 col-form-label">Vornamen</label>
 					<div class="col-sm-3">
-						<input id="stv-details-vornamen" type="text" class="form-control" v-model="person.vornamen">
+						<input id="stv-details-vornamen" type="text" class="form-control" v-model="data.vornamen">
 					</div>
 				</div>
 				<div class="row mb-3">
 					<label for="stv-details-wahlname" class="col-sm-1 col-form-label">Wahlname</label>
 					<div class="col-sm-3">
-						<input id="stv-details-wahlname" type="text" class="form-control" v-model="person.wahlname">
+						<input id="stv-details-wahlname" type="text" class="form-control" v-model="data.wahlname">
 					</div>
 				</div>
 				<div class="row mb-3">
 					<label for="dp-input-stv-details-gebdatum" class="col-sm-1 col-form-label">Geburtsdatum</label>
 					<div class="col-sm-3">
-						<vue-date-picker uid="stv-details-gebdatum" v-model="person.gebdatum" :clearable="false" no-today auto-apply :enable-time-picker="false" format="dd.MM.yyyy" preview-format="dd.MM.yyyy"></vue-date-picker>
+						<vue-date-picker uid="stv-details-gebdatum" v-model="data.gebdatum" :clearable="false" no-today auto-apply :enable-time-picker="false" format="dd.MM.yyyy" preview-format="dd.MM.yyyy"></vue-date-picker>
 					</div>
 					<label for="stv-details-gebort" class="col-sm-1 col-form-label">Geburtsort</label>
 					<div class="col-sm-3">
-						<input id="stv-details-gebort" type="text" class="form-control" v-model="person.gebort">
+						<input id="stv-details-gebort" type="text" class="form-control" v-model="data.gebort">
 					</div>
 					<label for="stv-details-geburtsnation" class="col-sm-1 col-form-label">Geburtsnation</label>
 					<div class="col-sm-3">
-						<select id="stv-details-geburtsnation" class="form-control" v-model="person.geburtsnation">
+						<select id="stv-details-geburtsnation" class="form-control" v-model="data.geburtsnation">
 							<option value="">-- keine Auswahl --</option>
 							<!-- TODO(chris): gesperrte nationen können nicht ausgewählt werden! Um das zu realisieren müsste man ein pseudo select machen -->
 							<option v-for="nation in nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
@@ -148,17 +160,17 @@ export default {
 				<div class="row mb-3">
 					<label for="stv-details-svnr" class="col-sm-1 col-form-label">SVNR</label>
 					<div class="col-sm-3">
-						<input id="stv-details-svnr" type="text" class="form-control" v-model="person.svnr">
+						<input id="stv-details-svnr" type="text" class="form-control" v-model="data.svnr">
 					</div>
 					<label for="stv-details-ersatzkennzeichen" class="col-sm-1 col-form-label">Ersatzkennzeichen</label>
 					<div class="col-sm-3">
-						<input id="stv-details-ersatzkennzeichen" type="text" class="form-control" v-model="person.ersatzkennzeichen">
+						<input id="stv-details-ersatzkennzeichen" type="text" class="form-control" v-model="data.ersatzkennzeichen">
 					</div>
 				</div>
 				<div class="row mb-3">
 					<label for="stv-details-staatsbuergerschaft" class="col-sm-1 col-form-label">Staatsbürgerschaft</label>
 					<div class="col-sm-3">
-						<select id="stv-details-staatsbuergerschaft" class="form-control" v-model="person.staatsbuergerschaft">
+						<select id="stv-details-staatsbuergerschaft" class="form-control" v-model="data.staatsbuergerschaft">
 							<option value="">-- keine Auswahl --</option>
 							<!-- TODO(chris): gesperrte nationen können nicht ausgewählt werden! Um das zu realisieren müsste man ein pseudo select machen -->
 							<option v-for="nation in nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
@@ -166,11 +178,11 @@ export default {
 					</div>
 					<label for="stv-details-matr_nr" class="col-sm-1 col-form-label">Matrikelnummer</label>
 					<div class="col-sm-3">
-						<input id="stv-details-matr_nr" type="text" class="form-control" v-model="person.matr_nr">
+						<input id="stv-details-matr_nr" type="text" class="form-control" v-model="data.matr_nr">
 					</div>
 					<label for="stv-details-sprache" class="col-sm-1 col-form-label">Sprache</label>
 					<div class="col-sm-3">
-						<select id="stv-details-sprache" class="form-control" v-model="person.sprache">
+						<select id="stv-details-sprache" class="form-control" v-model="data.sprache">
 							<option v-for="sprache in sprachen" :key="sprache.sprache" :value="sprache.sprache">{{sprache.sprache}}</option>
 						</select>
 					</div>
@@ -178,13 +190,13 @@ export default {
 				<div class="row mb-3">
 					<label for="stv-details-geschlecht" class="col-sm-1 col-form-label">Geschlecht</label>
 					<div class="col-sm-3">
-						<select id="stv-details-geschlecht" class="form-control" v-model="person.geschlecht">
+						<select id="stv-details-geschlecht" class="form-control" v-model="data.geschlecht">
 							<option v-for="geschlecht in geschlechter" :key="geschlecht.geschlecht" :value="geschlecht.geschlecht">{{geschlecht.bezeichnung}}</option>
 						</select>
 					</div>
 					<label for="stv-details-familienstand" class="col-sm-1 col-form-label">Familienstand</label>
 					<div class="col-sm-3">
-						<select id="stv-details-familienstand" class="form-control" v-model="person.familienstand">
+						<select id="stv-details-familienstand" class="form-control" v-model="data.familienstand">
 							<option v-for="(bezeichnung, key) in familienstaende" :key="key" :value="key">{{bezeichnung}}</option>
 						</select>
 					</div>
@@ -192,7 +204,7 @@ export default {
 				<div class="row mb-3">
 					<label for="stv-details-foto" class="col-sm-1 col-form-label">Foto</label>
 					<div class="col-sm-3">
-						<form-upload-image id="stv-details-foto" v-model="person.foto"></form-upload-image>
+						<form-upload-image id="stv-details-foto" v-model="data.foto"></form-upload-image>
 					</div>
 					<label for="stv-details-anmerkung" class="col-sm-1 col-form-label">Anmerkung</label>
 					<div class="col-sm-3">
@@ -200,7 +212,7 @@ export default {
 					</div>
 					<label for="stv-details-homepage" class="col-sm-1 col-form-label">Homepage</label>
 					<div class="col-sm-3">
-						<input id="stv-details-homepage" type="text" class="form-control" v-model="person.homepage">
+						<input id="stv-details-homepage" type="text" class="form-control" v-model="data.homepage">
 					</div>
 				</div>
 			</template>
@@ -210,23 +222,46 @@ export default {
 		</fieldset>
 		<fieldset>
 			<legend>StudentIn</legend>
-			<template v-if="studentIn">
-				<div class="row mb-3">
+			<template v-if="data">
+				<div class="row mb-3 align-items-center">
 					<label for="stv-details-student_uid" class="col-sm-1 col-form-label">UID</label>
 					<div class="col-sm-3">
-						<input id="stv-details-student_uid" type="text" class="form-control" v-model="studentIn.student_uid">
+						<input id="stv-details-student_uid" type="text" class="form-control" v-model="data.student_uid">
 					</div>
 					<label for="stv-details-personenkennzeichen" class="col-sm-1 col-form-label">Personenkennzeichen</label>
 					<div class="col-sm-3">
-						<input id="stv-details-personenkennzeichen" type="text" class="form-control" v-model="studentIn.personenkennzeichen">
+						<input id="stv-details-personenkennzeichen" type="text" class="form-control" v-model="data.matrikelnr">
 					</div>
 					<label for="stv-details-aktiv" class="col-sm-1 col-form-label">Aktiv</label>
 					<div class="col-sm-3">
 						<div class="form-check">
-							<input id="stv-details-aktiv" type="checkbox" class="form-check-input" v-model="studentIn.aktiv">
+							<input id="stv-details-aktiv" type="checkbox" class="form-check-input" v-model="data.aktiv">
 						</div>
 					</div>
 				</div>
+				<div class="row mb-3 align-items-center">
+					<label for="stv-details-semester" class="col-sm-1 col-form-label">Semester</label>
+					<div class="col-sm-3">
+						<input id="stv-details-semester" type="text" class="form-control" v-model="data.semester">
+					</div>
+					<label for="stv-details-verband" class="col-sm-1 col-form-label">Verband</label>
+					<div class="col-sm-3">
+						<input id="stv-details-verband" type="text" class="form-control" v-model="data.verband">
+					</div>
+					<label for="stv-details-gruppe" class="col-sm-1 col-form-label">Gruppe</label>
+					<div class="col-sm-3">
+						<input id="stv-details-gruppe" type="text" class="form-control" v-model="data.gruppe">
+					</div>
+				</div>
+				<div class="row mb-3 align-items-center">
+					<label for="stv-details-alias" class="col-sm-1 col-form-label">Alias</label>
+					<div class="col-sm-3">
+						<input id="stv-details-alias" type="text" class="form-control" v-model="data.alias">
+					</div>
+				</div>
+				<div>
+					<button type="button" class="btn btn-primary" @click="save">Speichern</button>
+				</div>
 			</template>
 			<div v-else>
 				Loading...

From 468d3345309716f065706519e8a327f7a6097ddb Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 2 Oct 2023 10:44:08 +0200
Subject: [PATCH 0119/1461] Feld Zugangscode

---
 .../controllers/components/stv/Student.php    |  4 ++++
 application/views/Studentenverwaltung.php     |  2 +-
 .../js/components/Stv/Studentenverwaltung.js  | 10 ++++++++++
 .../Studentenverwaltung/Details/Details.js    | 19 +++++++++++++++++--
 4 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/application/controllers/components/stv/Student.php b/application/controllers/components/stv/Student.php
index 2aaf00c9c..afb052861 100644
--- a/application/controllers/components/stv/Student.php
+++ b/application/controllers/components/stv/Student.php
@@ -26,6 +26,10 @@ class Student extends FHC_Controller
 		$this->StudentModel->addSelect('v.gruppe');
 		$this->StudentModel->addSelect('b.alias');
 
+		if (defined('ACTIVE_ADDONS') && strpos(ACTIVE_ADDONS, 'bewerbung') !== false) {
+			$this->StudentModel->addSelect("(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung ORDER BY kontakt_id LIMIT 1) AS email_privat", false);
+		}
+
 		$this->StudentModel->addJoin('public.tbl_benutzer b', 'student_uid = uid');
 		$this->StudentModel->addJoin('public.tbl_studentlehrverband v', 'b.uid = v.student_uid AND v.studiensemester_kurzbz = ' . $this->StudentModel->escape($studiensemester_kurzbz), 'LEFT');
 		$this->StudentModel->addJoin('public.tbl_person p', 'person_id');
diff --git a/application/views/Studentenverwaltung.php b/application/views/Studentenverwaltung.php
index ff6f5bfae..e9977851d 100644
--- a/application/views/Studentenverwaltung.php
+++ b/application/views/Studentenverwaltung.php
@@ -22,7 +22,7 @@
 ?>
 
 	<div id="main">
-		<router-view></router-view>
+		<router-view active-addons="<?= defined('ACTIVE_ADDONS') ? ACTIVE_ADDONS : ''; ?>" cis-root="<?= CIS_ROOT; ?>"></router-view>
 	</div>
 
 <?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index d28672f17..7e48e2218 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -30,6 +30,16 @@ export default {
 		StvDetails,
 		VerticalSplit
 	},
+	props: {
+		cisRoot: String,
+		activeAddons: String // semicolon separated list of active addons
+	},
+	provide() {
+		return {
+			cisRoot: this.cisRoot,
+			activeAddonBewerbung: this.activeAddons.split(';').includes('bewerbung')
+		}
+	},
 	data() {
 		return {
 			selected: [],
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
index 87cf9ac6e..25446d499 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
@@ -7,6 +7,15 @@ export default {
 		VueDatePicker,
 		FormUploadImage
 	},
+	inject: {
+		showZugangscode: {
+			from: 'activeAddonBewerbung',
+			default: false
+		},
+		cisRoot: {
+			from: 'cisRoot'
+		}
+	},
 	props: {
 		student: Object
 	},
@@ -89,7 +98,9 @@ export default {
 		this.updateStudent(this.student);
 	},
 	//TODO(chris): Felder student_uid, person_id sperren, Personenkz
-	//TODO(chris): Logik Feld Zugangscode
+	/**
+	 * BPK: isBerechtigt 'student/bpk'
+	 */
 	template: `
 	<div class="stv-details-details h-100 pb-3">
 		<fieldset>
@@ -98,7 +109,11 @@ export default {
 				<div class="row mb-3">
 					<label for="stv-details-person_id" class="col-sm-1 col-form-label">Person ID</label>
 					<div class="col-sm-3">
-						<input id="stv-details-person_id" type="text" class="form-control" v-model="data.person_id">
+						<input id="stv-details-person_id" type="text" class="form-control" v-model="data.person_id" disabled>
+					</div>
+					<label v-if="showZugangscode" for="stv-details-zugangscode" class="col-sm-1 col-form-label">Zugangscode</label>
+					<div v-if="showZugangscode" class="col-sm-3">
+						<a :href="cisRoot + 'addons/bewerbung/cis/registration.php?code=' + data.zugangscode + '&emailAdresse=' + data.email_privat" target="_blank">{{data.zugangscode}}</a>
 					</div>
 					<label for="stv-details-bpk" class="col-sm-1 col-form-label">BPK</label>
 					<div class="col-sm-3">

From 2a0a0a81f2da189a67021fffc85da2217a1e38ba Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 2 Oct 2023 11:33:23 +0200
Subject: [PATCH 0120/1461] Feld Bpk

---
 .../controllers/Studentenverwaltung.php       |  9 +++++++-
 application/views/Studentenverwaltung.php     |  2 +-
 .../js/components/Stv/Studentenverwaltung.js  |  2 ++
 .../Studentenverwaltung/Details/Details.js    | 22 +++++--------------
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/application/controllers/Studentenverwaltung.php b/application/controllers/Studentenverwaltung.php
index dded0ffdd..36b96af5e 100644
--- a/application/controllers/Studentenverwaltung.php
+++ b/application/controllers/Studentenverwaltung.php
@@ -14,6 +14,13 @@ class Studentenverwaltung extends FHC_Controller
 	 */
 	public function index()
 	{
-		$this->load->view('Studentenverwaltung');
+		$this->load->library('AuthLib');
+		$this->load->library('PermissionLib');
+
+		$this->load->view('Studentenverwaltung', [
+			'permissions' => [
+				'student/bpk' => $this->permissionlib->isBerechtigt('student/bpk')
+			]
+		]);
 	}
 }
diff --git a/application/views/Studentenverwaltung.php b/application/views/Studentenverwaltung.php
index e9977851d..18a67423e 100644
--- a/application/views/Studentenverwaltung.php
+++ b/application/views/Studentenverwaltung.php
@@ -22,7 +22,7 @@
 ?>
 
 	<div id="main">
-		<router-view active-addons="<?= defined('ACTIVE_ADDONS') ? ACTIVE_ADDONS : ''; ?>" cis-root="<?= CIS_ROOT; ?>"></router-view>
+		<router-view active-addons="<?= defined('ACTIVE_ADDONS') ? ACTIVE_ADDONS : ''; ?>" cis-root="<?= CIS_ROOT; ?>" :permissions="<?= htmlspecialchars(json_encode($permissions)); ?>"></router-view>
 	</div>
 
 <?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 7e48e2218..3b8fdbc82 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -31,11 +31,13 @@ export default {
 		VerticalSplit
 	},
 	props: {
+		permissions: Object,
 		cisRoot: String,
 		activeAddons: String // semicolon separated list of active addons
 	},
 	provide() {
 		return {
+			hasBpkPermission: this.permissions['student/bpk'],
 			cisRoot: this.cisRoot,
 			activeAddonBewerbung: this.activeAddons.split(';').includes('bewerbung')
 		}
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
index 25446d499..df7a2e1f6 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
@@ -8,6 +8,10 @@ export default {
 		FormUploadImage
 	},
 	inject: {
+		showBpk: {
+			from: 'hasBpkPermission',
+			default: false
+		},
 		showZugangscode: {
 			from: 'activeAddonBewerbung',
 			default: false
@@ -53,17 +57,6 @@ export default {
 				.catch(err => {
 					console.error(err.response.data || err.message);
 				});
-			/*CoreRESTClient
-				.get('components/stv/Student/getStudent/' + n.uid)
-				.then(result => result.data)
-				.then(result => {
-					// TODO(chris): IMPLEMENT HERE!
-					console.log(result);
-					this.studentIn = result;
-				})
-				.catch(err => {
-					console.error(err.response.data || err.message);
-				});*/
 		},
 		save() {
 			CoreRESTClient
@@ -98,9 +91,6 @@ export default {
 		this.updateStudent(this.student);
 	},
 	//TODO(chris): Felder student_uid, person_id sperren, Personenkz
-	/**
-	 * BPK: isBerechtigt 'student/bpk'
-	 */
 	template: `
 	<div class="stv-details-details h-100 pb-3">
 		<fieldset>
@@ -115,8 +105,8 @@ export default {
 					<div v-if="showZugangscode" class="col-sm-3">
 						<a :href="cisRoot + 'addons/bewerbung/cis/registration.php?code=' + data.zugangscode + '&emailAdresse=' + data.email_privat" target="_blank">{{data.zugangscode}}</a>
 					</div>
-					<label for="stv-details-bpk" class="col-sm-1 col-form-label">BPK</label>
-					<div class="col-sm-3">
+					<label v-if="showBpk" for="stv-details-bpk" class="col-sm-1 col-form-label">BPK</label>
+					<div v-if="showBpk" class="col-sm-3">
 						<input id="stv-details-bpk" type="text" class="form-control" v-model="data.bpk">
 					</div>
 				</div>

From fa74438f6652ae6cbd688a18528dd9fa9a3ae1b5 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 2 Oct 2023 16:38:11 +0200
Subject: [PATCH 0121/1461] Validation

---
 .../controllers/Studentenverwaltung.php       |   3 +-
 .../controllers/components/stv/Student.php    | 141 ++++++++------
 application/views/Studentenverwaltung.php     |  11 +-
 public/css/Studentenverwaltung.css            |  13 +-
 .../js/components/Stv/Studentenverwaltung.js  |   7 +-
 .../Studentenverwaltung/Details/Details.js    | 175 ++++++++++++++----
 6 files changed, 258 insertions(+), 92 deletions(-)

diff --git a/application/controllers/Studentenverwaltung.php b/application/controllers/Studentenverwaltung.php
index 36b96af5e..64db67ef1 100644
--- a/application/controllers/Studentenverwaltung.php
+++ b/application/controllers/Studentenverwaltung.php
@@ -19,7 +19,8 @@ class Studentenverwaltung extends FHC_Controller
 
 		$this->load->view('Studentenverwaltung', [
 			'permissions' => [
-				'student/bpk' => $this->permissionlib->isBerechtigt('student/bpk')
+				'student/bpk' => $this->permissionlib->isBerechtigt('student/bpk'),
+				'student/alias' => $this->permissionlib->isBerechtigt('student/alias')
 			]
 		]);
 	}
diff --git a/application/controllers/components/stv/Student.php b/application/controllers/components/stv/Student.php
index afb052861..a407d20c1 100644
--- a/application/controllers/components/stv/Student.php
+++ b/application/controllers/components/stv/Student.php
@@ -2,12 +2,19 @@
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
+use \DateTime as DateTime;
+
 class Student extends FHC_Controller
 {
 	public function __construct()
 	{
 		// TODO(chris): access!
 		parent::__construct();
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui'
+		]);
 	}
 
 	public function get($prestudent_id)
@@ -94,6 +101,7 @@ class Student extends FHC_Controller
 			$this->outputJson(getData($result) ?: []);
 		}
 	}
+
 	public function save($prestudent_id)
 	{
 		// TODO(chris): stdSem from Variable
@@ -104,7 +112,18 @@ class Student extends FHC_Controller
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
 
-		$data = json_decode(utf8_encode($this->input->raw_input_stream), true);
+		$this->load->library('form_validation');
+
+		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+
+		$this->form_validation->set_rules('gebdatum', 'Geburtsdatum', 'callback_isValidDate', [
+			'isValidDate' => $this->p->t('ui', 'error_invalid_date')
+		]);
+		// TODO(chris): other validations?
+
+		if ($this->form_validation->run() == false) {
+			return $this->outputJsonError($this->form_validation->error_array());
+		}
 
 		$result = $this->StudentModel->loadWhere(['prestudent_id' =>$prestudent_id]);
 		if (isError($result)) {
@@ -128,30 +147,17 @@ class Student extends FHC_Controller
 			$person_id = $person->person_id;
 		}
 
-		$array_allowed_props = ['verband','semester','gruppe'];
-		$update = array();
-		foreach ($array_allowed_props as $prop)
+		$array_allowed_props_lehrverband = ['verband', 'semester', 'gruppe'];
+		$update_lehrverband = array();
+		foreach ($array_allowed_props_lehrverband as $prop)
 		{
-			if(isset($data[$prop])){
-				$update[$prop] = $data[$prop];
+			$val = $this->input->post($prop);
+			if ($val !== null) {
+				$update_lehrverband[$prop] = $val;
 			}
 		}
-		//TODO(chris): form validation verband
-		if (count($update))
-		{
-			if($uid === null)
-			{
-				$this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST);
-				return $this->outputJson("Kein/e StudentIn vorhanden!");
-			}
-			$this->StudentlehrverbandModel->update([
-				'studiensemester_kurzbz' => $studiensemester_kurzbz,
-				'student_uid' => $uid],
-				$update
-			);
-		}
 
-		$array_allowed_props = [
+		$array_allowed_props_person = [
 			'anrede',
 			'bpk',
 			'titelpre',
@@ -160,7 +166,7 @@ class Student extends FHC_Controller
 			'vorname',
 			'vornamen',
 			'wahlname',
-			'geburtsdatum',
+			'gebdatum',
 			'gebort',
 			'geburtsnation',
 			'svnr',
@@ -174,52 +180,83 @@ class Student extends FHC_Controller
 			'anmerkung',
 			'homepage'
 		];
-		$update = array();
-		foreach ($array_allowed_props as $prop)
+		$update_person = array();
+		foreach ($array_allowed_props_person as $prop)
 		{
-			if(isset($data[$prop])){
-				$update[$prop] = $data[$prop];
+			$val = $this->input->post($prop);
+			if ($val !== null) {
+				$update_person[$prop] = $val;
 			}
 		}
 
-		if (count($update))
+		$array_allowed_props_student = ['matrikelnr'];
+		$update_student = array();
+		foreach ($array_allowed_props_student as $prop)
 		{
-			if($person_id === null)
-			{
-				$this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST);
-				return $this->outputJson("Keine Person vorhanden!");
+			$val = $this->input->post($prop);
+			if ($val !== null) {
+				$update_student[$prop] = $val;
 			}
-			$this->PersonModel->update(
+		}
+
+		if (count($update_lehrverband) + count($update_student) && $uid === null) {
+			$this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST);
+			// TODO(chris): phrase
+			return $this->outputJson("Kein/e StudentIn vorhanden!");
+		}
+		if (count($update_person) && $person_id === null) {
+			$this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST);
+			// TODO(chris): phrase
+			return $this->outputJson("Keine Person vorhanden!");
+		}
+
+		if (count($update_lehrverband))
+		{
+			$result = $this->StudentlehrverbandModel->update([
+				'studiensemester_kurzbz' => $studiensemester_kurzbz,
+				'student_uid' => $uid
+			], $update_lehrverband);
+			if (isError($result)) {
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return $this->outputJson(getError($result));
+			}
+		}
+
+		if (count($update_person))
+		{
+			$result = $this->PersonModel->update(
 				$person_id,
-				$update
+				$update_person
 			);
+			if (isError($result)) {
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return $this->outputJson(getError($result));
+			}
 		}
 
 
-		$array_allowed_props = ['matrikelnr'];
-		$update = array();
-		foreach ($array_allowed_props as $prop)
+		if (count($update_student))
 		{
-			if(isset($data[$prop])){
-				$update[$prop] = $data[$prop];
-			}
-		}
-		if (count($update))
-		{
-			if ($uid === null) {
-				$this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST);
-				return $this->outputJson("Kein/e StudentIn vorhanden!");
-			}
-			$this->StudentModel->update(
+			$result = $this->StudentModel->update(
 				[$uid],
-				$update
+				$update_student
 			);
+			if (isError($result)) {
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return $this->outputJson(getError($result));
+			}
 		}
 
+		$this->outputJsonSuccess(true);
+	}
 
-
-
-
-
+	public function isValidDate($date)
+	{
+		try {
+		    new DateTime($date);
+		} catch (Exception $e) {
+			return false;
+		}
+		return true;
 	}
 }
diff --git a/application/views/Studentenverwaltung.php b/application/views/Studentenverwaltung.php
index 18a67423e..5928a2b00 100644
--- a/application/views/Studentenverwaltung.php
+++ b/application/views/Studentenverwaltung.php
@@ -13,6 +13,9 @@
 			'public/css/Studentenverwaltung.css',
 			'public/css/components/vue-datepicker.css'
 		],
+		'customJSs' => [
+			'vendor/npm-asset/primevue/toast/toast.min.js'
+		],
 		'customJSModules' => [
 			'public/js/apps/Studentenverwaltung.js'
 		]
@@ -22,7 +25,13 @@
 ?>
 
 	<div id="main">
-		<router-view active-addons="<?= defined('ACTIVE_ADDONS') ? ACTIVE_ADDONS : ''; ?>" cis-root="<?= CIS_ROOT; ?>" :permissions="<?= htmlspecialchars(json_encode($permissions)); ?>"></router-view>
+		<router-view
+			active-addons="<?= defined('ACTIVE_ADDONS') ? ACTIVE_ADDONS : ''; ?>"
+			cis-root="<?= CIS_ROOT; ?>"
+			:permissions="<?= htmlspecialchars(json_encode($permissions)); ?>"
+			:config="<?= htmlspecialchars(json_encode(['generateAlias' => !defined('GENERATE_ALIAS_STUDENT') ? true : GENERATE_ALIAS_STUDENT])); ?>"
+			>
+		</router-view>
 	</div>
 
 <?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
diff --git a/public/css/Studentenverwaltung.css b/public/css/Studentenverwaltung.css
index ccc5b0694..d48397cc7 100644
--- a/public/css/Studentenverwaltung.css
+++ b/public/css/Studentenverwaltung.css
@@ -57,4 +57,15 @@
 }
 .stv-list > #filterTableDataset {
 	flex: 1 1 auto;
-}
\ No newline at end of file
+}
+
+.toast.toast-success {
+	color: #0f5132;
+	background-color: #d1e7dd!important;
+	border-color: #badbcc!important;
+}
+.toast.toast-danger {
+	color: #842029;
+	background-color: #f8d7da!important;
+	border-color: #f5c2c7!important;
+}
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 3b8fdbc82..bc30ed02a 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -31,15 +31,18 @@ export default {
 		VerticalSplit
 	},
 	props: {
+		config: Object,
 		permissions: Object,
 		cisRoot: String,
 		activeAddons: String // semicolon separated list of active addons
 	},
 	provide() {
 		return {
-			hasBpkPermission: this.permissions['student/bpk'],
 			cisRoot: this.cisRoot,
-			activeAddonBewerbung: this.activeAddons.split(';').includes('bewerbung')
+			activeAddonBewerbung: this.activeAddons.split(';').includes('bewerbung'),
+			configGenerateAlias: this.config.generateAlias,
+			hasBpkPermission: this.permissions['student/bpk'],
+			hasAliasPermission: this.permissions['student/alias']
 		}
 	},
 	data() {
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
index df7a2e1f6..a3433584a 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
@@ -5,7 +5,8 @@ import {CoreRESTClient} from '../../../../RESTClient.js';
 export default {
 	components: {
 		VueDatePicker,
-		FormUploadImage
+		FormUploadImage,
+		PvToast: primevue.toast
 	},
 	inject: {
 		showBpk: {
@@ -18,6 +19,14 @@ export default {
 		},
 		cisRoot: {
 			from: 'cisRoot'
+		},
+		generateAlias: {
+			from: 'configGenerateAlias',
+			default: false
+		},
+		hasAliasPermission: {
+			from: 'hasAliasPermission',
+			default: false
 		}
 	},
 	props: {
@@ -35,13 +44,42 @@ export default {
 				"v": "verheiratet",
 				"w": "verwitwet"
 			},
+			original: null,
 			data: null,
-			studentIn: null
+			changed: {},
+			studentIn: null,
+			gebDatumIsValid: false,
+			gebDatumIsInvalid: false
+		}
+	},
+	computed: {
+		aliasNotAllowed() {
+			return this.generateAlias === false && !this.hasAliasPermission;
+		},
+		changedLength() {
+			return Object.keys(this.changed).length;
 		}
 	},
 	watch: {
 		student(n) {
 			this.updateStudent(n);
+		},
+		data: {
+			handler(n) {
+				let res = {};
+				for (var k in this.original) {
+					if (k == 'gebdatum') {
+						if (new Date(this.original[k]).toString() != new Date(n[k]).toString())
+							res[k] = n[k];
+					} else {
+						if (this.original[k] !== n[k])
+							res[k] = n[k];
+					}
+				}
+				this.changed = res;
+				this.resetErrors();
+			},
+			deep: true
 		}
 	},
 	methods: {
@@ -53,6 +91,7 @@ export default {
 					this.data = result;
 					if (!this.data.familienstand)
 						this.data.familienstand = '';
+					this.original = {...this.data};
 				})
 				.catch(err => {
 					console.error(err.response.data || err.message);
@@ -60,7 +99,67 @@ export default {
 		},
 		save() {
 			CoreRESTClient
-				.post('components/stv/Student/save/' + this.student.prestudent_id, this.data)
+				.post('components/stv/Student/save/' + this.student.prestudent_id, this.changed)
+				.then(result => result.data)
+				.then(result => {
+					this.resetErrors();
+					if (CoreRESTClient.isError(result)) {
+						let errors = CoreRESTClient.getError(result);
+						
+						if (errors === "Generic error")
+							console.error(errors, result);
+						else {
+							for (var k in errors)
+								this.addError(k, errors[k]);
+						}
+					} else {
+						for (var node of document.querySelectorAll(Object.keys(this.changed).map(el => '#stv-details-' + el).join(',')))
+							node.classList.add('is-valid');
+						if (this.changed.gebdatum !== undefined)
+							this.gebDatumIsValid = true;
+						
+						// TODO(chris): phrase
+						this.addToast('Gespeichert', '', 'success');
+
+						this.original = {...this.data};
+						this.changed = {};
+					}
+				})
+				.catch(err => {
+					// TODO(chris): phrase
+					this.addToast('Error', err?.response?.data || err?.message, 'error');
+				})
+		},
+		resetErrors() {
+			Array.from(this.$refs.form.getElementsByClassName('is-valid')).forEach(el => el.classList.remove('is-valid'));
+			Array.from(this.$refs.form.getElementsByClassName('is-invalid')).forEach(el => el.classList.remove('is-invalid'));
+			Array.from(this.$refs.form.getElementsByClassName('invalid-feedback')).forEach(el => el.remove());
+			this.gebDatumIsValid = false;
+			this.gebDatumIsInvalid = false;
+		},
+		addError(field, msg) {
+			let id = 'stv-details-' + field;
+
+			let input = document.getElementById(id);
+			if (field === 'gebdatum') {
+				this.gebDatumIsInvalid = true;
+				input = document.getElementById('dp-input-' + id).parentNode;
+			}
+
+			input.classList.add('is-invalid');
+			
+			let feedback = document.createElement('div');
+			feedback.classList.add('invalid-feedback');
+			feedback.innerHTML = msg;
+			input.after(feedback);
+		},
+		addToast(header, msg, severity) {
+			this.$refs.responseToast.add({
+				severity: severity,
+				summary: header,
+				detail: msg,
+				life: 3000
+			})
 		}
 	},
 	created() {
@@ -90,68 +189,73 @@ export default {
 			});
 		this.updateStudent(this.student);
 	},
-	//TODO(chris): Felder student_uid, person_id sperren, Personenkz
+	mounted() {
+		console.log();
+	},
+	//TODO(chris): Geburtszeit? Anzahl der Kinder?
 	template: `
-	<div class="stv-details-details h-100 pb-3">
+	<div ref="form" class="stv-details-details h-100 pb-3">
 		<fieldset>
 			<legend>Person</legend>
 			<template v-if="data">
-				<div class="row mb-3">
+				<div class="row mb-3 align-items-center">
 					<label for="stv-details-person_id" class="col-sm-1 col-form-label">Person ID</label>
 					<div class="col-sm-3">
 						<input id="stv-details-person_id" type="text" class="form-control" v-model="data.person_id" disabled>
 					</div>
 					<label v-if="showZugangscode" for="stv-details-zugangscode" class="col-sm-1 col-form-label">Zugangscode</label>
 					<div v-if="showZugangscode" class="col-sm-3">
-						<a :href="cisRoot + 'addons/bewerbung/cis/registration.php?code=' + data.zugangscode + '&emailAdresse=' + data.email_privat" target="_blank">{{data.zugangscode}}</a>
+						<span class="form-text">
+							<a :href="cisRoot + 'addons/bewerbung/cis/registration.php?code=' + data.zugangscode + '&emailAdresse=' + data.email_privat" target="_blank">{{data.zugangscode}}</a>
+						</span>
 					</div>
 					<label v-if="showBpk" for="stv-details-bpk" class="col-sm-1 col-form-label">BPK</label>
 					<div v-if="showBpk" class="col-sm-3">
-						<input id="stv-details-bpk" type="text" class="form-control" v-model="data.bpk">
+						<input id="stv-details-bpk" type="text" class="form-control" v-model="data.bpk" maxlength="28">
 					</div>
 				</div>
-				<div class="row mb-3">
+				<div class="row mb-3 align-items-center">
 					<label for="stv-details-anrede" class="col-sm-1 col-form-label">Anrede</label>
 					<div class="col-sm-3">
-						<input id="stv-details-anrede" type="text" class="form-control" v-model="data.anrede">
+						<input id="stv-details-anrede" type="text" class="form-control" v-model="data.anrede" maxlength="16">
 					</div>
 					<label for="stv-details-titelpre" class="col-sm-1 col-form-label">Titel Pre</label>
 					<div class="col-sm-3">
-						<input id="stv-details-titelpre" type="text" class="form-control" v-model="data.titelpre">
+						<input id="stv-details-titelpre" type="text" class="form-control" v-model="data.titelpre" maxlength="64">
 					</div>
 					<label for="stv-details-titelpost" class="col-sm-1 col-form-label">Titel Post</label>
 					<div class="col-sm-3">
-						<input id="stv-details-titelpost" type="text" class="form-control" v-model="data.titelpost">
+						<input id="stv-details-titelpost" type="text" class="form-control" v-model="data.titelpost" maxlength="32">
 					</div>
 				</div>
-				<div class="row mb-3">
+				<div class="row mb-3 align-items-center">
 					<label for="stv-details-nachname" class="col-sm-1 col-form-label">Nachname</label>
 					<div class="col-sm-3">
-						<input id="stv-details-nachname" type="text" class="form-control" v-model="data.nachname">
+						<input id="stv-details-nachname" type="text" class="form-control" v-model="data.nachname" maxlength="64">
 					</div>
 					<label for="stv-details-vorname" class="col-sm-1 col-form-label">Vorname</label>
 					<div class="col-sm-3">
-						<input id="stv-details-vorname" type="text" class="form-control" v-model="data.vorname">
+						<input id="stv-details-vorname" type="text" class="form-control" v-model="data.vorname" maxlength="32">
 					</div>
 					<label for="stv-details-vornamen" class="col-sm-1 col-form-label">Vornamen</label>
 					<div class="col-sm-3">
-						<input id="stv-details-vornamen" type="text" class="form-control" v-model="data.vornamen">
+						<input id="stv-details-vornamen" type="text" class="form-control" v-model="data.vornamen" maxlength="128">
 					</div>
 				</div>
-				<div class="row mb-3">
+				<div class="row mb-3 align-items-center">
 					<label for="stv-details-wahlname" class="col-sm-1 col-form-label">Wahlname</label>
 					<div class="col-sm-3">
-						<input id="stv-details-wahlname" type="text" class="form-control" v-model="data.wahlname">
+						<input id="stv-details-wahlname" type="text" class="form-control" v-model="data.wahlname" maxlength="128">
 					</div>
 				</div>
-				<div class="row mb-3">
+				<div class="row mb-3 align-items-center">
 					<label for="dp-input-stv-details-gebdatum" class="col-sm-1 col-form-label">Geburtsdatum</label>
 					<div class="col-sm-3">
-						<vue-date-picker uid="stv-details-gebdatum" v-model="data.gebdatum" :clearable="false" no-today auto-apply :enable-time-picker="false" format="dd.MM.yyyy" preview-format="dd.MM.yyyy"></vue-date-picker>
+						<vue-date-picker id="stv-details-gebdatum" :input-class-name="gebDatumIsInvalid ? 'form-control is-invalid' : (gebDatumIsValid ? 'form-control is-valid' : 'form-control')" uid="stv-details-gebdatum" v-model="data.gebdatum" :clearable="false" no-today auto-apply :enable-time-picker="false" format="dd.MM.yyyy" preview-format="dd.MM.yyyy"></vue-date-picker>
 					</div>
 					<label for="stv-details-gebort" class="col-sm-1 col-form-label">Geburtsort</label>
 					<div class="col-sm-3">
-						<input id="stv-details-gebort" type="text" class="form-control" v-model="data.gebort">
+						<input id="stv-details-gebort" type="text" class="form-control" v-model="data.gebort" maxlength="128">
 					</div>
 					<label for="stv-details-geburtsnation" class="col-sm-1 col-form-label">Geburtsnation</label>
 					<div class="col-sm-3">
@@ -162,17 +266,17 @@ export default {
 						</select>
 					</div>
 				</div>
-				<div class="row mb-3">
+				<div class="row mb-3 align-items-center">
 					<label for="stv-details-svnr" class="col-sm-1 col-form-label">SVNR</label>
 					<div class="col-sm-3">
-						<input id="stv-details-svnr" type="text" class="form-control" v-model="data.svnr">
+						<input id="stv-details-svnr" type="text" class="form-control" v-model="data.svnr" maxlength="16">
 					</div>
 					<label for="stv-details-ersatzkennzeichen" class="col-sm-1 col-form-label">Ersatzkennzeichen</label>
 					<div class="col-sm-3">
-						<input id="stv-details-ersatzkennzeichen" type="text" class="form-control" v-model="data.ersatzkennzeichen">
+						<input id="stv-details-ersatzkennzeichen" type="text" class="form-control" v-model="data.ersatzkennzeichen" maxlength="10">
 					</div>
 				</div>
-				<div class="row mb-3">
+				<div class="row mb-3 align-items-center">
 					<label for="stv-details-staatsbuergerschaft" class="col-sm-1 col-form-label">Staatsbürgerschaft</label>
 					<div class="col-sm-3">
 						<select id="stv-details-staatsbuergerschaft" class="form-control" v-model="data.staatsbuergerschaft">
@@ -183,7 +287,7 @@ export default {
 					</div>
 					<label for="stv-details-matr_nr" class="col-sm-1 col-form-label">Matrikelnummer</label>
 					<div class="col-sm-3">
-						<input id="stv-details-matr_nr" type="text" class="form-control" v-model="data.matr_nr">
+						<input id="stv-details-matr_nr" type="text" class="form-control" v-model="data.matr_nr" maxlength="32">
 					</div>
 					<label for="stv-details-sprache" class="col-sm-1 col-form-label">Sprache</label>
 					<div class="col-sm-3">
@@ -192,7 +296,7 @@ export default {
 						</select>
 					</div>
 				</div>
-				<div class="row mb-3">
+				<div class="row mb-3 align-items-center">
 					<label for="stv-details-geschlecht" class="col-sm-1 col-form-label">Geschlecht</label>
 					<div class="col-sm-3">
 						<select id="stv-details-geschlecht" class="form-control" v-model="data.geschlecht">
@@ -217,7 +321,7 @@ export default {
 					</div>
 					<label for="stv-details-homepage" class="col-sm-1 col-form-label">Homepage</label>
 					<div class="col-sm-3">
-						<input id="stv-details-homepage" type="text" class="form-control" v-model="data.homepage">
+						<input id="stv-details-homepage" type="text" class="form-control" v-model="data.homepage" maxlength="256">
 					</div>
 				</div>
 			</template>
@@ -231,11 +335,11 @@ export default {
 				<div class="row mb-3 align-items-center">
 					<label for="stv-details-student_uid" class="col-sm-1 col-form-label">UID</label>
 					<div class="col-sm-3">
-						<input id="stv-details-student_uid" type="text" class="form-control" v-model="data.student_uid">
+						<input id="stv-details-student_uid" type="text" class="form-control" v-model="data.student_uid" disabled>
 					</div>
 					<label for="stv-details-personenkennzeichen" class="col-sm-1 col-form-label">Personenkennzeichen</label>
 					<div class="col-sm-3">
-						<input id="stv-details-personenkennzeichen" type="text" class="form-control" v-model="data.matrikelnr">
+						<input id="stv-details-personenkennzeichen" type="text" class="form-control" v-model="data.matrikelnr" disabled>
 					</div>
 					<label for="stv-details-aktiv" class="col-sm-1 col-form-label">Aktiv</label>
 					<div class="col-sm-3">
@@ -247,30 +351,31 @@ export default {
 				<div class="row mb-3 align-items-center">
 					<label for="stv-details-semester" class="col-sm-1 col-form-label">Semester</label>
 					<div class="col-sm-3">
-						<input id="stv-details-semester" type="text" class="form-control" v-model="data.semester">
+						<input id="stv-details-semester" type="text" class="form-control" v-model="data.semester" maxlength="2">
 					</div>
 					<label for="stv-details-verband" class="col-sm-1 col-form-label">Verband</label>
 					<div class="col-sm-3">
-						<input id="stv-details-verband" type="text" class="form-control" v-model="data.verband">
+						<input id="stv-details-verband" type="text" class="form-control" v-model="data.verband" maxlength="1">
 					</div>
 					<label for="stv-details-gruppe" class="col-sm-1 col-form-label">Gruppe</label>
 					<div class="col-sm-3">
-						<input id="stv-details-gruppe" type="text" class="form-control" v-model="data.gruppe">
+						<input id="stv-details-gruppe" type="text" class="form-control" v-model="data.gruppe" maxlength="1">
 					</div>
 				</div>
 				<div class="row mb-3 align-items-center">
 					<label for="stv-details-alias" class="col-sm-1 col-form-label">Alias</label>
 					<div class="col-sm-3">
-						<input id="stv-details-alias" type="text" class="form-control" v-model="data.alias">
+						<input id="stv-details-alias" type="text" class="form-control" v-model="data.alias" :disabled="aliasNotAllowed">
 					</div>
 				</div>
 				<div>
-					<button type="button" class="btn btn-primary" @click="save">Speichern</button>
+					<button type="button" class="btn btn-primary" @click="save" :disabled="!changedLength">Speichern</button>
 				</div>
 			</template>
 			<div v-else>
 				Loading...
 			</div>
 		</fieldset>
+		<pv-toast ref="responseToast" style="z-index:9999"></pv-toast>
 	</div>`
 };
\ No newline at end of file

From d1377b3f4e5ece90ce5f57d026f676f438a3a50e Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 3 Oct 2023 16:19:40 +0200
Subject: [PATCH 0122/1461] Searchbar Student Prestudent

---
 application/config/routes.php                 |  2 +-
 .../controllers/components/stv/Student.php    | 33 +++----
 .../controllers/components/stv/Students.php   | 80 +++++++++++++++++
 application/libraries/SearchBarLib.php        | 64 ++++++++++++++
 public/js/apps/Studentenverwaltung.js         |  3 +-
 .../js/components/Stv/Studentenverwaltung.js  | 33 ++++---
 .../Studentenverwaltung/Details/Details.js    | 40 ++++-----
 public/js/components/searchbar/prestudent.js  | 88 +++++++++++++++++++
 public/js/components/searchbar/searchbar.js   |  8 +-
 public/js/components/searchbar/student.js     | 80 +++++++++++++++++
 10 files changed, 374 insertions(+), 57 deletions(-)
 create mode 100644 public/js/components/searchbar/prestudent.js
 create mode 100644 public/js/components/searchbar/student.js

diff --git a/application/config/routes.php b/application/config/routes.php
index a5bd3a7c8..9fad59d88 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -61,7 +61,7 @@ $route['api/v1/organisation/[O|o]rganisationseinheit/(:any)'] = 'api/v1/organisa
 $route['api/v1/ressource/[B|b]etriebsmittelperson/(:any)'] = 'api/v1/ressource/betriebsmittelperson2/$1';
 $route['api/v1/system/[S|s]prache/(:any)'] = 'api/v1/system/sprache2/$1';
 
-$route['studentenverwaltung/(:any)'] = 'Studentenverwaltung/index';
+$route['studentenverwaltung/(:any)/(:any)'] = 'Studentenverwaltung/index';
 
 // load routes from extensions
 $subdir = 'application/config/extensions';
diff --git a/application/controllers/components/stv/Student.php b/application/controllers/components/stv/Student.php
index a407d20c1..20cf8572c 100644
--- a/application/controllers/components/stv/Student.php
+++ b/application/controllers/components/stv/Student.php
@@ -22,26 +22,27 @@ class Student extends FHC_Controller
 		// TODO(chris): stdSem from Variable
 		$studiensemester_kurzbz='SS2023';
 
-		$this->load->model('crm/Student_model', 'StudentModel');
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 
-		$this->StudentModel->addSelect('p.*');
-		$this->StudentModel->addSelect('tbl_student.student_uid');
-		$this->StudentModel->addSelect('matrikelnr');
-		$this->StudentModel->addSelect('b.aktiv');
-		$this->StudentModel->addSelect('v.semester');
-		$this->StudentModel->addSelect('v.verband');
-		$this->StudentModel->addSelect('v.gruppe');
-		$this->StudentModel->addSelect('b.alias');
+		$this->PrestudentModel->addSelect('p.*');
+		$this->PrestudentModel->addSelect('s.student_uid');
+		$this->PrestudentModel->addSelect('matrikelnr');
+		$this->PrestudentModel->addSelect('b.aktiv');
+		$this->PrestudentModel->addSelect('v.semester');
+		$this->PrestudentModel->addSelect('v.verband');
+		$this->PrestudentModel->addSelect('v.gruppe');
+		$this->PrestudentModel->addSelect('b.alias');
 
 		if (defined('ACTIVE_ADDONS') && strpos(ACTIVE_ADDONS, 'bewerbung') !== false) {
-			$this->StudentModel->addSelect("(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung ORDER BY kontakt_id LIMIT 1) AS email_privat", false);
+			$this->PrestudentModel->addSelect("(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung ORDER BY kontakt_id LIMIT 1) AS email_privat", false);
 		}
 
-		$this->StudentModel->addJoin('public.tbl_benutzer b', 'student_uid = uid');
-		$this->StudentModel->addJoin('public.tbl_studentlehrverband v', 'b.uid = v.student_uid AND v.studiensemester_kurzbz = ' . $this->StudentModel->escape($studiensemester_kurzbz), 'LEFT');
-		$this->StudentModel->addJoin('public.tbl_person p', 'person_id');
+		$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id', 'LEFT');
+		$this->PrestudentModel->addJoin('public.tbl_benutzer b', 'student_uid = uid', 'LEFT');
+		$this->PrestudentModel->addJoin('public.tbl_studentlehrverband v', 'b.uid = v.student_uid AND v.studiensemester_kurzbz = ' . $this->PrestudentModel->escape($studiensemester_kurzbz), 'LEFT');
+		$this->PrestudentModel->addJoin('public.tbl_person p', 'p.person_id = tbl_prestudent.person_id');
 
-		$result = $this->StudentModel->loadWhere(['prestudent_id' => $prestudent_id]);
+		$result = $this->PrestudentModel->loadWhere(['prestudent_id' => $prestudent_id]);
 		if (isError($result)) {
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 			$this->outputJson(getError($result));
@@ -119,7 +120,8 @@ class Student extends FHC_Controller
 		$this->form_validation->set_rules('gebdatum', 'Geburtsdatum', 'callback_isValidDate', [
 			'isValidDate' => $this->p->t('ui', 'error_invalid_date')
 		]);
-		// TODO(chris): other validations?
+
+		$this->form_validation->set_rules('semester', 'Semester', 'integer');
 
 		if ($this->form_validation->run() == false) {
 			return $this->outputJsonError($this->form_validation->error_array());
@@ -259,4 +261,5 @@ class Student extends FHC_Controller
 		}
 		return true;
 	}
+
 }
diff --git a/application/controllers/components/stv/Students.php b/application/controllers/components/stv/Students.php
index a0394d12e..941441466 100644
--- a/application/controllers/components/stv/Students.php
+++ b/application/controllers/components/stv/Students.php
@@ -34,6 +34,7 @@ class Students extends FHC_Controller
 	 * /(studiengang_kz)/(org_form)/(semester)/(verband)/(gruppe)
 	 * 														=> getStudents
 	 * /uid/(student_uid)									=> getStudent
+	 * /prestudent/(prestudent_id)                          => getPrestudent
 	 *
 	 * @param string		$method
 	 * @param array			$params				(optional)
@@ -67,6 +68,9 @@ class Students extends FHC_Controller
 		if ($method == 'uid' && $count == 1)
 			return $this->getStudent($params[0]);
 
+		if ($method == 'prestudent' && $count == 1)
+			return $this->getPrestudent($params[0]);
+
 		if (is_numeric($params[0])) {
 			$sem = $params[0];
 			if ($count == 3 && $params[1] == 'grp') {
@@ -341,4 +345,80 @@ class Students extends FHC_Controller
 			$this->outputJson(getData($result) ?: []);
 		}
 	}
+
+	/**
+	 * @param string		$prestudent_id
+	 *
+	 * @return void
+	 */
+	protected function getPrestudent($prestudent_id)
+	{
+		// TODO(chris): stdSem from Variable
+		$studiensemester_kurzbz='SS2023';
+
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+		$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
+		$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id', 'LEFT');
+		$this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid', 'LEFT');
+		$this->PrestudentModel->addJoin(
+			'public.tbl_studentlehrverband v',
+			'v.student_uid=s.student_uid AND v.studiensemester_kurzbz=' . $this->PrestudentModel->escape($studiensemester_kurzbz),
+			'LEFT'
+		);
+
+		$this->PrestudentModel->addSelect('p.person_id');
+		$this->PrestudentModel->addSelect('tbl_prestudent.prestudent_id');
+		$this->PrestudentModel->addSelect('b.uid');
+		$this->PrestudentModel->addSelect('titelpre');
+		$this->PrestudentModel->addSelect('titelpost');
+		$this->PrestudentModel->addSelect('vorname');
+		$this->PrestudentModel->addSelect('wahlname');
+		$this->PrestudentModel->addSelect('vornamen');
+		$this->PrestudentModel->addSelect('geschlecht');
+		$this->PrestudentModel->addSelect('nachname');
+		$this->PrestudentModel->addSelect('gebdatum');
+		$this->PrestudentModel->addSelect('tbl_prestudent.anmerkung');
+		$this->PrestudentModel->addSelect('ersatzkennzeichen');
+		$this->PrestudentModel->addSelect('svnr');
+		$this->PrestudentModel->addSelect('s.matrikelnr');
+		$this->PrestudentModel->addSelect('p.anmerkung AS anmerkungen');
+		$this->PrestudentModel->addSelect('v.semester');
+		$this->PrestudentModel->addSelect('v.verband');
+		$this->PrestudentModel->addSelect('v.gruppe');
+		$this->PrestudentModel->addSelect('tbl_prestudent.studiengang_kz');
+		$this->PrestudentModel->addSelect('aufmerksamdurch_kurzbz');
+		$this->PrestudentModel->addSelect('mentor');
+		$this->PrestudentModel->addSelect('b.aktiv AS bnaktiv');
+		$this->PrestudentModel->addSelect(
+			"(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung LIMIT 1) AS email_privat",
+			false
+		);
+		$this->PrestudentModel->addSelect(
+			"(SELECT rt_gesamtpunkte AS punkte FROM public.tbl_prestudent WHERE prestudent_id=s.prestudent_id) AS punkte",
+			false
+		);
+		$this->PrestudentModel->addSelect('tbl_prestudent.dual');
+		$this->PrestudentModel->addSelect('tbl_prestudent.reihungstest_id');
+		$this->PrestudentModel->addSelect('tbl_prestudent.anmeldungreihungstest');
+		$this->PrestudentModel->addSelect('p.matr_nr');
+		$this->PrestudentModel->addSelect('tbl_prestudent.gsstudientyp_kurzbz');
+		$this->PrestudentModel->addSelect('tbl_prestudent.aufnahmegruppe_kurzbz');
+		$this->PrestudentModel->addSelect('tbl_prestudent.priorisierung');
+		$this->PrestudentModel->addSelect('p.zugangscode');
+		$this->PrestudentModel->addSelect('p.bpk');
+
+		$where = [];
+
+		$result = $this->PrestudentModel->loadWhere([
+			'tbl_prestudent.prestudent_id' => $prestudent_id
+		]);
+
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->outputJson(getError($result));
+		} else {
+			$this->outputJson(getData($result) ?: []);
+		}
+	}
 }
diff --git a/application/libraries/SearchBarLib.php b/application/libraries/SearchBarLib.php
index 3a9d06d13..e49910e5a 100644
--- a/application/libraries/SearchBarLib.php
+++ b/application/libraries/SearchBarLib.php
@@ -260,6 +260,35 @@ class SearchBarLib
 	 */
 	private function _student($searchstr, $type)
 	{
+		$dbModel = new DB_Model();
+
+		$students = $dbModel->execReadOnlyQuery('
+		SELECT
+			\''.$type.'\' AS type,
+			s.student_uid AS uid,
+			s.matrikelnr,
+			p.person_id AS person_id,
+			p.vorname || \' \' || p.nachname AS name,
+			k.kontakt as email ,
+			p.foto
+			FROM public.tbl_student s
+			JOIN public.tbl_benutzer b ON(b.uid = s.student_uid)
+			JOIN public.tbl_person p USING(person_id)
+			LEFT JOIN (
+				SELECT kontakt, person_id
+				FROM public.tbl_kontakt
+					WHERE kontakttyp = \'email\'
+			) as k USING(person_id)
+				WHERE b.uid ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
+			OR p.vorname ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
+			OR p.nachname ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
+					GROUP BY type, s.student_uid, s.matrikelnr, p.person_id, name, email, p.foto
+	');
+
+		// If something has been found then return it
+		if (hasData($students)) return getData($students);
+
+		// Otherwise return an empty array
 		return array();
 	}
 
@@ -268,6 +297,41 @@ class SearchBarLib
 	 */
 	private function _prestudent($searchstr, $type)
 	{
+		$dbModel = new DB_Model();
+
+		$prestudent = $dbModel->execReadOnlyQuery('
+		SELECT
+			\''.$type.'\' AS type,
+			ps.prestudent_id,
+			ps.studiengang_kz,
+			p.person_id AS person_id,
+			b.uid,
+			p.vorname || \' \' || p.nachname AS name,
+			(
+				SELECT kontakt
+				FROM public.tbl_kontakt
+				WHERE kontakttyp = \'email\'
+				AND person_id = p.person_id
+				LIMIT 1
+			) as email,
+			p.foto,
+			sg.bezeichnung
+			FROM public.tbl_prestudent ps
+			LEFT JOIN public.tbl_student s USING (prestudent_id)
+			LEFT JOIN public.tbl_benutzer b ON (b.uid = s.student_uid)
+			JOIN public.tbl_person p ON (p.person_id = ps.person_id)
+			LEFT JOIN public.tbl_studiengang sg ON (sg.studiengang_kz = ps.studiengang_kz)
+			WHERE b.uid ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
+				OR p.vorname ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
+				OR p.nachname ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
+				or cast(ps.prestudent_id as text) ILIKE \'%'.$dbModel->escapeLIKE($searchstr).'%\'
+			GROUP BY type, b.uid, ps.prestudent_id, ps.studiengang_kz, sg.bezeichnung, s.student_uid, s.matrikelnr, p.person_id, name, email, p.foto
+			');
+
+		// If something has been found then return it
+		if (hasData($prestudent)) return getData($prestudent);
+
+		// Otherwise return an empty array
 		return array();
 	}
 
diff --git a/public/js/apps/Studentenverwaltung.js b/public/js/apps/Studentenverwaltung.js
index 2fc79fbdb..2b6cc4c46 100644
--- a/public/js/apps/Studentenverwaltung.js
+++ b/public/js/apps/Studentenverwaltung.js
@@ -26,7 +26,8 @@ const router = VueRouter.createRouter({
 	history: VueRouter.createWebHistory(),
 	routes: [
 		{ path: `/${ciPath}/studentenverwaltung`, component: FhcStudentenverwaltung },
-		{ path: `/${ciPath}/studentenverwaltung/:id`, component: FhcStudentenverwaltung }
+		{ path: `/${ciPath}/studentenverwaltung/prestudent/:prestudent_id`, component: FhcStudentenverwaltung },
+		{ path: `/${ciPath}/studentenverwaltung/student/:id`, component: FhcStudentenverwaltung }
 	]
 });
 
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index bc30ed02a..e171b665f 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -50,35 +50,28 @@ export default {
 			selected: [],
 			searchbaroptions: {
 				types: [
-					"person",
 					"student",
 					"prestudent"
 				],
 				actions: {
-					person: {
+					student: {
 						defaultaction: {
 							type: "link",
 							action: function(data) { 
-								return data.profil;
+								return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/studentenverwaltung/student/' + data.uid;
 							}
 						},
 						childactions: [
-							{
-								"label": "testchildaction1",
-								"icon": "fas fa-check-circle",
-								"type": "function",
-								"action": function(data) { 
-									alert('person testchildaction 01 ' + JSON.stringify(data)); 
-								}
-							},
-							{
-								"label": "testchildaction2",
-								"icon": "fas fa-file-csv",
-								"type": "function",
-								"action": function(data) { 
-									alert('person testchildaction 02 ' + JSON.stringify(data)); 
-								}
+						]
+					},
+					prestudent: {
+						defaultaction: {
+							type: "link",
+							action: function(data) {
+								return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/studentenverwaltung/prestudent/' + data.prestudent_id;
 							}
+						},
+						childactions: [
 						]
 					}
 				}
@@ -102,6 +95,10 @@ export default {
 		if (this.$route.params.id) {
 			this.$refs.stvList.updateUrl('components/stv/students/uid/' + this.$route.params.id);
 		}
+		if (this.$route.params.prestudent_id) {
+			this.$refs.stvList.updateUrl('components/stv/students/prestudent/' + this.$route.params.prestudent_id);
+		}
+
 	},
 	template: `
 	<header class="navbar navbar-expand-lg navbar-dark bg-dark flex-md-nowrap p-0 shadow">
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
index a3433584a..22c4deb0f 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
@@ -189,22 +189,19 @@ export default {
 			});
 		this.updateStudent(this.student);
 	},
-	mounted() {
-		console.log();
-	},
 	//TODO(chris): Geburtszeit? Anzahl der Kinder?
 	template: `
 	<div ref="form" class="stv-details-details h-100 pb-3">
-		<fieldset>
+		<fieldset class="overflow-hidden">
 			<legend>Person</legend>
 			<template v-if="data">
-				<div class="row mb-3 align-items-center">
+				<div class="row mb-3">
 					<label for="stv-details-person_id" class="col-sm-1 col-form-label">Person ID</label>
 					<div class="col-sm-3">
 						<input id="stv-details-person_id" type="text" class="form-control" v-model="data.person_id" disabled>
 					</div>
 					<label v-if="showZugangscode" for="stv-details-zugangscode" class="col-sm-1 col-form-label">Zugangscode</label>
-					<div v-if="showZugangscode" class="col-sm-3">
+					<div v-if="showZugangscode" class="col-sm-3 align-self-center">
 						<span class="form-text">
 							<a :href="cisRoot + 'addons/bewerbung/cis/registration.php?code=' + data.zugangscode + '&emailAdresse=' + data.email_privat" target="_blank">{{data.zugangscode}}</a>
 						</span>
@@ -214,7 +211,7 @@ export default {
 						<input id="stv-details-bpk" type="text" class="form-control" v-model="data.bpk" maxlength="28">
 					</div>
 				</div>
-				<div class="row mb-3 align-items-center">
+				<div class="row mb-3">
 					<label for="stv-details-anrede" class="col-sm-1 col-form-label">Anrede</label>
 					<div class="col-sm-3">
 						<input id="stv-details-anrede" type="text" class="form-control" v-model="data.anrede" maxlength="16">
@@ -228,7 +225,7 @@ export default {
 						<input id="stv-details-titelpost" type="text" class="form-control" v-model="data.titelpost" maxlength="32">
 					</div>
 				</div>
-				<div class="row mb-3 align-items-center">
+				<div class="row mb-3">
 					<label for="stv-details-nachname" class="col-sm-1 col-form-label">Nachname</label>
 					<div class="col-sm-3">
 						<input id="stv-details-nachname" type="text" class="form-control" v-model="data.nachname" maxlength="64">
@@ -242,13 +239,13 @@ export default {
 						<input id="stv-details-vornamen" type="text" class="form-control" v-model="data.vornamen" maxlength="128">
 					</div>
 				</div>
-				<div class="row mb-3 align-items-center">
+				<div class="row mb-3">
 					<label for="stv-details-wahlname" class="col-sm-1 col-form-label">Wahlname</label>
 					<div class="col-sm-3">
 						<input id="stv-details-wahlname" type="text" class="form-control" v-model="data.wahlname" maxlength="128">
 					</div>
 				</div>
-				<div class="row mb-3 align-items-center">
+				<div class="row mb-3">
 					<label for="dp-input-stv-details-gebdatum" class="col-sm-1 col-form-label">Geburtsdatum</label>
 					<div class="col-sm-3">
 						<vue-date-picker id="stv-details-gebdatum" :input-class-name="gebDatumIsInvalid ? 'form-control is-invalid' : (gebDatumIsValid ? 'form-control is-valid' : 'form-control')" uid="stv-details-gebdatum" v-model="data.gebdatum" :clearable="false" no-today auto-apply :enable-time-picker="false" format="dd.MM.yyyy" preview-format="dd.MM.yyyy"></vue-date-picker>
@@ -266,7 +263,7 @@ export default {
 						</select>
 					</div>
 				</div>
-				<div class="row mb-3 align-items-center">
+				<div class="row mb-3">
 					<label for="stv-details-svnr" class="col-sm-1 col-form-label">SVNR</label>
 					<div class="col-sm-3">
 						<input id="stv-details-svnr" type="text" class="form-control" v-model="data.svnr" maxlength="16">
@@ -276,7 +273,7 @@ export default {
 						<input id="stv-details-ersatzkennzeichen" type="text" class="form-control" v-model="data.ersatzkennzeichen" maxlength="10">
 					</div>
 				</div>
-				<div class="row mb-3 align-items-center">
+				<div class="row mb-3">
 					<label for="stv-details-staatsbuergerschaft" class="col-sm-1 col-form-label">Staatsbürgerschaft</label>
 					<div class="col-sm-3">
 						<select id="stv-details-staatsbuergerschaft" class="form-control" v-model="data.staatsbuergerschaft">
@@ -296,7 +293,7 @@ export default {
 						</select>
 					</div>
 				</div>
-				<div class="row mb-3 align-items-center">
+				<div class="row mb-3">
 					<label for="stv-details-geschlecht" class="col-sm-1 col-form-label">Geschlecht</label>
 					<div class="col-sm-3">
 						<select id="stv-details-geschlecht" class="form-control" v-model="data.geschlecht">
@@ -329,10 +326,10 @@ export default {
 				Loading...
 			</div>
 		</fieldset>
-		<fieldset>
+		<fieldset v-if="data?.student_uid" class="overflow-hidden">
 			<legend>StudentIn</legend>
 			<template v-if="data">
-				<div class="row mb-3 align-items-center">
+				<div class="row mb-3">
 					<label for="stv-details-student_uid" class="col-sm-1 col-form-label">UID</label>
 					<div class="col-sm-3">
 						<input id="stv-details-student_uid" type="text" class="form-control" v-model="data.student_uid" disabled>
@@ -342,13 +339,13 @@ export default {
 						<input id="stv-details-personenkennzeichen" type="text" class="form-control" v-model="data.matrikelnr" disabled>
 					</div>
 					<label for="stv-details-aktiv" class="col-sm-1 col-form-label">Aktiv</label>
-					<div class="col-sm-3">
+					<div class="col-sm-3 align-self-center">
 						<div class="form-check">
 							<input id="stv-details-aktiv" type="checkbox" class="form-check-input" v-model="data.aktiv">
 						</div>
 					</div>
 				</div>
-				<div class="row mb-3 align-items-center">
+				<div class="row mb-3">
 					<label for="stv-details-semester" class="col-sm-1 col-form-label">Semester</label>
 					<div class="col-sm-3">
 						<input id="stv-details-semester" type="text" class="form-control" v-model="data.semester" maxlength="2">
@@ -362,20 +359,21 @@ export default {
 						<input id="stv-details-gruppe" type="text" class="form-control" v-model="data.gruppe" maxlength="1">
 					</div>
 				</div>
-				<div class="row mb-3 align-items-center">
+				<div class="row mb-3">
 					<label for="stv-details-alias" class="col-sm-1 col-form-label">Alias</label>
 					<div class="col-sm-3">
 						<input id="stv-details-alias" type="text" class="form-control" v-model="data.alias" :disabled="aliasNotAllowed">
 					</div>
 				</div>
-				<div>
-					<button type="button" class="btn btn-primary" @click="save" :disabled="!changedLength">Speichern</button>
-				</div>
+
 			</template>
 			<div v-else>
 				Loading...
 			</div>
 		</fieldset>
+		<div>
+			<button type="button" class="btn btn-primary" @click="save" :disabled="!changedLength">Speichern</button>
+		</div>
 		<pv-toast ref="responseToast" style="z-index:9999"></pv-toast>
 	</div>`
 };
\ No newline at end of file
diff --git a/public/js/components/searchbar/prestudent.js b/public/js/components/searchbar/prestudent.js
new file mode 100644
index 000000000..0f7429075
--- /dev/null
+++ b/public/js/components/searchbar/prestudent.js
@@ -0,0 +1,88 @@
+import action from "./action.js";
+import actions from "./actions.js";
+
+export default {
+	props: [ "res", "actions" ],
+	components: {
+		action: action,
+		actions: actions
+	},
+	emits: [ 'actionexecuted' ],
+	template: `
+		<div class="searchbar_result searchbar_prestudent">
+		
+			<div class="searchbar_grid">
+				<div class="searchbar_icon">
+					<action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
+						<img v-if="(typeof res.foto !== 'undefined') && (res.foto !== null)"
+							 :src="'data:image/jpeg;base64,' + res.foto"
+							 class="rounded-circle" height="100"/>
+						<i v-else class="fas fa-user-circle fa-5x"></i>
+					</action>
+				</div>
+		
+				<div class="searchbar_data">
+					<action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
+						<span class="fw-bold">{{ res.name }}</span>
+					</action>
+		
+					<div class="mb-3"></div>
+		
+					<div class="searchbar_table">
+		
+						<div class="searchbar_tablerow">
+							<div class="searchbar_tablecell">Prestudent_id</div>
+							<div class="searchbar_tablecell">
+								{{ res.prestudent_id }}
+							</div>
+						</div>
+		
+						<div class="searchbar_tablerow">
+							<div class="searchbar_tablecell">Student_uid</div>
+							<div class="searchbar_tablecell">
+								{{ res.uid }}
+							</div>
+						</div>
+		
+						<div class="searchbar_tablerow">
+							<div class="searchbar_tablecell">Person_id</div>
+							<div class="searchbar_tablecell">
+								{{ res.person_id }}
+							</div>
+						</div>
+		
+						<div class="searchbar_tablerow">
+							<div class="searchbar_tablecell">Studiengang</div>
+							<div class="searchbar_tablecell">
+								{{ res.bezeichnung }}
+							</div>
+						</div>
+		
+						<div class="searchbar_tablerow">
+							<div class="searchbar_tablecell">EMail</div>
+							<div class="searchbar_tablecell">
+								<a :href="this.mailtourl">
+									{{ res.email }}
+								</a>
+							</div>
+						</div>
+		
+		
+					</div>
+		
+					<actions :res="this.res" :actions="this.actions.childactions"
+							 @actionexecuted="$emit('actionexecuted')"></actions>
+		
+				</div>
+			</div>
+		
+		</div>
+    `,
+	methods: {
+	},
+	computed: {
+		mailtourl: function() {
+			return 'mailto:' + this.res.email;
+		}
+	}
+};
\ No newline at end of file
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 7c0993e8a..cd6ee90e1 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -2,6 +2,8 @@ import person from "./person.js";
 import raum from "./raum.js";
 import employee from "./employee.js";
 import organisationunit from "./organisationunit.js";
+import student from "./student.js";
+import prestudent from "./prestudent.js";
 
 export default {
     props: [ "searchoptions", "searchfunction" ],
@@ -24,7 +26,9 @@ export default {
       person: person,
       raum: raum,
       employee: employee,
-      organisationunit: organisationunit
+      organisationunit: organisationunit,
+      student: student,
+      prestudent: prestudent
     },
     template: `
           <form ref="searchform" class="d-flex me-3" action="javascript:void(0);" 
@@ -45,6 +49,8 @@ export default {
               <div v-else-if="this.searchresult.length < 1">Es wurden keine Ergebnisse gefunden.</div>
               <template v-else="" v-for="res in this.searchresult">
                 <person v-if="res.type === 'person'" :res="res" :actions="this.searchoptions.actions.person" @actionexecuted="this.hideresult"></person>
+                <student v-else-if="res.type === 'student'" :res="res" :actions="this.searchoptions.actions.student" @actionexecuted="this.hideresult"></student>
+                <prestudent v-else-if="res.type === 'prestudent'" :res="res" :actions="this.searchoptions.actions.prestudent" @actionexecuted="this.hideresult"></prestudent>
                 <employee v-else-if="res.type === 'mitarbeiter'" :res="res" :actions="this.searchoptions.actions.employee" @actionexecuted="this.hideresult"></employee>
                 <organisationunit v-else-if="res.type === 'organisationunit'" :res="res" :actions="this.searchoptions.actions.organisationunit" @actionexecuted="this.hideresult"></organisationunit>
                 <raum v-else-if="res.type === 'raum'" :res="res" :actions="this.searchoptions.actions.raum" @actionexecuted="this.hideresult"></raum>
diff --git a/public/js/components/searchbar/student.js b/public/js/components/searchbar/student.js
new file mode 100644
index 000000000..73253237c
--- /dev/null
+++ b/public/js/components/searchbar/student.js
@@ -0,0 +1,80 @@
+import action from "./action.js";
+import actions from "./actions.js";
+
+export default {
+    props: [ "res", "actions" ],
+    components: {
+        action: action,
+        actions: actions
+    },
+    emits: [ 'actionexecuted' ],
+    template: `
+        <div class="searchbar_result searchbar_student">
+        
+            <div class="searchbar_grid">
+                <div class="searchbar_icon">
+                    <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
+                        <img v-if="(typeof res.foto !== 'undefined') && (res.foto !== null)"
+                             :src="'data:image/jpeg;base64,' + res.foto"
+                             class="rounded-circle" height="100"/>
+                        <i v-else class="fas fa-user-circle fa-5x"></i>
+                    </action>
+                </div>
+        
+                <div class="searchbar_data">
+                    <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
+                        <span class="fw-bold">{{ res.name }}</span>
+                    </action>
+        
+                    <div class="mb-3"></div>
+                
+                    <div class="searchbar_table">
+        
+                        <div class="searchbar_tablerow">
+                            <div class="searchbar_tablecell">Student_uid</div>
+                            <div class="searchbar_tablecell">
+                                {{ res.uid }}
+                            </div>
+                        </div>
+        
+                        <div class="searchbar_tablerow">
+                            <div class="searchbar_tablecell">Person_id</div>
+                            <div class="searchbar_tablecell">
+                                {{ res.person_id }}
+                            </div>
+                        </div>
+        
+                        <div class="searchbar_tablerow">
+                            <div class="searchbar_tablecell">Matrikelnummer</div>
+                            <div class="searchbar_tablecell">
+                                {{ res.matrikelnr }}
+                            </div>
+                        </div>
+        
+                        <div class="searchbar_tablerow">
+                            <div class="searchbar_tablecell">EMail</div>
+                            <div class="searchbar_tablecell">
+                                <a :href="this.mailtourl">
+                                    {{ res.email }}
+                                </a>
+                            </div>
+                        </div>
+        
+                    </div>
+        
+                    <actions :res="this.res" :actions="this.actions.childactions"
+                             @actionexecuted="$emit('actionexecuted')"></actions>
+        
+                </div>
+            </div>
+        
+        </div>
+    `,
+    methods: {
+    },
+    computed: {
+        mailtourl: function() {
+            return 'mailto:' + this.res.email;
+        }
+    }
+};
\ No newline at end of file

From 484a48e309a9fd4f6be17276182e5c6c59bcde7b Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 5 Oct 2023 11:08:52 +0200
Subject: [PATCH 0123/1461] Studiensemester in Variable

---
 .../controllers/Studentenverwaltung.php       |  4 +
 .../controllers/components/stv/Students.php   | 12 +--
 .../components/stv/Studiensemester.php        | 59 +++++++++++++
 application/views/Studentenverwaltung.php     |  1 +
 .../js/components/Stv/Studentenverwaltung.js  | 11 ++-
 .../Stv/Studentenverwaltung/List.js           | 19 ++--
 .../Studentenverwaltung/Studiensemester.js    | 86 +++++++++++++++++++
 7 files changed, 175 insertions(+), 17 deletions(-)
 create mode 100644 application/controllers/components/stv/Studiensemester.php
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Studiensemester.js

diff --git a/application/controllers/Studentenverwaltung.php b/application/controllers/Studentenverwaltung.php
index 64db67ef1..f2bb75b71 100644
--- a/application/controllers/Studentenverwaltung.php
+++ b/application/controllers/Studentenverwaltung.php
@@ -16,11 +16,15 @@ class Studentenverwaltung extends FHC_Controller
 	{
 		$this->load->library('AuthLib');
 		$this->load->library('PermissionLib');
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
 
 		$this->load->view('Studentenverwaltung', [
 			'permissions' => [
 				'student/bpk' => $this->permissionlib->isBerechtigt('student/bpk'),
 				'student/alias' => $this->permissionlib->isBerechtigt('student/alias')
+			],
+			'variables' => [
+				'semester_aktuell' => $this->variablelib->getVar('semester_aktuell')
 			]
 		]);
 	}
diff --git a/application/controllers/components/stv/Students.php b/application/controllers/components/stv/Students.php
index 941441466..ff4558400 100644
--- a/application/controllers/components/stv/Students.php
+++ b/application/controllers/components/stv/Students.php
@@ -8,6 +8,9 @@ class Students extends FHC_Controller
 	{
 		// TODO(chris): access!
 		parent::__construct();
+
+		$this->load->library('AuthLib');
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
 	}
 
 	/**
@@ -169,8 +172,7 @@ class Students extends FHC_Controller
 	 */
 	protected function getStudents($studiengang_kz, $semester = null, $verband = null, $gruppe = null, $gruppe_kurzbz = null, $orgform_kurzbz = null)
 	{
-		// TODO(chris): stdSem from Variable
-		$studiensemester_kurzbz='SS2023';
+		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
 		
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 
@@ -277,8 +279,7 @@ class Students extends FHC_Controller
 	 */
 	protected function getStudent($student_uid)
 	{
-		// TODO(chris): stdSem from Variable
-		$studiensemester_kurzbz='SS2023';
+		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
 
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 
@@ -353,8 +354,7 @@ class Students extends FHC_Controller
 	 */
 	protected function getPrestudent($prestudent_id)
 	{
-		// TODO(chris): stdSem from Variable
-		$studiensemester_kurzbz='SS2023';
+		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
 
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 
diff --git a/application/controllers/components/stv/Studiensemester.php b/application/controllers/components/stv/Studiensemester.php
new file mode 100644
index 000000000..3c23a1534
--- /dev/null
+++ b/application/controllers/components/stv/Studiensemester.php
@@ -0,0 +1,59 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Studiensemester extends FHC_Controller
+{
+	public function __construct()
+	{
+		// TODO(chris): access!
+		parent::__construct();
+	}
+
+	public function index()
+	{
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
+		$this->StudiensemesterModel->addOrder('start');
+
+		$result = $this->StudiensemesterModel->load();
+
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->outputJson(getError($result));
+		} elseif (!hasData($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_NOT_FOUND);
+			$this->outputJson('NOT FOUND');
+		} else {
+			$this->outputJson(getData($result));
+		}
+	}
+
+	public function set()
+	{
+		$this->load->library('AuthLib');
+		$this->load->library('form_validation');
+
+		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+
+		$this->form_validation->set_rules('studiensemester', 'Studiensemester', 'required');
+
+		if ($this->form_validation->run() == false) {
+			$this->output->set_status_header(HTTP_BAD_REQUEST);
+			return $this->outputJson($this->form_validation->error_array());
+		}
+
+		$stdsem = $this->input->post('studiensemester');
+
+		$this->load->model('system/Variable_model', 'VariableModel');
+
+		$result = $this->VariableModel->setVariable(getAuthUID(), 'semester_aktuell', $stdsem);
+
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson(getError($result));
+		}
+
+		$this->outputJsonSuccess(true);
+	}
+}
diff --git a/application/views/Studentenverwaltung.php b/application/views/Studentenverwaltung.php
index 5928a2b00..50a8ed3c4 100644
--- a/application/views/Studentenverwaltung.php
+++ b/application/views/Studentenverwaltung.php
@@ -26,6 +26,7 @@
 
 	<div id="main">
 		<router-view
+			default-semester="<?= $variables['semester_aktuell']; ?>"
 			active-addons="<?= defined('ACTIVE_ADDONS') ? ACTIVE_ADDONS : ''; ?>"
 			cis-root="<?= CIS_ROOT; ?>"
 			:permissions="<?= htmlspecialchars(json_encode($permissions)); ?>"
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index e171b665f..111663e47 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -20,17 +20,20 @@ import VerticalSplit from "../verticalsplit/verticalsplit.js";
 import StvVerband from "./Studentenverwaltung/Verband.js";
 import StvList from "./Studentenverwaltung/List.js";
 import StvDetails from "./Studentenverwaltung/Details.js";
+import StvStudiensemester from "./Studentenverwaltung/Studiensemester.js";
 
 
 export default {
 	components: {
 		FhcSearchbar,
+		VerticalSplit,
 		StvVerband,
 		StvList,
 		StvDetails,
-		VerticalSplit
+		StvStudiensemester
 	},
 	props: {
+		defaultSemester: String,
 		config: Object,
 		permissions: Object,
 		cisRoot: String,
@@ -89,6 +92,9 @@ export default {
 		},
 		searchfunction(searchsettings) {
 			return Vue.$fhcapi.Search.search(searchsettings);  
+		},
+		studiensemesterChanged() {
+			this.$refs.stvList.updateUrl();
 		}
 	},
 	mounted() {
@@ -112,7 +118,8 @@ export default {
 				<div class="offcanvas-header justify-content-end px-1 d-md-none">
 					<button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" aria-label="Close"></button>
 				</div>
-				<stv-verband @select-verband="onSelectVerband"></stv-verband>
+				<stv-verband @select-verband="onSelectVerband" class="col" style="height:0%"></stv-verband>
+				<stv-studiensemester :default="defaultSemester" @changed="studiensemesterChanged"></stv-studiensemester>
 			</nav>
 			<main class="col-md-8 ms-sm-auto col-lg-9 col-xl-10">
 				<vertical-split>
diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index 61631029e..f9ba77213 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -78,22 +78,23 @@ export default {
 			this.$emit('update:selected', data);
 		},
 		updateUrl(url) {
-			this.$refs.table.tabulator.on("dataProcessed", () => {
-				let rows = this.$refs.table.tabulator.getRows();
-				if (rows.length && rows.length == 1) {
-					this.$refs.table.tabulator.selectRow();
-				}
-			});
-			
+			if (url)
+				url = CoreRESTClient._generateRouterURI(url);
 			if (!this.$refs.table.tableBuilt)
 				this.$refs.table.tabulator.on("tableBuilt", () => {
-					this.$refs.table.tabulator.setData(CoreRESTClient._generateRouterURI(url));
+					this.$refs.table.tabulator.setData(url);
 				});
 			else
-				this.$refs.table.tabulator.setData(CoreRESTClient._generateRouterURI(url));
+				this.$refs.table.tabulator.setData(url);
 		}
 	},
 	mounted() {
+		this.$refs.table.tabulator.on("dataProcessed", () => {
+			let rows = this.$refs.table.tabulator.getRows();
+			if (rows.length && rows.length == 1) {
+				this.$refs.table.tabulator.selectRow();
+			}
+		});
 	},
 	template: `
 	<div class="stv-list h-100 pt-3">
diff --git a/public/js/components/Stv/Studentenverwaltung/Studiensemester.js b/public/js/components/Stv/Studentenverwaltung/Studiensemester.js
new file mode 100644
index 000000000..09d0cb532
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Studiensemester.js
@@ -0,0 +1,86 @@
+import {CoreRESTClient} from '../../../RESTClient.js';
+
+export default {
+	emits: [
+		'changed'
+	],
+	props: {
+		default: {
+			type: String,
+			default: ''
+		}
+	},
+	data() {
+		return {
+			current: 0,
+			loading: true,
+			list: []
+		};
+	},
+	methods: {
+		set(n) {
+			this.loading = true;
+			let fallback = this.current;
+			this.current = n;
+			this.save(fallback);
+		},
+		next() {
+			this.loading = true;
+			let fallback = this.current;
+			if (this.current++ >= this.list.length)
+				this.current = this.list.length - 1;
+			this.save(fallback);
+		},
+		prev() {
+			this.loading = true;
+			let fallback = this.current;
+			if (this.current-- < 0)
+				this.current = 0;
+			this.save(fallback);
+		},
+		save(fallback) {
+			CoreRESTClient
+				.post('components/stv/studiensemester/set', {
+					studiensemester: this.list[this.current]
+				})
+				.then(() => {
+					this.loading = false;
+					this.$emit('changed');
+				})
+				.catch(() => {
+					this.current = fallback;
+					// TODO(chris): emit error
+				});
+		}
+	},
+	created() {
+		CoreRESTClient
+			.get('components/stv/studiensemester')
+			.then(result => result.data)
+			.then(result => {
+				this.list = result.map(el => el.studiensemester_kurzbz);
+				this.loading = false;
+				this.current = this.list.indexOf(this.default);
+			})
+			.catch(error => {
+				console.error(error);
+			});
+	},
+	template: `
+	<div class="stv-studiensemester">
+		<div class="btn-group w-100 dropup" role="group" aria-label="Basic example">
+			<button type="button" class="btn btn-outline-secondary flex-grow-0" @click="prev"><i class="fa-solid fa-caret-left"></i></button>
+			<button type="button" class="btn btn-outline-secondary" data-bs-toggle="dropdown" data-bs-display="static" data-bs-offset="0,0" aria-expanded="false">
+				{{list[current]}}
+				<i v-if="loading" class="fa-solid fa-spinner fa-spin"></i>
+			</button>
+			<ul class="dropdown-menu dropdown-menu-dark overflow-auto w-100" style="max-height:60vh">
+				<li v-for="(item, index) in list" :key="index">
+					<a class="dropdown-item" :class="{active: index == current}" :aria-current="index == current ? 'true' : 'false'" href="#" @click="set(index)">{{item}}</a>
+				</li>
+			</ul>
+			<button type="button" class="btn btn-outline-secondary flex-grow-0" @click="next"><i class="fa-solid fa-caret-right"></i></button>
+		</div>
+	</div>
+	`
+}
\ No newline at end of file

From e28261f4f64fb8d12e5dba7896041f406ee77fe5 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 5 Oct 2023 15:41:55 +0200
Subject: [PATCH 0124/1461] Studiensemester in Variable

---
 application/controllers/components/stv/Student.php  | 10 ++++++----
 application/controllers/components/stv/Students.php |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/application/controllers/components/stv/Student.php b/application/controllers/components/stv/Student.php
index 20cf8572c..0acc37c64 100644
--- a/application/controllers/components/stv/Student.php
+++ b/application/controllers/components/stv/Student.php
@@ -11,6 +11,10 @@ class Student extends FHC_Controller
 		// TODO(chris): access!
 		parent::__construct();
 
+		// Load Libraries
+		$this->load->library('AuthLib');
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+
 		// Load language phrases
 		$this->loadPhrases([
 			'ui'
@@ -19,8 +23,7 @@ class Student extends FHC_Controller
 
 	public function get($prestudent_id)
 	{
-		// TODO(chris): stdSem from Variable
-		$studiensemester_kurzbz='SS2023';
+		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
 
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 
@@ -105,8 +108,7 @@ class Student extends FHC_Controller
 
 	public function save($prestudent_id)
 	{
-		// TODO(chris): stdSem from Variable
-		$studiensemester_kurzbz='SS2023';
+		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
 
 		$this->load->model('person/Person_model', 'PersonModel');
 		$this->load->model('crm/Student_model', 'StudentModel');
diff --git a/application/controllers/components/stv/Students.php b/application/controllers/components/stv/Students.php
index ff4558400..d707173b9 100644
--- a/application/controllers/components/stv/Students.php
+++ b/application/controllers/components/stv/Students.php
@@ -9,6 +9,7 @@ class Students extends FHC_Controller
 		// TODO(chris): access!
 		parent::__construct();
 
+		// Load Libraries
 		$this->load->library('AuthLib');
 		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
 	}

From 39ed309dd51749a409dd70a620ac88419e6835ec Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 9 Oct 2023 11:10:06 +0200
Subject: [PATCH 0125/1461] autoselect rows

---
 .../js/components/Stv/Studentenverwaltung.js  |  7 ++--
 .../Stv/Studentenverwaltung/List.js           | 39 ++++++++++++++-----
 2 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 111663e47..45fef2e1f 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -99,10 +99,9 @@ export default {
 	},
 	mounted() {
 		if (this.$route.params.id) {
-			this.$refs.stvList.updateUrl('components/stv/students/uid/' + this.$route.params.id);
-		}
-		if (this.$route.params.prestudent_id) {
-			this.$refs.stvList.updateUrl('components/stv/students/prestudent/' + this.$route.params.prestudent_id);
+			this.$refs.stvList.updateUrl('components/stv/students/uid/' + this.$route.params.id, true);
+		} else if (this.$route.params.prestudent_id) {
+			this.$refs.stvList.updateUrl('components/stv/students/prestudent/' + this.$route.params.prestudent_id, true);
 		}
 
 	},
diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index f9ba77213..a150746af 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -60,14 +60,21 @@ export default {
 				layoutColumnsOnNewData: false,
 				height: 'auto',
 				selectable: true,
+				// TODO(chris): select only one? selectMultiple with click?
+				index: 'prestudent_id',
 				//persistence: true
 			},
 			tabulatorEvents: [
 				{
 					event: 'rowSelectionChanged',
 					handler: this.rowSelectionChanged
+				},
+				{
+					event: 'dataProcessed',
+					handler: this.autoSelectRows
 				}
-			]
+			],
+			lastSelected: null
 		}
 	},
 	methods: {
@@ -77,7 +84,27 @@ export default {
 		rowSelectionChanged(data) {
 			this.$emit('update:selected', data);
 		},
-		updateUrl(url) {
+		autoSelectRows(data) {
+			if (this.lastSelected) {
+				// NOTE(chris): reselect rows on refresh
+				let selected = this.lastSelected.map(el => this.$refs.table.tabulator.getRow(el.prestudent_id))
+				// TODO(chris): unselect current item if it's no longer in the table?
+				// or maybe reselect only the last one?
+				selected = selected.filter(el => el);
+
+				this.lastSelected = null;
+
+				if (selected.length)
+					this.$refs.table.tabulator.selectRow(selected);
+			} else if(this.lastSelected === undefined) {
+				// NOTE(chris): select row if it's the only one (preferably only on startup)
+				if (data.length == 1) {
+					this.$refs.table.tabulator.selectRow(this.$refs.table.tabulator.getRows());
+				}
+			}
+		},
+		updateUrl(url, first) {
+			this.lastSelected = first ? undefined : this.selected;
 			if (url)
 				url = CoreRESTClient._generateRouterURI(url);
 			if (!this.$refs.table.tableBuilt)
@@ -88,14 +115,6 @@ export default {
 				this.$refs.table.tabulator.setData(url);
 		}
 	},
-	mounted() {
-		this.$refs.table.tabulator.on("dataProcessed", () => {
-			let rows = this.$refs.table.tabulator.getRows();
-			if (rows.length && rows.length == 1) {
-				this.$refs.table.tabulator.selectRow();
-			}
-		});
-	},
 	template: `
 	<div class="stv-list h-100 pt-3">
 		<core-filter-cmpt

From af678b3c562ee58588b42833ffc2b45c796e0c47 Mon Sep 17 00:00:00 2001
From: KarpAlex <karpen_ko@hotmail.com>
Date: Mon, 9 Oct 2023 14:29:38 +0200
Subject: [PATCH 0126/1461] added vue datepicker to composer

---
 composer.json | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 840a53124..256aaba74 100644
--- a/composer.json
+++ b/composer.json
@@ -348,6 +348,28 @@
 				}
 			}
 		},
+		{
+			"type": "package",
+			"package": {
+					"name": "vuejs/vuedatepicker_js",
+					"version": "5.4.0",
+					"dist": {
+							"url": "https://unpkg.com/@vuepic/vue-datepicker@4.2.3/dist/vue-datepicker.iife.js",
+							"type": "file"
+					}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+					"name": "vuejs/vuedatepicker_css",
+					"version": "5.4.0",
+					"dist": {
+							"url": "https://unpkg.com/@vuepic/vue-datepicker@4.2.3/dist/main.css",
+							"type": "file"
+					}
+			}
+		},
 		{
 			"type": "composer",
 			"url": "https://asset-packagist.org"
@@ -420,7 +442,9 @@
 		"twbs/bootstrap5": "5.1.*",
 
 		"vuejs/vuejs3": "3.2.33",
-		"vuejs/vuerouter4": "4.1.3"
+		"vuejs/vuerouter4": "4.1.3",
+		"vuejs/vuedatepicker_js": "5.4.0",
+		"vuejs/vuedatepicker_css": "5.4.0"
 	},
 	"config": {
 		"bin-dir": "vendor/bin"

From 1e449e6fd14d02f2727cb21d0b4ddeeb0f95989c Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 11 Oct 2023 15:38:30 +0200
Subject: [PATCH 0127/1461] Bugfix: FilterCmpt: reload function

---
 public/js/components/filter/Filter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index 2b6a4fe6d..6f074cc72 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -173,7 +173,7 @@ export const CoreFilterCmpt = {
 	methods: {
 		reloadTable() {
 			if (this.tableOnly)
-				this.tabulator.reload();
+				this.tabulator.setData();
 			else
 				this.getFilter();
 		},

From c74d22d46c5ce7ccf332edc20b1ffd278b7b3663 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 12 Oct 2023 15:47:44 +0200
Subject: [PATCH 0128/1461] Verband Order

---
 application/controllers/components/stv/Verband.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/application/controllers/components/stv/Verband.php b/application/controllers/components/stv/Verband.php
index 70ccf55f2..42efe1e4c 100644
--- a/application/controllers/components/stv/Verband.php
+++ b/application/controllers/components/stv/Verband.php
@@ -326,6 +326,8 @@ class Verband extends FHC_Controller
 	{
 		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
 
+		$this->StudiensemesterModel->addOrder('start');
+
 		/**
 		 * TODO(chris): filter with variable:
 		 * - $number_displayed_past_studiensemester from Variable

From 93ef1151df217cf3d9c594fe047aafb68163620b Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 12 Oct 2023 15:47:54 +0200
Subject: [PATCH 0129/1461] Prestudent Query

---
 .../controllers/components/stv/Students.php   | 307 +++++++++++++-----
 1 file changed, 231 insertions(+), 76 deletions(-)

diff --git a/application/controllers/components/stv/Students.php b/application/controllers/components/stv/Students.php
index d707173b9..3d22075cc 100644
--- a/application/controllers/components/stv/Students.php
+++ b/application/controllers/components/stv/Students.php
@@ -158,6 +158,164 @@ class Students extends FHC_Controller
 	{
 		// TODO(chris): @see: prestudent.class::loadInteressentenUndBewerber
 		// TODO(chris): IMPLEMENT!
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+		$stdsemEsc = $this->PrestudentModel->escape($studiensemester_kurzbz);
+		
+		$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
+		#$this->PrestudentModel->addJoin('public.tbl_prestudentstatus ps', 'ps.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, ' . $this->PrestudentModel->escape($studiensemester_kurzbz) . ') AND ps.prestudent_id=tbl_prestudent.prestudent_id');
+		$this->PrestudentModel->addJoin('public.tbl_prestudentstatus ps', 'ps.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ') AND ps.prestudent_id=tbl_prestudent.prestudent_id AND ps.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ') AND ps.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ')', 'LEFT');
+		// TODO(chris): check what functions are returning when no entry exists
+		
+		$this->PrestudentModel->addSelect('p.person_id');
+		$this->PrestudentModel->addSelect('tbl_prestudent.prestudent_id');
+		$this->PrestudentModel->addSelect("'' AS uid");
+		$this->PrestudentModel->addSelect('titelpre');
+		$this->PrestudentModel->addSelect('titelpost');
+		$this->PrestudentModel->addSelect('vorname');
+		$this->PrestudentModel->addSelect('wahlname');
+		$this->PrestudentModel->addSelect('vornamen');
+		$this->PrestudentModel->addSelect('geschlecht');
+		$this->PrestudentModel->addSelect('nachname');
+		$this->PrestudentModel->addSelect('gebdatum');
+		$this->PrestudentModel->addSelect('tbl_prestudent.anmerkung');
+		$this->PrestudentModel->addSelect('ersatzkennzeichen');
+		$this->PrestudentModel->addSelect('svnr');
+		$this->PrestudentModel->addSelect("'' AS matrikelnr");
+		$this->PrestudentModel->addSelect('p.anmerkung AS anmerkungen');
+		$this->PrestudentModel->addSelect("'' AS semester");
+		$this->PrestudentModel->addSelect("'' AS verband");
+		$this->PrestudentModel->addSelect("'' AS gruppe");
+		$this->PrestudentModel->addSelect('tbl_prestudent.studiengang_kz');
+		$this->PrestudentModel->addSelect('aufmerksamdurch_kurzbz');
+		$this->PrestudentModel->addSelect('mentor');
+		$this->PrestudentModel->addSelect('FALSE AS bnaktiv');
+		$this->PrestudentModel->addSelect(
+			"(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung LIMIT 1) AS email_privat",
+			false
+		);
+		$this->PrestudentModel->addSelect(
+			"(SELECT rt_gesamtpunkte AS punkte FROM public.tbl_prestudent WHERE prestudent_id=s.prestudent_id) AS punkte",
+			false
+		);
+		$this->PrestudentModel->addSelect('tbl_prestudent.dual');
+		$this->PrestudentModel->addSelect('tbl_prestudent.reihungstest_id');
+		$this->PrestudentModel->addSelect('tbl_prestudent.anmeldungreihungstest');
+		$this->PrestudentModel->addSelect('p.matr_nr');
+		$this->PrestudentModel->addSelect('tbl_prestudent.gsstudientyp_kurzbz');
+		$this->PrestudentModel->addSelect('tbl_prestudent.aufnahmegruppe_kurzbz');
+		$this->PrestudentModel->addSelect('tbl_prestudent.priorisierung');
+		$this->PrestudentModel->addSelect('p.zugangscode');
+		$this->PrestudentModel->addSelect('p.bpk');
+
+		$this->PrestudentModel->addOrder('nachname');
+		$this->PrestudentModel->addOrder('vorname');
+
+		$where = [];
+		if ($orgform_kurzbz) {
+			$where['ps.orgform_kurzbz'] = $orgform_kurzbz;
+		}
+
+		switch ($filter) {
+			case "interessenten":
+				$where['ps.status_kurzbz'] = 'Interessent';
+				break;
+			case "bewerbungnichtabgeschickt":
+				$where['ps.status_kurzbz'] = 'Interessent';
+				$where['bewerbung_abgeschicktamum'] = null;
+				break;
+			case "bewerbungabgeschickt":
+				$where['ps.status_kurzbz'] = 'Interessent';
+				$where['bewerbung_abgeschicktamum IS NOT'] = null;
+				$where['bestaetigtam'] = null;
+				break;
+			case "statusbestaetigt":
+				$where['ps.status_kurzbz'] = 'Interessent';
+				$where['bestaetigtam IS NOT'] = null;
+				break;
+			case "statusbestaetigtrtnichtangemeldet":
+				$where['ps.status_kurzbz'] = 'Interessent';
+				$where['bestaetigtam IS NOT'] = null;
+				$this->PrestudentModel->db->where('NOT EXISTS(SELECT 1 FROM public.tbl_rt_person JOIN public.tbl_reihungstest r ON (rt_id = reihungstest_id) WHERE person_id=p.person_id AND studienplan_id IN (SELECT studienplan_id FROM lehre.tbl_studienplan JOIN lehre.tbl_studienordnung o USING(studienordnung_id) WHERE o.studiengang_kz=tbl_prestudent.studiengang_kz) AND r.studiensemesterkurzbz=' . $stdsemEsc . ')', null, false);
+				break;
+			case "statusbestaetigtrtangemeldet":
+				$where['ps.status_kurzbz'] = 'Interessent';
+				$where['bestaetigtam IS NOT'] = null;
+				$this->PrestudentModel->db->where('EXISTS(SELECT 1 FROM public.tbl_rt_person JOIN public.tbl_reihungstest r ON (rt_id = reihungstest_id) WHERE person_id=p.person_id AND studienplan_id IN (SELECT studienplan_id FROM lehre.tbl_studienplan JOIN lehre.tbl_studienordnung o USING(studienordnung_id) WHERE o.studiengang_kz=tbl_prestudent.studiengang_kz) AND r.studiensemesterkurzbz=' . $stdsemEsc . ')', null, false);
+				break;
+			case "zgv":
+				$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+
+				$result = $this->StudiengangModel->load($studiengang_kz);
+				if (isError($result)) {
+					$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+					return $this->outputJson(getError($result));
+				} elseif (!hasData($result)) {
+					$this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST);
+					// TODO(chris): phrase
+					return $this->outputJson("Studiengang does not exist");
+				}
+				$stg = current(getData($result));
+
+				$where['ps.status_kurzbz'] = 'Interessent';
+				
+				if ($stg->typ == 'm') {
+					$where['zgvmas_code IS NOT'] = null;
+					if (defined('ZGV_ERFUELLT_ANZEIGEN') && ZGV_ERFUELLT_ANZEIGEN)
+						$where['zgvmas_erfuellt'] = true;
+				} elseif ($stg->typ == 'p') {
+					$where['zgvdoktor_code IS NOT'] = null;
+					if (defined('ZGV_DOKTOR_ANZEIGEN') && ZGV_DOKTOR_ANZEIGEN)
+						$where['zgvdoktor_erfuellt'] = true;
+				} else {
+					$where['zgv_code IS NOT'] = null;
+					if (defined('ZGV_ERFUELLT_ANZEIGEN') && ZGV_ERFUELLT_ANZEIGEN)
+						$where['zgv_erfuellt'] = true;
+				}
+				break;
+			case "reihungstestangemeldet":
+				$where['ps.status_kurzbz'] = 'Interessent';
+				$this->PrestudentModel->db->where('EXISTS(SELECT 1 FROM public.tbl_rt_person JOIN public.tbl_reihungstest r ON (rt_id = reihungstest_id) WHERE person_id=p.person_id AND studienplan_id IN (SELECT studienplan_id FROM lehre.tbl_studienplan JOIN lehre.tbl_studienordnung o USING(studienordnung_id) WHERE o.studiengang_kz=tbl_prestudent.studiengang_kz) AND r.studiensemesterkurzbz=' . $stdsemEsc . ')', null, false);
+				break;
+			case "reihungstestnichtangemeldet":
+				$where['ps.status_kurzbz'] = 'Interessent';
+				$this->PrestudentModel->db->where('NOT EXISTS(SELECT 1 FROM public.tbl_rt_person JOIN public.tbl_reihungstest r ON (rt_id = reihungstest_id) WHERE person_id=p.person_id AND studienplan_id IN (SELECT studienplan_id FROM lehre.tbl_studienplan JOIN lehre.tbl_studienordnung o USING(studienordnung_id) WHERE o.studiengang_kz=tbl_prestudent.studiengang_kz) AND r.studiensemesterkurzbz=' . $stdsemEsc . ')', null, false);
+				break;
+			case "bewerber":
+				$where['ps.status_kurzbz'] = 'Bewerber';
+				break;
+			case "aufgenommen":
+				$where['ps.status_kurzbz'] = 'Aufgenommener';
+				break;
+			case "warteliste":
+				$where['ps.status_kurzbz'] = 'Wartender';
+				break;
+			case "absage":
+				$where['ps.status_kurzbz'] = 'Abgewiesener';
+				break;
+			case "absolvent":
+				$where['ps.status_kurzbz'] = 'Absolvent';
+				break;
+			case "diplomand":
+				$where['ps.status_kurzbz'] = 'Diplomand';
+				break;
+			default:
+				if (!$studiensemester_kurzbz) {
+					// TODO(chris): should work ... needs testing
+					// we want all prestudents without status?
+					$where['ps.status_kurzbz'] = null;
+				} else {
+					$this->PrestudentModel->db->where_in('ps.status_kurzbz', [
+						'Interessent',
+						'Bewerber',
+						'Aufgenommener',
+						'Wartender',
+						'Abgewiesener'
+					]);
+				}
+				break;
+		}
+
 		$this->outputJson([]);
 	}
 
@@ -273,80 +431,6 @@ class Students extends FHC_Controller
 			$this->outputJson(getData($result) ?: []);
 		}
 	}
-	/**
-	 * @param string		$student_uid
-	 *
-	 * @return void
-	 */
-	protected function getStudent($student_uid)
-	{
-		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
-
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-
-		$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
-		$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id');
-		$this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid');
-		$this->PrestudentModel->addJoin(
-			'public.tbl_studentlehrverband v',
-			'v.student_uid=s.student_uid AND v.studiensemester_kurzbz=' . $this->PrestudentModel->escape($studiensemester_kurzbz),
-			'LEFT'
-		);
-
-		$this->PrestudentModel->addSelect('p.person_id');
-		$this->PrestudentModel->addSelect('s.prestudent_id');
-		$this->PrestudentModel->addSelect('b.uid');
-		$this->PrestudentModel->addSelect('titelpre');
-		$this->PrestudentModel->addSelect('titelpost');
-		$this->PrestudentModel->addSelect('vorname');
-		$this->PrestudentModel->addSelect('wahlname');
-		$this->PrestudentModel->addSelect('vornamen');
-		$this->PrestudentModel->addSelect('geschlecht');
-		$this->PrestudentModel->addSelect('nachname');
-		$this->PrestudentModel->addSelect('gebdatum');
-		$this->PrestudentModel->addSelect('tbl_prestudent.anmerkung');
-		$this->PrestudentModel->addSelect('ersatzkennzeichen');
-		$this->PrestudentModel->addSelect('svnr');
-		$this->PrestudentModel->addSelect('s.matrikelnr');
-		$this->PrestudentModel->addSelect('p.anmerkung AS anmerkungen');
-		$this->PrestudentModel->addSelect('v.semester');
-		$this->PrestudentModel->addSelect('v.verband');
-		$this->PrestudentModel->addSelect('v.gruppe');
-		$this->PrestudentModel->addSelect('tbl_prestudent.studiengang_kz');
-		$this->PrestudentModel->addSelect('aufmerksamdurch_kurzbz');
-		$this->PrestudentModel->addSelect('mentor');
-		$this->PrestudentModel->addSelect('b.aktiv AS bnaktiv');
-		$this->PrestudentModel->addSelect(
-			"(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung LIMIT 1) AS email_privat",
-			false
-		);
-		$this->PrestudentModel->addSelect(
-			"(SELECT rt_gesamtpunkte AS punkte FROM public.tbl_prestudent WHERE prestudent_id=s.prestudent_id) AS punkte",
-			false
-		);
-		$this->PrestudentModel->addSelect('tbl_prestudent.dual');
-		$this->PrestudentModel->addSelect('tbl_prestudent.reihungstest_id');
-		$this->PrestudentModel->addSelect('tbl_prestudent.anmeldungreihungstest');
-		$this->PrestudentModel->addSelect('p.matr_nr');
-		$this->PrestudentModel->addSelect('tbl_prestudent.gsstudientyp_kurzbz');
-		$this->PrestudentModel->addSelect('tbl_prestudent.aufnahmegruppe_kurzbz');
-		$this->PrestudentModel->addSelect('tbl_prestudent.priorisierung');
-		$this->PrestudentModel->addSelect('p.zugangscode');
-		$this->PrestudentModel->addSelect('p.bpk');
-
-		$where = [];
-
-		$result = $this->PrestudentModel->loadWhere([
-			's.student_uid' => $student_uid
-		]);
-		
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			$this->outputJson(getError($result));
-		} else {
-			$this->outputJson(getData($result) ?: []);
-		}
-	}
 
 	/**
 	 * @param string		$prestudent_id
@@ -409,8 +493,6 @@ class Students extends FHC_Controller
 		$this->PrestudentModel->addSelect('p.zugangscode');
 		$this->PrestudentModel->addSelect('p.bpk');
 
-		$where = [];
-
 		$result = $this->PrestudentModel->loadWhere([
 			'tbl_prestudent.prestudent_id' => $prestudent_id
 		]);
@@ -422,4 +504,77 @@ class Students extends FHC_Controller
 			$this->outputJson(getData($result) ?: []);
 		}
 	}
+
+	/**
+	 * @param string		$student_uid
+	 *
+	 * @return void
+	 */
+	protected function getStudent($student_uid)
+	{
+		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
+
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+		$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
+		$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id');
+		$this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid');
+		$this->PrestudentModel->addJoin(
+			'public.tbl_studentlehrverband v',
+			'v.student_uid=s.student_uid AND v.studiensemester_kurzbz=' . $this->PrestudentModel->escape($studiensemester_kurzbz),
+			'LEFT'
+		);
+
+		$this->PrestudentModel->addSelect('p.person_id');
+		$this->PrestudentModel->addSelect('s.prestudent_id');
+		$this->PrestudentModel->addSelect('b.uid');
+		$this->PrestudentModel->addSelect('titelpre');
+		$this->PrestudentModel->addSelect('titelpost');
+		$this->PrestudentModel->addSelect('vorname');
+		$this->PrestudentModel->addSelect('wahlname');
+		$this->PrestudentModel->addSelect('vornamen');
+		$this->PrestudentModel->addSelect('geschlecht');
+		$this->PrestudentModel->addSelect('nachname');
+		$this->PrestudentModel->addSelect('gebdatum');
+		$this->PrestudentModel->addSelect('tbl_prestudent.anmerkung');
+		$this->PrestudentModel->addSelect('ersatzkennzeichen');
+		$this->PrestudentModel->addSelect('svnr');
+		$this->PrestudentModel->addSelect('s.matrikelnr');
+		$this->PrestudentModel->addSelect('p.anmerkung AS anmerkungen');
+		$this->PrestudentModel->addSelect('v.semester');
+		$this->PrestudentModel->addSelect('v.verband');
+		$this->PrestudentModel->addSelect('v.gruppe');
+		$this->PrestudentModel->addSelect('tbl_prestudent.studiengang_kz');
+		$this->PrestudentModel->addSelect('aufmerksamdurch_kurzbz');
+		$this->PrestudentModel->addSelect('mentor');
+		$this->PrestudentModel->addSelect('b.aktiv AS bnaktiv');
+		$this->PrestudentModel->addSelect(
+			"(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung LIMIT 1) AS email_privat",
+			false
+		);
+		$this->PrestudentModel->addSelect(
+			"(SELECT rt_gesamtpunkte AS punkte FROM public.tbl_prestudent WHERE prestudent_id=s.prestudent_id) AS punkte",
+			false
+		);
+		$this->PrestudentModel->addSelect('tbl_prestudent.dual');
+		$this->PrestudentModel->addSelect('tbl_prestudent.reihungstest_id');
+		$this->PrestudentModel->addSelect('tbl_prestudent.anmeldungreihungstest');
+		$this->PrestudentModel->addSelect('p.matr_nr');
+		$this->PrestudentModel->addSelect('tbl_prestudent.gsstudientyp_kurzbz');
+		$this->PrestudentModel->addSelect('tbl_prestudent.aufnahmegruppe_kurzbz');
+		$this->PrestudentModel->addSelect('tbl_prestudent.priorisierung');
+		$this->PrestudentModel->addSelect('p.zugangscode');
+		$this->PrestudentModel->addSelect('p.bpk');
+
+		$result = $this->PrestudentModel->loadWhere([
+			's.student_uid' => $student_uid
+		]);
+		
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->outputJson(getError($result));
+		} else {
+			$this->outputJson(getData($result) ?: []);
+		}
+	}
 }

From c744d48aef43b73482aeabc196a655c9441f84f0 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 12 Oct 2023 15:49:44 +0200
Subject: [PATCH 0130/1461] "keep-alive" component caching

---
 public/js/components/Stv/Studentenverwaltung/Details.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details.js b/public/js/components/Stv/Studentenverwaltung/Details.js
index 871cfeccb..e5ffb74e3 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details.js
@@ -32,7 +32,9 @@ export default {
 					<a class="nav-link" :class="{active: comp == component}" :aria-current="comp == component ? 'page' : ''" href="#" @click="component=comp">{{title}}</a>
 				</li>
 			</ul>
-			<component :is="component" :student="student"></component>
+			<keep-alive>
+				<component :is="component" :student="student"></component>
+			</keep-alive>
 		</template>
 	</div>`
 };
\ No newline at end of file

From 697b1e5c00cfddf89634dfb3f248f54f3d4c06a1 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 13 Oct 2023 10:40:37 +0200
Subject: [PATCH 0131/1461] Save Button -> Top Right

---
 .../js/components/Stv/Studentenverwaltung/Details.js   | 10 ++++++----
 .../Stv/Studentenverwaltung/Details/Details.js         |  8 ++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details.js b/public/js/components/Stv/Studentenverwaltung/Details.js
index e5ffb74e3..c7338d5af 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details.js
@@ -24,7 +24,7 @@ export default {
 		}
 	},
 	template: `
-	<div class="stv-details h-100 pb-3">
+	<div class="stv-details h-100 pb-3 d-flex flex-column">
 		<div v-if="hasNoStudent" class="justify-content-center d-flex h-100 align-items-center">Bitte StudentIn auswählen!</div>
 		<template v-else>		
 			<ul class="nav nav-tabs">
@@ -32,9 +32,11 @@ export default {
 					<a class="nav-link" :class="{active: comp == component}" :aria-current="comp == component ? 'page' : ''" href="#" @click="component=comp">{{title}}</a>
 				</li>
 			</ul>
-			<keep-alive>
-				<component :is="component" :student="student"></component>
-			</keep-alive>
+			<div style="flex: 1 1 0%; height: 0%" class="border-bottom border-start border-end overflow-auto p-3">
+				<keep-alive>
+					<component :is="component" :student="student"></component>
+				</keep-alive>
+			</div>
 		</template>
 	</div>`
 };
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
index 22c4deb0f..dc4edf1ab 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
@@ -191,7 +191,10 @@ export default {
 	},
 	//TODO(chris): Geburtszeit? Anzahl der Kinder?
 	template: `
-	<div ref="form" class="stv-details-details h-100 pb-3">
+	<div ref="form" class="stv-details-details">
+		<div class="position-sticky top-0">
+			<button type="button" class="btn btn-primary position-absolute top-0 end-0" @click="save" :disabled="!changedLength">Speichern</button>
+		</div>
 		<fieldset class="overflow-hidden">
 			<legend>Person</legend>
 			<template v-if="data">
@@ -371,9 +374,6 @@ export default {
 				Loading...
 			</div>
 		</fieldset>
-		<div>
-			<button type="button" class="btn btn-primary" @click="save" :disabled="!changedLength">Speichern</button>
-		</div>
 		<pv-toast ref="responseToast" style="z-index:9999"></pv-toast>
 	</div>`
 };
\ No newline at end of file

From 65bf35fa3eb6d2ef026d029426c56ec99744d47d Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 16 Oct 2023 13:51:21 +0200
Subject: [PATCH 0132/1461] Studiensemester now

---
 .../components/stv/Studiensemester.php        | 22 ++++++-
 .../Studentenverwaltung/Studiensemester.js    | 60 ++++++++++++++-----
 2 files changed, 67 insertions(+), 15 deletions(-)

diff --git a/application/controllers/components/stv/Studiensemester.php b/application/controllers/components/stv/Studiensemester.php
index 3c23a1534..88c95cd71 100644
--- a/application/controllers/components/stv/Studiensemester.php
+++ b/application/controllers/components/stv/Studiensemester.php
@@ -29,6 +29,26 @@ class Studiensemester extends FHC_Controller
 		}
 	}
 
+	public function now()
+	{
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
+		$result = $this->StudiensemesterModel->getAkt();
+
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->outputJson(getError($result));
+		}
+		$result = getData($result) ?: [];
+
+		if (count($result) != 1) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->outputJson(count($result) ? 'Mehrere Studiensemester aktiv' : 'Kein Studiensemester aktiv');
+		} else {
+			$this->outputJson(current($result)->studiensemester_kurzbz);
+		}
+	}
+
 	public function set()
 	{
 		$this->load->library('AuthLib');
@@ -39,7 +59,7 @@ class Studiensemester extends FHC_Controller
 		$this->form_validation->set_rules('studiensemester', 'Studiensemester', 'required');
 
 		if ($this->form_validation->run() == false) {
-			$this->output->set_status_header(HTTP_BAD_REQUEST);
+			$this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST);
 			return $this->outputJson($this->form_validation->error_array());
 		}
 
diff --git a/public/js/components/Stv/Studentenverwaltung/Studiensemester.js b/public/js/components/Stv/Studentenverwaltung/Studiensemester.js
index 09d0cb532..24a9e7206 100644
--- a/public/js/components/Stv/Studentenverwaltung/Studiensemester.js
+++ b/public/js/components/Stv/Studentenverwaltung/Studiensemester.js
@@ -14,7 +14,8 @@ export default {
 		return {
 			current: 0,
 			loading: true,
-			list: []
+			list: [],
+			today: -1
 		};
 	},
 	methods: {
@@ -38,6 +39,31 @@ export default {
 				this.current = 0;
 			this.save(fallback);
 		},
+		setToToday() {
+			if (this.today > 0) {
+				if (this.today == this.current)
+					return;
+				return this.set(this.today);
+			}
+
+			this.loading = true;
+			CoreRESTClient
+				.get('components/stv/studiensemester/now')
+				.then(result => result.data)
+				.then(result => {
+					this.today = this.list.indexOf(result);
+					if (this.today > 0) {
+						if (this.today != this.current)
+							this.set(this.today);
+					} else {
+						// TODO(chris): handle error (list might not be loaded yet)
+					}
+				})
+				.catch(error => {
+					// TODO(chris): emit error
+					console.error(error);
+				});
+		},
 		save(fallback) {
 			CoreRESTClient
 				.post('components/stv/studiensemester/set', {
@@ -47,9 +73,10 @@ export default {
 					this.loading = false;
 					this.$emit('changed');
 				})
-				.catch(() => {
+				.catch(error => {
 					this.current = fallback;
 					// TODO(chris): emit error
+					console.error(error);
 				});
 		}
 	},
@@ -68,18 +95,23 @@ export default {
 	},
 	template: `
 	<div class="stv-studiensemester">
-		<div class="btn-group w-100 dropup" role="group" aria-label="Basic example">
-			<button type="button" class="btn btn-outline-secondary flex-grow-0" @click="prev"><i class="fa-solid fa-caret-left"></i></button>
-			<button type="button" class="btn btn-outline-secondary" data-bs-toggle="dropdown" data-bs-display="static" data-bs-offset="0,0" aria-expanded="false">
-				{{list[current]}}
-				<i v-if="loading" class="fa-solid fa-spinner fa-spin"></i>
-			</button>
-			<ul class="dropdown-menu dropdown-menu-dark overflow-auto w-100" style="max-height:60vh">
-				<li v-for="(item, index) in list" :key="index">
-					<a class="dropdown-item" :class="{active: index == current}" :aria-current="index == current ? 'true' : 'false'" href="#" @click="set(index)">{{item}}</a>
-				</li>
-			</ul>
-			<button type="button" class="btn btn-outline-secondary flex-grow-0" @click="next"><i class="fa-solid fa-caret-right"></i></button>
+		<div class="btn-toolbar w-100 dropup" role="toolbar" aria-label="Studiensemester">
+			<div class="btn-group flex-grow-1 position-static" role="group" aria-label="Studiensemester einstellen">
+				<button type="button" class="btn btn-outline-secondary flex-grow-0" @click="prev"><i class="fa-solid fa-caret-left"></i></button>
+				<button type="button" class="btn btn-outline-secondary" data-bs-toggle="dropdown" data-bs-display="static" data-bs-offset="0,0" aria-expanded="false">
+					{{list[current]}}
+					<i v-if="loading" class="fa-solid fa-spinner fa-spin"></i>
+				</button>
+				<ul class="dropdown-menu dropdown-menu-dark overflow-auto w-100" style="max-height:60vh">
+					<li v-for="(item, index) in list" :key="index">
+						<a class="dropdown-item" :class="{active: index == current}" :aria-current="index == current ? 'true' : 'false'" href="#" @click="set(index)">{{item}}</a>
+					</li>
+				</ul>
+				<button type="button" class="btn btn-outline-secondary flex-grow-0" @click="next"><i class="fa-solid fa-caret-right"></i></button>
+			</div>
+			<div class="btn-group flex-grow-0" role="group" aria-label="aktuelles Studiensemester">
+				<button type="button" class="btn btn-outline-secondary" @click="setToToday"><i class="fa-solid fa-bullseye"></i></button>
+			</div>
 		</div>
 	</div>
 	`

From 0f80b9d31b337766da425b90cc0c3ae20c489972 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Tue, 17 Oct 2023 11:30:35 +0200
Subject: [PATCH 0133/1461] Added Primevue-Toast and -Confirmdialog libraries
 to FHC-Footer

---
 application/views/templates/FHC-Footer.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/application/views/templates/FHC-Footer.php b/application/views/templates/FHC-Footer.php
index f360861e5..e7e593d42 100644
--- a/application/views/templates/FHC-Footer.php
+++ b/application/views/templates/FHC-Footer.php
@@ -123,6 +123,10 @@
 		generateJSsInclude('vendor/npm-asset/primevue/calendar/calendar.min.js');
 		generateJSsInclude('vendor/npm-asset/primevue/skeleton/skeleton.min.js');
 		generateJSsInclude('vendor/npm-asset/primevue/autocomplete/autocomplete.min.js');
+		generateJSsInclude('vendor/npm-asset/primevue/toast/toast.min.js');
+		generateJSsInclude('vendor/npm-asset/primevue/toastservice/toastservice.min.js');
+		generateJSsInclude('vendor/npm-asset/primevue/confirmdialog/confirmdialog.min.js');
+		generateJSsInclude('vendor/npm-asset/primevue/confirmationservice/confirmationservice.min.js');
 	}
 
 	// --------------------------------------------------------------------------------------------------------

From 645972d54910f3332b0aeb3cc86062781dcf2137 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 19 Oct 2023 09:48:42 +0200
Subject: [PATCH 0134/1461] primevue esm & search & favorites

---
 application/config/routes.php                 |  3 +
 .../controllers/components/stv/Verband.php    |  1 +
 application/controllers/public/Primevue.php   | 46 +++++++++
 application/views/Studentenverwaltung.php     |  6 +-
 application/views/templates/FHC-Header.php    |  1 +
 composer.json                                 |  2 +-
 public/css/Studentenverwaltung.css            | 23 +++++
 public/js/apps/Studentenverwaltung.js         |  5 +-
 .../js/components/Stv/Studentenverwaltung.js  |  3 +-
 .../Studentenverwaltung/Details/Details.js    |  6 +-
 .../Stv/Studentenverwaltung/Verband.js        | 93 +++++++++++++++++--
 11 files changed, 177 insertions(+), 12 deletions(-)
 create mode 100644 application/controllers/public/Primevue.php

diff --git a/application/config/routes.php b/application/config/routes.php
index 9fad59d88..b1dcc13fb 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -63,6 +63,9 @@ $route['api/v1/system/[S|s]prache/(:any)'] = 'api/v1/system/sprache2/$1';
 
 $route['studentenverwaltung/(:any)/(:any)'] = 'Studentenverwaltung/index';
 
+$route['public/js/components/primevue/(:any)/(:any)'] = 'public/Primevue/index/$1/$2';
+$route['public/js/components/primevue/(:any)/(:any)/(:any)'] = 'public/Primevue/index/$2/$3/$1';
+
 // load routes from extensions
 $subdir = 'application/config/extensions';
 $dirlist = scandir($subdir);
diff --git a/application/controllers/components/stv/Verband.php b/application/controllers/components/stv/Verband.php
index 42efe1e4c..f08419328 100644
--- a/application/controllers/components/stv/Verband.php
+++ b/application/controllers/components/stv/Verband.php
@@ -67,6 +67,7 @@ class Verband extends FHC_Controller
 		$this->StudiengangModel->addSelect('erhalter_kz');
 		$this->StudiengangModel->addSelect('typ');
 		$this->StudiengangModel->addSelect('kurzbz');
+		$this->StudiengangModel->addSelect('studiengang_kz');
 		
 		$this->StudiengangModel->addOrder('erhalter_kz');
 		$this->StudiengangModel->addOrder('typ');
diff --git a/application/controllers/public/Primevue.php b/application/controllers/public/Primevue.php
new file mode 100644
index 000000000..a1ae40692
--- /dev/null
+++ b/application/controllers/public/Primevue.php
@@ -0,0 +1,46 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Primevue extends FHC_Controller
+{
+	/**
+	 * @return void
+	 */
+	public function index($path, $file, $extrapath = null)
+	{
+		if ($extrapath)
+			$path = $extrapath . '/' . $path;
+		$target = FHCPATH . 'vendor/npm-asset/primevue/' . $path . '/' . $file;
+		if (!file_exists($target))
+			return show_404();
+		
+		$newUrl = '../../';
+		if ($extrapath)
+			$newUrl .= '../';
+
+		$ext = substr($file, -7) == '.min.js' ? '.esm.min.js' : '.esm.js';
+
+		$contents = file_get_contents($target);
+		
+		$contents = preg_replace_callback('/import([^;]*)from\s*[\'"]vue[\'"];/i', function ($matches) {
+			return 'let ' . str_replace(' as ', ': ', $matches[1]) . ' = Vue;';
+		}, $contents);
+		
+		$contents = preg_replace_callback('/(import[^;]*[\'"])(primevue[^\'"]+)([\'"])/i', function ($matches) use ($ext, $newUrl) {
+			if (is_file(FHCPATH . 'vendor/npm-asset/' . $matches[2])) {
+				$newUrl .= $matches[2];
+			} else {
+				$testfile = $matches[2] . '/index' . $ext;
+				if (file_exists(FHCPATH . 'vendor/npm-asset/' . $testfile))
+					$newUrl .= $testfile;
+				else
+					$newUrl .= $matches[2] . strrchr($matches[2], '/') . $ext;
+			}
+			return $matches[1] . $newUrl . $matches[3];
+		}, $contents);
+		
+		$this->output->set_content_type('text/javascript');
+		$this->output->set_output($contents);
+	}
+}
diff --git a/application/views/Studentenverwaltung.php b/application/views/Studentenverwaltung.php
index 50a8ed3c4..157c50466 100644
--- a/application/views/Studentenverwaltung.php
+++ b/application/views/Studentenverwaltung.php
@@ -5,7 +5,7 @@
 		'bootstrap5' => true,
 		'fontawesome6' => true,
 		'vue3' => true,
-		'primevue3' => true,
+		#'primevue3' => true,
 		'filtercomponent' => true,
 		'tabulator5' => true,
 		'phrases' => [],
@@ -14,7 +14,8 @@
 			'public/css/components/vue-datepicker.css'
 		],
 		'customJSs' => [
-			'vendor/npm-asset/primevue/toast/toast.min.js'
+			#'vendor/npm-asset/primevue/tree/tree.min.js',
+			#'vendor/npm-asset/primevue/toast/toast.min.js'
 		],
 		'customJSModules' => [
 			'public/js/apps/Studentenverwaltung.js'
@@ -28,6 +29,7 @@
 		<router-view
 			default-semester="<?= $variables['semester_aktuell']; ?>"
 			active-addons="<?= defined('ACTIVE_ADDONS') ? ACTIVE_ADDONS : ''; ?>"
+			stv-root="<?= site_url('Studentenverwaltung'); ?>"
 			cis-root="<?= CIS_ROOT; ?>"
 			:permissions="<?= htmlspecialchars(json_encode($permissions)); ?>"
 			:config="<?= htmlspecialchars(json_encode(['generateAlias' => !defined('GENERATE_ALIAS_STUDENT') ? true : GENERATE_ALIAS_STUDENT])); ?>"
diff --git a/application/views/templates/FHC-Header.php b/application/views/templates/FHC-Header.php
index aa63541c5..877cac87d 100644
--- a/application/views/templates/FHC-Header.php
+++ b/application/views/templates/FHC-Header.php
@@ -41,6 +41,7 @@
 			{
 				generateCSSsInclude('vendor/fortawesome/font-awesome6/css/fontawesome.min.css');
 				generateCSSsInclude('vendor/fortawesome/font-awesome6/css/solid.min.css');
+				generateCSSsInclude('vendor/fortawesome/font-awesome6/css/regular.min.css'); // NOTE(chris): for favorites in stv
 				generateCSSsInclude('vendor/fortawesome/font-awesome6/css/brands.min.css');
 			}
 
diff --git a/composer.json b/composer.json
index a2fd38d68..90da6ac20 100644
--- a/composer.json
+++ b/composer.json
@@ -422,7 +422,7 @@
 		"nategood/httpful": "0.2.*",
 		"netcarver/textile": "3.7.*",
 		"nicolaskruchten/pivottable": "2.23.0",
-		"npm-asset/primevue": "3.15.*",
+		"npm-asset/primevue": "3.29.*",
 		"npm-asset/primeicons": "5.0.0",
 
 		"olifolkerd/tabulator4": "4.9.*",
diff --git a/public/css/Studentenverwaltung.css b/public/css/Studentenverwaltung.css
index d48397cc7..cb1e72fe4 100644
--- a/public/css/Studentenverwaltung.css
+++ b/public/css/Studentenverwaltung.css
@@ -1,5 +1,13 @@
 @import './components/searchbar.css';
 @import './components/verticalsplit.css';
+@import '../../vendor/npm-asset/primevue/resources/themes/bootstrap4-light-blue/theme.css';
+@import '../../vendor/npm-asset/primevue/resources/primevue.min.css';
+@import '../../vendor/npm-asset/primeicons/primeicons.css';
+
+.navbar-dark .navbar-brand:focus {
+	box-shadow: 0 0 0 .25rem rgba(13,110,253,.25);
+	z-index: 3;
+}
 
 .searchbar {
 	margin-right: 0!important;
@@ -23,6 +31,10 @@
 	flex: 1 1 auto;
 }
 
+#sidebarMenu {
+	width: 0%;
+}
+
 @media (min-width: 768px) {
 	#sidebarMenu {
 		visibility: visible!important;
@@ -39,6 +51,8 @@
 		overflow: auto;
 	}
 }
+
+
 .stv-verband .p-treetable-tbody > tr > td {
 	display: flex;
 	padding-top: .25rem!important;
@@ -51,6 +65,15 @@
 	flex: 1 1 auto;
 }
 
+
+.stv-verband.p-tree {
+	/*overflow: auto;*/
+}
+.stv-verband.p-tree .p-treenode-icon {
+	display: none;
+}
+
+
 .stv-list {
 	display: flex;
 	flex-direction: column;
diff --git a/public/js/apps/Studentenverwaltung.js b/public/js/apps/Studentenverwaltung.js
index 2b6cc4c46..c676011c3 100644
--- a/public/js/apps/Studentenverwaltung.js
+++ b/public/js/apps/Studentenverwaltung.js
@@ -18,6 +18,8 @@
 import FhcStudentenverwaltung from "../components/Stv/Studentenverwaltung.js";
 import fhcapifactory from "./api/fhcapifactory.js";
 
+import PvConfig from "../../../index.ci.php/public/js/components/primevue/config/config.esm.min.js";
+
 Vue.$fhcapi = fhcapifactory;
 
 const ciPath = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*?\/)/g, '') + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
@@ -35,6 +37,7 @@ const app = Vue.createApp();
 
 app
 	.use(router)
-	.use(primevue.config.default)
+	.use(PvConfig)
+	.use(ErrorHandling)
 	.mount('#main');
 
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 45fef2e1f..0d1556f45 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -36,6 +36,7 @@ export default {
 		defaultSemester: String,
 		config: Object,
 		permissions: Object,
+		stvRoot: String,
 		cisRoot: String,
 		activeAddons: String // semicolon separated list of active addons
 	},
@@ -107,7 +108,7 @@ export default {
 	},
 	template: `
 	<header class="navbar navbar-expand-lg navbar-dark bg-dark flex-md-nowrap p-0 shadow">
-		<a class="navbar-brand col-md-4 col-lg-3 col-xl-2 me-0 px-3" href="<?= site_url('Studentenverwaltung'); ?>">FHC 4.0</a>
+		<a class="navbar-brand col-md-4 col-lg-3 col-xl-2 me-0 px-3" :href="stvRoot">FHC 4.0</a>
 		<button class="navbar-toggler d-md-none m-1 collapsed" type="button" data-bs-toggle="offcanvas" data-bs-target="#sidebarMenu" aria-controls="sidebarMenu" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button>
 		<fhc-searchbar :searchoptions="searchbaroptions" :searchfunction="searchfunction" class="searchbar w-100"></fhc-searchbar>
 	</header>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
index dc4edf1ab..ef36aebaf 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
@@ -2,11 +2,15 @@ import VueDatePicker from '../../../vueDatepicker.js.php';
 import FormUploadImage from '../../../Form/Upload/Image.js';
 import {CoreRESTClient} from '../../../../RESTClient.js';
 
+
+import PvToast from "../../../../../../index.ci.php/public/js/components/primevue/toast/toast.esm.min.js";
+
+
 export default {
 	components: {
 		VueDatePicker,
 		FormUploadImage,
-		PvToast: primevue.toast
+		PvToast
 	},
 	inject: {
 		showBpk: {
diff --git a/public/js/components/Stv/Studentenverwaltung/Verband.js b/public/js/components/Stv/Studentenverwaltung/Verband.js
index b670d0875..3220f78dc 100644
--- a/public/js/components/Stv/Studentenverwaltung/Verband.js
+++ b/public/js/components/Stv/Studentenverwaltung/Verband.js
@@ -1,16 +1,25 @@
 import {CoreRESTClient} from '../../../RESTClient.js';
 
+
+import PvTree from "../../../../../index.ci.php/public/js/components/primevue/tree/tree.esm.min.js";
+import PvTreetable from "../../../../../index.ci.php/public/js/components/primevue/treetable/treetable.esm.min.js";
+import PvColumn from "../../../../../index.ci.php/public/js/components/primevue/column/column.esm.min.js";
+
+
 export default {
 	components: {
-		TreeTable: primevue.treetable,
-		TreeColumn: primevue.column
+		PvTree,
+		PvTreetable,
+		PvColumn
 	},
 	emits: [
 		'selectVerband'
 	],
 	data() {
 		return {
+			debug_version: 1, // NOTE(chris): switch between tree/treetable and filter/favorites...
 			loading: true,
+			selected: {}, // NOTE(chris): tree only
 			nodes: []
 		}
 	},
@@ -18,6 +27,12 @@ export default {
 		onExpandTreeNode(node) {
 			if (!node.children) {
 				if (node.data.link) {
+					let activeEl = null;
+					this.$nextTick(() => {
+						this.$nextTick(() => {
+							activeEl = document.activeElement;
+						});
+					});
 					this.loading = true;
 					CoreRESTClient
 						.get("components/stv/verband/" + node.data.link)
@@ -25,6 +40,21 @@ export default {
 						.then(result => {
 							const subNodes = result.map(this.mapResultToTreeData);
 							node.children = subNodes;
+
+							let treeitem = this.$refs.tree.$el.querySelector('[data-tree-item-key="' + node.key + '"]');
+							if (!this.debug_version) // NOTE(chris): tree only
+								treeitem = treeitem.closest('[role="treeitem"]');
+							else // NOTE(chris): treetable only
+								treeitem = treeitem.closest('[role="row"]');
+							
+							this.$nextTick(() => {
+								if (activeEl == document.activeElement)
+									treeitem.dispatchEvent(new KeyboardEvent('keydown', {
+										code: 'ArrowDown',
+										key: 'ArrowDown'
+									}));
+							});
+
 							this.loading = false;
 						})
 						.catch(error => {
@@ -40,7 +70,8 @@ export default {
 		mapResultToTreeData(el) {
 			const cp = {
 				key: ("" + el.link).replace('/', '-'),
-				data: el
+				data: el,
+				label: el.name
 			};
 
 			if (el.children)
@@ -49,6 +80,15 @@ export default {
 				cp.leaf = el.leaf || false;
 
 			return cp;
+		},
+		onFilterKeydown(data) {
+			// NOTE(chris): tree only
+			// TODO(chris): we can online search here
+		},
+		markFav(key) {
+			// NOTE(chris): treetable only
+			// TODO(chris): IMPLEMENT
+			// TODO(chris): make clickable with keyboard
 		}
 	},
 	mounted() {
@@ -64,7 +104,48 @@ export default {
 			});
 	},
 	template: `
-	<tree-table class="stv-verband p-treetable-sm" :value="nodes" lazy @node-expand="onExpandTreeNode" selection-mode="single" @node-select="onSelectTreeNode" scrollable scroll-height="flex">
-		<tree-column field="name" header="Verband" expander></tree-column>
-	</tree-table>`
+	<div v-if="!debug_version" class="overflow-auto" tabindex="-1">
+		<pv-tree
+			ref="tree"
+			class="stv-verband p-0"
+			v-model:selectionKeys="selected"
+			:value="nodes"
+			selection-mode="single"
+			@node-select="onSelectTreeNode"
+			@node-expand="onExpandTreeNode"
+			:loading="loading"
+			filter
+			:pt="{input:{onKeydown:onFilterKeydown}}"
+			>
+			<template #default="{node}">
+				<span :data-tree-item-key="node.key" :title="node.data.studiengang_kz">{{node.label}}</span>
+			</template>
+		</pv-tree>
+	</div>
+	<div v-else class="overflow-auto" tabindex="-1">
+		<pv-treetable
+			ref="tree"
+			class="stv-verband p-treetable-sm"
+			:value="nodes"
+			lazy
+			@node-expand="onExpandTreeNode"
+			selection-mode="single"
+			@node-select="onSelectTreeNode"
+			scrollable
+			scroll-height="flex"
+			>
+			<pv-column field="name" header="Verband" expander>
+				<template #body="{node}">
+					<span :data-tree-item-key="node.key" :title="node.data.studiengang_kz">
+						{{node.data.name}}
+					</span>
+				</template>
+			</pv-column>
+			<pv-column field="fav" header="FAV" headerStyle="flex: 0 0 auto" style="flex: 0 0 auto">
+				<template #body="{node}">
+					<i :class="node.data.fav ? 'fa-solid' : 'fa-regular'" class="fa-star" @click="markFav(node.key)"></i>
+				</template>
+			</pv-column>
+		</pv-treetable>
+	</div>`
 };
\ No newline at end of file

From b01cd99a93715dde6f21ebea666d90fbc3143164 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 19 Oct 2023 14:10:55 +0200
Subject: [PATCH 0135/1461] Plugin: Fhc Alert

---
 public/js/plugin/FhcAlert.js | 369 +++++++++++++++++++++++++++++++++++
 1 file changed, 369 insertions(+)
 create mode 100644 public/js/plugin/FhcAlert.js

diff --git a/public/js/plugin/FhcAlert.js b/public/js/plugin/FhcAlert.js
new file mode 100644
index 000000000..5e1111dd6
--- /dev/null
+++ b/public/js/plugin/FhcAlert.js
@@ -0,0 +1,369 @@
+/**
+ * Copyright (C) 2022 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * 
+ * @usage:
+ * Preperations:
+ * Be sure to have PrimeVue loaded  with the toast and confirmdialog
+ * components as primevue variable
+ * Install:
+ * Import this Plugin and install it with the app.use() function.
+ * Use:
+ * In your component you can call now the global property $fhcAlert
+ * which has the following functions:
+ * 
+ * alertSuccess
+ * ------------
+ * Displays a success message
+ * @param string	message
+ * @return void
+ * 
+ * alertInfo
+ * ---------
+ * Displays an info message
+ * @param string	message
+ * @return void
+ * 
+ * alertWarning
+ * ------------
+ * Displays a warning
+ * @param string	message
+ * @return void
+ * 
+ * alertError
+ * ----------
+ * Displays an error
+ * @param string	message
+ * @return void
+ * 
+ * alertSystemError
+ * ----------------
+ * Displays an alert with the error details and a button to mail
+ * the error to the Support Team
+ * @param string	message
+ * @return void
+ * 
+ * confirmDelete
+ * -------------
+ * Displays a confirmation dialog and returns a Promise which resolves
+ * with true or false depending und the pressed button.
+ * @return Promise
+ * 
+ * alertDefault
+ * ------------
+ * Displays an alert
+ * @param string	severity		can be 'success', 'info', 'warning', 'error'
+ * @param string	title
+ * @param string	message
+ * @param boolean	sticky			(optional) defaults to false
+ * @return void
+ * 
+ * alertMultiple
+ * -------------
+ * Displays multiple alerts
+ * @param array		messageArray
+ * @param string	severity		(optional) defaults to 'info'
+ * @param string	title			(optional) defaults to 'Info'
+ * @param boolean	sticky			(optional) defaults to false
+ * @return void
+ * 
+ * handleSystemError
+ * -----------------
+ * Automatiticly determine how to display an system error and display it.
+ * This would be used in a catch block of an ajax call.
+ * @param mixed		error
+ * @return void
+ * 
+ * handleSystemMessage
+ * -------------------
+ * Automatiticly determine how to display a message and display it.
+ * @param mixed		message
+ * @return void
+ */
+
+let toast_component = null;
+const toast_queue = [];
+
+function _add_to_toast(...args) {
+	toast_component.add.apply(toast_component, args);
+}
+let toast_add = function _add_to_toast_queue(...args) {
+	toast_queue.push(args);
+};
+
+let alert_component = null;
+const alert_queue = [];
+
+function _add_to_alert(...args) {
+	alert_component.add.apply(alert_component, args);
+}
+let alert_add = function _add_to_alert_queue(...args) {
+	alert_queue.push(args);
+};
+
+let confirm_component = null;
+const confirm_queue = [];
+
+function _require_confirm(...args) {
+	confirm_component.confirm.apply(confirm_component, args);
+}
+let confirm_require = function _add_to_confirm_queue(...args) {
+	confirm_queue.push(args);
+};
+
+
+const helperAppContainer = document.createElement('div');
+
+const helperApp = Vue.createApp({
+	setup() {
+		return self => {
+			return [
+				Vue.h(primevue.toast, {
+					ref: 'toast',
+					baseZIndex: 99999
+				}),
+				Vue.h(primevue.toast, {
+					ref: 'alert',
+					baseZIndex: 99999,
+					position: 'center',
+				}, {
+					message: slotProps => {
+						const messageCard = Vue.h('div', {
+							ref: 'messageCard',
+							id: 'collapseMessageCard',
+							class: 'collapse mt-3'
+						}, [
+							Vue.h('div', {class: 'card card-body text-body small', style: 'white-space: pre-wrap'}, slotProps.message.detail)
+						]);
+						return [
+							Vue.h('i', {class: 'fa fa-circle-exclamation fa-2xl mt-3'}),
+							Vue.h('div', {class: 'p-toast-message-text'}, [
+								Vue.h('span', {class: 'p-toast-summary'}, slotProps.message.summary),
+								Vue.h('div', {class: 'p-toast-detail my-3'}, 'Sorry! Ein interner technischer Fehler ist aufgetreten.'),
+								Vue.h('div', {class: 'd-flex justify-content-between align-items-center'}, [
+									Vue.h('a', {
+										class: 'align-bottom flex-fill me-2',
+										dataBsToggle: 'collapse',
+										href: '#collapseMessageCard',
+										role: 'button',
+										ariaExpanded: 'false',
+										ariaControls: 'collapseMessageCard',
+										onClick: () => { bootstrap.Collapse.getOrCreateInstance(messageCard.el).toggle(); }
+									}, 'Fehler anzeigen'),
+									Vue.h('a', {
+										class: 'btn btn-primary flex-fill',
+										target: '_blank',
+										href: self.mailToUrl(slotProps),
+									}, 'Fehler melden')
+								]),
+								messageCard,
+							]),
+						];
+					}
+				}),
+				Vue.h(primevue.confirmdialog, {
+					ref: 'pvConfirmdialog'
+				})
+			];
+		};
+	},
+	methods: {
+		mailToUrl(slotProps) {
+			let mailTo = 'noreply@technikum-wien.at'; // TODO domain anpassen
+			let subject = 'Meldung%20Systemfehler';
+			let body = `
+				Danke, dass Sie uns den Fehler melden. %0D%0A %0D%0A
+				Bitte beschreiben Sie uns ausführlich das Problem.%0D%0A
+				Bsp: Ich habe X ausgewählt und Y angelegt. Beim Speichern erhielt ich die Fehlermeldung. [Optional: Ich habe den Browser Z verwendet.]%0D%0A
+				-----------------------------------------------------------------------------------------------------------------------------------%0D%0A
+				PROBLEM: ... %0D%0A %0D%0A %0D%0A
+
+				-----------------------------------------------------------------------------------------------------------------------------------%0D%0A
+				Fehler URL: ` + FHC_JS_DATA_STORAGE_OBJECT.called_path + '/' + FHC_JS_DATA_STORAGE_OBJECT.called_method + `%0D%0A
+				Fehler Meldung: ` + slotProps.message.detail + `%0D%0A
+				-----------------------------------------------------------------------------------------------------------------------------------%0D%0A %0D%0A
+				Wir kümmern uns um eine rasche Behebung des Problems!`
+
+			return "mailto:" + mailTo + "?subject=" + subject + "&body=" + body;
+		}
+	},
+	mounted() {
+		toast_component = this.$refs.toast;
+		toast_add = _add_to_toast;
+		while (toast_queue.length)
+			_add_to_toast(toast_queue.unshift());
+
+		alert_component = this.$refs.alert;
+		alert_add = _add_to_alert;
+		while (alert_queue.length)
+			_add_to_alert(alert_queue.unshift());
+
+		confirm_component = this.$refs.confirm;
+		confirm_require = _require_confirm;
+		while (confirm_queue.length)
+			_require_confirm(confirm_queue.unshift());
+	},
+	beforeUnmount() {
+		toast_add = _add_to_toast_queue;
+		toast_component = null;
+
+		alert_add = _add_to_alert_queue;
+		alert_component = null;
+
+		confirm_require = _add_to_confirm_queue;
+		confirm_component = null;
+	},
+	unmounted() {
+		helperAppContainer.parentElement.removeChild(helperAppContainer);
+	}
+});
+
+helperApp
+	.use(primevue.config.default)
+	.mount(helperAppContainer);
+
+document.body.appendChild(helperAppContainer);
+
+export default {
+	install: (app, options) => {
+		const $fhcAlert = {
+			alertSuccess(message) {
+				toast_add({ severity: 'success', summary: 'Info', detail: message, life: 1000});
+			},
+			alertInfo(message) {
+				toast_add({ severity: 'info', summary: 'Info', detail: message, life: 3000 });
+			},
+			alertWarning(message) {
+				toast_add({ severity: 'warn', summary: 'Achtung', detail: message, life: 7000 });
+			},
+			alertError(message) {
+				toast_add({ severity: 'error', summary: 'Achtung', detail: message });
+			},
+			alertSystemError(message) {
+				alert_add({ severity: 'error', summary: 'Systemfehler', detail: message});
+			},
+			confirmDelete() {
+				return new Promise((resolve, reject) => {
+					confirm_require({
+						header: 'Achtung',
+						message: 'Möchten Sie sicher löschen?',
+						acceptLabel: 'Löschen',
+						acceptClass: 'btn btn-danger',
+						rejectLabel: 'Abbrechen',
+						rejectClass: 'btn btn-outline-secondary',
+						accept() {
+							resolve(true);
+						},
+						reject() {
+							resolve(false);
+						},
+					});
+				});
+			},
+			alertDefault(severity, title, message, sticky = false) {
+				let options = { severity: severity, summary: title, detail: message};
+				
+				if (!sticky)
+					options.life = 3000;
+
+				toast_add(options);
+			},
+			alertMultiple(messageArray, severity = 'info', title = 'Info', sticky = false){
+				// Check, if array has only string values
+				if (messageArray.every(message => typeof message === 'string')) {
+					messageArray.every(message => this.alertDefault(severity, title, message, sticky));
+					return true;
+				}
+				return false;
+			},
+			handleSystemError(error) {
+				// Error is string
+				if (typeof error === 'string')
+					return $fhcAlert.alertSystemError(error);
+
+				// Error is array of strings
+				if (Array.isArray(error) && error.every(err => typeof err === 'string'))
+					return error.every($fhcAlert.alertSystemError);
+				
+				// Error is object
+				if (typeof error === 'object' && error !== null) {
+					let errMsg = '';
+
+					if (error.hasOwnProperty('message'))
+						errMsg += 'Error Message: ' + error.message.toUpperCase() + '\r\n';
+
+					if (error.hasOwnProperty('config') && error.config.hasOwnProperty('url'))
+						errMsg += 'Error ConfigURL: ' + error.config.url + '\r\n';
+
+					if (error.hasOwnProperty('stack'))
+						errMsg += 'Error Stack: ' + error.stack + '\r\n';
+					
+					// Fallback object error message
+					if (errMsg == '')
+						errMsg = 'Error Message: ' + JSON.stringify(error) + '\r\n';
+
+					errMsg += 'Error Controller Path: ' + FHC_JS_DATA_STORAGE_OBJECT.called_path + '/' + FHC_JS_DATA_STORAGE_OBJECT.called_method;
+
+					return $fhcAlert.alertSystemError(errMsg);
+				}
+
+				// Fallback
+				$fhcAlert.alertSystemError('alertSystemError throws Generic Error\r\nError Controller Path: ' + FHC_JS_DATA_STORAGE_OBJECT.called_path + '/' + FHC_JS_DATA_STORAGE_OBJECT.called_method);
+			},
+			handleSystemMessage(message) {
+				// Message is string
+				if (typeof message === 'string')
+					return fhcerror.alertWarning(message);
+
+				// Message is array of strings
+				if (Array.isArray(message)) {
+					// If Array has only Strings
+					if (message.every(msg => typeof msg === 'string'))
+						return message.every(fhcerror.alertWarning);
+
+					// If Array has only Objects
+					if (message.every(msg => typeof msg === 'object') && msg !== null) {
+						return message.every(msg => {
+							if (msg.hasOwnProperty('data')) {
+								if (msg.data.hasOwnProperty('retval'))
+									fhcerror.alertWarning(JSON.stringify(msg.data.retval));
+								// TODO(chris): there is no else here! join ifs?
+							} else {
+								fhcerror.alertSystemError(JSON.stringify(msg));
+							}
+						});
+					}
+				}
+
+				// Message is Object with data property  TODO: check object handling
+				if (typeof message === 'object' && message !== null){
+					if (message.hasOwnProperty('data')) {
+						if (message.data.hasOwnProperty('retval'))
+							// NOTE(chris): changed: alertSystemError => alertWarning
+							fhcerror.alertWarning(JSON.stringify(message.data.retval));
+						// TODO(chris): there is no else here! join ifs?
+					} else {
+						fhcerror.alertSystemError(JSON.stringify(message));
+					}
+					return;
+				}
+
+				// Fallback
+				fhcerror.alertSystemError('alertSystemError throws Generic Error\r\nError Controller Path: ' + FHC_JS_DATA_STORAGE_OBJECT.called_path + '/' +  FHC_JS_DATA_STORAGE_OBJECT.called_method);
+			}
+		};
+		app.config.globalProperties.$fhcAlert = $fhcAlert;
+	}
+}
\ No newline at end of file

From d57fd9eb609de807c823738d2391f5d13e473c0d Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 24 Oct 2023 12:23:12 +0200
Subject: [PATCH 0136/1461] fhcAlert: slight improvements

---
 public/js/plugin/FhcAlert.js | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/public/js/plugin/FhcAlert.js b/public/js/plugin/FhcAlert.js
index 5e1111dd6..8ff45f717 100644
--- a/public/js/plugin/FhcAlert.js
+++ b/public/js/plugin/FhcAlert.js
@@ -117,7 +117,7 @@ let confirm_component = null;
 const confirm_queue = [];
 
 function _require_confirm(...args) {
-	confirm_component.confirm.apply(confirm_component, args);
+	confirm_component.confirmListener.apply(confirm_component, args);
 }
 let confirm_require = function _add_to_confirm_queue(...args) {
 	confirm_queue.push(args);
@@ -174,7 +174,7 @@ const helperApp = Vue.createApp({
 					}
 				}),
 				Vue.h(primevue.confirmdialog, {
-					ref: 'pvConfirmdialog'
+					ref: 'confirm'
 				})
 			];
 		};
@@ -246,7 +246,7 @@ export default {
 				toast_add({ severity: 'info', summary: 'Info', detail: message, life: 3000 });
 			},
 			alertWarning(message) {
-				toast_add({ severity: 'warn', summary: 'Achtung', detail: message, life: 7000 });
+				toast_add({ severity: 'warn', summary: 'Achtung', detail: message});
 			},
 			alertError(message) {
 				toast_add({ severity: 'error', summary: 'Achtung', detail: message });
@@ -336,10 +336,8 @@ export default {
 					// If Array has only Objects
 					if (message.every(msg => typeof msg === 'object') && msg !== null) {
 						return message.every(msg => {
-							if (msg.hasOwnProperty('data')) {
-								if (msg.data.hasOwnProperty('retval'))
-									fhcerror.alertWarning(JSON.stringify(msg.data.retval));
-								// TODO(chris): there is no else here! join ifs?
+							if (msg.hasOwnProperty('data') && msg.data.hasOwnProperty('retval')) {
+								fhcerror.alertWarning(JSON.stringify(msg.data.retval));
 							} else {
 								fhcerror.alertSystemError(JSON.stringify(msg));
 							}
@@ -347,13 +345,11 @@ export default {
 					}
 				}
 
-				// Message is Object with data property  TODO: check object handling
+				// Message is Object with data property
 				if (typeof message === 'object' && message !== null){
-					if (message.hasOwnProperty('data')) {
-						if (message.data.hasOwnProperty('retval'))
-							// NOTE(chris): changed: alertSystemError => alertWarning
-							fhcerror.alertWarning(JSON.stringify(message.data.retval));
-						// TODO(chris): there is no else here! join ifs?
+					if (message.hasOwnProperty('data') && message.data.hasOwnProperty('retval')) {
+						// NOTE(chris): changed: alertSystemError => alertWarning
+						fhcerror.alertWarning(JSON.stringify(message.data.retval));
 					} else {
 						fhcerror.alertSystemError(JSON.stringify(message));
 					}

From 22453c71b4aafe690ee386f2a1cf77a6b7e027b4 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 24 Oct 2023 13:35:50 +0200
Subject: [PATCH 0137/1461] fhcAlert: slight improvements 2

---
 public/js/plugin/FhcAlert.js | 176 ++++++++++++-----------------------
 1 file changed, 57 insertions(+), 119 deletions(-)

diff --git a/public/js/plugin/FhcAlert.js b/public/js/plugin/FhcAlert.js
index 8ff45f717..6ff54061d 100644
--- a/public/js/plugin/FhcAlert.js
+++ b/public/js/plugin/FhcAlert.js
@@ -93,91 +93,12 @@
  * @return void
  */
 
-let toast_component = null;
-const toast_queue = [];
-
-function _add_to_toast(...args) {
-	toast_component.add.apply(toast_component, args);
-}
-let toast_add = function _add_to_toast_queue(...args) {
-	toast_queue.push(args);
-};
-
-let alert_component = null;
-const alert_queue = [];
-
-function _add_to_alert(...args) {
-	alert_component.add.apply(alert_component, args);
-}
-let alert_add = function _add_to_alert_queue(...args) {
-	alert_queue.push(args);
-};
-
-let confirm_component = null;
-const confirm_queue = [];
-
-function _require_confirm(...args) {
-	confirm_component.confirmListener.apply(confirm_component, args);
-}
-let confirm_require = function _add_to_confirm_queue(...args) {
-	confirm_queue.push(args);
-};
-
-
 const helperAppContainer = document.createElement('div');
 
 const helperApp = Vue.createApp({
-	setup() {
-		return self => {
-			return [
-				Vue.h(primevue.toast, {
-					ref: 'toast',
-					baseZIndex: 99999
-				}),
-				Vue.h(primevue.toast, {
-					ref: 'alert',
-					baseZIndex: 99999,
-					position: 'center',
-				}, {
-					message: slotProps => {
-						const messageCard = Vue.h('div', {
-							ref: 'messageCard',
-							id: 'collapseMessageCard',
-							class: 'collapse mt-3'
-						}, [
-							Vue.h('div', {class: 'card card-body text-body small', style: 'white-space: pre-wrap'}, slotProps.message.detail)
-						]);
-						return [
-							Vue.h('i', {class: 'fa fa-circle-exclamation fa-2xl mt-3'}),
-							Vue.h('div', {class: 'p-toast-message-text'}, [
-								Vue.h('span', {class: 'p-toast-summary'}, slotProps.message.summary),
-								Vue.h('div', {class: 'p-toast-detail my-3'}, 'Sorry! Ein interner technischer Fehler ist aufgetreten.'),
-								Vue.h('div', {class: 'd-flex justify-content-between align-items-center'}, [
-									Vue.h('a', {
-										class: 'align-bottom flex-fill me-2',
-										dataBsToggle: 'collapse',
-										href: '#collapseMessageCard',
-										role: 'button',
-										ariaExpanded: 'false',
-										ariaControls: 'collapseMessageCard',
-										onClick: () => { bootstrap.Collapse.getOrCreateInstance(messageCard.el).toggle(); }
-									}, 'Fehler anzeigen'),
-									Vue.h('a', {
-										class: 'btn btn-primary flex-fill',
-										target: '_blank',
-										href: self.mailToUrl(slotProps),
-									}, 'Fehler melden')
-								]),
-								messageCard,
-							]),
-						];
-					}
-				}),
-				Vue.h(primevue.confirmdialog, {
-					ref: 'confirm'
-				})
-			];
-		};
+	components: {
+		PvToast: primevue.toast,
+		PvConfirm: primevue.confirmdialog
 	},
 	methods: {
 		mailToUrl(slotProps) {
@@ -197,66 +118,83 @@ const helperApp = Vue.createApp({
 				Wir kümmern uns um eine rasche Behebung des Problems!`
 
 			return "mailto:" + mailTo + "?subject=" + subject + "&body=" + body;
+		},
+		openMessagecard() {
+			bootstrap.Collapse.getOrCreateInstance(this.$refs.messageCard).toggle();
 		}
 	},
-	mounted() {
-		toast_component = this.$refs.toast;
-		toast_add = _add_to_toast;
-		while (toast_queue.length)
-			_add_to_toast(toast_queue.unshift());
-
-		alert_component = this.$refs.alert;
-		alert_add = _add_to_alert;
-		while (alert_queue.length)
-			_add_to_alert(alert_queue.unshift());
-
-		confirm_component = this.$refs.confirm;
-		confirm_require = _require_confirm;
-		while (confirm_queue.length)
-			_require_confirm(confirm_queue.unshift());
-	},
-	beforeUnmount() {
-		toast_add = _add_to_toast_queue;
-		toast_component = null;
-
-		alert_add = _add_to_alert_queue;
-		alert_component = null;
-
-		confirm_require = _add_to_confirm_queue;
-		confirm_component = null;
-	},
 	unmounted() {
 		helperAppContainer.parentElement.removeChild(helperAppContainer);
-	}
+	},
+	template: `
+	<pv-toast ref="toast" base-z-index="99999"></pv-toast>
+	<pv-toast ref="alert" base-z-index="99999" position="center">
+		<template #message="slotProps">
+			<i class="fa fa-circle-exclamation fa-2xl mt-3"></i>
+			<div class="p-toast-message-text">
+				<span class="p-toast-summary">{{slotProps.message.summary}}</span>
+				<div class="p-toast-detail my-3">Sorry! Ein interner technischer Fehler ist aufgetreten.</div>
+				<div class="d-flex justify-content-between align-items-center">
+					<a
+						class="align-bottom flex-fill me-2"
+						data-bs-toggle="collapse"
+						href="#collapseMessageCard"
+						role="button"
+						aria-expanded="false"
+						aria-controls="collapseMessageCard"
+						@click="openMessagecard"
+						>
+						Fehler anzeigen
+					</a>
+					<a
+						class="btn btn-primary flex-fill"
+						target="_blank"
+						:href="mailToUrl(slotProps)"
+						>
+						Fehler melden
+					</a>
+				</div>
+				<div ref="messageCard" id="collapseMessageCard" class="collapse mt-3">
+					<div class="card card-body text-body small" style="white-space: pre-wrap">
+						{{slotProps.message.detail}}
+					</div>
+				</div>
+			</div>
+		</template>
+	</pv-toast>
+	<pv-confirm group="fhcAlertConfirm"></pv-confirm>`
 });
 
-helperApp
-	.use(primevue.config.default)
-	.mount(helperAppContainer);
+helperApp.use(primevue.config.default)
+helperApp.use(primevue.confirmationservice)
+
+const helperAppInstance = helperApp.mount(helperAppContainer);
 
 document.body.appendChild(helperAppContainer);
 
+
 export default {
 	install: (app, options) => {
 		const $fhcAlert = {
 			alertSuccess(message) {
-				toast_add({ severity: 'success', summary: 'Info', detail: message, life: 1000});
+				helperAppInstance.$refs.toast.add({ severity: 'success', summary: 'Info', detail: message, life: 1000});
 			},
 			alertInfo(message) {
-				toast_add({ severity: 'info', summary: 'Info', detail: message, life: 3000 });
+				helperAppInstance.$refs.toast.add({ severity: 'info', summary: 'Info', detail: message, life: 3000 });
 			},
 			alertWarning(message) {
-				toast_add({ severity: 'warn', summary: 'Achtung', detail: message});
+				helperAppInstance.$refs.toast.add({ severity: 'warn', summary: 'Achtung', detail: message});
 			},
 			alertError(message) {
-				toast_add({ severity: 'error', summary: 'Achtung', detail: message });
+				helperAppInstance.$refs.toast.add({ severity: 'error', summary: 'Achtung', detail: message });
 			},
 			alertSystemError(message) {
-				alert_add({ severity: 'error', summary: 'Systemfehler', detail: message});
+				helperAppInstance.$refs.alert.add({ severity: 'error', summary: 'Systemfehler', detail: message});
 			},
 			confirmDelete() {
 				return new Promise((resolve, reject) => {
-					confirm_require({
+					helperAppInstance.$confirm.require({
+						group: 'fhcAlertConfirm',
 						header: 'Achtung',
 						message: 'Möchten Sie sicher löschen?',
 						acceptLabel: 'Löschen',
@@ -278,7 +216,7 @@ export default {
 				if (!sticky)
 					options.life = 3000;
 
-				toast_add(options);
+				helperAppInstance.$refs.toast.add(options);
 			},
 			alertMultiple(messageArray, severity = 'info', title = 'Info', sticky = false){
 				// Check, if array has only string values

From bae7096ca14374651cb94e46586b80335de1bfb3 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 24 Oct 2023 15:04:45 +0200
Subject: [PATCH 0138/1461] Better Primeview esm path

---
 application/config/routes.php                     |  3 ---
 .../public/{Primevue.php => js/Components.php}    | 15 ++++++---------
 2 files changed, 6 insertions(+), 12 deletions(-)
 rename application/controllers/public/{Primevue.php => js/Components.php} (74%)

diff --git a/application/config/routes.php b/application/config/routes.php
index b1dcc13fb..9fad59d88 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -63,9 +63,6 @@ $route['api/v1/system/[S|s]prache/(:any)'] = 'api/v1/system/sprache2/$1';
 
 $route['studentenverwaltung/(:any)/(:any)'] = 'Studentenverwaltung/index';
 
-$route['public/js/components/primevue/(:any)/(:any)'] = 'public/Primevue/index/$1/$2';
-$route['public/js/components/primevue/(:any)/(:any)/(:any)'] = 'public/Primevue/index/$2/$3/$1';
-
 // load routes from extensions
 $subdir = 'application/config/extensions';
 $dirlist = scandir($subdir);
diff --git a/application/controllers/public/Primevue.php b/application/controllers/public/js/Components.php
similarity index 74%
rename from application/controllers/public/Primevue.php
rename to application/controllers/public/js/Components.php
index a1ae40692..830e7ea65 100644
--- a/application/controllers/public/Primevue.php
+++ b/application/controllers/public/js/Components.php
@@ -2,24 +2,21 @@
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
-class Primevue extends FHC_Controller
+class Components extends FHC_Controller
 {
 	/**
 	 * @return void
 	 */
-	public function index($path, $file, $extrapath = null)
+	public function primevue(...$args)
 	{
-		if ($extrapath)
-			$path = $extrapath . '/' . $path;
-		$target = FHCPATH . 'vendor/npm-asset/primevue/' . $path . '/' . $file;
+		$path = implode('/', $args);
+		$target = FHCPATH . 'vendor/npm-asset/primevue/' . $path;
 		if (!file_exists($target))
 			return show_404();
 		
-		$newUrl = '../../';
-		if ($extrapath)
-			$newUrl .= '../';
+		$newUrl = str_repeat('../', count($args));
 
-		$ext = substr($file, -7) == '.min.js' ? '.esm.min.js' : '.esm.js';
+		$ext = substr($path, -7) == '.min.js' ? '.esm.min.js' : '.esm.js';
 
 		$contents = file_get_contents($target);
 		

From e34bacb44323072bbc8728810c5ede77998fa0f2 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 24 Oct 2023 15:52:28 +0200
Subject: [PATCH 0139/1461] Routing & dynamic tab loading

---
 application/config/routes.php                 |  2 -
 .../controllers/Studentenverwaltung.php       |  2 +-
 public/js/apps/Studentenverwaltung.js         |  2 +-
 .../Stv/Studentenverwaltung/Details.js        | 40 ++++++++++++-------
 4 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/application/config/routes.php b/application/config/routes.php
index 9fad59d88..15da5698f 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -61,8 +61,6 @@ $route['api/v1/organisation/[O|o]rganisationseinheit/(:any)'] = 'api/v1/organisa
 $route['api/v1/ressource/[B|b]etriebsmittelperson/(:any)'] = 'api/v1/ressource/betriebsmittelperson2/$1';
 $route['api/v1/system/[S|s]prache/(:any)'] = 'api/v1/system/sprache2/$1';
 
-$route['studentenverwaltung/(:any)/(:any)'] = 'Studentenverwaltung/index';
-
 // load routes from extensions
 $subdir = 'application/config/extensions';
 $dirlist = scandir($subdir);
diff --git a/application/controllers/Studentenverwaltung.php b/application/controllers/Studentenverwaltung.php
index f2bb75b71..d2574c500 100644
--- a/application/controllers/Studentenverwaltung.php
+++ b/application/controllers/Studentenverwaltung.php
@@ -12,7 +12,7 @@ class Studentenverwaltung extends FHC_Controller
 	/**
 	 * @return void
 	 */
-	public function index()
+	public function _remap()
 	{
 		$this->load->library('AuthLib');
 		$this->load->library('PermissionLib');
diff --git a/public/js/apps/Studentenverwaltung.js b/public/js/apps/Studentenverwaltung.js
index c676011c3..4a8607a42 100644
--- a/public/js/apps/Studentenverwaltung.js
+++ b/public/js/apps/Studentenverwaltung.js
@@ -29,6 +29,7 @@ const router = VueRouter.createRouter({
 	routes: [
 		{ path: `/${ciPath}/studentenverwaltung`, component: FhcStudentenverwaltung },
 		{ path: `/${ciPath}/studentenverwaltung/prestudent/:prestudent_id`, component: FhcStudentenverwaltung },
+		{ path: `/${ciPath}/studentenverwaltung/prestudent/:prestudent_id/:tab`, component: FhcStudentenverwaltung },
 		{ path: `/${ciPath}/studentenverwaltung/student/:id`, component: FhcStudentenverwaltung }
 	]
 });
@@ -38,6 +39,5 @@ const app = Vue.createApp();
 app
 	.use(router)
 	.use(PvConfig)
-	.use(ErrorHandling)
 	.mount('#main');
 
diff --git a/public/js/components/Stv/Studentenverwaltung/Details.js b/public/js/components/Stv/Studentenverwaltung/Details.js
index c7338d5af..910a65866 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details.js
@@ -1,40 +1,50 @@
-import DetailsDetails from './Details/Details.js';
-import DetailsNotizen from './Details/Notizen.js';
-
 export default {
-	components: {
-		DetailsDetails,
-		DetailsNotizen
-	},
 	props: {
 		student: Object
 	},
 	data() {
 		return {
-			component: 'DetailsDetails',
-			tabs: {
-				DetailsDetails: 'Details',
-				DetailsNotizen: 'Notizen'
-			}
+			current: this.$route.params.tab || 'details',
+			tabTemplates: {
+				details: 'Details',
+				notizen: 'Notizen'
+			},
+			tabs: {}
 		}
 	},
 	computed: {
 		hasNoStudent() {
 			return !this.student || (Object.keys(this.student).length === 0 && this.student.constructor === Object);
+		},
+		currentComponent() {
+			return this.tabs[this.current].component;
 		}
 	},
+	created() {
+		this.tabs = Object.fromEntries(Object.entries(this.tabTemplates).map(([key, title]) => {
+			return [key, {
+				title,
+				component: Vue.defineAsyncComponent(() => import("./Details/" + key.charAt(0).toUpperCase() + key.slice(1) + '.js'))
+			}];
+		}));
+	},
 	template: `
 	<div class="stv-details h-100 pb-3 d-flex flex-column">
 		<div v-if="hasNoStudent" class="justify-content-center d-flex h-100 align-items-center">Bitte StudentIn auswählen!</div>
 		<template v-else>		
 			<ul class="nav nav-tabs">
-				<li v-for="(title, comp) in tabs" class="nav-item" :key="comp">
-					<a class="nav-link" :class="{active: comp == component}" :aria-current="comp == component ? 'page' : ''" href="#" @click="component=comp">{{title}}</a>
+				<li v-for="({title}, key) in tabs" class="nav-item" :key="comp">
+					<a class="nav-link" :class="{active: key == current}" :aria-current="key == current ? 'page' : ''" href="#" @click="current=key">{{title}}</a>
 				</li>
 			</ul>
 			<div style="flex: 1 1 0%; height: 0%" class="border-bottom border-start border-end overflow-auto p-3">
 				<keep-alive>
-					<component :is="component" :student="student"></component>
+					<suspense>
+						<component :is="currentComponent" :student="student"></component>
+						<template #fallback>
+							Loading...
+						</template>
+					</suspense>
 				</keep-alive>
 			</div>
 		</template>

From 8c7bbff1c16518e2ad2ab5f3996fe6a8a0fa7c79 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 25 Oct 2023 10:37:51 +0200
Subject: [PATCH 0140/1461] Favorites

---
 .../controllers/components/stv/Favorites.php  | 57 +++++++++++
 .../Stv/Studentenverwaltung/Verband.js        | 99 +++++++++++++++++--
 2 files changed, 150 insertions(+), 6 deletions(-)
 create mode 100644 application/controllers/components/stv/Favorites.php

diff --git a/application/controllers/components/stv/Favorites.php b/application/controllers/components/stv/Favorites.php
new file mode 100644
index 000000000..9d70f0b29
--- /dev/null
+++ b/application/controllers/components/stv/Favorites.php
@@ -0,0 +1,57 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Favorites extends FHC_Controller
+{
+	public function __construct()
+	{
+		// TODO(chris): access!
+		parent::__construct();
+
+		// Load models
+		$this->load->model('system/Variable_model', 'VariableModel');
+
+		// Load libraries
+		$this->load->library('AuthLib');
+
+		// TODO(chris): variable table might be to small to store favorites!
+	}
+
+	public function index()
+	{
+		$result = $this->VariableModel->getVariables(getAuthUID(), ['stv_favorites']);
+
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson(getError($result));
+		}
+
+		$this->outputJson(getData($result)['stv_favorites']);
+	}
+
+	public function set()
+	{
+		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+		
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('favorites', 'Favorites', 'required');
+
+		if ($this->form_validation->run() == false) {
+			$this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST);
+			return $this->outputJson($this->form_validation->error_array());
+		}
+
+		$favorites = $this->input->post('favorites');
+
+		$result = $this->VariableModel->setVariable(getAuthUID(), 'stv_favorites', $favorites);
+
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson(getError($result));
+		}
+
+		$this->outputJsonSuccess(true);
+	}
+}
diff --git a/public/js/components/Stv/Studentenverwaltung/Verband.js b/public/js/components/Stv/Studentenverwaltung/Verband.js
index 3220f78dc..8ad3bebdb 100644
--- a/public/js/components/Stv/Studentenverwaltung/Verband.js
+++ b/public/js/components/Stv/Studentenverwaltung/Verband.js
@@ -20,7 +20,15 @@ export default {
 			debug_version: 1, // NOTE(chris): switch between tree/treetable and filter/favorites...
 			loading: true,
 			selected: {}, // NOTE(chris): tree only
-			nodes: []
+			nodes: [],
+			favnodes: [],
+			favorites: {on: false, list: []}
+		}
+	},
+	computed: {
+		filteredNodes() {
+			// TODO(chris): what to display actually?
+			return this.favorites.on ? this.favnodes : this.nodes;
 		}
 	},
 	methods: {
@@ -85,9 +93,62 @@ export default {
 			// NOTE(chris): tree only
 			// TODO(chris): we can online search here
 		},
-		markFav(key) {
+		async filterFav() {
 			// NOTE(chris): treetable only
-			// TODO(chris): IMPLEMENT
+			if (!this.favorites.on && !this.favnodes.length && this.favorites.list.length) {
+				this.loading = true;
+				this.favnodes = await this.loadNodes(this.favorites.list);
+			}
+			this.favorites.on = !this.favorites.on;
+			CoreRESTClient.post("components/stv/favorites/set", {favorites: JSON.stringify(this.favorites)});
+			this.loading = false;
+		},
+		async loadNodes(links) {
+			// NOTE(chris): treetable only
+			let sortedInParents = links.reduce((o, link) => {
+				link = link + '';
+				let parent,
+					parts = link.split('/');
+				if (parts.length == 1) {
+					parent = '_';
+				} else {
+					parts.pop();
+					parent = parts.join('/');
+				}
+				if (!o[parent])
+					o[parent] = [link];
+				else
+					o[parent].push(link);
+				return o;
+			}, {});
+			
+			let promises = [];
+			for (let parent in sortedInParents)
+				promises.push(CoreRESTClient.get("components/stv/verband/" + (parent == '_' ? '' : parent)).then(res => res.data).then(res => res.filter(node => sortedInParents[parent].includes(node.link + ''))));
+			
+			// NOTE(chris): merge the resulting arrays and transform them to an associative one
+			let result = [].concat.apply([], await Promise.all(promises)).reduce((o, node) => {
+				o[node.link + ''] = this.mapResultToTreeData({...node, leaf: true, children: undefined});
+				return o;
+			}, {});
+
+			return links.map(link => result[link]);
+		},
+		async markFav(key) {
+			// NOTE(chris): treetable only
+			let index = this.favorites.list.indexOf(key.data.link + '');
+
+			if (index != -1) {
+				if (this.favnodes.length)
+					this.favnodes = this.favnodes.filter(node => node.data.link != key.data.link);
+				this.favorites.list.splice(index, 1);
+			} else {
+				if (this.favnodes.length || this.favorites.on)
+					this.favnodes.push((await this.loadNodes([key.data.link])).pop());
+				this.favorites.list.push(key.data.link + '');
+			}
+			
+			CoreRESTClient.post("components/stv/favorites/set", {favorites: JSON.stringify(this.favorites)});
 			// TODO(chris): make clickable with keyboard
 		}
 	},
@@ -102,6 +163,29 @@ export default {
 			.catch(error => {
 				console.error(error);
 			});
+		// NOTE(chris): treetable only
+		if (this.debug_version)
+			CoreRESTClient
+				.get("components/stv/favorites")
+				.then(result => result.data)
+				.then(result => {
+					if (result) {
+						let f = JSON.parse(result);
+						console.log(f);
+						if (f.on) {
+							this.loading = true;
+							this.favorites = f;
+							this.loadNodes(this.favorites.list).then(res => {
+								this.favnodes = res;
+								this.loading = false;
+							});
+						} else
+							this.favorites = f;
+					}
+				})
+				.catch(error => {
+					console.error(error);
+				});
 	},
 	template: `
 	<div v-if="!debug_version" class="overflow-auto" tabindex="-1">
@@ -126,7 +210,7 @@ export default {
 		<pv-treetable
 			ref="tree"
 			class="stv-verband p-treetable-sm"
-			:value="nodes"
+			:value="filteredNodes"
 			lazy
 			@node-expand="onExpandTreeNode"
 			selection-mode="single"
@@ -141,9 +225,12 @@ export default {
 					</span>
 				</template>
 			</pv-column>
-			<pv-column field="fav" header="FAV" headerStyle="flex: 0 0 auto" style="flex: 0 0 auto">
+			<pv-column field="fav" headerStyle="flex: 0 0 auto" style="flex: 0 0 auto">
+				<template #header>
+					<a href="#" @click.prev="filterFav"><i :class="favorites.on ? 'fa-solid' : 'fa-regular'" class="fa-star"></i></a>
+				</template>
 				<template #body="{node}">
-					<i :class="node.data.fav ? 'fa-solid' : 'fa-regular'" class="fa-star" @click="markFav(node.key)"></i>
+					<a href="#" @click.prev="markFav(node)"><i :class="favorites.list.includes(node.data.link + '') ? 'fa-solid' : 'fa-regular'" class="fa-star"></i></a>
 				</template>
 			</pv-column>
 		</pv-treetable>

From 6b2150b06694fa48842593bf12d19971419acdeb Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Wed, 25 Oct 2023 12:48:00 +0200
Subject: [PATCH 0141/1461] Fixed: unknown 'fhcerror' to this

---
 public/js/plugin/FhcAlert.js | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/public/js/plugin/FhcAlert.js b/public/js/plugin/FhcAlert.js
index 6ff54061d..ababd0d34 100644
--- a/public/js/plugin/FhcAlert.js
+++ b/public/js/plugin/FhcAlert.js
@@ -263,21 +263,23 @@ export default {
 			handleSystemMessage(message) {
 				// Message is string
 				if (typeof message === 'string')
-					return fhcerror.alertWarning(message);
+				{
+					return this.alertWarning(message);
+				}
 
 				// Message is array of strings
 				if (Array.isArray(message)) {
 					// If Array has only Strings
 					if (message.every(msg => typeof msg === 'string'))
-						return message.every(fhcerror.alertWarning);
+						return message.every(this.alertWarning);
 
 					// If Array has only Objects
 					if (message.every(msg => typeof msg === 'object') && msg !== null) {
 						return message.every(msg => {
 							if (msg.hasOwnProperty('data') && msg.data.hasOwnProperty('retval')) {
-								fhcerror.alertWarning(JSON.stringify(msg.data.retval));
+								this.alertWarning(JSON.stringify(msg.data.retval));
 							} else {
-								fhcerror.alertSystemError(JSON.stringify(msg));
+								this.alertSystemError(JSON.stringify(msg));
 							}
 						});
 					}
@@ -287,15 +289,15 @@ export default {
 				if (typeof message === 'object' && message !== null){
 					if (message.hasOwnProperty('data') && message.data.hasOwnProperty('retval')) {
 						// NOTE(chris): changed: alertSystemError => alertWarning
-						fhcerror.alertWarning(JSON.stringify(message.data.retval));
+						this.alertWarning(JSON.stringify(message.data.retval));
 					} else {
-						fhcerror.alertSystemError(JSON.stringify(message));
+						this.alertSystemError(JSON.stringify(message));
 					}
 					return;
 				}
 
 				// Fallback
-				fhcerror.alertSystemError('alertSystemError throws Generic Error\r\nError Controller Path: ' + FHC_JS_DATA_STORAGE_OBJECT.called_path + '/' +  FHC_JS_DATA_STORAGE_OBJECT.called_method);
+				this.alertSystemError('alertSystemError throws Generic Error\r\nError Controller Path: ' + FHC_JS_DATA_STORAGE_OBJECT.called_path + '/' +  FHC_JS_DATA_STORAGE_OBJECT.called_method);
 			}
 		};
 		app.config.globalProperties.$fhcAlert = $fhcAlert;

From c6d82fe029bb99c73ece04232caec2bd4eaf0198 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Wed, 25 Oct 2023 12:49:37 +0200
Subject: [PATCH 0142/1461] Minor style change of confirmDelete message

---
 public/js/plugin/FhcAlert.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/js/plugin/FhcAlert.js b/public/js/plugin/FhcAlert.js
index ababd0d34..21238c676 100644
--- a/public/js/plugin/FhcAlert.js
+++ b/public/js/plugin/FhcAlert.js
@@ -195,11 +195,12 @@ export default {
 				return new Promise((resolve, reject) => {
 					helperAppInstance.$confirm.require({
 						group: 'fhcAlertConfirm',
-						header: 'Achtung',
+						header: ' ',
 						message: 'Möchten Sie sicher löschen?',
 						acceptLabel: 'Löschen',
 						acceptClass: 'btn btn-danger',
 						rejectLabel: 'Abbrechen',
+						acceptIcon: 'fa fa-xmark',
 						rejectClass: 'btn btn-outline-secondary',
 						accept() {
 							resolve(true);

From fbb00be7cda562895ac7d4041a40911067f9d16a Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Wed, 25 Oct 2023 12:55:35 +0200
Subject: [PATCH 0143/1461] Added slot 'search' to Filterwidget.js

Slot to inject a autoselect / inputfield to search tabulator, if tabulator should stay empty until search results are provided. (Example: performance reasons if too many data; search for multiple at once)
---
 public/js/components/filter/Filter.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index 16d8d4616..4e04ed4b4 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -580,7 +580,7 @@ export const CoreFilterCmpt = {
 		<div :id="'filterCollapsables' + idExtra">
 
 			<div class="d-flex flex-row justify-content-between flex-wrap">
-				<div v-if="newBtnShow || reload || $slots.actions" class="d-flex gap-3 align-items-baseline flex-wrap">
+				<div v-if="newBtnShow || reload || $slots.search || $slots.actions" class="d-flex gap-3 align-items-baseline flex-wrap">
 					<button v-if="newBtnShow" class="btn btn-primary" :class="newBtnClass" :title="newBtnLabel ? undefined : 'New'" :aria-label="newBtnLabel ? undefined : 'New'" @click="$emit('click:new', $event)" :disabled="newBtnDisabled">
 						<span class="fa-solid fa-plus" aria-hidden="true"></span>
 						{{ newBtnLabel }}
@@ -590,6 +590,7 @@ export const CoreFilterCmpt = {
 					</button>
 					<span v-if="$slots.actions && tabulatorHasSelector">Mit {{selectedData.length}} ausgewählten:</span>
 					<slot name="actions" v-bind="tabulatorHasSelector ? selectedData : []"></slot>
+					<slot name="search"></slot>
 				</div>
 				<div class="d-flex gap-1 align-items-baseline flex-grow-1 justify-content-end">
 					<span v-if="!tableOnly">[ {{ filterName }} ]</span>

From 6d8606795fc894264babd08f6d7c3d4b5a89a2da Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 25 Oct 2023 14:04:50 +0200
Subject: [PATCH 0144/1461] Favorites keyboard navigation

---
 .../Stv/Studentenverwaltung/Verband.js        | 36 ++++++++++++++++---
 1 file changed, 31 insertions(+), 5 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Verband.js b/public/js/components/Stv/Studentenverwaltung/Verband.js
index 8ad3bebdb..065c1dc1b 100644
--- a/public/js/components/Stv/Studentenverwaltung/Verband.js
+++ b/public/js/components/Stv/Studentenverwaltung/Verband.js
@@ -149,7 +149,24 @@ export default {
 			}
 			
 			CoreRESTClient.post("components/stv/favorites/set", {favorites: JSON.stringify(this.favorites)});
-			// TODO(chris): make clickable with keyboard
+		},
+		unsetFavFocus(e) {
+			// NOTE(chris): treetable only
+			if (e.target.dataset?.linkFavAdd !== undefined) {
+				e.target.tabIndex = -1;
+			} else {
+				let items = e.target.querySelectorAll('[data-link-fav-add]:not([tabindex="-1"])');
+				items.forEach(el => el.tabIndex = document.activeElement == el ? 0 : -1);
+			}
+		},
+		setFavFocus(e) {
+			// NOTE(chris): treetable only
+			if (e.target.dataset?.linkFavAdd !== undefined) {
+				e.target.tabIndex = 0;
+			} else {
+				let items = e.target.querySelectorAll('[data-link-fav-add][tabindex="-1"]');
+				items.forEach(el => el.tabIndex = 0);
+			}
 		}
 	},
 	mounted() {
@@ -171,7 +188,6 @@ export default {
 				.then(result => {
 					if (result) {
 						let f = JSON.parse(result);
-						console.log(f);
 						if (f.on) {
 							this.loading = true;
 							this.favorites = f;
@@ -217,6 +233,8 @@ export default {
 			@node-select="onSelectTreeNode"
 			scrollable
 			scroll-height="flex"
+			@focusin="setFavFocus"
+			@focusout="unsetFavFocus"
 			>
 			<pv-column field="name" header="Verband" expander>
 				<template #body="{node}">
@@ -227,10 +245,18 @@ export default {
 			</pv-column>
 			<pv-column field="fav" headerStyle="flex: 0 0 auto" style="flex: 0 0 auto">
 				<template #header>
-					<a href="#" @click.prev="filterFav"><i :class="favorites.on ? 'fa-solid' : 'fa-regular'" class="fa-star"></i></a>
+					<a href="#" @click.prevent="filterFav"><i :class="favorites.on ? 'fa-solid' : 'fa-regular'" class="fa-star"></i></a>
 				</template>
-				<template #body="{node}">
-					<a href="#" @click.prev="markFav(node)"><i :class="favorites.list.includes(node.data.link + '') ? 'fa-solid' : 'fa-regular'" class="fa-star"></i></a>
+				<template #body="{node, column}">
+					<a
+						href="#"
+						@click.prevent="markFav(node)"
+						@keydown.enter.stop.prevent="markFav(node)"
+						tabindex="-1"
+						data-link-fav-add
+						>
+						<i :class="favorites.list.includes(node.data.link + '') ? 'fa-solid' : 'fa-regular'" class="fa-star"></i>
+					</a>
 				</template>
 			</pv-column>
 		</pv-treetable>

From aacba9f6aef46080e4cb72d59d0766f7b4740d60 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 25 Oct 2023 16:55:01 +0200
Subject: [PATCH 0145/1461] Accessibility

---
 .../Studentenverwaltung/Details/Details.js    |  6 +--
 .../Stv/Studentenverwaltung/List.js           | 50 ++++++++++++++++++-
 2 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
index ef36aebaf..22f1b012f 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
@@ -195,9 +195,9 @@ export default {
 	},
 	//TODO(chris): Geburtszeit? Anzahl der Kinder?
 	template: `
-	<div ref="form" class="stv-details-details">
+	<form ref="form" class="stv-details-details" @submit.prevent="save">
 		<div class="position-sticky top-0">
-			<button type="button" class="btn btn-primary position-absolute top-0 end-0" @click="save" :disabled="!changedLength">Speichern</button>
+			<button type="submit" class="btn btn-primary position-absolute top-0 end-0" :disabled="!changedLength">Speichern</button>
 		</div>
 		<fieldset class="overflow-hidden">
 			<legend>Person</legend>
@@ -379,5 +379,5 @@ export default {
 			</div>
 		</fieldset>
 		<pv-toast ref="responseToast" style="z-index:9999"></pv-toast>
-	</div>`
+	</form>`
 };
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index a150746af..0b79fee4f 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -74,6 +74,7 @@ export default {
 					handler: this.autoSelectRows
 				}
 			],
+			focusObj: null, // TODO(chris): this should be in the filter component
 			lastSelected: null
 		}
 	},
@@ -113,10 +114,56 @@ export default {
 				});
 			else
 				this.$refs.table.tabulator.setData(url);
+		},
+		onKeydown(e) { // TODO(chris): this should be in the filter component
+			if (!this.focusObj)
+				return;
+			switch (e.code) {
+				case 'Enter':
+				case 'Space':
+					e.preventDefault();
+					this.$refs.table.tabulator.rowManager.findRow(this.focusObj).component.toggleSelect();
+					break;
+				case 'ArrowUp':
+					e.preventDefault();
+					var next = this.focusObj.previousElementSibling;
+					if (next)
+						this.focusObj = this.changeFocus(this.focusObj, next);
+					break;
+				case 'ArrowDown':
+					e.preventDefault();
+					var next = this.focusObj.nextElementSibling;
+					if (next)
+						this.focusObj = this.changeFocus(this.focusObj, next);
+					break;
+			}
+		},
+		changeFocus(a, b) { // TODO(chris): this should be in the filter component
+			a.tabIndex = -1;
+			if (b) {
+				b.tabIndex = 0;
+				b.focus();
+			}
+			return b;
+		},
+		onBlur(e) { // TODO(chris): this should be in the filter component
+			const tableholder = e.target.closest('.tabulator-tableholder');
+			if (tableholder && tableholder != e.target && !e.relatedTarget?.classList.contains('tabulator-row')) {
+				e.target.tabIndex = -1;
+				tableholder.tabIndex = 0;
+				this.focusObj = null;
+			}
+		},
+		onFocus(e) { // TODO(chris): this should be in the filter component
+			if (e.target.classList.contains('tabulator-tableholder')) {
+				this.focusObj = this.changeFocus(e.target, e.target.querySelector('.tabulator-row'));
+			}
 		}
 	},
+	// TODO(chris): focusin, focusout, keydown and tabindex should be in the filter component
+	// TODO(chris): filter component column chooser has no accessibilty features
 	template: `
-	<div class="stv-list h-100 pt-3">
+	<div class="stv-list h-100 pt-3" @focusin="onFocus" @focusout="onBlur" @keydown="onKeydown">
 		<core-filter-cmpt
 			ref="table"
 			:tabulator-options="tabulatorOptions"
@@ -127,6 +174,7 @@ export default {
 			new-btn-show
 			new-btn-label="Prestudent"
 			@click:new="actionNewPrestudent"
+			tabindex="0"
 		>
 		</core-filter-cmpt>
 	</div>`

From 5a002c0f048c0c515d1abb24067514e7dc3480bb Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Tue, 31 Oct 2023 10:40:06 +0100
Subject: [PATCH 0146/1461] Minor change: Adapted mail-text

---
 public/js/plugin/FhcAlert.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/plugin/FhcAlert.js b/public/js/plugin/FhcAlert.js
index 21238c676..e4aaddb73 100644
--- a/public/js/plugin/FhcAlert.js
+++ b/public/js/plugin/FhcAlert.js
@@ -106,7 +106,7 @@ const helperApp = Vue.createApp({
 			let subject = 'Meldung%20Systemfehler';
 			let body = `
 				Danke, dass Sie uns den Fehler melden. %0D%0A %0D%0A
-				Bitte beschreiben Sie uns ausführlich das Problem.%0D%0A
+				Bitte hängen Sie ein screenshot des Fehlers an und beschreiben Sie uns ausführlich das Problem.%0D%0A
 				Bsp: Ich habe X ausgewählt und Y angelegt. Beim Speichern erhielt ich die Fehlermeldung. [Optional: Ich habe den Browser Z verwendet.]%0D%0A
 				-----------------------------------------------------------------------------------------------------------------------------------%0D%0A
 				PROBLEM: ... %0D%0A %0D%0A %0D%0A

From c494dd1cdc938c9338b70dcfb78161f8a1d354f7 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Tue, 31 Oct 2023 10:41:00 +0100
Subject: [PATCH 0147/1461] Added handleFormErrors- and resetFormErrors method
 to FhcAlert Plugin

---
 public/js/plugin/FhcAlert.js | 59 ++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/public/js/plugin/FhcAlert.js b/public/js/plugin/FhcAlert.js
index e4aaddb73..d07ed0d47 100644
--- a/public/js/plugin/FhcAlert.js
+++ b/public/js/plugin/FhcAlert.js
@@ -299,6 +299,65 @@ export default {
 
 				// Fallback
 				this.alertSystemError('alertSystemError throws Generic Error\r\nError Controller Path: ' + FHC_JS_DATA_STORAGE_OBJECT.called_path + '/' +  FHC_JS_DATA_STORAGE_OBJECT.called_method);
+			},
+			handleFormErrors(errors, formRef){
+				// Reset previous error messages, if present
+				this.resetFormErrors(formRef);
+
+				// If errors is object
+				if (typeof errors === 'object' && !Array.isArray(errors) && errors !== null)
+				{
+					// Loop through errors
+					for (let key in errors) {
+
+						let input = formRef.querySelector('[name="' + key + '"]');
+
+						// If key is an input field name, display error above field
+						if (input) {
+							input.classList.add("is-invalid");
+							input.classList.add("form-control");
+
+							const feedback = document.createElement("div");
+							feedback.innerHTML = errors[key];
+							feedback.classList.add("invalid-feedback");
+
+							input.after(feedback);
+						}
+						// ...else display error on top of the form
+						else {
+							const feedback = document.createElement("div");
+							feedback.classList.add("d-flex");
+							feedback.classList.add("align-items-center");
+							feedback.classList.add("alert");
+							feedback.classList.add("alert-danger");
+							feedback.innerHTML = errors[key];
+
+							formRef.prepend(feedback);
+						}
+					}
+				}
+				// else, display on top of the form
+				else {
+					const feedback = document.createElement("div");
+					feedback.classList.add("d-flex");
+					feedback.classList.add("align-items-center");
+					feedback.classList.add("alert");
+					feedback.classList.add("alert-danger");
+					feedback.innerHTML = errors;
+
+					formRef.prepend(feedback);
+				}
+			},
+			resetFormErrors(formRef){
+				// Remove all errors above input fields
+				Array.from(formRef.getElementsByClassName('is-invalid')).forEach(el => el.classList.remove('is-invalid'));
+				Array.from(formRef.getElementsByClassName('invalid-feedback')).forEach(el => el.remove());
+
+				// Check if there is a prepended alert-danger div, and remove it if it exists
+				const prependedAlert = formRef.querySelector('.alert.alert-danger');
+				if (prependedAlert) {
+					prependedAlert.remove();
+				}
 			}
 		};
 		app.config.globalProperties.$fhcAlert = $fhcAlert;

From be7321723acb8954bcb588cb7841e13984121316 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 31 Oct 2023 14:44:04 +0100
Subject: [PATCH 0148/1461] add FhcAlert

---
 public/js/apps/Studentenverwaltung.js                 |  3 +++
 .../Stv/Studentenverwaltung/Details/Details.js        | 11 ++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/public/js/apps/Studentenverwaltung.js b/public/js/apps/Studentenverwaltung.js
index 4a8607a42..e6a93c5c5 100644
--- a/public/js/apps/Studentenverwaltung.js
+++ b/public/js/apps/Studentenverwaltung.js
@@ -20,6 +20,8 @@ import fhcapifactory from "./api/fhcapifactory.js";
 
 import PvConfig from "../../../index.ci.php/public/js/components/primevue/config/config.esm.min.js";
 
+import FhcAlert from "../plugin/FhcAlert.js";
+
 Vue.$fhcapi = fhcapifactory;
 
 const ciPath = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*?\/)/g, '') + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
@@ -39,5 +41,6 @@ const app = Vue.createApp();
 app
 	.use(router)
 	.use(PvConfig)
+	.use(FhcAlert)
 	.mount('#main');
 
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
index 22f1b012f..50554f388 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
@@ -123,16 +123,17 @@ export default {
 							this.gebDatumIsValid = true;
 						
 						// TODO(chris): phrase
-						this.addToast('Gespeichert', '', 'success');
+						this.$fhcAlert.alertSuccess('Gespeichert');
+						//this.addToast('Gespeichert', '', 'success');
 
 						this.original = {...this.data};
 						this.changed = {};
 					}
 				})
-				.catch(err => {
+				.catch(this.$fhcAlert.handleSystemError/*err => {
 					// TODO(chris): phrase
 					this.addToast('Error', err?.response?.data || err?.message, 'error');
-				})
+				}*/);
 		},
 		resetErrors() {
 			Array.from(this.$refs.form.getElementsByClassName('is-valid')).forEach(el => el.classList.remove('is-valid'));
@@ -156,14 +157,14 @@ export default {
 			feedback.classList.add('invalid-feedback');
 			feedback.innerHTML = msg;
 			input.after(feedback);
-		},
+		/*},
 		addToast(header, msg, severity) {
 			this.$refs.responseToast.add({
 				severity: severity,
 				summary: header,
 				detail: msg,
 				life: 3000
-			})
+			})*/
 		}
 	},
 	created() {

From 562b8b000f5170aff4e83986f93d39fd45d5797e Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 31 Oct 2023 14:44:52 +0100
Subject: [PATCH 0149/1461] Don't submit field that is empty when original
 value is null

---
 .../js/components/Stv/Studentenverwaltung/Details/Details.js   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
index 50554f388..77c6bf4d2 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
@@ -76,7 +76,8 @@ export default {
 						if (new Date(this.original[k]).toString() != new Date(n[k]).toString())
 							res[k] = n[k];
 					} else {
-						if (this.original[k] !== n[k])
+						// TODO(chris): null && ""? should there be an exception for this?
+						if (this.original[k] !== n[k] && !(this.original[k] === null && n[k] === ""))
 							res[k] = n[k];
 					}
 				}

From bd9f3abfea0f3e9ab01e07a294efe1a03a639e08 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 31 Oct 2023 14:45:29 +0100
Subject: [PATCH 0150/1461] add FhcAlert file

---
 public/js/plugin/FhcAlert.js | 307 +++++++++++++++++++++++++++++++++++
 1 file changed, 307 insertions(+)
 create mode 100644 public/js/plugin/FhcAlert.js

diff --git a/public/js/plugin/FhcAlert.js b/public/js/plugin/FhcAlert.js
new file mode 100644
index 000000000..9eee56502
--- /dev/null
+++ b/public/js/plugin/FhcAlert.js
@@ -0,0 +1,307 @@
+/**
+ * Copyright (C) 2022 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * 
+ * @usage:
+ * Preperations:
+ * Be sure to have PrimeVue loaded  with the toast and confirmdialog
+ * components as primevue variable
+ * Install:
+ * Import this Plugin and install it with the app.use() function.
+ * Use:
+ * In your component you can call now the global property $fhcAlert
+ * which has the following functions:
+ * 
+ * alertSuccess
+ * ------------
+ * Displays a success message
+ * @param string	message
+ * @return void
+ * 
+ * alertInfo
+ * ---------
+ * Displays an info message
+ * @param string	message
+ * @return void
+ * 
+ * alertWarning
+ * ------------
+ * Displays a warning
+ * @param string	message
+ * @return void
+ * 
+ * alertError
+ * ----------
+ * Displays an error
+ * @param string	message
+ * @return void
+ * 
+ * alertSystemError
+ * ----------------
+ * Displays an alert with the error details and a button to mail
+ * the error to the Support Team
+ * @param string	message
+ * @return void
+ * 
+ * confirmDelete
+ * -------------
+ * Displays a confirmation dialog and returns a Promise which resolves
+ * with true or false depending und the pressed button.
+ * @return Promise
+ * 
+ * alertDefault
+ * ------------
+ * Displays an alert
+ * @param string	severity		can be 'success', 'info', 'warning', 'error'
+ * @param string	title
+ * @param string	message
+ * @param boolean	sticky			(optional) defaults to false
+ * @return void
+ * 
+ * alertMultiple
+ * -------------
+ * Displays multiple alerts
+ * @param array		messageArray
+ * @param string	severity		(optional) defaults to 'info'
+ * @param string	title			(optional) defaults to 'Info'
+ * @param boolean	sticky			(optional) defaults to false
+ * @return void
+ * 
+ * handleSystemError
+ * -----------------
+ * Automatiticly determine how to display an system error and display it.
+ * This would be used in a catch block of an ajax call.
+ * @param mixed		error
+ * @return void
+ * 
+ * handleSystemMessage
+ * -------------------
+ * Automatiticly determine how to display a message and display it.
+ * @param mixed		message
+ * @return void
+ */
+import PvConfig from "../../../index.ci.php/public/js/components/primevue/config/config.esm.min.js";
+import PvToast from "../../../index.ci.php/public/js/components/primevue/toast/toast.esm.min.js";
+import PvConfirm from "../../../index.ci.php/public/js/components/primevue/confirmdialog/confirmdialog.esm.min.js";
+import PvConfirmationService from "../../../index.ci.php/public/js/components/primevue/confirmationservice/confirmationservice.esm.min.js";
+
+const helperAppContainer = document.createElement('div');
+
+const helperApp = Vue.createApp({
+	components: {
+		PvToast,
+		PvConfirm
+	},
+	methods: {
+		mailToUrl(slotProps) {
+			let mailTo = 'noreply@technikum-wien.at'; // TODO domain anpassen
+			let subject = 'Meldung%20Systemfehler';
+			let body = `
+				Danke, dass Sie uns den Fehler melden. %0D%0A %0D%0A
+				Bitte beschreiben Sie uns ausführlich das Problem.%0D%0A
+				Bsp: Ich habe X ausgewählt und Y angelegt. Beim Speichern erhielt ich die Fehlermeldung. [Optional: Ich habe den Browser Z verwendet.]%0D%0A
+				-----------------------------------------------------------------------------------------------------------------------------------%0D%0A
+				PROBLEM: ... %0D%0A %0D%0A %0D%0A
+
+				-----------------------------------------------------------------------------------------------------------------------------------%0D%0A
+				Fehler URL: ` + FHC_JS_DATA_STORAGE_OBJECT.called_path + '/' + FHC_JS_DATA_STORAGE_OBJECT.called_method + `%0D%0A
+				Fehler Meldung: ` + slotProps.message.detail + `%0D%0A
+				-----------------------------------------------------------------------------------------------------------------------------------%0D%0A %0D%0A
+				Wir kümmern uns um eine rasche Behebung des Problems!`
+
+			return "mailto:" + mailTo + "?subject=" + subject + "&body=" + body;
+		},
+		openMessagecard() {
+			bootstrap.Collapse.getOrCreateInstance(this.$refs.messageCard).toggle();
+		}
+	},
+	unmounted() {
+		helperAppContainer.parentElement.removeChild(helperAppContainer);
+	},
+	template: `
+	<pv-toast ref="toast" base-z-index="99999"></pv-toast>
+	<pv-toast ref="alert" base-z-index="99999" position="center">
+		<template #message="slotProps">
+			<i class="fa fa-circle-exclamation fa-2xl mt-3"></i>
+			<div class="p-toast-message-text">
+				<span class="p-toast-summary">{{slotProps.message.summary}}</span>
+				<div class="p-toast-detail my-3">Sorry! Ein interner technischer Fehler ist aufgetreten.</div>
+				<div class="d-flex justify-content-between align-items-center">
+					<a
+						class="align-bottom flex-fill me-2"
+						data-bs-toggle="collapse"
+						href="#collapseMessageCard"
+						role="button"
+						aria-expanded="false"
+						aria-controls="collapseMessageCard"
+						@click="openMessagecard"
+						>
+						Fehler anzeigen
+					</a>
+					<a
+						class="btn btn-primary flex-fill"
+						target="_blank"
+						:href="mailToUrl(slotProps)"
+						>
+						Fehler melden
+					</a>
+				</div>
+				<div ref="messageCard" id="collapseMessageCard" class="collapse mt-3">
+					<div class="card card-body text-body small" style="white-space: pre-wrap">
+						{{slotProps.message.detail}}
+					</div>
+				</div>
+			</div>
+		</template>
+	</pv-toast>
+	<pv-confirm group="fhcAlertConfirm"></pv-confirm>`
+});
+
+helperApp.use(PvConfig);
+helperApp.use(PvConfirmationService);
+
+const helperAppInstance = helperApp.mount(helperAppContainer);
+
+document.body.appendChild(helperAppContainer);
+
+
+export default {
+	install: (app, options) => {
+		const $fhcAlert = {
+			alertSuccess(message) {
+				helperAppInstance.$refs.toast.add({ severity: 'success', summary: 'Info', detail: message, life: 1000});
+			},
+			alertInfo(message) {
+				helperAppInstance.$refs.toast.add({ severity: 'info', summary: 'Info', detail: message, life: 3000 });
+			},
+			alertWarning(message) {
+				helperAppInstance.$refs.toast.add({ severity: 'warn', summary: 'Achtung', detail: message});
+			},
+			alertError(message) {
+				helperAppInstance.$refs.toast.add({ severity: 'error', summary: 'Achtung', detail: message });
+			},
+			alertSystemError(message) {
+				helperAppInstance.$refs.alert.add({ severity: 'error', summary: 'Systemfehler', detail: message});
+			},
+			confirmDelete() {
+				return new Promise((resolve, reject) => {
+					helperAppInstance.$confirm.require({
+						group: 'fhcAlertConfirm',
+						header: 'Achtung',
+						message: 'Möchten Sie sicher löschen?',
+						acceptLabel: 'Löschen',
+						acceptClass: 'btn btn-danger',
+						rejectLabel: 'Abbrechen',
+						rejectClass: 'btn btn-outline-secondary',
+						accept() {
+							resolve(true);
+						},
+						reject() {
+							resolve(false);
+						},
+					});
+				});
+			},
+			alertDefault(severity, title, message, sticky = false) {
+				let options = { severity: severity, summary: title, detail: message};
+				
+				if (!sticky)
+					options.life = 3000;
+
+				helperAppInstance.$refs.toast.add(options);
+			},
+			alertMultiple(messageArray, severity = 'info', title = 'Info', sticky = false){
+				// Check, if array has only string values
+				if (messageArray.every(message => typeof message === 'string')) {
+					messageArray.every(message => this.alertDefault(severity, title, message, sticky));
+					return true;
+				}
+				return false;
+			},
+			handleSystemError(error) {
+				// Error is string
+				if (typeof error === 'string')
+					return $fhcAlert.alertSystemError(error);
+
+				// Error is array of strings
+				if (Array.isArray(error) && error.every(err => typeof err === 'string'))
+					return error.every($fhcAlert.alertSystemError);
+				
+				// Error is object
+				if (typeof error === 'object' && error !== null) {
+					let errMsg = '';
+
+					if (error.hasOwnProperty('message'))
+						errMsg += 'Error Message: ' + error.message.toUpperCase() + '\r\n';
+
+					if (error.hasOwnProperty('config') && error.config.hasOwnProperty('url'))
+						errMsg += 'Error ConfigURL: ' + error.config.url + '\r\n';
+
+					if (error.hasOwnProperty('stack'))
+						errMsg += 'Error Stack: ' + error.stack + '\r\n';
+					
+					// Fallback object error message
+					if (errMsg == '')
+						errMsg = 'Error Message: ' + JSON.stringify(error) + '\r\n';
+
+					errMsg += 'Error Controller Path: ' + FHC_JS_DATA_STORAGE_OBJECT.called_path + '/' + FHC_JS_DATA_STORAGE_OBJECT.called_method;
+
+					return $fhcAlert.alertSystemError(errMsg);
+				}
+
+				// Fallback
+				$fhcAlert.alertSystemError('alertSystemError throws Generic Error\r\nError Controller Path: ' + FHC_JS_DATA_STORAGE_OBJECT.called_path + '/' + FHC_JS_DATA_STORAGE_OBJECT.called_method);
+			},
+			handleSystemMessage(message) {
+				// Message is string
+				if (typeof message === 'string')
+					return fhcerror.alertWarning(message);
+
+				// Message is array of strings
+				if (Array.isArray(message)) {
+					// If Array has only Strings
+					if (message.every(msg => typeof msg === 'string'))
+						return message.every(fhcerror.alertWarning);
+
+					// If Array has only Objects
+					if (message.every(msg => typeof msg === 'object') && msg !== null) {
+						return message.every(msg => {
+							if (msg.hasOwnProperty('data') && msg.data.hasOwnProperty('retval')) {
+								fhcerror.alertWarning(JSON.stringify(msg.data.retval));
+							} else {
+								fhcerror.alertSystemError(JSON.stringify(msg));
+							}
+						});
+					}
+				}
+
+				// Message is Object with data property
+				if (typeof message === 'object' && message !== null){
+					if (message.hasOwnProperty('data') && message.data.hasOwnProperty('retval')) {
+						// NOTE(chris): changed: alertSystemError => alertWarning
+						fhcerror.alertWarning(JSON.stringify(message.data.retval));
+					} else {
+						fhcerror.alertSystemError(JSON.stringify(message));
+					}
+					return;
+				}
+
+				// Fallback
+				fhcerror.alertSystemError('alertSystemError throws Generic Error\r\nError Controller Path: ' + FHC_JS_DATA_STORAGE_OBJECT.called_path + '/' +  FHC_JS_DATA_STORAGE_OBJECT.called_method);
+			}
+		};
+		app.config.globalProperties.$fhcAlert = $fhcAlert;
+	}
+}
\ No newline at end of file

From 29600f1059c3b6021eed72038817e8ee8882fdcc Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 31 Oct 2023 14:45:47 +0100
Subject: [PATCH 0151/1461] Basic Search

---
 .../Stv/Studentenverwaltung/Verband.js        | 109 ++++++++----------
 1 file changed, 50 insertions(+), 59 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Verband.js b/public/js/components/Stv/Studentenverwaltung/Verband.js
index 065c1dc1b..be88057d0 100644
--- a/public/js/components/Stv/Studentenverwaltung/Verband.js
+++ b/public/js/components/Stv/Studentenverwaltung/Verband.js
@@ -17,10 +17,9 @@ export default {
 	],
 	data() {
 		return {
-			debug_version: 1, // NOTE(chris): switch between tree/treetable and filter/favorites...
 			loading: true,
-			selected: {}, // NOTE(chris): tree only
 			nodes: [],
+			filters: {}, // TODO(chris): filter only 1st level?
 			favnodes: [],
 			favorites: {on: false, list: []}
 		}
@@ -32,6 +31,17 @@ export default {
 		}
 	},
 	methods: {
+		findNodeByKey(key, arr) {
+			if (!arr)
+				arr = this.nodes;
+			let res = arr.filter(n => n.key == key);
+			if (res.length)
+				return res.pop();
+			res = arr.map(n => n.children ? this.findNodeByKey(key, n.children) : null).filter();
+			if (res.length)
+				return res.pop();
+			return null;
+		},
 		onExpandTreeNode(node) {
 			if (!node.children) {
 				if (node.data.link) {
@@ -42,18 +52,20 @@ export default {
 						});
 					});
 					this.loading = true;
+					
 					CoreRESTClient
 						.get("components/stv/verband/" + node.data.link)
 						.then(result => result.data)
 						.then(result => {
 							const subNodes = result.map(this.mapResultToTreeData);
-							node.children = subNodes;
+							const realNode = this.findNodeByKey(node.key);
+							if (realNode)
+								realNode.children = subNodes;
+							else
+								node.children = subNodes; // NOTE(chris): fallback should never be the case
 
 							let treeitem = this.$refs.tree.$el.querySelector('[data-tree-item-key="' + node.key + '"]');
-							if (!this.debug_version) // NOTE(chris): tree only
-								treeitem = treeitem.closest('[role="treeitem"]');
-							else // NOTE(chris): treetable only
-								treeitem = treeitem.closest('[role="row"]');
+							treeitem = treeitem.closest('[role="row"]');
 							
 							this.$nextTick(() => {
 								if (activeEl == document.activeElement)
@@ -89,12 +101,7 @@ export default {
 
 			return cp;
 		},
-		onFilterKeydown(data) {
-			// NOTE(chris): tree only
-			// TODO(chris): we can online search here
-		},
 		async filterFav() {
-			// NOTE(chris): treetable only
 			if (!this.favorites.on && !this.favnodes.length && this.favorites.list.length) {
 				this.loading = true;
 				this.favnodes = await this.loadNodes(this.favorites.list);
@@ -104,7 +111,6 @@ export default {
 			this.loading = false;
 		},
 		async loadNodes(links) {
-			// NOTE(chris): treetable only
 			let sortedInParents = links.reduce((o, link) => {
 				link = link + '';
 				let parent,
@@ -135,7 +141,6 @@ export default {
 			return links.map(link => result[link]);
 		},
 		async markFav(key) {
-			// NOTE(chris): treetable only
 			let index = this.favorites.list.indexOf(key.data.link + '');
 
 			if (index != -1) {
@@ -151,7 +156,6 @@ export default {
 			CoreRESTClient.post("components/stv/favorites/set", {favorites: JSON.stringify(this.favorites)});
 		},
 		unsetFavFocus(e) {
-			// NOTE(chris): treetable only
 			if (e.target.dataset?.linkFavAdd !== undefined) {
 				e.target.tabIndex = -1;
 			} else {
@@ -160,7 +164,6 @@ export default {
 			}
 		},
 		setFavFocus(e) {
-			// NOTE(chris): treetable only
 			if (e.target.dataset?.linkFavAdd !== undefined) {
 				e.target.tabIndex = 0;
 			} else {
@@ -180,54 +183,33 @@ export default {
 			.catch(error => {
 				console.error(error);
 			});
-		// NOTE(chris): treetable only
-		if (this.debug_version)
-			CoreRESTClient
-				.get("components/stv/favorites")
-				.then(result => result.data)
-				.then(result => {
-					if (result) {
-						let f = JSON.parse(result);
-						if (f.on) {
-							this.loading = true;
-							this.favorites = f;
-							this.loadNodes(this.favorites.list).then(res => {
-								this.favnodes = res;
-								this.loading = false;
-							});
-						} else
-							this.favorites = f;
-					}
-				})
-				.catch(error => {
-					console.error(error);
-				});
+		CoreRESTClient
+			.get("components/stv/favorites")
+			.then(result => result.data)
+			.then(result => {
+				if (result) {
+					let f = JSON.parse(result);
+					if (f.on) {
+						this.loading = true;
+						this.favorites = f;
+						this.loadNodes(this.favorites.list).then(res => {
+							this.favnodes = res;
+							this.loading = false;
+						});
+					} else
+						this.favorites = f;
+				}
+			})
+			.catch(error => {
+				console.error(error);
+			});
 	},
 	template: `
-	<div v-if="!debug_version" class="overflow-auto" tabindex="-1">
-		<pv-tree
-			ref="tree"
-			class="stv-verband p-0"
-			v-model:selectionKeys="selected"
-			:value="nodes"
-			selection-mode="single"
-			@node-select="onSelectTreeNode"
-			@node-expand="onExpandTreeNode"
-			:loading="loading"
-			filter
-			:pt="{input:{onKeydown:onFilterKeydown}}"
-			>
-			<template #default="{node}">
-				<span :data-tree-item-key="node.key" :title="node.data.studiengang_kz">{{node.label}}</span>
-			</template>
-		</pv-tree>
-	</div>
-	<div v-else class="overflow-auto" tabindex="-1">
+	<div class="overflow-auto" tabindex="-1">
 		<pv-treetable
 			ref="tree"
 			class="stv-verband p-treetable-sm"
 			:value="filteredNodes"
-			lazy
 			@node-expand="onExpandTreeNode"
 			selection-mode="single"
 			@node-select="onSelectTreeNode"
@@ -235,8 +217,17 @@ export default {
 			scroll-height="flex"
 			@focusin="setFavFocus"
 			@focusout="unsetFavFocus"
+			:filters="filters"
 			>
-			<pv-column field="name" header="Verband" expander>
+			<pv-column field="name" expander>
+				<template #header>
+					<div class="text-right">
+						<div class="p-input-icon-left">
+							<i class="pi pi-search"></i>
+							<input type="text" v-model="filters['global']" class="form-control ps-5" placeholder="Search" />
+						</div>
+					</div>
+				</template>
 				<template #body="{node}">
 					<span :data-tree-item-key="node.key" :title="node.data.studiengang_kz">
 						{{node.data.name}}

From 818a93ab2c9366573a1c85ce1a0e74512b944683 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 31 Oct 2023 14:52:54 +0100
Subject: [PATCH 0152/1461] search for studiengang_kz

---
 public/js/components/Stv/Studentenverwaltung/Verband.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/js/components/Stv/Studentenverwaltung/Verband.js b/public/js/components/Stv/Studentenverwaltung/Verband.js
index be88057d0..fea977e59 100644
--- a/public/js/components/Stv/Studentenverwaltung/Verband.js
+++ b/public/js/components/Stv/Studentenverwaltung/Verband.js
@@ -250,6 +250,7 @@ export default {
 					</a>
 				</template>
 			</pv-column>
+			<pv-column field="studiengang_kz" class="d-none"></pv-column>
 		</pv-treetable>
 	</div>`
 };
\ No newline at end of file

From 45715d78f728a1bd28f49225dd6fb434678043e2 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 2 Nov 2023 11:47:09 +0100
Subject: [PATCH 0153/1461] Bootstrap Modal Component

---
 public/js/components/Bootstrap/Modal.js | 111 ++++++++++++++++++++++++
 1 file changed, 111 insertions(+)
 create mode 100644 public/js/components/Bootstrap/Modal.js

diff --git a/public/js/components/Bootstrap/Modal.js b/public/js/components/Bootstrap/Modal.js
new file mode 100644
index 000000000..f910e8e32
--- /dev/null
+++ b/public/js/components/Bootstrap/Modal.js
@@ -0,0 +1,111 @@
+export default {
+	data: () => ({
+		modal: null
+	}),
+	props: {
+		backdrop: {
+			type: [Boolean,String],
+			default: true,
+			validator(value) {
+				return ['static', true, false].includes(value);
+			}
+		},
+		focus: {
+			type: Boolean,
+			default: true
+		},
+		keyboard: {
+			type: Boolean,
+			default: true
+		},
+		noCloseBtn: Boolean,
+		dialogClass: [String,Array,Object],
+		bodyClass: {
+			type: [String,Array,Object],
+			default: 'px-4 py-5'
+		}
+	},
+	emits: [
+		"hideBsModal",
+		"hiddenBsModal",
+		"hidePreventedBsModal",
+		"showBsModal",
+		"shownBsModal"
+	],
+	methods: {
+		dispose() {
+			return this.modal.dispose();
+		},
+		handleUpdate() {
+			return this.modal.handleUpdate();
+		},
+		hide() {
+			return this.modal.hide();
+		},
+		show(relatedTarget) {
+			return this.modal.show(relatedTarget);
+		},
+		toggle() {
+			return this.modal.toggle();
+		}
+	},
+	mounted() {
+		if (this.$refs.modal)
+			this.modal = new bootstrap.Modal(this.$refs.modal, {
+				backdrop: this.backdrop,
+				focus: this.focus,
+				keyboard: this.keyboard
+			});
+	},
+	popup(body, options, title, footer) {
+		const BsModal = this,
+			slots = {};
+		if (body !== undefined)
+			slots.default = () => body;
+		if (title !== undefined)
+			slots.title = () => title;
+		if (footer !== undefined)
+			slots.footer = () => footer;
+		return new Promise((resolve,reject) => {
+			const instance = Vue.createApp({
+				setup() {
+					return () => Vue.h(BsModal, {...{
+						class: 'fade'
+					},...options, ...{
+						ref: 'modal',
+						'onHidden.bs.modal': instance.unmount
+					}}, slots);
+				},
+				mounted() {
+					this.$refs.modal.show();
+				},
+				beforeUnmount() {
+					if (this.$refs.modal)
+						this.$refs.modal.result !== false ? resolve(this.$refs.modal.result) : reject();
+				},
+				unmounted() {
+					wrapper.parentElement.removeChild(wrapper);
+				}
+			});
+			const wrapper = document.createElement("div");
+			instance.mount(wrapper);
+			document.body.appendChild(wrapper);
+		});
+	},
+	template: `<div ref="modal" class="bootstrap-modal modal" tabindex="-1" @[\`hide.bs.modal\`]="$emit('hideBsModal')" @[\`hidden.bs.modal\`]="$emit('hiddenBsModal')" @[\`hidePrevented.bs.modal\`]="$emit('hidePreventedBsModal')" @[\`show.bs.modal\`]="$emit('showBsModal')" @[\`shown.bs.modal\`]="$emit('shownBsModal')">
+		<div class="modal-dialog" :class="dialogClass">
+			<div class="modal-content">
+				<div v-if="$slots.title" class="modal-header">
+					<h5 class="modal-title"><slot name="title"/></h5>
+					<button v-if="!noCloseBtn" type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+				</div>
+				<div class="modal-body" :class="bodyClass">
+					<slot></slot>
+				</div>
+				<div v-if="$slots.footer" class="modal-footer">
+					<slot name="footer"/>
+				</div>
+			</div>
+		</div>
+	</div>`
+}

From 94fe3b594d8487b22d3986a16f82477eec5d7890 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 2 Nov 2023 12:52:38 +0100
Subject: [PATCH 0154/1461] Anlage  Kontakttab

---
 .../controllers/components/stv/Student.php    | 100 ++++++++
 .../Stv/Studentenverwaltung/Details.js        |   3 +-
 .../Studentenverwaltung/Details/Kontakt.js    |  67 +++++
 .../Details/Kontakt/Address.js                | 231 ++++++++++++++++++
 .../Details/Kontakt/Bankaccount.js            |  99 ++++++++
 .../Details/Kontakt/Contact.js                |  93 +++++++
 6 files changed, 592 insertions(+), 1 deletion(-)
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Kontakt.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js

diff --git a/application/controllers/components/stv/Student.php b/application/controllers/components/stv/Student.php
index 0acc37c64..480e07a2c 100644
--- a/application/controllers/components/stv/Student.php
+++ b/application/controllers/components/stv/Student.php
@@ -264,4 +264,104 @@ class Student extends FHC_Controller
 		return true;
 	}
 
+	public function getAdressen($person_id)
+	{
+		$this->load->model('person/Adresse_model', 'AdresseModel');
+		$this->load->model('person/Adressentyp_model', 'AdressentypModel');
+		$this->load->model('ressource/firma_model', 'FirmaModel');
+
+		$this->AdresseModel->addSelect('*');
+		$this->AdressentypModel->addJoin('public.tbl_adressentyp t', 'ON (t.adressentyp_kurzbz = public.tbl_adresse.typ)');
+		$this->FirmaModel->addJoin('public.tbl_firma f', 'ON (f.firma_id = public.tbl_adresse.firma_id)', 'LEFT');
+
+		$result = $this->AdresseModel->loadWhere(
+			array('person_id' => $person_id)
+		);
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->outputJson(getError($result));
+		} else {
+			$this->outputJson(getData($result) ?: []);
+		}
+	}
+
+	public function addNewAddress($person_id)
+	{
+		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+
+		//var_dump($_POST);
+		//echo ($_POST['ort']);
+		$this->load->model('person/Adresse_model', 'AdresseModel');
+		// Load Libraries
+		$this->load->library('AuthLib');
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+
+		$result = $this->AdresseModel->insert(
+			[
+				'person_id' => $person_id,
+				'strasse' =>  $_POST['strasse'],
+				'insertvon' => 'FHC4',
+				'insertamum' => date('c'),
+				'plz' => $_POST['plz'],
+				'ort' => $_POST['ort'],
+				'gemeinde' => $_POST['gemeinde'],
+				'nation' => $_POST['nation'],
+				'heimatadresse' => $_POST['heimatadresse'],
+				'zustelladresse' => $_POST['zustelladresse'],
+				'co_name' => $_POST['co_name'],
+				'typ' => $_POST['typ']
+
+			]
+		);
+
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson($result);
+		}
+
+		return $this->outputJsonSuccess(true);
+
+
+
+	}
+
+	public function getKontakte($person_id)
+	{
+		$this->load->model('person/Kontakt_model', 'KontaktModel');
+		$this->load->model('organisation/standort_model', 'StandortModel');
+		$this->load->model('ressource/firma_model', 'FirmaModel');
+
+		$this->KontaktModel->addSelect('*');
+		$this->StandortModel->addJoin('public.tbl_standort st', 'ON (public.tbl_kontakt.standort_id = st.standort_id)', 'LEFT');
+		$this->StandortModel->addJoin('public.tbl_firma f', 'ON (f.firma_id = st.firma_id)', 'LEFT');
+
+		$result = $this->KontaktModel->loadWhere(
+			array('person_id' => $person_id)
+		);
+
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->outputJson(getError($result));
+		} else {
+			$this->outputJson(getData($result) ?: []);
+		}
+	}
+
+	public function getBankverbindung($person_id)
+	{
+		$this->load->model('person/Bankverbindung_model', 'BankverbindungModel');
+
+		$this->BankverbindungModel->addSelect('*');
+
+		$result = $this->BankverbindungModel->loadWhere(
+			array('person_id' => $person_id)
+		);
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->outputJson(getError($result));
+		} else {
+			$this->outputJson(getData($result) ?: []);
+		}
+	}
+
 }
diff --git a/public/js/components/Stv/Studentenverwaltung/Details.js b/public/js/components/Stv/Studentenverwaltung/Details.js
index 910a65866..2c4c4c837 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details.js
@@ -7,7 +7,8 @@ export default {
 			current: this.$route.params.tab || 'details',
 			tabTemplates: {
 				details: 'Details',
-				notizen: 'Notizen'
+				notizen: 'Notizen',
+				kontakt: 'Kontakt'
 			},
 			tabs: {}
 		}
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt.js
new file mode 100644
index 000000000..6212f8e32
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt.js
@@ -0,0 +1,67 @@
+import {CoreRESTClient} from '../../../../RESTClient.js';
+import AddressList from "./Kontakt/Address.js";
+import ContactList from "./Kontakt/Contact.js";
+import BankaccountList from "./Kontakt/Bankaccount.js";
+import PvToast from "../../../../../../index.ci.php/public/js/components/primevue/toast/toast.esm.min.js";
+export default {
+	components: {
+		AddressList,
+		ContactList,
+		BankaccountList,
+		PvToast
+	},
+	props: {
+		student: Object
+	},
+	data() {
+		return {
+			adressen: [],
+			kontakte: [],
+			bankverbindungen: []
+		}
+	},
+	created(){
+		CoreRESTClient
+			.get('components/stv/Student/getAdressen/' + this.student.person_id)
+			.then(result => {
+				this.adressen = result.data;
+			})
+			.catch(err => {
+				console.error(err.response.data || err.message);
+			});
+		/*		CoreRESTClient
+					.get('components/stv/Student/getKontakte/' + this.student.person_id)
+					.then(result => {
+						this.kontakte = result.data;
+					})
+					.catch(err => {
+						console.error(err.response.data || err.message);
+					});
+				CoreRESTClient
+					.get('components/stv/Student/getBankverbindung/' + this.student.person_id)
+					.then(result => {
+						this.bankverbindungen = result.data;
+					})
+					.catch(err => {
+						console.error(err.response.data || err.message);
+					});*/
+	},
+	template: `
+	<div class="stv-details-details h-100 pb-3">
+		<fieldset class="overflow-hidden">
+			<legend>Adressen</legend>		
+		<!--	{{this.adressen}}-->
+				<address-list ref="adressList" :uid="student.person_id"></address-list>
+		</fieldset>
+		<fieldset class="overflow-hidden">
+			<legend>Kontakt</legend>
+	<!--		{{this.kontakte}}-->
+			<contact-list ref="contactList" :uid="student.person_id"></contact-list>
+		</fieldset>
+		<fieldset class="overflow-hidden">
+			<legend>Bankverbindungen</legend>
+<!--			{{this.bankverbindungen}}-->
+			<bankaccount-list ref="bankaccountList" :uid="student.person_id"></bankaccount-list>
+		</fieldset>
+	</div>`
+};
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
new file mode 100644
index 000000000..477b3baa2
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
@@ -0,0 +1,231 @@
+import {CoreFilterCmpt} from "../../../../filter/Filter.js";
+import {CoreRESTClient} from "../../../../../RESTClient";
+
+
+var editIcon = function(cell, formatterParams){ //plain text value
+	return "<i class='fa fa-edit'></i>";
+};
+var deleteIcon = function(cell, formatterParams){ //plain text value
+	return "<i class='fa fa-remove'></i>";
+};
+
+
+export default{
+	components: {
+		CoreFilterCmpt
+	},
+	props: {
+		uid: String
+	},
+	emits: [
+		'update:selected'
+	],
+	data() {
+		return{
+			tabulatorOptions: {
+				ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Student/getAdressen/' + this.uid),
+				//autoColumns: true,
+				columns:[
+					{title:"Typ", field:"bezeichnung"}, //TODO(manu) mix ok?
+					{title:"Strasse", field:"strasse"},
+					{title:"Plz", field:"plz"},
+					{title:"Ort", field:"ort"},
+					{title:"Gemeinde", field:"gemeinde"},
+					{title:"Nation", field:"nation"},
+					{title:"Heimatadresse", field:"heimatadresse",
+						formatter: (cell, formatterParams, onRendered) => {
+							let output = cell.getValue() ? "ja" : "nein";
+							return output;}
+					},
+					{title:"Abweich.Empf", field:"co_name"},
+					{title:"Firma", field:"name"}, //TODO(manu) check in DB
+					{title:"Firma_id", field:"firma_id", visible:false},
+					{title:"Adresse_id", field:"adresse_id", visible:false},
+					{title:"Person_id", field:"person_id", visible:false},
+					{title:"Name", field:"name", visible:false},
+					{title:"letzte Änderung", field:"updateamum", visible:false},
+					{title:"Rechnungsadresse", field:"rechnungsadresse", visible:false,
+						formatter: (cell, formatterParams, onRendered) => {
+							let output = cell.getValue() ? "ja" : "nein";
+							return output;}
+					},
+					{title:"Anmerkung", field:"anmerkung", visible:false},
+					{formatter:editIcon, width:40, align:"center", cellClick:function(e, cell){alert("Edit data for adresse_id: " + cell.getRow().getIndex())}},
+					{formatter:deleteIcon, width:40, align:"center", cellClick:function(e, cell){alert("Delete data for adresse_id " + cell.getRow().getIndex())}},
+				],
+				layout: 'fitDataFill',
+				layoutColumnsOnNewData:	false,
+				height:	'auto',
+				selectable:	true,
+				index: 'adresse_id',
+			},
+			tabulatorEvents: [
+
+			],
+			lastSelected: null,
+			modalRefVis: false,
+			addressData: [],
+			formData: {}
+		}
+	},
+	methods:{
+		actionNewAdress(){
+
+			console.log("Neue Adresse anlegen");
+			bootstrap.Modal.getOrCreateInstance(this.$refs.newAdressModal).show();
+		},
+		deleteAdressData(){
+			formData: {}
+		},
+		hideModal(){
+			this.modalRefVis = false;
+		},
+		addNewAddress(formData) {
+			CoreRESTClient.post('components/stv/Student/addNewAddress/' + this.uid,
+					this.formData
+				).then(response => {
+					console.log(response);
+				if (!response.data.error) {
+					this.statusCode = response.data.retval[0];
+					this.statusMsg = response.data.retval[0].typ;
+					console.log('Speichern erfolgreich: ' + this.statusMsg);
+					this.$fhcAlert.alertSuccess('Speichern erfolgreich');
+				} else {
+					this.statusCode = 0;
+					this.statusMsg = 'Error';
+					console.log('Speichern nicht erfolgreich: ' + this.statusMsg);
+/*					this.$fhcAlert.alertDanger('Speichern nicht erfolgreich');*/
+				}
+			}).catch(error => {
+				console.log(error);
+				this.statusCode = 0;
+				this.statusMsg = 'Error2';
+				console.log('Speichern nicht erfolgreich ' + this.statusMsg);
+			}).finally(() => {
+				window.scrollTo(0, 0);
+			});
+			this.deleteAdressData();
+		},
+
+
+		/*		showModalRef(){
+
+					modalRef = true;
+				}*/
+		/*		updateUrl(url, first) {
+					this.lastSelected = first ? undefined : this.selected;
+					if (url)
+						url = CoreRESTClient._generateRouterURI(url);
+					if (!this.$refs.table.tableBuilt)
+						this.$refs.table.tabulator.on("tableBuilt", () => {
+							this.$refs.table.tabulator.setData(url);
+						});
+					else
+						this.$refs.table.tabulator.setData(url);
+				}*/
+	},
+	template: `	
+			
+		<div class="stv-list h-100 pt-3">
+		
+		     <div class="toast-container position-absolute top-0 end-0 pt-4 pe-2">
+                <Toast ref="toastRef">
+                    <template #body><h4>Adresse gespeichert.</h4></template>
+                </Toast>
+            </div>
+			
+<!--		<Modal>    -->
+		
+		<div ref="newAdressModal" class="modal fade" id="exampleModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
+		  <div class="modal-dialog">
+			<div class="modal-content">
+			  <div class="modal-header">
+				<h5 class="modal-title" id="exampleModalLabel">Details Adresse</h5>
+				<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+			  </div>
+			  <div class="modal-body">
+					<form  ref="formData">
+											
+						<div>
+						<label for="typ" class="required form-label">Typ</label>
+							<select id="typ" v-model="formData['typ']">
+							  <option value="h">Hauptwohnsitz</option>
+							  <option value="n">Nebenwohnsitz</option>
+							  <option value="r">Rechnungsadresse</option>
+							  <option value="f">Firma</option>
+							</select>									
+						</div>
+																	   
+						<div class="col-sm-3">
+							<label for="strasse" class="form-label">Strasse</label>
+							<input type="text" :readonly="readonly" class="form-control-sm" id="strasse" v-model="formData['strasse']" maxlength="256">
+						</div>
+						<div class="col-sm-3">
+							<label for="nation" class="form-label">Nation</label>
+							<input type="nation" v-model="formData['nation']">
+						</div>
+						
+						 <div class="col-sm-3">
+							<label for="plz" class="required form-label" >PLZ</label>
+							<input type="text" required v-model="formData['plz']" >
+						</div>
+						
+						<div class="col-sm-3">
+							<label for="gemeinde" class="form-label">Gemeinde</label>
+							<input class="form-control-sm" id="gemeinde"  v-model="formData['gemeinde']"maxlength="256">
+						</div>
+						
+						<div class="col-sm-3">
+							<label for="ort" class="required form-label">Ortschaft</label>  
+							<input type="text" required v-model="formData['ort']"> 
+						</div>
+						
+						<div class="col-sm-1">                                             
+							<label for="heimatadresse" class="form-label">Heimatadr.</label>
+							<div>
+								<input class="form-check-input" type="checkbox" id="heimatadresse" v-model="formData['heimatadresse']">
+							</div>
+						</div>
+						<div class="col-sm-1">
+							<label for="zustelladresse" class="form-label">Zustelladr.</label>
+							<div>
+								<input class="form-check-input" type="checkbox" id="zustelladresse" v-model="formData['zustelladresse']">
+							</div>                        
+						</div>
+
+						<div class="col-sm-6">
+							<label for="co_name" class="form-label">Abweich.Empfänger. (c/o)</label>
+							<input type="text" v-model="formData['co_name']">
+						</div>
+									   
+				</form>  
+				
+				
+			  </div>
+			  <div class="modal-footer">
+				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
+				<button type="button" class="btn btn-primary" @click="addNewAddress()">OK</button>
+			  </div>
+			</div>
+		  </div>
+		</div>
+				
+			<core-filter-cmpt
+				ref="table"
+				:tabulator-options="tabulatorOptions"
+				:tabulator-events="tabulatorEvents"
+				table-only
+				:side-menu="false"
+				reload
+				new-btn-show
+				new-btn-label="Neu"
+				@click:new="actionNewAdress"
+				
+			>
+				<button v-if="reload" class="btn btn-outline-warning" aria-label="Reload" @click="editTable">
+					<span class="fa-solid fa-rotate-right" aria-hidden="true"></span>
+				</button>
+		</core-filter-cmpt>
+		</div>`
+};
+
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
new file mode 100644
index 000000000..6a9ca06c6
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
@@ -0,0 +1,99 @@
+import {CoreFilterCmpt} from "../../../../filter/Filter.js";
+import {CoreRESTClient} from "../../../../../RESTClient";
+
+export default{
+	components: {
+		CoreFilterCmpt
+	},
+	props: {
+		uid: String
+	},
+	emits: [
+		'update:selected'
+	],
+	data() {
+		return{
+			tabulatorOptions: {
+				ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Student/getBankverbindung/' + this.uid),
+				columns:[
+					{title:"Name", field:"name"},
+					{title:"Anschrift", field:"anschrift", visible:false},
+					{title:"BIC", field:"bic"},
+					{title:"BLZ", field:"blz", visible:false},
+					{title:"IBAN", field:"iban"},
+					{title:"Kontonummer", field:"kontonr", visible:false},
+					{title:"Typ", field:"typ", visible:false,
+						formatter: (cell, formatterParams, onRendered) => {
+							let output;
+							switch(cell.getValue()){
+								case "p":
+									output = "Privatkonto";
+									break;
+								case "f":
+									output = "Firmenkonto";
+									break;
+								default:
+									output = cell.getValue();
+							}
+							return output;}
+					},
+					{title:"Verrechnung", field:"verrechnung", visible:false,
+						formatter: (cell, formatterParams, onRendered) => {
+							let output = cell.getValue() ? "ja" : "nein";
+							return output;}
+					},
+					{title:"Person_id", field:"person_id", visible:false},
+					{title:"Bankverbindung_id", field:"bankverbindung_id", visible:false},
+				],
+				layout: 'fitDataFill',
+				layoutColumnsOnNewData:	false,
+				height:	'auto',
+				selectable:	true,
+				index: 'bankverbindung_id',
+			},
+			tabulatorEvents: [
+				/*				{
+									event: 'rowSelectionChanged',
+									handler: this.rowSelectionChanged
+								},
+								{
+									event: 'dataProcessed',
+									handler: this.autoSelectRows
+								}*/
+			],
+			lastSelected: null
+		}
+	},
+	methods:{
+		actionNewAdress(){
+			console.log("Neuen Kontakt anlegen");
+		},
+		updateUrl(url, first) {
+			this.lastSelected = first ? undefined : this.selected;
+			if (url)
+				url = CoreRESTClient._generateRouterURI(url);
+			if (!this.$refs.table.tableBuilt)
+				this.$refs.table.tabulator.on("tableBuilt", () => {
+					this.$refs.table.tabulator.setData(url);
+				});
+			else
+				this.$refs.table.tabulator.setData(url);
+		}
+	},
+	template: `	
+		<div class="stv-list h-100 pt-3">
+			<core-filter-cmpt
+				ref="table"
+				:tabulator-options="tabulatorOptions"
+				:tabulator-events="tabulatorEvents"
+				table-only
+				:side-menu="false"
+				reload
+				new-btn-show
+				new-btn-label="Neu"
+				@click:new="actionNewContact"
+			>
+		</core-filter-cmpt>
+		</div>`
+};
+
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
new file mode 100644
index 000000000..203029fb2
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
@@ -0,0 +1,93 @@
+import {CoreFilterCmpt} from "../../../../filter/Filter.js";
+import {CoreRESTClient} from "../../../../../RESTClient";
+
+var editIcon = function(cell, formatterParams){ //plain text value
+	return "<i class='fa fa-edit'></i>";
+};
+var deleteIcon = function(cell, formatterParams){ //plain text value
+	return "<i class='fa fa-remove'></i>";
+};
+
+export default{
+	components: {
+		CoreFilterCmpt
+	},
+	props: {
+		uid: String
+	},
+	emits: [
+		'update:selected'
+	],
+	data() {
+		return{
+			tabulatorOptions: {
+				ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Student/getKontakte/' + this.uid),
+				columns:[
+					{title:"Typ", field:"kontakttyp"}, //TODO(manu) mix ok?
+					{title:"Kontakt", field:"kontakt"},
+					{title:"Zustellung", field:"zustellung",
+						formatter: (cell, formatterParams, onRendered) => {
+							let output = cell.getValue() ? "ja" : "nein";
+							return output;}
+					},
+					{title:"Anmerkung", field:"anmerkung"},
+					//{title:"Firma", field:"adress_id"},
+					{title:"Firma_id", field:"firma_id", visible:false},
+					{title:"Person_id", field:"person_id", visible:false},
+					{title:"Kontakt_id", field:"kontakt_id", visible:false},
+					{title:"letzte Änderung", field:"updateamum", visible:false},
+					{formatter:editIcon, width:40, align:"center", cellClick:function(e, cell){alert("Edit data for kontakt_id: " + cell.getRow().getIndex())}},
+					{formatter:deleteIcon, width:40, align:"center", cellClick:function(e, cell){alert("Delete data for kontakt_id " + cell.getRow().getIndex())}},
+				],
+				layout: 'fitDataFill',
+				layoutColumnsOnNewData:	false,
+				height:	'auto',
+				selectable:	true,
+				index: 'kontakt_id',
+			},
+			tabulatorEvents: [
+				/*				{
+									event: 'rowSelectionChanged',
+									handler: this.rowSelectionChanged
+								},
+								{
+									event: 'dataProcessed',
+									handler: this.autoSelectRows
+								}*/
+			],
+			lastSelected: null
+		}
+	},
+	methods:{
+		actionNewAdress(){
+			console.log("Neuen Kontakt anlegen");
+		},
+		updateUrl(url, first) {
+			this.lastSelected = first ? undefined : this.selected;
+			if (url)
+				url = CoreRESTClient._generateRouterURI(url);
+			if (!this.$refs.table.tableBuilt)
+				this.$refs.table.tabulator.on("tableBuilt", () => {
+					this.$refs.table.tabulator.setData(url);
+				});
+			else
+				this.$refs.table.tabulator.setData(url);
+		}
+	},
+	template: `	
+		<div class="stv-list h-100 pt-3">
+			<core-filter-cmpt
+				ref="table"
+				:tabulator-options="tabulatorOptions"
+				:tabulator-events="tabulatorEvents"
+				table-only
+				:side-menu="false"
+				reload
+				new-btn-show
+				new-btn-label="Neu"
+				@click:new="actionNewContact"
+			>
+		</core-filter-cmpt>
+		</div>`
+};
+

From 81b080ec4119d8c1f2451c1218fa3f458f992334 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 2 Nov 2023 16:41:28 +0100
Subject: [PATCH 0155/1461] Modal Adressen

---
 .../controllers/components/stv/Student.php    | 22 ++++-
 .../Details/Kontakt/Address.js                | 98 ++++++++++++-------
 2 files changed, 80 insertions(+), 40 deletions(-)

diff --git a/application/controllers/components/stv/Student.php b/application/controllers/components/stv/Student.php
index 480e07a2c..33e0bf5bf 100644
--- a/application/controllers/components/stv/Student.php
+++ b/application/controllers/components/stv/Student.php
@@ -310,19 +310,35 @@ class Student extends FHC_Controller
 				'zustelladresse' => $_POST['zustelladresse'],
 				'co_name' => $_POST['co_name'],
 				'typ' => $_POST['typ']
-
 			]
 		);
 
-		if (isError($result)) {
+		if (isError($result))
+		{
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 			return $this->outputJson($result);
 		}
-
 		return $this->outputJsonSuccess(true);
+	}
 
+	public function getAdressentypen()
+	{
+		$this->load->model('person/Adressentyp_model', 'AdressentypModel');
 
+		$result = $this->AdressentypModel->load();
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->outputJson(getError($result));
+		} else {
+			$this->outputJson(getData($result) ?: []);
+		}
+	}
 
+	public function getGmeinden($plz)
+	{
+		//TODO(manu) finish
+		$result = "";
+		return $result;
 	}
 
 	public function getKontakte($person_id)
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
index 477b3baa2..3222326af 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
@@ -65,7 +65,12 @@ export default{
 			lastSelected: null,
 			modalRefVis: false,
 			addressData: [],
-			formData: {}
+			formData: {
+				zustelladresse: false,
+				heimatadresse: false
+			},
+			nations: [],
+			adressentypen: []
 		}
 	},
 	methods:{
@@ -75,10 +80,10 @@ export default{
 			bootstrap.Modal.getOrCreateInstance(this.$refs.newAdressModal).show();
 		},
 		deleteAdressData(){
-			formData: {}
+			return this.formData = null;
 		},
 		hideModal(){
-			this.modalRefVis = false;
+			bootstrap.Modal.getOrCreateInstance(this.$refs.newAdressModal).hide();
 		},
 		addNewAddress(formData) {
 			CoreRESTClient.post('components/stv/Student/addNewAddress/' + this.uid,
@@ -86,25 +91,26 @@ export default{
 				).then(response => {
 					console.log(response);
 				if (!response.data.error) {
-					this.statusCode = response.data.retval[0];
-					this.statusMsg = response.data.retval[0].typ;
+					this.statusCode = 0;
+					this.statusMsg = 'success';
 					console.log('Speichern erfolgreich: ' + this.statusMsg);
 					this.$fhcAlert.alertSuccess('Speichern erfolgreich');
 				} else {
 					this.statusCode = 0;
 					this.statusMsg = 'Error';
 					console.log('Speichern nicht erfolgreich: ' + this.statusMsg);
-/*					this.$fhcAlert.alertDanger('Speichern nicht erfolgreich');*/
+					this.$fhcAlert.alertError('Speichern nicht erfolgreich');
 				}
 			}).catch(error => {
 				console.log(error);
 				this.statusCode = 0;
-				this.statusMsg = 'Error2';
+				this.statusMsg = 'Error in Catch';
 				console.log('Speichern nicht erfolgreich ' + this.statusMsg);
+				this.$fhcAlert.alertError('Fehler bei Speicherroutine aufgetreten');
 			}).finally(() => {
 				window.scrollTo(0, 0);
+				hideModal();
 			});
-			this.deleteAdressData();
 		},
 
 
@@ -124,17 +130,31 @@ export default{
 						this.$refs.table.tabulator.setData(url);
 				}*/
 	},
+	created(){
+		CoreRESTClient
+			.get('components/stv/Student/getNations')
+			.then(result => {
+				this.nations = result.data;
+			})
+			.catch(err => {
+				console.error(err.response.data || err.message);
+			});
+		CoreRESTClient
+			.get('components/stv/Student/getAdressentypen')
+			.then(result => {
+				this.adressentypen = result.data;
+			})
+			.catch(err => {
+				console.error(err.response.data || err.message);
+			});
+	},
 	template: `	
 			
 		<div class="stv-list h-100 pt-3">
-		
-		     <div class="toast-container position-absolute top-0 end-0 pt-4 pe-2">
-                <Toast ref="toastRef">
-                    <template #body><h4>Adresse gespeichert.</h4></template>
-                </Toast>
-            </div>
-			
-<!--		<Modal>    -->
+					
+<!--		<Modal>   
+ TODO(MANU) use BSModal, Validierungen
+ -->
 		
 		<div ref="newAdressModal" class="modal fade" id="exampleModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
 		  <div class="modal-dialog">
@@ -144,25 +164,27 @@ export default{
 				<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
 			  </div>
 			  <div class="modal-body">
-					<form  ref="formData">
-											
-						<div>
-						<label for="typ" class="required form-label">Typ</label>
-							<select id="typ" v-model="formData['typ']">
-							  <option value="h">Hauptwohnsitz</option>
-							  <option value="n">Nebenwohnsitz</option>
-							  <option value="r">Rechnungsadresse</option>
-							  <option value="f">Firma</option>
-							</select>									
+					<form  ref="formData">{{formData}}
+												
+						<div class="col-sm-3">
+							<label for="adressentyp" class="form-label required">Typ</label>
+							<select id="adressentyp" class="form-control" v-model="formData.typ">
+								<option value="">-- keine Auswahl --</option>
+								<option v-for="typ in adressentypen" :key="typ.adressentyp_kurzbz" :value="typ.adressentyp_kurzbz" >{{typ.bezeichnung}}</option>
+							</select>
 						</div>
 																	   
 						<div class="col-sm-3">
 							<label for="strasse" class="form-label">Strasse</label>
 							<input type="text" :readonly="readonly" class="form-control-sm" id="strasse" v-model="formData['strasse']" maxlength="256">
 						</div>
+						
 						<div class="col-sm-3">
 							<label for="nation" class="form-label">Nation</label>
-							<input type="nation" v-model="formData['nation']">
+							<select id="nation" class="form-control" v-model="formData.nation">
+								<option value="">-- keine Auswahl --</option>
+								<option v-for="nation in nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
+							</select>
 						</div>
 						
 						 <div class="col-sm-3">
@@ -179,19 +201,21 @@ export default{
 							<label for="ort" class="required form-label">Ortschaft</label>  
 							<input type="text" required v-model="formData['ort']"> 
 						</div>
-						
-						<div class="col-sm-1">                                             
-							<label for="heimatadresse" class="form-label">Heimatadr.</label>
-							<div>
-								<input class="form-check-input" type="checkbox" id="heimatadresse" v-model="formData['heimatadresse']">
+										
+						<div class="col-sm-3 align-self-center">
+						<label for="heimatadresse" class="form-label">Heimatadresse</label>
+							<div class="form-check">
+								<input id="heimatadresse" type="checkbox" class="form-check-input" value="1" v-model="formData['heimatadresse']">
 							</div>
 						</div>
-						<div class="col-sm-1">
-							<label for="zustelladresse" class="form-label">Zustelladr.</label>
-							<div>
-								<input class="form-check-input" type="checkbox" id="zustelladresse" v-model="formData['zustelladresse']">
-							</div>                        
+						
+						<div class="col-sm-3 align-self-center">
+						<label for="zustelladresse" class="form-label">Zustelladresse</label>
+							<div class="form-check">	
+								<input id="zustelladresse" type="checkbox" class="form-check-input" value="1" v-model="formData['zustelladresse']">
+							</div>
 						</div>
+						
 
 						<div class="col-sm-6">
 							<label for="co_name" class="form-label">Abweich.Empfänger. (c/o)</label>

From 52d406bca748a61dd2947a60a6b4f3670f0c7bf5 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 6 Nov 2023 11:06:10 +0100
Subject: [PATCH 0156/1461] FhcAlert improvements & InteressentIn anlegen part
 1

---
 .../controllers/components/stv/Verband.php    |  23 +-
 public/js/RESTClient.js                       |   6 +-
 public/js/components/Form/Validation.js       |  69 ++++++
 .../js/components/Stv/Studentenverwaltung.js  |   6 +-
 .../Studentenverwaltung/Details/Details.js    |   3 +-
 .../Stv/Studentenverwaltung/List.js           |  12 +-
 .../Stv/Studentenverwaltung/List/New.js       | 209 ++++++++++++++++++
 .../Stv/Studentenverwaltung/Verband.js        |  14 +-
 public/js/plugin/FhcAlert.js                  |  10 +-
 9 files changed, 325 insertions(+), 27 deletions(-)
 create mode 100644 public/js/components/Form/Validation.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/List/New.js

diff --git a/application/controllers/components/stv/Verband.php b/application/controllers/components/stv/Verband.php
index f08419328..18ce5c999 100644
--- a/application/controllers/components/stv/Verband.php
+++ b/application/controllers/components/stv/Verband.php
@@ -68,6 +68,7 @@ class Verband extends FHC_Controller
 		$this->StudiengangModel->addSelect('typ');
 		$this->StudiengangModel->addSelect('kurzbz');
 		$this->StudiengangModel->addSelect('studiengang_kz');
+		$this->StudiengangModel->addSelect('studiengang_kz AS stg_kz');
 		
 		$this->StudiengangModel->addOrder('erhalter_kz');
 		$this->StudiengangModel->addOrder('typ');
@@ -123,6 +124,7 @@ class Verband extends FHC_Controller
 		$this->StudiengangModel->addSelect("CONCAT(UPPER(CONCAT(typ, kurzbz)), '-', semester, (SELECT CASE WHEN bezeichnung IS NULL OR bezeichnung='' THEN ''::TEXT ELSE CONCAT(' (', bezeichnung, ')') END FROM public.tbl_lehrverband WHERE studiengang_kz=v.studiengang_kz AND semester=v.semester ORDER BY verband, gruppe LIMIT 1)) AS name", false);
 
 		$this->StudiengangModel->addSelect('semester');
+		$this->StudiengangModel->addSelect($this->StudiengangModel->escape($studiengang_kz) . ' AS stg_kz', false);
 		
 		$this->StudiengangModel->addOrder('semester');
 
@@ -146,7 +148,7 @@ class Verband extends FHC_Controller
 		array_unshift($list, [
 			'name' => 'PreStudent',
 			'link' => $link . 'prestudent',
-			'children' => $this->getStdSem($link . 'prestudent/')
+			'children' => $this->getStdSem($link . 'prestudent/', $studiengang_kz)
 		]);
 
 		if ($org_form === null) {
@@ -211,6 +213,7 @@ class Verband extends FHC_Controller
 
 		$this->GruppeModel->addSelect('sort');
 		$this->GruppeModel->addSelect('gruppe_kurzbz');
+		$this->GruppeModel->addSelect($this->GruppeModel->escape($studiengang_kz) . ' AS stg_kz', false);
 
 		$this->GruppeModel->addOrder('sort');
 		$this->GruppeModel->addOrder('gruppe_kurzbz');
@@ -243,6 +246,7 @@ class Verband extends FHC_Controller
 		$this->StudiengangModel->addSelect("CASE WHEN MAX(gruppe)='' OR MAX(gruppe)=' ' THEN TRUE ELSE FALSE END AS leaf");
 
 		$this->StudiengangModel->addSelect('verband');
+		$this->StudiengangModel->addSelect($this->StudiengangModel->escape($studiengang_kz) . ' AS stg_kz', false);
 		
 		$this->StudiengangModel->addOrder('verband');
 
@@ -293,6 +297,7 @@ class Verband extends FHC_Controller
 		$this->StudiengangModel->addSelect("TRUE AS leaf", false);
 
 		$this->StudiengangModel->addSelect('gruppe');
+		$this->StudiengangModel->addSelect($this->StudiengangModel->escape($studiengang_kz) . ' AS stg_kz', false);
 		
 		$this->StudiengangModel->addOrder('gruppe');
 
@@ -320,10 +325,11 @@ class Verband extends FHC_Controller
 
 	/**
 	 * @param string		$link
+	 * @param integer		$studiengang_kz
 	 *
 	 * @return array
 	 */
-	protected function getStdSem($link)
+	protected function getStdSem($link, $studiengang_kz)
 	{
 		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
 
@@ -350,29 +356,35 @@ class Verband extends FHC_Controller
 			$result[] = [
 				'name' => $sem->studiensemester_kurzbz,
 				'link' => $semlink,
+				'stg_kz' => $studiengang_kz,
 				'children' => [
 					[
 						'name' => 'Interessenten',
 						'link' => $intlink,
+						'stg_kz' => $studiengang_kz,
 						'children' => [
 							[
 								'name' => 'Bewerbung nicht abgeschickt',
 								'link' => $intlink . '/bewerbungnichtabgeschickt',
+								'stg_kz' => $studiengang_kz,
 								'leaf' => true
 							],
 							[
 								'name' => 'Bewerbung abgeschickt, Status unbestätigt',
 								'link' => $intlink . '/bewerbungabgeschickt',
+								'stg_kz' => $studiengang_kz,
 								'leaf' => true
 							],
 							[
 								'name' => 'ZGV erfüllt',
 								'link' => $intlink . '/zgv',
+								'stg_kz' => $studiengang_kz,
 								'leaf' => true
 							],
 							[
 								'name' => 'Status bestätigt',
 								'link' => $intlink . '/statusbestaetigt',
+								'stg_kz' => $studiengang_kz,
 								'children' => [
 									[
 										'name' => 'Nicht zum Reihungstest angemeldet',
@@ -389,11 +401,13 @@ class Verband extends FHC_Controller
 							[
 								'name' => 'Nicht zum Reihungstest angemeldet',
 								'link' => $intlink . '/reihungstestnichtangemeldet',
+								'stg_kz' => $studiengang_kz,
 								'leaf' => true
 							],
 							[
 								'name' => 'Reihungstest angemeldet',
 								'link' => $intlink . '/reihungstestangemeldet',
+								'stg_kz' => $studiengang_kz,
 								'leaf' => true
 							]
 						]
@@ -401,26 +415,31 @@ class Verband extends FHC_Controller
 					[
 						'name' => 'Bewerber',
 						'link' => $semlink . '/bewerber',
+						'stg_kz' => $studiengang_kz,
 						'leaf' => true
 					],
 					[
 						'name' => 'Aufgenommen',
 						'link' => $semlink . '/aufgenommen',
+						'stg_kz' => $studiengang_kz,
 						'leaf' => true
 					],
 					[
 						'name' => 'Warteliste',
 						'link' => $semlink . '/warteliste',
+						'stg_kz' => $studiengang_kz,
 						'leaf' => true
 					],
 					[
 						'name' => 'Absage',
 						'link' => $semlink . '/absage',
+						'stg_kz' => $studiengang_kz,
 						'leaf' => true
 					],
 					[
 						'name' => 'Incoming',
 						'link' => $semlink . '/incoming',
+						'stg_kz' => $studiengang_kz,
 						'leaf' => true
 					]
 				]
diff --git a/public/js/RESTClient.js b/public/js/RESTClient.js
index 66e046af9..64949eee9 100644
--- a/public/js/RESTClient.js
+++ b/public/js/RESTClient.js
@@ -121,8 +121,8 @@ export const CoreRESTClient = {
 	 */
 	getError: function(response) {
 
-		if (typeof response[CORE_REST_CLIENT_RETVAL] === "object"
-			&& Object.keys(response[CORE_REST_CLIENT_RETVAL]).length > 0
+		if (typeof response === "object"
+			&& Object.keys(response).length > 0
 			&& response.hasOwnProperty(CORE_REST_CLIENT_RETVAL))
 		{
 			return response[CORE_REST_CLIENT_RETVAL];
@@ -136,7 +136,7 @@ export const CoreRESTClient = {
 	 */
 	getErrorCode: function(response) {
 
-		if (typeof response[CORE_REST_CLIENT_RETVAL] === "object" && response.hasOwnProperty(CORE_REST_CLIENT_ERROR))
+		if (typeof response === "object" && response.hasOwnProperty(CORE_REST_CLIENT_ERROR))
 		{
 			return response[CORE_REST_CLIENT_ERROR];
 		}
diff --git a/public/js/components/Form/Validation.js b/public/js/components/Form/Validation.js
new file mode 100644
index 000000000..78408e8e8
--- /dev/null
+++ b/public/js/components/Form/Validation.js
@@ -0,0 +1,69 @@
+export default {
+	props: {
+		name: String
+	},
+	data() {
+		return {
+			isValid: false,
+			isInvalid: false,
+			invalidFeedback: ''
+		};
+	},
+	methods: {
+		reset() {
+			this.isValid = false;
+			this.isInvalid = false;
+			this.invalidFeedback = '';
+		},
+		setValid() {
+			this.isValid = true;
+		},
+		setInvalid(feedback) {
+			this.invalidFeedback = feedback?.detail || '';
+			this.isInvalid = true;
+		}
+	},
+	render() {
+		if (!this.$slots.default)
+			return Vue.h('div', {
+				'data-fhc-form-error': true,
+				class: {
+					'alert': true,
+					'alert-danger': true,
+					'd-none': !this.isInvalid
+				},
+				role: 'alert',
+				onFhcFormReset: this.reset,
+				onFhcFormError: this.setInvalid
+			}, (this.invalidFeedback || []).map((txt, i) => Vue.h('p', {
+				key: i,
+				class: i+1 == (this.invalidFeedback || []).length ? 'mb-0' : ''
+			}, txt)));
+		
+		const res = this.$slots.default();
+		const orig = res.shift();
+		let options = {
+			'data-fhc-form-validate': this.name,
+			onFhcFormReset: this.reset,
+			onFhcFormValidate: this.setValid,
+			onFhcFormInvalidate: this.setInvalid,
+			class: {
+				'form-control': true,
+				'is-valid': this.isValid,
+				'is-invalid': this.isInvalid
+			}
+		};
+		if (orig.type.__name == 'VueDatePicker') {
+			options.class['p-0'] = true;
+			options.inputClassName = 'border-0';
+		}
+		res.unshift(Vue.cloneVNode(orig, options));
+
+		if (this.isInvalid && this.invalidFeedback && this.$slots.default)
+			res.push(Vue.h('div', {
+				class: 'invalid-feedback'
+			}, this.invalidFeedback));
+
+		return res;
+	},
+};
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 0d1556f45..f2fd2ac36 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -80,6 +80,7 @@ export default {
 					}
 				}
 			},
+			studiengangKz: undefined,
 		}
 	},
 	computed: {
@@ -88,7 +89,8 @@ export default {
 		}
 	},
 	methods: {
-		onSelectVerband(link) {
+		onSelectVerband({link, studiengang_kz}) {
+			this.studiengangKz = studiengang_kz;
 			this.$refs.stvList.updateUrl(link);
 		},
 		searchfunction(searchsettings) {
@@ -124,7 +126,7 @@ export default {
 			<main class="col-md-8 ms-sm-auto col-lg-9 col-xl-10">
 				<vertical-split>
 					<template #top>
-						<stv-list ref="stvList" v-model:selected="selected"></stv-list>
+						<stv-list ref="stvList" v-model:selected="selected" :studiengang-kz="studiengangKz"></stv-list>
 					</template>
 					<template #bottom>
 						<stv-details :student="lastSelected"></stv-details>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
index 77c6bf4d2..b8f79465d 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
@@ -187,11 +187,12 @@ export default {
 			});
 		CoreRESTClient
 			.get('components/stv/Student/getGeschlechter')
+			.then(result => CoreRESTClient.getData(result.data))
 			.then(result => {
 				this.geschlechter = result.data;
 			})
 			.catch(err => {
-				console.error(err.response.data || err.message);
+				console.error(CoreRestClient.getError(err.response.data) || err.message);
 			});
 		this.updateStudent(this.student);
 	},
diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index 0b79fee4f..1ecaa78dd 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -1,12 +1,15 @@
 import {CoreFilterCmpt} from "../../filter/Filter.js";
 import {CoreRESTClient} from '../../../RESTClient.js';
+import ListNew from './List/New.js';
 
 export default {
 	components: {
-		CoreFilterCmpt
+		CoreFilterCmpt,
+		ListNew
 	},
 	props: {
-		selected: Array
+		selected: Array,
+		studiengangKz: Number
 	},
 	emits: [
 		'update:selected'
@@ -80,7 +83,7 @@ export default {
 	},
 	methods: {
 		actionNewPrestudent() {
-			console.log('actionNewPrestudent');
+			this.$refs.new.open();
 		},
 		rowSelectionChanged(data) {
 			this.$emit('update:selected', data);
@@ -172,10 +175,11 @@ export default {
 			:side-menu="false"
 			reload
 			new-btn-show
-			new-btn-label="Prestudent"
+			new-btn-label="InteressentIn"
 			@click:new="actionNewPrestudent"
 			tabindex="0"
 		>
 		</core-filter-cmpt>
+		<list-new ref="new" studiengang-kz="studiengangKz"></list-new>
 	</div>`
 };
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/List/New.js b/public/js/components/Stv/Studentenverwaltung/List/New.js
new file mode 100644
index 000000000..c71bce46f
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/List/New.js
@@ -0,0 +1,209 @@
+import {CoreRESTClient} from '../../../../RESTClient.js';
+import BsModal from '../../../Bootstrap/Modal.js';
+import FhcFormValidation from '../../../Form/Validation.js';
+import VueDatePicker1 from '../../../vueDatepicker.js.php';
+
+var _uuid = 0;
+
+export default {
+	components: {
+		BsModal,
+		FhcFormValidation,
+		VueDatePicker1
+	},
+	props: {
+		studiengangKz: Number
+	},
+	data() {
+		return {
+			date: null,
+			geschlechter: []
+		}
+	},
+	methods: {
+		open() {
+			this.$refs.modal.show();
+		},
+		send(e) {
+			this.sendForm(e.target, 'components/stv/student/check')
+				.then(result => {
+					console.log('check: ', result);
+				});
+		},
+		sendForm(form, url) {
+			this.resetFormValidation(form);
+			const data = new FormData(form);
+			return CoreRESTClient
+				.post(url, data)
+				.then(result => result.data)
+				.then(result => {
+					if (CoreRESTClient.isError(result))
+						throw new Error(CoreRESTClient.getError(result));
+					return result;
+				})
+				.catch(this.handleErrors(form));
+		},
+		resetForm() {
+			const form = this.$refs.form;
+			form.reset();
+			this.resetFormValidation(form);
+		},
+		resetFormValidation(form) {
+			const event = new Event('fhc-form-reset');
+			form.querySelectorAll(['[data-fhc-form-validate],[data-fhc-form-error]']).forEach(el => el.dispatchEvent(event));
+			/*const alert = form.querySelector('div.alert.alert-danger[role="alert"]');
+			if (alert) {
+				alert.innerHTML = '';
+				alert.classList.add('d-none');
+			}
+			form.querySelectorAll('.invalid-feedback').forEach(n => n.remove());
+			form.querySelectorAll('.is-invalid').forEach(n => n.classList.remove('is-invalid'));
+			form.querySelectorAll('.is-valid').forEach(n => n.classList.remove('is-valid'));*/
+		},
+		handleErrors(error, form) {
+			if (form === undefined) {
+				if (error && error.nodeType === Node.ELEMENT_NODE)
+					return err => this.handleErrors(err, error);
+			} else {
+				if (error?.response?.status == 400) {
+					let errors = CoreRESTClient.getError(error.response.data);
+					if (typeof errors !== "object")
+						errors = error.response.data;
+
+					// NOTE(chris): reset form validation
+					this.resetFormValidation(form);
+					
+					// NOTE(chris): set form input validation
+					const notFound = Object.entries(errors).filter(([key, detail]) => {
+						const input = form.querySelector('[data-fhc-form-validate="' + key + '"]');
+						if (!input)
+							return true;
+
+						input.dispatchEvent(new CustomEvent('fhc-form-invalidate', {detail}));
+
+						/*const input = form.querySelector('[name="' + key + '"]');
+						if (!input)
+							return true;
+						input.classList.add('is-invalid');
+						const feedback = document.createElement('div');
+						feedback.classList.add('invalid-feedback');
+						feedback.innerHTML = detail;
+						input.after(feedback);*/
+						return false;
+					}).map(arr => arr[1]);
+
+
+					//const alert = form.querySelector('div.alert.alert-danger[role="alert"]');
+					const alert = form.querySelector('[data-fhc-form-error]');
+					if (alert && notFound.length) {
+						alert.dispatchEvent(new CustomEvent('fhc-form-error', {detail: notFound}));
+						/*notFound.forEach(txt => {
+							const p = document.createElement('p');
+							p.innerHTML = txt;
+							alert.append(p);
+						});
+
+						if (notFound.length) {
+							alert.lastChild.classList.add('mb-0');
+							alert.classList.remove('d-none');
+						}*/
+					} else {
+						notFound.forEach(this.$fhcAlert.alertError);
+					}
+					return;
+				}
+			}
+			this.$fhcAlert.handleSystemError(error);
+		},test() {console.log('test')}
+	},
+	created() {
+		this.uuid = _uuid++;
+		CoreRESTClient
+			.get('components/stv/Student/getGeschlechter')
+			.then(result => CoreRESTClient.getData(result.data))
+			.then(result => {
+				this.geschlechter = result.data;
+			})
+			.catch(err => {
+				console.error(CoreRestClient.getError(err.response.data) || err.message);
+			});
+	},
+	template: `
+	<form ref="form" class="stv-list-new" @submit.prevent="send">
+		<bs-modal ref="modal" dialog-class="modal-fullscreen" @hidden-bs-modal="resetForm">
+			<template #title>
+				InteressentIn anlegen
+			</template>
+			<template #default>
+				<fhc-form-validation></fhc-form-validation>
+				<div class="row">
+					<div class="col-sm-4 mb-3">
+						<label :for="'stv-list-new-anrede-' + uuid">Anrede</label>
+						<fhc-form-validation name="anrede">
+							<input :id="'stv-list-new-anrede-' + uuid" type="text" name="anrede" class="form-control">
+						</fhc-form-validation>
+					</div>
+					<div class="col-sm-4 mb-3">
+						<label :for="'stv-list-new-titelpre-' + uuid">Titel (Pre)</label>
+						<fhc-form-validation name="titelpre">
+							<input :id="'stv-list-new-titelpre-' + uuid" type="text" name="titelpre" class="form-control">
+						</fhc-form-validation>
+					</div>
+					<div class="col-sm-4 mb-3">
+						<label :for="'stv-list-new-titelpost-' + uuid">Titel (Post)</label>
+						<fhc-form-validation name="titelpost">
+							<input :id="'stv-list-new-titelpost-' + uuid" type="text" name="titelpost" class="form-control">
+						</fhc-form-validation>
+					</div>
+				</div>
+				<div class="row">
+					<div class="col-sm-4 mb-3">
+						<label :for="'stv-list-new-nachname-' + uuid">Nachname*</label>
+						<fhc-form-validation name="nachname">
+							<input :id="'stv-list-new-nachname-' + uuid" type="text" name="nachname" class="form-control">
+						</fhc-form-validation>
+					</div>
+					<div class="col-sm-4 mb-3">
+						<label :for="'stv-list-new-vorname-' + uuid">Vorname</label>
+						<fhc-form-validation name="vorname">
+							<input :id="'stv-list-new-vorname-' + uuid" type="text" name="vorname" class="form-control">
+						</fhc-form-validation>
+					</div>
+					<div class="col-sm-4 mb-3">
+						<label :for="'stv-list-new-vornamen-' + uuid">Weitere Vornamen</label>
+						<fhc-form-validation name="vornamen">
+							<input :id="'stv-list-new-vornamen-' + uuid" type="text" name="vornamen" class="form-control">
+						</fhc-form-validation>
+					</div>
+				</div>
+				<div class="row">
+					<div class="col-sm-4 mb-3">
+						<label :for="'stv-list-new-wahlname-' + uuid">Wahlname</label>
+						<fhc-form-validation name="wahlname">
+							<input :id="'stv-list-new-wahlname-' + uuid" type="text" name="wahlname" class="form-control">
+						</fhc-form-validation>
+					</div>
+				</div>
+				<div class="row">
+					<div class="col-sm-4 mb-3">
+						<label :for="'stv-list-new-geschlecht-' + uuid">Geschlecht*</label>
+						<fhc-form-validation name="geschlecht">
+							<select :id="'stv-list-new-geschlecht-' + uuid" class="form-control" name="geschlecht">
+								<option v-for="geschlecht in geschlechter" :key="geschlecht.geschlecht" :value="geschlecht.geschlecht">{{geschlecht.bezeichnung}}</option>
+							</select>
+						</fhc-form-validation>
+					</div>
+					<div class="col-sm-4 mb-3">
+						<label :for="'dp-input-stv-list-new-gebdatum-' + uuid">Geburtsdatum</label>
+						<fhc-form-validation name="gebdatum">
+							<vue-date-picker1 :uid="'stv-list-new-gebdatum-' + uuid" name="gebdatum" text-input auto-apply no-today v-model="date" :enable-time-picker="false" format="dd.MM.yyyy"></vue-date-picker1>
+						</fhc-form-validation>
+					</div>
+				</div>
+			</template>
+			<template #footer>
+				<button type="submit" class="btn btn-primary">Vorschläge laden</button>
+			</template>
+		</bs-modal>
+	</form>`
+};
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Verband.js b/public/js/components/Stv/Studentenverwaltung/Verband.js
index fea977e59..92d343f08 100644
--- a/public/js/components/Stv/Studentenverwaltung/Verband.js
+++ b/public/js/components/Stv/Studentenverwaltung/Verband.js
@@ -77,15 +77,13 @@ export default {
 
 							this.loading = false;
 						})
-						.catch(error => {
-							console.error(error);
-						});
+						.catch(this.$fhcAlert.handleSystemError);
 				}
 			}
 		},
 		onSelectTreeNode(node) {
 			if (node.data.link)
-				this.$emit('selectVerband', 'components/stv/students/' + node.data.link);
+				this.$emit('selectVerband', {link: 'components/stv/students/' + node.data.link, studiengang_kz: node.data.stg_kz});
 		},
 		mapResultToTreeData(el) {
 			const cp = {
@@ -180,9 +178,7 @@ export default {
 				this.nodes = result.map(this.mapResultToTreeData);
 				this.loading = false;
 			})
-			.catch(error => {
-				console.error(error);
-			});
+			.catch(this.$fhcAlert.handleSystemError);
 		CoreRESTClient
 			.get("components/stv/favorites")
 			.then(result => result.data)
@@ -200,9 +196,7 @@ export default {
 						this.favorites = f;
 				}
 			})
-			.catch(error => {
-				console.error(error);
-			});
+			.catch(this.$fhcAlert.handleSystemError);
 	},
 	template: `
 	<div class="overflow-auto" tabindex="-1">
diff --git a/public/js/plugin/FhcAlert.js b/public/js/plugin/FhcAlert.js
index 9eee56502..aa0da4110 100644
--- a/public/js/plugin/FhcAlert.js
+++ b/public/js/plugin/FhcAlert.js
@@ -123,8 +123,8 @@ const helperApp = Vue.createApp({
 
 			return "mailto:" + mailTo + "?subject=" + subject + "&body=" + body;
 		},
-		openMessagecard() {
-			bootstrap.Collapse.getOrCreateInstance(this.$refs.messageCard).toggle();
+		openMessagecard(e) {
+			bootstrap.Collapse.getOrCreateInstance(e.target.getAttribute('href')).toggle();
 		}
 	},
 	unmounted() {
@@ -142,10 +142,10 @@ const helperApp = Vue.createApp({
 					<a
 						class="align-bottom flex-fill me-2"
 						data-bs-toggle="collapse"
-						href="#collapseMessageCard"
+						:href="'#fhcAlertCollapseMessageCard' + slotProps.message.id"
 						role="button"
 						aria-expanded="false"
-						aria-controls="collapseMessageCard"
+						:aria-controls="'fhcAlertCollapseMessageCard' + slotProps.message.id"
 						@click="openMessagecard"
 						>
 						Fehler anzeigen
@@ -158,7 +158,7 @@ const helperApp = Vue.createApp({
 						Fehler melden
 					</a>
 				</div>
-				<div ref="messageCard" id="collapseMessageCard" class="collapse mt-3">
+				<div ref="messageCard" :id="'fhcAlertCollapseMessageCard' + slotProps.message.id" class="collapse mt-3">
 					<div class="card card-body text-body small" style="white-space: pre-wrap">
 						{{slotProps.message.detail}}
 					</div>

From 8e3939a885754a6ebc8758f5ef23ab9ea3ee3e99 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 6 Nov 2023 11:20:00 +0100
Subject: [PATCH 0157/1461] bug: path seperator

---
 cis.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cis.php b/cis.php
index 276af93f1..1ef9895f0 100644
--- a/cis.php
+++ b/cis.php
@@ -313,7 +313,7 @@ $assign_to_config['base_url'] = APP_ROOT;
 include_once 'vendor/autoload.php';
 
 // Autoload custom controllers, models, etc that are present in the application/core directory
-require_once $application_folder . 'config/core_includes.php';
+require_once rtrim($application_folder, '/') . '/config/core_includes.php';
 
 // Now the bootstrap file
 require_once BASEPATH . 'core/CodeIgniter.php';

From 219113bc7320c5c70a58e266977e961ef917b3cb Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 6 Nov 2023 14:25:38 +0100
Subject: [PATCH 0158/1461] InteressentIn anlegen: check + getGeschlechter
 return value

---
 .../controllers/components/stv/Student.php    | 48 +++++++++++++++++--
 1 file changed, 45 insertions(+), 3 deletions(-)

diff --git a/application/controllers/components/stv/Student.php b/application/controllers/components/stv/Student.php
index 0acc37c64..823b22b50 100644
--- a/application/controllers/components/stv/Student.php
+++ b/application/controllers/components/stv/Student.php
@@ -100,9 +100,9 @@ class Student extends FHC_Controller
 		$result = $this->GeschlechtModel->load();
 		if (isError($result)) {
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			$this->outputJson(getError($result));
+			$this->outputJson($result);
 		} else {
-			$this->outputJson(getData($result) ?: []);
+			$this->outputJsonSuccess(getData($result) ?: []);
 		}
 	}
 
@@ -254,6 +254,49 @@ class Student extends FHC_Controller
 		$this->outputJsonSuccess(true);
 	}
 
+	public function check()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('gebdatum', 'Geburtsdatum', 'callback_isValidDate', [
+			'isValidDate' => $this->p->t('ui', 'error_invalid_date')
+		]);
+
+		if ($this->form_validation->run() == false) {
+			$this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST);
+			return $this->outputJsonError($this->form_validation->error_array());
+		}
+
+		$vorname = $this->input->post('vorname');
+		$nachname = $this->input->post('nachname');
+		$gebdatum = $this->input->post('gebdatum');
+
+		if (!$vorname && !$nachname && !$gebdatum) {
+			return $this->outputJsonSuccess([]);
+		}
+
+		$this->load->model('person/Person_model', 'PersonModel');
+
+		if ($gebdatum)
+			$this->PersonModel->db->where('gebdatum', (new DateTime($gebdatum))->format('Y-m-d'));
+		if ($vorname && $nachname) {
+			$this->PersonModel->db->or_group_start();
+			$this->PersonModel->db->where('LOWER(nachname)', 'LOWER(' . $this->PersonModel->db->escape($nachname) . ')', false);
+			$this->PersonModel->db->where('LOWER(vorname)', 'LOWER(' . $this->PersonModel->db->escape($vorname) . ')', false);
+			$this->PersonModel->db->group_end();
+		} elseif ($nachname) {
+			$this->PersonModel->db->or_where('LOWER(nachname)', 'LOWER(' . $this->PersonModel->escape($nachname) . ')', false);
+		}
+
+		$result = $this->PersonModel->load();
+
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+		}
+
+		$this->outputJson($result);
+	}
+
 	public function isValidDate($date)
 	{
 		try {
@@ -263,5 +306,4 @@ class Student extends FHC_Controller
 		}
 		return true;
 	}
-
 }

From c65fc571ac6c5e99cd3fbac55078ba04c0a7d1b3 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 9 Nov 2023 09:25:13 +0100
Subject: [PATCH 0159/1461] fix: copy pasta

---
 .../controllers/components/stv/Student.php    | 117 +-----------------
 1 file changed, 1 insertion(+), 116 deletions(-)

diff --git a/application/controllers/components/stv/Student.php b/application/controllers/components/stv/Student.php
index 63663b230..ce9000da8 100644
--- a/application/controllers/components/stv/Student.php
+++ b/application/controllers/components/stv/Student.php
@@ -305,6 +305,7 @@ class Student extends FHC_Controller
 			return false;
 		}
 		return true;
+	}
 	
 	public function getAdressen($person_id)
 	{
@@ -421,120 +422,4 @@ class Student extends FHC_Controller
 			$this->outputJson(getData($result) ?: []);
 		}
 	}
-	public function getAdressen($person_id)
-	{
-		$this->load->model('person/Adresse_model', 'AdresseModel');
-		$this->load->model('person/Adressentyp_model', 'AdressentypModel');
-		$this->load->model('ressource/firma_model', 'FirmaModel');
-
-		$this->AdresseModel->addSelect('*');
-		$this->AdressentypModel->addJoin('public.tbl_adressentyp t', 'ON (t.adressentyp_kurzbz = public.tbl_adresse.typ)');
-		$this->FirmaModel->addJoin('public.tbl_firma f', 'ON (f.firma_id = public.tbl_adresse.firma_id)', 'LEFT');
-
-		$result = $this->AdresseModel->loadWhere(
-			array('person_id' => $person_id)
-		);
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			$this->outputJson(getError($result));
-		} else {
-			$this->outputJson(getData($result) ?: []);
-		}
-	}
-
-	public function addNewAddress($person_id)
-	{
-		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-
-		//var_dump($_POST);
-		//echo ($_POST['ort']);
-		$this->load->model('person/Adresse_model', 'AdresseModel');
-		// Load Libraries
-		$this->load->library('AuthLib');
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-
-		$result = $this->AdresseModel->insert(
-			[
-				'person_id' => $person_id,
-				'strasse' =>  $_POST['strasse'],
-				'insertvon' => 'FHC4',
-				'insertamum' => date('c'),
-				'plz' => $_POST['plz'],
-				'ort' => $_POST['ort'],
-				'gemeinde' => $_POST['gemeinde'],
-				'nation' => $_POST['nation'],
-				'heimatadresse' => $_POST['heimatadresse'],
-				'zustelladresse' => $_POST['zustelladresse'],
-				'co_name' => $_POST['co_name'],
-				'typ' => $_POST['typ']
-			]
-		);
-
-		if (isError($result))
-		{
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson($result);
-		}
-		return $this->outputJsonSuccess(true);
-	}
-
-	public function getAdressentypen()
-	{
-		$this->load->model('person/Adressentyp_model', 'AdressentypModel');
-
-		$result = $this->AdressentypModel->load();
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			$this->outputJson(getError($result));
-		} else {
-			$this->outputJson(getData($result) ?: []);
-		}
-	}
-
-	public function getGmeinden($plz)
-	{
-		//TODO(manu) finish
-		$result = "";
-		return $result;
-	}
-
-	public function getKontakte($person_id)
-	{
-		$this->load->model('person/Kontakt_model', 'KontaktModel');
-		$this->load->model('organisation/standort_model', 'StandortModel');
-		$this->load->model('ressource/firma_model', 'FirmaModel');
-
-		$this->KontaktModel->addSelect('*');
-		$this->StandortModel->addJoin('public.tbl_standort st', 'ON (public.tbl_kontakt.standort_id = st.standort_id)', 'LEFT');
-		$this->StandortModel->addJoin('public.tbl_firma f', 'ON (f.firma_id = st.firma_id)', 'LEFT');
-
-		$result = $this->KontaktModel->loadWhere(
-			array('person_id' => $person_id)
-		);
-
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			$this->outputJson(getError($result));
-		} else {
-			$this->outputJson(getData($result) ?: []);
-		}
-	}
-
-	public function getBankverbindung($person_id)
-	{
-		$this->load->model('person/Bankverbindung_model', 'BankverbindungModel');
-
-		$this->BankverbindungModel->addSelect('*');
-
-		$result = $this->BankverbindungModel->loadWhere(
-			array('person_id' => $person_id)
-		);
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			$this->outputJson(getError($result));
-		} else {
-			$this->outputJson(getData($result) ?: []);
-		}
-	}
-
 }

From c0fbc74862832557684e98acbc4576554082235b Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 13 Nov 2023 15:04:41 +0100
Subject: [PATCH 0160/1461] Bug: search url not dynamic

---
 public/js/apps/api/search.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/js/apps/api/search.js b/public/js/apps/api/search.js
index 8544d9fe3..529c5dcc7 100644
--- a/public/js/apps/api/search.js
+++ b/public/js/apps/api/search.js
@@ -1,7 +1,8 @@
 export default {
   search: function(searchsettings) {
       const url = FHC_JS_DATA_STORAGE_OBJECT.app_root 
-                + 'index.ci.php/components/SearchBar/search';
+                + FHC_JS_DATA_STORAGE_OBJECT.ci_router
+                + 'components/SearchBar/search';
       return axios.post(url, searchsettings);
   },
   searchdummy: function(searchsettings) {

From 5b385d376e23d2ecd34428544d5de6ddd29d752e Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@simon-gschnell.technikum-wien.at>
Date: Tue, 14 Nov 2023 11:52:45 +0100
Subject: [PATCH 0161/1461] creating the controller/view/api base

---
 application/controllers/Cis/Profil.php    | 67 +++++++++++++++++++++++
 application/views/Cis/Profil.php          | 18 ++++++
 public/js/apps/Cis/ProfilApp.js           | 24 ++++++++
 public/js/apps/api/dummyapi.php           | 13 +++++
 public/js/apps/api/fhcapifactory.js       |  4 +-
 public/js/apps/api/userdata.js            | 13 +++++
 public/js/components/Cis/Profil/Profil.js | 27 +++++++++
 7 files changed, 165 insertions(+), 1 deletion(-)
 create mode 100644 application/controllers/Cis/Profil.php
 create mode 100644 application/views/Cis/Profil.php
 create mode 100644 public/js/apps/Cis/ProfilApp.js
 create mode 100644 public/js/apps/api/dummyapi.php
 create mode 100644 public/js/apps/api/userdata.js
 create mode 100644 public/js/components/Cis/Profil/Profil.js

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
new file mode 100644
index 000000000..f24216bfd
--- /dev/null
+++ b/application/controllers/Cis/Profil.php
@@ -0,0 +1,67 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ *
+ */
+class Profil extends Auth_Controller
+{
+
+	/**
+	 * Constructor
+	 */
+	
+	public function __construct()
+	{
+		parent::__construct([
+			'index' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
+			'getUser' => ['student/anrechnung_beantragen:r','user:r']
+		]);
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * @return void
+	 */
+	public function index()
+	{
+		//echo = getAuthUID();
+		
+		$this->load->view('Cis/Profil', ["uid" => getAuthUID()]);
+	}
+
+	public function getUser()
+	{
+		$myObj = new stdClass();
+		$myObj->name = "John";
+		$myObj->age = 30;
+		$myObj->city = "New York";
+        echo json_encode($myObj);
+	}
+
+	/*
+	public function _remap($param)
+	{
+		/$uid wird als global variable weiter gegeben
+			 /get the data from the database with the uid
+			 /give the data to the view 
+			 /put the queried data in global array and access properties needed in the specific view $profile_information = array()
+			/$this -> load->view('Cis/StudentProfile', ["uid" => $uid])
+			
+			
+			if ($param === 'some_method')
+			{
+					echo "if";
+			}
+			else
+			{
+					echo "else";
+			}
+	}*/
+
+	
+
+}
diff --git a/application/views/Cis/Profil.php b/application/views/Cis/Profil.php
new file mode 100644
index 000000000..c8207f0c5
--- /dev/null
+++ b/application/views/Cis/Profil.php
@@ -0,0 +1,18 @@
+<?php
+$includesArray = array(
+	'title' => 'Stundenplan',
+	'customJSModules' => ['public/js/apps/Cis/ProfilApp.js'],
+	'customCSSs' => ['public/css/components/calendar.css']
+);
+
+$this->load->view('templates/CISHTML-Header', $includesArray);
+?>
+
+<div id="content">
+	<h2>Profil</h2>
+	<hr>
+	<p><?php echo $uid; ?></p>
+	<Profil></Profil>
+</div>
+
+<?php $this->load->view('templates/CISHTML-Footer', $includesArray); ?>
diff --git a/public/js/apps/Cis/ProfilApp.js b/public/js/apps/Cis/ProfilApp.js
new file mode 100644
index 000000000..b6c727e88
--- /dev/null
+++ b/public/js/apps/Cis/ProfilApp.js
@@ -0,0 +1,24 @@
+import Profil from "../../components/Cis/Profil/Profil.js";
+
+import fhcapifactory from "../api/fhcapifactory.js";
+
+Vue.$fhcapi = fhcapifactory;
+
+const app = Vue.createApp({
+	components: {
+		Profil,
+	},
+	data() {
+		return {
+			stunden: [],
+			events: null
+		}
+	},
+	methods: {
+        testsearch: function() {
+			return Vue.$fhcapi.UserData.getUser();
+		}
+	},
+	
+});
+app.mount('#content');
\ No newline at end of file
diff --git a/public/js/apps/api/dummyapi.php b/public/js/apps/api/dummyapi.php
new file mode 100644
index 000000000..515e72bcf
--- /dev/null
+++ b/public/js/apps/api/dummyapi.php
@@ -0,0 +1,13 @@
+<?php
+
+function getUser(){
+    echo "test";
+}
+
+class Dummy extends Auth_Controller
+{
+
+
+}
+
+?>
\ No newline at end of file
diff --git a/public/js/apps/api/fhcapifactory.js b/public/js/apps/api/fhcapifactory.js
index c1f1e0d5c..f75b03482 100644
--- a/public/js/apps/api/fhcapifactory.js
+++ b/public/js/apps/api/fhcapifactory.js
@@ -1,5 +1,7 @@
 import Search from "./search.js";
+import UserData from "./userdata.js";
 
 export default {
-    "Search": Search
+    "Search": Search,
+    "UserData": UserData
 };
diff --git a/public/js/apps/api/userdata.js b/public/js/apps/api/userdata.js
new file mode 100644
index 000000000..d36628561
--- /dev/null
+++ b/public/js/apps/api/userdata.js
@@ -0,0 +1,13 @@
+export default {
+
+    getUser: function() {
+        const url = FHC_JS_DATA_STORAGE_OBJECT.app_root 
+                  + 'Cis/Profil/getUser';
+        return axios.get(url);
+    },
+    getUserDumy: function(){
+        const url = FHC_JS_DATA_STORAGE_OBJECT.app_root 
+                + 'public/js/apps/api/dummyapi.php/getUser';
+        return axios.get(url); 
+    }
+};
\ No newline at end of file
diff --git a/public/js/components/Cis/Profil/Profil.js b/public/js/components/Cis/Profil/Profil.js
new file mode 100644
index 000000000..546767c5c
--- /dev/null
+++ b/public/js/components/Cis/Profil/Profil.js
@@ -0,0 +1,27 @@
+
+
+export default {
+   
+    data: function() {
+        return {
+            person: null,
+        }
+    },
+    methods: {
+        testsearch: function() {
+             
+        }
+      },
+      created(){
+        this.$parent.testsearch().then((res) => {
+            this.person = res.data;
+        }); 
+      },
+     
+    template: `
+            <div>
+            <h1>test</h1>
+            <code>{{JSON.stringify(person)}}</code>
+            </div>
+    `,
+};
\ No newline at end of file

From 9227cc12f04aa1cf112a8d78416ae20a6ca63a6d Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@simon-gschnell.technikum-wien.at>
Date: Tue, 14 Nov 2023 14:36:47 +0100
Subject: [PATCH 0162/1461] retrieving user data from mitarbeiter and benutzer
 models

---
 application/controllers/Cis/Profil.php    | 23 ++++++++++++++++++-----
 public/js/apps/Cis/ProfilApp.js           |  3 +++
 public/js/apps/api/userdata.js            |  5 +++++
 public/js/components/Cis/Profil/Profil.js |  2 ++
 4 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index f24216bfd..9764b0cae 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -18,6 +18,8 @@ class Profil extends Auth_Controller
 			'index' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
 			'getUser' => ['student/anrechnung_beantragen:r','user:r']
 		]);
+		$this->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
+		$this->load->model('person/Benutzer_model', 'BenutzerModel');
 	}
 
 	// -----------------------------------------------------------------------------------------------------------------
@@ -33,15 +35,26 @@ class Profil extends Auth_Controller
 		$this->load->view('Cis/Profil', ["uid" => getAuthUID()]);
 	}
 
+
+	//? public function getUser returns information related to a user
 	public function getUser()
 	{
-		$myObj = new stdClass();
-		$myObj->name = "John";
-		$myObj->age = 30;
-		$myObj->city = "New York";
-        echo json_encode($myObj);
+		//* retrieve info from the Mitarbeiter model
+		$mitarbeiter_result = $this->MitarbeiterModel->load(getAuthUID());
+		//* retrieve info from the Benutzer model
+		$benutzer_result = $this->BenutzerModel->load([getAuthUID()]);
+		//* return JSON with info
+		$res = ['mitarbeiter' => $mitarbeiter_result,
+				'Benutzer' => $benutzer_result];
+		
+        echo json_encode($res);
 	}
 
+	
+
+
+
+	//? this idea was to use _remap, to call different views based on the type of user
 	/*
 	public function _remap($param)
 	{
diff --git a/public/js/apps/Cis/ProfilApp.js b/public/js/apps/Cis/ProfilApp.js
index b6c727e88..31abc2ec9 100644
--- a/public/js/apps/Cis/ProfilApp.js
+++ b/public/js/apps/Cis/ProfilApp.js
@@ -17,6 +17,9 @@ const app = Vue.createApp({
 	methods: {
         testsearch: function() {
 			return Vue.$fhcapi.UserData.getUser();
+		},
+		testsearch2: function() {
+			return Vue.$fhcapi.UserData.getUser2("ma0594");
 		}
 	},
 	
diff --git a/public/js/apps/api/userdata.js b/public/js/apps/api/userdata.js
index d36628561..0b5442add 100644
--- a/public/js/apps/api/userdata.js
+++ b/public/js/apps/api/userdata.js
@@ -5,6 +5,11 @@ export default {
                   + 'Cis/Profil/getUser';
         return axios.get(url);
     },
+    getUser2: function(uid) {
+        const url = FHC_JS_DATA_STORAGE_OBJECT.app_root 
+                  + 'models/person/Benutzer_model/getFromPersonId';
+        return axios.get(url,{params: {uid}});
+    },
     getUserDumy: function(){
         const url = FHC_JS_DATA_STORAGE_OBJECT.app_root 
                 + 'public/js/apps/api/dummyapi.php/getUser';
diff --git a/public/js/components/Cis/Profil/Profil.js b/public/js/components/Cis/Profil/Profil.js
index 546767c5c..1a054fc80 100644
--- a/public/js/components/Cis/Profil/Profil.js
+++ b/public/js/components/Cis/Profil/Profil.js
@@ -16,6 +16,8 @@ export default {
         this.$parent.testsearch().then((res) => {
             this.person = res.data;
         }); 
+        
+       
       },
      
     template: `

From 7c229bbcee8b4506468466ddb81f7bd27f35dbe8 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Wed, 15 Nov 2023 13:49:06 +0100
Subject: [PATCH 0163/1461] importing the api calls in the component and
 creating api endpoints for the cis profile page

---
 application/controllers/Cis/Profil.php        | 42 ++++++++++++++---
 .../models/ressource/Student_model.php        | 41 +++++++++++++++++
 application/views/Cis/Profil.php              |  5 ++-
 public/js/apps/Cis/ProfilApp.js               | 15 ++-----
 public/js/apps/api/userdata.js                | 11 +++++
 public/js/components/Cis/Profil/Profil.js     | 45 ++++++++++++++-----
 6 files changed, 127 insertions(+), 32 deletions(-)
 create mode 100644 application/models/ressource/Student_model.php

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index 9764b0cae..4221e3837 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -16,10 +16,16 @@ class Profil extends Auth_Controller
 	{
 		parent::__construct([
 			'index' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
-			'getUser' => ['student/anrechnung_beantragen:r','user:r']
+			'getUser' => ['student/anrechnung_beantragen:r','user:r'],
+			'isMitarbeiterOrStudent' => ['student/anrechnung_beantragen:r','user:r'],
+			'getPersonInformation' => ['student/anrechnung_beantragen:r','user:r'],
+			
 		]);
 		$this->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
+		$this->load->model('ressource/student_model', 'StudentModel');
 		$this->load->model('person/Benutzer_model', 'BenutzerModel');
+		$this->load->model('person/Person_model', 'PersonModel');
+		
 	}
 
 	// -----------------------------------------------------------------------------------------------------------------
@@ -30,9 +36,11 @@ class Profil extends Auth_Controller
 	 */
 	public function index()
 	{
-		//echo = getAuthUID();
 		
-		$this->load->view('Cis/Profil', ["uid" => getAuthUID()]);
+		//? we can pass data to the view by using the second parameter of the load->view() function 
+		//* the first parameter is the route that Code Igniter will switch to
+		//* the second parameter can be used to pass data to the view  
+		$this->load->view('Cis/Profil', ["uid" => getAuthUID(),"pid" => getAuthPersonId()]);
 	}
 
 
@@ -42,14 +50,36 @@ class Profil extends Auth_Controller
 		//* retrieve info from the Mitarbeiter model
 		$mitarbeiter_result = $this->MitarbeiterModel->load(getAuthUID());
 		//* retrieve info from the Benutzer model
-		$benutzer_result = $this->BenutzerModel->load([getAuthUID()]);
+		$benutzer_result = $this->BenutzerModel->getFromPersonId(getAuthUID());
 		//* return JSON with info
-		$res = ['mitarbeiter' => $mitarbeiter_result,
-				'Benutzer' => $benutzer_result];
+		//! was removed from $res for testing purposes: 'Benutzer' => $benutzer_result
+		$res = ['mitarbeiter' => $mitarbeiter_result,'Benutzer' => $benutzer_result
+				];
 		
         echo json_encode($res);
 	}
 
+	public function getPersonInformation($pid){
+		//? get the person information using the benutzer uid
+		echo json_encode($this->PersonModel->getPersonStammdaten($pid)->retval);
+	}
+
+	//? check wheter the parameter uid is a Mitarbeiter or a Student
+	public function isMitarbeiterOrStudent($uid){
+		if($this->MitarbeiterModel->isMitarbeiter($uid)->retval){
+			echo json_encode("Mitarbeiter");
+		}//! not sure if the user is automatically a student if he is not a mitarbeiter
+		else if($this->StudentModel->isStudent($uid)->retval){
+			echo json_encode("Student");
+		}else{
+			echo json_encode("Not a Mitarbeiter or Student");
+		}
+
+		
+	}
+
+	
+
 	
 
 
diff --git a/application/models/ressource/Student_model.php b/application/models/ressource/Student_model.php
new file mode 100644
index 000000000..937361b56
--- /dev/null
+++ b/application/models/ressource/Student_model.php
@@ -0,0 +1,41 @@
+<?php
+class Student_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_student';
+		$this->pk = 'student_uid';
+	}
+
+    /**
+     * Checks if the user is a Student.
+     * @param string $uid
+     * @return array
+     */
+    public function isStudent($uid)
+    {
+        $this->addSelect('1');
+
+       
+        $result = $this->loadWhere(array('student_uid' => $uid));
+        
+
+        if(hasData($result))
+        {
+            return success(true);
+        }
+        else
+        {
+            return success(false);
+        }
+    }
+    
+   //! THIS FILE WAS CREATED USING THE Mitarbeiter_model.php FILE 
+    
+   
+}
diff --git a/application/views/Cis/Profil.php b/application/views/Cis/Profil.php
index c8207f0c5..e02d895c3 100644
--- a/application/views/Cis/Profil.php
+++ b/application/views/Cis/Profil.php
@@ -9,10 +9,11 @@ $this->load->view('templates/CISHTML-Header', $includesArray);
 ?>
 
 <div id="content">
-	<h2>Profil</h2>
+	<h2>Profil2</h2>
 	<hr>
 	<p><?php echo $uid; ?></p>
-	<Profil></Profil>
+	<!-- we can pass information from the php view file to the public js file through interpolating data from php into vue props -->
+	<Profil uid="<?php echo $uid ?>" pid="<?php echo $pid ?>"></Profil>
 </div>
 
 <?php $this->load->view('templates/CISHTML-Footer', $includesArray); ?>
diff --git a/public/js/apps/Cis/ProfilApp.js b/public/js/apps/Cis/ProfilApp.js
index 31abc2ec9..d83e46846 100644
--- a/public/js/apps/Cis/ProfilApp.js
+++ b/public/js/apps/Cis/ProfilApp.js
@@ -1,8 +1,5 @@
 import Profil from "../../components/Cis/Profil/Profil.js";
 
-import fhcapifactory from "../api/fhcapifactory.js";
-
-Vue.$fhcapi = fhcapifactory;
 
 const app = Vue.createApp({
 	components: {
@@ -10,18 +7,12 @@ const app = Vue.createApp({
 	},
 	data() {
 		return {
-			stunden: [],
-			events: null
+			
 		}
 	},
 	methods: {
-        testsearch: function() {
-			return Vue.$fhcapi.UserData.getUser();
-		},
-		testsearch2: function() {
-			return Vue.$fhcapi.UserData.getUser2("ma0594");
-		}
+        
 	},
 	
 });
-app.mount('#content');
\ No newline at end of file
+app.mount('#content'); 
\ No newline at end of file
diff --git a/public/js/apps/api/userdata.js b/public/js/apps/api/userdata.js
index 0b5442add..ccd408ae5 100644
--- a/public/js/apps/api/userdata.js
+++ b/public/js/apps/api/userdata.js
@@ -5,6 +5,17 @@ export default {
                   + 'Cis/Profil/getUser';
         return axios.get(url);
     },
+    isMitarbeiterOrStudent: function(uid) {
+        const url = FHC_JS_DATA_STORAGE_OBJECT.app_root 
+                  + `Cis/Profil/isMitarbeiterOrStudent/${uid}`;
+        return axios.get(url);
+    },
+    getPersonInformation: function(uid) {
+        const url = FHC_JS_DATA_STORAGE_OBJECT.app_root 
+                  + `Cis/Profil/getPersonInformation/${uid}`;
+        return axios.get(url);
+    },
+    
     getUser2: function(uid) {
         const url = FHC_JS_DATA_STORAGE_OBJECT.app_root 
                   + 'models/person/Benutzer_model/getFromPersonId';
diff --git a/public/js/components/Cis/Profil/Profil.js b/public/js/components/Cis/Profil/Profil.js
index 1a054fc80..f00f6a85e 100644
--- a/public/js/components/Cis/Profil/Profil.js
+++ b/public/js/components/Cis/Profil/Profil.js
@@ -1,29 +1,50 @@
 
-
+import fhcapifactory from "../../../apps/api/fhcapifactory.js";
 export default {
    
     data: function() {
         return {
             person: null,
+            person_info: null,
+            role: null,
         }
     },
+    //? this prop was passed in the Profil.php view file
+    props:['uid','pid'],
     methods: {
-        testsearch: function() {
-             
-        }
-      },
-      created(){
-        this.$parent.testsearch().then((res) => {
-            this.person = res.data;
-        }); 
         
-       
-      },
+    },
+    computed:{
+        cis_profil_info(){
+            return {
+                anrede:this.person_info.anrede,
+                titelpre:this.person_info.titelpre,
+                titelpost:this.person_info.titelpost,
+                vorname:this.person_info.vorname,
+                nachname:this.person_info.nachname,
+                gebdatum:this.person_info.gebdatum,
+                gebort:this.person_info.gebort,
+            };
+        }
+    },
+    created(){
+    fhcapifactory.UserData.getUser().then(res => this.person = res.data);
+    fhcapifactory.UserData.isMitarbeiterOrStudent(this.uid).then(res => this.role = res.data);
+    fhcapifactory.UserData.getPersonInformation(this.pid).then(res => this.person_info = res.data);
+    
+    },
      
     template: `
             <div>
             <h1>test</h1>
-            <code>{{JSON.stringify(person)}}</code>
+            <p>{{"here is the uid "+uid}} </p>
+            <p>{{"here is the pid "+pid}} </p>
+            <code style="color:purple">{{JSON.stringify(cis_profil_info)}}</code>
+            <!--<code style="color:purple">{{JSON.stringify(person_info)}}</code>-->
+            <br/>
+            <code style="color:red">{{JSON.stringify(person)}}</code>
+            <br/>
+            <code>{{JSON.stringify(role)}}</code>
             </div>
     `,
 };
\ No newline at end of file

From dee0bdaa170439fc2a4f698dd6da66cc5a29baba Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Wed, 15 Nov 2023 15:09:59 +0100
Subject: [PATCH 0164/1461] querying new data for the cis profile page

---
 application/controllers/Cis/Profil.php    | 12 +++++++++++-
 public/js/components/Cis/Profil/Profil.js | 23 +++++++++++++++++++----
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index 4221e3837..c4d97b2fd 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -25,6 +25,7 @@ class Profil extends Auth_Controller
 		$this->load->model('ressource/student_model', 'StudentModel');
 		$this->load->model('person/Benutzer_model', 'BenutzerModel');
 		$this->load->model('person/Person_model', 'PersonModel');
+		$this->load->model('person/Adresse_model', 'AdresseModel');
 		
 	}
 
@@ -61,7 +62,16 @@ class Profil extends Auth_Controller
 
 	public function getPersonInformation($pid){
 		//? get the person information using the benutzer uid
-		echo json_encode($this->PersonModel->getPersonStammdaten($pid)->retval);
+		$json_result = $this->PersonModel->getPersonStammdaten($pid)->retval;
+
+
+		//! the following line is not needed because it is already included in the getPersonStammdaten function
+		//$json_result->addresse_info = $this->AdresseModel->getZustellAdresse($pid)->retval;
+		echo json_encode($json_result);
+		return;
+		
+		
+		
 	}
 
 	//? check wheter the parameter uid is a Mitarbeiter or a Student
diff --git a/public/js/components/Cis/Profil/Profil.js b/public/js/components/Cis/Profil/Profil.js
index f00f6a85e..7f953b150 100644
--- a/public/js/components/Cis/Profil/Profil.js
+++ b/public/js/components/Cis/Profil/Profil.js
@@ -24,6 +24,15 @@ export default {
                 nachname:this.person_info.nachname,
                 gebdatum:this.person_info.gebdatum,
                 gebort:this.person_info.gebort,
+                adresse:this.person_info.adressen[0].strasse + " " + this.person_info.adressen[0].plz,
+               
+            };
+        },
+        cis_profil_info_no_foto(){
+            return {
+                ...this.person_info,
+                foto:null, 
+               
             };
         }
     },
@@ -39,12 +48,18 @@ export default {
             <h1>test</h1>
             <p>{{"here is the uid "+uid}} </p>
             <p>{{"here is the pid "+pid}} </p>
-            <code style="color:purple">{{JSON.stringify(cis_profil_info)}}</code>
-            <!--<code style="color:purple">{{JSON.stringify(person_info)}}</code>-->
+            <!--
+            //! printing 2 computed functions
+            //* one to output the collected need information for the cis page
+            //* and the other returns all the information retrieved from the model without the foto data
+            -->
+            <pre style="color:blue">{{JSON.stringify(cis_profil_info,null,2)}}</pre>
+            <pre style="color:purple">{{JSON.stringify(cis_profil_info_no_foto,null,2)}}</pre>
+            
             <br/>
-            <code style="color:red">{{JSON.stringify(person)}}</code>
+            <pre style="color:red">{{JSON.stringify(person)}}</pre>
             <br/>
-            <code>{{JSON.stringify(role)}}</code>
+            <pre>{{JSON.stringify(role)}}</pre>
             </div>
     `,
 };
\ No newline at end of file

From 4502eefaaef9ed8baa9fba2efe62b1ef36ff0256 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 16 Nov 2023 07:46:48 +0100
Subject: [PATCH 0165/1461] neuer Controller Kontakt.php, Abfragen Adressen

---
 .../controllers/components/stv/Kontakt.php    | 600 ++++++++++++++++++
 application/models/person/Adresse_model.php   |  45 ++
 2 files changed, 645 insertions(+)
 create mode 100644 application/controllers/components/stv/Kontakt.php

diff --git a/application/controllers/components/stv/Kontakt.php b/application/controllers/components/stv/Kontakt.php
new file mode 100644
index 000000000..4108a8bf4
--- /dev/null
+++ b/application/controllers/components/stv/Kontakt.php
@@ -0,0 +1,600 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+
+class Kontakt extends FHC_Controller
+{
+	public function __construct()
+	{
+		// TODO(chris): access!
+		parent::__construct();
+
+		// Load Libraries
+		$this->load->library('AuthLib');
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui'
+		]);
+	}
+
+	public function getAdressen($person_id)
+	{
+		$this->load->model('person/Adresse_model', 'AdresseModel');
+		//TODO(manu) check select: für Anzeige alle Tabellen nötig
+		$this->AdresseModel->addSelect('*');
+		$this->AdresseModel->addJoin('public.tbl_adressentyp t', 'ON (t.adressentyp_kurzbz = public.tbl_adresse.typ)');
+		$this->AdresseModel->addJoin('public.tbl_firma f', 'ON (f.firma_id = public.tbl_adresse.firma_id)', 'LEFT');
+
+		//	$this->AdresseModel->addJoin('public.tbl_firmentyp ft', 'ON (f.firma_id = ft.firmentyp.firma_id)', 'LEFT');
+
+		$result = $this->AdresseModel->loadWhere(
+			array('person_id' => $person_id)
+		);
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->outputJson(getError($result));
+		} else {
+			$this->outputJson(getData($result) ?: []);
+		}
+	}
+
+	public function addNewAddress($person_id)
+	{
+		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+
+		$this->load->model('person/Adresse_model', 'AdresseModel');
+
+		// Load Libraries
+		$this->load->library('AuthLib');
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+
+		$firma_id = '';
+		if (isset($_POST['firma_id']))
+			$firma_id = $_POST('firma_id');
+
+		$co_name = '';
+		if (isset($_POST['co_name']))
+			$co_name = $_POST('co_name');
+
+		$result = $this->AdresseModel->insert(
+			[
+				'person_id' => $person_id,
+				'strasse' =>  $_POST['strasse'],
+				'insertvon' => 'uid',
+				'insertamum' => date('c'),
+				'plz' => $_POST['plz'],
+				'ort' => $_POST['ort'],
+				'gemeinde' => $_POST['gemeinde'],
+				'nation' => $_POST['nation'],
+				'heimatadresse' => $_POST['heimatadresse'],
+				'zustelladresse' => $_POST['zustelladresse'],
+				'co_name' => $co_name,
+				'typ' => $_POST['typ'],
+				'firma_id' => $firma_id,
+				'name' => $_POST['name'],
+				'rechnungsadresse' => $_POST['rechnungsadresse'],
+				'anmerkung' => $_POST['anmerkung']
+
+
+			]
+		);
+
+		if (isError($result))
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson($result);
+		}
+		return $this->outputJsonSuccess(true);
+	}
+
+	public function updateAddress($address_id)
+		//Todo(manu) update Firma
+	{
+		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+
+		$this->load->model('person/Adresse_model', 'AdresseModel');
+		// Load Libraries
+		$this->load->library('AuthLib');
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+
+		if(!$address_id)
+		{
+			return $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+		}
+
+		$result = $this->AdresseModel->update([
+			'adresse_id' => $address_id
+		],
+			[	'person_id' => $_POST['person_id'],
+				'strasse' =>  $_POST['strasse'],
+				'updatevon' => 'uid',
+				'updateamum' => date('c'),
+				'plz' => $_POST['plz'],
+				'ort' => $_POST['ort'],
+				'gemeinde' => $_POST['gemeinde'],
+				'nation' => $_POST['nation'],
+				'heimatadresse' => $_POST['heimatadresse'],
+				'zustelladresse' => $_POST['zustelladresse'],
+				'co_name' => $_POST['co_name'],
+				'typ' => $_POST['typ']
+			]);
+
+		if (isError($result))
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson(getError($result));
+		}
+		return $this->outputJsonSuccess(true);
+	}
+
+	public function loadAddress($adresse_id)
+	{
+		$this->load->model('person/Adresse_model', 'AdresseModel');
+
+		$this->AdresseModel->addSelect('*');
+		$this->AdresseModel->addJoin('public.tbl_adressentyp t', 'ON (t.adressentyp_kurzbz = public.tbl_adresse.typ)');
+		$this->AdresseModel->addJoin('public.tbl_firma f', 'ON (f.firma_id = public.tbl_adresse.firma_id)', 'LEFT');
+
+		$this->AdresseModel->addLimit(1);
+
+		$result = $this->AdresseModel->loadWhere(
+			array('adresse_id' => $adresse_id)
+		);
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->outputJson($result);
+		}
+
+		elseif (!hasData($result)) {
+			$this->outputJson($result); //success mit Wert null
+			//	$this->outputJson(getData($result) ?: []);
+		}
+		else
+		{
+			$this->outputJsonSuccess(current(getData($result)));
+		}
+	}
+
+	public function deleteAddress($adresse_id)
+	{
+		$this->load->model('person/Adresse_model', 'AdresseModel');
+
+		$result = $this->AdresseModel->delete(
+			array('adresse_id' => $adresse_id)
+		);
+
+		if (isError($result))
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->outputJson($result);
+		}
+		elseif (!hasData($result)) {
+			$this->outputJson($result); //success mit Wert null
+		}
+		return $this->outputJsonSuccess(current(getData($result)));
+	}
+
+	public function getAdressentypen()
+	{
+		$this->load->model('person/Adressentyp_model', 'AdressentypModel');
+
+		$result = $this->AdressentypModel->load();
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->outputJson(getError($result));
+		} else {
+			$this->outputJson(getData($result) ?: []);
+		}
+	}
+
+	//TODO(Manu) Liste zu lang - besser nachladen
+	public function getFirmen($searchString)
+	{
+		$this->load->model('ressource/firma_model', 'FirmaModel');
+
+		$result = $this->FirmaModel->searchFirmen($searchString);
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->outputJson(getError($result));
+		} else {
+			$this->outputJson(getData($result) ?: []);
+		}
+	}
+
+	//TODO(Manu) Autocomplete?
+	public function getStandorte($searchString)
+	{
+		$this->load->model('organisation/Standort_model', 'StandortModel');
+
+		$result = $this->StandortModel->load();
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->outputJson(getError($result));
+		} else {
+			$this->outputJson(getData($result) ?: []);
+		}
+	}
+
+	public function getFirmenliste($searchString)
+	{
+		$this->load->model('ressource/firma_model', 'FirmaModel');
+
+		$result = $this->FirmaModel->load();
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->outputJson(getError($result));
+		} else {
+			$this->outputJson(getData($result) ?: []);
+		}
+	}
+
+	/**
+	 * Get Array of Names of Ortschaften having plz
+	 * @param string $plz Postleitzahl
+	 * @return array $result[]
+	 */
+	public function getOrtschaften($plz, $gemeinde=null)
+	{
+		$this->load->model('person/Adresse_model', 'AdresseModel');
+
+		//$ort = isset($ortschaft) ? $ortschaft : null;
+		if(isset($gemeinde)) {
+			$gemeinde = urldecode($gemeinde);
+		}
+		else
+			$gemeinde = null;
+
+		$result = $this->AdresseModel->getOrtschaften($plz, $gemeinde);
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->outputJson($result);
+		}
+		elseif (!hasData($result)) {
+			$this->outputJson($result);
+		}
+		else
+		{
+			$this->outputJsonSuccess(getData($result));
+		}
+	}
+
+	/**
+	 * Get Array of Names of Gemeinden having plz
+	 * @param string $plz Postleitzahl
+	 * @return array $result[]
+	 */
+	function getGemeinden($plz)
+	{
+		$this->load->model('person/Adresse_model', 'AdresseModel');
+
+		$result = $this->AdresseModel->getGemeinden($plz);
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->outputJson($result);
+		}
+		elseif (!hasData($result)) {
+			$this->outputJson($result); //success mit Wert null
+			//	$this->outputJson(getData($result) ?: []);
+		}
+		else
+		{
+			$this->outputJsonSuccess(getData($result));
+		}
+	}
+
+	public function getKontakte($person_id)
+	{
+		$this->load->model('person/Kontakt_model', 'KontaktModel');
+		$this->load->model('organisation/standort_model', 'StandortModel');
+		$this->load->model('ressource/firma_model', 'FirmaModel');
+
+		$this->KontaktModel->addSelect('*');
+		$this->StandortModel->addJoin('public.tbl_standort st', 'ON (public.tbl_kontakt.standort_id = st.standort_id)', 'LEFT');
+		$this->StandortModel->addJoin('public.tbl_firma f', 'ON (f.firma_id = st.firma_id)', 'LEFT');
+
+		$result = $this->KontaktModel->loadWhere(
+			array('person_id' => $person_id)
+		);
+
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->outputJson(getError($result));
+		} else {
+			$this->outputJson(getData($result) ?: []);
+		}
+	}
+
+	public function getKontakttypen()
+	{
+		$this->load->model('person/Kontakttyp_model', 'KontakttypModel');
+
+		$result = $this->KontakttypModel->load();
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->outputJson(getError($result));
+		} else {
+			$this->outputJson(getData($result) ?: []);
+		}
+	}
+
+	public function loadContact($kontact_id)
+	{
+		$this->load->model('person/Kontakt_model', 'KontaktModel');
+
+		$this->KontaktModel->addSelect('*');
+		$this->KontaktModel->addJoin('public.tbl_standort st', 'ON (public.tbl_kontakt.standort_id = st.standort_id)', 'LEFT');
+		$this->KontaktModel->addJoin('public.tbl_firma f', 'ON (f.firma_id = st.firma_id)', 'LEFT');
+
+		$this->KontaktModel->addLimit(1);
+
+		$result = $this->KontaktModel->loadWhere(
+			array('kontakt_id' => $kontact_id)
+		);
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->outputJson($result);
+		}
+
+		elseif (!hasData($result)) {
+			$this->outputJson($result); //success mit Wert null
+			//	$this->outputJson(getData($result) ?: []);
+		}
+		else
+		{
+			$this->outputJsonSuccess(current(getData($result)));
+		}
+	}
+
+	public function addNewContact($person_id)
+	{
+		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+
+		$this->load->model('person/Kontakt_model', 'KontaktModel');
+
+		$firma_id = '';
+		if (isset($_POST['firma_id']))
+			$firma_id = $_POST('firma_id');
+
+		$result = $this->KontaktModel->insert(
+			[
+				'person_id' => $person_id,
+				'kontakttyp' =>  $_POST['kontakttyp'],
+				'anmerkung' => $_POST['anmerkung'],
+				'kontakt' => $_POST['kontakt'],
+				'zustellung' => $_POST['zustellung'],
+				'insertvon' => 'uid',
+				'insertamum' => date('c'),
+				'standort_id' => $_POST['standort_id'],
+				'ext_id' => $_POST['ext_id']
+			]
+		);
+
+		if (isError($result))
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson($result);
+		}
+		return $this->outputJsonSuccess(true);
+	}
+
+	public function updateContact($kontakt_id)
+	{
+		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+
+		$this->load->model('person/Kontakt_model', 'KontaktModel');
+
+		if(!$kontakt_id)
+		{
+			return $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+		}
+
+		$result = $this->KontaktModel->update([
+			'kontakt_id' => $kontakt_id
+		],
+			[
+				'person_id' => $_POST['person_id'],
+				'kontakttyp' =>  $_POST['kontakttyp'],
+				'anmerkung' => $_POST['anmerkung'],
+				'kontakt' => $_POST['kontakt'],
+				'zustellung' => $_POST['zustellung'],
+				'updatevon' => 'uid',
+				'updateamum' => date('c'),
+				'standort_id' => $_POST['standort_id'],
+				'ext_id' => $_POST['ext_id']
+			]);
+
+		if (isError($result))
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson(getError($result));
+		}
+		return $this->outputJsonSuccess(true);
+	}
+
+	public function deleteContact($kontakt_id)
+	{
+		$this->load->model('person/Kontakt_model', 'KontaktModel');
+
+		$result = $this->KontaktModel->delete(
+			array('kontakt_id' => $kontakt_id)
+		);
+
+		if (isError($result))
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->outputJson($result);
+		}
+		elseif (!hasData($result)) {
+			$this->outputJson($result); //success mit Wert null
+		}
+		return $this->outputJsonSuccess(current(getData($result)));
+	}
+
+
+	public function getBankverbindung($person_id)
+	{
+		$this->load->model('person/Bankverbindung_model', 'BankverbindungModel');
+
+		$this->BankverbindungModel->addSelect('*');
+
+		$result = $this->BankverbindungModel->loadWhere(
+			array('person_id' => $person_id)
+		);
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->outputJson(getError($result));
+		} else {
+			$this->outputJson(getData($result) ?: []);
+		}
+	}
+
+	public function addNewBankverbindung($person_id)
+	{
+		$this->load->library('form_validation');
+		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+
+		$this->form_validation->set_rules('iban', 'IBAN', 'required');
+		$this->form_validation->set_rules('typ', 'TYP', 'required');
+
+		if ($this->form_validation->run() == false)
+		{
+			return $this->outputJsonError($this->form_validation->error_array());
+		}
+
+		$this->load->model('person/Bankverbindung_model', 'BankverbindungModel');
+
+		$ext_id = isset($_POST['ext_id']) ? $_POST['ext_id'] : null;
+		$oe_kurzbz = isset($_POST['oe_kurzbz']) ? $_POST['oe_kurzbz'] : null;
+		$orgform_kurzbz = isset($_POST['orgform_kurzbz']) ? $_POST['orgform_kurzbz'] : null;
+		$name = isset($_POST['name']) ? $_POST['name'] : null;
+		$anschrift = isset($_POST['anschrift']) ? $_POST['anschrift'] : null;
+		$bic = isset($_POST['bic']) ? $_POST['bic'] : null;
+		$blz = isset($_POST['blz']) ? $_POST['blz'] : null;
+		$kontonr = isset($_POST['kontonr']) ? $_POST['kontonr'] : null;
+
+		$result = $this->BankverbindungModel->insert(
+			[
+				'person_id' => $person_id,
+				'name' => $name,
+				'anschrift' => $anschrift,
+				'bic' => $bic,
+				'iban' => $_POST['iban'],
+				'blz' => $blz,
+				'kontonr' => $kontonr,
+				'insertvon' => 'uid',
+				'insertamum' => date('c'),
+				'typ' => $_POST['typ'],
+				'verrechnung' => $_POST['verrechnung'],
+				'ext_id' => $ext_id,
+				'oe_kurzbz' => $oe_kurzbz,
+				'orgform_kurzbz' => $orgform_kurzbz
+			]
+		);
+		if (isError($result))
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson($result);
+		}
+		return $this->outputJsonSuccess(true);
+	}
+
+	public function loadBankverbindung($bankverbindung_id)
+	{
+		$this->load->model('person/Bankverbindung_model', 'BankverbindungModel');
+
+		$this->BankverbindungModel->addSelect('*');
+
+		$this->BankverbindungModel->addLimit(1);
+
+		$result = $this->BankverbindungModel->loadWhere(
+			array('bankverbindung_id' => $bankverbindung_id)
+		);
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->outputJson($result);
+		}
+
+		elseif (!hasData($result)) {
+			$this->outputJson($result); //success mit Wert null
+			//	$this->outputJson(getData($result) ?: []);
+		}
+		else
+		{
+			$this->outputJsonSuccess(current(getData($result)));
+		}
+	}
+
+	public function updateBankverbindung($bankverbindung_id)
+	{
+		$this->load->library('form_validation');
+		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+
+		$this->form_validation->set_rules('iban', 'IBAN', 'required');
+		$this->form_validation->set_rules('typ', 'TYP', 'required');
+
+		$this->load->model('person/Bankverbindung_model', 'BankverbindungModel');
+
+		if(!$bankverbindung_id)
+		{
+			return $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+		}
+
+		if ($this->form_validation->run() == false)
+		{
+			return $this->outputJsonError($this->form_validation->error_array());
+		}
+
+		$result = $this->BankverbindungModel->update([
+			'bankverbindung_id' => $bankverbindung_id
+		],
+			[
+				'person_id' => $_POST['person_id'],
+				'name' => $_POST['name'],
+				'anschrift' => $_POST['anschrift'],
+				'bic' => $_POST['bic'],
+				'iban' => $_POST['iban'],
+				'blz' => $_POST['blz'],
+				'kontonr' => $_POST['kontonr'],
+				'updatevon' => 'uid',
+				'updateamum' => date('c'),
+				'typ' => $_POST['typ'],
+				'verrechnung' => $_POST['verrechnung'],
+				'ext_id' => $_POST['ext_id'],
+				'oe_kurzbz' => $_POST['oe_kurzbz'],
+				'orgform_kurzbz' => $_POST['orgform_kurzbz']
+			]);
+
+		if (isError($result))
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson(getError($result));
+		}
+		return $this->outputJsonSuccess(true);
+	}
+
+	public function deleteBankverbindung($bankverbindung_id)
+	{
+		$this->load->model('person/Bankverbindung_model', 'BankverbindungModel');
+
+		$result = $this->BankverbindungModel->delete(
+			array('bankverbindung_id' => $bankverbindung_id)
+		);
+
+		if (isError($result))
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->outputJson($result);
+		}
+		elseif (!hasData($result)) {
+			$this->outputJson($result); //success mit Wert null
+		}
+		return $this->outputJsonSuccess(current(getData($result)));
+	}
+
+
+
+}
diff --git a/application/models/person/Adresse_model.php b/application/models/person/Adresse_model.php
index fb5112a8d..a0140af58 100644
--- a/application/models/person/Adresse_model.php
+++ b/application/models/person/Adresse_model.php
@@ -24,4 +24,49 @@ class Adresse_model extends DB_Model
 		$this->addSelect($select);
 		return $this->loadWhere(array('person_id' => $person_id, 'zustelladresse'=> true));
 	}
+
+	/**
+	 * Get Array of Names of Gemeinden having Postleitzahl
+	 * @param integer $plz Postleitzahl
+	 * @return array $result[]
+	 */
+	public function getGemeinden($plz)
+	{
+		$qry = "
+			SELECT distinct
+				g.name
+			FROM bis.tbl_gemeinde g
+			WHERE g.plz=?
+			ORDER BY g.name
+			";
+
+		return $this->execQuery($qry, array($plz));
+	}
+
+	/**
+	 * Get Array of Names of Ortschaften having Postleitzahl
+	 * @param integer $plz Postleitzahl
+	 * @param String $gemeindename Name Gemeinde
+	 * @return array $result[]
+	 */
+	public function getOrtschaften($plz, $gemeinde=null)
+	{
+		$params = array($plz);
+		$qry = "
+			SELECT distinct
+				g.ortschaftsname
+			FROM bis.tbl_gemeinde g
+			WHERE g.plz=? ";
+
+		if (isset($gemeinde))
+		{
+			$qry .= "AND g.name=?";
+			$params[] = $gemeinde;
+		}
+
+		$qry .=	"ORDER BY g.ortschaftsname";
+
+		return $this->execQuery($qry, $params);
+	}
 }
+

From b684c6a34d4a05863687a5dcc77bac075cf9bd23 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 16 Nov 2023 16:41:22 +0100
Subject: [PATCH 0166/1461] DatePicker & Form with v-model & validation in
 fhcAlert

---
 .../controllers/components/stv/Student.php    |   4 +-
 .../Stv/Studentenverwaltung/List/New.js       | 184 ++++++++----------
 public/js/plugin/FhcAlert.js                  |  67 +++++++
 3 files changed, 152 insertions(+), 103 deletions(-)

diff --git a/application/controllers/components/stv/Student.php b/application/controllers/components/stv/Student.php
index ce9000da8..c59092c7f 100644
--- a/application/controllers/components/stv/Student.php
+++ b/application/controllers/components/stv/Student.php
@@ -256,6 +256,8 @@ class Student extends FHC_Controller
 
 	public function check()
 	{
+		$_POST = json_decode($this->input->raw_input_stream, true);
+		
 		$this->load->library('form_validation');
 
 		$this->form_validation->set_rules('gebdatum', 'Geburtsdatum', 'callback_isValidDate', [
@@ -272,7 +274,7 @@ class Student extends FHC_Controller
 		$gebdatum = $this->input->post('gebdatum');
 
 		if (!$vorname && !$nachname && !$gebdatum) {
-			return $this->outputJsonSuccess([]);
+			return $this->outputJsonError(['#' => 'At least one of vorname, nachname or gebdatum must be set']);
 		}
 
 		$this->load->model('person/Person_model', 'PersonModel');
diff --git a/public/js/components/Stv/Studentenverwaltung/List/New.js b/public/js/components/Stv/Studentenverwaltung/List/New.js
index c71bce46f..1eab67967 100644
--- a/public/js/components/Stv/Studentenverwaltung/List/New.js
+++ b/public/js/components/Stv/Studentenverwaltung/List/New.js
@@ -1,7 +1,7 @@
 import {CoreRESTClient} from '../../../../RESTClient.js';
 import BsModal from '../../../Bootstrap/Modal.js';
 import FhcFormValidation from '../../../Form/Validation.js';
-import VueDatePicker1 from '../../../vueDatepicker.js.php';
+import VueDatePicker from '../../../vueDatepicker.js.php';
 
 var _uuid = 0;
 
@@ -9,128 +9,98 @@ export default {
 	components: {
 		BsModal,
 		FhcFormValidation,
-		VueDatePicker1
+		VueDatePicker
 	},
 	props: {
 		studiengangKz: Number
 	},
 	data() {
 		return {
-			date: null,
-			geschlechter: []
+			geschlechter: [],
+			formData: {},
+			suggestions: {},
+			person: null
+		}
+	},
+	computed: {
+		saveTitle() {
+			if (this.person === null)
+				return 'Bitte auswählen';
+			if (this.person === 0)
+				return 'Neue Person anlegen';
+			return 'zu ' + (this.person.vorname + ' ' + this.person.nachname).trim() + ' hinzufügen';
+		},
+		formDataPerson() {
+			if (this.person)
+				return this.person;
+			return this.formData;
 		}
 	},
 	methods: {
 		open() {
 			this.$refs.modal.show();
 		},
-		send(e) {
-			this.sendForm(e.target, 'components/stv/student/check')
+		reset() {
+			this.formData = {};
+			this.person = null;
+			this.suggestions = [];
+			this.$fhcAlert.resetFormValidation(this.$refs.form)
+		},
+		loadSuggestions() {
+			if (this.person)
+				return;
+			// TODO(chris): load serialized
+			CoreRESTClient
+				.post('components/stv/student/check', {
+					vorname: this.formData.vorname,
+					nachname: this.formData.nachname,
+					gebdatum: this.formData.gebdatum
+				})
+				.then(result => CoreRESTClient.getData(result.data) || [])
 				.then(result => {
-					console.log('check: ', result);
+					this.suggestions = result;
+				})
+				.catch(() => {
+					// NOTE(chris): repeat request
+					window.setTimeout(this.loadSuggestions, 100);
 				});
 		},
-		sendForm(form, url) {
-			this.resetFormValidation(form);
-			const data = new FormData(form);
-			return CoreRESTClient
-				.post(url, data)
+		send(e) {
+			if (e.person === null)
+				this.$fhcAlert.alertError('Select a person first'); // TODO(chris): better error handling!
+
+			this.$fhcAlert.resetFormValidation(form);
+			const data = {...this.formData, ...(this.person || {})};
+			CoreRESTClient
+				.post('components/stv/student/add')
 				.then(result => result.data)
 				.then(result => {
 					if (CoreRESTClient.isError(result))
 						throw new Error(CoreRESTClient.getError(result));
-					return result;
+					return CoreRESTClient.getData(result);
 				})
-				.catch(this.handleErrors(form));
-		},
-		resetForm() {
-			const form = this.$refs.form;
-			form.reset();
-			this.resetFormValidation(form);
-		},
-		resetFormValidation(form) {
-			const event = new Event('fhc-form-reset');
-			form.querySelectorAll(['[data-fhc-form-validate],[data-fhc-form-error]']).forEach(el => el.dispatchEvent(event));
-			/*const alert = form.querySelector('div.alert.alert-danger[role="alert"]');
-			if (alert) {
-				alert.innerHTML = '';
-				alert.classList.add('d-none');
-			}
-			form.querySelectorAll('.invalid-feedback').forEach(n => n.remove());
-			form.querySelectorAll('.is-invalid').forEach(n => n.classList.remove('is-invalid'));
-			form.querySelectorAll('.is-valid').forEach(n => n.classList.remove('is-valid'));*/
-		},
-		handleErrors(error, form) {
-			if (form === undefined) {
-				if (error && error.nodeType === Node.ELEMENT_NODE)
-					return err => this.handleErrors(err, error);
-			} else {
-				if (error?.response?.status == 400) {
-					let errors = CoreRESTClient.getError(error.response.data);
-					if (typeof errors !== "object")
-						errors = error.response.data;
-
-					// NOTE(chris): reset form validation
-					this.resetFormValidation(form);
-					
-					// NOTE(chris): set form input validation
-					const notFound = Object.entries(errors).filter(([key, detail]) => {
-						const input = form.querySelector('[data-fhc-form-validate="' + key + '"]');
-						if (!input)
-							return true;
-
-						input.dispatchEvent(new CustomEvent('fhc-form-invalidate', {detail}));
-
-						/*const input = form.querySelector('[name="' + key + '"]');
-						if (!input)
-							return true;
-						input.classList.add('is-invalid');
-						const feedback = document.createElement('div');
-						feedback.classList.add('invalid-feedback');
-						feedback.innerHTML = detail;
-						input.after(feedback);*/
-						return false;
-					}).map(arr => arr[1]);
-
-
-					//const alert = form.querySelector('div.alert.alert-danger[role="alert"]');
-					const alert = form.querySelector('[data-fhc-form-error]');
-					if (alert && notFound.length) {
-						alert.dispatchEvent(new CustomEvent('fhc-form-error', {detail: notFound}));
-						/*notFound.forEach(txt => {
-							const p = document.createElement('p');
-							p.innerHTML = txt;
-							alert.append(p);
-						});
-
-						if (notFound.length) {
-							alert.lastChild.classList.add('mb-0');
-							alert.classList.remove('d-none');
-						}*/
-					} else {
-						notFound.forEach(this.$fhcAlert.alertError);
-					}
-					return;
-				}
-			}
-			this.$fhcAlert.handleSystemError(error);
-		},test() {console.log('test')}
+				.then(result => {
+					this.$fhcAlert.alertSuccess('Gespeichert');
+					console.log('saved');
+					// TODO(chris): close
+				})
+				.catch(this.$fhcAlert.handleFormValidation);
+		}
 	},
 	created() {
 		this.uuid = _uuid++;
+		// TODO(chris): geschlechter in parent?
 		CoreRESTClient
 			.get('components/stv/Student/getGeschlechter')
 			.then(result => CoreRESTClient.getData(result.data))
 			.then(result => {
-				this.geschlechter = result.data;
+				this.geschlechter = result;
 			})
-			.catch(err => {
-				console.error(CoreRestClient.getError(err.response.data) || err.message);
-			});
+			.catch(this.$fhcAlert.handleSystemError);
 	},
 	template: `
 	<form ref="form" class="stv-list-new" @submit.prevent="send">
-		<bs-modal ref="modal" dialog-class="modal-fullscreen" @hidden-bs-modal="resetForm">
+		<bs-modal ref="modal" dialog-class="modal-fullscreen" @hidden-bs-modal="reset">
 			<template #title>
 				InteressentIn anlegen
 			</template>
@@ -140,19 +110,19 @@ export default {
 					<div class="col-sm-4 mb-3">
 						<label :for="'stv-list-new-anrede-' + uuid">Anrede</label>
 						<fhc-form-validation name="anrede">
-							<input :id="'stv-list-new-anrede-' + uuid" type="text" name="anrede" class="form-control">
+							<input :id="'stv-list-new-anrede-' + uuid" type="text" name="anrede" v-model="formDataPerson['anrede']" class="form-control" :disabled="person">
 						</fhc-form-validation>
 					</div>
 					<div class="col-sm-4 mb-3">
 						<label :for="'stv-list-new-titelpre-' + uuid">Titel (Pre)</label>
 						<fhc-form-validation name="titelpre">
-							<input :id="'stv-list-new-titelpre-' + uuid" type="text" name="titelpre" class="form-control">
+							<input :id="'stv-list-new-titelpre-' + uuid" type="text" name="titelpre" v-model="formDataPerson['titelpre']" class="form-control" :disabled="person">
 						</fhc-form-validation>
 					</div>
 					<div class="col-sm-4 mb-3">
 						<label :for="'stv-list-new-titelpost-' + uuid">Titel (Post)</label>
 						<fhc-form-validation name="titelpost">
-							<input :id="'stv-list-new-titelpost-' + uuid" type="text" name="titelpost" class="form-control">
+							<input :id="'stv-list-new-titelpost-' + uuid" type="text" name="titelpost" v-model="formDataPerson['titelpost']" class="form-control" :disabled="person">
 						</fhc-form-validation>
 					</div>
 				</div>
@@ -160,19 +130,19 @@ export default {
 					<div class="col-sm-4 mb-3">
 						<label :for="'stv-list-new-nachname-' + uuid">Nachname*</label>
 						<fhc-form-validation name="nachname">
-							<input :id="'stv-list-new-nachname-' + uuid" type="text" name="nachname" class="form-control">
+							<input :id="'stv-list-new-nachname-' + uuid" type="text" name="nachname" v-model="formDataPerson['nachname']" class="form-control" :disabled="person" @input="loadSuggestions">
 						</fhc-form-validation>
 					</div>
 					<div class="col-sm-4 mb-3">
 						<label :for="'stv-list-new-vorname-' + uuid">Vorname</label>
 						<fhc-form-validation name="vorname">
-							<input :id="'stv-list-new-vorname-' + uuid" type="text" name="vorname" class="form-control">
+							<input :id="'stv-list-new-vorname-' + uuid" type="text" name="vorname" v-model="formDataPerson['vorname']" class="form-control" :disabled="person" @input="loadSuggestions">
 						</fhc-form-validation>
 					</div>
 					<div class="col-sm-4 mb-3">
 						<label :for="'stv-list-new-vornamen-' + uuid">Weitere Vornamen</label>
 						<fhc-form-validation name="vornamen">
-							<input :id="'stv-list-new-vornamen-' + uuid" type="text" name="vornamen" class="form-control">
+							<input :id="'stv-list-new-vornamen-' + uuid" type="text" name="vornamen" v-model="formDataPerson['vornamen']" class="form-control" :disabled="person">
 						</fhc-form-validation>
 					</div>
 				</div>
@@ -180,7 +150,7 @@ export default {
 					<div class="col-sm-4 mb-3">
 						<label :for="'stv-list-new-wahlname-' + uuid">Wahlname</label>
 						<fhc-form-validation name="wahlname">
-							<input :id="'stv-list-new-wahlname-' + uuid" type="text" name="wahlname" class="form-control">
+							<input :id="'stv-list-new-wahlname-' + uuid" type="text" name="wahlname" v-model="formDataPerson['wahlname']" class="form-control" :disabled="person">
 						</fhc-form-validation>
 					</div>
 				</div>
@@ -188,7 +158,7 @@ export default {
 					<div class="col-sm-4 mb-3">
 						<label :for="'stv-list-new-geschlecht-' + uuid">Geschlecht*</label>
 						<fhc-form-validation name="geschlecht">
-							<select :id="'stv-list-new-geschlecht-' + uuid" class="form-control" name="geschlecht">
+							<select :id="'stv-list-new-geschlecht-' + uuid" class="form-control" :disabled="person" name="geschlecht" v-model="formDataPerson['geschlecht']">
 								<option v-for="geschlecht in geschlechter" :key="geschlecht.geschlecht" :value="geschlecht.geschlecht">{{geschlecht.bezeichnung}}</option>
 							</select>
 						</fhc-form-validation>
@@ -196,13 +166,23 @@ export default {
 					<div class="col-sm-4 mb-3">
 						<label :for="'dp-input-stv-list-new-gebdatum-' + uuid">Geburtsdatum</label>
 						<fhc-form-validation name="gebdatum">
-							<vue-date-picker1 :uid="'stv-list-new-gebdatum-' + uuid" name="gebdatum" text-input auto-apply no-today v-model="date" :enable-time-picker="false" format="dd.MM.yyyy"></vue-date-picker1>
+							<vue-date-picker :uid="'stv-list-new-gebdatum-' + uuid" name="gebdatum" text-input auto-apply no-today v-model="formDataPerson['gebdatum']" :enable-time-picker="false" format="dd.MM.yyyy" @update:model-value="loadSuggestions" :disabled="person"></vue-date-picker>
 						</fhc-form-validation>
 					</div>
 				</div>
 			</template>
 			<template #footer>
-				<button type="submit" class="btn btn-primary">Vorschläge laden</button>
+				<div class="btn-group dropup">
+					<button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" style="border-bottom-right-radius: 0; border-top-right-radius: 0" data-bs-toggle="dropdown" aria-expanded="false">
+						<span class="visually-hidden">Choose Person</span>
+					</button>
+					<ul class="dropdown-menu">
+						<!-- TODO(chris): more details -->
+						<li v-for="suggestion in suggestions" :key="suggestion.person_id"><a class="dropdown-item" :class="{active: person?.person_id == suggestion.person_id}" href="#" @click.prevent="person=suggestion">{{suggestion.vorname + ' ' + suggestion.nachname}}</a></li>
+						<li><a class="dropdown-item" :class="{active: person === 0}" href="#" @click.prevent="person=0">Neue Person anlegen</a></li>
+					</ul>
+					<button type="submit" class="btn btn-primary" :disabled="person === null">{{saveTitle}}</button>
+				</div>
 			</template>
 		</bs-modal>
 	</form>`
diff --git a/public/js/plugin/FhcAlert.js b/public/js/plugin/FhcAlert.js
index aa0da4110..b232c813a 100644
--- a/public/js/plugin/FhcAlert.js
+++ b/public/js/plugin/FhcAlert.js
@@ -300,6 +300,73 @@ export default {
 
 				// Fallback
 				fhcerror.alertSystemError('alertSystemError throws Generic Error\r\nError Controller Path: ' + FHC_JS_DATA_STORAGE_OBJECT.called_path + '/' +  FHC_JS_DATA_STORAGE_OBJECT.called_method);
+			},
+			resetFormValidation(form) {
+				const event = new Event('fhc-form-reset');
+				form.querySelectorAll(['[data-fhc-form-validate],[data-fhc-form-error]']).forEach(el => el.dispatchEvent(event));
+				/*const alert = form.querySelector('div.alert.alert-danger[role="alert"]');
+				if (alert) {
+					alert.innerHTML = '';
+					alert.classList.add('d-none');
+				}
+				form.querySelectorAll('.invalid-feedback').forEach(n => n.remove());
+				form.querySelectorAll('.is-invalid').forEach(n => n.classList.remove('is-invalid'));
+				form.querySelectorAll('.is-valid').forEach(n => n.classList.remove('is-valid'));*/
+			},
+			handleFormValidation(error, form) {
+				if (form === undefined) {
+					if (error && error.nodeType === Node.ELEMENT_NODE)
+						return err => $fhcAlert.handleFormValidation(err, error);
+				} else {
+					if (error?.response?.status == 400) {
+						let errors = CoreRESTClient.getError(error.response.data);
+						if (typeof errors !== "object")
+							errors = error.response.data;
+
+						// NOTE(chris): reset form validation
+						$fhcAlert.resetFormValidation(form);
+						
+						// NOTE(chris): set form input validation
+						const notFound = Object.entries(errors).filter(([key, detail]) => {
+							const input = form.querySelector('[data-fhc-form-validate="' + key + '"]');
+							if (!input)
+								return true;
+
+							input.dispatchEvent(new CustomEvent('fhc-form-invalidate', {detail}));
+
+							/*const input = form.querySelector('[name="' + key + '"]');
+							if (!input)
+								return true;
+							input.classList.add('is-invalid');
+							const feedback = document.createElement('div');
+							feedback.classList.add('invalid-feedback');
+							feedback.innerHTML = detail;
+							input.after(feedback);*/
+							return false;
+						}).map(arr => arr[1]);
+
+
+						//const alert = form.querySelector('div.alert.alert-danger[role="alert"]');
+						const alert = form.querySelector('[data-fhc-form-error]');
+						if (alert && notFound.length) {
+							alert.dispatchEvent(new CustomEvent('fhc-form-error', {detail: notFound}));
+							/*notFound.forEach(txt => {
+								const p = document.createElement('p');
+								p.innerHTML = txt;
+								alert.append(p);
+							});
+
+							if (notFound.length) {
+								alert.lastChild.classList.add('mb-0');
+								alert.classList.remove('d-none');
+							}*/
+						} else {
+							notFound.forEach($fhcAlert.alertError);
+						}
+						return;
+					}
+				}
+				$fhcAlert.handleSystemError(error);
 			}
 		};
 		app.config.globalProperties.$fhcAlert = $fhcAlert;

From 4158a66da464859abe420b40fd250b85b5fb922f Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 17 Nov 2023 11:54:36 +0100
Subject: [PATCH 0167/1461] accessibility directive first draft

---
 .../Stv/Studentenverwaltung/List/New.js       |  4 +
 public/js/directives/accessibility.js         | 83 +++++++++++++++++++
 2 files changed, 87 insertions(+)
 create mode 100644 public/js/directives/accessibility.js

diff --git a/public/js/components/Stv/Studentenverwaltung/List/New.js b/public/js/components/Stv/Studentenverwaltung/List/New.js
index 1eab67967..e72d5fda9 100644
--- a/public/js/components/Stv/Studentenverwaltung/List/New.js
+++ b/public/js/components/Stv/Studentenverwaltung/List/New.js
@@ -2,6 +2,7 @@ import {CoreRESTClient} from '../../../../RESTClient.js';
 import BsModal from '../../../Bootstrap/Modal.js';
 import FhcFormValidation from '../../../Form/Validation.js';
 import VueDatePicker from '../../../vueDatepicker.js.php';
+import accessibility from '../../../../directives/accessibility.js';
 
 var _uuid = 0;
 
@@ -11,6 +12,9 @@ export default {
 		FhcFormValidation,
 		VueDatePicker
 	},
+	directives: {
+		accessibility
+	},
 	props: {
 		studiengangKz: Number
 	},
diff --git a/public/js/directives/accessibility.js b/public/js/directives/accessibility.js
new file mode 100644
index 000000000..b65d15309
--- /dev/null
+++ b/public/js/directives/accessibility.js
@@ -0,0 +1,83 @@
+export default {
+	created(el, binding) {
+		switch (binding.arg) {
+			case 'tab':
+				const [prev, next] = binding.modifiers.vertical ? ['ArrowUp', 'ArrowDown'] : ['ArrowRight', 'ArrowLeft'];
+				el.addEventListener('focus', () => {
+					el.setAttribute('aria-selected', true);
+				});
+				el.addEventListener('blur', () => {
+					el.setAttribute('aria-selected', false);
+				});
+				el.addEventListener('keydown', e => {
+					switch (e.code) {
+						case prev:
+							if (el.previousSibling?.setAttribute) {
+								el.previousSibling.setAttribute('tabindex', 0);
+								el.setAttribute('tabindex', -1);
+								el.previousSibling.focus();
+							}
+							break;
+						case next:
+							if (el.nextSibling?.setAttribute) {
+								el.nextSibling.setAttribute('tabindex', 0);
+								el.setAttribute('tabindex', -1);
+								el.nextSibling.focus();
+							}
+							break;
+						case 'Enter':
+							el.click();
+							break;
+					}
+				});
+				break;
+		}
+	},
+	mounted(el, binding) {
+		switch (binding.arg) {
+			case 'tab':
+				//const [prev, next] = binding.modifiers.vertical ? ['up', 'down'] : ['right', 'left'];
+				let activetab = -1;
+				Array.from(el.parentNode.children).forEach((node, index) => {
+					node.setAttribute('aria-setsize', el.parentNode.children.length);
+					node.setAttribute('aria-posinset', index);
+					if (node.getAttribute('tabindex') == '0')
+						activetab = index;
+				});
+				if (activetab == -1) {
+					el.setAttribute('tabindex', 0);
+				} else if (el.classList.contains('active')) {
+					el.parentNode.children[activetab].setAttribute('tabindex', -1);
+					el.setAttribute('tabindex', 0);
+				} else {
+					el.setAttribute('tabindex', -1);
+				}
+				break;
+		}
+	},
+	beforeUnmount(el, binding) {
+		switch (binding.arg) {
+			case 'tab':
+				if (el.getAttribute('tabindex') == '0') {
+					if (el.previousSibling?.setAttribute)
+						el.previousSibling.setAttribute('tabindex', 0);
+					else if (el.nextSibling?.setAttribute)
+						el.nextSibling.setAttribute('tabindex', 0);
+				}
+				const pos = parseInt(el.getAttribute('aria-posinset'));
+				Array.from(el.parentNode.children).forEach((node, index) => {
+					node.setAttribute('aria-setsize', el.parentNode.children.length-1);
+					if (index > pos)
+						node.setAttribute('aria-posinset', index-1);
+				});
+			break;
+		}
+	},
+	unmounted(el, binding) {
+		switch (binding.arg) {
+			case 'tab':
+				console.log(el.parentNode);
+			break;
+		}
+	}
+}
\ No newline at end of file

From 364217c36d0d6db51a624f2e0df8d8e51697d9ac Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 17 Nov 2023 12:31:10 +0100
Subject: [PATCH 0168/1461] Accessibility for Details Tabs

---
 .../Stv/Studentenverwaltung/Details.js        | 23 +++++++++++++++----
 public/js/directives/accessibility.js         |  9 ++++++--
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details.js b/public/js/components/Stv/Studentenverwaltung/Details.js
index 2c4c4c837..f444c0eec 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details.js
@@ -1,4 +1,9 @@
+import accessibility from "../../../directives/accessibility.js";
+
 export default {
+	directives: {
+		accessibility
+	},
 	props: {
 		student: Object
 	},
@@ -33,11 +38,19 @@ export default {
 	<div class="stv-details h-100 pb-3 d-flex flex-column">
 		<div v-if="hasNoStudent" class="justify-content-center d-flex h-100 align-items-center">Bitte StudentIn auswählen!</div>
 		<template v-else>		
-			<ul class="nav nav-tabs">
-				<li v-for="({title}, key) in tabs" class="nav-item" :key="comp">
-					<a class="nav-link" :class="{active: key == current}" :aria-current="key == current ? 'page' : ''" href="#" @click="current=key">{{title}}</a>
-				</li>
-			</ul>
+			<div class="nav nav-tabs">
+				<div
+					v-for="({title}, key) in tabs"
+					:key="comp"
+					class="nav-item nav-link"
+					:class="{active: key == current}"
+					@click="current=key"
+					:aria-current="key == current ? 'page' : ''"
+					v-accessibility:tab
+					>
+					{{title}}
+				</div>
+			</div>
 			<div style="flex: 1 1 0%; height: 0%" class="border-bottom border-start border-end overflow-auto p-3">
 				<keep-alive>
 					<suspense>
diff --git a/public/js/directives/accessibility.js b/public/js/directives/accessibility.js
index b65d15309..e8b11b61d 100644
--- a/public/js/directives/accessibility.js
+++ b/public/js/directives/accessibility.js
@@ -2,7 +2,13 @@ export default {
 	created(el, binding) {
 		switch (binding.arg) {
 			case 'tab':
-				const [prev, next] = binding.modifiers.vertical ? ['ArrowUp', 'ArrowDown'] : ['ArrowRight', 'ArrowLeft'];
+				const [prev, next] = binding.modifiers.vertical ? ['ArrowUp', 'ArrowDown'] : ['ArrowLeft', 'ArrowRight'];
+				el.addEventListener('click', () => {
+					let act = el.parentNode.querySelector('[tabindex="0"]');
+					if (act)
+						act.setAttribute('tabindex', -1);
+					el.setAttribute('tabindex', 0);
+				});
 				el.addEventListener('focus', () => {
 					el.setAttribute('aria-selected', true);
 				});
@@ -36,7 +42,6 @@ export default {
 	mounted(el, binding) {
 		switch (binding.arg) {
 			case 'tab':
-				//const [prev, next] = binding.modifiers.vertical ? ['up', 'down'] : ['right', 'left'];
 				let activetab = -1;
 				Array.from(el.parentNode.children).forEach((node, index) => {
 					node.setAttribute('aria-setsize', el.parentNode.children.length);

From 6b27c00d30aa474b2d1eef3e5e7888ec7c048b44 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Fri, 17 Nov 2023 13:09:32 +0100
Subject: [PATCH 0169/1461] new data collection

---
 application/controllers/Cis/Profil.php    | 117 ++++++++++++++++++----
 public/js/apps/Cis/ProfilApp.js           |   3 +-
 public/js/apps/api/userdata.js            |   4 +-
 public/js/components/Cis/Profil/Profil.js |  43 ++++----
 4 files changed, 119 insertions(+), 48 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index c4d97b2fd..16446f493 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -16,9 +16,8 @@ class Profil extends Auth_Controller
 	{
 		parent::__construct([
 			'index' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
-			'getUser' => ['student/anrechnung_beantragen:r','user:r'],
 			'isMitarbeiterOrStudent' => ['student/anrechnung_beantragen:r','user:r'],
-			'getPersonInformation' => ['student/anrechnung_beantragen:r','user:r'],
+			'getMitarbeiterAnsicht' => ['student/anrechnung_beantragen:r','user:r'],
 			
 		]);
 		$this->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
@@ -26,6 +25,8 @@ class Profil extends Auth_Controller
 		$this->load->model('person/Benutzer_model', 'BenutzerModel');
 		$this->load->model('person/Person_model', 'PersonModel');
 		$this->load->model('person/Adresse_model', 'AdresseModel');
+		$this->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
+		
 		
 	}
 
@@ -45,29 +46,107 @@ class Profil extends Auth_Controller
 	}
 
 
-	//? public function getUser returns information related to a user
-	public function getUser()
-	{
-		//* retrieve info from the Mitarbeiter model
-		$mitarbeiter_result = $this->MitarbeiterModel->load(getAuthUID());
-		//* retrieve info from the Benutzer model
-		$benutzer_result = $this->BenutzerModel->getFromPersonId(getAuthUID());
-		//* return JSON with info
-		//! was removed from $res for testing purposes: 'Benutzer' => $benutzer_result
-		$res = ['mitarbeiter' => $mitarbeiter_result,'Benutzer' => $benutzer_result
-				];
+	
+
+	public function getMitarbeiterAnsicht(){
 		
-        echo json_encode($res);
-	}
+		$benutzer_funktion_res = $this->BenutzerfunktionModel->loadWhere();
+		if(isError($benutzer_funktion_res)){
+			// error handling
+		}else{
+			$benutzer_funktion_res = hasData($benutzer_funktion_res)? getData($benutzer_funktion_res) : null;
+		}
 
-	public function getPersonInformation($pid){
+		//! THERE COULD BE MULTIPLE ADRESSES
+		$adresse_res = $this->AdresseModel->load(getAuthPersonId());
+		if(isError($adresse_res)){
+			// error handling
+		}else{										//! not only one
+			$adresse_res = hasData($adresse_res)? getData($adresse_res)[0] : null;
+		}
+
+		$benutzer_res = $this->PersonModel->load(getAuthUID());
+		if(isError($benutzer_res)){
+			// error handling
+		}else{
+			$benutzer_res = hasData($benutzer_res)? getData($benutzer_res)[0] : null;
+		}
+
+		$person_res = $this->PersonModel->load(getAuthPersonId());
+		if(isError($person_res)){
+			// error handling
+		}else{
+			$person_res = hasData($person_res)? getData($person_res)[0] : null;
+		}
+		
 		//? get the person information using the benutzer uid
-		$json_result = $this->PersonModel->getPersonStammdaten($pid)->retval;
-
+		//! verwendet getAuthUID()
+		$mitarbeiter_res = $this->MitarbeiterModel->load(getAuthUID());
+		if(isError($mitarbeiter_res)){
+			// error handling
+		}else{
+			//? checks whether the getData does not return null 
+			//? and then checks that the current does return an empty array 
+			$mitarbeiter_res = hasData($mitarbeiter_res)? getData($mitarbeiter_res)[0] : null;
+		}
+		$res = new stdClass();
+		$res->username = getAuthUID();
+		//? Person Info
+		$res->foto = $person_res->foto;
+		$res->foto_sperre = $person_res->foto_sperre;
+		$res->anrede = $person_res->anrede;
+		$res->titelpre = $person_res->titelpre;
+		$res->titelpost = $person_res->titelpost;
+		$res->vorname = $person_res->vorname;
+		$res->nachname = $person_res->nachname;
+		//$res->postnomen = $person_res->postnomen; //!POSTNOMEN?
+		$res->gebdatum = $person_res->gebdatum;
+		$res->gebort = $person_res->gebort;
+		//? Mitarbeiter Info
+		$res->kurzbz = $mitarbeiter_res->kurzbz;
+		$res->telefonklappe = $mitarbeiter_res->telefonklappe;
+		//? Benutzer Info
+		$res->email_intern = getAuthUID() . "@technikum-wien.at";
+		$res->email_extern = $benutzer_res->alias . "@technikum-wien.at";
+		//? Adresse Info 
+		$res->strasse = $adresse_res->strasse;
+		$res->heimatadresse = $adresse_res->heimatadresse;
+		$res->zustelladresse = $adresse_res->zustelladresse;
+		$res->plz = $adresse_res->plz;
+		$res->ort = $adresse_res->ort;
+		//? Benutzerfunktion Info
+		$res->funktionen = $benutzer_funktion_res;
+		
+		
+		
+		echo json_encode($res);
+		
+		return;
+		/*
+		$res = getData($this->PersonModel->getPersonStammdaten($pid));
+		$json_result = new stdClass();
+		$json_result->anrede = $res->anrede;
+		$json_result->titelpre = $res->titelpre;
+		$json_result->titelpost = $res->titelpost;
+		$json_result->vorname = $res->vorname;
+		$json_result->nachname = $res->nachname;
+		$json_result->gebdatum = $res->gebdatum;
+		$json_result->gebort = $res->gebort;
+		$json_result->adressen = $res->adressen;
+		
+		anrede:this.person_info.anrede,
+                titelpre:this.person_info.titelpre,
+                titelpost:this.person_info.titelpost,
+                vorname:this.person_info.vorname,
+                nachname:this.person_info.nachname,
+                gebdatum:this.person_info.gebdatum,
+                gebort:this.person_info.gebort,
+                adresse:this.person_info.adressen[0].strasse + " " + this.person_info.adressen[0].plz,
+		*/
 
 		//! the following line is not needed because it is already included in the getPersonStammdaten function
 		//$json_result->addresse_info = $this->AdresseModel->getZustellAdresse($pid)->retval;
-		echo json_encode($json_result);
+		echo json_encode($res);
 		return;
 		
 		
diff --git a/public/js/apps/Cis/ProfilApp.js b/public/js/apps/Cis/ProfilApp.js
index d83e46846..7a663f108 100644
--- a/public/js/apps/Cis/ProfilApp.js
+++ b/public/js/apps/Cis/ProfilApp.js
@@ -2,6 +2,7 @@ import Profil from "../../components/Cis/Profil/Profil.js";
 
 
 const app = Vue.createApp({
+	
 	components: {
 		Profil,
 	},
@@ -15,4 +16,4 @@ const app = Vue.createApp({
 	},
 	
 });
-app.mount('#content'); 
\ No newline at end of file
+app.mount("#content");
\ No newline at end of file
diff --git a/public/js/apps/api/userdata.js b/public/js/apps/api/userdata.js
index ccd408ae5..63d605230 100644
--- a/public/js/apps/api/userdata.js
+++ b/public/js/apps/api/userdata.js
@@ -10,9 +10,9 @@ export default {
                   + `Cis/Profil/isMitarbeiterOrStudent/${uid}`;
         return axios.get(url);
     },
-    getPersonInformation: function(uid) {
+    getMitarbeiterAnsicht: function() {
         const url = FHC_JS_DATA_STORAGE_OBJECT.app_root 
-                  + `Cis/Profil/getPersonInformation/${uid}`;
+                  + `Cis/Profil/getMitarbeiterAnsicht`;
         return axios.get(url);
     },
     
diff --git a/public/js/components/Cis/Profil/Profil.js b/public/js/components/Cis/Profil/Profil.js
index 7f953b150..7a73a6f06 100644
--- a/public/js/components/Cis/Profil/Profil.js
+++ b/public/js/components/Cis/Profil/Profil.js
@@ -1,45 +1,34 @@
 
 import fhcapifactory from "../../../apps/api/fhcapifactory.js";
+
+
 export default {
-   
-    data: function() {
+    
+    data() {
         return {
-            person: null,
+           
             person_info: null,
+            //? beinhaltet die Information ob der angefragte user ein Student oder Mitarbeiter ist
             role: null,
         }
     },
-    //? this prop was passed in the Profil.php view file
+    //? this props were passed in the Profil.php view file
     props:['uid','pid'],
     methods: {
         
     },
     computed:{
-        cis_profil_info(){
+        computed_placeholder(){
             return {
-                anrede:this.person_info.anrede,
-                titelpre:this.person_info.titelpre,
-                titelpost:this.person_info.titelpost,
-                vorname:this.person_info.vorname,
-                nachname:this.person_info.nachname,
-                gebdatum:this.person_info.gebdatum,
-                gebort:this.person_info.gebort,
-                adresse:this.person_info.adressen[0].strasse + " " + this.person_info.adressen[0].plz,
-               
+                //
             };
         },
-        cis_profil_info_no_foto(){
-            return {
-                ...this.person_info,
-                foto:null, 
-               
-            };
-        }
+        
     },
     created(){
-    fhcapifactory.UserData.getUser().then(res => this.person = res.data);
+    //error //! fhcapifactory.UserData.getUser().then(res => this.person = res.data);
     fhcapifactory.UserData.isMitarbeiterOrStudent(this.uid).then(res => this.role = res.data);
-    fhcapifactory.UserData.getPersonInformation(this.pid).then(res => this.person_info = res.data);
+    fhcapifactory.UserData.getMitarbeiterAnsicht().then(res => {this.person_info = res.data;});
     
     },
      
@@ -52,14 +41,16 @@ export default {
             //! printing 2 computed functions
             //* one to output the collected need information for the cis page
             //* and the other returns all the information retrieved from the model without the foto data
-            -->
+            
             <pre style="color:blue">{{JSON.stringify(cis_profil_info,null,2)}}</pre>
             <pre style="color:purple">{{JSON.stringify(cis_profil_info_no_foto,null,2)}}</pre>
             
             <br/>
             <pre style="color:red">{{JSON.stringify(person)}}</pre>
-            <br/>
-            <pre>{{JSON.stringify(role)}}</pre>
+            -->
+            
+            
+            <p>test</p>
             </div>
     `,
 };
\ No newline at end of file

From 4fead18c067017a1c6fdaa1e09f8cd1738168407 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Fri, 17 Nov 2023 15:27:41 +0100
Subject: [PATCH 0170/1461] adds the model calls for the benutzerfunktionen
 information for the cis profile

---
 .gitignore                             |  2 +
 application/controllers/Cis/Profil.php | 54 ++++++++------------------
 public/js/apps/api/userdata.js         | 17 ++------
 3 files changed, 22 insertions(+), 51 deletions(-)

diff --git a/.gitignore b/.gitignore
index 96af3e5dc..84957a801 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,8 @@ documents/
 vendor/
 
 /nbproject/
+.vscode
+composer.phar
 /.idea/
 .settings
 .project
diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index 16446f493..8d3c2f692 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -49,12 +49,18 @@ class Profil extends Auth_Controller
 	
 
 	public function getMitarbeiterAnsicht(){
+
 		
-		$benutzer_funktion_res = $this->BenutzerfunktionModel->loadWhere();
-		if(isError($benutzer_funktion_res)){
-			// error handling
-		}else{
-			$benutzer_funktion_res = hasData($benutzer_funktion_res)? getData($benutzer_funktion_res) : null;
+		if(
+		 isSuccess($this->BenutzerfunktionModel->addSelect(["tbl_benutzerfunktion.bezeichnung as bf_bezeichnung","tbl_organisationseinheit.bezeichnung as oe_bezeichnung","datum_von","datum_bis","wochenstunden"]))
+	  	 && isSuccess($this->BenutzerfunktionModel->addJoin("tbl_organisationseinheit","oe_kurzbz"))
+		){
+			$benutzer_funktion_res = $this->BenutzerfunktionModel->loadWhere("uid='" . getAuthUID() . "'");
+			if(isError($benutzer_funktion_res)){
+				// error handling
+			}else{
+				$benutzer_funktion_res = hasData($benutzer_funktion_res)? getData($benutzer_funktion_res) : null;
+			}
 		}
 
 		//! THERE COULD BE MULTIPLE ADRESSES
@@ -65,7 +71,7 @@ class Profil extends Auth_Controller
 			$adresse_res = hasData($adresse_res)? getData($adresse_res)[0] : null;
 		}
 
-		$benutzer_res = $this->PersonModel->load(getAuthUID());
+		$benutzer_res = $this->BenutzerModel->load([getAuthUID()]);
 		if(isError($benutzer_res)){
 			// error handling
 		}else{
@@ -79,16 +85,13 @@ class Profil extends Auth_Controller
 			$person_res = hasData($person_res)? getData($person_res)[0] : null;
 		}
 		
-		//? get the person information using the benutzer uid
-		//! verwendet getAuthUID()
 		$mitarbeiter_res = $this->MitarbeiterModel->load(getAuthUID());
 		if(isError($mitarbeiter_res)){
 			// error handling
 		}else{
-			//? checks whether the getData does not return null 
-			//? and then checks that the current does return an empty array 
 			$mitarbeiter_res = hasData($mitarbeiter_res)? getData($mitarbeiter_res)[0] : null;
 		}
+
 		$res = new stdClass();
 		$res->username = getAuthUID();
 		//? Person Info
@@ -106,8 +109,8 @@ class Profil extends Auth_Controller
 		$res->kurzbz = $mitarbeiter_res->kurzbz;
 		$res->telefonklappe = $mitarbeiter_res->telefonklappe;
 		//? Benutzer Info
-		$res->email_intern = getAuthUID() . "@technikum-wien.at";
-		$res->email_extern = $benutzer_res->alias . "@technikum-wien.at";
+		$res->email_intern = getAuthUID() . DOMAIN;
+		$res->email_extern = $benutzer_res->alias . DOMAIN;
 		//? Adresse Info 
 		$res->strasse = $adresse_res->strasse;
 		$res->heimatadresse = $adresse_res->heimatadresse;
@@ -119,35 +122,10 @@ class Profil extends Auth_Controller
 		
 		
 		
+		
 		echo json_encode($res);
 		
 		return;
-		/*
-		$res = getData($this->PersonModel->getPersonStammdaten($pid));
-		$json_result = new stdClass();
-		$json_result->anrede = $res->anrede;
-		$json_result->titelpre = $res->titelpre;
-		$json_result->titelpost = $res->titelpost;
-		$json_result->vorname = $res->vorname;
-		$json_result->nachname = $res->nachname;
-		$json_result->gebdatum = $res->gebdatum;
-		$json_result->gebort = $res->gebort;
-		$json_result->adressen = $res->adressen;
-		
-		anrede:this.person_info.anrede,
-                titelpre:this.person_info.titelpre,
-                titelpost:this.person_info.titelpost,
-                vorname:this.person_info.vorname,
-                nachname:this.person_info.nachname,
-                gebdatum:this.person_info.gebdatum,
-                gebort:this.person_info.gebort,
-                adresse:this.person_info.adressen[0].strasse + " " + this.person_info.adressen[0].plz,
-		*/
-
-		//! the following line is not needed because it is already included in the getPersonStammdaten function
-		//$json_result->addresse_info = $this->AdresseModel->getZustellAdresse($pid)->retval;
-		echo json_encode($res);
-		return;
 		
 		
 		
diff --git a/public/js/apps/api/userdata.js b/public/js/apps/api/userdata.js
index 63d605230..2c72e9618 100644
--- a/public/js/apps/api/userdata.js
+++ b/public/js/apps/api/userdata.js
@@ -2,28 +2,19 @@ export default {
 
     getUser: function() {
         const url = FHC_JS_DATA_STORAGE_OBJECT.app_root 
-                  + 'Cis/Profil/getUser';
+                  + 'cis.php/Cis/Profil/getUser';
         return axios.get(url);
     },
     isMitarbeiterOrStudent: function(uid) {
         const url = FHC_JS_DATA_STORAGE_OBJECT.app_root 
-                  + `Cis/Profil/isMitarbeiterOrStudent/${uid}`;
+                  + `cis.php/Cis/Profil/isMitarbeiterOrStudent/${uid}`;
         return axios.get(url);
     },
     getMitarbeiterAnsicht: function() {
         const url = FHC_JS_DATA_STORAGE_OBJECT.app_root 
-                  + `Cis/Profil/getMitarbeiterAnsicht`;
+                  + `cis.php/Cis/Profil/getMitarbeiterAnsicht`;
         return axios.get(url);
     },
     
-    getUser2: function(uid) {
-        const url = FHC_JS_DATA_STORAGE_OBJECT.app_root 
-                  + 'models/person/Benutzer_model/getFromPersonId';
-        return axios.get(url,{params: {uid}});
-    },
-    getUserDumy: function(){
-        const url = FHC_JS_DATA_STORAGE_OBJECT.app_root 
-                + 'public/js/apps/api/dummyapi.php/getUser';
-        return axios.get(url); 
-    }
+ 
 };
\ No newline at end of file

From 16b61d05602582ef782836f2f1227acebfb9cdf1 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Mon, 20 Nov 2023 17:30:58 +0100
Subject: [PATCH 0171/1461] Daten fuer die Betriebsmittel und
 zutrittskarten_ausgegebenam gesammelt

---
 application/controllers/Cis/Profil.php        | 29 ++++++++++++-
 application/models/crm/Student_model.php      | 22 ++++++++++
 .../models/ressource/Student_model.php        | 41 -------------------
 application/views/Cis/Profil.php              |  2 +-
 public/js/components/Cis/Profil/Profil.js     |  2 +-
 5 files changed, 51 insertions(+), 45 deletions(-)
 delete mode 100644 application/models/ressource/Student_model.php

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index 8d3c2f692..a45edcab2 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -21,11 +21,13 @@ class Profil extends Auth_Controller
 			
 		]);
 		$this->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
-		$this->load->model('ressource/student_model', 'StudentModel');
+		$this->load->model('crm/Student_model', 'StudentModel');
 		$this->load->model('person/Benutzer_model', 'BenutzerModel');
 		$this->load->model('person/Person_model', 'PersonModel');
 		$this->load->model('person/Adresse_model', 'AdresseModel');
 		$this->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
+		$this->load->model('ressource/Betriebsmittelperson_model', 'BetriebsmittelpersonModel');
+		$this->load->model('person/Kontakt_model', 'KontaktModel');
 		
 		
 	}
@@ -50,7 +52,27 @@ class Profil extends Auth_Controller
 
 	public function getMitarbeiterAnsicht(){
 
+
 		
+
+		$zutrittskarte_ausgegebenam = $this->BetriebsmittelpersonModel->getBetriebsmittel(getAuthPersonId());
+		if(isError($zutrittskarte_ausgegebenam)){
+			// error handling
+		}else{
+			$zutrittskarte_ausgegebenam = hasData($zutrittskarte_ausgegebenam)? getData($zutrittskarte_ausgegebenam)[0] : null;
+		}
+
+		if(
+			isSuccess($this->BetriebsmittelpersonModel->addSelect(["betriebsmitteltyp", "beschreibung","nummer","ausgegebenam"]))
+		){
+			$betriebsmittelperson_res = $this->BetriebsmittelpersonModel->getBetriebsmittel(getAuthPersonId());
+			if(isError($betriebsmittelperson_res)){
+				   // error handling
+			   }else{
+				   $betriebsmittelperson_res = hasData($betriebsmittelperson_res)? getData($betriebsmittelperson_res) : null;
+			   }
+		   }
+
 		if(
 		 isSuccess($this->BenutzerfunktionModel->addSelect(["tbl_benutzerfunktion.bezeichnung as bf_bezeichnung","tbl_organisationseinheit.bezeichnung as oe_bezeichnung","datum_von","datum_bis","wochenstunden"]))
 	  	 && isSuccess($this->BenutzerfunktionModel->addJoin("tbl_organisationseinheit","oe_kurzbz"))
@@ -119,7 +141,10 @@ class Profil extends Auth_Controller
 		$res->ort = $adresse_res->ort;
 		//? Benutzerfunktion Info
 		$res->funktionen = $benutzer_funktion_res;
-		
+		//? Betriebsmittel Info
+		$res->mittel = $betriebsmittelperson_res;
+		$res->zutrittskarte_ausgegebenam = $zutrittskarte_ausgegebenam->ausgegebenam;
+		$res->kontakt = $kontakte;
 		
 		
 		
diff --git a/application/models/crm/Student_model.php b/application/models/crm/Student_model.php
index e27fa68dc..ad642aa75 100644
--- a/application/models/crm/Student_model.php
+++ b/application/models/crm/Student_model.php
@@ -13,6 +13,28 @@ class Student_model extends DB_Model
 		$this->hasSequence = false;
 	}
 
+	/**
+     * Checks if the user is a Student.
+     * @param string $uid
+     * @return array
+     */
+    public function isStudent($uid)
+    {
+        $this->addSelect('1');
+
+        $result = $this->loadWhere(array('student_uid' => $uid));
+        
+
+        if(hasData($result))
+        {
+            return success(true);
+        }
+        else
+        {
+            return success(false);
+        }
+    }
+
 	// ****
 	// * Generiert die Matrikelnummer
 	// * FORMAT: 0710254001
diff --git a/application/models/ressource/Student_model.php b/application/models/ressource/Student_model.php
deleted file mode 100644
index 937361b56..000000000
--- a/application/models/ressource/Student_model.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-class Student_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'public.tbl_student';
-		$this->pk = 'student_uid';
-	}
-
-    /**
-     * Checks if the user is a Student.
-     * @param string $uid
-     * @return array
-     */
-    public function isStudent($uid)
-    {
-        $this->addSelect('1');
-
-       
-        $result = $this->loadWhere(array('student_uid' => $uid));
-        
-
-        if(hasData($result))
-        {
-            return success(true);
-        }
-        else
-        {
-            return success(false);
-        }
-    }
-    
-   //! THIS FILE WAS CREATED USING THE Mitarbeiter_model.php FILE 
-    
-   
-}
diff --git a/application/views/Cis/Profil.php b/application/views/Cis/Profil.php
index e02d895c3..7be2cc0cc 100644
--- a/application/views/Cis/Profil.php
+++ b/application/views/Cis/Profil.php
@@ -9,7 +9,7 @@ $this->load->view('templates/CISHTML-Header', $includesArray);
 ?>
 
 <div id="content">
-	<h2>Profil2</h2>
+	<h2>Profil22</h2>
 	<hr>
 	<p><?php echo $uid; ?></p>
 	<!-- we can pass information from the php view file to the public js file through interpolating data from php into vue props -->
diff --git a/public/js/components/Cis/Profil/Profil.js b/public/js/components/Cis/Profil/Profil.js
index 7a73a6f06..a4c7a91dd 100644
--- a/public/js/components/Cis/Profil/Profil.js
+++ b/public/js/components/Cis/Profil/Profil.js
@@ -27,7 +27,7 @@ export default {
     },
     created(){
     //error //! fhcapifactory.UserData.getUser().then(res => this.person = res.data);
-    fhcapifactory.UserData.isMitarbeiterOrStudent(this.uid).then(res => this.role = res.data);
+    fhcapifactory.UserData.isMitarbeiterOrStudent(this.uid).then(res => {console.log(res.data);this.role = res.data;});
     fhcapifactory.UserData.getMitarbeiterAnsicht().then(res => {this.person_info = res.data;});
     
     },

From 92fdf3da4c0bd63127213ad3e3c7abc5aedecca7 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 22 Nov 2023 09:02:54 +0100
Subject: [PATCH 0172/1461] =?UTF-8?q?Autocomplete,=20=C3=BCberarbeitung=20?=
 =?UTF-8?q?Modal?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controllers/components/stv/Kontakt.php    | 175 ++++--
 .../models/organisation/Standort_model.php    |  14 +
 application/models/person/Adresse_model.php   |   2 +
 application/models/ressource/Firma_model.php  |  13 +
 .../Studentenverwaltung/Details/Kontakt.js    |  23 +-
 .../Details/Kontakt/Address.js                | 569 +++++++++++++++---
 .../Details/Kontakt/Bankaccount.js            | 342 ++++++++++-
 .../Details/Kontakt/Contact.js                | 348 ++++++++++-
 8 files changed, 1270 insertions(+), 216 deletions(-)

diff --git a/application/controllers/components/stv/Kontakt.php b/application/controllers/components/stv/Kontakt.php
index 4108a8bf4..9a7919c9e 100644
--- a/application/controllers/components/stv/Kontakt.php
+++ b/application/controllers/components/stv/Kontakt.php
@@ -24,13 +24,14 @@ class Kontakt extends FHC_Controller
 	public function getAdressen($person_id)
 	{
 		$this->load->model('person/Adresse_model', 'AdresseModel');
-		//TODO(manu) check select: für Anzeige alle Tabellen nötig
-		$this->AdresseModel->addSelect('*');
+		//TODO(manu) check name: in Adresse und firma
+		$this->AdresseModel->addSelect('public.tbl_adresse.*');
+		$this->AdresseModel->addSelect('t.*');
+		$this->AdresseModel->addSelect('f.firma_id');
+		$this->AdresseModel->addSelect('f.name as firmenname');
 		$this->AdresseModel->addJoin('public.tbl_adressentyp t', 'ON (t.adressentyp_kurzbz = public.tbl_adresse.typ)');
 		$this->AdresseModel->addJoin('public.tbl_firma f', 'ON (f.firma_id = public.tbl_adresse.firma_id)', 'LEFT');
 
-		//	$this->AdresseModel->addJoin('public.tbl_firmentyp ft', 'ON (f.firma_id = ft.firmentyp.firma_id)', 'LEFT');
-
 		$result = $this->AdresseModel->loadWhere(
 			array('person_id' => $person_id)
 		);
@@ -44,41 +45,52 @@ class Kontakt extends FHC_Controller
 
 	public function addNewAddress($person_id)
 	{
+		$this->load->library('form_validation');
 		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
 
+		$this->form_validation->set_rules('plz', 'PLZ', 'required');
+
+		if ($this->form_validation->run() == false)
+		{
+			return $this->outputJsonError($this->form_validation->error_array());
+		}
+
 		$this->load->model('person/Adresse_model', 'AdresseModel');
 
-		// Load Libraries
-		$this->load->library('AuthLib');
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+		$co_name = isset($_POST['co_name']) ? $_POST['co_name'] : null;
+		$strasse = isset($_POST['strasse']) ? $_POST['strasse'] : null;
+		$ort = isset($_POST['ort']) ? $_POST['ort'] : null;
+		$gemeinde = isset($_POST['gemeinde']) ? $_POST['gemeinde'] : null;
+		$nation = isset($_POST['nation']) ? $_POST['nation'] : null;
+		$name = isset($_POST['name']) ? $_POST['name'] : null;
+		$typ = isset($_POST['typ']) ? $_POST['typ'] : null;
+		$anmerkung = isset($_POST['anmerkung']) ? $_POST['anmerkung'] : null;
 
-		$firma_id = '';
-		if (isset($_POST['firma_id']))
-			$firma_id = $_POST('firma_id');
-
-		$co_name = '';
-		if (isset($_POST['co_name']))
-			$co_name = $_POST('co_name');
+		if(isset($_POST['firma']))
+		{
+			$firma_id = $_POST['firma']['firma_id'];
+		}
+		else
+			$firma_id = null;
 
 		$result = $this->AdresseModel->insert(
 			[
 				'person_id' => $person_id,
-				'strasse' =>  $_POST['strasse'],
+				'strasse' =>  $strasse,
 				'insertvon' => 'uid',
 				'insertamum' => date('c'),
 				'plz' => $_POST['plz'],
-				'ort' => $_POST['ort'],
-				'gemeinde' => $_POST['gemeinde'],
-				'nation' => $_POST['nation'],
+				'ort' => $ort,
+				'gemeinde' => $gemeinde,
+				'nation' => $nation,
 				'heimatadresse' => $_POST['heimatadresse'],
 				'zustelladresse' => $_POST['zustelladresse'],
 				'co_name' => $co_name,
-				'typ' => $_POST['typ'],
+				'typ' => $typ,
 				'firma_id' => $firma_id,
-				'name' => $_POST['name'],
+				'name' => $name,
 				'rechnungsadresse' => $_POST['rechnungsadresse'],
-				'anmerkung' => $_POST['anmerkung']
-
+				'anmerkung' => $anmerkung
 
 			]
 		);
@@ -92,20 +104,31 @@ class Kontakt extends FHC_Controller
 	}
 
 	public function updateAddress($address_id)
-		//Todo(manu) update Firma
 	{
+		$this->load->library('form_validation');
 		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
 
+		$this->form_validation->set_rules('plz', 'PLZ', 'required');
+
+		if ($this->form_validation->run() == false)
+		{
+			return $this->outputJsonError($this->form_validation->error_array());
+		}
+
 		$this->load->model('person/Adresse_model', 'AdresseModel');
-		// Load Libraries
-		$this->load->library('AuthLib');
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
 
 		if(!$address_id)
 		{
 			return $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 		}
 
+		if(isset($_POST['firma']))
+		{
+			$firma_id = $_POST['firma']['firma_id'];
+		}
+		else
+			$firma_id = $_POST['firma_id'];
+
 		$result = $this->AdresseModel->update([
 			'adresse_id' => $address_id
 		],
@@ -120,7 +143,11 @@ class Kontakt extends FHC_Controller
 				'heimatadresse' => $_POST['heimatadresse'],
 				'zustelladresse' => $_POST['zustelladresse'],
 				'co_name' => $_POST['co_name'],
-				'typ' => $_POST['typ']
+				'typ' => $_POST['typ'],
+				'firma_id' => $firma_id,
+				'name' => $_POST['name'],
+				'rechnungsadresse' => $_POST['rechnungsadresse'],
+				'anmerkung' => $_POST['anmerkung']
 			]);
 
 		if (isError($result))
@@ -135,7 +162,10 @@ class Kontakt extends FHC_Controller
 	{
 		$this->load->model('person/Adresse_model', 'AdresseModel');
 
-		$this->AdresseModel->addSelect('*');
+		$this->AdresseModel->addSelect('public.tbl_adresse.*');
+		$this->AdresseModel->addSelect('t.*');
+		$this->AdresseModel->addSelect('f.firma_id');
+		$this->AdresseModel->addSelect('f.name as firmenname');
 		$this->AdresseModel->addJoin('public.tbl_adressentyp t', 'ON (t.adressentyp_kurzbz = public.tbl_adresse.typ)');
 		$this->AdresseModel->addJoin('public.tbl_firma f', 'ON (f.firma_id = public.tbl_adresse.firma_id)', 'LEFT');
 
@@ -151,7 +181,6 @@ class Kontakt extends FHC_Controller
 
 		elseif (!hasData($result)) {
 			$this->outputJson($result); //success mit Wert null
-			//	$this->outputJson(getData($result) ?: []);
 		}
 		else
 		{
@@ -191,7 +220,6 @@ class Kontakt extends FHC_Controller
 		}
 	}
 
-	//TODO(Manu) Liste zu lang - besser nachladen
 	public function getFirmen($searchString)
 	{
 		$this->load->model('ressource/firma_model', 'FirmaModel');
@@ -199,27 +227,22 @@ class Kontakt extends FHC_Controller
 		$result = $this->FirmaModel->searchFirmen($searchString);
 		if (isError($result)) {
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			$this->outputJson(getError($result));
-		} else {
-			$this->outputJson(getData($result) ?: []);
 		}
+		$this->outputJson($result);
 	}
 
-	//TODO(Manu) Autocomplete?
 	public function getStandorte($searchString)
 	{
-		$this->load->model('organisation/Standort_model', 'StandortModel');
+		$this->load->model('organisation/standort_model', 'StandortModel');
 
-		$result = $this->StandortModel->load();
+		$result = $this->StandortModel->searchStandorte($searchString);
 		if (isError($result)) {
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			$this->outputJson(getError($result));
-		} else {
-			$this->outputJson(getData($result) ?: []);
 		}
+		$this->outputJson($result);
 	}
 
-	public function getFirmenliste($searchString)
+	public function getFirmenliste($searchString) //TODO (manu) DEPRECATED
 	{
 		$this->load->model('ressource/firma_model', 'FirmaModel');
 
@@ -290,11 +313,9 @@ class Kontakt extends FHC_Controller
 	{
 		$this->load->model('person/Kontakt_model', 'KontaktModel');
 		$this->load->model('organisation/standort_model', 'StandortModel');
-		$this->load->model('ressource/firma_model', 'FirmaModel');
 
 		$this->KontaktModel->addSelect('*');
 		$this->StandortModel->addJoin('public.tbl_standort st', 'ON (public.tbl_kontakt.standort_id = st.standort_id)', 'LEFT');
-		$this->StandortModel->addJoin('public.tbl_firma f', 'ON (f.firma_id = st.firma_id)', 'LEFT');
 
 		$result = $this->KontaktModel->loadWhere(
 			array('person_id' => $person_id)
@@ -325,9 +346,9 @@ class Kontakt extends FHC_Controller
 	{
 		$this->load->model('person/Kontakt_model', 'KontaktModel');
 
-		$this->KontaktModel->addSelect('*');
+		$this->AdresseModel->addSelect('public.tbl_kontakt.*');
+		$this->KontaktModel->addSelect('st.kurzbz');
 		$this->KontaktModel->addJoin('public.tbl_standort st', 'ON (public.tbl_kontakt.standort_id = st.standort_id)', 'LEFT');
-		$this->KontaktModel->addJoin('public.tbl_firma f', 'ON (f.firma_id = st.firma_id)', 'LEFT');
 
 		$this->KontaktModel->addLimit(1);
 
@@ -351,25 +372,46 @@ class Kontakt extends FHC_Controller
 
 	public function addNewContact($person_id)
 	{
+		$this->load->library('form_validation');
+
 		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
 
+		if(($_POST['kontakttyp'] == 'email' && isset($_POST['kontakt'])))
+			$this->form_validation->set_rules('kontakt', 'Kontakt', 'valid_email');
+		else
+			$this->form_validation->set_rules('kontakt', 'Kontakt', 'required');
+
+		if ($this->form_validation->run() == false)
+		{
+			return $this->outputJsonError($this->form_validation->error_array());
+		}
+
+
 		$this->load->model('person/Kontakt_model', 'KontaktModel');
 
-		$firma_id = '';
-		if (isset($_POST['firma_id']))
-			$firma_id = $_POST('firma_id');
+		if(isset($_POST['standort']))
+		{
+			$standort_id = $_POST['standort']['standort_id'];
+		}
+		else
+			$standort_id = null;
+
+		$kontakttyp = isset($_POST['kontakttyp']) ? $_POST['kontakttyp'] : null;
+		$anmerkung = isset($_POST['anmerkung']) ? $_POST['anmerkung'] : null;
+		$kontakt = isset($_POST['kontakt']) ? $_POST['kontakt'] : null;
+		$ext_id = isset($_POST['ext_id']) ? $_POST['ext_id'] : null;
 
 		$result = $this->KontaktModel->insert(
 			[
 				'person_id' => $person_id,
-				'kontakttyp' =>  $_POST['kontakttyp'],
-				'anmerkung' => $_POST['anmerkung'],
-				'kontakt' => $_POST['kontakt'],
+				'kontakttyp' =>  $kontakttyp,
+				'anmerkung' => $anmerkung,
+				'kontakt' => $kontakt,
 				'zustellung' => $_POST['zustellung'],
 				'insertvon' => 'uid',
 				'insertamum' => date('c'),
-				'standort_id' => $_POST['standort_id'],
-				'ext_id' => $_POST['ext_id']
+				'standort_id' => $standort_id,
+				'ext_id' => $ext_id
 			]
 		);
 
@@ -392,19 +434,32 @@ class Kontakt extends FHC_Controller
 			return $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 		}
 
+		if(isset($_POST['standort']))
+		{
+			$standort_id = $_POST['standort']['standort_id'];
+		}
+		else
+			$standort_id = $_POST['standort_id'];
+
+		$kontakttyp = isset($_POST['kontakttyp']) ? $_POST['kontakttyp'] : null;
+		$anmerkung = isset($_POST['anmerkung']) ? $_POST['anmerkung'] : null;
+		$kontakt = isset($_POST['kontakt']) ? $_POST['kontakt'] : null;
+		$ext_id = isset($_POST['ext_id']) ? $_POST['ext_id'] : null;
+		$person_id = isset($_POST['person_id']) ? $_POST['person_id'] : null;
+
 		$result = $this->KontaktModel->update([
 			'kontakt_id' => $kontakt_id
 		],
 			[
-				'person_id' => $_POST['person_id'],
-				'kontakttyp' =>  $_POST['kontakttyp'],
-				'anmerkung' => $_POST['anmerkung'],
-				'kontakt' => $_POST['kontakt'],
+				'person_id' => $person_id,
+				'kontakttyp' =>  $kontakttyp,
+				'anmerkung' => $anmerkung,
+				'kontakt' => $kontakt,
 				'zustellung' => $_POST['zustellung'],
-				'updatevon' => 'uid',
-				'updateamum' => date('c'),
-				'standort_id' => $_POST['standort_id'],
-				'ext_id' => $_POST['ext_id']
+				'insertvon' => 'uid',
+				'insertamum' => date('c'),
+				'standort_id' => $standort_id,
+				'ext_id' => $ext_id
 			]);
 
 		if (isError($result))
diff --git a/application/models/organisation/Standort_model.php b/application/models/organisation/Standort_model.php
index 382236e2f..7d31ecdcd 100644
--- a/application/models/organisation/Standort_model.php
+++ b/application/models/organisation/Standort_model.php
@@ -11,4 +11,18 @@ class Standort_model extends DB_Model
 		$this->dbTable = 'public.tbl_standort';
 		$this->pk = 'standort_id';
 	}
+
+	public function searchStandorte($filter)
+	{
+		$qry = "
+			SELECT 
+				s.kurzbz, s.standort_id
+			FROM 
+			    public.tbl_standort s
+			WHERE 
+			    lower (s.kurzbz) LIKE '%". $this->db->escape_like_str($filter)."%'";
+
+		return $this->execQuery($qry);
+	}
 }
+
diff --git a/application/models/person/Adresse_model.php b/application/models/person/Adresse_model.php
index a0140af58..cc6d68673 100644
--- a/application/models/person/Adresse_model.php
+++ b/application/models/person/Adresse_model.php
@@ -70,3 +70,5 @@ class Adresse_model extends DB_Model
 	}
 }
 
+
+
diff --git a/application/models/ressource/Firma_model.php b/application/models/ressource/Firma_model.php
index 1b8dfb51d..1d1b923e3 100644
--- a/application/models/ressource/Firma_model.php
+++ b/application/models/ressource/Firma_model.php
@@ -11,4 +11,17 @@ class Firma_model extends DB_Model
 		$this->dbTable = 'public.tbl_firma';
 		$this->pk = 'firma_id';
 	}
+
+	public function searchFirmen($filter)
+	{
+		$qry = "
+			SELECT 
+				f.name, f.firma_id
+			FROM 
+			    public.tbl_firma f
+			WHERE 
+			    lower (f.name) LIKE '%". $this->db->escape_like_str($filter)."%'";
+
+		return $this->execQuery($qry);
+	}
 }
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt.js
index 6212f8e32..f8d30a5a6 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt.js
@@ -2,13 +2,16 @@ import {CoreRESTClient} from '../../../../RESTClient.js';
 import AddressList from "./Kontakt/Address.js";
 import ContactList from "./Kontakt/Contact.js";
 import BankaccountList from "./Kontakt/Bankaccount.js";
+
 import PvToast from "../../../../../../index.ci.php/public/js/components/primevue/toast/toast.esm.min.js";
+import PvAutoComplete from "../../../../../../index.ci.php/public/js/components/primevue/autocomplete/autocomplete.esm.min.js";
 export default {
 	components: {
 		AddressList,
 		ContactList,
 		BankaccountList,
-		PvToast
+		PvToast,
+		PvAutoComplete
 	},
 	props: {
 		student: Object
@@ -22,7 +25,7 @@ export default {
 	},
 	created(){
 		CoreRESTClient
-			.get('components/stv/Student/getAdressen/' + this.student.person_id)
+			.get('components/stv/Kontakt/getAdressen/' + this.student.person_id)
 			.then(result => {
 				this.adressen = result.data;
 			})
@@ -30,7 +33,7 @@ export default {
 				console.error(err.response.data || err.message);
 			});
 		/*		CoreRESTClient
-					.get('components/stv/Student/getKontakte/' + this.student.person_id)
+					.get('components/stv/Kontakt/getKontakte/' + this.student.person_id)
 					.then(result => {
 						this.kontakte = result.data;
 					})
@@ -38,7 +41,7 @@ export default {
 						console.error(err.response.data || err.message);
 					});
 				CoreRESTClient
-					.get('components/stv/Student/getBankverbindung/' + this.student.person_id)
+					.get('components/stv/Kontakt/getBankverbindung/' + this.student.person_id)
 					.then(result => {
 						this.bankverbindungen = result.data;
 					})
@@ -49,15 +52,25 @@ export default {
 	template: `
 	<div class="stv-details-details h-100 pb-3">
 		<fieldset class="overflow-hidden">
+		
+
+		
 			<legend>Adressen</legend>		
-		<!--	{{this.adressen}}-->
+<!--			{{this.adressen}}-->
+
+				<!--props notwendig, um auf Funktion in child zuzugreifen-->
+<!--				<button type="button" class="btn btn btn-outline-warning" @click="actionNewAdress()">new Adress</button>
+				<button type="button" class="btn btn btn-outline-warning" @click="actionEditAdress(111444)">edit 111444</button>-->
+				
 				<address-list ref="adressList" :uid="student.person_id"></address-list>
 		</fieldset>
+		<br>
 		<fieldset class="overflow-hidden">
 			<legend>Kontakt</legend>
 	<!--		{{this.kontakte}}-->
 			<contact-list ref="contactList" :uid="student.person_id"></contact-list>
 		</fieldset>
+		<br>
 		<fieldset class="overflow-hidden">
 			<legend>Bankverbindungen</legend>
 <!--			{{this.bankverbindungen}}-->
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
index 3222326af..365d0a028 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
@@ -1,5 +1,7 @@
 import {CoreFilterCmpt} from "../../../../filter/Filter.js";
 import {CoreRESTClient} from "../../../../../RESTClient";
+import PvAutoComplete from "../../../../../../../index.ci.php/public/js/components/primevue/autocomplete/autocomplete.esm.min.js";
+/*import PvToast from "../../../../../../index.ci.php/public/js/components/primevue/toast/toast.esm.min.js";*/
 
 
 var editIcon = function(cell, formatterParams){ //plain text value
@@ -12,7 +14,8 @@ var deleteIcon = function(cell, formatterParams){ //plain text value
 
 export default{
 	components: {
-		CoreFilterCmpt
+		CoreFilterCmpt,
+		PvAutoComplete
 	},
 	props: {
 		uid: String
@@ -23,10 +26,10 @@ export default{
 	data() {
 		return{
 			tabulatorOptions: {
-				ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Student/getAdressen/' + this.uid),
+				ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Kontakt/getAdressen/' + this.uid),
 				//autoColumns: true,
 				columns:[
-					{title:"Typ", field:"bezeichnung"}, //TODO(manu) mix ok?
+					{title:"Typ", field:"bezeichnung"},
 					{title:"Strasse", field:"strasse"},
 					{title:"Plz", field:"plz"},
 					{title:"Ort", field:"ort"},
@@ -38,7 +41,8 @@ export default{
 							return output;}
 					},
 					{title:"Abweich.Empf", field:"co_name"},
-					{title:"Firma", field:"name"}, //TODO(manu) check in DB
+					{title:"Name", field:"name"},
+					{title:"Firma", field:"firmenname"}, //TODO(manu) check in DB
 					{title:"Firma_id", field:"firma_id", visible:false},
 					{title:"Adresse_id", field:"adresse_id", visible:false},
 					{title:"Person_id", field:"person_id", visible:false},
@@ -50,8 +54,18 @@ export default{
 							return output;}
 					},
 					{title:"Anmerkung", field:"anmerkung", visible:false},
-					{formatter:editIcon, width:40, align:"center", cellClick:function(e, cell){alert("Edit data for adresse_id: " + cell.getRow().getIndex())}},
-					{formatter:deleteIcon, width:40, align:"center", cellClick:function(e, cell){alert("Delete data for adresse_id " + cell.getRow().getIndex())}},
+					{title: "Actions",
+						columns:[
+							{formatter:editIcon, width:40, align:"center", cellClick: (e, cell) => {
+									this.actionEditAdress(cell.getData().adresse_id);
+									console.log(cell.getRow().getIndex(), cell.getData(), this);
+								}, width:50, headerSort:false},
+							{formatter:deleteIcon, width:40, align:"center", cellClick: (e, cell) => {
+									this.actionDeleteAdress(cell.getData().adresse_id);
+									console.log(cell.getRow().getIndex(), cell.getData(), this);
+								}, width:50, headerSort:false },
+						],
+					},
 				],
 				layout: 'fitDataFill',
 				layoutColumnsOnNewData:	false,
@@ -62,44 +76,58 @@ export default{
 			tabulatorEvents: [
 
 			],
-			lastSelected: null,
-			modalRefVis: false,
-			addressData: [],
+			addressData: {},
 			formData: {
-				zustelladresse: false,
-				heimatadresse: false
+				zustelladresse: true,
+				heimatadresse: true,
+				rechnungsadresse: false,
+				typ: 'h',
+				nation: 'A'
 			},
 			nations: [],
-			adressentypen: []
+			adressentypen: [],
+			firmen: [],
+			ortschaften: [],
+			gemeinden: [],
+			filteredFirmen: []
 		}
+	},
+	computed:{
+
 	},
 	methods:{
 		actionNewAdress(){
-
-			console.log("Neue Adresse anlegen");
 			bootstrap.Modal.getOrCreateInstance(this.$refs.newAdressModal).show();
 		},
-		deleteAdressData(){
-			return this.formData = null;
+		actionEditAdress(adress_id){
+			this.loadAdress(adress_id).then(() => {
+				if(this.addressData.adresse_id)
+					bootstrap.Modal.getOrCreateInstance(this.$refs.editAdressModal).show();
+			});
 		},
-		hideModal(){
-			bootstrap.Modal.getOrCreateInstance(this.$refs.newAdressModal).hide();
+		actionDeleteAdress(adress_id){
+			this.loadAdress(adress_id).then(() => {
+				if(this.addressData.adresse_id)
+					if(this.addressData.heimatadresse)
+						this.$fhcAlert.alertError("Heimatadressen dürfen nicht gelöscht werden, da diese für die BIS-Meldung relevant sind. Um die Adresse dennoch zu löschen, entfernen sie das Häkchen bei Heimatadresse!");
+					else
+						bootstrap.Modal.getOrCreateInstance(this.$refs.deleteAdressModal).show();
+			});
 		},
 		addNewAddress(formData) {
-			CoreRESTClient.post('components/stv/Student/addNewAddress/' + this.uid,
-					this.formData
-				).then(response => {
-					console.log(response);
+			CoreRESTClient.post('components/stv/Kontakt/addNewAddress/' + this.uid,
+				this.formData
+			).then(response => {
 				if (!response.data.error) {
-					this.statusCode = 0;
-					this.statusMsg = 'success';
-					console.log('Speichern erfolgreich: ' + this.statusMsg);
 					this.$fhcAlert.alertSuccess('Speichern erfolgreich');
+					this.hideModal('newAdressModal');
 				} else {
-					this.statusCode = 0;
-					this.statusMsg = 'Error';
-					console.log('Speichern nicht erfolgreich: ' + this.statusMsg);
-					this.$fhcAlert.alertError('Speichern nicht erfolgreich');
+					const errorData = response.data.retval;
+					Object.entries(errorData).forEach(entry => {
+						const [key, value] = entry;
+						console.log(key, value);
+						this.$fhcAlert.alertError(value);
+					});
 				}
 			}).catch(error => {
 				console.log(error);
@@ -109,26 +137,127 @@ export default{
 				this.$fhcAlert.alertError('Fehler bei Speicherroutine aufgetreten');
 			}).finally(() => {
 				window.scrollTo(0, 0);
-				hideModal();
+				this.reload();
+			});
+
+			//this.formData = [];
+		},
+		reload(){
+			this.$refs.table.reloadTable();
+		},
+		loadAdress(adress_id){
+			return CoreRESTClient.get('components/stv/Kontakt/loadAddress/' + adress_id
+			).then(
+				result => {
+					console.log(this.addressData, result);
+					if(result.data.retval)
+						this.addressData = result.data.retval;
+					else
+					{
+						this.addressData = {};
+						this.$fhcAlert.alertError('Keine Adresse mit Id ' + adress_id + ' gefunden');
+					}
+					return result;
+				}
+			);
+		},
+		updateAddress(adress_id){
+			CoreRESTClient.post('components/stv/Kontakt/updateAddress/' + adress_id,
+				this.addressData
+			).then(response => {
+				if (!response.data.error) {
+					this.$fhcAlert.alertSuccess('Speichern erfolgreich');
+					this.hideModal('editAdressModal');
+				} else {
+					const errorData = response.data.retval;
+					Object.entries(errorData).forEach(entry => {
+						const [key, value] = entry;
+						console.log(key, value);
+						this.$fhcAlert.alertError(value);
+					});
+				}
+			}).catch(error => {
+				this.statusMsg = 'Error in Catch';
+				console.log('Speichern nicht erfolgreich ' + this.statusMsg);
+				this.$fhcAlert.alertError('Fehler bei Speicherroutine aufgetreten');
+			}).finally(() => {
+				window.scrollTo(0, 0);
+				//hideModal();
+				this.reload();
 			});
 		},
-
-
-		/*		showModalRef(){
-
-					modalRef = true;
-				}*/
-		/*		updateUrl(url, first) {
-					this.lastSelected = first ? undefined : this.selected;
-					if (url)
-						url = CoreRESTClient._generateRouterURI(url);
-					if (!this.$refs.table.tableBuilt)
-						this.$refs.table.tabulator.on("tableBuilt", () => {
-							this.$refs.table.tabulator.setData(url);
-						});
+		deleteAddress(adress_id){
+			CoreRESTClient.post('components/stv/Kontakt/deleteAddress/' + adress_id)
+				.then(response => {
+					console.log(response);
+					if (!response.data.error) {
+						this.statusCode = 0;
+						this.statusMsg = 'success';
+						console.log('Löschen erfolgreich: ' + this.statusMsg);
+						this.$fhcAlert.alertSuccess('Löschen erfolgreich');
+					} else {
+						this.statusCode = 0;
+						this.statusMsg = 'Error';
+						console.log('Löschen nicht erfolgreich: ' + this.statusMsg);
+						this.$fhcAlert.alertError('Keine Adresse mit Id ' + adress_id + ' gefunden');
+					}
+				}).catch(error => {
+				console.log(error);
+				this.statusCode = 0;
+				this.statusMsg = 'Error in Catch';
+				console.log('Löschen nicht erfolgreich ' + this.statusMsg);
+				this.$fhcAlert.alertError('Fehler bei Löschroutine aufgetreten');
+			}).finally(()=> {
+				window.scrollTo(0, 0);
+				this.hideModal('deleteAdressModal');
+				this.reload();
+			});
+		},
+		getGemeinden(searchString){
+			return CoreRESTClient.get('components/stv/Kontakt/getGemeinden/' + searchString
+			).then(
+				result => {
+					if(result.data.retval)
+						this.gemeinden = result.data.retval;
 					else
-						this.$refs.table.tabulator.setData(url);
-				}*/
+					{
+						this.gemeinden = {};
+						this.$fhcAlert.alertError('Keine Gemeinde mit PLZ ' + plz + ' gefunden');
+					}
+					return result;
+				}
+			);
+		},
+		getOrtschaften(searchString){
+			return CoreRESTClient.get('components/stv/Kontakt/getOrtschaften/' + searchString
+			).then(
+				result => {
+					if(result.data.retval)
+						this.ortschaften = result.data.retval;
+					else
+					{
+						this.ortschaften = {};
+						//this.$fhcAlert.alertError('Keine Ortschaft mit PLZ ' + plz + ' gefunden');
+					}
+					return result;
+				}
+			);
+		},
+		search(event) {
+			//console.log(event.query);
+			return CoreRESTClient
+				.get('components/stv/Kontakt/getFirmen/' + event.query)
+				.then(result => {
+					this.filteredFirmen = CoreRESTClient.getData(result.data);
+					//return firma.name.toLowerCase().startsWith(event.query.toLowerCase());
+				});
+		},
+		reload(){
+			this.$refs.table.reloadTable();
+		},
+		hideModal(modalRef){
+			bootstrap.Modal.getOrCreateInstance(this.$refs[modalRef]).hide();
+		},
 	},
 	created(){
 		CoreRESTClient
@@ -140,7 +269,7 @@ export default{
 				console.error(err.response.data || err.message);
 			});
 		CoreRESTClient
-			.get('components/stv/Student/getAdressentypen')
+			.get('components/stv/Kontakt/getAdressentypen')
 			.then(result => {
 				this.adressentypen = result.data;
 			})
@@ -148,83 +277,145 @@ export default{
 				console.error(err.response.data || err.message);
 			});
 	},
-	template: `	
-			
+	template: `			
 		<div class="stv-list h-100 pt-3">
 					
-<!--		<Modal>   
- TODO(MANU) use BSModal, Validierungen
- -->
-		
-		<div ref="newAdressModal" class="modal fade" id="exampleModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
+		<!--		<Modal>   
+		 TODO(MANU) use BSModal, Validierungen
+		 -->
+				
+		<div ref="newAdressModal" class="modal fade" id="newAddressModal" tabindex="-1" aria-labelledby="newAddressModalLabel" aria-hidden="true">
 		  <div class="modal-dialog">
 			<div class="modal-content">
 			  <div class="modal-header">
-				<h5 class="modal-title" id="exampleModalLabel">Details Adresse</h5>
+				<h5 class="modal-title" id="newAddressModalLabel">Neue Adresse anlegen</h5>
 				<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
 			  </div>
 			  <div class="modal-body">
-					<form  ref="formData">{{formData}}
-												
-						<div class="col-sm-3">
-							<label for="adressentyp" class="form-label required">Typ</label>
+				<form  ref="formData">					
+					<div class="row mb-3">
+						<label for="adressentyp" class="form-label col-sm-4">Typ</label>
+						<div class="col-sm-5">
 							<select id="adressentyp" class="form-control" v-model="formData.typ">
-								<option value="">-- keine Auswahl --</option>
 								<option v-for="typ in adressentypen" :key="typ.adressentyp_kurzbz" :value="typ.adressentyp_kurzbz" >{{typ.bezeichnung}}</option>
 							</select>
 						</div>
-																	   
+					</div>
+					<div class="row mb-3">											   
+						<label for="strasse" class="form-label col-sm-4">Strasse</label>
 						<div class="col-sm-3">
-							<label for="strasse" class="form-label">Strasse</label>
-							<input type="text" :readonly="readonly" class="form-control-sm" id="strasse" v-model="formData['strasse']" maxlength="256">
+							<input type="text" :readonly="readonly" class="form-control-sm" id="strasse" v-model="formData['strasse']">
 						</div>
+					</div>	
 						
-						<div class="col-sm-3">
-							<label for="nation" class="form-label">Nation</label>
+					<div class="row mb-3">
+						<label for="nation" class="form-label col-sm-4">Nation</label>
+						<div class="col-sm-5">
 							<select id="nation" class="form-control" v-model="formData.nation">
-								<option value="">-- keine Auswahl --</option>
 								<option v-for="nation in nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
 							</select>
 						</div>
+					</div>	
 						
+					<div class="row mb-3">								
+						<label for="plz" class="required form-label col-sm-4" >PLZ</label>
 						 <div class="col-sm-3">
-							<label for="plz" class="required form-label" >PLZ</label>
-							<input type="text" required v-model="formData['plz']" >
+							<input type="text" class="form-control-sm" required v-model="formData['plz']" >
 						</div>
+					</div>	
+					
+					<div class="row mb-3">
+						<label for="gemeinde" class="form-label col-sm-4">Gemeinde</label>
+						<div v-if="formData.plz && formData.nation === 'A'" class="col-sm-5">
+							<select id="gemeinde" class="form-control" v-model="formData['gemeinde']" @click="getGemeinden(formData.plz)">
+								<option value="">-- keine Auswahl --</option>
+								<option v-for="gemeinde in gemeinden" :value="gemeinde.name" >{{gemeinde.name}}</option>
+							</select>	
+						</div>
+						<div v-else class="col-sm-3">
+							<div class="col-sm-3">
+								<input id="ort" type="text" class="form-control-sm" v-model="formData['gemeinde']">
+							</div>
+						</div>
+					</div>
 						
-						<div class="col-sm-3">
-							<label for="gemeinde" class="form-label">Gemeinde</label>
-							<input class="form-control-sm" id="gemeinde"  v-model="formData['gemeinde']"maxlength="256">
+					<div class="row mb-3">	
+						<label for="ort" class="form-label col-sm-4">Ortschaft</label>  
+						<div v-if="formData.plz && formData.nation === 'A' && formData.gemeinde" class="col-sm-5">
+							<select id="ort" class="form-control" v-model="formData['ort']" @click="getOrtschaften(formData.plz + '/' + formData.gemeinde)">
+								<option value="">-- keine Auswahl --</option>
+								<option v-for="ort in ortschaften" :value="ort.ortschaftsname" >{{ort.ortschaftsname}}</option>
+							</select>	
 						</div>
+						<div v-else-if="formData.plz && formData.nation === 'A'" class="col-sm-5">
+							<select id="ort" class="form-control" v-model="formData['ort']" @click="getOrtschaften(formData.plz)">
+								<option value="">-- keine Auswahl --</option>
+								<option v-for="ort in ortschaften" :value="ort.ortschaftsname" >{{ort.ortschaftsname}}</option>
+							</select>	
+						</div>
+						<div v-else class="col-sm-3">
+							<div class="col-sm-3">
+								<input id="ort" type="text" class="form-control-sm" v-model="formData['ort']">
+							</div>
+						</div>
+					</div>	
 						
-						<div class="col-sm-3">
-							<label for="ort" class="required form-label">Ortschaft</label>  
-							<input type="text" required v-model="formData['ort']"> 
-						</div>
-										
+					<div class="row mb-3">				
+						<label for="heimatadresse" class="form-label col-sm-4">Heimatadresse</label>
 						<div class="col-sm-3 align-self-center">
-						<label for="heimatadresse" class="form-label">Heimatadresse</label>
 							<div class="form-check">
 								<input id="heimatadresse" type="checkbox" class="form-check-input" value="1" v-model="formData['heimatadresse']">
 							</div>
 						</div>
+					</div>	
 						
+					<div class="row mb-3">
+						<label for="zustelladresse" class="form-label col-sm-4">Zustelladresse</label>
 						<div class="col-sm-3 align-self-center">
-						<label for="zustelladresse" class="form-label">Zustelladresse</label>
 							<div class="form-check">	
 								<input id="zustelladresse" type="checkbox" class="form-check-input" value="1" v-model="formData['zustelladresse']">
 							</div>
 						</div>
-						
-
-						<div class="col-sm-6">
-							<label for="co_name" class="form-label">Abweich.Empfänger. (c/o)</label>
-							<input type="text" v-model="formData['co_name']">
+					</div>	
+					
+					<div class="row mb-3">
+							<label for="co_name" class="form-label col-sm-4">Abweich.Empfänger. (c/o)</label>
+						<div class="col-sm-3">
+							<input type="text" id="co_name" class="form-control-sm" v-model="formData['co_name']">
+						</div>	
+					</div>
+					
+					<div class="row mb-3">
+						<label for="rechnungsadresse" class="form-label col-sm-4">Rechnungsadresse</label>
+						<div class="col-sm-3 align-self-center">
+							<div class="form-check">	
+								<input id="rechnungsadresse" type="checkbox" class="form-check-input" v-model="formData['rechnungsadresse']">
+							</div>
 						</div>
-									   
+					</div>			
+					
+					<div class="row mb-3">
+						<label for="firma_name" class="form-label col-sm-4">Firma</label>
+							<div class="col-sm-3">
+							 	<PvAutoComplete v-model="formData['firma']" optionLabel="name" :suggestions="filteredFirmen" @complete="search" minLength="3"/>
+							</div>	
+					</div>	
+
+					<div class="row mb-3">											   
+						<label for="name" class="form-label col-sm-4">Name</label>
+						<div class="col-sm-2">
+							<input type="text" :readonly="readonly" class="form-control-sm" id="name" v-model="formData['name']">
+						</div>
+					</div>		
+					
+					<div class="row mb-3">											   
+						<label for="anmerkung" class="form-label col-sm-4">Anmerkung</label>
+						<div class="col-sm-3">
+							<input type="text" :readonly="readonly" class="form-control-sm" id="anmerkung" v-model="formData['anmerkung']">
+						</div>
+					</div>					   
 				</form>  
-				
-				
+							
 			  </div>
 			  <div class="modal-footer">
 				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
@@ -233,21 +424,199 @@ export default{
 			</div>
 		  </div>
 		</div>
-				
-			<core-filter-cmpt
-				ref="table"
-				:tabulator-options="tabulatorOptions"
-				:tabulator-events="tabulatorEvents"
-				table-only
-				:side-menu="false"
-				reload
-				new-btn-show
-				new-btn-label="Neu"
-				@click:new="actionNewAdress"
-				
+		
+		<div ref="editAdressModal" class="modal fade" id="editAdressModal" tabindex="-1" aria-labelledby="editAdressModalLabel" aria-hidden="true">
+		  <div class="modal-dialog">
+			<div class="modal-content">
+			  <div class="modal-header">
+				<h5 class="modal-title" id="editAdressModalLabel">Adresse bearbeiten</h5>
+				<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+			  </div>
+			  <div class="modal-body">
+				<form ref="addressData"> 
+												
+					<div class="row mb-3">
+						<label for="adressentyp" class="form-label col-sm-4">Typ</label>
+						<div class="col-sm-5">
+							<select id="adressentyp" class="form-control" v-model="addressData.typ">
+								<option v-for="typ in adressentypen" :key="typ.adressentyp_kurzbz" :value="typ.adressentyp_kurzbz" >{{typ.bezeichnung}}</option>
+							</select>
+						</div>
+					</div>
+					
+					<div class="row mb-3">											   
+						<label for="strasse" class="form-label col-sm-4">Strasse</label>
+						<div class="col-sm-3">
+							<input type="text" :readonly="readonly" class="form-control-sm" id="strasse" v-model="addressData.strasse">
+						</div>
+					</div>	
+						
+					<div class="row mb-3">
+						<label for="nation" class="form-label col-sm-4">Nation</label>
+						<div class="col-sm-5">
+							<select id="nation" class="form-control" v-model="addressData.nation">
+								<option v-for="nation in nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
+							</select>
+						</div>
+					</div>	
+					
+					<div class="row mb-3">								
+						<label for="plz" class="required form-label col-sm-4" >PLZ</label>
+						 <div class="col-sm-3">
+							<input type="text" class="form-control-sm" required v-model="addressData.plz" >
+						</div>
+					</div>	
+						
+					<div class="row mb-3">
+						<label for="gemeinde" class="form-label col-sm-4">Gemeinde</label>
+						<div v-if="addressData.gemeinde" class="col-sm-3" >
+							<input id="ort" type="text" class="form-control-sm" v-model="addressData['gemeinde']">
+						</div>
+						<div v-else-if="addressData.plz && addressData.nation === 'A'" class="col-sm-5">
+							<select id="gemeinde" class="form-control" v-model="addressData['gemeinde']" @click="getGemeinden(addressData.plz)">
+								<option value="">-- keine Auswahl --</option>
+								<option v-for="gemeinde in gemeinden" :value="gemeinde.name" >{{gemeinde.name}}</option>
+							</select>	
+						</div>
+						<div v-else class="col-sm-3">
+							<div class="col-sm-3">
+								<input id="ort" type="text" class="form-control-sm" v-model="addressData['gemeinde']">
+							</div>
+						</div>
+					</div>
+
+					<div class="row mb-3">	
+						<label for="ort" class="form-label col-sm-4">Ortschaft</label>  
+						<div v-if="addressData.ort" class="col-sm-3">
+							<div class="col-sm-3">
+								<input id="ort" type="text" class="form-control-sm" v-model="addressData['ort']">
+							</div>
+						</div>
+						<div v-else-if="addressData.plz && addressData.nation === 'A' && addressData.gemeinde" class="col-sm-5">
+							<select id="ort" class="form-control" v-model="addressData['ort']" @click="getOrtschaften(addressData.plz + '/' + addressData.gemeinde)">
+								<option value="">-- keine Auswahl --</option>
+								<option v-for="ort in ortschaften" :value="ort.ortschaftsname" >{{ort.ortschaftsname}}</option>
+							</select>	
+						</div>
+						<div v-else-if="addressData.plz && addressData.nation === 'A'" class="col-sm-5">
+							<select id="ort" class="form-control" v-model="addressData['ort']" @click="getOrtschaften(addressData.plz)">
+								<option value="">-- keine Auswahl --</option>
+								<option v-for="ort in ortschaften" :value="ort.ortschaftsname" >{{ort.ortschaftsname}}</option>
+							</select>	
+						</div>
+						<div v-else class="col-sm-3">
+							<div class="col-sm-3">
+								<input id="ort" type="text" class="form-control-sm" v-model="addressData['ort']">
+							</div>
+						</div>
+					</div>
+					
+					<div class="row mb-3">				
+						<label for="heimatadresse" class="form-label col-sm-4">Heimatadresse</label>
+						<div class="col-sm-3 align-self-center">
+							<div class="form-check">
+								<input id="heimatadresse" type="checkbox" class="form-check-input" value="1" v-model="addressData['heimatadresse']">
+							</div>
+						</div>
+					</div>	
+						
+					<div class="row mb-3">
+						<label for="zustelladresse" class="form-label col-sm-4">Zustelladresse</label>
+						<div class="col-sm-3 align-self-center">
+							<div class="form-check">	
+								<input id="zustelladresse" type="checkbox" class="form-check-input" value="1" v-model="addressData['zustelladresse']">
+							</div>
+						</div>
+					</div>	
+					
+					<div class="row mb-3">
+						<label for="co_name" class="form-label col-sm-4">Abweich.Empfänger. (c/o)</label>
+						<div class="col-sm-3">
+							<input type="text" id="co_name" class="form-control-sm" v-model="addressData['co_name']">
+						</div>	
+					</div>
+					
+					<div class="row mb-3">
+						<label for="rechnungsadresse" class="form-label col-sm-4">Rechnungsadresse</label>
+						<div class="col-sm-3 align-self-center">
+							<div class="form-check">	
+								<input id="rechnungsadresse" type="checkbox" class="form-check-input" v-model="addressData['rechnungsadresse']">
+							</div>
+						</div>
+					</div>	
+
+					
+					<div class="row mb-3">
+						<label for="firma_name" class="form-label col-sm-4">Firma</label>
+							<div v-if="addressData.firmenname" class="col-sm-3">
+							 	<input type="text" :readonly="readonly" class="form-control-sm" id="name" v-model="addressData.firmenname">
+							</div>	
+							<div v-else class="col-sm-3">
+							 	<PvAutoComplete v-model="addressData['firma']" optionLabel="name" :suggestions="filteredFirmen" @complete="search" minLength="3"/>
+							</div>	
+					</div>	
+					
+					<div class="row mb-3">					
+						<input type="hidden" :readonly="readonly" class="form-control-sm" id="firma_id" v-model="addressData.firma_id">
+					</div>
+
+					<div class="row mb-3">											   
+						<label for="name" class="form-label col-sm-4">Name</label>
+						<div class="col-sm-2">
+							<input type="text" :readonly="readonly" class="form-control-sm" id="name" v-model="addressData['name']">
+						</div>
+					</div>		
+					
+					<div class="row mb-3">											   
+						<label for="anmerkung" class="form-label col-sm-4">Anmerkung</label>
+						<div class="col-sm-3">
+							<input type="text" :readonly="readonly" class="form-control-sm" id="anmerkung" v-model="addressData['anmerkung']">
+						</div>
+					</div>	
+																										   
+				</form>  
+							
+			  </div>
+			  <div class="modal-footer">
+				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
+				<button ref="Close" type="button" class="btn btn-primary" @click="updateAddress(addressData.adresse_id)">OK</button>
+
+			  </div>
+			</div>
+		  </div>
+		</div>
+		
+		<div ref="deleteAdressModal" class="modal fade" id="deleteAdressModal" tabindex="-1" aria-labelledby="deleteAdressModalLabel" aria-hidden="true">
+		  <div class="modal-dialog">
+			<div class="modal-content">
+			  <div class="modal-header">
+				<h5 class="modal-title" id="deleteAdressModalLabel">Adresse löschen</h5>
+				<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+			  </div>
+			  <div class="modal-body">	  
+			  	<p>Adresse {{addressData.adresse_id}} wirklich löschen?</p>											
+			  </div>
+			  <div class="modal-footer">
+				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
+				<button type="button" class="btn btn-primary" @click="deleteAddress(addressData.adresse_id)">OK</button>
+			  </div>
+			</div>
+		  </div>
+		</div>
+			
+		<core-filter-cmpt
+			ref="table"
+			:tabulator-options="tabulatorOptions"
+			:tabulator-events="tabulatorEvents"
+			table-only
+			:side-menu="false"
+			reload
+			new-btn-show
+			new-btn-label="Neu"
+			@click:new="actionNewAdress"
 			>
-				<button v-if="reload" class="btn btn-outline-warning" aria-label="Reload" @click="editTable">
-					<span class="fa-solid fa-rotate-right" aria-hidden="true"></span>
+				<button v-if="reload" class="btn btn-outline-warning" aria-label="Reload"> 
+					<span class="fa-solid fa-rotate-right" aria-hidden="true"></span>  				
 				</button>
 		</core-filter-cmpt>
 		</div>`
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
index 6a9ca06c6..b754f855d 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
@@ -1,6 +1,13 @@
 import {CoreFilterCmpt} from "../../../../filter/Filter.js";
 import {CoreRESTClient} from "../../../../../RESTClient";
 
+var editIcon = function(cell, formatterParams){ //plain text value
+	return "<i class='fa fa-edit'></i>";
+};
+var deleteIcon = function(cell, formatterParams) { //plain text value
+	return "<i class='fa fa-remove'></i>";
+};
+
 export default{
 	components: {
 		CoreFilterCmpt
@@ -14,7 +21,7 @@ export default{
 	data() {
 		return{
 			tabulatorOptions: {
-				ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Student/getBankverbindung/' + this.uid),
+				ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Kontakt/getBankverbindung/' + this.uid),
 				columns:[
 					{title:"Name", field:"name"},
 					{title:"Anschrift", field:"anschrift", visible:false},
@@ -44,6 +51,18 @@ export default{
 					},
 					{title:"Person_id", field:"person_id", visible:false},
 					{title:"Bankverbindung_id", field:"bankverbindung_id", visible:false},
+					{title: "Actions",
+						columns:[
+							{formatter:editIcon, width:40, align:"center", cellClick: (e, cell) => {
+									this.actionEditBankverbindung(cell.getData().bankverbindung_id);
+									console.log(cell.getRow().getIndex(), cell.getData(), this);
+								}, width:50, headerSort:false},
+							{formatter:deleteIcon, width:40, align:"center", cellClick: (e, cell) => {
+									this.actionDeleteBankverbindung(cell.getData().bankverbindung_id);
+									console.log(cell.getRow().getIndex(), cell.getData(), this);
+								}, width:50, headerSort:false },
+						],
+					},
 				],
 				layout: 'fitDataFill',
 				layoutColumnsOnNewData:	false,
@@ -51,37 +70,310 @@ export default{
 				selectable:	true,
 				index: 'bankverbindung_id',
 			},
-			tabulatorEvents: [
-				/*				{
-									event: 'rowSelectionChanged',
-									handler: this.rowSelectionChanged
-								},
-								{
-									event: 'dataProcessed',
-									handler: this.autoSelectRows
-								}*/
-			],
-			lastSelected: null
+			tabulatorEvents: [],
+			lastSelected: null,
+			bankverbindungData: {
+				verrechnung: true
+			}
 		}
 	},
 	methods:{
-		actionNewAdress(){
-			console.log("Neuen Kontakt anlegen");
+		actionNewBankverbindung(){
+			bootstrap.Modal.getOrCreateInstance(this.$refs.newBankverbindungModal).show();
 		},
-		updateUrl(url, first) {
-			this.lastSelected = first ? undefined : this.selected;
-			if (url)
-				url = CoreRESTClient._generateRouterURI(url);
-			if (!this.$refs.table.tableBuilt)
-				this.$refs.table.tabulator.on("tableBuilt", () => {
-					this.$refs.table.tabulator.setData(url);
-				});
-			else
-				this.$refs.table.tabulator.setData(url);
+		actionEditBankverbindung(bankverbindung_id){
+			this.loadBankverbindung(bankverbindung_id).then(() => {
+				if(this.bankverbindungData.bankverbindung_id)
+					bootstrap.Modal.getOrCreateInstance(this.$refs.editBankverbindungModal).show();
+			});
+		},
+		actionDeleteBankverbindung(bankverbindung_id){
+			this.loadBankverbindung(bankverbindung_id).then(() => {
+				if(this.bankverbindungData.bankverbindung_id)  //Todo(Manu) not optimal
+					bootstrap.Modal.getOrCreateInstance(this.$refs.deleteBankverbindungModal).show();
+			});
+		},
+		addNewBankverbindung(bankverbindungData) {
+			CoreRESTClient.post('components/stv/Kontakt/addNewBankverbindung/' + this.uid,
+				this.bankverbindungData
+			).then(response => {
+				if (!response.data.error) {
+					this.$fhcAlert.alertSuccess('Speichern erfolgreich');
+					this.hideModal('newBankverbindungModal');
+					this.reload();
+				} else {
+					//console.log(response.data.retval);
+					const errorData = response.data.retval;
+					Object.entries(errorData).forEach(entry => {
+						const [key, value] = entry;
+						console.log(key, value);
+						this.$fhcAlert.alertError('Das Feld ' + key + ' ist erforderlich');
+					});
+					this.statusCode = 0;
+					this.statusMsg = response.data;
+					//console.log('Speichern nicht erfolgreich: ' + this.statusMsg);
+				}
+			}).catch(error => {
+				console.log(error);
+				this.statusCode = 0;
+				this.statusMsg = 'Error in Catch';
+				this.$fhcAlert.alertError('Fehler bei Speicherroutine aufgetreten');
+			}).finally(() => {
+				window.scrollTo(0, 0);
+			});
+		},
+		loadBankverbindung(bankverbindung_id){
+			return CoreRESTClient.get('components/stv/Kontakt/loadBankverbindung/' + bankverbindung_id
+			).then(
+				result => {
+					console.log(this.bankverbindungData, result);
+					if(!result.data.retval || result.data.retval.length < 1)
+					{
+						this.bankverbindungData = {};
+						this.$fhcAlert.alertError('Keine Bankverbindung mit Id ' + bankverbindung_id + ' gefunden');
+					}
+					else
+					{
+						this.bankverbindungData = result.data.retval;
+					}
+					return result;
+				}
+			);
+		},
+		updateBankverbindung(bankverbindung_id){
+			CoreRESTClient.post('components/stv/Kontakt/updateBankverbindung/' + bankverbindung_id,
+				this.bankverbindungData
+			).then(response => {
+				console.log(response);
+				if (!response.data.error) {
+					this.$fhcAlert.alertSuccess('Speichern erfolgreich');
+					this.hideModal('editBankverbindungModal');
+					this.reload();
+				} else {
+					const errorData = response.data.retval;
+					console.log(errorData);
+					Object.entries(errorData).forEach(entry => {
+						const [key, value] = entry;
+						this.$fhcAlert.alertError('Das Feld ' + key + ' ist erforderlich');
+					});
+				}
+			}).catch(error => {
+				this.statusMsg = 'Error in Catch';
+				console.log('Speichern nicht erfolgreich ' + this.statusMsg);
+				this.$fhcAlert.alertError('Fehler bei Speicherroutine aufgetreten');
+			}).finally(() => {
+				window.scrollTo(0, 0);
+			});
+		},
+		deleteBankverbindung(bankverbindung_id){
+			CoreRESTClient.post('components/stv/Kontakt/deleteBankverbindung/' + bankverbindung_id)
+				.then(response => {
+					console.log(response);
+					if (!response.data.error || response.data === []) {
+						this.$fhcAlert.alertSuccess('Löschen erfolgreich');
+					} else {
+						this.$fhcAlert.alertError('Keine Adresse mit Id ' + bankverbindung_id + ' gefunden');
+					}
+				}).catch(error => {
+				this.$fhcAlert.alertError('Fehler bei Löschroutine aufgetreten');
+			}).finally(()=> {
+				window.scrollTo(0, 0);
+				this.hideModal('deleteBankverbindungModal');
+				this.reload();
+			});
+		},
+		hideModal(modalRef){
+			bootstrap.Modal.getOrCreateInstance(this.$refs[modalRef]).hide();
+		},
+		reload(){
+			this.$refs.table.reloadTable();
+		},
+		resetData(){ //Todo(manu) check
+			bankverbindungData: [];
 		}
 	},
 	template: `	
 		<div class="stv-list h-100 pt-3">
+		
+<!--			<button type="button" class="btn btn btn-outline-warning" class="col-sm-2" @click="actionDeleteBankverbindung(8796)">delete 8796</button>
+			<button type="button" class="btn btn btn-outline-warning" class="col-sm-2" @click="actionEditBankverbindung(8796)">edit 8796</button>
+			<button type="button" class="btn btn btn-outline-warning" class="col-sm-2" @click="reload">reload</button>-->
+		
+		<!--Modal: new Bankverbindung-->
+			<div ref="newBankverbindungModal" class="modal fade" id="newBankverbindungModal" tabindex="-1" aria-labelledby="newBankverbindungModalLabel" aria-hidden="true">
+			  <div class="modal-dialog">
+				<div class="modal-content">
+				  <div class="modal-header">
+					<h5 class="modal-title" id="newBankverbindungModalLabel">Bankverbindung anlegen</h5>
+					<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+				  </div>
+				  <div class="modal-body">
+					<form ref="bankverbindungData">
+<!--					{{bankverbindungData}}	-->						
+						<div class="row mb-3">
+							<label for="name" class="form-label col-sm-4">Name</label>
+							<div class="col-sm-3">
+								<input type="text" :readonly="readonly" class="form-control-sm" id="name" v-model="bankverbindungData['name']">
+							</div>
+						</div>
+						<div class="row mb-3">											   
+							<label for="anschrift" class="form-label col-sm-4">Anschrift</label>
+							<div class="col-sm-3">
+								<input type="text" :readonly="readonly" class="form-control-sm" id="anschrift" v-model="bankverbindungData['anschrift']">
+							</div>
+						</div>	
+
+						<div class="row mb-3">											   
+							<label for="iban" class="form-label col-sm-4">IBAN</label>
+							<div class="col-sm-3">
+								<input type="text" :readonly="readonly" required class="form-control-sm" id="iban" v-model="bankverbindungData['iban']">
+							</div>
+						</div>	
+						<div class="row mb-3">											   
+							<label for="bic" class="form-label col-sm-4">BIC</label>
+							<div class="col-sm-3">
+								<input type="text" :readonly="readonly" class="form-control-sm" id="bic" v-model="bankverbindungData['bic']">
+							</div>
+						</div>	
+						<div class="row mb-3">											   
+							<label for="kontonr" class="form-label col-sm-4">Kontonummer</label>
+							<div class="col-sm-3">
+								<input type="text" :readonly="readonly" class="form-control-sm" id="kontonr" v-model="bankverbindungData['kontonr']">
+							</div>
+						</div>	
+						<div class="row mb-3">											   
+							<label for="blz" class="form-label col-sm-4">BLZ</label>
+							<div class="col-sm-3">
+								<input type="text" :readonly="readonly" class="form-control-sm" id="blz" v-model="bankverbindungData['blz']">
+							</div>
+						</div>		
+						<div class="row mb-3">
+							<label for="typ" class="form-label col-sm-4">Typ</label>
+							<div class="col-sm-5">
+								<select  id="typ" class="form-control" required v-model="bankverbindungData['typ']">
+									<option  value="p">Privatkonto</option>
+									<option  value="f">Firmenkonto</option>
+								</select>
+							</div>
+						</div>	
+						<div class="row mb-3">
+							<label for="verrechnung" class="form-label col-sm-4">Verrechnung</label>
+							<div class="col-sm-3 align-self-center">
+								<div class="form-check">	
+									<input id="verrechnung" type="checkbox" class="form-check-input" value="1" v-model="bankverbindungData['verrechnung']">
+								</div>
+							</div>
+						</div>	
+											   
+					</form>  
+								
+				  </div>
+				  <div class="modal-footer">
+					<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
+					<button type="button" class="btn btn-primary" @click="addNewBankverbindung()">OK</button>
+				  </div>
+				</div>
+			  </div>
+			</div>
+				
+			<!--Modal: Edit Bankverbindung-->
+			<div ref="editBankverbindungModal" class="modal fade" id="editBankverbindungModal" tabindex="-1" aria-labelledby="editBankverbindungModalLabel" aria-hidden="true">
+			  <div class="modal-dialog">
+				<div class="modal-content">
+				  <div class="modal-header">
+					<h5 class="modal-title" id="editBankverbindungModalLabel">Bankverbindung bearbeiten</h5>
+					<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+				  </div>
+				  <div class="modal-body">
+						<form ref="bankverbindungData">
+						
+							<div class="row mb-3">
+								<label for="name" class="form-label col-sm-4">Name</label>
+								<div class="col-sm-3">
+									<input type="text" :readonly="readonly" class="form-control-sm" id="name" v-model="bankverbindungData['name']">
+								</div>
+							</div>
+													
+							<div class="row mb-3">											   
+							<label for="anschrift" class="form-label col-sm-4">Anschrift</label>
+							<div class="col-sm-3">
+								<input type="text" :readonly="readonly" class="form-control-sm" id="anschrift" v-model="bankverbindungData['anschrift']">
+							</div>
+						</div>	
+
+						<div class="row mb-3">											   
+							<label for="iban" class="form-label col-sm-4">IBAN</label>
+							<div class="col-sm-3">
+								<input type="text" :readonly="readonly" required class="form-control-sm" id="iban" v-model="bankverbindungData['iban']">
+							</div>
+						</div>	
+						<div class="row mb-3">											   
+							<label for="bic" class="form-label col-sm-4">BIC</label>
+							<div class="col-sm-3">
+								<input type="text" :readonly="readonly" class="form-control-sm" id="bic" v-model="bankverbindungData['bic']">
+							</div>
+						</div>	
+						<div class="row mb-3">											   
+							<label for="kontonr" class="form-label col-sm-4">Kontonummer</label>
+							<div class="col-sm-3">
+								<input type="text" :readonly="readonly" class="form-control-sm" id="kontonr" v-model="bankverbindungData['kontonr']">
+							</div>
+						</div>	
+						<div class="row mb-3">											   
+							<label for="blz" class="form-label col-sm-4">BLZ</label>
+							<div class="col-sm-3">
+								<input type="text" :readonly="readonly" class="form-control-sm" id="blz" v-model="bankverbindungData['blz']">
+							</div>
+						</div>		
+						<div class="row mb-3">
+							<label for="typ" class="form-label col-sm-4">Typ</label>
+							<div class="col-sm-5">
+								<select  id="typ" class="form-control" required v-model="bankverbindungData['typ']">
+									<option  value="p">Privatkonto</option>
+									<option  value="f">Firmenkonto</option>
+								</select>
+							</div>
+						</div>	
+						<div class="row mb-3">
+							<label for="verrechnung" class="form-label col-sm-4">Verrechnung</label>
+							<div class="col-sm-3 align-self-center">
+								<div class="form-check">	
+									<input id="verrechnung" type="checkbox" class="form-check-input" value="1" v-model="bankverbindungData['verrechnung']">
+								</div>
+							</div>
+						</div>	
+																				   
+					</form>  
+								
+				  </div>
+				  <div class="modal-footer">
+					<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
+					<button ref="Close" type="button" class="btn btn-primary" @click="updateBankverbindung(bankverbindungData.bankverbindung_id)">OK</button>
+	
+				  </div>
+				</div>
+			  </div>
+			</div>
+				
+			<!-- Modal: Delete Bankverbindung-->
+			<div ref="deleteBankverbindungModal" class="modal fade" id="deleteBankverbindungModal" tabindex="-1" aria-labelledby="deleteBankverbindungModalLabel" aria-hidden="true">
+			  <div class="modal-dialog">
+				<div class="modal-content">
+				  <div class="modal-header">
+					<h5 class="modal-title" id="deleteBankverbindungModalLabel">Kontakt löschen</h5>
+					<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+				  </div>
+				  <div class="modal-body">	  
+					<p>Bankverbindung wirklich löschen?</p>											
+				  </div>
+				  <div class="modal-footer">
+					<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
+					<button type="button" class="btn btn-primary" @click="deleteBankverbindung(bankverbindungData.bankverbindung_id)">OK</button>
+				  </div>
+				</div>
+			  </div>
+			</div>
+		
 			<core-filter-cmpt
 				ref="table"
 				:tabulator-options="tabulatorOptions"
@@ -91,7 +383,7 @@ export default{
 				reload
 				new-btn-show
 				new-btn-label="Neu"
-				@click:new="actionNewContact"
+				@click:new="actionNewBankverbindung"
 			>
 		</core-filter-cmpt>
 		</div>`
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
index 203029fb2..47bb1c147 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
@@ -1,5 +1,7 @@
 import {CoreFilterCmpt} from "../../../../filter/Filter.js";
 import {CoreRESTClient} from "../../../../../RESTClient";
+import PvToast from "../../../../../../../index.ci.php/public/js/components/primevue/toast/toast.esm.min.js";
+import PvAutoComplete from "../../../../../../../index.ci.php/public/js/components/primevue/autocomplete/autocomplete.esm.min.js";
 
 var editIcon = function(cell, formatterParams){ //plain text value
 	return "<i class='fa fa-edit'></i>";
@@ -10,7 +12,9 @@ var deleteIcon = function(cell, formatterParams){ //plain text value
 
 export default{
 	components: {
-		CoreFilterCmpt
+		CoreFilterCmpt,
+		PvAutoComplete,
+		PvToast
 	},
 	props: {
 		uid: String
@@ -21,7 +25,7 @@ export default{
 	data() {
 		return{
 			tabulatorOptions: {
-				ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Student/getKontakte/' + this.uid),
+				ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Kontakt/getKontakte/' + this.uid),
 				columns:[
 					{title:"Typ", field:"kontakttyp"}, //TODO(manu) mix ok?
 					{title:"Kontakt", field:"kontakt"},
@@ -31,51 +35,343 @@ export default{
 							return output;}
 					},
 					{title:"Anmerkung", field:"anmerkung"},
-					//{title:"Firma", field:"adress_id"},
+					{title:"Firma", field:"kurzbz", visible:false},
 					{title:"Firma_id", field:"firma_id", visible:false},
 					{title:"Person_id", field:"person_id", visible:false},
 					{title:"Kontakt_id", field:"kontakt_id", visible:false},
+					{title:"Standort_id", field:"standort_id", visible:false},
 					{title:"letzte Änderung", field:"updateamum", visible:false},
-					{formatter:editIcon, width:40, align:"center", cellClick:function(e, cell){alert("Edit data for kontakt_id: " + cell.getRow().getIndex())}},
-					{formatter:deleteIcon, width:40, align:"center", cellClick:function(e, cell){alert("Delete data for kontakt_id " + cell.getRow().getIndex())}},
+					{title: "Actions",
+						columns:[
+							{formatter:editIcon, cellClick: (e, cell) => {
+									this.actionEditContact(cell.getData().kontakt_id);
+									console.log(cell.getRow().getIndex(), cell.getData(), this);
+								}, width:50, headerSort:false, headerVisible:false},
+							{formatter:deleteIcon, cellClick: (e, cell) => {
+									this.actionDeleteContact(cell.getData().kontakt_id);
+									console.log(cell.getRow().getIndex(), cell.getData(), this);
+								}, width:50, headerSort:false, headerVisible:false },
+						],
+					},
 				],
 				layout: 'fitDataFill',
 				layoutColumnsOnNewData:	false,
 				height:	'auto',
 				selectable:	true,
-				index: 'kontakt_id',
+				index: 'kontakt_id'
 			},
 			tabulatorEvents: [
-				/*				{
-									event: 'rowSelectionChanged',
-									handler: this.rowSelectionChanged
-								},
-								{
-									event: 'dataProcessed',
-									handler: this.autoSelectRows
-								}*/
 			],
-			lastSelected: null
+			lastSelected: null,
+			contactData: {
+				zustellung: true,
+				kontakttyp: 'email'
+			},
+			kontakttypen: [],
+			standorte: [],
+			selectedStandort: null,
+			filteredStandorte: null
 		}
 	},
 	methods:{
-		actionNewAdress(){
+		actionNewContact(){
 			console.log("Neuen Kontakt anlegen");
+			bootstrap.Modal.getOrCreateInstance(this.$refs.newContactModal).show();
 		},
-		updateUrl(url, first) {
-			this.lastSelected = first ? undefined : this.selected;
-			if (url)
-				url = CoreRESTClient._generateRouterURI(url);
-			if (!this.$refs.table.tableBuilt)
-				this.$refs.table.tabulator.on("tableBuilt", () => {
-					this.$refs.table.tabulator.setData(url);
+		actionEditContact(contact_id){
+			console.log("Edit Contact mit contact_id " + contact_id);
+			this.loadContact(contact_id);
+			bootstrap.Modal.getOrCreateInstance(this.$refs.editContactModal).show();
+
+		},
+		actionDeleteContact(contact_id){
+			console.log("Delete Contact " + contact_id);
+			this.loadContact(contact_id);
+			bootstrap.Modal.getOrCreateInstance(this.$refs.deleteContactModal).show();
+		},
+		addNewContact(formData) {
+			CoreRESTClient.post('components/stv/Kontakt/addNewContact/' + this.uid,
+				this.contactData
+			).then(response => {
+				console.log(response);
+				if (!response.data.error) {
+					this.$fhcAlert.alertSuccess('Speichern erfolgreich');
+					this.hideModal("newContactModal");
+				} else {
+					const errorData = response.data.retval;
+					Object.entries(errorData).forEach(entry => {
+						const [key, value] = entry;
+						console.log(key, value);
+						this.$fhcAlert.alertError(value);
+					});
+				}
+			}).catch(error => {
+				console.log(error);
+				this.statusCode = 0;
+				this.statusMsg = 'Error in Catch';
+				console.log('Speichern nicht erfolgreich ' + this.statusMsg);
+				this.$fhcAlert.alertError('Fehler bei Speicherroutine aufgetreten');
+			}).finally(() => {
+				window.scrollTo(0, 0);
+				this.reload();
+			});
+		},
+		loadContact(contact_id){
+			return CoreRESTClient.get('components/stv/Kontakt/loadContact/' + contact_id
+			).then(
+				result => {
+					console.log(this.contactData, result);
+					if(result.data.retval)
+						this.contactData = result.data.retval;
+					else
+					{
+						this.contactData = {};
+						this.$fhcAlert.alertError('Kein Kontakt mit Id ' + contact_id + ' gefunden');
+					}
+
+					return result;
+				}
+			);
+		},
+		deleteContact(kontakt_id){
+			CoreRESTClient.post('components/stv/Kontakt/deleteContact/' + kontakt_id)
+				.then(response => {
+					console.log(response);
+					if (!response.data.error) {
+						this.statusCode = 0;
+						this.statusMsg = 'success';
+						console.log('Löschen erfolgreich: ' + this.statusMsg);
+						this.$fhcAlert.alertSuccess('Löschen erfolgreich');
+					} else {
+						this.statusCode = 0;
+						this.statusMsg = 'Error';
+						console.log('Löschen nicht erfolgreich: ' + this.statusMsg);
+						this.$fhcAlert.alertError('Keine Adresse mit Id ' + kontakt_id + ' gefunden');
+					}
+				}).catch(error => {
+				console.log(error);
+				this.statusCode = 0;
+				this.statusMsg = 'Error in Catch';
+				console.log('Löschen nicht erfolgreich ' + this.statusMsg);
+				this.$fhcAlert.alertError('Fehler bei Löschroutine aufgetreten');
+			}).finally(()=> {
+				window.scrollTo(0, 0);
+				this.hideModal('deleteContactModal');
+				this.reload();
+			});
+		},
+		updateContact(kontakt_id){
+			CoreRESTClient.post('components/stv/Kontakt/updateContact/' + kontakt_id,
+				this.contactData
+			).then(response => {
+				console.log(response);
+				if (!response.data.error) {
+					this.statusCode = 0;
+					this.statusMsg = 'success';
+					console.log('Speichern erfolgreich: ' + this.statusMsg);
+					this.$fhcAlert.alertSuccess('Speichern erfolgreich');
+					this.hideModal('editContactModal');
+					this.reload();
+				} else {
+					const errorData = response.data.retval;
+					Object.entries(errorData).forEach(entry => {
+						const [key, value] = entry;
+						console.log(key, value);
+						this.$fhcAlert.alertError(value);
+					});
+				}
+			}).catch(error => {
+				console.log(error);
+				this.statusCode = 0;
+				this.statusMsg = 'Error in Catch';
+				console.log('Speichern nicht erfolgreich ' + this.statusMsg);
+				this.$fhcAlert.alertError('Fehler bei Speicherroutine aufgetreten');
+			}).finally(() => {
+				window.scrollTo(0, 0);
+				//hideModal();
+				this.reload();
+			});
+		},
+		hideModal(modalRef){
+			bootstrap.Modal.getOrCreateInstance(this.$refs[modalRef]).hide();
+		},
+		reload(){
+			this.$refs.table.reloadTable();
+		},
+		search(event) {
+			return CoreRESTClient
+				.get('components/stv/Kontakt/getStandorte/' + event.query)
+				.then(result => {
+					this.filteredStandorte = CoreRESTClient.getData(result.data);
 				});
-			else
-				this.$refs.table.tabulator.setData(url);
-		}
+		},
+	},
+	created(){
+		CoreRESTClient
+			.get('components/stv/Kontakt/getKontakttypen')
+			.then(result => {
+				this.kontakttypen = result.data;
+			})
+			.catch(err => {
+				console.error(err.response.data || err.message);
+			});
 	},
 	template: `	
 		<div class="stv-list h-100 pt-3">
+		
+		<!--Modal: new Contact-->
+			<div ref="newContactModal" class="modal fade" id="newAContactModal" tabindex="-1" aria-labelledby="newAContactModalLabel" aria-hidden="true">
+			  <div class="modal-dialog">
+				<div class="modal-content">
+				  <div class="modal-header">
+					<h5 class="modal-title" id="newContactModalLabel">Details</h5>
+					<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+				  </div>
+				  <div class="modal-body">
+					<form  ref="contactData">
+					{{contactData}}							
+						<div class="row mb-3">
+							<label for="kontakttyp" class="form-label col-sm-4">Typ</label>
+							<div class="col-sm-5">
+								<select id="kontakttyp" class="form-control" v-model="contactData.kontakttyp">
+									<option value="">-- keine Auswahl --</option>
+									<option v-for="typ in kontakttypen" :key="typ.kontakttyp_kurzbz" :value="typ.kontakttyp" >{{typ.kontakttyp}}</option>
+								</select>
+							</div>
+						</div>
+						<div class="row mb-3">											   
+							<label for="kontakt" class="form-label col-sm-4">Kontakt</label>
+							<div class="col-sm-3">
+								<input type="text" :readonly="readonly" class="form-control-sm" id="kontakt" v-model="contactData['kontakt']">
+							</div>
+						</div>	
+						<div class="row mb-3">											   
+							<label for="anmerkung" class="form-label col-sm-4">Anmerkung</label>
+							<div class="col-sm-3">
+								<input type="text" :readonly="readonly" class="form-control-sm" id="anmerkung" v-model="contactData['anmerkung']">
+							</div>
+						</div>	
+						
+						<div class="row mb-3">
+							<label for="zustellung" class="form-label col-sm-4">Zustellung</label>
+							<div class="col-sm-3 align-self-center">
+								<div class="form-check">	
+									<input id="zustellung" type="checkbox" class="form-check-input" value="1" v-model="contactData['zustellung']">
+								</div>
+							</div>
+						</div>	
+							
+						<div class="row mb-3">
+							<label for="firma_name" class="form-label col-sm-4">Firma / Standort</label>
+								<div class="col-sm-3">
+									<PvAutoComplete v-model="contactData['standort']" optionLabel="kurzbz" :suggestions="filteredStandorte" @complete="search" minLength="3"/>
+								</div>	
+						</div>		
+																						   
+					</form>  
+								
+				  </div>
+				  <div class="modal-footer">
+					<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
+					<button type="button" class="btn btn-primary" @click="addNewContact()">OK</button>
+				  </div>
+				</div>
+			  </div>
+			</div>
+				
+			<!--Modal: Edit Contact-->
+			<div ref="editContactModal" class="modal fade" id="editContactModal" tabindex="-1" aria-labelledby="editContactModalLabel" aria-hidden="true">
+			  <div class="modal-dialog">
+				<div class="modal-content">
+				  <div class="modal-header">
+					<h5 class="modal-title" id="editContactModalLabel">Kontakt bearbeiten</h5>
+					<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+				  </div>
+				  <div class="modal-body">
+						<form ref="contactData">{{contactData}} 
+													
+							<div class="row mb-3">
+								<label for="kontakttyp" class="form-label col-sm-4">Typ</label>
+								<div class="col-sm-5">
+									<select id="kontakttyp" class="form-control" v-model="contactData.kontakttyp">
+										<option value="">-- keine Auswahl --</option>
+										<option v-for="typ in kontakttypen" :key="typ.kontakttyp_kurzbz" :value="typ.kontakttyp" >{{typ.kontakttyp}}</option>
+									</select>
+								</div>
+							</div>
+							<div class="row mb-3">											   
+								<label for="kontakt" class="form-label col-sm-4">Kontakt</label>
+								<div class="col-sm-3">
+									<input type="text" :readonly="readonly" class="form-control-sm" id="kontakt" v-model="contactData['kontakt']">
+								</div>
+							</div>	
+							<div class="row mb-3">											   
+								<label for="anmerkung" class="form-label col-sm-4">Anmerkung</label>
+								<div class="col-sm-3">
+									<input type="text" :readonly="readonly" class="form-control-sm" id="anmerkung" v-model="contactData['anmerkung']">
+								</div>
+							</div>	
+							
+							<div class="row mb-3">
+								<label for="zustellung" class="form-label col-sm-4">Zustellung</label>
+								<div class="col-sm-3 align-self-center">
+									<div class="form-check">	
+										<input id="zustellung" type="checkbox" class="form-check-input" value="1" v-model="contactData['zustellung']">
+									</div>
+								</div>
+							</div>	
+							
+							<div class="row mb-3">					
+								<input type="text" :readonly="readonly" class="form-control-sm" id="standort_id" v-model="contactData.standort_id">
+							</div>
+							
+<!--							<div class="row mb-3">											   
+								<label for="name" class="form-label col-sm-4">Firma/Standort</label>
+								<div class="col-sm-2">
+									<input type="text" :readonly="readonly" class="form-control-sm" id="name" v-model="addressData['name']">
+								</div>
+							</div>	-->
+							
+							<div class="row mb-3">
+								<label for="standort" class="form-label col-sm-4">Firma / Standort</label>
+									<div v-if="contactData.kurzbz" class="col-sm-3">
+										<input type="text" :readonly="readonly" class="form-control-sm" id="name" v-model="contactData.kurzbz">
+									</div>					
+									<div v-else class="col-sm-3">
+										<PvAutoComplete v-model="contactData['standort']" optionLabel="kurzbz" :suggestions="filteredStandorte" @complete="search" minLength="3"/>
+									</div>	
+							</div>																					   
+					</form>  
+								
+				  </div>
+				  <div class="modal-footer">
+					<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
+					<button ref="Close" type="button" class="btn btn-primary" @click="updateContact(contactData.kontakt_id)">OK</button>
+	
+				  </div>
+				</div>
+			  </div>
+			</div>
+				
+			<!--		Modal: Delete Contact-->
+			<div ref="deleteContactModal" class="modal fade" id="deleteContactModal" tabindex="-1" aria-labelledby="deleteContactModalLabel" aria-hidden="true">
+			  <div class="modal-dialog">
+				<div class="modal-content">
+				  <div class="modal-header">
+					<h5 class="modal-title" id="deleteContactModalLabel">Kontakt löschen</h5>
+					<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+				  </div>
+				  <div class="modal-body">	  
+					<p>Kontakt {{contactData.kontakt_id}} wirklich löschen?</p>											
+				  </div>
+				  <div class="modal-footer">
+					<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
+					<button type="button" class="btn btn-primary" @click="deleteContact(contactData.kontakt_id)">OK</button>
+				  </div>
+				</div>
+			  </div>
+			</div>
+				
 			<core-filter-cmpt
 				ref="table"
 				:tabulator-options="tabulatorOptions"

From 0e813f78fbc83f706ea008cac71656f61d41e380 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Wed, 22 Nov 2023 09:51:49 +0100
Subject: [PATCH 0173/1461] updates the foto_sperre_function to automatically
 update the data of the vue component

---
 application/controllers/Cis/Profil.php    |  95 ++++++++++++----
 application/views/Cis/Profil.php          |   3 +-
 public/js/apps/api/userdata.js            |   5 +
 public/js/components/Cis/Profil/Profil.js | 126 ++++++++++++++++++----
 4 files changed, 186 insertions(+), 43 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index a45edcab2..ef15d830c 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -18,6 +18,9 @@ class Profil extends Auth_Controller
 			'index' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
 			'isMitarbeiterOrStudent' => ['student/anrechnung_beantragen:r','user:r'],
 			'getMitarbeiterAnsicht' => ['student/anrechnung_beantragen:r','user:r'],
+			'foto_sperre_function' => ['student/anrechnung_beantragen:r','user:r'],
+			
+			
 			
 		]);
 		$this->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
@@ -52,8 +55,32 @@ class Profil extends Auth_Controller
 
 	public function getMitarbeiterAnsicht(){
 
+		if(
+			isSuccess($this->PersonModel->addSelect('gruppe_kurzbz, beschreibung'))&&
+			isSuccess($this->PersonModel->addJoin('tbl_benutzer', 'person_id')) && 
+		isSuccess($this->PersonModel->addJoin('tbl_benutzergruppe', 'uid')) &&
+		isSuccess($this->PersonModel->addJoin('tbl_gruppe', 'gruppe_kurzbz'))){
 
-		
+			$mailverteiler_res = $this->PersonModel->loadWhere(array('mailgrp' => true, 'uid'=>getAuthUID()));
+			if( isError($mailverteiler_res)){
+				// catch error
+			}
+			$mailverteiler_res = hasData($mailverteiler_res)? getData($mailverteiler_res) : null;
+		}
+
+		if(isSuccess($this->KontaktModel->addSelect('DISTINCT ON (kontakttyp) kontakttyp, kontakt, tbl_kontakt.anmerkung, tbl_kontakt.zustellung')) &&
+		isSuccess($this->KontaktModel->addJoin('public.tbl_standort', 'standort_id', 'LEFT')) &&
+		isSuccess($this->KontaktModel->addJoin('public.tbl_firma', 'firma_id', 'LEFT'))&&
+		isSuccess($this->KontaktModel->addOrder('kontakttyp, kontakt, tbl_kontakt.updateamum, tbl_kontakt.insertamum'))
+		){
+			$kontakte_res = $this->KontaktModel->loadWhere(array('person_id' => getAuthPersonID()));
+			if(isError($kontakte_res)){
+				// handle error	
+			}else{
+				$kontakte_res = hasData($kontakte_res)? getData($kontakte_res) : null;
+			}
+			
+		}
 
 		$zutrittskarte_ausgegebenam = $this->BetriebsmittelpersonModel->getBetriebsmittel(getAuthPersonId());
 		if(isError($zutrittskarte_ausgegebenam)){
@@ -64,6 +91,7 @@ class Profil extends Auth_Controller
 
 		if(
 			isSuccess($this->BetriebsmittelpersonModel->addSelect(["betriebsmitteltyp", "beschreibung","nummer","ausgegebenam"]))
+			
 		){
 			$betriebsmittelperson_res = $this->BetriebsmittelpersonModel->getBetriebsmittel(getAuthPersonId());
 			if(isError($betriebsmittelperson_res)){
@@ -74,10 +102,11 @@ class Profil extends Auth_Controller
 		   }
 
 		if(
-		 isSuccess($this->BenutzerfunktionModel->addSelect(["tbl_benutzerfunktion.bezeichnung as bf_bezeichnung","tbl_organisationseinheit.bezeichnung as oe_bezeichnung","datum_von","datum_bis","wochenstunden"]))
-	  	 && isSuccess($this->BenutzerfunktionModel->addJoin("tbl_organisationseinheit","oe_kurzbz"))
+			//! Summe der Wochenstunden wird jetzt in der hr/tbl_dienstverhaeltnis gespeichert
+		 isSuccess($this->BenutzerfunktionModel->addSelect(["tbl_benutzerfunktion.bezeichnung as bf_bezeichnung","tbl_organisationseinheit.bezeichnung as oe_bezeichnung","datum_von","datum_bis","wochenstunden"]))&&
+	  	  isSuccess($this->BenutzerfunktionModel->addJoin("tbl_organisationseinheit","oe_kurzbz"))
 		){
-			$benutzer_funktion_res = $this->BenutzerfunktionModel->loadWhere("uid='" . getAuthUID() . "'");
+			$benutzer_funktion_res = $this->BenutzerfunktionModel->loadWhere(array('uid'=>getAuthUID()));
 			if(isError($benutzer_funktion_res)){
 				// error handling
 			}else{
@@ -85,12 +114,19 @@ class Profil extends Auth_Controller
 			}
 		}
 
-		//! THERE COULD BE MULTIPLE ADRESSES
-		$adresse_res = $this->AdresseModel->load(getAuthPersonId());
-		if(isError($adresse_res)){
-			// error handling
-		}else{										//! not only one
-			$adresse_res = hasData($adresse_res)? getData($adresse_res)[0] : null;
+
+		if(
+			isSuccess($adresse_res = $this->AdresseModel->addSelect(array("strasse","tbl_adressentyp.bezeichnung as adr_typ","plz","ort")))&&
+			isSuccess($adresse_res = $this->AdresseModel->addOrder("zustelladresse","DESC"))&&
+			isSuccess($adresse_res = $this->AdresseModel->addOrder("sort"))&&
+			isSuccess($adresse_res = $this->AdresseModel->addJoin("tbl_adressentyp","typ=adressentyp_kurzbz"))
+		){
+			$adresse_res = $this->AdresseModel->loadWhere(array("person_id"=>getAuthPersonID()));
+			if(isError($adresse_res)){
+				// error handling
+			}else{									
+				$adresse_res = hasData($adresse_res)? getData($adresse_res) : null;
+			}
 		}
 
 		$benutzer_res = $this->BenutzerModel->load([getAuthUID()]);
@@ -134,26 +170,20 @@ class Profil extends Auth_Controller
 		$res->email_intern = getAuthUID() . DOMAIN;
 		$res->email_extern = $benutzer_res->alias . DOMAIN;
 		//? Adresse Info 
-		$res->strasse = $adresse_res->strasse;
-		$res->heimatadresse = $adresse_res->heimatadresse;
-		$res->zustelladresse = $adresse_res->zustelladresse;
-		$res->plz = $adresse_res->plz;
-		$res->ort = $adresse_res->ort;
+		$res->adressen = $adresse_res;
 		//? Benutzerfunktion Info
 		$res->funktionen = $benutzer_funktion_res;
 		//? Betriebsmittel Info
 		$res->mittel = $betriebsmittelperson_res;
+		//? Austellungsdatum von der Zutrittskarte
 		$res->zutrittskarte_ausgegebenam = $zutrittskarte_ausgegebenam->ausgegebenam;
-		$res->kontakt = $kontakte;
-		
-		
+		//? Kontakt Info
+		$res->kontakte = $kontakte_res;
+		//? Mailverteiler Info
+		$res->mailverteiler = $mailverteiler_res;
 		
 		echo json_encode($res);
 		
-		return;
-		
-		
-		
 	}
 
 	//? check wheter the parameter uid is a Mitarbeiter or a Student
@@ -170,6 +200,27 @@ class Profil extends Auth_Controller
 		
 	}
 
+	public function foto_sperre_function($value){
+		$res = $this->PersonModel->update(getAuthPersonID(),array("foto_sperre"=>$value));
+		if(isError($res)){
+			// error handling
+		}else{
+			//? select the value of the column foto_sperre to return 
+			if(isSuccess($this->PersonModel->addSelect("foto_sperre"))){
+				$res = $this->PersonModel->load(getAuthPersonID());
+				if(isError($res)){
+					// error handling
+				}
+				$res = hasData($res) ? getData($res)[0] : null;
+			}
+			
+		}
+		echo json_encode($res);
+	}
+
+
+	
+
 	
 
 	
diff --git a/application/views/Cis/Profil.php b/application/views/Cis/Profil.php
index 7be2cc0cc..4feb98ec4 100644
--- a/application/views/Cis/Profil.php
+++ b/application/views/Cis/Profil.php
@@ -9,7 +9,8 @@ $this->load->view('templates/CISHTML-Header', $includesArray);
 ?>
 
 <div id="content">
-	<h2>Profil22</h2>
+	<h2>Profil</h2>
+	
 	<hr>
 	<p><?php echo $uid; ?></p>
 	<!-- we can pass information from the php view file to the public js file through interpolating data from php into vue props -->
diff --git a/public/js/apps/api/userdata.js b/public/js/apps/api/userdata.js
index 2c72e9618..cd701a2d1 100644
--- a/public/js/apps/api/userdata.js
+++ b/public/js/apps/api/userdata.js
@@ -15,6 +15,11 @@ export default {
                   + `cis.php/Cis/Profil/getMitarbeiterAnsicht`;
         return axios.get(url);
     },
+    sperre_foto_function: function(value) {
+        const url = FHC_JS_DATA_STORAGE_OBJECT.app_root 
+                  + `cis.php/Cis/Profil/foto_sperre_function/${value}`;
+        return axios.get(url);
+    },
     
  
 };
\ No newline at end of file
diff --git a/public/js/components/Cis/Profil/Profil.js b/public/js/components/Cis/Profil/Profil.js
index a4c7a91dd..3b1ca8e03 100644
--- a/public/js/components/Cis/Profil/Profil.js
+++ b/public/js/components/Cis/Profil/Profil.js
@@ -1,6 +1,6 @@
 
 import fhcapifactory from "../../../apps/api/fhcapifactory.js";
-
+//"<ul><li v-for='element in wert'>{{element}}</li></ul>"
 
 export default {
     
@@ -15,14 +15,69 @@ export default {
     //? this props were passed in the Profil.php view file
     props:['uid','pid'],
     methods: {
+        concatenate_addresses(address_array){
+            let result = "";
+            for (let i = 0; i < address_array.length; i++) {
+                result += address_array[i].strasse + " " + address_array[i].plz + " " + address_array[i].ort + "\n";
+            }
+            return result;
+        },
+        render_unterelement(wert,bezeichnung){
+            if (isArray(bezeichnung)){
+                
+            }
+        },
+        concatenate_kontakte(kontakt_array){
+            let result = "";
+            for (let i = 0; i < kontakt_array.length; i++) {
+                result += kontakt_array[i].kontakttyp + " " + kontakt_array[i].kontakt + " " + kontakt_array[i].zustellung + "\n";
+            }
+            return result;
+        },
+        sperre_foto_function(value){
+            fhcapifactory.UserData.sperre_foto_function(value).then(res => {
+                console.log(res.data);
+                if(res.data){
+                    
+                    this.person_info.foto_sperre = res.data.foto_sperre;
+                }
+            });
+            
+        },
         
     },
     computed:{
-        computed_placeholder(){
-            return {
-                //
+        
+        get_image_base64_src(){
+            return "data:image/jpeg;base64,"+this.person_info.foto;
+        },
+        first_col(){
+            //! postnomen is still missing
+           return {
+                Username:this.uid,
+                Anrede:this.person_info.anrede,
+                Titel:(this.person_info.titelpre&&this.person_info.titelpost)?this.person_info.titelpre.concat(this.person_info.titelpost):"null",
+                Vorname:this.person_info.vorname,
+                Nachname:this.person_info.nachname,
+                Postnomen:null,
+                Geburtsdatum:this.person_info.gebdatum,
+                Geburtsort: this.person_info.gebort,
+                Adresse: this.person_info.adressen,
+                Kurzzeichen: this.person_info.kurzbz,
+                Telefon: this.person_info.telefonklappe,
             };
         },
+        second_col(){
+            //! postnomen is still missing
+           return {
+                Intern:this.person_info.email_intern,
+                Alias:this.person_info.email_extern,
+                Kontakte:this.person_info.kontakte,
+            };
+        },
+
+        
+        
         
     },
     created(){
@@ -33,24 +88,55 @@ export default {
     },
      
     template: `
-            <div>
-            <h1>test</h1>
-            <p>{{"here is the uid "+uid}} </p>
-            <p>{{"here is the pid "+pid}} </p>
-            <!--
-            //! printing 2 computed functions
-            //* one to output the collected need information for the cis page
-            //* and the other returns all the information retrieved from the model without the foto data
-            
-            <pre style="color:blue">{{JSON.stringify(cis_profil_info,null,2)}}</pre>
-            <pre style="color:purple">{{JSON.stringify(cis_profil_info_no_foto,null,2)}}</pre>
-            
-            <br/>
-            <pre style="color:red">{{JSON.stringify(person)}}</pre>
-            -->
+    
+    <p v-for="element in person_info.funktionen"><span v-for="(wert,bezeichnung) in element">{{wert + ": " + bezeichnung}}</span></p>
+    <p>{{JSON.stringify(first_col)}}</p>
+    <p>{{"here is the uid "+uid}} </p>
+    <p>{{"here is the pid "+pid}} </p>
+            <div :class={'container':true}>
+            <div :class={'row':true}>
+            <div :class={'col':true}>
+            <img :src="get_image_base64_src"></img>
+            <div v-if="person_info.foto_sperre">
+            <p style="margin:0">Profilfoto gesperrt</p>
+            <a href="#" @click.prevent="sperre_foto_function(false)">Sperre des Profilfotos aufheben</a>
+            </div>
+            <a href="#" @click.prevent="sperre_foto_function(true)" style="display:block"  v-else>Profilfoto sperren</a>
             
             
-            <p>test</p>
+            </div>
+            <div :class={'col':true}>
+            
+           
+            <ol style="list-style:none">
+            <li  v-for="(wert,bezeichnung) in first_col">
+            
+            <p v-for="element in wert" v-if="typeof wert == 'object' && bezeichnung=='Adresse'">{{element.strasse +" "+element.adr_typ+" " + element.plz+" "+element.ort}}</p>
+           
+            <p v-else>{{bezeichnung +": " +wert}}</p>
+            </li>
+            </ol>
+            </div>
+            <div :class={'col':true}>
+            <ol style="list-style:none">
+            <!--render_unterelement(wert,bezeichnung)-->
+            <li v-for="(wert,bezeichnung) in second_col">
+            
+            <p v-for="element in wert" v-if="typeof wert === 'object' && bezeichnung=='Kontakte'">
+            {{element.kontakttyp + "  " + element.kontakt+"  " }}
+            <i v-if="element.zustellung" class="fa-solid fa-check"></i>
+            <i v-else="element.zustellung" class="fa-solid fa-xmark"></i>
+            
+            </p>
+            
+            <p v-else >{{bezeichnung +": "+wert}}</p>
+            
+            </li>
+            </ol>
+
+
+            </div>
+            </div>
             </div>
     `,
 };
\ No newline at end of file

From cc52a9a28ba4c7a256dec186459f99c4002cb88c Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 22 Nov 2023 11:24:27 +0100
Subject: [PATCH 0174/1461] update search

---
 application/models/organisation/Standort_model.php | 6 +++++-
 application/models/ressource/Firma_model.php       | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/application/models/organisation/Standort_model.php b/application/models/organisation/Standort_model.php
index 7d31ecdcd..03a06ffae 100644
--- a/application/models/organisation/Standort_model.php
+++ b/application/models/organisation/Standort_model.php
@@ -14,13 +14,17 @@ class Standort_model extends DB_Model
 
 	public function searchStandorte($filter)
 	{
+		$filter = strtoLower($filter);
 		$qry = "
 			SELECT 
 				s.kurzbz, s.standort_id
 			FROM 
 			    public.tbl_standort s
 			WHERE 
-			    lower (s.kurzbz) LIKE '%". $this->db->escape_like_str($filter)."%'";
+			    lower (s.kurzbz) LIKE '%". $this->db->escape_like_str($filter)."%'
+			OR
+				lower (s.bezeichnung) LIKE '%". $this->db->escape_like_str($filter)."%'";
+
 
 		return $this->execQuery($qry);
 	}
diff --git a/application/models/ressource/Firma_model.php b/application/models/ressource/Firma_model.php
index 1d1b923e3..431f0815f 100644
--- a/application/models/ressource/Firma_model.php
+++ b/application/models/ressource/Firma_model.php
@@ -14,6 +14,7 @@ class Firma_model extends DB_Model
 
 	public function searchFirmen($filter)
 	{
+		$filter = strtoLower($filter);
 		$qry = "
 			SELECT 
 				f.name, f.firma_id

From f7d1f459ca5e7facf8fdae2de3a5c2f539b05db8 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 22 Nov 2023 12:49:16 +0100
Subject: [PATCH 0175/1461] reset Modals

---
 .../Details/Kontakt/Address.js                | 14 +++++++++
 .../Details/Kontakt/Bankaccount.js            | 29 +++++++++++--------
 .../Details/Kontakt/Contact.js                | 21 ++++++++++----
 3 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
index 365d0a028..13858c31f 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
@@ -84,6 +84,13 @@ export default{
 				typ: 'h',
 				nation: 'A'
 			},
+			initData: {
+				zustelladresse: true,
+				heimatadresse: true,
+				rechnungsadresse: false,
+				typ: 'h',
+				nation: 'A'
+			},
 			nations: [],
 			adressentypen: [],
 			firmen: [],
@@ -121,6 +128,7 @@ export default{
 				if (!response.data.error) {
 					this.$fhcAlert.alertSuccess('Speichern erfolgreich');
 					this.hideModal('newAdressModal');
+					this.resetModal();
 				} else {
 					const errorData = response.data.retval;
 					Object.entries(errorData).forEach(entry => {
@@ -168,6 +176,7 @@ export default{
 				if (!response.data.error) {
 					this.$fhcAlert.alertSuccess('Speichern erfolgreich');
 					this.hideModal('editAdressModal');
+					this.resetModal();
 				} else {
 					const errorData = response.data.retval;
 					Object.entries(errorData).forEach(entry => {
@@ -258,6 +267,11 @@ export default{
 		hideModal(modalRef){
 			bootstrap.Modal.getOrCreateInstance(this.$refs[modalRef]).hide();
 		},
+		resetModal(){
+			this.formData = {};
+			this.formData = this.initData;
+			this.addressData = {};
+		},
 	},
 	created(){
 		CoreRESTClient
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
index b754f855d..f7e1016c9 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
@@ -73,7 +73,12 @@ export default{
 			tabulatorEvents: [],
 			lastSelected: null,
 			bankverbindungData: {
-				verrechnung: true
+				verrechnung: true,
+				typ: 'p'
+			},
+			initData: {
+				verrechnung: true,
+				typ: 'p'
 			}
 		}
 	},
@@ -100,7 +105,7 @@ export default{
 				if (!response.data.error) {
 					this.$fhcAlert.alertSuccess('Speichern erfolgreich');
 					this.hideModal('newBankverbindungModal');
-					this.reload();
+					this.resetModal();
 				} else {
 					//console.log(response.data.retval);
 					const errorData = response.data.retval;
@@ -120,6 +125,7 @@ export default{
 				this.$fhcAlert.alertError('Fehler bei Speicherroutine aufgetreten');
 			}).finally(() => {
 				window.scrollTo(0, 0);
+				this.reload();
 			});
 		},
 		loadBankverbindung(bankverbindung_id){
@@ -148,7 +154,7 @@ export default{
 				if (!response.data.error) {
 					this.$fhcAlert.alertSuccess('Speichern erfolgreich');
 					this.hideModal('editBankverbindungModal');
-					this.reload();
+					this.resetModal();
 				} else {
 					const errorData = response.data.retval;
 					console.log(errorData);
@@ -163,6 +169,7 @@ export default{
 				this.$fhcAlert.alertError('Fehler bei Speicherroutine aufgetreten');
 			}).finally(() => {
 				window.scrollTo(0, 0);
+				this.reload();
 			});
 		},
 		deleteBankverbindung(bankverbindung_id){
@@ -188,17 +195,15 @@ export default{
 		reload(){
 			this.$refs.table.reloadTable();
 		},
-		resetData(){ //Todo(manu) check
-			bankverbindungData: [];
-		}
+		resetModal(){
+			this.bankverbindungData = {};
+			this.bankverbindungData = this.initData;
+		},
 	},
 	template: `	
 		<div class="stv-list h-100 pt-3">
 		
-<!--			<button type="button" class="btn btn btn-outline-warning" class="col-sm-2" @click="actionDeleteBankverbindung(8796)">delete 8796</button>
-			<button type="button" class="btn btn btn-outline-warning" class="col-sm-2" @click="actionEditBankverbindung(8796)">edit 8796</button>
-			<button type="button" class="btn btn btn-outline-warning" class="col-sm-2" @click="reload">reload</button>-->
-		
+
 		<!--Modal: new Bankverbindung-->
 			<div ref="newBankverbindungModal" class="modal fade" id="newBankverbindungModal" tabindex="-1" aria-labelledby="newBankverbindungModalLabel" aria-hidden="true">
 			  <div class="modal-dialog">
@@ -282,7 +287,7 @@ export default{
 				<div class="modal-content">
 				  <div class="modal-header">
 					<h5 class="modal-title" id="editBankverbindungModalLabel">Bankverbindung bearbeiten</h5>
-					<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+					<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close" @click="resetModal"></button>
 				  </div>
 				  <div class="modal-body">
 						<form ref="bankverbindungData">
@@ -347,7 +352,7 @@ export default{
 								
 				  </div>
 				  <div class="modal-footer">
-					<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
+					<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">Abbrechen</button>
 					<button ref="Close" type="button" class="btn btn-primary" @click="updateBankverbindung(bankverbindungData.bankverbindung_id)">OK</button>
 	
 				  </div>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
index 47bb1c147..6bf4768a7 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
@@ -67,6 +67,10 @@ export default{
 				zustellung: true,
 				kontakttyp: 'email'
 			},
+			initData: {
+				zustellung: true,
+				kontakttyp: 'email'
+			},
 			kontakttypen: [],
 			standorte: [],
 			selectedStandort: null,
@@ -97,6 +101,7 @@ export default{
 				if (!response.data.error) {
 					this.$fhcAlert.alertSuccess('Speichern erfolgreich');
 					this.hideModal("newContactModal");
+					this.resetModal();
 				} else {
 					const errorData = response.data.retval;
 					Object.entries(errorData).forEach(entry => {
@@ -171,6 +176,7 @@ export default{
 					console.log('Speichern erfolgreich: ' + this.statusMsg);
 					this.$fhcAlert.alertSuccess('Speichern erfolgreich');
 					this.hideModal('editContactModal');
+					this.resetModal();
 					this.reload();
 				} else {
 					const errorData = response.data.retval;
@@ -205,6 +211,10 @@ export default{
 					this.filteredStandorte = CoreRESTClient.getData(result.data);
 				});
 		},
+		resetModal(){
+			this.contactData = {};
+			this.contactData = this.initData;
+		},
 	},
 	created(){
 		CoreRESTClient
@@ -228,8 +238,7 @@ export default{
 					<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
 				  </div>
 				  <div class="modal-body">
-					<form  ref="contactData">
-					{{contactData}}							
+					<form  ref="contactData">						
 						<div class="row mb-3">
 							<label for="kontakttyp" class="form-label col-sm-4">Typ</label>
 							<div class="col-sm-5">
@@ -285,10 +294,10 @@ export default{
 				<div class="modal-content">
 				  <div class="modal-header">
 					<h5 class="modal-title" id="editContactModalLabel">Kontakt bearbeiten</h5>
-					<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+					<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close" @click="resetModal"></button>
 				  </div>
 				  <div class="modal-body">
-						<form ref="contactData">{{contactData}} 
+						<form ref="contactData">
 													
 							<div class="row mb-3">
 								<label for="kontakttyp" class="form-label col-sm-4">Typ</label>
@@ -322,7 +331,7 @@ export default{
 							</div>	
 							
 							<div class="row mb-3">					
-								<input type="text" :readonly="readonly" class="form-control-sm" id="standort_id" v-model="contactData.standort_id">
+								<input type="hidden" :readonly="readonly" class="form-control-sm" id="standort_id" v-model="contactData.standort_id">
 							</div>
 							
 <!--							<div class="row mb-3">											   
@@ -345,7 +354,7 @@ export default{
 								
 				  </div>
 				  <div class="modal-footer">
-					<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
+					<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">Abbrechen</button>
 					<button ref="Close" type="button" class="btn btn-primary" @click="updateContact(contactData.kontakt_id)">OK</button>
 	
 				  </div>

From 36743153058c5b865bf64f33ba1444947dbf540f Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 22 Nov 2023 13:33:19 +0100
Subject: [PATCH 0176/1461] =?UTF-8?q?update=20speichern/l=C3=B6schen=20aut?=
 =?UTF-8?q?ocomplete?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controllers/components/stv/Kontakt.php    | 32 ++++++++++++-------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/application/controllers/components/stv/Kontakt.php b/application/controllers/components/stv/Kontakt.php
index 9a7919c9e..b4e7385aa 100644
--- a/application/controllers/components/stv/Kontakt.php
+++ b/application/controllers/components/stv/Kontakt.php
@@ -127,27 +127,37 @@ class Kontakt extends FHC_Controller
 			$firma_id = $_POST['firma']['firma_id'];
 		}
 		else
-			$firma_id = $_POST['firma_id'];
+			$firma_id = null;
+
+		$person_id = isset($_POST['person_id']) ? $_POST['person_id'] : null;
+		$co_name = isset($_POST['co_name']) ? $_POST['co_name'] : null;
+		$strasse = isset($_POST['strasse']) ? $_POST['strasse'] : null;
+		$ort = isset($_POST['ort']) ? $_POST['ort'] : null;
+		$gemeinde = isset($_POST['gemeinde']) ? $_POST['gemeinde'] : null;
+		$nation = isset($_POST['nation']) ? $_POST['nation'] : null;
+		$name = isset($_POST['name']) ? $_POST['name'] : null;
+		$typ = isset($_POST['typ']) ? $_POST['typ'] : null;
+		$anmerkung = isset($_POST['anmerkung']) ? $_POST['anmerkung'] : null;
 
 		$result = $this->AdresseModel->update([
 			'adresse_id' => $address_id
 		],
-			[	'person_id' => $_POST['person_id'],
-				'strasse' =>  $_POST['strasse'],
+			[	'person_id' => $person_id,
+				'strasse' =>  $strasse,
 				'updatevon' => 'uid',
 				'updateamum' => date('c'),
 				'plz' => $_POST['plz'],
-				'ort' => $_POST['ort'],
-				'gemeinde' => $_POST['gemeinde'],
-				'nation' => $_POST['nation'],
+				'ort' => $ort,
+				'gemeinde' => $gemeinde,
+				'nation' => $nation,
 				'heimatadresse' => $_POST['heimatadresse'],
 				'zustelladresse' => $_POST['zustelladresse'],
-				'co_name' => $_POST['co_name'],
-				'typ' => $_POST['typ'],
+				'co_name' => $co_name,
+				'typ' => $typ,
 				'firma_id' => $firma_id,
-				'name' => $_POST['name'],
+				'name' => $name,
 				'rechnungsadresse' => $_POST['rechnungsadresse'],
-				'anmerkung' => $_POST['anmerkung']
+				'anmerkung' => $anmerkung
 			]);
 
 		if (isError($result))
@@ -439,7 +449,7 @@ class Kontakt extends FHC_Controller
 			$standort_id = $_POST['standort']['standort_id'];
 		}
 		else
-			$standort_id = $_POST['standort_id'];
+			$standort_id = null;
 
 		$kontakttyp = isset($_POST['kontakttyp']) ? $_POST['kontakttyp'] : null;
 		$anmerkung = isset($_POST['anmerkung']) ? $_POST['anmerkung'] : null;

From a32cda96d0f1c3d06fada39fb1748925a64d1342 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 22 Nov 2023 15:58:18 +0100
Subject: [PATCH 0177/1461] tidy up, z-Index for Modal

---
 .../controllers/components/stv/Student.php    | 116 ------------------
 public/js/apps/Studentenverwaltung.js         |   6 +-
 2 files changed, 5 insertions(+), 117 deletions(-)

diff --git a/application/controllers/components/stv/Student.php b/application/controllers/components/stv/Student.php
index c59092c7f..80b0a6a5a 100644
--- a/application/controllers/components/stv/Student.php
+++ b/application/controllers/components/stv/Student.php
@@ -308,120 +308,4 @@ class Student extends FHC_Controller
 		}
 		return true;
 	}
-	
-	public function getAdressen($person_id)
-	{
-		$this->load->model('person/Adresse_model', 'AdresseModel');
-		$this->load->model('person/Adressentyp_model', 'AdressentypModel');
-		$this->load->model('ressource/firma_model', 'FirmaModel');
-
-		$this->AdresseModel->addSelect('*');
-		$this->AdressentypModel->addJoin('public.tbl_adressentyp t', 'ON (t.adressentyp_kurzbz = public.tbl_adresse.typ)');
-		$this->FirmaModel->addJoin('public.tbl_firma f', 'ON (f.firma_id = public.tbl_adresse.firma_id)', 'LEFT');
-
-		$result = $this->AdresseModel->loadWhere(
-			array('person_id' => $person_id)
-		);
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			$this->outputJson(getError($result));
-		} else {
-			$this->outputJson(getData($result) ?: []);
-		}
-	}
-
-	public function addNewAddress($person_id)
-	{
-		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-
-		//var_dump($_POST);
-		//echo ($_POST['ort']);
-		$this->load->model('person/Adresse_model', 'AdresseModel');
-		// Load Libraries
-		$this->load->library('AuthLib');
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-
-		$result = $this->AdresseModel->insert(
-			[
-				'person_id' => $person_id,
-				'strasse' =>  $_POST['strasse'],
-				'insertvon' => 'FHC4',
-				'insertamum' => date('c'),
-				'plz' => $_POST['plz'],
-				'ort' => $_POST['ort'],
-				'gemeinde' => $_POST['gemeinde'],
-				'nation' => $_POST['nation'],
-				'heimatadresse' => $_POST['heimatadresse'],
-				'zustelladresse' => $_POST['zustelladresse'],
-				'co_name' => $_POST['co_name'],
-				'typ' => $_POST['typ']
-			]
-		);
-
-		if (isError($result))
-		{
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson($result);
-		}
-		return $this->outputJsonSuccess(true);
-	}
-
-	public function getAdressentypen()
-	{
-		$this->load->model('person/Adressentyp_model', 'AdressentypModel');
-
-		$result = $this->AdressentypModel->load();
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			$this->outputJson(getError($result));
-		} else {
-			$this->outputJson(getData($result) ?: []);
-		}
-	}
-
-	public function getGmeinden($plz)
-	{
-		//TODO(manu) finish
-		$result = "";
-		return $result;
-	}
-
-	public function getKontakte($person_id)
-	{
-		$this->load->model('person/Kontakt_model', 'KontaktModel');
-		$this->load->model('organisation/standort_model', 'StandortModel');
-		$this->load->model('ressource/firma_model', 'FirmaModel');
-
-		$this->KontaktModel->addSelect('*');
-		$this->StandortModel->addJoin('public.tbl_standort st', 'ON (public.tbl_kontakt.standort_id = st.standort_id)', 'LEFT');
-		$this->StandortModel->addJoin('public.tbl_firma f', 'ON (f.firma_id = st.firma_id)', 'LEFT');
-
-		$result = $this->KontaktModel->loadWhere(
-			array('person_id' => $person_id)
-		);
-
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			$this->outputJson(getError($result));
-		} else {
-			$this->outputJson(getData($result) ?: []);
-		}
-	}
-
-	public function getBankverbindung($person_id)
-	{
-		$this->load->model('person/Bankverbindung_model', 'BankverbindungModel');
-
-		$this->BankverbindungModel->addSelect('*');
-
-		$result = $this->BankverbindungModel->loadWhere(
-			array('person_id' => $person_id)
-		);
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			$this->outputJson(getError($result));
-		} else {
-			$this->outputJson(getData($result) ?: []);
-		}
-	}
 }
diff --git a/public/js/apps/Studentenverwaltung.js b/public/js/apps/Studentenverwaltung.js
index e6a93c5c5..dc26047ac 100644
--- a/public/js/apps/Studentenverwaltung.js
+++ b/public/js/apps/Studentenverwaltung.js
@@ -40,7 +40,11 @@ const app = Vue.createApp();
 
 app
 	.use(router)
-	.use(PvConfig)
+	.use(PvConfig, {
+		zIndex: {
+			overlay: 1100
+		}
+	})
 	.use(FhcAlert)
 	.mount('#main');
 

From d08b90453083d18bda692b0c0a7d512f64ab6f7b Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Thu, 23 Nov 2023 10:02:22 +0100
Subject: [PATCH 0178/1461] mailverteiler und deren mailto href

---
 application/controllers/Cis/Profil.php    |   9 +-
 application/views/Cis/Profil.php          |   3 +-
 public/js/apps/api/userdata.js            |   6 +
 public/js/components/Cis/Profil/Profil.js | 172 ++++++++++++++++++----
 4 files changed, 159 insertions(+), 31 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index ef15d830c..bd0970923 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -66,8 +66,12 @@ class Profil extends Auth_Controller
 				// catch error
 			}
 			$mailverteiler_res = hasData($mailverteiler_res)? getData($mailverteiler_res) : null;
+			
+			$mailverteiler_res = array_map(function($element) { $element->mailto="mailto:".$element->gruppe_kurzbz."@".DOMAIN; return $element;},$mailverteiler_res);
 		}
 
+	
+
 		if(isSuccess($this->KontaktModel->addSelect('DISTINCT ON (kontakttyp) kontakttyp, kontakt, tbl_kontakt.anmerkung, tbl_kontakt.zustellung')) &&
 		isSuccess($this->KontaktModel->addJoin('public.tbl_standort', 'standort_id', 'LEFT')) &&
 		isSuccess($this->KontaktModel->addJoin('public.tbl_firma', 'firma_id', 'LEFT'))&&
@@ -90,7 +94,7 @@ class Profil extends Auth_Controller
 		}
 
 		if(
-			isSuccess($this->BetriebsmittelpersonModel->addSelect(["betriebsmitteltyp", "beschreibung","nummer","ausgegebenam"]))
+			isSuccess($this->BetriebsmittelpersonModel->addSelect(["CONCAT(betriebsmitteltyp, ' ' ,beschreibung) as Betriebsmittel","nummer as Nummer","ausgegebenam as Ausgegeben_am"]))
 			
 		){
 			$betriebsmittelperson_res = $this->BetriebsmittelpersonModel->getBetriebsmittel(getAuthPersonId());
@@ -103,7 +107,7 @@ class Profil extends Auth_Controller
 
 		if(
 			//! Summe der Wochenstunden wird jetzt in der hr/tbl_dienstverhaeltnis gespeichert
-		 isSuccess($this->BenutzerfunktionModel->addSelect(["tbl_benutzerfunktion.bezeichnung as bf_bezeichnung","tbl_organisationseinheit.bezeichnung as oe_bezeichnung","datum_von","datum_bis","wochenstunden"]))&&
+		 isSuccess($this->BenutzerfunktionModel->addSelect(["tbl_benutzerfunktion.bezeichnung as Bezeichnung","tbl_organisationseinheit.bezeichnung as Organisationseinheit","datum_von as Gültig_von","datum_bis as Gültig_bis","wochenstunden as Wochenstunden"]))&&
 	  	  isSuccess($this->BenutzerfunktionModel->addJoin("tbl_organisationseinheit","oe_kurzbz"))
 		){
 			$benutzer_funktion_res = $this->BenutzerfunktionModel->loadWhere(array('uid'=>getAuthUID()));
@@ -219,6 +223,7 @@ class Profil extends Auth_Controller
 	}
 
 
+
 	
 
 	
diff --git a/application/views/Cis/Profil.php b/application/views/Cis/Profil.php
index 4feb98ec4..8c930db09 100644
--- a/application/views/Cis/Profil.php
+++ b/application/views/Cis/Profil.php
@@ -2,6 +2,7 @@
 $includesArray = array(
 	'title' => 'Stundenplan',
 	'customJSModules' => ['public/js/apps/Cis/ProfilApp.js'],
+	'tabulator5' => true,
 	'customCSSs' => ['public/css/components/calendar.css']
 );
 
@@ -12,7 +13,7 @@ $this->load->view('templates/CISHTML-Header', $includesArray);
 	<h2>Profil</h2>
 	
 	<hr>
-	<p><?php echo $uid; ?></p>
+	
 	<!-- we can pass information from the php view file to the public js file through interpolating data from php into vue props -->
 	<Profil uid="<?php echo $uid ?>" pid="<?php echo $pid ?>"></Profil>
 </div>
diff --git a/public/js/apps/api/userdata.js b/public/js/apps/api/userdata.js
index cd701a2d1..9550171c3 100644
--- a/public/js/apps/api/userdata.js
+++ b/public/js/apps/api/userdata.js
@@ -20,6 +20,12 @@ export default {
                   + `cis.php/Cis/Profil/foto_sperre_function/${value}`;
         return axios.get(url);
     },
+    getBenutzerFunktionen: function() {
+        const url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router+
+                   "/Cis/Profil/getBenutzerFunktionen";
+        
+        return axios.get(url);
+    },
     
  
 };
\ No newline at end of file
diff --git a/public/js/components/Cis/Profil/Profil.js b/public/js/components/Cis/Profil/Profil.js
index 3b1ca8e03..e8970f3f5 100644
--- a/public/js/components/Cis/Profil/Profil.js
+++ b/public/js/components/Cis/Profil/Profil.js
@@ -1,17 +1,61 @@
 
 import fhcapifactory from "../../../apps/api/fhcapifactory.js";
-//"<ul><li v-for='element in wert'>{{element}}</li></ul>"
+import {CoreFilterCmpt} from "../../../components/filter/Filter.js"
+
+
+/* [
+    {title: 'Log ID', field: 'LogId', headerFilter: true},
+    {title: 'Request ID', field: 'RequestId', headerFilter: true},
+    {title: 'Execution time', field: 'ExecutionTime', headerFilter: true},
+    {title: 'Executed by', field: 'ExecutedBy', headerFilter: true},
+    {title: 'Description', field: 'Description', headerFilter: true},
+    {title: 'Data', field: 'Data', headerFilter: true},
+    {title: 'Web service type', field: 'WebserviceType', headerFilter: true}
+] */
+
+//? old data
+/* ajaxUrl: FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router+
+                "/Cis/Profil/getBenutzerFunktionen", */
 
 export default {
-    
+    components:{
+        CoreFilterCmpt,
+    },
     data() {
         return {
-           
+            
             person_info: null,
             //? beinhaltet die Information ob der angefragte user ein Student oder Mitarbeiter ist
             role: null,
+            //"bf_bezeichnung", "oe_bezeichnung", "datum_von", "datum_bis", "wochenstunden" ]
+
+            funktionen_table_options: {
+                height: 300,
+                layout: 'fitColumns',
+                //ajaxUrl: FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router+
+                //"/Cis/Profil/getBenutzerFunktionen",
+                data:[{Bezeichnung:"test1",Organisationseinheit:"test2",Gültig_von:"test3",Gültig_bis:"test4",Wochenstunden:"test5"}],
+                
+                columns: [{title: 'Bezeichnung', field: 'Bezeichnung', headerFilter: true},
+                {title: 'Organisationseinheit', field: 'Organisationseinheit', headerFilter: true},
+                {title: 'Gültig_von', field: 'Gültig_von', headerFilter: true},
+                {title: 'Gültig_bis', field: 'Gültig_bis', headerFilter: true},
+                {title: 'Wochenstunden', field: 'Wochenstunden', headerFilter: true},]
+                
+            },
+            betriebsmittel_table_options:{
+                height: 300,
+                layout: 'fitColumns',
+                data:[{Bezeichnung:"test1",Organisationseinheit:"test2",Gültig_von:"test3",Gültig_bis:"test4",Wochenstunden:"test5"}],
+                
+                columns: [{title: 'Betriebsmittel', field: 'betriebsmittel', headerFilter: true},
+                {title: 'Nummer', field: 'Nummer', headerFilter: true},
+                {title: 'Ausgegeben_am', field: 'Ausgegeben_am', headerFilter: true},]
+                
+            },
         }
     },
+    
     //? this props were passed in the Profil.php view file
     props:['uid','pid'],
     methods: {
@@ -35,23 +79,39 @@ export default {
             return result;
         },
         sperre_foto_function(value){
+            if(!this.person_info){
+                return;
+            }
             fhcapifactory.UserData.sperre_foto_function(value).then(res => {
-                console.log(res.data);
-                if(res.data){
                     
                     this.person_info.foto_sperre = res.data.foto_sperre;
-                }
+                
             });
             
         },
         
+        
     },
     computed:{
-        
+        test_computed(){
+            return "test_computed";
+        },
+        get_Functions_Tabulator_Columns(){
+            if(!this.person_info){
+                return [];
+            }
+            return Object.keys(this.person_info.funktionen[0]).map(key => {return {title: key,field:key, headerFilter:true}});
+        },
         get_image_base64_src(){
-            return "data:image/jpeg;base64,"+this.person_info.foto;
+            if(!this.person_info){
+                return "";
+            }
+            return "data:image/jpeg;base64,"+(this.person_info ? this.person_info.foto : "");
         },
         first_col(){
+            if(!this.person_info){
+                return {};
+            }
             //! postnomen is still missing
            return {
                 Username:this.uid,
@@ -68,6 +128,9 @@ export default {
             };
         },
         second_col(){
+            if(!this.person_info){
+                return {};
+            }
             //! postnomen is still missing
            return {
                 Intern:this.person_info.email_intern,
@@ -75,37 +138,55 @@ export default {
                 Kontakte:this.person_info.kontakte,
             };
         },
-
-        
-        
         
     },
-    created(){
-    //error //! fhcapifactory.UserData.getUser().then(res => this.person = res.data);
-    fhcapifactory.UserData.isMitarbeiterOrStudent(this.uid).then(res => {console.log(res.data);this.role = res.data;});
-    fhcapifactory.UserData.getMitarbeiterAnsicht().then(res => {this.person_info = res.data;});
     
+    created(){
+        
+        //error //! fhcapifactory.UserData.getUser().then(res => this.person = res.data);
+        fhcapifactory.UserData.isMitarbeiterOrStudent(this.uid).then(res => {this.role = res.data;});
+        
+        
+        //.tabulator.setData(this.person_info?.funktionen);
+        
+    },
+    mounted(){
+        fhcapifactory.UserData.getMitarbeiterAnsicht().then(res => {
+            this.person_info = res.data;
+            this.$refs.funktionenTable.tabulator.setData(res.data.funktionen);
+            this.$refs.betriebsmittelTable.tabulator.setData(res.data.mittel);
+        });
     },
      
     template: `
+    <div :class="{'container':true}">
+    <div :class="{'row':true}">
+    <div :class="{'col':true}">
     
-    <p v-for="element in person_info.funktionen"><span v-for="(wert,bezeichnung) in element">{{wert + ": " + bezeichnung}}</span></p>
-    <p>{{JSON.stringify(first_col)}}</p>
-    <p>{{"here is the uid "+uid}} </p>
-    <p>{{"here is the pid "+pid}} </p>
-            <div :class={'container':true}>
-            <div :class={'row':true}>
-            <div :class={'col':true}>
-            <img :src="get_image_base64_src"></img>
-            <div v-if="person_info.foto_sperre">
+    </div>
+    <div :class="{'col':true}">
+    
+    </div>
+    </div>
+    </div>
+
+            <div :class="{'container':true}">
+            <!-- here starts the row of the whole window -->
+            <div :class="{'row':true}">
+            <!-- this is the left column of the window -->
+            <div :class="{'col-9':true}">
+            <div :class="{'row':true}">
+            <div :class="{'col':true}">
+            <img :class="{'img-thumbnail':true}" :src="get_image_base64_src"></img>
+            <div v-if="person_info?.foto_sperre">
             <p style="margin:0">Profilfoto gesperrt</p>
-            <a href="#" @click.prevent="sperre_foto_function(false)">Sperre des Profilfotos aufheben</a>
+            <a href="#" @click.prevent="sperre_foto_function(false)" style="text-decoration:none">Sperre des Profilfotos aufheben</a>
             </div>
-            <a href="#" @click.prevent="sperre_foto_function(true)" style="display:block"  v-else>Profilfoto sperren</a>
+            <a href="#" @click.prevent="sperre_foto_function(true)" style="display:block; text-decoration:none"  v-else>Profilfoto sperren</a>
             
             
             </div>
-            <div :class={'col':true}>
+            <div :class="{'col':true}">
             
            
             <ol style="list-style:none">
@@ -117,7 +198,7 @@ export default {
             </li>
             </ol>
             </div>
-            <div :class={'col':true}>
+            <div :class="{'col':true}">
             <ol style="list-style:none">
             <!--render_unterelement(wert,bezeichnung)-->
             <li v-for="(wert,bezeichnung) in second_col">
@@ -135,6 +216,41 @@ export default {
             </ol>
 
 
+            </div>
+            </div>
+            
+            <div :class="{'row':true}">
+            
+            <div :class="{'col':true}">
+            <core-filter-cmpt title="Funktionen"  ref="funktionenTable" :tabulator-options="funktionen_table_options" :tableOnly />
+           
+            </div>
+            
+            </div>
+
+            <div :class="{'row':true}">
+            
+            <div :class="{'col':true}">
+            <core-filter-cmpt title="Entlehnte Betriebsmittel"  ref="betriebsmittelTable" :tabulator-options="betriebsmittel_table_options" :tableOnly />
+            
+            </div>
+            </div>
+            </div>
+
+            <div  :class="{'col-3':true}">
+            <div style="background-color:#EEEEEE" :class="{'row':true, 'py-4':true}">
+            <a style="text-decoration:none" :class="{'my-1':true}" href="#">Zeitwuensche</a>
+            <a style="text-decoration:none" :class="{'my-1':true}" href="#">Lehrveranstaltungen</a>
+            <a style="text-decoration:none" :class="{'my-1':true}" href="#">Zeitsperren von Gschnell</a>
+            </div>
+            <div :class="{'row':true}">
+            <h5 :class="{'fs-3':true}" style="margin-top:1em">Mailverteilers</h5>
+            <p :class="{'fs-6':true}">Sie sind Mitgglied in folgenden Verteilern:</p>
+            <div  :class="{'row':true, 'text-break':true}" v-for="verteiler in person_info?.mailverteiler">
+            <div :class="{'col-6':true}"><a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a></div> 
+            <div :class="{'col-6':true}">{{verteiler.beschreibung}}</div>
+            </div>
+            </div>
             </div>
             </div>
             </div>

From d105ea7a56cc61657f9822dd5baf39d8f1424929 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 23 Nov 2023 10:22:48 +0100
Subject: [PATCH 0179/1461] Interessenten anlegen (Debug Version)

---
 .../controllers/components/stv/Address.php    |  47 ++
 .../controllers/components/stv/Lists.php      |  85 +++
 .../controllers/components/stv/Student.php    | 325 +++++++++--
 .../components/stv/Studienplan.php            |  41 ++
 .../components/stv/Studiensemester.php        |  15 +-
 public/js/components/Form/Validation.js       |  25 +-
 .../js/components/Stv/Studentenverwaltung.js  |  59 +-
 .../Studentenverwaltung/Details/Details.js    |  39 +-
 .../Stv/Studentenverwaltung/List.js           |   5 +-
 .../Stv/Studentenverwaltung/List/New.js       | 516 ++++++++++++++----
 .../Studentenverwaltung/Studiensemester.js    |  21 +-
 public/js/directives/accessibility.js         |  58 +-
 public/js/plugin/FhcAlert.js                  |  24 +-
 13 files changed, 1016 insertions(+), 244 deletions(-)
 create mode 100644 application/controllers/components/stv/Address.php
 create mode 100644 application/controllers/components/stv/Lists.php
 create mode 100644 application/controllers/components/stv/Studienplan.php

diff --git a/application/controllers/components/stv/Address.php b/application/controllers/components/stv/Address.php
new file mode 100644
index 000000000..c0e34c0c3
--- /dev/null
+++ b/application/controllers/components/stv/Address.php
@@ -0,0 +1,47 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Address extends FHC_Controller
+{
+	public function __construct()
+	{
+		// TODO(chris): access!
+		parent::__construct();
+	}
+
+	public function getNations()
+	{
+		$this->load->model('codex/Nation_model', 'NationModel');
+
+		$this->NationModel->addOrder('kurztext');
+
+		$result = $this->NationModel->load();
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+		}
+		$this->outputJson($result);
+	}
+
+	public function getPlaces($plz)
+	{
+		$this->load->model('codex/Gemeinde_model', 'GemeindeModel');
+
+		$this->load->library('form_validation');
+		
+		$this->form_validation->set_data(['address.plz' => $plz]);
+
+		$this->form_validation->set_rules('address.plz', 'PLZ', 'numeric|less_than[10000]');
+
+		if ($this->form_validation->run() == false) {
+			$this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST);
+			return $this->outputJsonError($this->form_validation->error_array());
+		}
+
+		$result = $this->GemeindeModel->getGemeindeByPlz($plz);
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+		}
+		$this->outputJson($result);
+	}
+}
diff --git a/application/controllers/components/stv/Lists.php b/application/controllers/components/stv/Lists.php
new file mode 100644
index 000000000..959de7a12
--- /dev/null
+++ b/application/controllers/components/stv/Lists.php
@@ -0,0 +1,85 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Lists extends FHC_Controller
+{
+	public function __construct()
+	{
+		// TODO(chris): access!
+		parent::__construct();
+	}
+
+	public function getSprachen()
+	{
+		$this->load->model('system/Sprache_model', 'SpracheModel');
+
+		$this->SpracheModel->addOrder('sprache');
+
+		$result = $this->SpracheModel->load();
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+		}
+		$this->outputJson($result);
+	}
+
+	public function getGeschlechter()
+	{
+		$this->load->model('person/Geschlecht_model', 'GeschlechtModel');
+
+		$this->GeschlechtModel->addOrder('sort');
+		$this->GeschlechtModel->addOrder('geschlecht');
+
+		$this->GeschlechtModel->addSelect('*');
+		$this->GeschlechtModel->addSelect("bezeichnung_mehrsprachig[(SELECT index FROM public.tbl_sprache WHERE sprache=" . $this->GeschlechtModel->escape(DEFAULT_LANGUAGE) . " LIMIT 1)] AS bezeichnung");
+
+		$result = $this->GeschlechtModel->load();
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+		}
+		$this->outputJson($result);
+	}
+
+	public function getAusbildungen()
+	{
+		$this->load->model('codex/Ausbildung_model', 'AusbildungModel');
+
+		$this->AusbildungModel->addOrder('ausbildungcode');
+
+		$result = $this->AusbildungModel->load();
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+		}
+		$this->outputJson($result);
+	}
+
+	public function getStgs()
+	{
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+
+		$this->StudiengangModel->addSelect('*');
+		$this->StudiengangModel->addSelect('UPPER(typ || kurzbz) AS kuerzel');
+
+		$this->StudiengangModel->addOrder('typ');
+		$this->StudiengangModel->addOrder('kurzbz');
+
+		$result = $this->StudiengangModel->loadWhere(['aktiv' => true]);
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+		}
+		$this->outputJson($result);
+	}
+
+	public function getOrgforms()
+	{
+		$this->load->model('codex/Orgform_model', 'OrgformModel');
+
+		$this->OrgformModel->addOrder('bezeichnung');
+
+		$result = $this->OrgformModel->loadWhere(['rolle' => true]);
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+		}
+		$this->outputJson($result);
+	}
+}
diff --git a/application/controllers/components/stv/Student.php b/application/controllers/components/stv/Student.php
index c59092c7f..4b1cbaf30 100644
--- a/application/controllers/components/stv/Student.php
+++ b/application/controllers/components/stv/Student.php
@@ -57,55 +57,6 @@ class Student extends FHC_Controller
 		}
 	}
 
-	public function getNations()
-	{
-		$this->load->model('codex/Nation_model', 'NationModel');
-
-		$this->NationModel->addOrder('kurztext');
-
-		$result = $this->NationModel->load();
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			$this->outputJson(getError($result));
-		} else {
-			$this->outputJson(getData($result) ?: []);
-		}
-	}
-
-	public function getSprachen()
-	{
-		$this->load->model('system/Sprache_model', 'SpracheModel');
-
-		$this->SpracheModel->addOrder('sprache');
-
-		$result = $this->SpracheModel->load();
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			$this->outputJson(getError($result));
-		} else {
-			$this->outputJson(getData($result) ?: []);
-		}
-	}
-
-	public function getGeschlechter()
-	{
-		$this->load->model('person/Geschlecht_model', 'GeschlechtModel');
-
-		$this->GeschlechtModel->addOrder('sort');
-		$this->GeschlechtModel->addOrder('geschlecht');
-
-		$this->GeschlechtModel->addSelect('*');
-		$this->GeschlechtModel->addSelect("bezeichnung_mehrsprachig[(SELECT index FROM public.tbl_sprache WHERE sprache=" . $this->GeschlechtModel->escape(DEFAULT_LANGUAGE) . " LIMIT 1)] AS bezeichnung");
-
-		$result = $this->GeschlechtModel->load();
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			$this->outputJson($result);
-		} else {
-			$this->outputJsonSuccess(getData($result) ?: []);
-		}
-	}
-
 	public function save($prestudent_id)
 	{
 		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
@@ -299,6 +250,282 @@ class Student extends FHC_Controller
 		$this->outputJson($result);
 	}
 
+	public function add()
+	{
+		$_POST = json_decode($this->input->raw_input_stream, true);
+
+		if (!$this->input->post('person_id')) {
+			if (!isset($_POST['address']) || !is_array($_POST['address']))
+				$_POST['address'] = [];
+			$_POST['address']['func'] = 1;
+		}
+		if ($this->input->post('incoming')) {
+			$_POST['ausbildungssemester'] = 0;
+		}
+
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('nachname', 'Nachname', 'callback_requiredIfNotPersonId', [
+			'requiredIfNotPersonId' => $this->p->t('ui', 'error_required')
+		]);
+		$this->form_validation->set_rules('geschlecht', 'Geschlecht', 'callback_requiredIfNotPersonId', [
+			'requiredIfNotPersonId' => $this->p->t('ui', 'error_required')
+		]);
+		$this->form_validation->set_rules('gebdatum', 'Geburtsdatum', 'callback_isValidDate', [
+			'isValidDate' => $this->p->t('ui', 'error_invalid_date')
+		]);
+		$this->form_validation->set_rules('address[func]', 'Address', 'required|integer|less_than[2]|greater_than[-2]');
+		$this->form_validation->set_rules('address[plz]', 'PLZ', 'callback_requiredIfAddressFunc', [
+			'requiredIfAddressFunc' => $this->p->t('ui', 'error_required')
+		]);
+		$this->form_validation->set_rules('address[gemeinde]', 'Gemeinde', 'callback_requiredIfAddressFunc', [
+			'requiredIfAddressFunc' => $this->p->t('ui', 'error_required')
+		]);
+		$this->form_validation->set_rules('address[ort]', 'Ort', 'callback_requiredIfAddressFunc', [
+			'requiredIfAddressFunc' => $this->p->t('ui', 'error_required')
+		]);
+		$this->form_validation->set_rules('address[address]', 'Adresse', 'callback_requiredIfAddressFunc', [
+			'requiredIfAddressFunc' => $this->p->t('ui', 'error_required')
+		]);
+		$this->form_validation->set_rules('email', 'E-Mail', 'valid_email');
+		$this->form_validation->set_rules('studiengang_kz', 'Studiengang', 'required');
+		$this->form_validation->set_rules('studiensemester_kurzbz', 'Studiensemester', 'required');
+		$this->form_validation->set_rules('ausbildungssemester', 'Ausbildungssemester', 'required|integer|less_than[9]|greater_than[-1]');
+		// TODO(chris): validate studienplan with studiengang, semester and orgform?
+		// TODO(chris): validate person_id, studiengang_kz, studiensemester_kurzbz, orgform_kurzbz, nation, gemeinde, ort, geschlecht?
+
+		if ($this->form_validation->run() == false) {
+			$this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST);
+			return $this->outputJsonError($this->form_validation->error_array());
+		}
+
+		// TODO(chris): This should be in a library
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
+
+		$this->db->trans_start();
+
+		$result = $this->addInteressent();
+
+		$this->db->trans_complete();
+
+		if ($this->db->trans_status() === FALSE) {
+			return $this->outputJsonSuccess(true); // TODO(chris): DEBUG! REMOVE!
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+		}
+
+		$this->outputJson($result);
+	}
+
+	protected function addInteressent()
+	{
+		// Person anlegen wenn nötig
+		$person_id = $this->input->post('person_id');
+		if (!$person_id) {
+			$this->load->model('person/Person_model', 'PersonModel');
+			
+			$data = [
+				'nachname' => $this->input->post('nachname'),
+				'insertamum' => date('c'),
+				'insertvon' => getAuthUID(),
+				'zugangscode' => uniqid(),
+				'aktiv' => true
+			];
+			if ($this->input->post('anrede'))
+				$data['anrede'] = $this->input->post('anrede');
+			if ($this->input->post('titelpre'))
+				$data['titelpre'] = $this->input->post('titelpre');
+			if ($this->input->post('titelpost'))
+				$data['titelpost'] = $this->input->post('titelpost');
+			if ($this->input->post('vorname'))
+				$data['vorname'] = $this->input->post('vorname');
+			if ($this->input->post('vornamen'))
+				$data['vornamen'] = $this->input->post('vornamen');
+			if ($this->input->post('wahlname'))
+				$data['wahlname'] = $this->input->post('wahlname');
+			if ($this->input->post('geschlecht'))
+				$data['geschlecht'] = $this->input->post('geschlecht');
+			if ($this->input->post('gebdatum'))
+				$data['gebdatum'] = (new DateTime($this->input->post('datum_obj')))->format('Y-m-d');
+			if ($this->input->post('geburtsnation'))
+				$data['geburtsnation'] = $this->input->post('geburtsnation');
+			if ($this->input->post('staatsbuergerschaft'))
+				$data['staatsbuergerschaft'] = $this->input->post('staatsbuergerschaft');
+
+			$result = $this->PersonModel->insert($data);
+			if (isError($result))
+				return $result;
+			$person_id = getData($result);
+		}
+
+		// Addresse anlegen
+		$anlegen = $this->input->post('address[func]');
+		if ($anlegen) {
+			$this->load->model('person/Adresse_model', 'AdresseModel');
+
+			$data = [
+				'nation' => $this->input->post('address[nation]'),
+				'strasse' => $this->input->post('address[address]'),
+				'plz' => $this->input->post('address[plz]'),
+				'ort' => $this->input->post('address[ort]'),
+				'gemeinde' => $this->input->post('address[gemeinde]'),
+				'typ' => 'h',
+				'zustelladresse' => true,
+			];
+			if ($anlegen < 0) { // Überschreiben
+				$this->AdresseModel->addOrder('zustelladresse', 'DESC');
+				$this->AdresseModel->addOrder('sort');
+				$result = $this->AdresseModel->loadWhere([
+					'person_id' => $person_id
+				]);
+				if (isError($result))
+					return $result;
+				if (hasData($result)) {
+					$address = current(getData($result));
+
+					$data['updateamum'] = date('c');
+					$data['updatevon'] = getAuthUID();
+
+					$result = $this->AdresseModel->update($address->adresse_id, $data);
+					if (isError($result))
+						return $result;
+				} else {
+					//Wenn keine Adrese vorhanden ist dann eine neue Anlegen
+					$anlegen = 1;
+					$data['heimatadresse'] = true;
+				}
+			}
+			if ($anlegen > 0) {
+				$data['person_id'] = $person_id;
+				$data['insertamum'] = date('c');
+				$data['insertvon'] = getAuthUID();
+				if (!isset($data['heimatadresse']))
+					$data['heimatadresse'] = !$this->input->post('person_id');
+				
+				$result = $this->AdresseModel->insert($data);
+				if (isError($result))
+					return $result;
+			}
+		}
+		
+		// Kontaktdaten
+		$kontaktdaten = [];
+		foreach (['email', 'telefon', 'mobil'] as $k) {
+			$v = $this->input->post($k);
+			if ($v)
+				$kontaktdaten[$k] = $v;
+		}
+		if (count($kontaktdaten)) {
+			$this->load->model('person/Kontakt_model', 'KontaktModel');
+
+			foreach ($kontaktdaten as $typ => $kontakt) {
+				$data = [
+					'person_id' => $person_id,
+					'kontakttyp' => $typ,
+					'kontakt' => $kontakt,
+					'zustellung' => true,
+					'insertamum' => date('c'),
+					'insertvon' => getAuthUID()
+				];
+				$result = $this->KontaktModel->insert($data);
+				if (isError($result))
+					return $result;
+			}
+		}
+
+		// Prestudent anlegen
+		$data = [
+			'aufmerksamdurch_kurzbz' => 'k.A.',
+			'person_id' => $person_id,
+			'studiengang_kz' => $this->input->post('studiengang_kz'),
+			'ausbildungcode' => $this->input->post('letzteausbildung'),
+			'anmerkung' => $this->input->post('anmerkungen'),
+			'reihungstestangetreten' => false,
+			'bismelden' => true
+		];
+		$ausbildungsart = $this->input->post('ausbildungsart');
+		if ($ausbildungsart)
+			$data['anmerkung'] .= ' Ausbildungsart:' . $ausbildungsart;
+		// Incomings und ausserordentliche sind bei Meldung nicht förderrelevant
+		$incoming = $this->input->post('incoming');
+		if ($incoming || substr($data['studiengang_kz'], 0, 1) == '9')
+			$data['foerderrelevant'] = false;
+		// Wenn die Person schon im System erfasst ist, dann die ZGV des Datensatzes uebernehmen
+		$this->PrestudentModel->addOrder('zgvmas_code');
+		$this->PrestudentModel->addOrder('zgv_code', 'DESC');
+		$this->PrestudentModel->addLimit(1);
+		$result = $this->PrestudentModel->loadWhere([
+			'person_id' => $person_id
+		]);
+		if (isError($result))
+			return $result;
+		if (hasData($result)) {
+			$prestudent = current(getData($result));
+			if ($prestudent->zgv_code) {
+				$data['zgv_code'] = $prestudent->zgv_code;
+				$data['zgvort'] = $prestudent->zgvort;
+				$data['zgvdatum'] = $prestudent->zgvdatum;
+
+				$data['zgvmas_code'] = $prestudent->zgvmas_code;
+				$data['zgvmaort'] = $prestudent->zgvmaort;
+				$data['zgvmadatum'] = $prestudent->zgvmadatum;
+			}
+		}
+		// Prestudent speichern
+		$result = $this->PrestudentModel->insert($data);
+		if (isError($result))
+			return $result;
+		$prestudent_id = getData($result);
+
+		// Prestudent Rolle Anlegen
+		$data = [
+			'prestudent_id' => $prestudent_id,
+			'status_kurzbz' => $incoming ? 'Incoming' : 'Interessent',
+			'studiensemester_kurzbz' => $this->input->post('studiensemester_kurzbz'),
+			'ausbildungssemester' => $this->input->post('ausbildungssemester') ?: 0,
+			'orgform_kurzbz' => $this->input->post('orgform_kurzbz') ?: null,
+			'studienplan_id' => $this->input->post('studienplan_id') ?: null,
+			'datum' => date('Y-m-d'),
+			'insertamum' => date('c'),
+			'insertvon' => getAuthUID()
+		];
+		$result = $this->PrestudentstatusModel->insert($data);
+		if (isError($result))
+			return $result;
+
+		if ($incoming) {
+			// TODO(chris): IMPLEMENT!
+			//Matrikelnummer und UID generieren
+			//Benutzerdatensatz anlegen
+			//Studentendatensatz anlegen
+			//StudentLehrverband anlegen
+		}
+
+		// TODO(chris): DEBUG
+		$result = $this->PrestudentModel->loadWhere([
+			'pestudent_id' => 1
+		]);
+		if (isError($result)) {
+			return $result;
+		}
+
+		return success(true);
+	}
+
+	public function requiredIfNotPersonId($value)
+	{
+		if (isset($_POST['person_id']))
+			return true;
+		return !!$value;
+	}
+	
+	public function requiredIfAddressFunc($value)
+	{
+		if (!$_POST['address']['func'])
+			return true;
+		return !!$value;
+	}
+	
 	public function isValidDate($date)
 	{
 		try {
diff --git a/application/controllers/components/stv/Studienplan.php b/application/controllers/components/stv/Studienplan.php
new file mode 100644
index 000000000..2e7c2f425
--- /dev/null
+++ b/application/controllers/components/stv/Studienplan.php
@@ -0,0 +1,41 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Studienplan extends FHC_Controller
+{
+	public function __construct()
+	{
+		// TODO(chris): access!
+		parent::__construct();
+	}
+
+	public function get()
+	{
+		$this->load->model('organisation/Studienplan_model', 'StudienplanModel');
+
+		$_POST = json_decode($this->input->raw_input_stream, true);
+		
+		$this->load->library('form_validation');
+		
+		$this->form_validation->set_rules('studiengang_kz', 'StudiengangKz', 'required|numeric');
+		$this->form_validation->set_rules('studiensemester_kurzbz', 'StudiensemesterKurbz', 'required');
+		$this->form_validation->set_rules('ausbildungssemester', 'Ausbildungssemester', 'numeric');
+
+		if ($this->form_validation->run() == false) {
+			$this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST);
+			return $this->outputJsonError($this->form_validation->error_array());
+		}
+
+		$studiengang_kz = $this->input->post('studiengang_kz');
+		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
+		$ausbildungssemester = $this->input->post('ausbildungssemester') ?: null;
+		$orgform_kurzbz = $this->input->post('orgform_kurzbz') ?: null;
+
+		$result = $this->StudienplanModel->getStudienplaeneBySemester($studiengang_kz, $studiensemester_kurzbz, $ausbildungssemester, $orgform_kurzbz);
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+		}
+		$this->outputJson($result);
+	}
+}
diff --git a/application/controllers/components/stv/Studiensemester.php b/application/controllers/components/stv/Studiensemester.php
index 88c95cd71..09bbf8886 100644
--- a/application/controllers/components/stv/Studiensemester.php
+++ b/application/controllers/components/stv/Studiensemester.php
@@ -20,13 +20,8 @@ class Studiensemester extends FHC_Controller
 
 		if (isError($result)) {
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			$this->outputJson(getError($result));
-		} elseif (!hasData($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_NOT_FOUND);
-			$this->outputJson('NOT FOUND');
-		} else {
-			$this->outputJson(getData($result));
 		}
+		$this->outputJson($result);
 	}
 
 	public function now()
@@ -43,9 +38,9 @@ class Studiensemester extends FHC_Controller
 
 		if (count($result) != 1) {
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			$this->outputJson(count($result) ? 'Mehrere Studiensemester aktiv' : 'Kein Studiensemester aktiv');
+			$this->outputJsonError(count($result) ? 'Mehrere Studiensemester aktiv' : 'Kein Studiensemester aktiv');
 		} else {
-			$this->outputJson(current($result)->studiensemester_kurzbz);
+			$this->outputJsonSuccess(current($result)->studiensemester_kurzbz);
 		}
 	}
 
@@ -60,7 +55,7 @@ class Studiensemester extends FHC_Controller
 
 		if ($this->form_validation->run() == false) {
 			$this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST);
-			return $this->outputJson($this->form_validation->error_array());
+			return $this->outputJsonError($this->form_validation->error_array());
 		}
 
 		$stdsem = $this->input->post('studiensemester');
@@ -71,7 +66,7 @@ class Studiensemester extends FHC_Controller
 
 		if (isError($result)) {
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson(getError($result));
+			return $this->outputJson($result);
 		}
 
 		$this->outputJsonSuccess(true);
diff --git a/public/js/components/Form/Validation.js b/public/js/components/Form/Validation.js
index 78408e8e8..3b4e69112 100644
--- a/public/js/components/Form/Validation.js
+++ b/public/js/components/Form/Validation.js
@@ -42,13 +42,16 @@ export default {
 		
 		const res = this.$slots.default();
 		const orig = res.shift();
+
 		let options = {
 			'data-fhc-form-validate': this.name,
 			onFhcFormReset: this.reset,
 			onFhcFormValidate: this.setValid,
 			onFhcFormInvalidate: this.setInvalid,
+			onInput: this.reset,
 			class: {
-				'form-control': true,
+				'form-control': orig.type !== 'select' && orig.props.type !== 'checkbox' && orig.props.type !== 'radio' && !(orig.props?.class || '').split(' ').includes('form-control'),
+				'form-select': orig.type === 'select' && !(orig.props?.class || '').split(' ').includes('form-select'),
 				'is-valid': this.isValid,
 				'is-invalid': this.isInvalid
 			}
@@ -59,11 +62,23 @@ export default {
 		}
 		res.unshift(Vue.cloneVNode(orig, options));
 
-		if (this.isInvalid && this.invalidFeedback && this.$slots.default)
-			res.push(Vue.h('div', {
+		if (this.isInvalid && this.invalidFeedback && this.$slots.default) {
+			/* NOTE(chris): use bootstraps 'feedback' */
+			/*res.push(Vue.h('div', {
 				class: 'invalid-feedback'
-			}, this.invalidFeedback));
+			}, this.invalidFeedback));*/
 
-		return res;
+			/* NOTE(chris): use bootstraps 'tooltip' */
+			res.push(Vue.h('div', {
+				class: 'invalid-tooltip'
+			}, this.invalidFeedback));
+		}
+		/* NOTE(chris): use bootstraps 'feedback' */
+		/*return res;*/
+		
+		/* NOTE(chris): use bootstraps 'tooltip' */
+		return Vue.h('div', {
+			class: 'position-relative'
+		}, res);
 	},
 };
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index f2fd2ac36..9cd3f0b57 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -21,6 +21,7 @@ import StvVerband from "./Studentenverwaltung/Verband.js";
 import StvList from "./Studentenverwaltung/List.js";
 import StvDetails from "./Studentenverwaltung/Details.js";
 import StvStudiensemester from "./Studentenverwaltung/Studiensemester.js";
+import {CoreRESTClient} from '../../RESTClient.js';
 
 
 export default {
@@ -46,7 +47,8 @@ export default {
 			activeAddonBewerbung: this.activeAddons.split(';').includes('bewerbung'),
 			configGenerateAlias: this.config.generateAlias,
 			hasBpkPermission: this.permissions['student/bpk'],
-			hasAliasPermission: this.permissions['student/alias']
+			hasAliasPermission: this.permissions['student/alias'],
+			lists: this.lists
 		}
 	},
 	data() {
@@ -81,6 +83,12 @@ export default {
 				}
 			},
 			studiengangKz: undefined,
+			studiensemesterKurzbz: this.defaultSemester,
+			lists: {
+				nations: [],
+				sprachen: [],
+				geschlechter: []
+			}
 		}
 	},
 	computed: {
@@ -96,10 +104,55 @@ export default {
 		searchfunction(searchsettings) {
 			return Vue.$fhcapi.Search.search(searchsettings);  
 		},
-		studiensemesterChanged() {
+		studiensemesterChanged(v) {
+			this.studiensemesterKurzbz = v;
 			this.$refs.stvList.updateUrl();
 		}
 	},
+	created() {
+		CoreRESTClient
+			.get('components/stv/Address/getNations')
+			.then(result => CoreRESTClient.getData(result.data) || [])
+			.then(result => {
+				this.lists.nations = result;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+		CoreRESTClient
+			.get('components/stv/Lists/getSprachen')
+			.then(result => CoreRESTClient.getData(result.data) || [])
+			.then(result => {
+				this.lists.sprachen = result;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+		CoreRESTClient
+			.get('components/stv/Lists/getGeschlechter')
+			.then(result => CoreRESTClient.getData(result.data) || [])
+			.then(result => {
+				this.lists.geschlechter = result;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+		CoreRESTClient
+			.get('components/stv/Lists/getAusbildungen')
+			.then(result => CoreRESTClient.getData(result.data) || [])
+			.then(result => {
+				this.lists.ausbildungen = result;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+		CoreRESTClient
+			.get('components/stv/Lists/getStgs')
+			.then(result => CoreRESTClient.getData(result.data) || [])
+			.then(result => {
+				this.lists.stgs = result;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+		CoreRESTClient
+			.get('components/stv/Lists/getOrgforms')
+			.then(result => CoreRESTClient.getData(result.data) || [])
+			.then(result => {
+				this.lists.orgforms = result;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+	},
 	mounted() {
 		if (this.$route.params.id) {
 			this.$refs.stvList.updateUrl('components/stv/students/uid/' + this.$route.params.id, true);
@@ -126,7 +179,7 @@ export default {
 			<main class="col-md-8 ms-sm-auto col-lg-9 col-xl-10">
 				<vertical-split>
 					<template #top>
-						<stv-list ref="stvList" v-model:selected="selected" :studiengang-kz="studiengangKz"></stv-list>
+						<stv-list ref="stvList" v-model:selected="selected" :studiengang-kz="studiengangKz" :studiensemester-kurzbz="studiensemesterKurzbz"></stv-list>
 					</template>
 					<template #bottom>
 						<stv-details :student="lastSelected"></stv-details>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
index b8f79465d..c60a32b1e 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
@@ -31,6 +31,9 @@ export default {
 		hasAliasPermission: {
 			from: 'hasAliasPermission',
 			default: false
+		},
+		lists: {
+			from: 'lists'
 		}
 	},
 	props: {
@@ -38,9 +41,6 @@ export default {
 	},
 	data() {
 		return {
-			nations: [],
-			sprachen: [],
-			geschlechter: [],
 			familienstaende: {
 				"": "--keine Auswahl--",
 				"g": "geschieden",
@@ -169,31 +169,6 @@ export default {
 		}
 	},
 	created() {
-		CoreRESTClient
-			.get('components/stv/Student/getNations')
-			.then(result => {
-				this.nations = result.data;
-			})
-			.catch(err => {
-				console.error(err.response.data || err.message);
-			});
-		CoreRESTClient
-			.get('components/stv/Student/getSprachen')
-			.then(result => {
-				this.sprachen = result.data;
-			})
-			.catch(err => {
-				console.error(err.response.data || err.message);
-			});
-		CoreRESTClient
-			.get('components/stv/Student/getGeschlechter')
-			.then(result => CoreRESTClient.getData(result.data))
-			.then(result => {
-				this.geschlechter = result.data;
-			})
-			.catch(err => {
-				console.error(CoreRestClient.getError(err.response.data) || err.message);
-			});
 		this.updateStudent(this.student);
 	},
 	//TODO(chris): Geburtszeit? Anzahl der Kinder?
@@ -269,7 +244,7 @@ export default {
 						<select id="stv-details-geburtsnation" class="form-control" v-model="data.geburtsnation">
 							<option value="">-- keine Auswahl --</option>
 							<!-- TODO(chris): gesperrte nationen können nicht ausgewählt werden! Um das zu realisieren müsste man ein pseudo select machen -->
-							<option v-for="nation in nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
+							<option v-for="nation in lists.nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
 						</select>
 					</div>
 				</div>
@@ -289,7 +264,7 @@ export default {
 						<select id="stv-details-staatsbuergerschaft" class="form-control" v-model="data.staatsbuergerschaft">
 							<option value="">-- keine Auswahl --</option>
 							<!-- TODO(chris): gesperrte nationen können nicht ausgewählt werden! Um das zu realisieren müsste man ein pseudo select machen -->
-							<option v-for="nation in nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
+							<option v-for="nation in lists.nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
 						</select>
 					</div>
 					<label for="stv-details-matr_nr" class="col-sm-1 col-form-label">Matrikelnummer</label>
@@ -299,7 +274,7 @@ export default {
 					<label for="stv-details-sprache" class="col-sm-1 col-form-label">Sprache</label>
 					<div class="col-sm-3">
 						<select id="stv-details-sprache" class="form-control" v-model="data.sprache">
-							<option v-for="sprache in sprachen" :key="sprache.sprache" :value="sprache.sprache">{{sprache.sprache}}</option>
+							<option v-for="sprache in lists.sprachen" :key="sprache.sprache" :value="sprache.sprache">{{sprache.sprache}}</option>
 						</select>
 					</div>
 				</div>
@@ -307,7 +282,7 @@ export default {
 					<label for="stv-details-geschlecht" class="col-sm-1 col-form-label">Geschlecht</label>
 					<div class="col-sm-3">
 						<select id="stv-details-geschlecht" class="form-control" v-model="data.geschlecht">
-							<option v-for="geschlecht in geschlechter" :key="geschlecht.geschlecht" :value="geschlecht.geschlecht">{{geschlecht.bezeichnung}}</option>
+							<option v-for="geschlecht in lists.geschlechter" :key="geschlecht.geschlecht" :value="geschlecht.geschlecht">{{geschlecht.bezeichnung}}</option>
 						</select>
 					</div>
 					<label for="stv-details-familienstand" class="col-sm-1 col-form-label">Familienstand</label>
diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index 1ecaa78dd..968067d5f 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -9,7 +9,8 @@ export default {
 	},
 	props: {
 		selected: Array,
-		studiengangKz: Number
+		studiengangKz: Number,
+		studiensemesterKurzbz: String
 	},
 	emits: [
 		'update:selected'
@@ -180,6 +181,6 @@ export default {
 			tabindex="0"
 		>
 		</core-filter-cmpt>
-		<list-new ref="new" studiengang-kz="studiengangKz"></list-new>
+		<list-new ref="new" :studiengang-kz="studiengangKz" :studiensemester-kurzbz="studiensemesterKurzbz"></list-new>
 	</div>`
 };
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/List/New.js b/public/js/components/Stv/Studentenverwaltung/List/New.js
index e72d5fda9..3709acb5f 100644
--- a/public/js/components/Stv/Studentenverwaltung/List/New.js
+++ b/public/js/components/Stv/Studentenverwaltung/List/New.js
@@ -5,6 +5,17 @@ import VueDatePicker from '../../../vueDatepicker.js.php';
 import accessibility from '../../../../directives/accessibility.js';
 
 var _uuid = 0;
+const FORMDATA_DEFAULT = {
+	address: {
+		func: 0,
+		nation: 'A'
+	},
+	geburtsnation: 'A',
+	staatsbuergerschaft: 'A',
+	ausbildungssemester: 1,
+	orgform_kurzbz: '',
+	studienplan_id: ''
+};
 
 export default {
 	components: {
@@ -15,29 +26,65 @@ export default {
 	directives: {
 		accessibility
 	},
+	inject: [
+		'lists'
+	],
 	props: {
-		studiengangKz: Number
+		studiengangKz: Number,
+		studiensemesterKurzbz: String
 	},
 	data() {
 		return {
-			geschlechter: [],
-			formData: {},
+			places: [],
+			formData: FORMDATA_DEFAULT,
 			suggestions: {},
-			person: null
+			person: null,
+			semester: [],
+			studienplaene: [],
+			abortController: {
+				suggestions: null,
+				places: null
+			}
 		}
 	},
 	computed: {
-		saveTitle() {
-			if (this.person === null)
-				return 'Bitte auswählen';
-			if (this.person === 0)
-				return 'Neue Person anlegen';
-			return 'zu ' + (this.person.vorname + ' ' + this.person.nachname).trim() + ' hinzufügen';
-		},
 		formDataPerson() {
 			if (this.person)
 				return this.person;
 			return this.formData;
+		},
+		orte() {
+			return this.places.filter(ort => ort.name == this.formData.address.gemeinde);
+		},
+		gemeinden() {
+			return Object.values(this.places.reduce((res,place) => {
+				res[place.name] = place;
+				return res;
+			}, {}));
+		},
+		formDataStg: {
+			get() {
+				return this.formData.studiengang_kz !== undefined ? this.formData.studiengang_kz : this.studiengangKz;
+			},
+			set(v) {
+				this.formData.studiengang_kz = v;
+			}
+		},
+		formDataSem: {
+			get() {
+				return this.formData.studiensemester_kurzbz !== undefined ? this.formData.studiensemester_kurzbz : this.studiensemesterKurzbz;
+			},
+			set(v) {
+				this.formData.studiensemester_kurzbz = v;
+			}
+		}
+	},
+	watch: {
+		formDataStg() {
+			this.loadStudienplaene();
+		},
+		formDataSem() {
+			this.loadStudienplaene();
 		}
 	},
 	methods: {
@@ -45,38 +92,103 @@ export default {
 			this.$refs.modal.show();
 		},
 		reset() {
-			this.formData = {};
+			this.formData = FORMDATA_DEFAULT;
 			this.person = null;
 			this.suggestions = [];
 			this.$fhcAlert.resetFormValidation(this.$refs.form)
 		},
 		loadSuggestions() {
-			if (this.person)
+			if (this.abortController.suggestions)
+				this.abortController.suggestions.abort();
+			if (this.person !== null)
 				return;
-			// TODO(chris): load serialized
+
+			this.abortController.suggestions = new AbortController();
 			CoreRESTClient
 				.post('components/stv/student/check', {
 					vorname: this.formData.vorname,
 					nachname: this.formData.nachname,
 					gebdatum: this.formData.gebdatum
+				}, {
+					signal: this.abortController.suggestions.signal
 				})
 				.then(result => CoreRESTClient.getData(result.data) || [])
 				.then(result => {
 					this.suggestions = result;
 				})
-				.catch(() => {
+				.catch(error => {
 					// NOTE(chris): repeat request
-					window.setTimeout(this.loadSuggestions, 100);
+					if (error.code != "ERR_CANCELED")
+						window.setTimeout(this.loadSuggestions, 100);
 				});
 		},
-		send(e) {
-			if (e.person === null)
-				this.$fhcAlert.alertError('Select a person first'); // TODO(chris): better error handling!
+		loadPlaces() {
+			if (this.abortController.places)
+				this.abortController.places.abort();
+			if (this.formData.address.nation != 'A' || !this.formData.address.plz)
+				return;
 
-			this.$fhcAlert.resetFormValidation(form);
-			const data = {...this.formData, ...(this.person || {})};
+			this.abortController.places = new AbortController();
 			CoreRESTClient
-				.post('components/stv/student/add')
+				.get('components/stv/address/getPlaces/' + this.formData.address.plz, undefined, {
+					signal: this.abortController.places.signal
+				})
+				.then(result => CoreRESTClient.getData(result.data) || [])
+				.then(result => {
+					this.places = result;
+				})
+				.catch(error => {
+					if (error.code == 'ERR_BAD_REQUEST') {
+						return this.$fhcAlert.handleFormValidation(error, this.$refs.form);
+					}
+					// NOTE(chris): repeat request
+					if (error.code != "ERR_CANCELED")
+						window.setTimeout(this.loadPlaces, 100);
+				});
+		},
+		loadStudienplaene() {
+			CoreRESTClient
+				.post('components/stv/studienplan/get', {
+					studiengang_kz: this.formDataStg,
+					studiensemester_kurzbz: this.formDataSem,
+					ausbildungssemester: this.formData.ausbildungssemester,
+					orgform_kurzbz: this.formData.orgform_kurzbz
+				})
+				.then(result => CoreRESTClient.getData(result.data) || [])
+				.then(result => {
+					this.studienplaene = result;
+					if (this.formData.studienplan_id !== '' && !this.studienplaene.filter(plan => plan.studienplan_id == this.formData.studienplan_id).length)
+						this.formData.studienplan_id = '';
+				})
+				.catch(error => {
+					if (error.code == 'ERR_BAD_REQUEST') {
+						return this.studienplaene = [];
+					}
+					// NOTE(chris): repeat request
+					if (error.code != "ERR_CANCELED")
+						window.setTimeout(this.loadStudienplaene, 100);
+				})
+		},
+		changeAddressNation(e) {
+			if (this.formData['geburtsnation'] == this.formData['address']['nation'])
+				this.formData['geburtsnation'] = e.target.value;
+			if (this.formData['staatsbuergerschaft'] == this.formData['address']['nation'])
+				this.formData['staatsbuergerschaft'] = e.target.value;
+			this.loadPlaces();
+		},
+		send(e) {
+			if (this.person === null)
+				return this.person = 0;
+
+			this.$fhcAlert.resetFormValidation(this.$refs.form);
+			const data = {...this.formData, ...(this.person || {})};
+			if (data.studiengang_kz === undefined)
+				data.studiengang_kz = this.studiengangKz;
+			if (data.studiensemester_kurzbz === undefined)
+				data.studiensemester_kurzbz = this.studiensemesterKurzbz;
+
+			CoreRESTClient
+				.post('components/stv/student/add', data)
 				.then(result => result.data)
 				.then(result => {
 					if (CoreRESTClient.isError(result))
@@ -85,108 +197,320 @@ export default {
 				})
 				.then(result => {
 					this.$fhcAlert.alertSuccess('Gespeichert');
-					console.log('saved');
-					// TODO(chris): close
+					this.$refs.modal.hide();
 				})
-				.catch(this.$fhcAlert.handleFormValidation);
+				.catch(this.$fhcAlert.handleFormValidation(this.$refs.form));
 		}
 	},
 	created() {
 		this.uuid = _uuid++;
-		// TODO(chris): geschlechter in parent?
 		CoreRESTClient
-			.get('components/stv/Student/getGeschlechter')
-			.then(result => CoreRESTClient.getData(result.data))
+			.get('components/stv/Studiensemester')
+			.then(result => CoreRESTClient.getData(result.data) || [])
 			.then(result => {
-				this.geschlechter = result;
+				this.semester = result;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
+
 	},
 	template: `
 	<form ref="form" class="stv-list-new" @submit.prevent="send">
-		<bs-modal ref="modal" dialog-class="modal-fullscreen" @hidden-bs-modal="reset">
+		<bs-modal ref="modal" dialog-class="modal-lg modal-scrollable" @hidden-bs-modal="reset">
 			<template #title>
 				InteressentIn anlegen
 			</template>
 			<template #default>
 				<fhc-form-validation></fhc-form-validation>
-				<div class="row">
-					<div class="col-sm-4 mb-3">
-						<label :for="'stv-list-new-anrede-' + uuid">Anrede</label>
-						<fhc-form-validation name="anrede">
-							<input :id="'stv-list-new-anrede-' + uuid" type="text" name="anrede" v-model="formDataPerson['anrede']" class="form-control" :disabled="person">
-						</fhc-form-validation>
+				<template v-if="person === null">
+					<div class="row">
+						<div class="col-sm-4 mb-3">
+							<label :for="'stv-list-new-nachname-' + uuid">Nachname*</label>
+							<fhc-form-validation name="nachname">
+								<input :id="'stv-list-new-nachname-' + uuid" type="text" name="nachname" v-model="formDataPerson['nachname']" class="form-control" :disabled="person" @input="loadSuggestions">
+							</fhc-form-validation>
+						</div>
+						<div class="col-sm-4 mb-3">
+							<label :for="'stv-list-new-vorname-' + uuid">Vorname</label>
+							<fhc-form-validation name="vorname">
+								<input :id="'stv-list-new-vorname-' + uuid" type="text" name="vorname" v-model="formDataPerson['vorname']" class="form-control" :disabled="person" @input="loadSuggestions">
+							</fhc-form-validation>
+						</div>
+						<div class="col-sm-4 mb-3">
+							<label :for="'dp-input-stv-list-new-gebdatum-' + uuid">Geburtsdatum</label>
+							<fhc-form-validation name="gebdatum">
+								<vue-date-picker :uid="'stv-list-new-gebdatum-' + uuid" name="gebdatum" text-input auto-apply no-today v-model="formDataPerson['gebdatum']" :enable-time-picker="false" format="dd.MM.yyyy" @update:model-value="loadSuggestions" :disabled="person"></vue-date-picker>
+							</fhc-form-validation>
+						</div>
 					</div>
-					<div class="col-sm-4 mb-3">
-						<label :for="'stv-list-new-titelpre-' + uuid">Titel (Pre)</label>
-						<fhc-form-validation name="titelpre">
-							<input :id="'stv-list-new-titelpre-' + uuid" type="text" name="titelpre" v-model="formDataPerson['titelpre']" class="form-control" :disabled="person">
-						</fhc-form-validation>
+					<!-- TODO(chris): more details -->
+					<table class="table caption-top table-striped table-hover">
+						<caption>Prüfung ob Person bereits existiert</caption>
+						<tbody>
+							<tr
+								v-for="(suggestion, index) in suggestions"
+								:key="suggestion.person_id"
+								:class="{'active': index == 2}"
+								@click="(index == 2) ? suggestions.shift() : person=suggestion"
+								v-accessibility:tab.vertical
+								>
+								<td>{{suggestion.vorname + ' ' + suggestion.nachname}}</td>
+								<td></td>
+							</tr>
+						</tbody>
+					</table>
+				</template>
+				<tempalte v-else>
+					<div class="row">
+						<div class="col-sm-4 mb-3">
+							<label :for="'stv-list-new-anrede-' + uuid">Anrede</label>
+							<fhc-form-validation name="anrede">
+								<input :id="'stv-list-new-anrede-' + uuid" type="text" name="anrede" v-model="formDataPerson['anrede']" class="form-control" :disabled="person">
+							</fhc-form-validation>
+						</div>
+						<div class="col-sm-4 mb-3">
+							<label :for="'stv-list-new-titelpre-' + uuid">Titel (Pre)</label>
+							<fhc-form-validation name="titelpre">
+								<input :id="'stv-list-new-titelpre-' + uuid" type="text" name="titelpre" v-model="formDataPerson['titelpre']" class="form-control" :disabled="person">
+							</fhc-form-validation>
+						</div>
+						<div class="col-sm-4 mb-3">
+							<label :for="'stv-list-new-titelpost-' + uuid">Titel (Post)</label>
+							<fhc-form-validation name="titelpost">
+								<input :id="'stv-list-new-titelpost-' + uuid" type="text" name="titelpost" v-model="formDataPerson['titelpost']" class="form-control" :disabled="person">
+							</fhc-form-validation>
+						</div>
 					</div>
-					<div class="col-sm-4 mb-3">
-						<label :for="'stv-list-new-titelpost-' + uuid">Titel (Post)</label>
-						<fhc-form-validation name="titelpost">
-							<input :id="'stv-list-new-titelpost-' + uuid" type="text" name="titelpost" v-model="formDataPerson['titelpost']" class="form-control" :disabled="person">
-						</fhc-form-validation>
+					<div class="row">
+						<div class="col-sm-4 mb-3">
+							<label :for="'stv-list-new-nachname-' + uuid">Nachname*</label>
+							<fhc-form-validation name="nachname">
+								<input :id="'stv-list-new-nachname-' + uuid" type="text" name="nachname" v-model="formDataPerson['nachname']" class="form-control" :disabled="person" @input="loadSuggestions">
+							</fhc-form-validation>
+						</div>
+						<div class="col-sm-4 mb-3">
+							<label :for="'stv-list-new-vorname-' + uuid">Vorname</label>
+							<fhc-form-validation name="vorname">
+								<input :id="'stv-list-new-vorname-' + uuid" type="text" name="vorname" v-model="formDataPerson['vorname']" class="form-control" :disabled="person" @input="loadSuggestions">
+							</fhc-form-validation>
+						</div>
+						<div class="col-sm-4 mb-3">
+							<label :for="'stv-list-new-vornamen-' + uuid">Weitere Vornamen</label>
+							<fhc-form-validation name="vornamen">
+								<input :id="'stv-list-new-vornamen-' + uuid" type="text" name="vornamen" v-model="formDataPerson['vornamen']" class="form-control" :disabled="person">
+							</fhc-form-validation>
+						</div>
 					</div>
-				</div>
-				<div class="row">
-					<div class="col-sm-4 mb-3">
-						<label :for="'stv-list-new-nachname-' + uuid">Nachname*</label>
-						<fhc-form-validation name="nachname">
-							<input :id="'stv-list-new-nachname-' + uuid" type="text" name="nachname" v-model="formDataPerson['nachname']" class="form-control" :disabled="person" @input="loadSuggestions">
-						</fhc-form-validation>
+					<div class="row">
+						<div class="col-sm-4 mb-3">
+							<label :for="'stv-list-new-wahlname-' + uuid">Wahlname</label>
+							<fhc-form-validation name="wahlname">
+								<input :id="'stv-list-new-wahlname-' + uuid" type="text" name="wahlname" v-model="formDataPerson['wahlname']" class="form-control" :disabled="person">
+							</fhc-form-validation>
+						</div>
 					</div>
-					<div class="col-sm-4 mb-3">
-						<label :for="'stv-list-new-vorname-' + uuid">Vorname</label>
-						<fhc-form-validation name="vorname">
-							<input :id="'stv-list-new-vorname-' + uuid" type="text" name="vorname" v-model="formDataPerson['vorname']" class="form-control" :disabled="person" @input="loadSuggestions">
-						</fhc-form-validation>
+					<div class="row">
+						<div class="col-sm-4 mb-3">
+							<label :for="'stv-list-new-geschlecht-' + uuid">Geschlecht*</label>
+							<fhc-form-validation name="geschlecht">
+								<select :id="'stv-list-new-geschlecht-' + uuid" class="form-control" class="form-select" :disabled="person" name="geschlecht" v-model="formDataPerson['geschlecht']">
+									<option v-for="geschlecht in lists.geschlechter" :key="geschlecht.geschlecht" :value="geschlecht.geschlecht">{{geschlecht.bezeichnung}}</option>
+								</select>
+							</fhc-form-validation>
+						</div>
+						<div class="col-sm-4 mb-3">
+							<label :for="'dp-input-stv-list-new-gebdatum-' + uuid">Geburtsdatum</label>
+							<fhc-form-validation name="gebdatum">
+								<vue-date-picker :uid="'stv-list-new-gebdatum-' + uuid" name="gebdatum" text-input auto-apply no-today v-model="formDataPerson['gebdatum']" :enable-time-picker="false" format="dd.MM.yyyy" @update:model-value="loadSuggestions" :disabled="person"></vue-date-picker>
+							</fhc-form-validation>
+						</div>
 					</div>
-					<div class="col-sm-4 mb-3">
-						<label :for="'stv-list-new-vornamen-' + uuid">Weitere Vornamen</label>
-						<fhc-form-validation name="vornamen">
-							<input :id="'stv-list-new-vornamen-' + uuid" type="text" name="vornamen" v-model="formDataPerson['vornamen']" class="form-control" :disabled="person">
-						</fhc-form-validation>
+					
+					<div v-if="person" class="row">
+						<div class="col-sm-6 mb-3">
+							<fhc-form-validation name="address[func]">
+								<select :id="'stv-list-new-address-func-' + uuid" name="address[func]" class="form-select" v-model="formData['address']['func']">
+									<option value="-1">Bestehende Adresse überschreiben</option>
+									<option value="1">Adresse hinzufügen</option>
+									<option value="0">Adresse nicht anlegen</option>
+								</select>
+							</fhc-form-validation>
+						</div>
 					</div>
-				</div>
-				<div class="row">
-					<div class="col-sm-4 mb-3">
-						<label :for="'stv-list-new-wahlname-' + uuid">Wahlname</label>
-						<fhc-form-validation name="wahlname">
-							<input :id="'stv-list-new-wahlname-' + uuid" type="text" name="wahlname" v-model="formDataPerson['wahlname']" class="form-control" :disabled="person">
-						</fhc-form-validation>
+					
+					<fieldset v-if="!person || formData['address']['func']">
+						<legend>Adresse</legend>
+						<div class="row">
+							<div class="col-sm-4 mb-3">
+								<label :for="'dp-input-stv-list-new-address-nation-' + uuid">Land</label>
+								<fhc-form-validation name="address.nation">
+									<select :id="'stv-list-new-address-nation' + uuid" name="address[nation]" class="form-select" v-model="formData['address']['nation']" @input="changeAddressNation">
+										<option v-for="nation in lists.nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.langtext}}</option>
+									</select>
+								</fhc-form-validation>
+							</div>
+						</div>
+						<div class="row">
+							<div class="col-sm-4 mb-3">
+								<label :for="'dp-input-stv-list-new-address-plz-' + uuid">PLZ</label>
+								<fhc-form-validation name="address[plz]">
+									<input type="text" :id="'stv-list-new-address-plz' + uuid" name="address[plz]" v-model="formData['address']['plz']" @input="loadPlaces">
+								</fhc-form-validation>
+							</div>
+							<div class="col-sm-4 mb-3">
+								<label :for="'dp-input-stv-list-new-address-gemeinde-' + uuid">Gemeinde</label>
+								<fhc-form-validation name="address[gemeinde]">
+									<select v-if="formData['address']['nation'] == 'A'" :id="'stv-list-new-address-gemeinde' + uuid" name="address[gemeinde]" class="form-select" v-model="formData['address']['gemeinde']">
+										<option v-if="!gemeinden.length" disabled>Bitte gültige PLZ wählen</option>
+										<option v-for="gemeinde in gemeinden" :key="gemeinde.name" :value="gemeinde.name">{{gemeinde.name}}</option>
+									</select>
+									<input v-else type="text" :id="'stv-list-new-address-gemeinde' + uuid" name="address[gemeinde]" class="form-control" v-model="formData['address']['gemeinde']">
+								</fhc-form-validation>
+							</div>
+							<div class="col-sm-4 mb-3">
+								<label :for="'dp-input-stv-list-new-address-ort-' + uuid">Ort</label>
+								<fhc-form-validation name="address[ort]">
+									<select v-if="formData['address']['nation'] == 'A'" :id="'stv-list-new-address-ort' + uuid" name="address[ort]" class="form-select" v-model="formData['address']['ort']">
+										<option v-if="!orte.length" disabled>Bitte gültige Gemeinde wählen</option>
+										<option v-for="ort in orte" :key="ort.ortschaftsname" :value="ort.ortschaftsname">{{ort.ortschaftsname}}</option>
+									</select>
+									<input v-else type="text" :id="'stv-list-new-address-ort' + uuid" name="address[ort]" class="form-control" v-model="formData['address']['ort']">
+								</fhc-form-validation>
+							</div>
+						</div>
+						<div class="row">
+							<div class="col-12 mb-3">
+								<label :for="'dp-input-stv-list-new-address-address-' + uuid">Adresse</label>
+								<fhc-form-validation name="address[address]">
+									<input type="text" :id="'stv-list-new-address-address' + uuid" name="address[address]" v-model="formData['address']['address']">
+								</fhc-form-validation>
+							</div>
+						</div>
+					</fieldset>
+
+					<div class="row">
+						<div class="col-sm-4 mb-3">
+							<label :for="'dp-input-stv-list-new-geburtsnation-' + uuid">Geburtsnation</label>
+							<fhc-form-validation name="geburtsnation">
+								<select :id="'stv-list-new-geburtsnation' + uuid" name="geburtsnation" class="form-select" v-model="formData['geburtsnation']">
+									<option v-for="nation in lists.nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.langtext}}</option>
+								</select>
+							</fhc-form-validation>
+						</div>
+						<div class="col-sm-4 mb-3">
+							<label :for="'dp-input-stv-list-new-staatsbuergerschaft-' + uuid">Staatsbürgerschaft</label>
+							<fhc-form-validation name="staatsbuergerschaft">
+								<select :id="'stv-list-new-staatsbuergerschaft' + uuid" name="staatsbuergerschaft" class="form-select" v-model="formData['staatsbuergerschaft']">
+									<option v-for="nation in lists.nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.langtext}}</option>
+								</select>
+							</fhc-form-validation>
+						</div>
 					</div>
-				</div>
-				<div class="row">
-					<div class="col-sm-4 mb-3">
-						<label :for="'stv-list-new-geschlecht-' + uuid">Geschlecht*</label>
-						<fhc-form-validation name="geschlecht">
-							<select :id="'stv-list-new-geschlecht-' + uuid" class="form-control" :disabled="person" name="geschlecht" v-model="formDataPerson['geschlecht']">
-								<option v-for="geschlecht in geschlechter" :key="geschlecht.geschlecht" :value="geschlecht.geschlecht">{{geschlecht.bezeichnung}}</option>
-							</select>
-						</fhc-form-validation>
+					<div class="row">
+						<div class="col-sm-4 mb-3">
+							<label :for="'stv-list-new-email-' + uuid">E-Mail</label>
+							<fhc-form-validation name="email">
+								<input :id="'stv-list-new-email-' + uuid" type="text" name="email" v-model="formDataPerson['email']" class="form-control">
+							</fhc-form-validation>
+						</div>
+						<div class="col-sm-4 mb-3">
+							<label :for="'stv-list-new-telefon-' + uuid">Telefon</label>
+							<fhc-form-validation name="telefon">
+								<input :id="'stv-list-new-telefon-' + uuid" type="text" name="telefon" v-model="formDataPerson['telefon']" class="form-control">
+							</fhc-form-validation>
+						</div>
+						<div class="col-sm-4 mb-3">
+							<label :for="'stv-list-new-mobil-' + uuid">Mobil</label>
+							<fhc-form-validation name="mobil">
+								<input :id="'stv-list-new-mobil-' + uuid" type="text" name="mobil" v-model="formDataPerson['mobil']" class="form-control">
+							</fhc-form-validation>
+						</div>
 					</div>
-					<div class="col-sm-4 mb-3">
-						<label :for="'dp-input-stv-list-new-gebdatum-' + uuid">Geburtsdatum</label>
-						<fhc-form-validation name="gebdatum">
-							<vue-date-picker :uid="'stv-list-new-gebdatum-' + uuid" name="gebdatum" text-input auto-apply no-today v-model="formDataPerson['gebdatum']" :enable-time-picker="false" format="dd.MM.yyyy" @update:model-value="loadSuggestions" :disabled="person"></vue-date-picker>
-						</fhc-form-validation>
+					<div class="row">
+						<div class="col-sm-4 mb-3">
+							<label :for="'stv-list-new-letzteausbildung-' + uuid">Letzte Ausbildung</label>
+							<fhc-form-validation name="letzteausbildung">
+								<select :id="'stv-list-new-letzteausbildung' + uuid" name="letzteausbildung" class="form-select" v-model="formData['letzteausbildung']">
+									<option v-for="ausbildung in lists.ausbildungen" :key="ausbildung.ausbildungcode" :value="ausbildung.ausbildungcode">{{ausbildung.ausbildungbez}}</option>
+								</select>
+							</fhc-form-validation>
+						</div>
+						<div class="col-sm-4 mb-3">
+							<label :for="'stv-list-new-ausbildungsart-' + uuid">Ausbildungsart</label>
+							<fhc-form-validation name="ausbildungsart">
+								<input :id="'stv-list-new-ausbildungsart-' + uuid" type="text" name="ausbildungsart" v-model="formDataPerson['ausbildungsart']" class="form-control">
+							</fhc-form-validation>
+						</div>
 					</div>
-				</div>
+					<div class="row">
+						<div class="col-sm-8 mb-3">
+							<label :for="'stv-list-new-anmerkungen-' + uuid">Anmerkungen</label>
+							<fhc-form-validation name="anmerkungen">
+								<textarea :id="'stv-list-new-anmerkungen-' + uuid" name="anmerkungen" v-model="formDataPerson['anmerkungen']" class="form-control"></textarea>
+							</fhc-form-validation>
+						</div>
+					</div>
+					<div class="row">
+						<div class="col-sm-4 mb-3">
+							<label :for="'stv-list-new-studiengang_kz-' + uuid">Studiengang*</label>
+							<fhc-form-validation name="studiengang_kz">
+								<select :id="'stv-list-new-studiengang_kz-' + uuid" name="studiengang_kz" v-model="formDataStg" class="form-select">
+									<option v-for="stg in lists.stgs" :key="stg.studiengang_kz" :value="stg.studiengang_kz">{{stg.kuerzel}}</option>
+								</select>
+							</fhc-form-validation>
+						</div>
+						<div class="col-sm-4 mb-3">
+							<label :for="'stv-list-new-studiensemester_kurzbz-' + uuid">Studiensemester*</label>
+							<fhc-form-validation name="studiensemester_kurzbz">
+								<select :id="'stv-list-new-studiensemester_kurzbz-' + uuid" name="studiensemester_kurzbz" v-model="formDataSem" class="form-select">
+									<option v-for="sem in semester" :key="sem.studiensemester_kurzbz" :value="sem.studiensemester_kurzbz">{{sem.studiensemester_kurzbz}}</option>
+								</select>
+							</fhc-form-validation>
+						</div>
+						<div class="col-sm-4 mb-3">
+							<label :for="'stv-list-new-ausbildungssemester-' + uuid">Ausbildungssemester*</label>
+							<fhc-form-validation name="ausbildungssemester">
+								<select :id="'stv-list-new-ausbildungssemester-' + uuid" name="ausbildungssemester" v-model="formData['ausbildungssemester']" class="form-select" @input="loadStudienplaene" :disabled="formData['incoming']">
+									<option v-for="sem in Array.from({length:8}).map((u,i) => i+1)" :key="sem" :value="sem">{{sem}}. Semester</option>
+								</select>
+							</fhc-form-validation>
+						</div>
+					</div>
+					<div class="row">
+						<div class="col-sm-4 mb-3">
+							<label :for="'stv-list-new-orgform_kurzbz-' + uuid">OrgForm</label>
+							<fhc-form-validation name="orgform_kurzbz">
+								<select :id="'stv-list-new-orgform_kurzbz-' + uuid" name="orgform_kurzbz" v-model="formData['orgform_kurzbz']" class="form-select" @input="loadStudienplaene">
+									<option value="">-- keine Auswahl --</option>
+									<option v-for="orgform in lists.orgforms" :key="orgform.orgform_kurzbz" :value="orgform.orgform_kurzbz">{{orgform.bezeichnung}}</option>
+								</select>
+							</fhc-form-validation>
+						</div>
+						<div class="col-sm-4 mb-3">
+							<label :for="'stv-list-new-studienplan_id-' + uuid">Studienplan</label>
+							<fhc-form-validation name="studienplan_id">
+								<select :id="'stv-list-new-studienplan_id-' + uuid" name="studienplan_id" v-model="formData['studienplan_id']" class="form-select">
+									<option value="">-- keine Auswahl --</option>
+									<option v-for="plan in studienplaene" :key="plan.studienplan_id" :value="plan.studienplan_id">{{plan.bezeichnung}}</option>
+								</select>
+							</fhc-form-validation>
+						</div>
+					</div>
+					<div class="row">
+						<div class="col-10 mb-3">
+							<div class="form-check">
+								<fhc-form-validation name="incoming">
+									<input type="checkbox" :id="'stv-list-new-incoming-' + uuid" name="incoming" v-model="formData['incoming']" class="form-check-input" value="1">
+								</fhc-form-validation>
+								<label :for="'stv-list-new-incoming-' + uuid" class="form-check-label">Incoming</label>
+							</div>
+						</div>
+					</div>
+
+				</template>
 			</template>
 			<template #footer>
-				<div class="btn-group dropup">
-					<button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" style="border-bottom-right-radius: 0; border-top-right-radius: 0" data-bs-toggle="dropdown" aria-expanded="false">
-						<span class="visually-hidden">Choose Person</span>
-					</button>
-					<ul class="dropdown-menu">
-						<!-- TODO(chris): more details -->
-						<li v-for="suggestion in suggestions" :key="suggestion.person_id"><a class="dropdown-item" :class="{active: person?.person_id == suggestion.person_id}" href="#" @click.prevent="person=suggestion">{{suggestion.vorname + ' ' + suggestion.nachname}}</a></li>
-						<li><a class="dropdown-item" :class="{active: person === 0}" href="#" @click.prevent="person=0">Neue Person anlegen</a></li>
-					</ul>
-					<button type="submit" class="btn btn-primary" :disabled="person === null">{{saveTitle}}</button>
-				</div>
+				<button v-if="person !== null" type="button" class="btn btn-secondary" @click="person = null"><i class="fa fa-chevron-left"></i>Zurück</button>
+				<button type="submit" class="btn btn-primary">{{ person === null ? 'Person anlegen' : 'InteressentIn anlegen' }}</button>
 			</template>
 		</bs-modal>
 	</form>`
diff --git a/public/js/components/Stv/Studentenverwaltung/Studiensemester.js b/public/js/components/Stv/Studentenverwaltung/Studiensemester.js
index 24a9e7206..c52d584fd 100644
--- a/public/js/components/Stv/Studentenverwaltung/Studiensemester.js
+++ b/public/js/components/Stv/Studentenverwaltung/Studiensemester.js
@@ -49,20 +49,17 @@ export default {
 			this.loading = true;
 			CoreRESTClient
 				.get('components/stv/studiensemester/now')
-				.then(result => result.data)
+				.then(result => CoreRESTClient.getData(result.data))
 				.then(result => {
 					this.today = this.list.indexOf(result);
-					if (this.today > 0) {
+					if (this.today >= 0) {
 						if (this.today != this.current)
 							this.set(this.today);
 					} else {
 						// TODO(chris): handle error (list might not be loaded yet)
 					}
 				})
-				.catch(error => {
-					// TODO(chris): emit error
-					console.error(error);
-				});
+				.catch(this.$fhcAlert.handleSystemError);
 		},
 		save(fallback) {
 			CoreRESTClient
@@ -71,27 +68,25 @@ export default {
 				})
 				.then(() => {
 					this.loading = false;
-					this.$emit('changed');
+					this.$emit('changed', this.list[this.current]);
 				})
 				.catch(error => {
 					this.current = fallback;
-					// TODO(chris): emit error
-					console.error(error);
+					this.loading = false;
+					this.$fhcAlert.handleFormValidation(error);
 				});
 		}
 	},
 	created() {
 		CoreRESTClient
 			.get('components/stv/studiensemester')
-			.then(result => result.data)
+			.then(result => CoreRESTClient.getData(result.data) || [])
 			.then(result => {
 				this.list = result.map(el => el.studiensemester_kurzbz);
 				this.loading = false;
 				this.current = this.list.indexOf(this.default);
 			})
-			.catch(error => {
-				console.error(error);
-			});
+			.catch(this.$fhcAlert.handleSystemError);
 	},
 	template: `
 	<div class="stv-studiensemester">
diff --git a/public/js/directives/accessibility.js b/public/js/directives/accessibility.js
index e8b11b61d..77ca8f428 100644
--- a/public/js/directives/accessibility.js
+++ b/public/js/directives/accessibility.js
@@ -2,32 +2,33 @@ export default {
 	created(el, binding) {
 		switch (binding.arg) {
 			case 'tab':
+				el.style.cursor = 'pointer';
 				const [prev, next] = binding.modifiers.vertical ? ['ArrowUp', 'ArrowDown'] : ['ArrowLeft', 'ArrowRight'];
 				el.addEventListener('click', () => {
 					let act = el.parentNode.querySelector('[tabindex="0"]');
 					if (act)
-						act.setAttribute('tabindex', -1);
-					el.setAttribute('tabindex', 0);
+						act.tabIndex = -1;
+					el.tabIndex = 0;
 				});
 				el.addEventListener('focus', () => {
-					el.setAttribute('aria-selected', true);
+					el.ariaSelected = "true";
 				});
 				el.addEventListener('blur', () => {
-					el.setAttribute('aria-selected', false);
+					el.ariaSelected = "false";
 				});
 				el.addEventListener('keydown', e => {
 					switch (e.code) {
 						case prev:
-							if (el.previousSibling?.setAttribute) {
-								el.previousSibling.setAttribute('tabindex', 0);
-								el.setAttribute('tabindex', -1);
+							if (el.previousSibling?.tabIndex !== undefined) {
+								el.previousSibling.tabIndex = 0;
+								el.tabIndex = -1;
 								el.previousSibling.focus();
 							}
 							break;
 						case next:
-							if (el.nextSibling?.setAttribute) {
-								el.nextSibling.setAttribute('tabindex', 0);
-								el.setAttribute('tabindex', -1);
+							if (el.nextSibling?.tabIndex !== undefined) {
+								el.nextSibling.tabIndex = 0;
+								el.tabIndex = -1;
 								el.nextSibling.focus();
 							}
 							break;
@@ -44,18 +45,18 @@ export default {
 			case 'tab':
 				let activetab = -1;
 				Array.from(el.parentNode.children).forEach((node, index) => {
-					node.setAttribute('aria-setsize', el.parentNode.children.length);
-					node.setAttribute('aria-posinset', index);
-					if (node.getAttribute('tabindex') == '0')
+					node.ariaSetSize = el.parentNode.children.length;
+					node.ariaPosInSet = index;
+					if (node.tabIndex === 0)
 						activetab = index;
 				});
 				if (activetab == -1) {
-					el.setAttribute('tabindex', 0);
+					el.tabIndex = 0;
 				} else if (el.classList.contains('active')) {
-					el.parentNode.children[activetab].setAttribute('tabindex', -1);
-					el.setAttribute('tabindex', 0);
+					el.parentNode.children[activetab].tabIndex = -1;
+					el.tabIndex = 0;
 				} else {
-					el.setAttribute('tabindex', -1);
+					el.tabIndex = -1;
 				}
 				break;
 		}
@@ -63,26 +64,19 @@ export default {
 	beforeUnmount(el, binding) {
 		switch (binding.arg) {
 			case 'tab':
-				if (el.getAttribute('tabindex') == '0') {
-					if (el.previousSibling?.setAttribute)
-						el.previousSibling.setAttribute('tabindex', 0);
-					else if (el.nextSibling?.setAttribute)
-						el.nextSibling.setAttribute('tabindex', 0);
+				if (el.tabIndex === 0) {
+					if (el.previousSibling?.tabIndex !== undefined)
+						el.previousSibling.tabIndex = 0;
+					else if (el.nextSibling?.tabIndex !== undefined)
+						el.nextSibling.tabIndex = 0;
 				}
-				const pos = parseInt(el.getAttribute('aria-posinset'));
+				const pos = parseInt(el.ariaPosInSet);
 				Array.from(el.parentNode.children).forEach((node, index) => {
-					node.setAttribute('aria-setsize', el.parentNode.children.length-1);
+					node.ariaSetSize = el.parentNode.children.length;
 					if (index > pos)
-						node.setAttribute('aria-posinset', index-1);
+						node.ariaPosInSet = index-1;
 				});
 			break;
 		}
-	},
-	unmounted(el, binding) {
-		switch (binding.arg) {
-			case 'tab':
-				console.log(el.parentNode);
-			break;
-		}
 	}
 }
\ No newline at end of file
diff --git a/public/js/plugin/FhcAlert.js b/public/js/plugin/FhcAlert.js
index b232c813a..079039aed 100644
--- a/public/js/plugin/FhcAlert.js
+++ b/public/js/plugin/FhcAlert.js
@@ -97,6 +97,8 @@ import PvToast from "../../../index.ci.php/public/js/components/primevue/toast/t
 import PvConfirm from "../../../index.ci.php/public/js/components/primevue/confirmdialog/confirmdialog.esm.min.js";
 import PvConfirmationService from "../../../index.ci.php/public/js/components/primevue/confirmationservice/confirmationservice.esm.min.js";
 
+import {CoreRESTClient} from '../RESTClient.js';
+
 const helperAppContainer = document.createElement('div');
 
 const helperApp = Vue.createApp({
@@ -181,18 +183,28 @@ export default {
 	install: (app, options) => {
 		const $fhcAlert = {
 			alertSuccess(message) {
+				if (Array.isArray(message))
+					return message.forEach(this.alertSuccess);
 				helperAppInstance.$refs.toast.add({ severity: 'success', summary: 'Info', detail: message, life: 1000});
 			},
 			alertInfo(message) {
+				if (Array.isArray(message))
+					return message.forEach(this.alertInfo);
 				helperAppInstance.$refs.toast.add({ severity: 'info', summary: 'Info', detail: message, life: 3000 });
 			},
 			alertWarning(message) {
+				if (Array.isArray(message))
+					return message.forEach(this.alertWarning);
 				helperAppInstance.$refs.toast.add({ severity: 'warn', summary: 'Achtung', detail: message});
 			},
 			alertError(message) {
+				if (Array.isArray(message))
+					return message.forEach(this.alertError);
 				helperAppInstance.$refs.toast.add({ severity: 'error', summary: 'Achtung', detail: message });
 			},
 			alertSystemError(message) {
+				if (Array.isArray(message))
+					return message.forEach(this.alertSystemError);
 				helperAppInstance.$refs.alert.add({ severity: 'error', summary: 'Systemfehler', detail: message});
 			},
 			confirmDelete() {
@@ -243,7 +255,9 @@ export default {
 				if (typeof error === 'object' && error !== null) {
 					let errMsg = '';
 
-					if (error.hasOwnProperty('message'))
+					if (error.hasOwnProperty('response') && error.response?.data?.retval)
+						errMsg += 'Error Message: ' + (error.response.data.retval.message || error.response.data.retval) + '\r\n';
+					else if (error.hasOwnProperty('message'))
 						errMsg += 'Error Message: ' + error.message.toUpperCase() + '\r\n';
 
 					if (error.hasOwnProperty('config') && error.config.hasOwnProperty('url'))
@@ -366,7 +380,13 @@ export default {
 						return;
 					}
 				}
-				$fhcAlert.handleSystemError(error);
+
+				if (error?.response?.status == 400) {
+					let errors = CoreRESTClient.getError(error.response.data);
+					$fhcAlert.alertError((typeof errors === 'object') ? Object.values(errors) : errors);
+				} else {
+					$fhcAlert.handleSystemError(error);
+				}
 			}
 		};
 		app.config.globalProperties.$fhcAlert = $fhcAlert;

From dee3b35a5d99b70c9c2c3fa6a86081e32d83d01b Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Thu, 23 Nov 2023 14:48:05 +0100
Subject: [PATCH 0180/1461] solved table bug

---
 application/controllers/Cis/Profil.php    | 21 ++++++---
 application/views/Cis/Profil.php          |  2 +-
 public/js/components/Cis/Profil/Profil.js | 53 ++++++++++++++++-------
 public/js/components/filter/Filter.js     |  3 ++
 4 files changed, 56 insertions(+), 23 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index bd0970923..cbbc84145 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -86,12 +86,16 @@ class Profil extends Auth_Controller
 			
 		}
 
-		$zutrittskarte_ausgegebenam = $this->BetriebsmittelpersonModel->getBetriebsmittel(getAuthPersonId());
+		$zutrittskarte_ausgegebenam = $this->BetriebsmittelpersonModel->getBetriebsmittelByUid(getAuthUID(),"Zutrittskarte");
 		if(isError($zutrittskarte_ausgegebenam)){
 			// error handling
 		}else{
-			$zutrittskarte_ausgegebenam = hasData($zutrittskarte_ausgegebenam)? getData($zutrittskarte_ausgegebenam)[0] : null;
+			$zutrittskarte_ausgegebenam = hasData($zutrittskarte_ausgegebenam)? getData($zutrittskarte_ausgegebenam)[0]->ausgegebenam : null;
+			//? formats the date from 01-01-2000 to 01.01.2000
+			$zutrittskarte_ausgegebenam = str_replace("-",".",$zutrittskarte_ausgegebenam);
 		}
+		
+		
 
 		if(
 			isSuccess($this->BetriebsmittelpersonModel->addSelect(["CONCAT(betriebsmitteltyp, ' ' ,beschreibung) as Betriebsmittel","nummer as Nummer","ausgegebenam as Ausgegeben_am"]))
@@ -170,9 +174,14 @@ class Profil extends Auth_Controller
 		//? Mitarbeiter Info
 		$res->kurzbz = $mitarbeiter_res->kurzbz;
 		$res->telefonklappe = $mitarbeiter_res->telefonklappe;
-		//? Benutzer Info
-		$res->email_intern = getAuthUID() . DOMAIN;
-		$res->email_extern = $benutzer_res->alias . DOMAIN;
+		//? Email Info 
+		$intern_email = array();
+		$intern_email+=array("type" => "intern");
+		$intern_email+=array("email"=> getAuthUID() . DOMAIN);
+		$extern_email=array();
+		$extern_email+=array("type" => "extern");
+		$extern_email+=array("email" => $benutzer_res->alias . DOMAIN);
+		$res->emails = array($intern_email,$extern_email);
 		//? Adresse Info 
 		$res->adressen = $adresse_res;
 		//? Benutzerfunktion Info
@@ -180,7 +189,7 @@ class Profil extends Auth_Controller
 		//? Betriebsmittel Info
 		$res->mittel = $betriebsmittelperson_res;
 		//? Austellungsdatum von der Zutrittskarte
-		$res->zutrittskarte_ausgegebenam = $zutrittskarte_ausgegebenam->ausgegebenam;
+		$res->zutrittskarte_ausgegebenam = $zutrittskarte_ausgegebenam;
 		//? Kontakt Info
 		$res->kontakte = $kontakte_res;
 		//? Mailverteiler Info
diff --git a/application/views/Cis/Profil.php b/application/views/Cis/Profil.php
index 8c930db09..931d879d5 100644
--- a/application/views/Cis/Profil.php
+++ b/application/views/Cis/Profil.php
@@ -3,7 +3,7 @@ $includesArray = array(
 	'title' => 'Stundenplan',
 	'customJSModules' => ['public/js/apps/Cis/ProfilApp.js'],
 	'tabulator5' => true,
-	'customCSSs' => ['public/css/components/calendar.css']
+	'customCSSs' => ['public/css/components/calendar.css', 'public/css/components/FilterComponent.css']
 );
 
 $this->load->view('templates/CISHTML-Header', $includesArray);
diff --git a/public/js/components/Cis/Profil/Profil.js b/public/js/components/Cis/Profil/Profil.js
index e8970f3f5..7361f8026 100644
--- a/public/js/components/Cis/Profil/Profil.js
+++ b/public/js/components/Cis/Profil/Profil.js
@@ -46,7 +46,7 @@ export default {
             betriebsmittel_table_options:{
                 height: 300,
                 layout: 'fitColumns',
-                data:[{Bezeichnung:"test1",Organisationseinheit:"test2",Gültig_von:"test3",Gültig_bis:"test4",Wochenstunden:"test5"}],
+                data:[{betriebsmittel:"test1",Nummer:"test2",Ausgegeben_am:"test3"}],
                 
                 columns: [{title: 'Betriebsmittel', field: 'betriebsmittel', headerFilter: true},
                 {title: 'Nummer', field: 'Nummer', headerFilter: true},
@@ -59,6 +59,7 @@ export default {
     //? this props were passed in the Profil.php view file
     props:['uid','pid'],
     methods: {
+        
         concatenate_addresses(address_array){
             let result = "";
             for (let i = 0; i < address_array.length; i++) {
@@ -133,8 +134,8 @@ export default {
             }
             //! postnomen is still missing
            return {
-                Intern:this.person_info.email_intern,
-                Alias:this.person_info.email_extern,
+                FhAusweisStatus: this.person_info.zutrittskarte_ausgegebenam,
+                emails:this.person_info.emails,
                 Kontakte:this.person_info.kontakte,
             };
         },
@@ -150,12 +151,21 @@ export default {
         //.tabulator.setData(this.person_info?.funktionen);
         
     },
-    mounted(){
-        fhcapifactory.UserData.getMitarbeiterAnsicht().then(res => {
-            this.person_info = res.data;
-            this.$refs.funktionenTable.tabulator.setData(res.data.funktionen);
-            this.$refs.betriebsmittelTable.tabulator.setData(res.data.mittel);
-        });
+     mounted(){
+        //? this function is to update the tabulator information only when the tabulator was build checking the tableBulit event
+        //! only the tableBuilt event of the second tabulator was used to update the table informations
+        this.$refs.betriebsmittelTable.tabulator.on('tableBuilt', () => {
+            fhcapifactory.UserData.getMitarbeiterAnsicht().then((res)=>{
+                this.person_info = res.data;
+                this.$refs.funktionenTable.tabulator.setData(res.data.funktionen);
+                this.$refs.betriebsmittelTable.tabulator.setData(res.data.mittel);
+                
+            })
+        })
+        
+        
+        
+        
     },
      
     template: `
@@ -200,17 +210,27 @@ export default {
             </div>
             <div :class="{'col':true}">
             <ol style="list-style:none">
-            <!--render_unterelement(wert,bezeichnung)-->
+            
             <li v-for="(wert,bezeichnung) in second_col">
             
-            <p v-for="element in wert" v-if="typeof wert === 'object' && bezeichnung=='Kontakte'">
+            <!-- HIER IST DAS DATUM DES FH AUSWEIS -->
+            <div v-if="bezeichnung=='FhAusweisStatus'">
+            <p><b>FH-Ausweis Status</b></p>
+            <p >{{"Der FH Ausweis ist am "+ wert+ " ausgegeben worden."}}</p>
+            </div>
+
+
+            <!-- HIER SIND DIE PRIVATEN KONTAKTE -->
+            <div v-else-if="typeof wert === 'object' && bezeichnung=='Kontakte'">
+            <p><b>Private Kontakte</b></p>
+            <span style="display:block" v-for="element in wert" >
             {{element.kontakttyp + "  " + element.kontakt+"  " }}
             <i v-if="element.zustellung" class="fa-solid fa-check"></i>
             <i v-else="element.zustellung" class="fa-solid fa-xmark"></i>
+            </span>
+            </div>
             
-            </p>
-            
-            <p v-else >{{bezeichnung +": "+wert}}</p>
+            <!--<pre v-else>{{JSON.stringify(wert,null,2)}}</pre>-->
             
             </li>
             </ol>
@@ -223,7 +243,7 @@ export default {
             
             <div :class="{'col':true}">
             <core-filter-cmpt title="Funktionen"  ref="funktionenTable" :tabulator-options="funktionen_table_options" :tableOnly />
-           
+          
             </div>
             
             </div>
@@ -231,8 +251,9 @@ export default {
             <div :class="{'row':true}">
             
             <div :class="{'col':true}">
+               
             <core-filter-cmpt title="Entlehnte Betriebsmittel"  ref="betriebsmittelTable" :tabulator-options="betriebsmittel_table_options" :tableOnly />
-            
+       
             </div>
             </div>
             </div>
diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index 2bf878e5a..985dc9a6e 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -182,8 +182,11 @@ export const CoreFilterCmpt = {
 					const cols = this.tabulator.getColumns();
 					this.fields = cols.map(col => col.getField());
 					this.selectedFields = cols.filter(col => col.isVisible()).map(col => col.getField());
+					
 				});
+				
 			}
+			
 		},
 		updateTabulator() {
 			if (this.tabulator) {

From 9f336b4590740aca57cf295f0763de437cb42365 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 23 Nov 2023 15:38:55 +0100
Subject: [PATCH 0181/1461] Formatierungen modals, Tabulator

---
 .../Details/Kontakt/Address.js                | 28 +++---
 .../Details/Kontakt/Bankaccount.js            | 90 ++++++++++++++++---
 .../Details/Kontakt/Contact.js                | 13 +--
 3 files changed, 101 insertions(+), 30 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
index 13858c31f..7a0197dc9 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
@@ -54,8 +54,8 @@ export default{
 							return output;}
 					},
 					{title:"Anmerkung", field:"anmerkung", visible:false},
-					{title: "Actions",
-						columns:[
+/*					{title: "Actions",
+						columns:[*/
 							{formatter:editIcon, width:40, align:"center", cellClick: (e, cell) => {
 									this.actionEditAdress(cell.getData().adresse_id);
 									console.log(cell.getRow().getIndex(), cell.getData(), this);
@@ -64,8 +64,8 @@ export default{
 									this.actionDeleteAdress(cell.getData().adresse_id);
 									console.log(cell.getRow().getIndex(), cell.getData(), this);
 								}, width:50, headerSort:false },
-						],
-					},
+/*					],
+					},*/
 				],
 				layout: 'fitDataFill',
 				layoutColumnsOnNewData:	false,
@@ -295,7 +295,7 @@ export default{
 		<div class="stv-list h-100 pt-3">
 					
 		<!--		<Modal>   
-		 TODO(MANU) use BSModal, Validierungen
+		 TODO(MANU) use BSModal, Validierungen, utf-8? 
 		 -->
 				
 		<div ref="newAdressModal" class="modal fade" id="newAddressModal" tabindex="-1" aria-labelledby="newAddressModalLabel" aria-hidden="true">
@@ -376,7 +376,7 @@ export default{
 						
 					<div class="row mb-3">				
 						<label for="heimatadresse" class="form-label col-sm-4">Heimatadresse</label>
-						<div class="col-sm-3 align-self-center">
+						<div class="col-sm-3">
 							<div class="form-check">
 								<input id="heimatadresse" type="checkbox" class="form-check-input" value="1" v-model="formData['heimatadresse']">
 							</div>
@@ -385,7 +385,7 @@ export default{
 						
 					<div class="row mb-3">
 						<label for="zustelladresse" class="form-label col-sm-4">Zustelladresse</label>
-						<div class="col-sm-3 align-self-center">
+						<div class="col-sm-3">
 							<div class="form-check">	
 								<input id="zustelladresse" type="checkbox" class="form-check-input" value="1" v-model="formData['zustelladresse']">
 							</div>
@@ -401,7 +401,7 @@ export default{
 					
 					<div class="row mb-3">
 						<label for="rechnungsadresse" class="form-label col-sm-4">Rechnungsadresse</label>
-						<div class="col-sm-3 align-self-center">
+						<div class="col-sm-3">
 							<div class="form-check">	
 								<input id="rechnungsadresse" type="checkbox" class="form-check-input" v-model="formData['rechnungsadresse']">
 							</div>
@@ -411,13 +411,13 @@ export default{
 					<div class="row mb-3">
 						<label for="firma_name" class="form-label col-sm-4">Firma</label>
 							<div class="col-sm-3">
-							 	<PvAutoComplete v-model="formData['firma']" optionLabel="name" :suggestions="filteredFirmen" @complete="search" minLength="3"/>
+									<PvAutoComplete v-model="formData['firma']" optionLabel="name" :suggestions="filteredFirmen" @complete="search" minLength="3"/>
 							</div>	
 					</div>	
-
+					
 					<div class="row mb-3">											   
 						<label for="name" class="form-label col-sm-4">Name</label>
-						<div class="col-sm-2">
+						<div class="col-sm-3">
 							<input type="text" :readonly="readonly" class="form-control-sm" id="name" v-model="formData['name']">
 						</div>
 					</div>		
@@ -527,7 +527,7 @@ export default{
 					
 					<div class="row mb-3">				
 						<label for="heimatadresse" class="form-label col-sm-4">Heimatadresse</label>
-						<div class="col-sm-3 align-self-center">
+						<div class="col-sm-3">
 							<div class="form-check">
 								<input id="heimatadresse" type="checkbox" class="form-check-input" value="1" v-model="addressData['heimatadresse']">
 							</div>
@@ -536,7 +536,7 @@ export default{
 						
 					<div class="row mb-3">
 						<label for="zustelladresse" class="form-label col-sm-4">Zustelladresse</label>
-						<div class="col-sm-3 align-self-center">
+						<div class="col-sm-3">
 							<div class="form-check">	
 								<input id="zustelladresse" type="checkbox" class="form-check-input" value="1" v-model="addressData['zustelladresse']">
 							</div>
@@ -552,7 +552,7 @@ export default{
 					
 					<div class="row mb-3">
 						<label for="rechnungsadresse" class="form-label col-sm-4">Rechnungsadresse</label>
-						<div class="col-sm-3 align-self-center">
+						<div class="col-sm-3">
 							<div class="form-check">	
 								<input id="rechnungsadresse" type="checkbox" class="form-check-input" v-model="addressData['rechnungsadresse']">
 							</div>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
index f7e1016c9..ca55b08f7 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
@@ -1,5 +1,6 @@
 import {CoreFilterCmpt} from "../../../../filter/Filter.js";
 import {CoreRESTClient} from "../../../../../RESTClient";
+/*import {BsModal} from "../../../../Bootstrap/Modal.js";*/
 
 var editIcon = function(cell, formatterParams){ //plain text value
 	return "<i class='fa fa-edit'></i>";
@@ -10,7 +11,8 @@ var deleteIcon = function(cell, formatterParams) { //plain text value
 
 export default{
 	components: {
-		CoreFilterCmpt
+		CoreFilterCmpt,
+/*		BsModal*/
 	},
 	props: {
 		uid: String
@@ -51,8 +53,8 @@ export default{
 					},
 					{title:"Person_id", field:"person_id", visible:false},
 					{title:"Bankverbindung_id", field:"bankverbindung_id", visible:false},
-					{title: "Actions",
-						columns:[
+	/*				{title: "Actions",
+						columns:[*/
 							{formatter:editIcon, width:40, align:"center", cellClick: (e, cell) => {
 									this.actionEditBankverbindung(cell.getData().bankverbindung_id);
 									console.log(cell.getRow().getIndex(), cell.getData(), this);
@@ -61,8 +63,8 @@ export default{
 									this.actionDeleteBankverbindung(cell.getData().bankverbindung_id);
 									console.log(cell.getRow().getIndex(), cell.getData(), this);
 								}, width:50, headerSort:false },
-						],
-					},
+/*						],
+					},*/
 				],
 				layout: 'fitDataFill',
 				layoutColumnsOnNewData:	false,
@@ -186,6 +188,7 @@ export default{
 			}).finally(()=> {
 				window.scrollTo(0, 0);
 				this.hideModal('deleteBankverbindungModal');
+				this.resetModal();
 				this.reload();
 			});
 		},
@@ -203,6 +206,73 @@ export default{
 	template: `	
 		<div class="stv-list h-100 pt-3">
 		
+<!--		Todo(manu) BsModal-->
+<!--		<BsModal title="Bankverbindung anlegen" ref="newBankverbindungModal">
+            <template #body>
+                <form class="row g-3" v-if="currentAddress != null" ref="bankverbindungData" >
+					<div class="row mb-3">
+							<label for="name" class="form-label col-sm-4">Name</label>
+							<div class="col-sm-3">
+								<input type="text" :readonly="readonly" class="form-control-sm" id="name" v-model="bankverbindungData['name']">
+							</div>
+						</div>
+						<div class="row mb-3">											   
+							<label for="anschrift" class="form-label col-sm-4">Anschrift</label>
+							<div class="col-sm-3">
+								<input type="text" :readonly="readonly" class="form-control-sm" id="anschrift" v-model="bankverbindungData['anschrift']">
+							</div>
+						</div>	
+
+						<div class="row mb-3">											   
+							<label for="iban" class="form-label col-sm-4">IBAN</label>
+							<div class="col-sm-3">
+								<input type="text" :readonly="readonly" required class="form-control-sm" id="iban" v-model="bankverbindungData['iban']">
+							</div>
+						</div>	
+						<div class="row mb-3">											   
+							<label for="bic" class="form-label col-sm-4">BIC</label>
+							<div class="col-sm-3">
+								<input type="text" :readonly="readonly" class="form-control-sm" id="bic" v-model="bankverbindungData['bic']">
+							</div>
+						</div>	
+						<div class="row mb-3">											   
+							<label for="kontonr" class="form-label col-sm-4">Kontonummer</label>
+							<div class="col-sm-3">
+								<input type="text" :readonly="readonly" class="form-control-sm" id="kontonr" v-model="bankverbindungData['kontonr']">
+							</div>
+						</div>	
+						<div class="row mb-3">											   
+							<label for="blz" class="form-label col-sm-4">BLZ</label>
+							<div class="col-sm-3">
+								<input type="text" :readonly="readonly" class="form-control-sm" id="blz" v-model="bankverbindungData['blz']">
+							</div>
+						</div>		
+						<div class="row mb-3">
+							<label for="typ" class="form-label col-sm-4">Typ</label>
+							<div class="col-sm-5">
+								<select  id="typ" class="form-control" required v-model="bankverbindungData['typ']">
+									<option  value="p">Privatkonto</option>
+									<option  value="f">Firmenkonto</option>
+								</select>
+							</div>
+						</div>	
+						<div class="row mb-3">
+							<label for="verrechnung" class="form-label col-sm-4">Verrechnung</label>
+							<div class="col-sm-3">
+								<div class="form-check">	
+									<input id="verrechnung" type="checkbox" class="form-check-input" value="1" v-model="bankverbindungData['verrechnung']">
+								</div>
+							</div>
+						</div>	
+				</form>
+			</template>
+            <template #footer>
+            		<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
+					<button type="button" class="btn btn-primary" @click="addNewBankverbindung()">OK</button>
+            </template>
+					
+		</BsModal>-->
+		
 
 		<!--Modal: new Bankverbindung-->
 			<div ref="newBankverbindungModal" class="modal fade" id="newBankverbindungModal" tabindex="-1" aria-labelledby="newBankverbindungModalLabel" aria-hidden="true">
@@ -213,8 +283,7 @@ export default{
 					<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
 				  </div>
 				  <div class="modal-body">
-					<form ref="bankverbindungData">
-<!--					{{bankverbindungData}}	-->						
+					<form ref="bankverbindungData">				
 						<div class="row mb-3">
 							<label for="name" class="form-label col-sm-4">Name</label>
 							<div class="col-sm-3">
@@ -263,7 +332,7 @@ export default{
 						</div>	
 						<div class="row mb-3">
 							<label for="verrechnung" class="form-label col-sm-4">Verrechnung</label>
-							<div class="col-sm-3 align-self-center">
+							<div class="col-sm-3">
 								<div class="form-check">	
 									<input id="verrechnung" type="checkbox" class="form-check-input" value="1" v-model="bankverbindungData['verrechnung']">
 								</div>
@@ -341,7 +410,7 @@ export default{
 						</div>	
 						<div class="row mb-3">
 							<label for="verrechnung" class="form-label col-sm-4">Verrechnung</label>
-							<div class="col-sm-3 align-self-center">
+							<div class="col-sm-3">
 								<div class="form-check">	
 									<input id="verrechnung" type="checkbox" class="form-check-input" value="1" v-model="bankverbindungData['verrechnung']">
 								</div>
@@ -378,7 +447,8 @@ export default{
 				</div>
 			  </div>
 			</div>
-		
+			
+	
 			<core-filter-cmpt
 				ref="table"
 				:tabulator-options="tabulatorOptions"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
index 6bf4768a7..e5e7f322a 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
@@ -41,8 +41,8 @@ export default{
 					{title:"Kontakt_id", field:"kontakt_id", visible:false},
 					{title:"Standort_id", field:"standort_id", visible:false},
 					{title:"letzte Änderung", field:"updateamum", visible:false},
-					{title: "Actions",
-						columns:[
+	/*				{title: "Actions",
+						columns:[*/
 							{formatter:editIcon, cellClick: (e, cell) => {
 									this.actionEditContact(cell.getData().kontakt_id);
 									console.log(cell.getRow().getIndex(), cell.getData(), this);
@@ -51,8 +51,8 @@ export default{
 									this.actionDeleteContact(cell.getData().kontakt_id);
 									console.log(cell.getRow().getIndex(), cell.getData(), this);
 								}, width:50, headerSort:false, headerVisible:false },
-						],
-					},
+/*						],
+					},*/
 				],
 				layout: 'fitDataFill',
 				layoutColumnsOnNewData:	false,
@@ -162,6 +162,7 @@ export default{
 			}).finally(()=> {
 				window.scrollTo(0, 0);
 				this.hideModal('deleteContactModal');
+				this.resetModal();
 				this.reload();
 			});
 		},
@@ -263,7 +264,7 @@ export default{
 						
 						<div class="row mb-3">
 							<label for="zustellung" class="form-label col-sm-4">Zustellung</label>
-							<div class="col-sm-3 align-self-center">
+							<div class="col-sm-3">
 								<div class="form-check">	
 									<input id="zustellung" type="checkbox" class="form-check-input" value="1" v-model="contactData['zustellung']">
 								</div>
@@ -323,7 +324,7 @@ export default{
 							
 							<div class="row mb-3">
 								<label for="zustellung" class="form-label col-sm-4">Zustellung</label>
-								<div class="col-sm-3 align-self-center">
+								<div class="col-sm-3">
 									<div class="form-check">	
 										<input id="zustellung" type="checkbox" class="form-check-input" value="1" v-model="contactData['zustellung']">
 									</div>

From 27e228609666a6a1082387474b67335403630c08 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 23 Nov 2023 15:50:02 +0100
Subject: [PATCH 0182/1461] getNations

---
 .../controllers/components/stv/Kontakt.php       | 16 +++++++++++++++-
 .../Details/Kontakt/Address.js                   |  2 +-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/application/controllers/components/stv/Kontakt.php b/application/controllers/components/stv/Kontakt.php
index b4e7385aa..02c2ca70a 100644
--- a/application/controllers/components/stv/Kontakt.php
+++ b/application/controllers/components/stv/Kontakt.php
@@ -8,7 +8,6 @@ class Kontakt extends FHC_Controller
 {
 	public function __construct()
 	{
-		// TODO(chris): access!
 		parent::__construct();
 
 		// Load Libraries
@@ -217,6 +216,21 @@ class Kontakt extends FHC_Controller
 		return $this->outputJsonSuccess(current(getData($result)));
 	}
 
+	public function getNations()
+	{
+		$this->load->model('codex/Nation_model', 'NationModel');
+
+		$this->NationModel->addOrder('kurztext');
+
+		$result = $this->NationModel->load();
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->outputJson(getError($result));
+		} else {
+			$this->outputJson(getData($result) ?: []);
+		}
+	}
+
 	public function getAdressentypen()
 	{
 		$this->load->model('person/Adressentyp_model', 'AdressentypModel');
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
index 7a0197dc9..2c42ccc6b 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
@@ -275,7 +275,7 @@ export default{
 	},
 	created(){
 		CoreRESTClient
-			.get('components/stv/Student/getNations')
+			.get('components/stv/Kontakt/getNations')
 			.then(result => {
 				this.nations = result.data;
 			})

From 1817757745ec564b84f9ebf5423335ef2785d7f8 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Mon, 27 Nov 2023 12:01:04 +0100
Subject: [PATCH 0183/1461] adds the @ to the emails and changes the layout of
 the information displayed on the profile page

---
 application/controllers/Cis/Profil.php    | 20 +++++--
 public/js/components/Cis/Profil/Profil.js | 63 +++++++++++++++--------
 2 files changed, 58 insertions(+), 25 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index cbbc84145..048c25959 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -158,17 +158,31 @@ class Profil extends Auth_Controller
 			$mitarbeiter_res = hasData($mitarbeiter_res)? getData($mitarbeiter_res)[0] : null;
 		}
 
+		// collection for the first collumn
+		$first_column = new stdClass();
+		$first_column->username = getAuthUID();
+		$first_column->anrede = $person_res->anrede;
+		$first_column->titelpre = $person_res->titelpre;
+		$first_column->titelpost = $person_res->titelpost;
+		$first_column->vorname = $person_res->vorname;
+		$first_column->nachname = $person_res->nachname;
+		
+		
 		$res = new stdClass();
 		$res->username = getAuthUID();
+
+
 		//? Person Info
 		$res->foto = $person_res->foto;
 		$res->foto_sperre = $person_res->foto_sperre;
+		
 		$res->anrede = $person_res->anrede;
 		$res->titelpre = $person_res->titelpre;
 		$res->titelpost = $person_res->titelpost;
 		$res->vorname = $person_res->vorname;
 		$res->nachname = $person_res->nachname;
 		//$res->postnomen = $person_res->postnomen; //!POSTNOMEN?
+		
 		$res->gebdatum = $person_res->gebdatum;
 		$res->gebort = $person_res->gebort;
 		//? Mitarbeiter Info
@@ -177,10 +191,10 @@ class Profil extends Auth_Controller
 		//? Email Info 
 		$intern_email = array();
 		$intern_email+=array("type" => "intern");
-		$intern_email+=array("email"=> getAuthUID() . DOMAIN);
+		$intern_email+=array("email"=> getAuthUID() . "@" . DOMAIN);
 		$extern_email=array();
-		$extern_email+=array("type" => "extern");
-		$extern_email+=array("email" => $benutzer_res->alias . DOMAIN);
+		$extern_email+=array("type" => "alias");
+		$extern_email+=array("email" => $benutzer_res->alias . "@" . DOMAIN);
 		$res->emails = array($intern_email,$extern_email);
 		//? Adresse Info 
 		$res->adressen = $adresse_res;
diff --git a/public/js/components/Cis/Profil/Profil.js b/public/js/components/Cis/Profil/Profil.js
index 7361f8026..260d92b02 100644
--- a/public/js/components/Cis/Profil/Profil.js
+++ b/public/js/components/Cis/Profil/Profil.js
@@ -109,26 +109,33 @@ export default {
             }
             return "data:image/jpeg;base64,"+(this.person_info ? this.person_info.foto : "");
         },
-        first_col(){
+        personData(){
             if(!this.person_info){
                 return {};
             }
             //! postnomen is still missing
            return {
-                Username:this.uid,
+                Allgemein: {
+                    Username:this.uid,
                 Anrede:this.person_info.anrede,
                 Titel:(this.person_info.titelpre&&this.person_info.titelpost)?this.person_info.titelpre.concat(this.person_info.titelpost):"null",
                 Vorname:this.person_info.vorname,
                 Nachname:this.person_info.nachname,
                 Postnomen:null,
+            },
+            GeburtsDaten:{
                 Geburtsdatum:this.person_info.gebdatum,
                 Geburtsort: this.person_info.gebort,
-                Adresse: this.person_info.adressen,
+            },
+                Adressen: this.person_info.adressen,
+            SpecialInformation: {
                 Kurzzeichen: this.person_info.kurzbz,
                 Telefon: this.person_info.telefonklappe,
+            },
             };
         },
-        second_col(){
+        //? this computed conains all the information that is used for the second column that displays the information of the person
+        kontaktInfo(){
             if(!this.person_info){
                 return {};
             }
@@ -169,6 +176,7 @@ export default {
     },
      
     template: `
+   
     <div :class="{'container':true}">
     <div :class="{'row':true}">
     <div :class="{'col':true}">
@@ -180,7 +188,7 @@ export default {
     </div>
     </div>
 
-            <div :class="{'container':true}">
+            <div :class="{'container-fluid':true}">
             <!-- here starts the row of the whole window -->
             <div :class="{'row':true}">
             <!-- this is the left column of the window -->
@@ -197,37 +205,48 @@ export default {
             
             </div>
             <div :class="{'col':true}">
-            
            
-            <ol style="list-style:none">
-            <li  v-for="(wert,bezeichnung) in first_col">
+            <p v-if="role=='Mitarbeiter'"><b>Mitarbeiter</b></p>
+            <p v-else ><b>Student</b></p>
+            
+            <div v-for="(wert,bezeichnung) in personData">
+            
+            <div class="mb-3"  v-if="typeof wert == 'object' && bezeichnung=='Adressen'"><span style="display:block" v-for="element in wert">{{element.strasse}} <b>({{element.adr_typ}})</b><br/>{{ element.plz}} {{element.ort}}</span></div>
+            <div v-else class="mb-3" ><span style="display:block;" v-for="(val,bez) in wert">{{bez}}: {{val}}</span></div>
+            
+            </div>
             
-            <p v-for="element in wert" v-if="typeof wert == 'object' && bezeichnung=='Adresse'">{{element.strasse +" "+element.adr_typ+" " + element.plz+" "+element.ort}}</p>
-           
-            <p v-else>{{bezeichnung +": " +wert}}</p>
-            </li>
-            </ol>
             </div>
             <div :class="{'col':true}">
             <ol style="list-style:none">
             
-            <li v-for="(wert,bezeichnung) in second_col">
+            <li v-for="(wert,bezeichnung) in kontaktInfo">
             
             <!-- HIER IST DAS DATUM DES FH AUSWEIS -->
-            <div v-if="bezeichnung=='FhAusweisStatus'">
-            <p><b>FH-Ausweis Status</b></p>
-            <p >{{"Der FH Ausweis ist am "+ wert+ " ausgegeben worden."}}</p>
+            <div class="mb-3" v-if="bezeichnung=='FhAusweisStatus'">
+            <p class="mb-0"><b>FH-Ausweis Status</b></p>
+            <p class="mb-0">{{"Der FH Ausweis ist am "+ wert+ " ausgegeben worden."}}</p>
             </div>
 
+            <!-- HIER SIND DIE EMAILS -->
+      
+
+            <div class="mb-3" v-if="typeof wert === 'object' && bezeichnung == 'emails'">
+            <p class="mb-0"><b>eMail</b></p>
+            <p v-for="email in wert" class="mb-0">{{email.type}}: <a  :href="'mailto:'+email.email"><b>{{email.email}}</b></a></p>
+            </div>
 
             <!-- HIER SIND DIE PRIVATEN KONTAKTE -->
-            <div v-else-if="typeof wert === 'object' && bezeichnung=='Kontakte'">
-            <p><b>Private Kontakte</b></p>
-            <span style="display:block" v-for="element in wert" >
-            {{element.kontakttyp + "  " + element.kontakt+"  " }}
+            <div class="mb-3" v-if="typeof wert === 'object' && bezeichnung=='Kontakte'">
+            <p class="mb-0"><b>Private Kontakte</b></p>
+            <div class="row" v-for="element in wert" >
+            <div class="col-6">{{element.kontakttyp + "  " + element.kontakt+"  " }}</div>
+            <div class="col-3"> {{element?.anmerkung}}</div>
+            <div class="col-3"> 
             <i v-if="element.zustellung" class="fa-solid fa-check"></i>
             <i v-else="element.zustellung" class="fa-solid fa-xmark"></i>
-            </span>
+            </div>
+            </div>
             </div>
             
             <!--<pre v-else>{{JSON.stringify(wert,null,2)}}</pre>-->

From 2df956ef206e3a642f763c0d96b14c82d3480dde Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Mon, 27 Nov 2023 12:04:57 +0100
Subject: [PATCH 0184/1461] layout for index Mitarbeiter

---
 public/js/components/Cis/Profil/Profil.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Cis/Profil/Profil.js b/public/js/components/Cis/Profil/Profil.js
index 260d92b02..476677368 100644
--- a/public/js/components/Cis/Profil/Profil.js
+++ b/public/js/components/Cis/Profil/Profil.js
@@ -233,7 +233,7 @@ export default {
 
             <div class="mb-3" v-if="typeof wert === 'object' && bezeichnung == 'emails'">
             <p class="mb-0"><b>eMail</b></p>
-            <p v-for="email in wert" class="mb-0">{{email.type}}: <a  :href="'mailto:'+email.email"><b>{{email.email}}</b></a></p>
+            <p v-for="email in wert" class="mb-0">{{email.type}}: <a style="text-decoration:none" :href="'mailto:'+email.email">{{email.email}}</a></p>
             </div>
 
             <!-- HIER SIND DIE PRIVATEN KONTAKTE -->

From e3ec0fc36c61eae666f1a45f64df43f98df18d95 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Tue, 28 Nov 2023 14:55:42 +0100
Subject: [PATCH 0185/1461] upadtes api calls

---
 public/js/apps/api/userdata.js | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/public/js/apps/api/userdata.js b/public/js/apps/api/userdata.js
index 9550171c3..7f5b32704 100644
--- a/public/js/apps/api/userdata.js
+++ b/public/js/apps/api/userdata.js
@@ -27,5 +27,26 @@ export default {
         return axios.get(url);
     },
     
+    indexProfilInformaion: function() {
+        const url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router+
+                   "/Cis/Profil/indexProfilInformaion";
+        
+        return axios.get(url);
+    },
+    mitarbeiterProfil: function() {
+        const url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router+
+                   "/Cis/Profil/mitarbeiterProfil";
+        
+        return axios.get(url);
+    },
+    studentProfil: function() {
+        const url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router+
+                   "/Cis/Profil/studentProfil";
+        
+        return axios.get(url);
+    },
+
+
+    
  
 };
\ No newline at end of file

From c68856b7407adb3a1b5311747abda231f5bc4ce5 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Tue, 28 Nov 2023 14:56:42 +0100
Subject: [PATCH 0186/1461] completes the index view for both student and
 mitarbeiter

---
 application/controllers/Cis/Profil.php    | 231 +++++++++++++++++++++-
 public/js/components/Cis/Profil/Profil.js | 167 ++++++++++------
 2 files changed, 324 insertions(+), 74 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index 048c25959..d6ec53a1a 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -19,6 +19,10 @@ class Profil extends Auth_Controller
 			'isMitarbeiterOrStudent' => ['student/anrechnung_beantragen:r','user:r'],
 			'getMitarbeiterAnsicht' => ['student/anrechnung_beantragen:r','user:r'],
 			'foto_sperre_function' => ['student/anrechnung_beantragen:r','user:r'],
+			'indexProfilInformaion' => ['student/anrechnung_beantragen:r','user:r'],
+			'mitarbeiterProfil' => ['student/anrechnung_beantragen:r','user:r'],
+			'studentProfil' => ['student/anrechnung_beantragen:r','user:r'],
+			
 			
 			
 			
@@ -29,8 +33,11 @@ class Profil extends Auth_Controller
 		$this->load->model('person/Person_model', 'PersonModel');
 		$this->load->model('person/Adresse_model', 'AdresseModel');
 		$this->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
+		$this->load->model('person/Benutzergruppe_model', 'BenutzergruppeModel');
 		$this->load->model('ressource/Betriebsmittelperson_model', 'BetriebsmittelpersonModel');
 		$this->load->model('person/Kontakt_model', 'KontaktModel');
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 		
 		
 	}
@@ -51,10 +58,223 @@ class Profil extends Auth_Controller
 	}
 
 
+	public function studentProfil(){
+
+		if(
+		isSuccess($this->BenutzergruppeModel->addSelect(['bezeichnung']))
+		&& isSuccess($this->BenutzergruppeModel->addJoin('tbl_gruppe', 'gruppe_kurzbz' ))
+		){
+			$zutrittsgruppe_res = $this->BenutzergruppeModel->loadWhere(array("uid"=>getAuthUID(), "zutrittssystem"=>true));
+			if(isError($zutrittsgruppe_res)){
+				// catch error
+			}
+			$zutrittsgruppe_res = hasData($zutrittsgruppe_res) ? getData($zutrittsgruppe_res) : null;
+			
+		}
+		
+
+
+		//? personenkennzeichen ist die Spalte Matrikelnr in der Tabelle Student
+		if(isSuccess($this->StudentModel->addSelect(['tbl_studiengang.bezeichnung as studiengang','tbl_student.semester', 'tbl_student.verband', 'tbl_student.gruppe' ,'tbl_student.matrikelnr as personenkennzeichen']))
+		 && isSuccess($this->StudentModel->addJoin('tbl_studiengang', "tbl_studiengang.studiengang_kz=tbl_student.studiengang_kz")))
+		{
+			$student_res = $this->StudentModel->load([getAuthUID()]);
+			if(isError($student_res)){
+				// catch error
+			}
+			$student_res = hasData($student_res)?getData($student_res)[0]:null;
+		
+		}
+		
+
+		
+		//? Matrikelnummer ist die Spalte matr_nr in Person
+		if(isSuccess($this->StudentModel->addSelect(["matr_nr"]))){
+			$person_res = $this->PersonModel->load(getAuthPersonID());
+			if(isError($person_res)){
+				// catch error
+			}else{
+				$person_res = hasData($person_res)? getData($person_res)[0] : [];
+				
+			}
+		}
+
+		$res = new stdClass();
+		$res->matrikelnummer = $person_res->matr_nr;
+		foreach($student_res as $key => $value){
+			$res->$key = $value;
+		}
+		$res->zuttritsgruppen = $zutrittsgruppe_res;
+		
+		echo json_encode($res);
+		
+		 
+
+	}
+
+	public function mitarbeiterProfil(){
+	//? informationen die nur für den Mitarbeiter verfügbar sind
+
+
+	if(
+		//! Summe der Wochenstunden wird jetzt in der hr/tbl_dienstverhaeltnis gespeichert
+	isSuccess($this->BenutzerfunktionModel->addSelect(["tbl_benutzerfunktion.bezeichnung as Bezeichnung","tbl_organisationseinheit.bezeichnung as Organisationseinheit","datum_von as Gültig_von","datum_bis as Gültig_bis","wochenstunden as Wochenstunden"]))&&
+		isSuccess($this->BenutzerfunktionModel->addJoin("tbl_organisationseinheit","oe_kurzbz"))
+	){
+		$benutzer_funktion_res = $this->BenutzerfunktionModel->loadWhere(array('uid'=>getAuthUID()));
+		if(isError($benutzer_funktion_res)){
+			// error handling
+		}else{
+			$benutzer_funktion_res = hasData($benutzer_funktion_res)? getData($benutzer_funktion_res) : null;
+		}
+	}
+
+
+
+	if(isSuccess($this->MitarbeiterModel->addSelect(["kurzbz","telefonklappe", "alias"]))
+		&& isSuccess($this->MitarbeiterModel->addJoin("tbl_benutzer", "tbl_benutzer.uid = tbl_mitarbeiter.mitarbeiter_uid"))
+	){
+		$mitarbeiter_res = $this->MitarbeiterModel->load(getAuthUID());
+			if(isError($mitarbeiter_res)){
+				// error handling
+			}else{
+				$mitarbeiter_res = hasData($mitarbeiter_res)? getData($mitarbeiter_res)[0] : null;
+			}
+		}
 	
+		$res = new stdClass();
+		foreach($mitarbeiter_res as $key => $value){
+			$res->$key = $value;
+		}
+		$intern_email = array();
+		$intern_email+=array("type" => "intern");
+		$intern_email+=array("email"=> getAuthUID() . "@" . DOMAIN);
+		$extern_email=array();
+		$extern_email+=array("type" => "alias");
+		$extern_email+=array("email" => $mitarbeiter_res->alias . "@" . DOMAIN);
+		$res->emails = array($intern_email,$extern_email);
+		
+		$res->funktionen = $benutzer_funktion_res;
+		echo json_encode($res);
+	}
+
+	public function indexProfilInformaion(){
+		//? funktion returns all data needed for the student and the mitarbeiter profil view
+
+
+
+		if(
+			isSuccess($this->PersonModel->addSelect('gruppe_kurzbz, beschreibung'))&&
+			isSuccess($this->PersonModel->addJoin('tbl_benutzer', 'person_id')) && 
+		isSuccess($this->PersonModel->addJoin('tbl_benutzergruppe', 'uid')) &&
+		isSuccess($this->PersonModel->addJoin('tbl_gruppe', 'gruppe_kurzbz'))){
+
+			$mailverteiler_res = $this->PersonModel->loadWhere(array('mailgrp' => true, 'uid'=>getAuthUID()));
+			if( isError($mailverteiler_res)){
+				// catch error
+			}
+			$mailverteiler_res = hasData($mailverteiler_res)? getData($mailverteiler_res) : null;
+			
+			$mailverteiler_res = array_map(function($element) { $element->mailto="mailto:".$element->gruppe_kurzbz."@".DOMAIN; return $element;},$mailverteiler_res);
+		}
+
+		
+
+		if(
+			isSuccess($this->BetriebsmittelpersonModel->addSelect(["CONCAT(betriebsmitteltyp, ' ' ,beschreibung) as Betriebsmittel","nummer as Nummer","ausgegebenam as Ausgegeben_am"]))
+			
+		){
+			$betriebsmittelperson_res = $this->BetriebsmittelpersonModel->getBetriebsmittel(getAuthPersonId());
+			if(isError($betriebsmittelperson_res)){
+				   // error handling
+			   }else{
+				   $betriebsmittelperson_res = hasData($betriebsmittelperson_res)? getData($betriebsmittelperson_res) : null;
+			   }
+		   }
+
+
+		if(isSuccess($this->KontaktModel->addSelect('DISTINCT ON (kontakttyp) kontakttyp, kontakt, tbl_kontakt.anmerkung, tbl_kontakt.zustellung')) &&
+		isSuccess($this->KontaktModel->addJoin('public.tbl_standort', 'standort_id', 'LEFT')) &&
+		isSuccess($this->KontaktModel->addJoin('public.tbl_firma', 'firma_id', 'LEFT'))&&
+		isSuccess($this->KontaktModel->addOrder('kontakttyp, kontakt, tbl_kontakt.updateamum, tbl_kontakt.insertamum'))
+		){
+			$kontakte_res = $this->KontaktModel->loadWhere(array('person_id' => getAuthPersonID()));
+			if(isError($kontakte_res)){
+				// handle error	
+			}else{
+				$kontakte_res = hasData($kontakte_res)? getData($kontakte_res) : null;
+			}
+			
+		}
+		
+		$zutrittskarte_ausgegebenam = $this->BetriebsmittelpersonModel->getBetriebsmittelByUid(getAuthUID(),"Zutrittskarte");
+		if(isError($zutrittskarte_ausgegebenam)){
+			// error handling
+		}else{
+			$zutrittskarte_ausgegebenam = hasData($zutrittskarte_ausgegebenam)? getData($zutrittskarte_ausgegebenam)[0]->ausgegebenam : null;
+			//? formats the date from 01-01-2000 to 01.01.2000
+			$zutrittskarte_ausgegebenam = str_replace("-",".",$zutrittskarte_ausgegebenam);
+		}
+
+		if(
+			isSuccess($adresse_res = $this->AdresseModel->addSelect(array("strasse","tbl_adressentyp.bezeichnung as adr_typ","plz","ort")))&&
+			isSuccess($adresse_res = $this->AdresseModel->addOrder("zustelladresse","DESC"))&&
+			isSuccess($adresse_res = $this->AdresseModel->addOrder("sort"))&&
+			isSuccess($adresse_res = $this->AdresseModel->addJoin("tbl_adressentyp","typ=adressentyp_kurzbz"))
+		){
+			$adresse_res = $this->AdresseModel->loadWhere(array("person_id"=>getAuthPersonID()));
+			if(isError($adresse_res)){
+				// error handling
+			}else{									
+				$adresse_res = hasData($adresse_res)? getData($adresse_res) : null;
+			}
+		}
+		
+		if(isSuccess($this->PersonModel->addSelect(["foto","foto_sperre","anrede","titelpost","titelpre","vorname","nachname", "gebort", "gebdatum"]))){
+
+			$person_res = $this->PersonModel->load(getAuthPersonId());
+			if(isError($person_res)){
+				// error handling
+			}else{
+				$person_res = hasData($person_res)? getData($person_res)[0] : null;
+			}
+		}
+		
+
+				
+		$res = new stdClass();
+		$res->foto = $person_res->foto;
+		$res->foto_sperre = $person_res->foto_sperre;
+		$res->username = getAuthUID();
+		
+		$res->anrede = $person_res->anrede;
+		$res->titel = $person_res->titelpre ." " . $person_res->titelpost;
+		$res->vorname = $person_res->vorname;
+		$res->nachname = $person_res->nachname;
+		$res->gebort = $person_res->gebort;
+		$res->gebdatum = $person_res->gebdatum;
+		$res->adressen = $adresse_res;
+		$res->zutrittsdatum = $zutrittskarte_ausgegebenam;
+		//$res->postnomen = $person_res->postnomen; //! still not found
+		$intern_email = array();
+		$intern_email+=array("type" => "intern");
+		$intern_email+=array("email"=> getAuthUID() . "@" . DOMAIN);
+		$res->emails = array($intern_email);
+
+		$res->kontakte = $kontakte_res;
+		$res->mittel = $betriebsmittelperson_res;
+		$res->mailverteiler = $mailverteiler_res;
+		 
+
+
+		echo json_encode($res);
+
+	}
 
 	public function getMitarbeiterAnsicht(){
 
+		
+
 		if(
 			isSuccess($this->PersonModel->addSelect('gruppe_kurzbz, beschreibung'))&&
 			isSuccess($this->PersonModel->addJoin('tbl_benutzer', 'person_id')) && 
@@ -158,15 +378,6 @@ class Profil extends Auth_Controller
 			$mitarbeiter_res = hasData($mitarbeiter_res)? getData($mitarbeiter_res)[0] : null;
 		}
 
-		// collection for the first collumn
-		$first_column = new stdClass();
-		$first_column->username = getAuthUID();
-		$first_column->anrede = $person_res->anrede;
-		$first_column->titelpre = $person_res->titelpre;
-		$first_column->titelpost = $person_res->titelpost;
-		$first_column->vorname = $person_res->vorname;
-		$first_column->nachname = $person_res->nachname;
-		
 		
 		$res = new stdClass();
 		$res->username = getAuthUID();
@@ -208,7 +419,7 @@ class Profil extends Auth_Controller
 		$res->kontakte = $kontakte_res;
 		//? Mailverteiler Info
 		$res->mailverteiler = $mailverteiler_res;
-		
+		 
 		echo json_encode($res);
 		
 	}
diff --git a/public/js/components/Cis/Profil/Profil.js b/public/js/components/Cis/Profil/Profil.js
index 476677368..c27893551 100644
--- a/public/js/components/Cis/Profil/Profil.js
+++ b/public/js/components/Cis/Profil/Profil.js
@@ -23,8 +23,9 @@ export default {
     },
     data() {
         return {
-            
-            person_info: null,
+            index_information: null,
+            mitarbeiter_info: null,
+            student_info:null,
             //? beinhaltet die Information ob der angefragte user ein Student oder Mitarbeiter ist
             role: null,
             //"bf_bezeichnung", "oe_bezeichnung", "datum_von", "datum_bis", "wochenstunden" ]
@@ -32,10 +33,7 @@ export default {
             funktionen_table_options: {
                 height: 300,
                 layout: 'fitColumns',
-                //ajaxUrl: FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router+
-                //"/Cis/Profil/getBenutzerFunktionen",
                 data:[{Bezeichnung:"test1",Organisationseinheit:"test2",Gültig_von:"test3",Gültig_bis:"test4",Wochenstunden:"test5"}],
-                
                 columns: [{title: 'Bezeichnung', field: 'Bezeichnung', headerFilter: true},
                 {title: 'Organisationseinheit', field: 'Organisationseinheit', headerFilter: true},
                 {title: 'Gültig_von', field: 'Gültig_von', headerFilter: true},
@@ -47,12 +45,17 @@ export default {
                 height: 300,
                 layout: 'fitColumns',
                 data:[{betriebsmittel:"test1",Nummer:"test2",Ausgegeben_am:"test3"}],
-                
                 columns: [{title: 'Betriebsmittel', field: 'betriebsmittel', headerFilter: true},
                 {title: 'Nummer', field: 'Nummer', headerFilter: true},
                 {title: 'Ausgegeben_am', field: 'Ausgegeben_am', headerFilter: true},]
                 
             },
+            zutrittsgruppen_table_options:{
+                height: 300,
+                layout: 'fitColumns',
+                data:[{bezeichnung:"test1"}],
+                columns: [{title: 'Zutritt', field: 'bezeichnung'}]
+            }
         }
     },
     
@@ -80,12 +83,12 @@ export default {
             return result;
         },
         sperre_foto_function(value){
-            if(!this.person_info){
+            if(!(this.mitarbeiter_info && this.index_information && this.student_info) ){
                 return;
             }
             fhcapifactory.UserData.sperre_foto_function(value).then(res => {
                     
-                    this.person_info.foto_sperre = res.data.foto_sperre;
+                    this.index_information.foto_sperre = res.data.foto_sperre;
                 
             });
             
@@ -94,56 +97,63 @@ export default {
         
     },
     computed:{
-        test_computed(){
-            return "test_computed";
-        },
-        get_Functions_Tabulator_Columns(){
-            if(!this.person_info){
-                return [];
-            }
-            return Object.keys(this.person_info.funktionen[0]).map(key => {return {title: key,field:key, headerFilter:true}});
-        },
+     
+        
         get_image_base64_src(){
-            if(!this.person_info){
+            if(!this.index_information){
                 return "";
             }
-            return "data:image/jpeg;base64,"+(this.person_info ? this.person_info.foto : "");
+            return "data:image/jpeg;base64,"+this.index_information.foto;
         },
         personData(){
-            if(!this.person_info){
+            if(!this.index_information){
                 return {};
             }
-            //! postnomen is still missing
+  
            return {
-                Allgemein: {
-                    Username:this.uid,
-                Anrede:this.person_info.anrede,
-                Titel:(this.person_info.titelpre&&this.person_info.titelpost)?this.person_info.titelpre.concat(this.person_info.titelpost):"null",
-                Vorname:this.person_info.vorname,
-                Nachname:this.person_info.nachname,
+                Allgemein: this.role =='Mitarbeiter'?{
+                    Username:this.index_information.username,
+                    Anrede:this.index_information.anrede,
+                    Titel:this.index_information.titel,
+                    Vorname:this.index_information.vorname,
+                    Nachname:this.index_information.nachname,
+                    Postnomen:null,
+            }:{
+                Username:this.index_information.username,
+                Matrikelnummer: this.student_info?.matrikelnummer,
+                Anrede:this.index_information.anrede,
+                Titel:this.index_information.titel,
+                Vorname:this.index_information.vorname,
+                Nachname:this.index_information.nachname,
                 Postnomen:null,
             },
             GeburtsDaten:{
-                Geburtsdatum:this.person_info.gebdatum,
-                Geburtsort: this.person_info.gebort,
+                Geburtsdatum:this.index_information.gebdatum,
+                Geburtsort: this.index_information.gebort,
             },
-                Adressen: this.person_info.adressen,
-            SpecialInformation: {
-                Kurzzeichen: this.person_info.kurzbz,
-                Telefon: this.person_info.telefonklappe,
+                Adressen: this.index_information.adressen,
+            SpecialInformation: this.role =='Mitarbeiter'?  {
+                Kurzzeichen: this.mitarbeiter_info?.kurzbz,
+                Telefon: this.mitarbeiter_info?.telefonklappe,
+            } : {
+                Studiengang:this.student_info?.studiengang,
+                Semester:this.student_info?.semester,
+                Verband:this.student_info?.verband,
+                Gruppe:this.student_info?.gruppe,
+                Personenkennzeichen:this.student_info?.personenkennzeichen
             },
             };
         },
         //? this computed conains all the information that is used for the second column that displays the information of the person
         kontaktInfo(){
-            if(!this.person_info){
+            if(!this.index_information){
                 return {};
             }
-            //! postnomen is still missing
+         
            return {
-                FhAusweisStatus: this.person_info.zutrittskarte_ausgegebenam,
-                emails:this.person_info.emails,
-                Kontakte:this.person_info.kontakte,
+                FhAusweisStatus: this.index_information.zutrittsdatum,
+                emails: this.role === 'Mitarbeiter'?  this.mitarbeiter_info?.emails: this.index_information.emails,
+                Kontakte:this.index_information.kontakte,
             };
         },
         
@@ -151,26 +161,54 @@ export default {
     
     created(){
         
-        //error //! fhcapifactory.UserData.getUser().then(res => this.person = res.data);
-        fhcapifactory.UserData.isMitarbeiterOrStudent(this.uid).then(res => {this.role = res.data;});
+   
+        
         
         
-        //.tabulator.setData(this.person_info?.funktionen);
         
     },
      mounted(){
+
+        console.log(this.uid);
+        console.log(this.pid);
+
         //? this function is to update the tabulator information only when the tabulator was build checking the tableBulit event
         //! only the tableBuilt event of the second tabulator was used to update the table informations
-        this.$refs.betriebsmittelTable.tabulator.on('tableBuilt', () => {
-            fhcapifactory.UserData.getMitarbeiterAnsicht().then((res)=>{
-                this.person_info = res.data;
-                this.$refs.funktionenTable.tabulator.setData(res.data.funktionen);
-                this.$refs.betriebsmittelTable.tabulator.setData(res.data.mittel);
+         this.$refs.betriebsmittelTable.tabulator.on('tableBuilt', () => {
+           
+            fhcapifactory.UserData.isMitarbeiterOrStudent(this.uid).then((res) => {
+                this.role = res.data;
+            
+
+                //? Die anderen api calls werden erst gemacht wenn der call zu isMitarbeiterOrStudent gemacht worden ist
+
+
+                //! indexProfilInformationen werden immer gefetcht
+                fhcapifactory.UserData.indexProfilInformaion().then((res) => {
+                    this.index_information = res.data;
+                    this.$refs.betriebsmittelTable.tabulator.setData(res.data.mittel);
+                });
                 
-            })
-        })
-        
-        
+
+                //? Danach werden die Informationen der Role gefetcht
+                if(this.role === 'Student'){ 
+                    fhcapifactory.UserData.studentProfil().then((res)=> {
+                        this.student_info = res.data;
+                        this.$refs.zutrittsgruppenTable.tabulator.setData(res.data.zuttritsgruppen);
+                    })
+                }
+                
+                if(this.role === 'Mitarbeiter'){
+                    fhcapifactory.UserData.mitarbeiterProfil().then((res)=> {
+                        this.mitarbeiter_info = res.data;
+                        this.$refs.funktionenTable.tabulator.setData(res.data.funktionen);
+                    })
+                }   
+            });
+            
+
+        }) 
+
         
         
     },
@@ -196,7 +234,7 @@ export default {
             <div :class="{'row':true}">
             <div :class="{'col':true}">
             <img :class="{'img-thumbnail':true}" :src="get_image_base64_src"></img>
-            <div v-if="person_info?.foto_sperre">
+            <div v-if="index_information?.foto_sperre">
             <p style="margin:0">Profilfoto gesperrt</p>
             <a href="#" @click.prevent="sperre_foto_function(false)" style="text-decoration:none">Sperre des Profilfotos aufheben</a>
             </div>
@@ -206,8 +244,8 @@ export default {
             </div>
             <div :class="{'col':true}">
            
-            <p v-if="role=='Mitarbeiter'"><b>Mitarbeiter</b></p>
-            <p v-else ><b>Student</b></p>
+            <h3 v-if="role=='Mitarbeiter'">Mitarbeiter</h3>
+            <h3 v-else >Student</h3>
             
             <div v-for="(wert,bezeichnung) in personData">
             
@@ -240,9 +278,9 @@ export default {
             <div class="mb-3" v-if="typeof wert === 'object' && bezeichnung=='Kontakte'">
             <p class="mb-0"><b>Private Kontakte</b></p>
             <div class="row" v-for="element in wert" >
-            <div class="col-6">{{element.kontakttyp + "  " + element.kontakt+"  " }}</div>
-            <div class="col-3"> {{element?.anmerkung}}</div>
-            <div class="col-3"> 
+            <div class="col-8">{{element.kontakttyp + ":  " + element.kontakt+"  " }}</div>
+            <div class="col-2"> {{element?.anmerkung}}</div>
+            <div class="col-2"> 
             <i v-if="element.zustellung" class="fa-solid fa-check"></i>
             <i v-else="element.zustellung" class="fa-solid fa-xmark"></i>
             </div>
@@ -260,21 +298,22 @@ export default {
             
             <div :class="{'row':true}">
             
-            <div :class="{'col':true}">
-            <core-filter-cmpt title="Funktionen"  ref="funktionenTable" :tabulator-options="funktionen_table_options" :tableOnly />
+            <!-- order-1 classe wird nur bei der Studentenansicht hinzugefügt um die Zutrittsgruppen Tabelle hinter der Betriebsmittel aufzureihen -->
+            <div :class="{'col-12':true, 'order-2':role==='Student'}">
           
-            </div>
+            <core-filter-cmpt v-if="role === 'Mitarbeiter'" title="Funktionen"  ref="funktionenTable" :tabulator-options="funktionen_table_options" :tableOnly />
+            <core-filter-cmpt v-else title="Zutrittsgruppen" ref="zutrittsgruppenTable" :tabulator-options="zutrittsgruppen_table_options" :tableOnly :noColFilter />
             
             </div>
-
-            <div :class="{'row':true}">
-            
-            <div :class="{'col':true}">
+            <div :class="{'col-12':true}">
                
             <core-filter-cmpt title="Entlehnte Betriebsmittel"  ref="betriebsmittelTable" :tabulator-options="betriebsmittel_table_options" :tableOnly />
        
             </div>
+            
             </div>
+
+           
             </div>
 
             <div  :class="{'col-3':true}">
@@ -286,7 +325,7 @@ export default {
             <div :class="{'row':true}">
             <h5 :class="{'fs-3':true}" style="margin-top:1em">Mailverteilers</h5>
             <p :class="{'fs-6':true}">Sie sind Mitgglied in folgenden Verteilern:</p>
-            <div  :class="{'row':true, 'text-break':true}" v-for="verteiler in person_info?.mailverteiler">
+            <div  :class="{'row':true, 'text-break':true}" v-for="verteiler in index_information?.mailverteiler">
             <div :class="{'col-6':true}"><a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a></div> 
             <div :class="{'col-6':true}">{{verteiler.beschreibung}}</div>
             </div>

From f26801b7dee3c338cf55fa19eda3e3dea6152080 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Tue, 28 Nov 2023 14:58:16 +0100
Subject: [PATCH 0187/1461] adds a prop to the FilterTable component to
 conditionally render the filter columns, this was added because there is no
 need for a filter column when the table only has 1 column

---
 public/js/components/filter/Filter.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index 985dc9a6e..b5a132318 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -45,7 +45,8 @@ export const CoreFilterCmpt = {
 		},
 		tabulatorOptions: Object,
 		tabulatorEvents: Array,
-		tableOnly: Boolean
+		tableOnly: Boolean,
+		noColFilter:Boolean,
 	},
 	data: function() {
 		return {
@@ -586,10 +587,10 @@ export const CoreFilterCmpt = {
 			<div class="filter-header-title">
 				<span v-if="!tableOnly" class="filter-header-title-span-filter">[ {{ filterName }} ]</span>
 				<span v-if="!tableOnly" data-bs-toggle="collapse" :data-bs-target="'#collapseFilters' + idExtra" class="filter-header-title-span-icon fa-solid fa-filter fa-xl"></span>
-				<span data-bs-toggle="collapse" :data-bs-target="'#collapseColumns' + idExtra" class="filter-header-title-span-icon fa-solid fa-table-columns fa-xl"></span>
+				<span v-if="!noColFilter" data-bs-toggle="collapse" :data-bs-target="'#collapseColumns' + idExtra" class="filter-header-title-span-icon fa-solid fa-table-columns fa-xl"></span>
 			</div>
 
-			<div :id="'collapseColumns' + idExtra" class="card-body collapse" :data-bs-parent="'#filterCollapsables' + idExtra">
+			<div v-if="!noColFilter" :id="'collapseColumns' + idExtra" class="card-body collapse" :data-bs-parent="'#filterCollapsables' + idExtra">
 				<div class="card">
 					<!-- Filter fields options -->
 					<div class="row card-body filter-options-div">

From 7a3bb2a37483de76b0e26cf0e6fc90b3dc268069 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 28 Nov 2023 16:55:20 +0100
Subject: [PATCH 0188/1461] =?UTF-8?q?Section=20Kontakt=20und=20Bankverbind?=
 =?UTF-8?q?ungen=20=C3=BCberarbeitet?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controllers/components/stv/Kontakt.php    |  46 +-
 .../controllers/components/stv/Notizen.php    |   0
 .../Details/Kontakt/Address.js                | 242 +++++++++--
 .../Details/Kontakt/Bankaccount.js            | 394 +++++++-----------
 .../Details/Kontakt/Contact.js                | 210 +++++-----
 5 files changed, 490 insertions(+), 402 deletions(-)
 create mode 100644 application/controllers/components/stv/Notizen.php

diff --git a/application/controllers/components/stv/Kontakt.php b/application/controllers/components/stv/Kontakt.php
index 02c2ca70a..c63c8c25a 100644
--- a/application/controllers/components/stv/Kontakt.php
+++ b/application/controllers/components/stv/Kontakt.php
@@ -47,7 +47,7 @@ class Kontakt extends FHC_Controller
 		$this->load->library('form_validation');
 		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
 
-		$this->form_validation->set_rules('plz', 'PLZ', 'required');
+		$this->form_validation->set_rules('plz', 'PLZ', 'required|numeric');
 
 		if ($this->form_validation->run() == false)
 		{
@@ -56,6 +56,7 @@ class Kontakt extends FHC_Controller
 
 		$this->load->model('person/Adresse_model', 'AdresseModel');
 
+		$uid = getAuthUID();
 		$co_name = isset($_POST['co_name']) ? $_POST['co_name'] : null;
 		$strasse = isset($_POST['strasse']) ? $_POST['strasse'] : null;
 		$ort = isset($_POST['ort']) ? $_POST['ort'] : null;
@@ -76,7 +77,7 @@ class Kontakt extends FHC_Controller
 			[
 				'person_id' => $person_id,
 				'strasse' =>  $strasse,
-				'insertvon' => 'uid',
+				'insertvon' => $uid,
 				'insertamum' => date('c'),
 				'plz' => $_POST['plz'],
 				'ort' => $ort,
@@ -104,8 +105,9 @@ class Kontakt extends FHC_Controller
 
 	public function updateAddress($address_id)
 	{
+		$uid = getAuthUID();
 		$this->load->library('form_validation');
-		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+		$_POST = json_decode($this->input->raw_input_stream, true);
 
 		$this->form_validation->set_rules('plz', 'PLZ', 'required');
 
@@ -143,7 +145,7 @@ class Kontakt extends FHC_Controller
 		],
 			[	'person_id' => $person_id,
 				'strasse' =>  $strasse,
-				'updatevon' => 'uid',
+				'updatevon' => $uid,
 				'updateamum' => date('c'),
 				'plz' => $_POST['plz'],
 				'ort' => $ort,
@@ -216,6 +218,7 @@ class Kontakt extends FHC_Controller
 		return $this->outputJsonSuccess(current(getData($result)));
 	}
 
+/*	TODO Manu bereits in Address.ph*/
 	public function getNations()
 	{
 		$this->load->model('codex/Nation_model', 'NationModel');
@@ -289,12 +292,21 @@ class Kontakt extends FHC_Controller
 		$this->load->model('person/Adresse_model', 'AdresseModel');
 
 		//$ort = isset($ortschaft) ? $ortschaft : null;
-		if(isset($gemeinde)) {
+		if(isset($gemeinde)) {var_dump($gemeinde);
 			$gemeinde = urldecode($gemeinde);
 		}
 		else
 			$gemeinde = null;
 
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules($plz, 'PLZ', 'numeric|less_than[10000]');
+		if ($this->form_validation->run() == false) {
+			return $this->outputJsonError($this->form_validation->error_array());
+/*			$this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST);
+			return $this->outputJsonError($this->form_validation->error_array());*/
+		}
+
 		$result = $this->AdresseModel->getOrtschaften($plz, $gemeinde);
 		if (isError($result)) {
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
@@ -366,18 +378,18 @@ class Kontakt extends FHC_Controller
 		}
 	}
 
-	public function loadContact($kontact_id)
+	public function loadContact($kontakt_id)
 	{
 		$this->load->model('person/Kontakt_model', 'KontaktModel');
 
-		$this->AdresseModel->addSelect('public.tbl_kontakt.*');
+		$this->KontaktModel->addSelect('public.tbl_kontakt.*');
 		$this->KontaktModel->addSelect('st.kurzbz');
 		$this->KontaktModel->addJoin('public.tbl_standort st', 'ON (public.tbl_kontakt.standort_id = st.standort_id)', 'LEFT');
 
 		$this->KontaktModel->addLimit(1);
 
 		$result = $this->KontaktModel->loadWhere(
-			array('kontakt_id' => $kontact_id)
+			array('kontakt_id' => $kontakt_id)
 		);
 		if (isError($result)) {
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
@@ -405,6 +417,13 @@ class Kontakt extends FHC_Controller
 		else
 			$this->form_validation->set_rules('kontakt', 'Kontakt', 'required');
 
+/*		if(($_POST['kontakttyp'] == 'email' && isset($_POST['kontakt'])))
+		{
+			$this->form_validation->set_data(['email' => $_POST['kontakt']]);
+			$this->form_validation->set_rules('email', 'email', 'valid_email|required]');
+		}*/
+
+
 		if ($this->form_validation->run() == false)
 		{
 			return $this->outputJsonError($this->form_validation->error_array());
@@ -420,6 +439,7 @@ class Kontakt extends FHC_Controller
 		else
 			$standort_id = null;
 
+		$uid = getAuthUID();
 		$kontakttyp = isset($_POST['kontakttyp']) ? $_POST['kontakttyp'] : null;
 		$anmerkung = isset($_POST['anmerkung']) ? $_POST['anmerkung'] : null;
 		$kontakt = isset($_POST['kontakt']) ? $_POST['kontakt'] : null;
@@ -432,7 +452,7 @@ class Kontakt extends FHC_Controller
 				'anmerkung' => $anmerkung,
 				'kontakt' => $kontakt,
 				'zustellung' => $_POST['zustellung'],
-				'insertvon' => 'uid',
+				'insertvon' => $uid,
 				'insertamum' => date('c'),
 				'standort_id' => $standort_id,
 				'ext_id' => $ext_id
@@ -465,6 +485,7 @@ class Kontakt extends FHC_Controller
 		else
 			$standort_id = null;
 
+		$uid = getAuthUID();
 		$kontakttyp = isset($_POST['kontakttyp']) ? $_POST['kontakttyp'] : null;
 		$anmerkung = isset($_POST['anmerkung']) ? $_POST['anmerkung'] : null;
 		$kontakt = isset($_POST['kontakt']) ? $_POST['kontakt'] : null;
@@ -480,7 +501,7 @@ class Kontakt extends FHC_Controller
 				'anmerkung' => $anmerkung,
 				'kontakt' => $kontakt,
 				'zustellung' => $_POST['zustellung'],
-				'insertvon' => 'uid',
+				'insertvon' => 	$uid,
 				'insertamum' => date('c'),
 				'standort_id' => $standort_id,
 				'ext_id' => $ext_id
@@ -609,6 +630,7 @@ class Kontakt extends FHC_Controller
 
 	public function updateBankverbindung($bankverbindung_id)
 	{
+
 		$this->load->library('form_validation');
 		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
 
@@ -627,6 +649,8 @@ class Kontakt extends FHC_Controller
 			return $this->outputJsonError($this->form_validation->error_array());
 		}
 
+		$uid = getAuthUID();
+
 		$result = $this->BankverbindungModel->update([
 			'bankverbindung_id' => $bankverbindung_id
 		],
@@ -638,7 +662,7 @@ class Kontakt extends FHC_Controller
 				'iban' => $_POST['iban'],
 				'blz' => $_POST['blz'],
 				'kontonr' => $_POST['kontonr'],
-				'updatevon' => 'uid',
+				'updatevon' => $uid,
 				'updateamum' => date('c'),
 				'typ' => $_POST['typ'],
 				'verrechnung' => $_POST['verrechnung'],
diff --git a/application/controllers/components/stv/Notizen.php b/application/controllers/components/stv/Notizen.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
index 2c42ccc6b..f3425cc5f 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
@@ -1,7 +1,9 @@
 import {CoreFilterCmpt} from "../../../../filter/Filter.js";
 import {CoreRESTClient} from "../../../../../RESTClient";
 import PvAutoComplete from "../../../../../../../index.ci.php/public/js/components/primevue/autocomplete/autocomplete.esm.min.js";
+import FhcFormValidation from '../../../../Form/Validation.js';
 /*import PvToast from "../../../../../../index.ci.php/public/js/components/primevue/toast/toast.esm.min.js";*/
+import BsModal from "../../../../Bootstrap/Modal.js";
 
 
 var editIcon = function(cell, formatterParams){ //plain text value
@@ -15,14 +17,16 @@ var deleteIcon = function(cell, formatterParams){ //plain text value
 export default{
 	components: {
 		CoreFilterCmpt,
-		PvAutoComplete
+		PvAutoComplete,
+		FhcFormValidation,
+		BsModal
 	},
 	props: {
 		uid: String
 	},
-	emits: [
+/*	emits: [
 		'update:selected'
-	],
+	],*/
 	data() {
 		return{
 			tabulatorOptions: {
@@ -104,12 +108,14 @@ export default{
 	},
 	methods:{
 		actionNewAdress(){
-			bootstrap.Modal.getOrCreateInstance(this.$refs.newAdressModal).show();
+			/*bootstrap.Modal.getOrCreateInstance(this.$refs.newAdressModal).show();*/
+			this.$refs.newAdressModal.show();
 		},
 		actionEditAdress(adress_id){
 			this.loadAdress(adress_id).then(() => {
 				if(this.addressData.adresse_id)
-					bootstrap.Modal.getOrCreateInstance(this.$refs.editAdressModal).show();
+					this.$refs.editAdressModal.show();
+/*					bootstrap.Modal.getOrCreateInstance(this.$refs.editAdressModal).show();*/
 			});
 		},
 		actionDeleteAdress(adress_id){
@@ -118,7 +124,8 @@ export default{
 					if(this.addressData.heimatadresse)
 						this.$fhcAlert.alertError("Heimatadressen dürfen nicht gelöscht werden, da diese für die BIS-Meldung relevant sind. Um die Adresse dennoch zu löschen, entfernen sie das Häkchen bei Heimatadresse!");
 					else
-						bootstrap.Modal.getOrCreateInstance(this.$refs.deleteAdressModal).show();
+						this.$refs.deleteAdressModal.show();
+/*						bootstrap.Modal.getOrCreateInstance(this.$refs.deleteAdressModal).show();*/
 			});
 		},
 		addNewAddress(formData) {
@@ -135,6 +142,7 @@ export default{
 						const [key, value] = entry;
 						console.log(key, value);
 						this.$fhcAlert.alertError(value);
+						/*this.$fhcAlert.handleFormValidation(error, this.$refs.newAdressModal);*/
 					});
 				}
 			}).catch(error => {
@@ -252,6 +260,24 @@ export default{
 				}
 			);
 		},
+		getPlaces(plz){
+			CoreRESTClient
+				.get('components/stv/address/getPlaces/' + this.formData.address.plz, undefined, {
+					signal: this.abortController.places.signal
+				})
+				.then(result => CoreRESTClient.getData(result.data) || [])
+				.then(result => {
+					this.places = result;
+				})
+				.catch(error => {
+					if (error.code == 'ERR_BAD_REQUEST') {
+						return this.$fhcAlert.handleFormValidation(error, this.$refs.form);
+					}
+					// NOTE(chris): repeat request
+					if (error.code != "ERR_CANCELED")
+						window.setTimeout(this.loadPlaces, 100);
+				});
+		},
 		search(event) {
 			//console.log(event.query);
 			return CoreRESTClient
@@ -265,7 +291,7 @@ export default{
 			this.$refs.table.reloadTable();
 		},
 		hideModal(modalRef){
-			bootstrap.Modal.getOrCreateInstance(this.$refs[modalRef]).hide();
+			this.$refs[modalRef].hide();
 		},
 		resetModal(){
 			this.formData = {};
@@ -274,14 +300,21 @@ export default{
 		},
 	},
 	created(){
-		CoreRESTClient
-			.get('components/stv/Kontakt/getNations')
+/*		CoreRESTClient
+			.get('components/stv/Address/getNations')
 			.then(result => {
-				this.nations = result.data;
+				this.nations = result.data[];
 			})
 			.catch(err => {
 				console.error(err.response.data || err.message);
-			});
+			});*/
+		CoreRESTClient
+			.get('components/stv/Address/getNations')
+			.then(result => CoreRESTClient.getData(result.data) || [])
+			.then(result => {
+				this.nations = result;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
 		CoreRESTClient
 			.get('components/stv/Kontakt/getAdressentypen')
 			.then(result => {
@@ -293,32 +326,23 @@ export default{
 	},
 	template: `			
 		<div class="stv-list h-100 pt-3">
-					
-		<!--		<Modal>   
-		 TODO(MANU) use BSModal, Validierungen, utf-8? 
-		 -->
-				
-		<div ref="newAdressModal" class="modal fade" id="newAddressModal" tabindex="-1" aria-labelledby="newAddressModalLabel" aria-hidden="true">
-		  <div class="modal-dialog">
-			<div class="modal-content">
-			  <div class="modal-header">
-				<h5 class="modal-title" id="newAddressModalLabel">Neue Adresse anlegen</h5>
-				<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-			  </div>
-			  <div class="modal-body">
-				<form  ref="formData">					
+		
+		<!--Modal: Add Address-->
+		<BsModal ref="newAdressModal">
+			<template #title>Adresse anlegen</template>
+				<form class="row g-3" ref="formData">
 					<div class="row mb-3">
 						<label for="adressentyp" class="form-label col-sm-4">Typ</label>
 						<div class="col-sm-5">
-							<select id="adressentyp" class="form-control" v-model="formData.typ">
+							<select id="adressentyp" class="form-select" v-model="formData.typ">
 								<option v-for="typ in adressentypen" :key="typ.adressentyp_kurzbz" :value="typ.adressentyp_kurzbz" >{{typ.bezeichnung}}</option>
 							</select>
 						</div>
 					</div>
 					<div class="row mb-3">											   
 						<label for="strasse" class="form-label col-sm-4">Strasse</label>
-						<div class="col-sm-3">
-							<input type="text" :readonly="readonly" class="form-control-sm" id="strasse" v-model="formData['strasse']">
+						<div class="col-sm-5">
+							<input type="text" :readonly="readonly" class="form-control" id="strasse" v-model="formData['strasse']">
 						</div>
 					</div>	
 						
@@ -333,8 +357,8 @@ export default{
 						
 					<div class="row mb-3">								
 						<label for="plz" class="required form-label col-sm-4" >PLZ</label>
-						 <div class="col-sm-3">
-							<input type="text" class="form-control-sm" required v-model="formData['plz']" >
+						 <div class="col-sm-5">
+							<input type="text" class="form-control" required v-model="formData['plz']" >
 						</div>
 					</div>	
 					
@@ -410,15 +434,152 @@ export default{
 					
 					<div class="row mb-3">
 						<label for="firma_name" class="form-label col-sm-4">Firma</label>
+							<div class="col-sm-5">
+									<PvAutoComplete v-model="formData['firma']" class="form-control" optionLabel="name" :suggestions="filteredFirmen" @complete="search" minLength="3"/>
+							</div>	
+					</div>	
+				
+					<div class="row mb-3">											   
+						<label for="name" class="form-label col-sm-4">Name</label>
+						<div class="col-sm-3">
+							<input type="text" :readonly="readonly" class="form-control" id="name" v-model="formData['name']">
+						</div>
+					</div>			
+					<div class="row mb-3">											   
+						<label for="anmerkung" class="form-label col-sm-4">Anmerkung</label>
+						<div class="col-sm-3">
+							<input type="text" :readonly="readonly" class="form-control-sm" id="anmerkung" v-model="formData['anmerkung']">
+						</div>
+					</div>	
+			</form>	
+			<template #footer>
+				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
+				<button type="button" class="btn btn-primary" @click="addNewAdress()">OK</button>
+            </template>
+		</BsModal>
+		
+								
+	<!--	<div ref="newAdressModal" class="modal fade" id="newAddressModal" tabindex="-1" aria-labelledby="newAddressModalLabel" aria-hidden="true">
+		  <div class="modal-dialog">
+			<div class="modal-content">
+			  <div class="modal-header">
+				<h5 class="modal-title" id="newAddressModalLabel">Neue Adresse anlegen</h5>
+				<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+			  </div>
+			  <div class="modal-body">
+				<form  ref="formData">					
+					<div class="row mb-3">
+						<label for="adressentyp" class="form-label col-sm-4">Typ</label>
+						<div class="col-sm-5">
+							<select id="adressentyp" class="form-select" v-model="formData.typ">
+								<option v-for="typ in adressentypen" :key="typ.adressentyp_kurzbz" :value="typ.adressentyp_kurzbz" >{{typ.bezeichnung}}</option>
+							</select>
+						</div>
+					</div>
+					<div class="row mb-3">											   
+						<label for="strasse" class="form-label col-sm-4">Strasse</label>
+						<div class="col-sm-5">
+							<input type="text" :readonly="readonly" class="form-control" id="strasse" v-model="formData['strasse']">
+						</div>
+					</div>	
+						
+					<div class="row mb-3">
+						<label for="nation" class="form-label col-sm-4">Nation</label>
+						<div class="col-sm-5">
+							<select id="nation" class="form-control" v-model="formData.nation">
+								<option v-for="nation in nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
+							</select>
+						</div>
+					</div>	
+						
+					<div class="row mb-3">								
+						<label for="plz" class="required form-label col-sm-4" >PLZ</label>
+						 <div class="col-sm-5">
+							<input type="text" class="form-control" required v-model="formData['plz']" >
+						</div>
+					</div>	
+					
+					<div class="row mb-3">
+						<label for="gemeinde" class="form-label col-sm-4">Gemeinde</label>
+						<div v-if="formData.plz && formData.nation === 'A'" class="col-sm-5">
+							<select id="gemeinde" class="form-control" v-model="formData['gemeinde']" @click="getGemeinden(formData.plz)">
+								<option value="">&#45;&#45; keine Auswahl &#45;&#45;</option>
+								<option v-for="gemeinde in gemeinden" :value="gemeinde.name" >{{gemeinde.name}}</option>
+							</select>	
+						</div>
+						<div v-else class="col-sm-3">
 							<div class="col-sm-3">
-									<PvAutoComplete v-model="formData['firma']" optionLabel="name" :suggestions="filteredFirmen" @complete="search" minLength="3"/>
+								<input id="ort" type="text" class="form-control-sm" v-model="formData['gemeinde']">
+							</div>
+						</div>
+					</div>
+						
+					<div class="row mb-3">	
+						<label for="ort" class="form-label col-sm-4">Ortschaft</label>  
+						<div v-if="formData.plz && formData.nation === 'A' && formData.gemeinde" class="col-sm-5">
+							<select id="ort" class="form-control" v-model="formData['ort']" @click="getOrtschaften(formData.plz + '/' + formData.gemeinde)">
+								<option value="">&#45;&#45; keine Auswahl &#45;&#45;</option>
+								<option v-for="ort in ortschaften" :value="ort.ortschaftsname" >{{ort.ortschaftsname}}</option>
+							</select>	
+						</div>
+						<div v-else-if="formData.plz && formData.nation === 'A'" class="col-sm-5">
+							<select id="ort" class="form-control" v-model="formData['ort']" @click="getOrtschaften(formData.plz)">
+								<option value="">&#45;&#45; keine Auswahl &#45;&#45;</option>
+								<option v-for="ort in ortschaften" :value="ort.ortschaftsname" >{{ort.ortschaftsname}}</option>
+							</select>	
+						</div>
+						<div v-else class="col-sm-3">
+							<div class="col-sm-3">
+								<input id="ort" type="text" class="form-control-sm" v-model="formData['ort']">
+							</div>
+						</div>
+					</div>	
+						
+					<div class="row mb-3">				
+						<label for="heimatadresse" class="form-label col-sm-4">Heimatadresse</label>
+						<div class="col-sm-3">
+							<div class="form-check">
+								<input id="heimatadresse" type="checkbox" class="form-check-input" value="1" v-model="formData['heimatadresse']">
+							</div>
+						</div>
+					</div>	
+						
+					<div class="row mb-3">
+						<label for="zustelladresse" class="form-label col-sm-4">Zustelladresse</label>
+						<div class="col-sm-3">
+							<div class="form-check">	
+								<input id="zustelladresse" type="checkbox" class="form-check-input" value="1" v-model="formData['zustelladresse']">
+							</div>
+						</div>
+					</div>	
+					
+					<div class="row mb-3">
+							<label for="co_name" class="form-label col-sm-4">Abweich.Empfänger. (c/o)</label>
+						<div class="col-sm-3">
+							<input type="text" id="co_name" class="form-control-sm" v-model="formData['co_name']">
+						</div>	
+					</div>
+					
+					<div class="row mb-3">
+						<label for="rechnungsadresse" class="form-label col-sm-4">Rechnungsadresse</label>
+						<div class="col-sm-3">
+							<div class="form-check">	
+								<input id="rechnungsadresse" type="checkbox" class="form-check-input" v-model="formData['rechnungsadresse']">
+							</div>
+						</div>
+					</div>			
+					
+					<div class="row mb-3">
+						<label for="firma_name" class="form-label col-sm-4">Firma</label>
+							<div class="col-sm-5">
+									<PvAutoComplete v-model="formData['firma']" class="form-control" optionLabel="name" :suggestions="filteredFirmen" @complete="search" minLength="3"/>
 							</div>	
 					</div>	
 					
 					<div class="row mb-3">											   
 						<label for="name" class="form-label col-sm-4">Name</label>
 						<div class="col-sm-3">
-							<input type="text" :readonly="readonly" class="form-control-sm" id="name" v-model="formData['name']">
+							<input type="text" :readonly="readonly" class="form-control" id="name" v-model="formData['name']">
 						</div>
 					</div>		
 					
@@ -437,7 +598,19 @@ export default{
 			  </div>
 			</div>
 		  </div>
-		</div>
+		</div>-->
+		
+				<!--Modal: Edit Address-->
+<!--		<BsModal ref="newBankverbindungModal">
+			<template #title>Adresse anlegen</template>
+			<form class="row g-3" ref="formData">
+			
+			</form>	
+			<template #footer>
+				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
+				<button type="button" class="btn btn-primary" @click="addNewAdress()">OK</button>
+            </template>
+		</BsModal>-->
 		
 		<div ref="editAdressModal" class="modal fade" id="editAdressModal" tabindex="-1" aria-labelledby="editAdressModalLabel" aria-hidden="true">
 		  <div class="modal-dialog">
@@ -592,9 +765,8 @@ export default{
 							
 			  </div>
 			  <div class="modal-footer">
-				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
+				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">Abbrechen</button>
 				<button ref="Close" type="button" class="btn btn-primary" @click="updateAddress(addressData.adresse_id)">OK</button>
-
 			  </div>
 			</div>
 		  </div>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
index ca55b08f7..ad632606a 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
@@ -1,6 +1,6 @@
 import {CoreFilterCmpt} from "../../../../filter/Filter.js";
 import {CoreRESTClient} from "../../../../../RESTClient";
-/*import {BsModal} from "../../../../Bootstrap/Modal.js";*/
+import BsModal from "../../../../Bootstrap/Modal.js";
 
 var editIcon = function(cell, formatterParams){ //plain text value
 	return "<i class='fa fa-edit'></i>";
@@ -12,7 +12,7 @@ var deleteIcon = function(cell, formatterParams) { //plain text value
 export default{
 	components: {
 		CoreFilterCmpt,
-/*		BsModal*/
+		BsModal
 	},
 	props: {
 		uid: String
@@ -53,18 +53,15 @@ export default{
 					},
 					{title:"Person_id", field:"person_id", visible:false},
 					{title:"Bankverbindung_id", field:"bankverbindung_id", visible:false},
-	/*				{title: "Actions",
-						columns:[*/
-							{formatter:editIcon, width:40, align:"center", cellClick: (e, cell) => {
-									this.actionEditBankverbindung(cell.getData().bankverbindung_id);
-									console.log(cell.getRow().getIndex(), cell.getData(), this);
-								}, width:50, headerSort:false},
-							{formatter:deleteIcon, width:40, align:"center", cellClick: (e, cell) => {
-									this.actionDeleteBankverbindung(cell.getData().bankverbindung_id);
-									console.log(cell.getRow().getIndex(), cell.getData(), this);
-								}, width:50, headerSort:false },
-/*						],
-					},*/
+					{formatter:editIcon, width:40, align:"center", cellClick: (e, cell) => {
+							this.actionEditBankverbindung(cell.getData().bankverbindung_id);
+							console.log(cell.getRow().getIndex(), cell.getData(), this);
+						}, width:50, headerSort:false},
+					{formatter:deleteIcon, width:40, align:"center", cellClick: (e, cell) => {
+							this.actionDeleteBankverbindung(cell.getData().bankverbindung_id);
+							console.log(cell.getRow().getIndex(), cell.getData(), this);
+						}, width:50, headerSort:false },
+
 				],
 				layout: 'fitDataFill',
 				layoutColumnsOnNewData:	false,
@@ -86,18 +83,18 @@ export default{
 	},
 	methods:{
 		actionNewBankverbindung(){
-			bootstrap.Modal.getOrCreateInstance(this.$refs.newBankverbindungModal).show();
+			this.$refs.newBankverbindungModal.show();
 		},
 		actionEditBankverbindung(bankverbindung_id){
 			this.loadBankverbindung(bankverbindung_id).then(() => {
 				if(this.bankverbindungData.bankverbindung_id)
-					bootstrap.Modal.getOrCreateInstance(this.$refs.editBankverbindungModal).show();
+					this.$refs.editBankverbindungModal.show();
 			});
 		},
 		actionDeleteBankverbindung(bankverbindung_id){
 			this.loadBankverbindung(bankverbindung_id).then(() => {
-				if(this.bankverbindungData.bankverbindung_id)  //Todo(Manu) not optimal
-					bootstrap.Modal.getOrCreateInstance(this.$refs.deleteBankverbindungModal).show();
+				if(this.bankverbindungData.bankverbindung_id)
+					this.$refs.deleteBankverbindungModal.show();
 			});
 		},
 		addNewBankverbindung(bankverbindungData) {
@@ -106,19 +103,17 @@ export default{
 			).then(response => {
 				if (!response.data.error) {
 					this.$fhcAlert.alertSuccess('Speichern erfolgreich');
+/*					this.$refs.newBankverbindungModal.hide();*/
 					this.hideModal('newBankverbindungModal');
 					this.resetModal();
 				} else {
-					//console.log(response.data.retval);
 					const errorData = response.data.retval;
 					Object.entries(errorData).forEach(entry => {
 						const [key, value] = entry;
-						console.log(key, value);
 						this.$fhcAlert.alertError('Das Feld ' + key + ' ist erforderlich');
 					});
 					this.statusCode = 0;
 					this.statusMsg = response.data;
-					//console.log('Speichern nicht erfolgreich: ' + this.statusMsg);
 				}
 			}).catch(error => {
 				console.log(error);
@@ -134,7 +129,7 @@ export default{
 			return CoreRESTClient.get('components/stv/Kontakt/loadBankverbindung/' + bankverbindung_id
 			).then(
 				result => {
-					console.log(this.bankverbindungData, result);
+					//console.log(this.bankverbindungData, result);
 					if(!result.data.retval || result.data.retval.length < 1)
 					{
 						this.bankverbindungData = {};
@@ -152,7 +147,7 @@ export default{
 			CoreRESTClient.post('components/stv/Kontakt/updateBankverbindung/' + bankverbindung_id,
 				this.bankverbindungData
 			).then(response => {
-				console.log(response);
+				//console.log(response);
 				if (!response.data.error) {
 					this.$fhcAlert.alertSuccess('Speichern erfolgreich');
 					this.hideModal('editBankverbindungModal');
@@ -167,7 +162,7 @@ export default{
 				}
 			}).catch(error => {
 				this.statusMsg = 'Error in Catch';
-				console.log('Speichern nicht erfolgreich ' + this.statusMsg);
+				console.log('Speichern nicht erfolgreich ' + this.errorData);
 				this.$fhcAlert.alertError('Fehler bei Speicherroutine aufgetreten');
 			}).finally(() => {
 				window.scrollTo(0, 0);
@@ -177,7 +172,6 @@ export default{
 		deleteBankverbindung(bankverbindung_id){
 			CoreRESTClient.post('components/stv/Kontakt/deleteBankverbindung/' + bankverbindung_id)
 				.then(response => {
-					console.log(response);
 					if (!response.data.error || response.data === []) {
 						this.$fhcAlert.alertSuccess('Löschen erfolgreich');
 					} else {
@@ -193,7 +187,7 @@ export default{
 			});
 		},
 		hideModal(modalRef){
-			bootstrap.Modal.getOrCreateInstance(this.$refs[modalRef]).hide();
+			this.$refs[modalRef].hide();
 		},
 		reload(){
 			this.$refs.table.reloadTable();
@@ -206,231 +200,151 @@ export default{
 	template: `	
 		<div class="stv-list h-100 pt-3">
 		
-<!--		Todo(manu) BsModal-->
-<!--		<BsModal title="Bankverbindung anlegen" ref="newBankverbindungModal">
-            <template #body>
-                <form class="row g-3" v-if="currentAddress != null" ref="bankverbindungData" >
+		<!--Modal: Add Bankverbindung-->
+		<BsModal title="Bankverbindung anlegen" ref="newBankverbindungModal">
+			<template #title>Bankverbindung anlegen</template>
+			<form class="row g-3" ref="bankverbindungData">	
+				<div class="row mb-3">
+						<label for="name" class="form-label col-sm-4">Name</label>
+						<div class="col-sm-6">
+							<input type="text" :readonly="readonly" class="form-control" id="name" v-model="bankverbindungData['name']">
+						</div>
+					</div>
+					<div class="row mb-3">											   
+						<label for="anschrift" class="form-label col-sm-4">Anschrift</label>
+						<div class="col-sm-6">
+							<input type="text" :readonly="readonly" class="form-control" id="anschrift" v-model="bankverbindungData['anschrift']">
+						</div>
+					</div>	
+
+					<div class="row mb-3">											   
+						<label for="iban" class="form-label col-sm-4">IBAN</label>
+						<div class="col-sm-6">
+							<input type="text" :readonly="readonly" required class="form-control" id="iban" v-model="bankverbindungData['iban']">
+						</div>
+					</div>	
+					<div class="row mb-3">											   
+						<label for="bic" class="form-label col-sm-4">BIC</label>
+						<div class="col-sm-6">
+							<input type="text" :readonly="readonly" class="form-control" id="bic" v-model="bankverbindungData['bic']">
+						</div>
+					</div>	
+					<div class="row mb-3">											   
+						<label for="kontonr" class="form-label col-sm-4">Kontonummer</label>
+						<div class="col-sm-6">
+							<input type="text" :readonly="readonly" class="form-control" id="kontonr" v-model="bankverbindungData['kontonr']">
+						</div>
+					</div>	
+					<div class="row mb-3">											   
+						<label for="blz" class="form-label col-sm-4">BLZ</label>
+						<div class="col-sm-6">
+							<input type="text" :readonly="readonly" class="form-control" id="blz" v-model="bankverbindungData['blz']">
+						</div>
+					</div>		
 					<div class="row mb-3">
-							<label for="name" class="form-label col-sm-4">Name</label>
-							<div class="col-sm-3">
-								<input type="text" :readonly="readonly" class="form-control-sm" id="name" v-model="bankverbindungData['name']">
+						<label for="typ" class="form-label col-sm-4">Typ</label>
+						<div class="col-sm-6">
+							<select  id="typ" class="form-select" required v-model="bankverbindungData['typ']">
+								<option  value="p">Privatkonto</option>
+								<option  value="f">Firmenkonto</option>
+							</select>
+						</div>
+					</div>	
+					<div class="row mb-3">
+						<label for="verrechnung" class="form-label col-sm-4">Verrechnung</label>
+						<div class="col-sm-3">
+							<div class="form-check">	
+								<input id="verrechnung" type="checkbox" class="form-check-input" value="1" v-model="bankverbindungData['verrechnung']">
 							</div>
 						</div>
-						<div class="row mb-3">											   
-							<label for="anschrift" class="form-label col-sm-4">Anschrift</label>
-							<div class="col-sm-3">
-								<input type="text" :readonly="readonly" class="form-control-sm" id="anschrift" v-model="bankverbindungData['anschrift']">
-							</div>
-						</div>	
-
-						<div class="row mb-3">											   
-							<label for="iban" class="form-label col-sm-4">IBAN</label>
-							<div class="col-sm-3">
-								<input type="text" :readonly="readonly" required class="form-control-sm" id="iban" v-model="bankverbindungData['iban']">
-							</div>
-						</div>	
-						<div class="row mb-3">											   
-							<label for="bic" class="form-label col-sm-4">BIC</label>
-							<div class="col-sm-3">
-								<input type="text" :readonly="readonly" class="form-control-sm" id="bic" v-model="bankverbindungData['bic']">
-							</div>
-						</div>	
-						<div class="row mb-3">											   
-							<label for="kontonr" class="form-label col-sm-4">Kontonummer</label>
-							<div class="col-sm-3">
-								<input type="text" :readonly="readonly" class="form-control-sm" id="kontonr" v-model="bankverbindungData['kontonr']">
-							</div>
-						</div>	
-						<div class="row mb-3">											   
-							<label for="blz" class="form-label col-sm-4">BLZ</label>
-							<div class="col-sm-3">
-								<input type="text" :readonly="readonly" class="form-control-sm" id="blz" v-model="bankverbindungData['blz']">
-							</div>
-						</div>		
-						<div class="row mb-3">
-							<label for="typ" class="form-label col-sm-4">Typ</label>
-							<div class="col-sm-5">
-								<select  id="typ" class="form-control" required v-model="bankverbindungData['typ']">
-									<option  value="p">Privatkonto</option>
-									<option  value="f">Firmenkonto</option>
-								</select>
-							</div>
-						</div>	
-						<div class="row mb-3">
-							<label for="verrechnung" class="form-label col-sm-4">Verrechnung</label>
-							<div class="col-sm-3">
-								<div class="form-check">	
-									<input id="verrechnung" type="checkbox" class="form-check-input" value="1" v-model="bankverbindungData['verrechnung']">
-								</div>
-							</div>
-						</div>	
-				</form>
-			</template>
+					</div>	
+			</form>
             <template #footer>
             		<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
 					<button type="button" class="btn btn-primary" @click="addNewBankverbindung()">OK</button>
             </template>
-					
-		</BsModal>-->
-		
-
-		<!--Modal: new Bankverbindung-->
-			<div ref="newBankverbindungModal" class="modal fade" id="newBankverbindungModal" tabindex="-1" aria-labelledby="newBankverbindungModalLabel" aria-hidden="true">
-			  <div class="modal-dialog">
-				<div class="modal-content">
-				  <div class="modal-header">
-					<h5 class="modal-title" id="newBankverbindungModalLabel">Bankverbindung anlegen</h5>
-					<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-				  </div>
-				  <div class="modal-body">
-					<form ref="bankverbindungData">				
-						<div class="row mb-3">
-							<label for="name" class="form-label col-sm-4">Name</label>
-							<div class="col-sm-3">
-								<input type="text" :readonly="readonly" class="form-control-sm" id="name" v-model="bankverbindungData['name']">
+		</BsModal>
+				
+		<!--Modal: Edit Bankverbindung-->
+		<BsModal ref="editBankverbindungModal" >
+			<template #title>Bankverbindung bearbeiten</template>
+				<form class="row g-3" ref="bankverbindungData" >
+				
+					<div class="row mb-3">
+						<label for="name" class="form-label col-sm-4">Name</label>
+						<div class="col-sm-6">
+							<input type="text" :readonly="readonly" class="form-control" id="name" v-model="bankverbindungData['name']">
+						</div>
+					</div>
+											
+					<div class="row mb-3">											   
+						<label for="anschrift" class="form-label col-sm-4">Anschrift</label>
+						<div class="col-sm-6">
+							<input type="text" :readonly="readonly" class="form-control" id="anschrift" v-model="bankverbindungData['anschrift']">
+						</div>
+					</div>	
+					<div class="row mb-3">											   
+						<label for="iban" class="form-label col-sm-4">IBAN</label>
+						<div class="col-sm-6">
+							<input type="text" :readonly="readonly" required class="form-control" id="iban" v-model="bankverbindungData['iban']">
+						</div>
+					</div>	
+					<div class="row mb-3">											   
+						<label for="bic" class="form-label col-sm-4">BIC</label>
+						<div class="col-sm-6">
+							<input type="text" :readonly="readonly" class="form-control" id="bic" v-model="bankverbindungData['bic']">
+						</div>
+					</div>	
+					<div class="row mb-3">											   
+						<label for="kontonr" class="form-label col-sm-4">Kontonummer</label>
+						<div class="col-sm-6">
+							<input type="text" :readonly="readonly" class="form-control" id="kontonr" v-model="bankverbindungData['kontonr']">
+						</div>
+					</div>	
+					<div class="row mb-3">											   
+						<label for="blz" class="form-label col-sm-4">BLZ</label>
+						<div class="col-sm-6">
+							<input type="text" :readonly="readonly" class="form-control" id="blz" v-model="bankverbindungData['blz']">
+						</div>
+					</div>		
+					<div class="row mb-3">
+						<label for="typ" class="form-label col-sm-4">Typ</label>
+						<div class="col-sm-6">
+							<select  id="typ" class="form-select" required v-model="bankverbindungData['typ']">
+								<option  value="p">Privatkonto</option>
+								<option  value="f">Firmenkonto</option>
+							</select>
+						</div>
+					</div>	
+					<div class="row mb-3">
+						<label for="verrechnung" class="form-label col-sm-4">Verrechnung</label>
+						<div class="col-sm-3">
+							<div class="form-check">	
+								<input id="verrechnung" type="checkbox" class="form-check-input" value="1" v-model="bankverbindungData['verrechnung']">
 							</div>
 						</div>
-						<div class="row mb-3">											   
-							<label for="anschrift" class="form-label col-sm-4">Anschrift</label>
-							<div class="col-sm-3">
-								<input type="text" :readonly="readonly" class="form-control-sm" id="anschrift" v-model="bankverbindungData['anschrift']">
-							</div>
-						</div>	
-
-						<div class="row mb-3">											   
-							<label for="iban" class="form-label col-sm-4">IBAN</label>
-							<div class="col-sm-3">
-								<input type="text" :readonly="readonly" required class="form-control-sm" id="iban" v-model="bankverbindungData['iban']">
-							</div>
-						</div>	
-						<div class="row mb-3">											   
-							<label for="bic" class="form-label col-sm-4">BIC</label>
-							<div class="col-sm-3">
-								<input type="text" :readonly="readonly" class="form-control-sm" id="bic" v-model="bankverbindungData['bic']">
-							</div>
-						</div>	
-						<div class="row mb-3">											   
-							<label for="kontonr" class="form-label col-sm-4">Kontonummer</label>
-							<div class="col-sm-3">
-								<input type="text" :readonly="readonly" class="form-control-sm" id="kontonr" v-model="bankverbindungData['kontonr']">
-							</div>
-						</div>	
-						<div class="row mb-3">											   
-							<label for="blz" class="form-label col-sm-4">BLZ</label>
-							<div class="col-sm-3">
-								<input type="text" :readonly="readonly" class="form-control-sm" id="blz" v-model="bankverbindungData['blz']">
-							</div>
-						</div>		
-						<div class="row mb-3">
-							<label for="typ" class="form-label col-sm-4">Typ</label>
-							<div class="col-sm-5">
-								<select  id="typ" class="form-control" required v-model="bankverbindungData['typ']">
-									<option  value="p">Privatkonto</option>
-									<option  value="f">Firmenkonto</option>
-								</select>
-							</div>
-						</div>	
-						<div class="row mb-3">
-							<label for="verrechnung" class="form-label col-sm-4">Verrechnung</label>
-							<div class="col-sm-3">
-								<div class="form-check">	
-									<input id="verrechnung" type="checkbox" class="form-check-input" value="1" v-model="bankverbindungData['verrechnung']">
-								</div>
-							</div>
-						</div>	
-											   
-					</form>  
-								
-				  </div>
-				  <div class="modal-footer">
-					<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
-					<button type="button" class="btn btn-primary" @click="addNewBankverbindung()">OK</button>
-				  </div>
-				</div>
-			  </div>
-			</div>
-				
-			<!--Modal: Edit Bankverbindung-->
-			<div ref="editBankverbindungModal" class="modal fade" id="editBankverbindungModal" tabindex="-1" aria-labelledby="editBankverbindungModalLabel" aria-hidden="true">
-			  <div class="modal-dialog">
-				<div class="modal-content">
-				  <div class="modal-header">
-					<h5 class="modal-title" id="editBankverbindungModalLabel">Bankverbindung bearbeiten</h5>
-					<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close" @click="resetModal"></button>
-				  </div>
-				  <div class="modal-body">
-						<form ref="bankverbindungData">
-						
-							<div class="row mb-3">
-								<label for="name" class="form-label col-sm-4">Name</label>
-								<div class="col-sm-3">
-									<input type="text" :readonly="readonly" class="form-control-sm" id="name" v-model="bankverbindungData['name']">
-								</div>
-							</div>
-													
-							<div class="row mb-3">											   
-							<label for="anschrift" class="form-label col-sm-4">Anschrift</label>
-							<div class="col-sm-3">
-								<input type="text" :readonly="readonly" class="form-control-sm" id="anschrift" v-model="bankverbindungData['anschrift']">
-							</div>
-						</div>	
-
-						<div class="row mb-3">											   
-							<label for="iban" class="form-label col-sm-4">IBAN</label>
-							<div class="col-sm-3">
-								<input type="text" :readonly="readonly" required class="form-control-sm" id="iban" v-model="bankverbindungData['iban']">
-							</div>
-						</div>	
-						<div class="row mb-3">											   
-							<label for="bic" class="form-label col-sm-4">BIC</label>
-							<div class="col-sm-3">
-								<input type="text" :readonly="readonly" class="form-control-sm" id="bic" v-model="bankverbindungData['bic']">
-							</div>
-						</div>	
-						<div class="row mb-3">											   
-							<label for="kontonr" class="form-label col-sm-4">Kontonummer</label>
-							<div class="col-sm-3">
-								<input type="text" :readonly="readonly" class="form-control-sm" id="kontonr" v-model="bankverbindungData['kontonr']">
-							</div>
-						</div>	
-						<div class="row mb-3">											   
-							<label for="blz" class="form-label col-sm-4">BLZ</label>
-							<div class="col-sm-3">
-								<input type="text" :readonly="readonly" class="form-control-sm" id="blz" v-model="bankverbindungData['blz']">
-							</div>
-						</div>		
-						<div class="row mb-3">
-							<label for="typ" class="form-label col-sm-4">Typ</label>
-							<div class="col-sm-5">
-								<select  id="typ" class="form-control" required v-model="bankverbindungData['typ']">
-									<option  value="p">Privatkonto</option>
-									<option  value="f">Firmenkonto</option>
-								</select>
-							</div>
-						</div>	
-						<div class="row mb-3">
-							<label for="verrechnung" class="form-label col-sm-4">Verrechnung</label>
-							<div class="col-sm-3">
-								<div class="form-check">	
-									<input id="verrechnung" type="checkbox" class="form-check-input" value="1" v-model="bankverbindungData['verrechnung']">
-								</div>
-							</div>
-						</div>	
-																				   
-					</form>  
-								
-				  </div>
-				  <div class="modal-footer">
+					</div>																	   
+				</form> 
+				<template #footer>
 					<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">Abbrechen</button>
 					<button ref="Close" type="button" class="btn btn-primary" @click="updateBankverbindung(bankverbindungData.bankverbindung_id)">OK</button>
-	
-				  </div>
-				</div>
-			  </div>
-			</div>
+            	</template> 
+		</BsModal>
+		
+		<!--Modal: Delete Bankverbindung TODO(manu) Formatierung mit zuviel Abstand-->		
+		<BsModal ref="deleteBankverbindungModal" >
+			<template #title>Bankverbindung löschen</template>  
+			<template #default>
+				<p>Bankverbindung wirklich löschen?</p>	
+			</template>												
+			<template #footer>
+				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">Abbrechen</button>
+				<button ref="Close" type="button" class="btn btn-primary" @click="deleteBankverbindung(bankverbindungData.bankverbindung_id)">OK</button>
+			</template> 
+		</BsModal>
 				
-			<!-- Modal: Delete Bankverbindung-->
-			<div ref="deleteBankverbindungModal" class="modal fade" id="deleteBankverbindungModal" tabindex="-1" aria-labelledby="deleteBankverbindungModalLabel" aria-hidden="true">
+			
+<!--		<div ref="deleteBankverbindungModal" class="modal fade" id="deleteBankverbindungModal" tabindex="-1" aria-labelledby="deleteBankverbindungModalLabel" aria-hidden="true">
 			  <div class="modal-dialog">
 				<div class="modal-content">
 				  <div class="modal-header">
@@ -446,7 +360,7 @@ export default{
 				  </div>
 				</div>
 			  </div>
-			</div>
+			</div>-->
 			
 	
 			<core-filter-cmpt
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
index e5e7f322a..750d03dab 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
@@ -1,6 +1,7 @@
 import {CoreFilterCmpt} from "../../../../filter/Filter.js";
 import {CoreRESTClient} from "../../../../../RESTClient";
-import PvToast from "../../../../../../../index.ci.php/public/js/components/primevue/toast/toast.esm.min.js";
+import BsModal from "../../../../Bootstrap/Modal.js";
+/*import PvToast from "../../../../../../../index.ci.php/public/js/components/primevue/toast/toast.esm.min.js";*/
 import PvAutoComplete from "../../../../../../../index.ci.php/public/js/components/primevue/autocomplete/autocomplete.esm.min.js";
 
 var editIcon = function(cell, formatterParams){ //plain text value
@@ -14,7 +15,7 @@ export default{
 	components: {
 		CoreFilterCmpt,
 		PvAutoComplete,
-		PvToast
+		BsModal
 	},
 	props: {
 		uid: String
@@ -79,25 +80,22 @@ export default{
 	},
 	methods:{
 		actionNewContact(){
-			console.log("Neuen Kontakt anlegen");
-			bootstrap.Modal.getOrCreateInstance(this.$refs.newContactModal).show();
+			this.$refs.newContactModal.show();
+/*			bootstrap.Modal.getOrCreateInstance(this.$refs.newContactModal).show();*/
 		},
 		actionEditContact(contact_id){
-			console.log("Edit Contact mit contact_id " + contact_id);
 			this.loadContact(contact_id);
-			bootstrap.Modal.getOrCreateInstance(this.$refs.editContactModal).show();
+			this.$refs.editContactModal.show();
 
 		},
 		actionDeleteContact(contact_id){
-			console.log("Delete Contact " + contact_id);
 			this.loadContact(contact_id);
-			bootstrap.Modal.getOrCreateInstance(this.$refs.deleteContactModal).show();
+			this.$refs.deleteContactModal.show();
 		},
 		addNewContact(formData) {
 			CoreRESTClient.post('components/stv/Kontakt/addNewContact/' + this.uid,
 				this.contactData
 			).then(response => {
-				console.log(response);
 				if (!response.data.error) {
 					this.$fhcAlert.alertSuccess('Speichern erfolgreich');
 					this.hideModal("newContactModal");
@@ -106,7 +104,7 @@ export default{
 					const errorData = response.data.retval;
 					Object.entries(errorData).forEach(entry => {
 						const [key, value] = entry;
-						console.log(key, value);
+						//console.log(key, value);
 						this.$fhcAlert.alertError(value);
 					});
 				}
@@ -141,11 +139,10 @@ export default{
 		deleteContact(kontakt_id){
 			CoreRESTClient.post('components/stv/Kontakt/deleteContact/' + kontakt_id)
 				.then(response => {
-					console.log(response);
 					if (!response.data.error) {
 						this.statusCode = 0;
 						this.statusMsg = 'success';
-						console.log('Löschen erfolgreich: ' + this.statusMsg);
+						//console.log('Löschen erfolgreich: ' + this.statusMsg);
 						this.$fhcAlert.alertSuccess('Löschen erfolgreich');
 					} else {
 						this.statusCode = 0;
@@ -200,7 +197,7 @@ export default{
 			});
 		},
 		hideModal(modalRef){
-			bootstrap.Modal.getOrCreateInstance(this.$refs[modalRef]).hide();
+			this.$refs[modalRef].hide();
 		},
 		reload(){
 			this.$refs.table.reloadTable();
@@ -231,40 +228,35 @@ export default{
 		<div class="stv-list h-100 pt-3">
 		
 		<!--Modal: new Contact-->
-			<div ref="newContactModal" class="modal fade" id="newAContactModal" tabindex="-1" aria-labelledby="newAContactModalLabel" aria-hidden="true">
-			  <div class="modal-dialog">
-				<div class="modal-content">
-				  <div class="modal-header">
-					<h5 class="modal-title" id="newContactModalLabel">Details</h5>
-					<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-				  </div>
-				  <div class="modal-body">
-					<form  ref="contactData">						
+		<BsModal ref="newContactModal">
+			<template #title>Kontakt anlegen</template>
+				<form class="row g-3" ref="contactData">
+				
 						<div class="row mb-3">
 							<label for="kontakttyp" class="form-label col-sm-4">Typ</label>
-							<div class="col-sm-5">
+							<div class="col-sm-6">
 								<select id="kontakttyp" class="form-control" v-model="contactData.kontakttyp">
-									<option value="">-- keine Auswahl --</option>
+									<option value="">keine Auswahl</option>
 									<option v-for="typ in kontakttypen" :key="typ.kontakttyp_kurzbz" :value="typ.kontakttyp" >{{typ.kontakttyp}}</option>
 								</select>
 							</div>
 						</div>
 						<div class="row mb-3">											   
 							<label for="kontakt" class="form-label col-sm-4">Kontakt</label>
-							<div class="col-sm-3">
-								<input type="text" :readonly="readonly" class="form-control-sm" id="kontakt" v-model="contactData['kontakt']">
+							<div class="col-sm-6">
+								<input type="text" :readonly="readonly" class="form-control" id="kontakt" v-model="contactData['kontakt']">
 							</div>
 						</div>	
 						<div class="row mb-3">											   
 							<label for="anmerkung" class="form-label col-sm-4">Anmerkung</label>
-							<div class="col-sm-3">
-								<input type="text" :readonly="readonly" class="form-control-sm" id="anmerkung" v-model="contactData['anmerkung']">
+							<div class="col-sm-6">
+								<input type="text" :readonly="readonly" class="form-control" id="anmerkung" v-model="contactData['anmerkung']">
 							</div>
 						</div>	
 						
 						<div class="row mb-3">
 							<label for="zustellung" class="form-label col-sm-4">Zustellung</label>
-							<div class="col-sm-3">
+							<div class="col-sm-6">
 								<div class="form-check">	
 									<input id="zustellung" type="checkbox" class="form-check-input" value="1" v-model="contactData['zustellung']">
 								</div>
@@ -273,98 +265,84 @@ export default{
 							
 						<div class="row mb-3">
 							<label for="firma_name" class="form-label col-sm-4">Firma / Standort</label>
-								<div class="col-sm-3">
+								<div class="col-sm-6">
 									<PvAutoComplete v-model="contactData['standort']" optionLabel="kurzbz" :suggestions="filteredStandorte" @complete="search" minLength="3"/>
 								</div>	
-						</div>		
-																						   
-					</form>  
-								
-				  </div>
-				  <div class="modal-footer">
-					<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
+						</div>	
+				</form>
+			    <template #footer>
+            		<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
 					<button type="button" class="btn btn-primary" @click="addNewContact()">OK</button>
-				  </div>
-				</div>
-			  </div>
-			</div>
+            	</template>
+		</BsModal>
 				
-			<!--Modal: Edit Contact-->
-			<div ref="editContactModal" class="modal fade" id="editContactModal" tabindex="-1" aria-labelledby="editContactModalLabel" aria-hidden="true">
-			  <div class="modal-dialog">
-				<div class="modal-content">
-				  <div class="modal-header">
-					<h5 class="modal-title" id="editContactModalLabel">Kontakt bearbeiten</h5>
-					<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close" @click="resetModal"></button>
-				  </div>
-				  <div class="modal-body">
-						<form ref="contactData">
-													
-							<div class="row mb-3">
-								<label for="kontakttyp" class="form-label col-sm-4">Typ</label>
-								<div class="col-sm-5">
-									<select id="kontakttyp" class="form-control" v-model="contactData.kontakttyp">
-										<option value="">-- keine Auswahl --</option>
-										<option v-for="typ in kontakttypen" :key="typ.kontakttyp_kurzbz" :value="typ.kontakttyp" >{{typ.kontakttyp}}</option>
-									</select>
-								</div>
-							</div>
-							<div class="row mb-3">											   
-								<label for="kontakt" class="form-label col-sm-4">Kontakt</label>
-								<div class="col-sm-3">
-									<input type="text" :readonly="readonly" class="form-control-sm" id="kontakt" v-model="contactData['kontakt']">
-								</div>
-							</div>	
-							<div class="row mb-3">											   
-								<label for="anmerkung" class="form-label col-sm-4">Anmerkung</label>
-								<div class="col-sm-3">
-									<input type="text" :readonly="readonly" class="form-control-sm" id="anmerkung" v-model="contactData['anmerkung']">
-								</div>
-							</div>	
-							
-							<div class="row mb-3">
-								<label for="zustellung" class="form-label col-sm-4">Zustellung</label>
-								<div class="col-sm-3">
-									<div class="form-check">	
-										<input id="zustellung" type="checkbox" class="form-check-input" value="1" v-model="contactData['zustellung']">
-									</div>
-								</div>
-							</div>	
-							
-							<div class="row mb-3">					
-								<input type="hidden" :readonly="readonly" class="form-control-sm" id="standort_id" v-model="contactData.standort_id">
-							</div>
-							
-<!--							<div class="row mb-3">											   
-								<label for="name" class="form-label col-sm-4">Firma/Standort</label>
-								<div class="col-sm-2">
-									<input type="text" :readonly="readonly" class="form-control-sm" id="name" v-model="addressData['name']">
-								</div>
-							</div>	-->
-							
-							<div class="row mb-3">
-								<label for="standort" class="form-label col-sm-4">Firma / Standort</label>
-									<div v-if="contactData.kurzbz" class="col-sm-3">
-										<input type="text" :readonly="readonly" class="form-control-sm" id="name" v-model="contactData.kurzbz">
-									</div>					
-									<div v-else class="col-sm-3">
-										<PvAutoComplete v-model="contactData['standort']" optionLabel="kurzbz" :suggestions="filteredStandorte" @complete="search" minLength="3"/>
-									</div>	
-							</div>																					   
-					</form>  
-								
-				  </div>
-				  <div class="modal-footer">
-					<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">Abbrechen</button>
-					<button ref="Close" type="button" class="btn btn-primary" @click="updateContact(contactData.kontakt_id)">OK</button>
-	
-				  </div>
+					
+		<!--Modal: Edit Contact-->
+		<BsModal ref="editContactModal">
+			<template #title>Kontakt bearbeiten</template>
+			<form class="row g-3" ref="contactData">	
+				<div class="row mb-3">
+					<label for="kontakttyp" class="form-label col-sm-4">Typ</label>
+					<div class="col-sm-6">
+						<select id="kontakttyp" class="form-control" v-model="contactData.kontakttyp">
+							<option value="">-- keine Auswahl --</option>
+							<option v-for="typ in kontakttypen" :key="typ.kontakttyp_kurzbz" :value="typ.kontakttyp" >{{typ.kontakttyp}}</option>
+						</select>
+					</div>
+				</div>
+				<div class="row mb-3">											   
+					<label for="kontakt" class="form-label col-sm-4">Kontakt</label>
+					<div class="col-sm-6">
+						<input type="text" :readonly="readonly" class="form-control" id="kontakt" v-model="contactData['kontakt']">
+					</div>
+				</div>	
+				<div class="row mb-3">											   
+					<label for="anmerkung" class="form-label col-sm-4">Anmerkung</label>
+					<div class="col-sm-6">
+						<input type="text" :readonly="readonly" class="form-control" id="anmerkung" v-model="contactData['anmerkung']">
+					</div>
+				</div>		
+				<div class="row mb-3">
+					<label for="zustellung" class="form-label col-sm-4">Zustellung</label>
+					<div class="col-sm-6">
+						<div class="form-check">	
+							<input id="zustellung" type="checkbox" class="form-check-input" value="1" v-model="contactData['zustellung']">
+						</div>
+					</div>
+				</div>	
+				<div class="row mb-3">					
+					<input type="hidden" :readonly="readonly" class="form-control" id="standort_id" v-model="contactData.standort_id">
 				</div>
-			  </div>
-			</div>
 				
-			<!--		Modal: Delete Contact-->
-			<div ref="deleteContactModal" class="modal fade" id="deleteContactModal" tabindex="-1" aria-labelledby="deleteContactModalLabel" aria-hidden="true">
+				<div class="row mb-3">
+					<label for="standort" class="form-label col-sm-4">Firma / Standort</label>
+						<div v-if="contactData.kurzbz" class="col-sm-3">
+							<input type="text" :readonly="readonly" class="form-control" id="name" v-model="contactData.kurzbz">
+						</div>					
+						<div v-else class="col-sm-3">
+							<PvAutoComplete v-model="contactData['standort']" optionLabel="kurzbz" :suggestions="filteredStandorte" @complete="search" minLength="3"/>
+						</div>	
+				</div>	
+			</form>
+			<template #footer>
+				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">Abbrechen</button>
+				<button type="button" class="btn btn-primary" @click="updateContact(contactData.kontakt_id)">OK</button>
+			</template>
+		</BsModal>
+									
+		<!--		Modal: Delete Contact TODO(manu) Formatierung-->
+		<BsModal ref="deleteContactModal" >
+			<template #title>Kontakt löschen</template>  
+			<template #default>
+				<p>Kontakt wirklich löschen?</p>	
+			</template>												
+			<template #footer>
+				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">Abbrechen</button>
+				<button ref="Close" type="button" class="btn btn-primary" @click="deleteContact(contactData.kontakt_id)">OK</button>
+			</template> 
+		</BsModal>
+		
+<!--		<div ref="deleteContactModal" class="modal fade" id="deleteContactModal" tabindex="-1" aria-labelledby="deleteContactModalLabel" aria-hidden="true">
 			  <div class="modal-dialog">
 				<div class="modal-content">
 				  <div class="modal-header">
@@ -380,7 +358,7 @@ export default{
 				  </div>
 				</div>
 			  </div>
-			</div>
+			</div>-->
 				
 			<core-filter-cmpt
 				ref="table"

From 74f9ac7600e33b74a1df0f66a5f9635a1306798a Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 29 Nov 2023 12:14:29 +0100
Subject: [PATCH 0189/1461] Cleanup & CSS

---
 .../controllers/components/stv/Student.php    |    4 +-
 application/views/Studentenverwaltung.php     |    7 +-
 public/css/Studentenverwaltung.css            |    3 -
 public/css/components/primevue.css            | 5666 +++++++++++++++++
 public/css/components/vue-datepicker.css      |    4 +-
 public/js/apps/Studentenverwaltung.js         |   51 +-
 .../Stv/Studentenverwaltung/List.js           |    2 +-
 7 files changed, 5701 insertions(+), 36 deletions(-)
 create mode 100644 public/css/components/primevue.css

diff --git a/application/controllers/components/stv/Student.php b/application/controllers/components/stv/Student.php
index 751cbfde8..88627ca03 100644
--- a/application/controllers/components/stv/Student.php
+++ b/application/controllers/components/stv/Student.php
@@ -502,12 +502,12 @@ class Student extends FHC_Controller
 		}
 
 		// TODO(chris): DEBUG
-		$result = $this->PrestudentModel->loadWhere([
+		/*$result = $this->PrestudentModel->loadWhere([
 			'pestudent_id' => 1
 		]);
 		if (isError($result)) {
 			return $result;
-		}
+		}*/
 
 		return success(true);
 	}
diff --git a/application/views/Studentenverwaltung.php b/application/views/Studentenverwaltung.php
index 157c50466..613a40abe 100644
--- a/application/views/Studentenverwaltung.php
+++ b/application/views/Studentenverwaltung.php
@@ -6,12 +6,13 @@
 		'fontawesome6' => true,
 		'vue3' => true,
 		#'primevue3' => true,
-		'filtercomponent' => true,
+		#'filtercomponent' => true,
 		'tabulator5' => true,
 		'phrases' => [],
 		'customCSSs' => [
-			'public/css/Studentenverwaltung.css',
-			'public/css/components/vue-datepicker.css'
+			'public/css/components/vue-datepicker.css',
+			'public/css/components/primevue.css',
+			'public/css/Studentenverwaltung.css'
 		],
 		'customJSs' => [
 			#'vendor/npm-asset/primevue/tree/tree.min.js',
diff --git a/public/css/Studentenverwaltung.css b/public/css/Studentenverwaltung.css
index cb1e72fe4..67a037238 100644
--- a/public/css/Studentenverwaltung.css
+++ b/public/css/Studentenverwaltung.css
@@ -1,8 +1,5 @@
 @import './components/searchbar.css';
 @import './components/verticalsplit.css';
-@import '../../vendor/npm-asset/primevue/resources/themes/bootstrap4-light-blue/theme.css';
-@import '../../vendor/npm-asset/primevue/resources/primevue.min.css';
-@import '../../vendor/npm-asset/primeicons/primeicons.css';
 
 .navbar-dark .navbar-brand:focus {
 	box-shadow: 0 0 0 .25rem rgba(13,110,253,.25);
diff --git a/public/css/components/primevue.css b/public/css/components/primevue.css
new file mode 100644
index 000000000..0f5caaa6f
--- /dev/null
+++ b/public/css/components/primevue.css
@@ -0,0 +1,5666 @@
+@import '../../../vendor/npm-asset/primevue/resources/primevue.min.css';
+@import '../../../vendor/npm-asset/primeicons/primeicons.css';
+
+:root {
+  --surface-a:#ffffff;
+  --surface-b:#efefef;
+  --surface-c:#e9ecef;
+  --surface-d:#dee2e6;
+  --surface-e:#ffffff;
+  --surface-f:#ffffff;
+  --text-color:#212529;
+  --text-color-secondary:#6c757d;
+  --primary-color:#007bff;
+  --primary-color-text:#ffffff;
+  --font-family:-apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Helvetica, Arial, sans-serif, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol;
+  --surface-0: #ffffff;
+  --surface-50: #f9fafb;
+  --surface-100: #f8f9fa;
+  --surface-200: #e9ecef;
+  --surface-300: #dee2e6;
+  --surface-400: #ced4da;
+  --surface-500: #adb5bd;
+  --surface-600: #6c757d;
+  --surface-700: #495057;
+  --surface-800: #343a40;
+  --surface-900: #212529;
+  --gray-50: #f9fafb;
+  --gray-100: #f8f9fa;
+  --gray-200: #e9ecef;
+  --gray-300: #dee2e6;
+  --gray-400: #ced4da;
+  --gray-500: #adb5bd;
+  --gray-600: #6c757d;
+  --gray-700: #495057;
+  --gray-800: #343a40;
+  --gray-900: #212529;
+  --content-padding:1.25rem;
+  --inline-spacing:0.5rem;
+  --border-radius:4px;
+  --surface-ground:#efefef;
+  --surface-section:#ffffff;
+  --surface-card:#ffffff;
+  --surface-overlay:#ffffff;
+  --surface-border:#dee2e6;
+  --surface-hover:#e9ecef;
+  --focus-ring: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+  --maskbg: rgba(0, 0, 0, 0.4);
+}
+
+* {
+  box-sizing: border-box;
+}
+
+.p-component {
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+  font-size: 1rem;
+  font-weight: normal;
+}
+
+.p-component-overlay {
+  background-color: rgba(0, 0, 0, 0.4);
+  transition-duration: 0.15s;
+}
+
+.p-disabled, .p-component:disabled {
+  opacity: 0.65;
+}
+
+.p-error {
+  color: #dc3545;
+}
+
+.p-text-secondary {
+  color: #6c757d;
+}
+
+.pi {
+  font-size: 1rem;
+}
+
+.p-link {
+  font-size: 1rem;
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+  border-radius: 4px;
+}
+.p-link:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+}
+
+.p-component-overlay-enter {
+  animation: p-component-overlay-enter-animation 150ms forwards;
+}
+
+.p-component-overlay-leave {
+  animation: p-component-overlay-leave-animation 150ms forwards;
+}
+
+@keyframes p-component-overlay-enter-animation {
+  from {
+    background-color: transparent;
+  }
+  to {
+    background-color: var(--maskbg);
+  }
+}
+@keyframes p-component-overlay-leave-animation {
+  from {
+    background-color: var(--maskbg);
+  }
+  to {
+    background-color: transparent;
+  }
+}
+
+:root {
+  --blue-50:#f3f8ff;
+  --blue-100:#c5dcff;
+  --blue-200:#97c1fe;
+  --blue-300:#69a5fe;
+  --blue-400:#3b8afd;
+  --blue-500:#0d6efd;
+  --blue-600:#0b5ed7;
+  --blue-700:#094db1;
+  --blue-800:#073d8b;
+  --blue-900:#052c65;
+  --green-50:#f4f9f6;
+  --green-100:#c8e2d6;
+  --green-200:#9ccbb5;
+  --green-300:#70b595;
+  --green-400:#459e74;
+  --green-500:#198754;
+  --green-600:#157347;
+  --green-700:#125f3b;
+  --green-800:#0e4a2e;
+  --green-900:#0a3622;
+  --yellow-50:#fffcf3;
+  --yellow-100:#fff0c3;
+  --yellow-200:#ffe494;
+  --yellow-300:#ffd965;
+  --yellow-400:#ffcd36;
+  --yellow-500:#ffc107;
+  --yellow-600:#d9a406;
+  --yellow-700:#b38705;
+  --yellow-800:#8c6a04;
+  --yellow-900:#664d03;
+  --cyan-50:#f3fcfe;
+  --cyan-100:#c5f2fb;
+  --cyan-200:#97e8f9;
+  --cyan-300:#69def6;
+  --cyan-400:#3bd4f3;
+  --cyan-500:#0dcaf0;
+  --cyan-600:#0baccc;
+  --cyan-700:#098da8;
+  --cyan-800:#076f84;
+  --cyan-900:#055160;
+  --pink-50:#fdf5f9;
+  --pink-100:#f5cee1;
+  --pink-200:#eda7ca;
+  --pink-300:#e681b3;
+  --pink-400:#de5a9b;
+  --pink-500:#d63384;
+  --pink-600:#b62b70;
+  --pink-700:#96245c;
+  --pink-800:#761c49;
+  --pink-900:#561435;
+  --indigo-50:#f7f3fe;
+  --indigo-100:#dac6fc;
+  --indigo-200:#bd98f9;
+  --indigo-300:#a06bf7;
+  --indigo-400:#833df4;
+  --indigo-500:#6610f2;
+  --indigo-600:#570ece;
+  --indigo-700:#470ba9;
+  --indigo-800:#380985;
+  --indigo-900:#290661;
+  --teal-50:#f4fcfa;
+  --teal-100:#c9f2e6;
+  --teal-200:#9fe8d2;
+  --teal-300:#75debf;
+  --teal-400:#4ad3ab;
+  --teal-500:#20c997;
+  --teal-600:#1bab80;
+  --teal-700:#168d6a;
+  --teal-800:#126f53;
+  --teal-900:#0d503c;
+  --orange-50:#fff9f3;
+  --orange-100:#ffe0c7;
+  --orange-200:#fec89a;
+  --orange-300:#feaf6d;
+  --orange-400:#fd9741;
+  --orange-500:#fd7e14;
+  --orange-600:#d76b11;
+  --orange-700:#b1580e;
+  --orange-800:#8b450b;
+  --orange-900:#653208;
+  --bluegray-50:#f8f9fb;
+  --bluegray-100:#e0e4ea;
+  --bluegray-200:#c7ced9;
+  --bluegray-300:#aeb9c8;
+  --bluegray-400:#95a3b8;
+  --bluegray-500:#7c8ea7;
+  --bluegray-600:#69798e;
+  --bluegray-700:#576375;
+  --bluegray-800:#444e5c;
+  --bluegray-900:#323943;
+  --purple-50:#f8f6fc;
+  --purple-100:#dcd2f0;
+  --purple-200:#c1aee4;
+  --purple-300:#a68ad9;
+  --purple-400:#8a66cd;
+  --purple-500:#6f42c1;
+  --purple-600:#5e38a4;
+  --purple-700:#4e2e87;
+  --purple-800:#3d246a;
+  --purple-900:#2c1a4d;
+  --red-50:#fdf5f6;
+  --red-100:#f7cfd2;
+  --red-200:#f0a8af;
+  --red-300:#e9828c;
+  --red-400:#e35b68;
+  --red-500:#dc3545;
+  --red-600:#bb2d3b;
+  --red-700:#9a2530;
+  --red-800:#791d26;
+  --red-900:#58151c;
+  --primary-50:#f2f8ff;
+  --primary-100:#c2dfff;
+  --primary-200:#91c6ff;
+  --primary-300:#61adff;
+  --primary-400:#3094ff;
+  --primary-500:#007bff;
+  --primary-600:#0069d9;
+  --primary-700:#0056b3;
+  --primary-800:#00448c;
+  --primary-900:#003166;
+}
+
+.p-autocomplete .p-autocomplete-loader {
+  right: 0.75rem;
+}
+.p-autocomplete.p-autocomplete-dd .p-autocomplete-loader {
+  right: 3.107rem;
+}
+.p-autocomplete .p-autocomplete-multiple-container {
+  padding: 0.25rem 0.75rem;
+}
+.p-autocomplete .p-autocomplete-multiple-container:not(.p-disabled):hover {
+  border-color: #ced4da;
+}
+.p-autocomplete .p-autocomplete-multiple-container:not(.p-disabled).p-focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+  border-color: #007bff;
+}
+.p-autocomplete .p-autocomplete-multiple-container .p-autocomplete-input-token {
+  padding: 0.25rem 0;
+}
+.p-autocomplete .p-autocomplete-multiple-container .p-autocomplete-input-token input {
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+  font-size: 1rem;
+  color: #212529;
+  padding: 0;
+  margin: 0;
+}
+.p-autocomplete .p-autocomplete-multiple-container .p-autocomplete-token {
+  padding: 0.25rem 0.75rem;
+  margin-right: 0.5rem;
+  background: #dee2e6;
+  color: #212529;
+  border-radius: 16px;
+}
+.p-autocomplete .p-autocomplete-multiple-container .p-autocomplete-token .p-autocomplete-token-icon {
+  margin-left: 0.5rem;
+}
+.p-autocomplete.p-invalid.p-component > .p-inputtext {
+  border-color: #dc3545;
+}
+
+.p-autocomplete-panel {
+  background: #ffffff;
+  color: #212529;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  border-radius: 4px;
+  box-shadow: none;
+}
+.p-autocomplete-panel .p-autocomplete-items {
+  padding: 0.5rem 0;
+}
+.p-autocomplete-panel .p-autocomplete-items .p-autocomplete-item {
+  margin: 0;
+  padding: 0.5rem 1.5rem;
+  border: 0 none;
+  color: #212529;
+  background: transparent;
+  transition: box-shadow 0.15s;
+  border-radius: 0;
+}
+.p-autocomplete-panel .p-autocomplete-items .p-autocomplete-item:hover {
+  color: #212529;
+  background: #e9ecef;
+}
+.p-autocomplete-panel .p-autocomplete-items .p-autocomplete-item.p-highlight {
+  color: #ffffff;
+  background: #007bff;
+}
+.p-autocomplete-panel .p-autocomplete-items .p-autocomplete-item-group {
+  margin: 0;
+  padding: 0.75rem 1rem;
+  color: #212529;
+  background: #ffffff;
+  font-weight: 600;
+}
+
+.p-calendar.p-invalid.p-component > .p-inputtext {
+  border-color: #dc3545;
+}
+
+.p-datepicker {
+  padding: 0;
+  background: #ffffff;
+  color: #212529;
+  border: 1px solid #ced4da;
+  border-radius: 4px;
+}
+.p-datepicker:not(.p-datepicker-inline) {
+  background: #ffffff;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  box-shadow: none;
+}
+.p-datepicker:not(.p-datepicker-inline) .p-datepicker-header {
+  background: #efefef;
+}
+.p-datepicker .p-datepicker-header {
+  padding: 0.5rem;
+  color: #212529;
+  background: #ffffff;
+  font-weight: 600;
+  margin: 0;
+  border-bottom: 1px solid #dee2e6;
+  border-top-right-radius: 4px;
+  border-top-left-radius: 4px;
+}
+.p-datepicker .p-datepicker-header .p-datepicker-prev,
+.p-datepicker .p-datepicker-header .p-datepicker-next {
+  width: 2rem;
+  height: 2rem;
+  color: #6c757d;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
+  transition: box-shadow 0.15s;
+}
+.p-datepicker .p-datepicker-header .p-datepicker-prev:enabled:hover,
+.p-datepicker .p-datepicker-header .p-datepicker-next:enabled:hover {
+  color: #495057;
+  border-color: transparent;
+  background: transparent;
+}
+.p-datepicker .p-datepicker-header .p-datepicker-prev:focus,
+.p-datepicker .p-datepicker-header .p-datepicker-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+}
+.p-datepicker .p-datepicker-header .p-datepicker-title {
+  line-height: 2rem;
+}
+.p-datepicker .p-datepicker-header .p-datepicker-title .p-datepicker-year,
+.p-datepicker .p-datepicker-header .p-datepicker-title .p-datepicker-month {
+  color: #212529;
+  transition: box-shadow 0.15s;
+  font-weight: 600;
+  padding: 0.5rem;
+}
+.p-datepicker .p-datepicker-header .p-datepicker-title .p-datepicker-year:enabled:hover,
+.p-datepicker .p-datepicker-header .p-datepicker-title .p-datepicker-month:enabled:hover {
+  color: #007bff;
+}
+.p-datepicker .p-datepicker-header .p-datepicker-title .p-datepicker-month {
+  margin-right: 0.5rem;
+}
+.p-datepicker table {
+  font-size: 1rem;
+  margin: 0.5rem 0;
+}
+.p-datepicker table th {
+  padding: 0.5rem;
+}
+.p-datepicker table th > span {
+  width: 2.5rem;
+  height: 2.5rem;
+}
+.p-datepicker table td {
+  padding: 0.5rem;
+}
+.p-datepicker table td > span {
+  width: 2.5rem;
+  height: 2.5rem;
+  border-radius: 4px;
+  transition: box-shadow 0.15s;
+  border: 1px solid transparent;
+}
+.p-datepicker table td > span.p-highlight {
+  color: #ffffff;
+  background: #007bff;
+}
+.p-datepicker table td > span:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+}
+.p-datepicker table td.p-datepicker-today > span {
+  background: #ced4da;
+  color: #212529;
+  border-color: transparent;
+}
+.p-datepicker table td.p-datepicker-today > span.p-highlight {
+  color: #ffffff;
+  background: #007bff;
+}
+.p-datepicker .p-datepicker-buttonbar {
+  padding: 1rem 0;
+  border-top: 1px solid #dee2e6;
+}
+.p-datepicker .p-datepicker-buttonbar .p-button {
+  width: auto;
+}
+.p-datepicker .p-timepicker {
+  border-top: 1px solid #dee2e6;
+  padding: 0.5rem;
+}
+.p-datepicker .p-timepicker button {
+  width: 2rem;
+  height: 2rem;
+  color: #6c757d;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
+  transition: box-shadow 0.15s;
+}
+.p-datepicker .p-timepicker button:enabled:hover {
+  color: #495057;
+  border-color: transparent;
+  background: transparent;
+}
+.p-datepicker .p-timepicker button:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+}
+.p-datepicker .p-timepicker button:last-child {
+  margin-top: 0.2em;
+}
+.p-datepicker .p-timepicker span {
+  font-size: 1.25rem;
+}
+.p-datepicker .p-timepicker > div {
+  padding: 0 0.5rem;
+}
+.p-datepicker.p-datepicker-timeonly .p-timepicker {
+  border-top: 0 none;
+}
+.p-datepicker .p-monthpicker {
+  margin: 0.5rem 0;
+}
+.p-datepicker .p-monthpicker .p-monthpicker-month {
+  padding: 0.5rem;
+  transition: box-shadow 0.15s;
+  border-radius: 4px;
+}
+.p-datepicker .p-monthpicker .p-monthpicker-month.p-highlight {
+  color: #ffffff;
+  background: #007bff;
+}
+.p-datepicker .p-yearpicker {
+  margin: 0.5rem 0;
+}
+.p-datepicker .p-yearpicker .p-yearpicker-year {
+  padding: 0.5rem;
+  transition: box-shadow 0.15s;
+  border-radius: 4px;
+}
+.p-datepicker .p-yearpicker .p-yearpicker-year.p-highlight {
+  color: #ffffff;
+  background: #007bff;
+}
+.p-datepicker.p-datepicker-multiple-month .p-datepicker-group {
+  border-left: 1px solid #dee2e6;
+  padding-right: 0;
+  padding-left: 0;
+  padding-top: 0;
+  padding-bottom: 0;
+}
+.p-datepicker.p-datepicker-multiple-month .p-datepicker-group:first-child {
+  padding-left: 0;
+  border-left: 0 none;
+}
+.p-datepicker.p-datepicker-multiple-month .p-datepicker-group:last-child {
+  padding-right: 0;
+}
+.p-datepicker:not(.p-disabled) table td span:not(.p-highlight):not(.p-disabled):hover {
+  background: #e9ecef;
+}
+.p-datepicker:not(.p-disabled) table td span:not(.p-highlight):not(.p-disabled):focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+}
+.p-datepicker:not(.p-disabled) .p-monthpicker .p-monthpicker-month:not(.p-disabled):not(.p-highlight):hover {
+  background: #e9ecef;
+}
+.p-datepicker:not(.p-disabled) .p-monthpicker .p-monthpicker-month:not(.p-disabled):focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+}
+.p-datepicker:not(.p-disabled) .p-yearpicker .p-yearpicker-year:not(.p-disabled):not(.p-highlight):hover {
+  background: #e9ecef;
+}
+.p-datepicker:not(.p-disabled) .p-yearpicker .p-yearpicker-year:not(.p-disabled):focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+}
+
+@media screen and (max-width: 769px) {
+  .p-datepicker table th, .p-datepicker table td {
+    padding: 0;
+  }
+}
+.p-cascadeselect {
+  background: #ffffff;
+  border: 1px solid #ced4da;
+  transition: background-color 0.15s, border-color 0.15s, box-shadow 0.15s;
+  border-radius: 4px;
+}
+.p-cascadeselect:not(.p-disabled):hover {
+  border-color: #ced4da;
+}
+.p-cascadeselect:not(.p-disabled).p-focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+  border-color: #007bff;
+}
+.p-cascadeselect .p-cascadeselect-label {
+  background: transparent;
+  border: 0 none;
+  padding: 0.5rem 0.75rem;
+}
+.p-cascadeselect .p-cascadeselect-label.p-placeholder {
+  color: #6c757d;
+}
+.p-cascadeselect .p-cascadeselect-label:enabled:focus {
+  outline: 0 none;
+  box-shadow: none;
+}
+.p-cascadeselect .p-cascadeselect-trigger {
+  background: transparent;
+  color: #495057;
+  width: 2.357rem;
+  border-top-right-radius: 4px;
+  border-bottom-right-radius: 4px;
+}
+.p-cascadeselect.p-invalid.p-component {
+  border-color: #dc3545;
+}
+
+.p-cascadeselect-panel {
+  background: #ffffff;
+  color: #212529;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  border-radius: 4px;
+  box-shadow: none;
+}
+.p-cascadeselect-panel .p-cascadeselect-items {
+  padding: 0.5rem 0;
+}
+.p-cascadeselect-panel .p-cascadeselect-items .p-cascadeselect-item {
+  margin: 0;
+  border: 0 none;
+  color: #212529;
+  background: transparent;
+  transition: box-shadow 0.15s;
+  border-radius: 0;
+}
+.p-cascadeselect-panel .p-cascadeselect-items .p-cascadeselect-item .p-cascadeselect-item-content {
+  padding: 0.5rem 1.5rem;
+}
+.p-cascadeselect-panel .p-cascadeselect-items .p-cascadeselect-item .p-cascadeselect-item-content:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: inset 0 0 0 0.15rem rgba(38, 143, 255, 0.5);
+}
+.p-cascadeselect-panel .p-cascadeselect-items .p-cascadeselect-item.p-highlight {
+  color: #ffffff;
+  background: #007bff;
+}
+.p-cascadeselect-panel .p-cascadeselect-items .p-cascadeselect-item:not(.p-highlight):not(.p-disabled):hover {
+  color: #212529;
+  background: #e9ecef;
+}
+.p-cascadeselect-panel .p-cascadeselect-items .p-cascadeselect-item .p-cascadeselect-group-icon {
+  font-size: 0.875rem;
+}
+
+.p-input-filled .p-cascadeselect {
+  background: #efefef;
+}
+.p-input-filled .p-cascadeselect:not(.p-disabled):hover {
+  background-color: #efefef;
+}
+.p-input-filled .p-cascadeselect:not(.p-disabled).p-focus {
+  background-color: #efefef;
+}
+
+.p-checkbox {
+  width: 20px;
+  height: 20px;
+}
+.p-checkbox .p-checkbox-box {
+  border: 2px solid #ced4da;
+  background: #ffffff;
+  width: 20px;
+  height: 20px;
+  color: #212529;
+  border-radius: 4px;
+  transition: background-color 0.15s, border-color 0.15s, box-shadow 0.15s;
+}
+.p-checkbox .p-checkbox-box .p-checkbox-icon {
+  transition-duration: 0.15s;
+  color: #ffffff;
+  font-size: 14px;
+}
+.p-checkbox .p-checkbox-box.p-highlight {
+  border-color: #007bff;
+  background: #007bff;
+}
+.p-checkbox:not(.p-checkbox-disabled) .p-checkbox-box:hover {
+  border-color: #ced4da;
+}
+.p-checkbox:not(.p-checkbox-disabled) .p-checkbox-box.p-focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+  border-color: #007bff;
+}
+.p-checkbox:not(.p-checkbox-disabled) .p-checkbox-box.p-highlight:hover {
+  border-color: #0062cc;
+  background: #0062cc;
+  color: #ffffff;
+}
+.p-checkbox.p-invalid > .p-checkbox-box {
+  border-color: #dc3545;
+}
+
+.p-input-filled .p-checkbox .p-checkbox-box {
+  background-color: #efefef;
+}
+.p-input-filled .p-checkbox .p-checkbox-box.p-highlight {
+  background: #007bff;
+}
+.p-input-filled .p-checkbox:not(.p-checkbox-disabled) .p-checkbox-box:hover {
+  background-color: #efefef;
+}
+.p-input-filled .p-checkbox:not(.p-checkbox-disabled) .p-checkbox-box.p-highlight:hover {
+  background: #0062cc;
+}
+
+.p-highlight .p-checkbox .p-checkbox-box {
+  border-color: #ffffff;
+}
+
+.p-chips .p-chips-multiple-container {
+  padding: 0.25rem 0.75rem;
+}
+.p-chips .p-chips-multiple-container:not(.p-disabled):hover {
+  border-color: #ced4da;
+}
+.p-chips .p-chips-multiple-container:not(.p-disabled).p-focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+  border-color: #007bff;
+}
+.p-chips .p-chips-multiple-container .p-chips-token {
+  padding: 0.25rem 0.75rem;
+  margin-right: 0.5rem;
+  background: #dee2e6;
+  color: #212529;
+  border-radius: 16px;
+}
+.p-chips .p-chips-multiple-container .p-chips-token .p-chips-token-icon {
+  margin-left: 0.5rem;
+}
+.p-chips .p-chips-multiple-container .p-chips-input-token {
+  padding: 0.25rem 0;
+}
+.p-chips .p-chips-multiple-container .p-chips-input-token input {
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+  font-size: 1rem;
+  color: #212529;
+  padding: 0;
+  margin: 0;
+}
+.p-chips.p-invalid.p-component > .p-inputtext {
+  border-color: #dc3545;
+}
+
+.p-colorpicker-preview {
+  width: 2rem;
+  height: 2rem;
+}
+
+.p-colorpicker-panel {
+  background: #212529;
+  border: 1px solid #212529;
+}
+.p-colorpicker-panel .p-colorpicker-color-handle,
+.p-colorpicker-panel .p-colorpicker-hue-handle {
+  border-color: #ffffff;
+}
+
+.p-colorpicker-overlay-panel {
+  box-shadow: none;
+}
+
+.p-dropdown {
+  background: #ffffff;
+  border: 1px solid #ced4da;
+  transition: background-color 0.15s, border-color 0.15s, box-shadow 0.15s;
+  border-radius: 4px;
+}
+.p-dropdown:not(.p-disabled):hover {
+  border-color: #ced4da;
+}
+.p-dropdown:not(.p-disabled).p-focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+  border-color: #007bff;
+}
+.p-dropdown.p-dropdown-clearable .p-dropdown-label {
+  padding-right: 1.75rem;
+}
+.p-dropdown .p-dropdown-label {
+  background: transparent;
+  border: 0 none;
+}
+.p-dropdown .p-dropdown-label.p-placeholder {
+  color: #6c757d;
+}
+.p-dropdown .p-dropdown-label:enabled:focus {
+  outline: 0 none;
+  box-shadow: none;
+}
+.p-dropdown .p-dropdown-trigger {
+  background: transparent;
+  color: #495057;
+  width: 2.357rem;
+  border-top-right-radius: 4px;
+  border-bottom-right-radius: 4px;
+}
+.p-dropdown .p-dropdown-clear-icon {
+  color: #495057;
+  right: 2.357rem;
+}
+.p-dropdown.p-invalid.p-component {
+  border-color: #dc3545;
+}
+
+.p-dropdown-panel {
+  background: #ffffff;
+  color: #212529;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  border-radius: 4px;
+  box-shadow: none;
+}
+.p-dropdown-panel .p-dropdown-header {
+  padding: 0.75rem 1.5rem;
+  border-bottom: 1px solid #dee2e6;
+  color: #212529;
+  background: #efefef;
+  margin: 0;
+  border-top-right-radius: 4px;
+  border-top-left-radius: 4px;
+}
+.p-dropdown-panel .p-dropdown-header .p-dropdown-filter {
+  padding-right: 1.75rem;
+  margin-right: -1.75rem;
+}
+.p-dropdown-panel .p-dropdown-header .p-dropdown-filter-icon {
+  right: 0.75rem;
+  color: #495057;
+}
+.p-dropdown-panel .p-dropdown-items {
+  padding: 0.5rem 0;
+}
+.p-dropdown-panel .p-dropdown-items .p-dropdown-item {
+  margin: 0;
+  padding: 0.5rem 1.5rem;
+  border: 0 none;
+  color: #212529;
+  background: transparent;
+  transition: box-shadow 0.15s;
+  border-radius: 0;
+}
+.p-dropdown-panel .p-dropdown-items .p-dropdown-item.p-highlight {
+  color: #ffffff;
+  background: #007bff;
+}
+.p-dropdown-panel .p-dropdown-items .p-dropdown-item:not(.p-highlight):not(.p-disabled):hover {
+  color: #212529;
+  background: #e9ecef;
+}
+.p-dropdown-panel .p-dropdown-items .p-dropdown-item-group {
+  margin: 0;
+  padding: 0.75rem 1rem;
+  color: #212529;
+  background: #ffffff;
+  font-weight: 600;
+}
+.p-dropdown-panel .p-dropdown-items .p-dropdown-empty-message {
+  padding: 0.5rem 1.5rem;
+  color: #212529;
+  background: transparent;
+}
+
+.p-input-filled .p-dropdown {
+  background: #efefef;
+}
+.p-input-filled .p-dropdown:not(.p-disabled):hover {
+  background-color: #efefef;
+}
+.p-input-filled .p-dropdown:not(.p-disabled).p-focus {
+  background-color: #efefef;
+}
+.p-input-filled .p-dropdown:not(.p-disabled).p-focus .p-inputtext {
+  background-color: transparent;
+}
+
+.p-editor-container .p-editor-toolbar {
+  background: #efefef;
+  border-top-right-radius: 4px;
+  border-top-left-radius: 4px;
+}
+.p-editor-container .p-editor-toolbar.ql-snow {
+  border: 1px solid #dee2e6;
+}
+.p-editor-container .p-editor-toolbar.ql-snow .ql-stroke {
+  stroke: #6c757d;
+}
+.p-editor-container .p-editor-toolbar.ql-snow .ql-fill {
+  fill: #6c757d;
+}
+.p-editor-container .p-editor-toolbar.ql-snow .ql-picker .ql-picker-label {
+  border: 0 none;
+  color: #6c757d;
+}
+.p-editor-container .p-editor-toolbar.ql-snow .ql-picker .ql-picker-label:hover {
+  color: #212529;
+}
+.p-editor-container .p-editor-toolbar.ql-snow .ql-picker .ql-picker-label:hover .ql-stroke {
+  stroke: #212529;
+}
+.p-editor-container .p-editor-toolbar.ql-snow .ql-picker .ql-picker-label:hover .ql-fill {
+  fill: #212529;
+}
+.p-editor-container .p-editor-toolbar.ql-snow .ql-picker.ql-expanded .ql-picker-label {
+  color: #212529;
+}
+.p-editor-container .p-editor-toolbar.ql-snow .ql-picker.ql-expanded .ql-picker-label .ql-stroke {
+  stroke: #212529;
+}
+.p-editor-container .p-editor-toolbar.ql-snow .ql-picker.ql-expanded .ql-picker-label .ql-fill {
+  fill: #212529;
+}
+.p-editor-container .p-editor-toolbar.ql-snow .ql-picker.ql-expanded .ql-picker-options {
+  background: #ffffff;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  box-shadow: none;
+  border-radius: 4px;
+  padding: 0.5rem 0;
+}
+.p-editor-container .p-editor-toolbar.ql-snow .ql-picker.ql-expanded .ql-picker-options .ql-picker-item {
+  color: #212529;
+}
+.p-editor-container .p-editor-toolbar.ql-snow .ql-picker.ql-expanded .ql-picker-options .ql-picker-item:hover {
+  color: #212529;
+  background: #e9ecef;
+}
+.p-editor-container .p-editor-toolbar.ql-snow .ql-picker.ql-expanded:not(.ql-icon-picker) .ql-picker-item {
+  padding: 0.5rem 1.5rem;
+}
+.p-editor-container .p-editor-content {
+  border-bottom-right-radius: 4px;
+  border-bottom-left-radius: 4px;
+}
+.p-editor-container .p-editor-content.ql-snow {
+  border: 1px solid #dee2e6;
+}
+.p-editor-container .p-editor-content .ql-editor {
+  background: #ffffff;
+  color: #495057;
+  border-bottom-right-radius: 4px;
+  border-bottom-left-radius: 4px;
+}
+.p-editor-container .ql-snow.ql-toolbar button:hover,
+.p-editor-container .ql-snow.ql-toolbar button:focus {
+  color: #212529;
+}
+.p-editor-container .ql-snow.ql-toolbar button:hover .ql-stroke,
+.p-editor-container .ql-snow.ql-toolbar button:focus .ql-stroke {
+  stroke: #212529;
+}
+.p-editor-container .ql-snow.ql-toolbar button:hover .ql-fill,
+.p-editor-container .ql-snow.ql-toolbar button:focus .ql-fill {
+  fill: #212529;
+}
+.p-editor-container .ql-snow.ql-toolbar button.ql-active,
+.p-editor-container .ql-snow.ql-toolbar .ql-picker-label.ql-active,
+.p-editor-container .ql-snow.ql-toolbar .ql-picker-item.ql-selected {
+  color: #007bff;
+}
+.p-editor-container .ql-snow.ql-toolbar button.ql-active .ql-stroke,
+.p-editor-container .ql-snow.ql-toolbar .ql-picker-label.ql-active .ql-stroke,
+.p-editor-container .ql-snow.ql-toolbar .ql-picker-item.ql-selected .ql-stroke {
+  stroke: #007bff;
+}
+.p-editor-container .ql-snow.ql-toolbar button.ql-active .ql-fill,
+.p-editor-container .ql-snow.ql-toolbar .ql-picker-label.ql-active .ql-fill,
+.p-editor-container .ql-snow.ql-toolbar .ql-picker-item.ql-selected .ql-fill {
+  fill: #007bff;
+}
+.p-editor-container .ql-snow.ql-toolbar button.ql-active .ql-picker-label,
+.p-editor-container .ql-snow.ql-toolbar .ql-picker-label.ql-active .ql-picker-label,
+.p-editor-container .ql-snow.ql-toolbar .ql-picker-item.ql-selected .ql-picker-label {
+  color: #007bff;
+}
+
+.p-inputgroup-addon {
+  background: #e9ecef;
+  color: #495057;
+  border-top: 1px solid #ced4da;
+  border-left: 1px solid #ced4da;
+  border-bottom: 1px solid #ced4da;
+  padding: 0.5rem 0.75rem;
+  min-width: 2.357rem;
+}
+.p-inputgroup-addon:last-child {
+  border-right: 1px solid #ced4da;
+}
+
+.p-inputgroup > .p-component,
+.p-inputgroup > .p-inputwrapper > .p-inputtext,
+.p-inputgroup > .p-float-label > .p-component {
+  border-radius: 0;
+  margin: 0;
+}
+.p-inputgroup > .p-component + .p-inputgroup-addon,
+.p-inputgroup > .p-inputwrapper > .p-inputtext + .p-inputgroup-addon,
+.p-inputgroup > .p-float-label > .p-component + .p-inputgroup-addon {
+  border-left: 0 none;
+}
+.p-inputgroup > .p-component:focus,
+.p-inputgroup > .p-inputwrapper > .p-inputtext:focus,
+.p-inputgroup > .p-float-label > .p-component:focus {
+  z-index: 1;
+}
+.p-inputgroup > .p-component:focus ~ label,
+.p-inputgroup > .p-inputwrapper > .p-inputtext:focus ~ label,
+.p-inputgroup > .p-float-label > .p-component:focus ~ label {
+  z-index: 1;
+}
+
+.p-inputgroup-addon:first-child,
+.p-inputgroup button:first-child,
+.p-inputgroup input:first-child,
+.p-inputgroup > .p-inputwrapper:first-child,
+.p-inputgroup > .p-inputwrapper:first-child > .p-inputtext {
+  border-top-left-radius: 4px;
+  border-bottom-left-radius: 4px;
+}
+
+.p-inputgroup .p-float-label:first-child input {
+  border-top-left-radius: 4px;
+  border-bottom-left-radius: 4px;
+}
+
+.p-inputgroup-addon:last-child,
+.p-inputgroup button:last-child,
+.p-inputgroup input:last-child,
+.p-inputgroup > .p-inputwrapper:last-child,
+.p-inputgroup > .p-inputwrapper:last-child > .p-inputtext {
+  border-top-right-radius: 4px;
+  border-bottom-right-radius: 4px;
+}
+
+.p-inputgroup .p-float-label:last-child input {
+  border-top-right-radius: 4px;
+  border-bottom-right-radius: 4px;
+}
+
+.p-fluid .p-inputgroup .p-button {
+  width: auto;
+}
+.p-fluid .p-inputgroup .p-button.p-button-icon-only {
+  width: 2.357rem;
+}
+
+.p-inputnumber.p-invalid.p-component > .p-inputtext {
+  border-color: #dc3545;
+}
+
+.p-inputswitch {
+  width: 3rem;
+  height: 1.75rem;
+}
+.p-inputswitch .p-inputswitch-slider {
+  background: #ced4da;
+  transition: background-color 0.15s, border-color 0.15s, box-shadow 0.15s;
+  border-radius: 4px;
+}
+.p-inputswitch .p-inputswitch-slider:before {
+  background: #ffffff;
+  width: 1.25rem;
+  height: 1.25rem;
+  left: 0.25rem;
+  margin-top: -0.625rem;
+  border-radius: 4px;
+  transition-duration: 0.15s;
+}
+.p-inputswitch.p-inputswitch-checked .p-inputswitch-slider:before {
+  transform: translateX(1.25rem);
+}
+.p-inputswitch.p-focus .p-inputswitch-slider {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+}
+.p-inputswitch:not(.p-disabled):hover .p-inputswitch-slider {
+  background: #ced4da;
+}
+.p-inputswitch.p-inputswitch-checked .p-inputswitch-slider {
+  background: #007bff;
+}
+.p-inputswitch.p-inputswitch-checked .p-inputswitch-slider:before {
+  background: #ffffff;
+}
+.p-inputswitch.p-inputswitch-checked:not(.p-disabled):hover .p-inputswitch-slider {
+  background: #007bff;
+}
+.p-inputswitch.p-invalid {
+  border-color: #dc3545;
+}
+
+
+.p-float-label > label {
+  left: 0.75rem;
+  color: #6c757d;
+  transition-duration: 0.15s;
+}
+
+.p-float-label > .p-invalid + label {
+  color: #dc3545;
+}
+
+.p-input-icon-left > i:first-of-type {
+  left: 0.75rem;
+  color: #495057;
+}
+
+.p-input-icon-left > .p-inputtext {
+  padding-left: 2.5rem;
+}
+
+.p-input-icon-left.p-float-label > label {
+  left: 2.5rem;
+}
+
+.p-input-icon-right > i:last-of-type {
+  right: 0.75rem;
+  color: #495057;
+}
+
+.p-input-icon-right > .p-inputtext {
+  padding-right: 2.5rem;
+}
+
+::-webkit-input-placeholder {
+  color: #6c757d;
+}
+
+:-moz-placeholder {
+  color: #6c757d;
+}
+
+::-moz-placeholder {
+  color: #6c757d;
+}
+
+:-ms-input-placeholder {
+  color: #6c757d;
+}
+
+.p-input-filled .p-inputtext {
+  background-color: #efefef;
+}
+.p-input-filled .p-inputtext:enabled:hover {
+  background-color: #efefef;
+}
+.p-input-filled .p-inputtext:enabled:focus {
+  background-color: #efefef;
+}
+
+.p-inputtext-sm .p-inputtext {
+  font-size: 0.875rem;
+  padding: 0.4375rem 0.65625rem;
+}
+
+.p-inputtext-lg .p-inputtext {
+  font-size: 1.25rem;
+  padding: 0.625rem 0.9375rem;
+}
+
+.p-listbox {
+  background: #ffffff;
+  color: #212529;
+  border: 1px solid #ced4da;
+  border-radius: 4px;
+}
+.p-listbox .p-listbox-header {
+  padding: 0.75rem 1.5rem;
+  border-bottom: 1px solid #dee2e6;
+  color: #212529;
+  background: #efefef;
+  margin: 0;
+  border-top-right-radius: 4px;
+  border-top-left-radius: 4px;
+}
+.p-listbox .p-listbox-header .p-listbox-filter {
+  padding-right: 1.75rem;
+}
+.p-listbox .p-listbox-header .p-listbox-filter-icon {
+  right: 0.75rem;
+  color: #495057;
+}
+.p-listbox .p-listbox-list {
+  padding: 0.5rem 0;
+}
+.p-listbox .p-listbox-list .p-listbox-item {
+  margin: 0;
+  padding: 0.5rem 1.5rem;
+  border: 0 none;
+  color: #212529;
+  transition: box-shadow 0.15s;
+  border-radius: 0;
+}
+.p-listbox .p-listbox-list .p-listbox-item.p-highlight {
+  color: #ffffff;
+  background: #007bff;
+}
+.p-listbox .p-listbox-list .p-listbox-item:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: inset 0 0 0 0.15rem rgba(38, 143, 255, 0.5);
+}
+.p-listbox .p-listbox-list .p-listbox-item-group {
+  margin: 0;
+  padding: 0.75rem 1rem;
+  color: #212529;
+  background: #ffffff;
+  font-weight: 600;
+}
+.p-listbox .p-listbox-list .p-listbox-empty-message {
+  padding: 0.5rem 1.5rem;
+  color: #212529;
+  background: transparent;
+}
+.p-listbox:not(.p-disabled) .p-listbox-item:not(.p-highlight):not(.p-disabled):hover {
+  color: #212529;
+  background: #e9ecef;
+}
+.p-listbox.p-invalid {
+  border-color: #dc3545;
+}
+
+.p-multiselect {
+  background: #ffffff;
+  border: 1px solid #ced4da;
+  transition: background-color 0.15s, border-color 0.15s, box-shadow 0.15s;
+  border-radius: 4px;
+}
+.p-multiselect:not(.p-disabled):hover {
+  border-color: #ced4da;
+}
+.p-multiselect:not(.p-disabled).p-focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+  border-color: #007bff;
+}
+.p-multiselect .p-multiselect-label {
+  padding: 0.5rem 0.75rem;
+  transition: background-color 0.15s, border-color 0.15s, box-shadow 0.15s;
+}
+.p-multiselect .p-multiselect-label.p-placeholder {
+  color: #6c757d;
+}
+.p-multiselect.p-multiselect-chip .p-multiselect-token {
+  padding: 0.25rem 0.75rem;
+  margin-right: 0.5rem;
+  background: #dee2e6;
+  color: #212529;
+  border-radius: 16px;
+}
+.p-multiselect.p-multiselect-chip .p-multiselect-token .p-multiselect-token-icon {
+  margin-left: 0.5rem;
+}
+.p-multiselect .p-multiselect-trigger {
+  background: transparent;
+  color: #495057;
+  width: 2.357rem;
+  border-top-right-radius: 4px;
+  border-bottom-right-radius: 4px;
+}
+.p-multiselect.p-invalid.p-component {
+  border-color: #dc3545;
+}
+
+.p-inputwrapper-filled.p-multiselect.p-multiselect-chip .p-multiselect-label {
+  padding: 0.25rem 0.75rem;
+}
+
+.p-multiselect-panel {
+  background: #ffffff;
+  color: #212529;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  border-radius: 4px;
+  box-shadow: none;
+}
+.p-multiselect-panel .p-multiselect-header {
+  padding: 0.75rem 1.5rem;
+  border-bottom: 1px solid #dee2e6;
+  color: #212529;
+  background: #efefef;
+  margin: 0;
+  border-top-right-radius: 4px;
+  border-top-left-radius: 4px;
+}
+.p-multiselect-panel .p-multiselect-header .p-multiselect-filter-container .p-inputtext {
+  padding-right: 1.75rem;
+}
+.p-multiselect-panel .p-multiselect-header .p-multiselect-filter-container .p-multiselect-filter-icon {
+  right: 0.75rem;
+  color: #495057;
+}
+.p-multiselect-panel .p-multiselect-header .p-checkbox {
+  margin-right: 0.5rem;
+}
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close {
+  margin-left: 0.5rem;
+  width: 2rem;
+  height: 2rem;
+  color: #6c757d;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
+  transition: box-shadow 0.15s;
+}
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:enabled:hover {
+  color: #495057;
+  border-color: transparent;
+  background: transparent;
+}
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+}
+.p-multiselect-panel .p-multiselect-items {
+  padding: 0.5rem 0;
+}
+.p-multiselect-panel .p-multiselect-items .p-multiselect-item {
+  margin: 0;
+  padding: 0.5rem 1.5rem;
+  border: 0 none;
+  color: #212529;
+  background: transparent;
+  transition: box-shadow 0.15s;
+  border-radius: 0;
+}
+.p-multiselect-panel .p-multiselect-items .p-multiselect-item.p-highlight {
+  color: #ffffff;
+  background: #007bff;
+}
+.p-multiselect-panel .p-multiselect-items .p-multiselect-item:not(.p-highlight):not(.p-disabled):hover {
+  color: #212529;
+  background: #e9ecef;
+}
+.p-multiselect-panel .p-multiselect-items .p-multiselect-item:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: inset 0 0 0 0.15rem rgba(38, 143, 255, 0.5);
+}
+.p-multiselect-panel .p-multiselect-items .p-multiselect-item .p-checkbox {
+  margin-right: 0.5rem;
+}
+.p-multiselect-panel .p-multiselect-items .p-multiselect-item-group {
+  margin: 0;
+  padding: 0.75rem 1rem;
+  color: #212529;
+  background: #ffffff;
+  font-weight: 600;
+}
+.p-multiselect-panel .p-multiselect-items .p-multiselect-empty-message {
+  padding: 0.5rem 1.5rem;
+  color: #212529;
+  background: transparent;
+}
+
+.p-input-filled .p-multiselect {
+  background: #efefef;
+}
+.p-input-filled .p-multiselect:not(.p-disabled):hover {
+  background-color: #efefef;
+}
+.p-input-filled .p-multiselect:not(.p-disabled).p-focus {
+  background-color: #efefef;
+}
+
+.p-password.p-invalid.p-component > .p-inputtext {
+  border-color: #dc3545;
+}
+
+.p-password-panel {
+  padding: 1.25rem;
+  background: #ffffff;
+  color: #212529;
+  border: 1px solid rgba(0, 0, 0, 0.2);
+  box-shadow: none;
+  border-radius: 4px;
+}
+.p-password-panel .p-password-meter {
+  margin-bottom: 0.5rem;
+  background: #e9ecef;
+}
+.p-password-panel .p-password-meter .p-password-strength.weak {
+  background: #dc3545;
+}
+.p-password-panel .p-password-meter .p-password-strength.medium {
+  background: #ffc107;
+}
+.p-password-panel .p-password-meter .p-password-strength.strong {
+  background: #28a745;
+}
+
+.p-radiobutton {
+  width: 20px;
+  height: 20px;
+}
+.p-radiobutton .p-radiobutton-box {
+  border: 2px solid #ced4da;
+  background: #ffffff;
+  width: 20px;
+  height: 20px;
+  color: #212529;
+  border-radius: 50%;
+  transition: background-color 0.15s, border-color 0.15s, box-shadow 0.15s;
+}
+.p-radiobutton .p-radiobutton-box:not(.p-disabled):not(.p-highlight):hover {
+  border-color: #ced4da;
+}
+.p-radiobutton .p-radiobutton-box:not(.p-disabled).p-focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+  border-color: #007bff;
+}
+.p-radiobutton .p-radiobutton-box .p-radiobutton-icon {
+  width: 12px;
+  height: 12px;
+  transition-duration: 0.15s;
+  background-color: #ffffff;
+}
+.p-radiobutton .p-radiobutton-box.p-highlight {
+  border-color: #007bff;
+  background: #007bff;
+}
+.p-radiobutton .p-radiobutton-box.p-highlight:not(.p-disabled):hover {
+  border-color: #0062cc;
+  background: #0062cc;
+  color: #ffffff;
+}
+.p-radiobutton.p-invalid > .p-radiobutton-box {
+  border-color: #dc3545;
+}
+.p-radiobutton:focus {
+  outline: 0 none;
+}
+
+.p-input-filled .p-radiobutton .p-radiobutton-box {
+  background-color: #efefef;
+}
+.p-input-filled .p-radiobutton .p-radiobutton-box:not(.p-disabled):hover {
+  background-color: #efefef;
+}
+.p-input-filled .p-radiobutton .p-radiobutton-box.p-highlight {
+  background: #007bff;
+}
+.p-input-filled .p-radiobutton .p-radiobutton-box.p-highlight:not(.p-disabled):hover {
+  background: #0062cc;
+}
+
+.p-highlight .p-radiobutton .p-radiobutton-box {
+  border-color: #ffffff;
+}
+
+.p-rating .p-rating-icon {
+  color: #495057;
+  margin-left: 0.5rem;
+  transition: background-color 0.15s, border-color 0.15s, box-shadow 0.15s;
+  font-size: 1.143rem;
+}
+.p-rating .p-rating-icon.p-rating-cancel {
+  color: #dc3545;
+}
+.p-rating .p-rating-icon:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+}
+.p-rating .p-rating-icon:first-child {
+  margin-left: 0;
+}
+.p-rating .p-rating-icon.pi-star-fill {
+  color: #007bff;
+}
+.p-rating:not(.p-disabled):not(.p-readonly) .p-rating-icon:hover {
+  color: #007bff;
+}
+.p-rating:not(.p-disabled):not(.p-readonly) .p-rating-icon.p-rating-cancel:hover {
+  color: #dc3545;
+}
+
+.p-highlight .p-rating .p-rating-icon {
+  color: #ffffff;
+}
+
+.p-selectbutton .p-button {
+  background: #6c757d;
+  border: 1px solid #6c757d;
+  color: #ffffff;
+  transition: background-color 0.15s, border-color 0.15s, box-shadow 0.15s;
+}
+.p-selectbutton .p-button .p-button-icon-left,
+.p-selectbutton .p-button .p-button-icon-right {
+  color: #ffffff;
+}
+.p-selectbutton .p-button:not(.p-disabled):not(.p-highlight):hover {
+  background: #5a6268;
+  border-color: #545b62;
+  color: #ffffff;
+}
+.p-selectbutton .p-button:not(.p-disabled):not(.p-highlight):hover .p-button-icon-left,
+.p-selectbutton .p-button:not(.p-disabled):not(.p-highlight):hover .p-button-icon-right {
+  color: #ffffff;
+}
+.p-selectbutton .p-button.p-highlight {
+  background: #545b62;
+  border-color: #4e555b;
+  color: #ffffff;
+}
+.p-selectbutton .p-button.p-highlight .p-button-icon-left,
+.p-selectbutton .p-button.p-highlight .p-button-icon-right {
+  color: #ffffff;
+}
+.p-selectbutton .p-button.p-highlight:hover {
+  background: #545b62;
+  border-color: #4e555b;
+  color: #ffffff;
+}
+.p-selectbutton .p-button.p-highlight:hover .p-button-icon-left,
+.p-selectbutton .p-button.p-highlight:hover .p-button-icon-right {
+  color: #ffffff;
+}
+.p-selectbutton.p-invalid > .p-button {
+  border-color: #dc3545;
+}
+
+.p-slider {
+  background: #e9ecef;
+  border: 0 none;
+  border-radius: 4px;
+}
+.p-slider.p-slider-horizontal {
+  height: 0.286rem;
+}
+.p-slider.p-slider-horizontal .p-slider-handle {
+  margin-top: -0.5715rem;
+  margin-left: -0.5715rem;
+}
+.p-slider.p-slider-vertical {
+  width: 0.286rem;
+}
+.p-slider.p-slider-vertical .p-slider-handle {
+  margin-left: -0.5715rem;
+  margin-bottom: -0.5715rem;
+}
+.p-slider .p-slider-handle {
+  height: 1.143rem;
+  width: 1.143rem;
+  background: #007bff;
+  border: 2px solid #007bff;
+  border-radius: 4px;
+  transition: background-color 0.15s, border-color 0.15s, box-shadow 0.15s;
+}
+.p-slider .p-slider-handle:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+}
+.p-slider .p-slider-range {
+  background: #007bff;
+}
+.p-slider:not(.p-disabled) .p-slider-handle:hover {
+  background: #0069d9;
+  border-color: #0069d9;
+}
+
+.p-treeselect {
+  background: #ffffff;
+  border: 1px solid #ced4da;
+  transition: background-color 0.15s, border-color 0.15s, box-shadow 0.15s;
+  border-radius: 4px;
+}
+.p-treeselect:not(.p-disabled):hover {
+  border-color: #ced4da;
+}
+.p-treeselect:not(.p-disabled).p-focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+  border-color: #007bff;
+}
+.p-treeselect .p-treeselect-label {
+  padding: 0.5rem 0.75rem;
+  transition: background-color 0.15s, border-color 0.15s, box-shadow 0.15s;
+}
+.p-treeselect .p-treeselect-label.p-placeholder {
+  color: #6c757d;
+}
+.p-treeselect.p-treeselect-chip .p-treeselect-token {
+  padding: 0.25rem 0.75rem;
+  margin-right: 0.5rem;
+  background: #dee2e6;
+  color: #212529;
+  border-radius: 16px;
+}
+.p-treeselect .p-treeselect-trigger {
+  background: transparent;
+  color: #495057;
+  width: 2.357rem;
+  border-top-right-radius: 4px;
+  border-bottom-right-radius: 4px;
+}
+.p-treeselect.p-invalid.p-component {
+  border-color: #dc3545;
+}
+
+.p-inputwrapper-filled.p-treeselect.p-treeselect-chip .p-treeselect-label {
+  padding: 0.25rem 0.75rem;
+}
+
+.p-treeselect-panel {
+  background: #ffffff;
+  color: #212529;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  border-radius: 4px;
+  box-shadow: none;
+}
+.p-treeselect-panel .p-treeselect-items-wrapper .p-tree {
+  border: 0 none;
+}
+.p-treeselect-panel .p-treeselect-items-wrapper .p-treeselect-empty-message {
+  padding: 0.5rem 1.5rem;
+  color: #212529;
+  background: transparent;
+}
+
+.p-input-filled .p-treeselect {
+  background: #efefef;
+}
+.p-input-filled .p-treeselect:not(.p-disabled):hover {
+  background-color: #efefef;
+}
+.p-input-filled .p-treeselect:not(.p-disabled).p-focus {
+  background-color: #efefef;
+}
+
+.p-togglebutton.p-button {
+  background: #6c757d;
+  border: 1px solid #6c757d;
+  color: #ffffff;
+  transition: background-color 0.15s, border-color 0.15s, box-shadow 0.15s;
+}
+.p-togglebutton.p-button .p-button-icon-left,
+.p-togglebutton.p-button .p-button-icon-right {
+  color: #ffffff;
+}
+.p-togglebutton.p-button:not(.p-disabled):not(.p-highlight):hover {
+  background: #5a6268;
+  border-color: #545b62;
+  color: #ffffff;
+}
+.p-togglebutton.p-button:not(.p-disabled):not(.p-highlight):hover .p-button-icon-left,
+.p-togglebutton.p-button:not(.p-disabled):not(.p-highlight):hover .p-button-icon-right {
+  color: #ffffff;
+}
+.p-togglebutton.p-button.p-highlight {
+  background: #545b62;
+  border-color: #4e555b;
+  color: #ffffff;
+}
+.p-togglebutton.p-button.p-highlight .p-button-icon-left,
+.p-togglebutton.p-button.p-highlight .p-button-icon-right {
+  color: #ffffff;
+}
+.p-togglebutton.p-button.p-highlight:hover {
+  background: #545b62;
+  border-color: #4e555b;
+  color: #ffffff;
+}
+.p-togglebutton.p-button.p-highlight:hover .p-button-icon-left,
+.p-togglebutton.p-button.p-highlight:hover .p-button-icon-right {
+  color: #ffffff;
+}
+.p-togglebutton.p-button.p-invalid > .p-button {
+  border-color: #dc3545;
+}
+
+.p-button {
+  color: #ffffff;
+  background: #007bff;
+  border: 1px solid #007bff;
+  padding: 0.5rem 0.75rem;
+  font-size: 1rem;
+  transition: background-color 0.15s, border-color 0.15s, box-shadow 0.15s;
+  border-radius: 4px;
+}
+.p-button:enabled:hover {
+  background: #0069d9;
+  color: #ffffff;
+  border-color: #0069d9;
+}
+.p-button:enabled:active {
+  background: #0062cc;
+  color: #ffffff;
+  border-color: #0062cc;
+}
+.p-button.p-button-outlined {
+  background-color: transparent;
+  color: #007bff;
+  border: 1px solid;
+}
+.p-button.p-button-outlined:enabled:hover {
+  background: rgba(0, 123, 255, 0.04);
+  color: #007bff;
+  border: 1px solid;
+}
+.p-button.p-button-outlined:enabled:active {
+  background: rgba(0, 123, 255, 0.16);
+  color: #007bff;
+  border: 1px solid;
+}
+.p-button.p-button-outlined.p-button-plain {
+  color: #6c757d;
+  border-color: #6c757d;
+}
+.p-button.p-button-outlined.p-button-plain:enabled:hover {
+  background: #e9ecef;
+  color: #6c757d;
+}
+.p-button.p-button-outlined.p-button-plain:enabled:active {
+  background: #dee2e6;
+  color: #6c757d;
+}
+.p-button.p-button-text {
+  background-color: transparent;
+  color: #007bff;
+  border-color: transparent;
+}
+.p-button.p-button-text:enabled:hover {
+  background: rgba(0, 123, 255, 0.04);
+  color: #007bff;
+  border-color: transparent;
+}
+.p-button.p-button-text:enabled:active {
+  background: rgba(0, 123, 255, 0.16);
+  color: #007bff;
+  border-color: transparent;
+}
+.p-button.p-button-text.p-button-plain {
+  color: #6c757d;
+}
+.p-button.p-button-text.p-button-plain:enabled:hover {
+  background: #e9ecef;
+  color: #6c757d;
+}
+.p-button.p-button-text.p-button-plain:enabled:active {
+  background: #dee2e6;
+  color: #6c757d;
+}
+.p-button:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+}
+.p-button .p-button-icon-left {
+  margin-right: 0.5rem;
+}
+.p-button .p-button-icon-right {
+  margin-left: 0.5rem;
+}
+.p-button .p-button-icon-bottom {
+  margin-top: 0.5rem;
+}
+.p-button .p-button-icon-top {
+  margin-bottom: 0.5rem;
+}
+.p-button .p-badge {
+  margin-left: 0.5rem;
+  min-width: 1rem;
+  height: 1rem;
+  line-height: 1rem;
+  color: #007bff;
+  background-color: #ffffff;
+}
+.p-button.p-button-raised {
+  box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12);
+}
+.p-button.p-button-rounded {
+  border-radius: 2rem;
+}
+.p-button.p-button-icon-only {
+  width: 2.357rem;
+  padding: 0.5rem 0;
+}
+.p-button.p-button-icon-only .p-button-icon-left,
+.p-button.p-button-icon-only .p-button-icon-right {
+  margin: 0;
+}
+.p-button.p-button-icon-only.p-button-rounded {
+  border-radius: 50%;
+  height: 2.357rem;
+}
+.p-button.p-button-sm {
+  font-size: 0.875rem;
+  padding: 0.4375rem 0.65625rem;
+}
+.p-button.p-button-sm .p-button-icon {
+  font-size: 0.875rem;
+}
+.p-button.p-button-lg {
+  font-size: 1.25rem;
+  padding: 0.625rem 0.9375rem;
+}
+.p-button.p-button-lg .p-button-icon {
+  font-size: 1.25rem;
+}
+.p-button.p-button-loading-label-only .p-button-label {
+  margin-left: 0.5rem;
+}
+.p-button.p-button-loading-label-only .p-button-loading-icon {
+  margin-right: 0;
+}
+
+.p-fluid .p-button {
+  width: 100%;
+}
+.p-fluid .p-button-icon-only {
+  width: 2.357rem;
+}
+.p-fluid .p-buttonset {
+  display: flex;
+}
+.p-fluid .p-buttonset .p-button {
+  flex: 1;
+}
+
+.p-button.p-button-secondary, .p-buttonset.p-button-secondary > .p-button, .p-splitbutton.p-button-secondary > .p-button {
+  color: #ffffff;
+  background: #6c757d;
+  border: 1px solid #6c757d;
+}
+.p-button.p-button-secondary:enabled:hover, .p-buttonset.p-button-secondary > .p-button:enabled:hover, .p-splitbutton.p-button-secondary > .p-button:enabled:hover {
+  background: #5a6268;
+  color: #ffffff;
+  border-color: #5a6268;
+}
+.p-button.p-button-secondary:enabled:focus, .p-buttonset.p-button-secondary > .p-button:enabled:focus, .p-splitbutton.p-button-secondary > .p-button:enabled:focus {
+  box-shadow: 0 0 0 0.2rem rgba(130, 138, 145, 0.5);
+}
+.p-button.p-button-secondary:enabled:active, .p-buttonset.p-button-secondary > .p-button:enabled:active, .p-splitbutton.p-button-secondary > .p-button:enabled:active {
+  background: #545b62;
+  color: #ffffff;
+  border-color: #4e555b;
+}
+.p-button.p-button-secondary.p-button-outlined, .p-buttonset.p-button-secondary > .p-button.p-button-outlined, .p-splitbutton.p-button-secondary > .p-button.p-button-outlined {
+  background-color: transparent;
+  color: #6c757d;
+  border: 1px solid;
+}
+.p-button.p-button-secondary.p-button-outlined:enabled:hover, .p-buttonset.p-button-secondary > .p-button.p-button-outlined:enabled:hover, .p-splitbutton.p-button-secondary > .p-button.p-button-outlined:enabled:hover {
+  background: rgba(108, 117, 125, 0.04);
+  color: #6c757d;
+  border: 1px solid;
+}
+.p-button.p-button-secondary.p-button-outlined:enabled:active, .p-buttonset.p-button-secondary > .p-button.p-button-outlined:enabled:active, .p-splitbutton.p-button-secondary > .p-button.p-button-outlined:enabled:active {
+  background: rgba(108, 117, 125, 0.16);
+  color: #6c757d;
+  border: 1px solid;
+}
+.p-button.p-button-secondary.p-button-text, .p-buttonset.p-button-secondary > .p-button.p-button-text, .p-splitbutton.p-button-secondary > .p-button.p-button-text {
+  background-color: transparent;
+  color: #6c757d;
+  border-color: transparent;
+}
+.p-button.p-button-secondary.p-button-text:enabled:hover, .p-buttonset.p-button-secondary > .p-button.p-button-text:enabled:hover, .p-splitbutton.p-button-secondary > .p-button.p-button-text:enabled:hover {
+  background: rgba(108, 117, 125, 0.04);
+  border-color: transparent;
+  color: #6c757d;
+}
+.p-button.p-button-secondary.p-button-text:enabled:active, .p-buttonset.p-button-secondary > .p-button.p-button-text:enabled:active, .p-splitbutton.p-button-secondary > .p-button.p-button-text:enabled:active {
+  background: rgba(108, 117, 125, 0.16);
+  border-color: transparent;
+  color: #6c757d;
+}
+
+.p-button.p-button-info, .p-buttonset.p-button-info > .p-button, .p-splitbutton.p-button-info > .p-button {
+  color: #ffffff;
+  background: #17a2b8;
+  border: 1px solid #17a2b8;
+}
+.p-button.p-button-info:enabled:hover, .p-buttonset.p-button-info > .p-button:enabled:hover, .p-splitbutton.p-button-info > .p-button:enabled:hover {
+  background: #138496;
+  color: #ffffff;
+  border-color: #117a8b;
+}
+.p-button.p-button-info:enabled:focus, .p-buttonset.p-button-info > .p-button:enabled:focus, .p-splitbutton.p-button-info > .p-button:enabled:focus {
+  box-shadow: 0 0 0 0.2rem rgba(58, 176, 195, 0.5);
+}
+.p-button.p-button-info:enabled:active, .p-buttonset.p-button-info > .p-button:enabled:active, .p-splitbutton.p-button-info > .p-button:enabled:active {
+  background: #138496;
+  color: #ffffff;
+  border-color: #117a8b;
+}
+.p-button.p-button-info.p-button-outlined, .p-buttonset.p-button-info > .p-button.p-button-outlined, .p-splitbutton.p-button-info > .p-button.p-button-outlined {
+  background-color: transparent;
+  color: #17a2b8;
+  border: 1px solid;
+}
+.p-button.p-button-info.p-button-outlined:enabled:hover, .p-buttonset.p-button-info > .p-button.p-button-outlined:enabled:hover, .p-splitbutton.p-button-info > .p-button.p-button-outlined:enabled:hover {
+  background: rgba(23, 162, 184, 0.04);
+  color: #17a2b8;
+  border: 1px solid;
+}
+.p-button.p-button-info.p-button-outlined:enabled:active, .p-buttonset.p-button-info > .p-button.p-button-outlined:enabled:active, .p-splitbutton.p-button-info > .p-button.p-button-outlined:enabled:active {
+  background: rgba(23, 162, 184, 0.16);
+  color: #17a2b8;
+  border: 1px solid;
+}
+.p-button.p-button-info.p-button-text, .p-buttonset.p-button-info > .p-button.p-button-text, .p-splitbutton.p-button-info > .p-button.p-button-text {
+  background-color: transparent;
+  color: #17a2b8;
+  border-color: transparent;
+}
+.p-button.p-button-info.p-button-text:enabled:hover, .p-buttonset.p-button-info > .p-button.p-button-text:enabled:hover, .p-splitbutton.p-button-info > .p-button.p-button-text:enabled:hover {
+  background: rgba(23, 162, 184, 0.04);
+  border-color: transparent;
+  color: #17a2b8;
+}
+.p-button.p-button-info.p-button-text:enabled:active, .p-buttonset.p-button-info > .p-button.p-button-text:enabled:active, .p-splitbutton.p-button-info > .p-button.p-button-text:enabled:active {
+  background: rgba(23, 162, 184, 0.16);
+  border-color: transparent;
+  color: #17a2b8;
+}
+
+.p-button.p-button-success, .p-buttonset.p-button-success > .p-button, .p-splitbutton.p-button-success > .p-button {
+  color: #ffffff;
+  background: #28a745;
+  border: 1px solid #28a745;
+}
+.p-button.p-button-success:enabled:hover, .p-buttonset.p-button-success > .p-button:enabled:hover, .p-splitbutton.p-button-success > .p-button:enabled:hover {
+  background: #218838;
+  color: #ffffff;
+  border-color: #1e7e34;
+}
+.p-button.p-button-success:enabled:focus, .p-buttonset.p-button-success > .p-button:enabled:focus, .p-splitbutton.p-button-success > .p-button:enabled:focus {
+  box-shadow: 0 0 0 0.2rem rgba(72, 180, 97, 0.5);
+}
+.p-button.p-button-success:enabled:active, .p-buttonset.p-button-success > .p-button:enabled:active, .p-splitbutton.p-button-success > .p-button:enabled:active {
+  background: #1e7e34;
+  color: #ffffff;
+  border-color: #1c7430;
+}
+.p-button.p-button-success.p-button-outlined, .p-buttonset.p-button-success > .p-button.p-button-outlined, .p-splitbutton.p-button-success > .p-button.p-button-outlined {
+  background-color: transparent;
+  color: #28a745;
+  border: 1px solid;
+}
+.p-button.p-button-success.p-button-outlined:enabled:hover, .p-buttonset.p-button-success > .p-button.p-button-outlined:enabled:hover, .p-splitbutton.p-button-success > .p-button.p-button-outlined:enabled:hover {
+  background: rgba(40, 167, 69, 0.04);
+  color: #28a745;
+  border: 1px solid;
+}
+.p-button.p-button-success.p-button-outlined:enabled:active, .p-buttonset.p-button-success > .p-button.p-button-outlined:enabled:active, .p-splitbutton.p-button-success > .p-button.p-button-outlined:enabled:active {
+  background: rgba(40, 167, 69, 0.16);
+  color: #28a745;
+  border: 1px solid;
+}
+.p-button.p-button-success.p-button-text, .p-buttonset.p-button-success > .p-button.p-button-text, .p-splitbutton.p-button-success > .p-button.p-button-text {
+  background-color: transparent;
+  color: #28a745;
+  border-color: transparent;
+}
+.p-button.p-button-success.p-button-text:enabled:hover, .p-buttonset.p-button-success > .p-button.p-button-text:enabled:hover, .p-splitbutton.p-button-success > .p-button.p-button-text:enabled:hover {
+  background: rgba(40, 167, 69, 0.04);
+  border-color: transparent;
+  color: #28a745;
+}
+.p-button.p-button-success.p-button-text:enabled:active, .p-buttonset.p-button-success > .p-button.p-button-text:enabled:active, .p-splitbutton.p-button-success > .p-button.p-button-text:enabled:active {
+  background: rgba(40, 167, 69, 0.16);
+  border-color: transparent;
+  color: #28a745;
+}
+
+.p-button.p-button-warning, .p-buttonset.p-button-warning > .p-button, .p-splitbutton.p-button-warning > .p-button {
+  color: #212529;
+  background: #ffc107;
+  border: 1px solid #ffc107;
+}
+.p-button.p-button-warning:enabled:hover, .p-buttonset.p-button-warning > .p-button:enabled:hover, .p-splitbutton.p-button-warning > .p-button:enabled:hover {
+  background: #e0a800;
+  color: #212529;
+  border-color: #d39e00;
+}
+.p-button.p-button-warning:enabled:focus, .p-buttonset.p-button-warning > .p-button:enabled:focus, .p-splitbutton.p-button-warning > .p-button:enabled:focus {
+  box-shadow: 0 0 0 0.2rem rgba(222, 170, 12, 0.5);
+}
+.p-button.p-button-warning:enabled:active, .p-buttonset.p-button-warning > .p-button:enabled:active, .p-splitbutton.p-button-warning > .p-button:enabled:active {
+  background: #d39e00;
+  color: #212529;
+  border-color: #c69500;
+}
+.p-button.p-button-warning.p-button-outlined, .p-buttonset.p-button-warning > .p-button.p-button-outlined, .p-splitbutton.p-button-warning > .p-button.p-button-outlined {
+  background-color: transparent;
+  color: #ffc107;
+  border: 1px solid;
+}
+.p-button.p-button-warning.p-button-outlined:enabled:hover, .p-buttonset.p-button-warning > .p-button.p-button-outlined:enabled:hover, .p-splitbutton.p-button-warning > .p-button.p-button-outlined:enabled:hover {
+  background: rgba(255, 193, 7, 0.04);
+  color: #ffc107;
+  border: 1px solid;
+}
+.p-button.p-button-warning.p-button-outlined:enabled:active, .p-buttonset.p-button-warning > .p-button.p-button-outlined:enabled:active, .p-splitbutton.p-button-warning > .p-button.p-button-outlined:enabled:active {
+  background: rgba(255, 193, 7, 0.16);
+  color: #ffc107;
+  border: 1px solid;
+}
+.p-button.p-button-warning.p-button-text, .p-buttonset.p-button-warning > .p-button.p-button-text, .p-splitbutton.p-button-warning > .p-button.p-button-text {
+  background-color: transparent;
+  color: #ffc107;
+  border-color: transparent;
+}
+.p-button.p-button-warning.p-button-text:enabled:hover, .p-buttonset.p-button-warning > .p-button.p-button-text:enabled:hover, .p-splitbutton.p-button-warning > .p-button.p-button-text:enabled:hover {
+  background: rgba(255, 193, 7, 0.04);
+  border-color: transparent;
+  color: #ffc107;
+}
+.p-button.p-button-warning.p-button-text:enabled:active, .p-buttonset.p-button-warning > .p-button.p-button-text:enabled:active, .p-splitbutton.p-button-warning > .p-button.p-button-text:enabled:active {
+  background: rgba(255, 193, 7, 0.16);
+  border-color: transparent;
+  color: #ffc107;
+}
+
+.p-button.p-button-help, .p-buttonset.p-button-help > .p-button, .p-splitbutton.p-button-help > .p-button {
+  color: #ffffff;
+  background: #6f42c1;
+  border: 1px solid #6f42c1;
+}
+.p-button.p-button-help:enabled:hover, .p-buttonset.p-button-help > .p-button:enabled:hover, .p-splitbutton.p-button-help > .p-button:enabled:hover {
+  background: #633bad;
+  color: #ffffff;
+  border-color: #58349a;
+}
+.p-button.p-button-help:enabled:focus, .p-buttonset.p-button-help > .p-button:enabled:focus, .p-splitbutton.p-button-help > .p-button:enabled:focus {
+  box-shadow: 0 0 0 0.2rem #d3c6ec;
+}
+.p-button.p-button-help:enabled:active, .p-buttonset.p-button-help > .p-button:enabled:active, .p-splitbutton.p-button-help > .p-button:enabled:active {
+  background: #58349a;
+  color: #ffffff;
+  border-color: #4d2e87;
+}
+.p-button.p-button-help.p-button-outlined, .p-buttonset.p-button-help > .p-button.p-button-outlined, .p-splitbutton.p-button-help > .p-button.p-button-outlined {
+  background-color: transparent;
+  color: #6f42c1;
+  border: 1px solid;
+}
+.p-button.p-button-help.p-button-outlined:enabled:hover, .p-buttonset.p-button-help > .p-button.p-button-outlined:enabled:hover, .p-splitbutton.p-button-help > .p-button.p-button-outlined:enabled:hover {
+  background: rgba(111, 66, 193, 0.04);
+  color: #6f42c1;
+  border: 1px solid;
+}
+.p-button.p-button-help.p-button-outlined:enabled:active, .p-buttonset.p-button-help > .p-button.p-button-outlined:enabled:active, .p-splitbutton.p-button-help > .p-button.p-button-outlined:enabled:active {
+  background: rgba(111, 66, 193, 0.16);
+  color: #6f42c1;
+  border: 1px solid;
+}
+.p-button.p-button-help.p-button-text, .p-buttonset.p-button-help > .p-button.p-button-text, .p-splitbutton.p-button-help > .p-button.p-button-text {
+  background-color: transparent;
+  color: #6f42c1;
+  border-color: transparent;
+}
+.p-button.p-button-help.p-button-text:enabled:hover, .p-buttonset.p-button-help > .p-button.p-button-text:enabled:hover, .p-splitbutton.p-button-help > .p-button.p-button-text:enabled:hover {
+  background: rgba(111, 66, 193, 0.04);
+  border-color: transparent;
+  color: #6f42c1;
+}
+.p-button.p-button-help.p-button-text:enabled:active, .p-buttonset.p-button-help > .p-button.p-button-text:enabled:active, .p-splitbutton.p-button-help > .p-button.p-button-text:enabled:active {
+  background: rgba(111, 66, 193, 0.16);
+  border-color: transparent;
+  color: #6f42c1;
+}
+
+.p-button.p-button-danger, .p-buttonset.p-button-danger > .p-button, .p-splitbutton.p-button-danger > .p-button {
+  color: #ffffff;
+  background: #dc3545;
+  border: 1px solid #dc3545;
+}
+.p-button.p-button-danger:enabled:hover, .p-buttonset.p-button-danger > .p-button:enabled:hover, .p-splitbutton.p-button-danger > .p-button:enabled:hover {
+  background: #c82333;
+  color: #ffffff;
+  border-color: #bd2130;
+}
+.p-button.p-button-danger:enabled:focus, .p-buttonset.p-button-danger > .p-button:enabled:focus, .p-splitbutton.p-button-danger > .p-button:enabled:focus {
+  box-shadow: 0 0 0 0.2rem rgba(225, 83, 97, 0.5);
+}
+.p-button.p-button-danger:enabled:active, .p-buttonset.p-button-danger > .p-button:enabled:active, .p-splitbutton.p-button-danger > .p-button:enabled:active {
+  background: #bd2130;
+  color: #ffffff;
+  border-color: #b21f2d;
+}
+.p-button.p-button-danger.p-button-outlined, .p-buttonset.p-button-danger > .p-button.p-button-outlined, .p-splitbutton.p-button-danger > .p-button.p-button-outlined {
+  background-color: transparent;
+  color: #dc3545;
+  border: 1px solid;
+}
+.p-button.p-button-danger.p-button-outlined:enabled:hover, .p-buttonset.p-button-danger > .p-button.p-button-outlined:enabled:hover, .p-splitbutton.p-button-danger > .p-button.p-button-outlined:enabled:hover {
+  background: rgba(220, 53, 69, 0.04);
+  color: #dc3545;
+  border: 1px solid;
+}
+.p-button.p-button-danger.p-button-outlined:enabled:active, .p-buttonset.p-button-danger > .p-button.p-button-outlined:enabled:active, .p-splitbutton.p-button-danger > .p-button.p-button-outlined:enabled:active {
+  background: rgba(220, 53, 69, 0.16);
+  color: #dc3545;
+  border: 1px solid;
+}
+.p-button.p-button-danger.p-button-text, .p-buttonset.p-button-danger > .p-button.p-button-text, .p-splitbutton.p-button-danger > .p-button.p-button-text {
+  background-color: transparent;
+  color: #dc3545;
+  border-color: transparent;
+}
+.p-button.p-button-danger.p-button-text:enabled:hover, .p-buttonset.p-button-danger > .p-button.p-button-text:enabled:hover, .p-splitbutton.p-button-danger > .p-button.p-button-text:enabled:hover {
+  background: rgba(220, 53, 69, 0.04);
+  border-color: transparent;
+  color: #dc3545;
+}
+.p-button.p-button-danger.p-button-text:enabled:active, .p-buttonset.p-button-danger > .p-button.p-button-text:enabled:active, .p-splitbutton.p-button-danger > .p-button.p-button-text:enabled:active {
+  background: rgba(220, 53, 69, 0.16);
+  border-color: transparent;
+  color: #dc3545;
+}
+
+.p-button.p-button-link {
+  color: #007bff;
+  background: transparent;
+  border: transparent;
+}
+.p-button.p-button-link:enabled:hover {
+  background: transparent;
+  color: #0069d9;
+  border-color: transparent;
+}
+.p-button.p-button-link:enabled:hover .p-button-label {
+  text-decoration: underline;
+}
+.p-button.p-button-link:enabled:focus {
+  background: transparent;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+  border-color: transparent;
+}
+.p-button.p-button-link:enabled:active {
+  background: transparent;
+  color: #007bff;
+  border-color: transparent;
+}
+
+.p-speeddial-button.p-button.p-button-icon-only {
+  width: 4rem;
+  height: 4rem;
+}
+.p-speeddial-button.p-button.p-button-icon-only .p-button-icon {
+  font-size: 1.3rem;
+}
+
+.p-speeddial-action {
+  width: 3rem;
+  height: 3rem;
+  background: #495057;
+  color: #fff;
+}
+.p-speeddial-action:hover {
+  background: #343a40;
+  color: #fff;
+}
+
+.p-speeddial-direction-up .p-speeddial-item {
+  margin: 0.25rem 0;
+}
+.p-speeddial-direction-up .p-speeddial-item:first-child {
+  margin-bottom: 0.5rem;
+}
+
+.p-speeddial-direction-down .p-speeddial-item {
+  margin: 0.25rem 0;
+}
+.p-speeddial-direction-down .p-speeddial-item:first-child {
+  margin-top: 0.5rem;
+}
+
+.p-speeddial-direction-left .p-speeddial-item {
+  margin: 0 0.25rem;
+}
+.p-speeddial-direction-left .p-speeddial-item:first-child {
+  margin-right: 0.5rem;
+}
+
+.p-speeddial-direction-right .p-speeddial-item {
+  margin: 0 0.25rem;
+}
+.p-speeddial-direction-right .p-speeddial-item:first-child {
+  margin-left: 0.5rem;
+}
+
+.p-speeddial-circle .p-speeddial-item,
+.p-speeddial-semi-circle .p-speeddial-item,
+.p-speeddial-quarter-circle .p-speeddial-item {
+  margin: 0;
+}
+.p-speeddial-circle .p-speeddial-item:first-child, .p-speeddial-circle .p-speeddial-item:last-child,
+.p-speeddial-semi-circle .p-speeddial-item:first-child,
+.p-speeddial-semi-circle .p-speeddial-item:last-child,
+.p-speeddial-quarter-circle .p-speeddial-item:first-child,
+.p-speeddial-quarter-circle .p-speeddial-item:last-child {
+  margin: 0;
+}
+
+.p-speeddial-mask {
+  background-color: rgba(0, 0, 0, 0.4);
+}
+
+.p-splitbutton {
+  border-radius: 4px;
+}
+.p-splitbutton.p-button-outlined > .p-button {
+  background-color: transparent;
+  color: #007bff;
+  border: 1px solid;
+}
+.p-splitbutton.p-button-outlined > .p-button:enabled:hover, .p-splitbutton.p-button-outlined > .p-button:not(button):not(a):not(.p-disabled):hover {
+  background: rgba(0, 123, 255, 0.04);
+  color: #007bff;
+}
+.p-splitbutton.p-button-outlined > .p-button:enabled:active, .p-splitbutton.p-button-outlined > .p-button:not(button):not(a):not(.p-disabled):active {
+  background: rgba(0, 123, 255, 0.16);
+  color: #007bff;
+}
+.p-splitbutton.p-button-outlined.p-button-plain > .p-button {
+  color: #6c757d;
+  border-color: #6c757d;
+}
+.p-splitbutton.p-button-outlined.p-button-plain > .p-button:enabled:hover, .p-splitbutton.p-button-outlined.p-button-plain > .p-button:not(button):not(a):not(.p-disabled):hover {
+  background: #e9ecef;
+  color: #6c757d;
+}
+.p-splitbutton.p-button-outlined.p-button-plain > .p-button:enabled:active, .p-splitbutton.p-button-outlined.p-button-plain > .p-button:not(button):not(a):not(.p-disabled):active {
+  background: #dee2e6;
+  color: #6c757d;
+}
+.p-splitbutton.p-button-text > .p-button {
+  background-color: transparent;
+  color: #007bff;
+  border-color: transparent;
+}
+.p-splitbutton.p-button-text > .p-button:enabled:hover, .p-splitbutton.p-button-text > .p-button:not(button):not(a):not(.p-disabled):hover {
+  background: rgba(0, 123, 255, 0.04);
+  color: #007bff;
+  border-color: transparent;
+}
+.p-splitbutton.p-button-text > .p-button:enabled:active, .p-splitbutton.p-button-text > .p-button:not(button):not(a):not(.p-disabled):active {
+  background: rgba(0, 123, 255, 0.16);
+  color: #007bff;
+  border-color: transparent;
+}
+.p-splitbutton.p-button-text.p-button-plain > .p-button {
+  color: #6c757d;
+}
+.p-splitbutton.p-button-text.p-button-plain > .p-button:enabled:hover, .p-splitbutton.p-button-text.p-button-plain > .p-button:not(button):not(a):not(.p-disabled):hover {
+  background: #e9ecef;
+  color: #6c757d;
+}
+.p-splitbutton.p-button-text.p-button-plain > .p-button:enabled:active, .p-splitbutton.p-button-text.p-button-plain > .p-button:not(button):not(a):not(.p-disabled):active {
+  background: #dee2e6;
+  color: #6c757d;
+}
+.p-splitbutton.p-button-raised {
+  box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12);
+}
+.p-splitbutton.p-button-rounded {
+  border-radius: 2rem;
+}
+.p-splitbutton.p-button-rounded > .p-button {
+  border-radius: 2rem;
+}
+.p-splitbutton.p-button-sm > .p-button {
+  font-size: 0.875rem;
+  padding: 0.4375rem 0.65625rem;
+}
+.p-splitbutton.p-button-sm > .p-button .p-button-icon {
+  font-size: 0.875rem;
+}
+.p-splitbutton.p-button-lg > .p-button {
+  font-size: 1.25rem;
+  padding: 0.625rem 0.9375rem;
+}
+.p-splitbutton.p-button-lg > .p-button .p-button-icon {
+  font-size: 1.25rem;
+}
+
+.p-splitbutton.p-button-secondary.p-button-outlined > .p-button {
+  background-color: transparent;
+  color: #6c757d;
+  border: 1px solid;
+}
+.p-splitbutton.p-button-secondary.p-button-outlined > .p-button:enabled:hover, .p-splitbutton.p-button-secondary.p-button-outlined > .p-button:not(button):not(a):not(.p-disabled):hover {
+  background: rgba(108, 117, 125, 0.04);
+  color: #6c757d;
+}
+.p-splitbutton.p-button-secondary.p-button-outlined > .p-button:enabled:active, .p-splitbutton.p-button-secondary.p-button-outlined > .p-button:not(button):not(a):not(.p-disabled):active {
+  background: rgba(108, 117, 125, 0.16);
+  color: #6c757d;
+}
+.p-splitbutton.p-button-secondary.p-button-text > .p-button {
+  background-color: transparent;
+  color: #6c757d;
+  border-color: transparent;
+}
+.p-splitbutton.p-button-secondary.p-button-text > .p-button:enabled:hover, .p-splitbutton.p-button-secondary.p-button-text > .p-button:not(button):not(a):not(.p-disabled):hover {
+  background: rgba(108, 117, 125, 0.04);
+  border-color: transparent;
+  color: #6c757d;
+}
+.p-splitbutton.p-button-secondary.p-button-text > .p-button:enabled:active, .p-splitbutton.p-button-secondary.p-button-text > .p-button:not(button):not(a):not(.p-disabled):active {
+  background: rgba(108, 117, 125, 0.16);
+  border-color: transparent;
+  color: #6c757d;
+}
+
+.p-splitbutton.p-button-info.p-button-outlined > .p-button {
+  background-color: transparent;
+  color: #17a2b8;
+  border: 1px solid;
+}
+.p-splitbutton.p-button-info.p-button-outlined > .p-button:enabled:hover, .p-splitbutton.p-button-info.p-button-outlined > .p-button:not(button):not(a):not(.p-disabled):hover {
+  background: rgba(23, 162, 184, 0.04);
+  color: #17a2b8;
+}
+.p-splitbutton.p-button-info.p-button-outlined > .p-button:enabled:active, .p-splitbutton.p-button-info.p-button-outlined > .p-button:not(button):not(a):not(.p-disabled):active {
+  background: rgba(23, 162, 184, 0.16);
+  color: #17a2b8;
+}
+.p-splitbutton.p-button-info.p-button-text > .p-button {
+  background-color: transparent;
+  color: #17a2b8;
+  border-color: transparent;
+}
+.p-splitbutton.p-button-info.p-button-text > .p-button:enabled:hover, .p-splitbutton.p-button-info.p-button-text > .p-button:not(button):not(a):not(.p-disabled):hover {
+  background: rgba(23, 162, 184, 0.04);
+  border-color: transparent;
+  color: #17a2b8;
+}
+.p-splitbutton.p-button-info.p-button-text > .p-button:enabled:active, .p-splitbutton.p-button-info.p-button-text > .p-button:not(button):not(a):not(.p-disabled):active {
+  background: rgba(23, 162, 184, 0.16);
+  border-color: transparent;
+  color: #17a2b8;
+}
+
+.p-splitbutton.p-button-success.p-button-outlined > .p-button {
+  background-color: transparent;
+  color: #28a745;
+  border: 1px solid;
+}
+.p-splitbutton.p-button-success.p-button-outlined > .p-button:enabled:hover, .p-splitbutton.p-button-success.p-button-outlined > .p-button:not(button):not(a):not(.p-disabled):hover {
+  background: rgba(40, 167, 69, 0.04);
+  color: #28a745;
+}
+.p-splitbutton.p-button-success.p-button-outlined > .p-button:enabled:active, .p-splitbutton.p-button-success.p-button-outlined > .p-button:not(button):not(a):not(.p-disabled):active {
+  background: rgba(40, 167, 69, 0.16);
+  color: #28a745;
+}
+.p-splitbutton.p-button-success.p-button-text > .p-button {
+  background-color: transparent;
+  color: #28a745;
+  border-color: transparent;
+}
+.p-splitbutton.p-button-success.p-button-text > .p-button:enabled:hover, .p-splitbutton.p-button-success.p-button-text > .p-button:not(button):not(a):not(.p-disabled):hover {
+  background: rgba(40, 167, 69, 0.04);
+  border-color: transparent;
+  color: #28a745;
+}
+.p-splitbutton.p-button-success.p-button-text > .p-button:enabled:active, .p-splitbutton.p-button-success.p-button-text > .p-button:not(button):not(a):not(.p-disabled):active {
+  background: rgba(40, 167, 69, 0.16);
+  border-color: transparent;
+  color: #28a745;
+}
+
+.p-splitbutton.p-button-warning.p-button-outlined > .p-button {
+  background-color: transparent;
+  color: #ffc107;
+  border: 1px solid;
+}
+.p-splitbutton.p-button-warning.p-button-outlined > .p-button:enabled:hover, .p-splitbutton.p-button-warning.p-button-outlined > .p-button:not(button):not(a):not(.p-disabled):hover {
+  background: rgba(255, 193, 7, 0.04);
+  color: #ffc107;
+}
+.p-splitbutton.p-button-warning.p-button-outlined > .p-button:enabled:active, .p-splitbutton.p-button-warning.p-button-outlined > .p-button:not(button):not(a):not(.p-disabled):active {
+  background: rgba(255, 193, 7, 0.16);
+  color: #ffc107;
+}
+.p-splitbutton.p-button-warning.p-button-text > .p-button {
+  background-color: transparent;
+  color: #ffc107;
+  border-color: transparent;
+}
+.p-splitbutton.p-button-warning.p-button-text > .p-button:enabled:hover, .p-splitbutton.p-button-warning.p-button-text > .p-button:not(button):not(a):not(.p-disabled):hover {
+  background: rgba(255, 193, 7, 0.04);
+  border-color: transparent;
+  color: #ffc107;
+}
+.p-splitbutton.p-button-warning.p-button-text > .p-button:enabled:active, .p-splitbutton.p-button-warning.p-button-text > .p-button:not(button):not(a):not(.p-disabled):active {
+  background: rgba(255, 193, 7, 0.16);
+  border-color: transparent;
+  color: #ffc107;
+}
+
+.p-splitbutton.p-button-help.p-button-outlined > .p-button {
+  background-color: transparent;
+  color: #6f42c1;
+  border: 1px solid;
+}
+.p-splitbutton.p-button-help.p-button-outlined > .p-button:enabled:hover, .p-splitbutton.p-button-help.p-button-outlined > .p-button:not(button):not(a):not(.p-disabled):hover {
+  background: rgba(111, 66, 193, 0.04);
+  color: #6f42c1;
+}
+.p-splitbutton.p-button-help.p-button-outlined > .p-button:enabled:active, .p-splitbutton.p-button-help.p-button-outlined > .p-button:not(button):not(a):not(.p-disabled):active {
+  background: rgba(111, 66, 193, 0.16);
+  color: #6f42c1;
+}
+.p-splitbutton.p-button-help.p-button-text > .p-button {
+  background-color: transparent;
+  color: #6f42c1;
+  border-color: transparent;
+}
+.p-splitbutton.p-button-help.p-button-text > .p-button:enabled:hover, .p-splitbutton.p-button-help.p-button-text > .p-button:not(button):not(a):not(.p-disabled):hover {
+  background: rgba(111, 66, 193, 0.04);
+  border-color: transparent;
+  color: #6f42c1;
+}
+.p-splitbutton.p-button-help.p-button-text > .p-button:enabled:active, .p-splitbutton.p-button-help.p-button-text > .p-button:not(button):not(a):not(.p-disabled):active {
+  background: rgba(111, 66, 193, 0.16);
+  border-color: transparent;
+  color: #6f42c1;
+}
+
+.p-splitbutton.p-button-danger.p-button-outlined > .p-button {
+  background-color: transparent;
+  color: #dc3545;
+  border: 1px solid;
+}
+.p-splitbutton.p-button-danger.p-button-outlined > .p-button:enabled:hover, .p-splitbutton.p-button-danger.p-button-outlined > .p-button:not(button):not(a):not(.p-disabled):hover {
+  background: rgba(220, 53, 69, 0.04);
+  color: #dc3545;
+}
+.p-splitbutton.p-button-danger.p-button-outlined > .p-button:enabled:active, .p-splitbutton.p-button-danger.p-button-outlined > .p-button:not(button):not(a):not(.p-disabled):active {
+  background: rgba(220, 53, 69, 0.16);
+  color: #dc3545;
+}
+.p-splitbutton.p-button-danger.p-button-text > .p-button {
+  background-color: transparent;
+  color: #dc3545;
+  border-color: transparent;
+}
+.p-splitbutton.p-button-danger.p-button-text > .p-button:enabled:hover, .p-splitbutton.p-button-danger.p-button-text > .p-button:not(button):not(a):not(.p-disabled):hover {
+  background: rgba(220, 53, 69, 0.04);
+  border-color: transparent;
+  color: #dc3545;
+}
+.p-splitbutton.p-button-danger.p-button-text > .p-button:enabled:active, .p-splitbutton.p-button-danger.p-button-text > .p-button:not(button):not(a):not(.p-disabled):active {
+  background: rgba(220, 53, 69, 0.16);
+  border-color: transparent;
+  color: #dc3545;
+}
+
+.p-carousel .p-carousel-content .p-carousel-prev,
+.p-carousel .p-carousel-content .p-carousel-next {
+  width: 2rem;
+  height: 2rem;
+  color: #6c757d;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
+  transition: box-shadow 0.15s;
+  margin: 0.5rem;
+}
+.p-carousel .p-carousel-content .p-carousel-prev:enabled:hover,
+.p-carousel .p-carousel-content .p-carousel-next:enabled:hover {
+  color: #495057;
+  border-color: transparent;
+  background: transparent;
+}
+.p-carousel .p-carousel-content .p-carousel-prev:focus,
+.p-carousel .p-carousel-content .p-carousel-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+}
+.p-carousel .p-carousel-indicators {
+  padding: 1rem;
+}
+.p-carousel .p-carousel-indicators .p-carousel-indicator {
+  margin-right: 0.5rem;
+  margin-bottom: 0.5rem;
+}
+.p-carousel .p-carousel-indicators .p-carousel-indicator button {
+  background-color: #e9ecef;
+  width: 2rem;
+  height: 0.5rem;
+  transition: box-shadow 0.15s;
+  border-radius: 0;
+}
+.p-carousel .p-carousel-indicators .p-carousel-indicator button:hover {
+  background: #dee2e6;
+}
+.p-carousel .p-carousel-indicators .p-carousel-indicator.p-highlight button {
+  background: #007bff;
+  color: #ffffff;
+}
+
+.p-datatable .p-paginator-top {
+  border-width: 1px 0 0 0;
+  border-radius: 0;
+}
+.p-datatable .p-paginator-bottom {
+  border-width: 1px 0 0 0;
+  border-radius: 0;
+}
+.p-datatable .p-datatable-header {
+  background: #efefef;
+  color: #212529;
+  border: solid #dee2e6;
+  border-width: 1px 0 0 0;
+  padding: 1rem 1rem;
+  font-weight: 600;
+}
+.p-datatable .p-datatable-footer {
+  background: #efefef;
+  color: #212529;
+  border: 1px solid #dee2e6;
+  border-width: 1px 0 1px 0;
+  padding: 1rem 1rem;
+  font-weight: 600;
+}
+.p-datatable .p-datatable-thead > tr > th {
+  text-align: left;
+  padding: 1rem 1rem;
+  border: 1px solid #dee2e6;
+  border-width: 1px 0 2px 0;
+  font-weight: 600;
+  color: #212529;
+  background: #ffffff;
+  transition: box-shadow 0.15s;
+}
+.p-datatable .p-datatable-tfoot > tr > td {
+  text-align: left;
+  padding: 1rem 1rem;
+  border: 1px solid #dee2e6;
+  border-width: 1px 0 1px 0;
+  font-weight: 600;
+  color: #212529;
+  background: #ffffff;
+}
+.p-datatable .p-sortable-column .p-sortable-column-icon {
+  color: #6c757d;
+  margin-left: 0.5rem;
+}
+.p-datatable .p-sortable-column .p-sortable-column-badge {
+  border-radius: 50%;
+  height: 1.143rem;
+  min-width: 1.143rem;
+  line-height: 1.143rem;
+  color: #ffffff;
+  background: #007bff;
+  margin-left: 0.5rem;
+}
+.p-datatable .p-sortable-column:not(.p-highlight):hover {
+  background: #e9ecef;
+  color: #212529;
+}
+.p-datatable .p-sortable-column:not(.p-highlight):hover .p-sortable-column-icon {
+  color: #6c757d;
+}
+.p-datatable .p-sortable-column.p-highlight {
+  background: #ffffff;
+  color: #007bff;
+}
+.p-datatable .p-sortable-column.p-highlight .p-sortable-column-icon {
+  color: #007bff;
+}
+.p-datatable .p-sortable-column.p-highlight:hover {
+  background: #e9ecef;
+  color: #007bff;
+}
+.p-datatable .p-sortable-column.p-highlight:hover .p-sortable-column-icon {
+  color: #007bff;
+}
+.p-datatable .p-sortable-column:focus {
+  box-shadow: inset 0 0 0 0.15rem rgba(38, 143, 255, 0.5);
+  outline: 0 none;
+}
+.p-datatable .p-datatable-tbody > tr {
+  background: #ffffff;
+  color: #212529;
+  transition: box-shadow 0.15s;
+}
+.p-datatable .p-datatable-tbody > tr > td {
+  text-align: left;
+  border: 1px solid #dee2e6;
+  border-width: 1px 0 0 0;
+  padding: 1rem 1rem;
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel {
+  width: 2rem;
+  height: 2rem;
+  color: #6c757d;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
+  transition: box-shadow 0.15s;
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:enabled:hover {
+  color: #495057;
+  border-color: transparent;
+  background: transparent;
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save {
+  margin-right: 0.5rem;
+}
+.p-datatable .p-datatable-tbody > tr > td > .p-column-title {
+  font-weight: 600;
+}
+.p-datatable .p-datatable-tbody > tr:focus {
+  outline: 0.15rem solid rgba(38, 143, 255, 0.5);
+  outline-offset: -0.15rem;
+}
+.p-datatable .p-datatable-tbody > tr.p-highlight {
+  background: #007bff;
+  color: #ffffff;
+}
+.p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-top > td {
+  box-shadow: inset 0 2px 0 0 #007bff;
+}
+.p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-bottom > td {
+  box-shadow: inset 0 -2px 0 0 #007bff;
+}
+.p-datatable.p-datatable-hoverable-rows .p-datatable-tbody > tr:not(.p-highlight):hover {
+  background: #e9ecef;
+  color: #212529;
+}
+.p-datatable .p-column-resizer-helper {
+  background: #007bff;
+}
+.p-datatable .p-datatable-scrollable-header,
+.p-datatable .p-datatable-scrollable-footer {
+  background: #efefef;
+}
+.p-datatable.p-datatable-scrollable > .p-datatable-wrapper > .p-datatable-table > .p-datatable-thead,
+.p-datatable.p-datatable-scrollable > .p-datatable-wrapper > .p-datatable-table > .p-datatable-tfoot {
+  background-color: #ffffff;
+}
+.p-datatable .p-datatable-loading-icon {
+  font-size: 2rem;
+}
+.p-datatable.p-datatable-gridlines .p-datatable-header {
+  border-width: 1px 1px 0 1px;
+}
+.p-datatable.p-datatable-gridlines .p-datatable-footer {
+  border-width: 0 1px 1px 1px;
+}
+.p-datatable.p-datatable-gridlines .p-paginator-top {
+  border-width: 0 1px 0 1px;
+}
+.p-datatable.p-datatable-gridlines .p-paginator-bottom {
+  border-width: 0 1px 1px 1px;
+}
+.p-datatable.p-datatable-gridlines .p-datatable-thead > tr > th {
+  border-width: 1px 1px 2px 1px;
+}
+.p-datatable.p-datatable-gridlines .p-datatable-tbody > tr > td {
+  border-width: 1px;
+}
+.p-datatable.p-datatable-gridlines .p-datatable-tfoot > tr > td {
+  border-width: 1px;
+}
+.p-datatable.p-datatable-gridlines.p-datatable-scrollable .p-datatable-thead > tr > th + th {
+  border-left-width: 0;
+}
+.p-datatable.p-datatable-gridlines.p-datatable-scrollable .p-datatable-tbody > tr > td + td {
+  border-left-width: 0;
+}
+.p-datatable.p-datatable-gridlines.p-datatable-scrollable .p-datatable-tbody > tr + tr > td, .p-datatable.p-datatable-gridlines.p-datatable-scrollable .p-datatable-tbody > tr:first-child > td {
+  border-top-width: 0;
+}
+.p-datatable.p-datatable-gridlines.p-datatable-scrollable .p-datatable-tfoot > tr > td + td {
+  border-left-width: 0;
+}
+.p-datatable.p-datatable-striped .p-datatable-tbody > tr:nth-child(even) {
+  background: rgba(0, 0, 0, 0.05);
+}
+.p-datatable.p-datatable-striped .p-datatable-tbody > tr:nth-child(even).p-highlight {
+  background: #007bff;
+  color: #ffffff;
+}
+.p-datatable.p-datatable-striped .p-datatable-tbody > tr:nth-child(even).p-highlight .p-row-toggler {
+  color: #ffffff;
+}
+.p-datatable.p-datatable-striped .p-datatable-tbody > tr:nth-child(even).p-highlight .p-row-toggler:hover {
+  color: #ffffff;
+}
+.p-datatable.p-datatable-sm .p-datatable-header {
+  padding: 0.5rem 0.5rem;
+}
+.p-datatable.p-datatable-sm .p-datatable-thead > tr > th {
+  padding: 0.5rem 0.5rem;
+}
+.p-datatable.p-datatable-sm .p-datatable-tbody > tr > td {
+  padding: 0.5rem 0.5rem;
+}
+.p-datatable.p-datatable-sm .p-datatable-tfoot > tr > td {
+  padding: 0.5rem 0.5rem;
+}
+.p-datatable.p-datatable-sm .p-datatable-footer {
+  padding: 0.5rem 0.5rem;
+}
+.p-datatable.p-datatable-lg .p-datatable-header {
+  padding: 1.25rem 1.25rem;
+}
+.p-datatable.p-datatable-lg .p-datatable-thead > tr > th {
+  padding: 1.25rem 1.25rem;
+}
+.p-datatable.p-datatable-lg .p-datatable-tbody > tr > td {
+  padding: 1.25rem 1.25rem;
+}
+.p-datatable.p-datatable-lg .p-datatable-tfoot > tr > td {
+  padding: 1.25rem 1.25rem;
+}
+.p-datatable.p-datatable-lg .p-datatable-footer {
+  padding: 1.25rem 1.25rem;
+}
+
+.p-dataview .p-paginator-top {
+  border-width: 1px 0 0 0;
+  border-radius: 0;
+}
+.p-dataview .p-paginator-bottom {
+  border-width: 1px 0 0 0;
+  border-radius: 0;
+}
+.p-dataview .p-dataview-header {
+  background: #efefef;
+  color: #212529;
+  border: solid #dee2e6;
+  border-width: 1px 0 0 0;
+  padding: 1rem 1rem;
+  font-weight: 600;
+}
+.p-dataview .p-dataview-content {
+  background: #ffffff;
+  color: #212529;
+  border: 0 none;
+  padding: 0;
+}
+.p-dataview.p-dataview-list .p-dataview-content > .p-grid > div {
+  border: 1px solid #dee2e6;
+  border-width: 1px 0 0 0;
+}
+.p-dataview .p-dataview-footer {
+  background: #efefef;
+  color: #212529;
+  border: 1px solid #dee2e6;
+  border-width: 1px 0 1px 0;
+  padding: 1rem 1rem;
+  font-weight: 600;
+  border-bottom-left-radius: 4px;
+  border-bottom-right-radius: 4px;
+}
+
+.p-column-filter-row .p-column-filter-menu-button,
+.p-column-filter-row .p-column-filter-clear-button {
+  margin-left: 0.5rem;
+}
+
+.p-column-filter-menu-button {
+  width: 2rem;
+  height: 2rem;
+  color: #6c757d;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
+  transition: box-shadow 0.15s;
+}
+.p-column-filter-menu-button:hover {
+  color: #495057;
+  border-color: transparent;
+  background: transparent;
+}
+.p-column-filter-menu-button.p-column-filter-menu-button-open, .p-column-filter-menu-button.p-column-filter-menu-button-open:hover {
+  background: transparent;
+  color: #495057;
+}
+.p-column-filter-menu-button.p-column-filter-menu-button-active, .p-column-filter-menu-button.p-column-filter-menu-button-active:hover {
+  background: #007bff;
+  color: #ffffff;
+}
+.p-column-filter-menu-button:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+}
+
+.p-column-filter-clear-button {
+  width: 2rem;
+  height: 2rem;
+  color: #6c757d;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
+  transition: box-shadow 0.15s;
+}
+.p-column-filter-clear-button:hover {
+  color: #495057;
+  border-color: transparent;
+  background: transparent;
+}
+.p-column-filter-clear-button:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+}
+
+.p-column-filter-overlay {
+  background: #ffffff;
+  color: #212529;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  border-radius: 4px;
+  box-shadow: none;
+  min-width: 12.5rem;
+}
+.p-column-filter-overlay .p-column-filter-row-items {
+  padding: 0.5rem 0;
+}
+.p-column-filter-overlay .p-column-filter-row-items .p-column-filter-row-item {
+  margin: 0;
+  padding: 0.5rem 1.5rem;
+  border: 0 none;
+  color: #212529;
+  background: transparent;
+  transition: box-shadow 0.15s;
+  border-radius: 0;
+}
+.p-column-filter-overlay .p-column-filter-row-items .p-column-filter-row-item.p-highlight {
+  color: #ffffff;
+  background: #007bff;
+}
+.p-column-filter-overlay .p-column-filter-row-items .p-column-filter-row-item:not(.p-highlight):not(.p-disabled):hover {
+  color: #212529;
+  background: #e9ecef;
+}
+.p-column-filter-overlay .p-column-filter-row-items .p-column-filter-row-item:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: inset 0 0 0 0.15rem rgba(38, 143, 255, 0.5);
+}
+.p-column-filter-overlay .p-column-filter-row-items .p-column-filter-separator {
+  border-top: 1px solid #dee2e6;
+  margin: 0.5rem 0;
+}
+
+.p-column-filter-overlay-menu .p-column-filter-operator {
+  padding: 0.75rem 1.5rem;
+  border-bottom: 1px solid #dee2e6;
+  color: #212529;
+  background: #efefef;
+  margin: 0;
+  border-top-right-radius: 4px;
+  border-top-left-radius: 4px;
+}
+.p-column-filter-overlay-menu .p-column-filter-constraint {
+  padding: 1.25rem;
+  border-bottom: 1px solid #dee2e6;
+}
+.p-column-filter-overlay-menu .p-column-filter-constraint .p-column-filter-matchmode-dropdown {
+  margin-bottom: 0.5rem;
+}
+.p-column-filter-overlay-menu .p-column-filter-constraint .p-column-filter-remove-button {
+  margin-top: 0.5rem;
+}
+.p-column-filter-overlay-menu .p-column-filter-constraint:last-child {
+  border-bottom: 0 none;
+}
+.p-column-filter-overlay-menu .p-column-filter-add-rule {
+  padding: 0.5rem 1.25rem;
+}
+.p-column-filter-overlay-menu .p-column-filter-buttonbar {
+  padding: 1.25rem;
+}
+
+.fc {
+  /* FullCalendar 4 */
+  /* FullCalendar 5 */
+}
+.fc.fc-unthemed .fc-view-container th {
+  background: #efefef;
+  border: 1px solid #dee2e6;
+  color: #212529;
+}
+.fc.fc-unthemed .fc-view-container td.fc-widget-content {
+  border: 1px solid #dee2e6;
+  color: #212529;
+}
+.fc.fc-unthemed .fc-view-container td.fc-head-container {
+  border: 1px solid #dee2e6;
+}
+.fc.fc-unthemed .fc-view-container .fc-view {
+  background: #ffffff;
+}
+.fc.fc-unthemed .fc-view-container .fc-row {
+  border-right: 1px solid #dee2e6;
+}
+.fc.fc-unthemed .fc-view-container .fc-event {
+  background: #0069d9;
+  border: 1px solid #0069d9;
+  color: #ffffff;
+}
+.fc.fc-unthemed .fc-view-container .fc-divider {
+  background: #efefef;
+  border: 1px solid #dee2e6;
+}
+.fc.fc-unthemed .fc-toolbar .fc-button {
+  color: #ffffff;
+  background: #007bff;
+  border: 1px solid #007bff;
+  font-size: 1rem;
+  transition: background-color 0.15s, border-color 0.15s, box-shadow 0.15s;
+  border-radius: 4px;
+  display: flex;
+  align-items: center;
+}
+.fc.fc-unthemed .fc-toolbar .fc-button:enabled:hover {
+  background: #0069d9;
+  color: #ffffff;
+  border-color: #0069d9;
+}
+.fc.fc-unthemed .fc-toolbar .fc-button:enabled:active {
+  background: #0062cc;
+  color: #ffffff;
+  border-color: #0062cc;
+}
+.fc.fc-unthemed .fc-toolbar .fc-button:enabled:active:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+}
+.fc.fc-unthemed .fc-toolbar .fc-button .fc-icon-chevron-left {
+  font-family: "PrimeIcons" !important;
+  text-indent: 0;
+  font-size: 1rem;
+}
+.fc.fc-unthemed .fc-toolbar .fc-button .fc-icon-chevron-left:before {
+  content: "\e900";
+}
+.fc.fc-unthemed .fc-toolbar .fc-button .fc-icon-chevron-right {
+  font-family: "PrimeIcons" !important;
+  text-indent: 0;
+  font-size: 1rem;
+}
+.fc.fc-unthemed .fc-toolbar .fc-button .fc-icon-chevron-right:before {
+  content: "\e901";
+}
+.fc.fc-unthemed .fc-toolbar .fc-button:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+}
+.fc.fc-unthemed .fc-toolbar .fc-button.fc-dayGridMonth-button, .fc.fc-unthemed .fc-toolbar .fc-button.fc-timeGridWeek-button, .fc.fc-unthemed .fc-toolbar .fc-button.fc-timeGridDay-button {
+  background: #6c757d;
+  border: 1px solid #6c757d;
+  color: #ffffff;
+  transition: background-color 0.15s, border-color 0.15s, box-shadow 0.15s;
+}
+.fc.fc-unthemed .fc-toolbar .fc-button.fc-dayGridMonth-button:hover, .fc.fc-unthemed .fc-toolbar .fc-button.fc-timeGridWeek-button:hover, .fc.fc-unthemed .fc-toolbar .fc-button.fc-timeGridDay-button:hover {
+  background: #5a6268;
+  border-color: #545b62;
+  color: #ffffff;
+}
+.fc.fc-unthemed .fc-toolbar .fc-button.fc-dayGridMonth-button.fc-button-active, .fc.fc-unthemed .fc-toolbar .fc-button.fc-timeGridWeek-button.fc-button-active, .fc.fc-unthemed .fc-toolbar .fc-button.fc-timeGridDay-button.fc-button-active {
+  background: #545b62;
+  border-color: #4e555b;
+  color: #ffffff;
+}
+.fc.fc-unthemed .fc-toolbar .fc-button.fc-dayGridMonth-button.fc-button-active:hover, .fc.fc-unthemed .fc-toolbar .fc-button.fc-timeGridWeek-button.fc-button-active:hover, .fc.fc-unthemed .fc-toolbar .fc-button.fc-timeGridDay-button.fc-button-active:hover {
+  background: #545b62;
+  border-color: #4e555b;
+  color: #ffffff;
+}
+.fc.fc-unthemed .fc-toolbar .fc-button.fc-dayGridMonth-button:focus, .fc.fc-unthemed .fc-toolbar .fc-button.fc-timeGridWeek-button:focus, .fc.fc-unthemed .fc-toolbar .fc-button.fc-timeGridDay-button:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+  z-index: 1;
+}
+.fc.fc-unthemed .fc-toolbar .fc-button-group .fc-button {
+  border-radius: 0;
+}
+.fc.fc-unthemed .fc-toolbar .fc-button-group .fc-button:first-child {
+  border-top-left-radius: 4px;
+  border-bottom-left-radius: 4px;
+}
+.fc.fc-unthemed .fc-toolbar .fc-button-group .fc-button:last-child {
+  border-top-right-radius: 4px;
+  border-bottom-right-radius: 4px;
+}
+.fc.fc-theme-standard .fc-view-harness .fc-scrollgrid {
+  border-color: #dee2e6;
+}
+.fc.fc-theme-standard .fc-view-harness th {
+  background: #efefef;
+  border-color: #dee2e6;
+  color: #212529;
+}
+.fc.fc-theme-standard .fc-view-harness td {
+  color: #212529;
+  border-color: #dee2e6;
+}
+.fc.fc-theme-standard .fc-view-harness .fc-view {
+  background: #ffffff;
+}
+.fc.fc-theme-standard .fc-view-harness .fc-popover {
+  background: none;
+  border: 0 none;
+}
+.fc.fc-theme-standard .fc-view-harness .fc-popover .fc-popover-header {
+  border: 1px solid #dee2e6;
+  padding: 1rem 1.25rem;
+  background: #efefef;
+  color: #212529;
+}
+.fc.fc-theme-standard .fc-view-harness .fc-popover .fc-popover-header .fc-popover-close {
+  opacity: 1;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  overflow: hidden;
+  font-family: "PrimeIcons" !important;
+  font-size: 1rem;
+  width: 2rem;
+  height: 2rem;
+  color: #6c757d;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
+  transition: box-shadow 0.15s;
+}
+.fc.fc-theme-standard .fc-view-harness .fc-popover .fc-popover-header .fc-popover-close:before {
+  content: "\e90b";
+}
+.fc.fc-theme-standard .fc-view-harness .fc-popover .fc-popover-header .fc-popover-close:hover {
+  color: #495057;
+  border-color: transparent;
+  background: transparent;
+}
+.fc.fc-theme-standard .fc-view-harness .fc-popover .fc-popover-header .fc-popover-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+}
+.fc.fc-theme-standard .fc-view-harness .fc-popover .fc-popover-body {
+  padding: 1.25rem;
+  border: 1px solid #dee2e6;
+  background: #ffffff;
+  color: #212529;
+  border-top: 0 none;
+}
+.fc.fc-theme-standard .fc-view-harness .fc-event.fc-daygrid-block-event {
+  color: #ffffff;
+  background: #0069d9;
+  border-color: #0069d9;
+}
+.fc.fc-theme-standard .fc-view-harness .fc-event.fc-daygrid-block-event .fc-event-main {
+  color: #ffffff;
+}
+.fc.fc-theme-standard .fc-view-harness .fc-event.fc-daygrid-dot-event .fc-daygrid-event-dot {
+  background: #0069d9;
+  border-color: #0069d9;
+}
+.fc.fc-theme-standard .fc-view-harness .fc-event.fc-daygrid-dot-event:hover {
+  background: #e9ecef;
+  color: #212529;
+}
+.fc.fc-theme-standard .fc-view-harness .fc-cell-shaded {
+  background: #efefef;
+}
+.fc.fc-theme-standard .fc-toolbar .fc-button {
+  color: #ffffff;
+  background: #007bff;
+  border: 1px solid #007bff;
+  font-size: 1rem;
+  transition: background-color 0.15s, border-color 0.15s, box-shadow 0.15s;
+  border-radius: 4px;
+}
+.fc.fc-theme-standard .fc-toolbar .fc-button:enabled:hover {
+  background: #0069d9;
+  color: #ffffff;
+  border-color: #0069d9;
+}
+.fc.fc-theme-standard .fc-toolbar .fc-button:enabled:active {
+  background: #0062cc;
+  color: #ffffff;
+  border-color: #0062cc;
+}
+.fc.fc-theme-standard .fc-toolbar .fc-button:enabled:active:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+}
+.fc.fc-theme-standard .fc-toolbar .fc-button:disabled {
+  opacity: 0.65;
+  color: #ffffff;
+  background: #007bff;
+  border: 1px solid #007bff;
+}
+.fc.fc-theme-standard .fc-toolbar .fc-button .fc-icon-chevron-left {
+  font-family: "PrimeIcons" !important;
+  text-indent: 0;
+  font-size: 1rem;
+}
+.fc.fc-theme-standard .fc-toolbar .fc-button .fc-icon-chevron-left:before {
+  content: "\e900";
+}
+.fc.fc-theme-standard .fc-toolbar .fc-button .fc-icon-chevron-right {
+  font-family: "PrimeIcons" !important;
+  text-indent: 0;
+  font-size: 1rem;
+}
+.fc.fc-theme-standard .fc-toolbar .fc-button .fc-icon-chevron-right:before {
+  content: "\e901";
+}
+.fc.fc-theme-standard .fc-toolbar .fc-button:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+}
+.fc.fc-theme-standard .fc-toolbar .fc-button.fc-dayGridMonth-button, .fc.fc-theme-standard .fc-toolbar .fc-button.fc-timeGridWeek-button, .fc.fc-theme-standard .fc-toolbar .fc-button.fc-timeGridDay-button {
+  background: #6c757d;
+  border: 1px solid #6c757d;
+  color: #ffffff;
+  transition: background-color 0.15s, border-color 0.15s, box-shadow 0.15s;
+}
+.fc.fc-theme-standard .fc-toolbar .fc-button.fc-dayGridMonth-button:hover, .fc.fc-theme-standard .fc-toolbar .fc-button.fc-timeGridWeek-button:hover, .fc.fc-theme-standard .fc-toolbar .fc-button.fc-timeGridDay-button:hover {
+  background: #5a6268;
+  border-color: #545b62;
+  color: #ffffff;
+}
+.fc.fc-theme-standard .fc-toolbar .fc-button.fc-dayGridMonth-button.fc-button-active, .fc.fc-theme-standard .fc-toolbar .fc-button.fc-timeGridWeek-button.fc-button-active, .fc.fc-theme-standard .fc-toolbar .fc-button.fc-timeGridDay-button.fc-button-active {
+  background: #545b62;
+  border-color: #4e555b;
+  color: #ffffff;
+}
+.fc.fc-theme-standard .fc-toolbar .fc-button.fc-dayGridMonth-button.fc-button-active:hover, .fc.fc-theme-standard .fc-toolbar .fc-button.fc-timeGridWeek-button.fc-button-active:hover, .fc.fc-theme-standard .fc-toolbar .fc-button.fc-timeGridDay-button.fc-button-active:hover {
+  background: #545b62;
+  border-color: #4e555b;
+  color: #ffffff;
+}
+.fc.fc-theme-standard .fc-toolbar .fc-button.fc-dayGridMonth-button:not(:disabled):focus, .fc.fc-theme-standard .fc-toolbar .fc-button.fc-timeGridWeek-button:not(:disabled):focus, .fc.fc-theme-standard .fc-toolbar .fc-button.fc-timeGridDay-button:not(:disabled):focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+  z-index: 1;
+}
+.fc.fc-theme-standard .fc-toolbar .fc-button-group .fc-button {
+  border-radius: 0;
+}
+.fc.fc-theme-standard .fc-toolbar .fc-button-group .fc-button:first-child {
+  border-top-left-radius: 4px;
+  border-bottom-left-radius: 4px;
+}
+.fc.fc-theme-standard .fc-toolbar .fc-button-group .fc-button:last-child {
+  border-top-right-radius: 4px;
+  border-bottom-right-radius: 4px;
+}
+.fc.fc-theme-standard .fc-highlight {
+  color: #ffffff;
+  background: #007bff;
+}
+
+.p-orderlist .p-orderlist-controls {
+  padding: 1.25rem;
+}
+.p-orderlist .p-orderlist-controls .p-button {
+  margin-bottom: 0.5rem;
+}
+.p-orderlist .p-orderlist-header {
+  background: #efefef;
+  color: #212529;
+  border: 1px solid #dee2e6;
+  padding: 1rem 1.25rem;
+  font-weight: 600;
+  border-bottom: 0 none;
+  border-top-right-radius: 4px;
+  border-top-left-radius: 4px;
+}
+.p-orderlist .p-orderlist-list {
+  border: 1px solid #dee2e6;
+  background: #ffffff;
+  color: #212529;
+  padding: 0.5rem 0;
+  border-bottom-right-radius: 4px;
+  border-bottom-left-radius: 4px;
+}
+.p-orderlist .p-orderlist-list .p-orderlist-item {
+  padding: 0.5rem 1.5rem;
+  margin: 0;
+  border: 0 none;
+  color: #212529;
+  background: transparent;
+  transition: transform 0.15s, box-shadow 0.15s;
+}
+.p-orderlist .p-orderlist-list .p-orderlist-item:not(.p-highlight):hover {
+  background: #e9ecef;
+  color: #212529;
+}
+.p-orderlist .p-orderlist-list .p-orderlist-item:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: inset 0 0 0 0.15rem rgba(38, 143, 255, 0.5);
+}
+.p-orderlist .p-orderlist-list .p-orderlist-item.p-highlight {
+  color: #ffffff;
+  background: #007bff;
+}
+.p-orderlist.p-orderlist-striped .p-orderlist-list .p-orderlist-item:nth-child(even) {
+  background: rgba(0, 0, 0, 0.05);
+}
+.p-orderlist.p-orderlist-striped .p-orderlist-list .p-orderlist-item:nth-child(even):hover {
+  background: #e9ecef;
+}
+
+.p-organizationchart .p-organizationchart-node-content.p-organizationchart-selectable-node:not(.p-highlight):hover {
+  background: #e9ecef;
+  color: #212529;
+}
+.p-organizationchart .p-organizationchart-node-content.p-highlight {
+  background: #007bff;
+  color: #ffffff;
+}
+.p-organizationchart .p-organizationchart-node-content.p-highlight .p-node-toggler i {
+  color: #003e80;
+}
+.p-organizationchart .p-organizationchart-line-down {
+  background: #dee2e6;
+}
+.p-organizationchart .p-organizationchart-line-left {
+  border-right: 1px solid #dee2e6;
+  border-color: #dee2e6;
+}
+.p-organizationchart .p-organizationchart-line-top {
+  border-top: 1px solid #dee2e6;
+  border-color: #dee2e6;
+}
+.p-organizationchart .p-organizationchart-node-content {
+  border: 1px solid #dee2e6;
+  background: #ffffff;
+  color: #212529;
+  padding: 1.25rem;
+}
+.p-organizationchart .p-organizationchart-node-content .p-node-toggler {
+  background: inherit;
+  color: inherit;
+  border-radius: 50%;
+}
+.p-organizationchart .p-organizationchart-node-content .p-node-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+}
+
+.p-paginator {
+  background: #ffffff;
+  color: #007bff;
+  border: solid #dee2e6;
+  border-width: 0;
+  padding: 0.75rem;
+  border-radius: 4px;
+}
+.p-paginator .p-paginator-first,
+.p-paginator .p-paginator-prev,
+.p-paginator .p-paginator-next,
+.p-paginator .p-paginator-last {
+  background-color: #ffffff;
+  border: 1px solid #dee2e6;
+  color: #007bff;
+  min-width: 2.357rem;
+  height: 2.357rem;
+  margin: 0 0 0 -1px;
+  transition: box-shadow 0.15s;
+  border-radius: 0;
+}
+.p-paginator .p-paginator-first:not(.p-disabled):not(.p-highlight):hover,
+.p-paginator .p-paginator-prev:not(.p-disabled):not(.p-highlight):hover,
+.p-paginator .p-paginator-next:not(.p-disabled):not(.p-highlight):hover,
+.p-paginator .p-paginator-last:not(.p-disabled):not(.p-highlight):hover {
+  background: #e9ecef;
+  border-color: #dee2e6;
+  color: #007bff;
+}
+.p-paginator .p-paginator-first {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+}
+.p-paginator .p-paginator-last {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+.p-paginator .p-dropdown {
+  margin-left: 0.5rem;
+  margin-right: 0.5rem;
+  height: 2.357rem;
+}
+.p-paginator .p-dropdown .p-dropdown-label {
+  padding-right: 0;
+}
+.p-paginator .p-paginator-page-input {
+  margin-left: 0.5rem;
+  margin-right: 0.5rem;
+}
+.p-paginator .p-paginator-page-input .p-inputtext {
+  max-width: 2.357rem;
+}
+.p-paginator .p-paginator-current {
+  background-color: #ffffff;
+  border: 1px solid #dee2e6;
+  color: #007bff;
+  min-width: 2.357rem;
+  height: 2.357rem;
+  margin: 0 0 0 -1px;
+  padding: 0 0.5rem;
+}
+.p-paginator .p-paginator-pages .p-paginator-page {
+  background-color: #ffffff;
+  border: 1px solid #dee2e6;
+  color: #007bff;
+  min-width: 2.357rem;
+  height: 2.357rem;
+  margin: 0 0 0 -1px;
+  transition: box-shadow 0.15s;
+  border-radius: 0;
+}
+.p-paginator .p-paginator-pages .p-paginator-page.p-highlight {
+  background: #007bff;
+  border-color: #007bff;
+  color: #ffffff;
+}
+.p-paginator .p-paginator-pages .p-paginator-page:not(.p-highlight):hover {
+  background: #e9ecef;
+  border-color: #dee2e6;
+  color: #007bff;
+}
+
+.p-picklist .p-picklist-buttons {
+  padding: 1.25rem;
+}
+.p-picklist .p-picklist-buttons .p-button {
+  margin-bottom: 0.5rem;
+}
+.p-picklist .p-picklist-header {
+  background: #efefef;
+  color: #212529;
+  border: 1px solid #dee2e6;
+  padding: 1rem 1.25rem;
+  font-weight: 600;
+  border-bottom: 0 none;
+  border-top-right-radius: 4px;
+  border-top-left-radius: 4px;
+}
+.p-picklist .p-picklist-list {
+  border: 1px solid #dee2e6;
+  background: #ffffff;
+  color: #212529;
+  padding: 0.5rem 0;
+  border-bottom-right-radius: 4px;
+  border-bottom-left-radius: 4px;
+}
+.p-picklist .p-picklist-list .p-picklist-item {
+  padding: 0.5rem 1.5rem;
+  margin: 0;
+  border: 0 none;
+  color: #212529;
+  background: transparent;
+  transition: transform 0.15s, box-shadow 0.15s;
+}
+.p-picklist .p-picklist-list .p-picklist-item:not(.p-highlight):hover {
+  background: #e9ecef;
+  color: #212529;
+}
+.p-picklist .p-picklist-list .p-picklist-item:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: inset 0 0 0 0.15rem rgba(38, 143, 255, 0.5);
+}
+.p-picklist .p-picklist-list .p-picklist-item.p-highlight {
+  color: #ffffff;
+  background: #007bff;
+}
+.p-picklist.p-picklist-striped .p-picklist-list .p-picklist-item:nth-child(even) {
+  background: rgba(0, 0, 0, 0.05);
+}
+.p-picklist.p-picklist-striped .p-picklist-list .p-picklist-item:nth-child(even):hover {
+  background: #e9ecef;
+}
+
+.p-timeline .p-timeline-event-marker {
+  border: 0 none;
+  border-radius: 50%;
+  width: 1rem;
+  height: 1rem;
+  background-color: #007bff;
+}
+.p-timeline .p-timeline-event-connector {
+  background-color: #dee2e6;
+}
+.p-timeline.p-timeline-vertical .p-timeline-event-opposite,
+.p-timeline.p-timeline-vertical .p-timeline-event-content {
+  padding: 0 1rem;
+}
+.p-timeline.p-timeline-vertical .p-timeline-event-connector {
+  width: 2px;
+}
+.p-timeline.p-timeline-horizontal .p-timeline-event-opposite,
+.p-timeline.p-timeline-horizontal .p-timeline-event-content {
+  padding: 1rem 0;
+}
+.p-timeline.p-timeline-horizontal .p-timeline-event-connector {
+  height: 2px;
+}
+
+.p-tree {
+  border: 1px solid #dee2e6;
+  background: #ffffff;
+  color: #212529;
+  padding: 1.25rem;
+  border-radius: 4px;
+}
+.p-tree .p-tree-container .p-treenode {
+  padding: 0.143rem;
+}
+.p-tree .p-tree-container .p-treenode .p-treenode-content {
+  border-radius: 4px;
+  transition: box-shadow 0.15s;
+  padding: 0.286rem;
+}
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler {
+  margin-right: 0.5rem;
+  width: 2rem;
+  height: 2rem;
+  color: #6c757d;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
+  transition: box-shadow 0.15s;
+}
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:enabled:hover {
+  color: #495057;
+  border-color: transparent;
+  background: transparent;
+}
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+}
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-treenode-icon {
+  margin-right: 0.5rem;
+  color: #6c757d;
+}
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-checkbox {
+  margin-right: 0.5rem;
+}
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-checkbox .p-indeterminate .p-checkbox-icon {
+  color: #212529;
+}
+.p-tree .p-tree-container .p-treenode .p-treenode-content:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: inset 0 0 0 0.15rem rgba(38, 143, 255, 0.5);
+}
+.p-tree .p-tree-container .p-treenode .p-treenode-content.p-highlight {
+  background: #007bff;
+  color: #ffffff;
+}
+.p-tree .p-tree-container .p-treenode .p-treenode-content.p-highlight .p-tree-toggler,
+.p-tree .p-tree-container .p-treenode .p-treenode-content.p-highlight .p-treenode-icon {
+  color: #ffffff;
+}
+.p-tree .p-tree-container .p-treenode .p-treenode-content.p-highlight .p-tree-toggler:hover,
+.p-tree .p-tree-container .p-treenode .p-treenode-content.p-highlight .p-treenode-icon:hover {
+  color: #ffffff;
+}
+.p-tree .p-tree-container .p-treenode .p-treenode-content.p-treenode-selectable:not(.p-highlight):hover {
+  background: #e9ecef;
+  color: #212529;
+}
+.p-tree .p-tree-filter-container {
+  margin-bottom: 0.5rem;
+}
+.p-tree .p-tree-filter-container .p-tree-filter {
+  width: 100%;
+  padding-right: 1.75rem;
+}
+.p-tree .p-tree-filter-container .p-tree-filter-icon {
+  right: 0.75rem;
+  color: #495057;
+}
+.p-tree .p-treenode-children {
+  padding: 0 0 0 1rem;
+}
+.p-tree .p-tree-loading-icon {
+  font-size: 2rem;
+}
+
+.p-treetable .p-paginator-top {
+  border-width: 1px 0 0 0;
+  border-radius: 0;
+}
+.p-treetable .p-paginator-bottom {
+  border-width: 1px 0 0 0;
+  border-radius: 0;
+}
+.p-treetable .p-treetable-header {
+  background: #efefef;
+  color: #212529;
+  border: solid #dee2e6;
+  border-width: 1px 0 0 0;
+  padding: 1rem 1rem;
+  font-weight: 600;
+}
+.p-treetable .p-treetable-footer {
+  background: #efefef;
+  color: #212529;
+  border: 1px solid #dee2e6;
+  border-width: 1px 0 1px 0;
+  padding: 1rem 1rem;
+  font-weight: 600;
+}
+.p-treetable .p-treetable-thead > tr > th {
+  text-align: left;
+  padding: 1rem 1rem;
+  border: 1px solid #dee2e6;
+  border-width: 1px 0 2px 0;
+  font-weight: 600;
+  color: #212529;
+  background: #ffffff;
+  transition: box-shadow 0.15s;
+}
+.p-treetable .p-treetable-tfoot > tr > td {
+  text-align: left;
+  padding: 1rem 1rem;
+  border: 1px solid #dee2e6;
+  border-width: 1px 0 1px 0;
+  font-weight: 600;
+  color: #212529;
+  background: #ffffff;
+}
+.p-treetable .p-sortable-column {
+  outline-color: rgba(38, 143, 255, 0.5);
+}
+.p-treetable .p-sortable-column .p-sortable-column-icon {
+  color: #6c757d;
+  margin-left: 0.5rem;
+}
+.p-treetable .p-sortable-column .p-sortable-column-badge {
+  border-radius: 50%;
+  height: 1.143rem;
+  min-width: 1.143rem;
+  line-height: 1.143rem;
+  color: #ffffff;
+  background: #007bff;
+  margin-left: 0.5rem;
+}
+.p-treetable .p-sortable-column:not(.p-highlight):hover {
+  background: #e9ecef;
+  color: #212529;
+}
+.p-treetable .p-sortable-column:not(.p-highlight):hover .p-sortable-column-icon {
+  color: #6c757d;
+}
+.p-treetable .p-sortable-column.p-highlight {
+  background: #ffffff;
+  color: #007bff;
+}
+.p-treetable .p-sortable-column.p-highlight .p-sortable-column-icon {
+  color: #007bff;
+}
+.p-treetable .p-treetable-tbody > tr {
+  background: #ffffff;
+  color: #212529;
+  transition: box-shadow 0.15s;
+}
+.p-treetable .p-treetable-tbody > tr > td {
+  text-align: left;
+  border: 1px solid #dee2e6;
+  border-width: 1px 0 0 0;
+  padding: 1rem 1rem;
+}
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler {
+  width: 2rem;
+  height: 2rem;
+  color: #6c757d;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
+  transition: box-shadow 0.15s;
+  margin-right: 0.5rem;
+}
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:enabled:hover {
+  color: #495057;
+  border-color: transparent;
+  background: transparent;
+}
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+}
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler + .p-checkbox {
+  margin-right: 0.5rem;
+}
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler + .p-checkbox .p-indeterminate .p-checkbox-icon {
+  color: #212529;
+}
+.p-treetable .p-treetable-tbody > tr:focus {
+  outline: 0.15rem solid rgba(38, 143, 255, 0.5);
+  outline-offset: -0.15rem;
+}
+.p-treetable .p-treetable-tbody > tr.p-highlight {
+  background: #007bff;
+  color: #ffffff;
+}
+.p-treetable .p-treetable-tbody > tr.p-highlight .p-treetable-toggler {
+  color: #ffffff;
+}
+.p-treetable .p-treetable-tbody > tr.p-highlight .p-treetable-toggler:hover {
+  color: #ffffff;
+}
+.p-treetable.p-treetable-hoverable-rows .p-treetable-tbody > tr:not(.p-highlight):hover {
+  background: #e9ecef;
+  color: #212529;
+}
+.p-treetable.p-treetable-hoverable-rows .p-treetable-tbody > tr:not(.p-highlight):hover .p-treetable-toggler {
+  color: #212529;
+}
+.p-treetable .p-column-resizer-helper {
+  background: #007bff;
+}
+.p-treetable .p-treetable-scrollable-header,
+.p-treetable .p-treetable-scrollable-footer {
+  background: #efefef;
+}
+.p-treetable .p-treetable-loading-icon {
+  font-size: 2rem;
+}
+.p-treetable.p-treetable-gridlines .p-datatable-header {
+  border-width: 1px 1px 0 1px;
+}
+.p-treetable.p-treetable-gridlines .p-treetable-footer {
+  border-width: 0 1px 1px 1px;
+}
+.p-treetable.p-treetable-gridlines .p-treetable-top {
+  border-width: 0 1px 0 1px;
+}
+.p-treetable.p-treetable-gridlines .p-treetable-bottom {
+  border-width: 0 1px 1px 1px;
+}
+.p-treetable.p-treetable-gridlines .p-treetable-thead > tr > th {
+  border-width: 1px;
+}
+.p-treetable.p-treetable-gridlines .p-treetable-tbody > tr > td {
+  border-width: 1px;
+}
+.p-treetable.p-treetable-gridlines .p-treetable-tfoot > tr > td {
+  border-width: 1px;
+}
+.p-treetable.p-treetable-sm .p-treetable-header {
+  padding: 0.875rem 0.875rem;
+}
+.p-treetable.p-treetable-sm .p-treetable-thead > tr > th {
+  padding: 0.5rem 0.5rem;
+}
+.p-treetable.p-treetable-sm .p-treetable-tbody > tr > td {
+  padding: 0.5rem 0.5rem;
+}
+.p-treetable.p-treetable-sm .p-treetable-tfoot > tr > td {
+  padding: 0.5rem 0.5rem;
+}
+.p-treetable.p-treetable-sm .p-treetable-footer {
+  padding: 0.5rem 0.5rem;
+}
+.p-treetable.p-treetable-lg .p-treetable-header {
+  padding: 1.25rem 1.25rem;
+}
+.p-treetable.p-treetable-lg .p-treetable-thead > tr > th {
+  padding: 1.25rem 1.25rem;
+}
+.p-treetable.p-treetable-lg .p-treetable-tbody > tr > td {
+  padding: 1.25rem 1.25rem;
+}
+.p-treetable.p-treetable-lg .p-treetable-tfoot > tr > td {
+  padding: 1.25rem 1.25rem;
+}
+.p-treetable.p-treetable-lg .p-treetable-footer {
+  padding: 1.25rem 1.25rem;
+}
+
+.p-accordion .p-accordion-header .p-accordion-header-link {
+  padding: 1rem 1.25rem;
+  border: 1px solid #dee2e6;
+  color: #212529;
+  background: #efefef;
+  font-weight: 600;
+  border-radius: 4px;
+  transition: box-shadow 0.15s;
+}
+.p-accordion .p-accordion-header .p-accordion-header-link .p-accordion-toggle-icon {
+  margin-right: 0.5rem;
+}
+.p-accordion .p-accordion-header:not(.p-disabled) .p-accordion-header-link:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+}
+.p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover .p-accordion-header-link {
+  background: #e9ecef;
+  border-color: #dee2e6;
+  color: #212529;
+}
+.p-accordion .p-accordion-header:not(.p-disabled).p-highlight .p-accordion-header-link {
+  background: #efefef;
+  border-color: #dee2e6;
+  color: #212529;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 0;
+}
+.p-accordion .p-accordion-header:not(.p-disabled).p-highlight:hover .p-accordion-header-link {
+  border-color: #dee2e6;
+  background: #e9ecef;
+  color: #212529;
+}
+.p-accordion .p-accordion-content {
+  padding: 1.25rem;
+  border: 1px solid #dee2e6;
+  background: #ffffff;
+  color: #212529;
+  border-top: 0;
+  border-top-right-radius: 0;
+  border-top-left-radius: 0;
+  border-bottom-right-radius: 4px;
+  border-bottom-left-radius: 4px;
+}
+.p-accordion .p-accordion-tab {
+  margin-bottom: 0;
+}
+.p-accordion .p-accordion-tab .p-accordion-header .p-accordion-header-link {
+  border-radius: 0;
+}
+.p-accordion .p-accordion-tab .p-accordion-content {
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 0;
+}
+.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header .p-accordion-header-link {
+  border-top: 0 none;
+}
+.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-highlight):not(.p-disabled):hover .p-accordion-header-link, .p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-disabled).p-highlight:hover .p-accordion-header-link {
+  border-top: 0 none;
+}
+.p-accordion .p-accordion-tab:first-child .p-accordion-header .p-accordion-header-link {
+  border-top-right-radius: 4px;
+  border-top-left-radius: 4px;
+}
+.p-accordion .p-accordion-tab:last-child .p-accordion-header:not(.p-highlight) .p-accordion-header-link {
+  border-bottom-right-radius: 4px;
+  border-bottom-left-radius: 4px;
+}
+.p-accordion .p-accordion-tab:last-child .p-accordion-content {
+  border-bottom-right-radius: 4px;
+  border-bottom-left-radius: 4px;
+}
+
+.p-card {
+  background: #ffffff;
+  color: #212529;
+  box-shadow: 0 2px 1px -1px rgba(0, 0, 0, 0.2), 0 1px 1px 0 rgba(0, 0, 0, 0.14), 0 1px 3px 0 rgba(0, 0, 0, 0.12);
+  border-radius: 4px;
+}
+.p-card .p-card-body {
+  padding: 1.5rem;
+}
+.p-card .p-card-title {
+  font-size: 1.5rem;
+  font-weight: 700;
+  margin-bottom: 0.5rem;
+}
+.p-card .p-card-subtitle {
+  font-weight: 400;
+  margin-bottom: 0.5rem;
+  color: #6c757d;
+}
+.p-card .p-card-content {
+  padding: 1rem 0;
+}
+.p-card .p-card-footer {
+  padding: 1rem 0 0 0;
+}
+
+.p-fieldset {
+  border: 1px solid #dee2e6;
+  background: #ffffff;
+  color: #212529;
+  border-radius: 4px;
+}
+.p-fieldset .p-fieldset-legend {
+  padding: 1rem 1.25rem;
+  border: 1px solid #dee2e6;
+  color: #212529;
+  background: #efefef;
+  font-weight: 600;
+  border-radius: 4px;
+}
+.p-fieldset.p-fieldset-toggleable .p-fieldset-legend {
+  padding: 0;
+  transition: box-shadow 0.15s;
+}
+.p-fieldset.p-fieldset-toggleable .p-fieldset-legend a {
+  padding: 1rem 1.25rem;
+  color: #212529;
+  border-radius: 4px;
+  transition: box-shadow 0.15s;
+}
+.p-fieldset.p-fieldset-toggleable .p-fieldset-legend a .p-fieldset-toggler {
+  margin-right: 0.5rem;
+}
+.p-fieldset.p-fieldset-toggleable .p-fieldset-legend a:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+}
+.p-fieldset.p-fieldset-toggleable .p-fieldset-legend a:hover {
+  color: #212529;
+}
+.p-fieldset.p-fieldset-toggleable .p-fieldset-legend:hover {
+  background: #e9ecef;
+  border-color: #dee2e6;
+  color: #212529;
+}
+.p-fieldset .p-fieldset-content {
+  padding: 1.25rem;
+}
+
+.p-divider .p-divider-content {
+  background-color: #ffffff;
+}
+.p-divider.p-divider-horizontal {
+  margin: 1rem 0;
+  padding: 0 1rem;
+}
+.p-divider.p-divider-horizontal:before {
+  border-top: 1px #dee2e6;
+}
+.p-divider.p-divider-horizontal .p-divider-content {
+  padding: 0 0.5rem;
+}
+.p-divider.p-divider-vertical {
+  margin: 0 1rem;
+  padding: 1rem 0;
+}
+.p-divider.p-divider-vertical:before {
+  border-left: 1px #dee2e6;
+}
+.p-divider.p-divider-vertical .p-divider-content {
+  padding: 0.5rem 0;
+}
+
+.p-panel .p-panel-header {
+  border: 1px solid #dee2e6;
+  padding: 1rem 1.25rem;
+  background: #efefef;
+  color: #212529;
+  border-top-right-radius: 4px;
+  border-top-left-radius: 4px;
+}
+.p-panel .p-panel-header .p-panel-title {
+  font-weight: 600;
+}
+.p-panel .p-panel-header .p-panel-header-icon {
+  width: 2rem;
+  height: 2rem;
+  color: #6c757d;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
+  transition: box-shadow 0.15s;
+}
+.p-panel .p-panel-header .p-panel-header-icon:enabled:hover {
+  color: #495057;
+  border-color: transparent;
+  background: transparent;
+}
+.p-panel .p-panel-header .p-panel-header-icon:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+}
+.p-panel.p-panel-toggleable .p-panel-header {
+  padding: 0.5rem 1.25rem;
+}
+.p-panel .p-panel-content {
+  padding: 1.25rem;
+  border: 1px solid #dee2e6;
+  background: #ffffff;
+  color: #212529;
+  border-bottom-right-radius: 4px;
+  border-bottom-left-radius: 4px;
+  border-top: 0 none;
+}
+.p-panel .p-panel-footer {
+  padding: 0.5rem 1.25rem;
+  border: 1px solid #dee2e6;
+  background: #ffffff;
+  color: #212529;
+  border-top: 0 none;
+}
+
+.p-scrollpanel .p-scrollpanel-bar {
+  background: #efefef;
+  border: 0 none;
+}
+
+.p-splitter {
+  border: 1px solid #dee2e6;
+  background: #ffffff;
+  border-radius: 4px;
+  color: #212529;
+}
+.p-splitter .p-splitter-gutter {
+  transition: box-shadow 0.15s;
+  background: #efefef;
+}
+.p-splitter .p-splitter-gutter .p-splitter-gutter-handle {
+  background: #dee2e6;
+}
+.p-splitter .p-splitter-gutter-resizing {
+  background: #dee2e6;
+}
+
+.p-tabview .p-tabview-nav {
+  background: transparent;
+  border: 1px solid #dee2e6;
+  border-width: 0 0 1px 0;
+}
+.p-tabview .p-tabview-nav li {
+  margin-right: 0;
+}
+.p-tabview .p-tabview-nav li .p-tabview-nav-link {
+  border: solid;
+  border-width: 1px;
+  border-color: #ffffff #ffffff #dee2e6 #ffffff;
+  background: #ffffff;
+  color: #6c757d;
+  padding: 0.75rem 1rem;
+  font-weight: 600;
+  border-top-right-radius: 4px;
+  border-top-left-radius: 4px;
+  transition: box-shadow 0.15s;
+  margin: 0 0 -1px 0;
+}
+.p-tabview .p-tabview-nav li .p-tabview-nav-link:not(.p-disabled):focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: inset 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+}
+.p-tabview .p-tabview-nav li:not(.p-highlight):not(.p-disabled):hover .p-tabview-nav-link {
+  background: #ffffff;
+  border-color: #dee2e6;
+  color: #6c757d;
+}
+.p-tabview .p-tabview-nav li.p-highlight .p-tabview-nav-link {
+  background: #ffffff;
+  border-color: #dee2e6 #dee2e6 #ffffff #dee2e6;
+  color: #495057;
+}
+.p-tabview .p-tabview-nav-btn.p-link {
+  background: #ffffff;
+  color: #495057;
+  width: 2.357rem;
+  box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12);
+  border-radius: 0;
+}
+.p-tabview .p-tabview-nav-btn.p-link:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: inset 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+}
+.p-tabview .p-tabview-panels {
+  background: #ffffff;
+  padding: 1.25rem;
+  border: 0 none;
+  color: #212529;
+  border-bottom-right-radius: 4px;
+  border-bottom-left-radius: 4px;
+}
+
+.p-toolbar {
+  background: #efefef;
+  border: 1px solid #dee2e6;
+  padding: 1rem 1.25rem;
+  border-radius: 4px;
+}
+.p-toolbar .p-toolbar-separator {
+  margin: 0 0.5rem;
+}
+
+.p-confirm-popup {
+  background: #ffffff;
+  color: #212529;
+  border: 1px solid rgba(0, 0, 0, 0.2);
+  border-radius: 4px;
+  box-shadow: none;
+}
+.p-confirm-popup .p-confirm-popup-content {
+  padding: 1.25rem;
+}
+.p-confirm-popup .p-confirm-popup-footer {
+  text-align: right;
+  padding: 0 1.25rem 1.25rem 1.25rem;
+}
+.p-confirm-popup .p-confirm-popup-footer button {
+  margin: 0 0.5rem 0 0;
+  width: auto;
+}
+.p-confirm-popup .p-confirm-popup-footer button:last-child {
+  margin: 0;
+}
+.p-confirm-popup:after {
+  border: solid transparent;
+  border-color: rgba(255, 255, 255, 0);
+  border-bottom-color: #ffffff;
+}
+.p-confirm-popup:before {
+  border: solid transparent;
+  border-color: rgba(0, 0, 0, 0);
+  border-bottom-color: rgba(0, 0, 0, 0.2);
+}
+.p-confirm-popup.p-confirm-popup-flipped:after {
+  border-top-color: #ffffff;
+}
+.p-confirm-popup.p-confirm-popup-flipped:before {
+  border-top-color: rgba(0, 0, 0, 0.2);
+}
+.p-confirm-popup .p-confirm-popup-icon {
+  font-size: 1.5rem;
+}
+.p-confirm-popup .p-confirm-popup-message {
+  margin-left: 1rem;
+}
+
+.p-dialog {
+  border-radius: 4px;
+  box-shadow: none;
+  border: 1px solid rgba(0, 0, 0, 0.2);
+}
+.p-dialog .p-dialog-header {
+  border-bottom: 1px solid #e9ecef;
+  background: #ffffff;
+  color: #212529;
+  padding: 1rem;
+  border-top-right-radius: 4px;
+  border-top-left-radius: 4px;
+}
+.p-dialog .p-dialog-header .p-dialog-title {
+  font-weight: 600;
+  font-size: 1.25rem;
+}
+.p-dialog .p-dialog-header .p-dialog-header-icon {
+  width: 2rem;
+  height: 2rem;
+  color: #6c757d;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
+  transition: box-shadow 0.15s;
+  margin-right: 0.5rem;
+}
+.p-dialog .p-dialog-header .p-dialog-header-icon:enabled:hover {
+  color: #495057;
+  border-color: transparent;
+  background: transparent;
+}
+.p-dialog .p-dialog-header .p-dialog-header-icon:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+}
+.p-dialog .p-dialog-header .p-dialog-header-icon:last-child {
+  margin-right: 0;
+}
+.p-dialog .p-dialog-content {
+  background: #ffffff;
+  color: #212529;
+  padding: 1rem;
+}
+.p-dialog .p-dialog-content:last-of-type {
+  border-bottom-right-radius: 4px;
+  border-bottom-left-radius: 4px;
+}
+.p-dialog .p-dialog-footer {
+  border-top: 1px solid #e9ecef;
+  background: #ffffff;
+  color: #212529;
+  padding: 1rem;
+  text-align: right;
+  border-bottom-right-radius: 4px;
+  border-bottom-left-radius: 4px;
+}
+.p-dialog .p-dialog-footer button {
+  margin: 0 0.5rem 0 0;
+  width: auto;
+}
+.p-dialog.p-confirm-dialog .p-confirm-dialog-icon {
+  font-size: 2rem;
+}
+.p-dialog.p-confirm-dialog .p-confirm-dialog-message {
+  margin-left: 1rem;
+}
+
+.p-overlaypanel {
+  background: #ffffff;
+  color: #212529;
+  border: 1px solid rgba(0, 0, 0, 0.2);
+  border-radius: 4px;
+  box-shadow: none;
+}
+.p-overlaypanel .p-overlaypanel-content {
+  padding: 1.25rem;
+}
+.p-overlaypanel .p-overlaypanel-close {
+  background: #007bff;
+  color: #ffffff;
+  width: 2rem;
+  height: 2rem;
+  transition: box-shadow 0.15s;
+  border-radius: 50%;
+  position: absolute;
+  top: -1rem;
+  right: -1rem;
+}
+.p-overlaypanel .p-overlaypanel-close:enabled:hover {
+  background: #0069d9;
+  color: #ffffff;
+}
+.p-overlaypanel:after {
+  border: solid transparent;
+  border-color: rgba(255, 255, 255, 0);
+  border-bottom-color: #ffffff;
+}
+.p-overlaypanel:before {
+  border: solid transparent;
+  border-color: rgba(0, 0, 0, 0);
+  border-bottom-color: rgba(0, 0, 0, 0.2);
+}
+.p-overlaypanel.p-overlaypanel-flipped:after {
+  border-top-color: #ffffff;
+}
+.p-overlaypanel.p-overlaypanel-flipped:before {
+  border-top-color: rgba(0, 0, 0, 0.2);
+}
+
+.p-sidebar {
+  background: #ffffff;
+  color: #212529;
+  border: 1px solid rgba(0, 0, 0, 0.2);
+  box-shadow: none;
+}
+.p-sidebar .p-sidebar-header {
+  padding: 1rem 1.25rem;
+}
+.p-sidebar .p-sidebar-header .p-sidebar-close,
+.p-sidebar .p-sidebar-header .p-sidebar-icon {
+  width: 2rem;
+  height: 2rem;
+  color: #6c757d;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
+  transition: box-shadow 0.15s;
+}
+.p-sidebar .p-sidebar-header .p-sidebar-close:enabled:hover,
+.p-sidebar .p-sidebar-header .p-sidebar-icon:enabled:hover {
+  color: #495057;
+  border-color: transparent;
+  background: transparent;
+}
+.p-sidebar .p-sidebar-header .p-sidebar-close:focus,
+.p-sidebar .p-sidebar-header .p-sidebar-icon:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+}
+.p-sidebar .p-sidebar-header + .p-sidebar-content {
+  padding-top: 0;
+}
+.p-sidebar .p-sidebar-content {
+  padding: 1.25rem;
+}
+
+.p-tooltip .p-tooltip-text {
+  background: #212529;
+  color: #ffffff;
+  padding: 0.5rem 0.75rem;
+  box-shadow: none;
+  border-radius: 4px;
+}
+.p-tooltip.p-tooltip-right .p-tooltip-arrow {
+  border-right-color: #212529;
+}
+.p-tooltip.p-tooltip-left .p-tooltip-arrow {
+  border-left-color: #212529;
+}
+.p-tooltip.p-tooltip-top .p-tooltip-arrow {
+  border-top-color: #212529;
+}
+.p-tooltip.p-tooltip-bottom .p-tooltip-arrow {
+  border-bottom-color: #212529;
+}
+
+.p-fileupload .p-fileupload-buttonbar {
+  background: #efefef;
+  padding: 1rem 1.25rem;
+  border: 1px solid #dee2e6;
+  color: #212529;
+  border-bottom: 0 none;
+  border-top-right-radius: 4px;
+  border-top-left-radius: 4px;
+}
+.p-fileupload .p-fileupload-buttonbar .p-button {
+  margin-right: 0.5rem;
+}
+.p-fileupload .p-fileupload-buttonbar .p-button.p-fileupload-choose.p-focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+}
+.p-fileupload .p-fileupload-content {
+  background: #ffffff;
+  padding: 2rem 1rem;
+  border: 1px solid #dee2e6;
+  color: #212529;
+  border-bottom-right-radius: 4px;
+  border-bottom-left-radius: 4px;
+}
+.p-fileupload .p-progressbar {
+  height: 0.25rem;
+}
+.p-fileupload .p-fileupload-row > div {
+  padding: 1rem 1rem;
+}
+.p-fileupload.p-fileupload-advanced .p-message {
+  margin-top: 0;
+}
+
+.p-fileupload-choose:not(.p-disabled):hover {
+  background: #0069d9;
+  color: #ffffff;
+  border-color: #0069d9;
+}
+.p-fileupload-choose:not(.p-disabled):active {
+  background: #0062cc;
+  color: #ffffff;
+  border-color: #0062cc;
+}
+
+.p-breadcrumb {
+  background: #efefef;
+  border: 0 none;
+  border-radius: 4px;
+  padding: 1rem;
+}
+.p-breadcrumb ul li .p-menuitem-link {
+  transition: box-shadow 0.15s;
+  border-radius: 4px;
+}
+.p-breadcrumb ul li .p-menuitem-link:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+}
+.p-breadcrumb ul li .p-menuitem-link .p-menuitem-text {
+  color: #007bff;
+}
+.p-breadcrumb ul li .p-menuitem-link .p-menuitem-icon {
+  color: #007bff;
+}
+.p-breadcrumb ul li.p-breadcrumb-chevron {
+  margin: 0 0.5rem 0 0.5rem;
+  color: #6c757d;
+}
+.p-breadcrumb ul li:last-child .p-menuitem-text {
+  color: #6c757d;
+}
+.p-breadcrumb ul li:last-child .p-menuitem-icon {
+  color: #6c757d;
+}
+
+.p-contextmenu {
+  padding: 0.5rem 0;
+  background: #ffffff;
+  color: #212529;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  box-shadow: none;
+  border-radius: 4px;
+  width: 12.5rem;
+}
+.p-contextmenu .p-menuitem-link {
+  padding: 0.75rem 1rem;
+  color: #212529;
+  border-radius: 0;
+  transition: box-shadow 0.15s;
+  user-select: none;
+}
+.p-contextmenu .p-menuitem-link .p-menuitem-text {
+  color: #212529;
+}
+.p-contextmenu .p-menuitem-link .p-menuitem-icon {
+  color: #212529;
+  margin-right: 0.5rem;
+}
+.p-contextmenu .p-menuitem-link .p-submenu-icon {
+  color: #212529;
+}
+.p-contextmenu .p-menuitem-link:not(.p-disabled):hover {
+  background: #e9ecef;
+}
+.p-contextmenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text {
+  color: #212529;
+}
+.p-contextmenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon {
+  color: #212529;
+}
+.p-contextmenu .p-menuitem-link:not(.p-disabled):hover .p-submenu-icon {
+  color: #212529;
+}
+.p-contextmenu .p-menuitem-link:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: inset 0 0 0 0.15rem rgba(38, 143, 255, 0.5);
+}
+.p-contextmenu .p-submenu-list {
+  padding: 0.5rem 0;
+  background: #ffffff;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  box-shadow: none;
+  border-radius: 4px;
+}
+.p-contextmenu .p-menuitem.p-menuitem-active > .p-menuitem-link {
+  background: #e9ecef;
+}
+.p-contextmenu .p-menuitem.p-menuitem-active > .p-menuitem-link .p-menuitem-text {
+  color: #212529;
+}
+.p-contextmenu .p-menuitem.p-menuitem-active > .p-menuitem-link .p-menuitem-icon, .p-contextmenu .p-menuitem.p-menuitem-active > .p-menuitem-link .p-submenu-icon {
+  color: #212529;
+}
+.p-contextmenu .p-menu-separator {
+  border-top: 1px solid #dee2e6;
+  margin: 0.5rem 0;
+}
+.p-contextmenu .p-submenu-icon {
+  font-size: 0.875rem;
+}
+
+.p-dock .p-dock-list-container {
+  background: rgba(255, 255, 255, 0.1);
+  border: 1px solid rgba(255, 255, 255, 0.2);
+  padding: 0.5rem 0.5rem;
+  border-radius: 0.5rem;
+}
+.p-dock .p-dock-item {
+  padding: 0.5rem;
+}
+.p-dock .p-dock-action {
+  width: 4rem;
+  height: 4rem;
+}
+.p-dock.p-dock-top .p-dock-item-second-prev,
+.p-dock.p-dock-top .p-dock-item-second-next, .p-dock.p-dock-bottom .p-dock-item-second-prev,
+.p-dock.p-dock-bottom .p-dock-item-second-next {
+  margin: 0 0.9rem;
+}
+.p-dock.p-dock-top .p-dock-item-prev,
+.p-dock.p-dock-top .p-dock-item-next, .p-dock.p-dock-bottom .p-dock-item-prev,
+.p-dock.p-dock-bottom .p-dock-item-next {
+  margin: 0 1.3rem;
+}
+.p-dock.p-dock-top .p-dock-item-current, .p-dock.p-dock-bottom .p-dock-item-current {
+  margin: 0 1.5rem;
+}
+.p-dock.p-dock-left .p-dock-item-second-prev,
+.p-dock.p-dock-left .p-dock-item-second-next, .p-dock.p-dock-right .p-dock-item-second-prev,
+.p-dock.p-dock-right .p-dock-item-second-next {
+  margin: 0.9rem 0;
+}
+.p-dock.p-dock-left .p-dock-item-prev,
+.p-dock.p-dock-left .p-dock-item-next, .p-dock.p-dock-right .p-dock-item-prev,
+.p-dock.p-dock-right .p-dock-item-next {
+  margin: 1.3rem 0;
+}
+.p-dock.p-dock-left .p-dock-item-current, .p-dock.p-dock-right .p-dock-item-current {
+  margin: 1.5rem 0;
+}
+
+@media screen and (max-width: 960px) {
+  .p-dock.p-dock-top .p-dock-list-container, .p-dock.p-dock-bottom .p-dock-list-container {
+    overflow-x: auto;
+    width: 100%;
+  }
+  .p-dock.p-dock-top .p-dock-list-container .p-dock-list, .p-dock.p-dock-bottom .p-dock-list-container .p-dock-list {
+    margin: 0 auto;
+  }
+  .p-dock.p-dock-left .p-dock-list-container, .p-dock.p-dock-right .p-dock-list-container {
+    overflow-y: auto;
+    height: 100%;
+  }
+  .p-dock.p-dock-left .p-dock-list-container .p-dock-list, .p-dock.p-dock-right .p-dock-list-container .p-dock-list {
+    margin: auto 0;
+  }
+  .p-dock .p-dock-list .p-dock-item {
+    transform: none;
+    margin: 0;
+  }
+}
+.p-megamenu {
+  padding: 0.5rem 1rem;
+  background: #efefef;
+  color: rgba(0, 0, 0, 0.9);
+  border: 0 none;
+  border-radius: 4px;
+}
+.p-megamenu .p-megamenu-root-list > .p-menuitem > .p-menuitem-link {
+  padding: 1rem;
+  color: rgba(0, 0, 0, 0.5);
+  border-radius: 4px;
+  transition: box-shadow 0.15s;
+  user-select: none;
+}
+.p-megamenu .p-megamenu-root-list > .p-menuitem > .p-menuitem-link .p-menuitem-text {
+  color: rgba(0, 0, 0, 0.5);
+}
+.p-megamenu .p-megamenu-root-list > .p-menuitem > .p-menuitem-link .p-menuitem-icon {
+  color: rgba(0, 0, 0, 0.5);
+  margin-right: 0.5rem;
+}
+.p-megamenu .p-megamenu-root-list > .p-menuitem > .p-menuitem-link .p-submenu-icon {
+  color: rgba(0, 0, 0, 0.5);
+  margin-left: 0.5rem;
+}
+.p-megamenu .p-megamenu-root-list > .p-menuitem > .p-menuitem-link:not(.p-disabled):hover {
+  background: transparent;
+}
+.p-megamenu .p-megamenu-root-list > .p-menuitem > .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text {
+  color: rgba(0, 0, 0, 0.7);
+}
+.p-megamenu .p-megamenu-root-list > .p-menuitem > .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon {
+  color: rgba(0, 0, 0, 0.7);
+}
+.p-megamenu .p-megamenu-root-list > .p-menuitem > .p-menuitem-link:not(.p-disabled):hover .p-submenu-icon {
+  color: rgba(0, 0, 0, 0.7);
+}
+.p-megamenu .p-megamenu-root-list > .p-menuitem > .p-menuitem-link:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: inset 0 0 0 0.15rem rgba(38, 143, 255, 0.5);
+}
+.p-megamenu .p-megamenu-root-list > .p-menuitem.p-menuitem-active > .p-menuitem-link,
+.p-megamenu .p-megamenu-root-list > .p-menuitem.p-menuitem-active > .p-menuitem-link:not(.p-disabled):hover {
+  background: transparent;
+}
+.p-megamenu .p-megamenu-root-list > .p-menuitem.p-menuitem-active > .p-menuitem-link .p-menuitem-text,
+.p-megamenu .p-megamenu-root-list > .p-menuitem.p-menuitem-active > .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text {
+  color: rgba(0, 0, 0, 0.9);
+}
+.p-megamenu .p-megamenu-root-list > .p-menuitem.p-menuitem-active > .p-menuitem-link .p-menuitem-icon,
+.p-megamenu .p-megamenu-root-list > .p-menuitem.p-menuitem-active > .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon {
+  color: rgba(0, 0, 0, 0.9);
+}
+.p-megamenu .p-megamenu-root-list > .p-menuitem.p-menuitem-active > .p-menuitem-link .p-submenu-icon,
+.p-megamenu .p-megamenu-root-list > .p-menuitem.p-menuitem-active > .p-menuitem-link:not(.p-disabled):hover .p-submenu-icon {
+  color: rgba(0, 0, 0, 0.9);
+}
+.p-megamenu .p-menuitem-link {
+  padding: 0.75rem 1rem;
+  color: #212529;
+  border-radius: 0;
+  transition: box-shadow 0.15s;
+  user-select: none;
+}
+.p-megamenu .p-menuitem-link .p-menuitem-text {
+  color: #212529;
+}
+.p-megamenu .p-menuitem-link .p-menuitem-icon {
+  color: #212529;
+  margin-right: 0.5rem;
+}
+.p-megamenu .p-menuitem-link .p-submenu-icon {
+  color: #212529;
+}
+.p-megamenu .p-menuitem-link:not(.p-disabled):hover {
+  background: #e9ecef;
+}
+.p-megamenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text {
+  color: #212529;
+}
+.p-megamenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon {
+  color: #212529;
+}
+.p-megamenu .p-menuitem-link:not(.p-disabled):hover .p-submenu-icon {
+  color: #212529;
+}
+.p-megamenu .p-menuitem-link:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: inset 0 0 0 0.15rem rgba(38, 143, 255, 0.5);
+}
+.p-megamenu .p-megamenu-panel {
+  background: #ffffff;
+  color: #212529;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  box-shadow: none;
+}
+.p-megamenu .p-megamenu-submenu-header {
+  margin: 0;
+  padding: 0.75rem 1rem;
+  color: #212529;
+  background: #ffffff;
+  font-weight: 600;
+  border-top-right-radius: 4px;
+  border-top-left-radius: 4px;
+}
+.p-megamenu .p-megamenu-submenu {
+  padding: 0.5rem 0;
+  width: 12.5rem;
+}
+.p-megamenu .p-megamenu-submenu .p-menu-separator {
+  border-top: 1px solid #dee2e6;
+  margin: 0.5rem 0;
+}
+.p-megamenu .p-menuitem.p-menuitem-active > .p-menuitem-link {
+  background: #e9ecef;
+}
+.p-megamenu .p-menuitem.p-menuitem-active > .p-menuitem-link .p-menuitem-text {
+  color: #212529;
+}
+.p-megamenu .p-menuitem.p-menuitem-active > .p-menuitem-link .p-menuitem-icon, .p-megamenu .p-menuitem.p-menuitem-active > .p-menuitem-link .p-submenu-icon {
+  color: #212529;
+}
+.p-megamenu.p-megamenu-vertical {
+  width: 12.5rem;
+  padding: 0.5rem 0;
+}
+
+.p-menu {
+  padding: 0.5rem 0;
+  background: #ffffff;
+  color: #212529;
+  border: 1px solid #dee2e6;
+  border-radius: 4px;
+  width: 12.5rem;
+}
+.p-menu .p-menuitem-link {
+  padding: 0.75rem 1rem;
+  color: #212529;
+  border-radius: 0;
+  transition: box-shadow 0.15s;
+  user-select: none;
+}
+.p-menu .p-menuitem-link .p-menuitem-text {
+  color: #212529;
+}
+.p-menu .p-menuitem-link .p-menuitem-icon {
+  color: #212529;
+  margin-right: 0.5rem;
+}
+.p-menu .p-menuitem-link .p-submenu-icon {
+  color: #212529;
+}
+.p-menu .p-menuitem-link:not(.p-disabled):hover {
+  background: #e9ecef;
+}
+.p-menu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text {
+  color: #212529;
+}
+.p-menu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon {
+  color: #212529;
+}
+.p-menu .p-menuitem-link:not(.p-disabled):hover .p-submenu-icon {
+  color: #212529;
+}
+.p-menu .p-menuitem-link:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: inset 0 0 0 0.15rem rgba(38, 143, 255, 0.5);
+}
+.p-menu.p-menu-overlay {
+  background: #ffffff;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  box-shadow: none;
+}
+.p-menu .p-submenu-header {
+  margin: 0;
+  padding: 0.75rem 1rem;
+  color: #212529;
+  background: #ffffff;
+  font-weight: 600;
+  border-top-right-radius: 0;
+  border-top-left-radius: 0;
+}
+.p-menu .p-menu-separator {
+  border-top: 1px solid #dee2e6;
+  margin: 0.5rem 0;
+}
+
+.p-menubar {
+  padding: 0.5rem 1rem;
+  background: #efefef;
+  color: rgba(0, 0, 0, 0.9);
+  border: 0 none;
+  border-radius: 4px;
+}
+.p-menubar .p-menuitem-link {
+  padding: 0.75rem 1rem;
+  color: #212529;
+  border-radius: 0;
+  transition: box-shadow 0.15s;
+  user-select: none;
+}
+.p-menubar .p-menuitem-link .p-menuitem-text {
+  color: #212529;
+}
+.p-menubar .p-menuitem-link .p-menuitem-icon {
+  color: #212529;
+  margin-right: 0.5rem;
+}
+.p-menubar .p-menuitem-link .p-submenu-icon {
+  color: #212529;
+}
+.p-menubar .p-menuitem-link:not(.p-disabled):hover {
+  background: #e9ecef;
+}
+.p-menubar .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text {
+  color: #212529;
+}
+.p-menubar .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon {
+  color: #212529;
+}
+.p-menubar .p-menuitem-link:not(.p-disabled):hover .p-submenu-icon {
+  color: #212529;
+}
+.p-menubar .p-menuitem-link:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: inset 0 0 0 0.15rem rgba(38, 143, 255, 0.5);
+}
+.p-menubar .p-menubar-root-list > .p-menuitem > .p-menuitem-link {
+  padding: 1rem;
+  color: rgba(0, 0, 0, 0.5);
+  border-radius: 4px;
+  transition: box-shadow 0.15s;
+  user-select: none;
+}
+.p-menubar .p-menubar-root-list > .p-menuitem > .p-menuitem-link .p-menuitem-text {
+  color: rgba(0, 0, 0, 0.5);
+}
+.p-menubar .p-menubar-root-list > .p-menuitem > .p-menuitem-link .p-menuitem-icon {
+  color: rgba(0, 0, 0, 0.5);
+  margin-right: 0.5rem;
+}
+.p-menubar .p-menubar-root-list > .p-menuitem > .p-menuitem-link .p-submenu-icon {
+  color: rgba(0, 0, 0, 0.5);
+  margin-left: 0.5rem;
+}
+.p-menubar .p-menubar-root-list > .p-menuitem > .p-menuitem-link:not(.p-disabled):hover {
+  background: transparent;
+}
+.p-menubar .p-menubar-root-list > .p-menuitem > .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text {
+  color: rgba(0, 0, 0, 0.7);
+}
+.p-menubar .p-menubar-root-list > .p-menuitem > .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon {
+  color: rgba(0, 0, 0, 0.7);
+}
+.p-menubar .p-menubar-root-list > .p-menuitem > .p-menuitem-link:not(.p-disabled):hover .p-submenu-icon {
+  color: rgba(0, 0, 0, 0.7);
+}
+.p-menubar .p-menubar-root-list > .p-menuitem > .p-menuitem-link:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: inset 0 0 0 0.15rem rgba(38, 143, 255, 0.5);
+}
+.p-menubar .p-menubar-root-list > .p-menuitem.p-menuitem-active > .p-menuitem-link,
+.p-menubar .p-menubar-root-list > .p-menuitem.p-menuitem-active > .p-menuitem-link:not(.p-disabled):hover {
+  background: transparent;
+}
+.p-menubar .p-menubar-root-list > .p-menuitem.p-menuitem-active > .p-menuitem-link .p-menuitem-text,
+.p-menubar .p-menubar-root-list > .p-menuitem.p-menuitem-active > .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text {
+  color: rgba(0, 0, 0, 0.9);
+}
+.p-menubar .p-menubar-root-list > .p-menuitem.p-menuitem-active > .p-menuitem-link .p-menuitem-icon,
+.p-menubar .p-menubar-root-list > .p-menuitem.p-menuitem-active > .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon {
+  color: rgba(0, 0, 0, 0.9);
+}
+.p-menubar .p-menubar-root-list > .p-menuitem.p-menuitem-active > .p-menuitem-link .p-submenu-icon,
+.p-menubar .p-menubar-root-list > .p-menuitem.p-menuitem-active > .p-menuitem-link:not(.p-disabled):hover .p-submenu-icon {
+  color: rgba(0, 0, 0, 0.9);
+}
+.p-menubar .p-submenu-list {
+  padding: 0.5rem 0;
+  background: #ffffff;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  box-shadow: none;
+  width: 12.5rem;
+}
+.p-menubar .p-submenu-list .p-menu-separator {
+  border-top: 1px solid #dee2e6;
+  margin: 0.5rem 0;
+}
+.p-menubar .p-submenu-list .p-submenu-icon {
+  font-size: 0.875rem;
+}
+.p-menubar .p-menuitem.p-menuitem-active > .p-menuitem-link {
+  background: #e9ecef;
+}
+.p-menubar .p-menuitem.p-menuitem-active > .p-menuitem-link .p-menuitem-text {
+  color: #212529;
+}
+.p-menubar .p-menuitem.p-menuitem-active > .p-menuitem-link .p-menuitem-icon, .p-menubar .p-menuitem.p-menuitem-active > .p-menuitem-link .p-submenu-icon {
+  color: #212529;
+}
+
+@media screen and (max-width: 960px) {
+  .p-menubar {
+    position: relative;
+  }
+  .p-menubar .p-menubar-button {
+    display: flex;
+    width: 2rem;
+    height: 2rem;
+    color: rgba(0, 0, 0, 0.5);
+    border-radius: 50%;
+    transition: box-shadow 0.15s;
+  }
+  .p-menubar .p-menubar-button:hover {
+    color: rgba(0, 0, 0, 0.7);
+    background: transparent;
+  }
+  .p-menubar .p-menubar-button:focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+  }
+  .p-menubar .p-menubar-root-list {
+    position: absolute;
+    display: none;
+    padding: 0.5rem 0;
+    background: #ffffff;
+    border: 1px solid rgba(0, 0, 0, 0.15);
+    box-shadow: none;
+    width: 100%;
+  }
+  .p-menubar .p-menubar-root-list .p-menu-separator {
+    border-top: 1px solid #dee2e6;
+    margin: 0.5rem 0;
+  }
+  .p-menubar .p-menubar-root-list .p-submenu-icon {
+    font-size: 0.875rem;
+  }
+  .p-menubar .p-menubar-root-list > .p-menuitem {
+    width: 100%;
+    position: static;
+  }
+  .p-menubar .p-menubar-root-list > .p-menuitem > .p-menuitem-link {
+    padding: 0.75rem 1rem;
+    color: #212529;
+    border-radius: 0;
+    transition: box-shadow 0.15s;
+    user-select: none;
+  }
+  .p-menubar .p-menubar-root-list > .p-menuitem > .p-menuitem-link .p-menuitem-text {
+    color: #212529;
+  }
+  .p-menubar .p-menubar-root-list > .p-menuitem > .p-menuitem-link .p-menuitem-icon {
+    color: #212529;
+    margin-right: 0.5rem;
+  }
+  .p-menubar .p-menubar-root-list > .p-menuitem > .p-menuitem-link .p-submenu-icon {
+    color: #212529;
+  }
+  .p-menubar .p-menubar-root-list > .p-menuitem > .p-menuitem-link:not(.p-disabled):hover {
+    background: #e9ecef;
+  }
+  .p-menubar .p-menubar-root-list > .p-menuitem > .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text {
+    color: #212529;
+  }
+  .p-menubar .p-menubar-root-list > .p-menuitem > .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon {
+    color: #212529;
+  }
+  .p-menubar .p-menubar-root-list > .p-menuitem > .p-menuitem-link:not(.p-disabled):hover .p-submenu-icon {
+    color: #212529;
+  }
+  .p-menubar .p-menubar-root-list > .p-menuitem > .p-menuitem-link:focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: inset 0 0 0 0.15rem rgba(38, 143, 255, 0.5);
+  }
+  .p-menubar .p-menubar-root-list > .p-menuitem > .p-menuitem-link > .p-submenu-icon {
+    margin-left: auto;
+    transition: transform 0.15s;
+  }
+  .p-menubar .p-menubar-root-list > .p-menuitem.p-menuitem-active > .p-menuitem-link > .p-submenu-icon {
+    transform: rotate(-180deg);
+  }
+  .p-menubar .p-menubar-root-list .p-submenu-list {
+    width: 100%;
+    position: static;
+    box-shadow: none;
+    border: 0 none;
+  }
+  .p-menubar .p-menubar-root-list .p-submenu-list .p-submenu-icon {
+    transition: transform 0.15s;
+    transform: rotate(90deg);
+  }
+  .p-menubar .p-menubar-root-list .p-submenu-list .p-menuitem-active > .p-menuitem-link > .p-submenu-icon {
+    transform: rotate(-90deg);
+  }
+  .p-menubar .p-menubar-root-list .p-menuitem {
+    width: 100%;
+    position: static;
+  }
+  .p-menubar .p-menubar-root-list ul li a {
+    padding-left: 2.25rem;
+  }
+  .p-menubar .p-menubar-root-list ul li ul li a {
+    padding-left: 3.75rem;
+  }
+  .p-menubar .p-menubar-root-list ul li ul li ul li a {
+    padding-left: 5.25rem;
+  }
+  .p-menubar .p-menubar-root-list ul li ul li ul li ul li a {
+    padding-left: 6.75rem;
+  }
+  .p-menubar .p-menubar-root-list ul li ul li ul li ul li ul li a {
+    padding-left: 8.25rem;
+  }
+  .p-menubar.p-menubar-mobile-active .p-menubar-root-list {
+    display: flex;
+    flex-direction: column;
+    top: 100%;
+    left: 0;
+    z-index: 1;
+  }
+}
+.p-panelmenu .p-panelmenu-header > a {
+  padding: 1rem 1.25rem;
+  border: 1px solid #dee2e6;
+  color: #212529;
+  background: #efefef;
+  font-weight: 600;
+  border-radius: 4px;
+  transition: box-shadow 0.15s;
+}
+.p-panelmenu .p-panelmenu-header > a .p-panelmenu-icon {
+  margin-right: 0.5rem;
+}
+.p-panelmenu .p-panelmenu-header > a .p-menuitem-icon {
+  margin-right: 0.5rem;
+}
+.p-panelmenu .p-panelmenu-header > a:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+}
+.p-panelmenu .p-panelmenu-header:not(.p-highlight):not(.p-disabled) > a:hover {
+  background: #e9ecef;
+  border-color: #dee2e6;
+  color: #212529;
+}
+.p-panelmenu .p-panelmenu-header.p-highlight {
+  margin-bottom: 0;
+}
+.p-panelmenu .p-panelmenu-header.p-highlight > a {
+  background: #efefef;
+  border-color: #dee2e6;
+  color: #212529;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 0;
+}
+.p-panelmenu .p-panelmenu-header.p-highlight:not(.p-disabled) > a:hover {
+  border-color: #dee2e6;
+  background: #e9ecef;
+  color: #212529;
+}
+.p-panelmenu .p-panelmenu-content {
+  padding: 0.5rem 0;
+  border: 1px solid #dee2e6;
+  background: #ffffff;
+  color: #212529;
+  border-top: 0;
+  border-top-right-radius: 0;
+  border-top-left-radius: 0;
+  border-bottom-right-radius: 4px;
+  border-bottom-left-radius: 4px;
+}
+.p-panelmenu .p-panelmenu-content .p-menuitem .p-menuitem-link {
+  padding: 0.75rem 1rem;
+  color: #212529;
+  border-radius: 0;
+  transition: box-shadow 0.15s;
+  user-select: none;
+}
+.p-panelmenu .p-panelmenu-content .p-menuitem .p-menuitem-link .p-menuitem-text {
+  color: #212529;
+}
+.p-panelmenu .p-panelmenu-content .p-menuitem .p-menuitem-link .p-menuitem-icon {
+  color: #212529;
+  margin-right: 0.5rem;
+}
+.p-panelmenu .p-panelmenu-content .p-menuitem .p-menuitem-link .p-submenu-icon {
+  color: #212529;
+}
+.p-panelmenu .p-panelmenu-content .p-menuitem .p-menuitem-link:not(.p-disabled):hover {
+  background: #e9ecef;
+}
+.p-panelmenu .p-panelmenu-content .p-menuitem .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text {
+  color: #212529;
+}
+.p-panelmenu .p-panelmenu-content .p-menuitem .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon {
+  color: #212529;
+}
+.p-panelmenu .p-panelmenu-content .p-menuitem .p-menuitem-link:not(.p-disabled):hover .p-submenu-icon {
+  color: #212529;
+}
+.p-panelmenu .p-panelmenu-content .p-menuitem .p-menuitem-link:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: inset 0 0 0 0.15rem rgba(38, 143, 255, 0.5);
+}
+.p-panelmenu .p-panelmenu-content .p-menuitem .p-menuitem-link .p-panelmenu-icon {
+  margin-right: 0.5rem;
+}
+.p-panelmenu .p-panelmenu-content .p-submenu-list:not(.p-panelmenu-root-submenu) {
+  padding: 0 0 0 1rem;
+}
+.p-panelmenu .p-panelmenu-panel {
+  margin-bottom: 0;
+}
+.p-panelmenu .p-panelmenu-panel .p-panelmenu-header > a {
+  border-radius: 0;
+}
+.p-panelmenu .p-panelmenu-panel .p-panelmenu-content {
+  border-radius: 0;
+}
+.p-panelmenu .p-panelmenu-panel:not(:first-child) .p-panelmenu-header > a {
+  border-top: 0 none;
+}
+.p-panelmenu .p-panelmenu-panel:not(:first-child) .p-panelmenu-header:not(.p-highlight):not(.p-disabled):hover > a, .p-panelmenu .p-panelmenu-panel:not(:first-child) .p-panelmenu-header:not(.p-disabled).p-highlight:hover > a {
+  border-top: 0 none;
+}
+.p-panelmenu .p-panelmenu-panel:first-child .p-panelmenu-header > a {
+  border-top-right-radius: 4px;
+  border-top-left-radius: 4px;
+}
+.p-panelmenu .p-panelmenu-panel:last-child .p-panelmenu-header:not(.p-highlight) > a {
+  border-bottom-right-radius: 4px;
+  border-bottom-left-radius: 4px;
+}
+.p-panelmenu .p-panelmenu-panel:last-child .p-panelmenu-content {
+  border-bottom-right-radius: 4px;
+  border-bottom-left-radius: 4px;
+}
+
+.p-steps .p-steps-item .p-menuitem-link {
+  background: transparent;
+  transition: box-shadow 0.15s;
+  border-radius: 4px;
+  background: transparent;
+}
+.p-steps .p-steps-item .p-menuitem-link .p-steps-number {
+  color: #212529;
+  border: 1px solid #dee2e6;
+  background: transparent;
+  min-width: 2rem;
+  height: 2rem;
+  line-height: 2rem;
+  font-size: 1.143rem;
+  z-index: 1;
+  border-radius: 4px;
+}
+.p-steps .p-steps-item .p-menuitem-link .p-steps-title {
+  margin-top: 0.5rem;
+  color: #6c757d;
+}
+.p-steps .p-steps-item .p-menuitem-link:not(.p-disabled):focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+}
+.p-steps .p-steps-item.p-highlight .p-steps-number {
+  background: #007bff;
+  color: #ffffff;
+}
+.p-steps .p-steps-item.p-highlight .p-steps-title {
+  font-weight: 600;
+  color: #212529;
+}
+.p-steps .p-steps-item:before {
+  content: " ";
+  border-top: 1px solid #dee2e6;
+  width: 100%;
+  top: 50%;
+  left: 0;
+  display: block;
+  position: absolute;
+  margin-top: -1rem;
+}
+
+.p-tabmenu .p-tabmenu-nav {
+  background: transparent;
+  border: 1px solid #dee2e6;
+  border-width: 0 0 1px 0;
+}
+.p-tabmenu .p-tabmenu-nav .p-tabmenuitem {
+  margin-right: 0;
+}
+.p-tabmenu .p-tabmenu-nav .p-tabmenuitem .p-menuitem-link {
+  border: solid;
+  border-width: 1px;
+  border-color: #ffffff #ffffff #dee2e6 #ffffff;
+  background: #ffffff;
+  color: #6c757d;
+  padding: 0.75rem 1rem;
+  font-weight: 600;
+  border-top-right-radius: 4px;
+  border-top-left-radius: 4px;
+  transition: box-shadow 0.15s;
+  margin: 0 0 -1px 0;
+}
+.p-tabmenu .p-tabmenu-nav .p-tabmenuitem .p-menuitem-link .p-menuitem-icon {
+  margin-right: 0.5rem;
+}
+.p-tabmenu .p-tabmenu-nav .p-tabmenuitem .p-menuitem-link:not(.p-disabled):focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: inset 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+}
+.p-tabmenu .p-tabmenu-nav .p-tabmenuitem:not(.p-highlight):not(.p-disabled):hover .p-menuitem-link {
+  background: #ffffff;
+  border-color: #dee2e6;
+  color: #6c757d;
+}
+.p-tabmenu .p-tabmenu-nav .p-tabmenuitem.p-highlight .p-menuitem-link {
+  background: #ffffff;
+  border-color: #dee2e6 #dee2e6 #ffffff #dee2e6;
+  color: #495057;
+}
+
+.p-tieredmenu {
+  padding: 0.5rem 0;
+  background: #ffffff;
+  color: #212529;
+  border: 1px solid #dee2e6;
+  border-radius: 4px;
+  width: 12.5rem;
+}
+.p-tieredmenu .p-menuitem-link {
+  padding: 0.75rem 1rem;
+  color: #212529;
+  border-radius: 0;
+  transition: box-shadow 0.15s;
+  user-select: none;
+}
+.p-tieredmenu .p-menuitem-link .p-menuitem-text {
+  color: #212529;
+}
+.p-tieredmenu .p-menuitem-link .p-menuitem-icon {
+  color: #212529;
+  margin-right: 0.5rem;
+}
+.p-tieredmenu .p-menuitem-link .p-submenu-icon {
+  color: #212529;
+}
+.p-tieredmenu .p-menuitem-link:not(.p-disabled):hover {
+  background: #e9ecef;
+}
+.p-tieredmenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text {
+  color: #212529;
+}
+.p-tieredmenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon {
+  color: #212529;
+}
+.p-tieredmenu .p-menuitem-link:not(.p-disabled):hover .p-submenu-icon {
+  color: #212529;
+}
+.p-tieredmenu .p-menuitem-link:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: inset 0 0 0 0.15rem rgba(38, 143, 255, 0.5);
+}
+.p-tieredmenu.p-tieredmenu-overlay {
+  background: #ffffff;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  box-shadow: none;
+}
+.p-tieredmenu .p-submenu-list {
+  padding: 0.5rem 0;
+  background: #ffffff;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  box-shadow: none;
+}
+.p-tieredmenu .p-menuitem.p-menuitem-active > .p-menuitem-link {
+  background: #e9ecef;
+}
+.p-tieredmenu .p-menuitem.p-menuitem-active > .p-menuitem-link .p-menuitem-text {
+  color: #212529;
+}
+.p-tieredmenu .p-menuitem.p-menuitem-active > .p-menuitem-link .p-menuitem-icon, .p-tieredmenu .p-menuitem.p-menuitem-active > .p-menuitem-link .p-submenu-icon {
+  color: #212529;
+}
+.p-tieredmenu .p-menu-separator {
+  border-top: 1px solid #dee2e6;
+  margin: 0.5rem 0;
+}
+.p-tieredmenu .p-submenu-icon {
+  font-size: 0.875rem;
+}
+
+.p-inline-message {
+  padding: 0.5rem 0.75rem;
+  margin: 0;
+  border-radius: 4px;
+}
+.p-inline-message.p-inline-message-info {
+  background: #cce5ff;
+  border: solid #b8daff;
+  border-width: 0px;
+  color: #004085;
+}
+.p-inline-message.p-inline-message-info .p-inline-message-icon {
+  color: #004085;
+}
+.p-inline-message.p-inline-message-success {
+  background: #d4edda;
+  border: solid #c3e6cb;
+  border-width: 0px;
+  color: #155724;
+}
+.p-inline-message.p-inline-message-success .p-inline-message-icon {
+  color: #155724;
+}
+.p-inline-message.p-inline-message-warn {
+  background: #fff3cd;
+  border: solid #ffeeba;
+  border-width: 0px;
+  color: #856404;
+}
+.p-inline-message.p-inline-message-warn .p-inline-message-icon {
+  color: #856404;
+}
+.p-inline-message.p-inline-message-error {
+  background: #f8d7da;
+  border: solid #f5c6cb;
+  border-width: 0px;
+  color: #721c24;
+}
+.p-inline-message.p-inline-message-error .p-inline-message-icon {
+  color: #721c24;
+}
+.p-inline-message .p-inline-message-icon {
+  font-size: 1rem;
+  margin-right: 0.5rem;
+}
+.p-inline-message .p-inline-message-text {
+  font-size: 1rem;
+}
+.p-inline-message.p-inline-message-icon-only .p-inline-message-icon {
+  margin-right: 0;
+}
+
+.p-message {
+  margin: 1rem 0;
+  border-radius: 4px;
+}
+.p-message .p-message-wrapper {
+  padding: 1rem 1.25rem;
+}
+.p-message .p-message-close {
+  width: 2rem;
+  height: 2rem;
+  border-radius: 50%;
+  background: transparent;
+  transition: box-shadow 0.15s;
+}
+.p-message .p-message-close:hover {
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-message .p-message-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+}
+.p-message.p-message-info {
+  background: #cce5ff;
+  border: solid #b8daff;
+  border-width: 1px;
+  color: #004085;
+}
+.p-message.p-message-info .p-message-icon {
+  color: #004085;
+}
+.p-message.p-message-info .p-message-close {
+  color: #004085;
+}
+.p-message.p-message-success {
+  background: #d4edda;
+  border: solid #c3e6cb;
+  border-width: 1px;
+  color: #155724;
+}
+.p-message.p-message-success .p-message-icon {
+  color: #155724;
+}
+.p-message.p-message-success .p-message-close {
+  color: #155724;
+}
+.p-message.p-message-warn {
+  background: #fff3cd;
+  border: solid #ffeeba;
+  border-width: 1px;
+  color: #856404;
+}
+.p-message.p-message-warn .p-message-icon {
+  color: #856404;
+}
+.p-message.p-message-warn .p-message-close {
+  color: #856404;
+}
+.p-message.p-message-error {
+  background: #f8d7da;
+  border: solid #f5c6cb;
+  border-width: 1px;
+  color: #721c24;
+}
+.p-message.p-message-error .p-message-icon {
+  color: #721c24;
+}
+.p-message.p-message-error .p-message-close {
+  color: #721c24;
+}
+.p-message .p-message-text {
+  font-size: 1rem;
+  font-weight: 500;
+}
+.p-message .p-message-icon {
+  font-size: 1.5rem;
+  margin-right: 0.5rem;
+}
+
+.p-toast {
+  opacity: 1;
+}
+.p-toast .p-toast-message {
+  margin: 0 0 1rem 0;
+  box-shadow: 0 0.25rem 0.75rem rgba(0, 0, 0, 0.1);
+  border-radius: 4px;
+}
+.p-toast .p-toast-message .p-toast-message-content {
+  padding: 1rem;
+  border-width: 0;
+}
+.p-toast .p-toast-message .p-toast-message-content .p-toast-message-text {
+  margin: 0 0 0 1rem;
+}
+.p-toast .p-toast-message .p-toast-message-content .p-toast-message-icon {
+  font-size: 2rem;
+}
+.p-toast .p-toast-message .p-toast-message-content .p-toast-summary {
+  font-weight: 700;
+}
+.p-toast .p-toast-message .p-toast-message-content .p-toast-detail {
+  margin: 0.5rem 0 0 0;
+}
+.p-toast .p-toast-message .p-toast-icon-close {
+  width: 2rem;
+  height: 2rem;
+  border-radius: 50%;
+  background: transparent;
+  transition: box-shadow 0.15s;
+}
+.p-toast .p-toast-message .p-toast-icon-close:hover {
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-toast .p-toast-message .p-toast-icon-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+}
+.p-toast .p-toast-message.p-toast-message-info {
+  background: #cce5ff;
+  border: solid #b8daff;
+  border-width: 1px;
+  color: #004085;
+}
+.p-toast .p-toast-message.p-toast-message-info .p-toast-message-icon,
+.p-toast .p-toast-message.p-toast-message-info .p-toast-icon-close {
+  color: #004085;
+}
+.p-toast .p-toast-message.p-toast-message-success {
+  background: #d4edda;
+  border: solid #c3e6cb;
+  border-width: 1px;
+  color: #155724;
+}
+.p-toast .p-toast-message.p-toast-message-success .p-toast-message-icon,
+.p-toast .p-toast-message.p-toast-message-success .p-toast-icon-close {
+  color: #155724;
+}
+.p-toast .p-toast-message.p-toast-message-warn {
+  background: #fff3cd;
+  border: solid #ffeeba;
+  border-width: 1px;
+  color: #856404;
+}
+.p-toast .p-toast-message.p-toast-message-warn .p-toast-message-icon,
+.p-toast .p-toast-message.p-toast-message-warn .p-toast-icon-close {
+  color: #856404;
+}
+.p-toast .p-toast-message.p-toast-message-error {
+  background: #f8d7da;
+  border: solid #f5c6cb;
+  border-width: 1px;
+  color: #721c24;
+}
+.p-toast .p-toast-message.p-toast-message-error .p-toast-message-icon,
+.p-toast .p-toast-message.p-toast-message-error .p-toast-icon-close {
+  color: #721c24;
+}
+
+.p-galleria .p-galleria-close {
+  margin: 0.5rem;
+  background: transparent;
+  color: #efefef;
+  width: 4rem;
+  height: 4rem;
+  transition: box-shadow 0.15s;
+  border-radius: 4px;
+}
+.p-galleria .p-galleria-close .p-galleria-close-icon {
+  font-size: 2rem;
+}
+.p-galleria .p-galleria-close:hover {
+  background: rgba(255, 255, 255, 0.1);
+  color: #efefef;
+}
+.p-galleria .p-galleria-item-nav {
+  background: transparent;
+  color: #efefef;
+  width: 4rem;
+  height: 4rem;
+  transition: box-shadow 0.15s;
+  border-radius: 4px;
+  margin: 0 0.5rem;
+}
+.p-galleria .p-galleria-item-nav .p-galleria-item-prev-icon,
+.p-galleria .p-galleria-item-nav .p-galleria-item-next-icon {
+  font-size: 2rem;
+}
+.p-galleria .p-galleria-item-nav:not(.p-disabled):hover {
+  background: rgba(255, 255, 255, 0.1);
+  color: #efefef;
+}
+.p-galleria .p-galleria-caption {
+  background: rgba(0, 0, 0, 0.5);
+  color: #efefef;
+  padding: 1rem;
+}
+.p-galleria .p-galleria-indicators {
+  padding: 1rem;
+}
+.p-galleria .p-galleria-indicators .p-galleria-indicator button {
+  background-color: #e9ecef;
+  width: 1rem;
+  height: 1rem;
+  transition: box-shadow 0.15s;
+  border-radius: 4px;
+}
+.p-galleria .p-galleria-indicators .p-galleria-indicator button:hover {
+  background: #dee2e6;
+}
+.p-galleria .p-galleria-indicators .p-galleria-indicator.p-highlight button {
+  background: #007bff;
+  color: #ffffff;
+}
+.p-galleria.p-galleria-indicators-bottom .p-galleria-indicator, .p-galleria.p-galleria-indicators-top .p-galleria-indicator {
+  margin-right: 0.5rem;
+}
+.p-galleria.p-galleria-indicators-left .p-galleria-indicator, .p-galleria.p-galleria-indicators-right .p-galleria-indicator {
+  margin-bottom: 0.5rem;
+}
+.p-galleria.p-galleria-indicator-onitem .p-galleria-indicators {
+  background: rgba(0, 0, 0, 0.5);
+}
+.p-galleria.p-galleria-indicator-onitem .p-galleria-indicators .p-galleria-indicator button {
+  background: rgba(255, 255, 255, 0.4);
+}
+.p-galleria.p-galleria-indicator-onitem .p-galleria-indicators .p-galleria-indicator button:hover {
+  background: rgba(255, 255, 255, 0.6);
+}
+.p-galleria.p-galleria-indicator-onitem .p-galleria-indicators .p-galleria-indicator.p-highlight button {
+  background: #007bff;
+  color: #ffffff;
+}
+.p-galleria .p-galleria-thumbnail-container {
+  background: rgba(0, 0, 0, 0.9);
+  padding: 1rem 0.25rem;
+}
+.p-galleria .p-galleria-thumbnail-container .p-galleria-thumbnail-prev,
+.p-galleria .p-galleria-thumbnail-container .p-galleria-thumbnail-next {
+  margin: 0.5rem;
+  background-color: transparent;
+  color: #efefef;
+  width: 2rem;
+  height: 2rem;
+  transition: box-shadow 0.15s;
+  border-radius: 4px;
+}
+.p-galleria .p-galleria-thumbnail-container .p-galleria-thumbnail-prev:hover,
+.p-galleria .p-galleria-thumbnail-container .p-galleria-thumbnail-next:hover {
+  background: rgba(255, 255, 255, 0.1);
+  color: #efefef;
+}
+.p-galleria .p-galleria-thumbnail-container .p-galleria-thumbnail-item-content:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+}
+
+.p-galleria-mask {
+  --maskbg: rgba(0, 0, 0, 0.9);
+}
+
+.p-image-mask {
+  --maskbg: rgba(0, 0, 0, 0.9);
+}
+
+.p-image-preview-indicator {
+  background-color: transparent;
+  color: #f8f9fa;
+  transition: box-shadow 0.15s;
+}
+
+.p-image-preview-container:hover > .p-image-preview-indicator {
+  background-color: rgba(0, 0, 0, 0.5);
+}
+
+.p-image-toolbar {
+  padding: 1rem;
+}
+
+.p-image-action.p-link {
+  color: #f8f9fa;
+  background-color: transparent;
+  width: 3rem;
+  height: 3rem;
+  border-radius: 50%;
+  transition: box-shadow 0.15s;
+  margin-right: 0.5rem;
+}
+.p-image-action.p-link:last-child {
+  margin-right: 0;
+}
+.p-image-action.p-link:hover {
+  color: #f8f9fa;
+  background-color: rgba(255, 255, 255, 0.1);
+}
+.p-image-action.p-link i {
+  font-size: 1.5rem;
+}
+
+.p-avatar {
+  background-color: #dee2e6;
+  border-radius: 4px;
+}
+.p-avatar.p-avatar-lg {
+  width: 3rem;
+  height: 3rem;
+  font-size: 1.5rem;
+}
+.p-avatar.p-avatar-lg .p-avatar-icon {
+  font-size: 1.5rem;
+}
+.p-avatar.p-avatar-xl {
+  width: 4rem;
+  height: 4rem;
+  font-size: 2rem;
+}
+.p-avatar.p-avatar-xl .p-avatar-icon {
+  font-size: 2rem;
+}
+
+.p-avatar-group .p-avatar {
+  border: 2px solid #ffffff;
+}
+
+.p-badge {
+  background: #007bff;
+  color: #ffffff;
+  font-size: 0.75rem;
+  font-weight: 700;
+  min-width: 1.5rem;
+  height: 1.5rem;
+  line-height: 1.5rem;
+}
+.p-badge.p-badge-secondary {
+  background-color: #6c757d;
+  color: #ffffff;
+}
+.p-badge.p-badge-success {
+  background-color: #28a745;
+  color: #ffffff;
+}
+.p-badge.p-badge-info {
+  background-color: #17a2b8;
+  color: #ffffff;
+}
+.p-badge.p-badge-warning {
+  background-color: #ffc107;
+  color: #212529;
+}
+.p-badge.p-badge-danger {
+  background-color: #dc3545;
+  color: #ffffff;
+}
+.p-badge.p-badge-lg {
+  font-size: 1.125rem;
+  min-width: 2.25rem;
+  height: 2.25rem;
+  line-height: 2.25rem;
+}
+.p-badge.p-badge-xl {
+  font-size: 1.5rem;
+  min-width: 3rem;
+  height: 3rem;
+  line-height: 3rem;
+}
+
+.p-chip {
+  background-color: #dee2e6;
+  color: #212529;
+  border-radius: 16px;
+  padding: 0 0.75rem;
+}
+.p-chip .p-chip-text {
+  line-height: 1.5;
+  margin-top: 0.25rem;
+  margin-bottom: 0.25rem;
+}
+.p-chip .p-chip-icon {
+  margin-right: 0.5rem;
+}
+.p-chip img {
+  width: 2rem;
+  height: 2rem;
+  margin-left: -0.75rem;
+  margin-right: 0.5rem;
+}
+.p-chip .p-chip-remove-icon {
+  margin-left: 0.5rem;
+  border-radius: 4px;
+  transition: box-shadow 0.15s;
+}
+.p-chip .p-chip-remove-icon:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+}
+
+.p-inplace .p-inplace-display {
+  padding: 0.5rem 0.75rem;
+  border-radius: 4px;
+  transition: background-color 0.15s, border-color 0.15s, box-shadow 0.15s;
+}
+.p-inplace .p-inplace-display:not(.p-disabled):hover {
+  background: #e9ecef;
+  color: #212529;
+}
+.p-inplace .p-inplace-display:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+}
+
+.p-progressbar {
+  border: 0 none;
+  height: 1.5rem;
+  background: #e9ecef;
+  border-radius: 4px;
+}
+.p-progressbar .p-progressbar-value {
+  border: 0 none;
+  margin: 0;
+  background: #007bff;
+}
+.p-progressbar .p-progressbar-label {
+  color: #ffffff;
+  line-height: 1.5rem;
+}
+
+.p-scrolltop {
+  width: 3rem;
+  height: 3rem;
+  border-radius: 4px;
+  box-shadow: none;
+  transition: box-shadow 0.15s;
+}
+.p-scrolltop.p-link {
+  background: rgba(0, 0, 0, 0.7);
+}
+.p-scrolltop.p-link:hover {
+  background: rgba(0, 0, 0, 0.8);
+}
+.p-scrolltop .p-scrolltop-icon {
+  font-size: 1.5rem;
+  color: #efefef;
+}
+
+.p-skeleton {
+  background-color: #e9ecef;
+  border-radius: 4px;
+}
+.p-skeleton:after {
+  background: linear-gradient(90deg, rgba(255, 255, 255, 0), rgba(255, 255, 255, 0.4), rgba(255, 255, 255, 0));
+}
+
+.p-tag {
+  background: #007bff;
+  color: #ffffff;
+  font-size: 0.75rem;
+  font-weight: 700;
+  padding: 0.25rem 0.4rem;
+  border-radius: 4px;
+}
+.p-tag.p-tag-success {
+  background-color: #28a745;
+  color: #ffffff;
+}
+.p-tag.p-tag-info {
+  background-color: #17a2b8;
+  color: #ffffff;
+}
+.p-tag.p-tag-warning {
+  background-color: #ffc107;
+  color: #212529;
+}
+.p-tag.p-tag-danger {
+  background-color: #dc3545;
+  color: #ffffff;
+}
+.p-tag .p-tag-icon {
+  margin-right: 0.25rem;
+  font-size: 0.75rem;
+}
+
+.p-terminal {
+  background: #ffffff;
+  color: #212529;
+  border: 1px solid #dee2e6;
+  padding: 1.25rem;
+}
+.p-terminal .p-terminal-input {
+  font-size: 1rem;
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+}
+
+/* Vendor extensions to the designer enhanced bootstrap compatibility */
+.p-breadcrumb .p-breadcrumb-chevron {
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+}
+.p-breadcrumb .p-breadcrumb-chevron:before {
+  content: "/";
+}
+
+.fc.fc-theme-standard .fc-highlight {
+  background: #cce5ff;
+}
+
+/* Customizations to the designer theme should be defined here */
diff --git a/public/css/components/vue-datepicker.css b/public/css/components/vue-datepicker.css
index 0dd87bb0c..ad8d2562c 100644
--- a/public/css/components/vue-datepicker.css
+++ b/public/css/components/vue-datepicker.css
@@ -1,2 +1,2 @@
-@import '../../../vendor/vuepic/vue-datepicker-css/main.css';
-
+.dp__input_wrap{position:relative;width:100%;box-sizing:unset}.dp__input_wrap:focus{border-color:var(--dp-border-color-hover);outline:none}.dp__input{background-color:var(--dp-background-color);border-radius:4px;font-family:-apple-system,blinkmacsystemfont,"Segoe UI",roboto,oxygen,ubuntu,cantarell,"Open Sans","Helvetica Neue",sans-serif;border:1px solid var(--dp-border-color);outline:none;transition:border-color .2s cubic-bezier(0.645, 0.045, 0.355, 1);width:100%;font-size:1rem;line-height:1.5rem;padding:6px 12px;color:var(--dp-text-color);box-sizing:border-box}.dp__input::placeholder{opacity:.7}.dp__input_reg{caret-color:rgba(0,0,0,0)}.dp__input_focus{border-color:var(--dp-border-color-hover)}.dp__disabled{background:var(--dp-disabled-color)}.dp__disabled::placeholder{color:var(--dp-disabled-color-text)}.dp__input_icons{display:inline-block;width:1rem;height:1rem;stroke-width:0;font-size:1rem;line-height:1.5rem;padding:6px 12px;color:var(--dp-icon-color);box-sizing:content-box}.dp__input_icon{cursor:pointer;position:absolute;top:50%;left:0;transform:translateY(-50%);color:var(--dp-icon-color)}.dp__clear_icon{position:absolute;top:50%;right:0;transform:translateY(-50%);cursor:pointer;color:var(--dp-icon-color)}.dp__input_icon_pad{padding-left:35px}.dp__input_valid{box-shadow:0 0 4px var(--dp-success-color);border-color:var(--dp-success-color)}.dp__input_valid:hover{border-color:var(--dp-success-color)}.dp__input_invalid{box-shadow:0 0 4px var(--dp-danger-color);border-color:var(--dp-danger-color)}.dp__input_invalid:hover{border-color:var(--dp-danger-color)}.dp__menu{position:fixed;background:var(--dp-background-color);border-radius:4px;min-width:260px;font-family:-apple-system,blinkmacsystemfont,"Segoe UI",roboto,oxygen,ubuntu,cantarell,"Open Sans","Helvetica Neue",sans-serif;font-size:1rem;user-select:none;border:1px solid var(--dp-menu-border-color);box-sizing:border-box}.dp__menu::after{box-sizing:border-box}.dp__menu::before{box-sizing:border-box}.dp__menu:focus{border:1px solid var(--dp-menu-border-color);outline:none}.dp__menu_index{z-index:99999}.dp__menu_readonly,.dp__menu_disabled{position:absolute;top:0;left:0;right:0;bottom:0;z-index:1}.dp__menu_disabled{background:rgba(255,255,255,.5);cursor:not-allowed}.dp__menu_readonly{background:rgba(0,0,0,0);cursor:default}.dp__arrow_top{left:50%;top:-1px;height:12px;width:12px;background-color:var(--dp-background-color);position:absolute;border-left:1px solid var(--dp-menu-border-color);border-top:1px solid var(--dp-menu-border-color);transform:translate(-50%, -50%) rotate(45deg)}.dp__arrow_bottom{left:50%;bottom:-1px;height:12px;width:12px;background-color:var(--dp-background-color);position:absolute;border-right:1px solid var(--dp-menu-border-color);border-bottom:1px solid var(--dp-menu-border-color);transform:translate(-50%, 50%) rotate(45deg)}.dp__now_wrap{text-align:center;padding:2px 0}.dp__now_button{border:1px solid var(--dp-primary-color);color:var(--dp-primary-color);padding:0 4px;font-weight:bold;border-radius:4px;font-size:1rem;cursor:pointer;background:rgba(0,0,0,0)}.dp__preset_ranges{padding:5px;border-right:1px solid var(--dp-border-color)}.dp__sidebar_left{padding:5px;border-right:1px solid var(--dp-border-color)}.dp__sidebar_right{padding:5px;border-left:1px solid var(--dp-border-color)}.dp__preset_range{padding:5px}.dp__preset_range:hover{background-color:var(--dp-hover-color);cursor:pointer}.dp__menu_content_wrapper{display:flex}.dp__calendar_wrap{display:flex;justify-content:center;align-items:center;flex-direction:column;font-family:-apple-system,blinkmacsystemfont,"Segoe UI",roboto,oxygen,ubuntu,cantarell,"Open Sans","Helvetica Neue",sans-serif;flex:0}.dp__calendar_header{position:relative;display:flex;justify-content:center;align-items:center;color:var(--dp-text-color);white-space:nowrap;font-weight:bold}.dp__calendar_header_item{text-align:center;flex-grow:1;height:35px;padding:5px;width:35px;box-sizing:border-box}.dp__calendar_row{display:flex;justify-content:center;align-items:center;margin:5px 0}.dp__calendar_item{text-align:center;flex-grow:1;box-sizing:border-box;color:var(--dp-text-color)}.dp__calendar{position:relative}.dp__calendar_header_cell{border-bottom:thin solid var(--dp-border-color);padding:.5rem}.dp__cell_inner{display:flex;align-items:center;text-align:center;justify-content:center;border-radius:4px;height:35px;padding:5px;width:35px;border:1px solid rgba(0,0,0,0);box-sizing:border-box;position:relative}.dp__cell_auto_range_start,.dp__date_hover_start:hover,.dp__range_start{border-bottom-right-radius:0;border-top-right-radius:0}.dp__cell_auto_range_end,.dp__date_hover_end:hover,.dp__range_end{border-bottom-left-radius:0;border-top-left-radius:0}.dp__range_end,.dp__range_start,.dp__active_date{background:var(--dp-primary-color);color:var(--dp-primary-text-color)}.dp__cell_auto_range_end,.dp__cell_auto_range_start{border-top:1px dashed var(--dp-primary-color);border-bottom:1px dashed var(--dp-primary-color)}.dp__date_hover_end:hover,.dp__date_hover_start:hover,.dp__date_hover:hover{background:var(--dp-hover-color);color:var(--dp-hover-text-color)}.dp__cell_offset{color:var(--dp-secondary-color)}.dp__cell_disabled{color:var(--dp-secondary-color);cursor:not-allowed}.dp__range_between{background:var(--dp-hover-color);border-radius:0;border-top:1px solid var(--dp-hover-color);border-bottom:1px solid var(--dp-hover-color)}.dp__range_between_week{background:var(--dp-primary-color);color:var(--dp-primary-text-color);border-radius:0;border-top:1px solid var(--dp-primary-color);border-bottom:1px solid var(--dp-primary-color)}.dp__today{border:1px solid var(--dp-primary-color)}.dp__week_num{color:var(--dp-secondary-color);text-align:center}.dp__cell_auto_range{border-radius:0;border-top:1px dashed var(--dp-primary-color);border-bottom:1px dashed var(--dp-primary-color)}.dp__cell_auto_range_start{border-left:1px dashed var(--dp-primary-color)}.dp__cell_auto_range_end{border-right:1px dashed var(--dp-primary-color)}.dp__calendar_header_separator{width:100%;height:1px;background:var(--dp-border-color)}.dp__calendar_next{margin-left:10px}.dp__marker_line,.dp__marker_dot{height:5px;background-color:var(--dp-marker-color);position:absolute;bottom:0}.dp__marker_dot{width:5px;border-radius:50%;left:50%;transform:translateX(-50%)}.dp__marker_line{width:100%;left:0}.dp__marker_tooltip{position:absolute;border-radius:4px;background-color:var(--dp-tooltip-color);padding:5px;border:1px solid var(--dp-border-color);z-index:99999;box-sizing:border-box;cursor:default}.dp__tooltip_content{white-space:nowrap}.dp__tooltip_text{display:flex;align-items:center;flex-flow:row nowrap;color:var(--dp-text-color)}.dp__tooltip_mark{height:5px;width:5px;border-radius:50%;background-color:var(--dp-text-color);color:var(--dp-text-color);margin-right:5px}.dp__arrow_bottom_tp{left:50%;bottom:0;height:8px;width:8px;background-color:var(--dp-tooltip-color);position:absolute;border-right:1px solid var(--dp-border-color);border-bottom:1px solid var(--dp-border-color);transform:translate(-50%, 50%) rotate(45deg)}.dp__instance_calendar{position:relative;width:100%}@media only screen and (max-width: 600px){.dp__flex_display{flex-direction:column}}.dp__cell_highlight{background-color:var(--dp-highlight-color)}.dp__month_year_row{display:flex;align-items:center;height:35px;color:var(--dp-text-color);box-sizing:border-box}.dp__inner_nav{display:flex;align-items:center;justify-content:center;cursor:pointer;height:25px;width:25px;color:var(--dp-icon-color);text-align:center;border-radius:50%}.dp__inner_nav svg{height:20px;width:20px}.dp__inner_nav:hover{background:var(--dp-hover-color);color:var(--dp-hover-icon-color)}.dp__inner_nav_disabled:hover,.dp__inner_nav_disabled{background:var(--dp-disabled-color);color:var(--dp-disabled-color-text);cursor:not-allowed}.dp__month_year_select{width:50%;text-align:center;cursor:pointer;height:35px;display:flex;align-items:center;justify-content:center;border-radius:4px;box-sizing:border-box}.dp__month_year_select:hover{background:var(--dp-hover-color);color:var(--dp-hover-text-color)}.dp__month_year_wrap{display:flex;width:100%}.dp__overlay{position:absolute;width:100%;height:100%;background:var(--dp-background-color);top:0;left:0;transition:opacity 1s ease-out;z-index:99999;font-family:-apple-system,blinkmacsystemfont,"Segoe UI",roboto,oxygen,ubuntu,cantarell,"Open Sans","Helvetica Neue",sans-serif;color:var(--dp-text-color);box-sizing:border-box}.dp__overlay_container::-webkit-scrollbar-track{box-shadow:var(--dp-scroll-bar-background);background-color:var(--dp-scroll-bar-background)}.dp__overlay_container::-webkit-scrollbar{width:5px;background-color:var(--dp-scroll-bar-background)}.dp__overlay_container::-webkit-scrollbar-thumb{background-color:var(--dp-scroll-bar-color);border-radius:10px}.dp__overlay:focus{border:none;outline:none}.dp__container_flex{display:flex}.dp__container_block{display:block}.dp__overlay_container{flex-direction:column;overflow-y:auto}.dp__time_picker_overlay_container{height:100%}.dp__overlay_row{padding:0;box-sizing:border-box;display:flex;margin-left:auto;margin-right:auto;flex-wrap:wrap;max-width:100%;width:100%;align-items:center}.dp__overlay_container>.dp__overlay_row{flex:1}.dp__overlay_col{box-sizing:border-box;width:33%;padding:3px;white-space:nowrap}.dp__overlay_cell_pad{padding:10px 0}.dp__overlay_cell_active{cursor:pointer;border-radius:4px;text-align:center;background:var(--dp-primary-color);color:var(--dp-primary-text-color)}.dp__overlay_cell{cursor:pointer;border-radius:4px;text-align:center}.dp__overlay_cell:hover{background:var(--dp-hover-color);color:var(--dp-hover-text-color)}.dp__cell_in_between{background:var(--dp-hover-color);color:var(--dp-hover-text-color)}.dp__overlay_action{position:sticky;bottom:0;background:#fff}.dp__over_action_scroll{right:5px;box-sizing:border-box}.dp__overlay_cell_disabled{cursor:not-allowed;background:var(--dp-disabled-color)}.dp__overlay_cell_disabled:hover{background:var(--dp-disabled-color)}.dp__overlay_cell_active_disabled{cursor:not-allowed;background:var(--dp-primary-disabled-color)}.dp__overlay_cell_active_disabled:hover{background:var(--dp-primary-disabled-color)}.dp__month_picker_header{display:flex;width:100%;align-items:center;justify-content:space-between;height:35px}.dp__time_input{width:100%;display:flex;align-items:center;justify-content:center;user-select:none;font-family:-apple-system,blinkmacsystemfont,"Segoe UI",roboto,oxygen,ubuntu,cantarell,"Open Sans","Helvetica Neue",sans-serif;color:var(--dp-text-color)}.dp__time_col_reg{padding:0 20px}.dp__time_col_reg_with_button{padding:0 15px}.dp__time_col_sec{padding:0 10px}.dp__time_col_sec_with_button{padding:0 5px}.dp__time_col{font-size:2rem;text-align:center;display:flex;align-items:center;justify-content:center;flex-direction:column}.dp__time_display{cursor:pointer;color:var(--dp-text-color);border-radius:4px;display:flex;align-items:center;justify-content:center;padding:0 3px}.dp__time_display:hover{background:var(--dp-hover-color);color:var(--dp-hover-text-color)}.dp__inc_dec_button{padding:5px;margin:0;height:32px;width:32px;display:flex;align-items:center;justify-content:center;cursor:pointer;border-radius:50%;color:var(--dp-icon-color);box-sizing:border-box}.dp__inc_dec_button svg{height:32px;width:32px}.dp__inc_dec_button:hover{background:var(--dp-hover-color);color:var(--dp-primary-color)}.dp__inc_dec_button_disabled:hover,.dp__inc_dec_button_disabled{background:var(--dp-disabled-color);color:var(--dp-disabled-color-text);cursor:not-allowed}.dp__pm_am_button{background:var(--dp-primary-color);color:var(--dp-primary-text-color);border:none;padding:10px;border-radius:4px;cursor:pointer}.dp__action_row{display:flex;align-items:center;width:100%;padding:10px;box-sizing:border-box;color:var(--dp-text-color);background:var(--dp-background-color)}.dp__action_row svg{height:20px;width:auto}.dp__selection_preview{width:50%;color:var(--dp-text-color);font-size:.8rem}.dp__action_buttons{width:50%;text-align:right}.dp__action{font-weight:bold;cursor:pointer;padding:2px 5px;border-radius:4px;display:inline-flex;align-items:center}.dp__select{color:var(--dp-success-color)}.dp__action_disabled{color:var(--dp-success-color-disabled);cursor:not-allowed}.dp__cancel{color:var(--dp-secondary-color)}.dp__theme_dark{--dp-background-color: #212121;--dp-text-color: #fff;--dp-hover-color: #484848;--dp-hover-text-color: #fff;--dp-hover-icon-color: #959595;--dp-primary-color: #005cb2;--dp-primary-disabled-color: #61a8ea;--dp-primary-text-color: #fff;--dp-secondary-color: #a9a9a9;--dp-border-color: #2d2d2d;--dp-menu-border-color: #2d2d2d;--dp-border-color-hover: #aaaeb7;--dp-disabled-color: #737373;--dp-disabled-color-text: #d0d0d0;--dp-scroll-bar-background: #212121;--dp-scroll-bar-color: #484848;--dp-success-color: #00701a;--dp-success-color-disabled: #428f59;--dp-icon-color: #959595;--dp-danger-color: #e53935;--dp-marker-color: #e53935;--dp-tooltip-color: #3e3e3e;--dp-highlight-color: rgb(0 92 178 / 20%)}.dp__theme_light{--dp-background-color: #fff;--dp-text-color: #212121;--dp-hover-color: #f3f3f3;--dp-hover-text-color: #212121;--dp-hover-icon-color: #959595;--dp-primary-color: #1976d2;--dp-primary-disabled-color: #6bacea;--dp-primary-text-color: #f8f5f5;--dp-secondary-color: #c0c4cc;--dp-border-color: #ddd;--dp-menu-border-color: #ddd;--dp-border-color-hover: #aaaeb7;--dp-disabled-color: #f6f6f6;--dp-scroll-bar-background: #f3f3f3;--dp-scroll-bar-color: #959595;--dp-success-color: #76d275;--dp-success-color-disabled: #a3d9b1;--dp-icon-color: #959595;--dp-danger-color: #ff6f60;--dp-marker-color: #ff6f60;--dp-tooltip-color: #fafafa;--dp-disabled-color-text: #8e8e8e;--dp-highlight-color: rgb(25 118 210 / 10%)}.dp__main{font-family:-apple-system,blinkmacsystemfont,"Segoe UI",roboto,oxygen,ubuntu,cantarell,"Open Sans","Helvetica Neue",sans-serif;user-select:none;box-sizing:border-box}.dp__pointer{cursor:pointer}.dp__icon{stroke:currentcolor;fill:currentcolor}.dp__button{width:100%;text-align:center;color:var(--dp-icon-color);background:var(--dp-background-color);cursor:pointer;display:flex;align-items:center;align-content:center;justify-content:center;padding:10px;box-sizing:border-box;height:35px}.dp__button:hover{background:var(--dp-hover-color);color:var(--dp-hover-icon-color)}.dp__button svg{height:20px;width:auto}.dp__button_bottom{border-bottom-left-radius:4px;border-bottom-right-radius:4px}.dp__flex_display{display:flex}.dp__flex_display_with_input{flex-direction:column;align-items:start}.dp__relative{position:relative}.calendar-next-enter-active,.calendar-next-leave-active,.calendar-prev-enter-active,.calendar-prev-leave-active{transition:all .1s ease-out}.calendar-next-enter-from{opacity:0;transform:translateX(22px)}.calendar-next-leave-to{opacity:0;transform:translateX(-22px)}.calendar-prev-enter-from{opacity:0;transform:translateX(-22px)}.calendar-prev-leave-to{opacity:0;transform:translateX(22px)}.dp-menu-appear-enter-active,.dp-menu-appear-leave-active,.dp-slide-up-enter-active,.dp-slide-up-leave-active,.dp-slide-down-enter-active,.dp-slide-down-leave-active{transition:all .1s ease-out}.dp-slide-down-leave-to,.dp-slide-up-enter-from{opacity:0;transform:translateY(22px)}.dp-slide-down-enter-from,.dp-slide-up-leave-to{opacity:0;transform:translateY(-22px)}.dp-menu-appear-enter-from{opacity:0}.dp-menu-appear-enter-active,.dp-menu-appear-leave-active{transition:opacity .1s ease}.dp-menu-appear-leave-to{opacity:1}
+.form-control.is-invalid ~ .dp__clear_icon, .was-validated .form-control:invalid ~ .dp__clear_icon { margin-right: calc(1.5em + .75rem - 12px) }
\ No newline at end of file
diff --git a/public/js/apps/Studentenverwaltung.js b/public/js/apps/Studentenverwaltung.js
index dc26047ac..a8eb5a578 100644
--- a/public/js/apps/Studentenverwaltung.js
+++ b/public/js/apps/Studentenverwaltung.js
@@ -18,33 +18,34 @@
 import FhcStudentenverwaltung from "../components/Stv/Studentenverwaltung.js";
 import fhcapifactory from "./api/fhcapifactory.js";
 
-import PvConfig from "../../../index.ci.php/public/js/components/primevue/config/config.esm.min.js";
-
 import FhcAlert from "../plugin/FhcAlert.js";
 
-Vue.$fhcapi = fhcapifactory;
+//import PrimeVue form "../../../../index.ci.php/public/js/components/primevue/config/config.esm.min.js");
+//const PrimeVue = await import(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + "/public/js/components/primevue/config/config.esm.min.js").default;
+import(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + "/public/js/components/primevue/config/config.esm.min.js").then(result => result.default).then(PrimeVue => {
+	Vue.$fhcapi = fhcapifactory;
 
-const ciPath = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*?\/)/g, '') + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
+	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}/studentenverwaltung`, component: FhcStudentenverwaltung },
-		{ path: `/${ciPath}/studentenverwaltung/prestudent/:prestudent_id`, component: FhcStudentenverwaltung },
-		{ path: `/${ciPath}/studentenverwaltung/prestudent/:prestudent_id/:tab`, component: FhcStudentenverwaltung },
-		{ path: `/${ciPath}/studentenverwaltung/student/:id`, component: FhcStudentenverwaltung }
-	]
+	const router = VueRouter.createRouter({
+		history: VueRouter.createWebHistory(),
+		routes: [
+			{ path: `/${ciPath}/studentenverwaltung`, component: FhcStudentenverwaltung },
+			{ path: `/${ciPath}/studentenverwaltung/prestudent/:prestudent_id`, component: FhcStudentenverwaltung },
+			{ path: `/${ciPath}/studentenverwaltung/prestudent/:prestudent_id/:tab`, component: FhcStudentenverwaltung },
+			{ path: `/${ciPath}/studentenverwaltung/student/:id`, component: FhcStudentenverwaltung }
+		]
+	});
+
+	const app = Vue.createApp();
+
+	app
+		.use(router)
+		.use(PrimeVue, {
+			zIndex: {
+				overlay: 1100
+			}
+		})
+		.use(FhcAlert)
+		.mount('#main');
 });
-
-const app = Vue.createApp();
-
-app
-	.use(router)
-	.use(PvConfig, {
-		zIndex: {
-			overlay: 1100
-		}
-	})
-	.use(FhcAlert)
-	.mount('#main');
-
diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index 968067d5f..6b262560f 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -66,7 +66,7 @@ export default {
 				selectable: true,
 				// TODO(chris): select only one? selectMultiple with click?
 				index: 'prestudent_id',
-				//persistence: true
+				persistence: true
 			},
 			tabulatorEvents: [
 				{

From a0635840b7260299f9974d47690e60bf6632113e Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 29 Nov 2023 12:14:45 +0100
Subject: [PATCH 0190/1461] New Validation

---
 public/js/components/Form/Form.js             | 129 +++++
 public/js/components/Form/Input.js            | 207 +++++++
 public/js/components/Form/Validation.js       |  98 +---
 public/js/components/Fragment.js              |   5 +
 .../Stv/Studentenverwaltung/List/New.js       | 548 ++++++++++++------
 5 files changed, 723 insertions(+), 264 deletions(-)
 create mode 100644 public/js/components/Form/Form.js
 create mode 100644 public/js/components/Form/Input.js
 create mode 100644 public/js/components/Fragment.js

diff --git a/public/js/components/Form/Form.js b/public/js/components/Form/Form.js
new file mode 100644
index 000000000..bf9e318c0
--- /dev/null
+++ b/public/js/components/Form/Form.js
@@ -0,0 +1,129 @@
+import FhcFragment from "../Fragment.js";
+
+export default {
+	components: {
+		FhcFragment
+	},
+	provide() {
+		return {
+			$registerToForm: component => {
+				if (this.inputs.indexOf(component) < 0)
+					this.inputs.push(component);
+			}
+		};
+	},
+	props: {
+		tag: {
+			type: String,
+			default: 'form'
+		}
+	},
+	data() {
+		return {
+			inputs: []
+		}
+	},
+	computed: {
+		sortedInputs() {
+			return this.inputs.reduce((a,c) => {
+				let name = c.name || '_default';
+				if (!a[name])
+					a[name] = [];
+				a[name].push(c);
+				return a;
+			}, {});
+		}
+	},
+	methods: {
+		_sendFeedbackToInput(inputs, feedback, valid) {
+			if (inputs.length) {
+				inputs.forEach(input => input.setFeedback(feedback, valid));
+				return false;
+			}
+			if (this.$fhcAlert) {
+				this.$fhcAlert[valid ? 'alertSuccess' : 'alertError'](feedback);
+				return false;
+			}
+			return true;
+		},
+		setFeedback(feedback, valid) {
+			if (Array.isArray(feedback)) {
+				let remaining = feedback.filter(fb => 
+					this._sendFeedbackToInput(
+						this.sortedInputs['_default'] || [],
+						fb,
+						valid
+					)
+				);
+				return remaining.length ? remaining : null;
+			}
+			if (typeof feedback === 'object') {
+				let remaining = Object.entries(feedback).filter(([name, fb]) => 
+					this._sendFeedbackToInput(
+						this.sortedInputs[name.split('.')[0] + name.split('.').slice(1).map(p => `[${p}]`).join("")] || this.sortedInputs['_default'] || [],
+						fb,
+						valid
+					)
+				);
+				return remaining.length ? Object.fromEntries(remaining) : null;
+			}
+
+			let remaining = this._sendFeedbackToInput(
+				this.sortedInputs['_default'] || [],
+				feedback,
+				valid
+			);
+			return remaining ? feedback : null;
+		},
+		clearValidation() {
+			this.inputs.forEach(input => input.clearValidation());
+		},
+		send(promise) {
+			return new Promise((resolve, reject) => {
+				promise.then(result => {
+					if (result?.status == 200 && result.data) {
+						if (typeof result.data !== 'object' || !result.data.hasOwnProperty('retval'))
+							// TODO(chris): IMPLEMENT! Error in API
+							return reject(result);
+						if (result.data.error)
+							// TODO(chris): IMPLEMENT! Error in API
+							return reject(result);
+						const data = result.data.retval;
+						// TODO(chris): check for something better/add new standardized return value
+						if (result.data.code == 1)
+							this.setFeedback(data, true);
+						return resolve(data);
+					}
+					// TODO(chris): IMPLEMENT! Wrong result object
+					reject(result);
+				}).catch(result => {
+					if (result?.response?.status == 400 && result.response.data) {
+						if (typeof result.response.data !== 'object' || !result.response.data.hasOwnProperty('retval'))
+							// TODO(chris): IMPLEMENT! Error in API
+							return reject(result);
+						this.clearValidation();
+						const remaining = this.setFeedback(
+							result.response.data.retval,
+							false
+						);
+						if (remaining) {
+							result.response.data.retval = remaining;
+							return reject(result);
+						}
+					} else if (result?.response?.status == 500) {
+						if (this.$fhcAlert)
+							this.$fhcAlert.handleSystemError(result);
+						else
+							return reject(result);
+					} else {
+						return reject(result);
+					}
+				});
+			});
+		}
+	},
+	template: `
+	<component :is="tag || 'FhcFragment'" v-bind="$attrs">
+		<slot></slot>
+	</component>`
+}
\ No newline at end of file
diff --git a/public/js/components/Form/Input.js b/public/js/components/Form/Input.js
new file mode 100644
index 000000000..6b3ed5eb1
--- /dev/null
+++ b/public/js/components/Form/Input.js
@@ -0,0 +1,207 @@
+import FhcFragment from "../Fragment.js";
+
+let _uuid = {};
+
+export default {
+	inheritAttrs: false,
+	components: {
+		FhcFragment
+	},
+	inject: [
+		'$registerToForm'
+	],
+	props: {
+		bsFeedback: Boolean,
+		noAutoClass: Boolean,
+		type: String,
+		name: String
+	},
+	data() {
+		return {
+			valid: undefined,
+			feedback: []
+		}
+	},
+	computed: {
+		lcType() {
+			if (!this.type)
+				return 'text';
+			return this.type.toLowerCase();
+		},
+		tag() {
+			switch (this.lcType) {
+				case 'textarea':
+				case 'select':
+					return this.lcType;
+				case 'datepicker':
+					return 'VueDatePicker';
+				case 'autocomplete':
+					return 'PvAutocomplete';
+				default:
+					return 'input';
+			}
+		},
+		validationClass() {
+			const classes = [];
+			if (this.valid)
+				classes.push('is-valid');
+			else if (this.valid === false)
+				classes.push('is-invalid');
+			
+			if (!this.noAutoClass) {
+				let c = this.$attrs.class ? this.$attrs.class.split(' ') : [];
+				switch (this.lcType) {
+					// TODO(chris): complete list!
+					case 'select':
+						if (!c.includes('form-select'))
+							classes.push('form-select');
+						break;
+					case 'range':
+						if (!c.includes('form-range'))
+							classes.push('form-range');
+						break;
+					case 'radio':
+					case 'checkbox':
+						// TODO(chris): maybe different handling?
+						if (!c.includes('form-check-input') && !c.includes('btn-check'))
+							classes.push('form-check-input');
+						break;
+					case 'autocomplete':
+					case 'datepicker':
+						classes.push('p-0');
+						classes.push('border-0');
+					case 'text':
+					case 'textarea':
+						if (!c.includes('form-control'))
+							classes.push('form-control');
+						break;
+				}
+			}
+
+			return classes;
+		},
+		feedbackClass() {
+			if (!this.feedback || this.feedback === true)
+				return '';
+			if (!this.bsFeedback)
+				return {
+					'valid-tooltip': this.valid === true,
+					'invalid-tooltip': this.valid === false
+				};
+			return {
+				'valid-feedback': this.valid === true,
+				'invalid-feedback': this.valid === false
+			};
+		},
+		modelValueCmp: {
+			get() {
+				return this.$attrs.modelValue;
+			},
+			set(v) {
+				this.$emit('update:modelValue', v);
+			}
+		},
+		idCmp() {
+			let uuid = this.$attrs.id;
+			if (this.lcType == 'datepicker')
+				uuid = this.$attrs.uid;
+			if (!uuid && this.$attrs.label)
+				uuid = 'fhc-form-input';
+			if (!uuid)
+				return undefined;
+			if (this.lcType == 'datepicker')
+				uuid = 'dp-input-' + uuid;
+			if (_uuid[uuid] === undefined)
+				_uuid[uuid] = 0;
+			return uuid + '-' + (_uuid[uuid]++);
+		}
+	},
+	methods: {
+		clearValidation() {
+			this.valid = undefined;
+			this.feedback = [];
+		},
+		setFeedback(feedback, valid) {
+			if (!Array.isArray(feedback))
+				feedback = [feedback];
+			this.valid = valid;
+			this.feedback = feedback;
+		},
+		_loadComponents() {
+			if (this.tag == 'VueDatePicker' && !this._.components.VueDatePicker) {
+				this._.components.VueDatePicker = Vue.defineAsyncComponent(() => import("../vueDatepicker.js.php"));
+			} else if (this.tag == 'PvAutocomplete' && !this._.components.PvAutocomplete) {
+				this._.components.PvAutocomplete = Vue.defineAsyncComponent(() => import(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + "/public/js/components/primevue/autocomplete/autocomplete.esm.min.js"));;
+			}
+		}
+	},
+	beforeMount() {
+		this._loadComponents();
+	},
+	beforeUpdate() {
+		this._loadComponents();
+	},
+	mounted() {
+		if (this.$registerToForm)
+			this.$registerToForm(this);
+		// TODO(chris): wrap check in div?
+	},
+	template: `
+	<component :is="bsFeedback ? 'FhcFragment' : 'div'" class="position-relative">
+		<label v-if="$attrs.label && lcType != 'radio' && lcType != 'checkbox'" :for="idCmp">{{$attrs.label}}</label>
+		<input v-if="tag == 'input'" :type="lcType" v-model="modelValueCmp" v-bind="$attrs" :id="idCmp" :name="name" :class="validationClass" :modelValue="undefined" @input="clearValidation(); $emit('input', $event)">
+		<textarea v-else-if="tag == 'textarea'" v-model="modelValueCmp" v-bind="$attrs" :id="idCmp" :name="name" :class="validationClass" :modelValue="undefined" @input="clearValidation(); $emit('input', $event)"></textarea>
+		<select v-else-if="tag == 'select'" v-model="modelValueCmp" v-bind="$attrs" :id="idCmp" :name="name" :class="validationClass" :modelValue="undefined" @input="clearValidation(); $emit('input', $event)">
+			<slot></slot>
+		</select>
+		<component
+			v-else-if="tag == 'VueDatePicker'"
+			:is="tag"
+			:type="type"
+			v-model="modelValueCmp"
+			v-bind="$attrs"
+			:uid="idCmp.substr(9)"
+			:name="name"
+			:class="validationClass"
+			:input-class-name="[...Object.entries({'form-control': !noAutoClass, 'is-valid': valid === true, 'is-invalid': valid === false}).reduce((a,[k,v]) => {if(v) a.push(k);return a}, []), ...($attrs['input-class-name'] ? $attrs['input-class-name'].split(' ') : [])].join(' ')"
+			@update:model-value="clearValidation"
+			>
+			<slot></slot>
+		</component>
+		<component
+			v-else-if="tag == 'PvAutocomplete'"
+			:is="tag"
+			:type="type"
+			v-model="modelValueCmp"
+			v-bind="$attrs"
+			:id="idCmp"
+			:name="name"
+			:class="validationClass"
+			:input-class="[...Object.entries({'form-control': !noAutoClass, 'is-valid': valid === true, 'is-invalid': valid === false}).reduce((a,[k,v]) => {if(v) a.push(k);return a}, []), ...($attrs['input-class'] ? $attrs['input-class'].split(' ') : [])].join(' ')"
+			@update:model-value="clearValidation"
+			>
+			<slot></slot>
+		</component>
+		<component
+			v-else
+			:is="tag"
+			:type="type"
+			v-model="modelValueCmp"
+			v-bind="$attrs"
+			:id="idCmp"
+			:name="name"
+			:class="validationClass"
+			@update:model-value="clearValidation"
+			>
+			<slot></slot>
+		</component>
+		<div v-if="valid !== undefined" :class="feedbackClass">
+			<template v-for="(msg, i) in feedback" :key="i">
+				<hr v-if="i" class="m-0">
+				{{msg}}
+			</template>
+		</div>
+		<label v-if="$attrs.label && (lcType == 'radio' || lcType == 'checkbox')" :for="idCmp" :class="!noAutoClass && 'form-check-label'">{{$attrs.label}}</label>
+	</component>
+	`
+}
\ No newline at end of file
diff --git a/public/js/components/Form/Validation.js b/public/js/components/Form/Validation.js
index 3b4e69112..51ea3c689 100644
--- a/public/js/components/Form/Validation.js
+++ b/public/js/components/Form/Validation.js
@@ -1,84 +1,36 @@
+const FEEDBACK_DEFAULT = {
+	success: [],
+	danger: []
+};
 export default {
-	props: {
-		name: String
-	},
+	inject: [
+		'$registerToForm'
+	],
 	data() {
 		return {
-			isValid: false,
-			isInvalid: false,
-			invalidFeedback: ''
+			feedback: FEEDBACK_DEFAULT
 		};
 	},
 	methods: {
-		reset() {
-			this.isValid = false;
-			this.isInvalid = false;
-			this.invalidFeedback = '';
+		clearValidation() {
+			this.feedback = FEEDBACK_DEFAULT;
 		},
-		setValid() {
-			this.isValid = true;
-		},
-		setInvalid(feedback) {
-			this.invalidFeedback = feedback?.detail || '';
-			this.isInvalid = true;
+		setFeedback(feedback, valid) {
+			if (!Array.isArray(feedback))
+				feedback = [feedback];
+			this.feedback[valid ? 'success' : 'danger'] = feedback;
 		}
 	},
-	render() {
-		if (!this.$slots.default)
-			return Vue.h('div', {
-				'data-fhc-form-error': true,
-				class: {
-					'alert': true,
-					'alert-danger': true,
-					'd-none': !this.isInvalid
-				},
-				role: 'alert',
-				onFhcFormReset: this.reset,
-				onFhcFormError: this.setInvalid
-			}, (this.invalidFeedback || []).map((txt, i) => Vue.h('p', {
-				key: i,
-				class: i+1 == (this.invalidFeedback || []).length ? 'mb-0' : ''
-			}, txt)));
-		
-		const res = this.$slots.default();
-		const orig = res.shift();
-
-		let options = {
-			'data-fhc-form-validate': this.name,
-			onFhcFormReset: this.reset,
-			onFhcFormValidate: this.setValid,
-			onFhcFormInvalidate: this.setInvalid,
-			onInput: this.reset,
-			class: {
-				'form-control': orig.type !== 'select' && orig.props.type !== 'checkbox' && orig.props.type !== 'radio' && !(orig.props?.class || '').split(' ').includes('form-control'),
-				'form-select': orig.type === 'select' && !(orig.props?.class || '').split(' ').includes('form-select'),
-				'is-valid': this.isValid,
-				'is-invalid': this.isInvalid
-			}
-		};
-		if (orig.type.__name == 'VueDatePicker') {
-			options.class['p-0'] = true;
-			options.inputClassName = 'border-0';
-		}
-		res.unshift(Vue.cloneVNode(orig, options));
-
-		if (this.isInvalid && this.invalidFeedback && this.$slots.default) {
-			/* NOTE(chris): use bootstraps 'feedback' */
-			/*res.push(Vue.h('div', {
-				class: 'invalid-feedback'
-			}, this.invalidFeedback));*/
-
-			/* NOTE(chris): use bootstraps 'tooltip' */
-			res.push(Vue.h('div', {
-				class: 'invalid-tooltip'
-			}, this.invalidFeedback));
-		}
-		/* NOTE(chris): use bootstraps 'feedback' */
-		/*return res;*/
-		
-		/* NOTE(chris): use bootstraps 'tooltip' */
-		return Vue.h('div', {
-			class: 'position-relative'
-		}, res);
+	mounted() {
+		if (this.$registerToForm)
+			this.$registerToForm(this);
 	},
+	template: `
+	<template v-for="(arr, key) in feedback" :key="key">
+		<div v-for="msg in arr" :key="msg" class="alert alert-dismissible fade show" :class="'alert-' + key" role="alert">
+			{{msg}}
+			<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+		</div>
+	</template>
+	`
 };
\ No newline at end of file
diff --git a/public/js/components/Fragment.js b/public/js/components/Fragment.js
new file mode 100644
index 000000000..4d4af87c7
--- /dev/null
+++ b/public/js/components/Fragment.js
@@ -0,0 +1,5 @@
+export default {
+	render() {
+		return (this.$slots && this.$slots.default) ? this.$slots.default() : null;
+	}
+};
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/List/New.js b/public/js/components/Stv/Studentenverwaltung/List/New.js
index 3709acb5f..8df462909 100644
--- a/public/js/components/Stv/Studentenverwaltung/List/New.js
+++ b/public/js/components/Stv/Studentenverwaltung/List/New.js
@@ -1,7 +1,9 @@
 import {CoreRESTClient} from '../../../../RESTClient.js';
 import BsModal from '../../../Bootstrap/Modal.js';
-import FhcFormValidation from '../../../Form/Validation.js';
-import VueDatePicker from '../../../vueDatepicker.js.php';
+import FhcForm from '../../../Form/Form.js';
+import FormValidation from '../../../Form/Validation.js';
+import FormInput from '../../../Form/Input.js';
+import { useForm } from '../../../../composables/Form.js';
 import accessibility from '../../../../directives/accessibility.js';
 
 var _uuid = 0;
@@ -20,8 +22,9 @@ const FORMDATA_DEFAULT = {
 export default {
 	components: {
 		BsModal,
-		FhcFormValidation,
-		VueDatePicker
+		FhcForm,
+		FormValidation,
+		FormInput
 	},
 	directives: {
 		accessibility
@@ -95,9 +98,9 @@ export default {
 			this.formData = FORMDATA_DEFAULT;
 			this.person = null;
 			this.suggestions = [];
-			this.$fhcAlert.resetFormValidation(this.$refs.form)
+			this.$refs.form.clearValidation();
 		},
-		loadSuggestions() {
+		loadSuggestions() {console.log('loadSuggestions');
 			if (this.abortController.suggestions)
 				this.abortController.suggestions.abort();
 			if (this.person !== null)
@@ -129,21 +132,22 @@ export default {
 				return;
 
 			this.abortController.places = new AbortController();
-			CoreRESTClient
-				.get('components/stv/address/getPlaces/' + this.formData.address.plz, undefined, {
-					signal: this.abortController.places.signal
-				})
-				.then(result => CoreRESTClient.getData(result.data) || [])
+			this.$refs.form
+				.send(CoreRESTClient.get(
+					'components/stv/address/getPlaces/' + this.formData.address.plz,
+					undefined,
+					{
+						signal: this.abortController.places.signal
+					}
+				))
 				.then(result => {
-					this.places = result;
+					this.places = result
 				})
 				.catch(error => {
-					if (error.code == 'ERR_BAD_REQUEST') {
-						return this.$fhcAlert.handleFormValidation(error, this.$refs.form);
-					}
-					// NOTE(chris): repeat request
 					if (error.code != "ERR_CANCELED")
 						window.setTimeout(this.loadPlaces, 100);
+					else
+						console.error(error);
 				});
 		},
 		loadStudienplaene() {
@@ -180,26 +184,20 @@ export default {
 			if (this.person === null)
 				return this.person = 0;
 
-			this.$fhcAlert.resetFormValidation(this.$refs.form);
+			//this.$fhcAlert.resetFormValidation(this.$refs.form);
 			const data = {...this.formData, ...(this.person || {})};
 			if (data.studiengang_kz === undefined)
 				data.studiengang_kz = this.studiengangKz;
 			if (data.studiensemester_kurzbz === undefined)
 				data.studiensemester_kurzbz = this.studiensemesterKurzbz;
 
-			CoreRESTClient
-				.post('components/stv/student/add', data)
-				.then(result => result.data)
-				.then(result => {
-					if (CoreRESTClient.isError(result))
-						throw new Error(CoreRESTClient.getError(result));
-					return CoreRESTClient.getData(result);
-				})
+			this.$refs.form
+				.send(CoreRESTClient.post('components/stv/student/add', data))
 				.then(result => {
 					this.$fhcAlert.alertSuccess('Gespeichert');
 					this.$refs.modal.hide();
 				})
-				.catch(this.$fhcAlert.handleFormValidation(this.$refs.form));
+				.catch(console.error);
 		}
 	},
 	created() {
@@ -211,35 +209,59 @@ export default {
 				this.semester = result;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
-
 	},
 	template: `
-	<form ref="form" class="stv-list-new" @submit.prevent="send">
+	<fhc-form ref="form" class="stv-list-new" @submit.prevent="send">
 		<bs-modal ref="modal" dialog-class="modal-lg modal-scrollable" @hidden-bs-modal="reset">
 			<template #title>
 				InteressentIn anlegen
 			</template>
 			<template #default>
-				<fhc-form-validation></fhc-form-validation>
+
+				<form-validation></form-validation>
+
 				<template v-if="person === null">
 					<div class="row">
 						<div class="col-sm-4 mb-3">
-							<label :for="'stv-list-new-nachname-' + uuid">Nachname*</label>
-							<fhc-form-validation name="nachname">
-								<input :id="'stv-list-new-nachname-' + uuid" type="text" name="nachname" v-model="formDataPerson['nachname']" class="form-control" :disabled="person" @input="loadSuggestions">
-							</fhc-form-validation>
+							<form-input
+								label="Nachname*"
+								type="text"
+								id="stv-list-new-nachname"
+								name="nachname"
+								v-model="formDataPerson['nachname']"
+								:disabled="person"
+								@input="loadSuggestions"
+								>
+							</form-input>
 						</div>
 						<div class="col-sm-4 mb-3">
-							<label :for="'stv-list-new-vorname-' + uuid">Vorname</label>
-							<fhc-form-validation name="vorname">
-								<input :id="'stv-list-new-vorname-' + uuid" type="text" name="vorname" v-model="formDataPerson['vorname']" class="form-control" :disabled="person" @input="loadSuggestions">
-							</fhc-form-validation>
+							<form-input
+								label="Vorname"
+								type="text"
+								:id="'stv-list-new-vorname-' + uuid"
+								name="vorname"
+								v-model="formDataPerson['vorname']"
+								:disabled="person"
+								@input="loadSuggestions"
+								>
+							</form-input>
 						</div>
 						<div class="col-sm-4 mb-3">
-							<label :for="'dp-input-stv-list-new-gebdatum-' + uuid">Geburtsdatum</label>
-							<fhc-form-validation name="gebdatum">
-								<vue-date-picker :uid="'stv-list-new-gebdatum-' + uuid" name="gebdatum" text-input auto-apply no-today v-model="formDataPerson['gebdatum']" :enable-time-picker="false" format="dd.MM.yyyy" @update:model-value="loadSuggestions" :disabled="person"></vue-date-picker>
-							</fhc-form-validation>
+							<form-input
+								label="Geburtsdatum"
+								type="datepicker"
+								uid="stv-list-new-gebdatum"
+								name="gebdatum"
+								v-model="formDataPerson['gebdatum']"
+								:disabled="person"
+								@update:model-value="loadSuggestions"
+								text-input
+								auto-apply
+								no-today 
+								:enable-time-picker="false"
+								format="dd.MM.yyyy"
+								>
+							</form-input>
 						</div>
 					</div>
 					<!-- TODO(chris): more details -->
@@ -262,78 +284,133 @@ export default {
 				<tempalte v-else>
 					<div class="row">
 						<div class="col-sm-4 mb-3">
-							<label :for="'stv-list-new-anrede-' + uuid">Anrede</label>
-							<fhc-form-validation name="anrede">
-								<input :id="'stv-list-new-anrede-' + uuid" type="text" name="anrede" v-model="formDataPerson['anrede']" class="form-control" :disabled="person">
-							</fhc-form-validation>
+							<form-input
+								label="Anrede"
+								type="text"
+								id="stv-list-new-anrede"
+								name="anrede"
+								v-model="formDataPerson['anrede']"
+								:disabled="person"
+								>
+							</form-input>
 						</div>
 						<div class="col-sm-4 mb-3">
-							<label :for="'stv-list-new-titelpre-' + uuid">Titel (Pre)</label>
-							<fhc-form-validation name="titelpre">
-								<input :id="'stv-list-new-titelpre-' + uuid" type="text" name="titelpre" v-model="formDataPerson['titelpre']" class="form-control" :disabled="person">
-							</fhc-form-validation>
+							<form-input
+								label="Titel (Pre)"
+								type="text"
+								id="stv-list-new-titelpre"
+								name="titelpre"
+								v-model="formDataPerson['titelpre']"
+								:disabled="person"
+								>
+							</form-input>
 						</div>
 						<div class="col-sm-4 mb-3">
-							<label :for="'stv-list-new-titelpost-' + uuid">Titel (Post)</label>
-							<fhc-form-validation name="titelpost">
-								<input :id="'stv-list-new-titelpost-' + uuid" type="text" name="titelpost" v-model="formDataPerson['titelpost']" class="form-control" :disabled="person">
-							</fhc-form-validation>
+							<form-input
+								label="Titel (Post)"
+								type="text"
+								id="stv-list-new-titelpost"
+								name="titelpost"
+								v-model="formDataPerson['titelpost']"
+								:disabled="person"
+								>
+							</form-input>
 						</div>
 					</div>
 					<div class="row">
 						<div class="col-sm-4 mb-3">
-							<label :for="'stv-list-new-nachname-' + uuid">Nachname*</label>
-							<fhc-form-validation name="nachname">
-								<input :id="'stv-list-new-nachname-' + uuid" type="text" name="nachname" v-model="formDataPerson['nachname']" class="form-control" :disabled="person" @input="loadSuggestions">
-							</fhc-form-validation>
+							<form-input
+								label="Nachname*"
+								type="text"
+								id="stv-list-new-nachname"
+								name="nachname"
+								v-model="formDataPerson['nachname']"
+								:disabled="person"
+								@input="loadSuggestions"
+								>
+							</form-input>
 						</div>
 						<div class="col-sm-4 mb-3">
-							<label :for="'stv-list-new-vorname-' + uuid">Vorname</label>
-							<fhc-form-validation name="vorname">
-								<input :id="'stv-list-new-vorname-' + uuid" type="text" name="vorname" v-model="formDataPerson['vorname']" class="form-control" :disabled="person" @input="loadSuggestions">
-							</fhc-form-validation>
+							<form-input
+								label="Vorname"
+								type="text"
+								id="stv-list-new-vorname"
+								name="vorname"
+								v-model="formDataPerson['vorname']"
+								:disabled="person"
+								@input="loadSuggestions"
+								>
+							</form-input>
 						</div>
 						<div class="col-sm-4 mb-3">
-							<label :for="'stv-list-new-vornamen-' + uuid">Weitere Vornamen</label>
-							<fhc-form-validation name="vornamen">
-								<input :id="'stv-list-new-vornamen-' + uuid" type="text" name="vornamen" v-model="formDataPerson['vornamen']" class="form-control" :disabled="person">
-							</fhc-form-validation>
+							<form-input
+								label="Weitere Vornamen"
+								type="text"
+								id="stv-list-new-vornamen"
+								name="vornamen"
+								v-model="formDataPerson['vornamen']"
+								:disabled="person"
+								>
+							</form-input>
 						</div>
 					</div>
 					<div class="row">
 						<div class="col-sm-4 mb-3">
-							<label :for="'stv-list-new-wahlname-' + uuid">Wahlname</label>
-							<fhc-form-validation name="wahlname">
-								<input :id="'stv-list-new-wahlname-' + uuid" type="text" name="wahlname" v-model="formDataPerson['wahlname']" class="form-control" :disabled="person">
-							</fhc-form-validation>
+							<form-input
+								label="Wahlname"
+								type="text"
+								id="stv-list-new-wahlname"
+								name="wahlname"
+								v-model="formDataPerson['wahlname']"
+								:disabled="person"
+								>
+							</form-input>
 						</div>
 					</div>
 					<div class="row">
 						<div class="col-sm-4 mb-3">
-							<label :for="'stv-list-new-geschlecht-' + uuid">Geschlecht*</label>
-							<fhc-form-validation name="geschlecht">
-								<select :id="'stv-list-new-geschlecht-' + uuid" class="form-control" class="form-select" :disabled="person" name="geschlecht" v-model="formDataPerson['geschlecht']">
-									<option v-for="geschlecht in lists.geschlechter" :key="geschlecht.geschlecht" :value="geschlecht.geschlecht">{{geschlecht.bezeichnung}}</option>
-								</select>
-							</fhc-form-validation>
+							<form-input
+								label="Geschlecht*"
+								type="select"
+								id="stv-list-new-geschlecht"
+								name="geschlecht"
+								v-model="formDataPerson['geschlecht']"
+								:disabled="person"
+								>
+								<option v-for="geschlecht in lists.geschlechter" :key="geschlecht.geschlecht" :value="geschlecht.geschlecht">{{geschlecht.bezeichnung}}</option>
+							</form-input>
 						</div>
 						<div class="col-sm-4 mb-3">
-							<label :for="'dp-input-stv-list-new-gebdatum-' + uuid">Geburtsdatum</label>
-							<fhc-form-validation name="gebdatum">
-								<vue-date-picker :uid="'stv-list-new-gebdatum-' + uuid" name="gebdatum" text-input auto-apply no-today v-model="formDataPerson['gebdatum']" :enable-time-picker="false" format="dd.MM.yyyy" @update:model-value="loadSuggestions" :disabled="person"></vue-date-picker>
-							</fhc-form-validation>
+							<form-input
+								label="Geburtsdatum"
+								type="datepicker"
+								uid="stv-list-new-gebdatum"
+								name="gebdatum"
+								v-model="formDataPerson['gebdatum']"
+								:disabled="person"
+								@update:model-value="loadSuggestions"
+								text-input
+								auto-apply
+								no-today
+								:enable-time-picker="false"
+								format="dd.MM.yyyy"
+								>
+							</form-input>
 						</div>
 					</div>
 					
 					<div v-if="person" class="row">
 						<div class="col-sm-6 mb-3">
-							<fhc-form-validation name="address[func]">
-								<select :id="'stv-list-new-address-func-' + uuid" name="address[func]" class="form-select" v-model="formData['address']['func']">
-									<option value="-1">Bestehende Adresse überschreiben</option>
-									<option value="1">Adresse hinzufügen</option>
-									<option value="0">Adresse nicht anlegen</option>
-								</select>
-							</fhc-form-validation>
+							<form-input
+								type="select"
+								id="stv-list-new-address-func"
+								name="address[func]"
+								v-model="formData['address']['func']"
+								>
+								<option value="-1">Bestehende Adresse überschreiben</option>
+								<option value="1">Adresse hinzufügen</option>
+								<option value="0">Adresse nicht anlegen</option>
+							</form-input>
 						</div>
 					</div>
 					
@@ -341,167 +418,256 @@ export default {
 						<legend>Adresse</legend>
 						<div class="row">
 							<div class="col-sm-4 mb-3">
-								<label :for="'dp-input-stv-list-new-address-nation-' + uuid">Land</label>
-								<fhc-form-validation name="address.nation">
-									<select :id="'stv-list-new-address-nation' + uuid" name="address[nation]" class="form-select" v-model="formData['address']['nation']" @input="changeAddressNation">
-										<option v-for="nation in lists.nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.langtext}}</option>
-									</select>
-								</fhc-form-validation>
+								<form-input
+									label="Land"
+									type="select"
+									id="stv-list-new-address-nation"
+									name="address[nation]"
+									v-model="formData['address']['nation']"
+									@input="changeAddressNation"
+									>
+									<option v-for="nation in lists.nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.langtext}}</option>
+								</form-input>
 							</div>
 						</div>
 						<div class="row">
 							<div class="col-sm-4 mb-3">
-								<label :for="'dp-input-stv-list-new-address-plz-' + uuid">PLZ</label>
-								<fhc-form-validation name="address[plz]">
-									<input type="text" :id="'stv-list-new-address-plz' + uuid" name="address[plz]" v-model="formData['address']['plz']" @input="loadPlaces">
-								</fhc-form-validation>
+								<form-input
+									label="PLZ"
+									type="text"
+									id="stv-list-new-address-plz"
+									name="address[plz]"
+									v-model="formData['address']['plz']"
+									@input="loadPlaces"
+									>
+								</form-input>
 							</div>
 							<div class="col-sm-4 mb-3">
-								<label :for="'dp-input-stv-list-new-address-gemeinde-' + uuid">Gemeinde</label>
-								<fhc-form-validation name="address[gemeinde]">
-									<select v-if="formData['address']['nation'] == 'A'" :id="'stv-list-new-address-gemeinde' + uuid" name="address[gemeinde]" class="form-select" v-model="formData['address']['gemeinde']">
-										<option v-if="!gemeinden.length" disabled>Bitte gültige PLZ wählen</option>
-										<option v-for="gemeinde in gemeinden" :key="gemeinde.name" :value="gemeinde.name">{{gemeinde.name}}</option>
-									</select>
-									<input v-else type="text" :id="'stv-list-new-address-gemeinde' + uuid" name="address[gemeinde]" class="form-control" v-model="formData['address']['gemeinde']">
-								</fhc-form-validation>
+								<form-input
+									label="Gemeinde"
+									type="select"
+									v-if="formData['address']['nation'] == 'A'"
+									id="stv-list-new-address-gemeinde"
+									name="address[gemeinde]"
+									v-model="formData['address']['gemeinde']"
+									>
+									<option v-if="!gemeinden.length" disabled>Bitte gültige PLZ wählen</option>
+									<option v-for="gemeinde in gemeinden" :key="gemeinde.name" :value="gemeinde.name">{{gemeinde.name}}</option>
+								</form-input>
+								<form-input
+									label="Gemeinde"
+									type="text"
+									v-else
+									id="stv-list-new-address-gemeinde"
+									name="address[gemeinde]"
+									v-model="formData['address']['gemeinde']"
+									>
+								</form-input>
 							</div>
 							<div class="col-sm-4 mb-3">
-								<label :for="'dp-input-stv-list-new-address-ort-' + uuid">Ort</label>
-								<fhc-form-validation name="address[ort]">
-									<select v-if="formData['address']['nation'] == 'A'" :id="'stv-list-new-address-ort' + uuid" name="address[ort]" class="form-select" v-model="formData['address']['ort']">
-										<option v-if="!orte.length" disabled>Bitte gültige Gemeinde wählen</option>
-										<option v-for="ort in orte" :key="ort.ortschaftsname" :value="ort.ortschaftsname">{{ort.ortschaftsname}}</option>
-									</select>
-									<input v-else type="text" :id="'stv-list-new-address-ort' + uuid" name="address[ort]" class="form-control" v-model="formData['address']['ort']">
-								</fhc-form-validation>
+								<form-input
+									label="Ort"
+									type="select"
+									v-if="formData['address']['nation'] == 'A'"
+									id="stv-list-new-address-ort"
+									name="address[ort]"
+									v-model="formData['address']['ort']"
+									>
+									<option v-if="!orte.length" disabled>Bitte gültige Gemeinde wählen</option>
+									<option v-for="ort in orte" :key="ort.ortschaftsname" :value="ort.ortschaftsname">{{ort.ortschaftsname}}</option>
+								</form-input>
+								<form-input
+									label="Ort"
+									type="text"
+									v-else
+									id="stv-list-new-address-ort"
+									name="address[ort]"
+									v-model="formData['address']['ort']"
+									>
+								</form-input>
 							</div>
 						</div>
 						<div class="row">
 							<div class="col-12 mb-3">
-								<label :for="'dp-input-stv-list-new-address-address-' + uuid">Adresse</label>
-								<fhc-form-validation name="address[address]">
-									<input type="text" :id="'stv-list-new-address-address' + uuid" name="address[address]" v-model="formData['address']['address']">
-								</fhc-form-validation>
+								<form-input
+									label="Adresse"
+									type="text"
+									id="stv-list-new-address-address"
+									name="address[address]"
+									v-model="formData['address']['address']"
+									>
+								</form-input>
 							</div>
 						</div>
 					</fieldset>
 
 					<div class="row">
 						<div class="col-sm-4 mb-3">
-							<label :for="'dp-input-stv-list-new-geburtsnation-' + uuid">Geburtsnation</label>
-							<fhc-form-validation name="geburtsnation">
-								<select :id="'stv-list-new-geburtsnation' + uuid" name="geburtsnation" class="form-select" v-model="formData['geburtsnation']">
-									<option v-for="nation in lists.nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.langtext}}</option>
-								</select>
-							</fhc-form-validation>
+							<form-input
+								label="Geburtsnation"
+								type="select"
+								id="stv-list-new-geburtsnation"
+								name="geburtsnation" class="form-select"
+								v-model="formData['geburtsnation']"
+								>
+								<option v-for="nation in lists.nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.langtext}}</option>
+							</form-input>
 						</div>
 						<div class="col-sm-4 mb-3">
-							<label :for="'dp-input-stv-list-new-staatsbuergerschaft-' + uuid">Staatsbürgerschaft</label>
-							<fhc-form-validation name="staatsbuergerschaft">
-								<select :id="'stv-list-new-staatsbuergerschaft' + uuid" name="staatsbuergerschaft" class="form-select" v-model="formData['staatsbuergerschaft']">
-									<option v-for="nation in lists.nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.langtext}}</option>
-								</select>
-							</fhc-form-validation>
+							<form-input
+								label="Staatsbürgerschaft"
+								type="select"
+								id="stv-list-new-staatsbuergerschaft"
+								name="staatsbuergerschaft"
+								v-model="formData['staatsbuergerschaft']"
+								>
+								<option v-for="nation in lists.nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.langtext}}</option>
+							</form-input>
 						</div>
 					</div>
 					<div class="row">
 						<div class="col-sm-4 mb-3">
-							<label :for="'stv-list-new-email-' + uuid">E-Mail</label>
-							<fhc-form-validation name="email">
-								<input :id="'stv-list-new-email-' + uuid" type="text" name="email" v-model="formDataPerson['email']" class="form-control">
-							</fhc-form-validation>
+							<form-input
+								label="E-Mail"
+								type="text"
+								id="stv-list-new-email"
+								name="email"
+								v-model="formDataPerson['email']"
+								>
+							</form-input>
 						</div>
 						<div class="col-sm-4 mb-3">
-							<label :for="'stv-list-new-telefon-' + uuid">Telefon</label>
-							<fhc-form-validation name="telefon">
-								<input :id="'stv-list-new-telefon-' + uuid" type="text" name="telefon" v-model="formDataPerson['telefon']" class="form-control">
-							</fhc-form-validation>
+							<form-input
+								label="Telefon"
+								type="text"
+								id="stv-list-new-telefon"
+								name="telefon"
+								v-model="formDataPerson['telefon']"
+								>
+							</form-input>
 						</div>
 						<div class="col-sm-4 mb-3">
-							<label :for="'stv-list-new-mobil-' + uuid">Mobil</label>
-							<fhc-form-validation name="mobil">
-								<input :id="'stv-list-new-mobil-' + uuid" type="text" name="mobil" v-model="formDataPerson['mobil']" class="form-control">
-							</fhc-form-validation>
+							<form-input
+								label="Mobil"
+								type="text"
+								id="stv-list-new-mobil"
+								name="mobil"
+								v-model="formDataPerson['mobil']"
+								>
+							</form-input>
 						</div>
 					</div>
 					<div class="row">
 						<div class="col-sm-4 mb-3">
-							<label :for="'stv-list-new-letzteausbildung-' + uuid">Letzte Ausbildung</label>
-							<fhc-form-validation name="letzteausbildung">
-								<select :id="'stv-list-new-letzteausbildung' + uuid" name="letzteausbildung" class="form-select" v-model="formData['letzteausbildung']">
-									<option v-for="ausbildung in lists.ausbildungen" :key="ausbildung.ausbildungcode" :value="ausbildung.ausbildungcode">{{ausbildung.ausbildungbez}}</option>
-								</select>
-							</fhc-form-validation>
+							<form-input
+								label="Letzte Ausbildung"
+								type="select"
+								id="stv-list-new-letzteausbildung"
+								name="letzteausbildung"
+								v-model="formData['letzteausbildung']"
+								>
+								<option v-for="ausbildung in lists.ausbildungen" :key="ausbildung.ausbildungcode" :value="ausbildung.ausbildungcode">{{ausbildung.ausbildungbez}}</option>
+							</form-input>
 						</div>
 						<div class="col-sm-4 mb-3">
-							<label :for="'stv-list-new-ausbildungsart-' + uuid">Ausbildungsart</label>
-							<fhc-form-validation name="ausbildungsart">
-								<input :id="'stv-list-new-ausbildungsart-' + uuid" type="text" name="ausbildungsart" v-model="formDataPerson['ausbildungsart']" class="form-control">
-							</fhc-form-validation>
+							<form-input
+								label="Ausbildungsart"
+								type="text"
+								id="stv-list-new-ausbildungsart"
+								name="ausbildungsart"
+								v-model="formDataPerson['ausbildungsart']"
+								>
+							</form-input>
 						</div>
 					</div>
 					<div class="row">
 						<div class="col-sm-8 mb-3">
-							<label :for="'stv-list-new-anmerkungen-' + uuid">Anmerkungen</label>
-							<fhc-form-validation name="anmerkungen">
-								<textarea :id="'stv-list-new-anmerkungen-' + uuid" name="anmerkungen" v-model="formDataPerson['anmerkungen']" class="form-control"></textarea>
-							</fhc-form-validation>
+							<form-input
+								label="Anmerkungen"
+								type="textarea"
+								id="stv-list-new-anmerkungen"
+								name="anmerkungen"
+								v-model="formDataPerson['anmerkungen']"
+								>
+							</form-input>
 						</div>
 					</div>
 					<div class="row">
 						<div class="col-sm-4 mb-3">
-							<label :for="'stv-list-new-studiengang_kz-' + uuid">Studiengang*</label>
-							<fhc-form-validation name="studiengang_kz">
-								<select :id="'stv-list-new-studiengang_kz-' + uuid" name="studiengang_kz" v-model="formDataStg" class="form-select">
-									<option v-for="stg in lists.stgs" :key="stg.studiengang_kz" :value="stg.studiengang_kz">{{stg.kuerzel}}</option>
-								</select>
-							</fhc-form-validation>
+							<form-input
+								label="Studiengang*"
+								type="select"
+								id="stv-list-new-studiengang_kz"
+								name="studiengang_kz"
+								v-model="formDataStg"
+								>
+								<option v-for="stg in lists.stgs" :key="stg.studiengang_kz" :value="stg.studiengang_kz">{{stg.kuerzel}}</option>
+							</form-input>
 						</div>
 						<div class="col-sm-4 mb-3">
-							<label :for="'stv-list-new-studiensemester_kurzbz-' + uuid">Studiensemester*</label>
-							<fhc-form-validation name="studiensemester_kurzbz">
-								<select :id="'stv-list-new-studiensemester_kurzbz-' + uuid" name="studiensemester_kurzbz" v-model="formDataSem" class="form-select">
-									<option v-for="sem in semester" :key="sem.studiensemester_kurzbz" :value="sem.studiensemester_kurzbz">{{sem.studiensemester_kurzbz}}</option>
-								</select>
-							</fhc-form-validation>
+							<form-input
+								label="Studiensemester*"
+								type="select"
+								id="stv-list-new-studiensemester_kurzbz"
+								name="studiensemester_kurzbz"
+								v-model="formDataSem"
+								>
+								<option v-for="sem in semester" :key="sem.studiensemester_kurzbz" :value="sem.studiensemester_kurzbz">{{sem.studiensemester_kurzbz}}</option>
+							</form-input>
 						</div>
 						<div class="col-sm-4 mb-3">
-							<label :for="'stv-list-new-ausbildungssemester-' + uuid">Ausbildungssemester*</label>
-							<fhc-form-validation name="ausbildungssemester">
-								<select :id="'stv-list-new-ausbildungssemester-' + uuid" name="ausbildungssemester" v-model="formData['ausbildungssemester']" class="form-select" @input="loadStudienplaene" :disabled="formData['incoming']">
-									<option v-for="sem in Array.from({length:8}).map((u,i) => i+1)" :key="sem" :value="sem">{{sem}}. Semester</option>
-								</select>
-							</fhc-form-validation>
+							<form-input
+								label="Ausbildungssemester*"
+								type="select"
+								id="stv-list-new-ausbildungssemester"
+								name="ausbildungssemester"
+								v-model="formData['ausbildungssemester']"
+								:disabled="formData['incoming']"
+								@input="loadStudienplaene"
+								>
+								<option v-for="sem in Array.from({length:8}).map((u,i) => i+1)" :key="sem" :value="sem">{{sem}}. Semester</option>
+							</form-input>
 						</div>
 					</div>
 					<div class="row">
 						<div class="col-sm-4 mb-3">
-							<label :for="'stv-list-new-orgform_kurzbz-' + uuid">OrgForm</label>
-							<fhc-form-validation name="orgform_kurzbz">
-								<select :id="'stv-list-new-orgform_kurzbz-' + uuid" name="orgform_kurzbz" v-model="formData['orgform_kurzbz']" class="form-select" @input="loadStudienplaene">
-									<option value="">-- keine Auswahl --</option>
-									<option v-for="orgform in lists.orgforms" :key="orgform.orgform_kurzbz" :value="orgform.orgform_kurzbz">{{orgform.bezeichnung}}</option>
-								</select>
-							</fhc-form-validation>
+							<form-input
+								label="OrgForm"
+								type="select"
+								id="stv-list-new-orgform_kurzbz"
+								name="orgform_kurzbz"
+								v-model="formData['orgform_kurzbz']"
+								@input="loadStudienplaene"
+								>
+								<option value="">-- keine Auswahl --</option>
+								<option v-for="orgform in lists.orgforms" :key="orgform.orgform_kurzbz" :value="orgform.orgform_kurzbz">{{orgform.bezeichnung}}</option>
+							</form-input>
 						</div>
 						<div class="col-sm-4 mb-3">
-							<label :for="'stv-list-new-studienplan_id-' + uuid">Studienplan</label>
-							<fhc-form-validation name="studienplan_id">
-								<select :id="'stv-list-new-studienplan_id-' + uuid" name="studienplan_id" v-model="formData['studienplan_id']" class="form-select">
-									<option value="">-- keine Auswahl --</option>
-									<option v-for="plan in studienplaene" :key="plan.studienplan_id" :value="plan.studienplan_id">{{plan.bezeichnung}}</option>
-								</select>
-							</fhc-form-validation>
+							<form-input
+								label="Studienplan"
+								type="select"
+								id="stv-list-new-studienplan_id"
+								name="studienplan_id"
+								v-model="formData['studienplan_id']"
+								>
+								<option value="">-- keine Auswahl --</option>
+								<option v-for="plan in studienplaene" :key="plan.studienplan_id" :value="plan.studienplan_id">{{plan.bezeichnung}}</option>
+							</form-input>
 						</div>
 					</div>
 					<div class="row">
 						<div class="col-10 mb-3">
 							<div class="form-check">
-								<fhc-form-validation name="incoming">
-									<input type="checkbox" :id="'stv-list-new-incoming-' + uuid" name="incoming" v-model="formData['incoming']" class="form-check-input" value="1">
-								</fhc-form-validation>
-								<label :for="'stv-list-new-incoming-' + uuid" class="form-check-label">Incoming</label>
+								<form-input
+									label="Incoming"
+									type="checkbox"
+									id="stv-list-new-incoming"
+									name="incoming"
+									v-model="formData['incoming']"
+									value="1"
+									>
+								</form-input>
 							</div>
 						</div>
 					</div>
@@ -513,5 +679,5 @@ export default {
 				<button type="submit" class="btn btn-primary">{{ person === null ? 'Person anlegen' : 'InteressentIn anlegen' }}</button>
 			</template>
 		</bs-modal>
-	</form>`
+	</fhc-form>`
 };
\ No newline at end of file

From 5d7370e4af12c27fdfb4fff3d311f89a71aed1da Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 29 Nov 2023 13:31:01 +0100
Subject: [PATCH 0191/1461] Form Validation reverse Arguments

---
 public/js/components/Form/Form.js       | 10 +++++-----
 public/js/components/Form/Input.js      |  4 +++-
 public/js/components/Form/Validation.js |  4 +++-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/public/js/components/Form/Form.js b/public/js/components/Form/Form.js
index bf9e318c0..9ca6af7e3 100644
--- a/public/js/components/Form/Form.js
+++ b/public/js/components/Form/Form.js
@@ -37,7 +37,7 @@ export default {
 	methods: {
 		_sendFeedbackToInput(inputs, feedback, valid) {
 			if (inputs.length) {
-				inputs.forEach(input => input.setFeedback(feedback, valid));
+				inputs.forEach(input => input.setFeedback(valid, feedback));
 				return false;
 			}
 			if (this.$fhcAlert) {
@@ -46,7 +46,7 @@ export default {
 			}
 			return true;
 		},
-		setFeedback(feedback, valid) {
+		setFeedback(valid, feedback) {
 			if (Array.isArray(feedback)) {
 				let remaining = feedback.filter(fb => 
 					this._sendFeedbackToInput(
@@ -91,7 +91,7 @@ export default {
 						const data = result.data.retval;
 						// TODO(chris): check for something better/add new standardized return value
 						if (result.data.code == 1)
-							this.setFeedback(data, true);
+							this.setFeedback(true, data);
 						return resolve(data);
 					}
 					// TODO(chris): IMPLEMENT! Wrong result object
@@ -103,8 +103,8 @@ export default {
 							return reject(result);
 						this.clearValidation();
 						const remaining = this.setFeedback(
-							result.response.data.retval,
-							false
+							false,
+							result.response.data.retval
 						);
 						if (remaining) {
 							result.response.data.retval = remaining;
diff --git a/public/js/components/Form/Input.js b/public/js/components/Form/Input.js
index 6b3ed5eb1..46ddbd3c5 100644
--- a/public/js/components/Form/Input.js
+++ b/public/js/components/Form/Input.js
@@ -121,7 +121,9 @@ export default {
 			this.valid = undefined;
 			this.feedback = [];
 		},
-		setFeedback(feedback, valid) {
+		setFeedback(valid, feedback) {
+			if (!feedback)
+				feedback = [];
 			if (!Array.isArray(feedback))
 				feedback = [feedback];
 			this.valid = valid;
diff --git a/public/js/components/Form/Validation.js b/public/js/components/Form/Validation.js
index 51ea3c689..8e8be6afa 100644
--- a/public/js/components/Form/Validation.js
+++ b/public/js/components/Form/Validation.js
@@ -15,7 +15,9 @@ export default {
 		clearValidation() {
 			this.feedback = FEEDBACK_DEFAULT;
 		},
-		setFeedback(feedback, valid) {
+		setFeedback(valid, feedback) {
+			if (!feedback)
+				feedback = [];
 			if (!Array.isArray(feedback))
 				feedback = [feedback];
 			this.feedback[valid ? 'success' : 'danger'] = feedback;

From dd2867a23d14e7a0737818590202165feb57fc2d Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 29 Nov 2023 15:14:34 +0100
Subject: [PATCH 0192/1461] composer

---
 composer.json |  55 +++---
 composer.lock | 458 +++++++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 447 insertions(+), 66 deletions(-)

diff --git a/composer.json b/composer.json
index 90da6ac20..7d1627420 100644
--- a/composer.json
+++ b/composer.json
@@ -26,28 +26,6 @@
 		"wiki": "https://wiki.fhcomplete.info/doku.php"
 	},
 	"repositories": [
-		{
-			"type": "package",
-			"package": {
-				"name": "vuepic/vue-datepicker-js",
-				"version": "4.0.0",
-				"dist": {
-					"url": "https://unpkg.com/@vuepic/vue-datepicker@4.0.0/dist/vue-datepicker.iife.js",
-					"type": "file"
-				}
-			}
-		},
-		{
-			"type": "package",
-			"package": {
-				"name": "vuepic/vue-datepicker-css",
-				"version": "4.0.0",
-				"dist": {
-					"url": "https://unpkg.com/@vuepic/vue-datepicker@4.0.0/dist/main.css",
-					"type": "file"
-				}
-			}
-		},
 		{
 			"type": "package",
 			"package": {
@@ -252,9 +230,9 @@
 			"type": "package",
 			"package": {
 				"name": "olifolkerd/tabulator5",
-				"version": "5.2.1",
+				"version": "5.5.2",
 				"dist": {
-					"url": "https://github.com/olifolkerd/tabulator/archive/refs/tags/5.2.1.zip",
+					"url": "https://github.com/olifolkerd/tabulator/archive/refs/tags/5.5.2.zip",
 					"type": "zip"
 				}
 			}
@@ -370,6 +348,28 @@
 				}
 			}
 		},
+                {
+                        "type": "package",
+                        "package": {
+                                "name": "vuejs/vuedatepicker_js",
+                                "version": "5.4.0",
+                                "dist": {
+                                        "url": "https://unpkg.com/@vuepic/vue-datepicker@5.4.0/dist/vue-datepicker.iife.js",
+                                        "type": "file"
+                                }
+                        }
+                },
+                {
+                        "type": "package",
+                        "package": {
+                                "name": "vuejs/vuedatepicker_css",
+                                "version": "5.4.0",
+                                "dist": {
+                                        "url": "https://unpkg.com/@vuepic/vue-datepicker@5.4.0/dist/main.css",
+                                        "type": "file"
+                                }
+                        }
+                },		
 		{
 			"type": "composer",
 			"url": "https://asset-packagist.org"
@@ -426,7 +426,7 @@
 		"npm-asset/primeicons": "5.0.0",
 
 		"olifolkerd/tabulator4": "4.9.*",
-		"olifolkerd/tabulator5": "5.2.*",
+		"olifolkerd/tabulator5": "5.5.*",
 
 		"phpseclib/phpseclib": "2.0.*",
 
@@ -443,8 +443,8 @@
 
 		"vuejs/vuejs3": "3.2.33",
 		"vuejs/vuerouter4": "4.1.3",
-		"vuepic/vue-datepicker-js": "4.*",
-		"vuepic/vue-datepicker-css": "4.*"
+		"vuejs/vuedatepicker_js": "5.4.0",
+		"vuejs/vuedatepicker_css": "5.4.0"
 	},
 	"config": {
 		"bin-dir": "vendor/bin"
@@ -456,4 +456,3 @@
 		"sebastian/phpcpd": "3.*"
 	}
 }
-
diff --git a/composer.lock b/composer.lock
index 72f13c76f..5660e87e9 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "d530cc4d7bd81812535eb64e87ba04f4",
+    "content-hash": "b6e875dbd1ec2554abbf9f7513806469",
     "packages": [
         {
             "name": "afarkas/html5shiv",
@@ -35,6 +35,10 @@
             ],
             "description": "Defacto way to enable use of HTML5 sectioning elements in legacy Internet Explorer.",
             "homepage": "http://paulirish.com/2011/the-history-of-the-html5-shiv/",
+            "support": {
+                "issues": "https://github.com/aFarkas/html5shiv/issues",
+                "source": "https://github.com/aFarkas/html5shiv/tree/3.7.3"
+            },
             "time": "2015-07-20T20:04:00+00:00"
         },
         {
@@ -130,6 +134,16 @@
             "keywords": [
                 "qr code"
             ],
+            "support": {
+                "issues": "https://github.com/chillerlan/php-qrcode/issues",
+                "source": "https://github.com/chillerlan/php-qrcode/tree/v2.0.x"
+            },
+            "funding": [
+                {
+                    "url": "https://ko-fi.com/codemasher",
+                    "type": "ko_fi"
+                }
+            ],
             "time": "2020-04-12T07:38:35+00:00"
         },
         {
@@ -178,6 +192,10 @@
                 "helper",
                 "trait"
             ],
+            "support": {
+                "issues": "https://github.com/chillerlan/php-traits/issues",
+                "source": "https://github.com/chillerlan/php-traits"
+            },
             "abandoned": true,
             "time": "2018-06-22T00:30:47+00:00"
         },
@@ -218,6 +236,10 @@
             ],
             "description": "REST Server for the CodeIgniter framework",
             "homepage": "https://github.com/chriskacerguis/codeigniter-restserver",
+            "support": {
+                "issues": "https://github.com/chriskacerguis/codeigniter-restserver/issues",
+                "source": "https://github.com/chriskacerguis/codeigniter-restserver"
+            },
             "time": "2017-09-23T16:44:55+00:00"
         },
         {
@@ -236,6 +258,10 @@
             },
             "type": "library",
             "notification-url": "https://packagist.org/downloads/",
+            "support": {
+                "issues": "https://github.com/akiyatkin/tablesorter/issues",
+                "source": "https://github.com/akiyatkin/tablesorter/tree/master"
+            },
             "time": "2016-09-02T11:31:54+00:00"
         },
         {
@@ -269,6 +295,13 @@
             ],
             "description": "The CodeIgniter framework",
             "homepage": "https://codeigniter.com",
+            "support": {
+                "forum": "http://forum.codeigniter.com/",
+                "issues": "https://github.com/bcit-ci/CodeIgniter/issues",
+                "slack": "https://codeigniterchat.slack.com",
+                "source": "https://github.com/bcit-ci/CodeIgniter",
+                "wiki": "https://github.com/bcit-ci/CodeIgniter/wiki"
+            },
             "time": "2022-03-03T13:21:49+00:00"
         },
         {
@@ -573,6 +606,10 @@
             ],
             "description": "Shim repository for Angular.js",
             "homepage": "http://angularjs.org",
+            "support": {
+                "issues": "https://github.com/components/angular.js/issues",
+                "source": "https://github.com/components/angular.js/tree/master"
+            },
             "time": "2015-06-07T20:10:38+00:00"
         },
         {
@@ -615,6 +652,13 @@
             ],
             "description": "jQuery JavaScript Library",
             "homepage": "http://jquery.com",
+            "support": {
+                "forum": "http://forum.jquery.com",
+                "irc": "irc://irc.freenode.org/jquery",
+                "issues": "https://github.com/jquery/jquery/issues",
+                "source": "https://github.com/jquery/jquery",
+                "wiki": "http://docs.jquery.com/"
+            },
             "time": "2021-03-20T19:13:42+00:00"
         },
         {
@@ -700,6 +744,10 @@
                 }
             ],
             "description": "jQuery UI is a curated set of user interface interactions, effects, widgets, and themes built on top of the jQuery JavaScript Library. Whether you're building highly interactive web applications or you just need to add a date picker to a form control, jQuery UI is the perfect choice.",
+            "support": {
+                "issues": "https://github.com/components/jqueryui/issues",
+                "source": "https://github.com/components/jqueryui/tree/master"
+            },
             "time": "2016-09-16T05:47:55+00:00"
         },
         {
@@ -749,6 +797,10 @@
                 "captcha",
                 "security"
             ],
+            "support": {
+                "issues": "https://github.com/dapphp/securimage/issues",
+                "source": "https://github.com/dapphp/securimage/tree/master"
+            },
             "abandoned": true,
             "time": "2018-03-09T06:07:41+00:00"
         },
@@ -812,6 +864,12 @@
                 "rdfa",
                 "sparql"
             ],
+            "support": {
+                "forum": "http://groups.google.com/group/easyrdf/",
+                "irc": "irc://chat.freenode.net/easyrdf",
+                "issues": "http://github.com/njh/easyrdf/issues",
+                "source": "https://github.com/easyrdf/easyrdf/tree/0.9.1"
+            },
             "time": "2015-02-27T09:45:49+00:00"
         },
         {
@@ -890,6 +948,10 @@
                 "faker",
                 "fixtures"
             ],
+            "support": {
+                "issues": "https://github.com/fzaninotto/Faker/issues",
+                "source": "https://github.com/fzaninotto/Faker/tree/v1.9.2"
+            },
             "abandoned": true,
             "time": "2020-12-11T09:56:16+00:00"
         },
@@ -1012,6 +1074,10 @@
                 "json",
                 "schema"
             ],
+            "support": {
+                "issues": "https://github.com/justinrainbow/json-schema/issues",
+                "source": "https://github.com/justinrainbow/json-schema/tree/master"
+            },
             "time": "2014-08-25T02:48:14+00:00"
         },
         {
@@ -1046,6 +1112,10 @@
                 }
             ],
             "description": "A framework-agnostic PHP Implementation for generating simple forms based on json-schema",
+            "support": {
+                "issues": "https://github.com/kingsquare/json-schema-form/issues",
+                "source": "https://github.com/kingsquare/json-schema-form/tree/master"
+            },
             "time": "2014-07-10T12:27:19+00:00"
         },
         {
@@ -1106,6 +1176,10 @@
             "keywords": [
                 "markdown"
             ],
+            "support": {
+                "issues": "https://github.com/michelf/php-markdown/issues",
+                "source": "https://github.com/michelf/php-markdown/tree/lib"
+            },
             "time": "2015-03-01T12:03:08+00:00"
         },
         {
@@ -1153,20 +1227,24 @@
                 "uri",
                 "url"
             ],
+            "support": {
+                "issues": "https://github.com/lanthaler/IRI/issues",
+                "source": "https://github.com/lanthaler/IRI/tree/master"
+            },
             "time": "2014-01-21T13:43:39+00:00"
         },
         {
             "name": "ml/json-ld",
-            "version": "1.2.0",
+            "version": "1.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/lanthaler/JsonLD.git",
-                "reference": "c74a1aed5979ed1cfb1be35a55a305fd30e30b93"
+                "reference": "537e68e87a6bce23e57c575cd5dcac1f67ce25d8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/lanthaler/JsonLD/zipball/c74a1aed5979ed1cfb1be35a55a305fd30e30b93",
-                "reference": "c74a1aed5979ed1cfb1be35a55a305fd30e30b93",
+                "url": "https://api.github.com/repos/lanthaler/JsonLD/zipball/537e68e87a6bce23e57c575cd5dcac1f67ce25d8",
+                "reference": "537e68e87a6bce23e57c575cd5dcac1f67ce25d8",
                 "shasum": ""
             },
             "require": {
@@ -1202,7 +1280,11 @@
                 "JSON-LD",
                 "jsonld"
             ],
-            "time": "2020-06-16T17:45:06+00:00"
+            "support": {
+                "issues": "https://github.com/lanthaler/JsonLD/issues",
+                "source": "https://github.com/lanthaler/JsonLD/tree/1.2.1"
+            },
+            "time": "2022-09-29T08:45:17+00:00"
         },
         {
             "name": "moment/momentjs",
@@ -1262,6 +1344,14 @@
                 "sorting",
                 "table"
             ],
+            "support": {
+                "docs": "https://mottie.github.io/tablesorter/docs/index.html",
+                "email": "wowmotty@gmail.com",
+                "irc": "irc://irc.freenode.org/tablesorter",
+                "issues": "https://github.com/Mottie/tablesorter/issues",
+                "source": "https://github.com/Mottie/tablesorter",
+                "wiki": "https://github.com/Mottie/tablesorter/wiki"
+            },
             "time": "2020-03-03T13:46:03+00:00"
         },
         {
@@ -1312,6 +1402,10 @@
                 "rest",
                 "restful"
             ],
+            "support": {
+                "issues": "https://github.com/nategood/httpful/issues",
+                "source": "https://github.com/nategood/httpful/tree/v0.2.20"
+            },
             "time": "2015-10-26T16:11:30+00:00"
         },
         {
@@ -1365,6 +1459,12 @@
                 "plaintext",
                 "textile"
             ],
+            "support": {
+                "irc": "irc://irc.freenode.net/textile",
+                "issues": "https://github.com/textile/php-textile/issues",
+                "source": "https://github.com/textile/php-textile",
+                "wiki": "https://github.com/textile/php-textile/wiki"
+            },
             "time": "2022-05-01T17:05:16+00:00"
         },
         {
@@ -1390,10 +1490,10 @@
         },
         {
             "name": "npm-asset/primevue",
-            "version": "3.15.0",
+            "version": "3.29.2",
             "dist": {
                 "type": "tar",
-                "url": "https://registry.npmjs.org/primevue/-/primevue-3.15.0.tgz"
+                "url": "https://registry.npmjs.org/primevue/-/primevue-3.29.2.tgz"
             },
             "type": "npm-asset",
             "license": [
@@ -1411,25 +1511,25 @@
         },
         {
             "name": "olifolkerd/tabulator5",
-            "version": "5.2.1",
+            "version": "5.5.2",
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/olifolkerd/tabulator/archive/refs/tags/5.2.1.zip"
+                "url": "https://github.com/olifolkerd/tabulator/archive/refs/tags/5.5.2.zip"
             },
             "type": "library"
         },
         {
             "name": "phpseclib/phpseclib",
-            "version": "2.0.37",
+            "version": "2.0.44",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "c812fbb4d6b4d7f30235ab7298a12f09ba13b37c"
+                "reference": "149f608243f8133c61926aae26ce67d2b22b37e5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/c812fbb4d6b4d7f30235ab7298a12f09ba13b37c",
-                "reference": "c812fbb4d6b4d7f30235ab7298a12f09ba13b37c",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/149f608243f8133c61926aae26ce67d2b22b37e5",
+                "reference": "149f608243f8133c61926aae26ce67d2b22b37e5",
                 "shasum": ""
             },
             "require": {
@@ -1444,7 +1544,8 @@
                 "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.",
                 "ext-libsodium": "SSH2/SFTP can make use of some algorithms provided by the libsodium-php extension.",
                 "ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.",
-                "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations."
+                "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations.",
+                "ext-xml": "Install the XML extension to load XML formatted public keys."
             },
             "type": "library",
             "autoload": {
@@ -1507,7 +1608,25 @@
                 "x.509",
                 "x509"
             ],
-            "time": "2022-04-04T04:57:45+00:00"
+            "support": {
+                "issues": "https://github.com/phpseclib/phpseclib/issues",
+                "source": "https://github.com/phpseclib/phpseclib/tree/2.0.44"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/terrafrost",
+                    "type": "github"
+                },
+                {
+                    "url": "https://www.patreon.com/phpseclib",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/phpseclib/phpseclib",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-06-13T08:41:47+00:00"
         },
         {
             "name": "rmariuzzo/jquery-checkboxes",
@@ -1587,6 +1706,23 @@
                 "polyfill",
                 "portable"
             ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.19.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-10-23T09:01:57+00:00"
         },
         {
@@ -1706,8 +1842,30 @@
             "keywords": [
                 "templating"
             ],
+            "support": {
+                "issues": "https://github.com/twigphp/Twig/issues",
+                "source": "https://github.com/twigphp/Twig/tree/1.x"
+            },
             "time": "2020-02-11T05:59:23+00:00"
         },
+        {
+            "name": "vuejs/vuedatepicker_css",
+            "version": "5.4.0",
+            "dist": {
+                "type": "file",
+                "url": "https://unpkg.com/@vuepic/vue-datepicker@5.4.0/dist/main.css"
+            },
+            "type": "library"
+        },
+        {
+            "name": "vuejs/vuedatepicker_js",
+            "version": "5.4.0",
+            "dist": {
+                "type": "file",
+                "url": "https://unpkg.com/@vuepic/vue-datepicker@5.4.0/dist/vue-datepicker.iife.js"
+            },
+            "type": "library"
+        },
         {
             "name": "vuejs/vuejs3",
             "version": "3.2.33",
@@ -1779,6 +1937,24 @@
                 "regex",
                 "regular expression"
             ],
+            "support": {
+                "issues": "https://github.com/composer/pcre/issues",
+                "source": "https://github.com/composer/pcre/tree/1.0.1"
+            },
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/composer",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2022-01-21T20:24:37+00:00"
         },
         {
@@ -1826,20 +2002,39 @@
                 "Xdebug",
                 "performance"
             ],
+            "support": {
+                "irc": "irc://irc.freenode.org/composer",
+                "issues": "https://github.com/composer/xdebug-handler/issues",
+                "source": "https://github.com/composer/xdebug-handler/tree/2.0.5"
+            },
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/composer",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2022-02-24T20:20:32+00:00"
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.14.0",
+            "version": "v4.16.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "34bea19b6e03d8153165d8f30bba4c3be86184c1"
+                "reference": "19526a33fb561ef417e822e85f08a00db4059c17"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/34bea19b6e03d8153165d8f30bba4c3be86184c1",
-                "reference": "34bea19b6e03d8153165d8f30bba4c3be86184c1",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/19526a33fb561ef417e822e85f08a00db4059c17",
+                "reference": "19526a33fb561ef417e822e85f08a00db4059c17",
                 "shasum": ""
             },
             "require": {
@@ -1878,20 +2073,24 @@
                 "parser",
                 "php"
             ],
-            "time": "2022-05-31T20:59:12+00:00"
+            "support": {
+                "issues": "https://github.com/nikic/PHP-Parser/issues",
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.16.0"
+            },
+            "time": "2023-06-25T14:52:30+00:00"
         },
         {
             "name": "pdepend/pdepend",
-            "version": "2.10.3",
+            "version": "2.14.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pdepend/pdepend.git",
-                "reference": "da3166a06b4a89915920a42444f707122a1584c9"
+                "reference": "1121d4b04af06e33e9659bac3a6741b91cab1de1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pdepend/pdepend/zipball/da3166a06b4a89915920a42444f707122a1584c9",
-                "reference": "da3166a06b4a89915920a42444f707122a1584c9",
+                "url": "https://api.github.com/repos/pdepend/pdepend/zipball/1121d4b04af06e33e9659bac3a6741b91cab1de1",
+                "reference": "1121d4b04af06e33e9659bac3a6741b91cab1de1",
                 "shasum": ""
             },
             "require": {
@@ -1925,26 +2124,42 @@
                 "BSD-3-Clause"
             ],
             "description": "Official version of pdepend to be handled with Composer",
-            "time": "2022-02-23T07:53:09+00:00"
+            "keywords": [
+                "PHP Depend",
+                "PHP_Depend",
+                "dev",
+                "pdepend"
+            ],
+            "support": {
+                "issues": "https://github.com/pdepend/pdepend/issues",
+                "source": "https://github.com/pdepend/pdepend/tree/2.14.0"
+            },
+            "funding": [
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/pdepend/pdepend",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-05-26T13:15:18+00:00"
         },
         {
             "name": "phpmd/phpmd",
-            "version": "2.12.0",
+            "version": "2.13.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpmd/phpmd.git",
-                "reference": "c0b678ba71902f539c27c14332aa0ddcf14388ec"
+                "reference": "dad0228156856b3ad959992f9748514fa943f3e3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpmd/phpmd/zipball/c0b678ba71902f539c27c14332aa0ddcf14388ec",
-                "reference": "c0b678ba71902f539c27c14332aa0ddcf14388ec",
+                "url": "https://api.github.com/repos/phpmd/phpmd/zipball/dad0228156856b3ad959992f9748514fa943f3e3",
+                "reference": "dad0228156856b3ad959992f9748514fa943f3e3",
                 "shasum": ""
             },
             "require": {
                 "composer/xdebug-handler": "^1.0 || ^2.0 || ^3.0",
                 "ext-xml": "*",
-                "pdepend/pdepend": "^2.10.3",
+                "pdepend/pdepend": "^2.12.1",
                 "php": ">=5.3.9"
             },
             "require-dev": {
@@ -1997,20 +2212,31 @@
                 "phpmd",
                 "pmd"
             ],
-            "time": "2022-03-24T13:33:01+00:00"
+            "support": {
+                "irc": "irc://irc.freenode.org/phpmd",
+                "issues": "https://github.com/phpmd/phpmd/issues",
+                "source": "https://github.com/phpmd/phpmd/tree/2.13.0"
+            },
+            "funding": [
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/phpmd/phpmd",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-09-10T08:44:15+00:00"
         },
         {
             "name": "phpmetrics/phpmetrics",
-            "version": "v2.8.1",
+            "version": "v2.8.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpmetrics/PhpMetrics.git",
-                "reference": "e279f7317390f642339941b693359e9a181817a7"
+                "reference": "4b77140a11452e63c7a9b98e0648320bf6710090"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpmetrics/PhpMetrics/zipball/e279f7317390f642339941b693359e9a181817a7",
-                "reference": "e279f7317390f642339941b693359e9a181817a7",
+                "url": "https://api.github.com/repos/phpmetrics/PhpMetrics/zipball/4b77140a11452e63c7a9b98e0648320bf6710090",
+                "reference": "4b77140a11452e63c7a9b98e0648320bf6710090",
                 "shasum": ""
             },
             "require": {
@@ -2061,7 +2287,11 @@
                 "quality",
                 "testing"
             ],
-            "time": "2022-03-24T10:19:51+00:00"
+            "support": {
+                "issues": "https://github.com/PhpMetrics/PhpMetrics/issues",
+                "source": "https://github.com/phpmetrics/PhpMetrics/tree/v2.8.2"
+            },
+            "time": "2023-03-08T15:03:36+00:00"
         },
         {
             "name": "phpunit/php-timer",
@@ -2110,6 +2340,10 @@
             "keywords": [
                 "timer"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-timer/issues",
+                "source": "https://github.com/sebastianbergmann/php-timer/tree/master"
+            },
             "time": "2017-02-26T11:10:40+00:00"
         },
         {
@@ -2159,6 +2393,10 @@
                 "container-interop",
                 "psr"
             ],
+            "support": {
+                "issues": "https://github.com/php-fig/container/issues",
+                "source": "https://github.com/php-fig/container/tree/master"
+            },
             "time": "2017-02-14T16:28:37+00:00"
         },
         {
@@ -2206,6 +2444,9 @@
                 "psr",
                 "psr-3"
             ],
+            "support": {
+                "source": "https://github.com/php-fig/log/tree/1.1.4"
+            },
             "time": "2021-05-03T11:20:27+00:00"
         },
         {
@@ -2245,6 +2486,10 @@
             ],
             "description": "FinderFacade is a convenience wrapper for Symfony's Finder component.",
             "homepage": "https://github.com/sebastianbergmann/finder-facade",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/finder-facade/issues",
+                "source": "https://github.com/sebastianbergmann/finder-facade/tree/master"
+            },
             "abandoned": true,
             "time": "2017-11-18T17:31:49+00:00"
         },
@@ -2296,6 +2541,11 @@
             ],
             "description": "Copy/Paste Detector (CPD) for PHP code.",
             "homepage": "https://github.com/sebastianbergmann/phpcpd",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/phpcpd/issues",
+                "source": "https://github.com/sebastianbergmann/phpcpd/tree/master"
+            },
+            "abandoned": true,
             "time": "2017-11-16T08:49:28+00:00"
         },
         {
@@ -2339,6 +2589,10 @@
             ],
             "description": "Library that helps with managing the version number of Git-hosted PHP projects",
             "homepage": "https://github.com/sebastianbergmann/version",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/version/issues",
+                "source": "https://github.com/sebastianbergmann/version/tree/master"
+            },
             "time": "2016-10-03T07:35:21+00:00"
         },
         {
@@ -2390,6 +2644,11 @@
                 "phpcs",
                 "standards"
             ],
+            "support": {
+                "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues",
+                "source": "https://github.com/squizlabs/PHP_CodeSniffer",
+                "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki"
+            },
             "time": "2021-12-12T21:44:58+00:00"
         },
         {
@@ -2449,6 +2708,23 @@
             ],
             "description": "Symfony Config Component",
             "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/config/tree/v3.4.47"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-10-24T10:57:07+00:00"
         },
         {
@@ -2516,6 +2792,23 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/console/tree/v3.4.47"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-10-24T10:57:07+00:00"
         },
         {
@@ -2567,6 +2860,23 @@
             ],
             "description": "Symfony Debug Component",
             "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/debug/tree/v3.4.47"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "abandoned": "symfony/error-handler",
             "time": "2020-10-24T10:57:07+00:00"
         },
@@ -2634,6 +2944,23 @@
             ],
             "description": "Symfony DependencyInjection Component",
             "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/dependency-injection/tree/v3.4.47"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-10-24T10:57:07+00:00"
         },
         {
@@ -2679,6 +3006,23 @@
             ],
             "description": "Symfony Filesystem Component",
             "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/filesystem/tree/v3.4.47"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-10-24T10:57:07+00:00"
         },
         {
@@ -2723,6 +3067,23 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/finder/tree/v3.4.47"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-11-16T17:02:08+00:00"
         },
         {
@@ -2786,6 +3147,23 @@
                 "portable",
                 "shim"
             ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.19.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-10-23T09:01:57+00:00"
         },
         {
@@ -2829,6 +3207,10 @@
             ],
             "description": "The classes contained within this repository extend the standard DOM to use exceptions at all occasions of errors instead of PHP warnings or notices. They also add various custom methods and shortcuts for convenience and to simplify the usage of DOM.",
             "homepage": "https://github.com/theseer/fDOMDocument",
+            "support": {
+                "issues": "https://github.com/theseer/fDOMDocument/issues",
+                "source": "https://github.com/theseer/fDOMDocument/tree/1.6.7"
+            },
             "abandoned": true,
             "time": "2022-01-25T23:10:35+00:00"
         }
@@ -2842,5 +3224,5 @@
         "php": ">=5.6.40"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.2.0"
 }

From a8b4e2b399013d1eca1c1ab73d8dfd65e5ac02d2 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 29 Nov 2023 15:18:15 +0100
Subject: [PATCH 0193/1461] dont use "useForm" anymore

---
 public/js/components/Stv/Studentenverwaltung/List/New.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/List/New.js b/public/js/components/Stv/Studentenverwaltung/List/New.js
index 8df462909..d62f92dd3 100644
--- a/public/js/components/Stv/Studentenverwaltung/List/New.js
+++ b/public/js/components/Stv/Studentenverwaltung/List/New.js
@@ -3,7 +3,6 @@ import BsModal from '../../../Bootstrap/Modal.js';
 import FhcForm from '../../../Form/Form.js';
 import FormValidation from '../../../Form/Validation.js';
 import FormInput from '../../../Form/Input.js';
-import { useForm } from '../../../../composables/Form.js';
 import accessibility from '../../../../directives/accessibility.js';
 
 var _uuid = 0;

From 6f3335cc3dc8c9e0c57f6aaf5011e8f67f4fe458 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 29 Nov 2023 15:25:39 +0100
Subject: [PATCH 0194/1461] vue-datepicker

---
 public/css/components/vue-datepicker.css  | 4 ++--
 public/js/components/vueDatepicker.js.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/css/components/vue-datepicker.css b/public/css/components/vue-datepicker.css
index ad8d2562c..55a2c80ca 100644
--- a/public/css/components/vue-datepicker.css
+++ b/public/css/components/vue-datepicker.css
@@ -1,2 +1,2 @@
-.dp__input_wrap{position:relative;width:100%;box-sizing:unset}.dp__input_wrap:focus{border-color:var(--dp-border-color-hover);outline:none}.dp__input{background-color:var(--dp-background-color);border-radius:4px;font-family:-apple-system,blinkmacsystemfont,"Segoe UI",roboto,oxygen,ubuntu,cantarell,"Open Sans","Helvetica Neue",sans-serif;border:1px solid var(--dp-border-color);outline:none;transition:border-color .2s cubic-bezier(0.645, 0.045, 0.355, 1);width:100%;font-size:1rem;line-height:1.5rem;padding:6px 12px;color:var(--dp-text-color);box-sizing:border-box}.dp__input::placeholder{opacity:.7}.dp__input_reg{caret-color:rgba(0,0,0,0)}.dp__input_focus{border-color:var(--dp-border-color-hover)}.dp__disabled{background:var(--dp-disabled-color)}.dp__disabled::placeholder{color:var(--dp-disabled-color-text)}.dp__input_icons{display:inline-block;width:1rem;height:1rem;stroke-width:0;font-size:1rem;line-height:1.5rem;padding:6px 12px;color:var(--dp-icon-color);box-sizing:content-box}.dp__input_icon{cursor:pointer;position:absolute;top:50%;left:0;transform:translateY(-50%);color:var(--dp-icon-color)}.dp__clear_icon{position:absolute;top:50%;right:0;transform:translateY(-50%);cursor:pointer;color:var(--dp-icon-color)}.dp__input_icon_pad{padding-left:35px}.dp__input_valid{box-shadow:0 0 4px var(--dp-success-color);border-color:var(--dp-success-color)}.dp__input_valid:hover{border-color:var(--dp-success-color)}.dp__input_invalid{box-shadow:0 0 4px var(--dp-danger-color);border-color:var(--dp-danger-color)}.dp__input_invalid:hover{border-color:var(--dp-danger-color)}.dp__menu{position:fixed;background:var(--dp-background-color);border-radius:4px;min-width:260px;font-family:-apple-system,blinkmacsystemfont,"Segoe UI",roboto,oxygen,ubuntu,cantarell,"Open Sans","Helvetica Neue",sans-serif;font-size:1rem;user-select:none;border:1px solid var(--dp-menu-border-color);box-sizing:border-box}.dp__menu::after{box-sizing:border-box}.dp__menu::before{box-sizing:border-box}.dp__menu:focus{border:1px solid var(--dp-menu-border-color);outline:none}.dp__menu_index{z-index:99999}.dp__menu_readonly,.dp__menu_disabled{position:absolute;top:0;left:0;right:0;bottom:0;z-index:1}.dp__menu_disabled{background:rgba(255,255,255,.5);cursor:not-allowed}.dp__menu_readonly{background:rgba(0,0,0,0);cursor:default}.dp__arrow_top{left:50%;top:-1px;height:12px;width:12px;background-color:var(--dp-background-color);position:absolute;border-left:1px solid var(--dp-menu-border-color);border-top:1px solid var(--dp-menu-border-color);transform:translate(-50%, -50%) rotate(45deg)}.dp__arrow_bottom{left:50%;bottom:-1px;height:12px;width:12px;background-color:var(--dp-background-color);position:absolute;border-right:1px solid var(--dp-menu-border-color);border-bottom:1px solid var(--dp-menu-border-color);transform:translate(-50%, 50%) rotate(45deg)}.dp__now_wrap{text-align:center;padding:2px 0}.dp__now_button{border:1px solid var(--dp-primary-color);color:var(--dp-primary-color);padding:0 4px;font-weight:bold;border-radius:4px;font-size:1rem;cursor:pointer;background:rgba(0,0,0,0)}.dp__preset_ranges{padding:5px;border-right:1px solid var(--dp-border-color)}.dp__sidebar_left{padding:5px;border-right:1px solid var(--dp-border-color)}.dp__sidebar_right{padding:5px;border-left:1px solid var(--dp-border-color)}.dp__preset_range{padding:5px}.dp__preset_range:hover{background-color:var(--dp-hover-color);cursor:pointer}.dp__menu_content_wrapper{display:flex}.dp__calendar_wrap{display:flex;justify-content:center;align-items:center;flex-direction:column;font-family:-apple-system,blinkmacsystemfont,"Segoe UI",roboto,oxygen,ubuntu,cantarell,"Open Sans","Helvetica Neue",sans-serif;flex:0}.dp__calendar_header{position:relative;display:flex;justify-content:center;align-items:center;color:var(--dp-text-color);white-space:nowrap;font-weight:bold}.dp__calendar_header_item{text-align:center;flex-grow:1;height:35px;padding:5px;width:35px;box-sizing:border-box}.dp__calendar_row{display:flex;justify-content:center;align-items:center;margin:5px 0}.dp__calendar_item{text-align:center;flex-grow:1;box-sizing:border-box;color:var(--dp-text-color)}.dp__calendar{position:relative}.dp__calendar_header_cell{border-bottom:thin solid var(--dp-border-color);padding:.5rem}.dp__cell_inner{display:flex;align-items:center;text-align:center;justify-content:center;border-radius:4px;height:35px;padding:5px;width:35px;border:1px solid rgba(0,0,0,0);box-sizing:border-box;position:relative}.dp__cell_auto_range_start,.dp__date_hover_start:hover,.dp__range_start{border-bottom-right-radius:0;border-top-right-radius:0}.dp__cell_auto_range_end,.dp__date_hover_end:hover,.dp__range_end{border-bottom-left-radius:0;border-top-left-radius:0}.dp__range_end,.dp__range_start,.dp__active_date{background:var(--dp-primary-color);color:var(--dp-primary-text-color)}.dp__cell_auto_range_end,.dp__cell_auto_range_start{border-top:1px dashed var(--dp-primary-color);border-bottom:1px dashed var(--dp-primary-color)}.dp__date_hover_end:hover,.dp__date_hover_start:hover,.dp__date_hover:hover{background:var(--dp-hover-color);color:var(--dp-hover-text-color)}.dp__cell_offset{color:var(--dp-secondary-color)}.dp__cell_disabled{color:var(--dp-secondary-color);cursor:not-allowed}.dp__range_between{background:var(--dp-hover-color);border-radius:0;border-top:1px solid var(--dp-hover-color);border-bottom:1px solid var(--dp-hover-color)}.dp__range_between_week{background:var(--dp-primary-color);color:var(--dp-primary-text-color);border-radius:0;border-top:1px solid var(--dp-primary-color);border-bottom:1px solid var(--dp-primary-color)}.dp__today{border:1px solid var(--dp-primary-color)}.dp__week_num{color:var(--dp-secondary-color);text-align:center}.dp__cell_auto_range{border-radius:0;border-top:1px dashed var(--dp-primary-color);border-bottom:1px dashed var(--dp-primary-color)}.dp__cell_auto_range_start{border-left:1px dashed var(--dp-primary-color)}.dp__cell_auto_range_end{border-right:1px dashed var(--dp-primary-color)}.dp__calendar_header_separator{width:100%;height:1px;background:var(--dp-border-color)}.dp__calendar_next{margin-left:10px}.dp__marker_line,.dp__marker_dot{height:5px;background-color:var(--dp-marker-color);position:absolute;bottom:0}.dp__marker_dot{width:5px;border-radius:50%;left:50%;transform:translateX(-50%)}.dp__marker_line{width:100%;left:0}.dp__marker_tooltip{position:absolute;border-radius:4px;background-color:var(--dp-tooltip-color);padding:5px;border:1px solid var(--dp-border-color);z-index:99999;box-sizing:border-box;cursor:default}.dp__tooltip_content{white-space:nowrap}.dp__tooltip_text{display:flex;align-items:center;flex-flow:row nowrap;color:var(--dp-text-color)}.dp__tooltip_mark{height:5px;width:5px;border-radius:50%;background-color:var(--dp-text-color);color:var(--dp-text-color);margin-right:5px}.dp__arrow_bottom_tp{left:50%;bottom:0;height:8px;width:8px;background-color:var(--dp-tooltip-color);position:absolute;border-right:1px solid var(--dp-border-color);border-bottom:1px solid var(--dp-border-color);transform:translate(-50%, 50%) rotate(45deg)}.dp__instance_calendar{position:relative;width:100%}@media only screen and (max-width: 600px){.dp__flex_display{flex-direction:column}}.dp__cell_highlight{background-color:var(--dp-highlight-color)}.dp__month_year_row{display:flex;align-items:center;height:35px;color:var(--dp-text-color);box-sizing:border-box}.dp__inner_nav{display:flex;align-items:center;justify-content:center;cursor:pointer;height:25px;width:25px;color:var(--dp-icon-color);text-align:center;border-radius:50%}.dp__inner_nav svg{height:20px;width:20px}.dp__inner_nav:hover{background:var(--dp-hover-color);color:var(--dp-hover-icon-color)}.dp__inner_nav_disabled:hover,.dp__inner_nav_disabled{background:var(--dp-disabled-color);color:var(--dp-disabled-color-text);cursor:not-allowed}.dp__month_year_select{width:50%;text-align:center;cursor:pointer;height:35px;display:flex;align-items:center;justify-content:center;border-radius:4px;box-sizing:border-box}.dp__month_year_select:hover{background:var(--dp-hover-color);color:var(--dp-hover-text-color)}.dp__month_year_wrap{display:flex;width:100%}.dp__overlay{position:absolute;width:100%;height:100%;background:var(--dp-background-color);top:0;left:0;transition:opacity 1s ease-out;z-index:99999;font-family:-apple-system,blinkmacsystemfont,"Segoe UI",roboto,oxygen,ubuntu,cantarell,"Open Sans","Helvetica Neue",sans-serif;color:var(--dp-text-color);box-sizing:border-box}.dp__overlay_container::-webkit-scrollbar-track{box-shadow:var(--dp-scroll-bar-background);background-color:var(--dp-scroll-bar-background)}.dp__overlay_container::-webkit-scrollbar{width:5px;background-color:var(--dp-scroll-bar-background)}.dp__overlay_container::-webkit-scrollbar-thumb{background-color:var(--dp-scroll-bar-color);border-radius:10px}.dp__overlay:focus{border:none;outline:none}.dp__container_flex{display:flex}.dp__container_block{display:block}.dp__overlay_container{flex-direction:column;overflow-y:auto}.dp__time_picker_overlay_container{height:100%}.dp__overlay_row{padding:0;box-sizing:border-box;display:flex;margin-left:auto;margin-right:auto;flex-wrap:wrap;max-width:100%;width:100%;align-items:center}.dp__overlay_container>.dp__overlay_row{flex:1}.dp__overlay_col{box-sizing:border-box;width:33%;padding:3px;white-space:nowrap}.dp__overlay_cell_pad{padding:10px 0}.dp__overlay_cell_active{cursor:pointer;border-radius:4px;text-align:center;background:var(--dp-primary-color);color:var(--dp-primary-text-color)}.dp__overlay_cell{cursor:pointer;border-radius:4px;text-align:center}.dp__overlay_cell:hover{background:var(--dp-hover-color);color:var(--dp-hover-text-color)}.dp__cell_in_between{background:var(--dp-hover-color);color:var(--dp-hover-text-color)}.dp__overlay_action{position:sticky;bottom:0;background:#fff}.dp__over_action_scroll{right:5px;box-sizing:border-box}.dp__overlay_cell_disabled{cursor:not-allowed;background:var(--dp-disabled-color)}.dp__overlay_cell_disabled:hover{background:var(--dp-disabled-color)}.dp__overlay_cell_active_disabled{cursor:not-allowed;background:var(--dp-primary-disabled-color)}.dp__overlay_cell_active_disabled:hover{background:var(--dp-primary-disabled-color)}.dp__month_picker_header{display:flex;width:100%;align-items:center;justify-content:space-between;height:35px}.dp__time_input{width:100%;display:flex;align-items:center;justify-content:center;user-select:none;font-family:-apple-system,blinkmacsystemfont,"Segoe UI",roboto,oxygen,ubuntu,cantarell,"Open Sans","Helvetica Neue",sans-serif;color:var(--dp-text-color)}.dp__time_col_reg{padding:0 20px}.dp__time_col_reg_with_button{padding:0 15px}.dp__time_col_sec{padding:0 10px}.dp__time_col_sec_with_button{padding:0 5px}.dp__time_col{font-size:2rem;text-align:center;display:flex;align-items:center;justify-content:center;flex-direction:column}.dp__time_display{cursor:pointer;color:var(--dp-text-color);border-radius:4px;display:flex;align-items:center;justify-content:center;padding:0 3px}.dp__time_display:hover{background:var(--dp-hover-color);color:var(--dp-hover-text-color)}.dp__inc_dec_button{padding:5px;margin:0;height:32px;width:32px;display:flex;align-items:center;justify-content:center;cursor:pointer;border-radius:50%;color:var(--dp-icon-color);box-sizing:border-box}.dp__inc_dec_button svg{height:32px;width:32px}.dp__inc_dec_button:hover{background:var(--dp-hover-color);color:var(--dp-primary-color)}.dp__inc_dec_button_disabled:hover,.dp__inc_dec_button_disabled{background:var(--dp-disabled-color);color:var(--dp-disabled-color-text);cursor:not-allowed}.dp__pm_am_button{background:var(--dp-primary-color);color:var(--dp-primary-text-color);border:none;padding:10px;border-radius:4px;cursor:pointer}.dp__action_row{display:flex;align-items:center;width:100%;padding:10px;box-sizing:border-box;color:var(--dp-text-color);background:var(--dp-background-color)}.dp__action_row svg{height:20px;width:auto}.dp__selection_preview{width:50%;color:var(--dp-text-color);font-size:.8rem}.dp__action_buttons{width:50%;text-align:right}.dp__action{font-weight:bold;cursor:pointer;padding:2px 5px;border-radius:4px;display:inline-flex;align-items:center}.dp__select{color:var(--dp-success-color)}.dp__action_disabled{color:var(--dp-success-color-disabled);cursor:not-allowed}.dp__cancel{color:var(--dp-secondary-color)}.dp__theme_dark{--dp-background-color: #212121;--dp-text-color: #fff;--dp-hover-color: #484848;--dp-hover-text-color: #fff;--dp-hover-icon-color: #959595;--dp-primary-color: #005cb2;--dp-primary-disabled-color: #61a8ea;--dp-primary-text-color: #fff;--dp-secondary-color: #a9a9a9;--dp-border-color: #2d2d2d;--dp-menu-border-color: #2d2d2d;--dp-border-color-hover: #aaaeb7;--dp-disabled-color: #737373;--dp-disabled-color-text: #d0d0d0;--dp-scroll-bar-background: #212121;--dp-scroll-bar-color: #484848;--dp-success-color: #00701a;--dp-success-color-disabled: #428f59;--dp-icon-color: #959595;--dp-danger-color: #e53935;--dp-marker-color: #e53935;--dp-tooltip-color: #3e3e3e;--dp-highlight-color: rgb(0 92 178 / 20%)}.dp__theme_light{--dp-background-color: #fff;--dp-text-color: #212121;--dp-hover-color: #f3f3f3;--dp-hover-text-color: #212121;--dp-hover-icon-color: #959595;--dp-primary-color: #1976d2;--dp-primary-disabled-color: #6bacea;--dp-primary-text-color: #f8f5f5;--dp-secondary-color: #c0c4cc;--dp-border-color: #ddd;--dp-menu-border-color: #ddd;--dp-border-color-hover: #aaaeb7;--dp-disabled-color: #f6f6f6;--dp-scroll-bar-background: #f3f3f3;--dp-scroll-bar-color: #959595;--dp-success-color: #76d275;--dp-success-color-disabled: #a3d9b1;--dp-icon-color: #959595;--dp-danger-color: #ff6f60;--dp-marker-color: #ff6f60;--dp-tooltip-color: #fafafa;--dp-disabled-color-text: #8e8e8e;--dp-highlight-color: rgb(25 118 210 / 10%)}.dp__main{font-family:-apple-system,blinkmacsystemfont,"Segoe UI",roboto,oxygen,ubuntu,cantarell,"Open Sans","Helvetica Neue",sans-serif;user-select:none;box-sizing:border-box}.dp__pointer{cursor:pointer}.dp__icon{stroke:currentcolor;fill:currentcolor}.dp__button{width:100%;text-align:center;color:var(--dp-icon-color);background:var(--dp-background-color);cursor:pointer;display:flex;align-items:center;align-content:center;justify-content:center;padding:10px;box-sizing:border-box;height:35px}.dp__button:hover{background:var(--dp-hover-color);color:var(--dp-hover-icon-color)}.dp__button svg{height:20px;width:auto}.dp__button_bottom{border-bottom-left-radius:4px;border-bottom-right-radius:4px}.dp__flex_display{display:flex}.dp__flex_display_with_input{flex-direction:column;align-items:start}.dp__relative{position:relative}.calendar-next-enter-active,.calendar-next-leave-active,.calendar-prev-enter-active,.calendar-prev-leave-active{transition:all .1s ease-out}.calendar-next-enter-from{opacity:0;transform:translateX(22px)}.calendar-next-leave-to{opacity:0;transform:translateX(-22px)}.calendar-prev-enter-from{opacity:0;transform:translateX(-22px)}.calendar-prev-leave-to{opacity:0;transform:translateX(22px)}.dp-menu-appear-enter-active,.dp-menu-appear-leave-active,.dp-slide-up-enter-active,.dp-slide-up-leave-active,.dp-slide-down-enter-active,.dp-slide-down-leave-active{transition:all .1s ease-out}.dp-slide-down-leave-to,.dp-slide-up-enter-from{opacity:0;transform:translateY(22px)}.dp-slide-down-enter-from,.dp-slide-up-leave-to{opacity:0;transform:translateY(-22px)}.dp-menu-appear-enter-from{opacity:0}.dp-menu-appear-enter-active,.dp-menu-appear-leave-active{transition:opacity .1s ease}.dp-menu-appear-leave-to{opacity:1}
-.form-control.is-invalid ~ .dp__clear_icon, .was-validated .form-control:invalid ~ .dp__clear_icon { margin-right: calc(1.5em + .75rem - 12px) }
\ No newline at end of file
+.dp__input_wrap{position:relative;width:100%;box-sizing:unset}.dp__input_wrap:focus{border-color:var(--dp-border-color-hover);outline:none}.dp__input{background-color:var(--dp-background-color);border-radius:var(--dp-border-radius);font-family:var(--dp-font-family);border:1px solid var(--dp-border-color);outline:none;transition:border-color .2s cubic-bezier(0.645, 0.045, 0.355, 1);width:100%;font-size:var(--dp-font-size);line-height:calc(var(--dp-font-size)*1.5);padding:var(--dp-input-padding);color:var(--dp-text-color);box-sizing:border-box}.dp__input::placeholder{opacity:.7}.dp__input_reg{caret-color:rgba(0,0,0,0)}.dp__input_focus{border-color:var(--dp-border-color-hover)}.dp__disabled{background:var(--dp-disabled-color)}.dp__disabled::placeholder{color:var(--dp-disabled-color-text)}.dp__input_icons{display:inline-block;width:var(--dp-font-size);height:var(--dp-font-size);stroke-width:0;font-size:var(--dp-font-size);line-height:calc(var(--dp-font-size)*1.5);padding:6px 12px;color:var(--dp-icon-color);box-sizing:content-box}.dp__input_icon{cursor:pointer;position:absolute;top:50%;left:0;transform:translateY(-50%);color:var(--dp-icon-color)}.dp__clear_icon{position:absolute;top:50%;right:0;transform:translateY(-50%);cursor:pointer;color:var(--dp-icon-color)}.dp__input_icon_pad{padding-left:var(--dp-input-icon-padding)}.dp__input_valid{box-shadow:0 0 var(--dp-border-radius) var(--dp-success-color);border-color:var(--dp-success-color)}.dp__input_valid:hover{border-color:var(--dp-success-color)}.dp__input_invalid{box-shadow:0 0 var(--dp-border-radius) var(--dp-danger-color);border-color:var(--dp-danger-color)}.dp__input_invalid:hover{border-color:var(--dp-danger-color)}.dp__menu{position:absolute;background:var(--dp-background-color);border-radius:var(--dp-border-radius);min-width:var(--dp-menu-min-width);font-family:var(--dp-font-family);font-size:var(--dp-font-size);user-select:none;border:1px solid var(--dp-menu-border-color);box-sizing:border-box}.dp__menu::after{box-sizing:border-box}.dp__menu::before{box-sizing:border-box}.dp__menu:focus{border:1px solid var(--dp-menu-border-color);outline:none}.dp__menu_inner{padding:var(--dp-menu-padding)}.dp__menu_index{z-index:99999}.dp__menu_readonly,.dp__menu_disabled{position:absolute;inset:0;z-index:1}.dp__menu_disabled{background:rgba(255,255,255,.5);cursor:not-allowed}.dp__menu_readonly{background:rgba(0,0,0,0);cursor:default}.dp__arrow_top{left:50%;top:-1px;height:12px;width:12px;background-color:var(--dp-background-color);position:absolute;border-left:1px solid var(--dp-menu-border-color);border-top:1px solid var(--dp-menu-border-color);transform:translate(-50%, -50%) rotate(45deg)}.dp__arrow_bottom{left:50%;bottom:-1px;height:12px;width:12px;background-color:var(--dp-background-color);position:absolute;border-right:1px solid var(--dp-menu-border-color);border-bottom:1px solid var(--dp-menu-border-color);transform:translate(-50%, 50%) rotate(45deg)}.dp__action_extra{text-align:center;padding:2px 0}.dp__preset_ranges{padding:5px;border-right:1px solid var(--dp-border-color)}.dp__sidebar_left{padding:5px;border-right:1px solid var(--dp-border-color)}.dp__sidebar_right{padding:5px;border-left:1px solid var(--dp-border-color)}.dp__preset_range{padding:5px;display:block;white-space:nowrap;color:var(--dp-text-color);border-radius:var(--dp-border-radius);transition:var(--dp-common-transition)}.dp__preset_range:hover{background-color:var(--dp-hover-color);cursor:pointer}.dp__menu_content_wrapper{display:flex}.dp__calendar_header{position:relative;display:flex;justify-content:center;align-items:center;color:var(--dp-text-color);white-space:nowrap;font-weight:bold}.dp__calendar_header_item{text-align:center;flex-grow:1;height:var(--dp-cell-size);padding:var(--dp-cell-padding);width:var(--dp-cell-size);box-sizing:border-box}.dp__calendar_row{display:flex;justify-content:center;align-items:center;margin:var(--dp-row-maring)}.dp__calendar_item{text-align:center;flex-grow:1;box-sizing:border-box;color:var(--dp-text-color)}.dp__calendar{position:relative}.dp__calendar_header_cell{border-bottom:thin solid var(--dp-border-color);padding:var(--dp-calendar-header-cell-padding)}.dp__cell_inner{display:flex;align-items:center;text-align:center;justify-content:center;border-radius:var(--dp-cell-border-radius);height:var(--dp-cell-size);padding:var(--dp-cell-padding);width:var(--dp-cell-size);border:1px solid rgba(0,0,0,0);box-sizing:border-box;position:relative}.dp__cell_inner:hover{transition:all .2s}.dp__cell_auto_range_start,.dp__date_hover_start:hover,.dp__range_start{border-bottom-right-radius:0;border-top-right-radius:0}.dp__cell_auto_range_end,.dp__date_hover_end:hover,.dp__range_end{border-bottom-left-radius:0;border-top-left-radius:0}.dp__range_end,.dp__range_start,.dp__active_date{background:var(--dp-primary-color);color:var(--dp-primary-text-color)}.dp__cell_auto_range_end,.dp__cell_auto_range_start{border-top:1px dashed var(--dp-primary-color);border-bottom:1px dashed var(--dp-primary-color)}.dp__date_hover_end:hover,.dp__date_hover_start:hover,.dp__date_hover:hover{background:var(--dp-hover-color);color:var(--dp-hover-text-color)}.dp__cell_offset{color:var(--dp-secondary-color)}.dp__cell_disabled{color:var(--dp-secondary-color);cursor:not-allowed}.dp__range_between{background:var(--dp-hover-color);border-radius:0;border:1px solid var(--dp-hover-color)}.dp__range_between_week{background:var(--dp-primary-color);color:var(--dp-primary-text-color);border-radius:0;border-top:1px solid var(--dp-primary-color);border-bottom:1px solid var(--dp-primary-color)}.dp__today{border:1px solid var(--dp-primary-color)}.dp__week_num{color:var(--dp-secondary-color);text-align:center}.dp__cell_auto_range{border-radius:0;border-top:1px dashed var(--dp-primary-color);border-bottom:1px dashed var(--dp-primary-color)}.dp__cell_auto_range_start{border-left:1px dashed var(--dp-primary-color)}.dp__cell_auto_range_end{border-right:1px dashed var(--dp-primary-color)}.dp__calendar_header_separator{width:100%;height:1px;background:var(--dp-border-color)}.dp__calendar_next{margin-left:var(--dp-multi-calendars-spacing)}.dp__marker_line,.dp__marker_dot{height:5px;background-color:var(--dp-marker-color);position:absolute;bottom:0}.dp__marker_dot{width:5px;border-radius:50%;left:50%;transform:translateX(-50%)}.dp__marker_line{width:100%;left:0}.dp__marker_tooltip{position:absolute;border-radius:var(--dp-border-radius);background-color:var(--dp-tooltip-color);padding:5px;border:1px solid var(--dp-border-color);z-index:99999;box-sizing:border-box;cursor:default}.dp__tooltip_content{white-space:nowrap}.dp__tooltip_text{display:flex;align-items:center;flex-flow:row nowrap;color:var(--dp-text-color)}.dp__tooltip_mark{height:5px;width:5px;border-radius:50%;background-color:var(--dp-text-color);color:var(--dp-text-color);margin-right:5px}.dp__arrow_bottom_tp{bottom:0;height:8px;width:8px;background-color:var(--dp-tooltip-color);position:absolute;border-right:1px solid var(--dp-border-color);border-bottom:1px solid var(--dp-border-color);transform:translate(-50%, 50%) rotate(45deg)}.dp__instance_calendar{position:relative;width:100%}@media only screen and (width <= 600px){.dp__flex_display{flex-direction:column}}.dp__cell_highlight{background-color:var(--dp-highlight-color)}.dp__month_year_row{display:flex;align-items:center;height:var(--dp-month-year-row-height);color:var(--dp-text-color);box-sizing:border-box}.dp__inner_nav{display:flex;align-items:center;justify-content:center;cursor:pointer;height:var(--dp-month-year-row-button-size);width:var(--dp-month-year-row-button-size);color:var(--dp-icon-color);text-align:center;border-radius:50%}.dp__inner_nav svg{height:var(--dp-button-icon-height);width:var(--dp-button-icon-height)}.dp__inner_nav:hover{background:var(--dp-hover-color);color:var(--dp-hover-icon-color)}.dp__inner_nav_disabled:hover,.dp__inner_nav_disabled{background:var(--dp-disabled-color);color:var(--dp-disabled-color-text);cursor:not-allowed}.dp__month_year_select{width:50%;text-align:center;cursor:pointer;height:var(--dp-month-year-row-height);display:flex;align-items:center;justify-content:center;border-radius:var(--dp-border-radius);box-sizing:border-box;color:var(--dp-text-color)}.dp__month_year_select:hover{background:var(--dp-hover-color);color:var(--dp-hover-text-color)}.dp__month_year_wrap{display:flex;width:100%}.dp__year_disable_select{justify-content:space-around}.dp__overlay{position:absolute;width:100%;height:100%;background:var(--dp-background-color);top:0;left:0;transition:opacity 1s ease-out;z-index:99999;font-family:var(--dp-font-family);color:var(--dp-text-color);box-sizing:border-box}.dp__overlay_container::-webkit-scrollbar-track{box-shadow:var(--dp-scroll-bar-background);background-color:var(--dp-scroll-bar-background)}.dp__overlay_container::-webkit-scrollbar{width:5px;background-color:var(--dp-scroll-bar-background)}.dp__overlay_container::-webkit-scrollbar-thumb{background-color:var(--dp-scroll-bar-color);border-radius:10px}.dp__overlay:focus{border:none;outline:none}.dp__container_flex{display:flex}.dp__container_block{display:block}.dp__overlay_container{flex-direction:column;overflow-y:auto}.dp__time_picker_overlay_container{height:100%}.dp__overlay_row{padding:0;box-sizing:border-box;display:flex;margin-left:auto;margin-right:auto;flex-wrap:wrap;max-width:100%;width:100%;align-items:center}.dp__flex_row{flex:1}.dp__overlay_col{box-sizing:border-box;width:33%;padding:var(--dp-overlay-col-padding);white-space:nowrap}.dp__overlay_cell_pad{padding:var(--dp-common-padding) 0}.dp__overlay_cell_active{cursor:pointer;border-radius:var(--dp-border-radius);text-align:center;background:var(--dp-primary-color);color:var(--dp-primary-text-color)}.dp__overlay_cell{cursor:pointer;border-radius:var(--dp-border-radius);text-align:center}.dp__overlay_cell:hover{background:var(--dp-hover-color);color:var(--dp-hover-text-color)}.dp__cell_in_between{background:var(--dp-hover-color);color:var(--dp-hover-text-color)}.dp__over_action_scroll{right:5px;box-sizing:border-box}.dp__overlay_cell_disabled{cursor:not-allowed;background:var(--dp-disabled-color)}.dp__overlay_cell_disabled:hover{background:var(--dp-disabled-color)}.dp__overlay_cell_active_disabled{cursor:not-allowed;background:var(--dp-primary-disabled-color)}.dp__overlay_cell_active_disabled:hover{background:var(--dp-primary-disabled-color)}.dp__month_picker_header{display:flex;width:100%;align-items:center;justify-content:space-between;height:var(--dp-cell-size)}.dp__time_input{width:100%;display:flex;align-items:center;justify-content:center;user-select:none;font-family:var(--dp-font-family);color:var(--dp-text-color)}.dp__time_col_reg_block{padding:0 20px}.dp__time_col_reg_inline{padding:0 10px}.dp__time_col_reg_with_button{padding:0 15px}.dp__time_col_sec{padding:0 10px}.dp__time_col_sec_with_button{padding:0 5px}.dp__time_col{text-align:center;display:flex;align-items:center;justify-content:center;flex-direction:column}.dp__time_col_block{font-size:var(--dp-time-font-size)}.dp__time_display{cursor:pointer;color:var(--dp-text-color);border-radius:var(--dp-border-radius);display:flex;align-items:center;justify-content:center}.dp__time_display:hover{background:var(--dp-hover-color);color:var(--dp-hover-text-color)}.dp__time_display_block{padding:0 3px}.dp__time_display_inline{padding:5px}.dp__time_picker_inline_container{display:flex;width:100%;justify-content:center}.dp__inc_dec_button{padding:5px;margin:0;height:var(--dp-time-inc-dec-button-size);width:var(--dp-time-inc-dec-button-size);display:flex;align-items:center;justify-content:center;cursor:pointer;border-radius:50%;color:var(--dp-icon-color);box-sizing:border-box}.dp__inc_dec_button svg{height:var(--dp-time-inc-dec-button-size);width:var(--dp-time-inc-dec-button-size)}.dp__inc_dec_button:hover{background:var(--dp-hover-color);color:var(--dp-primary-color)}.dp__inc_dec_button_inline{width:100%;padding:0;height:8px;cursor:pointer;display:flex;align-items:center}.dp__inc_dec_button_disabled:hover,.dp__inc_dec_button_disabled{background:var(--dp-disabled-color);color:var(--dp-disabled-color-text);cursor:not-allowed}.dp__pm_am_button{background:var(--dp-primary-color);color:var(--dp-primary-text-color);border:none;padding:var(--dp-common-padding);border-radius:var(--dp-border-radius);cursor:pointer}.dp__tp_inline_btn_bar{width:100%;height:4px;background-color:var(--dp-secondary-color);transition:var(--dp-common-transition);border-collapse:collapse}.dp__tp_inline_btn_top:hover .dp__tp_btn_in_r{background-color:var(--dp-primary-color);transform:rotate(12deg) scale(1.15) translateY(-2px)}.dp__tp_inline_btn_top:hover .dp__tp_btn_in_l{background-color:var(--dp-primary-color);transform:rotate(-12deg) scale(1.15) translateY(-2px)}.dp__tp_inline_btn_bottom:hover .dp__tp_btn_in_r{background-color:var(--dp-primary-color);transform:rotate(-12deg) scale(1.15) translateY(-2px)}.dp__tp_inline_btn_bottom:hover .dp__tp_btn_in_l{background-color:var(--dp-primary-color);transform:rotate(12deg) scale(1.15) translateY(-2px)}.dp__action_row{display:flex;align-items:center;width:100%;padding:var(--dp-common-padding);box-sizing:border-box;color:var(--dp-text-color);flex-flow:row nowrap}.dp__action_row svg{height:var(--dp-button-icon-height);width:auto}.dp__selection_preview{display:block;color:var(--dp-text-color);font-size:var(--dp-preview-font-size);overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.dp__action_buttons{display:flex;flex:0;align-items:center;justify-content:flex-end;margin-left:auto}.dp__action_button{background:rgba(0,0,0,0);border:1px solid rgba(0,0,0,0);padding:var(--dp-action-buttons-padding);line-height:initial;margin-left:3px;height:var(--dp-action-button-height);cursor:pointer;border-radius:var(--dp-border-radius)}.dp__action_select{background:var(--dp-primary-color);color:var(--dp-primary-text-color)}.dp__action_select:hover{background:var(--dp-primary-color);transition:var(--dp-action-row-transtion)}.dp__action_select:disabled{background:var(--dp-primary-disabled-color);cursor:not-allowed}.dp__action_cancel{color:var(--dp-text-color);border:1px solid var(--dp-border-color)}.dp__action_cancel:hover{border-color:var(--dp-primary-color);transition:var(--dp-action-row-transtion)}:root{--dp-common-transition: all 0.1s ease-in;--dp-menu-padding: 6px 8px;--dp-animation-duration: 0.1s;--dp-menu-appear-transition-timing: cubic-bezier(.4, 0, 1, 1);--dp-transition-timing: ease-out;--dp-action-row-transtion: all 0.2s ease-in;--dp-font-family: -apple-system, blinkmacsystemfont, "Segoe UI", roboto, oxygen, ubuntu, cantarell, "Open Sans", "Helvetica Neue", sans-serif;--dp-border-radius: 4px;--dp-cell-border-radius: 4px;--dp-transition-length: 22px;--dp-transition-timing-general: 0.1s;--dp-button-height: 35px;--dp-month-year-row-height: 35px;--dp-month-year-row-button-size: 25px;--dp-button-icon-height: 20px;--dp-calendar-wrap-padding: 0 5px;--dp-cell-size: 35px;--dp-cell-padding: 5px;--dp-common-padding: 10px;--dp-input-icon-padding: 35px;--dp-input-padding: 6px 30px 6px 12px;--dp-menu-min-width: 260px;--dp-action-buttons-padding: 1px 6px;--dp-row-maring: 5px 0;--dp-calendar-header-cell-padding: 0.5rem;--dp-multi-calendars-spacing: 10px;--dp-overlay-col-padding: 3px;--dp-time-inc-dec-button-size: 32px;--dp-font-size: 1rem;--dp-preview-font-size: 0.8rem;--dp-time-font-size: 2rem;--dp-action-button-height: 22px}.dp__theme_dark{--dp-background-color: #212121;--dp-text-color: #fff;--dp-hover-color: #484848;--dp-hover-text-color: #fff;--dp-hover-icon-color: #959595;--dp-primary-color: #005cb2;--dp-primary-disabled-color: #61a8ea;--dp-primary-text-color: #fff;--dp-secondary-color: #a9a9a9;--dp-border-color: #2d2d2d;--dp-menu-border-color: #2d2d2d;--dp-border-color-hover: #aaaeb7;--dp-disabled-color: #737373;--dp-disabled-color-text: #d0d0d0;--dp-scroll-bar-background: #212121;--dp-scroll-bar-color: #484848;--dp-success-color: #00701a;--dp-success-color-disabled: #428f59;--dp-icon-color: #959595;--dp-danger-color: #e53935;--dp-marker-color: #e53935;--dp-tooltip-color: #3e3e3e;--dp-highlight-color: rgb(0 92 178 / 20%)}.dp__theme_light{--dp-background-color: #fff;--dp-text-color: #212121;--dp-hover-color: #f3f3f3;--dp-hover-text-color: #212121;--dp-hover-icon-color: #959595;--dp-primary-color: #1976d2;--dp-primary-disabled-color: #6bacea;--dp-primary-text-color: #f8f5f5;--dp-secondary-color: #c0c4cc;--dp-border-color: #ddd;--dp-menu-border-color: #ddd;--dp-border-color-hover: #aaaeb7;--dp-disabled-color: #f6f6f6;--dp-scroll-bar-background: #f3f3f3;--dp-scroll-bar-color: #959595;--dp-success-color: #76d275;--dp-success-color-disabled: #a3d9b1;--dp-icon-color: #959595;--dp-danger-color: #ff6f60;--dp-marker-color: #ff6f60;--dp-tooltip-color: #fafafa;--dp-disabled-color-text: #8e8e8e;--dp-highlight-color: rgb(25 118 210 / 10%)}.dp__flex{display:flex;align-items:center}.dp__btn{background:none;border:none;font:inherit;cursor:pointer;transition:var(--dp-common-transition);line-height:normal}.dp__main{font-family:var(--dp-font-family);user-select:none;box-sizing:border-box;position:relative;width:100%}.dp__pointer{cursor:pointer}.dp__icon{stroke:currentcolor;fill:currentcolor}.dp__button{width:100%;text-align:center;color:var(--dp-icon-color);cursor:pointer;display:flex;align-items:center;align-content:center;justify-content:center;padding:var(--dp-common-padding);box-sizing:border-box;height:var(--dp-button-height)}.dp__button.dp__overlay_action{position:absolute;bottom:0}.dp__button:hover{background:var(--dp-hover-color);color:var(--dp-hover-icon-color)}.dp__button svg{height:var(--dp-button-icon-height);width:auto}.dp__button_bottom{border-bottom-left-radius:var(--dp-border-radius);border-bottom-right-radius:var(--dp-border-radius)}.dp__flex_display{display:flex}.dp__flex_display_with_input{flex-direction:column;align-items:flex-start}.dp__relative{position:relative}.calendar-next-enter-active,.calendar-next-leave-active,.calendar-prev-enter-active,.calendar-prev-leave-active{transition:all var(--dp-transition-timing-general) ease-out}.calendar-next-enter-from{opacity:0;transform:translateX(var(--dp-transition-length))}.calendar-next-leave-to{opacity:0;transform:translateX(calc(var(--dp-transition-length) * -1))}.calendar-prev-enter-from{opacity:0;transform:translateX(calc(var(--dp-transition-length) * -1))}.calendar-prev-leave-to{opacity:0;transform:translateX(var(--dp-transition-length))}.dp-slide-up-enter-active,.dp-slide-up-leave-active,.dp-slide-down-enter-active,.dp-slide-down-leave-active{transition:all var(--dp-animation-duration) var(--dp-transition-timing)}.dp-slide-down-leave-to,.dp-slide-up-enter-from{opacity:0;transform:translateY(var(--dp-transition-length))}.dp-slide-down-enter-from,.dp-slide-up-leave-to{opacity:0;transform:translateY(calc(var(--dp-transition-length) * -1))}.dp__menu_transitioned{transition:all var(--dp-animation-duration) var(--dp-menu-appear-transition-timing)}
+.form-control.is-invalid ~ .dp__clear_icon, .was-validated .form-control:invalid ~ .dp__clear_icon { margin-right: calc(1.5em + .75rem - 12px) }
diff --git a/public/js/components/vueDatepicker.js.php b/public/js/components/vueDatepicker.js.php
index d92bd4a33..37c66cd40 100644
--- a/public/js/components/vueDatepicker.js.php
+++ b/public/js/components/vueDatepicker.js.php
@@ -1,9 +1,9 @@
 <?php
 
-if(file_exists("../../../vendor/vuepic/vue-datepicker-js/vue-datepicker.iife.js"))
+if(file_exists("../../../vendor/vuejs/vuedatepicker_js/vue-datepicker.iife.js"))
 {
 	header('Content-Type: application/javascript');
-	echo file_get_contents("../../../vendor/vuepic/vue-datepicker-js/vue-datepicker.iife.js");
+	echo file_get_contents("../../../vendor/vuejs/vuedatepicker_js/vue-datepicker.iife.js");
 	echo "export default VueDatePicker";
 }
 else

From 9ac31f3925e1e3f2c457a04782c7c08f70b8c894 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 29 Nov 2023 15:32:13 +0100
Subject: [PATCH 0195/1461] line ending

---
 public/js/components/vueDatepicker.js.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/vueDatepicker.js.php b/public/js/components/vueDatepicker.js.php
index 37c66cd40..ad9053248 100644
--- a/public/js/components/vueDatepicker.js.php
+++ b/public/js/components/vueDatepicker.js.php
@@ -9,4 +9,4 @@ if(file_exists("../../../vendor/vuejs/vuedatepicker_js/vue-datepicker.iife.js"))
 else
 {
 	header('HTTP/1.0 404 Not Found');
-}
\ No newline at end of file
+}

From c0252e5ad9d0f55fb61b7761573f109f3b62f727 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 29 Nov 2023 15:38:16 +0100
Subject: [PATCH 0196/1461] Modal from Master

---
 public/js/components/Bootstrap/Modal.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/public/js/components/Bootstrap/Modal.js b/public/js/components/Bootstrap/Modal.js
index f910e8e32..453cc0b48 100644
--- a/public/js/components/Bootstrap/Modal.js
+++ b/public/js/components/Bootstrap/Modal.js
@@ -1,3 +1,5 @@
+import Phrasen from '../../plugin/Phrasen.js';
+
 export default {
 	data: () => ({
 		modal: null
@@ -19,11 +21,7 @@ export default {
 			default: true
 		},
 		noCloseBtn: Boolean,
-		dialogClass: [String,Array,Object],
-		bodyClass: {
-			type: [String,Array,Object],
-			default: 'px-4 py-5'
-		}
+		dialogClass: [String,Array,Object]
 	},
 	emits: [
 		"hideBsModal",
@@ -50,12 +48,14 @@ export default {
 		}
 	},
 	mounted() {
-		if (this.$refs.modal)
+		if(this.$refs.modal)
+		{
 			this.modal = new bootstrap.Modal(this.$refs.modal, {
 				backdrop: this.backdrop,
 				focus: this.focus,
 				keyboard: this.keyboard
 			});
+		}
 	},
 	popup(body, options, title, footer) {
 		const BsModal = this,
@@ -88,6 +88,7 @@ export default {
 				}
 			});
 			const wrapper = document.createElement("div");
+			instance.use(Phrasen); // TODO(chris): find a more dynamic way
 			instance.mount(wrapper);
 			document.body.appendChild(wrapper);
 		});
@@ -99,7 +100,7 @@ export default {
 					<h5 class="modal-title"><slot name="title"/></h5>
 					<button v-if="!noCloseBtn" type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
 				</div>
-				<div class="modal-body" :class="bodyClass">
+				<div class="modal-body">
 					<slot></slot>
 				</div>
 				<div v-if="$slots.footer" class="modal-footer">

From 776908792a00c5972bd62e11c65e936e0454c655 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 29 Nov 2023 16:38:20 +0100
Subject: [PATCH 0197/1461] Datepicker css

---
 public/css/components/vue-datepicker.css | 48 +++++++++++++++++++++++-
 1 file changed, 46 insertions(+), 2 deletions(-)

diff --git a/public/css/components/vue-datepicker.css b/public/css/components/vue-datepicker.css
index 55a2c80ca..c2551b9d8 100644
--- a/public/css/components/vue-datepicker.css
+++ b/public/css/components/vue-datepicker.css
@@ -1,2 +1,46 @@
-.dp__input_wrap{position:relative;width:100%;box-sizing:unset}.dp__input_wrap:focus{border-color:var(--dp-border-color-hover);outline:none}.dp__input{background-color:var(--dp-background-color);border-radius:var(--dp-border-radius);font-family:var(--dp-font-family);border:1px solid var(--dp-border-color);outline:none;transition:border-color .2s cubic-bezier(0.645, 0.045, 0.355, 1);width:100%;font-size:var(--dp-font-size);line-height:calc(var(--dp-font-size)*1.5);padding:var(--dp-input-padding);color:var(--dp-text-color);box-sizing:border-box}.dp__input::placeholder{opacity:.7}.dp__input_reg{caret-color:rgba(0,0,0,0)}.dp__input_focus{border-color:var(--dp-border-color-hover)}.dp__disabled{background:var(--dp-disabled-color)}.dp__disabled::placeholder{color:var(--dp-disabled-color-text)}.dp__input_icons{display:inline-block;width:var(--dp-font-size);height:var(--dp-font-size);stroke-width:0;font-size:var(--dp-font-size);line-height:calc(var(--dp-font-size)*1.5);padding:6px 12px;color:var(--dp-icon-color);box-sizing:content-box}.dp__input_icon{cursor:pointer;position:absolute;top:50%;left:0;transform:translateY(-50%);color:var(--dp-icon-color)}.dp__clear_icon{position:absolute;top:50%;right:0;transform:translateY(-50%);cursor:pointer;color:var(--dp-icon-color)}.dp__input_icon_pad{padding-left:var(--dp-input-icon-padding)}.dp__input_valid{box-shadow:0 0 var(--dp-border-radius) var(--dp-success-color);border-color:var(--dp-success-color)}.dp__input_valid:hover{border-color:var(--dp-success-color)}.dp__input_invalid{box-shadow:0 0 var(--dp-border-radius) var(--dp-danger-color);border-color:var(--dp-danger-color)}.dp__input_invalid:hover{border-color:var(--dp-danger-color)}.dp__menu{position:absolute;background:var(--dp-background-color);border-radius:var(--dp-border-radius);min-width:var(--dp-menu-min-width);font-family:var(--dp-font-family);font-size:var(--dp-font-size);user-select:none;border:1px solid var(--dp-menu-border-color);box-sizing:border-box}.dp__menu::after{box-sizing:border-box}.dp__menu::before{box-sizing:border-box}.dp__menu:focus{border:1px solid var(--dp-menu-border-color);outline:none}.dp__menu_inner{padding:var(--dp-menu-padding)}.dp__menu_index{z-index:99999}.dp__menu_readonly,.dp__menu_disabled{position:absolute;inset:0;z-index:1}.dp__menu_disabled{background:rgba(255,255,255,.5);cursor:not-allowed}.dp__menu_readonly{background:rgba(0,0,0,0);cursor:default}.dp__arrow_top{left:50%;top:-1px;height:12px;width:12px;background-color:var(--dp-background-color);position:absolute;border-left:1px solid var(--dp-menu-border-color);border-top:1px solid var(--dp-menu-border-color);transform:translate(-50%, -50%) rotate(45deg)}.dp__arrow_bottom{left:50%;bottom:-1px;height:12px;width:12px;background-color:var(--dp-background-color);position:absolute;border-right:1px solid var(--dp-menu-border-color);border-bottom:1px solid var(--dp-menu-border-color);transform:translate(-50%, 50%) rotate(45deg)}.dp__action_extra{text-align:center;padding:2px 0}.dp__preset_ranges{padding:5px;border-right:1px solid var(--dp-border-color)}.dp__sidebar_left{padding:5px;border-right:1px solid var(--dp-border-color)}.dp__sidebar_right{padding:5px;border-left:1px solid var(--dp-border-color)}.dp__preset_range{padding:5px;display:block;white-space:nowrap;color:var(--dp-text-color);border-radius:var(--dp-border-radius);transition:var(--dp-common-transition)}.dp__preset_range:hover{background-color:var(--dp-hover-color);cursor:pointer}.dp__menu_content_wrapper{display:flex}.dp__calendar_header{position:relative;display:flex;justify-content:center;align-items:center;color:var(--dp-text-color);white-space:nowrap;font-weight:bold}.dp__calendar_header_item{text-align:center;flex-grow:1;height:var(--dp-cell-size);padding:var(--dp-cell-padding);width:var(--dp-cell-size);box-sizing:border-box}.dp__calendar_row{display:flex;justify-content:center;align-items:center;margin:var(--dp-row-maring)}.dp__calendar_item{text-align:center;flex-grow:1;box-sizing:border-box;color:var(--dp-text-color)}.dp__calendar{position:relative}.dp__calendar_header_cell{border-bottom:thin solid var(--dp-border-color);padding:var(--dp-calendar-header-cell-padding)}.dp__cell_inner{display:flex;align-items:center;text-align:center;justify-content:center;border-radius:var(--dp-cell-border-radius);height:var(--dp-cell-size);padding:var(--dp-cell-padding);width:var(--dp-cell-size);border:1px solid rgba(0,0,0,0);box-sizing:border-box;position:relative}.dp__cell_inner:hover{transition:all .2s}.dp__cell_auto_range_start,.dp__date_hover_start:hover,.dp__range_start{border-bottom-right-radius:0;border-top-right-radius:0}.dp__cell_auto_range_end,.dp__date_hover_end:hover,.dp__range_end{border-bottom-left-radius:0;border-top-left-radius:0}.dp__range_end,.dp__range_start,.dp__active_date{background:var(--dp-primary-color);color:var(--dp-primary-text-color)}.dp__cell_auto_range_end,.dp__cell_auto_range_start{border-top:1px dashed var(--dp-primary-color);border-bottom:1px dashed var(--dp-primary-color)}.dp__date_hover_end:hover,.dp__date_hover_start:hover,.dp__date_hover:hover{background:var(--dp-hover-color);color:var(--dp-hover-text-color)}.dp__cell_offset{color:var(--dp-secondary-color)}.dp__cell_disabled{color:var(--dp-secondary-color);cursor:not-allowed}.dp__range_between{background:var(--dp-hover-color);border-radius:0;border:1px solid var(--dp-hover-color)}.dp__range_between_week{background:var(--dp-primary-color);color:var(--dp-primary-text-color);border-radius:0;border-top:1px solid var(--dp-primary-color);border-bottom:1px solid var(--dp-primary-color)}.dp__today{border:1px solid var(--dp-primary-color)}.dp__week_num{color:var(--dp-secondary-color);text-align:center}.dp__cell_auto_range{border-radius:0;border-top:1px dashed var(--dp-primary-color);border-bottom:1px dashed var(--dp-primary-color)}.dp__cell_auto_range_start{border-left:1px dashed var(--dp-primary-color)}.dp__cell_auto_range_end{border-right:1px dashed var(--dp-primary-color)}.dp__calendar_header_separator{width:100%;height:1px;background:var(--dp-border-color)}.dp__calendar_next{margin-left:var(--dp-multi-calendars-spacing)}.dp__marker_line,.dp__marker_dot{height:5px;background-color:var(--dp-marker-color);position:absolute;bottom:0}.dp__marker_dot{width:5px;border-radius:50%;left:50%;transform:translateX(-50%)}.dp__marker_line{width:100%;left:0}.dp__marker_tooltip{position:absolute;border-radius:var(--dp-border-radius);background-color:var(--dp-tooltip-color);padding:5px;border:1px solid var(--dp-border-color);z-index:99999;box-sizing:border-box;cursor:default}.dp__tooltip_content{white-space:nowrap}.dp__tooltip_text{display:flex;align-items:center;flex-flow:row nowrap;color:var(--dp-text-color)}.dp__tooltip_mark{height:5px;width:5px;border-radius:50%;background-color:var(--dp-text-color);color:var(--dp-text-color);margin-right:5px}.dp__arrow_bottom_tp{bottom:0;height:8px;width:8px;background-color:var(--dp-tooltip-color);position:absolute;border-right:1px solid var(--dp-border-color);border-bottom:1px solid var(--dp-border-color);transform:translate(-50%, 50%) rotate(45deg)}.dp__instance_calendar{position:relative;width:100%}@media only screen and (width <= 600px){.dp__flex_display{flex-direction:column}}.dp__cell_highlight{background-color:var(--dp-highlight-color)}.dp__month_year_row{display:flex;align-items:center;height:var(--dp-month-year-row-height);color:var(--dp-text-color);box-sizing:border-box}.dp__inner_nav{display:flex;align-items:center;justify-content:center;cursor:pointer;height:var(--dp-month-year-row-button-size);width:var(--dp-month-year-row-button-size);color:var(--dp-icon-color);text-align:center;border-radius:50%}.dp__inner_nav svg{height:var(--dp-button-icon-height);width:var(--dp-button-icon-height)}.dp__inner_nav:hover{background:var(--dp-hover-color);color:var(--dp-hover-icon-color)}.dp__inner_nav_disabled:hover,.dp__inner_nav_disabled{background:var(--dp-disabled-color);color:var(--dp-disabled-color-text);cursor:not-allowed}.dp__month_year_select{width:50%;text-align:center;cursor:pointer;height:var(--dp-month-year-row-height);display:flex;align-items:center;justify-content:center;border-radius:var(--dp-border-radius);box-sizing:border-box;color:var(--dp-text-color)}.dp__month_year_select:hover{background:var(--dp-hover-color);color:var(--dp-hover-text-color)}.dp__month_year_wrap{display:flex;width:100%}.dp__year_disable_select{justify-content:space-around}.dp__overlay{position:absolute;width:100%;height:100%;background:var(--dp-background-color);top:0;left:0;transition:opacity 1s ease-out;z-index:99999;font-family:var(--dp-font-family);color:var(--dp-text-color);box-sizing:border-box}.dp__overlay_container::-webkit-scrollbar-track{box-shadow:var(--dp-scroll-bar-background);background-color:var(--dp-scroll-bar-background)}.dp__overlay_container::-webkit-scrollbar{width:5px;background-color:var(--dp-scroll-bar-background)}.dp__overlay_container::-webkit-scrollbar-thumb{background-color:var(--dp-scroll-bar-color);border-radius:10px}.dp__overlay:focus{border:none;outline:none}.dp__container_flex{display:flex}.dp__container_block{display:block}.dp__overlay_container{flex-direction:column;overflow-y:auto}.dp__time_picker_overlay_container{height:100%}.dp__overlay_row{padding:0;box-sizing:border-box;display:flex;margin-left:auto;margin-right:auto;flex-wrap:wrap;max-width:100%;width:100%;align-items:center}.dp__flex_row{flex:1}.dp__overlay_col{box-sizing:border-box;width:33%;padding:var(--dp-overlay-col-padding);white-space:nowrap}.dp__overlay_cell_pad{padding:var(--dp-common-padding) 0}.dp__overlay_cell_active{cursor:pointer;border-radius:var(--dp-border-radius);text-align:center;background:var(--dp-primary-color);color:var(--dp-primary-text-color)}.dp__overlay_cell{cursor:pointer;border-radius:var(--dp-border-radius);text-align:center}.dp__overlay_cell:hover{background:var(--dp-hover-color);color:var(--dp-hover-text-color)}.dp__cell_in_between{background:var(--dp-hover-color);color:var(--dp-hover-text-color)}.dp__over_action_scroll{right:5px;box-sizing:border-box}.dp__overlay_cell_disabled{cursor:not-allowed;background:var(--dp-disabled-color)}.dp__overlay_cell_disabled:hover{background:var(--dp-disabled-color)}.dp__overlay_cell_active_disabled{cursor:not-allowed;background:var(--dp-primary-disabled-color)}.dp__overlay_cell_active_disabled:hover{background:var(--dp-primary-disabled-color)}.dp__month_picker_header{display:flex;width:100%;align-items:center;justify-content:space-between;height:var(--dp-cell-size)}.dp__time_input{width:100%;display:flex;align-items:center;justify-content:center;user-select:none;font-family:var(--dp-font-family);color:var(--dp-text-color)}.dp__time_col_reg_block{padding:0 20px}.dp__time_col_reg_inline{padding:0 10px}.dp__time_col_reg_with_button{padding:0 15px}.dp__time_col_sec{padding:0 10px}.dp__time_col_sec_with_button{padding:0 5px}.dp__time_col{text-align:center;display:flex;align-items:center;justify-content:center;flex-direction:column}.dp__time_col_block{font-size:var(--dp-time-font-size)}.dp__time_display{cursor:pointer;color:var(--dp-text-color);border-radius:var(--dp-border-radius);display:flex;align-items:center;justify-content:center}.dp__time_display:hover{background:var(--dp-hover-color);color:var(--dp-hover-text-color)}.dp__time_display_block{padding:0 3px}.dp__time_display_inline{padding:5px}.dp__time_picker_inline_container{display:flex;width:100%;justify-content:center}.dp__inc_dec_button{padding:5px;margin:0;height:var(--dp-time-inc-dec-button-size);width:var(--dp-time-inc-dec-button-size);display:flex;align-items:center;justify-content:center;cursor:pointer;border-radius:50%;color:var(--dp-icon-color);box-sizing:border-box}.dp__inc_dec_button svg{height:var(--dp-time-inc-dec-button-size);width:var(--dp-time-inc-dec-button-size)}.dp__inc_dec_button:hover{background:var(--dp-hover-color);color:var(--dp-primary-color)}.dp__inc_dec_button_inline{width:100%;padding:0;height:8px;cursor:pointer;display:flex;align-items:center}.dp__inc_dec_button_disabled:hover,.dp__inc_dec_button_disabled{background:var(--dp-disabled-color);color:var(--dp-disabled-color-text);cursor:not-allowed}.dp__pm_am_button{background:var(--dp-primary-color);color:var(--dp-primary-text-color);border:none;padding:var(--dp-common-padding);border-radius:var(--dp-border-radius);cursor:pointer}.dp__tp_inline_btn_bar{width:100%;height:4px;background-color:var(--dp-secondary-color);transition:var(--dp-common-transition);border-collapse:collapse}.dp__tp_inline_btn_top:hover .dp__tp_btn_in_r{background-color:var(--dp-primary-color);transform:rotate(12deg) scale(1.15) translateY(-2px)}.dp__tp_inline_btn_top:hover .dp__tp_btn_in_l{background-color:var(--dp-primary-color);transform:rotate(-12deg) scale(1.15) translateY(-2px)}.dp__tp_inline_btn_bottom:hover .dp__tp_btn_in_r{background-color:var(--dp-primary-color);transform:rotate(-12deg) scale(1.15) translateY(-2px)}.dp__tp_inline_btn_bottom:hover .dp__tp_btn_in_l{background-color:var(--dp-primary-color);transform:rotate(12deg) scale(1.15) translateY(-2px)}.dp__action_row{display:flex;align-items:center;width:100%;padding:var(--dp-common-padding);box-sizing:border-box;color:var(--dp-text-color);flex-flow:row nowrap}.dp__action_row svg{height:var(--dp-button-icon-height);width:auto}.dp__selection_preview{display:block;color:var(--dp-text-color);font-size:var(--dp-preview-font-size);overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.dp__action_buttons{display:flex;flex:0;align-items:center;justify-content:flex-end;margin-left:auto}.dp__action_button{background:rgba(0,0,0,0);border:1px solid rgba(0,0,0,0);padding:var(--dp-action-buttons-padding);line-height:initial;margin-left:3px;height:var(--dp-action-button-height);cursor:pointer;border-radius:var(--dp-border-radius)}.dp__action_select{background:var(--dp-primary-color);color:var(--dp-primary-text-color)}.dp__action_select:hover{background:var(--dp-primary-color);transition:var(--dp-action-row-transtion)}.dp__action_select:disabled{background:var(--dp-primary-disabled-color);cursor:not-allowed}.dp__action_cancel{color:var(--dp-text-color);border:1px solid var(--dp-border-color)}.dp__action_cancel:hover{border-color:var(--dp-primary-color);transition:var(--dp-action-row-transtion)}:root{--dp-common-transition: all 0.1s ease-in;--dp-menu-padding: 6px 8px;--dp-animation-duration: 0.1s;--dp-menu-appear-transition-timing: cubic-bezier(.4, 0, 1, 1);--dp-transition-timing: ease-out;--dp-action-row-transtion: all 0.2s ease-in;--dp-font-family: -apple-system, blinkmacsystemfont, "Segoe UI", roboto, oxygen, ubuntu, cantarell, "Open Sans", "Helvetica Neue", sans-serif;--dp-border-radius: 4px;--dp-cell-border-radius: 4px;--dp-transition-length: 22px;--dp-transition-timing-general: 0.1s;--dp-button-height: 35px;--dp-month-year-row-height: 35px;--dp-month-year-row-button-size: 25px;--dp-button-icon-height: 20px;--dp-calendar-wrap-padding: 0 5px;--dp-cell-size: 35px;--dp-cell-padding: 5px;--dp-common-padding: 10px;--dp-input-icon-padding: 35px;--dp-input-padding: 6px 30px 6px 12px;--dp-menu-min-width: 260px;--dp-action-buttons-padding: 1px 6px;--dp-row-maring: 5px 0;--dp-calendar-header-cell-padding: 0.5rem;--dp-multi-calendars-spacing: 10px;--dp-overlay-col-padding: 3px;--dp-time-inc-dec-button-size: 32px;--dp-font-size: 1rem;--dp-preview-font-size: 0.8rem;--dp-time-font-size: 2rem;--dp-action-button-height: 22px}.dp__theme_dark{--dp-background-color: #212121;--dp-text-color: #fff;--dp-hover-color: #484848;--dp-hover-text-color: #fff;--dp-hover-icon-color: #959595;--dp-primary-color: #005cb2;--dp-primary-disabled-color: #61a8ea;--dp-primary-text-color: #fff;--dp-secondary-color: #a9a9a9;--dp-border-color: #2d2d2d;--dp-menu-border-color: #2d2d2d;--dp-border-color-hover: #aaaeb7;--dp-disabled-color: #737373;--dp-disabled-color-text: #d0d0d0;--dp-scroll-bar-background: #212121;--dp-scroll-bar-color: #484848;--dp-success-color: #00701a;--dp-success-color-disabled: #428f59;--dp-icon-color: #959595;--dp-danger-color: #e53935;--dp-marker-color: #e53935;--dp-tooltip-color: #3e3e3e;--dp-highlight-color: rgb(0 92 178 / 20%)}.dp__theme_light{--dp-background-color: #fff;--dp-text-color: #212121;--dp-hover-color: #f3f3f3;--dp-hover-text-color: #212121;--dp-hover-icon-color: #959595;--dp-primary-color: #1976d2;--dp-primary-disabled-color: #6bacea;--dp-primary-text-color: #f8f5f5;--dp-secondary-color: #c0c4cc;--dp-border-color: #ddd;--dp-menu-border-color: #ddd;--dp-border-color-hover: #aaaeb7;--dp-disabled-color: #f6f6f6;--dp-scroll-bar-background: #f3f3f3;--dp-scroll-bar-color: #959595;--dp-success-color: #76d275;--dp-success-color-disabled: #a3d9b1;--dp-icon-color: #959595;--dp-danger-color: #ff6f60;--dp-marker-color: #ff6f60;--dp-tooltip-color: #fafafa;--dp-disabled-color-text: #8e8e8e;--dp-highlight-color: rgb(25 118 210 / 10%)}.dp__flex{display:flex;align-items:center}.dp__btn{background:none;border:none;font:inherit;cursor:pointer;transition:var(--dp-common-transition);line-height:normal}.dp__main{font-family:var(--dp-font-family);user-select:none;box-sizing:border-box;position:relative;width:100%}.dp__pointer{cursor:pointer}.dp__icon{stroke:currentcolor;fill:currentcolor}.dp__button{width:100%;text-align:center;color:var(--dp-icon-color);cursor:pointer;display:flex;align-items:center;align-content:center;justify-content:center;padding:var(--dp-common-padding);box-sizing:border-box;height:var(--dp-button-height)}.dp__button.dp__overlay_action{position:absolute;bottom:0}.dp__button:hover{background:var(--dp-hover-color);color:var(--dp-hover-icon-color)}.dp__button svg{height:var(--dp-button-icon-height);width:auto}.dp__button_bottom{border-bottom-left-radius:var(--dp-border-radius);border-bottom-right-radius:var(--dp-border-radius)}.dp__flex_display{display:flex}.dp__flex_display_with_input{flex-direction:column;align-items:flex-start}.dp__relative{position:relative}.calendar-next-enter-active,.calendar-next-leave-active,.calendar-prev-enter-active,.calendar-prev-leave-active{transition:all var(--dp-transition-timing-general) ease-out}.calendar-next-enter-from{opacity:0;transform:translateX(var(--dp-transition-length))}.calendar-next-leave-to{opacity:0;transform:translateX(calc(var(--dp-transition-length) * -1))}.calendar-prev-enter-from{opacity:0;transform:translateX(calc(var(--dp-transition-length) * -1))}.calendar-prev-leave-to{opacity:0;transform:translateX(var(--dp-transition-length))}.dp-slide-up-enter-active,.dp-slide-up-leave-active,.dp-slide-down-enter-active,.dp-slide-down-leave-active{transition:all var(--dp-animation-duration) var(--dp-transition-timing)}.dp-slide-down-leave-to,.dp-slide-up-enter-from{opacity:0;transform:translateY(var(--dp-transition-length))}.dp-slide-down-enter-from,.dp-slide-up-leave-to{opacity:0;transform:translateY(calc(var(--dp-transition-length) * -1))}.dp__menu_transitioned{transition:all var(--dp-animation-duration) var(--dp-menu-appear-transition-timing)}
-.form-control.is-invalid ~ .dp__clear_icon, .was-validated .form-control:invalid ~ .dp__clear_icon { margin-right: calc(1.5em + .75rem - 12px) }
+@import '../../../vendor/vuejs/vuedatepicker_css/main.css';
+:root {
+    /*General*/
+    --dp-font-family: var(--bs-body-font-family);
+    --dp-border-radius: .25rem;
+    --dp-cell-border-radius: .25rem; /*Specific border radius for the calendar cell*/
+
+    /*Sizing*/
+    --dp-button-height: 2.1875rem; /*Size for buttons in overlays*/
+    --dp-month-year-row-height: 2.1875rem; /*Height of the month-year select row*/
+    --dp-month-year-row-button-size: 2.1875rem; /*Specific height for the next/previous buttons*/
+    --dp-button-icon-height: 1.25rem; /*Icon sizing in buttons*/
+    --dp-cell-size: 2.1875rem; /*Width and height of calendar cell*/
+    --dp-cell-padding: .3125rem; /*Padding in the cell*/
+    --dp-common-padding: .625rem; /*Common padding used*/
+    --dp-input-icon-padding: 2.1875rem;
+    --dp-input-padding: .375rem .75rem;
+    --dp-action-buttons-padding: .125rem .3125rem; /*Adjust padding for the action buttons in action row*/
+    --dp-row-margin: .3125rem 0; /*Adjust the spacing between rows in the calendar*/
+    --dp-calendar-header-cell-padding: 0.5rem; /*Adjust padding in calendar header cells*/
+    --dp-two-calendars-spacing: .625rem; /*Space between multiple calendars*/
+    --dp-overlay-col-padding: .1875rem; /*Padding in the overlay column*/
+    --dp-time-inc-dec-button-size:  2rem; /*Sizing for arrow buttons in the time picker*/
+    --dp-menu-padding: .375rem .5rem; /*Menu padding*/
+}
+.dp__theme_light {
+    --dp-text-color: var(--text-color);
+    --dp-primary-color: var(--bs-primary);
+    --dp-primary-disabled-color: rgba(var(--bs-primary-rgb), .65);
+    --dp-primary-text-color: var(--primary-color-text);
+    --dp-secondary-color: var(--bs-secondary);
+    --dp-border-color: var(--bs-gray-400);
+    --dp-menu-border-color: var(--bs-gray-400);
+    --dp-border-color-hover: var(--bs-gray-400);
+    --dp-icon-color: rgba(var(--bs-black-rgb), .5);
+    --dp-hover-icon-color: rgba(var(--bs-black-rgb), .75);
+    --dp-range-between-dates-text-color: var(--dp-hover-text-color, var(--text-color));
+}
+.dp__theme_light .form-control.is-invalid {
+    --dp-border-color-hover: var(--bs-danger);
+}
+.dp__theme_light .form-control.is-valid {
+    --dp-border-color-hover: var(--bs-success);
+}
+.form-control.is-invalid ~ .dp__clear_icon,
+.was-validated .form-control:invalid ~ .dp__clear_icon { margin-right: calc(1.5em + .75rem - 12px) }

From 38f76f68f1be95a554e61735b4320b47285f6206 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Fri, 1 Dec 2023 11:07:25 +0100
Subject: [PATCH 0198/1461] conditional rendering for different Profile Views

---
 application/controllers/Cis/Profil.php    | 211 ++++++++++++++--------
 application/views/Cis/Profil.php          |   4 +-
 public/js/apps/Cis.js                     |   4 +
 public/js/apps/api/search.js              |   2 +-
 public/js/apps/api/userdata.js            |  32 +---
 public/js/components/Cis/Profil/Profil.js | 118 ++++++------
 6 files changed, 218 insertions(+), 153 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index d6ec53a1a..dd1de706d 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -16,6 +16,8 @@ class Profil extends Auth_Controller
 	{
 		parent::__construct([
 			'index' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
+			'View' => ['student/anrechnung_beantragen:r','user:r'],
+
 			'isMitarbeiterOrStudent' => ['student/anrechnung_beantragen:r','user:r'],
 			'getMitarbeiterAnsicht' => ['student/anrechnung_beantragen:r','user:r'],
 			'foto_sperre_function' => ['student/anrechnung_beantragen:r','user:r'],
@@ -48,23 +50,54 @@ class Profil extends Auth_Controller
 	/**
 	 * @return void
 	 */
+
+	
 	public function index()
 	{
 		
 		//? we can pass data to the view by using the second parameter of the load->view() function 
 		//* the first parameter is the route that Code Igniter will switch to
 		//* the second parameter can be used to pass data to the view  
-		$this->load->view('Cis/Profil', ["uid" => getAuthUID(),"pid" => getAuthPersonId()]);
+		$this->load->view('Cis/Profil', ["uid" => getAuthUID(),"pid" => getAuthPersonId(), "view"=> false]);
 	}
 
+	//? attempt at rerouting methods
+	/* public function _remap($method, $params = array())
+	{
+        if($method ==='View' || $method === 'Mitarbeiter'){
+			
+			
+				return call_user_func_array(array($this, "searchView"), $params);
+			
+		}else{
+			if (method_exists($this, $method))
+			{
+					return call_user_func_array(array($this, $method), $params);
+			}
+		}
+	} */
+	
+	public function View($uid){
+		
+		//? get the personID of the uid
+		isSuccess($this->BenutzerModel->addSelect(["person_id"]));
+		$personID_res = $this->BenutzerModel->load([$uid]);
+		$personID_res = hasData($personID_res) ? getData($personID_res)[0] : null; 
+		
+		$this->load->view('Cis/Profil', ["uid" => $uid,"pid" => $personID_res->person_id,"view"=>true]);
+	
+	}
+	
 
-	public function studentProfil(){
+
+	public function studentProfil($uid, $view=false){
 
 		if(
+			!$view &&
 		isSuccess($this->BenutzergruppeModel->addSelect(['bezeichnung']))
 		&& isSuccess($this->BenutzergruppeModel->addJoin('tbl_gruppe', 'gruppe_kurzbz' ))
 		){
-			$zutrittsgruppe_res = $this->BenutzergruppeModel->loadWhere(array("uid"=>getAuthUID(), "zutrittssystem"=>true));
+			$zutrittsgruppe_res = $this->BenutzergruppeModel->loadWhere(array("uid"=>$uid, "zutrittssystem"=>true));
 			if(isError($zutrittsgruppe_res)){
 				// catch error
 			}
@@ -78,7 +111,7 @@ class Profil extends Auth_Controller
 		if(isSuccess($this->StudentModel->addSelect(['tbl_studiengang.bezeichnung as studiengang','tbl_student.semester', 'tbl_student.verband', 'tbl_student.gruppe' ,'tbl_student.matrikelnr as personenkennzeichen']))
 		 && isSuccess($this->StudentModel->addJoin('tbl_studiengang', "tbl_studiengang.studiengang_kz=tbl_student.studiengang_kz")))
 		{
-			$student_res = $this->StudentModel->load([getAuthUID()]);
+			$student_res = $this->StudentModel->load([$uid]);
 			if(isError($student_res)){
 				// catch error
 			}
@@ -89,8 +122,9 @@ class Profil extends Auth_Controller
 
 		
 		//? Matrikelnummer ist die Spalte matr_nr in Person
-		if(isSuccess($this->StudentModel->addSelect(["matr_nr"]))){
-			$person_res = $this->PersonModel->load(getAuthPersonID());
+		if(isSuccess($this->BenutzerModel->addSelect(["matr_nr"])) 
+		&& isSuccess($this->BenutzerModel->addJoin("tbl_person","person_id"))){
+			$person_res = $this->BenutzerModel->load([$uid]);
 			if(isError($person_res)){
 				// catch error
 			}else{
@@ -104,7 +138,9 @@ class Profil extends Auth_Controller
 		foreach($student_res as $key => $value){
 			$res->$key = $value;
 		}
+		if(!$view){
 		$res->zuttritsgruppen = $zutrittsgruppe_res;
+		}
 		
 		echo json_encode($res);
 		
@@ -112,7 +148,7 @@ class Profil extends Auth_Controller
 
 	}
 
-	public function mitarbeiterProfil(){
+	public function mitarbeiterProfil($uid){
 	//? informationen die nur für den Mitarbeiter verfügbar sind
 
 
@@ -121,7 +157,7 @@ class Profil extends Auth_Controller
 	isSuccess($this->BenutzerfunktionModel->addSelect(["tbl_benutzerfunktion.bezeichnung as Bezeichnung","tbl_organisationseinheit.bezeichnung as Organisationseinheit","datum_von as Gültig_von","datum_bis as Gültig_bis","wochenstunden as Wochenstunden"]))&&
 		isSuccess($this->BenutzerfunktionModel->addJoin("tbl_organisationseinheit","oe_kurzbz"))
 	){
-		$benutzer_funktion_res = $this->BenutzerfunktionModel->loadWhere(array('uid'=>getAuthUID()));
+		$benutzer_funktion_res = $this->BenutzerfunktionModel->loadWhere(array('uid'=>$uid));
 		if(isError($benutzer_funktion_res)){
 			// error handling
 		}else{
@@ -134,7 +170,7 @@ class Profil extends Auth_Controller
 	if(isSuccess($this->MitarbeiterModel->addSelect(["kurzbz","telefonklappe", "alias"]))
 		&& isSuccess($this->MitarbeiterModel->addJoin("tbl_benutzer", "tbl_benutzer.uid = tbl_mitarbeiter.mitarbeiter_uid"))
 	){
-		$mitarbeiter_res = $this->MitarbeiterModel->load(getAuthUID());
+		$mitarbeiter_res = $this->MitarbeiterModel->load($uid);
 			if(isError($mitarbeiter_res)){
 				// error handling
 			}else{
@@ -148,7 +184,7 @@ class Profil extends Auth_Controller
 		}
 		$intern_email = array();
 		$intern_email+=array("type" => "intern");
-		$intern_email+=array("email"=> getAuthUID() . "@" . DOMAIN);
+		$intern_email+=array("email"=> $uid . "@" . DOMAIN);
 		$extern_email=array();
 		$extern_email+=array("type" => "alias");
 		$extern_email+=array("email" => $mitarbeiter_res->alias . "@" . DOMAIN);
@@ -158,10 +194,84 @@ class Profil extends Auth_Controller
 		echo json_encode($res);
 	}
 
-	public function indexProfilInformaion(){
+
+	//? the view parameter is a flag that describes if a Profile from a different person is being viewed
+	public function indexProfilInformaion($uid, $view=false){
 		//? funktion returns all data needed for the student and the mitarbeiter profil view
 
 
+		$res = new stdClass();
+
+		//! falls der view flag auf flase gesetzt ist werden extra informationen des Users abgefragt
+		if(!$view){
+			//? betriebsmittel soll nur der user selber sehen
+			if(
+			
+				isSuccess($this->BetriebsmittelpersonModel->addSelect(["CONCAT(betriebsmitteltyp, ' ' ,beschreibung) as Betriebsmittel","nummer as Nummer","ausgegebenam as Ausgegeben_am"]))
+				
+			){
+				//? betriebsmittel are not needed in a view
+				$betriebsmittelperson_res = $this->BetriebsmittelpersonModel->getBetriebsmittel(getAuthPersonId());
+				if(isError($betriebsmittelperson_res)){
+					   // error handling
+				   }else{
+					   $betriebsmittelperson_res = hasData($betriebsmittelperson_res)? getData($betriebsmittelperson_res) : null;
+				   }
+			   }
+
+			   if(
+			
+				//? kontaktdaten soll auch nur der user selbst sehen
+				isSuccess($this->KontaktModel->addSelect('DISTINCT ON (kontakttyp) kontakttyp, kontakt, tbl_kontakt.anmerkung, tbl_kontakt.zustellung')) &&
+			isSuccess($this->KontaktModel->addJoin('public.tbl_standort', 'standort_id', 'LEFT')) &&
+			isSuccess($this->KontaktModel->addJoin('public.tbl_firma', 'firma_id', 'LEFT'))&&
+			isSuccess($this->KontaktModel->addOrder('kontakttyp, kontakt, tbl_kontakt.updateamum, tbl_kontakt.insertamum'))
+			){
+				$kontakte_res = $this->KontaktModel->loadWhere(array('person_id' => getAuthPersonID()));
+				if(isError($kontakte_res)){
+					// handle error	
+				}else{
+					$kontakte_res = hasData($kontakte_res)? getData($kontakte_res) : null;
+				}
+				
+			}
+
+			//? FH Ausweis Austellungsdatum soll auch nur der user selbst sehen
+			$zutrittskarte_ausgegebenam = $this->BetriebsmittelpersonModel->getBetriebsmittelByUid($uid,"Zutrittskarte");
+			if(isError($zutrittskarte_ausgegebenam)){
+				// error handling
+			}else{
+				$zutrittskarte_ausgegebenam = hasData($zutrittskarte_ausgegebenam)? getData($zutrittskarte_ausgegebenam)[0]->ausgegebenam : null;
+				//? formats the date from 01-01-2000 to 01.01.2000
+				$zutrittskarte_ausgegebenam = str_replace("-",".",$zutrittskarte_ausgegebenam);
+			}
+
+
+			//? Die Adressen soll auch nur der user selber sehen
+
+			if(
+				!$view &&
+				isSuccess($adresse_res = $this->AdresseModel->addSelect(array("strasse","tbl_adressentyp.bezeichnung as adr_typ","plz","ort")))&&
+				isSuccess($adresse_res = $this->AdresseModel->addOrder("zustelladresse","DESC"))&&
+				isSuccess($adresse_res = $this->AdresseModel->addOrder("sort"))&&
+				isSuccess($adresse_res = $this->AdresseModel->addJoin("tbl_adressentyp","typ=adressentyp_kurzbz"))
+			){
+				$adresse_res = $this->AdresseModel->loadWhere(array("person_id"=>getAuthPersonID()));
+				if(isError($adresse_res)){
+					// error handling
+				}else{									
+					$adresse_res = hasData($adresse_res)? getData($adresse_res) : null;
+				}
+			}
+
+			//? die folgenden Informationen darf nur der eigene user sehen
+		$res->adressen = $adresse_res;
+		$res->zutrittsdatum = $zutrittskarte_ausgegebenam;
+		$res->kontakte = $kontakte_res;
+		$res->mittel = $betriebsmittelperson_res;
+
+		}
+		
 
 		if(
 			isSuccess($this->PersonModel->addSelect('gruppe_kurzbz, beschreibung'))&&
@@ -169,7 +279,7 @@ class Profil extends Auth_Controller
 		isSuccess($this->PersonModel->addJoin('tbl_benutzergruppe', 'uid')) &&
 		isSuccess($this->PersonModel->addJoin('tbl_gruppe', 'gruppe_kurzbz'))){
 
-			$mailverteiler_res = $this->PersonModel->loadWhere(array('mailgrp' => true, 'uid'=>getAuthUID()));
+			$mailverteiler_res = $this->PersonModel->loadWhere(array('mailgrp' => true, 'uid'=>$uid));
 			if( isError($mailverteiler_res)){
 				// catch error
 			}
@@ -179,60 +289,15 @@ class Profil extends Auth_Controller
 		}
 
 		
-
-		if(
-			isSuccess($this->BetriebsmittelpersonModel->addSelect(["CONCAT(betriebsmitteltyp, ' ' ,beschreibung) as Betriebsmittel","nummer as Nummer","ausgegebenam as Ausgegeben_am"]))
-			
-		){
-			$betriebsmittelperson_res = $this->BetriebsmittelpersonModel->getBetriebsmittel(getAuthPersonId());
-			if(isError($betriebsmittelperson_res)){
-				   // error handling
-			   }else{
-				   $betriebsmittelperson_res = hasData($betriebsmittelperson_res)? getData($betriebsmittelperson_res) : null;
-			   }
-		   }
-
-
-		if(isSuccess($this->KontaktModel->addSelect('DISTINCT ON (kontakttyp) kontakttyp, kontakt, tbl_kontakt.anmerkung, tbl_kontakt.zustellung')) &&
-		isSuccess($this->KontaktModel->addJoin('public.tbl_standort', 'standort_id', 'LEFT')) &&
-		isSuccess($this->KontaktModel->addJoin('public.tbl_firma', 'firma_id', 'LEFT'))&&
-		isSuccess($this->KontaktModel->addOrder('kontakttyp, kontakt, tbl_kontakt.updateamum, tbl_kontakt.insertamum'))
-		){
-			$kontakte_res = $this->KontaktModel->loadWhere(array('person_id' => getAuthPersonID()));
-			if(isError($kontakte_res)){
-				// handle error	
-			}else{
-				$kontakte_res = hasData($kontakte_res)? getData($kontakte_res) : null;
-			}
-			
-		}
-		
-		$zutrittskarte_ausgegebenam = $this->BetriebsmittelpersonModel->getBetriebsmittelByUid(getAuthUID(),"Zutrittskarte");
-		if(isError($zutrittskarte_ausgegebenam)){
-			// error handling
-		}else{
-			$zutrittskarte_ausgegebenam = hasData($zutrittskarte_ausgegebenam)? getData($zutrittskarte_ausgegebenam)[0]->ausgegebenam : null;
-			//? formats the date from 01-01-2000 to 01.01.2000
-			$zutrittskarte_ausgegebenam = str_replace("-",".",$zutrittskarte_ausgegebenam);
+		$benutzer_info_sql_columns = ["foto","foto_sperre","anrede","titelpost","titelpre","vorname","nachname"];
+		//? der Geburtsort und das Geburtsdatum darf auch nur der eigene User sehen
+		if (!$view){
+			array_push($benutzer_info_sql_columns, "gebort", "gebdatum");
 		}
+		if(isSuccess($this->BenutzerModel->addSelect($benutzer_info_sql_columns))
+		&& isSuccess($this->BenutzerModel->addJoin("tbl_person", "person_id"))){
 
-		if(
-			isSuccess($adresse_res = $this->AdresseModel->addSelect(array("strasse","tbl_adressentyp.bezeichnung as adr_typ","plz","ort")))&&
-			isSuccess($adresse_res = $this->AdresseModel->addOrder("zustelladresse","DESC"))&&
-			isSuccess($adresse_res = $this->AdresseModel->addOrder("sort"))&&
-			isSuccess($adresse_res = $this->AdresseModel->addJoin("tbl_adressentyp","typ=adressentyp_kurzbz"))
-		){
-			$adresse_res = $this->AdresseModel->loadWhere(array("person_id"=>getAuthPersonID()));
-			if(isError($adresse_res)){
-				// error handling
-			}else{									
-				$adresse_res = hasData($adresse_res)? getData($adresse_res) : null;
-			}
-		}
-		
-		if(isSuccess($this->PersonModel->addSelect(["foto","foto_sperre","anrede","titelpost","titelpre","vorname","nachname", "gebort", "gebdatum"]))){
-
-			$person_res = $this->PersonModel->load(getAuthPersonId());
+			$person_res = $this->BenutzerModel->load([$uid]);
 			if(isError($person_res)){
 				// error handling
 			}else{
@@ -242,27 +307,27 @@ class Profil extends Auth_Controller
 		
 
 				
-		$res = new stdClass();
+		
 		$res->foto = $person_res->foto;
 		$res->foto_sperre = $person_res->foto_sperre;
-		$res->username = getAuthUID();
+		$res->username = $uid;
 		
 		$res->anrede = $person_res->anrede;
 		$res->titel = $person_res->titelpre ." " . $person_res->titelpost;
 		$res->vorname = $person_res->vorname;
 		$res->nachname = $person_res->nachname;
+		if(!$view){
 		$res->gebort = $person_res->gebort;
 		$res->gebdatum = $person_res->gebdatum;
-		$res->adressen = $adresse_res;
-		$res->zutrittsdatum = $zutrittskarte_ausgegebenam;
+	}
 		//$res->postnomen = $person_res->postnomen; //! still not found
 		$intern_email = array();
 		$intern_email+=array("type" => "intern");
-		$intern_email+=array("email"=> getAuthUID() . "@" . DOMAIN);
+		$intern_email+=array("email"=> $uid . "@" . DOMAIN);
 		$res->emails = array($intern_email);
 
-		$res->kontakte = $kontakte_res;
-		$res->mittel = $betriebsmittelperson_res;
+	
+		
 		$res->mailverteiler = $mailverteiler_res;
 		 
 
@@ -271,6 +336,10 @@ class Profil extends Auth_Controller
 
 	}
 
+
+
+	//! old function that was used to fetch all the data
+	// todo delete the function at the end
 	public function getMitarbeiterAnsicht(){
 
 		
diff --git a/application/views/Cis/Profil.php b/application/views/Cis/Profil.php
index 931d879d5..83d9e6008 100644
--- a/application/views/Cis/Profil.php
+++ b/application/views/Cis/Profil.php
@@ -14,8 +14,8 @@ $this->load->view('templates/CISHTML-Header', $includesArray);
 	
 	<hr>
 	
-	<!-- we can pass information from the php view file to the public js file through interpolating data from php into vue props -->
-	<Profil uid="<?php echo $uid ?>" pid="<?php echo $pid ?>"></Profil>
+	<!-- we can pass information from the php view file to the public js file throughz interpolating data from php into vue props -->
+	<Profil <?php echo "uid=$uid" ?> <?php echo "pid=$pid" ?> view=<?php echo $view? boolval(1): boolval(0); ?>></Profil>
 </div>
 
 <?php $this->load->view('templates/CISHTML-Footer', $includesArray); ?>
diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js
index 0e1461a0f..a00178056 100644
--- a/public/js/apps/Cis.js
+++ b/public/js/apps/Cis.js
@@ -23,6 +23,10 @@ Vue.createApp({
                             type: "function",
                             action: function(data) {
                                 alert('employee defaultaction ' + JSON.stringify(data));
+                                //return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router+
+                                //"/Cis/Profil/"+data.person_id; 
+                                //? Person id is data.person_id
+                                //? Benutzer UID is data.uid
                             }
                         },
                         childactions: []
diff --git a/public/js/apps/api/search.js b/public/js/apps/api/search.js
index 529c5dcc7..eddd3fe5b 100644
--- a/public/js/apps/api/search.js
+++ b/public/js/apps/api/search.js
@@ -2,7 +2,7 @@ export default {
   search: function(searchsettings) {
       const url = FHC_JS_DATA_STORAGE_OBJECT.app_root 
                 + FHC_JS_DATA_STORAGE_OBJECT.ci_router
-                + 'components/SearchBar/search';
+                + '/components/SearchBar/search';
       return axios.post(url, searchsettings);
   },
   searchdummy: function(searchsettings) {
diff --git a/public/js/apps/api/userdata.js b/public/js/apps/api/userdata.js
index 7f5b32704..ad09144a7 100644
--- a/public/js/apps/api/userdata.js
+++ b/public/js/apps/api/userdata.js
@@ -1,47 +1,35 @@
 export default {
 
-    getUser: function() {
-        const url = FHC_JS_DATA_STORAGE_OBJECT.app_root 
-                  + 'cis.php/Cis/Profil/getUser';
-        return axios.get(url);
-    },
+ 
+    
     isMitarbeiterOrStudent: function(uid) {
         const url = FHC_JS_DATA_STORAGE_OBJECT.app_root 
                   + `cis.php/Cis/Profil/isMitarbeiterOrStudent/${uid}`;
         return axios.get(url);
     },
-    getMitarbeiterAnsicht: function() {
-        const url = FHC_JS_DATA_STORAGE_OBJECT.app_root 
-                  + `cis.php/Cis/Profil/getMitarbeiterAnsicht`;
-        return axios.get(url);
-    },
+ 
     sperre_foto_function: function(value) {
         const url = FHC_JS_DATA_STORAGE_OBJECT.app_root 
                   + `cis.php/Cis/Profil/foto_sperre_function/${value}`;
         return axios.get(url);
     },
-    getBenutzerFunktionen: function() {
-        const url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router+
-                   "/Cis/Profil/getBenutzerFunktionen";
-        
-        return axios.get(url);
-    },
+
     
-    indexProfilInformaion: function() {
+    indexProfilInformaion: function(uid, view=false) {
         const url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router+
-                   "/Cis/Profil/indexProfilInformaion";
+                   `/Cis/Profil/indexProfilInformaion/${uid}/${view}`;
         
         return axios.get(url);
     },
-    mitarbeiterProfil: function() {
+    mitarbeiterProfil: function(uid) {
         const url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router+
-                   "/Cis/Profil/mitarbeiterProfil";
+                   `/Cis/Profil/mitarbeiterProfil/${uid}`;
         
         return axios.get(url);
     },
-    studentProfil: function() {
+    studentProfil: function(uid, view=false) {
         const url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router+
-                   "/Cis/Profil/studentProfil";
+                   `/Cis/Profil/studentProfil/${uid}/${view}`;
         
         return axios.get(url);
     },
diff --git a/public/js/components/Cis/Profil/Profil.js b/public/js/components/Cis/Profil/Profil.js
index c27893551..ff40f7bd7 100644
--- a/public/js/components/Cis/Profil/Profil.js
+++ b/public/js/components/Cis/Profil/Profil.js
@@ -2,20 +2,12 @@
 import fhcapifactory from "../../../apps/api/fhcapifactory.js";
 import {CoreFilterCmpt} from "../../../components/filter/Filter.js"
 
-
-/* [
-    {title: 'Log ID', field: 'LogId', headerFilter: true},
-    {title: 'Request ID', field: 'RequestId', headerFilter: true},
-    {title: 'Execution time', field: 'ExecutionTime', headerFilter: true},
-    {title: 'Executed by', field: 'ExecutedBy', headerFilter: true},
-    {title: 'Description', field: 'Description', headerFilter: true},
-    {title: 'Data', field: 'Data', headerFilter: true},
-    {title: 'Web service type', field: 'WebserviceType', headerFilter: true}
-] */
-
-//? old data
-/* ajaxUrl: FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router+
-                "/Cis/Profil/getBenutzerFunktionen", */
+//? possible types of roles:
+//! depending on the role of the current view, different content is being displayed and fetched
+//* Student
+//* Mitarbeiter
+//* View_Student
+//* View_Mitarbeiter
 
 export default {
     components:{
@@ -28,7 +20,6 @@ export default {
             student_info:null,
             //? beinhaltet die Information ob der angefragte user ein Student oder Mitarbeiter ist
             role: null,
-            //"bf_bezeichnung", "oe_bezeichnung", "datum_von", "datum_bis", "wochenstunden" ]
 
             funktionen_table_options: {
                 height: 300,
@@ -60,7 +51,7 @@ export default {
     },
     
     //? this props were passed in the Profil.php view file
-    props:['uid','pid'],
+    props:['uid','pid','view'],
     methods: {
         
         concatenate_addresses(address_array){
@@ -111,7 +102,7 @@ export default {
             }
   
            return {
-                Allgemein: this.role =='Mitarbeiter'?{
+                Allgemein: (this.role =='Mitarbeiter' || this.role =='View_Mitarbeiter')?{
                     Username:this.index_information.username,
                     Anrede:this.index_information.anrede,
                     Titel:this.index_information.titel,
@@ -127,12 +118,12 @@ export default {
                 Nachname:this.index_information.nachname,
                 Postnomen:null,
             },
-            GeburtsDaten:{
+            GeburtsDaten:!this.role.includes("View")?{
                 Geburtsdatum:this.index_information.gebdatum,
                 Geburtsort: this.index_information.gebort,
-            },
+            }: null,
                 Adressen: this.index_information.adressen,
-            SpecialInformation: this.role =='Mitarbeiter'?  {
+            SpecialInformation: this.role =='Mitarbeiter' || this.role === 'View_Mitarbeiter'?  {
                 Kurzzeichen: this.mitarbeiter_info?.kurzbz,
                 Telefon: this.mitarbeiter_info?.telefonklappe,
             } : {
@@ -152,7 +143,7 @@ export default {
          
            return {
                 FhAusweisStatus: this.index_information.zutrittsdatum,
-                emails: this.role === 'Mitarbeiter'?  this.mitarbeiter_info?.emails: this.index_information.emails,
+                emails: this.role === 'Mitarbeiter' || this.role === 'View_Mitarbeiter'?  this.mitarbeiter_info?.emails: this.index_information.emails,
                 Kontakte:this.index_information.kontakte,
             };
         },
@@ -171,43 +162,57 @@ export default {
 
         console.log(this.uid);
         console.log(this.pid);
+        console.log(this.view);
+        console.log(typeof this.view);
+        if(this.view){console.log("view is true")}else{ console.log("view is false")}
 
         //? this function is to update the tabulator information only when the tabulator was build checking the tableBulit event
         //! only the tableBuilt event of the second tabulator was used to update the table informations
-         this.$refs.betriebsmittelTable.tabulator.on('tableBuilt', () => {
-           
-            fhcapifactory.UserData.isMitarbeiterOrStudent(this.uid).then((res) => {
-                this.role = res.data;
-            
+         
 
-                //? Die anderen api calls werden erst gemacht wenn der call zu isMitarbeiterOrStudent gemacht worden ist
+        fhcapifactory.UserData.isMitarbeiterOrStudent(this.uid).then((res) => {
+
+            this.role = this.view? "View_"+res.data: res.data;
+            if(!this.role.includes('View')){
+                this.$refs.betriebsmittelTable.tabulator.on('tableBuilt', () => {
+                }) 
+             }
 
 
-                //! indexProfilInformationen werden immer gefetcht
-                fhcapifactory.UserData.indexProfilInformaion().then((res) => {
-                    this.index_information = res.data;
-                    this.$refs.betriebsmittelTable.tabulator.setData(res.data.mittel);
-                });
-                
+        console.log("the role of the current view: ", this.role);
+        
+    
 
-                //? Danach werden die Informationen der Role gefetcht
-                if(this.role === 'Student'){ 
-                    fhcapifactory.UserData.studentProfil().then((res)=> {
-                        this.student_info = res.data;
-                        this.$refs.zutrittsgruppenTable.tabulator.setData(res.data.zuttritsgruppen);
-                    })
+        //? Die anderen api calls werden erst gemacht wenn der call zu isMitarbeiterOrStudent gemacht worden ist
+
+
+        //! indexProfilInformationen werden immer gefetcht
+        fhcapifactory.UserData.indexProfilInformaion(this.uid,this.view).then((res) => {
+            console.log(res.data);
+            this.index_information = res.data;
+            if(!this.role.includes("View")){
+            this.$refs.betriebsmittelTable.tabulator.setData(res.data.mittel);
+        }
+        });
+        
+
+        //? Danach werden die Informationen der Role gefetcht
+        if(this.role === "Student" || this.role === "View_Student"){ 
+            fhcapifactory.UserData.studentProfil(this.uid,this.view).then((res)=> {
+                this.student_info = res.data;
+                if(this.role ==="Student"){
+                this.$refs.zutrittsgruppenTable.tabulator.setData(res.data.zuttritsgruppen);
                 }
-                
-                if(this.role === 'Mitarbeiter'){
-                    fhcapifactory.UserData.mitarbeiterProfil().then((res)=> {
-                        this.mitarbeiter_info = res.data;
-                        this.$refs.funktionenTable.tabulator.setData(res.data.funktionen);
-                    })
-                }   
-            });
-            
-
-        }) 
+            })
+        }
+        
+        if(this.role === "Mitarbeiter" || this.role === "View_Mitarbeiter"){
+            fhcapifactory.UserData.mitarbeiterProfil(this.uid).then((res)=> {
+                this.mitarbeiter_info = res.data;
+                this.$refs.funktionenTable.tabulator.setData(res.data.funktionen);
+            })
+        }   
+    });
 
         
         
@@ -218,7 +223,6 @@ export default {
     <div :class="{'container':true}">
     <div :class="{'row':true}">
     <div :class="{'col':true}">
-    
     </div>
     <div :class="{'col':true}">
     
@@ -244,7 +248,7 @@ export default {
             </div>
             <div :class="{'col':true}">
            
-            <h3 v-if="role=='Mitarbeiter'">Mitarbeiter</h3>
+            <h3 v-if="role=='Mitarbeiter' || role == 'View_Mitarbeiter'">Mitarbeiter</h3>
             <h3 v-else >Student</h3>
             
             <div v-for="(wert,bezeichnung) in personData">
@@ -261,7 +265,7 @@ export default {
             <li v-for="(wert,bezeichnung) in kontaktInfo">
             
             <!-- HIER IST DAS DATUM DES FH AUSWEIS -->
-            <div class="mb-3" v-if="bezeichnung=='FhAusweisStatus'">
+            <div class="mb-3" v-if="bezeichnung=='FhAusweisStatus' && (role=='Sudent' || role =='Mitarbeiter')">
             <p class="mb-0"><b>FH-Ausweis Status</b></p>
             <p class="mb-0">{{"Der FH Ausweis ist am "+ wert+ " ausgegeben worden."}}</p>
             </div>
@@ -299,15 +303,15 @@ export default {
             <div :class="{'row':true}">
             
             <!-- order-1 classe wird nur bei der Studentenansicht hinzugefügt um die Zutrittsgruppen Tabelle hinter der Betriebsmittel aufzureihen -->
-            <div :class="{'col-12':true, 'order-2':role==='Student'}">
+            <div :class="{'col-12':true, 'order-2':role=='Student'}">
           
-            <core-filter-cmpt v-if="role === 'Mitarbeiter'" title="Funktionen"  ref="funktionenTable" :tabulator-options="funktionen_table_options" :tableOnly />
-            <core-filter-cmpt v-else title="Zutrittsgruppen" ref="zutrittsgruppenTable" :tabulator-options="zutrittsgruppen_table_options" :tableOnly :noColFilter />
+            <core-filter-cmpt v-if="role == 'Mitarbeiter' || role =='View_Mitarbeiter'" title="Funktionen"  ref="funktionenTable" :tabulator-options="funktionen_table_options" :tableOnly />
+            <core-filter-cmpt v-if="role == 'Student'" title="Zutrittsgruppen" ref="zutrittsgruppenTable" :tabulator-options="zutrittsgruppen_table_options" :tableOnly :noColFilter />
             
             </div>
             <div :class="{'col-12':true}">
                
-            <core-filter-cmpt title="Entlehnte Betriebsmittel"  ref="betriebsmittelTable" :tabulator-options="betriebsmittel_table_options" :tableOnly />
+            <core-filter-cmpt title="Entlehnte Betriebsmittel" v-if="!role?.includes('View')"  ref="betriebsmittelTable" :tabulator-options="betriebsmittel_table_options" :tableOnly />
        
             </div>
             

From 48f4afae73a377ed60dabcd87bb30fee90934d54 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Fri, 1 Dec 2023 11:41:17 +0100
Subject: [PATCH 0199/1461] adds Ort_kurzbz for the View_Mitarbeiter

---
 application/controllers/Cis/Profil.php    | 3 ++-
 public/js/components/Cis/Profil/Profil.js | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index dd1de706d..523a64386 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -166,8 +166,9 @@ class Profil extends Auth_Controller
 	}
 
 
+	
 
-	if(isSuccess($this->MitarbeiterModel->addSelect(["kurzbz","telefonklappe", "alias"]))
+	if(isSuccess($this->MitarbeiterModel->addSelect(["kurzbz","telefonklappe", "alias","ort_kurzbz"]))
 		&& isSuccess($this->MitarbeiterModel->addJoin("tbl_benutzer", "tbl_benutzer.uid = tbl_mitarbeiter.mitarbeiter_uid"))
 	){
 		$mitarbeiter_res = $this->MitarbeiterModel->load($uid);
diff --git a/public/js/components/Cis/Profil/Profil.js b/public/js/components/Cis/Profil/Profil.js
index ff40f7bd7..1e7900c38 100644
--- a/public/js/components/Cis/Profil/Profil.js
+++ b/public/js/components/Cis/Profil/Profil.js
@@ -126,6 +126,7 @@ export default {
             SpecialInformation: this.role =='Mitarbeiter' || this.role === 'View_Mitarbeiter'?  {
                 Kurzzeichen: this.mitarbeiter_info?.kurzbz,
                 Telefon: this.mitarbeiter_info?.telefonklappe,
+                ...(this.role === 'View_Mitarbeiter'?{Büro:this.mitarbeiter_info?.ort_kurzbz}:{}) ,
             } : {
                 Studiengang:this.student_info?.studiengang,
                 Semester:this.student_info?.semester,
@@ -223,6 +224,8 @@ export default {
     <div :class="{'container':true}">
     <div :class="{'row':true}">
     <div :class="{'col':true}">
+    <pre>
+   <!-- {{JSON.stringify(personData,null,2)}}</pre>-->
     </div>
     <div :class="{'col':true}">
     

From a105143771f74b05509706be56229832797dfe77 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 1 Dec 2023 12:18:42 +0100
Subject: [PATCH 0200/1461] =?UTF-8?q?=C3=9Cberarbeitung=20Tab=20Kontakt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controllers/components/stv/Kontakt.php    | 187 ++--
 .../Studentenverwaltung/Details/Kontakt.js    |  44 +-
 .../Details/Kontakt/Address.js                | 797 ++++++------------
 .../Details/Kontakt/Bankaccount.js            | 167 ++--
 .../Details/Kontakt/Contact.js                | 211 ++---
 5 files changed, 488 insertions(+), 918 deletions(-)

diff --git a/application/controllers/components/stv/Kontakt.php b/application/controllers/components/stv/Kontakt.php
index c63c8c25a..5ed9bc9ef 100644
--- a/application/controllers/components/stv/Kontakt.php
+++ b/application/controllers/components/stv/Kontakt.php
@@ -23,7 +23,7 @@ class Kontakt extends FHC_Controller
 	public function getAdressen($person_id)
 	{
 		$this->load->model('person/Adresse_model', 'AdresseModel');
-		//TODO(manu) check name: in Adresse und firma
+
 		$this->AdresseModel->addSelect('public.tbl_adresse.*');
 		$this->AdresseModel->addSelect('t.*');
 		$this->AdresseModel->addSelect('f.firma_id');
@@ -42,10 +42,11 @@ class Kontakt extends FHC_Controller
 		}
 	}
 
+	//old version
 	public function addNewAddress($person_id)
 	{
 		$this->load->library('form_validation');
-		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+		$_POST = json_decode($this->input->raw_input_stream, true);
 
 		$this->form_validation->set_rules('plz', 'PLZ', 'required|numeric');
 
@@ -94,7 +95,6 @@ class Kontakt extends FHC_Controller
 
 			]
 		);
-
 		if (isError($result))
 		{
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
@@ -103,6 +103,63 @@ class Kontakt extends FHC_Controller
 		return $this->outputJsonSuccess(true);
 	}
 
+	//Version mit input->post() TODO(Manu) check mit Chris, not working
+/*	public function addNewAddress($person_id)
+	{
+		$this->load->library('form_validation');
+		//$_POST = json_decode($this->input->raw_input_stream, true);
+
+
+		$this->load->model('person/Adresse_model', 'AdresseModel');
+
+		$uid = getAuthUID();
+
+		$data = [
+			'insertvon' => $uid,
+			'insertamum' => date('c'),
+			'plz' => $this->input->post('plz'),
+			'heimatadresse' => $this->input->post('heimatadresse'),
+			'zustelladresse' => $this->input->post('zustelladresse'),
+			'rechnungsadresse' => $this->input->post('rechnungsadresse')
+		];
+
+
+		$this->form_validation->set_rules('plz', 'PLZ', 'required|numeric');
+
+		if ($this->form_validation->run() == false)
+		{
+			return $this->outputJsonError($this->form_validation->error_array());
+		}
+
+
+		if ($this->input->post('co_name'))
+			$data['co_name'] = $this->input->post('co_name');
+		if ($this->input->post('strasse'))
+			$data['strasse'] = $this->input->post('strasse');
+		if ($this->input->post('ort'))
+			$data['ort'] = $this->input->post('ort');
+		if ($this->input->post('gemeinde'))
+			$data['gemeinde'] = $this->input->post('gemeinde');
+		if ($this->input->post('nation'))
+			$data['nation'] = $this->input->post('nation');
+		if ($this->input->post('name'))
+			$data['name'] = $this->input->post('name');
+		if ($this->input->post('typ'))
+			$data['typ'] = $this->input->post('typ');
+		if ($this->input->post('anmerkung'))
+			$data['anmerkung'] = $this->input->post('anmerkung');
+		if ($this->input->post('firma'))
+			$data['firma_id'] = $this->input->post('firma_id');
+
+		$result = $this->AdresseModel->insert($data);
+		if (isError($result))
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson($result);
+		}
+		return $this->outputJsonSuccess(true);
+	}*/
+
 	public function updateAddress($address_id)
 	{
 		$uid = getAuthUID();
@@ -140,9 +197,10 @@ class Kontakt extends FHC_Controller
 		$typ = isset($_POST['typ']) ? $_POST['typ'] : null;
 		$anmerkung = isset($_POST['anmerkung']) ? $_POST['anmerkung'] : null;
 
-		$result = $this->AdresseModel->update([
+		$result = $this->AdresseModel->update(
+			[
 			'adresse_id' => $address_id
-		],
+			],
 			[	'person_id' => $person_id,
 				'strasse' =>  $strasse,
 				'updatevon' => $uid,
@@ -159,7 +217,8 @@ class Kontakt extends FHC_Controller
 				'name' => $name,
 				'rechnungsadresse' => $_POST['rechnungsadresse'],
 				'anmerkung' => $anmerkung
-			]);
+			]
+		);
 
 		if (isError($result))
 		{
@@ -218,22 +277,6 @@ class Kontakt extends FHC_Controller
 		return $this->outputJsonSuccess(current(getData($result)));
 	}
 
-/*	TODO Manu bereits in Address.ph*/
-	public function getNations()
-	{
-		$this->load->model('codex/Nation_model', 'NationModel');
-
-		$this->NationModel->addOrder('kurztext');
-
-		$result = $this->NationModel->load();
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			$this->outputJson(getError($result));
-		} else {
-			$this->outputJson(getData($result) ?: []);
-		}
-	}
-
 	public function getAdressentypen()
 	{
 		$this->load->model('person/Adressentyp_model', 'AdressentypModel');
@@ -269,82 +312,6 @@ class Kontakt extends FHC_Controller
 		$this->outputJson($result);
 	}
 
-	public function getFirmenliste($searchString) //TODO (manu) DEPRECATED
-	{
-		$this->load->model('ressource/firma_model', 'FirmaModel');
-
-		$result = $this->FirmaModel->load();
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			$this->outputJson(getError($result));
-		} else {
-			$this->outputJson(getData($result) ?: []);
-		}
-	}
-
-	/**
-	 * Get Array of Names of Ortschaften having plz
-	 * @param string $plz Postleitzahl
-	 * @return array $result[]
-	 */
-	public function getOrtschaften($plz, $gemeinde=null)
-	{
-		$this->load->model('person/Adresse_model', 'AdresseModel');
-
-		//$ort = isset($ortschaft) ? $ortschaft : null;
-		if(isset($gemeinde)) {var_dump($gemeinde);
-			$gemeinde = urldecode($gemeinde);
-		}
-		else
-			$gemeinde = null;
-
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules($plz, 'PLZ', 'numeric|less_than[10000]');
-		if ($this->form_validation->run() == false) {
-			return $this->outputJsonError($this->form_validation->error_array());
-/*			$this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST);
-			return $this->outputJsonError($this->form_validation->error_array());*/
-		}
-
-		$result = $this->AdresseModel->getOrtschaften($plz, $gemeinde);
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			$this->outputJson($result);
-		}
-		elseif (!hasData($result)) {
-			$this->outputJson($result);
-		}
-		else
-		{
-			$this->outputJsonSuccess(getData($result));
-		}
-	}
-
-	/**
-	 * Get Array of Names of Gemeinden having plz
-	 * @param string $plz Postleitzahl
-	 * @return array $result[]
-	 */
-	function getGemeinden($plz)
-	{
-		$this->load->model('person/Adresse_model', 'AdresseModel');
-
-		$result = $this->AdresseModel->getGemeinden($plz);
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			$this->outputJson($result);
-		}
-		elseif (!hasData($result)) {
-			$this->outputJson($result); //success mit Wert null
-			//	$this->outputJson(getData($result) ?: []);
-		}
-		else
-		{
-			$this->outputJsonSuccess(getData($result));
-		}
-	}
-
 	public function getKontakte($person_id)
 	{
 		$this->load->model('person/Kontakt_model', 'KontaktModel');
@@ -492,9 +459,10 @@ class Kontakt extends FHC_Controller
 		$ext_id = isset($_POST['ext_id']) ? $_POST['ext_id'] : null;
 		$person_id = isset($_POST['person_id']) ? $_POST['person_id'] : null;
 
-		$result = $this->KontaktModel->update([
+		$result = $this->KontaktModel->update(
+			[
 			'kontakt_id' => $kontakt_id
-		],
+			],
 			[
 				'person_id' => $person_id,
 				'kontakttyp' =>  $kontakttyp,
@@ -505,7 +473,8 @@ class Kontakt extends FHC_Controller
 				'insertamum' => date('c'),
 				'standort_id' => $standort_id,
 				'ext_id' => $ext_id
-			]);
+			]
+		);
 
 		if (isError($result))
 		{
@@ -529,7 +498,7 @@ class Kontakt extends FHC_Controller
 			$this->outputJson($result);
 		}
 		elseif (!hasData($result)) {
-			$this->outputJson($result); //success mit Wert null
+			$this->outputJson($result);
 		}
 		return $this->outputJsonSuccess(current(getData($result)));
 	}
@@ -630,7 +599,6 @@ class Kontakt extends FHC_Controller
 
 	public function updateBankverbindung($bankverbindung_id)
 	{
-
 		$this->load->library('form_validation');
 		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
 
@@ -651,9 +619,10 @@ class Kontakt extends FHC_Controller
 
 		$uid = getAuthUID();
 
-		$result = $this->BankverbindungModel->update([
+		$result = $this->BankverbindungModel->update(
+			[
 			'bankverbindung_id' => $bankverbindung_id
-		],
+			],
 			[
 				'person_id' => $_POST['person_id'],
 				'name' => $_POST['name'],
@@ -669,7 +638,8 @@ class Kontakt extends FHC_Controller
 				'ext_id' => $_POST['ext_id'],
 				'oe_kurzbz' => $_POST['oe_kurzbz'],
 				'orgform_kurzbz' => $_POST['orgform_kurzbz']
-			]);
+			]
+		);
 
 		if (isError($result))
 		{
@@ -693,11 +663,8 @@ class Kontakt extends FHC_Controller
 			$this->outputJson($result);
 		}
 		elseif (!hasData($result)) {
-			$this->outputJson($result); //success mit Wert null
+			$this->outputJson($result);
 		}
 		return $this->outputJsonSuccess(current(getData($result)));
 	}
-
-
-
 }
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt.js
index f8d30a5a6..cfd4eec03 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt.js
@@ -1,4 +1,3 @@
-import {CoreRESTClient} from '../../../../RESTClient.js';
 import AddressList from "./Kontakt/Address.js";
 import ContactList from "./Kontakt/Contact.js";
 import BankaccountList from "./Kontakt/Bankaccount.js";
@@ -10,8 +9,6 @@ export default {
 		AddressList,
 		ContactList,
 		BankaccountList,
-		PvToast,
-		PvAutoComplete
 	},
 	props: {
 		student: Object
@@ -23,57 +20,20 @@ export default {
 			bankverbindungen: []
 		}
 	},
-	created(){
-		CoreRESTClient
-			.get('components/stv/Kontakt/getAdressen/' + this.student.person_id)
-			.then(result => {
-				this.adressen = result.data;
-			})
-			.catch(err => {
-				console.error(err.response.data || err.message);
-			});
-		/*		CoreRESTClient
-					.get('components/stv/Kontakt/getKontakte/' + this.student.person_id)
-					.then(result => {
-						this.kontakte = result.data;
-					})
-					.catch(err => {
-						console.error(err.response.data || err.message);
-					});
-				CoreRESTClient
-					.get('components/stv/Kontakt/getBankverbindung/' + this.student.person_id)
-					.then(result => {
-						this.bankverbindungen = result.data;
-					})
-					.catch(err => {
-						console.error(err.response.data || err.message);
-					});*/
-	},
 	template: `
 	<div class="stv-details-details h-100 pb-3">
 		<fieldset class="overflow-hidden">
-		
-
-		
-			<legend>Adressen</legend>		
-<!--			{{this.adressen}}-->
-
-				<!--props notwendig, um auf Funktion in child zuzugreifen-->
-<!--				<button type="button" class="btn btn btn-outline-warning" @click="actionNewAdress()">new Adress</button>
-				<button type="button" class="btn btn btn-outline-warning" @click="actionEditAdress(111444)">edit 111444</button>-->
-				
-				<address-list ref="adressList" :uid="student.person_id"></address-list>
+			<legend>Adressen</legend>
+			<address-list ref="adressList" :uid="student.person_id"></address-list>
 		</fieldset>
 		<br>
 		<fieldset class="overflow-hidden">
 			<legend>Kontakt</legend>
-	<!--		{{this.kontakte}}-->
 			<contact-list ref="contactList" :uid="student.person_id"></contact-list>
 		</fieldset>
 		<br>
 		<fieldset class="overflow-hidden">
 			<legend>Bankverbindungen</legend>
-<!--			{{this.bankverbindungen}}-->
 			<bankaccount-list ref="bankaccountList" :uid="student.person_id"></bankaccount-list>
 		</fieldset>
 	</div>`
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
index f3425cc5f..486e17fbe 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
@@ -2,18 +2,16 @@ import {CoreFilterCmpt} from "../../../../filter/Filter.js";
 import {CoreRESTClient} from "../../../../../RESTClient";
 import PvAutoComplete from "../../../../../../../index.ci.php/public/js/components/primevue/autocomplete/autocomplete.esm.min.js";
 import FhcFormValidation from '../../../../Form/Validation.js';
-/*import PvToast from "../../../../../../index.ci.php/public/js/components/primevue/toast/toast.esm.min.js";*/
 import BsModal from "../../../../Bootstrap/Modal.js";
 
 
-var editIcon = function(cell, formatterParams){ //plain text value
+var editIcon = function (cell, formatterParams) {
 	return "<i class='fa fa-edit'></i>";
 };
-var deleteIcon = function(cell, formatterParams){ //plain text value
+var deleteIcon = function (cell, formatterParams) {
 	return "<i class='fa fa-remove'></i>";
 };
 
-
 export default{
 	components: {
 		CoreFilterCmpt,
@@ -24,9 +22,6 @@ export default{
 	props: {
 		uid: String
 	},
-/*	emits: [
-		'update:selected'
-	],*/
 	data() {
 		return{
 			tabulatorOptions: {
@@ -42,11 +37,12 @@ export default{
 					{title:"Heimatadresse", field:"heimatadresse",
 						formatter: (cell, formatterParams, onRendered) => {
 							let output = cell.getValue() ? "ja" : "nein";
-							return output;}
+							return output;
+						}
 					},
 					{title:"Abweich.Empf", field:"co_name"},
 					{title:"Name", field:"name"},
-					{title:"Firma", field:"firmenname"}, //TODO(manu) check in DB
+					{title:"Firma", field:"firmenname"},
 					{title:"Firma_id", field:"firma_id", visible:false},
 					{title:"Adresse_id", field:"adresse_id", visible:false},
 					{title:"Person_id", field:"person_id", visible:false},
@@ -55,21 +51,16 @@ export default{
 					{title:"Rechnungsadresse", field:"rechnungsadresse", visible:false,
 						formatter: (cell, formatterParams, onRendered) => {
 							let output = cell.getValue() ? "ja" : "nein";
-							return output;}
+							return output;
+						}
 					},
 					{title:"Anmerkung", field:"anmerkung", visible:false},
-/*					{title: "Actions",
-						columns:[*/
-							{formatter:editIcon, width:40, align:"center", cellClick: (e, cell) => {
-									this.actionEditAdress(cell.getData().adresse_id);
-									console.log(cell.getRow().getIndex(), cell.getData(), this);
-								}, width:50, headerSort:false},
-							{formatter:deleteIcon, width:40, align:"center", cellClick: (e, cell) => {
-									this.actionDeleteAdress(cell.getData().adresse_id);
-									console.log(cell.getRow().getIndex(), cell.getData(), this);
-								}, width:50, headerSort:false },
-/*					],
-					},*/
+						{formatter:editIcon, width:40, align:"center", cellClick: (e, cell) => {
+								this.actionEditAdress(cell.getData().adresse_id);
+							}, width:50, headerSort:false},
+						{formatter:deleteIcon, width:40, align:"center", cellClick: (e, cell) => {
+								this.actionDeleteAdress(cell.getData().adresse_id);
+							}, width:50, headerSort:false },
 				],
 				layout: 'fitDataFill',
 				layoutColumnsOnNewData:	false,
@@ -77,11 +68,8 @@ export default{
 				selectable:	true,
 				index: 'adresse_id',
 			},
-			tabulatorEvents: [
-
-			],
-			addressData: {},
-			formData: {
+			tabulatorEvents: [],
+			addressData: {
 				zustelladresse: true,
 				heimatadresse: true,
 				rechnungsadresse: false,
@@ -95,27 +83,37 @@ export default{
 				typ: 'h',
 				nation: 'A'
 			},
+			places: [],
+			suggestions: {},
 			nations: [],
 			adressentypen: [],
 			firmen: [],
-			ortschaften: [],
-			gemeinden: [],
-			filteredFirmen: []
+			filteredFirmen: [],
+			abortController: {
+				suggestions: null,
+				places: null
+			}
 		}
 	},
 	computed:{
-
+		orte() {
+			return this.places.filter(ort => ort.name == this.addressData.gemeinde);
+		},
+		gemeinden() {
+			return Object.values(this.places.reduce((res,place) => {
+				res[place.name] = place;
+				return res;
+			}, {}));
+		}
 	},
 	methods:{
 		actionNewAdress(){
-			/*bootstrap.Modal.getOrCreateInstance(this.$refs.newAdressModal).show();*/
 			this.$refs.newAdressModal.show();
 		},
 		actionEditAdress(adress_id){
 			this.loadAdress(adress_id).then(() => {
 				if(this.addressData.adresse_id)
 					this.$refs.editAdressModal.show();
-/*					bootstrap.Modal.getOrCreateInstance(this.$refs.editAdressModal).show();*/
 			});
 		},
 		actionDeleteAdress(adress_id){
@@ -125,12 +123,11 @@ export default{
 						this.$fhcAlert.alertError("Heimatadressen dürfen nicht gelöscht werden, da diese für die BIS-Meldung relevant sind. Um die Adresse dennoch zu löschen, entfernen sie das Häkchen bei Heimatadresse!");
 					else
 						this.$refs.deleteAdressModal.show();
-/*						bootstrap.Modal.getOrCreateInstance(this.$refs.deleteAdressModal).show();*/
 			});
 		},
-		addNewAddress(formData) {
+		addNewAddress(addressData) {
 			CoreRESTClient.post('components/stv/Kontakt/addNewAddress/' + this.uid,
-				this.formData
+				this.addressData
 			).then(response => {
 				if (!response.data.error) {
 					this.$fhcAlert.alertSuccess('Speichern erfolgreich');
@@ -140,41 +137,32 @@ export default{
 					const errorData = response.data.retval;
 					Object.entries(errorData).forEach(entry => {
 						const [key, value] = entry;
-						console.log(key, value);
 						this.$fhcAlert.alertError(value);
-						/*this.$fhcAlert.handleFormValidation(error, this.$refs.newAdressModal);*/
 					});
 				}
 			}).catch(error => {
-				console.log(error);
-				this.statusCode = 0;
-				this.statusMsg = 'Error in Catch';
-				console.log('Speichern nicht erfolgreich ' + this.statusMsg);
 				this.$fhcAlert.alertError('Fehler bei Speicherroutine aufgetreten');
 			}).finally(() => {
 				window.scrollTo(0, 0);
 				this.reload();
 			});
-
-			//this.formData = [];
 		},
 		reload(){
 			this.$refs.table.reloadTable();
 		},
 		loadAdress(adress_id){
-			return CoreRESTClient.get('components/stv/Kontakt/loadAddress/' + adress_id
-			).then(
-				result => {
-					console.log(this.addressData, result);
-					if(result.data.retval)
-						this.addressData = result.data.retval;
-					else
-					{
-						this.addressData = {};
-						this.$fhcAlert.alertError('Keine Adresse mit Id ' + adress_id + ' gefunden');
+			return CoreRESTClient.get('components/stv/Kontakt/loadAddress/' + adress_id)
+				.then(
+					result => {
+						if(result.data.retval)
+							this.addressData = result.data.retval;
+						else
+						{
+							this.addressData = {};
+							this.$fhcAlert.alertError('Keine Adresse mit Id ' + adress_id + ' gefunden');
+						}
+						return result;
 					}
-					return result;
-				}
 			);
 		},
 		updateAddress(adress_id){
@@ -189,102 +177,62 @@ export default{
 					const errorData = response.data.retval;
 					Object.entries(errorData).forEach(entry => {
 						const [key, value] = entry;
-						console.log(key, value);
 						this.$fhcAlert.alertError(value);
 					});
 				}
 			}).catch(error => {
 				this.statusMsg = 'Error in Catch';
-				console.log('Speichern nicht erfolgreich ' + this.statusMsg);
 				this.$fhcAlert.alertError('Fehler bei Speicherroutine aufgetreten');
 			}).finally(() => {
 				window.scrollTo(0, 0);
-				//hideModal();
 				this.reload();
 			});
 		},
 		deleteAddress(adress_id){
 			CoreRESTClient.post('components/stv/Kontakt/deleteAddress/' + adress_id)
 				.then(response => {
-					console.log(response);
 					if (!response.data.error) {
-						this.statusCode = 0;
-						this.statusMsg = 'success';
-						console.log('Löschen erfolgreich: ' + this.statusMsg);
 						this.$fhcAlert.alertSuccess('Löschen erfolgreich');
 					} else {
-						this.statusCode = 0;
-						this.statusMsg = 'Error';
-						console.log('Löschen nicht erfolgreich: ' + this.statusMsg);
 						this.$fhcAlert.alertError('Keine Adresse mit Id ' + adress_id + ' gefunden');
 					}
 				}).catch(error => {
-				console.log(error);
-				this.statusCode = 0;
-				this.statusMsg = 'Error in Catch';
-				console.log('Löschen nicht erfolgreich ' + this.statusMsg);
-				this.$fhcAlert.alertError('Fehler bei Löschroutine aufgetreten');
-			}).finally(()=> {
-				window.scrollTo(0, 0);
-				this.hideModal('deleteAdressModal');
-				this.reload();
-			});
+					this.$fhcAlert.alertError('Fehler bei Löschroutine aufgetreten');
+				}).finally(()=> {
+					window.scrollTo(0, 0);
+					this.hideModal('deleteAdressModal');
+					this.reload();
+				});
 		},
-		getGemeinden(searchString){
-			return CoreRESTClient.get('components/stv/Kontakt/getGemeinden/' + searchString
-			).then(
-				result => {
-					if(result.data.retval)
-						this.gemeinden = result.data.retval;
-					else
-					{
-						this.gemeinden = {};
-						this.$fhcAlert.alertError('Keine Gemeinde mit PLZ ' + plz + ' gefunden');
-					}
-					return result;
-				}
-			);
-		},
-		getOrtschaften(searchString){
-			return CoreRESTClient.get('components/stv/Kontakt/getOrtschaften/' + searchString
-			).then(
-				result => {
-					if(result.data.retval)
-						this.ortschaften = result.data.retval;
-					else
-					{
-						this.ortschaften = {};
-						//this.$fhcAlert.alertError('Keine Ortschaft mit PLZ ' + plz + ' gefunden');
-					}
-					return result;
-				}
-			);
-		},
-		getPlaces(plz){
+		loadPlaces() {
+			if (this.abortController.places)
+				this.abortController.places.abort();
+			if (this.addressData.nation != 'A' || !this.addressData.plz)
+				return;
+
+			this.abortController.places = new AbortController();
 			CoreRESTClient
-				.get('components/stv/address/getPlaces/' + this.formData.address.plz, undefined, {
+				.get('components/stv/address/getPlaces/' + this.addressData.plz, undefined, {
 					signal: this.abortController.places.signal
 				})
 				.then(result => CoreRESTClient.getData(result.data) || [])
 				.then(result => {
 					this.places = result;
-				})
-				.catch(error => {
+				});
+/*				.catch(error => {
 					if (error.code == 'ERR_BAD_REQUEST') {
 						return this.$fhcAlert.handleFormValidation(error, this.$refs.form);
 					}
 					// NOTE(chris): repeat request
 					if (error.code != "ERR_CANCELED")
 						window.setTimeout(this.loadPlaces, 100);
-				});
+				});*/
 		},
 		search(event) {
-			//console.log(event.query);
 			return CoreRESTClient
 				.get('components/stv/Kontakt/getFirmen/' + event.query)
 				.then(result => {
 					this.filteredFirmen = CoreRESTClient.getData(result.data);
-					//return firma.name.toLowerCase().startsWith(event.query.toLowerCase());
 				});
 		},
 		reload(){
@@ -294,20 +242,11 @@ export default{
 			this.$refs[modalRef].hide();
 		},
 		resetModal(){
-			this.formData = {};
-			this.formData = this.initData;
 			this.addressData = {};
+			this.addressData = this.initData;
 		},
 	},
 	created(){
-/*		CoreRESTClient
-			.get('components/stv/Address/getNations')
-			.then(result => {
-				this.nations = result.data[];
-			})
-			.catch(err => {
-				console.error(err.response.data || err.message);
-			});*/
 		CoreRESTClient
 			.get('components/stv/Address/getNations')
 			.then(result => CoreRESTClient.getData(result.data) || [])
@@ -324,471 +263,267 @@ export default{
 				console.error(err.response.data || err.message);
 			});
 	},
-	template: `			
+	template: `
 		<div class="stv-list h-100 pt-3">
 		
 		<!--Modal: Add Address-->
 		<BsModal ref="newAdressModal">
 			<template #title>Adresse anlegen</template>
-				<form class="row g-3" ref="formData">
+				<form class="row g-3" ref="addressData">
 					<div class="row mb-3">
 						<label for="adressentyp" class="form-label col-sm-4">Typ</label>
-						<div class="col-sm-5">
-							<select id="adressentyp" class="form-select" v-model="formData.typ">
+						<div class="col-sm-6">
+							<select id="adressentyp" class="form-select" v-model="addressData.typ">
 								<option v-for="typ in adressentypen" :key="typ.adressentyp_kurzbz" :value="typ.adressentyp_kurzbz" >{{typ.bezeichnung}}</option>
 							</select>
 						</div>
 					</div>
-					<div class="row mb-3">											   
+					<div class="row mb-3">
 						<label for="strasse" class="form-label col-sm-4">Strasse</label>
-						<div class="col-sm-5">
-							<input type="text" :readonly="readonly" class="form-control" id="strasse" v-model="formData['strasse']">
+						<div class="col-sm-6">
+							<input type="text" :readonly="readonly" class="form-control" id="strasse" v-model="addressData['strasse']">
 						</div>
-					</div>	
+					</div>
 						
 					<div class="row mb-3">
 						<label for="nation" class="form-label col-sm-4">Nation</label>
-						<div class="col-sm-5">
-							<select id="nation" class="form-control" v-model="formData.nation">
+						<div class="col-sm-6">
+							<select id="nation" class="form-select" v-model="addressData.nation">
 								<option v-for="nation in nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
 							</select>
 						</div>
-					</div>	
-						
-					<div class="row mb-3">								
+					</div>
+										
+					<div class="row mb-3">
 						<label for="plz" class="required form-label col-sm-4" >PLZ</label>
-						 <div class="col-sm-5">
-							<input type="text" class="form-control" required v-model="formData['plz']" >
-						</div>
-					</div>	
-					
-					<div class="row mb-3">
-						<label for="gemeinde" class="form-label col-sm-4">Gemeinde</label>
-						<div v-if="formData.plz && formData.nation === 'A'" class="col-sm-5">
-							<select id="gemeinde" class="form-control" v-model="formData['gemeinde']" @click="getGemeinden(formData.plz)">
-								<option value="">-- keine Auswahl --</option>
-								<option v-for="gemeinde in gemeinden" :value="gemeinde.name" >{{gemeinde.name}}</option>
-							</select>	
-						</div>
-						<div v-else class="col-sm-3">
-							<div class="col-sm-3">
-								<input id="ort" type="text" class="form-control-sm" v-model="formData['gemeinde']">
-							</div>
-						</div>
-					</div>
-						
-					<div class="row mb-3">	
-						<label for="ort" class="form-label col-sm-4">Ortschaft</label>  
-						<div v-if="formData.plz && formData.nation === 'A' && formData.gemeinde" class="col-sm-5">
-							<select id="ort" class="form-control" v-model="formData['ort']" @click="getOrtschaften(formData.plz + '/' + formData.gemeinde)">
-								<option value="">-- keine Auswahl --</option>
-								<option v-for="ort in ortschaften" :value="ort.ortschaftsname" >{{ort.ortschaftsname}}</option>
-							</select>	
-						</div>
-						<div v-else-if="formData.plz && formData.nation === 'A'" class="col-sm-5">
-							<select id="ort" class="form-control" v-model="formData['ort']" @click="getOrtschaften(formData.plz)">
-								<option value="">-- keine Auswahl --</option>
-								<option v-for="ort in ortschaften" :value="ort.ortschaftsname" >{{ort.ortschaftsname}}</option>
-							</select>	
-						</div>
-						<div v-else class="col-sm-3">
-							<div class="col-sm-3">
-								<input id="ort" type="text" class="form-control-sm" v-model="formData['ort']">
-							</div>
-						</div>
-					</div>	
-						
-					<div class="row mb-3">				
-						<label for="heimatadresse" class="form-label col-sm-4">Heimatadresse</label>
-						<div class="col-sm-3">
-							<div class="form-check">
-								<input id="heimatadresse" type="checkbox" class="form-check-input" value="1" v-model="formData['heimatadresse']">
-							</div>
-						</div>
-					</div>	
-						
-					<div class="row mb-3">
-						<label for="zustelladresse" class="form-label col-sm-4">Zustelladresse</label>
-						<div class="col-sm-3">
-							<div class="form-check">	
-								<input id="zustelladresse" type="checkbox" class="form-check-input" value="1" v-model="formData['zustelladresse']">
-							</div>
-						</div>
-					</div>	
-					
-					<div class="row mb-3">
-							<label for="co_name" class="form-label col-sm-4">Abweich.Empfänger. (c/o)</label>
-						<div class="col-sm-3">
-							<input type="text" id="co_name" class="form-control-sm" v-model="formData['co_name']">
-						</div>	
-					</div>
-					
-					<div class="row mb-3">
-						<label for="rechnungsadresse" class="form-label col-sm-4">Rechnungsadresse</label>
-						<div class="col-sm-3">
-							<div class="form-check">	
-								<input id="rechnungsadresse" type="checkbox" class="form-check-input" v-model="formData['rechnungsadresse']">
-							</div>
-						</div>
-					</div>			
-					
-					<div class="row mb-3">
-						<label for="firma_name" class="form-label col-sm-4">Firma</label>
-							<div class="col-sm-5">
-									<PvAutoComplete v-model="formData['firma']" class="form-control" optionLabel="name" :suggestions="filteredFirmen" @complete="search" minLength="3"/>
-							</div>	
-					</div>	
-				
-					<div class="row mb-3">											   
-						<label for="name" class="form-label col-sm-4">Name</label>
-						<div class="col-sm-3">
-							<input type="text" :readonly="readonly" class="form-control" id="name" v-model="formData['name']">
-						</div>
-					</div>			
-					<div class="row mb-3">											   
-						<label for="anmerkung" class="form-label col-sm-4">Anmerkung</label>
-						<div class="col-sm-3">
-							<input type="text" :readonly="readonly" class="form-control-sm" id="anmerkung" v-model="formData['anmerkung']">
-						</div>
-					</div>	
-			</form>	
-			<template #footer>
-				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
-				<button type="button" class="btn btn-primary" @click="addNewAdress()">OK</button>
-            </template>
-		</BsModal>
-		
-								
-	<!--	<div ref="newAdressModal" class="modal fade" id="newAddressModal" tabindex="-1" aria-labelledby="newAddressModalLabel" aria-hidden="true">
-		  <div class="modal-dialog">
-			<div class="modal-content">
-			  <div class="modal-header">
-				<h5 class="modal-title" id="newAddressModalLabel">Neue Adresse anlegen</h5>
-				<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-			  </div>
-			  <div class="modal-body">
-				<form  ref="formData">					
-					<div class="row mb-3">
-						<label for="adressentyp" class="form-label col-sm-4">Typ</label>
-						<div class="col-sm-5">
-							<select id="adressentyp" class="form-select" v-model="formData.typ">
-								<option v-for="typ in adressentypen" :key="typ.adressentyp_kurzbz" :value="typ.adressentyp_kurzbz" >{{typ.bezeichnung}}</option>
-							</select>
-						</div>
-					</div>
-					<div class="row mb-3">											   
-						<label for="strasse" class="form-label col-sm-4">Strasse</label>
-						<div class="col-sm-5">
-							<input type="text" :readonly="readonly" class="form-control" id="strasse" v-model="formData['strasse']">
-						</div>
-					</div>	
-						
-					<div class="row mb-3">
-						<label for="nation" class="form-label col-sm-4">Nation</label>
-						<div class="col-sm-5">
-							<select id="nation" class="form-control" v-model="formData.nation">
-								<option v-for="nation in nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
-							</select>
-						</div>
-					</div>	
-						
-					<div class="row mb-3">								
-						<label for="plz" class="required form-label col-sm-4" >PLZ</label>
-						 <div class="col-sm-5">
-							<input type="text" class="form-control" required v-model="formData['plz']" >
-						</div>
-					</div>	
-					
-					<div class="row mb-3">
-						<label for="gemeinde" class="form-label col-sm-4">Gemeinde</label>
-						<div v-if="formData.plz && formData.nation === 'A'" class="col-sm-5">
-							<select id="gemeinde" class="form-control" v-model="formData['gemeinde']" @click="getGemeinden(formData.plz)">
-								<option value="">&#45;&#45; keine Auswahl &#45;&#45;</option>
-								<option v-for="gemeinde in gemeinden" :value="gemeinde.name" >{{gemeinde.name}}</option>
-							</select>	
-						</div>
-						<div v-else class="col-sm-3">
-							<div class="col-sm-3">
-								<input id="ort" type="text" class="form-control-sm" v-model="formData['gemeinde']">
-							</div>
-						</div>
-					</div>
-						
-					<div class="row mb-3">	
-						<label for="ort" class="form-label col-sm-4">Ortschaft</label>  
-						<div v-if="formData.plz && formData.nation === 'A' && formData.gemeinde" class="col-sm-5">
-							<select id="ort" class="form-control" v-model="formData['ort']" @click="getOrtschaften(formData.plz + '/' + formData.gemeinde)">
-								<option value="">&#45;&#45; keine Auswahl &#45;&#45;</option>
-								<option v-for="ort in ortschaften" :value="ort.ortschaftsname" >{{ort.ortschaftsname}}</option>
-							</select>	
-						</div>
-						<div v-else-if="formData.plz && formData.nation === 'A'" class="col-sm-5">
-							<select id="ort" class="form-control" v-model="formData['ort']" @click="getOrtschaften(formData.plz)">
-								<option value="">&#45;&#45; keine Auswahl &#45;&#45;</option>
-								<option v-for="ort in ortschaften" :value="ort.ortschaftsname" >{{ort.ortschaftsname}}</option>
-							</select>	
-						</div>
-						<div v-else class="col-sm-3">
-							<div class="col-sm-3">
-								<input id="ort" type="text" class="form-control-sm" v-model="formData['ort']">
-							</div>
-						</div>
-					</div>	
-						
-					<div class="row mb-3">				
-						<label for="heimatadresse" class="form-label col-sm-4">Heimatadresse</label>
-						<div class="col-sm-3">
-							<div class="form-check">
-								<input id="heimatadresse" type="checkbox" class="form-check-input" value="1" v-model="formData['heimatadresse']">
-							</div>
-						</div>
-					</div>	
-						
-					<div class="row mb-3">
-						<label for="zustelladresse" class="form-label col-sm-4">Zustelladresse</label>
-						<div class="col-sm-3">
-							<div class="form-check">	
-								<input id="zustelladresse" type="checkbox" class="form-check-input" value="1" v-model="formData['zustelladresse']">
-							</div>
-						</div>
-					</div>	
-					
-					<div class="row mb-3">
-							<label for="co_name" class="form-label col-sm-4">Abweich.Empfänger. (c/o)</label>
-						<div class="col-sm-3">
-							<input type="text" id="co_name" class="form-control-sm" v-model="formData['co_name']">
-						</div>	
-					</div>
-					
-					<div class="row mb-3">
-						<label for="rechnungsadresse" class="form-label col-sm-4">Rechnungsadresse</label>
-						<div class="col-sm-3">
-							<div class="form-check">	
-								<input id="rechnungsadresse" type="checkbox" class="form-check-input" v-model="formData['rechnungsadresse']">
-							</div>
-						</div>
-					</div>			
-					
-					<div class="row mb-3">
-						<label for="firma_name" class="form-label col-sm-4">Firma</label>
-							<div class="col-sm-5">
-									<PvAutoComplete v-model="formData['firma']" class="form-control" optionLabel="name" :suggestions="filteredFirmen" @complete="search" minLength="3"/>
-							</div>	
-					</div>	
-					
-					<div class="row mb-3">											   
-						<label for="name" class="form-label col-sm-4">Name</label>
-						<div class="col-sm-3">
-							<input type="text" :readonly="readonly" class="form-control" id="name" v-model="formData['name']">
-						</div>
-					</div>		
-					
-					<div class="row mb-3">											   
-						<label for="anmerkung" class="form-label col-sm-4">Anmerkung</label>
-						<div class="col-sm-3">
-							<input type="text" :readonly="readonly" class="form-control-sm" id="anmerkung" v-model="formData['anmerkung']">
-						</div>
-					</div>					   
-				</form>  
-							
-			  </div>
-			  <div class="modal-footer">
-				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
-				<button type="button" class="btn btn-primary" @click="addNewAddress()">OK</button>
-			  </div>
-			</div>
-		  </div>
-		</div>-->
-		
-				<!--Modal: Edit Address-->
-<!--		<BsModal ref="newBankverbindungModal">
-			<template #title>Adresse anlegen</template>
-			<form class="row g-3" ref="formData">
-			
-			</form>	
-			<template #footer>
-				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
-				<button type="button" class="btn btn-primary" @click="addNewAdress()">OK</button>
-            </template>
-		</BsModal>-->
-		
-		<div ref="editAdressModal" class="modal fade" id="editAdressModal" tabindex="-1" aria-labelledby="editAdressModalLabel" aria-hidden="true">
-		  <div class="modal-dialog">
-			<div class="modal-content">
-			  <div class="modal-header">
-				<h5 class="modal-title" id="editAdressModalLabel">Adresse bearbeiten</h5>
-				<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-			  </div>
-			  <div class="modal-body">
-				<form ref="addressData"> 
-												
-					<div class="row mb-3">
-						<label for="adressentyp" class="form-label col-sm-4">Typ</label>
-						<div class="col-sm-5">
-							<select id="adressentyp" class="form-control" v-model="addressData.typ">
-								<option v-for="typ in adressentypen" :key="typ.adressentyp_kurzbz" :value="typ.adressentyp_kurzbz" >{{typ.bezeichnung}}</option>
-							</select>
+						 <div class="col-sm-6">
+							<input type="text" class="form-control" required v-model="addressData['plz']" @input="loadPlaces" >
 						</div>
 					</div>
 					
-					<div class="row mb-3">											   
-						<label for="strasse" class="form-label col-sm-4">Strasse</label>
-						<div class="col-sm-3">
-							<input type="text" :readonly="readonly" class="form-control-sm" id="strasse" v-model="addressData.strasse">
-						</div>
-					</div>	
-						
 					<div class="row mb-3">
-						<label for="nation" class="form-label col-sm-4">Nation</label>
-						<div class="col-sm-5">
-							<select id="nation" class="form-control" v-model="addressData.nation">
-								<option v-for="nation in nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
-							</select>
-						</div>
-					</div>	
-					
-					<div class="row mb-3">								
-						<label for="plz" class="required form-label col-sm-4" >PLZ</label>
-						 <div class="col-sm-3">
-							<input type="text" class="form-control-sm" required v-model="addressData.plz" >
-						</div>
-					</div>	
-						
-					<div class="row mb-3">
-						<label for="gemeinde" class="form-label col-sm-4">Gemeinde</label>
-						<div v-if="addressData.gemeinde" class="col-sm-3" >
-							<input id="ort" type="text" class="form-control-sm" v-model="addressData['gemeinde']">
-						</div>
-						<div v-else-if="addressData.plz && addressData.nation === 'A'" class="col-sm-5">
-							<select id="gemeinde" class="form-control" v-model="addressData['gemeinde']" @click="getGemeinden(addressData.plz)">
-								<option value="">-- keine Auswahl --</option>
-								<option v-for="gemeinde in gemeinden" :value="gemeinde.name" >{{gemeinde.name}}</option>
-							</select>	
-						</div>
-						<div v-else class="col-sm-3">
-							<div class="col-sm-3">
-								<input id="ort" type="text" class="form-control-sm" v-model="addressData['gemeinde']">
+						<label :for="gemeinde" class="form-label col-sm-4">Gemeinde</label>
+							<div class="col-sm-6">
+								<select v-if="addressData['nation'] == 'A'" name="addressData[gemeinde]" class="form-select" v-model="addressData['gemeinde']">
+									<option v-if="!gemeinden.length" disabled>Bitte gültige PLZ wählen</option>
+									<option v-for="gemeinde in gemeinden" :key="gemeinde.name" :value="gemeinde.name">{{gemeinde.name}}</option>
+								</select>
+								<input v-else type="text" class="form-control" v-model="addressData['gemeinde']">
 							</div>
-						</div>
-					</div>
-
-					<div class="row mb-3">	
-						<label for="ort" class="form-label col-sm-4">Ortschaft</label>  
-						<div v-if="addressData.ort" class="col-sm-3">
-							<div class="col-sm-3">
-								<input id="ort" type="text" class="form-control-sm" v-model="addressData['ort']">
-							</div>
-						</div>
-						<div v-else-if="addressData.plz && addressData.nation === 'A' && addressData.gemeinde" class="col-sm-5">
-							<select id="ort" class="form-control" v-model="addressData['ort']" @click="getOrtschaften(addressData.plz + '/' + addressData.gemeinde)">
-								<option value="">-- keine Auswahl --</option>
-								<option v-for="ort in ortschaften" :value="ort.ortschaftsname" >{{ort.ortschaftsname}}</option>
-							</select>	
-						</div>
-						<div v-else-if="addressData.plz && addressData.nation === 'A'" class="col-sm-5">
-							<select id="ort" class="form-control" v-model="addressData['ort']" @click="getOrtschaften(addressData.plz)">
-								<option value="">-- keine Auswahl --</option>
-								<option v-for="ort in ortschaften" :value="ort.ortschaftsname" >{{ort.ortschaftsname}}</option>
-							</select>	
-						</div>
-						<div v-else class="col-sm-3">
-							<div class="col-sm-3">
-								<input id="ort" type="text" class="form-control-sm" v-model="addressData['ort']">
-							</div>
-						</div>
 					</div>
 					
-					<div class="row mb-3">				
+					<div class="row mb-3">
+							<label :for="Ort" class="form-label col-sm-4">Ort</label>
+							<div class="col-sm-6">
+								<select v-if="addressData['nation'] == 'A'" name="address[ort]" class="form-select" v-model="addressData['ort']">
+									<option v-if="!orte.length" disabled>Bitte gültige Gemeinde wählen</option>
+									<option v-for="ort in orte" :key="ort.ortschaftsname" :value="ort.ortschaftsname">{{ort.ortschaftsname}}</option>
+								</select>
+								<input v-else type="text" name="ort" class="form-control" v-model="addressData['ort']">
+							</div>
+					</div>
+										
+					<div class="row mb-3">
 						<label for="heimatadresse" class="form-label col-sm-4">Heimatadresse</label>
 						<div class="col-sm-3">
 							<div class="form-check">
 								<input id="heimatadresse" type="checkbox" class="form-check-input" value="1" v-model="addressData['heimatadresse']">
 							</div>
 						</div>
-					</div>	
+					</div>
 						
 					<div class="row mb-3">
 						<label for="zustelladresse" class="form-label col-sm-4">Zustelladresse</label>
 						<div class="col-sm-3">
-							<div class="form-check">	
+							<div class="form-check">
 								<input id="zustelladresse" type="checkbox" class="form-check-input" value="1" v-model="addressData['zustelladresse']">
 							</div>
 						</div>
-					</div>	
+					</div>
 					
 					<div class="row mb-3">
-						<label for="co_name" class="form-label col-sm-4">Abweich.Empfänger. (c/o)</label>
-						<div class="col-sm-3">
-							<input type="text" id="co_name" class="form-control-sm" v-model="addressData['co_name']">
-						</div>	
+							<label for="co_name" class="form-label col-sm-4">Abweich.Empfänger. (c/o)</label>
+						<div class="col-sm-6">
+							<input type="text" id="co_name" class="form-control" v-model="addressData['co_name']">
+						</div>
 					</div>
 					
 					<div class="row mb-3">
 						<label for="rechnungsadresse" class="form-label col-sm-4">Rechnungsadresse</label>
 						<div class="col-sm-3">
-							<div class="form-check">	
+							<div class="form-check">
 								<input id="rechnungsadresse" type="checkbox" class="form-check-input" v-model="addressData['rechnungsadresse']">
 							</div>
 						</div>
-					</div>	
-
+					</div>
 					
 					<div class="row mb-3">
 						<label for="firma_name" class="form-label col-sm-4">Firma</label>
-							<div v-if="addressData.firmenname" class="col-sm-3">
-							 	<input type="text" :readonly="readonly" class="form-control-sm" id="name" v-model="addressData.firmenname">
-							</div>	
-							<div v-else class="col-sm-3">
-							 	<PvAutoComplete v-model="addressData['firma']" optionLabel="name" :suggestions="filteredFirmen" @complete="search" minLength="3"/>
-							</div>	
-					</div>	
-					
-					<div class="row mb-3">					
-						<input type="hidden" :readonly="readonly" class="form-control-sm" id="firma_id" v-model="addressData.firma_id">
+							<div class="col-sm-4">
+							 	<PvAutoComplete v-model="addressData['firma']"  optionLabel="name" :suggestions="filteredFirmen" @complete="search" minLength="3"/>
+							</div>
 					</div>
-
-					<div class="row mb-3">											   
-						<label for="name" class="form-label col-sm-4">Name</label>
-						<div class="col-sm-2">
-							<input type="text" :readonly="readonly" class="form-control-sm" id="name" v-model="addressData['name']">
-						</div>
-					</div>		
 					
-					<div class="row mb-3">											   
-						<label for="anmerkung" class="form-label col-sm-4">Anmerkung</label>
-						<div class="col-sm-3">
-							<input type="text" :readonly="readonly" class="form-control-sm" id="anmerkung" v-model="addressData['anmerkung']">
+					<div class="row mb-3">
+						<label for="name" class="form-label col-sm-4">Name</label>
+						<div class="col-sm-6">
+							<input type="text" :readonly="readonly" class="form-control" id="name" v-model="addressData['name']">
 						</div>
-					</div>	
-																										   
-				</form>  
-							
-			  </div>
-			  <div class="modal-footer">
+					</div>
+					<div class="row mb-3">
+						<label for="anmerkung" class="form-label col-sm-4">Anmerkung</label>
+						<div class="col-sm-6">
+							<input type="text" :readonly="readonly" class="form-control" id="anmerkung" v-model="addressData['anmerkung']">
+						</div>
+					</div>
+			</form>
+			<template #footer>
+				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
+				<button type="button" class="btn btn-primary" @click="addNewAddress()">OK</button>
+            </template>
+		</BsModal>
+		
+		<!--Modal: Edit Address-->
+		<BsModal ref="editAdressModal">
+			<template #title>Adresse bearbeiten</template>
+			<form class="row g-3" ref="addressData">
+				<div class="row mb-3">
+					<label for="adressentyp" class="form-label col-sm-4">Typ</label>
+					<div class="col-sm-6">
+						<select id="adressentyp" class="form-control" v-model="addressData.typ">
+							<option v-for="typ in adressentypen" :key="typ.adressentyp_kurzbz" :value="typ.adressentyp_kurzbz" >{{typ.bezeichnung}}</option>
+						</select>
+					</div>
+				</div>
+				
+				<div class="row mb-3">
+					<label for="strasse" class="form-label col-sm-4">Strasse</label>
+					<div class="col-sm-6">
+						<input type="text" :readonly="readonly" class="form-control" id="strasse" v-model="addressData.strasse">
+					</div>
+				</div>
+					
+				<div class="row mb-3">
+					<label for="nation" class="form-label col-sm-4">Nation</label>
+					<div class="col-sm-6">
+						<select id="nation" class="form-select" v-model="addressData.nation">
+							<option v-for="nation in nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
+						</select>
+					</div>
+				</div>
+				
+				<div class="row mb-3">
+					<label for="plz" class="required form-label col-sm-4" >PLZ</label>
+					 <div class="col-sm-6">
+						<input type="text" class="form-control" required v-model="addressData['plz']" @input="loadPlaces">
+					</div>
+				</div>
+				<div class="row mb-3">
+					<label :for="gemeinde" class="form-label col-sm-4">Gemeinde</label>
+						<div v-if="addressData['gemeinde']" class="col-sm-6">
+							<input type="text" class="form-control" v-model="addressData['gemeinde']">
+						</div>
+						<div v-else class="col-sm-6">
+							<select v-if="addressData['nation'] == 'A'" name="addressData[gemeinde]" class="form-select" v-model="addressData['gemeinde']">
+								<option v-if="!gemeinden.length" disabled>Bitte gültige PLZ wählen</option>
+								<option v-for="gemeinde in gemeinden" :key="gemeinde.name" :value="gemeinde.name">{{gemeinde.name}}</option>
+							</select>
+						</div>
+				</div>
+		
+				<div class="row mb-3">
+						<label :for="Ort" class="form-label col-sm-4">Ort</label>
+						<div v-if="addressData['ort']" class="col-sm-6">
+							<input type="text" name="ort" class="form-control" v-model="addressData['ort']">
+						</div>
+						<div v-else class="col-sm-6">
+							<select v-if="addressData['nation'] == 'A'" name="address[ort]" class="form-select" v-model="addressData['ort']">
+								<option v-if="!orte.length" disabled>Bitte gültige Gemeinde wählen</option>
+								<option v-for="ort in orte" :key="ort.ortschaftsname" :value="ort.ortschaftsname">{{ort.ortschaftsname}}</option>
+							</select>
+						</div>
+				</div>
+								
+				<div class="row mb-3">
+					<label for="heimatadresse" class="form-label col-sm-4">Heimatadresse</label>
+					<div class="col-sm-3">
+						<div class="form-check">
+							<input id="heimatadresse" type="checkbox" class="form-check-input" value="1" v-model="addressData['heimatadresse']">
+						</div>
+					</div>
+				</div>
+					
+				<div class="row mb-3">
+					<label for="zustelladresse" class="form-label col-sm-4">Zustelladresse</label>
+					<div class="col-sm-3">
+						<div class="form-check">
+							<input id="zustelladresse" type="checkbox" class="form-check-input" value="1" v-model="addressData['zustelladresse']">
+						</div>
+					</div>
+				</div>
+				
+				<div class="row mb-3">
+					<label for="co_name" class="form-label col-sm-4">Abweich.Empfänger. (c/o)</label>
+					<div class="col-sm-6">
+						<input type="text" id="co_name" class="form-control" v-model="addressData['co_name']">
+					</div>
+				</div>
+				
+				<div class="row mb-3">
+					<label for="rechnungsadresse" class="form-label col-sm-4">Rechnungsadresse</label>
+					<div class="col-sm-3">
+						<div class="form-check">
+							<input id="rechnungsadresse" type="checkbox" class="form-check-input" v-model="addressData['rechnungsadresse']">
+						</div>
+					</div>
+				</div>
+				
+				<div class="row mb-3">
+					<label for="firma_name" class="form-label col-sm-4">Firma</label>
+						<div v-if="addressData.firmenname" class="col-sm-6">
+							<input type="text" :readonly="readonly" class="form-control" id="name" v-model="addressData.firmenname">
+						</div>
+						<div v-else class="col-sm-6">
+							<PvAutoComplete v-model="addressData['firma']" optionLabel="name" :suggestions="filteredFirmen" @complete="search" minLength="3"/>
+						</div>
+				</div>
+				
+				<div class="row mb-3">
+					<input type="hidden" :readonly="readonly" class="form-control" id="firma_id" v-model="addressData.firma_id">
+				</div>
+	
+				<div class="row mb-3">
+					<label for="name" class="form-label col-sm-4">Name</label>
+					<div class="col-sm-6">
+						<input type="text" :readonly="readonly" class="form-control" id="name" v-model="addressData['name']">
+					</div>
+				</div>
+				
+				<div class="row mb-3">
+					<label for="anmerkung" class="form-label col-sm-4">Anmerkung</label>
+					<div class="col-sm-6">
+						<input type="text" :readonly="readonly" class="form-control" id="anmerkung" v-model="addressData['anmerkung']">
+					</div>
+				</div>
+			
+			</form>
+			<template #footer>
 				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">Abbrechen</button>
 				<button ref="Close" type="button" class="btn btn-primary" @click="updateAddress(addressData.adresse_id)">OK</button>
-			  </div>
-			</div>
-		  </div>
-		</div>
+            </template>
+		</BsModal>
 		
-		<div ref="deleteAdressModal" class="modal fade" id="deleteAdressModal" tabindex="-1" aria-labelledby="deleteAdressModalLabel" aria-hidden="true">
-		  <div class="modal-dialog">
-			<div class="modal-content">
-			  <div class="modal-header">
-				<h5 class="modal-title" id="deleteAdressModalLabel">Adresse löschen</h5>
-				<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-			  </div>
-			  <div class="modal-body">	  
-			  	<p>Adresse {{addressData.adresse_id}} wirklich löschen?</p>											
-			  </div>
-			  <div class="modal-footer">
-				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
-				<button type="button" class="btn btn-primary" @click="deleteAddress(addressData.adresse_id)">OK</button>
-			  </div>
-			</div>
-		  </div>
-		</div>
+		<!--Modal: deleteAdressModal TODO(manu) Formatierung mit zuviel Abstand-->
+		<BsModal ref="deleteAdressModal">
+			<template #title>Adresse löschen</template>
+			<template #default>
+				<p>Adresse wirklich löschen?</p>
+			</template>
+			<template #footer>
+				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">Abbrechen</button>
+				<button ref="Close" type="button" class="btn btn-primary" @click="deleteAddress(addressData.adresse_id)">OK</button>
+			</template>
+		</BsModal>
 			
 		<core-filter-cmpt
 			ref="table"
@@ -801,8 +536,8 @@ export default{
 			new-btn-label="Neu"
 			@click:new="actionNewAdress"
 			>
-				<button v-if="reload" class="btn btn-outline-warning" aria-label="Reload"> 
-					<span class="fa-solid fa-rotate-right" aria-hidden="true"></span>  				
+				<button v-if="reload" class="btn btn-outline-warning" aria-label="Reload">
+					<span class="fa-solid fa-rotate-right" aria-hidden="true"></span>
 				</button>
 		</core-filter-cmpt>
 		</div>`
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
index ad632606a..d8e3227c6 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
@@ -2,10 +2,10 @@ import {CoreFilterCmpt} from "../../../../filter/Filter.js";
 import {CoreRESTClient} from "../../../../../RESTClient";
 import BsModal from "../../../../Bootstrap/Modal.js";
 
-var editIcon = function(cell, formatterParams){ //plain text value
+var editIcon = function (cell, formatterParams) {
 	return "<i class='fa fa-edit'></i>";
 };
-var deleteIcon = function(cell, formatterParams) { //plain text value
+var deleteIcon = function (cell, formatterParams)  {
 	return "<i class='fa fa-remove'></i>";
 };
 
@@ -17,9 +17,6 @@ export default{
 	props: {
 		uid: String
 	},
-	emits: [
-		'update:selected'
-	],
 	data() {
 		return{
 			tabulatorOptions: {
@@ -55,11 +52,9 @@ export default{
 					{title:"Bankverbindung_id", field:"bankverbindung_id", visible:false},
 					{formatter:editIcon, width:40, align:"center", cellClick: (e, cell) => {
 							this.actionEditBankverbindung(cell.getData().bankverbindung_id);
-							console.log(cell.getRow().getIndex(), cell.getData(), this);
 						}, width:50, headerSort:false},
 					{formatter:deleteIcon, width:40, align:"center", cellClick: (e, cell) => {
 							this.actionDeleteBankverbindung(cell.getData().bankverbindung_id);
-							console.log(cell.getRow().getIndex(), cell.getData(), this);
 						}, width:50, headerSort:false },
 
 				],
@@ -116,9 +111,6 @@ export default{
 					this.statusMsg = response.data;
 				}
 			}).catch(error => {
-				console.log(error);
-				this.statusCode = 0;
-				this.statusMsg = 'Error in Catch';
 				this.$fhcAlert.alertError('Fehler bei Speicherroutine aufgetreten');
 			}).finally(() => {
 				window.scrollTo(0, 0);
@@ -126,10 +118,9 @@ export default{
 			});
 		},
 		loadBankverbindung(bankverbindung_id){
-			return CoreRESTClient.get('components/stv/Kontakt/loadBankverbindung/' + bankverbindung_id
-			).then(
+			return CoreRESTClient.get('components/stv/Kontakt/loadBankverbindung/' + bankverbindung_id)
+				.then(
 				result => {
-					//console.log(this.bankverbindungData, result);
 					if(!result.data.retval || result.data.retval.length < 1)
 					{
 						this.bankverbindungData = {};
@@ -145,24 +136,20 @@ export default{
 		},
 		updateBankverbindung(bankverbindung_id){
 			CoreRESTClient.post('components/stv/Kontakt/updateBankverbindung/' + bankverbindung_id,
-				this.bankverbindungData
-			).then(response => {
-				//console.log(response);
-				if (!response.data.error) {
-					this.$fhcAlert.alertSuccess('Speichern erfolgreich');
-					this.hideModal('editBankverbindungModal');
-					this.resetModal();
-				} else {
-					const errorData = response.data.retval;
-					console.log(errorData);
-					Object.entries(errorData).forEach(entry => {
-						const [key, value] = entry;
-						this.$fhcAlert.alertError('Das Feld ' + key + ' ist erforderlich');
-					});
-				}
+				this.bankverbindungData)
+				.then(response => {
+					if (!response.data.error) {
+						this.$fhcAlert.alertSuccess('Speichern erfolgreich');
+						this.hideModal('editBankverbindungModal');
+						this.resetModal();
+					} else {
+						const errorData = response.data.retval;
+						Object.entries(errorData).forEach(entry => {
+							const [key, value] = entry;
+							this.$fhcAlert.alertError('Das Feld ' + key + ' ist erforderlich');
+						});
+					}
 			}).catch(error => {
-				this.statusMsg = 'Error in Catch';
-				console.log('Speichern nicht erfolgreich ' + this.errorData);
 				this.$fhcAlert.alertError('Fehler bei Speicherroutine aufgetreten');
 			}).finally(() => {
 				window.scrollTo(0, 0);
@@ -203,44 +190,44 @@ export default{
 		<!--Modal: Add Bankverbindung-->
 		<BsModal title="Bankverbindung anlegen" ref="newBankverbindungModal">
 			<template #title>Bankverbindung anlegen</template>
-			<form class="row g-3" ref="bankverbindungData">	
+			<form class="row g-3" ref="bankverbindungData">
 				<div class="row mb-3">
 						<label for="name" class="form-label col-sm-4">Name</label>
 						<div class="col-sm-6">
 							<input type="text" :readonly="readonly" class="form-control" id="name" v-model="bankverbindungData['name']">
 						</div>
 					</div>
-					<div class="row mb-3">											   
+					<div class="row mb-3">										   
 						<label for="anschrift" class="form-label col-sm-4">Anschrift</label>
 						<div class="col-sm-6">
 							<input type="text" :readonly="readonly" class="form-control" id="anschrift" v-model="bankverbindungData['anschrift']">
 						</div>
-					</div>	
+					</div>
 
-					<div class="row mb-3">											   
+					<div class="row mb-3">									   
 						<label for="iban" class="form-label col-sm-4">IBAN</label>
 						<div class="col-sm-6">
 							<input type="text" :readonly="readonly" required class="form-control" id="iban" v-model="bankverbindungData['iban']">
 						</div>
-					</div>	
-					<div class="row mb-3">											   
+					</div>
+					<div class="row mb-3">								   
 						<label for="bic" class="form-label col-sm-4">BIC</label>
 						<div class="col-sm-6">
 							<input type="text" :readonly="readonly" class="form-control" id="bic" v-model="bankverbindungData['bic']">
 						</div>
-					</div>	
-					<div class="row mb-3">											   
+					</div>
+					<div class="row mb-3">							   
 						<label for="kontonr" class="form-label col-sm-4">Kontonummer</label>
 						<div class="col-sm-6">
 							<input type="text" :readonly="readonly" class="form-control" id="kontonr" v-model="bankverbindungData['kontonr']">
 						</div>
-					</div>	
-					<div class="row mb-3">											   
+					</div>
+					<div class="row mb-3">										   
 						<label for="blz" class="form-label col-sm-4">BLZ</label>
 						<div class="col-sm-6">
 							<input type="text" :readonly="readonly" class="form-control" id="blz" v-model="bankverbindungData['blz']">
 						</div>
-					</div>		
+					</div>
 					<div class="row mb-3">
 						<label for="typ" class="form-label col-sm-4">Typ</label>
 						<div class="col-sm-6">
@@ -249,15 +236,15 @@ export default{
 								<option  value="f">Firmenkonto</option>
 							</select>
 						</div>
-					</div>	
+					</div>
 					<div class="row mb-3">
 						<label for="verrechnung" class="form-label col-sm-4">Verrechnung</label>
 						<div class="col-sm-3">
-							<div class="form-check">	
+							<div class="form-check">
 								<input id="verrechnung" type="checkbox" class="form-check-input" value="1" v-model="bankverbindungData['verrechnung']">
 							</div>
 						</div>
-					</div>	
+					</div>
 			</form>
             <template #footer>
             		<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
@@ -266,9 +253,9 @@ export default{
 		</BsModal>
 				
 		<!--Modal: Edit Bankverbindung-->
-		<BsModal ref="editBankverbindungModal" >
+		<BsModal ref="editBankverbindungModal">
 			<template #title>Bankverbindung bearbeiten</template>
-				<form class="row g-3" ref="bankverbindungData" >
+				<form class="row g-3" ref="bankverbindungData">
 				
 					<div class="row mb-3">
 						<label for="name" class="form-label col-sm-4">Name</label>
@@ -276,37 +263,36 @@ export default{
 							<input type="text" :readonly="readonly" class="form-control" id="name" v-model="bankverbindungData['name']">
 						</div>
 					</div>
-											
-					<div class="row mb-3">											   
+					<div class="row mb-3">									   
 						<label for="anschrift" class="form-label col-sm-4">Anschrift</label>
 						<div class="col-sm-6">
 							<input type="text" :readonly="readonly" class="form-control" id="anschrift" v-model="bankverbindungData['anschrift']">
 						</div>
-					</div>	
-					<div class="row mb-3">											   
+					</div>
+					<div class="row mb-3">
 						<label for="iban" class="form-label col-sm-4">IBAN</label>
 						<div class="col-sm-6">
 							<input type="text" :readonly="readonly" required class="form-control" id="iban" v-model="bankverbindungData['iban']">
 						</div>
-					</div>	
-					<div class="row mb-3">											   
+					</div>
+					<div class="row mb-3">									   
 						<label for="bic" class="form-label col-sm-4">BIC</label>
 						<div class="col-sm-6">
 							<input type="text" :readonly="readonly" class="form-control" id="bic" v-model="bankverbindungData['bic']">
 						</div>
-					</div>	
-					<div class="row mb-3">											   
+					</div>
+					<div class="row mb-3">									   
 						<label for="kontonr" class="form-label col-sm-4">Kontonummer</label>
 						<div class="col-sm-6">
 							<input type="text" :readonly="readonly" class="form-control" id="kontonr" v-model="bankverbindungData['kontonr']">
 						</div>
-					</div>	
-					<div class="row mb-3">											   
+					</div>
+					<div class="row mb-3">									   
 						<label for="blz" class="form-label col-sm-4">BLZ</label>
 						<div class="col-sm-6">
 							<input type="text" :readonly="readonly" class="form-control" id="blz" v-model="bankverbindungData['blz']">
 						</div>
-					</div>		
+					</div>
 					<div class="row mb-3">
 						<label for="typ" class="form-label col-sm-4">Typ</label>
 						<div class="col-sm-6">
@@ -315,66 +301,45 @@ export default{
 								<option  value="f">Firmenkonto</option>
 							</select>
 						</div>
-					</div>	
+					</div>
 					<div class="row mb-3">
 						<label for="verrechnung" class="form-label col-sm-4">Verrechnung</label>
 						<div class="col-sm-3">
-							<div class="form-check">	
+							<div class="form-check">
 								<input id="verrechnung" type="checkbox" class="form-check-input" value="1" v-model="bankverbindungData['verrechnung']">
 							</div>
 						</div>
-					</div>																	   
-				</form> 
+					</div>															   
+				</form>
 				<template #footer>
 					<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">Abbrechen</button>
 					<button ref="Close" type="button" class="btn btn-primary" @click="updateBankverbindung(bankverbindungData.bankverbindung_id)">OK</button>
-            	</template> 
+            	</template>
 		</BsModal>
 		
-		<!--Modal: Delete Bankverbindung TODO(manu) Formatierung mit zuviel Abstand-->		
-		<BsModal ref="deleteBankverbindungModal" >
-			<template #title>Bankverbindung löschen</template>  
+		<!--Modal: Delete Bankverbindung-->
+		<BsModal ref="deleteBankverbindungModal">
+			<template #title>Bankverbindung löschen</template>
 			<template #default>
-				<p>Bankverbindung wirklich löschen?</p>	
-			</template>												
+				<p>Bankverbindung wirklich löschen?</p>
+			</template>									
 			<template #footer>
 				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">Abbrechen</button>
 				<button ref="Close" type="button" class="btn btn-primary" @click="deleteBankverbindung(bankverbindungData.bankverbindung_id)">OK</button>
-			</template> 
+			</template>
 		</BsModal>
-				
 			
-<!--		<div ref="deleteBankverbindungModal" class="modal fade" id="deleteBankverbindungModal" tabindex="-1" aria-labelledby="deleteBankverbindungModalLabel" aria-hidden="true">
-			  <div class="modal-dialog">
-				<div class="modal-content">
-				  <div class="modal-header">
-					<h5 class="modal-title" id="deleteBankverbindungModalLabel">Kontakt löschen</h5>
-					<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-				  </div>
-				  <div class="modal-body">	  
-					<p>Bankverbindung wirklich löschen?</p>											
-				  </div>
-				  <div class="modal-footer">
-					<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
-					<button type="button" class="btn btn-primary" @click="deleteBankverbindung(bankverbindungData.bankverbindung_id)">OK</button>
-				  </div>
-				</div>
-			  </div>
-			</div>-->
-			
-	
-			<core-filter-cmpt
-				ref="table"
-				:tabulator-options="tabulatorOptions"
-				:tabulator-events="tabulatorEvents"
-				table-only
-				:side-menu="false"
-				reload
-				new-btn-show
-				new-btn-label="Neu"
-				@click:new="actionNewBankverbindung"
-			>
+		<core-filter-cmpt
+			ref="table"
+			:tabulator-options="tabulatorOptions"
+			:tabulator-events="tabulatorEvents"
+			table-only
+			:side-menu="false"
+			reload
+			new-btn-show
+			new-btn-label="Neu"
+			@click:new="actionNewBankverbindung"
+		>
 		</core-filter-cmpt>
 		</div>`
-};
-
+};
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
index 750d03dab..7eca55692 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
@@ -4,10 +4,10 @@ import BsModal from "../../../../Bootstrap/Modal.js";
 /*import PvToast from "../../../../../../../index.ci.php/public/js/components/primevue/toast/toast.esm.min.js";*/
 import PvAutoComplete from "../../../../../../../index.ci.php/public/js/components/primevue/autocomplete/autocomplete.esm.min.js";
 
-var editIcon = function(cell, formatterParams){ //plain text value
+var editIcon = function (cell, formatterParams) {
 	return "<i class='fa fa-edit'></i>";
 };
-var deleteIcon = function(cell, formatterParams){ //plain text value
+var deleteIcon = function (cell, formatterParams){
 	return "<i class='fa fa-remove'></i>";
 };
 
@@ -20,9 +20,6 @@ export default{
 	props: {
 		uid: String
 	},
-	emits: [
-		'update:selected'
-	],
 	data() {
 		return{
 			tabulatorOptions: {
@@ -42,18 +39,13 @@ export default{
 					{title:"Kontakt_id", field:"kontakt_id", visible:false},
 					{title:"Standort_id", field:"standort_id", visible:false},
 					{title:"letzte Änderung", field:"updateamum", visible:false},
-	/*				{title: "Actions",
-						columns:[*/
-							{formatter:editIcon, cellClick: (e, cell) => {
-									this.actionEditContact(cell.getData().kontakt_id);
-									console.log(cell.getRow().getIndex(), cell.getData(), this);
-								}, width:50, headerSort:false, headerVisible:false},
-							{formatter:deleteIcon, cellClick: (e, cell) => {
-									this.actionDeleteContact(cell.getData().kontakt_id);
-									console.log(cell.getRow().getIndex(), cell.getData(), this);
-								}, width:50, headerSort:false, headerVisible:false },
-/*						],
-					},*/
+						{formatter:editIcon, cellClick: (e, cell) => {
+								this.actionEditContact(cell.getData().kontakt_id);
+							}, width:50, headerSort:false, headerVisible:false},
+						{formatter:deleteIcon, cellClick: (e, cell) => {
+								this.actionDeleteContact(cell.getData().kontakt_id);
+
+							}, width:50, headerSort:false, headerVisible:false},
 				],
 				layout: 'fitDataFill',
 				layoutColumnsOnNewData:	false,
@@ -61,8 +53,7 @@ export default{
 				selectable:	true,
 				index: 'kontakt_id'
 			},
-			tabulatorEvents: [
-			],
+			tabulatorEvents: [],
 			lastSelected: null,
 			contactData: {
 				zustellung: true,
@@ -81,12 +72,10 @@ export default{
 	methods:{
 		actionNewContact(){
 			this.$refs.newContactModal.show();
-/*			bootstrap.Modal.getOrCreateInstance(this.$refs.newContactModal).show();*/
 		},
 		actionEditContact(contact_id){
 			this.loadContact(contact_id);
 			this.$refs.editContactModal.show();
-
 		},
 		actionDeleteContact(contact_id){
 			this.loadContact(contact_id);
@@ -94,25 +83,20 @@ export default{
 		},
 		addNewContact(formData) {
 			CoreRESTClient.post('components/stv/Kontakt/addNewContact/' + this.uid,
-				this.contactData
-			).then(response => {
-				if (!response.data.error) {
-					this.$fhcAlert.alertSuccess('Speichern erfolgreich');
-					this.hideModal("newContactModal");
-					this.resetModal();
-				} else {
-					const errorData = response.data.retval;
-					Object.entries(errorData).forEach(entry => {
-						const [key, value] = entry;
-						//console.log(key, value);
-						this.$fhcAlert.alertError(value);
-					});
-				}
+				this.contactData)
+				.then(response => {
+					if (!response.data.error) {
+						this.$fhcAlert.alertSuccess('Speichern erfolgreich');
+						this.hideModal("newContactModal");
+						this.resetModal();
+					} else {
+						const errorData = response.data.retval;
+						Object.entries(errorData).forEach(entry => {
+							const [key, value] = entry;
+							this.$fhcAlert.alertError(value);
+						});
+					}
 			}).catch(error => {
-				console.log(error);
-				this.statusCode = 0;
-				this.statusMsg = 'Error in Catch';
-				console.log('Speichern nicht erfolgreich ' + this.statusMsg);
 				this.$fhcAlert.alertError('Fehler bei Speicherroutine aufgetreten');
 			}).finally(() => {
 				window.scrollTo(0, 0);
@@ -120,42 +104,31 @@ export default{
 			});
 		},
 		loadContact(contact_id){
-			return CoreRESTClient.get('components/stv/Kontakt/loadContact/' + contact_id
-			).then(
-				result => {
-					console.log(this.contactData, result);
-					if(result.data.retval)
-						this.contactData = result.data.retval;
-					else
-					{
-						this.contactData = {};
-						this.$fhcAlert.alertError('Kein Kontakt mit Id ' + contact_id + ' gefunden');
+			return CoreRESTClient.get('components/stv/Kontakt/loadContact/' + contact_id)
+				.then(
+					result => {
+						if(result.data.retval)
+							this.contactData = result.data.retval;
+						else
+						{
+							this.contactData = {};
+							this.$fhcAlert.alertError('Kein Kontakt mit Id ' + contact_id + ' gefunden');
+						}
+						return result;
 					}
-
-					return result;
-				}
 			);
 		},
 		deleteContact(kontakt_id){
 			CoreRESTClient.post('components/stv/Kontakt/deleteContact/' + kontakt_id)
 				.then(response => {
 					if (!response.data.error) {
-						this.statusCode = 0;
-						this.statusMsg = 'success';
-						//console.log('Löschen erfolgreich: ' + this.statusMsg);
 						this.$fhcAlert.alertSuccess('Löschen erfolgreich');
 					} else {
-						this.statusCode = 0;
-						this.statusMsg = 'Error';
-						console.log('Löschen nicht erfolgreich: ' + this.statusMsg);
 						this.$fhcAlert.alertError('Keine Adresse mit Id ' + kontakt_id + ' gefunden');
 					}
-				}).catch(error => {
-				console.log(error);
-				this.statusCode = 0;
-				this.statusMsg = 'Error in Catch';
-				console.log('Löschen nicht erfolgreich ' + this.statusMsg);
-				this.$fhcAlert.alertError('Fehler bei Löschroutine aufgetreten');
+				})
+				.catch(error => {
+					this.$fhcAlert.alertError('Fehler bei Löschroutine aufgetreten');
 			}).finally(()=> {
 				window.scrollTo(0, 0);
 				this.hideModal('deleteContactModal');
@@ -165,13 +138,9 @@ export default{
 		},
 		updateContact(kontakt_id){
 			CoreRESTClient.post('components/stv/Kontakt/updateContact/' + kontakt_id,
-				this.contactData
-			).then(response => {
-				console.log(response);
+				this.contactData).
+			then(response => {
 				if (!response.data.error) {
-					this.statusCode = 0;
-					this.statusMsg = 'success';
-					console.log('Speichern erfolgreich: ' + this.statusMsg);
 					this.$fhcAlert.alertSuccess('Speichern erfolgreich');
 					this.hideModal('editContactModal');
 					this.resetModal();
@@ -180,19 +149,13 @@ export default{
 					const errorData = response.data.retval;
 					Object.entries(errorData).forEach(entry => {
 						const [key, value] = entry;
-						console.log(key, value);
 						this.$fhcAlert.alertError(value);
 					});
 				}
 			}).catch(error => {
-				console.log(error);
-				this.statusCode = 0;
-				this.statusMsg = 'Error in Catch';
-				console.log('Speichern nicht erfolgreich ' + this.statusMsg);
 				this.$fhcAlert.alertError('Fehler bei Speicherroutine aufgetreten');
 			}).finally(() => {
 				window.scrollTo(0, 0);
-				//hideModal();
 				this.reload();
 			});
 		},
@@ -205,8 +168,8 @@ export default{
 		search(event) {
 			return CoreRESTClient
 				.get('components/stv/Kontakt/getStandorte/' + event.query)
-				.then(result => {
-					this.filteredStandorte = CoreRESTClient.getData(result.data);
+					.then(result => {
+						this.filteredStandorte = CoreRESTClient.getData(result.data);
 				});
 		},
 		resetModal(){
@@ -241,46 +204,45 @@ export default{
 								</select>
 							</div>
 						</div>
-						<div class="row mb-3">											   
+						<div class="row mb-3">										   
 							<label for="kontakt" class="form-label col-sm-4">Kontakt</label>
 							<div class="col-sm-6">
 								<input type="text" :readonly="readonly" class="form-control" id="kontakt" v-model="contactData['kontakt']">
 							</div>
-						</div>	
-						<div class="row mb-3">											   
+						</div>
+						<div class="row mb-3">									   
 							<label for="anmerkung" class="form-label col-sm-4">Anmerkung</label>
 							<div class="col-sm-6">
 								<input type="text" :readonly="readonly" class="form-control" id="anmerkung" v-model="contactData['anmerkung']">
 							</div>
-						</div>	
+						</div>
 						
 						<div class="row mb-3">
 							<label for="zustellung" class="form-label col-sm-4">Zustellung</label>
 							<div class="col-sm-6">
-								<div class="form-check">	
+								<div class="form-check">
 									<input id="zustellung" type="checkbox" class="form-check-input" value="1" v-model="contactData['zustellung']">
 								</div>
 							</div>
-						</div>	
+						</div>
 							
 						<div class="row mb-3">
 							<label for="firma_name" class="form-label col-sm-4">Firma / Standort</label>
 								<div class="col-sm-6">
 									<PvAutoComplete v-model="contactData['standort']" optionLabel="kurzbz" :suggestions="filteredStandorte" @complete="search" minLength="3"/>
-								</div>	
-						</div>	
+								</div>
+						</div>
 				</form>
 			    <template #footer>
             		<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
 					<button type="button" class="btn btn-primary" @click="addNewContact()">OK</button>
             	</template>
 		</BsModal>
-				
-					
+						
 		<!--Modal: Edit Contact-->
 		<BsModal ref="editContactModal">
 			<template #title>Kontakt bearbeiten</template>
-			<form class="row g-3" ref="contactData">	
+			<form class="row g-3" ref="contactData">
 				<div class="row mb-3">
 					<label for="kontakttyp" class="form-label col-sm-4">Typ</label>
 					<div class="col-sm-6">
@@ -290,27 +252,27 @@ export default{
 						</select>
 					</div>
 				</div>
-				<div class="row mb-3">											   
+				<div class="row mb-3">									   
 					<label for="kontakt" class="form-label col-sm-4">Kontakt</label>
 					<div class="col-sm-6">
 						<input type="text" :readonly="readonly" class="form-control" id="kontakt" v-model="contactData['kontakt']">
 					</div>
-				</div>	
-				<div class="row mb-3">											   
+				</div>
+				<div class="row mb-3">									   
 					<label for="anmerkung" class="form-label col-sm-4">Anmerkung</label>
 					<div class="col-sm-6">
 						<input type="text" :readonly="readonly" class="form-control" id="anmerkung" v-model="contactData['anmerkung']">
 					</div>
-				</div>		
+				</div>
 				<div class="row mb-3">
 					<label for="zustellung" class="form-label col-sm-4">Zustellung</label>
 					<div class="col-sm-6">
-						<div class="form-check">	
+						<div class="form-check">
 							<input id="zustellung" type="checkbox" class="form-check-input" value="1" v-model="contactData['zustellung']">
 						</div>
 					</div>
-				</div>	
-				<div class="row mb-3">					
+				</div>
+				<div class="row mb-3">			
 					<input type="hidden" :readonly="readonly" class="form-control" id="standort_id" v-model="contactData.standort_id">
 				</div>
 				
@@ -318,11 +280,11 @@ export default{
 					<label for="standort" class="form-label col-sm-4">Firma / Standort</label>
 						<div v-if="contactData.kurzbz" class="col-sm-3">
 							<input type="text" :readonly="readonly" class="form-control" id="name" v-model="contactData.kurzbz">
-						</div>					
+						</div>	
 						<div v-else class="col-sm-3">
 							<PvAutoComplete v-model="contactData['standort']" optionLabel="kurzbz" :suggestions="filteredStandorte" @complete="search" minLength="3"/>
-						</div>	
-				</div>	
+						</div>
+				</div>
 			</form>
 			<template #footer>
 				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">Abbrechen</button>
@@ -330,48 +292,29 @@ export default{
 			</template>
 		</BsModal>
 									
-		<!--		Modal: Delete Contact TODO(manu) Formatierung-->
-		<BsModal ref="deleteContactModal" >
+		<!--Modal: Delete Contact-->
+		<BsModal ref="deleteContactModal">
 			<template #title>Kontakt löschen</template>  
 			<template #default>
-				<p>Kontakt wirklich löschen?</p>	
+				<p>Kontakt wirklich löschen?</p>
 			</template>												
 			<template #footer>
 				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">Abbrechen</button>
 				<button ref="Close" type="button" class="btn btn-primary" @click="deleteContact(contactData.kontakt_id)">OK</button>
-			</template> 
+			</template>
 		</BsModal>
-		
-<!--		<div ref="deleteContactModal" class="modal fade" id="deleteContactModal" tabindex="-1" aria-labelledby="deleteContactModalLabel" aria-hidden="true">
-			  <div class="modal-dialog">
-				<div class="modal-content">
-				  <div class="modal-header">
-					<h5 class="modal-title" id="deleteContactModalLabel">Kontakt löschen</h5>
-					<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-				  </div>
-				  <div class="modal-body">	  
-					<p>Kontakt {{contactData.kontakt_id}} wirklich löschen?</p>											
-				  </div>
-				  <div class="modal-footer">
-					<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
-					<button type="button" class="btn btn-primary" @click="deleteContact(contactData.kontakt_id)">OK</button>
-				  </div>
-				</div>
-			  </div>
-			</div>-->
-				
-			<core-filter-cmpt
-				ref="table"
-				:tabulator-options="tabulatorOptions"
-				:tabulator-events="tabulatorEvents"
-				table-only
-				:side-menu="false"
-				reload
-				new-btn-show
-				new-btn-label="Neu"
-				@click:new="actionNewContact"
+					
+		<core-filter-cmpt
+			ref="table"
+			:tabulator-options="tabulatorOptions"
+			:tabulator-events="tabulatorEvents"
+			table-only
+			:side-menu="false"
+			reload
+			new-btn-show
+			new-btn-label="Neu"
+			@click:new="actionNewContact"
 			>
 		</core-filter-cmpt>
 		</div>`
-};
-
+};
\ No newline at end of file

From da9002356cbecc4ac452b4adce7564a1f6f017ac Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 1 Dec 2023 12:43:39 +0100
Subject: [PATCH 0201/1461] Tabs Component

---
 application/config/Events.php                 | 14 +++
 .../controllers/components/stv/Config.php     | 40 +++++++++
 application/core/CI3_Events.php               | 51 +++++++++++
 .../js/components/Stv/Studentenverwaltung.js  |  7 +-
 .../Stv/Studentenverwaltung/Details.js        | 66 +++-----------
 .../Studentenverwaltung/Details/Details.js    |  8 +-
 .../Studentenverwaltung/Details/Kontakt.js    | 14 +--
 .../Studentenverwaltung/Details/Notizen.js    |  2 +-
 public/js/components/Tabs.js                  | 85 +++++++++++++++++++
 9 files changed, 213 insertions(+), 74 deletions(-)
 create mode 100644 application/config/Events.php
 create mode 100644 application/controllers/components/stv/Config.php
 create mode 100644 application/core/CI3_Events.php
 create mode 100644 public/js/components/Tabs.js

diff --git a/application/config/Events.php b/application/config/Events.php
new file mode 100644
index 000000000..191a1eb98
--- /dev/null
+++ b/application/config/Events.php
@@ -0,0 +1,14 @@
+<?php
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use CI3_Events as Events;
+
+/**
+ * NOTE(chris): example:
+	Events::on('stv_conf_student', function (&$res) {
+		$res['test'] = [
+			'title' => 'TEST',
+			'component' => './Stv/Studentenverwaltung/Details/Notizen.js'
+		];
+	});
+ */
diff --git a/application/controllers/components/stv/Config.php b/application/controllers/components/stv/Config.php
new file mode 100644
index 000000000..a9503f4e6
--- /dev/null
+++ b/application/controllers/components/stv/Config.php
@@ -0,0 +1,40 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use CI3_Events as Events;
+
+class Config extends FHC_Controller
+{
+	public function __construct()
+	{
+		// TODO(chris): access!
+		parent::__construct();
+	}
+
+	public function student()
+	{
+		$result = [];
+		$result['details'] = [
+			'title' => 'Details',
+			'component' => './Stv/Studentenverwaltung/Details/Details.js'
+		];
+		$result['kontakt'] = [
+			'title' => 'Kontakt',
+			'component' => './Stv/Studentenverwaltung/Details/Kontakt.js'
+		];
+		$result['notizen'] = [
+			'title' => 'Notizen',
+			'component' => './Stv/Studentenverwaltung/Details/Notizen.js'
+		];
+
+		Events::trigger('stv_conf_student', $result);
+
+		$this->outputJsonSuccess($result);
+	}
+
+	public function students()
+	{
+		$this->outputJsonSuccess([]);
+	}
+}
diff --git a/application/core/CI3_Events.php b/application/core/CI3_Events.php
new file mode 100644
index 000000000..d2c687a75
--- /dev/null
+++ b/application/core/CI3_Events.php
@@ -0,0 +1,51 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class CI3_Events
+{
+	const PRIORITY_LOW = 200;
+	const PRIORITY_NORMAL = 100;
+	const PRIORITY_HIGH = 10;
+
+	private static $events = [];
+	private static $eventsSorted = [];
+
+	public static function on($event, $function, $priority = self::PRIORITY_NORMAL)
+	{
+		if (!isset(self::$events[$event]))
+			self::$events[$event] = [];
+
+		self::$events[$event][] = [$priority, $function];
+
+		if (!isset(self::$eventsSorted[$event]))
+			self::$eventsSorted[$event] = true;
+		else
+			self::$eventsSorted[$event] = false;
+	}
+
+	public static function trigger($event, &...$args)
+	{
+		if (!isset(self::$events[$event]))
+			return;
+
+		if (!self::$eventsSorted[$event]) {
+			usort(self::$events[$event], function ($a, $b) {
+				return $a[0] - $b[0];
+			});
+			self::$eventsSorted[$event] = true;
+		}
+		
+		foreach (self::$events[$event] as $conf) {
+			call_user_func_array($conf[1], $args);
+		}
+	}
+}
+
+/**
+ * NOTE(chris): Autoload Events config
+ */
+require_once(APPPATH.'config/Events.php');
+foreach (scandir(APPPATH.'config/extensions') as $dir)
+	if ($dir[0] != '.' && file_exists(APPPATH.'config/extensions/'.$dir.'/Events.php'))
+		require_once APPPATH.'config/extensions/'.$dir.'/Events.php';
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 9cd3f0b57..a116e36e4 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -91,11 +91,6 @@ export default {
 			}
 		}
 	},
-	computed: {
-		lastSelected() {
-			return this.selected[this.selected.length - 1];
-		}
-	},
 	methods: {
 		onSelectVerband({link, studiengang_kz}) {
 			this.studiengangKz = studiengang_kz;
@@ -182,7 +177,7 @@ export default {
 						<stv-list ref="stvList" v-model:selected="selected" :studiengang-kz="studiengangKz" :studiensemester-kurzbz="studiensemesterKurzbz"></stv-list>
 					</template>
 					<template #bottom>
-						<stv-details :student="lastSelected"></stv-details>
+						<stv-details :students="selected"></stv-details>
 					</template>
 				</vertical-split>
 			</main>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details.js b/public/js/components/Stv/Studentenverwaltung/Details.js
index f444c0eec..78e57ae88 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details.js
@@ -1,66 +1,20 @@
-import accessibility from "../../../directives/accessibility.js";
+import FhcTabs from "../../Tabs.js";
 
 export default {
-	directives: {
-		accessibility
+	components: {
+		FhcTabs
 	},
 	props: {
-		student: Object
-	},
-	data() {
-		return {
-			current: this.$route.params.tab || 'details',
-			tabTemplates: {
-				details: 'Details',
-				notizen: 'Notizen',
-				kontakt: 'Kontakt'
-			},
-			tabs: {}
-		}
-	},
-	computed: {
-		hasNoStudent() {
-			return !this.student || (Object.keys(this.student).length === 0 && this.student.constructor === Object);
-		},
-		currentComponent() {
-			return this.tabs[this.current].component;
-		}
-	},
-	created() {
-		this.tabs = Object.fromEntries(Object.entries(this.tabTemplates).map(([key, title]) => {
-			return [key, {
-				title,
-				component: Vue.defineAsyncComponent(() => import("./Details/" + key.charAt(0).toUpperCase() + key.slice(1) + '.js'))
-			}];
-		}));
+		students: Array
 	},
 	template: `
 	<div class="stv-details h-100 pb-3 d-flex flex-column">
-		<div v-if="hasNoStudent" class="justify-content-center d-flex h-100 align-items-center">Bitte StudentIn auswählen!</div>
-		<template v-else>		
-			<div class="nav nav-tabs">
-				<div
-					v-for="({title}, key) in tabs"
-					:key="comp"
-					class="nav-item nav-link"
-					:class="{active: key == current}"
-					@click="current=key"
-					:aria-current="key == current ? 'page' : ''"
-					v-accessibility:tab
-					>
-					{{title}}
-				</div>
-			</div>
-			<div style="flex: 1 1 0%; height: 0%" class="border-bottom border-start border-end overflow-auto p-3">
-				<keep-alive>
-					<suspense>
-						<component :is="currentComponent" :student="student"></component>
-						<template #fallback>
-							Loading...
-						</template>
-					</suspense>
-				</keep-alive>
-			</div>
+		<div v-if="!students?.length" class="justify-content-center d-flex h-100 align-items-center">
+			Bitte StudentIn auswählen!
+		</div>
+		<template v-else>
+			<fhc-tabs v-if="students.length == 1" :modelValue="students[0]" config-url="/components/stv/config/student" :default="$route.params.tab"></fhc-tabs>
+			<fhc-tabs v-else :modelValue="students" config-url="/components/stv/config/students" :default="$route.params.tab"></fhc-tabs>
 		</template>
 	</div>`
 };
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
index c60a32b1e..9d824e142 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
@@ -37,7 +37,7 @@ export default {
 		}
 	},
 	props: {
-		student: Object
+		modelValue: Object
 	},
 	data() {
 		return {
@@ -65,7 +65,7 @@ export default {
 		}
 	},
 	watch: {
-		student(n) {
+		modelValue(n) {
 			this.updateStudent(n);
 		},
 		data: {
@@ -104,7 +104,7 @@ export default {
 		},
 		save() {
 			CoreRESTClient
-				.post('components/stv/Student/save/' + this.student.prestudent_id, this.changed)
+				.post('components/stv/Student/save/' + this.modelValue.prestudent_id, this.changed)
 				.then(result => result.data)
 				.then(result => {
 					this.resetErrors();
@@ -169,7 +169,7 @@ export default {
 		}
 	},
 	created() {
-		this.updateStudent(this.student);
+		this.updateStudent(this.modelValue);
 	},
 	//TODO(chris): Geburtszeit? Anzahl der Kinder?
 	template: `
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt.js
index f8d30a5a6..64d62642d 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt.js
@@ -14,7 +14,7 @@ export default {
 		PvAutoComplete
 	},
 	props: {
-		student: Object
+		modelValue: Object
 	},
 	data() {
 		return {
@@ -25,7 +25,7 @@ export default {
 	},
 	created(){
 		CoreRESTClient
-			.get('components/stv/Kontakt/getAdressen/' + this.student.person_id)
+			.get('components/stv/Kontakt/getAdressen/' + this.modelValue.person_id)
 			.then(result => {
 				this.adressen = result.data;
 			})
@@ -33,7 +33,7 @@ export default {
 				console.error(err.response.data || err.message);
 			});
 		/*		CoreRESTClient
-					.get('components/stv/Kontakt/getKontakte/' + this.student.person_id)
+					.get('components/stv/Kontakt/getKontakte/' + this.modelValue.person_id)
 					.then(result => {
 						this.kontakte = result.data;
 					})
@@ -41,7 +41,7 @@ export default {
 						console.error(err.response.data || err.message);
 					});
 				CoreRESTClient
-					.get('components/stv/Kontakt/getBankverbindung/' + this.student.person_id)
+					.get('components/stv/Kontakt/getBankverbindung/' + this.modelValue.person_id)
 					.then(result => {
 						this.bankverbindungen = result.data;
 					})
@@ -62,19 +62,19 @@ export default {
 <!--				<button type="button" class="btn btn btn-outline-warning" @click="actionNewAdress()">new Adress</button>
 				<button type="button" class="btn btn btn-outline-warning" @click="actionEditAdress(111444)">edit 111444</button>-->
 				
-				<address-list ref="adressList" :uid="student.person_id"></address-list>
+				<address-list ref="adressList" :uid="modelValue.person_id"></address-list>
 		</fieldset>
 		<br>
 		<fieldset class="overflow-hidden">
 			<legend>Kontakt</legend>
 	<!--		{{this.kontakte}}-->
-			<contact-list ref="contactList" :uid="student.person_id"></contact-list>
+			<contact-list ref="contactList" :uid="modelValue.person_id"></contact-list>
 		</fieldset>
 		<br>
 		<fieldset class="overflow-hidden">
 			<legend>Bankverbindungen</legend>
 <!--			{{this.bankverbindungen}}-->
-			<bankaccount-list ref="bankaccountList" :uid="student.person_id"></bankaccount-list>
+			<bankaccount-list ref="bankaccountList" :uid="modelValue.person_id"></bankaccount-list>
 		</fieldset>
 	</div>`
 };
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
index f94468b4c..4b7f5901e 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
@@ -1,6 +1,6 @@
 export default {
 	props: {
-		student: Object
+		modelValue: Object
 	},
 	template: `
 	<div class="stv-details-details h-100 pb-3">
diff --git a/public/js/components/Tabs.js b/public/js/components/Tabs.js
new file mode 100644
index 000000000..809a258ce
--- /dev/null
+++ b/public/js/components/Tabs.js
@@ -0,0 +1,85 @@
+import {CoreRESTClient} from '../RESTClient.js';
+import accessibility from "../directives/accessibility.js";
+
+export default {
+	directives: {
+		accessibility
+	},
+	emits: [
+		'update:modelValue'
+	],
+	props: {
+		configUrl: String,
+		default: String,
+		modelValue: [String, Number, Boolean, Array, Object, Date, Function, Symbol]
+	},
+	data() {
+		return {
+			current: null,
+			tabs: {}
+		}
+	},
+	computed: {
+		currentTab() {
+			if (this.tabs[this.current])
+				return this.tabs[this.current];
+			
+			return { component: 'div' };
+		},
+		value: {
+			get() {
+				return this.modelValue;
+			},
+			set(v) {
+				this.$emit('update:modelValue', v);
+			}
+		}
+	},
+	created() {
+		CoreRESTClient
+			.get(this.configUrl)
+			.then(result => CoreRESTClient.getData(result.data))
+			.then(result => {
+				const tabs = {};
+				// TODO(chris): check if result is array
+				Object.entries(result).forEach(([key, config]) => {
+					if (!config.component)
+						return console.error('Component missing for ' + key);
+
+					tabs[key] = {
+						component: Vue.defineAsyncComponent(() => import(config.component)),
+						title: config.title || key,
+						config: config.config,
+						key
+					}
+				});
+				if (tabs[this.default])
+					this.current = this.default;
+				else
+					this.current = Object.keys(tabs)[0];
+				this.tabs = tabs;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+	},
+	template: `
+	<div class="fhc-tabs d-flex flex-column">
+		<div class="nav nav-tabs">
+			<div
+				v-for="tab in tabs"
+				:key="tab.key"
+				class="nav-item nav-link"
+				:class="{active: tab.key == current}"
+				@click="current=tab.key"
+				:aria-current="tab.key == current ? 'page' : ''"
+				v-accessibility:tab
+				>
+				{{tab.title}}
+			</div>
+		</div>
+		<div style="flex: 1 1 0%; height: 0%" class="border-bottom border-start border-end overflow-auto p-3">
+			<keep-alive>
+				<component :is="currentTab.component" v-model="value" :config="currentTab.config"></component>
+			</keep-alive>
+		</div>
+	</div>`
+};
\ No newline at end of file

From 4ba828d0e89eef6da6b7ab8b69b1ebd385041d34 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 1 Dec 2023 12:44:10 +0100
Subject: [PATCH 0202/1461] Add Student Images

---
 .../Stv/Studentenverwaltung/Details.js        | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details.js b/public/js/components/Stv/Studentenverwaltung/Details.js
index 78e57ae88..3f723fdab 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details.js
@@ -1,5 +1,8 @@
 import FhcTabs from "../../Tabs.js";
 
+// TODO(chris): alt & title
+// TODO(chris): phrasen
+
 export default {
 	components: {
 		FhcTabs
@@ -7,14 +10,25 @@ export default {
 	props: {
 		students: Array
 	},
+	computed: {
+		appRoot() {
+			return FHC_JS_DATA_STORAGE_OBJECT.app_root;
+		}
+	},
 	template: `
 	<div class="stv-details h-100 pb-3 d-flex flex-column">
 		<div v-if="!students?.length" class="justify-content-center d-flex h-100 align-items-center">
 			Bitte StudentIn auswählen!
 		</div>
-		<template v-else>
-			<fhc-tabs v-if="students.length == 1" :modelValue="students[0]" config-url="/components/stv/config/student" :default="$route.params.tab"></fhc-tabs>
-			<fhc-tabs v-else :modelValue="students" config-url="/components/stv/config/students" :default="$route.params.tab"></fhc-tabs>
-		</template>
+		<div v-else class="d-flex flex-column h-100 pb-3">
+			<div class="d-flex justify-content-start align-items-center w-100 pb-3 gap-3" style="max-height:8rem">
+				<img v-for="student in students" :key="student.person_id" class="d-block h-100 rounded" alt="profilbild" :src="appRoot + '/cis/public/bild.php?src=person&person_id=' + student.person_id">
+				<div v-if="students.length == 1">
+					<h2 class="h4">{{students[0].titlepre}} {{students[0].vorname}} {{students[0].nachname}} {{students[0].titlepost}}
+				</div>
+			</div>
+			<fhc-tabs v-if="students.length == 1" :modelValue="students[0]" config-url="/components/stv/config/student" :default="$route.params.tab" style="flex: 1 1 0%; height: 0%"></fhc-tabs>
+			<fhc-tabs v-else :modelValue="students" config-url="/components/stv/config/students" :default="$route.params.tab" style="flex: 1 1 0%; height: 0%"></fhc-tabs>
+		</div>
 	</div>`
 };
\ No newline at end of file

From 4fb8bdd5d958eb523cc076e291089fac0c3b7d5c Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 1 Dec 2023 12:47:53 +0100
Subject: [PATCH 0203/1461] PV Autocomplete

---
 .../Stv/Studentenverwaltung/Details/Kontakt/Address.js          | 2 +-
 .../Stv/Studentenverwaltung/Details/Kontakt/Contact.js          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
index 486e17fbe..3f6f5eb42 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
@@ -359,7 +359,7 @@ export default{
 					
 					<div class="row mb-3">
 						<label for="firma_name" class="form-label col-sm-4">Firma</label>
-							<div class="col-sm-4">
+							<div class="col-sm-3">
 							 	<PvAutoComplete v-model="addressData['firma']"  optionLabel="name" :suggestions="filteredFirmen" @complete="search" minLength="3"/>
 							</div>
 					</div>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
index 7eca55692..27d84bc34 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
@@ -278,7 +278,7 @@ export default{
 				
 				<div class="row mb-3">
 					<label for="standort" class="form-label col-sm-4">Firma / Standort</label>
-						<div v-if="contactData.kurzbz" class="col-sm-3">
+						<div v-if="contactData.kurzbz" class="col-sm-6">
 							<input type="text" :readonly="readonly" class="form-control" id="name" v-model="contactData.kurzbz">
 						</div>	
 						<div v-else class="col-sm-3">

From 75547ea5e3bc74ce21856c6da3abdea8690d0429 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Fri, 1 Dec 2023 13:35:29 +0100
Subject: [PATCH 0204/1461] adding link to search to view profile

---
 application/controllers/Cis/Profil.php    |  4 ++--
 public/js/apps/Cis.js                     | 10 ++++----
 public/js/components/Cis/Profil/Profil.js | 28 +++++++++--------------
 3 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index 523a64386..0cba7e940 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -314,14 +314,14 @@ class Profil extends Auth_Controller
 		$res->username = $uid;
 		
 		$res->anrede = $person_res->anrede;
-		$res->titel = $person_res->titelpre ." " . $person_res->titelpost;
+		$res->titel = $person_res->titelpre;
 		$res->vorname = $person_res->vorname;
 		$res->nachname = $person_res->nachname;
 		if(!$view){
 		$res->gebort = $person_res->gebort;
 		$res->gebdatum = $person_res->gebdatum;
 	}
-		//$res->postnomen = $person_res->postnomen; //! still not found
+		$res->postnomen = $person_res->titelpost; 
 		$intern_email = array();
 		$intern_email+=array("type" => "intern");
 		$intern_email+=array("email"=> $uid . "@" . DOMAIN);
diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js
index a00178056..b514f3662 100644
--- a/public/js/apps/Cis.js
+++ b/public/js/apps/Cis.js
@@ -20,13 +20,11 @@ Vue.createApp({
                 actions: {
                     employee: {
                         defaultaction: {
-                            type: "function",
+                            type: "link",
                             action: function(data) {
-                                alert('employee defaultaction ' + JSON.stringify(data));
-                                //return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router+
-                                //"/Cis/Profil/"+data.person_id; 
-                                //? Person id is data.person_id
-                                //? Benutzer UID is data.uid
+                                return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router+
+                                "/Cis/Profil/View/"+data.uid; 
+                                
                             }
                         },
                         childactions: []
diff --git a/public/js/components/Cis/Profil/Profil.js b/public/js/components/Cis/Profil/Profil.js
index 1e7900c38..190962f85 100644
--- a/public/js/components/Cis/Profil/Profil.js
+++ b/public/js/components/Cis/Profil/Profil.js
@@ -24,7 +24,7 @@ export default {
             funktionen_table_options: {
                 height: 300,
                 layout: 'fitColumns',
-                data:[{Bezeichnung:"test1",Organisationseinheit:"test2",Gültig_von:"test3",Gültig_bis:"test4",Wochenstunden:"test5"}],
+                data:[{Bezeichnung:"",Organisationseinheit:"",Gültig_von:"",Gültig_bis:"",Wochenstunden:""}],
                 columns: [{title: 'Bezeichnung', field: 'Bezeichnung', headerFilter: true},
                 {title: 'Organisationseinheit', field: 'Organisationseinheit', headerFilter: true},
                 {title: 'Gültig_von', field: 'Gültig_von', headerFilter: true},
@@ -35,7 +35,7 @@ export default {
             betriebsmittel_table_options:{
                 height: 300,
                 layout: 'fitColumns',
-                data:[{betriebsmittel:"test1",Nummer:"test2",Ausgegeben_am:"test3"}],
+                data:[{betriebsmittel:"",Nummer:"",Ausgegeben_am:""}],
                 columns: [{title: 'Betriebsmittel', field: 'betriebsmittel', headerFilter: true},
                 {title: 'Nummer', field: 'Nummer', headerFilter: true},
                 {title: 'Ausgegeben_am', field: 'Ausgegeben_am', headerFilter: true},]
@@ -108,7 +108,7 @@ export default {
                     Titel:this.index_information.titel,
                     Vorname:this.index_information.vorname,
                     Nachname:this.index_information.nachname,
-                    Postnomen:null,
+                    Postnomen:this.index_information.postnomen,
             }:{
                 Username:this.index_information.username,
                 Matrikelnummer: this.student_info?.matrikelnummer,
@@ -116,7 +116,7 @@ export default {
                 Titel:this.index_information.titel,
                 Vorname:this.index_information.vorname,
                 Nachname:this.index_information.nachname,
-                Postnomen:null,
+                Postnomen:this.index_information.postnomen,
             },
             GeburtsDaten:!this.role.includes("View")?{
                 Geburtsdatum:this.index_information.gebdatum,
@@ -126,6 +126,7 @@ export default {
             SpecialInformation: this.role =='Mitarbeiter' || this.role === 'View_Mitarbeiter'?  {
                 Kurzzeichen: this.mitarbeiter_info?.kurzbz,
                 Telefon: this.mitarbeiter_info?.telefonklappe,
+                //* Wird das Feld Ort_kurzbz noch gepflegt?
                 ...(this.role === 'View_Mitarbeiter'?{Büro:this.mitarbeiter_info?.ort_kurzbz}:{}) ,
             } : {
                 Studiengang:this.student_info?.studiengang,
@@ -150,15 +151,7 @@ export default {
         },
         
     },
-    
-    created(){
-        
-   
-        
-        
-        
-        
-    },
+  
      mounted(){
 
         console.log(this.uid);
@@ -241,12 +234,13 @@ export default {
             <div :class="{'row':true}">
             <div :class="{'col':true}">
             <img :class="{'img-thumbnail':true}" :src="get_image_base64_src"></img>
-            <div v-if="index_information?.foto_sperre">
+            <div v-if="!role?.includes('View')">
+            <div v-if="index_information?.foto_sperre ">
             <p style="margin:0">Profilfoto gesperrt</p>
             <a href="#" @click.prevent="sperre_foto_function(false)" style="text-decoration:none">Sperre des Profilfotos aufheben</a>
             </div>
             <a href="#" @click.prevent="sperre_foto_function(true)" style="display:block; text-decoration:none"  v-else>Profilfoto sperren</a>
-            
+            </div>
             
             </div>
             <div :class="{'col':true}">
@@ -303,9 +297,9 @@ export default {
             </div>
             </div>
             
-            <div :class="{'row':true}">
+            <div class="row my-5">
             
-            <!-- order-1 classe wird nur bei der Studentenansicht hinzugefügt um die Zutrittsgruppen Tabelle hinter der Betriebsmittel aufzureihen -->
+            <!-- order-2 class wird nur bei der Studentenansicht hinzugefügt um die Zutrittsgruppen Tabelle hinter der Betriebsmittel aufzureihen -->
             <div :class="{'col-12':true, 'order-2':role=='Student'}">
           
             <core-filter-cmpt v-if="role == 'Mitarbeiter' || role =='View_Mitarbeiter'" title="Funktionen"  ref="funktionenTable" :tabulator-options="funktionen_table_options" :tableOnly />

From 71fda916a36a349986db9182d288a87f85f16340 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Mon, 4 Dec 2023 09:25:08 +0100
Subject: [PATCH 0205/1461] added Menu link and Profile pop up link

---
 application/controllers/Cis/Profil.php         | 11 +++++------
 application/models/content/Content_model.php   | 17 +++++++++++++----
 application/views/Cis/Profil.php               |  5 +++--
 application/views/templates/CISHTML-Header.php |  2 +-
 public/js/components/Cis/Profil/Profil.js      |  3 +--
 5 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index 0cba7e940..3782dfbe2 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -79,13 +79,12 @@ class Profil extends Auth_Controller
 	
 	public function View($uid){
 		
-		//? get the personID of the uid
-		isSuccess($this->BenutzerModel->addSelect(["person_id"]));
-		$personID_res = $this->BenutzerModel->load([$uid]);
-		$personID_res = hasData($personID_res) ? getData($personID_res)[0] : null; 
+		if($uid === getAuthUID()){
+			$this->index();
+		}else{
+			$this->load->view('Cis/Profil', ["uid" => $uid,"view"=>true]);
+		}
 		
-		$this->load->view('Cis/Profil', ["uid" => $uid,"pid" => $personID_res->person_id,"view"=>true]);
-	
 	}
 	
 
diff --git a/application/models/content/Content_model.php b/application/models/content/Content_model.php
index 9bc3ab03d..0a196f9fb 100644
--- a/application/models/content/Content_model.php
+++ b/application/models/content/Content_model.php
@@ -99,6 +99,15 @@ class Content_model extends DB_Model
 					{
 						"content_id": 1000002,
 						"template_kurzbz": "redirect",
+						"titel": "Profil",
+						"content": "<content><url><![CDATA[' . site_url('/Cis/Profil') . ']]></url><target><![CDATA[]]></target></content>",
+						"menu_open": false,
+						"aktiv": true,
+						"childs": []
+					},
+					{
+						"content_id": 1000003,
+						"template_kurzbz": "redirect",
 						"titel": "COVID-19",
 						"content": "<content><url><![CDATA[' . site_url('/CisHtml/Cms/content/10012') . ']]></url><target><![CDATA[]]></target></content>",
 						"menu_open": false,
@@ -106,7 +115,7 @@ class Content_model extends DB_Model
 						"childs": []
 					},
 					{
-						"content_id": 1000003,
+						"content_id": 1000004,
 						"template_kurzbz": "redirect",
 						"titel": "Meine LV",
 						"content": "<content><url><![CDATA[' . site_url('/Cis/MyLv') . ']]></url><target><![CDATA[]]></target></content>",
@@ -115,7 +124,7 @@ class Content_model extends DB_Model
 						"childs": []
 					},
 					{
-						"content_id": 1000004,
+						"content_id": 1000005,
 						"template_kurzbz": "redirect",
 						"titel": "Stundenplan",
 						"content": "<content><url><![CDATA[' . site_url('/Cis/Stundenplan') . ']]></url><target><![CDATA[]]></target></content>",
@@ -124,7 +133,7 @@ class Content_model extends DB_Model
 						"childs": []
 					},
 					{
-						"content_id": 1000005,
+						"content_id": 1000006,
 						"template_kurzbz": "redirect",
 						"titel": "Dokumente",
 						"content": "<content><url><![CDATA[' . site_url('/Cis/Documents') . ']]></url><target><![CDATA[]]></target></content>",
@@ -133,7 +142,7 @@ class Content_model extends DB_Model
 						"childs": []
 					},
 					{
-						"content_id": 1000006,
+						"content_id": 1000007,
 						"template_kurzbz": "redirect",
 						"titel": "Studierendenstatus",
 						"content": "<content><url><![CDATA[' . site_url('/lehre/Studierendenantrag') . ']]></url><target><![CDATA[]]></target></content>",
diff --git a/application/views/Cis/Profil.php b/application/views/Cis/Profil.php
index 83d9e6008..866fbc959 100644
--- a/application/views/Cis/Profil.php
+++ b/application/views/Cis/Profil.php
@@ -3,7 +3,8 @@ $includesArray = array(
 	'title' => 'Stundenplan',
 	'customJSModules' => ['public/js/apps/Cis/ProfilApp.js'],
 	'tabulator5' => true,
-	'customCSSs' => ['public/css/components/calendar.css', 'public/css/components/FilterComponent.css']
+	'customCSSs' => ['public/css/components/calendar.css', 'public/css/components/FilterComponent.css'],
+	'childs' => ['test1','test2','test3','test4']
 );
 
 $this->load->view('templates/CISHTML-Header', $includesArray);
@@ -15,7 +16,7 @@ $this->load->view('templates/CISHTML-Header', $includesArray);
 	<hr>
 	
 	<!-- we can pass information from the php view file to the public js file throughz interpolating data from php into vue props -->
-	<Profil <?php echo "uid=$uid" ?> <?php echo "pid=$pid" ?> view=<?php echo $view? boolval(1): boolval(0); ?>></Profil>
+	<Profil <?php echo "uid=$uid" ?> view=<?php echo $view? boolval(1): boolval(0); ?>></Profil>
 </div>
 
 <?php $this->load->view('templates/CISHTML-Footer', $includesArray); ?>
diff --git a/application/views/templates/CISHTML-Header.php b/application/views/templates/CISHTML-Header.php
index 2ae90bda8..71f268112 100644
--- a/application/views/templates/CISHTML-Header.php
+++ b/application/views/templates/CISHTML-Header.php
@@ -46,7 +46,7 @@ if (!isset($menu)) {
 				<img src="<?= site_url('Cis/Pub/bild/person/' . getAuthPersonId()); ?>" class="avatar rounded-circle"/>
 			</button>
 			<ul id="nav-user-menu" class="collapse list-unstyled" aria-labelledby="nav-user-btn">
-				<li><a class="btn btn-level-2 rounded-0 d-block" href="#" id="menu-profil">Profil</a></li>
+				<li><a class="btn btn-level-2 rounded-0 d-block" href="/cis.php/Cis/Profil" id="menu-profil">Profil</a></li>
 				<li><a class="btn btn-level-2 rounded-0 d-block" href="#">Ampeln</a></li>
 				<li><hr class="dropdown-divider"></li>
 				<li><a class="btn btn-level-2 rounded-0 d-block" href="<?= site_url('Cis/Auth/logout'); ?>">Logout</a></li>
diff --git a/public/js/components/Cis/Profil/Profil.js b/public/js/components/Cis/Profil/Profil.js
index 190962f85..3f23925e8 100644
--- a/public/js/components/Cis/Profil/Profil.js
+++ b/public/js/components/Cis/Profil/Profil.js
@@ -51,7 +51,7 @@ export default {
     },
     
     //? this props were passed in the Profil.php view file
-    props:['uid','pid','view'],
+    props:['uid','view'],
     methods: {
         
         concatenate_addresses(address_array){
@@ -155,7 +155,6 @@ export default {
      mounted(){
 
         console.log(this.uid);
-        console.log(this.pid);
         console.log(this.view);
         console.log(typeof this.view);
         if(this.view){console.log("view is true")}else{ console.log("view is false")}

From 9c2ece2bdaa658f6cef4ad3a11c0553021b81fb0 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 4 Dec 2023 10:37:10 +0100
Subject: [PATCH 0206/1461] References like in CI4

---
 application/controllers/components/stv/Config.php | 4 +++-
 application/core/CI3_Events.php                   | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/application/controllers/components/stv/Config.php b/application/controllers/components/stv/Config.php
index a9503f4e6..a0fd4f53a 100644
--- a/application/controllers/components/stv/Config.php
+++ b/application/controllers/components/stv/Config.php
@@ -28,7 +28,9 @@ class Config extends FHC_Controller
 			'component' => './Stv/Studentenverwaltung/Details/Notizen.js'
 		];
 
-		Events::trigger('stv_conf_student', $result);
+		Events::trigger('stv_conf_student', function & () use (&$result) {
+			return $result;
+		});
 
 		$this->outputJsonSuccess($result);
 	}
diff --git a/application/core/CI3_Events.php b/application/core/CI3_Events.php
index d2c687a75..33a96b89e 100644
--- a/application/core/CI3_Events.php
+++ b/application/core/CI3_Events.php
@@ -24,7 +24,7 @@ class CI3_Events
 			self::$eventsSorted[$event] = false;
 	}
 
-	public static function trigger($event, &...$args)
+	public static function trigger($event, ...$args)
 	{
 		if (!isset(self::$events[$event]))
 			return;
@@ -37,7 +37,7 @@ class CI3_Events
 		}
 		
 		foreach (self::$events[$event] as $conf) {
-			call_user_func_array($conf[1], $args);
+			$conf[1](...$args);
 		}
 	}
 }

From 087bf229af8eae66cefc2eab85a17f28dc92cf14 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Tue, 5 Dec 2023 10:39:39 +0100
Subject: [PATCH 0207/1461] restructuring controller

---
 application/controllers/Cis/Profil.php        | 626 ++++++++++++++++--
 application/views/Cis/Profil.php              |  19 +-
 public/js/apps/Cis/Profil.js                  |  55 ++
 public/js/apps/Cis/ProfilApp.js               |  19 -
 public/js/apps/api/userdata.js                |  10 +-
 .../Cis/Profil/MitarbeiterProfil.js           | 218 ++++++
 .../Cis/Profil/MitarbeiterViewProfil.js       | 218 ++++++
 .../js/components/Cis/Profil/StudentProfil.js | 218 ++++++
 .../Cis/Profil/StudentViewProfil.js           | 218 ++++++
 9 files changed, 1511 insertions(+), 90 deletions(-)
 create mode 100644 public/js/apps/Cis/Profil.js
 delete mode 100644 public/js/apps/Cis/ProfilApp.js
 create mode 100644 public/js/components/Cis/Profil/MitarbeiterProfil.js
 create mode 100644 public/js/components/Cis/Profil/MitarbeiterViewProfil.js
 create mode 100644 public/js/components/Cis/Profil/StudentProfil.js
 create mode 100644 public/js/components/Cis/Profil/StudentViewProfil.js

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index 3782dfbe2..8a731e085 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -24,6 +24,9 @@ class Profil extends Auth_Controller
 			'indexProfilInformaion' => ['student/anrechnung_beantragen:r','user:r'],
 			'mitarbeiterProfil' => ['student/anrechnung_beantragen:r','user:r'],
 			'studentProfil' => ['student/anrechnung_beantragen:r','user:r'],
+			'getView' => ['student/anrechnung_beantragen:r','user:r'],
+			
+			
 			
 			
 			
@@ -52,29 +55,32 @@ class Profil extends Auth_Controller
 	 */
 
 	
-	public function index()
+	public function index($test=null)
 	{
 		
 		//? we can pass data to the view by using the second parameter of the load->view() function 
 		//* the first parameter is the route that Code Igniter will switch to
 		//* the second parameter can be used to pass data to the view  
-		$this->load->view('Cis/Profil', ["uid" => getAuthUID(),"pid" => getAuthPersonId(), "view"=> false]);
+		$this->load->view('Cis/Profil');
 	}
 
 	//? attempt at rerouting methods
 	/* public function _remap($method, $params = array())
+
 	{
-        if($method ==='View' || $method === 'Mitarbeiter'){
+		echo json_encode($params);
+      
 			
 			
-				return call_user_func_array(array($this, "searchView"), $params);
+				echo json_encode($method);
+				return;
 			
-		}else{
+		 }else{
 			if (method_exists($this, $method))
 			{
 					return call_user_func_array(array($this, $method), $params);
 			}
-		}
+		} 
 	} */
 	
 	public function View($uid){
@@ -82,29 +88,153 @@ class Profil extends Auth_Controller
 		if($uid === getAuthUID()){
 			$this->index();
 		}else{
-			$this->load->view('Cis/Profil', ["uid" => $uid,"view"=>true]);
+			$this->load->view('Cis/Profil');
 		}
 		
 	}
-	
 
 
-	public function studentProfil($uid, $view=false){
 
+	private function viewMitarbeiterProfil($uid){
+
+		
 		if(
-			!$view &&
-		isSuccess($this->BenutzergruppeModel->addSelect(['bezeichnung']))
-		&& isSuccess($this->BenutzergruppeModel->addJoin('tbl_gruppe', 'gruppe_kurzbz' ))
-		){
-			$zutrittsgruppe_res = $this->BenutzergruppeModel->loadWhere(array("uid"=>$uid, "zutrittssystem"=>true));
-			if(isError($zutrittsgruppe_res)){
+			isSuccess($this->PersonModel->addSelect('gruppe_kurzbz, beschreibung'))&&
+			isSuccess($this->PersonModel->addJoin('tbl_benutzer', 'person_id')) && 
+		isSuccess($this->PersonModel->addJoin('tbl_benutzergruppe', 'uid')) &&
+		isSuccess($this->PersonModel->addJoin('tbl_gruppe', 'gruppe_kurzbz'))){
+
+			$mailverteiler_res = $this->PersonModel->loadWhere(array('mailgrp' => true, 'uid'=>$uid));
+			if( isError($mailverteiler_res)){
 				// catch error
 			}
-			$zutrittsgruppe_res = hasData($zutrittsgruppe_res) ? getData($zutrittsgruppe_res) : null;
+			$mailverteiler_res = hasData($mailverteiler_res)? getData($mailverteiler_res) : null;
 			
+			$mailverteiler_res = array_map(function($element) { $element->mailto="mailto:".$element->gruppe_kurzbz."@".DOMAIN; return $element;},$mailverteiler_res);
 		}
+
+	
 		
 
+		if(
+			//! Summe der Wochenstunden wird jetzt in der hr/tbl_dienstverhaeltnis gespeichert
+		 isSuccess($this->BenutzerfunktionModel->addSelect(["tbl_benutzerfunktion.bezeichnung as Bezeichnung","tbl_organisationseinheit.bezeichnung as Organisationseinheit","datum_von as Gültig_von","datum_bis as Gültig_bis","wochenstunden as Wochenstunden"]))&&
+	  	  isSuccess($this->BenutzerfunktionModel->addJoin("tbl_organisationseinheit","oe_kurzbz"))
+		){
+			$benutzer_funktion_res = $this->BenutzerfunktionModel->loadWhere(array('uid'=>$uid));
+			if(isError($benutzer_funktion_res)){
+				// error handling
+			}else{
+				$benutzer_funktion_res = hasData($benutzer_funktion_res)? getData($benutzer_funktion_res) : null;
+			}
+		}
+
+		if(isSuccess($this->BenutzerModel->addSelect(["alias"]))){
+		$benutzer_res = $this->BenutzerModel->load([$uid]);
+		if(isError($benutzer_res)){
+			// error handling
+		}else{
+			$benutzer_res = hasData($benutzer_res)? getData($benutzer_res)[0] : null;
+		}
+		}
+
+		if(isSuccess($this->BenutzerModel->addSelect(["foto","foto_sperre","anrede","titelpost","titelpre","vorname","nachname"]))
+		&& isSuccess($this->BenutzerModel->addJoin("tbl_person", "person_id"))){
+
+			$person_res = $this->BenutzerModel->load([$uid]);
+			if(isError($person_res)){
+				// error handling
+			}else{
+				$person_res = hasData($person_res)? getData($person_res)[0] : null;
+			}
+		}
+		$mitarbeiter_res = $this->MitarbeiterModel->load($uid);
+		if(isError($mitarbeiter_res)){
+			// error handling
+		}else{
+			$mitarbeiter_res = hasData($mitarbeiter_res)? getData($mitarbeiter_res)[0] : null;
+		}
+
+		
+		$res = new stdClass();
+		$res->username = $uid;
+
+
+		//? Person Info
+		$res->foto = $person_res->foto;
+		$res->foto_sperre = $person_res->foto_sperre;
+		
+		$res->anrede = $person_res->anrede;
+		$res->titelpre = $person_res->titelpre;
+		$res->titelpost = $person_res->titelpost;
+		$res->vorname = $person_res->vorname;
+		$res->nachname = $person_res->nachname;
+		
+		
+		$res->gebdatum = $person_res->gebdatum;
+		$res->gebort = $person_res->gebort;
+		//? Mitarbeiter Info
+		$res->kurzbz = $mitarbeiter_res->kurzbz;
+		$res->telefonklappe = $mitarbeiter_res->telefonklappe;
+		//? Email Info 
+		$intern_email = array();
+		$intern_email+=array("type" => "intern");
+		$intern_email+=array("email"=> $uid . "@" . DOMAIN);
+		$extern_email=array();
+		$extern_email+=array("type" => "alias");
+		$extern_email+=array("email" => $benutzer_res->alias . "@" . DOMAIN);
+		$res->emails = array($intern_email,$extern_email);
+		//? Adresse Info 
+		$res->adressen = $adresse_res;
+		//? Benutzerfunktion Info
+		$res->funktionen = $benutzer_funktion_res;
+		//? Betriebsmittel Info
+		$res->mittel = $betriebsmittelperson_res;
+		//? Austellungsdatum von der Zutrittskarte
+		$res->zutrittskarte_ausgegebenam = $zutrittskarte_ausgegebenam;
+		//? Kontakt Info
+		$res->kontakte = $kontakte_res;
+		//? Mailverteiler Info
+		$res->mailverteiler = $mailverteiler_res;
+		 
+		echo json_encode($res);
+
+	}
+
+
+	
+	private function viewStudentProfil($uid){
+		
+
+
+		if(
+			isSuccess($this->PersonModel->addSelect('gruppe_kurzbz, beschreibung'))&&
+			isSuccess($this->PersonModel->addJoin('tbl_benutzer', 'person_id')) && 
+		isSuccess($this->PersonModel->addJoin('tbl_benutzergruppe', 'uid')) &&
+		isSuccess($this->PersonModel->addJoin('tbl_gruppe', 'gruppe_kurzbz'))){
+
+			$mailverteiler_res = $this->PersonModel->loadWhere(array('mailgrp' => true, 'uid'=>$uid));
+			if( isError($mailverteiler_res)){
+				// catch error
+			}
+			$mailverteiler_res = hasData($mailverteiler_res)? getData($mailverteiler_res) : null;
+			
+			$mailverteiler_res = array_map(function($element) { $element->mailto="mailto:".$element->gruppe_kurzbz."@".DOMAIN; return $element;},$mailverteiler_res);
+		}
+
+		
+		
+		if(isSuccess($this->BenutzerModel->addSelect(["foto","foto_sperre","anrede","titelpost","titelpre","vorname","nachname"]))
+		&& isSuccess($this->BenutzerModel->addJoin("tbl_person", "person_id"))){
+
+			$person_res = $this->BenutzerModel->load([$uid]);
+			if(isError($person_res)){
+				// error handling
+			}else{
+				$person_res = hasData($person_res)? getData($person_res)[0] : null;
+			}
+		}
+		
 
 		//? personenkennzeichen ist die Spalte Matrikelnr in der Tabelle Student
 		if(isSuccess($this->StudentModel->addSelect(['tbl_studiengang.bezeichnung as studiengang','tbl_student.semester', 'tbl_student.verband', 'tbl_student.gruppe' ,'tbl_student.matrikelnr as personenkennzeichen']))
@@ -123,78 +253,448 @@ class Profil extends Auth_Controller
 		//? Matrikelnummer ist die Spalte matr_nr in Person
 		if(isSuccess($this->BenutzerModel->addSelect(["matr_nr"])) 
 		&& isSuccess($this->BenutzerModel->addJoin("tbl_person","person_id"))){
-			$person_res = $this->BenutzerModel->load([$uid]);
-			if(isError($person_res)){
+			$matr_res = $this->BenutzerModel->load([$uid]);
+			if(isError($matr_res)){
 				// catch error
 			}else{
-				$person_res = hasData($person_res)? getData($person_res)[0] : [];
+				$matr_res = hasData($matr_res)? getData($matr_res)[0] : [];
 				
 			}
 		}
 
 		$res = new stdClass();
-		$res->matrikelnummer = $person_res->matr_nr;
+		
+		
+		$res->foto = $person_res->foto;
+		$res->username = $uid;
+		
+		$res->anrede = $person_res->anrede;
+		$res->titel = $person_res->titelpre;
+		$res->vorname = $person_res->vorname;
+		$res->nachname = $person_res->nachname;
+	
+	
+		$res->postnomen = $person_res->titelpost; 
+		
+		$res->internal_email= $uid . "@" . DOMAIN;
+	
+	
+		
+		
+		$res->matrikelnummer = $matr_res->matr_nr;
 		foreach($student_res as $key => $value){
 			$res->$key = $value;
 		}
-		if(!$view){
-		$res->zuttritsgruppen = $zutrittsgruppe_res;
+
+	
+		
+		$res->mailverteiler = $mailverteiler_res;
+		
+		return $res;
+		
+		 
+	}
+
+	private function mitarbeiterProfil(){
+		//? informationen die nur für den Mitarbeiter verfügbar sind
+	//? Data for the Mitarbeiter view
+
+			//? betriebsmittel soll nur der user selber sehen
+			if(
+			
+				isSuccess($this->BetriebsmittelpersonModel->addSelect(["CONCAT(betriebsmitteltyp, ' ' ,beschreibung) as Betriebsmittel","nummer as Nummer","ausgegebenam as Ausgegeben_am"]))
+				
+			){
+				//? betriebsmittel are not needed in a view
+				$betriebsmittelperson_res = $this->BetriebsmittelpersonModel->getBetriebsmittel(getAuthPersonId());
+				if(isError($betriebsmittelperson_res)){
+					   // error handling
+				   }else{
+					   $betriebsmittelperson_res = hasData($betriebsmittelperson_res)? getData($betriebsmittelperson_res) : null;
+				   }
+			   }
+
+			   if(
+			
+				//? kontaktdaten soll auch nur der user selbst sehen
+				isSuccess($this->KontaktModel->addSelect('DISTINCT ON (kontakttyp) kontakttyp, kontakt, tbl_kontakt.anmerkung, tbl_kontakt.zustellung')) &&
+			isSuccess($this->KontaktModel->addJoin('public.tbl_standort', 'standort_id', 'LEFT')) &&
+			isSuccess($this->KontaktModel->addJoin('public.tbl_firma', 'firma_id', 'LEFT'))&&
+			isSuccess($this->KontaktModel->addOrder('kontakttyp, kontakt, tbl_kontakt.updateamum, tbl_kontakt.insertamum'))
+			){
+				$kontakte_res = $this->KontaktModel->loadWhere(array('person_id' => getAuthPersonID()));
+				if(isError($kontakte_res)){
+					// handle error	
+				}else{
+					$kontakte_res = hasData($kontakte_res)? getData($kontakte_res) : null;
+				}
+				
+			}
+
+			//? FH Ausweis Austellungsdatum soll auch nur der user selbst sehen
+			$zutrittskarte_ausgegebenam = $this->BetriebsmittelpersonModel->getBetriebsmittelByUid(getAuthUID(),"Zutrittskarte");
+			if(isError($zutrittskarte_ausgegebenam)){
+				// error handling
+			}else{
+				$zutrittskarte_ausgegebenam = hasData($zutrittskarte_ausgegebenam)? getData($zutrittskarte_ausgegebenam)[0]->ausgegebenam : null;
+				//? formats the date from 01-01-2000 to 01.01.2000
+				$zutrittskarte_ausgegebenam = str_replace("-",".",$zutrittskarte_ausgegebenam);
+			}
+
+
+			//? Die Adressen soll auch nur der user selber sehen
+
+			if(
+				
+				isSuccess($adresse_res = $this->AdresseModel->addSelect(array("strasse","tbl_adressentyp.bezeichnung as adr_typ","plz","ort")))&&
+				isSuccess($adresse_res = $this->AdresseModel->addOrder("zustelladresse","DESC"))&&
+				isSuccess($adresse_res = $this->AdresseModel->addOrder("sort"))&&
+				isSuccess($adresse_res = $this->AdresseModel->addJoin("tbl_adressentyp","typ=adressentyp_kurzbz"))
+			){
+				$adresse_res = $this->AdresseModel->loadWhere(array("person_id"=>getAuthPersonID()));
+				if(isError($adresse_res)){
+					// error handling
+				}else{									
+					$adresse_res = hasData($adresse_res)? getData($adresse_res) : null;
+				}
+			}
+
+			//? die folgenden Informationen darf nur der eigene user sehen
+		
+
+		
+		
+
+		if(
+			isSuccess($this->PersonModel->addSelect('gruppe_kurzbz, beschreibung'))&&
+			isSuccess($this->PersonModel->addJoin('tbl_benutzer', 'person_id')) && 
+		isSuccess($this->PersonModel->addJoin('tbl_benutzergruppe', 'uid')) &&
+		isSuccess($this->PersonModel->addJoin('tbl_gruppe', 'gruppe_kurzbz'))){
+
+			$mailverteiler_res = $this->PersonModel->loadWhere(array('mailgrp' => true, 'uid'=>getAuthUID()));
+			if( isError($mailverteiler_res)){
+				// catch error
+			}
+			$mailverteiler_res = hasData($mailverteiler_res)? getData($mailverteiler_res) : null;
+			
+			$mailverteiler_res = array_map(function($element) { $element->mailto="mailto:".$element->gruppe_kurzbz."@".DOMAIN; return $element;},$mailverteiler_res);
+		}
+
+		
+		
+		if(isSuccess($this->BenutzerModel->addSelect(["foto","foto_sperre","anrede","titelpost","titelpre","vorname","nachname", "gebort", "gebdatum"]))
+		&& isSuccess($this->BenutzerModel->addJoin("tbl_person", "person_id"))){
+
+			$person_res = $this->BenutzerModel->load([getAuthUID()]);
+			if(isError($person_res)){
+				// error handling
+			}else{
+				$person_res = hasData($person_res)? getData($person_res)[0] : null;
+			}
+		}
+
+
+		if(
+			//! Summe der Wochenstunden wird jetzt in der hr/tbl_dienstverhaeltnis gespeichert
+		isSuccess($this->BenutzerfunktionModel->addSelect(["tbl_benutzerfunktion.bezeichnung as Bezeichnung","tbl_organisationseinheit.bezeichnung as Organisationseinheit","datum_von as Gültig_von","datum_bis as Gültig_bis","wochenstunden as Wochenstunden"]))&&
+			isSuccess($this->BenutzerfunktionModel->addJoin("tbl_organisationseinheit","oe_kurzbz"))
+		){
+			$benutzer_funktion_res = $this->BenutzerfunktionModel->loadWhere(array('uid'=>getAuthUID()));
+			if(isError($benutzer_funktion_res)){
+				// error handling
+			}else{
+				$benutzer_funktion_res = hasData($benutzer_funktion_res)? getData($benutzer_funktion_res) : null;
+			}
+		}
+	
+	
+		
+	
+		if(isSuccess($this->MitarbeiterModel->addSelect(["kurzbz","telefonklappe", "alias","ort_kurzbz"]))
+			&& isSuccess($this->MitarbeiterModel->addJoin("tbl_benutzer", "tbl_benutzer.uid = tbl_mitarbeiter.mitarbeiter_uid"))
+		){
+			$mitarbeiter_res = $this->MitarbeiterModel->load(getAuthUID());
+				if(isError($mitarbeiter_res)){
+					// error handling
+				}else{
+					$mitarbeiter_res = hasData($mitarbeiter_res)? getData($mitarbeiter_res)[0] : null;
+				}
+			}
+		
+			$res = new stdClass();
+			$res->foto = $person_res->foto;
+			$res->foto_sperre = $person_res->foto_sperre;
+			$res->username = getAuthUID();
+			
+			$res->anrede = $person_res->anrede;
+			$res->titel = $person_res->titelpre;
+			$res->vorname = $person_res->vorname;
+			$res->nachname = $person_res->nachname;
+			
+			$res->gebort = $person_res->gebort;
+			$res->gebdatum = $person_res->gebdatum;
+		
+			$res->postnomen = $person_res->titelpost; 
+			
+			
+			$res->adressen = $adresse_res;
+			$res->zutrittsdatum = $zutrittskarte_ausgegebenam;
+			$res->kontakte = $kontakte_res;
+			$res->mittel = $betriebsmittelperson_res;
+			
+			$res->mailverteiler = $mailverteiler_res;
+			
+			foreach($mitarbeiter_res as $key => $value){
+				$res->$key = $value;
+			}
+			$intern_email = array();
+			$intern_email+=array("type" => "intern");
+			$intern_email+=array("email"=> getAuthUID() . "@" . DOMAIN);
+			$extern_email=array();
+			$extern_email+=array("type" => "alias");
+			$extern_email+=array("email" => $mitarbeiter_res->alias . "@" . DOMAIN);
+			$res->emails = array($intern_email,$extern_email);
+			
+			$res->funktionen = $benutzer_funktion_res;
+			return $res;
+		}
+	
+	
+	
+
+
+	private function studentProfil(){
+
+
+		
+			//? betriebsmittel soll nur der user selber sehen
+			if(
+			
+				isSuccess($this->BetriebsmittelpersonModel->addSelect(["CONCAT(betriebsmitteltyp, ' ' ,beschreibung) as Betriebsmittel","nummer as Nummer","ausgegebenam as Ausgegeben_am"]))
+				
+			){
+				//? betriebsmittel are not needed in a view
+				$betriebsmittelperson_res = $this->BetriebsmittelpersonModel->getBetriebsmittel(getAuthPersonId());
+				if(isError($betriebsmittelperson_res)){
+					   // error handling
+				   }else{
+					   $betriebsmittelperson_res = hasData($betriebsmittelperson_res)? getData($betriebsmittelperson_res) : null;
+				   }
+			   }
+
+			   if(
+			
+				//? kontaktdaten soll auch nur der user selbst sehen
+				isSuccess($this->KontaktModel->addSelect('DISTINCT ON (kontakttyp) kontakttyp, kontakt, tbl_kontakt.anmerkung, tbl_kontakt.zustellung')) &&
+			isSuccess($this->KontaktModel->addJoin('public.tbl_standort', 'standort_id', 'LEFT')) &&
+			isSuccess($this->KontaktModel->addJoin('public.tbl_firma', 'firma_id', 'LEFT'))&&
+			isSuccess($this->KontaktModel->addOrder('kontakttyp, kontakt, tbl_kontakt.updateamum, tbl_kontakt.insertamum'))
+			){
+				$kontakte_res = $this->KontaktModel->loadWhere(array('person_id' => getAuthPersonID()));
+				if(isError($kontakte_res)){
+					// handle error	
+				}else{
+					$kontakte_res = hasData($kontakte_res)? getData($kontakte_res) : null;
+				}
+				
+			}
+
+			//? FH Ausweis Austellungsdatum soll auch nur der user selbst sehen
+			$zutrittskarte_ausgegebenam = $this->BetriebsmittelpersonModel->getBetriebsmittelByUid(getAuthUID(),"Zutrittskarte");
+			if(isError($zutrittskarte_ausgegebenam)){
+				// error handling
+			}else{
+				$zutrittskarte_ausgegebenam = hasData($zutrittskarte_ausgegebenam)? getData($zutrittskarte_ausgegebenam)[0]->ausgegebenam : null;
+				//? formats the date from 01-01-2000 to 01.01.2000
+				$zutrittskarte_ausgegebenam = str_replace("-",".",$zutrittskarte_ausgegebenam);
+			}
+
+
+			//? Die Adressen soll auch nur der user selber sehen
+
+			if(
+				
+				isSuccess($adresse_res = $this->AdresseModel->addSelect(array("strasse","tbl_adressentyp.bezeichnung as adr_typ","plz","ort")))&&
+				isSuccess($adresse_res = $this->AdresseModel->addOrder("zustelladresse","DESC"))&&
+				isSuccess($adresse_res = $this->AdresseModel->addOrder("sort"))&&
+				isSuccess($adresse_res = $this->AdresseModel->addJoin("tbl_adressentyp","typ=adressentyp_kurzbz"))
+			){
+				$adresse_res = $this->AdresseModel->loadWhere(array("person_id"=>getAuthPersonID()));
+				if(isError($adresse_res)){
+					// error handling
+				}else{									
+					$adresse_res = hasData($adresse_res)? getData($adresse_res) : null;
+				}
+			}
+
+			//? die folgenden Informationen darf nur der eigene user sehen
+		
+
+		
+		
+
+		if(
+			isSuccess($this->PersonModel->addSelect('gruppe_kurzbz, beschreibung'))&&
+			isSuccess($this->PersonModel->addJoin('tbl_benutzer', 'person_id')) && 
+		isSuccess($this->PersonModel->addJoin('tbl_benutzergruppe', 'uid')) &&
+		isSuccess($this->PersonModel->addJoin('tbl_gruppe', 'gruppe_kurzbz'))){
+
+			$mailverteiler_res = $this->PersonModel->loadWhere(array('mailgrp' => true, 'uid'=>getAuthUID()));
+			if( isError($mailverteiler_res)){
+				// catch error
+			}
+			$mailverteiler_res = hasData($mailverteiler_res)? getData($mailverteiler_res) : null;
+			
+			$mailverteiler_res = array_map(function($element) { $element->mailto="mailto:".$element->gruppe_kurzbz."@".DOMAIN; return $element;},$mailverteiler_res);
+		}
+
+		
+		
+		if(isSuccess($this->BenutzerModel->addSelect(["foto","foto_sperre","anrede","titelpost","titelpre","vorname","nachname", "gebort", "gebdatum"]))
+		&& isSuccess($this->BenutzerModel->addJoin("tbl_person", "person_id"))){
+
+			$person_res = $this->BenutzerModel->load([getAuthUID()]);
+			if(isError($person_res)){
+				// error handling
+			}else{
+				$person_res = hasData($person_res)? getData($person_res)[0] : null;
+			}
 		}
 		
-		echo json_encode($res);
+		if(
+		
+		isSuccess($this->BenutzergruppeModel->addSelect(['bezeichnung']))
+		&& isSuccess($this->BenutzergruppeModel->addJoin('tbl_gruppe', 'gruppe_kurzbz' ))
+		){
+			$zutrittsgruppe_res = $this->BenutzergruppeModel->loadWhere(array("uid"=>getAuthUID(), "zutrittssystem"=>true));
+			if(isError($zutrittsgruppe_res)){
+				// catch error
+			}
+			$zutrittsgruppe_res = hasData($zutrittsgruppe_res) ? getData($zutrittsgruppe_res) : null;
+			
+		}
+		
+
+
+		//? personenkennzeichen ist die Spalte Matrikelnr in der Tabelle Student
+		if(isSuccess($this->StudentModel->addSelect(['tbl_studiengang.bezeichnung as studiengang','tbl_student.semester', 'tbl_student.verband', 'tbl_student.gruppe' ,'tbl_student.matrikelnr as personenkennzeichen']))
+		 && isSuccess($this->StudentModel->addJoin('tbl_studiengang', "tbl_studiengang.studiengang_kz=tbl_student.studiengang_kz")))
+		{
+			$student_res = $this->StudentModel->load([getAuthUID()]);
+			if(isError($student_res)){
+				// catch error
+			}
+			$student_res = hasData($student_res)?getData($student_res)[0]:null;
+		
+		}
+		
+
+		
+		//? Matrikelnummer ist die Spalte matr_nr in Person
+		if(isSuccess($this->BenutzerModel->addSelect(["matr_nr"])) 
+		&& isSuccess($this->BenutzerModel->addJoin("tbl_person","person_id"))){
+			$matr_res = $this->BenutzerModel->load([getAuthUID()]);
+			if(isError($matr_res)){
+				// catch error
+			}else{
+				$matr_res = hasData($matr_res)? getData($matr_res)[0] : [];
+				
+			}
+		}
+
+		$res = new stdClass();
+		
+		
+		$res->foto = $person_res->foto;
+		$res->foto_sperre = $person_res->foto_sperre;
+		$res->username = getAuthUID();
+		
+		$res->anrede = $person_res->anrede;
+		$res->titel = $person_res->titelpre;
+		$res->vorname = $person_res->vorname;
+		$res->nachname = $person_res->nachname;
+		
+		$res->gebort = $person_res->gebort;
+		$res->gebdatum = $person_res->gebdatum;
+	
+		$res->postnomen = $person_res->titelpost; 
+		
+		$res->internal_email= getAuthUID() . "@" . DOMAIN;
+		$res->adressen = $adresse_res;
+		$res->zutrittsdatum = $zutrittskarte_ausgegebenam;
+		$res->kontakte = $kontakte_res;
+		$res->mittel = $betriebsmittelperson_res;
+		$res->matrikelnummer = $matr_res->matr_nr;
+		foreach($student_res as $key => $value){
+			$res->$key = $value;
+		}
+		$res->zuttritsgruppen = $zutrittsgruppe_res;
+
+	
+		
+		$res->mailverteiler = $mailverteiler_res;
+		
+		return $res;
 		
 		 
 
 	}
 
-	public function mitarbeiterProfil($uid){
-	//? informationen die nur für den Mitarbeiter verfügbar sind
+	public function getView(){
+		// property_exists(object|string $object_or_class, string $property): bool
+		
+		$payload = json_decode($this->input->raw_input_stream);
+		/* echo json_encode($payload);
+		return; */
+		$uid = property_exists($payload,"uid")?  $payload->uid : null;
+		
+		
+		$isMitarbeiter = null;
+		if($uid)
+			$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter($uid);
+		else
+			$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter(getAuthUID());
+		
 
-
-	if(
-		//! Summe der Wochenstunden wird jetzt in der hr/tbl_dienstverhaeltnis gespeichert
-	isSuccess($this->BenutzerfunktionModel->addSelect(["tbl_benutzerfunktion.bezeichnung as Bezeichnung","tbl_organisationseinheit.bezeichnung as Organisationseinheit","datum_von as Gültig_von","datum_bis as Gültig_bis","wochenstunden as Wochenstunden"]))&&
-		isSuccess($this->BenutzerfunktionModel->addJoin("tbl_organisationseinheit","oe_kurzbz"))
-	){
-		$benutzer_funktion_res = $this->BenutzerfunktionModel->loadWhere(array('uid'=>$uid));
-		if(isError($benutzer_funktion_res)){
-			// error handling
-		}else{
-			$benutzer_funktion_res = hasData($benutzer_funktion_res)? getData($benutzer_funktion_res) : null;
+		if(isError($isMitarbeiter)){
+			//catch error
 		}
-	}
-
-
+		$isMitarbeiter = hasData($isMitarbeiter) ? getData($isMitarbeiter) : null;
+		
+		$res = new stdClass();
 	
-
-	if(isSuccess($this->MitarbeiterModel->addSelect(["kurzbz","telefonklappe", "alias","ort_kurzbz"]))
-		&& isSuccess($this->MitarbeiterModel->addJoin("tbl_benutzer", "tbl_benutzer.uid = tbl_mitarbeiter.mitarbeiter_uid"))
-	){
-		$mitarbeiter_res = $this->MitarbeiterModel->load($uid);
-			if(isError($mitarbeiter_res)){
-				// error handling
-			}else{
-				$mitarbeiter_res = hasData($mitarbeiter_res)? getData($mitarbeiter_res)[0] : null;
+		if($uid){
+			// if an $uid was passed as payload to the function then the user is trying to view another profile
+			if($isMitarbeiter ){
+				 $res->view= "ViewMitarbeiterProfil";
+				 $res->data= $this->viewMitarbeiterProfil($uid);
+			}
+			else {
+				$res->view= "ViewStudentProfil";
+				$res->data= $this->viewStudentProfil($uid);
+			}
+		}else{
+			// if the $uid is empty, then no payload was supplied and the own profile is being requested
+			if($isMitarbeiter ) {
+				$res->view= "MitarbeiterProfil";
+				$res->data = $this->mitarbeiterProfil();
+			}
+			else {
+				$res->view= "StudentProfil";
+				$res->data = $this->studentProfil();
 			}
 		}
-	
-		$res = new stdClass();
-		foreach($mitarbeiter_res as $key => $value){
-			$res->$key = $value;
-		}
-		$intern_email = array();
-		$intern_email+=array("type" => "intern");
-		$intern_email+=array("email"=> $uid . "@" . DOMAIN);
-		$extern_email=array();
-		$extern_email+=array("type" => "alias");
-		$extern_email+=array("email" => $mitarbeiter_res->alias . "@" . DOMAIN);
-		$res->emails = array($intern_email,$extern_email);
-		
-		$res->funktionen = $benutzer_funktion_res;
+
+
 		echo json_encode($res);
+		return;
+		
+
+		
+		
 	}
 
-
+	
 	//? the view parameter is a flag that describes if a Profile from a different person is being viewed
 	public function indexProfilInformaion($uid, $view=false){
 		//? funktion returns all data needed for the student and the mitarbeiter profil view
diff --git a/application/views/Cis/Profil.php b/application/views/Cis/Profil.php
index 866fbc959..a107f0775 100644
--- a/application/views/Cis/Profil.php
+++ b/application/views/Cis/Profil.php
@@ -1,22 +1,29 @@
 <?php
 $includesArray = array(
 	'title' => 'Stundenplan',
-	'customJSModules' => ['public/js/apps/Cis/ProfilApp.js'],
+	'customJSModules' => ['public/js/apps/Cis/Profil.js'],
 	'tabulator5' => true,
 	'customCSSs' => ['public/css/components/calendar.css', 'public/css/components/FilterComponent.css'],
-	'childs' => ['test1','test2','test3','test4']
+	
 );
 
 $this->load->view('templates/CISHTML-Header', $includesArray);
 ?>
+<!--
 
-<div id="content">
+	<student-profil></student-profil>
+	<component :is="StudentProfil"></component>
 	<h2>Profil</h2>
 	
 	<hr>
-	
-	<!-- we can pass information from the php view file to the public js file throughz interpolating data from php into vue props -->
-	<Profil <?php echo "uid=$uid" ?> view=<?php echo $view? boolval(1): boolval(0); ?>></Profil>
+	<component :is="<?php //echo "StudentProfil"; ?>" ></component>
+	 we can pass information from the php view file to the public js file throughz interpolating data from php into vue props 
+	<Profil <?php //echo "uid=$uid" ?> view=<?php //echo $view? boolval(1): boolval(0); ?>></Profil>
+
+-->
+
+<div id="content" >
+
 </div>
 
 <?php $this->load->view('templates/CISHTML-Footer', $includesArray); ?>
diff --git a/public/js/apps/Cis/Profil.js b/public/js/apps/Cis/Profil.js
new file mode 100644
index 000000000..93f951272
--- /dev/null
+++ b/public/js/apps/Cis/Profil.js
@@ -0,0 +1,55 @@
+//import ProfilView from "../../components/Cis/Profil/Profil.js";
+import StudentProfil from "../../components/Cis/Profil/StudentProfil.js";
+import MitarbeiterProfil from "../../components/Cis/Profil/MitarbeiterProfil.js";
+import ViewStudentProfil from "../../components/Cis/Profil/StudentViewProfil.js";
+import ViewMitarbeiterProfil from "../../components/Cis/Profil/MitarbeiterViewProfil.js";
+import fhcapifactory from "../api/fhcapifactory.js";
+
+Vue.$fhcapi = fhcapifactory;
+
+
+const app = Vue.createApp({
+	
+	components: {
+		
+		StudentProfil,
+		MitarbeiterProfil,
+		ViewStudentProfil,
+		ViewMitarbeiterProfil,
+	},
+	data() {
+		return {
+			view:null,
+			
+		}
+	},
+	methods: {
+        
+	},
+	created(){
+
+		let path = location.pathname;
+		console.log(path);
+		console.log(path.lastIndexOf('/'));
+		let uid = path.substring(path.lastIndexOf('/')).replace("/","");
+		console.log("i am passing this uid: ", uid);
+		const payload = {
+			...(uid != "Profil" ? {uid} : {})
+		};
+
+		Vue.$fhcapi.UserData.getView(payload).then((res)=>{
+			//this.view = res.data.view;
+			//this.data = res.data.data;
+			console.log(res.data);
+		});
+	},
+	template:`
+	<div>
+	<p>test element</p>
+	<!--<StudentProfil></StudentProfil>-->
+	<component :is="view"></component>
+	</div>`
+	
+	
+});
+app.mount("#content");
\ No newline at end of file
diff --git a/public/js/apps/Cis/ProfilApp.js b/public/js/apps/Cis/ProfilApp.js
deleted file mode 100644
index 7a663f108..000000000
--- a/public/js/apps/Cis/ProfilApp.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import Profil from "../../components/Cis/Profil/Profil.js";
-
-
-const app = Vue.createApp({
-	
-	components: {
-		Profil,
-	},
-	data() {
-		return {
-			
-		}
-	},
-	methods: {
-        
-	},
-	
-});
-app.mount("#content");
\ No newline at end of file
diff --git a/public/js/apps/api/userdata.js b/public/js/apps/api/userdata.js
index ad09144a7..b0213e0e4 100644
--- a/public/js/apps/api/userdata.js
+++ b/public/js/apps/api/userdata.js
@@ -7,6 +7,12 @@ export default {
                   + `cis.php/Cis/Profil/isMitarbeiterOrStudent/${uid}`;
         return axios.get(url);
     },
+
+    getView: function(payload) {
+        const url = FHC_JS_DATA_STORAGE_OBJECT.app_root 
+                  + `cis.php/Cis/Profil/getView`;
+        return axios.post(url,payload);
+    },
  
     sperre_foto_function: function(value) {
         const url = FHC_JS_DATA_STORAGE_OBJECT.app_root 
@@ -21,9 +27,9 @@ export default {
         
         return axios.get(url);
     },
-    mitarbeiterProfil: function(uid) {
+    mitarbeiterProfil: function() {
         const url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router+
-                   `/Cis/Profil/mitarbeiterProfil/${uid}`;
+                   `/Cis/Profil/mitarbeiterProfil/`;
         
         return axios.get(url);
     },
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
new file mode 100644
index 000000000..5e5448027
--- /dev/null
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -0,0 +1,218 @@
+
+import fhcapifactory from "../../../apps/api/fhcapifactory.js";
+import {CoreFilterCmpt} from "../../../components/filter/Filter.js"
+
+//? possible types of roles:
+//! depending on the role of the current view, different content is being displayed and fetched
+//* Student
+//* Mitarbeiter
+//* View_Student
+//* View_Mitarbeiter
+
+export default {
+    components:{
+        CoreFilterCmpt,
+    },
+    data() {
+        return {
+            index_information: null,
+            mitarbeiter_info: null,
+            student_info:null,
+            //? beinhaltet die Information ob der angefragte user ein Student oder Mitarbeiter ist
+            role: null,
+
+            funktionen_table_options: {
+                height: 300,
+                layout: 'fitColumns',
+                data:[{Bezeichnung:"",Organisationseinheit:"",Gültig_von:"",Gültig_bis:"",Wochenstunden:""}],
+                columns: [{title: 'Bezeichnung', field: 'Bezeichnung', headerFilter: true},
+                {title: 'Organisationseinheit', field: 'Organisationseinheit', headerFilter: true},
+                {title: 'Gültig_von', field: 'Gültig_von', headerFilter: true},
+                {title: 'Gültig_bis', field: 'Gültig_bis', headerFilter: true},
+                {title: 'Wochenstunden', field: 'Wochenstunden', headerFilter: true},]
+                
+            },
+            betriebsmittel_table_options:{
+                height: 300,
+                layout: 'fitColumns',
+                data:[{betriebsmittel:"",Nummer:"",Ausgegeben_am:""}],
+                columns: [{title: 'Betriebsmittel', field: 'betriebsmittel', headerFilter: true},
+                {title: 'Nummer', field: 'Nummer', headerFilter: true},
+                {title: 'Ausgegeben_am', field: 'Ausgegeben_am', headerFilter: true},]
+                
+            },
+            zutrittsgruppen_table_options:{
+                height: 300,
+                layout: 'fitColumns',
+                data:[{bezeichnung:"test1"}],
+                columns: [{title: 'Zutritt', field: 'bezeichnung'}]
+            }
+        }
+    },
+    
+    //? this props were passed in the Profil.php view file
+    props:['uid','view'],
+    methods: {
+        
+        concatenate_addresses(address_array){
+            let result = "";
+            for (let i = 0; i < address_array.length; i++) {
+                result += address_array[i].strasse + " " + address_array[i].plz + " " + address_array[i].ort + "\n";
+            }
+            return result;
+        },
+        render_unterelement(wert,bezeichnung){
+            if (isArray(bezeichnung)){
+                
+            }
+        },
+        concatenate_kontakte(kontakt_array){
+            let result = "";
+            for (let i = 0; i < kontakt_array.length; i++) {
+                result += kontakt_array[i].kontakttyp + " " + kontakt_array[i].kontakt + " " + kontakt_array[i].zustellung + "\n";
+            }
+            return result;
+        },
+        sperre_foto_function(value){
+            if(!(this.mitarbeiter_info && this.index_information && this.student_info) ){
+                return;
+            }
+            fhcapifactory.UserData.sperre_foto_function(value).then(res => {
+                    
+                    this.index_information.foto_sperre = res.data.foto_sperre;
+                
+            });
+            
+        },
+        
+        
+    },
+    computed:{
+     
+        
+        get_image_base64_src(){
+            if(!this.index_information){
+                return "";
+            }
+            return "data:image/jpeg;base64,"+this.index_information.foto;
+        },
+        personData(){
+            if(!this.index_information){
+                return {};
+            }
+  
+           return {
+                Allgemein: (this.role =='Mitarbeiter' || this.role =='View_Mitarbeiter')?{
+                    Username:this.index_information.username,
+                    Anrede:this.index_information.anrede,
+                    Titel:this.index_information.titel,
+                    Vorname:this.index_information.vorname,
+                    Nachname:this.index_information.nachname,
+                    Postnomen:this.index_information.postnomen,
+            }:{
+                Username:this.index_information.username,
+                Matrikelnummer: this.student_info?.matrikelnummer,
+                Anrede:this.index_information.anrede,
+                Titel:this.index_information.titel,
+                Vorname:this.index_information.vorname,
+                Nachname:this.index_information.nachname,
+                Postnomen:this.index_information.postnomen,
+            },
+            GeburtsDaten:!this.role.includes("View")?{
+                Geburtsdatum:this.index_information.gebdatum,
+                Geburtsort: this.index_information.gebort,
+            }: null,
+                Adressen: this.index_information.adressen,
+            SpecialInformation: this.role =='Mitarbeiter' || this.role === 'View_Mitarbeiter'?  {
+                Kurzzeichen: this.mitarbeiter_info?.kurzbz,
+                Telefon: this.mitarbeiter_info?.telefonklappe,
+                //* Wird das Feld Ort_kurzbz noch gepflegt?
+                ...(this.role === 'View_Mitarbeiter'?{Büro:this.mitarbeiter_info?.ort_kurzbz}:{}) ,
+            } : {
+                Studiengang:this.student_info?.studiengang,
+                Semester:this.student_info?.semester,
+                Verband:this.student_info?.verband,
+                Gruppe:this.student_info?.gruppe,
+                Personenkennzeichen:this.student_info?.personenkennzeichen
+            },
+            };
+        },
+        //? this computed conains all the information that is used for the second column that displays the information of the person
+        kontaktInfo(){
+            if(!this.index_information){
+                return {};
+            }
+         
+           return {
+                FhAusweisStatus: this.index_information.zutrittsdatum,
+                emails: this.role === 'Mitarbeiter' || this.role === 'View_Mitarbeiter'?  this.mitarbeiter_info?.emails: this.index_information.emails,
+                Kontakte:this.index_information.kontakte,
+            };
+        },
+        
+    },
+  
+     mounted(){
+
+        console.log(this.uid);
+        console.log(this.view);
+        console.log(typeof this.view);
+        if(this.view){console.log("view is true")}else{ console.log("view is false")}
+
+        //? this function is to update the tabulator information only when the tabulator was build checking the tableBulit event
+        //! only the tableBuilt event of the second tabulator was used to update the table informations
+         
+
+        fhcapifactory.UserData.isMitarbeiterOrStudent(this.uid).then((res) => {
+
+            this.role = this.view? "View_"+res.data: res.data;
+            if(!this.role.includes('View')){
+                this.$refs.betriebsmittelTable.tabulator.on('tableBuilt', () => {
+                }) 
+             }
+
+
+        console.log("the role of the current view: ", this.role);
+        
+    
+
+        //? Die anderen api calls werden erst gemacht wenn der call zu isMitarbeiterOrStudent gemacht worden ist
+
+
+        //! indexProfilInformationen werden immer gefetcht
+        fhcapifactory.UserData.indexProfilInformaion(this.uid,this.view).then((res) => {
+            console.log(res.data);
+            this.index_information = res.data;
+            if(!this.role.includes("View")){
+            this.$refs.betriebsmittelTable.tabulator.setData(res.data.mittel);
+        }
+        });
+        
+
+        //? Danach werden die Informationen der Role gefetcht
+        if(this.role === "Student" || this.role === "View_Student"){ 
+            fhcapifactory.UserData.studentProfil(this.uid,this.view).then((res)=> {
+                this.student_info = res.data;
+                if(this.role ==="Student"){
+                this.$refs.zutrittsgruppenTable.tabulator.setData(res.data.zuttritsgruppen);
+                }
+            })
+        }
+        
+        if(this.role === "Mitarbeiter" || this.role === "View_Mitarbeiter"){
+            fhcapifactory.UserData.mitarbeiterProfil(this.uid).then((res)=> {
+                this.mitarbeiter_info = res.data;
+                this.$refs.funktionenTable.tabulator.setData(res.data.funktionen);
+            })
+        }   
+    });
+
+        
+        
+    },
+     
+    template: `
+   
+    <p>MitarbeiterProfil</p>
+    `,
+};
\ No newline at end of file
diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
new file mode 100644
index 000000000..b259aa074
--- /dev/null
+++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
@@ -0,0 +1,218 @@
+
+import fhcapifactory from "../../../apps/api/fhcapifactory.js";
+import {CoreFilterCmpt} from "../../../components/filter/Filter.js"
+
+//? possible types of roles:
+//! depending on the role of the current view, different content is being displayed and fetched
+//* Student
+//* Mitarbeiter
+//* View_Student
+//* View_Mitarbeiter
+
+export default {
+    components:{
+        CoreFilterCmpt,
+    },
+    data() {
+        return {
+            index_information: null,
+            mitarbeiter_info: null,
+            student_info:null,
+            //? beinhaltet die Information ob der angefragte user ein Student oder Mitarbeiter ist
+            role: null,
+
+            funktionen_table_options: {
+                height: 300,
+                layout: 'fitColumns',
+                data:[{Bezeichnung:"",Organisationseinheit:"",Gültig_von:"",Gültig_bis:"",Wochenstunden:""}],
+                columns: [{title: 'Bezeichnung', field: 'Bezeichnung', headerFilter: true},
+                {title: 'Organisationseinheit', field: 'Organisationseinheit', headerFilter: true},
+                {title: 'Gültig_von', field: 'Gültig_von', headerFilter: true},
+                {title: 'Gültig_bis', field: 'Gültig_bis', headerFilter: true},
+                {title: 'Wochenstunden', field: 'Wochenstunden', headerFilter: true},]
+                
+            },
+            betriebsmittel_table_options:{
+                height: 300,
+                layout: 'fitColumns',
+                data:[{betriebsmittel:"",Nummer:"",Ausgegeben_am:""}],
+                columns: [{title: 'Betriebsmittel', field: 'betriebsmittel', headerFilter: true},
+                {title: 'Nummer', field: 'Nummer', headerFilter: true},
+                {title: 'Ausgegeben_am', field: 'Ausgegeben_am', headerFilter: true},]
+                
+            },
+            zutrittsgruppen_table_options:{
+                height: 300,
+                layout: 'fitColumns',
+                data:[{bezeichnung:"test1"}],
+                columns: [{title: 'Zutritt', field: 'bezeichnung'}]
+            }
+        }
+    },
+    
+    //? this props were passed in the Profil.php view file
+    props:['uid','view'],
+    methods: {
+        
+        concatenate_addresses(address_array){
+            let result = "";
+            for (let i = 0; i < address_array.length; i++) {
+                result += address_array[i].strasse + " " + address_array[i].plz + " " + address_array[i].ort + "\n";
+            }
+            return result;
+        },
+        render_unterelement(wert,bezeichnung){
+            if (isArray(bezeichnung)){
+                
+            }
+        },
+        concatenate_kontakte(kontakt_array){
+            let result = "";
+            for (let i = 0; i < kontakt_array.length; i++) {
+                result += kontakt_array[i].kontakttyp + " " + kontakt_array[i].kontakt + " " + kontakt_array[i].zustellung + "\n";
+            }
+            return result;
+        },
+        sperre_foto_function(value){
+            if(!(this.mitarbeiter_info && this.index_information && this.student_info) ){
+                return;
+            }
+            fhcapifactory.UserData.sperre_foto_function(value).then(res => {
+                    
+                    this.index_information.foto_sperre = res.data.foto_sperre;
+                
+            });
+            
+        },
+        
+        
+    },
+    computed:{
+     
+        
+        get_image_base64_src(){
+            if(!this.index_information){
+                return "";
+            }
+            return "data:image/jpeg;base64,"+this.index_information.foto;
+        },
+        personData(){
+            if(!this.index_information){
+                return {};
+            }
+  
+           return {
+                Allgemein: (this.role =='Mitarbeiter' || this.role =='View_Mitarbeiter')?{
+                    Username:this.index_information.username,
+                    Anrede:this.index_information.anrede,
+                    Titel:this.index_information.titel,
+                    Vorname:this.index_information.vorname,
+                    Nachname:this.index_information.nachname,
+                    Postnomen:this.index_information.postnomen,
+            }:{
+                Username:this.index_information.username,
+                Matrikelnummer: this.student_info?.matrikelnummer,
+                Anrede:this.index_information.anrede,
+                Titel:this.index_information.titel,
+                Vorname:this.index_information.vorname,
+                Nachname:this.index_information.nachname,
+                Postnomen:this.index_information.postnomen,
+            },
+            GeburtsDaten:!this.role.includes("View")?{
+                Geburtsdatum:this.index_information.gebdatum,
+                Geburtsort: this.index_information.gebort,
+            }: null,
+                Adressen: this.index_information.adressen,
+            SpecialInformation: this.role =='Mitarbeiter' || this.role === 'View_Mitarbeiter'?  {
+                Kurzzeichen: this.mitarbeiter_info?.kurzbz,
+                Telefon: this.mitarbeiter_info?.telefonklappe,
+                //* Wird das Feld Ort_kurzbz noch gepflegt?
+                ...(this.role === 'View_Mitarbeiter'?{Büro:this.mitarbeiter_info?.ort_kurzbz}:{}) ,
+            } : {
+                Studiengang:this.student_info?.studiengang,
+                Semester:this.student_info?.semester,
+                Verband:this.student_info?.verband,
+                Gruppe:this.student_info?.gruppe,
+                Personenkennzeichen:this.student_info?.personenkennzeichen
+            },
+            };
+        },
+        //? this computed conains all the information that is used for the second column that displays the information of the person
+        kontaktInfo(){
+            if(!this.index_information){
+                return {};
+            }
+         
+           return {
+                FhAusweisStatus: this.index_information.zutrittsdatum,
+                emails: this.role === 'Mitarbeiter' || this.role === 'View_Mitarbeiter'?  this.mitarbeiter_info?.emails: this.index_information.emails,
+                Kontakte:this.index_information.kontakte,
+            };
+        },
+        
+    },
+  
+     mounted(){
+
+        console.log(this.uid);
+        console.log(this.view);
+        console.log(typeof this.view);
+        if(this.view){console.log("view is true")}else{ console.log("view is false")}
+
+        //? this function is to update the tabulator information only when the tabulator was build checking the tableBulit event
+        //! only the tableBuilt event of the second tabulator was used to update the table informations
+         
+
+        fhcapifactory.UserData.isMitarbeiterOrStudent(this.uid).then((res) => {
+
+            this.role = this.view? "View_"+res.data: res.data;
+            if(!this.role.includes('View')){
+                this.$refs.betriebsmittelTable.tabulator.on('tableBuilt', () => {
+                }) 
+             }
+
+
+        console.log("the role of the current view: ", this.role);
+        
+    
+
+        //? Die anderen api calls werden erst gemacht wenn der call zu isMitarbeiterOrStudent gemacht worden ist
+
+
+        //! indexProfilInformationen werden immer gefetcht
+        fhcapifactory.UserData.indexProfilInformaion(this.uid,this.view).then((res) => {
+            console.log(res.data);
+            this.index_information = res.data;
+            if(!this.role.includes("View")){
+            this.$refs.betriebsmittelTable.tabulator.setData(res.data.mittel);
+        }
+        });
+        
+
+        //? Danach werden die Informationen der Role gefetcht
+        if(this.role === "Student" || this.role === "View_Student"){ 
+            fhcapifactory.UserData.studentProfil(this.uid,this.view).then((res)=> {
+                this.student_info = res.data;
+                if(this.role ==="Student"){
+                this.$refs.zutrittsgruppenTable.tabulator.setData(res.data.zuttritsgruppen);
+                }
+            })
+        }
+        
+        if(this.role === "Mitarbeiter" || this.role === "View_Mitarbeiter"){
+            fhcapifactory.UserData.mitarbeiterProfil(this.uid).then((res)=> {
+                this.mitarbeiter_info = res.data;
+                this.$refs.funktionenTable.tabulator.setData(res.data.funktionen);
+            })
+        }   
+    });
+
+        
+        
+    },
+     
+    template: `
+   
+    <p>MitarbeiterViewProfil</p>
+    `,
+};
\ No newline at end of file
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
new file mode 100644
index 000000000..ffe63e952
--- /dev/null
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -0,0 +1,218 @@
+
+import fhcapifactory from "../../../apps/api/fhcapifactory.js";
+import {CoreFilterCmpt} from "../../../components/filter/Filter.js"
+
+//? possible types of roles:
+//! depending on the role of the current view, different content is being displayed and fetched
+//* Student
+//* Mitarbeiter
+//* View_Student
+//* View_Mitarbeiter
+
+export default {
+    components:{
+        CoreFilterCmpt,
+    },
+    data() {
+        return {
+            index_information: null,
+            mitarbeiter_info: null,
+            student_info:null,
+            //? beinhaltet die Information ob der angefragte user ein Student oder Mitarbeiter ist
+            role: null,
+
+            funktionen_table_options: {
+                height: 300,
+                layout: 'fitColumns',
+                data:[{Bezeichnung:"",Organisationseinheit:"",Gültig_von:"",Gültig_bis:"",Wochenstunden:""}],
+                columns: [{title: 'Bezeichnung', field: 'Bezeichnung', headerFilter: true},
+                {title: 'Organisationseinheit', field: 'Organisationseinheit', headerFilter: true},
+                {title: 'Gültig_von', field: 'Gültig_von', headerFilter: true},
+                {title: 'Gültig_bis', field: 'Gültig_bis', headerFilter: true},
+                {title: 'Wochenstunden', field: 'Wochenstunden', headerFilter: true},]
+                
+            },
+            betriebsmittel_table_options:{
+                height: 300,
+                layout: 'fitColumns',
+                data:[{betriebsmittel:"",Nummer:"",Ausgegeben_am:""}],
+                columns: [{title: 'Betriebsmittel', field: 'betriebsmittel', headerFilter: true},
+                {title: 'Nummer', field: 'Nummer', headerFilter: true},
+                {title: 'Ausgegeben_am', field: 'Ausgegeben_am', headerFilter: true},]
+                
+            },
+            zutrittsgruppen_table_options:{
+                height: 300,
+                layout: 'fitColumns',
+                data:[{bezeichnung:"test1"}],
+                columns: [{title: 'Zutritt', field: 'bezeichnung'}]
+            }
+        }
+    },
+    
+    //? this props were passed in the Profil.php view file
+    props:['uid','view'],
+    methods: {
+        
+        concatenate_addresses(address_array){
+            let result = "";
+            for (let i = 0; i < address_array.length; i++) {
+                result += address_array[i].strasse + " " + address_array[i].plz + " " + address_array[i].ort + "\n";
+            }
+            return result;
+        },
+        render_unterelement(wert,bezeichnung){
+            if (isArray(bezeichnung)){
+                
+            }
+        },
+        concatenate_kontakte(kontakt_array){
+            let result = "";
+            for (let i = 0; i < kontakt_array.length; i++) {
+                result += kontakt_array[i].kontakttyp + " " + kontakt_array[i].kontakt + " " + kontakt_array[i].zustellung + "\n";
+            }
+            return result;
+        },
+        sperre_foto_function(value){
+            if(!(this.mitarbeiter_info && this.index_information && this.student_info) ){
+                return;
+            }
+            fhcapifactory.UserData.sperre_foto_function(value).then(res => {
+                    
+                    this.index_information.foto_sperre = res.data.foto_sperre;
+                
+            });
+            
+        },
+        
+        
+    },
+    computed:{
+     
+        
+        get_image_base64_src(){
+            if(!this.index_information){
+                return "";
+            }
+            return "data:image/jpeg;base64,"+this.index_information.foto;
+        },
+        personData(){
+            if(!this.index_information){
+                return {};
+            }
+  
+           return {
+                Allgemein: (this.role =='Mitarbeiter' || this.role =='View_Mitarbeiter')?{
+                    Username:this.index_information.username,
+                    Anrede:this.index_information.anrede,
+                    Titel:this.index_information.titel,
+                    Vorname:this.index_information.vorname,
+                    Nachname:this.index_information.nachname,
+                    Postnomen:this.index_information.postnomen,
+            }:{
+                Username:this.index_information.username,
+                Matrikelnummer: this.student_info?.matrikelnummer,
+                Anrede:this.index_information.anrede,
+                Titel:this.index_information.titel,
+                Vorname:this.index_information.vorname,
+                Nachname:this.index_information.nachname,
+                Postnomen:this.index_information.postnomen,
+            },
+            GeburtsDaten:!this.role.includes("View")?{
+                Geburtsdatum:this.index_information.gebdatum,
+                Geburtsort: this.index_information.gebort,
+            }: null,
+                Adressen: this.index_information.adressen,
+            SpecialInformation: this.role =='Mitarbeiter' || this.role === 'View_Mitarbeiter'?  {
+                Kurzzeichen: this.mitarbeiter_info?.kurzbz,
+                Telefon: this.mitarbeiter_info?.telefonklappe,
+                //* Wird das Feld Ort_kurzbz noch gepflegt?
+                ...(this.role === 'View_Mitarbeiter'?{Büro:this.mitarbeiter_info?.ort_kurzbz}:{}) ,
+            } : {
+                Studiengang:this.student_info?.studiengang,
+                Semester:this.student_info?.semester,
+                Verband:this.student_info?.verband,
+                Gruppe:this.student_info?.gruppe,
+                Personenkennzeichen:this.student_info?.personenkennzeichen
+            },
+            };
+        },
+        //? this computed conains all the information that is used for the second column that displays the information of the person
+        kontaktInfo(){
+            if(!this.index_information){
+                return {};
+            }
+         
+           return {
+                FhAusweisStatus: this.index_information.zutrittsdatum,
+                emails: this.role === 'Mitarbeiter' || this.role === 'View_Mitarbeiter'?  this.mitarbeiter_info?.emails: this.index_information.emails,
+                Kontakte:this.index_information.kontakte,
+            };
+        },
+        
+    },
+  
+     mounted(){
+
+        console.log(this.uid);
+        console.log(this.view);
+        console.log(typeof this.view);
+        if(this.view){console.log("view is true")}else{ console.log("view is false")}
+
+        //? this function is to update the tabulator information only when the tabulator was build checking the tableBulit event
+        //! only the tableBuilt event of the second tabulator was used to update the table informations
+         
+
+        fhcapifactory.UserData.isMitarbeiterOrStudent(this.uid).then((res) => {
+
+            this.role = this.view? "View_"+res.data: res.data;
+            if(!this.role.includes('View')){
+                this.$refs.betriebsmittelTable.tabulator.on('tableBuilt', () => {
+                }) 
+             }
+
+
+        console.log("the role of the current view: ", this.role);
+        
+    
+
+        //? Die anderen api calls werden erst gemacht wenn der call zu isMitarbeiterOrStudent gemacht worden ist
+
+
+        //! indexProfilInformationen werden immer gefetcht
+        fhcapifactory.UserData.indexProfilInformaion(this.uid,this.view).then((res) => {
+            console.log(res.data);
+            this.index_information = res.data;
+            if(!this.role.includes("View")){
+            this.$refs.betriebsmittelTable.tabulator.setData(res.data.mittel);
+        }
+        });
+        
+
+        //? Danach werden die Informationen der Role gefetcht
+        if(this.role === "Student" || this.role === "View_Student"){ 
+            fhcapifactory.UserData.studentProfil(this.uid,this.view).then((res)=> {
+                this.student_info = res.data;
+                if(this.role ==="Student"){
+                this.$refs.zutrittsgruppenTable.tabulator.setData(res.data.zuttritsgruppen);
+                }
+            })
+        }
+        
+        if(this.role === "Mitarbeiter" || this.role === "View_Mitarbeiter"){
+            fhcapifactory.UserData.mitarbeiterProfil(this.uid).then((res)=> {
+                this.mitarbeiter_info = res.data;
+                this.$refs.funktionenTable.tabulator.setData(res.data.funktionen);
+            })
+        }   
+    });
+
+        
+        
+    },
+     
+    template: `
+   
+    <p>StudentProfil</p>
+    `,
+};
\ No newline at end of file
diff --git a/public/js/components/Cis/Profil/StudentViewProfil.js b/public/js/components/Cis/Profil/StudentViewProfil.js
new file mode 100644
index 000000000..65484fd2e
--- /dev/null
+++ b/public/js/components/Cis/Profil/StudentViewProfil.js
@@ -0,0 +1,218 @@
+
+import fhcapifactory from "../../../apps/api/fhcapifactory.js";
+import {CoreFilterCmpt} from "../../../components/filter/Filter.js"
+
+//? possible types of roles:
+//! depending on the role of the current view, different content is being displayed and fetched
+//* Student
+//* Mitarbeiter
+//* View_Student
+//* View_Mitarbeiter
+
+export default {
+    components:{
+        CoreFilterCmpt,
+    },
+    data() {
+        return {
+            index_information: null,
+            mitarbeiter_info: null,
+            student_info:null,
+            //? beinhaltet die Information ob der angefragte user ein Student oder Mitarbeiter ist
+            role: null,
+
+            funktionen_table_options: {
+                height: 300,
+                layout: 'fitColumns',
+                data:[{Bezeichnung:"",Organisationseinheit:"",Gültig_von:"",Gültig_bis:"",Wochenstunden:""}],
+                columns: [{title: 'Bezeichnung', field: 'Bezeichnung', headerFilter: true},
+                {title: 'Organisationseinheit', field: 'Organisationseinheit', headerFilter: true},
+                {title: 'Gültig_von', field: 'Gültig_von', headerFilter: true},
+                {title: 'Gültig_bis', field: 'Gültig_bis', headerFilter: true},
+                {title: 'Wochenstunden', field: 'Wochenstunden', headerFilter: true},]
+                
+            },
+            betriebsmittel_table_options:{
+                height: 300,
+                layout: 'fitColumns',
+                data:[{betriebsmittel:"",Nummer:"",Ausgegeben_am:""}],
+                columns: [{title: 'Betriebsmittel', field: 'betriebsmittel', headerFilter: true},
+                {title: 'Nummer', field: 'Nummer', headerFilter: true},
+                {title: 'Ausgegeben_am', field: 'Ausgegeben_am', headerFilter: true},]
+                
+            },
+            zutrittsgruppen_table_options:{
+                height: 300,
+                layout: 'fitColumns',
+                data:[{bezeichnung:"test1"}],
+                columns: [{title: 'Zutritt', field: 'bezeichnung'}]
+            }
+        }
+    },
+    
+    //? this props were passed in the Profil.php view file
+    props:['uid','view'],
+    methods: {
+        
+        concatenate_addresses(address_array){
+            let result = "";
+            for (let i = 0; i < address_array.length; i++) {
+                result += address_array[i].strasse + " " + address_array[i].plz + " " + address_array[i].ort + "\n";
+            }
+            return result;
+        },
+        render_unterelement(wert,bezeichnung){
+            if (isArray(bezeichnung)){
+                
+            }
+        },
+        concatenate_kontakte(kontakt_array){
+            let result = "";
+            for (let i = 0; i < kontakt_array.length; i++) {
+                result += kontakt_array[i].kontakttyp + " " + kontakt_array[i].kontakt + " " + kontakt_array[i].zustellung + "\n";
+            }
+            return result;
+        },
+        sperre_foto_function(value){
+            if(!(this.mitarbeiter_info && this.index_information && this.student_info) ){
+                return;
+            }
+            fhcapifactory.UserData.sperre_foto_function(value).then(res => {
+                    
+                    this.index_information.foto_sperre = res.data.foto_sperre;
+                
+            });
+            
+        },
+        
+        
+    },
+    computed:{
+     
+        
+        get_image_base64_src(){
+            if(!this.index_information){
+                return "";
+            }
+            return "data:image/jpeg;base64,"+this.index_information.foto;
+        },
+        personData(){
+            if(!this.index_information){
+                return {};
+            }
+  
+           return {
+                Allgemein: (this.role =='Mitarbeiter' || this.role =='View_Mitarbeiter')?{
+                    Username:this.index_information.username,
+                    Anrede:this.index_information.anrede,
+                    Titel:this.index_information.titel,
+                    Vorname:this.index_information.vorname,
+                    Nachname:this.index_information.nachname,
+                    Postnomen:this.index_information.postnomen,
+            }:{
+                Username:this.index_information.username,
+                Matrikelnummer: this.student_info?.matrikelnummer,
+                Anrede:this.index_information.anrede,
+                Titel:this.index_information.titel,
+                Vorname:this.index_information.vorname,
+                Nachname:this.index_information.nachname,
+                Postnomen:this.index_information.postnomen,
+            },
+            GeburtsDaten:!this.role.includes("View")?{
+                Geburtsdatum:this.index_information.gebdatum,
+                Geburtsort: this.index_information.gebort,
+            }: null,
+                Adressen: this.index_information.adressen,
+            SpecialInformation: this.role =='Mitarbeiter' || this.role === 'View_Mitarbeiter'?  {
+                Kurzzeichen: this.mitarbeiter_info?.kurzbz,
+                Telefon: this.mitarbeiter_info?.telefonklappe,
+                //* Wird das Feld Ort_kurzbz noch gepflegt?
+                ...(this.role === 'View_Mitarbeiter'?{Büro:this.mitarbeiter_info?.ort_kurzbz}:{}) ,
+            } : {
+                Studiengang:this.student_info?.studiengang,
+                Semester:this.student_info?.semester,
+                Verband:this.student_info?.verband,
+                Gruppe:this.student_info?.gruppe,
+                Personenkennzeichen:this.student_info?.personenkennzeichen
+            },
+            };
+        },
+        //? this computed conains all the information that is used for the second column that displays the information of the person
+        kontaktInfo(){
+            if(!this.index_information){
+                return {};
+            }
+         
+           return {
+                FhAusweisStatus: this.index_information.zutrittsdatum,
+                emails: this.role === 'Mitarbeiter' || this.role === 'View_Mitarbeiter'?  this.mitarbeiter_info?.emails: this.index_information.emails,
+                Kontakte:this.index_information.kontakte,
+            };
+        },
+        
+    },
+  
+     mounted(){
+
+        console.log(this.uid);
+        console.log(this.view);
+        console.log(typeof this.view);
+        if(this.view){console.log("view is true")}else{ console.log("view is false")}
+
+        //? this function is to update the tabulator information only when the tabulator was build checking the tableBulit event
+        //! only the tableBuilt event of the second tabulator was used to update the table informations
+         
+
+        fhcapifactory.UserData.isMitarbeiterOrStudent(this.uid).then((res) => {
+
+            this.role = this.view? "View_"+res.data: res.data;
+            if(!this.role.includes('View')){
+                this.$refs.betriebsmittelTable.tabulator.on('tableBuilt', () => {
+                }) 
+             }
+
+
+        console.log("the role of the current view: ", this.role);
+        
+    
+
+        //? Die anderen api calls werden erst gemacht wenn der call zu isMitarbeiterOrStudent gemacht worden ist
+
+
+        //! indexProfilInformationen werden immer gefetcht
+        fhcapifactory.UserData.indexProfilInformaion(this.uid,this.view).then((res) => {
+            console.log(res.data);
+            this.index_information = res.data;
+            if(!this.role.includes("View")){
+            this.$refs.betriebsmittelTable.tabulator.setData(res.data.mittel);
+        }
+        });
+        
+
+        //? Danach werden die Informationen der Role gefetcht
+        if(this.role === "Student" || this.role === "View_Student"){ 
+            fhcapifactory.UserData.studentProfil(this.uid,this.view).then((res)=> {
+                this.student_info = res.data;
+                if(this.role ==="Student"){
+                this.$refs.zutrittsgruppenTable.tabulator.setData(res.data.zuttritsgruppen);
+                }
+            })
+        }
+        
+        if(this.role === "Mitarbeiter" || this.role === "View_Mitarbeiter"){
+            fhcapifactory.UserData.mitarbeiterProfil(this.uid).then((res)=> {
+                this.mitarbeiter_info = res.data;
+                this.$refs.funktionenTable.tabulator.setData(res.data.funktionen);
+            })
+        }   
+    });
+
+        
+        
+    },
+     
+    template: `
+   
+    <p>StudentViewProfil</p>
+    `,
+};
\ No newline at end of file

From 0d3c55b019a66a8ea26631c8fbb1f1c5cf204652 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Tue, 5 Dec 2023 13:52:31 +0100
Subject: [PATCH 0208/1461] dynamic component inside the profil app now
 controlls the view and the data

---
 application/controllers/Cis/Profil.php        |  84 ++--
 public/js/apps/Cis/Profil.js                  |  11 +-
 .../Cis/Profil/MitarbeiterProfil.js           | 472 +++++++++--------
 .../Cis/Profil/MitarbeiterViewProfil.js       | 465 +++++++++--------
 public/js/components/Cis/Profil/Profil.js     |   2 +-
 .../js/components/Cis/Profil/StudentProfil.js | 474 ++++++++++--------
 .../Cis/Profil/StudentViewProfil.js           | 428 ++++++++--------
 7 files changed, 1089 insertions(+), 847 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index 8a731e085..27da9a07b 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -148,11 +148,17 @@ class Profil extends Auth_Controller
 				$person_res = hasData($person_res)? getData($person_res)[0] : null;
 			}
 		}
-		$mitarbeiter_res = $this->MitarbeiterModel->load($uid);
-		if(isError($mitarbeiter_res)){
-			// error handling
-		}else{
-			$mitarbeiter_res = hasData($mitarbeiter_res)? getData($mitarbeiter_res)[0] : null;
+
+
+		if(isSuccess($this->MitarbeiterModel->addSelect(["kurzbz","telefonklappe", "alias","ort_kurzbz"]))
+			&& isSuccess($this->MitarbeiterModel->addJoin("tbl_benutzer", "tbl_benutzer.uid = tbl_mitarbeiter.mitarbeiter_uid")))
+		{
+			$mitarbeiter_res = $this->MitarbeiterModel->load($uid);
+			if(isError($mitarbeiter_res)){
+				// error handling
+			}else{
+				$mitarbeiter_res = hasData($mitarbeiter_res)? getData($mitarbeiter_res)[0] : null;
+			}
 		}
 
 		
@@ -171,11 +177,11 @@ class Profil extends Auth_Controller
 		$res->nachname = $person_res->nachname;
 		
 		
-		$res->gebdatum = $person_res->gebdatum;
-		$res->gebort = $person_res->gebort;
 		//? Mitarbeiter Info
-		$res->kurzbz = $mitarbeiter_res->kurzbz;
-		$res->telefonklappe = $mitarbeiter_res->telefonklappe;
+		foreach($mitarbeiter_res as $key => $val){
+			$res->$key = $val;
+
+		}
 		//? Email Info 
 		$intern_email = array();
 		$intern_email+=array("type" => "intern");
@@ -184,20 +190,14 @@ class Profil extends Auth_Controller
 		$extern_email+=array("type" => "alias");
 		$extern_email+=array("email" => $benutzer_res->alias . "@" . DOMAIN);
 		$res->emails = array($intern_email,$extern_email);
-		//? Adresse Info 
-		$res->adressen = $adresse_res;
+	
 		//? Benutzerfunktion Info
 		$res->funktionen = $benutzer_funktion_res;
-		//? Betriebsmittel Info
-		$res->mittel = $betriebsmittelperson_res;
-		//? Austellungsdatum von der Zutrittskarte
-		$res->zutrittskarte_ausgegebenam = $zutrittskarte_ausgegebenam;
-		//? Kontakt Info
-		$res->kontakte = $kontakte_res;
+	
 		//? Mailverteiler Info
 		$res->mailverteiler = $mailverteiler_res;
 		 
-		echo json_encode($res);
+		return $res;
 
 	}
 
@@ -276,7 +276,11 @@ class Profil extends Auth_Controller
 	
 		$res->postnomen = $person_res->titelpost; 
 		
-		$res->internal_email= $uid . "@" . DOMAIN;
+		$intern_email = array();
+			$intern_email+=array("type" => "intern");
+			$intern_email+=array("email"=> getAuthUID() . "@" . DOMAIN);
+		
+			$res->emails = array($intern_email);
 	
 	
 		
@@ -296,8 +300,7 @@ class Profil extends Auth_Controller
 	}
 
 	private function mitarbeiterProfil(){
-		//? informationen die nur für den Mitarbeiter verfügbar sind
-	//? Data for the Mitarbeiter view
+		
 
 			//? betriebsmittel soll nur der user selber sehen
 			if(
@@ -457,12 +460,9 @@ class Profil extends Auth_Controller
 			
 			$res->funktionen = $benutzer_funktion_res;
 			return $res;
-		}
+	}
 	
 	
-	
-
-
 	private function studentProfil(){
 
 
@@ -619,7 +619,12 @@ class Profil extends Auth_Controller
 	
 		$res->postnomen = $person_res->titelpost; 
 		
-		$res->internal_email= getAuthUID() . "@" . DOMAIN;
+
+		$intern_email = array();
+		$intern_email+=array("type" => "intern");
+		$intern_email+=array("email"=> getAuthUID() . "@" . DOMAIN);
+		
+		$res->emails = array($intern_email);
 		$res->adressen = $adresse_res;
 		$res->zutrittsdatum = $zutrittskarte_ausgegebenam;
 		$res->kontakte = $kontakte_res;
@@ -662,18 +667,8 @@ class Profil extends Auth_Controller
 		$isMitarbeiter = hasData($isMitarbeiter) ? getData($isMitarbeiter) : null;
 		
 		$res = new stdClass();
-	
-		if($uid){
-			// if an $uid was passed as payload to the function then the user is trying to view another profile
-			if($isMitarbeiter ){
-				 $res->view= "ViewMitarbeiterProfil";
-				 $res->data= $this->viewMitarbeiterProfil($uid);
-			}
-			else {
-				$res->view= "ViewStudentProfil";
-				$res->data= $this->viewStudentProfil($uid);
-			}
-		}else{
+		
+		if($uid == getAuthUID() || !$uid ){
 			// if the $uid is empty, then no payload was supplied and the own profile is being requested
 			if($isMitarbeiter ) {
 				$res->view= "MitarbeiterProfil";
@@ -684,10 +679,21 @@ class Profil extends Auth_Controller
 				$res->data = $this->studentProfil();
 			}
 		}
+		elseif($uid){
+			// if an $uid was passed as payload to the function then the user is trying to view another profile
+			if($isMitarbeiter ){
+				 $res->view= "ViewMitarbeiterProfil";
+				 $res->data= $this->viewMitarbeiterProfil($uid);
+			}
+			else {
+				$res->view= "ViewStudentProfil";
+				$res->data= $this->viewStudentProfil($uid);
+			}
+		}
 
 
 		echo json_encode($res);
-		return;
+		
 		
 
 		
diff --git a/public/js/apps/Cis/Profil.js b/public/js/apps/Cis/Profil.js
index 93f951272..af86d2ea2 100644
--- a/public/js/apps/Cis/Profil.js
+++ b/public/js/apps/Cis/Profil.js
@@ -20,6 +20,7 @@ const app = Vue.createApp({
 	data() {
 		return {
 			view:null,
+			data:null,
 			
 		}
 	},
@@ -38,16 +39,16 @@ const app = Vue.createApp({
 		};
 
 		Vue.$fhcapi.UserData.getView(payload).then((res)=>{
-			//this.view = res.data.view;
-			//this.data = res.data.data;
+			this.view = res.data.view;
+			this.data = res.data.data;
 			console.log(res.data);
 		});
 	},
 	template:`
 	<div>
-	<p>test element</p>
-	<!--<StudentProfil></StudentProfil>-->
-	<component :is="view"></component>
+	
+	
+	<component :is="view" :data="data" ></component>
 	</div>`
 	
 	
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 5e5448027..45897eb82 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -1,6 +1,5 @@
-
 import fhcapifactory from "../../../apps/api/fhcapifactory.js";
-import {CoreFilterCmpt} from "../../../components/filter/Filter.js"
+import { CoreFilterCmpt } from "../../../components/filter/Filter.js";
 
 //? possible types of roles:
 //! depending on the role of the current view, different content is being displayed and fetched
@@ -10,209 +9,282 @@ import {CoreFilterCmpt} from "../../../components/filter/Filter.js"
 //* View_Mitarbeiter
 
 export default {
-    components:{
-        CoreFilterCmpt,
-    },
-    data() {
-        return {
-            index_information: null,
-            mitarbeiter_info: null,
-            student_info:null,
-            //? beinhaltet die Information ob der angefragte user ein Student oder Mitarbeiter ist
-            role: null,
+  components: {
+    CoreFilterCmpt,
+  },
+  data() {
+    return {
+      index_information: null,
+      mitarbeiter_info: null,
+      student_info: null,
+      //? beinhaltet die Information ob der angefragte user ein Student oder Mitarbeiter ist
+      role: null,
 
-            funktionen_table_options: {
-                height: 300,
-                layout: 'fitColumns',
-                data:[{Bezeichnung:"",Organisationseinheit:"",Gültig_von:"",Gültig_bis:"",Wochenstunden:""}],
-                columns: [{title: 'Bezeichnung', field: 'Bezeichnung', headerFilter: true},
-                {title: 'Organisationseinheit', field: 'Organisationseinheit', headerFilter: true},
-                {title: 'Gültig_von', field: 'Gültig_von', headerFilter: true},
-                {title: 'Gültig_bis', field: 'Gültig_bis', headerFilter: true},
-                {title: 'Wochenstunden', field: 'Wochenstunden', headerFilter: true},]
-                
-            },
-            betriebsmittel_table_options:{
-                height: 300,
-                layout: 'fitColumns',
-                data:[{betriebsmittel:"",Nummer:"",Ausgegeben_am:""}],
-                columns: [{title: 'Betriebsmittel', field: 'betriebsmittel', headerFilter: true},
-                {title: 'Nummer', field: 'Nummer', headerFilter: true},
-                {title: 'Ausgegeben_am', field: 'Ausgegeben_am', headerFilter: true},]
-                
-            },
-            zutrittsgruppen_table_options:{
-                height: 300,
-                layout: 'fitColumns',
-                data:[{bezeichnung:"test1"}],
-                columns: [{title: 'Zutritt', field: 'bezeichnung'}]
-            }
-        }
+      funktionen_table_options: {
+        height: 300,
+        layout: "fitColumns",
+        data: [
+          {
+            Bezeichnung: "",
+            Organisationseinheit: "",
+            Gültig_von: "",
+            Gültig_bis: "",
+            Wochenstunden: "",
+          },
+        ],
+        columns: [
+          { title: "Bezeichnung", field: "Bezeichnung", headerFilter: true },
+          {
+            title: "Organisationseinheit",
+            field: "Organisationseinheit",
+            headerFilter: true,
+          },
+          { title: "Gültig_von", field: "Gültig_von", headerFilter: true },
+          { title: "Gültig_bis", field: "Gültig_bis", headerFilter: true },
+          {
+            title: "Wochenstunden",
+            field: "Wochenstunden",
+            headerFilter: true,
+          },
+        ],
+      },
+      betriebsmittel_table_options: {
+        height: 300,
+        layout: "fitColumns",
+        data: [{ betriebsmittel: "", Nummer: "", Ausgegeben_am: "" }],
+        columns: [
+          {
+            title: "Betriebsmittel",
+            field: "betriebsmittel",
+            headerFilter: true,
+          },
+          { title: "Nummer", field: "Nummer", headerFilter: true },
+          {
+            title: "Ausgegeben_am",
+            field: "Ausgegeben_am",
+            headerFilter: true,
+          },
+        ],
+      },
+      zutrittsgruppen_table_options: {
+        height: 300,
+        layout: "fitColumns",
+        data: [{ bezeichnung: "test1" }],
+        columns: [{ title: "Zutritt", field: "bezeichnung" }],
+      },
+    };
+  },
+
+  //? this props were passed in the Profil.php view file
+  props: ["data"],
+  methods: {
+    concatenate_addresses(address_array) {
+      let result = "";
+      for (let i = 0; i < address_array.length; i++) {
+        result +=
+          address_array[i].strasse +
+          " " +
+          address_array[i].plz +
+          " " +
+          address_array[i].ort +
+          "\n";
+      }
+      return result;
     },
+    render_unterelement(wert, bezeichnung) {
+      if (isArray(bezeichnung)) {
+      }
+    },
+    concatenate_kontakte(kontakt_array) {
+      let result = "";
+      for (let i = 0; i < kontakt_array.length; i++) {
+        result +=
+          kontakt_array[i].kontakttyp +
+          " " +
+          kontakt_array[i].kontakt +
+          " " +
+          kontakt_array[i].zustellung +
+          "\n";
+      }
+      return result;
+    },
+    sperre_foto_function(value) {
+      if (!this.data) {
+        return;
+      }
+      fhcapifactory.UserData.sperre_foto_function(value).then((res) => {
+        this.data.foto_sperre = res.data.foto_sperre;
+      });
+    },
+  },
+  computed: {
+    get_image_base64_src() {
+      if (!this.data) {
+        return "";
+      }
+      return "data:image/jpeg;base64," + this.data.foto;
+    },
+    personData() {
+      if (!this.data) {
+        return {};
+      }
+
+      return {
+        Allgemein: {
+          Username: this.data.username,
+          Anrede: this.data.anrede,
+          Titel: this.data.titel,
+          Vorname: this.data.vorname,
+          Nachname: this.data.nachname,
+          Postnomen: this.data.postnomen,
+        },
+        GeburtsDaten: {
+          Geburtsdatum: this.data.gebdatum,
+          Geburtsort: this.data.gebort,
+        },
+        Adressen: this.data.adressen,
+        SpecialInformation:  {
+            Kurzzeichen: this.data.kurzbz,
+            Telefon: this.data.telefonklappe,
+            Büro:this.data.ort_kurzbz,
+        },
+      };
+    },
+    //? this computed conains all the information that is used for the second column that displays the information of the person
+    kontaktInfo() {
+      if (!this.data) {
+        return {};
+      }
+
+      return {
+        FhAusweisStatus: this.data.zutrittsdatum,
+        emails: this.data.emails,
+        Kontakte: this.data.kontakte,
+      };
+    },
+  },
+
+  mounted() {
+    this.$refs.betriebsmittelTable.tabulator.on('tableBuilt', () => {
     
-    //? this props were passed in the Profil.php view file
-    props:['uid','view'],
-    methods: {
+        this.$refs.betriebsmittelTable.tabulator.setData(this.data.mittel);
         
-        concatenate_addresses(address_array){
-            let result = "";
-            for (let i = 0; i < address_array.length; i++) {
-                result += address_array[i].strasse + " " + address_array[i].plz + " " + address_array[i].ort + "\n";
-            }
-            return result;
-        },
-        render_unterelement(wert,bezeichnung){
-            if (isArray(bezeichnung)){
-                
-            }
-        },
-        concatenate_kontakte(kontakt_array){
-            let result = "";
-            for (let i = 0; i < kontakt_array.length; i++) {
-                result += kontakt_array[i].kontakttyp + " " + kontakt_array[i].kontakt + " " + kontakt_array[i].zustellung + "\n";
-            }
-            return result;
-        },
-        sperre_foto_function(value){
-            if(!(this.mitarbeiter_info && this.index_information && this.student_info) ){
-                return;
-            }
-            fhcapifactory.UserData.sperre_foto_function(value).then(res => {
+    }) 
+
+    this.$refs.funktionenTable.tabulator.on('tableBuilt', () => {
+    
+        this.$refs.funktionenTable.tabulator.setData(this.data.funktionen);
+        
+    }) 
+
+  },
+
+  template: `
+
+
+            <div class="container-fluid">
+            <!-- here starts the row of the whole window -->
+                <div class="row">
+                <!-- this is the left column of the window -->
+                    <div class="col-9">
+                        <div class="row">
+                            <div class="col">
+                                <img class="img-thumbnail" :src="get_image_base64_src"></img>
+                                
+                                <div v-if="data.foto_sperre ">
+                                    <p style="margin:0">Profilfoto gesperrt</p>
+                                    <a href="#" @click.prevent="sperre_foto_function(false)" style="text-decoration:none">Sperre des Profilfotos aufheben</a>
+                                </div>
+                                <a href="#" @click.prevent="sperre_foto_function(true)" style="display:block; text-decoration:none"  v-else>Profilfoto sperren</a>
+                            </div>
+                            
+                          
+                            <div class="col">
+                        
+                        
+                                <h3 >Mitarbeiter</h3>
+                                
+                                <div v-for="(wert,bezeichnung) in personData">
+                                
+                                <div class="mb-3"  v-if="typeof wert == 'object' && bezeichnung=='Adressen'"><span style="display:block" v-for="element in wert">{{element.strasse}} <b>({{element.adr_typ}})</b><br/>{{ element.plz}} {{element.ort}}</span></div>
+                                <div v-else class="mb-3" ><span style="display:block;" v-for="(val,bez) in wert">{{bez}}: {{val}}</span></div>
+                                
+                                </div>
+                                
+                            </div>
+                            <div class="col">
+                                <ol style="list-style:none">
+                                
+                                    <li v-for="(wert,bezeichnung) in kontaktInfo">
+                                    
+                                    <!-- HIER IST DAS DATUM DES FH AUSWEIS -->
+                                        <div class="mb-3" v-if="bezeichnung=='FhAusweisStatus'">
+                                            <p class="mb-0"><b>FH-Ausweis Status</b></p>
+                                            <p class="mb-0">{{"Der FH Ausweis ist am "+ wert+ " ausgegeben worden."}}</p>
+                                        </div>
+
+                                    <!-- HIER SIND DIE EMAILS -->
+                            
+
+                                        <div class="mb-3" v-if="typeof wert === 'object' && bezeichnung == 'emails'">
+                                            <p class="mb-0"><b>eMail</b></p>
+                                            <p v-for="email in wert" class="mb-0">{{email.type}}: <a style="text-decoration:none" :href="'mailto:'+email.email">{{email.email}}</a></p>
+                                        </div>
+
+                                        <!-- HIER SIND DIE PRIVATEN KONTAKTE -->
+                                        <div class="mb-3" v-if="typeof wert === 'object' && bezeichnung=='Kontakte'">
+                                        <p class="mb-0"><b>Private Kontakte</b></p>
+                                            <div class="row" v-for="element in wert" >
+                                                <div class="col-8">{{element.kontakttyp + ":  " + element.kontakt+"  " }}</div>
+                                                <div class="col-2"> {{element?.anmerkung}}</div>
+                                                <div class="col-2"> 
+                                                <i v-if="element.zustellung" class="fa-solid fa-check"></i>
+                                                <i v-else="element.zustellung" class="fa-solid fa-xmark"></i>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    
+                                    </li>
+                                </ol>
+
+
+                            </div>
+                        </div>
+                      
                     
-                    this.index_information.foto_sperre = res.data.foto_sperre;
+                        <div class="row my-5">
+                        
                 
-            });
+                            <div class="col-12">
+                            <core-filter-cmpt title="Funktionen"  ref="funktionenTable" :tabulator-options="funktionen_table_options" :tableOnly />
+                            
+                            </div>
+                            <div class="col-12">
+                            <core-filter-cmpt title="Entlehnte Betriebsmittel"  ref="betriebsmittelTable" :tabulator-options="betriebsmittel_table_options" :tableOnly />
+                            </div>
+                        
+                        </div>
+
+                
+                    </div>
+
+                    <div  class="col-3">
+                        <div style="background-color:#EEEEEE" class="row py-4">
+                        <a style="text-decoration:none" class="my-1" href="#">Zeitwuensche</a>
+                        <a style="text-decoration:none" class="my-1" href="#">Lehrveranstaltungen</a>
+                        <a style="text-decoration:none" class="my-1" href="#">Zeitsperren von Gschnell</a>
+                        </div>
+                        <div class="row">
+                            <h5 class="fs-3" style="margin-top:1em">Mailverteilers</h5>
+                            <p class="fs-6">Sie sind Mitgglied in folgenden Verteilern:</p>
+                            <div  class="row text-break" v-for="verteiler in data?.mailverteiler">
+                                <div class="col-6"><a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a></div> 
+                                <div class="col-6">{{verteiler.beschreibung}}</div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
             
-        },
-        
-        
-    },
-    computed:{
-     
-        
-        get_image_base64_src(){
-            if(!this.index_information){
-                return "";
-            }
-            return "data:image/jpeg;base64,"+this.index_information.foto;
-        },
-        personData(){
-            if(!this.index_information){
-                return {};
-            }
-  
-           return {
-                Allgemein: (this.role =='Mitarbeiter' || this.role =='View_Mitarbeiter')?{
-                    Username:this.index_information.username,
-                    Anrede:this.index_information.anrede,
-                    Titel:this.index_information.titel,
-                    Vorname:this.index_information.vorname,
-                    Nachname:this.index_information.nachname,
-                    Postnomen:this.index_information.postnomen,
-            }:{
-                Username:this.index_information.username,
-                Matrikelnummer: this.student_info?.matrikelnummer,
-                Anrede:this.index_information.anrede,
-                Titel:this.index_information.titel,
-                Vorname:this.index_information.vorname,
-                Nachname:this.index_information.nachname,
-                Postnomen:this.index_information.postnomen,
-            },
-            GeburtsDaten:!this.role.includes("View")?{
-                Geburtsdatum:this.index_information.gebdatum,
-                Geburtsort: this.index_information.gebort,
-            }: null,
-                Adressen: this.index_information.adressen,
-            SpecialInformation: this.role =='Mitarbeiter' || this.role === 'View_Mitarbeiter'?  {
-                Kurzzeichen: this.mitarbeiter_info?.kurzbz,
-                Telefon: this.mitarbeiter_info?.telefonklappe,
-                //* Wird das Feld Ort_kurzbz noch gepflegt?
-                ...(this.role === 'View_Mitarbeiter'?{Büro:this.mitarbeiter_info?.ort_kurzbz}:{}) ,
-            } : {
-                Studiengang:this.student_info?.studiengang,
-                Semester:this.student_info?.semester,
-                Verband:this.student_info?.verband,
-                Gruppe:this.student_info?.gruppe,
-                Personenkennzeichen:this.student_info?.personenkennzeichen
-            },
-            };
-        },
-        //? this computed conains all the information that is used for the second column that displays the information of the person
-        kontaktInfo(){
-            if(!this.index_information){
-                return {};
-            }
-         
-           return {
-                FhAusweisStatus: this.index_information.zutrittsdatum,
-                emails: this.role === 'Mitarbeiter' || this.role === 'View_Mitarbeiter'?  this.mitarbeiter_info?.emails: this.index_information.emails,
-                Kontakte:this.index_information.kontakte,
-            };
-        },
-        
-    },
-  
-     mounted(){
-
-        console.log(this.uid);
-        console.log(this.view);
-        console.log(typeof this.view);
-        if(this.view){console.log("view is true")}else{ console.log("view is false")}
-
-        //? this function is to update the tabulator information only when the tabulator was build checking the tableBulit event
-        //! only the tableBuilt event of the second tabulator was used to update the table informations
-         
-
-        fhcapifactory.UserData.isMitarbeiterOrStudent(this.uid).then((res) => {
-
-            this.role = this.view? "View_"+res.data: res.data;
-            if(!this.role.includes('View')){
-                this.$refs.betriebsmittelTable.tabulator.on('tableBuilt', () => {
-                }) 
-             }
-
-
-        console.log("the role of the current view: ", this.role);
-        
-    
-
-        //? Die anderen api calls werden erst gemacht wenn der call zu isMitarbeiterOrStudent gemacht worden ist
-
-
-        //! indexProfilInformationen werden immer gefetcht
-        fhcapifactory.UserData.indexProfilInformaion(this.uid,this.view).then((res) => {
-            console.log(res.data);
-            this.index_information = res.data;
-            if(!this.role.includes("View")){
-            this.$refs.betriebsmittelTable.tabulator.setData(res.data.mittel);
-        }
-        });
-        
-
-        //? Danach werden die Informationen der Role gefetcht
-        if(this.role === "Student" || this.role === "View_Student"){ 
-            fhcapifactory.UserData.studentProfil(this.uid,this.view).then((res)=> {
-                this.student_info = res.data;
-                if(this.role ==="Student"){
-                this.$refs.zutrittsgruppenTable.tabulator.setData(res.data.zuttritsgruppen);
-                }
-            })
-        }
-        
-        if(this.role === "Mitarbeiter" || this.role === "View_Mitarbeiter"){
-            fhcapifactory.UserData.mitarbeiterProfil(this.uid).then((res)=> {
-                this.mitarbeiter_info = res.data;
-                this.$refs.funktionenTable.tabulator.setData(res.data.funktionen);
-            })
-        }   
-    });
-
-        
-        
-    },
-     
-    template: `
-   
-    <p>MitarbeiterProfil</p>
     `,
-};
\ No newline at end of file
+};
diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
index b259aa074..ad0afd863 100644
--- a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
@@ -1,6 +1,5 @@
-
 import fhcapifactory from "../../../apps/api/fhcapifactory.js";
-import {CoreFilterCmpt} from "../../../components/filter/Filter.js"
+import { CoreFilterCmpt } from "../../../components/filter/Filter.js";
 
 //? possible types of roles:
 //! depending on the role of the current view, different content is being displayed and fetched
@@ -10,209 +9,273 @@ import {CoreFilterCmpt} from "../../../components/filter/Filter.js"
 //* View_Mitarbeiter
 
 export default {
-    components:{
-        CoreFilterCmpt,
-    },
-    data() {
-        return {
-            index_information: null,
-            mitarbeiter_info: null,
-            student_info:null,
-            //? beinhaltet die Information ob der angefragte user ein Student oder Mitarbeiter ist
-            role: null,
+  components: {
+    CoreFilterCmpt,
+  },
+  data() {
+    return {
+      index_information: null,
+      mitarbeiter_info: null,
+      student_info: null,
+      //? beinhaltet die Information ob der angefragte user ein Student oder Mitarbeiter ist
+      role: null,
 
-            funktionen_table_options: {
-                height: 300,
-                layout: 'fitColumns',
-                data:[{Bezeichnung:"",Organisationseinheit:"",Gültig_von:"",Gültig_bis:"",Wochenstunden:""}],
-                columns: [{title: 'Bezeichnung', field: 'Bezeichnung', headerFilter: true},
-                {title: 'Organisationseinheit', field: 'Organisationseinheit', headerFilter: true},
-                {title: 'Gültig_von', field: 'Gültig_von', headerFilter: true},
-                {title: 'Gültig_bis', field: 'Gültig_bis', headerFilter: true},
-                {title: 'Wochenstunden', field: 'Wochenstunden', headerFilter: true},]
-                
-            },
-            betriebsmittel_table_options:{
-                height: 300,
-                layout: 'fitColumns',
-                data:[{betriebsmittel:"",Nummer:"",Ausgegeben_am:""}],
-                columns: [{title: 'Betriebsmittel', field: 'betriebsmittel', headerFilter: true},
-                {title: 'Nummer', field: 'Nummer', headerFilter: true},
-                {title: 'Ausgegeben_am', field: 'Ausgegeben_am', headerFilter: true},]
-                
-            },
-            zutrittsgruppen_table_options:{
-                height: 300,
-                layout: 'fitColumns',
-                data:[{bezeichnung:"test1"}],
-                columns: [{title: 'Zutritt', field: 'bezeichnung'}]
-            }
-        }
+      funktionen_table_options: {
+        height: 300,
+        layout: "fitColumns",
+        data: [
+          {
+            Bezeichnung: "",
+            Organisationseinheit: "",
+            Gültig_von: "",
+            Gültig_bis: "",
+            Wochenstunden: "",
+          },
+        ],
+        columns: [
+          { title: "Bezeichnung", field: "Bezeichnung", headerFilter: true },
+          {
+            title: "Organisationseinheit",
+            field: "Organisationseinheit",
+            headerFilter: true,
+          },
+          { title: "Gültig_von", field: "Gültig_von", headerFilter: true },
+          { title: "Gültig_bis", field: "Gültig_bis", headerFilter: true },
+          {
+            title: "Wochenstunden",
+            field: "Wochenstunden",
+            headerFilter: true,
+          },
+        ],
+      },
+      betriebsmittel_table_options: {
+        height: 300,
+        layout: "fitColumns",
+        data: [{ betriebsmittel: "", Nummer: "", Ausgegeben_am: "" }],
+        columns: [
+          {
+            title: "Betriebsmittel",
+            field: "betriebsmittel",
+            headerFilter: true,
+          },
+          { title: "Nummer", field: "Nummer", headerFilter: true },
+          {
+            title: "Ausgegeben_am",
+            field: "Ausgegeben_am",
+            headerFilter: true,
+          },
+        ],
+      },
+      zutrittsgruppen_table_options: {
+        height: 300,
+        layout: "fitColumns",
+        data: [{ bezeichnung: "test1" }],
+        columns: [{ title: "Zutritt", field: "bezeichnung" }],
+      },
+    };
+  },
+
+  //? this props were passed in the Profil.php view file
+  props: ["data"],
+  methods: {
+    concatenate_addresses(address_array) {
+      let result = "";
+      for (let i = 0; i < address_array.length; i++) {
+        result +=
+          address_array[i].strasse +
+          " " +
+          address_array[i].plz +
+          " " +
+          address_array[i].ort +
+          "\n";
+      }
+      return result;
     },
-    
-    //? this props were passed in the Profil.php view file
-    props:['uid','view'],
-    methods: {
+    render_unterelement(wert, bezeichnung) {
+      if (isArray(bezeichnung)) {
+      }
+    },
+    concatenate_kontakte(kontakt_array) {
+      let result = "";
+      for (let i = 0; i < kontakt_array.length; i++) {
+        result +=
+          kontakt_array[i].kontakttyp +
+          " " +
+          kontakt_array[i].kontakt +
+          " " +
+          kontakt_array[i].zustellung +
+          "\n";
+      }
+      return result;
+    },
+    sperre_foto_function(value) {
+      if (!this.data) {
+        return;
+      }
+      fhcapifactory.UserData.sperre_foto_function(value).then((res) => {
+        this.data.foto_sperre = res.data.foto_sperre;
+      });
+    },
+  },
+  computed: {
+    get_image_base64_src() {
+      if (!this.data) {
+        return "";
+      }
+      return "data:image/jpeg;base64," + this.data.foto;
+    },
+    personData() {
+      if (!this.data) {
+        return {};
+      }
+
+      return {
+        Allgemein: {
+          Username: this.data.username,
+          Anrede: this.data.anrede,
+          Titel: this.data.titel,
+          Vorname: this.data.vorname,
+          Nachname: this.data.nachname,
+          Postnomen: this.data.postnomen,
+        },
+     
+       
+        SpecialInformation:  {
+            Kurzzeichen: this.data.kurzbz,
+            Telefon: this.data.telefonklappe,
+            Büro:this.data.ort_kurzbz,
+        },
+      };
+    },
+    //? this computed conains all the information that is used for the second column that displays the information of the person
+    kontaktInfo() {
+      if (!this.data) {
+        return {};
+      }
+
+      return {
+       
+        emails: this.data.emails,
         
-        concatenate_addresses(address_array){
-            let result = "";
-            for (let i = 0; i < address_array.length; i++) {
-                result += address_array[i].strasse + " " + address_array[i].plz + " " + address_array[i].ort + "\n";
-            }
-            return result;
-        },
-        render_unterelement(wert,bezeichnung){
-            if (isArray(bezeichnung)){
-                
-            }
-        },
-        concatenate_kontakte(kontakt_array){
-            let result = "";
-            for (let i = 0; i < kontakt_array.length; i++) {
-                result += kontakt_array[i].kontakttyp + " " + kontakt_array[i].kontakt + " " + kontakt_array[i].zustellung + "\n";
-            }
-            return result;
-        },
-        sperre_foto_function(value){
-            if(!(this.mitarbeiter_info && this.index_information && this.student_info) ){
-                return;
-            }
-            fhcapifactory.UserData.sperre_foto_function(value).then(res => {
+      };
+    },
+  },
+
+  mounted() {
+
+
+    this.$refs.funktionenTable.tabulator.on('tableBuilt', () => {
+    
+        this.$refs.funktionenTable.tabulator.setData(this.data.funktionen);
+        
+    }) 
+
+  },
+
+  template: `
+
+
+            <div class="container-fluid">
+            <!-- here starts the row of the whole window -->
+                <div class="row">
+                <!-- this is the left column of the window -->
+                    <div class="col-9">
+                        <div class="row">
+                            <div class="col">
+                                <img class="img-thumbnail" :src="get_image_base64_src"></img>
+                                
+                                <div v-if="data.foto_sperre ">
+                                    <p style="margin:0">Profilfoto gesperrt</p>
+                                    <a href="#" @click.prevent="sperre_foto_function(false)" style="text-decoration:none">Sperre des Profilfotos aufheben</a>
+                                </div>
+                                <a href="#" @click.prevent="sperre_foto_function(true)" style="display:block; text-decoration:none"  v-else>Profilfoto sperren</a>
+                            </div>
+                            
+                          
+                            <div class="col">
+                        
+                        
+                                <h3 >Mitarbeiter</h3>
+                                
+                                <div v-for="(wert,bezeichnung) in personData">
+                                
+                                <div class="mb-3"  v-if="typeof wert == 'object' && bezeichnung=='Adressen'"><span style="display:block" v-for="element in wert">{{element.strasse}} <b>({{element.adr_typ}})</b><br/>{{ element.plz}} {{element.ort}}</span></div>
+                                <div v-else class="mb-3" ><span style="display:block;" v-for="(val,bez) in wert">{{bez}}: {{val}}</span></div>
+                                
+                                </div>
+                                
+                            </div>
+                            <div class="col">
+                                <ol style="list-style:none">
+                                
+                                    <li v-for="(wert,bezeichnung) in kontaktInfo">
+                                    
+                                    <!-- HIER IST DAS DATUM DES FH AUSWEIS -->
+                                        <div class="mb-3" v-if="bezeichnung=='FhAusweisStatus'">
+                                            <p class="mb-0"><b>FH-Ausweis Status</b></p>
+                                            <p class="mb-0">{{"Der FH Ausweis ist am "+ wert+ " ausgegeben worden."}}</p>
+                                        </div>
+
+                                    <!-- HIER SIND DIE EMAILS -->
+                            
+
+                                        <div class="mb-3" v-if="typeof wert === 'object' && bezeichnung == 'emails'">
+                                            <p class="mb-0"><b>eMail</b></p>
+                                            <p v-for="email in wert" class="mb-0">{{email.type}}: <a style="text-decoration:none" :href="'mailto:'+email.email">{{email.email}}</a></p>
+                                        </div>
+
+                                        <!-- HIER SIND DIE PRIVATEN KONTAKTE -->
+                                        <div class="mb-3" v-if="typeof wert === 'object' && bezeichnung=='Kontakte'">
+                                        <p class="mb-0"><b>Private Kontakte</b></p>
+                                            <div class="row" v-for="element in wert" >
+                                                <div class="col-8">{{element.kontakttyp + ":  " + element.kontakt+"  " }}</div>
+                                                <div class="col-2"> {{element?.anmerkung}}</div>
+                                                <div class="col-2"> 
+                                                <i v-if="element.zustellung" class="fa-solid fa-check"></i>
+                                                <i v-else="element.zustellung" class="fa-solid fa-xmark"></i>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    
+                                    </li>
+                                </ol>
+
+
+                            </div>
+                        </div>
+                      
                     
-                    this.index_information.foto_sperre = res.data.foto_sperre;
+                        <div class="row my-5">
+                        
                 
-            });
+                            <div class="col-12">
+                            <core-filter-cmpt title="Funktionen"  ref="funktionenTable" :tabulator-options="funktionen_table_options" :tableOnly />
+                            
+                            </div>
+                           
+                        
+                        </div>
+
+                
+                    </div>
+
+                    <div  class="col-3">
+                        <div style="background-color:#EEEEEE" class="row py-4">
+                        <a style="text-decoration:none" class="my-1" href="#">Zeitwuensche</a>
+                        <a style="text-decoration:none" class="my-1" href="#">Lehrveranstaltungen</a>
+                        <a style="text-decoration:none" class="my-1" href="#">Zeitsperren von Gschnell</a>
+                        </div>
+                        <div class="row">
+                            <h5 class="fs-3" style="margin-top:1em">Mailverteilers</h5>
+                            <p class="fs-6">Sie sind Mitgglied in folgenden Verteilern:</p>
+                            <div  class="row text-break" v-for="verteiler in data?.mailverteiler">
+                                <div class="col-6"><a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a></div> 
+                                <div class="col-6">{{verteiler.beschreibung}}</div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
             
-        },
-        
-        
-    },
-    computed:{
-     
-        
-        get_image_base64_src(){
-            if(!this.index_information){
-                return "";
-            }
-            return "data:image/jpeg;base64,"+this.index_information.foto;
-        },
-        personData(){
-            if(!this.index_information){
-                return {};
-            }
-  
-           return {
-                Allgemein: (this.role =='Mitarbeiter' || this.role =='View_Mitarbeiter')?{
-                    Username:this.index_information.username,
-                    Anrede:this.index_information.anrede,
-                    Titel:this.index_information.titel,
-                    Vorname:this.index_information.vorname,
-                    Nachname:this.index_information.nachname,
-                    Postnomen:this.index_information.postnomen,
-            }:{
-                Username:this.index_information.username,
-                Matrikelnummer: this.student_info?.matrikelnummer,
-                Anrede:this.index_information.anrede,
-                Titel:this.index_information.titel,
-                Vorname:this.index_information.vorname,
-                Nachname:this.index_information.nachname,
-                Postnomen:this.index_information.postnomen,
-            },
-            GeburtsDaten:!this.role.includes("View")?{
-                Geburtsdatum:this.index_information.gebdatum,
-                Geburtsort: this.index_information.gebort,
-            }: null,
-                Adressen: this.index_information.adressen,
-            SpecialInformation: this.role =='Mitarbeiter' || this.role === 'View_Mitarbeiter'?  {
-                Kurzzeichen: this.mitarbeiter_info?.kurzbz,
-                Telefon: this.mitarbeiter_info?.telefonklappe,
-                //* Wird das Feld Ort_kurzbz noch gepflegt?
-                ...(this.role === 'View_Mitarbeiter'?{Büro:this.mitarbeiter_info?.ort_kurzbz}:{}) ,
-            } : {
-                Studiengang:this.student_info?.studiengang,
-                Semester:this.student_info?.semester,
-                Verband:this.student_info?.verband,
-                Gruppe:this.student_info?.gruppe,
-                Personenkennzeichen:this.student_info?.personenkennzeichen
-            },
-            };
-        },
-        //? this computed conains all the information that is used for the second column that displays the information of the person
-        kontaktInfo(){
-            if(!this.index_information){
-                return {};
-            }
-         
-           return {
-                FhAusweisStatus: this.index_information.zutrittsdatum,
-                emails: this.role === 'Mitarbeiter' || this.role === 'View_Mitarbeiter'?  this.mitarbeiter_info?.emails: this.index_information.emails,
-                Kontakte:this.index_information.kontakte,
-            };
-        },
-        
-    },
-  
-     mounted(){
-
-        console.log(this.uid);
-        console.log(this.view);
-        console.log(typeof this.view);
-        if(this.view){console.log("view is true")}else{ console.log("view is false")}
-
-        //? this function is to update the tabulator information only when the tabulator was build checking the tableBulit event
-        //! only the tableBuilt event of the second tabulator was used to update the table informations
-         
-
-        fhcapifactory.UserData.isMitarbeiterOrStudent(this.uid).then((res) => {
-
-            this.role = this.view? "View_"+res.data: res.data;
-            if(!this.role.includes('View')){
-                this.$refs.betriebsmittelTable.tabulator.on('tableBuilt', () => {
-                }) 
-             }
-
-
-        console.log("the role of the current view: ", this.role);
-        
-    
-
-        //? Die anderen api calls werden erst gemacht wenn der call zu isMitarbeiterOrStudent gemacht worden ist
-
-
-        //! indexProfilInformationen werden immer gefetcht
-        fhcapifactory.UserData.indexProfilInformaion(this.uid,this.view).then((res) => {
-            console.log(res.data);
-            this.index_information = res.data;
-            if(!this.role.includes("View")){
-            this.$refs.betriebsmittelTable.tabulator.setData(res.data.mittel);
-        }
-        });
-        
-
-        //? Danach werden die Informationen der Role gefetcht
-        if(this.role === "Student" || this.role === "View_Student"){ 
-            fhcapifactory.UserData.studentProfil(this.uid,this.view).then((res)=> {
-                this.student_info = res.data;
-                if(this.role ==="Student"){
-                this.$refs.zutrittsgruppenTable.tabulator.setData(res.data.zuttritsgruppen);
-                }
-            })
-        }
-        
-        if(this.role === "Mitarbeiter" || this.role === "View_Mitarbeiter"){
-            fhcapifactory.UserData.mitarbeiterProfil(this.uid).then((res)=> {
-                this.mitarbeiter_info = res.data;
-                this.$refs.funktionenTable.tabulator.setData(res.data.funktionen);
-            })
-        }   
-    });
-
-        
-        
-    },
-     
-    template: `
-   
-    <p>MitarbeiterViewProfil</p>
     `,
-};
\ No newline at end of file
+};
diff --git a/public/js/components/Cis/Profil/Profil.js b/public/js/components/Cis/Profil/Profil.js
index 3f23925e8..3e25652c5 100644
--- a/public/js/components/Cis/Profil/Profil.js
+++ b/public/js/components/Cis/Profil/Profil.js
@@ -51,7 +51,7 @@ export default {
     },
     
     //? this props were passed in the Profil.php view file
-    props:['uid','view'],
+    props:['data','view'],
     methods: {
         
         concatenate_addresses(address_array){
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index ffe63e952..13105d949 100644
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -1,6 +1,5 @@
-
 import fhcapifactory from "../../../apps/api/fhcapifactory.js";
-import {CoreFilterCmpt} from "../../../components/filter/Filter.js"
+import { CoreFilterCmpt } from "../../../components/filter/Filter.js";
 
 //? possible types of roles:
 //! depending on the role of the current view, different content is being displayed and fetched
@@ -10,209 +9,284 @@ import {CoreFilterCmpt} from "../../../components/filter/Filter.js"
 //* View_Mitarbeiter
 
 export default {
-    components:{
-        CoreFilterCmpt,
-    },
-    data() {
-        return {
-            index_information: null,
-            mitarbeiter_info: null,
-            student_info:null,
-            //? beinhaltet die Information ob der angefragte user ein Student oder Mitarbeiter ist
-            role: null,
+  components: {
+    CoreFilterCmpt,
+  },
+  data() {
+    return {
+      index_information: null,
+      mitarbeiter_info: null,
+      student_info: null,
+      //? beinhaltet die Information ob der angefragte user ein Student oder Mitarbeiter ist
+      role: null,
 
-            funktionen_table_options: {
-                height: 300,
-                layout: 'fitColumns',
-                data:[{Bezeichnung:"",Organisationseinheit:"",Gültig_von:"",Gültig_bis:"",Wochenstunden:""}],
-                columns: [{title: 'Bezeichnung', field: 'Bezeichnung', headerFilter: true},
-                {title: 'Organisationseinheit', field: 'Organisationseinheit', headerFilter: true},
-                {title: 'Gültig_von', field: 'Gültig_von', headerFilter: true},
-                {title: 'Gültig_bis', field: 'Gültig_bis', headerFilter: true},
-                {title: 'Wochenstunden', field: 'Wochenstunden', headerFilter: true},]
-                
-            },
-            betriebsmittel_table_options:{
-                height: 300,
-                layout: 'fitColumns',
-                data:[{betriebsmittel:"",Nummer:"",Ausgegeben_am:""}],
-                columns: [{title: 'Betriebsmittel', field: 'betriebsmittel', headerFilter: true},
-                {title: 'Nummer', field: 'Nummer', headerFilter: true},
-                {title: 'Ausgegeben_am', field: 'Ausgegeben_am', headerFilter: true},]
-                
-            },
-            zutrittsgruppen_table_options:{
-                height: 300,
-                layout: 'fitColumns',
-                data:[{bezeichnung:"test1"}],
-                columns: [{title: 'Zutritt', field: 'bezeichnung'}]
-            }
-        }
+      funktionen_table_options: {
+        height: 300,
+        layout: "fitColumns",
+        data: [
+          {
+            Bezeichnung: "",
+            Organisationseinheit: "",
+            Gültig_von: "",
+            Gültig_bis: "",
+            Wochenstunden: "",
+          },
+        ],
+        columns: [
+          { title: "Bezeichnung", field: "Bezeichnung", headerFilter: true },
+          {
+            title: "Organisationseinheit",
+            field: "Organisationseinheit",
+            headerFilter: true,
+          },
+          { title: "Gültig_von", field: "Gültig_von", headerFilter: true },
+          { title: "Gültig_bis", field: "Gültig_bis", headerFilter: true },
+          {
+            title: "Wochenstunden",
+            field: "Wochenstunden",
+            headerFilter: true,
+          },
+        ],
+      },
+      betriebsmittel_table_options: {
+        height: 300,
+        layout: "fitColumns",
+        data: [{ betriebsmittel: "", Nummer: "", Ausgegeben_am: "" }],
+        columns: [
+          {
+            title: "Betriebsmittel",
+            field: "betriebsmittel",
+            headerFilter: true,
+          },
+          { title: "Nummer", field: "Nummer", headerFilter: true },
+          {
+            title: "Ausgegeben_am",
+            field: "Ausgegeben_am",
+            headerFilter: true,
+          },
+        ],
+      },
+      zutrittsgruppen_table_options: {
+        height: 300,
+        layout: "fitColumns",
+        data: [{ bezeichnung: "test1" }],
+        columns: [{ title: "Zutritt", field: "bezeichnung" }],
+      },
+    };
+  },
+
+  //? this props were passed in the Profil.php view file
+  props: ["data"],
+  methods: {
+    concatenate_addresses(address_array) {
+      let result = "";
+      for (let i = 0; i < address_array.length; i++) {
+        result +=
+          address_array[i].strasse +
+          " " +
+          address_array[i].plz +
+          " " +
+          address_array[i].ort +
+          "\n";
+      }
+      return result;
     },
+    render_unterelement(wert, bezeichnung) {
+      if (isArray(bezeichnung)) {
+      }
+    },
+    concatenate_kontakte(kontakt_array) {
+      let result = "";
+      for (let i = 0; i < kontakt_array.length; i++) {
+        result +=
+          kontakt_array[i].kontakttyp +
+          " " +
+          kontakt_array[i].kontakt +
+          " " +
+          kontakt_array[i].zustellung +
+          "\n";
+      }
+      return result;
+    },
+    sperre_foto_function(value) {
+      if (!this.data) {
+        return;
+      }
+      fhcapifactory.UserData.sperre_foto_function(value).then((res) => {
+        this.data.foto_sperre = res.data.foto_sperre;
+      });
+    },
+  },
+  computed: {
+    get_image_base64_src() {
+      if (!this.data) {
+        return "";
+      }
+      return "data:image/jpeg;base64," + this.data.foto;
+    },
+    personData() {
+      if (!this.data) {
+        return {};
+      }
+
+      return {
+        Allgemein: {
+          Username: this.data.username,
+          Matrikelnummer: this.data.matrikelnummer,
+          Anrede: this.data.anrede,
+          Titel: this.data.titel,
+          Vorname: this.data.vorname,
+          Nachname: this.data.nachname,
+          Postnomen: this.data.postnomen,
+        },
+        GeburtsDaten: {
+          Geburtsdatum: this.data.gebdatum,
+          Geburtsort: this.data.gebort,
+        },
+        Adressen: this.data.adressen,
+        SpecialInformation: {
+          Studiengang: this.data.studiengang,
+          Semester: this.data.semester,
+          Verband: this.data.verband,
+          Gruppe: this.data.gruppe,
+          Personenkennzeichen: this.data.personenkennzeichen,
+        },
+      };
+    },
+    //? this computed conains all the information that is used for the second column that displays the information of the person
+    kontaktInfo() {
+      if (!this.data) {
+        return {};
+      }
+
+      return {
+        FhAusweisStatus: this.data.zutrittsdatum,
+        emails: this.data.emails,
+        Kontakte: this.data.kontakte,
+      };
+    },
+  },
+
+  mounted() {
+    this.$refs.betriebsmittelTable.tabulator.on('tableBuilt', () => {
     
-    //? this props were passed in the Profil.php view file
-    props:['uid','view'],
-    methods: {
+        this.$refs.betriebsmittelTable.tabulator.setData(this.data.mittel);
         
-        concatenate_addresses(address_array){
-            let result = "";
-            for (let i = 0; i < address_array.length; i++) {
-                result += address_array[i].strasse + " " + address_array[i].plz + " " + address_array[i].ort + "\n";
-            }
-            return result;
-        },
-        render_unterelement(wert,bezeichnung){
-            if (isArray(bezeichnung)){
-                
-            }
-        },
-        concatenate_kontakte(kontakt_array){
-            let result = "";
-            for (let i = 0; i < kontakt_array.length; i++) {
-                result += kontakt_array[i].kontakttyp + " " + kontakt_array[i].kontakt + " " + kontakt_array[i].zustellung + "\n";
-            }
-            return result;
-        },
-        sperre_foto_function(value){
-            if(!(this.mitarbeiter_info && this.index_information && this.student_info) ){
-                return;
-            }
-            fhcapifactory.UserData.sperre_foto_function(value).then(res => {
+    }) 
+
+    this.$refs.zutrittsgruppenTable.tabulator.on('tableBuilt', () => {
+    
+        this.$refs.zutrittsgruppenTable.tabulator.setData(this.data.zuttritsgruppen);
+        
+    }) 
+
+  },
+
+  template: `
+
+
+            <div class="container-fluid">
+            <!-- here starts the row of the whole window -->
+                <div class="row">
+                <!-- this is the left column of the window -->
+                    <div class="col-9">
+                        <div class="row">
+                            <div class="col">
+                                <img class="img-thumbnail" :src="get_image_base64_src"></img>
+                                
+                                <div v-if="data.foto_sperre ">
+                                    <p style="margin:0">Profilfoto gesperrt</p>
+                                    <a href="#" @click.prevent="sperre_foto_function(false)" style="text-decoration:none">Sperre des Profilfotos aufheben</a>
+                                </div>
+                                <a href="#" @click.prevent="sperre_foto_function(true)" style="display:block; text-decoration:none"  v-else>Profilfoto sperren</a>
+                            </div>
+                            
+                          
+                            <div class="col">
+                        
+                        
+                                <h3 >Student</h3>
+                                
+                                <div v-for="(wert,bezeichnung) in personData">
+                                
+                                <div class="mb-3"  v-if="typeof wert == 'object' && bezeichnung=='Adressen'"><span style="display:block" v-for="element in wert">{{element.strasse}} <b>({{element.adr_typ}})</b><br/>{{ element.plz}} {{element.ort}}</span></div>
+                                <div v-else class="mb-3" ><span style="display:block;" v-for="(val,bez) in wert">{{bez}}: {{val}}</span></div>
+                                
+                                </div>
+                                
+                            </div>
+                            <div class="col">
+                                <ol style="list-style:none">
+                                
+                                    <li v-for="(wert,bezeichnung) in kontaktInfo">
+                                    
+                                    <!-- HIER IST DAS DATUM DES FH AUSWEIS -->
+                                        <div class="mb-3" v-if="bezeichnung=='FhAusweisStatus'">
+                                            <p class="mb-0"><b>FH-Ausweis Status</b></p>
+                                            <p class="mb-0">{{"Der FH Ausweis ist am "+ wert+ " ausgegeben worden."}}</p>
+                                        </div>
+
+                                    <!-- HIER SIND DIE EMAILS -->
+                            
+
+                                        <div class="mb-3" v-if="typeof wert === 'object' && bezeichnung == 'emails'">
+                                            <p class="mb-0"><b>eMail</b></p>
+                                            <p v-for="email in wert" class="mb-0">{{email.type}}: <a style="text-decoration:none" :href="'mailto:'+email.email">{{email.email}}</a></p>
+                                        </div>
+
+                                        <!-- HIER SIND DIE PRIVATEN KONTAKTE -->
+                                        <div class="mb-3" v-if="typeof wert === 'object' && bezeichnung=='Kontakte'">
+                                        <p class="mb-0"><b>Private Kontakte</b></p>
+                                            <div class="row" v-for="element in wert" >
+                                                <div class="col-8">{{element.kontakttyp + ":  " + element.kontakt+"  " }}</div>
+                                                <div class="col-2"> {{element?.anmerkung}}</div>
+                                                <div class="col-2"> 
+                                                <i v-if="element.zustellung" class="fa-solid fa-check"></i>
+                                                <i v-else="element.zustellung" class="fa-solid fa-xmark"></i>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    
+                                    </li>
+                                </ol>
+
+
+                            </div>
+                        </div>
+                      
                     
-                    this.index_information.foto_sperre = res.data.foto_sperre;
+                        <div class="row my-5">
+                        
                 
-            });
+                            <div class="col-12">
+                            <core-filter-cmpt title="Entlehnte Betriebsmittel"  ref="betriebsmittelTable" :tabulator-options="betriebsmittel_table_options" :tableOnly />
+                            </div>
+                            <div class="col-12">
+                            <core-filter-cmpt title="Zutrittsgruppen" ref="zutrittsgruppenTable" :tabulator-options="zutrittsgruppen_table_options" :tableOnly :noColFilter />
+                            </div>
+                        
+                        </div>
+
+                
+                    </div>
+
+                    <div  class="col-3">
+                        <div style="background-color:#EEEEEE" class="row py-4">
+                        <a style="text-decoration:none" class="my-1" href="#">Zeitwuensche</a>
+                        <a style="text-decoration:none" class="my-1" href="#">Lehrveranstaltungen</a>
+                        <a style="text-decoration:none" class="my-1" href="#">Zeitsperren von Gschnell</a>
+                        </div>
+                        <div class="row">
+                            <h5 class="fs-3" style="margin-top:1em">Mailverteilers</h5>
+                            <p class="fs-6">Sie sind Mitgglied in folgenden Verteilern:</p>
+                            <div  class="row text-break" v-for="verteiler in data?.mailverteiler">
+                                <div class="col-6"><a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a></div> 
+                                <div class="col-6">{{verteiler.beschreibung}}</div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
             
-        },
-        
-        
-    },
-    computed:{
-     
-        
-        get_image_base64_src(){
-            if(!this.index_information){
-                return "";
-            }
-            return "data:image/jpeg;base64,"+this.index_information.foto;
-        },
-        personData(){
-            if(!this.index_information){
-                return {};
-            }
-  
-           return {
-                Allgemein: (this.role =='Mitarbeiter' || this.role =='View_Mitarbeiter')?{
-                    Username:this.index_information.username,
-                    Anrede:this.index_information.anrede,
-                    Titel:this.index_information.titel,
-                    Vorname:this.index_information.vorname,
-                    Nachname:this.index_information.nachname,
-                    Postnomen:this.index_information.postnomen,
-            }:{
-                Username:this.index_information.username,
-                Matrikelnummer: this.student_info?.matrikelnummer,
-                Anrede:this.index_information.anrede,
-                Titel:this.index_information.titel,
-                Vorname:this.index_information.vorname,
-                Nachname:this.index_information.nachname,
-                Postnomen:this.index_information.postnomen,
-            },
-            GeburtsDaten:!this.role.includes("View")?{
-                Geburtsdatum:this.index_information.gebdatum,
-                Geburtsort: this.index_information.gebort,
-            }: null,
-                Adressen: this.index_information.adressen,
-            SpecialInformation: this.role =='Mitarbeiter' || this.role === 'View_Mitarbeiter'?  {
-                Kurzzeichen: this.mitarbeiter_info?.kurzbz,
-                Telefon: this.mitarbeiter_info?.telefonklappe,
-                //* Wird das Feld Ort_kurzbz noch gepflegt?
-                ...(this.role === 'View_Mitarbeiter'?{Büro:this.mitarbeiter_info?.ort_kurzbz}:{}) ,
-            } : {
-                Studiengang:this.student_info?.studiengang,
-                Semester:this.student_info?.semester,
-                Verband:this.student_info?.verband,
-                Gruppe:this.student_info?.gruppe,
-                Personenkennzeichen:this.student_info?.personenkennzeichen
-            },
-            };
-        },
-        //? this computed conains all the information that is used for the second column that displays the information of the person
-        kontaktInfo(){
-            if(!this.index_information){
-                return {};
-            }
-         
-           return {
-                FhAusweisStatus: this.index_information.zutrittsdatum,
-                emails: this.role === 'Mitarbeiter' || this.role === 'View_Mitarbeiter'?  this.mitarbeiter_info?.emails: this.index_information.emails,
-                Kontakte:this.index_information.kontakte,
-            };
-        },
-        
-    },
-  
-     mounted(){
-
-        console.log(this.uid);
-        console.log(this.view);
-        console.log(typeof this.view);
-        if(this.view){console.log("view is true")}else{ console.log("view is false")}
-
-        //? this function is to update the tabulator information only when the tabulator was build checking the tableBulit event
-        //! only the tableBuilt event of the second tabulator was used to update the table informations
-         
-
-        fhcapifactory.UserData.isMitarbeiterOrStudent(this.uid).then((res) => {
-
-            this.role = this.view? "View_"+res.data: res.data;
-            if(!this.role.includes('View')){
-                this.$refs.betriebsmittelTable.tabulator.on('tableBuilt', () => {
-                }) 
-             }
-
-
-        console.log("the role of the current view: ", this.role);
-        
-    
-
-        //? Die anderen api calls werden erst gemacht wenn der call zu isMitarbeiterOrStudent gemacht worden ist
-
-
-        //! indexProfilInformationen werden immer gefetcht
-        fhcapifactory.UserData.indexProfilInformaion(this.uid,this.view).then((res) => {
-            console.log(res.data);
-            this.index_information = res.data;
-            if(!this.role.includes("View")){
-            this.$refs.betriebsmittelTable.tabulator.setData(res.data.mittel);
-        }
-        });
-        
-
-        //? Danach werden die Informationen der Role gefetcht
-        if(this.role === "Student" || this.role === "View_Student"){ 
-            fhcapifactory.UserData.studentProfil(this.uid,this.view).then((res)=> {
-                this.student_info = res.data;
-                if(this.role ==="Student"){
-                this.$refs.zutrittsgruppenTable.tabulator.setData(res.data.zuttritsgruppen);
-                }
-            })
-        }
-        
-        if(this.role === "Mitarbeiter" || this.role === "View_Mitarbeiter"){
-            fhcapifactory.UserData.mitarbeiterProfil(this.uid).then((res)=> {
-                this.mitarbeiter_info = res.data;
-                this.$refs.funktionenTable.tabulator.setData(res.data.funktionen);
-            })
-        }   
-    });
-
-        
-        
-    },
-     
-    template: `
-   
-    <p>StudentProfil</p>
     `,
-};
\ No newline at end of file
+};
diff --git a/public/js/components/Cis/Profil/StudentViewProfil.js b/public/js/components/Cis/Profil/StudentViewProfil.js
index 65484fd2e..a5f4036fb 100644
--- a/public/js/components/Cis/Profil/StudentViewProfil.js
+++ b/public/js/components/Cis/Profil/StudentViewProfil.js
@@ -1,6 +1,5 @@
-
 import fhcapifactory from "../../../apps/api/fhcapifactory.js";
-import {CoreFilterCmpt} from "../../../components/filter/Filter.js"
+import { CoreFilterCmpt } from "../../../components/filter/Filter.js";
 
 //? possible types of roles:
 //! depending on the role of the current view, different content is being displayed and fetched
@@ -10,209 +9,236 @@ import {CoreFilterCmpt} from "../../../components/filter/Filter.js"
 //* View_Mitarbeiter
 
 export default {
-    components:{
-        CoreFilterCmpt,
+  components: {
+    CoreFilterCmpt,
+  },
+  data() {
+    return {
+      index_information: null,
+      mitarbeiter_info: null,
+      student_info: null,
+      //? beinhaltet die Information ob der angefragte user ein Student oder Mitarbeiter ist
+      role: null,
+
+      funktionen_table_options: {
+        height: 300,
+        layout: "fitColumns",
+        data: [
+          {
+            Bezeichnung: "",
+            Organisationseinheit: "",
+            Gültig_von: "",
+            Gültig_bis: "",
+            Wochenstunden: "",
+          },
+        ],
+        columns: [
+          { title: "Bezeichnung", field: "Bezeichnung", headerFilter: true },
+          {
+            title: "Organisationseinheit",
+            field: "Organisationseinheit",
+            headerFilter: true,
+          },
+          { title: "Gültig_von", field: "Gültig_von", headerFilter: true },
+          { title: "Gültig_bis", field: "Gültig_bis", headerFilter: true },
+          {
+            title: "Wochenstunden",
+            field: "Wochenstunden",
+            headerFilter: true,
+          },
+        ],
+      },
+      betriebsmittel_table_options: {
+        height: 300,
+        layout: "fitColumns",
+        data: [{ betriebsmittel: "", Nummer: "", Ausgegeben_am: "" }],
+        columns: [
+          {
+            title: "Betriebsmittel",
+            field: "betriebsmittel",
+            headerFilter: true,
+          },
+          { title: "Nummer", field: "Nummer", headerFilter: true },
+          {
+            title: "Ausgegeben_am",
+            field: "Ausgegeben_am",
+            headerFilter: true,
+          },
+        ],
+      },
+      zutrittsgruppen_table_options: {
+        height: 300,
+        layout: "fitColumns",
+        data: [{ bezeichnung: "test1" }],
+        columns: [{ title: "Zutritt", field: "bezeichnung" }],
+      },
+    };
+  },
+
+  //? this props were passed in the Profil.php view file
+  props: ["data"],
+  methods: {
+    concatenate_addresses(address_array) {
+      let result = "";
+      for (let i = 0; i < address_array.length; i++) {
+        result +=
+          address_array[i].strasse +
+          " " +
+          address_array[i].plz +
+          " " +
+          address_array[i].ort +
+          "\n";
+      }
+      return result;
     },
-    data() {
-        return {
-            index_information: null,
-            mitarbeiter_info: null,
-            student_info:null,
-            //? beinhaltet die Information ob der angefragte user ein Student oder Mitarbeiter ist
-            role: null,
-
-            funktionen_table_options: {
-                height: 300,
-                layout: 'fitColumns',
-                data:[{Bezeichnung:"",Organisationseinheit:"",Gültig_von:"",Gültig_bis:"",Wochenstunden:""}],
-                columns: [{title: 'Bezeichnung', field: 'Bezeichnung', headerFilter: true},
-                {title: 'Organisationseinheit', field: 'Organisationseinheit', headerFilter: true},
-                {title: 'Gültig_von', field: 'Gültig_von', headerFilter: true},
-                {title: 'Gültig_bis', field: 'Gültig_bis', headerFilter: true},
-                {title: 'Wochenstunden', field: 'Wochenstunden', headerFilter: true},]
-                
-            },
-            betriebsmittel_table_options:{
-                height: 300,
-                layout: 'fitColumns',
-                data:[{betriebsmittel:"",Nummer:"",Ausgegeben_am:""}],
-                columns: [{title: 'Betriebsmittel', field: 'betriebsmittel', headerFilter: true},
-                {title: 'Nummer', field: 'Nummer', headerFilter: true},
-                {title: 'Ausgegeben_am', field: 'Ausgegeben_am', headerFilter: true},]
-                
-            },
-            zutrittsgruppen_table_options:{
-                height: 300,
-                layout: 'fitColumns',
-                data:[{bezeichnung:"test1"}],
-                columns: [{title: 'Zutritt', field: 'bezeichnung'}]
-            }
-        }
+    render_unterelement(wert, bezeichnung) {
+      if (isArray(bezeichnung)) {
+      }
     },
-    
-    //? this props were passed in the Profil.php view file
-    props:['uid','view'],
-    methods: {
-        
-        concatenate_addresses(address_array){
-            let result = "";
-            for (let i = 0; i < address_array.length; i++) {
-                result += address_array[i].strasse + " " + address_array[i].plz + " " + address_array[i].ort + "\n";
-            }
-            return result;
-        },
-        render_unterelement(wert,bezeichnung){
-            if (isArray(bezeichnung)){
-                
-            }
-        },
-        concatenate_kontakte(kontakt_array){
-            let result = "";
-            for (let i = 0; i < kontakt_array.length; i++) {
-                result += kontakt_array[i].kontakttyp + " " + kontakt_array[i].kontakt + " " + kontakt_array[i].zustellung + "\n";
-            }
-            return result;
-        },
-        sperre_foto_function(value){
-            if(!(this.mitarbeiter_info && this.index_information && this.student_info) ){
-                return;
-            }
-            fhcapifactory.UserData.sperre_foto_function(value).then(res => {
-                    
-                    this.index_information.foto_sperre = res.data.foto_sperre;
-                
-            });
-            
-        },
-        
-        
+    concatenate_kontakte(kontakt_array) {
+      let result = "";
+      for (let i = 0; i < kontakt_array.length; i++) {
+        result +=
+          kontakt_array[i].kontakttyp +
+          " " +
+          kontakt_array[i].kontakt +
+          " " +
+          kontakt_array[i].zustellung +
+          "\n";
+      }
+      return result;
     },
-    computed:{
-     
-        
-        get_image_base64_src(){
-            if(!this.index_information){
-                return "";
-            }
-            return "data:image/jpeg;base64,"+this.index_information.foto;
-        },
-        personData(){
-            if(!this.index_information){
-                return {};
-            }
-  
-           return {
-                Allgemein: (this.role =='Mitarbeiter' || this.role =='View_Mitarbeiter')?{
-                    Username:this.index_information.username,
-                    Anrede:this.index_information.anrede,
-                    Titel:this.index_information.titel,
-                    Vorname:this.index_information.vorname,
-                    Nachname:this.index_information.nachname,
-                    Postnomen:this.index_information.postnomen,
-            }:{
-                Username:this.index_information.username,
-                Matrikelnummer: this.student_info?.matrikelnummer,
-                Anrede:this.index_information.anrede,
-                Titel:this.index_information.titel,
-                Vorname:this.index_information.vorname,
-                Nachname:this.index_information.nachname,
-                Postnomen:this.index_information.postnomen,
-            },
-            GeburtsDaten:!this.role.includes("View")?{
-                Geburtsdatum:this.index_information.gebdatum,
-                Geburtsort: this.index_information.gebort,
-            }: null,
-                Adressen: this.index_information.adressen,
-            SpecialInformation: this.role =='Mitarbeiter' || this.role === 'View_Mitarbeiter'?  {
-                Kurzzeichen: this.mitarbeiter_info?.kurzbz,
-                Telefon: this.mitarbeiter_info?.telefonklappe,
-                //* Wird das Feld Ort_kurzbz noch gepflegt?
-                ...(this.role === 'View_Mitarbeiter'?{Büro:this.mitarbeiter_info?.ort_kurzbz}:{}) ,
-            } : {
-                Studiengang:this.student_info?.studiengang,
-                Semester:this.student_info?.semester,
-                Verband:this.student_info?.verband,
-                Gruppe:this.student_info?.gruppe,
-                Personenkennzeichen:this.student_info?.personenkennzeichen
-            },
-            };
-        },
-        //? this computed conains all the information that is used for the second column that displays the information of the person
-        kontaktInfo(){
-            if(!this.index_information){
-                return {};
-            }
-         
-           return {
-                FhAusweisStatus: this.index_information.zutrittsdatum,
-                emails: this.role === 'Mitarbeiter' || this.role === 'View_Mitarbeiter'?  this.mitarbeiter_info?.emails: this.index_information.emails,
-                Kontakte:this.index_information.kontakte,
-            };
-        },
-        
+    sperre_foto_function(value) {
+      if (!this.data) {
+        return;
+      }
+      fhcapifactory.UserData.sperre_foto_function(value).then((res) => {
+        this.data.foto_sperre = res.data.foto_sperre;
+      });
     },
-  
-     mounted(){
-
-        console.log(this.uid);
-        console.log(this.view);
-        console.log(typeof this.view);
-        if(this.view){console.log("view is true")}else{ console.log("view is false")}
-
-        //? this function is to update the tabulator information only when the tabulator was build checking the tableBulit event
-        //! only the tableBuilt event of the second tabulator was used to update the table informations
-         
-
-        fhcapifactory.UserData.isMitarbeiterOrStudent(this.uid).then((res) => {
-
-            this.role = this.view? "View_"+res.data: res.data;
-            if(!this.role.includes('View')){
-                this.$refs.betriebsmittelTable.tabulator.on('tableBuilt', () => {
-                }) 
-             }
-
-
-        console.log("the role of the current view: ", this.role);
-        
-    
-
-        //? Die anderen api calls werden erst gemacht wenn der call zu isMitarbeiterOrStudent gemacht worden ist
-
-
-        //! indexProfilInformationen werden immer gefetcht
-        fhcapifactory.UserData.indexProfilInformaion(this.uid,this.view).then((res) => {
-            console.log(res.data);
-            this.index_information = res.data;
-            if(!this.role.includes("View")){
-            this.$refs.betriebsmittelTable.tabulator.setData(res.data.mittel);
-        }
-        });
-        
-
-        //? Danach werden die Informationen der Role gefetcht
-        if(this.role === "Student" || this.role === "View_Student"){ 
-            fhcapifactory.UserData.studentProfil(this.uid,this.view).then((res)=> {
-                this.student_info = res.data;
-                if(this.role ==="Student"){
-                this.$refs.zutrittsgruppenTable.tabulator.setData(res.data.zuttritsgruppen);
-                }
-            })
-        }
-        
-        if(this.role === "Mitarbeiter" || this.role === "View_Mitarbeiter"){
-            fhcapifactory.UserData.mitarbeiterProfil(this.uid).then((res)=> {
-                this.mitarbeiter_info = res.data;
-                this.$refs.funktionenTable.tabulator.setData(res.data.funktionen);
-            })
-        }   
-    });
-
-        
-        
+  },
+  computed: {
+    get_image_base64_src() {
+      if (!this.data) {
+        return "";
+      }
+      return "data:image/jpeg;base64," + this.data.foto;
     },
-     
-    template: `
+    personData() {
+      if (!this.data) {
+        return {};
+      }
+
+      return {
+        Allgemein: {
+          Username: this.data.username,
+          Matrikelnummer: this.data.matrikelnummer,
+          Anrede: this.data.anrede,
+          Titel: this.data.titel,
+          Vorname: this.data.vorname,
+          Nachname: this.data.nachname,
+          Postnomen: this.data.postnomen,
+        },
+      
+        
+        SpecialInformation: {
+          Studiengang: this.data.studiengang,
+          Semester: this.data.semester,
+          Verband: this.data.verband,
+          Gruppe: this.data.gruppe,
+          Personenkennzeichen: this.data.personenkennzeichen,
+        },
+      };
+    },
+    //? this computed conains all the information that is used for the second column that displays the information of the person
+    kontaktInfo() {
+      if (!this.data) {
+        return {};
+      }
+
+      return {
+       
+        emails: this.data.emails,
+      
+      };
+    },
+  },
+
+  mounted() {
    
-    <p>StudentViewProfil</p>
+
+  },
+
+  template: `
+
+
+            <div class="container-fluid">
+            <!-- here starts the row of the whole window -->
+                <div class="row">
+                <!-- this is the left column of the window -->
+                    <div class="col-9">
+                        <div class="row">
+                            <div class="col">
+                                <img class="img-thumbnail" :src="get_image_base64_src"></img>
+                                
+                               
+                            </div>
+                            
+                          
+                            <div class="col">
+                        
+                        
+                                <h3 >Student</h3>
+                                
+                                <div v-for="(wert,bezeichnung) in personData">
+                                
+                                <div class="mb-3"  v-if="typeof wert == 'object' && bezeichnung=='Adressen'"><span style="display:block" v-for="element in wert">{{element.strasse}} <b>({{element.adr_typ}})</b><br/>{{ element.plz}} {{element.ort}}</span></div>
+                                <div v-else class="mb-3" ><span style="display:block;" v-for="(val,bez) in wert">{{bez}}: {{val}}</span></div>
+                                
+                                </div>
+                                
+                            </div>
+                            <div class="col">
+                                <ol style="list-style:none">
+                                
+                                    <li v-for="(wert,bezeichnung) in kontaktInfo">
+                                        <!-- HIER SIND DIE EMAILS -->
+                                        <div class="mb-3" v-if="typeof wert === 'object' && bezeichnung == 'emails'">
+                                            <p class="mb-0"><b>eMail</b></p>
+                                            <p v-for="email in wert" class="mb-0">{{email.type}}: <a style="text-decoration:none" :href="'mailto:'+email.email">{{email.email}}</a></p>
+                                        </div>
+
+                                       
+                                    
+                                    </li>
+                                </ol>
+
+
+                            </div>
+                        </div>
+                      
+                    
+                     
+                
+                    </div>
+
+                    <div  class="col-3">
+                        <div style="background-color:#EEEEEE" class="row py-4">
+                        <a style="text-decoration:none" class="my-1" href="#">Zeitwuensche</a>
+                        <a style="text-decoration:none" class="my-1" href="#">Lehrveranstaltungen</a>
+                        <a style="text-decoration:none" class="my-1" href="#">Zeitsperren von Gschnell</a>
+                        </div>
+                        <div class="row">
+                            <h5 class="fs-3" style="margin-top:1em">Mailverteilers</h5>
+                            <p class="fs-6">Sie sind Mitgglied in folgenden Verteilern:</p>
+                            <div  class="row text-break" v-for="verteiler in data?.mailverteiler">
+                                <div class="col-6"><a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a></div> 
+                                <div class="col-6">{{verteiler.beschreibung}}</div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            
     `,
-};
\ No newline at end of file
+};

From 28b7a41b80f036df57ee808b0b79ba39d843d2ab Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Tue, 5 Dec 2023 13:55:51 +0100
Subject: [PATCH 0209/1461] cleaning up the code not needed in the Profil
 controler

---
 application/controllers/Cis/Profil.php | 390 +------------------------
 1 file changed, 1 insertion(+), 389 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index 27da9a07b..71e7e9dae 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -17,20 +17,9 @@ class Profil extends Auth_Controller
 		parent::__construct([
 			'index' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
 			'View' => ['student/anrechnung_beantragen:r','user:r'],
-
-			'isMitarbeiterOrStudent' => ['student/anrechnung_beantragen:r','user:r'],
-			'getMitarbeiterAnsicht' => ['student/anrechnung_beantragen:r','user:r'],
 			'foto_sperre_function' => ['student/anrechnung_beantragen:r','user:r'],
-			'indexProfilInformaion' => ['student/anrechnung_beantragen:r','user:r'],
-			'mitarbeiterProfil' => ['student/anrechnung_beantragen:r','user:r'],
-			'studentProfil' => ['student/anrechnung_beantragen:r','user:r'],
 			'getView' => ['student/anrechnung_beantragen:r','user:r'],
 			
-			
-			
-			
-			
-			
 		]);
 		$this->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
 		$this->load->model('crm/Student_model', 'StudentModel');
@@ -41,8 +30,6 @@ class Profil extends Auth_Controller
 		$this->load->model('person/Benutzergruppe_model', 'BenutzergruppeModel');
 		$this->load->model('ressource/Betriebsmittelperson_model', 'BetriebsmittelpersonModel');
 		$this->load->model('person/Kontakt_model', 'KontaktModel');
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 		
 		
 	}
@@ -55,34 +42,10 @@ class Profil extends Auth_Controller
 	 */
 
 	
-	public function index($test=null)
+	public function index()
 	{
-		
-		//? we can pass data to the view by using the second parameter of the load->view() function 
-		//* the first parameter is the route that Code Igniter will switch to
-		//* the second parameter can be used to pass data to the view  
 		$this->load->view('Cis/Profil');
 	}
-
-	//? attempt at rerouting methods
-	/* public function _remap($method, $params = array())
-
-	{
-		echo json_encode($params);
-      
-			
-			
-				echo json_encode($method);
-				return;
-			
-		 }else{
-			if (method_exists($this, $method))
-			{
-					return call_user_func_array(array($this, $method), $params);
-			}
-		} 
-	} */
-	
 	public function View($uid){
 		
 		if($uid === getAuthUID()){
@@ -694,325 +657,7 @@ class Profil extends Auth_Controller
 
 		echo json_encode($res);
 		
-		
-
-		
-		
 	}
-
-	
-	//? the view parameter is a flag that describes if a Profile from a different person is being viewed
-	public function indexProfilInformaion($uid, $view=false){
-		//? funktion returns all data needed for the student and the mitarbeiter profil view
-
-
-		$res = new stdClass();
-
-		//! falls der view flag auf flase gesetzt ist werden extra informationen des Users abgefragt
-		if(!$view){
-			//? betriebsmittel soll nur der user selber sehen
-			if(
-			
-				isSuccess($this->BetriebsmittelpersonModel->addSelect(["CONCAT(betriebsmitteltyp, ' ' ,beschreibung) as Betriebsmittel","nummer as Nummer","ausgegebenam as Ausgegeben_am"]))
-				
-			){
-				//? betriebsmittel are not needed in a view
-				$betriebsmittelperson_res = $this->BetriebsmittelpersonModel->getBetriebsmittel(getAuthPersonId());
-				if(isError($betriebsmittelperson_res)){
-					   // error handling
-				   }else{
-					   $betriebsmittelperson_res = hasData($betriebsmittelperson_res)? getData($betriebsmittelperson_res) : null;
-				   }
-			   }
-
-			   if(
-			
-				//? kontaktdaten soll auch nur der user selbst sehen
-				isSuccess($this->KontaktModel->addSelect('DISTINCT ON (kontakttyp) kontakttyp, kontakt, tbl_kontakt.anmerkung, tbl_kontakt.zustellung')) &&
-			isSuccess($this->KontaktModel->addJoin('public.tbl_standort', 'standort_id', 'LEFT')) &&
-			isSuccess($this->KontaktModel->addJoin('public.tbl_firma', 'firma_id', 'LEFT'))&&
-			isSuccess($this->KontaktModel->addOrder('kontakttyp, kontakt, tbl_kontakt.updateamum, tbl_kontakt.insertamum'))
-			){
-				$kontakte_res = $this->KontaktModel->loadWhere(array('person_id' => getAuthPersonID()));
-				if(isError($kontakte_res)){
-					// handle error	
-				}else{
-					$kontakte_res = hasData($kontakte_res)? getData($kontakte_res) : null;
-				}
-				
-			}
-
-			//? FH Ausweis Austellungsdatum soll auch nur der user selbst sehen
-			$zutrittskarte_ausgegebenam = $this->BetriebsmittelpersonModel->getBetriebsmittelByUid($uid,"Zutrittskarte");
-			if(isError($zutrittskarte_ausgegebenam)){
-				// error handling
-			}else{
-				$zutrittskarte_ausgegebenam = hasData($zutrittskarte_ausgegebenam)? getData($zutrittskarte_ausgegebenam)[0]->ausgegebenam : null;
-				//? formats the date from 01-01-2000 to 01.01.2000
-				$zutrittskarte_ausgegebenam = str_replace("-",".",$zutrittskarte_ausgegebenam);
-			}
-
-
-			//? Die Adressen soll auch nur der user selber sehen
-
-			if(
-				!$view &&
-				isSuccess($adresse_res = $this->AdresseModel->addSelect(array("strasse","tbl_adressentyp.bezeichnung as adr_typ","plz","ort")))&&
-				isSuccess($adresse_res = $this->AdresseModel->addOrder("zustelladresse","DESC"))&&
-				isSuccess($adresse_res = $this->AdresseModel->addOrder("sort"))&&
-				isSuccess($adresse_res = $this->AdresseModel->addJoin("tbl_adressentyp","typ=adressentyp_kurzbz"))
-			){
-				$adresse_res = $this->AdresseModel->loadWhere(array("person_id"=>getAuthPersonID()));
-				if(isError($adresse_res)){
-					// error handling
-				}else{									
-					$adresse_res = hasData($adresse_res)? getData($adresse_res) : null;
-				}
-			}
-
-			//? die folgenden Informationen darf nur der eigene user sehen
-		$res->adressen = $adresse_res;
-		$res->zutrittsdatum = $zutrittskarte_ausgegebenam;
-		$res->kontakte = $kontakte_res;
-		$res->mittel = $betriebsmittelperson_res;
-
-		}
-		
-
-		if(
-			isSuccess($this->PersonModel->addSelect('gruppe_kurzbz, beschreibung'))&&
-			isSuccess($this->PersonModel->addJoin('tbl_benutzer', 'person_id')) && 
-		isSuccess($this->PersonModel->addJoin('tbl_benutzergruppe', 'uid')) &&
-		isSuccess($this->PersonModel->addJoin('tbl_gruppe', 'gruppe_kurzbz'))){
-
-			$mailverteiler_res = $this->PersonModel->loadWhere(array('mailgrp' => true, 'uid'=>$uid));
-			if( isError($mailverteiler_res)){
-				// catch error
-			}
-			$mailverteiler_res = hasData($mailverteiler_res)? getData($mailverteiler_res) : null;
-			
-			$mailverteiler_res = array_map(function($element) { $element->mailto="mailto:".$element->gruppe_kurzbz."@".DOMAIN; return $element;},$mailverteiler_res);
-		}
-
-		
-		$benutzer_info_sql_columns = ["foto","foto_sperre","anrede","titelpost","titelpre","vorname","nachname"];
-		//? der Geburtsort und das Geburtsdatum darf auch nur der eigene User sehen
-		if (!$view){
-			array_push($benutzer_info_sql_columns, "gebort", "gebdatum");
-		}
-		if(isSuccess($this->BenutzerModel->addSelect($benutzer_info_sql_columns))
-		&& isSuccess($this->BenutzerModel->addJoin("tbl_person", "person_id"))){
-
-			$person_res = $this->BenutzerModel->load([$uid]);
-			if(isError($person_res)){
-				// error handling
-			}else{
-				$person_res = hasData($person_res)? getData($person_res)[0] : null;
-			}
-		}
-		
-
-				
-		
-		$res->foto = $person_res->foto;
-		$res->foto_sperre = $person_res->foto_sperre;
-		$res->username = $uid;
-		
-		$res->anrede = $person_res->anrede;
-		$res->titel = $person_res->titelpre;
-		$res->vorname = $person_res->vorname;
-		$res->nachname = $person_res->nachname;
-		if(!$view){
-		$res->gebort = $person_res->gebort;
-		$res->gebdatum = $person_res->gebdatum;
-	}
-		$res->postnomen = $person_res->titelpost; 
-		$intern_email = array();
-		$intern_email+=array("type" => "intern");
-		$intern_email+=array("email"=> $uid . "@" . DOMAIN);
-		$res->emails = array($intern_email);
-
-	
-		
-		$res->mailverteiler = $mailverteiler_res;
-		 
-
-
-		echo json_encode($res);
-
-	}
-
-
-
-	//! old function that was used to fetch all the data
-	// todo delete the function at the end
-	public function getMitarbeiterAnsicht(){
-
-		
-
-		if(
-			isSuccess($this->PersonModel->addSelect('gruppe_kurzbz, beschreibung'))&&
-			isSuccess($this->PersonModel->addJoin('tbl_benutzer', 'person_id')) && 
-		isSuccess($this->PersonModel->addJoin('tbl_benutzergruppe', 'uid')) &&
-		isSuccess($this->PersonModel->addJoin('tbl_gruppe', 'gruppe_kurzbz'))){
-
-			$mailverteiler_res = $this->PersonModel->loadWhere(array('mailgrp' => true, 'uid'=>getAuthUID()));
-			if( isError($mailverteiler_res)){
-				// catch error
-			}
-			$mailverteiler_res = hasData($mailverteiler_res)? getData($mailverteiler_res) : null;
-			
-			$mailverteiler_res = array_map(function($element) { $element->mailto="mailto:".$element->gruppe_kurzbz."@".DOMAIN; return $element;},$mailverteiler_res);
-		}
-
-	
-
-		if(isSuccess($this->KontaktModel->addSelect('DISTINCT ON (kontakttyp) kontakttyp, kontakt, tbl_kontakt.anmerkung, tbl_kontakt.zustellung')) &&
-		isSuccess($this->KontaktModel->addJoin('public.tbl_standort', 'standort_id', 'LEFT')) &&
-		isSuccess($this->KontaktModel->addJoin('public.tbl_firma', 'firma_id', 'LEFT'))&&
-		isSuccess($this->KontaktModel->addOrder('kontakttyp, kontakt, tbl_kontakt.updateamum, tbl_kontakt.insertamum'))
-		){
-			$kontakte_res = $this->KontaktModel->loadWhere(array('person_id' => getAuthPersonID()));
-			if(isError($kontakte_res)){
-				// handle error	
-			}else{
-				$kontakte_res = hasData($kontakte_res)? getData($kontakte_res) : null;
-			}
-			
-		}
-
-		$zutrittskarte_ausgegebenam = $this->BetriebsmittelpersonModel->getBetriebsmittelByUid(getAuthUID(),"Zutrittskarte");
-		if(isError($zutrittskarte_ausgegebenam)){
-			// error handling
-		}else{
-			$zutrittskarte_ausgegebenam = hasData($zutrittskarte_ausgegebenam)? getData($zutrittskarte_ausgegebenam)[0]->ausgegebenam : null;
-			//? formats the date from 01-01-2000 to 01.01.2000
-			$zutrittskarte_ausgegebenam = str_replace("-",".",$zutrittskarte_ausgegebenam);
-		}
-		
-		
-
-		if(
-			isSuccess($this->BetriebsmittelpersonModel->addSelect(["CONCAT(betriebsmitteltyp, ' ' ,beschreibung) as Betriebsmittel","nummer as Nummer","ausgegebenam as Ausgegeben_am"]))
-			
-		){
-			$betriebsmittelperson_res = $this->BetriebsmittelpersonModel->getBetriebsmittel(getAuthPersonId());
-			if(isError($betriebsmittelperson_res)){
-				   // error handling
-			   }else{
-				   $betriebsmittelperson_res = hasData($betriebsmittelperson_res)? getData($betriebsmittelperson_res) : null;
-			   }
-		   }
-
-		if(
-			//! Summe der Wochenstunden wird jetzt in der hr/tbl_dienstverhaeltnis gespeichert
-		 isSuccess($this->BenutzerfunktionModel->addSelect(["tbl_benutzerfunktion.bezeichnung as Bezeichnung","tbl_organisationseinheit.bezeichnung as Organisationseinheit","datum_von as Gültig_von","datum_bis as Gültig_bis","wochenstunden as Wochenstunden"]))&&
-	  	  isSuccess($this->BenutzerfunktionModel->addJoin("tbl_organisationseinheit","oe_kurzbz"))
-		){
-			$benutzer_funktion_res = $this->BenutzerfunktionModel->loadWhere(array('uid'=>getAuthUID()));
-			if(isError($benutzer_funktion_res)){
-				// error handling
-			}else{
-				$benutzer_funktion_res = hasData($benutzer_funktion_res)? getData($benutzer_funktion_res) : null;
-			}
-		}
-
-
-		if(
-			isSuccess($adresse_res = $this->AdresseModel->addSelect(array("strasse","tbl_adressentyp.bezeichnung as adr_typ","plz","ort")))&&
-			isSuccess($adresse_res = $this->AdresseModel->addOrder("zustelladresse","DESC"))&&
-			isSuccess($adresse_res = $this->AdresseModel->addOrder("sort"))&&
-			isSuccess($adresse_res = $this->AdresseModel->addJoin("tbl_adressentyp","typ=adressentyp_kurzbz"))
-		){
-			$adresse_res = $this->AdresseModel->loadWhere(array("person_id"=>getAuthPersonID()));
-			if(isError($adresse_res)){
-				// error handling
-			}else{									
-				$adresse_res = hasData($adresse_res)? getData($adresse_res) : null;
-			}
-		}
-
-		$benutzer_res = $this->BenutzerModel->load([getAuthUID()]);
-		if(isError($benutzer_res)){
-			// error handling
-		}else{
-			$benutzer_res = hasData($benutzer_res)? getData($benutzer_res)[0] : null;
-		}
-
-		$person_res = $this->PersonModel->load(getAuthPersonId());
-		if(isError($person_res)){
-			// error handling
-		}else{
-			$person_res = hasData($person_res)? getData($person_res)[0] : null;
-		}
-		
-		$mitarbeiter_res = $this->MitarbeiterModel->load(getAuthUID());
-		if(isError($mitarbeiter_res)){
-			// error handling
-		}else{
-			$mitarbeiter_res = hasData($mitarbeiter_res)? getData($mitarbeiter_res)[0] : null;
-		}
-
-		
-		$res = new stdClass();
-		$res->username = getAuthUID();
-
-
-		//? Person Info
-		$res->foto = $person_res->foto;
-		$res->foto_sperre = $person_res->foto_sperre;
-		
-		$res->anrede = $person_res->anrede;
-		$res->titelpre = $person_res->titelpre;
-		$res->titelpost = $person_res->titelpost;
-		$res->vorname = $person_res->vorname;
-		$res->nachname = $person_res->nachname;
-		//$res->postnomen = $person_res->postnomen; //!POSTNOMEN?
-		
-		$res->gebdatum = $person_res->gebdatum;
-		$res->gebort = $person_res->gebort;
-		//? Mitarbeiter Info
-		$res->kurzbz = $mitarbeiter_res->kurzbz;
-		$res->telefonklappe = $mitarbeiter_res->telefonklappe;
-		//? Email Info 
-		$intern_email = array();
-		$intern_email+=array("type" => "intern");
-		$intern_email+=array("email"=> getAuthUID() . "@" . DOMAIN);
-		$extern_email=array();
-		$extern_email+=array("type" => "alias");
-		$extern_email+=array("email" => $benutzer_res->alias . "@" . DOMAIN);
-		$res->emails = array($intern_email,$extern_email);
-		//? Adresse Info 
-		$res->adressen = $adresse_res;
-		//? Benutzerfunktion Info
-		$res->funktionen = $benutzer_funktion_res;
-		//? Betriebsmittel Info
-		$res->mittel = $betriebsmittelperson_res;
-		//? Austellungsdatum von der Zutrittskarte
-		$res->zutrittskarte_ausgegebenam = $zutrittskarte_ausgegebenam;
-		//? Kontakt Info
-		$res->kontakte = $kontakte_res;
-		//? Mailverteiler Info
-		$res->mailverteiler = $mailverteiler_res;
-		 
-		echo json_encode($res);
-		
-	}
-
-	//? check wheter the parameter uid is a Mitarbeiter or a Student
-	public function isMitarbeiterOrStudent($uid){
-		if($this->MitarbeiterModel->isMitarbeiter($uid)->retval){
-			echo json_encode("Mitarbeiter");
-		}//! not sure if the user is automatically a student if he is not a mitarbeiter
-		else if($this->StudentModel->isStudent($uid)->retval){
-			echo json_encode("Student");
-		}else{
-			echo json_encode("Not a Mitarbeiter or Student");
-		}
-
-		
-	}
-
 	public function foto_sperre_function($value){
 		$res = $this->PersonModel->update(getAuthPersonID(),array("foto_sperre"=>$value));
 		if(isError($res)){
@@ -1031,37 +676,4 @@ class Profil extends Auth_Controller
 		echo json_encode($res);
 	}
 
-
-
-	
-
-	
-
-	
-
-
-
-	//? this idea was to use _remap, to call different views based on the type of user
-	/*
-	public function _remap($param)
-	{
-		/$uid wird als global variable weiter gegeben
-			 /get the data from the database with the uid
-			 /give the data to the view 
-			 /put the queried data in global array and access properties needed in the specific view $profile_information = array()
-			/$this -> load->view('Cis/StudentProfile', ["uid" => $uid])
-			
-			
-			if ($param === 'some_method')
-			{
-					echo "if";
-			}
-			else
-			{
-					echo "else";
-			}
-	}*/
-
-	
-
 }

From 617c126aa8f4d872155aac075d7f8803b74d0885 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Wed, 6 Dec 2023 09:52:46 +0100
Subject: [PATCH 0210/1461] store getAuthUID and getAuthPersonID inside Profil
 controller to avoid extra calls

---
 application/controllers/Cis/Profil.php        |  71 +++++------
 public/js/apps/Cis/Profil.js                  |  12 +-
 public/js/apps/api/userdata.js                |   6 +-
 .../Cis/Profil/MitarbeiterProfil.js           |  89 +++++---------
 .../Cis/Profil/MitarbeiterViewProfil.js       |  83 ++-----------
 .../Cis/Profil/{Profil.js => Profil.old.js}   |   0
 .../js/components/Cis/Profil/StudentProfil.js | 105 ++++------------
 .../Cis/Profil/StudentViewProfil.js           | 114 ++----------------
 8 files changed, 119 insertions(+), 361 deletions(-)
 rename public/js/components/Cis/Profil/{Profil.js => Profil.old.js} (100%)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index 71e7e9dae..de6f115da 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -31,6 +31,10 @@ class Profil extends Auth_Controller
 		$this->load->model('ressource/Betriebsmittelperson_model', 'BetriebsmittelpersonModel');
 		$this->load->model('person/Kontakt_model', 'KontaktModel');
 		
+
+		//? put the uid and pid inside the controller for further usage in views
+		$this->uid = getAuthUID();
+		$this->pid = getAuthPersonID();
 		
 	}
 
@@ -48,7 +52,7 @@ class Profil extends Auth_Controller
 	}
 	public function View($uid){
 		
-		if($uid === getAuthUID()){
+		if($uid === $this->uid){
 			$this->index();
 		}else{
 			$this->load->view('Cis/Profil');
@@ -241,7 +245,7 @@ class Profil extends Auth_Controller
 		
 		$intern_email = array();
 			$intern_email+=array("type" => "intern");
-			$intern_email+=array("email"=> getAuthUID() . "@" . DOMAIN);
+			$intern_email+=array("email"=> $this->uid . "@" . DOMAIN);
 		
 			$res->emails = array($intern_email);
 	
@@ -272,7 +276,7 @@ class Profil extends Auth_Controller
 				
 			){
 				//? betriebsmittel are not needed in a view
-				$betriebsmittelperson_res = $this->BetriebsmittelpersonModel->getBetriebsmittel(getAuthPersonId());
+				$betriebsmittelperson_res = $this->BetriebsmittelpersonModel->getBetriebsmittel($this->pid);
 				if(isError($betriebsmittelperson_res)){
 					   // error handling
 				   }else{
@@ -288,7 +292,7 @@ class Profil extends Auth_Controller
 			isSuccess($this->KontaktModel->addJoin('public.tbl_firma', 'firma_id', 'LEFT'))&&
 			isSuccess($this->KontaktModel->addOrder('kontakttyp, kontakt, tbl_kontakt.updateamum, tbl_kontakt.insertamum'))
 			){
-				$kontakte_res = $this->KontaktModel->loadWhere(array('person_id' => getAuthPersonID()));
+				$kontakte_res = $this->KontaktModel->loadWhere(array('person_id' => $this->pid));
 				if(isError($kontakte_res)){
 					// handle error	
 				}else{
@@ -298,7 +302,7 @@ class Profil extends Auth_Controller
 			}
 
 			//? FH Ausweis Austellungsdatum soll auch nur der user selbst sehen
-			$zutrittskarte_ausgegebenam = $this->BetriebsmittelpersonModel->getBetriebsmittelByUid(getAuthUID(),"Zutrittskarte");
+			$zutrittskarte_ausgegebenam = $this->BetriebsmittelpersonModel->getBetriebsmittelByUid($this->uid,"Zutrittskarte");
 			if(isError($zutrittskarte_ausgegebenam)){
 				// error handling
 			}else{
@@ -317,7 +321,7 @@ class Profil extends Auth_Controller
 				isSuccess($adresse_res = $this->AdresseModel->addOrder("sort"))&&
 				isSuccess($adresse_res = $this->AdresseModel->addJoin("tbl_adressentyp","typ=adressentyp_kurzbz"))
 			){
-				$adresse_res = $this->AdresseModel->loadWhere(array("person_id"=>getAuthPersonID()));
+				$adresse_res = $this->AdresseModel->loadWhere(array("person_id"=>$this->pid));
 				if(isError($adresse_res)){
 					// error handling
 				}else{									
@@ -337,7 +341,7 @@ class Profil extends Auth_Controller
 		isSuccess($this->PersonModel->addJoin('tbl_benutzergruppe', 'uid')) &&
 		isSuccess($this->PersonModel->addJoin('tbl_gruppe', 'gruppe_kurzbz'))){
 
-			$mailverteiler_res = $this->PersonModel->loadWhere(array('mailgrp' => true, 'uid'=>getAuthUID()));
+			$mailverteiler_res = $this->PersonModel->loadWhere(array('mailgrp' => true, 'uid'=>$this->uid));
 			if( isError($mailverteiler_res)){
 				// catch error
 			}
@@ -351,7 +355,7 @@ class Profil extends Auth_Controller
 		if(isSuccess($this->BenutzerModel->addSelect(["foto","foto_sperre","anrede","titelpost","titelpre","vorname","nachname", "gebort", "gebdatum"]))
 		&& isSuccess($this->BenutzerModel->addJoin("tbl_person", "person_id"))){
 
-			$person_res = $this->BenutzerModel->load([getAuthUID()]);
+			$person_res = $this->BenutzerModel->load([$this->uid]);
 			if(isError($person_res)){
 				// error handling
 			}else{
@@ -365,7 +369,7 @@ class Profil extends Auth_Controller
 		isSuccess($this->BenutzerfunktionModel->addSelect(["tbl_benutzerfunktion.bezeichnung as Bezeichnung","tbl_organisationseinheit.bezeichnung as Organisationseinheit","datum_von as Gültig_von","datum_bis as Gültig_bis","wochenstunden as Wochenstunden"]))&&
 			isSuccess($this->BenutzerfunktionModel->addJoin("tbl_organisationseinheit","oe_kurzbz"))
 		){
-			$benutzer_funktion_res = $this->BenutzerfunktionModel->loadWhere(array('uid'=>getAuthUID()));
+			$benutzer_funktion_res = $this->BenutzerfunktionModel->loadWhere(array('uid'=>$this->uid));
 			if(isError($benutzer_funktion_res)){
 				// error handling
 			}else{
@@ -379,7 +383,7 @@ class Profil extends Auth_Controller
 		if(isSuccess($this->MitarbeiterModel->addSelect(["kurzbz","telefonklappe", "alias","ort_kurzbz"]))
 			&& isSuccess($this->MitarbeiterModel->addJoin("tbl_benutzer", "tbl_benutzer.uid = tbl_mitarbeiter.mitarbeiter_uid"))
 		){
-			$mitarbeiter_res = $this->MitarbeiterModel->load(getAuthUID());
+			$mitarbeiter_res = $this->MitarbeiterModel->load($this->uid);
 				if(isError($mitarbeiter_res)){
 					// error handling
 				}else{
@@ -390,7 +394,7 @@ class Profil extends Auth_Controller
 			$res = new stdClass();
 			$res->foto = $person_res->foto;
 			$res->foto_sperre = $person_res->foto_sperre;
-			$res->username = getAuthUID();
+			$res->username = $this->uid;
 			
 			$res->anrede = $person_res->anrede;
 			$res->titel = $person_res->titelpre;
@@ -415,7 +419,7 @@ class Profil extends Auth_Controller
 			}
 			$intern_email = array();
 			$intern_email+=array("type" => "intern");
-			$intern_email+=array("email"=> getAuthUID() . "@" . DOMAIN);
+			$intern_email+=array("email"=> $this->uid . "@" . DOMAIN);
 			$extern_email=array();
 			$extern_email+=array("type" => "alias");
 			$extern_email+=array("email" => $mitarbeiter_res->alias . "@" . DOMAIN);
@@ -437,7 +441,7 @@ class Profil extends Auth_Controller
 				
 			){
 				//? betriebsmittel are not needed in a view
-				$betriebsmittelperson_res = $this->BetriebsmittelpersonModel->getBetriebsmittel(getAuthPersonId());
+				$betriebsmittelperson_res = $this->BetriebsmittelpersonModel->getBetriebsmittel($this->pid);
 				if(isError($betriebsmittelperson_res)){
 					   // error handling
 				   }else{
@@ -453,7 +457,7 @@ class Profil extends Auth_Controller
 			isSuccess($this->KontaktModel->addJoin('public.tbl_firma', 'firma_id', 'LEFT'))&&
 			isSuccess($this->KontaktModel->addOrder('kontakttyp, kontakt, tbl_kontakt.updateamum, tbl_kontakt.insertamum'))
 			){
-				$kontakte_res = $this->KontaktModel->loadWhere(array('person_id' => getAuthPersonID()));
+				$kontakte_res = $this->KontaktModel->loadWhere(array('person_id' => $this->pid));
 				if(isError($kontakte_res)){
 					// handle error	
 				}else{
@@ -463,7 +467,7 @@ class Profil extends Auth_Controller
 			}
 
 			//? FH Ausweis Austellungsdatum soll auch nur der user selbst sehen
-			$zutrittskarte_ausgegebenam = $this->BetriebsmittelpersonModel->getBetriebsmittelByUid(getAuthUID(),"Zutrittskarte");
+			$zutrittskarte_ausgegebenam = $this->BetriebsmittelpersonModel->getBetriebsmittelByUid($this->uid,"Zutrittskarte");
 			if(isError($zutrittskarte_ausgegebenam)){
 				// error handling
 			}else{
@@ -482,7 +486,7 @@ class Profil extends Auth_Controller
 				isSuccess($adresse_res = $this->AdresseModel->addOrder("sort"))&&
 				isSuccess($adresse_res = $this->AdresseModel->addJoin("tbl_adressentyp","typ=adressentyp_kurzbz"))
 			){
-				$adresse_res = $this->AdresseModel->loadWhere(array("person_id"=>getAuthPersonID()));
+				$adresse_res = $this->AdresseModel->loadWhere(array("person_id"=>$this->pid));
 				if(isError($adresse_res)){
 					// error handling
 				}else{									
@@ -502,7 +506,7 @@ class Profil extends Auth_Controller
 		isSuccess($this->PersonModel->addJoin('tbl_benutzergruppe', 'uid')) &&
 		isSuccess($this->PersonModel->addJoin('tbl_gruppe', 'gruppe_kurzbz'))){
 
-			$mailverteiler_res = $this->PersonModel->loadWhere(array('mailgrp' => true, 'uid'=>getAuthUID()));
+			$mailverteiler_res = $this->PersonModel->loadWhere(array('mailgrp' => true, 'uid'=>$this->uid));
 			if( isError($mailverteiler_res)){
 				// catch error
 			}
@@ -516,7 +520,7 @@ class Profil extends Auth_Controller
 		if(isSuccess($this->BenutzerModel->addSelect(["foto","foto_sperre","anrede","titelpost","titelpre","vorname","nachname", "gebort", "gebdatum"]))
 		&& isSuccess($this->BenutzerModel->addJoin("tbl_person", "person_id"))){
 
-			$person_res = $this->BenutzerModel->load([getAuthUID()]);
+			$person_res = $this->BenutzerModel->load([$this->uid]);
 			if(isError($person_res)){
 				// error handling
 			}else{
@@ -529,7 +533,7 @@ class Profil extends Auth_Controller
 		isSuccess($this->BenutzergruppeModel->addSelect(['bezeichnung']))
 		&& isSuccess($this->BenutzergruppeModel->addJoin('tbl_gruppe', 'gruppe_kurzbz' ))
 		){
-			$zutrittsgruppe_res = $this->BenutzergruppeModel->loadWhere(array("uid"=>getAuthUID(), "zutrittssystem"=>true));
+			$zutrittsgruppe_res = $this->BenutzergruppeModel->loadWhere(array("uid"=>$this->uid, "zutrittssystem"=>true));
 			if(isError($zutrittsgruppe_res)){
 				// catch error
 			}
@@ -543,7 +547,7 @@ class Profil extends Auth_Controller
 		if(isSuccess($this->StudentModel->addSelect(['tbl_studiengang.bezeichnung as studiengang','tbl_student.semester', 'tbl_student.verband', 'tbl_student.gruppe' ,'tbl_student.matrikelnr as personenkennzeichen']))
 		 && isSuccess($this->StudentModel->addJoin('tbl_studiengang', "tbl_studiengang.studiengang_kz=tbl_student.studiengang_kz")))
 		{
-			$student_res = $this->StudentModel->load([getAuthUID()]);
+			$student_res = $this->StudentModel->load([$this->uid]);
 			if(isError($student_res)){
 				// catch error
 			}
@@ -556,7 +560,7 @@ class Profil extends Auth_Controller
 		//? Matrikelnummer ist die Spalte matr_nr in Person
 		if(isSuccess($this->BenutzerModel->addSelect(["matr_nr"])) 
 		&& isSuccess($this->BenutzerModel->addJoin("tbl_person","person_id"))){
-			$matr_res = $this->BenutzerModel->load([getAuthUID()]);
+			$matr_res = $this->BenutzerModel->load([$this->uid]);
 			if(isError($matr_res)){
 				// catch error
 			}else{
@@ -570,7 +574,7 @@ class Profil extends Auth_Controller
 		
 		$res->foto = $person_res->foto;
 		$res->foto_sperre = $person_res->foto_sperre;
-		$res->username = getAuthUID();
+		$res->username = $this->uid;
 		
 		$res->anrede = $person_res->anrede;
 		$res->titel = $person_res->titelpre;
@@ -585,7 +589,7 @@ class Profil extends Auth_Controller
 
 		$intern_email = array();
 		$intern_email+=array("type" => "intern");
-		$intern_email+=array("email"=> getAuthUID() . "@" . DOMAIN);
+		$intern_email+=array("email"=> $this->uid . "@" . DOMAIN);
 		
 		$res->emails = array($intern_email);
 		$res->adressen = $adresse_res;
@@ -608,30 +612,29 @@ class Profil extends Auth_Controller
 
 	}
 
-	public function getView(){
-		// property_exists(object|string $object_or_class, string $property): bool
+	public function getView($uid){
+	
 		
-		$payload = json_decode($this->input->raw_input_stream);
-		/* echo json_encode($payload);
-		return; */
-		$uid = property_exists($payload,"uid")?  $payload->uid : null;
+		$uid = $uid != "Profil" ? $uid : null;
 		
 		
 		$isMitarbeiter = null;
 		if($uid)
 			$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter($uid);
 		else
-			$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter(getAuthUID());
+			$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter($this->uid);
 		
 
 		if(isError($isMitarbeiter)){
 			//catch error
+			echo "error";
+			return;
 		}
 		$isMitarbeiter = hasData($isMitarbeiter) ? getData($isMitarbeiter) : null;
 		
 		$res = new stdClass();
 		
-		if($uid == getAuthUID() || !$uid ){
+		if($uid == $this->uid || !$uid ){
 			// if the $uid is empty, then no payload was supplied and the own profile is being requested
 			if($isMitarbeiter ) {
 				$res->view= "MitarbeiterProfil";
@@ -658,14 +661,14 @@ class Profil extends Auth_Controller
 		echo json_encode($res);
 		
 	}
-	public function foto_sperre_function($value){
-		$res = $this->PersonModel->update(getAuthPersonID(),array("foto_sperre"=>$value));
+	public function foto_sperre_function($value, $uid=""){
+		$res = $this->PersonModel->update($this->pid,array("foto_sperre"=>$value));
 		if(isError($res)){
 			// error handling
 		}else{
 			//? select the value of the column foto_sperre to return 
 			if(isSuccess($this->PersonModel->addSelect("foto_sperre"))){
-				$res = $this->PersonModel->load(getAuthPersonID());
+				$res = $this->PersonModel->load($this->pid);
 				if(isError($res)){
 					// error handling
 				}
diff --git a/public/js/apps/Cis/Profil.js b/public/js/apps/Cis/Profil.js
index af86d2ea2..c48d7ef23 100644
--- a/public/js/apps/Cis/Profil.js
+++ b/public/js/apps/Cis/Profil.js
@@ -30,18 +30,16 @@ const app = Vue.createApp({
 	created(){
 
 		let path = location.pathname;
-		console.log(path);
-		console.log(path.lastIndexOf('/'));
+		
 		let uid = path.substring(path.lastIndexOf('/')).replace("/","");
-		console.log("i am passing this uid: ", uid);
-		const payload = {
+		
+		/* const payload = {
 			...(uid != "Profil" ? {uid} : {})
 		};
-
-		Vue.$fhcapi.UserData.getView(payload).then((res)=>{
+ */
+		Vue.$fhcapi.UserData.getView(uid).then((res)=>{
 			this.view = res.data.view;
 			this.data = res.data.data;
-			console.log(res.data);
 		});
 	},
 	template:`
diff --git a/public/js/apps/api/userdata.js b/public/js/apps/api/userdata.js
index b0213e0e4..8a13d16ae 100644
--- a/public/js/apps/api/userdata.js
+++ b/public/js/apps/api/userdata.js
@@ -8,10 +8,10 @@ export default {
         return axios.get(url);
     },
 
-    getView: function(payload) {
+    getView: function(uid) {
         const url = FHC_JS_DATA_STORAGE_OBJECT.app_root 
-                  + `cis.php/Cis/Profil/getView`;
-        return axios.post(url,payload);
+                  + `cis.php/Cis/Profil/getView/${uid}`;
+        return axios.get(url);
     },
  
     sperre_foto_function: function(value) {
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 45897eb82..765893f8f 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -1,24 +1,13 @@
 import fhcapifactory from "../../../apps/api/fhcapifactory.js";
 import { CoreFilterCmpt } from "../../../components/filter/Filter.js";
 
-//? possible types of roles:
-//! depending on the role of the current view, different content is being displayed and fetched
-//* Student
-//* Mitarbeiter
-//* View_Student
-//* View_Mitarbeiter
-
 export default {
   components: {
     CoreFilterCmpt,
   },
   data() {
     return {
-      index_information: null,
-      mitarbeiter_info: null,
-      student_info: null,
-      //? beinhaltet die Information ob der angefragte user ein Student oder Mitarbeiter ist
-      role: null,
+      
 
       funktionen_table_options: {
         height: 300,
@@ -66,48 +55,14 @@ export default {
           },
         ],
       },
-      zutrittsgruppen_table_options: {
-        height: 300,
-        layout: "fitColumns",
-        data: [{ bezeichnung: "test1" }],
-        columns: [{ title: "Zutritt", field: "bezeichnung" }],
-      },
+     
     };
   },
 
-  //? this props were passed in the Profil.php view file
+    //? this is the prop passed to the dynamic component with the custom data of the view
   props: ["data"],
   methods: {
-    concatenate_addresses(address_array) {
-      let result = "";
-      for (let i = 0; i < address_array.length; i++) {
-        result +=
-          address_array[i].strasse +
-          " " +
-          address_array[i].plz +
-          " " +
-          address_array[i].ort +
-          "\n";
-      }
-      return result;
-    },
-    render_unterelement(wert, bezeichnung) {
-      if (isArray(bezeichnung)) {
-      }
-    },
-    concatenate_kontakte(kontakt_array) {
-      let result = "";
-      for (let i = 0; i < kontakt_array.length; i++) {
-        result +=
-          kontakt_array[i].kontakttyp +
-          " " +
-          kontakt_array[i].kontakt +
-          " " +
-          kontakt_array[i].zustellung +
-          "\n";
-      }
-      return result;
-    },
+   
     sperre_foto_function(value) {
       if (!this.data) {
         return;
@@ -124,6 +79,7 @@ export default {
       }
       return "data:image/jpeg;base64," + this.data.foto;
     },
+    //? this computed function returns all the informations for the first column in the profil 
     personData() {
       if (!this.data) {
         return {};
@@ -150,7 +106,7 @@ export default {
         },
       };
     },
-    //? this computed conains all the information that is used for the second column that displays the information of the person
+    //? this computed function returns the data for the second column in the profil 
     kontaktInfo() {
       if (!this.data) {
         return {};
@@ -188,15 +144,28 @@ export default {
                 <!-- this is the left column of the window -->
                     <div class="col-9">
                         <div class="row">
+                            
+
+
                             <div class="col">
-                                <img class="img-thumbnail" :src="get_image_base64_src"></img>
-                                
-                                <div v-if="data.foto_sperre ">
-                                    <p style="margin:0">Profilfoto gesperrt</p>
-                                    <a href="#" @click.prevent="sperre_foto_function(false)" style="text-decoration:none">Sperre des Profilfotos aufheben</a>
+                            <div class="row">
+                                <div class="col">
+                                    <img class="img-thumbnail" :src="get_image_base64_src"></img>
                                 </div>
-                                <a href="#" @click.prevent="sperre_foto_function(true)" style="display:block; text-decoration:none"  v-else>Profilfoto sperren</a>
                             </div>
+                            <div class="row">
+                                <div class="col">
+                                    <div v-if="data.foto_sperre ">
+                                        <p class="m-0">Profilfoto gesperrt</p>
+                                        <a href="#" @click.prevent="sperre_foto_function(false)" class="text-decoration-none">Sperre des Profilfotos aufheben</a>
+                                    </div>
+                                    <a href="#" @click.prevent="sperre_foto_function(true)" class="text-decoration-none"  v-else>Profilfoto sperren</a>
+                                </div>
+                            </div>
+                        </div>
+
+
+
                             
                           
                             <div class="col">
@@ -213,9 +182,9 @@ export default {
                                 
                             </div>
                             <div class="col">
-                                <ol style="list-style:none">
+                                <div style="list-style:none">
                                 
-                                    <li v-for="(wert,bezeichnung) in kontaktInfo">
+                                    <p v-for="(wert,bezeichnung) in kontaktInfo">
                                     
                                     <!-- HIER IST DAS DATUM DES FH AUSWEIS -->
                                         <div class="mb-3" v-if="bezeichnung=='FhAusweisStatus'">
@@ -244,8 +213,8 @@ export default {
                                             </div>
                                         </div>
                                     
-                                    </li>
-                                </ol>
+                                    </p>
+                                </div>
 
 
                             </div>
diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
index ad0afd863..d7da24779 100644
--- a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
@@ -1,12 +1,6 @@
 import fhcapifactory from "../../../apps/api/fhcapifactory.js";
 import { CoreFilterCmpt } from "../../../components/filter/Filter.js";
 
-//? possible types of roles:
-//! depending on the role of the current view, different content is being displayed and fetched
-//* Student
-//* Mitarbeiter
-//* View_Student
-//* View_Mitarbeiter
 
 export default {
   components: {
@@ -14,11 +8,7 @@ export default {
   },
   data() {
     return {
-      index_information: null,
-      mitarbeiter_info: null,
-      student_info: null,
-      //? beinhaltet die Information ob der angefragte user ein Student oder Mitarbeiter ist
-      role: null,
+      
 
       funktionen_table_options: {
         height: 300,
@@ -48,66 +38,14 @@ export default {
           },
         ],
       },
-      betriebsmittel_table_options: {
-        height: 300,
-        layout: "fitColumns",
-        data: [{ betriebsmittel: "", Nummer: "", Ausgegeben_am: "" }],
-        columns: [
-          {
-            title: "Betriebsmittel",
-            field: "betriebsmittel",
-            headerFilter: true,
-          },
-          { title: "Nummer", field: "Nummer", headerFilter: true },
-          {
-            title: "Ausgegeben_am",
-            field: "Ausgegeben_am",
-            headerFilter: true,
-          },
-        ],
-      },
-      zutrittsgruppen_table_options: {
-        height: 300,
-        layout: "fitColumns",
-        data: [{ bezeichnung: "test1" }],
-        columns: [{ title: "Zutritt", field: "bezeichnung" }],
-      },
+    
+   
     };
   },
-
-  //? this props were passed in the Profil.php view file
+  //? this is the prop passed to the dynamic component with the custom data of the view
   props: ["data"],
   methods: {
-    concatenate_addresses(address_array) {
-      let result = "";
-      for (let i = 0; i < address_array.length; i++) {
-        result +=
-          address_array[i].strasse +
-          " " +
-          address_array[i].plz +
-          " " +
-          address_array[i].ort +
-          "\n";
-      }
-      return result;
-    },
-    render_unterelement(wert, bezeichnung) {
-      if (isArray(bezeichnung)) {
-      }
-    },
-    concatenate_kontakte(kontakt_array) {
-      let result = "";
-      for (let i = 0; i < kontakt_array.length; i++) {
-        result +=
-          kontakt_array[i].kontakttyp +
-          " " +
-          kontakt_array[i].kontakt +
-          " " +
-          kontakt_array[i].zustellung +
-          "\n";
-      }
-      return result;
-    },
+   
     sperre_foto_function(value) {
       if (!this.data) {
         return;
@@ -124,6 +62,7 @@ export default {
       }
       return "data:image/jpeg;base64," + this.data.foto;
     },
+    //? this computed function returns all the informations for the first column in the profil 
     personData() {
       if (!this.data) {
         return {};
@@ -147,7 +86,7 @@ export default {
         },
       };
     },
-    //? this computed conains all the information that is used for the second column that displays the information of the person
+    //? this computed function returns the data for the second column in the profil 
     kontaktInfo() {
       if (!this.data) {
         return {};
@@ -206,9 +145,9 @@ export default {
                                 
                             </div>
                             <div class="col">
-                                <ol style="list-style:none">
+                                <div style="list-style:none">
                                 
-                                    <li v-for="(wert,bezeichnung) in kontaktInfo">
+                                    <p v-for="(wert,bezeichnung) in kontaktInfo">
                                     
                                     <!-- HIER IST DAS DATUM DES FH AUSWEIS -->
                                         <div class="mb-3" v-if="bezeichnung=='FhAusweisStatus'">
@@ -237,8 +176,8 @@ export default {
                                             </div>
                                         </div>
                                     
-                                    </li>
-                                </ol>
+                                    </p>
+                                </div>
 
 
                             </div>
diff --git a/public/js/components/Cis/Profil/Profil.js b/public/js/components/Cis/Profil/Profil.old.js
similarity index 100%
rename from public/js/components/Cis/Profil/Profil.js
rename to public/js/components/Cis/Profil/Profil.old.js
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index 13105d949..a0aff3196 100644
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -1,12 +1,6 @@
 import fhcapifactory from "../../../apps/api/fhcapifactory.js";
 import { CoreFilterCmpt } from "../../../components/filter/Filter.js";
 
-//? possible types of roles:
-//! depending on the role of the current view, different content is being displayed and fetched
-//* Student
-//* Mitarbeiter
-//* View_Student
-//* View_Mitarbeiter
 
 export default {
   components: {
@@ -14,40 +8,9 @@ export default {
   },
   data() {
     return {
-      index_information: null,
-      mitarbeiter_info: null,
-      student_info: null,
-      //? beinhaltet die Information ob der angefragte user ein Student oder Mitarbeiter ist
-      role: null,
+     
 
-      funktionen_table_options: {
-        height: 300,
-        layout: "fitColumns",
-        data: [
-          {
-            Bezeichnung: "",
-            Organisationseinheit: "",
-            Gültig_von: "",
-            Gültig_bis: "",
-            Wochenstunden: "",
-          },
-        ],
-        columns: [
-          { title: "Bezeichnung", field: "Bezeichnung", headerFilter: true },
-          {
-            title: "Organisationseinheit",
-            field: "Organisationseinheit",
-            headerFilter: true,
-          },
-          { title: "Gültig_von", field: "Gültig_von", headerFilter: true },
-          { title: "Gültig_bis", field: "Gültig_bis", headerFilter: true },
-          {
-            title: "Wochenstunden",
-            field: "Wochenstunden",
-            headerFilter: true,
-          },
-        ],
-      },
+    
       betriebsmittel_table_options: {
         height: 300,
         layout: "fitColumns",
@@ -75,39 +38,9 @@ export default {
     };
   },
 
-  //? this props were passed in the Profil.php view file
+  //? this is the prop passed to the dynamic component with the custom data of the view
   props: ["data"],
   methods: {
-    concatenate_addresses(address_array) {
-      let result = "";
-      for (let i = 0; i < address_array.length; i++) {
-        result +=
-          address_array[i].strasse +
-          " " +
-          address_array[i].plz +
-          " " +
-          address_array[i].ort +
-          "\n";
-      }
-      return result;
-    },
-    render_unterelement(wert, bezeichnung) {
-      if (isArray(bezeichnung)) {
-      }
-    },
-    concatenate_kontakte(kontakt_array) {
-      let result = "";
-      for (let i = 0; i < kontakt_array.length; i++) {
-        result +=
-          kontakt_array[i].kontakttyp +
-          " " +
-          kontakt_array[i].kontakt +
-          " " +
-          kontakt_array[i].zustellung +
-          "\n";
-      }
-      return result;
-    },
     sperre_foto_function(value) {
       if (!this.data) {
         return;
@@ -124,6 +57,7 @@ export default {
       }
       return "data:image/jpeg;base64," + this.data.foto;
     },
+    //? this computed function returns all the informations for the first column in the profil 
     personData() {
       if (!this.data) {
         return {};
@@ -153,7 +87,7 @@ export default {
         },
       };
     },
-    //? this computed conains all the information that is used for the second column that displays the information of the person
+    //? this computed function returns the data for the second column in the profil 
     kontaktInfo() {
       if (!this.data) {
         return {};
@@ -192,13 +126,20 @@ export default {
                     <div class="col-9">
                         <div class="row">
                             <div class="col">
-                                <img class="img-thumbnail" :src="get_image_base64_src"></img>
-                                
-                                <div v-if="data.foto_sperre ">
-                                    <p style="margin:0">Profilfoto gesperrt</p>
-                                    <a href="#" @click.prevent="sperre_foto_function(false)" style="text-decoration:none">Sperre des Profilfotos aufheben</a>
+                                <div class="row">
+                                    <div class="col">
+                                        <img class="img-thumbnail" :src="get_image_base64_src"></img>
+                                    </div>
+                                </div>
+                                <div class="row">
+                                    <div class="col">
+                                        <div v-if="data.foto_sperre ">
+                                            <p class="m-0">Profilfoto gesperrt</p>
+                                            <a href="#" @click.prevent="sperre_foto_function(false)" class="text-decoration-none">Sperre des Profilfotos aufheben</a>
+                                        </div>
+                                        <a href="#" @click.prevent="sperre_foto_function(true)" class="text-decoration-none"  v-else>Profilfoto sperren</a>
+                                    </div>
                                 </div>
-                                <a href="#" @click.prevent="sperre_foto_function(true)" style="display:block; text-decoration:none"  v-else>Profilfoto sperren</a>
                             </div>
                             
                           
@@ -209,16 +150,16 @@ export default {
                                 
                                 <div v-for="(wert,bezeichnung) in personData">
                                 
-                                <div class="mb-3"  v-if="typeof wert == 'object' && bezeichnung=='Adressen'"><span style="display:block" v-for="element in wert">{{element.strasse}} <b>({{element.adr_typ}})</b><br/>{{ element.plz}} {{element.ort}}</span></div>
+                                <div class="mb-3"  v-if="typeof wert == 'object' && bezeichnung=='Adressen'"><p style="display:block" v-for="element in wert">{{element.strasse}} <b>({{element.adr_typ}})</b><br/>{{ element.plz}} {{element.ort}}</p></div>
                                 <div v-else class="mb-3" ><span style="display:block;" v-for="(val,bez) in wert">{{bez}}: {{val}}</span></div>
                                 
                                 </div>
                                 
                             </div>
                             <div class="col">
-                                <ol style="list-style:none">
+                                <div >
                                 
-                                    <li v-for="(wert,bezeichnung) in kontaktInfo">
+                                    <p v-for="(wert,bezeichnung) in kontaktInfo">
                                     
                                     <!-- HIER IST DAS DATUM DES FH AUSWEIS -->
                                         <div class="mb-3" v-if="bezeichnung=='FhAusweisStatus'">
@@ -247,8 +188,8 @@ export default {
                                             </div>
                                         </div>
                                     
-                                    </li>
-                                </ol>
+                                    </p>
+                                </div>
 
 
                             </div>
diff --git a/public/js/components/Cis/Profil/StudentViewProfil.js b/public/js/components/Cis/Profil/StudentViewProfil.js
index a5f4036fb..8dbc4275e 100644
--- a/public/js/components/Cis/Profil/StudentViewProfil.js
+++ b/public/js/components/Cis/Profil/StudentViewProfil.js
@@ -1,113 +1,20 @@
 import fhcapifactory from "../../../apps/api/fhcapifactory.js";
-import { CoreFilterCmpt } from "../../../components/filter/Filter.js";
 
-//? possible types of roles:
-//! depending on the role of the current view, different content is being displayed and fetched
-//* Student
-//* Mitarbeiter
-//* View_Student
-//* View_Mitarbeiter
 
 export default {
-  components: {
-    CoreFilterCmpt,
-  },
+ 
   data() {
     return {
-      index_information: null,
-      mitarbeiter_info: null,
-      student_info: null,
-      //? beinhaltet die Information ob der angefragte user ein Student oder Mitarbeiter ist
-      role: null,
+   
 
-      funktionen_table_options: {
-        height: 300,
-        layout: "fitColumns",
-        data: [
-          {
-            Bezeichnung: "",
-            Organisationseinheit: "",
-            Gültig_von: "",
-            Gültig_bis: "",
-            Wochenstunden: "",
-          },
-        ],
-        columns: [
-          { title: "Bezeichnung", field: "Bezeichnung", headerFilter: true },
-          {
-            title: "Organisationseinheit",
-            field: "Organisationseinheit",
-            headerFilter: true,
-          },
-          { title: "Gültig_von", field: "Gültig_von", headerFilter: true },
-          { title: "Gültig_bis", field: "Gültig_bis", headerFilter: true },
-          {
-            title: "Wochenstunden",
-            field: "Wochenstunden",
-            headerFilter: true,
-          },
-        ],
-      },
-      betriebsmittel_table_options: {
-        height: 300,
-        layout: "fitColumns",
-        data: [{ betriebsmittel: "", Nummer: "", Ausgegeben_am: "" }],
-        columns: [
-          {
-            title: "Betriebsmittel",
-            field: "betriebsmittel",
-            headerFilter: true,
-          },
-          { title: "Nummer", field: "Nummer", headerFilter: true },
-          {
-            title: "Ausgegeben_am",
-            field: "Ausgegeben_am",
-            headerFilter: true,
-          },
-        ],
-      },
-      zutrittsgruppen_table_options: {
-        height: 300,
-        layout: "fitColumns",
-        data: [{ bezeichnung: "test1" }],
-        columns: [{ title: "Zutritt", field: "bezeichnung" }],
-      },
+      
     };
   },
 
-  //? this props were passed in the Profil.php view file
+    //? this is the prop passed to the dynamic component with the custom data of the view
   props: ["data"],
   methods: {
-    concatenate_addresses(address_array) {
-      let result = "";
-      for (let i = 0; i < address_array.length; i++) {
-        result +=
-          address_array[i].strasse +
-          " " +
-          address_array[i].plz +
-          " " +
-          address_array[i].ort +
-          "\n";
-      }
-      return result;
-    },
-    render_unterelement(wert, bezeichnung) {
-      if (isArray(bezeichnung)) {
-      }
-    },
-    concatenate_kontakte(kontakt_array) {
-      let result = "";
-      for (let i = 0; i < kontakt_array.length; i++) {
-        result +=
-          kontakt_array[i].kontakttyp +
-          " " +
-          kontakt_array[i].kontakt +
-          " " +
-          kontakt_array[i].zustellung +
-          "\n";
-      }
-      return result;
-    },
+
     sperre_foto_function(value) {
       if (!this.data) {
         return;
@@ -124,6 +31,7 @@ export default {
       }
       return "data:image/jpeg;base64," + this.data.foto;
     },
+    //? this computed function returns all the informations for the first column in the profil 
     personData() {
       if (!this.data) {
         return {};
@@ -150,7 +58,7 @@ export default {
         },
       };
     },
-    //? this computed conains all the information that is used for the second column that displays the information of the person
+    //? this computed function returns the data for the second column in the profil 
     kontaktInfo() {
       if (!this.data) {
         return {};
@@ -199,9 +107,9 @@ export default {
                                 
                             </div>
                             <div class="col">
-                                <ol style="list-style:none">
+                                <div style="list-style:none">
                                 
-                                    <li v-for="(wert,bezeichnung) in kontaktInfo">
+                                    <p v-for="(wert,bezeichnung) in kontaktInfo">
                                         <!-- HIER SIND DIE EMAILS -->
                                         <div class="mb-3" v-if="typeof wert === 'object' && bezeichnung == 'emails'">
                                             <p class="mb-0"><b>eMail</b></p>
@@ -210,8 +118,8 @@ export default {
 
                                        
                                     
-                                    </li>
-                                </ol>
+                                    </p>
+                                </div>
 
 
                             </div>

From 02e7ef12dec6b7845fe7ebbf8c9d73ba6e00b580 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Wed, 6 Dec 2023 13:47:35 +0100
Subject: [PATCH 0211/1461] Profil information layout

---
 application/controllers/Cis/Profil.php        | 28 +++++++--
 public/js/apps/Cis/Profil.js                  | 21 ++++---
 .../Cis/Profil/MitarbeiterProfil.js           | 61 +++++++++++--------
 .../Cis/Profil/MitarbeiterViewProfil.js       |  6 +-
 4 files changed, 73 insertions(+), 43 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index de6f115da..9dfbc741d 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -618,20 +618,31 @@ class Profil extends Auth_Controller
 		$uid = $uid != "Profil" ? $uid : null;
 		
 		
+		
 		$isMitarbeiter = null;
-		if($uid)
+		if($uid){
+			
+			if(isSuccess($this->PersonModel->addSelect(["person_id"]))){
+				$pid = $this->PersonModel->getByUid($uid);
+				$pid = hasData($pid) ? getData($pid)[0] : null;
+				
+			}
+			if(!$pid){
+				return null;
+			}
+			
 			$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter($uid);
+		}
 		else
 			$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter($this->uid);
 		
 
 		if(isError($isMitarbeiter)){
 			//catch error
-			echo "error";
-			return;
 		}
 		$isMitarbeiter = hasData($isMitarbeiter) ? getData($isMitarbeiter) : null;
 		
+		
 		$res = new stdClass();
 		
 		if($uid == $this->uid || !$uid ){
@@ -639,10 +650,12 @@ class Profil extends Auth_Controller
 			if($isMitarbeiter ) {
 				$res->view= "MitarbeiterProfil";
 				$res->data = $this->mitarbeiterProfil();
+				$res->data->pid = $this->pid;
 			}
 			else {
 				$res->view= "StudentProfil";
 				$res->data = $this->studentProfil();
+				$res->data->pid = $this->pid;
 			}
 		}
 		elseif($uid){
@@ -650,10 +663,12 @@ class Profil extends Auth_Controller
 			if($isMitarbeiter ){
 				 $res->view= "ViewMitarbeiterProfil";
 				 $res->data= $this->viewMitarbeiterProfil($uid);
+				
 			}
 			else {
 				$res->view= "ViewStudentProfil";
 				$res->data= $this->viewStudentProfil($uid);
+				
 			}
 		}
 
@@ -661,9 +676,14 @@ class Profil extends Auth_Controller
 		echo json_encode($res);
 		
 	}
-	public function foto_sperre_function($value, $uid=""){
+
+	public function foto_sperre_function($value){
+		//? Nur der Index User hat die Erlaubniss das Profilbild zu sperren 
 		$res = $this->PersonModel->update($this->pid,array("foto_sperre"=>$value));
+		
 		if(isError($res)){
+			echo json_encode("error encountered when updating foto_sperre");
+			return;
 			// error handling
 		}else{
 			//? select the value of the column foto_sperre to return 
diff --git a/public/js/apps/Cis/Profil.js b/public/js/apps/Cis/Profil.js
index c48d7ef23..a6f811478 100644
--- a/public/js/apps/Cis/Profil.js
+++ b/public/js/apps/Cis/Profil.js
@@ -21,6 +21,8 @@ const app = Vue.createApp({
 		return {
 			view:null,
 			data:null,
+			// notfound is null by default, but contains an UID if no user exists with that UID
+			notFoundUID:null,
 			
 		}
 	},
@@ -32,21 +34,22 @@ const app = Vue.createApp({
 		let path = location.pathname;
 		
 		let uid = path.substring(path.lastIndexOf('/')).replace("/","");
-		
-		/* const payload = {
-			...(uid != "Profil" ? {uid} : {})
-		};
- */
+
 		Vue.$fhcapi.UserData.getView(uid).then((res)=>{
-			this.view = res.data.view;
-			this.data = res.data.data;
+			if(!res.data){
+				this.notFoundUID=uid;
+			}
+			this.view = res.data?.view;
+			this.data = res.data?.data;
 		});
 	},
 	template:`
 	<div>
 	
-	
-	<component :is="view" :data="data" ></component>
+	<div v-if="notFoundUID">
+	<h3>Es wurden keine oder mehrere Profile für {{this.notFoundUID}} gefunden</h3>
+	</div>
+	<component v-else :is="view" :data="data" ></component>
 	</div>`
 	
 	
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 765893f8f..12f7cb88e 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -40,7 +40,7 @@ export default {
       betriebsmittel_table_options: {
         height: 300,
         layout: "fitColumns",
-        data: [{ betriebsmittel: "", Nummer: "", Ausgegeben_am: "" }],
+        data: [{ betriebsmittel: "<a href='#'>test</a>", Nummer: "", Ausgegeben_am: "" }],
         columns: [
           {
             title: "Betriebsmittel",
@@ -93,8 +93,6 @@ export default {
           Vorname: this.data.vorname,
           Nachname: this.data.nachname,
           Postnomen: this.data.postnomen,
-        },
-        GeburtsDaten: {
           Geburtsdatum: this.data.gebdatum,
           Geburtsort: this.data.gebort,
         },
@@ -121,7 +119,7 @@ export default {
   },
 
   mounted() {
-    this.$refs.betriebsmittelTable.tabulator.on('tableBuilt', () => {
+     this.$refs.betriebsmittelTable.tabulator.on('tableBuilt', () => {
     
         this.$refs.betriebsmittelTable.tabulator.setData(this.data.mittel);
         
@@ -132,12 +130,11 @@ export default {
         this.$refs.funktionenTable.tabulator.setData(this.data.funktionen);
         
     }) 
-
+ 
   },
 
   template: `
 
-
             <div class="container-fluid">
             <!-- here starts the row of the whole window -->
                 <div class="row">
@@ -147,9 +144,10 @@ export default {
                             
 
 
-                            <div class="col">
+                            <div class="col-2">
                             <div class="row">
                                 <div class="col">
+                                <h3 >Mitarbeiter</h3>
                                     <img class="img-thumbnail" :src="get_image_base64_src"></img>
                                 </div>
                             </div>
@@ -168,52 +166,65 @@ export default {
 
                             
                           
-                            <div class="col">
+                            <div class="col m-4">
                         
                         
-                                <h3 >Mitarbeiter</h3>
                                 
-                                <div v-for="(wert,bezeichnung) in personData">
+                            
                                 
-                                <div class="mb-3"  v-if="typeof wert == 'object' && bezeichnung=='Adressen'"><span style="display:block" v-for="element in wert">{{element.strasse}} <b>({{element.adr_typ}})</b><br/>{{ element.plz}} {{element.ort}}</span></div>
-                                <div v-else class="mb-3" ><span style="display:block;" v-for="(val,bez) in wert">{{bez}}: {{val}}</span></div>
+                                <div class="row">
+                                  <div :class="{'col-lg-12':true, 'col-xl-6':true, 'order-1':bezeichnung=='Allgemein', 'order-3':bezeichnung=='SpecialInformation', 'order-4':bezeichnung=='Adressen'}" v-for="(wert,bezeichnung) in personData">
+                                                                  
+                                    <dl class="m-0"  v-if="bezeichnung=='Adressen'">
+                                      <dt>Adressen</dt>
+                                      <dd class="text-end m-0"  v-for="element in wert">
+                                      {{element.strasse}} <b>({{element.adr_typ}})</b><br/>{{ element.plz}} {{element.ort}}
+                                      </dd>
+                                    </dl>
+
+                                    <dl class="m-0" v-else v-for="(wert,bez) in wert">
+                                      <dt >{{bez}}</dt>
+                                      <dd class="text-end m-0">{{wert?wert:"-"}}</dd>
+                                    </dl>
                                 
-                                </div>
+                                  </div>
                                 
-                            </div>
-                            <div class="col">
-                                <div style="list-style:none">
                                 
-                                    <p v-for="(wert,bezeichnung) in kontaktInfo">
+                            
+                           
+                                <div class="col-lg-12 col-xl-6 order-2">
+                                
+                                    <dl v-for="(wert,bezeichnung) in kontaktInfo">
                                     
                                     <!-- HIER IST DAS DATUM DES FH AUSWEIS -->
                                         <div class="mb-3" v-if="bezeichnung=='FhAusweisStatus'">
-                                            <p class="mb-0"><b>FH-Ausweis Status</b></p>
-                                            <p class="mb-0">{{"Der FH Ausweis ist am "+ wert+ " ausgegeben worden."}}</p>
+                                            <dt class="mb-0">FH-Ausweis Status</dt>
+                                            <dd class="mb-0 text-end">{{"Der FH Ausweis ist am "+ wert+ " ausgegeben worden."}}</dd>
                                         </div>
 
                                     <!-- HIER SIND DIE EMAILS -->
                             
 
                                         <div class="mb-3" v-if="typeof wert === 'object' && bezeichnung == 'emails'">
-                                            <p class="mb-0"><b>eMail</b></p>
-                                            <p v-for="email in wert" class="mb-0">{{email.type}}: <a style="text-decoration:none" :href="'mailto:'+email.email">{{email.email}}</a></p>
+                                            <dt class="mb-0">eMail</dt>
+                                            <dd v-for="email in wert" class="mb-0 text-end">{{email.type}}: <a style="text-decoration:none" :href="'mailto:'+email.email">{{email.email}}</a></dd>
                                         </div>
 
                                         <!-- HIER SIND DIE PRIVATEN KONTAKTE -->
                                         <div class="mb-3" v-if="typeof wert === 'object' && bezeichnung=='Kontakte'">
-                                        <p class="mb-0"><b>Private Kontakte</b></p>
-                                            <div class="row" v-for="element in wert" >
+                                        <dt class="mb-0">Private Kontakte</dt>
+                                            <dd class="row text-end" v-for="element in wert" >
                                                 <div class="col-8">{{element.kontakttyp + ":  " + element.kontakt+"  " }}</div>
                                                 <div class="col-2"> {{element?.anmerkung}}</div>
                                                 <div class="col-2"> 
                                                 <i v-if="element.zustellung" class="fa-solid fa-check"></i>
                                                 <i v-else="element.zustellung" class="fa-solid fa-xmark"></i>
                                                 </div>
-                                            </div>
+                                            </dd>
                                         </div>
                                     
-                                    </p>
+                                    </dl>
+                                </div>
                                 </div>
 
 
diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
index d7da24779..b35942fea 100644
--- a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
@@ -123,11 +123,7 @@ export default {
                             <div class="col">
                                 <img class="img-thumbnail" :src="get_image_base64_src"></img>
                                 
-                                <div v-if="data.foto_sperre ">
-                                    <p style="margin:0">Profilfoto gesperrt</p>
-                                    <a href="#" @click.prevent="sperre_foto_function(false)" style="text-decoration:none">Sperre des Profilfotos aufheben</a>
-                                </div>
-                                <a href="#" @click.prevent="sperre_foto_function(true)" style="display:block; text-decoration:none"  v-else>Profilfoto sperren</a>
+                              
                             </div>
                             
                           

From 6fa680d19f58a7063b2f54e76e06bd28c86f39cf Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 6 Dec 2023 16:33:18 +0100
Subject: [PATCH 0212/1461] Fix: use modelValue instead of student in
 Kontakt.js

---
 .../components/Stv/Studentenverwaltung/Details/Kontakt.js   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt.js
index 19d0de768..0ed0fcb35 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt.js
@@ -24,17 +24,17 @@ export default {
 	<div class="stv-details-details h-100 pb-3">
 		<fieldset class="overflow-hidden">
 			<legend>Adressen</legend>
-			<address-list ref="adressList" :uid="student.person_id"></address-list>
+			<address-list ref="adressList" :uid="modelValue.person_id"></address-list>
 		</fieldset>
 		<br>
 		<fieldset class="overflow-hidden">
 			<legend>Kontakt</legend>
-			<contact-list ref="contactList" :uid="student.person_id"></contact-list>
+			<contact-list ref="contactList" :uid="modelValue.person_id"></contact-list>
 		</fieldset>
 		<br>
 		<fieldset class="overflow-hidden">
 			<legend>Bankverbindungen</legend>
-			<bankaccount-list ref="bankaccountList" :uid="student.person_id"></bankaccount-list>
+			<bankaccount-list ref="bankaccountList" :uid="modelValue.person_id"></bankaccount-list>
 		</fieldset>
 	</div>`
 };

From a48cbaabb925edbdceb32735c865b500ac010704 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Thu, 7 Dec 2023 15:59:01 +0100
Subject: [PATCH 0213/1461] layout template

---
 application/views/Cis/Profil.php              |   2 +-
 public/css/components/Profil.css              |  42 +++
 public/js/apps/Cis/Profil.js                  |   9 +-
 public/js/components/Cis/Profil/Base.js       | 295 ++++++++++++++++++
 .../Cis/Profil/MitarbeiterProfil.js           | 166 ++++++----
 .../Cis/Profil/MitarbeiterViewProfil.js       | 187 ++++++-----
 .../js/components/Cis/Profil/StudentProfil.js | 218 +++++++------
 .../Cis/Profil/StudentViewProfil.js           | 149 +++++----
 8 files changed, 774 insertions(+), 294 deletions(-)
 create mode 100644 public/css/components/Profil.css
 create mode 100644 public/js/components/Cis/Profil/Base.js

diff --git a/application/views/Cis/Profil.php b/application/views/Cis/Profil.php
index a107f0775..059a4edc1 100644
--- a/application/views/Cis/Profil.php
+++ b/application/views/Cis/Profil.php
@@ -3,7 +3,7 @@ $includesArray = array(
 	'title' => 'Stundenplan',
 	'customJSModules' => ['public/js/apps/Cis/Profil.js'],
 	'tabulator5' => true,
-	'customCSSs' => ['public/css/components/calendar.css', 'public/css/components/FilterComponent.css'],
+	'customCSSs' => ['public/css/components/calendar.css', 'public/css/components/FilterComponent.css','public/css/components/Profil.css'],
 	
 );
 
diff --git a/public/css/components/Profil.css b/public/css/components/Profil.css
new file mode 100644
index 000000000..a8f0e5d4b
--- /dev/null
+++ b/public/css/components/Profil.css
@@ -0,0 +1,42 @@
+
+
+@media (max-width: 991px) {
+    
+    .md-invisible{
+        display:none;
+    }
+  }
+
+  @media (min-width: 992px) {
+    
+    .lg-invisible{
+        display:none;
+    }
+  }
+
+/*   dl {
+    width: 100%;
+    overflow: hidden;
+   
+    padding: 0;
+    margin: 0
+  }
+  dt {
+    float: left;
+    width: 35%;
+    
+  
+   
+    padding: 0;
+    margin: 0
+  }
+  dd {
+    float: left;
+    width: 50%;
+   
+  
+    padding: 0;
+    margin: 0
+  }
+ */
+ 
\ No newline at end of file
diff --git a/public/js/apps/Cis/Profil.js b/public/js/apps/Cis/Profil.js
index a6f811478..eb5cfbf4a 100644
--- a/public/js/apps/Cis/Profil.js
+++ b/public/js/apps/Cis/Profil.js
@@ -3,6 +3,7 @@ import StudentProfil from "../../components/Cis/Profil/StudentProfil.js";
 import MitarbeiterProfil from "../../components/Cis/Profil/MitarbeiterProfil.js";
 import ViewStudentProfil from "../../components/Cis/Profil/StudentViewProfil.js";
 import ViewMitarbeiterProfil from "../../components/Cis/Profil/MitarbeiterViewProfil.js";
+import Base from "../../components/Cis/Profil/Base.js";
 import fhcapifactory from "../api/fhcapifactory.js";
 
 Vue.$fhcapi = fhcapifactory;
@@ -11,7 +12,7 @@ Vue.$fhcapi = fhcapifactory;
 const app = Vue.createApp({
 	
 	components: {
-		
+		Base,
 		StudentProfil,
 		MitarbeiterProfil,
 		ViewStudentProfil,
@@ -41,15 +42,17 @@ const app = Vue.createApp({
 			}
 			this.view = res.data?.view;
 			this.data = res.data?.data;
+			//* only for testing purposes and needs to be deleted after
+			this.data.base = "Base";
 		});
 	},
 	template:`
 	<div>
-	
+
 	<div v-if="notFoundUID">
 	<h3>Es wurden keine oder mehrere Profile für {{this.notFoundUID}} gefunden</h3>
 	</div>
-	<component v-else :is="view" :data="data" ></component>
+	<component v-else :is="data?.base" :data="data" ></component>
 	</div>`
 	
 	
diff --git a/public/js/components/Cis/Profil/Base.js b/public/js/components/Cis/Profil/Base.js
new file mode 100644
index 000000000..0726fa552
--- /dev/null
+++ b/public/js/components/Cis/Profil/Base.js
@@ -0,0 +1,295 @@
+import fhcapifactory from "../../../apps/api/fhcapifactory.js";
+import { CoreFilterCmpt } from "../../../components/filter/Filter.js";
+
+
+export default {
+  components: {
+    CoreFilterCmpt,
+  },
+  data() {
+    return {
+      
+
+      funktionen_table_options: {
+        height: 300,
+        layout: "fitColumns",
+        data: [
+          {
+            Bezeichnung: "",
+            Organisationseinheit: "",
+            Gültig_von: "",
+            Gültig_bis: "",
+            Wochenstunden: "",
+          },
+        ],
+        columns: [
+          { title: "Bezeichnung", field: "Bezeichnung", headerFilter: true },
+          {
+            title: "Organisationseinheit",
+            field: "Organisationseinheit",
+            headerFilter: true,
+          },
+          { title: "Gültig_von", field: "Gültig_von", headerFilter: true },
+          { title: "Gültig_bis", field: "Gültig_bis", headerFilter: true },
+          {
+            title: "Wochenstunden",
+            field: "Wochenstunden",
+            headerFilter: true,
+          },
+        ],
+      },
+      betriebsmittel_table_options: {
+        height: 300,
+        layout: "fitColumns",
+        data: [{ betriebsmittel: "<a href='#'>test</a>", Nummer: "", Ausgegeben_am: "" }],
+        columns: [
+          {
+            title: "Betriebsmittel",
+            field: "betriebsmittel",
+            headerFilter: true,
+          },
+          { title: "Nummer", field: "Nummer", headerFilter: true },
+          {
+            title: "Ausgegeben_am",
+            field: "Ausgegeben_am",
+            headerFilter: true,
+          },
+        ],
+      },
+     
+    };
+  },
+
+    //? this is the prop passed to the dynamic component with the custom data of the view
+  props: ["data"],
+  methods: {
+   
+    sperre_foto_function(value) {
+      if (!this.data) {
+        return;
+      }
+      fhcapifactory.UserData.sperre_foto_function(value).then((res) => {
+        this.data.foto_sperre = res.data.foto_sperre;
+      });
+    },
+  },
+  computed: {
+    refreshMailTo() {
+      return `mailto:info.mio@technikum-wien.at?subject=Datenkorrektur&body=Die%20Profildaten%20für%20User%20'${this.data.username}'%20sind%20nicht%20korrekt.%0DHier, die richtigen Daten:%0A%0ANachname:%20${this.data.nachname}%0AVorname:%20${this.data.vorname}%0AGeburtsdatum:${this.data.gebdatum}%0AGeburtsort:%20${this.data.gebort}%0ATitelPre:${this.data.titel}%20%0ATitelPost:${this.data.postnomen}%20%0A%0A***%0DPlatz für weitere (nicht angeführte Daten)%0D***%0A%0A[Bitte%20übermitteln%20Sie%20uns%20etwaige%20Dokumente%20zum%20Beleg%20der%20Änderung]`
+    },
+
+    get_image_base64_src() {
+      if (!this.data) {
+        return "";
+      }
+      return "data:image/jpeg;base64," + this.data.foto;
+    },
+    //? this computed function returns all the informations for the first column in the profil 
+    personData() {
+      if (!this.data) {
+        return {};
+      }
+
+      return {
+        Allgemein: {
+          Username: this.data.username,
+          Anrede: this.data.anrede,
+          Titel: this.data.titel,
+          Vorname: this.data.vorname,
+          Nachname: this.data.nachname,
+          Postnomen: this.data.postnomen,
+          Geburtsdatum: this.data.gebdatum,
+          Geburtsort: this.data.gebort,
+          Kurzzeichen: this.data.kurzbz,
+          Telefon: this.data.telefonklappe,
+          Büro:this.data.ort_kurzbz,
+          FhAusweisStatus: this.data.zutrittsdatum,
+        },
+        
+
+
+
+
+        
+      };
+    },
+    //? this computed function returns the data for the second column in the profil 
+    kontaktInfo() {
+      if (!this.data) {
+        return {};
+      }
+
+      return {
+        
+        
+        emails: this.data.emails,
+        Kontakte: this.data.kontakte,
+        Adressen: this.data.adressen,
+      };
+    },
+  },
+
+  mounted() {
+       this.$refs.betriebsmittelTable.tabulator.on('tableBuilt', () => {
+    
+        this.$refs.betriebsmittelTable.tabulator.setData(this.data.mittel);
+        
+    }) 
+
+    this.$refs.funktionenTable.tabulator.on('tableBuilt', () => {
+    
+        this.$refs.funktionenTable.tabulator.setData(this.data.funktionen);
+        
+    })  
+ 
+  },
+
+  template: `
+
+            <div class="container-fluid">
+                <div  class="row">
+                    <div class="col-12"> 
+                  
+                    <div class="row">
+                        <div  class="d-md-none col-12 ">
+                        <!-- DROP DOWN LINKS -->
+
+
+
+
+                        <div style="background-color:#EEEEEE;" class="row py-4">
+                        <div class="col">
+                            <div class="dropdown">
+                            <button style="width:100%" class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenu2" data-bs-toggle="dropdown" aria-expanded="false">
+                                Quick links
+                            </button>
+                            <ul class="dropdown-menu" aria-labelledby="dropdownMenu2">
+                                <li><button class="dropdown-item" type="button">Action</button></li>
+                                <li><button class="dropdown-item" type="button">Another action</button></li>
+                                <li><button class="dropdown-item" type="button">Something else here</button></li>
+                            </ul>
+                            </div>
+                        </div>
+                        </div>
+
+
+                        
+                        
+                        </div>
+                        <div class="col-md-3 col-sm-12" style="background-color:lightgreen;">
+                        <img class=" img-thumbnail "  :src="get_image_base64_src"></img>
+                        </div>
+                        <div class="col-md-6 col-sm-12" style="background-color:lightcoral;">
+                        
+
+
+
+                        <div class="row">
+                        <!-- HERE COMES THE INFORMATION -->
+                        <div style="background-color:red" class="col-md-12 col-lg-6">
+
+
+
+                        <div   v-for="(wert,bezeichnung) in personData">
+                            <dl class="  mb-0" v-else v-for="(wert,bez) in wert">
+                                <div class="row justify-content-center">
+                                    <dt class="col-6" >{{bez}}</dt>
+                                    <dd class=" col-6">{{wert?wert:"-"}}</dd>
+                                </div>
+                            </dl>
+                            <div class="row justify-content-center" v-if="bez=='FhAusweisStatus'">
+                                <dt class="col-6" >FH-Ausweis Status</dt>
+                                <dd class=" col-6 m-0">{{"Der FH Ausweis ist am "+ wert+ " ausgegeben worden."}}</dd>
+                            </div>
+                        </div>
+
+
+                        </div>
+
+
+
+                        <div style="background-color:orange" class="col-lg-6 col-md-12">
+
+                        <div   v-for="(wert,bezeichnung) in personData">
+                            <dl class="  mb-0" v-else v-for="(wert,bez) in wert">
+                                <div class="row justify-content-center">
+                                    <dt class="col-6" >{{bez}}</dt>
+                                    <dd class=" col-6">{{wert?wert:"-"}}</dd>
+                                </div>
+                            </dl>
+                            <div class="row justify-content-center" v-if="bez=='FhAusweisStatus'">
+                                <dt class="col-6" >FH-Ausweis Status</dt>
+                                <dd class=" col-6 m-0">{{"Der FH Ausweis ist am "+ wert+ " ausgegeben worden."}}</dd>
+                            </div>
+                        </div>
+                        </div>
+
+
+                        
+
+                        </div>
+
+
+
+                        
+                        </div>
+
+                        <div class="col-md-3 col-sm-12">
+
+
+
+                        <div style="background-color:#EEEEEE;height:200px" class="row d-none d-md-block">
+                        <div class="col">
+                           <div style="background-color:#EEEEEE" class="row py-4">
+                               <a style="text-decoration:none" class="my-1" href="#">Zeitwuensche</a>
+                               <a style="text-decoration:none" class="my-1" href="#">Lehrveranstaltungen</a>
+                               <a style="text-decoration:none" class="my-1" href="#">Zeitsperren von Gschnell</a>
+                           </div>
+                        </div>
+                        </div>
+                        <div style="background-color: darkgray"  class="  row">
+                        <div class="col">
+                        
+                           <!-- HIER SIND DIE MAILVERTEILER -->
+                           <h5 class="fs-3" style="margin-top:1em">Mailverteilers</h5>
+                           <p class="fs-6">Sie sind Mitgglied in folgenden Verteilern:</p>
+                           <div  class="row text-break" v-for="verteiler in data?.mailverteiler">
+                               <div class="col-6"><a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a></div> 
+                               <div class="col-6">{{verteiler.beschreibung}}</div>
+                           </div>
+   
+   
+   
+                        </div>
+                        </div>
+                       </div>
+
+
+                        </div>    
+                        <div class="row">
+
+                            <!-- HIER SIND DIE TABELLEN -->
+                            <div class="col-12" style="background-color:purple">
+                            <core-filter-cmpt title="Funktionen"  ref="funktionenTable" :tabulator-options="funktionen_table_options" :tableOnly />
+                            
+                            </div>
+                            <div class="col-12" style="background-color:orange">
+                            <core-filter-cmpt title="Entlehnte Betriebsmittel"  ref="betriebsmittelTable" :tabulator-options="betriebsmittel_table_options" :tableOnly />
+                            </div>
+
+
+                        </div>
+                         
+                    </div>
+
+
+
+                    <!-- HIER IST DIE RECHTE SEITE MIT DEN LINKS UND DEN MAILVERTEILERN -->
+                    
+                </div>
+                
+        
+            </div>
+            
+    `,
+};
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 12f7cb88e..2f3ef7d88 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -1,6 +1,7 @@
 import fhcapifactory from "../../../apps/api/fhcapifactory.js";
 import { CoreFilterCmpt } from "../../../components/filter/Filter.js";
 
+
 export default {
   components: {
     CoreFilterCmpt,
@@ -73,6 +74,10 @@ export default {
     },
   },
   computed: {
+    refreshMailTo() {
+      return `mailto:info.mio@technikum-wien.at?subject=Datenkorrektur&body=Die%20Profildaten%20für%20User%20'${this.data.username}'%20sind%20nicht%20korrekt.%0DHier, die richtigen Daten:%0A%0ANachname:%20${this.data.nachname}%0AVorname:%20${this.data.vorname}%0AGeburtsdatum:${this.data.gebdatum}%0AGeburtsort:%20${this.data.gebort}%0ATitelPre:${this.data.titel}%20%0ATitelPost:${this.data.postnomen}%20%0A%0A***%0DPlatz für weitere (nicht angeführte Daten)%0D***%0A%0A[Bitte%20übermitteln%20Sie%20uns%20etwaige%20Dokumente%20zum%20Beleg%20der%20Änderung]`
+    },
+
     get_image_base64_src() {
       if (!this.data) {
         return "";
@@ -95,13 +100,17 @@ export default {
           Postnomen: this.data.postnomen,
           Geburtsdatum: this.data.gebdatum,
           Geburtsort: this.data.gebort,
+          Kurzzeichen: this.data.kurzbz,
+          Telefon: this.data.telefonklappe,
+          Büro:this.data.ort_kurzbz,
+          FhAusweisStatus: this.data.zutrittsdatum,
         },
-        Adressen: this.data.adressen,
-        SpecialInformation:  {
-            Kurzzeichen: this.data.kurzbz,
-            Telefon: this.data.telefonklappe,
-            Büro:this.data.ort_kurzbz,
-        },
+        
+
+
+
+
+        
       };
     },
     //? this computed function returns the data for the second column in the profil 
@@ -111,9 +120,11 @@ export default {
       }
 
       return {
-        FhAusweisStatus: this.data.zutrittsdatum,
+        
+        
         emails: this.data.emails,
         Kontakte: this.data.kontakte,
+        Adressen: this.data.adressen,
       };
     },
   },
@@ -137,20 +148,32 @@ export default {
 
             <div class="container-fluid">
             <!-- here starts the row of the whole window -->
-                <div class="row">
+                <div class="row ">
                 <!-- this is the left column of the window -->
-                    <div class="col-9">
-                        <div class="row">
+                    <div class="col-md-12 col-lg-9">
+                    
+                        <div class="row align-items-center">
                             
 
 
-                            <div class="col-2">
+                            <div style="background-color:lightgreen" class="col-md-12 col-lg-2">
+                         
                             <div class="row">
-                                <div class="col">
+                                <div class="align-middle ">
                                 <h3 >Mitarbeiter</h3>
-                                    <img class="img-thumbnail" :src="get_image_base64_src"></img>
+                                    <img class=" img-thumbnail " :height="" :src="get_image_base64_src"></img>
+                                   
                                 </div>
+                                <div  style="background-color:#EEEEEE" class=" lg-invisible col row py-4">
+                                <a style="text-decoration:none" class="my-1" href="#">Zeitwuensche</a>
+                                <a style="text-decoration:none" class="my-1" href="#">Lehrveranstaltungen</a>
+                                <a style="text-decoration:none" class="my-1" href="#">Zeitsperren von Gschnell</a>
+                                </div>
+                                
+                                
+                                
                             </div>
+                            
                             <div class="row">
                                 <div class="col">
                                     <div v-if="data.foto_sperre ">
@@ -160,31 +183,36 @@ export default {
                                     <a href="#" @click.prevent="sperre_foto_function(true)" class="text-decoration-none"  v-else>Profilfoto sperren</a>
                                 </div>
                             </div>
+                          
                         </div>
 
 
 
                             
                           
-                            <div class="col m-4">
+                            <div style="background-color:lightblue" class="col-lg-10 col-md-12 ">
                         
                         
                                 
                             
                                 
                                 <div class="row">
-                                  <div :class="{'col-lg-12':true, 'col-xl-6':true, 'order-1':bezeichnung=='Allgemein', 'order-3':bezeichnung=='SpecialInformation', 'order-4':bezeichnung=='Adressen'}" v-for="(wert,bezeichnung) in personData">
+                                  <div style="background-color:lightsalmon" :class="{ 'col-lg-12':true, 'col-xl-6':true, 'order-1':bezeichnung=='Allgemein',  'order-4':bezeichnung=='Adressen'}" v-for="(wert,bezeichnung) in personData">
                                                                   
-                                    <dl class="m-0"  v-if="bezeichnung=='Adressen'">
-                                      <dt>Adressen</dt>
-                                      <dd class="text-end m-0"  v-for="element in wert">
-                                      {{element.strasse}} <b>({{element.adr_typ}})</b><br/>{{ element.plz}} {{element.ort}}
-                                      </dd>
-                                    </dl>
+                                    
 
-                                    <dl class="m-0" v-else v-for="(wert,bez) in wert">
-                                      <dt >{{bez}}</dt>
-                                      <dd class="text-end m-0">{{wert?wert:"-"}}</dd>
+                                    <dl class="  mb-3" v-else v-for="(wert,bez) in wert">
+                                    
+                                    
+                                    <div class="row justify-content-center" v-if="bez=='FhAusweisStatus'">
+                                    <dt class="col-md-6 col-xxl-4 m-0" >FH-Ausweis Status</dt>
+                                    <dd class=" col-md-6 col-xxl-4 m-0">{{"Der FH Ausweis ist am "+ wert+ " ausgegeben worden."}}</dd>
+                                  
+                                  </div>
+                                  <div v-else class="row justify-content-center">
+                                        <dt class="col-md-6 col-xxl-4 m-0" >{{bez}}</dt>
+                                        <dd class=" col-md-6 col-xxl-4 m-0">{{wert?wert:"-"}}</dd>
+                                        </div>
                                     </dl>
                                 
                                   </div>
@@ -192,46 +220,69 @@ export default {
                                 
                             
                            
-                                <div class="col-lg-12 col-xl-6 order-2">
-                                
-                                    <dl v-for="(wert,bezeichnung) in kontaktInfo">
-                                    
-                                    <!-- HIER IST DAS DATUM DES FH AUSWEIS -->
-                                        <div class="mb-3" v-if="bezeichnung=='FhAusweisStatus'">
-                                            <dt class="mb-0">FH-Ausweis Status</dt>
-                                            <dd class="mb-0 text-end">{{"Der FH Ausweis ist am "+ wert+ " ausgegeben worden."}}</dd>
-                                        </div>
+                                  <div style="background-color: lightcoral" class="col-lg-12 col-xl-6 order-2  ">
+                                  
+                                      <dl v-for="(wert,bezeichnung) in kontaktInfo">
+                                      
+                                      <!-- HIER IST DAS DATUM DES FH AUSWEIS -->
+                                      <!-- WAS MOVED TO THE FIRST INFO BOX -->
 
-                                    <!-- HIER SIND DIE EMAILS -->
-                            
 
-                                        <div class="mb-3" v-if="typeof wert === 'object' && bezeichnung == 'emails'">
-                                            <dt class="mb-0">eMail</dt>
-                                            <dd v-for="email in wert" class="mb-0 text-end">{{email.type}}: <a style="text-decoration:none" :href="'mailto:'+email.email">{{email.email}}</a></dd>
-                                        </div>
+                                          <div class="justify-content-center row mb-3" v-if="bezeichnung=='FhAusweisStatus'">
+                                            <dt class="col-md-6 col-xxl-4  mb-0">FH-Ausweis Status</dt>
+                                            <div class="col-md-6 col-xxl-4">
+                                              <dd class="mb-0 ">{{"Der FH Ausweis ist am "+ wert+ " ausgegeben worden."}}</dd>
+                                            </div>
+                                          </div>
 
-                                        <!-- HIER SIND DIE PRIVATEN KONTAKTE -->
-                                        <div class="mb-3" v-if="typeof wert === 'object' && bezeichnung=='Kontakte'">
-                                        <dt class="mb-0">Private Kontakte</dt>
-                                            <dd class="row text-end" v-for="element in wert" >
-                                                <div class="col-8">{{element.kontakttyp + ":  " + element.kontakt+"  " }}</div>
-                                                <div class="col-2"> {{element?.anmerkung}}</div>
-                                                <div class="col-2"> 
-                                                <i v-if="element.zustellung" class="fa-solid fa-check"></i>
-                                                <i v-else="element.zustellung" class="fa-solid fa-xmark"></i>
-                                                </div>
-                                            </dd>
-                                        </div>
-                                    
-                                    </dl>
-                                </div>
+                                      <!-- HIER SIND DIE EMAILS -->
+                              
+
+                                          <div class="justify-content-center row mb-3" v-if="typeof wert === 'object' && bezeichnung == 'emails'">
+                                              <dt class="col-md-6 col-xxl-4 mb-0">eMail</dt>
+                                              <div class="col-md-6 col-xxl-4">
+                                              <dd v-for="email in wert" class="mb-0 ">{{email.type}}: <a style="text-decoration:none" :href="'mailto:'+email.email">{{email.email}}</a></dd>
+                                              </div>
+                                            </div>
+
+                                          <!-- HIER SIND DIE PRIVATEN KONTAKTE -->
+                                          <div class="justify-content-center row mb-3" v-if="typeof wert === 'object' && bezeichnung=='Kontakte'">
+                                          <dt   class="col-md-6 col-xxl-4 mb-0">Private Kontakte</dt>
+                                          <div class="col-md-6 col-xxl-4">
+                                              <dd class="row justify-end" v-for="element in wert" >
+                                                  <div class="col-8">{{element.kontakttyp + ":  " + element.kontakt+"  " }}</div>
+                                                  <div class="col-2"> {{element?.anmerkung}}</div>
+                                                  <div class="col-2"> 
+                                                  <i v-if="element.zustellung" class="fa-solid fa-check"></i>
+                                                  <i v-else="element.zustellung" class="fa-solid fa-xmark"></i>
+                                                  </div>
+                                              </dd>
+                                              </div>
+                                          </div>
+                                          
+                                          <!-- HIER SIND DIE ADRESSEN -->
+                                          <div class=" justify-content-center row mb-3" v-if="typeof wert === 'object' && bezeichnung=='Adressen'">
+                                            <dt class="col-md-6 col-xxl-4">Adressen</dt>
+                                              <div class="col-md-6 col-xxl-4">
+                                                <dd class="  m-0"  v-for="element in wert">
+                                                  {{element.strasse}} <b>({{element.adr_typ}})</b><br/>{{ element.plz}} {{element.ort}}
+                                                </dd>
+                                              </div>
+                                          </div>
+                                      
+                                      </dl>
+                                  </div>
                                 </div>
 
 
                             </div>
                         </div>
                       
-                    
+                      <div class="row">
+                      <div class="col">
+                      <p>Sollten Ihre Daten nicht mehr aktuell sein, klicken Sie bitte <a :href="refreshMailTo">hier</a></p>
+                      </div>
+                      </div>
                         <div class="row my-5">
                         
                 
@@ -248,8 +299,8 @@ export default {
                 
                     </div>
 
-                    <div  class="col-3">
-                        <div style="background-color:#EEEEEE" class="row py-4">
+                    <div  class="col-md-12 col-lg-3 ">
+                        <div style="background-color:#EEEEEE" class="row md-invisible py-4">
                         <a style="text-decoration:none" class="my-1" href="#">Zeitwuensche</a>
                         <a style="text-decoration:none" class="my-1" href="#">Lehrveranstaltungen</a>
                         <a style="text-decoration:none" class="my-1" href="#">Zeitsperren von Gschnell</a>
@@ -264,6 +315,7 @@ export default {
                         </div>
                     </div>
                 </div>
+        
             </div>
             
     `,
diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
index b35942fea..589f1b204 100644
--- a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
@@ -114,103 +114,122 @@ export default {
   template: `
 
 
-            <div class="container-fluid">
-            <!-- here starts the row of the whole window -->
-                <div class="row">
-                <!-- this is the left column of the window -->
-                    <div class="col-9">
+        <div class="container-fluid">
+        <!-- here starts the row of the whole window -->
+            <div class="row">
+            <!-- this is the left column of the window -->
+                <div class="col-9">
+                    <div class="row">
+                        
+
+
+                        <div class="col-2">
                         <div class="row">
                             <div class="col">
+                            <h3 >Mitarbeiter</h3>
                                 <img class="img-thumbnail" :src="get_image_base64_src"></img>
-                                
-                              
-                            </div>
-                            
-                          
-                            <div class="col">
-                        
-                        
-                                <h3 >Mitarbeiter</h3>
-                                
-                                <div v-for="(wert,bezeichnung) in personData">
-                                
-                                <div class="mb-3"  v-if="typeof wert == 'object' && bezeichnung=='Adressen'"><span style="display:block" v-for="element in wert">{{element.strasse}} <b>({{element.adr_typ}})</b><br/>{{ element.plz}} {{element.ort}}</span></div>
-                                <div v-else class="mb-3" ><span style="display:block;" v-for="(val,bez) in wert">{{bez}}: {{val}}</span></div>
-                                
-                                </div>
-                                
-                            </div>
-                            <div class="col">
-                                <div style="list-style:none">
-                                
-                                    <p v-for="(wert,bezeichnung) in kontaktInfo">
-                                    
-                                    <!-- HIER IST DAS DATUM DES FH AUSWEIS -->
-                                        <div class="mb-3" v-if="bezeichnung=='FhAusweisStatus'">
-                                            <p class="mb-0"><b>FH-Ausweis Status</b></p>
-                                            <p class="mb-0">{{"Der FH Ausweis ist am "+ wert+ " ausgegeben worden."}}</p>
-                                        </div>
-
-                                    <!-- HIER SIND DIE EMAILS -->
-                            
-
-                                        <div class="mb-3" v-if="typeof wert === 'object' && bezeichnung == 'emails'">
-                                            <p class="mb-0"><b>eMail</b></p>
-                                            <p v-for="email in wert" class="mb-0">{{email.type}}: <a style="text-decoration:none" :href="'mailto:'+email.email">{{email.email}}</a></p>
-                                        </div>
-
-                                        <!-- HIER SIND DIE PRIVATEN KONTAKTE -->
-                                        <div class="mb-3" v-if="typeof wert === 'object' && bezeichnung=='Kontakte'">
-                                        <p class="mb-0"><b>Private Kontakte</b></p>
-                                            <div class="row" v-for="element in wert" >
-                                                <div class="col-8">{{element.kontakttyp + ":  " + element.kontakt+"  " }}</div>
-                                                <div class="col-2"> {{element?.anmerkung}}</div>
-                                                <div class="col-2"> 
-                                                <i v-if="element.zustellung" class="fa-solid fa-check"></i>
-                                                <i v-else="element.zustellung" class="fa-solid fa-xmark"></i>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    
-                                    </p>
-                                </div>
-
-
                             </div>
                         </div>
                       
-                    
-                        <div class="row my-5">
-                        
-                
-                            <div class="col-12">
-                            <core-filter-cmpt title="Funktionen"  ref="funktionenTable" :tabulator-options="funktionen_table_options" :tableOnly />
-                            
-                            </div>
-                           
-                        
-                        </div>
-
-                
                     </div>
 
-                    <div  class="col-3">
-                        <div style="background-color:#EEEEEE" class="row py-4">
-                        <a style="text-decoration:none" class="my-1" href="#">Zeitwuensche</a>
-                        <a style="text-decoration:none" class="my-1" href="#">Lehrveranstaltungen</a>
-                        <a style="text-decoration:none" class="my-1" href="#">Zeitsperren von Gschnell</a>
-                        </div>
-                        <div class="row">
-                            <h5 class="fs-3" style="margin-top:1em">Mailverteilers</h5>
-                            <p class="fs-6">Sie sind Mitgglied in folgenden Verteilern:</p>
-                            <div  class="row text-break" v-for="verteiler in data?.mailverteiler">
-                                <div class="col-6"><a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a></div> 
-                                <div class="col-6">{{verteiler.beschreibung}}</div>
+
+
+                        
+                      
+                        <div class="col m-4">
+                    
+                    
+                            
+                        
+                            
+                            <div class="row">
+                              <div :class="{'col-lg-12':true, 'col-xl-6':true, 'order-1':bezeichnung=='Allgemein', 'order-3':bezeichnung=='SpecialInformation'}" v-for="(wert,bezeichnung) in personData">
+                                                              
+                              
+                                <dl class="m-0" v-else v-for="(wert,bez) in wert">
+                                  <dt >{{bez}}</dt>
+                                  <dd class="text-end m-0">{{wert?wert:"-"}}</dd>
+                                </dl>
+                            
+                              </div>
+                            
+                            
+                        
+                      
+                              <div class="col-lg-12 col-xl-6 order-2">
+                              
+                                  <dl v-for="(wert,bezeichnung) in kontaktInfo">
+                                  
+                                  <!-- HIER IST DAS DATUM DES FH AUSWEIS -->
+                                      <div class="mb-3" v-if="bezeichnung=='FhAusweisStatus'">
+                                          <dt class="mb-0">FH-Ausweis Status</dt>
+                                          <dd class="mb-0 text-end">{{"Der FH Ausweis ist am "+ wert+ " ausgegeben worden."}}</dd>
+                                      </div>
+
+                                  <!-- HIER SIND DIE EMAILS -->
+                          
+
+                                      <div class="mb-3" v-if="typeof wert === 'object' && bezeichnung == 'emails'">
+                                          <dt class="mb-0">eMail</dt>
+                                          <dd v-for="email in wert" class="mb-0 text-end">{{email.type}}: <a style="text-decoration:none" :href="'mailto:'+email.email">{{email.email}}</a></dd>
+                                      </div>
+
+                                      <!-- HIER SIND DIE PRIVATEN KONTAKTE -->
+                                      <div class="mb-3" v-if="typeof wert === 'object' && bezeichnung=='Kontakte'">
+                                      <dt class="mb-0">Private Kontakte</dt>
+                                          <dd class="row text-end" v-for="element in wert" >
+                                              <div class="col-8">{{element.kontakttyp + ":  " + element.kontakt+"  " }}</div>
+                                              <div class="col-2"> {{element?.anmerkung}}</div>
+                                              <div class="col-2"> 
+                                              <i v-if="element.zustellung" class="fa-solid fa-check"></i>
+                                              <i v-else="element.zustellung" class="fa-solid fa-xmark"></i>
+                                              </div>
+                                          </dd>
+                                      </div>
+                                  
+                                  </dl>
+                              </div>
                             </div>
+
+
+                        </div>
+                    </div>
+                  
+                
+                    <div class="row my-5">
+                    
+            
+                        <div class="col-12">
+                        <core-filter-cmpt title="Funktionen"  ref="funktionenTable" :tabulator-options="funktionen_table_options" :tableOnly />
+                        
+                        </div>
+                       
+                    
+                    </div>
+
+            
+                </div>
+
+                <div  class="col-3">
+                    <div style="background-color:#EEEEEE" class="row py-4">
+                    <a style="text-decoration:none" class="my-1" href="#">Zeitwuensche</a>
+                    <a style="text-decoration:none" class="my-1" href="#">Lehrveranstaltungen</a>
+                    <a style="text-decoration:none" class="my-1" href="#">Zeitsperren von Gschnell</a>
+                    </div>
+                    <div class="row">
+                        <h5 class="fs-3" style="margin-top:1em">Mailverteilers</h5>
+                        <p class="fs-6">Sie sind Mitgglied in folgenden Verteilern:</p>
+                        <div  class="row text-break" v-for="verteiler in data?.mailverteiler">
+                            <div class="col-6"><a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a></div> 
+                            <div class="col-6">{{verteiler.beschreibung}}</div>
                         </div>
                     </div>
                 </div>
             </div>
+        </div>          
+  
+  
             
     `,
 };
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index a0aff3196..8df546c67 100644
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -51,6 +51,9 @@ export default {
     },
   },
   computed: {
+    refreshMailTo() {
+      return `mailto:info.mio@technikum-wien.at?subject=Datenkorrektur&body=Die%20Profildaten%20für%20User%20'${this.data.username}'%20sind%20nicht%20korrekt.%0DHier, die richtigen Daten:%0A%0ANachname:%20${this.data.nachname}%0AVorname:%20${this.data.vorname}%0AGeburtsdatum:${this.data.gebdatum}%0AGeburtsort:%20${this.data.gebort}%0ATitelPre:${this.data.titel}%20%0ATitelPost:${this.data.postnomen}%20%0A%0A***%0DPlatz für weitere (nicht angeführte Daten)%0D***%0A%0A[Bitte%20übermitteln%20Sie%20uns%20etwaige%20Dokumente%20zum%20Beleg%20der%20Änderung]`
+    },
     get_image_base64_src() {
       if (!this.data) {
         return "";
@@ -72,11 +75,10 @@ export default {
           Vorname: this.data.vorname,
           Nachname: this.data.nachname,
           Postnomen: this.data.postnomen,
-        },
-        GeburtsDaten: {
           Geburtsdatum: this.data.gebdatum,
           Geburtsort: this.data.gebort,
         },
+        
         Adressen: this.data.adressen,
         SpecialInformation: {
           Studiengang: this.data.studiengang,
@@ -118,85 +120,108 @@ export default {
 
   template: `
 
-
-            <div class="container-fluid">
-            <!-- here starts the row of the whole window -->
-                <div class="row">
-                <!-- this is the left column of the window -->
-                    <div class="col-9">
-                        <div class="row">
-                            <div class="col">
-                                <div class="row">
-                                    <div class="col">
-                                        <img class="img-thumbnail" :src="get_image_base64_src"></img>
-                                    </div>
-                                </div>
-                                <div class="row">
-                                    <div class="col">
-                                        <div v-if="data.foto_sperre ">
-                                            <p class="m-0">Profilfoto gesperrt</p>
-                                            <a href="#" @click.prevent="sperre_foto_function(false)" class="text-decoration-none">Sperre des Profilfotos aufheben</a>
-                                        </div>
-                                        <a href="#" @click.prevent="sperre_foto_function(true)" class="text-decoration-none"  v-else>Profilfoto sperren</a>
-                                    </div>
-                                </div>
-                            </div>
-                            
-                          
-                            <div class="col">
-                        
-                        
-                                <h3 >Student</h3>
-                                
-                                <div v-for="(wert,bezeichnung) in personData">
-                                
-                                <div class="mb-3"  v-if="typeof wert == 'object' && bezeichnung=='Adressen'"><p style="display:block" v-for="element in wert">{{element.strasse}} <b>({{element.adr_typ}})</b><br/>{{ element.plz}} {{element.ort}}</p></div>
-                                <div v-else class="mb-3" ><span style="display:block;" v-for="(val,bez) in wert">{{bez}}: {{val}}</span></div>
-                                
-                                </div>
-                                
-                            </div>
-                            <div class="col">
-                                <div >
-                                
-                                    <p v-for="(wert,bezeichnung) in kontaktInfo">
-                                    
-                                    <!-- HIER IST DAS DATUM DES FH AUSWEIS -->
-                                        <div class="mb-3" v-if="bezeichnung=='FhAusweisStatus'">
-                                            <p class="mb-0"><b>FH-Ausweis Status</b></p>
-                                            <p class="mb-0">{{"Der FH Ausweis ist am "+ wert+ " ausgegeben worden."}}</p>
-                                        </div>
-
-                                    <!-- HIER SIND DIE EMAILS -->
-                            
-
-                                        <div class="mb-3" v-if="typeof wert === 'object' && bezeichnung == 'emails'">
-                                            <p class="mb-0"><b>eMail</b></p>
-                                            <p v-for="email in wert" class="mb-0">{{email.type}}: <a style="text-decoration:none" :href="'mailto:'+email.email">{{email.email}}</a></p>
-                                        </div>
-
-                                        <!-- HIER SIND DIE PRIVATEN KONTAKTE -->
-                                        <div class="mb-3" v-if="typeof wert === 'object' && bezeichnung=='Kontakte'">
-                                        <p class="mb-0"><b>Private Kontakte</b></p>
-                                            <div class="row" v-for="element in wert" >
-                                                <div class="col-8">{{element.kontakttyp + ":  " + element.kontakt+"  " }}</div>
-                                                <div class="col-2"> {{element?.anmerkung}}</div>
-                                                <div class="col-2"> 
-                                                <i v-if="element.zustellung" class="fa-solid fa-check"></i>
-                                                <i v-else="element.zustellung" class="fa-solid fa-xmark"></i>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    
-                                    </p>
-                                </div>
+  <div class="container-fluid">
+  <!-- here starts the row of the whole window -->
+      <div class="row">
+      <!-- this is the left column of the window -->
+          <div class="col-9">
+              <div class="row">
+                  
 
 
-                            </div>
+                  <div class="col-2">
+                  <div class="row">
+                      <div class="col">
+                      <h3 >Student</h3>
+                          <img class="img-thumbnail" :src="get_image_base64_src"></img>
+                      </div>
+                  </div>
+                  <div class="row">
+                      <div class="col">
+                          <div v-if="data.foto_sperre ">
+                              <p class="m-0">Profilfoto gesperrt</p>
+                              <a href="#" @click.prevent="sperre_foto_function(false)" class="text-decoration-none">Sperre des Profilfotos aufheben</a>
+                          </div>
+                          <a href="#" @click.prevent="sperre_foto_function(true)" class="text-decoration-none"  v-else>Profilfoto sperren</a>
+                      </div>
+                  </div>
+              </div>
+
+
+
+                  
+                
+                  <div class="col m-4">
+              
+              
+                      
+                  
+                      
+                      <div class="row">
+                        <div :class="{'col-lg-12':true, 'col-xl-6':true, 'order-1':bezeichnung=='Allgemein', 'order-3':bezeichnung=='SpecialInformation', 'order-4':bezeichnung=='Adressen'}" v-for="(wert,bezeichnung) in personData">
+                                                        
+                          <dl class="m-0"  v-if="bezeichnung=='Adressen'">
+                            <dt>Adressen</dt>
+                            <dd class="text-end m-0"  v-for="element in wert">
+                            {{element.strasse}} <b>({{element.adr_typ}})</b><br/>{{ element.plz}} {{element.ort}}
+                            </dd>
+                          </dl>
+
+                          <dl class="m-0" v-else v-for="(wert,bez) in wert">
+                            <dt >{{bez}}</dt>
+                            <dd class="text-end m-0">{{wert?wert:"-"}}</dd>
+                          </dl>
+                      
                         </div>
                       
+                      
+                  
+                 
+                        <div class="col-lg-12 col-xl-6 order-2">
+                        
+                            <dl v-for="(wert,bezeichnung) in kontaktInfo">
+                            
+                            <!-- HIER IST DAS DATUM DES FH AUSWEIS -->
+                                <div class="mb-3" v-if="bezeichnung=='FhAusweisStatus'">
+                                    <dt class="mb-0">FH-Ausweis Status</dt>
+                                    <dd class="mb-0 text-end">{{"Der FH Ausweis ist am "+ wert+ " ausgegeben worden."}}</dd>
+                                </div>
+
+                            <!-- HIER SIND DIE EMAILS -->
                     
-                        <div class="row my-5">
+
+                                <div class="mb-3" v-if="typeof wert === 'object' && bezeichnung == 'emails'">
+                                    <dt class="mb-0">eMail</dt>
+                                    <dd v-for="email in wert" class="mb-0 text-end">{{email.type}}: <a style="text-decoration:none" :href="'mailto:'+email.email">{{email.email}}</a></dd>
+                                </div>
+
+                                <!-- HIER SIND DIE PRIVATEN KONTAKTE -->
+                                <div class="mb-3" v-if="typeof wert === 'object' && bezeichnung=='Kontakte'">
+                                <dt class="mb-0">Private Kontakte</dt>
+                                    <dd class="row text-end" v-for="element in wert" >
+                                        <div class="col-8">{{element.kontakttyp + ":  " + element.kontakt+"  " }}</div>
+                                        <div class="col-2"> {{element?.anmerkung}}</div>
+                                        <div class="col-2"> 
+                                        <i v-if="element.zustellung" class="fa-solid fa-check"></i>
+                                        <i v-else="element.zustellung" class="fa-solid fa-xmark"></i>
+                                        </div>
+                                    </dd>
+                                </div>
+                            
+                            </dl>
+                        </div>
+                      </div>
+
+
+                  </div>
+              </div>
+            
+              <div class="row">
+              <div class="col">
+              <p>Sollten Ihre Daten nicht mehr aktuell sein, klicken Sie bitte <a :href="refreshMailTo">hier</a></p>
+              </div>
+              </div>
+              <div class="row my-5">
                         
                 
                             <div class="col-12">
@@ -208,26 +233,29 @@ export default {
                         
                         </div>
 
-                
-                    </div>
+      
+          </div>
 
-                    <div  class="col-3">
-                        <div style="background-color:#EEEEEE" class="row py-4">
-                        <a style="text-decoration:none" class="my-1" href="#">Zeitwuensche</a>
-                        <a style="text-decoration:none" class="my-1" href="#">Lehrveranstaltungen</a>
-                        <a style="text-decoration:none" class="my-1" href="#">Zeitsperren von Gschnell</a>
-                        </div>
-                        <div class="row">
-                            <h5 class="fs-3" style="margin-top:1em">Mailverteilers</h5>
-                            <p class="fs-6">Sie sind Mitgglied in folgenden Verteilern:</p>
-                            <div  class="row text-break" v-for="verteiler in data?.mailverteiler">
-                                <div class="col-6"><a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a></div> 
-                                <div class="col-6">{{verteiler.beschreibung}}</div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
+          <div  class="col-3">
+              <div style="background-color:#EEEEEE" class="row py-4">
+              <a style="text-decoration:none" class="my-1" href="#">Zeitwuensche</a>
+              <a style="text-decoration:none" class="my-1" href="#">Lehrveranstaltungen</a>
+              <a style="text-decoration:none" class="my-1" href="#">Zeitsperren von Gschnell</a>
+              </div>
+              <div class="row">
+                  <h5 class="fs-3" style="margin-top:1em">Mailverteilers</h5>
+                  <p class="fs-6">Sie sind Mitgglied in folgenden Verteilern:</p>
+                  <div  class="row text-break" v-for="verteiler in data?.mailverteiler">
+                      <div class="col-6"><a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a></div> 
+                      <div class="col-6">{{verteiler.beschreibung}}</div>
+                  </div>
+              </div>
+          </div>
+      </div>
+  </div>
+
+
+           
             
     `,
 };
diff --git a/public/js/components/Cis/Profil/StudentViewProfil.js b/public/js/components/Cis/Profil/StudentViewProfil.js
index 8dbc4275e..b119ebdeb 100644
--- a/public/js/components/Cis/Profil/StudentViewProfil.js
+++ b/public/js/components/Cis/Profil/StudentViewProfil.js
@@ -80,73 +80,114 @@ export default {
   template: `
 
 
-            <div class="container-fluid">
-            <!-- here starts the row of the whole window -->
-                <div class="row">
-                <!-- this is the left column of the window -->
-                    <div class="col-9">
+           
+        <div class="container-fluid">
+        <!-- here starts the row of the whole window -->
+            <div class="row">
+            <!-- this is the left column of the window -->
+                <div class="col-9">
+                    <div class="row">
+                        
+
+
+                        <div class="col-2">
                         <div class="row">
                             <div class="col">
+                            <h3 >Student</h3>
                                 <img class="img-thumbnail" :src="get_image_base64_src"></img>
-                                
-                               
-                            </div>
-                            
-                          
-                            <div class="col">
-                        
-                        
-                                <h3 >Student</h3>
-                                
-                                <div v-for="(wert,bezeichnung) in personData">
-                                
-                                <div class="mb-3"  v-if="typeof wert == 'object' && bezeichnung=='Adressen'"><span style="display:block" v-for="element in wert">{{element.strasse}} <b>({{element.adr_typ}})</b><br/>{{ element.plz}} {{element.ort}}</span></div>
-                                <div v-else class="mb-3" ><span style="display:block;" v-for="(val,bez) in wert">{{bez}}: {{val}}</span></div>
-                                
-                                </div>
-                                
-                            </div>
-                            <div class="col">
-                                <div style="list-style:none">
-                                
-                                    <p v-for="(wert,bezeichnung) in kontaktInfo">
-                                        <!-- HIER SIND DIE EMAILS -->
-                                        <div class="mb-3" v-if="typeof wert === 'object' && bezeichnung == 'emails'">
-                                            <p class="mb-0"><b>eMail</b></p>
-                                            <p v-for="email in wert" class="mb-0">{{email.type}}: <a style="text-decoration:none" :href="'mailto:'+email.email">{{email.email}}</a></p>
-                                        </div>
-
-                                       
-                                    
-                                    </p>
-                                </div>
-
-
                             </div>
                         </div>
                       
-                    
-                     
-                
                     </div>
 
-                    <div  class="col-3">
-                        <div style="background-color:#EEEEEE" class="row py-4">
-                        <a style="text-decoration:none" class="my-1" href="#">Zeitwuensche</a>
-                        <a style="text-decoration:none" class="my-1" href="#">Lehrveranstaltungen</a>
-                        <a style="text-decoration:none" class="my-1" href="#">Zeitsperren von Gschnell</a>
-                        </div>
-                        <div class="row">
-                            <h5 class="fs-3" style="margin-top:1em">Mailverteilers</h5>
-                            <p class="fs-6">Sie sind Mitgglied in folgenden Verteilern:</p>
-                            <div  class="row text-break" v-for="verteiler in data?.mailverteiler">
-                                <div class="col-6"><a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a></div> 
-                                <div class="col-6">{{verteiler.beschreibung}}</div>
+
+
+                        
+                      
+                        <div class="col m-4">
+                    
+                    
+                            
+                        
+                            
+                            <div class="row">
+                              <div :class="{'col-lg-12':true, 'col-xl-6':true, 'order-1':bezeichnung=='Allgemein', 'order-3':bezeichnung=='SpecialInformation'}" v-for="(wert,bezeichnung) in personData">
+                                                              
+                              
+                                <dl class="m-0" v-else v-for="(wert,bez) in wert">
+                                  <dt >{{bez}}</dt>
+                                  <dd class="text-end m-0">{{wert?wert:"-"}}</dd>
+                                </dl>
+                            
+                              </div>
+                            
+                            
+                        
+                      
+                              <div class="col-lg-12 col-xl-6 order-2">
+                              
+                                  <dl v-for="(wert,bezeichnung) in kontaktInfo">
+                                  
+                                  <!-- HIER IST DAS DATUM DES FH AUSWEIS -->
+                                      <div class="mb-3" v-if="bezeichnung=='FhAusweisStatus'">
+                                          <dt class="mb-0">FH-Ausweis Status</dt>
+                                          <dd class="mb-0 text-end">{{"Der FH Ausweis ist am "+ wert+ " ausgegeben worden."}}</dd>
+                                      </div>
+
+                                  <!-- HIER SIND DIE EMAILS -->
+                          
+
+                                      <div class="mb-3" v-if="typeof wert === 'object' && bezeichnung == 'emails'">
+                                          <dt class="mb-0">eMail</dt>
+                                          <dd v-for="email in wert" class="mb-0 text-end">{{email.type}}: <a style="text-decoration:none" :href="'mailto:'+email.email">{{email.email}}</a></dd>
+                                      </div>
+
+                                      <!-- HIER SIND DIE PRIVATEN KONTAKTE -->
+                                      <div class="mb-3" v-if="typeof wert === 'object' && bezeichnung=='Kontakte'">
+                                      <dt class="mb-0">Private Kontakte</dt>
+                                          <dd class="row text-end" v-for="element in wert" >
+                                              <div class="col-8">{{element.kontakttyp + ":  " + element.kontakt+"  " }}</div>
+                                              <div class="col-2"> {{element?.anmerkung}}</div>
+                                              <div class="col-2"> 
+                                              <i v-if="element.zustellung" class="fa-solid fa-check"></i>
+                                              <i v-else="element.zustellung" class="fa-solid fa-xmark"></i>
+                                              </div>
+                                          </dd>
+                                      </div>
+                                  
+                                  </dl>
+                              </div>
                             </div>
+
+
+                        </div>
+                    </div>
+                  
+                
+                
+
+            
+                </div>
+
+                <div  class="col-3">
+                    <div style="background-color:#EEEEEE" class="row py-4">
+                    <a style="text-decoration:none" class="my-1" href="#">Zeitwuensche</a>
+                    <a style="text-decoration:none" class="my-1" href="#">Lehrveranstaltungen</a>
+                    <a style="text-decoration:none" class="my-1" href="#">Zeitsperren von Gschnell</a>
+                    </div>
+                    <div class="row">
+                        <h5 class="fs-3" style="margin-top:1em">Mailverteilers</h5>
+                        <p class="fs-6">Sie sind Mitgglied in folgenden Verteilern:</p>
+                        <div  class="row text-break" v-for="verteiler in data?.mailverteiler">
+                            <div class="col-6"><a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a></div> 
+                            <div class="col-6">{{verteiler.beschreibung}}</div>
                         </div>
                     </div>
                 </div>
             </div>
+        </div>          
+  
+  
             
     `,
 };

From 0b97a92ae97a126a50fe791f374d8088b9a2f713 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 7 Dec 2023 16:03:14 +0100
Subject: [PATCH 0214/1461] use smaller base font-size

---
 public/css/Studentenverwaltung.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/public/css/Studentenverwaltung.css b/public/css/Studentenverwaltung.css
index 67a037238..5f6050abf 100644
--- a/public/css/Studentenverwaltung.css
+++ b/public/css/Studentenverwaltung.css
@@ -1,6 +1,10 @@
 @import './components/searchbar.css';
 @import './components/verticalsplit.css';
 
+html {
+  font-size: .875em;
+}
+
 .navbar-dark .navbar-brand:focus {
 	box-shadow: 0 0 0 .25rem rgba(13,110,253,.25);
 	z-index: 3;

From 3f84fa7f2d2e81c086f28529762da0246ff1b0d0 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 7 Dec 2023 17:17:48 +0100
Subject: [PATCH 0215/1461] use smaller base font-size

---
 public/css/Cis4/Cis.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index 0ed8ecf62..9747767e5 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -42,6 +42,10 @@
   }
 }
 
+html {
+	font-size: .875em;
+}
+
 /* buttons */
 #cis-header .btn-level-1,
 #cis-header .btn-level-1 + .btn,

From 8f152cdf5015456810bb749e4debd991d69176de Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Mon, 11 Dec 2023 08:51:51 +0100
Subject: [PATCH 0216/1461] fixed layout bug, table now shows under profil
 information without disturbing the right panel

---
 public/js/components/Cis/Profil/Base.js | 33 ++++++++++++++-----------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/public/js/components/Cis/Profil/Base.js b/public/js/components/Cis/Profil/Base.js
index 0726fa552..16bd5404c 100644
--- a/public/js/components/Cis/Profil/Base.js
+++ b/public/js/components/Cis/Profil/Base.js
@@ -176,10 +176,13 @@ export default {
                         
                         
                         </div>
+                        <div class="col-sm-12 col-md-9">
+                        <div class="row">
+                        
                         <div class="col-md-3 col-sm-12" style="background-color:lightgreen;">
                         <img class=" img-thumbnail "  :src="get_image_base64_src"></img>
                         </div>
-                        <div class="col-md-6 col-sm-12" style="background-color:lightcoral;">
+                        <div class="col-md-9 col-sm-12" style="background-color:lightcoral;">
                         
 
 
@@ -229,7 +232,21 @@ export default {
 
                         </div>
 
+                        </div>
+                        </div>
+                        <div class="row">
 
+                        <!-- HIER SIND DIE TABELLEN -->
+                        <div class="col-12" style="background-color:purple">
+                        <core-filter-cmpt title="Funktionen"  ref="funktionenTable" :tabulator-options="funktionen_table_options" :tableOnly />
+                        
+                        </div>
+                        <div class="col-12" style="background-color:orange">
+                        <core-filter-cmpt title="Entlehnte Betriebsmittel"  ref="betriebsmittelTable" :tabulator-options="betriebsmittel_table_options" :tableOnly />
+                        </div>
+
+
+                    </div>
 
                         
                         </div>
@@ -266,19 +283,7 @@ export default {
 
 
                         </div>    
-                        <div class="row">
-
-                            <!-- HIER SIND DIE TABELLEN -->
-                            <div class="col-12" style="background-color:purple">
-                            <core-filter-cmpt title="Funktionen"  ref="funktionenTable" :tabulator-options="funktionen_table_options" :tableOnly />
-                            
-                            </div>
-                            <div class="col-12" style="background-color:orange">
-                            <core-filter-cmpt title="Entlehnte Betriebsmittel"  ref="betriebsmittelTable" :tabulator-options="betriebsmittel_table_options" :tableOnly />
-                            </div>
-
-
-                        </div>
+                       
                          
                     </div>
 

From e8a89cf2772eaf473e4741bcffcda6262a70d7a2 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Mon, 11 Dec 2023 09:43:32 +0100
Subject: [PATCH 0217/1461] add comments to the layout to logically seperate
 the different columns and rows

---
 public/js/components/Cis/Profil/Base.js | 311 ++++++++++++++----------
 1 file changed, 178 insertions(+), 133 deletions(-)

diff --git a/public/js/components/Cis/Profil/Base.js b/public/js/components/Cis/Profil/Base.js
index 16bd5404c..eaa85c6b3 100644
--- a/public/js/components/Cis/Profil/Base.js
+++ b/public/js/components/Cis/Profil/Base.js
@@ -1,15 +1,12 @@
 import fhcapifactory from "../../../apps/api/fhcapifactory.js";
 import { CoreFilterCmpt } from "../../../components/filter/Filter.js";
 
-
 export default {
   components: {
     CoreFilterCmpt,
   },
   data() {
     return {
-      
-
       funktionen_table_options: {
         height: 300,
         layout: "fitColumns",
@@ -41,7 +38,13 @@ export default {
       betriebsmittel_table_options: {
         height: 300,
         layout: "fitColumns",
-        data: [{ betriebsmittel: "<a href='#'>test</a>", Nummer: "", Ausgegeben_am: "" }],
+        data: [
+          {
+            betriebsmittel: "<a href='#'>test</a>",
+            Nummer: "",
+            Ausgegeben_am: "",
+          },
+        ],
         columns: [
           {
             title: "Betriebsmittel",
@@ -56,14 +59,12 @@ export default {
           },
         ],
       },
-     
     };
   },
 
-    //? this is the prop passed to the dynamic component with the custom data of the view
+  //? this is the prop passed to the dynamic component with the custom data of the view
   props: ["data"],
   methods: {
-   
     sperre_foto_function(value) {
       if (!this.data) {
         return;
@@ -75,7 +76,7 @@ export default {
   },
   computed: {
     refreshMailTo() {
-      return `mailto:info.mio@technikum-wien.at?subject=Datenkorrektur&body=Die%20Profildaten%20für%20User%20'${this.data.username}'%20sind%20nicht%20korrekt.%0DHier, die richtigen Daten:%0A%0ANachname:%20${this.data.nachname}%0AVorname:%20${this.data.vorname}%0AGeburtsdatum:${this.data.gebdatum}%0AGeburtsort:%20${this.data.gebort}%0ATitelPre:${this.data.titel}%20%0ATitelPost:${this.data.postnomen}%20%0A%0A***%0DPlatz für weitere (nicht angeführte Daten)%0D***%0A%0A[Bitte%20übermitteln%20Sie%20uns%20etwaige%20Dokumente%20zum%20Beleg%20der%20Änderung]`
+      return `mailto:info.mio@technikum-wien.at?subject=Datenkorrektur&body=Die%20Profildaten%20für%20User%20'${this.data.username}'%20sind%20nicht%20korrekt.%0DHier, die richtigen Daten:%0A%0ANachname:%20${this.data.nachname}%0AVorname:%20${this.data.vorname}%0AGeburtsdatum:${this.data.gebdatum}%0AGeburtsort:%20${this.data.gebort}%0ATitelPre:${this.data.titel}%20%0ATitelPost:${this.data.postnomen}%20%0A%0A***%0DPlatz für weitere (nicht angeführte Daten)%0D***%0A%0A[Bitte%20übermitteln%20Sie%20uns%20etwaige%20Dokumente%20zum%20Beleg%20der%20Änderung]`;
     },
 
     get_image_base64_src() {
@@ -84,7 +85,7 @@ export default {
       }
       return "data:image/jpeg;base64," + this.data.foto;
     },
-    //? this computed function returns all the informations for the first column in the profil 
+    //? this computed function returns all the informations for the first column in the profil
     personData() {
       if (!this.data) {
         return {};
@@ -102,26 +103,18 @@ export default {
           Geburtsort: this.data.gebort,
           Kurzzeichen: this.data.kurzbz,
           Telefon: this.data.telefonklappe,
-          Büro:this.data.ort_kurzbz,
+          Büro: this.data.ort_kurzbz,
           FhAusweisStatus: this.data.zutrittsdatum,
         },
-        
-
-
-
-
-        
       };
     },
-    //? this computed function returns the data for the second column in the profil 
+    //? this computed function returns the data for the second column in the profil
     kontaktInfo() {
       if (!this.data) {
         return {};
       }
 
       return {
-        
-        
         emails: this.data.emails,
         Kontakte: this.data.kontakte,
         Adressen: this.data.adressen,
@@ -130,170 +123,222 @@ export default {
   },
 
   mounted() {
-       this.$refs.betriebsmittelTable.tabulator.on('tableBuilt', () => {
-    
-        this.$refs.betriebsmittelTable.tabulator.setData(this.data.mittel);
-        
-    }) 
+    this.$refs.betriebsmittelTable.tabulator.on("tableBuilt", () => {
+      this.$refs.betriebsmittelTable.tabulator.setData(this.data.mittel);
+    });
 
-    this.$refs.funktionenTable.tabulator.on('tableBuilt', () => {
-    
-        this.$refs.funktionenTable.tabulator.setData(this.data.funktionen);
-        
-    })  
- 
+    this.$refs.funktionenTable.tabulator.on("tableBuilt", () => {
+      this.$refs.funktionenTable.tabulator.setData(this.data.funktionen);
+    });
   },
 
   template: `
-
+            <!-- CONTAINER -->
             <div class="container-fluid">
-                <div  class="row">
-                    <div class="col-12"> 
-                  
+              <!-- ROW --> 
                     <div class="row">
+                    <!-- HIDDEN QUICK LINKS -->
                         <div  class="d-md-none col-12 ">
-                        <!-- DROP DOWN LINKS -->
+                       
 
 
 
 
-                        <div style="background-color:#EEEEEE;" class="row py-4">
-                        <div class="col">
-                            <div class="dropdown">
-                            <button style="width:100%" class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenu2" data-bs-toggle="dropdown" aria-expanded="false">
-                                Quick links
-                            </button>
-                            <ul class="dropdown-menu" aria-labelledby="dropdownMenu2">
-                                <li><button class="dropdown-item" type="button">Action</button></li>
-                                <li><button class="dropdown-item" type="button">Another action</button></li>
-                                <li><button class="dropdown-item" type="button">Something else here</button></li>
-                            </ul>
+                          <div style="background-color:#EEEEEE;" class="row py-4">
+                            <div class="col">
+                                <div class="dropdown">
+                                <button style="width:100%" class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenu2" data-bs-toggle="dropdown" aria-expanded="false">
+                                    Quick links
+                                </button>
+                                <ul class="dropdown-menu" aria-labelledby="dropdownMenu2">
+                                    <li><button class="dropdown-item" type="button">Zeitwuensche</button></li>
+                                    <li><button class="dropdown-item" type="button">Lehrveranstaltungen</button></li>
+                                    <li><button class="dropdown-item" type="button">Zeitsperren von Gschnell</button></li>
+                                </ul>
+                                </div>
                             </div>
-                        </div>
-                        </div>
+                          </div>
 
 
                         
                         
                         </div>
+                        <!-- END OF HIDDEN QUCK LINKS -->
+
+
+
+                        <!-- MAIN PANNEL -->
                         <div class="col-sm-12 col-md-9">
-                        <div class="row">
-                        
-                        <div class="col-md-3 col-sm-12" style="background-color:lightgreen;">
-                        <img class=" img-thumbnail "  :src="get_image_base64_src"></img>
-                        </div>
-                        <div class="col-md-9 col-sm-12" style="background-color:lightcoral;">
+                          <!-- ROW WITH PROFIL IMAGE AND INFORMATION -->
+                          <div class="row">
+                            <!-- COLUMN WITH PROFIL IMAGE -->
+                              <div class="col-md-3 col-sm-12" style="background-color:lightgreen;">
+                              <img class=" img-thumbnail " style=" min-width:150px"  :src="get_image_base64_src"></img>
+                              </div>
+
+
+
+                              <!-- COLUMN WITH THE PROFIL INFORMATION --> 
+                              <div class="col-md-9 col-sm-12" style="background-color:lightcoral;">
                         
 
-
-
-                        <div class="row">
-                        <!-- HERE COMES THE INFORMATION -->
-                        <div style="background-color:red" class="col-md-12 col-lg-6">
+                              <!-- INFORMATION CONTENT START -->
+                              <!-- ROW WITH THE PROFIL INFORMATION --> 
+                              <div class="row">
 
 
 
-                        <div   v-for="(wert,bezeichnung) in personData">
-                            <dl class="  mb-0" v-else v-for="(wert,bez) in wert">
-                                <div class="row justify-content-center">
-                                    <dt class="col-6" >{{bez}}</dt>
-                                    <dd class=" col-6">{{wert?wert:"-"}}</dd>
+                                <!-- FIRST COLUMN WITH PROFIL INFORMATION -->
+                                <div style="background-color:red" class="col-md-12 col-lg-6">
+
+
+
+
+
+                                  <div   v-for="(wert,bezeichnung) in personData">
+                                      <dl class="  mb-0" v-else v-for="(wert,bez) in wert">
+                                          <div class="row justify-content-center">
+                                              <dt class="col-6" >{{bez}}</dt>
+                                              <dd class=" col-6">{{wert?wert:"-"}}</dd>
+                                          </div>
+                                      </dl>
+                                      <div class="row justify-content-center" v-if="bez=='FhAusweisStatus'">
+                                          <dt class="col-6" >FH-Ausweis Status</dt>
+                                          <dd class=" col-6 m-0">{{"Der FH Ausweis ist am "+ wert+ " ausgegeben worden."}}</dd>
+                                      </div>
+                                  </div>
+
+
+
+                                <!-- END OF THE FIRST INFORMATION COLUMN -->
                                 </div>
-                            </dl>
-                            <div class="row justify-content-center" v-if="bez=='FhAusweisStatus'">
-                                <dt class="col-6" >FH-Ausweis Status</dt>
-                                <dd class=" col-6 m-0">{{"Der FH Ausweis ist am "+ wert+ " ausgegeben worden."}}</dd>
-                            </div>
-                        </div>
 
 
-                        </div>
+                                <!-- START OF THE SECOND PROFIL INFORMATION COLUMN -->
+                                <div style="background-color:orange" class="col-lg-6 col-md-12">
 
 
 
-                        <div style="background-color:orange" class="col-lg-6 col-md-12">
 
-                        <div   v-for="(wert,bezeichnung) in personData">
-                            <dl class="  mb-0" v-else v-for="(wert,bez) in wert">
-                                <div class="row justify-content-center">
-                                    <dt class="col-6" >{{bez}}</dt>
-                                    <dd class=" col-6">{{wert?wert:"-"}}</dd>
+
+
+                                  <div   v-for="(wert,bezeichnung) in personData">
+                                      <dl class="  mb-0" v-else v-for="(wert,bez) in wert">
+                                          <div class="row justify-content-center">
+                                              <dt class="col-6" >{{bez}}</dt>
+                                              <dd class=" col-6">{{wert?wert:"-"}}</dd>
+                                          </div>
+                                      </dl>
+                                      <div class="row justify-content-center" v-if="bez=='FhAusweisStatus'">
+                                          <dt class="col-6" >FH-Ausweis Status</dt>
+                                          <dd class=" col-6 m-0">{{"Der FH Ausweis ist am "+ wert+ " ausgegeben worden."}}</dd>
+                                      </div>
+                                  </div>
+
+
+
+
+                                <!-- END OF THE SECOND INFORMATION COLUMN -->
                                 </div>
-                            </dl>
-                            <div class="row justify-content-center" v-if="bez=='FhAusweisStatus'">
-                                <dt class="col-6" >FH-Ausweis Status</dt>
-                                <dd class=" col-6 m-0">{{"Der FH Ausweis ist am "+ wert+ " ausgegeben worden."}}</dd>
+
+
+                        
+                              <!-- END OF PROFIL INFORMATION ROW -->
+                              <!-- INFORMATION CONTENT END -->
+                              </div>
+
+
+                              <!-- COLUMN WITH ALL PROFIL INFORMATION END -->
                             </div>
-                        </div>
+                            <!-- ROW WITH PROFIL IMAGE AND INFORMATION END -->
+                          </div  >
+
+
+
+
+                          <!-- SECOND ROW UNDER THE PROFIL IMAGE AND INFORMATION WITH THE TABLES -->
+                          <div class="row">
+
+                          <!-- FIRST TABLE -->
+                            <div class="col-12" style="background-color:lightskyblue">
+                              <core-filter-cmpt title="Funktionen"  ref="funktionenTable" :tabulator-options="funktionen_table_options" :tableOnly />
+                            </div>
+
+                          <!-- SECOND TABLE -->
+                            <div class="col-12" style="background-color:orange">
+                              <core-filter-cmpt title="Entlehnte Betriebsmittel"  ref="betriebsmittelTable" :tabulator-options="betriebsmittel_table_options" :tableOnly />
+                            </div>
+
+                          <!-- END OF THE ROW WITH THE TABLES UNDER THE PROFIL INFORMATION -->
+                          </div>
+
+
+
+
+
+
+
+                        <!-- END OF MAIN CONTENT COL -->
                         </div>
 
 
-                        
-
-                        </div>
-
-                        </div>
-                        </div>
-                        <div class="row">
-
-                        <!-- HIER SIND DIE TABELLEN -->
-                        <div class="col-12" style="background-color:purple">
-                        <core-filter-cmpt title="Funktionen"  ref="funktionenTable" :tabulator-options="funktionen_table_options" :tableOnly />
-                        
-                        </div>
-                        <div class="col-12" style="background-color:orange">
-                        <core-filter-cmpt title="Entlehnte Betriebsmittel"  ref="betriebsmittelTable" :tabulator-options="betriebsmittel_table_options" :tableOnly />
-                        </div>
 
 
-                    </div>
-
-                        
-                        </div>
-
+                        <!-- START OF SIDE PANEL -->
                         <div class="col-md-3 col-sm-12">
 
 
+                        <!-- SRART OF QUICK LINKS IN THE SIDE PANEL -->
 
-                        <div style="background-color:#EEEEEE;height:200px" class="row d-none d-md-block">
-                        <div class="col">
-                           <div style="background-color:#EEEEEE" class="row py-4">
-                               <a style="text-decoration:none" class="my-1" href="#">Zeitwuensche</a>
-                               <a style="text-decoration:none" class="my-1" href="#">Lehrveranstaltungen</a>
-                               <a style="text-decoration:none" class="my-1" href="#">Zeitsperren von Gschnell</a>
-                           </div>
+
+                        <!-- START OF THE FIRDT ROW IN THE SIDE PANEL -->
+                        <!-- THESE QUCK LINKS ARE ONLY VISIBLE UNTIL VIEWPORT MD -->
+                          <div style="background-color:#EEEEEE;" class="row d-none d-md-block">
+                            <div class="col">
+                              <div style="background-color:#EEEEEE" class="row py-4">
+                                  <a style="text-decoration:none" class="my-1" href="#">Zeitwuensche</a>
+                                  <a style="text-decoration:none" class="my-1" href="#">Lehrveranstaltungen</a>
+                                  <a style="text-decoration:none" class="my-1" href="#">Zeitsperren von Gschnell</a>
+                              </div>
+                            </div>
+                          </div>
+
+
+                          <!-- START OF THE SECOND ROW IN THE SIDE PANEL -->
+                          <div style="background-color: darkgray"  class="row">
+                          
+                            <div class="col">
+                          
+
+                            
+                            <!-- HIER SIND DIE MAILVERTEILER -->
+                              <h5 class="fs-3" style="margin-top:1em">Mailverteilers</h5>
+                              <p class="fs-6">Sie sind Mitgglied in folgenden Verteilern:</p>
+                              <div  class="row text-break" v-for="verteiler in data?.mailverteiler">
+                                <div class="col-6"><a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a></div> 
+                                <div class="col-6">{{verteiler.beschreibung}}</div>
+                              </div>
+    
+    
+    
+                            </div>
+
+                          <!-- END OF THE SECOND ROW IN THE SIDE PANEL -->
+                          </div>
+
+                          <!-- END OF SIDE PANEL -->
                         </div>
-                        </div>
-                        <div style="background-color: darkgray"  class="  row">
-                        <div class="col">
-                        
-                           <!-- HIER SIND DIE MAILVERTEILER -->
-                           <h5 class="fs-3" style="margin-top:1em">Mailverteilers</h5>
-                           <p class="fs-6">Sie sind Mitgglied in folgenden Verteilern:</p>
-                           <div  class="row text-break" v-for="verteiler in data?.mailverteiler">
-                               <div class="col-6"><a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a></div> 
-                               <div class="col-6">{{verteiler.beschreibung}}</div>
-                           </div>
-   
-   
-   
-                        </div>
-                        </div>
-                       </div>
 
 
-                        </div>    
-                       
-                         
-                    </div>
+                      
 
 
 
-                    <!-- HIER IST DIE RECHTE SEITE MIT DEN LINKS UND DEN MAILVERTEILERN -->
+                    <!-- END OF CONTAINER ROW-->
                     
                 </div>
                 
-        
+                <!-- END OF CONTAINER -->
             </div>
             
     `,

From f45d692e662bf755701bb7c5c1a98d690830a0ee Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Mon, 11 Dec 2023 12:55:54 +0100
Subject: [PATCH 0218/1461] used new layout for the different views

---
 application/controllers/Cis/Profil.php        |   1 +
 public/js/apps/Cis/Profil.js                  |   2 +-
 public/js/components/Cis/Profil/Base.js       |  13 +-
 .../Cis/Profil/MitarbeiterProfil.js           | 426 +++++++++++-------
 .../Cis/Profil/MitarbeiterViewProfil.js       | 306 +++++++++----
 .../js/components/Cis/Profil/StudentProfil.js | 387 +++++++++++-----
 .../Cis/Profil/StudentViewProfil.js           | 294 ++++++++----
 7 files changed, 962 insertions(+), 467 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index 9dfbc741d..a5640d916 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -628,6 +628,7 @@ class Profil extends Auth_Controller
 				
 			}
 			if(!$pid){
+				//! if no Person_ID was found, null is returned and the vue component will show a 404 View
 				return null;
 			}
 			
diff --git a/public/js/apps/Cis/Profil.js b/public/js/apps/Cis/Profil.js
index eb5cfbf4a..825b7a5ce 100644
--- a/public/js/apps/Cis/Profil.js
+++ b/public/js/apps/Cis/Profil.js
@@ -52,7 +52,7 @@ const app = Vue.createApp({
 	<div v-if="notFoundUID">
 	<h3>Es wurden keine oder mehrere Profile für {{this.notFoundUID}} gefunden</h3>
 	</div>
-	<component v-else :is="data?.base" :data="data" ></component>
+	<component v-else :is="view" :data="data" ></component>
 	</div>`
 	
 	
diff --git a/public/js/components/Cis/Profil/Base.js b/public/js/components/Cis/Profil/Base.js
index eaa85c6b3..10ff32739 100644
--- a/public/js/components/Cis/Profil/Base.js
+++ b/public/js/components/Cis/Profil/Base.js
@@ -172,14 +172,14 @@ export default {
                           <!-- ROW WITH PROFIL IMAGE AND INFORMATION -->
                           <div class="row">
                             <!-- COLUMN WITH PROFIL IMAGE -->
-                              <div class="col-md-3 col-sm-12" style="background-color:lightgreen;">
-                              <img class=" img-thumbnail " style=" min-width:150px"  :src="get_image_base64_src"></img>
+                              <div class="col-md-2 col-sm-12" style="background-color:lightgreen;">
+                              <img class=" img-thumbnail " style=" max-height:150px"  :src="get_image_base64_src"></img>
                               </div>
 
 
 
                               <!-- COLUMN WITH THE PROFIL INFORMATION --> 
-                              <div class="col-md-9 col-sm-12" style="background-color:lightcoral;">
+                              <div class="col-md-10 col-sm-12" style="background-color:lightcoral;">
                         
 
                               <!-- INFORMATION CONTENT START -->
@@ -254,6 +254,13 @@ export default {
                           </div  >
 
 
+                          <div class="row">
+                            <div style="background-color:lightpink" class="col">
+                              <p>Sollten Ihre Daten nicht mehr aktuell sein, klicken Sie bitte <a :href="refreshMailTo">hier</a></p>
+                            </div>
+                          </div>
+
+
 
 
                           <!-- SECOND ROW UNDER THE PROFIL IMAGE AND INFORMATION WITH THE TABLES -->
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 2f3ef7d88..b6f416d43 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -145,178 +145,296 @@ export default {
   },
 
   template: `
-
-            <div class="container-fluid">
-            <!-- here starts the row of the whole window -->
-                <div class="row ">
-                <!-- this is the left column of the window -->
-                    <div class="col-md-12 col-lg-9">
-                    
-                        <div class="row align-items-center">
-                            
-
-
-                            <div style="background-color:lightgreen" class="col-md-12 col-lg-2">
-                         
-                            <div class="row">
-                                <div class="align-middle ">
-                                <h3 >Mitarbeiter</h3>
-                                    <img class=" img-thumbnail " :height="" :src="get_image_base64_src"></img>
-                                   
-                                </div>
-                                <div  style="background-color:#EEEEEE" class=" lg-invisible col row py-4">
-                                <a style="text-decoration:none" class="my-1" href="#">Zeitwuensche</a>
-                                <a style="text-decoration:none" class="my-1" href="#">Lehrveranstaltungen</a>
-                                <a style="text-decoration:none" class="my-1" href="#">Zeitsperren von Gschnell</a>
-                                </div>
-                                
-                                
-                                
-                            </div>
-                            
-                            <div class="row">
-                                <div class="col">
-                                    <div v-if="data.foto_sperre ">
-                                        <p class="m-0">Profilfoto gesperrt</p>
-                                        <a href="#" @click.prevent="sperre_foto_function(false)" class="text-decoration-none">Sperre des Profilfotos aufheben</a>
-                                    </div>
-                                    <a href="#" @click.prevent="sperre_foto_function(true)" class="text-decoration-none"  v-else>Profilfoto sperren</a>
-                                </div>
-                            </div>
-                          
-                        </div>
+  <!-- CONTAINER -->
+  <div class="container-fluid">
+    <!-- ROW --> 
+          <div class="row">
+          <!-- HIDDEN QUICK LINKS -->
+              <div  class="d-md-none col-12 ">
+             
 
 
 
-                            
-                          
-                            <div style="background-color:lightblue" class="col-lg-10 col-md-12 ">
-                        
-                        
-                                
-                            
-                                
-                                <div class="row">
-                                  <div style="background-color:lightsalmon" :class="{ 'col-lg-12':true, 'col-xl-6':true, 'order-1':bezeichnung=='Allgemein',  'order-4':bezeichnung=='Adressen'}" v-for="(wert,bezeichnung) in personData">
-                                                                  
-                                    
 
-                                    <dl class="  mb-3" v-else v-for="(wert,bez) in wert">
-                                    
-                                    
-                                    <div class="row justify-content-center" v-if="bez=='FhAusweisStatus'">
-                                    <dt class="col-md-6 col-xxl-4 m-0" >FH-Ausweis Status</dt>
-                                    <dd class=" col-md-6 col-xxl-4 m-0">{{"Der FH Ausweis ist am "+ wert+ " ausgegeben worden."}}</dd>
-                                  
-                                  </div>
-                                  <div v-else class="row justify-content-center">
-                                        <dt class="col-md-6 col-xxl-4 m-0" >{{bez}}</dt>
-                                        <dd class=" col-md-6 col-xxl-4 m-0">{{wert?wert:"-"}}</dd>
-                                        </div>
-                                    </dl>
-                                
-                                  </div>
-                                
-                                
-                            
-                           
-                                  <div style="background-color: lightcoral" class="col-lg-12 col-xl-6 order-2  ">
-                                  
-                                      <dl v-for="(wert,bezeichnung) in kontaktInfo">
-                                      
-                                      <!-- HIER IST DAS DATUM DES FH AUSWEIS -->
-                                      <!-- WAS MOVED TO THE FIRST INFO BOX -->
+                <div style="border:4px solid;border-color:#EEEEEE;" class="row py-4">
+                  <div class="col">
+                      <div class="dropdown">
+                      <button style="width:100%" class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenu2" data-bs-toggle="dropdown" aria-expanded="false">
+                          Quick links
+                      </button>
+                      <ul class="dropdown-menu" aria-labelledby="dropdownMenu2">
+                          <li><button class="dropdown-item" type="button">Zeitwuensche</button></li>
+                          <li><button class="dropdown-item" type="button">Lehrveranstaltungen</button></li>
+                          <li><button class="dropdown-item" type="button">Zeitsperren von Gschnell</button></li>
+                      </ul>
+                      </div>
+                  </div>
+                </div>
 
 
-                                          <div class="justify-content-center row mb-3" v-if="bezeichnung=='FhAusweisStatus'">
-                                            <dt class="col-md-6 col-xxl-4  mb-0">FH-Ausweis Status</dt>
-                                            <div class="col-md-6 col-xxl-4">
-                                              <dd class="mb-0 ">{{"Der FH Ausweis ist am "+ wert+ " ausgegeben worden."}}</dd>
-                                            </div>
-                                          </div>
-
-                                      <!-- HIER SIND DIE EMAILS -->
-                              
-
-                                          <div class="justify-content-center row mb-3" v-if="typeof wert === 'object' && bezeichnung == 'emails'">
-                                              <dt class="col-md-6 col-xxl-4 mb-0">eMail</dt>
-                                              <div class="col-md-6 col-xxl-4">
-                                              <dd v-for="email in wert" class="mb-0 ">{{email.type}}: <a style="text-decoration:none" :href="'mailto:'+email.email">{{email.email}}</a></dd>
-                                              </div>
-                                            </div>
-
-                                          <!-- HIER SIND DIE PRIVATEN KONTAKTE -->
-                                          <div class="justify-content-center row mb-3" v-if="typeof wert === 'object' && bezeichnung=='Kontakte'">
-                                          <dt   class="col-md-6 col-xxl-4 mb-0">Private Kontakte</dt>
-                                          <div class="col-md-6 col-xxl-4">
-                                              <dd class="row justify-end" v-for="element in wert" >
-                                                  <div class="col-8">{{element.kontakttyp + ":  " + element.kontakt+"  " }}</div>
-                                                  <div class="col-2"> {{element?.anmerkung}}</div>
-                                                  <div class="col-2"> 
-                                                  <i v-if="element.zustellung" class="fa-solid fa-check"></i>
-                                                  <i v-else="element.zustellung" class="fa-solid fa-xmark"></i>
-                                                  </div>
-                                              </dd>
-                                              </div>
-                                          </div>
-                                          
-                                          <!-- HIER SIND DIE ADRESSEN -->
-                                          <div class=" justify-content-center row mb-3" v-if="typeof wert === 'object' && bezeichnung=='Adressen'">
-                                            <dt class="col-md-6 col-xxl-4">Adressen</dt>
-                                              <div class="col-md-6 col-xxl-4">
-                                                <dd class="  m-0"  v-for="element in wert">
-                                                  {{element.strasse}} <b>({{element.adr_typ}})</b><br/>{{ element.plz}} {{element.ort}}
-                                                </dd>
-                                              </div>
-                                          </div>
-                                      
-                                      </dl>
-                                  </div>
-                                </div>
+              
+              
+              </div>
+              <!-- END OF HIDDEN QUCK LINKS -->
 
 
-                            </div>
-                        </div>
-                      
+
+              <!-- MAIN PANNEL -->
+              <div class="col-sm-12 col-md-9">
+                <!-- ROW WITH PROFIL IMAGE AND INFORMATION -->
+                <div class="row">
+                  <!-- COLUMN WITH PROFIL IMAGE -->
+                    <div class="col-md-2 col-sm-12" style="border:4px solid;border-color:lightgreen;">
+
+
+
+
+
+
+                    <!-- START OF THE FIRST ROW WITH THE PROFIL IMAGE -->
                       <div class="row">
-                      <div class="col">
-                      <p>Sollten Ihre Daten nicht mehr aktuell sein, klicken Sie bitte <a :href="refreshMailTo">hier</a></p>
-                      </div>
-                      </div>
-                        <div class="row my-5">
-                        
-                
-                            <div class="col-12">
-                            <core-filter-cmpt title="Funktionen"  ref="funktionenTable" :tabulator-options="funktionen_table_options" :tableOnly />
-                            
-                            </div>
-                            <div class="col-12">
-                            <core-filter-cmpt title="Entlehnte Betriebsmittel"  ref="betriebsmittelTable" :tabulator-options="betriebsmittel_table_options" :tableOnly />
-                            </div>
-                        
+                        <div class="col">
+                          <img class=" img-thumbnail " style=" max-height:150px"  :src="get_image_base64_src"></img>
                         </div>
+                      </div>
+                    <!-- END OF THE ROW WITH THE IMAGE -->
 
-                
+
+
+
+
+
+                    <!-- START OF THE SECOND ROW WITH THE IMAGE LINK -->
+                      <div class="row">
+                        <div class="col">
+                          
+
+                        
+                        <div v-if="data.foto_sperre ">
+                          <p class="m-0">Profilfoto gesperrt</p>
+                          <a href="#" @click.prevent="sperre_foto_function(false)" class="text-decoration-none">Sperre des Profilfotos aufheben</a>
+                        </div>
+                        <!-- DIESEN LINK KOENNTE MAN MIT EINEM ICON AUSTAUSCHEN WENN DIE VIEWPORT KLEIN IST -->
+                        <a href="#" @click.prevent="sperre_foto_function(true)" class="text-decoration-none"  v-else>Profilfoto sperren</a>
+                     
+
+
+
+                        </div>
+                      </div>
+                    <!-- END OF THE ROW WITH THE IMAGE LINK -->
+
+
+
+
+
+
+                    <!-- END OF THE COLUMN WITH PROFIL IMAGE AND LINK -->
                     </div>
 
-                    <div  class="col-md-12 col-lg-3 ">
-                        <div style="background-color:#EEEEEE" class="row md-invisible py-4">
+
+
+                    <!-- COLUMN WITH THE PROFIL INFORMATION --> 
+                    <div class="col-md-10 col-sm-12" style="border:4px solid;border-color:lightcoral;">
+              
+
+                    <!-- INFORMATION CONTENT START -->
+                    <!-- ROW WITH THE PROFIL INFORMATION --> 
+                    <div class="row">
+
+
+
+                      <!-- FIRST COLUMN WITH PROFIL INFORMATION -->
+                      <div style="border:4px solid;border-color:red" class="col-md-12 col-lg-6">
+
+
+
+
+
+                        <div   v-for="(wert,bezeichnung) in personData">
+                            <dl class="  mb-0" v-else v-for="(wert,bez) in wert">
+                                <div class="row justify-content-center">
+                                    <dt class="col-6" >{{bez}}</dt>
+                                    <dd class=" col-6">{{wert?wert:"-"}}</dd>
+                                </div>
+                            </dl>
+                            <div class="row justify-content-center" v-if="bez=='FhAusweisStatus'">
+                                <dt class="col-6" >FH-Ausweis Status</dt>
+                                <dd class=" col-6 m-0">{{"Der FH Ausweis ist am "+ wert+ " ausgegeben worden."}}</dd>
+                            </div>
+                        </div>
+
+
+
+                      <!-- END OF THE FIRST INFORMATION COLUMN -->
+                      </div>
+
+
+                      <!-- START OF THE SECOND PROFIL INFORMATION COLUMN -->
+                      <div style="border:4px solid;border-color:orange" class="col-lg-6 col-md-12">
+
+
+
+
+
+
+                        <dl v-for="(wert,bezeichnung) in kontaktInfo">
+
+                        <!-- HIER SIND DIE EMAILS -->
+                    
+                    
+                          <div class="justify-content-center row mb-3" v-if="typeof wert === 'object' && bezeichnung == 'emails'">
+                              <dt class="col-4  mb-0">eMail</dt>
+                              <div class="col-8 ">
+                                  <dd v-for="email in wert" class="mb-0 ">{{email.type}}: <a style="text-decoration:none" :href="'mailto:'+email.email">{{email.email}}</a></dd>
+                              </div>
+                          </div>
+                      
+                      
+                          <!-- HIER SIND DIE PRIVATEN KONTAKTE -->
+                          <div class="justify-content-center row mb-3" v-if="typeof wert === 'object' && bezeichnung=='Kontakte'">
+                              <dt   class="col-4 mb-0">Private Kontakte</dt>
+                              <div class="col-8 ">
+                                  <dd class="row justify-end" v-for="element in wert" >
+                                      <div class="col-8">{{element.kontakttyp + ":  " + element.kontakt+"  " }}</div>
+                                      <div class="col-2"> {{element?.anmerkung}}</div>
+                                      <div class="col-2"> 
+                                          <i v-if="element.zustellung" class="fa-solid fa-check"></i>
+                                          <i v-else="element.zustellung" class="fa-solid fa-xmark"></i>
+                                      </div>
+                                  </dd>
+                              </div>
+                          </div>
+                      
+                      
+                      
+                          <!-- HIER SIND DIE ADRESSEN -->
+                          <div class=" justify-content-center row mb-3" v-if="typeof wert === 'object' && bezeichnung=='Adressen'">
+                              <dt class="col-4">Adressen</dt>
+                              <div class="col-8">
+                                  <dd class="  m-0"  v-for="element in wert">
+                                      {{element.strasse}} <b>({{element.adr_typ}})</b><br/>{{ element.plz}} {{element.ort}}
+                                  </dd>
+                              </div>
+                          </div>
+                    
+                        </dl>
+
+
+
+
+                      <!-- END OF THE SECOND INFORMATION COLUMN -->
+                      </div>
+
+
+              
+                    <!-- END OF PROFIL INFORMATION ROW -->
+                    <!-- INFORMATION CONTENT END -->
+                    </div>
+
+
+                    <!-- COLUMN WITH ALL PROFIL INFORMATION END -->
+                  </div>
+                  <!-- ROW WITH PROFIL IMAGE AND INFORMATION END -->
+                </div  >
+
+
+
+                <!-- LITTLE EXTRA ROW WITH INFORMATION REFRESHING LINK -->
+                <div class="row">
+                  <div style="border:4px solid;border-color:lightpink" class="col">
+                    <p>Sollten Ihre Daten nicht mehr aktuell sein, klicken Sie bitte <a :href="refreshMailTo">hier</a></p>
+                  </div>
+                </div>
+                <!-- END OF REFRESHING LINK ROW -->
+
+
+
+
+                <!-- SECOND ROW UNDER THE PROFIL IMAGE AND INFORMATION WITH THE TABLES -->
+                <div class="row">
+
+                <!-- FIRST TABLE -->
+                  <div class="col-12" style="border: 4px solid; border-color:lightskyblue">
+                    <core-filter-cmpt title="Funktionen"  ref="funktionenTable" :tabulator-options="funktionen_table_options" :tableOnly />
+                  </div>
+
+                <!-- SECOND TABLE -->
+                  <div class="col-12" style="border:4px solid;border-color:orange">
+                    <core-filter-cmpt title="Entlehnte Betriebsmittel"  ref="betriebsmittelTable" :tabulator-options="betriebsmittel_table_options" :tableOnly />
+                  </div>
+
+                <!-- END OF THE ROW WITH THE TABLES UNDER THE PROFIL INFORMATION -->
+                </div>
+
+
+
+
+
+
+
+              <!-- END OF MAIN CONTENT COL -->
+              </div>
+
+
+
+
+              <!-- START OF SIDE PANEL -->
+              <div class="col-md-3 col-sm-12">
+
+
+              <!-- SRART OF QUICK LINKS IN THE SIDE PANEL -->
+
+
+              <!-- START OF THE FIRDT ROW IN THE SIDE PANEL -->
+              <!-- THESE QUCK LINKS ARE ONLY VISIBLE UNTIL VIEWPORT MD -->
+                <div style="border:4px solid;border-color:#EEEEEE;" class="row d-none d-md-block">
+                  <div class="col">
+                    <div  class="row py-4">
                         <a style="text-decoration:none" class="my-1" href="#">Zeitwuensche</a>
                         <a style="text-decoration:none" class="my-1" href="#">Lehrveranstaltungen</a>
                         <a style="text-decoration:none" class="my-1" href="#">Zeitsperren von Gschnell</a>
-                        </div>
-                        <div class="row">
-                            <h5 class="fs-3" style="margin-top:1em">Mailverteilers</h5>
-                            <p class="fs-6">Sie sind Mitgglied in folgenden Verteilern:</p>
-                            <div  class="row text-break" v-for="verteiler in data?.mailverteiler">
-                                <div class="col-6"><a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a></div> 
-                                <div class="col-6">{{verteiler.beschreibung}}</div>
-                            </div>
-                        </div>
                     </div>
+                  </div>
                 </div>
-        
-            </div>
+
+
+                <!-- START OF THE SECOND ROW IN THE SIDE PANEL -->
+                <div style="border:4px solid;border-color: darkgray"  class="row">
+                
+                  <div class="col">
+                
+
+                  
+                  <!-- HIER SIND DIE MAILVERTEILER -->
+                    <h5 class="fs-3" style="margin-top:1em">Mailverteilers</h5>
+                    <p class="fs-6">Sie sind Mitgglied in folgenden Verteilern:</p>
+                    <div  class="row text-break" v-for="verteiler in data?.mailverteiler">
+                      <div class="col-6"><a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a></div> 
+                      <div class="col-6">{{verteiler.beschreibung}}</div>
+                    </div>
+
+
+
+                  </div>
+
+                <!-- END OF THE SECOND ROW IN THE SIDE PANEL -->
+                </div>
+
+                <!-- END OF SIDE PANEL -->
+              </div>
+
+
+            
+
+
+
+          <!-- END OF CONTAINER ROW-->
+          
+      </div>
+      
+      <!-- END OF CONTAINER -->
+  </div>
             
     `,
 };
diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
index 589f1b204..dfd610672 100644
--- a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
@@ -114,122 +114,230 @@ export default {
   template: `
 
 
-        <div class="container-fluid">
-        <!-- here starts the row of the whole window -->
-            <div class="row">
-            <!-- this is the left column of the window -->
-                <div class="col-9">
+  <!-- CONTAINER -->
+  <div class="container-fluid">
+    <!-- ROW --> 
+          <div class="row">
+          <!-- HIDDEN QUICK LINKS -->
+              <div  class="d-md-none col-12 ">
+             
+
+
+
+
+                <div style="border:4px solid;border-color:#EEEEEE;" class="row py-4">
+                  <div class="col">
+                      <div class="dropdown">
+                      <button style="width:100%" class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenu2" data-bs-toggle="dropdown" aria-expanded="false">
+                          Quick links
+                      </button>
+                      <ul class="dropdown-menu" aria-labelledby="dropdownMenu2">
+                          <li><button class="dropdown-item" type="button">Zeitwuensche</button></li>
+                          <li><button class="dropdown-item" type="button">Lehrveranstaltungen</button></li>
+                          <li><button class="dropdown-item" type="button">Zeitsperren von Gschnell</button></li>
+                      </ul>
+                      </div>
+                  </div>
+                </div>
+
+
+              
+              
+              </div>
+              <!-- END OF HIDDEN QUCK LINKS -->
+
+
+
+              <!-- MAIN PANNEL -->
+              <div class="col-sm-12 col-md-9">
+                <!-- ROW WITH PROFIL IMAGE AND INFORMATION -->
+                <div class="row">
+                  <!-- COLUMN WITH PROFIL IMAGE -->
+                    <div class="col-md-2 col-sm-12" style="border:4px solid;border-color:lightgreen;">
+
+
+
+
+
+
+                    <!-- START OF THE FIRST ROW WITH THE PROFIL IMAGE -->
+                      <div class="row">
+                        <div class="col">
+                          <img class=" img-thumbnail " style=" max-height:150px"  :src="get_image_base64_src"></img>
+                        </div>
+                      </div>
+                    <!-- END OF THE ROW WITH THE IMAGE -->
+
+
+
+
+
+
+                    <!-- END OF THE COLUMN WITH PROFIL IMAGE AND LINK -->
+                    </div>
+
+
+
+                    <!-- COLUMN WITH THE PROFIL INFORMATION --> 
+                    <div class="col-md-10 col-sm-12" style="border:4px solid;border-color:lightcoral;">
+              
+
+                    <!-- INFORMATION CONTENT START -->
+                    <!-- ROW WITH THE PROFIL INFORMATION --> 
                     <div class="row">
-                        
 
 
-                        <div class="col-2">
-                        <div class="row">
-                            <div class="col">
-                            <h3 >Mitarbeiter</h3>
-                                <img class="img-thumbnail" :src="get_image_base64_src"></img>
+
+                      <!-- FIRST COLUMN WITH PROFIL INFORMATION -->
+                      <div style="border:4px solid;border-color:red" class="col-md-12 col-lg-6">
+
+
+
+
+
+                        <div   v-for="(wert,bezeichnung) in personData">
+                            <dl class="  mb-0" v-else v-for="(wert,bez) in wert">
+                                <div class="row justify-content-center">
+                                    <dt class="col-6" >{{bez}}</dt>
+                                    <dd class=" col-6">{{wert?wert:"-"}}</dd>
+                                </div>
+                            </dl>
+                            <div class="row justify-content-center" v-if="bez=='FhAusweisStatus'">
+                                <dt class="col-6" >FH-Ausweis Status</dt>
+                                <dd class=" col-6 m-0">{{"Der FH Ausweis ist am "+ wert+ " ausgegeben worden."}}</dd>
                             </div>
                         </div>
+
+
+
+                      <!-- END OF THE FIRST INFORMATION COLUMN -->
+                      </div>
+
+
+                      <!-- START OF THE SECOND PROFIL INFORMATION COLUMN -->
+                      <div style="border:4px solid;border-color:orange" class="col-lg-6 col-md-12">
+
+
+
+
+
+
+                        <dl v-for="(wert,bezeichnung) in kontaktInfo">
+
+                        <!-- HIER SIND DIE EMAILS -->
+                    
+                    
+                          <div class="justify-content-center row mb-3" v-if="typeof wert === 'object' && bezeichnung == 'emails'">
+                              <dt class="col-4  mb-0">eMail</dt>
+                              <div class="col-8 ">
+                                  <dd v-for="email in wert" class="mb-0 ">{{email.type}}: <a style="text-decoration:none" :href="'mailto:'+email.email">{{email.email}}</a></dd>
+                              </div>
+                          </div>
                       
+                      
+                      
+                        </dl>
+
+
+
+
+                      <!-- END OF THE SECOND INFORMATION COLUMN -->
+                      </div>
+
+
+              
+                    <!-- END OF PROFIL INFORMATION ROW -->
+                    <!-- INFORMATION CONTENT END -->
                     </div>
 
 
-
-                        
-                      
-                        <div class="col m-4">
-                    
-                    
-                            
-                        
-                            
-                            <div class="row">
-                              <div :class="{'col-lg-12':true, 'col-xl-6':true, 'order-1':bezeichnung=='Allgemein', 'order-3':bezeichnung=='SpecialInformation'}" v-for="(wert,bezeichnung) in personData">
-                                                              
-                              
-                                <dl class="m-0" v-else v-for="(wert,bez) in wert">
-                                  <dt >{{bez}}</dt>
-                                  <dd class="text-end m-0">{{wert?wert:"-"}}</dd>
-                                </dl>
-                            
-                              </div>
-                            
-                            
-                        
-                      
-                              <div class="col-lg-12 col-xl-6 order-2">
-                              
-                                  <dl v-for="(wert,bezeichnung) in kontaktInfo">
-                                  
-                                  <!-- HIER IST DAS DATUM DES FH AUSWEIS -->
-                                      <div class="mb-3" v-if="bezeichnung=='FhAusweisStatus'">
-                                          <dt class="mb-0">FH-Ausweis Status</dt>
-                                          <dd class="mb-0 text-end">{{"Der FH Ausweis ist am "+ wert+ " ausgegeben worden."}}</dd>
-                                      </div>
-
-                                  <!-- HIER SIND DIE EMAILS -->
-                          
-
-                                      <div class="mb-3" v-if="typeof wert === 'object' && bezeichnung == 'emails'">
-                                          <dt class="mb-0">eMail</dt>
-                                          <dd v-for="email in wert" class="mb-0 text-end">{{email.type}}: <a style="text-decoration:none" :href="'mailto:'+email.email">{{email.email}}</a></dd>
-                                      </div>
-
-                                      <!-- HIER SIND DIE PRIVATEN KONTAKTE -->
-                                      <div class="mb-3" v-if="typeof wert === 'object' && bezeichnung=='Kontakte'">
-                                      <dt class="mb-0">Private Kontakte</dt>
-                                          <dd class="row text-end" v-for="element in wert" >
-                                              <div class="col-8">{{element.kontakttyp + ":  " + element.kontakt+"  " }}</div>
-                                              <div class="col-2"> {{element?.anmerkung}}</div>
-                                              <div class="col-2"> 
-                                              <i v-if="element.zustellung" class="fa-solid fa-check"></i>
-                                              <i v-else="element.zustellung" class="fa-solid fa-xmark"></i>
-                                              </div>
-                                          </dd>
-                                      </div>
-                                  
-                                  </dl>
-                              </div>
-                            </div>
+                    <!-- COLUMN WITH ALL PROFIL INFORMATION END -->
+                  </div>
+                  <!-- ROW WITH PROFIL IMAGE AND INFORMATION END -->
+                </div  >
 
 
-                        </div>
+
+
+                <!-- SECOND ROW UNDER THE PROFIL IMAGE AND INFORMATION WITH THE TABLES -->
+                <div class="row">
+
+                <!-- FIRST TABLE -->
+                  <div class="col-12" style="border: 4px solid; border-color:lightskyblue">
+                    <core-filter-cmpt title="Funktionen"  ref="funktionenTable" :tabulator-options="funktionen_table_options" :tableOnly />
+                  </div>
+
+                <!-- END OF THE ROW WITH THE TABLES UNDER THE PROFIL INFORMATION -->
+                </div>
+
+
+
+
+
+
+
+              <!-- END OF MAIN CONTENT COL -->
+              </div>
+
+
+
+
+              <!-- START OF SIDE PANEL -->
+              <div class="col-md-3 col-sm-12">
+
+
+              <!-- SRART OF QUICK LINKS IN THE SIDE PANEL -->
+
+
+              <!-- START OF THE FIRDT ROW IN THE SIDE PANEL -->
+              <!-- THESE QUCK LINKS ARE ONLY VISIBLE UNTIL VIEWPORT MD -->
+                <div style="border:4px solid;border-color:#EEEEEE;" class="row d-none d-md-block">
+                  <div class="col">
+                    <div  class="row py-4">
+                        <a style="text-decoration:none" class="my-1" href="#">Zeitwuensche</a>
+                        <a style="text-decoration:none" class="my-1" href="#">Lehrveranstaltungen</a>
+                        <a style="text-decoration:none" class="my-1" href="#">Zeitsperren von Gschnell</a>
                     </div>
-                  
+                  </div>
+                </div>
+
+
+                <!-- START OF THE SECOND ROW IN THE SIDE PANEL -->
+                <div style="border:4px solid;border-color: darkgray"  class="row">
                 
-                    <div class="row my-5">
-                    
-            
-                        <div class="col-12">
-                        <core-filter-cmpt title="Funktionen"  ref="funktionenTable" :tabulator-options="funktionen_table_options" :tableOnly />
-                        
-                        </div>
-                       
-                    
+                  <div class="col">
+                
+
+                  
+                  <!-- HIER SIND DIE MAILVERTEILER -->
+                    <h5 class="fs-3" style="margin-top:1em">Mailverteilers</h5>
+                    <p class="fs-6">Sie sind Mitgglied in folgenden Verteilern:</p>
+                    <div  class="row text-break" v-for="verteiler in data?.mailverteiler">
+                      <div class="col-6"><a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a></div> 
+                      <div class="col-6">{{verteiler.beschreibung}}</div>
                     </div>
 
-            
+
+
+                  </div>
+
+                <!-- END OF THE SECOND ROW IN THE SIDE PANEL -->
                 </div>
 
-                <div  class="col-3">
-                    <div style="background-color:#EEEEEE" class="row py-4">
-                    <a style="text-decoration:none" class="my-1" href="#">Zeitwuensche</a>
-                    <a style="text-decoration:none" class="my-1" href="#">Lehrveranstaltungen</a>
-                    <a style="text-decoration:none" class="my-1" href="#">Zeitsperren von Gschnell</a>
-                    </div>
-                    <div class="row">
-                        <h5 class="fs-3" style="margin-top:1em">Mailverteilers</h5>
-                        <p class="fs-6">Sie sind Mitgglied in folgenden Verteilern:</p>
-                        <div  class="row text-break" v-for="verteiler in data?.mailverteiler">
-                            <div class="col-6"><a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a></div> 
-                            <div class="col-6">{{verteiler.beschreibung}}</div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>          
-  
-  
+                <!-- END OF SIDE PANEL -->
+              </div>
+
+
             
+
+
+
+          <!-- END OF CONTAINER ROW-->
+          
+      </div>
+      
+      <!-- END OF CONTAINER -->
+  </div>
+
     `,
 };
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index 8df546c67..4d8b2d2da 100644
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -77,16 +77,15 @@ export default {
           Postnomen: this.data.postnomen,
           Geburtsdatum: this.data.gebdatum,
           Geburtsort: this.data.gebort,
-        },
-        
-        Adressen: this.data.adressen,
-        SpecialInformation: {
           Studiengang: this.data.studiengang,
           Semester: this.data.semester,
           Verband: this.data.verband,
           Gruppe: this.data.gruppe,
           Personenkennzeichen: this.data.personenkennzeichen,
+          FhAusweisStatus: this.data.zutrittsdatum,
         },
+        
+        
       };
     },
     //? this computed function returns the data for the second column in the profil 
@@ -96,9 +95,9 @@ export default {
       }
 
       return {
-        FhAusweisStatus: this.data.zutrittsdatum,
         emails: this.data.emails,
         Kontakte: this.data.kontakte,
+        Adressen: this.data.adressen,
       };
     },
   },
@@ -120,141 +119,297 @@ export default {
 
   template: `
 
+  <!-- CONTAINER -->
   <div class="container-fluid">
-  <!-- here starts the row of the whole window -->
-      <div class="row">
-      <!-- this is the left column of the window -->
-          <div class="col-9">
-              <div class="row">
-                  
+    <!-- ROW --> 
+          <div class="row">
+          <!-- HIDDEN QUICK LINKS -->
+              <div  class="d-md-none col-12 ">
+             
 
 
-                  <div class="col-2">
-                  <div class="row">
-                      <div class="col">
-                      <h3 >Student</h3>
-                          <img class="img-thumbnail" :src="get_image_base64_src"></img>
-                      </div>
-                  </div>
-                  <div class="row">
-                      <div class="col">
-                          <div v-if="data.foto_sperre ">
-                              <p class="m-0">Profilfoto gesperrt</p>
-                              <a href="#" @click.prevent="sperre_foto_function(false)" class="text-decoration-none">Sperre des Profilfotos aufheben</a>
-                          </div>
-                          <a href="#" @click.prevent="sperre_foto_function(true)" class="text-decoration-none"  v-else>Profilfoto sperren</a>
+
+
+                <div style="border:4px solid;border-color:#EEEEEE;" class="row py-4">
+                  <div class="col">
+                      <div class="dropdown">
+                      <button style="width:100%" class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenu2" data-bs-toggle="dropdown" aria-expanded="false">
+                          Quick links
+                      </button>
+                      <ul class="dropdown-menu" aria-labelledby="dropdownMenu2">
+                          <li><button class="dropdown-item" type="button">Zeitwuensche</button></li>
+                          <li><button class="dropdown-item" type="button">Lehrveranstaltungen</button></li>
+                          <li><button class="dropdown-item" type="button">Zeitsperren von Gschnell</button></li>
+                      </ul>
                       </div>
                   </div>
+                </div>
+
+
+              
+              
               </div>
+              <!-- END OF HIDDEN QUCK LINKS -->
 
 
 
-                  
-                
-                  <div class="col m-4">
-              
-              
-                      
-                  
-                      
+              <!-- MAIN PANNEL -->
+              <div class="col-sm-12 col-md-9">
+                <!-- ROW WITH PROFIL IMAGE AND INFORMATION -->
+                <div class="row">
+                  <!-- COLUMN WITH PROFIL IMAGE -->
+                    <div class="col-md-2 col-sm-12" style="border:4px solid;border-color:lightgreen;">
+
+
+
+
+
+
+                    <!-- START OF THE FIRST ROW WITH THE PROFIL IMAGE -->
                       <div class="row">
-                        <div :class="{'col-lg-12':true, 'col-xl-6':true, 'order-1':bezeichnung=='Allgemein', 'order-3':bezeichnung=='SpecialInformation', 'order-4':bezeichnung=='Adressen'}" v-for="(wert,bezeichnung) in personData">
-                                                        
-                          <dl class="m-0"  v-if="bezeichnung=='Adressen'">
-                            <dt>Adressen</dt>
-                            <dd class="text-end m-0"  v-for="element in wert">
-                            {{element.strasse}} <b>({{element.adr_typ}})</b><br/>{{ element.plz}} {{element.ort}}
-                            </dd>
-                          </dl>
-
-                          <dl class="m-0" v-else v-for="(wert,bez) in wert">
-                            <dt >{{bez}}</dt>
-                            <dd class="text-end m-0">{{wert?wert:"-"}}</dd>
-                          </dl>
-                      
+                        <div class="col">
+                          <img class=" img-thumbnail " style=" max-height:150px"  :src="get_image_base64_src"></img>
                         </div>
-                      
-                      
-                  
-                 
-                        <div class="col-lg-12 col-xl-6 order-2">
+                      </div>
+                    <!-- END OF THE ROW WITH THE IMAGE -->
+
+
+
+
+
+
+                    <!-- START OF THE SECOND ROW WITH THE IMAGE LINK -->
+                      <div class="row">
+                        <div class="col">
+                          
+
                         
-                            <dl v-for="(wert,bezeichnung) in kontaktInfo">
-                            
-                            <!-- HIER IST DAS DATUM DES FH AUSWEIS -->
-                                <div class="mb-3" v-if="bezeichnung=='FhAusweisStatus'">
-                                    <dt class="mb-0">FH-Ausweis Status</dt>
-                                    <dd class="mb-0 text-end">{{"Der FH Ausweis ist am "+ wert+ " ausgegeben worden."}}</dd>
-                                </div>
-
-                            <!-- HIER SIND DIE EMAILS -->
-                    
-
-                                <div class="mb-3" v-if="typeof wert === 'object' && bezeichnung == 'emails'">
-                                    <dt class="mb-0">eMail</dt>
-                                    <dd v-for="email in wert" class="mb-0 text-end">{{email.type}}: <a style="text-decoration:none" :href="'mailto:'+email.email">{{email.email}}</a></dd>
-                                </div>
-
-                                <!-- HIER SIND DIE PRIVATEN KONTAKTE -->
-                                <div class="mb-3" v-if="typeof wert === 'object' && bezeichnung=='Kontakte'">
-                                <dt class="mb-0">Private Kontakte</dt>
-                                    <dd class="row text-end" v-for="element in wert" >
-                                        <div class="col-8">{{element.kontakttyp + ":  " + element.kontakt+"  " }}</div>
-                                        <div class="col-2"> {{element?.anmerkung}}</div>
-                                        <div class="col-2"> 
-                                        <i v-if="element.zustellung" class="fa-solid fa-check"></i>
-                                        <i v-else="element.zustellung" class="fa-solid fa-xmark"></i>
-                                        </div>
-                                    </dd>
-                                </div>
-                            
-                            </dl>
+                        <div v-if="data.foto_sperre ">
+                          <p class="m-0">Profilfoto gesperrt</p>
+                          <a href="#" @click.prevent="sperre_foto_function(false)" class="text-decoration-none">Sperre des Profilfotos aufheben</a>
                         </div>
+                        <!-- DIESEN LINK KOENNTE MAN MIT EINEM ICON AUSTAUSCHEN WENN DIE VIEWPORT KLEIN IST -->
+                        <a href="#" @click.prevent="sperre_foto_function(true)" class="text-decoration-none"  v-else>Profilfoto sperren</a>
+                     
+
+
+
+                        </div>
+                      </div>
+                    <!-- END OF THE ROW WITH THE IMAGE LINK -->
+
+
+
+
+
+
+                    <!-- END OF THE COLUMN WITH PROFIL IMAGE AND LINK -->
+                    </div>
+
+
+
+                    <!-- COLUMN WITH THE PROFIL INFORMATION --> 
+                    <div class="col-md-10 col-sm-12" style="border:4px solid;border-color:lightcoral;">
+              
+
+                    <!-- INFORMATION CONTENT START -->
+                    <!-- ROW WITH THE PROFIL INFORMATION --> 
+                    <div class="row">
+
+
+
+                      <!-- FIRST COLUMN WITH PROFIL INFORMATION -->
+                      <div style="border:4px solid;border-color:red" class="col-md-12 col-lg-6">
+
+
+
+
+
+                        <div   v-for="(wert,bezeichnung) in personData">
+                            <dl class="  mb-0" v-else v-for="(wert,bez) in wert">
+                                <div class="row justify-content-center">
+                                    <dt class="col-6" >{{bez}}</dt>
+                                    <dd class=" col-6">{{wert?wert:"-"}}</dd>
+                                </div>
+                            </dl>
+                            <div class="row justify-content-center" v-if="bez=='FhAusweisStatus'">
+                                <dt class="col-6" >FH-Ausweis Status</dt>
+                                <dd class=" col-6 m-0">{{"Der FH Ausweis ist am "+ wert+ " ausgegeben worden."}}</dd>
+                            </div>
+                        </div>
+
+
+
+                      <!-- END OF THE FIRST INFORMATION COLUMN -->
                       </div>
 
 
+                      <!-- START OF THE SECOND PROFIL INFORMATION COLUMN -->
+                      <div style="border:4px solid;border-color:orange" class="col-lg-6 col-md-12">
+
+
+
+
+
+
+                        <dl v-for="(wert,bezeichnung) in kontaktInfo">
+
+                        <!-- HIER SIND DIE EMAILS -->
+                    
+                    
+                          <div class="justify-content-center row mb-3" v-if="typeof wert === 'object' && bezeichnung == 'emails'">
+                              <dt class="col-4  mb-0">eMail</dt>
+                              <div class="col-8 ">
+                                  <dd v-for="email in wert" class="mb-0 ">{{email.type}}: <a style="text-decoration:none" :href="'mailto:'+email.email">{{email.email}}</a></dd>
+                              </div>
+                          </div>
+                      
+                      
+                          <!-- HIER SIND DIE PRIVATEN KONTAKTE -->
+                          <div class="justify-content-center row mb-3" v-if="typeof wert === 'object' && bezeichnung=='Kontakte'">
+                              <dt   class="col-4 mb-0">Private Kontakte</dt>
+                              <div class="col-8 ">
+                                  <dd class="row justify-end" v-for="element in wert" >
+                                      <div class="col-8">{{element.kontakttyp + ":  " + element.kontakt+"  " }}</div>
+                                      <div class="col-2"> {{element?.anmerkung}}</div>
+                                      <div class="col-2"> 
+                                          <i v-if="element.zustellung" class="fa-solid fa-check"></i>
+                                          <i v-else="element.zustellung" class="fa-solid fa-xmark"></i>
+                                      </div>
+                                  </dd>
+                              </div>
+                          </div>
+                      
+                      
+                      
+                          <!-- HIER SIND DIE ADRESSEN -->
+                          <div class=" justify-content-center row mb-3" v-if="typeof wert === 'object' && bezeichnung=='Adressen'">
+                              <dt class="col-4">Adressen</dt>
+                              <div class="col-8">
+                                  <dd class="  m-0"  v-for="element in wert">
+                                      {{element.strasse}} <b>({{element.adr_typ}})</b><br/>{{ element.plz}} {{element.ort}}
+                                  </dd>
+                              </div>
+                          </div>
+                    
+                        </dl>
+
+
+
+
+                      <!-- END OF THE SECOND INFORMATION COLUMN -->
+                      </div>
+
+
+              
+                    <!-- END OF PROFIL INFORMATION ROW -->
+                    <!-- INFORMATION CONTENT END -->
+                    </div>
+
+
+                    <!-- COLUMN WITH ALL PROFIL INFORMATION END -->
                   </div>
+                  <!-- ROW WITH PROFIL IMAGE AND INFORMATION END -->
+                </div  >
+
+
+
+                <!-- LITTLE EXTRA ROW WITH INFORMATION REFRESHING LINK -->
+                <div class="row">
+                  <div style="border:4px solid;border-color:lightpink" class="col">
+                    <p>Sollten Ihre Daten nicht mehr aktuell sein, klicken Sie bitte <a :href="refreshMailTo">hier</a></p>
+                  </div>
+                </div>
+                <!-- END OF REFRESHING LINK ROW -->
+
+
+
+
+                <!-- SECOND ROW UNDER THE PROFIL IMAGE AND INFORMATION WITH THE TABLES -->
+                <div class="row">
+
+                <!-- FIRST TABLE -->
+                  <div class="col-12" style="border: 4px solid; border-color:lightskyblue">
+                  <core-filter-cmpt title="Entlehnte Betriebsmittel"  ref="betriebsmittelTable" :tabulator-options="betriebsmittel_table_options" :tableOnly />
+                  </div>
+
+                <!-- SECOND TABLE -->
+                  <div class="col-12" style="border:4px solid;border-color:orange">
+                  <core-filter-cmpt title="Zutrittsgruppen" ref="zutrittsgruppenTable" :tabulator-options="zutrittsgruppen_table_options" :tableOnly :noColFilter />
+                  </div>
+
+                <!-- END OF THE ROW WITH THE TABLES UNDER THE PROFIL INFORMATION -->
+                </div>
+
+
+
+
+
+
+
+              <!-- END OF MAIN CONTENT COL -->
               </div>
-            
-              <div class="row">
-              <div class="col">
-              <p>Sollten Ihre Daten nicht mehr aktuell sein, klicken Sie bitte <a :href="refreshMailTo">hier</a></p>
-              </div>
-              </div>
-              <div class="row my-5">
-                        
+
+
+
+
+              <!-- START OF SIDE PANEL -->
+              <div class="col-md-3 col-sm-12">
+
+
+              <!-- SRART OF QUICK LINKS IN THE SIDE PANEL -->
+
+
+              <!-- START OF THE FIRDT ROW IN THE SIDE PANEL -->
+              <!-- THESE QUCK LINKS ARE ONLY VISIBLE UNTIL VIEWPORT MD -->
+                <div style="border:4px solid;border-color:#EEEEEE;" class="row d-none d-md-block">
+                  <div class="col">
+                    <div  class="row py-4">
+                        <a style="text-decoration:none" class="my-1" href="#">Zeitwuensche</a>
+                        <a style="text-decoration:none" class="my-1" href="#">Lehrveranstaltungen</a>
+                        <a style="text-decoration:none" class="my-1" href="#">Zeitsperren von Gschnell</a>
+                    </div>
+                  </div>
+                </div>
+
+
+                <!-- START OF THE SECOND ROW IN THE SIDE PANEL -->
+                <div style="border:4px solid;border-color: darkgray"  class="row">
+                
+                  <div class="col">
                 
-                            <div class="col-12">
-                            <core-filter-cmpt title="Entlehnte Betriebsmittel"  ref="betriebsmittelTable" :tabulator-options="betriebsmittel_table_options" :tableOnly />
-                            </div>
-                            <div class="col-12">
-                            <core-filter-cmpt title="Zutrittsgruppen" ref="zutrittsgruppenTable" :tabulator-options="zutrittsgruppen_table_options" :tableOnly :noColFilter />
-                            </div>
-                        
-                        </div>
 
-      
-          </div>
-
-          <div  class="col-3">
-              <div style="background-color:#EEEEEE" class="row py-4">
-              <a style="text-decoration:none" class="my-1" href="#">Zeitwuensche</a>
-              <a style="text-decoration:none" class="my-1" href="#">Lehrveranstaltungen</a>
-              <a style="text-decoration:none" class="my-1" href="#">Zeitsperren von Gschnell</a>
-              </div>
-              <div class="row">
-                  <h5 class="fs-3" style="margin-top:1em">Mailverteilers</h5>
-                  <p class="fs-6">Sie sind Mitgglied in folgenden Verteilern:</p>
-                  <div  class="row text-break" v-for="verteiler in data?.mailverteiler">
+                  
+                  <!-- HIER SIND DIE MAILVERTEILER -->
+                    <h5 class="fs-3" style="margin-top:1em">Mailverteilers</h5>
+                    <p class="fs-6">Sie sind Mitgglied in folgenden Verteilern:</p>
+                    <div  class="row text-break" v-for="verteiler in data?.mailverteiler">
                       <div class="col-6"><a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a></div> 
                       <div class="col-6">{{verteiler.beschreibung}}</div>
-                  </div>
-              </div>
-          </div>
-      </div>
-  </div>
+                    </div>
 
 
+
+                  </div>
+
+                <!-- END OF THE SECOND ROW IN THE SIDE PANEL -->
+                </div>
+
+                <!-- END OF SIDE PANEL -->
+              </div>
+
+
+            
+
+
+
+          <!-- END OF CONTAINER ROW-->
+          
+      </div>
+      
+      <!-- END OF CONTAINER -->
+  </div>
+
            
             
     `,
diff --git a/public/js/components/Cis/Profil/StudentViewProfil.js b/public/js/components/Cis/Profil/StudentViewProfil.js
index b119ebdeb..69c59c6f7 100644
--- a/public/js/components/Cis/Profil/StudentViewProfil.js
+++ b/public/js/components/Cis/Profil/StudentViewProfil.js
@@ -80,114 +80,220 @@ export default {
   template: `
 
 
-           
-        <div class="container-fluid">
-        <!-- here starts the row of the whole window -->
-            <div class="row">
-            <!-- this is the left column of the window -->
-                <div class="col-9">
+  <!-- CONTAINER -->
+  <div class="container-fluid">
+    <!-- ROW --> 
+          <div class="row">
+          <!-- HIDDEN QUICK LINKS -->
+              <div  class="d-md-none col-12 ">
+             
+
+
+
+
+                <div style="border:4px solid;border-color:#EEEEEE;" class="row py-4">
+                  <div class="col">
+                      <div class="dropdown">
+                      <button style="width:100%" class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenu2" data-bs-toggle="dropdown" aria-expanded="false">
+                          Quick links
+                      </button>
+                      <ul class="dropdown-menu" aria-labelledby="dropdownMenu2">
+                          <li><button class="dropdown-item" type="button">Zeitwuensche</button></li>
+                          <li><button class="dropdown-item" type="button">Lehrveranstaltungen</button></li>
+                          <li><button class="dropdown-item" type="button">Zeitsperren von Gschnell</button></li>
+                      </ul>
+                      </div>
+                  </div>
+                </div>
+
+
+              
+              
+              </div>
+              <!-- END OF HIDDEN QUCK LINKS -->
+
+
+
+              <!-- MAIN PANNEL -->
+              <div class="col-sm-12 col-md-9">
+                <!-- ROW WITH PROFIL IMAGE AND INFORMATION -->
+                <div class="row">
+                  <!-- COLUMN WITH PROFIL IMAGE -->
+                    <div class="col-md-2 col-sm-12" style="border:4px solid;border-color:lightgreen;">
+
+
+
+
+
+
+                    <!-- START OF THE FIRST ROW WITH THE PROFIL IMAGE -->
+                      <div class="row">
+                        <div class="col">
+                          <img class=" img-thumbnail " style=" max-height:150px"  :src="get_image_base64_src"></img>
+                        </div>
+                      </div>
+                    <!-- END OF THE ROW WITH THE IMAGE -->
+
+
+
+
+
+
+               
+
+
+
+
+                    <!-- END OF THE COLUMN WITH PROFIL IMAGE AND LINK -->
+                    </div>
+
+
+
+                    <!-- COLUMN WITH THE PROFIL INFORMATION --> 
+                    <div class="col-md-10 col-sm-12" style="border:4px solid;border-color:lightcoral;">
+              
+
+                    <!-- INFORMATION CONTENT START -->
+                    <!-- ROW WITH THE PROFIL INFORMATION --> 
                     <div class="row">
-                        
-
-
-                        <div class="col-2">
-                        <div class="row">
-                            <div class="col">
-                            <h3 >Student</h3>
-                                <img class="img-thumbnail" :src="get_image_base64_src"></img>
-                            </div>
-                        </div>
-                      
-                    </div>
 
 
 
-                        
-                      
-                        <div class="col m-4">
-                    
-                    
-                            
-                        
-                            
-                            <div class="row">
-                              <div :class="{'col-lg-12':true, 'col-xl-6':true, 'order-1':bezeichnung=='Allgemein', 'order-3':bezeichnung=='SpecialInformation'}" v-for="(wert,bezeichnung) in personData">
-                                                              
-                              
-                                <dl class="m-0" v-else v-for="(wert,bez) in wert">
-                                  <dt >{{bez}}</dt>
-                                  <dd class="text-end m-0">{{wert?wert:"-"}}</dd>
-                                </dl>
-                            
-                              </div>
-                            
-                            
-                        
-                      
-                              <div class="col-lg-12 col-xl-6 order-2">
-                              
-                                  <dl v-for="(wert,bezeichnung) in kontaktInfo">
-                                  
-                                  <!-- HIER IST DAS DATUM DES FH AUSWEIS -->
-                                      <div class="mb-3" v-if="bezeichnung=='FhAusweisStatus'">
-                                          <dt class="mb-0">FH-Ausweis Status</dt>
-                                          <dd class="mb-0 text-end">{{"Der FH Ausweis ist am "+ wert+ " ausgegeben worden."}}</dd>
-                                      </div>
+                      <!-- FIRST COLUMN WITH PROFIL INFORMATION -->
+                      <div style="border:4px solid;border-color:red" class="col-md-12 col-lg-6">
 
-                                  <!-- HIER SIND DIE EMAILS -->
+
+
+
+
+                        <div   v-for="(wert,bezeichnung) in personData">
+                            <dl class="  mb-0" v-for="(wert,bez) in wert">
+                                <div class="row justify-content-center">
+                                    <dt class="col-6" >{{bez}}</dt>
+                                    <dd class=" col-6">{{wert?wert:"-"}}</dd>
+                                </div>
+                            </dl>
                           
-
-                                      <div class="mb-3" v-if="typeof wert === 'object' && bezeichnung == 'emails'">
-                                          <dt class="mb-0">eMail</dt>
-                                          <dd v-for="email in wert" class="mb-0 text-end">{{email.type}}: <a style="text-decoration:none" :href="'mailto:'+email.email">{{email.email}}</a></dd>
-                                      </div>
-
-                                      <!-- HIER SIND DIE PRIVATEN KONTAKTE -->
-                                      <div class="mb-3" v-if="typeof wert === 'object' && bezeichnung=='Kontakte'">
-                                      <dt class="mb-0">Private Kontakte</dt>
-                                          <dd class="row text-end" v-for="element in wert" >
-                                              <div class="col-8">{{element.kontakttyp + ":  " + element.kontakt+"  " }}</div>
-                                              <div class="col-2"> {{element?.anmerkung}}</div>
-                                              <div class="col-2"> 
-                                              <i v-if="element.zustellung" class="fa-solid fa-check"></i>
-                                              <i v-else="element.zustellung" class="fa-solid fa-xmark"></i>
-                                              </div>
-                                          </dd>
-                                      </div>
-                                  
-                                  </dl>
-                              </div>
-                            </div>
-
-
                         </div>
+
+
+
+                      <!-- END OF THE FIRST INFORMATION COLUMN -->
+                      </div>
+
+
+                      <!-- START OF THE SECOND PROFIL INFORMATION COLUMN -->
+                      <div style="border:4px solid;border-color:orange" class="col-lg-6 col-md-12">
+
+
+
+
+
+
+                        <dl v-for="(wert,bezeichnung) in kontaktInfo">
+
+                        <!-- HIER SIND DIE EMAILS -->
+                    
+                    
+                          <div class="justify-content-center row mb-3" v-if="typeof wert === 'object' && bezeichnung == 'emails'">
+                              <dt class="col-4  mb-0">eMail</dt>
+                              <div class="col-8 ">
+                                  <dd v-for="email in wert" class="mb-0 ">{{email.type}}: <a style="text-decoration:none" :href="'mailto:'+email.email">{{email.email}}</a></dd>
+                              </div>
+                          </div>
+                      
+              
+                    
+                        </dl>
+
+
+
+
+                      <!-- END OF THE SECOND INFORMATION COLUMN -->
+                      </div>
+
+
+              
+                    <!-- END OF PROFIL INFORMATION ROW -->
+                    <!-- INFORMATION CONTENT END -->
                     </div>
-                  
-                
-                
+
+
+                    <!-- COLUMN WITH ALL PROFIL INFORMATION END -->
+                  </div>
+                  <!-- ROW WITH PROFIL IMAGE AND INFORMATION END -->
+                </div  >
+
+
 
             
+
+
+
+              <!-- END OF MAIN CONTENT COL -->
+              </div>
+
+
+
+
+              <!-- START OF SIDE PANEL -->
+              <div class="col-md-3 col-sm-12">
+
+
+              <!-- SRART OF QUICK LINKS IN THE SIDE PANEL -->
+
+
+              <!-- START OF THE FIRDT ROW IN THE SIDE PANEL -->
+              <!-- THESE QUCK LINKS ARE ONLY VISIBLE UNTIL VIEWPORT MD -->
+                <div style="border:4px solid;border-color:#EEEEEE;" class="row d-none d-md-block">
+                  <div class="col">
+                    <div  class="row py-4">
+                        <a style="text-decoration:none" class="my-1" href="#">Zeitwuensche</a>
+                        <a style="text-decoration:none" class="my-1" href="#">Lehrveranstaltungen</a>
+                        <a style="text-decoration:none" class="my-1" href="#">Zeitsperren von Gschnell</a>
+                    </div>
+                  </div>
                 </div>
 
-                <div  class="col-3">
-                    <div style="background-color:#EEEEEE" class="row py-4">
-                    <a style="text-decoration:none" class="my-1" href="#">Zeitwuensche</a>
-                    <a style="text-decoration:none" class="my-1" href="#">Lehrveranstaltungen</a>
-                    <a style="text-decoration:none" class="my-1" href="#">Zeitsperren von Gschnell</a>
-                    </div>
-                    <div class="row">
-                        <h5 class="fs-3" style="margin-top:1em">Mailverteilers</h5>
-                        <p class="fs-6">Sie sind Mitgglied in folgenden Verteilern:</p>
-                        <div  class="row text-break" v-for="verteiler in data?.mailverteiler">
-                            <div class="col-6"><a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a></div> 
-                            <div class="col-6">{{verteiler.beschreibung}}</div>
-                        </div>
+
+                <!-- START OF THE SECOND ROW IN THE SIDE PANEL -->
+                <div style="border:4px solid;border-color: darkgray"  class="row">
+                
+                  <div class="col">
+                
+
+                  
+                  <!-- HIER SIND DIE MAILVERTEILER -->
+                    <h5 class="fs-3" style="margin-top:1em">Mailverteilers</h5>
+                    <p class="fs-6">Sie sind Mitgglied in folgenden Verteilern:</p>
+                    <div  class="row text-break" v-for="verteiler in data?.mailverteiler">
+                      <div class="col-6"><a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a></div> 
+                      <div class="col-6">{{verteiler.beschreibung}}</div>
                     </div>
+
+
+
+                  </div>
+
+                <!-- END OF THE SECOND ROW IN THE SIDE PANEL -->
                 </div>
-            </div>
-        </div>          
-  
-  
+
+                <!-- END OF SIDE PANEL -->
+              </div>
+
+
+            
+
+
+
+          <!-- END OF CONTAINER ROW-->
+          
+      </div>
+      
+      <!-- END OF CONTAINER -->
+  </div>
+
+           
             
     `,
 };

From d378cd30026ebe9edc8dd000f97fa554777145a3 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Mon, 11 Dec 2023 13:05:25 +0100
Subject: [PATCH 0219/1461] center profil image in the middle

---
 public/js/components/Cis/Profil/MitarbeiterProfil.js     | 4 ++--
 public/js/components/Cis/Profil/MitarbeiterViewProfil.js | 4 ++--
 public/js/components/Cis/Profil/StudentProfil.js         | 4 ++--
 public/js/components/Cis/Profil/StudentViewProfil.js     | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index b6f416d43..b0819801b 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -192,8 +192,8 @@ export default {
 
 
                     <!-- START OF THE FIRST ROW WITH THE PROFIL IMAGE -->
-                      <div class="row">
-                        <div class="col">
+                      <div class="row justify-content-center">
+                        <div class="col-auto ">
                           <img class=" img-thumbnail " style=" max-height:150px"  :src="get_image_base64_src"></img>
                         </div>
                       </div>
diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
index dfd610672..7865b8f2c 100644
--- a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
@@ -161,8 +161,8 @@ export default {
 
 
                     <!-- START OF THE FIRST ROW WITH THE PROFIL IMAGE -->
-                      <div class="row">
-                        <div class="col">
+                    <div class="row justify-content-center">
+                    <div class="col-auto ">
                           <img class=" img-thumbnail " style=" max-height:150px"  :src="get_image_base64_src"></img>
                         </div>
                       </div>
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index 4d8b2d2da..ece1f3fe4 100644
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -166,8 +166,8 @@ export default {
 
 
                     <!-- START OF THE FIRST ROW WITH THE PROFIL IMAGE -->
-                      <div class="row">
-                        <div class="col">
+                    <div class="row justify-content-center">
+                    <div class="col-auto ">
                           <img class=" img-thumbnail " style=" max-height:150px"  :src="get_image_base64_src"></img>
                         </div>
                       </div>
diff --git a/public/js/components/Cis/Profil/StudentViewProfil.js b/public/js/components/Cis/Profil/StudentViewProfil.js
index 69c59c6f7..45454c2de 100644
--- a/public/js/components/Cis/Profil/StudentViewProfil.js
+++ b/public/js/components/Cis/Profil/StudentViewProfil.js
@@ -127,8 +127,8 @@ export default {
 
 
                     <!-- START OF THE FIRST ROW WITH THE PROFIL IMAGE -->
-                      <div class="row">
-                        <div class="col">
+                    <div class="row justify-content-center">
+                    <div class="col-auto ">
                           <img class=" img-thumbnail " style=" max-height:150px"  :src="get_image_base64_src"></img>
                         </div>
                       </div>

From 832a3de8c55e7209b9c576e683d3ff855a5ac93d Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Mon, 11 Dec 2023 13:38:44 +0100
Subject: [PATCH 0220/1461] centers the text of the link under the image

---
 public/js/components/Cis/Profil/MitarbeiterProfil.js | 4 ++--
 public/js/components/Cis/Profil/StudentProfil.js     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index b0819801b..decd08914 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -205,8 +205,8 @@ export default {
 
 
                     <!-- START OF THE SECOND ROW WITH THE IMAGE LINK -->
-                      <div class="row">
-                        <div class="col">
+                    <div class="row justify-content-center">
+                    <div class="col-auto text-center ">
                           
 
                         
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index ece1f3fe4..86233962c 100644
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -179,8 +179,8 @@ export default {
 
 
                     <!-- START OF THE SECOND ROW WITH THE IMAGE LINK -->
-                      <div class="row">
-                        <div class="col">
+                    <div class="row justify-content-center">
+                    <div class="col-auto text-center ">
                           
 
                         

From 9beb42653166e3bff4e60f28892ca110a1edb4e8 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Mon, 11 Dec 2023 13:47:56 +0100
Subject: [PATCH 0221/1461] adding word wrap to bootstrap columns

---
 .../components/Cis/Profil/MitarbeiterProfil.js   | 16 ++++++++--------
 .../Cis/Profil/MitarbeiterViewProfil.js          |  4 ++--
 public/js/components/Cis/Profil/StudentProfil.js |  4 ++--
 .../components/Cis/Profil/StudentViewProfil.js   |  4 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index decd08914..561e2c9fa 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -245,7 +245,7 @@ export default {
 
 
                       <!-- FIRST COLUMN WITH PROFIL INFORMATION -->
-                      <div style="border:4px solid;border-color:red" class="col-md-12 col-lg-6">
+                      <div style="word-wrap:break-word;border:4px solid;border-color:red" class="col-md-12 col-lg-6">
 
 
 
@@ -271,7 +271,7 @@ export default {
 
 
                       <!-- START OF THE SECOND PROFIL INFORMATION COLUMN -->
-                      <div style="border:4px solid;border-color:orange" class="col-lg-6 col-md-12">
+                      <div style="word-wrap:break-word; border:4px solid;border-color:orange" class="col-lg-6 col-md-12">
 
 
 
@@ -284,8 +284,8 @@ export default {
                     
                     
                           <div class="justify-content-center row mb-3" v-if="typeof wert === 'object' && bezeichnung == 'emails'">
-                              <dt class="col-4  mb-0">eMail</dt>
-                              <div class="col-8 ">
+                              <dt class="col-3  mb-0">eMail</dt>
+                              <div class="col-9 ">
                                   <dd v-for="email in wert" class="mb-0 ">{{email.type}}: <a style="text-decoration:none" :href="'mailto:'+email.email">{{email.email}}</a></dd>
                               </div>
                           </div>
@@ -293,8 +293,8 @@ export default {
                       
                           <!-- HIER SIND DIE PRIVATEN KONTAKTE -->
                           <div class="justify-content-center row mb-3" v-if="typeof wert === 'object' && bezeichnung=='Kontakte'">
-                              <dt   class="col-4 mb-0">Private Kontakte</dt>
-                              <div class="col-8 ">
+                              <dt   class="col-3 mb-0">Private Kontakte</dt>
+                              <div class="col-9 ">
                                   <dd class="row justify-end" v-for="element in wert" >
                                       <div class="col-8">{{element.kontakttyp + ":  " + element.kontakt+"  " }}</div>
                                       <div class="col-2"> {{element?.anmerkung}}</div>
@@ -310,8 +310,8 @@ export default {
                       
                           <!-- HIER SIND DIE ADRESSEN -->
                           <div class=" justify-content-center row mb-3" v-if="typeof wert === 'object' && bezeichnung=='Adressen'">
-                              <dt class="col-4">Adressen</dt>
-                              <div class="col-8">
+                              <dt class="col-3">Adressen</dt>
+                              <div class="col-9">
                                   <dd class="  m-0"  v-for="element in wert">
                                       {{element.strasse}} <b>({{element.adr_typ}})</b><br/>{{ element.plz}} {{element.ort}}
                                   </dd>
diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
index 7865b8f2c..64307cb7c 100644
--- a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
@@ -189,7 +189,7 @@ export default {
 
 
                       <!-- FIRST COLUMN WITH PROFIL INFORMATION -->
-                      <div style="border:4px solid;border-color:red" class="col-md-12 col-lg-6">
+                      <div style="word-wrap:break-word;border:4px solid;border-color:red" class="col-md-12 col-lg-6">
 
 
 
@@ -215,7 +215,7 @@ export default {
 
 
                       <!-- START OF THE SECOND PROFIL INFORMATION COLUMN -->
-                      <div style="border:4px solid;border-color:orange" class="col-lg-6 col-md-12">
+                      <div style="word-wrap:break-word;border:4px solid;border-color:orange" class="col-lg-6 col-md-12">
 
 
 
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index 86233962c..368034b1d 100644
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -219,7 +219,7 @@ export default {
 
 
                       <!-- FIRST COLUMN WITH PROFIL INFORMATION -->
-                      <div style="border:4px solid;border-color:red" class="col-md-12 col-lg-6">
+                      <div style="word-wrap:break-word;border:4px solid;border-color:red" class="col-md-12 col-lg-6">
 
 
 
@@ -245,7 +245,7 @@ export default {
 
 
                       <!-- START OF THE SECOND PROFIL INFORMATION COLUMN -->
-                      <div style="border:4px solid;border-color:orange" class="col-lg-6 col-md-12">
+                      <div style="word-wrap:break-word;border:4px solid;border-color:orange" class="col-lg-6 col-md-12">
 
 
 
diff --git a/public/js/components/Cis/Profil/StudentViewProfil.js b/public/js/components/Cis/Profil/StudentViewProfil.js
index 45454c2de..23e66564e 100644
--- a/public/js/components/Cis/Profil/StudentViewProfil.js
+++ b/public/js/components/Cis/Profil/StudentViewProfil.js
@@ -160,7 +160,7 @@ export default {
 
 
                       <!-- FIRST COLUMN WITH PROFIL INFORMATION -->
-                      <div style="border:4px solid;border-color:red" class="col-md-12 col-lg-6">
+                      <div style="word-wrap:break-word;border:4px solid;border-color:red" class="col-md-12 col-lg-6">
 
 
 
@@ -183,7 +183,7 @@ export default {
 
 
                       <!-- START OF THE SECOND PROFIL INFORMATION COLUMN -->
-                      <div style="border:4px solid;border-color:orange" class="col-lg-6 col-md-12">
+                      <div style="word-wrap:break-word;border:4px solid;border-color:orange" class="col-lg-6 col-md-12">
 
 
 

From 84706c957edc7fffc3a6b4f6feadae281f575833 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Mon, 11 Dec 2023 14:35:17 +0100
Subject: [PATCH 0222/1461] changes dynamically the col width if a kontakt
 anmerkung is vorhanden or not

---
 .../Cis/Profil/MitarbeiterProfil.js           | 50 +++++++++++--------
 .../Cis/Profil/MitarbeiterViewProfil.js       |  8 +--
 .../js/components/Cis/Profil/StudentProfil.js | 39 +++++++++------
 .../Cis/Profil/StudentViewProfil.js           |  8 +--
 4 files changed, 59 insertions(+), 46 deletions(-)

diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 561e2c9fa..71afab9cd 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -103,7 +103,7 @@ export default {
           Kurzzeichen: this.data.kurzbz,
           Telefon: this.data.telefonklappe,
           Büro:this.data.ort_kurzbz,
-          FhAusweisStatus: this.data.zutrittsdatum,
+          
         },
         
 
@@ -121,7 +121,7 @@ export default {
 
       return {
         
-        
+        FhAusweisStatus: this.data.zutrittsdatum,
         emails: this.data.emails,
         Kontakte: this.data.kontakte,
         Adressen: this.data.adressen,
@@ -146,7 +146,7 @@ export default {
 
   template: `
   <!-- CONTAINER -->
-  <div class="container-fluid">
+  <div class="container-fluid" style="overflow-wrap:break-word">
     <!-- ROW --> 
           <div class="row">
           <!-- HIDDEN QUICK LINKS -->
@@ -245,7 +245,7 @@ export default {
 
 
                       <!-- FIRST COLUMN WITH PROFIL INFORMATION -->
-                      <div style="word-wrap:break-word;border:4px solid;border-color:red" class="col-md-12 col-lg-6">
+                      <div style="border:4px solid;border-color:red" class="col-lg-12 col-xl-6">
 
 
 
@@ -254,14 +254,14 @@ export default {
                         <div   v-for="(wert,bezeichnung) in personData">
                             <dl class="  mb-0" v-else v-for="(wert,bez) in wert">
                                 <div class="row justify-content-center">
-                                    <dt class="col-6" >{{bez}}</dt>
-                                    <dd class=" col-6">{{wert?wert:"-"}}</dd>
+                                    <dt class="col-lg-4 col-6  " >{{bez}}</dt>
+                                    <dd class=" col-lg-8 col-6 ">{{wert?wert:"-"}}</dd>
                                 </div>
+                               
+                            
                             </dl>
-                            <div class="row justify-content-center" v-if="bez=='FhAusweisStatus'">
-                                <dt class="col-6" >FH-Ausweis Status</dt>
-                                <dd class=" col-6 m-0">{{"Der FH Ausweis ist am "+ wert+ " ausgegeben worden."}}</dd>
-                            </div>
+                            
+                            
                         </div>
 
 
@@ -271,7 +271,7 @@ export default {
 
 
                       <!-- START OF THE SECOND PROFIL INFORMATION COLUMN -->
-                      <div style="word-wrap:break-word; border:4px solid;border-color:orange" class="col-lg-6 col-md-12">
+                      <div style=" border:4px solid;border-color:orange" class="col-xl-6 col-lg-12">
 
 
 
@@ -280,24 +280,30 @@ export default {
 
                         <dl v-for="(wert,bezeichnung) in kontaktInfo">
 
+
+                          <div class="row justify-content-center" v-if="bezeichnung=='FhAusweisStatus'">
+                            <dt class="col-lg-4 col-6" >FH-Ausweis Status</dt>
+                            <dd class=" col-lg-8 col-6 m-0">{{"Der FH Ausweis ist am "+ wert+ " ausgegeben worden."}}</dd>
+                          </div>
+
                         <!-- HIER SIND DIE EMAILS -->
                     
                     
                           <div class="justify-content-center row mb-3" v-if="typeof wert === 'object' && bezeichnung == 'emails'">
-                              <dt class="col-3  mb-0">eMail</dt>
-                              <div class="col-9 ">
-                                  <dd v-for="email in wert" class="mb-0 ">{{email.type}}: <a style="text-decoration:none" :href="'mailto:'+email.email">{{email.email}}</a></dd>
-                              </div>
+                            <dt class="col-lg-4  col-6 mb-0">eMail</dt>
+                            <div class="col-lg-8 col-6">
+                                <dd v-for="email in wert" class="mb-0 ">{{email.type}}: <a style="text-decoration:none" :href="'mailto:'+email.email">{{email.email}}</a></dd>
+                            </div>
                           </div>
                       
                       
                           <!-- HIER SIND DIE PRIVATEN KONTAKTE -->
                           <div class="justify-content-center row mb-3" v-if="typeof wert === 'object' && bezeichnung=='Kontakte'">
-                              <dt   class="col-3 mb-0">Private Kontakte</dt>
-                              <div class="col-9 ">
+                              <dt   class="col-lg-4 col-6  mb-0">Private Kontakte</dt>
+                              <div class="col-lg-8 col-6 ">
                                   <dd class="row justify-end" v-for="element in wert" >
-                                      <div class="col-8">{{element.kontakttyp + ":  " + element.kontakt+"  " }}</div>
-                                      <div class="col-2"> {{element?.anmerkung}}</div>
+                                      <div :class="{...(element?.anmerkung? {'col-7':true} : {'col-10':true} )}">{{element.kontakttyp + ":  " + element.kontakt+"  " }}</div>
+                                      <div :class="{...(element?.anmerkung? {'col-3':true} : {'d-none':true} )}"> {{element?.anmerkung}}</div>
                                       <div class="col-2"> 
                                           <i v-if="element.zustellung" class="fa-solid fa-check"></i>
                                           <i v-else="element.zustellung" class="fa-solid fa-xmark"></i>
@@ -310,8 +316,8 @@ export default {
                       
                           <!-- HIER SIND DIE ADRESSEN -->
                           <div class=" justify-content-center row mb-3" v-if="typeof wert === 'object' && bezeichnung=='Adressen'">
-                              <dt class="col-3">Adressen</dt>
-                              <div class="col-9">
+                              <dt class="col-lg-4 col-6">Adressen</dt>
+                              <div class="col-lg-8 col-6">
                                   <dd class="  m-0"  v-for="element in wert">
                                       {{element.strasse}} <b>({{element.adr_typ}})</b><br/>{{ element.plz}} {{element.ort}}
                                   </dd>
@@ -380,7 +386,7 @@ export default {
 
 
               <!-- START OF SIDE PANEL -->
-              <div class="col-md-3 col-sm-12">
+              <div  class="col-md-3 col-sm-12">
 
 
               <!-- SRART OF QUICK LINKS IN THE SIDE PANEL -->
diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
index 64307cb7c..ec2c277a0 100644
--- a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
@@ -115,7 +115,7 @@ export default {
 
 
   <!-- CONTAINER -->
-  <div class="container-fluid">
+  <div class="container-fluid" style="overflow-wrap:break-word">
     <!-- ROW --> 
           <div class="row">
           <!-- HIDDEN QUICK LINKS -->
@@ -189,7 +189,7 @@ export default {
 
 
                       <!-- FIRST COLUMN WITH PROFIL INFORMATION -->
-                      <div style="word-wrap:break-word;border:4px solid;border-color:red" class="col-md-12 col-lg-6">
+                      <div style="border:4px solid;border-color:red" class="col-lg-12 col-xl-6">
 
 
 
@@ -215,7 +215,7 @@ export default {
 
 
                       <!-- START OF THE SECOND PROFIL INFORMATION COLUMN -->
-                      <div style="word-wrap:break-word;border:4px solid;border-color:orange" class="col-lg-6 col-md-12">
+                      <div style="border:4px solid;border-color:orange" class="col-xl-6 col-lg-12">
 
 
 
@@ -283,7 +283,7 @@ export default {
 
 
               <!-- START OF SIDE PANEL -->
-              <div class="col-md-3 col-sm-12">
+              <div  class="col-md-3 col-sm-12">
 
 
               <!-- SRART OF QUICK LINKS IN THE SIDE PANEL -->
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index 368034b1d..c22bafe4a 100644
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -120,7 +120,7 @@ export default {
   template: `
 
   <!-- CONTAINER -->
-  <div class="container-fluid">
+  <div class="container-fluid" style="overflow-wrap:break-word">
     <!-- ROW --> 
           <div class="row">
           <!-- HIDDEN QUICK LINKS -->
@@ -219,7 +219,7 @@ export default {
 
 
                       <!-- FIRST COLUMN WITH PROFIL INFORMATION -->
-                      <div style="word-wrap:break-word;border:4px solid;border-color:red" class="col-md-12 col-lg-6">
+                      <div style="border:4px solid;border-color:red" class="col-lg-12 col-xl-6">
 
 
 
@@ -232,10 +232,7 @@ export default {
                                     <dd class=" col-6">{{wert?wert:"-"}}</dd>
                                 </div>
                             </dl>
-                            <div class="row justify-content-center" v-if="bez=='FhAusweisStatus'">
-                                <dt class="col-6" >FH-Ausweis Status</dt>
-                                <dd class=" col-6 m-0">{{"Der FH Ausweis ist am "+ wert+ " ausgegeben worden."}}</dd>
-                            </div>
+                            
                         </div>
 
 
@@ -245,7 +242,7 @@ export default {
 
 
                       <!-- START OF THE SECOND PROFIL INFORMATION COLUMN -->
-                      <div style="word-wrap:break-word;border:4px solid;border-color:orange" class="col-lg-6 col-md-12">
+                      <div style="border:4px solid;border-color:orange" class="col-xl-6 col-lg-12">
 
 
 
@@ -254,12 +251,22 @@ export default {
 
                         <dl v-for="(wert,bezeichnung) in kontaktInfo">
 
+
+
+                        <!-- HIER IST DER FH AUSWEIS -->
+
+                          <div class="row justify-content-center" v-if="bez=='FhAusweisStatus'">
+                            <dt class="col-lg-4 col-6" >FH-Ausweis Status</dt>
+                            <dd class=" col-lg-8 col-6 m-0">{{"Der FH Ausweis ist am "+ wert+ " ausgegeben worden."}}</dd>
+                          </div>
+
+
                         <!-- HIER SIND DIE EMAILS -->
                     
                     
                           <div class="justify-content-center row mb-3" v-if="typeof wert === 'object' && bezeichnung == 'emails'">
-                              <dt class="col-4  mb-0">eMail</dt>
-                              <div class="col-8 ">
+                              <dt class="col-lg-4  col-6 mb-0">eMail</dt>
+                              <div class="col-lg-8 col-6 ">
                                   <dd v-for="email in wert" class="mb-0 ">{{email.type}}: <a style="text-decoration:none" :href="'mailto:'+email.email">{{email.email}}</a></dd>
                               </div>
                           </div>
@@ -267,11 +274,11 @@ export default {
                       
                           <!-- HIER SIND DIE PRIVATEN KONTAKTE -->
                           <div class="justify-content-center row mb-3" v-if="typeof wert === 'object' && bezeichnung=='Kontakte'">
-                              <dt   class="col-4 mb-0">Private Kontakte</dt>
-                              <div class="col-8 ">
+                              <dt   class="col-lg-4 col-6 mb-0">Private Kontakte</dt>
+                              <div class="col-lg-8 col-6">
                                   <dd class="row justify-end" v-for="element in wert" >
-                                      <div class="col-8">{{element.kontakttyp + ":  " + element.kontakt+"  " }}</div>
-                                      <div class="col-2"> {{element?.anmerkung}}</div>
+                                  <div :class="{...(element?.anmerkung? {'col-7':true} : {'col-10':true} )}">{{element.kontakttyp + ":  " + element.kontakt+"  " }}</div>
+                                  <div :class="{...(element?.anmerkung? {'col-3':true} : {'d-none':true} )}"> {{element?.anmerkung}}</div>
                                       <div class="col-2"> 
                                           <i v-if="element.zustellung" class="fa-solid fa-check"></i>
                                           <i v-else="element.zustellung" class="fa-solid fa-xmark"></i>
@@ -284,8 +291,8 @@ export default {
                       
                           <!-- HIER SIND DIE ADRESSEN -->
                           <div class=" justify-content-center row mb-3" v-if="typeof wert === 'object' && bezeichnung=='Adressen'">
-                              <dt class="col-4">Adressen</dt>
-                              <div class="col-8">
+                              <dt class="col-lg-4 col-6">Adressen</dt>
+                              <div class="col-lg-8 col-6">
                                   <dd class="  m-0"  v-for="element in wert">
                                       {{element.strasse}} <b>({{element.adr_typ}})</b><br/>{{ element.plz}} {{element.ort}}
                                   </dd>
@@ -354,7 +361,7 @@ export default {
 
 
               <!-- START OF SIDE PANEL -->
-              <div class="col-md-3 col-sm-12">
+              <div  class="col-md-3 col-sm-12">
 
 
               <!-- SRART OF QUICK LINKS IN THE SIDE PANEL -->
diff --git a/public/js/components/Cis/Profil/StudentViewProfil.js b/public/js/components/Cis/Profil/StudentViewProfil.js
index 23e66564e..4cca513bc 100644
--- a/public/js/components/Cis/Profil/StudentViewProfil.js
+++ b/public/js/components/Cis/Profil/StudentViewProfil.js
@@ -81,7 +81,7 @@ export default {
 
 
   <!-- CONTAINER -->
-  <div class="container-fluid">
+  <div class="container-fluid" style="overflow-wrap:break-word">
     <!-- ROW --> 
           <div class="row">
           <!-- HIDDEN QUICK LINKS -->
@@ -160,7 +160,7 @@ export default {
 
 
                       <!-- FIRST COLUMN WITH PROFIL INFORMATION -->
-                      <div style="word-wrap:break-word;border:4px solid;border-color:red" class="col-md-12 col-lg-6">
+                      <div style="border:4px solid;border-color:red" class="col-lg-12 col-xl-6">
 
 
 
@@ -183,7 +183,7 @@ export default {
 
 
                       <!-- START OF THE SECOND PROFIL INFORMATION COLUMN -->
-                      <div style="word-wrap:break-word;border:4px solid;border-color:orange" class="col-lg-6 col-md-12">
+                      <div style="border:4px solid;border-color:orange" class="col-xl-6 col-lg-12">
 
 
 
@@ -237,7 +237,7 @@ export default {
 
 
               <!-- START OF SIDE PANEL -->
-              <div class="col-md-3 col-sm-12">
+              <div  class="col-md-3 col-sm-12">
 
 
               <!-- SRART OF QUICK LINKS IN THE SIDE PANEL -->

From 37f89010a4cc0de2c2b0a48d655a03221f481ee3 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Mon, 11 Dec 2023 15:18:44 +0100
Subject: [PATCH 0223/1461] adds Mitarbeiter und Studenten Profil Titel

---
 .../Cis/Profil/MitarbeiterProfil.js           | 36 +++++++++++--------
 .../Cis/Profil/MitarbeiterViewProfil.js       | 26 +++++++-------
 .../js/components/Cis/Profil/StudentProfil.js | 33 +++++++++--------
 .../Cis/Profil/StudentViewProfil.js           | 23 ++++++------
 4 files changed, 62 insertions(+), 56 deletions(-)

diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 71afab9cd..7b513801b 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -92,6 +92,7 @@ export default {
 
       return {
         Allgemein: {
+         
           Username: this.data.username,
           Anrede: this.data.anrede,
           Titel: this.data.titel,
@@ -187,7 +188,13 @@ export default {
                     <div class="col-md-2 col-sm-12" style="border:4px solid;border-color:lightgreen;">
 
 
-
+                      <!-- START OF THE FIRST ROW WITH THE PROFIL IMAGE -->
+                      <!--<div class="row justify-content-center">-->
+                      <!--  <div class="col-auto ">-->
+                      <!--    <h3>Mitarbeiter</h3>-->
+                      <!--  </div> -->
+                      <!--</div>-->
+                      <!-- END OF THE ROW WITH THE IMAGE -->
 
 
 
@@ -246,23 +253,24 @@ export default {
 
                       <!-- FIRST COLUMN WITH PROFIL INFORMATION -->
                       <div style="border:4px solid;border-color:red" class="col-lg-12 col-xl-6">
+                        
+                      
+                      
+                        <dl class="  mb-0"  >
 
+                            <!-- MITARBEITER TITEL -->
+                            <div class="row mb-2">
+                                <dt class="col-12 " ><b>MitarbeiterIn</b></dt>
+                            </div>
 
-
-
-
-                        <div   v-for="(wert,bezeichnung) in personData">
-                            <dl class="  mb-0" v-else v-for="(wert,bez) in wert">
-                                <div class="row justify-content-center">
-                                    <dt class="col-lg-4 col-6  " >{{bez}}</dt>
-                                    <dd class=" col-lg-8 col-6 ">{{wert?wert:"-"}}</dd>
-                                </div>
-                               
+                            <div v-for="(wert,bez) in personData.Allgemein" class="row">
+                                <dt class="col-lg-4 col-6  " >{{bez}}</dt>
+                                <dd class=" col-lg-8 col-6 ">{{wert?wert:"-"}}</dd>
+                            </div>
                             
-                            </dl>
+                        
+                        </dl>
                             
-                            
-                        </div>
 
 
 
diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
index ec2c277a0..fc4f49641 100644
--- a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
@@ -191,22 +191,20 @@ export default {
                       <!-- FIRST COLUMN WITH PROFIL INFORMATION -->
                       <div style="border:4px solid;border-color:red" class="col-lg-12 col-xl-6">
 
+                        <dl class="  mb-0"  >
 
+                        <!-- MITARBEITER TITEL -->
+                          <div class="row mb-2">
+                              <dt class="col-12 " ><b>MitarbeiterIn</b></dt>
+                          </div>
 
-
-
-                        <div   v-for="(wert,bezeichnung) in personData">
-                            <dl class="  mb-0" v-else v-for="(wert,bez) in wert">
-                                <div class="row justify-content-center">
-                                    <dt class="col-6" >{{bez}}</dt>
-                                    <dd class=" col-6">{{wert?wert:"-"}}</dd>
-                                </div>
-                            </dl>
-                            <div class="row justify-content-center" v-if="bez=='FhAusweisStatus'">
-                                <dt class="col-6" >FH-Ausweis Status</dt>
-                                <dd class=" col-6 m-0">{{"Der FH Ausweis ist am "+ wert+ " ausgegeben worden."}}</dd>
-                            </div>
-                        </div>
+                          <div v-for="(wert,bez) in personData.Allgemein" class="row">
+                              <dt class="col-lg-4 col-6  " >{{bez}}</dt>
+                              <dd class=" col-lg-8 col-6 ">{{wert?wert:"-"}}</dd>
+                          </div>
+                        
+                    
+                        </dl>
 
 
 
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index c22bafe4a..7f2088e43 100644
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -68,6 +68,7 @@ export default {
 
       return {
         Allgemein: {
+          
           Username: this.data.username,
           Matrikelnummer: this.data.matrikelnummer,
           Anrede: this.data.anrede,
@@ -82,7 +83,7 @@ export default {
           Verband: this.data.verband,
           Gruppe: this.data.gruppe,
           Personenkennzeichen: this.data.personenkennzeichen,
-          FhAusweisStatus: this.data.zutrittsdatum,
+          
         },
         
         
@@ -95,6 +96,7 @@ export default {
       }
 
       return {
+        FhAusweisStatus: this.data.zutrittsdatum,
         emails: this.data.emails,
         Kontakte: this.data.kontakte,
         Adressen: this.data.adressen,
@@ -162,9 +164,6 @@ export default {
 
 
 
-
-
-
                     <!-- START OF THE FIRST ROW WITH THE PROFIL IMAGE -->
                     <div class="row justify-content-center">
                     <div class="col-auto ">
@@ -221,20 +220,20 @@ export default {
                       <!-- FIRST COLUMN WITH PROFIL INFORMATION -->
                       <div style="border:4px solid;border-color:red" class="col-lg-12 col-xl-6">
 
+                        <dl class="  mb-0"  >
 
+                          <!-- STUDENTEN TITEL -->
+                          <div class="row mb-2">
+                              <dt class="col-12 " ><b>StudentIn</b></dt>
+                          </div>
 
-
-
-                        <div   v-for="(wert,bezeichnung) in personData">
-                            <dl class="  mb-0" v-else v-for="(wert,bez) in wert">
-                                <div class="row justify-content-center">
-                                    <dt class="col-6" >{{bez}}</dt>
-                                    <dd class=" col-6">{{wert?wert:"-"}}</dd>
-                                </div>
-                            </dl>
-                            
-                        </div>
-
+                          <div v-for="(wert,bez) in personData.Allgemein" class="row">
+                              <dt class="col-lg-4 col-6  " >{{bez}}</dt>
+                              <dd class=" col-lg-8 col-6 ">{{wert?wert:"-"}}</dd>
+                          </div>
+                        
+                    
+                        </dl>
 
 
                       <!-- END OF THE FIRST INFORMATION COLUMN -->
@@ -255,7 +254,7 @@ export default {
 
                         <!-- HIER IST DER FH AUSWEIS -->
 
-                          <div class="row justify-content-center" v-if="bez=='FhAusweisStatus'">
+                          <div class="row justify-content-center" v-if="bezeichnung=='FhAusweisStatus'">
                             <dt class="col-lg-4 col-6" >FH-Ausweis Status</dt>
                             <dd class=" col-lg-8 col-6 m-0">{{"Der FH Ausweis ist am "+ wert+ " ausgegeben worden."}}</dd>
                           </div>
diff --git a/public/js/components/Cis/Profil/StudentViewProfil.js b/public/js/components/Cis/Profil/StudentViewProfil.js
index 4cca513bc..628414007 100644
--- a/public/js/components/Cis/Profil/StudentViewProfil.js
+++ b/public/js/components/Cis/Profil/StudentViewProfil.js
@@ -162,19 +162,20 @@ export default {
                       <!-- FIRST COLUMN WITH PROFIL INFORMATION -->
                       <div style="border:4px solid;border-color:red" class="col-lg-12 col-xl-6">
 
+                        <dl class="  mb-0"  >
 
+                          <!-- STUDENTEN TITEL -->
+                          <div class="row mb-2">
+                              <dt class="col-12 " ><b>StudentIn</b></dt>
+                          </div>
 
-
-
-                        <div   v-for="(wert,bezeichnung) in personData">
-                            <dl class="  mb-0" v-for="(wert,bez) in wert">
-                                <div class="row justify-content-center">
-                                    <dt class="col-6" >{{bez}}</dt>
-                                    <dd class=" col-6">{{wert?wert:"-"}}</dd>
-                                </div>
-                            </dl>
-                          
-                        </div>
+                          <div v-for="(wert,bez) in personData.Allgemein" class="row">
+                              <dt class="col-lg-4 col-6  " >{{bez}}</dt>
+                              <dd class=" col-lg-8 col-6 ">{{wert?wert:"-"}}</dd>
+                          </div>
+                      
+                  
+                        </dl>
 
 
 

From efc8e7c5feee90a5b5d0c22b3bfc4bd63cc709e8 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Tue, 12 Dec 2023 09:04:07 +0100
Subject: [PATCH 0224/1461] css fix to wrap words when space gets little

---
 .../components/Cis/Profil/MitarbeiterProfil.js   | 16 +++-------------
 .../Cis/Profil/MitarbeiterViewProfil.js          |  2 +-
 public/js/components/Cis/Profil/StudentProfil.js |  2 +-
 .../components/Cis/Profil/StudentViewProfil.js   |  2 +-
 4 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 7b513801b..210c2dd99 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -147,7 +147,7 @@ export default {
 
   template: `
   <!-- CONTAINER -->
-  <div class="container-fluid" style="overflow-wrap:break-word">
+  <div class="container-fluid" style="overflow-wrap:word-break; white-space:break-spaces;" >
     <!-- ROW --> 
           <div class="row">
           <!-- HIDDEN QUICK LINKS -->
@@ -183,19 +183,9 @@ export default {
               <!-- MAIN PANNEL -->
               <div class="col-sm-12 col-md-9">
                 <!-- ROW WITH PROFIL IMAGE AND INFORMATION -->
-                <div class="row">
+                <div class="row ">
                   <!-- COLUMN WITH PROFIL IMAGE -->
-                    <div class="col-md-2 col-sm-12" style="border:4px solid;border-color:lightgreen;">
-
-
-                      <!-- START OF THE FIRST ROW WITH THE PROFIL IMAGE -->
-                      <!--<div class="row justify-content-center">-->
-                      <!--  <div class="col-auto ">-->
-                      <!--    <h3>Mitarbeiter</h3>-->
-                      <!--  </div> -->
-                      <!--</div>-->
-                      <!-- END OF THE ROW WITH THE IMAGE -->
-
+                    <div class=" col-md-2 col-sm-12" style="border:4px solid;border-color:lightgreen;  ">
 
 
                     <!-- START OF THE FIRST ROW WITH THE PROFIL IMAGE -->
diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
index fc4f49641..95bea8724 100644
--- a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
@@ -115,7 +115,7 @@ export default {
 
 
   <!-- CONTAINER -->
-  <div class="container-fluid" style="overflow-wrap:break-word">
+  <div class="container-fluid" style="overflow-wrap:word-break; white-space:break-spaces;">
     <!-- ROW --> 
           <div class="row">
           <!-- HIDDEN QUICK LINKS -->
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index 7f2088e43..75b6a41b3 100644
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -122,7 +122,7 @@ export default {
   template: `
 
   <!-- CONTAINER -->
-  <div class="container-fluid" style="overflow-wrap:break-word">
+  <div class="container-fluid" style="overflow-wrap:word-break; white-space:break-spaces;">
     <!-- ROW --> 
           <div class="row">
           <!-- HIDDEN QUICK LINKS -->
diff --git a/public/js/components/Cis/Profil/StudentViewProfil.js b/public/js/components/Cis/Profil/StudentViewProfil.js
index 628414007..8196d428f 100644
--- a/public/js/components/Cis/Profil/StudentViewProfil.js
+++ b/public/js/components/Cis/Profil/StudentViewProfil.js
@@ -81,7 +81,7 @@ export default {
 
 
   <!-- CONTAINER -->
-  <div class="container-fluid" style="overflow-wrap:break-word">
+  <div class="container-fluid" style="overflow-wrap:word-break; white-space:break-spaces;">
     <!-- ROW --> 
           <div class="row">
           <!-- HIDDEN QUICK LINKS -->

From aefe73b64208aab528f42cfa3652a48744104581 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Tue, 12 Dec 2023 09:28:49 +0100
Subject: [PATCH 0225/1461] overflow-wrap: break-word style for better text
 wrapping

---
 public/js/components/Cis/Profil/MitarbeiterProfil.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 210c2dd99..fe55b11bb 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -232,7 +232,7 @@ export default {
 
 
                     <!-- COLUMN WITH THE PROFIL INFORMATION --> 
-                    <div class="col-md-10 col-sm-12" style="border:4px solid;border-color:lightcoral;">
+                    <div class="col-md-10 col-sm-12" style="overflow-wrap:break-word; border:4px solid;border-color:lightcoral;">
               
 
                     <!-- INFORMATION CONTENT START -->
@@ -296,10 +296,10 @@ export default {
                       
                       
                           <!-- HIER SIND DIE PRIVATEN KONTAKTE -->
-                          <div class="justify-content-center row mb-3" v-if="typeof wert === 'object' && bezeichnung=='Kontakte'">
+                          <div  class="justify-content-center row mb-3" v-if="typeof wert === 'object' && bezeichnung=='Kontakte'">
                               <dt   class="col-lg-4 col-6  mb-0">Private Kontakte</dt>
                               <div class="col-lg-8 col-6 ">
-                                  <dd class="row justify-end" v-for="element in wert" >
+                                  <dd style="white-space:normal" class="row justify-end" v-for="element in wert" >
                                       <div :class="{...(element?.anmerkung? {'col-7':true} : {'col-10':true} )}">{{element.kontakttyp + ":  " + element.kontakt+"  " }}</div>
                                       <div :class="{...(element?.anmerkung? {'col-3':true} : {'d-none':true} )}"> {{element?.anmerkung}}</div>
                                       <div class="col-2"> 

From 38301572aec355339be5915632188dbb46c95ea5 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Tue, 12 Dec 2023 09:41:53 +0100
Subject: [PATCH 0226/1461] Mailverteiler nehmen ganze Spalte ein bei Viewport
 lg

---
 public/js/components/Cis/Profil/MitarbeiterProfil.js     | 6 +++---
 public/js/components/Cis/Profil/MitarbeiterViewProfil.js | 6 +++---
 public/js/components/Cis/Profil/StudentProfil.js         | 6 +++---
 public/js/components/Cis/Profil/StudentViewProfil.js     | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index fe55b11bb..7a23d298d 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -412,10 +412,10 @@ export default {
                   
                   <!-- HIER SIND DIE MAILVERTEILER -->
                     <h5 class="fs-3" style="margin-top:1em">Mailverteilers</h5>
-                    <p class="fs-6">Sie sind Mitgglied in folgenden Verteilern:</p>
+                    <p >Sie sind Mitgglied in folgenden Verteilern:</p>
                     <div  class="row text-break" v-for="verteiler in data?.mailverteiler">
-                      <div class="col-6"><a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a></div> 
-                      <div class="col-6">{{verteiler.beschreibung}}</div>
+                      <div class="col-lg-12 col-xl-6"><a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a></div> 
+                      <div class="col-lg-12 col-xl-6">{{verteiler.beschreibung}}</div>
                     </div>
 
 
diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
index 95bea8724..26baaf24e 100644
--- a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
@@ -309,10 +309,10 @@ export default {
                   
                   <!-- HIER SIND DIE MAILVERTEILER -->
                     <h5 class="fs-3" style="margin-top:1em">Mailverteilers</h5>
-                    <p class="fs-6">Sie sind Mitgglied in folgenden Verteilern:</p>
+                    <p >Sie sind Mitgglied in folgenden Verteilern:</p>
                     <div  class="row text-break" v-for="verteiler in data?.mailverteiler">
-                      <div class="col-6"><a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a></div> 
-                      <div class="col-6">{{verteiler.beschreibung}}</div>
+                      <div class="col-lg-12 col-xl-6"><a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a></div> 
+                      <div class="col-lg-12 col-xl-6">{{verteiler.beschreibung}}</div>
                     </div>
 
 
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index 75b6a41b3..a248eab34 100644
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -388,10 +388,10 @@ export default {
                   
                   <!-- HIER SIND DIE MAILVERTEILER -->
                     <h5 class="fs-3" style="margin-top:1em">Mailverteilers</h5>
-                    <p class="fs-6">Sie sind Mitgglied in folgenden Verteilern:</p>
+                    <p >Sie sind Mitgglied in folgenden Verteilern:</p>
                     <div  class="row text-break" v-for="verteiler in data?.mailverteiler">
-                      <div class="col-6"><a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a></div> 
-                      <div class="col-6">{{verteiler.beschreibung}}</div>
+                      <div class="col-lg-12 col-xl-6"><a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a></div> 
+                      <div class="col-lg-12 col-xl-6">{{verteiler.beschreibung}}</div>
                     </div>
 
 
diff --git a/public/js/components/Cis/Profil/StudentViewProfil.js b/public/js/components/Cis/Profil/StudentViewProfil.js
index 8196d428f..fc942a51b 100644
--- a/public/js/components/Cis/Profil/StudentViewProfil.js
+++ b/public/js/components/Cis/Profil/StudentViewProfil.js
@@ -266,10 +266,10 @@ export default {
                   
                   <!-- HIER SIND DIE MAILVERTEILER -->
                     <h5 class="fs-3" style="margin-top:1em">Mailverteilers</h5>
-                    <p class="fs-6">Sie sind Mitgglied in folgenden Verteilern:</p>
+                    <p >Sie sind Mitgglied in folgenden Verteilern:</p>
                     <div  class="row text-break" v-for="verteiler in data?.mailverteiler">
-                      <div class="col-6"><a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a></div> 
-                      <div class="col-6">{{verteiler.beschreibung}}</div>
+                      <div class="col-lg-12 col-xl-6"><a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a></div> 
+                      <div class="col-lg-12 col-xl-6">{{verteiler.beschreibung}}</div>
                     </div>
 
 

From 3a191f4a11b2d4335ebc02137771820c74695d3c Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Tue, 12 Dec 2023 12:09:03 +0100
Subject: [PATCH 0227/1461] adds responsive layout to the tables by collapsing
 the columns of a table

---
 public/css/components/Profil.css              |  5 ++
 .../Cis/Profil/MitarbeiterProfil.js           | 60 +++++++++++++++----
 2 files changed, 55 insertions(+), 10 deletions(-)

diff --git a/public/css/components/Profil.css b/public/css/components/Profil.css
index a8f0e5d4b..6bca17d6b 100644
--- a/public/css/components/Profil.css
+++ b/public/css/components/Profil.css
@@ -14,6 +14,11 @@
     }
   }
 
+.tabulator-collapsed-row{
+    padding:7px;
+    
+}
+
 /*   dl {
     width: 100%;
     overflow: hidden;
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 7a23d298d..0a32e0941 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -2,6 +2,7 @@ import fhcapifactory from "../../../apps/api/fhcapifactory.js";
 import { CoreFilterCmpt } from "../../../components/filter/Filter.js";
 
 
+
 export default {
   components: {
     CoreFilterCmpt,
@@ -12,8 +13,37 @@ export default {
 
       funktionen_table_options: {
         height: 300,
-        layout: "fitColumns",
+        layout:"fitColumns",
+        responsiveLayout:"collapse",
+        responsiveLayoutCollapseUseFormatters:false,
+        responsiveLayoutCollapseFormatter:function(data){
+          //data - an array of objects containing the column title and value for each cell
+          var container = document.createElement("div");
+          //container.classList.add("container-fluid");
+          //container.classList.add("p-0");
+          container.classList.add("tabulator-collapsed-row");
+          var list = document.createElement("div");
+          list.classList.add("row");
+          container.appendChild(list);
+        
+          data.forEach(function(col){
+              let item = document.createElement("div");
+              item.classList.add("col-6");
+              let item2 = document.createElement("div");
+              item2.classList.add("col-6");
+              
+              item.innerHTML = "<strong>" + col.title + "</strong>";
+              console.log("col values",col);
+              item2.innerHTML = col.value?col.value:"-";
+              list.appendChild(item);
+              list.appendChild(item2);
+          });
+        
+          return Object.keys(data).length ? container : "";
+        },
+        
         data: [
+          
           {
             Bezeichnung: "",
             Organisationseinheit: "",
@@ -23,19 +53,29 @@ export default {
           },
         ],
         columns: [
-          { title: "Bezeichnung", field: "Bezeichnung", headerFilter: true },
+         //? option when wanting to hide the collapsed list
+          /*  {
+            title: "",
+            field: "",
+            headerSort: false,
+            formatter:"responsiveCollapse",
+            maxWidth:20,
+          }, */
+          { title: "Bezeichnung", field: "Bezeichnung", headerFilter: true,minWidth:200, },
           {
             title: "Organisationseinheit",
             field: "Organisationseinheit",
-            headerFilter: true,
+            headerFilter: true,minWidth:200,
           },
-          { title: "Gültig_von", field: "Gültig_von", headerFilter: true },
-          { title: "Gültig_bis", field: "Gültig_bis", headerFilter: true },
+          { title: "Gültig_von", field: "Gültig_von", headerFilter: true, resizable:true,minWidth:200, },
+          { title: "Gültig_bis", field: "Gültig_bis", headerFilter: true, resizable:true,minWidth:200, },
           {
             title: "Wochenstunden",
             field: "Wochenstunden",
             headerFilter: true,
+            minWidth:200,
           },
+          
         ],
       },
       betriebsmittel_table_options: {
@@ -46,13 +86,13 @@ export default {
           {
             title: "Betriebsmittel",
             field: "betriebsmittel",
-            headerFilter: true,
+            headerFilter: true
           },
-          { title: "Nummer", field: "Nummer", headerFilter: true },
+          { title: "Nummer", field: "Nummer", headerFilter: true, resizable:true },
           {
             title: "Ausgegeben_am",
             field: "Ausgegeben_am",
-            headerFilter: true,
+            headerFilter: true
           },
         ],
       },
@@ -254,8 +294,8 @@ export default {
                             </div>
 
                             <div v-for="(wert,bez) in personData.Allgemein" class="row">
-                                <dt class="col-lg-4 col-6  " >{{bez}}</dt>
-                                <dd class=" col-lg-8 col-6 ">{{wert?wert:"-"}}</dd>
+                                <dt class="col-lg-4  col-md-6  " >{{bez}}</dt>
+                                <dd class=" col-lg-8  col-md-6 ">{{wert?wert:"-"}}</dd>
                             </div>
                             
                         

From 350911d474a2e8ada75d4c68f825dbc53cc0b7f3 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Tue, 12 Dec 2023 12:15:27 +0100
Subject: [PATCH 0228/1461] adds responsive layout collapse to both tables

---
 .../Cis/Profil/MitarbeiterProfil.js           | 62 ++++++++++---------
 1 file changed, 34 insertions(+), 28 deletions(-)

diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 0a32e0941..2ad709afd 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -2,6 +2,32 @@ import fhcapifactory from "../../../apps/api/fhcapifactory.js";
 import { CoreFilterCmpt } from "../../../components/filter/Filter.js";
 
 
+const collapseFormatter = function(data){
+  //data - an array of objects containing the column title and value for each cell
+  var container = document.createElement("div");
+  container.classList.add("tabulator-collapsed-row");
+
+  var list = document.createElement("div");
+  list.classList.add("row");
+  
+  container.appendChild(list);
+
+  data.forEach(function(col){
+      let item = document.createElement("div");
+      item.classList.add("col-6");
+      let item2 = document.createElement("div");
+      item2.classList.add("col-6");
+      
+      item.innerHTML = "<strong>" + col.title + "</strong>";
+      console.log("col values",col);
+      item2.innerHTML = col.value?col.value:"-";
+      list.appendChild(item);
+      list.appendChild(item2);
+  });
+
+  return Object.keys(data).length ? container : "";
+};
+
 
 export default {
   components: {
@@ -16,31 +42,7 @@ export default {
         layout:"fitColumns",
         responsiveLayout:"collapse",
         responsiveLayoutCollapseUseFormatters:false,
-        responsiveLayoutCollapseFormatter:function(data){
-          //data - an array of objects containing the column title and value for each cell
-          var container = document.createElement("div");
-          //container.classList.add("container-fluid");
-          //container.classList.add("p-0");
-          container.classList.add("tabulator-collapsed-row");
-          var list = document.createElement("div");
-          list.classList.add("row");
-          container.appendChild(list);
-        
-          data.forEach(function(col){
-              let item = document.createElement("div");
-              item.classList.add("col-6");
-              let item2 = document.createElement("div");
-              item2.classList.add("col-6");
-              
-              item.innerHTML = "<strong>" + col.title + "</strong>";
-              console.log("col values",col);
-              item2.innerHTML = col.value?col.value:"-";
-              list.appendChild(item);
-              list.appendChild(item2);
-          });
-        
-          return Object.keys(data).length ? container : "";
-        },
+        responsiveLayoutCollapseFormatter:collapseFormatter,
         
         data: [
           
@@ -81,18 +83,22 @@ export default {
       betriebsmittel_table_options: {
         height: 300,
         layout: "fitColumns",
+        responsiveLayout:"collapse",
+        responsiveLayoutCollapseUseFormatters:false,
+        responsiveLayoutCollapseFormatter:collapseFormatter,
         data: [{ betriebsmittel: "<a href='#'>test</a>", Nummer: "", Ausgegeben_am: "" }],
         columns: [
           {
             title: "Betriebsmittel",
             field: "betriebsmittel",
-            headerFilter: true
+            headerFilter: true, minWidth:200,
           },
-          { title: "Nummer", field: "Nummer", headerFilter: true, resizable:true },
+          { title: "Nummer", field: "Nummer", headerFilter: true, resizable:true, minWidth:200, },
           {
             title: "Ausgegeben_am",
             field: "Ausgegeben_am",
-            headerFilter: true
+            headerFilter: true,
+            minWidth:200,
           },
         ],
       },

From b2c8bcb2bf0bd5cc8533a750ff0b458f36d9f763 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Tue, 12 Dec 2023 13:21:15 +0100
Subject: [PATCH 0229/1461] adds a little shadow to the collapsed columns in
 the tables

---
 public/css/components/Profil.css | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/public/css/components/Profil.css b/public/css/components/Profil.css
index 6bca17d6b..66b52439c 100644
--- a/public/css/components/Profil.css
+++ b/public/css/components/Profil.css
@@ -15,8 +15,13 @@
   }
 
 .tabulator-collapsed-row{
-    padding:7px;
-    
+    padding:15px;
+    background-color: rgba(0,0,0,0.1);
+
+}
+
+.tabulator-responsive-collapse{
+  padding:0 !important;
 }
 
 /*   dl {

From 4b45914d4fa22edb7598630008f1223865a373a4 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Tue, 12 Dec 2023 13:50:38 +0100
Subject: [PATCH 0230/1461] adds the collapse formater function as a global Vue
 function that can be used by alle the different view components

---
 public/js/apps/Cis/Profil.js                  | 26 ++++++++++++++-
 .../Cis/Profil/MitarbeiterProfil.js           | 33 ++++---------------
 .../Cis/Profil/MitarbeiterViewProfil.js       | 25 +++++++++++---
 .../js/components/Cis/Profil/StudentProfil.js |  9 +++--
 4 files changed, 59 insertions(+), 34 deletions(-)

diff --git a/public/js/apps/Cis/Profil.js b/public/js/apps/Cis/Profil.js
index 825b7a5ce..d9bff2cb4 100644
--- a/public/js/apps/Cis/Profil.js
+++ b/public/js/apps/Cis/Profil.js
@@ -7,7 +7,31 @@ import Base from "../../components/Cis/Profil/Base.js";
 import fhcapifactory from "../api/fhcapifactory.js";
 
 Vue.$fhcapi = fhcapifactory;
-
+Vue.$collapseFormatter  = function(data){
+	//data - an array of objects containing the column title and value for each cell
+	var container = document.createElement("div");
+	container.classList.add("tabulator-collapsed-row");
+  
+	var list = document.createElement("div");
+	list.classList.add("row");
+	
+	container.appendChild(list);
+  
+	data.forEach(function(col){
+		let item = document.createElement("div");
+		item.classList.add("col-6");
+		let item2 = document.createElement("div");
+		item2.classList.add("col-6");
+		
+		item.innerHTML = "<strong>" + col.title + "</strong>";
+		console.log("col values",col);
+		item2.innerHTML = col.value?col.value:"-";
+		list.appendChild(item);
+		list.appendChild(item2);
+	});
+  
+	return Object.keys(data).length ? container : "";
+  };
 
 const app = Vue.createApp({
 	
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 2ad709afd..bf8c3144e 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -2,31 +2,7 @@ import fhcapifactory from "../../../apps/api/fhcapifactory.js";
 import { CoreFilterCmpt } from "../../../components/filter/Filter.js";
 
 
-const collapseFormatter = function(data){
-  //data - an array of objects containing the column title and value for each cell
-  var container = document.createElement("div");
-  container.classList.add("tabulator-collapsed-row");
 
-  var list = document.createElement("div");
-  list.classList.add("row");
-  
-  container.appendChild(list);
-
-  data.forEach(function(col){
-      let item = document.createElement("div");
-      item.classList.add("col-6");
-      let item2 = document.createElement("div");
-      item2.classList.add("col-6");
-      
-      item.innerHTML = "<strong>" + col.title + "</strong>";
-      console.log("col values",col);
-      item2.innerHTML = col.value?col.value:"-";
-      list.appendChild(item);
-      list.appendChild(item2);
-  });
-
-  return Object.keys(data).length ? container : "";
-};
 
 
 export default {
@@ -42,7 +18,7 @@ export default {
         layout:"fitColumns",
         responsiveLayout:"collapse",
         responsiveLayoutCollapseUseFormatters:false,
-        responsiveLayoutCollapseFormatter:collapseFormatter,
+        responsiveLayoutCollapseFormatter:Vue.$collapseFormatter,
         
         data: [
           
@@ -68,6 +44,7 @@ export default {
             title: "Organisationseinheit",
             field: "Organisationseinheit",
             headerFilter: true,minWidth:200,
+            
           },
           { title: "Gültig_von", field: "Gültig_von", headerFilter: true, resizable:true,minWidth:200, },
           { title: "Gültig_bis", field: "Gültig_bis", headerFilter: true, resizable:true,minWidth:200, },
@@ -85,7 +62,7 @@ export default {
         layout: "fitColumns",
         responsiveLayout:"collapse",
         responsiveLayoutCollapseUseFormatters:false,
-        responsiveLayoutCollapseFormatter:collapseFormatter,
+        responsiveLayoutCollapseFormatter:Vue.$collapseFormatter,
         data: [{ betriebsmittel: "<a href='#'>test</a>", Nummer: "", Ausgegeben_am: "" }],
         columns: [
           {
@@ -177,9 +154,13 @@ export default {
   },
 
   mounted() {
+
+    
+
      this.$refs.betriebsmittelTable.tabulator.on('tableBuilt', () => {
     
         this.$refs.betriebsmittelTable.tabulator.setData(this.data.mittel);
+        this.$refs.betriebsmittelTable.tabulator.hideColumn("betriebsmittel");
         
     }) 
 
diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
index 26baaf24e..e7fbbeff4 100644
--- a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
@@ -12,8 +12,13 @@ export default {
 
       funktionen_table_options: {
         height: 300,
-        layout: "fitColumns",
+        layout:"fitColumns",
+        responsiveLayout:"collapse",
+        responsiveLayoutCollapseUseFormatters:false,
+        responsiveLayoutCollapseFormatter:Vue.$collapseFormatter,
+        
         data: [
+          
           {
             Bezeichnung: "",
             Organisationseinheit: "",
@@ -23,19 +28,29 @@ export default {
           },
         ],
         columns: [
-          { title: "Bezeichnung", field: "Bezeichnung", headerFilter: true },
+         //? option when wanting to hide the collapsed list
+          /*  {
+            title: "",
+            field: "",
+            headerSort: false,
+            formatter:"responsiveCollapse",
+            maxWidth:20,
+          }, */
+          { title: "Bezeichnung", field: "Bezeichnung", headerFilter: true,minWidth:200, },
           {
             title: "Organisationseinheit",
             field: "Organisationseinheit",
-            headerFilter: true,
+            headerFilter: true,minWidth:200,
           },
-          { title: "Gültig_von", field: "Gültig_von", headerFilter: true },
-          { title: "Gültig_bis", field: "Gültig_bis", headerFilter: true },
+          { title: "Gültig_von", field: "Gültig_von", headerFilter: true, resizable:true,minWidth:200, },
+          { title: "Gültig_bis", field: "Gültig_bis", headerFilter: true, resizable:true,minWidth:200, },
           {
             title: "Wochenstunden",
             field: "Wochenstunden",
             headerFilter: true,
+            minWidth:200,
           },
+          
         ],
       },
     
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index a248eab34..4aa242a30 100644
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -14,21 +14,26 @@ export default {
       betriebsmittel_table_options: {
         height: 300,
         layout: "fitColumns",
+        responsiveLayout:"collapse",
+        responsiveLayoutCollapseUseFormatters:false,
+        responsiveLayoutCollapseFormatter:Vue.$collapseFormatter,
         data: [{ betriebsmittel: "", Nummer: "", Ausgegeben_am: "" }],
         columns: [
           {
             title: "Betriebsmittel",
             field: "betriebsmittel",
-            headerFilter: true,
+            headerFilter: true, minWidth:200,
           },
-          { title: "Nummer", field: "Nummer", headerFilter: true },
+          { title: "Nummer", field: "Nummer", headerFilter: true, resizable:true, minWidth:200, },
           {
             title: "Ausgegeben_am",
             field: "Ausgegeben_am",
             headerFilter: true,
+            minWidth:200,
           },
         ],
       },
+     
       zutrittsgruppen_table_options: {
         height: 300,
         layout: "fitColumns",

From 036365e148901ea14698ebc392168d5807e808f9 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Tue, 12 Dec 2023 14:00:01 +0100
Subject: [PATCH 0231/1461] shows all columns, removes the hidding of a column

---
 public/js/components/Cis/Profil/MitarbeiterProfil.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index bf8c3144e..95863e3b6 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -68,7 +68,8 @@ export default {
           {
             title: "Betriebsmittel",
             field: "betriebsmittel",
-            headerFilter: true, minWidth:200,
+            headerFilter: true,
+            minWidth:200,
           },
           { title: "Nummer", field: "Nummer", headerFilter: true, resizable:true, minWidth:200, },
           {
@@ -160,7 +161,6 @@ export default {
      this.$refs.betriebsmittelTable.tabulator.on('tableBuilt', () => {
     
         this.$refs.betriebsmittelTable.tabulator.setData(this.data.mittel);
-        this.$refs.betriebsmittelTable.tabulator.hideColumn("betriebsmittel");
         
     }) 
 

From 5b03abb50c2b7112390fb2aee454f85fda5f5860 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Tue, 12 Dec 2023 14:42:15 +0100
Subject: [PATCH 0232/1461] restyling for the hidden dropdown quick links

---
 public/js/apps/Cis/Profil.js                  |  2 +-
 .../Cis/Profil/MitarbeiterProfil.js           | 70 ++++++++++---------
 .../Cis/Profil/MitarbeiterViewProfil.js       | 37 +++++-----
 .../js/components/Cis/Profil/StudentProfil.js | 35 +++++-----
 .../Cis/Profil/StudentViewProfil.js           | 37 +++++-----
 5 files changed, 90 insertions(+), 91 deletions(-)

diff --git a/public/js/apps/Cis/Profil.js b/public/js/apps/Cis/Profil.js
index d9bff2cb4..eec4f9960 100644
--- a/public/js/apps/Cis/Profil.js
+++ b/public/js/apps/Cis/Profil.js
@@ -24,8 +24,8 @@ Vue.$collapseFormatter  = function(data){
 		item2.classList.add("col-6");
 		
 		item.innerHTML = "<strong>" + col.title + "</strong>";
-		console.log("col values",col);
 		item2.innerHTML = col.value?col.value:"-";
+		
 		list.appendChild(item);
 		list.appendChild(item2);
 	});
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 95863e3b6..68693b887 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -4,7 +4,6 @@ import { CoreFilterCmpt } from "../../../components/filter/Filter.js";
 
 
 
-
 export default {
   components: {
     CoreFilterCmpt,
@@ -14,14 +13,13 @@ export default {
       
 
       funktionen_table_options: {
+        reactiveData:true,
         height: 300,
         layout:"fitColumns",
         responsiveLayout:"collapse",
         responsiveLayoutCollapseUseFormatters:false,
         responsiveLayoutCollapseFormatter:Vue.$collapseFormatter,
-        
         data: [
-          
           {
             Bezeichnung: "",
             Organisationseinheit: "",
@@ -58,12 +56,13 @@ export default {
         ],
       },
       betriebsmittel_table_options: {
+        
         height: 300,
         layout: "fitColumns",
         responsiveLayout:"collapse",
         responsiveLayoutCollapseUseFormatters:false,
         responsiveLayoutCollapseFormatter:Vue.$collapseFormatter,
-        data: [{ betriebsmittel: "<a href='#'>test</a>", Nummer: "", Ausgegeben_am: "" }],
+        data: [{ betriebsmittel: "", Nummer: "", Ausgegeben_am: "" }],
         columns: [
           {
             title: "Betriebsmittel",
@@ -130,12 +129,6 @@ export default {
           Büro:this.data.ort_kurzbz,
           
         },
-        
-
-
-
-
-        
       };
     },
     //? this computed function returns the data for the second column in the profil 
@@ -167,12 +160,27 @@ export default {
     this.$refs.funktionenTable.tabulator.on('tableBuilt', () => {
     
         this.$refs.funktionenTable.tabulator.setData(this.data.funktionen);
-        
+       
     }) 
  
   },
 
-  template: `
+/* 
+  <div class="dropdown">
+                      <button class="w-100 btn btn-secondary dropdown-toggle" type="button" id="dropdownMenu2" data-bs-toggle="dropdown" aria-expanded="false">
+                          Quick links
+                      </button>
+                      <ul class="w-100 dropdown-menu" aria-labelledby="dropdownMenu2">
+                          <li><button class="dropdown-item" type="button">Zeitwuensche</button></li>
+                          <li><button class="dropdown-item" type="button">Lehrveranstaltungen</button></li>
+                          <li><button class="dropdown-item" type="button">Zeitsperren von Gschnell</button></li>
+                      </ul>
+                      </div>
+*/
+  template: ` 
+
+
+  
   <!-- CONTAINER -->
   <div class="container-fluid" style="overflow-wrap:word-break; white-space:break-spaces;" >
     <!-- ROW --> 
@@ -180,28 +188,26 @@ export default {
           <!-- HIDDEN QUICK LINKS -->
               <div  class="d-md-none col-12 ">
              
-
-
-
-
-                <div style="border:4px solid;border-color:#EEEEEE;" class="row py-4">
-                  <div class="col">
-                      <div class="dropdown">
-                      <button style="width:100%" class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenu2" data-bs-toggle="dropdown" aria-expanded="false">
-                          Quick links
-                      </button>
-                      <ul class="dropdown-menu" aria-labelledby="dropdownMenu2">
-                          <li><button class="dropdown-item" type="button">Zeitwuensche</button></li>
-                          <li><button class="dropdown-item" type="button">Lehrveranstaltungen</button></li>
-                          <li><button class="dropdown-item" type="button">Zeitsperren von Gschnell</button></li>
-                      </ul>
-                      </div>
+              <div style="border:4px solid;border-color:#EEEEEE;" class="row py-2">
+              <div class="col">
+                <p class="m-0">
+                  <a class="border w-100 btn " data-bs-toggle="collapse" href="#collapseExample" role="button" aria-expanded="false" aria-controls="collapseExample">
+                   <u> Quick links</u>
+                  </a>
+                 
+                </p>
+                <div class="mt-1 collapse" id="collapseExample">
+                  
+                  <div class="list-group">
+                   
+                    <a href="#" class="list-group-item list-group-item-action">Zeitwünsche</a>
+                    <a href="#" class="list-group-item list-group-item-action">Lehrveranstaltungen</a>
+                    <a href="#" class="list-group-item list-group-item-action ">Zeitsperren von Gschnell</a>
                   </div>
                 </div>
-
-
-              
-              
+              </div>
+            </div>
+            
               </div>
               <!-- END OF HIDDEN QUCK LINKS -->
 
diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
index e7fbbeff4..9329eb538 100644
--- a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
@@ -136,28 +136,25 @@ export default {
           <!-- HIDDEN QUICK LINKS -->
               <div  class="d-md-none col-12 ">
              
-
-
-
-
-                <div style="border:4px solid;border-color:#EEEEEE;" class="row py-4">
-                  <div class="col">
-                      <div class="dropdown">
-                      <button style="width:100%" class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenu2" data-bs-toggle="dropdown" aria-expanded="false">
-                          Quick links
-                      </button>
-                      <ul class="dropdown-menu" aria-labelledby="dropdownMenu2">
-                          <li><button class="dropdown-item" type="button">Zeitwuensche</button></li>
-                          <li><button class="dropdown-item" type="button">Lehrveranstaltungen</button></li>
-                          <li><button class="dropdown-item" type="button">Zeitsperren von Gschnell</button></li>
-                      </ul>
-                      </div>
+              <div style="border:4px solid;border-color:#EEEEEE;" class="row py-2">
+              <div class="col">
+                <p class="m-0">
+                  <a class="border w-100 btn " data-bs-toggle="collapse" href="#collapseExample" role="button" aria-expanded="false" aria-controls="collapseExample">
+                   <u> Quick links</u>
+                  </a>
+                 
+                </p>
+                <div class="mt-1 collapse" id="collapseExample">
+                  
+                  <div class="list-group">
+                   
+                    <a href="#" class="list-group-item list-group-item-action">Zeitwünsche</a>
+                    <a href="#" class="list-group-item list-group-item-action">Lehrveranstaltungen</a>
+                    <a href="#" class="list-group-item list-group-item-action ">Zeitsperren von Gschnell</a>
                   </div>
                 </div>
-
-
-              
-              
+              </div>
+            </div>
               </div>
               <!-- END OF HIDDEN QUCK LINKS -->
 
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index 4aa242a30..ce4f1545e 100644
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -133,26 +133,25 @@ export default {
           <!-- HIDDEN QUICK LINKS -->
               <div  class="d-md-none col-12 ">
              
-
-
-
-
-                <div style="border:4px solid;border-color:#EEEEEE;" class="row py-4">
-                  <div class="col">
-                      <div class="dropdown">
-                      <button style="width:100%" class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenu2" data-bs-toggle="dropdown" aria-expanded="false">
-                          Quick links
-                      </button>
-                      <ul class="dropdown-menu" aria-labelledby="dropdownMenu2">
-                          <li><button class="dropdown-item" type="button">Zeitwuensche</button></li>
-                          <li><button class="dropdown-item" type="button">Lehrveranstaltungen</button></li>
-                          <li><button class="dropdown-item" type="button">Zeitsperren von Gschnell</button></li>
-                      </ul>
-                      </div>
+              <div style="border:4px solid;border-color:#EEEEEE;" class="row py-2">
+              <div class="col">
+                <p class="m-0">
+                  <a class="border w-100 btn " data-bs-toggle="collapse" href="#collapseExample" role="button" aria-expanded="false" aria-controls="collapseExample">
+                   <u> Quick links</u>
+                  </a>
+                 
+                </p>
+                <div class="mt-1 collapse" id="collapseExample">
+                  
+                  <div class="list-group">
+                   
+                    <a href="#" class="list-group-item list-group-item-action">Zeitwünsche</a>
+                    <a href="#" class="list-group-item list-group-item-action">Lehrveranstaltungen</a>
+                    <a href="#" class="list-group-item list-group-item-action ">Zeitsperren von Gschnell</a>
                   </div>
                 </div>
-
-
+              </div>
+            </div>
               
               
               </div>
diff --git a/public/js/components/Cis/Profil/StudentViewProfil.js b/public/js/components/Cis/Profil/StudentViewProfil.js
index fc942a51b..4d4584dca 100644
--- a/public/js/components/Cis/Profil/StudentViewProfil.js
+++ b/public/js/components/Cis/Profil/StudentViewProfil.js
@@ -87,28 +87,25 @@ export default {
           <!-- HIDDEN QUICK LINKS -->
               <div  class="d-md-none col-12 ">
              
-
-
-
-
-                <div style="border:4px solid;border-color:#EEEEEE;" class="row py-4">
-                  <div class="col">
-                      <div class="dropdown">
-                      <button style="width:100%" class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenu2" data-bs-toggle="dropdown" aria-expanded="false">
-                          Quick links
-                      </button>
-                      <ul class="dropdown-menu" aria-labelledby="dropdownMenu2">
-                          <li><button class="dropdown-item" type="button">Zeitwuensche</button></li>
-                          <li><button class="dropdown-item" type="button">Lehrveranstaltungen</button></li>
-                          <li><button class="dropdown-item" type="button">Zeitsperren von Gschnell</button></li>
-                      </ul>
-                      </div>
+              <div style="border:4px solid;border-color:#EEEEEE;" class="row py-2">
+              <div class="col">
+                <p class="m-0">
+                  <a class="border w-100 btn " data-bs-toggle="collapse" href="#collapseExample" role="button" aria-expanded="false" aria-controls="collapseExample">
+                   <u> Quick links</u>
+                  </a>
+                 
+                </p>
+                <div class="mt-1 collapse" id="collapseExample">
+                  
+                  <div class="list-group">
+                   
+                    <a href="#" class="list-group-item list-group-item-action">Zeitwünsche</a>
+                    <a href="#" class="list-group-item list-group-item-action">Lehrveranstaltungen</a>
+                    <a href="#" class="list-group-item list-group-item-action ">Zeitsperren von Gschnell</a>
                   </div>
                 </div>
-
-
-              
-              
+              </div>
+            </div>
               </div>
               <!-- END OF HIDDEN QUCK LINKS -->
 

From 633cd6be0fcfed2703ec6038b1604a4fe16ac572 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Tue, 12 Dec 2023 14:48:26 +0100
Subject: [PATCH 0233/1461] adds wrap word to every view and deltes the old
 profil view

---
 .../Cis/Profil/MitarbeiterViewProfil.js       |   6 +-
 public/js/components/Cis/Profil/Profil.old.js | 337 ------------------
 .../js/components/Cis/Profil/StudentProfil.js |   2 +-
 .../Cis/Profil/StudentViewProfil.js           |   6 +-
 4 files changed, 7 insertions(+), 344 deletions(-)
 delete mode 100644 public/js/components/Cis/Profil/Profil.old.js

diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
index 9329eb538..7131c7d8e 100644
--- a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
@@ -191,7 +191,7 @@ export default {
 
 
                     <!-- COLUMN WITH THE PROFIL INFORMATION --> 
-                    <div class="col-md-10 col-sm-12" style="border:4px solid;border-color:lightcoral;">
+                    <div class="col-md-10 col-sm-12" style="overflow-wrap:break-word;border:4px solid;border-color:lightcoral;">
               
 
                     <!-- INFORMATION CONTENT START -->
@@ -238,8 +238,8 @@ export default {
                     
                     
                           <div class="justify-content-center row mb-3" v-if="typeof wert === 'object' && bezeichnung == 'emails'">
-                              <dt class="col-4  mb-0">eMail</dt>
-                              <div class="col-8 ">
+                              <dt class="col-lg-4 col-6  mb-0">eMail</dt>
+                              <div class="col-lg-8 col-6">
                                   <dd v-for="email in wert" class="mb-0 ">{{email.type}}: <a style="text-decoration:none" :href="'mailto:'+email.email">{{email.email}}</a></dd>
                               </div>
                           </div>
diff --git a/public/js/components/Cis/Profil/Profil.old.js b/public/js/components/Cis/Profil/Profil.old.js
deleted file mode 100644
index 3e25652c5..000000000
--- a/public/js/components/Cis/Profil/Profil.old.js
+++ /dev/null
@@ -1,337 +0,0 @@
-
-import fhcapifactory from "../../../apps/api/fhcapifactory.js";
-import {CoreFilterCmpt} from "../../../components/filter/Filter.js"
-
-//? possible types of roles:
-//! depending on the role of the current view, different content is being displayed and fetched
-//* Student
-//* Mitarbeiter
-//* View_Student
-//* View_Mitarbeiter
-
-export default {
-    components:{
-        CoreFilterCmpt,
-    },
-    data() {
-        return {
-            index_information: null,
-            mitarbeiter_info: null,
-            student_info:null,
-            //? beinhaltet die Information ob der angefragte user ein Student oder Mitarbeiter ist
-            role: null,
-
-            funktionen_table_options: {
-                height: 300,
-                layout: 'fitColumns',
-                data:[{Bezeichnung:"",Organisationseinheit:"",Gültig_von:"",Gültig_bis:"",Wochenstunden:""}],
-                columns: [{title: 'Bezeichnung', field: 'Bezeichnung', headerFilter: true},
-                {title: 'Organisationseinheit', field: 'Organisationseinheit', headerFilter: true},
-                {title: 'Gültig_von', field: 'Gültig_von', headerFilter: true},
-                {title: 'Gültig_bis', field: 'Gültig_bis', headerFilter: true},
-                {title: 'Wochenstunden', field: 'Wochenstunden', headerFilter: true},]
-                
-            },
-            betriebsmittel_table_options:{
-                height: 300,
-                layout: 'fitColumns',
-                data:[{betriebsmittel:"",Nummer:"",Ausgegeben_am:""}],
-                columns: [{title: 'Betriebsmittel', field: 'betriebsmittel', headerFilter: true},
-                {title: 'Nummer', field: 'Nummer', headerFilter: true},
-                {title: 'Ausgegeben_am', field: 'Ausgegeben_am', headerFilter: true},]
-                
-            },
-            zutrittsgruppen_table_options:{
-                height: 300,
-                layout: 'fitColumns',
-                data:[{bezeichnung:"test1"}],
-                columns: [{title: 'Zutritt', field: 'bezeichnung'}]
-            }
-        }
-    },
-    
-    //? this props were passed in the Profil.php view file
-    props:['data','view'],
-    methods: {
-        
-        concatenate_addresses(address_array){
-            let result = "";
-            for (let i = 0; i < address_array.length; i++) {
-                result += address_array[i].strasse + " " + address_array[i].plz + " " + address_array[i].ort + "\n";
-            }
-            return result;
-        },
-        render_unterelement(wert,bezeichnung){
-            if (isArray(bezeichnung)){
-                
-            }
-        },
-        concatenate_kontakte(kontakt_array){
-            let result = "";
-            for (let i = 0; i < kontakt_array.length; i++) {
-                result += kontakt_array[i].kontakttyp + " " + kontakt_array[i].kontakt + " " + kontakt_array[i].zustellung + "\n";
-            }
-            return result;
-        },
-        sperre_foto_function(value){
-            if(!(this.mitarbeiter_info && this.index_information && this.student_info) ){
-                return;
-            }
-            fhcapifactory.UserData.sperre_foto_function(value).then(res => {
-                    
-                    this.index_information.foto_sperre = res.data.foto_sperre;
-                
-            });
-            
-        },
-        
-        
-    },
-    computed:{
-     
-        
-        get_image_base64_src(){
-            if(!this.index_information){
-                return "";
-            }
-            return "data:image/jpeg;base64,"+this.index_information.foto;
-        },
-        personData(){
-            if(!this.index_information){
-                return {};
-            }
-  
-           return {
-                Allgemein: (this.role =='Mitarbeiter' || this.role =='View_Mitarbeiter')?{
-                    Username:this.index_information.username,
-                    Anrede:this.index_information.anrede,
-                    Titel:this.index_information.titel,
-                    Vorname:this.index_information.vorname,
-                    Nachname:this.index_information.nachname,
-                    Postnomen:this.index_information.postnomen,
-            }:{
-                Username:this.index_information.username,
-                Matrikelnummer: this.student_info?.matrikelnummer,
-                Anrede:this.index_information.anrede,
-                Titel:this.index_information.titel,
-                Vorname:this.index_information.vorname,
-                Nachname:this.index_information.nachname,
-                Postnomen:this.index_information.postnomen,
-            },
-            GeburtsDaten:!this.role.includes("View")?{
-                Geburtsdatum:this.index_information.gebdatum,
-                Geburtsort: this.index_information.gebort,
-            }: null,
-                Adressen: this.index_information.adressen,
-            SpecialInformation: this.role =='Mitarbeiter' || this.role === 'View_Mitarbeiter'?  {
-                Kurzzeichen: this.mitarbeiter_info?.kurzbz,
-                Telefon: this.mitarbeiter_info?.telefonklappe,
-                //* Wird das Feld Ort_kurzbz noch gepflegt?
-                ...(this.role === 'View_Mitarbeiter'?{Büro:this.mitarbeiter_info?.ort_kurzbz}:{}) ,
-            } : {
-                Studiengang:this.student_info?.studiengang,
-                Semester:this.student_info?.semester,
-                Verband:this.student_info?.verband,
-                Gruppe:this.student_info?.gruppe,
-                Personenkennzeichen:this.student_info?.personenkennzeichen
-            },
-            };
-        },
-        //? this computed conains all the information that is used for the second column that displays the information of the person
-        kontaktInfo(){
-            if(!this.index_information){
-                return {};
-            }
-         
-           return {
-                FhAusweisStatus: this.index_information.zutrittsdatum,
-                emails: this.role === 'Mitarbeiter' || this.role === 'View_Mitarbeiter'?  this.mitarbeiter_info?.emails: this.index_information.emails,
-                Kontakte:this.index_information.kontakte,
-            };
-        },
-        
-    },
-  
-     mounted(){
-
-        console.log(this.uid);
-        console.log(this.view);
-        console.log(typeof this.view);
-        if(this.view){console.log("view is true")}else{ console.log("view is false")}
-
-        //? this function is to update the tabulator information only when the tabulator was build checking the tableBulit event
-        //! only the tableBuilt event of the second tabulator was used to update the table informations
-         
-
-        fhcapifactory.UserData.isMitarbeiterOrStudent(this.uid).then((res) => {
-
-            this.role = this.view? "View_"+res.data: res.data;
-            if(!this.role.includes('View')){
-                this.$refs.betriebsmittelTable.tabulator.on('tableBuilt', () => {
-                }) 
-             }
-
-
-        console.log("the role of the current view: ", this.role);
-        
-    
-
-        //? Die anderen api calls werden erst gemacht wenn der call zu isMitarbeiterOrStudent gemacht worden ist
-
-
-        //! indexProfilInformationen werden immer gefetcht
-        fhcapifactory.UserData.indexProfilInformaion(this.uid,this.view).then((res) => {
-            console.log(res.data);
-            this.index_information = res.data;
-            if(!this.role.includes("View")){
-            this.$refs.betriebsmittelTable.tabulator.setData(res.data.mittel);
-        }
-        });
-        
-
-        //? Danach werden die Informationen der Role gefetcht
-        if(this.role === "Student" || this.role === "View_Student"){ 
-            fhcapifactory.UserData.studentProfil(this.uid,this.view).then((res)=> {
-                this.student_info = res.data;
-                if(this.role ==="Student"){
-                this.$refs.zutrittsgruppenTable.tabulator.setData(res.data.zuttritsgruppen);
-                }
-            })
-        }
-        
-        if(this.role === "Mitarbeiter" || this.role === "View_Mitarbeiter"){
-            fhcapifactory.UserData.mitarbeiterProfil(this.uid).then((res)=> {
-                this.mitarbeiter_info = res.data;
-                this.$refs.funktionenTable.tabulator.setData(res.data.funktionen);
-            })
-        }   
-    });
-
-        
-        
-    },
-     
-    template: `
-   
-    <div :class="{'container':true}">
-    <div :class="{'row':true}">
-    <div :class="{'col':true}">
-    <pre>
-   <!-- {{JSON.stringify(personData,null,2)}}</pre>-->
-    </div>
-    <div :class="{'col':true}">
-    
-    </div>
-    </div>
-    </div>
-
-            <div :class="{'container-fluid':true}">
-            <!-- here starts the row of the whole window -->
-            <div :class="{'row':true}">
-            <!-- this is the left column of the window -->
-            <div :class="{'col-9':true}">
-            <div :class="{'row':true}">
-            <div :class="{'col':true}">
-            <img :class="{'img-thumbnail':true}" :src="get_image_base64_src"></img>
-            <div v-if="!role?.includes('View')">
-            <div v-if="index_information?.foto_sperre ">
-            <p style="margin:0">Profilfoto gesperrt</p>
-            <a href="#" @click.prevent="sperre_foto_function(false)" style="text-decoration:none">Sperre des Profilfotos aufheben</a>
-            </div>
-            <a href="#" @click.prevent="sperre_foto_function(true)" style="display:block; text-decoration:none"  v-else>Profilfoto sperren</a>
-            </div>
-            
-            </div>
-            <div :class="{'col':true}">
-           
-            <h3 v-if="role=='Mitarbeiter' || role == 'View_Mitarbeiter'">Mitarbeiter</h3>
-            <h3 v-else >Student</h3>
-            
-            <div v-for="(wert,bezeichnung) in personData">
-            
-            <div class="mb-3"  v-if="typeof wert == 'object' && bezeichnung=='Adressen'"><span style="display:block" v-for="element in wert">{{element.strasse}} <b>({{element.adr_typ}})</b><br/>{{ element.plz}} {{element.ort}}</span></div>
-            <div v-else class="mb-3" ><span style="display:block;" v-for="(val,bez) in wert">{{bez}}: {{val}}</span></div>
-            
-            </div>
-            
-            </div>
-            <div :class="{'col':true}">
-            <ol style="list-style:none">
-            
-            <li v-for="(wert,bezeichnung) in kontaktInfo">
-            
-            <!-- HIER IST DAS DATUM DES FH AUSWEIS -->
-            <div class="mb-3" v-if="bezeichnung=='FhAusweisStatus' && (role=='Sudent' || role =='Mitarbeiter')">
-            <p class="mb-0"><b>FH-Ausweis Status</b></p>
-            <p class="mb-0">{{"Der FH Ausweis ist am "+ wert+ " ausgegeben worden."}}</p>
-            </div>
-
-            <!-- HIER SIND DIE EMAILS -->
-      
-
-            <div class="mb-3" v-if="typeof wert === 'object' && bezeichnung == 'emails'">
-            <p class="mb-0"><b>eMail</b></p>
-            <p v-for="email in wert" class="mb-0">{{email.type}}: <a style="text-decoration:none" :href="'mailto:'+email.email">{{email.email}}</a></p>
-            </div>
-
-            <!-- HIER SIND DIE PRIVATEN KONTAKTE -->
-            <div class="mb-3" v-if="typeof wert === 'object' && bezeichnung=='Kontakte'">
-            <p class="mb-0"><b>Private Kontakte</b></p>
-            <div class="row" v-for="element in wert" >
-            <div class="col-8">{{element.kontakttyp + ":  " + element.kontakt+"  " }}</div>
-            <div class="col-2"> {{element?.anmerkung}}</div>
-            <div class="col-2"> 
-            <i v-if="element.zustellung" class="fa-solid fa-check"></i>
-            <i v-else="element.zustellung" class="fa-solid fa-xmark"></i>
-            </div>
-            </div>
-            </div>
-            
-            <!--<pre v-else>{{JSON.stringify(wert,null,2)}}</pre>-->
-            
-            </li>
-            </ol>
-
-
-            </div>
-            </div>
-            
-            <div class="row my-5">
-            
-            <!-- order-2 class wird nur bei der Studentenansicht hinzugefügt um die Zutrittsgruppen Tabelle hinter der Betriebsmittel aufzureihen -->
-            <div :class="{'col-12':true, 'order-2':role=='Student'}">
-          
-            <core-filter-cmpt v-if="role == 'Mitarbeiter' || role =='View_Mitarbeiter'" title="Funktionen"  ref="funktionenTable" :tabulator-options="funktionen_table_options" :tableOnly />
-            <core-filter-cmpt v-if="role == 'Student'" title="Zutrittsgruppen" ref="zutrittsgruppenTable" :tabulator-options="zutrittsgruppen_table_options" :tableOnly :noColFilter />
-            
-            </div>
-            <div :class="{'col-12':true}">
-               
-            <core-filter-cmpt title="Entlehnte Betriebsmittel" v-if="!role?.includes('View')"  ref="betriebsmittelTable" :tabulator-options="betriebsmittel_table_options" :tableOnly />
-       
-            </div>
-            
-            </div>
-
-           
-            </div>
-
-            <div  :class="{'col-3':true}">
-            <div style="background-color:#EEEEEE" :class="{'row':true, 'py-4':true}">
-            <a style="text-decoration:none" :class="{'my-1':true}" href="#">Zeitwuensche</a>
-            <a style="text-decoration:none" :class="{'my-1':true}" href="#">Lehrveranstaltungen</a>
-            <a style="text-decoration:none" :class="{'my-1':true}" href="#">Zeitsperren von Gschnell</a>
-            </div>
-            <div :class="{'row':true}">
-            <h5 :class="{'fs-3':true}" style="margin-top:1em">Mailverteilers</h5>
-            <p :class="{'fs-6':true}">Sie sind Mitgglied in folgenden Verteilern:</p>
-            <div  :class="{'row':true, 'text-break':true}" v-for="verteiler in index_information?.mailverteiler">
-            <div :class="{'col-6':true}"><a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a></div> 
-            <div :class="{'col-6':true}">{{verteiler.beschreibung}}</div>
-            </div>
-            </div>
-            </div>
-            </div>
-            </div>
-    `,
-};
\ No newline at end of file
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index ce4f1545e..ee1b6f660 100644
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -212,7 +212,7 @@ export default {
 
 
                     <!-- COLUMN WITH THE PROFIL INFORMATION --> 
-                    <div class="col-md-10 col-sm-12" style="border:4px solid;border-color:lightcoral;">
+                    <div class="col-md-10 col-sm-12" style="overflow-wrap:break-word; border:4px solid;border-color:lightcoral;">
               
 
                     <!-- INFORMATION CONTENT START -->
diff --git a/public/js/components/Cis/Profil/StudentViewProfil.js b/public/js/components/Cis/Profil/StudentViewProfil.js
index 4d4584dca..c142937dd 100644
--- a/public/js/components/Cis/Profil/StudentViewProfil.js
+++ b/public/js/components/Cis/Profil/StudentViewProfil.js
@@ -147,7 +147,7 @@ export default {
 
 
                     <!-- COLUMN WITH THE PROFIL INFORMATION --> 
-                    <div class="col-md-10 col-sm-12" style="border:4px solid;border-color:lightcoral;">
+                    <div class="col-md-10 col-sm-12" style="overflow-wrap:break-word;border:4px solid;border-color:lightcoral;">
               
 
                     <!-- INFORMATION CONTENT START -->
@@ -194,8 +194,8 @@ export default {
                     
                     
                           <div class="justify-content-center row mb-3" v-if="typeof wert === 'object' && bezeichnung == 'emails'">
-                              <dt class="col-4  mb-0">eMail</dt>
-                              <div class="col-8 ">
+                              <dt class="col-lg-4 col-6 mb-0">eMail</dt>
+                              <div class="col-lg-8 col-6 ">
                                   <dd v-for="email in wert" class="mb-0 ">{{email.type}}: <a style="text-decoration:none" :href="'mailto:'+email.email">{{email.email}}</a></dd>
                               </div>
                           </div>

From a72b8a153efad8b4c232a81fb0cd0fb85fe9ee31 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Tue, 12 Dec 2023 15:34:28 +0100
Subject: [PATCH 0234/1461] layout changes

---
 .../Cis/Profil/MitarbeiterProfil.js           | 25 ++++++-------------
 .../Cis/Profil/MitarbeiterViewProfil.js       |  4 +--
 .../js/components/Cis/Profil/StudentProfil.js |  6 ++---
 .../Cis/Profil/StudentViewProfil.js           |  2 +-
 public/js/components/filter/Filter.js         |  8 +++---
 5 files changed, 17 insertions(+), 28 deletions(-)

diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 68693b887..27b6bb9b1 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -13,8 +13,7 @@ export default {
       
 
       funktionen_table_options: {
-        reactiveData:true,
-        height: 300,
+        height:400,
         layout:"fitColumns",
         responsiveLayout:"collapse",
         responsiveLayoutCollapseUseFormatters:false,
@@ -30,7 +29,8 @@ export default {
         ],
         columns: [
          //? option when wanting to hide the collapsed list
-          /*  {
+         /*   
+         {
             title: "",
             field: "",
             headerSort: false,
@@ -57,7 +57,7 @@ export default {
       },
       betriebsmittel_table_options: {
         
-        height: 300,
+        height:300,
         layout: "fitColumns",
         responsiveLayout:"collapse",
         responsiveLayoutCollapseUseFormatters:false,
@@ -165,18 +165,7 @@ export default {
  
   },
 
-/* 
-  <div class="dropdown">
-                      <button class="w-100 btn btn-secondary dropdown-toggle" type="button" id="dropdownMenu2" data-bs-toggle="dropdown" aria-expanded="false">
-                          Quick links
-                      </button>
-                      <ul class="w-100 dropdown-menu" aria-labelledby="dropdownMenu2">
-                          <li><button class="dropdown-item" type="button">Zeitwuensche</button></li>
-                          <li><button class="dropdown-item" type="button">Lehrveranstaltungen</button></li>
-                          <li><button class="dropdown-item" type="button">Zeitsperren von Gschnell</button></li>
-                      </ul>
-                      </div>
-*/
+
   template: ` 
 
 
@@ -207,7 +196,7 @@ export default {
                 </div>
               </div>
             </div>
-            
+
               </div>
               <!-- END OF HIDDEN QUCK LINKS -->
 
@@ -417,7 +406,7 @@ export default {
 
 
               <!-- START OF SIDE PANEL -->
-              <div  class="col-md-3 col-sm-12">
+              <div  class="col-md-3 col-sm-12" style="overflow-wrap:break-word">
 
 
               <!-- SRART OF QUICK LINKS IN THE SIDE PANEL -->
diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
index 7131c7d8e..9e04c2c34 100644
--- a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
@@ -11,7 +11,7 @@ export default {
       
 
       funktionen_table_options: {
-        height: 300,
+        height: 400,
         layout:"fitColumns",
         responsiveLayout:"collapse",
         responsiveLayoutCollapseUseFormatters:false,
@@ -293,7 +293,7 @@ export default {
 
 
               <!-- START OF SIDE PANEL -->
-              <div  class="col-md-3 col-sm-12">
+              <div  class="col-md-3 col-sm-12" style="overflow-wrap:break-word">
 
 
               <!-- SRART OF QUICK LINKS IN THE SIDE PANEL -->
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index ee1b6f660..147ab5d34 100644
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -35,7 +35,7 @@ export default {
       },
      
       zutrittsgruppen_table_options: {
-        height: 300,
+        height: 200,
         layout: "fitColumns",
         data: [{ bezeichnung: "test1" }],
         columns: [{ title: "Zutritt", field: "bezeichnung" }],
@@ -345,7 +345,7 @@ export default {
 
                 <!-- SECOND TABLE -->
                   <div class="col-12" style="border:4px solid;border-color:orange">
-                  <core-filter-cmpt title="Zutrittsgruppen" ref="zutrittsgruppenTable" :tabulator-options="zutrittsgruppen_table_options" :tableOnly :noColFilter />
+                  <core-filter-cmpt title="Zutrittsgruppen" ref="zutrittsgruppenTable" :tabulator-options="zutrittsgruppen_table_options" :tableOnly :noColumnFilter />
                   </div>
 
                 <!-- END OF THE ROW WITH THE TABLES UNDER THE PROFIL INFORMATION -->
@@ -364,7 +364,7 @@ export default {
 
 
               <!-- START OF SIDE PANEL -->
-              <div  class="col-md-3 col-sm-12">
+              <div  class="col-md-3 col-sm-12" style="overflow-wrap:break-word">
 
 
               <!-- SRART OF QUICK LINKS IN THE SIDE PANEL -->
diff --git a/public/js/components/Cis/Profil/StudentViewProfil.js b/public/js/components/Cis/Profil/StudentViewProfil.js
index c142937dd..216ddcbfd 100644
--- a/public/js/components/Cis/Profil/StudentViewProfil.js
+++ b/public/js/components/Cis/Profil/StudentViewProfil.js
@@ -235,7 +235,7 @@ export default {
 
 
               <!-- START OF SIDE PANEL -->
-              <div  class="col-md-3 col-sm-12">
+              <div  class="col-md-3 col-sm-12" style="overflow-wrap:break-word">
 
 
               <!-- SRART OF QUICK LINKS IN THE SIDE PANEL -->
diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index b5a132318..40821cf00 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -46,7 +46,7 @@ export const CoreFilterCmpt = {
 		tabulatorOptions: Object,
 		tabulatorEvents: Array,
 		tableOnly: Boolean,
-		noColFilter:Boolean,
+		noColumnFilter:Boolean,
 	},
 	data: function() {
 		return {
@@ -154,7 +154,7 @@ export const CoreFilterCmpt = {
 		initTabulator() {
 			// Define a default tabulator options in case it was not provided
 			let tabulatorOptions = {...{
-				height: 500,
+				height: 500, 
 				layout: "fitColumns",
 				movableColumns: true,
 				reactiveData: true
@@ -587,10 +587,10 @@ export const CoreFilterCmpt = {
 			<div class="filter-header-title">
 				<span v-if="!tableOnly" class="filter-header-title-span-filter">[ {{ filterName }} ]</span>
 				<span v-if="!tableOnly" data-bs-toggle="collapse" :data-bs-target="'#collapseFilters' + idExtra" class="filter-header-title-span-icon fa-solid fa-filter fa-xl"></span>
-				<span v-if="!noColFilter" data-bs-toggle="collapse" :data-bs-target="'#collapseColumns' + idExtra" class="filter-header-title-span-icon fa-solid fa-table-columns fa-xl"></span>
+				<span v-if="!noColumnFilter" data-bs-toggle="collapse" :data-bs-target="'#collapseColumns' + idExtra" class="filter-header-title-span-icon fa-solid fa-table-columns fa-xl"></span>
 			</div>
 
-			<div v-if="!noColFilter" :id="'collapseColumns' + idExtra" class="card-body collapse" :data-bs-parent="'#filterCollapsables' + idExtra">
+			<div v-if="!noColumnFilter" :id="'collapseColumns' + idExtra" class="card-body collapse" :data-bs-parent="'#filterCollapsables' + idExtra">
 				<div class="card">
 					<!-- Filter fields options -->
 					<div class="row card-body filter-options-div">

From 4715ce3b958c3f93b1cea5d980c01738ff6b1ab0 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Wed, 13 Dec 2023 10:58:05 +0100
Subject: [PATCH 0235/1461] icon to show or hide all collapsed columns

---
 public/css/components/Profil.css              |  4 +
 .../Cis/Profil/MitarbeiterProfil.js           | 99 +++++++++++++------
 .../Cis/Profil/MitarbeiterViewProfil.js       | 16 +--
 .../js/components/Cis/Profil/StudentProfil.js | 20 ++--
 .../Cis/Profil/StudentViewProfil.js           | 17 ++--
 5 files changed, 105 insertions(+), 51 deletions(-)

diff --git a/public/css/components/Profil.css b/public/css/components/Profil.css
index 66b52439c..2ae004c9f 100644
--- a/public/css/components/Profil.css
+++ b/public/css/components/Profil.css
@@ -20,6 +20,10 @@
 
 }
 
+.tabulator-col{
+  justify-content:center !important;
+}
+
 .tabulator-responsive-collapse{
   padding:0 !important;
 }
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 27b6bb9b1..0db26f157 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -1,7 +1,10 @@
 import fhcapifactory from "../../../apps/api/fhcapifactory.js";
 import { CoreFilterCmpt } from "../../../components/filter/Filter.js";
 
-
+let customEvents = [{event: "headerClick", handler:function(e,column){
+  console.log(e);
+  console.log(column);
+}}]
 
 
 export default {
@@ -11,9 +14,9 @@ export default {
   data() {
     return {
       
-
+      showCollapsedColumn: true,
       funktionen_table_options: {
-        height:400,
+        height:300,
         layout:"fitColumns",
         responsiveLayout:"collapse",
         responsiveLayoutCollapseUseFormatters:false,
@@ -29,14 +32,15 @@ export default {
         ],
         columns: [
          //? option when wanting to hide the collapsed list
-         /*   
+            
          {
-            title: "",
-            field: "",
+            title: "<i id='collapseIcon'  class='fa-solid fa-angle-down'></i>",
+            field: "collapse",
             headerSort: false,
+            headerFilter:false,
             formatter:"responsiveCollapse",
             maxWidth:20,
-          }, */
+          }, 
           { title: "Bezeichnung", field: "Bezeichnung", headerFilter: true,minWidth:200, },
           {
             title: "Organisationseinheit",
@@ -115,7 +119,8 @@ export default {
 
       return {
         Allgemein: {
-         
+          
+          View:"MitarbeiterIn",
           Username: this.data.username,
           Anrede: this.data.anrede,
           Titel: this.data.titel,
@@ -159,10 +164,48 @@ export default {
 
     this.$refs.funktionenTable.tabulator.on('tableBuilt', () => {
     
-        this.$refs.funktionenTable.tabulator.setData(this.data.funktionen);
+      this.$refs.funktionenTable.tabulator.setData(this.data.funktionen);
+        
        
     }) 
  
+
+
+    this.$refs.funktionenTable.tabulator.on("headerClick", function(e, column){
+      this.showCollapsedColumn = !this.showCollapsedColumn;
+      
+      if(column._column.field == "collapse"){
+        //* changes the icon that shows or hides all the collapsed columns
+        if(this.showCollapsedColumn){
+          document.getElementById("collapseIcon").classList.replace("fa-angle-up","fa-angle-down");
+        }else{
+          document.getElementById("collapseIcon").classList.replace("fa-angle-down","fa-angle-up");
+        }
+        
+        //* changes the icon for every collapsed column to open or closed
+        [...document.getElementsByClassName("tabulator-responsive-collapse-toggle")].forEach(ele => {
+            if(this.showCollapsedColumn){
+              ele.classList.replace("close","open");
+              
+            }else{
+              ele.classList.replace("open","close");
+            }
+        });
+
+        //* hides or shows the collapsed columns
+        [...document.getElementsByClassName("tabulator-responsive-collapse")].forEach(ele => {
+          if(this.showCollapsedColumn){
+            ele.style.display=""
+            
+          }else{
+            ele.style.display="none"
+          }
+          
+        });
+       
+      }
+      
+  });
   },
 
 
@@ -177,10 +220,10 @@ export default {
           <!-- HIDDEN QUICK LINKS -->
               <div  class="d-md-none col-12 ">
              
-              <div style="border:4px solid;border-color:#EEEEEE;" class="row py-2">
+              <div style=":4px solid;-color:#EEEEEE;" class="row py-2">
               <div class="col">
                 <p class="m-0">
-                  <a class="border w-100 btn " data-bs-toggle="collapse" href="#collapseExample" role="button" aria-expanded="false" aria-controls="collapseExample">
+                  <a class=" w-100 btn " data-bs-toggle="collapse" href="#collapseExample" role="button" aria-expanded="false" aria-controls="collapseExample">
                    <u> Quick links</u>
                   </a>
                  
@@ -207,7 +250,7 @@ export default {
                 <!-- ROW WITH PROFIL IMAGE AND INFORMATION -->
                 <div class="row ">
                   <!-- COLUMN WITH PROFIL IMAGE -->
-                    <div class=" col-md-2 col-sm-12" style="border:4px solid;border-color:lightgreen;  ">
+                    <div class=" col-md-2 col-sm-12" style=":4px solid;-color:lightgreen;  ">
 
 
                     <!-- START OF THE FIRST ROW WITH THE PROFIL IMAGE -->
@@ -254,7 +297,7 @@ export default {
 
 
                     <!-- COLUMN WITH THE PROFIL INFORMATION --> 
-                    <div class="col-md-10 col-sm-12" style="overflow-wrap:break-word; border:4px solid;border-color:lightcoral;">
+                    <div class="col-md-10 col-sm-12" style="overflow-wrap:break-word; :4px solid;-color:lightcoral;">
               
 
                     <!-- INFORMATION CONTENT START -->
@@ -264,20 +307,20 @@ export default {
 
 
                       <!-- FIRST COLUMN WITH PROFIL INFORMATION -->
-                      <div style="border:4px solid;border-color:red" class="col-lg-12 col-xl-6">
+                      <div style=":4px solid;-color:red" class="col-lg-12 col-xl-6">
                         
                       
                       
                         <dl class="  mb-0"  >
 
-                            <!-- MITARBEITER TITEL -->
-                            <div class="row mb-2">
-                                <dt class="col-12 " ><b>MitarbeiterIn</b></dt>
-                            </div>
+                        
 
-                            <div v-for="(wert,bez) in personData.Allgemein" class="row">
-                                <dt class="col-lg-4  col-md-6  " >{{bez}}</dt>
-                                <dd class=" col-lg-8  col-md-6 ">{{wert?wert:"-"}}</dd>
+                            <div v-for="(wert,bez) in personData.Allgemein" class="row justify-content-center">
+                              <dt class="col-xl-10 col-12 " v-if="bez=='View'" ><b>{{wert}}</b></dt>
+                              <template v-else>
+                                <dt class="col-xl-4 col-lg-6 col-md-6 col-6  " >{{bez}}</dt>
+                                <dd class="  col-6 ">{{wert?wert:"-"}}</dd>
+                              </template>
                             </div>
                             
                         
@@ -291,7 +334,7 @@ export default {
 
 
                       <!-- START OF THE SECOND PROFIL INFORMATION COLUMN -->
-                      <div style=" border:4px solid;border-color:orange" class="col-xl-6 col-lg-12">
+                      <div style=" :4px solid;-color:orange" class="col-xl-6 col-lg-12">
 
 
 
@@ -368,7 +411,7 @@ export default {
 
                 <!-- LITTLE EXTRA ROW WITH INFORMATION REFRESHING LINK -->
                 <div class="row">
-                  <div style="border:4px solid;border-color:lightpink" class="col">
+                  <div class="mt-5" style=":4px solid;-color:lightpink" class="col">
                     <p>Sollten Ihre Daten nicht mehr aktuell sein, klicken Sie bitte <a :href="refreshMailTo">hier</a></p>
                   </div>
                 </div>
@@ -381,12 +424,12 @@ export default {
                 <div class="row">
 
                 <!-- FIRST TABLE -->
-                  <div class="col-12" style="border: 4px solid; border-color:lightskyblue">
-                    <core-filter-cmpt title="Funktionen"  ref="funktionenTable" :tabulator-options="funktionen_table_options" :tableOnly />
+                  <div class="col-12" style=": 4px solid; -color:lightskyblue">
+                    <core-filter-cmpt title="Funktionen"  ref="funktionenTable" :tabulator-options="funktionen_table_options" :tabulator-events="customEvents" :tableOnly />
                   </div>
 
                 <!-- SECOND TABLE -->
-                  <div class="col-12" style="border:4px solid;border-color:orange">
+                  <div class="col-12" style=":4px solid;-color:orange">
                     <core-filter-cmpt title="Entlehnte Betriebsmittel"  ref="betriebsmittelTable" :tabulator-options="betriebsmittel_table_options" :tableOnly />
                   </div>
 
@@ -414,7 +457,7 @@ export default {
 
               <!-- START OF THE FIRDT ROW IN THE SIDE PANEL -->
               <!-- THESE QUCK LINKS ARE ONLY VISIBLE UNTIL VIEWPORT MD -->
-                <div style="border:4px solid;border-color:#EEEEEE;" class="row d-none d-md-block">
+                <div style=":4px solid;-color:#EEEEEE;" class="row d-none d-md-block">
                   <div class="col">
                     <div  class="row py-4">
                         <a style="text-decoration:none" class="my-1" href="#">Zeitwuensche</a>
@@ -426,7 +469,7 @@ export default {
 
 
                 <!-- START OF THE SECOND ROW IN THE SIDE PANEL -->
-                <div style="border:4px solid;border-color: darkgray"  class="row">
+                <div style=":4px solid;-color: darkgray"  class="row">
                 
                   <div class="col">
                 
diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
index 9e04c2c34..370a77a40 100644
--- a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
@@ -85,6 +85,7 @@ export default {
 
       return {
         Allgemein: {
+          View:"MitarbeiterIn",
           Username: this.data.username,
           Anrede: this.data.anrede,
           Titel: this.data.titel,
@@ -205,14 +206,15 @@ export default {
 
                         <dl class="  mb-0"  >
 
-                        <!-- MITARBEITER TITEL -->
-                          <div class="row mb-2">
-                              <dt class="col-12 " ><b>MitarbeiterIn</b></dt>
-                          </div>
+                        
 
-                          <div v-for="(wert,bez) in personData.Allgemein" class="row">
-                              <dt class="col-lg-4 col-6  " >{{bez}}</dt>
-                              <dd class=" col-lg-8 col-6 ">{{wert?wert:"-"}}</dd>
+                          <div v-for="(wert,bez) in personData.Allgemein" class="row justify-content-center">
+                          <!-- MITARBEITER TITEL -->
+                            <dt class="col-xl-10 col-12 " v-if="bez=='View'" ><b>{{wert}}</b></dt>
+                            <template v-else>
+                              <dt class="col-xl-4 col-lg-6 col-md-6 col-6  " >{{bez}}</dt>
+                              <dd class="  col-6 ">{{wert?wert:"-"}}</dd>
+                            </template>
                           </div>
                         
                     
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index 147ab5d34..0eaf820d4 100644
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -73,7 +73,7 @@ export default {
 
       return {
         Allgemein: {
-          
+          View:"StudentIn",
           Username: this.data.username,
           Matrikelnummer: this.data.matrikelnummer,
           Anrede: this.data.anrede,
@@ -226,14 +226,16 @@ export default {
 
                         <dl class="  mb-0"  >
 
-                          <!-- STUDENTEN TITEL -->
-                          <div class="row mb-2">
-                              <dt class="col-12 " ><b>StudentIn</b></dt>
-                          </div>
+                       
 
-                          <div v-for="(wert,bez) in personData.Allgemein" class="row">
-                              <dt class="col-lg-4 col-6  " >{{bez}}</dt>
-                              <dd class=" col-lg-8 col-6 ">{{wert?wert:"-"}}</dd>
+                          <div v-for="(wert,bez) in personData.Allgemein" class="justify-content-center row">
+                             
+
+                              <dt class="col-xl-10 col-12 " v-if="bez=='View'" ><b>{{wert}}</b></dt>
+                              <template v-else>
+                                <dt class="col-xl-4 col-lg-6 col-md-6 col-6  " >{{bez}}</dt>
+                                <dd class="  col-6 ">{{wert?wert:"-"}}</dd>
+                              </template>
                           </div>
                         
                     
@@ -325,7 +327,7 @@ export default {
 
 
                 <!-- LITTLE EXTRA ROW WITH INFORMATION REFRESHING LINK -->
-                <div class="row">
+                <div class="row mt-4">
                   <div style="border:4px solid;border-color:lightpink" class="col">
                     <p>Sollten Ihre Daten nicht mehr aktuell sein, klicken Sie bitte <a :href="refreshMailTo">hier</a></p>
                   </div>
diff --git a/public/js/components/Cis/Profil/StudentViewProfil.js b/public/js/components/Cis/Profil/StudentViewProfil.js
index 216ddcbfd..2834fdbcd 100644
--- a/public/js/components/Cis/Profil/StudentViewProfil.js
+++ b/public/js/components/Cis/Profil/StudentViewProfil.js
@@ -39,6 +39,7 @@ export default {
 
       return {
         Allgemein: {
+          View:"StudentIn",
           Username: this.data.username,
           Matrikelnummer: this.data.matrikelnummer,
           Anrede: this.data.anrede,
@@ -161,14 +162,16 @@ export default {
 
                         <dl class="  mb-0"  >
 
-                          <!-- STUDENTEN TITEL -->
-                          <div class="row mb-2">
-                              <dt class="col-12 " ><b>StudentIn</b></dt>
-                          </div>
+                          
+                       
 
-                          <div v-for="(wert,bez) in personData.Allgemein" class="row">
-                              <dt class="col-lg-4 col-6  " >{{bez}}</dt>
-                              <dd class=" col-lg-8 col-6 ">{{wert?wert:"-"}}</dd>
+                          <div v-for="(wert,bez) in personData.Allgemein" class="row justify-content-center">
+                          <!-- STUDENTEN TITEL -->
+                            <dt class="col-xl-10 col-12 " v-if="bez=='View'" ><b>{{wert}}</b></dt>
+                            <template v-else>
+                              <dt class="col-xl-4 col-lg-6 col-md-6 col-6  " >{{bez}}</dt>
+                              <dd class="  col-6 ">{{wert?wert:"-"}}</dd>
+                            </template>
                           </div>
                       
                   

From 058863ba8db882fe24db0d3331d2bfef3745bed1 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Wed, 13 Dec 2023 11:22:47 +0100
Subject: [PATCH 0236/1461] fix for show/hide all collapsed columns icon
 function, weird bug where collapsed columns icons don't work on first click

---
 .../Cis/Profil/MitarbeiterProfil.js           | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 0db26f157..0f672a005 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -6,6 +6,8 @@ let customEvents = [{event: "headerClick", handler:function(e,column){
   console.log(column);
 }}]
 
+let showCollapsedColumn= true; 
+
 
 export default {
   components: {
@@ -14,7 +16,7 @@ export default {
   data() {
     return {
       
-      showCollapsedColumn: true,
+      
       funktionen_table_options: {
         height:300,
         layout:"fitColumns",
@@ -39,7 +41,7 @@ export default {
             headerSort: false,
             headerFilter:false,
             formatter:"responsiveCollapse",
-            maxWidth:20,
+            maxWidth:40,
           }, 
           { title: "Bezeichnung", field: "Bezeichnung", headerFilter: true,minWidth:200, },
           {
@@ -172,11 +174,15 @@ export default {
 
 
     this.$refs.funktionenTable.tabulator.on("headerClick", function(e, column){
-      this.showCollapsedColumn = !this.showCollapsedColumn;
       
+      //* update the reactive data
+      console.log(showCollapsedColumn);
+      showCollapsedColumn = !showCollapsedColumn;
+      console.log(showCollapsedColumn);
+
       if(column._column.field == "collapse"){
         //* changes the icon that shows or hides all the collapsed columns
-        if(this.showCollapsedColumn){
+        if(showCollapsedColumn){
           document.getElementById("collapseIcon").classList.replace("fa-angle-up","fa-angle-down");
         }else{
           document.getElementById("collapseIcon").classList.replace("fa-angle-down","fa-angle-up");
@@ -184,25 +190,24 @@ export default {
         
         //* changes the icon for every collapsed column to open or closed
         [...document.getElementsByClassName("tabulator-responsive-collapse-toggle")].forEach(ele => {
-            if(this.showCollapsedColumn){
-              ele.classList.replace("close","open");
+            if(showCollapsedColumn){
+              ele.classList.add("open");
               
             }else{
-              ele.classList.replace("open","close");
+              ele.classList.remove("open")
             }
         });
 
         //* hides or shows the collapsed columns
         [...document.getElementsByClassName("tabulator-responsive-collapse")].forEach(ele => {
-          if(this.showCollapsedColumn){
+          if(showCollapsedColumn){
             ele.style.display=""
             
           }else{
             ele.style.display="none"
           }
-          
         });
-       
+
       }
       
   });

From b400ea758c578c61725097fcf830bb55d989dce6 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Wed, 13 Dec 2023 12:54:44 +0100
Subject: [PATCH 0237/1461] fixing the hide/show all collapsed table columns
 function by calling the click event instead of changing the classes and
 styles manually

---
 .../Cis/Profil/MitarbeiterProfil.js           | 48 +++++++++----------
 .../Cis/Profil/MitarbeiterViewProfil.js       |  6 +--
 .../js/components/Cis/Profil/StudentProfil.js |  6 +--
 .../Cis/Profil/StudentViewProfil.js           |  6 +--
 4 files changed, 31 insertions(+), 35 deletions(-)

diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 0f672a005..9cd334431 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -190,23 +190,19 @@ export default {
         
         //* changes the icon for every collapsed column to open or closed
         [...document.getElementsByClassName("tabulator-responsive-collapse-toggle")].forEach(ele => {
-            if(showCollapsedColumn){
-              ele.classList.add("open");
-              
-            }else{
-              ele.classList.remove("open")
-            }
-        });
-
-        //* hides or shows the collapsed columns
-        [...document.getElementsByClassName("tabulator-responsive-collapse")].forEach(ele => {
           if(showCollapsedColumn){
-            ele.style.display=""
-            
+              if(!ele.classList.contains("open"))
+                ele.click();
           }else{
-            ele.style.display="none"
+            if(ele.classList.contains("open"))
+              ele.click();
           }
-        });
+          
+          
+          });
+
+       
+    
 
       }
       
@@ -219,13 +215,13 @@ export default {
 
   
   <!-- CONTAINER -->
-  <div class="container-fluid" style="overflow-wrap:word-break; white-space:break-spaces;" >
+  <div class="container-fluid text-break"  >
     <!-- ROW --> 
           <div class="row">
           <!-- HIDDEN QUICK LINKS -->
               <div  class="d-md-none col-12 ">
              
-              <div style=":4px solid;-color:#EEEEEE;" class="row py-2">
+              <div class="row py-2">
               <div class="col">
                 <p class="m-0">
                   <a class=" w-100 btn " data-bs-toggle="collapse" href="#collapseExample" role="button" aria-expanded="false" aria-controls="collapseExample">
@@ -255,7 +251,7 @@ export default {
                 <!-- ROW WITH PROFIL IMAGE AND INFORMATION -->
                 <div class="row ">
                   <!-- COLUMN WITH PROFIL IMAGE -->
-                    <div class=" col-md-2 col-sm-12" style=":4px solid;-color:lightgreen;  ">
+                    <div class=" col-md-2 col-sm-12" >
 
 
                     <!-- START OF THE FIRST ROW WITH THE PROFIL IMAGE -->
@@ -302,7 +298,7 @@ export default {
 
 
                     <!-- COLUMN WITH THE PROFIL INFORMATION --> 
-                    <div class="col-md-10 col-sm-12" style="overflow-wrap:break-word; :4px solid;-color:lightcoral;">
+                    <div class="col-md-10 col-sm-12 text-break" >
               
 
                     <!-- INFORMATION CONTENT START -->
@@ -312,7 +308,7 @@ export default {
 
 
                       <!-- FIRST COLUMN WITH PROFIL INFORMATION -->
-                      <div style=":4px solid;-color:red" class="col-lg-12 col-xl-6">
+                      <div  class="col-lg-12 col-xl-6">
                         
                       
                       
@@ -339,7 +335,7 @@ export default {
 
 
                       <!-- START OF THE SECOND PROFIL INFORMATION COLUMN -->
-                      <div style=" :4px solid;-color:orange" class="col-xl-6 col-lg-12">
+                      <div  class="col-xl-6 col-lg-12">
 
 
 
@@ -416,7 +412,7 @@ export default {
 
                 <!-- LITTLE EXTRA ROW WITH INFORMATION REFRESHING LINK -->
                 <div class="row">
-                  <div class="mt-5" style=":4px solid;-color:lightpink" class="col">
+                  <div class="mt-5"  class="col">
                     <p>Sollten Ihre Daten nicht mehr aktuell sein, klicken Sie bitte <a :href="refreshMailTo">hier</a></p>
                   </div>
                 </div>
@@ -429,12 +425,12 @@ export default {
                 <div class="row">
 
                 <!-- FIRST TABLE -->
-                  <div class="col-12" style=": 4px solid; -color:lightskyblue">
+                  <div class="col-12" >
                     <core-filter-cmpt title="Funktionen"  ref="funktionenTable" :tabulator-options="funktionen_table_options" :tabulator-events="customEvents" :tableOnly />
                   </div>
 
                 <!-- SECOND TABLE -->
-                  <div class="col-12" style=":4px solid;-color:orange">
+                  <div class="col-12" >
                     <core-filter-cmpt title="Entlehnte Betriebsmittel"  ref="betriebsmittelTable" :tabulator-options="betriebsmittel_table_options" :tableOnly />
                   </div>
 
@@ -454,7 +450,7 @@ export default {
 
 
               <!-- START OF SIDE PANEL -->
-              <div  class="col-md-3 col-sm-12" style="overflow-wrap:break-word">
+              <div  class="col-md-3 col-sm-12 text-break" >
 
 
               <!-- SRART OF QUICK LINKS IN THE SIDE PANEL -->
@@ -462,7 +458,7 @@ export default {
 
               <!-- START OF THE FIRDT ROW IN THE SIDE PANEL -->
               <!-- THESE QUCK LINKS ARE ONLY VISIBLE UNTIL VIEWPORT MD -->
-                <div style=":4px solid;-color:#EEEEEE;" class="row d-none d-md-block">
+                <div  class="row d-none d-md-block">
                   <div class="col">
                     <div  class="row py-4">
                         <a style="text-decoration:none" class="my-1" href="#">Zeitwuensche</a>
@@ -474,7 +470,7 @@ export default {
 
 
                 <!-- START OF THE SECOND ROW IN THE SIDE PANEL -->
-                <div style=":4px solid;-color: darkgray"  class="row">
+                <div  class="row">
                 
                   <div class="col">
                 
diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
index 370a77a40..7c6c42cfb 100644
--- a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
@@ -131,7 +131,7 @@ export default {
 
 
   <!-- CONTAINER -->
-  <div class="container-fluid" style="overflow-wrap:word-break; white-space:break-spaces;">
+  <div class="container-fluid text-break" >
     <!-- ROW --> 
           <div class="row">
           <!-- HIDDEN QUICK LINKS -->
@@ -192,7 +192,7 @@ export default {
 
 
                     <!-- COLUMN WITH THE PROFIL INFORMATION --> 
-                    <div class="col-md-10 col-sm-12" style="overflow-wrap:break-word;border:4px solid;border-color:lightcoral;">
+                    <div class="col-md-10 col-sm-12 text-break" style="border:4px solid;border-color:lightcoral;">
               
 
                     <!-- INFORMATION CONTENT START -->
@@ -295,7 +295,7 @@ export default {
 
 
               <!-- START OF SIDE PANEL -->
-              <div  class="col-md-3 col-sm-12" style="overflow-wrap:break-word">
+              <div  class="col-md-3 col-sm-12 text-break" >
 
 
               <!-- SRART OF QUICK LINKS IN THE SIDE PANEL -->
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index 0eaf820d4..91dc80175 100644
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -127,7 +127,7 @@ export default {
   template: `
 
   <!-- CONTAINER -->
-  <div class="container-fluid" style="overflow-wrap:word-break; white-space:break-spaces;">
+  <div class="container-fluid text-break" >
     <!-- ROW --> 
           <div class="row">
           <!-- HIDDEN QUICK LINKS -->
@@ -212,7 +212,7 @@ export default {
 
 
                     <!-- COLUMN WITH THE PROFIL INFORMATION --> 
-                    <div class="col-md-10 col-sm-12" style="overflow-wrap:break-word; border:4px solid;border-color:lightcoral;">
+                    <div class="col-md-10 col-sm-12 text-break" style=" border:4px solid;border-color:lightcoral;">
               
 
                     <!-- INFORMATION CONTENT START -->
@@ -366,7 +366,7 @@ export default {
 
 
               <!-- START OF SIDE PANEL -->
-              <div  class="col-md-3 col-sm-12" style="overflow-wrap:break-word">
+              <div  class="col-md-3 col-sm-12 text-break" >
 
 
               <!-- SRART OF QUICK LINKS IN THE SIDE PANEL -->
diff --git a/public/js/components/Cis/Profil/StudentViewProfil.js b/public/js/components/Cis/Profil/StudentViewProfil.js
index 2834fdbcd..ce7be82a2 100644
--- a/public/js/components/Cis/Profil/StudentViewProfil.js
+++ b/public/js/components/Cis/Profil/StudentViewProfil.js
@@ -82,7 +82,7 @@ export default {
 
 
   <!-- CONTAINER -->
-  <div class="container-fluid" style="overflow-wrap:word-break; white-space:break-spaces;">
+  <div class="container-fluid text-break" >
     <!-- ROW --> 
           <div class="row">
           <!-- HIDDEN QUICK LINKS -->
@@ -148,7 +148,7 @@ export default {
 
 
                     <!-- COLUMN WITH THE PROFIL INFORMATION --> 
-                    <div class="col-md-10 col-sm-12" style="overflow-wrap:break-word;border:4px solid;border-color:lightcoral;">
+                    <div class="col-md-10 col-sm-12 text-break" style="border:4px solid;border-color:lightcoral;">
               
 
                     <!-- INFORMATION CONTENT START -->
@@ -238,7 +238,7 @@ export default {
 
 
               <!-- START OF SIDE PANEL -->
-              <div  class="col-md-3 col-sm-12" style="overflow-wrap:break-word">
+              <div  class="col-md-3 col-sm-12 text-break" >
 
 
               <!-- SRART OF QUICK LINKS IN THE SIDE PANEL -->

From ba17974371f9222d75621cd5e90baa8582560aa7 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Wed, 13 Dec 2023 12:58:34 +0100
Subject: [PATCH 0238/1461] adds the collapsing function to the column itself

---
 .../Cis/Profil/MitarbeiterProfil.js           | 66 +++++++++----------
 1 file changed, 32 insertions(+), 34 deletions(-)

diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 9cd334431..b1c3cef71 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -7,6 +7,36 @@ let customEvents = [{event: "headerClick", handler:function(e,column){
 }}]
 
 let showCollapsedColumn= true; 
+const collapseFunction = function(e, column){
+      
+  //* update the reactive data
+  console.log(showCollapsedColumn);
+  showCollapsedColumn = !showCollapsedColumn;
+  console.log(showCollapsedColumn);
+
+  
+    //* changes the icon that shows or hides all the collapsed columns
+    if(showCollapsedColumn){
+      document.getElementById("collapseIcon").classList.replace("fa-angle-up","fa-angle-down");
+    }else{
+      document.getElementById("collapseIcon").classList.replace("fa-angle-down","fa-angle-up");
+    }
+    
+    //* changes the icon for every collapsed column to open or closed
+    [...document.getElementsByClassName("tabulator-responsive-collapse-toggle")].forEach(ele => {
+      if(showCollapsedColumn){
+          if(!ele.classList.contains("open"))
+            ele.click();
+      }else{
+        if(ele.classList.contains("open"))
+          ele.click();
+      }
+      
+      
+      });
+  
+  
+}
 
 
 export default {
@@ -42,6 +72,7 @@ export default {
             headerFilter:false,
             formatter:"responsiveCollapse",
             maxWidth:40,
+            headerClick:collapseFunction,
           }, 
           { title: "Bezeichnung", field: "Bezeichnung", headerFilter: true,minWidth:200, },
           {
@@ -173,40 +204,7 @@ export default {
  
 
 
-    this.$refs.funktionenTable.tabulator.on("headerClick", function(e, column){
-      
-      //* update the reactive data
-      console.log(showCollapsedColumn);
-      showCollapsedColumn = !showCollapsedColumn;
-      console.log(showCollapsedColumn);
-
-      if(column._column.field == "collapse"){
-        //* changes the icon that shows or hides all the collapsed columns
-        if(showCollapsedColumn){
-          document.getElementById("collapseIcon").classList.replace("fa-angle-up","fa-angle-down");
-        }else{
-          document.getElementById("collapseIcon").classList.replace("fa-angle-down","fa-angle-up");
-        }
-        
-        //* changes the icon for every collapsed column to open or closed
-        [...document.getElementsByClassName("tabulator-responsive-collapse-toggle")].forEach(ele => {
-          if(showCollapsedColumn){
-              if(!ele.classList.contains("open"))
-                ele.click();
-          }else{
-            if(ele.classList.contains("open"))
-              ele.click();
-          }
-          
-          
-          });
-
-       
-    
-
-      }
-      
-  });
+   
   },
 
 

From 8fe19d40bc743d910981144a3f9cbc8c8e4b7ed8 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Wed, 13 Dec 2023 13:26:44 +0100
Subject: [PATCH 0239/1461] little fix for the collapsing columns function

---
 .../Cis/Profil/MitarbeiterProfil.js           | 85 +++++++++----------
 1 file changed, 40 insertions(+), 45 deletions(-)

diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index b1c3cef71..73e4a24d7 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -1,42 +1,9 @@
 import fhcapifactory from "../../../apps/api/fhcapifactory.js";
 import { CoreFilterCmpt } from "../../../components/filter/Filter.js";
 
-let customEvents = [{event: "headerClick", handler:function(e,column){
-  console.log(e);
-  console.log(column);
-}}]
 
-let showCollapsedColumn= true; 
-const collapseFunction = function(e, column){
-      
-  //* update the reactive data
-  console.log(showCollapsedColumn);
-  showCollapsedColumn = !showCollapsedColumn;
-  console.log(showCollapsedColumn);
+ 
 
-  
-    //* changes the icon that shows or hides all the collapsed columns
-    if(showCollapsedColumn){
-      document.getElementById("collapseIcon").classList.replace("fa-angle-up","fa-angle-down");
-    }else{
-      document.getElementById("collapseIcon").classList.replace("fa-angle-down","fa-angle-up");
-    }
-    
-    //* changes the icon for every collapsed column to open or closed
-    [...document.getElementsByClassName("tabulator-responsive-collapse-toggle")].forEach(ele => {
-      if(showCollapsedColumn){
-          if(!ele.classList.contains("open"))
-            ele.click();
-      }else{
-        if(ele.classList.contains("open"))
-          ele.click();
-      }
-      
-      
-      });
-  
-  
-}
 
 
 export default {
@@ -46,8 +13,9 @@ export default {
   data() {
     return {
       
-      
+      showCollapsedColumn: true,
       funktionen_table_options: {
+        
         height:300,
         layout:"fitColumns",
         responsiveLayout:"collapse",
@@ -66,13 +34,13 @@ export default {
          //? option when wanting to hide the collapsed list
             
          {
-            title: "<i id='collapseIcon'  class='fa-solid fa-angle-down'></i>",
+            title: "<i id='collapseIcon' role='button' class='fa-solid fa-angle-down  '></i>",
             field: "collapse",
             headerSort: false,
             headerFilter:false,
             formatter:"responsiveCollapse",
             maxWidth:40,
-            headerClick:collapseFunction,
+            headerClick:this.collapseFunction,
           }, 
           { title: "Bezeichnung", field: "Bezeichnung", headerFilter: true,minWidth:200, },
           {
@@ -132,7 +100,41 @@ export default {
         this.data.foto_sperre = res.data.foto_sperre;
       });
     },
+    collapseFunction (e, column){
+      
+     
+      this.showCollapsedColumn = !this.showCollapsedColumn;
+      
+
+
+      //* changes the icon that shows or hides all the collapsed columns
+      if(this.showCollapsedColumn){
+        e.target.classList.replace("fa-angle-up","fa-angle-down");
+      }else{
+        e.target.classList.replace("fa-angle-down","fa-angle-up");
+      }
+      
+      //* changes the icon for every collapsed column to open or closed
+      [...document.getElementsByClassName("tabulator-responsive-collapse-toggle")].forEach(ele => {
+        if(this.showCollapsedColumn){
+            if(!ele.classList.contains("open"))
+              ele.click();
+        }else{
+          if(ele.classList.contains("open"))
+            ele.click();
+        }
+        
+        
+        });
+
+        /* console.log(this);
+        
+        this.showCollapsedColumn = !this.showCollapsedColumn;
+        console.log(this.showCollapsedColumn); */
+    
   },
+  },
+  
   computed: {
     refreshMailTo() {
       return `mailto:info.mio@technikum-wien.at?subject=Datenkorrektur&body=Die%20Profildaten%20für%20User%20'${this.data.username}'%20sind%20nicht%20korrekt.%0DHier, die richtigen Daten:%0A%0ANachname:%20${this.data.nachname}%0AVorname:%20${this.data.vorname}%0AGeburtsdatum:${this.data.gebdatum}%0AGeburtsort:%20${this.data.gebort}%0ATitelPre:${this.data.titel}%20%0ATitelPost:${this.data.postnomen}%20%0A%0A***%0DPlatz für weitere (nicht angeführte Daten)%0D***%0A%0A[Bitte%20übermitteln%20Sie%20uns%20etwaige%20Dokumente%20zum%20Beleg%20der%20Änderung]`
@@ -186,9 +188,6 @@ export default {
   },
 
   mounted() {
-
-    
-
      this.$refs.betriebsmittelTable.tabulator.on('tableBuilt', () => {
     
         this.$refs.betriebsmittelTable.tabulator.setData(this.data.mittel);
@@ -201,10 +200,6 @@ export default {
         
        
     }) 
- 
-
-
-   
   },
 
 
@@ -424,7 +419,7 @@ export default {
 
                 <!-- FIRST TABLE -->
                   <div class="col-12" >
-                    <core-filter-cmpt title="Funktionen"  ref="funktionenTable" :tabulator-options="funktionen_table_options" :tabulator-events="customEvents" :tableOnly />
+                    <core-filter-cmpt title="Funktionen"  ref="funktionenTable" :tabulator-options="funktionen_table_options"  :tableOnly />
                   </div>
 
                 <!-- SECOND TABLE -->

From b6dbe1513e03a0b7594a008644e584be58a4850d Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Wed, 13 Dec 2023 13:59:23 +0100
Subject: [PATCH 0240/1461] adds the collapsing funktions to all the different
 profil view that use a table with more than one column

---
 .../Cis/Profil/MitarbeiterProfil.js           | 50 +++++++++++--------
 .../Cis/Profil/MitarbeiterViewProfil.js       | 49 ++++++++++++++----
 .../js/components/Cis/Profil/StudentProfil.js | 40 ++++++++++++++-
 3 files changed, 107 insertions(+), 32 deletions(-)

diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 73e4a24d7..f55dd0df9 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -13,7 +13,8 @@ export default {
   data() {
     return {
       
-      showCollapsedColumn: true,
+      collapseIconFunktionen: true,
+      collapseIconBetriebsmittel: true,
       funktionen_table_options: {
         
         height:300,
@@ -34,7 +35,7 @@ export default {
          //? option when wanting to hide the collapsed list
             
          {
-            title: "<i id='collapseIcon' role='button' class='fa-solid fa-angle-down  '></i>",
+            title: "<i id='collapseIconFunktionen' role='button' class='fa-solid fa-angle-down  '></i>",
             field: "collapse",
             headerSort: false,
             headerFilter:false,
@@ -69,6 +70,15 @@ export default {
         responsiveLayoutCollapseFormatter:Vue.$collapseFormatter,
         data: [{ betriebsmittel: "", Nummer: "", Ausgegeben_am: "" }],
         columns: [
+          {
+            title: "<i id='collapseIconBetriebsmittel' role='button' class='fa-solid fa-angle-down  '></i>",
+            field: "collapse",
+            headerSort: false,
+            headerFilter:false,
+            formatter:"responsiveCollapse",
+            maxWidth:40,
+            headerClick:this.collapseFunction,
+          }, 
           {
             title: "Betriebsmittel",
             field: "betriebsmittel",
@@ -101,37 +111,33 @@ export default {
       });
     },
     collapseFunction (e, column){
-      
-     
-      this.showCollapsedColumn = !this.showCollapsedColumn;
-      
 
+      //* the if of the column has to match with the name of the responsive data in the vue component
+      this[e.target.id] = !this[e.target.id];
 
+      //* gets all event icons of the different rows to use the onClick event later
+      let allClickableIcons = column._column.cells.map(row => {
+        return row.element.children[0];
+      });
+      
       //* changes the icon that shows or hides all the collapsed columns
-      if(this.showCollapsedColumn){
+      //* if the replace function does not find the class to replace, it just simply returns false
+      if(this[e.target.id]){
         e.target.classList.replace("fa-angle-up","fa-angle-down");
       }else{
         e.target.classList.replace("fa-angle-down","fa-angle-up");
       }
       
       //* changes the icon for every collapsed column to open or closed
-      [...document.getElementsByClassName("tabulator-responsive-collapse-toggle")].forEach(ele => {
-        if(this.showCollapsedColumn){
-            if(!ele.classList.contains("open"))
-              ele.click();
+        if(this[e.target.id]){
+          allClickableIcons.filter(column => {
+            return !column.classList.contains("open");
+          }).forEach(col => {col.click();})
         }else{
-          if(ele.classList.contains("open"))
-            ele.click();
+          allClickableIcons.filter(column => {
+            return column.classList.contains("open");
+          }).forEach(col => {col.click();})
         }
-        
-        
-        });
-
-        /* console.log(this);
-        
-        this.showCollapsedColumn = !this.showCollapsedColumn;
-        console.log(this.showCollapsedColumn); */
-    
   },
   },
   
diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
index 7c6c42cfb..6ff3daeea 100644
--- a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
@@ -8,7 +8,7 @@ export default {
   },
   data() {
     return {
-      
+      collapseIconFunktionen:true,
 
       funktionen_table_options: {
         height: 400,
@@ -28,14 +28,16 @@ export default {
           },
         ],
         columns: [
-         //? option when wanting to hide the collapsed list
-          /*  {
-            title: "",
-            field: "",
-            headerSort: false,
-            formatter:"responsiveCollapse",
-            maxWidth:20,
-          }, */
+         
+         {
+          title: "<i id='collapseIconFunktionen' role='button' class='fa-solid fa-angle-down  '></i>",
+          field: "collapse",
+          headerSort: false,
+          headerFilter:false,
+          formatter:"responsiveCollapse",
+          maxWidth:40,
+          headerClick:this.collapseFunction,
+        }, 
           { title: "Bezeichnung", field: "Bezeichnung", headerFilter: true,minWidth:200, },
           {
             title: "Organisationseinheit",
@@ -69,6 +71,35 @@ export default {
         this.data.foto_sperre = res.data.foto_sperre;
       });
     },
+    collapseFunction (e, column){
+
+      //* the if of the column has to match with the name of the responsive data in the vue component
+      this[e.target.id] = !this[e.target.id];
+
+      //* gets all event icons of the different rows to use the onClick event later
+      let allClickableIcons = column._column.cells.map(row => {
+        return row.element.children[0];
+      });
+      
+      //* changes the icon that shows or hides all the collapsed columns
+      //* if the replace function does not find the class to replace, it just simply returns false
+      if(this[e.target.id]){
+        e.target.classList.replace("fa-angle-up","fa-angle-down");
+      }else{
+        e.target.classList.replace("fa-angle-down","fa-angle-up");
+      }
+      
+      //* changes the icon for every collapsed column to open or closed
+        if(this[e.target.id]){
+          allClickableIcons.filter(column => {
+            return !column.classList.contains("open");
+          }).forEach(col => {col.click();})
+        }else{
+          allClickableIcons.filter(column => {
+            return column.classList.contains("open");
+          }).forEach(col => {col.click();})
+        }
+  },
   },
   computed: {
     get_image_base64_src() {
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index 91dc80175..4e2beeb92 100644
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -10,7 +10,7 @@ export default {
     return {
      
 
-    
+      collapseIconBetriebsmittel:true,
       betriebsmittel_table_options: {
         height: 300,
         layout: "fitColumns",
@@ -19,6 +19,15 @@ export default {
         responsiveLayoutCollapseFormatter:Vue.$collapseFormatter,
         data: [{ betriebsmittel: "", Nummer: "", Ausgegeben_am: "" }],
         columns: [
+          {
+            title: "<i id='collapseIconBetriebsmittel' role='button' class='fa-solid fa-angle-down  '></i>",
+            field: "collapse",
+            headerSort: false,
+            headerFilter:false,
+            formatter:"responsiveCollapse",
+            maxWidth:40,
+            headerClick:this.collapseFunction,
+          }, 
           {
             title: "Betriebsmittel",
             field: "betriebsmittel",
@@ -54,6 +63,35 @@ export default {
         this.data.foto_sperre = res.data.foto_sperre;
       });
     },
+    collapseFunction (e, column){
+
+      //* the if of the column has to match with the name of the responsive data in the vue component
+      this[e.target.id] = !this[e.target.id];
+
+      //* gets all event icons of the different rows to use the onClick event later
+      let allClickableIcons = column._column.cells.map(row => {
+        return row.element.children[0];
+      });
+      
+      //* changes the icon that shows or hides all the collapsed columns
+      //* if the replace function does not find the class to replace, it just simply returns false
+      if(this[e.target.id]){
+        e.target.classList.replace("fa-angle-up","fa-angle-down");
+      }else{
+        e.target.classList.replace("fa-angle-down","fa-angle-up");
+      }
+      
+      //* changes the icon for every collapsed column to open or closed
+        if(this[e.target.id]){
+          allClickableIcons.filter(column => {
+            return !column.classList.contains("open");
+          }).forEach(col => {col.click();})
+        }else{
+          allClickableIcons.filter(column => {
+            return column.classList.contains("open");
+          }).forEach(col => {col.click();})
+        }
+  },
   },
   computed: {
     refreshMailTo() {

From 5671bb340b0e284ababf4c23fa9bc9dcdb085a85 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Wed, 13 Dec 2023 14:47:40 +0100
Subject: [PATCH 0241/1461] resposive profil information column change and
 remove default table sideMenu prop

---
 public/js/components/Cis/Profil/MitarbeiterProfil.js     | 8 ++++----
 public/js/components/Cis/Profil/MitarbeiterViewProfil.js | 4 ++--
 public/js/components/Cis/Profil/StudentProfil.js         | 6 +++---
 public/js/components/Cis/Profil/StudentViewProfil.js     | 2 +-
 public/js/components/filter/Filter.js                    | 2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index f55dd0df9..3fbafc6c0 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -318,8 +318,8 @@ export default {
                             <div v-for="(wert,bez) in personData.Allgemein" class="row justify-content-center">
                               <dt class="col-xl-10 col-12 " v-if="bez=='View'" ><b>{{wert}}</b></dt>
                               <template v-else>
-                                <dt class="col-xl-4 col-lg-6 col-md-6 col-6  " >{{bez}}</dt>
-                                <dd class="  col-6 ">{{wert?wert:"-"}}</dd>
+                                <dt class="col-lg-4  col-md-6 col-6  " >{{bez}}</dt>
+                                <dd class=" col-lg-8 col-xl-6 col-6">{{wert?wert:"-"}}</dd>
                               </template>
                             </div>
                             
@@ -425,12 +425,12 @@ export default {
 
                 <!-- FIRST TABLE -->
                   <div class="col-12" >
-                    <core-filter-cmpt title="Funktionen"  ref="funktionenTable" :tabulator-options="funktionen_table_options"  :tableOnly />
+                    <core-filter-cmpt title="Funktionen"  ref="funktionenTable" :tabulator-options="funktionen_table_options"  tableOnly :sideMenu="false" />
                   </div>
 
                 <!-- SECOND TABLE -->
                   <div class="col-12" >
-                    <core-filter-cmpt title="Entlehnte Betriebsmittel"  ref="betriebsmittelTable" :tabulator-options="betriebsmittel_table_options" :tableOnly />
+                    <core-filter-cmpt title="Entlehnte Betriebsmittel"  ref="betriebsmittelTable" :tabulator-options="betriebsmittel_table_options" tableOnly :sideMenu="false" />
                   </div>
 
                 <!-- END OF THE ROW WITH THE TABLES UNDER THE PROFIL INFORMATION -->
diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
index 6ff3daeea..01e5fe9b5 100644
--- a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
@@ -244,7 +244,7 @@ export default {
                             <dt class="col-xl-10 col-12 " v-if="bez=='View'" ><b>{{wert}}</b></dt>
                             <template v-else>
                               <dt class="col-xl-4 col-lg-6 col-md-6 col-6  " >{{bez}}</dt>
-                              <dd class="  col-6 ">{{wert?wert:"-"}}</dd>
+                              <dd class=" col-lg-8 col-xl-6 col-6 ">{{wert?wert:"-"}}</dd>
                             </template>
                           </div>
                         
@@ -307,7 +307,7 @@ export default {
 
                 <!-- FIRST TABLE -->
                   <div class="col-12" style="border: 4px solid; border-color:lightskyblue">
-                    <core-filter-cmpt title="Funktionen"  ref="funktionenTable" :tabulator-options="funktionen_table_options" :tableOnly />
+                    <core-filter-cmpt title="Funktionen"  ref="funktionenTable" :tabulator-options="funktionen_table_options" tableOnly :sideMenu="false" />
                   </div>
 
                 <!-- END OF THE ROW WITH THE TABLES UNDER THE PROFIL INFORMATION -->
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index 4e2beeb92..986a5032f 100644
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -272,7 +272,7 @@ export default {
                               <dt class="col-xl-10 col-12 " v-if="bez=='View'" ><b>{{wert}}</b></dt>
                               <template v-else>
                                 <dt class="col-xl-4 col-lg-6 col-md-6 col-6  " >{{bez}}</dt>
-                                <dd class="  col-6 ">{{wert?wert:"-"}}</dd>
+                                <dd class=" col-lg-8 col-xl-6 col-6 ">{{wert?wert:"-"}}</dd>
                               </template>
                           </div>
                         
@@ -380,12 +380,12 @@ export default {
 
                 <!-- FIRST TABLE -->
                   <div class="col-12" style="border: 4px solid; border-color:lightskyblue">
-                  <core-filter-cmpt title="Entlehnte Betriebsmittel"  ref="betriebsmittelTable" :tabulator-options="betriebsmittel_table_options" :tableOnly />
+                  <core-filter-cmpt title="Entlehnte Betriebsmittel"  ref="betriebsmittelTable" :tabulator-options="betriebsmittel_table_options" tableOnly :sideMenu="false" />
                   </div>
 
                 <!-- SECOND TABLE -->
                   <div class="col-12" style="border:4px solid;border-color:orange">
-                  <core-filter-cmpt title="Zutrittsgruppen" ref="zutrittsgruppenTable" :tabulator-options="zutrittsgruppen_table_options" :tableOnly :noColumnFilter />
+                  <core-filter-cmpt title="Zutrittsgruppen" ref="zutrittsgruppenTable" :tabulator-options="zutrittsgruppen_table_options" tableOnly :sideMenu="false" :noColumnFilter />
                   </div>
 
                 <!-- END OF THE ROW WITH THE TABLES UNDER THE PROFIL INFORMATION -->
diff --git a/public/js/components/Cis/Profil/StudentViewProfil.js b/public/js/components/Cis/Profil/StudentViewProfil.js
index ce7be82a2..815b70fee 100644
--- a/public/js/components/Cis/Profil/StudentViewProfil.js
+++ b/public/js/components/Cis/Profil/StudentViewProfil.js
@@ -170,7 +170,7 @@ export default {
                             <dt class="col-xl-10 col-12 " v-if="bez=='View'" ><b>{{wert}}</b></dt>
                             <template v-else>
                               <dt class="col-xl-4 col-lg-6 col-md-6 col-6  " >{{bez}}</dt>
-                              <dd class="  col-6 ">{{wert?wert:"-"}}</dd>
+                              <dd class=" col-lg-8 col-xl-6 col-6 ">{{wert?wert:"-"}}</dd>
                             </template>
                           </div>
                       
diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index cd59a39b2..4690e1f28 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -153,7 +153,7 @@ export const CoreFilterCmpt = {
 				return [];
 			return this.tabulator.getColumns().filter(col => {
 				let def = col.getDefinition();
-				return !def.frozen && def.title;
+				return !def.frozen && def.title && def.formatter != "responsiveCollapse";
 			}).map(col => col.getField());
 		},
 		fieldNames() {

From d87670edb82775c2c73a3835e8bf59eba8d5e424 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Wed, 13 Dec 2023 15:49:51 +0100
Subject: [PATCH 0242/1461] adds Mailverteiler in card

---
 .../Cis/Profil/MitarbeiterProfil.js           | 22 ++++++++++++++-----
 .../js/components/Cis/Profil/StudentProfil.js |  4 ++--
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 3fbafc6c0..d65c320bb 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -411,7 +411,7 @@ export default {
 
                 <!-- LITTLE EXTRA ROW WITH INFORMATION REFRESHING LINK -->
                 <div class="row">
-                  <div class="mt-5"  class="col">
+                  <div   class="col pt-4">
                     <p>Sollten Ihre Daten nicht mehr aktuell sein, klicken Sie bitte <a :href="refreshMailTo">hier</a></p>
                   </div>
                 </div>
@@ -476,15 +476,25 @@ export default {
 
                   
                   <!-- HIER SIND DIE MAILVERTEILER -->
-                    <h5 class="fs-3" style="margin-top:1em">Mailverteilers</h5>
-                    <p >Sie sind Mitgglied in folgenden Verteilern:</p>
-                    <div  class="row text-break" v-for="verteiler in data?.mailverteiler">
-                      <div class="col-lg-12 col-xl-6"><a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a></div> 
-                      <div class="col-lg-12 col-xl-6">{{verteiler.beschreibung}}</div>
+                    <div class="card">
+                      <div class="card-header">
+                      Mailverteilers
+                      </div>
+                      <div class="card-body">
+                      
+                        <h6 class="card-title">Sie sind Mitgglied in folgenden Verteilern:</h6>
+                        <div  class="card-text row text-break" v-for="verteiler in data?.mailverteiler">
+                          <div class="col-lg-12 col-xl-6"><a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a></div> 
+                          <div class="col-lg-12 col-xl-6">{{verteiler.beschreibung}}</div>
+                        </div>
+
+                      </div>
                     </div>
 
 
 
+
+
                   </div>
 
                 <!-- END OF THE SECOND ROW IN THE SIDE PANEL -->
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index 986a5032f..42cf4f2da 100644
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -365,8 +365,8 @@ export default {
 
 
                 <!-- LITTLE EXTRA ROW WITH INFORMATION REFRESHING LINK -->
-                <div class="row mt-4">
-                  <div style="border:4px solid;border-color:lightpink" class="col">
+                <div class="row ">
+                  <div style="border:4px solid;border-color:lightpink" class="col pt-4">
                     <p>Sollten Ihre Daten nicht mehr aktuell sein, klicken Sie bitte <a :href="refreshMailTo">hier</a></p>
                   </div>
                 </div>

From 91781d3a38d299f17d4aea673253ef10981a25c4 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Wed, 13 Dec 2023 15:56:24 +0100
Subject: [PATCH 0243/1461] adds cards to the main information of the
 mitarbeiter profil view

---
 .../Cis/Profil/MitarbeiterProfil.js           | 56 +++++++++++++------
 1 file changed, 40 insertions(+), 16 deletions(-)

diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index d65c320bb..2d4e2b4d8 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -309,22 +309,30 @@ export default {
                       <!-- FIRST COLUMN WITH PROFIL INFORMATION -->
                       <div  class="col-lg-12 col-xl-6">
                         
+                      <div class="card h-100">
+                     
+                      <div class="card-body">
                       
-                      
-                        <dl class="  mb-0"  >
+                       
+                      <dl class="  mb-0"  >
 
                         
 
-                            <div v-for="(wert,bez) in personData.Allgemein" class="row justify-content-center">
-                              <dt class="col-xl-10 col-12 " v-if="bez=='View'" ><b>{{wert}}</b></dt>
-                              <template v-else>
-                                <dt class="col-lg-4  col-md-6 col-6  " >{{bez}}</dt>
-                                <dd class=" col-lg-8 col-xl-6 col-6">{{wert?wert:"-"}}</dd>
-                              </template>
-                            </div>
-                            
-                        
-                        </dl>
+                      <div v-for="(wert,bez) in personData.Allgemein" class="row justify-content-center">
+                        <dt class="col-xl-10 col-12 " v-if="bez=='View'" ><b>{{wert}}</b></dt>
+                        <template v-else>
+                          <dt class="col-lg-4  col-md-6 col-6  " >{{bez}}</dt>
+                          <dd class=" col-lg-8 col-xl-6 col-6">{{wert?wert:"-"}}</dd>
+                        </template>
+                      </div>
+                      
+                  
+                  </dl>
+
+                      </div>
+                    </div>
+                      
+                       
                             
 
 
@@ -337,7 +345,9 @@ export default {
                       <div  class="col-xl-6 col-lg-12">
 
 
-
+                      <div class="card h-100">
+                     
+                      <div class="card-body">
 
 
 
@@ -390,7 +400,8 @@ export default {
                         </dl>
 
 
-
+                      </div>
+                      </div>
 
                       <!-- END OF THE SECOND INFORMATION COLUMN -->
                       </div>
@@ -457,13 +468,26 @@ export default {
 
               <!-- START OF THE FIRDT ROW IN THE SIDE PANEL -->
               <!-- THESE QUCK LINKS ARE ONLY VISIBLE UNTIL VIEWPORT MD -->
-                <div  class="row d-none d-md-block">
+                <div  class="row d-none d-md-block mb-3">
                   <div class="col">
-                    <div  class="row py-4">
+                 
+                    <div class="card">
+                      <div class="card-header">
+                      Quick Links
+                      </div>
+                      <div class="card-body">
+                      
+                       
                         <a style="text-decoration:none" class="my-1" href="#">Zeitwuensche</a>
                         <a style="text-decoration:none" class="my-1" href="#">Lehrveranstaltungen</a>
                         <a style="text-decoration:none" class="my-1" href="#">Zeitsperren von Gschnell</a>
+
+                      </div>
                     </div>
+
+                   
+                      
+                  
                   </div>
                 </div>
 

From 98006b3d2be7afea876fde6f998ef3f6431ac744 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Thu, 14 Dec 2023 09:19:07 +0100
Subject: [PATCH 0244/1461] puts hidden quick links in card

---
 .../components/Cis/Profil/MitarbeiterProfil.js  | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 2d4e2b4d8..f0e437ee9 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -223,9 +223,14 @@ export default {
               <div class="row py-2">
               <div class="col">
                 <p class="m-0">
-                  <a class=" w-100 btn " data-bs-toggle="collapse" href="#collapseExample" role="button" aria-expanded="false" aria-controls="collapseExample">
-                   <u> Quick links</u>
-                  </a>
+                <div class="card">
+                
+                <a class=" w-100 btn " data-bs-toggle="collapse" href="#collapseExample" role="button" aria-expanded="false" aria-controls="collapseExample">
+                <u> Quick links</u>
+               </a>
+             
+                
+               </div>
                  
                 </p>
                 <div class="mt-1 collapse" id="collapseExample">
@@ -478,9 +483,9 @@ export default {
                       <div class="card-body">
                       
                        
-                        <a style="text-decoration:none" class="my-1" href="#">Zeitwuensche</a>
-                        <a style="text-decoration:none" class="my-1" href="#">Lehrveranstaltungen</a>
-                        <a style="text-decoration:none" class="my-1" href="#">Zeitsperren von Gschnell</a>
+                        <a style="text-decoration:none" class="my-1 d-block" href="#">Zeitwuensche</a>
+                        <a style="text-decoration:none" class="my-1 d-block" href="#">Lehrveranstaltungen</a>
+                        <a style="text-decoration:none" class="my-1 d-block" href="#">Zeitsperren von Gschnell</a>
 
                       </div>
                     </div>

From 798469dfccaa6c83ca7ad2a2c075a98e96e0a1d0 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 14 Dec 2023 16:01:18 +0100
Subject: [PATCH 0245/1461] Start Component Notiz und Tab Notizen

---
 .../controllers/components/stv/Notiz.php      | 177 +++++++++++++++
 .../controllers/components/stv/Notizen.php    |   0
 application/models/person/Notiz_model.php     |  43 +++-
 public/css/Studentenverwaltung.css            |   1 +
 public/css/components/Notiz.css               |   6 +
 public/js/components/Notiz/Notiz.js           | 138 ++++++++++++
 .../Studentenverwaltung/Details/Notizen.js    | 206 +++++++++++++++++-
 7 files changed, 568 insertions(+), 3 deletions(-)
 create mode 100644 application/controllers/components/stv/Notiz.php
 delete mode 100644 application/controllers/components/stv/Notizen.php
 create mode 100644 public/css/components/Notiz.css
 create mode 100644 public/js/components/Notiz/Notiz.js

diff --git a/application/controllers/components/stv/Notiz.php b/application/controllers/components/stv/Notiz.php
new file mode 100644
index 000000000..33205a862
--- /dev/null
+++ b/application/controllers/components/stv/Notiz.php
@@ -0,0 +1,177 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+
+class Notiz extends FHC_Controller
+{
+	public function __construct()
+	{
+		parent::__construct();
+
+		// Load Libraries
+		$this->load->library('AuthLib');
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui'
+		]);
+	}
+
+	public function getNotizen($person_id)
+	{
+		$this->load->model('person/Notiz_model', 'NotizModel');
+
+		$result = $this->NotizModel->getNotiz($person_id, true);
+
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->outputJson(getError($result));
+		} else {
+			$this->outputJson(getData($result) ?: []);
+		}
+	}
+
+	public function loadNotiz($notiz_id)
+	{
+		$this->load->model('person/Notiz_model', 'NotizModel');
+		$this->NotizModel->addJoin('public.tbl_notiz_dokument', 'notiz_id', 'LEFT');
+
+		$this->NotizModel->addSelect('*');
+
+		$this->NotizModel->addLimit(1);
+
+		$result = $this->NotizModel->loadWhere(
+			array('notiz_id' => $notiz_id)
+		);
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->outputJson($result);
+		}
+
+		elseif (!hasData($result)) {
+			$this->outputJson($result); //success mit Wert null
+			//	$this->outputJson(getData($result) ?: []);
+		}
+		else
+		{
+			$this->outputJsonSuccess(current(getData($result)));
+		}
+	}
+
+	public function addNewNotiz($person_id)
+	{
+		$_POST = json_decode($this->input->raw_input_stream, true);
+		$this->load->library('form_validation');
+
+
+		$this->form_validation->set_rules('titel', 'titel', 'required');
+		$this->form_validation->set_rules('text', 'Text', 'required');
+
+		if ($this->form_validation->run() == false)
+		{
+			return $this->outputJsonError($this->form_validation->error_array());
+		}
+
+		$this->load->model('person/Notiz_model', 'NotizModel');
+
+		$uid = getAuthUID();
+		$titel = isset($_POST['titel']) ? $_POST['titel'] : null;
+		$text = isset($_POST['text']) ? $_POST['text'] : null;
+		//$verfasser_uid = isset($_POST['verfasser_uid']) ? $_POST['verfasser_uid'] : null;
+		$verfasser_uid = $uid;
+		$start = isset($_POST['von']) ? $_POST['von'] : null;
+		$ende = isset($_POST['bis']) ? $_POST['bis'] : null;
+		$erledigt = $_POST['erledigt'];
+
+/*		$dms_id = isset($_POST['dms_id']) ? $_POST['dms_id'] : null;
+		$bearbeiter_uid = isset($_POST['bearbeiter_uid']) ? $_POST['bearbeiter_uid'] : null;
+
+*/
+
+		$result = $this->NotizModel->addNotizForPersonWithDoc($person_id, $titel, $text, $erledigt, $verfasser_uid, $start, $ende);
+
+	//	var_dump($result);
+
+/*		$result = $this->NotizModel->insert(
+			[
+				'titel' => $titel,
+				'text' =>  $text,
+				'insertvon' => $uid,
+				'insertamum' => date('c'),
+				'verfasser_uid' => $verfasser_uid,
+				'bearbeiter_uid' => $bearbeiter_uid,
+				'start' => $start,
+				'ende' => $ende,
+				'erledigt' => $_POST['erledigt'],
+				//'dms_id' => $dms_id
+			]
+		);*/
+		if (isError($result))
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson($result);
+		}
+		return $this->outputJsonSuccess(true);
+	}
+
+	public function updateNotiz($notiz_id)
+	{
+		$uid = getAuthUID();
+		$this->load->library('form_validation');
+		$_POST = json_decode($this->input->raw_input_stream, true);
+
+		$this->form_validation->set_rules('titel', 'titel', 'required');
+		$this->form_validation->set_rules('text', 'Text', 'required');
+
+		if ($this->form_validation->run() == false)
+		{
+			return $this->outputJsonError($this->form_validation->error_array());
+		}
+
+		$this->load->model('person/Notiz_model', 'NotizModel');
+
+		if(!$notiz_id)
+		{
+			return $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+		}
+
+	//	$person_id = isset($_POST['person_id']) ? $_POST['person_id'] : null;
+		$uid = getAuthUID();
+		$titel = isset($_POST['titel']) ? $_POST['titel'] : null;
+		$text = isset($_POST['text']) ? $_POST['text'] : null;
+		$verfasser_uid = isset($_POST['verfasser_uid']) ? $_POST['verfasser_uid'] : null;
+		$bearbeiter_uid = $uid;
+		$start = isset($_POST['von']) ? $_POST['von'] : null;
+		$ende = isset($_POST['bis']) ? $_POST['bis'] : null;
+		$erledigt = $_POST['erledigt'];
+
+		$result = $this->NotizModel->update(
+			[
+				'notiz_id' => $notiz_id
+			],
+			[
+				'titel' =>  $titel,
+				'updatevon' => $uid,
+				'updateamum' => date('c'),
+				'text' => $text,
+				'verfasser_uid' => $verfasser_uid,
+				'bearbeiter_uid' => $bearbeiter_uid,
+				'start' => $start,
+				'ende' => $ende,
+				'erledigt' => $erledigt
+			]
+		);
+
+		if (isError($result))
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson(getError($result));
+		}
+		return $this->outputJsonSuccess(true);
+	}
+
+
+
+}
\ No newline at end of file
diff --git a/application/controllers/components/stv/Notizen.php b/application/controllers/components/stv/Notizen.php
deleted file mode 100644
index e69de29bb..000000000
diff --git a/application/models/person/Notiz_model.php b/application/models/person/Notiz_model.php
index bfd8aa258..5a8bf1858 100644
--- a/application/models/person/Notiz_model.php
+++ b/application/models/person/Notiz_model.php
@@ -133,15 +133,56 @@ class Notiz_model extends DB_Model
 		return $result;
 	}
 
+	/**
+	 * Add a Notiz for a given person
+	 */
+	public function addNotizForPersonWithDoc($person_id, $titel, $text, $erledigt, $verfasser_uid, $von, $bis)
+	{
+		// Loads model Notizzuordnung_model
+		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
+
+		// Start DB transaction
+		$this->db->trans_start(false);
+
+		$result = $this->insert(array('titel' => $titel, 'text' => $text, 'erledigt' => $erledigt, 'verfasser_uid' => $verfasser_uid,
+			"insertvon" => $verfasser_uid, 'start' => $von, 'ende' => $bis));
+
+		if (isSuccess($result))
+		{
+			$notiz_id = $result->retval;
+			$result = $this->NotizzuordnungModel->insert(array('notiz_id' => $notiz_id, 'person_id' => $person_id));
+		}
+
+		// Transaction complete!
+		$this->db->trans_complete();
+
+		// Check if everything went ok during the transaction
+		if ($this->db->trans_status() === false || isError($result))
+		{
+			$this->db->trans_rollback();
+			$result = error($result->msg, EXIT_ERROR);
+		}
+		else
+		{
+			$this->db->trans_commit();
+			$result = success($notiz_id);
+		}
+
+		return $result;
+	}
+
 	/**
 	 * gets all Notizen for a person
 	 * @param $person_id
 	 */
-	public function getNotiz($person_id)
+	public function getNotiz($person_id, $withDoc=false)
 	{
 		// Join with the table public.tbl_notizzuordnung using notiz_id
 		$this->addJoin('public.tbl_notizzuordnung', 'notiz_id');
 
+		if($withDoc)
+			$this->addJoin('public.tbl_notiz_dokument', 'notiz_id', 'LEFT');
+
 		return $this->loadWhere(array('person_id' => $person_id));
 	}
 
diff --git a/public/css/Studentenverwaltung.css b/public/css/Studentenverwaltung.css
index 5f6050abf..85601381a 100644
--- a/public/css/Studentenverwaltung.css
+++ b/public/css/Studentenverwaltung.css
@@ -1,5 +1,6 @@
 @import './components/searchbar.css';
 @import './components/verticalsplit.css';
+@import './components/Notiz.css';
 
 html {
   font-size: .875em;
diff --git a/public/css/components/Notiz.css b/public/css/components/Notiz.css
new file mode 100644
index 000000000..75c69ec80
--- /dev/null
+++ b/public/css/components/Notiz.css
@@ -0,0 +1,6 @@
+.notizTitle {
+    color: darkred;
+}
+.notizText {
+    color: darkblue;
+}
\ No newline at end of file
diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
new file mode 100644
index 000000000..ae3ff8c7a
--- /dev/null
+++ b/public/js/components/Notiz/Notiz.js
@@ -0,0 +1,138 @@
+export default {
+	props: ['titel', 'text', 'von', 'bis', 'action', 'document', 'erledigt', 'verfasser', 'bearbeiter'],
+	computed: {
+		intTitel: {
+			get() {
+				return this.titel;
+			},
+			set(value) {
+				this.$emit('update:titel', value);
+			}
+		},
+		intText: {
+			get() {
+				return this.text;
+			},
+			set(value) {
+				this.$emit('update:text', value);
+			}
+		},
+		intVon: {
+			get() {
+				return this.von;
+			},
+			set(value) {
+				this.$emit('update:von', value);
+			}
+		},
+		intBis: {
+			get() {
+				return this.bis;
+			},
+			set(value) {
+				this.$emit('update:bis', value);
+			}
+		},
+		intDocument: {
+			get() {
+				return this.document;
+			},
+			set(value) {
+				this.$emit('update:document', value);
+			}
+		},
+		intErledigt: {
+			get() {
+				return this.erledigt;
+			},
+			set(value) {
+				this.$emit('update:erledigt', value);
+			}
+		},
+		intVerfasser: {
+			get() {
+				return this.verfasser;
+			},
+			set(value) {
+				this.$emit('update:verfasser', value);
+			}
+		},
+		intBearbeiter: {
+			get() {
+				return this.bearbeiter;
+			},
+			set(value) {
+				this.$emit('update:bearbeiter', value);
+			}
+		},
+	},
+	methods: {
+
+	},
+	template: `
+<div>
+{{intTitel}} {{intText}} {{intVon}}| {{titel}} {{text}} {{action}} {{von}} {{bis}} {{document}} {{erledigt}} {{verfasser}} {{bearbeiter}}
+	<form class="row">
+		<div class="notizAction row mb-3">
+			<b>{{action}}</b>
+		</div>
+		<div class="notizTitle row mb-3">
+			<label for="titel" class="form-label col-sm-2">Titel</label>
+			<div class="col-sm-6">
+				<input type="text" v-model="intTitel" class="form-control">
+			</div>	
+		</div>
+		
+		<div class="notizText row mb-3">
+			<label for="text" class="form-label col-sm-2">Text</label>
+			<div class="col-sm-6">
+				<textarea rows="5" cols="75" v-model="intText" class="form-control"></textarea>
+			</div>
+		</div>
+		
+		<div class="notizDoc row mb-3">
+			<label for="text" class="form-label col-sm-2">Dokument</label>
+			<div class="col-sm-6">
+				<input type="text" v-model="intDocument" class="form-control">
+			</div>
+		</div>
+		
+		<div class="notizVon row mb-3">
+			<label for="von" class="form-label col-sm-2">von</label>
+			<div class="col-sm-6" >
+				<input type="text" v-model="intVon" class="form-control">	
+			</div>
+		</div>
+		<div class="notizBis row mb-3">
+			<label for="bis" class="form-label col-sm-2">bis</label>
+			<div class="col-sm-6">
+				<input type="text" v-model="intBis" class="form-control">	
+			</div>
+		</div>
+		
+		<div class="notizErledigt row mb-3">
+			<label for="bis" class="form-label col-sm-2">erledigt</label>
+			<div class="col-sm-6"> 
+				<input type="checkbox" v-model="intErledigt">	
+			</div>
+		</div>
+		
+		<div class="notizVerfasser row mb-3">
+			<label for="bis" class="form-label col-sm-2">VerfasserIn</label>
+			<div class="col-sm-6">
+				<input type="text" v-model="intVerfasser" class="form-control">	
+				{{uid}}
+			</div>
+		</div>
+		
+		<div class="notizBearbeiter row mb-3">
+			<label for="bis" class="form-label col-sm-2">BearbeiterIn</label>
+			<div class="col-sm-6">
+				<input type="text" v-model="intBearbeiter" class="form-control">	
+			</div>
+		</div>
+		
+	</form>
+</div>`
+}
+
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
index 4b7f5901e..2d8f12b95 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
@@ -1,9 +1,211 @@
+//import NotizList from "./Notizen/Notizen.js";
+import {CoreRESTClient} from "../../../../RESTClient.js";
+import {CoreFilterCmpt} from "../../../filter/Filter.js";
+import Notiz from "../../../Notiz/Notiz.js";
+
+var editIcon = function (cell, formatterParams) {
+	return "<i class='fa fa-edit'></i>";
+};
+var deleteIcon = function (cell, formatterParams){
+	return "<i class='fa fa-remove'></i>";
+};
+
 export default {
+	components: {
+		CoreRESTClient,
+		CoreFilterCmpt,
+		Notiz
+	},
 	props: {
 		modelValue: Object
 	},
+	data() {
+		return {
+			tabulatorOptions: {
+				ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Notiz/getNotizen/' + this.modelValue.person_id),
+				columns: [
+					{title: "Titel", field: "titel"},
+					{title: "Text", field: "text", width: 350},
+					{title: "VerfasserIn", field: "verfasser_uid"},
+					{title: "BearbeiterIn", field: "bearbeiter_uid", visible: false},
+					{title: "Start", field: "start"},
+					{title: "Ende", field: "ende"},
+					{title: "Dokumente", field: "dms_id"},
+					{title: "Erledigt", field: "erledigt"},
+					{title: "Notiz_id", field: "notiz_id", visible: false},
+					{title: "Notizzuordnung_id", field: "notizzuordnung_id", visible: false},
+					{
+						formatter: editIcon, cellClick: (e, cell) => {
+							this.actionEditNotiz(cell.getData().notiz_id);
+							//console.log(cell.getRow().getIndex(), cell.getData(), this);
+						}, width: 50, headerSort: false, headerVisible: false
+					},
+					{
+						formatter: deleteIcon, cellClick: (e, cell) => {
+							this.actionDeleteNotiz(cell.getData().notiz_id);
+
+						}, width: 50, headerSort: false, headerVisible: false
+					},
+				],
+				layout: 'fitDataFill',
+				layoutColumnsOnNewData: false,
+				height: '150',
+				selectable: true,
+				index: 'notiz_id'
+			},
+			tabulatorEvents: [],
+			notizen: [],
+			formData: {
+				titel: null,
+				action: 'Neue Notiz',
+				text: null,
+				von: null,
+				bis: null,
+				dms_id: null,
+				erledigt: false,
+				verfasser: null,
+				bearbeiter: null
+			},
+		}
+	},
+	methods:{
+		actionEditNotiz(notiz_id){
+			this.loadNotiz(notiz_id).then(() => {
+				if(this.notizen.notiz_id) {
+					this.formData.titel = this.notizen.titel;
+					this.formData.action = 'Notiz bearbeiten';
+					this.formData.text = this.notizen.text;
+					this.formData.von = this.notizen.start;
+					this.formData.bis = this.notizen.ende;
+					this.formData.doc = this.notizen.dms_id;
+					this.formData.erledigt = this.notizen.erledigt;
+					this.formData.verfasser = this.notizen.verfasser_uid;
+					this.formData.bearbeiter = this.notizen.bearbeiter_uid;
+				}
+			});
+		},
+		actionNewNotiz(){
+			this.formData.titel = '';
+			this.formData.action = 'Neue Notiz';
+			this.formData.text = null;
+			this.formData.von = null;
+			this.formData.bis = null;
+			this.formData.dms_id = null;
+			this.formData.erledigt = false;
+			this.formData.verfasser = null;
+			this.formData.bearbeiter = null;
+		},
+		addNewNotiz(notizData) {
+			CoreRESTClient.post('components/stv/Notiz/addNewNotiz/' + this.modelValue.person_id,
+				this.formData
+			).then(response => {
+				if (!response.data.error) {
+					this.$fhcAlert.alertSuccess('Anlegen von neuer Notiz erfolgreich');
+					this.resetFormData();
+					this.reload();
+				} else {
+					const errorData = response.data.retval;
+					Object.entries(errorData).forEach(entry => {
+						const [key, value] = entry;
+						this.$fhcAlert.alertError(value);
+					});
+				}
+			}).catch(error => {
+				this.$fhcAlert.alertError('Fehler bei Speicherroutine aufgetreten');
+			}).finally(() => {
+				window.scrollTo(0, 0);
+			});
+		},
+		loadNotiz(notiz_id){
+			return CoreRESTClient.get('components/stv/Notiz/loadNotiz/' + notiz_id)
+				.then(
+					result => {
+						if(result.data.retval)
+							this.notizen = result.data.retval;
+						else
+						{
+							this.notizen = {};
+							this.$fhcAlert.alertError('Keine Notiz mit Id ' + notiz_id + ' gefunden');
+						}
+						return result;
+					}
+				);
+		},
+		reload(){
+			this.$refs.table.reloadTable();
+		},
+		resetFormData(){
+			this.formData.titel = null;
+			this.formData.text = null;
+			this.formData.von = null;
+			this.formData.bis = null;
+			this.formData.dms_id = null;
+			this.formData.erledigt = false;
+			this.formData.verfasser = null;
+			this.formData.bearbeiter = null;
+		},
+		updateNotiz(notiz_id){
+			CoreRESTClient.post('components/stv/Notiz/updateNotiz/' + notiz_id,
+				this.formData
+			).then(response => {
+				if (!response.data.error) {
+					this.$fhcAlert.alertSuccess('Update erfolgreich');
+					this.resetFormData();
+					this.reload();
+				} else {
+					const errorData = response.data.retval;
+					Object.entries(errorData).forEach(entry => {
+						const [key, value] = entry;
+						this.$fhcAlert.alertError(value);
+					});
+				}
+			}).catch(error => {
+				this.statusMsg = 'Error in Catch';
+				this.$fhcAlert.alertError('Fehler bei Updateroutine aufgetreten');
+			}).finally(() => {
+				window.scrollTo(0, 0);
+				//this.reload();
+			});
+		}
+	},
 	template: `
 	<div class="stv-details-details h-100 pb-3">
-		NOT YET IMPLEMENTED
-	</div>`
+	
+		<core-filter-cmpt
+		ref="table"
+		:tabulator-options="tabulatorOptions"
+		:tabulator-events="tabulatorEvents"
+		table-only
+		:side-menu="false"
+		reload
+		new-btn-show
+		new-btn-label="Neu"
+		@click:new="actionNewNotiz"
+		>
+	</core-filter-cmpt>
+
+	<br>
+			
+		<Notiz 
+			v-model:titel="formData.titel" 
+			v-model:text="formData.text" 
+			v-model:action="formData.action" 
+			v-model:von="formData.von" 
+			v-model:bis="formData.bis" 
+			v-model:document="formData.dms_id"
+			v-model:erledigt="formData.erledigt"
+			v-model:verfasser="formData.verfasser"
+			v-model:bearbeiter="formData.bearbeiter"
+			></Notiz>
+			
+			
+			<hr>
+			Parent: 	{{titel}}  {{text}}| {{notizTitel}} {{notizText}}
+			<br> {{modelValue}}
+			<br> {{formData}}
+			<hr>
+		<button v-if="formData.action === 'Neue Notiz'"  type="button" class="btn btn-primary" @click="addNewNotiz()"> Neu anlegen </button>
+		<button v-else type="button" class="btn btn-warning" @click="updateNotiz(notizen.notiz_id)"> Speichern </button>
+	</div>
+`
 };
\ No newline at end of file

From 7c29a726f247219e1155de96a83bbd34c6909fa1 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 14 Dec 2023 16:33:49 +0100
Subject: [PATCH 0246/1461] Aktionen Start New, Update, Delete

---
 .../controllers/components/stv/Notiz.php      | 17 +++++++
 public/js/components/Notiz/Notiz.js           |  2 +-
 .../Details/Kontakt/Address.js                |  2 +-
 .../Studentenverwaltung/Details/Notizen.js    | 50 +++++++++++++++----
 4 files changed, 58 insertions(+), 13 deletions(-)

diff --git a/application/controllers/components/stv/Notiz.php b/application/controllers/components/stv/Notiz.php
index 33205a862..439e7c7fb 100644
--- a/application/controllers/components/stv/Notiz.php
+++ b/application/controllers/components/stv/Notiz.php
@@ -172,6 +172,23 @@ class Notiz extends FHC_Controller
 		return $this->outputJsonSuccess(true);
 	}
 
+	public function deleteNotiz ($notiz_id)
+	{
+		$this->load->model('person/Notiz_model', 'NotizModel');
 
+		$result = $this->NotizModel->delete(
+			array('notiz_id' => $notiz_id)
+		);
+
+		if (isError($result))
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->outputJson($result);
+		}
+		elseif (!hasData($result)) {
+			$this->outputJson($result);
+		}
+		return $this->outputJsonSuccess(current(getData($result)));
+	}
 
 }
\ No newline at end of file
diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index ae3ff8c7a..eb9788516 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -71,7 +71,7 @@ export default {
 	},
 	template: `
 <div>
-{{intTitel}} {{intText}} {{intVon}}| {{titel}} {{text}} {{action}} {{von}} {{bis}} {{document}} {{erledigt}} {{verfasser}} {{bearbeiter}}
+<!--{{intTitel}} {{intText}} {{intVon}}| {{titel}} {{text}} {{action}} {{von}} {{bis}} {{document}} {{erledigt}} {{verfasser}} {{bearbeiter}}-->
 	<form class="row">
 		<div class="notizAction row mb-3">
 			<b>{{action}}</b>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
index 3f6f5eb42..834f857e6 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
@@ -513,7 +513,7 @@ export default{
             </template>
 		</BsModal>
 		
-		<!--Modal: deleteAdressModal TODO(manu) Formatierung mit zuviel Abstand-->
+		<!--Modal: deleteAdressModal-->
 		<BsModal ref="deleteAdressModal">
 			<template #title>Adresse löschen</template>
 			<template #default>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
index 2d8f12b95..1b87aaf21 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
@@ -1,7 +1,7 @@
-//import NotizList from "./Notizen/Notizen.js";
 import {CoreRESTClient} from "../../../../RESTClient.js";
 import {CoreFilterCmpt} from "../../../filter/Filter.js";
 import Notiz from "../../../Notiz/Notiz.js";
+import BsModal from "../../../Bootstrap/Modal";
 
 var editIcon = function (cell, formatterParams) {
 	return "<i class='fa fa-edit'></i>";
@@ -14,7 +14,8 @@ export default {
 	components: {
 		CoreRESTClient,
 		CoreFilterCmpt,
-		Notiz
+		Notiz,
+		BsModal
 	},
 	props: {
 		modelValue: Object
@@ -69,6 +70,12 @@ export default {
 		}
 	},
 	methods:{
+		actionDeleteNotiz(notiz_id){
+			this.loadNotiz(notiz_id).then(() => {
+				if(this.notizen.notiz_id)
+					this.$refs.deleteNotizModal.show();
+			});
+		},
 		actionEditNotiz(notiz_id){
 			this.loadNotiz(notiz_id).then(() => {
 				if(this.notizen.notiz_id) {
@@ -116,6 +123,22 @@ export default {
 				window.scrollTo(0, 0);
 			});
 		},
+		deleteNotiz(notiz_id){
+			CoreRESTClient.post('components/stv/Notiz/deleteNotiz/' + notiz_id)
+				.then(response => {
+					if (!response.data.error) {
+						this.$fhcAlert.alertSuccess('Löschen erfolgreich');
+						this.$refs.deleteNotizModal.hide();
+						this.reload();
+					} else {
+						this.$fhcAlert.alertError('Keine Notiz mit Id ' + notiz_id + ' gefunden');
+					}
+				}).catch(error => {
+				this.$fhcAlert.alertError('Fehler bei Löschroutine aufgetreten');
+			}).finally(()=> {
+				window.scrollTo(0, 0);
+			});
+		},
 		loadNotiz(notiz_id){
 			return CoreRESTClient.get('components/stv/Notiz/loadNotiz/' + notiz_id)
 				.then(
@@ -171,6 +194,18 @@ export default {
 	template: `
 	<div class="stv-details-details h-100 pb-3">
 	
+		<!--Modal: deleteNotizModal-->
+		<BsModal ref="deleteNotizModal">
+			<template #title>Notiz löschen</template>
+			<template #default>
+				<p>Notiz wirklich löschen?</p>
+			</template>
+			<template #footer>
+				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">Abbrechen</button>
+				<button ref="Close" type="button" class="btn btn-primary" @click="deleteNotiz(notizen.notiz_id)">OK</button>
+			</template>
+		</BsModal>
+	
 		<core-filter-cmpt
 		ref="table"
 		:tabulator-options="tabulatorOptions"
@@ -184,8 +219,7 @@ export default {
 		>
 	</core-filter-cmpt>
 
-	<br>
-			
+	<br>	
 		<Notiz 
 			v-model:titel="formData.titel" 
 			v-model:text="formData.text" 
@@ -196,14 +230,8 @@ export default {
 			v-model:erledigt="formData.erledigt"
 			v-model:verfasser="formData.verfasser"
 			v-model:bearbeiter="formData.bearbeiter"
-			></Notiz>
+		></Notiz>
 			
-			
-			<hr>
-			Parent: 	{{titel}}  {{text}}| {{notizTitel}} {{notizText}}
-			<br> {{modelValue}}
-			<br> {{formData}}
-			<hr>
 		<button v-if="formData.action === 'Neue Notiz'"  type="button" class="btn btn-primary" @click="addNewNotiz()"> Neu anlegen </button>
 		<button v-else type="button" class="btn btn-warning" @click="updateNotiz(notizen.notiz_id)"> Speichern </button>
 	</div>

From 1d75a26230e863ead48dad1645963b0df47bd61d Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Fri, 15 Dec 2023 14:40:56 +0100
Subject: [PATCH 0247/1461] responsive layout

---
 public/css/components/Profil.css              |  18 +
 public/js/apps/Cis/Profil.js                  |   5 +-
 public/js/components/Cis/Profil/Base.js       | 837 +++++++++++++-----
 .../Cis/Profil/MitarbeiterProfil.js           |   9 +-
 4 files changed, 640 insertions(+), 229 deletions(-)

diff --git a/public/css/components/Profil.css b/public/css/components/Profil.css
index 2ae004c9f..f5a3eec6e 100644
--- a/public/css/components/Profil.css
+++ b/public/css/components/Profil.css
@@ -28,6 +28,24 @@
   padding:0 !important;
 }
 
+.form-control_{
+  border:0;
+  border-bottom: 1px solid #ced4da;
+  height:auto !important;
+  padding-bottom: 5px !important;
+  padding-left: 3px !important;
+  border-radius:0px;
+}
+
+.form-control-plaintext[readonly]{
+  background-color:white;
+}
+
+.form-control:focus{
+  border-color:white;
+  box-shadow:none;
+}
+
 /*   dl {
     width: 100%;
     overflow: hidden;
diff --git a/public/js/apps/Cis/Profil.js b/public/js/apps/Cis/Profil.js
index eec4f9960..8c3727401 100644
--- a/public/js/apps/Cis/Profil.js
+++ b/public/js/apps/Cis/Profil.js
@@ -11,10 +11,12 @@ Vue.$collapseFormatter  = function(data){
 	//data - an array of objects containing the column title and value for each cell
 	var container = document.createElement("div");
 	container.classList.add("tabulator-collapsed-row");
+	container.classList.add("text-break");
   
 	var list = document.createElement("div");
 	list.classList.add("row");
 	
+	
 	container.appendChild(list);
   
 	data.forEach(function(col){
@@ -74,9 +76,10 @@ const app = Vue.createApp({
 	<div>
 
 	<div v-if="notFoundUID">
+	
 	<h3>Es wurden keine oder mehrere Profile für {{this.notFoundUID}} gefunden</h3>
 	</div>
-	<component v-else :is="view" :data="data" ></component>
+	<component v-else :is="data.base" :data="data" ></component>
 	</div>`
 	
 	
diff --git a/public/js/components/Cis/Profil/Base.js b/public/js/components/Cis/Profil/Base.js
index 10ff32739..547b6da57 100644
--- a/public/js/components/Cis/Profil/Base.js
+++ b/public/js/components/Cis/Profil/Base.js
@@ -7,9 +7,14 @@ export default {
   },
   data() {
     return {
+      collapseIconFunktionen: true,
+      collapseIconBetriebsmittel: true,
       funktionen_table_options: {
         height: 300,
         layout: "fitColumns",
+        responsiveLayout: "collapse",
+        responsiveLayoutCollapseUseFormatters: false,
+        responsiveLayoutCollapseFormatter: Vue.$collapseFormatter,
         data: [
           {
             Bezeichnung: "",
@@ -20,42 +25,88 @@ export default {
           },
         ],
         columns: [
-          { title: "Bezeichnung", field: "Bezeichnung", headerFilter: true },
+          //? option when wanting to hide the collapsed list
+
+          {
+            title:
+              "<i id='collapseIconFunktionen' role='button' class='fa-solid fa-angle-down  '></i>",
+            field: "collapse",
+            headerSort: false,
+            headerFilter: false,
+            formatter: "responsiveCollapse",
+            maxWidth: 40,
+            headerClick: this.collapseFunction,
+          },
+          {
+            title: "Bezeichnung",
+            field: "Bezeichnung",
+            headerFilter: true,
+            minWidth: 200,
+          },
           {
             title: "Organisationseinheit",
             field: "Organisationseinheit",
             headerFilter: true,
+            minWidth: 200,
+          },
+          {
+            title: "Gültig_von",
+            field: "Gültig_von",
+            headerFilter: true,
+            resizable: true,
+            minWidth: 200,
+          },
+          {
+            title: "Gültig_bis",
+            field: "Gültig_bis",
+            headerFilter: true,
+            resizable: true,
+            minWidth: 200,
           },
-          { title: "Gültig_von", field: "Gültig_von", headerFilter: true },
-          { title: "Gültig_bis", field: "Gültig_bis", headerFilter: true },
           {
             title: "Wochenstunden",
             field: "Wochenstunden",
             headerFilter: true,
+            minWidth: 200,
           },
         ],
       },
       betriebsmittel_table_options: {
         height: 300,
         layout: "fitColumns",
-        data: [
-          {
-            betriebsmittel: "<a href='#'>test</a>",
-            Nummer: "",
-            Ausgegeben_am: "",
-          },
-        ],
+        responsiveLayout: "collapse",
+        responsiveLayoutCollapseUseFormatters: false,
+        responsiveLayoutCollapseFormatter: Vue.$collapseFormatter,
+        data: [{ betriebsmittel: "", Nummer: "", Ausgegeben_am: "" }],
         columns: [
+          {
+            title:
+              "<i id='collapseIconBetriebsmittel' role='button' class='fa-solid fa-angle-down  '></i>",
+            field: "collapse",
+            headerSort: false,
+            headerFilter: false,
+            formatter: "responsiveCollapse",
+            maxWidth: 40,
+            headerClick: this.collapseFunction,
+          },
           {
             title: "Betriebsmittel",
             field: "betriebsmittel",
             headerFilter: true,
+            minWidth: 200,
+          },
+          {
+            title: "Nummer",
+            field: "Nummer",
+            headerFilter: true,
+            resizable: true,
+            minWidth: 200,
           },
-          { title: "Nummer", field: "Nummer", headerFilter: true },
           {
             title: "Ausgegeben_am",
             field: "Ausgegeben_am",
             headerFilter: true,
+            minWidth: 200,
           },
         ],
       },
@@ -65,15 +116,52 @@ export default {
   //? this is the prop passed to the dynamic component with the custom data of the view
   props: ["data"],
   methods: {
-    sperre_foto_function(value) {
+    sperre_foto_function() {
       if (!this.data) {
         return;
       }
-      fhcapifactory.UserData.sperre_foto_function(value).then((res) => {
+      fhcapifactory.UserData.sperre_foto_function(!this.data.foto_sperre).then((res) => {
         this.data.foto_sperre = res.data.foto_sperre;
       });
     },
+    collapseFunction(e, column) {
+      //* the if of the column has to match with the name of the responsive data in the vue component
+      this[e.target.id] = !this[e.target.id];
+
+      //* gets all event icons of the different rows to use the onClick event later
+      let allClickableIcons = column._column.cells.map((row) => {
+        return row.element.children[0];
+      });
+
+      //* changes the icon that shows or hides all the collapsed columns
+      //* if the replace function does not find the class to replace, it just simply returns false
+      if (this[e.target.id]) {
+        e.target.classList.replace("fa-angle-up", "fa-angle-down");
+      } else {
+        e.target.classList.replace("fa-angle-down", "fa-angle-up");
+      }
+
+      //* changes the icon for every collapsed column to open or closed
+      if (this[e.target.id]) {
+        allClickableIcons
+          .filter((column) => {
+            return !column.classList.contains("open");
+          })
+          .forEach((col) => {
+            col.click();
+          });
+      } else {
+        allClickableIcons
+          .filter((column) => {
+            return column.classList.contains("open");
+          })
+          .forEach((col) => {
+            col.click();
+          });
+      }
+    },
   },
+
   computed: {
     refreshMailTo() {
       return `mailto:info.mio@technikum-wien.at?subject=Datenkorrektur&body=Die%20Profildaten%20für%20User%20'${this.data.username}'%20sind%20nicht%20korrekt.%0DHier, die richtigen Daten:%0A%0ANachname:%20${this.data.nachname}%0AVorname:%20${this.data.vorname}%0AGeburtsdatum:${this.data.gebdatum}%0AGeburtsort:%20${this.data.gebort}%0ATitelPre:${this.data.titel}%20%0ATitelPost:${this.data.postnomen}%20%0A%0A***%0DPlatz für weitere (nicht angeführte Daten)%0D***%0A%0A[Bitte%20übermitteln%20Sie%20uns%20etwaige%20Dokumente%20zum%20Beleg%20der%20Änderung]`;
@@ -92,29 +180,64 @@ export default {
       }
 
       return {
-        Allgemein: {
-          Username: this.data.username,
-          Anrede: this.data.anrede,
-          Titel: this.data.titel,
-          Vorname: this.data.vorname,
-          Nachname: this.data.nachname,
-          Postnomen: this.data.postnomen,
-          Geburtsdatum: this.data.gebdatum,
-          Geburtsort: this.data.gebort,
-          Kurzzeichen: this.data.kurzbz,
-          Telefon: this.data.telefonklappe,
-          Büro: this.data.ort_kurzbz,
-          FhAusweisStatus: this.data.zutrittsdatum,
-        },
+        Username: this.data.username,
+        Anrede: this.data.anrede,
+        Titel: this.data.titel,
+        Postnomen: this.data.postnomen,
       };
     },
-    //? this computed function returns the data for the second column in the profil
+
+    personKontakt() {
+      if (!this.data) {
+        return {};
+      }
+
+      return {
+        emails: this.data.emails,
+        
+      };
+    },
+
+    specialData() {
+      if (!this.data) {
+        return {};
+      }
+
+      return {
+        Geburtsdatum: this.data.gebdatum,
+        Geburtsort: this.data.gebort,
+        Kurzzeichen: this.data.kurzbz,
+        Telefon: this.data.telefonklappe,
+        Büro: this.data.ort_kurzbz,
+      };
+    },
+
+    privateKontakte() {
+      if (!this.data) {
+        return {};
+      }
+
+      return this.data.kontakte;
+      
+    },
+
+    privateAdressen() {
+      if (!this.data) {
+        return {};
+      }
+
+      return this.data.adressen;
+      
+    },
+    
+
     kontaktInfo() {
       if (!this.data) {
         return {};
       }
 
       return {
+        FhAusweisStatus: this.data.zutrittsdatum,
         emails: this.data.emails,
         Kontakte: this.data.kontakte,
         Adressen: this.data.adressen,
@@ -132,221 +255,489 @@ export default {
     });
   },
 
-  template: `
-            <!-- CONTAINER -->
-            <div class="container-fluid">
-              <!-- ROW --> 
-                    <div class="row">
-                    <!-- HIDDEN QUICK LINKS -->
-                        <div  class="d-md-none col-12 ">
+  template: ` 
+
+  <div class="container-fluid text-break"  >
+    <!-- ROW --> 
+          <div class="row">
+          <!-- HIDDEN QUICK LINKS -->
+              <div  class="d-md-none col-12 ">
+             
+              <div class="row py-2">
+              <div class="col">
+                <p class="m-0">
+                <div class="card">
+                
+                <a class=" w-100 btn " data-bs-toggle="collapse" href="#collapseExample" role="button" aria-expanded="false" aria-controls="collapseExample">
+                <u> Quick links</u>
+               </a>
+             
+                
+               </div>
+                 
+                </p>
+                <div class="mt-1 collapse" id="collapseExample">
+                  
+                  <div class="list-group">
+                   
+                    <a href="#" class="list-group-item list-group-item-action">Zeitwünsche</a>
+                    <a href="#" class="list-group-item list-group-item-action">Lehrveranstaltungen</a>
+                    <a href="#" class="list-group-item list-group-item-action ">Zeitsperren von Gschnell</a>
+                  </div>
+                </div>
+              </div>
+            </div>
+
+              </div>
+              <!-- END OF HIDDEN QUCK LINKS -->
+
+
+              <div class="col-12">
+             
+             
+                    <div class=" form-floating mb-2">
+                      <div class="card">
+                        <div class="card-body">
+                          <span>Der FH Ausweis ist am <b>{{data.zutrittsdatum}}</b> ausgegeben worden.</span>
+                        </div>
+                      </div>
+                    </div>
+          
+              </div>
+
+
+              <!-- MAIN PANNEL -->
+              <div class="col-sm-12 col-md-9">
+                <!-- ROW WITH PROFIL IMAGE AND INFORMATION -->
+               
+              
+
+                    <!-- INFORMATION CONTENT START -->
+                    <!-- ROW WITH THE PROFIL INFORMATION --> 
+                    <div class="row mb-4">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<!-- FIRST KAESTCHEN -->
+                      <div  class="col-lg-12 col-xl-6 ">
+                     <div class="row mb-4">
+                     <div class="col">
+                     
+                        
+                      <div class="card h-100">
+                      <div class="card-header">
+                      MitarbeiterIn
+                      </div>
+                      <div class="card-body">
+                      
                        
 
 
-
-
-                          <div style="background-color:#EEEEEE;" class="row py-4">
-                            <div class="col">
-                                <div class="dropdown">
-                                <button style="width:100%" class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenu2" data-bs-toggle="dropdown" aria-expanded="false">
-                                    Quick links
-                                </button>
-                                <ul class="dropdown-menu" aria-labelledby="dropdownMenu2">
-                                    <li><button class="dropdown-item" type="button">Zeitwuensche</button></li>
-                                    <li><button class="dropdown-item" type="button">Lehrveranstaltungen</button></li>
-                                    <li><button class="dropdown-item" type="button">Zeitsperren von Gschnell</button></li>
-                                </ul>
-                                </div>
-                            </div>
-                          </div>
-
-
-                        
-                        
-                        </div>
-                        <!-- END OF HIDDEN QUCK LINKS -->
-
-
-
-                        <!-- MAIN PANNEL -->
-                        <div class="col-sm-12 col-md-9">
-                          <!-- ROW WITH PROFIL IMAGE AND INFORMATION -->
-                          <div class="row">
-                            <!-- COLUMN WITH PROFIL IMAGE -->
-                              <div class="col-md-2 col-sm-12" style="background-color:lightgreen;">
-                              <img class=" img-thumbnail " style=" max-height:150px"  :src="get_image_base64_src"></img>
-                              </div>
-
-
-
-                              <!-- COLUMN WITH THE PROFIL INFORMATION --> 
-                              <div class="col-md-10 col-sm-12" style="background-color:lightcoral;">
-                        
-
-                              <!-- INFORMATION CONTENT START -->
-                              <!-- ROW WITH THE PROFIL INFORMATION --> 
-                              <div class="row">
-
-
-
-                                <!-- FIRST COLUMN WITH PROFIL INFORMATION -->
-                                <div style="background-color:red" class="col-md-12 col-lg-6">
+                  
+                  <div  class="row justify-content-center align-items-center">
 
 
 
 
-
-                                  <div   v-for="(wert,bezeichnung) in personData">
-                                      <dl class="  mb-0" v-else v-for="(wert,bez) in wert">
-                                          <div class="row justify-content-center">
-                                              <dt class="col-6" >{{bez}}</dt>
-                                              <dd class=" col-6">{{wert?wert:"-"}}</dd>
-                                          </div>
-                                      </dl>
-                                      <div class="row justify-content-center" v-if="bez=='FhAusweisStatus'">
-                                          <dt class="col-6" >FH-Ausweis Status</dt>
-                                          <dd class=" col-6 m-0">{{"Der FH Ausweis ist am "+ wert+ " ausgegeben worden."}}</dd>
-                                      </div>
-                                  </div>
-
-
-
-                                <!-- END OF THE FIRST INFORMATION COLUMN -->
-                                </div>
-
-
-                                <!-- START OF THE SECOND PROFIL INFORMATION COLUMN -->
-                                <div style="background-color:orange" class="col-lg-6 col-md-12">
-
-
-
-
-
-
-                                  <div   v-for="(wert,bezeichnung) in personData">
-                                      <dl class="  mb-0" v-else v-for="(wert,bez) in wert">
-                                          <div class="row justify-content-center">
-                                              <dt class="col-6" >{{bez}}</dt>
-                                              <dd class=" col-6">{{wert?wert:"-"}}</dd>
-                                          </div>
-                                      </dl>
-                                      <div class="row justify-content-center" v-if="bez=='FhAusweisStatus'">
-                                          <dt class="col-6" >FH-Ausweis Status</dt>
-                                          <dd class=" col-6 m-0">{{"Der FH Ausweis ist am "+ wert+ " ausgegeben worden."}}</dd>
-                                      </div>
-                                  </div>
-
-
-
-
-                                <!-- END OF THE SECOND INFORMATION COLUMN -->
-                                </div>
-
-
-                        
-                              <!-- END OF PROFIL INFORMATION ROW -->
-                              <!-- INFORMATION CONTENT END -->
-                              </div>
-
-
-                              <!-- COLUMN WITH ALL PROFIL INFORMATION END -->
-                            </div>
-                            <!-- ROW WITH PROFIL IMAGE AND INFORMATION END -->
-                          </div  >
-
-
-                          <div class="row">
-                            <div style="background-color:lightpink" class="col">
-                              <p>Sollten Ihre Daten nicht mehr aktuell sein, klicken Sie bitte <a :href="refreshMailTo">hier</a></p>
-                            </div>
-                          </div>
-
-
-
-
-                          <!-- SECOND ROW UNDER THE PROFIL IMAGE AND INFORMATION WITH THE TABLES -->
-                          <div class="row">
-
-                          <!-- FIRST TABLE -->
-                            <div class="col-12" style="background-color:lightskyblue">
-                              <core-filter-cmpt title="Funktionen"  ref="funktionenTable" :tabulator-options="funktionen_table_options" :tableOnly />
-                            </div>
-
-                          <!-- SECOND TABLE -->
-                            <div class="col-12" style="background-color:orange">
-                              <core-filter-cmpt title="Entlehnte Betriebsmittel"  ref="betriebsmittelTable" :tabulator-options="betriebsmittel_table_options" :tableOnly />
-                            </div>
-
-                          <!-- END OF THE ROW WITH THE TABLES UNDER THE PROFIL INFORMATION -->
-                          </div>
-
-
-
-
-
-
-
-                        <!-- END OF MAIN CONTENT COL -->
-                        </div>
-
-
-
-
-                        <!-- START OF SIDE PANEL -->
-                        <div class="col-md-3 col-sm-12">
-
-
-                        <!-- SRART OF QUICK LINKS IN THE SIDE PANEL -->
-
-
-                        <!-- START OF THE FIRDT ROW IN THE SIDE PANEL -->
-                        <!-- THESE QUCK LINKS ARE ONLY VISIBLE UNTIL VIEWPORT MD -->
-                          <div style="background-color:#EEEEEE;" class="row d-none d-md-block">
-                            <div class="col">
-                              <div style="background-color:#EEEEEE" class="row py-4">
-                                  <a style="text-decoration:none" class="my-1" href="#">Zeitwuensche</a>
-                                  <a style="text-decoration:none" class="my-1" href="#">Lehrveranstaltungen</a>
-                                  <a style="text-decoration:none" class="my-1" href="#">Zeitsperren von Gschnell</a>
-                              </div>
-                            </div>
-                          </div>
-
-
-                          <!-- START OF THE SECOND ROW IN THE SIDE PANEL -->
-                          <div style="background-color: darkgray"  class="row">
+                  <!-- SQUEEZING THE IMAGE INSIDE THE FIRST INFORMATION COLUMN -->
+ <!-- START OF THE FIRST ROW WITH THE PROFIL IMAGE -->
+          <div class="col-12 col-sm-6 mb-2">
+           <div class="row justify-content-center">
+                        <div class="col-auto " style="position:relative">
+                          <img class=" img-thumbnail " style=" max-height:150px; "  :src="get_image_base64_src"></img>
+                          <!-- LOCKING IMAGE FUNCTIONALITY -->
+                          
+                          
+                          <div role="button" @click.prevent="sperre_foto_function" style="height:22px; width:21px; background-color:white; position:absolute; top:0; right:12px; display:flex; align-items:center; justify-content:center;" >
+                          <i :class="{'fa':true, ...(data.foto_sperre?{'fa-lock':true}:{'fa-lock-open':true})} " ></i>
                           
-                            <div class="col">
                           
-
-                            
-                            <!-- HIER SIND DIE MAILVERTEILER -->
-                              <h5 class="fs-3" style="margin-top:1em">Mailverteilers</h5>
-                              <p class="fs-6">Sie sind Mitgglied in folgenden Verteilern:</p>
-                              <div  class="row text-break" v-for="verteiler in data?.mailverteiler">
-                                <div class="col-6"><a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a></div> 
-                                <div class="col-6">{{verteiler.beschreibung}}</div>
-                              </div>
-    
-    
-    
-                            </div>
-
-                          <!-- END OF THE SECOND ROW IN THE SIDE PANEL -->
                           </div>
-
-                          <!-- END OF SIDE PANEL -->
                         </div>
+                      </div>
+                    <!-- END OF THE ROW WITH THE IMAGE -->
+                    </div>
+<!-- END OF SQUEEZE -->
+
+
+
+<!-- COLUMNS WITH MULTIPLE ROWS NEXT TO PROFIL PICTURE -->
+                  <div class="col-12 col-sm-6">
+                  <div class="row">
+                  <div class="col-12">
+                  <div class=" form-floating mb-2">
+                        
+                  <input  readonly class="form-control form-control-plaintext border-bottom" id="floatingInputValue"  :value="data.vorname">
+                  <label for="floatingInputValue">Vorname</label>
+                </div>
+                </div>
+                <div class="col-12">
+                <div class=" form-floating mb-2">
+                        
+                  <input  readonly class="form-control form-control-plaintext border-bottom" id="floatingInputValue"  :value="data.nachname">
+                  <label for="floatingInputValue">Nachname</label>
+                </div>
+                </div>
+                </div>
+             
+                
+                  </div>
+                  
+
+
+
+
+
+
+
+                  <div v-for="(wert,bez) in personData" class="col-md-6 col-sm-12 ">
+                  <div class=" form-floating mb-2">
+                        
+                  <input  readonly class="form-control form-control-plaintext border-bottom" id="floatingInputValue" placeholder="name@example.com" :value="wert?wert:'-'">
+                  <label for="floatingInputValue">{{bez}}</label>
+                  </div>
+                  </div>
+
+                  
+                      </div>
 
 
                       
+                      </div>
+                    </div>
+		    </div>
+                    </div>
+                     <div class="row mb-4">
+                     
+
+                     <div  class=" col-lg-12">
+        
+                     <div class="card">
+                 
+                         <div class="card-header">
+                         Mitarbeiter Information
+                         </div>
+                         <div class="card-body">
+                             <div class="row">
+                             <div v-for="(wert,bez) in specialData" class="col-md-6 col-sm-12 ">
+                                 <div class=" form-floating mb-2">    
+                                 <input  readonly class="form-control form-control-plaintext border-bottom" id="floatingInputValue" placeholder="name@example.com" :value="wert?wert:'-'">
+                                 <label for="floatingInputValue">{{bez}}</label>
+                                 </div>
+                             </div>
+                         </div>
+                         
+                     </div>
+                     
+                 </div>
+
+                     </div>  
+                            
 
 
 
-                    <!-- END OF CONTAINER ROW-->
+<!-- END OF THE FIRST KAESTCHEN -->
+                      </div>
+
+
+                      <!-- START OF SECOND PROFIL  INFORMATION COLUMN -->
+                     
+
+
+                     
+
+
+              
+                    <!-- END OF PROFIL INFORMATION ROW -->
+                    <!-- INFORMATION CONTENT END -->
+                    </div>
+
+                    <div  class="col-xl-6 col-lg-12 ">
+                    <div class="row mb-4">
+                    <div class="col">
+
+
+                    <div class="card ">
+                    <div class="card-header">
+                    Mails
+                    </div>
+                   
+                    <div class="card-body">
+
+
+
+                      <div v-for="(wert,bezeichnung) in personKontakt">
+
+                      
+            
+                      <!-- HIER SIND DIE EMAILS -->
+                  
+                  
+                      <div v-for="email in wert" v-if="typeof wert === 'object' && bezeichnung == 'emails'" class="row justify-content-center">
+                      <div  class="col-12 ">
+                      <div class=" form-floating mb-2">
+                            
+                      <input   readonly class="form-control form-control-plaintext border-bottom" id="floatingFhAusweis" :value="email.email">
+                      <label for="floatingFhAusweis">{{email.type }}</label>
                     
+                      </div>
+                      </div>
+                          </div>
+
+                    
+                    
+                     
+
+
+
+
+                    
+                      </div>
+
+
+                    </div>
+                    </div>
+                    </div></div>
+
+                    <!-- HIER SIND DIE PRIVATEN KONTAKTE-->
+                    <div class="row mb-4 ">
+                      <div class="col">
+                        <div class="card">
+                          <div class="card-header">
+                            Private Kontakte
+                          </div>
+                          <div class="card-body text-center">
+                            
+                            <div v-for="element in privateKontakte" class="align-items-center row justify-content-center">
+                           
+                              <div  :class="{...(element.anmerkung? {'col-10':true, 'col-md-6':true} : {'col-10':true, 'col-xl-11':true})}">
+                                  <div class=" form-floating mb-2">
+                                      <input  readonly class="form-control form-control-plaintext border-bottom" id="floatingKontakt" :value="element.kontakt">
+                                      <label for="floatingKontakt">{{element.kontakttyp}}</label>
+                                  </div>
+                              </div>
+                              <div v-if="element?.anmerkung" class="col-12 col-md-4 col-lg-4 col-xl-5 order-2 order-md-1 ">
+                                  <div class=" form-floating mb-2">
+                                      <input   readonly class="form-control form-control-plaintext border-bottom" id="floatingAnmerkung" :value="element.anmerkung">
+                                      <label for="floatingAnmerkung">Anmerkung</label>
+                                  </div>
+                              </div>
+                              <div class="col-2 order-1 order-md-2 col-xl-1 allign-middle">
+                                  <i v-if="element.zustellung" class="fa-solid fa-check"></i>
+                                  <i v-else="element.zustellung" class="fa-solid fa-xmark"></i>
+                              </div>
+                            </div>
+                           
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                    <!-- -->
+
+                    <!-- HIER SIND DIE PRIVATEN ADRESSEN-->
+                    <div class="row mb-4">
+                      <div class="col">
+                        <div class="card">
+                          <div class="card-header">Private Adressen</div>
+                          <div class="card-body">
+                          
+                            <div v-for="element in privateAdressen" class="row justify-content-center align-items-center">
+                            <!-- column 1 in the address row -->
+                                <div class="col-2 col-sm-1 text-center">
+                                 
+                                  <i class="fa fa-location-dot fa-lg" style="color:#00649C "></i>
+                                
+                                </div>
+                                <div  class="col-10 col-sm-11 ">
+                                    <div class=" form-floating mb-2">
+                                        <input   readonly class="form-control form-control-plaintext border-bottom" id="floatingFhAusweis" :value="element.strasse">
+                                        <label for="floatingFhAusweis">Strasse</label>
+                                    </div>
+                                </div>
+                            <!-- column 2 in the address row -->
+                                <div  class="col-lg-4 col-md-4 col-sm-6 col-xs-6 order-sm-1">
+                                    <div class=" form-floating mb-2">
+                                        <input   readonly class="form-control form-control-plaintext border-bottom" id="floatingFhAusweis" :value="element.adr_typ">
+                                        <label for="floatingFhAusweis">Typ</label>
+                                    </div>
+                                </div>
+                                <div  class="col-md-5 col-sm-12 col-xs-12 ">
+                                    <div class=" form-floating mb-2">
+                                        <input   readonly class="form-control form-control-plaintext border-bottom" id="floatingFhAusweis" :value="element.ort">
+                                        <label for="floatingFhAusweis">Ort</label>
+                                    </div>
+                                </div>
+                                <div  class="col-lg-3 col-md-3 col-sm-6 col-xs-6 order-sm-2">
+                                    <div class=" form-floating mb-2">
+                                        <input   readonly class="form-control form-control-plaintext border-bottom" id="floatingFhAusweis" :value="element.plz">
+                                        <label for="floatingFhAusweis">PLZ</label>
+                                    </div>
+                                </div>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                    <!-- -->
+
+
+
+                    <!-- END OF THE SECOND INFORMATION COLUMN -->
+                    </div>
+
+
+                    <!-- START OF THE SECOND PROFIL INFORMATION ROW --> 
+                  
+                    
+                  <!-- ROW WITH PROFIL IMAGE AND INFORMATION END -->
+                </div  >
+
+
+
+                <!-- LITTLE EXTRA ROW WITH INFORMATION REFRESHING LINK -->
+                <div class="row">
+                  <div   class="col ">
+                    <p>Sollten Ihre Daten nicht mehr aktuell sein, klicken Sie bitte <a :href="refreshMailTo">hier</a></p>
+                  </div>
                 </div>
+                <!-- END OF REFRESHING LINK ROW -->
+
+
+
+
+                <!-- SECOND ROW UNDER THE PROFIL IMAGE AND INFORMATION WITH THE TABLES -->
+                <div class="row">
+
+                <!-- FIRST TABLE -->
+                  <div class="col-12 mb-4" >
+                    <core-filter-cmpt title="Funktionen"  ref="funktionenTable" :tabulator-options="funktionen_table_options"  tableOnly :sideMenu="false" />
+                  </div>
+
+                <!-- SECOND TABLE -->
+                  <div class="col-12 mb-4" >
+                    <core-filter-cmpt title="Entlehnte Betriebsmittel"  ref="betriebsmittelTable" :tabulator-options="betriebsmittel_table_options" tableOnly :sideMenu="false" />
+                  </div>
+
+                <!-- END OF THE ROW WITH THE TABLES UNDER THE PROFIL INFORMATION -->
+                </div>
+
+
+
+
+
+
+
+              <!-- END OF MAIN CONTENT COL -->
+              </div>
+
+
+
+
+              <!-- START OF SIDE PANEL -->
+              <div  class="col-md-3 col-sm-12 text-break" >
+
+
+              <!-- SRART OF QUICK LINKS IN THE SIDE PANEL -->
+
+
+              <!-- START OF THE FIRDT ROW IN THE SIDE PANEL -->
+              <!-- THESE QUCK LINKS ARE ONLY VISIBLE UNTIL VIEWPORT MD -->
+                <div  class="row d-none d-md-block mb-3">
+                  <div class="col">
+                 
+                    <div class="card">
+                      <div class="card-header">
+                      Quick Links
+                      </div>
+                      <div class="card-body">
+                      
+                       
+                        <a style="text-decoration:none" class="my-1 d-block" href="#">Zeitwuensche</a>
+                        <a style="text-decoration:none" class="my-1 d-block" href="#">Lehrveranstaltungen</a>
+                        <a style="text-decoration:none" class="my-1 d-block" href="#">Zeitsperren von Gschnell</a>
+
+                      </div>
+                    </div>
+
+                   
+                      
+                  
+                  </div>
+                </div>
+
+
+                <!-- START OF THE SECOND ROW IN THE SIDE PANEL -->
+                <div  class="row">
                 
-                <!-- END OF CONTAINER -->
-            </div>
+                  <div class="col">
+                
+
+                  
+                  <!-- HIER SIND DIE MAILVERTEILER -->
+                    <div class="card">
+                      <div class="card-header">
+                      Mailverteilers
+                      </div>
+                      <div class="card-body">
+                      
+                        <h6 class="card-title">Sie sind Mitgglied in folgenden Verteilern:</h6>
+                        <div  class="card-text row text-break mb-2" v-for="verteiler in data?.mailverteiler">
+                          <div class="col-12 ">
+                            <div class="row">  
+                              <div class="col-1">
+                              
+                              <i class="fa-solid fa-envelope" style="color: #00649C;"></i>
+                              
+                              </div>
+                              <div class="col-11">
+                                <a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a>
+                              </div>
+                            </div>
+                           
+                          </div> 
+                          <div class="col-12 ">{{verteiler.beschreibung}}</div>
+                        </div>
+
+                      </div>
+                    </div>
+
+
+
+
+
+                  </div>
+
+                <!-- END OF THE SECOND ROW IN THE SIDE PANEL -->
+                </div>
+
+                <!-- END OF SIDE PANEL -->
+              </div>
+
+
+            
+
+
+
+          <!-- END OF CONTAINER ROW-->
+          
+      </div>
+      
+      <!-- END OF CONTAINER -->
+  </div>
             
     `,
 };
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index f0e437ee9..a4a008fe2 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -212,8 +212,6 @@ export default {
   template: ` 
 
 
-  
-  <!-- CONTAINER -->
   <div class="container-fluid text-break"  >
     <!-- ROW --> 
           <div class="row">
@@ -319,7 +317,7 @@ export default {
                       <div class="card-body">
                       
                        
-                      <dl class="  mb-0"  >
+                   <dl class="  mb-0"  >
 
                         
 
@@ -330,10 +328,11 @@ export default {
                           <dd class=" col-lg-8 col-xl-6 col-6">{{wert?wert:"-"}}</dd>
                         </template>
                       </div>
-                      
-                  
                   </dl>
 
+                  
+           
+
                       </div>
                     </div>
                       

From ae0c311be3dc67b94ff931833849bc0743cf8e40 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 18 Dec 2023 09:53:52 +0100
Subject: [PATCH 0248/1461] Css korrektur

---
 public/css/Cis4/Cis.css | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index 0ed8ecf62..908115486 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -4,8 +4,8 @@
   --fhc-cis-primary: #00649c;
   --fhc-cis-header-px: 1rem;
   --fhc-cis-header-py: .5rem;
-  --fhc-cis-main-px: 1rem;
-  --fhc-cis-main-py: 1rem;
+  --fhc-cis-main-px: 1.5rem;
+  --fhc-cis-main-py: 1.5rem;
   --fhc-cis-menu-lvl-1-bg: #00649c;
   --fhc-cis-menu-lvl-1-color: #fff;
   --fhc-cis-menu-lvl-1-bg-hover: #005585;
@@ -183,6 +183,10 @@
   display: none;
 }
 
+#cis-main {
+  padding: var(--fhc-cis-main-py) var(--fhc-cis-main-px);
+}
+
 /* desktop */
 @media (min-width: 992px) {
   body {
@@ -276,9 +280,6 @@
 }
 /* mobile */
 @media (max-width: 991.98px) {
-  #cis-main {
-    padding-left: var(--fhc-cis-main-px);
-  }
   #cis-main > :first-child {
     margin-top: var(--fhc-cis-header-height);
   }

From 9c2f062d349b6aff8b2ee21980f819bf575d94c5 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 18 Dec 2023 09:56:59 +0100
Subject: [PATCH 0249/1461] Css update

---
 public/css/Cis4/Cis.css | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index 833b5ddf2..6e987b92c 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -1,5 +1,10 @@
-/* variables */
+/* basic */
 @import '../components/searchbar.css';
+html {
+  font-size: 0.875em;
+}
+
+/* variables */
 :root {
   --fhc-cis-primary: #00649c;
   --fhc-cis-header-px: 1rem;
@@ -42,10 +47,6 @@
   }
 }
 
-html {
-	font-size: .875em;
-}
-
 /* buttons */
 #cis-header .btn-level-1,
 #cis-header .btn-level-1 + .btn,

From fa3d9e1e05ab6217cf30ec267dbe96afc1410640 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Mon, 18 Dec 2023 12:13:03 +0100
Subject: [PATCH 0250/1461] layout changes

---
 public/js/apps/Cis/Profil.js                  |   2 +-
 public/js/components/Cis/Profil/Base.js       |   2 +-
 .../Cis/Profil/MitarbeiterProfil.js           | 666 ++++++++++++------
 .../Cis/Profil/MitarbeiterViewProfil.js       | 418 ++++++++---
 4 files changed, 738 insertions(+), 350 deletions(-)

diff --git a/public/js/apps/Cis/Profil.js b/public/js/apps/Cis/Profil.js
index 8c3727401..5eac4db58 100644
--- a/public/js/apps/Cis/Profil.js
+++ b/public/js/apps/Cis/Profil.js
@@ -79,7 +79,7 @@ const app = Vue.createApp({
 	
 	<h3>Es wurden keine oder mehrere Profile für {{this.notFoundUID}} gefunden</h3>
 	</div>
-	<component v-else :is="data.base" :data="data" ></component>
+	<component v-else :is="view" :data="data" ></component>
 	</div>`
 	
 	
diff --git a/public/js/components/Cis/Profil/Base.js b/public/js/components/Cis/Profil/Base.js
index 547b6da57..ce6ca16f5 100644
--- a/public/js/components/Cis/Profil/Base.js
+++ b/public/js/components/Cis/Profil/Base.js
@@ -491,7 +491,7 @@ export default {
                       <div  class="col-12 ">
                       <div class=" form-floating mb-2">
                             
-                      <input   readonly class="form-control form-control-plaintext border-bottom" id="floatingFhAusweis" :value="email.email">
+                      <a  :href="'mailto:'+email.email" readonly class="form-control form-control-plaintext border-bottom" id="floatingFhAusweis" >{{email.email}}</a>
                       <label for="floatingFhAusweis">{{email.type }}</label>
                     
                       </div>
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index a4a008fe2..ce6ca16f5 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -1,27 +1,20 @@
 import fhcapifactory from "../../../apps/api/fhcapifactory.js";
 import { CoreFilterCmpt } from "../../../components/filter/Filter.js";
 
-
- 
-
-
-
 export default {
   components: {
     CoreFilterCmpt,
   },
   data() {
     return {
-      
       collapseIconFunktionen: true,
       collapseIconBetriebsmittel: true,
       funktionen_table_options: {
-        
-        height:300,
-        layout:"fitColumns",
-        responsiveLayout:"collapse",
-        responsiveLayoutCollapseUseFormatters:false,
-        responsiveLayoutCollapseFormatter:Vue.$collapseFormatter,
+        height: 300,
+        layout: "fitColumns",
+        responsiveLayout: "collapse",
+        responsiveLayoutCollapseUseFormatters: false,
+        responsiveLayoutCollapseFormatter: Vue.$collapseFormatter,
         data: [
           {
             Bezeichnung: "",
@@ -32,118 +25,146 @@ export default {
           },
         ],
         columns: [
-         //? option when wanting to hide the collapsed list
-            
-         {
-            title: "<i id='collapseIconFunktionen' role='button' class='fa-solid fa-angle-down  '></i>",
+          //? option when wanting to hide the collapsed list
+
+          {
+            title:
+              "<i id='collapseIconFunktionen' role='button' class='fa-solid fa-angle-down  '></i>",
             field: "collapse",
             headerSort: false,
-            headerFilter:false,
-            formatter:"responsiveCollapse",
-            maxWidth:40,
-            headerClick:this.collapseFunction,
-          }, 
-          { title: "Bezeichnung", field: "Bezeichnung", headerFilter: true,minWidth:200, },
+            headerFilter: false,
+            formatter: "responsiveCollapse",
+            maxWidth: 40,
+            headerClick: this.collapseFunction,
+          },
+          {
+            title: "Bezeichnung",
+            field: "Bezeichnung",
+            headerFilter: true,
+            minWidth: 200,
+          },
           {
             title: "Organisationseinheit",
             field: "Organisationseinheit",
-            headerFilter: true,minWidth:200,
-            
+            headerFilter: true,
+            minWidth: 200,
+          },
+          {
+            title: "Gültig_von",
+            field: "Gültig_von",
+            headerFilter: true,
+            resizable: true,
+            minWidth: 200,
+          },
+          {
+            title: "Gültig_bis",
+            field: "Gültig_bis",
+            headerFilter: true,
+            resizable: true,
+            minWidth: 200,
           },
-          { title: "Gültig_von", field: "Gültig_von", headerFilter: true, resizable:true,minWidth:200, },
-          { title: "Gültig_bis", field: "Gültig_bis", headerFilter: true, resizable:true,minWidth:200, },
           {
             title: "Wochenstunden",
             field: "Wochenstunden",
             headerFilter: true,
-            minWidth:200,
+            minWidth: 200,
           },
-          
         ],
       },
       betriebsmittel_table_options: {
-        
-        height:300,
+        height: 300,
         layout: "fitColumns",
-        responsiveLayout:"collapse",
-        responsiveLayoutCollapseUseFormatters:false,
-        responsiveLayoutCollapseFormatter:Vue.$collapseFormatter,
+        responsiveLayout: "collapse",
+        responsiveLayoutCollapseUseFormatters: false,
+        responsiveLayoutCollapseFormatter: Vue.$collapseFormatter,
         data: [{ betriebsmittel: "", Nummer: "", Ausgegeben_am: "" }],
         columns: [
           {
-            title: "<i id='collapseIconBetriebsmittel' role='button' class='fa-solid fa-angle-down  '></i>",
+            title:
+              "<i id='collapseIconBetriebsmittel' role='button' class='fa-solid fa-angle-down  '></i>",
             field: "collapse",
             headerSort: false,
-            headerFilter:false,
-            formatter:"responsiveCollapse",
-            maxWidth:40,
-            headerClick:this.collapseFunction,
-          }, 
+            headerFilter: false,
+            formatter: "responsiveCollapse",
+            maxWidth: 40,
+            headerClick: this.collapseFunction,
+          },
           {
             title: "Betriebsmittel",
             field: "betriebsmittel",
             headerFilter: true,
-            minWidth:200,
+            minWidth: 200,
+          },
+          {
+            title: "Nummer",
+            field: "Nummer",
+            headerFilter: true,
+            resizable: true,
+            minWidth: 200,
           },
-          { title: "Nummer", field: "Nummer", headerFilter: true, resizable:true, minWidth:200, },
           {
             title: "Ausgegeben_am",
             field: "Ausgegeben_am",
             headerFilter: true,
-            minWidth:200,
+            minWidth: 200,
           },
         ],
       },
-     
     };
   },
 
-    //? this is the prop passed to the dynamic component with the custom data of the view
+  //? this is the prop passed to the dynamic component with the custom data of the view
   props: ["data"],
   methods: {
-   
-    sperre_foto_function(value) {
+    sperre_foto_function() {
       if (!this.data) {
         return;
       }
-      fhcapifactory.UserData.sperre_foto_function(value).then((res) => {
+      fhcapifactory.UserData.sperre_foto_function(!this.data.foto_sperre).then((res) => {
         this.data.foto_sperre = res.data.foto_sperre;
       });
     },
-    collapseFunction (e, column){
-
+    collapseFunction(e, column) {
       //* the if of the column has to match with the name of the responsive data in the vue component
       this[e.target.id] = !this[e.target.id];
 
       //* gets all event icons of the different rows to use the onClick event later
-      let allClickableIcons = column._column.cells.map(row => {
+      let allClickableIcons = column._column.cells.map((row) => {
         return row.element.children[0];
       });
-      
+
       //* changes the icon that shows or hides all the collapsed columns
       //* if the replace function does not find the class to replace, it just simply returns false
-      if(this[e.target.id]){
-        e.target.classList.replace("fa-angle-up","fa-angle-down");
-      }else{
-        e.target.classList.replace("fa-angle-down","fa-angle-up");
+      if (this[e.target.id]) {
+        e.target.classList.replace("fa-angle-up", "fa-angle-down");
+      } else {
+        e.target.classList.replace("fa-angle-down", "fa-angle-up");
       }
-      
+
       //* changes the icon for every collapsed column to open or closed
-        if(this[e.target.id]){
-          allClickableIcons.filter(column => {
+      if (this[e.target.id]) {
+        allClickableIcons
+          .filter((column) => {
             return !column.classList.contains("open");
-          }).forEach(col => {col.click();})
-        }else{
-          allClickableIcons.filter(column => {
+          })
+          .forEach((col) => {
+            col.click();
+          });
+      } else {
+        allClickableIcons
+          .filter((column) => {
             return column.classList.contains("open");
-          }).forEach(col => {col.click();})
-        }
+          })
+          .forEach((col) => {
+            col.click();
+          });
+      }
+    },
   },
-  },
-  
+
   computed: {
     refreshMailTo() {
-      return `mailto:info.mio@technikum-wien.at?subject=Datenkorrektur&body=Die%20Profildaten%20für%20User%20'${this.data.username}'%20sind%20nicht%20korrekt.%0DHier, die richtigen Daten:%0A%0ANachname:%20${this.data.nachname}%0AVorname:%20${this.data.vorname}%0AGeburtsdatum:${this.data.gebdatum}%0AGeburtsort:%20${this.data.gebort}%0ATitelPre:${this.data.titel}%20%0ATitelPost:${this.data.postnomen}%20%0A%0A***%0DPlatz für weitere (nicht angeführte Daten)%0D***%0A%0A[Bitte%20übermitteln%20Sie%20uns%20etwaige%20Dokumente%20zum%20Beleg%20der%20Änderung]`
+      return `mailto:info.mio@technikum-wien.at?subject=Datenkorrektur&body=Die%20Profildaten%20für%20User%20'${this.data.username}'%20sind%20nicht%20korrekt.%0DHier, die richtigen Daten:%0A%0ANachname:%20${this.data.nachname}%0AVorname:%20${this.data.vorname}%0AGeburtsdatum:${this.data.gebdatum}%0AGeburtsort:%20${this.data.gebort}%0ATitelPre:${this.data.titel}%20%0ATitelPost:${this.data.postnomen}%20%0A%0A***%0DPlatz für weitere (nicht angeführte Daten)%0D***%0A%0A[Bitte%20übermitteln%20Sie%20uns%20etwaige%20Dokumente%20zum%20Beleg%20der%20Änderung]`;
     },
 
     get_image_base64_src() {
@@ -152,39 +173,70 @@ export default {
       }
       return "data:image/jpeg;base64," + this.data.foto;
     },
-    //? this computed function returns all the informations for the first column in the profil 
+    //? this computed function returns all the informations for the first column in the profil
     personData() {
       if (!this.data) {
         return {};
       }
 
       return {
-        Allgemein: {
-          
-          View:"MitarbeiterIn",
-          Username: this.data.username,
-          Anrede: this.data.anrede,
-          Titel: this.data.titel,
-          Vorname: this.data.vorname,
-          Nachname: this.data.nachname,
-          Postnomen: this.data.postnomen,
-          Geburtsdatum: this.data.gebdatum,
-          Geburtsort: this.data.gebort,
-          Kurzzeichen: this.data.kurzbz,
-          Telefon: this.data.telefonklappe,
-          Büro:this.data.ort_kurzbz,
-          
-        },
+        Username: this.data.username,
+        Anrede: this.data.anrede,
+        Titel: this.data.titel,
+        Postnomen: this.data.postnomen,
       };
     },
-    //? this computed function returns the data for the second column in the profil 
+
+    personKontakt() {
+      if (!this.data) {
+        return {};
+      }
+
+      return {
+        emails: this.data.emails,
+        
+      };
+    },
+
+    specialData() {
+      if (!this.data) {
+        return {};
+      }
+
+      return {
+        Geburtsdatum: this.data.gebdatum,
+        Geburtsort: this.data.gebort,
+        Kurzzeichen: this.data.kurzbz,
+        Telefon: this.data.telefonklappe,
+        Büro: this.data.ort_kurzbz,
+      };
+    },
+
+    privateKontakte() {
+      if (!this.data) {
+        return {};
+      }
+
+      return this.data.kontakte;
+      
+    },
+
+    privateAdressen() {
+      if (!this.data) {
+        return {};
+      }
+
+      return this.data.adressen;
+      
+    },
+    
+
     kontaktInfo() {
       if (!this.data) {
         return {};
       }
 
       return {
-        
         FhAusweisStatus: this.data.zutrittsdatum,
         emails: this.data.emails,
         Kontakte: this.data.kontakte,
@@ -194,24 +246,17 @@ export default {
   },
 
   mounted() {
-     this.$refs.betriebsmittelTable.tabulator.on('tableBuilt', () => {
-    
-        this.$refs.betriebsmittelTable.tabulator.setData(this.data.mittel);
-        
-    }) 
+    this.$refs.betriebsmittelTable.tabulator.on("tableBuilt", () => {
+      this.$refs.betriebsmittelTable.tabulator.setData(this.data.mittel);
+    });
 
-    this.$refs.funktionenTable.tabulator.on('tableBuilt', () => {
-    
+    this.$refs.funktionenTable.tabulator.on("tableBuilt", () => {
       this.$refs.funktionenTable.tabulator.setData(this.data.funktionen);
-        
-       
-    }) 
+    });
   },
 
-
   template: ` 
 
-
   <div class="container-fluid text-break"  >
     <!-- ROW --> 
           <div class="row">
@@ -247,168 +292,173 @@ export default {
               <!-- END OF HIDDEN QUCK LINKS -->
 
 
+              <div class="col-12">
+             
+             
+                    <div class=" form-floating mb-2">
+                      <div class="card">
+                        <div class="card-body">
+                          <span>Der FH Ausweis ist am <b>{{data.zutrittsdatum}}</b> ausgegeben worden.</span>
+                        </div>
+                      </div>
+                    </div>
+          
+              </div>
+
 
               <!-- MAIN PANNEL -->
               <div class="col-sm-12 col-md-9">
                 <!-- ROW WITH PROFIL IMAGE AND INFORMATION -->
-                <div class="row ">
-                  <!-- COLUMN WITH PROFIL IMAGE -->
-                    <div class=" col-md-2 col-sm-12" >
-
-
-                    <!-- START OF THE FIRST ROW WITH THE PROFIL IMAGE -->
-                      <div class="row justify-content-center">
-                        <div class="col-auto ">
-                          <img class=" img-thumbnail " style=" max-height:150px"  :src="get_image_base64_src"></img>
-                        </div>
-                      </div>
-                    <!-- END OF THE ROW WITH THE IMAGE -->
-
-
-
-
-
-
-                    <!-- START OF THE SECOND ROW WITH THE IMAGE LINK -->
-                    <div class="row justify-content-center">
-                    <div class="col-auto text-center ">
-                          
-
-                        
-                        <div v-if="data.foto_sperre ">
-                          <p class="m-0">Profilfoto gesperrt</p>
-                          <a href="#" @click.prevent="sperre_foto_function(false)" class="text-decoration-none">Sperre des Profilfotos aufheben</a>
-                        </div>
-                        <!-- DIESEN LINK KOENNTE MAN MIT EINEM ICON AUSTAUSCHEN WENN DIE VIEWPORT KLEIN IST -->
-                        <a href="#" @click.prevent="sperre_foto_function(true)" class="text-decoration-none"  v-else>Profilfoto sperren</a>
-                     
-
-
-
-                        </div>
-                      </div>
-                    <!-- END OF THE ROW WITH THE IMAGE LINK -->
-
-
-
-
-
-
-                    <!-- END OF THE COLUMN WITH PROFIL IMAGE AND LINK -->
-                    </div>
-
-
-
-                    <!-- COLUMN WITH THE PROFIL INFORMATION --> 
-                    <div class="col-md-10 col-sm-12 text-break" >
+               
               
 
                     <!-- INFORMATION CONTENT START -->
                     <!-- ROW WITH THE PROFIL INFORMATION --> 
-                    <div class="row">
+                    <div class="row mb-4">
 
 
 
-                      <!-- FIRST COLUMN WITH PROFIL INFORMATION -->
-                      <div  class="col-lg-12 col-xl-6">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<!-- FIRST KAESTCHEN -->
+                      <div  class="col-lg-12 col-xl-6 ">
+                     <div class="row mb-4">
+                     <div class="col">
+                     
                         
                       <div class="card h-100">
-                     
+                      <div class="card-header">
+                      MitarbeiterIn
+                      </div>
                       <div class="card-body">
                       
                        
-                   <dl class="  mb-0"  >
 
-                        
-
-                      <div v-for="(wert,bez) in personData.Allgemein" class="row justify-content-center">
-                        <dt class="col-xl-10 col-12 " v-if="bez=='View'" ><b>{{wert}}</b></dt>
-                        <template v-else>
-                          <dt class="col-lg-4  col-md-6 col-6  " >{{bez}}</dt>
-                          <dd class=" col-lg-8 col-xl-6 col-6">{{wert?wert:"-"}}</dd>
-                        </template>
-                      </div>
-                  </dl>
 
                   
-           
+                  <div  class="row justify-content-center align-items-center">
 
+
+
+
+                  <!-- SQUEEZING THE IMAGE INSIDE THE FIRST INFORMATION COLUMN -->
+ <!-- START OF THE FIRST ROW WITH THE PROFIL IMAGE -->
+          <div class="col-12 col-sm-6 mb-2">
+           <div class="row justify-content-center">
+                        <div class="col-auto " style="position:relative">
+                          <img class=" img-thumbnail " style=" max-height:150px; "  :src="get_image_base64_src"></img>
+                          <!-- LOCKING IMAGE FUNCTIONALITY -->
+                          
+                          
+                          <div role="button" @click.prevent="sperre_foto_function" style="height:22px; width:21px; background-color:white; position:absolute; top:0; right:12px; display:flex; align-items:center; justify-content:center;" >
+                          <i :class="{'fa':true, ...(data.foto_sperre?{'fa-lock':true}:{'fa-lock-open':true})} " ></i>
+                          
+                          
+                          </div>
+                        </div>
+                      </div>
+                    <!-- END OF THE ROW WITH THE IMAGE -->
+                    </div>
+<!-- END OF SQUEEZE -->
+
+
+
+<!-- COLUMNS WITH MULTIPLE ROWS NEXT TO PROFIL PICTURE -->
+                  <div class="col-12 col-sm-6">
+                  <div class="row">
+                  <div class="col-12">
+                  <div class=" form-floating mb-2">
+                        
+                  <input  readonly class="form-control form-control-plaintext border-bottom" id="floatingInputValue"  :value="data.vorname">
+                  <label for="floatingInputValue">Vorname</label>
+                </div>
+                </div>
+                <div class="col-12">
+                <div class=" form-floating mb-2">
+                        
+                  <input  readonly class="form-control form-control-plaintext border-bottom" id="floatingInputValue"  :value="data.nachname">
+                  <label for="floatingInputValue">Nachname</label>
+                </div>
+                </div>
+                </div>
+             
+                
+                  </div>
+                  
+
+
+
+
+
+
+
+                  <div v-for="(wert,bez) in personData" class="col-md-6 col-sm-12 ">
+                  <div class=" form-floating mb-2">
+                        
+                  <input  readonly class="form-control form-control-plaintext border-bottom" id="floatingInputValue" placeholder="name@example.com" :value="wert?wert:'-'">
+                  <label for="floatingInputValue">{{bez}}</label>
+                  </div>
+                  </div>
+
+                  
+                      </div>
+
+
+                      
                       </div>
                     </div>
-                      
-                       
+		    </div>
+                    </div>
+                     <div class="row mb-4">
+                     
+
+                     <div  class=" col-lg-12">
+        
+                     <div class="card">
+                 
+                         <div class="card-header">
+                         Mitarbeiter Information
+                         </div>
+                         <div class="card-body">
+                             <div class="row">
+                             <div v-for="(wert,bez) in specialData" class="col-md-6 col-sm-12 ">
+                                 <div class=" form-floating mb-2">    
+                                 <input  readonly class="form-control form-control-plaintext border-bottom" id="floatingInputValue" placeholder="name@example.com" :value="wert?wert:'-'">
+                                 <label for="floatingInputValue">{{bez}}</label>
+                                 </div>
+                             </div>
+                         </div>
+                         
+                     </div>
+                     
+                 </div>
+
+                     </div>  
                             
 
 
 
-                      <!-- END OF THE FIRST INFORMATION COLUMN -->
+<!-- END OF THE FIRST KAESTCHEN -->
                       </div>
 
 
-                      <!-- START OF THE SECOND PROFIL INFORMATION COLUMN -->
-                      <div  class="col-xl-6 col-lg-12">
-
-
-                      <div class="card h-100">
+                      <!-- START OF SECOND PROFIL  INFORMATION COLUMN -->
                      
-                      <div class="card-body">
 
 
-
-                        <dl v-for="(wert,bezeichnung) in kontaktInfo">
-
-
-                          <div class="row justify-content-center" v-if="bezeichnung=='FhAusweisStatus'">
-                            <dt class="col-lg-4 col-6" >FH-Ausweis Status</dt>
-                            <dd class=" col-lg-8 col-6 m-0">{{"Der FH Ausweis ist am "+ wert+ " ausgegeben worden."}}</dd>
-                          </div>
-
-                        <!-- HIER SIND DIE EMAILS -->
-                    
-                    
-                          <div class="justify-content-center row mb-3" v-if="typeof wert === 'object' && bezeichnung == 'emails'">
-                            <dt class="col-lg-4  col-6 mb-0">eMail</dt>
-                            <div class="col-lg-8 col-6">
-                                <dd v-for="email in wert" class="mb-0 ">{{email.type}}: <a style="text-decoration:none" :href="'mailto:'+email.email">{{email.email}}</a></dd>
-                            </div>
-                          </div>
-                      
-                      
-                          <!-- HIER SIND DIE PRIVATEN KONTAKTE -->
-                          <div  class="justify-content-center row mb-3" v-if="typeof wert === 'object' && bezeichnung=='Kontakte'">
-                              <dt   class="col-lg-4 col-6  mb-0">Private Kontakte</dt>
-                              <div class="col-lg-8 col-6 ">
-                                  <dd style="white-space:normal" class="row justify-end" v-for="element in wert" >
-                                      <div :class="{...(element?.anmerkung? {'col-7':true} : {'col-10':true} )}">{{element.kontakttyp + ":  " + element.kontakt+"  " }}</div>
-                                      <div :class="{...(element?.anmerkung? {'col-3':true} : {'d-none':true} )}"> {{element?.anmerkung}}</div>
-                                      <div class="col-2"> 
-                                          <i v-if="element.zustellung" class="fa-solid fa-check"></i>
-                                          <i v-else="element.zustellung" class="fa-solid fa-xmark"></i>
-                                      </div>
-                                  </dd>
-                              </div>
-                          </div>
-                      
-                      
-                      
-                          <!-- HIER SIND DIE ADRESSEN -->
-                          <div class=" justify-content-center row mb-3" v-if="typeof wert === 'object' && bezeichnung=='Adressen'">
-                              <dt class="col-lg-4 col-6">Adressen</dt>
-                              <div class="col-lg-8 col-6">
-                                  <dd class="  m-0"  v-for="element in wert">
-                                      {{element.strasse}} <b>({{element.adr_typ}})</b><br/>{{ element.plz}} {{element.ort}}
-                                  </dd>
-                              </div>
-                          </div>
-                    
-                        </dl>
-
-
-                      </div>
-                      </div>
-
-                      <!-- END OF THE SECOND INFORMATION COLUMN -->
-                      </div>
+                     
 
 
               
@@ -416,9 +466,143 @@ export default {
                     <!-- INFORMATION CONTENT END -->
                     </div>
 
+                    <div  class="col-xl-6 col-lg-12 ">
+                    <div class="row mb-4">
+                    <div class="col">
 
-                    <!-- COLUMN WITH ALL PROFIL INFORMATION END -->
-                  </div>
+
+                    <div class="card ">
+                    <div class="card-header">
+                    Mails
+                    </div>
+                   
+                    <div class="card-body">
+
+
+
+                      <div v-for="(wert,bezeichnung) in personKontakt">
+
+                      
+            
+                      <!-- HIER SIND DIE EMAILS -->
+                  
+                  
+                      <div v-for="email in wert" v-if="typeof wert === 'object' && bezeichnung == 'emails'" class="row justify-content-center">
+                      <div  class="col-12 ">
+                      <div class=" form-floating mb-2">
+                            
+                      <a  :href="'mailto:'+email.email" readonly class="form-control form-control-plaintext border-bottom" id="floatingFhAusweis" >{{email.email}}</a>
+                      <label for="floatingFhAusweis">{{email.type }}</label>
+                    
+                      </div>
+                      </div>
+                          </div>
+
+                    
+                    
+                     
+
+
+
+
+                    
+                      </div>
+
+
+                    </div>
+                    </div>
+                    </div></div>
+
+                    <!-- HIER SIND DIE PRIVATEN KONTAKTE-->
+                    <div class="row mb-4 ">
+                      <div class="col">
+                        <div class="card">
+                          <div class="card-header">
+                            Private Kontakte
+                          </div>
+                          <div class="card-body text-center">
+                            
+                            <div v-for="element in privateKontakte" class="align-items-center row justify-content-center">
+                           
+                              <div  :class="{...(element.anmerkung? {'col-10':true, 'col-md-6':true} : {'col-10':true, 'col-xl-11':true})}">
+                                  <div class=" form-floating mb-2">
+                                      <input  readonly class="form-control form-control-plaintext border-bottom" id="floatingKontakt" :value="element.kontakt">
+                                      <label for="floatingKontakt">{{element.kontakttyp}}</label>
+                                  </div>
+                              </div>
+                              <div v-if="element?.anmerkung" class="col-12 col-md-4 col-lg-4 col-xl-5 order-2 order-md-1 ">
+                                  <div class=" form-floating mb-2">
+                                      <input   readonly class="form-control form-control-plaintext border-bottom" id="floatingAnmerkung" :value="element.anmerkung">
+                                      <label for="floatingAnmerkung">Anmerkung</label>
+                                  </div>
+                              </div>
+                              <div class="col-2 order-1 order-md-2 col-xl-1 allign-middle">
+                                  <i v-if="element.zustellung" class="fa-solid fa-check"></i>
+                                  <i v-else="element.zustellung" class="fa-solid fa-xmark"></i>
+                              </div>
+                            </div>
+                           
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                    <!-- -->
+
+                    <!-- HIER SIND DIE PRIVATEN ADRESSEN-->
+                    <div class="row mb-4">
+                      <div class="col">
+                        <div class="card">
+                          <div class="card-header">Private Adressen</div>
+                          <div class="card-body">
+                          
+                            <div v-for="element in privateAdressen" class="row justify-content-center align-items-center">
+                            <!-- column 1 in the address row -->
+                                <div class="col-2 col-sm-1 text-center">
+                                 
+                                  <i class="fa fa-location-dot fa-lg" style="color:#00649C "></i>
+                                
+                                </div>
+                                <div  class="col-10 col-sm-11 ">
+                                    <div class=" form-floating mb-2">
+                                        <input   readonly class="form-control form-control-plaintext border-bottom" id="floatingFhAusweis" :value="element.strasse">
+                                        <label for="floatingFhAusweis">Strasse</label>
+                                    </div>
+                                </div>
+                            <!-- column 2 in the address row -->
+                                <div  class="col-lg-4 col-md-4 col-sm-6 col-xs-6 order-sm-1">
+                                    <div class=" form-floating mb-2">
+                                        <input   readonly class="form-control form-control-plaintext border-bottom" id="floatingFhAusweis" :value="element.adr_typ">
+                                        <label for="floatingFhAusweis">Typ</label>
+                                    </div>
+                                </div>
+                                <div  class="col-md-5 col-sm-12 col-xs-12 ">
+                                    <div class=" form-floating mb-2">
+                                        <input   readonly class="form-control form-control-plaintext border-bottom" id="floatingFhAusweis" :value="element.ort">
+                                        <label for="floatingFhAusweis">Ort</label>
+                                    </div>
+                                </div>
+                                <div  class="col-lg-3 col-md-3 col-sm-6 col-xs-6 order-sm-2">
+                                    <div class=" form-floating mb-2">
+                                        <input   readonly class="form-control form-control-plaintext border-bottom" id="floatingFhAusweis" :value="element.plz">
+                                        <label for="floatingFhAusweis">PLZ</label>
+                                    </div>
+                                </div>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                    <!-- -->
+
+
+
+                    <!-- END OF THE SECOND INFORMATION COLUMN -->
+                    </div>
+
+
+                    <!-- START OF THE SECOND PROFIL INFORMATION ROW --> 
+                  
+                    
                   <!-- ROW WITH PROFIL IMAGE AND INFORMATION END -->
                 </div  >
 
@@ -426,7 +610,7 @@ export default {
 
                 <!-- LITTLE EXTRA ROW WITH INFORMATION REFRESHING LINK -->
                 <div class="row">
-                  <div   class="col pt-4">
+                  <div   class="col ">
                     <p>Sollten Ihre Daten nicht mehr aktuell sein, klicken Sie bitte <a :href="refreshMailTo">hier</a></p>
                   </div>
                 </div>
@@ -439,12 +623,12 @@ export default {
                 <div class="row">
 
                 <!-- FIRST TABLE -->
-                  <div class="col-12" >
+                  <div class="col-12 mb-4" >
                     <core-filter-cmpt title="Funktionen"  ref="funktionenTable" :tabulator-options="funktionen_table_options"  tableOnly :sideMenu="false" />
                   </div>
 
                 <!-- SECOND TABLE -->
-                  <div class="col-12" >
+                  <div class="col-12 mb-4" >
                     <core-filter-cmpt title="Entlehnte Betriebsmittel"  ref="betriebsmittelTable" :tabulator-options="betriebsmittel_table_options" tableOnly :sideMenu="false" />
                   </div>
 
@@ -511,9 +695,21 @@ export default {
                       <div class="card-body">
                       
                         <h6 class="card-title">Sie sind Mitgglied in folgenden Verteilern:</h6>
-                        <div  class="card-text row text-break" v-for="verteiler in data?.mailverteiler">
-                          <div class="col-lg-12 col-xl-6"><a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a></div> 
-                          <div class="col-lg-12 col-xl-6">{{verteiler.beschreibung}}</div>
+                        <div  class="card-text row text-break mb-2" v-for="verteiler in data?.mailverteiler">
+                          <div class="col-12 ">
+                            <div class="row">  
+                              <div class="col-1">
+                              
+                              <i class="fa-solid fa-envelope" style="color: #00649C;"></i>
+                              
+                              </div>
+                              <div class="col-11">
+                                <a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a>
+                              </div>
+                            </div>
+                           
+                          </div> 
+                          <div class="col-12 ">{{verteiler.beschreibung}}</div>
                         </div>
 
                       </div>
diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
index 01e5fe9b5..d4b289c4e 100644
--- a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
@@ -115,36 +115,38 @@ export default {
       }
 
       return {
-        Allgemein: {
-          View:"MitarbeiterIn",
-          Username: this.data.username,
-          Anrede: this.data.anrede,
-          Titel: this.data.titel,
-          Vorname: this.data.vorname,
-          Nachname: this.data.nachname,
-          Postnomen: this.data.postnomen,
-        },
-     
-       
-        SpecialInformation:  {
-            Kurzzeichen: this.data.kurzbz,
-            Telefon: this.data.telefonklappe,
-            Büro:this.data.ort_kurzbz,
-        },
+        Username: this.data.username,
+        Anrede: this.data.anrede,
+        Titel: this.data.titel,
+        Postnomen: this.data.postnomen,
       };
     },
-    //? this computed function returns the data for the second column in the profil 
-    kontaktInfo() {
+
+    personKontakt() {
+      if (!this.data) {
+        return {};
+      }
+
+      return {
+        emails: this.data.emails,
+        
+      };
+    },
+
+    specialData() {
       if (!this.data) {
         return {};
       }
 
       return {
        
-        emails: this.data.emails,
-        
+        Kurzzeichen: this.data.kurzbz,
+        Telefon: this.data.telefonklappe,
+        Büro: this.data.ort_kurzbz,
       };
     },
+    
+    
   },
 
   mounted() {
@@ -159,21 +161,25 @@ export default {
   },
 
   template: `
+ 
 
-
-  <!-- CONTAINER -->
-  <div class="container-fluid text-break" >
+  <div class="container-fluid text-break"  >
     <!-- ROW --> 
           <div class="row">
           <!-- HIDDEN QUICK LINKS -->
               <div  class="d-md-none col-12 ">
              
-              <div style="border:4px solid;border-color:#EEEEEE;" class="row py-2">
+              <div class="row py-2">
               <div class="col">
                 <p class="m-0">
-                  <a class="border w-100 btn " data-bs-toggle="collapse" href="#collapseExample" role="button" aria-expanded="false" aria-controls="collapseExample">
-                   <u> Quick links</u>
-                  </a>
+                <div class="card">
+                
+                <a class=" w-100 btn " data-bs-toggle="collapse" href="#collapseExample" role="button" aria-expanded="false" aria-controls="collapseExample">
+                <u> Quick links</u>
+               </a>
+             
+                
+               </div>
                  
                 </p>
                 <div class="mt-1 collapse" id="collapseExample">
@@ -187,105 +193,178 @@ export default {
                 </div>
               </div>
             </div>
+
               </div>
               <!-- END OF HIDDEN QUCK LINKS -->
 
 
+              <div class="col-12">
+             
+             
+                    <div class=" form-floating mb-2">
+                      <div class="card">
+                        <div class="card-body">
+                          <span>Der FH Ausweis ist am <b>{{data.zutrittsdatum}}</b> ausgegeben worden.</span>
+                        </div>
+                      </div>
+                    </div>
+          
+              </div>
+
 
               <!-- MAIN PANNEL -->
               <div class="col-sm-12 col-md-9">
                 <!-- ROW WITH PROFIL IMAGE AND INFORMATION -->
-                <div class="row">
-                  <!-- COLUMN WITH PROFIL IMAGE -->
-                    <div class="col-md-2 col-sm-12" style="border:4px solid;border-color:lightgreen;">
-
-
-
-
-
-
-                    <!-- START OF THE FIRST ROW WITH THE PROFIL IMAGE -->
-                    <div class="row justify-content-center">
-                    <div class="col-auto ">
-                          <img class=" img-thumbnail " style=" max-height:150px"  :src="get_image_base64_src"></img>
-                        </div>
-                      </div>
-                    <!-- END OF THE ROW WITH THE IMAGE -->
-
-
-
-
-
-
-                    <!-- END OF THE COLUMN WITH PROFIL IMAGE AND LINK -->
-                    </div>
-
-
-
-                    <!-- COLUMN WITH THE PROFIL INFORMATION --> 
-                    <div class="col-md-10 col-sm-12 text-break" style="border:4px solid;border-color:lightcoral;">
+               
               
 
                     <!-- INFORMATION CONTENT START -->
                     <!-- ROW WITH THE PROFIL INFORMATION --> 
-                    <div class="row">
+                    <div class="row mb-4">
 
 
 
-                      <!-- FIRST COLUMN WITH PROFIL INFORMATION -->
-                      <div style="border:4px solid;border-color:red" class="col-lg-12 col-xl-6">
 
-                        <dl class="  mb-0"  >
 
+
+
+
+
+
+
+
+
+
+
+
+
+<!-- FIRST KAESTCHEN -->
+                      <div  class="col-lg-12 col-xl-6 ">
+                     <div class="row mb-4">
+                     <div class="col">
+                     
                         
+                      <div class="card h-100">
+                      <div class="card-header">
+                      MitarbeiterIn
+                      </div>
+                      <div class="card-body">
+                      
+                       
 
-                          <div v-for="(wert,bez) in personData.Allgemein" class="row justify-content-center">
-                          <!-- MITARBEITER TITEL -->
-                            <dt class="col-xl-10 col-12 " v-if="bez=='View'" ><b>{{wert}}</b></dt>
-                            <template v-else>
-                              <dt class="col-xl-4 col-lg-6 col-md-6 col-6  " >{{bez}}</dt>
-                              <dd class=" col-lg-8 col-xl-6 col-6 ">{{wert?wert:"-"}}</dd>
-                            </template>
+
+                  
+                  <div  class="row justify-content-center align-items-center">
+
+
+
+
+                  <!-- SQUEEZING THE IMAGE INSIDE THE FIRST INFORMATION COLUMN -->
+ <!-- START OF THE FIRST ROW WITH THE PROFIL IMAGE -->
+          <div class="col-12 col-sm-6 mb-2">
+           <div class="row justify-content-center">
+                        <div class="col-auto " style="position:relative">
+                          <img class=" img-thumbnail " style=" max-height:150px; "  :src="get_image_base64_src"></img>
+                          <!-- LOCKING IMAGE FUNCTIONALITY -->
+                          
+                          
+                          <div role="button" @click.prevent="sperre_foto_function" style="height:22px; width:21px; background-color:white; position:absolute; top:0; right:12px; display:flex; align-items:center; justify-content:center;" >
+                          <i :class="{'fa':true, ...(data.foto_sperre?{'fa-lock':true}:{'fa-lock-open':true})} " ></i>
+                          
+                          
                           </div>
+                        </div>
+                      </div>
+                    <!-- END OF THE ROW WITH THE IMAGE -->
+                    </div>
+<!-- END OF SQUEEZE -->
+
+
+
+<!-- COLUMNS WITH MULTIPLE ROWS NEXT TO PROFIL PICTURE -->
+                  <div class="col-12 col-sm-6">
+                  <div class="row">
+                  <div class="col-12">
+                  <div class=" form-floating mb-2">
                         
-                    
-                        </dl>
+                  <input  readonly class="form-control form-control-plaintext border-bottom" id="floatingInputValue"  :value="data.vorname">
+                  <label for="floatingInputValue">Vorname</label>
+                </div>
+                </div>
+                <div class="col-12">
+                <div class=" form-floating mb-2">
+                        
+                  <input  readonly class="form-control form-control-plaintext border-bottom" id="floatingInputValue"  :value="data.nachname">
+                  <label for="floatingInputValue">Nachname</label>
+                </div>
+                </div>
+                </div>
+             
+                
+                  </div>
+                  
 
 
 
-                      <!-- END OF THE FIRST INFORMATION COLUMN -->
+
+
+
+
+                  <div v-for="(wert,bez) in personData" class="col-md-6 col-sm-12 ">
+                  <div class=" form-floating mb-2">
+                        
+                  <input  readonly class="form-control form-control-plaintext border-bottom" id="floatingInputValue" placeholder="name@example.com" :value="wert?wert:'-'">
+                  <label for="floatingInputValue">{{bez}}</label>
+                  </div>
+                  </div>
+
+                  
                       </div>
 
 
-                      <!-- START OF THE SECOND PROFIL INFORMATION COLUMN -->
-                      <div style="border:4px solid;border-color:orange" class="col-xl-6 col-lg-12">
-
-
-
-
-
-
-                        <dl v-for="(wert,bezeichnung) in kontaktInfo">
-
-                        <!-- HIER SIND DIE EMAILS -->
-                    
-                    
-                          <div class="justify-content-center row mb-3" v-if="typeof wert === 'object' && bezeichnung == 'emails'">
-                              <dt class="col-lg-4 col-6  mb-0">eMail</dt>
-                              <div class="col-lg-8 col-6">
-                                  <dd v-for="email in wert" class="mb-0 ">{{email.type}}: <a style="text-decoration:none" :href="'mailto:'+email.email">{{email.email}}</a></dd>
-                              </div>
-                          </div>
                       
-                      
-                      
-                        </dl>
-
-
-
-
-                      <!-- END OF THE SECOND INFORMATION COLUMN -->
                       </div>
+                    </div>
+		    </div>
+                    </div>
+                     <div class="row mb-4">
+                     
+
+                     <div  class=" col-lg-12">
+        
+                     <div class="card">
+                 
+                         <div class="card-header">
+                         Mitarbeiter Information
+                         </div>
+                         <div class="card-body">
+                             <div class="row">
+                             <div v-for="(wert,bez) in specialData" class="col-md-6 col-sm-12 ">
+                                 <div class=" form-floating mb-2">    
+                                 <input  readonly class="form-control form-control-plaintext border-bottom" id="floatingInputValue" placeholder="name@example.com" :value="wert?wert:'-'">
+                                 <label for="floatingInputValue">{{bez}}</label>
+                                 </div>
+                             </div>
+                         </div>
+                         
+                     </div>
+                     
+                 </div>
+
+                     </div>  
+                            
+
+
+
+<!-- END OF THE FIRST KAESTCHEN -->
+                      </div>
+
+
+                      <!-- START OF SECOND PROFIL  INFORMATION COLUMN -->
+                     
+
+
+                     
 
 
               
@@ -293,21 +372,98 @@ export default {
                     <!-- INFORMATION CONTENT END -->
                     </div>
 
+                    <div  class="col-xl-6 col-lg-12 ">
+                    <div class="row mb-4">
+                    <div class="col">
 
-                    <!-- COLUMN WITH ALL PROFIL INFORMATION END -->
-                  </div>
+
+                    <div class="card ">
+                    <div class="card-header">
+                    Mails
+                    </div>
+                   
+                    <div class="card-body">
+
+
+
+                      <div v-for="(wert,bezeichnung) in personKontakt">
+
+                      
+            
+                      <!-- HIER SIND DIE EMAILS -->
+                  
+                  
+                      <div v-for="email in wert" v-if="typeof wert === 'object' && bezeichnung == 'emails'" class="row justify-content-center">
+                      <div  class="col-12 ">
+                      <div class=" form-floating mb-2">
+                            
+                      <a  :href="'mailto:'+email.email" readonly class="form-control form-control-plaintext border-bottom" id="floatingFhAusweis" >{{email.email}}</a>
+                      <label for="floatingFhAusweis">{{email.type }}</label>
+                    
+                      </div>
+                      </div>
+                          </div>
+
+                    
+                    
+                     
+
+
+
+
+                    
+                      </div>
+
+
+                    </div>
+                    </div>
+                    </div></div>
+
+                  
+
+                    <!-- HIER SIND DIE PRIVATEN ADRESSEN-->
+                    <div class="row mb-4">
+                      <div class="col">
+                                              </div>
+                    </div>
+                    <!-- -->
+
+
+
+                    <!-- END OF THE SECOND INFORMATION COLUMN -->
+                    </div>
+
+
+                    <!-- START OF THE SECOND PROFIL INFORMATION ROW --> 
+                  
+                    
                   <!-- ROW WITH PROFIL IMAGE AND INFORMATION END -->
                 </div  >
 
 
 
+                <!-- LITTLE EXTRA ROW WITH INFORMATION REFRESHING LINK -->
+                <div class="row">
+                  <div   class="col ">
+                    <p>Sollten Ihre Daten nicht mehr aktuell sein, klicken Sie bitte <a :href="refreshMailTo">hier</a></p>
+                  </div>
+                </div>
+                <!-- END OF REFRESHING LINK ROW -->
+
+
+
 
                 <!-- SECOND ROW UNDER THE PROFIL IMAGE AND INFORMATION WITH THE TABLES -->
                 <div class="row">
 
                 <!-- FIRST TABLE -->
-                  <div class="col-12" style="border: 4px solid; border-color:lightskyblue">
-                    <core-filter-cmpt title="Funktionen"  ref="funktionenTable" :tabulator-options="funktionen_table_options" tableOnly :sideMenu="false" />
+                  <div class="col-12 mb-4" >
+                    <core-filter-cmpt title="Funktionen"  ref="funktionenTable" :tabulator-options="funktionen_table_options"  tableOnly :sideMenu="false" />
+                  </div>
+
+                <!-- SECOND TABLE -->
+                  <div class="col-12 mb-4" >
+                    <core-filter-cmpt title="Entlehnte Betriebsmittel"  ref="betriebsmittelTable" :tabulator-options="betriebsmittel_table_options" tableOnly :sideMenu="false" />
                   </div>
 
                 <!-- END OF THE ROW WITH THE TABLES UNDER THE PROFIL INFORMATION -->
@@ -334,34 +490,69 @@ export default {
 
               <!-- START OF THE FIRDT ROW IN THE SIDE PANEL -->
               <!-- THESE QUCK LINKS ARE ONLY VISIBLE UNTIL VIEWPORT MD -->
-                <div style="border:4px solid;border-color:#EEEEEE;" class="row d-none d-md-block">
+                <div  class="row d-none d-md-block mb-3">
                   <div class="col">
-                    <div  class="row py-4">
-                        <a style="text-decoration:none" class="my-1" href="#">Zeitwuensche</a>
-                        <a style="text-decoration:none" class="my-1" href="#">Lehrveranstaltungen</a>
-                        <a style="text-decoration:none" class="my-1" href="#">Zeitsperren von Gschnell</a>
+                 
+                    <div class="card">
+                      <div class="card-header">
+                      Quick Links
+                      </div>
+                      <div class="card-body">
+                      
+                       
+                        <a style="text-decoration:none" class="my-1 d-block" href="#">Zeitwuensche</a>
+                        <a style="text-decoration:none" class="my-1 d-block" href="#">Lehrveranstaltungen</a>
+                        <a style="text-decoration:none" class="my-1 d-block" href="#">Zeitsperren von Gschnell</a>
+
+                      </div>
                     </div>
+
+                   
+                      
+                  
                   </div>
                 </div>
 
 
                 <!-- START OF THE SECOND ROW IN THE SIDE PANEL -->
-                <div style="border:4px solid;border-color: darkgray"  class="row">
+                <div  class="row">
                 
                   <div class="col">
                 
 
                   
                   <!-- HIER SIND DIE MAILVERTEILER -->
-                    <h5 class="fs-3" style="margin-top:1em">Mailverteilers</h5>
-                    <p >Sie sind Mitgglied in folgenden Verteilern:</p>
-                    <div  class="row text-break" v-for="verteiler in data?.mailverteiler">
-                      <div class="col-lg-12 col-xl-6"><a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a></div> 
-                      <div class="col-lg-12 col-xl-6">{{verteiler.beschreibung}}</div>
+                    <div class="card">
+                      <div class="card-header">
+                      Mailverteilers
+                      </div>
+                      <div class="card-body">
+                      
+                        <h6 class="card-title">Sie sind Mitgglied in folgenden Verteilern:</h6>
+                        <div  class="card-text row text-break mb-2" v-for="verteiler in data?.mailverteiler">
+                          <div class="col-12 ">
+                            <div class="row">  
+                              <div class="col-1">
+                              
+                              <i class="fa-solid fa-envelope" style="color: #00649C;"></i>
+                              
+                              </div>
+                              <div class="col-11">
+                                <a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a>
+                              </div>
+                            </div>
+                           
+                          </div> 
+                          <div class="col-12 ">{{verteiler.beschreibung}}</div>
+                        </div>
+
+                      </div>
                     </div>
 
 
 
+
+
                   </div>
 
                 <!-- END OF THE SECOND ROW IN THE SIDE PANEL -->
@@ -381,6 +572,7 @@ export default {
       
       <!-- END OF CONTAINER -->
   </div>
-
+            
+    
     `,
 };

From 5fbe374ea323574f11d9eaab4038989793878a39 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Mon, 18 Dec 2023 12:21:17 +0100
Subject: [PATCH 0251/1461] removes the p-4 for all screensizes from the
 cis-main and adds different padding for mobile view Cis-main in Cis.css

---
 application/views/templates/CISHTML-Header.php | 2 +-
 public/css/Cis4/Cis.css                        | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/application/views/templates/CISHTML-Header.php b/application/views/templates/CISHTML-Header.php
index 71f268112..838b242c2 100644
--- a/application/views/templates/CISHTML-Header.php
+++ b/application/views/templates/CISHTML-Header.php
@@ -62,4 +62,4 @@ if (!isset($menu)) {
 	</nav>
 </header>
 
-<main id="cis-main" class="flex-grow-1 overflow-scroll p-4">
+<main id="cis-main" class="flex-grow-1 overflow-scroll">
diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index 6e987b92c..7120d60f7 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -285,6 +285,9 @@ html {
 }
 /* mobile */
 @media (max-width: 991.98px) {
+  #cis-main{
+    padding: 0.75rem 0.75rem;
+  }
   #cis-main > :first-child {
     margin-top: var(--fhc-cis-header-height);
   }

From eb059220431af03f2daad85cb5ac6335ae2cd571 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 18 Dec 2023 12:25:16 +0100
Subject: [PATCH 0252/1461] menu width

---
 public/css/Cis4/Cis.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index 6e987b92c..35c2407a9 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -34,7 +34,7 @@ html {
 }
 @media (min-width: 992px) {
   :root {
-    --fhc-cis-menu-width: 300px;
+    --fhc-cis-menu-width: 250px;
     --fhc-cis-header-height: 60px;
     --fhc-cis-menu-bg: #72777A;
   }

From 8b06ef030af955e1f549a0a961fecd4595a7a8cb Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Mon, 18 Dec 2023 15:27:45 +0100
Subject: [PATCH 0253/1461] adds icons and some layout changes

---
 .../Cis/Profil/MitarbeiterProfil.js           | 115 +++++++++++-------
 .../Cis/Profil/MitarbeiterViewProfil.js       |  11 --
 2 files changed, 68 insertions(+), 58 deletions(-)

diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index ce6ca16f5..a64016556 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -292,22 +292,11 @@ export default {
               <!-- END OF HIDDEN QUCK LINKS -->
 
 
-              <div class="col-12">
-             
-             
-                    <div class=" form-floating mb-2">
-                      <div class="card">
-                        <div class="card-body">
-                          <span>Der FH Ausweis ist am <b>{{data.zutrittsdatum}}</b> ausgegeben worden.</span>
-                        </div>
-                      </div>
-                    </div>
-          
-              </div>
+            
 
 
               <!-- MAIN PANNEL -->
-              <div class="col-sm-12 col-md-9">
+              <div class="col-sm-12 col-md-8 col-xxl-9 ">
                 <!-- ROW WITH PROFIL IMAGE AND INFORMATION -->
                
               
@@ -381,15 +370,15 @@ export default {
                   <div class="col-12">
                   <div class=" form-floating mb-2">
                         
-                  <input  readonly class="form-control form-control-plaintext border-bottom" id="floatingInputValue"  :value="data.vorname">
-                  <label for="floatingInputValue">Vorname</label>
+                  <input  readonly class="form-control form-control-plaintext border-bottom" id="floatingVorname"  :value="data.vorname">
+                  <label for="floatingVorname">Vorname</label>
                 </div>
                 </div>
                 <div class="col-12">
                 <div class=" form-floating mb-2">
                         
-                  <input  readonly class="form-control form-control-plaintext border-bottom" id="floatingInputValue"  :value="data.nachname">
-                  <label for="floatingInputValue">Nachname</label>
+                  <input  readonly class="form-control form-control-plaintext border-bottom" id="floatingNachname"  :value="data.nachname">
+                  <label for="floatingNachname">Nachname</label>
                 </div>
                 </div>
                 </div>
@@ -407,8 +396,8 @@ export default {
                   <div v-for="(wert,bez) in personData" class="col-md-6 col-sm-12 ">
                   <div class=" form-floating mb-2">
                         
-                  <input  readonly class="form-control form-control-plaintext border-bottom" id="floatingInputValue" placeholder="name@example.com" :value="wert?wert:'-'">
-                  <label for="floatingInputValue">{{bez}}</label>
+                  <input  readonly class="form-control form-control-plaintext border-bottom" :id="'floating'+bez"  :value="wert?wert:'-'">
+                  <label :for="'floating'+bez">{{bez}}</label>
                   </div>
                   </div>
 
@@ -435,8 +424,8 @@ export default {
                              <div class="row">
                              <div v-for="(wert,bez) in specialData" class="col-md-6 col-sm-12 ">
                                  <div class=" form-floating mb-2">    
-                                 <input  readonly class="form-control form-control-plaintext border-bottom" id="floatingInputValue" placeholder="name@example.com" :value="wert?wert:'-'">
-                                 <label for="floatingInputValue">{{bez}}</label>
+                                 <input  readonly class="form-control form-control-plaintext border-bottom" :id="'floating'+bez"  :value="wert?wert:'-'">
+                                 <label :for="'floating'+bez">{{bez}}</label>
                                  </div>
                              </div>
                          </div>
@@ -487,13 +476,21 @@ export default {
                       <!-- HIER SIND DIE EMAILS -->
                   
                   
-                      <div v-for="email in wert" v-if="typeof wert === 'object' && bezeichnung == 'emails'" class="row justify-content-center">
+                      <div v-for="email in wert" v-if="typeof wert === 'object' && bezeichnung == 'emails'" class="row justify-content-center ">
                       <div  class="col-12 ">
+                     
+                            <div class="row align-items-center">
+                      <div class="col-1">
+
+                      <i class="fa-solid fa-envelope" style="color:rgb(0, 100, 156)"></i>
+
+                      </div>
+                      <div class="col">
                       <div class=" form-floating mb-2">
-                            
-                      <a  :href="'mailto:'+email.email" readonly class="form-control form-control-plaintext border-bottom" id="floatingFhAusweis" >{{email.email}}</a>
-                      <label for="floatingFhAusweis">{{email.type }}</label>
-                    
+                            <a  :href="'mailto:'+email.email" readonly class="form-control form-control-plaintext border-bottom" :id="'floating'+email.type" >{{email.email}}</a>
+                      <label :for="'floating'+email.type">{{email.type }}</label>
+                      </div>
+                      </div>
                       </div>
                       </div>
                           </div>
@@ -523,20 +520,22 @@ export default {
                           <div class="card-body text-center">
                             
                             <div v-for="element in privateKontakte" class="align-items-center row justify-content-center">
-                           
-                              <div  :class="{...(element.anmerkung? {'col-10':true, 'col-md-6':true} : {'col-10':true, 'col-xl-11':true})}">
+                              <div class="col-1">
+                              <i class="fa-solid fa-envelope" style="color:rgb(0, 100, 156)"></i>
+                              </div>
+                              <div  :class="{...(element.anmerkung? {'col-11':true, 'col-md-5':true, 'col-xl-11':true, 'col-xxl-5':true} : {'col-9':true, 'col-xl-9':true})}">
                                   <div class=" form-floating mb-2">
                                       <input  readonly class="form-control form-control-plaintext border-bottom" id="floatingKontakt" :value="element.kontakt">
                                       <label for="floatingKontakt">{{element.kontakttyp}}</label>
                                   </div>
                               </div>
-                              <div v-if="element?.anmerkung" class="col-12 col-md-4 col-lg-4 col-xl-5 order-2 order-md-1 ">
+                              <div v-if="element?.anmerkung" class="offset-1 offset-md-0 col-9 col-md-4  offset-xl-1 offset-xxl-0 col-xl-9 col-xxl-4 order-2 order-md-1 order-xl-1 order-sm-1 order-xxl-1  ">
                                   <div class=" form-floating mb-2">
                                       <input   readonly class="form-control form-control-plaintext border-bottom" id="floatingAnmerkung" :value="element.anmerkung">
                                       <label for="floatingAnmerkung">Anmerkung</label>
                                   </div>
                               </div>
-                              <div class="col-2 order-1 order-md-2 col-xl-1 allign-middle">
+                              <div class="col-2 order-2 order-sm-2 order-md-2 order-lg-1 col-xl-2 col-xxl-2 allign-middle">
                                   <i v-if="element.zustellung" class="fa-solid fa-check"></i>
                                   <i v-else="element.zustellung" class="fa-solid fa-xmark"></i>
                               </div>
@@ -557,34 +556,37 @@ export default {
                           
                             <div v-for="element in privateAdressen" class="row justify-content-center align-items-center">
                             <!-- column 1 in the address row -->
-                                <div class="col-2 col-sm-1 text-center">
+                            
+                                <div class="col-1 text-center">
                                  
                                   <i class="fa fa-location-dot fa-lg" style="color:#00649C "></i>
                                 
                                 </div>
-                                <div  class="col-10 col-sm-11 ">
+                                <div  class="col ">
                                     <div class=" form-floating mb-2">
-                                        <input   readonly class="form-control form-control-plaintext border-bottom" id="floatingFhAusweis" :value="element.strasse">
-                                        <label for="floatingFhAusweis">Strasse</label>
+                                        <input   readonly class="form-control form-control-plaintext border-bottom" id="floatingStrasse" :value="element.strasse">
+                                        <label for="floatingStrasse">Strasse</label>
                                     </div>
                                 </div>
+                                <div class="w-100 "></div>
+                                
                             <!-- column 2 in the address row -->
-                                <div  class="col-lg-4 col-md-4 col-sm-6 col-xs-6 order-sm-1">
+                                <div  class="col-11 offset-1 offset-md-0 offset-xl-1  col-xl-6 order-xl-1 col-md-3 col-sm-6 col-xs-6 order-sm-1">
                                     <div class=" form-floating mb-2">
-                                        <input   readonly class="form-control form-control-plaintext border-bottom" id="floatingFhAusweis" :value="element.adr_typ">
-                                        <label for="floatingFhAusweis">Typ</label>
+                                        <input   readonly class="form-control form-control-plaintext border-bottom" id="floatingTyp" :value="element.adr_typ">
+                                        <label for="floatingTyp">Typ</label>
                                     </div>
                                 </div>
-                                <div  class="col-md-5 col-sm-12 col-xs-12 ">
+                                <div  class="col-11 offset-1  col-xl-11 col-md-5 col-sm-11 col-xs-11 ">
                                     <div class=" form-floating mb-2">
-                                        <input   readonly class="form-control form-control-plaintext border-bottom" id="floatingFhAusweis" :value="element.ort">
-                                        <label for="floatingFhAusweis">Ort</label>
+                                        <input   readonly class="form-control form-control-plaintext border-bottom" id="floatingOrt" :value="element.ort">
+                                        <label for="floatingOrt">Ort</label>
                                     </div>
                                 </div>
-                                <div  class="col-lg-3 col-md-3 col-sm-6 col-xs-6 order-sm-2">
+                                <div  class="col-11 offset-1 offset-sm-0 offset-md-0 col-xl-5 order-xl-2 col-md-3 col-sm-5 col-xs-5 order-sm-2">
                                     <div class=" form-floating mb-2">
-                                        <input   readonly class="form-control form-control-plaintext border-bottom" id="floatingFhAusweis" :value="element.plz">
-                                        <label for="floatingFhAusweis">PLZ</label>
+                                        <input   readonly class="form-control form-control-plaintext border-bottom" id="floatingPLZ" :value="element.plz">
+                                        <label for="floatingPLZ">PLZ</label>
                                     </div>
                                 </div>
                             </div>
@@ -648,7 +650,7 @@ export default {
 
 
               <!-- START OF SIDE PANEL -->
-              <div  class="col-md-3 col-sm-12 text-break" >
+              <div  class="col-md-4 col-xxl-3 col-sm-12 text-break" >
 
 
               <!-- SRART OF QUICK LINKS IN THE SIDE PANEL -->
@@ -679,6 +681,25 @@ export default {
                   </div>
                 </div>
 
+                <div class="row mb-3" >
+                
+                
+                <div class="col-12">
+             
+             
+                
+                  <div class="card">
+                    <div class="card-body">
+                      <span>Der FH Ausweis ist am <b>{{data.zutrittsdatum}}</b> ausgegeben worden.</span>
+                    </div>
+                
+                </div>
+      
+         
+                </div>
+                
+                </div>
+
 
                 <!-- START OF THE SECOND ROW IN THE SIDE PANEL -->
                 <div  class="row">
@@ -698,18 +719,18 @@ export default {
                         <div  class="card-text row text-break mb-2" v-for="verteiler in data?.mailverteiler">
                           <div class="col-12 ">
                             <div class="row">  
-                              <div class="col-1">
+                              <div class="col-1 ">
                               
                               <i class="fa-solid fa-envelope" style="color: #00649C;"></i>
                               
                               </div>
-                              <div class="col-11">
+                              <div class="col">
                                 <a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a>
                               </div>
                             </div>
                            
                           </div> 
-                          <div class="col-12 ">{{verteiler.beschreibung}}</div>
+                          <div class="col-11 offset-1 ">{{verteiler.beschreibung}}</div>
                         </div>
 
                       </div>
diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
index d4b289c4e..88fd2caab 100644
--- a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
@@ -198,18 +198,7 @@ export default {
               <!-- END OF HIDDEN QUCK LINKS -->
 
 
-              <div class="col-12">
              
-             
-                    <div class=" form-floating mb-2">
-                      <div class="card">
-                        <div class="card-body">
-                          <span>Der FH Ausweis ist am <b>{{data.zutrittsdatum}}</b> ausgegeben worden.</span>
-                        </div>
-                      </div>
-                    </div>
-          
-              </div>
 
 
               <!-- MAIN PANNEL -->

From a3e70afdc1d9c98021c4c871d3ddbc664838f558 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Tue, 19 Dec 2023 11:01:51 +0100
Subject: [PATCH 0254/1461] adds font-size 1rem to the .tabulator class of the
 FilterComponent

---
 public/css/components/FilterComponent.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/public/css/components/FilterComponent.css b/public/css/components/FilterComponent.css
index cd0b33a48..1a6698890 100644
--- a/public/css/components/FilterComponent.css
+++ b/public/css/components/FilterComponent.css
@@ -64,3 +64,7 @@
 	margin-top: 20px;
 }
 
+.tabulator{
+	font-size:1rem;
+}
+

From 030be5b83f559337b7b2cce228f93443357ffa6e Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Tue, 19 Dec 2023 11:02:44 +0100
Subject: [PATCH 0255/1461] queryies the telefon number of the mitarbeiter with
 standort and adds tel links to all phone numbers

---
 application/controllers/Cis/Profil.php        | 43 +++++++++++++++-
 .../Cis/Profil/MitarbeiterProfil.js           | 51 +++++++++++++------
 2 files changed, 77 insertions(+), 17 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index a5640d916..d2618274d 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -128,6 +128,21 @@ class Profil extends Auth_Controller
 			}
 		}
 
+		//? querying the telefon number of the office
+		if(isSuccess($this->MitarbeiterModel->addSelect(["mitarbeiter_uid"])) &&
+			isSuccess($this->MitarbeiterModel->addJoin("tbl_kontakt", "tbl_mitarbeiter.standort_id = tbl_kontakt.standort_id"))
+			
+			
+		){
+			$this->MitarbeiterModel->addLimit(1);
+			$telefon_res = $this->MitarbeiterModel->loadWhere(["mitarbeiter_uid"=>$this->uid, "kontakttyp"=>"telefon"]);
+			if(isError($telefon_res)){
+				// error handling
+			}else{
+				$telefon_res = hasData($telefon_res)? getData($telefon_res)[0] : null;
+			}
+		}
+
 		
 		$res = new stdClass();
 		$res->username = $uid;
@@ -163,6 +178,8 @@ class Profil extends Auth_Controller
 	
 		//? Mailverteiler Info
 		$res->mailverteiler = $mailverteiler_res;
+
+		$res->standort_telefon = $telefon_res;
 		 
 		return $res;
 
@@ -301,6 +318,9 @@ class Profil extends Auth_Controller
 				
 			}
 
+
+			//$this->MitarbeiterModel->load($this->uid);
+
 			//? FH Ausweis Austellungsdatum soll auch nur der user selbst sehen
 			$zutrittskarte_ausgegebenam = $this->BetriebsmittelpersonModel->getBetriebsmittelByUid($this->uid,"Zutrittskarte");
 			if(isError($zutrittskarte_ausgegebenam)){
@@ -378,10 +398,28 @@ class Profil extends Auth_Controller
 		}
 	
 	
+		//? querying the telefon number of the office
+		if(isSuccess($this->MitarbeiterModel->addSelect(["mitarbeiter_uid"])) &&
+			isSuccess($this->MitarbeiterModel->addJoin("tbl_kontakt", "tbl_mitarbeiter.standort_id = tbl_kontakt.standort_id"))
+			
+			
+		){
+			$this->MitarbeiterModel->addLimit(1);
+			$telefon_res = $this->MitarbeiterModel->loadWhere(["mitarbeiter_uid"=>$this->uid, "kontakttyp"=>"telefon"]);
+			if(isError($telefon_res)){
+				// error handling
+			}else{
+				$telefon_res = hasData($telefon_res)? getData($telefon_res)[0] : null;
+			}
+		}
+			
+			
+			
 		
 	
-		if(isSuccess($this->MitarbeiterModel->addSelect(["kurzbz","telefonklappe", "alias","ort_kurzbz"]))
+		if(isSuccess($this->MitarbeiterModel->addSelect(["kurzbz","tbl_mitarbeiter.telefonklappe", "alias","ort_kurzbz"]))
 			&& isSuccess($this->MitarbeiterModel->addJoin("tbl_benutzer", "tbl_benutzer.uid = tbl_mitarbeiter.mitarbeiter_uid"))
+			
 		){
 			$mitarbeiter_res = $this->MitarbeiterModel->load($this->uid);
 				if(isError($mitarbeiter_res)){
@@ -426,6 +464,9 @@ class Profil extends Auth_Controller
 			$res->emails = array($intern_email,$extern_email);
 			
 			$res->funktionen = $benutzer_funktion_res;
+
+			//telefon nummer von dem Standort
+			$res->standort_telefon = $telefon_res;
 			return $res;
 	}
 	
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index a64016556..6a858bb32 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -173,6 +173,14 @@ export default {
       }
       return "data:image/jpeg;base64," + this.data.foto;
     },
+
+    get_mitarbeiter_standort_telefon(){
+      if(this.data.standort_telefon){
+        return "tel:"+ this.data.telefonklappe + this.data.standort_telefon;
+      }else{
+        return null;
+      }
+    },
     //? this computed function returns all the informations for the first column in the profil
     personData() {
       if (!this.data) {
@@ -207,7 +215,7 @@ export default {
         Geburtsdatum: this.data.gebdatum,
         Geburtsort: this.data.gebort,
         Kurzzeichen: this.data.kurzbz,
-        Telefon: this.data.telefonklappe,
+        Telefon: this.data.telefonklappe + (this.data.standort_telefon?this.data.standort_telefon:""),
         Büro: this.data.ort_kurzbz,
       };
     },
@@ -253,6 +261,8 @@ export default {
     this.$refs.funktionenTable.tabulator.on("tableBuilt", () => {
       this.$refs.funktionenTable.tabulator.setData(this.data.funktionen);
     });
+
+   
   },
 
   template: ` 
@@ -423,8 +433,14 @@ export default {
                          <div class="card-body">
                              <div class="row">
                              <div v-for="(wert,bez) in specialData" class="col-md-6 col-sm-12 ">
-                                 <div class=" form-floating mb-2">    
-                                 <input  readonly class="form-control form-control-plaintext border-bottom" :id="'floating'+bez"  :value="wert?wert:'-'">
+                             
+                            
+                             <div  class=" form-floating mb-2">  
+                              <!-- print Telefon link -->
+                                 <a v-if="bez=='Telefon'" :href="get_mitarbeiter_standort_telefon"  readonly class="form-control form-control-plaintext border-bottom" :id="'floating'+bez"  >{{wert?wert:''}}</a>  
+                                 
+                              <!-- otherwise print input field -->
+                                 <input v-else  readonly class="form-control form-control-plaintext border-bottom" :id="'floating'+bez"  :value="wert?wert:'-'">
                                  <label :for="'floating'+bez">{{bez}}</label>
                                  </div>
                              </div>
@@ -480,7 +496,7 @@ export default {
                       <div  class="col-12 ">
                      
                             <div class="row align-items-center">
-                      <div class="col-1">
+                      <div class="col-1 text-center">
 
                       <i class="fa-solid fa-envelope" style="color:rgb(0, 100, 156)"></i>
 
@@ -517,17 +533,26 @@ export default {
                           <div class="card-header">
                             Private Kontakte
                           </div>
-                          <div class="card-body text-center">
+                          <div class="card-body ">
                             
                             <div v-for="element in privateKontakte" class="align-items-center row justify-content-center">
-                              <div class="col-1">
-                              <i class="fa-solid fa-envelope" style="color:rgb(0, 100, 156)"></i>
+                              <div class="col-1 text-center" >
+                              
+                              <i class="fa-solid " :class="{...(element.kontakt.includes('@')?{'fa-envelope':true}:{'fa-phone':true})}" style="color:rgb(0, 100, 156)"></i>
                               </div>
                               <div  :class="{...(element.anmerkung? {'col-11':true, 'col-md-5':true, 'col-xl-11':true, 'col-xxl-5':true} : {'col-9':true, 'col-xl-9':true})}">
-                                  <div class=" form-floating mb-2">
-                                      <input  readonly class="form-control form-control-plaintext border-bottom" id="floatingKontakt" :value="element.kontakt">
+                                  
+                                  <!-- rendering KONTAKT emails -->
+                                  <div v-if="element.kontakt.includes('@')" class=" form-floating mb-2">
+                                      <a :href="'mailto:'+element.kontakt" readonly class="form-control form-control-plaintext border-bottom" id="floatingKontakt" >{{element.kontakt}}</a>
                                       <label for="floatingKontakt">{{element.kontakttyp}}</label>
                                   </div>
+                                  <!-- rendering KONTAKT phones -->
+                                  <div v-else class=" form-floating mb-2">
+                                      <a :href="'tel:'+element.kontakt" readonly class="form-control form-control-plaintext border-bottom" id="floatingKontakt" >{{element.kontakt}}</a>
+                                      <label for="floatingKontakt">{{element.kontakttyp}}</label>
+                                  </div>
+
                               </div>
                               <div v-if="element?.anmerkung" class="offset-1 offset-md-0 col-9 col-md-4  offset-xl-1 offset-xxl-0 col-xl-9 col-xxl-4 order-2 order-md-1 order-xl-1 order-sm-1 order-xxl-1  ">
                                   <div class=" form-floating mb-2">
@@ -610,13 +635,7 @@ export default {
 
 
 
-                <!-- LITTLE EXTRA ROW WITH INFORMATION REFRESHING LINK -->
-                <div class="row">
-                  <div   class="col ">
-                    <p>Sollten Ihre Daten nicht mehr aktuell sein, klicken Sie bitte <a :href="refreshMailTo">hier</a></p>
-                  </div>
-                </div>
-                <!-- END OF REFRESHING LINK ROW -->
+                
 
 
 

From c08171536c2a93762ea8da5acad87645ea312ae6 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Tue, 19 Dec 2023 15:34:28 +0100
Subject: [PATCH 0256/1461] changes the tel and mailto links of all profil
 views

---
 application/controllers/Cis/Profil.php        |   6 +-
 .../Cis/Profil/MitarbeiterProfil.js           |  36 +-
 .../Cis/Profil/MitarbeiterViewProfil.js       | 249 +++---
 .../js/components/Cis/Profil/StudentProfil.js | 757 ++++++++++++------
 .../Cis/Profil/StudentViewProfil.js           | 446 +++++++----
 5 files changed, 978 insertions(+), 516 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index d2618274d..b17022e6e 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -129,13 +129,13 @@ class Profil extends Auth_Controller
 		}
 
 		//? querying the telefon number of the office
-		if(isSuccess($this->MitarbeiterModel->addSelect(["mitarbeiter_uid"])) &&
+		if(isSuccess($this->MitarbeiterModel->addSelect(["kontakt"])) &&
 			isSuccess($this->MitarbeiterModel->addJoin("tbl_kontakt", "tbl_mitarbeiter.standort_id = tbl_kontakt.standort_id"))
 			
 			
 		){
 			$this->MitarbeiterModel->addLimit(1);
-			$telefon_res = $this->MitarbeiterModel->loadWhere(["mitarbeiter_uid"=>$this->uid, "kontakttyp"=>"telefon"]);
+			$telefon_res = $this->MitarbeiterModel->loadWhere(["mitarbeiter_uid"=>$uid, "kontakttyp"=>"telefon"]);
 			if(isError($telefon_res)){
 				// error handling
 			}else{
@@ -179,7 +179,7 @@ class Profil extends Auth_Controller
 		//? Mailverteiler Info
 		$res->mailverteiler = $mailverteiler_res;
 
-		$res->standort_telefon = $telefon_res;
+		$res->standort_telefon = $telefon_res->kontakt;
 		 
 		return $res;
 
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 6a858bb32..d0ecebc13 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -163,6 +163,7 @@ export default {
   },
 
   computed: {
+    //? legacy mailto link to create an email with information that should be changed
     refreshMailTo() {
       return `mailto:info.mio@technikum-wien.at?subject=Datenkorrektur&body=Die%20Profildaten%20für%20User%20'${this.data.username}'%20sind%20nicht%20korrekt.%0DHier, die richtigen Daten:%0A%0ANachname:%20${this.data.nachname}%0AVorname:%20${this.data.vorname}%0AGeburtsdatum:${this.data.gebdatum}%0AGeburtsort:%20${this.data.gebort}%0ATitelPre:${this.data.titel}%20%0ATitelPost:${this.data.postnomen}%20%0A%0A***%0DPlatz für weitere (nicht angeführte Daten)%0D***%0A%0A[Bitte%20übermitteln%20Sie%20uns%20etwaige%20Dokumente%20zum%20Beleg%20der%20Änderung]`;
     },
@@ -190,7 +191,7 @@ export default {
       return {
         Username: this.data.username,
         Anrede: this.data.anrede,
-        Titel: this.data.titel,
+        Titel: this.data.titelpre,
         Postnomen: this.data.postnomen,
       };
     },
@@ -437,8 +438,11 @@ export default {
                             
                              <div  class=" form-floating mb-2">  
                               <!-- print Telefon link -->
-                                 <a v-if="bez=='Telefon'" :href="get_mitarbeiter_standort_telefon"  readonly class="form-control form-control-plaintext border-bottom" :id="'floating'+bez"  >{{wert?wert:''}}</a>  
-                                 
+                               
+                                <a v-if="bez=='Telefon'" :href="get_mitarbeiter_standort_telefon" readonly class="form-control form-control-plaintext border-bottom" :id="'floating'+bez">
+                                  <input :role="get_mitarbeiter_standort_telefon?'button':''" readonly :value="wert?wert:'-'" class="w-100" style="border:none; outline:none;" />
+                                </a>
+
                               <!-- otherwise print input field -->
                                  <input v-else  readonly class="form-control form-control-plaintext border-bottom" :id="'floating'+bez"  :value="wert?wert:'-'">
                                  <label :for="'floating'+bez">{{bez}}</label>
@@ -503,8 +507,10 @@ export default {
                       </div>
                       <div class="col">
                       <div class=" form-floating mb-2">
-                            <a  :href="'mailto:'+email.email" readonly class="form-control form-control-plaintext border-bottom" :id="'floating'+email.type" >{{email.email}}</a>
-                      <label :for="'floating'+email.type">{{email.type }}</label>
+                            <a :href="'mailto:'+email.email" readonly class="form-control form-control-plaintext border-bottom" :id="'floating'+email.type">
+                              <input role="button" readonly :value="email.email" class="w-100" style="border:none; outline:none;" />
+                            </a>
+                            <label :for="'floating'+email.type">{{email.type }}</label>
                       </div>
                       </div>
                       </div>
@@ -544,13 +550,25 @@ export default {
                                   
                                   <!-- rendering KONTAKT emails -->
                                   <div v-if="element.kontakt.includes('@')" class=" form-floating mb-2">
-                                      <a :href="'mailto:'+element.kontakt" readonly class="form-control form-control-plaintext border-bottom" id="floatingKontakt" >{{element.kontakt}}</a>
-                                      <label for="floatingKontakt">{{element.kontakttyp}}</label>
+
+
+                                      <a :href="'mailto:'+element.kontakt" readonly class="form-control form-control-plaintext border-bottom" :id="'floating'+element.kontakttyp">
+                                        <input role="button" readonly :value="element.kontakt" class="w-100" style="border:none; outline:none;" />
+                                      </a>
+                                      <label :for="'floating'+element.kontakttyp">{{element.kontakttyp}}</label>
+
+                                     
                                   </div>
                                   <!-- rendering KONTAKT phones -->
                                   <div v-else class=" form-floating mb-2">
-                                      <a :href="'tel:'+element.kontakt" readonly class="form-control form-control-plaintext border-bottom" id="floatingKontakt" >{{element.kontakt}}</a>
-                                      <label for="floatingKontakt">{{element.kontakttyp}}</label>
+
+
+                                      <a :href="'tel:'+element.kontakt" readonly class="form-control form-control-plaintext border-bottom" :id="'floating'+element.kontakttyp">
+                                        <input role="button" readonly :value="element.kontakt" class="w-100" style="border:none; outline:none;" />
+                                      </a>
+                                      <label :for="'floating'+element.kontakttyp">{{element.kontakttyp}}</label>
+
+                                     
                                   </div>
 
                               </div>
diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
index 88fd2caab..1e92108dd 100644
--- a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
@@ -1,24 +1,21 @@
 import fhcapifactory from "../../../apps/api/fhcapifactory.js";
 import { CoreFilterCmpt } from "../../../components/filter/Filter.js";
 
-
 export default {
   components: {
     CoreFilterCmpt,
   },
   data() {
     return {
-      collapseIconFunktionen:true,
-
+      collapseIconFunktionen: true,
+     
       funktionen_table_options: {
-        height: 400,
-        layout:"fitColumns",
-        responsiveLayout:"collapse",
-        responsiveLayoutCollapseUseFormatters:false,
-        responsiveLayoutCollapseFormatter:Vue.$collapseFormatter,
-        
+        height: 300,
+        layout: "fitColumns",
+        responsiveLayout: "collapse",
+        responsiveLayoutCollapseUseFormatters: false,
+        responsiveLayoutCollapseFormatter: Vue.$collapseFormatter,
         data: [
-          
           {
             Bezeichnung: "",
             Organisationseinheit: "",
@@ -28,87 +25,116 @@ export default {
           },
         ],
         columns: [
-         
-         {
-          title: "<i id='collapseIconFunktionen' role='button' class='fa-solid fa-angle-down  '></i>",
-          field: "collapse",
-          headerSort: false,
-          headerFilter:false,
-          formatter:"responsiveCollapse",
-          maxWidth:40,
-          headerClick:this.collapseFunction,
-        }, 
-          { title: "Bezeichnung", field: "Bezeichnung", headerFilter: true,minWidth:200, },
+          //? option when wanting to hide the collapsed list
+
+          {
+            title:
+              "<i id='collapseIconFunktionen' role='button' class='fa-solid fa-angle-down  '></i>",
+            field: "collapse",
+            headerSort: false,
+            headerFilter: false,
+            formatter: "responsiveCollapse",
+            maxWidth: 40,
+            headerClick: this.collapseFunction,
+          },
+          {
+            title: "Bezeichnung",
+            field: "Bezeichnung",
+            headerFilter: true,
+            minWidth: 200,
+          },
           {
             title: "Organisationseinheit",
             field: "Organisationseinheit",
-            headerFilter: true,minWidth:200,
+            headerFilter: true,
+            minWidth: 200,
+          },
+          {
+            title: "Gültig_von",
+            field: "Gültig_von",
+            headerFilter: true,
+            resizable: true,
+            minWidth: 200,
+          },
+          {
+            title: "Gültig_bis",
+            field: "Gültig_bis",
+            headerFilter: true,
+            resizable: true,
+            minWidth: 200,
           },
-          { title: "Gültig_von", field: "Gültig_von", headerFilter: true, resizable:true,minWidth:200, },
-          { title: "Gültig_bis", field: "Gültig_bis", headerFilter: true, resizable:true,minWidth:200, },
           {
             title: "Wochenstunden",
             field: "Wochenstunden",
             headerFilter: true,
-            minWidth:200,
+            minWidth: 200,
           },
-          
         ],
       },
-    
-   
+     
     };
   },
+
   //? this is the prop passed to the dynamic component with the custom data of the view
   props: ["data"],
   methods: {
-   
-    sperre_foto_function(value) {
-      if (!this.data) {
-        return;
-      }
-      fhcapifactory.UserData.sperre_foto_function(value).then((res) => {
-        this.data.foto_sperre = res.data.foto_sperre;
-      });
-    },
-    collapseFunction (e, column){
-
+    
+    collapseFunction(e, column) {
       //* the if of the column has to match with the name of the responsive data in the vue component
       this[e.target.id] = !this[e.target.id];
 
       //* gets all event icons of the different rows to use the onClick event later
-      let allClickableIcons = column._column.cells.map(row => {
+      let allClickableIcons = column._column.cells.map((row) => {
         return row.element.children[0];
       });
-      
+
       //* changes the icon that shows or hides all the collapsed columns
       //* if the replace function does not find the class to replace, it just simply returns false
-      if(this[e.target.id]){
-        e.target.classList.replace("fa-angle-up","fa-angle-down");
-      }else{
-        e.target.classList.replace("fa-angle-down","fa-angle-up");
+      if (this[e.target.id]) {
+        e.target.classList.replace("fa-angle-up", "fa-angle-down");
+      } else {
+        e.target.classList.replace("fa-angle-down", "fa-angle-up");
       }
-      
+
       //* changes the icon for every collapsed column to open or closed
-        if(this[e.target.id]){
-          allClickableIcons.filter(column => {
+      if (this[e.target.id]) {
+        allClickableIcons
+          .filter((column) => {
             return !column.classList.contains("open");
-          }).forEach(col => {col.click();})
-        }else{
-          allClickableIcons.filter(column => {
+          })
+          .forEach((col) => {
+            col.click();
+          });
+      } else {
+        allClickableIcons
+          .filter((column) => {
             return column.classList.contains("open");
-          }).forEach(col => {col.click();})
-        }
-  },
+          })
+          .forEach((col) => {
+            col.click();
+          });
+      }
+    },
   },
+
   computed: {
+    
+
     get_image_base64_src() {
       if (!this.data) {
         return "";
       }
       return "data:image/jpeg;base64," + this.data.foto;
     },
-    //? this computed function returns all the informations for the first column in the profil 
+
+    get_mitarbeiter_standort_telefon(){
+      if(this.data.standort_telefon){
+        return "tel:"+ this.data.telefonklappe + this.data.standort_telefon;
+      }else{
+        return null;
+      }
+    },
+    //? this computed function returns all the informations for the first column in the profil
     personData() {
       if (!this.data) {
         return {};
@@ -117,7 +143,7 @@ export default {
       return {
         Username: this.data.username,
         Anrede: this.data.anrede,
-        Titel: this.data.titel,
+        Titel: this.data.titelpre,
         Postnomen: this.data.postnomen,
       };
     },
@@ -139,29 +165,27 @@ export default {
       }
 
       return {
-       
+        
         Kurzzeichen: this.data.kurzbz,
-        Telefon: this.data.telefonklappe,
+        Telefon: this.data.telefonklappe + (this.data.standort_telefon?this.data.standort_telefon:""),
         Büro: this.data.ort_kurzbz,
       };
     },
-    
-    
+
+  
   },
 
   mounted() {
+  
 
+    this.$refs.funktionenTable.tabulator.on("tableBuilt", () => {
+      this.$refs.funktionenTable.tabulator.setData(this.data.funktionen);
+    });
 
-    this.$refs.funktionenTable.tabulator.on('tableBuilt', () => {
-    
-        this.$refs.funktionenTable.tabulator.setData(this.data.funktionen);
-        
-    }) 
-
+   
   },
 
-  template: `
- 
+  template: ` 
 
   <div class="container-fluid text-break"  >
     <!-- ROW --> 
@@ -198,11 +222,11 @@ export default {
               <!-- END OF HIDDEN QUCK LINKS -->
 
 
-             
+            
 
 
               <!-- MAIN PANNEL -->
-              <div class="col-sm-12 col-md-9">
+              <div class="col-sm-12 col-md-8 col-xxl-9 ">
                 <!-- ROW WITH PROFIL IMAGE AND INFORMATION -->
                
               
@@ -254,14 +278,7 @@ export default {
            <div class="row justify-content-center">
                         <div class="col-auto " style="position:relative">
                           <img class=" img-thumbnail " style=" max-height:150px; "  :src="get_image_base64_src"></img>
-                          <!-- LOCKING IMAGE FUNCTIONALITY -->
-                          
-                          
-                          <div role="button" @click.prevent="sperre_foto_function" style="height:22px; width:21px; background-color:white; position:absolute; top:0; right:12px; display:flex; align-items:center; justify-content:center;" >
-                          <i :class="{'fa':true, ...(data.foto_sperre?{'fa-lock':true}:{'fa-lock-open':true})} " ></i>
-                          
-                          
-                          </div>
+                         
                         </div>
                       </div>
                     <!-- END OF THE ROW WITH THE IMAGE -->
@@ -276,15 +293,15 @@ export default {
                   <div class="col-12">
                   <div class=" form-floating mb-2">
                         
-                  <input  readonly class="form-control form-control-plaintext border-bottom" id="floatingInputValue"  :value="data.vorname">
-                  <label for="floatingInputValue">Vorname</label>
+                  <input  readonly class="form-control form-control-plaintext border-bottom" id="floatingVorname"  :value="data.vorname">
+                  <label for="floatingVorname">Vorname</label>
                 </div>
                 </div>
                 <div class="col-12">
                 <div class=" form-floating mb-2">
                         
-                  <input  readonly class="form-control form-control-plaintext border-bottom" id="floatingInputValue"  :value="data.nachname">
-                  <label for="floatingInputValue">Nachname</label>
+                  <input  readonly class="form-control form-control-plaintext border-bottom" id="floatingNachname"  :value="data.nachname">
+                  <label for="floatingNachname">Nachname</label>
                 </div>
                 </div>
                 </div>
@@ -302,8 +319,8 @@ export default {
                   <div v-for="(wert,bez) in personData" class="col-md-6 col-sm-12 ">
                   <div class=" form-floating mb-2">
                         
-                  <input  readonly class="form-control form-control-plaintext border-bottom" id="floatingInputValue" placeholder="name@example.com" :value="wert?wert:'-'">
-                  <label for="floatingInputValue">{{bez}}</label>
+                  <input  readonly class="form-control form-control-plaintext border-bottom" :id="'floating'+bez"  :value="wert?wert:'-'">
+                  <label :for="'floating'+bez">{{bez}}</label>
                   </div>
                   </div>
 
@@ -329,9 +346,16 @@ export default {
                          <div class="card-body">
                              <div class="row">
                              <div v-for="(wert,bez) in specialData" class="col-md-6 col-sm-12 ">
-                                 <div class=" form-floating mb-2">    
-                                 <input  readonly class="form-control form-control-plaintext border-bottom" id="floatingInputValue" placeholder="name@example.com" :value="wert?wert:'-'">
-                                 <label for="floatingInputValue">{{bez}}</label>
+                             
+                            
+                             <div  class=" form-floating mb-2">  
+                              <!-- print Telefon link -->
+                                <a v-if="bez=='Telefon'" :href="get_mitarbeiter_standort_telefon" readonly class="form-control form-control-plaintext border-bottom" :id="'floating'+bez">
+                                  <input :role="get_mitarbeiter_standort_telefon?'button':''" readonly :value="wert?wert:'-'" class="w-100" style="border:none; outline:none;" />
+                                </a>
+                              <!-- otherwise print input field -->
+                                 <input v-else  readonly class="form-control form-control-plaintext border-bottom" :id="'floating'+bez"  :value="wert?wert:'-'">
+                                 <label :for="'floating'+bez">{{bez}}</label>
                                  </div>
                              </div>
                          </div>
@@ -382,13 +406,24 @@ export default {
                       <!-- HIER SIND DIE EMAILS -->
                   
                   
-                      <div v-for="email in wert" v-if="typeof wert === 'object' && bezeichnung == 'emails'" class="row justify-content-center">
+                      <div v-for="email in wert" v-if="typeof wert === 'object' && bezeichnung == 'emails'" class="row justify-content-center ">
                       <div  class="col-12 ">
+                     
+                            <div class="row align-items-center">
+                      <div class="col-1 text-center">
+
+                      <i class="fa-solid fa-envelope" style="color:rgb(0, 100, 156)"></i>
+
+                      </div>
+                      <div class="col">
                       <div class=" form-floating mb-2">
                             
-                      <a  :href="'mailto:'+email.email" readonly class="form-control form-control-plaintext border-bottom" id="floatingFhAusweis" >{{email.email}}</a>
-                      <label for="floatingFhAusweis">{{email.type }}</label>
-                    
+                      <a :href="'mailto:'+email.email" readonly class="form-control form-control-plaintext border-bottom" :id="'floating'+email.type">
+                              <input role="button" readonly :value="email.email" class="w-100" style="border:none; outline:none;" />
+                            </a>
+                            <label :for="'floating'+email.type">{{email.type }}</label>
+                      </div>
+                      </div>
                       </div>
                       </div>
                           </div>
@@ -408,14 +443,6 @@ export default {
                     </div>
                     </div></div>
 
-                  
-
-                    <!-- HIER SIND DIE PRIVATEN ADRESSEN-->
-                    <div class="row mb-4">
-                      <div class="col">
-                                              </div>
-                    </div>
-                    <!-- -->
 
 
 
@@ -431,13 +458,7 @@ export default {
 
 
 
-                <!-- LITTLE EXTRA ROW WITH INFORMATION REFRESHING LINK -->
-                <div class="row">
-                  <div   class="col ">
-                    <p>Sollten Ihre Daten nicht mehr aktuell sein, klicken Sie bitte <a :href="refreshMailTo">hier</a></p>
-                  </div>
-                </div>
-                <!-- END OF REFRESHING LINK ROW -->
+                
 
 
 
@@ -450,10 +471,7 @@ export default {
                     <core-filter-cmpt title="Funktionen"  ref="funktionenTable" :tabulator-options="funktionen_table_options"  tableOnly :sideMenu="false" />
                   </div>
 
-                <!-- SECOND TABLE -->
-                  <div class="col-12 mb-4" >
-                    <core-filter-cmpt title="Entlehnte Betriebsmittel"  ref="betriebsmittelTable" :tabulator-options="betriebsmittel_table_options" tableOnly :sideMenu="false" />
-                  </div>
+               
 
                 <!-- END OF THE ROW WITH THE TABLES UNDER THE PROFIL INFORMATION -->
                 </div>
@@ -471,7 +489,7 @@ export default {
 
 
               <!-- START OF SIDE PANEL -->
-              <div  class="col-md-3 col-sm-12 text-break" >
+              <div  class="col-md-4 col-xxl-3 col-sm-12 text-break" >
 
 
               <!-- SRART OF QUICK LINKS IN THE SIDE PANEL -->
@@ -502,6 +520,8 @@ export default {
                   </div>
                 </div>
 
+              
+
 
                 <!-- START OF THE SECOND ROW IN THE SIDE PANEL -->
                 <div  class="row">
@@ -521,18 +541,18 @@ export default {
                         <div  class="card-text row text-break mb-2" v-for="verteiler in data?.mailverteiler">
                           <div class="col-12 ">
                             <div class="row">  
-                              <div class="col-1">
+                              <div class="col-1 ">
                               
                               <i class="fa-solid fa-envelope" style="color: #00649C;"></i>
                               
                               </div>
-                              <div class="col-11">
+                              <div class="col">
                                 <a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a>
                               </div>
                             </div>
                            
                           </div> 
-                          <div class="col-12 ">{{verteiler.beschreibung}}</div>
+                          <div class="col-11 offset-1 ">{{verteiler.beschreibung}}</div>
                         </div>
 
                       </div>
@@ -562,6 +582,5 @@ export default {
       <!-- END OF CONTAINER -->
   </div>
             
-    
     `,
 };
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index 42cf4f2da..850d4da68 100644
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -1,182 +1,221 @@
 import fhcapifactory from "../../../apps/api/fhcapifactory.js";
 import { CoreFilterCmpt } from "../../../components/filter/Filter.js";
 
-
 export default {
   components: {
     CoreFilterCmpt,
   },
   data() {
     return {
-     
-
-      collapseIconBetriebsmittel:true,
+      
+      collapseIconBetriebsmittel: true,
+      zutrittsgruppen_table_options: {
+        height: 200,
+        layout: "fitColumns",
+        data: [{ bezeichnung: "" }],
+        columns: [{ title: "Zutritt", field: "bezeichnung" }],
+      },
       betriebsmittel_table_options: {
         height: 300,
         layout: "fitColumns",
-        responsiveLayout:"collapse",
-        responsiveLayoutCollapseUseFormatters:false,
-        responsiveLayoutCollapseFormatter:Vue.$collapseFormatter,
+        responsiveLayout: "collapse",
+        responsiveLayoutCollapseUseFormatters: false,
+        responsiveLayoutCollapseFormatter: Vue.$collapseFormatter,
         data: [{ betriebsmittel: "", Nummer: "", Ausgegeben_am: "" }],
         columns: [
           {
-            title: "<i id='collapseIconBetriebsmittel' role='button' class='fa-solid fa-angle-down  '></i>",
+            title:
+              "<i id='collapseIconBetriebsmittel' role='button' class='fa-solid fa-angle-down  '></i>",
             field: "collapse",
             headerSort: false,
-            headerFilter:false,
-            formatter:"responsiveCollapse",
-            maxWidth:40,
-            headerClick:this.collapseFunction,
-          }, 
+            headerFilter: false,
+            formatter: "responsiveCollapse",
+            maxWidth: 40,
+            headerClick: this.collapseFunction,
+          },
           {
             title: "Betriebsmittel",
             field: "betriebsmittel",
-            headerFilter: true, minWidth:200,
+            headerFilter: true,
+            minWidth: 200,
+          },
+          {
+            title: "Nummer",
+            field: "Nummer",
+            headerFilter: true,
+            resizable: true,
+            minWidth: 200,
           },
-          { title: "Nummer", field: "Nummer", headerFilter: true, resizable:true, minWidth:200, },
           {
             title: "Ausgegeben_am",
             field: "Ausgegeben_am",
             headerFilter: true,
-            minWidth:200,
+            minWidth: 200,
           },
         ],
       },
-     
-      zutrittsgruppen_table_options: {
-        height: 200,
-        layout: "fitColumns",
-        data: [{ bezeichnung: "test1" }],
-        columns: [{ title: "Zutritt", field: "bezeichnung" }],
-      },
     };
   },
 
   //? this is the prop passed to the dynamic component with the custom data of the view
   props: ["data"],
   methods: {
-    sperre_foto_function(value) {
+    sperre_foto_function() {
       if (!this.data) {
         return;
       }
-      fhcapifactory.UserData.sperre_foto_function(value).then((res) => {
+      fhcapifactory.UserData.sperre_foto_function(!this.data.foto_sperre).then((res) => {
         this.data.foto_sperre = res.data.foto_sperre;
       });
     },
-    collapseFunction (e, column){
-
+    collapseFunction(e, column) {
       //* the if of the column has to match with the name of the responsive data in the vue component
       this[e.target.id] = !this[e.target.id];
 
       //* gets all event icons of the different rows to use the onClick event later
-      let allClickableIcons = column._column.cells.map(row => {
+      let allClickableIcons = column._column.cells.map((row) => {
         return row.element.children[0];
       });
-      
+
       //* changes the icon that shows or hides all the collapsed columns
       //* if the replace function does not find the class to replace, it just simply returns false
-      if(this[e.target.id]){
-        e.target.classList.replace("fa-angle-up","fa-angle-down");
-      }else{
-        e.target.classList.replace("fa-angle-down","fa-angle-up");
+      if (this[e.target.id]) {
+        e.target.classList.replace("fa-angle-up", "fa-angle-down");
+      } else {
+        e.target.classList.replace("fa-angle-down", "fa-angle-up");
       }
-      
+
       //* changes the icon for every collapsed column to open or closed
-        if(this[e.target.id]){
-          allClickableIcons.filter(column => {
+      if (this[e.target.id]) {
+        allClickableIcons
+          .filter((column) => {
             return !column.classList.contains("open");
-          }).forEach(col => {col.click();})
-        }else{
-          allClickableIcons.filter(column => {
+          })
+          .forEach((col) => {
+            col.click();
+          });
+      } else {
+        allClickableIcons
+          .filter((column) => {
             return column.classList.contains("open");
-          }).forEach(col => {col.click();})
-        }
-  },
-  },
-  computed: {
-    refreshMailTo() {
-      return `mailto:info.mio@technikum-wien.at?subject=Datenkorrektur&body=Die%20Profildaten%20für%20User%20'${this.data.username}'%20sind%20nicht%20korrekt.%0DHier, die richtigen Daten:%0A%0ANachname:%20${this.data.nachname}%0AVorname:%20${this.data.vorname}%0AGeburtsdatum:${this.data.gebdatum}%0AGeburtsort:%20${this.data.gebort}%0ATitelPre:${this.data.titel}%20%0ATitelPost:${this.data.postnomen}%20%0A%0A***%0DPlatz für weitere (nicht angeführte Daten)%0D***%0A%0A[Bitte%20übermitteln%20Sie%20uns%20etwaige%20Dokumente%20zum%20Beleg%20der%20Änderung]`
+          })
+          .forEach((col) => {
+            col.click();
+          });
+      }
     },
+  },
+
+  computed: {
+ 
+
     get_image_base64_src() {
       if (!this.data) {
         return "";
       }
       return "data:image/jpeg;base64," + this.data.foto;
     },
-    //? this computed function returns all the informations for the first column in the profil 
+
+   
+    //? this computed function returns all the informations for the first column in the profil
     personData() {
       if (!this.data) {
         return {};
       }
 
       return {
-        Allgemein: {
-          View:"StudentIn",
-          Username: this.data.username,
-          Matrikelnummer: this.data.matrikelnummer,
-          Anrede: this.data.anrede,
-          Titel: this.data.titel,
-          Vorname: this.data.vorname,
-          Nachname: this.data.nachname,
-          Postnomen: this.data.postnomen,
-          Geburtsdatum: this.data.gebdatum,
-          Geburtsort: this.data.gebort,
-          Studiengang: this.data.studiengang,
-          Semester: this.data.semester,
-          Verband: this.data.verband,
-          Gruppe: this.data.gruppe,
-          Personenkennzeichen: this.data.personenkennzeichen,
-          
-        },
-        
-        
+        Username: this.data.username,
+        Anrede: this.data.anrede,
+        Matrikelnummer: this.data.matrikelnummer,
+        Titel: this.data.titelpre,
+        Postnomen: this.data.postnomen,
       };
     },
-    //? this computed function returns the data for the second column in the profil 
-    kontaktInfo() {
+
+    personKontakt() {
       if (!this.data) {
         return {};
       }
 
       return {
-        FhAusweisStatus: this.data.zutrittsdatum,
         emails: this.data.emails,
-        Kontakte: this.data.kontakte,
-        Adressen: this.data.adressen,
+        
       };
     },
+
+    specialData() {
+      if (!this.data) {
+        return {};
+      }
+
+      return {
+        Geburtsdatum: this.data.gebdatum,
+        Geburtsort: this.data.gebort,
+        Personenkennzeichen: this.data.personenkennzeichen,
+        Studiengang: this.data.studiengang,
+        Semester: this.data.semester,
+        Verband: this.data.verband,
+        Gruppe: this.data.gruppe,
+      };
+    },
+
+    privateKontakte() {
+      if (!this.data) {
+        return {};
+      }
+
+      return this.data.kontakte;
+      
+    },
+
+    privateAdressen() {
+      if (!this.data) {
+        return {};
+      }
+
+      return this.data.adressen;
+      
+    },
+    
+
+  
   },
 
   mounted() {
     this.$refs.betriebsmittelTable.tabulator.on('tableBuilt', () => {
     
-        this.$refs.betriebsmittelTable.tabulator.setData(this.data.mittel);
-        
-    }) 
+      this.$refs.betriebsmittelTable.tabulator.setData(this.data.mittel);
+      
+  }) 
 
-    this.$refs.zutrittsgruppenTable.tabulator.on('tableBuilt', () => {
-    
-        this.$refs.zutrittsgruppenTable.tabulator.setData(this.data.zuttritsgruppen);
-        
-    }) 
+  this.$refs.zutrittsgruppenTable.tabulator.on('tableBuilt', () => {
+  
+      this.$refs.zutrittsgruppenTable.tabulator.setData(this.data.zuttritsgruppen);
+      
+  }) 
 
+   
   },
 
-  template: `
+  template: ` 
 
-  <!-- CONTAINER -->
-  <div class="container-fluid text-break" >
+  <div class="container-fluid text-break"  >
     <!-- ROW --> 
           <div class="row">
           <!-- HIDDEN QUICK LINKS -->
               <div  class="d-md-none col-12 ">
              
-              <div style="border:4px solid;border-color:#EEEEEE;" class="row py-2">
+              <div class="row py-2">
               <div class="col">
                 <p class="m-0">
-                  <a class="border w-100 btn " data-bs-toggle="collapse" href="#collapseExample" role="button" aria-expanded="false" aria-controls="collapseExample">
-                   <u> Quick links</u>
-                  </a>
+                <div class="card">
+                
+                <a class=" w-100 btn " data-bs-toggle="collapse" href="#collapseExample" role="button" aria-expanded="false" aria-controls="collapseExample">
+                <u> Quick links</u>
+               </a>
+             
+                
+               </div>
                  
                 </p>
                 <div class="mt-1 collapse" id="collapseExample">
@@ -190,165 +229,170 @@ export default {
                 </div>
               </div>
             </div>
-              
-              
+
               </div>
               <!-- END OF HIDDEN QUCK LINKS -->
 
 
+            
+
 
               <!-- MAIN PANNEL -->
-              <div class="col-sm-12 col-md-9">
+              <div class="col-sm-12 col-md-8 col-xxl-9 ">
                 <!-- ROW WITH PROFIL IMAGE AND INFORMATION -->
-                <div class="row">
-                  <!-- COLUMN WITH PROFIL IMAGE -->
-                    <div class="col-md-2 col-sm-12" style="border:4px solid;border-color:lightgreen;">
-
-
-
-                    <!-- START OF THE FIRST ROW WITH THE PROFIL IMAGE -->
-                    <div class="row justify-content-center">
-                    <div class="col-auto ">
-                          <img class=" img-thumbnail " style=" max-height:150px"  :src="get_image_base64_src"></img>
-                        </div>
-                      </div>
-                    <!-- END OF THE ROW WITH THE IMAGE -->
-
-
-
-
-
-
-                    <!-- START OF THE SECOND ROW WITH THE IMAGE LINK -->
-                    <div class="row justify-content-center">
-                    <div class="col-auto text-center ">
-                          
-
-                        
-                        <div v-if="data.foto_sperre ">
-                          <p class="m-0">Profilfoto gesperrt</p>
-                          <a href="#" @click.prevent="sperre_foto_function(false)" class="text-decoration-none">Sperre des Profilfotos aufheben</a>
-                        </div>
-                        <!-- DIESEN LINK KOENNTE MAN MIT EINEM ICON AUSTAUSCHEN WENN DIE VIEWPORT KLEIN IST -->
-                        <a href="#" @click.prevent="sperre_foto_function(true)" class="text-decoration-none"  v-else>Profilfoto sperren</a>
-                     
-
-
-
-                        </div>
-                      </div>
-                    <!-- END OF THE ROW WITH THE IMAGE LINK -->
-
-
-
-
-
-
-                    <!-- END OF THE COLUMN WITH PROFIL IMAGE AND LINK -->
-                    </div>
-
-
-
-                    <!-- COLUMN WITH THE PROFIL INFORMATION --> 
-                    <div class="col-md-10 col-sm-12 text-break" style=" border:4px solid;border-color:lightcoral;">
+               
               
 
                     <!-- INFORMATION CONTENT START -->
                     <!-- ROW WITH THE PROFIL INFORMATION --> 
-                    <div class="row">
+                    <div class="row mb-4">
 
 
 
-                      <!-- FIRST COLUMN WITH PROFIL INFORMATION -->
-                      <div style="border:4px solid;border-color:red" class="col-lg-12 col-xl-6">
 
-                        <dl class="  mb-0"  >
 
+
+
+
+
+
+
+
+
+
+
+
+
+<!-- FIRST KAESTCHEN -->
+                      <div  class="col-lg-12 col-xl-6 ">
+                     <div class="row mb-4">
+                     <div class="col">
+                     
+                        
+                      <div class="card h-100">
+                      <div class="card-header">
+                      StudentIn
+                      </div>
+                      <div class="card-body">
+                      
                        
 
-                          <div v-for="(wert,bez) in personData.Allgemein" class="justify-content-center row">
-                             
 
-                              <dt class="col-xl-10 col-12 " v-if="bez=='View'" ><b>{{wert}}</b></dt>
-                              <template v-else>
-                                <dt class="col-xl-4 col-lg-6 col-md-6 col-6  " >{{bez}}</dt>
-                                <dd class=" col-lg-8 col-xl-6 col-6 ">{{wert?wert:"-"}}</dd>
-                              </template>
+                  
+                  <div  class="row align-items-center">
+
+
+
+
+                  <!-- SQUEEZING THE IMAGE INSIDE THE FIRST INFORMATION COLUMN -->
+ <!-- START OF THE FIRST ROW WITH THE PROFIL IMAGE -->
+          <div class="col-12 col-sm-6 mb-2">
+           <div class="row justify-content-center">
+                        <div class="col-auto " style="position:relative">
+                          <img class=" img-thumbnail " style=" max-height:150px; "  :src="get_image_base64_src"></img>
+                          <!-- LOCKING IMAGE FUNCTIONALITY -->
+                          
+                          
+                          <div role="button" @click.prevent="sperre_foto_function" style="height:22px; width:21px; background-color:white; position:absolute; top:0; right:12px; display:flex; align-items:center; justify-content:center;" >
+                          <i :class="{'fa':true, ...(data.foto_sperre?{'fa-lock':true}:{'fa-lock-open':true})} " ></i>
+                          
+                          
                           </div>
+                        </div>
+                      </div>
+                    <!-- END OF THE ROW WITH THE IMAGE -->
+                    </div>
+<!-- END OF SQUEEZE -->
+
+
+
+<!-- COLUMNS WITH MULTIPLE ROWS NEXT TO PROFIL PICTURE -->
+                  <div class="col-12 col-sm-6">
+                  <div class="row">
+                  <div class="col-12">
+                  <div class=" form-floating mb-2">
                         
-                    
-                        </dl>
+                  <input  readonly class="form-control form-control-plaintext border-bottom" id="floatingVorname"  :value="data.vorname">
+                  <label for="floatingVorname">Vorname</label>
+                </div>
+                </div>
+                <div class="col-12">
+                <div class=" form-floating mb-2">
+                        
+                  <input  readonly class="form-control form-control-plaintext border-bottom" id="floatingNachname"  :value="data.nachname">
+                  <label for="floatingNachname">Nachname</label>
+                </div>
+                </div>
+                </div>
+             
+                
+                  </div>
+                  
 
 
-                      <!-- END OF THE FIRST INFORMATION COLUMN -->
+
+
+
+
+
+                  <div v-for="(wert,bez) in personData" class="col-md-6 col-sm-12 ">
+                  <div class=" form-floating mb-2">
+                        
+                  <input  readonly class="form-control form-control-plaintext border-bottom" :id="'floating'+bez"  :value="wert?wert:'-'">
+                  <label :for="'floating'+bez">{{bez}}</label>
+                  </div>
+                  </div>
+
+                  
                       </div>
 
 
-                      <!-- START OF THE SECOND PROFIL INFORMATION COLUMN -->
-                      <div style="border:4px solid;border-color:orange" class="col-xl-6 col-lg-12">
-
-
-
-
-
-
-                        <dl v-for="(wert,bezeichnung) in kontaktInfo">
-
-
-
-                        <!-- HIER IST DER FH AUSWEIS -->
-
-                          <div class="row justify-content-center" v-if="bezeichnung=='FhAusweisStatus'">
-                            <dt class="col-lg-4 col-6" >FH-Ausweis Status</dt>
-                            <dd class=" col-lg-8 col-6 m-0">{{"Der FH Ausweis ist am "+ wert+ " ausgegeben worden."}}</dd>
-                          </div>
-
-
-                        <!-- HIER SIND DIE EMAILS -->
-                    
-                    
-                          <div class="justify-content-center row mb-3" v-if="typeof wert === 'object' && bezeichnung == 'emails'">
-                              <dt class="col-lg-4  col-6 mb-0">eMail</dt>
-                              <div class="col-lg-8 col-6 ">
-                                  <dd v-for="email in wert" class="mb-0 ">{{email.type}}: <a style="text-decoration:none" :href="'mailto:'+email.email">{{email.email}}</a></dd>
-                              </div>
-                          </div>
                       
-                      
-                          <!-- HIER SIND DIE PRIVATEN KONTAKTE -->
-                          <div class="justify-content-center row mb-3" v-if="typeof wert === 'object' && bezeichnung=='Kontakte'">
-                              <dt   class="col-lg-4 col-6 mb-0">Private Kontakte</dt>
-                              <div class="col-lg-8 col-6">
-                                  <dd class="row justify-end" v-for="element in wert" >
-                                  <div :class="{...(element?.anmerkung? {'col-7':true} : {'col-10':true} )}">{{element.kontakttyp + ":  " + element.kontakt+"  " }}</div>
-                                  <div :class="{...(element?.anmerkung? {'col-3':true} : {'d-none':true} )}"> {{element?.anmerkung}}</div>
-                                      <div class="col-2"> 
-                                          <i v-if="element.zustellung" class="fa-solid fa-check"></i>
-                                          <i v-else="element.zustellung" class="fa-solid fa-xmark"></i>
-                                      </div>
-                                  </dd>
-                              </div>
-                          </div>
-                      
-                      
-                      
-                          <!-- HIER SIND DIE ADRESSEN -->
-                          <div class=" justify-content-center row mb-3" v-if="typeof wert === 'object' && bezeichnung=='Adressen'">
-                              <dt class="col-lg-4 col-6">Adressen</dt>
-                              <div class="col-lg-8 col-6">
-                                  <dd class="  m-0"  v-for="element in wert">
-                                      {{element.strasse}} <b>({{element.adr_typ}})</b><br/>{{ element.plz}} {{element.ort}}
-                                  </dd>
-                              </div>
-                          </div>
-                    
-                        </dl>
-
-
-
-
-                      <!-- END OF THE SECOND INFORMATION COLUMN -->
                       </div>
+                    </div>
+		    </div>
+                    </div>
+                     <div class="row mb-4">
+                     
+
+                     <div  class=" col-lg-12">
+        
+                     <div class="card">
+                 
+                         <div class="card-header">
+                         Studenten Information
+                         </div>
+                         <div class="card-body">
+                             <div class="row">
+                             <div v-for="(wert,bez) in specialData" class="col-md-6 col-sm-12 ">
+                             
+                            
+                             <div  class=" form-floating mb-2">  
+                            
+                                 <input   readonly class="form-control form-control-plaintext border-bottom" :id="'floating'+bez"  :value="wert?wert:'-'">
+                                 <label :for="'floating'+bez">{{bez}}</label>
+                                 </div>
+                             </div>
+                         </div>
+                         
+                     </div>
+                     
+                 </div>
+
+                     </div>  
+                            
+
+
+
+<!-- END OF THE FIRST KAESTCHEN -->
+                      </div>
+
+
+                      <!-- START OF SECOND PROFIL  INFORMATION COLUMN -->
+                     
+
+
+                     
 
 
               
@@ -356,21 +400,183 @@ export default {
                     <!-- INFORMATION CONTENT END -->
                     </div>
 
+                    <div  class="col-xl-6 col-lg-12 ">
+                    <div class="row mb-4">
+                    <div class="col">
 
-                    <!-- COLUMN WITH ALL PROFIL INFORMATION END -->
-                  </div>
+
+                    <div class="card ">
+                    <div class="card-header">
+                    Mails
+                    </div>
+                   
+                    <div class="card-body">
+
+
+
+                      <div v-for="(wert,bezeichnung) in personKontakt">
+
+                      
+            
+                      <!-- HIER SIND DIE EMAILS -->
+                  
+                  
+                      <div v-for="email in wert" v-if="typeof wert === 'object' && bezeichnung == 'emails'" class="row justify-content-center ">
+                      <div  class="col-12 ">
+                     
+                            <div class="row align-items-center">
+                      <div class="col-1 text-center">
+
+                      <i class="fa-solid fa-envelope" style="color:rgb(0, 100, 156)"></i>
+
+                      </div>
+                      <div class="col">
+                      <div class=" form-floating mb-2">
+                            
+                            <a :href="'mailto:'+email.email" readonly class="form-control form-control-plaintext border-bottom" :id="'floating'+email.type">
+                              <input role="button" readonly :value="email.email" class="w-100" style="border:none; outline:none;" />
+                            </a>
+                            <label :for="'floating'+email.type">{{email.type }}</label>
+                      </div>
+                      </div>
+                      </div>
+                      </div>
+                          </div>
+
+                    
+                    
+                     
+
+
+
+
+                    
+                      </div>
+
+
+                    </div>
+                    </div>
+                    </div></div>
+
+                    <!-- HIER SIND DIE PRIVATEN KONTAKTE-->
+                    <div class="row mb-4 ">
+                      <div class="col">
+                        <div class="card">
+                          <div class="card-header">
+                            Private Kontakte
+                          </div>
+                          <div class="card-body ">
+                            
+                            <div v-for="element in privateKontakte" class="align-items-center row justify-content-center">
+                              <div class="col-1 text-center" >
+                              
+                              <i class="fa-solid " :class="{...(element.kontakt.includes('@')?{'fa-envelope':true}:{'fa-phone':true})}" style="color:rgb(0, 100, 156)"></i>
+                              </div>
+                              <div  :class="{...(element.anmerkung? {'col-11':true, 'col-md-5':true, 'col-xl-11':true, 'col-xxl-5':true} : {'col-9':true, 'col-xl-9':true})}">
+                                  
+                                  <!-- rendering KONTAKT emails -->
+                                  <div v-if="element.kontakt.includes('@')" class=" form-floating mb-2">
+                                    
+                                    <a :href="'mailto:'+element.kontakt" readonly class="form-control form-control-plaintext border-bottom" :id="'floating'+element.kontakttyp">
+                                      <input role="button" readonly :value="element.kontakt" class="w-100" style="border:none; outline:none;" />
+                                    </a>
+                                    <label :for="'floating'+element.kontakttyp">{{element.kontakttyp}}</label>
+                                  
+                                  </div>
+
+                                  <!-- rendering KONTAKT phones -->
+                                  <div v-else class=" form-floating mb-2">
+                                     
+                                    <a :href="'tel:'+element.kontakt" readonly class="form-control form-control-plaintext border-bottom" :id="'floating'+element.kontakttyp">
+                                      <input role="button" readonly :value="element.kontakt" class="w-100" style="border:none; outline:none;" />
+                                    </a>
+                                    <label :for="'floating'+element.kontakttyp">{{element.kontakttyp}}</label>
+
+                                  </div>
+
+                              </div>
+                              <div v-if="element?.anmerkung" class="offset-1 offset-md-0 col-9 col-md-4  offset-xl-1 offset-xxl-0 col-xl-9 col-xxl-4 order-2 order-md-1 order-xl-1 order-sm-1 order-xxl-1  ">
+                                  <div class=" form-floating mb-2">
+                                      <input   readonly class="form-control form-control-plaintext border-bottom" id="floatingAnmerkung" :value="element.anmerkung">
+                                      <label for="floatingAnmerkung">Anmerkung</label>
+                                  </div>
+                              </div>
+                              <div class="col-2 order-2 order-sm-2 order-md-2 order-lg-1 col-xl-2 col-xxl-2 allign-middle">
+                                  <i v-if="element.zustellung" class="fa-solid fa-check"></i>
+                                  <i v-else="element.zustellung" class="fa-solid fa-xmark"></i>
+                              </div>
+                            </div>
+                           
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                    <!-- -->
+
+                    <!-- HIER SIND DIE PRIVATEN ADRESSEN-->
+                    <div class="row mb-4">
+                      <div class="col">
+                        <div class="card">
+                          <div class="card-header">Private Adressen</div>
+                          <div class="card-body">
+                          
+                            <div v-for="element in privateAdressen" class="row justify-content-center align-items-center">
+                            <!-- column 1 in the address row -->
+                            
+                                <div class="col-1 text-center">
+                                 
+                                  <i class="fa fa-location-dot fa-lg" style="color:#00649C "></i>
+                                
+                                </div>
+                                <div  class="col ">
+                                    <div class=" form-floating mb-2">
+                                        <input   readonly class="form-control form-control-plaintext border-bottom" id="floatingStrasse" :value="element.strasse">
+                                        <label for="floatingStrasse">Strasse</label>
+                                    </div>
+                                </div>
+                                <div class="w-100 "></div>
+                                
+                            <!-- column 2 in the address row -->
+                                <div  class="col-11 offset-1 offset-md-0 offset-xl-1  col-xl-6 order-xl-1 col-md-3 col-sm-6 col-xs-6 order-sm-1">
+                                    <div class=" form-floating mb-2">
+                                        <input   readonly class="form-control form-control-plaintext border-bottom" id="floatingTyp" :value="element.adr_typ">
+                                        <label for="floatingTyp">Typ</label>
+                                    </div>
+                                </div>
+                                <div  class="col-11 offset-1  col-xl-11 col-md-5 col-sm-11 col-xs-11 ">
+                                    <div class=" form-floating mb-2">
+                                        <input   readonly class="form-control form-control-plaintext border-bottom" id="floatingOrt" :value="element.ort">
+                                        <label for="floatingOrt">Ort</label>
+                                    </div>
+                                </div>
+                                <div  class="col-11 offset-1 offset-sm-0 offset-md-0 col-xl-5 order-xl-2 col-md-3 col-sm-5 col-xs-5 order-sm-2">
+                                    <div class=" form-floating mb-2">
+                                        <input   readonly class="form-control form-control-plaintext border-bottom" id="floatingPLZ" :value="element.plz">
+                                        <label for="floatingPLZ">PLZ</label>
+                                    </div>
+                                </div>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                    <!-- -->
+
+
+
+                    <!-- END OF THE SECOND INFORMATION COLUMN -->
+                    </div>
+
+
+                    <!-- START OF THE SECOND PROFIL INFORMATION ROW --> 
+                  
+                    
                   <!-- ROW WITH PROFIL IMAGE AND INFORMATION END -->
                 </div  >
 
 
 
-                <!-- LITTLE EXTRA ROW WITH INFORMATION REFRESHING LINK -->
-                <div class="row ">
-                  <div style="border:4px solid;border-color:lightpink" class="col pt-4">
-                    <p>Sollten Ihre Daten nicht mehr aktuell sein, klicken Sie bitte <a :href="refreshMailTo">hier</a></p>
-                  </div>
-                </div>
-                <!-- END OF REFRESHING LINK ROW -->
+                
 
 
 
@@ -378,14 +584,17 @@ export default {
                 <!-- SECOND ROW UNDER THE PROFIL IMAGE AND INFORMATION WITH THE TABLES -->
                 <div class="row">
 
-                <!-- FIRST TABLE -->
-                  <div class="col-12" style="border: 4px solid; border-color:lightskyblue">
-                  <core-filter-cmpt title="Entlehnte Betriebsmittel"  ref="betriebsmittelTable" :tabulator-options="betriebsmittel_table_options" tableOnly :sideMenu="false" />
-                  </div>
+               
 
-                <!-- SECOND TABLE -->
-                  <div class="col-12" style="border:4px solid;border-color:orange">
-                  <core-filter-cmpt title="Zutrittsgruppen" ref="zutrittsgruppenTable" :tabulator-options="zutrittsgruppen_table_options" tableOnly :sideMenu="false" :noColumnFilter />
+                <!-- FIRST TABLE -->
+                  <div class="col-12 mb-4" >
+                    <core-filter-cmpt title="Entlehnte Betriebsmittel"  ref="betriebsmittelTable" :tabulator-options="betriebsmittel_table_options" tableOnly :sideMenu="false" />
+                  </div> 
+                  
+                  <!-- SECOND TABLE -->
+                  <div class="col-12 mb-4" >
+                    <core-filter-cmpt title="Zutrittsgruppen" ref="zutrittsgruppenTable" :tabulator-options="zutrittsgruppen_table_options"  tableOnly :sideMenu="false" noColumnFilter />
+            
                   </div>
 
                 <!-- END OF THE ROW WITH THE TABLES UNDER THE PROFIL INFORMATION -->
@@ -404,7 +613,7 @@ export default {
 
 
               <!-- START OF SIDE PANEL -->
-              <div  class="col-md-3 col-sm-12 text-break" >
+              <div  class="col-md-4 col-xxl-3 col-sm-12 text-break" >
 
 
               <!-- SRART OF QUICK LINKS IN THE SIDE PANEL -->
@@ -412,34 +621,88 @@ export default {
 
               <!-- START OF THE FIRDT ROW IN THE SIDE PANEL -->
               <!-- THESE QUCK LINKS ARE ONLY VISIBLE UNTIL VIEWPORT MD -->
-                <div style="border:4px solid;border-color:#EEEEEE;" class="row d-none d-md-block">
+                <div  class="row d-none d-md-block mb-3">
                   <div class="col">
-                    <div  class="row py-4">
-                        <a style="text-decoration:none" class="my-1" href="#">Zeitwuensche</a>
-                        <a style="text-decoration:none" class="my-1" href="#">Lehrveranstaltungen</a>
-                        <a style="text-decoration:none" class="my-1" href="#">Zeitsperren von Gschnell</a>
+                 
+                    <div class="card">
+                      <div class="card-header">
+                      Quick Links
+                      </div>
+                      <div class="card-body">
+                      
+                       
+                        <a style="text-decoration:none" class="my-1 d-block" href="#">Zeitwuensche</a>
+                        <a style="text-decoration:none" class="my-1 d-block" href="#">Lehrveranstaltungen</a>
+                        <a style="text-decoration:none" class="my-1 d-block" href="#">Zeitsperren von Gschnell</a>
+
+                      </div>
                     </div>
+
+                   
+                      
+                  
                   </div>
                 </div>
 
+                <div class="row mb-3" >
+                
+                
+                <div class="col-12">
+             
+             
+                
+                  <div class="card">
+                    <div class="card-body">
+                      <span>Der FH Ausweis ist am <b>{{data.zutrittsdatum}}</b> ausgegeben worden.</span>
+                    </div>
+                
+                </div>
+      
+         
+                </div>
+                
+                </div>
+
 
                 <!-- START OF THE SECOND ROW IN THE SIDE PANEL -->
-                <div style="border:4px solid;border-color: darkgray"  class="row">
+                <div  class="row">
                 
                   <div class="col">
                 
 
                   
                   <!-- HIER SIND DIE MAILVERTEILER -->
-                    <h5 class="fs-3" style="margin-top:1em">Mailverteilers</h5>
-                    <p >Sie sind Mitgglied in folgenden Verteilern:</p>
-                    <div  class="row text-break" v-for="verteiler in data?.mailverteiler">
-                      <div class="col-lg-12 col-xl-6"><a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a></div> 
-                      <div class="col-lg-12 col-xl-6">{{verteiler.beschreibung}}</div>
+                    <div class="card">
+                      <div class="card-header">
+                      Mailverteilers
+                      </div>
+                      <div class="card-body">
+                      
+                        <h6 class="card-title">Sie sind Mitgglied in folgenden Verteilern:</h6>
+                        <div  class="card-text row text-break mb-2" v-for="verteiler in data?.mailverteiler">
+                          <div class="col-12 ">
+                            <div class="row">  
+                              <div class="col-1 ">
+                              
+                              <i class="fa-solid fa-envelope" style="color: #00649C;"></i>
+                              
+                              </div>
+                              <div class="col">
+                                <a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a>
+                              </div>
+                            </div>
+                           
+                          </div> 
+                          <div class="col-11 offset-1 ">{{verteiler.beschreibung}}</div>
+                        </div>
+
+                      </div>
                     </div>
 
 
 
+
+
                   </div>
 
                 <!-- END OF THE SECOND ROW IN THE SIDE PANEL -->
@@ -459,8 +722,6 @@ export default {
       
       <!-- END OF CONTAINER -->
   </div>
-
-           
             
     `,
 };
diff --git a/public/js/components/Cis/Profil/StudentViewProfil.js b/public/js/components/Cis/Profil/StudentViewProfil.js
index 815b70fee..39fc844be 100644
--- a/public/js/components/Cis/Profil/StudentViewProfil.js
+++ b/public/js/components/Cis/Profil/StudentViewProfil.js
@@ -1,99 +1,100 @@
-import fhcapifactory from "../../../apps/api/fhcapifactory.js";
-
 
 export default {
- 
+  
   data() {
     return {
-   
-
       
+     
     };
   },
 
-    //? this is the prop passed to the dynamic component with the custom data of the view
+  //? this is the prop passed to the dynamic component with the custom data of the view
   props: ["data"],
   methods: {
-
-    sperre_foto_function(value) {
-      if (!this.data) {
-        return;
-      }
-      fhcapifactory.UserData.sperre_foto_function(value).then((res) => {
-        this.data.foto_sperre = res.data.foto_sperre;
-      });
-    },
+    
   },
+
   computed: {
+  
+
     get_image_base64_src() {
       if (!this.data) {
         return "";
       }
       return "data:image/jpeg;base64," + this.data.foto;
     },
-    //? this computed function returns all the informations for the first column in the profil 
+
+   
+    //? this computed function returns all the informations for the first column in the profil
     personData() {
       if (!this.data) {
         return {};
       }
 
       return {
-        Allgemein: {
-          View:"StudentIn",
-          Username: this.data.username,
-          Matrikelnummer: this.data.matrikelnummer,
-          Anrede: this.data.anrede,
-          Titel: this.data.titel,
-          Vorname: this.data.vorname,
-          Nachname: this.data.nachname,
-          Postnomen: this.data.postnomen,
-        },
-      
-        
-        SpecialInformation: {
-          Studiengang: this.data.studiengang,
-          Semester: this.data.semester,
-          Verband: this.data.verband,
-          Gruppe: this.data.gruppe,
-          Personenkennzeichen: this.data.personenkennzeichen,
-        },
+        Username: this.data.username,
+        Anrede: this.data.anrede,
+        Matrikelnummer: this.data.matrikelnummer,
+        Titel: this.data.titelpre,
+        Postnomen: this.data.postnomen,
       };
     },
-    //? this computed function returns the data for the second column in the profil 
-    kontaktInfo() {
+
+    personKontakt() {
       if (!this.data) {
         return {};
       }
 
       return {
-       
         emails: this.data.emails,
-      
+        
       };
     },
+
+    specialData() {
+      if (!this.data) {
+        return {};
+      }
+
+      return {
+        Personenkennzeichen: this.data.personenkennzeichen,
+        Studiengang: this.data.studiengang,
+        Semester: this.data.semester,
+        Verband: this.data.verband,
+        Gruppe: this.data.gruppe,
+      };
+    },
+
+    
+
+  
   },
 
   mounted() {
    
 
+   
   },
 
-  template: `
+  template: ` 
 
-
-  <!-- CONTAINER -->
-  <div class="container-fluid text-break" >
+  <div class="container-fluid text-break"  >
     <!-- ROW --> 
           <div class="row">
           <!-- HIDDEN QUICK LINKS -->
               <div  class="d-md-none col-12 ">
              
-              <div style="border:4px solid;border-color:#EEEEEE;" class="row py-2">
+              <div class="row py-2">
               <div class="col">
                 <p class="m-0">
-                  <a class="border w-100 btn " data-bs-toggle="collapse" href="#collapseExample" role="button" aria-expanded="false" aria-controls="collapseExample">
-                   <u> Quick links</u>
-                  </a>
+                <div class="card">
+                
+                <a class=" w-100 btn " data-bs-toggle="collapse" href="#collapseExample" role="button" aria-expanded="false" aria-controls="collapseExample">
+                <u> Quick links</u>
+               </a>
+             
+                
+               </div>
                  
                 </p>
                 <div class="mt-1 collapse" id="collapseExample">
@@ -107,111 +108,163 @@ export default {
                 </div>
               </div>
             </div>
+
               </div>
               <!-- END OF HIDDEN QUCK LINKS -->
 
 
+            
+
 
               <!-- MAIN PANNEL -->
-              <div class="col-sm-12 col-md-9">
+              <div class="col-sm-12 col-md-8 col-xxl-9 ">
                 <!-- ROW WITH PROFIL IMAGE AND INFORMATION -->
-                <div class="row">
-                  <!-- COLUMN WITH PROFIL IMAGE -->
-                    <div class="col-md-2 col-sm-12" style="border:4px solid;border-color:lightgreen;">
-
-
-
-
-
-
-                    <!-- START OF THE FIRST ROW WITH THE PROFIL IMAGE -->
-                    <div class="row justify-content-center">
-                    <div class="col-auto ">
-                          <img class=" img-thumbnail " style=" max-height:150px"  :src="get_image_base64_src"></img>
-                        </div>
-                      </div>
-                    <!-- END OF THE ROW WITH THE IMAGE -->
-
-
-
-
-
-
                
-
-
-
-
-                    <!-- END OF THE COLUMN WITH PROFIL IMAGE AND LINK -->
-                    </div>
-
-
-
-                    <!-- COLUMN WITH THE PROFIL INFORMATION --> 
-                    <div class="col-md-10 col-sm-12 text-break" style="border:4px solid;border-color:lightcoral;">
               
 
                     <!-- INFORMATION CONTENT START -->
                     <!-- ROW WITH THE PROFIL INFORMATION --> 
-                    <div class="row">
+                    <div class="row mb-4">
 
 
 
-                      <!-- FIRST COLUMN WITH PROFIL INFORMATION -->
-                      <div style="border:4px solid;border-color:red" class="col-lg-12 col-xl-6">
 
-                        <dl class="  mb-0"  >
 
-                          
+
+
+
+
+
+
+
+
+
+
+
+
+<!-- FIRST KAESTCHEN -->
+                      <div  class="col-lg-12 col-xl-6 ">
+                     <div class="row mb-4">
+                     <div class="col">
+                     
+                        
+                      <div class="card h-100">
+                      <div class="card-header">
+                      StudentIn
+                      </div>
+                      <div class="card-body">
+                      
                        
 
-                          <div v-for="(wert,bez) in personData.Allgemein" class="row justify-content-center">
-                          <!-- STUDENTEN TITEL -->
-                            <dt class="col-xl-10 col-12 " v-if="bez=='View'" ><b>{{wert}}</b></dt>
-                            <template v-else>
-                              <dt class="col-xl-4 col-lg-6 col-md-6 col-6  " >{{bez}}</dt>
-                              <dd class=" col-lg-8 col-xl-6 col-6 ">{{wert?wert:"-"}}</dd>
-                            </template>
-                          </div>
-                      
+
                   
-                        </dl>
+                  <div  class="row align-items-center">
 
 
 
-                      <!-- END OF THE FIRST INFORMATION COLUMN -->
+
+                  <!-- SQUEEZING THE IMAGE INSIDE THE FIRST INFORMATION COLUMN -->
+ <!-- START OF THE FIRST ROW WITH THE PROFIL IMAGE -->
+          <div class="col-12 col-sm-6 mb-2">
+           <div class="row justify-content-center">
+                        <div class="col-auto " style="position:relative">
+                          <img class=" img-thumbnail " style=" max-height:150px; "  :src="get_image_base64_src"></img>
+                         
+                        </div>
+                      </div>
+                    <!-- END OF THE ROW WITH THE IMAGE -->
+                    </div>
+<!-- END OF SQUEEZE -->
+
+
+
+<!-- COLUMNS WITH MULTIPLE ROWS NEXT TO PROFIL PICTURE -->
+                  <div class="col-12 col-sm-6">
+                  <div class="row">
+                  <div class="col-12">
+                  <div class=" form-floating mb-2">
+                        
+                  <input  readonly class="form-control form-control-plaintext border-bottom" id="floatingVorname"  :value="data.vorname">
+                  <label for="floatingVorname">Vorname</label>
+                </div>
+                </div>
+                <div class="col-12">
+                <div class=" form-floating mb-2">
+                        
+                  <input  readonly class="form-control form-control-plaintext border-bottom" id="floatingNachname"  :value="data.nachname">
+                  <label for="floatingNachname">Nachname</label>
+                </div>
+                </div>
+                </div>
+             
+                
+                  </div>
+                  
+
+
+
+
+
+
+
+                  <div v-for="(wert,bez) in personData" class="col-md-6 col-sm-12 ">
+                  <div class=" form-floating mb-2">
+                        
+                  <input  readonly class="form-control form-control-plaintext border-bottom" :id="'floating'+bez"  :value="wert?wert:'-'">
+                  <label :for="'floating'+bez">{{bez}}</label>
+                  </div>
+                  </div>
+
+                  
                       </div>
 
 
-                      <!-- START OF THE SECOND PROFIL INFORMATION COLUMN -->
-                      <div style="border:4px solid;border-color:orange" class="col-xl-6 col-lg-12">
-
-
-
-
-
-
-                        <dl v-for="(wert,bezeichnung) in kontaktInfo">
-
-                        <!-- HIER SIND DIE EMAILS -->
-                    
-                    
-                          <div class="justify-content-center row mb-3" v-if="typeof wert === 'object' && bezeichnung == 'emails'">
-                              <dt class="col-lg-4 col-6 mb-0">eMail</dt>
-                              <div class="col-lg-8 col-6 ">
-                                  <dd v-for="email in wert" class="mb-0 ">{{email.type}}: <a style="text-decoration:none" :href="'mailto:'+email.email">{{email.email}}</a></dd>
-                              </div>
-                          </div>
                       
-              
-                    
-                        </dl>
-
-
-
-
-                      <!-- END OF THE SECOND INFORMATION COLUMN -->
                       </div>
+                    </div>
+		    </div>
+                    </div>
+                     <div class="row mb-4">
+                     
+
+                     <div  class=" col-lg-12">
+        
+                     <div class="card">
+                 
+                         <div class="card-header">
+                         Studenten Information
+                         </div>
+                         <div class="card-body">
+                             <div class="row">
+                             <div v-for="(wert,bez) in specialData" class="col-md-6 col-sm-12 ">
+                             
+                            
+                             <div  class=" form-floating mb-2">  
+                            
+                                 <input   readonly class="form-control form-control-plaintext border-bottom" :id="'floating'+bez"  :value="wert?wert:'-'">
+                                 <label :for="'floating'+bez">{{bez}}</label>
+                                 </div>
+                             </div>
+                         </div>
+                         
+                     </div>
+                     
+                 </div>
+
+                     </div>  
+                            
+
+
+
+<!-- END OF THE FIRST KAESTCHEN -->
+                      </div>
+
+
+                      <!-- START OF SECOND PROFIL  INFORMATION COLUMN -->
+                     
+
+
+                     
 
 
               
@@ -219,15 +272,92 @@ export default {
                     <!-- INFORMATION CONTENT END -->
                     </div>
 
+                    <div  class="col-xl-6 col-lg-12 ">
+                    <div class="row mb-4">
+                    <div class="col">
 
-                    <!-- COLUMN WITH ALL PROFIL INFORMATION END -->
-                  </div>
+
+                    <div class="card ">
+                    <div class="card-header">
+                    Mails
+                    </div>
+                   
+                    <div class="card-body">
+
+
+
+                      <div v-for="(wert,bezeichnung) in personKontakt">
+
+                      
+            
+                      <!-- HIER SIND DIE EMAILS -->
+                  
+                  
+                      <div v-for="email in wert" v-if="typeof wert === 'object' && bezeichnung == 'emails'" class="row justify-content-center ">
+                      <div  class="col-12 ">
+                     
+                            <div class="row align-items-center">
+                      <div class="col-1 text-center">
+
+                      <i class="fa-solid fa-envelope" style="color:rgb(0, 100, 156)"></i>
+
+                      </div>
+                      <div class="col">
+                      <div class=" form-floating mb-2">
+                           
+                            <a :href="'mailto:'+email.email" readonly class="form-control form-control-plaintext border-bottom" :id="'floating'+email.type">
+                              <input role="button" readonly :value="email.email" class="w-100" style="border:none; outline:none;" />
+                            </a>
+                            <label :for="'floating'+email.type">{{email.type }}</label>
+
+                      </div>
+                      </div>
+                      </div>
+                      </div>
+                          </div>
+
+                    
+                    
+                     
+
+
+
+
+                    
+                      </div>
+
+
+                    </div>
+                    </div>
+                    </div></div>
+
+                   
+
+                  
+
+
+
+                    <!-- END OF THE SECOND INFORMATION COLUMN -->
+                    </div>
+
+
+                    <!-- START OF THE SECOND PROFIL INFORMATION ROW --> 
+                  
+                    
                   <!-- ROW WITH PROFIL IMAGE AND INFORMATION END -->
                 </div  >
 
 
 
-            
+                
+
+
+
+
+        
+
+
+
 
 
 
@@ -238,7 +368,7 @@ export default {
 
 
               <!-- START OF SIDE PANEL -->
-              <div  class="col-md-3 col-sm-12 text-break" >
+              <div  class="col-md-4 col-xxl-3 col-sm-12 text-break" >
 
 
               <!-- SRART OF QUICK LINKS IN THE SIDE PANEL -->
@@ -246,34 +376,70 @@ export default {
 
               <!-- START OF THE FIRDT ROW IN THE SIDE PANEL -->
               <!-- THESE QUCK LINKS ARE ONLY VISIBLE UNTIL VIEWPORT MD -->
-                <div style="border:4px solid;border-color:#EEEEEE;" class="row d-none d-md-block">
+                <div  class="row d-none d-md-block mb-3">
                   <div class="col">
-                    <div  class="row py-4">
-                        <a style="text-decoration:none" class="my-1" href="#">Zeitwuensche</a>
-                        <a style="text-decoration:none" class="my-1" href="#">Lehrveranstaltungen</a>
-                        <a style="text-decoration:none" class="my-1" href="#">Zeitsperren von Gschnell</a>
+                 
+                    <div class="card">
+                      <div class="card-header">
+                      Quick Links
+                      </div>
+                      <div class="card-body">
+                      
+                       
+                        <a style="text-decoration:none" class="my-1 d-block" href="#">Zeitwuensche</a>
+                        <a style="text-decoration:none" class="my-1 d-block" href="#">Lehrveranstaltungen</a>
+                        <a style="text-decoration:none" class="my-1 d-block" href="#">Zeitsperren von Gschnell</a>
+
+                      </div>
                     </div>
+
+                   
+                      
+                  
                   </div>
                 </div>
 
+              
 
                 <!-- START OF THE SECOND ROW IN THE SIDE PANEL -->
-                <div style="border:4px solid;border-color: darkgray"  class="row">
+                <div  class="row">
                 
                   <div class="col">
                 
 
                   
                   <!-- HIER SIND DIE MAILVERTEILER -->
-                    <h5 class="fs-3" style="margin-top:1em">Mailverteilers</h5>
-                    <p >Sie sind Mitgglied in folgenden Verteilern:</p>
-                    <div  class="row text-break" v-for="verteiler in data?.mailverteiler">
-                      <div class="col-lg-12 col-xl-6"><a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a></div> 
-                      <div class="col-lg-12 col-xl-6">{{verteiler.beschreibung}}</div>
+                    <div class="card">
+                      <div class="card-header">
+                      Mailverteilers
+                      </div>
+                      <div class="card-body">
+                      
+                        <h6 class="card-title">Sie sind Mitgglied in folgenden Verteilern:</h6>
+                        <div  class="card-text row text-break mb-2" v-for="verteiler in data?.mailverteiler">
+                          <div class="col-12 ">
+                            <div class="row">  
+                              <div class="col-1 ">
+                              
+                              <i class="fa-solid fa-envelope" style="color: #00649C;"></i>
+                              
+                              </div>
+                              <div class="col">
+                                <a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a>
+                              </div>
+                            </div>
+                           
+                          </div> 
+                          <div class="col-11 offset-1 ">{{verteiler.beschreibung}}</div>
+                        </div>
+
+                      </div>
                     </div>
 
 
 
+
+
                   </div>
 
                 <!-- END OF THE SECOND ROW IN THE SIDE PANEL -->
@@ -293,8 +459,6 @@ export default {
       
       <!-- END OF CONTAINER -->
   </div>
-
-           
             
     `,
 };

From 8666dbe3a658b5d98c8b17b90b26d124f78881af Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Tue, 19 Dec 2023 15:36:11 +0100
Subject: [PATCH 0257/1461] wrong uid was used to get the emails of the student
 profil view

---
 application/controllers/Cis/Profil.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index b17022e6e..aed70c0ae 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -262,7 +262,7 @@ class Profil extends Auth_Controller
 		
 		$intern_email = array();
 			$intern_email+=array("type" => "intern");
-			$intern_email+=array("email"=> $this->uid . "@" . DOMAIN);
+			$intern_email+=array("email"=> $uid . "@" . DOMAIN);
 		
 			$res->emails = array($intern_email);
 	

From 9c69d8cc466b8d4e1a5e16ce2fd7334e6772b792 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Tue, 19 Dec 2023 15:49:57 +0100
Subject: [PATCH 0258/1461] trims the student information so that the value is
 falsy in javascript

---
 application/controllers/Cis/Profil.php           | 2 +-
 public/js/components/Cis/Profil/StudentProfil.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index aed70c0ae..0a3189fdd 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -639,7 +639,7 @@ class Profil extends Auth_Controller
 		$res->mittel = $betriebsmittelperson_res;
 		$res->matrikelnummer = $matr_res->matr_nr;
 		foreach($student_res as $key => $value){
-			$res->$key = $value;
+			$res->$key = trim($value);
 		}
 		$res->zuttritsgruppen = $zutrittsgruppe_res;
 
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index 850d4da68..f05c53dc6 100644
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -366,9 +366,9 @@ export default {
                              <div class="row">
                              <div v-for="(wert,bez) in specialData" class="col-md-6 col-sm-12 ">
                              
-                            
+                          
                              <div  class=" form-floating mb-2">  
-                            
+                           
                                  <input   readonly class="form-control form-control-plaintext border-bottom" :id="'floating'+bez"  :value="wert?wert:'-'">
                                  <label :for="'floating'+bez">{{bez}}</label>
                                  </div>

From 6f8bd9527c3eb9428db63e690f76f796f7f9d09f Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Tue, 19 Dec 2023 16:00:43 +0100
Subject: [PATCH 0259/1461] changes the styling when hovering over form-control
 fields in the profil view, so that it does not also change the behavior of
 other elements that use form-control on the web page

---
 public/css/components/Profil.css                         | 4 ++--
 public/js/components/Cis/Profil/MitarbeiterProfil.js     | 2 +-
 public/js/components/Cis/Profil/MitarbeiterViewProfil.js | 2 +-
 public/js/components/Cis/Profil/StudentProfil.js         | 8 +-------
 public/js/components/Cis/Profil/StudentViewProfil.js     | 2 +-
 5 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/public/css/components/Profil.css b/public/css/components/Profil.css
index f5a3eec6e..42defa8e7 100644
--- a/public/css/components/Profil.css
+++ b/public/css/components/Profil.css
@@ -41,10 +41,10 @@
   background-color:white;
 }
 
-.form-control:focus{
+.fhc-form .form-control:focus{
   border-color:white;
   box-shadow:none;
-}
+} 
 
 /*   dl {
     width: 100%;
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index d0ecebc13..b827358b8 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -268,7 +268,7 @@ export default {
 
   template: ` 
 
-  <div class="container-fluid text-break"  >
+  <div class="container-fluid text-break fhc-form"  >
     <!-- ROW --> 
           <div class="row">
           <!-- HIDDEN QUICK LINKS -->
diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
index 1e92108dd..f7efd5d19 100644
--- a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
@@ -187,7 +187,7 @@ export default {
 
   template: ` 
 
-  <div class="container-fluid text-break"  >
+  <div class="container-fluid text-break fhc-form"  >
     <!-- ROW --> 
           <div class="row">
           <!-- HIDDEN QUICK LINKS -->
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index f05c53dc6..98fa81cb6 100644
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -199,7 +199,7 @@ export default {
 
   template: ` 
 
-  <div class="container-fluid text-break"  >
+  <div class="container-fluid text-break fhc-form"  >
     <!-- ROW --> 
           <div class="row">
           <!-- HIDDEN QUICK LINKS -->
@@ -329,12 +329,6 @@ export default {
                   </div>
                   
 
-
-
-
-
-
-
                   <div v-for="(wert,bez) in personData" class="col-md-6 col-sm-12 ">
                   <div class=" form-floating mb-2">
                         
diff --git a/public/js/components/Cis/Profil/StudentViewProfil.js b/public/js/components/Cis/Profil/StudentViewProfil.js
index 39fc844be..5967fe7f9 100644
--- a/public/js/components/Cis/Profil/StudentViewProfil.js
+++ b/public/js/components/Cis/Profil/StudentViewProfil.js
@@ -78,7 +78,7 @@ export default {
 
   template: ` 
 
-  <div class="container-fluid text-break"  >
+  <div class="container-fluid text-break fhc-form"  >
     <!-- ROW --> 
           <div class="row">
           <!-- HIDDEN QUICK LINKS -->

From 5d4ec93b0905d3c06dea1edefb68b1658f74bd64 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 20 Dec 2023 11:39:28 +0100
Subject: [PATCH 0260/1461] Change Font-Size in Tabulator 5, Start Dateiupload

---
 .../controllers/components/stv/Notiz.php      |  40 +++-
 application/models/person/Notiz_model.php     |  34 +++-
 public/css/Tabulator5.css                     |   3 +
 .../js/components/Form/Upload/SingleFile.js   |  36 ++++
 public/js/components/Notiz/Notiz.js           | 176 ++++++++++++------
 .../Studentenverwaltung/Details/Notizen.js    |  81 ++++++--
 6 files changed, 283 insertions(+), 87 deletions(-)
 create mode 100644 public/js/components/Form/Upload/SingleFile.js

diff --git a/application/controllers/components/stv/Notiz.php b/application/controllers/components/stv/Notiz.php
index 439e7c7fb..00935a95d 100644
--- a/application/controllers/components/stv/Notiz.php
+++ b/application/controllers/components/stv/Notiz.php
@@ -23,7 +23,7 @@ class Notiz extends FHC_Controller
 	{
 		$this->load->model('person/Notiz_model', 'NotizModel');
 
-		$result = $this->NotizModel->getNotiz($person_id, true);
+		$result = $this->NotizModel->getNotizWithDocEntries($person_id);
 
 		if (isError($result)) {
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
@@ -62,7 +62,9 @@ class Notiz extends FHC_Controller
 
 	public function addNewNotiz($person_id)
 	{
-		$_POST = json_decode($this->input->raw_input_stream, true);
+		var_dump($this->input->post('titel'));
+		var_dump($this->input->post('anhang'));
+		var_dump($_FILES);
 		$this->load->library('form_validation');
 
 
@@ -79,17 +81,11 @@ class Notiz extends FHC_Controller
 		$uid = getAuthUID();
 		$titel = isset($_POST['titel']) ? $_POST['titel'] : null;
 		$text = isset($_POST['text']) ? $_POST['text'] : null;
-		//$verfasser_uid = isset($_POST['verfasser_uid']) ? $_POST['verfasser_uid'] : null;
 		$verfasser_uid = $uid;
 		$start = isset($_POST['von']) ? $_POST['von'] : null;
 		$ende = isset($_POST['bis']) ? $_POST['bis'] : null;
 		$erledigt = $_POST['erledigt'];
 
-/*		$dms_id = isset($_POST['dms_id']) ? $_POST['dms_id'] : null;
-		$bearbeiter_uid = isset($_POST['bearbeiter_uid']) ? $_POST['bearbeiter_uid'] : null;
-
-*/
-
 		$result = $this->NotizModel->addNotizForPersonWithDoc($person_id, $titel, $text, $erledigt, $verfasser_uid, $start, $ende);
 
 	//	var_dump($result);
@@ -191,4 +187,32 @@ class Notiz extends FHC_Controller
 		return $this->outputJsonSuccess(current(getData($result)));
 	}
 
+	public function loadDokumente($notiz_id)
+	{
+		$this->load->model('person/Notiz_model', 'NotizModel');
+
+		//TODO(manu) check, ob mehr Dateien bzw. -versionen
+		//warum nur ein Eintrag???
+		$this->NotizModel->addSelect('campus.tbl_dms_version.*');
+
+		$this->NotizModel->addJoin('public.tbl_notiz_dokument','ON (public.tbl_notiz_dokument.notiz_id = public.tbl_notiz.notiz_id)');
+		$this->NotizModel->addJoin('campus.tbl_dms_version','ON (public.tbl_notiz_dokument.dms_id = campus.tbl_dms_version.dms_id)');
+
+		$result = $this->NotizModel->loadWhere(
+			array('public.tbl_notiz.notiz_id' => $notiz_id)
+		);
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->outputJson($result);
+		}
+
+		elseif (!hasData($result)) {
+			$this->outputJson($result);
+		}
+		else
+		{
+			$this->outputJsonSuccess(getData($result));
+		}
+	}
+
 }
\ No newline at end of file
diff --git a/application/models/person/Notiz_model.php b/application/models/person/Notiz_model.php
index 5a8bf1858..fbebc3bd8 100644
--- a/application/models/person/Notiz_model.php
+++ b/application/models/person/Notiz_model.php
@@ -175,17 +175,41 @@ class Notiz_model extends DB_Model
 	 * gets all Notizen for a person
 	 * @param $person_id
 	 */
-	public function getNotiz($person_id, $withDoc=false)
+	public function getNotiz($person_id)
 	{
-		// Join with the table public.tbl_notizzuordnung using notiz_id
+		$this->addSelect('public.tbl_notiz.*');
 		$this->addJoin('public.tbl_notizzuordnung', 'notiz_id');
 
-		if($withDoc)
-			$this->addJoin('public.tbl_notiz_dokument', 'notiz_id', 'LEFT');
-
 		return $this->loadWhere(array('person_id' => $person_id));
 	}
 
+	/**
+	 * gets all Notizen with Documententries for a person
+	 * @param $person_id
+	 */
+	public function getNotizWithDocEntries($person_id)
+	{
+		$qry = "
+			SELECT 
+			    	n.*, count(dms_id) as countDoc
+			FROM
+			    	public.tbl_notiz n
+			JOIN 
+			    	    public.tbl_notizzuordnung z USING (notiz_id)
+			LEFT JOIN 
+			    	    public.tbl_notiz_dokument dok USING (notiz_id)
+			LEFT JOIN 
+			    	    campus.tbl_dms_version USING (dms_id)
+			WHERE 
+			    z.person_id = ?
+			GROUP BY 
+			    notiz_id
+		";
+
+		return $this->execQuery($qry, array($person_id));
+
+	}
+
 	/**
 	 * gets all Notizen for a person with a specific title
 	 * @param $person_id
diff --git a/public/css/Tabulator5.css b/public/css/Tabulator5.css
index 48124335f..a9a79a6d8 100644
--- a/public/css/Tabulator5.css
+++ b/public/css/Tabulator5.css
@@ -38,3 +38,6 @@
 .tabulator .tabulator-col-resize-handle:last-of-type {
 	z-index: 999999;
 }
+.tabulator {
+	font-size: 1rem;
+}
diff --git a/public/js/components/Form/Upload/SingleFile.js b/public/js/components/Form/Upload/SingleFile.js
new file mode 100644
index 000000000..74c60fcb8
--- /dev/null
+++ b/public/js/components/Form/Upload/SingleFile.js
@@ -0,0 +1,36 @@
+export default {
+	data() {
+		return {
+			file: null,
+		};
+	},
+	methods: {
+		handleFileChange(event) {
+			this.file = event.target.files[0];
+		},
+		uploadFile() {
+			if (this.file) {
+				// You can perform your file upload logic here
+				console.log('Uploading file:', this.file);
+				// Reset the file input
+				this.$refs.fileInput.value = '';
+				this.file = null;
+			} else {
+				console.error('No file selected');
+			}
+		},
+	},
+};
+template: `
+	<div>
+		<h2>File Upload</h2>
+		<form
+		@submit.prevent="uploadFile">
+		<input type="file" ref="fileInput" @change="handleFileChange" />
+		<button type="submit">Upload</button>
+	</form>
+	<div v-if="file">
+		<p>Selected File: {{file.name}}</p>
+	</div>
+</div>
+</template>`
\ No newline at end of file
diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index eb9788516..88bffa711 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -1,5 +1,26 @@
+import VueDatePicker from '../vueDatepicker.js.php';
+//import SingleFile from '../Form/Upload/SingleFile.js';
+
 export default {
-	props: ['titel', 'text', 'von', 'bis', 'action', 'document', 'erledigt', 'verfasser', 'bearbeiter'],
+	components: {
+		VueDatePicker,
+		//BsModal
+		//SingleFile
+	},
+	props: [
+		'titel',
+		'text',
+		'von',
+		'bis',
+		'action',
+		'document',
+		'erledigt',
+		'verfasser',
+		'bearbeiter',
+		'showErweitert',
+		'showDocument',
+		'anhang'
+		],
 	computed: {
 		intTitel: {
 			get() {
@@ -65,72 +86,111 @@ export default {
 				this.$emit('update:bearbeiter', value);
 			}
 		},
+		intAnhang: {
+			get() {
+				return this.anhang;
+			},
+			set(value) {
+				console.log(value);
+				this.$emit('update:anhang', value);
+			}
+		}
 	},
 	methods: {
-
+		handleFileChange(event) {
+			this.intAnhang = event.target.files[0];
+		},
 	},
 	template: `
 <div>
-<!--{{intTitel}} {{intText}} {{intVon}}| {{titel}} {{text}} {{action}} {{von}} {{bis}} {{document}} {{erledigt}} {{verfasser}} {{bearbeiter}}-->
+
+component: {{intTitel}} {{intVon}} || {{intAnhang.name}} {{intAnhang}}
 	<form class="row">
-		<div class="notizAction row mb-3">
-			<b>{{action}}</b>
-		</div>
-		<div class="notizTitle row mb-3">
-			<label for="titel" class="form-label col-sm-2">Titel</label>
-			<div class="col-sm-6">
-				<input type="text" v-model="intTitel" class="form-control">
-			</div>	
+		<div>
+			<div class="row mb-3">
+				<b>{{action}}</b>
+			</div>
+			<div class="notizTitle row mb-3">
+				<label for="titel" class="form-label col-sm-2">Titel</label>
+				<div class="col-sm-7">
+					<input type="text" v-model="intTitel" class="form-control">
+				</div>	
+			</div>
+			
+			<div class="row mb-3">
+				<label for="text" class="form-label col-sm-2">Text</label>
+				<div class="col-sm-7">
+					<textarea rows="5" cols="75" v-model="intText" class="form-control"></textarea>
+				</div>
+			</div>
 		</div>
+	
+	<div v-if="showDocument">
+			<slot name="document">
+				<div class="row mb-3">
+					<label for="text" class="form-label col-sm-2">Dokument</label>
+					
+					<!--Todo(Manu) Component SingleFile-->
+					<!--<single-file id="file" v-model="intDocument"></single-file>-->
+
+					<div  class="col-sm-7">					
+					<span>
+					  <input type="file" ref="fileInput" @change="handleFileChange" v-model="intAnhang"/>
+<!--      							<button type="submit">Upload</button>-->
+							<div v-if="intAnhang.name">
+							  <p>Selected File: {{ intAnhang.name }}</p>
+							  <button class="text-danger">X</button>
+							</div>
+					</span>
+					<span >					
+						<ul>							
+							<li v-for="anh in anhang">
+								<button>{{anh.name}}</button><button class="text-danger">X</button>
+							</li>
+						</ul>
+					</span>
+					</div>
+				</div>
+			</slot>
+	</div>	
+
+		<div v-if="showErweitert">
+			<slot name="erweitert">	
+				<div class="row mb-3">
+					<label for="bis" class="form-label col-sm-2">VerfasserIn</label>
+					<div class="col-sm-7">
+						<input type="text" v-model="intVerfasser" class="form-contrsol">	
+						{{uid}}
+					</div>
+				</div>
+				
+				<div class="row mb-3">
+					<label for="bis" class="form-label col-sm-2">BearbeiterIn</label>
+					<div class="col-sm-7">
+						<input type="text" v-model="intBearbeiter" class="form-control">	
+					</div>
+				</div>
+							
+				<div class="row mb-3">
+					<label for="von" class="form-label col-sm-2">von</label>
+					<div class="col-sm-2">
+						<vue-date-picker id="von" v-model="intVon" clearable="false" no-today auto-apply enable-time-picker="true" format="dd.MM.yyyy" preview-format="dd.MM.yyyy"></vue-date-picker>
+					</div>
+	
+					<label for="bis" class="form-label col-sm-1">bis</label>
+					<div class="col-sm-2">
+						<vue-date-picker id="bis" v-model="intBis" clearable="false" no-today auto-apply enable-time-picker="true" format="dd.MM.yyyy" preview-format="dd.MM.yyyy"></vue-date-picker>
+					</div>
+	
+					<label for="bis" class="form-label col-sm-1">erledigt</label>
+					<div class="col-sm-1"> 
+						<input type="checkbox" v-model="intErledigt">	
+					</div>
+				</div>
+			</slot>
 		
-		<div class="notizText row mb-3">
-			<label for="text" class="form-label col-sm-2">Text</label>
-			<div class="col-sm-6">
-				<textarea rows="5" cols="75" v-model="intText" class="form-control"></textarea>
-			</div>
-		</div>
+	</div>
 		
-		<div class="notizDoc row mb-3">
-			<label for="text" class="form-label col-sm-2">Dokument</label>
-			<div class="col-sm-6">
-				<input type="text" v-model="intDocument" class="form-control">
-			</div>
-		</div>
-		
-		<div class="notizVon row mb-3">
-			<label for="von" class="form-label col-sm-2">von</label>
-			<div class="col-sm-6" >
-				<input type="text" v-model="intVon" class="form-control">	
-			</div>
-		</div>
-		<div class="notizBis row mb-3">
-			<label for="bis" class="form-label col-sm-2">bis</label>
-			<div class="col-sm-6">
-				<input type="text" v-model="intBis" class="form-control">	
-			</div>
-		</div>
-		
-		<div class="notizErledigt row mb-3">
-			<label for="bis" class="form-label col-sm-2">erledigt</label>
-			<div class="col-sm-6"> 
-				<input type="checkbox" v-model="intErledigt">	
-			</div>
-		</div>
-		
-		<div class="notizVerfasser row mb-3">
-			<label for="bis" class="form-label col-sm-2">VerfasserIn</label>
-			<div class="col-sm-6">
-				<input type="text" v-model="intVerfasser" class="form-control">	
-				{{uid}}
-			</div>
-		</div>
-		
-		<div class="notizBearbeiter row mb-3">
-			<label for="bis" class="form-label col-sm-2">BearbeiterIn</label>
-			<div class="col-sm-6">
-				<input type="text" v-model="intBearbeiter" class="form-control">	
-			</div>
-		</div>
 		
 	</form>
 </div>`
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
index 1b87aaf21..7e28e6985 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
@@ -15,7 +15,7 @@ export default {
 		CoreRESTClient,
 		CoreFilterCmpt,
 		Notiz,
-		BsModal
+		BsModal,
 	},
 	props: {
 		modelValue: Object
@@ -31,7 +31,8 @@ export default {
 					{title: "BearbeiterIn", field: "bearbeiter_uid", visible: false},
 					{title: "Start", field: "start"},
 					{title: "Ende", field: "ende"},
-					{title: "Dokumente", field: "dms_id"},
+/*					{title: "Dokumente", field: "dms_id"},*/
+					{title: "Dokumente", field: "countdoc"},
 					{title: "Erledigt", field: "erledigt"},
 					{title: "Notiz_id", field: "notiz_id", visible: false},
 					{title: "Notizzuordnung_id", field: "notizzuordnung_id", visible: false},
@@ -62,18 +63,23 @@ export default {
 				text: null,
 				von: null,
 				bis: null,
-				dms_id: null,
+				document: null,
 				erledigt: false,
 				verfasser: null,
-				bearbeiter: null
+				bearbeiter: null,
+				anhang: []
 			},
+			showErweitert: true,
+			showDocument: true,
+
 		}
 	},
 	methods:{
 		actionDeleteNotiz(notiz_id){
 			this.loadNotiz(notiz_id).then(() => {
-				if(this.notizen.notiz_id)
+				if(this.notizen.notiz_id) {
 					this.$refs.deleteNotizModal.show();
+				}
 			});
 		},
 		actionEditNotiz(notiz_id){
@@ -84,10 +90,14 @@ export default {
 					this.formData.text = this.notizen.text;
 					this.formData.von = this.notizen.start;
 					this.formData.bis = this.notizen.ende;
-					this.formData.doc = this.notizen.dms_id;
+					this.formData.document = this.notizen.dms_id;
 					this.formData.erledigt = this.notizen.erledigt;
 					this.formData.verfasser = this.notizen.verfasser_uid;
 					this.formData.bearbeiter = this.notizen.bearbeiter_uid;
+					if(this.notizen.dms_id){
+						console.log("loadEntries");
+						this.loadDocEntries(this.notizen.notiz_id);
+					}
 				}
 			});
 		},
@@ -97,14 +107,20 @@ export default {
 			this.formData.text = null;
 			this.formData.von = null;
 			this.formData.bis = null;
-			this.formData.dms_id = null;
+			this.formData.document = null;
 			this.formData.erledigt = false;
 			this.formData.verfasser = null;
 			this.formData.bearbeiter = null;
+			this.formData.anhang = [];
 		},
 		addNewNotiz(notizData) {
+			console.log(this.formData);
+			const formData = new FormData();
+			Object.entries(this.formData).forEach(([k, v]) => formData.append(k, v));
+			console.log(formData);
 			CoreRESTClient.post('components/stv/Notiz/addNewNotiz/' + this.modelValue.person_id,
-				this.formData
+				formData,
+				{ Headers: { "Content-Type": "multipart/form-data" } }
 			).then(response => {
 				if (!response.data.error) {
 					this.$fhcAlert.alertSuccess('Anlegen von neuer Notiz erfolgreich');
@@ -123,6 +139,9 @@ export default {
 				window.scrollTo(0, 0);
 			});
 		},
+		attachFile(){
+			console.log("ATTACH FILE");
+		},
 		deleteNotiz(notiz_id){
 			CoreRESTClient.post('components/stv/Notiz/deleteNotiz/' + notiz_id)
 				.then(response => {
@@ -139,12 +158,30 @@ export default {
 				window.scrollTo(0, 0);
 			});
 		},
+		loadDocEntries(notiz_id){
+			return CoreRESTClient.get('components/stv/Notiz/loadDokumente/' + notiz_id)
+				.then(
+					result => {
+						console.log(result.data);
+						if(result.data.retval)
+							this.formData.anhang = result.data.retval;
+						else
+						{
+							this.formData.anhang = {};
+							this.$fhcAlert.alertError('Kein Dokumenteneintrag mit NotizId ' + notiz_id + ' gefunden');
+						}
+						return result;
+					}
+				);
+		},
 		loadNotiz(notiz_id){
 			return CoreRESTClient.get('components/stv/Notiz/loadNotiz/' + notiz_id)
 				.then(
 					result => {
-						if(result.data.retval)
+						if(result.data.retval) {
 							this.notizen = result.data.retval;
+
+						}
 						else
 						{
 							this.notizen = {};
@@ -162,10 +199,11 @@ export default {
 			this.formData.text = null;
 			this.formData.von = null;
 			this.formData.bis = null;
-			this.formData.dms_id = null;
+			this.formData.document = null;
 			this.formData.erledigt = false;
 			this.formData.verfasser = null;
 			this.formData.bearbeiter = null;
+			this.formData.anhang = [];
 		},
 		updateNotiz(notiz_id){
 			CoreRESTClient.post('components/stv/Notiz/updateNotiz/' + notiz_id,
@@ -189,11 +227,12 @@ export default {
 				window.scrollTo(0, 0);
 				//this.reload();
 			});
-		}
+		},
 	},
 	template: `
 	<div class="stv-details-details h-100 pb-3">
-	
+	{{modelValue}}
+
 		<!--Modal: deleteNotizModal-->
 		<BsModal ref="deleteNotizModal">
 			<template #title>Notiz löschen</template>
@@ -205,7 +244,7 @@ export default {
 				<button ref="Close" type="button" class="btn btn-primary" @click="deleteNotiz(notizen.notiz_id)">OK</button>
 			</template>
 		</BsModal>
-	
+			
 		<core-filter-cmpt
 		ref="table"
 		:tabulator-options="tabulatorOptions"
@@ -220,20 +259,30 @@ export default {
 	</core-filter-cmpt>
 
 	<br>	
+	<hr>
 		<Notiz 
+			:showErweitert="showErweitert"
+			:showDocument="showDocument"
 			v-model:titel="formData.titel" 
 			v-model:text="formData.text" 
-			v-model:action="formData.action" 
+			v-model:action="formData.action" 				
 			v-model:von="formData.von" 
 			v-model:bis="formData.bis" 
-			v-model:document="formData.dms_id"
+			v-model:document="formData.document"
 			v-model:erledigt="formData.erledigt"
 			v-model:verfasser="formData.verfasser"
 			v-model:bearbeiter="formData.bearbeiter"
-		></Notiz>
+			v-model:anhang="formData.anhang"
+		>
+		</Notiz>
 			
 		<button v-if="formData.action === 'Neue Notiz'"  type="button" class="btn btn-primary" @click="addNewNotiz()"> Neu anlegen </button>
 		<button v-else type="button" class="btn btn-warning" @click="updateNotiz(notizen.notiz_id)"> Speichern </button>
+		
+		
+		<div>
+			parent: {{anhang}} | {{formData.anhang.name}}
+		</div>
 	</div>
 `
 };
\ No newline at end of file

From fed4f7f9293853a886704c3e62d8bbdb458b12fe Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Thu, 21 Dec 2023 08:53:56 +0100
Subject: [PATCH 0261/1461] replaced form-control with custom css construct

---
 application/views/Cis/Profil.php              |  12 --
 public/css/components/Profil.css              |  59 ++++++
 public/js/apps/Cis/Profil.js                  |  15 +-
 .../Cis/Profil/MitarbeiterProfil.js           | 189 ++++++++++--------
 .../Cis/Profil/MitarbeiterViewProfil.js       |  94 +++++----
 .../js/components/Cis/Profil/StudentProfil.js |  26 ++-
 .../Cis/Profil/StudentViewProfil.js           |  78 ++++----
 7 files changed, 280 insertions(+), 193 deletions(-)

diff --git a/application/views/Cis/Profil.php b/application/views/Cis/Profil.php
index 059a4edc1..9e09bea62 100644
--- a/application/views/Cis/Profil.php
+++ b/application/views/Cis/Profil.php
@@ -9,18 +9,6 @@ $includesArray = array(
 
 $this->load->view('templates/CISHTML-Header', $includesArray);
 ?>
-<!--
-
-	<student-profil></student-profil>
-	<component :is="StudentProfil"></component>
-	<h2>Profil</h2>
-	
-	<hr>
-	<component :is="<?php //echo "StudentProfil"; ?>" ></component>
-	 we can pass information from the php view file to the public js file throughz interpolating data from php into vue props 
-	<Profil <?php //echo "uid=$uid" ?> view=<?php //echo $view? boolval(1): boolval(0); ?>></Profil>
-
--->
 
 <div id="content" >
 
diff --git a/public/css/components/Profil.css b/public/css/components/Profil.css
index 42defa8e7..5334dfa48 100644
--- a/public/css/components/Profil.css
+++ b/public/css/components/Profil.css
@@ -46,6 +46,65 @@
   box-shadow:none;
 } 
 
+.fhc-form .form-floating > .form-control:focus ~ .floating-title, .form-floating > .form-control:not(:placeholder-shown) ~ .floating-title, .form-floating > .form-select ~ .floating-title{
+  opacity: .65;
+  transform: scale(.85) translateY(-.5rem) translateX(.15rem);
+}
+
+.fhc-form .form-floating > .floating-title{
+  position: absolute;
+  top: 0;
+  left: 0;
+  height: 100%;
+  padding: 1rem .75rem;
+  pointer-events: none;
+  border: 1px solid transparent;
+  transform-origin: 0 0;
+  transition: opacity .1s ease-in-out,transform .1s ease-in-out;
+}
+
+.floating-title{
+  display:inline-block;
+}
+
+.form-floating>.form-control, .form-floating>.form-select{
+  height: auto;
+}
+
+
+/* FORM UNDERLINE
+*/
+.form-underline{
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-content: space-between;
+
+}
+.form-underline .form-underline-content{
+  border-width: 1px;
+  border-color: transparent transparent #dee2e6 transparent;
+  border-style: solid;
+  padding-bottom: 0.25rem;
+  padding-left: 0.5rem;
+
+  /*optional not wrapping text that is horizontally scrollable and does not display a scrollbar */
+  white-space: nowrap;
+  overflow: auto;
+  scrollbar-width: none;
+
+}
+
+.form-underline .form-underline-content::-webkit-scrollbar {
+  display: none;
+}
+
+.form-underline .form-underline-titel{
+  opacity: 0.65;
+  font-size: .85rem;
+  padding-left: 0.5rem;
+}
+
 /*   dl {
     width: 100%;
     overflow: hidden;
diff --git a/public/js/apps/Cis/Profil.js b/public/js/apps/Cis/Profil.js
index 5eac4db58..f1a1206a5 100644
--- a/public/js/apps/Cis/Profil.js
+++ b/public/js/apps/Cis/Profil.js
@@ -38,7 +38,6 @@ Vue.$collapseFormatter  = function(data){
 const app = Vue.createApp({
 	
 	components: {
-		Base,
 		StudentProfil,
 		MitarbeiterProfil,
 		ViewStudentProfil,
@@ -68,18 +67,20 @@ const app = Vue.createApp({
 			}
 			this.view = res.data?.view;
 			this.data = res.data?.data;
-			//* only for testing purposes and needs to be deleted after
-			this.data.base = "Base";
+			
 		});
 	},
 	template:`
 	<div>
 
-	<div v-if="notFoundUID">
+		<div v-if="notFoundUID">
+		
+			<h3>Es wurden keine oder mehrere Profile für {{this.notFoundUID}} gefunden</h3>
+
+		</div>
+
+		<component v-else :is="view" :data="data" ></component>
 	
-	<h3>Es wurden keine oder mehrere Profile für {{this.notFoundUID}} gefunden</h3>
-	</div>
-	<component v-else :is="view" :data="data" ></component>
 	</div>`
 	
 	
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index b827358b8..c466c28f0 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -216,7 +216,7 @@ export default {
         Geburtsdatum: this.data.gebdatum,
         Geburtsort: this.data.gebort,
         Kurzzeichen: this.data.kurzbz,
-        Telefon: this.data.telefonklappe + (this.data.standort_telefon?this.data.standort_telefon:""),
+        Telefon:  (this.data.standort_telefon?this.data.standort_telefon:"") + " " + this.data.telefonklappe,
         Büro: this.data.ort_kurzbz,
       };
     },
@@ -348,7 +348,7 @@ export default {
 
 
                   
-                  <div  class="row justify-content-center align-items-center">
+                  <div  class="gy-3 row justify-content-center align-items-center">
 
 
 
@@ -377,20 +377,25 @@ export default {
 
 <!-- COLUMNS WITH MULTIPLE ROWS NEXT TO PROFIL PICTURE -->
                   <div class="col-12 col-sm-6">
-                  <div class="row">
+                  <div class="row gy-4">
                   <div class="col-12">
-                  <div class=" form-floating mb-2">
+                  
                         
-                  <input  readonly class="form-control form-control-plaintext border-bottom" id="floatingVorname"  :value="data.vorname">
-                  <label for="floatingVorname">Vorname</label>
-                </div>
+                  <div class="form-underline ">
+                  <div class="form-underline-titel">Vorname</div>
+                  <span class="form-underline-content">{{data.vorname}} </span>
+                  </div>
+
+
+                
                 </div>
                 <div class="col-12">
-                <div class=" form-floating mb-2">
-                        
-                  <input  readonly class="form-control form-control-plaintext border-bottom" id="floatingNachname"  :value="data.nachname">
-                  <label for="floatingNachname">Nachname</label>
+              
+                <div class="form-underline ">
+                <div class="form-underline-titel">Nachname</div>
+                <span class="form-underline-content">{{data.nachname}} </span>
                 </div>
+
                 </div>
                 </div>
              
@@ -405,11 +410,15 @@ export default {
 
 
                   <div v-for="(wert,bez) in personData" class="col-md-6 col-sm-12 ">
-                  <div class=" form-floating mb-2">
-                        
-                  <input  readonly class="form-control form-control-plaintext border-bottom" :id="'floating'+bez"  :value="wert?wert:'-'">
-                  <label :for="'floating'+bez">{{bez}}</label>
+                  
+                  
+                  <div class="form-underline ">
+                  <div class="form-underline-titel">{{bez}}</div>
+                  <span class="form-underline-content">{{wert?wert:'-'}} </span>
                   </div>
+                
+
+
                   </div>
 
                   
@@ -432,21 +441,25 @@ export default {
                          Mitarbeiter Information
                          </div>
                          <div class="card-body">
-                             <div class="row">
+                             <div class="gy-3 row">
                              <div v-for="(wert,bez) in specialData" class="col-md-6 col-sm-12 ">
                              
                             
-                             <div  class=" form-floating mb-2">  
-                              <!-- print Telefon link -->
+                             
+                             
                                
-                                <a v-if="bez=='Telefon'" :href="get_mitarbeiter_standort_telefon" readonly class="form-control form-control-plaintext border-bottom" :id="'floating'+bez">
-                                  <input :role="get_mitarbeiter_standort_telefon?'button':''" readonly :value="wert?wert:'-'" class="w-100" style="border:none; outline:none;" />
-                                </a>
+                                <div class="form-underline">
+                                <div class="form-underline-titel">{{bez }}</div>
 
-                              <!-- otherwise print input field -->
-                                 <input v-else  readonly class="form-control form-control-plaintext border-bottom" :id="'floating'+bez"  :value="wert?wert:'-'">
-                                 <label :for="'floating'+bez">{{bez}}</label>
-                                 </div>
+                                <!-- print Telefon link -->
+                                <a :href="get_mitarbeiter_standort_telefon" v-if="bez=='Telefon'" :href="get_mitarbeiter_standort_telefon" class="form-underline-content">{{wert?wert:'-'}}</a>
+                                
+                                <!-- else print information -->
+                                <span v-else class="form-underline-content">{{wert?wert:'-'}}</span>
+                                </div>
+                                
+
+                         
                              </div>
                          </div>
                          
@@ -489,29 +502,36 @@ export default {
 
 
 
+                   
+
                       <div v-for="(wert,bezeichnung) in personKontakt">
 
                       
             
                       <!-- HIER SIND DIE EMAILS -->
                   
+
                   
-                      <div v-for="email in wert" v-if="typeof wert === 'object' && bezeichnung == 'emails'" class="row justify-content-center ">
-                      <div  class="col-12 ">
+                      <div  v-if="typeof wert === 'object' && bezeichnung == 'emails'" class="gy-3 row justify-content-center ">
+                      <div v-for="email in wert" class="col-12 ">
                      
                             <div class="row align-items-center">
+                            
                       <div class="col-1 text-center">
 
                       <i class="fa-solid fa-envelope" style="color:rgb(0, 100, 156)"></i>
 
                       </div>
-                      <div class="col">
-                      <div class=" form-floating mb-2">
-                            <a :href="'mailto:'+email.email" readonly class="form-control form-control-plaintext border-bottom" :id="'floating'+email.type">
-                              <input role="button" readonly :value="email.email" class="w-100" style="border:none; outline:none;" />
-                            </a>
-                            <label :for="'floating'+email.type">{{email.type }}</label>
+
+                      
+                      <div class="col-11">
+
+                      <div class="form-underline">
+                      <div class="form-underline-titel">{{email.type}}</div>
+                      <a :href="'mailto:'+email.email" class="form-underline-content">{{email.email}} </a>
                       </div>
+                      
+                      
                       </div>
                       </div>
                       </div>
@@ -541,49 +561,43 @@ export default {
                           </div>
                           <div class="card-body ">
                             
-                            <div v-for="element in privateKontakte" class="align-items-center row justify-content-center">
+                            <div  class="gy-3  row ">
+                            <div v-for="element in privateKontakte" class="col-12">
+                            <div class="gy-3 row align-items-center justify-content-center">
                               <div class="col-1 text-center" >
                               
                               <i class="fa-solid " :class="{...(element.kontakt.includes('@')?{'fa-envelope':true}:{'fa-phone':true})}" style="color:rgb(0, 100, 156)"></i>
                               </div>
-                              <div  :class="{...(element.anmerkung? {'col-11':true, 'col-md-5':true, 'col-xl-11':true, 'col-xxl-5':true} : {'col-9':true, 'col-xl-9':true})}">
+                              <div  :class="{...(element.anmerkung? {'col-11':true, 'col-md-6':true, 'col-xl-11':true, 'col-xxl-6':true} : {'col-10':true, 'col-xl-9':true, 'col-xxl-10':true})}">
                                   
                                   <!-- rendering KONTAKT emails -->
-                                  <div v-if="element.kontakt.includes('@')" class=" form-floating mb-2">
+                             
 
-
-                                      <a :href="'mailto:'+element.kontakt" readonly class="form-control form-control-plaintext border-bottom" :id="'floating'+element.kontakttyp">
-                                        <input role="button" readonly :value="element.kontakt" class="w-100" style="border:none; outline:none;" />
-                                      </a>
-                                      <label :for="'floating'+element.kontakttyp">{{element.kontakttyp}}</label>
-
-                                     
-                                  </div>
-                                  <!-- rendering KONTAKT phones -->
-                                  <div v-else class=" form-floating mb-2">
-
-
-                                      <a :href="'tel:'+element.kontakt" readonly class="form-control form-control-plaintext border-bottom" :id="'floating'+element.kontakttyp">
-                                        <input role="button" readonly :value="element.kontakt" class="w-100" style="border:none; outline:none;" />
-                                      </a>
-                                      <label :for="'floating'+element.kontakttyp">{{element.kontakttyp}}</label>
-
-                                     
+                                  <div  class="form-underline ">
+                                  <div class="form-underline-titel">{{element.kontakttyp}}</div>
+                                  <a  :href="'mailto:'+element.kontakt" v-if="element.kontakt.includes('@')" class="form-underline-content">{{element.kontakt}} </a>
+                                  <a  v-else :href="'tel:'+element.kontakt" class="form-underline-content">{{element.kontakt}} </a>
                                   </div>
+                                    
+                                 
 
                               </div>
-                              <div v-if="element?.anmerkung" class="offset-1 offset-md-0 col-9 col-md-4  offset-xl-1 offset-xxl-0 col-xl-9 col-xxl-4 order-2 order-md-1 order-xl-1 order-sm-1 order-xxl-1  ">
-                                  <div class=" form-floating mb-2">
-                                      <input   readonly class="form-control form-control-plaintext border-bottom" id="floatingAnmerkung" :value="element.anmerkung">
-                                      <label for="floatingAnmerkung">Anmerkung</label>
-                                  </div>
+                              <div v-if="element?.anmerkung" class="offset-1 offset-md-0 offset-xl-1 offset-xxl-0 order-2 order-sm-1 col-10  col-md-4   col-xl-9 col-xxl-4   ">
+                                  
+                              <div  class="form-underline ">
+                              <div class="form-underline-titel">Anmerkung</div>
+                              <span  class="form-underline-content">{{element.anmerkung}} </span>
                               </div>
-                              <div class="col-2 order-2 order-sm-2 order-md-2 order-lg-1 col-xl-2 col-xxl-2 allign-middle">
+
+                            
+                              </div>
+                              <div class="col-1 col-sm-1 order-2  order-lg-1 col-xl-2 col-xxl-1 allign-middle">
                                   <i v-if="element.zustellung" class="fa-solid fa-check"></i>
                                   <i v-else="element.zustellung" class="fa-solid fa-xmark"></i>
                               </div>
                             </div>
-                           
+                            </div>
+                            </div>
                           </div>
                         </div>
                       </div>
@@ -597,7 +611,10 @@ export default {
                           <div class="card-header">Private Adressen</div>
                           <div class="card-body">
                           
-                            <div v-for="element in privateAdressen" class="row justify-content-center align-items-center">
+                            <div class="gy-3 row ">
+                            <div v-for="element in privateAdressen" class="col-12">
+                            <div class="gy-3 row justify-content-center align-items-center">
+                            
                             <!-- column 1 in the address row -->
                             
                                 <div class="col-1 text-center">
@@ -605,35 +622,43 @@ export default {
                                   <i class="fa fa-location-dot fa-lg" style="color:#00649C "></i>
                                 
                                 </div>
-                                <div  class="col ">
-                                    <div class=" form-floating mb-2">
-                                        <input   readonly class="form-control form-control-plaintext border-bottom" id="floatingStrasse" :value="element.strasse">
-                                        <label for="floatingStrasse">Strasse</label>
-                                    </div>
+                                <div  class="col-11 col-sm-8 col-xl-11 col-xxl-8 order-1">
+
+                                <div class="form-underline ">
+                                <div class="form-underline-titel">Strasse</div>
+                                <span class="form-underline-content">{{element.strasse}} </span>
+                                </div>
+
+
                                 </div>
-                                <div class="w-100 "></div>
                                 
                             <!-- column 2 in the address row -->
-                                <div  class="col-11 offset-1 offset-md-0 offset-xl-1  col-xl-6 order-xl-1 col-md-3 col-sm-6 col-xs-6 order-sm-1">
-                                    <div class=" form-floating mb-2">
-                                        <input   readonly class="form-control form-control-plaintext border-bottom" id="floatingTyp" :value="element.adr_typ">
-                                        <label for="floatingTyp">Typ</label>
+                                <div  class="offset-1 offset-sm-0 offset-xl-1 offset-xxl-0 order-2 order-sm-4 order-xl-2 order-xxl-4 col-11 col-sm-5  col-xl-11 col-xxl-5  ">
+                                    
+
+                                    <div class="form-underline ">
+                                    <div class="form-underline-titel">Typ</div>
+                                    <span class="form-underline-content">{{element.adr_typ}} </span>
+                                    </div>
+
+                                </div>
+                                <div  class="offset-1 order-3 order-sm-3 col-11 col-sm-6  col-xl-7 col-xxl-6 ">
+                                    
+                                    <div class="form-underline ">
+                                    <div class="form-underline-titel">Ort</div>
+                                    <span class="form-underline-content">{{element.ort}} </span>
                                     </div>
                                 </div>
-                                <div  class="col-11 offset-1  col-xl-11 col-md-5 col-sm-11 col-xs-11 ">
-                                    <div class=" form-floating mb-2">
-                                        <input   readonly class="form-control form-control-plaintext border-bottom" id="floatingOrt" :value="element.ort">
-                                        <label for="floatingOrt">Ort</label>
-                                    </div>
-                                </div>
-                                <div  class="col-11 offset-1 offset-sm-0 offset-md-0 col-xl-5 order-xl-2 col-md-3 col-sm-5 col-xs-5 order-sm-2">
-                                    <div class=" form-floating mb-2">
-                                        <input   readonly class="form-control form-control-plaintext border-bottom" id="floatingPLZ" :value="element.plz">
-                                        <label for="floatingPLZ">PLZ</label>
+                                <div  class="offset-1 offset-sm-0 order-4 order-sm-2 order-xl-4 order-xxl-2 col-11 col-sm-3 col-xl-4 col-xxl-3 ">
+                                    <div class="form-underline ">
+                                    <div class="form-underline-titel">PLZ</div>
+                                    <span class="form-underline-content">{{element.plz}} </span>
                                     </div>
                                 </div>
                             </div>
                           </div>
+                          </div>
+                            </div>
                         </div>
                       </div>
                     </div>
diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
index f7efd5d19..b20818517 100644
--- a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
@@ -129,7 +129,7 @@ export default {
 
     get_mitarbeiter_standort_telefon(){
       if(this.data.standort_telefon){
-        return "tel:"+ this.data.telefonklappe + this.data.standort_telefon;
+        return "tel:"+ this.data.telefonklappe + this.data.standort_telefon ;
       }else{
         return null;
       }
@@ -167,7 +167,7 @@ export default {
       return {
         
         Kurzzeichen: this.data.kurzbz,
-        Telefon: this.data.telefonklappe + (this.data.standort_telefon?this.data.standort_telefon:""),
+        Telefon: (this.data.standort_telefon?this.data.standort_telefon:"") + " " + this.data.telefonklappe ,
         Büro: this.data.ort_kurzbz,
       };
     },
@@ -333,44 +333,7 @@ export default {
                     </div>
 		    </div>
                     </div>
-                     <div class="row mb-4">
-                     
-
-                     <div  class=" col-lg-12">
-        
-                     <div class="card">
-                 
-                         <div class="card-header">
-                         Mitarbeiter Information
-                         </div>
-                         <div class="card-body">
-                             <div class="row">
-                             <div v-for="(wert,bez) in specialData" class="col-md-6 col-sm-12 ">
-                             
-                            
-                             <div  class=" form-floating mb-2">  
-                              <!-- print Telefon link -->
-                                <a v-if="bez=='Telefon'" :href="get_mitarbeiter_standort_telefon" readonly class="form-control form-control-plaintext border-bottom" :id="'floating'+bez">
-                                  <input :role="get_mitarbeiter_standort_telefon?'button':''" readonly :value="wert?wert:'-'" class="w-100" style="border:none; outline:none;" />
-                                </a>
-                              <!-- otherwise print input field -->
-                                 <input v-else  readonly class="form-control form-control-plaintext border-bottom" :id="'floating'+bez"  :value="wert?wert:'-'">
-                                 <label :for="'floating'+bez">{{bez}}</label>
-                                 </div>
-                             </div>
-                         </div>
-                         
-                     </div>
-                     
-                 </div>
-
-                     </div>  
-                            
-
-
-
-<!-- END OF THE FIRST KAESTCHEN -->
-                      </div>
+                    
 
 
                       <!-- START OF SECOND PROFIL  INFORMATION COLUMN -->
@@ -418,10 +381,11 @@ export default {
                       <div class="col">
                       <div class=" form-floating mb-2">
                             
-                      <a :href="'mailto:'+email.email" readonly class="form-control form-control-plaintext border-bottom" :id="'floating'+email.type">
-                              <input role="button" readonly :value="email.email" class="w-100" style="border:none; outline:none;" />
+                      <a :href="'mailto:'+email.email" class="form-control form-control-plaintext border-bottom" :id="'floating'+email.type">
+                             {{email.email}}
                             </a>
-                            <label :for="'floating'+email.type">{{email.type }}</label>
+                            <div class="floating-title">{{email.type }}</div>
+
                       </div>
                       </div>
                       </div>
@@ -444,6 +408,50 @@ export default {
                     </div></div>
 
 
+                    <!-- SECOND ROW OF SECOND COLUMN IN MAIN CONTENT -->
+                    <div class="row mb-4">
+                     
+
+                    <div  class=" col-lg-12">
+       
+                    <div class="card">
+                
+                        <div class="card-header">
+                        Mitarbeiter Information
+                        </div>
+                        <div class="card-body">
+                            <div class="row">
+                            <div v-for="(wert,bez) in specialData" class="col-md-6 col-sm-12 ">
+                            
+                           
+                            <div  class=" form-floating mb-2">  
+                             <!-- print Telefon link -->
+                             <template v-if="bez=='Telefon'">
+                               <a  :href="get_mitarbeiter_standort_telefon"  class="form-control form-control-plaintext border-bottom" :id="'floating'+bez">
+                                 {{wert?wert:'-'}}
+                                </a>
+                                <div class="floating-title">{{bez }}</div>
+                                </template>
+
+                             <!-- otherwise print input field -->
+                                <template v-else>
+                                <input  readonly class="form-control form-control-plaintext border-bottom" :id="'floating'+bez"  :value="wert?wert:'-'">
+                                <label :for="'floating'+bez">{{bez }}</label>
+                                </template>
+                                </div>
+                            </div>
+                        </div>
+                        
+                    </div>
+                    
+                </div>
+
+                    </div>  
+                           
+                     </div>
+                     <!-- END OF SECOND ROW OF SECOND COLUMN IN MAIN CONTENT -->
+
+
 
 
                     <!-- END OF THE SECOND INFORMATION COLUMN -->
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index 98fa81cb6..469c72411 100644
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -155,7 +155,7 @@ export default {
         Studiengang: this.data.studiengang,
         Semester: this.data.semester,
         Verband: this.data.verband,
-        Gruppe: this.data.gruppe,
+        Gruppe: this.data.gruppe.trim(),
       };
     },
 
@@ -419,19 +419,24 @@ export default {
                       <div  class="col-12 ">
                      
                             <div class="row align-items-center">
+                            <!--
                       <div class="col-1 text-center">
 
                       <i class="fa-solid fa-envelope" style="color:rgb(0, 100, 156)"></i>
 
                       </div>
+                      -->
                       <div class="col">
                       <div class=" form-floating mb-2">
                             
                             <a :href="'mailto:'+email.email" readonly class="form-control form-control-plaintext border-bottom" :id="'floating'+email.type">
-                              <input role="button" readonly :value="email.email" class="w-100" style="border:none; outline:none;" />
+                              {{email.email}}
                             </a>
-                            <label :for="'floating'+email.type">{{email.type }}</label>
+                            <div class="floating-title"> <i class="fa-solid fa-envelope" style="color:rgb(0, 100, 156)"></i> {{email.type }}</div>
                       </div>
+
+                   
+
                       </div>
                       </div>
                       </div>
@@ -464,27 +469,28 @@ export default {
                             <div v-for="element in privateKontakte" class="align-items-center row justify-content-center">
                               <div class="col-1 text-center" >
                               
-                              <i class="fa-solid " :class="{...(element.kontakt.includes('@')?{'fa-envelope':true}:{'fa-phone':true})}" style="color:rgb(0, 100, 156)"></i>
+                              <!--<i class="fa-solid " :class="{...(element.kontakt.includes('@')?{'fa-envelope':true}:{'fa-phone':true})}" style="color:rgb(0, 100, 156)"></i>-->
                               </div>
                               <div  :class="{...(element.anmerkung? {'col-11':true, 'col-md-5':true, 'col-xl-11':true, 'col-xxl-5':true} : {'col-9':true, 'col-xl-9':true})}">
                                   
                                   <!-- rendering KONTAKT emails -->
                                   <div v-if="element.kontakt.includes('@')" class=" form-floating mb-2">
                                     
-                                    <a :href="'mailto:'+element.kontakt" readonly class="form-control form-control-plaintext border-bottom" :id="'floating'+element.kontakttyp">
-                                      <input role="button" readonly :value="element.kontakt" class="w-100" style="border:none; outline:none;" />
+                                    <a :href="'mailto:'+element.kontakt" class="form-control form-control-plaintext border-bottom" :id="'floating'+element.kontakttyp">
+                                     {{element.kontakt}}
                                     </a>
-                                    <label :for="'floating'+element.kontakttyp">{{element.kontakttyp}}</label>
+                                     <div class="floating-title"><i class="fa-solid fa-envelope" style="color:rgb(0, 100, 156)"></i> {{element.kontakttyp }}</div>
                                   
                                   </div>
 
                                   <!-- rendering KONTAKT phones -->
                                   <div v-else class=" form-floating mb-2">
                                      
-                                    <a :href="'tel:'+element.kontakt" readonly class="form-control form-control-plaintext border-bottom" :id="'floating'+element.kontakttyp">
-                                      <input role="button" readonly :value="element.kontakt" class="w-100" style="border:none; outline:none;" />
+                                    <a :href="'tel:'+element.kontakt" class="form-control form-control-plaintext border-bottom" :id="'floating'+element.kontakttyp">
+                                      {{element.kontakt}}
                                     </a>
-                                    <label :for="'floating'+element.kontakttyp">{{element.kontakttyp}}</label>
+                                    <div class="floating-title"><i class="fa-solid fa-phone" style="color:rgb(0, 100, 156)"></i> {{element.kontakttyp }}</div>
+                                    
 
                                   </div>
 
diff --git a/public/js/components/Cis/Profil/StudentViewProfil.js b/public/js/components/Cis/Profil/StudentViewProfil.js
index 5967fe7f9..b05c68db7 100644
--- a/public/js/components/Cis/Profil/StudentViewProfil.js
+++ b/public/js/components/Cis/Profil/StudentViewProfil.js
@@ -61,7 +61,7 @@ export default {
         Studiengang: this.data.studiengang,
         Semester: this.data.semester,
         Verband: this.data.verband,
-        Gruppe: this.data.gruppe,
+        Gruppe: this.data.gruppe.trim(),
       };
     },
 
@@ -224,40 +224,7 @@ export default {
                     </div>
 		    </div>
                     </div>
-                     <div class="row mb-4">
-                     
-
-                     <div  class=" col-lg-12">
-        
-                     <div class="card">
-                 
-                         <div class="card-header">
-                         Studenten Information
-                         </div>
-                         <div class="card-body">
-                             <div class="row">
-                             <div v-for="(wert,bez) in specialData" class="col-md-6 col-sm-12 ">
-                             
-                            
-                             <div  class=" form-floating mb-2">  
-                            
-                                 <input   readonly class="form-control form-control-plaintext border-bottom" :id="'floating'+bez"  :value="wert?wert:'-'">
-                                 <label :for="'floating'+bez">{{bez}}</label>
-                                 </div>
-                             </div>
-                         </div>
-                         
-                     </div>
-                     
-                 </div>
-
-                     </div>  
-                            
-
-
-
-<!-- END OF THE FIRST KAESTCHEN -->
-                      </div>
+                  
 
 
                       <!-- START OF SECOND PROFIL  INFORMATION COLUMN -->
@@ -305,10 +272,10 @@ export default {
                       <div class="col">
                       <div class=" form-floating mb-2">
                            
-                            <a :href="'mailto:'+email.email" readonly class="form-control form-control-plaintext border-bottom" :id="'floating'+email.type">
-                              <input role="button" readonly :value="email.email" class="w-100" style="border:none; outline:none;" />
+                            <a :href="'mailto:'+email.email" class="form-control form-control-plaintext border-bottom" :id="'floating'+email.type">
+                              {{email.email}}
                             </a>
-                            <label :for="'floating'+email.type">{{email.type }}</label>
+                            <div class="floating-title">{{email.type }}</div>
 
                       </div>
                       </div>
@@ -331,8 +298,41 @@ export default {
                     </div>
                     </div></div>
 
-                   
+                   <!-- SECOND ROW OF SECOND COLUMN IN MAIN CONTENT -->
+                    <div class="row mb-4">
+                     
 
+                    <div  class=" col-lg-12">
+       
+                    <div class="card">
+                
+                        <div class="card-header">
+                        Studenten Information
+                        </div>
+                        <div class="card-body">
+                            <div class="row">
+                            <div v-for="(wert,bez) in specialData" class="col-md-6 col-sm-12 ">
+                            
+                           
+                            <div  class=" form-floating mb-2">  
+                           
+                                <input   readonly class="form-control form-control-plaintext border-bottom" :id="'floating'+bez"  :value="wert?wert:'-'">
+                                <label :for="'floating'+bez">{{bez}}</label>
+                                </div>
+                            </div>
+                        </div>
+                        
+                    </div>
+                    
+                </div>
+
+                    </div>  
+                           
+
+
+                     </div>
+
+                     <!-- END OF SECOND ROW OF SECOND COLUMN IN MAIN CONTENT -->
                   
 
 

From d6ef9c4ec4f3f3144cffc4e872273ce6dbcc1bc9 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Thu, 21 Dec 2023 11:46:42 +0100
Subject: [PATCH 0262/1461] adds custom floating label css construct to the
 rest of the profil views

---
 .../Cis/Profil/MitarbeiterViewProfil.js       |  90 +++++----
 .../js/components/Cis/Profil/StudentProfil.js | 181 ++++++++++--------
 .../Cis/Profil/StudentViewProfil.js           |  74 ++++---
 3 files changed, 201 insertions(+), 144 deletions(-)

diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
index b20818517..6b3ab22bb 100644
--- a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
@@ -289,20 +289,27 @@ export default {
 
 <!-- COLUMNS WITH MULTIPLE ROWS NEXT TO PROFIL PICTURE -->
                   <div class="col-12 col-sm-6">
-                  <div class="row">
+                  <div class="gy-4 row">
                   <div class="col-12">
-                  <div class=" form-floating mb-2">
-                        
-                  <input  readonly class="form-control form-control-plaintext border-bottom" id="floatingVorname"  :value="data.vorname">
-                  <label for="floatingVorname">Vorname</label>
+                
+
+                  <div  class="form-underline ">
+                <div class="form-underline-titel">Vorname</div>
+                <span class="form-underline-content">{{data.vorname}} </span>
+                
                 </div>
+
+                        
                 </div>
                 <div class="col-12">
-                <div class=" form-floating mb-2">
-                        
-                  <input  readonly class="form-control form-control-plaintext border-bottom" id="floatingNachname"  :value="data.nachname">
-                  <label for="floatingNachname">Nachname</label>
+                
+                
+                <div  class="form-underline ">
+                <div class="form-underline-titel">Nachname</div>
+                <span class="form-underline-content">{{data.nachname}} </span>
+                
                 </div>
+
                 </div>
                 </div>
              
@@ -317,13 +324,18 @@ export default {
 
 
                   <div v-for="(wert,bez) in personData" class="col-md-6 col-sm-12 ">
-                  <div class=" form-floating mb-2">
                         
-                  <input  readonly class="form-control form-control-plaintext border-bottom" :id="'floating'+bez"  :value="wert?wert:'-'">
-                  <label :for="'floating'+bez">{{bez}}</label>
-                  </div>
-                  </div>
 
+
+                  
+                  <div  class="form-underline ">
+                  <div class="form-underline-titel">{{bez}}</div>
+                  <span class="form-underline-content">{{wert?wert:'-'}} </span>
+                  
+                  </div>
+                  
+                  </div>
+                
                   
                       </div>
 
@@ -369,8 +381,8 @@ export default {
                       <!-- HIER SIND DIE EMAILS -->
                   
                   
-                      <div v-for="email in wert" v-if="typeof wert === 'object' && bezeichnung == 'emails'" class="row justify-content-center ">
-                      <div  class="col-12 ">
+                      <div  v-if="typeof wert === 'object' && bezeichnung == 'emails'" class="gy-3 row justify-content-center ">
+                      <div v-for="email in wert" class="col-12 ">
                      
                             <div class="row align-items-center">
                       <div class="col-1 text-center">
@@ -379,14 +391,16 @@ export default {
 
                       </div>
                       <div class="col">
-                      <div class=" form-floating mb-2">
-                            
-                      <a :href="'mailto:'+email.email" class="form-control form-control-plaintext border-bottom" :id="'floating'+email.type">
-                             {{email.email}}
-                            </a>
-                            <div class="floating-title">{{email.type }}</div>
 
-                      </div>
+
+
+                      <div  class="form-underline ">
+                  <div class="form-underline-titel">{{email.type}}</div>
+                  <a :href="'mailto:'+email.email" class="form-underline-content" >{{email.email}}</a>
+                  </div>
+                     
+                            
+                   
                       </div>
                       </div>
                       </div>
@@ -420,25 +434,25 @@ export default {
                         Mitarbeiter Information
                         </div>
                         <div class="card-body">
-                            <div class="row">
+                            <div class="gy-3 row">
                             <div v-for="(wert,bez) in specialData" class="col-md-6 col-sm-12 ">
                             
                            
-                            <div  class=" form-floating mb-2">  
-                             <!-- print Telefon link -->
-                             <template v-if="bez=='Telefon'">
-                               <a  :href="get_mitarbeiter_standort_telefon"  class="form-control form-control-plaintext border-bottom" :id="'floating'+bez">
-                                 {{wert?wert:'-'}}
-                                </a>
-                                <div class="floating-title">{{bez }}</div>
-                                </template>
+                         
 
-                             <!-- otherwise print input field -->
-                                <template v-else>
-                                <input  readonly class="form-control form-control-plaintext border-bottom" :id="'floating'+bez"  :value="wert?wert:'-'">
-                                <label :for="'floating'+bez">{{bez }}</label>
-                                </template>
-                                </div>
+                                <div  class="form-underline ">
+                             <div class="form-underline-titel">{{bez}}</div>
+                             <a v-if="bez=='Telefon'" :href="get_mitarbeiter_standort_telefon"  class="form-underline-content" >
+                             {{wert?wert:'-'}}
+                            </a>
+                             <span  v-else class="form-underline-content" >
+                                 {{wert?wert:'-'}}
+                                </span>
+                             
+                             </div>
+
+                               
+                              
                             </div>
                         </div>
                         
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index 469c72411..62a4a0799 100644
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -245,7 +245,7 @@ export default {
 
                     <!-- INFORMATION CONTENT START -->
                     <!-- ROW WITH THE PROFIL INFORMATION --> 
-                    <div class="row mb-4">
+                    <div class="row mb-4 ">
 
 
 
@@ -265,7 +265,7 @@ export default {
 
 <!-- FIRST KAESTCHEN -->
                       <div  class="col-lg-12 col-xl-6 ">
-                     <div class="row mb-4">
+                     <div class="row mb-4 ">
                      <div class="col">
                      
                         
@@ -279,7 +279,7 @@ export default {
 
 
                   
-                  <div  class="row align-items-center">
+                  <div  class="row gy-3 align-items-center">
 
 
 
@@ -308,20 +308,29 @@ export default {
 
 <!-- COLUMNS WITH MULTIPLE ROWS NEXT TO PROFIL PICTURE -->
                   <div class="col-12 col-sm-6">
-                  <div class="row">
+                  <div class="row gy-4">
                   <div class="col-12">
-                  <div class=" form-floating mb-2">
+                 
                         
-                  <input  readonly class="form-control form-control-plaintext border-bottom" id="floatingVorname"  :value="data.vorname">
-                  <label for="floatingVorname">Vorname</label>
-                </div>
+                  <div  class="form-underline ">
+                  <div class="form-underline-titel">Vorname</div>
+                  <span class="form-underline-content">{{data.vorname}} </span>
+                  
+                  </div>
+
+                  
+               
                 </div>
                 <div class="col-12">
-                <div class=" form-floating mb-2">
-                        
-                  <input  readonly class="form-control form-control-plaintext border-bottom" id="floatingNachname"  :value="data.nachname">
-                  <label for="floatingNachname">Nachname</label>
-                </div>
+                
+                     
+
+                  <div  class="form-underline ">
+                  <div class="form-underline-titel">Nachname</div>
+                  <span class="form-underline-content">{{data.nachname}} </span>
+                  
+                  </div>
+                
                 </div>
                 </div>
              
@@ -330,11 +339,15 @@ export default {
                   
 
                   <div v-for="(wert,bez) in personData" class="col-md-6 col-sm-12 ">
-                  <div class=" form-floating mb-2">
-                        
-                  <input  readonly class="form-control form-control-plaintext border-bottom" :id="'floating'+bez"  :value="wert?wert:'-'">
-                  <label :for="'floating'+bez">{{bez}}</label>
+          
+
+
+                  <div  class="form-underline ">
+                  <div class="form-underline-titel">{{bez}}</div>
+                  <span class="form-underline-content">{{wert?wert:'-'}} </span>
+                  
                   </div>
+                  
                   </div>
 
                   
@@ -346,7 +359,7 @@ export default {
                     </div>
 		    </div>
                     </div>
-                     <div class="row mb-4">
+                     <div class="row mb-4 ">
                      
 
                      <div  class=" col-lg-12">
@@ -357,15 +370,18 @@ export default {
                          Studenten Information
                          </div>
                          <div class="card-body">
-                             <div class="row">
+                             <div class="row gy-3">
                              <div v-for="(wert,bez) in specialData" class="col-md-6 col-sm-12 ">
                              
                           
-                             <div  class=" form-floating mb-2">  
+                             <div  class="form-underline ">
+                             <div class="form-underline-titel">{{bez}}</div>
+                             <span class="form-underline-content">{{wert?wert:'-'}} </span>
+                             
+                             </div>
                            
-                                 <input   readonly class="form-control form-control-plaintext border-bottom" :id="'floating'+bez"  :value="wert?wert:'-'">
-                                 <label :for="'floating'+bez">{{bez}}</label>
-                                 </div>
+                               
+                               
                              </div>
                          </div>
                          
@@ -415,8 +431,8 @@ export default {
                       <!-- HIER SIND DIE EMAILS -->
                   
                   
-                      <div v-for="email in wert" v-if="typeof wert === 'object' && bezeichnung == 'emails'" class="row justify-content-center ">
-                      <div  class="col-12 ">
+                      <div  v-if="typeof wert === 'object' && bezeichnung == 'emails'" class="row gy-3 justify-content-center ">
+                      <div v-for="email in wert" class="col-12 ">
                      
                             <div class="row align-items-center">
                             <!--
@@ -429,10 +445,11 @@ export default {
                       <div class="col">
                       <div class=" form-floating mb-2">
                             
-                            <a :href="'mailto:'+email.email" readonly class="form-control form-control-plaintext border-bottom" :id="'floating'+email.type">
-                              {{email.email}}
-                            </a>
-                            <div class="floating-title"> <i class="fa-solid fa-envelope" style="color:rgb(0, 100, 156)"></i> {{email.type }}</div>
+                            <div class="form-underline ">
+                            <div class="form-underline-titel">{{email.type}}</div>
+                            <a :href="'mailto'+email.email" class="form-underline-content">{{email.email}} </a>
+                            </div>
+
                       </div>
 
                    
@@ -466,53 +483,50 @@ export default {
                           </div>
                           <div class="card-body ">
                             
-                            <div v-for="element in privateKontakte" class="align-items-center row justify-content-center">
+                            <div  class="gy-3  row ">
+                            <div v-for="element in privateKontakte" class="col-12">
+                            <div class="gy-3 row align-items-center justify-content-center">
                               <div class="col-1 text-center" >
                               
-                              <!--<i class="fa-solid " :class="{...(element.kontakt.includes('@')?{'fa-envelope':true}:{'fa-phone':true})}" style="color:rgb(0, 100, 156)"></i>-->
+                              <i class="fa-solid " :class="{...(element.kontakt.includes('@')?{'fa-envelope':true}:{'fa-phone':true})}" style="color:rgb(0, 100, 156)"></i>
                               </div>
-                              <div  :class="{...(element.anmerkung? {'col-11':true, 'col-md-5':true, 'col-xl-11':true, 'col-xxl-5':true} : {'col-9':true, 'col-xl-9':true})}">
+                              <div  :class="{...(element.anmerkung? {'col-11':true, 'col-md-6':true, 'col-xl-11':true, 'col-xxl-6':true} : {'col-10':true, 'col-xl-9':true, 'col-xxl-10':true})}">
                                   
                                   <!-- rendering KONTAKT emails -->
-                                  <div v-if="element.kontakt.includes('@')" class=" form-floating mb-2">
+                             
+
+                                  <div  class="form-underline ">
+                                  <div class="form-underline-titel">{{element.kontakttyp}}</div>
+                                  <a  :href="'mailto:'+element.kontakt" v-if="element.kontakt.includes('@')" class="form-underline-content">{{element.kontakt}} </a>
+                                  <a  v-else :href="'tel:'+element.kontakt" class="form-underline-content">{{element.kontakt}} </a>
+                                  </div>
                                     
-                                    <a :href="'mailto:'+element.kontakt" class="form-control form-control-plaintext border-bottom" :id="'floating'+element.kontakttyp">
-                                     {{element.kontakt}}
-                                    </a>
-                                     <div class="floating-title"><i class="fa-solid fa-envelope" style="color:rgb(0, 100, 156)"></i> {{element.kontakttyp }}</div>
+                                 
+
+                              </div>
+                              <div v-if="element?.anmerkung" class="offset-1 offset-md-0 offset-xl-1 offset-xxl-0 order-2 order-sm-1 col-10  col-md-4   col-xl-9 col-xxl-4   ">
                                   
-                                  </div>
-
-                                  <!-- rendering KONTAKT phones -->
-                                  <div v-else class=" form-floating mb-2">
-                                     
-                                    <a :href="'tel:'+element.kontakt" class="form-control form-control-plaintext border-bottom" :id="'floating'+element.kontakttyp">
-                                      {{element.kontakt}}
-                                    </a>
-                                    <div class="floating-title"><i class="fa-solid fa-phone" style="color:rgb(0, 100, 156)"></i> {{element.kontakttyp }}</div>
-                                    
-
-                                  </div>
-
+                              <div  class="form-underline ">
+                              <div class="form-underline-titel">Anmerkung</div>
+                              <span  class="form-underline-content">{{element.anmerkung}} </span>
                               </div>
-                              <div v-if="element?.anmerkung" class="offset-1 offset-md-0 col-9 col-md-4  offset-xl-1 offset-xxl-0 col-xl-9 col-xxl-4 order-2 order-md-1 order-xl-1 order-sm-1 order-xxl-1  ">
-                                  <div class=" form-floating mb-2">
-                                      <input   readonly class="form-control form-control-plaintext border-bottom" id="floatingAnmerkung" :value="element.anmerkung">
-                                      <label for="floatingAnmerkung">Anmerkung</label>
-                                  </div>
+
+                            
                               </div>
-                              <div class="col-2 order-2 order-sm-2 order-md-2 order-lg-1 col-xl-2 col-xxl-2 allign-middle">
+                              <div class="col-1 col-sm-1 order-2  order-lg-1 col-xl-2 col-xxl-1 allign-middle">
                                   <i v-if="element.zustellung" class="fa-solid fa-check"></i>
                                   <i v-else="element.zustellung" class="fa-solid fa-xmark"></i>
                               </div>
                             </div>
-                           
+                            </div>
+                            </div>
                           </div>
                         </div>
                       </div>
                     </div>
                     <!-- -->
 
+
                     <!-- HIER SIND DIE PRIVATEN ADRESSEN-->
                     <div class="row mb-4">
                       <div class="col">
@@ -520,7 +534,10 @@ export default {
                           <div class="card-header">Private Adressen</div>
                           <div class="card-body">
                           
-                            <div v-for="element in privateAdressen" class="row justify-content-center align-items-center">
+                            <div class="gy-3 row ">
+                            <div v-for="element in privateAdressen" class="col-12">
+                            <div class="gy-3 row justify-content-center align-items-center">
+                            
                             <!-- column 1 in the address row -->
                             
                                 <div class="col-1 text-center">
@@ -528,35 +545,43 @@ export default {
                                   <i class="fa fa-location-dot fa-lg" style="color:#00649C "></i>
                                 
                                 </div>
-                                <div  class="col ">
-                                    <div class=" form-floating mb-2">
-                                        <input   readonly class="form-control form-control-plaintext border-bottom" id="floatingStrasse" :value="element.strasse">
-                                        <label for="floatingStrasse">Strasse</label>
-                                    </div>
+                                <div  class="col-11 col-sm-8 col-xl-11 col-xxl-8 order-1">
+
+                                <div class="form-underline ">
+                                <div class="form-underline-titel">Strasse</div>
+                                <span class="form-underline-content">{{element.strasse}} </span>
+                                </div>
+
+
                                 </div>
-                                <div class="w-100 "></div>
                                 
                             <!-- column 2 in the address row -->
-                                <div  class="col-11 offset-1 offset-md-0 offset-xl-1  col-xl-6 order-xl-1 col-md-3 col-sm-6 col-xs-6 order-sm-1">
-                                    <div class=" form-floating mb-2">
-                                        <input   readonly class="form-control form-control-plaintext border-bottom" id="floatingTyp" :value="element.adr_typ">
-                                        <label for="floatingTyp">Typ</label>
+                                <div  class="offset-1 offset-sm-0 offset-xl-1 offset-xxl-0 order-2 order-sm-4 order-xl-2 order-xxl-4 col-11 col-sm-5  col-xl-11 col-xxl-5  ">
+                                    
+
+                                    <div class="form-underline ">
+                                    <div class="form-underline-titel">Typ</div>
+                                    <span class="form-underline-content">{{element.adr_typ}} </span>
+                                    </div>
+
+                                </div>
+                                <div  class="offset-1 order-3 order-sm-3 col-11 col-sm-6  col-xl-7 col-xxl-6 ">
+                                    
+                                    <div class="form-underline ">
+                                    <div class="form-underline-titel">Ort</div>
+                                    <span class="form-underline-content">{{element.ort}} </span>
                                     </div>
                                 </div>
-                                <div  class="col-11 offset-1  col-xl-11 col-md-5 col-sm-11 col-xs-11 ">
-                                    <div class=" form-floating mb-2">
-                                        <input   readonly class="form-control form-control-plaintext border-bottom" id="floatingOrt" :value="element.ort">
-                                        <label for="floatingOrt">Ort</label>
-                                    </div>
-                                </div>
-                                <div  class="col-11 offset-1 offset-sm-0 offset-md-0 col-xl-5 order-xl-2 col-md-3 col-sm-5 col-xs-5 order-sm-2">
-                                    <div class=" form-floating mb-2">
-                                        <input   readonly class="form-control form-control-plaintext border-bottom" id="floatingPLZ" :value="element.plz">
-                                        <label for="floatingPLZ">PLZ</label>
+                                <div  class="offset-1 offset-sm-0 order-4 order-sm-2 order-xl-4 order-xxl-2 col-11 col-sm-3 col-xl-4 col-xxl-3 ">
+                                    <div class="form-underline ">
+                                    <div class="form-underline-titel">PLZ</div>
+                                    <span class="form-underline-content">{{element.plz}} </span>
                                     </div>
                                 </div>
                             </div>
                           </div>
+                          </div>
+                            </div>
                         </div>
                       </div>
                     </div>
diff --git a/public/js/components/Cis/Profil/StudentViewProfil.js b/public/js/components/Cis/Profil/StudentViewProfil.js
index b05c68db7..38aadb1d6 100644
--- a/public/js/components/Cis/Profil/StudentViewProfil.js
+++ b/public/js/components/Cis/Profil/StudentViewProfil.js
@@ -158,7 +158,7 @@ export default {
 
 
                   
-                  <div  class="row align-items-center">
+                  <div  class="gy-3 row align-items-center">
 
 
 
@@ -180,20 +180,31 @@ export default {
 
 <!-- COLUMNS WITH MULTIPLE ROWS NEXT TO PROFIL PICTURE -->
                   <div class="col-12 col-sm-6">
-                  <div class="row">
+                  <div class="gy-4 row">
                   <div class="col-12">
-                  <div class=" form-floating mb-2">
+                 
                         
-                  <input  readonly class="form-control form-control-plaintext border-bottom" id="floatingVorname"  :value="data.vorname">
-                  <label for="floatingVorname">Vorname</label>
-                </div>
+                  <div  class="form-underline ">
+                  <div class="form-underline-titel">Vorname</div>
+                  <span class="form-underline-content">{{data.vorname}} </span>
+                  
+                  </div>
+
+
+
                 </div>
                 <div class="col-12">
-                <div class=" form-floating mb-2">
+               
                         
-                  <input  readonly class="form-control form-control-plaintext border-bottom" id="floatingNachname"  :value="data.nachname">
-                  <label for="floatingNachname">Nachname</label>
-                </div>
+                
+
+                  <div  class="form-underline ">
+                  <div class="form-underline-titel">Nachname</div>
+                  <span class="form-underline-content">{{data.nachname}} </span>
+                  
+                  </div>
+
+
                 </div>
                 </div>
              
@@ -208,11 +219,16 @@ export default {
 
 
                   <div v-for="(wert,bez) in personData" class="col-md-6 col-sm-12 ">
-                  <div class=" form-floating mb-2">
+                  
                         
-                  <input  readonly class="form-control form-control-plaintext border-bottom" :id="'floating'+bez"  :value="wert?wert:'-'">
-                  <label :for="'floating'+bez">{{bez}}</label>
+                  <div  class="form-underline ">
+                  <div class="form-underline-titel">{{bez}}</div>
+                  <span class="form-underline-content">{{wert?wert:'-'}} </span>
+                  
                   </div>
+
+
+                  
                   </div>
 
                   
@@ -260,8 +276,8 @@ export default {
                       <!-- HIER SIND DIE EMAILS -->
                   
                   
-                      <div v-for="email in wert" v-if="typeof wert === 'object' && bezeichnung == 'emails'" class="row justify-content-center ">
-                      <div  class="col-12 ">
+                      <div  v-if="typeof wert === 'object' && bezeichnung == 'emails'" class="gy-3 row justify-content-center ">
+                      <div v-for="email in wert" class="col-12 ">
                      
                             <div class="row align-items-center">
                       <div class="col-1 text-center">
@@ -270,14 +286,15 @@ export default {
 
                       </div>
                       <div class="col">
-                      <div class=" form-floating mb-2">
+                     
                            
-                            <a :href="'mailto:'+email.email" class="form-control form-control-plaintext border-bottom" :id="'floating'+email.type">
-                              {{email.email}}
-                            </a>
-                            <div class="floating-title">{{email.type }}</div>
+                            <div  class="form-underline ">
+                            <div class="form-underline-titel">{{email.type }}</div>
+                            <a :href="'mailto:'+email.emails" class="form-underline-content">{{email.email}} </a>
+                            
+                            </div>
 
-                      </div>
+                     
                       </div>
                       </div>
                       </div>
@@ -299,7 +316,7 @@ export default {
                     </div></div>
 
                    <!-- SECOND ROW OF SECOND COLUMN IN MAIN CONTENT -->
-                    <div class="row mb-4">
+                    <div class=" row mb-4">
                      
 
                     <div  class=" col-lg-12">
@@ -310,15 +327,16 @@ export default {
                         Studenten Information
                         </div>
                         <div class="card-body">
-                            <div class="row">
+                            <div class="gy-3 row">
                             <div v-for="(wert,bez) in specialData" class="col-md-6 col-sm-12 ">
                             
+
+                            <div  class="form-underline ">
+                            <div class="form-underline-titel">{{bez}}</div>
+                            <span class="form-underline-content">{{wert?wert:'-'}} </span>
+                            
+                            </div>
                            
-                            <div  class=" form-floating mb-2">  
-                           
-                                <input   readonly class="form-control form-control-plaintext border-bottom" :id="'floating'+bez"  :value="wert?wert:'-'">
-                                <label :for="'floating'+bez">{{bez}}</label>
-                                </div>
                             </div>
                         </div>
                         

From d38ed229bfaf89b973b80e1539d180048417053f Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 21 Dec 2023 14:01:25 +0100
Subject: [PATCH 0263/1461] Korrekturen Bugs

---
 public/js/components/Stv/Studentenverwaltung/Details.js  | 2 +-
 public/js/components/Stv/Studentenverwaltung/List/New.js | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details.js b/public/js/components/Stv/Studentenverwaltung/Details.js
index 3f723fdab..69182db29 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details.js
@@ -24,7 +24,7 @@ export default {
 			<div class="d-flex justify-content-start align-items-center w-100 pb-3 gap-3" style="max-height:8rem">
 				<img v-for="student in students" :key="student.person_id" class="d-block h-100 rounded" alt="profilbild" :src="appRoot + '/cis/public/bild.php?src=person&person_id=' + student.person_id">
 				<div v-if="students.length == 1">
-					<h2 class="h4">{{students[0].titlepre}} {{students[0].vorname}} {{students[0].nachname}} {{students[0].titlepost}}
+					<h2 class="h4">{{students[0].titlepre}} {{students[0].vorname}} {{students[0].nachname}} {{students[0].titlepost}}</h2>
 				</div>
 			</div>
 			<fhc-tabs v-if="students.length == 1" :modelValue="students[0]" config-url="/components/stv/config/student" :default="$route.params.tab" style="flex: 1 1 0%; height: 0%"></fhc-tabs>
diff --git a/public/js/components/Stv/Studentenverwaltung/List/New.js b/public/js/components/Stv/Studentenverwaltung/List/New.js
index d62f92dd3..37f25a823 100644
--- a/public/js/components/Stv/Studentenverwaltung/List/New.js
+++ b/public/js/components/Stv/Studentenverwaltung/List/New.js
@@ -280,7 +280,7 @@ export default {
 						</tbody>
 					</table>
 				</template>
-				<tempalte v-else>
+				<template v-else>
 					<div class="row">
 						<div class="col-sm-4 mb-3">
 							<form-input
@@ -670,7 +670,6 @@ export default {
 							</div>
 						</div>
 					</div>
-
 				</template>
 			</template>
 			<template #footer>

From c7ee0ce82b00757a1b502dd0bec2dc40fc81416d Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 21 Dec 2023 14:02:01 +0100
Subject: [PATCH 0264/1461] Tabs.js: MarkRaw Warning

---
 public/js/components/Tabs.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Tabs.js b/public/js/components/Tabs.js
index 809a258ce..84104b812 100644
--- a/public/js/components/Tabs.js
+++ b/public/js/components/Tabs.js
@@ -47,7 +47,7 @@ export default {
 						return console.error('Component missing for ' + key);
 
 					tabs[key] = {
-						component: Vue.defineAsyncComponent(() => import(config.component)),
+						component: Vue.markRaw(Vue.defineAsyncComponent(() => import(config.component))),
 						title: config.title || key,
 						config: config.config,
 						key

From f479e7ff62c37ab1c9efbf3c526152e0ef29d41e Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 21 Dec 2023 15:09:50 +0100
Subject: [PATCH 0265/1461] Better List Click handling

---
 .../Stv/Studentenverwaltung/List.js           | 45 +++++++++++--------
 1 file changed, 27 insertions(+), 18 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index 6b262560f..f3e1b1bc0 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -60,11 +60,11 @@ export default {
 					{title:"GeburtsdatumISO", field:"geburtsdatum_iso", visible:false},
 				],
 
-				layout: 'fitDataFill',
+				layout: 'fitDataStretch',
 				layoutColumnsOnNewData: false,
-				height: 'auto',
+				height: '100%',
 				selectable: true,
-				// TODO(chris): select only one? selectMultiple with click?
+				selectableRangeMode: 'click',
 				index: 'prestudent_id',
 				persistence: true
 			},
@@ -126,7 +126,12 @@ export default {
 				case 'Enter':
 				case 'Space':
 					e.preventDefault();
-					this.$refs.table.tabulator.rowManager.findRow(this.focusObj).component.toggleSelect();
+					const e2 = new Event('click', e);
+					e2.altKey = e.altKey;
+					e2.ctrlKey = e.ctrlKey;
+					e2.shiftKey = e.shiftKey;
+					this.focusObj.dispatchEvent(e2);
+					//row.component.toggleSelect();
 					break;
 				case 'ArrowUp':
 					e.preventDefault();
@@ -159,6 +164,9 @@ export default {
 			}
 		},
 		onFocus(e) { // TODO(chris): this should be in the filter component
+			if (e.target.classList.contains('tablulator-container')) {
+				this.focusObj = this.changeFocus(e.target, e.target.querySelector('.tabulator-row'));
+			}
 			if (e.target.classList.contains('tabulator-tableholder')) {
 				this.focusObj = this.changeFocus(e.target, e.target.querySelector('.tabulator-row'));
 			}
@@ -167,20 +175,21 @@ export default {
 	// TODO(chris): focusin, focusout, keydown and tabindex should be in the filter component
 	// TODO(chris): filter component column chooser has no accessibilty features
 	template: `
-	<div class="stv-list h-100 pt-3" @focusin="onFocus" @focusout="onBlur" @keydown="onKeydown">
-		<core-filter-cmpt
-			ref="table"
-			:tabulator-options="tabulatorOptions"
-			:tabulator-events="tabulatorEvents"
-			table-only
-			:side-menu="false"
-			reload
-			new-btn-show
-			new-btn-label="InteressentIn"
-			@click:new="actionNewPrestudent"
-			tabindex="0"
-		>
-		</core-filter-cmpt>
+	<div class="stv-list h-100 pt-3">
+		<div class="tablulator-container d-flex flex-column h-100" tabindex="0" @focusin="onFocus" @focusout="onBlur" @keydown="onKeydown">
+			<core-filter-cmpt
+				ref="table"
+				:tabulator-options="tabulatorOptions"
+				:tabulator-events="tabulatorEvents"
+				table-only
+				:side-menu="false"
+				reload
+				new-btn-show
+				new-btn-label="InteressentIn"
+				@click:new="actionNewPrestudent"
+			>
+			</core-filter-cmpt>
+		</div>
 		<list-new ref="new" :studiengang-kz="studiengangKz" :studiensemester-kurzbz="studiensemesterKurzbz"></list-new>
 	</div>`
 };
\ No newline at end of file

From 4b5e784081c87f9cd74802b9738106ec5998a83d Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 21 Dec 2023 15:10:30 +0100
Subject: [PATCH 0266/1461] Tabs: handle null and array values

---
 public/js/components/Tabs.js | 44 +++++++++++++++++++++++++-----------
 1 file changed, 31 insertions(+), 13 deletions(-)

diff --git a/public/js/components/Tabs.js b/public/js/components/Tabs.js
index 84104b812..80f59e646 100644
--- a/public/js/components/Tabs.js
+++ b/public/js/components/Tabs.js
@@ -40,19 +40,37 @@ export default {
 			.get(this.configUrl)
 			.then(result => CoreRESTClient.getData(result.data))
 			.then(result => {
-				const tabs = {};
-				// TODO(chris): check if result is array
-				Object.entries(result).forEach(([key, config]) => {
-					if (!config.component)
-						return console.error('Component missing for ' + key);
+				if (!result)
+					return;
 
-					tabs[key] = {
-						component: Vue.markRaw(Vue.defineAsyncComponent(() => import(config.component))),
-						title: config.title || key,
-						config: config.config,
-						key
-					}
-				});
+				const tabs = {};
+
+				if (Array.isArray(result)) {
+					result.forEach((config, key) => {
+						if (!config.component)
+							return console.error('Component missing for ' + key);
+
+						tabs[key] = {
+							component: Vue.markRaw(Vue.defineAsyncComponent(() => import(config.component))),
+							title: config.title || key,
+							config: config.config,
+							key
+						}
+					});
+
+				} else {
+					Object.entries(result).forEach(([key, config]) => {
+						if (!config.component)
+							return console.error('Component missing for ' + key);
+
+						tabs[key] = {
+							component: Vue.markRaw(Vue.defineAsyncComponent(() => import(config.component))),
+							title: config.title || key,
+							config: config.config,
+							key
+						}
+					});
+				}
 				if (tabs[this.default])
 					this.current = this.default;
 				else
@@ -62,7 +80,7 @@ export default {
 			.catch(this.$fhcAlert.handleSystemError);
 	},
 	template: `
-	<div class="fhc-tabs d-flex flex-column">
+	<div class="fhc-tabs d-flex flex-column" v-if="Object.keys(tabs).length">
 		<div class="nav nav-tabs">
 			<div
 				v-for="tab in tabs"

From a2f944ff924c110ce52005bb27160d0876cfe24a Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 22 Dec 2023 11:01:43 +0100
Subject: [PATCH 0267/1461] VueJs Warning: FhcAlert number/string

---
 public/js/plugin/FhcAlert.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/plugin/FhcAlert.js b/public/js/plugin/FhcAlert.js
index 079039aed..03f6a6020 100644
--- a/public/js/plugin/FhcAlert.js
+++ b/public/js/plugin/FhcAlert.js
@@ -133,8 +133,8 @@ const helperApp = Vue.createApp({
 		helperAppContainer.parentElement.removeChild(helperAppContainer);
 	},
 	template: `
-	<pv-toast ref="toast" base-z-index="99999"></pv-toast>
-	<pv-toast ref="alert" base-z-index="99999" position="center">
+	<pv-toast ref="toast" :base-z-index="99999"></pv-toast>
+	<pv-toast ref="alert" :base-z-index="99999" position="center">
 		<template #message="slotProps">
 			<i class="fa fa-circle-exclamation fa-2xl mt-3"></i>
 			<div class="p-toast-message-text">

From 787d479a338b114874d854c9ce7ca7e1b95299cf Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 22 Dec 2023 11:04:42 +0100
Subject: [PATCH 0268/1461] Filter Cmpt: correct type for Column names

---
 public/js/components/filter/Filter/Columns.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/components/filter/Filter/Columns.js b/public/js/components/filter/Filter/Columns.js
index 47d66d5f1..be29e5f19 100644
--- a/public/js/components/filter/Filter/Columns.js
+++ b/public/js/components/filter/Filter/Columns.js
@@ -26,8 +26,8 @@ export default {
 			default: []
 		},
 		names: {
-			type: Array,
-			default: []
+			type: Object,
+			default: {}
 		}
 	},
 	emits: {

From 4503e0db713083a3127e8905920f24eaf02ec520 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 22 Dec 2023 11:05:41 +0100
Subject: [PATCH 0269/1461] Filter Cmpt: handle rowselection via setup option

---
 public/js/components/filter/Filter.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index 77e3d7a60..92984d0eb 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -199,7 +199,7 @@ export const CoreFilterCmpt = {
 				tabulatorOptions.columns = this.filteredColumns;
 			}
 
-			if (tabulatorOptions.columns && tabulatorOptions.columns.filter(el => el.formatter == 'rowSelection').length)
+			if (tabulatorOptions.selectable || (tabulatorOptions.columns && tabulatorOptions.columns.filter(el => el.formatter == 'rowSelection').length))
 				this.tabulatorHasSelector = true;
 
 			// Start the tabulator with the build options
@@ -235,7 +235,7 @@ export const CoreFilterCmpt = {
 			}
 		},
 		_updateTabulator() {
-			this.tabulatorHasSelector = this.filteredColumns.filter(el => el.formatter == 'rowSelection').length;
+			this.tabulatorHasSelector = this.tabulatorOptions.selectable || this.filteredColumns.filter(el => el.formatter == 'rowSelection').length;
 			this.tabulator.setColumns(this.filteredColumns);
 			this.tabulator.setData(this.filteredData);
 		},
@@ -529,7 +529,7 @@ export const CoreFilterCmpt = {
 						<span class="fa-solid fa-rotate-right" aria-hidden="true"></span>
 					</button>
 					<span v-if="$slots.actions && tabulatorHasSelector">Mit {{selectedData.length}} ausgewählten: </span>
-					<slot name="actions" v-bind="tabulatorHasSelector ? selectedData : []"></slot>
+					<slot name="actions" v-bind="{selected: tabulatorHasSelector ? selectedData : []}"></slot>
 				</div>
 				<div class="d-flex gap-1 align-items-baseline flex-grow-1 justify-content-end">
 					<span v-if="!tableOnly">[ {{ filterName }} ]</span>

From 7dbf29d655385d2fc0eda3f5c74c36c5a082545e Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 22 Dec 2023 11:33:55 +0100
Subject: [PATCH 0270/1461] Filter Cmpt: filterType not required (if tableOnly
 is true)

---
 public/js/components/filter/Filter.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index 92984d0eb..24d249f81 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -50,8 +50,7 @@ export const CoreFilterCmpt = {
 			default: true
 		},
 		filterType: {
-			type: String,
-			required: true
+			type: String
 		},
 		tabulatorOptions: Object,
 		tabulatorEvents: Array,

From cbd7566e3c35e1791381a29e1e11df145f9de0be Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 22 Dec 2023 11:34:51 +0100
Subject: [PATCH 0271/1461] CSS improvements

---
 public/css/Studentenverwaltung.css |  2 ++
 public/css/Tabulator5.css          |  6 ++++++
 public/css/components/Tabs.css     | 16 ++++++++++++++++
 3 files changed, 24 insertions(+)
 create mode 100644 public/css/components/Tabs.css

diff --git a/public/css/Studentenverwaltung.css b/public/css/Studentenverwaltung.css
index 85601381a..f845adc43 100644
--- a/public/css/Studentenverwaltung.css
+++ b/public/css/Studentenverwaltung.css
@@ -1,5 +1,7 @@
 @import './components/searchbar.css';
 @import './components/verticalsplit.css';
+@import './components/FilterComponent.css';
+@import './components/Tabs.css';
 @import './components/Notiz.css';
 
 html {
diff --git a/public/css/Tabulator5.css b/public/css/Tabulator5.css
index a9a79a6d8..2c7fa9117 100644
--- a/public/css/Tabulator5.css
+++ b/public/css/Tabulator5.css
@@ -41,3 +41,9 @@
 .tabulator {
 	font-size: 1rem;
 }
+
+.tabulator-row.tabulator-selectable:focus {
+	box-shadow: 0 0 0 .24rem rgba(13,110,253,.25);
+	z-index: 1;
+	outline: 0;
+}
diff --git a/public/css/components/Tabs.css b/public/css/components/Tabs.css
new file mode 100644
index 000000000..7127869f0
--- /dev/null
+++ b/public/css/components/Tabs.css
@@ -0,0 +1,16 @@
+.nav-item.nav-link:focus {
+	box-shadow: 0 0 0 .24rem rgba(13,110,253,.25);
+	z-index: 1;
+	outline: 0;
+	position: relative;
+}
+.nav-item.nav-link:focus::after {
+	content: "";
+	display: block;
+	position: absolute;
+	left: -.5rem;
+	right: -.5rem;
+	top: calc(100% + 1px);
+	background: white;
+	height: .25rem;
+}

From c2fb582db093d7a088d37daae77403c8ba6792ee Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 22 Dec 2023 12:04:03 +0100
Subject: [PATCH 0272/1461] temp

---
 application/controllers/components/stv/Notiz.php | 15 +++++++++++----
 application/models/person/Notiz_model.php        |  2 ++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/application/controllers/components/stv/Notiz.php b/application/controllers/components/stv/Notiz.php
index 00935a95d..89466f97c 100644
--- a/application/controllers/components/stv/Notiz.php
+++ b/application/controllers/components/stv/Notiz.php
@@ -62,19 +62,26 @@ class Notiz extends FHC_Controller
 
 	public function addNewNotiz($person_id)
 	{
-		var_dump($this->input->post('titel'));
-		var_dump($this->input->post('anhang'));
+/*		var_dump($this->input->post('titel'));
+		var_dump($this->input->post('anhang'));*/
 		var_dump($_FILES);
+
 		$this->load->library('form_validation');
+		$this->load->library('DmsLib');
+
+		$name = $this->input->post('anhang')['name'];
 
 
-		$this->form_validation->set_rules('titel', 'titel', 'required');
+		//$this->DmsLib->add($name, $mimetype, $fileHandle);
+
+
+/*		$this->form_validation->set_rules('titel', 'titel', 'required');
 		$this->form_validation->set_rules('text', 'Text', 'required');
 
 		if ($this->form_validation->run() == false)
 		{
 			return $this->outputJsonError($this->form_validation->error_array());
-		}
+		}*/
 
 		$this->load->model('person/Notiz_model', 'NotizModel');
 
diff --git a/application/models/person/Notiz_model.php b/application/models/person/Notiz_model.php
index fbebc3bd8..372fb8485 100644
--- a/application/models/person/Notiz_model.php
+++ b/application/models/person/Notiz_model.php
@@ -136,6 +136,7 @@ class Notiz_model extends DB_Model
 	/**
 	 * Add a Notiz for a given person
 	 */
+	//TODO(manu) add type for Notizzuordnung
 	public function addNotizForPersonWithDoc($person_id, $titel, $text, $erledigt, $verfasser_uid, $von, $bis)
 	{
 		// Loads model Notizzuordnung_model
@@ -187,6 +188,7 @@ class Notiz_model extends DB_Model
 	 * gets all Notizen with Documententries for a person
 	 * @param $person_id
 	 */
+	//Todo(Manu) rewrite in CI-Style
 	public function getNotizWithDocEntries($person_id)
 	{
 		$qry = "

From 733275a16270f4b74aaf600b671f90913a6b5e6c Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Fri, 22 Dec 2023 14:18:49 +0100
Subject: [PATCH 0273/1461] first profil info edit template

---
 application/controllers/Cis/Profil.php        |  20 +-
 .../models/crm/Profil_change_model.php        |  38 ++++
 public/css/components/Profil.css              |  16 +-
 public/js/apps/api/userdata.js                |   6 +-
 .../Cis/Profil/MitarbeiterProfil.js           | 176 +++++++++++++++++-
 .../components/Cis/Profil/ProfilEditModal.js  |  61 ++++++
 .../js/components/Cis/Profil/StudentProfil.js |   6 +-
 system/dbupdate_3.4.php                       |   3 +-
 system/dbupdate_3.4/25999_C4_ma0594.php       |  31 +++
 9 files changed, 343 insertions(+), 14 deletions(-)
 create mode 100644 application/models/crm/Profil_change_model.php
 create mode 100644 public/js/components/Cis/Profil/ProfilEditModal.js
 create mode 100644 system/dbupdate_3.4/25999_C4_ma0594.php

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index 0a3189fdd..d125fcc0e 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -19,6 +19,7 @@ class Profil extends Auth_Controller
 			'View' => ['student/anrechnung_beantragen:r','user:r'],
 			'foto_sperre_function' => ['student/anrechnung_beantragen:r','user:r'],
 			'getView' => ['student/anrechnung_beantragen:r','user:r'],
+			'editProfil' => ['student/anrechnung_beantragen:r','user:r'],
 			
 		]);
 		$this->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
@@ -30,7 +31,7 @@ class Profil extends Auth_Controller
 		$this->load->model('person/Benutzergruppe_model', 'BenutzergruppeModel');
 		$this->load->model('ressource/Betriebsmittelperson_model', 'BetriebsmittelpersonModel');
 		$this->load->model('person/Kontakt_model', 'KontaktModel');
-		
+		$this->load->model('crm/Profil_change_model', 'ChangeModel');
 
 		//? put the uid and pid inside the controller for further usage in views
 		$this->uid = getAuthUID();
@@ -62,6 +63,23 @@ class Profil extends Auth_Controller
 
 
 
+	
+
+	public function editProfil(){
+		
+		$json = $this->input->raw_input_stream;
+		$data = ["uid"=>"karpenko", "profil_changes"=>$json, "change_timestamp"=>"NOW()"];
+		//? gets the data inside the public.tbl_cis_profil_update
+		//$res = json_encode($this->ChangeModel->load([$this->uid]));
+
+		//? inserts new row inside the public.tbl_cis_profil_update table
+		$insert_res = json_encode($this->ChangeModel->insert($data));
+		
+		echo $insert_res;
+
+	}
+
+
 	private function viewMitarbeiterProfil($uid){
 
 		
diff --git a/application/models/crm/Profil_change_model.php b/application/models/crm/Profil_change_model.php
new file mode 100644
index 000000000..eea42a5d0
--- /dev/null
+++ b/application/models/crm/Profil_change_model.php
@@ -0,0 +1,38 @@
+<?php
+
+class Profil_change_model extends DB_Model
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_cis_profil_update';
+		$this->pk = ['uid'];
+        $this->hasSequence = false;
+
+		//? loading other models to query them
+        $this->load->model('crm/prestudentstatus_model', 'PrestudentstatusModel');
+	}
+
+	/**
+	 * getLastStatuses
+	 */
+	public function getData($uid){
+       
+        $res = $this->load($uid);
+        $res = hasData($res) ? getData($res)[0] : null;
+
+        return $res;
+    }
+
+    public function insertData($data){
+       
+        $res =  $this->insert($data);
+        //$res = hasData($res) ? getData($res)[0] : null;
+
+        return $res;
+    }
+
+}
diff --git a/public/css/components/Profil.css b/public/css/components/Profil.css
index 5334dfa48..e6d820ed6 100644
--- a/public/css/components/Profil.css
+++ b/public/css/components/Profil.css
@@ -14,6 +14,18 @@
     }
   }
 
+.image-lock{
+  height:22px; 
+  width:21px; 
+  background-color:white; 
+  position:absolute; 
+  top:0; 
+  right:12px; 
+  display:flex; 
+  align-items:center;
+  justify-content:center;
+}
+
 .tabulator-collapsed-row{
     padding:15px;
     background-color: rgba(0,0,0,0.1);
@@ -41,10 +53,10 @@
   background-color:white;
 }
 
-.fhc-form .form-control:focus{
+/* .fhc-form .form-control:focus{
   border-color:white;
   box-shadow:none;
-} 
+}  */
 
 .fhc-form .form-floating > .form-control:focus ~ .floating-title, .form-floating > .form-control:not(:placeholder-shown) ~ .floating-title, .form-floating > .form-select ~ .floating-title{
   opacity: .65;
diff --git a/public/js/apps/api/userdata.js b/public/js/apps/api/userdata.js
index 8a13d16ae..d671cbd66 100644
--- a/public/js/apps/api/userdata.js
+++ b/public/js/apps/api/userdata.js
@@ -1,6 +1,10 @@
 export default {
 
- 
+    editProfil: function(payload) {
+        const url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router+
+                   `/Cis/Profil/editProfil`;
+        return axios.post(url,payload);
+    },
     
     isMitarbeiterOrStudent: function(uid) {
         const url = FHC_JS_DATA_STORAGE_OBJECT.app_root 
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index c466c28f0..c6306b982 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -1,14 +1,18 @@
 import fhcapifactory from "../../../apps/api/fhcapifactory.js";
 import { CoreFilterCmpt } from "../../../components/filter/Filter.js";
+import BsModal from "../../Bootstrap/Modal.js";
 
 export default {
   components: {
     CoreFilterCmpt,
+    BsModal,
   },
   data() {
     return {
       collapseIconFunktionen: true,
       collapseIconBetriebsmittel: true,
+      //? this reactive object contains all the field the user is able to edit and keep track of which fields he has edited
+      editData:null,
       funktionen_table_options: {
         height: 300,
         layout: "fitColumns",
@@ -114,8 +118,64 @@ export default {
   },
 
   //? this is the prop passed to the dynamic component with the custom data of the view
-  props: ["data"],
+  
+  props: {
+		data: Object,
+		
+		/*
+		 * NOTE(chris): 
+		 * Hack to expose in "emits" declared events to $props which we use 
+		 * in the v-bind directive to forward all events.
+		 * @see: https://github.com/vuejs/core/issues/3432
+		
+		onHideBsModal: Function,
+		onHiddenBsModal: Function,
+		onHidePreventedBsModal: Function,
+		onShowBsModal: Function,
+		onShownBsModal: Function
+    */
+	},
+ /*  mixins: [
+		BsModal,
+	
+	], */
+  popup(options) {
+		return BsModal.popup.bind(this)(null, options);
+	},
   methods: {
+    showModal() {
+      this.$refs.bsmodal.show()
+    },
+
+    hideModal() {
+      // You can call the hide method of the modal component if needed
+      this.$refs.bsmodal.hide();
+    },
+
+
+    insertEditData(){
+      
+      
+      let editDataKeys = Object.keys(this.editData);
+      let this_data = Object.entries(this.data).filter(([key,value])=>{
+        return editDataKeys.includes(key);
+      })
+
+      if(JSON.stringify(this_data) == JSON.stringify(Object.entries(this.editData))){
+        
+        console.log("the editData contains the same information",JSON.stringify(this_data),"editData values:", JSON.stringify(Object.entries(this.editData)));
+      }else{
+        console.log("the editData HAS DIFFERENT INFORMATION");
+      }
+
+      /* if(somethingChanged){
+        console.log("the editData contains changed information");
+      }else{
+        console.log("the editData does not contain changed information");
+      } */
+      //? insert editData into a new row inside the public.tbl_cis_profil_update table
+      //Vue.$fhcapi.UserData.editProfil(this.editData);
+    },
     sperre_foto_function() {
       if (!this.data) {
         return;
@@ -191,7 +251,7 @@ export default {
       return {
         Username: this.data.username,
         Anrede: this.data.anrede,
-        Titel: this.data.titelpre,
+        Titel: this.data.titel,
         Postnomen: this.data.postnomen,
       };
     },
@@ -253,8 +313,26 @@ export default {
       };
     },
   },
+  created() {
 
+    
+    this.editData =  JSON.parse(
+      JSON.stringify(
+      {
+        emails:this.data.emails,
+        kontakte: this.data.kontakte,
+        
+        personData : {...this.personData, vorname: this.data.vorname, nachname: this.data.nachname}
+      }));
+
+      console.log(this.data.titelpre);
+   
+   
+  },
   mounted() {
+
+
+    
     this.$refs.betriebsmittelTable.tabulator.on("tableBuilt", () => {
       this.$refs.betriebsmittelTable.tabulator.setData(this.data.mittel);
     });
@@ -262,12 +340,18 @@ export default {
     this.$refs.funktionenTable.tabulator.on("tableBuilt", () => {
       this.$refs.funktionenTable.tabulator.setData(this.data.funktionen);
     });
+   
+    
+
+    
 
    
   },
 
   template: ` 
 
+  <div class="row"><div class="col"><pre>{{JSON.stringify(editData,null,2)}}</pre></div><div class="col"><pre>{{JSON.stringify(data.emails,null,2)}}</pre></div></div>
+
   <div class="container-fluid text-break fhc-form"  >
     <!-- ROW --> 
           <div class="row">
@@ -362,11 +446,11 @@ export default {
                           <!-- LOCKING IMAGE FUNCTIONALITY -->
                           
                           
-                          <div role="button" @click.prevent="sperre_foto_function" style="height:22px; width:21px; background-color:white; position:absolute; top:0; right:12px; display:flex; align-items:center; justify-content:center;" >
+                          <div role="button" @click.prevent="sperre_foto_function" class="image-lock" >
                           <i :class="{'fa':true, ...(data.foto_sperre?{'fa-lock':true}:{'fa-lock-open':true})} " ></i>
-                          
-                          
                           </div>
+
+
                         </div>
                       </div>
                     <!-- END OF THE ROW WITH THE IMAGE -->
@@ -461,7 +545,87 @@ export default {
 
                          
                              </div>
-                         </div>
+
+
+                             <!-- Bearbeiten Button -->
+                             <div class="col-md-6 col-sm-12 ">
+                              <button @click="showModal" type="button" class="text-start w-100 btn btn-outline-primary" >
+                                <div class="row">
+                                  <div class="col-2">
+                                    <i class="fa fa-edit"></i>
+                                  </div>
+                                  <div class="col-10">Bearbeiten</div>
+                                </div>
+                              </button>
+
+                             <bs-modal ref="bsmodal" >
+                                <template v-slot:title>
+                                  {{"Profil bearbeiten" }}
+                                </template>
+                                <template v-slot:default>
+                                
+                                <!-- START OF THE ACCORDION -->
+
+                                <!-- ACCORDEON 1 -->
+
+
+                                <div class="accordion accordion-flush" id="accordionFlushExample" v-for="ele in editData ">
+                                  <div class="accordion-item">
+                                    <h2 class="accordion-header" id="flush-headingOne">
+                                      <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#flush-collapseOne" aria-expanded="false" aria-controls="flush-collapseOne">
+                                        Personen Daten
+                                      </button>
+                                    </h2>
+                                    <!-- SHOWING ALL MAILS IN THE FIRST PART OF THE ACCORDION -->
+                                    <div id="flush-collapseOne" class="accordion-collapse collapse" aria-labelledby="flush-headingOne" data-bs-parent="#accordionFlushExample">
+                                      <div class="accordion-body">
+                                     
+                                      <div class="row gy-3">
+                                      <div v-for="(wert,bez) in ele" class="col-12">
+                                      <div class="form-underline ">
+                                      <div class="form-underline-titel">
+                                      <label :for="bez+'input'" >{{bez}}</label>
+                                      </div>
+                                      <div>
+                                        
+                                        <input type="email" class="form-control" :id="bez+'input'" v-model="editData.personData[bez]" :placeholder="wert">
+                                      </div>
+                                      </div>
+                                      </div>
+                                      </div>
+
+                                      
+                                      
+                                      
+                                      
+
+                                      </div>
+                                    </div>
+                                  </div>
+
+                                  <!-- -->
+
+                                  <!-- ACCORDEON 2 -->
+
+                                <!-- -->
+                        
+                        
+                                <!-- END OF THE ACCORDION -->
+
+                                </template>
+                                <!-- optional footer 
+                                <template v-slot:footer>
+                                  {{""}}
+                                </template>
+                                -->
+                                </bs-modal>
+
+                           
+                              
+                            
+
+                             </div>
+                             </div>
                          
                      </div>
                      
diff --git a/public/js/components/Cis/Profil/ProfilEditModal.js b/public/js/components/Cis/Profil/ProfilEditModal.js
new file mode 100644
index 000000000..4813e2d3b
--- /dev/null
+++ b/public/js/components/Cis/Profil/ProfilEditModal.js
@@ -0,0 +1,61 @@
+
+export default {
+  
+    data() {
+      return {
+        
+       
+      };
+    },
+  
+    
+    props: ["editData"],
+    methods: {
+      
+    },
+  
+    computed: {
+    
+  
+  
+    
+    },
+  
+    mounted() {
+     console.log(this.editData);
+  
+     
+    },
+  
+    template: ` 
+    <!-- Modal -->
+    <div class="modal fade" id="editProfil" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="editProfilLabel" aria-hidden="true">
+      <div class="modal-dialog">
+        <div class="modal-content">
+          <div class="modal-header">
+            <h5 class="modal-title" id="editProfilLabel">Edit Profil</h5>
+            <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+          </div>
+          <div class="modal-body">
+            
+          </div>
+          <div class="modal-footer">
+            <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
+            <button type="button" @click="insertEditData" class="btn btn-primary">Understood</button>
+          </div>
+        </div>
+      </div>
+    </div>
+    
+    
+    
+    <!-- end of trying the modal -->
+              
+      `,
+  };
+  
+
+
+
+
+
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index 62a4a0799..84997b0ac 100644
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -293,11 +293,11 @@ export default {
                           <!-- LOCKING IMAGE FUNCTIONALITY -->
                           
                           
-                          <div role="button" @click.prevent="sperre_foto_function" style="height:22px; width:21px; background-color:white; position:absolute; top:0; right:12px; display:flex; align-items:center; justify-content:center;" >
+                          <div role="button" @click.prevent="sperre_foto_function" class="image-lock" >
                           <i :class="{'fa':true, ...(data.foto_sperre?{'fa-lock':true}:{'fa-lock-open':true})} " ></i>
-                          
-                          
                           </div>
+
+
                         </div>
                       </div>
                     <!-- END OF THE ROW WITH THE IMAGE -->
diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index 0d1e554dc..4a20a6289 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -47,7 +47,7 @@ require_once('dbupdate_3.4/30181_tabelle_anrechnung_neue_attribute_fuer_begruend
 require_once('dbupdate_3.4/29529_infocenter_anpassungen.php');
 require_once('dbupdate_3.4/29835_uhstat1_erfassung_der_uhstat1_daten_ueber_das_bewerbungstool.php');
 require_once('dbupdate_3.4/33714_erhoehter_studienbeitrag_fuer_drittsaatenangehoerig.php');
-
+require_once('dbupdate_3.4/25999_C4_ma0594.php');
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
@@ -221,6 +221,7 @@ $tabellen=array(
 	"public.tbl_benutzerfunktion"  => array("benutzerfunktion_id","fachbereich_kurzbz","uid","oe_kurzbz","funktion_kurzbz","semester", "datum_von","datum_bis", "updateamum","updatevon","insertamum","insertvon","ext_id","bezeichnung","wochenstunden"),
 	"public.tbl_benutzergruppe"  => array("uid","gruppe_kurzbz","studiensemester_kurzbz","updateamum","updatevon","insertamum","insertvon","ext_id"),
 	"public.tbl_bewerbungstermine" => array("bewerbungstermin_id","studiengang_kz","studiensemester_kurzbz","beginn","ende","nachfrist","nachfrist_ende","anmerkung", "insertamum", "insertvon", "updateamum", "updatevon","studienplan_id","nationengruppe_kurzbz"),
+	"public.tbl_cis_profil_update" => array("uid","profil_changes","change_timestamp"),
 	"public.tbl_buchungstyp"  => array("buchungstyp_kurzbz","beschreibung","standardbetrag","standardtext","aktiv","credit_points"),
 	"public.tbl_dokument"  => array("dokument_kurzbz","bezeichnung","ext_id","bezeichnung_mehrsprachig","dokumentbeschreibung_mehrsprachig","ausstellungsdetails"),
 	"public.tbl_dokumentprestudent"  => array("dokument_kurzbz","prestudent_id","mitarbeiter_uid","datum","updateamum","updatevon","insertamum","insertvon","ext_id"),
diff --git a/system/dbupdate_3.4/25999_C4_ma0594.php b/system/dbupdate_3.4/25999_C4_ma0594.php
new file mode 100644
index 000000000..f5bb66213
--- /dev/null
+++ b/system/dbupdate_3.4/25999_C4_ma0594.php
@@ -0,0 +1,31 @@
+<?php
+
+    if(!$result = @$db->db_query("SELECT 1 FROM public.tbl_cis_profil_update LIMIT 1"))
+    {
+        $qry = "CREATE TABLE public.tbl_cis_profil_update (
+                uid VARCHAR(32) NOT NULL,
+                profil_changes jsonb NOT NULL,
+                change_timestamp TIMESTAMP NOT NULL,
+                CONSTRAINT tbl_cis_profil_update_pk PRIMARY KEY(uid),
+                CONSTRAINT tbl_cis_profil_update_fk FOREIGN KEY(uid) REFERENCES public.tbl_benutzer(uid)
+            );
+
+            GRANT SELECT, INSERT, UPDATE, DELETE ON public.tbl_cis_profil_update TO vilesci;
+            GRANT SELECT, INSERT, UPDATE, DELETE ON public.tbl_cis_profil_update TO web;";
+
+        if(!$db->db_query($qry))
+            echo '<strong>public.tbl_cis_profil_update: '.$db->db_last_error().'</strong><br>';
+        else
+            echo '<br>public.tbl_cis_profil_update: table created';
+    }
+
+
+    if($db->db_num_rows($result)==0)
+	{
+		$qry = "INSERT INTO public.tbl_cis_profil_update(uid, profil_changes, change_timestamp) VALUES('ma0594', '{\"test\":\"data\"}', NOW());";
+
+		if(!$db->db_query($qry))
+			echo '<strong>Prüfungstyp: '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br>test eintrag in public.tbl_cis_profil_update hinzugefügt';
+	}
\ No newline at end of file

From 620528fa50b36b8c761e9f5165079c769b64442f Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Wed, 27 Dec 2023 09:27:18 +0100
Subject: [PATCH 0274/1461] moves the collapseFunction to the parent component
 Profil and also manages the collapse state from the parent

---
 public/css/components/Profil.css              | 43 -----------------
 public/js/apps/Cis/Profil.js                  | 44 +++++++++++++++++
 .../Cis/Profil/MitarbeiterProfil.js           | 47 ++-----------------
 .../Cis/Profil/MitarbeiterViewProfil.js       | 40 +---------------
 .../js/components/Cis/Profil/StudentProfil.js | 39 +--------------
 5 files changed, 53 insertions(+), 160 deletions(-)

diff --git a/public/css/components/Profil.css b/public/css/components/Profil.css
index e6d820ed6..7b13f048c 100644
--- a/public/css/components/Profil.css
+++ b/public/css/components/Profil.css
@@ -40,49 +40,6 @@
   padding:0 !important;
 }
 
-.form-control_{
-  border:0;
-  border-bottom: 1px solid #ced4da;
-  height:auto !important;
-  padding-bottom: 5px !important;
-  padding-left: 3px !important;
-  border-radius:0px;
-}
-
-.form-control-plaintext[readonly]{
-  background-color:white;
-}
-
-/* .fhc-form .form-control:focus{
-  border-color:white;
-  box-shadow:none;
-}  */
-
-.fhc-form .form-floating > .form-control:focus ~ .floating-title, .form-floating > .form-control:not(:placeholder-shown) ~ .floating-title, .form-floating > .form-select ~ .floating-title{
-  opacity: .65;
-  transform: scale(.85) translateY(-.5rem) translateX(.15rem);
-}
-
-.fhc-form .form-floating > .floating-title{
-  position: absolute;
-  top: 0;
-  left: 0;
-  height: 100%;
-  padding: 1rem .75rem;
-  pointer-events: none;
-  border: 1px solid transparent;
-  transform-origin: 0 0;
-  transition: opacity .1s ease-in-out,transform .1s ease-in-out;
-}
-
-.floating-title{
-  display:inline-block;
-}
-
-.form-floating>.form-control, .form-floating>.form-select{
-  height: auto;
-}
-
 
 /* FORM UNDERLINE
 */
diff --git a/public/js/apps/Cis/Profil.js b/public/js/apps/Cis/Profil.js
index f1a1206a5..989a1b5e2 100644
--- a/public/js/apps/Cis/Profil.js
+++ b/public/js/apps/Cis/Profil.js
@@ -35,6 +35,8 @@ Vue.$collapseFormatter  = function(data){
 	return Object.keys(data).length ? container : "";
   };
 
+  
+
 const app = Vue.createApp({
 	
 	components: {
@@ -53,6 +55,48 @@ const app = Vue.createApp({
 		}
 	},
 	methods: {
+		//? arrow function because it references to the this element of the components that use the function
+		collapseFunction: function (e, column) {
+		
+		  //* check if property doesn't exist already and add it to the reactive this properties
+		  if(this[e.target.id] === undefined){
+			this[e.target.id] = true
+		
+		  } 
+		  this[e.target.id]=!this[e.target.id];
+	  
+		  //* gets all event icons of the different rows to use the onClick event later
+		  let allClickableIcons = column._column.cells.map((row) => {
+			return row.element.children[0];
+		  });
+	  
+		  //* changes the icon that shows or hides all the collapsed columns
+		  //* if the replace function does not find the class to replace, it just simply returns false
+		  if (this[e.target.id]) {
+			e.target.classList.replace("fa-angle-up", "fa-angle-down");
+		  } else {
+			e.target.classList.replace("fa-angle-down", "fa-angle-up");
+		  }
+	  
+		  //* changes the icon for every collapsed column to open or closed
+		  if (this[e.target.id]) {
+			allClickableIcons
+			  .filter((column) => {
+				return !column.classList.contains("open");
+			  })
+			  .forEach((col) => {
+				col.click();
+			  });
+		  } else {
+			allClickableIcons
+			  .filter((column) => {
+				return column.classList.contains("open");
+			  })
+			  .forEach((col) => {
+				col.click();
+			  });
+		  }
+		}
         
 	},
 	created(){
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index c6306b982..2df528335 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -2,6 +2,7 @@ import fhcapifactory from "../../../apps/api/fhcapifactory.js";
 import { CoreFilterCmpt } from "../../../components/filter/Filter.js";
 import BsModal from "../../Bootstrap/Modal.js";
 
+
 export default {
   components: {
     CoreFilterCmpt,
@@ -9,8 +10,7 @@ export default {
   },
   data() {
     return {
-      collapseIconFunktionen: true,
-      collapseIconBetriebsmittel: true,
+      
       //? this reactive object contains all the field the user is able to edit and keep track of which fields he has edited
       editData:null,
       funktionen_table_options: {
@@ -39,7 +39,7 @@ export default {
             headerFilter: false,
             formatter: "responsiveCollapse",
             maxWidth: 40,
-            headerClick: this.collapseFunction,
+            headerClick: this.$parent.collapseFunction,
           },
           {
             title: "Bezeichnung",
@@ -91,7 +91,7 @@ export default {
             headerFilter: false,
             formatter: "responsiveCollapse",
             maxWidth: 40,
-            headerClick: this.collapseFunction,
+            headerClick: this.$parent.collapseFunction,
           },
           {
             title: "Betriebsmittel",
@@ -184,42 +184,7 @@ export default {
         this.data.foto_sperre = res.data.foto_sperre;
       });
     },
-    collapseFunction(e, column) {
-      //* the if of the column has to match with the name of the responsive data in the vue component
-      this[e.target.id] = !this[e.target.id];
-
-      //* gets all event icons of the different rows to use the onClick event later
-      let allClickableIcons = column._column.cells.map((row) => {
-        return row.element.children[0];
-      });
-
-      //* changes the icon that shows or hides all the collapsed columns
-      //* if the replace function does not find the class to replace, it just simply returns false
-      if (this[e.target.id]) {
-        e.target.classList.replace("fa-angle-up", "fa-angle-down");
-      } else {
-        e.target.classList.replace("fa-angle-down", "fa-angle-up");
-      }
-
-      //* changes the icon for every collapsed column to open or closed
-      if (this[e.target.id]) {
-        allClickableIcons
-          .filter((column) => {
-            return !column.classList.contains("open");
-          })
-          .forEach((col) => {
-            col.click();
-          });
-      } else {
-        allClickableIcons
-          .filter((column) => {
-            return column.classList.contains("open");
-          })
-          .forEach((col) => {
-            col.click();
-          });
-      }
-    },
+    
   },
 
   computed: {
@@ -330,8 +295,6 @@ export default {
    
   },
   mounted() {
-
-
     
     this.$refs.betriebsmittelTable.tabulator.on("tableBuilt", () => {
       this.$refs.betriebsmittelTable.tabulator.setData(this.data.mittel);
diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
index 6b3ab22bb..ddabf6815 100644
--- a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
@@ -35,7 +35,7 @@ export default {
             headerFilter: false,
             formatter: "responsiveCollapse",
             maxWidth: 40,
-            headerClick: this.collapseFunction,
+            headerClick: this.$parent.collapseFunction,
           },
           {
             title: "Bezeichnung",
@@ -78,43 +78,7 @@ export default {
   //? this is the prop passed to the dynamic component with the custom data of the view
   props: ["data"],
   methods: {
-    
-    collapseFunction(e, column) {
-      //* the if of the column has to match with the name of the responsive data in the vue component
-      this[e.target.id] = !this[e.target.id];
-
-      //* gets all event icons of the different rows to use the onClick event later
-      let allClickableIcons = column._column.cells.map((row) => {
-        return row.element.children[0];
-      });
-
-      //* changes the icon that shows or hides all the collapsed columns
-      //* if the replace function does not find the class to replace, it just simply returns false
-      if (this[e.target.id]) {
-        e.target.classList.replace("fa-angle-up", "fa-angle-down");
-      } else {
-        e.target.classList.replace("fa-angle-down", "fa-angle-up");
-      }
-
-      //* changes the icon for every collapsed column to open or closed
-      if (this[e.target.id]) {
-        allClickableIcons
-          .filter((column) => {
-            return !column.classList.contains("open");
-          })
-          .forEach((col) => {
-            col.click();
-          });
-      } else {
-        allClickableIcons
-          .filter((column) => {
-            return column.classList.contains("open");
-          })
-          .forEach((col) => {
-            col.click();
-          });
-      }
-    },
+   
   },
 
   computed: {
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index 84997b0ac..bc59514fa 100644
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -31,7 +31,7 @@ export default {
             headerFilter: false,
             formatter: "responsiveCollapse",
             maxWidth: 40,
-            headerClick: this.collapseFunction,
+            headerClick: this.$parent.collapseFunction,
           },
           {
             title: "Betriebsmittel",
@@ -68,42 +68,7 @@ export default {
         this.data.foto_sperre = res.data.foto_sperre;
       });
     },
-    collapseFunction(e, column) {
-      //* the if of the column has to match with the name of the responsive data in the vue component
-      this[e.target.id] = !this[e.target.id];
-
-      //* gets all event icons of the different rows to use the onClick event later
-      let allClickableIcons = column._column.cells.map((row) => {
-        return row.element.children[0];
-      });
-
-      //* changes the icon that shows or hides all the collapsed columns
-      //* if the replace function does not find the class to replace, it just simply returns false
-      if (this[e.target.id]) {
-        e.target.classList.replace("fa-angle-up", "fa-angle-down");
-      } else {
-        e.target.classList.replace("fa-angle-down", "fa-angle-up");
-      }
-
-      //* changes the icon for every collapsed column to open or closed
-      if (this[e.target.id]) {
-        allClickableIcons
-          .filter((column) => {
-            return !column.classList.contains("open");
-          })
-          .forEach((col) => {
-            col.click();
-          });
-      } else {
-        allClickableIcons
-          .filter((column) => {
-            return column.classList.contains("open");
-          })
-          .forEach((col) => {
-            col.click();
-          });
-      }
-    },
+   
   },
 
   computed: {

From f3e23b888d7c1f45b6a7ce4fdb6a4007228ecc0c Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Wed, 27 Dec 2023 10:42:33 +0100
Subject: [PATCH 0275/1461] fixing the accordion with editData

---
 .../Cis/Profil/MitarbeiterProfil.js           | 48 ++++++++++++++-----
 1 file changed, 36 insertions(+), 12 deletions(-)

diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 2df528335..900c7e83f 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -521,7 +521,7 @@ export default {
                                 </div>
                               </button>
 
-                             <bs-modal ref="bsmodal" >
+                             <bs-modal ref="bsmodal" backdrop="false" >
                                 <template v-slot:title>
                                   {{"Profil bearbeiten" }}
                                 </template>
@@ -532,26 +532,49 @@ export default {
                                 <!-- ACCORDEON 1 -->
 
 
-                                <div class="accordion accordion-flush" id="accordionFlushExample" v-for="ele in editData ">
-                                  <div class="accordion-item">
-                                    <h2 class="accordion-header" id="flush-headingOne">
-                                      <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#flush-collapseOne" aria-expanded="false" aria-controls="flush-collapseOne">
-                                        Personen Daten
+                                <div class="accordion accordion-flush" id="accordionFlushExample" >
+                                  <div class="accordion-item" v-for="(value,key) in editData ">
+                                    <h2 class="accordion-header" :id="'flush-headingOne'+key">
+                                      <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" :data-bs-target="'#flush-collapseOne'+key" aria-expanded="false" :aria-controls="'flush-collapseOne'+key">
+                                        {{key}}
                                       </button>
                                     </h2>
                                     <!-- SHOWING ALL MAILS IN THE FIRST PART OF THE ACCORDION -->
-                                    <div id="flush-collapseOne" class="accordion-collapse collapse" aria-labelledby="flush-headingOne" data-bs-parent="#accordionFlushExample">
+                                    <div :id="'flush-collapseOne'+key" class="accordion-collapse collapse" aria-labelledby="flush-headingOne" data-bs-parent="#accordionFlushExample">
                                       <div class="accordion-body">
                                      
-                                      <div class="row gy-3">
-                                      <div v-for="(wert,bez) in ele" class="col-12">
-                                      <div class="form-underline ">
+                                      <div v-if="Array.isArray(value)" class="row gy-5">
+                                      
+                                        <div  v-for="(objects,objectkey) in value" class="col-12" >
+                                          <div class="row gy-3">
+                                          <div v-for="(data,title) in objects" class="col-12" >
+                                          
+                                          <div  class="form-underline ">
+                                          <div class="form-underline-titel">
+                                          <label :for="title+'input'" >{{title}}</label>
+                                          </div>
+                                          <div>
+                                            
+                                            <input type="email" class="form-control" :id="title+'input'" v-model="editData[key][objectkey][title]" :placeholder="data">
+                                          </div>
+                                          </div>
+
+                                          </div>
+                                          </div>
+
+                                        </div>
+                                      
+                                      </div>
+                                      <div v-else class="row gy-3">
+                                      <div  v-for="(data,title) in value" class="col-12">
+                                    
+                                      <div  class="form-underline ">
                                       <div class="form-underline-titel">
-                                      <label :for="bez+'input'" >{{bez}}</label>
+                                      <label :for="title+'input'" >{{title}}</label>
                                       </div>
                                       <div>
                                         
-                                        <input type="email" class="form-control" :id="bez+'input'" v-model="editData.personData[bez]" :placeholder="wert">
+                                        <input type="email" class="form-control" :id="title+'input'" v-model="editData.personData[title]" :placeholder="data">
                                       </div>
                                       </div>
                                       </div>
@@ -581,6 +604,7 @@ export default {
                                   {{""}}
                                 </template>
                                 -->
+                                
                                 </bs-modal>
 
                            

From d8cd52f7a0377668397a263687f8c70df3c33a18 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Wed, 27 Dec 2023 11:16:18 +0100
Subject: [PATCH 0276/1461] accordion styling

---
 .../Cis/Profil/MitarbeiterProfil.js           | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 900c7e83f..fe4622656 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -284,10 +284,11 @@ export default {
     this.editData =  JSON.parse(
       JSON.stringify(
       {
-        emails:this.data.emails,
-        kontakte: this.data.kontakte,
-        
-        personData : {...this.personData, vorname: this.data.vorname, nachname: this.data.nachname}
+        Personen_Informationen : {...this.personData, vorname: this.data.vorname, nachname: this.data.nachname},
+        Mitarbeiter_Informatinen: this.specialData,
+        Emails:this.data.emails,
+        Private_Kontakte: this.data.kontakte,
+        Private_Adressen:this.privateAdressen,
       }));
 
       console.log(this.data.titelpre);
@@ -313,8 +314,8 @@ export default {
 
   template: ` 
 
-  <div class="row"><div class="col"><pre>{{JSON.stringify(editData,null,2)}}</pre></div><div class="col"><pre>{{JSON.stringify(data.emails,null,2)}}</pre></div></div>
-
+  <!--<div  class="row"><div class="col"><pre>{{JSON.stringify(editData,null,2)}}</pre></div><div class="col"><pre>{{JSON.stringify(data.emails,null,2)}}</pre></div></div>
+-->
   <div class="container-fluid text-break fhc-form"  >
     <!-- ROW --> 
           <div class="row">
@@ -535,8 +536,8 @@ export default {
                                 <div class="accordion accordion-flush" id="accordionFlushExample" >
                                   <div class="accordion-item" v-for="(value,key) in editData ">
                                     <h2 class="accordion-header" :id="'flush-headingOne'+key">
-                                      <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" :data-bs-target="'#flush-collapseOne'+key" aria-expanded="false" :aria-controls="'flush-collapseOne'+key">
-                                        {{key}}
+                                      <button style="font-weight:500" class="accordion-button collapsed" type="button" data-bs-toggle="collapse" :data-bs-target="'#flush-collapseOne'+key" aria-expanded="false" :aria-controls="'flush-collapseOne'+key">
+                                        {{key.replace("_"," ")}}
                                       </button>
                                     </h2>
                                     <!-- SHOWING ALL MAILS IN THE FIRST PART OF THE ACCORDION -->
@@ -545,7 +546,8 @@ export default {
                                      
                                       <div v-if="Array.isArray(value)" class="row gy-5">
                                       
-                                        <div  v-for="(objects,objectkey) in value" class="col-12" >
+                                        <template  v-for="(objects,objectkey) in value"  >
+                                        <div class="col-12 ">
                                           <div class="row gy-3">
                                           <div v-for="(data,title) in objects" class="col-12" >
                                           
@@ -555,14 +557,18 @@ export default {
                                           </div>
                                           <div>
                                             
-                                            <input type="email" class="form-control" :id="title+'input'" v-model="editData[key][objectkey][title]" :placeholder="data">
+                                            <input  class="form-control" :id="title+'input'" v-model="editData[key][objectkey][title]" :placeholder="data">
                                           </div>
                                           </div>
 
                                           </div>
                                           </div>
 
-                                        </div>
+                                          </div>
+                                          <hr class="mb-0" v-if="value[value.length-1] != objects">
+                                        </template>
+                                        
+
                                       
                                       </div>
                                       <div v-else class="row gy-3">
@@ -574,7 +580,7 @@ export default {
                                       </div>
                                       <div>
                                         
-                                        <input type="email" class="form-control" :id="title+'input'" v-model="editData.personData[title]" :placeholder="data">
+                                        <input type="email" class="form-control" :id="title+'input'" v-model="editData[key][title]" :placeholder="data">
                                       </div>
                                       </div>
                                       </div>

From 87f640d66a2eff7b6d188f66ac739dd12ffef956 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Wed, 27 Dec 2023 11:20:54 +0100
Subject: [PATCH 0277/1461] little layout fix for MitarbeiterViewProfil.js

---
 public/js/components/Cis/Profil/MitarbeiterViewProfil.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
index ddabf6815..de5b33624 100644
--- a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
@@ -231,7 +231,7 @@ export default {
 
 
                   
-                  <div  class="row justify-content-center align-items-center">
+                  <div  class="row gy-3 justify-content-center align-items-center">
 
 
 

From 981e782c578b3f5775d0473ec1670dbf246106e0 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Thu, 28 Dec 2023 10:15:24 +0100
Subject: [PATCH 0278/1461] checks whether the editProfilData was changed by
 the user and is not in the original state

---
 application/controllers/Cis/Profil.php        |  4 +-
 .../{crm => person}/Profil_change_model.php   |  0
 .../Cis/Profil/MitarbeiterProfil.js           | 65 ++++++++++---------
 3 files changed, 37 insertions(+), 32 deletions(-)
 rename application/models/{crm => person}/Profil_change_model.php (100%)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index d125fcc0e..747a667db 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -31,7 +31,7 @@ class Profil extends Auth_Controller
 		$this->load->model('person/Benutzergruppe_model', 'BenutzergruppeModel');
 		$this->load->model('ressource/Betriebsmittelperson_model', 'BetriebsmittelpersonModel');
 		$this->load->model('person/Kontakt_model', 'KontaktModel');
-		$this->load->model('crm/Profil_change_model', 'ChangeModel');
+		$this->load->model('person/Profil_change_model', 'ProfilChangeModel');
 
 		//? put the uid and pid inside the controller for further usage in views
 		$this->uid = getAuthUID();
@@ -73,7 +73,7 @@ class Profil extends Auth_Controller
 		//$res = json_encode($this->ChangeModel->load([$this->uid]));
 
 		//? inserts new row inside the public.tbl_cis_profil_update table
-		$insert_res = json_encode($this->ChangeModel->insert($data));
+		$insert_res = json_encode($this->ProfilChangeModel->insert($data));
 		
 		echo $insert_res;
 
diff --git a/application/models/crm/Profil_change_model.php b/application/models/person/Profil_change_model.php
similarity index 100%
rename from application/models/crm/Profil_change_model.php
rename to application/models/person/Profil_change_model.php
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index fe4622656..a23b8c452 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -10,7 +10,7 @@ export default {
   },
   data() {
     return {
-      
+     
       //? this reactive object contains all the field the user is able to edit and keep track of which fields he has edited
       editData:null,
       funktionen_table_options: {
@@ -139,9 +139,7 @@ export default {
 		BsModal,
 	
 	], */
-  popup(options) {
-		return BsModal.popup.bind(this)(null, options);
-	},
+  
   methods: {
     showModal() {
       this.$refs.bsmodal.show()
@@ -153,15 +151,10 @@ export default {
     },
 
 
-    insertEditData(){
+    submitProfilChange(){
       
       
-      let editDataKeys = Object.keys(this.editData);
-      let this_data = Object.entries(this.data).filter(([key,value])=>{
-        return editDataKeys.includes(key);
-      })
-
-      if(JSON.stringify(this_data) == JSON.stringify(Object.entries(this.editData))){
+      if(this.isEditDataChanged){
         
         console.log("the editData contains the same information",JSON.stringify(this_data),"editData values:", JSON.stringify(Object.entries(this.editData)));
       }else{
@@ -193,6 +186,8 @@ export default {
       return `mailto:info.mio@technikum-wien.at?subject=Datenkorrektur&body=Die%20Profildaten%20für%20User%20'${this.data.username}'%20sind%20nicht%20korrekt.%0DHier, die richtigen Daten:%0A%0ANachname:%20${this.data.nachname}%0AVorname:%20${this.data.vorname}%0AGeburtsdatum:${this.data.gebdatum}%0AGeburtsort:%20${this.data.gebort}%0ATitelPre:${this.data.titel}%20%0ATitelPost:${this.data.postnomen}%20%0A%0A***%0DPlatz für weitere (nicht angeführte Daten)%0D***%0A%0A[Bitte%20übermitteln%20Sie%20uns%20etwaige%20Dokumente%20zum%20Beleg%20der%20Änderung]`;
     },
 
+    
+
     get_image_base64_src() {
       if (!this.data) {
         return "";
@@ -200,6 +195,11 @@ export default {
       return "data:image/jpeg;base64," + this.data.foto;
     },
 
+    
+    isEditDataChanged: function(){
+      return JSON.stringify(this.editData) != this.originalEditData;
+    },
+
     get_mitarbeiter_standort_telefon(){
       if(this.data.standort_telefon){
         return "tel:"+ this.data.telefonklappe + this.data.standort_telefon;
@@ -278,21 +278,25 @@ export default {
       };
     },
   },
+ 
   created() {
+    
 
     
-    this.editData =  JSON.parse(
-      JSON.stringify(
+    
+    //? storing an original version of the editData to check if the editData was changed by the user and is not in the original state
+    this.originalEditData = JSON.stringify(
       {
         Personen_Informationen : {...this.personData, vorname: this.data.vorname, nachname: this.data.nachname},
         Mitarbeiter_Informatinen: this.specialData,
         Emails:this.data.emails,
         Private_Kontakte: this.data.kontakte,
         Private_Adressen:this.privateAdressen,
-      }));
+      });
+
+    this.editData = JSON.parse(this.originalEditData);
+
 
-      console.log(this.data.titelpre);
-   
    
   },
   mounted() {
@@ -306,7 +310,6 @@ export default {
     });
    
     
-
     
 
    
@@ -314,8 +317,8 @@ export default {
 
   template: ` 
 
-  <!--<div  class="row"><div class="col"><pre>{{JSON.stringify(editData,null,2)}}</pre></div><div class="col"><pre>{{JSON.stringify(data.emails,null,2)}}</pre></div></div>
--->
+  <div  class="row"><div class="col"><pre>{{JSON.stringify(editData,null,2)}}</pre></div><div class="col"><pre>{{JSON.stringify(data.emails,null,2)}}</pre></div></div>
+
   <div class="container-fluid text-break fhc-form"  >
     <!-- ROW --> 
           <div class="row">
@@ -530,7 +533,7 @@ export default {
                                 
                                 <!-- START OF THE ACCORDION -->
 
-                                <!-- ACCORDEON 1 -->
+                               
 
 
                                 <div class="accordion accordion-flush" id="accordionFlushExample" >
@@ -597,20 +600,17 @@ export default {
 
                                   <!-- -->
 
-                                  <!-- ACCORDEON 2 -->
-
-                                <!-- -->
+                               
                         
                         
                                 <!-- END OF THE ACCORDION -->
 
                                 </template>
-                                <!-- optional footer 
-                                <template v-slot:footer>
-                                  {{""}}
+                                <!-- optional footer -->
+                                <template v-if="isEditDataChanged" v-slot:footer>
+                                  <button role="button" class="btn btn-primary">submit</button>
                                 </template>
-                                -->
-                                
+                                <!-- end of optional footer -->
                                 </bs-modal>
 
                            
@@ -845,8 +845,13 @@ export default {
 
                 <!-- FIRST TABLE -->
                   <div class="col-12 mb-4" >
-                    <core-filter-cmpt title="Funktionen"  ref="funktionenTable" :tabulator-options="funktionen_table_options"  tableOnly :sideMenu="false" />
-                  </div>
+                  <div class="card">
+                  <div class="card-header">Funktionen </div>
+                  <div class="card-body">
+                    <core-filter-cmpt   ref="funktionenTable" :tabulator-options="funktionen_table_options"  tableOnly :sideMenu="false" />
+                    </div>
+                    </div>
+                    </div>
 
                 <!-- SECOND TABLE -->
                   <div class="col-12 mb-4" >

From 414541b6cfe783a92fa085a84387c8e13f4105a9 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Thu, 28 Dec 2023 10:43:21 +0100
Subject: [PATCH 0279/1461] checks if table entry for uid exists and performs
 update or insert on result

---
 application/controllers/Cis/Profil.php        | 1030 +++++++++--------
 public/js/apps/Cis/Profil.js                  |    1 -
 public/js/components/Cis/Profil/Base.js       |  743 ------------
 .../Cis/Profil/MitarbeiterProfil.js           |   23 +-
 4 files changed, 540 insertions(+), 1257 deletions(-)
 delete mode 100644 public/js/components/Cis/Profil/Base.js

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index 747a667db..a2de9497e 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -1,6 +1,7 @@
 <?php
 
-if (! defined('BASEPATH')) exit('No direct script access allowed');
+if (!defined('BASEPATH'))
+	exit('No direct script access allowed');
 
 /**
  *
@@ -11,16 +12,16 @@ class Profil extends Auth_Controller
 	/**
 	 * Constructor
 	 */
-	
+
 	public function __construct()
 	{
 		parent::__construct([
-			'index' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
-			'View' => ['student/anrechnung_beantragen:r','user:r'],
-			'foto_sperre_function' => ['student/anrechnung_beantragen:r','user:r'],
-			'getView' => ['student/anrechnung_beantragen:r','user:r'],
-			'editProfil' => ['student/anrechnung_beantragen:r','user:r'],
-			
+			'index' => ['student/anrechnung_beantragen:r', 'user:r'], // TODO(chris): permissions?
+			'View' => ['student/anrechnung_beantragen:r', 'user:r'],
+			'foto_sperre_function' => ['student/anrechnung_beantragen:r', 'user:r'],
+			'getView' => ['student/anrechnung_beantragen:r', 'user:r'],
+			'editProfil' => ['student/anrechnung_beantragen:r', 'user:r'],
+
 		]);
 		$this->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
 		$this->load->model('crm/Student_model', 'StudentModel');
@@ -36,7 +37,7 @@ class Profil extends Auth_Controller
 		//? put the uid and pid inside the controller for further usage in views
 		$this->uid = getAuthUID();
 		$this->pid = getAuthPersonID();
-		
+
 	}
 
 	// -----------------------------------------------------------------------------------------------------------------
@@ -46,122 +47,139 @@ class Profil extends Auth_Controller
 	 * @return void
 	 */
 
-	
+
 	public function index()
 	{
 		$this->load->view('Cis/Profil');
 	}
-	public function View($uid){
-		
-		if($uid === $this->uid){
+	public function View($uid)
+	{
+
+		if ($uid === $this->uid) {
 			$this->index();
-		}else{
+		} else {
 			$this->load->view('Cis/Profil');
 		}
-		
+
 	}
 
 
 
-	
 
-	public function editProfil(){
-		
+
+	public function editProfil()
+	{
+
 		$json = $this->input->raw_input_stream;
-		$data = ["uid"=>"karpenko", "profil_changes"=>$json, "change_timestamp"=>"NOW()"];
-		//? gets the data inside the public.tbl_cis_profil_update
-		//$res = json_encode($this->ChangeModel->load([$this->uid]));
 
-		//? inserts new row inside the public.tbl_cis_profil_update table
-		$insert_res = json_encode($this->ProfilChangeModel->insert($data));
-		
-		echo $insert_res;
+		$data = ["uid" => $this->uid, "profil_changes" => $json, "change_timestamp" => "NOW()"];
+
+		$res = $this->ProfilChangeModel->load([$this->uid]);
+		$res = hasData($res) ? getData($res) : null;
+
+		if (empty($res)) {
+			$insert_res = $this->ProfilChangeModel->insert($data);
+			echo json_encode($insert_res);
+		} else {
+			$update_res = $this->ProfilChangeModel->update([$this->uid], $data);
+			echo json_encode($update_res);
+		}
+
+
 
 	}
 
 
-	private function viewMitarbeiterProfil($uid){
+	private function viewMitarbeiterProfil($uid)
+	{
 
-		
-		if(
-			isSuccess($this->PersonModel->addSelect('gruppe_kurzbz, beschreibung'))&&
-			isSuccess($this->PersonModel->addJoin('tbl_benutzer', 'person_id')) && 
-		isSuccess($this->PersonModel->addJoin('tbl_benutzergruppe', 'uid')) &&
-		isSuccess($this->PersonModel->addJoin('tbl_gruppe', 'gruppe_kurzbz'))){
 
-			$mailverteiler_res = $this->PersonModel->loadWhere(array('mailgrp' => true, 'uid'=>$uid));
-			if( isError($mailverteiler_res)){
+		if (
+			isSuccess($this->PersonModel->addSelect('gruppe_kurzbz, beschreibung')) &&
+			isSuccess($this->PersonModel->addJoin('tbl_benutzer', 'person_id')) &&
+			isSuccess($this->PersonModel->addJoin('tbl_benutzergruppe', 'uid')) &&
+			isSuccess($this->PersonModel->addJoin('tbl_gruppe', 'gruppe_kurzbz'))
+		) {
+
+			$mailverteiler_res = $this->PersonModel->loadWhere(array('mailgrp' => true, 'uid' => $uid));
+			if (isError($mailverteiler_res)) {
 				// catch error
 			}
-			$mailverteiler_res = hasData($mailverteiler_res)? getData($mailverteiler_res) : null;
-			
-			$mailverteiler_res = array_map(function($element) { $element->mailto="mailto:".$element->gruppe_kurzbz."@".DOMAIN; return $element;},$mailverteiler_res);
+			$mailverteiler_res = hasData($mailverteiler_res) ? getData($mailverteiler_res) : null;
+
+			$mailverteiler_res = array_map(function ($element) {
+				$element->mailto = "mailto:" . $element->gruppe_kurzbz . "@" . DOMAIN;
+				return $element; }, $mailverteiler_res);
 		}
 
-	
-		
 
-		if(
+
+
+		if (
 			//! Summe der Wochenstunden wird jetzt in der hr/tbl_dienstverhaeltnis gespeichert
-		 isSuccess($this->BenutzerfunktionModel->addSelect(["tbl_benutzerfunktion.bezeichnung as Bezeichnung","tbl_organisationseinheit.bezeichnung as Organisationseinheit","datum_von as Gültig_von","datum_bis as Gültig_bis","wochenstunden as Wochenstunden"]))&&
-	  	  isSuccess($this->BenutzerfunktionModel->addJoin("tbl_organisationseinheit","oe_kurzbz"))
-		){
-			$benutzer_funktion_res = $this->BenutzerfunktionModel->loadWhere(array('uid'=>$uid));
-			if(isError($benutzer_funktion_res)){
+			isSuccess($this->BenutzerfunktionModel->addSelect(["tbl_benutzerfunktion.bezeichnung as Bezeichnung", "tbl_organisationseinheit.bezeichnung as Organisationseinheit", "datum_von as Gültig_von", "datum_bis as Gültig_bis", "wochenstunden as Wochenstunden"])) &&
+			isSuccess($this->BenutzerfunktionModel->addJoin("tbl_organisationseinheit", "oe_kurzbz"))
+		) {
+			$benutzer_funktion_res = $this->BenutzerfunktionModel->loadWhere(array('uid' => $uid));
+			if (isError($benutzer_funktion_res)) {
 				// error handling
-			}else{
-				$benutzer_funktion_res = hasData($benutzer_funktion_res)? getData($benutzer_funktion_res) : null;
+			} else {
+				$benutzer_funktion_res = hasData($benutzer_funktion_res) ? getData($benutzer_funktion_res) : null;
 			}
 		}
 
-		if(isSuccess($this->BenutzerModel->addSelect(["alias"]))){
-		$benutzer_res = $this->BenutzerModel->load([$uid]);
-		if(isError($benutzer_res)){
-			// error handling
-		}else{
-			$benutzer_res = hasData($benutzer_res)? getData($benutzer_res)[0] : null;
-		}
+		if (isSuccess($this->BenutzerModel->addSelect(["alias"]))) {
+			$benutzer_res = $this->BenutzerModel->load([$uid]);
+			if (isError($benutzer_res)) {
+				// error handling
+			} else {
+				$benutzer_res = hasData($benutzer_res) ? getData($benutzer_res)[0] : null;
+			}
 		}
 
-		if(isSuccess($this->BenutzerModel->addSelect(["foto","foto_sperre","anrede","titelpost","titelpre","vorname","nachname"]))
-		&& isSuccess($this->BenutzerModel->addJoin("tbl_person", "person_id"))){
+		if (
+			isSuccess($this->BenutzerModel->addSelect(["foto", "foto_sperre", "anrede", "titelpost", "titelpre", "vorname", "nachname"]))
+			&& isSuccess($this->BenutzerModel->addJoin("tbl_person", "person_id"))
+		) {
 
 			$person_res = $this->BenutzerModel->load([$uid]);
-			if(isError($person_res)){
+			if (isError($person_res)) {
 				// error handling
-			}else{
-				$person_res = hasData($person_res)? getData($person_res)[0] : null;
+			} else {
+				$person_res = hasData($person_res) ? getData($person_res)[0] : null;
 			}
 		}
 
 
-		if(isSuccess($this->MitarbeiterModel->addSelect(["kurzbz","telefonklappe", "alias","ort_kurzbz"]))
-			&& isSuccess($this->MitarbeiterModel->addJoin("tbl_benutzer", "tbl_benutzer.uid = tbl_mitarbeiter.mitarbeiter_uid")))
-		{
+		if (
+			isSuccess($this->MitarbeiterModel->addSelect(["kurzbz", "telefonklappe", "alias", "ort_kurzbz"]))
+			&& isSuccess($this->MitarbeiterModel->addJoin("tbl_benutzer", "tbl_benutzer.uid = tbl_mitarbeiter.mitarbeiter_uid"))
+		) {
 			$mitarbeiter_res = $this->MitarbeiterModel->load($uid);
-			if(isError($mitarbeiter_res)){
+			if (isError($mitarbeiter_res)) {
 				// error handling
-			}else{
-				$mitarbeiter_res = hasData($mitarbeiter_res)? getData($mitarbeiter_res)[0] : null;
+			} else {
+				$mitarbeiter_res = hasData($mitarbeiter_res) ? getData($mitarbeiter_res)[0] : null;
 			}
 		}
 
 		//? querying the telefon number of the office
-		if(isSuccess($this->MitarbeiterModel->addSelect(["kontakt"])) &&
+		if (
+			isSuccess($this->MitarbeiterModel->addSelect(["kontakt"])) &&
 			isSuccess($this->MitarbeiterModel->addJoin("tbl_kontakt", "tbl_mitarbeiter.standort_id = tbl_kontakt.standort_id"))
-			
-			
-		){
+
+
+		) {
 			$this->MitarbeiterModel->addLimit(1);
-			$telefon_res = $this->MitarbeiterModel->loadWhere(["mitarbeiter_uid"=>$uid, "kontakttyp"=>"telefon"]);
-			if(isError($telefon_res)){
+			$telefon_res = $this->MitarbeiterModel->loadWhere(["mitarbeiter_uid" => $uid, "kontakttyp" => "telefon"]);
+			if (isError($telefon_res)) {
 				// error handling
-			}else{
-				$telefon_res = hasData($telefon_res)? getData($telefon_res)[0] : null;
+			} else {
+				$telefon_res = hasData($telefon_res) ? getData($telefon_res)[0] : null;
 			}
 		}
 
-		
+
 		$res = new stdClass();
 		$res->username = $uid;
 
@@ -169,592 +187,616 @@ class Profil extends Auth_Controller
 		//? Person Info
 		$res->foto = $person_res->foto;
 		$res->foto_sperre = $person_res->foto_sperre;
-		
+
 		$res->anrede = $person_res->anrede;
 		$res->titelpre = $person_res->titelpre;
 		$res->titelpost = $person_res->titelpost;
 		$res->vorname = $person_res->vorname;
 		$res->nachname = $person_res->nachname;
-		
-		
+
+
 		//? Mitarbeiter Info
-		foreach($mitarbeiter_res as $key => $val){
+		foreach ($mitarbeiter_res as $key => $val) {
 			$res->$key = $val;
 
 		}
 		//? Email Info 
 		$intern_email = array();
-		$intern_email+=array("type" => "intern");
-		$intern_email+=array("email"=> $uid . "@" . DOMAIN);
-		$extern_email=array();
-		$extern_email+=array("type" => "alias");
-		$extern_email+=array("email" => $benutzer_res->alias . "@" . DOMAIN);
-		$res->emails = array($intern_email,$extern_email);
-	
+		$intern_email += array("type" => "intern");
+		$intern_email += array("email" => $uid . "@" . DOMAIN);
+		$extern_email = array();
+		$extern_email += array("type" => "alias");
+		$extern_email += array("email" => $benutzer_res->alias . "@" . DOMAIN);
+		$res->emails = array($intern_email, $extern_email);
+
 		//? Benutzerfunktion Info
 		$res->funktionen = $benutzer_funktion_res;
-	
+
 		//? Mailverteiler Info
 		$res->mailverteiler = $mailverteiler_res;
 
 		$res->standort_telefon = $telefon_res->kontakt;
-		 
+
 		return $res;
 
 	}
 
 
-	
-	private function viewStudentProfil($uid){
-		
+
+	private function viewStudentProfil($uid)
+	{
 
 
-		if(
-			isSuccess($this->PersonModel->addSelect('gruppe_kurzbz, beschreibung'))&&
-			isSuccess($this->PersonModel->addJoin('tbl_benutzer', 'person_id')) && 
-		isSuccess($this->PersonModel->addJoin('tbl_benutzergruppe', 'uid')) &&
-		isSuccess($this->PersonModel->addJoin('tbl_gruppe', 'gruppe_kurzbz'))){
 
-			$mailverteiler_res = $this->PersonModel->loadWhere(array('mailgrp' => true, 'uid'=>$uid));
-			if( isError($mailverteiler_res)){
+		if (
+			isSuccess($this->PersonModel->addSelect('gruppe_kurzbz, beschreibung')) &&
+			isSuccess($this->PersonModel->addJoin('tbl_benutzer', 'person_id')) &&
+			isSuccess($this->PersonModel->addJoin('tbl_benutzergruppe', 'uid')) &&
+			isSuccess($this->PersonModel->addJoin('tbl_gruppe', 'gruppe_kurzbz'))
+		) {
+
+			$mailverteiler_res = $this->PersonModel->loadWhere(array('mailgrp' => true, 'uid' => $uid));
+			if (isError($mailverteiler_res)) {
 				// catch error
 			}
-			$mailverteiler_res = hasData($mailverteiler_res)? getData($mailverteiler_res) : null;
-			
-			$mailverteiler_res = array_map(function($element) { $element->mailto="mailto:".$element->gruppe_kurzbz."@".DOMAIN; return $element;},$mailverteiler_res);
+			$mailverteiler_res = hasData($mailverteiler_res) ? getData($mailverteiler_res) : null;
+
+			$mailverteiler_res = array_map(function ($element) {
+				$element->mailto = "mailto:" . $element->gruppe_kurzbz . "@" . DOMAIN;
+				return $element; }, $mailverteiler_res);
 		}
 
-		
-		
-		if(isSuccess($this->BenutzerModel->addSelect(["foto","foto_sperre","anrede","titelpost","titelpre","vorname","nachname"]))
-		&& isSuccess($this->BenutzerModel->addJoin("tbl_person", "person_id"))){
+
+
+		if (
+			isSuccess($this->BenutzerModel->addSelect(["foto", "foto_sperre", "anrede", "titelpost", "titelpre", "vorname", "nachname"]))
+			&& isSuccess($this->BenutzerModel->addJoin("tbl_person", "person_id"))
+		) {
 
 			$person_res = $this->BenutzerModel->load([$uid]);
-			if(isError($person_res)){
+			if (isError($person_res)) {
 				// error handling
-			}else{
-				$person_res = hasData($person_res)? getData($person_res)[0] : null;
+			} else {
+				$person_res = hasData($person_res) ? getData($person_res)[0] : null;
 			}
 		}
-		
+
 
 		//? personenkennzeichen ist die Spalte Matrikelnr in der Tabelle Student
-		if(isSuccess($this->StudentModel->addSelect(['tbl_studiengang.bezeichnung as studiengang','tbl_student.semester', 'tbl_student.verband', 'tbl_student.gruppe' ,'tbl_student.matrikelnr as personenkennzeichen']))
-		 && isSuccess($this->StudentModel->addJoin('tbl_studiengang', "tbl_studiengang.studiengang_kz=tbl_student.studiengang_kz")))
-		{
+		if (
+			isSuccess($this->StudentModel->addSelect(['tbl_studiengang.bezeichnung as studiengang', 'tbl_student.semester', 'tbl_student.verband', 'tbl_student.gruppe', 'tbl_student.matrikelnr as personenkennzeichen']))
+			&& isSuccess($this->StudentModel->addJoin('tbl_studiengang', "tbl_studiengang.studiengang_kz=tbl_student.studiengang_kz"))
+		) {
 			$student_res = $this->StudentModel->load([$uid]);
-			if(isError($student_res)){
+			if (isError($student_res)) {
 				// catch error
 			}
-			$student_res = hasData($student_res)?getData($student_res)[0]:null;
-		
-		}
-		
+			$student_res = hasData($student_res) ? getData($student_res)[0] : null;
+
+		}
+
+
 
-		
 		//? Matrikelnummer ist die Spalte matr_nr in Person
-		if(isSuccess($this->BenutzerModel->addSelect(["matr_nr"])) 
-		&& isSuccess($this->BenutzerModel->addJoin("tbl_person","person_id"))){
+		if (
+			isSuccess($this->BenutzerModel->addSelect(["matr_nr"]))
+			&& isSuccess($this->BenutzerModel->addJoin("tbl_person", "person_id"))
+		) {
 			$matr_res = $this->BenutzerModel->load([$uid]);
-			if(isError($matr_res)){
+			if (isError($matr_res)) {
 				// catch error
-			}else{
-				$matr_res = hasData($matr_res)? getData($matr_res)[0] : [];
-				
+			} else {
+				$matr_res = hasData($matr_res) ? getData($matr_res)[0] : [];
+
 			}
 		}
 
 		$res = new stdClass();
-		
-		
+
+
 		$res->foto = $person_res->foto;
 		$res->username = $uid;
-		
+
 		$res->anrede = $person_res->anrede;
 		$res->titel = $person_res->titelpre;
 		$res->vorname = $person_res->vorname;
 		$res->nachname = $person_res->nachname;
-	
-	
-		$res->postnomen = $person_res->titelpost; 
-		
+
+
+		$res->postnomen = $person_res->titelpost;
+
 		$intern_email = array();
-			$intern_email+=array("type" => "intern");
-			$intern_email+=array("email"=> $uid . "@" . DOMAIN);
-		
-			$res->emails = array($intern_email);
-	
-	
-		
-		
+		$intern_email += array("type" => "intern");
+		$intern_email += array("email" => $uid . "@" . DOMAIN);
+
+		$res->emails = array($intern_email);
+
+
+
+
 		$res->matrikelnummer = $matr_res->matr_nr;
-		foreach($student_res as $key => $value){
+		foreach ($student_res as $key => $value) {
 			$res->$key = $value;
 		}
 
-	
-		
+
+
 		$res->mailverteiler = $mailverteiler_res;
-		
+
 		return $res;
-		
-		 
+
+
 	}
 
-	private function mitarbeiterProfil(){
-		
-
-			//? betriebsmittel soll nur der user selber sehen
-			if(
-			
-				isSuccess($this->BetriebsmittelpersonModel->addSelect(["CONCAT(betriebsmitteltyp, ' ' ,beschreibung) as Betriebsmittel","nummer as Nummer","ausgegebenam as Ausgegeben_am"]))
-				
-			){
-				//? betriebsmittel are not needed in a view
-				$betriebsmittelperson_res = $this->BetriebsmittelpersonModel->getBetriebsmittel($this->pid);
-				if(isError($betriebsmittelperson_res)){
-					   // error handling
-				   }else{
-					   $betriebsmittelperson_res = hasData($betriebsmittelperson_res)? getData($betriebsmittelperson_res) : null;
-				   }
-			   }
-
-			   if(
-			
-				//? kontaktdaten soll auch nur der user selbst sehen
-				isSuccess($this->KontaktModel->addSelect('DISTINCT ON (kontakttyp) kontakttyp, kontakt, tbl_kontakt.anmerkung, tbl_kontakt.zustellung')) &&
-			isSuccess($this->KontaktModel->addJoin('public.tbl_standort', 'standort_id', 'LEFT')) &&
-			isSuccess($this->KontaktModel->addJoin('public.tbl_firma', 'firma_id', 'LEFT'))&&
-			isSuccess($this->KontaktModel->addOrder('kontakttyp, kontakt, tbl_kontakt.updateamum, tbl_kontakt.insertamum'))
-			){
-				$kontakte_res = $this->KontaktModel->loadWhere(array('person_id' => $this->pid));
-				if(isError($kontakte_res)){
-					// handle error	
-				}else{
-					$kontakte_res = hasData($kontakte_res)? getData($kontakte_res) : null;
-				}
-				
-			}
+	private function mitarbeiterProfil()
+	{
 
 
-			//$this->MitarbeiterModel->load($this->uid);
+		//? betriebsmittel soll nur der user selber sehen
+		if (
 
-			//? FH Ausweis Austellungsdatum soll auch nur der user selbst sehen
-			$zutrittskarte_ausgegebenam = $this->BetriebsmittelpersonModel->getBetriebsmittelByUid($this->uid,"Zutrittskarte");
-			if(isError($zutrittskarte_ausgegebenam)){
+			isSuccess($this->BetriebsmittelpersonModel->addSelect(["CONCAT(betriebsmitteltyp, ' ' ,beschreibung) as Betriebsmittel", "nummer as Nummer", "ausgegebenam as Ausgegeben_am"]))
+
+		) {
+			//? betriebsmittel are not needed in a view
+			$betriebsmittelperson_res = $this->BetriebsmittelpersonModel->getBetriebsmittel($this->pid);
+			if (isError($betriebsmittelperson_res)) {
 				// error handling
-			}else{
-				$zutrittskarte_ausgegebenam = hasData($zutrittskarte_ausgegebenam)? getData($zutrittskarte_ausgegebenam)[0]->ausgegebenam : null;
-				//? formats the date from 01-01-2000 to 01.01.2000
-				$zutrittskarte_ausgegebenam = str_replace("-",".",$zutrittskarte_ausgegebenam);
+			} else {
+				$betriebsmittelperson_res = hasData($betriebsmittelperson_res) ? getData($betriebsmittelperson_res) : null;
+			}
+		}
+
+		if (
+
+			//? kontaktdaten soll auch nur der user selbst sehen
+			isSuccess($this->KontaktModel->addSelect('DISTINCT ON (kontakttyp) kontakttyp, kontakt, tbl_kontakt.anmerkung, tbl_kontakt.zustellung')) &&
+			isSuccess($this->KontaktModel->addJoin('public.tbl_standort', 'standort_id', 'LEFT')) &&
+			isSuccess($this->KontaktModel->addJoin('public.tbl_firma', 'firma_id', 'LEFT')) &&
+			isSuccess($this->KontaktModel->addOrder('kontakttyp, kontakt, tbl_kontakt.updateamum, tbl_kontakt.insertamum'))
+		) {
+			$kontakte_res = $this->KontaktModel->loadWhere(array('person_id' => $this->pid));
+			if (isError($kontakte_res)) {
+				// handle error	
+			} else {
+				$kontakte_res = hasData($kontakte_res) ? getData($kontakte_res) : null;
 			}
 
+		}
 
-			//? Die Adressen soll auch nur der user selber sehen
 
-			if(
-				
-				isSuccess($adresse_res = $this->AdresseModel->addSelect(array("strasse","tbl_adressentyp.bezeichnung as adr_typ","plz","ort")))&&
-				isSuccess($adresse_res = $this->AdresseModel->addOrder("zustelladresse","DESC"))&&
-				isSuccess($adresse_res = $this->AdresseModel->addOrder("sort"))&&
-				isSuccess($adresse_res = $this->AdresseModel->addJoin("tbl_adressentyp","typ=adressentyp_kurzbz"))
-			){
-				$adresse_res = $this->AdresseModel->loadWhere(array("person_id"=>$this->pid));
-				if(isError($adresse_res)){
-					// error handling
-				}else{									
-					$adresse_res = hasData($adresse_res)? getData($adresse_res) : null;
-				}
+		//$this->MitarbeiterModel->load($this->uid);
+
+		//? FH Ausweis Austellungsdatum soll auch nur der user selbst sehen
+		$zutrittskarte_ausgegebenam = $this->BetriebsmittelpersonModel->getBetriebsmittelByUid($this->uid, "Zutrittskarte");
+		if (isError($zutrittskarte_ausgegebenam)) {
+			// error handling
+		} else {
+			$zutrittskarte_ausgegebenam = hasData($zutrittskarte_ausgegebenam) ? getData($zutrittskarte_ausgegebenam)[0]->ausgegebenam : null;
+			//? formats the date from 01-01-2000 to 01.01.2000
+			$zutrittskarte_ausgegebenam = str_replace("-", ".", $zutrittskarte_ausgegebenam);
+		}
+
+
+		//? Die Adressen soll auch nur der user selber sehen
+
+		if (
+
+			isSuccess($adresse_res = $this->AdresseModel->addSelect(array("strasse", "tbl_adressentyp.bezeichnung as adr_typ", "plz", "ort"))) &&
+			isSuccess($adresse_res = $this->AdresseModel->addOrder("zustelladresse", "DESC")) &&
+			isSuccess($adresse_res = $this->AdresseModel->addOrder("sort")) &&
+			isSuccess($adresse_res = $this->AdresseModel->addJoin("tbl_adressentyp", "typ=adressentyp_kurzbz"))
+		) {
+			$adresse_res = $this->AdresseModel->loadWhere(array("person_id" => $this->pid));
+			if (isError($adresse_res)) {
+				// error handling
+			} else {
+				$adresse_res = hasData($adresse_res) ? getData($adresse_res) : null;
 			}
+		}
 
-			//? die folgenden Informationen darf nur der eigene user sehen
-		
+		//? die folgenden Informationen darf nur der eigene user sehen
 
-		
-		
 
-		if(
-			isSuccess($this->PersonModel->addSelect('gruppe_kurzbz, beschreibung'))&&
-			isSuccess($this->PersonModel->addJoin('tbl_benutzer', 'person_id')) && 
-		isSuccess($this->PersonModel->addJoin('tbl_benutzergruppe', 'uid')) &&
-		isSuccess($this->PersonModel->addJoin('tbl_gruppe', 'gruppe_kurzbz'))){
 
-			$mailverteiler_res = $this->PersonModel->loadWhere(array('mailgrp' => true, 'uid'=>$this->uid));
-			if( isError($mailverteiler_res)){
+
+
+		if (
+			isSuccess($this->PersonModel->addSelect('gruppe_kurzbz, beschreibung')) &&
+			isSuccess($this->PersonModel->addJoin('tbl_benutzer', 'person_id')) &&
+			isSuccess($this->PersonModel->addJoin('tbl_benutzergruppe', 'uid')) &&
+			isSuccess($this->PersonModel->addJoin('tbl_gruppe', 'gruppe_kurzbz'))
+		) {
+
+			$mailverteiler_res = $this->PersonModel->loadWhere(array('mailgrp' => true, 'uid' => $this->uid));
+			if (isError($mailverteiler_res)) {
 				// catch error
 			}
-			$mailverteiler_res = hasData($mailverteiler_res)? getData($mailverteiler_res) : null;
-			
-			$mailverteiler_res = array_map(function($element) { $element->mailto="mailto:".$element->gruppe_kurzbz."@".DOMAIN; return $element;},$mailverteiler_res);
+			$mailverteiler_res = hasData($mailverteiler_res) ? getData($mailverteiler_res) : null;
+
+			$mailverteiler_res = array_map(function ($element) {
+				$element->mailto = "mailto:" . $element->gruppe_kurzbz . "@" . DOMAIN;
+				return $element; }, $mailverteiler_res);
 		}
 
-		
-		
-		if(isSuccess($this->BenutzerModel->addSelect(["foto","foto_sperre","anrede","titelpost","titelpre","vorname","nachname", "gebort", "gebdatum"]))
-		&& isSuccess($this->BenutzerModel->addJoin("tbl_person", "person_id"))){
+
+
+		if (
+			isSuccess($this->BenutzerModel->addSelect(["foto", "foto_sperre", "anrede", "titelpost", "titelpre", "vorname", "nachname", "gebort", "gebdatum"]))
+			&& isSuccess($this->BenutzerModel->addJoin("tbl_person", "person_id"))
+		) {
 
 			$person_res = $this->BenutzerModel->load([$this->uid]);
-			if(isError($person_res)){
+			if (isError($person_res)) {
 				// error handling
-			}else{
-				$person_res = hasData($person_res)? getData($person_res)[0] : null;
+			} else {
+				$person_res = hasData($person_res) ? getData($person_res)[0] : null;
 			}
 		}
 
 
-		if(
+		if (
 			//! Summe der Wochenstunden wird jetzt in der hr/tbl_dienstverhaeltnis gespeichert
-		isSuccess($this->BenutzerfunktionModel->addSelect(["tbl_benutzerfunktion.bezeichnung as Bezeichnung","tbl_organisationseinheit.bezeichnung as Organisationseinheit","datum_von as Gültig_von","datum_bis as Gültig_bis","wochenstunden as Wochenstunden"]))&&
-			isSuccess($this->BenutzerfunktionModel->addJoin("tbl_organisationseinheit","oe_kurzbz"))
-		){
-			$benutzer_funktion_res = $this->BenutzerfunktionModel->loadWhere(array('uid'=>$this->uid));
-			if(isError($benutzer_funktion_res)){
+			isSuccess($this->BenutzerfunktionModel->addSelect(["tbl_benutzerfunktion.bezeichnung as Bezeichnung", "tbl_organisationseinheit.bezeichnung as Organisationseinheit", "datum_von as Gültig_von", "datum_bis as Gültig_bis", "wochenstunden as Wochenstunden"])) &&
+			isSuccess($this->BenutzerfunktionModel->addJoin("tbl_organisationseinheit", "oe_kurzbz"))
+		) {
+			$benutzer_funktion_res = $this->BenutzerfunktionModel->loadWhere(array('uid' => $this->uid));
+			if (isError($benutzer_funktion_res)) {
 				// error handling
-			}else{
-				$benutzer_funktion_res = hasData($benutzer_funktion_res)? getData($benutzer_funktion_res) : null;
+			} else {
+				$benutzer_funktion_res = hasData($benutzer_funktion_res) ? getData($benutzer_funktion_res) : null;
 			}
 		}
-	
-	
+
+
 		//? querying the telefon number of the office
-		if(isSuccess($this->MitarbeiterModel->addSelect(["mitarbeiter_uid"])) &&
+		if (
+			isSuccess($this->MitarbeiterModel->addSelect(["mitarbeiter_uid"])) &&
 			isSuccess($this->MitarbeiterModel->addJoin("tbl_kontakt", "tbl_mitarbeiter.standort_id = tbl_kontakt.standort_id"))
-			
-			
-		){
+
+
+		) {
 			$this->MitarbeiterModel->addLimit(1);
-			$telefon_res = $this->MitarbeiterModel->loadWhere(["mitarbeiter_uid"=>$this->uid, "kontakttyp"=>"telefon"]);
-			if(isError($telefon_res)){
+			$telefon_res = $this->MitarbeiterModel->loadWhere(["mitarbeiter_uid" => $this->uid, "kontakttyp" => "telefon"]);
+			if (isError($telefon_res)) {
 				// error handling
-			}else{
-				$telefon_res = hasData($telefon_res)? getData($telefon_res)[0] : null;
+			} else {
+				$telefon_res = hasData($telefon_res) ? getData($telefon_res)[0] : null;
 			}
 		}
-			
-			
-			
-		
-	
-		if(isSuccess($this->MitarbeiterModel->addSelect(["kurzbz","tbl_mitarbeiter.telefonklappe", "alias","ort_kurzbz"]))
+
+
+
+
+
+		if (
+			isSuccess($this->MitarbeiterModel->addSelect(["kurzbz", "tbl_mitarbeiter.telefonklappe", "alias", "ort_kurzbz"]))
 			&& isSuccess($this->MitarbeiterModel->addJoin("tbl_benutzer", "tbl_benutzer.uid = tbl_mitarbeiter.mitarbeiter_uid"))
-			
-		){
+
+		) {
 			$mitarbeiter_res = $this->MitarbeiterModel->load($this->uid);
-				if(isError($mitarbeiter_res)){
-					// error handling
-				}else{
-					$mitarbeiter_res = hasData($mitarbeiter_res)? getData($mitarbeiter_res)[0] : null;
-				}
-			}
-		
-			$res = new stdClass();
-			$res->foto = $person_res->foto;
-			$res->foto_sperre = $person_res->foto_sperre;
-			$res->username = $this->uid;
-			
-			$res->anrede = $person_res->anrede;
-			$res->titel = $person_res->titelpre;
-			$res->vorname = $person_res->vorname;
-			$res->nachname = $person_res->nachname;
-			
-			$res->gebort = $person_res->gebort;
-			$res->gebdatum = $person_res->gebdatum;
-		
-			$res->postnomen = $person_res->titelpost; 
-			
-			
-			$res->adressen = $adresse_res;
-			$res->zutrittsdatum = $zutrittskarte_ausgegebenam;
-			$res->kontakte = $kontakte_res;
-			$res->mittel = $betriebsmittelperson_res;
-			
-			$res->mailverteiler = $mailverteiler_res;
-			
-			foreach($mitarbeiter_res as $key => $value){
-				$res->$key = $value;
-			}
-			$intern_email = array();
-			$intern_email+=array("type" => "intern");
-			$intern_email+=array("email"=> $this->uid . "@" . DOMAIN);
-			$extern_email=array();
-			$extern_email+=array("type" => "alias");
-			$extern_email+=array("email" => $mitarbeiter_res->alias . "@" . DOMAIN);
-			$res->emails = array($intern_email,$extern_email);
-			
-			$res->funktionen = $benutzer_funktion_res;
-
-			//telefon nummer von dem Standort
-			$res->standort_telefon = $telefon_res;
-			return $res;
-	}
-	
-	
-	private function studentProfil(){
-
-
-		
-			//? betriebsmittel soll nur der user selber sehen
-			if(
-			
-				isSuccess($this->BetriebsmittelpersonModel->addSelect(["CONCAT(betriebsmitteltyp, ' ' ,beschreibung) as Betriebsmittel","nummer as Nummer","ausgegebenam as Ausgegeben_am"]))
-				
-			){
-				//? betriebsmittel are not needed in a view
-				$betriebsmittelperson_res = $this->BetriebsmittelpersonModel->getBetriebsmittel($this->pid);
-				if(isError($betriebsmittelperson_res)){
-					   // error handling
-				   }else{
-					   $betriebsmittelperson_res = hasData($betriebsmittelperson_res)? getData($betriebsmittelperson_res) : null;
-				   }
-			   }
-
-			   if(
-			
-				//? kontaktdaten soll auch nur der user selbst sehen
-				isSuccess($this->KontaktModel->addSelect('DISTINCT ON (kontakttyp) kontakttyp, kontakt, tbl_kontakt.anmerkung, tbl_kontakt.zustellung')) &&
-			isSuccess($this->KontaktModel->addJoin('public.tbl_standort', 'standort_id', 'LEFT')) &&
-			isSuccess($this->KontaktModel->addJoin('public.tbl_firma', 'firma_id', 'LEFT'))&&
-			isSuccess($this->KontaktModel->addOrder('kontakttyp, kontakt, tbl_kontakt.updateamum, tbl_kontakt.insertamum'))
-			){
-				$kontakte_res = $this->KontaktModel->loadWhere(array('person_id' => $this->pid));
-				if(isError($kontakte_res)){
-					// handle error	
-				}else{
-					$kontakte_res = hasData($kontakte_res)? getData($kontakte_res) : null;
-				}
-				
-			}
-
-			//? FH Ausweis Austellungsdatum soll auch nur der user selbst sehen
-			$zutrittskarte_ausgegebenam = $this->BetriebsmittelpersonModel->getBetriebsmittelByUid($this->uid,"Zutrittskarte");
-			if(isError($zutrittskarte_ausgegebenam)){
+			if (isError($mitarbeiter_res)) {
 				// error handling
-			}else{
-				$zutrittskarte_ausgegebenam = hasData($zutrittskarte_ausgegebenam)? getData($zutrittskarte_ausgegebenam)[0]->ausgegebenam : null;
-				//? formats the date from 01-01-2000 to 01.01.2000
-				$zutrittskarte_ausgegebenam = str_replace("-",".",$zutrittskarte_ausgegebenam);
-			}
-
-
-			//? Die Adressen soll auch nur der user selber sehen
-
-			if(
-				
-				isSuccess($adresse_res = $this->AdresseModel->addSelect(array("strasse","tbl_adressentyp.bezeichnung as adr_typ","plz","ort")))&&
-				isSuccess($adresse_res = $this->AdresseModel->addOrder("zustelladresse","DESC"))&&
-				isSuccess($adresse_res = $this->AdresseModel->addOrder("sort"))&&
-				isSuccess($adresse_res = $this->AdresseModel->addJoin("tbl_adressentyp","typ=adressentyp_kurzbz"))
-			){
-				$adresse_res = $this->AdresseModel->loadWhere(array("person_id"=>$this->pid));
-				if(isError($adresse_res)){
-					// error handling
-				}else{									
-					$adresse_res = hasData($adresse_res)? getData($adresse_res) : null;
-				}
-			}
-
-			//? die folgenden Informationen darf nur der eigene user sehen
-		
-
-		
-		
-
-		if(
-			isSuccess($this->PersonModel->addSelect('gruppe_kurzbz, beschreibung'))&&
-			isSuccess($this->PersonModel->addJoin('tbl_benutzer', 'person_id')) && 
-		isSuccess($this->PersonModel->addJoin('tbl_benutzergruppe', 'uid')) &&
-		isSuccess($this->PersonModel->addJoin('tbl_gruppe', 'gruppe_kurzbz'))){
-
-			$mailverteiler_res = $this->PersonModel->loadWhere(array('mailgrp' => true, 'uid'=>$this->uid));
-			if( isError($mailverteiler_res)){
-				// catch error
-			}
-			$mailverteiler_res = hasData($mailverteiler_res)? getData($mailverteiler_res) : null;
-			
-			$mailverteiler_res = array_map(function($element) { $element->mailto="mailto:".$element->gruppe_kurzbz."@".DOMAIN; return $element;},$mailverteiler_res);
-		}
-
-		
-		
-		if(isSuccess($this->BenutzerModel->addSelect(["foto","foto_sperre","anrede","titelpost","titelpre","vorname","nachname", "gebort", "gebdatum"]))
-		&& isSuccess($this->BenutzerModel->addJoin("tbl_person", "person_id"))){
-
-			$person_res = $this->BenutzerModel->load([$this->uid]);
-			if(isError($person_res)){
-				// error handling
-			}else{
-				$person_res = hasData($person_res)? getData($person_res)[0] : null;
-			}
-		}
-		
-		if(
-		
-		isSuccess($this->BenutzergruppeModel->addSelect(['bezeichnung']))
-		&& isSuccess($this->BenutzergruppeModel->addJoin('tbl_gruppe', 'gruppe_kurzbz' ))
-		){
-			$zutrittsgruppe_res = $this->BenutzergruppeModel->loadWhere(array("uid"=>$this->uid, "zutrittssystem"=>true));
-			if(isError($zutrittsgruppe_res)){
-				// catch error
-			}
-			$zutrittsgruppe_res = hasData($zutrittsgruppe_res) ? getData($zutrittsgruppe_res) : null;
-			
-		}
-		
-
-
-		//? personenkennzeichen ist die Spalte Matrikelnr in der Tabelle Student
-		if(isSuccess($this->StudentModel->addSelect(['tbl_studiengang.bezeichnung as studiengang','tbl_student.semester', 'tbl_student.verband', 'tbl_student.gruppe' ,'tbl_student.matrikelnr as personenkennzeichen']))
-		 && isSuccess($this->StudentModel->addJoin('tbl_studiengang', "tbl_studiengang.studiengang_kz=tbl_student.studiengang_kz")))
-		{
-			$student_res = $this->StudentModel->load([$this->uid]);
-			if(isError($student_res)){
-				// catch error
-			}
-			$student_res = hasData($student_res)?getData($student_res)[0]:null;
-		
-		}
-		
-
-		
-		//? Matrikelnummer ist die Spalte matr_nr in Person
-		if(isSuccess($this->BenutzerModel->addSelect(["matr_nr"])) 
-		&& isSuccess($this->BenutzerModel->addJoin("tbl_person","person_id"))){
-			$matr_res = $this->BenutzerModel->load([$this->uid]);
-			if(isError($matr_res)){
-				// catch error
-			}else{
-				$matr_res = hasData($matr_res)? getData($matr_res)[0] : [];
-				
+			} else {
+				$mitarbeiter_res = hasData($mitarbeiter_res) ? getData($mitarbeiter_res)[0] : null;
 			}
 		}
 
 		$res = new stdClass();
-		
-		
 		$res->foto = $person_res->foto;
 		$res->foto_sperre = $person_res->foto_sperre;
 		$res->username = $this->uid;
-		
+
 		$res->anrede = $person_res->anrede;
 		$res->titel = $person_res->titelpre;
 		$res->vorname = $person_res->vorname;
 		$res->nachname = $person_res->nachname;
-		
+
 		$res->gebort = $person_res->gebort;
 		$res->gebdatum = $person_res->gebdatum;
-	
-		$res->postnomen = $person_res->titelpost; 
-		
+
+		$res->postnomen = $person_res->titelpost;
+
+
+		$res->adressen = $adresse_res;
+		$res->zutrittsdatum = $zutrittskarte_ausgegebenam;
+		$res->kontakte = $kontakte_res;
+		$res->mittel = $betriebsmittelperson_res;
+
+		$res->mailverteiler = $mailverteiler_res;
+
+		foreach ($mitarbeiter_res as $key => $value) {
+			$res->$key = $value;
+		}
+		$intern_email = array();
+		$intern_email += array("type" => "intern");
+		$intern_email += array("email" => $this->uid . "@" . DOMAIN);
+		$extern_email = array();
+		$extern_email += array("type" => "alias");
+		$extern_email += array("email" => $mitarbeiter_res->alias . "@" . DOMAIN);
+		$res->emails = array($intern_email, $extern_email);
+
+		$res->funktionen = $benutzer_funktion_res;
+
+		//telefon nummer von dem Standort
+		$res->standort_telefon = $telefon_res;
+		return $res;
+	}
+
+
+	private function studentProfil()
+	{
+
+
+
+		//? betriebsmittel soll nur der user selber sehen
+		if (
+
+			isSuccess($this->BetriebsmittelpersonModel->addSelect(["CONCAT(betriebsmitteltyp, ' ' ,beschreibung) as Betriebsmittel", "nummer as Nummer", "ausgegebenam as Ausgegeben_am"]))
+
+		) {
+			//? betriebsmittel are not needed in a view
+			$betriebsmittelperson_res = $this->BetriebsmittelpersonModel->getBetriebsmittel($this->pid);
+			if (isError($betriebsmittelperson_res)) {
+				// error handling
+			} else {
+				$betriebsmittelperson_res = hasData($betriebsmittelperson_res) ? getData($betriebsmittelperson_res) : null;
+			}
+		}
+
+		if (
+
+			//? kontaktdaten soll auch nur der user selbst sehen
+			isSuccess($this->KontaktModel->addSelect('DISTINCT ON (kontakttyp) kontakttyp, kontakt, tbl_kontakt.anmerkung, tbl_kontakt.zustellung')) &&
+			isSuccess($this->KontaktModel->addJoin('public.tbl_standort', 'standort_id', 'LEFT')) &&
+			isSuccess($this->KontaktModel->addJoin('public.tbl_firma', 'firma_id', 'LEFT')) &&
+			isSuccess($this->KontaktModel->addOrder('kontakttyp, kontakt, tbl_kontakt.updateamum, tbl_kontakt.insertamum'))
+		) {
+			$kontakte_res = $this->KontaktModel->loadWhere(array('person_id' => $this->pid));
+			if (isError($kontakte_res)) {
+				// handle error	
+			} else {
+				$kontakte_res = hasData($kontakte_res) ? getData($kontakte_res) : null;
+			}
+
+		}
+
+		//? FH Ausweis Austellungsdatum soll auch nur der user selbst sehen
+		$zutrittskarte_ausgegebenam = $this->BetriebsmittelpersonModel->getBetriebsmittelByUid($this->uid, "Zutrittskarte");
+		if (isError($zutrittskarte_ausgegebenam)) {
+			// error handling
+		} else {
+			$zutrittskarte_ausgegebenam = hasData($zutrittskarte_ausgegebenam) ? getData($zutrittskarte_ausgegebenam)[0]->ausgegebenam : null;
+			//? formats the date from 01-01-2000 to 01.01.2000
+			$zutrittskarte_ausgegebenam = str_replace("-", ".", $zutrittskarte_ausgegebenam);
+		}
+
+
+		//? Die Adressen soll auch nur der user selber sehen
+
+		if (
+
+			isSuccess($adresse_res = $this->AdresseModel->addSelect(array("strasse", "tbl_adressentyp.bezeichnung as adr_typ", "plz", "ort"))) &&
+			isSuccess($adresse_res = $this->AdresseModel->addOrder("zustelladresse", "DESC")) &&
+			isSuccess($adresse_res = $this->AdresseModel->addOrder("sort")) &&
+			isSuccess($adresse_res = $this->AdresseModel->addJoin("tbl_adressentyp", "typ=adressentyp_kurzbz"))
+		) {
+			$adresse_res = $this->AdresseModel->loadWhere(array("person_id" => $this->pid));
+			if (isError($adresse_res)) {
+				// error handling
+			} else {
+				$adresse_res = hasData($adresse_res) ? getData($adresse_res) : null;
+			}
+		}
+
+		//? die folgenden Informationen darf nur der eigene user sehen
+
+
+
+
+
+		if (
+			isSuccess($this->PersonModel->addSelect('gruppe_kurzbz, beschreibung')) &&
+			isSuccess($this->PersonModel->addJoin('tbl_benutzer', 'person_id')) &&
+			isSuccess($this->PersonModel->addJoin('tbl_benutzergruppe', 'uid')) &&
+			isSuccess($this->PersonModel->addJoin('tbl_gruppe', 'gruppe_kurzbz'))
+		) {
+
+			$mailverteiler_res = $this->PersonModel->loadWhere(array('mailgrp' => true, 'uid' => $this->uid));
+			if (isError($mailverteiler_res)) {
+				// catch error
+			}
+			$mailverteiler_res = hasData($mailverteiler_res) ? getData($mailverteiler_res) : null;
+
+			$mailverteiler_res = array_map(function ($element) {
+				$element->mailto = "mailto:" . $element->gruppe_kurzbz . "@" . DOMAIN;
+				return $element; }, $mailverteiler_res);
+		}
+
+
+
+		if (
+			isSuccess($this->BenutzerModel->addSelect(["foto", "foto_sperre", "anrede", "titelpost", "titelpre", "vorname", "nachname", "gebort", "gebdatum"]))
+			&& isSuccess($this->BenutzerModel->addJoin("tbl_person", "person_id"))
+		) {
+
+			$person_res = $this->BenutzerModel->load([$this->uid]);
+			if (isError($person_res)) {
+				// error handling
+			} else {
+				$person_res = hasData($person_res) ? getData($person_res)[0] : null;
+			}
+		}
+
+		if (
+
+			isSuccess($this->BenutzergruppeModel->addSelect(['bezeichnung']))
+			&& isSuccess($this->BenutzergruppeModel->addJoin('tbl_gruppe', 'gruppe_kurzbz'))
+		) {
+			$zutrittsgruppe_res = $this->BenutzergruppeModel->loadWhere(array("uid" => $this->uid, "zutrittssystem" => true));
+			if (isError($zutrittsgruppe_res)) {
+				// catch error
+			}
+			$zutrittsgruppe_res = hasData($zutrittsgruppe_res) ? getData($zutrittsgruppe_res) : null;
+
+		}
+
+
+
+		//? personenkennzeichen ist die Spalte Matrikelnr in der Tabelle Student
+		if (
+			isSuccess($this->StudentModel->addSelect(['tbl_studiengang.bezeichnung as studiengang', 'tbl_student.semester', 'tbl_student.verband', 'tbl_student.gruppe', 'tbl_student.matrikelnr as personenkennzeichen']))
+			&& isSuccess($this->StudentModel->addJoin('tbl_studiengang', "tbl_studiengang.studiengang_kz=tbl_student.studiengang_kz"))
+		) {
+			$student_res = $this->StudentModel->load([$this->uid]);
+			if (isError($student_res)) {
+				// catch error
+			}
+			$student_res = hasData($student_res) ? getData($student_res)[0] : null;
+
+		}
+
+
+
+		//? Matrikelnummer ist die Spalte matr_nr in Person
+		if (
+			isSuccess($this->BenutzerModel->addSelect(["matr_nr"]))
+			&& isSuccess($this->BenutzerModel->addJoin("tbl_person", "person_id"))
+		) {
+			$matr_res = $this->BenutzerModel->load([$this->uid]);
+			if (isError($matr_res)) {
+				// catch error
+			} else {
+				$matr_res = hasData($matr_res) ? getData($matr_res)[0] : [];
+
+			}
+		}
+
+		$res = new stdClass();
+
+
+		$res->foto = $person_res->foto;
+		$res->foto_sperre = $person_res->foto_sperre;
+		$res->username = $this->uid;
+
+		$res->anrede = $person_res->anrede;
+		$res->titel = $person_res->titelpre;
+		$res->vorname = $person_res->vorname;
+		$res->nachname = $person_res->nachname;
+
+		$res->gebort = $person_res->gebort;
+		$res->gebdatum = $person_res->gebdatum;
+
+		$res->postnomen = $person_res->titelpost;
+
 
 		$intern_email = array();
-		$intern_email+=array("type" => "intern");
-		$intern_email+=array("email"=> $this->uid . "@" . DOMAIN);
-		
+		$intern_email += array("type" => "intern");
+		$intern_email += array("email" => $this->uid . "@" . DOMAIN);
+
 		$res->emails = array($intern_email);
 		$res->adressen = $adresse_res;
 		$res->zutrittsdatum = $zutrittskarte_ausgegebenam;
 		$res->kontakte = $kontakte_res;
 		$res->mittel = $betriebsmittelperson_res;
 		$res->matrikelnummer = $matr_res->matr_nr;
-		foreach($student_res as $key => $value){
+		foreach ($student_res as $key => $value) {
 			$res->$key = trim($value);
 		}
 		$res->zuttritsgruppen = $zutrittsgruppe_res;
 
-	
-		
+
+
 		$res->mailverteiler = $mailverteiler_res;
-		
+
 		return $res;
-		
-		 
+
+
 
 	}
 
-	public function getView($uid){
-	
-		
+	public function getView($uid)
+	{
+
+
 		$uid = $uid != "Profil" ? $uid : null;
-		
-		
-		
+
+
+
 		$isMitarbeiter = null;
-		if($uid){
-			
-			if(isSuccess($this->PersonModel->addSelect(["person_id"]))){
+		if ($uid) {
+
+			if (isSuccess($this->PersonModel->addSelect(["person_id"]))) {
 				$pid = $this->PersonModel->getByUid($uid);
 				$pid = hasData($pid) ? getData($pid)[0] : null;
-				
+
 			}
-			if(!$pid){
+			if (!$pid) {
 				//! if no Person_ID was found, null is returned and the vue component will show a 404 View
 				return null;
 			}
-			
-			$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter($uid);
-		}
-		else
-			$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter($this->uid);
-		
 
-		if(isError($isMitarbeiter)){
+			$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter($uid);
+		} else
+			$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter($this->uid);
+
+
+		if (isError($isMitarbeiter)) {
 			//catch error
 		}
 		$isMitarbeiter = hasData($isMitarbeiter) ? getData($isMitarbeiter) : null;
-		
-		
+
+
 		$res = new stdClass();
-		
-		if($uid == $this->uid || !$uid ){
+
+		if ($uid == $this->uid || !$uid) {
 			// if the $uid is empty, then no payload was supplied and the own profile is being requested
-			if($isMitarbeiter ) {
-				$res->view= "MitarbeiterProfil";
+			if ($isMitarbeiter) {
+				$res->view = "MitarbeiterProfil";
 				$res->data = $this->mitarbeiterProfil();
 				$res->data->pid = $this->pid;
-			}
-			else {
-				$res->view= "StudentProfil";
+			} else {
+				$res->view = "StudentProfil";
 				$res->data = $this->studentProfil();
 				$res->data->pid = $this->pid;
 			}
-		}
-		elseif($uid){
+		} elseif ($uid) {
 			// if an $uid was passed as payload to the function then the user is trying to view another profile
-			if($isMitarbeiter ){
-				 $res->view= "ViewMitarbeiterProfil";
-				 $res->data= $this->viewMitarbeiterProfil($uid);
-				
-			}
-			else {
-				$res->view= "ViewStudentProfil";
-				$res->data= $this->viewStudentProfil($uid);
-				
+			if ($isMitarbeiter) {
+				$res->view = "ViewMitarbeiterProfil";
+				$res->data = $this->viewMitarbeiterProfil($uid);
+
+			} else {
+				$res->view = "ViewStudentProfil";
+				$res->data = $this->viewStudentProfil($uid);
+
 			}
 		}
 
 
 		echo json_encode($res);
-		
+
 	}
 
-	public function foto_sperre_function($value){
+	public function foto_sperre_function($value)
+	{
 		//? Nur der Index User hat die Erlaubniss das Profilbild zu sperren 
-		$res = $this->PersonModel->update($this->pid,array("foto_sperre"=>$value));
-		
-		if(isError($res)){
+		$res = $this->PersonModel->update($this->pid, array("foto_sperre" => $value));
+
+		if (isError($res)) {
 			echo json_encode("error encountered when updating foto_sperre");
 			return;
 			// error handling
-		}else{
+		} else {
 			//? select the value of the column foto_sperre to return 
-			if(isSuccess($this->PersonModel->addSelect("foto_sperre"))){
+			if (isSuccess($this->PersonModel->addSelect("foto_sperre"))) {
 				$res = $this->PersonModel->load($this->pid);
-				if(isError($res)){
+				if (isError($res)) {
 					// error handling
 				}
 				$res = hasData($res) ? getData($res)[0] : null;
 			}
-			
+
 		}
 		echo json_encode($res);
 	}
diff --git a/public/js/apps/Cis/Profil.js b/public/js/apps/Cis/Profil.js
index 989a1b5e2..2547f9e48 100644
--- a/public/js/apps/Cis/Profil.js
+++ b/public/js/apps/Cis/Profil.js
@@ -3,7 +3,6 @@ import StudentProfil from "../../components/Cis/Profil/StudentProfil.js";
 import MitarbeiterProfil from "../../components/Cis/Profil/MitarbeiterProfil.js";
 import ViewStudentProfil from "../../components/Cis/Profil/StudentViewProfil.js";
 import ViewMitarbeiterProfil from "../../components/Cis/Profil/MitarbeiterViewProfil.js";
-import Base from "../../components/Cis/Profil/Base.js";
 import fhcapifactory from "../api/fhcapifactory.js";
 
 Vue.$fhcapi = fhcapifactory;
diff --git a/public/js/components/Cis/Profil/Base.js b/public/js/components/Cis/Profil/Base.js
deleted file mode 100644
index ce6ca16f5..000000000
--- a/public/js/components/Cis/Profil/Base.js
+++ /dev/null
@@ -1,743 +0,0 @@
-import fhcapifactory from "../../../apps/api/fhcapifactory.js";
-import { CoreFilterCmpt } from "../../../components/filter/Filter.js";
-
-export default {
-  components: {
-    CoreFilterCmpt,
-  },
-  data() {
-    return {
-      collapseIconFunktionen: true,
-      collapseIconBetriebsmittel: true,
-      funktionen_table_options: {
-        height: 300,
-        layout: "fitColumns",
-        responsiveLayout: "collapse",
-        responsiveLayoutCollapseUseFormatters: false,
-        responsiveLayoutCollapseFormatter: Vue.$collapseFormatter,
-        data: [
-          {
-            Bezeichnung: "",
-            Organisationseinheit: "",
-            Gültig_von: "",
-            Gültig_bis: "",
-            Wochenstunden: "",
-          },
-        ],
-        columns: [
-          //? option when wanting to hide the collapsed list
-
-          {
-            title:
-              "<i id='collapseIconFunktionen' role='button' class='fa-solid fa-angle-down  '></i>",
-            field: "collapse",
-            headerSort: false,
-            headerFilter: false,
-            formatter: "responsiveCollapse",
-            maxWidth: 40,
-            headerClick: this.collapseFunction,
-          },
-          {
-            title: "Bezeichnung",
-            field: "Bezeichnung",
-            headerFilter: true,
-            minWidth: 200,
-          },
-          {
-            title: "Organisationseinheit",
-            field: "Organisationseinheit",
-            headerFilter: true,
-            minWidth: 200,
-          },
-          {
-            title: "Gültig_von",
-            field: "Gültig_von",
-            headerFilter: true,
-            resizable: true,
-            minWidth: 200,
-          },
-          {
-            title: "Gültig_bis",
-            field: "Gültig_bis",
-            headerFilter: true,
-            resizable: true,
-            minWidth: 200,
-          },
-          {
-            title: "Wochenstunden",
-            field: "Wochenstunden",
-            headerFilter: true,
-            minWidth: 200,
-          },
-        ],
-      },
-      betriebsmittel_table_options: {
-        height: 300,
-        layout: "fitColumns",
-        responsiveLayout: "collapse",
-        responsiveLayoutCollapseUseFormatters: false,
-        responsiveLayoutCollapseFormatter: Vue.$collapseFormatter,
-        data: [{ betriebsmittel: "", Nummer: "", Ausgegeben_am: "" }],
-        columns: [
-          {
-            title:
-              "<i id='collapseIconBetriebsmittel' role='button' class='fa-solid fa-angle-down  '></i>",
-            field: "collapse",
-            headerSort: false,
-            headerFilter: false,
-            formatter: "responsiveCollapse",
-            maxWidth: 40,
-            headerClick: this.collapseFunction,
-          },
-          {
-            title: "Betriebsmittel",
-            field: "betriebsmittel",
-            headerFilter: true,
-            minWidth: 200,
-          },
-          {
-            title: "Nummer",
-            field: "Nummer",
-            headerFilter: true,
-            resizable: true,
-            minWidth: 200,
-          },
-          {
-            title: "Ausgegeben_am",
-            field: "Ausgegeben_am",
-            headerFilter: true,
-            minWidth: 200,
-          },
-        ],
-      },
-    };
-  },
-
-  //? this is the prop passed to the dynamic component with the custom data of the view
-  props: ["data"],
-  methods: {
-    sperre_foto_function() {
-      if (!this.data) {
-        return;
-      }
-      fhcapifactory.UserData.sperre_foto_function(!this.data.foto_sperre).then((res) => {
-        this.data.foto_sperre = res.data.foto_sperre;
-      });
-    },
-    collapseFunction(e, column) {
-      //* the if of the column has to match with the name of the responsive data in the vue component
-      this[e.target.id] = !this[e.target.id];
-
-      //* gets all event icons of the different rows to use the onClick event later
-      let allClickableIcons = column._column.cells.map((row) => {
-        return row.element.children[0];
-      });
-
-      //* changes the icon that shows or hides all the collapsed columns
-      //* if the replace function does not find the class to replace, it just simply returns false
-      if (this[e.target.id]) {
-        e.target.classList.replace("fa-angle-up", "fa-angle-down");
-      } else {
-        e.target.classList.replace("fa-angle-down", "fa-angle-up");
-      }
-
-      //* changes the icon for every collapsed column to open or closed
-      if (this[e.target.id]) {
-        allClickableIcons
-          .filter((column) => {
-            return !column.classList.contains("open");
-          })
-          .forEach((col) => {
-            col.click();
-          });
-      } else {
-        allClickableIcons
-          .filter((column) => {
-            return column.classList.contains("open");
-          })
-          .forEach((col) => {
-            col.click();
-          });
-      }
-    },
-  },
-
-  computed: {
-    refreshMailTo() {
-      return `mailto:info.mio@technikum-wien.at?subject=Datenkorrektur&body=Die%20Profildaten%20für%20User%20'${this.data.username}'%20sind%20nicht%20korrekt.%0DHier, die richtigen Daten:%0A%0ANachname:%20${this.data.nachname}%0AVorname:%20${this.data.vorname}%0AGeburtsdatum:${this.data.gebdatum}%0AGeburtsort:%20${this.data.gebort}%0ATitelPre:${this.data.titel}%20%0ATitelPost:${this.data.postnomen}%20%0A%0A***%0DPlatz für weitere (nicht angeführte Daten)%0D***%0A%0A[Bitte%20übermitteln%20Sie%20uns%20etwaige%20Dokumente%20zum%20Beleg%20der%20Änderung]`;
-    },
-
-    get_image_base64_src() {
-      if (!this.data) {
-        return "";
-      }
-      return "data:image/jpeg;base64," + this.data.foto;
-    },
-    //? this computed function returns all the informations for the first column in the profil
-    personData() {
-      if (!this.data) {
-        return {};
-      }
-
-      return {
-        Username: this.data.username,
-        Anrede: this.data.anrede,
-        Titel: this.data.titel,
-        Postnomen: this.data.postnomen,
-      };
-    },
-
-    personKontakt() {
-      if (!this.data) {
-        return {};
-      }
-
-      return {
-        emails: this.data.emails,
-        
-      };
-    },
-
-    specialData() {
-      if (!this.data) {
-        return {};
-      }
-
-      return {
-        Geburtsdatum: this.data.gebdatum,
-        Geburtsort: this.data.gebort,
-        Kurzzeichen: this.data.kurzbz,
-        Telefon: this.data.telefonklappe,
-        Büro: this.data.ort_kurzbz,
-      };
-    },
-
-    privateKontakte() {
-      if (!this.data) {
-        return {};
-      }
-
-      return this.data.kontakte;
-      
-    },
-
-    privateAdressen() {
-      if (!this.data) {
-        return {};
-      }
-
-      return this.data.adressen;
-      
-    },
-    
-
-    kontaktInfo() {
-      if (!this.data) {
-        return {};
-      }
-
-      return {
-        FhAusweisStatus: this.data.zutrittsdatum,
-        emails: this.data.emails,
-        Kontakte: this.data.kontakte,
-        Adressen: this.data.adressen,
-      };
-    },
-  },
-
-  mounted() {
-    this.$refs.betriebsmittelTable.tabulator.on("tableBuilt", () => {
-      this.$refs.betriebsmittelTable.tabulator.setData(this.data.mittel);
-    });
-
-    this.$refs.funktionenTable.tabulator.on("tableBuilt", () => {
-      this.$refs.funktionenTable.tabulator.setData(this.data.funktionen);
-    });
-  },
-
-  template: ` 
-
-  <div class="container-fluid text-break"  >
-    <!-- ROW --> 
-          <div class="row">
-          <!-- HIDDEN QUICK LINKS -->
-              <div  class="d-md-none col-12 ">
-             
-              <div class="row py-2">
-              <div class="col">
-                <p class="m-0">
-                <div class="card">
-                
-                <a class=" w-100 btn " data-bs-toggle="collapse" href="#collapseExample" role="button" aria-expanded="false" aria-controls="collapseExample">
-                <u> Quick links</u>
-               </a>
-             
-                
-               </div>
-                 
-                </p>
-                <div class="mt-1 collapse" id="collapseExample">
-                  
-                  <div class="list-group">
-                   
-                    <a href="#" class="list-group-item list-group-item-action">Zeitwünsche</a>
-                    <a href="#" class="list-group-item list-group-item-action">Lehrveranstaltungen</a>
-                    <a href="#" class="list-group-item list-group-item-action ">Zeitsperren von Gschnell</a>
-                  </div>
-                </div>
-              </div>
-            </div>
-
-              </div>
-              <!-- END OF HIDDEN QUCK LINKS -->
-
-
-              <div class="col-12">
-             
-             
-                    <div class=" form-floating mb-2">
-                      <div class="card">
-                        <div class="card-body">
-                          <span>Der FH Ausweis ist am <b>{{data.zutrittsdatum}}</b> ausgegeben worden.</span>
-                        </div>
-                      </div>
-                    </div>
-          
-              </div>
-
-
-              <!-- MAIN PANNEL -->
-              <div class="col-sm-12 col-md-9">
-                <!-- ROW WITH PROFIL IMAGE AND INFORMATION -->
-               
-              
-
-                    <!-- INFORMATION CONTENT START -->
-                    <!-- ROW WITH THE PROFIL INFORMATION --> 
-                    <div class="row mb-4">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<!-- FIRST KAESTCHEN -->
-                      <div  class="col-lg-12 col-xl-6 ">
-                     <div class="row mb-4">
-                     <div class="col">
-                     
-                        
-                      <div class="card h-100">
-                      <div class="card-header">
-                      MitarbeiterIn
-                      </div>
-                      <div class="card-body">
-                      
-                       
-
-
-                  
-                  <div  class="row justify-content-center align-items-center">
-
-
-
-
-                  <!-- SQUEEZING THE IMAGE INSIDE THE FIRST INFORMATION COLUMN -->
- <!-- START OF THE FIRST ROW WITH THE PROFIL IMAGE -->
-          <div class="col-12 col-sm-6 mb-2">
-           <div class="row justify-content-center">
-                        <div class="col-auto " style="position:relative">
-                          <img class=" img-thumbnail " style=" max-height:150px; "  :src="get_image_base64_src"></img>
-                          <!-- LOCKING IMAGE FUNCTIONALITY -->
-                          
-                          
-                          <div role="button" @click.prevent="sperre_foto_function" style="height:22px; width:21px; background-color:white; position:absolute; top:0; right:12px; display:flex; align-items:center; justify-content:center;" >
-                          <i :class="{'fa':true, ...(data.foto_sperre?{'fa-lock':true}:{'fa-lock-open':true})} " ></i>
-                          
-                          
-                          </div>
-                        </div>
-                      </div>
-                    <!-- END OF THE ROW WITH THE IMAGE -->
-                    </div>
-<!-- END OF SQUEEZE -->
-
-
-
-<!-- COLUMNS WITH MULTIPLE ROWS NEXT TO PROFIL PICTURE -->
-                  <div class="col-12 col-sm-6">
-                  <div class="row">
-                  <div class="col-12">
-                  <div class=" form-floating mb-2">
-                        
-                  <input  readonly class="form-control form-control-plaintext border-bottom" id="floatingInputValue"  :value="data.vorname">
-                  <label for="floatingInputValue">Vorname</label>
-                </div>
-                </div>
-                <div class="col-12">
-                <div class=" form-floating mb-2">
-                        
-                  <input  readonly class="form-control form-control-plaintext border-bottom" id="floatingInputValue"  :value="data.nachname">
-                  <label for="floatingInputValue">Nachname</label>
-                </div>
-                </div>
-                </div>
-             
-                
-                  </div>
-                  
-
-
-
-
-
-
-
-                  <div v-for="(wert,bez) in personData" class="col-md-6 col-sm-12 ">
-                  <div class=" form-floating mb-2">
-                        
-                  <input  readonly class="form-control form-control-plaintext border-bottom" id="floatingInputValue" placeholder="name@example.com" :value="wert?wert:'-'">
-                  <label for="floatingInputValue">{{bez}}</label>
-                  </div>
-                  </div>
-
-                  
-                      </div>
-
-
-                      
-                      </div>
-                    </div>
-		    </div>
-                    </div>
-                     <div class="row mb-4">
-                     
-
-                     <div  class=" col-lg-12">
-        
-                     <div class="card">
-                 
-                         <div class="card-header">
-                         Mitarbeiter Information
-                         </div>
-                         <div class="card-body">
-                             <div class="row">
-                             <div v-for="(wert,bez) in specialData" class="col-md-6 col-sm-12 ">
-                                 <div class=" form-floating mb-2">    
-                                 <input  readonly class="form-control form-control-plaintext border-bottom" id="floatingInputValue" placeholder="name@example.com" :value="wert?wert:'-'">
-                                 <label for="floatingInputValue">{{bez}}</label>
-                                 </div>
-                             </div>
-                         </div>
-                         
-                     </div>
-                     
-                 </div>
-
-                     </div>  
-                            
-
-
-
-<!-- END OF THE FIRST KAESTCHEN -->
-                      </div>
-
-
-                      <!-- START OF SECOND PROFIL  INFORMATION COLUMN -->
-                     
-
-
-                     
-
-
-              
-                    <!-- END OF PROFIL INFORMATION ROW -->
-                    <!-- INFORMATION CONTENT END -->
-                    </div>
-
-                    <div  class="col-xl-6 col-lg-12 ">
-                    <div class="row mb-4">
-                    <div class="col">
-
-
-                    <div class="card ">
-                    <div class="card-header">
-                    Mails
-                    </div>
-                   
-                    <div class="card-body">
-
-
-
-                      <div v-for="(wert,bezeichnung) in personKontakt">
-
-                      
-            
-                      <!-- HIER SIND DIE EMAILS -->
-                  
-                  
-                      <div v-for="email in wert" v-if="typeof wert === 'object' && bezeichnung == 'emails'" class="row justify-content-center">
-                      <div  class="col-12 ">
-                      <div class=" form-floating mb-2">
-                            
-                      <a  :href="'mailto:'+email.email" readonly class="form-control form-control-plaintext border-bottom" id="floatingFhAusweis" >{{email.email}}</a>
-                      <label for="floatingFhAusweis">{{email.type }}</label>
-                    
-                      </div>
-                      </div>
-                          </div>
-
-                    
-                    
-                     
-
-
-
-
-                    
-                      </div>
-
-
-                    </div>
-                    </div>
-                    </div></div>
-
-                    <!-- HIER SIND DIE PRIVATEN KONTAKTE-->
-                    <div class="row mb-4 ">
-                      <div class="col">
-                        <div class="card">
-                          <div class="card-header">
-                            Private Kontakte
-                          </div>
-                          <div class="card-body text-center">
-                            
-                            <div v-for="element in privateKontakte" class="align-items-center row justify-content-center">
-                           
-                              <div  :class="{...(element.anmerkung? {'col-10':true, 'col-md-6':true} : {'col-10':true, 'col-xl-11':true})}">
-                                  <div class=" form-floating mb-2">
-                                      <input  readonly class="form-control form-control-plaintext border-bottom" id="floatingKontakt" :value="element.kontakt">
-                                      <label for="floatingKontakt">{{element.kontakttyp}}</label>
-                                  </div>
-                              </div>
-                              <div v-if="element?.anmerkung" class="col-12 col-md-4 col-lg-4 col-xl-5 order-2 order-md-1 ">
-                                  <div class=" form-floating mb-2">
-                                      <input   readonly class="form-control form-control-plaintext border-bottom" id="floatingAnmerkung" :value="element.anmerkung">
-                                      <label for="floatingAnmerkung">Anmerkung</label>
-                                  </div>
-                              </div>
-                              <div class="col-2 order-1 order-md-2 col-xl-1 allign-middle">
-                                  <i v-if="element.zustellung" class="fa-solid fa-check"></i>
-                                  <i v-else="element.zustellung" class="fa-solid fa-xmark"></i>
-                              </div>
-                            </div>
-                           
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <!-- -->
-
-                    <!-- HIER SIND DIE PRIVATEN ADRESSEN-->
-                    <div class="row mb-4">
-                      <div class="col">
-                        <div class="card">
-                          <div class="card-header">Private Adressen</div>
-                          <div class="card-body">
-                          
-                            <div v-for="element in privateAdressen" class="row justify-content-center align-items-center">
-                            <!-- column 1 in the address row -->
-                                <div class="col-2 col-sm-1 text-center">
-                                 
-                                  <i class="fa fa-location-dot fa-lg" style="color:#00649C "></i>
-                                
-                                </div>
-                                <div  class="col-10 col-sm-11 ">
-                                    <div class=" form-floating mb-2">
-                                        <input   readonly class="form-control form-control-plaintext border-bottom" id="floatingFhAusweis" :value="element.strasse">
-                                        <label for="floatingFhAusweis">Strasse</label>
-                                    </div>
-                                </div>
-                            <!-- column 2 in the address row -->
-                                <div  class="col-lg-4 col-md-4 col-sm-6 col-xs-6 order-sm-1">
-                                    <div class=" form-floating mb-2">
-                                        <input   readonly class="form-control form-control-plaintext border-bottom" id="floatingFhAusweis" :value="element.adr_typ">
-                                        <label for="floatingFhAusweis">Typ</label>
-                                    </div>
-                                </div>
-                                <div  class="col-md-5 col-sm-12 col-xs-12 ">
-                                    <div class=" form-floating mb-2">
-                                        <input   readonly class="form-control form-control-plaintext border-bottom" id="floatingFhAusweis" :value="element.ort">
-                                        <label for="floatingFhAusweis">Ort</label>
-                                    </div>
-                                </div>
-                                <div  class="col-lg-3 col-md-3 col-sm-6 col-xs-6 order-sm-2">
-                                    <div class=" form-floating mb-2">
-                                        <input   readonly class="form-control form-control-plaintext border-bottom" id="floatingFhAusweis" :value="element.plz">
-                                        <label for="floatingFhAusweis">PLZ</label>
-                                    </div>
-                                </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <!-- -->
-
-
-
-                    <!-- END OF THE SECOND INFORMATION COLUMN -->
-                    </div>
-
-
-                    <!-- START OF THE SECOND PROFIL INFORMATION ROW --> 
-                  
-                    
-                  <!-- ROW WITH PROFIL IMAGE AND INFORMATION END -->
-                </div  >
-
-
-
-                <!-- LITTLE EXTRA ROW WITH INFORMATION REFRESHING LINK -->
-                <div class="row">
-                  <div   class="col ">
-                    <p>Sollten Ihre Daten nicht mehr aktuell sein, klicken Sie bitte <a :href="refreshMailTo">hier</a></p>
-                  </div>
-                </div>
-                <!-- END OF REFRESHING LINK ROW -->
-
-
-
-
-                <!-- SECOND ROW UNDER THE PROFIL IMAGE AND INFORMATION WITH THE TABLES -->
-                <div class="row">
-
-                <!-- FIRST TABLE -->
-                  <div class="col-12 mb-4" >
-                    <core-filter-cmpt title="Funktionen"  ref="funktionenTable" :tabulator-options="funktionen_table_options"  tableOnly :sideMenu="false" />
-                  </div>
-
-                <!-- SECOND TABLE -->
-                  <div class="col-12 mb-4" >
-                    <core-filter-cmpt title="Entlehnte Betriebsmittel"  ref="betriebsmittelTable" :tabulator-options="betriebsmittel_table_options" tableOnly :sideMenu="false" />
-                  </div>
-
-                <!-- END OF THE ROW WITH THE TABLES UNDER THE PROFIL INFORMATION -->
-                </div>
-
-
-
-
-
-
-
-              <!-- END OF MAIN CONTENT COL -->
-              </div>
-
-
-
-
-              <!-- START OF SIDE PANEL -->
-              <div  class="col-md-3 col-sm-12 text-break" >
-
-
-              <!-- SRART OF QUICK LINKS IN THE SIDE PANEL -->
-
-
-              <!-- START OF THE FIRDT ROW IN THE SIDE PANEL -->
-              <!-- THESE QUCK LINKS ARE ONLY VISIBLE UNTIL VIEWPORT MD -->
-                <div  class="row d-none d-md-block mb-3">
-                  <div class="col">
-                 
-                    <div class="card">
-                      <div class="card-header">
-                      Quick Links
-                      </div>
-                      <div class="card-body">
-                      
-                       
-                        <a style="text-decoration:none" class="my-1 d-block" href="#">Zeitwuensche</a>
-                        <a style="text-decoration:none" class="my-1 d-block" href="#">Lehrveranstaltungen</a>
-                        <a style="text-decoration:none" class="my-1 d-block" href="#">Zeitsperren von Gschnell</a>
-
-                      </div>
-                    </div>
-
-                   
-                      
-                  
-                  </div>
-                </div>
-
-
-                <!-- START OF THE SECOND ROW IN THE SIDE PANEL -->
-                <div  class="row">
-                
-                  <div class="col">
-                
-
-                  
-                  <!-- HIER SIND DIE MAILVERTEILER -->
-                    <div class="card">
-                      <div class="card-header">
-                      Mailverteilers
-                      </div>
-                      <div class="card-body">
-                      
-                        <h6 class="card-title">Sie sind Mitgglied in folgenden Verteilern:</h6>
-                        <div  class="card-text row text-break mb-2" v-for="verteiler in data?.mailverteiler">
-                          <div class="col-12 ">
-                            <div class="row">  
-                              <div class="col-1">
-                              
-                              <i class="fa-solid fa-envelope" style="color: #00649C;"></i>
-                              
-                              </div>
-                              <div class="col-11">
-                                <a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a>
-                              </div>
-                            </div>
-                           
-                          </div> 
-                          <div class="col-12 ">{{verteiler.beschreibung}}</div>
-                        </div>
-
-                      </div>
-                    </div>
-
-
-
-
-
-                  </div>
-
-                <!-- END OF THE SECOND ROW IN THE SIDE PANEL -->
-                </div>
-
-                <!-- END OF SIDE PANEL -->
-              </div>
-
-
-            
-
-
-
-          <!-- END OF CONTAINER ROW-->
-          
-      </div>
-      
-      <!-- END OF CONTAINER -->
-  </div>
-            
-    `,
-};
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index a23b8c452..ad1fe4a9d 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -135,10 +135,6 @@ export default {
 		onShownBsModal: Function
     */
 	},
- /*  mixins: [
-		BsModal,
-	
-	], */
   
   methods: {
     showModal() {
@@ -152,22 +148,11 @@ export default {
 
 
     submitProfilChange(){
-      
-      
       if(this.isEditDataChanged){
-        
-        console.log("the editData contains the same information",JSON.stringify(this_data),"editData values:", JSON.stringify(Object.entries(this.editData)));
-      }else{
-        console.log("the editData HAS DIFFERENT INFORMATION");
+        //? inserts new row in public.tbl_cis_profil_update 
+        Vue.$fhcapi.UserData.editProfil(this.editData);
+     
       }
-
-      /* if(somethingChanged){
-        console.log("the editData contains changed information");
-      }else{
-        console.log("the editData does not contain changed information");
-      } */
-      //? insert editData into a new row inside the public.tbl_cis_profil_update table
-      //Vue.$fhcapi.UserData.editProfil(this.editData);
     },
     sperre_foto_function() {
       if (!this.data) {
@@ -608,7 +593,7 @@ export default {
                                 </template>
                                 <!-- optional footer -->
                                 <template v-if="isEditDataChanged" v-slot:footer>
-                                  <button role="button" class="btn btn-primary">submit</button>
+                                  <button @click="submitProfilChange" role="button" class="btn btn-primary">submit</button>
                                 </template>
                                 <!-- end of optional footer -->
                                 </bs-modal>

From 59b848c576df20a43c6164bf60ecfb6d43f9f373 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Thu, 28 Dec 2023 11:51:58 +0100
Subject: [PATCH 0280/1461] fetches profil update request if an entry with uid
 in table public.tbl_cis_profil_update exists

---
 application/controllers/Cis/Profil.php        | 28 ++++++++-
 public/js/apps/Cis/Profil.js                  |  1 +
 public/js/apps/api/userdata.js                | 25 +++-----
 .../Cis/Profil/MitarbeiterProfil.js           | 59 +++++++++----------
 .../Cis/Profil/MitarbeiterViewProfil.js       |  2 +-
 5 files changed, 63 insertions(+), 52 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index a2de9497e..d46217fea 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -21,6 +21,7 @@ class Profil extends Auth_Controller
 			'foto_sperre_function' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'getView' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'editProfil' => ['student/anrechnung_beantragen:r', 'user:r'],
+			
 
 		]);
 		$this->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
@@ -90,6 +91,7 @@ class Profil extends Auth_Controller
 	}
 
 
+
 	private function viewMitarbeiterProfil($uid)
 	{
 
@@ -179,6 +181,7 @@ class Profil extends Auth_Controller
 			}
 		}
 
+		
 
 		$res = new stdClass();
 		$res->username = $uid;
@@ -482,6 +485,15 @@ class Profil extends Auth_Controller
 			}
 		}
 
+
+		//? querying if the user already has a pending profil information update request
+		$editData_res = $this->ProfilChangeModel->load([$this->uid]);
+		if(isError($editData_res)){
+			//error handling
+		}else{
+			$editData_res = hasData($editData_res) ? getData($editData_res)[0] : null;
+		}
+
 		$res = new stdClass();
 		$res->foto = $person_res->foto;
 		$res->foto_sperre = $person_res->foto_sperre;
@@ -520,6 +532,10 @@ class Profil extends Auth_Controller
 
 		//telefon nummer von dem Standort
 		$res->standort_telefon = $telefon_res;
+
+		$res->editData = json_decode($editData_res->profil_changes);
+		$res->editDataTimestamp = $editData_res->change_timestamp;
+
 		return $res;
 	}
 
@@ -672,6 +688,15 @@ class Profil extends Auth_Controller
 			}
 		}
 
+		//? querying if the user already has a pending profil information update request
+		$editData_res = $this->ProfilChangeModel->load([$this->uid]);
+		if(isError($editData_res)){
+			//error handling
+		}else{
+			$editData_res = hasData($editData_res) ? getData($editData_res)[0] : null;
+		}
+
+
 		$res = new stdClass();
 
 
@@ -708,7 +733,8 @@ class Profil extends Auth_Controller
 
 
 		$res->mailverteiler = $mailverteiler_res;
-
+		$res->editData = json_decode($editData_res->profil_changes);
+		$res->editDataTimestamp = $editData_res->change_timestamp;
 		return $res;
 
 
diff --git a/public/js/apps/Cis/Profil.js b/public/js/apps/Cis/Profil.js
index 2547f9e48..2969d62f2 100644
--- a/public/js/apps/Cis/Profil.js
+++ b/public/js/apps/Cis/Profil.js
@@ -111,6 +111,7 @@ const app = Vue.createApp({
 			this.view = res.data?.view;
 			this.data = res.data?.data;
 			
+			
 		});
 	},
 	template:`
diff --git a/public/js/apps/api/userdata.js b/public/js/apps/api/userdata.js
index d671cbd66..8e7ea9b47 100644
--- a/public/js/apps/api/userdata.js
+++ b/public/js/apps/api/userdata.js
@@ -5,6 +5,12 @@ export default {
                    `/Cis/Profil/editProfil`;
         return axios.post(url,payload);
     },
+
+    getEditProfil: function() {
+        const url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router+
+                   `/Cis/Profil/getEditProfil`;
+        return axios.get(url);
+    },
     
     isMitarbeiterOrStudent: function(uid) {
         const url = FHC_JS_DATA_STORAGE_OBJECT.app_root 
@@ -25,24 +31,7 @@ export default {
     },
 
     
-    indexProfilInformaion: function(uid, view=false) {
-        const url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router+
-                   `/Cis/Profil/indexProfilInformaion/${uid}/${view}`;
-        
-        return axios.get(url);
-    },
-    mitarbeiterProfil: function() {
-        const url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router+
-                   `/Cis/Profil/mitarbeiterProfil/`;
-        
-        return axios.get(url);
-    },
-    studentProfil: function(uid, view=false) {
-        const url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router+
-                   `/Cis/Profil/studentProfil/${uid}/${view}`;
-        
-        return axios.get(url);
-    },
+   
 
 
     
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index ad1fe4a9d..5630fa8ee 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -11,8 +11,7 @@ export default {
   data() {
     return {
      
-      //? this reactive object contains all the field the user is able to edit and keep track of which fields he has edited
-      editData:null,
+      
       funktionen_table_options: {
         height: 300,
         layout: "fitColumns",
@@ -150,7 +149,7 @@ export default {
     submitProfilChange(){
       if(this.isEditDataChanged){
         //? inserts new row in public.tbl_cis_profil_update 
-        Vue.$fhcapi.UserData.editProfil(this.editData);
+        Vue.$fhcapi.UserData.editProfil(this.data.editData);
      
       }
     },
@@ -182,7 +181,7 @@ export default {
 
     
     isEditDataChanged: function(){
-      return JSON.stringify(this.editData) != this.originalEditData;
+      return JSON.stringify(this.data.editData) != this.originalEditData;
     },
 
     get_mitarbeiter_standort_telefon(){
@@ -266,23 +265,22 @@ export default {
  
   created() {
     
+    if(this.data.editData){
+      this.originalEditData = JSON.stringify(this.data.editData);
+    }else{
+      //? storing an original version of the editData to check if the editData was changed by the user and is not in the original state
+      this.originalEditData = JSON.stringify(
+        {
+          Personen_Informationen : {...this.personData, vorname: this.data.vorname, nachname: this.data.nachname},
+          Mitarbeiter_Informatinen: this.specialData,
+          Emails:this.data.emails,
+          Private_Kontakte: this.data.kontakte,
+          Private_Adressen:this.privateAdressen,
+        });
 
-    
-    
-    //? storing an original version of the editData to check if the editData was changed by the user and is not in the original state
-    this.originalEditData = JSON.stringify(
-      {
-        Personen_Informationen : {...this.personData, vorname: this.data.vorname, nachname: this.data.nachname},
-        Mitarbeiter_Informatinen: this.specialData,
-        Emails:this.data.emails,
-        Private_Kontakte: this.data.kontakte,
-        Private_Adressen:this.privateAdressen,
-      });
+      this.data.editData = JSON.parse(this.originalEditData);
 
-    this.editData = JSON.parse(this.originalEditData);
-
-
-   
+    }
   },
   mounted() {
     
@@ -295,14 +293,11 @@ export default {
     });
    
     
-    
-
-   
   },
 
   template: ` 
 
-  <div  class="row"><div class="col"><pre>{{JSON.stringify(editData,null,2)}}</pre></div><div class="col"><pre>{{JSON.stringify(data.emails,null,2)}}</pre></div></div>
+  <div  class="row"><div class="col"><pre>{{JSON.stringify(data.editData,null,2)}}</pre></div><div class="col"><pre>{{JSON.stringify(data.emails,null,2)}}</pre></div></div>
 
   <div class="container-fluid text-break fhc-form"  >
     <!-- ROW --> 
@@ -522,7 +517,7 @@ export default {
 
 
                                 <div class="accordion accordion-flush" id="accordionFlushExample" >
-                                  <div class="accordion-item" v-for="(value,key) in editData ">
+                                  <div class="accordion-item" v-for="(value,key) in data.editData ">
                                     <h2 class="accordion-header" :id="'flush-headingOne'+key">
                                       <button style="font-weight:500" class="accordion-button collapsed" type="button" data-bs-toggle="collapse" :data-bs-target="'#flush-collapseOne'+key" aria-expanded="false" :aria-controls="'flush-collapseOne'+key">
                                         {{key.replace("_"," ")}}
@@ -534,18 +529,18 @@ export default {
                                      
                                       <div v-if="Array.isArray(value)" class="row gy-5">
                                       
-                                        <template  v-for="(objects,objectkey) in value"  >
+                                        <template  v-for="(object,objectkey) in value"  >
                                         <div class="col-12 ">
                                           <div class="row gy-3">
-                                          <div v-for="(data,title) in objects" class="col-12" >
+                                          <div v-for="(propertyValue,propertyKey) in object" class="col-12" >
                                           
                                           <div  class="form-underline ">
                                           <div class="form-underline-titel">
-                                          <label :for="title+'input'" >{{title}}</label>
+                                          <label :for="propertyKey+'input'" >{{propertyKey}}</label>
                                           </div>
                                           <div>
                                             
-                                            <input  class="form-control" :id="title+'input'" v-model="editData[key][objectkey][title]" :placeholder="data">
+                                            <input  class="form-control" :id="propertyKey+'input'" v-model="data.editData[key][objectkey][propertyKey]" :placeholder="propertyValue">
                                           </div>
                                           </div>
 
@@ -553,22 +548,22 @@ export default {
                                           </div>
 
                                           </div>
-                                          <hr class="mb-0" v-if="value[value.length-1] != objects">
+                                          <hr class="mb-0" v-if="value[value.length-1] != object">
                                         </template>
                                         
 
                                       
                                       </div>
                                       <div v-else class="row gy-3">
-                                      <div  v-for="(data,title) in value" class="col-12">
+                                      <div  v-for="(propertyValue,propertyKey) in value" class="col-12">
                                     
                                       <div  class="form-underline ">
                                       <div class="form-underline-titel">
-                                      <label :for="title+'input'" >{{title}}</label>
+                                      <label :for="propertyKey+'input'" >{{propertyKey}}</label>
                                       </div>
                                       <div>
                                         
-                                        <input type="email" class="form-control" :id="title+'input'" v-model="editData[key][title]" :placeholder="data">
+                                        <input type="email" class="form-control" :id="propertyKey+'input'" v-model="data.editData[key][propertyKey]" :placeholder="propertyValue">
                                       </div>
                                       </div>
                                       </div>
diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
index de5b33624..2a13b4b03 100644
--- a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
@@ -1,4 +1,4 @@
-import fhcapifactory from "../../../apps/api/fhcapifactory.js";
+
 import { CoreFilterCmpt } from "../../../components/filter/Filter.js";
 
 export default {

From a27b80c39448e71e2e5f43b4ea34e78770de1347 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Fri, 29 Dec 2023 10:17:33 +0100
Subject: [PATCH 0281/1461] show the date of the last edit profil information
 request if there is any

---
 application/controllers/Cis/Profil.php        |  8 ++++----
 public/js/apps/Cis/Profil.js                  | 10 ++++++++--
 .../Cis/Profil/MitarbeiterProfil.js           | 19 +++++++++++++++++--
 3 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index d46217fea..58b5e2280 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -533,8 +533,8 @@ class Profil extends Auth_Controller
 		//telefon nummer von dem Standort
 		$res->standort_telefon = $telefon_res;
 
-		$res->editData = json_decode($editData_res->profil_changes);
-		$res->editDataTimestamp = $editData_res->change_timestamp;
+		$res->editData = $editData_res? json_decode($editData_res->profil_changes): null;
+		$res->editDataTimestamp = $editData_res? $editData_res->change_timestamp: null;
 
 		return $res;
 	}
@@ -733,8 +733,8 @@ class Profil extends Auth_Controller
 
 
 		$res->mailverteiler = $mailverteiler_res;
-		$res->editData = json_decode($editData_res->profil_changes);
-		$res->editDataTimestamp = $editData_res->change_timestamp;
+		$res->editData = $editData_res? json_decode($editData_res->profil_changes): null;
+		$res->editDataTimestamp = $editData_res? $editData_res->change_timestamp: null;
 		return $res;
 
 
diff --git a/public/js/apps/Cis/Profil.js b/public/js/apps/Cis/Profil.js
index 2969d62f2..4014d8e6e 100644
--- a/public/js/apps/Cis/Profil.js
+++ b/public/js/apps/Cis/Profil.js
@@ -107,9 +107,15 @@ const app = Vue.createApp({
 		Vue.$fhcapi.UserData.getView(uid).then((res)=>{
 			if(!res.data){
 				this.notFoundUID=uid;
+			}else{
+				this.view = res.data?.view;
+
+				this.data = res.data?.data;
+			
+				if(this.data.editDataTimestamp){
+					this.data.editDataTimestamp= new Date(this.data.editDataTimestamp);
+				}
 			}
-			this.view = res.data?.view;
-			this.data = res.data?.data;
 			
 			
 		});
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 5630fa8ee..0be210761 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -3,6 +3,7 @@ import { CoreFilterCmpt } from "../../../components/filter/Filter.js";
 import BsModal from "../../Bootstrap/Modal.js";
 
 
+
 export default {
   components: {
     CoreFilterCmpt,
@@ -165,6 +166,15 @@ export default {
   },
 
   computed: {
+
+    editDataTimestampFormated: function(){
+      return [
+        this.data.editDataTimestamp.getDate().toString().padStart(2,'0'),
+        (this.data.editDataTimestamp.getMonth()+1).toString().padStart(2,'0'),
+        this.data.editDataTimestamp.getFullYear(),
+      ].join('/');
+    },
+
     //? legacy mailto link to create an email with information that should be changed
     refreshMailTo() {
       return `mailto:info.mio@technikum-wien.at?subject=Datenkorrektur&body=Die%20Profildaten%20für%20User%20'${this.data.username}'%20sind%20nicht%20korrekt.%0DHier, die richtigen Daten:%0A%0ANachname:%20${this.data.nachname}%0AVorname:%20${this.data.vorname}%0AGeburtsdatum:${this.data.gebdatum}%0AGeburtsort:%20${this.data.gebort}%0ATitelPre:${this.data.titel}%20%0ATitelPost:${this.data.postnomen}%20%0A%0A***%0DPlatz für weitere (nicht angeführte Daten)%0D***%0A%0A[Bitte%20übermitteln%20Sie%20uns%20etwaige%20Dokumente%20zum%20Beleg%20der%20Änderung]`;
@@ -291,6 +301,9 @@ export default {
     this.$refs.funktionenTable.tabulator.on("tableBuilt", () => {
       this.$refs.funktionenTable.tabulator.setData(this.data.funktionen);
     });
+
+    
+    
    
     
   },
@@ -587,8 +600,10 @@ export default {
 
                                 </template>
                                 <!-- optional footer -->
-                                <template v-if="isEditDataChanged" v-slot:footer>
-                                  <button @click="submitProfilChange" role="button" class="btn btn-primary">submit</button>
+                                <template  v-slot:footer>
+                                  <p v-if="data.editDataTimestamp" class="flex-fill">Letzte Anfrage: {{editDataTimestampFormated}}</p>
+                                 
+                                  <button v-if="isEditDataChanged" @click="submitProfilChange" role="button" class="btn btn-primary">submit</button>
                                 </template>
                                 <!-- end of optional footer -->
                                 </bs-modal>

From bb0656c480cb95763ca2f2aa1203da919b7bd1a2 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Fri, 29 Dec 2023 12:01:25 +0100
Subject: [PATCH 0282/1461] http response returns the timestamp of the change

---
 application/controllers/Cis/Profil.php        | 15 ++++++-
 .../models/person/Profil_change_model.php     | 20 +++------
 public/js/apps/Cis/Profil.js                  | 10 ++++-
 public/js/components/Bootstrap/Confirm.js     |  2 +-
 .../Cis/Profil/MitarbeiterProfil.js           | 45 ++++++++++++-------
 5 files changed, 58 insertions(+), 34 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index 58b5e2280..323d6c3ea 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -80,9 +80,22 @@ class Profil extends Auth_Controller
 
 		if (empty($res)) {
 			$insert_res = $this->ProfilChangeModel->insert($data);
-			echo json_encode($insert_res);
+			if(isError($insert_res)){
+				//catch error
+			}else{
+				//? status code 201 CREATED
+				$insert_res->code = 201;
+				$insert_res->retval = $this->ProfilChangeModel->getTimestamp($this->uid)->change_timestamp;
+				echo json_encode($insert_res);
+			}
+			
 		} else {
 			$update_res = $this->ProfilChangeModel->update([$this->uid], $data);
+			if(isError($update_res)){
+				//catch error
+			}
+			//? status code 200 OK
+			$update_res->code = 200;
 			echo json_encode($update_res);
 		}
 
diff --git a/application/models/person/Profil_change_model.php b/application/models/person/Profil_change_model.php
index eea42a5d0..946fe6d84 100644
--- a/application/models/person/Profil_change_model.php
+++ b/application/models/person/Profil_change_model.php
@@ -19,20 +19,10 @@ class Profil_change_model extends DB_Model
 	/**
 	 * getLastStatuses
 	 */
-	public function getData($uid){
-       
-        $res = $this->load($uid);
-        $res = hasData($res) ? getData($res)[0] : null;
-
-        return $res;
-    }
-
-    public function insertData($data){
-       
-        $res =  $this->insert($data);
-        //$res = hasData($res) ? getData($res)[0] : null;
-
-        return $res;
-    }
+	public function getTimestamp($uid){
+		$this->addSelect(['change_timestamp']);
+		$res = $this->load([$uid]);
+		return hasData($res) ? getData($res)[0] : null;
+	}
 
 }
diff --git a/public/js/apps/Cis/Profil.js b/public/js/apps/Cis/Profil.js
index 4014d8e6e..c4d8aee3d 100644
--- a/public/js/apps/Cis/Profil.js
+++ b/public/js/apps/Cis/Profil.js
@@ -95,7 +95,15 @@ const app = Vue.createApp({
 				col.click();
 			  });
 		  }
-		}
+		},
+
+		getFormatedDate: function(date){
+			return [
+			  date.getDate().toString().padStart(2,'0'),
+			  (date.getMonth()+1).toString().padStart(2,'0'),
+			  date.getFullYear(),
+			].join('/');
+		  },
         
 	},
 	created(){
diff --git a/public/js/components/Bootstrap/Confirm.js b/public/js/components/Bootstrap/Confirm.js
index 1c609d457..7a6f74b15 100644
--- a/public/js/components/Bootstrap/Confirm.js
+++ b/public/js/components/Bootstrap/Confirm.js
@@ -1,4 +1,4 @@
-import BsAlert from './Alert';
+import BsAlert from './Alert.js';
 
 export default {
 	mixins: [
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 0be210761..1234eeeff 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -1,6 +1,7 @@
 import fhcapifactory from "../../../apps/api/fhcapifactory.js";
 import { CoreFilterCmpt } from "../../../components/filter/Filter.js";
 import BsModal from "../../Bootstrap/Modal.js";
+import Alert from "../../Bootstrap/Alert.js";
 
 
 
@@ -8,6 +9,7 @@ export default {
   components: {
     CoreFilterCmpt,
     BsModal,
+    Alert,
   },
   data() {
     return {
@@ -142,7 +144,6 @@ export default {
     },
 
     hideModal() {
-      // You can call the hide method of the modal component if needed
       this.$refs.bsmodal.hide();
     },
 
@@ -150,7 +151,22 @@ export default {
     submitProfilChange(){
       if(this.isEditDataChanged){
         //? inserts new row in public.tbl_cis_profil_update 
-        Vue.$fhcapi.UserData.editProfil(this.data.editData);
+        Vue.$fhcapi.UserData.editProfil(this.data.editData).then((res)=>{
+          this.hideModal(); 
+          if(res.data.error == 0){
+
+            //? sets the requested changes as the current data state, so that computed property isEditDataChanged works properly
+            this.originalEditData = JSON.stringify(this.data.editData);
+            console.log(this.originalEditData != JSON.stringify(this.data.editData));
+
+            //* sets the returned timestamp from the response
+            this.data.editDataTimestamp = res.data.retval? new Date(res.data.retval) : null;
+            Alert.popup("Ihre Anfrage wurde erfolgreich gesendet. Bitte warten Sie, während sich das Team um Ihre Anfrage kümmert.");
+          }else{
+            Alert.popup("Ein Fehler ist aufgetreten: "+ res.data.retval);
+          }
+          //
+        });
      
       }
     },
@@ -167,13 +183,7 @@ export default {
 
   computed: {
 
-    editDataTimestampFormated: function(){
-      return [
-        this.data.editDataTimestamp.getDate().toString().padStart(2,'0'),
-        (this.data.editDataTimestamp.getMonth()+1).toString().padStart(2,'0'),
-        this.data.editDataTimestamp.getFullYear(),
-      ].join('/');
-    },
+    
 
     //? legacy mailto link to create an email with information that should be changed
     refreshMailTo() {
@@ -190,8 +200,8 @@ export default {
     },
 
     
-    isEditDataChanged: function(){
-      return JSON.stringify(this.data.editData) != this.originalEditData;
+    isEditDataChanged(){
+      return this.originalEditData != JSON.stringify(this.data.editData)
     },
 
     get_mitarbeiter_standort_telefon(){
@@ -275,6 +285,9 @@ export default {
  
   created() {
     
+    
+    
+
     if(this.data.editData){
       this.originalEditData = JSON.stringify(this.data.editData);
     }else{
@@ -310,8 +323,8 @@ export default {
 
   template: ` 
 
-  <div  class="row"><div class="col"><pre>{{JSON.stringify(data.editData,null,2)}}</pre></div><div class="col"><pre>{{JSON.stringify(data.emails,null,2)}}</pre></div></div>
-
+  <div  class="row"><div class="col"><pre>{{JSON.stringify(JSON.parse(originalEditData),null,2)}}</pre></div><div class="col"><pre>{{JSON.stringify(data.editData,null,2)}}</pre></div></div>
+  <p>{{isEditDataChanged}}</p>
   <div class="container-fluid text-break fhc-form"  >
     <!-- ROW --> 
           <div class="row">
@@ -600,10 +613,10 @@ export default {
 
                                 </template>
                                 <!-- optional footer -->
-                                <template  v-slot:footer>
-                                  <p v-if="data.editDataTimestamp" class="flex-fill">Letzte Anfrage: {{editDataTimestampFormated}}</p>
+                                <template v-if="data.editDataTimestamp || isEditDataChanged"  v-slot:footer>
+                                  <p v-if="data.editDataTimestamp" class="flex-fill">Letzte Anfrage: {{$parent.getFormatedDate(data.editDataTimestamp)}}</p>
                                  
-                                  <button v-if="isEditDataChanged" @click="submitProfilChange" role="button" class="btn btn-primary">submit</button>
+                                  <button v-if="isEditDataChanged" @click="submitProfilChange" role="button" class="btn btn-primary">Senden</button>
                                 </template>
                                 <!-- end of optional footer -->
                                 </bs-modal>

From ddab42123b142f1f5b527b8ba58fde25fc6424e7 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Tue, 2 Jan 2024 12:50:04 +0100
Subject: [PATCH 0283/1461] refactores the modal out of the view into its own
 modal component

---
 application/controllers/Cis/Profil.php        |   1 +
 public/js/apps/Cis/Profil.js                  |   8 +-
 public/js/components/Cis/Profil/EditProfil.js | 197 ++++++++++++++++++
 .../Cis/Profil/MitarbeiterProfil.js           | 191 ++++-------------
 .../components/Cis/Profil/ProfilEditModal.js  |  61 ------
 5 files changed, 234 insertions(+), 224 deletions(-)
 create mode 100644 public/js/components/Cis/Profil/EditProfil.js
 delete mode 100644 public/js/components/Cis/Profil/ProfilEditModal.js

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index 323d6c3ea..687f2becc 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -96,6 +96,7 @@ class Profil extends Auth_Controller
 			}
 			//? status code 200 OK
 			$update_res->code = 200;
+			$update_res->retval = $this->ProfilChangeModel->getTimestamp($this->uid)->change_timestamp;
 			echo json_encode($update_res);
 		}
 
diff --git a/public/js/apps/Cis/Profil.js b/public/js/apps/Cis/Profil.js
index c4d8aee3d..ba4443b69 100644
--- a/public/js/apps/Cis/Profil.js
+++ b/public/js/apps/Cis/Profil.js
@@ -97,13 +97,7 @@ const app = Vue.createApp({
 		  }
 		},
 
-		getFormatedDate: function(date){
-			return [
-			  date.getDate().toString().padStart(2,'0'),
-			  (date.getMonth()+1).toString().padStart(2,'0'),
-			  date.getFullYear(),
-			].join('/');
-		  },
+		
         
 	},
 	created(){
diff --git a/public/js/components/Cis/Profil/EditProfil.js b/public/js/components/Cis/Profil/EditProfil.js
new file mode 100644
index 000000000..84997caea
--- /dev/null
+++ b/public/js/components/Cis/Profil/EditProfil.js
@@ -0,0 +1,197 @@
+import BsModal from "../../Bootstrap/Modal.js";
+import Alert from "../../Bootstrap/Alert.js";
+const infos = {};
+
+export default {
+  components: {
+    BsModal,
+    Alert,
+  },
+  mixins: [BsModal],
+  props: {
+
+    value: Object,
+    
+    timestamp: Object,
+    /*
+     * NOTE(chris):
+     * Hack to expose in "emits" declared events to $props which we use
+     * in the v-bind directive to forward all events.
+     * @see: https://github.com/vuejs/core/issues/3432
+     */
+    onHideBsModal: Function,
+    onHiddenBsModal: Function,
+    onHidePreventedBsModal: Function,
+    onShowBsModal: Function,
+    onShownBsModal: Function,
+  },
+  data() {
+    return {
+    editData: this.value,
+    editTimestamp: this.timestamp,
+    result: true,
+    info: null,
+  }
+ 
+  },
+  methods: {
+    test(){
+      console.log("test");
+    },
+    submitProfilChange(){
+      
+       if(this.isEditDataChanged){
+        //? inserts new row in public.tbl_cis_profil_update 
+        Vue.$fhcapi.UserData.editProfil(this.editData).then((res)=>{
+          this.result = {
+            editData: this.editData,
+            timestamp: res.data.retval,
+          };
+          this.hide(); 
+          
+           if(res.data.error == 0){
+           
+            Alert.popup("Ihre Anfrage wurde erfolgreich gesendet. Bitte warten Sie, während sich das Team um Ihre Anfrage kümmert.");
+          }else{
+            Alert.popup("Ein Fehler ist aufgetreten: "+ JSON.stringify(res.data.retval));
+          } 
+          //
+        });
+     
+      } 
+    },
+  },
+  computed: {
+    getFormatedDate: function(){
+			return [
+			  this.editTimestamp.getDate().toString().padStart(2,'0'),
+			  (this.editTimestamp.getMonth()+1).toString().padStart(2,'0'),
+			  this.editTimestamp.getFullYear(),
+			].join('/');
+		  },
+      isEditDataChanged(){
+        return this.originalEditData != JSON.stringify(this.editData)
+      },
+  },
+  created() {
+
+    this.originalEditData = JSON.stringify(this.editData);
+    
+    /* 
+    if (infos[this.lehrveranstaltung_id]) {
+      this.info = infos[this.lehrveranstaltung_id];
+    } else {
+      axios
+        .get(
+          FHC_JS_DATA_STORAGE_OBJECT.app_root +
+          FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+          "/components/Cis/Mylv/Info/" +
+          this.studien_semester +
+          "/" +
+          this.lehrveranstaltung_id
+        )
+        .then((res) => {
+          this.info = infos[this.lehrveranstaltung_id] = res.data.retval || [];
+        })
+        .catch(() => (this.info = {}));
+    } */
+  },
+  mounted() {
+    this.modal = this.$refs.modalContainer.modal;
+  },
+  popup(options) {
+    return BsModal.popup.bind(this)(null, options);
+  },
+  template: `
+  
+  <bs-modal ref="modalContainer" v-bind="$props" body-class="" dialog-class="modal-lg" class="bootstrap-alert" backdrop="false" >
+    <template v-slot:title>
+      {{"Profil bearbeiten" }}
+    </template>
+    <template v-slot:default>
+    
+    <!-- START OF THE ACCORDION 
+<pre>{{JSON.stringify(data)}}</pre>
+<pre>{{JSON.stringify(result)}}</pre>-->
+  
+
+
+    <div class="accordion accordion-flush" id="accordionFlushExample" >
+      <div class="accordion-item" v-for="(value,key) in editData ">
+        <h2 class="accordion-header" :id="'flush-headingOne'+key">
+          <button style="font-weight:500" class="accordion-button collapsed" type="button" data-bs-toggle="collapse" :data-bs-target="'#flush-collapseOne'+key" aria-expanded="false" :aria-controls="'flush-collapseOne'+key">
+            {{key.replace("_"," ")}}
+          </button>
+        </h2>
+        <!-- SHOWING ALL MAILS IN THE FIRST PART OF THE ACCORDION -->
+        <div :id="'flush-collapseOne'+key" class="accordion-collapse collapse" aria-labelledby="flush-headingOne" data-bs-parent="#accordionFlushExample">
+          <div class="accordion-body">
+        
+          <div v-if="Array.isArray(value)" class="row gy-5">
+          
+            <template  v-for="(object,objectkey) in value"  >
+            <div class="col-12 ">
+              <div class="row gy-3">
+              <div v-for="(propertyValue,propertyKey) in object" class="col-12" >
+              
+              <div  class="form-underline ">
+              <div class="form-underline-titel">
+              <label :for="propertyKey+'input'" >{{propertyKey}}</label>
+              </div>
+              <div>
+                
+                <input  class="form-control" :id="propertyKey+'input'" v-model="editData[key][objectkey][propertyKey]" :placeholder="propertyValue">
+              </div>
+              </div>
+
+              </div>
+              </div>
+
+              </div>
+              <hr class="mb-0" v-if="value[value.length-1] != object">
+            </template>
+            
+
+          
+          </div>
+          <div v-else class="row gy-3">
+          <div  v-for="(propertyValue,propertyKey) in value" class="col-12">
+        
+          <div  class="form-underline ">
+          <div class="form-underline-titel">
+          <label :for="propertyKey+'input'" >{{propertyKey}}</label>
+          </div>
+          <div>
+            
+            <input type="email" class="form-control" :id="propertyKey+'input'" v-model="editData[key][propertyKey]" :placeholder="propertyValue">
+          </div>
+          </div>
+          </div>
+          </div>
+
+          
+          
+          
+          
+
+          </div>
+        </div>
+      </div>
+
+      <!-- -->
+
+     
+
+
+    <!-- END OF THE ACCORDION -->
+
+    </template>
+    <!-- optional footer -->
+    <template v-if="editTimestamp || isEditDataChanged"  v-slot:footer>
+      <p v-if="editTimestamp" class="flex-fill">Letzte Anfrage: {{getFormatedDate}}</p>
+    
+      <button v-if="isEditDataChanged" @click="submitProfilChange" role="button" class="btn btn-primary">Senden</button>
+    </template>
+    <!-- end of optional footer --> 
+  </bs-modal>`,
+};
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 1234eeeff..1bad5f177 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -1,15 +1,14 @@
-import fhcapifactory from "../../../apps/api/fhcapifactory.js";
+
 import { CoreFilterCmpt } from "../../../components/filter/Filter.js";
-import BsModal from "../../Bootstrap/Modal.js";
-import Alert from "../../Bootstrap/Alert.js";
+import EditProfil from "./EditProfil.js"
+
 
 
 
 export default {
   components: {
     CoreFilterCmpt,
-    BsModal,
-    Alert,
+    EditProfil,
   },
   data() {
     return {
@@ -124,57 +123,36 @@ export default {
   props: {
 		data: Object,
 		
-		/*
-		 * NOTE(chris): 
-		 * Hack to expose in "emits" declared events to $props which we use 
-		 * in the v-bind directive to forward all events.
-		 * @see: https://github.com/vuejs/core/issues/3432
-		
-		onHideBsModal: Function,
-		onHiddenBsModal: Function,
-		onHidePreventedBsModal: Function,
-		onShowBsModal: Function,
-		onShownBsModal: Function
-    */
+	
 	},
   
   methods: {
     showModal() {
-      this.$refs.bsmodal.show()
-    },
-
-    hideModal() {
-      this.$refs.bsmodal.hide();
-    },
-
-
-    submitProfilChange(){
-      if(this.isEditDataChanged){
-        //? inserts new row in public.tbl_cis_profil_update 
-        Vue.$fhcapi.UserData.editProfil(this.data.editData).then((res)=>{
-          this.hideModal(); 
-          if(res.data.error == 0){
-
-            //? sets the requested changes as the current data state, so that computed property isEditDataChanged works properly
-            this.originalEditData = JSON.stringify(this.data.editData);
-            console.log(this.originalEditData != JSON.stringify(this.data.editData));
-
-            //* sets the returned timestamp from the response
-            this.data.editDataTimestamp = res.data.retval? new Date(res.data.retval) : null;
-            Alert.popup("Ihre Anfrage wurde erfolgreich gesendet. Bitte warten Sie, während sich das Team um Ihre Anfrage kümmert.");
-          }else{
-            Alert.popup("Ein Fehler ist aufgetreten: "+ res.data.retval);
+      
+      EditProfil.popup({ 
+          value:JSON.parse(JSON.stringify(this.data.editData)),
+          timestamp:this.data.editDataTimestamp
+        }).then((res) => {
+          if(res.timestamp && res.editData){
+            this.data.editDataTimestamp = new Date(res.timestamp);
+            this.data.editData = res.editData;
           }
-          //
+          
+        }).catch((e) => {
+          console.log(e);
+         
         });
      
-      }
+    
     },
+
+
+  
     sperre_foto_function() {
       if (!this.data) {
         return;
       }
-      fhcapifactory.UserData.sperre_foto_function(!this.data.foto_sperre).then((res) => {
+      Vue.$fhcapi.UserData.sperre_foto_function(!this.data.foto_sperre).then((res) => {
         this.data.foto_sperre = res.data.foto_sperre;
       });
     },
@@ -200,9 +178,7 @@ export default {
     },
 
     
-    isEditDataChanged(){
-      return this.originalEditData != JSON.stringify(this.data.editData)
-    },
+
 
     get_mitarbeiter_standort_telefon(){
       if(this.data.standort_telefon){
@@ -288,20 +264,16 @@ export default {
     
     
 
-    if(this.data.editData){
-      this.originalEditData = JSON.stringify(this.data.editData);
-    }else{
-      //? storing an original version of the editData to check if the editData was changed by the user and is not in the original state
-      this.originalEditData = JSON.stringify(
-        {
-          Personen_Informationen : {...this.personData, vorname: this.data.vorname, nachname: this.data.nachname},
-          Mitarbeiter_Informatinen: this.specialData,
-          Emails:this.data.emails,
-          Private_Kontakte: this.data.kontakte,
-          Private_Adressen:this.privateAdressen,
-        });
+    if(!this.data.editData){
+    
 
-      this.data.editData = JSON.parse(this.originalEditData);
+      this.data.editData = {
+        Personen_Informationen : {...this.personData, vorname: this.data.vorname, nachname: this.data.nachname},
+        Mitarbeiter_Informatinen: this.specialData,
+        Emails:this.data.emails,
+        Private_Kontakte: this.data.kontakte,
+        Private_Adressen:this.privateAdressen,
+      };
 
     }
   },
@@ -323,8 +295,6 @@ export default {
 
   template: ` 
 
-  <div  class="row"><div class="col"><pre>{{JSON.stringify(JSON.parse(originalEditData),null,2)}}</pre></div><div class="col"><pre>{{JSON.stringify(data.editData,null,2)}}</pre></div></div>
-  <p>{{isEditDataChanged}}</p>
   <div class="container-fluid text-break fhc-form"  >
     <!-- ROW --> 
           <div class="row">
@@ -531,95 +501,7 @@ export default {
                                 </div>
                               </button>
 
-                             <bs-modal ref="bsmodal" backdrop="false" >
-                                <template v-slot:title>
-                                  {{"Profil bearbeiten" }}
-                                </template>
-                                <template v-slot:default>
-                                
-                                <!-- START OF THE ACCORDION -->
-
-                               
-
-
-                                <div class="accordion accordion-flush" id="accordionFlushExample" >
-                                  <div class="accordion-item" v-for="(value,key) in data.editData ">
-                                    <h2 class="accordion-header" :id="'flush-headingOne'+key">
-                                      <button style="font-weight:500" class="accordion-button collapsed" type="button" data-bs-toggle="collapse" :data-bs-target="'#flush-collapseOne'+key" aria-expanded="false" :aria-controls="'flush-collapseOne'+key">
-                                        {{key.replace("_"," ")}}
-                                      </button>
-                                    </h2>
-                                    <!-- SHOWING ALL MAILS IN THE FIRST PART OF THE ACCORDION -->
-                                    <div :id="'flush-collapseOne'+key" class="accordion-collapse collapse" aria-labelledby="flush-headingOne" data-bs-parent="#accordionFlushExample">
-                                      <div class="accordion-body">
-                                     
-                                      <div v-if="Array.isArray(value)" class="row gy-5">
-                                      
-                                        <template  v-for="(object,objectkey) in value"  >
-                                        <div class="col-12 ">
-                                          <div class="row gy-3">
-                                          <div v-for="(propertyValue,propertyKey) in object" class="col-12" >
-                                          
-                                          <div  class="form-underline ">
-                                          <div class="form-underline-titel">
-                                          <label :for="propertyKey+'input'" >{{propertyKey}}</label>
-                                          </div>
-                                          <div>
-                                            
-                                            <input  class="form-control" :id="propertyKey+'input'" v-model="data.editData[key][objectkey][propertyKey]" :placeholder="propertyValue">
-                                          </div>
-                                          </div>
-
-                                          </div>
-                                          </div>
-
-                                          </div>
-                                          <hr class="mb-0" v-if="value[value.length-1] != object">
-                                        </template>
-                                        
-
-                                      
-                                      </div>
-                                      <div v-else class="row gy-3">
-                                      <div  v-for="(propertyValue,propertyKey) in value" class="col-12">
-                                    
-                                      <div  class="form-underline ">
-                                      <div class="form-underline-titel">
-                                      <label :for="propertyKey+'input'" >{{propertyKey}}</label>
-                                      </div>
-                                      <div>
-                                        
-                                        <input type="email" class="form-control" :id="propertyKey+'input'" v-model="data.editData[key][propertyKey]" :placeholder="propertyValue">
-                                      </div>
-                                      </div>
-                                      </div>
-                                      </div>
-
-                                      
-                                      
-                                      
-                                      
-
-                                      </div>
-                                    </div>
-                                  </div>
-
-                                  <!-- -->
-
-                               
-                        
-                        
-                                <!-- END OF THE ACCORDION -->
-
-                                </template>
-                                <!-- optional footer -->
-                                <template v-if="data.editDataTimestamp || isEditDataChanged"  v-slot:footer>
-                                  <p v-if="data.editDataTimestamp" class="flex-fill">Letzte Anfrage: {{$parent.getFormatedDate(data.editDataTimestamp)}}</p>
-                                 
-                                  <button v-if="isEditDataChanged" @click="submitProfilChange" role="button" class="btn btn-primary">Senden</button>
-                                </template>
-                                <!-- end of optional footer -->
-                                </bs-modal>
+                             <!-- simml -->
 
                            
                               
@@ -853,12 +735,9 @@ export default {
 
                 <!-- FIRST TABLE -->
                   <div class="col-12 mb-4" >
-                  <div class="card">
-                  <div class="card-header">Funktionen </div>
-                  <div class="card-body">
+                 
                     <core-filter-cmpt   ref="funktionenTable" :tabulator-options="funktionen_table_options"  tableOnly :sideMenu="false" />
-                    </div>
-                    </div>
+                  
                     </div>
 
                 <!-- SECOND TABLE -->
diff --git a/public/js/components/Cis/Profil/ProfilEditModal.js b/public/js/components/Cis/Profil/ProfilEditModal.js
deleted file mode 100644
index 4813e2d3b..000000000
--- a/public/js/components/Cis/Profil/ProfilEditModal.js
+++ /dev/null
@@ -1,61 +0,0 @@
-
-export default {
-  
-    data() {
-      return {
-        
-       
-      };
-    },
-  
-    
-    props: ["editData"],
-    methods: {
-      
-    },
-  
-    computed: {
-    
-  
-  
-    
-    },
-  
-    mounted() {
-     console.log(this.editData);
-  
-     
-    },
-  
-    template: ` 
-    <!-- Modal -->
-    <div class="modal fade" id="editProfil" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="editProfilLabel" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <h5 class="modal-title" id="editProfilLabel">Edit Profil</h5>
-            <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-          </div>
-          <div class="modal-body">
-            
-          </div>
-          <div class="modal-footer">
-            <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
-            <button type="button" @click="insertEditData" class="btn btn-primary">Understood</button>
-          </div>
-        </div>
-      </div>
-    </div>
-    
-    
-    
-    <!-- end of trying the modal -->
-              
-      `,
-  };
-  
-
-
-
-
-

From b07d9a9a63967bb09f054edbd69f2a7269959606 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 3 Jan 2024 09:50:06 +0100
Subject: [PATCH 0284/1461] single fileupload

---
 .../controllers/components/stv/Notiz.php      | 74 +++++++++++++++----
 application/models/person/Notiz_model.php     |  9 ++-
 .../models/person/Notizdokument_model.php     | 14 ++++
 public/js/components/Notiz/Notiz.js           | 41 +++++-----
 .../Studentenverwaltung/Details/Notizen.js    | 10 +--
 5 files changed, 110 insertions(+), 38 deletions(-)
 create mode 100644 application/models/person/Notizdokument_model.php

diff --git a/application/controllers/components/stv/Notiz.php b/application/controllers/components/stv/Notiz.php
index 89466f97c..eb0711f9a 100644
--- a/application/controllers/components/stv/Notiz.php
+++ b/application/controllers/components/stv/Notiz.php
@@ -64,24 +64,33 @@ class Notiz extends FHC_Controller
 	{
 /*		var_dump($this->input->post('titel'));
 		var_dump($this->input->post('anhang'));*/
+
 		var_dump($_FILES);
+		var_dump($_FILES["anhang"]["name"]);
 
 		$this->load->library('form_validation');
 		$this->load->library('DmsLib');
+		$dms_id = null;
 
-		$name = $this->input->post('anhang')['name'];
+		$uid = getAuthUID();
+		$dms = array(
+			'kategorie_kurzbz'  => 'notiz',
+			'version'           => 0,
+			'name'              => $_FILES["anhang"]["name"],
+			'mimetype'          => $_FILES["anhang"]["type"],
+			'insertamum'        => date('c'),
+			'insertvon'         => $uid
+		);
 
+		var_dump($dms);
+		$result = $this->dmslib->upload($dms, 'anhang', array('pdf'));
 
-		//$this->DmsLib->add($name, $mimetype, $fileHandle);
-
-
-/*		$this->form_validation->set_rules('titel', 'titel', 'required');
-		$this->form_validation->set_rules('text', 'Text', 'required');
-
-		if ($this->form_validation->run() == false)
+		if (isSuccess($result))
 		{
-			return $this->outputJsonError($this->form_validation->error_array());
-		}*/
+			$dms_id = $result->retval['dms_id'];
+			//var_dump($dms_id);
+		}
+
 
 		$this->load->model('person/Notiz_model', 'NotizModel');
 
@@ -89,11 +98,45 @@ class Notiz extends FHC_Controller
 		$titel = isset($_POST['titel']) ? $_POST['titel'] : null;
 		$text = isset($_POST['text']) ? $_POST['text'] : null;
 		$verfasser_uid = $uid;
-		$start = isset($_POST['von']) ? $_POST['von'] : null;
-		$ende = isset($_POST['bis']) ? $_POST['bis'] : null;
+
+		/*		$start = isset($_POST['bis']) ? ($_POST['bis'] : null;
+		$ende = isset($_POST['bis']) ? $_POST['bis'] : null;*/
+
+
+		if(isset($_POST['von']))
+		{
+/*			$date = $_POST['von'];
+			$date = DateTime::createFromFormat('F-d-Y h:i A',$date);
+			var_dump($date);
+			$timestamp = strtotime($_POST['von']);
+			$start = date('Y-m-d', $timestamp);*/
+
+/*			$dateString = $_POST['von'];
+			$myDateTime = DateTime::createFromFormat('Y-m-d', $dateString);
+			$start= $myDateTime->format('Y-m-d');*/
+
+			//Todo(manu) check input format datepicker.. auch ohne null!!!
+			$start = '2023-01-01';
+		}
+		else
+			$start = null;
+
+
+		if(isset($_POST['bis']))
+		{
+			//Todo(manu) check input format datepicker
+			$ende = strtotime($_POST['bis']);
+			$ende = new DateTime($ende);
+			$ende = $ende->format('Y-m-d');
+		}
+		else
+			$ende = null;
+
+
+
 		$erledigt = $_POST['erledigt'];
 
-		$result = $this->NotizModel->addNotizForPersonWithDoc($person_id, $titel, $text, $erledigt, $verfasser_uid, $start, $ende);
+		$result = $this->NotizModel->addNotizForPersonWithDoc($person_id, $titel, $text, $erledigt, $verfasser_uid, $start, $ende, $dms_id);
 
 	//	var_dump($result);
 
@@ -146,8 +189,8 @@ class Notiz extends FHC_Controller
 		$text = isset($_POST['text']) ? $_POST['text'] : null;
 		$verfasser_uid = isset($_POST['verfasser_uid']) ? $_POST['verfasser_uid'] : null;
 		$bearbeiter_uid = $uid;
-		$start = isset($_POST['von']) ? $_POST['von'] : null;
-		$ende = isset($_POST['bis']) ? $_POST['bis'] : null;
+		$start = isset($_POST['von']) ? new DateTime($_POST['von']) : null;
+		$ende = isset($_POST['bis']) ? new DateTime($_POST['bis']) : null;
 		$erledigt = $_POST['erledigt'];
 
 		$result = $this->NotizModel->update(
@@ -177,6 +220,7 @@ class Notiz extends FHC_Controller
 
 	public function deleteNotiz ($notiz_id)
 	{
+		//Todo(manu) Notizzuordnung und NotizDokument ebenfalls berücksichtigen
 		$this->load->model('person/Notiz_model', 'NotizModel');
 
 		$result = $this->NotizModel->delete(
diff --git a/application/models/person/Notiz_model.php b/application/models/person/Notiz_model.php
index 372fb8485..e343efa60 100644
--- a/application/models/person/Notiz_model.php
+++ b/application/models/person/Notiz_model.php
@@ -137,7 +137,7 @@ class Notiz_model extends DB_Model
 	 * Add a Notiz for a given person
 	 */
 	//TODO(manu) add type for Notizzuordnung
-	public function addNotizForPersonWithDoc($person_id, $titel, $text, $erledigt, $verfasser_uid, $von, $bis)
+	public function addNotizForPersonWithDoc($person_id, $titel, $text, $erledigt, $verfasser_uid, $von, $bis, $dms_id=null)
 	{
 		// Loads model Notizzuordnung_model
 		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
@@ -152,6 +152,13 @@ class Notiz_model extends DB_Model
 		{
 			$notiz_id = $result->retval;
 			$result = $this->NotizzuordnungModel->insert(array('notiz_id' => $notiz_id, 'person_id' => $person_id));
+
+			if($dms_id)
+			{
+				// Loads model Notizdokument_model
+				$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
+				$result = $this->NotizdokumentModel->insert(array('notiz_id' => $notiz_id, 'dms_id' => $dms_id));
+			}
 		}
 
 		// Transaction complete!
diff --git a/application/models/person/Notizdokument_model.php b/application/models/person/Notizdokument_model.php
new file mode 100644
index 000000000..6b141307f
--- /dev/null
+++ b/application/models/person/Notizdokument_model.php
@@ -0,0 +1,14 @@
+<?php
+class Notizdokument_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_notiz_dokument';
+		$this->pk= array('notiz_id' , 'dms_id');
+	}
+}
\ No newline at end of file
diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index 88bffa711..43dd32003 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -98,7 +98,11 @@ export default {
 	},
 	methods: {
 		handleFileChange(event) {
+			//single
 			this.intAnhang = event.target.files[0];
+
+			//multiple
+			//this.intAnhang = event.target.files;
 		},
 	},
 	template: `
@@ -134,23 +138,26 @@ component: {{intTitel}} {{intVon}} || {{intAnhang.name}} {{intAnhang}}
 					<!--<single-file id="file" v-model="intDocument"></single-file>-->
 
 					<div  class="col-sm-7">					
-					<span>
-					  <input type="file" ref="fileInput" @change="handleFileChange" v-model="intAnhang"/>
-<!--      							<button type="submit">Upload</button>-->
-							<div v-if="intAnhang.name">
-							  <p>Selected File: {{ intAnhang.name }}</p>
-							  <button class="text-danger">X</button>
-							</div>
-					</span>
-					<span >					
-						<ul>							
-							<li v-for="anh in anhang">
-								<button>{{anh.name}}</button><button class="text-danger">X</button>
-							</li>
-						</ul>
-					</span>
+						<span>
+						  <input type="file" multiple ref="fileInput" @change="handleFileChange" v-model="intAnhang"/>
+	<!--      							<button type="submit">Upload</button>-->
+								<div v-if="intAnhang.name">
+								  <p>Selected File: {{ intAnhang.name }}</p>
+								  <button class="text-danger">X</button>
+								</div>
+						</span>
+						
+<!--						Anzeige outputs-->
+						<span >					
+							<ul>							
+								<li v-for="anh in anhang">
+									<button>{{anh.name}}</button><button class="text-danger">X</button>
+								</li>
+							</ul>
+						</span>
 					</div>
 				</div>
+				
 			</slot>
 	</div>	
 
@@ -174,12 +181,12 @@ component: {{intTitel}} {{intVon}} || {{intAnhang.name}} {{intAnhang}}
 				<div class="row mb-3">
 					<label for="von" class="form-label col-sm-2">von</label>
 					<div class="col-sm-2">
-						<vue-date-picker id="von" v-model="intVon" clearable="false" no-today auto-apply enable-time-picker="true" format="dd.MM.yyyy" preview-format="dd.MM.yyyy"></vue-date-picker>
+						<vue-date-picker id="von" v-model="intVon" clearable="false" auto-apply enable-time-picker="true" format="Y-m-d" preview-format="dd.MM.yyyy"></vue-date-picker>
 					</div>
 	
 					<label for="bis" class="form-label col-sm-1">bis</label>
 					<div class="col-sm-2">
-						<vue-date-picker id="bis" v-model="intBis" clearable="false" no-today auto-apply enable-time-picker="true" format="dd.MM.yyyy" preview-format="dd.MM.yyyy"></vue-date-picker>
+						<vue-date-picker id="bis" v-model="intBis" clearable="false" auto-apply enable-time-picker="true" format="dd.MM.yyyy" preview-format="dd.MM.yyyy"></vue-date-picker>
 					</div>
 	
 					<label for="bis" class="form-label col-sm-1">erledigt</label>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
index 7e28e6985..a0b0dd444 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
@@ -103,7 +103,7 @@ export default {
 		},
 		actionNewNotiz(){
 			this.formData.titel = '';
-			this.formData.action = 'Neue Notiz';
+			this.formData.action = 'Neue Notiz2';
 			this.formData.text = null;
 			this.formData.von = null;
 			this.formData.bis = null;
@@ -114,10 +114,10 @@ export default {
 			this.formData.anhang = [];
 		},
 		addNewNotiz(notizData) {
-			console.log(this.formData);
+			//console.log(this.formData);
 			const formData = new FormData();
 			Object.entries(this.formData).forEach(([k, v]) => formData.append(k, v));
-			console.log(formData);
+			//console.log(formData);
 			CoreRESTClient.post('components/stv/Notiz/addNewNotiz/' + this.modelValue.person_id,
 				formData,
 				{ Headers: { "Content-Type": "multipart/form-data" } }
@@ -204,6 +204,7 @@ export default {
 			this.formData.verfasser = null;
 			this.formData.bearbeiter = null;
 			this.formData.anhang = [];
+			//this.formData.anhang = {};
 		},
 		updateNotiz(notiz_id){
 			CoreRESTClient.post('components/stv/Notiz/updateNotiz/' + notiz_id,
@@ -231,7 +232,6 @@ export default {
 	},
 	template: `
 	<div class="stv-details-details h-100 pb-3">
-	{{modelValue}}
 
 		<!--Modal: deleteNotizModal-->
 		<BsModal ref="deleteNotizModal">
@@ -281,7 +281,7 @@ export default {
 		
 		
 		<div>
-			parent: {{anhang}} | {{formData.anhang.name}}
+			parent: {{formData.anhang}} | {{formData.anhang.name}}
 		</div>
 	</div>
 `

From d412c1d00e1b9e03d26d5db27d9d6f755207e3d5 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Wed, 3 Jan 2024 14:38:40 +0100
Subject: [PATCH 0285/1461] first template for the hr view to accept or deny
 profil update requests

---
 application/controllers/Cis/Profil.php        |  3 +-
 application/controllers/Cis/ProfilUpdate.php  | 42 +++++++++++
 application/views/Cis/ProfilUpdate.php        | 15 ++++
 public/js/apps/Cis/ProfilUpdateRequests.js    | 73 +++++++++++++++++++
 public/js/apps/api/userdata.js                |  9 +++
 public/js/components/Cis/Profil/EditProfil.js |  4 +-
 .../Cis/Profil/MitarbeiterProfil.js           |  6 +-
 7 files changed, 144 insertions(+), 8 deletions(-)
 create mode 100644 application/controllers/Cis/ProfilUpdate.php
 create mode 100644 application/views/Cis/ProfilUpdate.php
 create mode 100644 public/js/apps/Cis/ProfilUpdateRequests.js

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index 687f2becc..9f692b0a9 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -17,7 +17,6 @@ class Profil extends Auth_Controller
 	{
 		parent::__construct([
 			'index' => ['student/anrechnung_beantragen:r', 'user:r'], // TODO(chris): permissions?
-			'View' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'foto_sperre_function' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'getView' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'editProfil' => ['student/anrechnung_beantragen:r', 'user:r'],
@@ -35,7 +34,7 @@ class Profil extends Auth_Controller
 		$this->load->model('person/Kontakt_model', 'KontaktModel');
 		$this->load->model('person/Profil_change_model', 'ProfilChangeModel');
 
-		//? put the uid and pid inside the controller for further usage in views
+		//? put the uid and pid inside the controller to reuse in controller
 		$this->uid = getAuthUID();
 		$this->pid = getAuthPersonID();
 
diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
new file mode 100644
index 000000000..5e410bace
--- /dev/null
+++ b/application/controllers/Cis/ProfilUpdate.php
@@ -0,0 +1,42 @@
+<?php
+
+if (!defined('BASEPATH'))
+	exit('No direct script access allowed');
+
+/**
+ *
+ */
+class ProfilUpdate extends Auth_Controller
+{
+
+	public function __construct(){
+		parent::__construct([
+			'index' => ['student/anrechnung_beantragen:r', 'user:r'], // TODO(chris): permissions?
+			'getAllRequests' => ['student/anrechnung_beantragen:r', 'user:r'],
+
+		]);
+		//? put the uid and pid inside the controller to reuse in controller
+		$this->uid = getAuthUID();
+		$this->pid = getAuthPersonID();
+
+		$this->load->model('person/Profil_change_model','ProfilChangeModel');
+	}
+
+
+	public function index(){
+		$this->load->view('Cis/ProfilUpdate');
+	}
+
+	public function getAllRequests(){
+		
+		$res = $this->ProfilChangeModel->load();
+		if(isError($res)){
+			// catch exception
+			echo $res->retval->data;
+			return;
+		}else{
+			$res = hasData($res)? getData($res) : null;
+		}
+		echo json_encode($res);
+	}
+}
\ No newline at end of file
diff --git a/application/views/Cis/ProfilUpdate.php b/application/views/Cis/ProfilUpdate.php
new file mode 100644
index 000000000..f55fd4dc1
--- /dev/null
+++ b/application/views/Cis/ProfilUpdate.php
@@ -0,0 +1,15 @@
+<?php 
+$includesArray = ['title'=> 'Profil Änderungen',
+                  'customJSModules'=> ['public/js/apps/Cis/ProfilUpdateRequests.js'],
+                  'tabulator5'=> true,
+                  'customCSSs'=>['public/css/components/FilterComponent.css'],
+                 ];
+
+$this->load->view('templates/CISHTML-Header',$includesArray);
+?>
+
+<div id="content">
+
+</div>
+
+<?php $this->load->view('templates/CISHTML-Footer',$includesArray); ?>
\ No newline at end of file
diff --git a/public/js/apps/Cis/ProfilUpdateRequests.js b/public/js/apps/Cis/ProfilUpdateRequests.js
new file mode 100644
index 000000000..4a518796c
--- /dev/null
+++ b/public/js/apps/Cis/ProfilUpdateRequests.js
@@ -0,0 +1,73 @@
+import fhcapifactory from "../api/fhcapifactory.js";
+import {CoreFilterCmpt} from '../../components/filter/Filter.js'
+Vue.$fhcapi = fhcapifactory;
+
+const app = Vue.createApp({
+    components:{
+        CoreFilterCmpt,
+    },
+    data(){
+        return{
+            profil_updates_table_options:{
+                height:300,
+                layout:'fitColumns',
+                responsiveLayout: "collapse",
+                data: [
+                    {
+                      uid: "",
+                      profil_changes: "",
+                      change_timestamp: "",
+                    },
+                  ],
+                  columns: [
+                    {
+                      title: "Uid",
+                      field: "uid",
+                      minWidth: 200,
+                    },
+                    {
+                      title: "Update",
+                      field: "profil_changes",
+                      minWidth: 200,
+                    },
+                    {
+                      title: "Date",
+                      field: "change_timestamp",
+                      resizable: true,
+                      minWidth: 200,
+                    },
+                    
+                  ],
+            },
+        }
+    },
+    methods:{
+        sideMenuFunction: function(){
+            console.log("test from the side menu");
+        }
+    },
+    created(){
+
+        
+
+
+    },
+    mounted(){
+
+        this.$refs.UpdatesTable.tabulator.on('tableBuilt',()=>{
+            Vue.$fhcapi.UserData.getProfilUpdateRequest().then((data)=>{
+                this.$refs.UpdatesTable.tabulator.setData(data.data);
+            }).catch(()=>{});
+            
+        });
+    },
+    template:`
+    <div>
+    
+    <core-filter-cmpt title="Update Requests"  ref="UpdatesTable" :tabulator-options="profil_updates_table_options" tableOnly :sideMenu="false" />
+
+    </div>`,
+
+})
+
+app.mount('#content');
\ No newline at end of file
diff --git a/public/js/apps/api/userdata.js b/public/js/apps/api/userdata.js
index 8e7ea9b47..bb0309423 100644
--- a/public/js/apps/api/userdata.js
+++ b/public/js/apps/api/userdata.js
@@ -1,5 +1,8 @@
 export default {
 
+
+    //! API Calls for Profil Views
+
     editProfil: function(payload) {
         const url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router+
                    `/Cis/Profil/editProfil`;
@@ -31,6 +34,12 @@ export default {
     },
 
     
+    //! API Calls for Profil Update View
+
+    getProfilUpdateRequest: function(){
+        const url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/Cis/ProfilUpdate/getAllRequests';
+        return axios.get(url);
+    }
    
 
 
diff --git a/public/js/components/Cis/Profil/EditProfil.js b/public/js/components/Cis/Profil/EditProfil.js
index 84997caea..b29c1c345 100644
--- a/public/js/components/Cis/Profil/EditProfil.js
+++ b/public/js/components/Cis/Profil/EditProfil.js
@@ -132,7 +132,7 @@ export default {
             <template  v-for="(object,objectkey) in value"  >
             <div class="col-12 ">
               <div class="row gy-3">
-              <div v-for="(propertyValue,propertyKey) in object" class="col-12" >
+              <div v-for="(propertyValue,propertyKey) in object" class="col-6" >
               
               <div  class="form-underline ">
               <div class="form-underline-titel">
@@ -155,7 +155,7 @@ export default {
           
           </div>
           <div v-else class="row gy-3">
-          <div  v-for="(propertyValue,propertyKey) in value" class="col-12">
+          <div  v-for="(propertyValue,propertyKey) in value" class="col-6">
         
           <div  class="form-underline ">
           <div class="form-underline-titel">
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 1bad5f177..0776565be 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -30,8 +30,6 @@ export default {
           },
         ],
         columns: [
-          //? option when wanting to hide the collapsed list
-
           {
             title:
               "<i id='collapseIconFunktionen' role='button' class='fa-solid fa-angle-down  '></i>",
@@ -492,7 +490,7 @@ export default {
 
                              <!-- Bearbeiten Button -->
                              <div class="col-md-6 col-sm-12 ">
-                              <button @click="showModal" type="button" class="text-start w-100 btn btn-outline-primary" >
+                              <button @click="showModal" type="button" class="text-start  w-100 btn btn-outline-primary" >
                                 <div class="row">
                                   <div class="col-2">
                                     <i class="fa fa-edit"></i>
@@ -736,7 +734,7 @@ export default {
                 <!-- FIRST TABLE -->
                   <div class="col-12 mb-4" >
                  
-                    <core-filter-cmpt   ref="funktionenTable" :tabulator-options="funktionen_table_options"  tableOnly :sideMenu="false" />
+                    <core-filter-cmpt title="Funktionen"  ref="funktionenTable" :tabulator-options="funktionen_table_options"  tableOnly :sideMenu="false" />
                   
                     </div>
 

From 49c29115579abbcdea28fd2b844450b5c07635e7 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 3 Jan 2024 15:13:53 +0100
Subject: [PATCH 0286/1461] Bugfix

---
 .../Stv/Studentenverwaltung/List/New.js       | 43 ++++++++++---------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/List/New.js b/public/js/components/Stv/Studentenverwaltung/List/New.js
index 37f25a823..7bba76e51 100644
--- a/public/js/components/Stv/Studentenverwaltung/List/New.js
+++ b/public/js/components/Stv/Studentenverwaltung/List/New.js
@@ -150,27 +150,28 @@ export default {
 				});
 		},
 		loadStudienplaene() {
-			CoreRESTClient
-				.post('components/stv/studienplan/get', {
-					studiengang_kz: this.formDataStg,
-					studiensemester_kurzbz: this.formDataSem,
-					ausbildungssemester: this.formData.ausbildungssemester,
-					orgform_kurzbz: this.formData.orgform_kurzbz
-				})
-				.then(result => CoreRESTClient.getData(result.data) || [])
-				.then(result => {
-					this.studienplaene = result;
-					if (this.formData.studienplan_id !== '' && !this.studienplaene.filter(plan => plan.studienplan_id == this.formData.studienplan_id).length)
-						this.formData.studienplan_id = '';
-				})
-				.catch(error => {
-					if (error.code == 'ERR_BAD_REQUEST') {
-						return this.studienplaene = [];
-					}
-					// NOTE(chris): repeat request
-					if (error.code != "ERR_CANCELED")
-						window.setTimeout(this.loadStudienplaene, 100);
-				})
+			if (this.formDataStg)
+				CoreRESTClient
+					.post('components/stv/studienplan/get', {
+						studiengang_kz: this.formDataStg,
+						studiensemester_kurzbz: this.formDataSem,
+						ausbildungssemester: this.formData.ausbildungssemester,
+						orgform_kurzbz: this.formData.orgform_kurzbz
+					})
+					.then(result => CoreRESTClient.getData(result.data) || [])
+					.then(result => {
+						this.studienplaene = result;
+						if (this.formData.studienplan_id !== '' && !this.studienplaene.filter(plan => plan.studienplan_id == this.formData.studienplan_id).length)
+							this.formData.studienplan_id = '';
+					})
+					.catch(error => {
+						if (error.code == 'ERR_BAD_REQUEST') {
+							return this.studienplaene = [];
+						}
+						// NOTE(chris): repeat request
+						if (error.code != "ERR_CANCELED")
+							window.setTimeout(this.loadStudienplaene, 100);
+					})
 		},
 		changeAddressNation(e) {
 			if (this.formData['geburtsnation'] == this.formData['address']['nation'])

From b5bbf89b7d9eb2b338021468cbb99b99abf7a08e Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 3 Jan 2024 15:14:11 +0100
Subject: [PATCH 0287/1461] Make current tab accessible from outside

---
 public/js/components/Tabs.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Tabs.js b/public/js/components/Tabs.js
index 80f59e646..5583c6286 100644
--- a/public/js/components/Tabs.js
+++ b/public/js/components/Tabs.js
@@ -96,7 +96,7 @@ export default {
 		</div>
 		<div style="flex: 1 1 0%; height: 0%" class="border-bottom border-start border-end overflow-auto p-3">
 			<keep-alive>
-				<component :is="currentTab.component" v-model="value" :config="currentTab.config"></component>
+				<component ref="current" :is="currentTab.component" v-model="value" :config="currentTab.config"></component>
 			</keep-alive>
 		</div>
 	</div>`

From 9a81111ebc5ba580da6fa6e32048202e78f79a04 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 3 Jan 2024 15:14:44 +0100
Subject: [PATCH 0288/1461] Propagate reload into details tabs

---
 public/js/components/Stv/Studentenverwaltung.js        |  3 ++-
 .../js/components/Stv/Studentenverwaltung/Details.js   | 10 ++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index a116e36e4..908a98ae3 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -102,6 +102,7 @@ export default {
 		studiensemesterChanged(v) {
 			this.studiensemesterKurzbz = v;
 			this.$refs.stvList.updateUrl();
+			this.$refs.details.reload();
 		}
 	},
 	created() {
@@ -177,7 +178,7 @@ export default {
 						<stv-list ref="stvList" v-model:selected="selected" :studiengang-kz="studiengangKz" :studiensemester-kurzbz="studiensemesterKurzbz"></stv-list>
 					</template>
 					<template #bottom>
-						<stv-details :students="selected"></stv-details>
+						<stv-details ref="details" :students="selected"></stv-details>
 					</template>
 				</vertical-split>
 			</main>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details.js b/public/js/components/Stv/Studentenverwaltung/Details.js
index 69182db29..9d1a63ac8 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details.js
@@ -15,6 +15,12 @@ export default {
 			return FHC_JS_DATA_STORAGE_OBJECT.app_root;
 		}
 	},
+	methods: {
+		reload() {
+			if (this.$refs.tabs?.$refs?.current?.reload)
+				this.$refs.tabs.$refs.current.reload();
+		}
+	},
 	template: `
 	<div class="stv-details h-100 pb-3 d-flex flex-column">
 		<div v-if="!students?.length" class="justify-content-center d-flex h-100 align-items-center">
@@ -27,8 +33,8 @@ export default {
 					<h2 class="h4">{{students[0].titlepre}} {{students[0].vorname}} {{students[0].nachname}} {{students[0].titlepost}}</h2>
 				</div>
 			</div>
-			<fhc-tabs v-if="students.length == 1" :modelValue="students[0]" config-url="/components/stv/config/student" :default="$route.params.tab" style="flex: 1 1 0%; height: 0%"></fhc-tabs>
-			<fhc-tabs v-else :modelValue="students" config-url="/components/stv/config/students" :default="$route.params.tab" style="flex: 1 1 0%; height: 0%"></fhc-tabs>
+			<fhc-tabs v-if="students.length == 1" ref="tabs" :modelValue="students[0]" config-url="/components/stv/config/student" :default="$route.params.tab" style="flex: 1 1 0%; height: 0%"></fhc-tabs>
+			<fhc-tabs v-else ref="tabs" :modelValue="students" config-url="/components/stv/config/students" :default="$route.params.tab" style="flex: 1 1 0%; height: 0%"></fhc-tabs>
 		</div>
 	</div>`
 };
\ No newline at end of file

From b4505536f6d14cdf7b744605d0bbf91a3a498402 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 3 Jan 2024 15:38:39 +0100
Subject: [PATCH 0289/1461] track tab changes with event

---
 public/js/components/Tabs.js | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Tabs.js b/public/js/components/Tabs.js
index 5583c6286..7d2cf0500 100644
--- a/public/js/components/Tabs.js
+++ b/public/js/components/Tabs.js
@@ -6,7 +6,9 @@ export default {
 		accessibility
 	},
 	emits: [
-		'update:modelValue'
+		'update:modelValue',
+		'change',
+		'changed'
 	],
 	props: {
 		configUrl: String,
@@ -35,6 +37,13 @@ export default {
 			}
 		}
 	},
+	methods: {
+		change(key) {
+			this.$emit("change", key)
+			this.current = key;
+			this.$nextTick(() => this.$emit("changed", key));
+		}
+	},
 	created() {
 		CoreRESTClient
 			.get(this.configUrl)
@@ -87,7 +96,7 @@ export default {
 				:key="tab.key"
 				class="nav-item nav-link"
 				:class="{active: tab.key == current}"
-				@click="current=tab.key"
+				@click="change(tab.key)"
 				:aria-current="tab.key == current ? 'page' : ''"
 				v-accessibility:tab
 				>

From b070607f915d2beb346559a819ab22582cccf3e6 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 3 Jan 2024 15:39:31 +0100
Subject: [PATCH 0290/1461] reload details on tab change

---
 public/js/components/Stv/Studentenverwaltung/Details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details.js b/public/js/components/Stv/Studentenverwaltung/Details.js
index 9d1a63ac8..74e54cfe8 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details.js
@@ -33,8 +33,8 @@ export default {
 					<h2 class="h4">{{students[0].titlepre}} {{students[0].vorname}} {{students[0].nachname}} {{students[0].titlepost}}</h2>
 				</div>
 			</div>
-			<fhc-tabs v-if="students.length == 1" ref="tabs" :modelValue="students[0]" config-url="/components/stv/config/student" :default="$route.params.tab" style="flex: 1 1 0%; height: 0%"></fhc-tabs>
-			<fhc-tabs v-else ref="tabs" :modelValue="students" config-url="/components/stv/config/students" :default="$route.params.tab" style="flex: 1 1 0%; height: 0%"></fhc-tabs>
+			<fhc-tabs v-if="students.length == 1" ref="tabs" :modelValue="students[0]" config-url="/components/stv/config/student" :default="$route.params.tab" style="flex: 1 1 0%; height: 0%" @changed="reload"></fhc-tabs>
+			<fhc-tabs v-else ref="tabs" :modelValue="students" config-url="/components/stv/config/students" :default="$route.params.tab" style="flex: 1 1 0%; height: 0%" @changed="reload"></fhc-tabs>
 		</div>
 	</div>`
 };
\ No newline at end of file

From ef91489b29076e72299e209cdd03f41fea7342f1 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 3 Jan 2024 15:49:10 +0100
Subject: [PATCH 0291/1461] Bugfixes

---
 public/js/components/Form/Upload/Image.js                       | 2 +-
 public/js/components/Stv/Studentenverwaltung/Details/Details.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Form/Upload/Image.js b/public/js/components/Form/Upload/Image.js
index 99128f9c5..270108ace 100644
--- a/public/js/components/Form/Upload/Image.js
+++ b/public/js/components/Form/Upload/Image.js
@@ -46,7 +46,7 @@ export default {
 			</div>
 		</template>
 		<template v-else>
-			<slot #placeholder>
+			<slot name="placeholder">
 				<svg class="bd-placeholder-img img-thumbnail" xmlns="http://www.w3.org/2000/svg" role="img" aria-label="A generic square placeholder image with a white border around it, making it resemble a photograph taken with an old instant camera: 200x200" preserveAspectRatio="xMidYMid slice" focusable="false"><title>A generic square placeholder image with a white border around it, making it resemble a photograph taken with an old instant camera</title><rect width="100%" height="100%" fill="#868e96"></rect><text x="50%" y="50%" fill="#dee2e6" dy=".3em"></text></svg>
 				<div class="fotobutton-visible">
 					<div class="d-grid gap-2 d-md-flex">
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
index 9d824e142..ebbd68dd2 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
@@ -299,7 +299,7 @@ export default {
 					</div>
 					<label for="stv-details-anmerkung" class="col-sm-1 col-form-label">Anmerkung</label>
 					<div class="col-sm-3">
-						<textarea id="stv-details-anmerkung" class="form-control" v-text="anmerkung"></textarea>
+						<textarea id="stv-details-anmerkung" class="form-control" v-model="data.anmerkung"></textarea>
 					</div>
 					<label for="stv-details-homepage" class="col-sm-1 col-form-label">Homepage</label>
 					<div class="col-sm-3">

From c7e008b61578e411950e6caad679c6ed59149e97 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 4 Jan 2024 15:00:13 +0100
Subject: [PATCH 0292/1461] Noten anzeigen

---
 .../controllers/components/stv/Config.php     |  4 ++
 .../controllers/components/stv/Noten.php      | 43 +++++++++++
 .../Stv/Studentenverwaltung/Details/Noten.js  | 19 +++++
 .../Details/Noten/Zeugnis.js                  | 72 +++++++++++++++++++
 4 files changed, 138 insertions(+)
 create mode 100644 application/controllers/components/stv/Noten.php
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Noten.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js

diff --git a/application/controllers/components/stv/Config.php b/application/controllers/components/stv/Config.php
index a0fd4f53a..efc93e3d8 100644
--- a/application/controllers/components/stv/Config.php
+++ b/application/controllers/components/stv/Config.php
@@ -23,6 +23,10 @@ class Config extends FHC_Controller
 			'title' => 'Kontakt',
 			'component' => './Stv/Studentenverwaltung/Details/Kontakt.js'
 		];
+		$result['noten'] = [
+			'title' => 'Noten',
+			'component' => './Stv/Studentenverwaltung/Details/Noten.js'
+		];
 		$result['notizen'] = [
 			'title' => 'Notizen',
 			'component' => './Stv/Studentenverwaltung/Details/Notizen.js'
diff --git a/application/controllers/components/stv/Noten.php b/application/controllers/components/stv/Noten.php
new file mode 100644
index 000000000..6ba5863c5
--- /dev/null
+++ b/application/controllers/components/stv/Noten.php
@@ -0,0 +1,43 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Noten extends Auth_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'getZeugnis' => 'student/noten:r'
+		]);
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+	}
+
+	public function getZeugnis($prestudent_id)
+	{
+		$this->load->model('crm/Student_model', 'StudentModel');
+		$this->load->model('education/Zeugnisnote_model', 'ZeugnisnoteModel');
+
+		$result = $this->StudentModel->loadWhere([
+			'prestudent_id' => $prestudent_id
+		]);
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson($result);
+		}
+		if (!hasData($result))
+			return $this->outputJsonSuccess(null);
+		
+		$student_uid = current(getData($result))->student_uid;
+
+		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
+
+		$result = $this->ZeugnisnoteModel->getZeugnisnoten($student_uid, $studiensemester_kurzbz);
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+		}
+		
+		return $this->outputJson($result);
+	}
+}
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Noten.js b/public/js/components/Stv/Studentenverwaltung/Details/Noten.js
new file mode 100644
index 000000000..8e8269ee5
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Noten.js
@@ -0,0 +1,19 @@
+import NotenZeugnis from './Noten/Zeugnis.js';
+
+export default {
+	components: {
+		NotenZeugnis
+	},
+	props: {
+		modelValue: Object
+	},
+	methods: {
+		reload() {
+			this.$refs.zeugnis.$refs.table.reloadTable();
+		}
+	},
+	template: `
+	<div class="stv-details-noten h-100 d-flex flex-column">
+		<noten-zeugnis ref="zeugnis" :student="modelValue"></noten-zeugnis>
+	</div>`
+};
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js
new file mode 100644
index 000000000..8dcc52d96
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js
@@ -0,0 +1,72 @@
+import {CoreFilterCmpt} from "../../../../filter/Filter.js";
+import {CoreRESTClient} from '../../../../../RESTClient.js';
+
+export default {
+	components: {
+		CoreFilterCmpt
+	},
+	props: {
+		student: Object
+	},
+	data() {
+		return {
+			validStudent: true,
+			tabulatorEvents: []
+		};
+	},
+	computed: {
+		ajaxURL() {
+			return CoreRESTClient._generateRouterURI('components/stv/Noten/getZeugnis/' + this.student.prestudent_id);
+		},
+		tabulatorOptions() {
+			return {
+				ajaxURL: this.ajaxURL,
+				ajaxResponse: (url, params, response) => {
+					if (!response.retval)
+						this.validStudent = false;
+					else
+						this.validStudent = true;
+					return response.retval || [];
+				},
+				columns: [
+					{ field: 'zeugnis', title: 'Zeugnis', formatter: 'tickCross' },
+					{ field: 'lehrveranstaltung_bezeichnung', title: 'Lehrveranstaltung' },
+					{ field: 'note_bezeichnung', title: 'Note' },
+					{ field: 'uebernahmedatum', title: 'Übernahmedatum', visible: false },
+					{ field: 'benotungsdatum', title: 'Benotungsdatum', visible: false },
+					{ field: 'benotungsdatum-iso', title: 'Benotungsdatum ISO', visible: false },
+					{ field: 'studiensemester_kurzbz', title: 'Studiensemester', visible: false },
+					{ field: 'note', title: 'Note Numerisch', visible: false },
+					{ field: 'lehrveranstaltung_id', title: 'Lehrveranstaltung ID', visible: false },
+					{ field: 'studiengang', title: 'Studiengang', visible: false },
+					{ field: 'studiengang_kz', title: 'Studiengang Kennzahl', visible: false },
+					{ field: 'studiengang_lv', title: 'StudiengangLV', visible: false },
+					{ field: 'studiengang_kz_lv', title: 'Studiengang_kzLV', visible: false },
+					{ field: 'semester_lv', title: 'SemesterLV', visible: false },
+					{ field: 'ects_lv', title: 'ECTS', visible: false },
+					{ field: 'lehrform', title: 'Lehrform', visible: false },
+					{ field: 'kurzbz', title: 'Kurzbz', visible: false },
+					{ field: 'punkte', title: 'Punkte', visible: false },
+					{ field: 'lehrveranstaltung_bezeichnung_english', title: 'Englisch', visible: false }
+				],
+				layout: 'fitDataStretch',
+				height: '100%',
+				persistence: true
+			};
+		}
+	},
+	template: `
+	<div class="stv-details-noten-zeugnis h-100 d-flex flex-column">
+		<div v-if="!validStudent">Kein Student</div>
+		<core-filter-cmpt
+			v-else
+			ref="table"
+			:tabulator-options="tabulatorOptions"
+			:tabulator-events="tabulatorEvents"
+			table-only
+			:side-menu="false"
+			reload
+			>
+		</core-filter-cmpt>
+	</div>`
+};
\ No newline at end of file

From ee8051915ece438fb305f43a4928f3ce3d02a440 Mon Sep 17 00:00:00 2001
From: Simon Gschnell <simongschnell@gmail.com>
Date: Thu, 4 Jan 2024 16:06:47 +0100
Subject: [PATCH 0293/1461] formats the update timestamps in php, differently
 tracks which properties and informations where changed by the user

---
 application/controllers/Cis/Profil.php        | 14 +++--
 application/controllers/Cis/ProfilUpdate.php  |  9 ++-
 .../models/person/Profil_change_model.php     |  4 +-
 public/js/apps/Cis/Profil.js                  |  4 +-
 public/js/apps/Cis/ProfilUpdateRequests.js    | 59 ++++++++++++++-----
 public/js/components/Cis/Profil/EditProfil.js | 50 ++++++++++++----
 .../Cis/Profil/MitarbeiterProfil.js           |  7 +--
 7 files changed, 104 insertions(+), 43 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index 9f692b0a9..272474d22 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -76,15 +76,16 @@ class Profil extends Auth_Controller
 
 		$res = $this->ProfilChangeModel->load([$this->uid]);
 		$res = hasData($res) ? getData($res) : null;
-
+		
 		if (empty($res)) {
 			$insert_res = $this->ProfilChangeModel->insert($data);
 			if(isError($insert_res)){
 				//catch error
 			}else{
+				$editTimestamp = $this->ProfilChangeModel->getTimestamp($this->uid);
 				//? status code 201 CREATED
 				$insert_res->code = 201;
-				$insert_res->retval = $this->ProfilChangeModel->getTimestamp($this->uid)->change_timestamp;
+				$insert_res->retval = date_create($editTimestamp)->format('d/m/Y');
 				echo json_encode($insert_res);
 			}
 			
@@ -93,9 +94,10 @@ class Profil extends Auth_Controller
 			if(isError($update_res)){
 				//catch error
 			}
+			$editTimestamp = $this->ProfilChangeModel->getTimestamp($this->uid);
 			//? status code 200 OK
 			$update_res->code = 200;
-			$update_res->retval = $this->ProfilChangeModel->getTimestamp($this->uid)->change_timestamp;
+			$update_res->retval = date_create($editTimestamp)->format('d/m/Y');;
 			echo json_encode($update_res);
 		}
 
@@ -547,7 +549,8 @@ class Profil extends Auth_Controller
 		$res->standort_telefon = $telefon_res;
 
 		$res->editData = $editData_res? json_decode($editData_res->profil_changes): null;
-		$res->editDataTimestamp = $editData_res? $editData_res->change_timestamp: null;
+		$res->editDataTimestamp = $editData_res? date_create($editData_res->change_timestamp)->format('d/m/Y') : null;
+		
 
 		return $res;
 	}
@@ -747,7 +750,8 @@ class Profil extends Auth_Controller
 
 		$res->mailverteiler = $mailverteiler_res;
 		$res->editData = $editData_res? json_decode($editData_res->profil_changes): null;
-		$res->editDataTimestamp = $editData_res? $editData_res->change_timestamp: null;
+		$res->editDataTimestamp = $editData_res? date_create($editData_res->change_timestamp)->format('d/m/Y'): null;
+		
 		return $res;
 
 
diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
index 5e410bace..2ee7368be 100644
--- a/application/controllers/Cis/ProfilUpdate.php
+++ b/application/controllers/Cis/ProfilUpdate.php
@@ -35,7 +35,14 @@ class ProfilUpdate extends Auth_Controller
 			echo $res->retval->data;
 			return;
 		}else{
-			$res = hasData($res)? getData($res) : null;
+			if(hasData($res)){
+				$res = getData($res);
+				foreach($res as $element){
+					$element->change_timestamp = date_create($element->change_timestamp)->format('d/m/Y H:i');
+				}
+			}else{
+				$res = null;
+			}
 		}
 		echo json_encode($res);
 	}
diff --git a/application/models/person/Profil_change_model.php b/application/models/person/Profil_change_model.php
index 946fe6d84..f7e514847 100644
--- a/application/models/person/Profil_change_model.php
+++ b/application/models/person/Profil_change_model.php
@@ -12,8 +12,6 @@ class Profil_change_model extends DB_Model
 		$this->pk = ['uid'];
         $this->hasSequence = false;
 
-		//? loading other models to query them
-        $this->load->model('crm/prestudentstatus_model', 'PrestudentstatusModel');
 	}
 
 	/**
@@ -22,7 +20,7 @@ class Profil_change_model extends DB_Model
 	public function getTimestamp($uid){
 		$this->addSelect(['change_timestamp']);
 		$res = $this->load([$uid]);
-		return hasData($res) ? getData($res)[0] : null;
+		return hasData($res) ? getData($res)[0]->change_timestamp : null;
 	}
 
 }
diff --git a/public/js/apps/Cis/Profil.js b/public/js/apps/Cis/Profil.js
index ba4443b69..a490eddc5 100644
--- a/public/js/apps/Cis/Profil.js
+++ b/public/js/apps/Cis/Profil.js
@@ -114,9 +114,7 @@ const app = Vue.createApp({
 
 				this.data = res.data?.data;
 			
-				if(this.data.editDataTimestamp){
-					this.data.editDataTimestamp= new Date(this.data.editDataTimestamp);
-				}
+				
 			}
 			
 			
diff --git a/public/js/apps/Cis/ProfilUpdateRequests.js b/public/js/apps/Cis/ProfilUpdateRequests.js
index 4a518796c..65b996f3c 100644
--- a/public/js/apps/Cis/ProfilUpdateRequests.js
+++ b/public/js/apps/Cis/ProfilUpdateRequests.js
@@ -1,6 +1,14 @@
 import fhcapifactory from "../api/fhcapifactory.js";
 import {CoreFilterCmpt} from '../../components/filter/Filter.js'
 Vue.$fhcapi = fhcapifactory;
+/* 
+data: [
+  {
+    uid: "",
+    profil_changes: "",
+    change_timestamp: "",
+  },
+], */
 
 const app = Vue.createApp({
     components:{
@@ -9,32 +17,32 @@ const app = Vue.createApp({
     data(){
         return{
             profil_updates_table_options:{
+              ajaxURL:FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/Cis/ProfilUpdate/getAllRequests',
                 height:300,
                 layout:'fitColumns',
                 responsiveLayout: "collapse",
-                data: [
-                    {
-                      uid: "",
-                      profil_changes: "",
-                      change_timestamp: "",
-                    },
-                  ],
+                responsiveLayoutCollapseUseFormatters:false,
+                responsiveLayoutCollapseFormatter:this.collapseFormatter,
+                
                   columns: [
                     {
                       title: "Uid",
                       field: "uid",
                       minWidth: 200,
+                      responsive:0,
                     },
                     {
                       title: "Update",
                       field: "profil_changes",
-                      minWidth: 200,
+                      minWidth: 10000,
+                      responsive:3,
                     },
                     {
                       title: "Date",
                       field: "change_timestamp",
                       resizable: true,
                       minWidth: 200,
+                      responsive:0,
                     },
                     
                   ],
@@ -44,7 +52,33 @@ const app = Vue.createApp({
     methods:{
         sideMenuFunction: function(){
             console.log("test from the side menu");
-        }
+        },
+        collapseFormatter: function(data){
+          //data - an array of objects containing the column title and value for each cell
+          var container = document.createElement("div");
+          container.classList.add("tabulator-collapsed-row");
+          container.classList.add("text-break");
+          
+          var list = document.createElement("div");
+          list.classList.add("row");
+          
+          
+          container.appendChild(list);
+          
+          data.forEach(function(col){
+            let item = document.createElement("div");
+            item.classList.add("col-12");
+          
+            
+            item.innerHTML = Object.keys(JSON.parse(col.value)).map(key => {return key+'<br/>'});
+            
+          
+            list.appendChild(item);
+         
+          });
+          
+          return Object.keys(data).length ? container : "";
+          },
     },
     created(){
 
@@ -54,12 +88,7 @@ const app = Vue.createApp({
     },
     mounted(){
 
-        this.$refs.UpdatesTable.tabulator.on('tableBuilt',()=>{
-            Vue.$fhcapi.UserData.getProfilUpdateRequest().then((data)=>{
-                this.$refs.UpdatesTable.tabulator.setData(data.data);
-            }).catch(()=>{});
-            
-        });
+        
     },
     template:`
     <div>
diff --git a/public/js/components/Cis/Profil/EditProfil.js b/public/js/components/Cis/Profil/EditProfil.js
index b29c1c345..cfd3b2a2f 100644
--- a/public/js/components/Cis/Profil/EditProfil.js
+++ b/public/js/components/Cis/Profil/EditProfil.js
@@ -28,20 +28,46 @@ export default {
   data() {
     return {
     editData: this.value,
+    //? tracks what specific profil data was changed
+    changesData: {Emails: [],Private_Adressen:[],Private_Kontakte:[],Personen_Informationen:{},Mitarbeiter_Informationen:{} },
     editTimestamp: this.timestamp,
     result: true,
     info: null,
   }
  
   },
+
   methods: {
-    test(){
-      console.log("test");
+     
+    updateData: function(event,key,ArrayKey,ObjectKey=null){
+      if(Array.isArray(this.editData[key])){
+        this.editData[key][ArrayKey][ObjectKey]= event.target.value;
+        if(event.target.value === JSON.parse(this.originalEditData)[key][ArrayKey][ObjectKey]){
+          this.changesData[key].splice(ArrayKey,1);
+        }else{
+          if(!this.changesData[key].includes(this.editData[key][ArrayKey])){
+            this.changesData[key].push(this.editData[key][ArrayKey]);
+          }
+          
+        }
+      }else{
+        console.log(key);
+        this.editData[key][ArrayKey]= event.target.value;
+        if(event.target.value === JSON.parse(this.originalEditData)[key][ArrayKey]){
+          delete this.changesData[key][ArrayKey];
+        }else{
+          this.changesData[key][ArrayKey]= this.editData[key][ArrayKey];
+        }
+      }
+      
+     
     },
     submitProfilChange(){
       
        if(this.isEditDataChanged){
         //? inserts new row in public.tbl_cis_profil_update 
+
+
         Vue.$fhcapi.UserData.editProfil(this.editData).then((res)=>{
           this.result = {
             editData: this.editData,
@@ -62,6 +88,7 @@ export default {
     },
   },
   computed: {
+   
     getFormatedDate: function(){
 			return [
 			  this.editTimestamp.getDate().toString().padStart(2,'0'),
@@ -109,13 +136,13 @@ export default {
       {{"Profil bearbeiten" }}
     </template>
     <template v-slot:default>
-    
-    <!-- START OF THE ACCORDION 
-<pre>{{JSON.stringify(data)}}</pre>
-<pre>{{JSON.stringify(result)}}</pre>-->
-  
 
 
+    
+    <!-- START OF THE ACCORDION
+     -->
+     <pre>{{JSON.stringify(changesData,null,2)}}</pre>
+
     <div class="accordion accordion-flush" id="accordionFlushExample" >
       <div class="accordion-item" v-for="(value,key) in editData ">
         <h2 class="accordion-header" :id="'flush-headingOne'+key">
@@ -129,7 +156,7 @@ export default {
         
           <div v-if="Array.isArray(value)" class="row gy-5">
           
-            <template  v-for="(object,objectkey) in value"  >
+            <template  v-for="(object,objectKey) in value"  >
             <div class="col-12 ">
               <div class="row gy-3">
               <div v-for="(propertyValue,propertyKey) in object" class="col-6" >
@@ -139,8 +166,7 @@ export default {
               <label :for="propertyKey+'input'" >{{propertyKey}}</label>
               </div>
               <div>
-                
-                <input  class="form-control" :id="propertyKey+'input'" v-model="editData[key][objectkey][propertyKey]" :placeholder="propertyValue">
+                <input  class="form-control" :id="propertyKey+'input'" :value="editData[key][objectKey][propertyKey]" @input="updateData($event,key,objectKey,propertyKey)" :placeholder="propertyValue">
               </div>
               </div>
 
@@ -163,7 +189,7 @@ export default {
           </div>
           <div>
             
-            <input type="email" class="form-control" :id="propertyKey+'input'" v-model="editData[key][propertyKey]" :placeholder="propertyValue">
+            <input type="email" class="form-control" :id="propertyKey+'input'" :value="editData[key][propertyKey]" @input="updateData($event,key,propertyKey)"  :placeholder="propertyValue">
           </div>
           </div>
           </div>
@@ -188,7 +214,7 @@ export default {
     </template>
     <!-- optional footer -->
     <template v-if="editTimestamp || isEditDataChanged"  v-slot:footer>
-      <p v-if="editTimestamp" class="flex-fill">Letzte Anfrage: {{getFormatedDate}}</p>
+      <p v-if="editTimestamp" class="flex-fill">Letzte Anfrage: {{editTimestamp}}</p>
     
       <button v-if="isEditDataChanged" @click="submitProfilChange" role="button" class="btn btn-primary">Senden</button>
     </template>
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 0776565be..538e1a2f5 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -126,13 +126,13 @@ export default {
   
   methods: {
     showModal() {
-      
+
       EditProfil.popup({ 
           value:JSON.parse(JSON.stringify(this.data.editData)),
           timestamp:this.data.editDataTimestamp
         }).then((res) => {
           if(res.timestamp && res.editData){
-            this.data.editDataTimestamp = new Date(res.timestamp);
+            this.data.editDataTimestamp = res.timestamp;
             this.data.editData = res.editData;
           }
           
@@ -260,14 +260,13 @@ export default {
   created() {
     
     
-    
 
     if(!this.data.editData){
     
 
       this.data.editData = {
         Personen_Informationen : {...this.personData, vorname: this.data.vorname, nachname: this.data.nachname},
-        Mitarbeiter_Informatinen: this.specialData,
+        Mitarbeiter_Informationen: this.specialData,
         Emails:this.data.emails,
         Private_Kontakte: this.data.kontakte,
         Private_Adressen:this.privateAdressen,

From e479a7aa49fa92a2cbb9081e18d7c2c0bd7a0c52 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 5 Jan 2024 10:40:47 +0100
Subject: [PATCH 0294/1461] stores the old and the new value in the profil
 update request, to track which information has to be updated in the database

---
 public/js/components/Cis/Profil/EditProfil.js | 44 ++++++++++++++-----
 1 file changed, 34 insertions(+), 10 deletions(-)

diff --git a/public/js/components/Cis/Profil/EditProfil.js b/public/js/components/Cis/Profil/EditProfil.js
index cfd3b2a2f..c61a9faf5 100644
--- a/public/js/components/Cis/Profil/EditProfil.js
+++ b/public/js/components/Cis/Profil/EditProfil.js
@@ -29,7 +29,7 @@ export default {
     return {
     editData: this.value,
     //? tracks what specific profil data was changed
-    changesData: {Emails: [],Private_Adressen:[],Private_Kontakte:[],Personen_Informationen:{},Mitarbeiter_Informationen:{} },
+    changesData: {},
     editTimestamp: this.timestamp,
     result: true,
     info: null,
@@ -40,24 +40,48 @@ export default {
   methods: {
      
     updateData: function(event,key,ArrayKey,ObjectKey=null){
+
+      const cleanUpObjectProperties= () => {
+        Object.entries(this.changesData).forEach( ([property, value]) => { if(!Object.keys(value).length) delete this.changesData[property]; })
+      }
+      
+      let newValue = event.target.value;
+      if(!this.changesData[key]){
+        Array.isArray(this.editData[key])? this.changesData[key] = [] : this.changesData[key] = {};
+      } 
+      
       if(Array.isArray(this.editData[key])){
-        this.editData[key][ArrayKey][ObjectKey]= event.target.value;
-        if(event.target.value === JSON.parse(this.originalEditData)[key][ArrayKey][ObjectKey]){
-          this.changesData[key].splice(ArrayKey,1);
+        if(newValue.length > 0) this.editData[key][ArrayKey][ObjectKey]= newValue;
+          
+        else this.editData[key][ArrayKey][ObjectKey]= null;
+
+        let Obj = {key:ArrayKey, new: this.editData[key][ArrayKey], old: JSON.parse(this.originalEditData)[key][ArrayKey]};
+
+        
+        if(JSON.stringify(this.editData[key][ArrayKey]) === JSON.stringify(JSON.parse(this.originalEditData)[key][ArrayKey]) ){
+            this.changesData[key] = this.changesData[key].filter( arrayElement => arrayElement.key !== ArrayKey );
+            cleanUpObjectProperties();
         }else{
-          if(!this.changesData[key].includes(this.editData[key][ArrayKey])){
-            this.changesData[key].push(this.editData[key][ArrayKey]);
+          if(!this.changesData[key].filter( arrayElement => arrayElement.key === ArrayKey ).length){
+            this.changesData[key].push(Obj);
           }
           
         }
       }else{
-        console.log(key);
-        this.editData[key][ArrayKey]= event.target.value;
-        if(event.target.value === JSON.parse(this.originalEditData)[key][ArrayKey]){
+        if(newValue.length > 0) this.editData[key][ArrayKey]= newValue;
+          
+        else this.editData[key][ArrayKey]= null;
+
+        let Obj = { new: this.editData[key][ArrayKey], old: JSON.parse(this.originalEditData)[key][ArrayKey]};
+
+        
+        if(JSON.stringify(this.editData[key][ArrayKey]) === JSON.stringify(JSON.parse(this.originalEditData)[key][ArrayKey])){
           delete this.changesData[key][ArrayKey];
+          cleanUpObjectProperties();
         }else{
-          this.changesData[key][ArrayKey]= this.editData[key][ArrayKey];
+          this.changesData[key][ArrayKey]= Obj;
         }
+
       }
       
      

From ff6f23b3f44b8468562aa2aa822d938048f94df0 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 5 Jan 2024 15:13:10 +0100
Subject: [PATCH 0295/1461] =?UTF-8?q?Notiz=20l=C3=B6schen=20mit=20Dokument?=
 =?UTF-8?q?en,=20Start=20Umbau=20Funktionen=20von=20person=5Fid=20auf=20ty?=
 =?UTF-8?q?p?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controllers/components/stv/Notiz.php      | 130 +++++++++++++++---
 application/models/person/Notiz_model.php     |  77 ++++++++++-
 public/js/components/Notiz/Notiz.js           |  15 +-
 .../Studentenverwaltung/Details/Notizen.js    |  20 ++-
 4 files changed, 211 insertions(+), 31 deletions(-)

diff --git a/application/controllers/components/stv/Notiz.php b/application/controllers/components/stv/Notiz.php
index eb0711f9a..3ec8b6f26 100644
--- a/application/controllers/components/stv/Notiz.php
+++ b/application/controllers/components/stv/Notiz.php
@@ -22,6 +22,7 @@ class Notiz extends FHC_Controller
 	public function getNotizen($person_id)
 	{
 		$this->load->model('person/Notiz_model', 'NotizModel');
+		$type = 'person';
 
 		$result = $this->NotizModel->getNotizWithDocEntries($person_id);
 
@@ -37,9 +38,7 @@ class Notiz extends FHC_Controller
 	{
 		$this->load->model('person/Notiz_model', 'NotizModel');
 		$this->NotizModel->addJoin('public.tbl_notiz_dokument', 'notiz_id', 'LEFT');
-
 		$this->NotizModel->addSelect('*');
-
 		$this->NotizModel->addLimit(1);
 
 		$result = $this->NotizModel->loadWhere(
@@ -60,19 +59,25 @@ class Notiz extends FHC_Controller
 		}
 	}
 
-	public function addNewNotiz($person_id)
+	public function addNewNotiz($id)
 	{
-/*		var_dump($this->input->post('titel'));
-		var_dump($this->input->post('anhang'));*/
-
-		var_dump($_FILES);
-		var_dump($_FILES["anhang"]["name"]);
-
 		$this->load->library('form_validation');
-		$this->load->library('DmsLib');
 		$dms_id = null;
 
+		//DMS-Logik zum Speichern des Anhangs
+/*		var_dump("im Backend: addNewNotiz, dmslogik");
+		var_dump($_FILES);*/
+
+		$this->load->library('DmsLib');
+
+
+
+
+
 		$uid = getAuthUID();
+
+		//single
+		$dms_id = null;
 		$dms = array(
 			'kategorie_kurzbz'  => 'notiz',
 			'version'           => 0,
@@ -82,22 +87,61 @@ class Notiz extends FHC_Controller
 			'insertvon'         => $uid
 		);
 
-		var_dump($dms);
+		//var_dump($dms);
+
 		$result = $this->dmslib->upload($dms, 'anhang', array('pdf'));
+		//var_dump($result);
 
 		if (isSuccess($result))
 		{
+			//TODO(Manu) change to array
 			$dms_id = $result->retval['dms_id'];
-			//var_dump($dms_id);
 		}
 
+		//var_dump($dms_id);
+
+/*		//multiple files
+		$dms_id = [];
+		foreach ($_FILES as $file)
+		{
+			//var_dump($file["name"]);
+			var_dump($file);
+			$dms = array(
+				'kategorie_kurzbz'  => 'notiz',
+				'version'           => 0,
+				'name'              => $file["name"],
+				'mimetype'          => $file["type"],
+				'insertamum'        => date('c'),
+				'insertvon'         => $uid
+			);
+
+			$result = $this->dmslib->upload($dms, 'file', array('pdf'));
+			var_dump($result);
+
+			if (isSuccess($result))
+			{
+				//TODO(Manu) change to array
+				$dms_id[] = $result->retval['dms_id'];
+			}
+
+
+		}
+
+		var_dump($dms_id);
+		return;*/
+
 
 		$this->load->model('person/Notiz_model', 'NotizModel');
 
+		//var_dump($_POST);
+
 		$uid = getAuthUID();
 		$titel = isset($_POST['titel']) ? $_POST['titel'] : null;
 		$text = isset($_POST['text']) ? $_POST['text'] : null;
-		$verfasser_uid = $uid;
+		$bearbeiter_uid = isset($_POST['bearbeiter_uid']) ? $_POST['bearbeiter_uid'] : null;
+		$verfasser_uid = isset($_POST['verfasser_uid']) ? $_POST['verfasser_uid'] : $uid;
+		$erledigt = $_POST['erledigt'];
+		$type = $_POST['typeId'];
 
 		/*		$start = isset($_POST['bis']) ? ($_POST['bis'] : null;
 		$ende = isset($_POST['bis']) ? $_POST['bis'] : null;*/
@@ -125,18 +169,24 @@ class Notiz extends FHC_Controller
 		if(isset($_POST['bis']))
 		{
 			//Todo(manu) check input format datepicker
-			$ende = strtotime($_POST['bis']);
+/*			$ende = strtotime($_POST['bis']);
 			$ende = new DateTime($ende);
-			$ende = $ende->format('Y-m-d');
+			$ende = $ende->format('Y-m-d');*/
+
+			$ende = '2023-01-01';
 		}
 		else
 			$ende = null;
 
 
+		//Todo(manu) multiple files
+		$result = $this->NotizModel->addNotizForType($type, $id, $titel, $text, $uid, $dms_id, $start, $ende, $erledigt, $verfasser_uid, $bearbeiter_uid);
+
+		//vorher
+		//$result = $this->NotizModel->addNotizForPersonWithDoc($id, $titel, $text, $erledigt, $verfasser_uid, $start, $ende, $dms_id);
+
 
-		$erledigt = $_POST['erledigt'];
 
-		$result = $this->NotizModel->addNotizForPersonWithDoc($person_id, $titel, $text, $erledigt, $verfasser_uid, $start, $ende, $dms_id);
 
 	//	var_dump($result);
 
@@ -220,8 +270,51 @@ class Notiz extends FHC_Controller
 
 	public function deleteNotiz ($notiz_id)
 	{
-		//Todo(manu) Notizzuordnung und NotizDokument ebenfalls berücksichtigen
+		//dms_id auslesen aus notizdokument wenn vorhanden
+		$dms_id = null;
+		$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
+
+		$result = $this->NotizdokumentModel->loadWhere(array('notiz_id' => $notiz_id));
+
+		if (isError($result))
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->outputJson($result);
+		}
+		elseif (!hasData($result))
+		{
+			$this->outputJson($result);
+			$dms_id = null;
+		}
+		else
+		{
+			//Todo(manu( umbau auf array)
+			$result = current(getData($result));
+			$dms_id = $result->dms_id;
+		}
+
+		if($dms_id)
+		{
+			$this->load->library('DmsLib');
+			$result = $this->dmslib->removeAll($dms_id);
+
+			if (isError($result))
+			{
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				$this->outputJson($result);
+			}
+			else
+				$this->outputJson($result);
+
+			//return $this->outputJsonSuccess(current(getData($result)));
+
+		}
+
+
+		//Todo(manu) rollback?
+		//delete Notiz und Notizzuordnung
 		$this->load->model('person/Notiz_model', 'NotizModel');
+		$this->NotizModel->addJoin('public.tbl_notizzuordnung', 'notiz_id');
 
 		$result = $this->NotizModel->delete(
 			array('notiz_id' => $notiz_id)
@@ -235,6 +328,7 @@ class Notiz extends FHC_Controller
 		elseif (!hasData($result)) {
 			$this->outputJson($result);
 		}
+
 		return $this->outputJsonSuccess(current(getData($result)));
 	}
 
diff --git a/application/models/person/Notiz_model.php b/application/models/person/Notiz_model.php
index e343efa60..141065c87 100644
--- a/application/models/person/Notiz_model.php
+++ b/application/models/person/Notiz_model.php
@@ -134,7 +134,65 @@ class Notiz_model extends DB_Model
 	}
 
 	/**
-	 * Add a Notiz for a given person
+	 * Add a Notiz with Notizuordnung for a given type
+	 * @param type type of id for Notizzuordnung (example: person, prestudent, mitarbeiter, projekt, projektphase, projekttask,
+	 *        bestellung, lehreinheit, anrechnung)
+	 * @param id for Dokumentzuordnung (person_id, prestudent_id, uid, projekt_id...)
+	 * @param titel, text, start, ende, erledigt, verfasser_uid, bearbeiter_uid, insertvon Parameter for notiz
+	 */
+	public function addNotizForType($type, $id, $titel, $text, $insertvon, $dms_id=null, $start=null, $ende=null, $erledigt=false, $verfasser_uid=null, $bearbeiter_uid=null)
+	{
+		// Loads model Notizzuordnung_model
+		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
+
+		// Start DB transaction
+		$this->db->trans_start(false);
+
+		$result = $this->insert(array('titel' => $titel, 'text' => $text, 'erledigt' => $erledigt, 'verfasser_uid' => $verfasser_uid,
+			"insertvon" => $insertvon, 'start' => $start, 'ende' => $ende, 'bearbeiter_uid' => $bearbeiter_uid));
+
+		if (isSuccess($result))
+		{
+			//cases für alle types
+
+			$notiz_id = $result->retval;
+
+			if($dms_id)
+			{
+				// Loads model Notizdokument_model
+				$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
+				//Todo(manu) change for multiple files
+				$result = $this->NotizdokumentModel->insert(array('notiz_id' => $notiz_id, 'dms_id' => $dms_id));
+			}
+
+			if ($type == 'person')
+				$result = $this->NotizzuordnungModel->insert(array('notiz_id' => $notiz_id, 'person_id' => $id));
+			elseif ($type == 'prestudent')
+				$result = $this->NotizzuordnungModel->insert(array('notiz_id' => $notiz_id, 'prestudent_id' => $id));
+			else
+				$result = error($result->msg, "Type nicht vorhanden");
+		}
+
+		// Transaction complete!
+		$this->db->trans_complete();
+
+		// Check if everything went ok during the transaction
+		if ($this->db->trans_status() === false || isError($result))
+		{
+			$this->db->trans_rollback();
+			$result = error($result->msg, EXIT_ERROR);
+		}
+		else
+		{
+			$this->db->trans_commit();
+			$result = success($notiz_id);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Add a Notiz for a given person with DMS_id
 	 */
 	//TODO(manu) add type for Notizzuordnung
 	public function addNotizForPersonWithDoc($person_id, $titel, $text, $erledigt, $verfasser_uid, $von, $bis, $dms_id=null)
@@ -157,6 +215,7 @@ class Notiz_model extends DB_Model
 			{
 				// Loads model Notizdokument_model
 				$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
+				//Todo(manu) change for multiple files
 				$result = $this->NotizdokumentModel->insert(array('notiz_id' => $notiz_id, 'dms_id' => $dms_id));
 			}
 		}
@@ -192,15 +251,19 @@ class Notiz_model extends DB_Model
 	}
 
 	/**
-	 * gets all Notizen with Documententries for a person
+	 * gets all Notizen with Documententries for a certain type and type_id
 	 * @param $person_id
 	 */
 	//Todo(Manu) rewrite in CI-Style
-	public function getNotizWithDocEntries($person_id)
+	public function getNotizWithDocEntries($id)
 	{
+	$type = 'writeFunction';
+		//$type_id = 'z.person_id';
+
+
 		$qry = "
 			SELECT 
-			    	n.*, count(dms_id) as countDoc
+			    	n.*, count(dms_id) as countDoc, z.notizzuordnung_id
 			FROM
 			    	public.tbl_notiz n
 			JOIN 
@@ -210,12 +273,12 @@ class Notiz_model extends DB_Model
 			LEFT JOIN 
 			    	    campus.tbl_dms_version USING (dms_id)
 			WHERE 
-			    z.person_id = ?
+			   z.person_id = ?
 			GROUP BY 
-			    notiz_id
+			    notiz_id, z.notizzuordnung_id
 		";
 
-		return $this->execQuery($qry, array($person_id));
+		return $this->execQuery($qry, array($id));
 
 	}
 
diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index 43dd32003..d61483a0c 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -8,6 +8,7 @@ export default {
 		//SingleFile
 	},
 	props: [
+		'typeId',
 		'titel',
 		'text',
 		'von',
@@ -96,24 +97,32 @@ export default {
 			}
 		}
 	},
+/*	mounted(){
+		showZuordnung(){
+			this.idTyp = 'Person';
+		}
+	},*/
 	methods: {
 		handleFileChange(event) {
 			//single
 			this.intAnhang = event.target.files[0];
 
-			//multiple
+			//multiple not working
 			//this.intAnhang = event.target.files;
 		},
 	},
 	template: `
 <div>
 
-component: {{intTitel}} {{intVon}} || {{intAnhang.name}} {{intAnhang}}
+component: {{intTitel}} {{intVon}} || {{intAnhang.name}} {{intAnhang}} {{typeId}}
 	<form class="row">
 		<div>
 			<div class="row mb-3">
 				<b>{{action}}</b>
 			</div>
+			<div>
+				<p>Zuordnung {{this.typeId}}</p>
+			</div>
 			<div class="notizTitle row mb-3">
 				<label for="titel" class="form-label col-sm-2">Titel</label>
 				<div class="col-sm-7">
@@ -181,7 +190,7 @@ component: {{intTitel}} {{intVon}} || {{intAnhang.name}} {{intAnhang}}
 				<div class="row mb-3">
 					<label for="von" class="form-label col-sm-2">von</label>
 					<div class="col-sm-2">
-						<vue-date-picker id="von" v-model="intVon" clearable="false" auto-apply enable-time-picker="true" format="Y-m-d" preview-format="dd.MM.yyyy"></vue-date-picker>
+						<vue-date-picker id="von" v-model="intVon" clearable="false" auto-apply enable-time-picker="true" format="dd.MM.yyyy" preview-format="dd.MM.yyyy"></vue-date-picker>
 					</div>
 	
 					<label for="bis" class="form-label col-sm-1">bis</label>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
index a0b0dd444..29efb8078 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
@@ -24,6 +24,7 @@ export default {
 		return {
 			tabulatorOptions: {
 				ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Notiz/getNotizen/' + this.modelValue.person_id),
+				//	+ this.modelValue.person_id, 'person'),
 				columns: [
 					{title: "Titel", field: "titel"},
 					{title: "Text", field: "text", width: 350},
@@ -58,6 +59,7 @@ export default {
 			tabulatorEvents: [],
 			notizen: [],
 			formData: {
+				typeId: 'person',
 				titel: null,
 				action: 'Neue Notiz',
 				text: null,
@@ -102,6 +104,7 @@ export default {
 			});
 		},
 		actionNewNotiz(){
+			this.formData.typeId = 'person';
 			this.formData.titel = '';
 			this.formData.action = 'Neue Notiz2';
 			this.formData.text = null;
@@ -114,10 +117,20 @@ export default {
 			this.formData.anhang = [];
 		},
 		addNewNotiz(notizData) {
-			//console.log(this.formData);
+/*			console.log("here: anhang noch empty");
+			console.log(this.formData);*/
 			const formData = new FormData();
+
 			Object.entries(this.formData).forEach(([k, v]) => formData.append(k, v));
-			//console.log(formData);
+
+/*			for( var i = 0; i < this.formData.anhang.length; i++ ){
+				let file = this.formData.anhang[i];
+
+				formData.append('files[' + i + ']', file);
+			}*/
+
+			console.log("after append");
+			console.log(formData);
 			CoreRESTClient.post('components/stv/Notiz/addNewNotiz/' + this.modelValue.person_id,
 				formData,
 				{ Headers: { "Content-Type": "multipart/form-data" } }
@@ -263,6 +276,7 @@ export default {
 		<Notiz 
 			:showErweitert="showErweitert"
 			:showDocument="showDocument"
+			v-model:typeId="formData.typeId"
 			v-model:titel="formData.titel" 
 			v-model:text="formData.text" 
 			v-model:action="formData.action" 				
@@ -281,7 +295,7 @@ export default {
 		
 		
 		<div>
-			parent: {{formData.anhang}} | {{formData.anhang.name}}
+			parent: {{formData.anhang}} {{formData.typeId}} | {{formData.anhang.name}}
 		</div>
 	</div>
 `

From 5b597dbc3112624ecc69cf16db28c70ccf2083af Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 8 Jan 2024 15:19:18 +0100
Subject: [PATCH 0296/1461] changing the editProfil Modal from an Accordion to
 a select

---
 application/controllers/Cis/Profil.php        |  39 +++--
 .../models/person/Profil_change_model.php     |   4 +-
 public/js/components/Cis/Profil/EditProfil.js | 159 ++++++++----------
 .../Cis/Profil/MitarbeiterProfil.js           |  13 +-
 .../Cis/Profil/MitarbeiterViewProfil.js       |   4 +-
 .../js/components/Cis/Profil/StudentProfil.js |   4 +-
 .../Cis/Profil/StudentViewProfil.js           |   4 +-
 .../js/components/Cis/Profil/oldAccordion.txt |  72 ++++++++
 system/dbupdate_3.4.php                       |   4 +-
 system/dbupdate_3.4/25999_C4_ma0594.php       |  48 +++++-
 10 files changed, 227 insertions(+), 124 deletions(-)
 create mode 100644 public/js/components/Cis/Profil/oldAccordion.txt

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index 272474d22..da601b890 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -71,35 +71,38 @@ class Profil extends Auth_Controller
 	{
 
 		$json = $this->input->raw_input_stream;
+		
 
-		$data = ["uid" => $this->uid, "profil_changes" => $json, "change_timestamp" => "NOW()"];
+		$data = ["uid" => $this->uid, "requested_change" => $json, "change_timestamp" => "NOW()"];
 
-		$res = $this->ProfilChangeModel->load([$this->uid]);
+		//? gets all the requested changes from a user
+		$res = $this->ProfilChangeModel->loadWhere(["uid"=>$this->uid]);
 		$res = hasData($res) ? getData($res) : null;
 		
-		if (empty($res)) {
+		
 			$insert_res = $this->ProfilChangeModel->insert($data);
+		
 			if(isError($insert_res)){
 				//catch error
 			}else{
-				$editTimestamp = $this->ProfilChangeModel->getTimestamp($this->uid);
-				//? status code 201 CREATED
-				$insert_res->code = 201;
-				$insert_res->retval = date_create($editTimestamp)->format('d/m/Y');
+				$editTimestamp = $this->ProfilChangeModel->getTimestamp($insert_res->retval);
+				
+				$insert_res->retval = date_create($editTimestamp)->format('d.m.Y');
 				echo json_encode($insert_res);
 			}
-			
+			/* if (empty($res)) {
 		} else {
 			$update_res = $this->ProfilChangeModel->update([$this->uid], $data);
+			
 			if(isError($update_res)){
 				//catch error
 			}
 			$editTimestamp = $this->ProfilChangeModel->getTimestamp($this->uid);
 			//? status code 200 OK
 			$update_res->code = 200;
-			$update_res->retval = date_create($editTimestamp)->format('d/m/Y');;
+			$update_res->retval = date_create($editTimestamp)->format('d.m.Y');;
 			echo json_encode($update_res);
-		}
+		} */
 
 
 
@@ -502,12 +505,12 @@ class Profil extends Auth_Controller
 
 
 		//? querying if the user already has a pending profil information update request
-		$editData_res = $this->ProfilChangeModel->load([$this->uid]);
+		/* $editData_res = $this->ProfilChangeModel->load([$this->uid]);
 		if(isError($editData_res)){
 			//error handling
 		}else{
 			$editData_res = hasData($editData_res) ? getData($editData_res)[0] : null;
-		}
+		} */
 
 		$res = new stdClass();
 		$res->foto = $person_res->foto;
@@ -548,9 +551,9 @@ class Profil extends Auth_Controller
 		//telefon nummer von dem Standort
 		$res->standort_telefon = $telefon_res;
 
-		$res->editData = $editData_res? json_decode($editData_res->profil_changes): null;
+		/* $res->editData = $editData_res? json_decode($editData_res->profil_data): null;
 		$res->editDataTimestamp = $editData_res? date_create($editData_res->change_timestamp)->format('d/m/Y') : null;
-		
+		 */
 
 		return $res;
 	}
@@ -705,12 +708,12 @@ class Profil extends Auth_Controller
 		}
 
 		//? querying if the user already has a pending profil information update request
-		$editData_res = $this->ProfilChangeModel->load([$this->uid]);
+		/* $editData_res = $this->ProfilChangeModel->load([$this->uid]);
 		if(isError($editData_res)){
 			//error handling
 		}else{
 			$editData_res = hasData($editData_res) ? getData($editData_res)[0] : null;
-		}
+		} */
 
 
 		$res = new stdClass();
@@ -749,9 +752,9 @@ class Profil extends Auth_Controller
 
 
 		$res->mailverteiler = $mailverteiler_res;
-		$res->editData = $editData_res? json_decode($editData_res->profil_changes): null;
+		/* $res->editData = $editData_res? json_decode($editData_res->profil_data): null;
 		$res->editDataTimestamp = $editData_res? date_create($editData_res->change_timestamp)->format('d/m/Y'): null;
-		
+		 */
 		return $res;
 
 
diff --git a/application/models/person/Profil_change_model.php b/application/models/person/Profil_change_model.php
index f7e514847..54b8adf4f 100644
--- a/application/models/person/Profil_change_model.php
+++ b/application/models/person/Profil_change_model.php
@@ -9,8 +9,8 @@ class Profil_change_model extends DB_Model
 	{
 		parent::__construct();
 		$this->dbTable = 'public.tbl_cis_profil_update';
-		$this->pk = ['uid'];
-        $this->hasSequence = false;
+		$this->pk = ['profil_update_id'];
+        $this->hasSequence = true;
 
 	}
 
diff --git a/public/js/components/Cis/Profil/EditProfil.js b/public/js/components/Cis/Profil/EditProfil.js
index c61a9faf5..b6363077b 100644
--- a/public/js/components/Cis/Profil/EditProfil.js
+++ b/public/js/components/Cis/Profil/EditProfil.js
@@ -27,10 +27,17 @@ export default {
   },
   data() {
     return {
+    selection: null,
+    propertySelection:true,
+    selectedProperty:null,
+    inputField:null,
+    detailSelection:false,
     editData: this.value,
     //? tracks what specific profil data was changed
     changesData: {},
     editTimestamp: this.timestamp,
+    selectionOrder: {firstSelect: true, secondSelect:false},
+    
     result: true,
     info: null,
   }
@@ -38,6 +45,20 @@ export default {
   },
 
   methods: {
+
+    formSelection: function(selection){
+      
+      if(Array.isArray(selection)){
+        return ['a','b'];
+      }else if(typeof(selection) === 'object'){
+        console.log(selection);
+        return Object.keys(selection);
+
+      }else{
+        // it is not an array or and object
+        return null;
+      }
+    },
      
     updateData: function(event,key,ArrayKey,ObjectKey=null){
 
@@ -88,18 +109,18 @@ export default {
     },
     submitProfilChange(){
       
-       if(this.isEditDataChanged){
+     
         //? inserts new row in public.tbl_cis_profil_update 
 
 
-        Vue.$fhcapi.UserData.editProfil(this.editData).then((res)=>{
+        Vue.$fhcapi.UserData.editProfil(this.inputField).then((res)=>{
           this.result = {
             editData: this.editData,
             timestamp: res.data.retval,
           };
           this.hide(); 
           
-           if(res.data.error == 0){
+          if(res.data.error == 0){
            
             Alert.popup("Ihre Anfrage wurde erfolgreich gesendet. Bitte warten Sie, während sich das Team um Ihre Anfrage kümmert.");
           }else{
@@ -108,24 +129,34 @@ export default {
           //
         });
      
-      } 
+      
     },
   },
   computed: {
+
+    firstSelection(){
+      return Object.keys(this.value);
+    },
+
+    secondSelection(){
+      switch(this.selectedProperty){
+        case "Personen_Informationen": return Object.keys(this.editData[this.selectedProperty]);
+        case "Private_Kontakte": return this.editData[this.selectedProperty];
+        case "Private_Adressen": return this.editData[this.selectedProperty];
+        default: return [];
+      }
+    },
+
+  
+
+    
    
-    getFormatedDate: function(){
-			return [
-			  this.editTimestamp.getDate().toString().padStart(2,'0'),
-			  (this.editTimestamp.getMonth()+1).toString().padStart(2,'0'),
-			  this.editTimestamp.getFullYear(),
-			].join('/');
-		  },
+    
       isEditDataChanged(){
         return this.originalEditData != JSON.stringify(this.editData)
       },
   },
   created() {
-
     this.originalEditData = JSON.stringify(this.editData);
     
     /* 
@@ -161,86 +192,42 @@ export default {
     </template>
     <template v-slot:default>
 
+    
+
+    <select v-if="!selectedProperty"  class="form-select" size="3" aria-label="size 3 select example">
+      <option @click="selectedProperty=option;  " v-for="option in firstSelection" :value="option">{{option}}</option>
+    </select>
+
+    <select v-if="selectedProperty && !inputField" class="form-select" size="3" aria-label="size 3 select example">
+      <option @click="
+      if(Array.isArray(editData[selectedProperty])){
+        inputField=option
+      }else{
+        inputField={[option]:editData[selectedProperty][option]};
+      }" v-for="option in secondSelection" :value="option"><div v-if="typeof(option)==='object'"><p v-for="(value,property) in option">{{property}}:{{value}}</p></div><template v-else>{{option}}</template></option>
+    </select>
+    <div v-if="inputField">
+    <div v-for="(field,index) in inputField">
+    
+    <div class="form-underline">
+    <div class="form-underline-titel">{{index}}</div>
+
+    <input  class="form-control" :id="index" v-model="inputField[index]" :placeholder="field">
+    </div>
+    
+      </div>
+    </div>
 
     
-    <!-- START OF THE ACCORDION
-     -->
-     <pre>{{JSON.stringify(changesData,null,2)}}</pre>
-
-    <div class="accordion accordion-flush" id="accordionFlushExample" >
-      <div class="accordion-item" v-for="(value,key) in editData ">
-        <h2 class="accordion-header" :id="'flush-headingOne'+key">
-          <button style="font-weight:500" class="accordion-button collapsed" type="button" data-bs-toggle="collapse" :data-bs-target="'#flush-collapseOne'+key" aria-expanded="false" :aria-controls="'flush-collapseOne'+key">
-            {{key.replace("_"," ")}}
-          </button>
-        </h2>
-        <!-- SHOWING ALL MAILS IN THE FIRST PART OF THE ACCORDION -->
-        <div :id="'flush-collapseOne'+key" class="accordion-collapse collapse" aria-labelledby="flush-headingOne" data-bs-parent="#accordionFlushExample">
-          <div class="accordion-body">
-        
-          <div v-if="Array.isArray(value)" class="row gy-5">
-          
-            <template  v-for="(object,objectKey) in value"  >
-            <div class="col-12 ">
-              <div class="row gy-3">
-              <div v-for="(propertyValue,propertyKey) in object" class="col-6" >
-              
-              <div  class="form-underline ">
-              <div class="form-underline-titel">
-              <label :for="propertyKey+'input'" >{{propertyKey}}</label>
-              </div>
-              <div>
-                <input  class="form-control" :id="propertyKey+'input'" :value="editData[key][objectKey][propertyKey]" @input="updateData($event,key,objectKey,propertyKey)" :placeholder="propertyValue">
-              </div>
-              </div>
-
-              </div>
-              </div>
-
-              </div>
-              <hr class="mb-0" v-if="value[value.length-1] != object">
-            </template>
-            
-
-          
-          </div>
-          <div v-else class="row gy-3">
-          <div  v-for="(propertyValue,propertyKey) in value" class="col-6">
-        
-          <div  class="form-underline ">
-          <div class="form-underline-titel">
-          <label :for="propertyKey+'input'" >{{propertyKey}}</label>
-          </div>
-          <div>
-            
-            <input type="email" class="form-control" :id="propertyKey+'input'" :value="editData[key][propertyKey]" @input="updateData($event,key,propertyKey)"  :placeholder="propertyValue">
-          </div>
-          </div>
-          </div>
-          </div>
-
-          
-          
-          
-          
-
-          </div>
-        </div>
-      </div>
-
-      <!-- -->
-
-     
-
-
-    <!-- END OF THE ACCORDION -->
-
+ 
+    
+  
     </template>
     <!-- optional footer -->
-    <template v-if="editTimestamp || isEditDataChanged"  v-slot:footer>
+    <template   v-slot:footer>
       <p v-if="editTimestamp" class="flex-fill">Letzte Anfrage: {{editTimestamp}}</p>
     
-      <button v-if="isEditDataChanged" @click="submitProfilChange" role="button" class="btn btn-primary">Senden</button>
+      <button  @click="submitProfilChange" role="button" class="btn btn-primary">Senden</button>
     </template>
     <!-- end of optional footer --> 
   </bs-modal>`,
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 538e1a2f5..279b3bd76 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -266,8 +266,13 @@ export default {
 
       this.data.editData = {
         Personen_Informationen : {...this.personData, vorname: this.data.vorname, nachname: this.data.nachname},
-        Mitarbeiter_Informationen: this.specialData,
-        Emails:this.data.emails,
+        Private_Kontakte: this.data.kontakte,
+        Private_Adressen:this.privateAdressen,
+      };
+
+    }else{
+      this.data.editData = {
+        Personen_Informationen : {...this.personData, vorname: this.data.vorname, nachname: this.data.nachname},
         Private_Kontakte: this.data.kontakte,
         Private_Adressen:this.privateAdressen,
       };
@@ -317,7 +322,7 @@ export default {
                    
                     <a href="#" class="list-group-item list-group-item-action">Zeitwünsche</a>
                     <a href="#" class="list-group-item list-group-item-action">Lehrveranstaltungen</a>
-                    <a href="#" class="list-group-item list-group-item-action ">Zeitsperren von Gschnell</a>
+                    <a href="#" class="list-group-item list-group-item-action ">Zeitsperren</a>
                   </div>
                 </div>
               </div>
@@ -778,7 +783,7 @@ export default {
                        
                         <a style="text-decoration:none" class="my-1 d-block" href="#">Zeitwuensche</a>
                         <a style="text-decoration:none" class="my-1 d-block" href="#">Lehrveranstaltungen</a>
-                        <a style="text-decoration:none" class="my-1 d-block" href="#">Zeitsperren von Gschnell</a>
+                        <a style="text-decoration:none" class="my-1 d-block" href="#">Zeitsperren</a>
 
                       </div>
                     </div>
diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
index 2a13b4b03..b64d3ebbd 100644
--- a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
@@ -176,7 +176,7 @@ export default {
                    
                     <a href="#" class="list-group-item list-group-item-action">Zeitwünsche</a>
                     <a href="#" class="list-group-item list-group-item-action">Lehrveranstaltungen</a>
-                    <a href="#" class="list-group-item list-group-item-action ">Zeitsperren von Gschnell</a>
+                    <a href="#" class="list-group-item list-group-item-action ">Zeitsperren</a>
                   </div>
                 </div>
               </div>
@@ -495,7 +495,7 @@ export default {
                        
                         <a style="text-decoration:none" class="my-1 d-block" href="#">Zeitwuensche</a>
                         <a style="text-decoration:none" class="my-1 d-block" href="#">Lehrveranstaltungen</a>
-                        <a style="text-decoration:none" class="my-1 d-block" href="#">Zeitsperren von Gschnell</a>
+                        <a style="text-decoration:none" class="my-1 d-block" href="#">Zeitsperren</a>
 
                       </div>
                     </div>
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index bc59514fa..ef92a4247 100644
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -189,7 +189,7 @@ export default {
                    
                     <a href="#" class="list-group-item list-group-item-action">Zeitwünsche</a>
                     <a href="#" class="list-group-item list-group-item-action">Lehrveranstaltungen</a>
-                    <a href="#" class="list-group-item list-group-item-action ">Zeitsperren von Gschnell</a>
+                    <a href="#" class="list-group-item list-group-item-action ">Zeitsperren</a>
                   </div>
                 </div>
               </div>
@@ -623,7 +623,7 @@ export default {
                        
                         <a style="text-decoration:none" class="my-1 d-block" href="#">Zeitwuensche</a>
                         <a style="text-decoration:none" class="my-1 d-block" href="#">Lehrveranstaltungen</a>
-                        <a style="text-decoration:none" class="my-1 d-block" href="#">Zeitsperren von Gschnell</a>
+                        <a style="text-decoration:none" class="my-1 d-block" href="#">Zeitsperren</a>
 
                       </div>
                     </div>
diff --git a/public/js/components/Cis/Profil/StudentViewProfil.js b/public/js/components/Cis/Profil/StudentViewProfil.js
index 38aadb1d6..4c1a41db7 100644
--- a/public/js/components/Cis/Profil/StudentViewProfil.js
+++ b/public/js/components/Cis/Profil/StudentViewProfil.js
@@ -103,7 +103,7 @@ export default {
                    
                     <a href="#" class="list-group-item list-group-item-action">Zeitwünsche</a>
                     <a href="#" class="list-group-item list-group-item-action">Lehrveranstaltungen</a>
-                    <a href="#" class="list-group-item list-group-item-action ">Zeitsperren von Gschnell</a>
+                    <a href="#" class="list-group-item list-group-item-action ">Zeitsperren</a>
                   </div>
                 </div>
               </div>
@@ -406,7 +406,7 @@ export default {
                        
                         <a style="text-decoration:none" class="my-1 d-block" href="#">Zeitwuensche</a>
                         <a style="text-decoration:none" class="my-1 d-block" href="#">Lehrveranstaltungen</a>
-                        <a style="text-decoration:none" class="my-1 d-block" href="#">Zeitsperren von Gschnell</a>
+                        <a style="text-decoration:none" class="my-1 d-block" href="#">Zeitsperren</a>
 
                       </div>
                     </div>
diff --git a/public/js/components/Cis/Profil/oldAccordion.txt b/public/js/components/Cis/Profil/oldAccordion.txt
new file mode 100644
index 000000000..733ecafd2
--- /dev/null
+++ b/public/js/components/Cis/Profil/oldAccordion.txt
@@ -0,0 +1,72 @@
+<!-- START OF THE ACCORDION
+ 
+<pre>{{JSON.stringify(changesData,null,2)}}</pre>
+
+<div class="accordion accordion-flush" id="accordionFlushExample" >
+ <div class="accordion-item" v-for="(value,key) in editData ">
+   <h2 class="accordion-header" :id="'flush-headingOne'+key">
+     <button style="font-weight:500" class="accordion-button collapsed" type="button" data-bs-toggle="collapse" :data-bs-target="'#flush-collapseOne'+key" aria-expanded="false" :aria-controls="'flush-collapseOne'+key">
+       {{key.replace("_"," ")}}
+     </button>
+   </h2>
+   <!-- SHOWING ALL MAILS IN THE FIRST PART OF THE ACCORDION -->
+   <div :id="'flush-collapseOne'+key" class="accordion-collapse collapse" aria-labelledby="flush-headingOne" data-bs-parent="#accordionFlushExample">
+     <div class="accordion-body">
+   
+     <div v-if="Array.isArray(value)" class="row gy-3">
+     
+       <template  v-for="(object,objectKey) in value"  >
+       
+       <div class="card card-body col-12 ">
+         <div class="row gy-3">
+         <div v-for="(propertyValue,propertyKey) in object" class="col-6" >
+         
+         <div  class="form-underline ">
+         <div class="form-underline-titel">
+         <label :for="propertyKey+'input'" >{{propertyKey}}</label>
+         </div>
+         <div>
+           <input  class="form-control" :id="propertyKey+'input'" :value="editData[key][objectKey][propertyKey]" @input="updateData($event,key,objectKey,propertyKey)" :placeholder="propertyValue">
+         </div>
+         </div>
+
+         </div>
+         </div>
+
+         </div>
+      
+       </template>
+       
+
+     
+     </div>
+     <div v-else class="row gy-3">
+     <div  v-for="(propertyValue,propertyKey) in value" class="col-6">
+   
+     <div  class="form-underline ">
+     <div class="form-underline-titel">
+     <label :for="propertyKey+'input'" >{{propertyKey}}</label>
+     </div>
+     <div>
+       
+       <input type="email" class="form-control" :id="propertyKey+'input'" :value="editData[key][propertyKey]" @input="updateData($event,key,propertyKey)"  :placeholder="propertyValue">
+     </div>
+     </div>
+     </div>
+     </div>
+
+     
+     
+     
+     
+
+     </div>
+   </div>
+ </div>
+
+ <!-- -->
+
+
+
+
+<!-- END OF THE ACCORDION -->
\ No newline at end of file
diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index 4a20a6289..523017bbf 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -49,6 +49,8 @@ require_once('dbupdate_3.4/29835_uhstat1_erfassung_der_uhstat1_daten_ueber_das_b
 require_once('dbupdate_3.4/33714_erhoehter_studienbeitrag_fuer_drittsaatenangehoerig.php');
 require_once('dbupdate_3.4/25999_C4_ma0594.php');
 
+
+	
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
 
@@ -221,7 +223,7 @@ $tabellen=array(
 	"public.tbl_benutzerfunktion"  => array("benutzerfunktion_id","fachbereich_kurzbz","uid","oe_kurzbz","funktion_kurzbz","semester", "datum_von","datum_bis", "updateamum","updatevon","insertamum","insertvon","ext_id","bezeichnung","wochenstunden"),
 	"public.tbl_benutzergruppe"  => array("uid","gruppe_kurzbz","studiensemester_kurzbz","updateamum","updatevon","insertamum","insertvon","ext_id"),
 	"public.tbl_bewerbungstermine" => array("bewerbungstermin_id","studiengang_kz","studiensemester_kurzbz","beginn","ende","nachfrist","nachfrist_ende","anmerkung", "insertamum", "insertvon", "updateamum", "updatevon","studienplan_id","nationengruppe_kurzbz"),
-	"public.tbl_cis_profil_update" => array("uid","profil_changes","change_timestamp"),
+	"public.tbl_cis_profil_update" => array("profil_update_id","uid","requested_change","change_timestamp"),
 	"public.tbl_buchungstyp"  => array("buchungstyp_kurzbz","beschreibung","standardbetrag","standardtext","aktiv","credit_points"),
 	"public.tbl_dokument"  => array("dokument_kurzbz","bezeichnung","ext_id","bezeichnung_mehrsprachig","dokumentbeschreibung_mehrsprachig","ausstellungsdetails"),
 	"public.tbl_dokumentprestudent"  => array("dokument_kurzbz","prestudent_id","mitarbeiter_uid","datum","updateamum","updatevon","insertamum","insertvon","ext_id"),
diff --git a/system/dbupdate_3.4/25999_C4_ma0594.php b/system/dbupdate_3.4/25999_C4_ma0594.php
index f5bb66213..34c1b1db1 100644
--- a/system/dbupdate_3.4/25999_C4_ma0594.php
+++ b/system/dbupdate_3.4/25999_C4_ma0594.php
@@ -1,17 +1,29 @@
 <?php
-
+    
     if(!$result = @$db->db_query("SELECT 1 FROM public.tbl_cis_profil_update LIMIT 1"))
     {
         $qry = "CREATE TABLE public.tbl_cis_profil_update (
+                profil_update_id INTEGER NOT NULL,
                 uid VARCHAR(32) NOT NULL,
-                profil_changes jsonb NOT NULL,
+                requested_change jsonb NOT NULL,
                 change_timestamp TIMESTAMP NOT NULL,
-                CONSTRAINT tbl_cis_profil_update_pk PRIMARY KEY(uid),
+                CONSTRAINT tbl_cis_profil_update_pk PRIMARY KEY(profil_update_id),
                 CONSTRAINT tbl_cis_profil_update_fk FOREIGN KEY(uid) REFERENCES public.tbl_benutzer(uid)
             );
 
+            CREATE SEQUENCE public.tbl_cis_profil_update_id_seq
+			 INCREMENT BY 1
+			 NO MAXVALUE
+			 NO MINVALUE
+			 CACHE 1;
+		    ALTER TABLE public.tbl_cis_profil_update ALTER COLUMN profil_update_id SET DEFAULT nextval('public.tbl_cis_profil_update_id_seq');
+
+
             GRANT SELECT, INSERT, UPDATE, DELETE ON public.tbl_cis_profil_update TO vilesci;
-            GRANT SELECT, INSERT, UPDATE, DELETE ON public.tbl_cis_profil_update TO web;";
+            GRANT SELECT, INSERT, UPDATE, DELETE ON public.tbl_cis_profil_update TO web; 
+            GRANT SELECT, UPDATE ON public.tbl_cis_profil_update_id_seq TO vilesci;
+            GRANT SELECT, UPDATE ON public.tbl_cis_profil_update_id_seq TO web;";
+
 
         if(!$db->db_query($qry))
             echo '<strong>public.tbl_cis_profil_update: '.$db->db_last_error().'</strong><br>';
@@ -19,13 +31,35 @@
             echo '<br>public.tbl_cis_profil_update: table created';
     }
 
+    /* else{
+        $qry = "DROP TABLE public.tbl_cis_profil_update;";
+        if(!$db->db_query($qry))
+            echo '<strong> was not able to delete public.tbl_cis_profil_update: '.$db->db_last_error().'</strong><br>';
+        else
+            echo '<br>public.tbl_cis_profil_update: table deleted';
+    } */
 
-    if($db->db_num_rows($result)==0)
+
+    /* if($db->db_num_rows($result)==0)
 	{
-		$qry = "INSERT INTO public.tbl_cis_profil_update(uid, profil_changes, change_timestamp) VALUES('ma0594', '{\"test\":\"data\"}', NOW());";
+		$qry = "INSERT INTO public.tbl_cis_profil_update(uid, profil_data, profil_changes, change_timestamp) VALUES('ma0594','{\"test\":\"data\"}', NOW());";
 
 		if(!$db->db_query($qry))
 			echo '<strong>Prüfungstyp: '.$db->db_last_error().'</strong><br>';
 		else
 			echo '<br>test eintrag in public.tbl_cis_profil_update hinzugefügt';
-	}
\ No newline at end of file
+	}   */
+
+
+    //! was used to add an extra column to the table after the table was already created
+    /* 
+    
+    if(!$result = @$db->db_query("SELECT profil_data FROM public.tbl_cis_profil_update LIMIT 1"))
+    {
+        $qry = "ALTER TABLE public.tbl_cis_profil_update ADD COLUMN profil_data jsonb;";
+
+        if(!$db->db_query($qry))
+            echo '<strong>public.tbl_cis_profil_update: '.$db->db_last_error().'</strong><br>';
+        else
+            echo '<br>public.tbl_cis_profil_update: Spalte profil_data hinzugefuegt';
+    } */
\ No newline at end of file

From 83335d6d30ff239330449551ea19575ddc3fea9e Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 9 Jan 2024 12:55:35 +0100
Subject: [PATCH 0297/1461] neue Component File, filehandling mit datatransfer

---
 .../controllers/components/stv/Notiz.php      | 84 +++++--------------
 application/models/person/Notiz_model.php     |  8 +-
 public/js/components/Form/Upload/File.js      | 51 +++++++++++
 .../js/components/Form/Upload/SingleFile.js   | 36 --------
 public/js/components/Notiz/Notiz.js           | 82 +++++++++++-------
 .../Studentenverwaltung/Details/Notizen.js    | 58 ++++++++-----
 6 files changed, 167 insertions(+), 152 deletions(-)
 create mode 100644 public/js/components/Form/Upload/File.js
 delete mode 100644 public/js/components/Form/Upload/SingleFile.js

diff --git a/application/controllers/components/stv/Notiz.php b/application/controllers/components/stv/Notiz.php
index 3ec8b6f26..73c06ba86 100644
--- a/application/controllers/components/stv/Notiz.php
+++ b/application/controllers/components/stv/Notiz.php
@@ -62,50 +62,23 @@ class Notiz extends FHC_Controller
 	public function addNewNotiz($id)
 	{
 		$this->load->library('form_validation');
-		$dms_id = null;
+		//$_POST = json_decode($this->input->raw_input_stream, true);
 
-		//DMS-Logik zum Speichern des Anhangs
-/*		var_dump("im Backend: addNewNotiz, dmslogik");
-		var_dump($_FILES);*/
+		//TODO(Manu) Validation
 
+		$this->form_validation->set_rules('titel', 'titel', 'required');
+		$this->form_validation->set_rules('text', 'Text', 'required');
+
+		//TODO(Manu) form validation - schon für type hier?,
 		$this->load->library('DmsLib');
-
-
-
-
-
 		$uid = getAuthUID();
 
-		//single
-		$dms_id = null;
-		$dms = array(
-			'kategorie_kurzbz'  => 'notiz',
-			'version'           => 0,
-			'name'              => $_FILES["anhang"]["name"],
-			'mimetype'          => $_FILES["anhang"]["type"],
-			'insertamum'        => date('c'),
-			'insertvon'         => $uid
-		);
-
-		//var_dump($dms);
-
-		$result = $this->dmslib->upload($dms, 'anhang', array('pdf'));
-		//var_dump($result);
-
-		if (isSuccess($result))
-		{
-			//TODO(Manu) change to array
-			$dms_id = $result->retval['dms_id'];
-		}
-
-		//var_dump($dms_id);
-
-/*		//multiple files
+		//multiple files
 		$dms_id = [];
-		foreach ($_FILES as $file)
+		foreach ($_FILES as $k => $file)
 		{
-			//var_dump($file["name"]);
-			var_dump($file);
+/*			var_dump($file["name"]);
+			var_dump($file);*/
 			$dms = array(
 				'kategorie_kurzbz'  => 'notiz',
 				'version'           => 0,
@@ -115,26 +88,27 @@ class Notiz extends FHC_Controller
 				'insertvon'         => $uid
 			);
 
-			$result = $this->dmslib->upload($dms, 'file', array('pdf'));
-			var_dump($result);
+			$result = $this->dmslib->upload($dms, $k, array('pdf'));
 
 			if (isSuccess($result))
 			{
 				//TODO(Manu) change to array
 				$dms_id[] = $result->retval['dms_id'];
 			}
+/*			else {
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+
+				//TODO(manu) error handling
+				//feedback, dass ein File nicht erfolgreich gespeichert werden konnte
+				//$this->outputJson($result);
+				//$this->outputJsonError(['filetype nicht erlaubt' => getError($result)]);
+			}*/
 
 
 		}
 
-		var_dump($dms_id);
-		return;*/
-
-
 		$this->load->model('person/Notiz_model', 'NotizModel');
 
-		//var_dump($_POST);
-
 		$uid = getAuthUID();
 		$titel = isset($_POST['titel']) ? $_POST['titel'] : null;
 		$text = isset($_POST['text']) ? $_POST['text'] : null;
@@ -180,30 +154,12 @@ class Notiz extends FHC_Controller
 
 
 		//Todo(manu) multiple files
+		// mit id_type
 		$result = $this->NotizModel->addNotizForType($type, $id, $titel, $text, $uid, $dms_id, $start, $ende, $erledigt, $verfasser_uid, $bearbeiter_uid);
 
 		//vorher
 		//$result = $this->NotizModel->addNotizForPersonWithDoc($id, $titel, $text, $erledigt, $verfasser_uid, $start, $ende, $dms_id);
 
-
-
-
-	//	var_dump($result);
-
-/*		$result = $this->NotizModel->insert(
-			[
-				'titel' => $titel,
-				'text' =>  $text,
-				'insertvon' => $uid,
-				'insertamum' => date('c'),
-				'verfasser_uid' => $verfasser_uid,
-				'bearbeiter_uid' => $bearbeiter_uid,
-				'start' => $start,
-				'ende' => $ende,
-				'erledigt' => $_POST['erledigt'],
-				//'dms_id' => $dms_id
-			]
-		);*/
 		if (isError($result))
 		{
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
diff --git a/application/models/person/Notiz_model.php b/application/models/person/Notiz_model.php
index 141065c87..3a4888f38 100644
--- a/application/models/person/Notiz_model.php
+++ b/application/models/person/Notiz_model.php
@@ -162,7 +162,13 @@ class Notiz_model extends DB_Model
 				// Loads model Notizdokument_model
 				$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
 				//Todo(manu) change for multiple files
-				$result = $this->NotizdokumentModel->insert(array('notiz_id' => $notiz_id, 'dms_id' => $dms_id));
+				foreach ($dms_id as $file)
+				{
+					$result = $this->NotizdokumentModel->insert(array('notiz_id' => $notiz_id, 'dms_id' => $file));
+				}
+
+				//single File
+				//$result = $this->NotizdokumentModel->insert(array('notiz_id' => $notiz_id, 'dms_id' => $dms_id));
 			}
 
 			if ($type == 'person')
diff --git a/public/js/components/Form/Upload/File.js b/public/js/components/Form/Upload/File.js
new file mode 100644
index 000000000..0394afd42
--- /dev/null
+++ b/public/js/components/Form/Upload/File.js
@@ -0,0 +1,51 @@
+export default {
+	props: [
+		'dateien',
+		'multiupload'
+	],
+	computed: {
+		intDateien:{
+			get() {
+				return this.dateien;
+			},
+			set(value) {
+				this.$emit('update:dateien', value);
+			}
+		},
+	},
+	methods: {
+		handleFileChange(event) {
+			this.intDateien = event.target.files;
+		},
+		deleteFile(id) {
+			const dt = new DataTransfer();
+			const files = this.$refs.upload.files;
+
+			for (let i = 0; i < files.length; i++) {
+				const file = files[i];
+				if (id !== i)
+					dt.items.add(file);
+			}
+
+			this.$refs.upload.files = dt.files;
+			this.$emit('update:dateien', dt.files);
+		}
+	},
+	template: `		
+		<span v-if="multiupload">
+		  	<input type="file" multiple ref="upload" @change="handleFileChange" v-model="dateien"/>								
+		</span>
+		<span v-else>
+			<input type="file" ref="upload" @change="handleFileChange" v-model="dateien"/>
+		</span>
+		
+		<span>					
+			<ul>							
+				<li v-for="(datei,index) in dateien">
+					<button>{{datei.name}}</button><button class="text-danger" @click="deleteFile(index)">X</button>
+				</li>
+			</ul>
+		</span>
+</div>
+</template>`
+}
\ No newline at end of file
diff --git a/public/js/components/Form/Upload/SingleFile.js b/public/js/components/Form/Upload/SingleFile.js
deleted file mode 100644
index 74c60fcb8..000000000
--- a/public/js/components/Form/Upload/SingleFile.js
+++ /dev/null
@@ -1,36 +0,0 @@
-export default {
-	data() {
-		return {
-			file: null,
-		};
-	},
-	methods: {
-		handleFileChange(event) {
-			this.file = event.target.files[0];
-		},
-		uploadFile() {
-			if (this.file) {
-				// You can perform your file upload logic here
-				console.log('Uploading file:', this.file);
-				// Reset the file input
-				this.$refs.fileInput.value = '';
-				this.file = null;
-			} else {
-				console.error('No file selected');
-			}
-		},
-	},
-};
-template: `
-	<div>
-		<h2>File Upload</h2>
-		<form
-		@submit.prevent="uploadFile">
-		<input type="file" ref="fileInput" @change="handleFileChange" />
-		<button type="submit">Upload</button>
-	</form>
-	<div v-if="file">
-		<p>Selected File: {{file.name}}</p>
-	</div>
-</div>
-</template>`
\ No newline at end of file
diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index d61483a0c..64430294f 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -1,11 +1,10 @@
 import VueDatePicker from '../vueDatepicker.js.php';
-//import SingleFile from '../Form/Upload/SingleFile.js';
+import File from '../Form/Upload/File.js';
 
 export default {
 	components: {
 		VueDatePicker,
-		//BsModal
-		//SingleFile
+		File
 	},
 	props: [
 		'typeId',
@@ -22,6 +21,11 @@ export default {
 		'showDocument',
 		'anhang'
 		],
+	data(){
+		return {
+			multiupload: true
+		}
+	},
 	computed: {
 		intTitel: {
 			get() {
@@ -103,26 +107,45 @@ export default {
 		}
 	},*/
 	methods: {
-		handleFileChange(event) {
-			//single
-			this.intAnhang = event.target.files[0];
-
-			//multiple not working
-			//this.intAnhang = event.target.files;
+/*		handleFileChange(event) {
+			this.intAnhang = event.target.files;
+		},*/
+		reset() {
+			this.$refs.form.reset();
+			//this.$emit('update:anhang', dt.files);
 		},
+/*		deleteFile(id){
+			//console.log("Delete file with id " + id );
+
+			//console.log(this.intAnhang[id]);
+
+			const dt = new DataTransfer();
+			const files = this.$refs.upload.files;
+
+			for (let i = 0; i < files.length; i++) {
+				const file = files[i];
+				if (id !== i)
+					dt.items.add(file); // here you exclude the file. thus removing it.
+			}
+
+			this.$refs.upload.files = dt.files; // Assign the updates list
+			this.$emit('update:anhang', dt.files);
+		}*/
 	},
+
 	template: `
 <div>
-
-component: {{intTitel}} {{intVon}} || {{intAnhang.name}} {{intAnhang}} {{typeId}}
-	<form class="row">
+	<form ref="form" @submit.prevent class="row">
 		<div>
 			<div class="row mb-3">
-				<b>{{action}}</b>
+				<b>{{action}}
+				<div class="col-sm-7">
+					</b><span class="small">[{{this.typeId}}]</span>
+				</div>	
 			</div>
-			<div>
+<!--			<div>
 				<p>Zuordnung {{this.typeId}}</p>
-			</div>
+			</div>-->
 			<div class="notizTitle row mb-3">
 				<label for="titel" class="form-label col-sm-2">Titel</label>
 				<div class="col-sm-7">
@@ -143,29 +166,30 @@ component: {{intTitel}} {{intVon}} || {{intAnhang.name}} {{intAnhang}} {{typeId}
 				<div class="row mb-3">
 					<label for="text" class="form-label col-sm-2">Dokument</label>
 					
-					<!--Todo(Manu) Component SingleFile-->
-					<!--<single-file id="file" v-model="intDocument"></single-file>-->
+				<!-- Component File-->
+				<div  class="col-sm-7">		
+					<File ref="upload" id="file" :multiupload="multiupload" v-model:dateien="intAnhang" ></File>
+				</div>
 
-					<div  class="col-sm-7">					
+<!--					<div  class="col-sm-7">					
 						<span>
-						  <input type="file" multiple ref="fileInput" @change="handleFileChange" v-model="intAnhang"/>
-	<!--      							<button type="submit">Upload</button>-->
-								<div v-if="intAnhang.name">
-								  <p>Selected File: {{ intAnhang.name }}</p>
-								  <button class="text-danger">X</button>
-								</div>
+						
+						  <input ref="upload" type="file" multiple ref="fileInput" @change="handleFileChange" v-model="intAnhang"/>
+													
 						</span>
 						
-<!--						Anzeige outputs-->
 						<span >					
 							<ul>							
-								<li v-for="anh in anhang">
-									<button>{{anh.name}}</button><button class="text-danger">X</button>
+								<li v-for="(anh,index) in intAnhang">
+									<button>{{anh.name}}</button><button class="text-danger" @click="deleteFile(index)">X {{index}}</button>
 								</li>
 							</ul>
 						</span>
 					</div>
-				</div>
+				</div>-->
+				
+				<hr>
+
 				
 			</slot>
 	</div>	
@@ -175,7 +199,7 @@ component: {{intTitel}} {{intVon}} || {{intAnhang.name}} {{intAnhang}} {{typeId}
 				<div class="row mb-3">
 					<label for="bis" class="form-label col-sm-2">VerfasserIn</label>
 					<div class="col-sm-7">
-						<input type="text" v-model="intVerfasser" class="form-contrsol">	
+						<input type="text" v-model="intVerfasser" class="form-control">	
 						{{uid}}
 					</div>
 				</div>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
index 29efb8078..ee203efc6 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
@@ -30,8 +30,8 @@ export default {
 					{title: "Text", field: "text", width: 350},
 					{title: "VerfasserIn", field: "verfasser_uid"},
 					{title: "BearbeiterIn", field: "bearbeiter_uid", visible: false},
-					{title: "Start", field: "start"},
-					{title: "Ende", field: "ende"},
+					{title: "Start", field: "start", visible: false},
+					{title: "Ende", field: "ende", visible: false},
 /*					{title: "Dokumente", field: "dms_id"},*/
 					{title: "Dokumente", field: "countdoc"},
 					{title: "Erledigt", field: "erledigt"},
@@ -71,7 +71,7 @@ export default {
 				bearbeiter: null,
 				anhang: []
 			},
-			showErweitert: true,
+			showErweitert: false,
 			showDocument: true,
 
 		}
@@ -104,7 +104,8 @@ export default {
 			});
 		},
 		actionNewNotiz(){
-			this.formData.typeId = 'person';
+			this.resetFormData();
+/*			this.formData.typeId = 'person';
 			this.formData.titel = '';
 			this.formData.action = 'Neue Notiz2';
 			this.formData.text = null;
@@ -114,14 +115,24 @@ export default {
 			this.formData.erledigt = false;
 			this.formData.verfasser = null;
 			this.formData.bearbeiter = null;
-			this.formData.anhang = [];
+			this.formData.anhang = [];*/
 		},
 		addNewNotiz(notizData) {
 /*			console.log("here: anhang noch empty");
 			console.log(this.formData);*/
+
 			const formData = new FormData();
 
-			Object.entries(this.formData).forEach(([k, v]) => formData.append(k, v));
+			//working with single files
+		//	Object.entries(this.formData).forEach(([k, v]) => formData.append(k, v));
+
+			//multiple files
+			//console.log(this.formData.anhang);
+			Object.entries(this.formData).forEach(([k, v]) => {
+				if(k!= 'anhang')
+					formData.append(k, v);
+			});
+			Object.entries(this.formData.anhang).forEach(([k, v]) => formData.append(k, v));
 
 /*			for( var i = 0; i < this.formData.anhang.length; i++ ){
 				let file = this.formData.anhang[i];
@@ -129,8 +140,8 @@ export default {
 				formData.append('files[' + i + ']', file);
 			}*/
 
-			console.log("after append");
-			console.log(formData);
+/*			console.log("after append");
+			console.log(this.formData);*/
 			CoreRESTClient.post('components/stv/Notiz/addNewNotiz/' + this.modelValue.person_id,
 				formData,
 				{ Headers: { "Content-Type": "multipart/form-data" } }
@@ -152,9 +163,6 @@ export default {
 				window.scrollTo(0, 0);
 			});
 		},
-		attachFile(){
-			console.log("ATTACH FILE");
-		},
 		deleteNotiz(notiz_id){
 			CoreRESTClient.post('components/stv/Notiz/deleteNotiz/' + notiz_id)
 				.then(response => {
@@ -208,16 +216,21 @@ export default {
 			this.$refs.table.reloadTable();
 		},
 		resetFormData(){
-			this.formData.titel = null;
-			this.formData.text = null;
-			this.formData.von = null;
-			this.formData.bis = null;
-			this.formData.document = null;
-			this.formData.erledigt = false;
-			this.formData.verfasser = null;
-			this.formData.bearbeiter = null;
-			this.formData.anhang = [];
-			//this.formData.anhang = {};
+			this.$refs.form.reset();
+			//sicherstellen, dass über props nur leere felder übergeben werden
+			this.formData = {
+				typeId: 'person',
+					titel: null,
+					action: 'Neue Notiz',
+					text: null,
+					von: null,
+					bis: null,
+					document: null,
+					erledigt: false,
+					verfasser: null,
+					bearbeiter: null,
+					anhang: []
+			};
 		},
 		updateNotiz(notiz_id){
 			CoreRESTClient.post('components/stv/Notiz/updateNotiz/' + notiz_id,
@@ -274,6 +287,7 @@ export default {
 	<br>	
 	<hr>
 		<Notiz 
+			ref="form"
 			:showErweitert="showErweitert"
 			:showDocument="showDocument"
 			v-model:typeId="formData.typeId"
@@ -295,7 +309,7 @@ export default {
 		
 		
 		<div>
-			parent: {{formData.anhang}} {{formData.typeId}} | {{formData.anhang.name}}
+<!--			PARENT: {{formData.anhang}} {{formData.typeId}} | single: {{formData.anhang.name}} , multi: {{formData.anhang}} <span v-for="(anhang,index) in formData.anhang"> {{anhang.name}} {{index}}<br></span> ref: {{formData.ref}}-->
 		</div>
 	</div>
 `

From a3f9e19bd68ff893573c4d4354c54a3bbb606c71 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 9 Jan 2024 13:22:37 +0100
Subject: [PATCH 0298/1461] =?UTF-8?q?Noten=20manuell=20=C3=A4ndern?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controllers/components/stv/Noten.php      | 127 +++++++++++++++++-
 .../education/Lehrveranstaltung_model.php     |   7 +
 .../models/organisation/Studienplan_model.php |  13 ++
 .../Details/Noten/Zeugnis.js                  |  17 ++-
 .../Details/Noten/Zeugnis/Actions.js          |  54 ++++++++
 5 files changed, 216 insertions(+), 2 deletions(-)
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis/Actions.js

diff --git a/application/controllers/components/stv/Noten.php b/application/controllers/components/stv/Noten.php
index 6ba5863c5..dfde2892b 100644
--- a/application/controllers/components/stv/Noten.php
+++ b/application/controllers/components/stv/Noten.php
@@ -7,13 +7,29 @@ class Noten extends Auth_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'getZeugnis' => 'student/noten:r'
+			'get' => 'student/noten:r',
+			'getZeugnis' => 'student/noten:r',
+			'update' => ['admin:w', 'assistenz:w']
 		]);
 
 		// Load Libraries
 		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
 	}
 
+	public function get()
+	{
+		$this->load->model('codex/Note_model', 'NoteModel');
+
+		$result = $this->NoteModel->addOrder('note');
+		
+		$result = $this->NoteModel->load();
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+		}
+		
+		return $this->outputJson($result);
+	}
+
 	public function getZeugnis($prestudent_id)
 	{
 		$this->load->model('crm/Student_model', 'StudentModel');
@@ -40,4 +56,113 @@ class Noten extends Auth_Controller
 		
 		return $this->outputJson($result);
 	}
+
+	public function update()
+	{
+		$this->load->model('crm/Student_model', 'StudentModel');
+		$this->load->model('organisation/Studienplan_model', 'StudienplanModel');
+		$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+		$this->load->model('education/Zeugnisnote_model', 'ZeugnisnoteModel');
+
+		$this->load->library('form_validation');
+
+		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+		
+		if (empty($_POST) || !is_array(current($_POST))) {
+			$result = $this->hasPermissionUpdate($this->input->post('lehrveranstaltung_id'), $this->input->post('student_uid'));
+			if (isError($result)) {
+				$this->output->set_status_header(REST_Controller::HTTP_FORBIDDEN);
+				return $this->outputJson($result);
+			}
+
+			$this->form_validation->set_rules('lehrveranstaltung_id', 'Lehrverantaltung ID', 'required|numeric');
+			$this->form_validation->set_rules('student_uid', 'Student UID', 'required');
+			$this->form_validation->set_rules('studiensemester_kurzbz', 'Studiensemester Kurzbezeichnung', 'required');
+			$this->form_validation->set_rules('note', 'Note', 'required|numeric');
+			$post = [$_POST];
+		} else {
+			foreach ($_POST as $i => $data) {
+				$lvid = isset($data['lehrveranstaltung_id']) ? $data['lehrveranstaltung_id'] : null;
+				$uid = isset($data['student_uid']) ? $data['student_uid'] : null;
+				$result = $this->hasPermissionUpdate($lvid, $uid);
+				if (isError($result)) {
+					$this->output->set_status_header(REST_Controller::HTTP_FORBIDDEN);
+					return $this->outputJson($result);
+				}
+
+				$this->form_validation->set_rules($i . '[lehrveranstaltung_id]', '#' . $i . ' Lehrverantaltung ID', 'required|numeric');
+				$this->form_validation->set_rules($i . '[student_uid]', '#' . $i . ' Student UID', 'required');
+				$this->form_validation->set_rules($i . '[studiensemester_kurzbz]', '#' . $i . ' Studiensemester Kurzbezeichnung', 'required');
+				$this->form_validation->set_rules($i . '[note]', '#' . $i . ' Note', 'required|numeric');
+			}
+			$post = $_POST;
+		}
+		if ($this->form_validation->run() == false) {
+			$this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST);
+			return $this->outputJsonError($this->form_validation->error_array());
+		}
+
+		$final_result = success();
+		$this->ZeugnisnoteModel->db->trans_start();
+
+		foreach ($post as $i => $data) {
+			$note = $data['note'];
+			unset($data['note']);
+			$result = $this->ZeugnisnoteModel->update($data, [
+				'note' => $note,
+				'benotungsdatum' => date('c'),
+				'updateamum' => date('c'),
+				'updatevon' => getAuthUID()
+			]);
+			if (isError($result)) {
+				$final_result = $result;
+				break;
+			}
+		}
+
+		$this->ZeugnisnoteModel->db->trans_complete();
+
+		if (isError($final_result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+		}
+
+		$this->outputJson($final_result);
+	}
+
+	protected function hasPermissionUpdate($lehrveranstaltung_id, $student_uid)
+	{
+		// TODO(chris): error phrases!
+		if ($lehrveranstaltung_id === null || $student_uid === null)
+			return success();
+		$result = $this->StudentModel->load([$student_uid]);
+		if (isError($result))
+			return $result;
+		if (!hasData($result))
+			return error('Fehler beim Ermitteln des Studenten');
+		$student = current(getData($result));
+
+		if ($this->permissionlib->isBerechtigt('admin', 'suid', $student->studiengang_kz))
+			return success();
+		if ($this->permissionlib->isBerechtigt('assistenz', 'suid', $student->studiengang_kz))
+			return success();
+
+		$result = $this->StudienplanModel->getAllOesForLv($lehrveranstaltung_id);
+		if (isError($result))
+			return $result;
+		$oes = getData($result) ?: [];
+		$result = $this->LehrveranstaltungModel->getStg($lehrveranstaltung_id);
+		if (isError($result))
+			return $result;
+		if (hasData($result))
+			$oes[] = current(getData($result));
+
+		foreach ($oes as $oe) {
+			if ($this->permissionlib->isBerechtigt('admin', 'suid', $oe->oe_kurzbz))
+				return success();
+			if ($this->permissionlib->isBerechtigt('assistenz', 'suid', $oe->oe_kurzbz))
+				return success();
+		}
+
+		return error('Forbidden');
+	}
 }
diff --git a/application/models/education/Lehrveranstaltung_model.php b/application/models/education/Lehrveranstaltung_model.php
index 1f1b90131..cefd147b9 100644
--- a/application/models/education/Lehrveranstaltung_model.php
+++ b/application/models/education/Lehrveranstaltung_model.php
@@ -493,4 +493,11 @@ class Lehrveranstaltung_model extends DB_Model
 
         return $this->execQuery($qry, array($student_uid));
     }
+
+    public function getStg($lehrveranstaltung_id)
+    {
+    	$this->addSelect('stg.*');
+    	$this->addJoin('public.tbl_studiengang stg', 'studiengang_kz');
+    	return $this->load($lehrveranstaltung_id);
+    }
 }
diff --git a/application/models/organisation/Studienplan_model.php b/application/models/organisation/Studienplan_model.php
index 66ec06ba8..b68f74bd8 100644
--- a/application/models/organisation/Studienplan_model.php
+++ b/application/models/organisation/Studienplan_model.php
@@ -90,4 +90,17 @@ class Studienplan_model extends DB_Model
 			'tbl_studienplan_lehrveranstaltung.semester' => $semester
 		));
 	}
+
+	public function getAllOesForLv($lehrveranstaltung_id)
+	{
+		$this->addDistinct('oe_kurzbz');
+
+		$this->addJoin('lehre.tbl_studienplan_lehrveranstaltung lv', 'studienplan_id');
+		$this->addJoin('lehre.tbl_studienordnung', 'studienordnung_id');
+		$this->addJoin('public.tbl_studiengang', 'studiengang_kz');
+
+		return $this->loadWhere([
+			'lv.lehrveranstaltung_id' => $lehrveranstaltung_id
+		]);
+	}
 }
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js
index 8dcc52d96..95875f868 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js
@@ -1,9 +1,11 @@
 import {CoreFilterCmpt} from "../../../../filter/Filter.js";
 import {CoreRESTClient} from '../../../../../RESTClient.js';
+import ZeugnisActions from './Zeugnis/Actions.js';
 
 export default {
 	components: {
-		CoreFilterCmpt
+		CoreFilterCmpt,
+		ZeugnisActions
 	},
 	props: {
 		student: Object
@@ -51,10 +53,20 @@ export default {
 				],
 				layout: 'fitDataStretch',
 				height: '100%',
+				selectable: true,
+				selectableRangeMode: 'click',
 				persistence: true
 			};
 		}
 	},
+	methods: {
+		setGrades(selected) {
+			CoreRESTClient
+				.post('components/stv/Noten/update', selected)
+				.then(this.$refs.table.reloadTable)
+				.catch(this.$fhcAlert.handleFormValidation);
+		}
+	},
 	template: `
 	<div class="stv-details-noten-zeugnis h-100 d-flex flex-column">
 		<div v-if="!validStudent">Kein Student</div>
@@ -67,6 +79,9 @@ export default {
 			:side-menu="false"
 			reload
 			>
+			<template #actions="{selected}">
+				<zeugnis-actions :selected="selected" @set-grades="setGrades"></zeugnis-actions>
+			</template>
 		</core-filter-cmpt>
 	</div>`
 };
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis/Actions.js b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis/Actions.js
new file mode 100644
index 000000000..7e8e2cbe5
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis/Actions.js
@@ -0,0 +1,54 @@
+import {CoreRESTClient} from '../../../../../../RESTClient.js';
+
+export default {
+	emits: [
+		'setGrades'
+	],
+	props: {
+		selected: Array
+	},
+	data() {
+		return {
+			grades: []
+		};
+	},
+	computed: {
+		current: {
+			get() {
+				if (!this.selected.length)
+					return '';
+				if (this.selected.length == 1)
+					return this.selected[0].note;
+				const grades = Object.keys(this.selected.reduce((a,c) => {
+					a[c.note] = true;
+					return a;
+				}, {}));
+				if (grades.length == 1)
+					return grades[0];
+				return '';
+			},
+			set(note) {
+				this.$emit('setGrades', this.selected.map(zeugnis => {
+					const { lehrveranstaltung_id, uid: student_uid, studiensemester_kurzbz } = zeugnis;
+					return { lehrveranstaltung_id, student_uid, studiensemester_kurzbz, note };
+				}));
+			}
+		}
+	},
+	created() {
+		CoreRESTClient
+			.get('components/stv/Noten/get')
+			.then(result => result.data)
+			.then(result => {
+				this.grades = result.retval;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+	},
+	template: `
+	<div class="stv-details-noten-zeugnis-actions">
+		<select class="form-select" v-model="current" :disabled="!selected.length">
+			<option value="" disabled>Note setzen</option>
+			<option v-for="grade in grades" :key="grade.note" :value="grade.note">{{ grade.bezeichnung }}</option>
+		</select>
+	</div>`
+};
\ No newline at end of file

From b1d8a2f5a47fd040ed0a98b33895b8c50ceede6d Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 9 Jan 2024 15:51:50 +0100
Subject: [PATCH 0299/1461] adds topic field to the cis_profil_update table and
 changes the layout of the editProfil Modul

---
 application/controllers/Cis/Profil.php        |  49 +++--
 public/js/apps/api/userdata.js                |   5 +-
 public/js/components/Cis/Profil/EditProfil.js | 188 +++++++-----------
 .../Cis/Profil/MitarbeiterProfil.js           |  44 +++-
 .../js/components/Cis/Profil/oldAccordion.txt |  57 ++++++
 system/dbupdate_3.4.php                       |   2 +-
 system/dbupdate_3.4/25999_C4_ma0594.php       |  35 +---
 7 files changed, 211 insertions(+), 169 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index da601b890..f606484ea 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -70,17 +70,28 @@ class Profil extends Auth_Controller
 	public function editProfil()
 	{
 
-		$json = $this->input->raw_input_stream;
+		$json = json_decode($this->input->raw_input_stream);
 		
 
-		$data = ["uid" => $this->uid, "requested_change" => $json, "change_timestamp" => "NOW()"];
+		$data = ["uid" => $this->uid, "requested_change" => json_encode($json->payload), "change_timestamp" => "NOW()", "topic"=>$json->topic];
 
 		//? gets all the requested changes from a user
 		$res = $this->ProfilChangeModel->loadWhere(["uid"=>$this->uid]);
 		$res = hasData($res) ? getData($res) : null;
+
+		//? checks if the user already made a request to change a topic
+		//! which is an constraint added to the public.tbl_cis_profil_update table
+		foreach($res as $update_request){
+			if($update_request->topic == $json->topic && $update_request->uid == $this->uid){
+				
+				echo json_encode(error("uid and topic combination exists already"));
+				return;
+			}
+		}
 		
 		
 			$insert_res = $this->ProfilChangeModel->insert($data);
+			
 		
 			if(isError($insert_res)){
 				//catch error
@@ -504,13 +515,15 @@ class Profil extends Auth_Controller
 		}
 
 
-		//? querying if the user already has a pending profil information update request
-		/* $editData_res = $this->ProfilChangeModel->load([$this->uid]);
-		if(isError($editData_res)){
+		//? querying if the user has profil update requests
+		$profilUpdates = $this->ProfilChangeModel->loadWhere(["uid"=>$this->uid]);
+		if(isError($profilUpdates)){
 			//error handling
 		}else{
-			$editData_res = hasData($editData_res) ? getData($editData_res)[0] : null;
-		} */
+			//? array containing all the requested profil information changes from the current user
+			$profilUpdates = hasData($profilUpdates) ? getData($profilUpdates) : null;
+			
+		} 
 
 		$res = new stdClass();
 		$res->foto = $person_res->foto;
@@ -551,9 +564,8 @@ class Profil extends Auth_Controller
 		//telefon nummer von dem Standort
 		$res->standort_telefon = $telefon_res;
 
-		/* $res->editData = $editData_res? json_decode($editData_res->profil_data): null;
-		$res->editDataTimestamp = $editData_res? date_create($editData_res->change_timestamp)->format('d/m/Y') : null;
-		 */
+		$res->profilUpdates = $profilUpdates?: null;
+		
 
 		return $res;
 	}
@@ -707,13 +719,15 @@ class Profil extends Auth_Controller
 			}
 		}
 
-		//? querying if the user already has a pending profil information update request
-		/* $editData_res = $this->ProfilChangeModel->load([$this->uid]);
-		if(isError($editData_res)){
+		//? querying if the user has profil update requests
+		$profilUpdates = $this->ProfilChangeModel->loadWhere(["uid"=>$this->uid]);
+		if(isError($profilUpdates)){
 			//error handling
 		}else{
-			$editData_res = hasData($editData_res) ? getData($editData_res)[0] : null;
-		} */
+			//? array containing all the requested profil information changes from the current user
+			$profilUpdates = hasData($profilUpdates) ? getData($profilUpdates) : null;
+			
+		} 
 
 
 		$res = new stdClass();
@@ -752,9 +766,8 @@ class Profil extends Auth_Controller
 
 
 		$res->mailverteiler = $mailverteiler_res;
-		/* $res->editData = $editData_res? json_decode($editData_res->profil_data): null;
-		$res->editDataTimestamp = $editData_res? date_create($editData_res->change_timestamp)->format('d/m/Y'): null;
-		 */
+		$res->profilUpdates = $profilUpdates?: null;
+		
 		return $res;
 
 
diff --git a/public/js/apps/api/userdata.js b/public/js/apps/api/userdata.js
index bb0309423..fb3a68a42 100644
--- a/public/js/apps/api/userdata.js
+++ b/public/js/apps/api/userdata.js
@@ -3,10 +3,11 @@ export default {
 
     //! API Calls for Profil Views
 
-    editProfil: function(payload) {
+    editProfil: function(topic, payload) {
         const url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router+
                    `/Cis/Profil/editProfil`;
-        return axios.post(url,payload);
+                   
+        return axios.post(url,{topic, payload});
     },
 
     getEditProfil: function() {
diff --git a/public/js/components/Cis/Profil/EditProfil.js b/public/js/components/Cis/Profil/EditProfil.js
index b6363077b..02cdbfbca 100644
--- a/public/js/components/Cis/Profil/EditProfil.js
+++ b/public/js/components/Cis/Profil/EditProfil.js
@@ -1,6 +1,6 @@
 import BsModal from "../../Bootstrap/Modal.js";
 import Alert from "../../Bootstrap/Alert.js";
-const infos = {};
+
 
 export default {
   components: {
@@ -27,93 +27,50 @@ export default {
   },
   data() {
     return {
-    selection: null,
-    propertySelection:true,
-    selectedProperty:null,
-    inputField:null,
-    detailSelection:false,
-    editData: this.value,
-    //? tracks what specific profil data was changed
-    changesData: {},
-    editTimestamp: this.timestamp,
-    selectionOrder: {firstSelect: true, secondSelect:false},
+      topic:null,
+      firstSelectedOption:null,
+      secondSelectedOption: null,
+      secondSelectedOptionIndex: null,
     
-    result: true,
-    info: null,
-  }
- 
+    
+      inputField:null,
+      
+      editData: this.value,
+      //? tracks what specific profil data was changed
+      changesData: {},
+      editTimestamp: this.timestamp,
+      
+      result: true,
+      info: null,
+    }
   },
 
   methods: {
+    
 
-    formSelection: function(selection){
-      
-      if(Array.isArray(selection)){
-        return ['a','b'];
-      }else if(typeof(selection) === 'object'){
-        console.log(selection);
-        return Object.keys(selection);
-
-      }else{
-        // it is not an array or and object
-        return null;
-      }
+    createDeepCopy: function(object){
+      //? using Vue.toRaw because deep clones with structuredClone can not be done on proxies
+      return structuredClone(Vue.toRaw(object));
     },
-     
-    updateData: function(event,key,ArrayKey,ObjectKey=null){
 
-      const cleanUpObjectProperties= () => {
-        Object.entries(this.changesData).forEach( ([property, value]) => { if(!Object.keys(value).length) delete this.changesData[property]; })
-      }
-      
-      let newValue = event.target.value;
-      if(!this.changesData[key]){
-        Array.isArray(this.editData[key])? this.changesData[key] = [] : this.changesData[key] = {};
-      } 
-      
-      if(Array.isArray(this.editData[key])){
-        if(newValue.length > 0) this.editData[key][ArrayKey][ObjectKey]= newValue;
-          
-        else this.editData[key][ArrayKey][ObjectKey]= null;
+    changeInput: function(event, inputField,index){
+      let newValue = event.target.value? event.target.value: null;
+      inputField[index] = newValue; 
 
-        let Obj = {key:ArrayKey, new: this.editData[key][ArrayKey], old: JSON.parse(this.originalEditData)[key][ArrayKey]};
-
-        
-        if(JSON.stringify(this.editData[key][ArrayKey]) === JSON.stringify(JSON.parse(this.originalEditData)[key][ArrayKey]) ){
-            this.changesData[key] = this.changesData[key].filter( arrayElement => arrayElement.key !== ArrayKey );
-            cleanUpObjectProperties();
-        }else{
-          if(!this.changesData[key].filter( arrayElement => arrayElement.key === ArrayKey ).length){
-            this.changesData[key].push(Obj);
-          }
-          
-        }
-      }else{
-        if(newValue.length > 0) this.editData[key][ArrayKey]= newValue;
-          
-        else this.editData[key][ArrayKey]= null;
-
-        let Obj = { new: this.editData[key][ArrayKey], old: JSON.parse(this.originalEditData)[key][ArrayKey]};
-
-        
-        if(JSON.stringify(this.editData[key][ArrayKey]) === JSON.stringify(JSON.parse(this.originalEditData)[key][ArrayKey])){
-          delete this.changesData[key][ArrayKey];
-          cleanUpObjectProperties();
-        }else{
-          this.changesData[key][ArrayKey]= Obj;
-        }
-
-      }
-      
-     
     },
+
+
+     
+    
     submitProfilChange(){
       
      
+        //* only inserts new row if the inputField value is different from the original value
+        if(this.isInputFieldChanged && this.topic){
+
         //? inserts new row in public.tbl_cis_profil_update 
-
-
-        Vue.$fhcapi.UserData.editProfil(this.inputField).then((res)=>{
+      
+        Vue.$fhcapi.UserData.editProfil(this.topic,this.inputField).then((res)=>{
           this.result = {
             editData: this.editData,
             timestamp: res.data.retval,
@@ -129,54 +86,34 @@ export default {
           //
         });
      
-      
+      }
     },
   },
   computed: {
 
+    isInputFieldChanged: function(){
+      if(this.inputField){
+        return JSON.stringify(this.inputField) !== JSON.stringify(this.secondSelectedOption);
+      }
+      return false;
+    },
+
     firstSelection(){
       return Object.keys(this.value);
     },
 
     secondSelection(){
-      switch(this.selectedProperty){
-        case "Personen_Informationen": return Object.keys(this.editData[this.selectedProperty]);
-        case "Private_Kontakte": return this.editData[this.selectedProperty];
-        case "Private_Adressen": return this.editData[this.selectedProperty];
+      switch(this.firstSelectedOption){
+        case "Personen_Informationen": return Object.keys(this.editData[this.firstSelectedOption]);
+        case "Private_Kontakte": return this.editData[this.firstSelectedOption];
+        case "Private_Adressen": return this.editData[this.firstSelectedOption];
         default: return [];
       }
     },
 
   
-
-    
-   
-    
-      isEditDataChanged(){
-        return this.originalEditData != JSON.stringify(this.editData)
-      },
   },
   created() {
-    this.originalEditData = JSON.stringify(this.editData);
-    
-    /* 
-    if (infos[this.lehrveranstaltung_id]) {
-      this.info = infos[this.lehrveranstaltung_id];
-    } else {
-      axios
-        .get(
-          FHC_JS_DATA_STORAGE_OBJECT.app_root +
-          FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-          "/components/Cis/Mylv/Info/" +
-          this.studien_semester +
-          "/" +
-          this.lehrveranstaltung_id
-        )
-        .then((res) => {
-          this.info = infos[this.lehrveranstaltung_id] = res.data.retval || [];
-        })
-        .catch(() => (this.info = {}));
-    } */
   },
   mounted() {
     this.modal = this.$refs.modalContainer.modal;
@@ -192,19 +129,35 @@ export default {
     </template>
     <template v-slot:default>
 
-    
+    <!-- Breadcrumbs -->
+    <nav aria-label="breadcrumb">
+      <ol class="breadcrumb">
+        <li class="breadcrumb-item" v-if="firstSelectedOption">{{firstSelectedOption}}</li>
+        <li class="breadcrumb-item" v-if="secondSelectedOption" >{{firstSelectedOption ==="Personen_Informationen" ? Object.keys(secondSelectedOption)[0] : secondSelectedOptionIndex+1 }}</li>
+        <!--<li class="breadcrumb-item" aria-current="page">Drei</li>-->
+      </ol>
+    </nav>
 
-    <select v-if="!selectedProperty"  class="form-select" size="3" aria-label="size 3 select example">
-      <option @click="selectedProperty=option;  " v-for="option in firstSelection" :value="option">{{option}}</option>
+
+    <select v-if="!firstSelectedOption" v-model="firstSelectedOption"  class="form-select" size="3" aria-label="size 3 select example">
+      <option  v-for="option in firstSelection" :value="option">{{option}}</option>
     </select>
 
-    <select v-if="selectedProperty && !inputField" class="form-select" size="3" aria-label="size 3 select example">
+    <select v-if="firstSelectedOption && !secondSelectedOption" class="form-select" size="3" aria-label="size 3 select example">
       <option @click="
-      if(Array.isArray(editData[selectedProperty])){
-        inputField=option
+      
+      if(Array.isArray(editData[firstSelectedOption])){
+        secondSelectedOptionIndex = index;
+        secondSelectedOption = createDeepCopy(option);
+        inputField= createDeepCopy(option);
+        //* topic is the property in which the array is stored when it is an array
+        topic = firstSelectedOption;
       }else{
-        inputField={[option]:editData[selectedProperty][option]};
-      }" v-for="option in secondSelection" :value="option"><div v-if="typeof(option)==='object'"><p v-for="(value,property) in option">{{property}}:{{value}}</p></div><template v-else>{{option}}</template></option>
+        secondSelectedOption={[option]:editData[firstSelectedOption][option]};
+        inputField={[option]:editData[firstSelectedOption][option]};
+        //* topic is the selected property if is an object
+        topic = option;
+      }" v-for="(option, index) in secondSelection" :value="option"><div v-if="typeof(option)==='object'"><span class="m-2 d-block" v-for="(value,property) in option">{{property}}:{{value}}</span></div><template v-else>{{option}}</template></option>
     </select>
     <div v-if="inputField">
     <div v-for="(field,index) in inputField">
@@ -212,7 +165,7 @@ export default {
     <div class="form-underline">
     <div class="form-underline-titel">{{index}}</div>
 
-    <input  class="form-control" :id="index" v-model="inputField[index]" :placeholder="field">
+    <input  class="form-control" :id="index" :value="inputField[index]" @input="changeInput($event,inputField,index)" :placeholder="field">
     </div>
     
       </div>
@@ -225,9 +178,10 @@ export default {
     </template>
     <!-- optional footer -->
     <template   v-slot:footer>
+      <button class="btn btn-outline-danger " @click="hide">Abbrechen</button>
       <p v-if="editTimestamp" class="flex-fill">Letzte Anfrage: {{editTimestamp}}</p>
     
-      <button  @click="submitProfilChange" role="button" class="btn btn-primary">Senden</button>
+      <button v-if="isInputFieldChanged"  @click="submitProfilChange" role="button" class="btn btn-primary">Senden</button>
     </template>
     <!-- end of optional footer --> 
   </bs-modal>`,
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 279b3bd76..fbec823b1 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -303,7 +303,7 @@ export default {
           <!-- HIDDEN QUICK LINKS -->
               <div  class="d-md-none col-12 ">
              
-              <div class="row py-2">
+              <div class="row mb-3">
               <div class="col">
                 <p class="m-0">
                 <div class="card">
@@ -328,8 +328,25 @@ export default {
               </div>
             </div>
 
+            <!-- HERE STARTS THE ROW WITH REQUESTED CHANGES FROM THE USER -->
+            <div class="row mb-3">
+            <div class="col">
+              <div class="card">
+              <div class="card-header">
+              Profil Informations Änderungen Anfragen</div>
+              <div class="card-body">
+              <p v-for="update in data.profilUpdates">{{update.requested_change}}</p>
               </div>
-              <!-- END OF HIDDEN QUCK LINKS -->
+              </div>
+             
+            </div>
+          </div>
+
+            
+
+              </div>
+              
+              <!-- END OF HIDDEN ROW (HIDDEN IN VIEWPORTS GREATER THEN-EQUAL MD) -->
 
 
             
@@ -771,8 +788,27 @@ export default {
 
               <!-- START OF THE FIRDT ROW IN THE SIDE PANEL -->
               <!-- THESE QUCK LINKS ARE ONLY VISIBLE UNTIL VIEWPORT MD -->
-                <div  class="row d-none d-md-block mb-3">
-                  <div class="col">
+              <div  class="row d-none d-md-block mb-3">
+              <div class="col mb-3">
+                 
+                    <div class="card">
+                      <div class="card-header">
+                      Something else
+                      </div>
+                      <div class="card-body">
+                      
+                       <p v-for="update in data.profilUpdates">{{JSON.stringify(update)}}</p>
+                      </div>
+                    </div>
+
+                   
+                      
+                  
+                  </div>    
+                  </div>
+              <div  class="row d-none d-md-block mb-3">
+                
+                <div class="col">
                  
                     <div class="card">
                       <div class="card-header">
diff --git a/public/js/components/Cis/Profil/oldAccordion.txt b/public/js/components/Cis/Profil/oldAccordion.txt
index 733ecafd2..9581f5846 100644
--- a/public/js/components/Cis/Profil/oldAccordion.txt
+++ b/public/js/components/Cis/Profil/oldAccordion.txt
@@ -1,3 +1,60 @@
+
+// Legacy function that constructed a result object where the old and the new versions of the changed data was stored
+updateData: function(event,key,ArrayKey,ObjectKey=null){
+
+      const cleanUpObjectProperties= () => {
+        Object.entries(this.changesData).forEach( ([property, value]) => { if(!Object.keys(value).length) delete this.changesData[property]; })
+      }
+      
+      let newValue = event.target.value;
+      if(!this.changesData[key]){
+        Array.isArray(this.editData[key])? this.changesData[key] = [] : this.changesData[key] = {};
+      } 
+      
+      if(Array.isArray(this.editData[key])){
+        if(newValue.length > 0) this.editData[key][ArrayKey][ObjectKey]= newValue;
+          
+        else this.editData[key][ArrayKey][ObjectKey]= null;
+
+        let Obj = {key:ArrayKey, new: this.editData[key][ArrayKey], old: JSON.parse(this.originalEditData)[key][ArrayKey]};
+
+        
+        if(JSON.stringify(this.editData[key][ArrayKey]) === JSON.stringify(JSON.parse(this.originalEditData)[key][ArrayKey]) ){
+            this.changesData[key] = this.changesData[key].filter( arrayElement => arrayElement.key !== ArrayKey );
+            cleanUpObjectProperties();
+        }else{
+          if(!this.changesData[key].filter( arrayElement => arrayElement.key === ArrayKey ).length){
+            this.changesData[key].push(Obj);
+          }
+          
+        }
+      }else{
+        if(newValue.length > 0) this.editData[key][ArrayKey]= newValue;
+          
+        else this.editData[key][ArrayKey]= null;
+
+        let Obj = { new: this.editData[key][ArrayKey], old: JSON.parse(this.originalEditData)[key][ArrayKey]};
+
+        
+        if(JSON.stringify(this.editData[key][ArrayKey]) === JSON.stringify(JSON.parse(this.originalEditData)[key][ArrayKey])){
+          delete this.changesData[key][ArrayKey];
+          cleanUpObjectProperties();
+        }else{
+          this.changesData[key][ArrayKey]= Obj;
+        }
+
+      }
+      
+     
+    },
+
+
+
+
+
+
+    
+
 <!-- START OF THE ACCORDION
  
 <pre>{{JSON.stringify(changesData,null,2)}}</pre>
diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index 523017bbf..060238d46 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -223,7 +223,7 @@ $tabellen=array(
 	"public.tbl_benutzerfunktion"  => array("benutzerfunktion_id","fachbereich_kurzbz","uid","oe_kurzbz","funktion_kurzbz","semester", "datum_von","datum_bis", "updateamum","updatevon","insertamum","insertvon","ext_id","bezeichnung","wochenstunden"),
 	"public.tbl_benutzergruppe"  => array("uid","gruppe_kurzbz","studiensemester_kurzbz","updateamum","updatevon","insertamum","insertvon","ext_id"),
 	"public.tbl_bewerbungstermine" => array("bewerbungstermin_id","studiengang_kz","studiensemester_kurzbz","beginn","ende","nachfrist","nachfrist_ende","anmerkung", "insertamum", "insertvon", "updateamum", "updatevon","studienplan_id","nationengruppe_kurzbz"),
-	"public.tbl_cis_profil_update" => array("profil_update_id","uid","requested_change","change_timestamp"),
+	"public.tbl_cis_profil_update" => array("profil_update_id","topic","uid","requested_change","change_timestamp"),
 	"public.tbl_buchungstyp"  => array("buchungstyp_kurzbz","beschreibung","standardbetrag","standardtext","aktiv","credit_points"),
 	"public.tbl_dokument"  => array("dokument_kurzbz","bezeichnung","ext_id","bezeichnung_mehrsprachig","dokumentbeschreibung_mehrsprachig","ausstellungsdetails"),
 	"public.tbl_dokumentprestudent"  => array("dokument_kurzbz","prestudent_id","mitarbeiter_uid","datum","updateamum","updatevon","insertamum","insertvon","ext_id"),
diff --git a/system/dbupdate_3.4/25999_C4_ma0594.php b/system/dbupdate_3.4/25999_C4_ma0594.php
index 34c1b1db1..eea45c0f1 100644
--- a/system/dbupdate_3.4/25999_C4_ma0594.php
+++ b/system/dbupdate_3.4/25999_C4_ma0594.php
@@ -4,6 +4,7 @@
     {
         $qry = "CREATE TABLE public.tbl_cis_profil_update (
                 profil_update_id INTEGER NOT NULL,
+                topic VARCHAR(32) NOT NULL,
                 uid VARCHAR(32) NOT NULL,
                 requested_change jsonb NOT NULL,
                 change_timestamp TIMESTAMP NOT NULL,
@@ -16,8 +17,9 @@
 			 NO MAXVALUE
 			 NO MINVALUE
 			 CACHE 1;
+             
 		    ALTER TABLE public.tbl_cis_profil_update ALTER COLUMN profil_update_id SET DEFAULT nextval('public.tbl_cis_profil_update_id_seq');
-
+            ALTER TABLE public.tbl_cis_profil_update ADD CONSTRAINT cis_profil_udpate_topic_uid_unique UNIQUE (uid,topic);
 
             GRANT SELECT, INSERT, UPDATE, DELETE ON public.tbl_cis_profil_update TO vilesci;
             GRANT SELECT, INSERT, UPDATE, DELETE ON public.tbl_cis_profil_update TO web; 
@@ -31,35 +33,14 @@
             echo '<br>public.tbl_cis_profil_update: table created';
     }
 
-    /* else{
-        $qry = "DROP TABLE public.tbl_cis_profil_update;";
-        if(!$db->db_query($qry))
-            echo '<strong> was not able to delete public.tbl_cis_profil_update: '.$db->db_last_error().'</strong><br>';
-        else
-            echo '<br>public.tbl_cis_profil_update: table deleted';
-    } */
-
-
-    /* if($db->db_num_rows($result)==0)
-	{
-		$qry = "INSERT INTO public.tbl_cis_profil_update(uid, profil_data, profil_changes, change_timestamp) VALUES('ma0594','{\"test\":\"data\"}', NOW());";
-
-		if(!$db->db_query($qry))
-			echo '<strong>Prüfungstyp: '.$db->db_last_error().'</strong><br>';
-		else
-			echo '<br>test eintrag in public.tbl_cis_profil_update hinzugefügt';
-	}   */
-
-
-    //! was used to add an extra column to the table after the table was already created
-    /* 
     
-    if(!$result = @$db->db_query("SELECT profil_data FROM public.tbl_cis_profil_update LIMIT 1"))
+    //? would add a column if the column is missing in the table
+  /*   if(!$result = @$db->db_query("SELECT topic FROM public.tbl_cis_profil_update LIMIT 1"))
     {
-        $qry = "ALTER TABLE public.tbl_cis_profil_update ADD COLUMN profil_data jsonb;";
+        $qry = "ALTER TABLE public.tbl_cis_profil_update ADD COLUMN topic varchar(32) NOT NULL;";
 
         if(!$db->db_query($qry))
             echo '<strong>public.tbl_cis_profil_update: '.$db->db_last_error().'</strong><br>';
         else
-            echo '<br>public.tbl_cis_profil_update: Spalte profil_data hinzugefuegt';
-    } */
\ No newline at end of file
+            echo '<br>public.tbl_cis_profil_update: Spalte topic hinzugefuegt';
+    }  */
\ No newline at end of file

From 284351a0242bd7240fc5760ac4094e847cfea043 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 9 Jan 2024 16:39:38 +0100
Subject: [PATCH 0300/1461] bugfix format date vuedatepicker

---
 .../controllers/components/stv/Notiz.php      | 54 ++-----------
 public/js/components/Notiz/Notiz.js           | 78 +++++++------------
 .../Studentenverwaltung/Details/Notizen.js    | 49 ++++++++----
 3 files changed, 69 insertions(+), 112 deletions(-)

diff --git a/application/controllers/components/stv/Notiz.php b/application/controllers/components/stv/Notiz.php
index 73c06ba86..f9145bdcc 100644
--- a/application/controllers/components/stv/Notiz.php
+++ b/application/controllers/components/stv/Notiz.php
@@ -77,8 +77,6 @@ class Notiz extends FHC_Controller
 		$dms_id = [];
 		foreach ($_FILES as $k => $file)
 		{
-/*			var_dump($file["name"]);
-			var_dump($file);*/
 			$dms = array(
 				'kategorie_kurzbz'  => 'notiz',
 				'version'           => 0,
@@ -92,7 +90,6 @@ class Notiz extends FHC_Controller
 
 			if (isSuccess($result))
 			{
-				//TODO(Manu) change to array
 				$dms_id[] = $result->retval['dms_id'];
 			}
 /*			else {
@@ -117,49 +114,12 @@ class Notiz extends FHC_Controller
 		$erledigt = $_POST['erledigt'];
 		$type = $_POST['typeId'];
 
-		/*		$start = isset($_POST['bis']) ? ($_POST['bis'] : null;
-		$ende = isset($_POST['bis']) ? $_POST['bis'] : null;*/
+		//get rid of null value error
+		$start = $this->input->post(date('von'));
+		$ende = $this->input->post(date('bis'));
 
-
-		if(isset($_POST['von']))
-		{
-/*			$date = $_POST['von'];
-			$date = DateTime::createFromFormat('F-d-Y h:i A',$date);
-			var_dump($date);
-			$timestamp = strtotime($_POST['von']);
-			$start = date('Y-m-d', $timestamp);*/
-
-/*			$dateString = $_POST['von'];
-			$myDateTime = DateTime::createFromFormat('Y-m-d', $dateString);
-			$start= $myDateTime->format('Y-m-d');*/
-
-			//Todo(manu) check input format datepicker.. auch ohne null!!!
-			$start = '2023-01-01';
-		}
-		else
-			$start = null;
-
-
-		if(isset($_POST['bis']))
-		{
-			//Todo(manu) check input format datepicker
-/*			$ende = strtotime($_POST['bis']);
-			$ende = new DateTime($ende);
-			$ende = $ende->format('Y-m-d');*/
-
-			$ende = '2023-01-01';
-		}
-		else
-			$ende = null;
-
-
-		//Todo(manu) multiple files
-		// mit id_type
 		$result = $this->NotizModel->addNotizForType($type, $id, $titel, $text, $uid, $dms_id, $start, $ende, $erledigt, $verfasser_uid, $bearbeiter_uid);
 
-		//vorher
-		//$result = $this->NotizModel->addNotizForPersonWithDoc($id, $titel, $text, $erledigt, $verfasser_uid, $start, $ende, $dms_id);
-
 		if (isError($result))
 		{
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
@@ -172,7 +132,7 @@ class Notiz extends FHC_Controller
 	{
 		$uid = getAuthUID();
 		$this->load->library('form_validation');
-		$_POST = json_decode($this->input->raw_input_stream, true);
+		//$_POST = json_decode($this->input->raw_input_stream, true);
 
 		$this->form_validation->set_rules('titel', 'titel', 'required');
 		$this->form_validation->set_rules('text', 'Text', 'required');
@@ -195,9 +155,11 @@ class Notiz extends FHC_Controller
 		$text = isset($_POST['text']) ? $_POST['text'] : null;
 		$verfasser_uid = isset($_POST['verfasser_uid']) ? $_POST['verfasser_uid'] : null;
 		$bearbeiter_uid = $uid;
-		$start = isset($_POST['von']) ? new DateTime($_POST['von']) : null;
-		$ende = isset($_POST['bis']) ? new DateTime($_POST['bis']) : null;
 		$erledigt = $_POST['erledigt'];
+		$start = $this->input->post(date('von'));
+		$ende = $this->input->post(date('bis'));
+
+
 
 		$result = $this->NotizModel->update(
 			[
diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index 64430294f..38b1ca22c 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -48,7 +48,8 @@ export default {
 				return this.von;
 			},
 			set(value) {
-				this.$emit('update:von', value);
+				const tempVon = new Date(value).toISOString().split('T')[0];
+				this.$emit('update:von', tempVon);
 			}
 		},
 		intBis: {
@@ -56,7 +57,8 @@ export default {
 				return this.bis;
 			},
 			set(value) {
-				this.$emit('update:bis', value);
+				const tempBis = new Date(value).toISOString().split('T')[0];
+				this.$emit('update:bis', tempBis);
 			}
 		},
 		intDocument: {
@@ -101,36 +103,11 @@ export default {
 			}
 		}
 	},
-/*	mounted(){
-		showZuordnung(){
-			this.idTyp = 'Person';
-		}
-	},*/
 	methods: {
-/*		handleFileChange(event) {
-			this.intAnhang = event.target.files;
-		},*/
 		reset() {
 			this.$refs.form.reset();
 			//this.$emit('update:anhang', dt.files);
 		},
-/*		deleteFile(id){
-			//console.log("Delete file with id " + id );
-
-			//console.log(this.intAnhang[id]);
-
-			const dt = new DataTransfer();
-			const files = this.$refs.upload.files;
-
-			for (let i = 0; i < files.length; i++) {
-				const file = files[i];
-				if (id !== i)
-					dt.items.add(file); // here you exclude the file. thus removing it.
-			}
-
-			this.$refs.upload.files = dt.files; // Assign the updates list
-			this.$emit('update:anhang', dt.files);
-		}*/
 	},
 
 	template: `
@@ -143,9 +120,7 @@ export default {
 					</b><span class="small">[{{this.typeId}}]</span>
 				</div>	
 			</div>
-<!--			<div>
-				<p>Zuordnung {{this.typeId}}</p>
-			</div>-->
+
 			<div class="notizTitle row mb-3">
 				<label for="titel" class="form-label col-sm-2">Titel</label>
 				<div class="col-sm-7">
@@ -170,24 +145,7 @@ export default {
 				<div  class="col-sm-7">		
 					<File ref="upload" id="file" :multiupload="multiupload" v-model:dateien="intAnhang" ></File>
 				</div>
-
-<!--					<div  class="col-sm-7">					
-						<span>
-						
-						  <input ref="upload" type="file" multiple ref="fileInput" @change="handleFileChange" v-model="intAnhang"/>
-													
-						</span>
-						
-						<span >					
-							<ul>							
-								<li v-for="(anh,index) in intAnhang">
-									<button>{{anh.name}}</button><button class="text-danger" @click="deleteFile(index)">X {{index}}</button>
-								</li>
-							</ul>
-						</span>
-					</div>
-				</div>-->
-				
+			
 				<hr>
 
 				
@@ -196,7 +154,8 @@ export default {
 
 		<div v-if="showErweitert">
 			<slot name="erweitert">	
-				<div class="row mb-3">
+				
+<!--				<div class="row mb-3">
 					<label for="bis" class="form-label col-sm-2">VerfasserIn</label>
 					<div class="col-sm-7">
 						<input type="text" v-model="intVerfasser" class="form-control">	
@@ -209,17 +168,31 @@ export default {
 					<div class="col-sm-7">
 						<input type="text" v-model="intBearbeiter" class="form-control">	
 					</div>
-				</div>
+				</div>-->
 							
 				<div class="row mb-3">
 					<label for="von" class="form-label col-sm-2">von</label>
 					<div class="col-sm-2">
-						<vue-date-picker id="von" v-model="intVon" clearable="false" auto-apply enable-time-picker="true" format="dd.MM.yyyy" preview-format="dd.MM.yyyy"></vue-date-picker>
+						<vue-date-picker 
+							id="von" 
+							v-model="intVon" 
+							clearable="false" 
+							auto-apply
+							:enable-time-picker="false"
+							format="dd.MM.yyyy" 
+							preview-format="dd.MM.yyyy"></vue-date-picker>
 					</div>
 	
 					<label for="bis" class="form-label col-sm-1">bis</label>
 					<div class="col-sm-2">
-						<vue-date-picker id="bis" v-model="intBis" clearable="false" auto-apply enable-time-picker="true" format="dd.MM.yyyy" preview-format="dd.MM.yyyy"></vue-date-picker>
+						<vue-date-picker 
+							id="bis" 
+							v-model="intBis" 
+							clearable="false" 
+							auto-apply 
+							:enable-time-picker="false"
+							format="dd.MM.yyyy" 
+							preview-format="dd.MM.yyyy"></vue-date-picker>
 					</div>
 	
 					<label for="bis" class="form-label col-sm-1">erledigt</label>
@@ -233,6 +206,7 @@ export default {
 		
 		
 	</form>
+	
 </div>`
 }
 
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
index ee203efc6..b6bb9e3ec 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
@@ -28,7 +28,7 @@ export default {
 				columns: [
 					{title: "Titel", field: "titel"},
 					{title: "Text", field: "text", width: 350},
-					{title: "VerfasserIn", field: "verfasser_uid"},
+					{title: "VerfasserIn", field: "verfasser_uid", visible: false},
 					{title: "BearbeiterIn", field: "bearbeiter_uid", visible: false},
 					{title: "Start", field: "start", visible: false},
 					{title: "Ende", field: "ende", visible: false},
@@ -71,7 +71,7 @@ export default {
 				bearbeiter: null,
 				anhang: []
 			},
-			showErweitert: false,
+			showErweitert: true,
 			showDocument: true,
 
 		}
@@ -105,7 +105,7 @@ export default {
 		},
 		actionNewNotiz(){
 			this.resetFormData();
-/*			this.formData.typeId = 'person';
+			this.formData.typeId = 'person';
 			this.formData.titel = '';
 			this.formData.action = 'Neue Notiz2';
 			this.formData.text = null;
@@ -115,7 +115,7 @@ export default {
 			this.formData.erledigt = false;
 			this.formData.verfasser = null;
 			this.formData.bearbeiter = null;
-			this.formData.anhang = [];*/
+			this.formData.anhang = [];
 		},
 		addNewNotiz(notizData) {
 /*			console.log("here: anhang noch empty");
@@ -134,14 +134,6 @@ export default {
 			});
 			Object.entries(this.formData.anhang).forEach(([k, v]) => formData.append(k, v));
 
-/*			for( var i = 0; i < this.formData.anhang.length; i++ ){
-				let file = this.formData.anhang[i];
-
-				formData.append('files[' + i + ']', file);
-			}*/
-
-/*			console.log("after append");
-			console.log(this.formData);*/
 			CoreRESTClient.post('components/stv/Notiz/addNewNotiz/' + this.modelValue.person_id,
 				formData,
 				{ Headers: { "Content-Type": "multipart/form-data" } }
@@ -232,7 +224,7 @@ export default {
 					anhang: []
 			};
 		},
-		updateNotiz(notiz_id){
+/*		updateNotiz(notiz_id){
 			CoreRESTClient.post('components/stv/Notiz/updateNotiz/' + notiz_id,
 				this.formData
 			).then(response => {
@@ -254,6 +246,35 @@ export default {
 				window.scrollTo(0, 0);
 				//this.reload();
 			});
+		},*/
+		updateNotiz(notiz_id){
+			const formData = new FormData();
+			Object.entries(this.formData).forEach(([k, v]) => {
+				if(k!= 'anhang')
+					formData.append(k, v);
+			});
+			Object.entries(this.formData.anhang).forEach(([k, v]) => formData.append(k, v));
+
+			CoreRESTClient.post('components/stv/Notiz/updateNotiz/' + notiz_id,
+				formData,
+				{ Headers: { "Content-Type": "multipart/form-data" } }
+			).then(response => {
+				if (!response.data.error) {
+					this.$fhcAlert.alertSuccess('Update von neuer Notiz erfolgreich');
+					this.resetFormData();
+					this.reload();
+				} else {
+					const errorData = response.data.retval;
+					Object.entries(errorData).forEach(entry => {
+						const [key, value] = entry;
+						this.$fhcAlert.alertError(value);
+					});
+				}
+			}).catch(error => {
+				this.$fhcAlert.alertError('Fehler bei Updateroutine aufgetreten');
+			}).finally(() => {
+				window.scrollTo(0, 0);
+			});
 		},
 	},
 	template: `
@@ -305,7 +326,7 @@ export default {
 		</Notiz>
 			
 		<button v-if="formData.action === 'Neue Notiz'"  type="button" class="btn btn-primary" @click="addNewNotiz()"> Neu anlegen </button>
-		<button v-else type="button" class="btn btn-warning" @click="updateNotiz(notizen.notiz_id)"> Speichern </button>
+		<button v-else type="button" class="btn btn-primary" @click="updateNotiz(notizen.notiz_id)"> Speichern </button>
 		
 		
 		<div>

From 75ce2a0aa81fd28e34a0c7fa362e60ed9ab32009 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 10 Jan 2024 09:11:24 +0100
Subject: [PATCH 0301/1461] Shows Select option names without _

---
 public/js/components/Cis/Profil/EditProfil.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Cis/Profil/EditProfil.js b/public/js/components/Cis/Profil/EditProfil.js
index 02cdbfbca..af03df11f 100644
--- a/public/js/components/Cis/Profil/EditProfil.js
+++ b/public/js/components/Cis/Profil/EditProfil.js
@@ -140,7 +140,7 @@ export default {
 
 
     <select v-if="!firstSelectedOption" v-model="firstSelectedOption"  class="form-select" size="3" aria-label="size 3 select example">
-      <option  v-for="option in firstSelection" :value="option">{{option}}</option>
+      <option  v-for="(option,index) in firstSelection" :value="option">{{option.replace("_"," ")}}</option>
     </select>
 
     <select v-if="firstSelectedOption && !secondSelectedOption" class="form-select" size="3" aria-label="size 3 select example">
@@ -157,7 +157,15 @@ export default {
         inputField={[option]:editData[firstSelectedOption][option]};
         //* topic is the selected property if is an object
         topic = option;
-      }" v-for="(option, index) in secondSelection" :value="option"><div v-if="typeof(option)==='object'"><span class="m-2 d-block" v-for="(value,property) in option">{{property}}:{{value}}</span></div><template v-else>{{option}}</template></option>
+      }" v-for="(option, index) in secondSelection" :value="option"><div v-if="typeof(option)==='object'">
+      <div class="row m-2" v-for="(value,property) in option">
+      <div class="col"><span>{{property}}</span></div>
+      <div class="col"><span>{{value}}</span></div>
+      
+      </div>
+      </div>
+      <template v-else>{{option}}</template>
+      </option>
     </select>
     <div v-if="inputField">
     <div v-for="(field,index) in inputField">

From 751c1fd31ea4c6e1efbe885458b491217d587ebb Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 10 Jan 2024 14:51:28 +0100
Subject: [PATCH 0302/1461] Profile Image: Slash removed from path

---
 public/js/components/Stv/Studentenverwaltung/Details.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details.js b/public/js/components/Stv/Studentenverwaltung/Details.js
index 74e54cfe8..d502adc5e 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details.js
@@ -28,7 +28,7 @@ export default {
 		</div>
 		<div v-else class="d-flex flex-column h-100 pb-3">
 			<div class="d-flex justify-content-start align-items-center w-100 pb-3 gap-3" style="max-height:8rem">
-				<img v-for="student in students" :key="student.person_id" class="d-block h-100 rounded" alt="profilbild" :src="appRoot + '/cis/public/bild.php?src=person&person_id=' + student.person_id">
+				<img v-for="student in students" :key="student.person_id" class="d-block h-100 rounded" alt="profilbild" :src="appRoot + 'cis/public/bild.php?src=person&person_id=' + student.person_id">
 				<div v-if="students.length == 1">
 					<h2 class="h4">{{students[0].titlepre}} {{students[0].vorname}} {{students[0].nachname}} {{students[0].titlepost}}</h2>
 				</div>

From d3a3ebacfc7535cc4ebff2f6e63fe8ceaf7318ed Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 10 Jan 2024 15:02:11 +0100
Subject: [PATCH 0303/1461] first templates for the components Select and
 Breadcrumbs

---
 public/css/components/Profil.css              | 33 ++-----
 public/js/components/Cis/Profil/EditProfil.js | 34 ++++++--
 .../Cis/Profil/MitarbeiterProfil.js           | 11 +--
 .../js/components/Cis/Selection/Breadcrumb.js | 37 ++++++++
 public/js/components/Cis/Selection/Select.js  | 86 +++++++++++++++++++
 5 files changed, 165 insertions(+), 36 deletions(-)
 create mode 100644 public/js/components/Cis/Selection/Breadcrumb.js
 create mode 100644 public/js/components/Cis/Selection/Select.js

diff --git a/public/css/components/Profil.css b/public/css/components/Profil.css
index 7b13f048c..0138e5530 100644
--- a/public/css/components/Profil.css
+++ b/public/css/components/Profil.css
@@ -74,29 +74,12 @@
   padding-left: 0.5rem;
 }
 
-/*   dl {
-    width: 100%;
-    overflow: hidden;
-   
-    padding: 0;
-    margin: 0
-  }
-  dt {
-    float: left;
-    width: 35%;
-    
+
+option:checked{
+  background: linear-gradient(#005485, #005485);
+
+}
+
+#SelectStyle{
   
-   
-    padding: 0;
-    margin: 0
-  }
-  dd {
-    float: left;
-    width: 50%;
-   
-  
-    padding: 0;
-    margin: 0
-  }
- */
- 
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/public/js/components/Cis/Profil/EditProfil.js b/public/js/components/Cis/Profil/EditProfil.js
index af03df11f..fffef6d99 100644
--- a/public/js/components/Cis/Profil/EditProfil.js
+++ b/public/js/components/Cis/Profil/EditProfil.js
@@ -1,11 +1,14 @@
 import BsModal from "../../Bootstrap/Modal.js";
 import Alert from "../../Bootstrap/Alert.js";
-
+import BreadCrumb from "../Selection/Breadcrumb.js";
+import Select from "../Selection/Select.js";
 
 export default {
   components: {
     BsModal,
     Alert,
+    BreadCrumb,
+    Select,
   },
   mixins: [BsModal],
   props: {
@@ -27,6 +30,15 @@ export default {
   },
   data() {
     return {
+      propertySelected: false,
+      testValue:null,
+      testListe:{
+        privateInfo:{username:"hans33",Titel:"Doktor", Anrede:"Herr"},
+        privateKontakte:[{strasse:"strasse1",plz:100},{strasse:"strasse1",plz:100},{strasse:"strasse1",plz:100}],
+        privateAdressen:[{kontakt:"telefon",anmerkung:"1"},{kontakt:"email",anmerkung:"2"},{kontakt:"telefon",anmerkung:"3"}]
+      },
+
+
       topic:null,
       firstSelectedOption:null,
       secondSelectedOption: null,
@@ -47,7 +59,12 @@ export default {
 
   methods: {
     
-
+    testEvent: function(){
+      if(!this.propertySelected){
+        this.testListe = this.testListe[this.testValue];
+        this.propertySelected = true;
+      }
+    },
     createDeepCopy: function(object){
       //? using Vue.toRaw because deep clones with structuredClone can not be done on proxies
       return structuredClone(Vue.toRaw(object));
@@ -128,15 +145,20 @@ export default {
       {{"Profil bearbeiten" }}
     </template>
     <template v-slot:default>
-
-    <!-- Breadcrumbs -->
+    
+    <bread-crumb :list="['this','is a','test']" ></bread-crumb>
+    <p>{{testValue}}</p>
+    <Select ariaLabel="test" v-model="testValue" @select="testEvent" :list="testListe"></Select>
+    <!-- DONT FORGET TO UNCOMMENT THIS -->
+    <!-- Breadcrumbs 
     <nav aria-label="breadcrumb">
       <ol class="breadcrumb">
         <li class="breadcrumb-item" v-if="firstSelectedOption">{{firstSelectedOption}}</li>
         <li class="breadcrumb-item" v-if="secondSelectedOption" >{{firstSelectedOption ==="Personen_Informationen" ? Object.keys(secondSelectedOption)[0] : secondSelectedOptionIndex+1 }}</li>
-        <!--<li class="breadcrumb-item" aria-current="page">Drei</li>-->
+       
       </ol>
     </nav>
+    -->
 
 
     <select v-if="!firstSelectedOption" v-model="firstSelectedOption"  class="form-select" size="3" aria-label="size 3 select example">
@@ -187,7 +209,7 @@ export default {
     <!-- optional footer -->
     <template   v-slot:footer>
       <button class="btn btn-outline-danger " @click="hide">Abbrechen</button>
-      <p v-if="editTimestamp" class="flex-fill">Letzte Anfrage: {{editTimestamp}}</p>
+      <!--<p v-if="editTimestamp" class="flex-fill">Letzte Anfrage: {{editTimestamp}}</p>-->
     
       <button v-if="isInputFieldChanged"  @click="submitProfilChange" role="button" class="btn btn-primary">Senden</button>
     </template>
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index fbec823b1..8070f50d8 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -793,12 +793,13 @@ export default {
                  
                     <div class="card">
                       <div class="card-header">
-                      Something else
-                      </div>
-                      <div class="card-body">
-                      
-                       <p v-for="update in data.profilUpdates">{{JSON.stringify(update)}}</p>
+                      Profil Updates
                       </div>
+                      <div class="card-body d-flex justify-content-start flex-wrap">
+                      <!--  -->
+                  <button v-for="update in data.profilUpdates" class="btn m-1" :class="{'btn-outline-primary':(update.topic !== 'Private_Kontakte' || update.topic !== 'Private_Adressen'), 'btn-outline-danger':update.topic == 'Private_Kontakte', 'btn-outline-success':update.topic == 'Private_Adressen'}" ><i class="fa fa-edit"></i> {{update.topic}}</button>
+                        
+                       </div>
                     </div>
 
                    
diff --git a/public/js/components/Cis/Selection/Breadcrumb.js b/public/js/components/Cis/Selection/Breadcrumb.js
new file mode 100644
index 000000000..8a373e23a
--- /dev/null
+++ b/public/js/components/Cis/Selection/Breadcrumb.js
@@ -0,0 +1,37 @@
+
+
+export default {
+  components: {
+  },
+  props: {
+    //! this should throw an error in the js console, have to check later
+    list:Number,
+   
+  },
+  data() {
+    return {
+   
+    }
+  },
+
+  methods: {
+  },
+  computed: {
+    lastElement: function(){
+        return this.list[this.list.length-1];
+    }
+  },
+  created() {
+    
+  },
+  mounted() {
+  },
+  template: `
+  <nav aria-label="breadcrumb">
+  <ol class="breadcrumb">
+    <!-- https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Attributes/aria-current -->
+    <li class="breadcrumb-item"  :class="{'active':element===lastElement}" :aria-current="element===lastElement?'page':'false'" v-for="element in list">{{element}}</li>
+   
+  </ol>
+</nav>`,
+};
diff --git a/public/js/components/Cis/Selection/Select.js b/public/js/components/Cis/Selection/Select.js
new file mode 100644
index 000000000..59e039dea
--- /dev/null
+++ b/public/js/components/Cis/Selection/Select.js
@@ -0,0 +1,86 @@
+
+
+export default {
+    components: {
+    },
+    props: {
+
+      //! this should throw an error in the js console, have to check later
+      list:[Array,Object],
+      //? prop modelValue allows v-model on custom Components
+      modelValue:String,
+      //? Prop used to determine how many options the select should initially show
+      size:{
+        type:Number,
+        default: null,
+      },
+      //? Content for the aria label of the select
+      ariaLabel:{
+        type:String,
+        required:true,
+      },
+     
+    },
+    emits:{
+        //? update:modelValue event is needed to notify the v-model when the value has changed
+        ['update:modelValue']:null,
+        select:null,
+    },
+    data() {
+      return {
+        selectedOption: [],
+        optionLength:this.size,
+      }
+    },
+  
+    methods: {
+    },
+    computed: {
+      listLength: function(){
+        return this.list.length;
+      },
+      lastElement: function(){
+          return this.list[this.list.length-1];
+      },
+      computedList: function(){
+        if(Array.isArray(this.list)){
+            //? the passed data is an array
+            return this.list;
+        }else if(typeof(this.list) === 'object' && this.list !== null){
+            //? the passed data is an object
+            return Object.keys(this.list);
+        }else{
+            console.warn("The passed data is neither an Array or an Object");
+            return null;
+            //! the passed data is neither an object or an array
+        }
+        
+      }
+    },
+    created() {
+        console.log(this.optionLength);
+        //? sets the default length of the options to show equal to the number of elements in the list
+        if(!this.optionLength){
+            //? if it is an object, then it will take the length of the object keys, otherwise it takes the normal length
+            this.optionLength = this.computedList.length;
+        }
+    },
+    mounted() {
+    },
+    template: `
+    <p>size:{{optionLength}}</p>
+    <!-- styling des Selects und dessen Options könnte man noch anpassen -->
+    <div id="SelectStyle">
+    <select  v-model="selectedOption"  class="form-select" :size="this.optionLength" :aria-label="ariaLabel">
+      <option  @click="$emit('update:modelValue', option); $emit('select')" v-for="(option,index) in computedList" :value="option">
+        <template v-if="typeof(option) === 'object' && option !== null" >
+            <div class="row " v-for="(element,index) in option"><div class="col">{{index}} : </div><div class="col">{{element}}</div></div>
+        </template>
+        <template v-else >
+            {{option}}
+        </template>
+      </option>
+    </select>
+    </div>`,
+  };
+  
\ No newline at end of file

From db6e1add8a1233283e7c8fe913e3ee1fa13f0671 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 11 Jan 2024 07:37:46 +0100
Subject: [PATCH 0304/1461] refactoring Fkt addNewNotiz

---
 .../controllers/components/stv/Notiz.php      | 70 +++++++++++++++----
 application/models/person/Notiz_model.php     | 25 ++-----
 public/js/components/Form/Upload/File.js      |  1 +
 public/js/components/Notiz/Notiz.js           |  7 +-
 .../Studentenverwaltung/Details/Notizen.js    | 11 ++-
 5 files changed, 75 insertions(+), 39 deletions(-)

diff --git a/application/controllers/components/stv/Notiz.php b/application/controllers/components/stv/Notiz.php
index f9145bdcc..cdb15d9d3 100644
--- a/application/controllers/components/stv/Notiz.php
+++ b/application/controllers/components/stv/Notiz.php
@@ -61,20 +61,24 @@ class Notiz extends FHC_Controller
 
 	public function addNewNotiz($id)
 	{
-		$this->load->library('form_validation');
+		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
+		//$this->load->library('form_validation');
 		//$_POST = json_decode($this->input->raw_input_stream, true);
 
 		//TODO(Manu) Validation
 
-		$this->form_validation->set_rules('titel', 'titel', 'required');
-		$this->form_validation->set_rules('text', 'Text', 'required');
+/*		$this->form_validation->set_rules('titel', 'titel', 'required');
+		$this->form_validation->set_rules('text', 'Text', 'required');*/
 
 		//TODO(Manu) form validation - schon für type hier?,
+
+		//Speichern der Files
 		$this->load->library('DmsLib');
 		$uid = getAuthUID();
 
 		//multiple files
-		$dms_id = [];
+		$dms_id_arr = [];
+		$notiz_id = null;
 		foreach ($_FILES as $k => $file)
 		{
 			$dms = array(
@@ -90,7 +94,7 @@ class Notiz extends FHC_Controller
 
 			if (isSuccess($result))
 			{
-				$dms_id[] = $result->retval['dms_id'];
+				$dms_id_arr[] = $result->retval['dms_id'];
 			}
 /*			else {
 				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
@@ -104,27 +108,67 @@ class Notiz extends FHC_Controller
 
 		}
 
+		//Speichern der Notiz mit Notizzuordnung
 		$this->load->model('person/Notiz_model', 'NotizModel');
 
 		$uid = getAuthUID();
-		$titel = isset($_POST['titel']) ? $_POST['titel'] : null;
-		$text = isset($_POST['text']) ? $_POST['text'] : null;
-		$bearbeiter_uid = isset($_POST['bearbeiter_uid']) ? $_POST['bearbeiter_uid'] : null;
 		$verfasser_uid = isset($_POST['verfasser_uid']) ? $_POST['verfasser_uid'] : $uid;
-		$erledigt = $_POST['erledigt'];
-		$type = $_POST['typeId'];
+		$titel = $this->input->post('titel');
+		$text = $this->input->post('text');
+		$bearbeiter_uid = $this->input->post('bearbeiter_uid');
+		$erledigt = $this->input->post('erledigt');
+		$type = $this->input->post('typeId');
 
 		//get rid of null value error
 		$start = $this->input->post(date('von'));
 		$ende = $this->input->post(date('bis'));
 
-		$result = $this->NotizModel->addNotizForType($type, $id, $titel, $text, $uid, $dms_id, $start, $ende, $erledigt, $verfasser_uid, $bearbeiter_uid);
-
+		$result = $this->NotizModel->addNotizForType($type, $id, $titel, $text, $uid, $start, $ende, $erledigt, $verfasser_uid, $bearbeiter_uid);
 		if (isError($result))
 		{
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson($result);
+			return $this->outputJson(getError($result));
 		}
+		$notiz_id = $result->retval;
+
+		//Zuordnung speichern
+/*		$result = $this->NotizzuordnungModel->insert(array('notiz_id' => $notiz_id, $type=> $id));
+		if (isError($result))
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson(getError($result));
+		}*/
+
+
+		//Eintrag in Notizdokument speichern
+		if($dms_id_arr)
+		{
+			// Loads model Notizdokument_model
+			$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
+			//Todo(manu) change for multiple files
+			foreach($dms_id_arr as $dms_id)
+			{
+				$result = $this->NotizdokumentModel->insert(array('notiz_id' => $notiz_id, 'dms_id' => $dms_id));
+				if (isError($result))
+				{
+					$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+					return $this->outputJson(getError($result));
+				}
+			}
+
+		}
+
+
+
+
+		//$result = $this->NotizModel->addNotizForType($type, $id, $titel, $text, $uid, $dms_id, $start, $ende, $erledigt, $verfasser_uid, $bearbeiter_uid);
+/*
+		$result = $this->NotizModel->addNotizForPerson($id, $titel, $text, $erledigt, $verfasser_uid);
+		if (isError($result))
+		{
+			//$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson($result);
+		}*/
 		return $this->outputJsonSuccess(true);
 	}
 
diff --git a/application/models/person/Notiz_model.php b/application/models/person/Notiz_model.php
index 3a4888f38..17cf9a140 100644
--- a/application/models/person/Notiz_model.php
+++ b/application/models/person/Notiz_model.php
@@ -140,7 +140,7 @@ class Notiz_model extends DB_Model
 	 * @param id for Dokumentzuordnung (person_id, prestudent_id, uid, projekt_id...)
 	 * @param titel, text, start, ende, erledigt, verfasser_uid, bearbeiter_uid, insertvon Parameter for notiz
 	 */
-	public function addNotizForType($type, $id, $titel, $text, $insertvon, $dms_id=null, $start=null, $ende=null, $erledigt=false, $verfasser_uid=null, $bearbeiter_uid=null)
+	public function addNotizForType($type, $id, $titel, $text, $insertvon, $start=null, $ende=null, $erledigt=false, $verfasser_uid=null, $bearbeiter_uid=null)
 	{
 		// Loads model Notizzuordnung_model
 		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
@@ -153,30 +153,13 @@ class Notiz_model extends DB_Model
 
 		if (isSuccess($result))
 		{
-			//cases für alle types
-
 			$notiz_id = $result->retval;
 
-			if($dms_id)
+			if (isSuccess($result))
 			{
-				// Loads model Notizdokument_model
-				$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
-				//Todo(manu) change for multiple files
-				foreach ($dms_id as $file)
-				{
-					$result = $this->NotizdokumentModel->insert(array('notiz_id' => $notiz_id, 'dms_id' => $file));
-				}
-
-				//single File
-				//$result = $this->NotizdokumentModel->insert(array('notiz_id' => $notiz_id, 'dms_id' => $dms_id));
+				$notiz_id = $result->retval;
+				$result = $this->NotizzuordnungModel->insert(array('notiz_id' => $notiz_id, $type => $id));
 			}
-
-			if ($type == 'person')
-				$result = $this->NotizzuordnungModel->insert(array('notiz_id' => $notiz_id, 'person_id' => $id));
-			elseif ($type == 'prestudent')
-				$result = $this->NotizzuordnungModel->insert(array('notiz_id' => $notiz_id, 'prestudent_id' => $id));
-			else
-				$result = error($result->msg, "Type nicht vorhanden");
 		}
 
 		// Transaction complete!
diff --git a/public/js/components/Form/Upload/File.js b/public/js/components/Form/Upload/File.js
index 0394afd42..c84996e8d 100644
--- a/public/js/components/Form/Upload/File.js
+++ b/public/js/components/Form/Upload/File.js
@@ -32,6 +32,7 @@ export default {
 		}
 	},
 	template: `		
+		FILES: {{dateien}}
 		<span v-if="multiupload">
 		  	<input type="file" multiple ref="upload" @change="handleFileChange" v-model="dateien"/>								
 		</span>
diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index 38b1ca22c..ccbfaa548 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -98,7 +98,7 @@ export default {
 				return this.anhang;
 			},
 			set(value) {
-				console.log(value);
+				//console.log(value);
 				this.$emit('update:anhang', value);
 			}
 		}
@@ -106,12 +106,15 @@ export default {
 	methods: {
 		reset() {
 			this.$refs.form.reset();
-			//this.$emit('update:anhang', dt.files);
+			this.intAnhang = null;
+			this.$emit('update:anhang', []);
 		},
 	},
 
 	template: `
 <div>
+{{this.intAnhang}} 
+		<span v-for="(anhang,index) in intAnhang"> {{anhang.name}} {{index}}<br></span>
 	<form ref="form" @submit.prevent class="row">
 		<div>
 			<div class="row mb-3">
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
index b6bb9e3ec..678e3abe1 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
@@ -59,7 +59,7 @@ export default {
 			tabulatorEvents: [],
 			notizen: [],
 			formData: {
-				typeId: 'person',
+				typeId: 'person_id',
 				titel: null,
 				action: 'Neue Notiz',
 				text: null,
@@ -105,7 +105,7 @@ export default {
 		},
 		actionNewNotiz(){
 			this.resetFormData();
-			this.formData.typeId = 'person';
+			this.formData.typeId = 'person_id';
 			this.formData.titel = '';
 			this.formData.action = 'Neue Notiz2';
 			this.formData.text = null;
@@ -134,6 +134,9 @@ export default {
 			});
 			Object.entries(this.formData.anhang).forEach(([k, v]) => formData.append(k, v));
 
+			console.log(this.formData);
+			console.log(formData);
+
 			CoreRESTClient.post('components/stv/Notiz/addNewNotiz/' + this.modelValue.person_id,
 				formData,
 				{ Headers: { "Content-Type": "multipart/form-data" } }
@@ -211,7 +214,7 @@ export default {
 			this.$refs.form.reset();
 			//sicherstellen, dass über props nur leere felder übergeben werden
 			this.formData = {
-				typeId: 'person',
+				typeId: 'person_id',
 					titel: null,
 					action: 'Neue Notiz',
 					text: null,
@@ -330,6 +333,8 @@ export default {
 		
 		
 		<div>
+		Parent: {{formData.title}} {{formData.anhang}} || {{formData.anhang.name}}
+		<span v-for="(anhang,index) in formData.anhang"> {{anhang.name}} {{index}}<br></span> ref: {{formData.ref}}
 <!--			PARENT: {{formData.anhang}} {{formData.typeId}} | single: {{formData.anhang.name}} , multi: {{formData.anhang}} <span v-for="(anhang,index) in formData.anhang"> {{anhang.name}} {{index}}<br></span> ref: {{formData.ref}}-->
 		</div>
 	</div>

From ef6634a38e38af2d719947c0ff05730aba492c2f Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 11 Jan 2024 09:56:59 +0100
Subject: [PATCH 0305/1461] bugfix FileUpload Component

---
 public/js/components/Form/Upload/File.js      |  8 +---
 public/js/components/Notiz/Notiz.js           | 48 +++++++++----------
 .../Studentenverwaltung/Details/Notizen.js    |  4 +-
 3 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/public/js/components/Form/Upload/File.js b/public/js/components/Form/Upload/File.js
index c84996e8d..b62cdd788 100644
--- a/public/js/components/Form/Upload/File.js
+++ b/public/js/components/Form/Upload/File.js
@@ -32,12 +32,8 @@ export default {
 		}
 	},
 	template: `		
-		FILES: {{dateien}}
-		<span v-if="multiupload">
-		  	<input type="file" multiple ref="upload" @change="handleFileChange" v-model="dateien"/>								
-		</span>
-		<span v-else>
-			<input type="file" ref="upload" @change="handleFileChange" v-model="dateien"/>
+		<span>
+		  	<input type="file" :multiple="multiupload" ref="upload" @change="handleFileChange" v-model="dateien"/>								
 		</span>
 		
 		<span>					
diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index ccbfaa548..941820405 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -107,37 +107,37 @@ export default {
 		reset() {
 			this.$refs.form.reset();
 			this.intAnhang = null;
-			this.$emit('update:anhang', []);
+			//this.$emit('update:anhang', []);
 		},
 	},
 
 	template: `
-<div>
-{{this.intAnhang}} 
+	<div class="notiz-notiz">
+<!--		{{this.intAnhang}}-->
 		<span v-for="(anhang,index) in intAnhang"> {{anhang.name}} {{index}}<br></span>
-	<form ref="form" @submit.prevent class="row">
-		<div>
-			<div class="row mb-3">
-				<b>{{action}}
-				<div class="col-sm-7">
-					</b><span class="small">[{{this.typeId}}]</span>
-				</div>	
-			</div>
-
-			<div class="notizTitle row mb-3">
-				<label for="titel" class="form-label col-sm-2">Titel</label>
-				<div class="col-sm-7">
-					<input type="text" v-model="intTitel" class="form-control">
-				</div>	
-			</div>
-			
-			<div class="row mb-3">
-				<label for="text" class="form-label col-sm-2">Text</label>
-				<div class="col-sm-7">
-					<textarea rows="5" cols="75" v-model="intText" class="form-control"></textarea>
+		<form ref="form" @submit.prevent class="row">
+			<div>
+				<div class="row mb-3">
+					<b>{{action}}</b>
+					<div class="col-sm-7">
+						<span class="small">[{{this.typeId}}]</span>
+					</div>	
+				</div>
+	
+				<div class="notizTitle row mb-3">
+					<label for="titel" class="form-label col-sm-2">Titel</label>
+					<div class="col-sm-7">
+						<input type="text" v-model="intTitel" class="form-control">
+					</div>	
+				</div>
+				
+				<div class="row mb-3">
+					<label for="text" class="form-label col-sm-2">Text</label>
+					<div class="col-sm-7">
+						<textarea rows="5" cols="75" v-model="intText" class="form-control"></textarea>
+					</div>
 				</div>
 			</div>
-		</div>
 	
 	<div v-if="showDocument">
 			<slot name="document">
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
index 678e3abe1..5d618592b 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
@@ -333,8 +333,8 @@ export default {
 		
 		
 		<div>
-		Parent: {{formData.title}} {{formData.anhang}} || {{formData.anhang.name}}
-		<span v-for="(anhang,index) in formData.anhang"> {{anhang.name}} {{index}}<br></span> ref: {{formData.ref}}
+<!--		Parent: {{formData.title}} {{formData.anhang}} || {{formData.anhang.name}}
+		<span v-for="(anhang,index) in formData.anhang"> {{anhang.name}} {{index}}<br></span> ref: {{formData.ref}}-->
 <!--			PARENT: {{formData.anhang}} {{formData.typeId}} | single: {{formData.anhang.name}} , multi: {{formData.anhang}} <span v-for="(anhang,index) in formData.anhang"> {{anhang.name}} {{index}}<br></span> ref: {{formData.ref}}-->
 		</div>
 	</div>

From 4526c10d304fc134a3ef6408661a57b2f10d47a5 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 11 Jan 2024 12:56:36 +0100
Subject: [PATCH 0306/1461] temp

---
 .../controllers/components/stv/Notiz.php      | 66 +++++++++++++++++--
 application/models/person/Notiz_model.php     |  4 ++
 .../Studentenverwaltung/Details/Notizen.js    |  5 +-
 3 files changed, 66 insertions(+), 9 deletions(-)

diff --git a/application/controllers/components/stv/Notiz.php b/application/controllers/components/stv/Notiz.php
index cdb15d9d3..28dcb33ef 100644
--- a/application/controllers/components/stv/Notiz.php
+++ b/application/controllers/components/stv/Notiz.php
@@ -48,7 +48,6 @@ class Notiz extends FHC_Controller
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 			$this->outputJson($result);
 		}
-
 		elseif (!hasData($result)) {
 			$this->outputJson($result); //success mit Wert null
 			//	$this->outputJson(getData($result) ?: []);
@@ -158,9 +157,6 @@ class Notiz extends FHC_Controller
 
 		}
 
-
-
-
 		//$result = $this->NotizModel->addNotizForType($type, $id, $titel, $text, $uid, $dms_id, $start, $ende, $erledigt, $verfasser_uid, $bearbeiter_uid);
 /*
 		$result = $this->NotizModel->addNotizForPerson($id, $titel, $text, $erledigt, $verfasser_uid);
@@ -172,7 +168,7 @@ class Notiz extends FHC_Controller
 		return $this->outputJsonSuccess(true);
 	}
 
-	public function updateNotiz($notiz_id)
+	public function updateNotizOldVersion($notiz_id)
 	{
 		$uid = getAuthUID();
 		$this->load->library('form_validation');
@@ -205,6 +201,63 @@ class Notiz extends FHC_Controller
 
 
 
+		$result = $this->NotizModel->update(
+			[
+				'notiz_id' => $notiz_id
+			],
+			[
+				'titel' =>  $titel,
+				'updatevon' => $uid,
+				'updateamum' => date('c'),
+				'text' => $text,
+				'verfasser_uid' => $verfasser_uid,
+				'bearbeiter_uid' => $bearbeiter_uid,
+				'start' => $start,
+				'ende' => $ende,
+				'erledigt' => $erledigt
+			]
+		);
+
+		if (isError($result))
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson(getError($result));
+		}
+		return $this->outputJsonSuccess(true);
+	}
+
+	public function updateNotiz($notiz_id)
+	{
+		$uid = getAuthUID();
+		$this->load->library('form_validation');
+		//$_POST = json_decode($this->input->raw_input_stream, true);
+	/*	$this->form_validation->set_rules('titel', 'titel', 'required');
+		$this->form_validation->set_rules('text', 'Text', 'required');
+
+		if ($this->form_validation->run() == false)
+		{
+			return $this->outputJsonError($this->form_validation->error_array());
+		}*/
+
+		$this->load->model('person/Notiz_model', 'NotizModel');
+
+		if(!$notiz_id)
+		{
+			return $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+		}
+
+		$uid = getAuthUID();
+		$titel = $this->input->post('titel');
+		$text = $this->input->post('text');
+		$verfasser_uid = isset($_POST['verfasser_uid']) ? $_POST['verfasser_uid'] : null;
+		$bearbeiter_uid = $uid;
+		$erledigt = $this->input->post('erledigt');
+		$type = $this->input->post('typeId');
+		$start = $this->input->post(date('von'));
+		$ende = $this->input->post(date('bis'));
+
+
+
 		$result = $this->NotizModel->update(
 			[
 				'notiz_id' => $notiz_id
@@ -298,8 +351,7 @@ class Notiz extends FHC_Controller
 	{
 		$this->load->model('person/Notiz_model', 'NotizModel');
 
-		//TODO(manu) check, ob mehr Dateien bzw. -versionen
-		//warum nur ein Eintrag???
+
 		$this->NotizModel->addSelect('campus.tbl_dms_version.*');
 
 		$this->NotizModel->addJoin('public.tbl_notiz_dokument','ON (public.tbl_notiz_dokument.notiz_id = public.tbl_notiz.notiz_id)');
diff --git a/application/models/person/Notiz_model.php b/application/models/person/Notiz_model.php
index 17cf9a140..7e7ffbe32 100644
--- a/application/models/person/Notiz_model.php
+++ b/application/models/person/Notiz_model.php
@@ -180,6 +180,8 @@ class Notiz_model extends DB_Model
 		return $result;
 	}
 
+
+
 	/**
 	 * Add a Notiz for a given person with DMS_id
 	 */
@@ -244,6 +246,7 @@ class Notiz_model extends DB_Model
 	 * @param $person_id
 	 */
 	//Todo(Manu) rewrite in CI-Style
+	//Todo(Manu) auf andere types erweitern
 	public function getNotizWithDocEntries($id)
 	{
 	$type = 'writeFunction';
@@ -267,6 +270,7 @@ class Notiz_model extends DB_Model
 			    notiz_id, z.notizzuordnung_id
 		";
 
+
 		return $this->execQuery($qry, array($id));
 
 	}
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
index 5d618592b..0dd0c9ce0 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
@@ -52,7 +52,7 @@ export default {
 				],
 				layout: 'fitDataFill',
 				layoutColumnsOnNewData: false,
-				height: '150',
+				height: '200',
 				selectable: true,
 				index: 'notiz_id'
 			},
@@ -96,6 +96,7 @@ export default {
 					this.formData.erledigt = this.notizen.erledigt;
 					this.formData.verfasser = this.notizen.verfasser_uid;
 					this.formData.bearbeiter = this.notizen.bearbeiter_uid;
+					this.formData.anhang = this.notizen.anhang;
 					if(this.notizen.dms_id){
 						console.log("loadEntries");
 						this.loadDocEntries(this.notizen.notiz_id);
@@ -107,7 +108,7 @@ export default {
 			this.resetFormData();
 			this.formData.typeId = 'person_id';
 			this.formData.titel = '';
-			this.formData.action = 'Neue Notiz2';
+			this.formData.action = 'Neue Notiz';
 			this.formData.text = null;
 			this.formData.von = null;
 			this.formData.bis = null;

From 8d8c25bd6e9b2937ff4acda2e5092cea77545658 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 15 Jan 2024 09:39:46 +0100
Subject: [PATCH 0307/1461] =?UTF-8?q?Autocomplete=20Feld=20Mitarbeiter=20f?=
 =?UTF-8?q?=C3=BCr=20Bearbeiterlogik?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controllers/components/stv/Notiz.php      | 142 ++++++++++--------
 .../models/ressource/Mitarbeiter_model.php    |  22 +++
 public/js/components/Form/Upload/File.js      |   2 +-
 public/js/components/Notiz/Notiz.js           |  43 ++++--
 .../Studentenverwaltung/Details/Notizen.js    | 120 ++++++++-------
 5 files changed, 197 insertions(+), 132 deletions(-)

diff --git a/application/controllers/components/stv/Notiz.php b/application/controllers/components/stv/Notiz.php
index 28dcb33ef..507e9ed07 100644
--- a/application/controllers/components/stv/Notiz.php
+++ b/application/controllers/components/stv/Notiz.php
@@ -48,6 +48,7 @@ class Notiz extends FHC_Controller
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 			$this->outputJson($result);
 		}
+
 		elseif (!hasData($result)) {
 			$this->outputJson($result); //success mit Wert null
 			//	$this->outputJson(getData($result) ?: []);
@@ -60,7 +61,10 @@ class Notiz extends FHC_Controller
 
 	public function addNewNotiz($id)
 	{
-		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
+		$this->load->model('person/Notiz_model', 'NotizModel');
+
+		$this->load->library('DmsLib');
+
 		//$this->load->library('form_validation');
 		//$_POST = json_decode($this->input->raw_input_stream, true);
 
@@ -69,52 +73,14 @@ class Notiz extends FHC_Controller
 /*		$this->form_validation->set_rules('titel', 'titel', 'required');
 		$this->form_validation->set_rules('text', 'Text', 'required');*/
 
-		//TODO(Manu) form validation - schon für type hier?,
-
-		//Speichern der Files
-		$this->load->library('DmsLib');
-		$uid = getAuthUID();
-
-		//multiple files
-		$dms_id_arr = [];
-		$notiz_id = null;
-		foreach ($_FILES as $k => $file)
-		{
-			$dms = array(
-				'kategorie_kurzbz'  => 'notiz',
-				'version'           => 0,
-				'name'              => $file["name"],
-				'mimetype'          => $file["type"],
-				'insertamum'        => date('c'),
-				'insertvon'         => $uid
-			);
-
-			$result = $this->dmslib->upload($dms, $k, array('pdf'));
-
-			if (isSuccess($result))
-			{
-				$dms_id_arr[] = $result->retval['dms_id'];
-			}
-/*			else {
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-
-				//TODO(manu) error handling
-				//feedback, dass ein File nicht erfolgreich gespeichert werden konnte
-				//$this->outputJson($result);
-				//$this->outputJsonError(['filetype nicht erlaubt' => getError($result)]);
-			}*/
-
-
-		}
-
-		//Speichern der Notiz mit Notizzuordnung
-		$this->load->model('person/Notiz_model', 'NotizModel');
+		//TODO(Manu) form validation - schon für type hier?
 
+		//Speichern der Notiz und Notizzuordnung
 		$uid = getAuthUID();
 		$verfasser_uid = isset($_POST['verfasser_uid']) ? $_POST['verfasser_uid'] : $uid;
 		$titel = $this->input->post('titel');
 		$text = $this->input->post('text');
-		$bearbeiter_uid = $this->input->post('bearbeiter_uid');
+		$bearbeiter_uid = $this->input->post('bearbeiter');
 		$erledigt = $this->input->post('erledigt');
 		$type = $this->input->post('typeId');
 
@@ -130,21 +96,33 @@ class Notiz extends FHC_Controller
 		}
 		$notiz_id = $result->retval;
 
-		//Zuordnung speichern
-/*		$result = $this->NotizzuordnungModel->insert(array('notiz_id' => $notiz_id, $type=> $id));
-		if (isError($result))
+		//Speichern der Files
+		$dms_id_arr = [];
+		foreach ($_FILES as $k => $file)
 		{
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson(getError($result));
-		}*/
+			$dms = array(
+				'kategorie_kurzbz'  => 'notiz',
+				'version'           => 0,
+				'name'              => $file["name"],
+				'mimetype'          => $file["type"],
+				'insertamum'        => date('c'),
+				'insertvon'         => $uid
+			);
 
+			$result = $this->dmslib->upload($dms, $k, array('pdf'));
+			if (isError($result))
+			{
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return $this->outputJson(getError($result));
+			}
+			$dms_id_arr[] = $result->retval['dms_id'];
+		}
 
 		//Eintrag in Notizdokument speichern
 		if($dms_id_arr)
 		{
 			// Loads model Notizdokument_model
 			$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
-			//Todo(manu) change for multiple files
 			foreach($dms_id_arr as $dms_id)
 			{
 				$result = $this->NotizdokumentModel->insert(array('notiz_id' => $notiz_id, 'dms_id' => $dms_id));
@@ -154,17 +132,8 @@ class Notiz extends FHC_Controller
 					return $this->outputJson(getError($result));
 				}
 			}
-
 		}
 
-		//$result = $this->NotizModel->addNotizForType($type, $id, $titel, $text, $uid, $dms_id, $start, $ende, $erledigt, $verfasser_uid, $bearbeiter_uid);
-/*
-		$result = $this->NotizModel->addNotizForPerson($id, $titel, $text, $erledigt, $verfasser_uid);
-		if (isError($result))
-		{
-			//$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson($result);
-		}*/
 		return $this->outputJsonSuccess(true);
 	}
 
@@ -228,8 +197,15 @@ class Notiz extends FHC_Controller
 
 	public function updateNotiz($notiz_id)
 	{
-		$uid = getAuthUID();
+		var_dump("in function updateNotiz " . $notiz_id);
+		//Loads Libraries
 		$this->load->library('form_validation');
+		$this->load->library('DmsLib');
+
+		// Loads models
+		$this->load->model('person/Notiz_model', 'NotizModel');
+		$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
+
 		//$_POST = json_decode($this->input->raw_input_stream, true);
 	/*	$this->form_validation->set_rules('titel', 'titel', 'required');
 		$this->form_validation->set_rules('text', 'Text', 'required');
@@ -239,25 +215,22 @@ class Notiz extends FHC_Controller
 			return $this->outputJsonError($this->form_validation->error_array());
 		}*/
 
-		$this->load->model('person/Notiz_model', 'NotizModel');
-
 		if(!$notiz_id)
 		{
 			return $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 		}
 
+		//update Notiz
 		$uid = getAuthUID();
 		$titel = $this->input->post('titel');
 		$text = $this->input->post('text');
 		$verfasser_uid = isset($_POST['verfasser_uid']) ? $_POST['verfasser_uid'] : null;
-		$bearbeiter_uid = $uid;
+		$bearbeiter_uid = isset($_POST['bearbeiter']) ? $_POST['bearbeiter'] : $uid;
 		$erledigt = $this->input->post('erledigt');
 		$type = $this->input->post('typeId');
 		$start = $this->input->post(date('von'));
 		$ende = $this->input->post(date('bis'));
 
-
-
 		$result = $this->NotizModel->update(
 			[
 				'notiz_id' => $notiz_id
@@ -274,12 +247,40 @@ class Notiz extends FHC_Controller
 				'erledigt' => $erledigt
 			]
 		);
-
 		if (isError($result))
 		{
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 			return $this->outputJson(getError($result));
 		}
+
+		//neue Files speichern
+		//Todo(manu) check, welche files neu sind..
+		foreach ($_FILES as $k => $file)
+		{
+			$dms = array(
+				'kategorie_kurzbz'  => 'notiz',
+				'version'           => 0,
+				'name'              => $file["name"],
+				'mimetype'          => $file["type"],
+				'insertamum'        => date('c'),
+				'insertvon'         => $uid
+			);
+
+			$result = $this->dmslib->upload($dms, $k, array('pdf'));
+			if (isError($result))
+			{
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return $this->outputJson(getError($result));
+			}
+			$dms_id = $result->retval['dms_id'];
+
+			$result = $this->NotizdokumentModel->insert(array('notiz_id' => $notiz_id, 'dms_id' => $dms_id));
+			if (isError($result))
+			{
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return $this->outputJson(getError($result));
+			}
+		}
 		return $this->outputJsonSuccess(true);
 	}
 
@@ -374,4 +375,15 @@ class Notiz extends FHC_Controller
 		}
 	}
 
+	public function getMitarbeiter($searchString)
+	{
+		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
+
+		$result = $this->MitarbeiterModel->searchMitarbeiter($searchString);
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+		}
+		$this->outputJson($result);
+	}
+
 }
\ No newline at end of file
diff --git a/application/models/ressource/Mitarbeiter_model.php b/application/models/ressource/Mitarbeiter_model.php
index 90c30927f..1e3fde502 100644
--- a/application/models/ressource/Mitarbeiter_model.php
+++ b/application/models/ressource/Mitarbeiter_model.php
@@ -202,4 +202,26 @@ class Mitarbeiter_model extends DB_Model
 		}
 		return success($kurzbz);
 	}
+
+	public function searchMitarbeiter($filter)
+	{
+		$filter = strtoLower($filter);
+		$qry = "
+			SELECT 
+					ma.mitarbeiter_uid, CONCAT(p.nachname, ' ', p.vorname, ' (', ma.mitarbeiter_uid , ')') as mitarbeiter
+			FROM 
+			    public.tbl_mitarbeiter ma 
+			JOIN 
+			    public.tbl_benutzer b on (ma.mitarbeiter_uid = b.uid)
+			JOIN 
+			    public.tbl_person p on (p.person_id = b.person_id)
+			WHERE 
+			    lower (p.nachname) LIKE '%". $this->db->escape_like_str($filter)."%'
+			OR
+				lower (p.vorname) LIKE '%". $this->db->escape_like_str($filter)."%'
+			OR
+				(ma.mitarbeiter_uid) LIKE '%". $this->db->escape_like_str($filter)."%'";
+
+		return $this->execQuery($qry);
+	}
 }
diff --git a/public/js/components/Form/Upload/File.js b/public/js/components/Form/Upload/File.js
index b62cdd788..6881c8e67 100644
--- a/public/js/components/Form/Upload/File.js
+++ b/public/js/components/Form/Upload/File.js
@@ -39,7 +39,7 @@ export default {
 		<span>					
 			<ul>							
 				<li v-for="(datei,index) in dateien">
-					<button>{{datei.name}}</button><button class="text-danger" @click="deleteFile(index)">X</button>
+					<button>{{datei.name}}</button><button class="text-danger" @click="deleteFile(index)"><i class="fa fa-remove"></i></button>
 				</li>
 			</ul>
 		</span>
diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index 941820405..660404f7c 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -1,10 +1,13 @@
 import VueDatePicker from '../vueDatepicker.js.php';
+import PvAutoComplete from "../../../../index.ci.php/public/js/components/primevue/autocomplete/autocomplete.esm.min.js";
 import File from '../Form/Upload/File.js';
+import {CoreRESTClient} from "../../RESTClient";
 
 export default {
 	components: {
 		VueDatePicker,
-		File
+		File,
+		PvAutoComplete
 	},
 	props: [
 		'typeId',
@@ -12,7 +15,7 @@ export default {
 		'text',
 		'von',
 		'bis',
-		'action',
+		'statusNew',
 		'document',
 		'erledigt',
 		'verfasser',
@@ -23,7 +26,10 @@ export default {
 		],
 	data(){
 		return {
-			multiupload: true
+			multiupload: true,
+			mitarbeiter: [],
+			filteredMitarbeiter: [],
+			filteredFirmen: []
 		}
 	},
 	computed: {
@@ -90,7 +96,12 @@ export default {
 				return this.bearbeiter;
 			},
 			set(value) {
-				this.$emit('update:bearbeiter', value);
+				if(value)
+				{
+					this.$emit('update:bearbeiter', value.mitarbeiter_uid);
+				}
+				else
+					this.$emit('update:bearbeiter', value);
 			}
 		},
 		intAnhang: {
@@ -109,11 +120,19 @@ export default {
 			this.intAnhang = null;
 			//this.$emit('update:anhang', []);
 		},
+
+		search(event) {
+			return CoreRESTClient
+				.get('components/stv/Notiz/getMitarbeiter/' + event.query)
+				.then(result => {
+					//console.log(result);
+					this.filteredMitarbeiter = CoreRESTClient.getData(result.data);
+				});
+		},
 	},
 
 	template: `
 	<div class="notiz-notiz">
-<!--		{{this.intAnhang}}-->
 		<span v-for="(anhang,index) in intAnhang"> {{anhang.name}} {{index}}<br></span>
 		<form ref="form" @submit.prevent class="row">
 			<div>
@@ -156,9 +175,9 @@ export default {
 	</div>	
 
 		<div v-if="showErweitert">
-			<slot name="erweitert">	
+<!--			<slot name="erweitert">	-->
 				
-<!--				<div class="row mb-3">
+				<div class="row mb-3">
 					<label for="bis" class="form-label col-sm-2">VerfasserIn</label>
 					<div class="col-sm-7">
 						<input type="text" v-model="intVerfasser" class="form-control">	
@@ -169,10 +188,12 @@ export default {
 				<div class="row mb-3">
 					<label for="bis" class="form-label col-sm-2">BearbeiterIn</label>
 					<div class="col-sm-7">
-						<input type="text" v-model="intBearbeiter" class="form-control">	
+						<PvAutoComplete v-model="intBearbeiter" optionLabel="mitarbeiter"  :suggestions="filteredMitarbeiter" @complete="search" minLength="3"/>
+<!--						<input type="text" v-model="intBearbeiter" class="form-control">	-->
 					</div>
-				</div>-->
-							
+					
+				</div>
+									
 				<div class="row mb-3">
 					<label for="von" class="form-label col-sm-2">von</label>
 					<div class="col-sm-2">
@@ -203,7 +224,7 @@ export default {
 						<input type="checkbox" v-model="intErledigt">	
 					</div>
 				</div>
-			</slot>
+<!--			</slot>-->
 		
 	</div>
 		
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
index 0dd0c9ce0..ba82b2628 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
@@ -15,7 +15,7 @@ export default {
 		CoreRESTClient,
 		CoreFilterCmpt,
 		Notiz,
-		BsModal,
+		BsModal
 	},
 	props: {
 		modelValue: Object
@@ -32,7 +32,7 @@ export default {
 					{title: "BearbeiterIn", field: "bearbeiter_uid", visible: false},
 					{title: "Start", field: "start", visible: false},
 					{title: "Ende", field: "ende", visible: false},
-/*					{title: "Dokumente", field: "dms_id"},*/
+					/*					{title: "Dokumente", field: "dms_id"},*/
 					{title: "Dokumente", field: "countdoc"},
 					{title: "Erledigt", field: "erledigt"},
 					{title: "Notiz_id", field: "notiz_id", visible: false},
@@ -58,10 +58,11 @@ export default {
 			},
 			tabulatorEvents: [],
 			notizen: [],
+			filteredMitarbeiter: [],
 			formData: {
 				typeId: 'person_id',
 				titel: null,
-				action: 'Neue Notiz',
+				statusNew: true,
 				text: null,
 				von: null,
 				bis: null,
@@ -73,7 +74,6 @@ export default {
 			},
 			showErweitert: true,
 			showDocument: true,
-
 		}
 	},
 	methods:{
@@ -88,7 +88,7 @@ export default {
 			this.loadNotiz(notiz_id).then(() => {
 				if(this.notizen.notiz_id) {
 					this.formData.titel = this.notizen.titel;
-					this.formData.action = 'Notiz bearbeiten';
+					this.formData.statusNew = false;
 					this.formData.text = this.notizen.text;
 					this.formData.von = this.notizen.start;
 					this.formData.bis = this.notizen.ende;
@@ -96,19 +96,22 @@ export default {
 					this.formData.erledigt = this.notizen.erledigt;
 					this.formData.verfasser = this.notizen.verfasser_uid;
 					this.formData.bearbeiter = this.notizen.bearbeiter_uid;
-					this.formData.anhang = this.notizen.anhang;
-					if(this.notizen.dms_id){
-						console.log("loadEntries");
-						this.loadDocEntries(this.notizen.notiz_id);
-					}
 				}
-			});
+			})
+				.then(() => {
+					if(this.notizen.dms_id){
+						console.log("loadEntries with " + this.notizen.notiz_id);
+						this.loadDocEntries(this.notizen.notiz_id);
+						//console.log(this.formData.anhang);
+					}
+				})
+			;
 		},
 		actionNewNotiz(){
 			this.resetFormData();
 			this.formData.typeId = 'person_id';
 			this.formData.titel = '';
-			this.formData.action = 'Neue Notiz';
+			this.formData.statusNew = false;
 			this.formData.text = null;
 			this.formData.von = null;
 			this.formData.bis = null;
@@ -119,13 +122,13 @@ export default {
 			this.formData.anhang = [];
 		},
 		addNewNotiz(notizData) {
-/*			console.log("here: anhang noch empty");
-			console.log(this.formData);*/
+			/*			console.log("here: anhang noch empty");
+						console.log(this.formData);*/
 
 			const formData = new FormData();
 
 			//working with single files
-		//	Object.entries(this.formData).forEach(([k, v]) => formData.append(k, v));
+			//	Object.entries(this.formData).forEach(([k, v]) => formData.append(k, v));
 
 			//multiple files
 			//console.log(this.formData.anhang);
@@ -134,9 +137,9 @@ export default {
 					formData.append(k, v);
 			});
 			Object.entries(this.formData.anhang).forEach(([k, v]) => formData.append(k, v));
-
+/*
 			console.log(this.formData);
-			console.log(formData);
+			console.log(formData);*/
 
 			CoreRESTClient.post('components/stv/Notiz/addNewNotiz/' + this.modelValue.person_id,
 				formData,
@@ -179,9 +182,11 @@ export default {
 			return CoreRESTClient.get('components/stv/Notiz/loadDokumente/' + notiz_id)
 				.then(
 					result => {
-						console.log(result.data);
-						if(result.data.retval)
+						//console.log(result.data);
+						if(result.data.retval) {
 							this.formData.anhang = result.data.retval;
+							console.log(this.formData.anhang);
+						}
 						else
 						{
 							this.formData.anhang = {};
@@ -197,7 +202,7 @@ export default {
 					result => {
 						if(result.data.retval) {
 							this.notizen = result.data.retval;
-
+							console.log(this.notizen);
 						}
 						else
 						{
@@ -216,55 +221,59 @@ export default {
 			//sicherstellen, dass über props nur leere felder übergeben werden
 			this.formData = {
 				typeId: 'person_id',
-					titel: null,
-					action: 'Neue Notiz',
-					text: null,
-					von: null,
-					bis: null,
-					document: null,
-					erledigt: false,
-					verfasser: null,
-					bearbeiter: null,
-					anhang: []
+				titel: null,
+				statusNew: true,
+				text: null,
+				von: null,
+				bis: null,
+				document: null,
+				erledigt: false,
+				verfasser: null,
+				bearbeiter: null,
+				anhang: []
 			};
 		},
-/*		updateNotiz(notiz_id){
-			CoreRESTClient.post('components/stv/Notiz/updateNotiz/' + notiz_id,
-				this.formData
-			).then(response => {
-				if (!response.data.error) {
-					this.$fhcAlert.alertSuccess('Update erfolgreich');
-					this.resetFormData();
-					this.reload();
-				} else {
-					const errorData = response.data.retval;
-					Object.entries(errorData).forEach(entry => {
-						const [key, value] = entry;
-						this.$fhcAlert.alertError(value);
+		/*		updateNotiz(notiz_id){
+					CoreRESTClient.post('components/stv/Notiz/updateNotiz/' + notiz_id,
+						this.formData
+					).then(response => {
+						if (!response.data.error) {
+							this.$fhcAlert.alertSuccess('Update erfolgreich');
+							this.resetFormData();
+							this.reload();
+						} else {
+							const errorData = response.data.retval;
+							Object.entries(errorData).forEach(entry => {
+								const [key, value] = entry;
+								this.$fhcAlert.alertError(value);
+							});
+						}
+					}).catch(error => {
+						this.statusMsg = 'Error in Catch';
+						this.$fhcAlert.alertError('Fehler bei Updateroutine aufgetreten');
+					}).finally(() => {
+						window.scrollTo(0, 0);
+						//this.reload();
 					});
-				}
-			}).catch(error => {
-				this.statusMsg = 'Error in Catch';
-				this.$fhcAlert.alertError('Fehler bei Updateroutine aufgetreten');
-			}).finally(() => {
-				window.scrollTo(0, 0);
-				//this.reload();
-			});
-		},*/
+				},*/
 		updateNotiz(notiz_id){
 			const formData = new FormData();
+
+
 			Object.entries(this.formData).forEach(([k, v]) => {
 				if(k!= 'anhang')
 					formData.append(k, v);
 			});
 			Object.entries(this.formData.anhang).forEach(([k, v]) => formData.append(k, v));
+			console.log(this.formData);
 
+			//warum geht das nicht analog? wie kann titel = null sein?
 			CoreRESTClient.post('components/stv/Notiz/updateNotiz/' + notiz_id,
 				formData,
 				{ Headers: { "Content-Type": "multipart/form-data" } }
 			).then(response => {
 				if (!response.data.error) {
-					this.$fhcAlert.alertSuccess('Update von neuer Notiz erfolgreich');
+					this.$fhcAlert.alertSuccess('Update von Notiz erfolgreich');
 					this.resetFormData();
 					this.reload();
 				} else {
@@ -318,7 +327,7 @@ export default {
 			v-model:typeId="formData.typeId"
 			v-model:titel="formData.titel" 
 			v-model:text="formData.text" 
-			v-model:action="formData.action" 				
+			v-model:statusNew="formData.statusNew" 				
 			v-model:von="formData.von" 
 			v-model:bis="formData.bis" 
 			v-model:document="formData.document"
@@ -329,11 +338,12 @@ export default {
 		>
 		</Notiz>
 			
-		<button v-if="formData.action === 'Neue Notiz'"  type="button" class="btn btn-primary" @click="addNewNotiz()"> Neu anlegen </button>
+		<button v-if="formData.statusNew"  type="button" class="btn btn-primary" @click="addNewNotiz()"> Neu anlegen </button>
 		<button v-else type="button" class="btn btn-primary" @click="updateNotiz(notizen.notiz_id)"> Speichern </button>
 		
 		
 		<div>
+		parent: {{formData.bearbeiter}}
 <!--		Parent: {{formData.title}} {{formData.anhang}} || {{formData.anhang.name}}
 		<span v-for="(anhang,index) in formData.anhang"> {{anhang.name}} {{index}}<br></span> ref: {{formData.ref}}-->
 <!--			PARENT: {{formData.anhang}} {{formData.typeId}} | single: {{formData.anhang.name}} , multi: {{formData.anhang}} <span v-for="(anhang,index) in formData.anhang"> {{anhang.name}} {{index}}<br></span> ref: {{formData.ref}}-->

From 61616fbaefacd0abece97545bc0838eb44659f99 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 15 Jan 2024 13:56:17 +0100
Subject: [PATCH 0308/1461] Update AppendForm mit JSON.stringify, Update Form,
 authUid

---
 .../controllers/components/stv/Notiz.php      | 52 ++++++++++--
 public/js/components/Notiz/Notiz.js           | 40 ++++-----
 .../Studentenverwaltung/Details/Notizen.js    | 82 ++++++-------------
 3 files changed, 89 insertions(+), 85 deletions(-)

diff --git a/application/controllers/components/stv/Notiz.php b/application/controllers/components/stv/Notiz.php
index 507e9ed07..494b1fdbf 100644
--- a/application/controllers/components/stv/Notiz.php
+++ b/application/controllers/components/stv/Notiz.php
@@ -19,6 +19,24 @@ class Notiz extends FHC_Controller
 		]);
 	}
 
+	public function getUid()
+	{
+		// Load Libraries
+		$this->load->library('AuthLib');
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+		$result = getAuthUid();
+		$this->outputJsonError($result);
+
+	//	$this->outputJson(getData($result));
+
+/*		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->outputJson(getError($result));
+		} else {
+			$this->outputJson($result);
+		}*/
+	}
+
 	public function getNotizen($person_id)
 	{
 		$this->load->model('person/Notiz_model', 'NotizModel');
@@ -74,19 +92,26 @@ class Notiz extends FHC_Controller
 		$this->form_validation->set_rules('text', 'Text', 'required');*/
 
 		//TODO(Manu) form validation - schon für type hier?
-
 		//Speichern der Notiz und Notizzuordnung
 		$uid = getAuthUID();
-		$verfasser_uid = isset($_POST['verfasser_uid']) ? $_POST['verfasser_uid'] : $uid;
+
+		if (isset($_POST['data']))
+		{
+			$data = json_decode($_POST['data']);
+			unset($_POST['data']);
+			foreach ($data as $k => $v) {
+				$_POST[$k] = $v;
+			}
+		}
+
 		$titel = $this->input->post('titel');
 		$text = $this->input->post('text');
-		$bearbeiter_uid = $this->input->post('bearbeiter');
 		$erledigt = $this->input->post('erledigt');
+		$verfasser_uid = isset($_POST['verfasser_uid']) ? $_POST['verfasser_uid'] : $uid;
+		$bearbeiter_uid = isset($_POST['bearbeiter']) ? $_POST['bearbeiter'] : null;
 		$type = $this->input->post('typeId');
-
-		//get rid of null value error
-		$start = $this->input->post(date('von'));
-		$ende = $this->input->post(date('bis'));
+		$start = $this->input->post('von');
+		$ende = $this->input->post('bis');
 
 		$result = $this->NotizModel->addNotizForType($type, $id, $titel, $text, $uid, $start, $ende, $erledigt, $verfasser_uid, $bearbeiter_uid);
 		if (isError($result))
@@ -215,6 +240,15 @@ class Notiz extends FHC_Controller
 			return $this->outputJsonError($this->form_validation->error_array());
 		}*/
 
+		if (isset($_POST['data']))
+		{
+			$data = json_decode($_POST['data']);
+			unset($_POST['data']);
+			foreach ($data as $k => $v) {
+				$_POST[$k] = $v;
+			}
+		}
+
 		if(!$notiz_id)
 		{
 			return $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
@@ -228,8 +262,8 @@ class Notiz extends FHC_Controller
 		$bearbeiter_uid = isset($_POST['bearbeiter']) ? $_POST['bearbeiter'] : $uid;
 		$erledigt = $this->input->post('erledigt');
 		$type = $this->input->post('typeId');
-		$start = $this->input->post(date('von'));
-		$ende = $this->input->post(date('bis'));
+		$start = $this->input->post('von');
+		$ende = $this->input->post('bis');
 
 		$result = $this->NotizModel->update(
 			[
diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index 660404f7c..46b6a6992 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -88,7 +88,8 @@ export default {
 				return this.verfasser;
 			},
 			set(value) {
-				this.$emit('update:verfasser', value);
+				//this.$emit('update:verfasser', value);
+				this.$emit('update:verfasser', value.mitarbeiter_uid);
 			}
 		},
 		intBearbeiter: {
@@ -179,24 +180,12 @@ export default {
 				
 				<div class="row mb-3">
 					<label for="bis" class="form-label col-sm-2">VerfasserIn</label>
-					<div class="col-sm-7">
-						<input type="text" v-model="intVerfasser" class="form-control">	
-						{{uid}}
-					</div>
-				</div>
-				
-				<div class="row mb-3">
-					<label for="bis" class="form-label col-sm-2">BearbeiterIn</label>
-					<div class="col-sm-7">
-						<PvAutoComplete v-model="intBearbeiter" optionLabel="mitarbeiter"  :suggestions="filteredMitarbeiter" @complete="search" minLength="3"/>
-<!--						<input type="text" v-model="intBearbeiter" class="form-control">	-->
+					<div class="col-sm-3">
+						<PvAutoComplete v-model="intVerfasser" optionLabel="mitarbeiter"  :suggestions="filteredMitarbeiter" @complete="search" minLength="3"/>
 					</div>
 					
-				</div>
-									
-				<div class="row mb-3">
-					<label for="von" class="form-label col-sm-2">von</label>
-					<div class="col-sm-2">
+					<label for="von" class="form-label col-sm-1">von</label>
+					<div class="col-sm-3">
 						<vue-date-picker 
 							id="von" 
 							v-model="intVon" 
@@ -205,10 +194,17 @@ export default {
 							:enable-time-picker="false"
 							format="dd.MM.yyyy" 
 							preview-format="dd.MM.yyyy"></vue-date-picker>
+					</div>			
+				</div>
+				
+				<div class="row mb-3">
+					<label for="bis" class="form-label col-sm-2">BearbeiterIn</label>
+					<div class="col-sm-3">
+						<PvAutoComplete v-model="intBearbeiter" optionLabel="mitarbeiter"  :suggestions="filteredMitarbeiter" @complete="search" minLength="3"/>
 					</div>
-	
+					
 					<label for="bis" class="form-label col-sm-1">bis</label>
-					<div class="col-sm-2">
+					<div class="col-sm-3">
 						<vue-date-picker 
 							id="bis" 
 							v-model="intBis" 
@@ -218,8 +214,12 @@ export default {
 							format="dd.MM.yyyy" 
 							preview-format="dd.MM.yyyy"></vue-date-picker>
 					</div>
+					
+				</div>
+									
+				<div class="row mb-3">
 	
-					<label for="bis" class="form-label col-sm-1">erledigt</label>
+					<label for="bis" class="form-label col-sm-2">erledigt</label>
 					<div class="col-sm-1"> 
 						<input type="checkbox" v-model="intErledigt">	
 					</div>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
index ba82b2628..f88ce0627 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
@@ -7,7 +7,7 @@ var editIcon = function (cell, formatterParams) {
 	return "<i class='fa fa-edit'></i>";
 };
 var deleteIcon = function (cell, formatterParams){
-	return "<i class='fa fa-remove'></i>";
+	return "<i class='fa fa-remove text-danger'></i>";
 };
 
 export default {
@@ -28,13 +28,13 @@ export default {
 				columns: [
 					{title: "Titel", field: "titel"},
 					{title: "Text", field: "text", width: 350},
-					{title: "VerfasserIn", field: "verfasser_uid", visible: false},
+					{title: "VerfasserIn", field: "verfasser_uid"},
 					{title: "BearbeiterIn", field: "bearbeiter_uid", visible: false},
 					{title: "Start", field: "start", visible: false},
 					{title: "Ende", field: "ende", visible: false},
 					/*					{title: "Dokumente", field: "dms_id"},*/
 					{title: "Dokumente", field: "countdoc"},
-					{title: "Erledigt", field: "erledigt"},
+					{title: "Erledigt", field: "erledigt", visible: false},
 					{title: "Notiz_id", field: "notiz_id", visible: false},
 					{title: "Notizzuordnung_id", field: "notizzuordnung_id", visible: false},
 					{
@@ -58,6 +58,8 @@ export default {
 			},
 			tabulatorEvents: [],
 			notizen: [],
+			uid: '',
+			intVerfasser: '',
 			filteredMitarbeiter: [],
 			formData: {
 				typeId: 'person_id',
@@ -68,12 +70,13 @@ export default {
 				bis: null,
 				document: null,
 				erledigt: false,
-				verfasser: null,
+				verfasser: this.uid,
 				bearbeiter: null,
 				anhang: []
 			},
 			showErweitert: true,
-			showDocument: true,
+			showDocument: true
+
 		}
 	},
 	methods:{
@@ -111,35 +114,22 @@ export default {
 			this.resetFormData();
 			this.formData.typeId = 'person_id';
 			this.formData.titel = '';
-			this.formData.statusNew = false;
+			this.formData.statusNew = true;
 			this.formData.text = null;
 			this.formData.von = null;
 			this.formData.bis = null;
 			this.formData.document = null;
 			this.formData.erledigt = false;
-			this.formData.verfasser = null;
+			this.formData.verfasser = this.uid;
 			this.formData.bearbeiter = null;
 			this.formData.anhang = [];
 		},
 		addNewNotiz(notizData) {
-			/*			console.log("here: anhang noch empty");
-						console.log(this.formData);*/
 
 			const formData = new FormData();
 
-			//working with single files
-			//	Object.entries(this.formData).forEach(([k, v]) => formData.append(k, v));
-
-			//multiple files
-			//console.log(this.formData.anhang);
-			Object.entries(this.formData).forEach(([k, v]) => {
-				if(k!= 'anhang')
-					formData.append(k, v);
-			});
+			formData.append('data', JSON.stringify(this.formData));
 			Object.entries(this.formData.anhang).forEach(([k, v]) => formData.append(k, v));
-/*
-			console.log(this.formData);
-			console.log(formData);*/
 
 			CoreRESTClient.post('components/stv/Notiz/addNewNotiz/' + this.modelValue.person_id,
 				formData,
@@ -228,46 +218,18 @@ export default {
 				bis: null,
 				document: null,
 				erledigt: false,
-				verfasser: null,
+				verfasser: this.uid,
 				bearbeiter: null,
 				anhang: []
 			};
 		},
-		/*		updateNotiz(notiz_id){
-					CoreRESTClient.post('components/stv/Notiz/updateNotiz/' + notiz_id,
-						this.formData
-					).then(response => {
-						if (!response.data.error) {
-							this.$fhcAlert.alertSuccess('Update erfolgreich');
-							this.resetFormData();
-							this.reload();
-						} else {
-							const errorData = response.data.retval;
-							Object.entries(errorData).forEach(entry => {
-								const [key, value] = entry;
-								this.$fhcAlert.alertError(value);
-							});
-						}
-					}).catch(error => {
-						this.statusMsg = 'Error in Catch';
-						this.$fhcAlert.alertError('Fehler bei Updateroutine aufgetreten');
-					}).finally(() => {
-						window.scrollTo(0, 0);
-						//this.reload();
-					});
-				},*/
 		updateNotiz(notiz_id){
 			const formData = new FormData();
 
-
-			Object.entries(this.formData).forEach(([k, v]) => {
-				if(k!= 'anhang')
-					formData.append(k, v);
-			});
+			formData.append('data', JSON.stringify(this.formData));
 			Object.entries(this.formData.anhang).forEach(([k, v]) => formData.append(k, v));
-			console.log(this.formData);
+			//console.log(this.formData);
 
-			//warum geht das nicht analog? wie kann titel = null sein?
 			CoreRESTClient.post('components/stv/Notiz/updateNotiz/' + notiz_id,
 				formData,
 				{ Headers: { "Content-Type": "multipart/form-data" } }
@@ -290,6 +252,17 @@ export default {
 			});
 		},
 	},
+	created(){
+		CoreRESTClient
+			.get('components/stv/Notiz/getUid')
+			.then(result => {
+					if(result.data.retval) {
+						this.formData.verfasser = result.data.retval;
+					}
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+	},
+	computed: {	},
 	template: `
 	<div class="stv-details-details h-100 pb-3">
 
@@ -343,10 +316,7 @@ export default {
 		
 		
 		<div>
-		parent: {{formData.bearbeiter}}
-<!--		Parent: {{formData.title}} {{formData.anhang}} || {{formData.anhang.name}}
-		<span v-for="(anhang,index) in formData.anhang"> {{anhang.name}} {{index}}<br></span> ref: {{formData.ref}}-->
-<!--			PARENT: {{formData.anhang}} {{formData.typeId}} | single: {{formData.anhang.name}} , multi: {{formData.anhang}} <span v-for="(anhang,index) in formData.anhang"> {{anhang.name}} {{index}}<br></span> ref: {{formData.ref}}-->
+<!--			parent: -->
 		</div>
 	</div>
 `

From 20edb299a76ecadd6daa12dda7c0227a94d7e72e Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 15 Jan 2024 14:05:34 +0100
Subject: [PATCH 0309/1461] Form validation

---
 .../controllers/components/stv/Notiz.php      | 47 +++++++++----------
 1 file changed, 22 insertions(+), 25 deletions(-)

diff --git a/application/controllers/components/stv/Notiz.php b/application/controllers/components/stv/Notiz.php
index 494b1fdbf..197ec06d3 100644
--- a/application/controllers/components/stv/Notiz.php
+++ b/application/controllers/components/stv/Notiz.php
@@ -82,17 +82,8 @@ class Notiz extends FHC_Controller
 		$this->load->model('person/Notiz_model', 'NotizModel');
 
 		$this->load->library('DmsLib');
+		$this->load->library('form_validation');
 
-		//$this->load->library('form_validation');
-		//$_POST = json_decode($this->input->raw_input_stream, true);
-
-		//TODO(Manu) Validation
-
-/*		$this->form_validation->set_rules('titel', 'titel', 'required');
-		$this->form_validation->set_rules('text', 'Text', 'required');*/
-
-		//TODO(Manu) form validation - schon für type hier?
-		//Speichern der Notiz und Notizzuordnung
 		$uid = getAuthUID();
 
 		if (isset($_POST['data']))
@@ -104,6 +95,15 @@ class Notiz extends FHC_Controller
 			}
 		}
 
+		//Form Validation
+		$this->form_validation->set_rules('titel', 'titel', 'required');
+		$this->form_validation->set_rules('text', 'Text', 'required');
+
+		if ($this->form_validation->run() == false)
+		{
+			return $this->outputJsonError($this->form_validation->error_array());
+		}
+
 		$titel = $this->input->post('titel');
 		$text = $this->input->post('text');
 		$erledigt = $this->input->post('erledigt');
@@ -113,6 +113,7 @@ class Notiz extends FHC_Controller
 		$start = $this->input->post('von');
 		$ende = $this->input->post('bis');
 
+		//Speichern der Notiz und Notizzuordnung
 		$result = $this->NotizModel->addNotizForType($type, $id, $titel, $text, $uid, $start, $ende, $erledigt, $verfasser_uid, $bearbeiter_uid);
 		if (isError($result))
 		{
@@ -222,23 +223,11 @@ class Notiz extends FHC_Controller
 
 	public function updateNotiz($notiz_id)
 	{
-		var_dump("in function updateNotiz " . $notiz_id);
-		//Loads Libraries
-		$this->load->library('form_validation');
-		$this->load->library('DmsLib');
-
-		// Loads models
 		$this->load->model('person/Notiz_model', 'NotizModel');
 		$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
 
-		//$_POST = json_decode($this->input->raw_input_stream, true);
-	/*	$this->form_validation->set_rules('titel', 'titel', 'required');
-		$this->form_validation->set_rules('text', 'Text', 'required');
-
-		if ($this->form_validation->run() == false)
-		{
-			return $this->outputJsonError($this->form_validation->error_array());
-		}*/
+		$this->load->library('form_validation');
+		$this->load->library('DmsLib');
 
 		if (isset($_POST['data']))
 		{
@@ -254,6 +243,15 @@ class Notiz extends FHC_Controller
 			return $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 		}
 
+		//Form Validation
+		$this->form_validation->set_rules('titel', 'titel', 'required');
+		$this->form_validation->set_rules('text', 'Text', 'required');
+
+		if ($this->form_validation->run() == false)
+		{
+			return $this->outputJsonError($this->form_validation->error_array());
+		}
+
 		//update Notiz
 		$uid = getAuthUID();
 		$titel = $this->input->post('titel');
@@ -288,7 +286,6 @@ class Notiz extends FHC_Controller
 		}
 
 		//neue Files speichern
-		//Todo(manu) check, welche files neu sind..
 		foreach ($_FILES as $k => $file)
 		{
 			$dms = array(

From 70d7496ed9982c54f48af051f25babc2d4b8626a Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 15 Jan 2024 14:54:24 +0100
Subject: [PATCH 0310/1461] =?UTF-8?q?bei=20L=C3=B6schen=20von=20Notiz=20En?=
 =?UTF-8?q?tfernen=20aller=20DMS-=20und=20Eintr=C3=A4ge=20in=20Notizdokume?=
 =?UTF-8?q?nt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controllers/components/stv/Notiz.php      | 35 ++++++++++---------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/application/controllers/components/stv/Notiz.php b/application/controllers/components/stv/Notiz.php
index 197ec06d3..2356f8bf1 100644
--- a/application/controllers/components/stv/Notiz.php
+++ b/application/controllers/components/stv/Notiz.php
@@ -318,7 +318,7 @@ class Notiz extends FHC_Controller
 	public function deleteNotiz ($notiz_id)
 	{
 		//dms_id auslesen aus notizdokument wenn vorhanden
-		$dms_id = null;
+		$dms_id_arr = [];
 		$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
 
 		$result = $this->NotizdokumentModel->loadWhere(array('notiz_id' => $notiz_id));
@@ -326,35 +326,36 @@ class Notiz extends FHC_Controller
 		if (isError($result))
 		{
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			$this->outputJson($result);
+			$this->outputJson(getError($result));
 		}
 		elseif (!hasData($result))
 		{
 			$this->outputJson($result);
-			$dms_id = null;
+			//$dms_id_arr = [];
 		}
 		else
 		{
-			//Todo(manu( umbau auf array)
-			$result = current(getData($result));
-			$dms_id = $result->dms_id;
+			$result = getData($result);
+			foreach($result as $doc) {
+				$dms_id_arr[] = $doc->dms_id;
+			}
 		}
 
-		if($dms_id)
+		if($dms_id_arr)
 		{
 			$this->load->library('DmsLib');
-			$result = $this->dmslib->removeAll($dms_id);
-
-			if (isError($result))
+			foreach($dms_id_arr as $dms_id)
 			{
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				$this->outputJson($result);
+				$result = $this->dmslib->removeAll($dms_id);
+
+				if (isError($result))
+				{
+					$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+					return $this->outputJson(getError($result));
+				}
+				else
+					$this->outputJson($result);
 			}
-			else
-				$this->outputJson($result);
-
-			//return $this->outputJsonSuccess(current(getData($result)));
-
 		}
 
 

From e881abe90421bac2aa6d84d6d4a5e7afe247aaee Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 15 Jan 2024 15:15:16 +0100
Subject: [PATCH 0311/1461] allows user to make profil changes requests and to
 oversee his requested changes

---
 application/controllers/Cis/Profil.php        |  51 ++-
 public/css/components/Profil.css              |  11 +-
 public/js/apps/api/userdata.js                |  11 +-
 public/js/components/Cis/Profil/EditProfil.js | 144 +++----
 .../components/Cis/Profil/EditProfilSelect.js | 124 ++++++
 .../Cis/Profil/MitarbeiterProfil.js           | 171 ++++-----
 .../components/Cis/Profil/ProfilComponents.js | 352 ++++++++++++++++++
 public/js/components/Cis/Selection/Select.js  |  86 -----
 8 files changed, 653 insertions(+), 297 deletions(-)
 create mode 100644 public/js/components/Cis/Profil/EditProfilSelect.js
 create mode 100644 public/js/components/Cis/Profil/ProfilComponents.js
 delete mode 100644 public/js/components/Cis/Selection/Select.js

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index f606484ea..8b87f3c5a 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -19,7 +19,8 @@ class Profil extends Auth_Controller
 			'index' => ['student/anrechnung_beantragen:r', 'user:r'], // TODO(chris): permissions?
 			'foto_sperre_function' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'getView' => ['student/anrechnung_beantragen:r', 'user:r'],
-			'editProfil' => ['student/anrechnung_beantragen:r', 'user:r'],
+			'insertProfilRequest' => ['student/anrechnung_beantragen:r', 'user:r'],
+			'updateProfilRequest' => ['student/anrechnung_beantragen:r', 'user:r'],
 			
 
 		]);
@@ -67,13 +68,13 @@ class Profil extends Auth_Controller
 
 
 
-	public function editProfil()
+	public function insertProfilRequest()
 	{
 
 		$json = json_decode($this->input->raw_input_stream);
 		
 
-		$data = ["uid" => $this->uid, "requested_change" => json_encode($json->payload), "change_timestamp" => "NOW()", "topic"=>$json->topic];
+		$data = ["topic"=>$json->topic,"uid" => $this->uid, "requested_change" => json_encode($json->payload), "change_timestamp" => "NOW()" ];
 
 		//? gets all the requested changes from a user
 		$res = $this->ProfilChangeModel->loadWhere(["uid"=>$this->uid]);
@@ -81,13 +82,14 @@ class Profil extends Auth_Controller
 
 		//? checks if the user already made a request to change a topic
 		//! which is an constraint added to the public.tbl_cis_profil_update table
+		if($res){
 		foreach($res as $update_request){
 			if($update_request->topic == $json->topic && $update_request->uid == $this->uid){
 				
 				echo json_encode(error("uid and topic combination exists already"));
 				return;
 			}
-		}
+		}}
 		
 		
 			$insert_res = $this->ProfilChangeModel->insert($data);
@@ -119,6 +121,32 @@ class Profil extends Auth_Controller
 
 	}
 
+	public function updateProfilRequest()
+	{
+
+		$json = json_decode($this->input->raw_input_stream);
+		
+
+		$data = ["topic"=>$json->topic,"uid" => $this->uid, "requested_change" => json_encode($json->payload), "change_timestamp" => "NOW()" ];
+
+		//? gets all the requested changes from a user
+		
+		if(isSuccess($this->ProfilChangeModel->addSelect(["profil_update_id"])) ){
+			$requestID = $this->ProfilChangeModel->loadWhere(["uid"=>$this->uid,"topic"=>$json->topic]);
+			$requestID = hasData($requestID) ? getData($requestID)[0]->profil_update_id : null;
+		};
+		
+		$update_res =$this->ProfilChangeModel->update([$requestID],$data);
+		if(isError($update_res)){
+			//catch error
+		}else{
+			$editTimestamp = $this->ProfilChangeModel->getTimestamp($update_res->retval[0]);
+			
+			$update_res->retval = date_create($editTimestamp)->format('d.m.Y'); 
+			echo json_encode($update_res);
+		}
+	}
+
 
 
 	private function viewMitarbeiterProfil($uid)
@@ -414,7 +442,7 @@ class Profil extends Auth_Controller
 
 		if (
 
-			isSuccess($adresse_res = $this->AdresseModel->addSelect(array("strasse", "tbl_adressentyp.bezeichnung as adr_typ", "plz", "ort"))) &&
+			isSuccess($adresse_res = $this->AdresseModel->addSelect(["adresse_id","strasse", "tbl_adressentyp.bezeichnung as adr_typ", "plz", "ort"])) &&
 			isSuccess($adresse_res = $this->AdresseModel->addOrder("zustelladresse", "DESC")) &&
 			isSuccess($adresse_res = $this->AdresseModel->addOrder("sort")) &&
 			isSuccess($adresse_res = $this->AdresseModel->addJoin("tbl_adressentyp", "typ=adressentyp_kurzbz"))
@@ -565,7 +593,11 @@ class Profil extends Auth_Controller
 		$res->standort_telefon = $telefon_res;
 
 		$res->profilUpdates = $profilUpdates?: null;
-		
+		if($res->profilUpdates){
+		foreach($res->profilUpdates as $update){
+			$update->requested_change = json_decode($update->requested_change);
+			$update->change_timestamp = date_create($update->change_timestamp)->format('d.m.Y');
+		}}
 
 		return $res;
 	}
@@ -623,7 +655,7 @@ class Profil extends Auth_Controller
 
 		if (
 
-			isSuccess($adresse_res = $this->AdresseModel->addSelect(array("strasse", "tbl_adressentyp.bezeichnung as adr_typ", "plz", "ort"))) &&
+			isSuccess($adresse_res = $this->AdresseModel->addSelect(["adresse_id","strasse", "tbl_adressentyp.bezeichnung as adr_typ", "plz", "ort"])) &&
 			isSuccess($adresse_res = $this->AdresseModel->addOrder("zustelladresse", "DESC")) &&
 			isSuccess($adresse_res = $this->AdresseModel->addOrder("sort")) &&
 			isSuccess($adresse_res = $this->AdresseModel->addJoin("tbl_adressentyp", "typ=adressentyp_kurzbz"))
@@ -767,6 +799,11 @@ class Profil extends Auth_Controller
 
 		$res->mailverteiler = $mailverteiler_res;
 		$res->profilUpdates = $profilUpdates?: null;
+		if($res->profilUpdates){
+		foreach($res->profilUpdates as $update){
+			$update->requested_change = json_decode($update->requested_change);
+			$update->change_timestamp = date_create($update->change_timestamp)->format('d.m.Y');
+		}}
 		
 		return $res;
 
diff --git a/public/css/components/Profil.css b/public/css/components/Profil.css
index 0138e5530..797504786 100644
--- a/public/css/components/Profil.css
+++ b/public/css/components/Profil.css
@@ -50,6 +50,9 @@
   align-content: space-between;
 
 }
+
+
+
 .form-underline .form-underline-content{
   border-width: 1px;
   border-color: transparent transparent #dee2e6 transparent;
@@ -75,11 +78,7 @@
 }
 
 
-option:checked{
-  background: linear-gradient(#005485, #005485);
 
-}
 
-#SelectStyle{
-  
-}
\ No newline at end of file
+
+
diff --git a/public/js/apps/api/userdata.js b/public/js/apps/api/userdata.js
index fb3a68a42..df655988c 100644
--- a/public/js/apps/api/userdata.js
+++ b/public/js/apps/api/userdata.js
@@ -3,9 +3,16 @@ export default {
 
     //! API Calls for Profil Views
 
-    editProfil: function(topic, payload) {
+    insertProfilRequest: function(topic, payload) {
         const url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router+
-                   `/Cis/Profil/editProfil`;
+                   `/Cis/Profil/insertProfilRequest`;
+                   
+        return axios.post(url,{topic, payload});
+    },
+
+    updateProfilRequest: function(topic, payload) {
+        const url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router+
+                   `/Cis/Profil/updateProfilRequest`;
                    
         return axios.post(url,{topic, payload});
     },
diff --git a/public/js/components/Cis/Profil/EditProfil.js b/public/js/components/Cis/Profil/EditProfil.js
index fffef6d99..103418fdf 100644
--- a/public/js/components/Cis/Profil/EditProfil.js
+++ b/public/js/components/Cis/Profil/EditProfil.js
@@ -1,14 +1,14 @@
 import BsModal from "../../Bootstrap/Modal.js";
 import Alert from "../../Bootstrap/Alert.js";
 import BreadCrumb from "../Selection/Breadcrumb.js";
-import Select from "../Selection/Select.js";
+import EditProfilSelect from "./EditProfilSelect.js";
 
 export default {
   components: {
     BsModal,
     Alert,
     BreadCrumb,
-    Select,
+    EditProfilSelect,
   },
   mixins: [BsModal],
   props: {
@@ -37,6 +37,8 @@ export default {
         privateKontakte:[{strasse:"strasse1",plz:100},{strasse:"strasse1",plz:100},{strasse:"strasse1",plz:100}],
         privateAdressen:[{kontakt:"telefon",anmerkung:"1"},{kontakt:"email",anmerkung:"2"},{kontakt:"telefon",anmerkung:"3"}]
       },
+      testSelectedItems:[],
+      profilUpdate:null,
 
 
       topic:null,
@@ -58,12 +60,11 @@ export default {
   },
 
   methods: {
+
     
-    testEvent: function(){
-      if(!this.propertySelected){
-        this.testListe = this.testListe[this.testValue];
-        this.propertySelected = true;
-      }
+    
+    selectEvent: function (option){
+      this.editData = this.editData[option];
     },
     createDeepCopy: function(object){
       //? using Vue.toRaw because deep clones with structuredClone can not be done on proxies
@@ -83,11 +84,12 @@ export default {
       
      
         //* only inserts new row if the inputField value is different from the original value
-        if(this.isInputFieldChanged && this.topic){
+        if(this.topic && this.profilUpdate){
 
         //? inserts new row in public.tbl_cis_profil_update 
-      
-        Vue.$fhcapi.UserData.editProfil(this.topic,this.inputField).then((res)=>{
+      if(this.editData.update){
+        
+        Vue.$fhcapi.UserData.updateProfilRequest(this.topic,this.profilUpdate).then((res)=>{
           this.result = {
             editData: this.editData,
             timestamp: res.data.retval,
@@ -102,116 +104,68 @@ export default {
           } 
           //
         });
+        //
      
-      }
+      }else{
+
+        Vue.$fhcapi.UserData.insertProfilRequest(this.topic,this.profilUpdate).then((res)=>{
+          this.result = {
+            editData: this.editData,
+            timestamp: res.data.retval,
+          };
+          this.hide(); 
+          
+          if(res.data.error == 0){
+           
+            Alert.popup("Ihre Anfrage wurde erfolgreich gesendet. Bitte warten Sie, während sich das Team um Ihre Anfrage kümmert.");
+          }else{
+            Alert.popup("Ein Fehler ist aufgetreten: "+ JSON.stringify(res.data.retval));
+          } 
+          //
+        });
+        
+      
+    }
+   
+    }
     },
   },
   computed: {
-
-    isInputFieldChanged: function(){
-      if(this.inputField){
-        return JSON.stringify(this.inputField) !== JSON.stringify(this.secondSelectedOption);
-      }
-      return false;
-    },
-
-    firstSelection(){
-      return Object.keys(this.value);
-    },
-
-    secondSelection(){
-      switch(this.firstSelectedOption){
-        case "Personen_Informationen": return Object.keys(this.editData[this.firstSelectedOption]);
-        case "Private_Kontakte": return this.editData[this.firstSelectedOption];
-        case "Private_Adressen": return this.editData[this.firstSelectedOption];
-        default: return [];
-      }
-    },
-
-  
   },
   created() {
+
+    if(this.editData.topic){
+      //? if the topic was passed through the prop add it to the reactive data
+      this.topic = this.editData.topic;
+    }
+   
+
   },
   mounted() {
     this.modal = this.$refs.modalContainer.modal;
   },
   popup(options) {
+    console.log("popup start");
     return BsModal.popup.bind(this)(null, options);
   },
   template: `
   
   <bs-modal ref="modalContainer" v-bind="$props" body-class="" dialog-class="modal-lg" class="bootstrap-alert" backdrop="false" >
-    <template v-slot:title>
-      {{"Profil bearbeiten" }}
+    
+  <template v-slot:title>
+      {{"Profil bearbeiten" }}  
     </template>
     <template v-slot:default>
-    
-    <bread-crumb :list="['this','is a','test']" ></bread-crumb>
-    <p>{{testValue}}</p>
-    <Select ariaLabel="test" v-model="testValue" @select="testEvent" :list="testListe"></Select>
-    <!-- DONT FORGET TO UNCOMMENT THIS -->
-    <!-- Breadcrumbs 
-    <nav aria-label="breadcrumb">
-      <ol class="breadcrumb">
-        <li class="breadcrumb-item" v-if="firstSelectedOption">{{firstSelectedOption}}</li>
-        <li class="breadcrumb-item" v-if="secondSelectedOption" >{{firstSelectedOption ==="Personen_Informationen" ? Object.keys(secondSelectedOption)[0] : secondSelectedOptionIndex+1 }}</li>
-       
-      </ol>
-    </nav>
-    -->
+    <edit-profil-select v-model:topic="topic" v-model:profilUpdate="profilUpdate" ariaLabel="test" :list="editData"></edit-profil-select>
+   
 
-
-    <select v-if="!firstSelectedOption" v-model="firstSelectedOption"  class="form-select" size="3" aria-label="size 3 select example">
-      <option  v-for="(option,index) in firstSelection" :value="option">{{option.replace("_"," ")}}</option>
-    </select>
-
-    <select v-if="firstSelectedOption && !secondSelectedOption" class="form-select" size="3" aria-label="size 3 select example">
-      <option @click="
-      
-      if(Array.isArray(editData[firstSelectedOption])){
-        secondSelectedOptionIndex = index;
-        secondSelectedOption = createDeepCopy(option);
-        inputField= createDeepCopy(option);
-        //* topic is the property in which the array is stored when it is an array
-        topic = firstSelectedOption;
-      }else{
-        secondSelectedOption={[option]:editData[firstSelectedOption][option]};
-        inputField={[option]:editData[firstSelectedOption][option]};
-        //* topic is the selected property if is an object
-        topic = option;
-      }" v-for="(option, index) in secondSelection" :value="option"><div v-if="typeof(option)==='object'">
-      <div class="row m-2" v-for="(value,property) in option">
-      <div class="col"><span>{{property}}</span></div>
-      <div class="col"><span>{{value}}</span></div>
-      
-      </div>
-      </div>
-      <template v-else>{{option}}</template>
-      </option>
-    </select>
-    <div v-if="inputField">
-    <div v-for="(field,index) in inputField">
-    
-    <div class="form-underline">
-    <div class="form-underline-titel">{{index}}</div>
-
-    <input  class="form-control" :id="index" :value="inputField[index]" @input="changeInput($event,inputField,index)" :placeholder="field">
-    </div>
-    
-      </div>
-    </div>
-
-    
- 
-    
-  
     </template>
     <!-- optional footer -->
     <template   v-slot:footer>
       <button class="btn btn-outline-danger " @click="hide">Abbrechen</button>
       <!--<p v-if="editTimestamp" class="flex-fill">Letzte Anfrage: {{editTimestamp}}</p>-->
     
-      <button v-if="isInputFieldChanged"  @click="submitProfilChange" role="button" class="btn btn-primary">Senden</button>
+      <button v-if="profilUpdate"  @click="submitProfilChange" role="button" class="btn btn-primary">Senden</button>
     </template>
     <!-- end of optional footer --> 
   </bs-modal>`,
diff --git a/public/js/components/Cis/Profil/EditProfilSelect.js b/public/js/components/Cis/Profil/EditProfilSelect.js
new file mode 100644
index 000000000..a888f2aef
--- /dev/null
+++ b/public/js/components/Cis/Profil/EditProfilSelect.js
@@ -0,0 +1,124 @@
+import {Kontakt, EditKontakt, Adresse, EditAdresse} from "./ProfilComponents.js";
+
+
+export default {
+    components: {
+      Kontakt,
+      EditKontakt,
+      Adresse,
+      EditAdresse,
+    },
+    props: {
+
+      //! this should throw an error in the js console, have to check later
+      list:Object,
+  
+      //? Prop used to determine how many options the select should initially show
+      size:{
+        type:Number,
+        default: null,
+      },
+      //? Content for the aria label of the select
+      ariaLabel:{
+        type:String,
+        required:true,
+      },
+      profilUpdate:String,
+      topic:String,
+
+     
+    },
+    emits:{
+        //? update:modelValue event is needed to notify the v-model when the value has changed
+        ['update:profilUpdate']:null,
+        ['update:topic']:null,
+        select:null,
+
+    },
+    data() {
+      return {
+        view:null,
+        data:null,
+      }
+    },
+  
+    methods: {
+      profilUpdateEmit: function(event){
+        console.log(event);
+        //? passes the updated profil information to the parent component
+        this.$emit('update:profilUpdate',event);
+      },
+      updateOptions: function(event, item){
+        
+        this.data=item.data; 
+        this.view=item.view; 
+        //? emits the selected topic to the parent component
+        if(item.title){
+          this.$emit('update:topic',item.title);
+        }
+      },
+     
+    },
+    computed: {
+      listLength: function(){
+        return this.list.length;
+      },
+      lastElement: function(){
+          return this.list[this.list.length-1];
+      },
+      computedList: function(){
+        if(Array.isArray(this.list)){
+            //? the passed data is an array
+            return this.list;
+        }else if(typeof(this.list) === 'object' && this.list !== null){
+            //? the passed data is an object
+            return Object.keys(this.list);
+        }else{
+            console.warn("The passed data is neither an Array or an Object");
+            return null;
+            //! the passed data is neither an object or an array
+        }
+        
+      }
+    },
+    created() {
+      this.data = JSON.parse(JSON.stringify(this.list.data));
+      this.view = JSON.parse(JSON.stringify(this.list.view));
+        
+        //? sets the default length of the options to show equal to the number of elements in the list
+        if(!this.optionLength){
+            //? if it is an object, then it will take the length of the object keys, otherwise it takes the normal length
+            this.optionLength = this.computedList.length;
+        }
+    },
+    mounted() {
+    },
+   
+    template: `
+  
+
+    <div v-if="!view" class="list-group">
+      <button type="button" class=" list-group-item list-group-item-action" @click="updateOptions($event,item)" v-for="item in data">
+      
+        <p v-if="item.title" class="my-1"   >{{item.title}}</p>
+        <!-- this is used for multiple elements in the select -->
+        <component class="my-2" :is="item.listview" v-bind="item"></component>
+      </button>
+    
+    </div>
+
+    <div v-else-if="view==='text_input'" class="form-underline">
+      <div class="form-underline-titel">{{data.titel?data.titel:'titel'}}</div>
+
+      <input  class="form-control" @input="$emit('update:profilUpdate',data.value)"  v-model="data.value" :placeholder="data.value">
+    </div>
+
+
+    <!-- if it not a normal text input field then reder the custom edit input component -->
+    <!-- custom component is required to emit an profilUpdate event to register the new entered value --> 
+    <template v-else>
+      <component @profilUpdate="profilUpdateEmit"  :is="view" :data="data"></component>
+    </template>
+   `,
+  };
+  
\ No newline at end of file
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 8070f50d8..c0bb372c4 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -1,14 +1,16 @@
 
 import { CoreFilterCmpt } from "../../../components/filter/Filter.js";
-import EditProfil from "./EditProfil.js"
-
-
+import EditProfil from "./EditProfil.js";
+import {Adresse, Kontakt, FetchProfilUpdates} from "./ProfilComponents.js";
 
 
 export default {
   components: {
     CoreFilterCmpt,
     EditProfil,
+    Adresse,
+    Kontakt,
+    FetchProfilUpdates,
   },
   data() {
     return {
@@ -260,24 +262,65 @@ export default {
   created() {
     
     
-
-    if(!this.data.editData){
+    
+    
     
 
       this.data.editData = {
-        Personen_Informationen : {...this.personData, vorname: this.data.vorname, nachname: this.data.nachname},
-        Private_Kontakte: this.data.kontakte,
-        Private_Adressen:this.privateAdressen,
+        view:null,
+        data:{
+        Personen_Informationen : {
+          title:"Personen Informationen",
+          view:null,
+          data:{
+            username:{
+              title:"username",
+              view:"text_input",
+              data:{
+                titel:"username",
+                value:this.data.username,
+              }
+            },
+            vorname: {
+              title:"vorname",
+              view:"text_input",
+              data:{
+                titel:"vorname",
+                value:this.data.vorname,
+              }},
+              nachname: {
+                title:"nachname",
+                view:"text_input",
+                data:{
+                  titel:"nachname",
+                  value:this.data.nachname,
+                }
+              }
+            }
+          },
+          Private_Kontakte: {
+            title:"Private Kontakte" ,
+            data:this.privateKontakte.map(kontakt => {
+              return {
+                listview:'Kontakt',
+                view:'EditKontakt',
+                data:kontakt
+              }})
+           },
+          Private_Adressen: {
+            title: "Private Adressen",
+            data:this.privateAdressen.map(kontakt => {
+              return {
+                listview:'Adresse',
+                view:'EditAdresse',
+                data:kontakt
+              }})
+           },
+          },
+       
       };
 
-    }else{
-      this.data.editData = {
-        Personen_Informationen : {...this.personData, vorname: this.data.vorname, nachname: this.data.nachname},
-        Private_Kontakte: this.data.kontakte,
-        Private_Adressen:this.privateAdressen,
-      };
-
-    }
+    console.log(JSON.stringify(this.data.editData,null,2));
   },
   mounted() {
     
@@ -335,7 +378,7 @@ export default {
               <div class="card-header">
               Profil Informations Änderungen Anfragen</div>
               <div class="card-body">
-              <p v-for="update in data.profilUpdates">{{update.requested_change}}</p>
+              <fetch-profil-updates></fetch-profil-updates>
               </div>
               </div>
              
@@ -629,39 +672,9 @@ export default {
                             
                             <div  class="gy-3  row ">
                             <div v-for="element in privateKontakte" class="col-12">
-                            <div class="gy-3 row align-items-center justify-content-center">
-                              <div class="col-1 text-center" >
-                              
-                              <i class="fa-solid " :class="{...(element.kontakt.includes('@')?{'fa-envelope':true}:{'fa-phone':true})}" style="color:rgb(0, 100, 156)"></i>
-                              </div>
-                              <div  :class="{...(element.anmerkung? {'col-11':true, 'col-md-6':true, 'col-xl-11':true, 'col-xxl-6':true} : {'col-10':true, 'col-xl-9':true, 'col-xxl-10':true})}">
-                                  
-                                  <!-- rendering KONTAKT emails -->
-                             
-
-                                  <div  class="form-underline ">
-                                  <div class="form-underline-titel">{{element.kontakttyp}}</div>
-                                  <a  :href="'mailto:'+element.kontakt" v-if="element.kontakt.includes('@')" class="form-underline-content">{{element.kontakt}} </a>
-                                  <a  v-else :href="'tel:'+element.kontakt" class="form-underline-content">{{element.kontakt}} </a>
-                                  </div>
-                                    
-                                 
-
-                              </div>
-                              <div v-if="element?.anmerkung" class="offset-1 offset-md-0 offset-xl-1 offset-xxl-0 order-2 order-sm-1 col-10  col-md-4   col-xl-9 col-xxl-4   ">
-                                  
-                              <div  class="form-underline ">
-                              <div class="form-underline-titel">Anmerkung</div>
-                              <span  class="form-underline-content">{{element.anmerkung}} </span>
-                              </div>
-
                             
-                              </div>
-                              <div class="col-1 col-sm-1 order-2  order-lg-1 col-xl-2 col-xxl-1 allign-middle">
-                                  <i v-if="element.zustellung" class="fa-solid fa-check"></i>
-                                  <i v-else="element.zustellung" class="fa-solid fa-xmark"></i>
-                              </div>
-                            </div>
+                            <Kontakt :data="element"></Kontakt>
+                            
                             </div>
                             </div>
                           </div>
@@ -675,60 +688,20 @@ export default {
                       <div class="col">
                         <div class="card">
                           <div class="card-header">Private Adressen</div>
-                          <div class="card-body">
-                          
-                            <div class="gy-3 row ">
-                            <div v-for="element in privateAdressen" class="col-12">
-                            <div class="gy-3 row justify-content-center align-items-center">
+                            <div class="card-body">
                             
-                            <!-- column 1 in the address row -->
-                            
-                                <div class="col-1 text-center">
+                              <div class="gy-3 row ">
+                                <div v-for="element in privateAdressen" class="col-12">
+                                <Adresse :data="element"></Adresse>
                                  
-                                  <i class="fa fa-location-dot fa-lg" style="color:#00649C "></i>
-                                
-                                </div>
-                                <div  class="col-11 col-sm-8 col-xl-11 col-xxl-8 order-1">
-
-                                <div class="form-underline ">
-                                <div class="form-underline-titel">Strasse</div>
-                                <span class="form-underline-content">{{element.strasse}} </span>
-                                </div>
-
-
-                                </div>
-                                
-                            <!-- column 2 in the address row -->
-                                <div  class="offset-1 offset-sm-0 offset-xl-1 offset-xxl-0 order-2 order-sm-4 order-xl-2 order-xxl-4 col-11 col-sm-5  col-xl-11 col-xxl-5  ">
-                                    
-
-                                    <div class="form-underline ">
-                                    <div class="form-underline-titel">Typ</div>
-                                    <span class="form-underline-content">{{element.adr_typ}} </span>
-                                    </div>
-
-                                </div>
-                                <div  class="offset-1 order-3 order-sm-3 col-11 col-sm-6  col-xl-7 col-xxl-6 ">
-                                    
-                                    <div class="form-underline ">
-                                    <div class="form-underline-titel">Ort</div>
-                                    <span class="form-underline-content">{{element.ort}} </span>
-                                    </div>
-                                </div>
-                                <div  class="offset-1 offset-sm-0 order-4 order-sm-2 order-xl-4 order-xxl-2 col-11 col-sm-3 col-xl-4 col-xxl-3 ">
-                                    <div class="form-underline ">
-                                    <div class="form-underline-titel">PLZ</div>
-                                    <span class="form-underline-content">{{element.plz}} </span>
-                                    </div>
-                                </div>
+                              </div>
                             </div>
                           </div>
-                          </div>
-                            </div>
                         </div>
                       </div>
                     </div>
-                    <!-- -->
+                    
+                    <!--   -->
 
 
 
@@ -795,11 +768,7 @@ export default {
                       <div class="card-header">
                       Profil Updates
                       </div>
-                      <div class="card-body d-flex justify-content-start flex-wrap">
-                      <!--  -->
-                  <button v-for="update in data.profilUpdates" class="btn m-1" :class="{'btn-outline-primary':(update.topic !== 'Private_Kontakte' || update.topic !== 'Private_Adressen'), 'btn-outline-danger':update.topic == 'Private_Kontakte', 'btn-outline-success':update.topic == 'Private_Adressen'}" ><i class="fa fa-edit"></i> {{update.topic}}</button>
-                        
-                       </div>
+                      <fetch-profil-updates :modal="EditProfil" :data="data.profilUpdates"></fetch-profil-updates>
                     </div>
 
                    
diff --git a/public/js/components/Cis/Profil/ProfilComponents.js b/public/js/components/Cis/Profil/ProfilComponents.js
new file mode 100644
index 000000000..55c748ec7
--- /dev/null
+++ b/public/js/components/Cis/Profil/ProfilComponents.js
@@ -0,0 +1,352 @@
+
+
+
+const Adresse = {
+    props:{data:Object, view:String},
+    data(){
+        return{}
+    },
+    created(){
+        
+    },
+    template:`
+    <div class="my-2 row justify-content-center align-items-center">
+    
+    <!-- column 1 in the address row -->
+    
+        <div class="col-1 text-center">
+         
+          <i class="fa fa-location-dot fa-lg" style="color:#00649C "></i>
+        
+        </div>
+        <div  class="col-11 col-sm-8 col-xl-11 col-xxl-8 order-1">
+
+        <div class="form-underline ">
+        <div class="form-underline-titel">Strasse</div>
+        <span class="form-underline-content">{{data.strasse}} </span>
+        </div>
+
+
+        </div>
+        
+    <!-- column 2 in the address row -->
+        <div  class="offset-1 offset-sm-0 offset-xl-1 offset-xxl-0 order-2 order-sm-4 order-xl-2 order-xxl-4 col-11 col-sm-5  col-xl-11 col-xxl-5  ">
+            
+
+            <div class="form-underline ">
+            <div class="form-underline-titel">Typ</div>
+            <span class="form-underline-content">{{data.adr_typ}} </span>
+            </div>
+
+        </div>
+        <div  class="offset-1 order-3 order-sm-3 col-11 col-sm-6  col-xl-7 col-xxl-6 ">
+            
+            <div class="form-underline ">
+            <div class="form-underline-titel">Ort</div>
+            <span class="form-underline-content">{{data.ort}} </span>
+            </div>
+        </div>
+        <div  class="offset-1 offset-sm-0 order-4 order-sm-2 order-xl-4 order-xxl-2 col-11 col-sm-3 col-xl-4 col-xxl-3 ">
+            <div class="form-underline ">
+            <div class="form-underline-titel">PLZ</div>
+            <span class="form-underline-content">{{data.plz}} </span>
+            </div>
+        </div>
+    </div>
+    `
+
+};
+
+const EditAdresse = {
+    props:{data:Object},
+    data(){
+        return{}
+    },
+    methods:{
+        updateValue: function(event,bind){
+            this.data[bind] = event.target.value;
+            this.$emit('profilUpdate',this.data);
+        },
+    },
+    created(){
+        
+    },
+    template:`
+    <div class="gy-3 row justify-content-center align-items-center">
+    
+    <!-- column 1 in the address row -->
+    
+      
+        <div  class="col-12 col-sm-9 col-xl-12 col-xxl-9 order-1">
+
+        <div class="form-underline ">
+        <div class="form-underline-titel">Strasse</div>
+        <input  class="form-control" :value="data.strasse" @input="updateValue($event,'strasse')" :placeholder="data.strasse">
+        
+        </div>
+
+
+        </div>
+        
+    <!-- column 2 in the address row -->
+        <div  class=" order-2 order-sm-4 order-xl-3 order-xxl-4 col-12 col-sm-5  col-xl-8 col-xxl-5  ">
+            
+
+            <div class="form-underline ">
+            <div class="form-underline-titel">Typ</div>
+            <input  class="form-control" :value="data.adr_typ" @input="updateValue($event,'adr_typ')" :placeholder="data.adr_typ">
+        
+            </div>
+
+        </div>
+        <div  class="order-3 order-sm-3 order-xl-2 order-xxl-3 col-12 col-sm-7  col-xl-12 col-xxl-7 ">
+            
+            <div class="form-underline ">
+            <div class="form-underline-titel">Ort</div>
+            <input  class="form-control" :value="data.ort" @input="updateValue($event,'ort')" :placeholder="data.ort">
+        
+            </div>
+        </div>
+        <div  class="order-4 order-sm-2 order-xl-4 order-xxl-2 col-12 col-sm-3 col-xl-4 col-xxl-3 ">
+            <div class="form-underline ">
+            <div class="form-underline-titel">PLZ</div>
+    
+            <input  class="form-control" :value="data.plz" @input="updateValue($event,'plz')" :placeholder="data.plz">
+        
+            </div>
+        </div>
+    </div>
+    `
+
+};
+
+const Kontakt = {
+    props:{
+        view:String,
+        data:Object,
+    },
+    data(){
+        return {
+
+        }
+    },
+    created(){
+
+    }, 
+    template:`
+    <div class=" row align-items-center justify-content-center">
+    <div class="col-1 text-center" >
+    
+    <i class="fa-solid " :class="{...(data.kontakt.includes('@')?{'fa-envelope':true}:{'fa-phone':true})}" style="color:rgb(0, 100, 156)"></i>
+    </div>
+    <div  :class="{...(data.anmerkung? {'col-11':true, 'col-md-6':true, 'col-xl-11':true, 'col-xxl-6':true} : {'col-10':true, 'col-xl-9':true, 'col-xxl-10':true})}">
+        
+        <!-- rendering KONTAKT emails -->
+   
+        
+        <div  class="form-underline ">
+        <div class="form-underline-titel">{{data.kontakttyp}}</div>
+        <a v-if="data.kontakt.includes('@')" role="link" :aria-disabled="view?true:false" :href="!view?('mailto:'+data.kontakt):null" class="form-underline-content">{{data.kontakt}} </a>
+        <a v-else role="link" :aria-disabled="view?true:false" :href="!view?('tel:'+data.kontakt):null" class="form-underline-content">{{data.kontakt}} </a>
+        </div>
+          
+       
+
+    </div>
+    <div v-if="data?.anmerkung" class="offset-1 offset-md-0 offset-xl-1 offset-xxl-0 order-2 order-sm-1 col-10  col-md-4   col-xl-9 col-xxl-4   ">
+        
+    <div  class="form-underline ">
+    <div class="form-underline-titel">Anmerkung</div>
+    <span  class="form-underline-content">{{data.anmerkung}} </span>
+    </div>
+
+  
+    </div>
+    <div class="text-center col-1 col-sm-1 order-2  order-lg-1 col-xl-2 col-xxl-1 allign-middle">
+        <i v-if="data.zustellung" class="fa-solid fa-check"></i>
+        <i v-else="data.zustellung" class="fa-solid fa-xmark"></i>
+    </div>
+  </div>
+    
+    
+    
+    
+    `,
+};
+
+const EditKontakt =  {
+    props:{
+        data:Object,
+    },
+    data(){
+        return{
+
+        }
+    },
+    methods:{
+        updateValue: function(event,bind){
+            if(bind === 'zustellung'){
+                this.data[bind] = event.target.checked;    
+            }else{
+                this.data[bind] = event.target.value;
+            }
+            
+            this.$emit('profilUpdate',this.data);
+        },
+    },
+    created(){
+        console.log(this.$props);
+    },
+    template:
+    `
+   
+    <div class="gy-3 row align-items-center justify-content-center">
+    
+   
+    <div class="col-12">
+        
+        <!-- rendering KONTAKT emails -->
+   
+
+        <div  class="form-underline">
+        <div class="form-underline-titel">{{data.kontakttyp}}</div>
+    
+        <input  class="form-control"   :value="data.kontakt" @input="updateValue($event,'kontakt')" :placeholder="data.kontakt">
+        </div>
+
+    
+          
+       
+
+    </div>
+    <div v-if="data?.anmerkung" class="col-12">
+        
+
+    <div  class="form-underline">
+    <div class="form-underline-titel">Anmerkung</div>
+
+    <input  class="form-control" :value="data.anmerkung" @input="updateValue($event,'anmerkung')" :placeholder="data.anmerkung">
+    </div>
+
+  
+
+  
+    </div>
+    
+  
+  
+  
+    <div  class="d-flex flex-row justify-content-start col-12  allign-middle">
+        
+   
+    
+        <span style="opacity: 0.65; font-size: .85rem; " class="px-2">Zustellungs Adresse</span>
+
+        <input class="form-check-input " type="checkbox" :checked="data.zustellung" @change="updateValue($event,'zustellung')" id="flexCheckDefault">
+    
+    
+ 
+
+   
+    </div>
+  </div>
+    `
+};
+
+
+//? used to edit already requested profil changes
+import EditProfil from "./EditProfil.js";
+const FetchProfilUpdates = {
+    props:{
+        data:{
+            type:Object,
+        },
+        
+    },
+    
+    data(){
+        return {}
+    },
+    methods:{
+        getView: function(topic){
+            console.log("the topic is here",topic);
+            switch(topic){
+                case "Private Kontakte" : return "EditKontakt"; break;
+                case "Private Adressen" : return "EditAdresse"; break;
+                default: return "text_input"; break;
+            }
+        },
+        openModal(updateRequest) {
+
+            let view = this.getView(updateRequest.topic);
+            let content =null;
+            if(view === 'text_input'){
+                content={
+                    view:view,
+                    data:{
+                        titel:updateRequest.topic,
+                        value:updateRequest.requested_change,
+                    },
+                    update:true,
+                    topic:updateRequest.topic,
+                }
+            }else{
+                content = {
+                    view: view,
+                    data: updateRequest.requested_change,
+                    update:true,
+                    topic:updateRequest.topic,
+                    
+                }
+            }
+
+
+            //? only show the popup if also the right content is available
+            if(content){
+            EditProfil.popup({ 
+                
+                value:content,
+                timestamp:null,
+              }).then((res) => {
+                /* if(res.timestamp && res.editData){
+                  this.data.editDataTimestamp = res.timestamp;
+                  this.data.editData = res.editData;
+                } */
+                
+              }).catch(e => {
+                console.log(e);
+               
+              });
+            
+            }
+           
+          
+          }, 
+    },
+    created(){
+        
+    },
+    template:`
+   
+    
+    <table class="table table-sm table-hover">
+    <thead>
+    <tr >
+      <th scope="col">Topic</th>
+      <th scope="col">Date of Request</th>
+      <th scope="col"></th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr v-for="item in data">
+      <td >{{item.topic}}</td>
+      <td >{{item.change_timestamp}}</td>
+      <td ><i @click="openModal(item)" role="button" class="fa fa-edit"></i></td>
+    </tr>
+  </tbody>
+    </table>
+    
+    `
+};
+
+export {Adresse, EditAdresse, Kontakt, EditKontakt, FetchProfilUpdates};
\ No newline at end of file
diff --git a/public/js/components/Cis/Selection/Select.js b/public/js/components/Cis/Selection/Select.js
deleted file mode 100644
index 59e039dea..000000000
--- a/public/js/components/Cis/Selection/Select.js
+++ /dev/null
@@ -1,86 +0,0 @@
-
-
-export default {
-    components: {
-    },
-    props: {
-
-      //! this should throw an error in the js console, have to check later
-      list:[Array,Object],
-      //? prop modelValue allows v-model on custom Components
-      modelValue:String,
-      //? Prop used to determine how many options the select should initially show
-      size:{
-        type:Number,
-        default: null,
-      },
-      //? Content for the aria label of the select
-      ariaLabel:{
-        type:String,
-        required:true,
-      },
-     
-    },
-    emits:{
-        //? update:modelValue event is needed to notify the v-model when the value has changed
-        ['update:modelValue']:null,
-        select:null,
-    },
-    data() {
-      return {
-        selectedOption: [],
-        optionLength:this.size,
-      }
-    },
-  
-    methods: {
-    },
-    computed: {
-      listLength: function(){
-        return this.list.length;
-      },
-      lastElement: function(){
-          return this.list[this.list.length-1];
-      },
-      computedList: function(){
-        if(Array.isArray(this.list)){
-            //? the passed data is an array
-            return this.list;
-        }else if(typeof(this.list) === 'object' && this.list !== null){
-            //? the passed data is an object
-            return Object.keys(this.list);
-        }else{
-            console.warn("The passed data is neither an Array or an Object");
-            return null;
-            //! the passed data is neither an object or an array
-        }
-        
-      }
-    },
-    created() {
-        console.log(this.optionLength);
-        //? sets the default length of the options to show equal to the number of elements in the list
-        if(!this.optionLength){
-            //? if it is an object, then it will take the length of the object keys, otherwise it takes the normal length
-            this.optionLength = this.computedList.length;
-        }
-    },
-    mounted() {
-    },
-    template: `
-    <p>size:{{optionLength}}</p>
-    <!-- styling des Selects und dessen Options könnte man noch anpassen -->
-    <div id="SelectStyle">
-    <select  v-model="selectedOption"  class="form-select" :size="this.optionLength" :aria-label="ariaLabel">
-      <option  @click="$emit('update:modelValue', option); $emit('select')" v-for="(option,index) in computedList" :value="option">
-        <template v-if="typeof(option) === 'object' && option !== null" >
-            <div class="row " v-for="(element,index) in option"><div class="col">{{index}} : </div><div class="col">{{element}}</div></div>
-        </template>
-        <template v-else >
-            {{option}}
-        </template>
-      </option>
-    </select>
-    </div>`,
-  };
-  
\ No newline at end of file

From 09c02b0906d4f9c5b5a949f52c2868aeeabaf156 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 15 Jan 2024 15:29:04 +0100
Subject: [PATCH 0312/1461] refactoring controllers, codesniffer

---
 .../controllers/components/stv/Kontakt.php    | 117 ++++++------------
 .../controllers/components/stv/Notiz.php      |  78 +-----------
 2 files changed, 46 insertions(+), 149 deletions(-)

diff --git a/application/controllers/components/stv/Kontakt.php b/application/controllers/components/stv/Kontakt.php
index 5ed9bc9ef..d8ed352f6 100644
--- a/application/controllers/components/stv/Kontakt.php
+++ b/application/controllers/components/stv/Kontakt.php
@@ -42,7 +42,6 @@ class Kontakt extends FHC_Controller
 		}
 	}
 
-	//old version
 	public function addNewAddress($person_id)
 	{
 		$this->load->library('form_validation');
@@ -58,6 +57,16 @@ class Kontakt extends FHC_Controller
 		$this->load->model('person/Adresse_model', 'AdresseModel');
 
 		$uid = getAuthUID();
+/*		$person_id = $this->input->post('$person_id');
+		$co_name = $this->input->post('co_name');
+		$strasse = $this->input->post('strasse');
+		$ort = $this->input->post('ort');
+		$gemeinde = $this->input->post('gemeinde');
+		$nation = $this->input->post('nation');
+		$name = $this->input->post('name');
+		$typ = $this->input->post('typ');
+		$anmerkung = $this->input->post('anmerkung');*/
+
 		$co_name = isset($_POST['co_name']) ? $_POST['co_name'] : null;
 		$strasse = isset($_POST['strasse']) ? $_POST['strasse'] : null;
 		$ort = isset($_POST['ort']) ? $_POST['ort'] : null;
@@ -98,68 +107,11 @@ class Kontakt extends FHC_Controller
 		if (isError($result))
 		{
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson($result);
+			return $this->outputJson(getError($result));
 		}
 		return $this->outputJsonSuccess(true);
 	}
 
-	//Version mit input->post() TODO(Manu) check mit Chris, not working
-/*	public function addNewAddress($person_id)
-	{
-		$this->load->library('form_validation');
-		//$_POST = json_decode($this->input->raw_input_stream, true);
-
-
-		$this->load->model('person/Adresse_model', 'AdresseModel');
-
-		$uid = getAuthUID();
-
-		$data = [
-			'insertvon' => $uid,
-			'insertamum' => date('c'),
-			'plz' => $this->input->post('plz'),
-			'heimatadresse' => $this->input->post('heimatadresse'),
-			'zustelladresse' => $this->input->post('zustelladresse'),
-			'rechnungsadresse' => $this->input->post('rechnungsadresse')
-		];
-
-
-		$this->form_validation->set_rules('plz', 'PLZ', 'required|numeric');
-
-		if ($this->form_validation->run() == false)
-		{
-			return $this->outputJsonError($this->form_validation->error_array());
-		}
-
-
-		if ($this->input->post('co_name'))
-			$data['co_name'] = $this->input->post('co_name');
-		if ($this->input->post('strasse'))
-			$data['strasse'] = $this->input->post('strasse');
-		if ($this->input->post('ort'))
-			$data['ort'] = $this->input->post('ort');
-		if ($this->input->post('gemeinde'))
-			$data['gemeinde'] = $this->input->post('gemeinde');
-		if ($this->input->post('nation'))
-			$data['nation'] = $this->input->post('nation');
-		if ($this->input->post('name'))
-			$data['name'] = $this->input->post('name');
-		if ($this->input->post('typ'))
-			$data['typ'] = $this->input->post('typ');
-		if ($this->input->post('anmerkung'))
-			$data['anmerkung'] = $this->input->post('anmerkung');
-		if ($this->input->post('firma'))
-			$data['firma_id'] = $this->input->post('firma_id');
-
-		$result = $this->AdresseModel->insert($data);
-		if (isError($result))
-		{
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson($result);
-		}
-		return $this->outputJsonSuccess(true);
-	}*/
-
 	public function updateAddress($address_id)
 	{
 		$uid = getAuthUID();
@@ -187,6 +139,8 @@ class Kontakt extends FHC_Controller
 		else
 			$firma_id = null;
 
+
+
 		$person_id = isset($_POST['person_id']) ? $_POST['person_id'] : null;
 		$co_name = isset($_POST['co_name']) ? $_POST['co_name'] : null;
 		$strasse = isset($_POST['strasse']) ? $_POST['strasse'] : null;
@@ -197,6 +151,16 @@ class Kontakt extends FHC_Controller
 		$typ = isset($_POST['typ']) ? $_POST['typ'] : null;
 		$anmerkung = isset($_POST['anmerkung']) ? $_POST['anmerkung'] : null;
 
+/*		$person_id = $this->input->post('$person_id');
+		$co_name = $this->input->post('co_name');
+		$strasse = $this->input->post('strasse');
+		$ort = $this->input->post('ort');
+		$gemeinde = $this->input->post('gemeinde');
+		$nation = $this->input->post('nation');
+		$name = $this->input->post('name');
+		$typ = $this->input->post('typ');
+		$anmerkung = $this->input->post('anmerkung');*/
+
 		$result = $this->AdresseModel->update(
 			[
 			'adresse_id' => $address_id
@@ -407,10 +371,11 @@ class Kontakt extends FHC_Controller
 			$standort_id = null;
 
 		$uid = getAuthUID();
-		$kontakttyp = isset($_POST['kontakttyp']) ? $_POST['kontakttyp'] : null;
-		$anmerkung = isset($_POST['anmerkung']) ? $_POST['anmerkung'] : null;
-		$kontakt = isset($_POST['kontakt']) ? $_POST['kontakt'] : null;
-		$ext_id = isset($_POST['ext_id']) ? $_POST['ext_id'] : null;
+
+		$kontakttyp = $this->input->post('kontakttyp');
+		$anmerkung = $this->input->post('anmerkung');
+		$kontakt = $this->input->post('kontakt');
+		$ext_id = $this->input->post('ext_id');
 
 		$result = $this->KontaktModel->insert(
 			[
@@ -453,11 +418,11 @@ class Kontakt extends FHC_Controller
 			$standort_id = null;
 
 		$uid = getAuthUID();
-		$kontakttyp = isset($_POST['kontakttyp']) ? $_POST['kontakttyp'] : null;
-		$anmerkung = isset($_POST['anmerkung']) ? $_POST['anmerkung'] : null;
-		$kontakt = isset($_POST['kontakt']) ? $_POST['kontakt'] : null;
-		$ext_id = isset($_POST['ext_id']) ? $_POST['ext_id'] : null;
-		$person_id = isset($_POST['person_id']) ? $_POST['person_id'] : null;
+		$kontakttyp = $this->input->post('kontakttyp');
+		$anmerkung = $this->input->post('anmerkung');
+		$kontakt = $this->input->post('kontakt');
+		$ext_id = $this->input->post('ext_id');
+		$person_id = $this->input->post('person_id');
 
 		$result = $this->KontaktModel->update(
 			[
@@ -536,14 +501,14 @@ class Kontakt extends FHC_Controller
 
 		$this->load->model('person/Bankverbindung_model', 'BankverbindungModel');
 
-		$ext_id = isset($_POST['ext_id']) ? $_POST['ext_id'] : null;
-		$oe_kurzbz = isset($_POST['oe_kurzbz']) ? $_POST['oe_kurzbz'] : null;
-		$orgform_kurzbz = isset($_POST['orgform_kurzbz']) ? $_POST['orgform_kurzbz'] : null;
-		$name = isset($_POST['name']) ? $_POST['name'] : null;
-		$anschrift = isset($_POST['anschrift']) ? $_POST['anschrift'] : null;
-		$bic = isset($_POST['bic']) ? $_POST['bic'] : null;
-		$blz = isset($_POST['blz']) ? $_POST['blz'] : null;
-		$kontonr = isset($_POST['kontonr']) ? $_POST['kontonr'] : null;
+		$ext_id = $this->input->post('ext_id');
+		$oe_kurzbz = $this->input->post('oe_kurzbz');
+		$orgform_kurzbz = $this->input->post('orgform_kurzbz');
+		$name = $this->input->post('name');
+		$anschrift = $this->input->post('anschrift');
+		$bic = $this->input->post('bic');
+		$blz  = $this->input->post('blz ');
+		$kontonr = $this->input->post('kontonr');
 
 		$result = $this->BankverbindungModel->insert(
 			[
diff --git a/application/controllers/components/stv/Notiz.php b/application/controllers/components/stv/Notiz.php
index 2356f8bf1..36504d77d 100644
--- a/application/controllers/components/stv/Notiz.php
+++ b/application/controllers/components/stv/Notiz.php
@@ -25,16 +25,8 @@ class Notiz extends FHC_Controller
 		$this->load->library('AuthLib');
 		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
 		$result = getAuthUid();
+
 		$this->outputJsonError($result);
-
-	//	$this->outputJson(getData($result));
-
-/*		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			$this->outputJson(getError($result));
-		} else {
-			$this->outputJson($result);
-		}*/
 	}
 
 	public function getNotizen($person_id)
@@ -163,64 +155,6 @@ class Notiz extends FHC_Controller
 		return $this->outputJsonSuccess(true);
 	}
 
-	public function updateNotizOldVersion($notiz_id)
-	{
-		$uid = getAuthUID();
-		$this->load->library('form_validation');
-		//$_POST = json_decode($this->input->raw_input_stream, true);
-
-		$this->form_validation->set_rules('titel', 'titel', 'required');
-		$this->form_validation->set_rules('text', 'Text', 'required');
-
-		if ($this->form_validation->run() == false)
-		{
-			return $this->outputJsonError($this->form_validation->error_array());
-		}
-
-		$this->load->model('person/Notiz_model', 'NotizModel');
-
-		if(!$notiz_id)
-		{
-			return $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-		}
-
-	//	$person_id = isset($_POST['person_id']) ? $_POST['person_id'] : null;
-		$uid = getAuthUID();
-		$titel = isset($_POST['titel']) ? $_POST['titel'] : null;
-		$text = isset($_POST['text']) ? $_POST['text'] : null;
-		$verfasser_uid = isset($_POST['verfasser_uid']) ? $_POST['verfasser_uid'] : null;
-		$bearbeiter_uid = $uid;
-		$erledigt = $_POST['erledigt'];
-		$start = $this->input->post(date('von'));
-		$ende = $this->input->post(date('bis'));
-
-
-
-		$result = $this->NotizModel->update(
-			[
-				'notiz_id' => $notiz_id
-			],
-			[
-				'titel' =>  $titel,
-				'updatevon' => $uid,
-				'updateamum' => date('c'),
-				'text' => $text,
-				'verfasser_uid' => $verfasser_uid,
-				'bearbeiter_uid' => $bearbeiter_uid,
-				'start' => $start,
-				'ende' => $ende,
-				'erledigt' => $erledigt
-			]
-		);
-
-		if (isError($result))
-		{
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson(getError($result));
-		}
-		return $this->outputJsonSuccess(true);
-	}
-
 	public function updateNotiz($notiz_id)
 	{
 		$this->load->model('person/Notiz_model', 'NotizModel');
@@ -315,7 +249,7 @@ class Notiz extends FHC_Controller
 		return $this->outputJsonSuccess(true);
 	}
 
-	public function deleteNotiz ($notiz_id)
+	public function deleteNotiz($notiz_id)
 	{
 		//dms_id auslesen aus notizdokument wenn vorhanden
 		$dms_id_arr = [];
@@ -331,7 +265,6 @@ class Notiz extends FHC_Controller
 		elseif (!hasData($result))
 		{
 			$this->outputJson($result);
-			//$dms_id_arr = [];
 		}
 		else
 		{
@@ -387,8 +320,8 @@ class Notiz extends FHC_Controller
 
 		$this->NotizModel->addSelect('campus.tbl_dms_version.*');
 
-		$this->NotizModel->addJoin('public.tbl_notiz_dokument','ON (public.tbl_notiz_dokument.notiz_id = public.tbl_notiz.notiz_id)');
-		$this->NotizModel->addJoin('campus.tbl_dms_version','ON (public.tbl_notiz_dokument.dms_id = campus.tbl_dms_version.dms_id)');
+		$this->NotizModel->addJoin('public.tbl_notiz_dokument', 'ON (public.tbl_notiz_dokument.notiz_id = public.tbl_notiz.notiz_id)');
+		$this->NotizModel->addJoin('campus.tbl_dms_version', 'ON (public.tbl_notiz_dokument.dms_id = campus.tbl_dms_version.dms_id)');
 
 		$result = $this->NotizModel->loadWhere(
 			array('public.tbl_notiz.notiz_id' => $notiz_id)
@@ -417,5 +350,4 @@ class Notiz extends FHC_Controller
 		}
 		$this->outputJson($result);
 	}
-
-}
\ No newline at end of file
+}

From 73792d1e780a21baa91a57ea54f3141025dc3cf9 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 15 Jan 2024 15:40:55 +0100
Subject: [PATCH 0313/1461] the user is now able to delete an existing change
 request that he made

---
 application/controllers/Cis/Profil.php           | 11 +++++++++++
 public/js/apps/api/userdata.js                   |  7 +++++++
 .../js/components/Cis/Profil/ProfilComponents.js | 16 +++++++++++++---
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index 8b87f3c5a..89ff47b32 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -21,6 +21,7 @@ class Profil extends Auth_Controller
 			'getView' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'insertProfilRequest' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'updateProfilRequest' => ['student/anrechnung_beantragen:r', 'user:r'],
+			'deleteProfilRequest' => ['student/anrechnung_beantragen:r', 'user:r'],
 			
 
 		]);
@@ -147,6 +148,16 @@ class Profil extends Auth_Controller
 		}
 	}
 
+	public function deleteProfilRequest(){
+
+		$json = json_decode($this->input->raw_input_stream);
+
+		$delete_res = $this->ProfilChangeModel->delete([$json]);
+		echo json_encode($delete_res);
+		
+
+	}
+
 
 
 	private function viewMitarbeiterProfil($uid)
diff --git a/public/js/apps/api/userdata.js b/public/js/apps/api/userdata.js
index df655988c..b8691e8ec 100644
--- a/public/js/apps/api/userdata.js
+++ b/public/js/apps/api/userdata.js
@@ -17,6 +17,13 @@ export default {
         return axios.post(url,{topic, payload});
     },
 
+    deleteProfilRequest: function(requestID){
+        const url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router+
+        `/Cis/Profil/deleteProfilRequest`;
+
+        return axios.post(url,requestID);
+    },
+
     getEditProfil: function() {
         const url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router+
                    `/Cis/Profil/getEditProfil`;
diff --git a/public/js/components/Cis/Profil/ProfilComponents.js b/public/js/components/Cis/Profil/ProfilComponents.js
index 55c748ec7..28a68bb64 100644
--- a/public/js/components/Cis/Profil/ProfilComponents.js
+++ b/public/js/components/Cis/Profil/ProfilComponents.js
@@ -268,6 +268,12 @@ const FetchProfilUpdates = {
         return {}
     },
     methods:{
+        deleteRequest: function(item){
+
+            Vue.$fhcapi.UserData.deleteProfilRequest(item.profil_update_id).then((res)=>{
+                console.log(res);
+            });
+        },
         getView: function(topic){
             console.log("the topic is here",topic);
             switch(topic){
@@ -289,6 +295,7 @@ const FetchProfilUpdates = {
                     },
                     update:true,
                     topic:updateRequest.topic,
+                    
                 }
             }else{
                 content = {
@@ -297,6 +304,7 @@ const FetchProfilUpdates = {
                     update:true,
                     topic:updateRequest.topic,
                     
+                    
                 }
             }
 
@@ -328,20 +336,22 @@ const FetchProfilUpdates = {
     },
     template:`
    
-    
+    <pre>{{JSON.stringify(data,null,2)}}</pre>
     <table class="table table-sm table-hover">
     <thead>
     <tr >
       <th scope="col">Topic</th>
       <th scope="col">Date of Request</th>
-      <th scope="col"></th>
+      <th scope="col">Bearbeiten</th>
+      <th scope="col">Löschen</th>
     </tr>
   </thead>
   <tbody>
     <tr v-for="item in data">
       <td >{{item.topic}}</td>
       <td >{{item.change_timestamp}}</td>
-      <td ><i @click="openModal(item)" role="button" class="fa fa-edit"></i></td>
+      <td class="text-center" ><i style="color:#00639c" @click="openModal(item)" role="button" class="fa fa-edit"></i></td>
+      <td class="text-center"><i style="color:red" role="button" @click="deleteRequest(item)" class="fa fa-trash"></i></td>
     </tr>
   </tbody>
     </table>

From 28fe3ef839820f6859b022962eccb9d3da930e98 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 16 Jan 2024 14:34:13 +0100
Subject: [PATCH 0314/1461] Funktionserweiterungen um idType

---
 .../controllers/components/stv/Notiz.php      | 51 +++++++++----
 application/models/person/Notiz_model.php     | 48 +++++++-----
 .../models/person/Notizzuordnung_model.php    | 31 ++++++++
 public/js/components/Notiz/Notiz.js           | 71 ++++++++----------
 .../Studentenverwaltung/Details/Notizen.js    | 73 +++++++++----------
 5 files changed, 163 insertions(+), 111 deletions(-)

diff --git a/application/controllers/components/stv/Notiz.php b/application/controllers/components/stv/Notiz.php
index 36504d77d..1850a5609 100644
--- a/application/controllers/components/stv/Notiz.php
+++ b/application/controllers/components/stv/Notiz.php
@@ -29,18 +29,30 @@ class Notiz extends FHC_Controller
 		$this->outputJsonError($result);
 	}
 
-	public function getNotizen($person_id)
+	public function getNotizen($id, $type)
 	{
 		$this->load->model('person/Notiz_model', 'NotizModel');
-		$type = 'person';
+		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
 
-		$result = $this->NotizModel->getNotizWithDocEntries($person_id);
+		//check if valid type
+		$isValidType = $this->NotizzuordnungModel->isValidType($type);
 
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+		if($isValidType)
+		{
+			$result = $this->NotizModel->getNotizWithDocEntries($id, $type);
+
+			if (isError($result)) {
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				$this->outputJson(getError($result));
+			} else {
+				$this->outputJson(getData($result) ?: []);
+			}
+		}
+		else
+		{
+			//Todo manu (correct return to ajax)
+			$result = "datatype not yet implemented for notes";
 			$this->outputJson(getError($result));
-		} else {
-			$this->outputJson(getData($result) ?: []);
 		}
 	}
 
@@ -60,8 +72,7 @@ class Notiz extends FHC_Controller
 		}
 
 		elseif (!hasData($result)) {
-			$this->outputJson($result); //success mit Wert null
-			//	$this->outputJson(getData($result) ?: []);
+			$this->outputJson($result);
 		}
 		else
 		{
@@ -69,7 +80,7 @@ class Notiz extends FHC_Controller
 		}
 	}
 
-	public function addNewNotiz($id)
+	public function addNewNotiz($id, $paramTyp = null)
 	{
 		$this->load->model('person/Notiz_model', 'NotizModel');
 
@@ -87,6 +98,18 @@ class Notiz extends FHC_Controller
 			}
 		}
 
+		//Überprüfung ob type übergeben wurde (entweder Funktions- oder Postparameter)
+		if ($paramTyp)
+			$type = $paramTyp;
+		if(isset($_POST['typeId']))
+			$type = $this->input->post('typeId');
+
+		if(!$type)
+		{
+			//Todo(manu) return error
+			var_dump("ERROR no type");
+		}
+
 		//Form Validation
 		$this->form_validation->set_rules('titel', 'titel', 'required');
 		$this->form_validation->set_rules('text', 'Text', 'required');
@@ -101,11 +124,11 @@ class Notiz extends FHC_Controller
 		$erledigt = $this->input->post('erledigt');
 		$verfasser_uid = isset($_POST['verfasser_uid']) ? $_POST['verfasser_uid'] : $uid;
 		$bearbeiter_uid = isset($_POST['bearbeiter']) ? $_POST['bearbeiter'] : null;
-		$type = $this->input->post('typeId');
+		//$type = $this->input->post('typeId');
 		$start = $this->input->post('von');
 		$ende = $this->input->post('bis');
 
-		//Speichern der Notiz und Notizzuordnung
+		//Speichern der Notiz und Notizzuordnung inkl Prüfung ob valid type
 		$result = $this->NotizModel->addNotizForType($type, $id, $titel, $text, $uid, $start, $ende, $erledigt, $verfasser_uid, $bearbeiter_uid);
 		if (isError($result))
 		{
@@ -219,7 +242,10 @@ class Notiz extends FHC_Controller
 			return $this->outputJson(getError($result));
 		}
 
+		//Todo(manu) update von Notizzuordnung?? typeId?
+
 		//neue Files speichern
+		//Todo(manu) update files
 		foreach ($_FILES as $k => $file)
 		{
 			$dms = array(
@@ -291,7 +317,6 @@ class Notiz extends FHC_Controller
 			}
 		}
 
-
 		//Todo(manu) rollback?
 		//delete Notiz und Notizzuordnung
 		$this->load->model('person/Notiz_model', 'NotizModel');
diff --git a/application/models/person/Notiz_model.php b/application/models/person/Notiz_model.php
index 7e7ffbe32..21c91884b 100644
--- a/application/models/person/Notiz_model.php
+++ b/application/models/person/Notiz_model.php
@@ -140,11 +140,31 @@ class Notiz_model extends DB_Model
 	 * @param id for Dokumentzuordnung (person_id, prestudent_id, uid, projekt_id...)
 	 * @param titel, text, start, ende, erledigt, verfasser_uid, bearbeiter_uid, insertvon Parameter for notiz
 	 */
-	public function addNotizForType($type, $id, $titel, $text, $insertvon, $start=null, $ende=null, $erledigt=false, $verfasser_uid=null, $bearbeiter_uid=null)
-	{
+	public function addNotizForType(
+		$type,
+		$id,
+		$titel,
+		$text,
+		$insertvon,
+		$start = null,
+		$ende = null,
+		$erledigt = false,
+		$verfasser_uid = null,
+		$bearbeiter_uid = null
+	) {
 		// Loads model Notizzuordnung_model
 		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
 
+		//check if valid type
+		$isValidType = $this->NotizzuordnungModel->isValidType($type);
+
+		if(!$isValidType)
+		{
+			//Todo manu (correct return to controller)
+			$msg = "datatype " . $type . " not implemented for notes";
+			return error($msg, EXIT_ERROR);
+		}
+
 		// Start DB transaction
 		$this->db->trans_start(false);
 
@@ -180,13 +200,10 @@ class Notiz_model extends DB_Model
 		return $result;
 	}
 
-
-
 	/**
 	 * Add a Notiz for a given person with DMS_id
 	 */
-	//TODO(manu) add type for Notizzuordnung
-	public function addNotizForPersonWithDoc($person_id, $titel, $text, $erledigt, $verfasser_uid, $von, $bis, $dms_id=null)
+	public function addNotizForPersonWithDoc($person_id, $titel, $text, $erledigt, $verfasser_uid, $von, $bis, $dms_id = null)
 	{
 		// Loads model Notizzuordnung_model
 		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
@@ -243,16 +260,12 @@ class Notiz_model extends DB_Model
 
 	/**
 	 * gets all Notizen with Documententries for a certain type and type_id
-	 * @param $person_id
+	 * @param String type of id eg. person_id, prestudent_id, mitarbeiter_uid, projekt_kurzbz, projektphase_id, projekttask_id,
+	 *         bestellung_id, lehreinheit_id, anrechnung_id, uid)
+	 * @param $id the corresponding id, part of public.tbl_notizzuordnung
 	 */
-	//Todo(Manu) rewrite in CI-Style
-	//Todo(Manu) auf andere types erweitern
-	public function getNotizWithDocEntries($id)
+	public function getNotizWithDocEntries($id, $type)
 	{
-	$type = 'writeFunction';
-		//$type_id = 'z.person_id';
-
-
 		$qry = "
 			SELECT 
 			    	n.*, count(dms_id) as countDoc, z.notizzuordnung_id
@@ -265,16 +278,15 @@ class Notiz_model extends DB_Model
 			LEFT JOIN 
 			    	    campus.tbl_dms_version USING (dms_id)
 			WHERE 
-			   z.person_id = ?
+			   z.$type  = ?
 			GROUP BY 
 			    notiz_id, z.notizzuordnung_id
 		";
 
-
 		return $this->execQuery($qry, array($id));
-
 	}
 
+
 	/**
 	 * gets all Notizen for a person with a specific title
 	 * @param $person_id
@@ -361,6 +373,4 @@ class Notiz_model extends DB_Model
 		
 		return $this->loadWhere(array('anrechnung_id' => $anrechnung_id));
 	}
-	// ------------------------------------------------------------------------------------------------------
-
 }
diff --git a/application/models/person/Notizzuordnung_model.php b/application/models/person/Notizzuordnung_model.php
index 187a8399b..542c68e6f 100644
--- a/application/models/person/Notizzuordnung_model.php
+++ b/application/models/person/Notizzuordnung_model.php
@@ -11,4 +11,35 @@ class Notizzuordnung_model extends DB_Model
 		$this->dbTable = 'public.tbl_notizzuordnung';
 		$this->pk = 'notizzuordnung_id';
 	}
+
+	public function isValidType($type)
+	{
+		//var_dump($type);
+		$validTypes = [];
+
+		$qry = "
+			SELECT column_name
+			FROM information_schema.columns
+			WHERE table_schema = 'public'
+			AND table_name   = 'tbl_notizzuordnung'
+		";
+
+		$type_arr = $this->execQuery($qry);
+		$type_arr = $type_arr->retval;
+
+		foreach ($type_arr as $t) {
+			$validTypes[] = $t->column_name;
+		}
+
+		if (in_array($type, $validTypes))
+		{
+		//	var_dump($type . " is IN ARRAY");
+			return true;
+		}
+		else
+		{
+			//var_dump($type . " is NOT IN ARRAY");
+			return false;
+		}
+	}
 }
diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index 46b6a6992..be472de6d 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -29,7 +29,7 @@ export default {
 			multiupload: true,
 			mitarbeiter: [],
 			filteredMitarbeiter: [],
-			filteredFirmen: []
+/*			filteredFirmen: []*/
 		}
 	},
 	computed: {
@@ -138,17 +138,16 @@ export default {
 		<form ref="form" @submit.prevent class="row">
 			<div>
 				<div class="row mb-3">
-					<b>{{action}}</b>
 					<div class="col-sm-7">
 						<span class="small">[{{this.typeId}}]</span>
-					</div>	
+					</div>
 				</div>
 	
 				<div class="notizTitle row mb-3">
 					<label for="titel" class="form-label col-sm-2">Titel</label>
 					<div class="col-sm-7">
 						<input type="text" v-model="intTitel" class="form-control">
-					</div>	
+					</div>
 				</div>
 				
 				<div class="row mb-3">
@@ -159,25 +158,21 @@ export default {
 				</div>
 			</div>
 	
-	<div v-if="showDocument">
-			<slot name="document">
+			<!-- show Documentupload-->
+			<div v-if="showDocument">
 				<div class="row mb-3">
 					<label for="text" class="form-label col-sm-2">Dokument</label>
 					
-				<!-- Component File-->
-				<div  class="col-sm-7">		
+				<!-- File component-->
+				<div  class="col-sm-7">
 					<File ref="upload" id="file" :multiupload="multiupload" v-model:dateien="intAnhang" ></File>
 				</div>
-			
 				<hr>
-
-				
-			</slot>
-	</div>	
-
-		<div v-if="showErweitert">
-<!--			<slot name="erweitert">	-->
-				
+			</div>
+			
+			<!-- show Details-->
+			<div v-if="showErweitert">
+			
 				<div class="row mb-3">
 					<label for="bis" class="form-label col-sm-2">VerfasserIn</label>
 					<div class="col-sm-3">
@@ -186,15 +181,15 @@ export default {
 					
 					<label for="von" class="form-label col-sm-1">von</label>
 					<div class="col-sm-3">
-						<vue-date-picker 
-							id="von" 
-							v-model="intVon" 
-							clearable="false" 
+						<vue-date-picker
+							id="von"
+							v-model="intVon"
+							clearable="false"
 							auto-apply
 							:enable-time-picker="false"
-							format="dd.MM.yyyy" 
+							format="dd.MM.yyyy"
 							preview-format="dd.MM.yyyy"></vue-date-picker>
-					</div>			
+					</div>
 				</div>
 				
 				<div class="row mb-3">
@@ -205,32 +200,28 @@ export default {
 					
 					<label for="bis" class="form-label col-sm-1">bis</label>
 					<div class="col-sm-3">
-						<vue-date-picker 
-							id="bis" 
-							v-model="intBis" 
-							clearable="false" 
-							auto-apply 
+						<vue-date-picker
+							id="bis"
+							v-model="intBis"
+							clearable="false"
+							auto-apply
 							:enable-time-picker="false"
-							format="dd.MM.yyyy" 
+							format="dd.MM.yyyy"
 							preview-format="dd.MM.yyyy"></vue-date-picker>
 					</div>
 					
 				</div>
 									
 				<div class="row mb-3">
-	
 					<label for="bis" class="form-label col-sm-2">erledigt</label>
-					<div class="col-sm-1"> 
-						<input type="checkbox" v-model="intErledigt">	
+					<div class="col-sm-1">
+						<input type="checkbox" v-model="intErledigt">
 					</div>
 				</div>
-<!--			</slot>-->
-		
-	</div>
-		
-		
-	</form>
-	
-</div>`
+			</div>
+				
+		</form>
+
+	</div>`
 }
 
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
index f88ce0627..8e9917287 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
@@ -6,7 +6,7 @@ import BsModal from "../../../Bootstrap/Modal";
 var editIcon = function (cell, formatterParams) {
 	return "<i class='fa fa-edit'></i>";
 };
-var deleteIcon = function (cell, formatterParams){
+var deleteIcon = function (cell, formatterParams) {
 	return "<i class='fa fa-remove text-danger'></i>";
 };
 
@@ -20,11 +20,11 @@ export default {
 	props: {
 		modelValue: Object
 	},
-	data() {
+	data(){
 		return {
 			tabulatorOptions: {
-				ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Notiz/getNotizen/' + this.modelValue.person_id),
-				//	+ this.modelValue.person_id, 'person'),
+				ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Notiz/getNotizen/' + this.modelValue.person_id + '/person_id'),
+				//ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Notiz/getNotizen/' + this.modelValue.person_id + '/' + this.typeId),
 				columns: [
 					{title: "Titel", field: "titel"},
 					{title: "Text", field: "text", width: 350},
@@ -52,7 +52,7 @@ export default {
 				],
 				layout: 'fitDataFill',
 				layoutColumnsOnNewData: false,
-				height: '200',
+				height: '150',
 				selectable: true,
 				index: 'notiz_id'
 			},
@@ -74,10 +74,10 @@ export default {
 				bearbeiter: null,
 				anhang: []
 			},
-			showErweitert: true,
-			showDocument: true
+			showErweitert: true, //show details verfasser, bearbeiter, von, bis, erledigt
+			showDocument: true //show upload documents
 
-		}
+		};
 	},
 	methods:{
 		actionDeleteNotiz(notiz_id){
@@ -107,8 +107,7 @@ export default {
 						this.loadDocEntries(this.notizen.notiz_id);
 						//console.log(this.formData.anhang);
 					}
-				})
-			;
+				});
 		},
 		actionNewNotiz(){
 			this.resetFormData();
@@ -125,13 +124,13 @@ export default {
 			this.formData.anhang = [];
 		},
 		addNewNotiz(notizData) {
-
 			const formData = new FormData();
 
 			formData.append('data', JSON.stringify(this.formData));
 			Object.entries(this.formData.anhang).forEach(([k, v]) => formData.append(k, v));
 
-			CoreRESTClient.post('components/stv/Notiz/addNewNotiz/' + this.modelValue.person_id,
+			CoreRESTClient.post(
+				'components/stv/Notiz/addNewNotiz/' + this.modelValue.person_id,
 				formData,
 				{ Headers: { "Content-Type": "multipart/form-data" } }
 			).then(response => {
@@ -163,16 +162,15 @@ export default {
 						this.$fhcAlert.alertError('Keine Notiz mit Id ' + notiz_id + ' gefunden');
 					}
 				}).catch(error => {
-				this.$fhcAlert.alertError('Fehler bei Löschroutine aufgetreten');
-			}).finally(()=> {
-				window.scrollTo(0, 0);
-			});
+					this.$fhcAlert.alertError('Fehler bei Löschroutine aufgetreten');
+				}).finally(()=> {
+					window.scrollTo(0, 0);
+				});
 		},
 		loadDocEntries(notiz_id){
 			return CoreRESTClient.get('components/stv/Notiz/loadDokumente/' + notiz_id)
 				.then(
 					result => {
-						//console.log(result.data);
 						if(result.data.retval) {
 							this.formData.anhang = result.data.retval;
 							console.log(this.formData.anhang);
@@ -187,15 +185,15 @@ export default {
 				);
 		},
 		loadNotiz(notiz_id){
-			return CoreRESTClient.get('components/stv/Notiz/loadNotiz/' + notiz_id)
+			return CoreRESTClient.get(
+				'components/stv/Notiz/loadNotiz/' + notiz_id)
 				.then(
 					result => {
 						if(result.data.retval) {
 							this.notizen = result.data.retval;
-							console.log(this.notizen);
+							//console.log(this.notizen);
 						}
-						else
-						{
+						else {
 							this.notizen = {};
 							this.$fhcAlert.alertError('Keine Notiz mit Id ' + notiz_id + ' gefunden');
 						}
@@ -230,7 +228,8 @@ export default {
 			Object.entries(this.formData.anhang).forEach(([k, v]) => formData.append(k, v));
 			//console.log(this.formData);
 
-			CoreRESTClient.post('components/stv/Notiz/updateNotiz/' + notiz_id,
+			CoreRESTClient.post(
+				'components/stv/Notiz/updateNotiz/' + notiz_id,
 				formData,
 				{ Headers: { "Content-Type": "multipart/form-data" } }
 			).then(response => {
@@ -256,9 +255,9 @@ export default {
 		CoreRESTClient
 			.get('components/stv/Notiz/getUid')
 			.then(result => {
-					if(result.data.retval) {
-						this.formData.verfasser = result.data.retval;
-					}
+				if(result.data.retval) {
+					this.formData.verfasser = result.data.retval;
+				}
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 	},
@@ -277,7 +276,7 @@ export default {
 				<button ref="Close" type="button" class="btn btn-primary" @click="deleteNotiz(notizen.notiz_id)">OK</button>
 			</template>
 		</BsModal>
-			
+		
 		<core-filter-cmpt
 		ref="table"
 		:tabulator-options="tabulatorOptions"
@@ -291,18 +290,18 @@ export default {
 		>
 	</core-filter-cmpt>
 
-	<br>	
+	<br>
 	<hr>
-		<Notiz 
+		<Notiz
 			ref="form"
 			:showErweitert="showErweitert"
 			:showDocument="showDocument"
 			v-model:typeId="formData.typeId"
-			v-model:titel="formData.titel" 
-			v-model:text="formData.text" 
-			v-model:statusNew="formData.statusNew" 				
-			v-model:von="formData.von" 
-			v-model:bis="formData.bis" 
+			v-model:titel="formData.titel"
+			v-model:text="formData.text"
+			v-model:statusNew="formData.statusNew"
+			v-model:von="formData.von"
+			v-model:bis="formData.bis"
 			v-model:document="formData.document"
 			v-model:erledigt="formData.erledigt"
 			v-model:verfasser="formData.verfasser"
@@ -314,10 +313,6 @@ export default {
 		<button v-if="formData.statusNew"  type="button" class="btn btn-primary" @click="addNewNotiz()"> Neu anlegen </button>
 		<button v-else type="button" class="btn btn-primary" @click="updateNotiz(notizen.notiz_id)"> Speichern </button>
 		
-		
-		<div>
-<!--			parent: -->
-		</div>
 	</div>
-`
-};
\ No newline at end of file
+	`
+};

From b53dec6a314de538552330352e1b8ef18f31d951 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 16 Jan 2024 15:44:04 +0100
Subject: [PATCH 0315/1461] adds breadcrumb to modal and adjusts controller
 functions and api calls

---
 application/controllers/Cis/Profil.php        | 40 ++++----
 .../models/person/Profil_change_model.php     | 30 +++++-
 public/js/apps/api/userdata.js                |  7 ++
 public/js/components/Cis/Profil/EditProfil.js | 92 ++++++-------------
 .../components/Cis/Profil/EditProfilSelect.js | 46 ++++------
 .../Cis/Profil/MitarbeiterProfil.js           | 57 ++++++------
 .../components/Cis/Profil/ProfilComponents.js | 71 +++++++-------
 .../js/components/Cis/Selection/Breadcrumb.js | 37 --------
 8 files changed, 174 insertions(+), 206 deletions(-)
 delete mode 100644 public/js/components/Cis/Selection/Breadcrumb.js

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index 89ff47b32..a8c89f631 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -22,7 +22,7 @@ class Profil extends Auth_Controller
 			'insertProfilRequest' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'updateProfilRequest' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'deleteProfilRequest' => ['student/anrechnung_beantragen:r', 'user:r'],
-			
+			'selectProfilRequest' => ['student/anrechnung_beantragen:r', 'user:r'],
 
 		]);
 		$this->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
@@ -67,7 +67,23 @@ class Profil extends Auth_Controller
 
 
 
+	public function selectProfilRequest(){
+		$uid =json_decode($this->input->get("uid"));
+		$id =json_decode($this->input->get("id"));
+		
+		if($uid && $id){
+			$res= $this->ProfilChangeModel->getProfilUpdate($uid, $id);
+		}elseif($uid){
+			$res= $this->ProfilChangeModel->getProfilUpdate($uid);
+		}elseif($id){
+			$res= $this->ProfilChangeModel->getProfilUpdate($this->uid, $id);
+		}else{
+			$res= $this->ProfilChangeModel->getProfilUpdate($this->uid);
+		}
 
+		echo json_encode($res);
+		
+	}
 
 	public function insertProfilRequest()
 	{
@@ -151,11 +167,8 @@ class Profil extends Auth_Controller
 	public function deleteProfilRequest(){
 
 		$json = json_decode($this->input->raw_input_stream);
-
 		$delete_res = $this->ProfilChangeModel->delete([$json]);
 		echo json_encode($delete_res);
-		
-
 	}
 
 
@@ -297,8 +310,6 @@ class Profil extends Auth_Controller
 	private function viewStudentProfil($uid)
 	{
 
-
-
 		if (
 			isSuccess($this->PersonModel->addSelect('gruppe_kurzbz, beschreibung')) &&
 			isSuccess($this->PersonModel->addJoin('tbl_benutzer', 'person_id')) &&
@@ -555,7 +566,7 @@ class Profil extends Auth_Controller
 
 
 		//? querying if the user has profil update requests
-		$profilUpdates = $this->ProfilChangeModel->loadWhere(["uid"=>$this->uid]);
+		$profilUpdates = $this->ProfilChangeModel->getProfilUpdate($this->uid);
 		if(isError($profilUpdates)){
 			//error handling
 		}else{
@@ -604,11 +615,8 @@ class Profil extends Auth_Controller
 		$res->standort_telefon = $telefon_res;
 
 		$res->profilUpdates = $profilUpdates?: null;
-		if($res->profilUpdates){
-		foreach($res->profilUpdates as $update){
-			$update->requested_change = json_decode($update->requested_change);
-			$update->change_timestamp = date_create($update->change_timestamp)->format('d.m.Y');
-		}}
+		
+		
 
 		return $res;
 	}
@@ -763,7 +771,7 @@ class Profil extends Auth_Controller
 		}
 
 		//? querying if the user has profil update requests
-		$profilUpdates = $this->ProfilChangeModel->loadWhere(["uid"=>$this->uid]);
+		$profilUpdates = $this->ProfilChangeModel->getProfilUpdate($this->uid);
 		if(isError($profilUpdates)){
 			//error handling
 		}else{
@@ -810,11 +818,7 @@ class Profil extends Auth_Controller
 
 		$res->mailverteiler = $mailverteiler_res;
 		$res->profilUpdates = $profilUpdates?: null;
-		if($res->profilUpdates){
-		foreach($res->profilUpdates as $update){
-			$update->requested_change = json_decode($update->requested_change);
-			$update->change_timestamp = date_create($update->change_timestamp)->format('d.m.Y');
-		}}
+	
 		
 		return $res;
 
diff --git a/application/models/person/Profil_change_model.php b/application/models/person/Profil_change_model.php
index 54b8adf4f..fb48e4726 100644
--- a/application/models/person/Profil_change_model.php
+++ b/application/models/person/Profil_change_model.php
@@ -15,7 +15,8 @@ class Profil_change_model extends DB_Model
 	}
 
 	/**
-	 * getLastStatuses
+	 * getTimestamp
+	 * returns insert or update timestamp of a certain profil update
 	 */
 	public function getTimestamp($uid){
 		$this->addSelect(['change_timestamp']);
@@ -23,4 +24,31 @@ class Profil_change_model extends DB_Model
 		return hasData($res) ? getData($res)[0]->change_timestamp : null;
 	}
 
+	/**
+	 * 
+	 * getProfilUpdate
+	 * returns a profil update with id 
+	 * returns all profil updates if id is set to null
+	 */
+	public function getProfilUpdate($uid,$id=null){
+		$whereClause = ["uid"=>$uid];
+		if(!is_null($id)){
+			$whereClause['profil_update_id']=$id;
+		}
+		
+		$res = $this->loadWhere($whereClause);
+		if(isError($res)){
+			// catch error
+		}else{
+			if(hasData($res)){
+				foreach($res->retval as $update){
+					$update->requested_change = json_decode($update->requested_change);
+					$update->change_timestamp = date_create($update->change_timestamp)->format('d.m.Y');
+				}
+			}
+		}
+		return $res;
+
+	}
+
 }
diff --git a/public/js/apps/api/userdata.js b/public/js/apps/api/userdata.js
index b8691e8ec..47df445b4 100644
--- a/public/js/apps/api/userdata.js
+++ b/public/js/apps/api/userdata.js
@@ -3,6 +3,13 @@ export default {
 
     //! API Calls for Profil Views
 
+    selectProfilRequest: function(uid=null,id=null) {
+        const url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router+
+                   `/Cis/Profil/selectProfilRequest?uid=${uid}&id=${id}`;
+                   
+        return axios.get(url);
+    },
+    
     insertProfilRequest: function(topic, payload) {
         const url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router+
                    `/Cis/Profil/insertProfilRequest`;
diff --git a/public/js/components/Cis/Profil/EditProfil.js b/public/js/components/Cis/Profil/EditProfil.js
index 103418fdf..978ab1f67 100644
--- a/public/js/components/Cis/Profil/EditProfil.js
+++ b/public/js/components/Cis/Profil/EditProfil.js
@@ -1,20 +1,17 @@
 import BsModal from "../../Bootstrap/Modal.js";
 import Alert from "../../Bootstrap/Alert.js";
-import BreadCrumb from "../Selection/Breadcrumb.js";
 import EditProfilSelect from "./EditProfilSelect.js";
 
 export default {
   components: {
     BsModal,
     Alert,
-    BreadCrumb,
     EditProfilSelect,
   },
   mixins: [BsModal],
   props: {
 
     value: Object,
-    
     timestamp: Object,
     /*
      * NOTE(chris):
@@ -30,31 +27,12 @@ export default {
   },
   data() {
     return {
-      propertySelected: false,
-      testValue:null,
-      testListe:{
-        privateInfo:{username:"hans33",Titel:"Doktor", Anrede:"Herr"},
-        privateKontakte:[{strasse:"strasse1",plz:100},{strasse:"strasse1",plz:100},{strasse:"strasse1",plz:100}],
-        privateAdressen:[{kontakt:"telefon",anmerkung:"1"},{kontakt:"email",anmerkung:"2"},{kontakt:"telefon",anmerkung:"3"}]
-      },
-      testSelectedItems:[],
-      profilUpdate:null,
-
-
       topic:null,
-      firstSelectedOption:null,
-      secondSelectedOption: null,
-      secondSelectedOptionIndex: null,
-    
-    
-      inputField:null,
-      
+      profilUpdate:null,      
       editData: this.value,
-      //? tracks what specific profil data was changed
-      changesData: {},
-      editTimestamp: this.timestamp,
+      breadcrumb:null,
       
-      result: true,
+      result: false,
       info: null,
     }
   },
@@ -62,69 +40,44 @@ export default {
   methods: {
 
     
-    
-    selectEvent: function (option){
-      this.editData = this.editData[option];
-    },
-    createDeepCopy: function(object){
-      //? using Vue.toRaw because deep clones with structuredClone can not be done on proxies
-      return structuredClone(Vue.toRaw(object));
-    },
-
-    changeInput: function(event, inputField,index){
-      let newValue = event.target.value? event.target.value: null;
-      inputField[index] = newValue; 
-
-    },
-
-
-     
-    
     submitProfilChange(){
       
-     
-        //* only inserts new row if the inputField value is different from the original value
-        if(this.topic && this.profilUpdate){
+       if(this.topic && this.profilUpdate){
 
         //? inserts new row in public.tbl_cis_profil_update 
       if(this.editData.update){
         
         Vue.$fhcapi.UserData.updateProfilRequest(this.topic,this.profilUpdate).then((res)=>{
-          this.result = {
-            editData: this.editData,
-            timestamp: res.data.retval,
-          };
-          this.hide(); 
           
           if(res.data.error == 0){
-           
+            this.result= true;
+            this.hide();
             Alert.popup("Ihre Anfrage wurde erfolgreich gesendet. Bitte warten Sie, während sich das Team um Ihre Anfrage kümmert.");
           }else{
+            this.result= false;
+            this.hide();
             Alert.popup("Ein Fehler ist aufgetreten: "+ JSON.stringify(res.data.retval));
           } 
-          //
+         
         });
-        //
-     
+      
       }else{
 
         Vue.$fhcapi.UserData.insertProfilRequest(this.topic,this.profilUpdate).then((res)=>{
-          this.result = {
-            editData: this.editData,
-            timestamp: res.data.retval,
-          };
-          this.hide(); 
+          
           
           if(res.data.error == 0){
-           
+            this.result= true;
+            this.hide();
             Alert.popup("Ihre Anfrage wurde erfolgreich gesendet. Bitte warten Sie, während sich das Team um Ihre Anfrage kümmert.");
           }else{
+            this.result= false;
+            this.hide();
             Alert.popup("Ein Fehler ist aufgetreten: "+ JSON.stringify(res.data.retval));
           } 
-          //
+      
         });
         
-      
     }
    
     }
@@ -135,7 +88,7 @@ export default {
   created() {
 
     if(this.editData.topic){
-      //? if the topic was passed through the prop add it to the reactive data
+      //? if the topic was passed through the prop add it to the component
       this.topic = this.editData.topic;
     }
    
@@ -145,7 +98,6 @@ export default {
     this.modal = this.$refs.modalContainer.modal;
   },
   popup(options) {
-    console.log("popup start");
     return BsModal.popup.bind(this)(null, options);
   },
   template: `
@@ -156,7 +108,15 @@ export default {
       {{"Profil bearbeiten" }}  
     </template>
     <template v-slot:default>
-    <edit-profil-select v-model:topic="topic" v-model:profilUpdate="profilUpdate" ariaLabel="test" :list="editData"></edit-profil-select>
+
+    <nav aria-label="breadcrumb" class="ps-2  ">
+      <ol class="breadcrumb ">
+        <li class="breadcrumb-item"  v-for="element in breadcrumb">{{element}}</li>
+      
+      </ol>
+    </nav>
+
+    <edit-profil-select v-model:breadcrumb="breadcrumb" v-model:topic="topic" v-model:profilUpdate="profilUpdate" ariaLabel="test" :list="editData"></edit-profil-select>
    
 
     </template>
diff --git a/public/js/components/Cis/Profil/EditProfilSelect.js b/public/js/components/Cis/Profil/EditProfilSelect.js
index a888f2aef..1323455c7 100644
--- a/public/js/components/Cis/Profil/EditProfilSelect.js
+++ b/public/js/components/Cis/Profil/EditProfilSelect.js
@@ -25,6 +25,7 @@ export default {
       },
       profilUpdate:String,
       topic:String,
+      breadcrumb:String,
 
      
     },
@@ -32,6 +33,7 @@ export default {
         //? update:modelValue event is needed to notify the v-model when the value has changed
         ['update:profilUpdate']:null,
         ['update:topic']:null,
+        ['update:breadcrumb']:null,
         select:null,
 
     },
@@ -39,6 +41,7 @@ export default {
       return {
         view:null,
         data:null,
+        breadcrumbItems:[],
       }
     },
   
@@ -52,44 +55,35 @@ export default {
         
         this.data=item.data; 
         this.view=item.view; 
-        //? emits the selected topic to the parent component
+        
         if(item.title){
+          //? emits the selected topic to the parent component
           this.$emit('update:topic',item.title);
+        
+          //? emits the new item for the breadcrumb in the parent component
+          this.breadcrumbItems.push(item.title);
+        }else{
+          if(item.data.kontakttyp){
+            this.breadcrumbItems.push(item.data.kontakttyp);
+            this.breadcrumbItems.push(item.data.kontakt);
+          }else if(item.data.strasse){
+            this.breadcrumbItems.push(item.data.strasse);
+          }
         }
+        this.$emit('update:breadcrumb',this.breadcrumbItems);
+        
       },
      
     },
     computed: {
-      listLength: function(){
-        return this.list.length;
-      },
-      lastElement: function(){
-          return this.list[this.list.length-1];
-      },
-      computedList: function(){
-        if(Array.isArray(this.list)){
-            //? the passed data is an array
-            return this.list;
-        }else if(typeof(this.list) === 'object' && this.list !== null){
-            //? the passed data is an object
-            return Object.keys(this.list);
-        }else{
-            console.warn("The passed data is neither an Array or an Object");
-            return null;
-            //! the passed data is neither an object or an array
-        }
-        
-      }
+      
+      
     },
     created() {
       this.data = JSON.parse(JSON.stringify(this.list.data));
       this.view = JSON.parse(JSON.stringify(this.list.view));
         
-        //? sets the default length of the options to show equal to the number of elements in the list
-        if(!this.optionLength){
-            //? if it is an object, then it will take the length of the object keys, otherwise it takes the normal length
-            this.optionLength = this.computedList.length;
-        }
+        
     },
     mounted() {
     },
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index c0bb372c4..062e9280e 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -122,31 +122,43 @@ export default {
   
   props: {
 		data: Object,
-		
-	
 	},
   
   methods: {
+
+    fetchProfilUpdates: function(){
+      Vue.$fhcapi.UserData.selectProfilRequest().then((res)=>{
+        
+        if(!res.error){
+          this.data.profilUpdates = res.data.retval?.length ? res.data.retval : null ; 
+        }
+      });
+    },
+  
     showModal() {
 
       EditProfil.popup({ 
           value:JSON.parse(JSON.stringify(this.data.editData)),
           timestamp:this.data.editDataTimestamp
-        }).then((res) => {
-          if(res.timestamp && res.editData){
-            this.data.editDataTimestamp = res.timestamp;
-            this.data.editData = res.editData;
+        }).then((popup_result) => {
+          if(popup_result){
+            Vue.$fhcapi.UserData.selectProfilRequest()
+            .then((res) =>{
+              if(!res.error){
+                this.data.profilUpdates = res.data.retval;
+              }else{
+                alert("Error when fetching profile updates: " +res.data.retval);
+              }
+            })
+            .catch(err=>alert(err));
           }
           
         }).catch((e) => {
           console.log(e);
          
         });
-     
     
     },
-
-
   
     sperre_foto_function() {
       if (!this.data) {
@@ -161,15 +173,11 @@ export default {
 
   computed: {
 
-    
-
     //? legacy mailto link to create an email with information that should be changed
     refreshMailTo() {
       return `mailto:info.mio@technikum-wien.at?subject=Datenkorrektur&body=Die%20Profildaten%20für%20User%20'${this.data.username}'%20sind%20nicht%20korrekt.%0DHier, die richtigen Daten:%0A%0ANachname:%20${this.data.nachname}%0AVorname:%20${this.data.vorname}%0AGeburtsdatum:${this.data.gebdatum}%0AGeburtsort:%20${this.data.gebort}%0ATitelPre:${this.data.titel}%20%0ATitelPost:${this.data.postnomen}%20%0A%0A***%0DPlatz für weitere (nicht angeführte Daten)%0D***%0A%0A[Bitte%20übermitteln%20Sie%20uns%20etwaige%20Dokumente%20zum%20Beleg%20der%20Änderung]`;
     },
 
-    
-
     get_image_base64_src() {
       if (!this.data) {
         return "";
@@ -177,9 +185,6 @@ export default {
       return "data:image/jpeg;base64," + this.data.foto;
     },
 
-    
-
-
     get_mitarbeiter_standort_telefon(){
       if(this.data.standort_telefon){
         return "tel:"+ this.data.telefonklappe + this.data.standort_telefon;
@@ -320,7 +325,7 @@ export default {
        
       };
 
-    console.log(JSON.stringify(this.data.editData,null,2));
+  
   },
   mounted() {
     
@@ -332,10 +337,6 @@ export default {
       this.$refs.funktionenTable.tabulator.setData(this.data.funktionen);
     });
 
-    
-    
-   
-    
   },
 
   template: ` 
@@ -378,7 +379,8 @@ export default {
               <div class="card-header">
               Profil Informations Änderungen Anfragen</div>
               <div class="card-body">
-              <fetch-profil-updates></fetch-profil-updates>
+              <fetch-profil-updates @fetchUpdates="fetchProfilUpdates" :data="data.profilUpdates"></fetch-profil-updates>
+                    
               </div>
               </div>
              
@@ -761,15 +763,16 @@ export default {
 
               <!-- START OF THE FIRDT ROW IN THE SIDE PANEL -->
               <!-- THESE QUCK LINKS ARE ONLY VISIBLE UNTIL VIEWPORT MD -->
-              <div  class="row d-none d-md-block mb-3">
+              <div v-if="data.profilUpdates" class="row d-none d-md-block mb-3">
               <div class="col mb-3">
-                 
-                    <div class="card">
+                    <div  class="card">
                       <div class="card-header">
                       Profil Updates
                       </div>
-                      <fetch-profil-updates :modal="EditProfil" :data="data.profilUpdates"></fetch-profil-updates>
-                    </div>
+                      <div class="card-body">
+                      <fetch-profil-updates @fetchUpdates="fetchProfilUpdates" :data="data.profilUpdates"></fetch-profil-updates>
+                      </div>
+                      </div>
 
                    
                       
diff --git a/public/js/components/Cis/Profil/ProfilComponents.js b/public/js/components/Cis/Profil/ProfilComponents.js
index 28a68bb64..6e8fdabce 100644
--- a/public/js/components/Cis/Profil/ProfilComponents.js
+++ b/public/js/components/Cis/Profil/ProfilComponents.js
@@ -195,7 +195,7 @@ const EditKontakt =  {
         },
     },
     created(){
-        console.log(this.$props);
+        
     },
     template:
     `
@@ -240,7 +240,7 @@ const EditKontakt =  {
         
    
     
-        <span style="opacity: 0.65; font-size: .85rem; " class="px-2">Zustellungs Adresse</span>
+        <span style="opacity: 0.65; font-size: .85rem; " class="px-2">Zustellungs Kontakt</span>
 
         <input class="form-check-input " type="checkbox" :checked="data.zustellung" @change="updateValue($event,'zustellung')" id="flexCheckDefault">
     
@@ -261,21 +261,28 @@ const FetchProfilUpdates = {
         data:{
             type:Object,
         },
-        
     },
+
+    emits:["fetchUpdates"],
     
     data(){
-        return {}
+        return {
+            
+        }
     },
     methods:{
         deleteRequest: function(item){
-
+            
             Vue.$fhcapi.UserData.deleteProfilRequest(item.profil_update_id).then((res)=>{
-                console.log(res);
+                if(res.data.error){
+                    //? open alert
+                    console.log(res.data);                    
+                }else{
+                    this.$emit('fetchUpdates');
+                }
             });
         },
         getView: function(topic){
-            console.log("the topic is here",topic);
             switch(topic){
                 case "Private Kontakte" : return "EditKontakt"; break;
                 case "Private Adressen" : return "EditAdresse"; break;
@@ -316,10 +323,9 @@ const FetchProfilUpdates = {
                 value:content,
                 timestamp:null,
               }).then((res) => {
-                /* if(res.timestamp && res.editData){
-                  this.data.editDataTimestamp = res.timestamp;
-                  this.data.editData = res.editData;
-                } */
+                if(res === true){
+                    this.$emit('fetchUpdates');
+                }
                 
               }).catch(e => {
                 console.log(e);
@@ -333,28 +339,31 @@ const FetchProfilUpdates = {
     },
     created(){
         
+    },
+    computed:{
+        
     },
     template:`
-   
-    <pre>{{JSON.stringify(data,null,2)}}</pre>
-    <table class="table table-sm table-hover">
-    <thead>
-    <tr >
-      <th scope="col">Topic</th>
-      <th scope="col">Date of Request</th>
-      <th scope="col">Bearbeiten</th>
-      <th scope="col">Löschen</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr v-for="item in data">
-      <td >{{item.topic}}</td>
-      <td >{{item.change_timestamp}}</td>
-      <td class="text-center" ><i style="color:#00639c" @click="openModal(item)" role="button" class="fa fa-edit"></i></td>
-      <td class="text-center"><i style="color:red" role="button" @click="deleteRequest(item)" class="fa fa-trash"></i></td>
-    </tr>
-  </tbody>
-    </table>
+    <div class="table-responsive">
+        <table class="m-0  table  table-hover">
+            <thead>
+                <tr >
+                <th scope="col">Topic</th>
+                <th scope="col">Date of Request</th>
+                <th scope="col">Bearbeiten</th>
+                <th style="white-space:normal" scope="col">Löschen</th>
+                </tr>
+            </thead>
+            <tbody>
+                <tr v-for="item in data">
+                <td class="align-middle">{{item.topic}}</td>
+                <td class="align-middle">{{item.change_timestamp}}</td>
+                <td class="align-middle text-center" ><i style="color:#00639c" @click="openModal(item)" role="button" class="fa fa-edit"></i></td>
+                <td class="align-middle text-center"><i style="color:red" role="button" @click="deleteRequest(item)" class="fa fa-trash"></i></td>
+                </tr>
+            </tbody>
+        </table>
+    </div>
     
     `
 };
diff --git a/public/js/components/Cis/Selection/Breadcrumb.js b/public/js/components/Cis/Selection/Breadcrumb.js
deleted file mode 100644
index 8a373e23a..000000000
--- a/public/js/components/Cis/Selection/Breadcrumb.js
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-export default {
-  components: {
-  },
-  props: {
-    //! this should throw an error in the js console, have to check later
-    list:Number,
-   
-  },
-  data() {
-    return {
-   
-    }
-  },
-
-  methods: {
-  },
-  computed: {
-    lastElement: function(){
-        return this.list[this.list.length-1];
-    }
-  },
-  created() {
-    
-  },
-  mounted() {
-  },
-  template: `
-  <nav aria-label="breadcrumb">
-  <ol class="breadcrumb">
-    <!-- https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Attributes/aria-current -->
-    <li class="breadcrumb-item"  :class="{'active':element===lastElement}" :aria-current="element===lastElement?'page':'false'" v-for="element in list">{{element}}</li>
-   
-  </ol>
-</nav>`,
-};

From a5c77543b1c9c767f93097dc6ae73d26061be8da Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 17 Jan 2024 12:07:06 +0100
Subject: [PATCH 0316/1461] adds functionality to delete a Kontakt or an Adress

---
 application/controllers/Cis/Profil.php        | 25 ++++++++++---
 public/js/components/Cis/Profil/EditProfil.js | 35 +++++--------------
 .../components/Cis/Profil/EditProfilSelect.js | 19 ++++++++--
 .../Cis/Profil/MitarbeiterProfil.js           |  3 ++
 .../components/Cis/Profil/ProfilComponents.js | 11 ++++--
 system/dbupdate_3.4/25999_C4_ma0594.php       |  2 +-
 6 files changed, 58 insertions(+), 37 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index a8c89f631..f0efb51e3 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -97,16 +97,33 @@ class Profil extends Auth_Controller
 		$res = $this->ProfilChangeModel->loadWhere(["uid"=>$this->uid]);
 		$res = hasData($res) ? getData($res) : null;
 
+		
 		//? checks if the user already made a request to change a topic
-		//! which is an constraint added to the public.tbl_cis_profil_update table
-		if($res){
+		//* Exception: a user can have multiple delete or add requests 
+			
 		foreach($res as $update_request){
-			if($update_request->topic == $json->topic && $update_request->uid == $this->uid){
+			
+			//TODO: Check if a change request already exists before adding the delete request
+				
+			if(property_exists($json->payload, "delete")){
+				
+				if(json_decode($update_request->requested_change) == $json->payload){
+				//? Check if the delete request for this resource already exists before adding the new delete request
+						
+					echo json_encode(error("this delete request already exists"));
+					return;	
+				}
+			}elseif(property_exists($json->payload, "add")){
+	
+			}elseif($update_request->topic == $json->topic && $update_request->uid == $this->uid){
 				
 				echo json_encode(error("uid and topic combination exists already"));
 				return;
 			}
-		}}
+		}
+		
+		
+		
 		
 		
 			$insert_res = $this->ProfilChangeModel->insert($data);
diff --git a/public/js/components/Cis/Profil/EditProfil.js b/public/js/components/Cis/Profil/EditProfil.js
index 978ab1f67..4f2022b0f 100644
--- a/public/js/components/Cis/Profil/EditProfil.js
+++ b/public/js/components/Cis/Profil/EditProfil.js
@@ -38,17 +38,15 @@ export default {
   },
 
   methods: {
-
-    
     submitProfilChange(){
       
        if(this.topic && this.profilUpdate){
 
         //? inserts new row in public.tbl_cis_profil_update 
-      if(this.editData.update){
-        
-        Vue.$fhcapi.UserData.updateProfilRequest(this.topic,this.profilUpdate).then((res)=>{
-          
+        //* calls the update api call if an update field is present in the data that was passed to the module
+        Vue.$fhcapi.UserData[this.editData.update?'updateProfilRequest':'insertProfilRequest'](this.topic,this.profilUpdate).then((res)=>{
+          console.log("topic",this.topic);
+          console.log("profilUpdate",this.profilUpdate);
           if(res.data.error == 0){
             this.result= true;
             this.hide();
@@ -60,26 +58,6 @@ export default {
           } 
          
         });
-      
-      }else{
-
-        Vue.$fhcapi.UserData.insertProfilRequest(this.topic,this.profilUpdate).then((res)=>{
-          
-          
-          if(res.data.error == 0){
-            this.result= true;
-            this.hide();
-            Alert.popup("Ihre Anfrage wurde erfolgreich gesendet. Bitte warten Sie, während sich das Team um Ihre Anfrage kümmert.");
-          }else{
-            this.result= false;
-            this.hide();
-            Alert.popup("Ein Fehler ist aufgetreten: "+ JSON.stringify(res.data.retval));
-          } 
-      
-        });
-        
-    }
-   
     }
     },
   },
@@ -116,7 +94,10 @@ export default {
       </ol>
     </nav>
 
-    <edit-profil-select v-model:breadcrumb="breadcrumb" v-model:topic="topic" v-model:profilUpdate="profilUpdate" ariaLabel="test" :list="editData"></edit-profil-select>
+    <pre>{{JSON.stringify(profilUpdate,null,2)}}</pre>
+    <pre>{{JSON.stringify(topic,null,2)}}</pre>
+
+    <edit-profil-select @submit="submitProfilChange" v-model:breadcrumb="breadcrumb" v-model:topic="topic" v-model:profilUpdate="profilUpdate" ariaLabel="test" :list="editData"></edit-profil-select>
    
 
     </template>
diff --git a/public/js/components/Cis/Profil/EditProfilSelect.js b/public/js/components/Cis/Profil/EditProfilSelect.js
index 1323455c7..f438100d7 100644
--- a/public/js/components/Cis/Profil/EditProfilSelect.js
+++ b/public/js/components/Cis/Profil/EditProfilSelect.js
@@ -34,6 +34,7 @@ export default {
         ['update:profilUpdate']:null,
         ['update:topic']:null,
         ['update:breadcrumb']:null,
+        submit:null,
         select:null,
 
     },
@@ -46,6 +47,16 @@ export default {
     },
   
     methods: {
+
+      deleteItem: function(item){
+        let data = item.data;
+        data.delete = true;
+        this.$emit('update:profilUpdate',item.data);
+        //? updates the topic when a Kontakt or an Address should be deleted
+        this.$emit('update:topic',item.data.kontakt?"Delete Kontakte":"Delete Adressen");
+        this.$emit('submit');
+      },
+
       profilUpdateEmit: function(event){
         console.log(event);
         //? passes the updated profil information to the parent component
@@ -92,11 +103,15 @@ export default {
   
 
     <div v-if="!view" class="list-group">
-      <button type="button" class=" list-group-item list-group-item-action" @click="updateOptions($event,item)" v-for="item in data">
+      <button style="position:relative" type="button" class=" list-group-item list-group-item-action" @click="updateOptions($event,item)" v-for="item in data">
       
         <p v-if="item.title" class="my-1"   >{{item.title}}</p>
         <!-- this is used for multiple elements in the select -->
-        <component class="my-2" :is="item.listview" v-bind="item"></component>
+        <div class="my-2 me-4" v-else>
+        <component  :is="item.listview" v-bind="item"></component>
+        <i @click="deleteItem(item)" style="color:lightcoral; position:absolute; top:10px; right:10px;" class="fa fa-trash"></i>
+        
+        </div>
       </button>
     
     </div>
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 062e9280e..e31d817f9 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -325,6 +325,9 @@ export default {
        
       };
 
+
+      console.log(JSON.stringify(this.data.editData,null,2));
+
   
   },
   mounted() {
diff --git a/public/js/components/Cis/Profil/ProfilComponents.js b/public/js/components/Cis/Profil/ProfilComponents.js
index 6e8fdabce..7234044c9 100644
--- a/public/js/components/Cis/Profil/ProfilComponents.js
+++ b/public/js/components/Cis/Profil/ProfilComponents.js
@@ -10,7 +10,7 @@ const Adresse = {
         
     },
     template:`
-    <div class="my-2 row justify-content-center align-items-center">
+    <div class="gy-2 row justify-content-center align-items-center">
     
     <!-- column 1 in the address row -->
     
@@ -166,6 +166,9 @@ const Kontakt = {
         <i v-if="data.zustellung" class="fa-solid fa-check"></i>
         <i v-else="data.zustellung" class="fa-solid fa-xmark"></i>
     </div>
+    
+    
+</div>
   </div>
     
     
@@ -344,13 +347,14 @@ const FetchProfilUpdates = {
         
     },
     template:`
+    <pre>{{JSON.stringify(data,null,2)}}</pre>
     <div class="table-responsive">
         <table class="m-0  table  table-hover">
             <thead>
                 <tr >
                 <th scope="col">Topic</th>
                 <th scope="col">Date of Request</th>
-                <th scope="col">Bearbeiten</th>
+                <th  scope="col">Bearbeiten</th>
                 <th style="white-space:normal" scope="col">Löschen</th>
                 </tr>
             </thead>
@@ -358,7 +362,8 @@ const FetchProfilUpdates = {
                 <tr v-for="item in data">
                 <td class="align-middle">{{item.topic}}</td>
                 <td class="align-middle">{{item.change_timestamp}}</td>
-                <td class="align-middle text-center" ><i style="color:#00639c" @click="openModal(item)" role="button" class="fa fa-edit"></i></td>
+                <td v-if="item.topic.toLowerCase().includes('delete')" class="align-middle text-center" >{{item.requested_change.adr_typ?item.requested_change.adr_typ:item.requested_change.kontakt}}</td>
+                <td v-else class="align-middle text-center" ><i style="color:#00639c" @click="openModal(item)" role="button" class="fa fa-edit"></i></td>
                 <td class="align-middle text-center"><i style="color:red" role="button" @click="deleteRequest(item)" class="fa fa-trash"></i></td>
                 </tr>
             </tbody>
diff --git a/system/dbupdate_3.4/25999_C4_ma0594.php b/system/dbupdate_3.4/25999_C4_ma0594.php
index eea45c0f1..4d694c4c2 100644
--- a/system/dbupdate_3.4/25999_C4_ma0594.php
+++ b/system/dbupdate_3.4/25999_C4_ma0594.php
@@ -19,7 +19,7 @@
 			 CACHE 1;
              
 		    ALTER TABLE public.tbl_cis_profil_update ALTER COLUMN profil_update_id SET DEFAULT nextval('public.tbl_cis_profil_update_id_seq');
-            ALTER TABLE public.tbl_cis_profil_update ADD CONSTRAINT cis_profil_udpate_topic_uid_unique UNIQUE (uid,topic);
+            --ALTER TABLE public.tbl_cis_profil_update ADD CONSTRAINT cis_profil_udpate_topic_uid_unique UNIQUE (uid,topic);
 
             GRANT SELECT, INSERT, UPDATE, DELETE ON public.tbl_cis_profil_update TO vilesci;
             GRANT SELECT, INSERT, UPDATE, DELETE ON public.tbl_cis_profil_update TO web; 

From dc5368f346fc86656050cc6a913694920ea7bce0 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 17 Jan 2024 13:23:52 +0100
Subject: [PATCH 0317/1461] =?UTF-8?q?Letzte=20=C3=84nderung?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controllers/components/stv/Notiz.php      |  2 ++
 application/models/person/Notiz_model.php     | 21 ++++++++++++-
 public/js/components/Notiz/Notiz.js           | 31 +++++++++++++++++--
 .../Studentenverwaltung/Details/Notizen.js    |  8 ++++-
 4 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/application/controllers/components/stv/Notiz.php b/application/controllers/components/stv/Notiz.php
index 1850a5609..82d494a16 100644
--- a/application/controllers/components/stv/Notiz.php
+++ b/application/controllers/components/stv/Notiz.php
@@ -61,6 +61,8 @@ class Notiz extends FHC_Controller
 		$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 
+			THEN public.tbl_notiz.updateamum ELSE public.tbl_notiz.insertamum END::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS lastUpdate");
 		$this->NotizModel->addLimit(1);
 
 		$result = $this->NotizModel->loadWhere(
diff --git a/application/models/person/Notiz_model.php b/application/models/person/Notiz_model.php
index 21c91884b..aac679915 100644
--- a/application/models/person/Notiz_model.php
+++ b/application/models/person/Notiz_model.php
@@ -266,9 +266,27 @@ class Notiz_model extends DB_Model
 	 */
 	public function getNotizWithDocEntries($id, $type)
 	{
+	// ci query builder returns null
+/*		$this->db->select('n.*, count(dms_id) as countDoc, z.notizzuordnung_id');
+		$this->db->select('(CASE WHEN n.updateamum >= n.insertamum THEN n.updateamum ELSE n.insertamum END) AS lastUpdate');
+		$this->db->from('public.tbl_notiz n');
+		$this->db->join('public.tbl_notizzuordnung z', 'n.notiz_id = z.notiz_id');
+		$this->db->join('public.tbl_notiz_dokument dok', 'n.notiz_id = dok.notiz_id', 'left');
+		$this->db->join('campus.tbl_dms_version', 'dok.notiz_id = campus.tbl_dms_version.dms_id', 'left');
+		$this->db->where("z.$type", $id);
+		$this->db->group_by('n.notiz_id, z.notizzuordnung_id');
+
+		$query = $this->db->get();
+		return $query->result();*/
+
+
 		$qry = "
 			SELECT 
-			    	n.*, count(dms_id) as countDoc, z.notizzuordnung_id
+			    	n.*, count(dms_id) as countDoc, z.notizzuordnung_id,
+			    	TO_CHAR (CASE 
+						WHEN n.updateamum >= n.insertamum THEN n.updateamum 
+						ELSE n.insertamum
+					END::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS lastUpdate
 			FROM
 			    	public.tbl_notiz n
 			JOIN 
@@ -284,6 +302,7 @@ class Notiz_model extends DB_Model
 		";
 
 		return $this->execQuery($qry, array($id));
+
 	}
 
 
diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index be472de6d..3c1bbab27 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -13,6 +13,7 @@ export default {
 		'typeId',
 		'titel',
 		'text',
+		'lastChange',
 		'von',
 		'bis',
 		'statusNew',
@@ -49,6 +50,14 @@ export default {
 				this.$emit('update:text', value);
 			}
 		},
+/*		intLastChange: {
+			get() {
+				return this.lastChange;
+			},
+			set(value) {
+				this.$emit('update:lastChange', value);
+			}
+		},*/
 		intVon: {
 			get() {
 				return this.von;
@@ -142,6 +151,13 @@ export default {
 						<span class="small">[{{this.typeId}}]</span>
 					</div>
 				</div>
+				
+				<div class="row mb-3">
+					<div class="col-sm-7">
+						<p v-if="statusNew" class="fw-bold">Neue Notiz</p>
+						<p v-else class="fw-bold">Notiz bearbeiten</p>
+					</div>
+				</div>
 	
 				<div class="notizTitle row mb-3">
 					<label for="titel" class="form-label col-sm-2">Titel</label>
@@ -156,6 +172,7 @@ export default {
 						<textarea rows="5" cols="75" v-model="intText" class="form-control"></textarea>
 					</div>
 				</div>
+				
 			</div>
 	
 			<!-- show Documentupload-->
@@ -179,7 +196,7 @@ export default {
 						<PvAutoComplete v-model="intVerfasser" optionLabel="mitarbeiter"  :suggestions="filteredMitarbeiter" @complete="search" minLength="3"/>
 					</div>
 					
-					<label for="von" class="form-label col-sm-1">von</label>
+					<label for="von" class="form-label col-sm-1">gültig von</label>
 					<div class="col-sm-3">
 						<vue-date-picker
 							id="von"
@@ -198,7 +215,7 @@ export default {
 						<PvAutoComplete v-model="intBearbeiter" optionLabel="mitarbeiter"  :suggestions="filteredMitarbeiter" @complete="search" minLength="3"/>
 					</div>
 					
-					<label for="bis" class="form-label col-sm-1">bis</label>
+					<label for="bis" class="form-label col-sm-1">gültig bis</label>
 					<div class="col-sm-3">
 						<vue-date-picker
 							id="bis"
@@ -219,7 +236,15 @@ export default {
 					</div>
 				</div>
 			</div>
-				
+			
+			<div class="row mb-3">
+				<label for="lastChange" class="form-label col-sm-2 small">letzte Änderung</label>
+				<div class="col-sm-7">
+<!--					<input v-model="lastChange" >-->
+					<p class="small">{{this.lastChange}}</p>
+				</div>
+			</div>
+			
 		</form>
 
 	</div>`
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
index 8e9917287..bbe03d785 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
@@ -37,6 +37,7 @@ export default {
 					{title: "Erledigt", field: "erledigt", visible: false},
 					{title: "Notiz_id", field: "notiz_id", visible: false},
 					{title: "Notizzuordnung_id", field: "notizzuordnung_id", visible: false},
+					{title: "letzte Änderung", field: "lastupdate", visible: false},
 					{
 						formatter: editIcon, cellClick: (e, cell) => {
 							this.actionEditNotiz(cell.getData().notiz_id);
@@ -66,6 +67,7 @@ export default {
 				titel: null,
 				statusNew: true,
 				text: null,
+				lastChange: null,
 				von: null,
 				bis: null,
 				document: null,
@@ -93,6 +95,7 @@ export default {
 					this.formData.titel = this.notizen.titel;
 					this.formData.statusNew = false;
 					this.formData.text = this.notizen.text;
+					this.formData.lastChange = this.notizen.lastupdate;
 					this.formData.von = this.notizen.start;
 					this.formData.bis = this.notizen.ende;
 					this.formData.document = this.notizen.dms_id;
@@ -115,6 +118,7 @@ export default {
 			this.formData.titel = '';
 			this.formData.statusNew = true;
 			this.formData.text = null;
+			this.formData.lastChange = null;
 			this.formData.von = null;
 			this.formData.bis = null;
 			this.formData.document = null;
@@ -212,6 +216,7 @@ export default {
 				titel: null,
 				statusNew: true,
 				text: null,
+				lastChange: null,
 				von: null,
 				bis: null,
 				document: null,
@@ -299,6 +304,7 @@ export default {
 			v-model:typeId="formData.typeId"
 			v-model:titel="formData.titel"
 			v-model:text="formData.text"
+			:lastChange="formData.lastChange"
 			v-model:statusNew="formData.statusNew"
 			v-model:von="formData.von"
 			v-model:bis="formData.bis"
@@ -312,7 +318,7 @@ export default {
 			
 		<button v-if="formData.statusNew"  type="button" class="btn btn-primary" @click="addNewNotiz()"> Neu anlegen </button>
 		<button v-else type="button" class="btn btn-primary" @click="updateNotiz(notizen.notiz_id)"> Speichern </button>
-		
+
 	</div>
 	`
 };

From 49fda27e56779ff99250be2f4b7e6744caa995d1 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 17 Jan 2024 13:53:32 +0100
Subject: [PATCH 0318/1461] profilUpdates need to have unique adresse_id or
 kontakt_id

---
 application/controllers/Cis/Profil.php        | 65 ++++++++-----------
 .../components/Cis/Profil/EditProfilSelect.js |  3 +-
 2 files changed, 27 insertions(+), 41 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index f0efb51e3..d308c5700 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -85,42 +85,41 @@ class Profil extends Auth_Controller
 		
 	}
 
+
+
 	public function insertProfilRequest()
 	{
 
 		$json = json_decode($this->input->raw_input_stream);
-		
+		$payload = $json->payload;
+		$type = isset($json->payload->kontakt_id)? "kontakt_id" : "adresse_id";
 
-		$data = ["topic"=>$json->topic,"uid" => $this->uid, "requested_change" => json_encode($json->payload), "change_timestamp" => "NOW()" ];
+		$data = ["topic"=>$json->topic,"uid" => $this->uid, "requested_change" => json_encode($payload), "change_timestamp" => "NOW()" ];
 
-		//? gets all the requested changes from a user
+		//? loops over all updateRequests from a user to validate if the new request is valid
 		$res = $this->ProfilChangeModel->loadWhere(["uid"=>$this->uid]);
 		$res = hasData($res) ? getData($res) : null;
-
-		
-		//? checks if the user already made a request to change a topic
-		//* Exception: a user can have multiple delete or add requests 
-			
+		if($res){
 		foreach($res as $update_request){
-			
-			//TODO: Check if a change request already exists before adding the delete request
+			$existing_change = json_decode($update_request->requested_change);
+
+			if(isset($existing_change->$type) && $existing_change->$type == $payload->$type){
+				//? the kontakt_id / adresse_id of a change has to be unique 
 				
-			if(property_exists($json->payload, "delete")){
-				
-				if(json_decode($update_request->requested_change) == $json->payload){
-				//? Check if the delete request for this resource already exists before adding the new delete request
-						
-					echo json_encode(error("this delete request already exists"));
-					return;	
-				}
-			}elseif(property_exists($json->payload, "add")){
-	
-			}elseif($update_request->topic == $json->topic && $update_request->uid == $this->uid){
-				
-				echo json_encode(error("uid and topic combination exists already"));
+				echo json_encode(error("cannot change the same resource twice"));
 				return;
 			}
-		}
+
+			
+			if(isset($payload->add)){
+				//TODO: add functionality for adding a new kontakt or address
+	
+			}elseif($update_request->topic == $json->topic && $update_request->uid == $this->uid){
+				//? if it is not a delete or add request than the topic in combination with the uid of the user have to be unique
+				echo json_encode(error("A request to change " + $json->topic + " is already open"));
+				return;
+			}
+		}}
 		
 		
 		
@@ -137,19 +136,7 @@ class Profil extends Auth_Controller
 				$insert_res->retval = date_create($editTimestamp)->format('d.m.Y');
 				echo json_encode($insert_res);
 			}
-			/* if (empty($res)) {
-		} else {
-			$update_res = $this->ProfilChangeModel->update([$this->uid], $data);
-			
-			if(isError($update_res)){
-				//catch error
-			}
-			$editTimestamp = $this->ProfilChangeModel->getTimestamp($this->uid);
-			//? status code 200 OK
-			$update_res->code = 200;
-			$update_res->retval = date_create($editTimestamp)->format('d.m.Y');;
-			echo json_encode($update_res);
-		} */
+		
 
 
 
@@ -449,7 +436,7 @@ class Profil extends Auth_Controller
 		if (
 
 			//? kontaktdaten soll auch nur der user selbst sehen
-			isSuccess($this->KontaktModel->addSelect('DISTINCT ON (kontakttyp) kontakttyp, kontakt, tbl_kontakt.anmerkung, tbl_kontakt.zustellung')) &&
+			isSuccess($this->KontaktModel->addSelect('DISTINCT ON (kontakttyp) kontakttyp, kontakt_id, kontakt, tbl_kontakt.anmerkung, tbl_kontakt.zustellung')) &&
 			isSuccess($this->KontaktModel->addJoin('public.tbl_standort', 'standort_id', 'LEFT')) &&
 			isSuccess($this->KontaktModel->addJoin('public.tbl_firma', 'firma_id', 'LEFT')) &&
 			isSuccess($this->KontaktModel->addOrder('kontakttyp, kontakt, tbl_kontakt.updateamum, tbl_kontakt.insertamum'))
@@ -662,7 +649,7 @@ class Profil extends Auth_Controller
 		if (
 
 			//? kontaktdaten soll auch nur der user selbst sehen
-			isSuccess($this->KontaktModel->addSelect('DISTINCT ON (kontakttyp) kontakttyp, kontakt, tbl_kontakt.anmerkung, tbl_kontakt.zustellung')) &&
+			isSuccess($this->KontaktModel->addSelect('DISTINCT ON (kontakttyp) kontakttyp, kontakt_id, kontakt, tbl_kontakt.anmerkung, tbl_kontakt.zustellung')) &&
 			isSuccess($this->KontaktModel->addJoin('public.tbl_standort', 'standort_id', 'LEFT')) &&
 			isSuccess($this->KontaktModel->addJoin('public.tbl_firma', 'firma_id', 'LEFT')) &&
 			isSuccess($this->KontaktModel->addOrder('kontakttyp, kontakt, tbl_kontakt.updateamum, tbl_kontakt.insertamum'))
diff --git a/public/js/components/Cis/Profil/EditProfilSelect.js b/public/js/components/Cis/Profil/EditProfilSelect.js
index f438100d7..1fad1ca92 100644
--- a/public/js/components/Cis/Profil/EditProfilSelect.js
+++ b/public/js/components/Cis/Profil/EditProfilSelect.js
@@ -49,8 +49,7 @@ export default {
     methods: {
 
       deleteItem: function(item){
-        let data = item.data;
-        data.delete = true;
+        
         this.$emit('update:profilUpdate',item.data);
         //? updates the topic when a Kontakt or an Address should be deleted
         this.$emit('update:topic',item.data.kontakt?"Delete Kontakte":"Delete Adressen");

From 22f6e3fe3bdf7a20ae2cef3ac73c5091a2f3cb38 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 17 Jan 2024 15:18:38 +0100
Subject: [PATCH 0319/1461] Upload Dms Component

---
 public/js/components/Form/Upload/Dms.js | 85 +++++++++++++++++++++++++
 1 file changed, 85 insertions(+)
 create mode 100644 public/js/components/Form/Upload/Dms.js

diff --git a/public/js/components/Form/Upload/Dms.js b/public/js/components/Form/Upload/Dms.js
new file mode 100644
index 000000000..1c2f476e8
--- /dev/null
+++ b/public/js/components/Form/Upload/Dms.js
@@ -0,0 +1,85 @@
+export default {
+	emits: [
+		'update:modelValue'
+	],
+	props: {
+		modelValue: {
+			type: [ FileList, Array ],
+			required: true
+		},
+		multiple: Boolean,
+		id: String,
+		name: String
+	},
+	methods: {
+		stringifyFile(file) {
+			return JSON.stringify({
+				lastModified: file.lastModified,
+				lastModifiedDate: file.lastModifiedDate,
+				name: file.name,
+				size: file.size,
+				type: file.type
+			});
+		},
+		addFiles(event) {
+			if (!this.multiple)
+				return this.$emit('update:modelValue', event.target.files);
+			
+			const dt = new DataTransfer();
+			const doubles = [];
+			for (var file of this.modelValue) {
+				dt.items.add(file);
+				doubles.push(this.stringifyFile(file));
+			}
+			for (var file of event.target.files) {
+				// NOTE(chris): deep check (with FileReader) would require an async function so we only check the basic attributes
+				if (doubles.indexOf(this.stringifyFile(file)) < 0)
+					dt.items.add(file);
+			}
+			this.$emit('update:modelValue', dt.files);
+		},
+		removeFile(id) {
+			const fileToRemove = Array.from(this.modelValue)[id];
+			
+			const dt = new DataTransfer();
+			for (var file of this.modelValue) {
+				if (file !== fileToRemove)
+					dt.items.add(file);
+			}
+			this.$emit('update:modelValue', dt.files);
+		}
+	},
+	watch: {
+		modelValue(n) {
+			if (n instanceof FileList)
+				return this.$refs.upload.files = n;
+
+			const dt = new DataTransfer();
+			const dms = [];
+			for (var file of n) {
+				if (file instanceof File) {
+					dt.items.add(file);
+				} else {
+					const dmsFile = new File([JSON.stringify(file)], file.name, {
+						type: 'application/x.fhc-dms+json'
+					});
+					dt.items.add(dmsFile);
+				}
+			}
+			this.$emit('update:modelValue', dt.files);
+		}
+	},
+	template: `
+	<div class="form-upload-dms">
+		<input ref="upload" class="form-control" :id="id" :name="name" :multiple="multiple" type="file" @change="addFiles">
+		<ul v-if="modelValue.length && multiple" class="list-unstyled m-0">
+			<li v-for="(file, index) in modelValue" :key="index" class="d-flex mx-1 mt-1">
+				<span class="col-auto"><i class="fa fa-file me-1"></i></span>
+				<span class="col">{{ file.name }}</span>
+				<button class="col-auto btn btn-outline-secondary btn-p-0" @click="removeFile(index)">
+					<i class="fa fa-close"></i>
+				</button>
+			</li>
+		</ul>
+	</div>`
+}
\ No newline at end of file

From abb9885b3b9a19cccbafecc718419ec765ab4064 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 17 Jan 2024 15:23:00 +0100
Subject: [PATCH 0320/1461] Fhc.css

---
 public/css/Fhc.css                 | 80 ++----------------------------
 public/css/Studentenverwaltung.css |  1 +
 2 files changed, 5 insertions(+), 76 deletions(-)

diff --git a/public/css/Fhc.css b/public/css/Fhc.css
index 23c2379ea..1376a251f 100644
--- a/public/css/Fhc.css
+++ b/public/css/Fhc.css
@@ -2,82 +2,10 @@
   white-space: pre-line;
 }
 
-.accordion-button-primary {
-  background-color: #e7f1ff;
-  color: #0c63e4;
-}
-.accordion-button-primary:not(.collapsed) {
-  background-color: #cfe2ff;
-  color: #0a58ca;
+.btn-p-0 {
+  padding: 0 .375rem;
 }
 
-.accordion-button-secondary {
-  background-color: #f0f1f2;
-  color: #616971;
+.z-1 {
+  z-index: 1;
 }
-.accordion-button-secondary:not(.collapsed) {
-  background-color: #e2e3e5;
-  color: #565e64;
-}
-
-.accordion-button-success {
-  background-color: #e8f3ee;
-  color: #177a4c;
-}
-.accordion-button-success:not(.collapsed) {
-  background-color: #d1e7dd;
-  color: #146c43;
-}
-
-.accordion-button-info {
-  background-color: #e7fafe;
-  color: #0cb6d8;
-}
-.accordion-button-info:not(.collapsed) {
-  background-color: #cff4fc;
-  color: #0aa2c0;
-}
-
-.accordion-button-warning {
-  background-color: #fff9e6;
-  color: #e6ae06;
-}
-.accordion-button-warning:not(.collapsed) {
-  background-color: #fff3cd;
-  color: #cc9a06;
-}
-
-.accordion-button-danger {
-  background-color: #fcebec;
-  color: #c6303e;
-}
-.accordion-button-danger:not(.collapsed) {
-  background-color: #f8d7da;
-  color: #b02a37;
-}
-
-.accordion-button-light {
-  background-color: #fefeff;
-  color: #dfe0e1;
-}
-.accordion-button-light:not(.collapsed) {
-  background-color: #fefefe;
-  color: #c6c7c8;
-}
-
-.accordion-button-dark {
-  background-color: #e9e9ea;
-  color: #1e2125;
-}
-.accordion-button-dark:not(.collapsed) {
-  background-color: #d3d3d4;
-  color: #1a1e21;
-}
-
-.tabulator-edit-list .tabulator-edit-list-item {
-  background-color: white;
-}
-.tabulator-edit-list .tabulator-edit-list-item:hover,
-.tabulator-edit-list .tabulator-edit-list-item.active {
-  color: white;
-}
\ No newline at end of file
diff --git a/public/css/Studentenverwaltung.css b/public/css/Studentenverwaltung.css
index f845adc43..3f12660ff 100644
--- a/public/css/Studentenverwaltung.css
+++ b/public/css/Studentenverwaltung.css
@@ -1,3 +1,4 @@
+@import './Fhc.css';
 @import './components/searchbar.css';
 @import './components/verticalsplit.css';
 @import './components/FilterComponent.css';

From 8762e87658523265fe469b2943fa0845f502d375 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 17 Jan 2024 15:24:44 +0100
Subject: [PATCH 0321/1461] Noten: Switch all/current semester

---
 .../controllers/components/stv/Noten.php      |  4 +-
 .../Details/Noten/Zeugnis.js                  | 54 +++++++++++++------
 2 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/application/controllers/components/stv/Noten.php b/application/controllers/components/stv/Noten.php
index dfde2892b..fb61de065 100644
--- a/application/controllers/components/stv/Noten.php
+++ b/application/controllers/components/stv/Noten.php
@@ -30,7 +30,7 @@ class Noten extends Auth_Controller
 		return $this->outputJson($result);
 	}
 
-	public function getZeugnis($prestudent_id)
+	public function getZeugnis($prestudent_id, $all = null)
 	{
 		$this->load->model('crm/Student_model', 'StudentModel');
 		$this->load->model('education/Zeugnisnote_model', 'ZeugnisnoteModel');
@@ -47,7 +47,7 @@ class Noten extends Auth_Controller
 		
 		$student_uid = current(getData($result))->student_uid;
 
-		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
+		$studiensemester_kurzbz = ($all === null) ? $this->variablelib->getVar('semester_aktuell') : null;
 
 		$result = $this->ZeugnisnoteModel->getZeugnisnoten($student_uid, $studiensemester_kurzbz);
 		if (isError($result)) {
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js
index 95875f868..0f5bcc62e 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js
@@ -2,6 +2,8 @@ import {CoreFilterCmpt} from "../../../../filter/Filter.js";
 import {CoreRESTClient} from '../../../../../RESTClient.js';
 import ZeugnisActions from './Zeugnis/Actions.js';
 
+const LOCAL_STORAGE_ID = 'stv_details_noten_zeugnis_2024-01-11_stdsem_all';
+
 export default {
 	components: {
 		CoreFilterCmpt,
@@ -13,12 +15,13 @@ export default {
 	data() {
 		return {
 			validStudent: true,
-			tabulatorEvents: []
+			tabulatorEvents: [],
+			stdsem: ''
 		};
 	},
 	computed: {
 		ajaxURL() {
-			return CoreRESTClient._generateRouterURI('components/stv/Noten/getZeugnis/' + this.student.prestudent_id);
+			return CoreRESTClient._generateRouterURI('components/stv/Noten/getZeugnis/' + this.student.prestudent_id + this.stdsem);
 		},
 		tabulatorOptions() {
 			return {
@@ -59,29 +62,50 @@ export default {
 			};
 		}
 	},
+	watch: {
+		ajaxURL(n) {
+			if (this.$refs.table)
+				this.$refs.table.tabulator.setData(n);
+		}
+	},
 	methods: {
 		setGrades(selected) {
 			CoreRESTClient
 				.post('components/stv/Noten/update', selected)
 				.then(this.$refs.table.reloadTable)
 				.catch(this.$fhcAlert.handleFormValidation);
+		},
+		saveStdsem(event) {
+			window.localStorage.setItem(LOCAL_STORAGE_ID, event.target.value ? 'true' : '');
 		}
 	},
+	created() {
+		const savedPath = window.localStorage.getItem(LOCAL_STORAGE_ID);
+		this.stdsem = savedPath ? '/all' : '';
+	},
+	// TODO(chris): phrasen
 	template: `
 	<div class="stv-details-noten-zeugnis h-100 d-flex flex-column">
 		<div v-if="!validStudent">Kein Student</div>
-		<core-filter-cmpt
-			v-else
-			ref="table"
-			:tabulator-options="tabulatorOptions"
-			:tabulator-events="tabulatorEvents"
-			table-only
-			:side-menu="false"
-			reload
-			>
-			<template #actions="{selected}">
-				<zeugnis-actions :selected="selected" @set-grades="setGrades"></zeugnis-actions>
-			</template>
-		</core-filter-cmpt>
+		<template v-else>
+			<div class="mb-3">
+				<select class="form-select" v-model="stdsem" @input="saveStdsem">
+					<option value="">Aktuelles Semester</option>
+					<option value="/all">Alle Semester</option>
+				</select>
+			</div>
+			<core-filter-cmpt
+				ref="table"
+				:tabulator-options="tabulatorOptions"
+				:tabulator-events="tabulatorEvents"
+				table-only
+				:side-menu="false"
+				reload
+				>
+				<template #actions="{selected}">
+					<zeugnis-actions :selected="selected" @set-grades="setGrades"></zeugnis-actions>
+				</template>
+			</core-filter-cmpt>
+		</template>
 	</div>`
 };
\ No newline at end of file

From 5c9e1b3fd36ac56238b352964e6d6e571d2c4a2c Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 17 Jan 2024 15:28:39 +0100
Subject: [PATCH 0322/1461] Use new Form Components in Details

---
 .../controllers/components/stv/Student.php    |   7 +-
 public/js/components/Form/Input.js            |  20 +-
 public/js/components/Form/Upload/Image.js     |  18 +-
 .../Studentenverwaltung/Details/Details.js    | 512 ++++++++++--------
 4 files changed, 329 insertions(+), 228 deletions(-)

diff --git a/application/controllers/components/stv/Student.php b/application/controllers/components/stv/Student.php
index 88627ca03..ddfd95aed 100644
--- a/application/controllers/components/stv/Student.php
+++ b/application/controllers/components/stv/Student.php
@@ -77,6 +77,7 @@ class Student extends FHC_Controller
 		$this->form_validation->set_rules('semester', 'Semester', 'integer');
 
 		if ($this->form_validation->run() == false) {
+			$this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST);
 			return $this->outputJsonError($this->form_validation->error_array());
 		}
 
@@ -202,7 +203,11 @@ class Student extends FHC_Controller
 			}
 		}
 
-		$this->outputJsonSuccess(true);
+		$this->outputJson(success(array_fill_keys(array_merge(
+			array_keys($update_lehrverband),
+			array_keys($update_person),
+			array_keys($update_student)
+		), ''), 1));
 	}
 
 	public function check()
diff --git a/public/js/components/Form/Input.js b/public/js/components/Form/Input.js
index 46ddbd3c5..8bdff639b 100644
--- a/public/js/components/Form/Input.js
+++ b/public/js/components/Form/Input.js
@@ -14,7 +14,8 @@ export default {
 		bsFeedback: Boolean,
 		noAutoClass: Boolean,
 		type: String,
-		name: String
+		name: String,
+		containerClass: [String, Array, Object]
 	},
 	data() {
 		return {
@@ -23,6 +24,13 @@ export default {
 		}
 	},
 	computed: {
+		hasContainer() {
+			if (!this.bsFeedback)
+				return true;
+			if (this.containerClass)
+				return true;
+			return false;
+		},
 		lcType() {
 			if (!this.type)
 				return 'text';
@@ -37,6 +45,8 @@ export default {
 					return 'VueDatePicker';
 				case 'autocomplete':
 					return 'PvAutocomplete';
+				case 'uploadimage':
+					return 'UploadImage';
 				default:
 					return 'input';
 			}
@@ -133,7 +143,9 @@ export default {
 			if (this.tag == 'VueDatePicker' && !this._.components.VueDatePicker) {
 				this._.components.VueDatePicker = Vue.defineAsyncComponent(() => import("../vueDatepicker.js.php"));
 			} else if (this.tag == 'PvAutocomplete' && !this._.components.PvAutocomplete) {
-				this._.components.PvAutocomplete = Vue.defineAsyncComponent(() => import(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + "/public/js/components/primevue/autocomplete/autocomplete.esm.min.js"));;
+				this._.components.PvAutocomplete = Vue.defineAsyncComponent(() => import(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + "/public/js/components/primevue/autocomplete/autocomplete.esm.min.js"));
+			} else if (this.tag == 'UploadImage' && !this._.components.UploadImage) {
+				this._.components.UploadImage = Vue.defineAsyncComponent(() => import("./Upload/Image.js"));
 			}
 		}
 	},
@@ -149,7 +161,7 @@ export default {
 		// TODO(chris): wrap check in div?
 	},
 	template: `
-	<component :is="bsFeedback ? 'FhcFragment' : 'div'" class="position-relative">
+	<component :is="hasContainer ? 'FhcFragment' : 'div'" class="position-relative" :class="containerClass">
 		<label v-if="$attrs.label && lcType != 'radio' && lcType != 'checkbox'" :for="idCmp">{{$attrs.label}}</label>
 		<input v-if="tag == 'input'" :type="lcType" v-model="modelValueCmp" v-bind="$attrs" :id="idCmp" :name="name" :class="validationClass" :modelValue="undefined" @input="clearValidation(); $emit('input', $event)">
 		<textarea v-else-if="tag == 'textarea'" v-model="modelValueCmp" v-bind="$attrs" :id="idCmp" :name="name" :class="validationClass" :modelValue="undefined" @input="clearValidation(); $emit('input', $event)"></textarea>
@@ -197,7 +209,7 @@ export default {
 			>
 			<slot></slot>
 		</component>
-		<div v-if="valid !== undefined" :class="feedbackClass">
+		<div v-if="valid !== undefined && feedback.length" :class="feedbackClass">
 			<template v-for="(msg, i) in feedback" :key="i">
 				<hr v-if="i" class="m-0">
 				{{msg}}
diff --git a/public/js/components/Form/Upload/Image.js b/public/js/components/Form/Upload/Image.js
index 270108ace..b0b8d5b78 100644
--- a/public/js/components/Form/Upload/Image.js
+++ b/public/js/components/Form/Upload/Image.js
@@ -46,17 +46,17 @@ export default {
 			</div>
 		</template>
 		<template v-else>
-			<slot name="placeholder">
+			<slot>
 				<svg class="bd-placeholder-img img-thumbnail" xmlns="http://www.w3.org/2000/svg" role="img" aria-label="A generic square placeholder image with a white border around it, making it resemble a photograph taken with an old instant camera: 200x200" preserveAspectRatio="xMidYMid slice" focusable="false"><title>A generic square placeholder image with a white border around it, making it resemble a photograph taken with an old instant camera</title><rect width="100%" height="100%" fill="#868e96"></rect><text x="50%" y="50%" fill="#dee2e6" dy=".3em"></text></svg>
-				<div class="fotobutton-visible">
-					<div class="d-grid gap-2 d-md-flex">
-						<button type="button" class="btn btn-outline-dark btn-sm" @click="openUploadDialog">
-							<i class="fa fa-pen"></i>
-						</button>
-					</div>
-				</div>
 			</slot>
+			<div class="fotobutton-visible">
+				<div class="d-grid gap-2 d-md-flex">
+					<button type="button" class="btn btn-outline-dark btn-sm" @click="openUploadDialog">
+						<i class="fa fa-pen"></i>
+					</button>
+				</div>
+			</div>
 		</template>
-		<input class="d-none" type="file" ref="fileInput" @input="pickFile" accept="image/*">
+		<input :id="$attrs.id" class="d-none" type="file" ref="fileInput" @input="pickFile" accept="image/*">
 	</div>`
 }
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
index ebbd68dd2..0c988179f 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
@@ -1,16 +1,14 @@
-import VueDatePicker from '../../../vueDatepicker.js.php';
-import FormUploadImage from '../../../Form/Upload/Image.js';
 import {CoreRESTClient} from '../../../../RESTClient.js';
-
-
-import PvToast from "../../../../../../index.ci.php/public/js/components/primevue/toast/toast.esm.min.js";
+import FormForm from '../../../Form/Form.js';
+import FormInput from '../../../Form/Input.js';
+import FormUploadImage from '../../../Form/Upload/Image.js';
 
 
 export default {
 	components: {
-		VueDatePicker,
-		FormUploadImage,
-		PvToast
+		FormForm,
+		FormInput,
+		FormUploadImage
 	},
 	inject: {
 		showBpk: {
@@ -62,6 +60,9 @@ export default {
 		},
 		changedLength() {
 			return Object.keys(this.changed).length;
+		},
+		noImageSrc() {
+			return FHC_JS_DATA_STORAGE_OBJECT.app_root + 'skin/images/profilbild_dummy.jpg';
 		}
 	},
 	watch: {
@@ -69,6 +70,7 @@ export default {
 			this.updateStudent(n);
 		},
 		data: {
+			// TODO(chris): use @input instead?
 			handler(n) {
 				let res = {};
 				for (var k in this.original) {
@@ -82,7 +84,6 @@ export default {
 					}
 				}
 				this.changed = res;
-				this.resetErrors();
 			},
 			deep: true
 		}
@@ -98,213 +99,264 @@ export default {
 						this.data.familienstand = '';
 					this.original = {...this.data};
 				})
-				.catch(err => {
-					console.error(err.response.data || err.message);
-				});
+				.catch(this.$fhcAlert.handleSystemError);
 		},
 		save() {
-			CoreRESTClient
-				.post('components/stv/Student/save/' + this.modelValue.prestudent_id, this.changed)
-				.then(result => result.data)
+			this.$refs.form
+				.send(CoreRESTClient.post('components/stv/Student/save/' + this.modelValue.prestudent_id, this.changed))
 				.then(result => {
-					this.resetErrors();
-					if (CoreRESTClient.isError(result)) {
-						let errors = CoreRESTClient.getError(result);
-						
-						if (errors === "Generic error")
-							console.error(errors, result);
-						else {
-							for (var k in errors)
-								this.addError(k, errors[k]);
-						}
-					} else {
-						for (var node of document.querySelectorAll(Object.keys(this.changed).map(el => '#stv-details-' + el).join(',')))
-							node.classList.add('is-valid');
-						if (this.changed.gebdatum !== undefined)
-							this.gebDatumIsValid = true;
-						
-						// TODO(chris): phrase
-						this.$fhcAlert.alertSuccess('Gespeichert');
-						//this.addToast('Gespeichert', '', 'success');
-
-						this.original = {...this.data};
-						this.changed = {};
-					}
+					this.original = {...this.data};
+					this.changed = {};
 				})
-				.catch(this.$fhcAlert.handleSystemError/*err => {
-					// TODO(chris): phrase
-					this.addToast('Error', err?.response?.data || err?.message, 'error');
-				}*/);
-		},
-		resetErrors() {
-			Array.from(this.$refs.form.getElementsByClassName('is-valid')).forEach(el => el.classList.remove('is-valid'));
-			Array.from(this.$refs.form.getElementsByClassName('is-invalid')).forEach(el => el.classList.remove('is-invalid'));
-			Array.from(this.$refs.form.getElementsByClassName('invalid-feedback')).forEach(el => el.remove());
-			this.gebDatumIsValid = false;
-			this.gebDatumIsInvalid = false;
-		},
-		addError(field, msg) {
-			let id = 'stv-details-' + field;
-
-			let input = document.getElementById(id);
-			if (field === 'gebdatum') {
-				this.gebDatumIsInvalid = true;
-				input = document.getElementById('dp-input-' + id).parentNode;
-			}
-
-			input.classList.add('is-invalid');
-			
-			let feedback = document.createElement('div');
-			feedback.classList.add('invalid-feedback');
-			feedback.innerHTML = msg;
-			input.after(feedback);
-		/*},
-		addToast(header, msg, severity) {
-			this.$refs.responseToast.add({
-				severity: severity,
-				summary: header,
-				detail: msg,
-				life: 3000
-			})*/
+				.catch(this.$fhcAlert.handleSystemError);
 		}
 	},
 	created() {
 		this.updateStudent(this.modelValue);
 	},
+	//TODO(chris): Phrasen
 	//TODO(chris): Geburtszeit? Anzahl der Kinder?
 	template: `
-	<form ref="form" class="stv-details-details" @submit.prevent="save">
-		<div class="position-sticky top-0">
+	<form-form ref="form" class="stv-details-details" @submit.prevent="save">
+		<div class="position-sticky top-0 z-1">
 			<button type="submit" class="btn btn-primary position-absolute top-0 end-0" :disabled="!changedLength">Speichern</button>
 		</div>
 		<fieldset class="overflow-hidden">
 			<legend>Person</legend>
 			<template v-if="data">
 				<div class="row mb-3">
-					<label for="stv-details-person_id" class="col-sm-1 col-form-label">Person ID</label>
-					<div class="col-sm-3">
-						<input id="stv-details-person_id" type="text" class="form-control" v-model="data.person_id" disabled>
-					</div>
-					<label v-if="showZugangscode" for="stv-details-zugangscode" class="col-sm-1 col-form-label">Zugangscode</label>
-					<div v-if="showZugangscode" class="col-sm-3 align-self-center">
-						<span class="form-text">
-							<a :href="cisRoot + 'addons/bewerbung/cis/registration.php?code=' + data.zugangscode + '&emailAdresse=' + data.email_privat" target="_blank">{{data.zugangscode}}</a>
-						</span>
-					</div>
-					<label v-if="showBpk" for="stv-details-bpk" class="col-sm-1 col-form-label">BPK</label>
-					<div v-if="showBpk" class="col-sm-3">
-						<input id="stv-details-bpk" type="text" class="form-control" v-model="data.bpk" maxlength="28">
+					<form-input
+						container-class="col-4"
+						label="Person ID"
+						type="text"
+						v-model="data.person_id"
+						name="person_id"
+						readonly
+						>
+					</form-input>
+					<div v-if="showZugangscode" class="col-4">
+						<label>Zugangscode</label>
+						<div class="align-self-center">
+							<span class="form-text">
+								<a :href="cisRoot + 'addons/bewerbung/cis/registration.php?code=' + data.zugangscode + '&emailAdresse=' + data.email_privat" target="_blank">{{data.zugangscode}}</a>
+							</span>
+						</div>
 					</div>
+					<form-input
+						v-if="showBpk"
+						container-class="col-4"
+						label="BPK"
+						type="text"
+						v-model="data.bpk"
+						name="bpk"
+						maxlength="28"
+ 						>
+					</form-input>
 				</div>
 				<div class="row mb-3">
-					<label for="stv-details-anrede" class="col-sm-1 col-form-label">Anrede</label>
-					<div class="col-sm-3">
-						<input id="stv-details-anrede" type="text" class="form-control" v-model="data.anrede" maxlength="16">
-					</div>
-					<label for="stv-details-titelpre" class="col-sm-1 col-form-label">Titel Pre</label>
-					<div class="col-sm-3">
-						<input id="stv-details-titelpre" type="text" class="form-control" v-model="data.titelpre" maxlength="64">
-					</div>
-					<label for="stv-details-titelpost" class="col-sm-1 col-form-label">Titel Post</label>
-					<div class="col-sm-3">
-						<input id="stv-details-titelpost" type="text" class="form-control" v-model="data.titelpost" maxlength="32">
-					</div>
+					<form-input
+						container-class="col-4"
+						label="Anrede"
+						type="text"
+						v-model="data.anrede"
+						name="anrede"
+						maxlength="16"
+ 						>
+					</form-input>
+					<form-input
+						container-class="col-4"
+						label="Titel Pre"
+						type="text"
+						v-model="data.titelpre"
+						name="titelpre"
+						maxlength="64"
+ 						>
+					</form-input>
+					<form-input
+						container-class="col-4"
+						label="Titel Post"
+						type="text"
+						v-model="data.titelpost"
+						name="titelpost"
+						maxlength="32"
+ 						>
+					</form-input>
 				</div>
 				<div class="row mb-3">
-					<label for="stv-details-nachname" class="col-sm-1 col-form-label">Nachname</label>
-					<div class="col-sm-3">
-						<input id="stv-details-nachname" type="text" class="form-control" v-model="data.nachname" maxlength="64">
-					</div>
-					<label for="stv-details-vorname" class="col-sm-1 col-form-label">Vorname</label>
-					<div class="col-sm-3">
-						<input id="stv-details-vorname" type="text" class="form-control" v-model="data.vorname" maxlength="32">
-					</div>
-					<label for="stv-details-vornamen" class="col-sm-1 col-form-label">Vornamen</label>
-					<div class="col-sm-3">
-						<input id="stv-details-vornamen" type="text" class="form-control" v-model="data.vornamen" maxlength="128">
-					</div>
+					<form-input
+						container-class="col-4"
+						label="Nachname"
+						type="text"
+						v-model="data.nachname"
+						name="nachname"
+						maxlength="64"
+ 						>
+					</form-input>
+					<form-input
+						container-class="col-4"
+						label="Vorname"
+						type="text"
+						v-model="data.vorname"
+						name="vorname"
+						maxlength="32"
+ 						>
+					</form-input>
+					<form-input
+						container-class="col-4"
+						label="Vornamen"
+						type="text"
+						v-model="data.vornamen"
+						name="vornamen"
+						maxlength="128"
+ 						>
+					</form-input>
 				</div>
 				<div class="row mb-3">
-					<label for="stv-details-wahlname" class="col-sm-1 col-form-label">Wahlname</label>
-					<div class="col-sm-3">
-						<input id="stv-details-wahlname" type="text" class="form-control" v-model="data.wahlname" maxlength="128">
-					</div>
+					<form-input
+						container-class="col-4"
+						label="Wahlname"
+						type="text"
+						v-model="data.wahlname"
+						name="wahlname"
+						maxlength="128"
+ 						>
+					</form-input>
 				</div>
 				<div class="row mb-3">
-					<label for="dp-input-stv-details-gebdatum" class="col-sm-1 col-form-label">Geburtsdatum</label>
-					<div class="col-sm-3">
-						<vue-date-picker id="stv-details-gebdatum" :input-class-name="gebDatumIsInvalid ? 'form-control is-invalid' : (gebDatumIsValid ? 'form-control is-valid' : 'form-control')" uid="stv-details-gebdatum" v-model="data.gebdatum" :clearable="false" no-today auto-apply :enable-time-picker="false" format="dd.MM.yyyy" preview-format="dd.MM.yyyy"></vue-date-picker>
-					</div>
-					<label for="stv-details-gebort" class="col-sm-1 col-form-label">Geburtsort</label>
-					<div class="col-sm-3">
-						<input id="stv-details-gebort" type="text" class="form-control" v-model="data.gebort" maxlength="128">
-					</div>
-					<label for="stv-details-geburtsnation" class="col-sm-1 col-form-label">Geburtsnation</label>
-					<div class="col-sm-3">
-						<select id="stv-details-geburtsnation" class="form-control" v-model="data.geburtsnation">
-							<option value="">-- keine Auswahl --</option>
-							<!-- TODO(chris): gesperrte nationen können nicht ausgewählt werden! Um das zu realisieren müsste man ein pseudo select machen -->
-							<option v-for="nation in lists.nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
-						</select>
-					</div>
+					<form-input
+						container-class="col-4"
+						label="Geburtsdatum"
+						type="DatePicker"
+						v-model="data.gebdatum"
+						name="gebdatum"
+						:clearable="false"
+						no-today
+						auto-apply
+						:enable-time-picker="false"
+						format="dd.MM.yyyy"
+						preview-format="dd.MM.yyyy"
+ 						>
+					</form-input>
+					<form-input
+						container-class="col-4"
+						label="Geburtsort"
+						type="text"
+						v-model="data.gebort"
+						name="gebort"
+						maxlength="128"
+ 						>
+					</form-input>
+					<form-input
+						container-class="col-4"
+						label="Geburtsnation"
+						type="select"
+						v-model="data.geburtsnation"
+						name="geburtsnation"
+ 						>
+						<option value="">-- keine Auswahl --</option>
+						<!-- TODO(chris): gesperrte nationen können nicht ausgewählt werden! Um das zu realisieren müsste man ein pseudo select machen -->
+						<option v-for="nation in lists.nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
+					</form-input>
 				</div>
 				<div class="row mb-3">
-					<label for="stv-details-svnr" class="col-sm-1 col-form-label">SVNR</label>
-					<div class="col-sm-3">
-						<input id="stv-details-svnr" type="text" class="form-control" v-model="data.svnr" maxlength="16">
-					</div>
-					<label for="stv-details-ersatzkennzeichen" class="col-sm-1 col-form-label">Ersatzkennzeichen</label>
-					<div class="col-sm-3">
-						<input id="stv-details-ersatzkennzeichen" type="text" class="form-control" v-model="data.ersatzkennzeichen" maxlength="10">
-					</div>
+					<form-input
+						container-class="col-4"
+						label="SVNR"
+						type="text"
+						v-model="data.svnr"
+						name="svnr"
+						maxlength="16"
+ 						>
+					</form-input>
+					<form-input
+						container-class="col-4"
+						label="Ersatzkennzeichen"
+						type="text"
+						v-model="data.ersatzkennzeichen"
+						name="ersatzkennzeichen"
+						maxlength="10"
+ 						>
+					</form-input>
 				</div>
 				<div class="row mb-3">
-					<label for="stv-details-staatsbuergerschaft" class="col-sm-1 col-form-label">Staatsbürgerschaft</label>
-					<div class="col-sm-3">
-						<select id="stv-details-staatsbuergerschaft" class="form-control" v-model="data.staatsbuergerschaft">
-							<option value="">-- keine Auswahl --</option>
-							<!-- TODO(chris): gesperrte nationen können nicht ausgewählt werden! Um das zu realisieren müsste man ein pseudo select machen -->
-							<option v-for="nation in lists.nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
-						</select>
-					</div>
-					<label for="stv-details-matr_nr" class="col-sm-1 col-form-label">Matrikelnummer</label>
-					<div class="col-sm-3">
-						<input id="stv-details-matr_nr" type="text" class="form-control" v-model="data.matr_nr" maxlength="32">
-					</div>
-					<label for="stv-details-sprache" class="col-sm-1 col-form-label">Sprache</label>
-					<div class="col-sm-3">
-						<select id="stv-details-sprache" class="form-control" v-model="data.sprache">
-							<option v-for="sprache in lists.sprachen" :key="sprache.sprache" :value="sprache.sprache">{{sprache.sprache}}</option>
-						</select>
-					</div>
+					<form-input
+						container-class="col-4"
+						label="Staatsbürgerschaft"
+						type="select"
+						v-model="data.staatsbuergerschaft"
+						name="staatsbuergerschaft"
+ 						>
+						<option value="">-- keine Auswahl --</option>
+						<!-- TODO(chris): gesperrte nationen können nicht ausgewählt werden! Um das zu realisieren müsste man ein pseudo select machen -->
+						<option v-for="nation in lists.nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
+					</form-input>
+					<form-input
+						container-class="col-4"
+						label="Matrikelnummer"
+						type="text"
+						v-model="data.matr_nr"
+						name="matr_nr"
+						maxlength="32"
+ 						>
+					</form-input>
+					<form-input
+						container-class="col-4"
+						label="Sprache"
+						type="select"
+						v-model="data.sprache"
+						name="sprache"
+ 						>
+						<option v-for="sprache in lists.sprachen" :key="sprache.sprache" :value="sprache.sprache">{{sprache.sprache}}</option>
+					</form-input>
 				</div>
 				<div class="row mb-3">
-					<label for="stv-details-geschlecht" class="col-sm-1 col-form-label">Geschlecht</label>
-					<div class="col-sm-3">
-						<select id="stv-details-geschlecht" class="form-control" v-model="data.geschlecht">
-							<option v-for="geschlecht in lists.geschlechter" :key="geschlecht.geschlecht" :value="geschlecht.geschlecht">{{geschlecht.bezeichnung}}</option>
-						</select>
-					</div>
-					<label for="stv-details-familienstand" class="col-sm-1 col-form-label">Familienstand</label>
-					<div class="col-sm-3">
-						<select id="stv-details-familienstand" class="form-control" v-model="data.familienstand">
-							<option v-for="(bezeichnung, key) in familienstaende" :key="key" :value="key">{{bezeichnung}}</option>
-						</select>
-					</div>
+					<form-input
+						container-class="col-4"
+						label="Geschlecht"
+						type="select"
+						v-model="data.geschlecht"
+						name="geschlecht"
+ 						>
+						<option v-for="geschlecht in lists.geschlechter" :key="geschlecht.geschlecht" :value="geschlecht.geschlecht">{{geschlecht.bezeichnung}}</option>
+					</form-input>
+					<form-input
+						container-class="col-4"
+						label="Familienstand"
+						type="select"
+						v-model="data.familienstand"
+						name="familienstand"
+ 						>
+						<option v-for="(bezeichnung, key) in familienstaende" :key="key" :value="key">{{bezeichnung}}</option>
+					</form-input>
 				</div>
 				<div class="row mb-3">
-					<label for="stv-details-foto" class="col-sm-1 col-form-label">Foto</label>
-					<div class="col-sm-3">
-						<form-upload-image id="stv-details-foto" v-model="data.foto"></form-upload-image>
-					</div>
-					<label for="stv-details-anmerkung" class="col-sm-1 col-form-label">Anmerkung</label>
-					<div class="col-sm-3">
-						<textarea id="stv-details-anmerkung" class="form-control" v-model="data.anmerkung"></textarea>
-					</div>
-					<label for="stv-details-homepage" class="col-sm-1 col-form-label">Homepage</label>
-					<div class="col-sm-3">
-						<input id="stv-details-homepage" type="text" class="form-control" v-model="data.homepage" maxlength="256">
-					</div>
+					<form-input
+						container-class="col-4"
+						label="Foto"
+						type="UploadImage"
+						v-model="data.foto"
+						name="foto"
+ 						>
+ 						<img alt="No Image" :src="noImageSrc" class="w-100">
+					</form-input>
+					<form-input
+						container-class="col-4"
+						label="Anmerkung"
+						type="textarea"
+						v-model="data.anmerkung"
+						name="anmerkung"
+						rows="8"
+ 						>
+					</form-input>
+					<form-input
+						container-class="col-4"
+						label="Homepage"
+						type="text"
+						v-model="data.homepage"
+						name="homepage"
+						maxlength="256"
+ 						>
+					</form-input>
 				</div>
 			</template>
 			<div v-else>
@@ -315,47 +367,79 @@ export default {
 			<legend>StudentIn</legend>
 			<template v-if="data">
 				<div class="row mb-3">
-					<label for="stv-details-student_uid" class="col-sm-1 col-form-label">UID</label>
-					<div class="col-sm-3">
-						<input id="stv-details-student_uid" type="text" class="form-control" v-model="data.student_uid" disabled>
-					</div>
-					<label for="stv-details-personenkennzeichen" class="col-sm-1 col-form-label">Personenkennzeichen</label>
-					<div class="col-sm-3">
-						<input id="stv-details-personenkennzeichen" type="text" class="form-control" v-model="data.matrikelnr" disabled>
-					</div>
-					<label for="stv-details-aktiv" class="col-sm-1 col-form-label">Aktiv</label>
-					<div class="col-sm-3 align-self-center">
-						<div class="form-check">
-							<input id="stv-details-aktiv" type="checkbox" class="form-check-input" v-model="data.aktiv">
-						</div>
+					<form-input
+						container-class="col-4"
+						label="UID"
+						type="text"
+						v-model="data.student_uid"
+						name="student_uid"
+						readonly
+						>
+					</form-input>
+					<form-input
+						container-class="col-4"
+						label="Personenkennzeichen"
+						type="text"
+						v-model="data.matrikelnr"
+						name="matrikelnr"
+						readonly
+						>
+					</form-input>
+					<div class="col-4 pt-4 d-flex align-items-center">
+						<form-input
+							container-class="form-check"
+							label="Aktiv"
+							type="checkbox"
+							v-model="data.aktiv"
+							name="aktiv"
+							>
+						</form-input>
 					</div>
 				</div>
 				<div class="row mb-3">
-					<label for="stv-details-semester" class="col-sm-1 col-form-label">Semester</label>
-					<div class="col-sm-3">
-						<input id="stv-details-semester" type="text" class="form-control" v-model="data.semester" maxlength="2">
-					</div>
-					<label for="stv-details-verband" class="col-sm-1 col-form-label">Verband</label>
-					<div class="col-sm-3">
-						<input id="stv-details-verband" type="text" class="form-control" v-model="data.verband" maxlength="1">
-					</div>
-					<label for="stv-details-gruppe" class="col-sm-1 col-form-label">Gruppe</label>
-					<div class="col-sm-3">
-						<input id="stv-details-gruppe" type="text" class="form-control" v-model="data.gruppe" maxlength="1">
-					</div>
+					<form-input
+						container-class="col-4"
+						label="Semester"
+						type="text"
+						v-model="data.semester"
+						name="semester"
+						maxlength="2"
+						>
+					</form-input>
+					<form-input
+						container-class="col-4"
+						label="Verband"
+						type="text"
+						v-model="data.verband"
+						name="verband"
+						maxlength="1"
+						>
+					</form-input>
+					<form-input
+						container-class="col-4"
+						label="Gruppe"
+						type="text"
+						v-model="data.gruppe"
+						name="gruppe"
+						maxlength="1"
+						>
+					</form-input>
 				</div>
 				<div class="row mb-3">
-					<label for="stv-details-alias" class="col-sm-1 col-form-label">Alias</label>
-					<div class="col-sm-3">
-						<input id="stv-details-alias" type="text" class="form-control" v-model="data.alias" :disabled="aliasNotAllowed">
-					</div>
+					<form-input
+						container-class="col-4"
+						label="Alias"
+						type="text"
+						v-model="data.alias"
+						name="alias"
+						:disabled="aliasNotAllowed"
+						>
+					</form-input>
 				</div>
-
 			</template>
 			<div v-else>
 				Loading...
 			</div>
 		</fieldset>
-		<pv-toast ref="responseToast" style="z-index:9999"></pv-toast>
-	</form>`
+	</form-form>`
 };
\ No newline at end of file

From 8bda0f2f96ee92a98b2838eded83016f0290be62 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 17 Jan 2024 15:34:53 +0100
Subject: [PATCH 0323/1461] first template for the functionality to add a new
 kontakt/address

---
 public/css/components/Profil.css              | 10 +++-
 .../components/Cis/Profil/EditProfilSelect.js | 60 ++++++++++++++++---
 .../components/Cis/Profil/ProfilComponents.js | 18 +++++-
 3 files changed, 77 insertions(+), 11 deletions(-)

diff --git a/public/css/components/Profil.css b/public/css/components/Profil.css
index 797504786..4ca104dc8 100644
--- a/public/css/components/Profil.css
+++ b/public/css/components/Profil.css
@@ -77,7 +77,15 @@
   padding-left: 0.5rem;
 }
 
-
+.btn-circle {
+  width: 30px;
+  height: 30px;
+  padding: 6px 0px;
+  border-radius: 15px;
+  text-align: center;
+  font-size: 12px;
+  line-height: 1.42857;
+}
 
 
 
diff --git a/public/js/components/Cis/Profil/EditProfilSelect.js b/public/js/components/Cis/Profil/EditProfilSelect.js
index 1fad1ca92..8e20058bb 100644
--- a/public/js/components/Cis/Profil/EditProfilSelect.js
+++ b/public/js/components/Cis/Profil/EditProfilSelect.js
@@ -43,16 +43,48 @@ export default {
         view:null,
         data:null,
         breadcrumbItems:[],
+        topic:null,
       }
     },
   
     methods: {
 
+      addItem: function(){
+        
+        this.view= this.topic == "Private Kontakte"?"EditKontakt":"EditAdresse" ;
+        console.log(this.view);
+        //? updates the topic when a Kontakt or an Address should be added
+        this.topic = this.topic == "Private Kontakte"?"Add Kontakte":"Add Adressen"
+        this.$emit('update:topic',this.topic);
+       
+        
+        
+        this.data= this.view=="EditAdresse"?
+        {
+          adresse_id: "to be defined",
+          strasse: "",
+          adr_typ: "",
+          plz: "",
+          ort: ""
+        }:
+        {
+          kontakt_id: "to be defined",
+          kontakttyp: "",
+          kontakt: "",
+          anmerkung: "",
+          zustellung: false
+        }
+        console.log(this.data);
+
+      },
+
       deleteItem: function(item){
         
         this.$emit('update:profilUpdate',item.data);
         //? updates the topic when a Kontakt or an Address should be deleted
-        this.$emit('update:topic',item.data.kontakt?"Delete Kontakte":"Delete Adressen");
+        this.topic = item.data.kontakt?"Delete Kontakte":"Delete Adressen";
+        this.$emit('update:topic',this.topic);
+
         this.$emit('submit');
       },
 
@@ -68,7 +100,8 @@ export default {
         
         if(item.title){
           //? emits the selected topic to the parent component
-          this.$emit('update:topic',item.title);
+          this.topic= item.title;
+          this.$emit('update:topic',this.topic);
         
           //? emits the new item for the breadcrumb in the parent component
           this.breadcrumbItems.push(item.title);
@@ -99,21 +132,32 @@ export default {
     },
    
     template: `
+   
   
-
-    <div v-if="!view" class="list-group">
-      <button style="position:relative" type="button" class=" list-group-item list-group-item-action" @click="updateOptions($event,item)" v-for="item in data">
+    <template v-if="!view">
+    <div  class="list-group">
+    <template v-for="item in data">
+      <div class="d-flex flex-row align-items-center">
+      <button style="position:relative" type="button" class=" list-group-item list-group-item-action" @click="updateOptions($event,item)" >
       
         <p v-if="item.title" class="my-1"   >{{item.title}}</p>
         <!-- this is used for multiple elements in the select -->
         <div class="my-2 me-4" v-else>
         <component  :is="item.listview" v-bind="item"></component>
-        <i @click="deleteItem(item)" style="color:lightcoral; position:absolute; top:10px; right:10px;" class="fa fa-trash"></i>
-        
         </div>
       </button>
-    
+      <button v-if="item.listview" @click="deleteItem(item)" type="button" class="mx-3 btn btn-danger btn-circle"><i class="fa fa-trash"></i>
+      </div>
+      </template>
     </div>
+    <div v-if="Array.isArray(data)" class="mt-4 d-flex justify-content-center">
+      
+      <button @click="addItem" type="button" class="btn btn-primary btn-circle"><i class="fa fa-plus"></i>
+      
+    </div>
+    
+    </template>
+    
 
     <div v-else-if="view==='text_input'" class="form-underline">
       <div class="form-underline-titel">{{data.titel?data.titel:'titel'}}</div>
diff --git a/public/js/components/Cis/Profil/ProfilComponents.js b/public/js/components/Cis/Profil/ProfilComponents.js
index 7234044c9..baa296f78 100644
--- a/public/js/components/Cis/Profil/ProfilComponents.js
+++ b/public/js/components/Cis/Profil/ProfilComponents.js
@@ -205,14 +205,28 @@ const EditKontakt =  {
    
     <div class="gy-3 row align-items-center justify-content-center">
     
-   
+    <div v-if="data.kontakt_id =='to be defined'" class="col-12">
+        
+    
+        <div  class="form-underline">
+            <div class="form-underline-titel">Kontakttyp</div>
+    
+            <select :value="data.kontakttyp" @change="updateValue($event,'kontakttyp')" class="form-select" aria-label="Select Kontakttyp">
+                <option selected></option>
+                <option value="email">Email</option>
+                <option value="telefon">Telefon</option>
+                <option value="notfallkontakt">Notfallkontakt</option>
+            </select>    
+        </div>
+        
+    </div>
     <div class="col-12">
         
         <!-- rendering KONTAKT emails -->
    
 
         <div  class="form-underline">
-        <div class="form-underline-titel">{{data.kontakttyp}}</div>
+        <div class="form-underline-titel">{{data.kontakttyp?data.kontakttyp:'Kontakt'}}</div>
     
         <input  class="form-control"   :value="data.kontakt" @input="updateValue($event,'kontakt')" :placeholder="data.kontakt">
         </div>

From f17591327dc882a61b24ac5e0707a52aecf79fc9 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 17 Jan 2024 16:00:56 +0100
Subject: [PATCH 0324/1461] Quickfix missing "!"

---
 public/js/components/Form/Input.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Form/Input.js b/public/js/components/Form/Input.js
index 8bdff639b..8107c1a19 100644
--- a/public/js/components/Form/Input.js
+++ b/public/js/components/Form/Input.js
@@ -161,7 +161,7 @@ export default {
 		// TODO(chris): wrap check in div?
 	},
 	template: `
-	<component :is="hasContainer ? 'FhcFragment' : 'div'" class="position-relative" :class="containerClass">
+	<component :is="!hasContainer ? 'FhcFragment' : 'div'" class="position-relative" :class="containerClass">
 		<label v-if="$attrs.label && lcType != 'radio' && lcType != 'checkbox'" :for="idCmp">{{$attrs.label}}</label>
 		<input v-if="tag == 'input'" :type="lcType" v-model="modelValueCmp" v-bind="$attrs" :id="idCmp" :name="name" :class="validationClass" :modelValue="undefined" @input="clearValidation(); $emit('input', $event)">
 		<textarea v-else-if="tag == 'textarea'" v-model="modelValueCmp" v-bind="$attrs" :id="idCmp" :name="name" :class="validationClass" :modelValue="undefined" @input="clearValidation(); $emit('input', $event)"></textarea>

From 0c0d5294789a9087031ec2dfb4e43e43c3f54c10 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 17 Jan 2024 16:03:24 +0100
Subject: [PATCH 0325/1461] Tabs: vertical usage & reactive configUrl &
 configUrl accepts object

---
 public/js/components/Tabs.js | 99 +++++++++++++++++++++---------------
 1 file changed, 57 insertions(+), 42 deletions(-)

diff --git a/public/js/components/Tabs.js b/public/js/components/Tabs.js
index 7d2cf0500..1e77fa996 100644
--- a/public/js/components/Tabs.js
+++ b/public/js/components/Tabs.js
@@ -11,9 +11,14 @@ export default {
 		'changed'
 	],
 	props: {
-		configUrl: String,
+		// TODO(chris): rename to config?
+		configUrl: {
+			type: [String, Object],
+			required: true
+		},
 		default: String,
-		modelValue: [String, Number, Boolean, Array, Object, Date, Function, Symbol]
+		modelValue: [String, Number, Boolean, Array, Object, Date, Function, Symbol],
+		vertical: Boolean
 	},
 	data() {
 		return {
@@ -37,60 +42,70 @@ export default {
 			}
 		}
 	},
+	watch: {
+		configUrl(n) {
+			this.initConfig(n);
+		}
+	},
 	methods: {
 		change(key) {
 			this.$emit("change", key)
 			this.current = key;
 			this.$nextTick(() => this.$emit("changed", key));
-		}
-	},
-	created() {
-		CoreRESTClient
-			.get(this.configUrl)
-			.then(result => CoreRESTClient.getData(result.data))
-			.then(result => {
-				if (!result)
-					return;
+		},
+		initConfig(config) {
+			if (!config)
+				return;
+			if (typeof config === 'string' || config instanceof String)
+				return CoreRESTClient.get(config)
+					.then(result => CoreRESTClient.getData(result.data))
+					.then(this.initConfig)
+					.catch(this.$fhcAlert.handleSystemError);
 
-				const tabs = {};
+			console.log(config);
+			const tabs = {};
 
-				if (Array.isArray(result)) {
-					result.forEach((config, key) => {
-						if (!config.component)
-							return console.error('Component missing for ' + key);
+			if (Array.isArray(config)) {
+				config.forEach((item, key) => {
+					if (!item.component)
+						return console.error('Component missing for ' + key);
 
-						tabs[key] = {
-							component: Vue.markRaw(Vue.defineAsyncComponent(() => import(config.component))),
-							title: config.title || key,
-							config: config.config,
-							key
-						}
-					});
+					tabs[key] = {
+						component: Vue.markRaw(Vue.defineAsyncComponent(() => import(item.component))),
+						title: item.title || key,
+						config: item.config,
+						key
+					}
+				});
+			} else {
+				Object.entries(config).forEach(([key, item]) => {
+					if (!item.component)
+						return console.error('Component missing for ' + key);
 
-				} else {
-					Object.entries(result).forEach(([key, config]) => {
-						if (!config.component)
-							return console.error('Component missing for ' + key);
+					tabs[key] = {
+						component: Vue.markRaw(Vue.defineAsyncComponent(() => import(item.component))),
+						title: item.title || key,
+						config: item.config,
+						key
+					}
+				});
+			}
 
-						tabs[key] = {
-							component: Vue.markRaw(Vue.defineAsyncComponent(() => import(config.component))),
-							title: config.title || key,
-							config: config.config,
-							key
-						}
-					});
-				}
+			if (this.current === null || !tabs[this.current]) {
 				if (tabs[this.default])
 					this.current = this.default;
 				else
 					this.current = Object.keys(tabs)[0];
-				this.tabs = tabs;
-			})
-			.catch(this.$fhcAlert.handleSystemError);
+			}
+			this.tabs = tabs;
+		}
+	},
+	created() {
+		this.initConfig(this.configUrl);
 	},
 	template: `
-	<div class="fhc-tabs d-flex flex-column" v-if="Object.keys(tabs).length">
-		<div class="nav nav-tabs">
+	<div class="fhc-tabs d-flex" :class="vertical ? 'align-items-stretch' : 'flex-column'" v-if="Object.keys(tabs).length">
+		<div class="nav" :class="vertical ? 'nav-pills flex-column' : 'nav-tabs'">
 			<div
 				v-for="tab in tabs"
 				:key="tab.key"
@@ -98,12 +113,12 @@ export default {
 				:class="{active: tab.key == current}"
 				@click="change(tab.key)"
 				:aria-current="tab.key == current ? 'page' : ''"
-				v-accessibility:tab
+				v-accessibility:tab.[vertical]
 				>
 				{{tab.title}}
 			</div>
 		</div>
-		<div style="flex: 1 1 0%; height: 0%" class="border-bottom border-start border-end overflow-auto p-3">
+		<div :style="vertical ? '' : 'flex: 1 1 0%; height: 0%'" class="overflow-auto p-3" :class="vertical ? '' : 'border-bottom border-start border-end'">
 			<keep-alive>
 				<component ref="current" :is="currentTab.component" v-model="value" :config="currentTab.config"></component>
 			</keep-alive>

From bd4bbe0b7a1f8e976cecef6cfbde37650d9cb2f0 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 18 Jan 2024 07:45:08 +0100
Subject: [PATCH 0326/1461] Update response/error handling

---
 application/controllers/components/stv/Notiz.php   | 11 +++++++----
 application/models/person/Notiz_model.php          | 11 +++++++++--
 application/models/person/Notizzuordnung_model.php | 12 ++++++------
 public/js/components/Notiz/Notiz.js                | 14 ++------------
 .../Stv/Studentenverwaltung/Details/Notizen.js     |  5 +++--
 5 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/application/controllers/components/stv/Notiz.php b/application/controllers/components/stv/Notiz.php
index 82d494a16..d5307f7c2 100644
--- a/application/controllers/components/stv/Notiz.php
+++ b/application/controllers/components/stv/Notiz.php
@@ -100,7 +100,8 @@ class Notiz extends FHC_Controller
 			}
 		}
 
-		//Überprüfung ob type übergeben wurde (entweder Funktions- oder Postparameter)
+		//Überprüfung ob type übergeben wurde (via Funktions- oder Postparameter)
+		$type = null;
 		if ($paramTyp)
 			$type = $paramTyp;
 		if(isset($_POST['typeId']))
@@ -108,8 +109,10 @@ class Notiz extends FHC_Controller
 
 		if(!$type)
 		{
-			//Todo(manu) return error
-			var_dump("ERROR no type");
+			$result = error('kein Type für ID vorhanden', EXIT_ERROR);
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+
+			return $this->outputJson(getError($result));
 		}
 
 		//Form Validation
@@ -126,7 +129,7 @@ class Notiz extends FHC_Controller
 		$erledigt = $this->input->post('erledigt');
 		$verfasser_uid = isset($_POST['verfasser_uid']) ? $_POST['verfasser_uid'] : $uid;
 		$bearbeiter_uid = isset($_POST['bearbeiter']) ? $_POST['bearbeiter'] : null;
-		//$type = $this->input->post('typeId');
+		$type = $this->input->post('typeId');
 		$start = $this->input->post('von');
 		$ende = $this->input->post('bis');
 
diff --git a/application/models/person/Notiz_model.php b/application/models/person/Notiz_model.php
index aac679915..5684bf3ed 100644
--- a/application/models/person/Notiz_model.php
+++ b/application/models/person/Notiz_model.php
@@ -156,14 +156,21 @@ class Notiz_model extends DB_Model
 		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
 
 		//check if valid type
-		$isValidType = $this->NotizzuordnungModel->isValidType($type);
+		$result = $this->NotizzuordnungModel->isValidType($type);
+		if (isError($result))
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 
+			$result = error($result->retval, EXIT_ERROR);
+			return $result;
+		}
+/*
 		if(!$isValidType)
 		{
 			//Todo manu (correct return to controller)
 			$msg = "datatype " . $type . " not implemented for notes";
 			return error($msg, EXIT_ERROR);
-		}
+		}*/
 
 		// Start DB transaction
 		$this->db->trans_start(false);
diff --git a/application/models/person/Notizzuordnung_model.php b/application/models/person/Notizzuordnung_model.php
index 542c68e6f..8a6672424 100644
--- a/application/models/person/Notizzuordnung_model.php
+++ b/application/models/person/Notizzuordnung_model.php
@@ -14,7 +14,6 @@ class Notizzuordnung_model extends DB_Model
 
 	public function isValidType($type)
 	{
-		//var_dump($type);
 		$validTypes = [];
 
 		$qry = "
@@ -22,24 +21,25 @@ class Notizzuordnung_model extends DB_Model
 			FROM information_schema.columns
 			WHERE table_schema = 'public'
 			AND table_name   = 'tbl_notizzuordnung'
+			AND column_name not in ('notizzuordnung_id', 'notiz_id')
 		";
 
 		$type_arr = $this->execQuery($qry);
 		$type_arr = $type_arr->retval;
 
-		foreach ($type_arr as $t) {
+		foreach ($type_arr as $t)
+		{
 			$validTypes[] = $t->column_name;
 		}
 
 		if (in_array($type, $validTypes))
 		{
-		//	var_dump($type . " is IN ARRAY");
-			return true;
+			$result = success('Type of Id is valid');
 		}
 		else
 		{
-			//var_dump($type . " is NOT IN ARRAY");
-			return false;
+			$result = error('Type of Id  is not valid');
 		}
+		return $result;
 	}
 }
diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index 3c1bbab27..6850feff8 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -30,7 +30,6 @@ export default {
 			multiupload: true,
 			mitarbeiter: [],
 			filteredMitarbeiter: [],
-/*			filteredFirmen: []*/
 		}
 	},
 	computed: {
@@ -50,14 +49,6 @@ export default {
 				this.$emit('update:text', value);
 			}
 		},
-/*		intLastChange: {
-			get() {
-				return this.lastChange;
-			},
-			set(value) {
-				this.$emit('update:lastChange', value);
-			}
-		},*/
 		intVon: {
 			get() {
 				return this.von;
@@ -128,7 +119,6 @@ export default {
 		reset() {
 			this.$refs.form.reset();
 			this.intAnhang = null;
-			//this.$emit('update:anhang', []);
 		},
 
 		search(event) {
@@ -143,7 +133,8 @@ export default {
 
 	template: `
 	<div class="notiz-notiz">
-		<span v-for="(anhang,index) in intAnhang"> {{anhang.name}} {{index}}<br></span>
+<!--	<p>testausgaben child</p>
+		<span v-for="(anhang,index) in intAnhang"> {{anhang.name}} {{index}}<br></span>-->
 		<form ref="form" @submit.prevent class="row">
 			<div>
 				<div class="row mb-3">
@@ -240,7 +231,6 @@ export default {
 			<div class="row mb-3">
 				<label for="lastChange" class="form-label col-sm-2 small">letzte Änderung</label>
 				<div class="col-sm-7">
-<!--					<input v-model="lastChange" >-->
 					<p class="small">{{this.lastChange}}</p>
 				</div>
 			</div>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
index bbe03d785..f31cf745a 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
@@ -150,7 +150,9 @@ export default {
 					});
 				}
 			}).catch(error => {
-				this.$fhcAlert.alertError('Fehler bei Speicherroutine aufgetreten');
+				if (error.response) {
+					this.$fhcAlert.alertError(error.response.data);
+				}
 			}).finally(() => {
 				window.scrollTo(0, 0);
 			});
@@ -210,7 +212,6 @@ export default {
 		},
 		resetFormData(){
 			this.$refs.form.reset();
-			//sicherstellen, dass über props nur leere felder übergeben werden
 			this.formData = {
 				typeId: 'person_id',
 				titel: null,

From c5f6ce861bd21635c70927b65bf7d6aaf08ebd88 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 18 Jan 2024 09:20:01 +0100
Subject: [PATCH 0327/1461] when adding a new kontakt or address, it is
 possible to modify it afterwards

---
 public/js/components/Cis/Profil/EditProfil.js       |  6 ++----
 public/js/components/Cis/Profil/EditProfilSelect.js | 10 +++++-----
 public/js/components/Cis/Profil/ProfilComponents.js |  9 ++++++---
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/public/js/components/Cis/Profil/EditProfil.js b/public/js/components/Cis/Profil/EditProfil.js
index 4f2022b0f..b033cd66a 100644
--- a/public/js/components/Cis/Profil/EditProfil.js
+++ b/public/js/components/Cis/Profil/EditProfil.js
@@ -39,7 +39,7 @@ export default {
 
   methods: {
     submitProfilChange(){
-      
+        //TODO: check if the updated value is different from the original value before submitting the request
        if(this.topic && this.profilUpdate){
 
         //? inserts new row in public.tbl_cis_profil_update 
@@ -94,9 +94,7 @@ export default {
       </ol>
     </nav>
 
-    <pre>{{JSON.stringify(profilUpdate,null,2)}}</pre>
-    <pre>{{JSON.stringify(topic,null,2)}}</pre>
-
+   
     <edit-profil-select @submit="submitProfilChange" v-model:breadcrumb="breadcrumb" v-model:topic="topic" v-model:profilUpdate="profilUpdate" ariaLabel="test" :list="editData"></edit-profil-select>
    
 
diff --git a/public/js/components/Cis/Profil/EditProfilSelect.js b/public/js/components/Cis/Profil/EditProfilSelect.js
index 8e20058bb..cef314eb6 100644
--- a/public/js/components/Cis/Profil/EditProfilSelect.js
+++ b/public/js/components/Cis/Profil/EditProfilSelect.js
@@ -52,29 +52,29 @@ export default {
       addItem: function(){
         
         this.view= this.topic == "Private Kontakte"?"EditKontakt":"EditAdresse" ;
-        console.log(this.view);
+        
         //? updates the topic when a Kontakt or an Address should be added
         this.topic = this.topic == "Private Kontakte"?"Add Kontakte":"Add Adressen"
         this.$emit('update:topic',this.topic);
-       
+        this.breadcrumbItems.push(this.topic);
+        this.$emit('update:breadcrumb',this.breadcrumbItems);
         
         
         this.data= this.view=="EditAdresse"?
         {
-          adresse_id: "to be defined",
+          adresse_id: "",
           strasse: "",
           adr_typ: "",
           plz: "",
           ort: ""
         }:
         {
-          kontakt_id: "to be defined",
+          kontakt_id: "",
           kontakttyp: "",
           kontakt: "",
           anmerkung: "",
           zustellung: false
         }
-        console.log(this.data);
 
       },
 
diff --git a/public/js/components/Cis/Profil/ProfilComponents.js b/public/js/components/Cis/Profil/ProfilComponents.js
index baa296f78..361890251 100644
--- a/public/js/components/Cis/Profil/ProfilComponents.js
+++ b/public/js/components/Cis/Profil/ProfilComponents.js
@@ -205,7 +205,7 @@ const EditKontakt =  {
    
     <div class="gy-3 row align-items-center justify-content-center">
     
-    <div v-if="data.kontakt_id =='to be defined'" class="col-12">
+    <div v-if="!data.kontakt_id" class="col-12">
         
     
         <div  class="form-underline">
@@ -236,9 +236,8 @@ const EditKontakt =  {
        
 
     </div>
-    <div v-if="data?.anmerkung" class="col-12">
+    <div class="col-12">
         
-
     <div  class="form-underline">
     <div class="form-underline-titel">Anmerkung</div>
 
@@ -303,6 +302,10 @@ const FetchProfilUpdates = {
             switch(topic){
                 case "Private Kontakte" : return "EditKontakt"; break;
                 case "Private Adressen" : return "EditAdresse"; break;
+                case "Add Adressen" : return "EditAdresse"; break;
+                case "Add Kontakte" : return "EditKontakt"; break;
+                case "Delete Adressen" : return "EditAdresse"; break;
+                case "Delete Kontakte" : return "EditKontakt"; break;
                 default: return "text_input"; break;
             }
         },

From b9329aa41774491becc54dd11795c3830214b615 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 18 Jan 2024 09:46:31 +0100
Subject: [PATCH 0328/1461] temp

---
 public/js/components/Notiz/Notiz.js | 44 +++++++++++++++++++++++++++--
 public/js/components/tinymce.js.php | 22 +++++++++++++++
 2 files changed, 64 insertions(+), 2 deletions(-)
 create mode 100644 public/js/components/tinymce.js.php

diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index 6850feff8..0882b41b5 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -1,4 +1,5 @@
 import VueDatePicker from '../vueDatepicker.js.php';
+import tinymce from '../tinymce.js.php';
 import PvAutoComplete from "../../../../index.ci.php/public/js/components/primevue/autocomplete/autocomplete.esm.min.js";
 import File from '../Form/Upload/File.js';
 import {CoreRESTClient} from "../../RESTClient";
@@ -7,7 +8,8 @@ export default {
 	components: {
 		VueDatePicker,
 		File,
-		PvAutoComplete
+		PvAutoComplete,
+		tinymce
 	},
 	props: [
 		'typeId',
@@ -129,6 +131,26 @@ export default {
 					this.filteredMitarbeiter = CoreRESTClient.getData(result.data);
 				});
 		},
+		methods: {
+			initTinyMCE() {
+				//console.log(" before initfile");
+				tinymce.init({
+					selector: '#editor', // Use the ID of your textarea or div
+					plugins: ['autoresize', 'lists'],
+					toolbar: 'undo redo | styleselect | bold italic | bullist numlist',
+					autoresize_bottom_margin: 16,
+					setup: (editor) => {
+						// for additional setup or customization here
+					},
+				});
+			},
+		},
+	},
+	mounted() {
+		this.initTinyMCE();
+	},
+	beforeDestroy() {
+		tinymce.get('editor').destroy();
 	},
 
 	template: `
@@ -150,13 +172,31 @@ export default {
 					</div>
 				</div>
 	
-				<div class="notizTitle row mb-3">
+				<div class="row mb-3">
 					<label for="titel" class="form-label col-sm-2">Titel</label>
 					<div class="col-sm-7">
 						<input type="text" v-model="intTitel" class="form-control">
 					</div>
 				</div>
 				
+				<div class="row mb-3">
+				<!--TINYMCE-->
+				<label for="text" class="form-label col-sm-2">tinymce</label>
+					<div class="col-sm-7">
+					<tinymce id="editor"></tinymce>
+					  <textarea id="editor"  rows="5" cols="75" v-model="intText" class="form-control"></textarea>
+<!--					  <tinymce
+						api-key="no-api-key"
+						:init="{
+						  menubar: true,
+						  plugins: 'lists link image emoticons',
+						  toolbar: 'styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist | link image emoticons'
+						}"
+					  />-->
+
+					</div>
+				</div>
+				
 				<div class="row mb-3">
 					<label for="text" class="form-label col-sm-2">Text</label>
 					<div class="col-sm-7">
diff --git a/public/js/components/tinymce.js.php b/public/js/components/tinymce.js.php
new file mode 100644
index 000000000..101306442
--- /dev/null
+++ b/public/js/components/tinymce.js.php
@@ -0,0 +1,22 @@
+<?php
+
+if(file_exists("../../../vendor/tinymce/tinymce5/tinymce.min.js"))
+{
+	header('Content-Type: application/javascript');
+
+	//echo file_get_contents("../../../vendor/tinymce/tinymce5/tinymce.min.js");
+
+	//echo file_get_contents("../../../vendor/tinymce/tinymce5/tinymce.min.js");
+	//echo "export default tinymce";
+
+	//echo "export default " . json_encode(file_get_contents('../../../vendor/tinymce/tinymce5/tinymce.min.js')) . ";";
+
+	echo "var tinymce = ";
+	echo file_get_contents('../../../vendor/tinymce/tinymce5/tinymce.min.js') . ";";
+	echo "export default tinymce";
+
+}
+else
+{
+	header('HTTP/1.0 404 Not Found');
+}
\ No newline at end of file

From 5e7e2b63ddba10140a701e5efed12cde6fdaac6c Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 18 Jan 2024 11:31:28 +0100
Subject: [PATCH 0329/1461] disables the kontakt input field in the EditKontakt
 component if no Kontakttyp was selected

---
 application/controllers/Cis/Profil.php        |  3 ++
 .../components/Cis/Profil/EditProfilSelect.js | 20 +++++-----
 .../components/Cis/Profil/ProfilComponents.js | 38 +++++++++++++++----
 3 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index d308c5700..6789de7b8 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -446,6 +446,8 @@ class Profil extends Auth_Controller
 				// handle error	
 			} else {
 				$kontakte_res = hasData($kontakte_res) ? getData($kontakte_res) : null;
+				
+				
 			}
 
 		}
@@ -659,6 +661,7 @@ class Profil extends Auth_Controller
 				// handle error	
 			} else {
 				$kontakte_res = hasData($kontakte_res) ? getData($kontakte_res) : null;
+				
 			}
 
 		}
diff --git a/public/js/components/Cis/Profil/EditProfilSelect.js b/public/js/components/Cis/Profil/EditProfilSelect.js
index cef314eb6..f067d1778 100644
--- a/public/js/components/Cis/Profil/EditProfilSelect.js
+++ b/public/js/components/Cis/Profil/EditProfilSelect.js
@@ -62,17 +62,19 @@ export default {
         
         this.data= this.view=="EditAdresse"?
         {
-          adresse_id: "",
-          strasse: "",
-          adr_typ: "",
-          plz: "",
-          ort: ""
+          added:true,
+          adresse_id: null,
+          strasse: null,
+          adr_typ: null,
+          plz: null,
+          ort: null
         }:
         {
-          kontakt_id: "",
-          kontakttyp: "",
-          kontakt: "",
-          anmerkung: "",
+          added:true,
+          kontakt_id: null,
+          kontakttyp: null,
+          kontakt: null,
+          anmerkung: null,
           zustellung: false
         }
 
diff --git a/public/js/components/Cis/Profil/ProfilComponents.js b/public/js/components/Cis/Profil/ProfilComponents.js
index 361890251..3b666002c 100644
--- a/public/js/components/Cis/Profil/ProfilComponents.js
+++ b/public/js/components/Cis/Profil/ProfilComponents.js
@@ -60,15 +60,24 @@ const Adresse = {
 const EditAdresse = {
     props:{data:Object},
     data(){
-        return{}
+        return{
+            originalValue:null,
+        }
     },
     methods:{
         updateValue: function(event,bind){
-            this.data[bind] = event.target.value;
-            this.$emit('profilUpdate',this.data);
+            //? sets the value of a property to null when an empty string is entered to keep the isChanged function valid 
+            this.data[bind] = event.target.value === "" ? null : event.target.value;
+            this.$emit('profilUpdate',this.isChanged?this.data:null);
+        },
+    },
+    computed:{
+        isChanged: function(){
+            return this.originalValue !== JSON.stringify(this.data);
         },
     },
     created(){
+        this.originalValue = JSON.stringify(this.data);
         
     },
     template:`
@@ -183,7 +192,7 @@ const EditKontakt =  {
     },
     data(){
         return{
-
+            originalValue:null,
         }
     },
     methods:{
@@ -191,18 +200,31 @@ const EditKontakt =  {
             if(bind === 'zustellung'){
                 this.data[bind] = event.target.checked;    
             }else{
-                this.data[bind] = event.target.value;
+                //? sets the value of a property to null when an empty string is entered to keep the isChanged function valid
+                this.data[bind] = event.target.value === ""  ? null: event.target.value;
             }
             
-            this.$emit('profilUpdate',this.data);
+            
+            this.$emit('profilUpdate',this.isChanged?this.data:null);
+            
         },
     },
+    computed:{
+        isChanged: function(){
+            //? returns true if the original passed data object was changed 
+            return JSON.stringify(this.data) !== this.originalValue;
+        }
+    },
     created(){
+
+        this.originalValue = JSON.stringify(this.data);
+       
         
     },
     template:
     `
-   
+    <pre>{{JSON.stringify(data)}}</pre>
+    <pre>{{originalValue}}</pre>
     <div class="gy-3 row align-items-center justify-content-center">
     
     <div v-if="!data.kontakt_id" class="col-12">
@@ -228,7 +250,7 @@ const EditKontakt =  {
         <div  class="form-underline">
         <div class="form-underline-titel">{{data.kontakttyp?data.kontakttyp:'Kontakt'}}</div>
     
-        <input  class="form-control"   :value="data.kontakt" @input="updateValue($event,'kontakt')" :placeholder="data.kontakt">
+        <input :disabled="data.kontakttyp?false:true"  class="form-control"   :value="data.kontakt" @input="updateValue($event,'kontakt')" :placeholder="data.kontakt">
         </div>
 
     

From 98c877e9ea4c5c4fe277071f7db3b571610b3054 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 18 Jan 2024 14:38:23 +0100
Subject: [PATCH 0330/1461] Tiny MCE: neue Notiz erstellen

---
 application/views/Studentenverwaltung.php |   1 +
 public/js/components/Notiz/Notiz.js       | 101 ++++++++++++----------
 public/js/components/tinymce.js.php       |  22 -----
 3 files changed, 57 insertions(+), 67 deletions(-)
 delete mode 100644 public/js/components/tinymce.js.php

diff --git a/application/views/Studentenverwaltung.php b/application/views/Studentenverwaltung.php
index 613a40abe..4fbc0fecd 100644
--- a/application/views/Studentenverwaltung.php
+++ b/application/views/Studentenverwaltung.php
@@ -8,6 +8,7 @@
 		#'primevue3' => true,
 		#'filtercomponent' => true,
 		'tabulator5' => true,
+		'tinymce5' => true,
 		'phrases' => [],
 		'customCSSs' => [
 			'public/css/components/vue-datepicker.css',
diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index 0882b41b5..f1aa63280 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -1,7 +1,7 @@
 import VueDatePicker from '../vueDatepicker.js.php';
-import tinymce from '../tinymce.js.php';
 import PvAutoComplete from "../../../../index.ci.php/public/js/components/primevue/autocomplete/autocomplete.esm.min.js";
 import File from '../Form/Upload/File.js';
+import FormUploadDms from '../Form/Upload/Dms.js';
 import {CoreRESTClient} from "../../RESTClient";
 
 export default {
@@ -9,12 +9,12 @@ export default {
 		VueDatePicker,
 		File,
 		PvAutoComplete,
-		tinymce
+		FormUploadDms
 	},
 	props: [
 		'typeId',
 		'titel',
-		'text',
+		'propText',
 		'lastChange',
 		'von',
 		'bis',
@@ -32,6 +32,7 @@ export default {
 			multiupload: true,
 			mitarbeiter: [],
 			filteredMitarbeiter: [],
+			zwischenvar: null
 		}
 	},
 	computed: {
@@ -51,6 +52,14 @@ export default {
 				this.$emit('update:text', value);
 			}
 		},
+/*		intPropText: {
+			get() {
+				return this.propText;
+			},
+			set(value) {
+				this.$emit('update:propText', value);
+			}
+		},*/
 		intVon: {
 			get() {
 				return this.von;
@@ -131,19 +140,35 @@ export default {
 					this.filteredMitarbeiter = CoreRESTClient.getData(result.data);
 				});
 		},
-		methods: {
-			initTinyMCE() {
-				//console.log(" before initfile");
-				tinymce.init({
-					selector: '#editor', // Use the ID of your textarea or div
-					plugins: ['autoresize', 'lists'],
-					toolbar: 'undo redo | styleselect | bold italic | bullist numlist',
-					autoresize_bottom_margin: 16,
-					setup: (editor) => {
-						// for additional setup or customization here
-					},
-				});
-			},
+		initTinyMCE() {
+			tinymce.init({
+				selector: '#editor',
+				//height: 800,
+				plugins: ['autoresize', 'lists'],
+				toolbar: "undo redo | blocks | bold italic | alignleft aligncenter alignright alignjustify | outdent indent",
+
+				autoresize_bottom_margin: 16,
+				setup: (editor) => {
+
+/*					editor.on('input', () => {
+						this.$emit('update:propText', editor.getContent());
+					});*/
+
+					// workaround for avoiding conflict id of frame: same Id as textarea
+					// working just for new notes
+					//Todo(manu) find a solution for update notes
+					editor.on('input', () => {
+						this.intText = editor.getContent();
+						//this.$emit('update:intText', editor.getContent());
+
+					});
+				},
+			});
+		},
+		updateContent(event) {
+			// Manually update the content when the textarea is edited
+			tinymce.get('editor').setContent(event.target.value);
+			console.log(event.target.value);
 		},
 	},
 	mounted() {
@@ -152,7 +177,6 @@ export default {
 	beforeDestroy() {
 		tinymce.get('editor').destroy();
 	},
-
 	template: `
 	<div class="notiz-notiz">
 <!--	<p>testausgaben child</p>
@@ -178,44 +202,28 @@ export default {
 						<input type="text" v-model="intTitel" class="form-control">
 					</div>
 				</div>
-				
-				<div class="row mb-3">
-				<!--TINYMCE-->
-				<label for="text" class="form-label col-sm-2">tinymce</label>
-					<div class="col-sm-7">
-					<tinymce id="editor"></tinymce>
-					  <textarea id="editor"  rows="5" cols="75" v-model="intText" class="form-control"></textarea>
-<!--					  <tinymce
-						api-key="no-api-key"
-						:init="{
-						  menubar: true,
-						  plugins: 'lists link image emoticons',
-						  toolbar: 'styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist | link image emoticons'
-						}"
-					  />-->
-
-					</div>
-				</div>
-				
+							
 				<div class="row mb-3">
 					<label for="text" class="form-label col-sm-2">Text</label>
+					
+					<!--tinymce-->
 					<div class="col-sm-7">
-						<textarea rows="5" cols="75" v-model="intText" class="form-control"></textarea>
+<!--						<textarea id="editor" rows="5" cols="75" @input="updateContent" class="form-control">{{ intText }}</textarea>-->
+						<textarea id="editor" rows="5" cols="75" @input="updateContent" class="form-control">{{ intText }}</textarea>
 					</div>
 				</div>
-				
-			</div>
 	
 			<!-- show Documentupload-->
 			<div v-if="showDocument">
 				<div class="row mb-3">
+				
 					<label for="text" class="form-label col-sm-2">Dokument</label>
-					
-				<!-- File component-->
-				<div  class="col-sm-7">
-					<File ref="upload" id="file" :multiupload="multiupload" v-model:dateien="intAnhang" ></File>
+					<div  class="col-sm-7 py-3">
+						<!--Upload Component-->
+						<FormUploadDms ref="upload" id="file" multiple v-model="intAnhang" ></FormUploadDms>
+					</div>
+				
 				</div>
-				<hr>
 			</div>
 			
 			<!-- show Details-->
@@ -274,8 +282,11 @@ export default {
 					<p class="small">{{this.lastChange}}</p>
 				</div>
 			</div>
-			
+					
 		</form>
+		
+		intText: {{intText}} |<br>propText:	{{propText}} |<br> text: {{text}}  <br> {{intPropText}}
+
 
 	</div>`
 }
diff --git a/public/js/components/tinymce.js.php b/public/js/components/tinymce.js.php
deleted file mode 100644
index 101306442..000000000
--- a/public/js/components/tinymce.js.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-if(file_exists("../../../vendor/tinymce/tinymce5/tinymce.min.js"))
-{
-	header('Content-Type: application/javascript');
-
-	//echo file_get_contents("../../../vendor/tinymce/tinymce5/tinymce.min.js");
-
-	//echo file_get_contents("../../../vendor/tinymce/tinymce5/tinymce.min.js");
-	//echo "export default tinymce";
-
-	//echo "export default " . json_encode(file_get_contents('../../../vendor/tinymce/tinymce5/tinymce.min.js')) . ";";
-
-	echo "var tinymce = ";
-	echo file_get_contents('../../../vendor/tinymce/tinymce5/tinymce.min.js') . ";";
-	echo "export default tinymce";
-
-}
-else
-{
-	header('HTTP/1.0 404 Not Found');
-}
\ No newline at end of file

From 84b23a148ef7e73e0aaa697b5eb67080934b535d Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 18 Jan 2024 15:32:52 +0100
Subject: [PATCH 0331/1461] modulerizing the profil page in multiple reusable
 components

---
 .../Cis/Profil/MitarbeiterProfil.js           | 423 ++----------------
 .../components/Cis/Profil/ProfilComponents.js |  13 +-
 .../ProfilComponents/FhAusweisStatus.js       |  18 +
 .../Profil/ProfilComponents/Mailverteiler.js  |  37 ++
 .../Profil/ProfilComponents/ProfilEmails.js   |  74 +++
 .../ProfilComponents/ProfilInformation.js     | 145 ++++++
 .../Cis/Profil/ProfilComponents/QuickLinks.js |  74 +++
 .../ProfilComponents/RoleInformation.js       |  72 +++
 8 files changed, 478 insertions(+), 378 deletions(-)
 create mode 100644 public/js/components/Cis/Profil/ProfilComponents/FhAusweisStatus.js
 create mode 100644 public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js
 create mode 100644 public/js/components/Cis/Profil/ProfilComponents/ProfilEmails.js
 create mode 100644 public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
 create mode 100644 public/js/components/Cis/Profil/ProfilComponents/QuickLinks.js
 create mode 100644 public/js/components/Cis/Profil/ProfilComponents/RoleInformation.js

diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index e31d817f9..3b0b81d41 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -2,7 +2,12 @@
 import { CoreFilterCmpt } from "../../../components/filter/Filter.js";
 import EditProfil from "./EditProfil.js";
 import {Adresse, Kontakt, FetchProfilUpdates} from "./ProfilComponents.js";
-
+import Mailverteiler from "./ProfilComponents/Mailverteiler.js"; 
+import AusweisStatus from "./ProfilComponents/FhAusweisStatus.js";
+import QuickLinks from "./ProfilComponents/QuickLinks.js";
+import ProfilEmails from "./ProfilComponents/ProfilEmails.js"
+import RoleInformation from "./ProfilComponents/RoleInformation.js";
+import ProfilInformation from "./ProfilComponents/ProfilInformation.js";
 
 export default {
   components: {
@@ -11,6 +16,12 @@ export default {
     Adresse,
     Kontakt,
     FetchProfilUpdates,
+    AusweisStatus,
+    Mailverteiler,
+    QuickLinks,
+    ProfilEmails,
+    RoleInformation,
+    ProfilInformation,
   },
   data() {
     return {
@@ -160,64 +171,30 @@ export default {
     
     },
   
-    sperre_foto_function() {
-      if (!this.data) {
-        return;
-      }
-      Vue.$fhcapi.UserData.sperre_foto_function(!this.data.foto_sperre).then((res) => {
-        this.data.foto_sperre = res.data.foto_sperre;
-      });
-    },
+    
     
   },
 
   computed: {
-
-    //? legacy mailto link to create an email with information that should be changed
-    refreshMailTo() {
-      return `mailto:info.mio@technikum-wien.at?subject=Datenkorrektur&body=Die%20Profildaten%20für%20User%20'${this.data.username}'%20sind%20nicht%20korrekt.%0DHier, die richtigen Daten:%0A%0ANachname:%20${this.data.nachname}%0AVorname:%20${this.data.vorname}%0AGeburtsdatum:${this.data.gebdatum}%0AGeburtsort:%20${this.data.gebort}%0ATitelPre:${this.data.titel}%20%0ATitelPost:${this.data.postnomen}%20%0A%0A***%0DPlatz für weitere (nicht angeführte Daten)%0D***%0A%0A[Bitte%20übermitteln%20Sie%20uns%20etwaige%20Dokumente%20zum%20Beleg%20der%20Änderung]`;
-    },
-
-    get_image_base64_src() {
-      if (!this.data) {
-        return "";
-      }
-      return "data:image/jpeg;base64," + this.data.foto;
-    },
-
-    get_mitarbeiter_standort_telefon(){
-      if(this.data.standort_telefon){
-        return "tel:"+ this.data.telefonklappe + this.data.standort_telefon;
-      }else{
-        return null;
-      }
-    },
-    //? this computed function returns all the informations for the first column in the profil
-    personData() {
+     profilInformation() {
       if (!this.data) {
         return {};
       }
 
       return {
+        Vorname: this.data.vorname,
+        Nachname: this.data.nachname,
         Username: this.data.username,
         Anrede: this.data.anrede,
         Titel: this.data.titel,
         Postnomen: this.data.postnomen,
+        foto_sperre:this.data.foto_sperre,
+        foto:this.data.foto,
+
       };
     },
 
-    personKontakt() {
-      if (!this.data) {
-        return {};
-      }
-
-      return {
-        emails: this.data.emails,
-        
-      };
-    },
-
-    specialData() {
+    roleInformation() {
       if (!this.data) {
         return {};
       }
@@ -231,6 +208,10 @@ export default {
       };
     },
 
+    personEmails() {
+      return this.data?.emails ? this.data.emails : [];
+    },
+
     privateKontakte() {
       if (!this.data) {
         return {};
@@ -250,18 +231,6 @@ export default {
     },
     
 
-    kontaktInfo() {
-      if (!this.data) {
-        return {};
-      }
-
-      return {
-        FhAusweisStatus: this.data.zutrittsdatum,
-        emails: this.data.emails,
-        Kontakte: this.data.kontakte,
-        Adressen: this.data.adressen,
-      };
-    },
   },
  
   created() {
@@ -352,41 +321,18 @@ export default {
              
               <div class="row mb-3">
               <div class="col">
-                <p class="m-0">
-                <div class="card">
-                
-                <a class=" w-100 btn " data-bs-toggle="collapse" href="#collapseExample" role="button" aria-expanded="false" aria-controls="collapseExample">
-                <u> Quick links</u>
-               </a>
-             
-                
-               </div>
-                 
-                </p>
-                <div class="mt-1 collapse" id="collapseExample">
-                  
-                  <div class="list-group">
-                   
-                    <a href="#" class="list-group-item list-group-item-action">Zeitwünsche</a>
-                    <a href="#" class="list-group-item list-group-item-action">Lehrveranstaltungen</a>
-                    <a href="#" class="list-group-item list-group-item-action ">Zeitsperren</a>
-                  </div>
-                </div>
+               
+                <quick-links :mobile="true"></quick-links>
               </div>
             </div>
 
             <!-- HERE STARTS THE ROW WITH REQUESTED CHANGES FROM THE USER -->
             <div class="row mb-3">
             <div class="col">
-              <div class="card">
-              <div class="card-header">
-              Profil Informations Änderungen Anfragen</div>
-              <div class="card-body">
+              
               <fetch-profil-updates @fetchUpdates="fetchProfilUpdates" :data="data.profilUpdates"></fetch-profil-updates>
                     
-              </div>
-              </div>
-             
+              
             </div>
           </div>
 
@@ -432,96 +378,10 @@ export default {
                      <div class="col">
                      
                         
-                      <div class="card h-100">
-                      <div class="card-header">
-                      MitarbeiterIn
-                      </div>
-                      <div class="card-body">
-                      
-                       
+                     <!-- PROFIL INFORMATION -->
+                     <profil-information title="MitarbeiterIn" :data="profilInformation"></profil-information>
 
 
-                  
-                  <div  class="gy-3 row justify-content-center align-items-center">
-
-
-
-
-                  <!-- SQUEEZING THE IMAGE INSIDE THE FIRST INFORMATION COLUMN -->
- <!-- START OF THE FIRST ROW WITH THE PROFIL IMAGE -->
-          <div class="col-12 col-sm-6 mb-2">
-           <div class="row justify-content-center">
-                        <div class="col-auto " style="position:relative">
-                          <img class=" img-thumbnail " style=" max-height:150px; "  :src="get_image_base64_src"></img>
-                          <!-- LOCKING IMAGE FUNCTIONALITY -->
-                          
-                          
-                          <div role="button" @click.prevent="sperre_foto_function" class="image-lock" >
-                          <i :class="{'fa':true, ...(data.foto_sperre?{'fa-lock':true}:{'fa-lock-open':true})} " ></i>
-                          </div>
-
-
-                        </div>
-                      </div>
-                    <!-- END OF THE ROW WITH THE IMAGE -->
-                    </div>
-<!-- END OF SQUEEZE -->
-
-
-
-<!-- COLUMNS WITH MULTIPLE ROWS NEXT TO PROFIL PICTURE -->
-                  <div class="col-12 col-sm-6">
-                  <div class="row gy-4">
-                  <div class="col-12">
-                  
-                        
-                  <div class="form-underline ">
-                  <div class="form-underline-titel">Vorname</div>
-                  <span class="form-underline-content">{{data.vorname}} </span>
-                  </div>
-
-
-                
-                </div>
-                <div class="col-12">
-              
-                <div class="form-underline ">
-                <div class="form-underline-titel">Nachname</div>
-                <span class="form-underline-content">{{data.nachname}} </span>
-                </div>
-
-                </div>
-                </div>
-             
-                
-                  </div>
-                  
-
-
-
-
-
-
-
-                  <div v-for="(wert,bez) in personData" class="col-md-6 col-sm-12 ">
-                  
-                  
-                  <div class="form-underline ">
-                  <div class="form-underline-titel">{{bez}}</div>
-                  <span class="form-underline-content">{{wert?wert:'-'}} </span>
-                  </div>
-                
-
-
-                  </div>
-
-                  
-                      </div>
-
-
-                      
-                      </div>
-                    </div>
 		    </div>
                     </div>
                      <div class="row mb-4">
@@ -529,57 +389,9 @@ export default {
 
                      <div  class=" col-lg-12">
         
-                     <div class="card">
-                 
-                         <div class="card-header">
-                         Mitarbeiter Information
-                         </div>
-                         <div class="card-body">
-                             <div class="gy-3 row">
-                             <div v-for="(wert,bez) in specialData" class="col-md-6 col-sm-12 ">
-                             
-                            
-                             
-                             
-                               
-                                <div class="form-underline">
-                                <div class="form-underline-titel">{{bez }}</div>
+                   <!-- MITARBEITER INFO -->
+                    <role-information title="Mitarbeiter Information" :data="roleInformation"></role-information>
 
-                                <!-- print Telefon link -->
-                                <a :href="get_mitarbeiter_standort_telefon" v-if="bez=='Telefon'" :href="get_mitarbeiter_standort_telefon" class="form-underline-content">{{wert?wert:'-'}}</a>
-                                
-                                <!-- else print information -->
-                                <span v-else class="form-underline-content">{{wert?wert:'-'}}</span>
-                                </div>
-                                
-
-                         
-                             </div>
-
-
-                             <!-- Bearbeiten Button -->
-                             <div class="col-md-6 col-sm-12 ">
-                              <button @click="showModal" type="button" class="text-start  w-100 btn btn-outline-primary" >
-                                <div class="row">
-                                  <div class="col-2">
-                                    <i class="fa fa-edit"></i>
-                                  </div>
-                                  <div class="col-10">Bearbeiten</div>
-                                </div>
-                              </button>
-
-                             <!-- simml -->
-
-                           
-                              
-                            
-
-                             </div>
-                             </div>
-                         
-                     </div>
-                     
-                 </div>
 
                      </div>  
                             
@@ -606,64 +418,11 @@ export default {
                     <div class="row mb-4">
                     <div class="col">
 
-
-                    <div class="card ">
-                    <div class="card-header">
-                    Mails
-                    </div>
-                   
-                    <div class="card-body">
-
-
+                    
+                    <!-- EMAILS -->
+                    <profil-emails :data="personEmails" ></profil-emails>
 
                    
-
-                      <div v-for="(wert,bezeichnung) in personKontakt">
-
-                      
-            
-                      <!-- HIER SIND DIE EMAILS -->
-                  
-
-                  
-                      <div  v-if="typeof wert === 'object' && bezeichnung == 'emails'" class="gy-3 row justify-content-center ">
-                      <div v-for="email in wert" class="col-12 ">
-                     
-                            <div class="row align-items-center">
-                            
-                      <div class="col-1 text-center">
-
-                      <i class="fa-solid fa-envelope" style="color:rgb(0, 100, 156)"></i>
-
-                      </div>
-
-                      
-                      <div class="col-11">
-
-                      <div class="form-underline">
-                      <div class="form-underline-titel">{{email.type}}</div>
-                      <a :href="'mailto:'+email.email" class="form-underline-content">{{email.email}} </a>
-                      </div>
-                      
-                      
-                      </div>
-                      </div>
-                      </div>
-                          </div>
-
-                    
-                    
-                     
-
-
-
-
-                    
-                      </div>
-
-
-                    </div>
-                    </div>
                     </div></div>
 
                     <!-- HIER SIND DIE PRIVATEN KONTAKTE-->
@@ -759,26 +518,13 @@ export default {
 
               <!-- START OF SIDE PANEL -->
               <div  class="col-md-4 col-xxl-3 col-sm-12 text-break" >
-
-
-              <!-- SRART OF QUICK LINKS IN THE SIDE PANEL -->
-
-
-              <!-- START OF THE FIRDT ROW IN THE SIDE PANEL -->
-              <!-- THESE QUCK LINKS ARE ONLY VISIBLE UNTIL VIEWPORT MD -->
+              
               <div v-if="data.profilUpdates" class="row d-none d-md-block mb-3">
               <div class="col mb-3">
-                    <div  class="card">
-                      <div class="card-header">
-                      Profil Updates
-                      </div>
-                      <div class="card-body">
-                      <fetch-profil-updates @fetchUpdates="fetchProfilUpdates" :data="data.profilUpdates"></fetch-profil-updates>
-                      </div>
-                      </div>
 
-                   
-                      
+
+                      <!-- PROFIL UPDATES -->
+                      <fetch-profil-updates @fetchUpdates="fetchProfilUpdates" :data="data.profilUpdates"></fetch-profil-updates>
                   
                   </div>    
                   </div>
@@ -786,20 +532,8 @@ export default {
                 
                 <div class="col">
                  
-                    <div class="card">
-                      <div class="card-header">
-                      Quick Links
-                      </div>
-                      <div class="card-body">
-                      
-                       
-                        <a style="text-decoration:none" class="my-1 d-block" href="#">Zeitwuensche</a>
-                        <a style="text-decoration:none" class="my-1 d-block" href="#">Lehrveranstaltungen</a>
-                        <a style="text-decoration:none" class="my-1 d-block" href="#">Zeitsperren</a>
-
-                      </div>
-                    </div>
-
+                    <!-- QUICK LINKS --> 
+                    <quick-links></quick-links>
                    
                       
                   
@@ -807,82 +541,21 @@ export default {
                 </div>
 
                 <div class="row mb-3" >
-                
-                
                 <div class="col-12">
-             
-             
-                
-                  <div class="card">
-                    <div class="card-body">
-                      <span>Der FH Ausweis ist am <b>{{data.zutrittsdatum}}</b> ausgegeben worden.</span>
-                    </div>
-                
-                </div>
-      
-         
-                </div>
-                
+                  <!-- AUSWEIS STATUS -->
+                  <ausweis-status :data="data.zutrittsdatum"></ausweis-status>
+                </div>                
                 </div>
 
-
-                <!-- START OF THE SECOND ROW IN THE SIDE PANEL -->
                 <div  class="row">
-                
                   <div class="col">
-                
-
-                  
-                  <!-- HIER SIND DIE MAILVERTEILER -->
-                    <div class="card">
-                      <div class="card-header">
-                      Mailverteilers
-                      </div>
-                      <div class="card-body">
-                      
-                        <h6 class="card-title">Sie sind Mitgglied in folgenden Verteilern:</h6>
-                        <div  class="card-text row text-break mb-2" v-for="verteiler in data?.mailverteiler">
-                          <div class="col-12 ">
-                            <div class="row">  
-                              <div class="col-1 ">
-                              
-                              <i class="fa-solid fa-envelope" style="color: #00649C;"></i>
-                              
-                              </div>
-                              <div class="col">
-                                <a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a>
-                              </div>
-                            </div>
-                           
-                          </div> 
-                          <div class="col-11 offset-1 ">{{verteiler.beschreibung}}</div>
-                        </div>
-
-                      </div>
-                    </div>
-
-
-
-
-
+                  <!-- MAILVERTEILER -->
+                    <mailverteiler  :data="data?.mailverteiler"></mailverteiler>
+                    
                   </div>
-
-                <!-- END OF THE SECOND ROW IN THE SIDE PANEL -->
                 </div>
-
-                <!-- END OF SIDE PANEL -->
-              </div>
-
-
-            
-
-
-
-          <!-- END OF CONTAINER ROW-->
-          
+              </div>          
       </div>
-      
-      <!-- END OF CONTAINER -->
   </div>
             
     `,
diff --git a/public/js/components/Cis/Profil/ProfilComponents.js b/public/js/components/Cis/Profil/ProfilComponents.js
index 3b666002c..fd9db1dd4 100644
--- a/public/js/components/Cis/Profil/ProfilComponents.js
+++ b/public/js/components/Cis/Profil/ProfilComponents.js
@@ -223,8 +223,7 @@ const EditKontakt =  {
     },
     template:
     `
-    <pre>{{JSON.stringify(data)}}</pre>
-    <pre>{{originalValue}}</pre>
+    
     <div class="gy-3 row align-items-center justify-content-center">
     
     <div v-if="!data.kontakt_id" class="col-12">
@@ -386,7 +385,12 @@ const FetchProfilUpdates = {
         
     },
     template:`
-    <pre>{{JSON.stringify(data,null,2)}}</pre>
+   
+    <div  class="card">
+                      <div class="card-header">
+                      Profil Updates
+                      </div>
+                      <div class="card-body" >
     <div class="table-responsive">
         <table class="m-0  table  table-hover">
             <thead>
@@ -408,6 +412,9 @@ const FetchProfilUpdates = {
             </tbody>
         </table>
     </div>
+    </div>
+    </div>
+
     
     `
 };
diff --git a/public/js/components/Cis/Profil/ProfilComponents/FhAusweisStatus.js b/public/js/components/Cis/Profil/ProfilComponents/FhAusweisStatus.js
new file mode 100644
index 000000000..25bd41708
--- /dev/null
+++ b/public/js/components/Cis/Profil/ProfilComponents/FhAusweisStatus.js
@@ -0,0 +1,18 @@
+export default {
+    props:{
+        data:{
+            type:String,
+        }
+    },
+    data(){
+        return {
+
+        }
+    },
+    template: `
+    <div class="card">
+        <div class="card-body">
+        <span>Der FH Ausweis ist am <b>{{data}}</b> ausgegeben worden.</span>
+        </div>
+    </div>`,
+}
\ No newline at end of file
diff --git a/public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js b/public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js
new file mode 100644
index 000000000..15f4efcf8
--- /dev/null
+++ b/public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js
@@ -0,0 +1,37 @@
+export default {
+    props: {
+        data: Object,
+        title: { type: String, default: "Mailverteilers" },
+    },
+    data() {
+        return {};
+    },
+    template: `
+    <div class="card">
+   
+        <div class="card-header">
+        {{title}}
+        </div>
+        <div class="card-body">
+        
+        <h6 class="card-title">Sie sind Mitglied in folgenden Verteilern:</h6>
+        <div  class="card-text row text-break mb-2" v-for="verteiler in data">
+            <div class="col-12 ">
+            <div class="row">  
+                <div class="col-1 ">
+                
+                <i class="fa-solid fa-envelope" style="color: #00649C;"></i>
+                
+                </div>
+                <div class="col">
+                <a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a>
+                </div>
+            </div>
+            
+            </div> 
+            <div class="col-11 offset-1 ">{{verteiler.beschreibung}}</div>
+        </div>
+
+        </div>
+    </div>`,
+};
diff --git a/public/js/components/Cis/Profil/ProfilComponents/ProfilEmails.js b/public/js/components/Cis/Profil/ProfilComponents/ProfilEmails.js
new file mode 100644
index 000000000..5de2be8ad
--- /dev/null
+++ b/public/js/components/Cis/Profil/ProfilComponents/ProfilEmails.js
@@ -0,0 +1,74 @@
+export default {
+    data(){
+        return {
+
+        }
+    },
+    props:{
+        title:{
+            type:String,
+            default:"Mails",
+        },
+        data:{
+            type:Array,
+        }
+    },
+    template: `
+    <div class="card ">
+    <div class="card-header">
+    {{title}}
+    </div>
+   
+    <div class="card-body">
+
+
+
+   
+
+      
+
+      
+
+      <!-- HIER SIND DIE EMAILS -->
+  
+
+  
+      <div  class="gy-3 row justify-content-center ">
+      <div v-for="email in data" class="col-12 ">
+  
+            <div class="row align-items-center">
+            
+      <div class="col-1 text-center">
+
+      <i class="fa-solid fa-envelope" style="color:rgb(0, 100, 156)"></i>
+
+      </div>
+
+      
+      <div class="col-11">
+
+      <div class="form-underline">
+      <div class="form-underline-titel">{{email.type}}</div>
+      <a :href="'mailto:'+email.email" class="form-underline-content">{{email.email}} </a>
+      </div>
+      
+      
+      </div>
+      </div>
+      </div>
+          </div>
+
+    
+    
+     
+
+
+
+
+    
+   
+
+
+    </div>
+    </div>`
+}
\ No newline at end of file
diff --git a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
new file mode 100644
index 000000000..fe3b18380
--- /dev/null
+++ b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
@@ -0,0 +1,145 @@
+export default {
+
+    props:{
+        title:{
+            type:String,
+            
+        },
+        data:{
+            type:Object,
+        }
+    },
+    data(){
+        return {
+            FotoSperre:this.data.foto_sperre,
+        }
+    },
+    
+    methods:{
+        
+        sperre_foto_function() {
+            //TODO: make this better
+            if (!this.data) {
+              return;
+            }
+            Vue.$fhcapi.UserData.sperre_foto_function(!this.FotoSperre).then((res) => {
+              this.FotoSperre = res.data.foto_sperre;
+            
+            });
+          },
+    },
+    computed:{
+        get_image_base64_src: function() {
+            if (!this.data.foto) {
+              return "";
+            }
+            return "data:image/jpeg;base64," + this.data.foto;
+          },
+        name: function(){
+            return {vorname:this.data.Vorname, nachname: this.data.Nachname};
+        },
+        profilInfo: function(){
+            let res = {};
+            let notIncludedProperties=["Vorname", "Nachname", "foto_sperre","foto"];
+            Object.keys(this.data).forEach((key)=>{
+                if(!notIncludedProperties.includes(key)){
+                    res[key] = this.data[key];
+                }
+            })
+            return res;
+        }
+    },
+    template: `
+    
+    <div class="card h-100">
+    <div class="card-header">
+    {{title}}
+    </div>
+    <div class="card-body">
+    
+     
+
+
+
+<div  class="gy-3 row justify-content-center align-items-center">
+
+
+
+
+<!-- SQUEEZING THE IMAGE INSIDE THE FIRST INFORMATION COLUMN -->
+<!-- START OF THE FIRST ROW WITH THE PROFIL IMAGE -->
+<div class="col-12 col-sm-6 mb-2">
+<div class="row justify-content-center">
+      <div class="col-auto " style="position:relative">
+        <img class=" img-thumbnail " style=" max-height:150px; "  :src="get_image_base64_src"></img>
+        <!-- LOCKING IMAGE FUNCTIONALITY -->
+        
+        
+        <div role="button" @click.prevent="sperre_foto_function" class="image-lock" >
+        <i :class="{'fa':true, ...(FotoSperre?{'fa-lock':true}:{'fa-lock-open':true})} " ></i>
+        </div>
+
+
+      </div>
+    </div>
+  <!-- END OF THE ROW WITH THE IMAGE -->
+  </div>
+<!-- END OF SQUEEZE -->
+
+
+
+<!-- COLUMNS WITH MULTIPLE ROWS NEXT TO PROFIL PICTURE -->
+<div class="col-12 col-sm-6">
+<div class="row gy-4">
+<div class="col-12">
+
+      
+<div class="form-underline ">
+<div class="form-underline-titel">Vorname</div>
+<span class="form-underline-content">{{name.vorname}} </span>
+</div>
+
+
+
+</div>
+<div class="col-12">
+
+<div class="form-underline ">
+<div class="form-underline-titel">Nachname</div>
+<span class="form-underline-content">{{name.nachname}} </span>
+</div>
+
+</div>
+</div>
+
+
+</div>
+
+
+
+
+
+
+
+
+<div v-for="(wert,bez) in profilInfo" class="col-md-6 col-sm-12 ">
+
+
+<div class="form-underline ">
+<div class="form-underline-titel">{{bez}}</div>
+<span class="form-underline-content">{{wert?wert:'-'}} </span>
+</div>
+
+
+
+</div>
+
+
+    </div>
+
+
+    
+    </div>
+  </div>`,
+
+};
\ No newline at end of file
diff --git a/public/js/components/Cis/Profil/ProfilComponents/QuickLinks.js b/public/js/components/Cis/Profil/ProfilComponents/QuickLinks.js
new file mode 100644
index 000000000..7a78d2041
--- /dev/null
+++ b/public/js/components/Cis/Profil/ProfilComponents/QuickLinks.js
@@ -0,0 +1,74 @@
+export default{
+    //TODO: To be implemented
+    props:{
+        data:{
+            type:String,
+            
+        },
+        title:{
+            type:String,
+            default: "Quick Links",
+        },
+        mobile:{
+            type:Boolean,
+            default:false,
+        }
+    },
+    methods:{
+        hideCollapse: function(){
+            this.collapseOpen = false;
+        },
+        showCollapse: function(){
+            this.collapseOpen = true;
+        },
+    },
+    data(){
+        return{
+            collapseOpen: false,
+
+        }
+    },
+    template:`
+    <div class="card">
+    <template v-if="mobile">
+    
+                
+               
+               <button class="btn btn-outline-primary"  data-bs-toggle="collapse"  data-bs-target="#quickLinks" :aria-expanded="collapseOpen" aria-controls="quickLinks" >
+               {{title}}
+               <i class="fa " :class="collapseOpen?'fa-chevron-up':'fa-chevron-down'"></i> 
+               </button>
+             
+                
+               
+                 
+   
+                <div @['show.bs.collapse']="collapseOpen=true;" @['hide.bs.collapse']="collapseOpen=false;" class="mt-1 collapse" id="quickLinks">
+                  
+                  <div class="list-group">
+                   
+                    <a href="#" class="list-group-item list-group-item-action">Zeitwünsche</a>
+                    <a href="#" class="list-group-item list-group-item-action">Lehrveranstaltungen</a>
+                    <a href="#" class="list-group-item list-group-item-action ">Zeitsperren</a>
+                  </div>
+                  </div>
+                
+    </template>
+    <template v-else>
+    
+   
+    <div class="card-header">
+    {{title}}
+    </div>
+    <div class="card-body">
+    
+     
+      <a style="text-decoration:none" class="my-1 d-block" href="#">Zeitwuensche</a>
+      <a style="text-decoration:none" class="my-1 d-block" href="#">Lehrveranstaltungen</a>
+      <a style="text-decoration:none" class="my-1 d-block" href="#">Zeitsperren</a>
+
+    </div>
+  
+  </template>
+  </div>`,
+}
\ No newline at end of file
diff --git a/public/js/components/Cis/Profil/ProfilComponents/RoleInformation.js b/public/js/components/Cis/Profil/ProfilComponents/RoleInformation.js
new file mode 100644
index 000000000..6303719de
--- /dev/null
+++ b/public/js/components/Cis/Profil/ProfilComponents/RoleInformation.js
@@ -0,0 +1,72 @@
+export default {
+    data(){
+        return {
+
+        }
+    },
+    props:{
+        data:{
+            type:Object,
+        },
+        title:{
+            type:String,
+        }
+    },
+    computed:{
+        
+    },
+    created(){
+        //TODO: check if data.Telefon is a valid telefon number to call before using it as a tel: link
+    },
+    template:`
+    <div class="card">
+                 
+    <div class="card-header">
+    {{title}}
+    </div>
+    <div class="card-body">
+        <div class="gy-3 row">
+        <div v-for="(wert,bez) in data" class="col-md-6 col-sm-12 ">
+            
+       
+        
+        
+          
+           <div class="form-underline">
+           <div class="form-underline-titel">{{bez }}</div>
+
+           <!-- print Telefon link -->
+           <a  v-if="bez=='Telefon'" :href="data.Telefon?'tel:'+data.Telefon:''" class="form-underline-content">{{wert?wert:'-'}}</a>
+           
+           <!-- else print information -->
+           <span v-else class="form-underline-content">{{wert?wert:'-'}}</span>
+           </div>
+           
+
+    
+        </div>
+
+
+        <!-- Bearbeiten Button -->
+        <div class="col-md-6 col-sm-12 ">
+         <button @click="showModal" type="button" class="text-start  w-100 btn btn-outline-primary" >
+           <div class="row">
+             <div class="col-2">
+               <i class="fa fa-edit"></i>
+             </div>
+             <div class="col-10">Bearbeiten</div>
+           </div>
+         </button>
+
+
+      
+         
+       
+
+        </div>
+        </div>
+    
+</div>
+
+</div>`
+};
\ No newline at end of file

From bc71415dd5b02c2d1fe98434bc71b374d7da0c31 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 18 Jan 2024 15:40:42 +0100
Subject: [PATCH 0332/1461] Tabs: rename prop configUrl => config

---
 public/js/components/Tabs.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/js/components/Tabs.js b/public/js/components/Tabs.js
index 1e77fa996..fed6957a0 100644
--- a/public/js/components/Tabs.js
+++ b/public/js/components/Tabs.js
@@ -12,7 +12,7 @@ export default {
 	],
 	props: {
 		// TODO(chris): rename to config?
-		configUrl: {
+		config: {
 			type: [String, Object],
 			required: true
 		},
@@ -43,7 +43,7 @@ export default {
 		}
 	},
 	watch: {
-		configUrl(n) {
+		config(n) {
 			this.initConfig(n);
 		}
 	},
@@ -101,7 +101,7 @@ export default {
 		}
 	},
 	created() {
-		this.initConfig(this.configUrl);
+		this.initConfig(this.config);
 	},
 	template: `
 	<div class="fhc-tabs d-flex" :class="vertical ? 'align-items-stretch' : 'flex-column'" v-if="Object.keys(tabs).length">

From dc973217b7d4026e9702256ae26312286df36f8f Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 18 Jan 2024 15:40:56 +0100
Subject: [PATCH 0333/1461] Css improvements

---
 public/css/Fhc.css                 | 55 ++++++++++++++++++++++++++++--
 public/css/components/primevue.css | 11 ++++++
 2 files changed, 63 insertions(+), 3 deletions(-)

diff --git a/public/css/Fhc.css b/public/css/Fhc.css
index 1376a251f..30fa212d7 100644
--- a/public/css/Fhc.css
+++ b/public/css/Fhc.css
@@ -1,11 +1,60 @@
 .text-prewrap {
-  white-space: pre-line;
+	white-space: pre-line;
 }
 
 .btn-p-0 {
-  padding: 0 .375rem;
+	padding: 0 .375rem;
 }
 
 .z-1 {
-  z-index: 1;
+	z-index: 1;
 }
+
+.input-group > .input-group-item {
+	position: relative;
+	flex: 1 1 auto;
+	width: 1%;
+	min-width: 0;
+}
+
+.input-group > .input-group-item .form-control:focus,
+.input-group > .input-group-item .form-select:focus {
+	z-index: 3;
+	position: relative;
+}
+
+.input-group-lg > .input-group-item .form-control,
+.input-group-lg > .input-group-item .form-select {
+	padding: 0.5rem 1rem;
+	font-size: 1.25rem;
+	border-radius: 0.3rem;
+}
+
+
+.input-group-sm > .input-group-item .form-control,
+.input-group-sm > .input-group-item .form-select {
+	padding: 0.25rem 0.5rem;
+	font-size: 0.875rem;
+	border-radius: 0.2rem;
+}
+
+.input-group-lg > .input-group-item .form-select,
+.input-group-sm > .input-group-item .form-select {
+	padding-right: 3rem;
+}
+
+.input-group:not(.has-validation) > .input-group-item:not(:last-child) .form-control,
+.input-group:not(.has-validation) > .input-group-item:not(:last-child) .form-select {
+	border-top-right-radius: 0;
+	border-bottom-right-radius: 0;
+}
+.input-group.has-validation > .input-group-item:nth-last-child(n+3) .form-control,
+.input-group.has-validation > .input-group-item:nth-last-child(n+3) .form-select {
+	border-top-right-radius: 0;
+	border-bottom-right-radius: 0;
+}
+.input-group > .input-group-item:not(:first-child) .form-control,
+.input-group > .input-group-item:not(:first-child) .form-select {
+	border-top-left-radius: 0;
+	border-bottom-left-radius: 0;
+}
\ No newline at end of file
diff --git a/public/css/components/primevue.css b/public/css/components/primevue.css
index 0f5caaa6f..6e27bbc10 100644
--- a/public/css/components/primevue.css
+++ b/public/css/components/primevue.css
@@ -5664,3 +5664,14 @@
 }
 
 /* Customizations to the designer theme should be defined here */
+.p-inputtext {
+  padding: 0.375rem 0.75rem;
+}
+
+.p-inputtext:enabled:focus {
+  color: #212529;
+  background-color: #fff;
+  border-color: #86b7fe;
+  outline: 0;
+  box-shadow: 0 0 0 .25rem rgba(13,110,253,.25);
+}

From 604bfeea2009fc321c7368c4418d51d6a80cbe82 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 18 Jan 2024 15:41:24 +0100
Subject: [PATCH 0334/1461] Form input component: improvements

---
 public/js/components/Form/Form.js       |  8 +++
 public/js/components/Form/Input.js      | 68 ++++++++++++++++++++++---
 public/js/components/Form/Upload/Dms.js |  8 +--
 3 files changed, 74 insertions(+), 10 deletions(-)

diff --git a/public/js/components/Form/Form.js b/public/js/components/Form/Form.js
index 9ca6af7e3..2257eb289 100644
--- a/public/js/components/Form/Form.js
+++ b/public/js/components/Form/Form.js
@@ -30,6 +30,14 @@ export default {
 				if (!a[name])
 					a[name] = [];
 				a[name].push(c);
+
+				if (c.lcType == 'checkbox' && name.substr(-1) == ']' && name.indexOf('[')) {
+					name = name.substr(0, name.lastIndexOf('['));
+					if (!a[name])
+						a[name] = [];
+					a[name].push(c);
+				}
+
 				return a;
 			}, {});
 		}
diff --git a/public/js/components/Form/Input.js b/public/js/components/Form/Input.js
index 8107c1a19..ba63b8fdc 100644
--- a/public/js/components/Form/Input.js
+++ b/public/js/components/Form/Input.js
@@ -13,6 +13,8 @@ export default {
 	props: {
 		bsFeedback: Boolean,
 		noAutoClass: Boolean,
+		noFeedback: Boolean,
+		inputGroup: Boolean,
 		type: String,
 		name: String,
 		containerClass: [String, Array, Object]
@@ -29,8 +31,38 @@ export default {
 				return true;
 			if (this.containerClass)
 				return true;
+			if (this.autoContainerClass)
+				return true;
 			return false;
 		},
+		acc() {
+			if (!this.containerClass)
+				return {};
+			if (typeof this.containerClass === 'string' || this.containerClass instanceof String)
+				return this.containerClass.split(' ').reduce((a,c) => {a[c] = true; return a}, {});
+			if (Array.isArray(this.containerClass))
+				return this.containerClass.reduce((a,c) => {a[c] = true; return a}, {});
+			return this.containerClass;
+		},
+		autoContainerClass() {
+			if (this.noAutoClass)
+				return this.acc;
+			
+			const acc = {...this.acc};
+			
+			if (this.inputGroup)
+				acc['input-group-item'] = true;
+
+			if (this.lcType == 'radio' || this.lcType == 'checkbox')
+				acc['form-check'] = true;
+			
+			if (this.inputGroup && acc['form-check']) {
+				acc['input-group-item'] = false;
+				acc['form-check'] = false;
+				acc['input-group-text'] = true;
+			}
+			return acc;
+		},
 		lcType() {
 			if (!this.type)
 				return 'text';
@@ -47,6 +79,9 @@ export default {
 					return 'PvAutocomplete';
 				case 'uploadimage':
 					return 'UploadImage';
+				case 'uploadfile':
+				case 'uploaddms':
+					return 'UploadDms';
 				default:
 					return 'input';
 			}
@@ -81,6 +116,8 @@ export default {
 						classes.push('p-0');
 						classes.push('border-0');
 					case 'text':
+					case 'number':
+					case 'password':
 					case 'textarea':
 						if (!c.includes('form-control'))
 							classes.push('form-control');
@@ -146,6 +183,8 @@ export default {
 				this._.components.PvAutocomplete = Vue.defineAsyncComponent(() => import(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + "/public/js/components/primevue/autocomplete/autocomplete.esm.min.js"));
 			} else if (this.tag == 'UploadImage' && !this._.components.UploadImage) {
 				this._.components.UploadImage = Vue.defineAsyncComponent(() => import("./Upload/Image.js"));
+			} else if (this.tag == 'UploadDms' && !this._.components.UploadDms) {
+				this._.components.UploadDms = Vue.defineAsyncComponent(() => import("./Upload/Dms.js"));
 			}
 		}
 	},
@@ -158,10 +197,9 @@ export default {
 	mounted() {
 		if (this.$registerToForm)
 			this.$registerToForm(this);
-		// TODO(chris): wrap check in div?
 	},
 	template: `
-	<component :is="!hasContainer ? 'FhcFragment' : 'div'" class="position-relative" :class="containerClass">
+	<component :is="!hasContainer ? 'FhcFragment' : 'div'" class="position-relative" :class="autoContainerClass">
 		<label v-if="$attrs.label && lcType != 'radio' && lcType != 'checkbox'" :for="idCmp">{{$attrs.label}}</label>
 		<input v-if="tag == 'input'" :type="lcType" v-model="modelValueCmp" v-bind="$attrs" :id="idCmp" :name="name" :class="validationClass" :modelValue="undefined" @input="clearValidation(); $emit('input', $event)">
 		<textarea v-else-if="tag == 'textarea'" v-model="modelValueCmp" v-bind="$attrs" :id="idCmp" :name="name" :class="validationClass" :modelValue="undefined" @input="clearValidation(); $emit('input', $event)"></textarea>
@@ -174,10 +212,11 @@ export default {
 			:type="type"
 			v-model="modelValueCmp"
 			v-bind="$attrs"
-			:uid="idCmp.substr(9)"
+			:uid="idCmp ? idCmp.substr(9) : idCmp"
 			:name="name"
 			:class="validationClass"
-			:input-class-name="[...Object.entries({'form-control': !noAutoClass, 'is-valid': valid === true, 'is-invalid': valid === false}).reduce((a,[k,v]) => {if(v) a.push(k);return a}, []), ...($attrs['input-class-name'] ? $attrs['input-class-name'].split(' ') : [])].join(' ')"
+			:input-class-name=
+			"[...Object.entries({'form-control': !noAutoClass, 'is-valid': valid === true, 'is-invalid': valid === false}).reduce((a,[k,v]) => {if(v) a.push(k);return a}, []), ...($attrs['input-class-name'] ? $attrs['input-class-name'].split(' ') : [])].join(' ')"
 			@update:model-value="clearValidation"
 			>
 			<slot></slot>
@@ -189,13 +228,28 @@ export default {
 			v-model="modelValueCmp"
 			v-bind="$attrs"
 			:id="idCmp"
-			:name="name"
+			:input-props="{name}"
 			:class="validationClass"
 			:input-class="[...Object.entries({'form-control': !noAutoClass, 'is-valid': valid === true, 'is-invalid': valid === false}).reduce((a,[k,v]) => {if(v) a.push(k);return a}, []), ...($attrs['input-class'] ? $attrs['input-class'].split(' ') : [])].join(' ')"
 			@update:model-value="clearValidation"
 			>
 			<slot></slot>
 		</component>
+		<component
+			v-else-if="tag == 'UploadDms'"
+			:is="tag"
+			:type="type"
+			v-model="modelValueCmp"
+			v-bind="$attrs"
+			:id="idCmp"
+			:name="name"
+			:class="validationClass"
+			:input-class="validationClass"
+			:no-list="inputGroup"
+			@update:model-value="clearValidation"
+			>
+			<slot></slot>
+		</component>
 		<component
 			v-else
 			:is="tag"
@@ -209,13 +263,13 @@ export default {
 			>
 			<slot></slot>
 		</component>
-		<div v-if="valid !== undefined && feedback.length" :class="feedbackClass">
+		<label v-if="$attrs.label && (lcType == 'radio' || lcType == 'checkbox')" :for="idCmp" :class="!noAutoClass && 'form-check-label'">{{$attrs.label}}</label>
+		<div v-if="valid !== undefined && feedback.length && !noFeedback" :class="feedbackClass">
 			<template v-for="(msg, i) in feedback" :key="i">
 				<hr v-if="i" class="m-0">
 				{{msg}}
 			</template>
 		</div>
-		<label v-if="$attrs.label && (lcType == 'radio' || lcType == 'checkbox')" :for="idCmp" :class="!noAutoClass && 'form-check-label'">{{$attrs.label}}</label>
 	</component>
 	`
 }
\ No newline at end of file
diff --git a/public/js/components/Form/Upload/Dms.js b/public/js/components/Form/Upload/Dms.js
index 1c2f476e8..da37a2105 100644
--- a/public/js/components/Form/Upload/Dms.js
+++ b/public/js/components/Form/Upload/Dms.js
@@ -9,7 +9,9 @@ export default {
 		},
 		multiple: Boolean,
 		id: String,
-		name: String
+		name: String,
+		inputClass: [String, Array, Object],
+		noList: Boolean
 	},
 	methods: {
 		stringifyFile(file) {
@@ -71,8 +73,8 @@ export default {
 	},
 	template: `
 	<div class="form-upload-dms">
-		<input ref="upload" class="form-control" :id="id" :name="name" :multiple="multiple" type="file" @change="addFiles">
-		<ul v-if="modelValue.length && multiple" class="list-unstyled m-0">
+		<input ref="upload" class="form-control" :class="inputClass" :id="id" :name="name" :multiple="multiple" type="file" @change="addFiles">
+		<ul v-if="modelValue.length && multiple && !noList" class="list-unstyled m-0">
 			<li v-for="(file, index) in modelValue" :key="index" class="d-flex mx-1 mt-1">
 				<span class="col-auto"><i class="fa fa-file me-1"></i></span>
 				<span class="col">{{ file.name }}</span>

From 7861829ee4d9a84499e59573c015fc6b0079aaae Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 18 Jan 2024 15:54:23 +0100
Subject: [PATCH 0335/1461] input color

---
 public/css/Fhc.css                 | 10 +++++++++-
 public/js/components/Form/Input.js |  3 +++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/public/css/Fhc.css b/public/css/Fhc.css
index 30fa212d7..20bfd85d7 100644
--- a/public/css/Fhc.css
+++ b/public/css/Fhc.css
@@ -57,4 +57,12 @@
 .input-group > .input-group-item:not(:first-child) .form-select {
 	border-top-left-radius: 0;
 	border-bottom-left-radius: 0;
-}
\ No newline at end of file
+}
+
+.form-control-color.is-invalid,
+.was-validated .form-control-color:invalid,
+.form-control-color.is-valid,
+.was-validated .form-control-color:valid {
+	padding-right: .375rem;
+	background-image: none;
+}
diff --git a/public/js/components/Form/Input.js b/public/js/components/Form/Input.js
index ba63b8fdc..1fc318523 100644
--- a/public/js/components/Form/Input.js
+++ b/public/js/components/Form/Input.js
@@ -115,6 +115,9 @@ export default {
 					case 'datepicker':
 						classes.push('p-0');
 						classes.push('border-0');
+					case 'color':
+						if (!c.includes('form-control-color'))
+							classes.push('form-control-color');
 					case 'text':
 					case 'number':
 					case 'password':

From 3e912f9545aa936af307146297b658d02ab8393e Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 19 Jan 2024 09:04:37 +0100
Subject: [PATCH 0336/1461] bugfix prop

---
 public/js/components/Notiz/Notiz.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index f1aa63280..a6e4c7183 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -14,7 +14,7 @@ export default {
 	props: [
 		'typeId',
 		'titel',
-		'propText',
+		'text',
 		'lastChange',
 		'von',
 		'bis',
@@ -211,6 +211,11 @@ export default {
 <!--						<textarea id="editor" rows="5" cols="75" @input="updateContent" class="form-control">{{ intText }}</textarea>-->
 						<textarea id="editor" rows="5" cols="75" @input="updateContent" class="form-control">{{ intText }}</textarea>
 					</div>
+					
+					<!--	oldversion-->
+<!--					<div class="col-sm-7">
+						<textarea rows="5" cols="75" v-model="intText" class="form-control"></textarea>
+					</div>-->
 				</div>
 	
 			<!-- show Documentupload-->

From 0d5e8e89a64acb08d9ec0fef72266c6d4e445d23 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 19 Jan 2024 15:07:57 +0100
Subject: [PATCH 0337/1461] splits the ProfilComponents.js file into multiple
 components in the ProfilComponents Folder and StudentProfil uses the
 components

---
 public/js/components/Cis/Profil/EditProfil.js |   4 +-
 .../components/Cis/Profil/EditProfilSelect.js |   8 +-
 .../Cis/Profil/MitarbeiterProfil.js           | 138 ++----
 .../components/Cis/Profil/ProfilComponents.js | 422 ----------------
 .../Cis/Profil/ProfilComponents/Adresse.js    |  55 +++
 .../Profil/ProfilComponents/EditAdresse.js    |  97 ++++
 .../Profil/ProfilComponents/EditKontakt.js    | 106 ++++
 .../ProfilComponents/FetchProfilUpdates.js    | 128 +++++
 .../Cis/Profil/ProfilComponents/Kontakt.js    |  56 +++
 .../ProfilComponents/RoleInformation.js       |  23 -
 .../js/components/Cis/Profil/StudentProfil.js | 465 +++---------------
 .../js/components/Cis/Profil/oldAccordion.txt | 129 -----
 12 files changed, 572 insertions(+), 1059 deletions(-)
 delete mode 100644 public/js/components/Cis/Profil/ProfilComponents.js
 create mode 100644 public/js/components/Cis/Profil/ProfilComponents/Adresse.js
 create mode 100644 public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
 create mode 100644 public/js/components/Cis/Profil/ProfilComponents/EditKontakt.js
 create mode 100644 public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
 create mode 100644 public/js/components/Cis/Profil/ProfilComponents/Kontakt.js
 delete mode 100644 public/js/components/Cis/Profil/oldAccordion.txt

diff --git a/public/js/components/Cis/Profil/EditProfil.js b/public/js/components/Cis/Profil/EditProfil.js
index b033cd66a..10bcea898 100644
--- a/public/js/components/Cis/Profil/EditProfil.js
+++ b/public/js/components/Cis/Profil/EditProfil.js
@@ -45,8 +45,7 @@ export default {
         //? inserts new row in public.tbl_cis_profil_update 
         //* calls the update api call if an update field is present in the data that was passed to the module
         Vue.$fhcapi.UserData[this.editData.update?'updateProfilRequest':'insertProfilRequest'](this.topic,this.profilUpdate).then((res)=>{
-          console.log("topic",this.topic);
-          console.log("profilUpdate",this.profilUpdate);
+          
           if(res.data.error == 0){
             this.result= true;
             this.hide();
@@ -79,7 +78,6 @@ export default {
     return BsModal.popup.bind(this)(null, options);
   },
   template: `
-  
   <bs-modal ref="modalContainer" v-bind="$props" body-class="" dialog-class="modal-lg" class="bootstrap-alert" backdrop="false" >
     
   <template v-slot:title>
diff --git a/public/js/components/Cis/Profil/EditProfilSelect.js b/public/js/components/Cis/Profil/EditProfilSelect.js
index f067d1778..e721b6f11 100644
--- a/public/js/components/Cis/Profil/EditProfilSelect.js
+++ b/public/js/components/Cis/Profil/EditProfilSelect.js
@@ -1,5 +1,7 @@
-import {Kontakt, EditKontakt, Adresse, EditAdresse} from "./ProfilComponents.js";
-
+import Kontakt from "./ProfilComponents/Kontakt.js";
+import EditKontakt from "./ProfilComponents/EditKontakt.js";
+import Adresse from "./ProfilComponents/Adresse.js";
+import EditAdresse from "./ProfilComponents/EditAdresse.js";
 
 export default {
     components: {
@@ -91,7 +93,7 @@ export default {
       },
 
       profilUpdateEmit: function(event){
-        console.log(event);
+        
         //? passes the updated profil information to the parent component
         this.$emit('update:profilUpdate',event);
       },
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 3b0b81d41..3de33af47 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -1,7 +1,9 @@
 
 import { CoreFilterCmpt } from "../../../components/filter/Filter.js";
 import EditProfil from "./EditProfil.js";
-import {Adresse, Kontakt, FetchProfilUpdates} from "./ProfilComponents.js";
+import Adresse from "./ProfilComponents/Adresse.js";
+import Kontakt from "./ProfilComponents/Kontakt.js";
+import FetchProfilUpdates from "./ProfilComponents/FetchProfilUpdates.js";
 import Mailverteiler from "./ProfilComponents/Mailverteiler.js"; 
 import AusweisStatus from "./ProfilComponents/FhAusweisStatus.js";
 import QuickLinks from "./ProfilComponents/QuickLinks.js";
@@ -165,7 +167,7 @@ export default {
           }
           
         }).catch((e) => {
-          console.log(e);
+          // Wenn der User das Modal abbricht ohne Änderungen
          
         });
     
@@ -314,25 +316,23 @@ export default {
   template: ` 
 
   <div class="container-fluid text-break fhc-form"  >
-    <!-- ROW --> 
+    
           <div class="row">
-          <!-- HIDDEN QUICK LINKS -->
+          
               <div  class="d-md-none col-12 ">
              
               <div class="row mb-3">
               <div class="col">
-               
+              <!-- MOBILE QUICK LINKS -->     
                 <quick-links :mobile="true"></quick-links>
               </div>
             </div>
 
-            <!-- HERE STARTS THE ROW WITH REQUESTED CHANGES FROM THE USER -->
+            
             <div class="row mb-3">
             <div class="col">
-              
+              <!-- MOBILE PROFIL UPDATES -->  
               <fetch-profil-updates @fetchUpdates="fetchProfilUpdates" :data="data.profilUpdates"></fetch-profil-updates>
-                    
-              
             </div>
           </div>
 
@@ -342,10 +342,6 @@ export default {
               
               <!-- END OF HIDDEN ROW (HIDDEN IN VIEWPORTS GREATER THEN-EQUAL MD) -->
 
-
-            
-
-
               <!-- MAIN PANNEL -->
               <div class="col-sm-12 col-md-8 col-xxl-9 ">
                 <!-- ROW WITH PROFIL IMAGE AND INFORMATION -->
@@ -356,79 +352,49 @@ export default {
                     <!-- ROW WITH THE PROFIL INFORMATION --> 
                     <div class="row mb-4">
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<!-- FIRST KAESTCHEN -->
                       <div  class="col-lg-12 col-xl-6 ">
                      <div class="row mb-4">
                      <div class="col">
                      
-                        
                      <!-- PROFIL INFORMATION -->
                      <profil-information title="MitarbeiterIn" :data="profilInformation"></profil-information>
 
 
-		    </div>
+		                 </div>
                     </div>
                      <div class="row mb-4">
                      
 
                      <div  class=" col-lg-12">
         
-                   <!-- MITARBEITER INFO -->
+                    <!-- MITARBEITER INFO -->
                     <role-information title="Mitarbeiter Information" :data="roleInformation"></role-information>
 
 
-                     </div>  
-                            
-
-
-
-<!-- END OF THE FIRST KAESTCHEN -->
+                     </div> 
                       </div>
 
 
                       <!-- START OF SECOND PROFIL  INFORMATION COLUMN -->
                      
-
-
-                     
-
-
-              
-                    <!-- END OF PROFIL INFORMATION ROW -->
-                    <!-- INFORMATION CONTENT END -->
+                    
                     </div>
 
                     <div  class="col-xl-6 col-lg-12 ">
                     <div class="row mb-4">
                     <div class="col">
-
-                    
                     <!-- EMAILS -->
                     <profil-emails :data="personEmails" ></profil-emails>
+                    </div>
+                    </div>
 
-                   
-                    </div></div>
-
-                    <!-- HIER SIND DIE PRIVATEN KONTAKTE-->
+                    
                     <div class="row mb-4 ">
                       <div class="col">
-                        <div class="card">
+                        
+                      <!-- PRIVATE KONTAKTE-->
+                      
+                      <div class="card">
                           <div class="card-header">
                             Private Kontakte
                           </div>
@@ -445,12 +411,14 @@ export default {
                         </div>
                       </div>
                     </div>
-                    <!-- -->
-
-                    <!-- HIER SIND DIE PRIVATEN ADRESSEN-->
+                   
+                    
                     <div class="row mb-4">
                       <div class="col">
-                        <div class="card">
+                    
+                      <!-- PRIVATE ADRESSEN-->
+
+                      <div class="card">
                           <div class="card-header">Private Adressen</div>
                             <div class="card-body">
                             
@@ -464,61 +432,51 @@ export default {
                         </div>
                       </div>
                     </div>
+
+
                     
-                    <!--   -->
-
-
-
-                    <!-- END OF THE SECOND INFORMATION COLUMN -->
                     </div>
-
-
-                    <!-- START OF THE SECOND PROFIL INFORMATION ROW --> 
-                  
-                    
-                  <!-- ROW WITH PROFIL IMAGE AND INFORMATION END -->
                 </div  >
 
-
-
-                
-
-
-
-
-                <!-- SECOND ROW UNDER THE PROFIL IMAGE AND INFORMATION WITH THE TABLES -->
                 <div class="row">
 
-                <!-- FIRST TABLE -->
+                
                   <div class="col-12 mb-4" >
+
+                  <!-- FUNKTIONEN TABELLE -->
                  
                     <core-filter-cmpt title="Funktionen"  ref="funktionenTable" :tabulator-options="funktionen_table_options"  tableOnly :sideMenu="false" />
                   
                     </div>
 
-                <!-- SECOND TABLE -->
                   <div class="col-12 mb-4" >
+
+                  <!-- BETRIEBSMITTEL TABELLE -->
                     <core-filter-cmpt title="Entlehnte Betriebsmittel"  ref="betriebsmittelTable" :tabulator-options="betriebsmittel_table_options" tableOnly :sideMenu="false" />
                   </div>
 
-                <!-- END OF THE ROW WITH THE TABLES UNDER THE PROFIL INFORMATION -->
                 </div>
 
-
-
-
-
-
-
-              <!-- END OF MAIN CONTENT COL -->
               </div>
 
-
-
-
               <!-- START OF SIDE PANEL -->
               <div  class="col-md-4 col-xxl-3 col-sm-12 text-break" >
               
+              <!-- Bearbeiten Button -->
+  
+              <div class="row d-none d-md-block mb-3">
+              <div class="col mb-3">
+              <button @click="showModal" type="button" class="text-start  w-100 btn btn-outline-secondary" >
+                <div class="row">
+                  <div class="col-2">
+                    <i class="fa fa-edit"></i>
+                  </div>
+                  <div class="col-10">Bearbeiten</div>
+                </div>
+              </button>
+              </div>
+              </div>
+
               <div v-if="data.profilUpdates" class="row d-none d-md-block mb-3">
               <div class="col mb-3">
 
diff --git a/public/js/components/Cis/Profil/ProfilComponents.js b/public/js/components/Cis/Profil/ProfilComponents.js
deleted file mode 100644
index fd9db1dd4..000000000
--- a/public/js/components/Cis/Profil/ProfilComponents.js
+++ /dev/null
@@ -1,422 +0,0 @@
-
-
-
-const Adresse = {
-    props:{data:Object, view:String},
-    data(){
-        return{}
-    },
-    created(){
-        
-    },
-    template:`
-    <div class="gy-2 row justify-content-center align-items-center">
-    
-    <!-- column 1 in the address row -->
-    
-        <div class="col-1 text-center">
-         
-          <i class="fa fa-location-dot fa-lg" style="color:#00649C "></i>
-        
-        </div>
-        <div  class="col-11 col-sm-8 col-xl-11 col-xxl-8 order-1">
-
-        <div class="form-underline ">
-        <div class="form-underline-titel">Strasse</div>
-        <span class="form-underline-content">{{data.strasse}} </span>
-        </div>
-
-
-        </div>
-        
-    <!-- column 2 in the address row -->
-        <div  class="offset-1 offset-sm-0 offset-xl-1 offset-xxl-0 order-2 order-sm-4 order-xl-2 order-xxl-4 col-11 col-sm-5  col-xl-11 col-xxl-5  ">
-            
-
-            <div class="form-underline ">
-            <div class="form-underline-titel">Typ</div>
-            <span class="form-underline-content">{{data.adr_typ}} </span>
-            </div>
-
-        </div>
-        <div  class="offset-1 order-3 order-sm-3 col-11 col-sm-6  col-xl-7 col-xxl-6 ">
-            
-            <div class="form-underline ">
-            <div class="form-underline-titel">Ort</div>
-            <span class="form-underline-content">{{data.ort}} </span>
-            </div>
-        </div>
-        <div  class="offset-1 offset-sm-0 order-4 order-sm-2 order-xl-4 order-xxl-2 col-11 col-sm-3 col-xl-4 col-xxl-3 ">
-            <div class="form-underline ">
-            <div class="form-underline-titel">PLZ</div>
-            <span class="form-underline-content">{{data.plz}} </span>
-            </div>
-        </div>
-    </div>
-    `
-
-};
-
-const EditAdresse = {
-    props:{data:Object},
-    data(){
-        return{
-            originalValue:null,
-        }
-    },
-    methods:{
-        updateValue: function(event,bind){
-            //? sets the value of a property to null when an empty string is entered to keep the isChanged function valid 
-            this.data[bind] = event.target.value === "" ? null : event.target.value;
-            this.$emit('profilUpdate',this.isChanged?this.data:null);
-        },
-    },
-    computed:{
-        isChanged: function(){
-            return this.originalValue !== JSON.stringify(this.data);
-        },
-    },
-    created(){
-        this.originalValue = JSON.stringify(this.data);
-        
-    },
-    template:`
-    <div class="gy-3 row justify-content-center align-items-center">
-    
-    <!-- column 1 in the address row -->
-    
-      
-        <div  class="col-12 col-sm-9 col-xl-12 col-xxl-9 order-1">
-
-        <div class="form-underline ">
-        <div class="form-underline-titel">Strasse</div>
-        <input  class="form-control" :value="data.strasse" @input="updateValue($event,'strasse')" :placeholder="data.strasse">
-        
-        </div>
-
-
-        </div>
-        
-    <!-- column 2 in the address row -->
-        <div  class=" order-2 order-sm-4 order-xl-3 order-xxl-4 col-12 col-sm-5  col-xl-8 col-xxl-5  ">
-            
-
-            <div class="form-underline ">
-            <div class="form-underline-titel">Typ</div>
-            <input  class="form-control" :value="data.adr_typ" @input="updateValue($event,'adr_typ')" :placeholder="data.adr_typ">
-        
-            </div>
-
-        </div>
-        <div  class="order-3 order-sm-3 order-xl-2 order-xxl-3 col-12 col-sm-7  col-xl-12 col-xxl-7 ">
-            
-            <div class="form-underline ">
-            <div class="form-underline-titel">Ort</div>
-            <input  class="form-control" :value="data.ort" @input="updateValue($event,'ort')" :placeholder="data.ort">
-        
-            </div>
-        </div>
-        <div  class="order-4 order-sm-2 order-xl-4 order-xxl-2 col-12 col-sm-3 col-xl-4 col-xxl-3 ">
-            <div class="form-underline ">
-            <div class="form-underline-titel">PLZ</div>
-    
-            <input  class="form-control" :value="data.plz" @input="updateValue($event,'plz')" :placeholder="data.plz">
-        
-            </div>
-        </div>
-    </div>
-    `
-
-};
-
-const Kontakt = {
-    props:{
-        view:String,
-        data:Object,
-    },
-    data(){
-        return {
-
-        }
-    },
-    created(){
-
-    }, 
-    template:`
-    <div class=" row align-items-center justify-content-center">
-    <div class="col-1 text-center" >
-    
-    <i class="fa-solid " :class="{...(data.kontakt.includes('@')?{'fa-envelope':true}:{'fa-phone':true})}" style="color:rgb(0, 100, 156)"></i>
-    </div>
-    <div  :class="{...(data.anmerkung? {'col-11':true, 'col-md-6':true, 'col-xl-11':true, 'col-xxl-6':true} : {'col-10':true, 'col-xl-9':true, 'col-xxl-10':true})}">
-        
-        <!-- rendering KONTAKT emails -->
-   
-        
-        <div  class="form-underline ">
-        <div class="form-underline-titel">{{data.kontakttyp}}</div>
-        <a v-if="data.kontakt.includes('@')" role="link" :aria-disabled="view?true:false" :href="!view?('mailto:'+data.kontakt):null" class="form-underline-content">{{data.kontakt}} </a>
-        <a v-else role="link" :aria-disabled="view?true:false" :href="!view?('tel:'+data.kontakt):null" class="form-underline-content">{{data.kontakt}} </a>
-        </div>
-          
-       
-
-    </div>
-    <div v-if="data?.anmerkung" class="offset-1 offset-md-0 offset-xl-1 offset-xxl-0 order-2 order-sm-1 col-10  col-md-4   col-xl-9 col-xxl-4   ">
-        
-    <div  class="form-underline ">
-    <div class="form-underline-titel">Anmerkung</div>
-    <span  class="form-underline-content">{{data.anmerkung}} </span>
-    </div>
-
-  
-    </div>
-    <div class="text-center col-1 col-sm-1 order-2  order-lg-1 col-xl-2 col-xxl-1 allign-middle">
-        <i v-if="data.zustellung" class="fa-solid fa-check"></i>
-        <i v-else="data.zustellung" class="fa-solid fa-xmark"></i>
-    </div>
-    
-    
-</div>
-  </div>
-    
-    
-    
-    
-    `,
-};
-
-const EditKontakt =  {
-    props:{
-        data:Object,
-    },
-    data(){
-        return{
-            originalValue:null,
-        }
-    },
-    methods:{
-        updateValue: function(event,bind){
-            if(bind === 'zustellung'){
-                this.data[bind] = event.target.checked;    
-            }else{
-                //? sets the value of a property to null when an empty string is entered to keep the isChanged function valid
-                this.data[bind] = event.target.value === ""  ? null: event.target.value;
-            }
-            
-            
-            this.$emit('profilUpdate',this.isChanged?this.data:null);
-            
-        },
-    },
-    computed:{
-        isChanged: function(){
-            //? returns true if the original passed data object was changed 
-            return JSON.stringify(this.data) !== this.originalValue;
-        }
-    },
-    created(){
-
-        this.originalValue = JSON.stringify(this.data);
-       
-        
-    },
-    template:
-    `
-    
-    <div class="gy-3 row align-items-center justify-content-center">
-    
-    <div v-if="!data.kontakt_id" class="col-12">
-        
-    
-        <div  class="form-underline">
-            <div class="form-underline-titel">Kontakttyp</div>
-    
-            <select :value="data.kontakttyp" @change="updateValue($event,'kontakttyp')" class="form-select" aria-label="Select Kontakttyp">
-                <option selected></option>
-                <option value="email">Email</option>
-                <option value="telefon">Telefon</option>
-                <option value="notfallkontakt">Notfallkontakt</option>
-            </select>    
-        </div>
-        
-    </div>
-    <div class="col-12">
-        
-        <!-- rendering KONTAKT emails -->
-   
-
-        <div  class="form-underline">
-        <div class="form-underline-titel">{{data.kontakttyp?data.kontakttyp:'Kontakt'}}</div>
-    
-        <input :disabled="data.kontakttyp?false:true"  class="form-control"   :value="data.kontakt" @input="updateValue($event,'kontakt')" :placeholder="data.kontakt">
-        </div>
-
-    
-          
-       
-
-    </div>
-    <div class="col-12">
-        
-    <div  class="form-underline">
-    <div class="form-underline-titel">Anmerkung</div>
-
-    <input  class="form-control" :value="data.anmerkung" @input="updateValue($event,'anmerkung')" :placeholder="data.anmerkung">
-    </div>
-
-  
-
-  
-    </div>
-    
-  
-  
-  
-    <div  class="d-flex flex-row justify-content-start col-12  allign-middle">
-        
-   
-    
-        <span style="opacity: 0.65; font-size: .85rem; " class="px-2">Zustellungs Kontakt</span>
-
-        <input class="form-check-input " type="checkbox" :checked="data.zustellung" @change="updateValue($event,'zustellung')" id="flexCheckDefault">
-    
-    
- 
-
-   
-    </div>
-  </div>
-    `
-};
-
-
-//? used to edit already requested profil changes
-import EditProfil from "./EditProfil.js";
-const FetchProfilUpdates = {
-    props:{
-        data:{
-            type:Object,
-        },
-    },
-
-    emits:["fetchUpdates"],
-    
-    data(){
-        return {
-            
-        }
-    },
-    methods:{
-        deleteRequest: function(item){
-            
-            Vue.$fhcapi.UserData.deleteProfilRequest(item.profil_update_id).then((res)=>{
-                if(res.data.error){
-                    //? open alert
-                    console.log(res.data);                    
-                }else{
-                    this.$emit('fetchUpdates');
-                }
-            });
-        },
-        getView: function(topic){
-            switch(topic){
-                case "Private Kontakte" : return "EditKontakt"; break;
-                case "Private Adressen" : return "EditAdresse"; break;
-                case "Add Adressen" : return "EditAdresse"; break;
-                case "Add Kontakte" : return "EditKontakt"; break;
-                case "Delete Adressen" : return "EditAdresse"; break;
-                case "Delete Kontakte" : return "EditKontakt"; break;
-                default: return "text_input"; break;
-            }
-        },
-        openModal(updateRequest) {
-
-            let view = this.getView(updateRequest.topic);
-            let content =null;
-            if(view === 'text_input'){
-                content={
-                    view:view,
-                    data:{
-                        titel:updateRequest.topic,
-                        value:updateRequest.requested_change,
-                    },
-                    update:true,
-                    topic:updateRequest.topic,
-                    
-                }
-            }else{
-                content = {
-                    view: view,
-                    data: updateRequest.requested_change,
-                    update:true,
-                    topic:updateRequest.topic,
-                    
-                    
-                }
-            }
-
-
-            //? only show the popup if also the right content is available
-            if(content){
-            EditProfil.popup({ 
-                
-                value:content,
-                timestamp:null,
-              }).then((res) => {
-                if(res === true){
-                    this.$emit('fetchUpdates');
-                }
-                
-              }).catch(e => {
-                console.log(e);
-               
-              });
-            
-            }
-           
-          
-          }, 
-    },
-    created(){
-        
-    },
-    computed:{
-        
-    },
-    template:`
-   
-    <div  class="card">
-                      <div class="card-header">
-                      Profil Updates
-                      </div>
-                      <div class="card-body" >
-    <div class="table-responsive">
-        <table class="m-0  table  table-hover">
-            <thead>
-                <tr >
-                <th scope="col">Topic</th>
-                <th scope="col">Date of Request</th>
-                <th  scope="col">Bearbeiten</th>
-                <th style="white-space:normal" scope="col">Löschen</th>
-                </tr>
-            </thead>
-            <tbody>
-                <tr v-for="item in data">
-                <td class="align-middle">{{item.topic}}</td>
-                <td class="align-middle">{{item.change_timestamp}}</td>
-                <td v-if="item.topic.toLowerCase().includes('delete')" class="align-middle text-center" >{{item.requested_change.adr_typ?item.requested_change.adr_typ:item.requested_change.kontakt}}</td>
-                <td v-else class="align-middle text-center" ><i style="color:#00639c" @click="openModal(item)" role="button" class="fa fa-edit"></i></td>
-                <td class="align-middle text-center"><i style="color:red" role="button" @click="deleteRequest(item)" class="fa fa-trash"></i></td>
-                </tr>
-            </tbody>
-        </table>
-    </div>
-    </div>
-    </div>
-
-    
-    `
-};
-
-export {Adresse, EditAdresse, Kontakt, EditKontakt, FetchProfilUpdates};
\ No newline at end of file
diff --git a/public/js/components/Cis/Profil/ProfilComponents/Adresse.js b/public/js/components/Cis/Profil/ProfilComponents/Adresse.js
new file mode 100644
index 000000000..d7ca5b199
--- /dev/null
+++ b/public/js/components/Cis/Profil/ProfilComponents/Adresse.js
@@ -0,0 +1,55 @@
+export default {
+    props:{data:Object, view:String},
+    data(){
+        return{}
+    },
+    created(){
+        
+    },
+    template:`
+    <div class="gy-2 row justify-content-center align-items-center">
+    
+    <!-- column 1 in the address row -->
+    
+        <div class="col-1 text-center">
+         
+          <i class="fa fa-location-dot fa-lg" style="color:#00649C "></i>
+        
+        </div>
+        <div  class="col-11 col-sm-8 col-xl-11 col-xxl-8 order-1">
+
+        <div class="form-underline ">
+        <div class="form-underline-titel">Strasse</div>
+        <span class="form-underline-content">{{data.strasse}} </span>
+        </div>
+
+
+        </div>
+        
+    <!-- column 2 in the address row -->
+        <div  class="offset-1 offset-sm-0 offset-xl-1 offset-xxl-0 order-2 order-sm-4 order-xl-2 order-xxl-4 col-11 col-sm-5  col-xl-11 col-xxl-5  ">
+            
+
+            <div class="form-underline ">
+            <div class="form-underline-titel">Typ</div>
+            <span class="form-underline-content">{{data.adr_typ}} </span>
+            </div>
+
+        </div>
+        <div  class="offset-1 order-3 order-sm-3 col-11 col-sm-6  col-xl-7 col-xxl-6 ">
+            
+            <div class="form-underline ">
+            <div class="form-underline-titel">Ort</div>
+            <span class="form-underline-content">{{data.ort}} </span>
+            </div>
+        </div>
+        <div  class="offset-1 offset-sm-0 order-4 order-sm-2 order-xl-4 order-xxl-2 col-11 col-sm-3 col-xl-4 col-xxl-3 ">
+            <div class="form-underline ">
+            <div class="form-underline-titel">PLZ</div>
+            <span class="form-underline-content">{{data.plz}} </span>
+            </div>
+        </div>
+    </div>
+    `
+
+};
\ No newline at end of file
diff --git a/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js b/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
new file mode 100644
index 000000000..6b0cecc41
--- /dev/null
+++ b/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
@@ -0,0 +1,97 @@
+export default {
+    props:{data:Object},
+    data(){
+        return{
+            originalValue:null,
+        }
+    },
+    methods:{
+        updateValue: function(event,bind){
+            //? sets the value of a property to null when an empty string is entered to keep the isChanged function valid 
+            this.data[bind] = event.target.value === "" ? null : event.target.value;
+            this.$emit('profilUpdate',this.isChanged?this.data:null);
+        },
+    },
+    computed:{
+        isChanged: function(){
+            if(!this.data.strasse || !this.data.plz || !this.data.ort || !this.data.adr_typ){
+               
+                return false;
+            }
+            return this.originalValue !== JSON.stringify(this.data);
+        },
+    },
+    created(){
+        this.originalValue = JSON.stringify(this.data);
+        
+    },
+    template:`
+    <pre>{{isChanged}}</pre>
+    <div class="gy-3 row justify-content-center align-items-center">
+    
+    <!-- column 1 in the address row -->
+    
+      
+        <div  class="col-12 col-sm-9 col-xl-12 col-xxl-9 order-1">
+
+        <div class="form-underline ">
+        <div class="form-underline-titel">Strasse</div>
+        <input  class="form-control" :value="data.strasse" @input="updateValue($event,'strasse')" :placeholder="data.strasse">
+        
+        </div>
+
+
+        </div>
+        
+    <!-- column 2 in the address row -->
+        <div  class=" order-2 order-sm-4 order-xl-3 order-xxl-4 col-12 col-sm-5  col-xl-8 col-xxl-5  ">
+            
+            <template v-if="data.adresse_id">
+            <div class="form-underline ">
+            <div class="form-underline-titel">Typ</div>
+            <input  class="form-control" :value="data.adr_typ" @input="updateValue($event,'adr_typ')" :placeholder="data.adr_typ">
+        
+            </div>
+            </template>
+            <template v-else>
+            
+        
+    
+            <div  class="form-underline">
+                <div class="form-underline-titel">Kontakttyp</div>
+        
+                <select :value="data.adr_typ" @change="updateValue($event,'adr_typ')" class="form-select" aria-label="Select Kontakttyp">
+                    <option selected></option>
+                    <option value="Rechnungsadresse">Rechnungsadresse</option>
+                    <option value="Nebenwohnsitz">Nebenwohnsitz</option>
+                    <option value="Homeoffice">Homeoffice</option>
+                    <option value="Hauptwohnsitz">Hauptwohnsitz</option>
+                    <option value="Firma">Firma</option>
+                </select>    
+            </div>
+        
+
+            
+            </template>
+
+        </div>
+        <div  class="order-3 order-sm-3 order-xl-2 order-xxl-3 col-12 col-sm-7  col-xl-12 col-xxl-7 ">
+            
+            <div class="form-underline ">
+            <div class="form-underline-titel">Ort</div>
+            <input  class="form-control" :value="data.ort" @input="updateValue($event,'ort')" :placeholder="data.ort">
+        
+            </div>
+        </div>
+        <div  class="order-4 order-sm-2 order-xl-4 order-xxl-2 col-12 col-sm-3 col-xl-4 col-xxl-3 ">
+            <div class="form-underline ">
+            <div class="form-underline-titel">PLZ</div>
+    
+            <input  class="form-control" :value="data.plz" @input="updateValue($event,'plz')" :placeholder="data.plz">
+        
+            </div>
+        </div>
+    </div>
+    `
+
+};
\ No newline at end of file
diff --git a/public/js/components/Cis/Profil/ProfilComponents/EditKontakt.js b/public/js/components/Cis/Profil/ProfilComponents/EditKontakt.js
new file mode 100644
index 000000000..a00a56bfd
--- /dev/null
+++ b/public/js/components/Cis/Profil/ProfilComponents/EditKontakt.js
@@ -0,0 +1,106 @@
+
+export default {
+    props:{
+        data:Object,
+    },
+    data(){
+        return{
+            originalValue:null,
+        }
+    },
+    methods:{
+        updateValue: function(event,bind){
+            if(bind === 'zustellung'){
+                this.data[bind] = event.target.checked;    
+            }else{
+                //? sets the value of a property to null when an empty string is entered to keep the isChanged function valid
+                this.data[bind] = event.target.value === ""  ? null: event.target.value;
+            }
+            
+            
+            this.$emit('profilUpdate',this.isChanged?this.data:null);
+            
+            
+        },
+    },
+    computed:{
+        isChanged: function(){
+            //? returns true if the original passed data object was changed 
+            if(!this.data.kontakt || !this.data.kontakttyp) {return false;}
+            return JSON.stringify(this.data) !== this.originalValue;
+        }
+    },
+    created(){
+
+        this.originalValue = JSON.stringify(this.data);
+       
+        
+    },
+    template:
+    `
+    
+    <div class="gy-3 row align-items-center justify-content-center">
+    
+    <div v-if="!data.kontakt_id" class="col-12">
+        
+    
+        <div  class="form-underline">
+            <div class="form-underline-titel">Kontakttyp</div>
+    
+            <select :value="data.kontakttyp" @change="updateValue($event,'kontakttyp')" class="form-select" aria-label="Select Kontakttyp">
+                <option selected></option>
+                <option value="email">Email</option>
+                <option value="telefon">Telefon</option>
+                <option value="notfallkontakt">Notfallkontakt</option>
+            </select>    
+        </div>
+        
+    </div>
+    <div class="col-12">
+        
+        <!-- rendering KONTAKT emails -->
+   
+
+        <div  class="form-underline">
+        <div class="form-underline-titel">{{data.kontakttyp?data.kontakttyp:'Kontakt'}}</div>
+    
+        <input :disabled="data.kontakttyp?false:true"  class="form-control"   :value="data.kontakt" @input="updateValue($event,'kontakt')" :placeholder="data.kontakt">
+        </div>
+
+    
+          
+       
+
+    </div>
+    <div class="col-12">
+        
+    <div  class="form-underline">
+    <div class="form-underline-titel">Anmerkung</div>
+
+    <input  class="form-control" :value="data.anmerkung" @input="updateValue($event,'anmerkung')" :placeholder="data.anmerkung">
+    </div>
+
+  
+
+  
+    </div>
+    
+  
+  
+  
+    <div  class="d-flex flex-row justify-content-start col-12  allign-middle">
+        
+   
+    
+        <span style="opacity: 0.65; font-size: .85rem; " class="px-2">Zustellungs Kontakt</span>
+
+        <input class="form-check-input " type="checkbox" :checked="data.zustellung" @change="updateValue($event,'zustellung')" id="flexCheckDefault">
+    
+    
+ 
+
+   
+    </div>
+  </div>
+    `
+};
\ No newline at end of file
diff --git a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
new file mode 100644
index 000000000..ff42454fc
--- /dev/null
+++ b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
@@ -0,0 +1,128 @@
+
+import EditProfil from "../EditProfil.js";
+//? EditProfil is the modal used to edit the profil updates
+export default {
+    props:{
+        data:{
+            type:Object,
+        },
+    },
+
+    emits:["fetchUpdates"],
+    
+    data(){
+        return {
+            
+        }
+    },
+    methods:{
+        deleteRequest: function(item){
+            
+            Vue.$fhcapi.UserData.deleteProfilRequest(item.profil_update_id).then((res)=>{
+                if(res.data.error){
+                    //? open alert
+                    console.log(res.data);                    
+                }else{
+                    this.$emit('fetchUpdates');
+                }
+            });
+        },
+        getView: function(topic){
+            switch(topic){
+                case "Private Kontakte" : return "EditKontakt"; break;
+                case "Private Adressen" : return "EditAdresse"; break;
+                case "Add Adressen" : return "EditAdresse"; break;
+                case "Add Kontakte" : return "EditKontakt"; break;
+                case "Delete Adressen" : return "EditAdresse"; break;
+                case "Delete Kontakte" : return "EditKontakt"; break;
+                default: return "text_input"; break;
+            }
+        },
+        openModal(updateRequest) {
+
+            let view = this.getView(updateRequest.topic);
+            let content =null;
+            if(view === 'text_input'){
+                content={
+                    view:view,
+                    data:{
+                        titel:updateRequest.topic,
+                        value:updateRequest.requested_change,
+                    },
+                    update:true,
+                    topic:updateRequest.topic,
+                    
+                }
+            }else{
+                content = {
+                    view: view,
+                    data: updateRequest.requested_change,
+                    update:true,
+                    topic:updateRequest.topic,
+                    
+                    
+                }
+            }
+
+
+            //? only show the popup if also the right content is available
+            if(content){
+            EditProfil.popup({ 
+                
+                value:content,
+                timestamp:null,
+              }).then((res) => {
+                if(res === true){
+                    this.$emit('fetchUpdates');
+                }
+                
+              }).catch(e => {
+                // Wenn der User das Modal abbricht ohne Änderungen
+               
+              });
+            
+            }
+           
+          
+          }, 
+    },
+    created(){
+        
+    },
+    computed:{
+        
+    },
+    template:`
+   
+    <div  class="card">
+                      <div class="card-header">
+                      Profil Updates
+                      </div>
+                      <div class="card-body" >
+    <div class="table-responsive">
+        <table class="m-0  table  table-hover">
+            <thead>
+                <tr >
+                <th scope="col">Topic</th>
+                <th scope="col">Date of Request</th>
+                <th  scope="col">Bearbeiten</th>
+                <th style="white-space:normal" scope="col">Löschen</th>
+                </tr>
+            </thead>
+            <tbody>
+                <tr v-for="item in data">
+                <td class="align-middle">{{item.topic}}</td>
+                <td class="align-middle">{{item.change_timestamp}}</td>
+                <td v-if="item.topic.toLowerCase().includes('delete')" class="align-middle text-center" >{{item.requested_change.adr_typ?item.requested_change.adr_typ:item.requested_change.kontakt}}</td>
+                <td v-else class="align-middle text-center" ><i style="color:#00639c" @click="openModal(item)" role="button" class="fa fa-edit"></i></td>
+                <td class="align-middle text-center"><i style="color:red" role="button" @click="deleteRequest(item)" class="fa fa-trash"></i></td>
+                </tr>
+            </tbody>
+        </table>
+    </div>
+    </div>
+    </div>
+
+    
+    `
+};
\ No newline at end of file
diff --git a/public/js/components/Cis/Profil/ProfilComponents/Kontakt.js b/public/js/components/Cis/Profil/ProfilComponents/Kontakt.js
new file mode 100644
index 000000000..51dbbeba2
--- /dev/null
+++ b/public/js/components/Cis/Profil/ProfilComponents/Kontakt.js
@@ -0,0 +1,56 @@
+export default{
+    props:{
+        view:String,
+        data:Object,
+    },
+    data(){
+        return {
+
+        }
+    },
+    created(){
+
+    }, 
+    template:`
+    <div class=" row align-items-center justify-content-center">
+    <div class="col-1 text-center" >
+    
+    <i class="fa-solid " :class="{...(data.kontakt.includes('@')?{'fa-envelope':true}:{'fa-phone':true})}" style="color:rgb(0, 100, 156)"></i>
+    </div>
+    <div  :class="{...(data.anmerkung? {'col-11':true, 'col-md-6':true, 'col-xl-11':true, 'col-xxl-6':true} : {'col-10':true, 'col-xl-9':true, 'col-xxl-10':true})}">
+        
+        <!-- rendering KONTAKT emails -->
+   
+        
+        <div  class="form-underline ">
+        <div class="form-underline-titel">{{data.kontakttyp}}</div>
+        <a v-if="data.kontakt.includes('@')" role="link" :aria-disabled="view?true:false" :href="!view?('mailto:'+data.kontakt):null" class="form-underline-content">{{data.kontakt}} </a>
+        <a v-else role="link" :aria-disabled="view?true:false" :href="!view?('tel:'+data.kontakt):null" class="form-underline-content">{{data.kontakt}} </a>
+        </div>
+          
+       
+
+    </div>
+    <div v-if="data?.anmerkung" class="offset-1 offset-md-0 offset-xl-1 offset-xxl-0 order-2 order-sm-1 col-10  col-md-4   col-xl-9 col-xxl-4   ">
+        
+    <div  class="form-underline ">
+    <div class="form-underline-titel">Anmerkung</div>
+    <span  class="form-underline-content">{{data.anmerkung}} </span>
+    </div>
+
+  
+    </div>
+    <div class="text-center col-1 col-sm-1 order-2  order-lg-1 col-xl-2 col-xxl-1 allign-middle">
+        <i v-if="data.zustellung" class="fa-solid fa-check"></i>
+        <i v-else="data.zustellung" class="fa-solid fa-xmark"></i>
+    </div>
+    
+    
+</div>
+  </div>
+    
+    
+    
+    
+    `,
+};
\ No newline at end of file
diff --git a/public/js/components/Cis/Profil/ProfilComponents/RoleInformation.js b/public/js/components/Cis/Profil/ProfilComponents/RoleInformation.js
index 6303719de..32c6d286c 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/RoleInformation.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/RoleInformation.js
@@ -27,10 +27,6 @@ export default {
     <div class="card-body">
         <div class="gy-3 row">
         <div v-for="(wert,bez) in data" class="col-md-6 col-sm-12 ">
-            
-       
-        
-        
           
            <div class="form-underline">
            <div class="form-underline-titel">{{bez }}</div>
@@ -42,28 +38,9 @@ export default {
            <span v-else class="form-underline-content">{{wert?wert:'-'}}</span>
            </div>
            
-
-    
         </div>
 
-
-        <!-- Bearbeiten Button -->
-        <div class="col-md-6 col-sm-12 ">
-         <button @click="showModal" type="button" class="text-start  w-100 btn btn-outline-primary" >
-           <div class="row">
-             <div class="col-2">
-               <i class="fa fa-edit"></i>
-             </div>
-             <div class="col-10">Bearbeiten</div>
-           </div>
-         </button>
-
-
-      
-         
        
-
-        </div>
         </div>
     
 </div>
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index ef92a4247..f61440630 100644
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -1,9 +1,26 @@
 import fhcapifactory from "../../../apps/api/fhcapifactory.js";
 import { CoreFilterCmpt } from "../../../components/filter/Filter.js";
+import Mailverteiler from "./ProfilComponents/Mailverteiler.js";
+import AusweisStatus from "./ProfilComponents/FhAusweisStatus.js";
+import QuickLinks from "./ProfilComponents/QuickLinks.js";
+import Adresse from "./ProfilComponents/Adresse.js";
+import Kontakt from "./ProfilComponents/Kontakt.js";
+import ProfilEmails from "./ProfilComponents/ProfilEmails.js";
+import RoleInformation from "./ProfilComponents/RoleInformation.js";
+import ProfilInformation from "./ProfilComponents/ProfilInformation.js";
 
 export default {
   components: {
     CoreFilterCmpt,
+    Mailverteiler,
+    AusweisStatus,
+    QuickLinks,
+    Adresse,
+    Kontakt,
+    ProfilEmails,
+    RoleInformation,
+    ProfilInformation,
+
   },
   data() {
     return {
@@ -82,33 +99,30 @@ export default {
     },
 
    
-    //? this computed function returns all the informations for the first column in the profil
-    personData() {
+   profilInformation() {
       if (!this.data) {
         return {};
       }
 
       return {
+        Vorname: this.data.vorname,
+        Nachname: this.data.nachname,
         Username: this.data.username,
         Anrede: this.data.anrede,
-        Matrikelnummer: this.data.matrikelnummer,
-        Titel: this.data.titelpre,
+        Titel: this.data.titel,
         Postnomen: this.data.postnomen,
+        foto_sperre:this.data.foto_sperre,
+        foto:this.data.foto,
+
       };
     },
 
-    personKontakt() {
-      if (!this.data) {
-        return {};
-      }
-
-      return {
-        emails: this.data.emails,
-        
-      };
+    personEmails() {
+      return this.data?.emails ? this.data.emails : [];
     },
 
-    specialData() {
+   
+    roleInformation() {
       if (!this.data) {
         return {};
       }
@@ -128,22 +142,16 @@ export default {
       if (!this.data) {
         return {};
       }
-
       return this.data.kontakte;
-      
     },
 
     privateAdressen() {
       if (!this.data) {
         return {};
       }
-
       return this.data.adressen;
-      
     },
     
-
-  
   },
 
   mounted() {
@@ -172,26 +180,8 @@ export default {
              
               <div class="row py-2">
               <div class="col">
-                <p class="m-0">
-                <div class="card">
-                
-                <a class=" w-100 btn " data-bs-toggle="collapse" href="#collapseExample" role="button" aria-expanded="false" aria-controls="collapseExample">
-                <u> Quick links</u>
-               </a>
-             
-                
-               </div>
-                 
-                </p>
-                <div class="mt-1 collapse" id="collapseExample">
-                  
-                  <div class="list-group">
-                   
-                    <a href="#" class="list-group-item list-group-item-action">Zeitwünsche</a>
-                    <a href="#" class="list-group-item list-group-item-action">Lehrveranstaltungen</a>
-                    <a href="#" class="list-group-item list-group-item-action ">Zeitsperren</a>
-                  </div>
-                </div>
+               
+              <quick-links :mobile="true"></quick-links>
               </div>
             </div>
 
@@ -227,222 +217,55 @@ export default {
 
 
 
-
-<!-- FIRST KAESTCHEN -->
-                      <div  class="col-lg-12 col-xl-6 ">
-                     <div class="row mb-4 ">
-                     <div class="col">
-                     
-                        
-                      <div class="card h-100">
-                      <div class="card-header">
-                      StudentIn
-                      </div>
-                      <div class="card-body">
-                      
-                       
+                    <div  class="col-lg-12 col-xl-6 ">
+                    <div class="row mb-4">
+                    <div class="col">
+                    
+                    <!-- PROFIL INFORMATION -->
+                    <profil-information title="StudentIn" :data="profilInformation"></profil-information>
 
 
-                  
-                  <div  class="row gy-3 align-items-center">
-
-
-
-
-                  <!-- SQUEEZING THE IMAGE INSIDE THE FIRST INFORMATION COLUMN -->
- <!-- START OF THE FIRST ROW WITH THE PROFIL IMAGE -->
-          <div class="col-12 col-sm-6 mb-2">
-           <div class="row justify-content-center">
-                        <div class="col-auto " style="position:relative">
-                          <img class=" img-thumbnail " style=" max-height:150px; "  :src="get_image_base64_src"></img>
-                          <!-- LOCKING IMAGE FUNCTIONALITY -->
-                          
-                          
-                          <div role="button" @click.prevent="sperre_foto_function" class="image-lock" >
-                          <i :class="{'fa':true, ...(data.foto_sperre?{'fa-lock':true}:{'fa-lock-open':true})} " ></i>
-                          </div>
-
-
-                        </div>
-                      </div>
-                    <!-- END OF THE ROW WITH THE IMAGE -->
                     </div>
-<!-- END OF SQUEEZE -->
+                   </div>
+                    <div class="row mb-4">
+                    
+
+                    <div  class=" col-lg-12">
+       
+                   <!-- MITARBEITER INFO -->
+                   <role-information title="Student Information" :data="roleInformation"></role-information>
 
 
-
-<!-- COLUMNS WITH MULTIPLE ROWS NEXT TO PROFIL PICTURE -->
-                  <div class="col-12 col-sm-6">
-                  <div class="row gy-4">
-                  <div class="col-12">
-                 
-                        
-                  <div  class="form-underline ">
-                  <div class="form-underline-titel">Vorname</div>
-                  <span class="form-underline-content">{{data.vorname}} </span>
-                  
-                  </div>
-
-                  
-               
-                </div>
-                <div class="col-12">
-                
-                     
-
-                  <div  class="form-underline ">
-                  <div class="form-underline-titel">Nachname</div>
-                  <span class="form-underline-content">{{data.nachname}} </span>
-                  
-                  </div>
-                
-                </div>
-                </div>
-             
-                
-                  </div>
-                  
-
-                  <div v-for="(wert,bez) in personData" class="col-md-6 col-sm-12 ">
-          
-
-
-                  <div  class="form-underline ">
-                  <div class="form-underline-titel">{{bez}}</div>
-                  <span class="form-underline-content">{{wert?wert:'-'}} </span>
-                  
-                  </div>
-                  
-                  </div>
-
-                  
-                      </div>
-
-
-                      
-                      </div>
-                    </div>
-		    </div>
-                    </div>
-                     <div class="row mb-4 ">
-                     
-
-                     <div  class=" col-lg-12">
-        
-                     <div class="card">
-                 
-                         <div class="card-header">
-                         Studenten Information
-                         </div>
-                         <div class="card-body">
-                             <div class="row gy-3">
-                             <div v-for="(wert,bez) in specialData" class="col-md-6 col-sm-12 ">
-                             
-                          
-                             <div  class="form-underline ">
-                             <div class="form-underline-titel">{{bez}}</div>
-                             <span class="form-underline-content">{{wert?wert:'-'}} </span>
-                             
-                             </div>
-                           
-                               
-                               
-                             </div>
-                         </div>
-                         
+                    </div> 
                      </div>
-                     
-                 </div>
 
-                     </div>  
-                            
+
+                     <!-- START OF SECOND PROFIL  INFORMATION COLUMN -->
+                    
+                   
+                   </div>
 
 
 
-<!-- END OF THE FIRST KAESTCHEN -->
-                      </div>
 
 
-                      <!-- START OF SECOND PROFIL  INFORMATION COLUMN -->
-                     
-
-
-                     
-
-
-              
-                    <!-- END OF PROFIL INFORMATION ROW -->
-                    <!-- INFORMATION CONTENT END -->
-                    </div>
 
                     <div  class="col-xl-6 col-lg-12 ">
                     <div class="row mb-4">
                     <div class="col">
-
-
-                    <div class="card ">
-                    <div class="card-header">
-                    Mails
+                    <!-- EMAILS -->
+                    <profil-emails :data="personEmails" ></profil-emails>
+                    </div>
                     </div>
-                   
-                    <div class="card-body">
 
-
-
-                      <div v-for="(wert,bezeichnung) in personKontakt">
-
-                      
-            
-                      <!-- HIER SIND DIE EMAILS -->
                   
-                  
-                      <div  v-if="typeof wert === 'object' && bezeichnung == 'emails'" class="row gy-3 justify-content-center ">
-                      <div v-for="email in wert" class="col-12 ">
-                     
-                            <div class="row align-items-center">
-                            <!--
-                      <div class="col-1 text-center">
 
-                      <i class="fa-solid fa-envelope" style="color:rgb(0, 100, 156)"></i>
-
-                      </div>
-                      -->
-                      <div class="col">
-                      <div class=" form-floating mb-2">
-                            
-                            <div class="form-underline ">
-                            <div class="form-underline-titel">{{email.type}}</div>
-                            <a :href="'mailto'+email.email" class="form-underline-content">{{email.email}} </a>
-                            </div>
-
-                      </div>
-
-                   
-
-                      </div>
-                      </div>
-                      </div>
-                          </div>
-
-                    
-                    
-                     
-
-
-
-
-                    
-                      </div>
-
-
-                    </div>
-                    </div>
-                    </div></div>
-
-                    <!-- HIER SIND DIE PRIVATEN KONTAKTE-->
                     <div class="row mb-4 ">
                       <div class="col">
-                        <div class="card">
+                        
+                      <!-- PRIVATE KONTAKTE-->
+                      
+                      <div class="card">
                           <div class="card-header">
                             Private Kontakte
                           </div>
@@ -450,144 +273,54 @@ export default {
                             
                             <div  class="gy-3  row ">
                             <div v-for="element in privateKontakte" class="col-12">
-                            <div class="gy-3 row align-items-center justify-content-center">
-                              <div class="col-1 text-center" >
-                              
-                              <i class="fa-solid " :class="{...(element.kontakt.includes('@')?{'fa-envelope':true}:{'fa-phone':true})}" style="color:rgb(0, 100, 156)"></i>
-                              </div>
-                              <div  :class="{...(element.anmerkung? {'col-11':true, 'col-md-6':true, 'col-xl-11':true, 'col-xxl-6':true} : {'col-10':true, 'col-xl-9':true, 'col-xxl-10':true})}">
-                                  
-                                  <!-- rendering KONTAKT emails -->
-                             
-
-                                  <div  class="form-underline ">
-                                  <div class="form-underline-titel">{{element.kontakttyp}}</div>
-                                  <a  :href="'mailto:'+element.kontakt" v-if="element.kontakt.includes('@')" class="form-underline-content">{{element.kontakt}} </a>
-                                  <a  v-else :href="'tel:'+element.kontakt" class="form-underline-content">{{element.kontakt}} </a>
-                                  </div>
-                                    
-                                 
-
-                              </div>
-                              <div v-if="element?.anmerkung" class="offset-1 offset-md-0 offset-xl-1 offset-xxl-0 order-2 order-sm-1 col-10  col-md-4   col-xl-9 col-xxl-4   ">
-                                  
-                              <div  class="form-underline ">
-                              <div class="form-underline-titel">Anmerkung</div>
-                              <span  class="form-underline-content">{{element.anmerkung}} </span>
-                              </div>
-
                             
-                              </div>
-                              <div class="col-1 col-sm-1 order-2  order-lg-1 col-xl-2 col-xxl-1 allign-middle">
-                                  <i v-if="element.zustellung" class="fa-solid fa-check"></i>
-                                  <i v-else="element.zustellung" class="fa-solid fa-xmark"></i>
-                              </div>
-                            </div>
+                            <Kontakt :data="element"></Kontakt>
+                            
                             </div>
                             </div>
                           </div>
                         </div>
                       </div>
                     </div>
-                    <!-- -->
 
-
-                    <!-- HIER SIND DIE PRIVATEN ADRESSEN-->
                     <div class="row mb-4">
-                      <div class="col">
-                        <div class="card">
-                          <div class="card-header">Private Adressen</div>
+                    <div class="col">
+                  
+                    <!-- PRIVATE ADRESSEN-->
+
+                    <div class="card">
+                        <div class="card-header">Private Adressen</div>
                           <div class="card-body">
                           
                             <div class="gy-3 row ">
-                            <div v-for="element in privateAdressen" class="col-12">
-                            <div class="gy-3 row justify-content-center align-items-center">
-                            
-                            <!-- column 1 in the address row -->
-                            
-                                <div class="col-1 text-center">
-                                 
-                                  <i class="fa fa-location-dot fa-lg" style="color:#00649C "></i>
-                                
-                                </div>
-                                <div  class="col-11 col-sm-8 col-xl-11 col-xxl-8 order-1">
-
-                                <div class="form-underline ">
-                                <div class="form-underline-titel">Strasse</div>
-                                <span class="form-underline-content">{{element.strasse}} </span>
-                                </div>
-
-
-                                </div>
-                                
-                            <!-- column 2 in the address row -->
-                                <div  class="offset-1 offset-sm-0 offset-xl-1 offset-xxl-0 order-2 order-sm-4 order-xl-2 order-xxl-4 col-11 col-sm-5  col-xl-11 col-xxl-5  ">
-                                    
-
-                                    <div class="form-underline ">
-                                    <div class="form-underline-titel">Typ</div>
-                                    <span class="form-underline-content">{{element.adr_typ}} </span>
-                                    </div>
-
-                                </div>
-                                <div  class="offset-1 order-3 order-sm-3 col-11 col-sm-6  col-xl-7 col-xxl-6 ">
-                                    
-                                    <div class="form-underline ">
-                                    <div class="form-underline-titel">Ort</div>
-                                    <span class="form-underline-content">{{element.ort}} </span>
-                                    </div>
-                                </div>
-                                <div  class="offset-1 offset-sm-0 order-4 order-sm-2 order-xl-4 order-xxl-2 col-11 col-sm-3 col-xl-4 col-xxl-3 ">
-                                    <div class="form-underline ">
-                                    <div class="form-underline-titel">PLZ</div>
-                                    <span class="form-underline-content">{{element.plz}} </span>
-                                    </div>
-                                </div>
+                              <div v-for="element in privateAdressen" class="col-12">
+                              <Adresse :data="element"></Adresse>
+                               
                             </div>
                           </div>
-                          </div>
-                            </div>
                         </div>
                       </div>
                     </div>
-                    <!-- -->
+                  </div>
 
 
-
-                    <!-- END OF THE SECOND INFORMATION COLUMN -->
                     </div>
 
 
-                    <!-- START OF THE SECOND PROFIL INFORMATION ROW --> 
-                  
-                    
-                  <!-- ROW WITH PROFIL IMAGE AND INFORMATION END -->
                 </div  >
 
-
-
-                
-
-
-
-
                 <!-- SECOND ROW UNDER THE PROFIL IMAGE AND INFORMATION WITH THE TABLES -->
                 <div class="row">
 
-               
-
-                <!-- FIRST TABLE -->
                   <div class="col-12 mb-4" >
                     <core-filter-cmpt title="Entlehnte Betriebsmittel"  ref="betriebsmittelTable" :tabulator-options="betriebsmittel_table_options" tableOnly :sideMenu="false" />
                   </div> 
-                  
-                  <!-- SECOND TABLE -->
+
                   <div class="col-12 mb-4" >
                     <core-filter-cmpt title="Zutrittsgruppen" ref="zutrittsgruppenTable" :tabulator-options="zutrittsgruppen_table_options"  tableOnly :sideMenu="false" noColumnFilter />
             
                   </div>
 
-                <!-- END OF THE ROW WITH THE TABLES UNDER THE PROFIL INFORMATION -->
                 </div>
 
 
@@ -606,29 +339,13 @@ export default {
               <div  class="col-md-4 col-xxl-3 col-sm-12 text-break" >
 
 
-              <!-- SRART OF QUICK LINKS IN THE SIDE PANEL -->
-
-
-              <!-- START OF THE FIRDT ROW IN THE SIDE PANEL -->
-              <!-- THESE QUCK LINKS ARE ONLY VISIBLE UNTIL VIEWPORT MD -->
+             
+              
                 <div  class="row d-none d-md-block mb-3">
                   <div class="col">
                  
-                    <div class="card">
-                      <div class="card-header">
-                      Quick Links
-                      </div>
-                      <div class="card-body">
-                      
-                       
-                        <a style="text-decoration:none" class="my-1 d-block" href="#">Zeitwuensche</a>
-                        <a style="text-decoration:none" class="my-1 d-block" href="#">Lehrveranstaltungen</a>
-                        <a style="text-decoration:none" class="my-1 d-block" href="#">Zeitsperren</a>
-
-                      </div>
-                    </div>
-
-                   
+                  <!-- QUICK LINKS -->     
+                   <quick-links ></quick-links>
                       
                   
                   </div>
@@ -641,12 +358,7 @@ export default {
              
              
                 
-                  <div class="card">
-                    <div class="card-body">
-                      <span>Der FH Ausweis ist am <b>{{data.zutrittsdatum}}</b> ausgegeben worden.</span>
-                    </div>
-                
-                </div>
+                <ausweis-status :data="data.zutrittsdatum"></ausweis-status>
       
          
                 </div>
@@ -662,32 +374,7 @@ export default {
 
                   
                   <!-- HIER SIND DIE MAILVERTEILER -->
-                    <div class="card">
-                      <div class="card-header">
-                      Mailverteilers
-                      </div>
-                      <div class="card-body">
-                      
-                        <h6 class="card-title">Sie sind Mitgglied in folgenden Verteilern:</h6>
-                        <div  class="card-text row text-break mb-2" v-for="verteiler in data?.mailverteiler">
-                          <div class="col-12 ">
-                            <div class="row">  
-                              <div class="col-1 ">
-                              
-                              <i class="fa-solid fa-envelope" style="color: #00649C;"></i>
-                              
-                              </div>
-                              <div class="col">
-                                <a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a>
-                              </div>
-                            </div>
-                           
-                          </div> 
-                          <div class="col-11 offset-1 ">{{verteiler.beschreibung}}</div>
-                        </div>
-
-                      </div>
-                    </div>
+                   <mailverteiler :data="data?.mailverteiler"></mailverteiler>
 
 
 
diff --git a/public/js/components/Cis/Profil/oldAccordion.txt b/public/js/components/Cis/Profil/oldAccordion.txt
deleted file mode 100644
index 9581f5846..000000000
--- a/public/js/components/Cis/Profil/oldAccordion.txt
+++ /dev/null
@@ -1,129 +0,0 @@
-
-// Legacy function that constructed a result object where the old and the new versions of the changed data was stored
-updateData: function(event,key,ArrayKey,ObjectKey=null){
-
-      const cleanUpObjectProperties= () => {
-        Object.entries(this.changesData).forEach( ([property, value]) => { if(!Object.keys(value).length) delete this.changesData[property]; })
-      }
-      
-      let newValue = event.target.value;
-      if(!this.changesData[key]){
-        Array.isArray(this.editData[key])? this.changesData[key] = [] : this.changesData[key] = {};
-      } 
-      
-      if(Array.isArray(this.editData[key])){
-        if(newValue.length > 0) this.editData[key][ArrayKey][ObjectKey]= newValue;
-          
-        else this.editData[key][ArrayKey][ObjectKey]= null;
-
-        let Obj = {key:ArrayKey, new: this.editData[key][ArrayKey], old: JSON.parse(this.originalEditData)[key][ArrayKey]};
-
-        
-        if(JSON.stringify(this.editData[key][ArrayKey]) === JSON.stringify(JSON.parse(this.originalEditData)[key][ArrayKey]) ){
-            this.changesData[key] = this.changesData[key].filter( arrayElement => arrayElement.key !== ArrayKey );
-            cleanUpObjectProperties();
-        }else{
-          if(!this.changesData[key].filter( arrayElement => arrayElement.key === ArrayKey ).length){
-            this.changesData[key].push(Obj);
-          }
-          
-        }
-      }else{
-        if(newValue.length > 0) this.editData[key][ArrayKey]= newValue;
-          
-        else this.editData[key][ArrayKey]= null;
-
-        let Obj = { new: this.editData[key][ArrayKey], old: JSON.parse(this.originalEditData)[key][ArrayKey]};
-
-        
-        if(JSON.stringify(this.editData[key][ArrayKey]) === JSON.stringify(JSON.parse(this.originalEditData)[key][ArrayKey])){
-          delete this.changesData[key][ArrayKey];
-          cleanUpObjectProperties();
-        }else{
-          this.changesData[key][ArrayKey]= Obj;
-        }
-
-      }
-      
-     
-    },
-
-
-
-
-
-
-    
-
-<!-- START OF THE ACCORDION
- 
-<pre>{{JSON.stringify(changesData,null,2)}}</pre>
-
-<div class="accordion accordion-flush" id="accordionFlushExample" >
- <div class="accordion-item" v-for="(value,key) in editData ">
-   <h2 class="accordion-header" :id="'flush-headingOne'+key">
-     <button style="font-weight:500" class="accordion-button collapsed" type="button" data-bs-toggle="collapse" :data-bs-target="'#flush-collapseOne'+key" aria-expanded="false" :aria-controls="'flush-collapseOne'+key">
-       {{key.replace("_"," ")}}
-     </button>
-   </h2>
-   <!-- SHOWING ALL MAILS IN THE FIRST PART OF THE ACCORDION -->
-   <div :id="'flush-collapseOne'+key" class="accordion-collapse collapse" aria-labelledby="flush-headingOne" data-bs-parent="#accordionFlushExample">
-     <div class="accordion-body">
-   
-     <div v-if="Array.isArray(value)" class="row gy-3">
-     
-       <template  v-for="(object,objectKey) in value"  >
-       
-       <div class="card card-body col-12 ">
-         <div class="row gy-3">
-         <div v-for="(propertyValue,propertyKey) in object" class="col-6" >
-         
-         <div  class="form-underline ">
-         <div class="form-underline-titel">
-         <label :for="propertyKey+'input'" >{{propertyKey}}</label>
-         </div>
-         <div>
-           <input  class="form-control" :id="propertyKey+'input'" :value="editData[key][objectKey][propertyKey]" @input="updateData($event,key,objectKey,propertyKey)" :placeholder="propertyValue">
-         </div>
-         </div>
-
-         </div>
-         </div>
-
-         </div>
-      
-       </template>
-       
-
-     
-     </div>
-     <div v-else class="row gy-3">
-     <div  v-for="(propertyValue,propertyKey) in value" class="col-6">
-   
-     <div  class="form-underline ">
-     <div class="form-underline-titel">
-     <label :for="propertyKey+'input'" >{{propertyKey}}</label>
-     </div>
-     <div>
-       
-       <input type="email" class="form-control" :id="propertyKey+'input'" :value="editData[key][propertyKey]" @input="updateData($event,key,propertyKey)"  :placeholder="propertyValue">
-     </div>
-     </div>
-     </div>
-     </div>
-
-     
-     
-     
-     
-
-     </div>
-   </div>
- </div>
-
- <!-- -->
-
-
-
-
-<!-- END OF THE ACCORDION -->
\ No newline at end of file

From 33a93457ec5f0682ae86bedc0ccf7d3819f326ef Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 19 Jan 2024 15:19:57 +0100
Subject: [PATCH 0338/1461] finished Handling of Fileuploads

---
 .../controllers/components/stv/Notiz.php      | 110 ++++++++++++++----
 public/js/components/Notiz/Notiz.js           |  19 +--
 2 files changed, 91 insertions(+), 38 deletions(-)

diff --git a/application/controllers/components/stv/Notiz.php b/application/controllers/components/stv/Notiz.php
index d5307f7c2..4c999b7c1 100644
--- a/application/controllers/components/stv/Notiz.php
+++ b/application/controllers/components/stv/Notiz.php
@@ -50,7 +50,7 @@ class Notiz extends FHC_Controller
 		}
 		else
 		{
-			//Todo manu (correct return to ajax)
+			//Todo manu (phrases, response?)
 			$result = "datatype not yet implemented for notes";
 			$this->outputJson(getError($result));
 		}
@@ -107,6 +107,8 @@ class Notiz extends FHC_Controller
 		if(isset($_POST['typeId']))
 			$type = $this->input->post('typeId');
 
+		//var_dump($_POST);
+
 		if(!$type)
 		{
 			$result = error('kein Type für ID vorhanden', EXIT_ERROR);
@@ -155,7 +157,9 @@ class Notiz extends FHC_Controller
 				'insertvon'         => $uid
 			);
 
-			$result = $this->dmslib->upload($dms, $k, array('pdf'));
+			//Todo(manu) check if filetypes weiter eingeschränkt werden sollen
+			$result = $this->dmslib->upload($dms, $k, ['*']);
+/*			$result = $this->dmslib->upload($dms, $k, ['application/pdf','application/x.fhc-dms+json']);*/
 			if (isError($result))
 			{
 				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
@@ -221,7 +225,7 @@ class Notiz extends FHC_Controller
 		$verfasser_uid = isset($_POST['verfasser_uid']) ? $_POST['verfasser_uid'] : null;
 		$bearbeiter_uid = isset($_POST['bearbeiter']) ? $_POST['bearbeiter'] : $uid;
 		$erledigt = $this->input->post('erledigt');
-		$type = $this->input->post('typeId');
+		//$type = $this->input->post('typeId'); //soll auch dieser geändert werden können?
 		$start = $this->input->post('von');
 		$ende = $this->input->post('bis');
 
@@ -247,34 +251,90 @@ class Notiz extends FHC_Controller
 			return $this->outputJson(getError($result));
 		}
 
-		//Todo(manu) update von Notizzuordnung?? typeId?
+		//update(1) laden aller bereits mit dieser notiz_id verknüpften DMS-Einträge
+		$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
+		$this->NotizdokumentModel->addJoin('campus.tbl_dms_version', 'dms_id');
+
+		$result = $this->NotizdokumentModel->loadWhere(array('notiz_id' => $notiz_id));
+		if (isError($result))
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->outputJson(getError($result));
+		}
+		elseif (!hasData($result))
+		{
+			$dms_id_arr = null;
+		}
+		else
+		{
+			$result = getData($result);
+			foreach($result as $doc) {
+				$dms_id_arr[] = array(
+					'name' => $doc->name,
+					'dms_id' => $doc->dms_id
+					);
+			}
+		}
 
-		//neue Files speichern
-		//Todo(manu) update files
 		foreach ($_FILES as $k => $file)
 		{
-			$dms = array(
-				'kategorie_kurzbz'  => 'notiz',
-				'version'           => 0,
-				'name'              => $file["name"],
-				'mimetype'          => $file["type"],
-				'insertamum'        => date('c'),
-				'insertvon'         => $uid
-			);
-
-			$result = $this->dmslib->upload($dms, $k, array('pdf'));
-			if (isError($result))
+			//update(2) alle neuen files (alle außer type application/x.fhc-dms+json) anhängen
+			if($file["type"] == 'application/x.fhc-dms+json')
 			{
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson(getError($result));
+				$dms_uploaded[] = array(
+					'name' => $file["name"]
+				);
 			}
-			$dms_id = $result->retval['dms_id'];
-
-			$result = $this->NotizdokumentModel->insert(array('notiz_id' => $notiz_id, 'dms_id' => $dms_id));
-			if (isError($result))
+			else
 			{
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson(getError($result));
+				$dms = array(
+					'kategorie_kurzbz'  => 'notiz',
+					'version'           => 0,
+					'name'              => $file["name"],
+					'mimetype'          => $file["type"],
+					'insertamum'        => date('c'),
+					'insertvon'         => $uid
+				);
+
+				//Todo(manu) check if filetypes weiter eingeschränkt werden sollen
+				$result = $this->dmslib->upload($dms, $k, array('*'));
+
+				if (isError($result))
+				{
+					$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+					return $this->outputJson(getError($result));
+				}
+				$dms_id = $result->retval['dms_id'];
+
+				$result = $this->NotizdokumentModel->insert(array('notiz_id' => $notiz_id, 'dms_id' => $dms_id));
+				if (isError($result))
+				{
+					$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+					return $this->outputJson(getError($result));
+				}
+			}
+		}
+
+		//update(3) check if Dateien gelöscht wurden
+		if(count($dms_uploaded) != count($dms_id_arr))
+		{
+			$upload_new_names = array_column($dms_uploaded, "name");
+
+			$filesDeleted = array_filter($dms_id_arr, function ($file) use ($upload_new_names) {
+				return !in_array($file["name"], $upload_new_names);
+			});
+
+			foreach ($filesDeleted as $file)
+			{
+				$result = $this->dmslib->removeAll($file['dms_id']);
+
+				if (isError($result))
+				{
+					$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+					return $this->outputJson(getError($result));
+				}
+				else
+					$this->outputJson($result);
 			}
 		}
 		return $this->outputJsonSuccess(true);
diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index a6e4c7183..fd1639bfb 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -32,7 +32,6 @@ export default {
 			multiupload: true,
 			mitarbeiter: [],
 			filteredMitarbeiter: [],
-			zwischenvar: null
 		}
 	},
 	computed: {
@@ -52,14 +51,6 @@ export default {
 				this.$emit('update:text', value);
 			}
 		},
-/*		intPropText: {
-			get() {
-				return this.propText;
-			},
-			set(value) {
-				this.$emit('update:propText', value);
-			}
-		},*/
 		intVon: {
 			get() {
 				return this.von;
@@ -179,8 +170,8 @@ export default {
 	},
 	template: `
 	<div class="notiz-notiz">
-<!--	<p>testausgaben child</p>
-		<span v-for="(anhang,index) in intAnhang"> {{anhang.name}} {{index}}<br></span>-->
+	
+<!--		<span v-for="(anhang,index) in intAnhang"> {{anhang.name}} | {{anhang.type}} | {{anhang.size}} {{index}}<br></span>-->
 		<form ref="form" @submit.prevent class="row">
 			<div>
 				<div class="row mb-3">
@@ -225,7 +216,7 @@ export default {
 					<label for="text" class="form-label col-sm-2">Dokument</label>
 					<div  class="col-sm-7 py-3">
 						<!--Upload Component-->
-						<FormUploadDms ref="upload" id="file" multiple v-model="intAnhang" ></FormUploadDms>
+						<FormUploadDms ref="upload" id="file" multiple v-model="intAnhang"></FormUploadDms>
 					</div>
 				
 				</div>
@@ -289,8 +280,10 @@ export default {
 			</div>
 					
 		</form>
+<!--		files: {{files}} <hr>
+		intText: {{intText}} |<br>propText:	{{propText}} |<br> text: {{text}}  <br> {{intPropText}}-->
 		
-		intText: {{intText}} |<br>propText:	{{propText}} |<br> text: {{text}}  <br> {{intPropText}}
+<!--		{{intAnhang}}-->
 
 
 	</div>`

From fb9b65b13886a7d500c07e9643b2c3e03b22b0c6 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 22 Jan 2024 14:45:32 +0100
Subject: [PATCH 0339/1461] changes how to display the hr table with all the
 user update requests and the update request table in the profil view, also
 adds some new columns to the cis_profil_update table to store the status,
 status date and status message

---
 application/controllers/Cis/Profil.php        |   4 +-
 application/controllers/Cis/ProfilUpdate.php  |  51 ++++--
 .../models/person/Profil_change_model.php     |   9 +-
 application/views/Cis/Profil.php              |   2 +-
 application/views/Cis/ProfilUpdate.php        |   2 +-
 public/css/components/FormUnderline.css       |  35 ++++
 public/css/components/Profil.css              |  34 ----
 public/js/apps/Cis/ProfilUpdateRequests.js    |  92 +++++++---
 public/js/apps/api/fhcapifactory.js           |   4 +-
 public/js/apps/api/profilUpdate.js            |  20 +++
 public/js/apps/api/userdata.js                |   6 -
 .../ProfilComponents/FetchProfilUpdates.js    |  41 ++++-
 .../Cis/ProfilUpdate/AcceptDenyUpdate.js      | 160 ++++++++++++++++++
 system/dbupdate_3.4/25999_C4_ma0594.php       |   4 +
 14 files changed, 372 insertions(+), 92 deletions(-)
 create mode 100644 public/css/components/FormUnderline.css
 create mode 100644 public/js/apps/api/profilUpdate.js
 create mode 100644 public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index 6789de7b8..c9801bbb5 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -94,7 +94,7 @@ class Profil extends Auth_Controller
 		$payload = $json->payload;
 		$type = isset($json->payload->kontakt_id)? "kontakt_id" : "adresse_id";
 
-		$data = ["topic"=>$json->topic,"uid" => $this->uid, "requested_change" => json_encode($payload), "change_timestamp" => "NOW()" ];
+		$data = ["topic"=>$json->topic,"uid" => $this->uid, "requested_change" => json_encode($payload), "change_timestamp" => "NOW()","status"=>"pending" ];
 
 		//? loops over all updateRequests from a user to validate if the new request is valid
 		$res = $this->ProfilChangeModel->loadWhere(["uid"=>$this->uid]);
@@ -148,7 +148,7 @@ class Profil extends Auth_Controller
 		$json = json_decode($this->input->raw_input_stream);
 		
 
-		$data = ["topic"=>$json->topic,"uid" => $this->uid, "requested_change" => json_encode($json->payload), "change_timestamp" => "NOW()" ];
+		$data = ["topic"=>$json->topic,"uid" => $this->uid, "requested_change" => json_encode($json->payload), "change_timestamp" => "NOW()","status"=>"pending" ];
 
 		//? gets all the requested changes from a user
 		
diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
index 2ee7368be..fcbda43e2 100644
--- a/application/controllers/Cis/ProfilUpdate.php
+++ b/application/controllers/Cis/ProfilUpdate.php
@@ -13,6 +13,8 @@ class ProfilUpdate extends Auth_Controller
 		parent::__construct([
 			'index' => ['student/anrechnung_beantragen:r', 'user:r'], // TODO(chris): permissions?
 			'getAllRequests' => ['student/anrechnung_beantragen:r', 'user:r'],
+			'acceptProfilRequest'=>['user:r'],
+			'denyProfilRequest'=>['user:r'],
 
 		]);
 		//? put the uid and pid inside the controller to reuse in controller
@@ -28,22 +30,39 @@ class ProfilUpdate extends Auth_Controller
 	}
 
 	public function getAllRequests(){
-		
-		$res = $this->ProfilChangeModel->load();
-		if(isError($res)){
-			// catch exception
-			echo $res->retval->data;
-			return;
-		}else{
-			if(hasData($res)){
-				$res = getData($res);
-				foreach($res as $element){
-					$element->change_timestamp = date_create($element->change_timestamp)->format('d/m/Y H:i');
-				}
-			}else{
-				$res = null;
-			}
-		}
+		$res = $this->ProfilChangeModel->getProfilUpdate();
+		$res = hasData($res)? getData($res) : null;
 		echo json_encode($res);
 	}
+
+	public function acceptProfilRequest(){
+		$_POST = json_decode($this->input->raw_input_stream,true);
+
+		$id = $this->input->post('requestID',true);
+		
+		if(isset($id)){
+			$res =$this->ProfilChangeModel->update([$id], ["status"=>"accepted","status_timestamp"=>"NOW()"]);
+			echo json_encode($res);
+		}
+
+	}
+
+	public function denyProfilRequest(){
+		$_POST = json_decode($this->input->raw_input_stream,true);
+
+		$id = $this->input->post('requestID',true);
+		
+		if(isset($id)){
+			var_dump($id);
+			//! instead of deleting the rejected profil update, the status of the db entry is set to rejected
+			//$res = $this->ProfilChangeModel->delete([$id]);
+
+
+			$res = $this->ProfilChangeModel->update([$id],["status"=>"rejected","status_timestamp"=>"NOW()"]);
+			echo json_encode($res);
+			
+		}
+		
+
+	}
 }
\ No newline at end of file
diff --git a/application/models/person/Profil_change_model.php b/application/models/person/Profil_change_model.php
index fb48e4726..2f33068c6 100644
--- a/application/models/person/Profil_change_model.php
+++ b/application/models/person/Profil_change_model.php
@@ -30,8 +30,13 @@ class Profil_change_model extends DB_Model
 	 * returns a profil update with id 
 	 * returns all profil updates if id is set to null
 	 */
-	public function getProfilUpdate($uid,$id=null){
-		$whereClause = ["uid"=>$uid];
+	public function getProfilUpdate($uid=null,$id=null){
+		$whereClause=[];
+
+		if(!is_null($uid)){
+			$whereClause['uid']=$uid;
+		}
+		//?
 		if(!is_null($id)){
 			$whereClause['profil_update_id']=$id;
 		}
diff --git a/application/views/Cis/Profil.php b/application/views/Cis/Profil.php
index 9e09bea62..99d2c0ae4 100644
--- a/application/views/Cis/Profil.php
+++ b/application/views/Cis/Profil.php
@@ -3,7 +3,7 @@ $includesArray = array(
 	'title' => 'Stundenplan',
 	'customJSModules' => ['public/js/apps/Cis/Profil.js'],
 	'tabulator5' => true,
-	'customCSSs' => ['public/css/components/calendar.css', 'public/css/components/FilterComponent.css','public/css/components/Profil.css'],
+	'customCSSs' => ['public/css/components/calendar.css', 'public/css/components/FilterComponent.css','public/css/components/Profil.css','public/css/components/FormUnderline.css'],
 	
 );
 
diff --git a/application/views/Cis/ProfilUpdate.php b/application/views/Cis/ProfilUpdate.php
index f55fd4dc1..1c50bf458 100644
--- a/application/views/Cis/ProfilUpdate.php
+++ b/application/views/Cis/ProfilUpdate.php
@@ -2,7 +2,7 @@
 $includesArray = ['title'=> 'Profil Änderungen',
                   'customJSModules'=> ['public/js/apps/Cis/ProfilUpdateRequests.js'],
                   'tabulator5'=> true,
-                  'customCSSs'=>['public/css/components/FilterComponent.css'],
+                  'customCSSs'=>['public/css/components/FilterComponent.css','public/css/components/FormUnderline.css'],
                  ];
 
 $this->load->view('templates/CISHTML-Header',$includesArray);
diff --git a/public/css/components/FormUnderline.css b/public/css/components/FormUnderline.css
new file mode 100644
index 000000000..6b3092b49
--- /dev/null
+++ b/public/css/components/FormUnderline.css
@@ -0,0 +1,35 @@
+/* FORM UNDERLINE
+*/
+.form-underline{
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-content: space-between;
+  
+  }
+  
+  
+  
+  .form-underline .form-underline-content{
+    border-width: 1px;
+    border-color: transparent transparent #dee2e6 transparent;
+    border-style: solid;
+    padding-bottom: 0.25rem;
+    padding-left: 0.5rem;
+  
+    /*optional not wrapping text that is horizontally scrollable and does not display a scrollbar */
+    white-space: nowrap;
+    overflow: auto;
+    scrollbar-width: none;
+  
+  }
+  
+  .form-underline .form-underline-content::-webkit-scrollbar {
+    display: none;
+  }
+  
+  .form-underline .form-underline-titel{
+    opacity: 0.65;
+    font-size: .85rem;
+    padding-left: 0.5rem;
+  }
\ No newline at end of file
diff --git a/public/css/components/Profil.css b/public/css/components/Profil.css
index 4ca104dc8..31adc7fff 100644
--- a/public/css/components/Profil.css
+++ b/public/css/components/Profil.css
@@ -41,41 +41,7 @@
 }
 
 
-/* FORM UNDERLINE
-*/
-.form-underline{
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-content: space-between;
 
-}
-
-
-
-.form-underline .form-underline-content{
-  border-width: 1px;
-  border-color: transparent transparent #dee2e6 transparent;
-  border-style: solid;
-  padding-bottom: 0.25rem;
-  padding-left: 0.5rem;
-
-  /*optional not wrapping text that is horizontally scrollable and does not display a scrollbar */
-  white-space: nowrap;
-  overflow: auto;
-  scrollbar-width: none;
-
-}
-
-.form-underline .form-underline-content::-webkit-scrollbar {
-  display: none;
-}
-
-.form-underline .form-underline-titel{
-  opacity: 0.65;
-  font-size: .85rem;
-  padding-left: 0.5rem;
-}
 
 .btn-circle {
   width: 30px;
diff --git a/public/js/apps/Cis/ProfilUpdateRequests.js b/public/js/apps/Cis/ProfilUpdateRequests.js
index 65b996f3c..5f6f1b31c 100644
--- a/public/js/apps/Cis/ProfilUpdateRequests.js
+++ b/public/js/apps/Cis/ProfilUpdateRequests.js
@@ -1,53 +1,100 @@
 import fhcapifactory from "../api/fhcapifactory.js";
-import {CoreFilterCmpt} from '../../components/filter/Filter.js'
+import {CoreFilterCmpt} from "../../components/filter/Filter.js";
+import AcceptDenyUpdate from "../../components/Cis/ProfilUpdate/AcceptDenyUpdate.js";
 Vue.$fhcapi = fhcapifactory;
-/* 
-data: [
-  {
-    uid: "",
-    profil_changes: "",
-    change_timestamp: "",
-  },
-], */
+
+
+let printIcon= function(cell, formatterParams, onRendered){ //plain text value
+  return "<i class='fa fa-eye'></i>";
+};
 
 const app = Vue.createApp({
     components:{
         CoreFilterCmpt,
+        
     },
     data(){
         return{
+          
             profil_updates_table_options:{
               ajaxURL:FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/Cis/ProfilUpdate/getAllRequests',
                 height:300,
                 layout:'fitColumns',
-                responsiveLayout: "collapse",
-                responsiveLayoutCollapseUseFormatters:false,
-                responsiveLayoutCollapseFormatter:this.collapseFormatter,
                 
                   columns: [
                     {
-                      title: "Uid",
-                      field: "uid",
+                      title: "Topic",
+                      field: "topic",
+                      resizable: true,
                       minWidth: 200,
-                      responsive:0,
+                      //responsive:0,
                     },
                     {
-                      title: "Update",
-                      field: "profil_changes",
-                      minWidth: 10000,
-                      responsive:3,
+                      title: "UID",
+                      field: "uid",
+                      minWidth: 200,
+                      //responsive:0,
                     },
+                   
                     {
                       title: "Date",
                       field: "change_timestamp",
                       resizable: true,
                       minWidth: 200,
-                      responsive:0,
+                      //responsive:0,
                     },
+                    {
+                      title: "Status",
+                      field: "status",
+                      hozAlign:'center',
+                      formatter: function(cell,para){
+                        let res =Object.getPrototypeOf(cell);
+                        //console.log(res);
+                        
+                        switch(cell.getValue()){
+                          case "pending": return "<i class='fa fa-circle-info text-info fa-lg'></i> pending";
+                          case "accepted": return "<i class='fa fa-circle-check text-success fa-lg'></i> accepted";
+                          case "rejected": return "<i class='fa-solid fa-circle-xmark text-danger fa-lg '></i> rejected";
+                          default: return "<p>default</p>";
+                        }
+                      },
+                      
+                      resizable: true,
+                      minWidth: 200,
+                      //responsive:0,
+                    },
+                    {
+                      title: "View",
+                      formatter:printIcon,
+                      resizable: true,
+                      minWidth: 200,
+                      hozAlign: 'center',
+                      cellClick:(e, cell)=>{
+                        //! function that is called when clicking on a row in the table
+                        
+                        let cellData = cell.getRow().getData();
+                        AcceptDenyUpdate.popup({value:cellData}).then(res=>{
+                          console.log("res of the modal: ",res);
+                          //? refetches the data, if any request was denied or accepted
+                          //* setData will call the ajaxURL again to refresh the data 
+                          this.$refs.UpdatesTable.tabulator.setData();
+                        }).catch(e=>{
+                          //? catches the rejected Promise if the result of the modal was falsy
+                          console.log("catch of the modal: ",e);
+                        });
+                          
+                      },
+                      //responsive:0,
+                    },
+                    
+                    
                     
                   ],
             },
         }
+    },
+    computed:{
+      
     },
     methods:{
         sideMenuFunction: function(){
@@ -82,7 +129,9 @@ const app = Vue.createApp({
     },
     created(){
 
-        
+        Vue.$fhcapi.ProfilUpdate.getProfilUpdateRequest().then((res)=>{
+          console.log(res.data);
+        })
 
 
     },
@@ -93,6 +142,7 @@ const app = Vue.createApp({
     template:`
     <div>
     
+    
     <core-filter-cmpt title="Update Requests"  ref="UpdatesTable" :tabulator-options="profil_updates_table_options" tableOnly :sideMenu="false" />
 
     </div>`,
diff --git a/public/js/apps/api/fhcapifactory.js b/public/js/apps/api/fhcapifactory.js
index f75b03482..9845d2fc5 100644
--- a/public/js/apps/api/fhcapifactory.js
+++ b/public/js/apps/api/fhcapifactory.js
@@ -1,7 +1,9 @@
 import Search from "./search.js";
 import UserData from "./userdata.js";
+import ProfilUpdate from "./profilUpdate.js"
 
 export default {
     "Search": Search,
-    "UserData": UserData
+    "UserData": UserData,
+    "ProfilUpdate": ProfilUpdate,
 };
diff --git a/public/js/apps/api/profilUpdate.js b/public/js/apps/api/profilUpdate.js
new file mode 100644
index 000000000..b9aa01731
--- /dev/null
+++ b/public/js/apps/api/profilUpdate.js
@@ -0,0 +1,20 @@
+export default {
+
+    //! API calls for profil update requests
+
+    getProfilUpdateRequest: function(){
+        const url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/Cis/ProfilUpdate/getAllRequests';
+        return axios.get(url);
+    },
+
+    acceptProfilRequest: function(requestID){
+        const url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/Cis/ProfilUpdate/acceptProfilRequest';
+        return axios.post(url,{requestID: requestID});
+    },
+
+    denyProfilRequest: function(requestID){
+        const url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/Cis/ProfilUpdate/denyProfilRequest';
+        return axios.post(url,{requestID: requestID});
+    }
+
+}
\ No newline at end of file
diff --git a/public/js/apps/api/userdata.js b/public/js/apps/api/userdata.js
index 47df445b4..6c881393d 100644
--- a/public/js/apps/api/userdata.js
+++ b/public/js/apps/api/userdata.js
@@ -56,12 +56,6 @@ export default {
     },
 
     
-    //! API Calls for Profil Update View
-
-    getProfilUpdateRequest: function(){
-        const url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/Cis/ProfilUpdate/getAllRequests';
-        return axios.get(url);
-    }
    
 
 
diff --git a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
index ff42454fc..5af4a89ae 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
@@ -33,12 +33,13 @@ export default {
                 case "Private Adressen" : return "EditAdresse"; break;
                 case "Add Adressen" : return "EditAdresse"; break;
                 case "Add Kontakte" : return "EditKontakt"; break;
-                case "Delete Adressen" : return "EditAdresse"; break;
-                case "Delete Kontakte" : return "EditKontakt"; break;
+                case "Delete Adressen" : return "Adresse"; break;
+                case "Delete Kontakte" : return "Kontakt"; break;
                 default: return "text_input"; break;
             }
         },
         openModal(updateRequest) {
+            console.log(JSON.stringify(updateRequest));
 
             let view = this.getView(updateRequest.topic);
             let content =null;
@@ -104,18 +105,42 @@ export default {
             <thead>
                 <tr >
                 <th scope="col">Topic</th>
+                <th scope="col">Status</th>
                 <th scope="col">Date of Request</th>
-                <th  scope="col">Bearbeiten</th>
-                <th style="white-space:normal" scope="col">Löschen</th>
+                
+                <th  scope="col">Action</th>
+                
+                
                 </tr>
             </thead>
             <tbody>
-                <tr v-for="item in data">
+            <!-- :class="{'bg-success':item.status === 'accepted', 'bg-danger':item.status === 'rejected', 'text-white':item.status =='rejected' || item.status=='accepted'}" -->
+                <tr v-for="item in data" :style="item.status=='accepted'?'background-color:lightgreen':item.status==='rejected'?'background-color:lightcoral':''">
                 <td class="align-middle">{{item.topic}}</td>
+                <td class="align-middle text-center" >{{item.status}}</td>
                 <td class="align-middle">{{item.change_timestamp}}</td>
-                <td v-if="item.topic.toLowerCase().includes('delete')" class="align-middle text-center" >{{item.requested_change.adr_typ?item.requested_change.adr_typ:item.requested_change.kontakt}}</td>
-                <td v-else class="align-middle text-center" ><i style="color:#00639c" @click="openModal(item)" role="button" class="fa fa-edit"></i></td>
-                <td class="align-middle text-center"><i style="color:red" role="button" @click="deleteRequest(item)" class="fa fa-trash"></i></td>
+                
+                
+                
+                <template v-if="item.status === 'pending'">
+                <td>
+                <template v-if="item.topic.toLowerCase().includes('delete')">
+                <!-- old edit view for delete requests <div class="align-middle text-center" >{{item.requested_change.adr_typ?item.requested_change.adr_typ:item.requested_change.kontakt}}</div>-->
+                <div  class="align-middle text-center"><i style="color:gray" role="button" @click="openModal(item)" class="fa fa-eye"></i></div>
+                </template>
+                <template v-else >
+                <div class="align-middle text-center" ><i style="color:#00639c" @click="openModal(item)" role="button" class="fa fa-edit"></i></div>
+                </template>
+                
+                <div class="align-middle text-center"><i style="color:red" role="button" @click="deleteRequest(item)" class="fa fa-trash"></i></div>
+                
+                </td>
+                </template>
+                
+                
+                
+                
+                
                 </tr>
             </tbody>
         </table>
diff --git a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
new file mode 100644
index 000000000..ee8485bf7
--- /dev/null
+++ b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
@@ -0,0 +1,160 @@
+import BsModal from "../../Bootstrap/Modal.js";
+import Alert from "../../Bootstrap/Alert.js";
+import Kontakt from "../Profil/ProfilComponents/Kontakt.js";
+import Adresse from "../Profil/ProfilComponents/Adresse.js";
+
+
+export default {
+  components: {
+    BsModal,
+    Alert,
+    Kontakt,
+    Adresse,
+   
+  },
+  mixins: [BsModal],
+  props: {
+    title:{
+        type:String,
+        default:"Profil Update Request"
+    },
+    value: {
+        type:Object,
+    },
+    /*
+     * NOTE(chris):
+     * Hack to expose in "emits" declared events to $props which we use
+     * in the v-bind directive to forward all events.
+     * @see: https://github.com/vuejs/core/issues/3432
+     */
+    onHideBsModal: Function,
+    onHiddenBsModal: Function,
+    onHidePreventedBsModal: Function,
+    onShowBsModal: Function,
+    onShownBsModal: Function,
+  },
+  data() {
+    return {      
+      data: this.value,
+      //? result is returned from the Promise when the modal is closed
+      result: false,
+      info: null,
+    }
+  },
+
+  methods: {
+    acceptRequest: function(){
+      console.log(this.data.profil_update_id);
+      Vue.$fhcapi.ProfilUpdate.acceptProfilRequest(this.data.profil_update_id).then(res =>{
+        console.log("res",res);
+        console.log("res.data",res.data);
+        this.result = true;
+      })
+      this.hide();
+    },
+
+    denyRequest: function(){
+      console.log(this.data.profil_update_id);
+      Vue.$fhcapi.ProfilUpdate.denyProfilRequest(this.data.profil_update_id).then(res =>{
+        console.log("res",res);
+        console.log("res.data",res.data);
+        this.result = true;
+      })
+      this.hide();
+    },
+    
+    submitProfilChange(){
+        //TODO: check if the updated value is different from the original value before submitting the request
+       if(false){
+
+        //? inserts new row in public.tbl_cis_profil_update 
+        //* calls the update api call if an update field is present in the data that was passed to the module
+        Vue.$fhcapi.UserData[this.editData.update?'updateProfilRequest':'insertProfilRequest'](this.topic,this.profilUpdate).then((res)=>{
+          
+          if(res.data.error == 0){
+            this.result= true;
+            this.hide();
+            Alert.popup("Ihre Anfrage wurde erfolgreich gesendet. Bitte warten Sie, während sich das Team um Ihre Anfrage kümmert.");
+          }else{
+            this.result= false;
+            this.hide();
+            Alert.popup("Ein Fehler ist aufgetreten: "+ JSON.stringify(res.data.retval));
+          } 
+         
+        });
+    }
+    },
+  },
+  computed: {
+    getComponentView: function(){
+        
+        if(this.data.topic.toLowerCase().includes("kontakt")){
+            return "kontakt";
+        }else if (this.data.topic.toLowerCase().includes("adresse")){
+            return "adresse";
+        }else{
+            return "text_input";
+        }
+    },
+  },
+  created() {
+    console.log("data passed as prop",this.data);
+
+  },
+  mounted() {
+    this.modal = this.$refs.modalContainer.modal;
+  },
+  popup(options) {
+    return BsModal.popup.bind(this)(null, options);
+  },
+  template: `
+  <bs-modal ref="modalContainer" v-bind="$props" body-class="" dialog-class="modal-lg" class="bootstrap-alert" backdrop="false" >
+    
+    <template v-slot:title>
+      {{title}}  
+    </template>
+
+
+    <template v-slot:default>
+    <pre>{{JSON.stringify(data.profil_update_id,null,2)}}</pre>
+    <!-- debugging prints 
+    <pre>view {{getComponentView}}</pre>
+    <pre>topic {{JSON.stringify(data.topic,null,2)}}</pre>
+    <pre>data {{JSON.stringify(data.requested_change,null,2)}}</pre>
+    -->
+
+    <div  class="form-underline mb-2">
+      <div class="form-underline-titel">UserID: </div>
+
+      <span  class="form-underline-content" >{{data.uid}}</span>
+    </div>
+
+    <div  class="form-underline mb-2">
+      <div class="form-underline-titel">Topic of Request: </div>
+
+      <span  class="form-underline-content" >{{data.topic}}</span>
+    </div>
+
+    <div  class="form-underline mb-2">
+      <div class="form-underline-titel">Date of Request:</div>
+
+      <span  class="form-underline-content" >{{data.change_timestamp}}</span>
+    </div>
+
+    <div v-if="getComponentView==='text_input'" class="form-underline mb-2">
+      <div class="form-underline-titel">{{data.topic}}</div>
+
+      <span  class="form-underline-content" >{{data.requested_change}}</span>
+    </div>
+    
+    <component v-else :is="getComponentView" :data="data.requested_change"></component>
+    </template>
+    
+
+    <template   v-slot:footer>
+     <button @click="acceptRequest" class="btn btn-primary">Accept <i class="fa fa-check"></i></button>
+     <button @click="denyRequest" class="btn btn-danger">Deny <i class="fa fa-xmark"></i></button>
+    </template>
+  
+    </bs-modal>`,
+};
diff --git a/system/dbupdate_3.4/25999_C4_ma0594.php b/system/dbupdate_3.4/25999_C4_ma0594.php
index 4d694c4c2..151a727b2 100644
--- a/system/dbupdate_3.4/25999_C4_ma0594.php
+++ b/system/dbupdate_3.4/25999_C4_ma0594.php
@@ -8,6 +8,9 @@
                 uid VARCHAR(32) NOT NULL,
                 requested_change jsonb NOT NULL,
                 change_timestamp TIMESTAMP NOT NULL,
+                status VARCHAR(32) NOT NULL,
+                status_timestamp TIMESTAMP NULL,
+                status_message TEXT NULL,
                 CONSTRAINT tbl_cis_profil_update_pk PRIMARY KEY(profil_update_id),
                 CONSTRAINT tbl_cis_profil_update_fk FOREIGN KEY(uid) REFERENCES public.tbl_benutzer(uid)
             );
@@ -19,6 +22,7 @@
 			 CACHE 1;
              
 		    ALTER TABLE public.tbl_cis_profil_update ALTER COLUMN profil_update_id SET DEFAULT nextval('public.tbl_cis_profil_update_id_seq');
+            ALTER TABLE public.tbl_cis_profil_update ADD CONSTRAINT tbl_cis_profil_update_restricted_status CHECK (status IN ('pending','accepted','rejected'));
             --ALTER TABLE public.tbl_cis_profil_update ADD CONSTRAINT cis_profil_udpate_topic_uid_unique UNIQUE (uid,topic);
 
             GRANT SELECT, INSERT, UPDATE, DELETE ON public.tbl_cis_profil_update TO vilesci;

From 4bd430ae795b2b78dcdea45a0c3e0ea9563e0431 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 22 Jan 2024 14:51:40 +0100
Subject: [PATCH 0340/1461] tiny mce, workaround for binding textfield variable

---
 public/js/components/Notiz/Notiz.js | 62 +++++++++++++++++++++--------
 1 file changed, 46 insertions(+), 16 deletions(-)

diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index fd1639bfb..14e34ee58 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -31,7 +31,7 @@ export default {
 		return {
 			multiupload: true,
 			mitarbeiter: [],
-			filteredMitarbeiter: [],
+			filteredMitarbeiter: []
 		}
 	},
 	computed: {
@@ -132,41 +132,72 @@ export default {
 				});
 		},
 		initTinyMCE() {
+			//const vm = this.intText;
 			tinymce.init({
 				selector: '#editor',
+/*				selector: `#${this.$refs.editor.id}`,*/
 				//height: 800,
-				plugins: ['autoresize', 'lists'],
-				toolbar: "undo redo | blocks | bold italic | alignleft aligncenter alignright alignjustify | outdent indent",
+				plugins: ['lists'],
+/*				toolbar: "undo redo | blocks | bold italic | alignleft aligncenter alignright alignjustify | outdent indent",*/
+				toolbar: "undo redo",
 
 				autoresize_bottom_margin: 16,
 				setup: (editor) => {
 
-/*					editor.on('input', () => {
-						this.$emit('update:propText', editor.getContent());
-					});*/
-
 					// workaround for avoiding conflict id of frame: same Id as textarea
 					// working just for new notes
-					//Todo(manu) find a solution for update notes
+					//solution for update notes: now working
+					//todo(manu) but now: cursor position!!
+
 					editor.on('input', () => {
-						this.intText = editor.getContent();
-						//this.$emit('update:intText', editor.getContent());
+
+						const newContent = editor.getContent();
+/*						const contentLength = newContent.length;
+						console.log(contentLength);
+
+						editor.selection.setCursorLocation(editor.getBody(), contentLength);*/
+						this.intText = newContent;
 
 					});
+
+/*					editor.on('change', () => {
+						const newContent = editor.getContent();
+						const contentLength = newContent.length;
+
+						//editor.selection.setCursorLocation(editor.getBody(), contentLength);
+
+						// Vue-Instanz-Referenz (vm), um auf die Daten zuzugreifen
+						this.intText = newContent;
+					});*/
 				},
 			});
 		},
 		updateContent(event) {
 			// Manually update the content when the textarea is edited
 			tinymce.get('editor').setContent(event.target.value);
-			console.log(event.target.value);
+			//console.log(event.target.value);
 		},
 	},
 	mounted() {
 		this.initTinyMCE();
 	},
+	watch: {
+		intText: function(newVal, oldVal) {
+			// Überprüfen, ob sich der Wert von intText geändert hat
+			if (newVal !== oldVal) {
+
+				const editor = tinymce.get('editor');
+
+				// Aktualisieren Inhalt des Editors
+				editor.setContent(newVal);
+				//tinymce.get(this.$refs.editor.id).setContent(newVal);
+
+			}
+		},
+	},
 	beforeDestroy() {
 		tinymce.get('editor').destroy();
+/*		tinymce.get(this.$refs.editor.id).destroy();*/
 	},
 	template: `
 	<div class="notiz-notiz">
@@ -199,8 +230,9 @@ export default {
 					
 					<!--tinymce-->
 					<div class="col-sm-7">
-<!--						<textarea id="editor" rows="5" cols="75" @input="updateContent" class="form-control">{{ intText }}</textarea>-->
-						<textarea id="editor" rows="5" cols="75" @input="updateContent" class="form-control">{{ intText }}</textarea>
+						<!--<textarea id="editor" rows="5" cols="75" @input="updateContent" class="form-control">{{ intText }}</textarea>-->
+						<textarea id="editor" rows="5" cols="75" :value="intText" @input="updateContent" class="form-control"></textarea>
+
 					</div>
 					
 					<!--	oldversion-->
@@ -280,10 +312,8 @@ export default {
 			</div>
 					
 		</form>
-<!--		files: {{files}} <hr>
-		intText: {{intText}} |<br>propText:	{{propText}} |<br> text: {{text}}  <br> {{intPropText}}-->
 		
-<!--		{{intAnhang}}-->
+		intText: {{intText}}
 
 
 	</div>`

From 7abe04a69f6acb5b07c8431e7c49f123747df961 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 22 Jan 2024 16:02:52 +0100
Subject: [PATCH 0341/1461] fixes little bug for View Profil and changes layout
 of the profil update fetch component

---
 application/controllers/Cis/Profil.php        | 11 ++--
 public/js/components/Cis/Profil/EditProfil.js |  1 +
 .../components/Cis/Profil/EditProfilSelect.js |  4 +-
 .../ProfilComponents/FetchProfilUpdates.js    | 51 +++++++++++--------
 .../Cis/Profil/ProfilComponents/Status.js     | 35 +++++++++++++
 5 files changed, 78 insertions(+), 24 deletions(-)
 create mode 100644 public/js/components/Cis/Profil/ProfilComponents/Status.js

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index c9801bbb5..797db3ed9 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -19,6 +19,7 @@ class Profil extends Auth_Controller
 			'index' => ['student/anrechnung_beantragen:r', 'user:r'], // TODO(chris): permissions?
 			'foto_sperre_function' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'getView' => ['student/anrechnung_beantragen:r', 'user:r'],
+			'View' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'insertProfilRequest' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'updateProfilRequest' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'deleteProfilRequest' => ['student/anrechnung_beantragen:r', 'user:r'],
@@ -99,11 +100,14 @@ class Profil extends Auth_Controller
 		//? loops over all updateRequests from a user to validate if the new request is valid
 		$res = $this->ProfilChangeModel->loadWhere(["uid"=>$this->uid]);
 		$res = hasData($res) ? getData($res) : null;
+		
 		if($res){
 		foreach($res as $update_request){
 			$existing_change = json_decode($update_request->requested_change);
-
-			if(isset($existing_change->$type) && $existing_change->$type == $payload->$type){
+			echo json_encode($existing_change);
+			echo property_exists($existing_change,$type);
+			 
+			if(property_exists($existing_change,$type) && $existing_change->$type == $payload->$type){
 				//? the kontakt_id / adresse_id of a change has to be unique 
 				
 				echo json_encode(error("cannot change the same resource twice"));
@@ -267,6 +271,7 @@ class Profil extends Auth_Controller
 		}
 
 		
+		print_r($telefon_res);
 
 		$res = new stdClass();
 		$res->username = $uid;
@@ -303,7 +308,7 @@ class Profil extends Auth_Controller
 		//? Mailverteiler Info
 		$res->mailverteiler = $mailverteiler_res;
 
-		$res->standort_telefon = $telefon_res->kontakt;
+		$res->standort_telefon = isset($telefon_res)? $telefon_res->kontakt : null;
 
 		return $res;
 
diff --git a/public/js/components/Cis/Profil/EditProfil.js b/public/js/components/Cis/Profil/EditProfil.js
index 10bcea898..316d6966f 100644
--- a/public/js/components/Cis/Profil/EditProfil.js
+++ b/public/js/components/Cis/Profil/EditProfil.js
@@ -68,6 +68,7 @@ export default {
       //? if the topic was passed through the prop add it to the component
       this.topic = this.editData.topic;
     }
+    console.log("here",this.editData);
    
 
   },
diff --git a/public/js/components/Cis/Profil/EditProfilSelect.js b/public/js/components/Cis/Profil/EditProfilSelect.js
index e721b6f11..a5869eb75 100644
--- a/public/js/components/Cis/Profil/EditProfilSelect.js
+++ b/public/js/components/Cis/Profil/EditProfilSelect.js
@@ -2,6 +2,7 @@ import Kontakt from "./ProfilComponents/Kontakt.js";
 import EditKontakt from "./ProfilComponents/EditKontakt.js";
 import Adresse from "./ProfilComponents/Adresse.js";
 import EditAdresse from "./ProfilComponents/EditAdresse.js";
+import Status from "./ProfilComponents/Status.js";
 
 export default {
     components: {
@@ -9,6 +10,7 @@ export default {
       EditKontakt,
       Adresse,
       EditAdresse,
+      Status,
     },
     props: {
 
@@ -173,7 +175,7 @@ export default {
     <!-- if it not a normal text input field then reder the custom edit input component -->
     <!-- custom component is required to emit an profilUpdate event to register the new entered value --> 
     <template v-else>
-      <component @profilUpdate="profilUpdateEmit"  :is="view" :data="data"></component>
+      <component @profilUpdate="profilUpdateEmit"  :is="view" :data="data" v-bind="list"></component>
     </template>
    `,
   };
diff --git a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
index 5af4a89ae..50dcc1440 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
@@ -16,6 +16,7 @@ export default {
         }
     },
     methods:{
+       
         deleteRequest: function(item){
             
             Vue.$fhcapi.UserData.deleteProfilRequest(item.profil_update_id).then((res)=>{
@@ -27,42 +28,46 @@ export default {
                 }
             });
         },
-        getView: function(topic){
+        getView: function(topic,status){
             switch(topic){
                 case "Private Kontakte" : return "EditKontakt"; break;
                 case "Private Adressen" : return "EditAdresse"; break;
                 case "Add Adressen" : return "EditAdresse"; break;
                 case "Add Kontakte" : return "EditKontakt"; break;
-                case "Delete Adressen" : return "Adresse"; break;
-                case "Delete Kontakte" : return "Kontakt"; break;
+                case "Delete Adressen" :  return status ==='pending'? "Adresse": "Status" ; break;
+                case "Delete Kontakte" : return status ==='pending'? "Kontakt": "Status"; break;
                 default: return "text_input"; break;
             }
         },
         openModal(updateRequest) {
             console.log(JSON.stringify(updateRequest));
 
-            let view = this.getView(updateRequest.topic);
+            let view = this.getView(updateRequest.topic,updateRequest.status);
+            let data = null;
             let content =null;
             if(view === 'text_input'){
-                content={
-                    view:view,
-                    data:{
+               //TODO:  change data handling for text_input component to accept the data in the same way as the other components
+                data = {
                         titel:updateRequest.topic,
                         value:updateRequest.requested_change,
-                    },
-                    update:true,
-                    topic:updateRequest.topic,
-                    
-                }
+                    };
             }else{
-                content = {
-                    view: view,
-                    data: updateRequest.requested_change,
-                    update:true,
-                    topic:updateRequest.topic,
-                    
-                    
-                }
+                data = updateRequest.requested_change;
+            }
+
+            content={
+                view:view,
+                data:data,
+                update:true,
+                topic:updateRequest.topic,
+                
+            }
+
+            //? adds the status information if the profil update request was rejected or accepted
+            if(updateRequest.status !== 'pending'){
+                content['status']= updateRequest.status;
+                content['status_message']= updateRequest.status_message;
+                content['status_timestamp']=updateRequest.status_timestamp;
             }
 
 
@@ -136,6 +141,12 @@ export default {
                 
                 </td>
                 </template>
+                <template v-else-if="item.status === 'accepted'">
+                <td  class="align-middle text-center"><i style="color:gray" role="button" @click="openModal(item)" class="fa fa-eye"></i></td>
+                </template>
+                <template v-else-if="item.status === 'rejected'">
+                <td  class="align-middle text-center"><i style="color:gray" role="button" @click="openModal(item)" class="fa fa-eye"></i></td>
+                </template>
                 
                 
                 
diff --git a/public/js/components/Cis/Profil/ProfilComponents/Status.js b/public/js/components/Cis/Profil/ProfilComponents/Status.js
new file mode 100644
index 000000000..bc69497bd
--- /dev/null
+++ b/public/js/components/Cis/Profil/ProfilComponents/Status.js
@@ -0,0 +1,35 @@
+export default {
+
+    data(){
+        return {
+
+        }
+    },
+    props:{
+        data:{type:Object},
+        view:{type:String},
+        status:{type:String},
+        status_message:{type:String},
+        status_timestamp:{type:String},
+        update:{type:Boolean},
+    },
+    created(){
+        
+
+    },template:`
+    <div  class="form-underline mb-2">
+    <div class="form-underline-titel">Status</div>
+    <span  class="form-underline-content">{{status}} </span>
+    </div>
+
+    <div v-if="status_message" class="form-underline mb-2 ">
+    <div class="form-underline-titel">Status message</div>
+    <span  class="form-underline-content">{{status_message}} </span>
+    </div>
+
+    <div  class="form-underline mb-2">
+    <div class="form-underline-titel">Date</div>
+    <span  class="form-underline-content">{{status_timestamp}} </span>
+    </div>`,
+
+}
\ No newline at end of file

From df74bade9bbf4ac33c760d82efb49dbb6012d3e8 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 23 Jan 2024 11:00:43 +0100
Subject: [PATCH 0342/1461] fixes bug when getting all the profil update
 requests and makes it possible to add a message when dening or accepting a
 profil update

---
 application/controllers/Cis/Profil.php        | 15 ++--
 application/controllers/Cis/ProfilUpdate.php  | 20 ++---
 .../models/person/Profil_change_model.php     |  1 +
 public/js/apps/Cis/ProfilUpdateRequests.js    |  2 +
 public/js/apps/api/profilUpdate.js            |  8 +-
 public/js/apps/api/userdata.js                |  4 +-
 .../components/Cis/Profil/EditProfilSelect.js | 13 ++--
 .../Cis/Profil/MitarbeiterProfil.js           | 27 ++++---
 .../Profil/ProfilComponents/EditAdresse.js    |  4 +-
 .../Profil/ProfilComponents/EditKontakt.js    |  2 +-
 .../ProfilComponents/FetchProfilUpdates.js    | 28 ++++---
 .../Cis/ProfilUpdate/AcceptDenyUpdate.js      | 73 ++++++++++++++++---
 12 files changed, 133 insertions(+), 64 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index 797db3ed9..20fb65e22 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -69,8 +69,11 @@ class Profil extends Auth_Controller
 
 
 	public function selectProfilRequest(){
-		$uid =json_decode($this->input->get("uid"));
-		$id =json_decode($this->input->get("id"));
+		$_GET = json_decode($this->input->raw_input_stream, true);
+		$uid = $this->input->get('uid');
+		$id = $this->input->get('id');
+		echo $uid;
+		echo $id;
 		
 		if($uid && $id){
 			$res= $this->ProfilChangeModel->getProfilUpdate($uid, $id);
@@ -93,7 +96,8 @@ class Profil extends Auth_Controller
 
 		$json = json_decode($this->input->raw_input_stream);
 		$payload = $json->payload;
-		$type = isset($json->payload->kontakt_id)? "kontakt_id" : "adresse_id";
+		$type = property_exists($json->payload,"kontakt_id")? "kontakt_id" : "adresse_id";
+		
 
 		$data = ["topic"=>$json->topic,"uid" => $this->uid, "requested_change" => json_encode($payload), "change_timestamp" => "NOW()","status"=>"pending" ];
 
@@ -104,10 +108,9 @@ class Profil extends Auth_Controller
 		if($res){
 		foreach($res as $update_request){
 			$existing_change = json_decode($update_request->requested_change);
-			echo json_encode($existing_change);
-			echo property_exists($existing_change,$type);
+			
 			 
-			if(property_exists($existing_change,$type) && $existing_change->$type == $payload->$type){
+			if(property_exists($existing_change,$type) && property_exists($payload,$type) && $existing_change->$type == $payload->$type){
 				//? the kontakt_id / adresse_id of a change has to be unique 
 				
 				echo json_encode(error("cannot change the same resource twice"));
diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
index fcbda43e2..c82096020 100644
--- a/application/controllers/Cis/ProfilUpdate.php
+++ b/application/controllers/Cis/ProfilUpdate.php
@@ -37,28 +37,24 @@ class ProfilUpdate extends Auth_Controller
 
 	public function acceptProfilRequest(){
 		$_POST = json_decode($this->input->raw_input_stream,true);
-
-		$id = $this->input->post('requestID',true);
 		
+		$id = $this->input->post('profil_update_id',true);
+		$status_message = $this->input->post('status_message',true);
 		if(isset($id)){
-			$res =$this->ProfilChangeModel->update([$id], ["status"=>"accepted","status_timestamp"=>"NOW()"]);
+			$res =$this->ProfilChangeModel->update([$id], ["status"=>"accepted","status_timestamp"=>"NOW()","status_message"=>$status_message]);
 			echo json_encode($res);
-		}
+		} 
 
 	}
 
 	public function denyProfilRequest(){
 		$_POST = json_decode($this->input->raw_input_stream,true);
-
-		$id = $this->input->post('requestID',true);
+		
+		$id = $this->input->post('profil_update_id',true);
+		$status_message = $this->input->post('status_message',true);
 		
 		if(isset($id)){
-			var_dump($id);
-			//! instead of deleting the rejected profil update, the status of the db entry is set to rejected
-			//$res = $this->ProfilChangeModel->delete([$id]);
-
-
-			$res = $this->ProfilChangeModel->update([$id],["status"=>"rejected","status_timestamp"=>"NOW()"]);
+			$res = $this->ProfilChangeModel->update([$id],["status"=>"rejected","status_timestamp"=>"NOW()","status_mesage"=>$status_message]);
 			echo json_encode($res);
 			
 		}
diff --git a/application/models/person/Profil_change_model.php b/application/models/person/Profil_change_model.php
index 2f33068c6..b8c487a5a 100644
--- a/application/models/person/Profil_change_model.php
+++ b/application/models/person/Profil_change_model.php
@@ -49,6 +49,7 @@ class Profil_change_model extends DB_Model
 				foreach($res->retval as $update){
 					$update->requested_change = json_decode($update->requested_change);
 					$update->change_timestamp = date_create($update->change_timestamp)->format('d.m.Y');
+					$update->status_timestamp = date_create($update->status_timestamp)->format('d.m.Y');
 				}
 			}
 		}
diff --git a/public/js/apps/Cis/ProfilUpdateRequests.js b/public/js/apps/Cis/ProfilUpdateRequests.js
index 5f6f1b31c..c45283876 100644
--- a/public/js/apps/Cis/ProfilUpdateRequests.js
+++ b/public/js/apps/Cis/ProfilUpdateRequests.js
@@ -73,6 +73,7 @@ const app = Vue.createApp({
                         //! function that is called when clicking on a row in the table
                         
                         let cellData = cell.getRow().getData();
+                        
                         AcceptDenyUpdate.popup({value:cellData}).then(res=>{
                           console.log("res of the modal: ",res);
                           //? refetches the data, if any request was denied or accepted
@@ -82,6 +83,7 @@ const app = Vue.createApp({
                           //? catches the rejected Promise if the result of the modal was falsy
                           console.log("catch of the modal: ",e);
                         });
+                      
                           
                       },
                       //responsive:0,
diff --git a/public/js/apps/api/profilUpdate.js b/public/js/apps/api/profilUpdate.js
index b9aa01731..7f0bdc63e 100644
--- a/public/js/apps/api/profilUpdate.js
+++ b/public/js/apps/api/profilUpdate.js
@@ -7,14 +7,14 @@ export default {
         return axios.get(url);
     },
 
-    acceptProfilRequest: function(requestID){
+    acceptProfilRequest: function(payload){
         const url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/Cis/ProfilUpdate/acceptProfilRequest';
-        return axios.post(url,{requestID: requestID});
+        return axios.post(url,payload);
     },
 
-    denyProfilRequest: function(requestID){
+    denyProfilRequest: function(payload){
         const url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/Cis/ProfilUpdate/denyProfilRequest';
-        return axios.post(url,{requestID: requestID});
+        return axios.post(url,payload);
     }
 
 }
\ No newline at end of file
diff --git a/public/js/apps/api/userdata.js b/public/js/apps/api/userdata.js
index 6c881393d..be6092dd4 100644
--- a/public/js/apps/api/userdata.js
+++ b/public/js/apps/api/userdata.js
@@ -5,9 +5,9 @@ export default {
 
     selectProfilRequest: function(uid=null,id=null) {
         const url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router+
-                   `/Cis/Profil/selectProfilRequest?uid=${uid}&id=${id}`;
+                   `/Cis/Profil/selectProfilRequest`;
                    
-        return axios.get(url);
+        return axios.get(url,{uid:uid, id:id});
     },
     
     insertProfilRequest: function(topic, payload) {
diff --git a/public/js/components/Cis/Profil/EditProfilSelect.js b/public/js/components/Cis/Profil/EditProfilSelect.js
index a5869eb75..b620c2848 100644
--- a/public/js/components/Cis/Profil/EditProfilSelect.js
+++ b/public/js/components/Cis/Profil/EditProfilSelect.js
@@ -55,6 +55,7 @@ export default {
 
       addItem: function(){
         
+        
         this.view= this.topic == "Private Kontakte"?"EditKontakt":"EditAdresse" ;
         
         //? updates the topic when a Kontakt or an Address should be added
@@ -63,7 +64,6 @@ export default {
         this.breadcrumbItems.push(this.topic);
         this.$emit('update:breadcrumb',this.breadcrumbItems);
         
-        
         this.data= this.view=="EditAdresse"?
         {
           added:true,
@@ -72,8 +72,7 @@ export default {
           adr_typ: null,
           plz: null,
           ort: null
-        }:
-        {
+        }: {
           added:true,
           kontakt_id: null,
           kontakttyp: null,
@@ -81,7 +80,8 @@ export default {
           anmerkung: null,
           zustellung: false
         }
-
+        
+        
       },
 
       deleteItem: function(item){
@@ -138,8 +138,6 @@ export default {
     },
    
     template: `
-   
-  
     <template v-if="!view">
     <div  class="list-group">
     <template v-for="item in data">
@@ -175,7 +173,8 @@ export default {
     <!-- if it not a normal text input field then reder the custom edit input component -->
     <!-- custom component is required to emit an profilUpdate event to register the new entered value --> 
     <template v-else>
-      <component @profilUpdate="profilUpdateEmit"  :is="view" :data="data" v-bind="list"></component>
+      <!-- both v-bind="list" and :data="data" pass a data prop, in this case the last one is the one that gets taken -->
+      <component @profilUpdate="profilUpdateEmit"  :is="view" v-bind="list" :data="data"></component>
     </template>
    `,
   };
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 3de33af47..ea67092d8 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -249,14 +249,7 @@ export default {
           title:"Personen Informationen",
           view:null,
           data:{
-            username:{
-              title:"username",
-              view:"text_input",
-              data:{
-                titel:"username",
-                value:this.data.username,
-              }
-            },
+            
             vorname: {
               title:"vorname",
               view:"text_input",
@@ -271,7 +264,23 @@ export default {
                   titel:"nachname",
                   value:this.data.nachname,
                 }
-              }
+              },
+              titel:{
+                title:"titel",
+                view:"text_input",
+                data:{
+                  titel:"titel",
+                  value:this.data.titel,
+                }
+              },
+              postnomen:{
+                title:"postnomen",
+                view:"text_input",
+                data:{
+                  titel:"postnomen",
+                  value:this.data.titel,
+                }
+              },
             }
           },
           Private_Kontakte: {
diff --git a/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js b/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
index 6b0cecc41..e6dda6bb8 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
@@ -26,7 +26,7 @@ export default {
         
     },
     template:`
-    <pre>{{isChanged}}</pre>
+    
     <div class="gy-3 row justify-content-center align-items-center">
     
     <!-- column 1 in the address row -->
@@ -46,6 +46,7 @@ export default {
     <!-- column 2 in the address row -->
         <div  class=" order-2 order-sm-4 order-xl-3 order-xxl-4 col-12 col-sm-5  col-xl-8 col-xxl-5  ">
             
+            <!-- OLD INPUT FIELD FOR ADDRESS TYPE 
             <template v-if="data.adresse_id">
             <div class="form-underline ">
             <div class="form-underline-titel">Typ</div>
@@ -54,6 +55,7 @@ export default {
             </div>
             </template>
             <template v-else>
+            -->
             
         
     
diff --git a/public/js/components/Cis/Profil/ProfilComponents/EditKontakt.js b/public/js/components/Cis/Profil/ProfilComponents/EditKontakt.js
index a00a56bfd..2343e7dfb 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/EditKontakt.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/EditKontakt.js
@@ -10,6 +10,7 @@ export default {
     },
     methods:{
         updateValue: function(event,bind){
+
             if(bind === 'zustellung'){
                 this.data[bind] = event.target.checked;    
             }else{
@@ -38,7 +39,6 @@ export default {
     },
     template:
     `
-    
     <div class="gy-3 row align-items-center justify-content-center">
     
     <div v-if="!data.kontakt_id" class="col-12">
diff --git a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
index 50dcc1440..cd70ab62c 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
@@ -30,13 +30,13 @@ export default {
         },
         getView: function(topic,status){
             switch(topic){
-                case "Private Kontakte" : return "EditKontakt"; break;
-                case "Private Adressen" : return "EditAdresse"; break;
-                case "Add Adressen" : return "EditAdresse"; break;
-                case "Add Kontakte" : return "EditKontakt"; break;
+                case "Private Kontakte" : return status ==='pending'? "EditKontakt": "Status"; break;
+                case "Private Adressen" : return status ==='pending'? "EditAdresse": "Status"; break;
+                case "Add Adressen" : return status ==='pending'? "EditAdresse": "Status"; break;
+                case "Add Kontakte" : return status ==='pending'? "EditKontakt": "Status"; break;
                 case "Delete Adressen" :  return status ==='pending'? "Adresse": "Status" ; break;
                 case "Delete Kontakte" : return status ==='pending'? "Kontakt": "Status"; break;
-                default: return "text_input"; break;
+                default: return status ==='pending'? "text_input": "Status"; break;
             }
         },
         openModal(updateRequest) {
@@ -45,15 +45,19 @@ export default {
             let view = this.getView(updateRequest.topic,updateRequest.status);
             let data = null;
             let content =null;
-            if(view === 'text_input'){
-               //TODO:  change data handling for text_input component to accept the data in the same way as the other components
+
+            if(view === "text_input"){
+                
                 data = {
-                        titel:updateRequest.topic,
-                        value:updateRequest.requested_change,
-                    };
-            }else{
+                    titel:updateRequest.topic,
+                    value: updateRequest.requested_change,
+                };
+            }
+            else{
                 data = updateRequest.requested_change;
             }
+                
+           
 
             content={
                 view:view,
@@ -130,7 +134,7 @@ export default {
                 <template v-if="item.status === 'pending'">
                 <td>
                 <template v-if="item.topic.toLowerCase().includes('delete')">
-                <!-- old edit view for delete requests <div class="align-middle text-center" >{{item.requested_change.adr_typ?item.requested_change.adr_typ:item.requested_change.kontakt}}</div>-->
+                
                 <div  class="align-middle text-center"><i style="color:gray" role="button" @click="openModal(item)" class="fa fa-eye"></i></div>
                 </template>
                 <template v-else >
diff --git a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
index ee8485bf7..284cea8c7 100644
--- a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
+++ b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
@@ -45,7 +45,7 @@ export default {
   methods: {
     acceptRequest: function(){
       console.log(this.data.profil_update_id);
-      Vue.$fhcapi.ProfilUpdate.acceptProfilRequest(this.data.profil_update_id).then(res =>{
+      Vue.$fhcapi.ProfilUpdate.acceptProfilRequest(this.data).then(res =>{
         console.log("res",res);
         console.log("res.data",res.data);
         this.result = true;
@@ -55,7 +55,7 @@ export default {
 
     denyRequest: function(){
       console.log(this.data.profil_update_id);
-      Vue.$fhcapi.ProfilUpdate.denyProfilRequest(this.data.profil_update_id).then(res =>{
+      Vue.$fhcapi.ProfilUpdate.denyProfilRequest(this.data).then(res =>{
         console.log("res",res);
         console.log("res.data",res.data);
         this.result = true;
@@ -116,44 +116,97 @@ export default {
 
 
     <template v-slot:default>
-    <pre>{{JSON.stringify(data.profil_update_id,null,2)}}</pre>
+   
     <!-- debugging prints 
+    <pre>{{JSON.stringify(data.profil_update_id,null,2)}}</pre>
     <pre>view {{getComponentView}}</pre>
     <pre>topic {{JSON.stringify(data.topic,null,2)}}</pre>
     <pre>data {{JSON.stringify(data.requested_change,null,2)}}</pre>
     -->
+    <div class="row">
+    <div  class="form-underline mb-2 col">
+      <div class="form-underline-titel">Status: </div>
 
-    <div  class="form-underline mb-2">
+      <span  class="form-underline-content" >{{data.status}}</span>
+    </div>
+
+
+    <div  class="form-underline mb-2 col">
+      <div class="form-underline-titel">Date of Status: </div>
+
+      <span  class="form-underline-content" >{{data.status_timestamp}}</span>
+    </div>
+
+
+    
+    <div  class="form-underline mb-2 col">
+      <div class="form-underline-titel">Status message: </div>
+
+      <span  class="form-underline-content" >{{data.status_message? data.status_message : '-'}}</span>
+    </div>
+
+
+
+
+    <div  class="form-underline mb-2 col">
       <div class="form-underline-titel">UserID: </div>
 
       <span  class="form-underline-content" >{{data.uid}}</span>
     </div>
 
-    <div  class="form-underline mb-2">
+
+
+
+    <div  class="form-underline mb-2 col">
       <div class="form-underline-titel">Topic of Request: </div>
 
       <span  class="form-underline-content" >{{data.topic}}</span>
     </div>
 
-    <div  class="form-underline mb-2">
+
+
+
+    <div  class="form-underline mb-2 col">
       <div class="form-underline-titel">Date of Request:</div>
 
       <span  class="form-underline-content" >{{data.change_timestamp}}</span>
     </div>
 
+    </div>
+
+    <div class="row my-4">
+    <div class="col ">
+    <div class="card">
+    <div class="card-header">update</div>
+    <div class="card-body">
+    
     <div v-if="getComponentView==='text_input'" class="form-underline mb-2">
       <div class="form-underline-titel">{{data.topic}}</div>
 
       <span  class="form-underline-content" >{{data.requested_change}}</span>
     </div>
-    
+
+
     <component v-else :is="getComponentView" :data="data.requested_change"></component>
+    </div>
+    </div>
+    </div>
+    </div>
+    
     </template>
     
 
-    <template   v-slot:footer>
-     <button @click="acceptRequest" class="btn btn-primary">Accept <i class="fa fa-check"></i></button>
-     <button @click="denyRequest" class="btn btn-danger">Deny <i class="fa fa-xmark"></i></button>
+    <template v-if="data.status === 'pending'"  v-slot:footer>
+    <div  class="form-underline flex-fill">
+      <div class="form-underline-titel">Message</div>
+
+      <div class="d-flex flex-row gap-2">
+        <input  class="form-control " v-model="data.status_message"  >
+        <button  @click="acceptRequest" class="text-nowrap btn btn-primary">Accept <i class="fa fa-check"></i></button>
+        <button @click="denyRequest" class="text-nowrap btn btn-danger">Deny <i class="fa fa-xmark"></i></button>
+      </div>
+    </div>
+     
     </template>
   
     </bs-modal>`,

From 13f2bb4e853b04eced9a5b0498e403c365eb1ced Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 23 Jan 2024 11:40:02 +0100
Subject: [PATCH 0343/1461] fixes little bug where status timestamp was
 converted from null to the current date, with create_date in php

---
 application/controllers/Cis/Profil.php                    | 3 +--
 application/models/person/Profil_change_model.php         | 5 +++--
 public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index 20fb65e22..b9e0b6f36 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -72,8 +72,7 @@ class Profil extends Auth_Controller
 		$_GET = json_decode($this->input->raw_input_stream, true);
 		$uid = $this->input->get('uid');
 		$id = $this->input->get('id');
-		echo $uid;
-		echo $id;
+		
 		
 		if($uid && $id){
 			$res= $this->ProfilChangeModel->getProfilUpdate($uid, $id);
diff --git a/application/models/person/Profil_change_model.php b/application/models/person/Profil_change_model.php
index b8c487a5a..0877b4bcc 100644
--- a/application/models/person/Profil_change_model.php
+++ b/application/models/person/Profil_change_model.php
@@ -46,10 +46,11 @@ class Profil_change_model extends DB_Model
 			// catch error
 		}else{
 			if(hasData($res)){
+				
 				foreach($res->retval as $update){
 					$update->requested_change = json_decode($update->requested_change);
-					$update->change_timestamp = date_create($update->change_timestamp)->format('d.m.Y');
-					$update->status_timestamp = date_create($update->status_timestamp)->format('d.m.Y');
+					$update->change_timestamp = !is_null($update->change_timestamp)?date_create($update->change_timestamp)->format('d.m.Y'):null;
+					$update->status_timestamp = !is_null($update->status_timestamp)?date_create($update->status_timestamp)->format('d.m.Y'):null;
 				}
 			}
 		}
diff --git a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
index 284cea8c7..ce446bbdc 100644
--- a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
+++ b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
@@ -133,15 +133,15 @@ export default {
 
     <div  class="form-underline mb-2 col">
       <div class="form-underline-titel">Date of Status: </div>
-
-      <span  class="form-underline-content" >{{data.status_timestamp}}</span>
+      <!-- only status timestamp and status message can be null in the database -->
+      <span  class="form-underline-content" >{{data.status_timestamp?data.status_timestamp:'-'}}</span>
     </div>
 
 
     
     <div  class="form-underline mb-2 col">
       <div class="form-underline-titel">Status message: </div>
-
+      <!-- only status timestamp and status message can be null in the database -->
       <span  class="form-underline-content" >{{data.status_message? data.status_message : '-'}}</span>
     </div>
 

From e513550cba0f94982080b70b2ebd145b043237df Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 23 Jan 2024 13:22:26 +0100
Subject: [PATCH 0344/1461] bugfix eingabe textarea Tinymce

---
 public/js/components/Notiz/Notiz.js | 79 ++++++++---------------------
 1 file changed, 22 insertions(+), 57 deletions(-)

diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index 14e34ee58..d965ce3ac 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -31,7 +31,10 @@ export default {
 		return {
 			multiupload: true,
 			mitarbeiter: [],
-			filteredMitarbeiter: []
+			filteredMitarbeiter: [],
+			zwischenvar: '',
+			editorInitialized: false,
+			editor: null
 		}
 	},
 	computed: {
@@ -132,77 +135,45 @@ export default {
 				});
 		},
 		initTinyMCE() {
-			//const vm = this.intText;
+
+			const vm = this;
 			tinymce.init({
-				selector: '#editor',
-/*				selector: `#${this.$refs.editor.id}`,*/
+				target: this.$refs.editor, //Important: not selector: to enable multiple import of component
 				//height: 800,
 				plugins: ['lists'],
-/*				toolbar: "undo redo | blocks | bold italic | alignleft aligncenter alignright alignjustify | outdent indent",*/
-				toolbar: "undo redo",
-
+				toolbar: "undo redo | blocks | bold italic | alignleft aligncenter alignright alignjustify | outdent indent",
 				autoresize_bottom_margin: 16,
-				setup: (editor) => {
 
-					// workaround for avoiding conflict id of frame: same Id as textarea
-					// working just for new notes
-					//solution for update notes: now working
-					//todo(manu) but now: cursor position!!
+				setup: (editor) => {
+					vm.editor = editor;
 
 					editor.on('input', () => {
-
 						const newContent = editor.getContent();
-/*						const contentLength = newContent.length;
-						console.log(contentLength);
-
-						editor.selection.setCursorLocation(editor.getBody(), contentLength);*/
-						this.intText = newContent;
-
+						vm.intText =  newContent;
 					});
-
-/*					editor.on('change', () => {
-						const newContent = editor.getContent();
-						const contentLength = newContent.length;
-
-						//editor.selection.setCursorLocation(editor.getBody(), contentLength);
-
-						// Vue-Instanz-Referenz (vm), um auf die Daten zuzugreifen
-						this.intText = newContent;
-					});*/
 				},
 			});
 		},
-		updateContent(event) {
-			// Manually update the content when the textarea is edited
-			tinymce.get('editor').setContent(event.target.value);
-			//console.log(event.target.value);
-		},
 	},
 	mounted() {
 		this.initTinyMCE();
 	},
 	watch: {
-		intText: function(newVal, oldVal) {
-			// Überprüfen, ob sich der Wert von intText geändert hat
-			if (newVal !== oldVal) {
-
-				const editor = tinymce.get('editor');
-
-				// Aktualisieren Inhalt des Editors
-				editor.setContent(newVal);
-				//tinymce.get(this.$refs.editor.id).setContent(newVal);
+		intText: function(newVal) {
+			const tinymcsVal = this.editor.getContent();
 
+			if (tinymcsVal != newVal) {
+				//Inhalt des Editors aktualisieren
+				this.editor.setContent(newVal);
 			}
 		},
 	},
 	beforeDestroy() {
-		tinymce.get('editor').destroy();
-/*		tinymce.get(this.$refs.editor.id).destroy();*/
+		this.editor.destroy();
 	},
 	template: `
 	<div class="notiz-notiz">
 	
-<!--		<span v-for="(anhang,index) in intAnhang"> {{anhang.name}} | {{anhang.type}} | {{anhang.size}} {{index}}<br></span>-->
 		<form ref="form" @submit.prevent class="row">
 			<div>
 				<div class="row mb-3">
@@ -227,18 +198,12 @@ export default {
 							
 				<div class="row mb-3">
 					<label for="text" class="form-label col-sm-2">Text</label>
-					
-					<!--tinymce-->
+								
+					<!-- TinyMce 5 -->
 					<div class="col-sm-7">
-						<!--<textarea id="editor" rows="5" cols="75" @input="updateContent" class="form-control">{{ intText }}</textarea>-->
-						<textarea id="editor" rows="5" cols="75" :value="intText" @input="updateContent" class="form-control"></textarea>
-
+						<textarea ref="editor" rows="5" cols="75" class="form-control"></textarea>
 					</div>
-					
-					<!--	oldversion-->
-<!--					<div class="col-sm-7">
-						<textarea rows="5" cols="75" v-model="intText" class="form-control"></textarea>
-					</div>-->
+				
 				</div>
 	
 			<!-- show Documentupload-->
@@ -313,7 +278,7 @@ export default {
 					
 		</form>
 		
-		intText: {{intText}}
+		<!--intText: {{intText}}-->
 
 
 	</div>`

From 2f5d93daa226bccd193a6a45399c14d5247e0006 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 23 Jan 2024 13:38:47 +0100
Subject: [PATCH 0345/1461] change config-ul auf config

---
 public/js/components/Stv/Studentenverwaltung/Details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details.js b/public/js/components/Stv/Studentenverwaltung/Details.js
index d502adc5e..c34cf2684 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details.js
@@ -33,8 +33,8 @@ export default {
 					<h2 class="h4">{{students[0].titlepre}} {{students[0].vorname}} {{students[0].nachname}} {{students[0].titlepost}}</h2>
 				</div>
 			</div>
-			<fhc-tabs v-if="students.length == 1" ref="tabs" :modelValue="students[0]" config-url="/components/stv/config/student" :default="$route.params.tab" style="flex: 1 1 0%; height: 0%" @changed="reload"></fhc-tabs>
-			<fhc-tabs v-else ref="tabs" :modelValue="students" config-url="/components/stv/config/students" :default="$route.params.tab" style="flex: 1 1 0%; height: 0%" @changed="reload"></fhc-tabs>
+			<fhc-tabs v-if="students.length == 1" ref="tabs" :modelValue="students[0]" config="/components/stv/config/student" :default="$route.params.tab" style="flex: 1 1 0%; height: 0%" @changed="reload"></fhc-tabs>
+			<fhc-tabs v-else ref="tabs" :modelValue="students" config="/components/stv/config/students" :default="$route.params.tab" style="flex: 1 1 0%; height: 0%" @changed="reload"></fhc-tabs>
 		</div>
 	</div>`
 };
\ No newline at end of file

From 5f55834ccf26bb74745c475fbc33f7656cac306b Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 23 Jan 2024 18:03:38 +0100
Subject: [PATCH 0346/1461] controller functionality to apply profil update
 requests to the user

---
 application/controllers/Cis/Profil.php        |  7 ++-
 application/controllers/Cis/ProfilUpdate.php  | 57 +++++++++++++++++++
 public/js/apps/Cis/ProfilUpdateRequests.js    | 11 ++--
 public/js/components/Cis/Profil/EditProfil.js |  1 +
 .../Cis/Profil/ProfilComponents/Adresse.js    |  2 +-
 .../Profil/ProfilComponents/EditAdresse.js    | 18 ++----
 6 files changed, 74 insertions(+), 22 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index b9e0b6f36..381d13a67 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -120,9 +120,10 @@ class Profil extends Auth_Controller
 			if(isset($payload->add)){
 				//TODO: add functionality for adding a new kontakt or address
 	
-			}elseif($update_request->topic == $json->topic && $update_request->uid == $this->uid){
+			}elseif($update_request->topic == $json->topic ){
+				
 				//? if it is not a delete or add request than the topic in combination with the uid of the user have to be unique
-				echo json_encode(error("A request to change " + $json->topic + " is already open"));
+				echo json_encode(error("A request to change " . $json->topic . " is already open"));
 				return;
 			}
 		}}
@@ -477,7 +478,7 @@ class Profil extends Auth_Controller
 
 		if (
 
-			isSuccess($adresse_res = $this->AdresseModel->addSelect(["adresse_id","strasse", "tbl_adressentyp.bezeichnung as adr_typ", "plz", "ort"])) &&
+			isSuccess($adresse_res = $this->AdresseModel->addSelect(["adresse_id","strasse", "tbl_adressentyp.bezeichnung as typ", "plz", "ort"])) &&
 			isSuccess($adresse_res = $this->AdresseModel->addOrder("zustelladresse", "DESC")) &&
 			isSuccess($adresse_res = $this->AdresseModel->addOrder("sort")) &&
 			isSuccess($adresse_res = $this->AdresseModel->addJoin("tbl_adressentyp", "typ=adressentyp_kurzbz"))
diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
index c82096020..32b54ac8e 100644
--- a/application/controllers/Cis/ProfilUpdate.php
+++ b/application/controllers/Cis/ProfilUpdate.php
@@ -22,6 +22,10 @@ class ProfilUpdate extends Auth_Controller
 		$this->pid = getAuthPersonID();
 
 		$this->load->model('person/Profil_change_model','ProfilChangeModel');
+		$this->load->model('person/Kontakt_model','KontaktModel');
+		$this->load->model('person/Adresse_model','AdresseModel');
+		$this->load->model('person/Adressentyp_model', 'AdressenTypModel');
+		$this->load->model('person/Person_model','PersonModel');
 	}
 
 
@@ -39,7 +43,60 @@ class ProfilUpdate extends Auth_Controller
 		$_POST = json_decode($this->input->raw_input_stream,true);
 		
 		$id = $this->input->post('profil_update_id',true);
+		$uid = $this->input->post('uid',true);	
 		$status_message = $this->input->post('status_message',true);
+		$topic = $this->input->post('topic',true);
+		$requested_change = $this->input->post('requested_change',true);
+		
+		
+		print_r($_POST);
+		//! PROPERTY EXISTS DOES NOT WORK FOR ASSOCIATIVE ARRAYS
+		if(property_exists($requested_change,"adresse_id")){
+			echo 'if';
+			return;
+
+			$this->AdressenTypModel->addSelect(["adressentyp_kurzbz"]);
+			$adr_kurzbz = $this->AdressenTypModel->loadWhere(["bezeichnung"=>$requested_change['typ']]);
+			$adr_kurzbz = hasData($adr_kurzbz)? getData($adr_kurzbz)[0]->adressentyp_kurzbz : null;
+			//? replace the address_typ with its correct kurzbz foreign key
+			$requested_change['typ']= $adr_kurzbz;
+			
+			$adresse_id = $requested_change["adresse_id"];
+			//? removes the adresse_id because we don't want to update the kontakt_id in the database
+			unset($requested_change["adresse_id"]);
+
+			$res = $this->AdresseModel->update($adresse_id, $requested_change);
+			echo json_encode($res);
+		}else if (property_exists($requested_change,"kontakt_id")){
+			echo 'else if';
+			return;
+			
+			$kontakt_id = $requested_change["kontakt_id"];
+			//? removes the kontakt_id because we don't want to update the kontakt_id in the database
+			unset($requested_change["kontakt_id"]);
+			
+			
+			$res = $this->KontaktModel->update($kontakt_id,$requested_change);
+			
+			echo json_encode($res);
+
+		}else{
+			echo 'else';
+			return;
+			//? fetching person_id using UID
+			$personID = $this->PersonModel->getByUid($uid);
+			$personID = hasData($personID)? getData($personID)[0]->person_id : null;
+			
+			switch($topic){
+				case "titel": $topic ="titelpre"; break;
+				case "postnomen": $topic = "titelpost"; break;
+			}
+			$res = $this->PersonModel->update($personID,[$topic=>$requested_change]);
+		
+			echo json_encode($res);
+		}
+
+		return;
 		if(isset($id)){
 			$res =$this->ProfilChangeModel->update([$id], ["status"=>"accepted","status_timestamp"=>"NOW()","status_message"=>$status_message]);
 			echo json_encode($res);
diff --git a/public/js/apps/Cis/ProfilUpdateRequests.js b/public/js/apps/Cis/ProfilUpdateRequests.js
index c45283876..3ce881116 100644
--- a/public/js/apps/Cis/ProfilUpdateRequests.js
+++ b/public/js/apps/Cis/ProfilUpdateRequests.js
@@ -4,9 +4,7 @@ import AcceptDenyUpdate from "../../components/Cis/ProfilUpdate/AcceptDenyUpdate
 Vue.$fhcapi = fhcapifactory;
 
 
-let printIcon= function(cell, formatterParams, onRendered){ //plain text value
-  return "<i class='fa fa-eye'></i>";
-};
+
 
 const app = Vue.createApp({
     components:{
@@ -27,12 +25,15 @@ const app = Vue.createApp({
                       field: "topic",
                       resizable: true,
                       minWidth: 200,
+                      headerFilter: true,
                       //responsive:0,
                     },
                     {
                       title: "UID",
                       field: "uid",
                       minWidth: 200,
+                      resizable:true,
+                      headerFilter: true,
                       //responsive:0,
                     },
                    
@@ -40,6 +41,7 @@ const app = Vue.createApp({
                       title: "Date",
                       field: "change_timestamp",
                       resizable: true,
+                      headerFilter: true,
                       minWidth: 200,
                       //responsive:0,
                     },
@@ -47,6 +49,7 @@ const app = Vue.createApp({
                       title: "Status",
                       field: "status",
                       hozAlign:'center',
+                      headerFilter: true,
                       formatter: function(cell,para){
                         let res =Object.getPrototypeOf(cell);
                         //console.log(res);
@@ -65,7 +68,7 @@ const app = Vue.createApp({
                     },
                     {
                       title: "View",
-                      formatter:printIcon,
+                      formatter:function(){ return "<i class='fa fa-eye'></i>";},
                       resizable: true,
                       minWidth: 200,
                       hozAlign: 'center',
diff --git a/public/js/components/Cis/Profil/EditProfil.js b/public/js/components/Cis/Profil/EditProfil.js
index 316d6966f..4928b72e8 100644
--- a/public/js/components/Cis/Profil/EditProfil.js
+++ b/public/js/components/Cis/Profil/EditProfil.js
@@ -53,6 +53,7 @@ export default {
           }else{
             this.result= false;
             this.hide();
+            console.log(res.data);
             Alert.popup("Ein Fehler ist aufgetreten: "+ JSON.stringify(res.data.retval));
           } 
          
diff --git a/public/js/components/Cis/Profil/ProfilComponents/Adresse.js b/public/js/components/Cis/Profil/ProfilComponents/Adresse.js
index d7ca5b199..1c2d3b442 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/Adresse.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/Adresse.js
@@ -32,7 +32,7 @@ export default {
 
             <div class="form-underline ">
             <div class="form-underline-titel">Typ</div>
-            <span class="form-underline-content">{{data.adr_typ}} </span>
+            <span class="form-underline-content">{{data.typ}} </span>
             </div>
 
         </div>
diff --git a/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js b/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
index e6dda6bb8..183f8fd8d 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
@@ -14,7 +14,7 @@ export default {
     },
     computed:{
         isChanged: function(){
-            if(!this.data.strasse || !this.data.plz || !this.data.ort || !this.data.adr_typ){
+            if(!this.data.strasse || !this.data.plz || !this.data.ort || !this.data.typ){
                
                 return false;
             }
@@ -26,8 +26,7 @@ export default {
         
     },
     template:`
-    
-    <div class="gy-3 row justify-content-center align-items-center">
+     <div class="gy-3 row justify-content-center align-items-center">
     
     <!-- column 1 in the address row -->
     
@@ -46,23 +45,14 @@ export default {
     <!-- column 2 in the address row -->
         <div  class=" order-2 order-sm-4 order-xl-3 order-xxl-4 col-12 col-sm-5  col-xl-8 col-xxl-5  ">
             
-            <!-- OLD INPUT FIELD FOR ADDRESS TYPE 
-            <template v-if="data.adresse_id">
-            <div class="form-underline ">
-            <div class="form-underline-titel">Typ</div>
-            <input  class="form-control" :value="data.adr_typ" @input="updateValue($event,'adr_typ')" :placeholder="data.adr_typ">
-        
-            </div>
-            </template>
-            <template v-else>
-            -->
+            
             
         
     
             <div  class="form-underline">
                 <div class="form-underline-titel">Kontakttyp</div>
         
-                <select :value="data.adr_typ" @change="updateValue($event,'adr_typ')" class="form-select" aria-label="Select Kontakttyp">
+                <select :value="data.typ" @change="updateValue($event,'typ')" class="form-select" aria-label="Select Kontakttyp">
                     <option selected></option>
                     <option value="Rechnungsadresse">Rechnungsadresse</option>
                     <option value="Nebenwohnsitz">Nebenwohnsitz</option>

From b8c885c8a4a25e777a1a52fce65d40a57b234b20 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 24 Jan 2024 09:04:53 +0100
Subject: [PATCH 0347/1461] Remove  html-Tags in tabulator text

---
 .../controllers/components/stv/Notiz.php        |  4 +---
 application/models/person/Notiz_model.php       |  3 ++-
 public/js/components/Notiz/Notiz.js             | 17 ++++++++++++++---
 .../Stv/Studentenverwaltung/Details/Notizen.js  | 14 +++++++++-----
 4 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/application/controllers/components/stv/Notiz.php b/application/controllers/components/stv/Notiz.php
index 4c999b7c1..a73014b59 100644
--- a/application/controllers/components/stv/Notiz.php
+++ b/application/controllers/components/stv/Notiz.php
@@ -107,11 +107,9 @@ class Notiz extends FHC_Controller
 		if(isset($_POST['typeId']))
 			$type = $this->input->post('typeId');
 
-		//var_dump($_POST);
-
 		if(!$type)
 		{
-			$result = error('kein Type für ID vorhanden', EXIT_ERROR);
+			$result = error('kein Type für ID vorhanden', ERROR);
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 
 			return $this->outputJson(getError($result));
diff --git a/application/models/person/Notiz_model.php b/application/models/person/Notiz_model.php
index 5684bf3ed..ea0d7d361 100644
--- a/application/models/person/Notiz_model.php
+++ b/application/models/person/Notiz_model.php
@@ -293,7 +293,8 @@ class Notiz_model extends DB_Model
 			    	TO_CHAR (CASE 
 						WHEN n.updateamum >= n.insertamum THEN n.updateamum 
 						ELSE n.insertamum
-					END::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS lastUpdate
+					END::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS lastUpdate,
+			    	regexp_replace(n.text, '<[^>]*>', '', 'g') as text_stripped
 			FROM
 			    	public.tbl_notiz n
 			JOIN 
diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index d965ce3ac..bafaa5479 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -140,8 +140,19 @@ export default {
 			tinymce.init({
 				target: this.$refs.editor, //Important: not selector: to enable multiple import of component
 				//height: 800,
-				plugins: ['lists'],
-				toolbar: "undo redo | blocks | bold italic | alignleft aligncenter alignright alignjustify | outdent indent",
+				//plugins: ['lists'],
+				//toolbar: " blocks | bold italic underline | alignleft aligncenter alignright alignjustify",
+				toolbar: 'styleselect | bold italic underline | alignleft aligncenter alignright alignjustify',
+				style_formats: [
+					{ title: 'Blocks', block: 'div' },
+					{ title: 'Paragraph', block: 'p' },
+					{ title: 'Heading 1', block: 'h1' },
+					{ title: 'Heading 2', block: 'h2' },
+					{ title: 'Heading 3', block: 'h3' },
+					{ title: 'Heading 4', block: 'h4' },
+					{ title: 'Heading 5', block: 'h5' },
+					{ title: 'Heading 6', block: 'h6' },
+				],
 				autoresize_bottom_margin: 16,
 
 				setup: (editor) => {
@@ -278,7 +289,7 @@ export default {
 					
 		</form>
 		
-		<!--intText: {{intText}}-->
+	<!--	intText: {{intText}}-->
 
 
 	</div>`
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
index f31cf745a..0b19280d3 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
@@ -24,15 +24,14 @@ export default {
 		return {
 			tabulatorOptions: {
 				ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Notiz/getNotizen/' + this.modelValue.person_id + '/person_id'),
-				//ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Notiz/getNotizen/' + this.modelValue.person_id + '/' + this.typeId),
+				//ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Notiz/getNotizen/' + this.modelValue.person_id + '/' + this.formData.typeId),
 				columns: [
 					{title: "Titel", field: "titel"},
-					{title: "Text", field: "text", width: 350},
+					{title: "Text", field: "text_stripped", width: 350},
 					{title: "VerfasserIn", field: "verfasser_uid"},
 					{title: "BearbeiterIn", field: "bearbeiter_uid", visible: false},
 					{title: "Start", field: "start", visible: false},
 					{title: "Ende", field: "ende", visible: false},
-					/*					{title: "Dokumente", field: "dms_id"},*/
 					{title: "Dokumente", field: "countdoc"},
 					{title: "Erledigt", field: "erledigt", visible: false},
 					{title: "Notiz_id", field: "notiz_id", visible: false},
@@ -54,8 +53,14 @@ export default {
 				layout: 'fitDataFill',
 				layoutColumnsOnNewData: false,
 				height: '150',
+				selectableRangeMode: 'click',
 				selectable: true,
-				index: 'notiz_id'
+				index: 'notiz_id',
+/*				rowClick: (e, row) => {
+					const notizId = row.getData().notiz_id;
+					console.log(notizId);
+					this.actionEditNotiz(notizId);
+				},*/
 			},
 			tabulatorEvents: [],
 			notizen: [],
@@ -132,7 +137,6 @@ export default {
 
 			formData.append('data', JSON.stringify(this.formData));
 			Object.entries(this.formData.anhang).forEach(([k, v]) => formData.append(k, v));
-
 			CoreRESTClient.post(
 				'components/stv/Notiz/addNewNotiz/' + this.modelValue.person_id,
 				formData,

From 20d6a345060ce4a0e45789a14d8b29af3f3f3ea8 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 24 Jan 2024 12:18:21 +0100
Subject: [PATCH 0348/1461] little style changes and adds name field to the
 public.tbl_cis_profil_update table

---
 application/controllers/Cis/Profil.php        |  9 +++++--
 .../models/person/Profil_change_model.php     |  1 +
 public/css/components/Profil.css              |  6 +++--
 public/js/apps/Cis/ProfilUpdateRequests.js    | 27 ++++++++++++-------
 .../ProfilComponents/FetchProfilUpdates.js    | 12 ++++-----
 .../Cis/ProfilUpdate/AcceptDenyUpdate.js      |  2 +-
 system/dbupdate_3.4/25999_C4_ma0594.php       |  4 ++-
 7 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index 381d13a67..cdd3ecde1 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -97,8 +97,13 @@ class Profil extends Auth_Controller
 		$payload = $json->payload;
 		$type = property_exists($json->payload,"kontakt_id")? "kontakt_id" : "adresse_id";
 		
-
-		$data = ["topic"=>$json->topic,"uid" => $this->uid, "requested_change" => json_encode($payload), "change_timestamp" => "NOW()","status"=>"pending" ];
+		$name = $this->PersonModel->getFullName($this->uid);
+		if(isError($name)){
+			// error handling
+			var_dump($name);
+			return;
+		}
+		$data = ["topic"=>$json->topic,"uid" => $this->uid, "name"=>getData($name), "requested_change" => json_encode($payload), "change_timestamp" => "NOW()","status"=>"pending" ];
 
 		//? loops over all updateRequests from a user to validate if the new request is valid
 		$res = $this->ProfilChangeModel->loadWhere(["uid"=>$this->uid]);
diff --git a/application/models/person/Profil_change_model.php b/application/models/person/Profil_change_model.php
index 0877b4bcc..9a229f308 100644
--- a/application/models/person/Profil_change_model.php
+++ b/application/models/person/Profil_change_model.php
@@ -51,6 +51,7 @@ class Profil_change_model extends DB_Model
 					$update->requested_change = json_decode($update->requested_change);
 					$update->change_timestamp = !is_null($update->change_timestamp)?date_create($update->change_timestamp)->format('d.m.Y'):null;
 					$update->status_timestamp = !is_null($update->status_timestamp)?date_create($update->status_timestamp)->format('d.m.Y'):null;
+					 
 				}
 			}
 		}
diff --git a/public/css/components/Profil.css b/public/css/components/Profil.css
index 31adc7fff..d9b725cb6 100644
--- a/public/css/components/Profil.css
+++ b/public/css/components/Profil.css
@@ -18,12 +18,14 @@
   height:22px; 
   width:21px; 
   background-color:white; 
-  position:absolute; 
-  top:0; 
+  position:absolute;
+  /* top: 1px is important, otherwise it goes over the border of the thumbnail*/ 
+  top:1px; 
   right:12px; 
   display:flex; 
   align-items:center;
   justify-content:center;
+  border-radius:3px;
 }
 
 .tabulator-collapsed-row{
diff --git a/public/js/apps/Cis/ProfilUpdateRequests.js b/public/js/apps/Cis/ProfilUpdateRequests.js
index 3ce881116..74f3e98c2 100644
--- a/public/js/apps/Cis/ProfilUpdateRequests.js
+++ b/public/js/apps/Cis/ProfilUpdateRequests.js
@@ -16,18 +16,10 @@ const app = Vue.createApp({
           
             profil_updates_table_options:{
               ajaxURL:FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/Cis/ProfilUpdate/getAllRequests',
-                height:300,
+                height:600,
                 layout:'fitColumns',
                 
                   columns: [
-                    {
-                      title: "Topic",
-                      field: "topic",
-                      resizable: true,
-                      minWidth: 200,
-                      headerFilter: true,
-                      //responsive:0,
-                    },
                     {
                       title: "UID",
                       field: "uid",
@@ -36,7 +28,22 @@ const app = Vue.createApp({
                       headerFilter: true,
                       //responsive:0,
                     },
-                   
+                    {
+                      title: "Name",
+                      field: "name",
+                      minWidth: 200,
+                      resizable:true,
+                      headerFilter: true,
+                      //responsive:0,
+                    },
+                    {
+                      title: "Topic",
+                      field: "topic",
+                      resizable: true,
+                      minWidth: 200,
+                      headerFilter: true,
+                      //responsive:0,
+                    },
                     {
                       title: "Date",
                       field: "change_timestamp",
diff --git a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
index cd70ab62c..4593fed74 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
@@ -104,14 +104,14 @@ export default {
     },
     template:`
    
-    <div  class="card">
+    <div  class="card text-nowrap" >
                       <div class="card-header">
                       Profil Updates
                       </div>
                       <div class="card-body" >
     <div class="table-responsive">
         <table class="m-0  table  table-hover">
-            <thead>
+            <thead >
                 <tr >
                 <th scope="col">Topic</th>
                 <th scope="col">Status</th>
@@ -125,7 +125,7 @@ export default {
             <tbody>
             <!-- :class="{'bg-success':item.status === 'accepted', 'bg-danger':item.status === 'rejected', 'text-white':item.status =='rejected' || item.status=='accepted'}" -->
                 <tr v-for="item in data" :style="item.status=='accepted'?'background-color:lightgreen':item.status==='rejected'?'background-color:lightcoral':''">
-                <td class="align-middle">{{item.topic}}</td>
+                <td class="align-middle text-wrap">{{item.topic}}</td>
                 <td class="align-middle text-center" >{{item.status}}</td>
                 <td class="align-middle">{{item.change_timestamp}}</td>
                 
@@ -135,7 +135,7 @@ export default {
                 <td>
                 <template v-if="item.topic.toLowerCase().includes('delete')">
                 
-                <div  class="align-middle text-center"><i style="color:gray" role="button" @click="openModal(item)" class="fa fa-eye"></i></div>
+                <div  class="align-middle text-center"><i role="button" @click="openModal(item)" class="fa fa-eye"></i></div>
                 </template>
                 <template v-else >
                 <div class="align-middle text-center" ><i style="color:#00639c" @click="openModal(item)" role="button" class="fa fa-edit"></i></div>
@@ -146,10 +146,10 @@ export default {
                 </td>
                 </template>
                 <template v-else-if="item.status === 'accepted'">
-                <td  class="align-middle text-center"><i style="color:gray" role="button" @click="openModal(item)" class="fa fa-eye"></i></td>
+                <td  class="align-middle text-center"><i  role="button" @click="openModal(item)" class="fa fa-eye"></i></td>
                 </template>
                 <template v-else-if="item.status === 'rejected'">
-                <td  class="align-middle text-center"><i style="color:gray" role="button" @click="openModal(item)" class="fa fa-eye"></i></td>
+                <td  class="align-middle text-center"><i  role="button" @click="openModal(item)" class="fa fa-eye"></i></td>
                 </template>
                 
                 
diff --git a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
index ce446bbdc..6b05a7bf3 100644
--- a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
+++ b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
@@ -202,7 +202,7 @@ export default {
 
       <div class="d-flex flex-row gap-2">
         <input  class="form-control " v-model="data.status_message"  >
-        <button  @click="acceptRequest" class="text-nowrap btn btn-primary">Accept <i class="fa fa-check"></i></button>
+        <button  @click="acceptRequest" class="text-nowrap btn btn-success">Accept <i class="fa fa-check"></i></button>
         <button @click="denyRequest" class="text-nowrap btn btn-danger">Deny <i class="fa fa-xmark"></i></button>
       </div>
     </div>
diff --git a/system/dbupdate_3.4/25999_C4_ma0594.php b/system/dbupdate_3.4/25999_C4_ma0594.php
index 151a727b2..1017ef94a 100644
--- a/system/dbupdate_3.4/25999_C4_ma0594.php
+++ b/system/dbupdate_3.4/25999_C4_ma0594.php
@@ -4,8 +4,9 @@
     {
         $qry = "CREATE TABLE public.tbl_cis_profil_update (
                 profil_update_id INTEGER NOT NULL,
-                topic VARCHAR(32) NOT NULL,
                 uid VARCHAR(32) NOT NULL,
+                name TEXT NOT NULL,
+                topic VARCHAR(32) NOT NULL,
                 requested_change jsonb NOT NULL,
                 change_timestamp TIMESTAMP NOT NULL,
                 status VARCHAR(32) NOT NULL,
@@ -22,6 +23,7 @@
 			 CACHE 1;
              
 		    ALTER TABLE public.tbl_cis_profil_update ALTER COLUMN profil_update_id SET DEFAULT nextval('public.tbl_cis_profil_update_id_seq');
+            ALTER SEQUENCE public.tbl_cis_profil_update_id_seq OWNED BY public.tbl_cis_profil_update.profil_update_id;
             ALTER TABLE public.tbl_cis_profil_update ADD CONSTRAINT tbl_cis_profil_update_restricted_status CHECK (status IN ('pending','accepted','rejected'));
             --ALTER TABLE public.tbl_cis_profil_update ADD CONSTRAINT cis_profil_udpate_topic_uid_unique UNIQUE (uid,topic);
 

From a390eefd75772e5ac59cab88be758fbcfc145a4a Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 24 Jan 2024 16:06:22 +0100
Subject: [PATCH 0349/1461] add/delete/update kontakt is possible

---
 application/controllers/Cis/Profil.php        |   7 +-
 application/controllers/Cis/ProfilUpdate.php  | 139 ++++++++++++------
 .../components/Cis/Profil/EditProfilSelect.js |  11 +-
 .../Profil/ProfilComponents/EditAdresse.js    |   1 +
 .../Profil/ProfilComponents/EditKontakt.js    |   8 +-
 .../Cis/ProfilUpdate/AcceptDenyUpdate.js      |  10 +-
 6 files changed, 115 insertions(+), 61 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index cdd3ecde1..80f168585 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -95,6 +95,7 @@ class Profil extends Auth_Controller
 
 		$json = json_decode($this->input->raw_input_stream);
 		$payload = $json->payload;
+	
 		$type = property_exists($json->payload,"kontakt_id")? "kontakt_id" : "adresse_id";
 		
 		$name = $this->PersonModel->getFullName($this->uid);
@@ -449,7 +450,8 @@ class Profil extends Auth_Controller
 		if (
 
 			//? kontaktdaten soll auch nur der user selbst sehen
-			isSuccess($this->KontaktModel->addSelect('DISTINCT ON (kontakttyp) kontakttyp, kontakt_id, kontakt, tbl_kontakt.anmerkung, tbl_kontakt.zustellung')) &&
+			//DISTINCT ON (kontakttyp)
+			isSuccess($this->KontaktModel->addSelect(['kontakttyp','kontakt_id','kontakt', 'tbl_kontakt.anmerkung', 'tbl_kontakt.zustellung'])) &&
 			isSuccess($this->KontaktModel->addJoin('public.tbl_standort', 'standort_id', 'LEFT')) &&
 			isSuccess($this->KontaktModel->addJoin('public.tbl_firma', 'firma_id', 'LEFT')) &&
 			isSuccess($this->KontaktModel->addOrder('kontakttyp, kontakt, tbl_kontakt.updateamum, tbl_kontakt.insertamum'))
@@ -664,7 +666,8 @@ class Profil extends Auth_Controller
 		if (
 
 			//? kontaktdaten soll auch nur der user selbst sehen
-			isSuccess($this->KontaktModel->addSelect('DISTINCT ON (kontakttyp) kontakttyp, kontakt_id, kontakt, tbl_kontakt.anmerkung, tbl_kontakt.zustellung')) &&
+			//DISTINCT ON (kontakttyp) 
+			isSuccess($this->KontaktModel->addSelect(['kontakttyp', 'kontakt_id', 'kontakt', 'tbl_kontakt.anmerkung', 'tbl_kontakt.zustellung'])) &&
 			isSuccess($this->KontaktModel->addJoin('public.tbl_standort', 'standort_id', 'LEFT')) &&
 			isSuccess($this->KontaktModel->addJoin('public.tbl_firma', 'firma_id', 'LEFT')) &&
 			isSuccess($this->KontaktModel->addOrder('kontakttyp, kontakt, tbl_kontakt.updateamum, tbl_kontakt.insertamum'))
diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
index 32b54ac8e..48760d0dc 100644
--- a/application/controllers/Cis/ProfilUpdate.php
+++ b/application/controllers/Cis/ProfilUpdate.php
@@ -17,9 +17,7 @@ class ProfilUpdate extends Auth_Controller
 			'denyProfilRequest'=>['user:r'],
 
 		]);
-		//? put the uid and pid inside the controller to reuse in controller
-		$this->uid = getAuthUID();
-		$this->pid = getAuthPersonID();
+		
 
 		$this->load->model('person/Profil_change_model','ProfilChangeModel');
 		$this->load->model('person/Kontakt_model','KontaktModel');
@@ -44,48 +42,27 @@ class ProfilUpdate extends Auth_Controller
 		
 		$id = $this->input->post('profil_update_id',true);
 		$uid = $this->input->post('uid',true);	
+		//? fetching person_id using UID
+		$personID = $this->PersonModel->getByUid($uid);
+		$personID = hasData($personID)? getData($personID)[0]->person_id : null;
 		$status_message = $this->input->post('status_message',true);
 		$topic = $this->input->post('topic',true);
-		$requested_change = $this->input->post('requested_change',true);
+		//! somehow the xss check converted boolean false to empty string
+		$requested_change = $this->input->post('requested_change');
+
+		//! check for required information
+		if(!isset($id) || !isset($uid) || !isset($personID) || !isset($requested_change) || !isset($topic)){
+			return json_encode(error("missing required information"));
+		}
 		
 		
-		print_r($_POST);
-		//! PROPERTY EXISTS DOES NOT WORK FOR ASSOCIATIVE ARRAYS
-		if(property_exists($requested_change,"adresse_id")){
-			echo 'if';
+		if(is_array($requested_change) && array_key_exists("adresse_id",$requested_change)){
+			$this->handleAdresse($requested_change);
 			return;
-
-			$this->AdressenTypModel->addSelect(["adressentyp_kurzbz"]);
-			$adr_kurzbz = $this->AdressenTypModel->loadWhere(["bezeichnung"=>$requested_change['typ']]);
-			$adr_kurzbz = hasData($adr_kurzbz)? getData($adr_kurzbz)[0]->adressentyp_kurzbz : null;
-			//? replace the address_typ with its correct kurzbz foreign key
-			$requested_change['typ']= $adr_kurzbz;
-			
-			$adresse_id = $requested_change["adresse_id"];
-			//? removes the adresse_id because we don't want to update the kontakt_id in the database
-			unset($requested_change["adresse_id"]);
-
-			$res = $this->AdresseModel->update($adresse_id, $requested_change);
-			echo json_encode($res);
-		}else if (property_exists($requested_change,"kontakt_id")){
-			echo 'else if';
-			return;
-			
-			$kontakt_id = $requested_change["kontakt_id"];
-			//? removes the kontakt_id because we don't want to update the kontakt_id in the database
-			unset($requested_change["kontakt_id"]);
-			
-			
-			$res = $this->KontaktModel->update($kontakt_id,$requested_change);
-			
-			echo json_encode($res);
-
+		}else if (is_array($requested_change) && array_key_exists("kontakt_id", $requested_change)){
+			$this->handleKontakt($requested_change, $personID);
 		}else{
-			echo 'else';
-			return;
-			//? fetching person_id using UID
-			$personID = $this->PersonModel->getByUid($uid);
-			$personID = hasData($personID)? getData($personID)[0]->person_id : null;
+			
 			
 			switch($topic){
 				case "titel": $topic ="titelpre"; break;
@@ -96,11 +73,9 @@ class ProfilUpdate extends Auth_Controller
 			echo json_encode($res);
 		}
 
-		return;
-		if(isset($id)){
-			$res =$this->ProfilChangeModel->update([$id], ["status"=>"accepted","status_timestamp"=>"NOW()","status_message"=>$status_message]);
-			echo json_encode($res);
-		} 
+		
+		echo json_encode($this->setStatusOnUpdateRequest($id, "accepted", $status_message));
+		 
 
 	}
 
@@ -110,12 +85,78 @@ class ProfilUpdate extends Auth_Controller
 		$id = $this->input->post('profil_update_id',true);
 		$status_message = $this->input->post('status_message',true);
 		
-		if(isset($id)){
-			$res = $this->ProfilChangeModel->update([$id],["status"=>"rejected","status_timestamp"=>"NOW()","status_mesage"=>$status_message]);
-			echo json_encode($res);
-			
-		}
+		
+		echo json_encode($this->setStatusOnUpdateRequest($id, "rejected", $status_message));
+		
 		
 
 	}
+
+	private function setStatusOnUpdateRequest($id, $status, $status_message){
+		return $this->ProfilChangeModel->update([$id],["status"=>$status,"status_timestamp"=>"NOW()","status_message"=>$status_message]);
+	}
+
+	private function handleKontakt($requested_change, $personID){
+		$kontakt_id = $requested_change["kontakt_id"];
+		//? removes the kontakt_id because we don't want to update the kontakt_id in the database
+		unset($requested_change["kontakt_id"]);
+		
+
+		//! ADD
+		if(array_key_exists('add',$requested_change) && $requested_change['add']){
+			//? removes add flag
+			unset($requested_change['add']);
+			//? fields like insertvon are not filled when inserting new row
+			$requested_change['person_id'] = $personID;
+			$res = $this->KontaktModel->insert($requested_change);
+		}
+		//! DELETE
+		elseif(array_key_exists('delete',$requested_change) && $requested_change['delete']){
+			$res = $this->KontaktModel->delete($kontakt_id);
+		}
+		//! UPDATE
+		else{
+			$res = $this->KontaktModel->update($kontakt_id,$requested_change);
+		}
+		return $res;
+	}
+
+	private function handleAdresse($requested_change){
+
+		$this->AdressenTypModel->addSelect(["adressentyp_kurzbz"]);
+		$adr_kurzbz = $this->AdressenTypModel->loadWhere(["bezeichnung"=>$requested_change['typ']]);
+		$adr_kurzbz = hasData($adr_kurzbz)? getData($adr_kurzbz)[0]->adressentyp_kurzbz : null;
+		//? replace the address_typ with its correct kurzbz foreign key
+		$requested_change['typ']= $adr_kurzbz;
+		
+		$adresse_id = $requested_change["adresse_id"];
+		//? removes the adresse_id because we don't want to update the kontakt_id in the database
+		unset($requested_change["adresse_id"]);
+
+		
+		//! ADD
+		if(array_key_exists('add',$requested_change) && $requested_change['add']){
+			//? removes add flag
+			unset($requested_change['add']);
+			echo "add";
+			var_dump($requested_change);
+			return;
+			$res = $this->AdresseModel->insert($requested_change);
+		}
+		//! DELETE
+		elseif(array_key_exists('delete',$requested_change) && $requested_change['delete']){
+			echo "delete";
+			var_dump($requested_change);
+			return;
+			$res = $this->AdresseModel->delete($adresse_id);
+		}
+		//! UPDATE
+		else{
+			echo "update";
+			var_dump($requested_change);
+			return;
+			$res = $this->AdresseModel->update($adresse_id,$requested_change);
+		}
+		return $res;
+	}
 }
\ No newline at end of file
diff --git a/public/js/components/Cis/Profil/EditProfilSelect.js b/public/js/components/Cis/Profil/EditProfilSelect.js
index b620c2848..706cec63e 100644
--- a/public/js/components/Cis/Profil/EditProfilSelect.js
+++ b/public/js/components/Cis/Profil/EditProfilSelect.js
@@ -66,14 +66,16 @@ export default {
         
         this.data= this.view=="EditAdresse"?
         {
-          added:true,
+          //? add flag
+          add:true,
           adresse_id: null,
           strasse: null,
-          adr_typ: null,
+          typ: null,
           plz: null,
           ort: null
         }: {
-          added:true,
+          //? add flag
+          add:true,
           kontakt_id: null,
           kontakttyp: null,
           kontakt: null,
@@ -85,7 +87,8 @@ export default {
       },
 
       deleteItem: function(item){
-        
+        //? delete flag 
+        item.data.delete = true;
         this.$emit('update:profilUpdate',item.data);
         //? updates the topic when a Kontakt or an Address should be deleted
         this.topic = item.data.kontakt?"Delete Kontakte":"Delete Adressen";
diff --git a/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js b/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
index 183f8fd8d..015a5ef5f 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
@@ -26,6 +26,7 @@ export default {
         
     },
     template:`
+   
      <div class="gy-3 row justify-content-center align-items-center">
     
     <!-- column 1 in the address row -->
diff --git a/public/js/components/Cis/Profil/ProfilComponents/EditKontakt.js b/public/js/components/Cis/Profil/ProfilComponents/EditKontakt.js
index 2343e7dfb..1b885be05 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/EditKontakt.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/EditKontakt.js
@@ -49,9 +49,13 @@ export default {
     
             <select :value="data.kontakttyp" @change="updateValue($event,'kontakttyp')" class="form-select" aria-label="Select Kontakttyp">
                 <option selected></option>
-                <option value="email">Email</option>
-                <option value="telefon">Telefon</option>
+                <option value="email">E-mail</option>
+                <option value="telefon">Telefonnummer</option>
                 <option value="notfallkontakt">Notfallkontakt</option>
+                <option value="mobil">Mobiltelefonnummer</option>
+                <option value="homepage">Homepage</option>
+                <option value="fax">Faxnummer</option>
+                
             </select>    
         </div>
         
diff --git a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
index 6b05a7bf3..f7cd05e31 100644
--- a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
+++ b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
@@ -44,7 +44,7 @@ export default {
 
   methods: {
     acceptRequest: function(){
-      console.log(this.data.profil_update_id);
+      
       Vue.$fhcapi.ProfilUpdate.acceptProfilRequest(this.data).then(res =>{
         console.log("res",res);
         console.log("res.data",res.data);
@@ -108,6 +108,7 @@ export default {
     return BsModal.popup.bind(this)(null, options);
   },
   template: `
+
   <bs-modal ref="modalContainer" v-bind="$props" body-class="" dialog-class="modal-lg" class="bootstrap-alert" backdrop="false" >
     
     <template v-slot:title>
@@ -116,14 +117,15 @@ export default {
 
 
     <template v-slot:default>
-   
+
     <!-- debugging prints 
     <pre>{{JSON.stringify(data.profil_update_id,null,2)}}</pre>
     <pre>view {{getComponentView}}</pre>
     <pre>topic {{JSON.stringify(data.topic,null,2)}}</pre>
-    <pre>data {{JSON.stringify(data.requested_change,null,2)}}</pre>
+    
     -->
-    <div class="row">
+    
+   <div class="row">
     <div  class="form-underline mb-2 col">
       <div class="form-underline-titel">Status: </div>
 

From 20672cd311d30e93653aa80d1ab32c98b5ed18d4 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 24 Jan 2024 17:03:06 +0100
Subject: [PATCH 0350/1461] add/delete/update von Adressen funktioniert

---
 application/controllers/Cis/ProfilUpdate.php | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
index 48760d0dc..8d3b6dc1f 100644
--- a/application/controllers/Cis/ProfilUpdate.php
+++ b/application/controllers/Cis/ProfilUpdate.php
@@ -57,8 +57,7 @@ class ProfilUpdate extends Auth_Controller
 		
 		
 		if(is_array($requested_change) && array_key_exists("adresse_id",$requested_change)){
-			$this->handleAdresse($requested_change);
-			return;
+			$this->handleAdresse($requested_change, $personID);
 		}else if (is_array($requested_change) && array_key_exists("kontakt_id", $requested_change)){
 			$this->handleKontakt($requested_change, $personID);
 		}else{
@@ -121,7 +120,7 @@ class ProfilUpdate extends Auth_Controller
 		return $res;
 	}
 
-	private function handleAdresse($requested_change){
+	private function handleAdresse($requested_change, $personID){
 
 		$this->AdressenTypModel->addSelect(["adressentyp_kurzbz"]);
 		$adr_kurzbz = $this->AdressenTypModel->loadWhere(["bezeichnung"=>$requested_change['typ']]);
@@ -138,23 +137,17 @@ class ProfilUpdate extends Auth_Controller
 		if(array_key_exists('add',$requested_change) && $requested_change['add']){
 			//? removes add flag
 			unset($requested_change['add']);
-			echo "add";
-			var_dump($requested_change);
-			return;
+			//? fields like insertvon are not filled when inserting new row
+			$requested_change['person_id'] = $personID;
+			//TODO: zustelladresse, heimatadresse, rechnungsadresse und nation werden nicht beachtet
 			$res = $this->AdresseModel->insert($requested_change);
 		}
 		//! DELETE
 		elseif(array_key_exists('delete',$requested_change) && $requested_change['delete']){
-			echo "delete";
-			var_dump($requested_change);
-			return;
 			$res = $this->AdresseModel->delete($adresse_id);
 		}
 		//! UPDATE
 		else{
-			echo "update";
-			var_dump($requested_change);
-			return;
 			$res = $this->AdresseModel->update($adresse_id,$requested_change);
 		}
 		return $res;

From 4653e070b186e6c484f308998a47ac76b91d03b4 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 25 Jan 2024 10:27:43 +0100
Subject: [PATCH 0351/1461] =?UTF-8?q?Notiztab:=20Phrasen=20f=C3=BCr=20Form?=
 =?UTF-8?q?=20und=20Tabulator=20Notiz,=20Update=20Actionbuttons?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/views/Studentenverwaltung.php     |   6 +-
 public/js/apps/Studentenverwaltung.js         |   2 +
 public/js/components/Notiz/Notiz.js           |  33 ++---
 .../Studentenverwaltung/Details/Notizen.js    |  96 +++++++++----
 system/phrasesupdate.php                      | 133 ++++++++++++++++++
 5 files changed, 223 insertions(+), 47 deletions(-)

diff --git a/application/views/Studentenverwaltung.php b/application/views/Studentenverwaltung.php
index 4fbc0fecd..01b616397 100644
--- a/application/views/Studentenverwaltung.php
+++ b/application/views/Studentenverwaltung.php
@@ -9,7 +9,11 @@
 		#'filtercomponent' => true,
 		'tabulator5' => true,
 		'tinymce5' => true,
-		'phrases' => [],
+		'phrases' => array(
+			'global',
+			'ui',
+			'notiz',
+		),
 		'customCSSs' => [
 			'public/css/components/vue-datepicker.css',
 			'public/css/components/primevue.css',
diff --git a/public/js/apps/Studentenverwaltung.js b/public/js/apps/Studentenverwaltung.js
index a8eb5a578..e1dacf792 100644
--- a/public/js/apps/Studentenverwaltung.js
+++ b/public/js/apps/Studentenverwaltung.js
@@ -19,6 +19,7 @@ import FhcStudentenverwaltung from "../components/Stv/Studentenverwaltung.js";
 import fhcapifactory from "./api/fhcapifactory.js";
 
 import FhcAlert from "../plugin/FhcAlert.js";
+import FhcPhrasen from "../plugin/Phrasen.js";
 
 //import PrimeVue form "../../../../index.ci.php/public/js/components/primevue/config/config.esm.min.js");
 //const PrimeVue = await import(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + "/public/js/components/primevue/config/config.esm.min.js").default;
@@ -47,5 +48,6 @@ import(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_route
 			}
 		})
 		.use(FhcAlert)
+		.use(FhcPhrasen)
 		.mount('#main');
 });
diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index bafaa5479..c3eead4bb 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -4,6 +4,7 @@ import File from '../Form/Upload/File.js';
 import FormUploadDms from '../Form/Upload/Dms.js';
 import {CoreRESTClient} from "../../RESTClient";
 
+
 export default {
 	components: {
 		VueDatePicker,
@@ -115,7 +116,6 @@ export default {
 				return this.anhang;
 			},
 			set(value) {
-				//console.log(value);
 				this.$emit('update:anhang', value);
 			}
 		}
@@ -130,7 +130,6 @@ export default {
 			return CoreRESTClient
 				.get('components/stv/Notiz/getMitarbeiter/' + event.query)
 				.then(result => {
-					//console.log(result);
 					this.filteredMitarbeiter = CoreRESTClient.getData(result.data);
 				});
 		},
@@ -195,20 +194,20 @@ export default {
 				
 				<div class="row mb-3">
 					<div class="col-sm-7">
-						<p v-if="statusNew" class="fw-bold">Neue Notiz</p>
-						<p v-else class="fw-bold">Notiz bearbeiten</p>
+						<p v-if="statusNew" class="fw-bold"> {{$p.t('notiz','notiz_new')}}</p>
+						<p v-else class="fw-bold">{{$p.t('notiz','notiz_edit')}}</p>
 					</div>
 				</div>
 	
 				<div class="row mb-3">
-					<label for="titel" class="form-label col-sm-2">Titel</label>
+					<label for="titel" class="form-label col-sm-2">{{$p.t('global','titel')}}</label>
 					<div class="col-sm-7">
 						<input type="text" v-model="intTitel" class="form-control">
 					</div>
 				</div>
 							
 				<div class="row mb-3">
-					<label for="text" class="form-label col-sm-2">Text</label>
+					<label for="text" class="form-label col-sm-2">{{$p.t('global','text')}}</label>
 								
 					<!-- TinyMce 5 -->
 					<div class="col-sm-7">
@@ -221,7 +220,7 @@ export default {
 			<div v-if="showDocument">
 				<div class="row mb-3">
 				
-					<label for="text" class="form-label col-sm-2">Dokument</label>
+					<label for="text" class="form-label col-sm-2">{{$p.t('notiz','document')}}</label>
 					<div  class="col-sm-7 py-3">
 						<!--Upload Component-->
 						<FormUploadDms ref="upload" id="file" multiple v-model="intAnhang"></FormUploadDms>
@@ -234,12 +233,12 @@ export default {
 			<div v-if="showErweitert">
 			
 				<div class="row mb-3">
-					<label for="bis" class="form-label col-sm-2">VerfasserIn</label>
+					<label for="bis" class="form-label col-sm-2">{{$p.t('notiz','verfasser')}}</label>
 					<div class="col-sm-3">
 						<PvAutoComplete v-model="intVerfasser" optionLabel="mitarbeiter"  :suggestions="filteredMitarbeiter" @complete="search" minLength="3"/>
 					</div>
 					
-					<label for="von" class="form-label col-sm-1">gültig von</label>
+					<label for="von" class="form-label col-sm-1">{{$p.t('global','gueltigVon')}}</label>
 					<div class="col-sm-3">
 						<vue-date-picker
 							id="von"
@@ -253,12 +252,13 @@ export default {
 				</div>
 				
 				<div class="row mb-3">
-					<label for="bis" class="form-label col-sm-2">BearbeiterIn</label>
+					<label for="bis" class="form-label col-sm-2">{{$p.t('notiz','bearbeiter')}}</label>
 					<div class="col-sm-3">
-						<PvAutoComplete v-model="intBearbeiter" optionLabel="mitarbeiter"  :suggestions="filteredMitarbeiter" @complete="search" minLength="3"/>
+						<PvAutoComplete v-model="intBearbeiter" optionLabel="mitarbeiter" :suggestions="filteredMitarbeiter" @complete="search" minlength="3"/>
 					</div>
 					
-					<label for="bis" class="form-label col-sm-1">gültig bis</label>
+					
+					<label for="bis" class="form-label col-sm-1">{{$p.t('global','gueltigBis')}}</label>
 					<div class="col-sm-3">
 						<vue-date-picker
 							id="bis"
@@ -268,12 +268,12 @@ export default {
 							:enable-time-picker="false"
 							format="dd.MM.yyyy"
 							preview-format="dd.MM.yyyy"></vue-date-picker>
-					</div>
+					</div>				
 					
 				</div>
 									
 				<div class="row mb-3">
-					<label for="bis" class="form-label col-sm-2">erledigt</label>
+					<label for="bis" class="form-label col-sm-2">{{$p.t('notiz','erledigt')}}</label>
 					<div class="col-sm-1">
 						<input type="checkbox" v-model="intErledigt">
 					</div>
@@ -281,7 +281,7 @@ export default {
 			</div>
 			
 			<div class="row mb-3">
-				<label for="lastChange" class="form-label col-sm-2 small">letzte Änderung</label>
+				<label for="lastChange" class="form-label col-sm-2 small">{{$p.t('notiz','letzte_aenderung')}}</label>
 				<div class="col-sm-7">
 					<p class="small">{{this.lastChange}}</p>
 				</div>
@@ -289,9 +289,6 @@ export default {
 					
 		</form>
 		
-	<!--	intText: {{intText}}-->
-
-
 	</div>`
 }
 
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
index 0b19280d3..131b4fd55 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
@@ -3,13 +3,6 @@ import {CoreFilterCmpt} from "../../../filter/Filter.js";
 import Notiz from "../../../Notiz/Notiz.js";
 import BsModal from "../../../Bootstrap/Modal";
 
-var editIcon = function (cell, formatterParams) {
-	return "<i class='fa fa-edit'></i>";
-};
-var deleteIcon = function (cell, formatterParams) {
-	return "<i class='fa fa-remove text-danger'></i>";
-};
-
 export default {
 	components: {
 		CoreRESTClient,
@@ -27,8 +20,8 @@ export default {
 				//ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Notiz/getNotizen/' + this.modelValue.person_id + '/' + this.formData.typeId),
 				columns: [
 					{title: "Titel", field: "titel"},
-					{title: "Text", field: "text_stripped", width: 350},
-					{title: "VerfasserIn", field: "verfasser_uid"},
+					{title: "Text", field: "text_stripped", width: 250},
+					{title:  "VerfasserIn", field: "verfasser_uid"},
 					{title: "BearbeiterIn", field: "bearbeiter_uid", visible: false},
 					{title: "Start", field: "start", visible: false},
 					{title: "Ende", field: "ende", visible: false},
@@ -37,22 +30,37 @@ export default {
 					{title: "Notiz_id", field: "notiz_id", visible: false},
 					{title: "Notizzuordnung_id", field: "notizzuordnung_id", visible: false},
 					{title: "letzte Änderung", field: "lastupdate", visible: false},
-					{
-						formatter: editIcon, cellClick: (e, cell) => {
-							this.actionEditNotiz(cell.getData().notiz_id);
-							//console.log(cell.getRow().getIndex(), cell.getData(), this);
-						}, width: 50, headerSort: false, headerVisible: false
-					},
-					{
-						formatter: deleteIcon, cellClick: (e, cell) => {
-							this.actionDeleteNotiz(cell.getData().notiz_id);
+					{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";
 
-						}, width: 50, headerSort: false, headerVisible: false
-					},
+						let button = document.createElement('button');
+						button.className = 'btn btn-outline-secondary btn-action';
+						button.innerHTML = '<i class="fa fa-edit"></i>';
+						button.addEventListener('click', (event) =>
+							this.actionEditNotiz(cell.getData().notiz_id)
+						);
+						container.append(button);
+
+						button = document.createElement('button');
+						button.className = 'btn btn-outline-secondary btn-action';
+						button.innerHTML = '<i class="fa fa-xmark"></i>';
+						button.addEventListener('click', () =>
+							this.actionDeleteNotiz(cell.getData().notiz_id)
+						);
+						container.append(button);
+
+						return container;
+						},
+						frozen: true
+					}
 				],
+
 				layout: 'fitDataFill',
 				layoutColumnsOnNewData: false,
-				height: '150',
+				height: '250',
 				selectableRangeMode: 'click',
 				selectable: true,
 				index: 'notiz_id',
@@ -82,8 +90,7 @@ export default {
 				anhang: []
 			},
 			showErweitert: true, //show details verfasser, bearbeiter, von, bis, erledigt
-			showDocument: true //show upload documents
-
+			showDocument: true, //show upload documents
 		};
 	},
 	methods:{
@@ -113,7 +120,6 @@ export default {
 					if(this.notizen.dms_id){
 						console.log("loadEntries with " + this.notizen.notiz_id);
 						this.loadDocEntries(this.notizen.notiz_id);
-						//console.log(this.formData.anhang);
 					}
 				});
 		},
@@ -271,7 +277,41 @@ export default {
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 	},
-	computed: {	},
+	async mounted() {
+		await this.$p.loadCategory(['notiz','global']);
+
+		let cm = this.$refs.table.tabulator.columnManager;
+
+		cm.getColumnByField('verfasser_uid').component.updateDefinition({
+			title: this.$p.t('notiz', 'verfasser')
+		});
+		cm.getColumnByField('titel').component.updateDefinition({
+			title: this.$p.t('global', 'titel')
+		});
+		cm.getColumnByField('text_stripped').component.updateDefinition({
+			title: this.$p.t('global', 'text')
+		});
+		cm.getColumnByField('bearbeiter_uid').component.updateDefinition({
+			title: this.$p.t('notiz', 'bearbeiter')
+		});
+		cm.getColumnByField('start').component.updateDefinition({
+			title: this.$p.t('global', 'gueltigVon')
+		});
+		cm.getColumnByField('ende').component.updateDefinition({
+			title: this.$p.t('global', 'gueltigBis')
+		});
+		cm.getColumnByField('countdoc').component.updateDefinition({
+			title: this.$p.t('notiz', 'document')
+		});
+		cm.getColumnByField('erledigt').component.updateDefinition({
+			title: this.$p.t('notiz', 'erledigt')
+		});
+		cm.getColumnByField('lastupdate').component.updateDefinition({
+			title: this.$p.t('notiz', 'letzte_aenderung')
+		});
+	},
+/*	computed: {
+		},*/
 	template: `
 	<div class="stv-details-details h-100 pb-3">
 
@@ -321,9 +361,9 @@ export default {
 		>
 		</Notiz>
 			
-		<button v-if="formData.statusNew"  type="button" class="btn btn-primary" @click="addNewNotiz()"> Neu anlegen </button>
-		<button v-else type="button" class="btn btn-primary" @click="updateNotiz(notizen.notiz_id)"> Speichern </button>
-
+		<button v-if="formData.statusNew"  type="button" class="btn btn-primary" @click="addNewNotiz()"> {{$p.t('studierendenantrag', 'btn_new')}}</button>
+		<button v-else type="button" class="btn btn-primary" @click="updateNotiz(notizen.notiz_id)"> {{$p.t('ui', 'speichern')}}</button>
+	
 	</div>
 	`
 };
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 971b9dab1..c7f3659fb 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -21782,6 +21782,139 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'notiz',
+		'phrase' => 'document',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anhänge',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Attachments',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'notiz',
+		'phrase' => 'notiz_new',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Neue Notiz',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'New Note',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'notiz',
+		'phrase' => 'notiz_edit',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Notiz bearbeiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Edit Note',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'notiz',
+		'phrase' => 'verfasser',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Verfasser*in',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'author',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'notiz',
+		'phrase' => 'bearbeiter',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bearbeiter*in',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'editor',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'notiz',
+		'phrase' => 'erledigt',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'erledigt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'completed',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'notiz',
+		'phrase' => 'letzte_aenderung',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'letzte Änderung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Last updated',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 );
 
 

From 15cd9155f124ef8a6c9eba88a89140d75c91fa18 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 25 Jan 2024 16:43:47 +0100
Subject: [PATCH 0352/1461] updates kontakt_id / adresse_id in
 profilUpdateRequest after inserting new kontakt/adresse in db

---
 application/controllers/Cis/Profil.php        |  2 +-
 application/controllers/Cis/ProfilUpdate.php  | 45 ++++++++++---------
 public/js/components/Cis/Profil/EditProfil.js |  1 -
 .../components/Cis/Profil/EditProfilSelect.js |  2 +-
 .../Cis/Profil/MitarbeiterProfil.js           |  2 +-
 .../ProfilComponents/FetchProfilUpdates.js    |  2 -
 .../Cis/Profil/ProfilComponents/Status.js     | 44 ++++++++++++++++--
 7 files changed, 68 insertions(+), 30 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index 80f168585..3b3ccf182 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -115,7 +115,7 @@ class Profil extends Auth_Controller
 			$existing_change = json_decode($update_request->requested_change);
 			
 			 
-			if(property_exists($existing_change,$type) && property_exists($payload,$type) && $existing_change->$type == $payload->$type){
+			if(!isset($existing_change->add) && property_exists($existing_change,$type) && property_exists($payload,$type) && $existing_change->$type == $payload->$type){
 				//? the kontakt_id / adresse_id of a change has to be unique 
 				
 				echo json_encode(error("cannot change the same resource twice"));
diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
index 8d3b6dc1f..66a38cd17 100644
--- a/application/controllers/Cis/ProfilUpdate.php
+++ b/application/controllers/Cis/ProfilUpdate.php
@@ -38,63 +38,66 @@ class ProfilUpdate extends Auth_Controller
 	}
 
 	public function acceptProfilRequest(){
+
 		$_POST = json_decode($this->input->raw_input_stream,true);
-		
 		$id = $this->input->post('profil_update_id',true);
 		$uid = $this->input->post('uid',true);	
+
 		//? fetching person_id using UID
 		$personID = $this->PersonModel->getByUid($uid);
 		$personID = hasData($personID)? getData($personID)[0]->person_id : null;
 		$status_message = $this->input->post('status_message',true);
 		$topic = $this->input->post('topic',true);
+
 		//! somehow the xss check converted boolean false to empty string
 		$requested_change = $this->input->post('requested_change');
-
+		
 		//! check for required information
 		if(!isset($id) || !isset($uid) || !isset($personID) || !isset($requested_change) || !isset($topic)){
 			return json_encode(error("missing required information"));
 		}
 		
-		
 		if(is_array($requested_change) && array_key_exists("adresse_id",$requested_change)){
-			$this->handleAdresse($requested_change, $personID);
+			$resID = $this->handleAdresse($requested_change, $personID);
+			$resID = hasData($resID) ? getData($resID) : null;
+			$requested_change['adresse_id'] = $resID;
+			
 		}else if (is_array($requested_change) && array_key_exists("kontakt_id", $requested_change)){
-			$this->handleKontakt($requested_change, $personID);
+			$resID = $this->handleKontakt($requested_change, $personID);
+			$resID = hasData($resID) ? getData($resID)[0] : null;
+			$requested_change['kontakt_id'] = $resID;
+			
 		}else{
-			
-			
 			switch($topic){
 				case "titel": $topic ="titelpre"; break;
 				case "postnomen": $topic = "titelpost"; break;
 			}
-			$res = $this->PersonModel->update($personID,[$topic=>$requested_change]);
-		
-			echo json_encode($res);
+			$result = $this->PersonModel->update($personID,[$topic=>$requested_change]);
+			if(isError($result)){
+				echo json_encode($result);
+				return;
+			}
 		}
-
 		
-		echo json_encode($this->setStatusOnUpdateRequest($id, "accepted", $status_message));
-		 
-
+		echo json_encode($this->setStatusOnUpdateRequest($id, "accepted", $status_message, $requested_change));
 	}
 
 	public function denyProfilRequest(){
-		$_POST = json_decode($this->input->raw_input_stream,true);
 		
+		$_POST = json_decode($this->input->raw_input_stream,true);
 		$id = $this->input->post('profil_update_id',true);
 		$status_message = $this->input->post('status_message',true);
 		
-		
 		echo json_encode($this->setStatusOnUpdateRequest($id, "rejected", $status_message));
-		
-		
-
 	}
 
-	private function setStatusOnUpdateRequest($id, $status, $status_message){
-		return $this->ProfilChangeModel->update([$id],["status"=>$status,"status_timestamp"=>"NOW()","status_message"=>$status_message]);
+	private function setStatusOnUpdateRequest($id, $status, $status_message, $requested_change=NULL){
+		$update = ["status"=>$status,"status_timestamp"=>"NOW()","status_message"=>$status_message];
+		if(isset($requested_change)) { $update['requested_change'] = $requested_change; } 
+		return $this->ProfilChangeModel->update([$id], $update);
 	}
 
+
 	private function handleKontakt($requested_change, $personID){
 		$kontakt_id = $requested_change["kontakt_id"];
 		//? removes the kontakt_id because we don't want to update the kontakt_id in the database
diff --git a/public/js/components/Cis/Profil/EditProfil.js b/public/js/components/Cis/Profil/EditProfil.js
index 4928b72e8..4c024d944 100644
--- a/public/js/components/Cis/Profil/EditProfil.js
+++ b/public/js/components/Cis/Profil/EditProfil.js
@@ -69,7 +69,6 @@ export default {
       //? if the topic was passed through the prop add it to the component
       this.topic = this.editData.topic;
     }
-    console.log("here",this.editData);
    
 
   },
diff --git a/public/js/components/Cis/Profil/EditProfilSelect.js b/public/js/components/Cis/Profil/EditProfilSelect.js
index 706cec63e..c91ddd683 100644
--- a/public/js/components/Cis/Profil/EditProfilSelect.js
+++ b/public/js/components/Cis/Profil/EditProfilSelect.js
@@ -134,7 +134,7 @@ export default {
     created() {
       this.data = JSON.parse(JSON.stringify(this.list.data));
       this.view = JSON.parse(JSON.stringify(this.list.view));
-        
+      
         
     },
     mounted() {
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index ea67092d8..6b66aeccf 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -278,7 +278,7 @@ export default {
                 view:"text_input",
                 data:{
                   titel:"postnomen",
-                  value:this.data.titel,
+                  value:this.data.postnomen,
                 }
               },
             }
diff --git a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
index 4593fed74..23310fd2f 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
@@ -40,7 +40,6 @@ export default {
             }
         },
         openModal(updateRequest) {
-            console.log(JSON.stringify(updateRequest));
 
             let view = this.getView(updateRequest.topic,updateRequest.status);
             let data = null;
@@ -74,7 +73,6 @@ export default {
                 content['status_timestamp']=updateRequest.status_timestamp;
             }
 
-
             //? only show the popup if also the right content is available
             if(content){
             EditProfil.popup({ 
diff --git a/public/js/components/Cis/Profil/ProfilComponents/Status.js b/public/js/components/Cis/Profil/ProfilComponents/Status.js
index bc69497bd..a1aed8054 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/Status.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/Status.js
@@ -1,10 +1,31 @@
-export default {
+import Adresse from "./Adresse.js";
+import Kontakt from "./Kontakt.js";
 
+export default {
+    components:{
+        Adresse,
+        Kontakt,
+    },
     data(){
         return {
 
         }
     },
+    computed:{
+        getComponentView: function(){
+            let title = this.topic.toLowerCase();
+            if(title.includes("adressen")) return "Adresse";
+            else if(title.includes("kontakte"))return "Kontakt";
+            else return "text_input";
+            
+        },
+        cardHeader: function(){
+            let title = this.topic.toLowerCase();
+            if(title.includes("delete")) return "Delete";
+            else if(title.includes("add")) return "Add";
+            else return "Update";
+        }
+    },
     props:{
         data:{type:Object},
         view:{type:String},
@@ -12,11 +33,12 @@ export default {
         status_message:{type:String},
         status_timestamp:{type:String},
         update:{type:Boolean},
+        topic:{type:String},
     },
     created(){
-        
 
     },template:`
+  
     <div  class="form-underline mb-2">
     <div class="form-underline-titel">Status</div>
     <span  class="form-underline-content">{{status}} </span>
@@ -30,6 +52,22 @@ export default {
     <div  class="form-underline mb-2">
     <div class="form-underline-titel">Date</div>
     <span  class="form-underline-content">{{status_timestamp}} </span>
-    </div>`,
+    </div>
+    
+    <div class="card mt-4">
+    <div class="card-header">
+    <i class="fa" :class="{'fa-trash':cardHeader==='Delete', 'fa-edit':cardHeader==='Update', 'fa-plus':cardHeader==='Add'}" ></i>
+    {{cardHeader}} 
+    </div>
+    <div class="card-body">
+    <div v-if="getComponentView === 'text_input'"  class="form-underline mb-2">
+    <div class="form-underline-titel">{{topic}}</div>
+    <span  class="form-underline-content">{{data}} </span>
+    </div>
+    <component v-else :is="getComponentView" :data="data"></component>
+    
+    </div>
+    </div>
+    `,
 
 }
\ No newline at end of file

From c49a36e9ca1892221fda1d057d26e995004ed9be Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 26 Jan 2024 14:02:34 +0100
Subject: [PATCH 0353/1461] insert Phrasen to Modals and Tables in Tab Kontakt

---
 .../Studentenverwaltung/Details/Kontakt.js    |   6 +-
 .../Details/Kontakt/Address.js                | 117 +++-
 .../Details/Kontakt/Bankaccount.js            |  63 +-
 .../Details/Kontakt/Contact.js                |  58 +-
 system/phrasesupdate.php                      | 638 ++++++++++++++++++
 5 files changed, 805 insertions(+), 77 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt.js
index 0ed0fcb35..2adc5129d 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt.js
@@ -23,17 +23,17 @@ export default {
 	template: `
 	<div class="stv-details-details h-100 pb-3">
 		<fieldset class="overflow-hidden">
-			<legend>Adressen</legend>
+			<legend>{{this.$p.t('person', 'adressen')}}</legend>
 			<address-list ref="adressList" :uid="modelValue.person_id"></address-list>
 		</fieldset>
 		<br>
 		<fieldset class="overflow-hidden">
-			<legend>Kontakt</legend>
+			<legend>{{this.$p.t('global', 'kontakt')}}</legend>
 			<contact-list ref="contactList" :uid="modelValue.person_id"></contact-list>
 		</fieldset>
 		<br>
 		<fieldset class="overflow-hidden">
-			<legend>Bankverbindungen</legend>
+			<legend>{{this.$p.t('person', 'bankverbindungen')}}</legend>
 			<bankaccount-list ref="bankaccountList" :uid="modelValue.person_id"></bankaccount-list>
 		</fieldset>
 	</div>`
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
index 834f857e6..2b9f9c0fe 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
@@ -41,9 +41,9 @@ export default{
 						}
 					},
 					{title:"Abweich.Empf", field:"co_name"},
-					{title:"Name", field:"name"},
 					{title:"Firma", field:"firmenname"},
 					{title:"Firma_id", field:"firma_id", visible:false},
+					{title:"Name", field:"name"},
 					{title:"Adresse_id", field:"adresse_id", visible:false},
 					{title:"Person_id", field:"person_id", visible:false},
 					{title:"Name", field:"name", visible:false},
@@ -263,15 +263,60 @@ export default{
 				console.error(err.response.data || err.message);
 			});
 	},
+	async mounted() {
+		await this.$p.loadCategory(['notiz','global','person']);
+
+		let cm = this.$refs.table.tabulator.columnManager;
+
+		cm.getColumnByField('bezeichnung').component.updateDefinition({
+			title: this.$p.t('global', 'typ')
+		});
+		cm.getColumnByField('strasse').component.updateDefinition({
+			title: this.$p.t('person', 'strasse')
+		});
+		cm.getColumnByField('plz').component.updateDefinition({
+			title: this.$p.t('person', 'plz')
+		});
+		cm.getColumnByField('ort').component.updateDefinition({
+			title: this.$p.t('person', 'ort')
+		});
+		cm.getColumnByField('gemeinde').component.updateDefinition({
+			title: this.$p.t('person', 'gemeinde')
+		});
+		cm.getColumnByField('nation').component.updateDefinition({
+			title: this.$p.t('person', 'nation')
+		});
+		cm.getColumnByField('heimatadresse').component.updateDefinition({
+			title: this.$p.t('person', 'heimatadresse')
+		});
+		cm.getColumnByField('co_name').component.updateDefinition({
+			title: this.$p.t('person', 'co_name')
+		});
+		cm.getColumnByField('name').component.updateDefinition({
+			title: this.$p.t('person', 'firma_zusatz')
+		});
+		cm.getColumnByField('firmenname').component.updateDefinition({
+			title: this.$p.t('person', 'firma')
+		});
+		cm.getColumnByField('updateamum').component.updateDefinition({
+			title: this.$p.t('notiz', 'letzte_aenderung')
+		});
+		cm.getColumnByField('rechnungsadresse').component.updateDefinition({
+			title: this.$p.t('person', 'rechnungsadresse')
+		});
+		cm.getColumnByField('anmerkung').component.updateDefinition({
+			title: this.$p.t('notiz', 'document')
+		});
+	},
 	template: `
 		<div class="stv-list h-100 pt-3">
 		
 		<!--Modal: Add Address-->
 		<BsModal ref="newAdressModal">
-			<template #title>Adresse anlegen</template>
+			<template #title>{{this.$p.t('person', 'adresse_new')}}</template>
 				<form class="row g-3" ref="addressData">
 					<div class="row mb-3">
-						<label for="adressentyp" class="form-label col-sm-4">Typ</label>
+						<label for="adressentyp" class="form-label col-sm-4">{{this.$p.t('global', 'typ')}}</label>
 						<div class="col-sm-6">
 							<select id="adressentyp" class="form-select" v-model="addressData.typ">
 								<option v-for="typ in adressentypen" :key="typ.adressentyp_kurzbz" :value="typ.adressentyp_kurzbz" >{{typ.bezeichnung}}</option>
@@ -279,14 +324,14 @@ export default{
 						</div>
 					</div>
 					<div class="row mb-3">
-						<label for="strasse" class="form-label col-sm-4">Strasse</label>
+						<label for="strasse" class="form-label col-sm-4">{{this.$p.t('person', 'strasse')}}</label>
 						<div class="col-sm-6">
 							<input type="text" :readonly="readonly" class="form-control" id="strasse" v-model="addressData['strasse']">
 						</div>
 					</div>
 						
 					<div class="row mb-3">
-						<label for="nation" class="form-label col-sm-4">Nation</label>
+						<label for="nation" class="form-label col-sm-4">{{this.$p.t('person', 'nation')}}</label>
 						<div class="col-sm-6">
 							<select id="nation" class="form-select" v-model="addressData.nation">
 								<option v-for="nation in nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
@@ -295,14 +340,14 @@ export default{
 					</div>
 										
 					<div class="row mb-3">
-						<label for="plz" class="required form-label col-sm-4" >PLZ</label>
+						<label for="plz" class="required form-label col-sm-4" >{{this.$p.t('person', 'plz')}}</label>
 						 <div class="col-sm-6">
 							<input type="text" class="form-control" required v-model="addressData['plz']" @input="loadPlaces" >
 						</div>
 					</div>
 					
 					<div class="row mb-3">
-						<label :for="gemeinde" class="form-label col-sm-4">Gemeinde</label>
+						<label :for="gemeinde" class="form-label col-sm-4">{{this.$p.t('person', 'gemeinde')}}</label>
 							<div class="col-sm-6">
 								<select v-if="addressData['nation'] == 'A'" name="addressData[gemeinde]" class="form-select" v-model="addressData['gemeinde']">
 									<option v-if="!gemeinden.length" disabled>Bitte gültige PLZ wählen</option>
@@ -313,7 +358,7 @@ export default{
 					</div>
 					
 					<div class="row mb-3">
-							<label :for="Ort" class="form-label col-sm-4">Ort</label>
+							<label :for="Ort" class="form-label col-sm-4">{{this.$p.t('person', 'ort')}}</label>
 							<div class="col-sm-6">
 								<select v-if="addressData['nation'] == 'A'" name="address[ort]" class="form-select" v-model="addressData['ort']">
 									<option v-if="!orte.length" disabled>Bitte gültige Gemeinde wählen</option>
@@ -324,7 +369,7 @@ export default{
 					</div>
 										
 					<div class="row mb-3">
-						<label for="heimatadresse" class="form-label col-sm-4">Heimatadresse</label>
+						<label for="heimatadresse" class="form-label col-sm-4">{{this.$p.t('person', 'heimatadresse')}}</label>
 						<div class="col-sm-3">
 							<div class="form-check">
 								<input id="heimatadresse" type="checkbox" class="form-check-input" value="1" v-model="addressData['heimatadresse']">
@@ -333,7 +378,7 @@ export default{
 					</div>
 						
 					<div class="row mb-3">
-						<label for="zustelladresse" class="form-label col-sm-4">Zustelladresse</label>
+						<label for="zustelladresse" class="form-label col-sm-4">{{this.$p.t('person', 'zustelladresse')}}</label>
 						<div class="col-sm-3">
 							<div class="form-check">
 								<input id="zustelladresse" type="checkbox" class="form-check-input" value="1" v-model="addressData['zustelladresse']">
@@ -342,14 +387,14 @@ export default{
 					</div>
 					
 					<div class="row mb-3">
-							<label for="co_name" class="form-label col-sm-4">Abweich.Empfänger. (c/o)</label>
+							<label for="co_name" class="form-label col-sm-4">{{this.$p.t('person', 'co_name')}}</label>
 						<div class="col-sm-6">
 							<input type="text" id="co_name" class="form-control" v-model="addressData['co_name']">
 						</div>
 					</div>
 					
 					<div class="row mb-3">
-						<label for="rechnungsadresse" class="form-label col-sm-4">Rechnungsadresse</label>
+						<label for="rechnungsadresse" class="form-label col-sm-4">{{this.$p.t('person', 'rechnungsadresse')}}</label>
 						<div class="col-sm-3">
 							<div class="form-check">
 								<input id="rechnungsadresse" type="checkbox" class="form-check-input" v-model="addressData['rechnungsadresse']">
@@ -358,37 +403,37 @@ export default{
 					</div>
 					
 					<div class="row mb-3">
-						<label for="firma_name" class="form-label col-sm-4">Firma</label>
+						<label for="firma_name" class="form-label col-sm-4">{{this.$p.t('person', 'firma')}}</label>
 							<div class="col-sm-3">
 							 	<PvAutoComplete v-model="addressData['firma']"  optionLabel="name" :suggestions="filteredFirmen" @complete="search" minLength="3"/>
 							</div>
 					</div>
 					
 					<div class="row mb-3">
-						<label for="name" class="form-label col-sm-4">Name</label>
+						<label for="name" class="form-label col-sm-4">{{this.$p.t('person', 'firma_zusatz')}}</label>
 						<div class="col-sm-6">
 							<input type="text" :readonly="readonly" class="form-control" id="name" v-model="addressData['name']">
 						</div>
 					</div>
 					<div class="row mb-3">
-						<label for="anmerkung" class="form-label col-sm-4">Anmerkung</label>
+						<label for="anmerkung" class="form-label col-sm-4">{{this.$p.t('global', 'anmerkung')}}</label>
 						<div class="col-sm-6">
 							<input type="text" :readonly="readonly" class="form-control" id="anmerkung" v-model="addressData['anmerkung']">
 						</div>
 					</div>
 			</form>
 			<template #footer>
-				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
+				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{this.$p.t('ui', 'abbrechen')}}</button>
 				<button type="button" class="btn btn-primary" @click="addNewAddress()">OK</button>
             </template>
 		</BsModal>
 		
 		<!--Modal: Edit Address-->
 		<BsModal ref="editAdressModal">
-			<template #title>Adresse bearbeiten</template>
+			<template #title>{{this.$p.t('person', 'adresse_edit')}}</template>
 			<form class="row g-3" ref="addressData">
 				<div class="row mb-3">
-					<label for="adressentyp" class="form-label col-sm-4">Typ</label>
+					<label for="adressentyp" class="form-label col-sm-4">{{this.$p.t('global', 'typ')}}</label>
 					<div class="col-sm-6">
 						<select id="adressentyp" class="form-control" v-model="addressData.typ">
 							<option v-for="typ in adressentypen" :key="typ.adressentyp_kurzbz" :value="typ.adressentyp_kurzbz" >{{typ.bezeichnung}}</option>
@@ -397,14 +442,14 @@ export default{
 				</div>
 				
 				<div class="row mb-3">
-					<label for="strasse" class="form-label col-sm-4">Strasse</label>
+					<label for="strasse" class="form-label col-sm-4">{{this.$p.t('person', 'strasse')}}</label>
 					<div class="col-sm-6">
 						<input type="text" :readonly="readonly" class="form-control" id="strasse" v-model="addressData.strasse">
 					</div>
 				</div>
 					
 				<div class="row mb-3">
-					<label for="nation" class="form-label col-sm-4">Nation</label>
+					<label for="nation" class="form-label col-sm-4">{{this.$p.t('person', 'nation')}}</label>
 					<div class="col-sm-6">
 						<select id="nation" class="form-select" v-model="addressData.nation">
 							<option v-for="nation in nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
@@ -413,39 +458,39 @@ export default{
 				</div>
 				
 				<div class="row mb-3">
-					<label for="plz" class="required form-label col-sm-4" >PLZ</label>
+					<label for="plz" class="required form-label col-sm-4" >{{this.$p.t('person', 'plz')}}</label>
 					 <div class="col-sm-6">
 						<input type="text" class="form-control" required v-model="addressData['plz']" @input="loadPlaces">
 					</div>
 				</div>
 				<div class="row mb-3">
-					<label :for="gemeinde" class="form-label col-sm-4">Gemeinde</label>
+					<label :for="gemeinde" class="form-label col-sm-4">{{this.$p.t('person', 'gemeinde')}}</label>
 						<div v-if="addressData['gemeinde']" class="col-sm-6">
 							<input type="text" class="form-control" v-model="addressData['gemeinde']">
 						</div>
 						<div v-else class="col-sm-6">
 							<select v-if="addressData['nation'] == 'A'" name="addressData[gemeinde]" class="form-select" v-model="addressData['gemeinde']">
-								<option v-if="!gemeinden.length" disabled>Bitte gültige PLZ wählen</option>
+								<option v-if="!gemeinden.length" disabled>{{this.$p.t('person', 'plz_waehlen')}}</option>
 								<option v-for="gemeinde in gemeinden" :key="gemeinde.name" :value="gemeinde.name">{{gemeinde.name}}</option>
 							</select>
 						</div>
 				</div>
 		
 				<div class="row mb-3">
-						<label :for="Ort" class="form-label col-sm-4">Ort</label>
+						<label :for="Ort" class="form-label col-sm-4">{{this.$p.t('person', 'ort')}}</label>
 						<div v-if="addressData['ort']" class="col-sm-6">
 							<input type="text" name="ort" class="form-control" v-model="addressData['ort']">
 						</div>
 						<div v-else class="col-sm-6">
 							<select v-if="addressData['nation'] == 'A'" name="address[ort]" class="form-select" v-model="addressData['ort']">
-								<option v-if="!orte.length" disabled>Bitte gültige Gemeinde wählen</option>
+								<option v-if="!orte.length" disabled>{{this.$p.t('person', 'gemeinde_waehlen')}}</option>
 								<option v-for="ort in orte" :key="ort.ortschaftsname" :value="ort.ortschaftsname">{{ort.ortschaftsname}}</option>
 							</select>
 						</div>
 				</div>
 								
 				<div class="row mb-3">
-					<label for="heimatadresse" class="form-label col-sm-4">Heimatadresse</label>
+					<label for="heimatadresse" class="form-label col-sm-4">{{this.$p.t('person', 'heimatadresse')}}</label>
 					<div class="col-sm-3">
 						<div class="form-check">
 							<input id="heimatadresse" type="checkbox" class="form-check-input" value="1" v-model="addressData['heimatadresse']">
@@ -454,7 +499,7 @@ export default{
 				</div>
 					
 				<div class="row mb-3">
-					<label for="zustelladresse" class="form-label col-sm-4">Zustelladresse</label>
+					<label for="zustelladresse" class="form-label col-sm-4">{{this.$p.t('person', 'zustelladresse')}}</label>
 					<div class="col-sm-3">
 						<div class="form-check">
 							<input id="zustelladresse" type="checkbox" class="form-check-input" value="1" v-model="addressData['zustelladresse']">
@@ -463,14 +508,14 @@ export default{
 				</div>
 				
 				<div class="row mb-3">
-					<label for="co_name" class="form-label col-sm-4">Abweich.Empfänger. (c/o)</label>
+					<label for="co_name" class="form-label col-sm-4">{{this.$p.t('person', 'co_name')}}</label>
 					<div class="col-sm-6">
 						<input type="text" id="co_name" class="form-control" v-model="addressData['co_name']">
 					</div>
 				</div>
 				
 				<div class="row mb-3">
-					<label for="rechnungsadresse" class="form-label col-sm-4">Rechnungsadresse</label>
+					<label for="rechnungsadresse" class="form-label col-sm-4">{{this.$p.t('person', 'rechnungsadresse')}}</label>
 					<div class="col-sm-3">
 						<div class="form-check">
 							<input id="rechnungsadresse" type="checkbox" class="form-check-input" v-model="addressData['rechnungsadresse']">
@@ -479,7 +524,7 @@ export default{
 				</div>
 				
 				<div class="row mb-3">
-					<label for="firma_name" class="form-label col-sm-4">Firma</label>
+					<label for="firma_name" class="form-label col-sm-4">{{this.$p.t('person', 'firma')}}</label>
 						<div v-if="addressData.firmenname" class="col-sm-6">
 							<input type="text" :readonly="readonly" class="form-control" id="name" v-model="addressData.firmenname">
 						</div>
@@ -493,14 +538,14 @@ export default{
 				</div>
 	
 				<div class="row mb-3">
-					<label for="name" class="form-label col-sm-4">Name</label>
+					<label for="name" class="form-label col-sm-4">{{this.$p.t('person', 'firma_zusatz')}}</label>
 					<div class="col-sm-6">
 						<input type="text" :readonly="readonly" class="form-control" id="name" v-model="addressData['name']">
 					</div>
 				</div>
 				
 				<div class="row mb-3">
-					<label for="anmerkung" class="form-label col-sm-4">Anmerkung</label>
+					<label for="anmerkung" class="form-label col-sm-4">{{this.$p.t('global', 'anmerkung')}}</label>
 					<div class="col-sm-6">
 						<input type="text" :readonly="readonly" class="form-control" id="anmerkung" v-model="addressData['anmerkung']">
 					</div>
@@ -508,19 +553,19 @@ export default{
 			
 			</form>
 			<template #footer>
-				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">Abbrechen</button>
+				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">{{this.$p.t('ui', 'abbrechen')}}</button>
 				<button ref="Close" type="button" class="btn btn-primary" @click="updateAddress(addressData.adresse_id)">OK</button>
             </template>
 		</BsModal>
 		
 		<!--Modal: deleteAdressModal-->
 		<BsModal ref="deleteAdressModal">
-			<template #title>Adresse löschen</template>
+			<template #title>{{this.$p.t('person', 'adresse_delete')}}</template>
 			<template #default>
-				<p>Adresse wirklich löschen?</p>
+				<p>{{this.$p.t('person', 'adresse_confirm_delete')}}</p>
 			</template>
 			<template #footer>
-				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">Abbrechen</button>
+				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">{{this.$p.t('ui', 'abbrechen')}}</button>
 				<button ref="Close" type="button" class="btn btn-primary" @click="deleteAddress(addressData.adresse_id)">OK</button>
 			</template>
 		</BsModal>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
index d8e3227c6..c4f457260 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
@@ -184,12 +184,33 @@ export default{
 			this.bankverbindungData = this.initData;
 		},
 	},
+	async mounted() {
+		await this.$p.loadCategory(['global','person']);
+
+		let cm = this.$refs.table.tabulator.columnManager;
+
+		cm.getColumnByField('anschrift').component.updateDefinition({
+			title: this.$p.t('person', 'anschrift')
+		});
+		cm.getColumnByField('kontonr').component.updateDefinition({
+			title: this.$p.t('person', 'kontonr')
+		});
+		cm.getColumnByField('blz').component.updateDefinition({
+			title: this.$p.t('person', 'blz')
+		});
+		cm.getColumnByField('typ').component.updateDefinition({
+			title: this.$p.t('global', 'typ')
+		});
+		cm.getColumnByField('verrechnung').component.updateDefinition({
+			title: this.$p.t('person', 'verrechnung')
+		});
+	},
 	template: `	
 		<div class="stv-list h-100 pt-3">
 		
 		<!--Modal: Add Bankverbindung-->
 		<BsModal title="Bankverbindung anlegen" ref="newBankverbindungModal">
-			<template #title>Bankverbindung anlegen</template>
+			<template #title>{{this.$p.t('person', 'bankvb_new')}}</template>
 			<form class="row g-3" ref="bankverbindungData">
 				<div class="row mb-3">
 						<label for="name" class="form-label col-sm-4">Name</label>
@@ -198,7 +219,7 @@ export default{
 						</div>
 					</div>
 					<div class="row mb-3">										   
-						<label for="anschrift" class="form-label col-sm-4">Anschrift</label>
+						<label for="anschrift" class="form-label col-sm-4">{{this.$p.t('person', 'anschrift')}}</label>
 						<div class="col-sm-6">
 							<input type="text" :readonly="readonly" class="form-control" id="anschrift" v-model="bankverbindungData['anschrift']">
 						</div>
@@ -217,28 +238,28 @@ export default{
 						</div>
 					</div>
 					<div class="row mb-3">							   
-						<label for="kontonr" class="form-label col-sm-4">Kontonummer</label>
+						<label for="kontonr" class="form-label col-sm-4">{{this.$p.t('person', 'kontonr')}}</label>
 						<div class="col-sm-6">
 							<input type="text" :readonly="readonly" class="form-control" id="kontonr" v-model="bankverbindungData['kontonr']">
 						</div>
 					</div>
 					<div class="row mb-3">										   
-						<label for="blz" class="form-label col-sm-4">BLZ</label>
+						<label for="blz" class="form-label col-sm-4">{{this.$p.t('person', 'blz')}}</label>
 						<div class="col-sm-6">
 							<input type="text" :readonly="readonly" class="form-control" id="blz" v-model="bankverbindungData['blz']">
 						</div>
 					</div>
 					<div class="row mb-3">
-						<label for="typ" class="form-label col-sm-4">Typ</label>
+						<label for="typ" class="form-label col-sm-4">{{this.$p.t('global', 'typ')}}</label>
 						<div class="col-sm-6">
 							<select  id="typ" class="form-select" required v-model="bankverbindungData['typ']">
-								<option  value="p">Privatkonto</option>
-								<option  value="f">Firmenkonto</option>
+								<option  value="p">{{this.$p.t('person', 'privatkonto')}}</option>
+								<option  value="f">{{this.$p.t('person', 'firmenkonto')}}</option>
 							</select>
 						</div>
 					</div>
 					<div class="row mb-3">
-						<label for="verrechnung" class="form-label col-sm-4">Verrechnung</label>
+						<label for="verrechnung" class="form-label col-sm-4">{{this.$p.t('person', 'verrechnung')}}</label>
 						<div class="col-sm-3">
 							<div class="form-check">
 								<input id="verrechnung" type="checkbox" class="form-check-input" value="1" v-model="bankverbindungData['verrechnung']">
@@ -247,14 +268,14 @@ export default{
 					</div>
 			</form>
             <template #footer>
-            		<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
+            		<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{this.$p.t('ui', 'abbrechen')}}</button>
 					<button type="button" class="btn btn-primary" @click="addNewBankverbindung()">OK</button>
             </template>
 		</BsModal>
 				
 		<!--Modal: Edit Bankverbindung-->
 		<BsModal ref="editBankverbindungModal">
-			<template #title>Bankverbindung bearbeiten</template>
+			<template #title>{{this.$p.t('person', 'bankvb_edit')}}</template>
 				<form class="row g-3" ref="bankverbindungData">
 				
 					<div class="row mb-3">
@@ -264,7 +285,7 @@ export default{
 						</div>
 					</div>
 					<div class="row mb-3">									   
-						<label for="anschrift" class="form-label col-sm-4">Anschrift</label>
+						<label for="anschrift" class="form-label col-sm-4">{{this.$p.t('person', 'anschrift')}}</label>
 						<div class="col-sm-6">
 							<input type="text" :readonly="readonly" class="form-control" id="anschrift" v-model="bankverbindungData['anschrift']">
 						</div>
@@ -282,28 +303,28 @@ export default{
 						</div>
 					</div>
 					<div class="row mb-3">									   
-						<label for="kontonr" class="form-label col-sm-4">Kontonummer</label>
+						<label for="kontonr" class="form-label col-sm-4">{{this.$p.t('person', 'kontonr')}}</label>
 						<div class="col-sm-6">
 							<input type="text" :readonly="readonly" class="form-control" id="kontonr" v-model="bankverbindungData['kontonr']">
 						</div>
 					</div>
 					<div class="row mb-3">									   
-						<label for="blz" class="form-label col-sm-4">BLZ</label>
+						<label for="blz" class="form-label col-sm-4">{{this.$p.t('person', 'blz')}}</label>
 						<div class="col-sm-6">
 							<input type="text" :readonly="readonly" class="form-control" id="blz" v-model="bankverbindungData['blz']">
 						</div>
 					</div>
 					<div class="row mb-3">
-						<label for="typ" class="form-label col-sm-4">Typ</label>
+						<label for="typ" class="form-label col-sm-4">{{this.$p.t('global', 'typ')}}</label>
 						<div class="col-sm-6">
 							<select  id="typ" class="form-select" required v-model="bankverbindungData['typ']">
-								<option  value="p">Privatkonto</option>
-								<option  value="f">Firmenkonto</option>
+								<option  value="p">{{this.$p.t('person', 'privatkonto')}}</option>
+								<option  value="f">{{this.$p.t('person', 'firmenkonto')}}</option>
 							</select>
 						</div>
 					</div>
 					<div class="row mb-3">
-						<label for="verrechnung" class="form-label col-sm-4">Verrechnung</label>
+						<label for="verrechnung" class="form-label col-sm-4">{{this.$p.t('person', 'verrechnung')}}</label>
 						<div class="col-sm-3">
 							<div class="form-check">
 								<input id="verrechnung" type="checkbox" class="form-check-input" value="1" v-model="bankverbindungData['verrechnung']">
@@ -312,19 +333,19 @@ export default{
 					</div>															   
 				</form>
 				<template #footer>
-					<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">Abbrechen</button>
+					<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">{{this.$p.t('ui', 'abbrechen')}}</button>
 					<button ref="Close" type="button" class="btn btn-primary" @click="updateBankverbindung(bankverbindungData.bankverbindung_id)">OK</button>
             	</template>
 		</BsModal>
 		
 		<!--Modal: Delete Bankverbindung-->
 		<BsModal ref="deleteBankverbindungModal">
-			<template #title>Bankverbindung löschen</template>
+			<template #title>{{this.$p.t('person', 'bankvb_delete')}}</template>
 			<template #default>
-				<p>Bankverbindung wirklich löschen?</p>
+				<p>{{this.$p.t('person', 'bankvb_confirm_delete')}}</p>
 			</template>									
 			<template #footer>
-				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">Abbrechen</button>
+				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">{{this.$p.t('ui', 'abbrechen')}}</button>
 				<button ref="Close" type="button" class="btn btn-primary" @click="deleteBankverbindung(bankverbindungData.bankverbindung_id)">OK</button>
 			</template>
 		</BsModal>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
index 27d84bc34..806f07fdd 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
@@ -187,16 +187,40 @@ export default{
 				console.error(err.response.data || err.message);
 			});
 	},
+	async mounted() {
+		await this.$p.loadCategory(['notiz','global','person']);
+
+		let cm = this.$refs.table.tabulator.columnManager;
+
+		cm.getColumnByField('kontakttyp').component.updateDefinition({
+			title: this.$p.t('global', 'typ')
+		});
+		cm.getColumnByField('kontakt').component.updateDefinition({
+			title: this.$p.t('global', 'kontakt')
+		});
+		cm.getColumnByField('zustellung').component.updateDefinition({
+			title: this.$p.t('person', 'zustellung')
+		});
+		cm.getColumnByField('anmerkung').component.updateDefinition({
+			title: this.$p.t('global', 'anmerkung')
+		});
+		cm.getColumnByField('kurz_bz').component.updateDefinition({
+			title: this.$p.t('person', 'firma')
+		});
+		cm.getColumnByField('updateamum').component.updateDefinition({
+			title: this.$p.t('notiz', 'letzte_aenderung')
+		});
+	},
 	template: `	
 		<div class="stv-list h-100 pt-3">
 		
 		<!--Modal: new Contact-->
 		<BsModal ref="newContactModal">
-			<template #title>Kontakt anlegen</template>
+			<template #title>{{this.$p.t('person', 'kontakt_new')}}</template>
 				<form class="row g-3" ref="contactData">
 				
 						<div class="row mb-3">
-							<label for="kontakttyp" class="form-label col-sm-4">Typ</label>
+							<label for="kontakttyp" class="form-label col-sm-4">{{this.$p.t('global', 'typ')}}</label>
 							<div class="col-sm-6">
 								<select id="kontakttyp" class="form-control" v-model="contactData.kontakttyp">
 									<option value="">keine Auswahl</option>
@@ -205,20 +229,20 @@ export default{
 							</div>
 						</div>
 						<div class="row mb-3">										   
-							<label for="kontakt" class="form-label col-sm-4">Kontakt</label>
+							<label for="kontakt" class="form-label col-sm-4">{{this.$p.t('global', 'kontakt')}}</label>
 							<div class="col-sm-6">
 								<input type="text" :readonly="readonly" class="form-control" id="kontakt" v-model="contactData['kontakt']">
 							</div>
 						</div>
 						<div class="row mb-3">									   
-							<label for="anmerkung" class="form-label col-sm-4">Anmerkung</label>
+							<label for="anmerkung" class="form-label col-sm-4">{{this.$p.t('global', 'anmerkung')}}</label>
 							<div class="col-sm-6">
 								<input type="text" :readonly="readonly" class="form-control" id="anmerkung" v-model="contactData['anmerkung']">
 							</div>
 						</div>
 						
 						<div class="row mb-3">
-							<label for="zustellung" class="form-label col-sm-4">Zustellung</label>
+							<label for="zustellung" class="form-label col-sm-4">{{this.$p.t('person', 'zustellung')}}</label>
 							<div class="col-sm-6">
 								<div class="form-check">
 									<input id="zustellung" type="checkbox" class="form-check-input" value="1" v-model="contactData['zustellung']">
@@ -227,24 +251,24 @@ export default{
 						</div>
 							
 						<div class="row mb-3">
-							<label for="firma_name" class="form-label col-sm-4">Firma / Standort</label>
+							<label for="firma_name" class="form-label col-sm-4">{{this.$p.t('person', 'firma')}} / {{this.$p.t('person', 'standort')}}</label>
 								<div class="col-sm-6">
 									<PvAutoComplete v-model="contactData['standort']" optionLabel="kurzbz" :suggestions="filteredStandorte" @complete="search" minLength="3"/>
 								</div>
 						</div>
 				</form>
 			    <template #footer>
-            		<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
+            		<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{this.$p.t('ui', 'abbrechen')}}</button>
 					<button type="button" class="btn btn-primary" @click="addNewContact()">OK</button>
             	</template>
 		</BsModal>
 						
 		<!--Modal: Edit Contact-->
 		<BsModal ref="editContactModal">
-			<template #title>Kontakt bearbeiten</template>
+			<template #title>{{this.$p.t('person', 'kontakt_edit')}}</template>
 			<form class="row g-3" ref="contactData">
 				<div class="row mb-3">
-					<label for="kontakttyp" class="form-label col-sm-4">Typ</label>
+					<label for="kontakttyp" class="form-label col-sm-4">{{this.$p.t('global', 'typ')}}</label>
 					<div class="col-sm-6">
 						<select id="kontakttyp" class="form-control" v-model="contactData.kontakttyp">
 							<option value="">-- keine Auswahl --</option>
@@ -253,19 +277,19 @@ export default{
 					</div>
 				</div>
 				<div class="row mb-3">									   
-					<label for="kontakt" class="form-label col-sm-4">Kontakt</label>
+					<label for="kontakt" class="form-label col-sm-4">{{this.$p.t('global', 'kontakt')}}</label>
 					<div class="col-sm-6">
 						<input type="text" :readonly="readonly" class="form-control" id="kontakt" v-model="contactData['kontakt']">
 					</div>
 				</div>
 				<div class="row mb-3">									   
-					<label for="anmerkung" class="form-label col-sm-4">Anmerkung</label>
+					<label for="anmerkung" class="form-label col-sm-4">{{this.$p.t('global', 'anmerkung')}}</label>
 					<div class="col-sm-6">
 						<input type="text" :readonly="readonly" class="form-control" id="anmerkung" v-model="contactData['anmerkung']">
 					</div>
 				</div>
 				<div class="row mb-3">
-					<label for="zustellung" class="form-label col-sm-4">Zustellung</label>
+					<label for="zustellung" class="form-label col-sm-4">{{this.$p.t('person', 'zustellung')}}</label>
 					<div class="col-sm-6">
 						<div class="form-check">
 							<input id="zustellung" type="checkbox" class="form-check-input" value="1" v-model="contactData['zustellung']">
@@ -277,7 +301,7 @@ export default{
 				</div>
 				
 				<div class="row mb-3">
-					<label for="standort" class="form-label col-sm-4">Firma / Standort</label>
+					<label for="standort" class="form-label col-sm-4">{{this.$p.t('person', 'firma')}} / {{this.$p.t('person', 'standort')}}</label>
 						<div v-if="contactData.kurzbz" class="col-sm-6">
 							<input type="text" :readonly="readonly" class="form-control" id="name" v-model="contactData.kurzbz">
 						</div>	
@@ -287,19 +311,19 @@ export default{
 				</div>
 			</form>
 			<template #footer>
-				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">Abbrechen</button>
+				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">{{this.$p.t('ui', 'abbrechen')}}</button>
 				<button type="button" class="btn btn-primary" @click="updateContact(contactData.kontakt_id)">OK</button>
 			</template>
 		</BsModal>
 									
 		<!--Modal: Delete Contact-->
 		<BsModal ref="deleteContactModal">
-			<template #title>Kontakt löschen</template>  
+			<template #title>{{this.$p.t('person', 'kontakt_delete')}}</template>  
 			<template #default>
-				<p>Kontakt wirklich löschen?</p>
+				<p>{{this.$p.t('person', 'kontakt_confirm_delete')}}</p>
 			</template>												
 			<template #footer>
-				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">Abbrechen</button>
+				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">{{this.$p.t('ui', 'abbrechen')}}</button>
 				<button ref="Close" type="button" class="btn btn-primary" @click="deleteContact(contactData.kontakt_id)">OK</button>
 			</template>
 		</BsModal>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index c7f3659fb..df493751f 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -2081,6 +2081,166 @@ $phrases = array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'adressen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Adressen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'addresses',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'bankverbindungen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bankverbindungen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'bank details',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'rechnungsadresse',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Rechnungsadresse',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'billing address',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'heimatadresse',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Heimatadresse',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'home address',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'co_name',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'abweichender Empfänger',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'c/o',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'gemeinde',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gemeinde',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'municipality',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'gemeinde_waehlen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bitte gültige Gemeinde wählen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Please select a valid municipality',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'plz_waehlen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bitte gültige PLZ wählen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Please select a valid zip code',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'person',
@@ -2121,6 +2281,26 @@ $phrases = array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'plz',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'plz',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'code',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'person',
@@ -2141,6 +2321,26 @@ $phrases = array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'zustellung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zustellung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'delivery',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'person',
@@ -21915,6 +22115,444 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'notiz',
+		'phrase' => 'error_fieldRequired',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Das Eingabefeld {field} ist erforderlich',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The Input Field {field} is required',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'notiz',
+		'phrase' => 'error_textFieldRequired',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Das Eingabefeld textField ist erforderlich',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The Field textField is required',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'firma_zusatz',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Firmenzusatz',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'add.company info',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'firma',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Firma',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'company',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'standort',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Standort',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'location',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'adresse_new',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Adresse anlegen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'create address',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'adresse_edit',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Adresse bearbeiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'edit address',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'adresse_delete',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Adresse löschen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'delete address',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'adresse_confirm_delete',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Adresse wirklich löschen?',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Really delete address?',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'kontakt_new',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kontakt anlegen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'create contact data',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'kontakt_edit',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kontakt bearbeiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'edit contact data',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'kontakt_delete',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kontakt löschen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'delete contact data',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'kontakt_confirm_delete',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kontakt wirklich löschen?',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Really delete contact data?',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'kontonr',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kontonummer',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Address',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'anschrift',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anschrift',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Bank account number',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'verrechnung',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Verrechnung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Billing',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'blz',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'BLZ',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Bank code',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'privatkonto',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Privatkonto',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Private account',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'firmenkonto',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Firmenkonto',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Company Account',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'bankvb_new',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bankverbindung anlegen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'create bank details',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'bankvb_edit',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bankverbindung bearbeiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'edit bank details',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'bankvb_delete',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bankverbindung löschen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'delete bank details',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'bankvb_confirm_delete',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bankverbindung wirklich löschen?',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Really delete bank details?',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+
 );
 
 

From e824d48edf4a9adb05e063a3a4a5db7975dc8b6d Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 26 Jan 2024 14:40:57 +0100
Subject: [PATCH 0354/1461] update action and delete buttons in Kontakt-Tab

---
 .../Details/Kontakt/Address.js                | 40 ++++++++++++-------
 .../Details/Kontakt/Bankaccount.js            | 38 ++++++++++++------
 .../Details/Kontakt/Contact.js                | 38 ++++++++++++------
 3 files changed, 76 insertions(+), 40 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
index 2b9f9c0fe..8905ed52a 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
@@ -4,14 +4,6 @@ import PvAutoComplete from "../../../../../../../index.ci.php/public/js/componen
 import FhcFormValidation from '../../../../Form/Validation.js';
 import BsModal from "../../../../Bootstrap/Modal.js";
 
-
-var editIcon = function (cell, formatterParams) {
-	return "<i class='fa fa-edit'></i>";
-};
-var deleteIcon = function (cell, formatterParams) {
-	return "<i class='fa fa-remove'></i>";
-};
-
 export default{
 	components: {
 		CoreFilterCmpt,
@@ -55,12 +47,32 @@ export default{
 						}
 					},
 					{title:"Anmerkung", field:"anmerkung", visible:false},
-						{formatter:editIcon, width:40, align:"center", cellClick: (e, cell) => {
-								this.actionEditAdress(cell.getData().adresse_id);
-							}, width:50, headerSort:false},
-						{formatter:deleteIcon, width:40, align:"center", cellClick: (e, cell) => {
-								this.actionDeleteAdress(cell.getData().adresse_id);
-							}, width:50, headerSort:false },
+					{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.addEventListener('click', (event) =>
+								this.actionEditAdress(cell.getData().adresse_id)
+							);
+							container.append(button);
+
+							button = document.createElement('button');
+							button.className = 'btn btn-outline-secondary btn-action';
+							button.innerHTML = '<i class="fa fa-xmark"></i>';
+							button.addEventListener('click', () =>
+								this.actionDeleteAdress(cell.getData().adresse_id)
+							);
+							container.append(button);
+
+							return container;
+						},
+						frozen: true
+					},
 				],
 				layout: 'fitDataFill',
 				layoutColumnsOnNewData:	false,
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
index c4f457260..cd3bbbfad 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
@@ -2,13 +2,6 @@ import {CoreFilterCmpt} from "../../../../filter/Filter.js";
 import {CoreRESTClient} from "../../../../../RESTClient";
 import BsModal from "../../../../Bootstrap/Modal.js";
 
-var editIcon = function (cell, formatterParams) {
-	return "<i class='fa fa-edit'></i>";
-};
-var deleteIcon = function (cell, formatterParams)  {
-	return "<i class='fa fa-remove'></i>";
-};
-
 export default{
 	components: {
 		CoreFilterCmpt,
@@ -50,13 +43,32 @@ export default{
 					},
 					{title:"Person_id", field:"person_id", visible:false},
 					{title:"Bankverbindung_id", field:"bankverbindung_id", visible:false},
-					{formatter:editIcon, width:40, align:"center", cellClick: (e, cell) => {
-							this.actionEditBankverbindung(cell.getData().bankverbindung_id);
-						}, width:50, headerSort:false},
-					{formatter:deleteIcon, width:40, align:"center", cellClick: (e, cell) => {
-							this.actionDeleteBankverbindung(cell.getData().bankverbindung_id);
-						}, width:50, headerSort:false },
+					{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.addEventListener('click', (event) =>
+								this.actionEditBankverbindung(cell.getData().bankverbindung_id)
+							);
+							container.append(button);
+
+							button = document.createElement('button');
+							button.className = 'btn btn-outline-secondary btn-action';
+							button.innerHTML = '<i class="fa fa-xmark"></i>';
+							button.addEventListener('click', () =>
+								this.actionDeleteBankverbindung(cell.getData().bankverbindung_id)
+							);
+							container.append(button);
+
+							return container;
+						},
+						frozen: true
+					},
 				],
 				layout: 'fitDataFill',
 				layoutColumnsOnNewData:	false,
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
index 806f07fdd..0ed648b5c 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
@@ -4,13 +4,6 @@ import BsModal from "../../../../Bootstrap/Modal.js";
 /*import PvToast from "../../../../../../../index.ci.php/public/js/components/primevue/toast/toast.esm.min.js";*/
 import PvAutoComplete from "../../../../../../../index.ci.php/public/js/components/primevue/autocomplete/autocomplete.esm.min.js";
 
-var editIcon = function (cell, formatterParams) {
-	return "<i class='fa fa-edit'></i>";
-};
-var deleteIcon = function (cell, formatterParams){
-	return "<i class='fa fa-remove'></i>";
-};
-
 export default{
 	components: {
 		CoreFilterCmpt,
@@ -39,13 +32,32 @@ export default{
 					{title:"Kontakt_id", field:"kontakt_id", visible:false},
 					{title:"Standort_id", field:"standort_id", visible:false},
 					{title:"letzte Änderung", field:"updateamum", visible:false},
-						{formatter:editIcon, cellClick: (e, cell) => {
-								this.actionEditContact(cell.getData().kontakt_id);
-							}, width:50, headerSort:false, headerVisible:false},
-						{formatter:deleteIcon, cellClick: (e, cell) => {
-								this.actionDeleteContact(cell.getData().kontakt_id);
+					{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";
 
-							}, width:50, headerSort:false, headerVisible:false},
+							let button = document.createElement('button');
+							button.className = 'btn btn-outline-secondary btn-action';
+							button.innerHTML = '<i class="fa fa-edit"></i>';
+							button.addEventListener('click', (event) =>
+								this.actionEditContact(cell.getData().kontakt_id)
+							);
+							container.append(button);
+
+							button = document.createElement('button');
+							button.className = 'btn btn-outline-secondary btn-action';
+							button.innerHTML = '<i class="fa fa-xmark"></i>';
+							button.addEventListener('click', () =>
+								this.actionDeleteContact(cell.getData().kontakt_id)
+							);
+							container.append(button);
+
+							return container;
+						},
+						frozen: true
+					},
 				],
 				layout: 'fitDataFill',
 				layoutColumnsOnNewData:	false,

From bece495ac8a4064b640574bf0af450eb89deba4d Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 26 Jan 2024 16:37:39 +0100
Subject: [PATCH 0355/1461] fixes edge cases realted to creating new profil
 update requests

---
 application/controllers/Cis/Profil.php       | 30 +++-------
 application/controllers/Cis/ProfilUpdate.php | 58 +++++++++++++-------
 2 files changed, 47 insertions(+), 41 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index 3b3ccf182..5b0cacfbf 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -96,7 +96,7 @@ class Profil extends Auth_Controller
 		$json = json_decode($this->input->raw_input_stream);
 		$payload = $json->payload;
 	
-		$type = property_exists($json->payload,"kontakt_id")? "kontakt_id" : "adresse_id";
+		$identifier = property_exists($json->payload,"kontakt_id")? "kontakt_id" : "adresse_id";
 		
 		$name = $this->PersonModel->getFullName($this->uid);
 		if(isError($name)){
@@ -111,36 +111,28 @@ class Profil extends Auth_Controller
 		$res = hasData($res) ? getData($res) : null;
 		
 		if($res){
-		foreach($res as $update_request){
+		$pending_changes = array_filter($res, function($element) {
+			return $element->status == 'pending';
+		});
+		foreach($pending_changes as $update_request){
 			$existing_change = json_decode($update_request->requested_change);
 			
-			 
-			if(!isset($existing_change->add) && property_exists($existing_change,$type) && property_exists($payload,$type) && $existing_change->$type == $payload->$type){
+			 //? the user can add as many new kontakt/adresse as he likes
+			if( !isset($payload->add) && property_exists($existing_change,$identifier) && property_exists($payload,$identifier) && $existing_change->$identifier == $payload->$identifier){
 				//? the kontakt_id / adresse_id of a change has to be unique 
-				
 				echo json_encode(error("cannot change the same resource twice"));
 				return;
 			}
 
-			
-			if(isset($payload->add)){
-				//TODO: add functionality for adding a new kontakt or address
-	
-			}elseif($update_request->topic == $json->topic ){
-				
+			elseif(!isset($payload->add) && !isset($payload->delete) && $update_request->topic == $json->topic ){
 				//? if it is not a delete or add request than the topic in combination with the uid of the user have to be unique
 				echo json_encode(error("A request to change " . $json->topic . " is already open"));
 				return;
 			}
 		}}
 		
-		
-		
-		
-		
 			$insert_res = $this->ProfilChangeModel->insert($data);
-			
-		
+				
 			if(isError($insert_res)){
 				//catch error
 			}else{
@@ -149,10 +141,6 @@ class Profil extends Auth_Controller
 				$insert_res->retval = date_create($editTimestamp)->format('d.m.Y');
 				echo json_encode($insert_res);
 			}
-		
-
-
-
 	}
 
 	public function updateProfilRequest()
diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
index 66a38cd17..24db74ddd 100644
--- a/application/controllers/Cis/ProfilUpdate.php
+++ b/application/controllers/Cis/ProfilUpdate.php
@@ -58,14 +58,29 @@ class ProfilUpdate extends Auth_Controller
 		}
 		
 		if(is_array($requested_change) && array_key_exists("adresse_id",$requested_change)){
-			$resID = $this->handleAdresse($requested_change, $personID);
-			$resID = hasData($resID) ? getData($resID) : null;
-			$requested_change['adresse_id'] = $resID;
-			
+			$insertID = $this->handleAdresse($requested_change, $personID);
+			$insertID = hasData($insertID) ? getData($insertID) : null;
+			if(isset($insertID)) {
+				$requested_change['kontakt_id'] = $insertID;
+				$update_res = $this->updateRequestedChange($id,$requested_change);
+				if(isError($update_res)){
+					echo json_encode(error("was not able to add addresse_id " . $insertID . " to profilRequest " . $id ));
+					return;
+				}
+			}
+		
 		}else if (is_array($requested_change) && array_key_exists("kontakt_id", $requested_change)){
-			$resID = $this->handleKontakt($requested_change, $personID);
-			$resID = hasData($resID) ? getData($resID)[0] : null;
-			$requested_change['kontakt_id'] = $resID;
+			$insertID = $this->handleKontakt($requested_change, $personID);
+			$insertID = hasData($insertID) ? getData($insertID) : null;
+			if(isset($insertID)) {
+				$requested_change['kontakt_id'] = $insertID;
+				$update_res = $this->updateRequestedChange($id,$requested_change);
+				if(isError($update_res)){
+					 echo json_encode(error("was not able to add kontakt_id " . $insertID . " to profilRequest " . $id ));
+					 return;
+				}
+			}
+			
 			
 		}else{
 			switch($topic){
@@ -74,7 +89,7 @@ class ProfilUpdate extends Auth_Controller
 			}
 			$result = $this->PersonModel->update($personID,[$topic=>$requested_change]);
 			if(isError($result)){
-				echo json_encode($result);
+				echo json_encode(error("was not able to update Person Information: " . $topic . " with value : " . $requested_change));
 				return;
 			}
 		}
@@ -91,10 +106,12 @@ class ProfilUpdate extends Auth_Controller
 		echo json_encode($this->setStatusOnUpdateRequest($id, "rejected", $status_message));
 	}
 
-	private function setStatusOnUpdateRequest($id, $status, $status_message, $requested_change=NULL){
-		$update = ["status"=>$status,"status_timestamp"=>"NOW()","status_message"=>$status_message];
-		if(isset($requested_change)) { $update['requested_change'] = $requested_change; } 
-		return $this->ProfilChangeModel->update([$id], $update);
+	private function updateRequestedChange($id, $requested_change){
+		return $this->ProfilChangeModel->update([$id], ['requested_change'=>json_encode($requested_change)]);
+	}
+
+	private function setStatusOnUpdateRequest($id, $status, $status_message ){ 
+		return $this->ProfilChangeModel->update([$id], ["status"=>$status,"status_timestamp"=>"NOW()","status_message"=>$status_message]);
 	}
 
 
@@ -110,17 +127,18 @@ class ProfilUpdate extends Auth_Controller
 			unset($requested_change['add']);
 			//? fields like insertvon are not filled when inserting new row
 			$requested_change['person_id'] = $personID;
-			$res = $this->KontaktModel->insert($requested_change);
+			$insertID = $this->KontaktModel->insert($requested_change);
+			
 		}
 		//! DELETE
 		elseif(array_key_exists('delete',$requested_change) && $requested_change['delete']){
-			$res = $this->KontaktModel->delete($kontakt_id);
+			$this->KontaktModel->delete($kontakt_id);
 		}
 		//! UPDATE
 		else{
-			$res = $this->KontaktModel->update($kontakt_id,$requested_change);
+			$this->KontaktModel->update($kontakt_id,$requested_change);
 		}
-		return $res;
+		return isset($insertID) ? $insertID : null;
 	}
 
 	private function handleAdresse($requested_change, $personID){
@@ -143,16 +161,16 @@ class ProfilUpdate extends Auth_Controller
 			//? fields like insertvon are not filled when inserting new row
 			$requested_change['person_id'] = $personID;
 			//TODO: zustelladresse, heimatadresse, rechnungsadresse und nation werden nicht beachtet
-			$res = $this->AdresseModel->insert($requested_change);
+			$insertID = $this->AdresseModel->insert($requested_change);
 		}
 		//! DELETE
 		elseif(array_key_exists('delete',$requested_change) && $requested_change['delete']){
-			$res = $this->AdresseModel->delete($adresse_id);
+			$this->AdresseModel->delete($adresse_id);
 		}
 		//! UPDATE
 		else{
-			$res = $this->AdresseModel->update($adresse_id,$requested_change);
+			$this->AdresseModel->update($adresse_id,$requested_change);
 		}
-		return $res;
+		return isset($insertID)? $insertID : null;
 	}
 }
\ No newline at end of file

From bdf59f323086c7d8afb28c78ed8ee042c112710c Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 26 Jan 2024 17:51:08 +0100
Subject: [PATCH 0356/1461] layout fixes and adding profilUpdateRequests
 component to Student view

---
 public/js/components/Cis/Profil/EditProfil.js |  10 +-
 .../Cis/Profil/MitarbeiterProfil.js           |  35 ++--
 .../ProfilComponents/FetchProfilUpdates.js    |  33 ++--
 .../Cis/Profil/ProfilComponents/Status.js     |  23 ++-
 .../js/components/Cis/Profil/StudentProfil.js | 152 +++++++++++++++---
 5 files changed, 175 insertions(+), 78 deletions(-)

diff --git a/public/js/components/Cis/Profil/EditProfil.js b/public/js/components/Cis/Profil/EditProfil.js
index 4c024d944..47ffd19fd 100644
--- a/public/js/components/Cis/Profil/EditProfil.js
+++ b/public/js/components/Cis/Profil/EditProfil.js
@@ -12,7 +12,7 @@ export default {
   props: {
 
     value: Object,
-    timestamp: Object,
+    title: String,
     /*
      * NOTE(chris):
      * Hack to expose in "emits" declared events to $props which we use
@@ -81,8 +81,8 @@ export default {
   template: `
   <bs-modal ref="modalContainer" v-bind="$props" body-class="" dialog-class="modal-lg" class="bootstrap-alert" backdrop="false" >
     
-  <template v-slot:title>
-      {{"Profil bearbeiten" }}  
+  <template v-if="title" v-slot:title>
+      {{title }}  
     </template>
     <template v-slot:default>
 
@@ -100,9 +100,7 @@ export default {
     </template>
     <!-- optional footer -->
     <template   v-slot:footer>
-      <button class="btn btn-outline-danger " @click="hide">Abbrechen</button>
-      <!--<p v-if="editTimestamp" class="flex-fill">Letzte Anfrage: {{editTimestamp}}</p>-->
-    
+      <button class="btn btn-outline-danger " @click="hide">Abbrechen</button>    
       <button v-if="profilUpdate"  @click="submitProfilChange" role="button" class="btn btn-primary">Senden</button>
     </template>
     <!-- end of optional footer --> 
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 6b66aeccf..e2087880e 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -131,8 +131,6 @@ export default {
     };
   },
 
-  //? this is the prop passed to the dynamic component with the custom data of the view
-  
   props: {
 		data: Object,
 	},
@@ -152,7 +150,7 @@ export default {
 
       EditProfil.popup({ 
           value:JSON.parse(JSON.stringify(this.data.editData)),
-          timestamp:this.data.editDataTimestamp
+          title:"Profil bearbeiten",
         }).then((popup_result) => {
           if(popup_result){
             Vue.$fhcapi.UserData.selectProfilRequest()
@@ -165,12 +163,10 @@ export default {
             })
             .catch(err=>alert(err));
           }
-          
         }).catch((e) => {
           // Wenn der User das Modal abbricht ohne Änderungen
          
         });
-    
     },
   
     
@@ -236,11 +232,6 @@ export default {
   },
  
   created() {
-    
-    
-    
-    
-    
 
       this.data.editData = {
         view:null,
@@ -305,10 +296,6 @@ export default {
        
       };
 
-
-      console.log(JSON.stringify(this.data.editData,null,2));
-
-  
   },
   mounted() {
     
@@ -331,19 +318,19 @@ export default {
               <div  class="d-md-none col-12 ">
              
               <div class="row mb-3">
-              <div class="col">
-              <!-- MOBILE QUICK LINKS -->     
-                <quick-links :mobile="true"></quick-links>
+                <div class="col">
+                <!-- MOBILE QUICK LINKS -->     
+                  <quick-links :mobile="true"></quick-links>
+                </div>
               </div>
-            </div>
 
             
-            <div class="row mb-3">
-            <div class="col">
-              <!-- MOBILE PROFIL UPDATES -->  
-              <fetch-profil-updates @fetchUpdates="fetchProfilUpdates" :data="data.profilUpdates"></fetch-profil-updates>
-            </div>
-          </div>
+              <div v-if="data.profilUpdates" class="row mb-3">
+                <div class="col">
+                  <!-- MOBILE PROFIL UPDATES -->  
+                  <fetch-profil-updates @fetchUpdates="fetchProfilUpdates" :data="data.profilUpdates"></fetch-profil-updates>
+                </div>
+              </div>
 
             
 
diff --git a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
index 23310fd2f..7477979ff 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
@@ -78,7 +78,7 @@ export default {
             EditProfil.popup({ 
                 
                 value:content,
-                timestamp:null,
+               
               }).then((res) => {
                 if(res === true){
                     this.$emit('fetchUpdates');
@@ -113,46 +113,39 @@ export default {
                 <tr >
                 <th scope="col">Topic</th>
                 <th scope="col">Status</th>
-                <th scope="col">Date of Request</th>
-                
-                <th  scope="col">Action</th>
-                
-                
+                <th scope="col">Date</th>
+                <th class="text-center" scope="col">Action</th>
                 </tr>
             </thead>
             <tbody>
-            <!-- :class="{'bg-success':item.status === 'accepted', 'bg-danger':item.status === 'rejected', 'text-white':item.status =='rejected' || item.status=='accepted'}" -->
                 <tr v-for="item in data" :style="item.status=='accepted'?'background-color:lightgreen':item.status==='rejected'?'background-color:lightcoral':''">
                 <td class="align-middle text-wrap">{{item.topic}}</td>
-                <td class="align-middle text-center" >{{item.status}}</td>
+                <td class="align-middle " >{{item.status}}</td>
                 <td class="align-middle">{{item.change_timestamp}}</td>
                 
-                
-                
                 <template v-if="item.status === 'pending'">
                 <td>
-                <template v-if="item.topic.toLowerCase().includes('delete')">
                 
+                <div class="d-flex flex-row justify-content-evenly">
+                <template v-if="item.topic.toLowerCase().includes('delete')">
                 <div  class="align-middle text-center"><i role="button" @click="openModal(item)" class="fa fa-eye"></i></div>
                 </template>
+
                 <template v-else >
                 <div class="align-middle text-center" ><i style="color:#00639c" @click="openModal(item)" role="button" class="fa fa-edit"></i></div>
                 </template>
                 
                 <div class="align-middle text-center"><i style="color:red" role="button" @click="deleteRequest(item)" class="fa fa-trash"></i></div>
-                
+                </div>
+
                 </td>
                 </template>
-                <template v-else-if="item.status === 'accepted'">
+
+                <template v-else>
+                <div class="d-flex flex-row justify-content-evenly">
                 <td  class="align-middle text-center"><i  role="button" @click="openModal(item)" class="fa fa-eye"></i></td>
                 </template>
-                <template v-else-if="item.status === 'rejected'">
-                <td  class="align-middle text-center"><i  role="button" @click="openModal(item)" class="fa fa-eye"></i></td>
-                </template>
-                
-                
-                
-                
+                </div>
                 
                 </tr>
             </tbody>
diff --git a/public/js/components/Cis/Profil/ProfilComponents/Status.js b/public/js/components/Cis/Profil/ProfilComponents/Status.js
index a1aed8054..0092f984e 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/Status.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/Status.js
@@ -38,22 +38,33 @@ export default {
     created(){
 
     },template:`
-  
+    <div class="row">
+
+    <div class="col">
     <div  class="form-underline mb-2">
     <div class="form-underline-titel">Status</div>
     <span  class="form-underline-content">{{status}} </span>
     </div>
-
-    <div v-if="status_message" class="form-underline mb-2 ">
-    <div class="form-underline-titel">Status message</div>
-    <span  class="form-underline-content">{{status_message}} </span>
     </div>
 
+    <div class="col">
     <div  class="form-underline mb-2">
     <div class="form-underline-titel">Date</div>
     <span  class="form-underline-content">{{status_timestamp}} </span>
     </div>
-    
+    </div>
+ 
+    </div>
+    <div class="row">
+    <div class="col">
+    <div v-if="status_message" class="form-underline mb-2 ">
+    <div class="form-underline-titel">Status message</div>
+    <textarea  class="form-control" rows="4" disabled>{{status_message}} </textarea>
+    </div>
+    </div>
+    </div>
+
+
     <div class="card mt-4">
     <div class="card-header">
     <i class="fa" :class="{'fa-trash':cardHeader==='Delete', 'fa-edit':cardHeader==='Update', 'fa-plus':cardHeader==='Add'}" ></i>
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index f61440630..e1063b7eb 100644
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -1,4 +1,3 @@
-import fhcapifactory from "../../../apps/api/fhcapifactory.js";
 import { CoreFilterCmpt } from "../../../components/filter/Filter.js";
 import Mailverteiler from "./ProfilComponents/Mailverteiler.js";
 import AusweisStatus from "./ProfilComponents/FhAusweisStatus.js";
@@ -8,6 +7,8 @@ import Kontakt from "./ProfilComponents/Kontakt.js";
 import ProfilEmails from "./ProfilComponents/ProfilEmails.js";
 import RoleInformation from "./ProfilComponents/RoleInformation.js";
 import ProfilInformation from "./ProfilComponents/ProfilInformation.js";
+import FetchProfilUpdates from "./ProfilComponents/FetchProfilUpdates.js";
+import EditProfil from "./EditProfil.js";
 
 export default {
   components: {
@@ -20,6 +21,7 @@ export default {
     ProfilEmails,
     RoleInformation,
     ProfilInformation,
+    FetchProfilUpdates,
 
   },
   data() {
@@ -74,31 +76,45 @@ export default {
     };
   },
 
-  //? this is the prop passed to the dynamic component with the custom data of the view
   props: ["data"],
   methods: {
-    sperre_foto_function() {
-      if (!this.data) {
-        return;
-      }
-      fhcapifactory.UserData.sperre_foto_function(!this.data.foto_sperre).then((res) => {
-        this.data.foto_sperre = res.data.foto_sperre;
+
+    fetchProfilUpdates: function(){
+      Vue.$fhcapi.UserData.selectProfilRequest().then((res)=>{
+        
+        if(!res.error){
+          this.data.profilUpdates = res.data.retval?.length ? res.data.retval : null ; 
+        }
       });
     },
+    
+    showModal() {
+
+      EditProfil.popup({ 
+          value:JSON.parse(JSON.stringify(this.data.editData)),
+          title:"Profil bearbeiten",
+        }).then((popup_result) => {
+          if(popup_result){
+            Vue.$fhcapi.UserData.selectProfilRequest()
+            .then((res) =>{
+              if(!res.error){
+                this.data.profilUpdates = res.data.retval;
+              }else{
+                alert("Error when fetching profile updates: " +res.data.retval);
+              }
+            })
+            .catch(err=>alert(err));
+          }
+        }).catch((e) => {
+          // Wenn der User das Modal abbricht ohne Änderungen
+         
+        });
+    },
    
   },
 
   computed: {
  
-
-    get_image_base64_src() {
-      if (!this.data) {
-        return "";
-      }
-      return "data:image/jpeg;base64," + this.data.foto;
-    },
-
-   
    profilInformation() {
       if (!this.data) {
         return {};
@@ -154,6 +170,71 @@ export default {
     
   },
 
+  created(){
+    this.data.editData = {
+      view:null,
+      data:{
+      Personen_Informationen : {
+        title:"Personen Informationen",
+        view:null,
+        data:{
+          
+          vorname: {
+            title:"vorname",
+            view:"text_input",
+            data:{
+              titel:"vorname",
+              value:this.data.vorname,
+            }},
+            nachname: {
+              title:"nachname",
+              view:"text_input",
+              data:{
+                titel:"nachname",
+                value:this.data.nachname,
+              }
+            },
+            titel:{
+              title:"titel",
+              view:"text_input",
+              data:{
+                titel:"titel",
+                value:this.data.titel,
+              }
+            },
+            postnomen:{
+              title:"postnomen",
+              view:"text_input",
+              data:{
+                titel:"postnomen",
+                value:this.data.postnomen,
+              }
+            },
+          }
+        },
+        Private_Kontakte: {
+          title:"Private Kontakte" ,
+          data:this.privateKontakte.map(kontakt => {
+            return {
+              listview:'Kontakt',
+              view:'EditKontakt',
+              data:kontakt
+            }})
+         },
+        Private_Adressen: {
+          title: "Private Adressen",
+          data:this.privateAdressen.map(kontakt => {
+            return {
+              listview:'Adresse',
+              view:'EditAdresse',
+              data:kontakt
+            }})
+         },
+        },
+     
+    };
+  },
+
   mounted() {
     this.$refs.betriebsmittelTable.tabulator.on('tableBuilt', () => {
     
@@ -179,11 +260,18 @@ export default {
               <div  class="d-md-none col-12 ">
              
               <div class="row py-2">
-              <div class="col">
-               
-              <quick-links :mobile="true"></quick-links>
+                <div class="col">
+                
+                <quick-links :mobile="true"></quick-links>
+                </div>
+              </div>
+
+              <div v-if="data.profilUpdates" class="row mb-3">
+                <div class="col">
+                  <!-- MOBILE PROFIL UPDATES -->  
+                  <fetch-profil-updates @fetchUpdates="fetchProfilUpdates" :data="data.profilUpdates"></fetch-profil-updates>
+                </div>
               </div>
-            </div>
 
               </div>
               <!-- END OF HIDDEN QUCK LINKS -->
@@ -339,7 +427,27 @@ export default {
               <div  class="col-md-4 col-xxl-3 col-sm-12 text-break" >
 
 
-             
+              <!-- Bearbeiten Button -->
+  
+              <div class="row d-none d-md-block mb-3">
+              <div class="col mb-3">
+              <button @click="showModal" type="button" class="text-start  w-100 btn btn-outline-secondary" >
+                <div class="row">
+                  <div class="col-2">
+                    <i class="fa fa-edit"></i>
+                  </div>
+                  <div class="col-10">Bearbeiten</div>
+                </div>
+              </button>
+              </div>
+              </div>
+
+                <div v-if="data.profilUpdates" class="row d-none d-md-block mb-3">
+                <div class="col mb-3">
+                    <!-- PROFIL UPDATES -->
+                    <fetch-profil-updates @fetchUpdates="fetchProfilUpdates" :data="data.profilUpdates"></fetch-profil-updates>
+                </div>    
+                </div>
               
                 <div  class="row d-none d-md-block mb-3">
                   <div class="col">

From b7fa6b2072a34cf2a94e679214a96489cf0853d5 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 29 Jan 2024 07:52:15 +0100
Subject: [PATCH 0357/1461] update Forms

---
 public/js/components/Notiz/Notiz.js           |  2 +-
 .../Details/Kontakt/Address.js                | 70 +++++++++----------
 .../Details/Kontakt/Bankaccount.js            | 42 +++++------
 .../Details/Kontakt/Contact.js                | 36 +++++-----
 4 files changed, 75 insertions(+), 75 deletions(-)

diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index c3eead4bb..988c6d7ec 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -188,7 +188,7 @@ export default {
 			<div>
 				<div class="row mb-3">
 					<div class="col-sm-7">
-						<span class="small">[{{this.typeId}}]</span>
+						<span class="small">[{{typeId}}]</span>
 					</div>
 				</div>
 				
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
index 8905ed52a..b9edfb634 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
@@ -325,10 +325,10 @@ export default{
 		
 		<!--Modal: Add Address-->
 		<BsModal ref="newAdressModal">
-			<template #title>{{this.$p.t('person', 'adresse_new')}}</template>
+			<template #title>{{$p.t('person', 'adresse_new')}}</template>
 				<form class="row g-3" ref="addressData">
 					<div class="row mb-3">
-						<label for="adressentyp" class="form-label col-sm-4">{{this.$p.t('global', 'typ')}}</label>
+						<label for="adressentyp" class="form-label col-sm-4">{{$p.t('global', 'typ')}}</label>
 						<div class="col-sm-6">
 							<select id="adressentyp" class="form-select" v-model="addressData.typ">
 								<option v-for="typ in adressentypen" :key="typ.adressentyp_kurzbz" :value="typ.adressentyp_kurzbz" >{{typ.bezeichnung}}</option>
@@ -336,14 +336,14 @@ export default{
 						</div>
 					</div>
 					<div class="row mb-3">
-						<label for="strasse" class="form-label col-sm-4">{{this.$p.t('person', 'strasse')}}</label>
+						<label for="strasse" class="form-label col-sm-4">{{$p.t('person', 'strasse')}}</label>
 						<div class="col-sm-6">
 							<input type="text" :readonly="readonly" class="form-control" id="strasse" v-model="addressData['strasse']">
 						</div>
 					</div>
 						
 					<div class="row mb-3">
-						<label for="nation" class="form-label col-sm-4">{{this.$p.t('person', 'nation')}}</label>
+						<label for="nation" class="form-label col-sm-4">{{$p.t('person', 'nation')}}</label>
 						<div class="col-sm-6">
 							<select id="nation" class="form-select" v-model="addressData.nation">
 								<option v-for="nation in nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
@@ -352,14 +352,14 @@ export default{
 					</div>
 										
 					<div class="row mb-3">
-						<label for="plz" class="required form-label col-sm-4" >{{this.$p.t('person', 'plz')}}</label>
+						<label for="plz" class="required form-label col-sm-4" >{{$p.t('person', 'plz')}}</label>
 						 <div class="col-sm-6">
 							<input type="text" class="form-control" required v-model="addressData['plz']" @input="loadPlaces" >
 						</div>
 					</div>
 					
 					<div class="row mb-3">
-						<label :for="gemeinde" class="form-label col-sm-4">{{this.$p.t('person', 'gemeinde')}}</label>
+						<label :for="gemeinde" class="form-label col-sm-4">{{$p.t('person', 'gemeinde')}}</label>
 							<div class="col-sm-6">
 								<select v-if="addressData['nation'] == 'A'" name="addressData[gemeinde]" class="form-select" v-model="addressData['gemeinde']">
 									<option v-if="!gemeinden.length" disabled>Bitte gültige PLZ wählen</option>
@@ -370,7 +370,7 @@ export default{
 					</div>
 					
 					<div class="row mb-3">
-							<label :for="Ort" class="form-label col-sm-4">{{this.$p.t('person', 'ort')}}</label>
+							<label :for="Ort" class="form-label col-sm-4">{{$p.t('person', 'ort')}}</label>
 							<div class="col-sm-6">
 								<select v-if="addressData['nation'] == 'A'" name="address[ort]" class="form-select" v-model="addressData['ort']">
 									<option v-if="!orte.length" disabled>Bitte gültige Gemeinde wählen</option>
@@ -381,7 +381,7 @@ export default{
 					</div>
 										
 					<div class="row mb-3">
-						<label for="heimatadresse" class="form-label col-sm-4">{{this.$p.t('person', 'heimatadresse')}}</label>
+						<label for="heimatadresse" class="form-label col-sm-4">{{$p.t('person', 'heimatadresse')}}</label>
 						<div class="col-sm-3">
 							<div class="form-check">
 								<input id="heimatadresse" type="checkbox" class="form-check-input" value="1" v-model="addressData['heimatadresse']">
@@ -390,7 +390,7 @@ export default{
 					</div>
 						
 					<div class="row mb-3">
-						<label for="zustelladresse" class="form-label col-sm-4">{{this.$p.t('person', 'zustelladresse')}}</label>
+						<label for="zustelladresse" class="form-label col-sm-4">{{$p.t('person', 'zustelladresse')}}</label>
 						<div class="col-sm-3">
 							<div class="form-check">
 								<input id="zustelladresse" type="checkbox" class="form-check-input" value="1" v-model="addressData['zustelladresse']">
@@ -399,14 +399,14 @@ export default{
 					</div>
 					
 					<div class="row mb-3">
-							<label for="co_name" class="form-label col-sm-4">{{this.$p.t('person', 'co_name')}}</label>
+							<label for="co_name" class="form-label col-sm-4">{{$p.t('person', 'co_name')}}</label>
 						<div class="col-sm-6">
 							<input type="text" id="co_name" class="form-control" v-model="addressData['co_name']">
 						</div>
 					</div>
 					
 					<div class="row mb-3">
-						<label for="rechnungsadresse" class="form-label col-sm-4">{{this.$p.t('person', 'rechnungsadresse')}}</label>
+						<label for="rechnungsadresse" class="form-label col-sm-4">{{$p.t('person', 'rechnungsadresse')}}</label>
 						<div class="col-sm-3">
 							<div class="form-check">
 								<input id="rechnungsadresse" type="checkbox" class="form-check-input" v-model="addressData['rechnungsadresse']">
@@ -415,37 +415,37 @@ export default{
 					</div>
 					
 					<div class="row mb-3">
-						<label for="firma_name" class="form-label col-sm-4">{{this.$p.t('person', 'firma')}}</label>
+						<label for="firma_name" class="form-label col-sm-4">{{$p.t('person', 'firma')}}</label>
 							<div class="col-sm-3">
 							 	<PvAutoComplete v-model="addressData['firma']"  optionLabel="name" :suggestions="filteredFirmen" @complete="search" minLength="3"/>
 							</div>
 					</div>
 					
 					<div class="row mb-3">
-						<label for="name" class="form-label col-sm-4">{{this.$p.t('person', 'firma_zusatz')}}</label>
+						<label for="name" class="form-label col-sm-4">{{$p.t('person', 'firma_zusatz')}}</label>
 						<div class="col-sm-6">
 							<input type="text" :readonly="readonly" class="form-control" id="name" v-model="addressData['name']">
 						</div>
 					</div>
 					<div class="row mb-3">
-						<label for="anmerkung" class="form-label col-sm-4">{{this.$p.t('global', 'anmerkung')}}</label>
+						<label for="anmerkung" class="form-label col-sm-4">{{$p.t('global', 'anmerkung')}}</label>
 						<div class="col-sm-6">
 							<input type="text" :readonly="readonly" class="form-control" id="anmerkung" v-model="addressData['anmerkung']">
 						</div>
 					</div>
 			</form>
 			<template #footer>
-				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{this.$p.t('ui', 'abbrechen')}}</button>
+				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{$p.t('ui', 'abbrechen')}}</button>
 				<button type="button" class="btn btn-primary" @click="addNewAddress()">OK</button>
             </template>
 		</BsModal>
 		
 		<!--Modal: Edit Address-->
 		<BsModal ref="editAdressModal">
-			<template #title>{{this.$p.t('person', 'adresse_edit')}}</template>
+			<template #title>{{$p.t('person', 'adresse_edit')}}</template>
 			<form class="row g-3" ref="addressData">
 				<div class="row mb-3">
-					<label for="adressentyp" class="form-label col-sm-4">{{this.$p.t('global', 'typ')}}</label>
+					<label for="adressentyp" class="form-label col-sm-4">{{$p.t('global', 'typ')}}</label>
 					<div class="col-sm-6">
 						<select id="adressentyp" class="form-control" v-model="addressData.typ">
 							<option v-for="typ in adressentypen" :key="typ.adressentyp_kurzbz" :value="typ.adressentyp_kurzbz" >{{typ.bezeichnung}}</option>
@@ -454,14 +454,14 @@ export default{
 				</div>
 				
 				<div class="row mb-3">
-					<label for="strasse" class="form-label col-sm-4">{{this.$p.t('person', 'strasse')}}</label>
+					<label for="strasse" class="form-label col-sm-4">{{$p.t('person', 'strasse')}}</label>
 					<div class="col-sm-6">
 						<input type="text" :readonly="readonly" class="form-control" id="strasse" v-model="addressData.strasse">
 					</div>
 				</div>
 					
 				<div class="row mb-3">
-					<label for="nation" class="form-label col-sm-4">{{this.$p.t('person', 'nation')}}</label>
+					<label for="nation" class="form-label col-sm-4">{{$p.t('person', 'nation')}}</label>
 					<div class="col-sm-6">
 						<select id="nation" class="form-select" v-model="addressData.nation">
 							<option v-for="nation in nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
@@ -470,39 +470,39 @@ export default{
 				</div>
 				
 				<div class="row mb-3">
-					<label for="plz" class="required form-label col-sm-4" >{{this.$p.t('person', 'plz')}}</label>
+					<label for="plz" class="required form-label col-sm-4" >{{$p.t('person', 'plz')}}</label>
 					 <div class="col-sm-6">
 						<input type="text" class="form-control" required v-model="addressData['plz']" @input="loadPlaces">
 					</div>
 				</div>
 				<div class="row mb-3">
-					<label :for="gemeinde" class="form-label col-sm-4">{{this.$p.t('person', 'gemeinde')}}</label>
+					<label :for="gemeinde" class="form-label col-sm-4">{{$p.t('person', 'gemeinde')}}</label>
 						<div v-if="addressData['gemeinde']" class="col-sm-6">
 							<input type="text" class="form-control" v-model="addressData['gemeinde']">
 						</div>
 						<div v-else class="col-sm-6">
 							<select v-if="addressData['nation'] == 'A'" name="addressData[gemeinde]" class="form-select" v-model="addressData['gemeinde']">
-								<option v-if="!gemeinden.length" disabled>{{this.$p.t('person', 'plz_waehlen')}}</option>
+								<option v-if="!gemeinden.length" disabled>{{$p.t('person', 'plz_waehlen')}}</option>
 								<option v-for="gemeinde in gemeinden" :key="gemeinde.name" :value="gemeinde.name">{{gemeinde.name}}</option>
 							</select>
 						</div>
 				</div>
 		
 				<div class="row mb-3">
-						<label :for="Ort" class="form-label col-sm-4">{{this.$p.t('person', 'ort')}}</label>
+						<label :for="Ort" class="form-label col-sm-4">{{$p.t('person', 'ort')}}</label>
 						<div v-if="addressData['ort']" class="col-sm-6">
 							<input type="text" name="ort" class="form-control" v-model="addressData['ort']">
 						</div>
 						<div v-else class="col-sm-6">
 							<select v-if="addressData['nation'] == 'A'" name="address[ort]" class="form-select" v-model="addressData['ort']">
-								<option v-if="!orte.length" disabled>{{this.$p.t('person', 'gemeinde_waehlen')}}</option>
+								<option v-if="!orte.length" disabled>{{$p.t('person', 'gemeinde_waehlen')}}</option>
 								<option v-for="ort in orte" :key="ort.ortschaftsname" :value="ort.ortschaftsname">{{ort.ortschaftsname}}</option>
 							</select>
 						</div>
 				</div>
 								
 				<div class="row mb-3">
-					<label for="heimatadresse" class="form-label col-sm-4">{{this.$p.t('person', 'heimatadresse')}}</label>
+					<label for="heimatadresse" class="form-label col-sm-4">{{$p.t('person', 'heimatadresse')}}</label>
 					<div class="col-sm-3">
 						<div class="form-check">
 							<input id="heimatadresse" type="checkbox" class="form-check-input" value="1" v-model="addressData['heimatadresse']">
@@ -511,7 +511,7 @@ export default{
 				</div>
 					
 				<div class="row mb-3">
-					<label for="zustelladresse" class="form-label col-sm-4">{{this.$p.t('person', 'zustelladresse')}}</label>
+					<label for="zustelladresse" class="form-label col-sm-4">{{$p.t('person', 'zustelladresse')}}</label>
 					<div class="col-sm-3">
 						<div class="form-check">
 							<input id="zustelladresse" type="checkbox" class="form-check-input" value="1" v-model="addressData['zustelladresse']">
@@ -520,14 +520,14 @@ export default{
 				</div>
 				
 				<div class="row mb-3">
-					<label for="co_name" class="form-label col-sm-4">{{this.$p.t('person', 'co_name')}}</label>
+					<label for="co_name" class="form-label col-sm-4">{{$p.t('person', 'co_name')}}</label>
 					<div class="col-sm-6">
 						<input type="text" id="co_name" class="form-control" v-model="addressData['co_name']">
 					</div>
 				</div>
 				
 				<div class="row mb-3">
-					<label for="rechnungsadresse" class="form-label col-sm-4">{{this.$p.t('person', 'rechnungsadresse')}}</label>
+					<label for="rechnungsadresse" class="form-label col-sm-4">{{$p.t('person', 'rechnungsadresse')}}</label>
 					<div class="col-sm-3">
 						<div class="form-check">
 							<input id="rechnungsadresse" type="checkbox" class="form-check-input" v-model="addressData['rechnungsadresse']">
@@ -536,7 +536,7 @@ export default{
 				</div>
 				
 				<div class="row mb-3">
-					<label for="firma_name" class="form-label col-sm-4">{{this.$p.t('person', 'firma')}}</label>
+					<label for="firma_name" class="form-label col-sm-4">{{$p.t('person', 'firma')}}</label>
 						<div v-if="addressData.firmenname" class="col-sm-6">
 							<input type="text" :readonly="readonly" class="form-control" id="name" v-model="addressData.firmenname">
 						</div>
@@ -550,14 +550,14 @@ export default{
 				</div>
 	
 				<div class="row mb-3">
-					<label for="name" class="form-label col-sm-4">{{this.$p.t('person', 'firma_zusatz')}}</label>
+					<label for="name" class="form-label col-sm-4">{{$p.t('person', 'firma_zusatz')}}</label>
 					<div class="col-sm-6">
 						<input type="text" :readonly="readonly" class="form-control" id="name" v-model="addressData['name']">
 					</div>
 				</div>
 				
 				<div class="row mb-3">
-					<label for="anmerkung" class="form-label col-sm-4">{{this.$p.t('global', 'anmerkung')}}</label>
+					<label for="anmerkung" class="form-label col-sm-4">{{$p.t('global', 'anmerkung')}}</label>
 					<div class="col-sm-6">
 						<input type="text" :readonly="readonly" class="form-control" id="anmerkung" v-model="addressData['anmerkung']">
 					</div>
@@ -565,19 +565,19 @@ export default{
 			
 			</form>
 			<template #footer>
-				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">{{this.$p.t('ui', 'abbrechen')}}</button>
+				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">{{$p.t('ui', 'abbrechen')}}</button>
 				<button ref="Close" type="button" class="btn btn-primary" @click="updateAddress(addressData.adresse_id)">OK</button>
             </template>
 		</BsModal>
 		
 		<!--Modal: deleteAdressModal-->
 		<BsModal ref="deleteAdressModal">
-			<template #title>{{this.$p.t('person', 'adresse_delete')}}</template>
+			<template #title>{{$p.t('person', 'adresse_delete')}}</template>
 			<template #default>
-				<p>{{this.$p.t('person', 'adresse_confirm_delete')}}</p>
+				<p>{{$p.t('person', 'adresse_confirm_delete')}}</p>
 			</template>
 			<template #footer>
-				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">{{this.$p.t('ui', 'abbrechen')}}</button>
+				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">{{$p.t('ui', 'abbrechen')}}</button>
 				<button ref="Close" type="button" class="btn btn-primary" @click="deleteAddress(addressData.adresse_id)">OK</button>
 			</template>
 		</BsModal>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
index cd3bbbfad..0c6e6dda7 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
@@ -222,7 +222,7 @@ export default{
 		
 		<!--Modal: Add Bankverbindung-->
 		<BsModal title="Bankverbindung anlegen" ref="newBankverbindungModal">
-			<template #title>{{this.$p.t('person', 'bankvb_new')}}</template>
+			<template #title>{{$p.t('person', 'bankvb_new')}}</template>
 			<form class="row g-3" ref="bankverbindungData">
 				<div class="row mb-3">
 						<label for="name" class="form-label col-sm-4">Name</label>
@@ -231,7 +231,7 @@ export default{
 						</div>
 					</div>
 					<div class="row mb-3">										   
-						<label for="anschrift" class="form-label col-sm-4">{{this.$p.t('person', 'anschrift')}}</label>
+						<label for="anschrift" class="form-label col-sm-4">{{$p.t('person', 'anschrift')}}</label>
 						<div class="col-sm-6">
 							<input type="text" :readonly="readonly" class="form-control" id="anschrift" v-model="bankverbindungData['anschrift']">
 						</div>
@@ -250,28 +250,28 @@ export default{
 						</div>
 					</div>
 					<div class="row mb-3">							   
-						<label for="kontonr" class="form-label col-sm-4">{{this.$p.t('person', 'kontonr')}}</label>
+						<label for="kontonr" class="form-label col-sm-4">{{$p.t('person', 'kontonr')}}</label>
 						<div class="col-sm-6">
 							<input type="text" :readonly="readonly" class="form-control" id="kontonr" v-model="bankverbindungData['kontonr']">
 						</div>
 					</div>
 					<div class="row mb-3">										   
-						<label for="blz" class="form-label col-sm-4">{{this.$p.t('person', 'blz')}}</label>
+						<label for="blz" class="form-label col-sm-4">{{$p.t('person', 'blz')}}</label>
 						<div class="col-sm-6">
 							<input type="text" :readonly="readonly" class="form-control" id="blz" v-model="bankverbindungData['blz']">
 						</div>
 					</div>
 					<div class="row mb-3">
-						<label for="typ" class="form-label col-sm-4">{{this.$p.t('global', 'typ')}}</label>
+						<label for="typ" class="form-label col-sm-4">{{$p.t('global', 'typ')}}</label>
 						<div class="col-sm-6">
 							<select  id="typ" class="form-select" required v-model="bankverbindungData['typ']">
-								<option  value="p">{{this.$p.t('person', 'privatkonto')}}</option>
-								<option  value="f">{{this.$p.t('person', 'firmenkonto')}}</option>
+								<option  value="p">{{$p.t('person', 'privatkonto')}}</option>
+								<option  value="f">{{$p.t('person', 'firmenkonto')}}</option>
 							</select>
 						</div>
 					</div>
 					<div class="row mb-3">
-						<label for="verrechnung" class="form-label col-sm-4">{{this.$p.t('person', 'verrechnung')}}</label>
+						<label for="verrechnung" class="form-label col-sm-4">{{$p.t('person', 'verrechnung')}}</label>
 						<div class="col-sm-3">
 							<div class="form-check">
 								<input id="verrechnung" type="checkbox" class="form-check-input" value="1" v-model="bankverbindungData['verrechnung']">
@@ -280,14 +280,14 @@ export default{
 					</div>
 			</form>
             <template #footer>
-            		<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{this.$p.t('ui', 'abbrechen')}}</button>
+            		<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{$p.t('ui', 'abbrechen')}}</button>
 					<button type="button" class="btn btn-primary" @click="addNewBankverbindung()">OK</button>
             </template>
 		</BsModal>
 				
 		<!--Modal: Edit Bankverbindung-->
 		<BsModal ref="editBankverbindungModal">
-			<template #title>{{this.$p.t('person', 'bankvb_edit')}}</template>
+			<template #title>{{$p.t('person', 'bankvb_edit')}}</template>
 				<form class="row g-3" ref="bankverbindungData">
 				
 					<div class="row mb-3">
@@ -297,7 +297,7 @@ export default{
 						</div>
 					</div>
 					<div class="row mb-3">									   
-						<label for="anschrift" class="form-label col-sm-4">{{this.$p.t('person', 'anschrift')}}</label>
+						<label for="anschrift" class="form-label col-sm-4">{{$p.t('person', 'anschrift')}}</label>
 						<div class="col-sm-6">
 							<input type="text" :readonly="readonly" class="form-control" id="anschrift" v-model="bankverbindungData['anschrift']">
 						</div>
@@ -315,28 +315,28 @@ export default{
 						</div>
 					</div>
 					<div class="row mb-3">									   
-						<label for="kontonr" class="form-label col-sm-4">{{this.$p.t('person', 'kontonr')}}</label>
+						<label for="kontonr" class="form-label col-sm-4">{{$p.t('person', 'kontonr')}}</label>
 						<div class="col-sm-6">
 							<input type="text" :readonly="readonly" class="form-control" id="kontonr" v-model="bankverbindungData['kontonr']">
 						</div>
 					</div>
 					<div class="row mb-3">									   
-						<label for="blz" class="form-label col-sm-4">{{this.$p.t('person', 'blz')}}</label>
+						<label for="blz" class="form-label col-sm-4">{{$p.t('person', 'blz')}}</label>
 						<div class="col-sm-6">
 							<input type="text" :readonly="readonly" class="form-control" id="blz" v-model="bankverbindungData['blz']">
 						</div>
 					</div>
 					<div class="row mb-3">
-						<label for="typ" class="form-label col-sm-4">{{this.$p.t('global', 'typ')}}</label>
+						<label for="typ" class="form-label col-sm-4">{{$p.t('global', 'typ')}}</label>
 						<div class="col-sm-6">
 							<select  id="typ" class="form-select" required v-model="bankverbindungData['typ']">
-								<option  value="p">{{this.$p.t('person', 'privatkonto')}}</option>
-								<option  value="f">{{this.$p.t('person', 'firmenkonto')}}</option>
+								<option  value="p">{{$p.t('person', 'privatkonto')}}</option>
+								<option  value="f">{{$p.t('person', 'firmenkonto')}}</option>
 							</select>
 						</div>
 					</div>
 					<div class="row mb-3">
-						<label for="verrechnung" class="form-label col-sm-4">{{this.$p.t('person', 'verrechnung')}}</label>
+						<label for="verrechnung" class="form-label col-sm-4">{{$p.t('person', 'verrechnung')}}</label>
 						<div class="col-sm-3">
 							<div class="form-check">
 								<input id="verrechnung" type="checkbox" class="form-check-input" value="1" v-model="bankverbindungData['verrechnung']">
@@ -345,19 +345,19 @@ export default{
 					</div>															   
 				</form>
 				<template #footer>
-					<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">{{this.$p.t('ui', 'abbrechen')}}</button>
+					<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">{{$p.t('ui', 'abbrechen')}}</button>
 					<button ref="Close" type="button" class="btn btn-primary" @click="updateBankverbindung(bankverbindungData.bankverbindung_id)">OK</button>
             	</template>
 		</BsModal>
 		
 		<!--Modal: Delete Bankverbindung-->
 		<BsModal ref="deleteBankverbindungModal">
-			<template #title>{{this.$p.t('person', 'bankvb_delete')}}</template>
+			<template #title>{{$p.t('person', 'bankvb_delete')}}</template>
 			<template #default>
-				<p>{{this.$p.t('person', 'bankvb_confirm_delete')}}</p>
+				<p>{{$p.t('person', 'bankvb_confirm_delete')}}</p>
 			</template>									
 			<template #footer>
-				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">{{this.$p.t('ui', 'abbrechen')}}</button>
+				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">{{$p.t('ui', 'abbrechen')}}</button>
 				<button ref="Close" type="button" class="btn btn-primary" @click="deleteBankverbindung(bankverbindungData.bankverbindung_id)">OK</button>
 			</template>
 		</BsModal>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
index 0ed648b5c..5645dd519 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
@@ -18,7 +18,7 @@ export default{
 			tabulatorOptions: {
 				ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Kontakt/getKontakte/' + this.uid),
 				columns:[
-					{title:"Typ", field:"kontakttyp"}, //TODO(manu) mix ok?
+					{title:"Typ", field:"kontakttyp"},
 					{title:"Kontakt", field:"kontakt"},
 					{title:"Zustellung", field:"zustellung",
 						formatter: (cell, formatterParams, onRendered) => {
@@ -228,11 +228,11 @@ export default{
 		
 		<!--Modal: new Contact-->
 		<BsModal ref="newContactModal">
-			<template #title>{{this.$p.t('person', 'kontakt_new')}}</template>
+			<template #title>{{$p.t('person', 'kontakt_new')}}</template>
 				<form class="row g-3" ref="contactData">
 				
 						<div class="row mb-3">
-							<label for="kontakttyp" class="form-label col-sm-4">{{this.$p.t('global', 'typ')}}</label>
+							<label for="kontakttyp" class="form-label col-sm-4">{{$p.t('global', 'typ')}}</label>
 							<div class="col-sm-6">
 								<select id="kontakttyp" class="form-control" v-model="contactData.kontakttyp">
 									<option value="">keine Auswahl</option>
@@ -241,20 +241,20 @@ export default{
 							</div>
 						</div>
 						<div class="row mb-3">										   
-							<label for="kontakt" class="form-label col-sm-4">{{this.$p.t('global', 'kontakt')}}</label>
+							<label for="kontakt" class="form-label col-sm-4">{{$p.t('global', 'kontakt')}}</label>
 							<div class="col-sm-6">
 								<input type="text" :readonly="readonly" class="form-control" id="kontakt" v-model="contactData['kontakt']">
 							</div>
 						</div>
 						<div class="row mb-3">									   
-							<label for="anmerkung" class="form-label col-sm-4">{{this.$p.t('global', 'anmerkung')}}</label>
+							<label for="anmerkung" class="form-label col-sm-4">{{$p.t('global', 'anmerkung')}}</label>
 							<div class="col-sm-6">
 								<input type="text" :readonly="readonly" class="form-control" id="anmerkung" v-model="contactData['anmerkung']">
 							</div>
 						</div>
 						
 						<div class="row mb-3">
-							<label for="zustellung" class="form-label col-sm-4">{{this.$p.t('person', 'zustellung')}}</label>
+							<label for="zustellung" class="form-label col-sm-4">{{$p.t('person', 'zustellung')}}</label>
 							<div class="col-sm-6">
 								<div class="form-check">
 									<input id="zustellung" type="checkbox" class="form-check-input" value="1" v-model="contactData['zustellung']">
@@ -263,24 +263,24 @@ export default{
 						</div>
 							
 						<div class="row mb-3">
-							<label for="firma_name" class="form-label col-sm-4">{{this.$p.t('person', 'firma')}} / {{this.$p.t('person', 'standort')}}</label>
+							<label for="firma_name" class="form-label col-sm-4">{{$p.t('person', 'firma')}} / {{$p.t('person', 'standort')}}</label>
 								<div class="col-sm-6">
 									<PvAutoComplete v-model="contactData['standort']" optionLabel="kurzbz" :suggestions="filteredStandorte" @complete="search" minLength="3"/>
 								</div>
 						</div>
 				</form>
 			    <template #footer>
-            		<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{this.$p.t('ui', 'abbrechen')}}</button>
+            		<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{$p.t('ui', 'abbrechen')}}</button>
 					<button type="button" class="btn btn-primary" @click="addNewContact()">OK</button>
             	</template>
 		</BsModal>
 						
 		<!--Modal: Edit Contact-->
 		<BsModal ref="editContactModal">
-			<template #title>{{this.$p.t('person', 'kontakt_edit')}}</template>
+			<template #title>{{$p.t('person', 'kontakt_edit')}}</template>
 			<form class="row g-3" ref="contactData">
 				<div class="row mb-3">
-					<label for="kontakttyp" class="form-label col-sm-4">{{this.$p.t('global', 'typ')}}</label>
+					<label for="kontakttyp" class="form-label col-sm-4">{{$p.t('global', 'typ')}}</label>
 					<div class="col-sm-6">
 						<select id="kontakttyp" class="form-control" v-model="contactData.kontakttyp">
 							<option value="">-- keine Auswahl --</option>
@@ -289,19 +289,19 @@ export default{
 					</div>
 				</div>
 				<div class="row mb-3">									   
-					<label for="kontakt" class="form-label col-sm-4">{{this.$p.t('global', 'kontakt')}}</label>
+					<label for="kontakt" class="form-label col-sm-4">{{$p.t('global', 'kontakt')}}</label>
 					<div class="col-sm-6">
 						<input type="text" :readonly="readonly" class="form-control" id="kontakt" v-model="contactData['kontakt']">
 					</div>
 				</div>
 				<div class="row mb-3">									   
-					<label for="anmerkung" class="form-label col-sm-4">{{this.$p.t('global', 'anmerkung')}}</label>
+					<label for="anmerkung" class="form-label col-sm-4">{{$p.t('global', 'anmerkung')}}</label>
 					<div class="col-sm-6">
 						<input type="text" :readonly="readonly" class="form-control" id="anmerkung" v-model="contactData['anmerkung']">
 					</div>
 				</div>
 				<div class="row mb-3">
-					<label for="zustellung" class="form-label col-sm-4">{{this.$p.t('person', 'zustellung')}}</label>
+					<label for="zustellung" class="form-label col-sm-4">{{$p.t('person', 'zustellung')}}</label>
 					<div class="col-sm-6">
 						<div class="form-check">
 							<input id="zustellung" type="checkbox" class="form-check-input" value="1" v-model="contactData['zustellung']">
@@ -313,7 +313,7 @@ export default{
 				</div>
 				
 				<div class="row mb-3">
-					<label for="standort" class="form-label col-sm-4">{{this.$p.t('person', 'firma')}} / {{this.$p.t('person', 'standort')}}</label>
+					<label for="standort" class="form-label col-sm-4">{{$p.t('person', 'firma')}} / {{$p.t('person', 'standort')}}</label>
 						<div v-if="contactData.kurzbz" class="col-sm-6">
 							<input type="text" :readonly="readonly" class="form-control" id="name" v-model="contactData.kurzbz">
 						</div>	
@@ -323,19 +323,19 @@ export default{
 				</div>
 			</form>
 			<template #footer>
-				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">{{this.$p.t('ui', 'abbrechen')}}</button>
+				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">{{$p.t('ui', 'abbrechen')}}</button>
 				<button type="button" class="btn btn-primary" @click="updateContact(contactData.kontakt_id)">OK</button>
 			</template>
 		</BsModal>
 									
 		<!--Modal: Delete Contact-->
 		<BsModal ref="deleteContactModal">
-			<template #title>{{this.$p.t('person', 'kontakt_delete')}}</template>  
+			<template #title>{{$p.t('person', 'kontakt_delete')}}</template>  
 			<template #default>
-				<p>{{this.$p.t('person', 'kontakt_confirm_delete')}}</p>
+				<p>{{$p.t('person', 'kontakt_confirm_delete')}}</p>
 			</template>												
 			<template #footer>
-				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">{{this.$p.t('ui', 'abbrechen')}}</button>
+				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">{{$p.t('ui', 'abbrechen')}}</button>
 				<button ref="Close" type="button" class="btn btn-primary" @click="deleteContact(contactData.kontakt_id)">OK</button>
 			</template>
 		</BsModal>

From 783a2fb2b09c25fe20f124c9b3d01436d6d7a675 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 29 Jan 2024 09:22:20 +0100
Subject: [PATCH 0358/1461] removes print in MitarbeiterView Controller and
 MitarbeiterView uses the components to render the information

---
 application/controllers/Cis/Profil.php        |   2 -
 .../Cis/Profil/MitarbeiterViewProfil.js       | 304 +++---------------
 2 files changed, 40 insertions(+), 266 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index 5b0cacfbf..2969ecf9c 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -267,8 +267,6 @@ class Profil extends Auth_Controller
 			}
 		}
 
-		
-		print_r($telefon_res);
 
 		$res = new stdClass();
 		$res->username = $uid;
diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
index b64d3ebbd..e2d727ad7 100644
--- a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
@@ -1,9 +1,19 @@
 
 import { CoreFilterCmpt } from "../../../components/filter/Filter.js";
+import Mailverteiler from "./ProfilComponents/Mailverteiler.js";
+import QuickLinks from "./ProfilComponents/QuickLinks.js";
+import RoleInformation from "./ProfilComponents/RoleInformation.js";
+import ProfilEmails from "./ProfilComponents/ProfilEmails.js";
+import ProfilInformation from "./ProfilComponents/ProfilInformation.js";
 
 export default {
   components: {
     CoreFilterCmpt,
+    Mailverteiler,
+    QuickLinks,
+    RoleInformation,
+    ProfilEmails,
+    ProfilInformation,
   },
   data() {
     return {
@@ -82,56 +92,41 @@ export default {
   },
 
   computed: {
+
+    personEmails() {
+      return this.data?.emails ? this.data.emails : [];
+    },
     
-
-    get_image_base64_src() {
-      if (!this.data) {
-        return "";
-      }
-      return "data:image/jpeg;base64," + this.data.foto;
-    },
-
-    get_mitarbeiter_standort_telefon(){
-      if(this.data.standort_telefon){
-        return "tel:"+ this.data.telefonklappe + this.data.standort_telefon ;
-      }else{
-        return null;
-      }
-    },
-    //? this computed function returns all the informations for the first column in the profil
-    personData() {
+    profilInformation() {
       if (!this.data) {
         return {};
       }
 
       return {
+        Vorname: this.data.vorname,
+        Nachname: this.data.nachname,
         Username: this.data.username,
         Anrede: this.data.anrede,
-        Titel: this.data.titelpre,
+        Titel: this.data.titel,
         Postnomen: this.data.postnomen,
+        foto_sperre:this.data.foto_sperre,
+        foto:this.data.foto,
+
       };
     },
+  
+   
 
-    personKontakt() {
+    roleInformation() {
       if (!this.data) {
         return {};
       }
 
       return {
-        emails: this.data.emails,
-        
-      };
-    },
-
-    specialData() {
-      if (!this.data) {
-        return {};
-      }
-
-      return {
-        
+        Geburtsdatum: this.data.gebdatum,
+        Geburtsort: this.data.gebort,
         Kurzzeichen: this.data.kurzbz,
-        Telefon: (this.data.standort_telefon?this.data.standort_telefon:"") + " " + this.data.telefonklappe ,
+        Telefon:  (this.data.standort_telefon?this.data.standort_telefon:"") + " " + this.data.telefonklappe,
         Büro: this.data.ort_kurzbz,
       };
     },
@@ -220,94 +215,10 @@ export default {
                      <div class="row mb-4">
                      <div class="col">
                      
-                        
-                      <div class="card h-100">
-                      <div class="card-header">
-                      MitarbeiterIn
-                      </div>
-                      <div class="card-body">
-                      
-                       
-
-
-                  
-                  <div  class="row gy-3 justify-content-center align-items-center">
-
-
-
-
-                  <!-- SQUEEZING THE IMAGE INSIDE THE FIRST INFORMATION COLUMN -->
- <!-- START OF THE FIRST ROW WITH THE PROFIL IMAGE -->
-          <div class="col-12 col-sm-6 mb-2">
-           <div class="row justify-content-center">
-                        <div class="col-auto " style="position:relative">
-                          <img class=" img-thumbnail " style=" max-height:150px; "  :src="get_image_base64_src"></img>
-                         
-                        </div>
-                      </div>
-                    <!-- END OF THE ROW WITH THE IMAGE -->
-                    </div>
-<!-- END OF SQUEEZE -->
-
-
-
-<!-- COLUMNS WITH MULTIPLE ROWS NEXT TO PROFIL PICTURE -->
-                  <div class="col-12 col-sm-6">
-                  <div class="gy-4 row">
-                  <div class="col-12">
-                
-
-                  <div  class="form-underline ">
-                <div class="form-underline-titel">Vorname</div>
-                <span class="form-underline-content">{{data.vorname}} </span>
-                
-                </div>
-
-                        
-                </div>
-                <div class="col-12">
-                
-                
-                <div  class="form-underline ">
-                <div class="form-underline-titel">Nachname</div>
-                <span class="form-underline-content">{{data.nachname}} </span>
-                
-                </div>
-
-                </div>
-                </div>
-             
-                
-                  </div>
-                  
-
-
-
-
-
-
-
-                  <div v-for="(wert,bez) in personData" class="col-md-6 col-sm-12 ">
-                        
-
-
-                  
-                  <div  class="form-underline ">
-                  <div class="form-underline-titel">{{bez}}</div>
-                  <span class="form-underline-content">{{wert?wert:'-'}} </span>
-                  
-                  </div>
-                  
-                  </div>
-                
-                  
-                      </div>
-
-
-                      
-                      </div>
-                    </div>
-		    </div>
+                        <!-- Profil Informationen -->
+                        <profil-information title="MitarbeiterIn" :data="profilInformation"></profil-information>
+                     
+		                </div>
                     </div>
                     
 
@@ -328,61 +239,9 @@ export default {
                     <div class="row mb-4">
                     <div class="col">
 
-
-                    <div class="card ">
-                    <div class="card-header">
-                    Mails
-                    </div>
+                    <!-- EMAILS -->
+                    <profil-emails :data="personEmails"></profil-emails>
                    
-                    <div class="card-body">
-
-
-
-                      <div v-for="(wert,bezeichnung) in personKontakt">
-
-                      
-            
-                      <!-- HIER SIND DIE EMAILS -->
-                  
-                  
-                      <div  v-if="typeof wert === 'object' && bezeichnung == 'emails'" class="gy-3 row justify-content-center ">
-                      <div v-for="email in wert" class="col-12 ">
-                     
-                            <div class="row align-items-center">
-                      <div class="col-1 text-center">
-
-                      <i class="fa-solid fa-envelope" style="color:rgb(0, 100, 156)"></i>
-
-                      </div>
-                      <div class="col">
-
-
-
-                      <div  class="form-underline ">
-                  <div class="form-underline-titel">{{email.type}}</div>
-                  <a :href="'mailto:'+email.email" class="form-underline-content" >{{email.email}}</a>
-                  </div>
-                     
-                            
-                   
-                      </div>
-                      </div>
-                      </div>
-                          </div>
-
-                    
-                    
-                     
-
-
-
-
-                    
-                      </div>
-
-
-                    </div>
-                    </div>
                     </div></div>
 
 
@@ -392,37 +251,8 @@ export default {
 
                     <div  class=" col-lg-12">
        
-                    <div class="card">
-                
-                        <div class="card-header">
-                        Mitarbeiter Information
-                        </div>
-                        <div class="card-body">
-                            <div class="gy-3 row">
-                            <div v-for="(wert,bez) in specialData" class="col-md-6 col-sm-12 ">
-                            
-                           
-                         
-
-                                <div  class="form-underline ">
-                             <div class="form-underline-titel">{{bez}}</div>
-                             <a v-if="bez=='Telefon'" :href="get_mitarbeiter_standort_telefon"  class="form-underline-content" >
-                             {{wert?wert:'-'}}
-                            </a>
-                             <span  v-else class="form-underline-content" >
-                                 {{wert?wert:'-'}}
-                                </span>
-                             
-                             </div>
-
-                               
-                              
-                            </div>
-                        </div>
-                        
-                    </div>
-                    
-                </div>
+                    <!-- roleInformation -->
+                    <role-information :data="roleInformation" title="Mitarbeiter Information"></role-information>
 
                     </div>  
                            
@@ -477,80 +307,26 @@ export default {
               <!-- START OF SIDE PANEL -->
               <div  class="col-md-4 col-xxl-3 col-sm-12 text-break" >
 
-
-              <!-- SRART OF QUICK LINKS IN THE SIDE PANEL -->
-
-
-              <!-- START OF THE FIRDT ROW IN THE SIDE PANEL -->
-              <!-- THESE QUCK LINKS ARE ONLY VISIBLE UNTIL VIEWPORT MD -->
+              <!-- VISIBLE UNTIL VIEWPORT MD -->
                 <div  class="row d-none d-md-block mb-3">
                   <div class="col">
                  
-                    <div class="card">
-                      <div class="card-header">
-                      Quick Links
-                      </div>
-                      <div class="card-body">
-                      
-                       
-                        <a style="text-decoration:none" class="my-1 d-block" href="#">Zeitwuensche</a>
-                        <a style="text-decoration:none" class="my-1 d-block" href="#">Lehrveranstaltungen</a>
-                        <a style="text-decoration:none" class="my-1 d-block" href="#">Zeitsperren</a>
+                   <!-- QUICKLINKS -->
+                   <quick-links ></quick-links>
 
-                      </div>
-                    </div>
-
-                   
-                      
-                  
                   </div>
                 </div>
 
-              
-
-
-                <!-- START OF THE SECOND ROW IN THE SIDE PANEL -->
                 <div  class="row">
                 
                   <div class="col">
-                
-
-                  
-                  <!-- HIER SIND DIE MAILVERTEILER -->
-                    <div class="card">
-                      <div class="card-header">
-                      Mailverteilers
-                      </div>
-                      <div class="card-body">
-                      
-                        <h6 class="card-title">Sie sind Mitgglied in folgenden Verteilern:</h6>
-                        <div  class="card-text row text-break mb-2" v-for="verteiler in data?.mailverteiler">
-                          <div class="col-12 ">
-                            <div class="row">  
-                              <div class="col-1 ">
-                              
-                              <i class="fa-solid fa-envelope" style="color: #00649C;"></i>
-                              
-                              </div>
-                              <div class="col">
-                                <a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a>
-                              </div>
-                            </div>
-                           
-                          </div> 
-                          <div class="col-11 offset-1 ">{{verteiler.beschreibung}}</div>
-                        </div>
-
-                      </div>
-                    </div>
-
-
 
+                  <!-- MAILVERTEILER -->
 
+                  <mailverteiler :data="data?.mailverteiler"></mailverteiler>
 
                   </div>
 
-                <!-- END OF THE SECOND ROW IN THE SIDE PANEL -->
                 </div>
 
                 <!-- END OF SIDE PANEL -->

From 9ebb04a01b6aab4d29a67ee7d0f6cc2d601d24a8 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 29 Jan 2024 09:49:50 +0100
Subject: [PATCH 0359/1461] StudentView also uses the layout components

---
 .../Cis/Profil/MitarbeiterViewProfil.js       |  25 +-
 .../Cis/Profil/StudentViewProfil.js           | 317 ++----------------
 2 files changed, 36 insertions(+), 306 deletions(-)

diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
index e2d727ad7..77b74d437 100644
--- a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
@@ -152,30 +152,7 @@ export default {
           <!-- HIDDEN QUICK LINKS -->
               <div  class="d-md-none col-12 ">
              
-              <div class="row py-2">
-              <div class="col">
-                <p class="m-0">
-                <div class="card">
-                
-                <a class=" w-100 btn " data-bs-toggle="collapse" href="#collapseExample" role="button" aria-expanded="false" aria-controls="collapseExample">
-                <u> Quick links</u>
-               </a>
-             
-                
-               </div>
-                 
-                </p>
-                <div class="mt-1 collapse" id="collapseExample">
-                  
-                  <div class="list-group">
-                   
-                    <a href="#" class="list-group-item list-group-item-action">Zeitwünsche</a>
-                    <a href="#" class="list-group-item list-group-item-action">Lehrveranstaltungen</a>
-                    <a href="#" class="list-group-item list-group-item-action ">Zeitsperren</a>
-                  </div>
-                </div>
-              </div>
-            </div>
+              <quick-links :mobile="true" ></quick-links>
 
               </div>
               <!-- END OF HIDDEN QUCK LINKS -->
diff --git a/public/js/components/Cis/Profil/StudentViewProfil.js b/public/js/components/Cis/Profil/StudentViewProfil.js
index 4c1a41db7..3996f1950 100644
--- a/public/js/components/Cis/Profil/StudentViewProfil.js
+++ b/public/js/components/Cis/Profil/StudentViewProfil.js
@@ -1,3 +1,8 @@
+import QuickLinks from "./ProfilComponents/QuickLinks.js";
+import Mailverteiler from "./ProfilComponents/Mailverteiler.js";
+import ProfilEmails from "./ProfilComponents/ProfilEmails.js";
+import RoleInformation from "./ProfilComponents/RoleInformation.js";
+import ProfilInformation from "./ProfilComponents/ProfilInformation.js";
 
 export default {
   
@@ -7,56 +12,51 @@ export default {
      
     };
   },
+  components:{
+    QuickLinks,
+    Mailverteiler,
+    ProfilEmails,
+    RoleInformation,
+    ProfilInformation
+  },
 
-  //? this is the prop passed to the dynamic component with the custom data of the view
   props: ["data"],
   methods: {
     
   },
 
   computed: {
-  
-
-    get_image_base64_src() {
-      if (!this.data) {
-        return "";
-      }
-      return "data:image/jpeg;base64," + this.data.foto;
-    },
-
    
-    //? this computed function returns all the informations for the first column in the profil
-    personData() {
+     profilInformation() {
       if (!this.data) {
         return {};
       }
 
       return {
+        Vorname: this.data.vorname,
+        Nachname: this.data.nachname,
         Username: this.data.username,
         Anrede: this.data.anrede,
-        Matrikelnummer: this.data.matrikelnummer,
-        Titel: this.data.titelpre,
+        Titel: this.data.titel,
         Postnomen: this.data.postnomen,
+        foto_sperre:this.data.foto_sperre,
+        foto:this.data.foto,
+
       };
     },
 
-    personKontakt() {
-      if (!this.data) {
-        return {};
-      }
-
-      return {
-        emails: this.data.emails,
-        
-      };
-    },
-
-    specialData() {
+    personEmails() {
+      return this.data?.emails ? this.data.emails : [];
+    },
+
+    roleInformation() {
       if (!this.data) {
         return {};
       }
 
       return {
+        Geburtsdatum: this.data.gebdatum,
+        Geburtsort: this.data.gebort,
         Personenkennzeichen: this.data.personenkennzeichen,
         Studiengang: this.data.studiengang,
         Semester: this.data.semester,
@@ -64,9 +64,6 @@ export default {
         Gruppe: this.data.gruppe.trim(),
       };
     },
-
-    
-
   
   },
 
@@ -84,30 +81,7 @@ export default {
           <!-- HIDDEN QUICK LINKS -->
               <div  class="d-md-none col-12 ">
              
-              <div class="row py-2">
-              <div class="col">
-                <p class="m-0">
-                <div class="card">
-                
-                <a class=" w-100 btn " data-bs-toggle="collapse" href="#collapseExample" role="button" aria-expanded="false" aria-controls="collapseExample">
-                <u> Quick links</u>
-               </a>
-             
-                
-               </div>
-                 
-                </p>
-                <div class="mt-1 collapse" id="collapseExample">
-                  
-                  <div class="list-group">
-                   
-                    <a href="#" class="list-group-item list-group-item-action">Zeitwünsche</a>
-                    <a href="#" class="list-group-item list-group-item-action">Lehrveranstaltungen</a>
-                    <a href="#" class="list-group-item list-group-item-action ">Zeitsperren</a>
-                  </div>
-                </div>
-              </div>
-            </div>
+             <quick-links :mobile="true"></quick-links>
 
               </div>
               <!-- END OF HIDDEN QUCK LINKS -->
@@ -147,98 +121,9 @@ export default {
                      <div class="row mb-4">
                      <div class="col">
                      
-                        
-                      <div class="card h-100">
-                      <div class="card-header">
-                      StudentIn
-                      </div>
-                      <div class="card-body">
-                      
-                       
-
-
-                  
-                  <div  class="gy-3 row align-items-center">
-
-
-
-
-                  <!-- SQUEEZING THE IMAGE INSIDE THE FIRST INFORMATION COLUMN -->
- <!-- START OF THE FIRST ROW WITH THE PROFIL IMAGE -->
-          <div class="col-12 col-sm-6 mb-2">
-           <div class="row justify-content-center">
-                        <div class="col-auto " style="position:relative">
-                          <img class=" img-thumbnail " style=" max-height:150px; "  :src="get_image_base64_src"></img>
-                         
-                        </div>
-                      </div>
-                    <!-- END OF THE ROW WITH THE IMAGE -->
-                    </div>
-<!-- END OF SQUEEZE -->
-
-
-
-<!-- COLUMNS WITH MULTIPLE ROWS NEXT TO PROFIL PICTURE -->
-                  <div class="col-12 col-sm-6">
-                  <div class="gy-4 row">
-                  <div class="col-12">
-                 
-                        
-                  <div  class="form-underline ">
-                  <div class="form-underline-titel">Vorname</div>
-                  <span class="form-underline-content">{{data.vorname}} </span>
-                  
-                  </div>
-
-
-
-                </div>
-                <div class="col-12">
-               
-                        
-                
-
-                  <div  class="form-underline ">
-                  <div class="form-underline-titel">Nachname</div>
-                  <span class="form-underline-content">{{data.nachname}} </span>
-                  
-                  </div>
-
-
-                </div>
-                </div>
-             
-                
-                  </div>
-                  
-
-
-
-
-
-
-
-                  <div v-for="(wert,bez) in personData" class="col-md-6 col-sm-12 ">
-                  
-                        
-                  <div  class="form-underline ">
-                  <div class="form-underline-titel">{{bez}}</div>
-                  <span class="form-underline-content">{{wert?wert:'-'}} </span>
-                  
-                  </div>
-
-
-                  
-                  </div>
-
-                  
-                      </div>
-
-
-                      
-                      </div>
-                    </div>
-		    </div>
+                        <profil-information :data="profilInformation" title="StudentIn"></profil-information>
+                     
+		                </div>
                     </div>
                   
 
@@ -259,60 +144,9 @@ export default {
                     <div class="row mb-4">
                     <div class="col">
 
-
-                    <div class="card ">
-                    <div class="card-header">
-                    Mails
-                    </div>
-                   
-                    <div class="card-body">
-
-
-
-                      <div v-for="(wert,bezeichnung) in personKontakt">
-
-                      
-            
-                      <!-- HIER SIND DIE EMAILS -->
+                    <!-- EMAILS -->
+                    <profil-emails :data="personEmails"></profil-emails>
                   
-                  
-                      <div  v-if="typeof wert === 'object' && bezeichnung == 'emails'" class="gy-3 row justify-content-center ">
-                      <div v-for="email in wert" class="col-12 ">
-                     
-                            <div class="row align-items-center">
-                      <div class="col-1 text-center">
-
-                      <i class="fa-solid fa-envelope" style="color:rgb(0, 100, 156)"></i>
-
-                      </div>
-                      <div class="col">
-                     
-                           
-                            <div  class="form-underline ">
-                            <div class="form-underline-titel">{{email.type }}</div>
-                            <a :href="'mailto:'+email.emails" class="form-underline-content">{{email.email}} </a>
-                            
-                            </div>
-
-                     
-                      </div>
-                      </div>
-                      </div>
-                          </div>
-
-                    
-                    
-                     
-
-
-
-
-                    
-                      </div>
-
-
-                    </div>
-                    </div>
                     </div></div>
 
                    <!-- SECOND ROW OF SECOND COLUMN IN MAIN CONTENT -->
@@ -321,28 +155,7 @@ export default {
 
                     <div  class=" col-lg-12">
        
-                    <div class="card">
-                
-                        <div class="card-header">
-                        Studenten Information
-                        </div>
-                        <div class="card-body">
-                            <div class="gy-3 row">
-                            <div v-for="(wert,bez) in specialData" class="col-md-6 col-sm-12 ">
-                            
-
-                            <div  class="form-underline ">
-                            <div class="form-underline-titel">{{bez}}</div>
-                            <span class="form-underline-content">{{wert?wert:'-'}} </span>
-                            
-                            </div>
-                           
-                            </div>
-                        </div>
-                        
-                    </div>
-                    
-                </div>
+                    <role-information title="Student Information" :data="roleInformation"></role-information>
 
                     </div>  
                            
@@ -365,20 +178,6 @@ export default {
                   <!-- ROW WITH PROFIL IMAGE AND INFORMATION END -->
                 </div  >
 
-
-
-                
-
-
-
-
-        
-
-
-
-
-
-
               <!-- END OF MAIN CONTENT COL -->
               </div>
 
@@ -397,28 +196,11 @@ export default {
                 <div  class="row d-none d-md-block mb-3">
                   <div class="col">
                  
-                    <div class="card">
-                      <div class="card-header">
-                      Quick Links
-                      </div>
-                      <div class="card-body">
-                      
-                       
-                        <a style="text-decoration:none" class="my-1 d-block" href="#">Zeitwuensche</a>
-                        <a style="text-decoration:none" class="my-1 d-block" href="#">Lehrveranstaltungen</a>
-                        <a style="text-decoration:none" class="my-1 d-block" href="#">Zeitsperren</a>
+                   <quick-links></quick-links>
 
-                      </div>
-                    </div>
-
-                   
-                      
-                  
                   </div>
                 </div>
 
-              
-
                 <!-- START OF THE SECOND ROW IN THE SIDE PANEL -->
                 <div  class="row">
                 
@@ -427,36 +209,7 @@ export default {
 
                   
                   <!-- HIER SIND DIE MAILVERTEILER -->
-                    <div class="card">
-                      <div class="card-header">
-                      Mailverteilers
-                      </div>
-                      <div class="card-body">
-                      
-                        <h6 class="card-title">Sie sind Mitgglied in folgenden Verteilern:</h6>
-                        <div  class="card-text row text-break mb-2" v-for="verteiler in data?.mailverteiler">
-                          <div class="col-12 ">
-                            <div class="row">  
-                              <div class="col-1 ">
-                              
-                              <i class="fa-solid fa-envelope" style="color: #00649C;"></i>
-                              
-                              </div>
-                              <div class="col">
-                                <a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a>
-                              </div>
-                            </div>
-                           
-                          </div> 
-                          <div class="col-11 offset-1 ">{{verteiler.beschreibung}}</div>
-                        </div>
-
-                      </div>
-                    </div>
-
-
-
-
+                    <mailverteiler :data="data?.mailverteiler"></mailverteiler>
 
                   </div>
 

From 76f2501fecad5a285d36ae9206d2095576361c4e Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 29 Jan 2024 11:14:51 +0100
Subject: [PATCH 0360/1461] little layout fix

---
 .../Cis/Profil/ProfilComponents/FetchProfilUpdates.js | 11 ++++++++---
 .../components/Cis/Profil/ProfilComponents/Kontakt.js |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
index 7477979ff..4a145e268 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
@@ -119,7 +119,7 @@ export default {
             </thead>
             <tbody>
                 <tr v-for="item in data" :style="item.status=='accepted'?'background-color:lightgreen':item.status==='rejected'?'background-color:lightcoral':''">
-                <td class="align-middle text-wrap">{{item.topic}}</td>
+                <td class="align-middle text-wrap ">{{item.topic}}</td>
                 <td class="align-middle " >{{item.status}}</td>
                 <td class="align-middle">{{item.change_timestamp}}</td>
                 
@@ -142,10 +142,15 @@ export default {
                 </template>
 
                 <template v-else>
+                
+                <td  class="align-middle text-center">
                 <div class="d-flex flex-row justify-content-evenly">
-                <td  class="align-middle text-center"><i  role="button" @click="openModal(item)" class="fa fa-eye"></i></td>
-                </template>
+                <i  role="button" @click="openModal(item)" class="fa fa-eye"></i>
                 </div>
+                </td>
+                
+                </template>
+                
                 
                 </tr>
             </tbody>
diff --git a/public/js/components/Cis/Profil/ProfilComponents/Kontakt.js b/public/js/components/Cis/Profil/ProfilComponents/Kontakt.js
index 51dbbeba2..3bc7ecd72 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/Kontakt.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/Kontakt.js
@@ -12,7 +12,7 @@ export default{
 
     }, 
     template:`
-    <div class=" row align-items-center justify-content-center">
+    <div class="gy-2 row align-items-center justify-content-center">
     <div class="col-1 text-center" >
     
     <i class="fa-solid " :class="{...(data.kontakt.includes('@')?{'fa-envelope':true}:{'fa-phone':true})}" style="color:rgb(0, 100, 156)"></i>

From b99b09ca6a75c9732b9e09dfcfccbf706c93354b Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 29 Jan 2024 14:24:47 +0100
Subject: [PATCH 0361/1461] Form Validation Notiz und Kontakt-Tab

---
 .../controllers/components/stv/Kontakt.php    | 112 ++++++++++++++----
 .../controllers/components/stv/Notiz.php      |  32 ++++-
 system/phrasesupdate.php                      |  29 ++++-
 3 files changed, 143 insertions(+), 30 deletions(-)

diff --git a/application/controllers/components/stv/Kontakt.php b/application/controllers/components/stv/Kontakt.php
index d8ed352f6..62a28d7eb 100644
--- a/application/controllers/components/stv/Kontakt.php
+++ b/application/controllers/components/stv/Kontakt.php
@@ -13,6 +13,7 @@ class Kontakt extends FHC_Controller
 		// Load Libraries
 		$this->load->library('AuthLib');
 		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+		$this->load->library('form_validation');
 
 		// Load language phrases
 		$this->loadPhrases([
@@ -44,10 +45,9 @@ class Kontakt extends FHC_Controller
 
 	public function addNewAddress($person_id)
 	{
-		$this->load->library('form_validation');
 		$_POST = json_decode($this->input->raw_input_stream, true);
 
-		$this->form_validation->set_rules('plz', 'PLZ', 'required|numeric');
+		$this->form_validation->set_rules('plz', 'PLZ', 'callback_plz_required|callback_plz_numeric');
 
 		if ($this->form_validation->run() == false)
 		{
@@ -115,10 +115,9 @@ class Kontakt extends FHC_Controller
 	public function updateAddress($address_id)
 	{
 		$uid = getAuthUID();
-		$this->load->library('form_validation');
 		$_POST = json_decode($this->input->raw_input_stream, true);
 
-		$this->form_validation->set_rules('plz', 'PLZ', 'required');
+		$this->form_validation->set_rules('plz', 'PLZ', 'callback_plz_required|callback_plz_numeric');
 
 		if ($this->form_validation->run() == false)
 		{
@@ -339,28 +338,18 @@ class Kontakt extends FHC_Controller
 
 	public function addNewContact($person_id)
 	{
-		$this->load->library('form_validation');
-
 		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
 
 		if(($_POST['kontakttyp'] == 'email' && isset($_POST['kontakt'])))
-			$this->form_validation->set_rules('kontakt', 'Kontakt', 'valid_email');
+			$this->form_validation->set_rules('kontakt', 'Kontakt', 'callback_kontakt_valid_email');
 		else
-			$this->form_validation->set_rules('kontakt', 'Kontakt', 'required');
-
-/*		if(($_POST['kontakttyp'] == 'email' && isset($_POST['kontakt'])))
-		{
-			$this->form_validation->set_data(['email' => $_POST['kontakt']]);
-			$this->form_validation->set_rules('email', 'email', 'valid_email|required]');
-		}*/
-
+			$this->form_validation->set_rules('kontakt', 'Kontakt', 'callback_kontakt_required');
 
 		if ($this->form_validation->run() == false)
 		{
 			return $this->outputJsonError($this->form_validation->error_array());
 		}
 
-
 		$this->load->model('person/Kontakt_model', 'KontaktModel');
 
 		if(isset($_POST['standort']))
@@ -410,6 +399,16 @@ class Kontakt extends FHC_Controller
 			return $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 		}
 
+		if(($_POST['kontakttyp'] == 'email' && isset($_POST['kontakt'])))
+			$this->form_validation->set_rules('kontakt', 'Kontakt', 'callback_kontakt_valid_email');
+		else
+			$this->form_validation->set_rules('kontakt', 'Kontakt', 'callback_kontakt_required');
+
+		if ($this->form_validation->run() == false)
+		{
+			return $this->outputJsonError($this->form_validation->error_array());
+		}
+
 		if(isset($_POST['standort']))
 		{
 			$standort_id = $_POST['standort']['standort_id'];
@@ -491,8 +490,8 @@ class Kontakt extends FHC_Controller
 		$this->load->library('form_validation');
 		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
 
-		$this->form_validation->set_rules('iban', 'IBAN', 'required');
-		$this->form_validation->set_rules('typ', 'TYP', 'required');
+		$this->form_validation->set_rules('iban', 'IBAN', 'callback_iban_required');
+		$this->form_validation->set_rules('typ', 'TYP', 'callback_typ_required');
 
 		if ($this->form_validation->run() == false)
 		{
@@ -564,11 +563,10 @@ class Kontakt extends FHC_Controller
 
 	public function updateBankverbindung($bankverbindung_id)
 	{
-		$this->load->library('form_validation');
 		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
 
-		$this->form_validation->set_rules('iban', 'IBAN', 'required');
-		$this->form_validation->set_rules('typ', 'TYP', 'required');
+		$this->form_validation->set_rules('iban', 'IBAN', 'callback_iban_required');
+		$this->form_validation->set_rules('typ', 'TYP', 'callback_typ_required');
 
 		$this->load->model('person/Bankverbindung_model', 'BankverbindungModel');
 
@@ -632,4 +630,76 @@ class Kontakt extends FHC_Controller
 		}
 		return $this->outputJsonSuccess(current(getData($result)));
 	}
+
+	public function plz_required($value)
+	{
+		if (empty($value)) {
+			$this->form_validation->set_message('plz_required',  $this->p->t('ui','error_fieldRequired',['field' => 'PLZ']));
+			return false;
+		}
+		else
+		{
+			return true;
+		}
+	}
+
+	public function kontakt_required($value)
+	{
+		if (empty($value)) {
+			$this->form_validation->set_message('kontakt_required',  $this->p->t('ui','error_fieldRequired',['field' => 'Kontakt']));
+			return false;
+		}
+		else
+		{
+			return true;
+		}
+	}
+
+	public function iban_required($value)
+	{
+		if (empty($value)) {
+			$this->form_validation->set_message('iban_required',  $this->p->t('ui','error_fieldRequired',['field' => 'IBANoff']));
+			return false;
+		}
+		else
+		{
+			return true;
+		}
+	}
+
+	public function typ_required($value)
+	{
+		if (empty($value)) {
+			$this->form_validation->set_message('typ_required',  $this->p->t('ui','error_fieldRequired',['field' => 'Typ']));
+			return false;
+		}
+		else
+		{
+			return true;
+		}
+	}
+
+	public function plz_numeric($value)
+	{
+		if (!is_numeric($value)) {
+			$this->form_validation->set_message('plz_numeric',  $this->p->t('ui','error_fieldNotNumeric',['field' => 'PLZ']));
+			return false;
+		}
+		else
+		{
+			return true;
+		}
+	}
+
+	public function kontakt_valid_email($email)
+	{
+		if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
+			$this->form_validation->set_message('kontakt_valid_email',  $this->p->t('ui','error_fieldNoValidEmail',['field' => 'Kontakt']));
+			return false;
+		}
+		else
+		{
+			return true;
+		}
+	}
 }
diff --git a/application/controllers/components/stv/Notiz.php b/application/controllers/components/stv/Notiz.php
index a73014b59..f370e8abe 100644
--- a/application/controllers/components/stv/Notiz.php
+++ b/application/controllers/components/stv/Notiz.php
@@ -116,8 +116,8 @@ class Notiz extends FHC_Controller
 		}
 
 		//Form Validation
-		$this->form_validation->set_rules('titel', 'titel', 'required');
-		$this->form_validation->set_rules('text', 'Text', 'required');
+		$this->form_validation->set_rules('titel', 'titel', 'callback_titel_required');
+		$this->form_validation->set_rules('text', 'text', 'callback_text_required');
 
 		if ($this->form_validation->run() == false)
 		{
@@ -208,8 +208,8 @@ class Notiz extends FHC_Controller
 		}
 
 		//Form Validation
-		$this->form_validation->set_rules('titel', 'titel', 'required');
-		$this->form_validation->set_rules('text', 'Text', 'required');
+		$this->form_validation->set_rules('titel', 'titel', 'callback_titel_required');
+		$this->form_validation->set_rules('text', 'text', 'callback_text_required');
 
 		if ($this->form_validation->run() == false)
 		{
@@ -438,4 +438,28 @@ class Notiz extends FHC_Controller
 		}
 		$this->outputJson($result);
 	}
+
+	public function titel_required($value)
+	{
+		if (empty($value)) {
+			$this->form_validation->set_message('titel_required',  $this->p->t('ui','error_fieldRequired',['field' => 'Titel']));
+			return false;
+		}
+		else
+		{
+			return true;
+		}
+	}
+
+	public function text_required($value)
+	{
+		if (empty($value)) {
+			$this->form_validation->set_message('text_required', $this->p->t('ui','error_fieldRequired',['field' => 'Text']));
+			return false;
+		}
+		else
+		{
+			return true;
+		}
+	}
 }
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index df493751f..47fe8a4a4 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -22117,7 +22117,7 @@ array(
 	),
 	array(
 		'app' => 'core',
-		'category' => 'notiz',
+		'category' => 'ui',
 		'phrase' => 'error_fieldRequired',
 		'phrases' => array(
 			array(
@@ -22136,18 +22136,37 @@ array(
 	),
 	array(
 		'app' => 'core',
-		'category' => 'notiz',
-		'phrase' => 'error_textFieldRequired',
+		'category' => 'ui',
+		'phrase' => 'error_fieldNotNumeric',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Das Eingabefeld textField ist erforderlich',
+				'text' => 'Das Eingabefeld {field} darf nur Zahlen enthalten.',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'The Field textField is required',
+				'text' => 'The Field {Field} must contain only numbers.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'error_fieldNoValidEmail',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Das Eingabefeld {field} muss eine gültige Email-Adresse enthalten.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The field {field} must contain a valid email address.',
 				'description' => '',
 				'insertvon' => 'system'
 			)

From ed71077243b9ee5c19c5663959b4de0b6e68b71c Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 29 Jan 2024 16:09:07 +0100
Subject: [PATCH 0362/1461] update lastupdate Contacttable

---
 application/controllers/components/stv/Kontakt.php        | 8 ++++++--
 .../Stv/Studentenverwaltung/Details/Kontakt/Contact.js    | 6 +++---
 system/phrasesupdate.php                                  | 2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/application/controllers/components/stv/Kontakt.php b/application/controllers/components/stv/Kontakt.php
index 62a28d7eb..85071c416 100644
--- a/application/controllers/components/stv/Kontakt.php
+++ b/application/controllers/components/stv/Kontakt.php
@@ -279,8 +279,12 @@ class Kontakt extends FHC_Controller
 	{
 		$this->load->model('person/Kontakt_model', 'KontaktModel');
 		$this->load->model('organisation/standort_model', 'StandortModel');
-
-		$this->KontaktModel->addSelect('*');
+		$this->KontaktModel->addSelect("*,
+			TO_CHAR (CASE 
+					WHEN public.tbl_kontakt.updateamum >= public.tbl_kontakt.insertamum 
+					THEN public.tbl_kontakt.updateamum 
+					ELSE public.tbl_kontakt.insertamum 
+				END::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS lastUpdate");
 		$this->StandortModel->addJoin('public.tbl_standort st', 'ON (public.tbl_kontakt.standort_id = st.standort_id)', 'LEFT');
 
 		$result = $this->KontaktModel->loadWhere(
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
index 5645dd519..d901fa7e1 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
@@ -31,7 +31,7 @@ export default{
 					{title:"Person_id", field:"person_id", visible:false},
 					{title:"Kontakt_id", field:"kontakt_id", visible:false},
 					{title:"Standort_id", field:"standort_id", visible:false},
-					{title:"letzte Änderung", field:"updateamum", visible:false},
+					{title:"letzte Änderung", field:"lastupdate", visible:false},
 					{title: 'Aktionen', field: 'actions',
 						minWidth: 150, // Ensures Action-buttons will be always fully displayed
 						formatter: (cell, formatterParams, onRendered) => {
@@ -216,10 +216,10 @@ export default{
 		cm.getColumnByField('anmerkung').component.updateDefinition({
 			title: this.$p.t('global', 'anmerkung')
 		});
-		cm.getColumnByField('kurz_bz').component.updateDefinition({
+		cm.getColumnByField('kurzbz').component.updateDefinition({
 			title: this.$p.t('person', 'firma')
 		});
-		cm.getColumnByField('updateamum').component.updateDefinition({
+		cm.getColumnByField('lastupdate').component.updateDefinition({
 			title: this.$p.t('notiz', 'letzte_aenderung')
 		});
 	},
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 47fe8a4a4..2ff8f1489 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -22413,7 +22413,7 @@ array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Bank account number',
+				'text' => 'Address',
 				'description' => '',
 				'insertvon' => 'system'
 			)

From a21a292da65580dc641de9d73451ddbc8be3f4df Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 29 Jan 2024 16:48:41 +0100
Subject: [PATCH 0363/1461] dokument upload

---
 .gitignore                                    |   0
 CHANGELOG.md                                  |   0
 FHC-vendor/angular-tablesort/.gitignore       |   0
 FHC-vendor/angular-tablesort/LICENSE          |   0
 FHC-vendor/angular-tablesort/README.md        |   0
 FHC-vendor/angular-tablesort/bower.json       |   0
 FHC-vendor/angular-tablesort/example.html     |   0
 FHC-vendor/angular-tablesort/index.js         |   0
 .../angular-tablesort/js/angular-tablesort.js |   0
 FHC-vendor/angular-tablesort/package.json     |   0
 FHC-vendor/angular-tablesort/tablesort.css    |   0
 FHC-vendor/easyui/changelog.txt               |   0
 FHC-vendor/easyui/easyloader.js               |   0
 FHC-vendor/easyui/jquery.easyui.min.js        |   0
 FHC-vendor/easyui/jquery.easyui.mobile.js     |   0
 FHC-vendor/easyui/jquery.min.js               |   0
 FHC-vendor/easyui/license_freeware.txt        |   0
 FHC-vendor/easyui/locale/easyui-lang-af.js    |   0
 FHC-vendor/easyui/locale/easyui-lang-am.js    |   0
 FHC-vendor/easyui/locale/easyui-lang-ar.js    |   0
 FHC-vendor/easyui/locale/easyui-lang-bg.js    |   0
 FHC-vendor/easyui/locale/easyui-lang-ca.js    |   0
 FHC-vendor/easyui/locale/easyui-lang-cs.js    |   0
 FHC-vendor/easyui/locale/easyui-lang-cz.js    |   0
 FHC-vendor/easyui/locale/easyui-lang-da.js    |   0
 FHC-vendor/easyui/locale/easyui-lang-de.js    |   0
 FHC-vendor/easyui/locale/easyui-lang-el.js    |   0
 FHC-vendor/easyui/locale/easyui-lang-en.js    |   0
 FHC-vendor/easyui/locale/easyui-lang-es.js    |   0
 FHC-vendor/easyui/locale/easyui-lang-fr.js    |   0
 FHC-vendor/easyui/locale/easyui-lang-it.js    |   0
 FHC-vendor/easyui/locale/easyui-lang-jp.js    |   0
 FHC-vendor/easyui/locale/easyui-lang-nl.js    |   0
 FHC-vendor/easyui/locale/easyui-lang-pl.js    |   0
 FHC-vendor/easyui/locale/easyui-lang-pt_BR.js |   0
 FHC-vendor/easyui/locale/easyui-lang-ru.js    |   0
 FHC-vendor/easyui/locale/easyui-lang-sv_SE.js |   0
 FHC-vendor/easyui/locale/easyui-lang-tr.js    |   0
 FHC-vendor/easyui/locale/easyui-lang-zh_CN.js |   0
 FHC-vendor/easyui/locale/easyui-lang-zh_TW.js |   0
 FHC-vendor/easyui/plugins/jquery.accordion.js |   0
 FHC-vendor/easyui/plugins/jquery.calendar.js  |   0
 FHC-vendor/easyui/plugins/jquery.combo.js     |   0
 FHC-vendor/easyui/plugins/jquery.combobox.js  |   0
 FHC-vendor/easyui/plugins/jquery.combogrid.js |   0
 FHC-vendor/easyui/plugins/jquery.combotree.js |   0
 FHC-vendor/easyui/plugins/jquery.datagrid.js  |   0
 FHC-vendor/easyui/plugins/jquery.datalist.js  |   0
 FHC-vendor/easyui/plugins/jquery.datebox.js   |   0
 .../easyui/plugins/jquery.datetimebox.js      |   0
 .../easyui/plugins/jquery.datetimespinner.js  |   0
 FHC-vendor/easyui/plugins/jquery.dialog.js    |   0
 FHC-vendor/easyui/plugins/jquery.draggable.js |   0
 FHC-vendor/easyui/plugins/jquery.droppable.js |   0
 FHC-vendor/easyui/plugins/jquery.filebox.js   |   0
 FHC-vendor/easyui/plugins/jquery.form.js      |   0
 FHC-vendor/easyui/plugins/jquery.layout.js    |   0
 .../easyui/plugins/jquery.linkbutton.js       |   0
 FHC-vendor/easyui/plugins/jquery.menu.js      |   0
 .../easyui/plugins/jquery.menubutton.js       |   0
 FHC-vendor/easyui/plugins/jquery.messager.js  |   0
 FHC-vendor/easyui/plugins/jquery.mobile.js    |   0
 FHC-vendor/easyui/plugins/jquery.numberbox.js |   0
 .../easyui/plugins/jquery.numberspinner.js    |   0
 .../easyui/plugins/jquery.pagination.js       |   0
 FHC-vendor/easyui/plugins/jquery.panel.js     |   0
 FHC-vendor/easyui/plugins/jquery.parser.js    |   0
 .../easyui/plugins/jquery.progressbar.js      |   0
 .../easyui/plugins/jquery.propertygrid.js     |   0
 FHC-vendor/easyui/plugins/jquery.resizable.js |   0
 FHC-vendor/easyui/plugins/jquery.searchbox.js |   0
 FHC-vendor/easyui/plugins/jquery.slider.js    |   0
 FHC-vendor/easyui/plugins/jquery.spinner.js   |   0
 .../easyui/plugins/jquery.splitbutton.js      |   0
 .../easyui/plugins/jquery.switchbutton.js     |   0
 FHC-vendor/easyui/plugins/jquery.tabs.js      |   0
 FHC-vendor/easyui/plugins/jquery.textbox.js   |   0
 .../easyui/plugins/jquery.timespinner.js      |   0
 FHC-vendor/easyui/plugins/jquery.tooltip.js   |   0
 FHC-vendor/easyui/plugins/jquery.tree.js      |   0
 FHC-vendor/easyui/plugins/jquery.treegrid.js  |   0
 .../easyui/plugins/jquery.validatebox.js      |   0
 FHC-vendor/easyui/plugins/jquery.window.js    |   0
 FHC-vendor/easyui/readme.txt                  |   0
 FHC-vendor/easyui/src/easyloader.js           |   0
 FHC-vendor/easyui/src/jquery.accordion.js     |   0
 FHC-vendor/easyui/src/jquery.calendar.js      |   0
 FHC-vendor/easyui/src/jquery.combobox.js      |   0
 FHC-vendor/easyui/src/jquery.datebox.js       |   0
 FHC-vendor/easyui/src/jquery.draggable.js     |   0
 FHC-vendor/easyui/src/jquery.droppable.js     |   0
 FHC-vendor/easyui/src/jquery.form.js          |   0
 FHC-vendor/easyui/src/jquery.linkbutton.js    |   0
 FHC-vendor/easyui/src/jquery.menu.js          |   0
 FHC-vendor/easyui/src/jquery.parser.js        |   0
 FHC-vendor/easyui/src/jquery.progressbar.js   |   0
 FHC-vendor/easyui/src/jquery.propertygrid.js  |   0
 FHC-vendor/easyui/src/jquery.resizable.js     |   0
 FHC-vendor/easyui/src/jquery.slider.js        |   0
 FHC-vendor/easyui/src/jquery.tabs.js          |   0
 FHC-vendor/easyui/src/jquery.window.js        |   0
 FHC-vendor/easyui/themes/black/accordion.css  |   0
 FHC-vendor/easyui/themes/black/calendar.css   |   0
 FHC-vendor/easyui/themes/black/combo.css      |   0
 FHC-vendor/easyui/themes/black/combobox.css   |   0
 FHC-vendor/easyui/themes/black/datagrid.css   |   0
 FHC-vendor/easyui/themes/black/datalist.css   |   0
 FHC-vendor/easyui/themes/black/datebox.css    |   0
 FHC-vendor/easyui/themes/black/dialog.css     |   0
 FHC-vendor/easyui/themes/black/easyui.css     |   0
 FHC-vendor/easyui/themes/black/filebox.css    |   0
 .../themes/black/images/accordion_arrows.png  | Bin
 .../easyui/themes/black/images/blank.gif      | Bin
 .../themes/black/images/calendar_arrows.png   | Bin
 .../themes/black/images/combo_arrow.png       | Bin
 .../themes/black/images/datagrid_icons.png    | Bin
 .../themes/black/images/datebox_arrow.png     | Bin
 .../themes/black/images/layout_arrows.png     | Bin
 .../themes/black/images/linkbutton_bg.png     | Bin
 .../easyui/themes/black/images/loading.gif    | Bin
 .../themes/black/images/menu_arrows.png       | Bin
 .../themes/black/images/messager_icons.png    | Bin
 .../themes/black/images/pagination_icons.png  | Bin
 .../themes/black/images/panel_tools.png       | Bin
 .../themes/black/images/searchbox_button.png  | Bin
 .../themes/black/images/slider_handle.png     | Bin
 .../themes/black/images/spinner_arrows.png    | Bin
 .../easyui/themes/black/images/tabs_icons.png | Bin
 .../easyui/themes/black/images/tree_icons.png | Bin
 .../black/images/validatebox_warning.png      | Bin
 FHC-vendor/easyui/themes/black/layout.css     |   0
 FHC-vendor/easyui/themes/black/linkbutton.css |   0
 FHC-vendor/easyui/themes/black/menu.css       |   0
 FHC-vendor/easyui/themes/black/menubutton.css |   0
 FHC-vendor/easyui/themes/black/messager.css   |   0
 FHC-vendor/easyui/themes/black/numberbox.css  |   0
 FHC-vendor/easyui/themes/black/pagination.css |   0
 FHC-vendor/easyui/themes/black/panel.css      |   0
 .../easyui/themes/black/progressbar.css       |   0
 .../easyui/themes/black/propertygrid.css      |   0
 FHC-vendor/easyui/themes/black/searchbox.css  |   0
 FHC-vendor/easyui/themes/black/slider.css     |   0
 FHC-vendor/easyui/themes/black/spinner.css    |   0
 .../easyui/themes/black/splitbutton.css       |   0
 .../easyui/themes/black/switchbutton.css      |   0
 FHC-vendor/easyui/themes/black/tabs.css       |   0
 FHC-vendor/easyui/themes/black/textbox.css    |   0
 FHC-vendor/easyui/themes/black/tooltip.css    |   0
 FHC-vendor/easyui/themes/black/tree.css       |   0
 .../easyui/themes/black/validatebox.css       |   0
 FHC-vendor/easyui/themes/black/window.css     |   0
 .../easyui/themes/bootstrap/accordion.css     |   0
 .../easyui/themes/bootstrap/calendar.css      |   0
 FHC-vendor/easyui/themes/bootstrap/combo.css  |   0
 .../easyui/themes/bootstrap/combobox.css      |   0
 .../easyui/themes/bootstrap/datagrid.css      |   0
 .../easyui/themes/bootstrap/datebox.css       |   0
 FHC-vendor/easyui/themes/bootstrap/dialog.css |   0
 FHC-vendor/easyui/themes/bootstrap/easyui.css |   0
 .../easyui/themes/bootstrap/filebox.css       |   0
 .../bootstrap/images/accordion_arrows.png     | Bin
 .../easyui/themes/bootstrap/images/blank.gif  | Bin
 .../bootstrap/images/calendar_arrows.png      | Bin
 .../themes/bootstrap/images/combo_arrow.png   | Bin
 .../bootstrap/images/datagrid_icons.png       | Bin
 .../themes/bootstrap/images/datebox_arrow.png | Bin
 .../themes/bootstrap/images/layout_arrows.png | Bin
 .../themes/bootstrap/images/linkbutton_bg.png | Bin
 .../themes/bootstrap/images/loading.gif       | Bin
 .../themes/bootstrap/images/menu_arrows.png   | Bin
 .../bootstrap/images/messager_icons.png       | Bin
 .../bootstrap/images/pagination_icons.png     | Bin
 .../themes/bootstrap/images/panel_tools.png   | Bin
 .../bootstrap/images/searchbox_button.png     | Bin
 .../themes/bootstrap/images/slider_handle.png | Bin
 .../bootstrap/images/spinner_arrows.png       | Bin
 .../themes/bootstrap/images/tabs_icons.png    | Bin
 .../themes/bootstrap/images/tree_icons.png    | Bin
 .../bootstrap/images/validatebox_warning.png  | Bin
 FHC-vendor/easyui/themes/bootstrap/layout.css |   0
 .../easyui/themes/bootstrap/linkbutton.css    |   0
 FHC-vendor/easyui/themes/bootstrap/menu.css   |   0
 .../easyui/themes/bootstrap/menubutton.css    |   0
 .../easyui/themes/bootstrap/messager.css      |   0
 .../easyui/themes/bootstrap/numberbox.css     |   0
 .../easyui/themes/bootstrap/pagination.css    |   0
 FHC-vendor/easyui/themes/bootstrap/panel.css  |   0
 .../easyui/themes/bootstrap/progressbar.css   |   0
 .../easyui/themes/bootstrap/propertygrid.css  |   0
 .../easyui/themes/bootstrap/searchbox.css     |   0
 FHC-vendor/easyui/themes/bootstrap/slider.css |   0
 .../easyui/themes/bootstrap/spinner.css       |   0
 .../easyui/themes/bootstrap/splitbutton.css   |   0
 .../easyui/themes/bootstrap/switchbutton.css  |   0
 FHC-vendor/easyui/themes/bootstrap/tabs.css   |   0
 .../easyui/themes/bootstrap/textbox.css       |   0
 .../easyui/themes/bootstrap/tooltip.css       |   0
 FHC-vendor/easyui/themes/bootstrap/tree.css   |   0
 .../easyui/themes/bootstrap/validatebox.css   |   0
 FHC-vendor/easyui/themes/bootstrap/window.css |   0
 FHC-vendor/easyui/themes/color.css            |   0
 .../easyui/themes/default/accordion.css       |   0
 FHC-vendor/easyui/themes/default/calendar.css |   0
 FHC-vendor/easyui/themes/default/combo.css    |   0
 FHC-vendor/easyui/themes/default/combobox.css |   0
 FHC-vendor/easyui/themes/default/datagrid.css |   0
 FHC-vendor/easyui/themes/default/datalist.css |   0
 FHC-vendor/easyui/themes/default/datebox.css  |   0
 FHC-vendor/easyui/themes/default/dialog.css   |   0
 FHC-vendor/easyui/themes/default/easyui.css   |   0
 FHC-vendor/easyui/themes/default/filebox.css  |   0
 .../default/images/accordion_arrows.png       | Bin
 .../easyui/themes/default/images/blank.gif    | Bin
 .../themes/default/images/calendar_arrows.png | Bin
 .../themes/default/images/combo_arrow.png     | Bin
 .../themes/default/images/datagrid_icons.png  | Bin
 .../themes/default/images/datebox_arrow.png   | Bin
 .../themes/default/images/layout_arrows.png   | Bin
 .../themes/default/images/linkbutton_bg.png   | Bin
 .../easyui/themes/default/images/loading.gif  | Bin
 .../themes/default/images/menu_arrows.png     | Bin
 .../themes/default/images/messager_icons.png  | Bin
 .../default/images/pagination_icons.png       | Bin
 .../themes/default/images/panel_tools.png     | Bin
 .../default/images/searchbox_button.png       | Bin
 .../themes/default/images/slider_handle.png   | Bin
 .../themes/default/images/spinner_arrows.png  | Bin
 .../themes/default/images/tabs_icons.png      | Bin
 .../themes/default/images/tree_icons.png      | Bin
 .../default/images/validatebox_warning.png    | Bin
 FHC-vendor/easyui/themes/default/layout.css   |   0
 .../easyui/themes/default/linkbutton.css      |   0
 FHC-vendor/easyui/themes/default/menu.css     |   0
 .../easyui/themes/default/menubutton.css      |   0
 FHC-vendor/easyui/themes/default/messager.css |   0
 .../easyui/themes/default/numberbox.css       |   0
 .../easyui/themes/default/pagination.css      |   0
 FHC-vendor/easyui/themes/default/panel.css    |   0
 .../easyui/themes/default/progressbar.css     |   0
 .../easyui/themes/default/propertygrid.css    |   0
 .../easyui/themes/default/searchbox.css       |   0
 FHC-vendor/easyui/themes/default/slider.css   |   0
 FHC-vendor/easyui/themes/default/spinner.css  |   0
 .../easyui/themes/default/splitbutton.css     |   0
 .../easyui/themes/default/switchbutton.css    |   0
 FHC-vendor/easyui/themes/default/tabs.css     |   0
 FHC-vendor/easyui/themes/default/textbox.css  |   0
 FHC-vendor/easyui/themes/default/tooltip.css  |   0
 FHC-vendor/easyui/themes/default/tree.css     |   0
 .../easyui/themes/default/validatebox.css     |   0
 FHC-vendor/easyui/themes/default/window.css   |   0
 FHC-vendor/easyui/themes/gray/accordion.css   |   0
 FHC-vendor/easyui/themes/gray/calendar.css    |   0
 FHC-vendor/easyui/themes/gray/combo.css       |   0
 FHC-vendor/easyui/themes/gray/combobox.css    |   0
 FHC-vendor/easyui/themes/gray/datagrid.css    |   0
 FHC-vendor/easyui/themes/gray/datalist.css    |   0
 FHC-vendor/easyui/themes/gray/datebox.css     |   0
 FHC-vendor/easyui/themes/gray/dialog.css      |   0
 FHC-vendor/easyui/themes/gray/easyui.css      |   0
 FHC-vendor/easyui/themes/gray/filebox.css     |   0
 .../themes/gray/images/accordion_arrows.png   | Bin
 .../easyui/themes/gray/images/blank.gif       | Bin
 .../themes/gray/images/calendar_arrows.png    | Bin
 .../easyui/themes/gray/images/combo_arrow.png | Bin
 .../themes/gray/images/datagrid_icons.png     | Bin
 .../themes/gray/images/datebox_arrow.png      | Bin
 .../themes/gray/images/layout_arrows.png      | Bin
 .../themes/gray/images/linkbutton_bg.png      | Bin
 .../easyui/themes/gray/images/loading.gif     | Bin
 .../easyui/themes/gray/images/menu_arrows.png | Bin
 .../themes/gray/images/messager_icons.png     | Bin
 .../themes/gray/images/pagination_icons.png   | Bin
 .../easyui/themes/gray/images/panel_tools.png | Bin
 .../themes/gray/images/searchbox_button.png   | Bin
 .../themes/gray/images/slider_handle.png      | Bin
 .../themes/gray/images/spinner_arrows.png     | Bin
 .../easyui/themes/gray/images/tabs_icons.png  | Bin
 .../easyui/themes/gray/images/tree_icons.png  | Bin
 .../gray/images/validatebox_warning.png       | Bin
 FHC-vendor/easyui/themes/gray/layout.css      |   0
 FHC-vendor/easyui/themes/gray/linkbutton.css  |   0
 FHC-vendor/easyui/themes/gray/menu.css        |   0
 FHC-vendor/easyui/themes/gray/menubutton.css  |   0
 FHC-vendor/easyui/themes/gray/messager.css    |   0
 FHC-vendor/easyui/themes/gray/numberbox.css   |   0
 FHC-vendor/easyui/themes/gray/pagination.css  |   0
 FHC-vendor/easyui/themes/gray/panel.css       |   0
 FHC-vendor/easyui/themes/gray/progressbar.css |   0
 .../easyui/themes/gray/propertygrid.css       |   0
 FHC-vendor/easyui/themes/gray/searchbox.css   |   0
 FHC-vendor/easyui/themes/gray/slider.css      |   0
 FHC-vendor/easyui/themes/gray/spinner.css     |   0
 FHC-vendor/easyui/themes/gray/splitbutton.css |   0
 .../easyui/themes/gray/switchbutton.css       |   0
 FHC-vendor/easyui/themes/gray/tabs.css        |   0
 FHC-vendor/easyui/themes/gray/textbox.css     |   0
 FHC-vendor/easyui/themes/gray/tooltip.css     |   0
 FHC-vendor/easyui/themes/gray/tree.css        |   0
 FHC-vendor/easyui/themes/gray/validatebox.css |   0
 FHC-vendor/easyui/themes/gray/window.css      |   0
 FHC-vendor/easyui/themes/icon.css             |   0
 FHC-vendor/easyui/themes/icons/back.png       | Bin
 FHC-vendor/easyui/themes/icons/blank.gif      | Bin
 FHC-vendor/easyui/themes/icons/cancel.png     | Bin
 FHC-vendor/easyui/themes/icons/clear.png      | Bin
 FHC-vendor/easyui/themes/icons/cut.png        | Bin
 FHC-vendor/easyui/themes/icons/edit_add.png   | Bin
 .../easyui/themes/icons/edit_remove.png       | Bin
 FHC-vendor/easyui/themes/icons/filesave.png   | Bin
 FHC-vendor/easyui/themes/icons/filter.png     | Bin
 FHC-vendor/easyui/themes/icons/help.png       | Bin
 .../easyui/themes/icons/large_chart.png       | Bin
 .../easyui/themes/icons/large_clipart.png     | Bin
 .../easyui/themes/icons/large_picture.png     | Bin
 .../easyui/themes/icons/large_shapes.png      | Bin
 .../easyui/themes/icons/large_smartart.png    | Bin
 FHC-vendor/easyui/themes/icons/lock.png       | Bin
 FHC-vendor/easyui/themes/icons/man.png        | Bin
 FHC-vendor/easyui/themes/icons/mini_add.png   | Bin
 FHC-vendor/easyui/themes/icons/mini_edit.png  | Bin
 .../easyui/themes/icons/mini_refresh.png      | Bin
 FHC-vendor/easyui/themes/icons/more.png       | Bin
 FHC-vendor/easyui/themes/icons/no.png         | Bin
 FHC-vendor/easyui/themes/icons/ok.png         | Bin
 FHC-vendor/easyui/themes/icons/pencil.png     | Bin
 FHC-vendor/easyui/themes/icons/print.png      | Bin
 FHC-vendor/easyui/themes/icons/redo.png       | Bin
 FHC-vendor/easyui/themes/icons/reload.png     | Bin
 FHC-vendor/easyui/themes/icons/search.png     | Bin
 FHC-vendor/easyui/themes/icons/sum.png        | Bin
 FHC-vendor/easyui/themes/icons/tip.png        | Bin
 FHC-vendor/easyui/themes/icons/undo.png       | Bin
 FHC-vendor/easyui/themes/metro/accordion.css  |   0
 FHC-vendor/easyui/themes/metro/calendar.css   |   0
 FHC-vendor/easyui/themes/metro/combo.css      |   0
 FHC-vendor/easyui/themes/metro/combobox.css   |   0
 FHC-vendor/easyui/themes/metro/datagrid.css   |   0
 FHC-vendor/easyui/themes/metro/datalist.css   |   0
 FHC-vendor/easyui/themes/metro/datebox.css    |   0
 FHC-vendor/easyui/themes/metro/dialog.css     |   0
 FHC-vendor/easyui/themes/metro/easyui.css     |   0
 FHC-vendor/easyui/themes/metro/filebox.css    |   0
 .../themes/metro/images/accordion_arrows.png  | Bin
 .../easyui/themes/metro/images/blank.gif      | Bin
 .../themes/metro/images/calendar_arrows.png   | Bin
 .../themes/metro/images/combo_arrow.png       | Bin
 .../themes/metro/images/datagrid_icons.png    | Bin
 .../themes/metro/images/datebox_arrow.png     | Bin
 .../themes/metro/images/layout_arrows.png     | Bin
 .../themes/metro/images/linkbutton_bg.png     | Bin
 .../easyui/themes/metro/images/loading.gif    | Bin
 .../themes/metro/images/menu_arrows.png       | Bin
 .../themes/metro/images/messager_icons.png    | Bin
 .../themes/metro/images/pagination_icons.png  | Bin
 .../themes/metro/images/panel_tools.png       | Bin
 .../themes/metro/images/searchbox_button.png  | Bin
 .../themes/metro/images/slider_handle.png     | Bin
 .../themes/metro/images/spinner_arrows.png    | Bin
 .../easyui/themes/metro/images/tabs_icons.png | Bin
 .../easyui/themes/metro/images/tree_icons.png | Bin
 .../metro/images/validatebox_warning.png      | Bin
 FHC-vendor/easyui/themes/metro/layout.css     |   0
 FHC-vendor/easyui/themes/metro/linkbutton.css |   0
 FHC-vendor/easyui/themes/metro/menu.css       |   0
 FHC-vendor/easyui/themes/metro/menubutton.css |   0
 FHC-vendor/easyui/themes/metro/messager.css   |   0
 FHC-vendor/easyui/themes/metro/numberbox.css  |   0
 FHC-vendor/easyui/themes/metro/pagination.css |   0
 FHC-vendor/easyui/themes/metro/panel.css      |   0
 .../easyui/themes/metro/progressbar.css       |   0
 .../easyui/themes/metro/propertygrid.css      |   0
 FHC-vendor/easyui/themes/metro/searchbox.css  |   0
 FHC-vendor/easyui/themes/metro/slider.css     |   0
 FHC-vendor/easyui/themes/metro/spinner.css    |   0
 .../easyui/themes/metro/splitbutton.css       |   0
 .../easyui/themes/metro/switchbutton.css      |   0
 FHC-vendor/easyui/themes/metro/tabs.css       |   0
 FHC-vendor/easyui/themes/metro/textbox.css    |   0
 FHC-vendor/easyui/themes/metro/tooltip.css    |   0
 FHC-vendor/easyui/themes/metro/tree.css       |   0
 .../easyui/themes/metro/validatebox.css       |   0
 FHC-vendor/easyui/themes/metro/window.css     |   0
 FHC-vendor/easyui/themes/mobile.css           |   0
 FHC-vendor/easyui/themes/vilesci              |   0
 FHC-vendor/jquery-tablesorter/.gitattributes  |   0
 FHC-vendor/jquery-tablesorter/.gitignore      |   0
 FHC-vendor/jquery-tablesorter/.jscsrc         |   0
 FHC-vendor/jquery-tablesorter/CONTRIBUTING.md |   0
 FHC-vendor/jquery-tablesorter/Gruntfile.js    |   0
 FHC-vendor/jquery-tablesorter/README.md       |   0
 .../addons/pager/icons/first.png              | Bin
 .../addons/pager/icons/last.png               | Bin
 .../addons/pager/icons/loading.gif            | Bin
 .../addons/pager/icons/next.png               | Bin
 .../addons/pager/icons/prev.png               | Bin
 .../addons/pager/jquery.tablesorter.pager.css |   0
 .../addons/pager/jquery.tablesorter.pager.js  |   0
 .../example-pager-custom-controls.html        |   0
 .../example-widget-column-reorder.html        |   0
 .../beta-testing/pager-custom-controls.js     |   0
 .../beta-testing/widget-reorder.js            |   0
 FHC-vendor/jquery-tablesorter/bower.json      |   0
 FHC-vendor/jquery-tablesorter/changelog.txt   |   0
 .../jquery-tablesorter/css/bootstrap.less     |   0
 .../jquery-tablesorter/css/dragtable.mod.css  |   0
 .../css/filter.formatter.css                  |   0
 .../css/images/black-asc.gif                  | Bin
 .../css/images/black-desc.gif                 | Bin
 .../css/images/black-unsorted.gif             | Bin
 .../css/images/bootstrap-black-unsorted.png   | Bin
 .../css/images/bootstrap-white-unsorted.png   | Bin
 .../css/images/dragtable-handle.png           | Bin
 .../css/images/dragtable-handle.svg           |   0
 .../css/images/dropbox-asc-hovered.png        | Bin
 .../css/images/dropbox-asc.png                | Bin
 .../css/images/dropbox-desc-hovered.png       | Bin
 .../css/images/dropbox-desc.png               | Bin
 .../css/images/green-asc.gif                  | Bin
 .../css/images/green-desc.gif                 | Bin
 .../css/images/green-header.gif               | Bin
 .../css/images/green-unsorted.gif             | Bin
 .../jquery-tablesorter/css/images/ice-asc.gif | Bin
 .../css/images/ice-desc.gif                   | Bin
 .../css/images/ice-unsorted.gif               | Bin
 .../css/images/metro-black-asc.png            | Bin
 .../css/images/metro-black-desc.png           | Bin
 .../css/images/metro-loading.gif              | Bin
 .../css/images/metro-unsorted.png             | Bin
 .../css/images/metro-white-asc.png            | Bin
 .../css/images/metro-white-desc.png           | Bin
 .../css/images/white-asc.gif                  | Bin
 .../css/images/white-desc.gif                 | Bin
 .../css/images/white-unsorted.gif             | Bin
 FHC-vendor/jquery-tablesorter/css/metro.less  |   0
 .../jquery-tablesorter/css/psd/green-asc.psd  | Bin
 .../jquery-tablesorter/css/psd/green-desc.psd | Bin
 .../css/psd/green-unsorted.psd                | Bin
 .../css/psd/metro-style.psd                   | Bin
 .../css/theme.black-ice.css                   |   0
 .../jquery-tablesorter/css/theme.blue.css     |   0
 .../css/theme.bootstrap.css                   |   0
 .../css/theme.bootstrap_2.css                 |   0
 .../jquery-tablesorter/css/theme.dark.css     |   0
 .../jquery-tablesorter/css/theme.default.css  |   0
 .../jquery-tablesorter/css/theme.dropbox.css  |   0
 .../jquery-tablesorter/css/theme.green.css    |   0
 .../jquery-tablesorter/css/theme.grey.css     |   0
 .../jquery-tablesorter/css/theme.ice.css      |   0
 .../jquery-tablesorter/css/theme.jui.css      |   0
 FHC-vendor/jquery-tablesorter/css/theme.less  |   0
 .../css/theme.metro-dark.css                  |   0
 .../dist/css/dragtable.mod.min.css            |   0
 .../dist/css/filter.formatter.min.css         |   0
 .../dist/css/images/black-asc.gif             | Bin
 .../dist/css/images/black-desc.gif            | Bin
 .../dist/css/images/black-unsorted.gif        | Bin
 .../css/images/bootstrap-black-unsorted.png   | Bin
 .../css/images/bootstrap-white-unsorted.png   | Bin
 .../dist/css/images/dragtable-handle.png      | Bin
 .../dist/css/images/dragtable-handle.svg      |   0
 .../dist/css/images/dropbox-asc-hovered.png   | Bin
 .../dist/css/images/dropbox-asc.png           | Bin
 .../dist/css/images/dropbox-desc-hovered.png  | Bin
 .../dist/css/images/dropbox-desc.png          | Bin
 .../dist/css/images/first.png                 | Bin
 .../dist/css/images/green-asc.gif             | Bin
 .../dist/css/images/green-desc.gif            | Bin
 .../dist/css/images/green-header.gif          | Bin
 .../dist/css/images/green-unsorted.gif        | Bin
 .../dist/css/images/ice-asc.gif               | Bin
 .../dist/css/images/ice-desc.gif              | Bin
 .../dist/css/images/ice-unsorted.gif          | Bin
 .../dist/css/images/last.png                  | Bin
 .../dist/css/images/loading.gif               | Bin
 .../dist/css/images/metro-black-asc.png       | Bin
 .../dist/css/images/metro-black-desc.png      | Bin
 .../dist/css/images/metro-loading.gif         | Bin
 .../dist/css/images/metro-unsorted.png        | Bin
 .../dist/css/images/metro-white-asc.png       | Bin
 .../dist/css/images/metro-white-desc.png      | Bin
 .../dist/css/images/next.png                  | Bin
 .../dist/css/images/prev.png                  | Bin
 .../dist/css/images/white-asc.gif             | Bin
 .../dist/css/images/white-desc.gif            | Bin
 .../dist/css/images/white-unsorted.gif        | Bin
 .../dist/css/jquery.tablesorter.pager.min.css |   0
 .../dist/css/less/bootstrap.less              |   0
 .../dist/css/less/metro.less                  |   0
 .../dist/css/less/theme.less                  |   0
 .../dist/css/theme.blackice.min.css           |   0
 .../dist/css/theme.blue.min.css               |   0
 .../dist/css/theme.bootstrap.min.css          |   0
 .../dist/css/theme.bootstrap_2.min.css        |   0
 .../dist/css/theme.dark.min.css               |   0
 .../dist/css/theme.default.min.css            |   0
 .../dist/css/theme.dropbox.min.css            |   0
 .../dist/css/theme.green.min.css              |   0
 .../dist/css/theme.grey.min.css               |   0
 .../dist/css/theme.ice.min.css                |   0
 .../dist/css/theme.jui.min.css                |   0
 .../dist/css/theme.metro-dark.min.css         |   0
 .../js/extras/jquery.dragtable.mod.min.js     |   0
 .../dist/js/extras/jquery.metadata.min.js     |   0
 .../js/extras/jquery.tablesorter.pager.min.js |   0
 .../dist/js/extras/semver-mod.min.js          |   0
 .../dist/js/jquery.tablesorter.combined.js    |   0
 .../js/jquery.tablesorter.combined.min.js     |   0
 .../dist/js/jquery.tablesorter.js             |   0
 .../dist/js/jquery.tablesorter.min.js         |   0
 .../dist/js/jquery.tablesorter.widgets.js     |   0
 .../dist/js/jquery.tablesorter.widgets.min.js |   0
 .../js/parsers/parser-date-extract.min.js     |   0
 .../js/parsers/parser-date-iso8601.min.js     |   0
 .../dist/js/parsers/parser-date-month.min.js  |   0
 .../dist/js/parsers/parser-date-range.min.js  |   0
 .../parsers/parser-date-two-digit-year.min.js |   0
 .../js/parsers/parser-date-weekday.min.js     |   0
 .../dist/js/parsers/parser-date.min.js        |   0
 .../dist/js/parsers/parser-duration.min.js    |   0
 .../parsers/parser-feet-inch-fraction.min.js  |   0
 .../dist/js/parsers/parser-file-type.min.js   |   0
 .../dist/js/parsers/parser-globalize.min.js   |   0
 .../js/parsers/parser-ignore-articles.min.js  |   0
 .../dist/js/parsers/parser-image.min.js       |   0
 .../js/parsers/parser-input-select.min.js     |   0
 .../dist/js/parsers/parser-metric.min.js      |   0
 .../js/parsers/parser-named-numbers.min.js    |   0
 .../dist/js/parsers/parser-network.min.js     |   0
 .../dist/js/parsers/parser-roman.min.js       |   0
 .../dist/js/widgets/widget-alignChar.min.js   |   0
 .../dist/js/widgets/widget-build-table.min.js |   0
 .../dist/js/widgets/widget-chart.min.js       |   0
 .../js/widgets/widget-columnSelector.min.js   |   0
 .../dist/js/widgets/widget-columns.min.js     |   0
 .../js/widgets/widget-cssStickyHeaders.min.js |   0
 .../dist/js/widgets/widget-editable.min.js    |   0
 .../widget-filter-formatter-html5.min.js      |   0
 .../widget-filter-formatter-jui.min.js        |   0
 .../widget-filter-formatter-select2.min.js    |   0
 .../widget-filter-type-insideRange.min.js     |   0
 .../dist/js/widgets/widget-filter.min.js      |   0
 .../dist/js/widgets/widget-formatter.min.js   |   0
 .../dist/js/widgets/widget-grouping.min.js    |   0
 .../js/widgets/widget-headerTitles.min.js     |   0
 .../dist/js/widgets/widget-lazyload.min.js    |   0
 .../dist/js/widgets/widget-math.min.js        |   0
 .../dist/js/widgets/widget-output.min.js      |   0
 .../dist/js/widgets/widget-pager.min.js       |   0
 .../dist/js/widgets/widget-print.min.js       |   0
 .../dist/js/widgets/widget-reflow.min.js      |   0
 .../js/widgets/widget-repeatheaders.min.js    |   0
 .../dist/js/widgets/widget-resizable.min.js   |   0
 .../dist/js/widgets/widget-saveSort.min.js    |   0
 .../dist/js/widgets/widget-scroller.min.js    |   0
 .../dist/js/widgets/widget-sort2Hash.min.js   |   0
 .../dist/js/widgets/widget-sortTbodies.min.js |   0
 .../dist/js/widgets/widget-staticRow.min.js   |   0
 .../js/widgets/widget-stickyHeaders.min.js    |   0
 .../dist/js/widgets/widget-storage.min.js     |   0
 .../dist/js/widgets/widget-toggle.min.js      |   0
 .../dist/js/widgets/widget-uitheme.min.js     |   0
 .../dist/js/widgets/widget-view.min.js        |   0
 .../jquery-tablesorter/docs/assets/City0.json |   0
 .../jquery-tablesorter/docs/assets/City1.json |   0
 .../jquery-tablesorter/docs/assets/City2.json |   0
 .../jquery-tablesorter/docs/assets/City3.json |   0
 .../docs/assets/ajax-content.html             |   0
 .../jquery-tablesorter/docs/assets/build.json |   0
 .../jquery-tablesorter/docs/assets/build.txt  |   0
 .../docs/assets/theme_switcher.json           |   0
 .../docs/css/bootstrap-v2.min.css             |   0
 .../docs/css/bootstrap.min.css                |   0
 .../css/images/glyphicons-halflings-white.png | Bin
 .../docs/css/images/glyphicons-halflings.png  | Bin
 .../ui-bg_diagonals-thick_90_eeeeee_40x40.png | Bin
 .../images/ui-bg_flat_15_cd0a0a_40x100.png    | Bin
 .../images/ui-bg_glass_100_e4f1fb_1x400.png   | Bin
 .../images/ui-bg_glass_50_3baae3_1x400.png    | Bin
 .../images/ui-bg_glass_80_d7ebf9_1x400.png    | Bin
 .../ui-bg_highlight-hard_100_f2f5f7_1x100.png | Bin
 .../ui-bg_highlight-hard_70_000000_1x100.png  | Bin
 .../ui-bg_highlight-soft_100_deedf7_1x100.png | Bin
 .../ui-bg_highlight-soft_25_ffef8f_1x100.png  | Bin
 .../css/images/ui-icons_2694e8_256x240.png    | Bin
 .../css/images/ui-icons_2e83ff_256x240.png    | Bin
 .../css/images/ui-icons_3d80b3_256x240.png    | Bin
 .../css/images/ui-icons_72a7cf_256x240.png    | Bin
 .../css/images/ui-icons_ffffff_256x240.png    | Bin
 FHC-vendor/jquery-tablesorter/docs/css/jq.css |   0
 .../docs/css/jquery-ui.min.css                |   0
 .../docs/css/magnific-popup.css               |   0
 .../jquery-tablesorter/docs/css/menu.css      |   0
 .../jquery-tablesorter/docs/css/prettify.css  |   0
 .../docs/css/rangeslider.css                  |   0
 .../docs/css/select2-3.4.6.min.css            |   0
 .../docs/css/select2-spinner.gif              | Bin
 .../jquery-tablesorter/docs/css/select2.png   | Bin
 .../jquery-tablesorter/docs/css/select2x2.png | Bin
 .../jquery-tablesorter/docs/css/tipsy.css     |   0
 .../docs/example-add-rows.html                |   0
 .../jquery-tablesorter/docs/example-ajax.html |   0
 .../docs/example-apply-widget.html            |   0
 .../docs/example-child-rows-filtered.html     |   0
 .../docs/example-child-rows.html              |   0
 .../docs/example-css-highlighting.html        |   0
 .../docs/example-dragtable.html               |   0
 .../docs/example-empty-table.html             |   0
 .../docs/example-extending-defaults.html      |   0
 .../docs/example-extractors-parsers.html      |   0
 .../docs/example-header-column-span.html      |   0
 .../docs/example-locale-sort.html             |   0
 .../docs/example-meta-headers.html            |   0
 .../docs/example-meta-parsers.html            |   0
 .../docs/example-meta-sort-list.html          |   0
 .../docs/example-method-sortreset.html        |   0
 .../docs/example-multiple-tbodies.html        |   0
 .../docs/example-option-custom-sort.html      |   0
 .../docs/example-option-date-format.html      |   0
 .../docs/example-option-debug.html            |   0
 .../docs/example-option-delay-init.html       |   0
 .../docs/example-option-digits.html           |   0
 .../docs/example-option-render-header.html    |   0
 .../docs/example-option-render-template.html  |   0
 .../docs/example-option-selectorsort.html     |   0
 .../docs/example-option-show-processing.html  |   0
 .../docs/example-option-sort-append.html      |   0
 .../docs/example-option-sort-empty.html       |   0
 .../docs/example-option-sort-force.html       |   0
 .../docs/example-option-sort-key.html         |   0
 .../docs/example-option-sort-list.html        |   0
 .../docs/example-option-sort-order.html       |   0
 .../example-option-sortreset-sortrestart.html |   0
 .../docs/example-option-text-extraction.html  |   0
 .../example-option-textsorter-semver.html     |   0
 .../example-option-theme-metro-style.html     |   0
 ...xample-options-headers-digits-strings.html |   0
 .../docs/example-options-headers-locked.html  |   0
 .../docs/example-options-headers-order.html   |   0
 .../docs/example-options-headers-parser.html  |   0
 .../docs/example-options-headers.html         |   0
 .../docs/example-pager-ajax.html              |   0
 .../docs/example-pager-filtered.html          |   0
 .../docs/example-pager.html                   |   0
 .../docs/example-parsers-advanced.html        |   0
 .../docs/example-parsers-class-name.html      |   0
 .../docs/example-parsers-date-range.html      |   0
 .../docs/example-parsers-dates.html           |   0
 .../docs/example-parsers-duration.html        |   0
 .../example-parsers-feet-inch-fraction.html   |   0
 .../docs/example-parsers-file-type.html       |   0
 .../docs/example-parsers-globalize.html       |   0
 .../docs/example-parsers-ignore-articles.html |   0
 .../docs/example-parsers-ip-address.html      |   0
 .../docs/example-parsers-jquery-data.html     |   0
 .../docs/example-parsers-metric.html          |   0
 .../docs/example-parsers-named-numbers.html   |   0
 .../docs/example-parsers-roman.html           |   0
 .../docs/example-parsers.html                 |   0
 .../docs/example-trigger-sort.html            |   0
 .../docs/example-triggers.html                |   0
 .../docs/example-update-all.html              |   0
 .../docs/example-update-cell.html             |   0
 .../docs/example-widget-align-character.html  |   0
 .../example-widget-bootstrap-theme-v2.html    |   0
 .../docs/example-widget-bootstrap-theme.html  |   0
 .../docs/example-widget-build-table.html      |   0
 .../docs/example-widget-chart.html            |   0
 .../docs/example-widget-column-selector.html  |   0
 .../docs/example-widget-columns.html          |   0
 .../example-widget-css-sticky-header.html     |   0
 .../docs/example-widget-editable.html         |   0
 .../docs/example-widget-filter-any-match.html |   0
 .../docs/example-widget-filter-childrows.html |   0
 .../example-widget-filter-custom-search.html  |   0
 .../example-widget-filter-custom-search2.html |   0
 .../docs/example-widget-filter-custom.html    |   0
 ...example-widget-filter-external-inputs.html |   0
 .../example-widget-filter-formatter-1.html    |   0
 .../example-widget-filter-formatter-2.html    |   0
 ...ample-widget-filter-formatter-select2.html |   0
 .../example-widget-filter-selectmenu.html     |   0
 .../docs/example-widget-filter.html           |   0
 .../docs/example-widget-formatter.html        |   0
 ...mple-widget-grouping-filter-childrows.html |   0
 .../docs/example-widget-grouping.html         |   0
 .../docs/example-widget-header-titles.html    |   0
 .../docs/example-widget-lazyload.html         |   0
 .../docs/example-widget-math.html             |   0
 .../docs/example-widget-output.html           |   0
 .../docs/example-widget-pager-ajax.html       |   0
 .../docs/example-widget-pager.html            |   0
 .../docs/example-widget-print.html            |   0
 .../docs/example-widget-reflow.html           |   0
 .../docs/example-widget-reflow1.html          |   0
 .../docs/example-widget-reflow2.html          |   0
 .../docs/example-widget-reflow3.html          |   0
 .../docs/example-widget-resizable.html        |   0
 .../docs/example-widget-savesort.html         |   0
 .../docs/example-widget-scroller.html         |   0
 .../docs/example-widget-sort-tbodies.html     |   0
 .../docs/example-widget-sort-to-hash.html     |   0
 .../docs/example-widget-static-row.html       |   0
 .../docs/example-widget-sticky-header.html    |   0
 .../example-widget-toggle-tablesorter.html    |   0
 .../docs/example-widget-ui-theme.html         |   0
 .../docs/example-widget-view.html             |   0
 .../docs/example-widget-zebra.html            |   0
 .../docs/example-widgets.html                 |   0
 .../fonts/glyphicons-halflings-regular.eot    | Bin
 .../fonts/glyphicons-halflings-regular.svg    |   0
 .../fonts/glyphicons-halflings-regular.ttf    | Bin
 .../fonts/glyphicons-halflings-regular.woff   | Bin
 .../fonts/glyphicons-halflings-regular.woff2  | Bin
 .../jquery-tablesorter/docs/img/external.png  | Bin
 .../docs/img/grid-default-thumb.png           | Bin
 .../jquery-tablesorter/docs/img/link.png      | Bin
 .../docs/img/new-product-banner.png           | Bin
 .../docs/img/sale-banner.png                  | Bin
 .../docs/img/screens-blue.png                 | Bin
 .../jquery-tablesorter/docs/img/screens.png   | Bin
 FHC-vendor/jquery-tablesorter/docs/index.html |   0
 .../docs/js/bootstrap.min.js                  |   0
 .../docs/js/chili/jquery.chili-2.2.js         |   0
 .../docs/js/chili/recipes.js                  |   0
 .../docs/js/demo-build-table.js               |   0
 FHC-vendor/jquery-tablesorter/docs/js/docs.js |   0
 .../docs/js/jquery-1.2.6.min.js               |   0
 .../docs/js/jquery-1.4.4.min.js               |   0
 .../docs/js/jquery-latest.min.js              |   0
 .../docs/js/jquery-ui.min.js                  |   0
 .../docs/js/jquery.jui_theme_switch.min.js    |   0
 .../docs/js/jquery.magnific-popup.min.js      |   0
 .../docs/js/jquery.tipsy.min.js               |   0
 .../jquery-tablesorter/docs/js/prettify.js    |   0
 .../docs/js/rangeslider.min.js                |   0
 .../jquery-tablesorter/docs/js/search-ie.js   |   0
 .../jquery-tablesorter/docs/js/search.js      |   0
 .../docs/js/select2-3.4.6.min.js              |   0
 .../jquery-tablesorter/docs/js/sugar.min.js   |   0
 .../jquery-tablesorter/docs/themes.html       |   0
 FHC-vendor/jquery-tablesorter/example.json    |   0
 FHC-vendor/jquery-tablesorter/index.html      |   0
 .../js/extras/jquery.dragtable.mod.js         |   0
 .../js/extras/jquery.metadata.js              |   0
 .../js/extras/semver-mod.js                   |   0
 .../jquery-tablesorter/js/extras/semver.js    |   0
 .../js/jquery.tablesorter.combined.js         |   0
 .../js/jquery.tablesorter.js                  |   0
 .../js/jquery.tablesorter.widgets.js          |   0
 .../js/parsers/parser-date-extract.js         |   0
 .../js/parsers/parser-date-iso8601.js         |   0
 .../js/parsers/parser-date-month.js           |   0
 .../js/parsers/parser-date-range.js           |   0
 .../js/parsers/parser-date-two-digit-year.js  |   0
 .../js/parsers/parser-date-weekday.js         |   0
 .../js/parsers/parser-date.js                 |   0
 .../js/parsers/parser-duration.js             |   0
 .../js/parsers/parser-feet-inch-fraction.js   |   0
 .../js/parsers/parser-file-type.js            |   0
 .../js/parsers/parser-globalize.js            |   0
 .../js/parsers/parser-ignore-articles.js      |   0
 .../js/parsers/parser-image.js                |   0
 .../js/parsers/parser-input-select.js         |   0
 .../js/parsers/parser-metric.js               |   0
 .../js/parsers/parser-named-numbers.js        |   0
 .../js/parsers/parser-network.js              |   0
 .../js/parsers/parser-roman.js                |   0
 .../js/widgets/widget-alignChar.js            |   0
 .../js/widgets/widget-build-table.js          |   0
 .../js/widgets/widget-chart.js                |   0
 .../js/widgets/widget-columnSelector.js       |   0
 .../js/widgets/widget-columns.js              |   0
 .../js/widgets/widget-cssStickyHeaders.js     |   0
 .../js/widgets/widget-editable.js             |   0
 .../widgets/widget-filter-formatter-html5.js  |   0
 .../js/widgets/widget-filter-formatter-jui.js |   0
 .../widget-filter-formatter-select2.js        |   0
 .../widgets/widget-filter-type-insideRange.js |   0
 .../js/widgets/widget-filter.js               |   0
 .../js/widgets/widget-formatter.js            |   0
 .../js/widgets/widget-grouping.js             |   0
 .../js/widgets/widget-headerTitles.js         |   0
 .../js/widgets/widget-lazyload.js             |   0
 .../js/widgets/widget-math.js                 |   0
 .../js/widgets/widget-output.js               |   0
 .../js/widgets/widget-pager.js                |   0
 .../js/widgets/widget-print.js                |   0
 .../js/widgets/widget-reflow.js               |   0
 .../js/widgets/widget-repeatheaders.js        |   0
 .../js/widgets/widget-resizable.js            |   0
 .../js/widgets/widget-saveSort.js             |   0
 .../js/widgets/widget-scroller.js             |   0
 .../js/widgets/widget-sort2Hash.js            |   0
 .../js/widgets/widget-sortTbodies.js          |   0
 .../js/widgets/widget-staticRow.js            |   0
 .../js/widgets/widget-stickyHeaders.js        |   0
 .../js/widgets/widget-storage.js              |   0
 .../js/widgets/widget-toggle.js               |   0
 .../js/widgets/widget-uitheme.js              |   0
 .../js/widgets/widget-view.js                 |   0
 FHC-vendor/jquery-tablesorter/package.json    |   0
 .../tablesorter.jquery.json                   |   0
 FHC-vendor/jquery-tablesorter/test.html       |   0
 .../testing/qunit-1.20.0.css                  |   0
 .../testing/qunit-1.20.0.js                   |   0
 .../testing/testing-ipv6.js                   |   0
 .../testing/testing-widgets.js                |   0
 .../jquery-tablesorter/testing/testing.css    |   0
 .../jquery-tablesorter/testing/testing.js     |   0
 LICENSE                                       |   0
 README.md                                     |   0
 addons/.gitignore                             |   0
 addons/CodingGuidelines.txt                   |   0
 addons/index.html                             |   0
 addons/template/cis/index.html                |   0
 addons/template/cis/init.js.php               |   0
 addons/template/cis/vorlage_profil_array.php  |   0
 addons/template/content/index.html            |   0
 addons/template/content/init.js.php           |   0
 addons/template/dbcheck.php                   |   0
 addons/template/index.html                    |   0
 addons/template/install.php                   |   0
 addons/template/locale/README.txt             |   0
 addons/template/locale/index.html             |   0
 addons/template/soap/index.html               |   0
 addons/template/system/index.html             |   0
 addons/template/system/vorlage_zip/README.txt |   0
 addons/template/version.php                   |   0
 addons/template/vilesci/index.php             |   0
 addons/template/vilesci/init.js.php           |   0
 addons/template/vilesci/menu.inc.php          |   0
 .../vilesci/vorlage_generateuid.inc.php       |   0
 .../template/vilesci/vorlage_passwort.inc.php |   0
 .../vilesci/vorlage_serviceterminal.inc.php   |   0
 addons/template/xml/index.html                |   0
 application/cache/index.html                  |   0
 .../components/extensions/.placeholder        |   0
 application/components/filters/LogsViewer.php |   0
 application/config/anrechnung.php             |   0
 application/config/auth.php                   |   0
 application/config/autoload.php               |   0
 application/config/config.php                 |   0
 application/config/constants.php              |   0
 application/config/core_includes.php          |   0
 application/config/database.php               |   0
 application/config/doctypes.php               |   0
 application/config/extensions/.placeholder    |   0
 application/config/foreign_chars.php          |   0
 application/config/hooks.php                  |   0
 application/config/index.html                 |   0
 application/config/infocenter.php             |   0
 application/config/jqm.php                    |   0
 application/config/ldap.php                   |   0
 application/config/mail.php                   |   0
 application/config/memcached.php              |   0
 application/config/message.php                |   0
 application/config/migration.php              |   0
 application/config/mimes.php                  |   0
 application/config/navigation.php             |   0
 application/config/permission.php             |   0
 application/config/profiler.php               |   0
 application/config/rest.php                   |   0
 application/config/routes.php                 |   0
 application/config/studierendenantrag.php     |   0
 application/config/udfmasterschema.json       |   0
 application/config/user_agents.php            |   0
 application/controllers/Cis/Auth.php          |   0
 application/controllers/Cis/Documents.php     |   0
 application/controllers/Cis/MyLv.php          |   0
 application/controllers/Cis/Profil.php        |  29 ++
 application/controllers/Cis/ProfilUpdate.php  |   0
 application/controllers/Cis/Pub.php           |   0
 application/controllers/Cis/Stundenplan.php   |   0
 application/controllers/Cis4.php              |   0
 application/controllers/CisHmvc.php           |   0
 application/controllers/CisHmvc/Cms.php       |   0
 application/controllers/CisHmvc/Dashboard.php |   0
 application/controllers/CisHtml/Cms.php       |   0
 application/controllers/CisHtml/Dashboard.php |   0
 application/controllers/CisVue/Cms.php        |   0
 application/controllers/CisVue/Dashboard.php  |   0
 application/controllers/Test.php              |   0
 application/controllers/Vilesci.php           |   0
 application/controllers/api/index.html        |   0
 .../controllers/api/v1/CheckUserAuth.php      |   0
 application/controllers/api/v1/Test.php       |   0
 .../api/v1/accounting/Aufteilung.php          |   0
 .../api/v1/accounting/Bestelldetail.php       |   0
 .../api/v1/accounting/Bestelldetailtag.php    |   0
 .../api/v1/accounting/Bestellstatus.php       |   0
 .../api/v1/accounting/Bestellung.php          |   0
 .../api/v1/accounting/Bestellungtag.php       |   0
 .../controllers/api/v1/accounting/Buchung.php |   0
 .../api/v1/accounting/Buchungstyp.php         |   0
 .../controllers/api/v1/accounting/Budget.php  |   0
 .../controllers/api/v1/accounting/Konto.php   |   0
 .../api/v1/accounting/Kostenstelle.php        |   0
 .../api/v1/accounting/Rechnung.php            |   0
 .../api/v1/accounting/Rechnungsbetrag.php     |   0
 .../api/v1/accounting/Rechnungstyp.php        |   0
 .../controllers/api/v1/accounting/Vertrag.php |   0
 .../api/v1/accounting/Vertragsstatus.php      |   0
 .../api/v1/accounting/Vertragstyp.php         |   0
 .../api/v1/accounting/Zahlungstyp.php         |   0
 .../controllers/api/v1/codex/Akadgrad.php     |   0
 .../controllers/api/v1/codex/Archiv.php       |   0
 .../api/v1/codex/Aufmerksamdurch.php          |   0
 .../controllers/api/v1/codex/Ausbildung.php   |   0
 .../api/v1/codex/Berufstaetigkeit.php         |   0
 .../api/v1/codex/Beschaeftigungsausmass.php   |   0
 .../controllers/api/v1/codex/Besqual.php      |   0
 .../controllers/api/v1/codex/Bisfunktion.php  |   0
 .../controllers/api/v1/codex/Bisio.php        |   0
 .../controllers/api/v1/codex/Bisorgform.php   |   0
 .../api/v1/codex/Bisverwendung.php            |   0
 .../controllers/api/v1/codex/Bundesland.php   |   0
 .../api/v1/codex/Entwicklungsteam.php         |   0
 .../controllers/api/v1/codex/Gemeinde.php     |   0
 .../controllers/api/v1/codex/Hauptberuf.php   |   0
 .../controllers/api/v1/codex/Lehrform.php     |   0
 .../controllers/api/v1/codex/Lgartcode.php    |   0
 .../api/v1/codex/Mobilitaetsprogramm.php      |   0
 .../controllers/api/v1/codex/Nation.php       |   0
 application/controllers/api/v1/codex/Note.php |   0
 .../controllers/api/v1/codex/Orgform.php      |   0
 .../controllers/api/v1/codex/Verwendung.php   |   0
 application/controllers/api/v1/codex/Zgv.php  |   0
 .../controllers/api/v1/codex/Zgvdoktor.php    |   0
 .../controllers/api/v1/codex/Zgvgruppe.php    |   0
 .../controllers/api/v1/codex/Zgvmaster.php    |   0
 .../controllers/api/v1/codex/Zweck.php        |   0
 .../controllers/api/v1/content/Ampel.php      |   0
 .../controllers/api/v1/content/Content.php    |   0
 .../api/v1/content/Contentchild.php           |   0
 .../api/v1/content/Contentgruppe.php          |   0
 .../controllers/api/v1/content/Contentlog.php |   0
 .../api/v1/content/Contentsprache.php         |   0
 .../controllers/api/v1/content/Dms.php        |   0
 .../controllers/api/v1/content/Infoscreen.php |   0
 .../controllers/api/v1/content/News.php       |   0
 .../controllers/api/v1/content/Template.php   |   0
 .../api/v1/content/Veranstaltung.php          |   0
 .../v1/content/Veranstaltungskategorie.php    |   0
 application/controllers/api/v1/crm/Akte.php   |   0
 .../api/v1/crm/Aufnahmeschluessel.php         |   0
 .../controllers/api/v1/crm/Aufnahmetermin.php |   0
 .../api/v1/crm/Aufnahmetermintyp.php          |   0
 .../api/v1/crm/Bewerbungstermine.php          |   0
 .../controllers/api/v1/crm/Buchungstyp.php    |   0
 .../controllers/api/v1/crm/Dokument.php       |   0
 .../api/v1/crm/Dokumentprestudent.php         |   0
 .../api/v1/crm/Dokumentstudiengang.php        |   0
 application/controllers/api/v1/crm/Konto.php  |   0
 .../controllers/api/v1/crm/Preincoming.php    |   0
 .../controllers/api/v1/crm/Preinteressent.php |   0
 .../api/v1/crm/Preinteressentstudiengang.php  |   0
 .../controllers/api/v1/crm/Preoutgoing.php    |   0
 .../controllers/api/v1/crm/Prestudent.php     |   0
 .../api/v1/crm/Prestudentstatus.php           |   0
 .../controllers/api/v1/crm/Reihungstest.php   |   0
 .../controllers/api/v1/crm/RtPerson.php       |   0
 application/controllers/api/v1/crm/Status.php |   0
 .../controllers/api/v1/crm/Statusgrund.php    |   0
 .../controllers/api/v1/crm/Student.php        |   0
 .../controllers/api/v1/education/Abgabe.php   |   0
 .../api/v1/education/Abschlussbeurteilung.php |   0
 .../api/v1/education/Abschlusspruefung.php    |   0
 .../api/v1/education/Anrechnung.php           |   0
 .../api/v1/education/Anwesenheit.php          |   0
 .../controllers/api/v1/education/Beispiel.php |   0
 .../api/v1/education/Betreuerart.php          |   0
 .../controllers/api/v1/education/Feedback.php |   0
 .../api/v1/education/Legesamtnote.php         |   0
 .../api/v1/education/Lehreinheit.php          |   0
 .../api/v1/education/Lehreinheitgruppe.php    |   0
 .../v1/education/Lehreinheitmitarbeiter.php   |   0
 .../controllers/api/v1/education/Lehrfach.php |   0
 .../api/v1/education/Lehrfunktion.php         |   0
 .../controllers/api/v1/education/Lehrtyp.php  |   0
 .../api/v1/education/Lehrveranstaltung.php    |   0
 .../api/v1/education/Lenotenschluessel.php    |   0
 .../api/v1/education/Lepruefung.php           |   0
 .../api/v1/education/Lvangebot.php            |   0
 .../api/v1/education/Lvgesamtnote.php         |   0
 .../controllers/api/v1/education/Lvinfo.php   |   0
 .../controllers/api/v1/education/Lvregel.php  |   0
 .../api/v1/education/Lvregeltyp.php           |   0
 .../api/v1/education/Notenschluessel.php      |   0
 .../education/Notenschluesselaufteilung.php   |   0
 .../v1/education/Notenschluesseluebung.php    |   0
 .../v1/education/Notenschluesselzuordnung.php |   0
 .../controllers/api/v1/education/Paabgabe.php |   0
 .../api/v1/education/Paabgabetyp.php          |   0
 .../api/v1/education/Projektarbeit.php        |   0
 .../api/v1/education/Projektbetreuer.php      |   0
 .../api/v1/education/Projekttyp.php           |   0
 .../controllers/api/v1/education/Pruefung.php |   0
 .../api/v1/education/Pruefungsanmeldung.php   |   0
 .../api/v1/education/Pruefungsfenster.php     |   0
 .../api/v1/education/Pruefungsstatus.php      |   0
 .../api/v1/education/Pruefungstermin.php      |   0
 .../api/v1/education/Pruefungstyp.php         |   0
 .../api/v1/education/Studentbeispiel.php      |   0
 .../api/v1/education/Studentlehrverband.php   |   0
 .../api/v1/education/Studentuebung.php        |   0
 .../controllers/api/v1/education/Uebung.php   |   0
 .../controllers/api/v1/education/Zeugnis.php  |   0
 .../api/v1/education/Zeugnisnote.php          |   0
 .../api/v1/organisation/Erhalter.php          |   0
 .../api/v1/organisation/Fachbereich2.php      |   0
 .../api/v1/organisation/Ferien.php            |   0
 .../api/v1/organisation/Geschaeftsjahr2.php   |   0
 .../api/v1/organisation/Gruppe.php            |   0
 .../api/v1/organisation/Lehrverband.php       |   0
 .../v1/organisation/Organisationseinheit2.php |   0
 .../organisation/Organisationseinheittyp.php  |   0
 .../api/v1/organisation/Semesterwochen.php    |   0
 .../api/v1/organisation/Service.php           |   0
 .../api/v1/organisation/Standort.php          |   0
 .../api/v1/organisation/Statistik.php         |   0
 .../api/v1/organisation/Studiengang2.php      |   0
 .../api/v1/organisation/Studiengangstyp.php   |   0
 .../api/v1/organisation/Studienjahr.php       |   0
 .../api/v1/organisation/Studienordnung.php    |   0
 .../v1/organisation/Studienordnungstatus.php  |   0
 .../api/v1/organisation/Studienplan.php       |   0
 .../api/v1/organisation/Studienplatz.php      |   0
 .../api/v1/organisation/Studiensemester.php   |   0
 .../controllers/api/v1/person/Adresse.php     |   0
 .../api/v1/person/Bankverbindung.php          |   0
 .../controllers/api/v1/person/Benutzer.php    |   0
 .../api/v1/person/Benutzerfunktion.php        |   0
 .../api/v1/person/Benutzergruppe.php          |   0
 .../controllers/api/v1/person/Fotostatus.php  |   0
 .../controllers/api/v1/person/Freebusy.php    |   0
 .../controllers/api/v1/person/Freebusytyp.php |   0
 .../controllers/api/v1/person/Kontakt.php     |   0
 .../api/v1/person/Kontaktmedium.php           |   0
 .../controllers/api/v1/person/Kontakttyp.php  |   0
 .../controllers/api/v1/person/Notiz.php       |   0
 .../api/v1/person/Notizzuordnung.php          |   0
 .../controllers/api/v1/person/Person.php      |   0
 .../controllers/api/v1/project/Aktivitaet.php |   0
 .../api/v1/project/Aufwandstyp.php            |   0
 .../controllers/api/v1/project/Projekt.php    |   0
 .../api/v1/project/Projekt_ressource.php      |   0
 .../api/v1/project/Projektphase.php           |   0
 .../api/v1/project/Projekttask.php            |   0
 .../controllers/api/v1/project/Ressource.php  |   0
 .../api/v1/project/Scrumsprint.php            |   0
 .../api/v1/ressource/Betriebsmittel.php       |   0
 .../v1/ressource/Betriebsmittelperson2.php    |   0
 .../api/v1/ressource/Betriebsmittelstatus.php |   0
 .../api/v1/ressource/Betriebsmitteltyp.php    |   0
 .../controllers/api/v1/ressource/Coodle.php   |   0
 .../api/v1/ressource/Erreichbarkeit.php       |   0
 .../controllers/api/v1/ressource/Firma.php    |   0
 .../controllers/api/v1/ressource/Firmatag.php |   0
 .../api/v1/ressource/Firmentyp.php            |   0
 .../controllers/api/v1/ressource/Funktion.php |   0
 .../api/v1/ressource/Lehrmittel.php           |   0
 .../api/v1/ressource/Mitarbeiter.php          |   0
 .../controllers/api/v1/ressource/Ort.php      |   0
 .../api/v1/ressource/Ortraumtyp.php           |   0
 .../v1/ressource/Personfunktionstandort.php   |   0
 .../controllers/api/v1/ressource/Raumtyp.php  |   0
 .../api/v1/ressource/Reservierung.php         |   0
 .../controllers/api/v1/ressource/Stunde.php   |   0
 .../api/v1/ressource/Stundenplan.php          |   0
 .../api/v1/ressource/Stundenplandev.php       |   0
 .../api/v1/ressource/Zeitaufzeichnung.php     |   0
 .../api/v1/ressource/Zeitfenster.php          |   0
 .../api/v1/ressource/Zeitsperre.php           |   0
 .../api/v1/ressource/Zeitsperretyp.php        |   0
 .../api/v1/ressource/Zeitwunsch.php           |   0
 .../controllers/api/v1/system/Appdaten.php    |   0
 .../api/v1/system/Benutzerrolle.php           |   0
 .../api/v1/system/Berechtigung.php            |   0
 .../controllers/api/v1/system/Cronjob.php     |   0
 .../controllers/api/v1/system/Filter.php      |   0
 application/controllers/api/v1/system/Log.php |   0
 .../controllers/api/v1/system/Message.php     |   0
 .../controllers/api/v1/system/Phrase.php      |   0
 .../controllers/api/v1/system/Rolle.php       |   0
 .../api/v1/system/Rolleberechtigung.php       |   0
 .../controllers/api/v1/system/Server.php      |   0
 .../controllers/api/v1/system/Sprache2.php    |   0
 application/controllers/api/v1/system/Tag.php |   0
 application/controllers/api/v1/system/UDF.php |   0
 .../controllers/api/v1/system/Variable.php    |   0
 .../controllers/api/v1/system/Vorlage.php     |   0
 .../api/v1/system/Vorlagestudiengang.php      |   0
 .../api/v1/system/Webservicelog.php           |   0
 .../api/v1/system/Webservicerecht.php         |   0
 .../api/v1/system/Webservicetyp.php           |   0
 .../controllers/api/v1/testtool/Ablauf.php    |   0
 .../controllers/api/v1/testtool/Antwort.php   |   0
 .../controllers/api/v1/testtool/Frage.php     |   0
 .../controllers/api/v1/testtool/Gebiet.php    |   0
 .../controllers/api/v1/testtool/Kategorie.php |   0
 .../controllers/api/v1/testtool/Kriterien.php |   0
 .../controllers/api/v1/testtool/Pruefling.php |   0
 .../controllers/api/v1/testtool/Vorschlag.php |   0
 application/controllers/codex/Oehbeitrag.php  |   0
 application/controllers/codex/UHSTAT1.php     |   0
 .../components/Antrag/Abmeldung.php           |   0
 .../controllers/components/Antrag/Leitung.php |   0
 .../components/Antrag/Unterbrechung.php       |   0
 .../components/Antrag/Wiederholung.php        |   0
 .../controllers/components/Cis/Mylv.php       |   0
 .../components/Cis/Stundenplan.php            |   0
 application/controllers/components/CisVue.php |   0
 application/controllers/components/Filter.php |   0
 .../controllers/components/Phrasen.php        |   0
 .../controllers/components/SearchBar.php      |   0
 application/controllers/crm/Statusgrund.php   |   0
 application/controllers/dashboard/Api.php     |   0
 application/controllers/dashboard/Config.php  |   0
 .../controllers/dashboard/Dashboard.php       |   0
 .../controllers/dashboard/DashboardDemo.php   |   0
 application/controllers/dashboard/Widget.php  |   0
 .../controllers/extensions/.placeholder       |   0
 application/controllers/index.html            |   0
 application/controllers/jobs/AmpelMail.php    |   0
 .../controllers/jobs/AnrechnungJob.php        |   0
 application/controllers/jobs/AntragJob.php    |   0
 application/controllers/jobs/LVPlanJob.php    |   0
 .../controllers/jobs/LehrauftragJob.php       |   0
 application/controllers/jobs/MailJob.php      |   0
 .../controllers/jobs/OneTimeMessages.php      |   0
 .../controllers/jobs/PlausiIssueProducer.php  |   0
 .../controllers/jobs/Prestudentstatus.php     |   0
 .../controllers/jobs/ReihungstestJob.php      |   0
 .../controllers/lehre/Antrag/Attachment.php   |   0
 .../controllers/lehre/Antrag/Wiederholung.php |   0
 .../controllers/lehre/Pruefungsprotokoll.php  |   0
 .../controllers/lehre/Studierendenantrag.php  |   0
 .../lehre/anrechnung/AdminAnrechnung.php      |   0
 .../anrechnung/ApproveAnrechnungDetail.php    |   0
 .../ApproveAnrechnungUebersicht.php           |   0
 .../lehre/anrechnung/CreateAnrechnung.php     |   0
 .../lehre/anrechnung/RequestAnrechnung.php    |   0
 .../anrechnung/ReviewAnrechnungDetail.php     |   0
 .../anrechnung/ReviewAnrechnungUebersicht.php |   0
 .../lehre/lehrauftrag/Lehrauftrag.php         |   0
 .../lehrauftrag/LehrauftragAkzeptieren.php    |   0
 .../lehre/lehrauftrag/LehrauftragErteilen.php |   0
 .../lvplanung/AdminZeitverfuegbarkeit.php     |   0
 .../controllers/organisation/Reihungstest.php |   0
 .../controllers/organisation/Studienjahr.php  |   0
 .../organisation/Studiensemester.php          |   0
 application/controllers/person/BPKWartung.php |   0
 application/controllers/person/Gradelist.php  |   0
 .../controllers/person/Gruppenmanagement.php  |   0
 application/controllers/system/FAS_UDF.php    |   0
 application/controllers/system/Login.php      |   0
 application/controllers/system/Logout.php     |   0
 application/controllers/system/LogsViewer.php |   0
 application/controllers/system/Navigation.php |   0
 application/controllers/system/Phrases.php    |   0
 application/controllers/system/TestSearch.php |   0
 application/controllers/system/Variables.php  |   0
 application/controllers/system/Vorlage.php    |   0
 .../system/aufnahme/PrestudentMultiAssign.php |   0
 .../system/extensions/CLI_Manager.php         |   0
 .../controllers/system/extensions/Manager.php |   0
 .../system/infocenter/InfoCenter.php          |   0
 .../system/infocenter/Rueckstellung.php       |   0
 .../system/infocenter/ZGVUeberpruefung.php    |   0
 .../controllers/system/issues/Issues.php      |   0
 .../system/issues/IssuesKonfiguration.php     |   0
 .../system/issues/IssuesZustaendigkeiten.php  |   0
 .../system/issues/Plausichecks.php            |   0
 .../system/jq/JobsQueueManager.php            |   0
 .../controllers/system/jq/JobsQueueViewer.php |   0
 .../system/messages/FASMessages.php           |   0
 .../system/messages/MessageClient.php         |   0
 .../controllers/system/messages/Messages.php  |   0
 .../system/messages/ViewMessage.php           |   0
 application/controllers/widgets/Filters.php   |   0
 application/controllers/widgets/Language.php  |   0
 application/controllers/widgets/Tables.php    |   0
 application/controllers/widgets/UDF.php       |   0
 application/core/API_Controller.php           |   0
 application/core/Auth_Controller.php          |   0
 application/core/CLI_Controller.php           |   0
 application/core/DB_Model.php                 |   0
 application/core/FHC_Controller.php           |   0
 application/core/FS_Model.php                 |   0
 application/core/IIssueResolvedChecker.php    |   0
 application/core/JOB_Controller.php           |   0
 application/core/JQW_Controller.php           |   0
 .../core/PlausiIssueProducer_Controller.php   |   0
 application/core/RESTFul_Controller.php       |   0
 application/core/index.html                   |   0
 application/extensions/.placeholder           |   0
 application/helpers/extensions/.placeholder   |   0
 .../helpers/hlp_authentication_helper.php     |   0
 application/helpers/hlp_common_helper.php     |   0
 application/helpers/hlp_header_helper.php     |   0
 application/helpers/hlp_language_helper.php   |   0
 .../helpers/hlp_return_object_helper.php      |   0
 application/helpers/hlp_sancho_helper.php     |   0
 application/helpers/hlp_session_helper.php    |   0
 application/helpers/index.html                |   0
 application/hooks/extensions/.placeholder     |   0
 application/hooks/index.html                  |   0
 application/index.html                        |   0
 application/language/index.html               |   0
 application/libraries/AkteLib.php             |   0
 application/libraries/AnrechnungLib.php       |   0
 application/libraries/AntragLib.php           |   0
 application/libraries/AuthLDAPLib.php         |   0
 application/libraries/AuthLib.php             |   0
 application/libraries/CisHmvc/Loader.php      |   0
 application/libraries/CmsLib.php              |   0
 application/libraries/CryptLib.php            |   0
 application/libraries/DmsLib.php              |   0
 application/libraries/DocsboxLib.php          |   0
 application/libraries/DocumentLib.php         |   0
 application/libraries/EPrintfLib.php          |   0
 application/libraries/ExtensionsLib.php       |   0
 application/libraries/FilterCmptLib.php       |   0
 application/libraries/FilterWidgetLib.php     |   0
 application/libraries/IssuesLib.php           |   0
 application/libraries/JobsQueueLib.php        |   0
 application/libraries/LogLib.php              |   0
 application/libraries/MailLib.php             |   0
 application/libraries/MessageLib.php          |   0
 application/libraries/NavigationLib.php       |   0
 .../libraries/OrganisationseinheitLib.php     |   0
 application/libraries/PermissionLib.php       |   0
 application/libraries/PersonLogLib.php        |   0
 application/libraries/PhrasesLib.php          |   0
 application/libraries/PrestudentLib.php       |   0
 application/libraries/ReihungstestLib.php     |   0
 application/libraries/SearchBarLib.php        |   0
 application/libraries/SignatureLib.php        |   0
 application/libraries/StudienplanLib.php      |   0
 application/libraries/TableWidgetLib.php      |   0
 application/libraries/UDFLib.php              |   0
 application/libraries/VariableLib.php         |   0
 application/libraries/VorlageLib.php          |   0
 application/libraries/WidgetLib.php           |   0
 .../libraries/dashboard/DashboardLib.php      |   0
 application/libraries/extensions/.placeholder |   0
 application/libraries/index.html              |   0
 .../issues/PlausicheckDefinitionLib.php       |   0
 .../issues/PlausicheckProducerLib.php         |   0
 .../issues/plausichecks/AbbrecherAktiv.php    |   0
 .../plausichecks/AbschlussstatusFehlt.php     |   0
 .../issues/plausichecks/AktSemesterNull.php   |   0
 .../plausichecks/AktiverStudentOhneStatus.php |   0
 .../AktiverStudentstatusOhneKontobuchung.php  |   0
 ...PrestudentUngleichAusbildungssemStatus.php |   0
 .../BewerberNichtZumRtAngetreten.php          |   0
 .../DatumAbschlusspruefungFehlt.php           |   0
 .../plausichecks/DatumSponsionFehlt.php       |   0
 ...DatumStudiensemesterFalscheReihenfolge.php |   0
 .../FalscheAnzahlAbschlusspruefungen.php      |   0
 .../FalscheAnzahlHeimatadressen.php           |   0
 .../FalscheAnzahlZustelladressen.php          |   0
 .../plausichecks/GbDatumWeitZurueck.php       |   0
 .../InaktiverStudentAktiverStatus.php         |   0
 .../IncomingHeimatNationOesterreich.php       |   0
 .../plausichecks/IncomingOhneIoDatensatz.php  |   0
 .../IncomingOrGsFoerderrelevant.php           |   0
 .../InskriptionVorLetzerBismeldung.php        |   0
 .../NationNichtOesterreichAberGemeinde.php    |   0
 .../OrgformStgUngleichOrgformPrestudent.php   |   0
 .../issues/plausichecks/PlausiChecker.php     |   0
 .../PrestudentMischformOhneOrgform.php        |   0
 .../StgPrestudentUngleichStgStudent.php       |   0
 .../StgPrestudentUngleichStgStudienplan.php   |   0
 .../StudentstatusNachAbbrecher.php            |   0
 .../plausichecks/StudienplanUngueltig.php     |   0
 .../issues/resolvers/CORE_INOUT_0001.php      |   0
 .../issues/resolvers/CORE_INOUT_0002.php      |   0
 .../issues/resolvers/CORE_INOUT_0003.php      |   0
 .../issues/resolvers/CORE_INOUT_0004.php      |   0
 .../issues/resolvers/CORE_INOUT_0005.php      |   0
 .../issues/resolvers/CORE_INOUT_0006.php      |   0
 .../issues/resolvers/CORE_INOUT_0007.php      |   0
 .../issues/resolvers/CORE_INOUT_0008.php      |   0
 .../issues/resolvers/CORE_INOUT_0009.php      |   0
 .../issues/resolvers/CORE_PERSON_0001.php     |   0
 .../issues/resolvers/CORE_PERSON_0002.php     |   0
 .../issues/resolvers/CORE_PERSON_0003.php     |   0
 .../issues/resolvers/CORE_PERSON_0004.php     |   0
 .../issues/resolvers/CORE_STG_0001.php        |   0
 .../issues/resolvers/CORE_STG_0002.php        |   0
 .../issues/resolvers/CORE_STG_0003.php        |   0
 .../issues/resolvers/CORE_STG_0004.php        |   0
 .../resolvers/CORE_STUDENTSTATUS_0001.php     |   0
 .../resolvers/CORE_STUDENTSTATUS_0002.php     |   0
 .../resolvers/CORE_STUDENTSTATUS_0003.php     |   0
 .../resolvers/CORE_STUDENTSTATUS_0004.php     |   0
 .../resolvers/CORE_STUDENTSTATUS_0005.php     |   0
 .../resolvers/CORE_STUDENTSTATUS_0006.php     |   0
 .../resolvers/CORE_STUDENTSTATUS_0007.php     |   0
 .../resolvers/CORE_STUDENTSTATUS_0008.php     |   0
 .../resolvers/CORE_STUDENTSTATUS_0009.php     |   0
 .../resolvers/CORE_STUDENTSTATUS_0010.php     |   0
 .../resolvers/CORE_STUDENTSTATUS_0011.php     |   0
 .../resolvers/CORE_STUDENTSTATUS_0012.php     |   0
 .../resolvers/CORE_STUDENTSTATUS_0013.php     |   0
 .../resolvers/CORE_STUDENTSTATUS_0014.php     |   0
 .../resolvers/CORE_STUDENTSTATUS_0015.php     |   0
 .../issues/resolvers/CORE_ZGV_0001.php        |   0
 .../issues/resolvers/CORE_ZGV_0002.php        |   0
 .../issues/resolvers/CORE_ZGV_0003.php        |   0
 .../issues/resolvers/CORE_ZGV_0004.php        |   0
 .../issues/resolvers/CORE_ZGV_0005.php        |   0
 application/logs/index.html                   |   0
 application/models/CL/Messages_model.php      |   0
 .../models/accounting/Aufteilung_model.php    |   0
 .../models/accounting/Bestelldetail_model.php |   0
 .../accounting/Bestelldetailtag_model.php     |   0
 .../models/accounting/Bestellstatus_model.php |   0
 .../models/accounting/Bestellung_model.php    |   0
 .../models/accounting/Bestellungtag_model.php |   0
 .../models/accounting/Buchung_model.php       |   0
 .../models/accounting/Buchungstyp_model.php   |   0
 .../models/accounting/Budget_model.php        |   0
 application/models/accounting/Konto_model.php |   0
 .../models/accounting/Kostenstelle_model.php  |   0
 .../models/accounting/Rechnung_model.php      |   0
 .../accounting/Rechnungsbetrag_model.php      |   0
 .../models/accounting/Rechnungstyp_model.php  |   0
 .../models/accounting/Vertrag_model.php       |   0
 .../accounting/Vertragsstatus_model.php       |   0
 .../models/accounting/Vertragstyp_model.php   |   0
 .../Vertragvertragsstatus_model.php           |   0
 .../models/accounting/Zahlungstyp_model.php   |   0
 application/models/codex/Abschluss_model.php  |   0
 application/models/codex/Akadgrad_model.php   |   0
 application/models/codex/Archiv_model.php     |   0
 .../codex/Aufenthaltfoerderung_model.php      |   0
 .../models/codex/Aufmerksamdurch_model.php    |   0
 application/models/codex/Ausbildung_model.php |   0
 .../models/codex/Berufstaetigkeit_model.php   |   0
 .../codex/Beschaeftigungsausmass_model.php    |   0
 application/models/codex/Besqual_model.php    |   0
 .../models/codex/Bisfunktion_model.php        |   0
 application/models/codex/Bisio_model.php      |   0
 .../codex/Bisioaufenthaltfoerderung_model.php |   0
 application/models/codex/Bisiozweck_model.php |   0
 application/models/codex/Bisorgform_model.php |   0
 .../models/codex/Bisverwendung_model.php      |   0
 application/models/codex/Bundesland_model.php |   0
 .../models/codex/Entwicklungsteam_model.php   |   0
 application/models/codex/Gemeinde_model.php   |   0
 application/models/codex/Gsprogramm_model.php |   0
 application/models/codex/Hauptberuf_model.php |   0
 application/models/codex/Lehrform_model.php   |   0
 application/models/codex/Lgartcode_model.php  |   0
 application/models/codex/Mobilitaet_model.php |   0
 .../codex/Mobilitaetsprogramm_model.php       |   0
 application/models/codex/Nation_model.php     |   0
 application/models/codex/Note_model.php       |   0
 application/models/codex/Oehbeitrag_model.php |   0
 application/models/codex/Orgform_model.php    |   0
 .../models/codex/Uhstat1daten_model.php       |   0
 application/models/codex/Verwendung_model.php |   0
 application/models/codex/Zgv_model.php        |   0
 application/models/codex/Zgvdoktor_model.php  |   0
 application/models/codex/Zgvgruppe_model.php  |   0
 application/models/codex/Zgvmaster_model.php  |   0
 application/models/codex/Zweck_model.php      |   0
 application/models/content/Ampel_model.php    |   0
 application/models/content/Content_model.php  |   0
 .../models/content/Contentchild_model.php     |   0
 .../models/content/Contentgruppe_model.php    |   0
 .../models/content/Contentlog_model.php       |   0
 .../models/content/Contentsprache_model.php   |   0
 application/models/content/DmsFS_model.php    |   0
 .../models/content/DmsVersion_model.php       |   0
 application/models/content/Dms_model.php      |   0
 .../models/content/Infoscreen_model.php       |   0
 application/models/content/News_model.php     |   0
 application/models/content/TempFS_model.php   |   0
 application/models/content/Template_model.php |   0
 .../models/content/Veranstaltung_model.php    |   0
 .../content/Veranstaltungskategorie_model.php |   0
 application/models/crm/Akte_model.php         |   0
 .../models/crm/Aufnahmeschluessel_model.php   |   0
 .../models/crm/Bewerbungstermine_model.php    |   0
 application/models/crm/Buchungstyp_model.php  |   0
 application/models/crm/Dokument_model.php     |   0
 .../models/crm/Dokumentprestudent_model.php   |   0
 .../models/crm/Dokumentstudiengang_model.php  |   0
 application/models/crm/Konto_model.php        |   0
 application/models/crm/Preincoming_model.php  |   0
 .../models/crm/Preinteressent_model.php       |   0
 .../crm/Preinteressentstudiengang_model.php   |   0
 application/models/crm/Preoutgoing_model.php  |   0
 application/models/crm/Prestudent_model.php   |   0
 .../models/crm/Prestudentstatus_model.php     |   0
 application/models/crm/Reihungstest_model.php |   0
 application/models/crm/RtPerson_model.php     |   0
 .../models/crm/RtStudienplan_model.php        |   0
 .../models/crm/RueckstellungStatus_model.php  |   0
 .../models/crm/Rueckstellung_model.php        |   0
 application/models/crm/Status_model.php       |   0
 application/models/crm/Statusgrund_model.php  |   0
 application/models/crm/Student_model.php      |   0
 .../models/crm/ZGVPruefungStatus_model.php    |   0
 application/models/crm/ZGVPruefung_model.php  |   0
 .../dashboard/Dashboard_Override_model.php    |   0
 .../dashboard/Dashboard_Preset_model.php      |   0
 .../dashboard/Dashboard_Widget_model.php      |   0
 .../models/dashboard/Dashboard_model.php      |   0
 application/models/dashboard/Widget_model.php |   0
 application/models/education/Abgabe_model.php |   0
 .../education/Abschlussbeurteilung_model.php  |   0
 .../education/Abschlusspruefung_model.php     |   0
 .../models/education/Anrechnung_model.php     |   0
 .../education/Anrechnungbegruendung_model.php |   0
 .../education/Anrechnungstatus_model.php      |   0
 .../education/Anrechnungszeitraum_model.php   |   0
 .../models/education/Anwesenheit_model.php    |   0
 .../models/education/Beispiel_model.php       |   0
 .../models/education/Betreuerart_model.php    |   0
 .../models/education/Feedback_model.php       |   0
 .../education/LeNotenschluessel_model.php     |   0
 .../models/education/LePruefung_model.php     |   0
 .../models/education/Legesamtnote_model.php   |   0
 .../models/education/Lehreinheit_model.php    |   0
 .../education/Lehreinheitgruppe_model.php     |   0
 .../Lehreinheitmitarbeiter_model.php          |   0
 .../models/education/Lehrfach_model.php       |   0
 .../models/education/Lehrfunktion_model.php   |   0
 .../models/education/Lehrtyp_model.php        |   0
 .../education/Lehrveranstaltung_model.php     |   0
 .../models/education/Lvangebot_model.php      |   0
 .../models/education/Lvgesamtnote_model.php   |   0
 application/models/education/Lvinfo_model.php |   0
 .../models/education/Lvregel_model.php        |   0
 .../models/education/Lvregeltyp_model.php     |   0
 .../education/Notenschluessel_model.php       |   0
 .../Notenschluesselaufteilung_model.php       |   0
 .../education/Notenschluesseluebung_model.php |   0
 .../Notenschluesselzuordnung_model.php        |   0
 .../models/education/Paabgabe_model.php       |   0
 .../models/education/Paabgabetyp_model.php    |   0
 .../models/education/Projektarbeit_model.php  |   0
 .../education/Projektbetreuer_model.php       |   0
 .../models/education/Projekttyp_model.php     |   0
 .../models/education/Pruefung_model.php       |   0
 .../education/Pruefungsanmeldung_model.php    |   0
 .../education/Pruefungsfenster_model.php      |   0
 .../education/Pruefungsstatus_model.php       |   0
 .../education/Pruefungstermin_model.php       |   0
 .../models/education/Pruefungstyp_model.php   |   0
 .../education/Studentbeispiel_model.php       |   0
 .../education/Studentlehrverband_model.php    |   0
 .../models/education/Studentuebung_model.php  |   0
 .../education/Studierendenantrag_model.php    |   0
 ...dierendenantraglehrveranstaltung_model.php |   0
 .../Studierendenantragstatus_model.php        |   0
 application/models/education/Uebung_model.php |   0
 .../models/education/Zeugnis_model.php        |   0
 .../models/education/Zeugnisnote_model.php    |   0
 application/models/extensions/.placeholder    |   0
 application/models/index.html                 |   0
 .../models/organisation/Erhalter_model.php    |   0
 .../models/organisation/Fachbereich_model.php |   0
 .../models/organisation/Ferien_model.php      |   0
 .../organisation/Geschaeftsjahr_model.php     |   0
 .../models/organisation/Gruppe_model.php      |   0
 .../models/organisation/Lehrverband_model.php |   0
 .../Organisationseinheit_model.php            |   0
 .../Organisationseinheittyp_model.php         |   0
 .../organisation/Semesterwochen_model.php     |   0
 .../models/organisation/Service_model.php     |   0
 .../models/organisation/Standort_model.php    |   0
 .../models/organisation/Statistik_model.php   |   0
 .../models/organisation/Studiengang_model.php |   0
 .../organisation/Studiengangstyp_model.php    |   0
 .../models/organisation/Studienjahr_model.php |   0
 .../organisation/Studienordnung_model.php     |   0
 .../Studienordnungstatus_model.php            |   0
 .../models/organisation/Studienplan_model.php |   0
 .../organisation/Studienplatz_model.php       |   0
 .../organisation/Studiensemester_model.php    |   0
 application/models/person/Adresse_model.php   |   0
 .../models/person/Adressentyp_model.php       |   0
 .../models/person/Bankverbindung_model.php    |   0
 application/models/person/Benutzer_model.php  |   0
 .../models/person/Benutzerfunktion_model.php  |   0
 .../models/person/Benutzergruppe_model.php    |   0
 .../models/person/Fotostatus_model.php        |   0
 .../models/person/Fotostatusperson_model.php  |   0
 application/models/person/Freebusy_model.php  |   0
 .../models/person/Freebusytyp_model.php       |   0
 .../models/person/Geschlecht_model.php        |   0
 application/models/person/Kontakt_model.php   |   0
 .../models/person/Kontaktmedium_model.php     |   0
 .../models/person/Kontakttyp_model.php        |   0
 application/models/person/Notiz_model.php     |   0
 .../models/person/Notizzuordnung_model.php    |   0
 application/models/person/Person_model.php    |   0
 .../models/person/Profil_change_model.php     |   0
 .../models/project/Aktivitaet_model.php       |   0
 .../models/project/Aufwandstyp_model.php      |   0
 application/models/project/Projekt_model.php  |   0
 .../project/Projekt_ressource_model.php       |   0
 .../models/project/Projektphase_model.php     |   0
 .../models/project/Projekttask_model.php      |   0
 .../models/project/Ressource_model.php        |   0
 .../models/project/Scrumsprint_model.php      |   0
 .../models/ressource/Betriebsmittel_model.php |   0
 .../ressource/Betriebsmittelperson_model.php  |   0
 .../ressource/Betriebsmittelstatus_model.php  |   0
 .../ressource/Betriebsmitteltyp_model.php     |   0
 application/models/ressource/Coodle_model.php |   0
 .../models/ressource/Erreichbarkeit_model.php |   0
 application/models/ressource/Firma_model.php  |   0
 .../models/ressource/Firmatag_model.php       |   0
 .../models/ressource/Firmentyp_model.php      |   0
 .../models/ressource/Funktion_model.php       |   0
 .../models/ressource/Lehrmittel_model.php     |   0
 .../models/ressource/Mitarbeiter_model.php    |   0
 application/models/ressource/Ort_model.php    |   0
 .../models/ressource/Ortraumtyp_model.php     |   0
 .../Personfunktionstandort_model.php          |   0
 .../models/ressource/Raumtyp_model.php        |   0
 .../models/ressource/Reservierung_model.php   |   0
 application/models/ressource/Stunde_model.php |   0
 .../models/ressource/Stundenplan_model.php    |   0
 .../models/ressource/Stundenplandev_model.php |   0
 .../ressource/Zeitaufzeichnung_model.php      |   0
 .../models/ressource/Zeitsperre_model.php     |   0
 .../models/ressource/Zeitsperretyp_model.php  |   0
 .../Zeitwunsch_gueltigkeit_model.php          |   0
 .../models/ressource/Zeitwunsch_model.php     |   0
 application/models/system/Appdaten_model.php  |   0
 .../models/system/Attachment_model.php        |   0
 .../models/system/Benutzerrolle_model.php     |   0
 .../models/system/Berechtigung_model.php      |   0
 application/models/system/Cronjob_model.php   |   0
 application/models/system/Dokument_model.php  |   0
 .../models/system/Extensions_model.php        |   0
 application/models/system/Fehler_model.php    |   0
 .../system/Fehlerkonfiguration_model.php      |   0
 .../system/Fehlerkonfigurationstyp_model.php  |   0
 .../system/Fehlerzustaendigkeiten_model.php   |   0
 application/models/system/Filter_model.php    |   0
 application/models/system/Filters_model.php   |   0
 application/models/system/Issue_model.php     |   0
 .../models/system/JobStatuses_model.php       |   0
 .../models/system/JobTriggers_model.php       |   0
 application/models/system/JobTypes_model.php  |   0
 application/models/system/JobsQueue_model.php |   0
 application/models/system/Log_model.php       |   0
 .../models/system/MessageToken_model.php      |   0
 application/models/system/Message_model.php   |   0
 application/models/system/MsgStatus_model.php |   0
 .../models/system/PersonLock_model.php        |   0
 application/models/system/PersonLog_model.php |   0
 application/models/system/Phrase_model.php    |   0
 .../models/system/Phrasentext_model.php       |   0
 application/models/system/Recipient_model.php |   0
 application/models/system/Rolle_model.php     |   0
 .../models/system/Rolleberechtigung_model.php |   0
 application/models/system/Server_model.php    |   0
 application/models/system/Sprache_model.php   |   0
 application/models/system/Tag_model.php       |   0
 application/models/system/UDF_model.php       |   0
 application/models/system/Variable_model.php  |   0
 .../models/system/Variablenname_model.php     |   0
 application/models/system/Vorlage_model.php   |   0
 .../models/system/Vorlagedokument_model.php   |   0
 .../system/Vorlagestudiengang_model.php       |   0
 .../models/system/Webservicelog_model.php     |   0
 .../models/system/Webservicerecht_model.php   |   0
 .../models/system/Webservicetyp_model.php     |   0
 application/models/testtool/Ablauf_model.php  |   0
 application/models/testtool/Antwort_model.php |   0
 application/models/testtool/Frage_model.php   |   0
 application/models/testtool/Gebiet_model.php  |   0
 .../models/testtool/Kategorie_model.php       |   0
 .../models/testtool/Kriterien_model.php       |   0
 .../models/testtool/Pruefling_model.php       |   0
 .../models/testtool/Vorschlag_model.php       |   0
 application/third_party/index.html            |   0
 application/tmp/.placeholder                  |   0
 .../Cis/Cms/News/Xml/Address/Detailed.php     |   0
 .../views/Cis/Cms/News/Xml/Address/Short.php  |   0
 .../views/Cis/Cms/News/Xml/NewsExtras.php     |   0
 application/views/Cis/Documents.php           |   0
 application/views/Cis/Login.php               |   0
 application/views/Cis/MyLv.php                |   0
 application/views/Cis/Profil.php              |   0
 application/views/Cis/ProfilUpdate.php        |   0
 application/views/Cis/Stundenplan.php         |   0
 application/views/CisHmvc/Cms/Content.php     |   0
 application/views/CisHmvc/Cms/Legacy.php      |   0
 application/views/CisHmvc/Dashboard.php       |   0
 application/views/CisHmvc/Error.php           |   0
 application/views/CisHtml/Cms/Content.php     |   0
 application/views/CisHtml/Dashboard.php       |   0
 application/views/CisHtml/Error.php           |   0
 application/views/CisVue/Cms/Content.php      |   0
 application/views/CisVue/Dashboard.php        |   0
 application/views/codex/oehbeitrag.php        |   0
 application/views/codex/uhstat1.php           |   0
 application/views/crm/statusEdit.php          |   0
 application/views/crm/statusGrundList.php     |   0
 application/views/crm/statusList.php          |   0
 application/views/crm/statusgrund.php         |   0
 application/views/crm/statusgrundEdit.php     |   0
 application/views/crm/statusgrundNew.php      |   0
 .../views/dashboard/dashboard_demo.php        |   0
 .../views/dashboard/dashboard_demo_admin.php  |   0
 application/views/errors/cli/error_404.php    |   0
 application/views/errors/cli/error_db.php     |   0
 .../views/errors/cli/error_exception.php      |   0
 .../views/errors/cli/error_general.php        |   0
 application/views/errors/cli/error_php.php    |   0
 application/views/errors/cli/index.html       |   0
 application/views/errors/html/error_404.php   |   0
 application/views/errors/html/error_db.php    |   0
 .../views/errors/html/error_exception.php     |   0
 .../views/errors/html/error_general.php       |   0
 application/views/errors/html/error_php.php   |   0
 application/views/errors/html/index.html      |   0
 application/views/errors/index.html           |   0
 application/views/extensions/.placeholder     |   0
 application/views/home.php                    |   0
 application/views/index.html                  |   0
 application/views/lehre/Antrag/Create.php     |   0
 .../views/lehre/Antrag/Leitung/List.php       |   0
 .../views/lehre/Antrag/Student/List.php       |   0
 .../lehre/Antrag/Wiederholung/Student.php     |   0
 .../lehre/Antrag/Wiederholung/getLvs.rdf.php  |   0
 .../lehre/Antrag/Wiederholung/moveLvs.rdf.php |   0
 .../lehre/anrechnung/adminAnrechnung.php      |   0
 .../lehre/anrechnung/adminAnrechnungData.php  |   0
 .../anrechnung/approveAnrechnungDetail.php    |   0
 .../approveAnrechnungUebersicht.php           |   0
 .../approveAnrechnungUebersichtData.php       |   0
 .../lehre/anrechnung/createAnrechnung.php     |   0
 .../lehre/anrechnung/createAnrechnungData.php |   0
 .../lehre/anrechnung/requestAnrechnung.php    |   0
 .../anrechnung/requestAnrechnungImportant.php |   0
 .../anrechnung/reviewAnrechnungDetail.php     |   0
 .../lehre/anrechnung/reviewAnrechnungInfo.php |   0
 .../anrechnung/reviewAnrechnungUebersicht.php |   0
 .../reviewAnrechnungUebersichtData.php        |   0
 .../views/lehre/lehrauftrag/Dashboard.php     |   0
 .../lehre/lehrauftrag/LehrendeUebersicht.php  |   0
 .../lehre/lehrauftrag/acceptLehrauftrag.php   |   0
 .../lehrauftrag/acceptLehrauftragData.php     |   0
 .../lehrauftrag/acceptLehrauftragHelp.php     |   0
 .../lehre/lehrauftrag/approveLehrauftrag.php  |   0
 .../lehrauftrag/approveLehrauftragData.php    |   0
 .../lehrauftrag/approveLehrauftragHelp.php    |   0
 .../lehrauftrag/cancelledLehrauftragData.php  |   0
 .../lehre/lehrauftrag/orderLehrauftrag.php    |   0
 .../lehrauftrag/orderLehrauftragData.php      |   0
 .../lehrauftrag/orderLehrauftragHelp.php      |   0
 .../lvplanung/adminZeitverfuegbarkeit.php     |   0
 .../lvplanung/adminZeitverfuegbarkeitData.php |   0
 .../views/lehre/pruefungsprotokoll.php        |   0
 .../lehre/pruefungsprotokollUebersicht.php    |   0
 .../pruefungsprotokollUebersichtData.php      |   0
 .../ReihungstestUebersichtData.php            |   0
 .../reihungstest/reihungstest.php             |   0
 .../views/organisation/studienjahr.php        |   0
 .../views/organisation/studienjahrEdit.php    |   0
 .../views/organisation/studienjahrForm.php    |   0
 .../views/organisation/studienjahrNew.php     |   0
 .../views/organisation/studiensemester.php    |   0
 .../organisation/studiensemesterEdit.php      |   0
 .../organisation/studiensemesterForm.php      |   0
 .../views/organisation/studiensemesterNew.php |   0
 application/views/person/bpk/bpkData.php      |   0
 application/views/person/bpk/bpkDetails.php   |   0
 application/views/person/bpk/bpkwartung.php   |   0
 application/views/person/cli/view.php         |   0
 application/views/person/gradelist/course.php |   0
 .../views/person/gradelist/gradelist.php      |   0
 .../views/person/gradelist/semester.php       |   0
 .../gruppenmanagement/benutzergruppe.php      |   0
 .../gruppenmanagement/gruppenmanagement.php   |   0
 .../gruppenmanagementData.php                 |   0
 application/views/person/index.php            |   0
 application/views/person/view.php             |   0
 .../system/aufnahme/prestudentMultiAssign.php |   0
 .../views/system/extensions/manager.php       |   0
 application/views/system/fas_udf.php          |   0
 .../views/system/infocenter/absageModal.php   |   0
 .../views/system/infocenter/addNotiz.php      |   0
 .../infocenter/anmerkungenZurBewerbung.php    |   0
 .../system/infocenter/dokNachzureichend.php   |   0
 .../views/system/infocenter/dokpruefung.php   |   0
 .../views/system/infocenter/infocenter.php    |   0
 .../infocenter/infocenterAbgewiesen.php       |   0
 .../infocenter/infocenterAbgewiesenData.php   |   0
 .../infocenter/infocenterAufgenommen.php      |   0
 .../infocenter/infocenterAufgenommenData.php  |   0
 .../system/infocenter/infocenterData.php      |   0
 .../system/infocenter/infocenterDetails.php   |   0
 .../infocenter/infocenterFreigegeben.php      |   0
 .../infocenter/infocenterFreigegebenData.php  |   0
 .../infocenterReihungstestAbsolviert.php      |   0
 .../infocenterReihungstestAbsolviertData.php  |   0
 .../infocenter/infocenterZgvDetails.php       |   0
 .../infocenter/infocenterZgvUeberpruefung.php |   0
 .../infocenterZgvUeberpruefungData.php        |   0
 application/views/system/infocenter/logs.php  |   0
 .../views/system/infocenter/messageList.php   |   0
 .../views/system/infocenter/notizen.php       |   0
 .../views/system/infocenter/stammdaten.php    |   0
 .../system/infocenter/studiengangZgvInfo.php  |   0
 .../views/system/infocenter/zgvpruefungen.php |   0
 application/views/system/issues/issues.php    |   0
 .../views/system/issues/issuesData.php        |   0
 .../system/issues/issuesKonfiguration.php     |   0
 .../system/issues/issuesKonfigurationData.php |   0
 .../system/issues/issuesZustaendigkeiten.php  |   0
 .../issues/issuesZustaendigkeitenData.php     |   0
 .../views/system/issues/plausichecks.php      |   0
 .../views/system/jq/jobsQueueViewer.php       |   0
 .../views/system/jq/jobsQueueViewerData.php   |   0
 .../views/system/login/usernamePassword.php   |   0
 application/views/system/logs/logsViewer.php  |   0
 application/views/system/logs/testSearch.php  |   0
 .../system/messages/FAShtmlWriteTemplate.php  |   0
 .../views/system/messages/ajaxRead.php        |   0
 .../views/system/messages/ajaxWrite.php       |   0
 .../views/system/messages/ajaxWriteReply.php  |   0
 .../system/messages/htmlMessageSentError.php  |   0
 .../messages/htmlMessageSentSuccess.php       |   0
 .../views/system/messages/htmlRead.php        |   0
 .../views/system/messages/htmlWriteReply.php  |   0
 .../system/messages/htmlWriteTemplate.php     |   0
 .../views/system/phrases/phraseinhaltEdit.php |   0
 application/views/system/phrases/phrases.php  |   0
 .../views/system/phrases/phrasesEdit.php      |   0
 .../views/system/phrases/phrasesList.php      |   0
 .../system/phrases/phrasesinhaltList.php      |   0
 .../system/vorlage/templateLinkDocuments.php  |   0
 .../views/system/vorlage/templates.php        |   0
 .../views/system/vorlage/templatesEdit.php    |   0
 .../views/system/vorlage/templatesList.php    |   0
 .../views/system/vorlage/templatetextEdit.php |   0
 .../views/system/vorlage/templatetextList.php |   0
 .../system/vorlage/templatetextPreview.php    |   0
 .../views/templates/CISHMVC-Footer.php        |   0
 .../views/templates/CISHMVC-Header.php        |   0
 .../views/templates/CISHMVC-Menu/Entry.php    |   0
 .../views/templates/CISHTML-Footer.php        |   0
 .../views/templates/CISHTML-Header.php        |   0
 .../views/templates/CISHTML-Menu/Entry.php    |   0
 .../templates/CISHTML-Menu/EntryBase.php      |   0
 .../templates/CISHTML-Menu/EntryInclude.php   |   0
 application/views/templates/CISVUE-Footer.php |   0
 application/views/templates/CISVUE-Header.php |   0
 application/views/templates/FHC-Common.php    |   0
 application/views/templates/FHC-Footer.php    |   0
 application/views/templates/FHC-Header.php    |   0
 application/views/templates/footer.php        |   0
 application/views/templates/header.php        |   0
 application/views/templates/mailHTML.php      |   0
 application/views/templates/mailTXT.php       |   0
 .../mailtemplates/interessentFreigabe.php     |   0
 application/views/templates/vilesci.php       |   0
 application/views/test/Admin.php              |   0
 application/views/test/Test.php               |   0
 application/views/widgets/checkbox.php        |   0
 application/views/widgets/dropdown.php        |   0
 application/views/widgets/filter/filter.php   |   0
 .../views/widgets/filter/filterOptions.php    |   0
 .../views/widgets/filter/pivotUIDataset.php   |   0
 .../views/widgets/filter/saveFilter.php       |   0
 .../views/widgets/filter/selectFields.php     |   0
 .../views/widgets/filter/selectFilters.php    |   0
 .../views/widgets/filter/tableDataset.php     |   0
 .../views/widgets/filter/tabulatorDataset.php |   0
 application/views/widgets/jsoneditor.php      |   0
 application/views/widgets/jsonforms.php       |   0
 application/views/widgets/mimetype.php        |   0
 application/views/widgets/navigation.php      |   0
 .../views/widgets/navigationHeader.php        |   0
 application/views/widgets/navigationMenu.php  |   0
 application/views/widgets/phpjsonform.php     |   0
 .../views/widgets/table/pivotUIDataset.php    |   0
 application/views/widgets/table/table.php     |   0
 .../views/widgets/table/tableDataset.php      |   0
 .../views/widgets/table/tableHelpsite.php     |   0
 .../views/widgets/table/tabulatorDataset.php  |   0
 application/views/widgets/textarea.php        |   0
 application/views/widgets/textfield.php       |   0
 application/views/widgets/tinymce.php         |   0
 application/widgets/Aufnahmegruppe_widget.php |   0
 .../widgets/Ausbildungssemester_widget.php    |   0
 application/widgets/Dropdown_widget.php       |   0
 application/widgets/FilterWidget.php          |   0
 .../widgets/MultipleDropdown_widget.php       |   0
 application/widgets/Nation_widget.php         |   0
 .../widgets/NavigationHeaderWidget.php        |   0
 application/widgets/NavigationMenuWidget.php  |   0
 application/widgets/NavigationWidget.php      |   0
 .../widgets/Organisationseinheit_widget.php   |   0
 application/widgets/Orgform_widget.php        |   0
 application/widgets/Reihungstest_widget.php   |   0
 application/widgets/Sprache_widget.php        |   0
 application/widgets/Statusgrund_widget.php    |   0
 application/widgets/Studiengang_widget.php    |   0
 .../widgets/Studiensemester_widget.php        |   0
 application/widgets/Stufe_widget.php          |   0
 application/widgets/TableWidget.php           |   0
 application/widgets/Vorlage_widget.php        |   0
 application/widgets/Zgv_widget.php            |   0
 application/widgets/Zgvmaster_widget.php      |   0
 application/widgets/extensions/.placeholder   |   0
 application/widgets/html/CheckboxWidget.php   |   0
 application/widgets/html/DropdownWidget.php   |   0
 application/widgets/html/HTMLWidget.php       |   0
 application/widgets/html/TextareaWidget.php   |   0
 application/widgets/html/TextfieldWidget.php  |   0
 application/widgets/jsoneditor_widget.php     |   0
 application/widgets/jsonforms_widget.php      |   0
 application/widgets/mimetype_widget.php       |   0
 application/widgets/phpjsonform_widget.php    |   0
 application/widgets/tinymce_widget.php        |   0
 application/widgets/udf/CheckboxWidgetUDF.php |   0
 application/widgets/udf/DropdownWidgetUDF.php |   0
 application/widgets/udf/TextareaWidgetUDF.php |   0
 .../widgets/udf/TextfieldWidgetUDF.php        |   0
 application/widgets/udf/UDFWidget.php         |   0
 cis.php                                       |   0
 cis/ampel.php                                 |   0
 cis/cisdocs/index.html                        |   0
 cis/cisdocs/muster_semesterplan.doc           | Bin
 cis/cisdocs/muster_semesterplan_index.html    |   0
 cis/cisdocs/vorlage_studienbrief.dot          | Bin
 cis/index.html                                |   0
 cis/index.php                                 |   0
 cis/index_login.php                           |   0
 cis/infoterminal/feed.png                     | Bin
 cis/infoterminal/go-bottom.png                | Bin
 cis/infoterminal/go-top.png                   | Bin
 cis/infoterminal/index.php                    |   0
 cis/infoterminal/informationsbildschirm.php   |   0
 cis/infoterminal/infoterm.css                 |   0
 cis/infoterminal/keyboard.php                 |   0
 cis/infoterminal/lvplan.php                   |   0
 cis/infoterminal/system-users_in.png          | Bin
 cis/infoterminal/system-users_out.png         | Bin
 cis/infoterminal/tw_lageplan.jpg              | Bin
 cis/infoterminal/tw_logo_01.jpg               | Bin
 cis/infoterminal/twplan.gif                   | Bin
 cis/menu.php                                  |   0
 cis/private/bildupload.php                    |   0
 cis/private/coodle/coodle_autocomplete.php    |   0
 cis/private/coodle/coodle_events.php          |   0
 cis/private/coodle/coodle_worker.php          |   0
 cis/private/coodle/index.html                 |   0
 cis/private/coodle/stammdaten.php             |   0
 cis/private/coodle/termin.php                 |   0
 cis/private/coodle/uebersicht.php             |   0
 cis/private/crop.php                          |   0
 cis/private/freifaecher/anmeldung.php         |   0
 .../freifaecher/anmeldungsuebersicht.php      |   0
 cis/private/freifaecher/index.html            |   0
 cis/private/index.html                        |   0
 cis/private/info/ersthelfer.php               |   0
 .../Projektarbeitsabgabe_FHTW_Anleitung_A.pdf | Bin
 .../Projektarbeitsabgabe_FHTW_Anleitung_L.pdf | Bin
 .../Publikationsdatenbank_FHTW_Handbuch.pdf   | Bin
 .../info/handbuecher/abgabetool_lektoren.pdf  | Bin
 .../info/handbuecher/abgabetool_studenten.pdf | Bin
 cis/private/info/handbuecher/index.php        |   0
 cis/private/info/index.html                   |   0
 cis/private/info/partnerhochschulen.php       |   0
 cis/private/info/service_uebersicht.php       |   0
 cis/private/info/telefonverzeichnis.php       |   0
 cis/private/jahresplan/index.html             |   0
 cis/private/jahresplan/index.php              |   0
 cis/private/jahresplan/jahresplan_bilder.php  |   0
 cis/private/jahresplan/jahresplan_detail.php  |   0
 .../jahresplan/jahresplan_funktionen.inc.php  |   0
 .../jahresplan/jahresplan_kategorie.php       |   0
 .../jahresplan/jahresplan_reservierung.php    |   0
 .../jahresplan/jahresplan_veranstaltung.php   |   0
 cis/private/lehre/abgabe_lektor.php           |   0
 cis/private/lehre/abgabe_lektor_details.php   |   0
 cis/private/lehre/abgabe_lektor_frameset.html |   0
 .../lehre/abgabe_lektor_multitermin.php       |   0
 .../lehre/abgabe_lektor_terminuebersicht.php  |   0
 cis/private/lehre/abgabe_lektor_zusatz.php    |   0
 cis/private/lehre/abgabe_student.php          |   0
 cis/private/lehre/abgabe_student_details.php  |   0
 cis/private/lehre/abgabe_student_file.php     |   0
 cis/private/lehre/abgabe_student_frameset.php |   0
 cis/private/lehre/abmeldung.php               |   0
 cis/private/lehre/anwesenheitsliste.pdf.php   |   0
 cis/private/lehre/anwesenheitsliste.php       |   0
 .../benotungstool/lvgesamtnote_worker.php     |   0
 .../benotungstool/lvgesamtnoteeintragen.php   |   0
 .../benotungstool/lvgesamtnoteverwalten.php   |   0
 .../benotungstool/nachpruefungeintragen.php   |   0
 .../lehre/benotungstool/notenschluessel.php   |   0
 cis/private/lehre/covidstatusliste.php        |   0
 cis/private/lehre/feedback.php                |   0
 cis/private/lehre/fotoliste.pdf.php           |   0
 cis/private/lehre/index.html                  |   0
 cis/private/lehre/lector_choice.php           |   0
 cis/private/lehre/lesson.php                  |   0
 cis/private/lehre/notenliste.php              |   0
 cis/private/lehre/notenliste.xls.php          |   0
 cis/private/lehre/pruefung/index.php          |   0
 .../lehre/pruefung/lektor_autocomplete.php    |   0
 cis/private/lehre/pruefung/pruefung.js.php    |   0
 .../pruefung/pruefungsanmeldung.json.php      |   0
 .../lehre/pruefung/pruefungsanmeldung.php     |   0
 .../pruefungsanmeldungen_liste.pdf.php        |   0
 .../pruefung/pruefungsanmeldungen_liste.php   |   0
 .../pruefungsanmeldungen_liste_ohne_namen.php |   0
 .../pruefungsanmeldungen_verwalten.php        |   0
 .../lehre/pruefung/pruefungsbewertung.js.php  |   0
 .../pruefung/pruefungsbewertung.json.php      |   0
 .../lehre/pruefung/pruefungsbewertung.php     |   0
 .../pruefung/pruefungsfenster_anlegen.php     |   0
 .../lehre/pruefung/pruefungstermin.json.php   |   0
 .../pruefung/pruefungstermin_aendern.php      |   0
 .../pruefung/pruefungstermin_festlegen.php    |   0
 .../pruefung/pruefungstermin_loeschen.php     |   0
 cis/private/lehre/semdownhlp.php              |   0
 cis/private/lehre/semupload.php               |   0
 cis/private/lehre/softgrid.php                |   0
 cis/private/lehre/upload.php                  |   0
 cis/private/lvplan/belegt.php                 |   0
 cis/private/lvplan/index.html                 |   0
 cis/private/lvplan/index.php                  |   0
 cis/private/lvplan/index_out.html             |   0
 cis/private/lvplan/lvplan_autocomplete.php    |   0
 cis/private/lvplan/raumsuche.php              |   0
 cis/private/lvplan/stpl_detail.php            |   0
 cis/private/lvplan/stpl_kalender.php          |   0
 cis/private/lvplan/stpl_reserve_list.php      |   0
 cis/private/lvplan/stpl_week.php              |   0
 .../lvplan/stpl_week_anzahl_studenten.php     |   0
 cis/private/lvplan/verband_uebersicht.php     |   0
 cis/private/mailverteiler.php                 |   0
 cis/private/open_grp.php                      |   0
 cis/private/outgoing/akte.php                 |   0
 cis/private/outgoing/akteupload.php           |   0
 cis/private/outgoing/index.html               |   0
 cis/private/outgoing/outgoing.php             |   0
 .../outgoing/outgoing_autocomplete.php        |   0
 cis/private/outgoing/registration.php         |   0
 cis/private/pdfExport.php                     |   0
 cis/private/pers_in_grp.php                   |   0
 cis/private/profile/anwesenheit.php           |   0
 cis/private/profile/anwesenheit_lektor.php    |   0
 cis/private/profile/change_password.php       |   0
 cis/private/profile/dokumente.php             |   0
 cis/private/profile/freebusy.php              |   0
 cis/private/profile/index.html                |   0
 cis/private/profile/index.php                 |   0
 cis/private/profile/lva_liste.php             |   0
 cis/private/profile/mitarbeiter_buchung.php   |   0
 cis/private/profile/studienplan.php           |   0
 cis/private/profile/urlaubsfreigabe.php       |   0
 cis/private/profile/urlaubstool.php           |   0
 .../profile/urlaubstool_autocomplete.php      |   0
 cis/private/profile/zahlungen.php             |   0
 cis/private/profile/zahlungen_details.php     |   0
 cis/private/profile/zeitsperre.php            |   0
 cis/private/profile/zeitsperre_days.php       |   0
 cis/private/profile/zeitsperre_export.php     |   0
 cis/private/profile/zeitsperre_resturlaub.php |   0
 cis/private/profile/zeitwunsch.php            |   0
 cis/private/profile/zeitwunsch_help.php       |   0
 cis/private/stud_in_grp.php                   |   0
 cis/private/tools/ampelleiteruebersicht.php   |   0
 cis/private/tools/ampelverwaltung.php         |   0
 cis/private/tools/index.html                  |   0
 cis/private/tools/notebook_registration.php   |   0
 cis/private/tools/projektabgabe.php           |   0
 .../tools/projektabgabe_autocomplete.php      |   0
 cis/private/tools/suche.php                   |   0
 cis/private/tools/zeitaufzeichnung.php        |   0
 .../tools/zeitaufzeichnung_autocomplete.php   |   0
 .../tools/zeitaufzeichnung_bisverwendung.php  |   0
 .../tools/zeitaufzeichnung_projektliste.php   |   0
 .../tools/zeitaufzeichnung_projektphasen.php  |   0
 .../tools/zeitaufzeichnung_zeitsperren.php    |   0
 cis/public/accountactivation.php              |   0
 cis/public/bild.php                           |   0
 cis/public/bildupload.php                     |   0
 cis/public/coodle.php                         |   0
 cis/public/freebusy.php                       |   0
 cis/public/freebusy_coodle.php                |   0
 cis/public/freebusy_lvplan.php                |   0
 cis/public/freebusy_sogo.php                  |   0
 cis/public/freebusy_zeitsperren.php           |   0
 cis/public/ical_coodle.php                    |   0
 cis/public/incoming/akte.php                  |   0
 cis/public/incoming/akteupload.php            |   0
 cis/public/incoming/auth.php                  |   0
 cis/public/incoming/incoming.php              |   0
 cis/public/incoming/index.php                 |   0
 cis/public/incoming/logout.php                |   0
 cis/public/incoming/lvinfo.php                |   0
 cis/public/incoming/registration.php          |   0
 cis/public/index.html                         |   0
 cis/public/prestudententool/auth.php          |   0
 cis/public/prestudententool/index.php         |   0
 cis/public/prestudententool/logout.php        |   0
 cis/public/prestudententool/prestudent.php    |   0
 cis/public/testtool_test/MathML_Beispiel.jpg  | Bin
 cis/public/testtool_test/audio_testfile.mp3   | Bin
 cis/public/testtool_test/testseite.php        |   0
 cis/testtool/admin/Testtool.pdf               | Bin
 cis/testtool/admin/add_gebiet.php             |   0
 cis/testtool/admin/auswertung.php             |   0
 cis/testtool/admin/auswertung_detail.php      |   0
 .../admin/auswertung_detail_frage.php         |   0
 .../admin/auswertung_detail_prestudent.php    |   0
 cis/testtool/admin/copy_gebiet.php            |   0
 cis/testtool/admin/edit_ablauf.php            |   0
 cis/testtool/admin/edit_gebiet.php            |   0
 cis/testtool/admin/gebieteAnheangen.php       |   0
 cis/testtool/admin/index.php                  |   0
 cis/testtool/admin/uebersichtFragen.php       |   0
 cis/testtool/admin/uebersichtGebiete.php      |   0
 .../audio-player/audio-player-noswfobject.js  |   0
 .../audio-player/audio-player-uncompressed.js |   0
 cis/testtool/audio-player/audio-player.js     |   0
 cis/testtool/audio-player/license.txt         |   0
 cis/testtool/audio-player/player.swf          | Bin
 cis/testtool/bild.php                         |   0
 cis/testtool/ctop.xsl                         |   0
 cis/testtool/frage.php                        |   0
 cis/testtool/gebietfertig.php                 |   0
 cis/testtool/index.html                       |   0
 cis/testtool/index.php                        |   0
 cis/testtool/login.php                        |   0
 cis/testtool/logout.html                      |   0
 cis/testtool/mathml.xsl                       |   0
 cis/testtool/menu.php                         |   0
 cis/testtool/pmathml.xsl                      |   0
 cis/testtool/prueflinggesperrt.php            |   0
 cis/testtool/sound.php                        |   0
 cis/testtool/test/MathML_Beispiel.jpg         | Bin
 cis/testtool/test/audio_testfile.mp3          | Bin
 cis/testtool/test/testseite.php               |   0
 cis/testtool/topbar.html                      |   0
 cis/testtool/topbar.php                       |   0
 cms/admin.php                                 |   0
 cms/admin_dms.php                             |   0
 cms/content.php                               |   0
 cms/content_uebersicht.php                    |   0
 cms/dms.php                                   |   0
 cms/image.php                                 |   0
 cms/index.html                                |   0
 cms/menu.inc.php                              |   0
 cms/menu/menu_addon.class.php                 |   0
 cms/menu/menu_addon_freifaecher.inc.php       |   0
 .../menu_addon_lehrveranstaltungen.inc.php    |   0
 ...on_lehrveranstaltungen_studienplan.inc.php |   0
 cms/menu/menu_addon_meinelehrfaecher.inc.php  |   0
 cms/menu/menu_addon_meinelv.inc.php           |   0
 cms/menu/menu_addon_spacer.inc.php            |   0
 cms/menu/menu_addon_test.inc.php              |   0
 cms/menu/menu_addon_urlaub.inc.php            |   0
 cms/menu/menu_addon_zeitsperren.inc.php       |   0
 cms/news.php                                  |   0
 cms/newsverwaltung.php                        |   0
 cms/tinymce_dms.php                           |   0
 composer.json                                 |   0
 composer.lock                                 |   0
 config/.gitignore                             |   0
 config/cis.config-default.inc.php             |   0
 config/global.config-default.inc.php          |   0
 config/system.config-default.inc.php          |   0
 config/vilesci.config-default.inc.php         |   0
 config/wawi.config-default.inc.php            |   0
 content/DragAndDrop.js                        |   0
 content/about.xul.php                         |   0
 content/adressedialog.js.php                  |   0
 content/adressedialog.xul.php                 |   0
 content/akte.php                              |   0
 content/akteupload.php                        |   0
 content/anwesenheit.js.php                    |   0
 content/anwesenheit.xul.php                   |   0
 content/bankverbindungdialog.js.php           |   0
 content/bankverbindungdialog.xul.php          |   0
 content/betriebsmitteloverlay.js.php          |   0
 content/betriebsmitteloverlay.xul.php         |   0
 content/bild.php                              |   0
 content/bildupload.php                        |   0
 content/bindings.css                          |   0
 content/bindings.xml.php                      |   0
 content/datepicker/calendar.png               | Bin
 content/datepicker/date.png                   | Bin
 content/datepicker/datepicker.css             |   0
 content/datepicker/datepicker.xml             |   0
 content/datepicker/navigation.png             | Bin
 content/dokumentenakt.pdf.php                 |   0
 content/dragboard.js.php                      |   0
 content/fas.xul.php                           |   0
 content/fasDBDML.php                          |   0
 content/fasoverlay.js.php                     |   0
 content/fasoverlay.xul.php                    |   0
 content/functions.js.php                      |   0
 content/funktionen.js.php                     |   0
 content/funktionen.xul.php                    |   0
 content/kontakt.js.php                        |   0
 content/kontakt.xul.php                       |   0
 content/kontaktdialog.js.php                  |   0
 content/kontaktdialog.xul.php                 |   0
 content/lvplanung/lehrveranstaltungDBDML.php  |   0
 .../lehrveranstaltungdetailoverlay.xul.php    |   0
 .../lehrveranstaltungnotenoverlay.xul.php     |   0
 .../lvplanung/lehrveranstaltungoverlay.js.php |   0
 .../lehrveranstaltungoverlay.xul.php          |   0
 content/lvplanung/ressourcedialog.js.php      |   0
 content/lvplanung/ressourcedialog.xul.php     |   0
 content/lvplanung/stpl-details-dialog.js.php  |   0
 content/lvplanung/stpl-details-dialog.xul.php |   0
 .../lvplanung/stpl-details-overlay.xul.php    |   0
 .../lvplanung/stpl-semester-overlay.js.php    |   0
 .../lvplanung/stpl-semester-overlay.xul.php   |   0
 content/lvplanung/stpl-week-overlay.js.php    |   0
 content/lvplanung/stpl-week-overlay.xul.php   |   0
 content/lvplanung/timetable-week.xul.php      |   0
 content/messages.js.php                       |   0
 content/messages.xul.php                      |   0
 content/mitarbeiter/lehrtaetigkeit.pdf.php    |   0
 content/mitarbeiter/mitarbeiterDBDML.php      |   0
 content/mitarbeiter/mitarbeiterbuchung.js.php |   0
 .../mitarbeiterbuchungoverlay.xul.php         |   0
 .../mitarbeiterdetailoverlay.xul.php          |   0
 .../mitarbeiterfunktionoverlay.xul.php        |   0
 content/mitarbeiter/mitarbeiteroverlay.js.php |   0
 .../mitarbeiter/mitarbeiteroverlay.xul.php    |   0
 content/mitarbeiter/mitarbeitervertrag.js.php |   0
 .../mitarbeitervertragneudialog.js.php        |   0
 .../mitarbeitervertragneudialog.xul.php       |   0
 .../mitarbeitervertragoverlay.xul.php         |   0
 .../mitarbeiterverwendungdialog.js.php        |   0
 .../mitarbeiterverwendungdialog.xul.php       |   0
 content/notiz.xml.php                         |   0
 content/notizdialog.js.php                    |   0
 content/notizdialog.xul.php                   |   0
 content/notizdokdownload.php                  |   0
 content/notizdokupload.php                    |   0
 content/pdfExport.php                         |   0
 content/phpRequest.js.php                     |   0
 content/planner.js.php                        |   0
 content/planner.overlay.js.php                |   0
 content/planner.overlay.xul.php               |   0
 content/planner.xul.php                       |   0
 content/projekt/GanttChart.svg                |   0
 content/projekt/bestellung.overlay.js.php     |   0
 content/projekt/bestellung.overlay.xul.php    |   0
 content/projekt/gantt.css                     |   0
 content/projekt/gantt.overlay.js.php          |   0
 content/projekt/gantt.overlay.xul.php         |   0
 content/projekt/gantt.svg.css                 |   0
 content/projekt/gantt.svg.php                 |   0
 content/projekt/gantt.svg.xbl                 |   0
 content/projekt/mantisdetail.overlay.xul.php  |   0
 content/projekt/parsedown.php                 |   0
 content/projekt/projekt.overlay.js.php        |   0
 content/projekt/projekt.overlay.xul.php       |   0
 .../projekt/projekt_ressource.window.js.php   |   0
 .../projekt/projekt_ressource.window.xul.php  |   0
 content/projekt/projektdetail.overlay.xul.php |   0
 .../projekt/projektdokument.overlay.js.php    |   0
 .../projekt/projektdokument.overlay.xul.php   |   0
 content/projekt/projektdokument.window.js.php |   0
 .../projekt/projektdokument.window.xul.php    |   0
 content/projekt/projektphase.overlay.js.php   |   0
 content/projekt/projektphase.overlay.xul.php  |   0
 .../projektphasedetail.overlay.xul.php        |   0
 content/projekt/projekttask.overlay.js.php    |   0
 content/projekt/projekttask.overlay.xul.php   |   0
 .../projekt/projekttaskdetail.overlay.xul.php |   0
 content/projekt/ressource.js.php              |   0
 content/projekt/ressource.overlay.js.php      |   0
 content/projekt/ressource.overlay.xul.php     |   0
 content/projekt/ressource.window.xul.php      |   0
 content/projekt/ressource.xml.php             |   0
 content/projekt/ressourcenauslastung.php      |   0
 content/projektbeschreibung.php               |   0
 content/statistik/StudierendeZGV.php          |   0
 content/statistik/abgaengerstatistik.php      |   0
 .../statistik/abschlusspruefungexport.xls.php |   0
 content/statistik/absolventen.xls.php         |   0
 content/statistik/absolventenstatistik.php    |   0
 content/statistik/absolventenzahlen.php       |   0
 content/statistik/alvsstatistik.php           |   0
 content/statistik/bama_stromanalyse.php       |   0
 content/statistik/bama_studentenstrom.svg.php |   0
 content/statistik/bewerberstatistik.php       |   0
 content/statistik/bewerberstatistik.svg.php   |   0
 content/statistik/dokumente.xls.php           |   0
 content/statistik/dropout.php                 |   0
 content/statistik/dropoutZGV.php              |   0
 .../statistik/lehrauftragsliste_gst.xls.php   |   0
 .../statistik/lehrauftragsliste_mail.xls.php  |   0
 content/statistik/lvplanung.php               |   0
 content/statistik/lvplanung.xls.php           |   0
 content/statistik/mitarbeiterexport.xls.php   |   0
 content/statistik/mitarbeiterstatistik.php    |   0
 content/statistik/notenspiegel.php            |   0
 content/statistik/notenspiegel_erweitert.php  |   0
 content/statistik/oeh_beitraege.xls.php       |   0
 content/statistik/projektarbeitexport.xls.php |   0
 .../statistik/studentenexportextended.xls.php |   0
 content/statistik/studentenprosemester.php    |   0
 content/statistik/studentenstatistik.php      |   0
 .../studentenstatistik_lehrgaenge.php         |   0
 content/statistik/termine.xls.php             |   0
 content/statistik/vertragsuebersicht.xls.php  |   0
 content/student/aufnahmetermine.js.php        |   0
 content/student/aufnahmetermine.xul.php       |   0
 .../student/interessentdokumentedialog.js.php |   0
 .../interessentdokumentedialog.xul.php        |   0
 .../interessentdokumenteoverlay.js.php        |   0
 .../interessentdokumenteoverlay.xul.php       |   0
 content/student/interessentoverlay.js.php     |   0
 content/student/studentDBDML.php              |   0
 .../student/studentabschlusspruefung.js.php   |   0
 .../studentabschlusspruefungoverlay.xul.php   |   0
 .../studentanrechnungenoverlay.xul.php        |   0
 content/student/studentdetailoverlay.xul.php  |   0
 content/student/studentenoverlay.xul.php      |   0
 content/student/studentgruppenoverlay.js.php  |   0
 content/student/studentgruppenoverlay.xul.php |   0
 content/student/studentiooverlay.xul.php      |   0
 content/student/studentkontoneudialog.js.php  |   0
 content/student/studentkontoneudialog.xul.php |   0
 content/student/studentkontooverlay.xul.php   |   0
 .../student/studentmobilitaetoverlay.js.php   |   0
 .../student/studentmobilitaetoverlay.xul.php  |   0
 content/student/studentnotenoverlay.xul.php   |   0
 content/student/studentoverlay.js.php         |   0
 content/student/studentprojektarbeit.js.php   |   0
 .../studentprojektarbeitoverlay.xul.php       |   0
 .../student/studentpruefungoverlay.xul.php    |   0
 content/student/studentrolledialog.js.php     |   0
 content/student/studentrolledialog.xul.php    |   0
 content/student/studentzeugnisoverlay.xul.php |   0
 content/studenten.js                          |   0
 content/tempus.js.php                         |   0
 content/tempus.xul.php                        |   0
 content/tempusDBDML.php                       |   0
 content/tempusoverlay.js.php                  |   0
 content/tempusoverlay.xul.php                 |   0
 content/termine.js.php                        |   0
 content/termine.xul.php                       |   0
 content/udf.js.php                            |   0
 content/udf.xul.php                           |   0
 content/zutrittskarte.php                     |   0
 favicon.ico                                   | Bin
 include/DifferenceEngine/DifferenceEngine.php |   0
 include/Excel/BIFFwriter.php                  |   0
 include/Excel/File.php                        |   0
 include/Excel/Format.php                      |   0
 include/Excel/OLE.php                         |   0
 include/Excel/PEAR.php                        |   0
 include/Excel/PPS.php                         |   0
 include/Excel/Parser.php                      |   0
 include/Excel/Root.php                        |   0
 include/Excel/Validator.php                   |   0
 include/Excel/Workbook.php                    |   0
 include/Excel/Worksheet.php                   |   0
 include/Excel/Writer.php                      |   0
 include/Excel/excel.php                       |   0
 include/File/CSV.php                          |   0
 include/File/Find.php                         |   0
 include/File/Match.php                        |   0
 include/File/Passwd.php                       |   0
 include/File/SearchReplace.php                |   0
 include/File/Util.php                         |   0
 include/Parser/Parsedown.php                  |   0
 include/ablauf.class.php                      |   0
 include/abschlusspruefung.class.php           |   0
 include/abschlusspruefung_antritt.class.php   |   0
 include/addon.class.php                       |   0
 include/adresse.class.php                     |   0
 include/adressentyp.class.php                 |   0
 include/akadgrad.class.php                    |   0
 include/akte.class.php                        |   0
 include/ampel.class.php                       |   0
 include/anrechnung.class.php                  |   0
 include/antwort.class.php                     |   0
 include/anwesenheit.class.php                 |   0
 include/appdaten.class.php                    |   0
 include/aufmerksamdurch.class.php             |   0
 include/auth_demo.class.php                   |   0
 include/auth_mixed.class.php                  |   0
 include/auth_session.class.php                |   0
 include/authentication.class.php              |   0
 include/bankverbindung.class.php              |   0
 include/basis.class.php                       |   0
 include/basis_db.class.php                    |   0
 include/beispiel.class.php                    |   0
 include/benutzer.class.php                    |   0
 include/benutzerberechtigung.class.php        |   0
 include/benutzerfunktion.class.php            |   0
 include/benutzergruppe.class.php              |   0
 include/benutzerlvstudiensemester.class.php   |   0
 include/berechtigung.class.php                |   0
 include/betriebsmittel.class.php              |   0
 ...riebsmittel_betriebsmittelstatus.class.php |   0
 include/betriebsmittelperson.class.php        |   0
 include/betriebsmittelstatus.class.php        |   0
 include/betriebsmitteltyp.class.php           |   0
 include/bewerbungstermin.class.php            |   0
 include/bisarchiv.class.php                   |   0
 include/bisberufstaetigkeit.class.php         |   0
 include/bisfunktion.class.php                 |   0
 include/bisio.class.php                       |   0
 include/bisorgform.class.php                  |   0
 include/bisverwendung.class.php               |   0
 include/buchung.class.php                     |   0
 include/content.class.php                     |   0
 include/coodle.class.php                      |   0
 include/covid/covidhelper.class.php           |   0
 include/cronjob.class.php                     |   0
 .../ui-bg_diagonals-thick_18_b81900_40x40.png | Bin
 .../ui-bg_diagonals-thick_20_666666_40x40.png | Bin
 .../images/ui-bg_flat_10_000000_40x100.png    | Bin
 .../images/ui-bg_glass_100_f6f6f6_1x400.png   | Bin
 .../images/ui-bg_glass_100_fdf5ce_1x400.png   | Bin
 .../images/ui-bg_glass_65_ffffff_1x400.png    | Bin
 .../ui-bg_gloss-wave_35_f6a828_500x100.png    | Bin
 .../ui-bg_highlight-soft_100_eeeeee_1x100.png | Bin
 .../ui-bg_highlight-soft_75_ffe45c_1x100.png  | Bin
 .../css/images/ui-icons_222222_256x240.png    | Bin
 .../css/images/ui-icons_228ef1_256x240.png    | Bin
 .../css/images/ui-icons_ef8c08_256x240.png    | Bin
 .../css/images/ui-icons_ffd27a_256x240.png    | Bin
 .../css/images/ui-icons_ffffff_256x240.png    | Bin
 include/datum.class.php                       |   0
 include/dms.class.php                         |   0
 include/dokument.class.php                    |   0
 include/dokument_export.class.php             |   0
 include/dvb.class.php                         |   0
 include/ean13.function.php                    |   0
 include/entwicklungsteam.class.php            |   0
 include/erhalter.class.php                    |   0
 include/errorhandler.class.php                |   0
 include/ezcomponents/Base/CREDITS             |   0
 include/ezcomponents/Base/ChangeLog           |   0
 include/ezcomponents/Base/DESCRIPTION         |   0
 .../Base/design/class_diagram.png             | Bin
 include/ezcomponents/Base/design/design.txt   |   0
 .../Base/docs/repos/Me/myclass1.php           |   0
 .../Base/docs/repos/Me/myclass2.php           |   0
 .../Base/docs/repos/You/yourclass1.php        |   0
 .../Base/docs/repos/You/yourclass2.php        |   0
 .../Base/docs/repos/autoloads/my_autoload.php |   0
 .../docs/repos/autoloads/your_autoload.php    |   0
 include/ezcomponents/Base/docs/tutorial.txt   |   0
 .../Base/docs/tutorial_autoload.php           |   0
 .../Base/docs/tutorial_example_01.php         |   0
 .../Base/docs/tutorial_example_02.php         |   0
 .../Base/docs/tutorial_example_03.php         |   0
 .../docs/tutorial_lazy_initialization.php     |   0
 include/ezcomponents/Base/review-1.5.txt      |   0
 include/ezcomponents/Base/src/base.php        |   0
 .../Base/src/exceptions/autoload.php          |   0
 .../double_class_repository_prefix.php        |   0
 .../Base/src/exceptions/exception.php         |   0
 .../src/exceptions/extension_not_found.php    |   0
 .../Base/src/exceptions/file_exception.php    |   0
 .../Base/src/exceptions/file_io.php           |   0
 .../Base/src/exceptions/file_not_found.php    |   0
 .../Base/src/exceptions/file_permission.php   |   0
 .../exceptions/init_callback_configured.php   |   0
 .../src/exceptions/invalid_callback_class.php |   0
 .../src/exceptions/invalid_parent_class.php   |   0
 .../src/exceptions/property_not_found.php     |   0
 .../src/exceptions/property_permission.php    |   0
 .../Base/src/exceptions/setting_not_found.php |   0
 .../Base/src/exceptions/setting_value.php     |   0
 .../Base/src/exceptions/value.php             |   0
 .../Base/src/exceptions/whatever.php          |   0
 .../ezcomponents/Base/src/ezc_bootstrap.php   |   0
 include/ezcomponents/Base/src/features.php    |   0
 include/ezcomponents/Base/src/file.php        |   0
 include/ezcomponents/Base/src/init.php        |   0
 .../interfaces/configuration_initializer.php  |   0
 .../Base/src/interfaces/persistable.php       |   0
 include/ezcomponents/Base/src/options.php     |   0
 .../Base/src/options/autoload.php             |   0
 include/ezcomponents/Base/src/struct.php      |   0
 .../Base/src/structs/repository_directory.php |   0
 .../Base/tests/base_init_test.php             |   0
 .../Base/tests/base_options_test.php          |   0
 include/ezcomponents/Base/tests/base_test.php |   0
 .../extra_repository/Translation/test.php     |   0
 .../autoload/translation_autoload.php         |   0
 .../ezcomponents/Base/tests/features_test.php |   0
 .../file_calculate_relative_path_test.php     |   0
 .../Base/tests/file_copy_recursive_test.php   |   0
 .../Base/tests/file_find_recursive_test.php   |   0
 .../Base/tests/file_is_absolute_path.php      |   0
 .../Base/tests/file_remove_recursive_test.php |   0
 .../Base/tests/init/base_init_callback.php    |   0
 .../Base/tests/init/base_init_class.php       |   0
 .../ezcomponents/Base/tests/struct_test.php   |   0
 include/ezcomponents/Base/tests/suite.php     |   0
 .../ezcomponents/Base/tests/test_options.php  |   0
 .../TestClasses/base_test_class.php           |   0
 .../base_test_class_number_two.php            |   0
 .../TestClasses/base_test_long_class.php      |   0
 .../autoload_files/basetest_autoload.php      |   0
 .../autoload_files/basetest_long_autoload.php |   0
 .../autoload_files/object_autoload.php        |   0
 .../tests/test_repository/object/object.php   |   0
 include/ezcomponents/ChangeLog                |   0
 include/ezcomponents/Graph/CREDITS            |   0
 include/ezcomponents/Graph/ChangeLog          |   0
 include/ezcomponents/Graph/DESCRIPTION        |   0
 .../Graph/design/class_diagram.png            | Bin
 include/ezcomponents/Graph/design/design.txt  |   0
 .../enhancements/interactive_data_points.txt  |   0
 .../design/enhancements/multiple_axis.txt     |   0
 .../Graph/design/requirements.txt             |   0
 .../requirements/interactive_data_points.txt  |   0
 .../design/requirements/multiple_axis.txt     |   0
 .../Graph/docs/examples/ez_green.php          |   0
 .../Graph/docs/examples/ez_red.php            |   0
 .../Graph/docs/examples/forum_evolution.php   |   0
 .../Graph/docs/examples/forum_month.php       |   0
 .../Graph/docs/examples/forum_weekly.php      |   0
 .../Graph/docs/examples/forum_year.php        |   0
 .../Graph/docs/examples/php_magazine.php      |   0
 .../Graph/docs/examples/wikipedia.php         |   0
 .../docs/img/tutorial_axis_datetime.svg.png   | Bin
 .../docs/img/tutorial_axis_labeled.svg.png    | Bin
 .../docs/img/tutorial_axis_numeric.svg.png    | Bin
 .../Graph/docs/img/tutorial_bar_chart.svg.png | Bin
 .../docs/img/tutorial_bar_chart_3d.svg.png    | Bin
 .../img/tutorial_bar_chart_options.svg.png    | Bin
 .../docs/img/tutorial_bar_line_chart.svg.png  | Bin
 .../docs/img/tutorial_bar_options.svg.png     | Bin
 .../img/tutorial_chart_background.svg.png     | Bin
 .../docs/img/tutorial_chart_legend.svg.png    | Bin
 .../docs/img/tutorial_chart_title.svg.png     | Bin
 .../img/tutorial_complex_radar_chart.svg.png  | Bin
 .../tutorial_custom_odometer_chart.svg.png    | Bin
 .../docs/img/tutorial_custom_palette.svg.png  | Bin
 .../docs/img/tutorial_dataset_average.svg.png | Bin
 .../docs/img/tutorial_dataset_numeric.svg.png | Bin
 .../Graph/docs/img/tutorial_driver_flash.swf  | Bin
 .../Graph/docs/img/tutorial_driver_gd.jpg     | Bin
 .../docs/img/tutorial_driver_svg.svg.png      | Bin
 .../docs/img/tutorial_legend_options.svg.png  | Bin
 .../docs/img/tutorial_line_chart.svg.png      | Bin
 .../docs/img/tutorial_line_chart_3d.svg.png   | Bin
 ...utorial_line_chart_additional_axis.svg.png | Bin
 .../img/tutorial_line_chart_markers.svg.png   | Bin
 .../img/tutorial_modified_palette.svg.png     | Bin
 .../docs/img/tutorial_odometer_chart.svg.png  | Bin
 .../docs/img/tutorial_pie_chart_3d.svg.png    | Bin
 .../img/tutorial_pie_chart_options.svg.png    | Bin
 .../img/tutorial_pie_chart_pimped.svg.png     | Bin
 .../docs/img/tutorial_pie_options.svg.png     | Bin
 .../docs/img/tutorial_radar_chart.svg.png     | Bin
 .../Graph/docs/img/tutorial_reference_gd.html |   0
 .../Graph/docs/img/tutorial_reference_gd.png  | Bin
 .../Graph/docs/img/tutorial_reference_svg.svg |   0
 .../docs/img/tutorial_renderer_3d.svg.png     | Bin
 .../docs/img/tutorial_rotated_labels.svg.png  | Bin
 .../docs/img/tutorial_simple_pie.svg.png      | Bin
 .../img/tutorial_stacked_bar_chart.svg.png    | Bin
 .../docs/img/tutorial_user_palette.svg.png    | Bin
 include/ezcomponents/Graph/docs/tutorial.txt  |   0
 .../ezcomponents/Graph/docs/tutorial/ez.png   | Bin
 .../Graph/docs/tutorial/template.svg          |   0
 .../Graph/docs/tutorial/tutorial_autoload.php |   0
 .../docs/tutorial/tutorial_axis_datetime.php  |   0
 .../docs/tutorial/tutorial_axis_labeled.php   |   0
 .../docs/tutorial/tutorial_axis_numeric.php   |   0
 .../docs/tutorial/tutorial_bar_chart.php      |   0
 .../docs/tutorial/tutorial_bar_chart_3d.php   |   0
 .../tutorial/tutorial_bar_chart_options.php   |   0
 .../docs/tutorial/tutorial_bar_line_chart.php |   0
 .../docs/tutorial/tutorial_bar_options.php    |   0
 .../tutorial/tutorial_chart_background.php    |   0
 .../docs/tutorial/tutorial_chart_legend.php   |   0
 .../docs/tutorial/tutorial_chart_title.php    |   0
 .../tutorial/tutorial_complex_radar_chart.php |   0
 .../tutorial_custom_odometer_chart.php        |   0
 .../docs/tutorial/tutorial_custom_palette.php |   0
 .../tutorial_custom_palette_palette.php       |   0
 .../tutorial/tutorial_dataset_average.php     |   0
 .../tutorial/tutorial_dataset_numeric.php     |   0
 .../docs/tutorial/tutorial_driver_cairo.php   |   0
 .../docs/tutorial/tutorial_driver_flash.php   |   0
 .../docs/tutorial/tutorial_driver_gd.php      |   0
 .../docs/tutorial/tutorial_driver_svg.php     |   0
 .../Graph/docs/tutorial/tutorial_font.fdb     | Bin
 .../Graph/docs/tutorial/tutorial_font.pfb     | Bin
 .../Graph/docs/tutorial/tutorial_font.ttf     | Bin
 .../docs/tutorial/tutorial_legend_options.php |   0
 .../docs/tutorial/tutorial_line_chart.php     |   0
 .../docs/tutorial/tutorial_line_chart_3d.php  |   0
 .../tutorial_line_chart_additional_axis.php   |   0
 .../tutorial/tutorial_line_chart_markers.php  |   0
 .../tutorial/tutorial_modified_palette.php    |   0
 .../docs/tutorial/tutorial_odometer_chart.php |   0
 .../Graph/docs/tutorial/tutorial_output.php   |   0
 .../docs/tutorial/tutorial_pie_chart_3d.php   |   0
 .../tutorial/tutorial_pie_chart_options.php   |   0
 .../tutorial/tutorial_pie_chart_pimped.php    |   0
 .../docs/tutorial/tutorial_pie_options.php    |   0
 .../docs/tutorial/tutorial_radar_chart.php    |   0
 .../docs/tutorial/tutorial_reference_gd.php   |   0
 .../docs/tutorial/tutorial_reference_svg.php  |   0
 .../docs/tutorial/tutorial_renderer_3d.php    |   0
 .../docs/tutorial/tutorial_rotated_labels.php |   0
 .../docs/tutorial/tutorial_simple_pie.php     |   0
 .../tutorial/tutorial_stacked_bar_chart.php   |   0
 .../docs/tutorial/tutorial_user_palette.php   |   0
 .../docs/tutorial/tutorial_wikipedia_data.php |   0
 .../ezcomponents/Graph/src/axis/container.php |   0
 include/ezcomponents/Graph/src/axis/date.php  |   0
 .../ezcomponents/Graph/src/axis/labeled.php   |   0
 .../Graph/src/axis/logarithmic.php            |   0
 .../ezcomponents/Graph/src/axis/numeric.php   |   0
 include/ezcomponents/Graph/src/charts/bar.php |   0
 .../ezcomponents/Graph/src/charts/line.php    |   0
 .../Graph/src/charts/odometer.php             |   0
 include/ezcomponents/Graph/src/charts/pie.php |   0
 .../ezcomponents/Graph/src/charts/radar.php   |   0
 .../ezcomponents/Graph/src/colors/color.php   |   0
 .../Graph/src/colors/linear_gradient.php      |   0
 .../Graph/src/colors/radial_gradient.php      |   0
 .../Graph/src/data_container/base.php         |   0
 .../Graph/src/data_container/single.php       |   0
 .../ezcomponents/Graph/src/datasets/array.php |   0
 .../Graph/src/datasets/average.php            |   0
 .../ezcomponents/Graph/src/datasets/base.php  |   0
 .../Graph/src/datasets/numeric.php            |   0
 .../Graph/src/datasets/property/axis.php      |   0
 .../Graph/src/datasets/property/boolean.php   |   0
 .../Graph/src/datasets/property/color.php     |   0
 .../Graph/src/datasets/property/integer.php   |   0
 .../Graph/src/datasets/property/string.php    |   0
 .../ezcomponents/Graph/src/driver/cairo.php   |   0
 .../ezcomponents/Graph/src/driver/flash.php   |   0
 include/ezcomponents/Graph/src/driver/gd.php  |   0
 include/ezcomponents/Graph/src/driver/svg.php |   0
 .../Graph/src/driver/svg_font.php             |   0
 .../ezcomponents/Graph/src/driver/verbose.php |   0
 .../ezcomponents/Graph/src/element/axis.php   |   0
 .../Graph/src/element/background.php          |   0
 .../ezcomponents/Graph/src/element/legend.php |   0
 .../ezcomponents/Graph/src/element/text.php   |   0
 .../Graph/src/exceptions/date_parsing.php     |   0
 .../Graph/src/exceptions/exception.php        |   0
 .../src/exceptions/flash_bitmap_type.php      |   0
 .../Graph/src/exceptions/font_rendering.php   |   0
 .../Graph/src/exceptions/font_type.php        |   0
 .../src/exceptions/incompatible_driver.php    |   0
 .../src/exceptions/invalid_assignement.php    |   0
 .../Graph/src/exceptions/invalid_data.php     |   0
 .../src/exceptions/invalid_data_source.php    |   0
 .../src/exceptions/invalid_dimensions.php     |   0
 .../src/exceptions/invalid_display_type.php   |   0
 .../Graph/src/exceptions/invalid_id.php       |   0
 .../src/exceptions/invalid_image_file.php     |   0
 .../Graph/src/exceptions/invalid_keys.php     |   0
 .../Graph/src/exceptions/no_data.php          |   0
 .../Graph/src/exceptions/no_such_data.php     |   0
 .../Graph/src/exceptions/no_such_dataset.php  |   0
 .../Graph/src/exceptions/no_such_element.php  |   0
 .../Graph/src/exceptions/not_rendered.php     |   0
 .../Graph/src/exceptions/out_of_boundings.php |   0
 .../out_of_logarithmical_boundings.php        |   0
 .../src/exceptions/reducement_failed.php      |   0
 .../src/exceptions/too_many_datasets.php      |   0
 .../exceptions/unknown_color_definition.php   |   0
 .../Graph/src/exceptions/unregular_steps.php  |   0
 .../src/exceptions/unsupported_image_type.php |   0
 include/ezcomponents/Graph/src/graph.php      |   0
 .../src/interfaces/axis_label_renderer.php    |   0
 .../Graph/src/interfaces/chart.php            |   0
 .../Graph/src/interfaces/dataset_property.php |   0
 .../Graph/src/interfaces/driver.php           |   0
 .../Graph/src/interfaces/element.php          |   0
 .../src/interfaces/odometer_renderer.php      |   0
 .../Graph/src/interfaces/palette.php          |   0
 .../Graph/src/interfaces/radar_renderer.php   |   0
 .../Graph/src/interfaces/renderer.php         |   0
 .../src/interfaces/stacked_bar_renderer.php   |   0
 .../ezcomponents/Graph/src/math/boundings.php |   0
 .../ezcomponents/Graph/src/math/matrix.php    |   0
 .../ezcomponents/Graph/src/math/polynom.php   |   0
 .../ezcomponents/Graph/src/math/rotation.php  |   0
 .../Graph/src/math/transformation.php         |   0
 .../Graph/src/math/translation.php            |   0
 .../ezcomponents/Graph/src/math/vector.php    |   0
 .../Graph/src/options/cairo_driver.php        |   0
 .../ezcomponents/Graph/src/options/chart.php  |   0
 .../ezcomponents/Graph/src/options/driver.php |   0
 .../Graph/src/options/flash_driver.php        |   0
 .../ezcomponents/Graph/src/options/font.php   |   0
 .../Graph/src/options/gd_driver.php           |   0
 .../Graph/src/options/line_chart.php          |   0
 .../Graph/src/options/odometer_chart.php      |   0
 .../Graph/src/options/pie_chart.php           |   0
 .../Graph/src/options/radar_chart.php         |   0
 .../Graph/src/options/renderer.php            |   0
 .../Graph/src/options/renderer_2d.php         |   0
 .../Graph/src/options/renderer_3d.php         |   0
 .../Graph/src/options/svg_driver.php          |   0
 .../ezcomponents/Graph/src/palette/black.php  |   0
 include/ezcomponents/Graph/src/palette/ez.php |   0
 .../Graph/src/palette/ez_blue.php             |   0
 .../Graph/src/palette/ez_green.php            |   0
 .../ezcomponents/Graph/src/palette/ez_red.php |   0
 .../ezcomponents/Graph/src/palette/tango.php  |   0
 .../ezcomponents/Graph/src/renderer/2d.php    |   0
 .../ezcomponents/Graph/src/renderer/3d.php    |   0
 .../Graph/src/renderer/axis_label_boxed.php   |   0
 .../src/renderer/axis_label_centered.php      |   0
 .../Graph/src/renderer/axis_label_exact.php   |   0
 .../Graph/src/renderer/axis_label_none.php    |   0
 .../Graph/src/renderer/axis_label_radar.php   |   0
 .../Graph/src/renderer/axis_label_rotated.php |   0
 .../Graph/src/structs/context.php             |   0
 .../Graph/src/structs/coordinate.php          |   0
 .../ezcomponents/Graph/src/structs/step.php   |   0
 include/ezcomponents/Graph/src/tools.php      |   0
 .../ezcomponents/GraphDatabaseTiein/CREDITS   |   0
 .../ezcomponents/GraphDatabaseTiein/ChangeLog |   0
 include/ezcomponents/GraphDatabaseTiein/DEPS  |   0
 .../GraphDatabaseTiein/DESCRIPTION            |   0
 include/ezcomponents/GraphDatabaseTiein/TODO  |   0
 .../design/class_diagram.png                  | Bin
 .../GraphDatabaseTiein/design/design.txt      |   0
 .../docs/img/tutorial_multiple.svg.png        | Bin
 .../docs/img/tutorial_simple.svg.png          | Bin
 .../docs/img/tutorial_single.svg.png          | Bin
 .../GraphDatabaseTiein/docs/tutorial.txt      |   0
 .../docs/tutorial/tutorial_autoload.php       |   0
 .../docs/tutorial/tutorial_insert_data.php    |   0
 .../docs/tutorial/tutorial_multiple.php       |   0
 .../docs/tutorial/tutorial_simple.php         |   0
 .../docs/tutorial/tutorial_single.php         |   0
 .../GraphDatabaseTiein/src/dataset.php        |   0
 .../src/exceptions/exception.php              |   0
 .../src/exceptions/missing_column.php         |   0
 .../src/exceptions/statement_not_executed.php |   0
 .../src/exceptions/too_many_columns.php       |   0
 .../tests/dataset_pdo_test.php                |   0
 .../GraphDatabaseTiein/tests/suite.php        |   0
 include/ezcomponents/ImageAnalysis/CREDITS    |   0
 include/ezcomponents/ImageAnalysis/ChangeLog  |   0
 .../ezcomponents/ImageAnalysis/DESCRIPTION    |   0
 .../ImageAnalysis/design/class_diagram.png    | Bin
 .../ImageAnalysis/design/imageanalysis.png    | Bin
 .../ImageAnalysis/design/imageanalysis.xml    |   0
 .../ImageAnalysis/docs/example.php            |   0
 .../docs/img/imageanalysis_example_01.jpg     | Bin
 .../docs/img/imageanalysis_example_02.jpg     | Bin
 .../docs/img/imageanalysis_example_03.jpg     | Bin
 .../ezcomponents/ImageAnalysis/docs/toby.jpg  | Bin
 .../ImageAnalysis/docs/tutorial.txt           |   0
 .../ImageAnalysis/docs/tutorial_autoload.php  |   0
 .../docs/tutorial_example_01.php              |   0
 .../docs/tutorial_example_02.php              |   0
 .../docs/tutorial_example_03.php              |   0
 .../ImageAnalysis/src/analyzer.php            |   0
 .../src/exceptions/exception.php              |   0
 .../src/exceptions/file_not_processable.php   |   0
 .../src/exceptions/invalid_handler.php        |   0
 .../src/handlers/imagemagick.php              |   0
 .../ImageAnalysis/src/handlers/php.php        |   0
 .../ImageAnalysis/src/interfaces/handler.php  |   0
 .../src/structs/analyzer_data.php             |   0
 .../ImageAnalysis/tests/analyzer_test.php     |   0
 .../ImageAnalysis/tests/data/gif_animated.gif | Bin
 .../tests/data/gif_nonanimated.gif            | Bin
 .../ImageAnalysis/tests/data/jpeg_exif.jpg    | Bin
 .../ImageAnalysis/tests/data/jpeg_noexif.jpg  | Bin
 .../tests/data/png_nonanimated.png            | Bin
 .../ImageAnalysis/tests/data/svg.svg          |   0
 .../ImageAnalysis/tests/data/tiff_exif.tiff   | Bin
 .../ImageAnalysis/tests/data/tiff_noexif.tiff | Bin
 .../ImageAnalysis/tests/suite.php             |   0
 include/ezcomponents/ImageConversion/CREDITS  |   0
 .../ezcomponents/ImageConversion/ChangeLog    |   0
 include/ezcomponents/ImageConversion/DEPS     |   0
 .../ezcomponents/ImageConversion/DESCRIPTION  |   0
 include/ezcomponents/ImageConversion/TODO     |   0
 .../ImageConversion/design/class_diagram.png  | Bin
 .../ImageConversion/design/design.htm         |   0
 .../ImageConversion/design/design.txt         |   0
 .../ImageConversion/design/image.png          | Bin
 .../ImageConversion/design/image.xml          |   0
 .../design/image_exceptions.png               | Bin
 .../ImageConversion/design/image_filters.png  | Bin
 .../ImageConversion/docs/example_general.php  |   0
 .../docs/example_singleton.php                |   0
 .../img/imageconversion_example_01_after.jpg  | Bin
 .../img/imageconversion_example_01_before.bmp | Bin
 .../img/imageconversion_example_02_after.jpg  | Bin
 .../img/imageconversion_example_02_before.jpg | Bin
 .../img/imageconversion_example_03_after.jpg  | Bin
 .../img/imageconversion_example_03_before.jpg | Bin
 .../img/imageconversion_example_04_after.jpg  | Bin
 .../img/imageconversion_example_04_before.jpg | Bin
 .../img/imageconversion_example_05_after.jpg  | Bin
 .../img/imageconversion_example_05_before.jpg | Bin
 .../ImageConversion/docs/img/watermark.png    | Bin
 .../ImageConversion/docs/jpeg.jpg             | Bin
 .../ImageConversion/docs/tutorial.txt         |   0
 .../docs/tutorial_autoload.php                |   0
 .../tutorial_example_01_simpleconvert.php     |   0
 .../docs/tutorial_example_02_simpletrans.php  |   0
 .../docs/tutorial_example_03_complextrans.php |   0
 .../docs/tutorial_example_04_watermark.php    |   0
 .../docs/tutorial_example_05_thumbnail.php    |   0
 .../ImageConversion/review-1.3.4.txt          |   0
 .../ImageConversion/src/converter.php         |   0
 .../src/exceptions/exception.php              |   0
 .../src/exceptions/file_name_invalid.php      |   0
 .../src/exceptions/file_not_processable.php   |   0
 .../src/exceptions/filter_failed.php          |   0
 .../src/exceptions/filter_not_available.php   |   0
 .../src/exceptions/handler_not_available.php  |   0
 .../exceptions/handler_settings_invalid.php   |   0
 .../exceptions/invalid_filter_parameter.php   |   0
 .../src/exceptions/invalid_reference.php      |   0
 .../src/exceptions/mime_type_unsupported.php  |   0
 .../exceptions/missing_filter_parameter.php   |   0
 .../src/exceptions/transformation.php         |   0
 .../transformation_already_exists.php         |   0
 .../transformation_not_available.php          |   0
 .../ImageConversion/src/handlers/gd.php       |   0
 .../ImageConversion/src/handlers/gd_base.php  |   0
 .../src/handlers/imagemagick.php              |   0
 .../src/handlers/imagemagick_base.php         |   0
 .../src/interfaces/colorspace.php             |   0
 .../ImageConversion/src/interfaces/effect.php |   0
 .../src/interfaces/geometry.php               |   0
 .../src/interfaces/handler.php                |   0
 .../src/interfaces/methodcall_handler.php     |   0
 .../src/interfaces/thumbnail.php              |   0
 .../src/interfaces/watermark.php              |   0
 .../src/options/save_options.php              |   0
 .../src/structs/converter_settings.php        |   0
 .../ImageConversion/src/structs/filter.php    |   0
 .../src/structs/handler_settings.php          |   0
 .../ImageConversion/src/transformation.php    |   0
 .../ImageConversion/tests/converter_test.php  |   0
 ...erterTest_testApplyFilterSuccessColorspace | Bin
 ...ApplyFilterSuccessColorspaceDefinedHandler | Bin
 ...nConverterTest_testApplyFilterSuccessScale | Bin
 ...ConversionFiltersGdTest_testColorspaceGrey | Bin
 ...sionFiltersGdTest_testColorspaceMonochrome | Bin
 ...onversionFiltersGdTest_testColorspaceSepia | Bin
 ...sionFiltersGdTest_testCropNegativeOffset_1 | Bin
 ...sionFiltersGdTest_testCropNegativeOffset_2 | Bin
 ...sionFiltersGdTest_testCropNegativeOffset_3 | Bin
 ...nFiltersGdTest_testCropThumbnailHorizontal | Bin
 ...ionFiltersGdTest_testCropThumbnailVertical | Bin
 ...onversionFiltersGdTest_testCropTransparent | Bin
 ...eConversionFiltersGdTest_testCrop_0_Offset | Bin
 ...ezcImageConversionFiltersGdTest_testCrop_1 | Bin
 ...ezcImageConversionFiltersGdTest_testCrop_2 | Bin
 ...ezcImageConversionFiltersGdTest_testCrop_3 | Bin
 ...ezcImageConversionFiltersGdTest_testCrop_4 | Bin
 ...nFiltersGdTest_testFillThumbnailHorizontal | Bin
 ...GdTest_testFillThumbnailTooLargeColorArray | Bin
 ...ionFiltersGdTest_testFillThumbnailVertical | Bin
 ...nversionFiltersGdTest_testScaleTransparent | Bin
 ...FiltersGdTest_testWatermarkAbsoluteNoScale | Bin
 ...onFiltersGdTest_testWatermarkAbsoluteScale | Bin
 ...nFiltersGdTest_testWatermarkPercentNoScale | Bin
 ...ionFiltersGdTest_testWatermarkPercentScale | Bin
 ...ageConversionFiltersShellTest_testBorder_2 | Bin
 ...ageConversionFiltersShellTest_testBorder_5 | Bin
 ...versionFiltersShellTest_testColorspaceGrey | Bin
 ...nFiltersShellTest_testColorspaceMonochrome | Bin
 ...ersionFiltersShellTest_testColorspaceSepia | Bin
 ...nFiltersShellTest_testCropNegativeOffset_1 | Bin
 ...nFiltersShellTest_testCropNegativeOffset_2 | Bin
 ...nFiltersShellTest_testCropNegativeOffset_3 | Bin
 ...ltersShellTest_testCropThumbnailHorizontal | Bin
 ...FiltersShellTest_testCropThumbnailVertical | Bin
 ...nversionFiltersShellTest_testCrop_0_Offset | Bin
 ...ImageConversionFiltersShellTest_testCrop_1 | Bin
 ...ImageConversionFiltersShellTest_testCrop_2 | Bin
 ...ImageConversionFiltersShellTest_testCrop_3 | Bin
 ...ltersShellTest_testFillThumbnailHorizontal | Bin
 ...llTest_testFillThumbnailTooLargeColorArray | Bin
 ...FiltersShellTest_testFillThumbnailVertical | Bin
 ...nversionFiltersShellTest_testNoiseGaussian | Bin
 ...onversionFiltersShellTest_testNoiseImpulse | Bin
 ...versionFiltersShellTest_testNoiseLaplacian | Bin
 ...onFiltersShellTest_testNoiseMultiplicative | Bin
 ...onversionFiltersShellTest_testNoisePoisson | Bin
 ...onversionFiltersShellTest_testNoiseUniform | Bin
 ...cImageConversionFiltersShellTest_testScale | Bin
 ...onversionFiltersShellTest_testScaleDown_do | Bin
 ...versionFiltersShellTest_testScaleDown_dont | Bin
 ...onversionFiltersShellTest_testScaleExact_1 | Bin
 ...onversionFiltersShellTest_testScaleExact_2 | Bin
 ...onversionFiltersShellTest_testScaleExact_3 | Bin
 ...sionFiltersShellTest_testScaleHeightDown_1 | Bin
 ...sionFiltersShellTest_testScaleHeightDown_2 | Bin
 ...ersionFiltersShellTest_testScaleHeightUp_1 | Bin
 ...ersionFiltersShellTest_testScaleHeightUp_2 | Bin
 ...versionFiltersShellTest_testScalePercent_1 | Bin
 ...versionFiltersShellTest_testScalePercent_2 | Bin
 ...eConversionFiltersShellTest_testScaleUp_do | Bin
 ...onversionFiltersShellTest_testScaleUp_dont | Bin
 ...versionFiltersShellTest_testScaleWidthBoth | Bin
 ...rsionFiltersShellTest_testScaleWidthDown_1 | Bin
 ...rsionFiltersShellTest_testScaleWidthDown_2 | Bin
 ...versionFiltersShellTest_testScaleWidthUp_1 | Bin
 ...versionFiltersShellTest_testScaleWidthUp_2 | Bin
 ...ageConversionFiltersShellTest_testSwirl_10 | Bin
 ...geConversionFiltersShellTest_testSwirl_100 | Bin
 ...ageConversionFiltersShellTest_testSwirl_50 | Bin
 ...tersShellTest_testWatermarkAbsoluteNoScale | Bin
 ...iltersShellTest_testWatermarkAbsoluteScale | Bin
 ...ltersShellTest_testWatermarkPercentNoScale | Bin
 ...FiltersShellTest_testWatermarkPercentScale | Bin
 ...rsionHandlerGdTest_testApplyFilterMultiple | Bin
 ...versionHandlerGdTest_testApplyFilterSingle | Bin
 ...dTest_testConvertTransparentNonTransparent | Bin
 ...ersionHandlerGdTest_testSaveNewfileConvert | Bin
 ...sionHandlerGdTest_testSaveNewfileNoconvert | Bin
 ...sionHandlerGdTest_testSaveOldfileNoconvert | Bin
 ...onHandlerShellTest_testApplyFilterMultiple | Bin
 ...sionHandlerShellTest_testApplyFilterSingle | Bin
 ...lTest_testConvertTransparentNonTransparent | Bin
 ...HandlerTest_testSaveIllegalFileNameFailure | Bin
 ...nversionHandlerTest_testSaveNewfileConvert | Bin
 ...ersionHandlerTest_testSaveNewfileNoconvert | Bin
 ...ersionHandlerTest_testSaveOldfileNoconvert | Bin
 ...nTransformationTest_testMultiTransformjpeg | Bin
 ...onTransformationTest_testMultiTransformpng | Bin
 ...mationTest_testTransformSuccessGifAnimated | Bin
 ...ansformationTest_testTransformSuccessGif_1 | Bin
 ...ansformationTest_testTransformSuccessGif_2 | Bin
 ...ansformationTest_testTransformSuccessGif_3 | Bin
 ...nsformationTest_testTransformSuccessJpeg_1 | Bin
 ...nsformationTest_testTransformSuccessJpeg_2 | Bin
 ...nsformationTest_testTransformSuccessJpeg_3 | Bin
 ...ansformationTest_testTransformSuccessPng_1 | Bin
 ...ansformationTest_testTransformSuccessPng_2 | Bin
 ...ansformationTest_testTransformSuccessPng_3 | Bin
 ...ansformationTest_testTransformSuccessPng_4 | Bin
 ...stTransformationChangingHandlersForFilters | Bin
 .../tests/data/gif_animated.gif               | Bin
 .../tests/data/gif_nonanimated.gif            | Bin
 .../ImageConversion/tests/data/jpeg.jpg       | Bin
 .../ImageConversion/tests/data/png.png        | Bin
 .../tests/data/png_transparent.png            | Bin
 .../ImageConversion/tests/data/text.txt       |   0
 .../ImageConversion/tests/data/watermark.png  | Bin
 .../ImageConversion/tests/data/xpm.xpm        |   0
 .../ImageConversion/tests/filtersgd_test.php  |   0
 .../tests/filtersshell_test.php               |   0
 .../ImageConversion/tests/handler_test.php    |   0
 .../ImageConversion/tests/handlergd_test.php  |   0
 .../tests/handlershell_test.php               |   0
 .../tests/save_options_test.php               |   0
 .../ImageConversion/tests/suite.php           |   0
 .../ImageConversion/tests/test_case.php       |   0
 .../tests/transformation_test.php             |   0
 include/ezcomponents/LICENSE                  |   0
 .../autoload/archive_autoload.php             |   0
 .../autoload/authentication_autoload.php      |   0
 .../authentication_database_autoload.php      |   0
 .../authentication_openid_autoload.php        |   0
 .../ezcomponents/autoload/base_autoload.php   |   0
 .../ezcomponents/autoload/cache_autoload.php  |   0
 .../autoload/configuration_autoload.php       |   0
 .../autoload/console_autoload.php             |   0
 include/ezcomponents/autoload/db_autoload.php |   0
 .../autoload/db_schema_autoload.php           |   0
 .../ezcomponents/autoload/debug_autoload.php  |   0
 .../autoload/document_autoload.php            |   0
 .../autoload/execution_autoload.php           |   0
 .../ezcomponents/autoload/feed_autoload.php   |   0
 .../ezcomponents/autoload/file_autoload.php   |   0
 .../ezcomponents/autoload/graph_autoload.php  |   0
 .../autoload/graph_database_autoload.php      |   0
 .../autoload/image_analyzer_autoload.php      |   0
 .../ezcomponents/autoload/image_autoload.php  |   0
 .../ezcomponents/autoload/input_autoload.php  |   0
 .../ezcomponents/autoload/log_autoload.php    |   0
 .../autoload/log_database_autoload.php        |   0
 .../ezcomponents/autoload/mail_autoload.php   |   0
 .../autoload/persistent_autoload.php          |   0
 .../autoload/persistent_object_autoload.php   |   0
 .../autoload/php_generator_autoload.php       |   0
 .../ezcomponents/autoload/query_autoload.php  |   0
 .../ezcomponents/autoload/search_autoload.php |   0
 .../ezcomponents/autoload/signal_autoload.php |   0
 .../ezcomponents/autoload/system_autoload.php |   0
 .../autoload/template_autoload.php            |   0
 .../template_translation_autoload.php         |   0
 .../autoload/translation_autoload.php         |   0
 .../autoload/translation_cache_autoload.php   |   0
 .../ezcomponents/autoload/tree_autoload.php   |   0
 .../autoload/tree_db_autoload.php             |   0
 .../autoload/tree_persistent_autoload.php     |   0
 .../ezcomponents/autoload/url_autoload.php    |   0
 .../ezcomponents/autoload/webdav_autoload.php |   0
 .../autoload/workflow_autoload.php            |   0
 .../autoload/workflow_database_autoload.php   |   0
 .../autoload/workflow_event_autoload.php      |   0
 .../autoload/workflow_signal_autoload.php     |   0
 include/ezcomponents/descriptions.txt         |   0
 include/fachbereich.class.php                 |   0
 include/feedback.class.php                    |   0
 include/ferien.class.php                      |   0
 include/filter.class.php                      |   0
 include/firma.class.php                       |   0
 .../fonts/glyphicons-halflings-regular.eot    | Bin
 .../fonts/glyphicons-halflings-regular.svg    |   0
 .../fonts/glyphicons-halflings-regular.ttf    | Bin
 .../fonts/glyphicons-halflings-regular.woff   | Bin
 include/fotostatus.class.php                  |   0
 include/frage.class.php                       |   0
 include/freebusy.class.php                    |   0
 include/functions.inc.php                     |   0
 include/funktion.class.php                    |   0
 include/gantt.class.php                       |   0
 include/gebiet.class.php                      |   0
 include/gemeinde.class.php                    |   0
 include/geschaeftsjahr.class.php              |   0
 include/geschlecht.class.php                  |   0
 include/globals.inc.php                       |   0
 include/gruppe.class.php                      |   0
 include/gruppemanager.class.php               |   0
 include/gsprogramm.class.php                  |   0
 include/ical.class.php                        |   0
 include/index.html                            |   0
 include/infoscreen.class.php                  |   0
 include/jahresplan.class.php                  |   0
 include/js/JSONeditor/JSONeditor.html         |   0
 include/js/JSONeditor/JSONeditor.js           |   0
 .../js/JSONeditor/treeBuilderImages/Thumbs.db | Bin
 .../js/JSONeditor/treeBuilderImages/doc.gif   | Bin
 .../JSONeditor/treeBuilderImages/docNode.gif  | Bin
 .../treeBuilderImages/docNodeLast.gif         | Bin
 .../treeBuilderImages/docNodeLastFirst.gif    | Bin
 .../JSONeditor/treeBuilderImages/folder.gif   | Bin
 .../treeBuilderImages/folderNode.gif          | Bin
 .../treeBuilderImages/folderNodeFirst.gif     | Bin
 .../treeBuilderImages/folderNodeLast.gif      | Bin
 .../treeBuilderImages/folderNodeLastFirst.gif | Bin
 .../treeBuilderImages/folderNodeOpen.gif      | Bin
 .../treeBuilderImages/folderNodeOpenFirst.gif | Bin
 .../treeBuilderImages/folderNodeOpenLast.gif  | Bin
 .../folderNodeOpenLastFirst.gif               | Bin
 .../treeBuilderImages/folderOpen.gif          | Bin
 .../JSONeditor/treeBuilderImages/vertLine.gif | Bin
 include/js/colorpicker.js                     |   0
 include/js/cropper.js                         |   0
 include/js/croppie.js                         |   0
 include/js/datecheck.js                       |   0
 include/js/fullcalendar/fullcalendar.css      |   0
 include/js/fullcalendar/fullcalendar.js       |   0
 include/js/fullcalendar/fullcalendar.min.js   |   0
 .../js/fullcalendar/fullcalendar.print.css    |   0
 include/js/fullcalendar/gcal.js               |   0
 include/js/jqSOAPClient.js                    |   0
 include/js/jqXMLUtils.js                      |   0
 include/js/jquery.contextmenu.r2.js           |   0
 include/js/jquery.js                          |   0
 .../js/jquery.ui.datepicker.translation.js    |   0
 include/js/jstree/README.txt                  |   0
 include/js/jstree/_docs/!style.css            |   0
 include/js/jstree/_docs/_drive.png            | Bin
 include/js/jstree/_docs/_html_data.html       |   0
 include/js/jstree/_docs/_json_data.json       |   0
 include/js/jstree/_docs/_search_data.json     |   0
 include/js/jstree/_docs/_search_result.json   |   0
 include/js/jstree/_docs/_xml_flat.xml         |   0
 include/js/jstree/_docs/_xml_nest.xml         |   0
 include/js/jstree/_docs/checkbox.html         |   0
 include/js/jstree/_docs/contextmenu.html      |   0
 include/js/jstree/_docs/cookies.html          |   0
 include/js/jstree/_docs/core.html             |   0
 include/js/jstree/_docs/crrm.html             |   0
 include/js/jstree/_docs/dnd.html              |   0
 include/js/jstree/_docs/hotkeys.html          |   0
 include/js/jstree/_docs/html_data.html        |   0
 include/js/jstree/_docs/index.html            |   0
 include/js/jstree/_docs/json_data.html        |   0
 include/js/jstree/_docs/languages.html        |   0
 include/js/jstree/_docs/logo.png              | Bin
 include/js/jstree/_docs/search.html           |   0
 include/js/jstree/_docs/sort.html             |   0
 include/js/jstree/_docs/syntax/!script.js     |   0
 include/js/jstree/_docs/syntax/!style.css     |   0
 include/js/jstree/_docs/syntax/clipboard.swf  | Bin
 include/js/jstree/_docs/syntax/help.png       | Bin
 include/js/jstree/_docs/syntax/magnifier.png  | Bin
 .../jstree/_docs/syntax/page_white_code.png   | Bin
 .../jstree/_docs/syntax/page_white_copy.png   | Bin
 include/js/jstree/_docs/syntax/printer.png    | Bin
 include/js/jstree/_docs/syntax/wrapping.png   | Bin
 include/js/jstree/_docs/themeroller.html      |   0
 include/js/jstree/_docs/themes.html           |   0
 include/js/jstree/_docs/types.html            |   0
 include/js/jstree/_docs/ui.html               |   0
 include/js/jstree/_docs/unique.html           |   0
 include/js/jstree/_docs/xml_data.html         |   0
 include/js/jstree/_lib/jquery.cookie.js       |   0
 include/js/jstree/_lib/jquery.hotkeys.js      |   0
 include/js/jstree/_lib/jquery.js              |   0
 include/js/jstree/icons/lehrveranstaltung.png | Bin
 include/js/jstree/icons/modul.png             | Bin
 include/js/jstree/jquery.jstree.js            |   0
 include/js/jstree/themes/apple/bg.jpg         | Bin
 include/js/jstree/themes/apple/d.png          | Bin
 include/js/jstree/themes/apple/dot_for_ie.gif | Bin
 include/js/jstree/themes/apple/style.css      |   0
 include/js/jstree/themes/apple/throbber.gif   | Bin
 include/js/jstree/themes/classic/d.gif        | Bin
 include/js/jstree/themes/classic/d.png        | Bin
 .../js/jstree/themes/classic/dot_for_ie.gif   | Bin
 include/js/jstree/themes/classic/style.css    |   0
 include/js/jstree/themes/classic/throbber.gif | Bin
 include/js/jstree/themes/default-rtl/d.gif    | Bin
 include/js/jstree/themes/default-rtl/d.png    | Bin
 include/js/jstree/themes/default-rtl/dots.gif | Bin
 .../js/jstree/themes/default-rtl/style.css    |   0
 .../js/jstree/themes/default-rtl/throbber.gif | Bin
 include/js/jstree/themes/default/d.gif        | Bin
 include/js/jstree/themes/default/d.png        | Bin
 include/js/jstree/themes/default/style.css    |   0
 include/js/jstree/themes/default/throbber.gif | Bin
 include/js/mailcheck.js                       |   0
 include/js/tablesort/icons/01_ascending.gif   | Bin
 include/js/tablesort/icons/01_descending.gif  | Bin
 include/js/tablesort/icons/01_unsorted.gif    | Bin
 include/js/tablesort/table.css                |   0
 include/js/tablesort/table.js                 |   0
 include/js/treeGrid/.gitignore                |   0
 include/js/treeGrid/CHANGELOG.txt             |   0
 include/js/treeGrid/LICENSE                   |   0
 include/js/treeGrid/README.md                 |   0
 include/js/treeGrid/css/jquery.treegrid.css   |   0
 .../css/bootstrap-responsive.css              |   0
 .../css/bootstrap-responsive.min.css          |   0
 .../bootstrap-2.3.2/css/bootstrap.css         |   0
 .../bootstrap-2.3.2/css/bootstrap.min.css     |   0
 .../img/glyphicons-halflings-white.png        | Bin
 .../img/glyphicons-halflings.png              | Bin
 .../examples/bootstrap-2.3.2/js/bootstrap.js  |   0
 .../bootstrap-2.3.2/js/bootstrap.min.js       |   0
 .../bootstrap-3.0.0/css/bootstrap-theme.css   |   0
 .../css/bootstrap-theme.min.css               |   0
 .../bootstrap-3.0.0/css/bootstrap.css         |   0
 .../bootstrap-3.0.0/css/bootstrap.min.css     |   0
 .../fonts/glyphicons-halflings-regular.eot    | Bin
 .../fonts/glyphicons-halflings-regular.svg    |   0
 .../fonts/glyphicons-halflings-regular.ttf    | Bin
 .../fonts/glyphicons-halflings-regular.woff   | Bin
 .../examples/bootstrap-3.0.0/js/bootstrap.js  |   0
 .../bootstrap-3.0.0/js/bootstrap.min.js       |   0
 .../js/treeGrid/examples/example-basic.html   |   0
 .../examples/example-bootstrap-2.html         |   0
 .../examples/example-bootstrap-3.html         |   0
 .../js/treeGrid/examples/example-column.html  |   0
 .../treeGrid/examples/example-save-state.html |   0
 include/js/treeGrid/img/collapse.png          | Bin
 include/js/treeGrid/img/expand.png            | Bin
 include/js/treeGrid/img/file.png              | Bin
 include/js/treeGrid/img/folder.png            | Bin
 include/js/treeGrid/index.html                |   0
 include/js/treeGrid/js/jquery-1.10.2.js       |   0
 include/js/treeGrid/js/jquery.cookie.js       |   0
 .../treeGrid/js/jquery.treegrid.bootstrap2.js |   0
 .../treeGrid/js/jquery.treegrid.bootstrap3.js |   0
 include/js/treeGrid/js/jquery.treegrid.js     |   0
 include/js/treeGrid/jstreegrid.js             |   0
 include/js/treeGrid/params.json               |   0
 include/js/treeGrid/styles.css                |   0
 include/js/treeGrid/test.html                 |   0
 include/js/treeGrid/tests/qunit-1.12.0.css    |   0
 include/js/treeGrid/tests/qunit-1.12.0.js     |   0
 include/js/treeGrid/tests/tests.js            |   0
 include/js/treeGrid/treegrid.jquery.json      |   0
 include/kontakt.class.php                     |   0
 include/konto.class.php                       |   0
 include/legesamtnote.class.php                |   0
 include/lehre_tools.class.php                 |   0
 include/lehreinheit.class.php                 |   0
 include/lehreinheitgruppe.class.php           |   0
 include/lehreinheitmitarbeiter.class.php      |   0
 include/lehrelisthelper.class.php             |   0
 include/lehrfach.class.php                    |   0
 include/lehrform.class.php                    |   0
 include/lehrfunktion.class.php                |   0
 include/lehrmodus.class.php                   |   0
 include/lehrstunde.class.php                  |   0
 include/lehrtyp.class.php                     |   0
 include/lehrveranstaltung.class.php           |   0
 include/lehrverband.class.php                 |   0
 include/log.class.php                         |   0
 include/lvangebot.class.php                   |   0
 include/lvgesamtnote.class.php                |   0
 include/lvinfo.class.php                      |   0
 include/lvregel.class.php                     |   0
 include/mail.class.php                        |   0
 include/mantis.class.php                      |   0
 include/meta/angular-tablesorter.php          |   0
 include/meta/angular.php                      |   0
 include/meta/easyui.php                       |   0
 include/meta/jquery-tablesorter.php           |   0
 include/meta/jquery.php                       |   0
 include/meta/js_utils.php                     |   0
 include/meta/jsoneditor.php                   |   0
 include/meta/php_utils.php                    |   0
 include/mitarbeiter.class.php                 |   0
 include/mobilitaet.class.php                  |   0
 include/mobilitaetsprogramm.class.php         |   0
 include/nation.class.php                      |   0
 include/nationengruppe.class.php              |   0
 include/news.class.php                        |   0
 include/note.class.php                        |   0
 include/notenschluessel.class.php             |   0
 include/notiz.class.php                       |   0
 include/organisationseinheit.class.php        |   0
 include/organisationsform.class.php           |   0
 include/ort.class.php                         |   0
 include/ortraumtyp.class.php                  |   0
 include/pdf.class.php                         |   0
 include/pdf.inc.php                           |   0
 include/pdf/FAQ.htm                           |   0
 include/pdf/doc/acceptpagebreak.htm           |   0
 include/pdf/doc/addfont.htm                   |   0
 include/pdf/doc/addlink.htm                   |   0
 include/pdf/doc/addpage.htm                   |   0
 include/pdf/doc/aliasnbpages.htm              |   0
 include/pdf/doc/cell.htm                      |   0
 include/pdf/doc/close.htm                     |   0
 include/pdf/doc/error.htm                     |   0
 include/pdf/doc/footer.htm                    |   0
 include/pdf/doc/fpdf.htm                      |   0
 include/pdf/doc/getstringwidth.htm            |   0
 include/pdf/doc/getx.htm                      |   0
 include/pdf/doc/gety.htm                      |   0
 include/pdf/doc/header.htm                    |   0
 include/pdf/doc/image.htm                     |   0
 include/pdf/doc/index.htm                     |   0
 include/pdf/doc/line.htm                      |   0
 include/pdf/doc/link.htm                      |   0
 include/pdf/doc/ln.htm                        |   0
 include/pdf/doc/multicell.htm                 |   0
 include/pdf/doc/open.htm                      |   0
 include/pdf/doc/output.htm                    |   0
 include/pdf/doc/pageno.htm                    |   0
 include/pdf/doc/rect.htm                      |   0
 include/pdf/doc/setauthor.htm                 |   0
 include/pdf/doc/setautopagebreak.htm          |   0
 include/pdf/doc/setcompression.htm            |   0
 include/pdf/doc/setcreator.htm                |   0
 include/pdf/doc/setdisplaymode.htm            |   0
 include/pdf/doc/setdrawcolor.htm              |   0
 include/pdf/doc/setfillcolor.htm              |   0
 include/pdf/doc/setfont.htm                   |   0
 include/pdf/doc/setfontsize.htm               |   0
 include/pdf/doc/setkeywords.htm               |   0
 include/pdf/doc/setleftmargin.htm             |   0
 include/pdf/doc/setlinewidth.htm              |   0
 include/pdf/doc/setlink.htm                   |   0
 include/pdf/doc/setmargins.htm                |   0
 include/pdf/doc/setrightmargin.htm            |   0
 include/pdf/doc/setsubject.htm                |   0
 include/pdf/doc/settextcolor.htm              |   0
 include/pdf/doc/settitle.htm                  |   0
 include/pdf/doc/settopmargin.htm              |   0
 include/pdf/doc/setx.htm                      |   0
 include/pdf/doc/setxy.htm                     |   0
 include/pdf/doc/sety.htm                      |   0
 include/pdf/doc/text.htm                      |   0
 include/pdf/doc/write.htm                     |   0
 include/pdf/font/courier.php                  |   0
 include/pdf/font/helvetica.php                |   0
 include/pdf/font/helveticab.php               |   0
 include/pdf/font/helveticabi.php              |   0
 include/pdf/font/helveticai.php               |   0
 include/pdf/font/makefont/cp1250.map          |   0
 include/pdf/font/makefont/cp1251.map          |   0
 include/pdf/font/makefont/cp1252.map          |   0
 include/pdf/font/makefont/cp1253.map          |   0
 include/pdf/font/makefont/cp1254.map          |   0
 include/pdf/font/makefont/cp1255.map          |   0
 include/pdf/font/makefont/cp1257.map          |   0
 include/pdf/font/makefont/cp1258.map          |   0
 include/pdf/font/makefont/cp874.map           |   0
 include/pdf/font/makefont/iso-8859-1.map      |   0
 include/pdf/font/makefont/iso-8859-11.map     |   0
 include/pdf/font/makefont/iso-8859-15.map     |   0
 include/pdf/font/makefont/iso-8859-16.map     |   0
 include/pdf/font/makefont/iso-8859-2.map      |   0
 include/pdf/font/makefont/iso-8859-4.map      |   0
 include/pdf/font/makefont/iso-8859-5.map      |   0
 include/pdf/font/makefont/iso-8859-7.map      |   0
 include/pdf/font/makefont/iso-8859-9.map      |   0
 include/pdf/font/makefont/koi8-r.map          |   0
 include/pdf/font/makefont/koi8-u.map          |   0
 include/pdf/font/makefont/makefont.php        |   0
 include/pdf/font/symbol.php                   |   0
 include/pdf/font/times.php                    |   0
 include/pdf/font/timesb.php                   |   0
 include/pdf/font/timesbi.php                  |   0
 include/pdf/font/timesi.php                   |   0
 include/pdf/font/zapfdingbats.php             |   0
 include/pdf/fpdf.css                          |   0
 include/pdf/fpdf.php                          |   0
 include/pdf/histo.htm                         |   0
 include/pdf/install.txt                       |   0
 include/person.class.php                      |   0
 include/personlog.class.php                   |   0
 include/pgsql.class.php                       |   0
 include/phrasen.class.php                     |   0
 include/preincoming.class.php                 |   0
 include/preinteressent.class.php              |   0
 include/preoutgoing.class.php                 |   0
 include/prestudent.class.php                  |   0
 include/process.class.php                     |   0
 include/projekt.class.php                     |   0
 include/projektarbeit.class.php               |   0
 include/projektbenutzer.class.php             |   0
 include/projektbetreuer.class.php             |   0
 include/projektphase.class.php                |   0
 include/projekttask.class.php                 |   0
 include/pruefling.class.php                   |   0
 include/pruefung.class.php                    |   0
 include/pruefungCis.class.php                 |   0
 include/pruefungsanmeldung.class.php          |   0
 include/pruefungsfenster.class.php            |   0
 include/pruefungstermin.class.php             |   0
 include/raumtyp.class.php                     |   0
 include/rdf.class.php                         |   0
 include/reihungstest.class.php                |   0
 include/reservierung.class.php                |   0
 include/ressource.class.php                   |   0
 include/rueckstellung.class.php               |   0
 include/sabredav/ChangeLog                    |   0
 include/sabredav/LICENSE                      |   0
 include/sabredav/README.md                    |   0
 include/sabredav/bin/build.php                |   0
 include/sabredav/bin/googlecode_upload.py     |   0
 include/sabredav/bin/migrateto17.php          |   0
 include/sabredav/bin/naturalselection.py      |   0
 include/sabredav/bin/sabredav                 |   0
 include/sabredav/bin/sabredav.php             |   0
 include/sabredav/bin/vobjectvalidate.php      |   0
 include/sabredav/composer.json                |   0
 include/sabredav/composer.lock                |   0
 .../sabredav/examples/addressbookserver.php   |   0
 include/sabredav/examples/basicauth.php       |   0
 include/sabredav/examples/calendarserver.php  |   0
 include/sabredav/examples/digestauth.php      |   0
 include/sabredav/examples/fileserver.php      |   0
 include/sabredav/examples/groupwareserver.php |   0
 include/sabredav/examples/simplefsserver.php  |   0
 .../examples/sql/mysql.addressbook.sql        |   0
 .../sabredav/examples/sql/mysql.calendars.sql |   0
 include/sabredav/examples/sql/mysql.locks.sql |   0
 .../examples/sql/mysql.principals.sql         |   0
 include/sabredav/examples/sql/mysql.users.sql |   0
 .../examples/sql/pgsql.addressbook.sql        |   0
 .../sabredav/examples/sql/pgsql.calendars.sql |   0
 include/sabredav/examples/sql/pgsql.locks.sql |   0
 .../examples/sql/pgsql.principals.sql         |   0
 include/sabredav/examples/sql/pgsql.users.sql |   0
 .../examples/sql/sqlite.addressbooks.sql      |   0
 .../examples/sql/sqlite.calendars.sql         |   0
 .../sabredav/examples/sql/sqlite.locks.sql    |   0
 .../examples/sql/sqlite.principals.sql        |   0
 .../sabredav/examples/sql/sqlite.users.sql    |   0
 .../examples/webserver/apache2_htaccess.conf  |   0
 .../examples/webserver/apache2_vhost.conf     |   0
 .../examples/webserver/apache2_vhost_cgi.conf |   0
 .../Sabre/CalDAV/Backend/AbstractBackend.php  |   0
 .../Sabre/CalDAV/Backend/BackendInterface.php |   0
 .../CalDAV/Backend/NotificationSupport.php    |   0
 .../sabredav/lib/Sabre/CalDAV/Backend/PDO.php |   0
 .../Sabre/CalDAV/Backend/SharingSupport.php   |   0
 .../sabredav/lib/Sabre/CalDAV/Calendar.php    |   0
 .../lib/Sabre/CalDAV/CalendarObject.php       |   0
 .../lib/Sabre/CalDAV/CalendarQueryParser.php  |   0
 .../Sabre/CalDAV/CalendarQueryValidator.php   |   0
 .../lib/Sabre/CalDAV/CalendarRootNode.php     |   0
 .../CalDAV/Exception/InvalidComponentType.php |   0
 .../lib/Sabre/CalDAV/ICSExportPlugin.php      |   0
 .../sabredav/lib/Sabre/CalDAV/ICalendar.php   |   0
 .../lib/Sabre/CalDAV/ICalendarObject.php      |   0
 .../lib/Sabre/CalDAV/IShareableCalendar.php   |   0
 .../lib/Sabre/CalDAV/ISharedCalendar.php      |   0
 .../Sabre/CalDAV/Notifications/Collection.php |   0
 .../CalDAV/Notifications/ICollection.php      |   0
 .../lib/Sabre/CalDAV/Notifications/INode.php  |   0
 .../Notifications/INotificationType.php       |   0
 .../lib/Sabre/CalDAV/Notifications/Node.php   |   0
 .../Notifications/Notification/Invite.php     |   0
 .../Notification/InviteReply.php              |   0
 .../Notification/SystemStatus.php             |   0
 include/sabredav/lib/Sabre/CalDAV/Plugin.php  |   0
 .../lib/Sabre/CalDAV/Principal/Collection.php |   0
 .../lib/Sabre/CalDAV/Principal/IProxyRead.php |   0
 .../Sabre/CalDAV/Principal/IProxyWrite.php    |   0
 .../lib/Sabre/CalDAV/Principal/ProxyRead.php  |   0
 .../lib/Sabre/CalDAV/Principal/ProxyWrite.php |   0
 .../lib/Sabre/CalDAV/Principal/User.php       |   0
 .../CalDAV/Property/AllowedSharingModes.php   |   0
 .../lib/Sabre/CalDAV/Property/Invite.php      |   0
 .../Property/ScheduleCalendarTransp.php       |   0
 .../SupportedCalendarComponentSet.php         |   0
 .../CalDAV/Property/SupportedCalendarData.php |   0
 .../CalDAV/Property/SupportedCollationSet.php |   0
 .../lib/Sabre/CalDAV/Schedule/IMip.php        |   0
 .../lib/Sabre/CalDAV/Schedule/IOutbox.php     |   0
 .../lib/Sabre/CalDAV/Schedule/Outbox.php      |   0
 .../lib/Sabre/CalDAV/ShareableCalendar.php    |   0
 .../lib/Sabre/CalDAV/SharedCalendar.php       |   0
 .../lib/Sabre/CalDAV/SharingPlugin.php        |   0
 .../lib/Sabre/CalDAV/UserCalendars.php        |   0
 include/sabredav/lib/Sabre/CalDAV/Version.php |   0
 .../lib/Sabre/CardDAV/AddressBook.php         |   0
 .../Sabre/CardDAV/AddressBookQueryParser.php  |   0
 .../lib/Sabre/CardDAV/AddressBookRoot.php     |   0
 .../Sabre/CardDAV/Backend/AbstractBackend.php |   0
 .../CardDAV/Backend/BackendInterface.php      |   0
 .../lib/Sabre/CardDAV/Backend/PDO.php         |   0
 include/sabredav/lib/Sabre/CardDAV/Card.php   |   0
 .../lib/Sabre/CardDAV/IAddressBook.php        |   0
 include/sabredav/lib/Sabre/CardDAV/ICard.php  |   0
 .../sabredav/lib/Sabre/CardDAV/IDirectory.php |   0
 include/sabredav/lib/Sabre/CardDAV/Plugin.php |   0
 .../CardDAV/Property/SupportedAddressData.php |   0
 .../lib/Sabre/CardDAV/UserAddressBooks.php    |   0
 .../lib/Sabre/CardDAV/VCFExportPlugin.php     |   0
 .../sabredav/lib/Sabre/CardDAV/Version.php    |   0
 .../Sabre/DAV/Auth/Backend/AbstractBasic.php  |   0
 .../Sabre/DAV/Auth/Backend/AbstractDigest.php |   0
 .../lib/Sabre/DAV/Auth/Backend/Apache.php     |   0
 .../DAV/Auth/Backend/BackendInterface.php     |   0
 .../lib/Sabre/DAV/Auth/Backend/File.php       |   0
 .../lib/Sabre/DAV/Auth/Backend/PDO.php        |   0
 .../sabredav/lib/Sabre/DAV/Auth/Plugin.php    |   0
 .../Sabre/DAV/Browser/GuessContentType.php    |   0
 .../Sabre/DAV/Browser/MapGetToPropFind.php    |   0
 .../sabredav/lib/Sabre/DAV/Browser/Plugin.php |   0
 .../lib/Sabre/DAV/Browser/assets/favicon.ico  | Bin
 .../DAV/Browser/assets/icons/addressbook.png  | Bin
 .../DAV/Browser/assets/icons/calendar.png     | Bin
 .../Sabre/DAV/Browser/assets/icons/card.png   | Bin
 .../DAV/Browser/assets/icons/collection.png   | Bin
 .../Sabre/DAV/Browser/assets/icons/file.png   | Bin
 .../Sabre/DAV/Browser/assets/icons/parent.png | Bin
 .../DAV/Browser/assets/icons/principal.png    | Bin
 include/sabredav/lib/Sabre/DAV/Client.php     |   0
 include/sabredav/lib/Sabre/DAV/Collection.php |   0
 include/sabredav/lib/Sabre/DAV/Exception.php  |   0
 .../lib/Sabre/DAV/Exception/BadRequest.php    |   0
 .../lib/Sabre/DAV/Exception/Conflict.php      |   0
 .../Sabre/DAV/Exception/ConflictingLock.php   |   0
 .../lib/Sabre/DAV/Exception/FileNotFound.php  |   0
 .../lib/Sabre/DAV/Exception/Forbidden.php     |   0
 .../DAV/Exception/InsufficientStorage.php     |   0
 .../DAV/Exception/InvalidResourceType.php     |   0
 .../Sabre/DAV/Exception/LengthRequired.php    |   0
 .../Exception/LockTokenMatchesRequestUri.php  |   0
 .../lib/Sabre/DAV/Exception/Locked.php        |   0
 .../Sabre/DAV/Exception/MethodNotAllowed.php  |   0
 .../Sabre/DAV/Exception/NotAuthenticated.php  |   0
 .../lib/Sabre/DAV/Exception/NotFound.php      |   0
 .../Sabre/DAV/Exception/NotImplemented.php    |   0
 .../Sabre/DAV/Exception/PaymentRequired.php   |   0
 .../DAV/Exception/PreconditionFailed.php      |   0
 .../DAV/Exception/ReportNotSupported.php      |   0
 .../RequestedRangeNotSatisfiable.php          |   0
 .../DAV/Exception/ServiceUnavailable.php      |   0
 .../DAV/Exception/UnsupportedMediaType.php    |   0
 .../sabredav/lib/Sabre/DAV/FS/Directory.php   |   0
 include/sabredav/lib/Sabre/DAV/FS/File.php    |   0
 include/sabredav/lib/Sabre/DAV/FS/Node.php    |   0
 .../lib/Sabre/DAV/FSExt/Directory.php         |   0
 include/sabredav/lib/Sabre/DAV/FSExt/File.php |   0
 include/sabredav/lib/Sabre/DAV/FSExt/Node.php |   0
 include/sabredav/lib/Sabre/DAV/File.php       |   0
 .../sabredav/lib/Sabre/DAV/ICollection.php    |   0
 .../lib/Sabre/DAV/IExtendedCollection.php     |   0
 include/sabredav/lib/Sabre/DAV/IFile.php      |   0
 include/sabredav/lib/Sabre/DAV/INode.php      |   0
 .../sabredav/lib/Sabre/DAV/IProperties.php    |   0
 include/sabredav/lib/Sabre/DAV/IQuota.php     |   0
 .../DAV/Locks/Backend/AbstractBackend.php     |   0
 .../DAV/Locks/Backend/BackendInterface.php    |   0
 .../lib/Sabre/DAV/Locks/Backend/FS.php        |   0
 .../lib/Sabre/DAV/Locks/Backend/File.php      |   0
 .../lib/Sabre/DAV/Locks/Backend/PDO.php       |   0
 .../sabredav/lib/Sabre/DAV/Locks/LockInfo.php |   0
 .../sabredav/lib/Sabre/DAV/Locks/Plugin.php   |   0
 .../sabredav/lib/Sabre/DAV/Mount/Plugin.php   |   0
 include/sabredav/lib/Sabre/DAV/Node.php       |   0
 include/sabredav/lib/Sabre/DAV/ObjectTree.php |   0
 .../lib/Sabre/DAV/PartialUpdate/IFile.php     |   0
 .../Sabre/DAV/PartialUpdate/IPatchSupport.php |   0
 .../lib/Sabre/DAV/PartialUpdate/Plugin.php    |   0
 include/sabredav/lib/Sabre/DAV/Property.php   |   0
 .../Sabre/DAV/Property/GetLastModified.php    |   0
 .../sabredav/lib/Sabre/DAV/Property/Href.php  |   0
 .../lib/Sabre/DAV/Property/HrefList.php       |   0
 .../sabredav/lib/Sabre/DAV/Property/IHref.php |   0
 .../lib/Sabre/DAV/Property/LockDiscovery.php  |   0
 .../lib/Sabre/DAV/Property/ResourceType.php   |   0
 .../lib/Sabre/DAV/Property/Response.php       |   0
 .../lib/Sabre/DAV/Property/ResponseList.php   |   0
 .../lib/Sabre/DAV/Property/SupportedLock.php  |   0
 .../Sabre/DAV/Property/SupportedReportSet.php |   0
 .../lib/Sabre/DAV/PropertyInterface.php       |   0
 include/sabredav/lib/Sabre/DAV/Server.php     |   0
 .../sabredav/lib/Sabre/DAV/ServerPlugin.php   |   0
 .../lib/Sabre/DAV/SimpleCollection.php        |   0
 include/sabredav/lib/Sabre/DAV/SimpleFile.php |   0
 include/sabredav/lib/Sabre/DAV/StringUtil.php |   0
 .../Sabre/DAV/TemporaryFileFilterPlugin.php   |   0
 include/sabredav/lib/Sabre/DAV/Tree.php       |   0
 .../lib/Sabre/DAV/Tree/Filesystem.php         |   0
 include/sabredav/lib/Sabre/DAV/URLUtil.php    |   0
 include/sabredav/lib/Sabre/DAV/UUIDUtil.php   |   0
 include/sabredav/lib/Sabre/DAV/Version.php    |   0
 include/sabredav/lib/Sabre/DAV/XMLUtil.php    |   0
 .../DAVACL/AbstractPrincipalCollection.php    |   0
 .../Sabre/DAVACL/Exception/AceConflict.php    |   0
 .../Sabre/DAVACL/Exception/NeedPrivileges.php |   0
 .../lib/Sabre/DAVACL/Exception/NoAbstract.php |   0
 .../Exception/NotRecognizedPrincipal.php      |   0
 .../Exception/NotSupportedPrivilege.php       |   0
 include/sabredav/lib/Sabre/DAVACL/IACL.php    |   0
 .../sabredav/lib/Sabre/DAVACL/IPrincipal.php  |   0
 .../lib/Sabre/DAVACL/IPrincipalCollection.php |   0
 include/sabredav/lib/Sabre/DAVACL/Plugin.php  |   0
 .../sabredav/lib/Sabre/DAVACL/Principal.php   |   0
 .../PrincipalBackend/AbstractBackend.php      |   0
 .../PrincipalBackend/BackendInterface.php     |   0
 .../lib/Sabre/DAVACL/PrincipalBackend/PDO.php |   0
 .../lib/Sabre/DAVACL/PrincipalCollection.php  |   0
 .../lib/Sabre/DAVACL/Property/Acl.php         |   0
 .../Sabre/DAVACL/Property/AclRestrictions.php |   0
 .../Property/CurrentUserPrivilegeSet.php      |   0
 .../lib/Sabre/DAVACL/Property/Principal.php   |   0
 .../DAVACL/Property/SupportedPrivilegeSet.php |   0
 include/sabredav/lib/Sabre/DAVACL/Version.php |   0
 include/sabredav/lib/Sabre/HTTP/AWSAuth.php   |   0
 .../sabredav/lib/Sabre/HTTP/AbstractAuth.php  |   0
 include/sabredav/lib/Sabre/HTTP/BasicAuth.php |   0
 .../sabredav/lib/Sabre/HTTP/DigestAuth.php    |   0
 include/sabredav/lib/Sabre/HTTP/Request.php   |   0
 include/sabredav/lib/Sabre/HTTP/Response.php  |   0
 include/sabredav/lib/Sabre/HTTP/Util.php      |   0
 include/sabredav/lib/Sabre/HTTP/Version.php   |   0
 include/sabredav/lib/Sabre/autoload.php       |   0
 .../Sabre/CalDAV/Backend/AbstractPDOTest.php  |   0
 .../Sabre/CalDAV/Backend/AbstractTest.php     |   0
 .../tests/Sabre/CalDAV/Backend/Mock.php       |   0
 .../Sabre/CalDAV/Backend/PDOMySQLTest.php     |   0
 .../Sabre/CalDAV/Backend/PDOSqliteTest.php    |   0
 .../tests/Sabre/CalDAV/CalendarObjectTest.php |   0
 .../Sabre/CalDAV/CalendarQueryParserTest.php  |   0
 .../Sabre/CalDAV/CalendarQueryVAlarmTest.php  |   0
 .../CalDAV/CalendarQueryValidatorTest.php     |   0
 .../tests/Sabre/CalDAV/CalendarTest.php       |   0
 .../ExpandEventsDTSTARTandDTENDTest.php       |   0
 .../ExpandEventsDTSTARTandDTENDbyDayTest.php  |   0
 .../CalDAV/ExpandEventsDoubleEventsTest.php   |   0
 .../tests/Sabre/CalDAV/FreeBusyReportTest.php |   0
 .../Sabre/CalDAV/FreeBusyRequestTest.php      |   0
 .../Sabre/CalDAV/GetEventsByTimerangeTest.php |   0
 .../Sabre/CalDAV/ICSExportPluginTest.php      |   0
 .../tests/Sabre/CalDAV/Issue166Test.php       |   0
 .../tests/Sabre/CalDAV/Issue172Test.php       |   0
 .../tests/Sabre/CalDAV/Issue203Test.php       |   0
 .../tests/Sabre/CalDAV/Issue205Test.php       |   0
 .../tests/Sabre/CalDAV/Issue211Test.php       |   0
 .../tests/Sabre/CalDAV/Issue220Test.php       |   0
 .../tests/Sabre/CalDAV/Issue228Test.php       |   0
 .../CalDAV/Notifications/CollectionTest.php   |   0
 .../Sabre/CalDAV/Notifications/NodeTest.php   |   0
 .../Notification/InviteReplyTest.php          |   0
 .../Notifications/Notification/InviteTest.php |   0
 .../Notification/SystemStatusTest.php         |   0
 .../tests/Sabre/CalDAV/OutboxPostTest.php     |   0
 .../tests/Sabre/CalDAV/PluginTest.php         |   0
 .../Sabre/CalDAV/Principal/CollectionTest.php |   0
 .../Sabre/CalDAV/Principal/ProxyReadTest.php  |   0
 .../Sabre/CalDAV/Principal/ProxyWriteTest.php |   0
 .../tests/Sabre/CalDAV/Principal/UserTest.php |   0
 .../Property/AllowedSharingModesTest.php      |   0
 .../Sabre/CalDAV/Property/InviteTest.php      |   0
 .../Property/ScheduleCalendarTranspTest.php   |   0
 .../SupportedCalendarComponentSetTest.php     |   0
 .../Property/SupportedCalendarDataTest.php    |   0
 .../Property/SupportedCollationSetTest.php    |   0
 .../tests/Sabre/CalDAV/Schedule/IMip/Mock.php |   0
 .../Sabre/CalDAV/Schedule/OutboxTest.php      |   0
 .../Sabre/CalDAV/ShareableCalendarTest.php    |   0
 .../tests/Sabre/CalDAV/SharedCalendarTest.php |   0
 .../tests/Sabre/CalDAV/SharingPluginTest.php  |   0
 .../sabredav/tests/Sabre/CalDAV/TestUtil.php  |   0
 .../UserCalendarsSharedCalendarsTest.php      |   0
 .../tests/Sabre/CalDAV/UserCalendarsTest.php  |   0
 .../tests/Sabre/CalDAV/ValidateICalTest.php   |   0
 .../tests/Sabre/CalDAV/VersionTest.php        |   0
 .../Sabre/CardDAV/AbstractPluginTest.php      |   0
 .../CardDAV/AddressBookQueryParserTest.php    |   0
 .../Sabre/CardDAV/AddressBookQueryTest.php    |   0
 .../Sabre/CardDAV/AddressBookRootTest.php     |   0
 .../tests/Sabre/CardDAV/AddressBookTest.php   |   0
 .../Sabre/CardDAV/Backend/AbstractPDOTest.php |   0
 .../tests/Sabre/CardDAV/Backend/Mock.php      |   0
 .../Sabre/CardDAV/Backend/PDOMySQLTest.php    |   0
 .../Sabre/CardDAV/Backend/PDOSqliteTest.php   |   0
 .../sabredav/tests/Sabre/CardDAV/CardTest.php |   0
 .../tests/Sabre/CardDAV/IDirectoryTest.php    |   0
 .../tests/Sabre/CardDAV/MultiGetTest.php      |   0
 .../tests/Sabre/CardDAV/PluginTest.php        |   0
 .../Property/SupportedAddressDataTest.php     |   0
 .../CardDAV/SogoStripContentTypeTest.php      |   0
 .../sabredav/tests/Sabre/CardDAV/TestUtil.php |   0
 .../Sabre/CardDAV/UserAddressBooksTest.php    |   0
 .../tests/Sabre/CardDAV/VCFExportTest.php     |   0
 .../Sabre/CardDAV/ValidateFilterTest.php      |   0
 .../tests/Sabre/CardDAV/ValidateVCardTest.php |   0
 .../tests/Sabre/CardDAV/VersionTest.php       |   0
 .../tests/Sabre/DAV/AbstractServer.php        |   0
 .../DAV/Auth/Backend/AbstractBasicTest.php    |   0
 .../DAV/Auth/Backend/AbstractDigestTest.php   |   0
 .../DAV/Auth/Backend/AbstractPDOTest.php      |   0
 .../Sabre/DAV/Auth/Backend/ApacheTest.php     |   0
 .../tests/Sabre/DAV/Auth/Backend/FileTest.php |   0
 .../tests/Sabre/DAV/Auth/Backend/Mock.php     |   0
 .../Sabre/DAV/Auth/Backend/PDOMySQLTest.php   |   0
 .../Sabre/DAV/Auth/Backend/PDOSqliteTest.php  |   0
 .../tests/Sabre/DAV/Auth/PluginTest.php       |   0
 .../tests/Sabre/DAV/BasicNodeTest.php         |   0
 .../DAV/Browser/GuessContentTypeTest.php      |   0
 .../DAV/Browser/MapGetToPropFindTest.php      |   0
 .../tests/Sabre/DAV/Browser/PluginTest.php    |   0
 .../sabredav/tests/Sabre/DAV/ClientMock.php   |   0
 .../sabredav/tests/Sabre/DAV/ClientTest.php   |   0
 .../tests/Sabre/DAV/Exception/LockedTest.php  |   0
 .../DAV/Exception/PaymentRequiredTest.php     |   0
 .../tests/Sabre/DAV/ExceptionTest.php         |   0
 .../tests/Sabre/DAV/FSExt/FileTest.php        |   0
 .../tests/Sabre/DAV/FSExt/NodeTest.php        |   0
 .../tests/Sabre/DAV/FSExt/ServerTest.php      |   0
 .../tests/Sabre/DAV/HTTPPreferParsingTest.php |   0
 .../tests/Sabre/DAV/HttpDeleteTest.php        |   0
 .../sabredav/tests/Sabre/DAV/HttpPutTest.php  |   0
 .../sabredav/tests/Sabre/DAV/Issue33Test.php  |   0
 .../Sabre/DAV/Locks/Backend/AbstractTest.php  |   0
 .../tests/Sabre/DAV/Locks/Backend/FSTest.php  |   0
 .../Sabre/DAV/Locks/Backend/FileTest.php      |   0
 .../Sabre/DAV/Locks/Backend/PDOMySQLTest.php  |   0
 .../tests/Sabre/DAV/Locks/Backend/PDOTest.php |   0
 .../Sabre/DAV/Locks/GetIfConditionsTest.php   |   0
 .../tests/Sabre/DAV/Locks/MSWordTest.php      |   0
 .../tests/Sabre/DAV/Locks/PluginTest.php      |   0
 .../tests/Sabre/DAV/Mock/Collection.php       |   0
 .../sabredav/tests/Sabre/DAV/Mock/File.php    |   0
 .../tests/Sabre/DAV/Mount/PluginTest.php      |   0
 .../tests/Sabre/DAV/ObjectTreeTest.php        |   0
 .../Sabre/DAV/PartialUpdate/FileMock.php      |   0
 .../Sabre/DAV/PartialUpdate/PluginTest.php    |   0
 .../DAV/PartialUpdate/SpecificationTest.php   |   0
 .../DAV/Property/GetLastModifiedTest.php      |   0
 .../tests/Sabre/DAV/Property/HrefListTest.php |   0
 .../tests/Sabre/DAV/Property/HrefTest.php     |   0
 .../Sabre/DAV/Property/ResourceTypeTest.php   |   0
 .../Sabre/DAV/Property/ResponseListTest.php   |   0
 .../tests/Sabre/DAV/Property/ResponseTest.php |   0
 .../DAV/Property/SupportedReportSetTest.php   |   0
 .../tests/Sabre/DAV/ServerCopyMoveTest.php    |   0
 .../tests/Sabre/DAV/ServerEventsTest.php      |   0
 .../tests/Sabre/DAV/ServerMKCOLTest.php       |   0
 .../tests/Sabre/DAV/ServerPluginTest.php      |   0
 .../Sabre/DAV/ServerPreconditionTest.php      |   0
 .../tests/Sabre/DAV/ServerPropsTest.php       |   0
 .../tests/Sabre/DAV/ServerRangeTest.php       |   0
 .../tests/Sabre/DAV/ServerSimpleTest.php      |   0
 .../Sabre/DAV/ServerUpdatePropertiesTest.php  |   0
 .../tests/Sabre/DAV/SimpleFileTest.php        |   0
 .../tests/Sabre/DAV/StringUtilTest.php        |   0
 .../Sabre/DAV/TemporaryFileFilterTest.php     |   0
 .../sabredav/tests/Sabre/DAV/TestPlugin.php   |   0
 .../tests/Sabre/DAV/Tree/FilesystemTest.php   |   0
 include/sabredav/tests/Sabre/DAV/TreeTest.php |   0
 .../sabredav/tests/Sabre/DAV/URLUtilTest.php  |   0
 .../sabredav/tests/Sabre/DAV/UUIDUtilTest.php |   0
 .../sabredav/tests/Sabre/DAV/XMLUtilTest.php  |   0
 .../tests/Sabre/DAVACL/ACLMethodTest.php      |   0
 .../tests/Sabre/DAVACL/AllowAccessTest.php    |   0
 .../tests/Sabre/DAVACL/BlockAccessTest.php    |   0
 .../DAVACL/Exception/AceConflictTest.php      |   0
 .../Exception/NeedPrivilegesExceptionTest.php |   0
 .../Sabre/DAVACL/Exception/NoAbstractTest.php |   0
 .../Exception/NotRecognizedPrincipalTest.php  |   0
 .../Exception/NotSupportedPrivilegeTest.php   |   0
 .../Sabre/DAVACL/ExpandPropertiesTest.php     |   0
 .../tests/Sabre/DAVACL/MockACLNode.php        |   0
 .../tests/Sabre/DAVACL/MockPrincipal.php      |   0
 .../tests/Sabre/DAVACL/PluginAdminTest.php    |   0
 .../Sabre/DAVACL/PluginPropertiesTest.php     |   0
 .../DAVACL/PluginUpdatePropertiesTest.php     |   0
 .../PrincipalBackend/AbstractPDOTest.php      |   0
 .../Sabre/DAVACL/PrincipalBackend/Mock.php    |   0
 .../DAVACL/PrincipalBackend/PDOMySQLTest.php  |   0
 .../DAVACL/PrincipalBackend/PDOSqliteTest.php |   0
 .../Sabre/DAVACL/PrincipalCollectionTest.php  |   0
 .../DAVACL/PrincipalPropertySearchTest.php    |   0
 .../DAVACL/PrincipalSearchPropertySetTest.php |   0
 .../tests/Sabre/DAVACL/PrincipalTest.php      |   0
 .../DAVACL/Property/ACLRestrictionsTest.php   |   0
 .../tests/Sabre/DAVACL/Property/ACLTest.php   |   0
 .../Property/CurrentUserPrivilegeSetTest.php  |   0
 .../Sabre/DAVACL/Property/PrincipalTest.php   |   0
 .../Property/SupportedPrivilegeSetTest.php    |   0
 .../tests/Sabre/DAVACL/SimplePluginTest.php   |   0
 .../tests/Sabre/DAVACL/VersionTest.php        |   0
 .../sabredav/tests/Sabre/DAVServerTest.php    |   0
 .../sabredav/tests/Sabre/HTTP/AWSAuthTest.php |   0
 .../tests/Sabre/HTTP/BasicAuthTest.php        |   0
 .../tests/Sabre/HTTP/DigestAuthTest.php       |   0
 .../sabredav/tests/Sabre/HTTP/RequestTest.php |   0
 .../tests/Sabre/HTTP/ResponseMock.php         |   0
 .../tests/Sabre/HTTP/ResponseTest.php         |   0
 .../sabredav/tests/Sabre/HTTP/UtilTest.php    |   0
 .../sabredav/tests/Sabre/HTTP/VersionTest.php |   0
 include/sabredav/tests/Sabre/TestUtil.php     |   0
 include/sabredav/tests/bootstrap.php          |   0
 include/sabredav/tests/composer.vobject3.json |   0
 include/sabredav/tests/phpunit.xml            |   0
 include/sabredav/vendor/autoload.php          |   0
 .../sabredav/vendor/composer/ClassLoader.php  |   0
 .../vendor/composer/autoload_classmap.php     |   0
 .../vendor/composer/autoload_namespaces.php   |   0
 .../vendor/composer/autoload_psr4.php         |   0
 .../vendor/composer/autoload_real.php         |   0
 .../sabredav/vendor/composer/installed.json   |   0
 .../sabredav/vendor/sabre/vobject/.gitignore  |   0
 .../sabredav/vendor/sabre/vobject/.travis.yml |   0
 .../sabredav/vendor/sabre/vobject/ChangeLog   |   0
 include/sabredav/vendor/sabre/vobject/LICENSE |   0
 .../sabredav/vendor/sabre/vobject/README.md   |   0
 .../vendor/sabre/vobject/bin/bench.php        |   0
 .../vobject/bin/generateicalendardata.php     |   0
 .../sabre/vobject/bin/vobjectvalidate.php     |   0
 .../vendor/sabre/vobject/composer.json        |   0
 .../vobject/lib/Sabre/VObject/Component.php   |   0
 .../lib/Sabre/VObject/Component/VAlarm.php    |   0
 .../lib/Sabre/VObject/Component/VCalendar.php |   0
 .../lib/Sabre/VObject/Component/VCard.php     |   0
 .../lib/Sabre/VObject/Component/VEvent.php    |   0
 .../lib/Sabre/VObject/Component/VFreeBusy.php |   0
 .../lib/Sabre/VObject/Component/VJournal.php  |   0
 .../lib/Sabre/VObject/Component/VTodo.php     |   0
 .../lib/Sabre/VObject/DateTimeParser.php      |   0
 .../vobject/lib/Sabre/VObject/Document.php    |   0
 .../vobject/lib/Sabre/VObject/ElementList.php |   0
 .../lib/Sabre/VObject/FreeBusyGenerator.php   |   0
 .../sabre/vobject/lib/Sabre/VObject/Node.php  |   0
 .../vobject/lib/Sabre/VObject/Parameter.php   |   0
 .../lib/Sabre/VObject/ParseException.php      |   0
 .../vobject/lib/Sabre/VObject/Property.php    |   0
 .../lib/Sabre/VObject/Property/Compound.php   |   0
 .../lib/Sabre/VObject/Property/DateTime.php   |   0
 .../Sabre/VObject/Property/MultiDateTime.php  |   0
 .../vobject/lib/Sabre/VObject/Reader.php      |   0
 .../lib/Sabre/VObject/RecurrenceIterator.php  |   0
 .../lib/Sabre/VObject/Splitter/ICalendar.php  |   0
 .../VObject/Splitter/SplitterInterface.php    |   0
 .../lib/Sabre/VObject/Splitter/VCard.php      |   0
 .../vobject/lib/Sabre/VObject/StringUtil.php  |   0
 .../lib/Sabre/VObject/TimeZoneUtil.php        |   0
 .../vobject/lib/Sabre/VObject/Version.php     |   0
 .../vobject/lib/Sabre/VObject/includes.php    |   0
 .../Sabre/VObject/Component/VAlarmTest.php    |   0
 .../Sabre/VObject/Component/VCalendarTest.php |   0
 .../Sabre/VObject/Component/VCardTest.php     |   0
 .../Sabre/VObject/Component/VEventTest.php    |   0
 .../Sabre/VObject/Component/VFreeBusyTest.php |   0
 .../Sabre/VObject/Component/VJournalTest.php  |   0
 .../Sabre/VObject/Component/VTodoTest.php     |   0
 .../tests/Sabre/VObject/ComponentTest.php     |   0
 .../Sabre/VObject/DateTimeParserTest.php      |   0
 .../tests/Sabre/VObject/DocumentTest.php      |   0
 .../tests/Sabre/VObject/ElementListTest.php   |   0
 .../tests/Sabre/VObject/EmClientTest.php      |   0
 .../Sabre/VObject/FreeBusyGeneratorTest.php   |   0
 .../tests/Sabre/VObject/Issue153Test.php      |   0
 .../tests/Sabre/VObject/Issue154Test.php      |   0
 .../tests/Sabre/VObject/Issue48Test.php       |   0
 .../tests/Sabre/VObject/Issue50Test.php       |   0
 .../tests/Sabre/VObject/ParameterTest.php     |   0
 .../Sabre/VObject/Property/CompoundTest.php   |   0
 .../Sabre/VObject/Property/DateTimeTest.php   |   0
 .../VObject/Property/MultiDateTimeTest.php    |   0
 .../tests/Sabre/VObject/PropertyTest.php      |   0
 .../tests/Sabre/VObject/ReaderTest.php        |   0
 ...urrenceIteratorFifthTuesdayProblemTest.php |   0
 .../RecurrenceIteratorIncorrectExpandTest.php |   0
 ...urrenceIteratorInfiniteLoopProblemTest.php |   0
 .../RecurrenceIteratorMinusOneProblemTest.php |   0
 ...ecurrenceIteratorMissingOverriddenTest.php |   0
 .../Sabre/VObject/RecurrenceIteratorTest.php  |   0
 .../tests/Sabre/VObject/SlashRTest.php        |   0
 .../Sabre/VObject/Splitter/ICalendarTest.php  |   0
 .../Sabre/VObject/Splitter/VCardTest.php      |   0
 .../tests/Sabre/VObject/StringUtilTest.php    |   0
 .../tests/Sabre/VObject/TimeZoneUtilTest.php  |   0
 .../tests/Sabre/VObject/VersionTest.php       |   0
 .../vobject/tests/Sabre/VObject/issue153.vcf  |   0
 .../vendor/sabre/vobject/tests/bootstrap.php  |   0
 .../vendor/sabre/vobject/tests/phpunit.xml    |   0
 include/sancho.inc.php                        |   0
 include/schluesseltyp.class.php               |   0
 include/securimage/AHGBold.ttf                | Bin
 include/securimage/LICENSE.txt                |   0
 include/securimage/README.FONT.txt            |   0
 include/securimage/README.txt                 |   0
 include/securimage/WavFile.php                |   0
 include/securimage/audio/en/0.wav             | Bin
 include/securimage/audio/en/1.wav             | Bin
 include/securimage/audio/en/10.wav            | Bin
 include/securimage/audio/en/11.wav            | Bin
 include/securimage/audio/en/12.wav            | Bin
 include/securimage/audio/en/13.wav            | Bin
 include/securimage/audio/en/14.wav            | Bin
 include/securimage/audio/en/15.wav            | Bin
 include/securimage/audio/en/16.wav            | Bin
 include/securimage/audio/en/17.wav            | Bin
 include/securimage/audio/en/18.wav            | Bin
 include/securimage/audio/en/19.wav            | Bin
 include/securimage/audio/en/2.wav             | Bin
 include/securimage/audio/en/20.wav            | Bin
 include/securimage/audio/en/3.wav             | Bin
 include/securimage/audio/en/4.wav             | Bin
 include/securimage/audio/en/5.wav             | Bin
 include/securimage/audio/en/6.wav             | Bin
 include/securimage/audio/en/7.wav             | Bin
 include/securimage/audio/en/8.wav             | Bin
 include/securimage/audio/en/9.wav             | Bin
 include/securimage/audio/en/A.wav             | Bin
 include/securimage/audio/en/B.wav             | Bin
 include/securimage/audio/en/C.wav             | Bin
 include/securimage/audio/en/D.wav             | Bin
 include/securimage/audio/en/E.wav             | Bin
 include/securimage/audio/en/F.wav             | Bin
 include/securimage/audio/en/G.wav             | Bin
 include/securimage/audio/en/H.wav             | Bin
 include/securimage/audio/en/I.wav             | Bin
 include/securimage/audio/en/J.wav             | Bin
 include/securimage/audio/en/K.wav             | Bin
 include/securimage/audio/en/L.wav             | Bin
 include/securimage/audio/en/M.wav             | Bin
 include/securimage/audio/en/MINUS.wav         | Bin
 include/securimage/audio/en/N.wav             | Bin
 include/securimage/audio/en/O.wav             | Bin
 include/securimage/audio/en/P.wav             | Bin
 include/securimage/audio/en/PLUS.wav          | Bin
 include/securimage/audio/en/Q.wav             | Bin
 include/securimage/audio/en/R.wav             | Bin
 include/securimage/audio/en/S.wav             | Bin
 include/securimage/audio/en/T.wav             | Bin
 include/securimage/audio/en/TIMES.wav         | Bin
 include/securimage/audio/en/U.wav             | Bin
 include/securimage/audio/en/V.wav             | Bin
 include/securimage/audio/en/W.wav             | Bin
 include/securimage/audio/en/X.wav             | Bin
 include/securimage/audio/en/Y.wav             | Bin
 include/securimage/audio/en/Z.wav             | Bin
 include/securimage/audio/en/error.wav         | Bin
 .../securimage/audio/noise/check-point-1.wav  | Bin
 .../audio/noise/crowd-talking-1.wav           | Bin
 .../audio/noise/crowd-talking-6.wav           | Bin
 .../audio/noise/crowd-talking-7.wav           | Bin
 .../securimage/audio/noise/kids-playing-1.wav | Bin
 include/securimage/backgrounds/bg3.jpg        | Bin
 include/securimage/backgrounds/bg4.jpg        | Bin
 include/securimage/backgrounds/bg5.jpg        | Bin
 include/securimage/backgrounds/bg6.png        | Bin
 include/securimage/captcha.html               |   0
 include/securimage/database/.htaccess         |   0
 include/securimage/database/index.html        |   0
 include/securimage/database/securimage.sq3    | Bin
 include/securimage/images/audio_icon.png      | Bin
 include/securimage/images/refresh.png         | Bin
 include/securimage/securimage.php             |   0
 include/securimage/securimage_play.php        |   0
 include/securimage/securimage_play.swf        | Bin
 include/securimage/securimage_show.php        |   0
 include/securimage/words/words.txt            |   0
 include/service.class.php                     |   0
 include/sprache.class.php                     |   0
 include/standort.class.php                    |   0
 include/statistik.class.php                   |   0
 include/statusgrund.class.php                 |   0
 include/student.class.php                     |   0
 include/studentnote.class.php                 |   0
 include/studiengang.class.php                 |   0
 include/studienjahr.class.php                 |   0
 include/studienordnung.class.php              |   0
 include/studienplan.class.php                 |   0
 include/studienplatz.class.php                |   0
 include/studiensemester.class.php             |   0
 include/studierendenantrag.class.php          |   0
 include/stunde.class.php                      |   0
 include/stundenplan.class.php                 |   0
 include/tags.class.php                        |   0
 include/template.class.php                    |   0
 include/tiny_mce/langs/de.js                  |   0
 include/tiny_mce/langs/en.js                  |   0
 include/tiny_mce/license.txt                  |   0
 include/tiny_mce/plugins/advhr/css/advhr.css  |   0
 .../tiny_mce/plugins/advhr/editor_plugin.js   |   0
 .../plugins/advhr/editor_plugin_src.js        |   0
 include/tiny_mce/plugins/advhr/js/rule.js     |   0
 .../tiny_mce/plugins/advhr/langs/de_dlg.js    |   0
 .../tiny_mce/plugins/advhr/langs/en_dlg.js    |   0
 include/tiny_mce/plugins/advhr/rule.htm       |   0
 .../plugins/advimage/css/advimage.css         |   0
 .../plugins/advimage/editor_plugin.js         |   0
 .../plugins/advimage/editor_plugin_src.js     |   0
 include/tiny_mce/plugins/advimage/image.htm   |   0
 .../tiny_mce/plugins/advimage/img/sample.gif  | Bin
 include/tiny_mce/plugins/advimage/js/image.js |   0
 .../tiny_mce/plugins/advimage/langs/de_dlg.js |   0
 .../tiny_mce/plugins/advimage/langs/en_dlg.js |   0
 .../tiny_mce/plugins/advlink/css/advlink.css  |   0
 .../tiny_mce/plugins/advlink/editor_plugin.js |   0
 .../plugins/advlink/editor_plugin_src.js      |   0
 .../tiny_mce/plugins/advlink/js/advlink.js    |   0
 .../tiny_mce/plugins/advlink/langs/de_dlg.js  |   0
 .../tiny_mce/plugins/advlink/langs/en_dlg.js  |   0
 include/tiny_mce/plugins/advlink/link.htm     |   0
 .../tiny_mce/plugins/advlist/editor_plugin.js |   0
 .../plugins/advlist/editor_plugin_src.js      |   0
 .../plugins/autoresize/editor_plugin.js       |   0
 .../plugins/autoresize/editor_plugin_src.js   |   0
 .../plugins/autosave/editor_plugin.js         |   0
 .../plugins/autosave/editor_plugin_src.js     |   0
 include/tiny_mce/plugins/autosave/langs/en.js |   0
 .../tiny_mce/plugins/bbcode/editor_plugin.js  |   0
 .../plugins/bbcode/editor_plugin_src.js       |   0
 .../plugins/contextmenu/editor_plugin.js      |   0
 .../plugins/contextmenu/editor_plugin_src.js  |   0
 .../plugins/directionality/editor_plugin.js   |   0
 .../directionality/editor_plugin_src.js       |   0
 .../plugins/emotions/editor_plugin.js         |   0
 .../plugins/emotions/editor_plugin_src.js     |   0
 .../tiny_mce/plugins/emotions/emotions.htm    |   0
 .../plugins/emotions/img/smiley-cool.gif      | Bin
 .../plugins/emotions/img/smiley-cry.gif       | Bin
 .../emotions/img/smiley-embarassed.gif        | Bin
 .../emotions/img/smiley-foot-in-mouth.gif     | Bin
 .../plugins/emotions/img/smiley-frown.gif     | Bin
 .../plugins/emotions/img/smiley-innocent.gif  | Bin
 .../plugins/emotions/img/smiley-kiss.gif      | Bin
 .../plugins/emotions/img/smiley-laughing.gif  | Bin
 .../emotions/img/smiley-money-mouth.gif       | Bin
 .../plugins/emotions/img/smiley-sealed.gif    | Bin
 .../plugins/emotions/img/smiley-smile.gif     | Bin
 .../plugins/emotions/img/smiley-surprised.gif | Bin
 .../emotions/img/smiley-tongue-out.gif        | Bin
 .../plugins/emotions/img/smiley-undecided.gif | Bin
 .../plugins/emotions/img/smiley-wink.gif      | Bin
 .../plugins/emotions/img/smiley-yell.gif      | Bin
 .../tiny_mce/plugins/emotions/js/emotions.js  |   0
 .../tiny_mce/plugins/emotions/langs/de_dlg.js |   0
 .../tiny_mce/plugins/emotions/langs/en_dlg.js |   0
 include/tiny_mce/plugins/example/dialog.htm   |   0
 .../tiny_mce/plugins/example/editor_plugin.js |   0
 .../plugins/example/editor_plugin_src.js      |   0
 .../tiny_mce/plugins/example/img/example.gif  | Bin
 include/tiny_mce/plugins/example/js/dialog.js |   0
 include/tiny_mce/plugins/example/langs/en.js  |   0
 .../tiny_mce/plugins/example/langs/en_dlg.js  |   0
 .../plugins/fullpage/css/fullpage.css         |   0
 .../plugins/fullpage/editor_plugin.js         |   0
 .../plugins/fullpage/editor_plugin_src.js     |   0
 .../tiny_mce/plugins/fullpage/fullpage.htm    |   0
 .../tiny_mce/plugins/fullpage/js/fullpage.js  |   0
 .../tiny_mce/plugins/fullpage/langs/de_dlg.js |   0
 .../tiny_mce/plugins/fullpage/langs/en_dlg.js |   0
 .../plugins/fullscreen/editor_plugin.js       |   0
 .../plugins/fullscreen/editor_plugin_src.js   |   0
 .../plugins/fullscreen/fullscreen.htm         |   0
 .../tiny_mce/plugins/iespell/editor_plugin.js |   0
 .../plugins/iespell/editor_plugin_src.js      |   0
 .../plugins/inlinepopups/editor_plugin.js     |   0
 .../plugins/inlinepopups/editor_plugin_src.js |   0
 .../skins/clearlooks2/img/alert.gif           | Bin
 .../skins/clearlooks2/img/button.gif          | Bin
 .../skins/clearlooks2/img/buttons.gif         | Bin
 .../skins/clearlooks2/img/confirm.gif         | Bin
 .../skins/clearlooks2/img/corners.gif         | Bin
 .../skins/clearlooks2/img/horizontal.gif      | Bin
 .../skins/clearlooks2/img/vertical.gif        | Bin
 .../inlinepopups/skins/clearlooks2/window.css |   0
 .../plugins/inlinepopups/template.htm         |   0
 .../plugins/insertdatetime/editor_plugin.js   |   0
 .../insertdatetime/editor_plugin_src.js       |   0
 .../tiny_mce/plugins/layer/editor_plugin.js   |   0
 .../plugins/layer/editor_plugin_src.js        |   0
 .../plugins/legacyoutput/editor_plugin.js     |   0
 .../plugins/legacyoutput/editor_plugin_src.js |   0
 include/tiny_mce/plugins/media/css/media.css  |   0
 .../tiny_mce/plugins/media/editor_plugin.js   |   0
 .../plugins/media/editor_plugin_src.js        |   0
 include/tiny_mce/plugins/media/js/embed.js    |   0
 include/tiny_mce/plugins/media/js/media.js    |   0
 .../tiny_mce/plugins/media/langs/de_dlg.js    |   0
 .../tiny_mce/plugins/media/langs/en_dlg.js    |   0
 include/tiny_mce/plugins/media/media.htm      |   0
 .../tiny_mce/plugins/media/moxieplayer.swf    | Bin
 .../plugins/nonbreaking/editor_plugin.js      |   0
 .../plugins/nonbreaking/editor_plugin_src.js  |   0
 .../plugins/noneditable/editor_plugin.js      |   0
 .../plugins/noneditable/editor_plugin_src.js  |   0
 .../plugins/pagebreak/editor_plugin.js        |   0
 .../plugins/pagebreak/editor_plugin_src.js    |   0
 .../tiny_mce/plugins/paste/editor_plugin.js   |   0
 .../plugins/paste/editor_plugin_src.js        |   0
 .../tiny_mce/plugins/paste/js/pastetext.js    |   0
 .../tiny_mce/plugins/paste/js/pasteword.js    |   0
 .../tiny_mce/plugins/paste/langs/de_dlg.js    |   0
 .../tiny_mce/plugins/paste/langs/en_dlg.js    |   0
 include/tiny_mce/plugins/paste/pastetext.htm  |   0
 include/tiny_mce/plugins/paste/pasteword.htm  |   0
 .../tiny_mce/plugins/preview/editor_plugin.js |   0
 .../plugins/preview/editor_plugin_src.js      |   0
 include/tiny_mce/plugins/preview/example.html |   0
 .../plugins/preview/jscripts/embed.js         |   0
 include/tiny_mce/plugins/preview/preview.html |   0
 .../tiny_mce/plugins/print/editor_plugin.js   |   0
 .../plugins/print/editor_plugin_src.js        |   0
 .../tiny_mce/plugins/save/editor_plugin.js    |   0
 .../plugins/save/editor_plugin_src.js         |   0
 .../searchreplace/css/searchreplace.css       |   0
 .../plugins/searchreplace/editor_plugin.js    |   0
 .../searchreplace/editor_plugin_src.js        |   0
 .../plugins/searchreplace/js/searchreplace.js |   0
 .../plugins/searchreplace/langs/de_dlg.js     |   0
 .../plugins/searchreplace/langs/en_dlg.js     |   0
 .../plugins/searchreplace/searchreplace.htm   |   0
 .../plugins/spellchecker/css/content.css      |   0
 .../plugins/spellchecker/editor_plugin.js     |   0
 .../plugins/spellchecker/editor_plugin_src.js |   0
 .../plugins/spellchecker/img/wline.gif        | Bin
 include/tiny_mce/plugins/style/css/props.css  |   0
 .../tiny_mce/plugins/style/editor_plugin.js   |   0
 .../plugins/style/editor_plugin_src.js        |   0
 include/tiny_mce/plugins/style/js/props.js    |   0
 .../tiny_mce/plugins/style/langs/de_dlg.js    |   0
 .../tiny_mce/plugins/style/langs/en_dlg.js    |   0
 include/tiny_mce/plugins/style/props.htm      |   0
 .../plugins/tabfocus/editor_plugin.js         |   0
 .../plugins/tabfocus/editor_plugin_src.js     |   0
 include/tiny_mce/plugins/table/cell.htm       |   0
 include/tiny_mce/plugins/table/css/cell.css   |   0
 include/tiny_mce/plugins/table/css/row.css    |   0
 include/tiny_mce/plugins/table/css/table.css  |   0
 .../tiny_mce/plugins/table/editor_plugin.js   |   0
 .../plugins/table/editor_plugin_src.js        |   0
 include/tiny_mce/plugins/table/js/cell.js     |   0
 .../tiny_mce/plugins/table/js/merge_cells.js  |   0
 include/tiny_mce/plugins/table/js/row.js      |   0
 include/tiny_mce/plugins/table/js/table.js    |   0
 .../tiny_mce/plugins/table/langs/de_dlg.js    |   0
 .../tiny_mce/plugins/table/langs/en_dlg.js    |   0
 .../tiny_mce/plugins/table/merge_cells.htm    |   0
 include/tiny_mce/plugins/table/row.htm        |   0
 include/tiny_mce/plugins/table/table.htm      |   0
 include/tiny_mce/plugins/template/blank.htm   |   0
 .../plugins/template/css/template.css         |   0
 .../plugins/template/editor_plugin.js         |   0
 .../plugins/template/editor_plugin_src.js     |   0
 .../tiny_mce/plugins/template/js/template.js  |   0
 .../tiny_mce/plugins/template/langs/de_dlg.js |   0
 .../tiny_mce/plugins/template/langs/en_dlg.js |   0
 .../tiny_mce/plugins/template/template.htm    |   0
 .../plugins/visualchars/editor_plugin.js      |   0
 .../plugins/visualchars/editor_plugin_src.js  |   0
 .../tiny_mce/plugins/wordc/langs/de_dlg.js    |   0
 .../tiny_mce/plugins/wordc/langs/en_dlg.js    |   0
 .../plugins/wordcount/editor_plugin.js        |   0
 .../plugins/wordcount/editor_plugin_src.js    |   0
 include/tiny_mce/plugins/xhtmlxtras/abbr.htm  |   0
 .../tiny_mce/plugins/xhtmlxtras/acronym.htm   |   0
 .../plugins/xhtmlxtras/attributes.htm         |   0
 include/tiny_mce/plugins/xhtmlxtras/cite.htm  |   0
 .../plugins/xhtmlxtras/css/attributes.css     |   0
 .../tiny_mce/plugins/xhtmlxtras/css/popup.css |   0
 include/tiny_mce/plugins/xhtmlxtras/del.htm   |   0
 .../plugins/xhtmlxtras/editor_plugin.js       |   0
 .../plugins/xhtmlxtras/editor_plugin_src.js   |   0
 include/tiny_mce/plugins/xhtmlxtras/ins.htm   |   0
 .../tiny_mce/plugins/xhtmlxtras/js/abbr.js    |   0
 .../tiny_mce/plugins/xhtmlxtras/js/acronym.js |   0
 .../plugins/xhtmlxtras/js/attributes.js       |   0
 .../tiny_mce/plugins/xhtmlxtras/js/cite.js    |   0
 include/tiny_mce/plugins/xhtmlxtras/js/del.js |   0
 .../plugins/xhtmlxtras/js/element_common.js   |   0
 include/tiny_mce/plugins/xhtmlxtras/js/ins.js |   0
 .../plugins/xhtmlxtras/langs/de_dlg.js        |   0
 .../plugins/xhtmlxtras/langs/en_dlg.js        |   0
 include/tiny_mce/themes/advanced/about.htm    |   0
 include/tiny_mce/themes/advanced/anchor.htm   |   0
 include/tiny_mce/themes/advanced/charmap.htm  |   0
 .../tiny_mce/themes/advanced/color_picker.htm |   0
 .../themes/advanced/editor_template.js        |   0
 .../themes/advanced/editor_template_src.js    |   0
 include/tiny_mce/themes/advanced/image.htm    |   0
 .../themes/advanced/img/colorpicker.jpg       | Bin
 .../tiny_mce/themes/advanced/img/flash.gif    | Bin
 .../tiny_mce/themes/advanced/img/icons.gif    | Bin
 .../tiny_mce/themes/advanced/img/iframe.gif   | Bin
 .../themes/advanced/img/pagebreak.gif         | Bin
 .../themes/advanced/img/quicktime.gif         | Bin
 .../themes/advanced/img/realmedia.gif         | Bin
 .../themes/advanced/img/shockwave.gif         | Bin
 .../tiny_mce/themes/advanced/img/trans.gif    | Bin
 .../tiny_mce/themes/advanced/img/video.gif    | Bin
 .../themes/advanced/img/windowsmedia.gif      | Bin
 include/tiny_mce/themes/advanced/js/about.js  |   0
 include/tiny_mce/themes/advanced/js/anchor.js |   0
 .../tiny_mce/themes/advanced/js/charmap.js    |   0
 .../themes/advanced/js/color_picker.js        |   0
 include/tiny_mce/themes/advanced/js/image.js  |   0
 include/tiny_mce/themes/advanced/js/link.js   |   0
 .../themes/advanced/js/source_editor.js       |   0
 include/tiny_mce/themes/advanced/langs/de.js  |   0
 .../tiny_mce/themes/advanced/langs/de_dlg.js  |   0
 include/tiny_mce/themes/advanced/langs/en.js  |   0
 .../tiny_mce/themes/advanced/langs/en_dlg.js  |   0
 include/tiny_mce/themes/advanced/link.htm     |   0
 .../tiny_mce/themes/advanced/shortcuts.htm    |   0
 .../themes/advanced/skins/default/content.css |   0
 .../themes/advanced/skins/default/dialog.css  |   0
 .../advanced/skins/default/img/buttons.png    | Bin
 .../advanced/skins/default/img/items.gif      | Bin
 .../advanced/skins/default/img/menu_arrow.gif | Bin
 .../advanced/skins/default/img/menu_check.gif | Bin
 .../advanced/skins/default/img/progress.gif   | Bin
 .../advanced/skins/default/img/tabs.gif       | Bin
 .../themes/advanced/skins/default/ui.css      |   0
 .../advanced/skins/highcontrast/content.css   |   0
 .../advanced/skins/highcontrast/dialog.css    |   0
 .../themes/advanced/skins/highcontrast/ui.css |   0
 .../themes/advanced/skins/o2k7/content.css    |   0
 .../themes/advanced/skins/o2k7/dialog.css     |   0
 .../advanced/skins/o2k7/img/button_bg.png     | Bin
 .../skins/o2k7/img/button_bg_black.png        | Bin
 .../skins/o2k7/img/button_bg_silver.png       | Bin
 .../themes/advanced/skins/o2k7/ui.css         |   0
 .../themes/advanced/skins/o2k7/ui_black.css   |   0
 .../themes/advanced/skins/o2k7/ui_silver.css  |   0
 .../themes/advanced/source_editor.htm         |   0
 .../tiny_mce/themes/simple/editor_template.js |   0
 .../themes/simple/editor_template_src.js      |   0
 include/tiny_mce/themes/simple/img/icons.gif  | Bin
 include/tiny_mce/themes/simple/langs/de.js    |   0
 include/tiny_mce/themes/simple/langs/en.js    |   0
 .../themes/simple/skins/default/content.css   |   0
 .../themes/simple/skins/default/ui.css        |   0
 .../themes/simple/skins/o2k7/content.css      |   0
 .../simple/skins/o2k7/img/button_bg.png       | Bin
 .../tiny_mce/themes/simple/skins/o2k7/ui.css  |   0
 include/tiny_mce/tiny_mce.js                  |   0
 include/tiny_mce/tiny_mce_popup.js            |   0
 include/tiny_mce/tiny_mce_src.js              |   0
 include/tiny_mce/utils/editable_selects.js    |   0
 include/tiny_mce/utils/form_utils.js          |   0
 include/tiny_mce/utils/mctabs.js              |   0
 include/tiny_mce/utils/validate.js            |   0
 include/tw/abgabe_lektor_benotung.php         |   0
 include/tw/cis_menu_lv.inc.php                |   0
 include/tw/fas_zusatzmenues.inc.php           |   0
 include/tw/fas_zusatzmenues.js.php            |   0
 include/tw/generateZahlungsreferenz.inc.php   |   0
 include/tw/generatematrikelnr.inc.php         |   0
 include/tw/generateuid.inc.php                |   0
 include/tw/index.html                         |   0
 include/tw/passwort.inc.php                   |   0
 include/tw/serviceterminal.inc.php            |   0
 include/tw/vilesci_menu_main.inc.php          |   0
 include/tw/wawi_menu_main.inc.php             |   0
 include/udf.class.php                         |   0
 include/uebung.class.php                      |   0
 include/variable.class.php                    |   0
 .../angular-tablesorter/tablesort.css         |   0
 include/vendor_custom/easyui/easyui.css       |   0
 include/vendor_custom/easyui/icon.css         |   0
 .../jquery-tablesorter/tablesort.css          |   0
 include/vertrag.class.php                     |   0
 include/vorlage.class.php                     |   0
 include/vorschlag.class.php                   |   0
 include/wawi_aufteilung.class.php             |   0
 include/wawi_bestelldetail.class.php          |   0
 include/wawi_bestellstatus.class.php          |   0
 include/wawi_bestellung.class.php             |   0
 include/wawi_konto.class.php                  |   0
 include/wawi_kostenstelle.class.php           |   0
 include/wawi_rechnung.class.php               |   0
 include/wawi_zahlungstyp.class.php            |   0
 include/webservicelog.class.php               |   0
 include/webservicerecht.class.php             |   0
 include/wochenplan.class.php                  |   0
 include/xmlrpcutils/utils.php                 |   0
 include/xsdformprinter/config.inc.php         |   0
 include/xsdformprinter/examples/shiporder.xml |   0
 .../xsdformprinter/examples/shiporder1.xsd    |   0
 .../xsdformprinter/examples/shiporder2.xsd    |   0
 include/xsdformprinter/style.css              |   0
 include/xsdformprinter/types.php              |   0
 include/xsdformprinter/xfp.php                |   0
 include/xsdformprinter/xsdformprinter.php     |   0
 include/zeitaufzeichnung.class.php            |   0
 include/zeitaufzeichnung_gd.class.php         |   0
 include/zeitaufzeichnung_import.class.php     |   0
 include/zeitaufzeichnung_import_csv.class.php |   0
 .../zeitaufzeichnung_import_post.class.php    |   0
 include/zeitsperre.class.php                  |   0
 include/zeitwunsch.class.php                  |   0
 include/zeitwunsch_gueltigkeit.class.php      |   0
 include/zeugnisnote.class.php                 |   0
 include/zgv.class.php                         |   0
 include/zweck.class.php                       |   0
 index.ci.php                                  |   0
 index.cis.html                                |   0
 index.vilesci.php                             |   0
 locale/contents.rdf                           |   0
 locale/de-AT/abgabetool.php                   |   0
 locale/de-AT/anwesenheitsliste.php            |   0
 locale/de-AT/benotungstool.php                |   0
 locale/de-AT/buchungen.php                    |   0
 locale/de-AT/contents.rdf                     |   0
 locale/de-AT/coodle.php                       |   0
 locale/de-AT/courseInformation.php            |   0
 locale/de-AT/dms_link.php                     |   0
 locale/de-AT/errors.php                       |   0
 locale/de-AT/eventkalender.php                |   0
 locale/de-AT/fas.dtd                          |   0
 locale/de-AT/feedback.php                     |   0
 locale/de-AT/freebusy.php                     |   0
 locale/de-AT/freifach.php                     |   0
 locale/de-AT/gesamtnote.php                   |   0
 locale/de-AT/global.php                       |   0
 locale/de-AT/incoming.php                     |   0
 locale/de-AT/ktu.php                          |   0
 locale/de-AT/lehre.php                        |   0
 locale/de-AT/lehrveranstaltung.php            |   0
 locale/de-AT/lvaliste.php                     |   0
 locale/de-AT/lvinfo.php                       |   0
 locale/de-AT/lvplan.php                       |   0
 locale/de-AT/mail.php                         |   0
 locale/de-AT/mailverteiler.php                |   0
 locale/de-AT/menu.php                         |   0
 locale/de-AT/news.php                         |   0
 locale/de-AT/notebookregister.php             |   0
 locale/de-AT/notfallbestimmungen.php          |   0
 locale/de-AT/passwort.php                     |   0
 locale/de-AT/personensuche.php                |   0
 locale/de-AT/planner.dtd                      |   0
 locale/de-AT/profil.php                       |   0
 locale/de-AT/pruefung.php                     |   0
 locale/de-AT/reihungstest.php                 |   0
 locale/de-AT/semesterplan.php                 |   0
 locale/de-AT/services.php                     |   0
 locale/de-AT/studienplan.php                  |   0
 locale/de-AT/studierendenantrag.php           |   0
 locale/de-AT/telefonverzeichnis.php           |   0
 locale/de-AT/tempus.dtd                       |   0
 locale/de-AT/testtool.php                     |   0
 locale/de-AT/tools.php                        |   0
 locale/de-AT/upload.php                       |   0
 locale/de-AT/urlaubstool.php                  |   0
 locale/de-AT/zeitaufzeichnung.php             |   0
 locale/de-AT/zeitsperre.php                   |   0
 locale/de-AT/zeitwunsch.php                   |   0
 locale/de-SFU/contents.rdf                    |   0
 locale/de-SFU/fas.dtd                         |   0
 locale/de-SFU/planner.dtd                     |   0
 locale/de-SFU/tempus.dtd                      |   0
 locale/en-US/abgabetool.php                   |   0
 locale/en-US/anwesenheitsliste.php            |   0
 locale/en-US/benotungstool.php                |   0
 locale/en-US/contents.rdf                     |   0
 locale/en-US/coodle.php                       |   0
 locale/en-US/courseInformation.php            |   0
 locale/en-US/dms_link.php                     |   0
 locale/en-US/errors.php                       |   0
 locale/en-US/eventkalender.php                |   0
 locale/en-US/feedback.php                     |   0
 locale/en-US/freebusy.php                     |   0
 locale/en-US/freifach.php                     |   0
 locale/en-US/gesamtnote.php                   |   0
 locale/en-US/global.php                       |   0
 locale/en-US/incoming.php                     |   0
 locale/en-US/lehre.php                        |   0
 locale/en-US/lvaliste.php                     |   0
 locale/en-US/lvinfo.php                       |   0
 locale/en-US/lvplan.php                       |   0
 locale/en-US/mail.php                         |   0
 locale/en-US/mailverteiler.php                |   0
 locale/en-US/menu.php                         |   0
 locale/en-US/news.php                         |   0
 locale/en-US/notebookregister.php             |   0
 locale/en-US/notfallbestimmungen.php          |   0
 locale/en-US/passwort.php                     |   0
 locale/en-US/personensuche.php                |   0
 locale/en-US/profil.php                       |   0
 locale/en-US/pruefung.php                     |   0
 locale/en-US/reihungstest.php                 |   0
 locale/en-US/semesterplan.php                 |   0
 locale/en-US/services.php                     |   0
 locale/en-US/studierendenantrag.php           |   0
 locale/en-US/telefonverzeichnis.php           |   0
 locale/en-US/tempus.dtd                       |   0
 locale/en-US/testtool.php                     |   0
 locale/en-US/tools.php                        |   0
 locale/en-US/upload.php                       |   0
 locale/en-US/urlaubstool.php                  |   0
 locale/en-US/zeitaufzeichnung.php             |   0
 locale/en-US/zeitsperre.php                   |   0
 locale/en-US/zeitwunsch.php                   |   0
 locale/it-IT/abgabetool.php                   |   0
 locale/it-IT/anwesenheitsliste.php            |   0
 locale/it-IT/benotungstool.php                |   0
 locale/it-IT/buchungen.php                    |   0
 locale/it-IT/coodle.php                       |   0
 locale/it-IT/courseInformation.php            |   0
 locale/it-IT/dms_link.php                     |   0
 locale/it-IT/errors.php                       |   0
 locale/it-IT/eventkalender.php                |   0
 locale/it-IT/feedback.php                     |   0
 locale/it-IT/freebusy.php                     |   0
 locale/it-IT/freifach.php                     |   0
 locale/it-IT/gesamtnote.php                   |   0
 locale/it-IT/global.php                       |   0
 locale/it-IT/incoming.php                     |   0
 locale/it-IT/lehre.php                        |   0
 locale/it-IT/lvaliste.php                     |   0
 locale/it-IT/lvinfo.php                       |   0
 locale/it-IT/lvplan.php                       |   0
 locale/it-IT/mail.php                         |   0
 locale/it-IT/mailverteiler.php                |   0
 locale/it-IT/menu.php                         |   0
 locale/it-IT/news.php                         |   0
 locale/it-IT/notebookregister.php             |   0
 locale/it-IT/notfallbestimmungen.php          |   0
 locale/it-IT/passwort.php                     |   0
 locale/it-IT/personensuche.php                |   0
 locale/it-IT/profil.php                       |   0
 locale/it-IT/pruefung.php                     |   0
 locale/it-IT/semesterplan.php                 |   0
 locale/it-IT/services.php                     |   0
 locale/it-IT/studienplan.php                  |   0
 locale/it-IT/telefonverzeichnis.php           |   0
 locale/it-IT/testtool.php                     |   0
 locale/it-IT/tools.php                        |   0
 locale/it-IT/upload.php                       |   0
 locale/it-IT/urlaubstool.php                  |   0
 locale/it-IT/zeitaufzeichnung.php             |   0
 locale/it-IT/zeitsperre.php                   |   0
 locale/it-IT/zeitwunsch.php                   |   0
 public/css/AjaxLib.css                        |   0
 public/css/Cis4/Cis.css                       |   0
 public/css/Cis4/Cms.css                       |   0
 public/css/Cis4/Legacy.css                    |   0
 public/css/DialogLib.css                      |   0
 public/css/Fhc.css                            |   0
 public/css/FilterWidget.css                   |   0
 public/css/Login.css                          |   0
 public/css/NavigationWidget.css               |   0
 public/css/Tabulator.css                      |   0
 public/css/Tabulator5.css                     |   0
 public/css/TinyMCE5.css                       |   0
 public/css/Widgets.css                        |   0
 public/css/cis4.css                           |   0
 public/css/cis_bs5.css                        |   0
 public/css/codex/oehbeitrag.css               |   0
 public/css/codex/uhstat1.css                  |   0
 public/css/components/FilterComponent.css     |   0
 public/css/components/FormUnderline.css       |   0
 public/css/components/NavigationComponent.css |   0
 public/css/components/Profil.css              |   0
 public/css/components/calendar.css            |   0
 public/css/components/dashboard.css           |   0
 public/css/components/searchbar.css           |   0
 public/css/components/verticalsplit.css       |   0
 public/css/fhcomplete.css                     |   0
 public/css/infocenter/infocenterDetails.css   |   0
 .../infocenter/infocenterPersonDataset.css    |   0
 public/css/issues/issuesDataset.css           |   0
 public/css/issues/issuesKonfiguration.css     |   0
 public/css/issues/issuesZustaendigkeiten.css  |   0
 public/css/lehre/anrechnung.css               |   0
 public/css/lehre/pruefungsprotokoll.css       |   0
 public/css/messaging/message.css              |   0
 public/css/sbadmin2/admintemplate.css         |   0
 .../sbadmin2/admintemplate_contentonly.css    |   0
 public/css/sbadmin2/tablesort_bootstrap.css   |   0
 public/css/tools/auswertung_fhtw.css          |   0
 public/css/tools/gradelist.css                |   0
 public/extensions/.placeholder                |   0
 public/images/icons/fa-user-check.png         | Bin
 public/images/icons/fa-user-clock.png         | Bin
 public/images/icons/fa-user-cog.png           | Bin
 public/images/icons/fa-user-edit.png          | Bin
 public/images/icons/fa-user-graduate.png      | Bin
 public/images/icons/fa-user-lock.png          | Bin
 public/images/icons/fa-user-minus.png         | Bin
 public/images/icons/fa-user-ninja.png         | Bin
 public/images/icons/fa-user-tag.png           | Bin
 public/images/icons/fa-user-times.png         | Bin
 public/images/icons/fa-users-cog.png          | Bin
 public/images/loader.gif                      | Bin
 public/images/logo-300x160.png                | Bin
 public/js/AjaxLib.js                          |   0
 public/js/DialogLib.js                        |   0
 public/js/FilterWidget.js                     |   0
 public/js/Login.js                            |   0
 public/js/NavigationWidget.js                 |   0
 public/js/PhrasesLib.js                       |   0
 public/js/RESTClient.js                       |   0
 public/js/TableWidget.js                      |   0
 public/js/UDFWidget.js                        |   0
 public/js/apps/Cis.js                         |   0
 public/js/apps/Cis/Cms.js                     |   0
 public/js/apps/Cis/Documents.js               |   0
 public/js/apps/Cis/MyLv/Student.js            |   0
 public/js/apps/Cis/Profil.js                  |   0
 public/js/apps/Cis/ProfilUpdateRequests.js    |   0
 public/js/apps/Cis/Stundenplan.js             |   0
 public/js/apps/Dashboard.js                   |   0
 public/js/apps/Dashboard/Admin.js             |   0
 public/js/apps/Dashboard/Fhc.js               |   0
 public/js/apps/DashboardAdmin.js              |   0
 public/js/apps/LogsViewer/LogsViewer.js       |   0
 public/js/apps/LogsViewer/TabulatorSetup.js   |   0
 public/js/apps/TestSearch.js                  |   0
 public/js/apps/api/dummyapi.php               |   0
 public/js/apps/api/fhcapifactory.js           |   0
 public/js/apps/api/profilUpdate.js            |   0
 public/js/apps/api/search.js                  |   0
 public/js/apps/api/userdata.js                |   9 +
 public/js/apps/lehre/Antrag.js                |   0
 public/js/apps/lehre/Antrag/Leitung.js        |   0
 public/js/apps/lehre/Antrag/Lvzuweisung.js    |   0
 public/js/apps/lehre/Antrag/Student.js        |   0
 public/js/bootstrapper.js                     |   0
 public/js/codex/oehbeitrag.js                 |   0
 public/js/codex/uhstat1.js                    |   0
 public/js/components/Base/Modal.js            |   0
 public/js/components/Base/Offcanvas.js        |   0
 public/js/components/Bootstrap/Alert.js       |   0
 public/js/components/Bootstrap/Confirm.js     |   0
 public/js/components/Bootstrap/Modal.js       |   0
 public/js/components/Bootstrap/Prompt.js      |   0
 public/js/components/Calendar/Abstract.js     |   0
 public/js/components/Calendar/Calendar.js     |   0
 public/js/components/Calendar/Header.js       |   0
 public/js/components/Calendar/Minimized.js    |   0
 public/js/components/Calendar/Month.js        |   0
 public/js/components/Calendar/Month/Page.js   |   0
 public/js/components/Calendar/Months.js       |   0
 public/js/components/Calendar/Pane.js         |   0
 public/js/components/Calendar/Week.js         |   0
 public/js/components/Calendar/Week/Page.js    |   0
 public/js/components/Calendar/Weeks.js        |   0
 public/js/components/Calendar/Years.js        |   0
 public/js/components/Calendar/Years/Page.js   |   0
 public/js/components/Cis/Menu.js              |   0
 public/js/components/Cis/Menu/Entry.js        |   0
 public/js/components/Cis/Mylv/Semester.js     |   0
 .../Cis/Mylv/Semester/Studiengang.js          |   0
 .../Cis/Mylv/Semester/Studiengang/Lv.js       |   0
 .../Cis/Mylv/Semester/Studiengang/Lv/Info.js  |   0
 .../Semester/Studiengang/Lv/Pruefungen.js     |   0
 public/js/components/Cis/Mylv/Student.js      |   0
 public/js/components/Cis/Profil/EditProfil.js |   0
 .../components/Cis/Profil/EditProfilSelect.js |   0
 .../Cis/Profil/MitarbeiterProfil.js           |  37 +++
 .../Cis/Profil/MitarbeiterViewProfil.js       |   0
 .../Cis/Profil/ProfilComponents/Adresse.js    |   0
 .../Profil/ProfilComponents/EditAdresse.js    |   0
 .../Profil/ProfilComponents/EditKontakt.js    |   4 +-
 .../ProfilComponents/FetchProfilUpdates.js    |   0
 .../ProfilComponents/FhAusweisStatus.js       |   0
 .../Cis/Profil/ProfilComponents/Kontakt.js    |   0
 .../Profil/ProfilComponents/Mailverteiler.js  |   0
 .../Profil/ProfilComponents/ProfilEmails.js   |   0
 .../ProfilComponents/ProfilInformation.js     |   0
 .../Cis/Profil/ProfilComponents/QuickLinks.js |   0
 .../ProfilComponents/RoleInformation.js       |   0
 .../Cis/Profil/ProfilComponents/Status.js     |   0
 .../js/components/Cis/Profil/StudentProfil.js |   0
 .../Cis/Profil/StudentViewProfil.js           |   0
 .../Cis/ProfilUpdate/AcceptDenyUpdate.js      |   0
 public/js/components/Dashboard/Admin.js       |   0
 public/js/components/Dashboard/Admin/Edit.js  |   0
 .../js/components/Dashboard/Admin/Presets.js  |   0
 .../js/components/Dashboard/Admin/Widgets.js  |   0
 public/js/components/Dashboard/Dashboard.js   |   0
 public/js/components/Dashboard/Item.js        |   0
 public/js/components/Dashboard/Section.js     |   0
 .../js/components/Dashboard/Widget/Picker.js  |   0
 .../js/components/DashboardWidget/Abstract.js |   0
 public/js/components/DashboardWidget/Ampel.js |   0
 .../js/components/DashboardWidget/Default.js  |   0
 public/js/components/DashboardWidget/News.js  |   0
 .../components/DashboardWidget/Stundenplan.js |   0
 public/js/components/DashboardWidget/Url.js   |   0
 public/js/components/Drop/Grid.js             |   0
 public/js/components/Drop/Grid/Item.js        |   0
 public/js/components/Fetch.js                 |   0
 public/js/components/Form/Form.js             | 137 +++++++++
 public/js/components/Form/Input.js            | 278 ++++++++++++++++++
 public/js/components/Form/Upload/Dms.js       |  90 ++++++
 public/js/components/Form/Upload/Image.js     |  62 ++++
 public/js/components/Form/Validation.js       |  38 +++
 public/js/components/Loader.js                |   0
 .../components/Studierendenantrag/Antrag.js   |   0
 .../Studierendenantrag/Form/Abmeldung.js      |   0
 .../Studierendenantrag/Form/AbmeldungStgl.js  |   0
 .../Studierendenantrag/Form/Unterbrechung.js  |   0
 .../Studierendenantrag/Form/Wiederholung.js   |   0
 .../Studierendenantrag/Infoblock.js           |   0
 .../components/Studierendenantrag/Leitung.js  |   0
 .../Studierendenantrag/Leitung/Actions.js     |   0
 .../Leitung/Actions/Columns.js                |   0
 .../Studierendenantrag/Leitung/Actions/New.js |   0
 .../Studierendenantrag/Leitung/GrundPopup.js  |   0
 .../Studierendenantrag/Leitung/Header.js      |   0
 .../Studierendenantrag/Leitung/LvPopup.js     |   0
 .../Studierendenantrag/Leitung/Table.js       |   0
 .../Studierendenantrag/Lvzuweisung.js         |   0
 .../components/Studierendenantrag/Status.js   |   0
 public/js/components/filter/API.js            |   0
 public/js/components/filter/Filter.js         |   0
 public/js/components/filter/Filter/Columns.js |   0
 public/js/components/filter/Filter/Config.js  |   0
 public/js/components/filter/Table/Download.js |   0
 public/js/components/navigation/API.js        |   0
 public/js/components/navigation/Navigation.js |   0
 public/js/components/searchbar/action.js      |   0
 public/js/components/searchbar/actions.js     |   0
 public/js/components/searchbar/employee.js    |   0
 .../components/searchbar/organisationunit.js  |   0
 public/js/components/searchbar/person.js      |   0
 public/js/components/searchbar/raum.js        |   0
 public/js/components/searchbar/searchbar.js   |   0
 .../components/verticalsplit/verticalsplit.js |   0
 public/js/components/vueDatepicker.js.php     |   0
 public/js/composables/CalendarDate.js         |   0
 .../Dashboard/CachedWidgetLoader.js           |   0
 public/js/composables/GridLogic.js            |   0
 public/js/composables/ObjectUtils.js          |   0
 public/js/infocenter/docUeberpruefung.js      |   0
 public/js/infocenter/infocenterDetails.js     |   0
 .../js/infocenter/infocenterPersonDataset.js  |   0
 public/js/infocenter/messageList.js           |   0
 public/js/infocenter/rueckstellung.js         |   0
 public/js/infocenter/stammdaten.js            |   0
 public/js/infocenter/zgvUeberpruefung.js      |   0
 public/js/issues/issuesDataset.js             |   0
 public/js/issues/issuesKonfiguration.js       |   0
 public/js/issues/issuesZustaendigkeiten.js    |   0
 public/js/issues/plausichecks.js              |   0
 public/js/lehre/anrechnung/adminAnrechnung.js |   0
 .../anrechnung/approveAnrechnungDetail.js     |   0
 .../anrechnung/approveAnrechnungUebersicht.js |   0
 .../js/lehre/anrechnung/createAnrechnung.js   |   0
 .../js/lehre/anrechnung/requestAnrechnung.js  |   0
 .../anrechnung/reviewAnrechnungDetail.js      |   0
 .../anrechnung/reviewAnrechnungUebersicht.js  |   0
 .../js/lehre/lehrauftrag/acceptLehrauftrag.js |   0
 .../lehre/lehrauftrag/approveLehrauftrag.js   |   0
 .../js/lehre/lehrauftrag/orderLehrauftrag.js  |   0
 public/js/lehre/lvplanung/zverfueg.js         |   0
 public/js/lehre/pruefungsprotokoll.js         |   0
 public/js/messaging/fasMessageWrite.js        |   0
 public/js/messaging/messageWrite.js           |   0
 public/js/messaging/messageWriteReply.js      |   0
 public/js/messaging/read.js                   |   0
 public/js/messaging/write.js                  |   0
 public/js/messaging/writeReply.js             |   0
 public/js/mixins/Phrasen.js                   |   0
 public/js/person/benutzergruppe.js            |   0
 public/js/pivottable/pivot.de.js              |   0
 public/js/plugin/Phrasen.js                   |   0
 public/js/tablesort/tablesort.js              |   0
 public/js/tabulator/filters/Dates.js          |   0
 public/media/.placeholder                     |   0
 rdf/AntragAbmeldung.xml.php                   |   0
 rdf/AntragAbmeldungStgl.xml.php               |   0
 rdf/AntragUnterbrechung.xml.php               |   0
 rdf/PHPRequest.txt                            |   0
 rdf/abschlussbeurteilung.rdf.php              |   0
 rdf/abschlusspruefung.rdf.php                 |   0
 rdf/abschlusspruefung_antritt.rdf.php         |   0
 rdf/accountinfoblatt.xml.php                  |   0
 rdf/adresse.rdf.php                           |   0
 rdf/adressentyp.rdf.php                       |   0
 rdf/akadgrad.rdf.php                          |   0
 rdf/akte.rdf.php                              |   0
 rdf/anrechnung.rdf.php                        |   0
 rdf/anrechnungbegruendung.rdf.php             |   0
 rdf/anwesenheit.rdf.php                       |   0
 rdf/anwesenheitsliste.xml.php                 |   0
 rdf/anzahlAnwesenheitenStudenplan.rdf.php     |   0
 rdf/aufenthaltfoerderung.rdf.php              |   0
 rdf/aufmerksamdurch.rdf.php                   |   0
 rdf/aufnahmeschluessel.rdf.php                |   0
 rdf/aufnahmetermine.rdf.php                   |   0
 rdf/aufwandstyp.rdf.php                       |   0
 rdf/ausbildung.rdf.php                        |   0
 rdf/ausbildungsvertrag.xml.php                |   0
 rdf/bankverbindung.rdf.php                    |   0
 rdf/benutzer.rdf.php                          |   0
 rdf/benutzerfunktion.rdf.php                  |   0
 rdf/berufstaetigkeit.rdf.php                  |   0
 rdf/beschaeftigungsart1.rdf.php               |   0
 rdf/beschaeftigungsart2.rdf.php               |   0
 rdf/beschaeftigungsausmass.rdf.php            |   0
 rdf/besonderequalifikation.rdf.php            |   0
 rdf/bestelldetail.rdf.php                     |   0
 rdf/bestellung.rdf.php                        |   0
 rdf/betreuerart.rdf.php                       |   0
 rdf/betriebsmittel.rdf.php                    |   0
 rdf/betriebsmittelperson.rdf.php              |   0
 rdf/betriebsmitteltyp.rdf.php                 |   0
 rdf/bisfunktion.rdf.php                       |   0
 rdf/bisio.rdf.php                             |   0
 rdf/bisstandort.rdf.php                       |   0
 rdf/bisverwendung.rdf.php                     |   0
 rdf/buchungstyp.rdf.php                       |   0
 rdf/diplomasupplement.xml.php                 |   0
 rdf/dms.rdf.php                               |   0
 rdf/dokument.rdf.php                          |   0
 rdf/dokumentprestudent.rdf.php                |   0
 rdf/dokumenttyp.rdf.php                       |   0
 rdf/entwicklungsteam.rdf.php                  |   0
 rdf/erfolgsnachweis.rdf.php                   |   0
 rdf/fachbereich.rdf.php                       |   0
 rdf/fachbereich_menue.rdf.php                 |   0
 rdf/firma.rdf.php                             |   0
 rdf/funktion.rdf.php                          |   0
 rdf/gemeinde.rdf.php                          |   0
 rdf/geschlecht.rdf.php                        |   0
 rdf/gruppen.rdf.php                           |   0
 rdf/gsprogramm.rdf.php                        |   0
 rdf/gsstudientyp.rdf.php                      |   0
 rdf/hauptberuf.rdf.php                        |   0
 rdf/index.html                                |   0
 rdf/kontakt.rdf.php                           |   0
 rdf/kontakttyp.rdf.php                        |   0
 rdf/konto.rdf.php                             |   0
 rdf/ktu_abschlusszeugnis.rdf.php              |   0
 rdf/ktu_honorarvertrag.xml.php                |   0
 rdf/ktu_lvinfo.xml.php                        |   0
 rdf/learningagreement.rdf.php                 |   0
 rdf/learningagreement_outgoing.rdf.php        |   0
 rdf/lehrauftrag.xml.php                       |   0
 rdf/lehrauftrag_annehmen.xml.php              |   0
 rdf/lehreinheit-lvplan.rdf.php                |   0
 rdf/lehreinheit.rdf.php                       |   0
 rdf/lehreinheit_direkt.rdf.php                |   0
 rdf/lehreinheitgruppe.rdf.php                 |   0
 rdf/lehreinheitmitarbeiter.rdf.php            |   0
 rdf/lehrfach.rdf.php                          |   0
 rdf/lehrform.rdf.php                          |   0
 rdf/lehrfunktion.rdf.php                      |   0
 rdf/lehrstunde.rdf.php                        |   0
 rdf/lehrveranstaltung.rdf.php                 |   0
 rdf/lehrveranstaltung_einheiten.rdf.php       |   0
 rdf/lehrveranstaltung_studienplan.rdf.php     |   0
 rdf/lehrveranstaltungszeugnis.rdf.php         |   0
 rdf/lehrveranstaltungszeugnis_ktu.rdf.php     |   0
 rdf/lehrverbandsgruppe.rdf.php                |   0
 rdf/lektoren.rdf.php                          |   0
 rdf/lvangebot.rdf.php                         |   0
 rdf/lvgesamtnote.rdf.php                      |   0
 rdf/lvinfo.rdf.php                            |   0
 rdf/mantis.rdf.php                            |   0
 rdf/mantis_categories.rdf.php                 |   0
 rdf/mantis_projects.rdf.php                   |   0
 rdf/messages.rdf.php                          |   0
 rdf/mitarbeiter.rdf.php                       |   0
 rdf/mobilitaet.rdf.php                        |   0
 rdf/mobilitaetsprogramm.rdf.php               |   0
 rdf/mobilitaetstyp.rdf.php                    |   0
 rdf/nation.rdf.php                            |   0
 rdf/note.rdf.php                              |   0
 rdf/notiz.rdf.php                             |   0
 rdf/organisationseinheit.rdf.php              |   0
 rdf/organisationseinheit_menue.rdf.php        |   0
 rdf/ort.rdf.php                               |   0
 rdf/orte.rdf.php                              |   0
 rdf/person.rdf.php                            |   0
 rdf/personal.rdf.php                          |   0
 rdf/prestudent.rdf.php                        |   0
 rdf/prestudenthistorie.rdf.php                |   0
 rdf/prestudentrolle.rdf.php                   |   0
 rdf/projekt.rdf.php                           |   0
 rdf/projektarbeit.rdf.php                     |   0
 rdf/projektbeschreibung.rdf.php               |   0
 rdf/projektbetreuer.rdf.php                   |   0
 rdf/projektphase.rdf.php                      |   0
 rdf/projekttask.rdf.php                       |   0
 rdf/projekttyp.rdf.php                        |   0
 rdf/pruefung.rdf.php                          |   0
 rdf/pruefungstyp.rdf.php                      |   0
 rdf/raumtyp.rdf.php                           |   0
 rdf/reihungstest.rdf.php                      |   0
 rdf/ressource.rdf.php                         |   0
 rdf/sammelzeugnis.rdf.php                     |   0
 rdf/sprache.rdf.php                           |   0
 rdf/standort.rdf.php                          |   0
 rdf/status.rdf.php                            |   0
 rdf/statusbericht.rdf.php                     |   0
 rdf/statusgrund.rdf.php                       |   0
 rdf/student.rdf.php                           |   0
 rdf/studienblatt.xml.php                      |   0
 rdf/studienerfolg.rdf.php                     |   0
 rdf/studiengang.rdf.php                       |   0
 rdf/studienordnung.rdf.php                    |   0
 rdf/studienplan.rdf.php                       |   0
 rdf/studiensemester.rdf.php                   |   0
 rdf/stundenplan_betriebsmittel.rdf.php        |   0
 rdf/termine.rdf.php                           |   0
 rdf/undo.rdf.php                              |   0
 rdf/vertrag.rdf.php                           |   0
 rdf/vertragdetails.rdf.php                    |   0
 rdf/vertragsstatus.rdf.php                    |   0
 rdf/vertragstyp.rdf.php                       |   0
 rdf/verwendung.rdf.php                        |   0
 rdf/vorlage.rdf.php                           |   0
 rdf/wawi_buchung.rdf.php                      |   0
 rdf/wawi_buchungstyp.rdf.php                  |   0
 rdf/wawi_konto.rdf.php                        |   0
 rdf/wawi_kostenstelle.rdf.php                 |   0
 rdf/zertifikat.rdf.php                        |   0
 rdf/zeugnis.rdf.php                           |   0
 rdf/zeugnisnote.rdf.php                       |   0
 rdf/zgv.rdf.php                               |   0
 rdf/zgvdoktor.rdf.php                         |   0
 rdf/zgvmaster.rdf.php                         |   0
 rdf/zweck.rdf.php                             |   0
 skin/cis.css                                  |   0
 skin/colorpicker.css                          |   0
 skin/croppie.css                              |   0
 skin/fas.css                                  |   0
 skin/fhcomplete.css                           |   0
 skin/fhcomplete_website.css                   |   0
 skin/flexcrollstyles.css                      |   0
 skin/images/CIS.ico                           | Bin
 skin/images/Calculator.png                    | Bin
 skin/images/Chart.svg                         |   0
 skin/images/DeleteIcon.png                    | Bin
 skin/images/ExcelIcon.png                     | Bin
 skin/images/FAS.ico                           | Bin
 skin/images/Filter.svg                        |   0
 skin/images/Graphs_clip_art.svg               |   0
 skin/images/NeuDokument.png                   | Bin
 skin/images/Report.svg                        |   0
 skin/images/Statistik.svg                     |   0
 skin/images/TWLogo_klein.gif                  | Bin
 skin/images/TWLogo_klein.jpg                  | Bin
 skin/images/Tempus.ico                        | Bin
 skin/images/Vilesci.ico                       | Bin
 skin/images/Wawi.ico                          | Bin
 skin/images/addKonto.png                      | Bin
 skin/images/ampel_gelb.png                    | Bin
 skin/images/ampel_gruen.png                   | Bin
 skin/images/ampel_rot.png                     | Bin
 skin/images/anmelden.png                      | Bin
 skin/images/application_form_delete.png       | Bin
 skin/images/application_form_edit.png         | Bin
 skin/images/application_go.png                | Bin
 skin/images/application_home.png              | Bin
 skin/images/arbeitspaket.png                  | Bin
 skin/images/arrow-next.png                    | Bin
 skin/images/arrow-previous.png                | Bin
 skin/images/arrow-single-down-green.png       | Bin
 skin/images/arrow-single-up-green.png         | Bin
 skin/images/arrow_down.png                    | Bin
 skin/images/asc.gif                           | Bin
 skin/images/bg.gif                            | Bin
 skin/images/bg_.gif                           | Bin
 skin/images/bg_sort.gif                       | Bin
 skin/images/blank.gif                         | Bin
 skin/images/bold.png                          | Bin
 skin/images/bullet_arrow_down.png             | Bin
 skin/images/bullet_arrow_right.png            | Bin
 skin/images/bullet_go.png                     | Bin
 skin/images/bullet_green.png                  | Bin
 skin/images/bullet_red.png                    | Bin
 skin/images/button_admin.png                  | Bin
 skin/images/button_download.png               | Bin
 skin/images/button_endnote.png                | Bin
 skin/images/button_esnack.png                 | Bin
 skin/images/button_feedback.png               | Bin
 skin/images/button_kreuzerltool.png           | Bin
 skin/images/button_listen.png                 | Bin
 skin/images/button_lvinfo.png                 | Bin
 skin/images/button_lvplan.png                 | Bin
 skin/images/button_mail.gif                   | Bin
 skin/images/button_moodle.png                 | Bin
 skin/images/button_newsgroups.png             | Bin
 skin/images/button_opus.png                   | Bin
 skin/images/button_pinboard.png               | Bin
 skin/images/button_semplan.png                | Bin
 skin/images/button_studiupload.png            | Bin
 skin/images/cbox-check.gif                    | Bin
 skin/images/changed.png                       | Bin
 skin/images/check_black.png                   | Bin
 skin/images/checkbox_toggle.png               | Bin
 skin/images/checkbox_uncheck.png              | Bin
 skin/images/cis_logo.png                      | Bin
 skin/images/cis_logo_400px.png                | Bin
 skin/images/cis_logo_weiss.png                | Bin
 skin/images/clock_down.png                    | Bin
 skin/images/clock_up.png                      | Bin
 skin/images/colorpicker/blank.gif             | Bin
 .../colorpicker/colorpicker_background.png    | Bin
 skin/images/colorpicker/colorpicker_hex.png   | Bin
 skin/images/colorpicker/colorpicker_hsb_b.png | Bin
 skin/images/colorpicker/colorpicker_hsb_h.png | Bin
 skin/images/colorpicker/colorpicker_hsb_s.png | Bin
 skin/images/colorpicker/colorpicker_indic.gif | Bin
 .../colorpicker/colorpicker_overlay.png       | Bin
 skin/images/colorpicker/colorpicker_rgb_b.png | Bin
 skin/images/colorpicker/colorpicker_rgb_g.png | Bin
 skin/images/colorpicker/colorpicker_rgb_r.png | Bin
 .../images/colorpicker/colorpicker_select.gif | Bin
 .../images/colorpicker/colorpicker_submit.png | Bin
 skin/images/colorpicker/custom_background.png | Bin
 skin/images/colorpicker/custom_hex.png        | Bin
 skin/images/colorpicker/custom_hsb_b.png      | Bin
 skin/images/colorpicker/custom_hsb_h.png      | Bin
 skin/images/colorpicker/custom_hsb_s.png      | Bin
 skin/images/colorpicker/custom_indic.gif      | Bin
 skin/images/colorpicker/custom_rgb_b.png      | Bin
 skin/images/colorpicker/custom_rgb_g.png      | Bin
 skin/images/colorpicker/custom_rgb_r.png      | Bin
 .../colorpicker/custom_submit - original.png  | Bin
 skin/images/colorpicker/custom_submit.png     | Bin
 skin/images/colorpicker/select.png            | Bin
 skin/images/colorpicker/select2.png           | Bin
 skin/images/colorpicker/slider.png            | Bin
 skin/images/copy.png                          | Bin
 skin/images/cross.png                         | Bin
 skin/images/csv.ico                           | Bin
 skin/images/csv.png                           | Bin
 skin/images/csv_light.png                     | Bin
 skin/images/date_add.png                      | Bin
 skin/images/date_delete.png                   | Bin
 skin/images/date_edit.png                     | Bin
 skin/images/date_go.png                       | Bin
 skin/images/date_go_grau.png                  | Bin
 skin/images/date_magnify.png                  | Bin
 skin/images/delete.gif                        | Bin
 skin/images/delete.png                        | Bin
 skin/images/delete_round.png                  | Bin
 skin/images/delete_x.png                      | Bin
 skin/images/delete_x_grau.png                 | Bin
 skin/images/desc.gif                          | Bin
 skin/images/doc_icon.png                      | Bin
 skin/images/doppelampel_gelb.gif              | Bin
 skin/images/doppelampel_grau.gif              | Bin
 skin/images/doppelampel_rot.gif               | Bin
 skin/images/doppelampel_rot_gelb.gif          | Bin
 skin/images/down.png                          | Bin
 skin/images/down_lvplan.png                   | Bin
 skin/images/drucken.png                       | Bin
 skin/images/edit-paste.png                    | Bin
 skin/images/edit.png                          | Bin
 skin/images/edit_grau.png                     | Bin
 skin/images/edit_wawi.gif                     | Bin
 skin/images/email.png                         | Bin
 skin/images/entitlement-pot.png               | Bin
 skin/images/entry.gif                         | Bin
 skin/images/eps-logo_full.gif                 | Bin
 skin/images/excel.gif                         | Bin
 skin/images/exclamation.png                   | Bin
 skin/images/eye.png                           | Bin
 skin/images/false.png                         | Bin
 skin/images/fh-complete_weiss.png             | Bin
 skin/images/fh_complete_logo.png              | Bin
 skin/images/fh_complete_logo_400x61.png       | Bin
 skin/images/fh_logo.png                       | Bin
 .../fh_technikum_wien_illustration_klein.png  | Bin
 skin/images/fhcomplete.png                    | Bin
 skin/images/fhtw_logo.png                     | Bin
 skin/images/file.gif                          | Bin
 skin/images/flag-green.png                    | Bin
 skin/images/flag-red.png                      | Bin
 skin/images/flag-yellow.png                   | Bin
 skin/images/folder.gif                        | Bin
 skin/images/folderup.gif                      | Bin
 skin/images/green_point.gif                   | Bin
 skin/images/group.png                         | Bin
 skin/images/haken.gif                         | Bin
 skin/images/header_line.gif                   | Bin
 skin/images/header_testtool.png               | Bin
 skin/images/help.png                          | Bin
 skin/images/html.png                          | Bin
 skin/images/html_light.png                    | Bin
 skin/images/ical1.0.png                       | Bin
 skin/images/ical1.0_light.png                 | Bin
 skin/images/ical2.0.png                       | Bin
 skin/images/ical2.0_light.png                 | Bin
 skin/images/img_icon.png                      | Bin
 skin/images/index.php                         |   0
 skin/images/indicator.gif                     | Bin
 skin/images/info.png                          | Bin
 skin/images/information.png                   | Bin
 skin/images/invisible.png                     | Bin
 skin/images/italic.png                        | Bin
 skin/images/ja.png                            | Bin
 skin/images/justifycenter.png                 | Bin
 skin/images/justifyleft.png                   | Bin
 skin/images/justifyright.png                  | Bin
 skin/images/left.gif                          | Bin
 skin/images/left.png                          | Bin
 skin/images/left_lvplan.png                   | Bin
 skin/images/lehrtyp_.png                      | Bin
 skin/images/lehrtyp_2.png                     | Bin
 skin/images/lehrtyp_lf.png                    | Bin
 skin/images/lehrtyp_lv.png                    | Bin
 skin/images/lehrtyp_modul.png                 | Bin
 skin/images/list-add.png                      | Bin
 skin/images/liste.gif                         | Bin
 skin/images/lock.png                          | Bin
 skin/images/login.gif                         | Bin
 skin/images/logo.jpg                          | Bin
 skin/images/logo.png                          | Bin
 skin/images/logo_gmbh.jpg                     | Bin
 skin/images/lv.png                            | Bin
 skin/images/lvaMulti.png                      | Bin
 skin/images/lvaMultiDel.png                   | Bin
 skin/images/lvaSingle.png                     | Bin
 skin/images/lvaSingleDel.png                  | Bin
 skin/images/lvplan.png                        | Bin
 skin/images/map.png                           | Bin
 skin/images/markdown_button.png               | Bin
 skin/images/menu_item.gif                     | Bin
 skin/images/menue.png                         | Bin
 skin/images/menue_hover.png                   | Bin
 skin/images/merge.png                         | Bin
 skin/images/milestone.png                     | Bin
 skin/images/modul.png                         | Bin
 skin/images/moreleft.png                      | Bin
 skin/images/moreleft_lvplan.png               | Bin
 skin/images/moremoreleft.png                  | Bin
 skin/images/moremoreright.png                 | Bin
 skin/images/moreright.png                     | Bin
 skin/images/moreright_lvplan.png              | Bin
 skin/images/nachgereicht.png                  | Bin
 skin/images/not-available.png                 | Bin
 skin/images/offen.png                         | Bin
 skin/images/ok.png                            | Bin
 skin/images/open.gif                          | Bin
 skin/images/openoffice0.jpg                   | Bin
 skin/images/organisationseinheit.png          | Bin
 skin/images/outlook.ico                       | Bin
 skin/images/outlook.png                       | Bin
 skin/images/outlook_light.png                 | Bin
 skin/images/p.gif                             | Bin
 skin/images/page_go.png                       | Bin
 skin/images/page_green.png                    | Bin
 skin/images/pdf.ico                           | Bin
 skin/images/pdf_icon.png                      | Bin
 skin/images/pdfpic.gif                        | Bin
 skin/images/pencil.png                        | Bin
 skin/images/person.gif                        | Bin
 skin/images/photoupload.png                   | Bin
 skin/images/planner.ico                       | Bin
 skin/images/planner.png                       | Bin
 skin/images/planner_logo.png                  | Bin
 skin/images/planner_logo_weiss.png            | Bin
 skin/images/plus.png                          | Bin
 skin/images/ppt_icon.png                      | Bin
 skin/images/preferences-system.png            | Bin
 skin/images/printer.png                       | Bin
 skin/images/profilbild_dummy.jpg              | Bin
 skin/images/projekt.png                       | Bin
 skin/images/projektphase.png                  | Bin
 skin/images/question.png                      | Bin
 skin/images/red_point.gif                     | Bin
 skin/images/refresh.png                       | Bin
 skin/images/repeat.png                        | Bin
 skin/images/right.gif                         | Bin
 skin/images/right.png                         | Bin
 skin/images/right_lvplan.png                  | Bin
 skin/images/round.png                         | Bin
 skin/images/sancho/sancho_footer.jpg          | Bin
 skin/images/sancho/sancho_footer_DEFAULT.jpg  | Bin
 .../sancho/sancho_footer_DEFAULT_bw.jpg       | Bin
 skin/images/sancho/sancho_footer_min_bw.jpg   | Bin
 skin/images/sancho/sancho_footer_min_bw.xcf   | Bin
 skin/images/sancho/sancho_header_DEFAULT.jpg  | Bin
 .../sancho/sancho_header_DEFAULT_bw.jpg       | Bin
 .../sancho/sancho_header_TEMPLATE - Kopie.xcf | Bin
 skin/images/sancho/sancho_header_TEMPLATE.xcf | Bin
 .../sancho/sancho_header_ampel_overdue.jpg    | Bin
 .../sancho_header_confirm_timesheet.jpg       | Bin
 ...sancho_header_du_hast_neue_nachrichten.jpg | Bin
 ...o_header_du_hast_verpflichtende_ampeln.jpg | Bin
 skin/images/sancho/sancho_header_min_bw.jpg   | Bin
 ...header_neue_nachrichten_in_ampelsystem.jpg | Bin
 skin/images/sancho/sancho_roboter.jpg         | Bin
 .../sancho/sancho_roboter_freigestellt.png    | Bin
 skin/images/sancho_round_right_blue.png       | Bin
 skin/images/sancho_round_right_grey.png       | Bin
 skin/images/sancho_round_right_red.png        | Bin
 skin/images/scrollbar_left_right.png          | Bin
 skin/images/scrollbar_up_down.png             | Bin
 skin/images/scrollbase_bottom.png             | Bin
 skin/images/scrollbase_left.png               | Bin
 skin/images/scrollbase_right.png              | Bin
 skin/images/scrollbase_top.png                | Bin
 skin/images/search.png                        | Bin
 skin/images/seperator.gif                     | Bin
 skin/images/service.png                       | Bin
 skin/images/spinner.gif                       | Bin
 skin/images/split-arrows.png                  | Bin
 skin/images/square_blue.png                   | Bin
 skin/images/statistic.png                     | Bin
 skin/images/sticky.png                        | Bin
 skin/images/system-index-search.png           | Bin
 skin/images/tempus_logo.png                   | Bin
 skin/images/tempus_logo_weiss.png             | Bin
 skin/images/testtool_button.png               | Bin
 skin/images/testtool_button_hover.png         | Bin
 skin/images/testtool_buttonleft.png           | Bin
 skin/images/testtool_buttonright.png          | Bin
 skin/images/text-x-generic_with_pencil.png    | Bin
 skin/images/tick.png                          | Bin
 skin/images/timetable.png                     | Bin
 skin/images/transmit.png                      | Bin
 skin/images/tree-diagramm.png                 | Bin
 skin/images/true.png                          | Bin
 skin/images/tw_logo_02.jpg                    | Bin
 .../ui-bg_diagonals-thick_18_b81900_40x40.png | Bin
 .../ui-bg_diagonals-thick_20_666666_40x40.png | Bin
 skin/images/ui-bg_flat_0_aaaaaa_40x100.png    | Bin
 skin/images/ui-bg_flat_10_000000_40x100.png   | Bin
 skin/images/ui-bg_flat_75_ffffff_40x100.png   | Bin
 skin/images/ui-bg_glass_100_f6f6f6_1x400.png  | Bin
 skin/images/ui-bg_glass_100_fdf5ce_1x400.png  | Bin
 skin/images/ui-bg_glass_55_fbf9ee_1x400.png   | Bin
 skin/images/ui-bg_glass_65_ffffff_1x400.png   | Bin
 skin/images/ui-bg_glass_75_dadada_1x400.png   | Bin
 skin/images/ui-bg_glass_75_e6e6e6_1x400.png   | Bin
 skin/images/ui-bg_glass_95_fef1ec_1x400.png   | Bin
 .../ui-bg_gloss-wave_35_f6a828_500x100.png    | Bin
 .../ui-bg_highlight-soft_100_eeeeee_1x100.png | Bin
 .../ui-bg_highlight-soft_75_cccccc_1x100.png  | Bin
 .../ui-bg_highlight-soft_75_ffe45c_1x100.png  | Bin
 skin/images/ui-icons_222222_256x240.png       | Bin
 skin/images/ui-icons_228ef1_256x240.png       | Bin
 skin/images/ui-icons_2e83ff_256x240.png       | Bin
 skin/images/ui-icons_454545_256x240.png       | Bin
 skin/images/ui-icons_888888_256x240.png       | Bin
 skin/images/ui-icons_cd0a0a_256x240.png       | Bin
 skin/images/ui-icons_ef8c08_256x240.png       | Bin
 skin/images/ui-icons_ffd27a_256x240.png       | Bin
 skin/images/ui-icons_ffffff_256x240.png       | Bin
 skin/images/underline.png                     | Bin
 skin/images/up.png                            | Bin
 skin/images/upload.png                        | Bin
 skin/images/user_down.png                     | Bin
 skin/images/user_up.png                       | Bin
 skin/images/verplant_false.png                | Bin
 skin/images/verplant_true.png                 | Bin
 skin/images/vilesci_addons.png                | Bin
 skin/images/vilesci_admin.png                 | Bin
 skin/images/vilesci_farbverlauf.png           | Bin
 skin/images/vilesci_farbverlauf_top.png       | Bin
 skin/images/vilesci_inventar.png              | Bin
 skin/images/vilesci_lehre.png                 | Bin
 skin/images/vilesci_logo.png                  | Bin
 skin/images/vilesci_logo_weiss.png            | Bin
 skin/images/vilesci_lvplan.png                | Bin
 skin/images/vilesci_personen.png              | Bin
 skin/images/vilesci_stammdaten.png            | Bin
 skin/images/vilesci_statistik.png             | Bin
 skin/images/vilesci_wartung.png               | Bin
 skin/images/wawi_logo.png                     | Bin
 skin/images/wawi_logo_sz.png                  | Bin
 skin/images/wawi_logo_weiss.png               | Bin
 skin/images/x-office-presentation.svg         |   0
 skin/images/x-office-spreadsheet.svg          |   0
 skin/images/xls.png                           | Bin
 skin/images/xls_icon.png                      | Bin
 skin/images/xls_light.png                     | Bin
 skin/images/zip_icon.png                      | Bin
 skin/infoscreen.css                           |   0
 skin/jquery-ui-1.9.2.custom.min.css           |   0
 skin/jquery.css                               |   0
 skin/planner.css                              |   0
 skin/print.css                                |   0
 skin/simplecropper.css                        |   0
 skin/sounds/inventar_error.ogg                | Bin
 skin/sounds/testtool_demo.mp3                 | Bin
 skin/sounds/testtool_demo.ogg                 | Bin
 skin/style.css.php                            |   0
 skin/styles/default/cis_logo_text_400x78.png  | Bin
 skin/styles/default/header.png                | Bin
 skin/styles/default/logo_250x130.png          | Bin
 skin/styles/example.css                       |   0
 skin/styles/example/description.txt           |   0
 skin/styles/example/line.jpg                  | Bin
 skin/styles/example/logo.jpg                  | Bin
 skin/styles/example/pixel.jpg                 | Bin
 skin/styles/example/screenshot.jpg            | Bin
 skin/styles/fhb/description.txt               |   0
 skin/styles/fhb/logo.png                      | Bin
 skin/styles/fhb/logo_klein.jpg                | Bin
 skin/styles/jquery.css                        |   0
 skin/styles/mobile.css                        |   0
 skin/styles/mobile/TWLogo_klein.jpg           | Bin
 skin/styles/mobile/description.txt            |   0
 skin/styles/mobile/header_line.jpg            | Bin
 skin/styles/mobile/screenshot.jpg             | Bin
 skin/styles/stp.css                           |   0
 skin/styles/stp/BannerLogo.jpg                | Bin
 skin/styles/stp/KTULogo.jpg                   | Bin
 skin/styles/stp/KTULogo.png                   | Bin
 skin/styles/stp/abschlusspraesentation.jpg    | Bin
 skin/styles/stp/absolventen.jpg               | Bin
 skin/styles/stp/international_week.jpg        | Bin
 skin/styles/stp/logo.jpg                      | Bin
 skin/styles/stp/logo.png                      | Bin
 skin/styles/stp/pitching.jpg                  | Bin
 skin/styles/stp/projektidee.jpg               | Bin
 skin/styles/tinymce.css                       |   0
 skin/styles/tw.css                            |   0
 skin/styles/tw/TWLogo_klein.jpg               | Bin
 skin/styles/tw/academy.jpg                    | Bin
 skin/styles/tw/cis_logo_text_400x78.png       | Bin
 skin/styles/tw/description.txt                |   0
 skin/styles/tw/header.png                     | Bin
 skin/styles/tw/header_line.jpg                | Bin
 skin/styles/tw/lageplan.jpg                   | Bin
 skin/styles/tw/logo.jpg                       | Bin
 skin/styles/tw/logo.png                       | Bin
 skin/styles/tw/logo_200x400.png               | Bin
 skin/styles/tw/logo_250x130.png               | Bin
 skin/styles/tw/logo_50x25.png                 | Bin
 skin/styles/tw/logo_academy.png               | Bin
 skin/styles/tw/logo_klein.png                 | Bin
 skin/styles/tw/logo_ws_50x25.png              | Bin
 skin/styles/tw/screenshot.jpg                 | Bin
 skin/styles/twgreen.css                       |   0
 skin/styles/twgreen/description.txt           |   0
 skin/styles/twgreen/menu.jpg                  | Bin
 skin/styles/twgreen/screenshot.jpg            | Bin
 skin/styles/twgreen/tw_gr_header.jpg          | Bin
 skin/styles/twgreen/tw_gr_logo.jpg            | Bin
 skin/tablesort.css                            |   0
 skin/tempus.css                               |   0
 skin/vilesci.css                              |   0
 skin/wawi.css                                 |   0
 skin/widgets.css                              |   0
 soap/datenverbund_client.php                  |   0
 soap/fhcomplete.php                           |   0
 soap/index.html                               |   0
 soap/kartenverlaengerung.soap.php             |   0
 soap/kartenverlaengerung.test.php             |   0
 soap/kartenverlaengerung.wsdl.php             |   0
 soap/lehrveranstaltung.json.php               |   0
 soap/lehrveranstaltung.soap.php               |   0
 soap/lehrveranstaltung.wsdl.php               |   0
 soap/lvplan.soap.php                          |   0
 soap/lvplan.wsdl.php                          |   0
 soap/mitarbeiter.soap.php                     |   0
 soap/mitarbeiter.wsdl.php                     |   0
 soap/notiz.soap.php                           |   0
 soap/notiz.wsdl.php                           |   0
 soap/ort.soap.php                             |   0
 soap/ort.wsdl.php                             |   0
 soap/person.soap.php                          |   0
 soap/person.wsdl.php                          |   0
 soap/projekt.soap.php                         |   0
 soap/projekt.wsdl.php                         |   0
 soap/projekt_jquery_client.php                |   0
 soap/projektphase.soap.php                    |   0
 soap/projektphase.wsdl.php                    |   0
 soap/projekttask.soap.php                     |   0
 soap/projekttask.wsdl.php                     |   0
 soap/ressource.soap.php                       |   0
 soap/ressource.wsdl.php                       |   0
 soap/ressource_projekt.soap.php               |   0
 soap/ressource_projekt.wsdl.php               |   0
 soap/semesterticket.soap.php                  |   0
 soap/semesterticket.wsdl.php                  |   0
 soap/semesterticket_client.php                |   0
 soap/soap_test_lv.php                         |   0
 soap/soap_test_lvplan.php                     |   0
 soap/soap_test_mitarbeiter.php                |   0
 soap/soap_test_ort.php                        |   0
 soap/soap_test_person.php                     |   0
 soap/soap_test_student.php                    |   0
 soap/stip.class.php                           |   0
 soap/stip.soap.php                            |   0
 soap/stip.wsdl.php                            |   0
 soap/stip_client.php                          |   0
 soap/stip_client_error.php                    |   0
 soap/student.soap.php                         |   0
 soap/student.wsdl.php                         |   0
 soap/studienordnung.json.php                  |   0
 soap/studienplan.json.php                     |   0
 soap/test.soap.php                            |   0
 soap/test.wsdl.php                            |   0
 soap/test_client.php                          |   0
 system/.htaccess_exmpl                        |   0
 system/FH-Complete.txp                        |   0
 system/FHComplete-3.3.sql                     |   0
 system/FHCompleteTDM3PG83.xsl                 |   0
 system/UnitTests/AppdatenTest.php             |   0
 system/UnitTests/FunctionsTest.php            |   0
 system/UnitTests/Studienordnung2Test.php      |   0
 system/UnitTests/StudienordnungTest.php       |   0
 system/UnitTests/StudienplanTest.php          |   0
 system/UnitTests/StudienplatzTest.php         |   0
 .../studienplatzverwaltung/AqaClientTest.php  |   0
 .../AqaFoebisPersonTest.php                   |   0
 .../AqaFoebisStgTest.php                      |   0
 .../studienplatzverwaltung/FunctionsTest.php  |   0
 .../StudienplatzverwaltungAPITest.php         |   0
 .../studienplatzverwaltung/testfile.xml       |   0
 system/UnitTests/ut_studienordnung.php        |   0
 system/ampel_erinnerungsmail.php              |   0
 system/checkStudenten.php                     |   0
 system/check_neue_lektoren.php                |   0
 system/check_studentlehrverband.php           |   0
 system/checkroles.php                         |   0
 system/checksystem.php                        |   0
 system/dbupdate_3.0.php                       |   0
 system/dbupdate_3.1.php                       |   0
 system/dbupdate_3.2.php                       |   0
 system/dbupdate_3.2/migrate_reihungstest.php  |   0
 system/dbupdate_3.3.php                       |   0
 system/dbupdate_3.4.php                       |   0
 ...ter_kurzbz_bei_reservierungen_anzeigen.php |   0
 .../17512_fehlercode_constraints.php          |   0
 ...4_beurteilungsformulare_pruefungssenat.php |   0
 ...82_reihungstest_zugangscode_fuer_login.php |   0
 ...3_tabelle_raumtyp_neues_attribut_aktiv.php |   0
 .../25003_notenimport_nachpruefung.php        |   0
 system/dbupdate_3.4/25999_C4_ma0594.php       |   0
 system/dbupdate_3.4/25999_cis4_cms.php        |   0
 .../26173_index_webservicelog.php             |   0
 ...esci_erfassung_abwesenheiten_reinigung.php |   0
 .../27351_digitalisierung_formulare.php       |   0
 ...27388_anrechnungen_zeitfenster_pflegen.php |   0
 ...49_infocenter_zurueckstellen_mit_grund.php |   0
 ..._plausichecks_in_extension_hinzufuegen.php |   0
 ...tudiengaenge_aus_issuechecks_ausnehmen.php |   0
 .../29529_infocenter_anpassungen.php          |   0
 ...uhstat1_daten_ueber_das_bewerbungstool.php |   0
 ...chnung_neue_attribute_fuer_begruendung.php |   0
 ...537_anmerkung_in_tbl_rolleberechtigung.php |   0
 ...dienbeitrag_fuer_drittsaatenangehoerig.php |   0
 system/dbupdate_3.4/dbupdate_dashboard.php    |   0
 system/dbupdate_3.4/example.php               |   0
 system/environment.php                        |   0
 system/erinnerungsmail_coodle.php             |   0
 system/erinnerungsmail_sek_lehrauftrag.php    |   0
 system/erinnerungsmail_sek_preinteressent.php |   0
 system/fehlerupdate.php                       |   0
 system/filtersupdate.php                      |   0
 system/generate_missing_sto.php               |   0
 system/generatestudienordnung.php             |   0
 system/konsistenzpruefung.php                 |   0
 system/matrikelnummer_clearing_download.php   |   0
 system/matrikelnummer_clearing_import.php     |   0
 system/phpinfo.php                            |   0
 system/phrasesupdate.php                      |   0
 system/prestudentstatus_studienplan_id.php    |   0
 system/pruefung_bestaetigen.php               |   0
 system/services/systemd/phantomjs@.service    |   0
 system/services/systemd/unoconv@.service      |   0
 system/services/upstart/unoconv.conf          |   0
 system/sync/sync_stpldev_stpl.php             |   0
 system/system_check_sql.php                   |   0
 system/templates/contentmittitel.xsd          |   0
 ...ntentmittitel_filterwidget_xslt_xhtml.xslt |   0
 .../templates/contentmittitel_xslt_xhtml.xslt |   0
 system/templates/contentohnetitel.xsd         |   0
 .../contentohnetitel_xslt_xhtml.xslt          |   0
 system/templates/include.xsd                  |   0
 system/templates/include_xslt_xhtml.xslt      |   0
 system/templates/news.xsd                     |   0
 system/templates/news_infoscreen.xsd          |   0
 .../templates/news_infoscreen_xslt_xhtml.xslt |   0
 system/templates/news_xslt_xhtml.xslt         |   0
 system/templates/redirect.xsd                 |   0
 system/templates/redirect_xslt_xhtml.xslt     |   0
 system/vorlage_zip/AccountInfo.odt            | Bin
 system/vorlage_zip/AntragAbmeldung.odt        | Bin
 system/vorlage_zip/AntragAbmeldungStgl.odt    | Bin
 system/vorlage_zip/AntragUnterbrechung.odt    | Bin
 system/vorlage_zip/AnwListBarcode.odt         | Bin
 system/vorlage_zip/Anwesenheitslist.odt       | Bin
 system/vorlage_zip/AusbVerEng.odt             | Bin
 system/vorlage_zip/Ausbildungsver.odt         | Bin
 system/vorlage_zip/Bakkurkunde.odt            | Bin
 system/vorlage_zip/BakkurkundeEng.odt         | Bin
 system/vorlage_zip/Bakkzeugnis.odt            | Bin
 system/vorlage_zip/BakkzeugnisEng.odt         | Bin
 system/vorlage_zip/Bescheid.odt               | Bin
 system/vorlage_zip/BescheidEng.odt            | Bin
 system/vorlage_zip/Bestellung.odt             | Bin
 system/vorlage_zip/Bewerberakt.odt            | Bin
 system/vorlage_zip/DiplSupplement.odt         | Bin
 system/vorlage_zip/DiplSupplementDebug.odt    | Bin
 system/vorlage_zip/Diplomurkunde.odt          | Bin
 system/vorlage_zip/DiplomurkundeEng.odt       | Bin
 system/vorlage_zip/Diplomzeugnis.odt          | Bin
 system/vorlage_zip/DiplomzeugnisEng.odt       | Bin
 system/vorlage_zip/Erfolgsnachweis.odt        | Bin
 system/vorlage_zip/FHB_Ausbildungsver.odt     | Bin
 system/vorlage_zip/FHB_PrProtBA.odt           | Bin
 system/vorlage_zip/FHB_PrProtMA.odt           | Bin
 system/vorlage_zip/Inskription.odt            | Bin
 system/vorlage_zip/InskriptionEng.odt         | Bin
 system/vorlage_zip/KTU_Studienblatt.odt       | Bin
 system/vorlage_zip/LVZeugnis.odt              | Bin
 system/vorlage_zip/LVZeugnisEng.odt           | Bin
 system/vorlage_zip/Lehrauftrag.odt            | Bin
 system/vorlage_zip/Lehrtaetigkeit.odt         | Bin
 system/vorlage_zip/PrProtBA.odt               | Bin
 system/vorlage_zip/PrProtBAEng.odt            | Bin
 system/vorlage_zip/PrProtMA.odt               | Bin
 system/vorlage_zip/PrProtMAEng.odt            | Bin
 system/vorlage_zip/PrProtMAEng_alt.odt        | Bin
 system/vorlage_zip/PrProtMA_alt.odt           | Bin
 system/vorlage_zip/Projektbeschr.odt          | Bin
 system/vorlage_zip/Studienblatt.odt           | Bin
 system/vorlage_zip/StudienblattEng.odt        | Bin
 system/vorlage_zip/Studienerfolg.odt          | Bin
 system/vorlage_zip/StudienerfolgEng.odt       | Bin
 system/vorlage_zip/Studienordnung.odt         | Bin
 system/vorlage_zip/Uebernahme.odt             | Bin
 system/vorlage_zip/Zahlung.odt                | Bin
 system/vorlage_zip/Zertifikat.odt             | Bin
 system/vorlage_zip/Zertifikat_ktu.odt         | Bin
 system/vorlage_zip/Zeugnis.odt                | Bin
 system/vorlage_zip/ZeugnisEng.odt             | Bin
 system/vorlage_zip/ZeugnisEngNeu.odt          | Bin
 system/vorlage_zip/ZeugnisNeu.odt             | Bin
 system/vorlage_zip/Zutrittskarte.odt          | Bin
 system/vorlage_zip/fotoliste.odt              | Bin
 system/vorlage_zip/statusbericht.ods          | Bin
 system/xsl/AntragAbmeldung.xsl                |   0
 system/xsl/AntragAbmeldungStgl.xsl            |   0
 system/xsl/AntragUnterbrechung.xsl            |   0
 system/xsl/AnwListBarcode.xsl                 |   0
 system/xsl/Anwesenheitsliste.xsl              |   0
 system/xsl/AusbVerEngHead_0.xsl               |   0
 system/xsl/AusbVerEng_0.xsl                   |   0
 system/xsl/AusbildStatus_0.xsl                |   0
 system/xsl/Ausbildungsver_0.xsl               |   0
 system/xsl/Bewerberakt.xsl                    |   0
 system/xsl/LehrveranstaltungszeugnisEng_0.xsl |   0
 system/xsl/Lehrveranstaltungszeugnis_0.xsl    |   0
 .../Lehrveranstaltungszeugnis_Eng_9005.xsl    |   0
 system/xsl/PrProtBAEng_0.xsl                  |   0
 system/xsl/PrProtBA_0.xsl                     |   0
 system/xsl/PrProtMAEng_0.xsl                  |   0
 system/xsl/PrProtMA_0.xsl                     |   0
 system/xsl/Projektbeschr_0.xsl                |   0
 system/xsl/StudienblattEng_0.xsl              |   0
 system/xsl/Studienblatt_0.xsl                 |   0
 system/xsl/Studienordnung_0.xsl               |   0
 system/xsl/Studienordnung_style_0.xml         |   0
 system/xsl/ZertifikatFreifaecher_0.xsl        |   0
 system/xsl/ZeugnisEng_0.xsl                   |   0
 system/xsl/ZeugnisEng_Lehrgaenge.xsl          |   0
 system/xsl/Zeugnis_0.xsl                      |   0
 system/xsl/Zeugnis_Lehrgaenge.xsl             |   0
 system/xsl/Zeugnis_style_0.xsl                |   0
 system/xsl/Zutrittskarte.xsl                  |   0
 system/xsl/accountinfoblatt_0.xsl             |   0
 system/xsl/bachelorurkundeEng_0.xsl           |   0
 system/xsl/bachelorurkunde_0.xsl              |   0
 system/xsl/bakkzeugnisEng_0.xsl               |   0
 system/xsl/bakkzeugnis_0.xsl                  |   0
 system/xsl/bescheid_0.xsl                     |   0
 system/xsl/bescheid_style_0.xsl               |   0
 system/xsl/diplomaSuppDebug.xsl               |   0
 system/xsl/diplomaSupp_0.xsl                  |   0
 system/xsl/diplomaSupp_style_0.xsl            |   0
 system/xsl/diplomurkundeEng_0.xsl             |   0
 system/xsl/diplomurkunde_0.xsl                |   0
 system/xsl/diplomzeugnisEng_0.xsl             |   0
 system/xsl/diplomzeugnis_0.xsl                |   0
 system/xsl/fotoliste_0.xsl                    |   0
 system/xsl/inskription_0.xsl                  |   0
 system/xsl/inskription_eng_0.xsl              |   0
 system/xsl/lehrauftrag_0.xsl                  |   0
 system/xsl/lehrauftrag_style_0.xsl            |   0
 system/xsl/lehrtaetigkeit_0.xsl               |   0
 system/xsl/prprotokollbakk_0.xsl              |   0
 system/xsl/statusbericht.xsl                  |   0
 system/xsl/studienerfolgEng_0.xsl             |   0
 system/xsl/studienerfolgEng_Lehrgaenge.xsl    |   0
 system/xsl/studienerfolg_0.xsl                |   0
 system/xsl/studienerfolg_Lehrgaenge.xsl       |   0
 system/xsl/uebernahmebestaetigung_0.xsl       |   0
 system/xsl/zahlung_0.xsl                      |   0
 system/xsl/zahlung_style_0.xsl                |   0
 .../Classes/FHCPropertyDeclarationSniff.php   |   0
 .../Sniffs/Classes/FHCValidClassNameSniff.php |   0
 .../FHCControlSignatureSniff.php              |   0
 .../Methods/FHCMethodDeclarationSniff.php     |   0
 tests/codesniffer/FHComplete/ruleset.xml      |   0
 tests/phpmd/rulesets-dev-only.xml             |   0
 tests/phpmd/rulesets.xml                      |   0
 version.php                                   |   0
 vilesci/admin/XPI/FASoProduktiv/FASonline.xpi | Bin
 .../FASoProduktiv/chrome/content/contents.rdf |   0
 .../chrome/content/fasonline.xul              |   0
 .../XPI/FASoProduktiv/chrome/fasonline.jar    | Bin
 vilesci/admin/XPI/FASoProduktiv/install.js    |   0
 vilesci/admin/XPI/FASoProduktiv/install.rdf   |   0
 .../FASoProduktivSeamonkey2.0/FASonline.xpi   | Bin
 .../FASoProduktivSeamonkey2.0/chrome.manifest |   0
 .../chrome/content/contents.rdf               |   0
 .../chrome/content/fasonline.xul              |   0
 .../chrome/fasonline.jar                      | Bin
 .../chrome/skin/fasonline.png                 | Bin
 .../XPI/FASoProduktivSeamonkey2.0/install.rdf |   0
 vilesci/admin/XPI/FASoStPoelten/FASonline.xpi | Bin
 .../FASoStPoelten/chrome/content/contents.rdf |   0
 .../chrome/content/fasonline.xul              |   0
 .../XPI/FASoStPoelten/chrome/fasonline.jar    | Bin
 vilesci/admin/XPI/FASoStPoelten/install.js    |   0
 vilesci/admin/XPI/FASoStPoelten/install.rdf   |   0
 .../XPI/FASoStPoeltenDEV/FASoStPoelten2.xpi   | Bin
 .../chrome/content/contents.rdf               |   0
 .../chrome/content/fasonline2.xul             |   0
 .../FASoStPoeltenDEV/chrome/fasonline2.jar    | Bin
 vilesci/admin/XPI/FASoStPoeltenDEV/install.js |   0
 .../admin/XPI/FASoStPoeltenDEV/install.rdf    |   0
 vilesci/admin/XPI/FHCFas/FHCFas.xpi           | Bin
 .../XPI/FHCFas/chrome/content/contents.rdf    |   0
 .../XPI/FHCFas/chrome/content/fhcfas.xul      |   0
 vilesci/admin/XPI/FHCFas/chrome/fhcfas.jar    | Bin
 vilesci/admin/XPI/FHCFas/install.js           |   0
 vilesci/admin/XPI/FHCFas/install.rdf          |   0
 vilesci/admin/XPI/FHCTempus/FHCTempus.xpi     | Bin
 .../XPI/FHCTempus/chrome/content/contents.rdf |   0
 .../FHCTempus/chrome/content/fhctempus.xul    |   0
 .../admin/XPI/FHCTempus/chrome/fhctempus.jar  | Bin
 vilesci/admin/XPI/FHCTempus/install.js        |   0
 vilesci/admin/XPI/FHCTempus/install.rdf       |   0
 .../admin/XPI/PlannerProduktiv/Planner.xpi    | Bin
 .../chrome/content/contents.rdf               |   0
 .../chrome/content/planner.xul                |   0
 .../XPI/PlannerProduktiv/chrome/planner.jar   | Bin
 vilesci/admin/XPI/PlannerProduktiv/install.js |   0
 .../admin/XPI/PlannerProduktiv/install.rdf    |   0
 .../Seamonkey2.11/fhcomplete/chrome.manifest  |   0
 .../fhcomplete/chrome/content/appchoose.xul   |   0
 .../fhcomplete/chrome/content/contents.rdf    |   0
 .../fhcomplete/chrome/content/fas.xul         |   0
 .../fhcomplete/chrome/content/fhcomplete.js   |   0
 .../fhcomplete/chrome/content/fhcomplete.xul  |   0
 .../fhcomplete/chrome/content/options.xul     |   0
 .../fhcomplete/chrome/content/planner.xul     |   0
 .../chrome/content/statusbaroverlay.xul       |   0
 .../fhcomplete/chrome/content/tempus.xul      |   0
 .../fhcomplete/chrome/fhcomplete.jar          | Bin
 .../fhcomplete/chrome/skin/fasonline.png      | Bin
 .../fhcomplete/chrome/skin/fasonline15.png    | Bin
 .../fhcomplete/chrome/skin/fasonline32.png    | Bin
 .../fhcomplete/chrome/skin/fhcomplete.ico     | Bin
 .../fhcomplete/chrome/skin/fhcomplete.png     | Bin
 .../fhcomplete/chrome/skin/planner.png        | Bin
 .../fhcomplete/chrome/skin/planner15.png      | Bin
 .../fhcomplete/chrome/skin/planner32.png      | Bin
 .../fhcomplete/chrome/skin/settings.png       | Bin
 .../fhcomplete/chrome/skin/tempus.png         | Bin
 .../fhcomplete/chrome/skin/tempus15.png       | Bin
 .../fhcomplete/chrome/skin/tempus32.png       | Bin
 .../defaults/preferences/defaults.js          |   0
 .../Seamonkey2.11/fhcomplete/fhcomplete.xpi   | Bin
 .../XPI/Seamonkey2.11/fhcomplete/install.rdf  |   0
 .../XPI/Seamonkey2.11/fhcomplete/make.sh      |   0
 vilesci/admin/XPI/TempusStPoelten/Tempus.xpi  | Bin
 .../chrome/content/contents.rdf               |   0
 .../TempusStPoelten/chrome/content/tempus.xul |   0
 .../XPI/TempusStPoelten/chrome/tempus.jar     | Bin
 vilesci/admin/XPI/TempusStPoelten/install.js  |   0
 vilesci/admin/XPI/TempusStPoelten/install.rdf |   0
 .../TempusStPoeltenDEV/TempusStPoelten2.xpi   | Bin
 .../chrome/content/contents.rdf               |   0
 .../chrome/content/tempus2.xul                |   0
 .../XPI/TempusStPoeltenDEV/chrome/tempus2.jar | Bin
 .../admin/XPI/TempusStPoeltenDEV/install.js   |   0
 .../admin/XPI/TempusStPoeltenDEV/install.rdf  |   0
 .../TempusStPoeltenExtern.xpi                 | Bin
 .../TempusStPoeltenExtern81.xpi               | Bin
 .../chrome/content/contents.rdf               |   0
 .../chrome/content/tempusextern81.xul         |   0
 .../chrome/tempusextern.jar                   | Bin
 .../chrome/tempusextern81.jar                 | Bin
 .../XPI/TempusStPoeltenExtern/install.js      |   0
 .../XPI/TempusStPoeltenExtern/install.rdf     |   0
 .../admin/XPI/TempusTWProduktiv/Tempusdev.xpi | Bin
 .../chrome/content/contents.rdf               |   0
 .../chrome/content/tempusdev.xul              |   0
 .../TempusTWProduktiv/chrome/tempusdev.jar    | Bin
 .../admin/XPI/TempusTWProduktiv/install.js    |   0
 .../admin/XPI/TempusTWProduktiv/install.rdf   |   0
 vilesci/admin/XPI/orbit-1.8f5-MiK.xpi         | Bin
 vilesci/bis/archiv.php                        |   0
 vilesci/bis/bisdaten/.gitignore               |   0
 vilesci/bis/checkfunktion.php                 |   0
 vilesci/bis/checkverwendung.php               |   0
 vilesci/bis/lehrgangsmeldung.php              |   0
 vilesci/bis/personal_generateverwendung.php   |   0
 .../bis/personal_lektorenohnelehrauftrag.php  |   0
 vilesci/bis/personalimport.php                |   0
 vilesci/bis/personalmeldung.php               |   0
 vilesci/bis/personalmeldung_uebersicht.php    |   0
 vilesci/bis/studentenmeldung.php              |   0
 vilesci/cronjobs/bpk.php                      |   0
 vilesci/cronjobs/cronjob.php                  |   0
 vilesci/cronjobs/jobwatcher.php               |   0
 vilesci/cronjobs/lvplanwartung.php            |   0
 vilesci/cronjobs/matrikelnummern.php          |   0
 vilesci/cronjobs/testjob.php                  |   0
 vilesci/fhausweis/bildpruefung.php            |   0
 vilesci/fhausweis/bildzuschnitt.php           |   0
 vilesci/fhausweis/imageupload.php             |   0
 vilesci/fhausweis/kartenausgabe.php           |   0
 vilesci/fhausweis/kartenkorrektur.php         |   0
 vilesci/fhausweis/kartenruecknahme.php        |   0
 vilesci/fhausweis/kartentausch.php            |   0
 vilesci/fhausweis/kartenverwaltung.php        |   0
 vilesci/fhausweis/kartezuweisen.php           |   0
 vilesci/fhausweis/search.php                  |   0
 vilesci/fhausweis/verlaengerung.php           |   0
 vilesci/index.php                             |   0
 vilesci/inventar/etiketten.php                |   0
 vilesci/inventar/inventar.php                 |   0
 vilesci/inventar/inventar_afa.php             |   0
 vilesci/inventar/inventar_autocomplete.php    |   0
 vilesci/inventar/inventar_inventur.php        |   0
 vilesci/inventar/inventar_pflege.php          |   0
 vilesci/inventar/inventarliste.php            |   0
 vilesci/inventar/konto_detail.php             |   0
 vilesci/inventar/kostenstelle_detail.php      |   0
 vilesci/inventar/studiengang_detail.php       |   0
 vilesci/left.php                              |   0
 vilesci/lehre/abgabe_assistenz.php            |   0
 vilesci/lehre/abgabe_assistenz_details.php    |   0
 vilesci/lehre/abgabe_assistenz_frameset.php   |   0
 .../lehre/abgabe_assistenz_multitermin.php    |   0
 vilesci/lehre/abgabe_assistenz_zusatz.php     |   0
 vilesci/lehre/check/index.html                |   0
 vilesci/lehre/check/res_check.php             |   0
 vilesci/lehre/check/stdplan_check.php         |   0
 vilesci/lehre/check/ueberbuchung.php          |   0
 vilesci/lehre/check/verplanungsuebersicht.php |   0
 vilesci/lehre/einheit_autocomplete.php        |   0
 vilesci/lehre/einheit_det.php                 |   0
 vilesci/lehre/einheit_menu.php                |   0
 vilesci/lehre/ferienverwaltung.php            |   0
 vilesci/lehre/freifach.php                    |   0
 vilesci/lehre/freifach_lektoren.php           |   0
 .../lehre/freifach_studentenvorrueckung.php   |   0
 vilesci/lehre/incoming_delete.php             |   0
 vilesci/lehre/index.html                      |   0
 vilesci/lehre/lehreinheiten_vorrueckung.php   |   0
 vilesci/lehre/lehrveranstaltung.php           |   0
 vilesci/lehre/lehrveranstaltung_details.php   |   0
 vilesci/lehre/lehrveranstaltung_frameset.html |   0
 .../lehre/lehrveranstaltung_kompatibel.php    |   0
 vilesci/lehre/lehrveranstaltung_lvangebot.php |   0
 vilesci/lehre/lv_merge.php                    |   0
 vilesci/lehre/lvangebot_autocomplete.php      |   0
 vilesci/lehre/lvplan_custom_sync.php          |   0
 vilesci/lehre/lvplanwartung.php               |   0
 vilesci/lehre/projektarbeitsbenotung.php      |   0
 vilesci/lehre/raumauslastung.php              |   0
 vilesci/lehre/raummitteilung.php              |   0
 vilesci/lehre/reservierung_autocomplete.php   |   0
 vilesci/lehre/reservierung_insert.php         |   0
 vilesci/lehre/saveStudienordnung.php          |   0
 vilesci/lehre/stpl_benutzer_kollision.php     |   0
 .../lehre/stpl_benutzer_kollision_details.php |   0
 .../stpl_benutzer_kollision_frameset.html     |   0
 vilesci/lehre/studienordnung.inc.php          |   0
 vilesci/lehre/studienordnung.js               |   0
 vilesci/lehre/studienordnung.php              |   0
 vilesci/lehre/studienordnung_autocomplete.php |   0
 vilesci/lehre/studienordnung_lvregel.js       |   0
 vilesci/lehre/studienplan_gueltigkeit.php     |   0
 vilesci/lehre/studienplan_vorrueckung.php     |   0
 vilesci/lehre/studienplan_zuteilung.php       |   0
 vilesci/lehre/zeitwuensche.php                |   0
 vilesci/main.php                              |   0
 vilesci/personen/akteupdate.php               |   0
 vilesci/personen/aliquote_reduktion.json.php  |   0
 vilesci/personen/aliquote_reduktion.php       |   0
 vilesci/personen/anwesenheit.php              |   0
 .../personen/anwesenheitslisten_barcode.php   |   0
 vilesci/personen/aufbaukurscheckliste.php     |   0
 vilesci/personen/funktion.php                 |   0
 vilesci/personen/funktion_det.php             |   0
 .../personen/import/interessentenimport.php   |   0
 vilesci/personen/import/mitarbeiterimport.php |   0
 vilesci/personen/incoming_detail.php          |   0
 vilesci/personen/incoming_frameset.php        |   0
 .../personen/incoming_lehrveranstaltungen.php |   0
 vilesci/personen/incoming_uebersicht.php      |   0
 vilesci/personen/index.html                   |   0
 vilesci/personen/institutsliste.php           |   0
 vilesci/personen/kontaktdaten_edit.php        |   0
 vilesci/personen/lehrveranstaltungen_json.php |   0
 vilesci/personen/leistungsstipendium.php      |   0
 vilesci/personen/lektor_uebersicht.php        |   0
 vilesci/personen/outgoing_detail.php          |   0
 vilesci/personen/outgoing_frameset.php        |   0
 vilesci/personen/outgoing_uebersicht.php      |   0
 vilesci/personen/personen_anlegen.php         |   0
 vilesci/personen/personen_details.php         |   0
 vilesci/personen/personendetails.php          |   0
 vilesci/personen/preinteressent_anlegen.php   |   0
 vilesci/personen/preinteressent_detail.php    |   0
 vilesci/personen/preinteressent_frameset.html |   0
 .../personen/preinteressent_uebernahme.php    |   0
 .../personen/preinteressent_uebersicht.php    |   0
 vilesci/personen/student_edit.php             |   0
 vilesci/personen/student_vorrueckung.php      |   0
 vilesci/personen/suche.php                    |   0
 vilesci/personen/uniflow.csv.php              |   0
 vilesci/personen/urlaubsverwaltung.php        |   0
 vilesci/personen/wiederholer.php              |   0
 vilesci/personen/zeitwunsch.php               |   0
 vilesci/stammdaten/ampel_details.php          |   0
 vilesci/stammdaten/ampel_frameset.html        |   0
 vilesci/stammdaten/ampel_uebersicht.php       |   0
 vilesci/stammdaten/auswertung_fhtw.php        |   0
 .../benutzerberechtigung_autocomplete.php     |   0
 .../benutzerberechtigung_detailliste.php      |   0
 .../benutzerberechtigung_details.php          |   0
 .../benutzerberechtigung_frameset.html        |   0
 .../benutzerberechtigung_uebersicht.php       |   0
 vilesci/stammdaten/berechtigungen.php         |   0
 vilesci/stammdaten/berechtigungrolle.php      |   0
 vilesci/stammdaten/betriebsmittel_details.php |   0
 .../stammdaten/betriebsmittel_frameset.php    |   0
 .../stammdaten/betriebsmittel_uebersicht.php  |   0
 vilesci/stammdaten/buchung_typ.php            |   0
 vilesci/stammdaten/cronjobverwaltung.php      |   0
 .../dokumentvorlagen_verwaltung.php           |   0
 vilesci/stammdaten/firma_details.php          |   0
 vilesci/stammdaten/firma_detailwork.php       |   0
 vilesci/stammdaten/firma_frameset.html        |   0
 vilesci/stammdaten/firma_uebersicht.php       |   0
 vilesci/stammdaten/firma_zusammen_details.php |   0
 .../stammdaten/firma_zusammen_uebersicht.php  |   0
 vilesci/stammdaten/gsprogramm.php             |   0
 vilesci/stammdaten/imexport/dabis.php         |   0
 vilesci/stammdaten/imexport/index.html        |   0
 .../imexport/zutrittskarten/export.php        |   0
 .../zutrittskarten/generatefromsipass.php     |   0
 .../generatefromsipass_predelete.php          |   0
 .../imexport/zutrittskarten/import.php        |   0
 .../imexport/zutrittskarten/index.html        |   0
 vilesci/stammdaten/infoscreen_details.php     |   0
 vilesci/stammdaten/infoscreen_frameset.html   |   0
 vilesci/stammdaten/infoscreen_preview.php     |   0
 vilesci/stammdaten/infoscreen_uebersicht.php  |   0
 vilesci/stammdaten/lvbgruppenverwaltung.js    |   0
 vilesci/stammdaten/lvbgruppenverwaltung.php   |   0
 .../stammdaten/lvbgruppenverwaltungDetail.php |   0
 .../stammdaten/lvbgruppenverwaltungTree.php   |   0
 vilesci/stammdaten/organisationseinheiten.php |   0
 vilesci/stammdaten/personen_wartung.php       |   0
 vilesci/stammdaten/raum_details.php           |   0
 vilesci/stammdaten/raum_frameset.html         |   0
 vilesci/stammdaten/raum_uebersicht.php        |   0
 .../reihungstest_administration.php           |   0
 .../reihungstest_zusammenlegung.php           |   0
 vilesci/stammdaten/reihungstestverwaltung.php |   0
 .../reihungstestverwaltung_autocomplete.php   |   0
 vilesci/stammdaten/service_details.php        |   0
 vilesci/stammdaten/service_frameset.html      |   0
 vilesci/stammdaten/service_uebersicht.php     |   0
 vilesci/stammdaten/set_gemeinde.php           |   0
 .../stammdaten/stammdaten_autocomplete.php    |   0
 vilesci/stammdaten/statistik_details.php      |   0
 vilesci/stammdaten/statistik_frameset.html    |   0
 vilesci/stammdaten/statistik_uebersicht.php   |   0
 vilesci/stammdaten/studiengang_details.js     |   0
 vilesci/stammdaten/studiengang_details.php    |   0
 vilesci/stammdaten/studiengang_dokumente.php  |   0
 vilesci/stammdaten/studiengang_edit.php       |   0
 vilesci/stammdaten/studiengang_frameset.html  |   0
 vilesci/stammdaten/studiengang_uebersicht.php |   0
 vilesci/stammdaten/studiensemester.php        |   0
 vilesci/stammdaten/variablen_details.php      |   0
 vilesci/stammdaten/variablen_frameset.html    |   0
 vilesci/stammdaten/variablen_uebersicht.php   |   0
 vilesci/stammdaten/vertrag_typ.php            |   0
 vilesci/statistik/filter_details.php          |   0
 vilesci/statistik/filter_frameset.html        |   0
 vilesci/statistik/filter_overview.php         |   0
 vilesci/statistik/filter_vorschau.php         |   0
 vilesci/statistik/incoming.php                |   0
 vilesci/statistik/oehwaehlerverzeichnis.php   |   0
 vilesci/statistik/outgoing.php                |   0
 vilesci/statistik/statistik.php               |   0
 vilesci/statistik/statistik_frameset.php      |   0
 vilesci/statistik/statistik_sql.php           |   0
 vilesci/statistik/studenten_historie.php      |   0
 vilesci/statistik/studierendenliste_oeh.php   |   0
 vilesci/top.php                               |   0
 wawi/auswertungen/aufteilung.php              |   0
 wawi/auswertungen/konto.php                   |   0
 wawi/auswertungen/kostenstelle.php            |   0
 wawi/auswertungen/wawi_tags.php               |   0
 wawi/auth.php                                 |   0
 wawi/berechtigung.php                         |   0
 wawi/bestellung.php                           |   0
 wawi/budget.php                               |   0
 wawi/check_bestellung.php                     |   0
 wawi/firma.php                                |   0
 wawi/home.php                                 |   0
 wawi/index.php                                |   0
 wawi/kontouebersicht.php                      |   0
 wawi/kostenstellenuebersicht.php              |   0
 wawi/login.php                                |   0
 wawi/logout.php                               |   0
 wawi/menu.php                                 |   0
 wawi/mwst.html                                |   0
 wawi/pdfExport.txt                            |   0
 wawi/rechnung.php                             |   0
 wawi/wawi_autocomplete.php                    |   0
 webdav/Caldav_Backend.php                     |   0
 webdav/Principal.php                          |   0
 webdav/auth.class.php                         |   0
 webdav/google.txt                             |   0
 webdav/lvplan.php                             |   0
 5677 files changed, 683 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 .gitignore
 mode change 100644 => 100755 CHANGELOG.md
 mode change 100644 => 100755 FHC-vendor/angular-tablesort/.gitignore
 mode change 100644 => 100755 FHC-vendor/angular-tablesort/LICENSE
 mode change 100644 => 100755 FHC-vendor/angular-tablesort/README.md
 mode change 100644 => 100755 FHC-vendor/angular-tablesort/bower.json
 mode change 100644 => 100755 FHC-vendor/angular-tablesort/example.html
 mode change 100644 => 100755 FHC-vendor/angular-tablesort/index.js
 mode change 100644 => 100755 FHC-vendor/angular-tablesort/js/angular-tablesort.js
 mode change 100644 => 100755 FHC-vendor/angular-tablesort/package.json
 mode change 100644 => 100755 FHC-vendor/angular-tablesort/tablesort.css
 mode change 100644 => 100755 FHC-vendor/easyui/changelog.txt
 mode change 100644 => 100755 FHC-vendor/easyui/easyloader.js
 mode change 100644 => 100755 FHC-vendor/easyui/jquery.easyui.min.js
 mode change 100644 => 100755 FHC-vendor/easyui/jquery.easyui.mobile.js
 mode change 100644 => 100755 FHC-vendor/easyui/jquery.min.js
 mode change 100644 => 100755 FHC-vendor/easyui/license_freeware.txt
 mode change 100644 => 100755 FHC-vendor/easyui/locale/easyui-lang-af.js
 mode change 100644 => 100755 FHC-vendor/easyui/locale/easyui-lang-am.js
 mode change 100644 => 100755 FHC-vendor/easyui/locale/easyui-lang-ar.js
 mode change 100644 => 100755 FHC-vendor/easyui/locale/easyui-lang-bg.js
 mode change 100644 => 100755 FHC-vendor/easyui/locale/easyui-lang-ca.js
 mode change 100644 => 100755 FHC-vendor/easyui/locale/easyui-lang-cs.js
 mode change 100644 => 100755 FHC-vendor/easyui/locale/easyui-lang-cz.js
 mode change 100644 => 100755 FHC-vendor/easyui/locale/easyui-lang-da.js
 mode change 100644 => 100755 FHC-vendor/easyui/locale/easyui-lang-de.js
 mode change 100644 => 100755 FHC-vendor/easyui/locale/easyui-lang-el.js
 mode change 100644 => 100755 FHC-vendor/easyui/locale/easyui-lang-en.js
 mode change 100644 => 100755 FHC-vendor/easyui/locale/easyui-lang-es.js
 mode change 100644 => 100755 FHC-vendor/easyui/locale/easyui-lang-fr.js
 mode change 100644 => 100755 FHC-vendor/easyui/locale/easyui-lang-it.js
 mode change 100644 => 100755 FHC-vendor/easyui/locale/easyui-lang-jp.js
 mode change 100644 => 100755 FHC-vendor/easyui/locale/easyui-lang-nl.js
 mode change 100644 => 100755 FHC-vendor/easyui/locale/easyui-lang-pl.js
 mode change 100644 => 100755 FHC-vendor/easyui/locale/easyui-lang-pt_BR.js
 mode change 100644 => 100755 FHC-vendor/easyui/locale/easyui-lang-ru.js
 mode change 100644 => 100755 FHC-vendor/easyui/locale/easyui-lang-sv_SE.js
 mode change 100644 => 100755 FHC-vendor/easyui/locale/easyui-lang-tr.js
 mode change 100644 => 100755 FHC-vendor/easyui/locale/easyui-lang-zh_CN.js
 mode change 100644 => 100755 FHC-vendor/easyui/locale/easyui-lang-zh_TW.js
 mode change 100644 => 100755 FHC-vendor/easyui/plugins/jquery.accordion.js
 mode change 100644 => 100755 FHC-vendor/easyui/plugins/jquery.calendar.js
 mode change 100644 => 100755 FHC-vendor/easyui/plugins/jquery.combo.js
 mode change 100644 => 100755 FHC-vendor/easyui/plugins/jquery.combobox.js
 mode change 100644 => 100755 FHC-vendor/easyui/plugins/jquery.combogrid.js
 mode change 100644 => 100755 FHC-vendor/easyui/plugins/jquery.combotree.js
 mode change 100644 => 100755 FHC-vendor/easyui/plugins/jquery.datagrid.js
 mode change 100644 => 100755 FHC-vendor/easyui/plugins/jquery.datalist.js
 mode change 100644 => 100755 FHC-vendor/easyui/plugins/jquery.datebox.js
 mode change 100644 => 100755 FHC-vendor/easyui/plugins/jquery.datetimebox.js
 mode change 100644 => 100755 FHC-vendor/easyui/plugins/jquery.datetimespinner.js
 mode change 100644 => 100755 FHC-vendor/easyui/plugins/jquery.dialog.js
 mode change 100644 => 100755 FHC-vendor/easyui/plugins/jquery.draggable.js
 mode change 100644 => 100755 FHC-vendor/easyui/plugins/jquery.droppable.js
 mode change 100644 => 100755 FHC-vendor/easyui/plugins/jquery.filebox.js
 mode change 100644 => 100755 FHC-vendor/easyui/plugins/jquery.form.js
 mode change 100644 => 100755 FHC-vendor/easyui/plugins/jquery.layout.js
 mode change 100644 => 100755 FHC-vendor/easyui/plugins/jquery.linkbutton.js
 mode change 100644 => 100755 FHC-vendor/easyui/plugins/jquery.menu.js
 mode change 100644 => 100755 FHC-vendor/easyui/plugins/jquery.menubutton.js
 mode change 100644 => 100755 FHC-vendor/easyui/plugins/jquery.messager.js
 mode change 100644 => 100755 FHC-vendor/easyui/plugins/jquery.mobile.js
 mode change 100644 => 100755 FHC-vendor/easyui/plugins/jquery.numberbox.js
 mode change 100644 => 100755 FHC-vendor/easyui/plugins/jquery.numberspinner.js
 mode change 100644 => 100755 FHC-vendor/easyui/plugins/jquery.pagination.js
 mode change 100644 => 100755 FHC-vendor/easyui/plugins/jquery.panel.js
 mode change 100644 => 100755 FHC-vendor/easyui/plugins/jquery.parser.js
 mode change 100644 => 100755 FHC-vendor/easyui/plugins/jquery.progressbar.js
 mode change 100644 => 100755 FHC-vendor/easyui/plugins/jquery.propertygrid.js
 mode change 100644 => 100755 FHC-vendor/easyui/plugins/jquery.resizable.js
 mode change 100644 => 100755 FHC-vendor/easyui/plugins/jquery.searchbox.js
 mode change 100644 => 100755 FHC-vendor/easyui/plugins/jquery.slider.js
 mode change 100644 => 100755 FHC-vendor/easyui/plugins/jquery.spinner.js
 mode change 100644 => 100755 FHC-vendor/easyui/plugins/jquery.splitbutton.js
 mode change 100644 => 100755 FHC-vendor/easyui/plugins/jquery.switchbutton.js
 mode change 100644 => 100755 FHC-vendor/easyui/plugins/jquery.tabs.js
 mode change 100644 => 100755 FHC-vendor/easyui/plugins/jquery.textbox.js
 mode change 100644 => 100755 FHC-vendor/easyui/plugins/jquery.timespinner.js
 mode change 100644 => 100755 FHC-vendor/easyui/plugins/jquery.tooltip.js
 mode change 100644 => 100755 FHC-vendor/easyui/plugins/jquery.tree.js
 mode change 100644 => 100755 FHC-vendor/easyui/plugins/jquery.treegrid.js
 mode change 100644 => 100755 FHC-vendor/easyui/plugins/jquery.validatebox.js
 mode change 100644 => 100755 FHC-vendor/easyui/plugins/jquery.window.js
 mode change 100644 => 100755 FHC-vendor/easyui/readme.txt
 mode change 100644 => 100755 FHC-vendor/easyui/src/easyloader.js
 mode change 100644 => 100755 FHC-vendor/easyui/src/jquery.accordion.js
 mode change 100644 => 100755 FHC-vendor/easyui/src/jquery.calendar.js
 mode change 100644 => 100755 FHC-vendor/easyui/src/jquery.combobox.js
 mode change 100644 => 100755 FHC-vendor/easyui/src/jquery.datebox.js
 mode change 100644 => 100755 FHC-vendor/easyui/src/jquery.draggable.js
 mode change 100644 => 100755 FHC-vendor/easyui/src/jquery.droppable.js
 mode change 100644 => 100755 FHC-vendor/easyui/src/jquery.form.js
 mode change 100644 => 100755 FHC-vendor/easyui/src/jquery.linkbutton.js
 mode change 100644 => 100755 FHC-vendor/easyui/src/jquery.menu.js
 mode change 100644 => 100755 FHC-vendor/easyui/src/jquery.parser.js
 mode change 100644 => 100755 FHC-vendor/easyui/src/jquery.progressbar.js
 mode change 100644 => 100755 FHC-vendor/easyui/src/jquery.propertygrid.js
 mode change 100644 => 100755 FHC-vendor/easyui/src/jquery.resizable.js
 mode change 100644 => 100755 FHC-vendor/easyui/src/jquery.slider.js
 mode change 100644 => 100755 FHC-vendor/easyui/src/jquery.tabs.js
 mode change 100644 => 100755 FHC-vendor/easyui/src/jquery.window.js
 mode change 100644 => 100755 FHC-vendor/easyui/themes/black/accordion.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/black/calendar.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/black/combo.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/black/combobox.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/black/datagrid.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/black/datalist.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/black/datebox.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/black/dialog.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/black/easyui.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/black/filebox.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/black/images/accordion_arrows.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/black/images/blank.gif
 mode change 100644 => 100755 FHC-vendor/easyui/themes/black/images/calendar_arrows.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/black/images/combo_arrow.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/black/images/datagrid_icons.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/black/images/datebox_arrow.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/black/images/layout_arrows.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/black/images/linkbutton_bg.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/black/images/loading.gif
 mode change 100644 => 100755 FHC-vendor/easyui/themes/black/images/menu_arrows.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/black/images/messager_icons.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/black/images/pagination_icons.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/black/images/panel_tools.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/black/images/searchbox_button.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/black/images/slider_handle.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/black/images/spinner_arrows.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/black/images/tabs_icons.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/black/images/tree_icons.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/black/images/validatebox_warning.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/black/layout.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/black/linkbutton.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/black/menu.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/black/menubutton.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/black/messager.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/black/numberbox.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/black/pagination.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/black/panel.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/black/progressbar.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/black/propertygrid.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/black/searchbox.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/black/slider.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/black/spinner.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/black/splitbutton.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/black/switchbutton.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/black/tabs.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/black/textbox.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/black/tooltip.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/black/tree.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/black/validatebox.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/black/window.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/bootstrap/accordion.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/bootstrap/calendar.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/bootstrap/combo.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/bootstrap/combobox.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/bootstrap/datagrid.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/bootstrap/datebox.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/bootstrap/dialog.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/bootstrap/easyui.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/bootstrap/filebox.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/bootstrap/images/accordion_arrows.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/bootstrap/images/blank.gif
 mode change 100644 => 100755 FHC-vendor/easyui/themes/bootstrap/images/calendar_arrows.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/bootstrap/images/combo_arrow.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/bootstrap/images/datagrid_icons.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/bootstrap/images/datebox_arrow.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/bootstrap/images/layout_arrows.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/bootstrap/images/linkbutton_bg.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/bootstrap/images/loading.gif
 mode change 100644 => 100755 FHC-vendor/easyui/themes/bootstrap/images/menu_arrows.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/bootstrap/images/messager_icons.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/bootstrap/images/pagination_icons.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/bootstrap/images/panel_tools.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/bootstrap/images/searchbox_button.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/bootstrap/images/slider_handle.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/bootstrap/images/spinner_arrows.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/bootstrap/images/tabs_icons.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/bootstrap/images/tree_icons.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/bootstrap/images/validatebox_warning.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/bootstrap/layout.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/bootstrap/linkbutton.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/bootstrap/menu.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/bootstrap/menubutton.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/bootstrap/messager.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/bootstrap/numberbox.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/bootstrap/pagination.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/bootstrap/panel.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/bootstrap/progressbar.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/bootstrap/propertygrid.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/bootstrap/searchbox.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/bootstrap/slider.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/bootstrap/spinner.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/bootstrap/splitbutton.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/bootstrap/switchbutton.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/bootstrap/tabs.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/bootstrap/textbox.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/bootstrap/tooltip.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/bootstrap/tree.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/bootstrap/validatebox.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/bootstrap/window.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/color.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/default/accordion.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/default/calendar.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/default/combo.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/default/combobox.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/default/datagrid.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/default/datalist.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/default/datebox.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/default/dialog.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/default/easyui.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/default/filebox.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/default/images/accordion_arrows.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/default/images/blank.gif
 mode change 100644 => 100755 FHC-vendor/easyui/themes/default/images/calendar_arrows.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/default/images/combo_arrow.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/default/images/datagrid_icons.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/default/images/datebox_arrow.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/default/images/layout_arrows.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/default/images/linkbutton_bg.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/default/images/loading.gif
 mode change 100644 => 100755 FHC-vendor/easyui/themes/default/images/menu_arrows.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/default/images/messager_icons.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/default/images/pagination_icons.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/default/images/panel_tools.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/default/images/searchbox_button.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/default/images/slider_handle.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/default/images/spinner_arrows.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/default/images/tabs_icons.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/default/images/tree_icons.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/default/images/validatebox_warning.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/default/layout.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/default/linkbutton.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/default/menu.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/default/menubutton.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/default/messager.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/default/numberbox.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/default/pagination.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/default/panel.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/default/progressbar.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/default/propertygrid.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/default/searchbox.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/default/slider.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/default/spinner.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/default/splitbutton.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/default/switchbutton.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/default/tabs.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/default/textbox.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/default/tooltip.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/default/tree.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/default/validatebox.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/default/window.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/gray/accordion.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/gray/calendar.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/gray/combo.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/gray/combobox.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/gray/datagrid.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/gray/datalist.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/gray/datebox.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/gray/dialog.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/gray/easyui.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/gray/filebox.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/gray/images/accordion_arrows.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/gray/images/blank.gif
 mode change 100644 => 100755 FHC-vendor/easyui/themes/gray/images/calendar_arrows.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/gray/images/combo_arrow.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/gray/images/datagrid_icons.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/gray/images/datebox_arrow.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/gray/images/layout_arrows.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/gray/images/linkbutton_bg.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/gray/images/loading.gif
 mode change 100644 => 100755 FHC-vendor/easyui/themes/gray/images/menu_arrows.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/gray/images/messager_icons.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/gray/images/pagination_icons.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/gray/images/panel_tools.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/gray/images/searchbox_button.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/gray/images/slider_handle.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/gray/images/spinner_arrows.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/gray/images/tabs_icons.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/gray/images/tree_icons.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/gray/images/validatebox_warning.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/gray/layout.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/gray/linkbutton.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/gray/menu.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/gray/menubutton.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/gray/messager.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/gray/numberbox.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/gray/pagination.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/gray/panel.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/gray/progressbar.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/gray/propertygrid.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/gray/searchbox.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/gray/slider.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/gray/spinner.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/gray/splitbutton.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/gray/switchbutton.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/gray/tabs.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/gray/textbox.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/gray/tooltip.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/gray/tree.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/gray/validatebox.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/gray/window.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/icon.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/icons/back.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/icons/blank.gif
 mode change 100644 => 100755 FHC-vendor/easyui/themes/icons/cancel.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/icons/clear.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/icons/cut.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/icons/edit_add.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/icons/edit_remove.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/icons/filesave.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/icons/filter.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/icons/help.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/icons/large_chart.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/icons/large_clipart.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/icons/large_picture.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/icons/large_shapes.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/icons/large_smartart.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/icons/lock.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/icons/man.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/icons/mini_add.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/icons/mini_edit.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/icons/mini_refresh.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/icons/more.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/icons/no.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/icons/ok.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/icons/pencil.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/icons/print.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/icons/redo.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/icons/reload.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/icons/search.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/icons/sum.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/icons/tip.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/icons/undo.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/metro/accordion.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/metro/calendar.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/metro/combo.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/metro/combobox.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/metro/datagrid.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/metro/datalist.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/metro/datebox.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/metro/dialog.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/metro/easyui.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/metro/filebox.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/metro/images/accordion_arrows.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/metro/images/blank.gif
 mode change 100644 => 100755 FHC-vendor/easyui/themes/metro/images/calendar_arrows.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/metro/images/combo_arrow.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/metro/images/datagrid_icons.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/metro/images/datebox_arrow.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/metro/images/layout_arrows.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/metro/images/linkbutton_bg.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/metro/images/loading.gif
 mode change 100644 => 100755 FHC-vendor/easyui/themes/metro/images/menu_arrows.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/metro/images/messager_icons.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/metro/images/pagination_icons.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/metro/images/panel_tools.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/metro/images/searchbox_button.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/metro/images/slider_handle.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/metro/images/spinner_arrows.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/metro/images/tabs_icons.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/metro/images/tree_icons.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/metro/images/validatebox_warning.png
 mode change 100644 => 100755 FHC-vendor/easyui/themes/metro/layout.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/metro/linkbutton.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/metro/menu.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/metro/menubutton.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/metro/messager.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/metro/numberbox.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/metro/pagination.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/metro/panel.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/metro/progressbar.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/metro/propertygrid.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/metro/searchbox.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/metro/slider.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/metro/spinner.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/metro/splitbutton.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/metro/switchbutton.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/metro/tabs.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/metro/textbox.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/metro/tooltip.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/metro/tree.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/metro/validatebox.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/metro/window.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/mobile.css
 mode change 100644 => 100755 FHC-vendor/easyui/themes/vilesci
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/.gitattributes
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/.gitignore
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/.jscsrc
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/CONTRIBUTING.md
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/Gruntfile.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/README.md
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/addons/pager/icons/first.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/addons/pager/icons/last.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/addons/pager/icons/loading.gif
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/addons/pager/icons/next.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/addons/pager/icons/prev.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/addons/pager/jquery.tablesorter.pager.css
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/addons/pager/jquery.tablesorter.pager.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/beta-testing/example-pager-custom-controls.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/beta-testing/example-widget-column-reorder.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/beta-testing/pager-custom-controls.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/beta-testing/widget-reorder.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/bower.json
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/changelog.txt
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/css/bootstrap.less
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/css/dragtable.mod.css
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/css/filter.formatter.css
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/css/images/black-asc.gif
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/css/images/black-desc.gif
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/css/images/black-unsorted.gif
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/css/images/bootstrap-black-unsorted.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/css/images/bootstrap-white-unsorted.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/css/images/dragtable-handle.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/css/images/dragtable-handle.svg
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/css/images/dropbox-asc-hovered.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/css/images/dropbox-asc.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/css/images/dropbox-desc-hovered.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/css/images/dropbox-desc.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/css/images/green-asc.gif
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/css/images/green-desc.gif
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/css/images/green-header.gif
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/css/images/green-unsorted.gif
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/css/images/ice-asc.gif
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/css/images/ice-desc.gif
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/css/images/ice-unsorted.gif
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/css/images/metro-black-asc.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/css/images/metro-black-desc.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/css/images/metro-loading.gif
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/css/images/metro-unsorted.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/css/images/metro-white-asc.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/css/images/metro-white-desc.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/css/images/white-asc.gif
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/css/images/white-desc.gif
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/css/images/white-unsorted.gif
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/css/metro.less
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/css/psd/green-asc.psd
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/css/psd/green-desc.psd
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/css/psd/green-unsorted.psd
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/css/psd/metro-style.psd
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/css/theme.black-ice.css
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/css/theme.blue.css
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/css/theme.bootstrap.css
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/css/theme.bootstrap_2.css
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/css/theme.dark.css
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/css/theme.default.css
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/css/theme.dropbox.css
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/css/theme.green.css
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/css/theme.grey.css
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/css/theme.ice.css
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/css/theme.jui.css
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/css/theme.less
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/css/theme.metro-dark.css
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/css/dragtable.mod.min.css
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/css/filter.formatter.min.css
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/css/images/black-asc.gif
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/css/images/black-desc.gif
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/css/images/black-unsorted.gif
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/css/images/bootstrap-black-unsorted.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/css/images/bootstrap-white-unsorted.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/css/images/dragtable-handle.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/css/images/dragtable-handle.svg
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/css/images/dropbox-asc-hovered.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/css/images/dropbox-asc.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/css/images/dropbox-desc-hovered.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/css/images/dropbox-desc.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/css/images/first.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/css/images/green-asc.gif
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/css/images/green-desc.gif
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/css/images/green-header.gif
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/css/images/green-unsorted.gif
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/css/images/ice-asc.gif
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/css/images/ice-desc.gif
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/css/images/ice-unsorted.gif
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/css/images/last.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/css/images/loading.gif
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/css/images/metro-black-asc.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/css/images/metro-black-desc.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/css/images/metro-loading.gif
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/css/images/metro-unsorted.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/css/images/metro-white-asc.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/css/images/metro-white-desc.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/css/images/next.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/css/images/prev.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/css/images/white-asc.gif
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/css/images/white-desc.gif
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/css/images/white-unsorted.gif
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/css/jquery.tablesorter.pager.min.css
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/css/less/bootstrap.less
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/css/less/metro.less
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/css/less/theme.less
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/css/theme.blackice.min.css
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/css/theme.blue.min.css
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/css/theme.bootstrap.min.css
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/css/theme.bootstrap_2.min.css
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/css/theme.dark.min.css
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/css/theme.default.min.css
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/css/theme.dropbox.min.css
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/css/theme.green.min.css
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/css/theme.grey.min.css
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/css/theme.ice.min.css
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/css/theme.jui.min.css
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/css/theme.metro-dark.min.css
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/extras/jquery.dragtable.mod.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/extras/jquery.metadata.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/extras/jquery.tablesorter.pager.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/extras/semver-mod.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.combined.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.combined.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.widgets.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.widgets.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-extract.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-iso8601.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-month.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-range.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-two-digit-year.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-weekday.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-duration.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-feet-inch-fraction.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-file-type.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-globalize.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-ignore-articles.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-image.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-input-select.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-metric.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-named-numbers.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-network.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-roman.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-alignChar.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-build-table.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-chart.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-columnSelector.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-columns.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-cssStickyHeaders.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-editable.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-filter-formatter-html5.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-filter-formatter-jui.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-filter-formatter-select2.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-filter-type-insideRange.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-filter.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-formatter.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-grouping.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-headerTitles.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-lazyload.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-math.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-output.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-pager.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-print.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-reflow.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-repeatheaders.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-resizable.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-saveSort.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-scroller.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-sort2Hash.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-sortTbodies.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-staticRow.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-stickyHeaders.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-storage.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-toggle.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-uitheme.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-view.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/assets/City0.json
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/assets/City1.json
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/assets/City2.json
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/assets/City3.json
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/assets/ajax-content.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/assets/build.json
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/assets/build.txt
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/assets/theme_switcher.json
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/css/bootstrap-v2.min.css
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/css/bootstrap.min.css
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/css/images/glyphicons-halflings-white.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/css/images/glyphicons-halflings.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_flat_15_cd0a0a_40x100.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_glass_100_e4f1fb_1x400.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_glass_50_3baae3_1x400.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_glass_80_d7ebf9_1x400.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_highlight-hard_70_000000_1x100.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_highlight-soft_100_deedf7_1x100.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_highlight-soft_25_ffef8f_1x100.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/css/images/ui-icons_2694e8_256x240.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/css/images/ui-icons_2e83ff_256x240.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/css/images/ui-icons_3d80b3_256x240.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/css/images/ui-icons_72a7cf_256x240.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/css/images/ui-icons_ffffff_256x240.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/css/jq.css
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/css/jquery-ui.min.css
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/css/magnific-popup.css
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/css/menu.css
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/css/prettify.css
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/css/rangeslider.css
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/css/select2-3.4.6.min.css
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/css/select2-spinner.gif
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/css/select2.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/css/select2x2.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/css/tipsy.css
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-add-rows.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-ajax.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-apply-widget.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-child-rows-filtered.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-child-rows.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-css-highlighting.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-dragtable.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-empty-table.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-extending-defaults.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-extractors-parsers.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-header-column-span.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-locale-sort.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-meta-headers.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-meta-parsers.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-meta-sort-list.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-method-sortreset.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-multiple-tbodies.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-option-custom-sort.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-option-date-format.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-option-debug.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-option-delay-init.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-option-digits.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-option-render-header.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-option-render-template.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-option-selectorsort.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-option-show-processing.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-option-sort-append.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-option-sort-empty.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-option-sort-force.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-option-sort-key.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-option-sort-list.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-option-sort-order.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-option-sortreset-sortrestart.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-option-text-extraction.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-option-textsorter-semver.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-option-theme-metro-style.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-options-headers-digits-strings.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-options-headers-locked.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-options-headers-order.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-options-headers-parser.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-options-headers.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-pager-ajax.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-pager-filtered.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-pager.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-parsers-advanced.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-parsers-class-name.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-parsers-date-range.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-parsers-dates.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-parsers-duration.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-parsers-feet-inch-fraction.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-parsers-file-type.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-parsers-globalize.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-parsers-ignore-articles.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-parsers-ip-address.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-parsers-jquery-data.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-parsers-metric.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-parsers-named-numbers.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-parsers-roman.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-parsers.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-trigger-sort.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-triggers.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-update-all.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-update-cell.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-widget-align-character.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-widget-bootstrap-theme-v2.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-widget-bootstrap-theme.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-widget-build-table.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-widget-chart.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-widget-column-selector.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-widget-columns.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-widget-css-sticky-header.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-widget-editable.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-widget-filter-any-match.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-widget-filter-childrows.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-widget-filter-custom-search.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-widget-filter-custom-search2.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-widget-filter-custom.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-widget-filter-external-inputs.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-widget-filter-formatter-1.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-widget-filter-formatter-2.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-widget-filter-formatter-select2.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-widget-filter-selectmenu.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-widget-filter.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-widget-formatter.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-widget-grouping-filter-childrows.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-widget-grouping.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-widget-header-titles.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-widget-lazyload.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-widget-math.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-widget-output.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-widget-pager-ajax.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-widget-pager.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-widget-print.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-widget-reflow.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-widget-reflow1.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-widget-reflow2.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-widget-reflow3.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-widget-resizable.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-widget-savesort.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-widget-scroller.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-widget-sort-tbodies.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-widget-sort-to-hash.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-widget-static-row.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-widget-sticky-header.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-widget-toggle-tablesorter.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-widget-ui-theme.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-widget-view.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-widget-zebra.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/example-widgets.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/fonts/glyphicons-halflings-regular.eot
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/fonts/glyphicons-halflings-regular.svg
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/fonts/glyphicons-halflings-regular.ttf
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/fonts/glyphicons-halflings-regular.woff
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/fonts/glyphicons-halflings-regular.woff2
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/img/external.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/img/grid-default-thumb.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/img/link.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/img/new-product-banner.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/img/sale-banner.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/img/screens-blue.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/img/screens.png
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/index.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/js/bootstrap.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/js/chili/jquery.chili-2.2.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/js/chili/recipes.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/js/demo-build-table.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/js/docs.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/js/jquery-1.2.6.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/js/jquery-1.4.4.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/js/jquery-latest.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/js/jquery-ui.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/js/jquery.jui_theme_switch.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/js/jquery.magnific-popup.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/js/jquery.tipsy.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/js/prettify.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/js/rangeslider.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/js/search-ie.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/js/search.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/js/select2-3.4.6.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/js/sugar.min.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/docs/themes.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/example.json
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/index.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/extras/jquery.dragtable.mod.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/extras/jquery.metadata.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/extras/semver-mod.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/extras/semver.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/jquery.tablesorter.combined.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/jquery.tablesorter.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/jquery.tablesorter.widgets.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/parsers/parser-date-extract.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/parsers/parser-date-iso8601.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/parsers/parser-date-month.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/parsers/parser-date-range.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/parsers/parser-date-two-digit-year.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/parsers/parser-date-weekday.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/parsers/parser-date.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/parsers/parser-duration.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/parsers/parser-feet-inch-fraction.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/parsers/parser-file-type.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/parsers/parser-globalize.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/parsers/parser-ignore-articles.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/parsers/parser-image.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/parsers/parser-input-select.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/parsers/parser-metric.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/parsers/parser-named-numbers.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/parsers/parser-network.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/parsers/parser-roman.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/widgets/widget-alignChar.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/widgets/widget-build-table.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/widgets/widget-chart.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/widgets/widget-columnSelector.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/widgets/widget-columns.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/widgets/widget-cssStickyHeaders.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/widgets/widget-editable.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/widgets/widget-filter-formatter-html5.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/widgets/widget-filter-formatter-jui.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/widgets/widget-filter-formatter-select2.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/widgets/widget-filter-type-insideRange.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/widgets/widget-filter.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/widgets/widget-formatter.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/widgets/widget-grouping.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/widgets/widget-headerTitles.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/widgets/widget-lazyload.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/widgets/widget-math.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/widgets/widget-output.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/widgets/widget-pager.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/widgets/widget-print.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/widgets/widget-reflow.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/widgets/widget-repeatheaders.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/widgets/widget-resizable.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/widgets/widget-saveSort.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/widgets/widget-scroller.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/widgets/widget-sort2Hash.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/widgets/widget-sortTbodies.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/widgets/widget-staticRow.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/widgets/widget-stickyHeaders.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/widgets/widget-storage.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/widgets/widget-toggle.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/widgets/widget-uitheme.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/js/widgets/widget-view.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/package.json
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/tablesorter.jquery.json
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/test.html
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/testing/qunit-1.20.0.css
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/testing/qunit-1.20.0.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/testing/testing-ipv6.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/testing/testing-widgets.js
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/testing/testing.css
 mode change 100644 => 100755 FHC-vendor/jquery-tablesorter/testing/testing.js
 mode change 100644 => 100755 LICENSE
 mode change 100644 => 100755 README.md
 mode change 100644 => 100755 addons/.gitignore
 mode change 100644 => 100755 addons/CodingGuidelines.txt
 mode change 100644 => 100755 addons/index.html
 mode change 100644 => 100755 addons/template/cis/index.html
 mode change 100644 => 100755 addons/template/cis/init.js.php
 mode change 100644 => 100755 addons/template/cis/vorlage_profil_array.php
 mode change 100644 => 100755 addons/template/content/index.html
 mode change 100644 => 100755 addons/template/content/init.js.php
 mode change 100644 => 100755 addons/template/dbcheck.php
 mode change 100644 => 100755 addons/template/index.html
 mode change 100644 => 100755 addons/template/install.php
 mode change 100644 => 100755 addons/template/locale/README.txt
 mode change 100644 => 100755 addons/template/locale/index.html
 mode change 100644 => 100755 addons/template/soap/index.html
 mode change 100644 => 100755 addons/template/system/index.html
 mode change 100644 => 100755 addons/template/system/vorlage_zip/README.txt
 mode change 100644 => 100755 addons/template/version.php
 mode change 100644 => 100755 addons/template/vilesci/index.php
 mode change 100644 => 100755 addons/template/vilesci/init.js.php
 mode change 100644 => 100755 addons/template/vilesci/menu.inc.php
 mode change 100644 => 100755 addons/template/vilesci/vorlage_generateuid.inc.php
 mode change 100644 => 100755 addons/template/vilesci/vorlage_passwort.inc.php
 mode change 100644 => 100755 addons/template/vilesci/vorlage_serviceterminal.inc.php
 mode change 100644 => 100755 addons/template/xml/index.html
 mode change 100644 => 100755 application/cache/index.html
 mode change 100644 => 100755 application/components/extensions/.placeholder
 mode change 100644 => 100755 application/components/filters/LogsViewer.php
 mode change 100644 => 100755 application/config/anrechnung.php
 mode change 100644 => 100755 application/config/auth.php
 mode change 100644 => 100755 application/config/autoload.php
 mode change 100644 => 100755 application/config/config.php
 mode change 100644 => 100755 application/config/constants.php
 mode change 100644 => 100755 application/config/core_includes.php
 mode change 100644 => 100755 application/config/database.php
 mode change 100644 => 100755 application/config/doctypes.php
 mode change 100644 => 100755 application/config/extensions/.placeholder
 mode change 100644 => 100755 application/config/foreign_chars.php
 mode change 100644 => 100755 application/config/hooks.php
 mode change 100644 => 100755 application/config/index.html
 mode change 100644 => 100755 application/config/infocenter.php
 mode change 100644 => 100755 application/config/jqm.php
 mode change 100644 => 100755 application/config/ldap.php
 mode change 100644 => 100755 application/config/mail.php
 mode change 100644 => 100755 application/config/memcached.php
 mode change 100644 => 100755 application/config/message.php
 mode change 100644 => 100755 application/config/migration.php
 mode change 100644 => 100755 application/config/mimes.php
 mode change 100644 => 100755 application/config/navigation.php
 mode change 100644 => 100755 application/config/permission.php
 mode change 100644 => 100755 application/config/profiler.php
 mode change 100644 => 100755 application/config/rest.php
 mode change 100644 => 100755 application/config/routes.php
 mode change 100644 => 100755 application/config/studierendenantrag.php
 mode change 100644 => 100755 application/config/udfmasterschema.json
 mode change 100644 => 100755 application/config/user_agents.php
 mode change 100644 => 100755 application/controllers/Cis/Auth.php
 mode change 100644 => 100755 application/controllers/Cis/Documents.php
 mode change 100644 => 100755 application/controllers/Cis/MyLv.php
 mode change 100644 => 100755 application/controllers/Cis/Profil.php
 mode change 100644 => 100755 application/controllers/Cis/ProfilUpdate.php
 mode change 100644 => 100755 application/controllers/Cis/Pub.php
 mode change 100644 => 100755 application/controllers/Cis/Stundenplan.php
 mode change 100644 => 100755 application/controllers/Cis4.php
 mode change 100644 => 100755 application/controllers/CisHmvc.php
 mode change 100644 => 100755 application/controllers/CisHmvc/Cms.php
 mode change 100644 => 100755 application/controllers/CisHmvc/Dashboard.php
 mode change 100644 => 100755 application/controllers/CisHtml/Cms.php
 mode change 100644 => 100755 application/controllers/CisHtml/Dashboard.php
 mode change 100644 => 100755 application/controllers/CisVue/Cms.php
 mode change 100644 => 100755 application/controllers/CisVue/Dashboard.php
 mode change 100644 => 100755 application/controllers/Test.php
 mode change 100644 => 100755 application/controllers/Vilesci.php
 mode change 100644 => 100755 application/controllers/api/index.html
 mode change 100644 => 100755 application/controllers/api/v1/CheckUserAuth.php
 mode change 100644 => 100755 application/controllers/api/v1/Test.php
 mode change 100644 => 100755 application/controllers/api/v1/accounting/Aufteilung.php
 mode change 100644 => 100755 application/controllers/api/v1/accounting/Bestelldetail.php
 mode change 100644 => 100755 application/controllers/api/v1/accounting/Bestelldetailtag.php
 mode change 100644 => 100755 application/controllers/api/v1/accounting/Bestellstatus.php
 mode change 100644 => 100755 application/controllers/api/v1/accounting/Bestellung.php
 mode change 100644 => 100755 application/controllers/api/v1/accounting/Bestellungtag.php
 mode change 100644 => 100755 application/controllers/api/v1/accounting/Buchung.php
 mode change 100644 => 100755 application/controllers/api/v1/accounting/Buchungstyp.php
 mode change 100644 => 100755 application/controllers/api/v1/accounting/Budget.php
 mode change 100644 => 100755 application/controllers/api/v1/accounting/Konto.php
 mode change 100644 => 100755 application/controllers/api/v1/accounting/Kostenstelle.php
 mode change 100644 => 100755 application/controllers/api/v1/accounting/Rechnung.php
 mode change 100644 => 100755 application/controllers/api/v1/accounting/Rechnungsbetrag.php
 mode change 100644 => 100755 application/controllers/api/v1/accounting/Rechnungstyp.php
 mode change 100644 => 100755 application/controllers/api/v1/accounting/Vertrag.php
 mode change 100644 => 100755 application/controllers/api/v1/accounting/Vertragsstatus.php
 mode change 100644 => 100755 application/controllers/api/v1/accounting/Vertragstyp.php
 mode change 100644 => 100755 application/controllers/api/v1/accounting/Zahlungstyp.php
 mode change 100644 => 100755 application/controllers/api/v1/codex/Akadgrad.php
 mode change 100644 => 100755 application/controllers/api/v1/codex/Archiv.php
 mode change 100644 => 100755 application/controllers/api/v1/codex/Aufmerksamdurch.php
 mode change 100644 => 100755 application/controllers/api/v1/codex/Ausbildung.php
 mode change 100644 => 100755 application/controllers/api/v1/codex/Berufstaetigkeit.php
 mode change 100644 => 100755 application/controllers/api/v1/codex/Beschaeftigungsausmass.php
 mode change 100644 => 100755 application/controllers/api/v1/codex/Besqual.php
 mode change 100644 => 100755 application/controllers/api/v1/codex/Bisfunktion.php
 mode change 100644 => 100755 application/controllers/api/v1/codex/Bisio.php
 mode change 100644 => 100755 application/controllers/api/v1/codex/Bisorgform.php
 mode change 100644 => 100755 application/controllers/api/v1/codex/Bisverwendung.php
 mode change 100644 => 100755 application/controllers/api/v1/codex/Bundesland.php
 mode change 100644 => 100755 application/controllers/api/v1/codex/Entwicklungsteam.php
 mode change 100644 => 100755 application/controllers/api/v1/codex/Gemeinde.php
 mode change 100644 => 100755 application/controllers/api/v1/codex/Hauptberuf.php
 mode change 100644 => 100755 application/controllers/api/v1/codex/Lehrform.php
 mode change 100644 => 100755 application/controllers/api/v1/codex/Lgartcode.php
 mode change 100644 => 100755 application/controllers/api/v1/codex/Mobilitaetsprogramm.php
 mode change 100644 => 100755 application/controllers/api/v1/codex/Nation.php
 mode change 100644 => 100755 application/controllers/api/v1/codex/Note.php
 mode change 100644 => 100755 application/controllers/api/v1/codex/Orgform.php
 mode change 100644 => 100755 application/controllers/api/v1/codex/Verwendung.php
 mode change 100644 => 100755 application/controllers/api/v1/codex/Zgv.php
 mode change 100644 => 100755 application/controllers/api/v1/codex/Zgvdoktor.php
 mode change 100644 => 100755 application/controllers/api/v1/codex/Zgvgruppe.php
 mode change 100644 => 100755 application/controllers/api/v1/codex/Zgvmaster.php
 mode change 100644 => 100755 application/controllers/api/v1/codex/Zweck.php
 mode change 100644 => 100755 application/controllers/api/v1/content/Ampel.php
 mode change 100644 => 100755 application/controllers/api/v1/content/Content.php
 mode change 100644 => 100755 application/controllers/api/v1/content/Contentchild.php
 mode change 100644 => 100755 application/controllers/api/v1/content/Contentgruppe.php
 mode change 100644 => 100755 application/controllers/api/v1/content/Contentlog.php
 mode change 100644 => 100755 application/controllers/api/v1/content/Contentsprache.php
 mode change 100644 => 100755 application/controllers/api/v1/content/Dms.php
 mode change 100644 => 100755 application/controllers/api/v1/content/Infoscreen.php
 mode change 100644 => 100755 application/controllers/api/v1/content/News.php
 mode change 100644 => 100755 application/controllers/api/v1/content/Template.php
 mode change 100644 => 100755 application/controllers/api/v1/content/Veranstaltung.php
 mode change 100644 => 100755 application/controllers/api/v1/content/Veranstaltungskategorie.php
 mode change 100644 => 100755 application/controllers/api/v1/crm/Akte.php
 mode change 100644 => 100755 application/controllers/api/v1/crm/Aufnahmeschluessel.php
 mode change 100644 => 100755 application/controllers/api/v1/crm/Aufnahmetermin.php
 mode change 100644 => 100755 application/controllers/api/v1/crm/Aufnahmetermintyp.php
 mode change 100644 => 100755 application/controllers/api/v1/crm/Bewerbungstermine.php
 mode change 100644 => 100755 application/controllers/api/v1/crm/Buchungstyp.php
 mode change 100644 => 100755 application/controllers/api/v1/crm/Dokument.php
 mode change 100644 => 100755 application/controllers/api/v1/crm/Dokumentprestudent.php
 mode change 100644 => 100755 application/controllers/api/v1/crm/Dokumentstudiengang.php
 mode change 100644 => 100755 application/controllers/api/v1/crm/Konto.php
 mode change 100644 => 100755 application/controllers/api/v1/crm/Preincoming.php
 mode change 100644 => 100755 application/controllers/api/v1/crm/Preinteressent.php
 mode change 100644 => 100755 application/controllers/api/v1/crm/Preinteressentstudiengang.php
 mode change 100644 => 100755 application/controllers/api/v1/crm/Preoutgoing.php
 mode change 100644 => 100755 application/controllers/api/v1/crm/Prestudent.php
 mode change 100644 => 100755 application/controllers/api/v1/crm/Prestudentstatus.php
 mode change 100644 => 100755 application/controllers/api/v1/crm/Reihungstest.php
 mode change 100644 => 100755 application/controllers/api/v1/crm/RtPerson.php
 mode change 100644 => 100755 application/controllers/api/v1/crm/Status.php
 mode change 100644 => 100755 application/controllers/api/v1/crm/Statusgrund.php
 mode change 100644 => 100755 application/controllers/api/v1/crm/Student.php
 mode change 100644 => 100755 application/controllers/api/v1/education/Abgabe.php
 mode change 100644 => 100755 application/controllers/api/v1/education/Abschlussbeurteilung.php
 mode change 100644 => 100755 application/controllers/api/v1/education/Abschlusspruefung.php
 mode change 100644 => 100755 application/controllers/api/v1/education/Anrechnung.php
 mode change 100644 => 100755 application/controllers/api/v1/education/Anwesenheit.php
 mode change 100644 => 100755 application/controllers/api/v1/education/Beispiel.php
 mode change 100644 => 100755 application/controllers/api/v1/education/Betreuerart.php
 mode change 100644 => 100755 application/controllers/api/v1/education/Feedback.php
 mode change 100644 => 100755 application/controllers/api/v1/education/Legesamtnote.php
 mode change 100644 => 100755 application/controllers/api/v1/education/Lehreinheit.php
 mode change 100644 => 100755 application/controllers/api/v1/education/Lehreinheitgruppe.php
 mode change 100644 => 100755 application/controllers/api/v1/education/Lehreinheitmitarbeiter.php
 mode change 100644 => 100755 application/controllers/api/v1/education/Lehrfach.php
 mode change 100644 => 100755 application/controllers/api/v1/education/Lehrfunktion.php
 mode change 100644 => 100755 application/controllers/api/v1/education/Lehrtyp.php
 mode change 100644 => 100755 application/controllers/api/v1/education/Lehrveranstaltung.php
 mode change 100644 => 100755 application/controllers/api/v1/education/Lenotenschluessel.php
 mode change 100644 => 100755 application/controllers/api/v1/education/Lepruefung.php
 mode change 100644 => 100755 application/controllers/api/v1/education/Lvangebot.php
 mode change 100644 => 100755 application/controllers/api/v1/education/Lvgesamtnote.php
 mode change 100644 => 100755 application/controllers/api/v1/education/Lvinfo.php
 mode change 100644 => 100755 application/controllers/api/v1/education/Lvregel.php
 mode change 100644 => 100755 application/controllers/api/v1/education/Lvregeltyp.php
 mode change 100644 => 100755 application/controllers/api/v1/education/Notenschluessel.php
 mode change 100644 => 100755 application/controllers/api/v1/education/Notenschluesselaufteilung.php
 mode change 100644 => 100755 application/controllers/api/v1/education/Notenschluesseluebung.php
 mode change 100644 => 100755 application/controllers/api/v1/education/Notenschluesselzuordnung.php
 mode change 100644 => 100755 application/controllers/api/v1/education/Paabgabe.php
 mode change 100644 => 100755 application/controllers/api/v1/education/Paabgabetyp.php
 mode change 100644 => 100755 application/controllers/api/v1/education/Projektarbeit.php
 mode change 100644 => 100755 application/controllers/api/v1/education/Projektbetreuer.php
 mode change 100644 => 100755 application/controllers/api/v1/education/Projekttyp.php
 mode change 100644 => 100755 application/controllers/api/v1/education/Pruefung.php
 mode change 100644 => 100755 application/controllers/api/v1/education/Pruefungsanmeldung.php
 mode change 100644 => 100755 application/controllers/api/v1/education/Pruefungsfenster.php
 mode change 100644 => 100755 application/controllers/api/v1/education/Pruefungsstatus.php
 mode change 100644 => 100755 application/controllers/api/v1/education/Pruefungstermin.php
 mode change 100644 => 100755 application/controllers/api/v1/education/Pruefungstyp.php
 mode change 100644 => 100755 application/controllers/api/v1/education/Studentbeispiel.php
 mode change 100644 => 100755 application/controllers/api/v1/education/Studentlehrverband.php
 mode change 100644 => 100755 application/controllers/api/v1/education/Studentuebung.php
 mode change 100644 => 100755 application/controllers/api/v1/education/Uebung.php
 mode change 100644 => 100755 application/controllers/api/v1/education/Zeugnis.php
 mode change 100644 => 100755 application/controllers/api/v1/education/Zeugnisnote.php
 mode change 100644 => 100755 application/controllers/api/v1/organisation/Erhalter.php
 mode change 100644 => 100755 application/controllers/api/v1/organisation/Fachbereich2.php
 mode change 100644 => 100755 application/controllers/api/v1/organisation/Ferien.php
 mode change 100644 => 100755 application/controllers/api/v1/organisation/Geschaeftsjahr2.php
 mode change 100644 => 100755 application/controllers/api/v1/organisation/Gruppe.php
 mode change 100644 => 100755 application/controllers/api/v1/organisation/Lehrverband.php
 mode change 100644 => 100755 application/controllers/api/v1/organisation/Organisationseinheit2.php
 mode change 100644 => 100755 application/controllers/api/v1/organisation/Organisationseinheittyp.php
 mode change 100644 => 100755 application/controllers/api/v1/organisation/Semesterwochen.php
 mode change 100644 => 100755 application/controllers/api/v1/organisation/Service.php
 mode change 100644 => 100755 application/controllers/api/v1/organisation/Standort.php
 mode change 100644 => 100755 application/controllers/api/v1/organisation/Statistik.php
 mode change 100644 => 100755 application/controllers/api/v1/organisation/Studiengang2.php
 mode change 100644 => 100755 application/controllers/api/v1/organisation/Studiengangstyp.php
 mode change 100644 => 100755 application/controllers/api/v1/organisation/Studienjahr.php
 mode change 100644 => 100755 application/controllers/api/v1/organisation/Studienordnung.php
 mode change 100644 => 100755 application/controllers/api/v1/organisation/Studienordnungstatus.php
 mode change 100644 => 100755 application/controllers/api/v1/organisation/Studienplan.php
 mode change 100644 => 100755 application/controllers/api/v1/organisation/Studienplatz.php
 mode change 100644 => 100755 application/controllers/api/v1/organisation/Studiensemester.php
 mode change 100644 => 100755 application/controllers/api/v1/person/Adresse.php
 mode change 100644 => 100755 application/controllers/api/v1/person/Bankverbindung.php
 mode change 100644 => 100755 application/controllers/api/v1/person/Benutzer.php
 mode change 100644 => 100755 application/controllers/api/v1/person/Benutzerfunktion.php
 mode change 100644 => 100755 application/controllers/api/v1/person/Benutzergruppe.php
 mode change 100644 => 100755 application/controllers/api/v1/person/Fotostatus.php
 mode change 100644 => 100755 application/controllers/api/v1/person/Freebusy.php
 mode change 100644 => 100755 application/controllers/api/v1/person/Freebusytyp.php
 mode change 100644 => 100755 application/controllers/api/v1/person/Kontakt.php
 mode change 100644 => 100755 application/controllers/api/v1/person/Kontaktmedium.php
 mode change 100644 => 100755 application/controllers/api/v1/person/Kontakttyp.php
 mode change 100644 => 100755 application/controllers/api/v1/person/Notiz.php
 mode change 100644 => 100755 application/controllers/api/v1/person/Notizzuordnung.php
 mode change 100644 => 100755 application/controllers/api/v1/person/Person.php
 mode change 100644 => 100755 application/controllers/api/v1/project/Aktivitaet.php
 mode change 100644 => 100755 application/controllers/api/v1/project/Aufwandstyp.php
 mode change 100644 => 100755 application/controllers/api/v1/project/Projekt.php
 mode change 100644 => 100755 application/controllers/api/v1/project/Projekt_ressource.php
 mode change 100644 => 100755 application/controllers/api/v1/project/Projektphase.php
 mode change 100644 => 100755 application/controllers/api/v1/project/Projekttask.php
 mode change 100644 => 100755 application/controllers/api/v1/project/Ressource.php
 mode change 100644 => 100755 application/controllers/api/v1/project/Scrumsprint.php
 mode change 100644 => 100755 application/controllers/api/v1/ressource/Betriebsmittel.php
 mode change 100644 => 100755 application/controllers/api/v1/ressource/Betriebsmittelperson2.php
 mode change 100644 => 100755 application/controllers/api/v1/ressource/Betriebsmittelstatus.php
 mode change 100644 => 100755 application/controllers/api/v1/ressource/Betriebsmitteltyp.php
 mode change 100644 => 100755 application/controllers/api/v1/ressource/Coodle.php
 mode change 100644 => 100755 application/controllers/api/v1/ressource/Erreichbarkeit.php
 mode change 100644 => 100755 application/controllers/api/v1/ressource/Firma.php
 mode change 100644 => 100755 application/controllers/api/v1/ressource/Firmatag.php
 mode change 100644 => 100755 application/controllers/api/v1/ressource/Firmentyp.php
 mode change 100644 => 100755 application/controllers/api/v1/ressource/Funktion.php
 mode change 100644 => 100755 application/controllers/api/v1/ressource/Lehrmittel.php
 mode change 100644 => 100755 application/controllers/api/v1/ressource/Mitarbeiter.php
 mode change 100644 => 100755 application/controllers/api/v1/ressource/Ort.php
 mode change 100644 => 100755 application/controllers/api/v1/ressource/Ortraumtyp.php
 mode change 100644 => 100755 application/controllers/api/v1/ressource/Personfunktionstandort.php
 mode change 100644 => 100755 application/controllers/api/v1/ressource/Raumtyp.php
 mode change 100644 => 100755 application/controllers/api/v1/ressource/Reservierung.php
 mode change 100644 => 100755 application/controllers/api/v1/ressource/Stunde.php
 mode change 100644 => 100755 application/controllers/api/v1/ressource/Stundenplan.php
 mode change 100644 => 100755 application/controllers/api/v1/ressource/Stundenplandev.php
 mode change 100644 => 100755 application/controllers/api/v1/ressource/Zeitaufzeichnung.php
 mode change 100644 => 100755 application/controllers/api/v1/ressource/Zeitfenster.php
 mode change 100644 => 100755 application/controllers/api/v1/ressource/Zeitsperre.php
 mode change 100644 => 100755 application/controllers/api/v1/ressource/Zeitsperretyp.php
 mode change 100644 => 100755 application/controllers/api/v1/ressource/Zeitwunsch.php
 mode change 100644 => 100755 application/controllers/api/v1/system/Appdaten.php
 mode change 100644 => 100755 application/controllers/api/v1/system/Benutzerrolle.php
 mode change 100644 => 100755 application/controllers/api/v1/system/Berechtigung.php
 mode change 100644 => 100755 application/controllers/api/v1/system/Cronjob.php
 mode change 100644 => 100755 application/controllers/api/v1/system/Filter.php
 mode change 100644 => 100755 application/controllers/api/v1/system/Log.php
 mode change 100644 => 100755 application/controllers/api/v1/system/Message.php
 mode change 100644 => 100755 application/controllers/api/v1/system/Phrase.php
 mode change 100644 => 100755 application/controllers/api/v1/system/Rolle.php
 mode change 100644 => 100755 application/controllers/api/v1/system/Rolleberechtigung.php
 mode change 100644 => 100755 application/controllers/api/v1/system/Server.php
 mode change 100644 => 100755 application/controllers/api/v1/system/Sprache2.php
 mode change 100644 => 100755 application/controllers/api/v1/system/Tag.php
 mode change 100644 => 100755 application/controllers/api/v1/system/UDF.php
 mode change 100644 => 100755 application/controllers/api/v1/system/Variable.php
 mode change 100644 => 100755 application/controllers/api/v1/system/Vorlage.php
 mode change 100644 => 100755 application/controllers/api/v1/system/Vorlagestudiengang.php
 mode change 100644 => 100755 application/controllers/api/v1/system/Webservicelog.php
 mode change 100644 => 100755 application/controllers/api/v1/system/Webservicerecht.php
 mode change 100644 => 100755 application/controllers/api/v1/system/Webservicetyp.php
 mode change 100644 => 100755 application/controllers/api/v1/testtool/Ablauf.php
 mode change 100644 => 100755 application/controllers/api/v1/testtool/Antwort.php
 mode change 100644 => 100755 application/controllers/api/v1/testtool/Frage.php
 mode change 100644 => 100755 application/controllers/api/v1/testtool/Gebiet.php
 mode change 100644 => 100755 application/controllers/api/v1/testtool/Kategorie.php
 mode change 100644 => 100755 application/controllers/api/v1/testtool/Kriterien.php
 mode change 100644 => 100755 application/controllers/api/v1/testtool/Pruefling.php
 mode change 100644 => 100755 application/controllers/api/v1/testtool/Vorschlag.php
 mode change 100644 => 100755 application/controllers/codex/Oehbeitrag.php
 mode change 100644 => 100755 application/controllers/codex/UHSTAT1.php
 mode change 100644 => 100755 application/controllers/components/Antrag/Abmeldung.php
 mode change 100644 => 100755 application/controllers/components/Antrag/Leitung.php
 mode change 100644 => 100755 application/controllers/components/Antrag/Unterbrechung.php
 mode change 100644 => 100755 application/controllers/components/Antrag/Wiederholung.php
 mode change 100644 => 100755 application/controllers/components/Cis/Mylv.php
 mode change 100644 => 100755 application/controllers/components/Cis/Stundenplan.php
 mode change 100644 => 100755 application/controllers/components/CisVue.php
 mode change 100644 => 100755 application/controllers/components/Filter.php
 mode change 100644 => 100755 application/controllers/components/Phrasen.php
 mode change 100644 => 100755 application/controllers/components/SearchBar.php
 mode change 100644 => 100755 application/controllers/crm/Statusgrund.php
 mode change 100644 => 100755 application/controllers/dashboard/Api.php
 mode change 100644 => 100755 application/controllers/dashboard/Config.php
 mode change 100644 => 100755 application/controllers/dashboard/Dashboard.php
 mode change 100644 => 100755 application/controllers/dashboard/DashboardDemo.php
 mode change 100644 => 100755 application/controllers/dashboard/Widget.php
 mode change 100644 => 100755 application/controllers/extensions/.placeholder
 mode change 100644 => 100755 application/controllers/index.html
 mode change 100644 => 100755 application/controllers/jobs/AmpelMail.php
 mode change 100644 => 100755 application/controllers/jobs/AnrechnungJob.php
 mode change 100644 => 100755 application/controllers/jobs/AntragJob.php
 mode change 100644 => 100755 application/controllers/jobs/LVPlanJob.php
 mode change 100644 => 100755 application/controllers/jobs/LehrauftragJob.php
 mode change 100644 => 100755 application/controllers/jobs/MailJob.php
 mode change 100644 => 100755 application/controllers/jobs/OneTimeMessages.php
 mode change 100644 => 100755 application/controllers/jobs/PlausiIssueProducer.php
 mode change 100644 => 100755 application/controllers/jobs/Prestudentstatus.php
 mode change 100644 => 100755 application/controllers/jobs/ReihungstestJob.php
 mode change 100644 => 100755 application/controllers/lehre/Antrag/Attachment.php
 mode change 100644 => 100755 application/controllers/lehre/Antrag/Wiederholung.php
 mode change 100644 => 100755 application/controllers/lehre/Pruefungsprotokoll.php
 mode change 100644 => 100755 application/controllers/lehre/Studierendenantrag.php
 mode change 100644 => 100755 application/controllers/lehre/anrechnung/AdminAnrechnung.php
 mode change 100644 => 100755 application/controllers/lehre/anrechnung/ApproveAnrechnungDetail.php
 mode change 100644 => 100755 application/controllers/lehre/anrechnung/ApproveAnrechnungUebersicht.php
 mode change 100644 => 100755 application/controllers/lehre/anrechnung/CreateAnrechnung.php
 mode change 100644 => 100755 application/controllers/lehre/anrechnung/RequestAnrechnung.php
 mode change 100644 => 100755 application/controllers/lehre/anrechnung/ReviewAnrechnungDetail.php
 mode change 100644 => 100755 application/controllers/lehre/anrechnung/ReviewAnrechnungUebersicht.php
 mode change 100644 => 100755 application/controllers/lehre/lehrauftrag/Lehrauftrag.php
 mode change 100644 => 100755 application/controllers/lehre/lehrauftrag/LehrauftragAkzeptieren.php
 mode change 100644 => 100755 application/controllers/lehre/lehrauftrag/LehrauftragErteilen.php
 mode change 100644 => 100755 application/controllers/lehre/lvplanung/AdminZeitverfuegbarkeit.php
 mode change 100644 => 100755 application/controllers/organisation/Reihungstest.php
 mode change 100644 => 100755 application/controllers/organisation/Studienjahr.php
 mode change 100644 => 100755 application/controllers/organisation/Studiensemester.php
 mode change 100644 => 100755 application/controllers/person/BPKWartung.php
 mode change 100644 => 100755 application/controllers/person/Gradelist.php
 mode change 100644 => 100755 application/controllers/person/Gruppenmanagement.php
 mode change 100644 => 100755 application/controllers/system/FAS_UDF.php
 mode change 100644 => 100755 application/controllers/system/Login.php
 mode change 100644 => 100755 application/controllers/system/Logout.php
 mode change 100644 => 100755 application/controllers/system/LogsViewer.php
 mode change 100644 => 100755 application/controllers/system/Navigation.php
 mode change 100644 => 100755 application/controllers/system/Phrases.php
 mode change 100644 => 100755 application/controllers/system/TestSearch.php
 mode change 100644 => 100755 application/controllers/system/Variables.php
 mode change 100644 => 100755 application/controllers/system/Vorlage.php
 mode change 100644 => 100755 application/controllers/system/aufnahme/PrestudentMultiAssign.php
 mode change 100644 => 100755 application/controllers/system/extensions/CLI_Manager.php
 mode change 100644 => 100755 application/controllers/system/extensions/Manager.php
 mode change 100644 => 100755 application/controllers/system/infocenter/InfoCenter.php
 mode change 100644 => 100755 application/controllers/system/infocenter/Rueckstellung.php
 mode change 100644 => 100755 application/controllers/system/infocenter/ZGVUeberpruefung.php
 mode change 100644 => 100755 application/controllers/system/issues/Issues.php
 mode change 100644 => 100755 application/controllers/system/issues/IssuesKonfiguration.php
 mode change 100644 => 100755 application/controllers/system/issues/IssuesZustaendigkeiten.php
 mode change 100644 => 100755 application/controllers/system/issues/Plausichecks.php
 mode change 100644 => 100755 application/controllers/system/jq/JobsQueueManager.php
 mode change 100644 => 100755 application/controllers/system/jq/JobsQueueViewer.php
 mode change 100644 => 100755 application/controllers/system/messages/FASMessages.php
 mode change 100644 => 100755 application/controllers/system/messages/MessageClient.php
 mode change 100644 => 100755 application/controllers/system/messages/Messages.php
 mode change 100644 => 100755 application/controllers/system/messages/ViewMessage.php
 mode change 100644 => 100755 application/controllers/widgets/Filters.php
 mode change 100644 => 100755 application/controllers/widgets/Language.php
 mode change 100644 => 100755 application/controllers/widgets/Tables.php
 mode change 100644 => 100755 application/controllers/widgets/UDF.php
 mode change 100644 => 100755 application/core/API_Controller.php
 mode change 100644 => 100755 application/core/Auth_Controller.php
 mode change 100644 => 100755 application/core/CLI_Controller.php
 mode change 100644 => 100755 application/core/DB_Model.php
 mode change 100644 => 100755 application/core/FHC_Controller.php
 mode change 100644 => 100755 application/core/FS_Model.php
 mode change 100644 => 100755 application/core/IIssueResolvedChecker.php
 mode change 100644 => 100755 application/core/JOB_Controller.php
 mode change 100644 => 100755 application/core/JQW_Controller.php
 mode change 100644 => 100755 application/core/PlausiIssueProducer_Controller.php
 mode change 100644 => 100755 application/core/RESTFul_Controller.php
 mode change 100644 => 100755 application/core/index.html
 mode change 100644 => 100755 application/extensions/.placeholder
 mode change 100644 => 100755 application/helpers/extensions/.placeholder
 mode change 100644 => 100755 application/helpers/hlp_authentication_helper.php
 mode change 100644 => 100755 application/helpers/hlp_common_helper.php
 mode change 100644 => 100755 application/helpers/hlp_header_helper.php
 mode change 100644 => 100755 application/helpers/hlp_language_helper.php
 mode change 100644 => 100755 application/helpers/hlp_return_object_helper.php
 mode change 100644 => 100755 application/helpers/hlp_sancho_helper.php
 mode change 100644 => 100755 application/helpers/hlp_session_helper.php
 mode change 100644 => 100755 application/helpers/index.html
 mode change 100644 => 100755 application/hooks/extensions/.placeholder
 mode change 100644 => 100755 application/hooks/index.html
 mode change 100644 => 100755 application/index.html
 mode change 100644 => 100755 application/language/index.html
 mode change 100644 => 100755 application/libraries/AkteLib.php
 mode change 100644 => 100755 application/libraries/AnrechnungLib.php
 mode change 100644 => 100755 application/libraries/AntragLib.php
 mode change 100644 => 100755 application/libraries/AuthLDAPLib.php
 mode change 100644 => 100755 application/libraries/AuthLib.php
 mode change 100644 => 100755 application/libraries/CisHmvc/Loader.php
 mode change 100644 => 100755 application/libraries/CmsLib.php
 mode change 100644 => 100755 application/libraries/CryptLib.php
 mode change 100644 => 100755 application/libraries/DmsLib.php
 mode change 100644 => 100755 application/libraries/DocsboxLib.php
 mode change 100644 => 100755 application/libraries/DocumentLib.php
 mode change 100644 => 100755 application/libraries/EPrintfLib.php
 mode change 100644 => 100755 application/libraries/ExtensionsLib.php
 mode change 100644 => 100755 application/libraries/FilterCmptLib.php
 mode change 100644 => 100755 application/libraries/FilterWidgetLib.php
 mode change 100644 => 100755 application/libraries/IssuesLib.php
 mode change 100644 => 100755 application/libraries/JobsQueueLib.php
 mode change 100644 => 100755 application/libraries/LogLib.php
 mode change 100644 => 100755 application/libraries/MailLib.php
 mode change 100644 => 100755 application/libraries/MessageLib.php
 mode change 100644 => 100755 application/libraries/NavigationLib.php
 mode change 100644 => 100755 application/libraries/OrganisationseinheitLib.php
 mode change 100644 => 100755 application/libraries/PermissionLib.php
 mode change 100644 => 100755 application/libraries/PersonLogLib.php
 mode change 100644 => 100755 application/libraries/PhrasesLib.php
 mode change 100644 => 100755 application/libraries/PrestudentLib.php
 mode change 100644 => 100755 application/libraries/ReihungstestLib.php
 mode change 100644 => 100755 application/libraries/SearchBarLib.php
 mode change 100644 => 100755 application/libraries/SignatureLib.php
 mode change 100644 => 100755 application/libraries/StudienplanLib.php
 mode change 100644 => 100755 application/libraries/TableWidgetLib.php
 mode change 100644 => 100755 application/libraries/UDFLib.php
 mode change 100644 => 100755 application/libraries/VariableLib.php
 mode change 100644 => 100755 application/libraries/VorlageLib.php
 mode change 100644 => 100755 application/libraries/WidgetLib.php
 mode change 100644 => 100755 application/libraries/dashboard/DashboardLib.php
 mode change 100644 => 100755 application/libraries/extensions/.placeholder
 mode change 100644 => 100755 application/libraries/index.html
 mode change 100644 => 100755 application/libraries/issues/PlausicheckDefinitionLib.php
 mode change 100644 => 100755 application/libraries/issues/PlausicheckProducerLib.php
 mode change 100644 => 100755 application/libraries/issues/plausichecks/AbbrecherAktiv.php
 mode change 100644 => 100755 application/libraries/issues/plausichecks/AbschlussstatusFehlt.php
 mode change 100644 => 100755 application/libraries/issues/plausichecks/AktSemesterNull.php
 mode change 100644 => 100755 application/libraries/issues/plausichecks/AktiverStudentOhneStatus.php
 mode change 100644 => 100755 application/libraries/issues/plausichecks/AktiverStudentstatusOhneKontobuchung.php
 mode change 100644 => 100755 application/libraries/issues/plausichecks/AusbildungssemPrestudentUngleichAusbildungssemStatus.php
 mode change 100644 => 100755 application/libraries/issues/plausichecks/BewerberNichtZumRtAngetreten.php
 mode change 100644 => 100755 application/libraries/issues/plausichecks/DatumAbschlusspruefungFehlt.php
 mode change 100644 => 100755 application/libraries/issues/plausichecks/DatumSponsionFehlt.php
 mode change 100644 => 100755 application/libraries/issues/plausichecks/DatumStudiensemesterFalscheReihenfolge.php
 mode change 100644 => 100755 application/libraries/issues/plausichecks/FalscheAnzahlAbschlusspruefungen.php
 mode change 100644 => 100755 application/libraries/issues/plausichecks/FalscheAnzahlHeimatadressen.php
 mode change 100644 => 100755 application/libraries/issues/plausichecks/FalscheAnzahlZustelladressen.php
 mode change 100644 => 100755 application/libraries/issues/plausichecks/GbDatumWeitZurueck.php
 mode change 100644 => 100755 application/libraries/issues/plausichecks/InaktiverStudentAktiverStatus.php
 mode change 100644 => 100755 application/libraries/issues/plausichecks/IncomingHeimatNationOesterreich.php
 mode change 100644 => 100755 application/libraries/issues/plausichecks/IncomingOhneIoDatensatz.php
 mode change 100644 => 100755 application/libraries/issues/plausichecks/IncomingOrGsFoerderrelevant.php
 mode change 100644 => 100755 application/libraries/issues/plausichecks/InskriptionVorLetzerBismeldung.php
 mode change 100644 => 100755 application/libraries/issues/plausichecks/NationNichtOesterreichAberGemeinde.php
 mode change 100644 => 100755 application/libraries/issues/plausichecks/OrgformStgUngleichOrgformPrestudent.php
 mode change 100644 => 100755 application/libraries/issues/plausichecks/PlausiChecker.php
 mode change 100644 => 100755 application/libraries/issues/plausichecks/PrestudentMischformOhneOrgform.php
 mode change 100644 => 100755 application/libraries/issues/plausichecks/StgPrestudentUngleichStgStudent.php
 mode change 100644 => 100755 application/libraries/issues/plausichecks/StgPrestudentUngleichStgStudienplan.php
 mode change 100644 => 100755 application/libraries/issues/plausichecks/StudentstatusNachAbbrecher.php
 mode change 100644 => 100755 application/libraries/issues/plausichecks/StudienplanUngueltig.php
 mode change 100644 => 100755 application/libraries/issues/resolvers/CORE_INOUT_0001.php
 mode change 100644 => 100755 application/libraries/issues/resolvers/CORE_INOUT_0002.php
 mode change 100644 => 100755 application/libraries/issues/resolvers/CORE_INOUT_0003.php
 mode change 100644 => 100755 application/libraries/issues/resolvers/CORE_INOUT_0004.php
 mode change 100644 => 100755 application/libraries/issues/resolvers/CORE_INOUT_0005.php
 mode change 100644 => 100755 application/libraries/issues/resolvers/CORE_INOUT_0006.php
 mode change 100644 => 100755 application/libraries/issues/resolvers/CORE_INOUT_0007.php
 mode change 100644 => 100755 application/libraries/issues/resolvers/CORE_INOUT_0008.php
 mode change 100644 => 100755 application/libraries/issues/resolvers/CORE_INOUT_0009.php
 mode change 100644 => 100755 application/libraries/issues/resolvers/CORE_PERSON_0001.php
 mode change 100644 => 100755 application/libraries/issues/resolvers/CORE_PERSON_0002.php
 mode change 100644 => 100755 application/libraries/issues/resolvers/CORE_PERSON_0003.php
 mode change 100644 => 100755 application/libraries/issues/resolvers/CORE_PERSON_0004.php
 mode change 100644 => 100755 application/libraries/issues/resolvers/CORE_STG_0001.php
 mode change 100644 => 100755 application/libraries/issues/resolvers/CORE_STG_0002.php
 mode change 100644 => 100755 application/libraries/issues/resolvers/CORE_STG_0003.php
 mode change 100644 => 100755 application/libraries/issues/resolvers/CORE_STG_0004.php
 mode change 100644 => 100755 application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0001.php
 mode change 100644 => 100755 application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0002.php
 mode change 100644 => 100755 application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0003.php
 mode change 100644 => 100755 application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0004.php
 mode change 100644 => 100755 application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0005.php
 mode change 100644 => 100755 application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0006.php
 mode change 100644 => 100755 application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0007.php
 mode change 100644 => 100755 application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0008.php
 mode change 100644 => 100755 application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0009.php
 mode change 100644 => 100755 application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0010.php
 mode change 100644 => 100755 application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0011.php
 mode change 100644 => 100755 application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0012.php
 mode change 100644 => 100755 application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0013.php
 mode change 100644 => 100755 application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0014.php
 mode change 100644 => 100755 application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0015.php
 mode change 100644 => 100755 application/libraries/issues/resolvers/CORE_ZGV_0001.php
 mode change 100644 => 100755 application/libraries/issues/resolvers/CORE_ZGV_0002.php
 mode change 100644 => 100755 application/libraries/issues/resolvers/CORE_ZGV_0003.php
 mode change 100644 => 100755 application/libraries/issues/resolvers/CORE_ZGV_0004.php
 mode change 100644 => 100755 application/libraries/issues/resolvers/CORE_ZGV_0005.php
 mode change 100644 => 100755 application/logs/index.html
 mode change 100644 => 100755 application/models/CL/Messages_model.php
 mode change 100644 => 100755 application/models/accounting/Aufteilung_model.php
 mode change 100644 => 100755 application/models/accounting/Bestelldetail_model.php
 mode change 100644 => 100755 application/models/accounting/Bestelldetailtag_model.php
 mode change 100644 => 100755 application/models/accounting/Bestellstatus_model.php
 mode change 100644 => 100755 application/models/accounting/Bestellung_model.php
 mode change 100644 => 100755 application/models/accounting/Bestellungtag_model.php
 mode change 100644 => 100755 application/models/accounting/Buchung_model.php
 mode change 100644 => 100755 application/models/accounting/Buchungstyp_model.php
 mode change 100644 => 100755 application/models/accounting/Budget_model.php
 mode change 100644 => 100755 application/models/accounting/Konto_model.php
 mode change 100644 => 100755 application/models/accounting/Kostenstelle_model.php
 mode change 100644 => 100755 application/models/accounting/Rechnung_model.php
 mode change 100644 => 100755 application/models/accounting/Rechnungsbetrag_model.php
 mode change 100644 => 100755 application/models/accounting/Rechnungstyp_model.php
 mode change 100644 => 100755 application/models/accounting/Vertrag_model.php
 mode change 100644 => 100755 application/models/accounting/Vertragsstatus_model.php
 mode change 100644 => 100755 application/models/accounting/Vertragstyp_model.php
 mode change 100644 => 100755 application/models/accounting/Vertragvertragsstatus_model.php
 mode change 100644 => 100755 application/models/accounting/Zahlungstyp_model.php
 mode change 100644 => 100755 application/models/codex/Abschluss_model.php
 mode change 100644 => 100755 application/models/codex/Akadgrad_model.php
 mode change 100644 => 100755 application/models/codex/Archiv_model.php
 mode change 100644 => 100755 application/models/codex/Aufenthaltfoerderung_model.php
 mode change 100644 => 100755 application/models/codex/Aufmerksamdurch_model.php
 mode change 100644 => 100755 application/models/codex/Ausbildung_model.php
 mode change 100644 => 100755 application/models/codex/Berufstaetigkeit_model.php
 mode change 100644 => 100755 application/models/codex/Beschaeftigungsausmass_model.php
 mode change 100644 => 100755 application/models/codex/Besqual_model.php
 mode change 100644 => 100755 application/models/codex/Bisfunktion_model.php
 mode change 100644 => 100755 application/models/codex/Bisio_model.php
 mode change 100644 => 100755 application/models/codex/Bisioaufenthaltfoerderung_model.php
 mode change 100644 => 100755 application/models/codex/Bisiozweck_model.php
 mode change 100644 => 100755 application/models/codex/Bisorgform_model.php
 mode change 100644 => 100755 application/models/codex/Bisverwendung_model.php
 mode change 100644 => 100755 application/models/codex/Bundesland_model.php
 mode change 100644 => 100755 application/models/codex/Entwicklungsteam_model.php
 mode change 100644 => 100755 application/models/codex/Gemeinde_model.php
 mode change 100644 => 100755 application/models/codex/Gsprogramm_model.php
 mode change 100644 => 100755 application/models/codex/Hauptberuf_model.php
 mode change 100644 => 100755 application/models/codex/Lehrform_model.php
 mode change 100644 => 100755 application/models/codex/Lgartcode_model.php
 mode change 100644 => 100755 application/models/codex/Mobilitaet_model.php
 mode change 100644 => 100755 application/models/codex/Mobilitaetsprogramm_model.php
 mode change 100644 => 100755 application/models/codex/Nation_model.php
 mode change 100644 => 100755 application/models/codex/Note_model.php
 mode change 100644 => 100755 application/models/codex/Oehbeitrag_model.php
 mode change 100644 => 100755 application/models/codex/Orgform_model.php
 mode change 100644 => 100755 application/models/codex/Uhstat1daten_model.php
 mode change 100644 => 100755 application/models/codex/Verwendung_model.php
 mode change 100644 => 100755 application/models/codex/Zgv_model.php
 mode change 100644 => 100755 application/models/codex/Zgvdoktor_model.php
 mode change 100644 => 100755 application/models/codex/Zgvgruppe_model.php
 mode change 100644 => 100755 application/models/codex/Zgvmaster_model.php
 mode change 100644 => 100755 application/models/codex/Zweck_model.php
 mode change 100644 => 100755 application/models/content/Ampel_model.php
 mode change 100644 => 100755 application/models/content/Content_model.php
 mode change 100644 => 100755 application/models/content/Contentchild_model.php
 mode change 100644 => 100755 application/models/content/Contentgruppe_model.php
 mode change 100644 => 100755 application/models/content/Contentlog_model.php
 mode change 100644 => 100755 application/models/content/Contentsprache_model.php
 mode change 100644 => 100755 application/models/content/DmsFS_model.php
 mode change 100644 => 100755 application/models/content/DmsVersion_model.php
 mode change 100644 => 100755 application/models/content/Dms_model.php
 mode change 100644 => 100755 application/models/content/Infoscreen_model.php
 mode change 100644 => 100755 application/models/content/News_model.php
 mode change 100644 => 100755 application/models/content/TempFS_model.php
 mode change 100644 => 100755 application/models/content/Template_model.php
 mode change 100644 => 100755 application/models/content/Veranstaltung_model.php
 mode change 100644 => 100755 application/models/content/Veranstaltungskategorie_model.php
 mode change 100644 => 100755 application/models/crm/Akte_model.php
 mode change 100644 => 100755 application/models/crm/Aufnahmeschluessel_model.php
 mode change 100644 => 100755 application/models/crm/Bewerbungstermine_model.php
 mode change 100644 => 100755 application/models/crm/Buchungstyp_model.php
 mode change 100644 => 100755 application/models/crm/Dokument_model.php
 mode change 100644 => 100755 application/models/crm/Dokumentprestudent_model.php
 mode change 100644 => 100755 application/models/crm/Dokumentstudiengang_model.php
 mode change 100644 => 100755 application/models/crm/Konto_model.php
 mode change 100644 => 100755 application/models/crm/Preincoming_model.php
 mode change 100644 => 100755 application/models/crm/Preinteressent_model.php
 mode change 100644 => 100755 application/models/crm/Preinteressentstudiengang_model.php
 mode change 100644 => 100755 application/models/crm/Preoutgoing_model.php
 mode change 100644 => 100755 application/models/crm/Prestudent_model.php
 mode change 100644 => 100755 application/models/crm/Prestudentstatus_model.php
 mode change 100644 => 100755 application/models/crm/Reihungstest_model.php
 mode change 100644 => 100755 application/models/crm/RtPerson_model.php
 mode change 100644 => 100755 application/models/crm/RtStudienplan_model.php
 mode change 100644 => 100755 application/models/crm/RueckstellungStatus_model.php
 mode change 100644 => 100755 application/models/crm/Rueckstellung_model.php
 mode change 100644 => 100755 application/models/crm/Status_model.php
 mode change 100644 => 100755 application/models/crm/Statusgrund_model.php
 mode change 100644 => 100755 application/models/crm/Student_model.php
 mode change 100644 => 100755 application/models/crm/ZGVPruefungStatus_model.php
 mode change 100644 => 100755 application/models/crm/ZGVPruefung_model.php
 mode change 100644 => 100755 application/models/dashboard/Dashboard_Override_model.php
 mode change 100644 => 100755 application/models/dashboard/Dashboard_Preset_model.php
 mode change 100644 => 100755 application/models/dashboard/Dashboard_Widget_model.php
 mode change 100644 => 100755 application/models/dashboard/Dashboard_model.php
 mode change 100644 => 100755 application/models/dashboard/Widget_model.php
 mode change 100644 => 100755 application/models/education/Abgabe_model.php
 mode change 100644 => 100755 application/models/education/Abschlussbeurteilung_model.php
 mode change 100644 => 100755 application/models/education/Abschlusspruefung_model.php
 mode change 100644 => 100755 application/models/education/Anrechnung_model.php
 mode change 100644 => 100755 application/models/education/Anrechnungbegruendung_model.php
 mode change 100644 => 100755 application/models/education/Anrechnungstatus_model.php
 mode change 100644 => 100755 application/models/education/Anrechnungszeitraum_model.php
 mode change 100644 => 100755 application/models/education/Anwesenheit_model.php
 mode change 100644 => 100755 application/models/education/Beispiel_model.php
 mode change 100644 => 100755 application/models/education/Betreuerart_model.php
 mode change 100644 => 100755 application/models/education/Feedback_model.php
 mode change 100644 => 100755 application/models/education/LeNotenschluessel_model.php
 mode change 100644 => 100755 application/models/education/LePruefung_model.php
 mode change 100644 => 100755 application/models/education/Legesamtnote_model.php
 mode change 100644 => 100755 application/models/education/Lehreinheit_model.php
 mode change 100644 => 100755 application/models/education/Lehreinheitgruppe_model.php
 mode change 100644 => 100755 application/models/education/Lehreinheitmitarbeiter_model.php
 mode change 100644 => 100755 application/models/education/Lehrfach_model.php
 mode change 100644 => 100755 application/models/education/Lehrfunktion_model.php
 mode change 100644 => 100755 application/models/education/Lehrtyp_model.php
 mode change 100644 => 100755 application/models/education/Lehrveranstaltung_model.php
 mode change 100644 => 100755 application/models/education/Lvangebot_model.php
 mode change 100644 => 100755 application/models/education/Lvgesamtnote_model.php
 mode change 100644 => 100755 application/models/education/Lvinfo_model.php
 mode change 100644 => 100755 application/models/education/Lvregel_model.php
 mode change 100644 => 100755 application/models/education/Lvregeltyp_model.php
 mode change 100644 => 100755 application/models/education/Notenschluessel_model.php
 mode change 100644 => 100755 application/models/education/Notenschluesselaufteilung_model.php
 mode change 100644 => 100755 application/models/education/Notenschluesseluebung_model.php
 mode change 100644 => 100755 application/models/education/Notenschluesselzuordnung_model.php
 mode change 100644 => 100755 application/models/education/Paabgabe_model.php
 mode change 100644 => 100755 application/models/education/Paabgabetyp_model.php
 mode change 100644 => 100755 application/models/education/Projektarbeit_model.php
 mode change 100644 => 100755 application/models/education/Projektbetreuer_model.php
 mode change 100644 => 100755 application/models/education/Projekttyp_model.php
 mode change 100644 => 100755 application/models/education/Pruefung_model.php
 mode change 100644 => 100755 application/models/education/Pruefungsanmeldung_model.php
 mode change 100644 => 100755 application/models/education/Pruefungsfenster_model.php
 mode change 100644 => 100755 application/models/education/Pruefungsstatus_model.php
 mode change 100644 => 100755 application/models/education/Pruefungstermin_model.php
 mode change 100644 => 100755 application/models/education/Pruefungstyp_model.php
 mode change 100644 => 100755 application/models/education/Studentbeispiel_model.php
 mode change 100644 => 100755 application/models/education/Studentlehrverband_model.php
 mode change 100644 => 100755 application/models/education/Studentuebung_model.php
 mode change 100644 => 100755 application/models/education/Studierendenantrag_model.php
 mode change 100644 => 100755 application/models/education/Studierendenantraglehrveranstaltung_model.php
 mode change 100644 => 100755 application/models/education/Studierendenantragstatus_model.php
 mode change 100644 => 100755 application/models/education/Uebung_model.php
 mode change 100644 => 100755 application/models/education/Zeugnis_model.php
 mode change 100644 => 100755 application/models/education/Zeugnisnote_model.php
 mode change 100644 => 100755 application/models/extensions/.placeholder
 mode change 100644 => 100755 application/models/index.html
 mode change 100644 => 100755 application/models/organisation/Erhalter_model.php
 mode change 100644 => 100755 application/models/organisation/Fachbereich_model.php
 mode change 100644 => 100755 application/models/organisation/Ferien_model.php
 mode change 100644 => 100755 application/models/organisation/Geschaeftsjahr_model.php
 mode change 100644 => 100755 application/models/organisation/Gruppe_model.php
 mode change 100644 => 100755 application/models/organisation/Lehrverband_model.php
 mode change 100644 => 100755 application/models/organisation/Organisationseinheit_model.php
 mode change 100644 => 100755 application/models/organisation/Organisationseinheittyp_model.php
 mode change 100644 => 100755 application/models/organisation/Semesterwochen_model.php
 mode change 100644 => 100755 application/models/organisation/Service_model.php
 mode change 100644 => 100755 application/models/organisation/Standort_model.php
 mode change 100644 => 100755 application/models/organisation/Statistik_model.php
 mode change 100644 => 100755 application/models/organisation/Studiengang_model.php
 mode change 100644 => 100755 application/models/organisation/Studiengangstyp_model.php
 mode change 100644 => 100755 application/models/organisation/Studienjahr_model.php
 mode change 100644 => 100755 application/models/organisation/Studienordnung_model.php
 mode change 100644 => 100755 application/models/organisation/Studienordnungstatus_model.php
 mode change 100644 => 100755 application/models/organisation/Studienplan_model.php
 mode change 100644 => 100755 application/models/organisation/Studienplatz_model.php
 mode change 100644 => 100755 application/models/organisation/Studiensemester_model.php
 mode change 100644 => 100755 application/models/person/Adresse_model.php
 mode change 100644 => 100755 application/models/person/Adressentyp_model.php
 mode change 100644 => 100755 application/models/person/Bankverbindung_model.php
 mode change 100644 => 100755 application/models/person/Benutzer_model.php
 mode change 100644 => 100755 application/models/person/Benutzerfunktion_model.php
 mode change 100644 => 100755 application/models/person/Benutzergruppe_model.php
 mode change 100644 => 100755 application/models/person/Fotostatus_model.php
 mode change 100644 => 100755 application/models/person/Fotostatusperson_model.php
 mode change 100644 => 100755 application/models/person/Freebusy_model.php
 mode change 100644 => 100755 application/models/person/Freebusytyp_model.php
 mode change 100644 => 100755 application/models/person/Geschlecht_model.php
 mode change 100644 => 100755 application/models/person/Kontakt_model.php
 mode change 100644 => 100755 application/models/person/Kontaktmedium_model.php
 mode change 100644 => 100755 application/models/person/Kontakttyp_model.php
 mode change 100644 => 100755 application/models/person/Notiz_model.php
 mode change 100644 => 100755 application/models/person/Notizzuordnung_model.php
 mode change 100644 => 100755 application/models/person/Person_model.php
 mode change 100644 => 100755 application/models/person/Profil_change_model.php
 mode change 100644 => 100755 application/models/project/Aktivitaet_model.php
 mode change 100644 => 100755 application/models/project/Aufwandstyp_model.php
 mode change 100644 => 100755 application/models/project/Projekt_model.php
 mode change 100644 => 100755 application/models/project/Projekt_ressource_model.php
 mode change 100644 => 100755 application/models/project/Projektphase_model.php
 mode change 100644 => 100755 application/models/project/Projekttask_model.php
 mode change 100644 => 100755 application/models/project/Ressource_model.php
 mode change 100644 => 100755 application/models/project/Scrumsprint_model.php
 mode change 100644 => 100755 application/models/ressource/Betriebsmittel_model.php
 mode change 100644 => 100755 application/models/ressource/Betriebsmittelperson_model.php
 mode change 100644 => 100755 application/models/ressource/Betriebsmittelstatus_model.php
 mode change 100644 => 100755 application/models/ressource/Betriebsmitteltyp_model.php
 mode change 100644 => 100755 application/models/ressource/Coodle_model.php
 mode change 100644 => 100755 application/models/ressource/Erreichbarkeit_model.php
 mode change 100644 => 100755 application/models/ressource/Firma_model.php
 mode change 100644 => 100755 application/models/ressource/Firmatag_model.php
 mode change 100644 => 100755 application/models/ressource/Firmentyp_model.php
 mode change 100644 => 100755 application/models/ressource/Funktion_model.php
 mode change 100644 => 100755 application/models/ressource/Lehrmittel_model.php
 mode change 100644 => 100755 application/models/ressource/Mitarbeiter_model.php
 mode change 100644 => 100755 application/models/ressource/Ort_model.php
 mode change 100644 => 100755 application/models/ressource/Ortraumtyp_model.php
 mode change 100644 => 100755 application/models/ressource/Personfunktionstandort_model.php
 mode change 100644 => 100755 application/models/ressource/Raumtyp_model.php
 mode change 100644 => 100755 application/models/ressource/Reservierung_model.php
 mode change 100644 => 100755 application/models/ressource/Stunde_model.php
 mode change 100644 => 100755 application/models/ressource/Stundenplan_model.php
 mode change 100644 => 100755 application/models/ressource/Stundenplandev_model.php
 mode change 100644 => 100755 application/models/ressource/Zeitaufzeichnung_model.php
 mode change 100644 => 100755 application/models/ressource/Zeitsperre_model.php
 mode change 100644 => 100755 application/models/ressource/Zeitsperretyp_model.php
 mode change 100644 => 100755 application/models/ressource/Zeitwunsch_gueltigkeit_model.php
 mode change 100644 => 100755 application/models/ressource/Zeitwunsch_model.php
 mode change 100644 => 100755 application/models/system/Appdaten_model.php
 mode change 100644 => 100755 application/models/system/Attachment_model.php
 mode change 100644 => 100755 application/models/system/Benutzerrolle_model.php
 mode change 100644 => 100755 application/models/system/Berechtigung_model.php
 mode change 100644 => 100755 application/models/system/Cronjob_model.php
 mode change 100644 => 100755 application/models/system/Dokument_model.php
 mode change 100644 => 100755 application/models/system/Extensions_model.php
 mode change 100644 => 100755 application/models/system/Fehler_model.php
 mode change 100644 => 100755 application/models/system/Fehlerkonfiguration_model.php
 mode change 100644 => 100755 application/models/system/Fehlerkonfigurationstyp_model.php
 mode change 100644 => 100755 application/models/system/Fehlerzustaendigkeiten_model.php
 mode change 100644 => 100755 application/models/system/Filter_model.php
 mode change 100644 => 100755 application/models/system/Filters_model.php
 mode change 100644 => 100755 application/models/system/Issue_model.php
 mode change 100644 => 100755 application/models/system/JobStatuses_model.php
 mode change 100644 => 100755 application/models/system/JobTriggers_model.php
 mode change 100644 => 100755 application/models/system/JobTypes_model.php
 mode change 100644 => 100755 application/models/system/JobsQueue_model.php
 mode change 100644 => 100755 application/models/system/Log_model.php
 mode change 100644 => 100755 application/models/system/MessageToken_model.php
 mode change 100644 => 100755 application/models/system/Message_model.php
 mode change 100644 => 100755 application/models/system/MsgStatus_model.php
 mode change 100644 => 100755 application/models/system/PersonLock_model.php
 mode change 100644 => 100755 application/models/system/PersonLog_model.php
 mode change 100644 => 100755 application/models/system/Phrase_model.php
 mode change 100644 => 100755 application/models/system/Phrasentext_model.php
 mode change 100644 => 100755 application/models/system/Recipient_model.php
 mode change 100644 => 100755 application/models/system/Rolle_model.php
 mode change 100644 => 100755 application/models/system/Rolleberechtigung_model.php
 mode change 100644 => 100755 application/models/system/Server_model.php
 mode change 100644 => 100755 application/models/system/Sprache_model.php
 mode change 100644 => 100755 application/models/system/Tag_model.php
 mode change 100644 => 100755 application/models/system/UDF_model.php
 mode change 100644 => 100755 application/models/system/Variable_model.php
 mode change 100644 => 100755 application/models/system/Variablenname_model.php
 mode change 100644 => 100755 application/models/system/Vorlage_model.php
 mode change 100644 => 100755 application/models/system/Vorlagedokument_model.php
 mode change 100644 => 100755 application/models/system/Vorlagestudiengang_model.php
 mode change 100644 => 100755 application/models/system/Webservicelog_model.php
 mode change 100644 => 100755 application/models/system/Webservicerecht_model.php
 mode change 100644 => 100755 application/models/system/Webservicetyp_model.php
 mode change 100644 => 100755 application/models/testtool/Ablauf_model.php
 mode change 100644 => 100755 application/models/testtool/Antwort_model.php
 mode change 100644 => 100755 application/models/testtool/Frage_model.php
 mode change 100644 => 100755 application/models/testtool/Gebiet_model.php
 mode change 100644 => 100755 application/models/testtool/Kategorie_model.php
 mode change 100644 => 100755 application/models/testtool/Kriterien_model.php
 mode change 100644 => 100755 application/models/testtool/Pruefling_model.php
 mode change 100644 => 100755 application/models/testtool/Vorschlag_model.php
 mode change 100644 => 100755 application/third_party/index.html
 mode change 100644 => 100755 application/tmp/.placeholder
 mode change 100644 => 100755 application/views/Cis/Cms/News/Xml/Address/Detailed.php
 mode change 100644 => 100755 application/views/Cis/Cms/News/Xml/Address/Short.php
 mode change 100644 => 100755 application/views/Cis/Cms/News/Xml/NewsExtras.php
 mode change 100644 => 100755 application/views/Cis/Documents.php
 mode change 100644 => 100755 application/views/Cis/Login.php
 mode change 100644 => 100755 application/views/Cis/MyLv.php
 mode change 100644 => 100755 application/views/Cis/Profil.php
 mode change 100644 => 100755 application/views/Cis/ProfilUpdate.php
 mode change 100644 => 100755 application/views/Cis/Stundenplan.php
 mode change 100644 => 100755 application/views/CisHmvc/Cms/Content.php
 mode change 100644 => 100755 application/views/CisHmvc/Cms/Legacy.php
 mode change 100644 => 100755 application/views/CisHmvc/Dashboard.php
 mode change 100644 => 100755 application/views/CisHmvc/Error.php
 mode change 100644 => 100755 application/views/CisHtml/Cms/Content.php
 mode change 100644 => 100755 application/views/CisHtml/Dashboard.php
 mode change 100644 => 100755 application/views/CisHtml/Error.php
 mode change 100644 => 100755 application/views/CisVue/Cms/Content.php
 mode change 100644 => 100755 application/views/CisVue/Dashboard.php
 mode change 100644 => 100755 application/views/codex/oehbeitrag.php
 mode change 100644 => 100755 application/views/codex/uhstat1.php
 mode change 100644 => 100755 application/views/crm/statusEdit.php
 mode change 100644 => 100755 application/views/crm/statusGrundList.php
 mode change 100644 => 100755 application/views/crm/statusList.php
 mode change 100644 => 100755 application/views/crm/statusgrund.php
 mode change 100644 => 100755 application/views/crm/statusgrundEdit.php
 mode change 100644 => 100755 application/views/crm/statusgrundNew.php
 mode change 100644 => 100755 application/views/dashboard/dashboard_demo.php
 mode change 100644 => 100755 application/views/dashboard/dashboard_demo_admin.php
 mode change 100644 => 100755 application/views/errors/cli/error_404.php
 mode change 100644 => 100755 application/views/errors/cli/error_db.php
 mode change 100644 => 100755 application/views/errors/cli/error_exception.php
 mode change 100644 => 100755 application/views/errors/cli/error_general.php
 mode change 100644 => 100755 application/views/errors/cli/error_php.php
 mode change 100644 => 100755 application/views/errors/cli/index.html
 mode change 100644 => 100755 application/views/errors/html/error_404.php
 mode change 100644 => 100755 application/views/errors/html/error_db.php
 mode change 100644 => 100755 application/views/errors/html/error_exception.php
 mode change 100644 => 100755 application/views/errors/html/error_general.php
 mode change 100644 => 100755 application/views/errors/html/error_php.php
 mode change 100644 => 100755 application/views/errors/html/index.html
 mode change 100644 => 100755 application/views/errors/index.html
 mode change 100644 => 100755 application/views/extensions/.placeholder
 mode change 100644 => 100755 application/views/home.php
 mode change 100644 => 100755 application/views/index.html
 mode change 100644 => 100755 application/views/lehre/Antrag/Create.php
 mode change 100644 => 100755 application/views/lehre/Antrag/Leitung/List.php
 mode change 100644 => 100755 application/views/lehre/Antrag/Student/List.php
 mode change 100644 => 100755 application/views/lehre/Antrag/Wiederholung/Student.php
 mode change 100644 => 100755 application/views/lehre/Antrag/Wiederholung/getLvs.rdf.php
 mode change 100644 => 100755 application/views/lehre/Antrag/Wiederholung/moveLvs.rdf.php
 mode change 100644 => 100755 application/views/lehre/anrechnung/adminAnrechnung.php
 mode change 100644 => 100755 application/views/lehre/anrechnung/adminAnrechnungData.php
 mode change 100644 => 100755 application/views/lehre/anrechnung/approveAnrechnungDetail.php
 mode change 100644 => 100755 application/views/lehre/anrechnung/approveAnrechnungUebersicht.php
 mode change 100644 => 100755 application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
 mode change 100644 => 100755 application/views/lehre/anrechnung/createAnrechnung.php
 mode change 100644 => 100755 application/views/lehre/anrechnung/createAnrechnungData.php
 mode change 100644 => 100755 application/views/lehre/anrechnung/requestAnrechnung.php
 mode change 100644 => 100755 application/views/lehre/anrechnung/requestAnrechnungImportant.php
 mode change 100644 => 100755 application/views/lehre/anrechnung/reviewAnrechnungDetail.php
 mode change 100644 => 100755 application/views/lehre/anrechnung/reviewAnrechnungInfo.php
 mode change 100644 => 100755 application/views/lehre/anrechnung/reviewAnrechnungUebersicht.php
 mode change 100644 => 100755 application/views/lehre/anrechnung/reviewAnrechnungUebersichtData.php
 mode change 100644 => 100755 application/views/lehre/lehrauftrag/Dashboard.php
 mode change 100644 => 100755 application/views/lehre/lehrauftrag/LehrendeUebersicht.php
 mode change 100644 => 100755 application/views/lehre/lehrauftrag/acceptLehrauftrag.php
 mode change 100644 => 100755 application/views/lehre/lehrauftrag/acceptLehrauftragData.php
 mode change 100644 => 100755 application/views/lehre/lehrauftrag/acceptLehrauftragHelp.php
 mode change 100644 => 100755 application/views/lehre/lehrauftrag/approveLehrauftrag.php
 mode change 100644 => 100755 application/views/lehre/lehrauftrag/approveLehrauftragData.php
 mode change 100644 => 100755 application/views/lehre/lehrauftrag/approveLehrauftragHelp.php
 mode change 100644 => 100755 application/views/lehre/lehrauftrag/cancelledLehrauftragData.php
 mode change 100644 => 100755 application/views/lehre/lehrauftrag/orderLehrauftrag.php
 mode change 100644 => 100755 application/views/lehre/lehrauftrag/orderLehrauftragData.php
 mode change 100644 => 100755 application/views/lehre/lehrauftrag/orderLehrauftragHelp.php
 mode change 100644 => 100755 application/views/lehre/lvplanung/adminZeitverfuegbarkeit.php
 mode change 100644 => 100755 application/views/lehre/lvplanung/adminZeitverfuegbarkeitData.php
 mode change 100644 => 100755 application/views/lehre/pruefungsprotokoll.php
 mode change 100644 => 100755 application/views/lehre/pruefungsprotokollUebersicht.php
 mode change 100644 => 100755 application/views/lehre/pruefungsprotokollUebersichtData.php
 mode change 100644 => 100755 application/views/organisation/reihungstest/ReihungstestUebersichtData.php
 mode change 100644 => 100755 application/views/organisation/reihungstest/reihungstest.php
 mode change 100644 => 100755 application/views/organisation/studienjahr.php
 mode change 100644 => 100755 application/views/organisation/studienjahrEdit.php
 mode change 100644 => 100755 application/views/organisation/studienjahrForm.php
 mode change 100644 => 100755 application/views/organisation/studienjahrNew.php
 mode change 100644 => 100755 application/views/organisation/studiensemester.php
 mode change 100644 => 100755 application/views/organisation/studiensemesterEdit.php
 mode change 100644 => 100755 application/views/organisation/studiensemesterForm.php
 mode change 100644 => 100755 application/views/organisation/studiensemesterNew.php
 mode change 100644 => 100755 application/views/person/bpk/bpkData.php
 mode change 100644 => 100755 application/views/person/bpk/bpkDetails.php
 mode change 100644 => 100755 application/views/person/bpk/bpkwartung.php
 mode change 100644 => 100755 application/views/person/cli/view.php
 mode change 100644 => 100755 application/views/person/gradelist/course.php
 mode change 100644 => 100755 application/views/person/gradelist/gradelist.php
 mode change 100644 => 100755 application/views/person/gradelist/semester.php
 mode change 100644 => 100755 application/views/person/gruppenmanagement/benutzergruppe.php
 mode change 100644 => 100755 application/views/person/gruppenmanagement/gruppenmanagement.php
 mode change 100644 => 100755 application/views/person/gruppenmanagement/gruppenmanagementData.php
 mode change 100644 => 100755 application/views/person/index.php
 mode change 100644 => 100755 application/views/person/view.php
 mode change 100644 => 100755 application/views/system/aufnahme/prestudentMultiAssign.php
 mode change 100644 => 100755 application/views/system/extensions/manager.php
 mode change 100644 => 100755 application/views/system/fas_udf.php
 mode change 100644 => 100755 application/views/system/infocenter/absageModal.php
 mode change 100644 => 100755 application/views/system/infocenter/addNotiz.php
 mode change 100644 => 100755 application/views/system/infocenter/anmerkungenZurBewerbung.php
 mode change 100644 => 100755 application/views/system/infocenter/dokNachzureichend.php
 mode change 100644 => 100755 application/views/system/infocenter/dokpruefung.php
 mode change 100644 => 100755 application/views/system/infocenter/infocenter.php
 mode change 100644 => 100755 application/views/system/infocenter/infocenterAbgewiesen.php
 mode change 100644 => 100755 application/views/system/infocenter/infocenterAbgewiesenData.php
 mode change 100644 => 100755 application/views/system/infocenter/infocenterAufgenommen.php
 mode change 100644 => 100755 application/views/system/infocenter/infocenterAufgenommenData.php
 mode change 100644 => 100755 application/views/system/infocenter/infocenterData.php
 mode change 100644 => 100755 application/views/system/infocenter/infocenterDetails.php
 mode change 100644 => 100755 application/views/system/infocenter/infocenterFreigegeben.php
 mode change 100644 => 100755 application/views/system/infocenter/infocenterFreigegebenData.php
 mode change 100644 => 100755 application/views/system/infocenter/infocenterReihungstestAbsolviert.php
 mode change 100644 => 100755 application/views/system/infocenter/infocenterReihungstestAbsolviertData.php
 mode change 100644 => 100755 application/views/system/infocenter/infocenterZgvDetails.php
 mode change 100644 => 100755 application/views/system/infocenter/infocenterZgvUeberpruefung.php
 mode change 100644 => 100755 application/views/system/infocenter/infocenterZgvUeberpruefungData.php
 mode change 100644 => 100755 application/views/system/infocenter/logs.php
 mode change 100644 => 100755 application/views/system/infocenter/messageList.php
 mode change 100644 => 100755 application/views/system/infocenter/notizen.php
 mode change 100644 => 100755 application/views/system/infocenter/stammdaten.php
 mode change 100644 => 100755 application/views/system/infocenter/studiengangZgvInfo.php
 mode change 100644 => 100755 application/views/system/infocenter/zgvpruefungen.php
 mode change 100644 => 100755 application/views/system/issues/issues.php
 mode change 100644 => 100755 application/views/system/issues/issuesData.php
 mode change 100644 => 100755 application/views/system/issues/issuesKonfiguration.php
 mode change 100644 => 100755 application/views/system/issues/issuesKonfigurationData.php
 mode change 100644 => 100755 application/views/system/issues/issuesZustaendigkeiten.php
 mode change 100644 => 100755 application/views/system/issues/issuesZustaendigkeitenData.php
 mode change 100644 => 100755 application/views/system/issues/plausichecks.php
 mode change 100644 => 100755 application/views/system/jq/jobsQueueViewer.php
 mode change 100644 => 100755 application/views/system/jq/jobsQueueViewerData.php
 mode change 100644 => 100755 application/views/system/login/usernamePassword.php
 mode change 100644 => 100755 application/views/system/logs/logsViewer.php
 mode change 100644 => 100755 application/views/system/logs/testSearch.php
 mode change 100644 => 100755 application/views/system/messages/FAShtmlWriteTemplate.php
 mode change 100644 => 100755 application/views/system/messages/ajaxRead.php
 mode change 100644 => 100755 application/views/system/messages/ajaxWrite.php
 mode change 100644 => 100755 application/views/system/messages/ajaxWriteReply.php
 mode change 100644 => 100755 application/views/system/messages/htmlMessageSentError.php
 mode change 100644 => 100755 application/views/system/messages/htmlMessageSentSuccess.php
 mode change 100644 => 100755 application/views/system/messages/htmlRead.php
 mode change 100644 => 100755 application/views/system/messages/htmlWriteReply.php
 mode change 100644 => 100755 application/views/system/messages/htmlWriteTemplate.php
 mode change 100644 => 100755 application/views/system/phrases/phraseinhaltEdit.php
 mode change 100644 => 100755 application/views/system/phrases/phrases.php
 mode change 100644 => 100755 application/views/system/phrases/phrasesEdit.php
 mode change 100644 => 100755 application/views/system/phrases/phrasesList.php
 mode change 100644 => 100755 application/views/system/phrases/phrasesinhaltList.php
 mode change 100644 => 100755 application/views/system/vorlage/templateLinkDocuments.php
 mode change 100644 => 100755 application/views/system/vorlage/templates.php
 mode change 100644 => 100755 application/views/system/vorlage/templatesEdit.php
 mode change 100644 => 100755 application/views/system/vorlage/templatesList.php
 mode change 100644 => 100755 application/views/system/vorlage/templatetextEdit.php
 mode change 100644 => 100755 application/views/system/vorlage/templatetextList.php
 mode change 100644 => 100755 application/views/system/vorlage/templatetextPreview.php
 mode change 100644 => 100755 application/views/templates/CISHMVC-Footer.php
 mode change 100644 => 100755 application/views/templates/CISHMVC-Header.php
 mode change 100644 => 100755 application/views/templates/CISHMVC-Menu/Entry.php
 mode change 100644 => 100755 application/views/templates/CISHTML-Footer.php
 mode change 100644 => 100755 application/views/templates/CISHTML-Header.php
 mode change 100644 => 100755 application/views/templates/CISHTML-Menu/Entry.php
 mode change 100644 => 100755 application/views/templates/CISHTML-Menu/EntryBase.php
 mode change 100644 => 100755 application/views/templates/CISHTML-Menu/EntryInclude.php
 mode change 100644 => 100755 application/views/templates/CISVUE-Footer.php
 mode change 100644 => 100755 application/views/templates/CISVUE-Header.php
 mode change 100644 => 100755 application/views/templates/FHC-Common.php
 mode change 100644 => 100755 application/views/templates/FHC-Footer.php
 mode change 100644 => 100755 application/views/templates/FHC-Header.php
 mode change 100644 => 100755 application/views/templates/footer.php
 mode change 100644 => 100755 application/views/templates/header.php
 mode change 100644 => 100755 application/views/templates/mailHTML.php
 mode change 100644 => 100755 application/views/templates/mailTXT.php
 mode change 100644 => 100755 application/views/templates/mailtemplates/interessentFreigabe.php
 mode change 100644 => 100755 application/views/templates/vilesci.php
 mode change 100644 => 100755 application/views/test/Admin.php
 mode change 100644 => 100755 application/views/test/Test.php
 mode change 100644 => 100755 application/views/widgets/checkbox.php
 mode change 100644 => 100755 application/views/widgets/dropdown.php
 mode change 100644 => 100755 application/views/widgets/filter/filter.php
 mode change 100644 => 100755 application/views/widgets/filter/filterOptions.php
 mode change 100644 => 100755 application/views/widgets/filter/pivotUIDataset.php
 mode change 100644 => 100755 application/views/widgets/filter/saveFilter.php
 mode change 100644 => 100755 application/views/widgets/filter/selectFields.php
 mode change 100644 => 100755 application/views/widgets/filter/selectFilters.php
 mode change 100644 => 100755 application/views/widgets/filter/tableDataset.php
 mode change 100644 => 100755 application/views/widgets/filter/tabulatorDataset.php
 mode change 100644 => 100755 application/views/widgets/jsoneditor.php
 mode change 100644 => 100755 application/views/widgets/jsonforms.php
 mode change 100644 => 100755 application/views/widgets/mimetype.php
 mode change 100644 => 100755 application/views/widgets/navigation.php
 mode change 100644 => 100755 application/views/widgets/navigationHeader.php
 mode change 100644 => 100755 application/views/widgets/navigationMenu.php
 mode change 100644 => 100755 application/views/widgets/phpjsonform.php
 mode change 100644 => 100755 application/views/widgets/table/pivotUIDataset.php
 mode change 100644 => 100755 application/views/widgets/table/table.php
 mode change 100644 => 100755 application/views/widgets/table/tableDataset.php
 mode change 100644 => 100755 application/views/widgets/table/tableHelpsite.php
 mode change 100644 => 100755 application/views/widgets/table/tabulatorDataset.php
 mode change 100644 => 100755 application/views/widgets/textarea.php
 mode change 100644 => 100755 application/views/widgets/textfield.php
 mode change 100644 => 100755 application/views/widgets/tinymce.php
 mode change 100644 => 100755 application/widgets/Aufnahmegruppe_widget.php
 mode change 100644 => 100755 application/widgets/Ausbildungssemester_widget.php
 mode change 100644 => 100755 application/widgets/Dropdown_widget.php
 mode change 100644 => 100755 application/widgets/FilterWidget.php
 mode change 100644 => 100755 application/widgets/MultipleDropdown_widget.php
 mode change 100644 => 100755 application/widgets/Nation_widget.php
 mode change 100644 => 100755 application/widgets/NavigationHeaderWidget.php
 mode change 100644 => 100755 application/widgets/NavigationMenuWidget.php
 mode change 100644 => 100755 application/widgets/NavigationWidget.php
 mode change 100644 => 100755 application/widgets/Organisationseinheit_widget.php
 mode change 100644 => 100755 application/widgets/Orgform_widget.php
 mode change 100644 => 100755 application/widgets/Reihungstest_widget.php
 mode change 100644 => 100755 application/widgets/Sprache_widget.php
 mode change 100644 => 100755 application/widgets/Statusgrund_widget.php
 mode change 100644 => 100755 application/widgets/Studiengang_widget.php
 mode change 100644 => 100755 application/widgets/Studiensemester_widget.php
 mode change 100644 => 100755 application/widgets/Stufe_widget.php
 mode change 100644 => 100755 application/widgets/TableWidget.php
 mode change 100644 => 100755 application/widgets/Vorlage_widget.php
 mode change 100644 => 100755 application/widgets/Zgv_widget.php
 mode change 100644 => 100755 application/widgets/Zgvmaster_widget.php
 mode change 100644 => 100755 application/widgets/extensions/.placeholder
 mode change 100644 => 100755 application/widgets/html/CheckboxWidget.php
 mode change 100644 => 100755 application/widgets/html/DropdownWidget.php
 mode change 100644 => 100755 application/widgets/html/HTMLWidget.php
 mode change 100644 => 100755 application/widgets/html/TextareaWidget.php
 mode change 100644 => 100755 application/widgets/html/TextfieldWidget.php
 mode change 100644 => 100755 application/widgets/jsoneditor_widget.php
 mode change 100644 => 100755 application/widgets/jsonforms_widget.php
 mode change 100644 => 100755 application/widgets/mimetype_widget.php
 mode change 100644 => 100755 application/widgets/phpjsonform_widget.php
 mode change 100644 => 100755 application/widgets/tinymce_widget.php
 mode change 100644 => 100755 application/widgets/udf/CheckboxWidgetUDF.php
 mode change 100644 => 100755 application/widgets/udf/DropdownWidgetUDF.php
 mode change 100644 => 100755 application/widgets/udf/TextareaWidgetUDF.php
 mode change 100644 => 100755 application/widgets/udf/TextfieldWidgetUDF.php
 mode change 100644 => 100755 application/widgets/udf/UDFWidget.php
 mode change 100644 => 100755 cis.php
 mode change 100644 => 100755 cis/ampel.php
 mode change 100644 => 100755 cis/cisdocs/index.html
 mode change 100644 => 100755 cis/cisdocs/muster_semesterplan.doc
 mode change 100644 => 100755 cis/cisdocs/muster_semesterplan_index.html
 mode change 100644 => 100755 cis/cisdocs/vorlage_studienbrief.dot
 mode change 100644 => 100755 cis/index.html
 mode change 100644 => 100755 cis/index.php
 mode change 100644 => 100755 cis/index_login.php
 mode change 100644 => 100755 cis/infoterminal/feed.png
 mode change 100644 => 100755 cis/infoterminal/go-bottom.png
 mode change 100644 => 100755 cis/infoterminal/go-top.png
 mode change 100644 => 100755 cis/infoterminal/index.php
 mode change 100644 => 100755 cis/infoterminal/informationsbildschirm.php
 mode change 100644 => 100755 cis/infoterminal/infoterm.css
 mode change 100644 => 100755 cis/infoterminal/keyboard.php
 mode change 100644 => 100755 cis/infoterminal/lvplan.php
 mode change 100644 => 100755 cis/infoterminal/system-users_in.png
 mode change 100644 => 100755 cis/infoterminal/system-users_out.png
 mode change 100644 => 100755 cis/infoterminal/tw_lageplan.jpg
 mode change 100644 => 100755 cis/infoterminal/tw_logo_01.jpg
 mode change 100644 => 100755 cis/infoterminal/twplan.gif
 mode change 100644 => 100755 cis/menu.php
 mode change 100644 => 100755 cis/private/bildupload.php
 mode change 100644 => 100755 cis/private/coodle/coodle_autocomplete.php
 mode change 100644 => 100755 cis/private/coodle/coodle_events.php
 mode change 100644 => 100755 cis/private/coodle/coodle_worker.php
 mode change 100644 => 100755 cis/private/coodle/index.html
 mode change 100644 => 100755 cis/private/coodle/stammdaten.php
 mode change 100644 => 100755 cis/private/coodle/termin.php
 mode change 100644 => 100755 cis/private/coodle/uebersicht.php
 mode change 100644 => 100755 cis/private/crop.php
 mode change 100644 => 100755 cis/private/freifaecher/anmeldung.php
 mode change 100644 => 100755 cis/private/freifaecher/anmeldungsuebersicht.php
 mode change 100644 => 100755 cis/private/freifaecher/index.html
 mode change 100644 => 100755 cis/private/index.html
 mode change 100644 => 100755 cis/private/info/ersthelfer.php
 mode change 100644 => 100755 cis/private/info/handbuecher/Projektarbeitsabgabe_FHTW_Anleitung_A.pdf
 mode change 100644 => 100755 cis/private/info/handbuecher/Projektarbeitsabgabe_FHTW_Anleitung_L.pdf
 mode change 100644 => 100755 cis/private/info/handbuecher/Publikationsdatenbank_FHTW_Handbuch.pdf
 mode change 100644 => 100755 cis/private/info/handbuecher/abgabetool_lektoren.pdf
 mode change 100644 => 100755 cis/private/info/handbuecher/abgabetool_studenten.pdf
 mode change 100644 => 100755 cis/private/info/handbuecher/index.php
 mode change 100644 => 100755 cis/private/info/index.html
 mode change 100644 => 100755 cis/private/info/partnerhochschulen.php
 mode change 100644 => 100755 cis/private/info/service_uebersicht.php
 mode change 100644 => 100755 cis/private/info/telefonverzeichnis.php
 mode change 100644 => 100755 cis/private/jahresplan/index.html
 mode change 100644 => 100755 cis/private/jahresplan/index.php
 mode change 100644 => 100755 cis/private/jahresplan/jahresplan_bilder.php
 mode change 100644 => 100755 cis/private/jahresplan/jahresplan_detail.php
 mode change 100644 => 100755 cis/private/jahresplan/jahresplan_funktionen.inc.php
 mode change 100644 => 100755 cis/private/jahresplan/jahresplan_kategorie.php
 mode change 100644 => 100755 cis/private/jahresplan/jahresplan_reservierung.php
 mode change 100644 => 100755 cis/private/jahresplan/jahresplan_veranstaltung.php
 mode change 100644 => 100755 cis/private/lehre/abgabe_lektor.php
 mode change 100644 => 100755 cis/private/lehre/abgabe_lektor_details.php
 mode change 100644 => 100755 cis/private/lehre/abgabe_lektor_frameset.html
 mode change 100644 => 100755 cis/private/lehre/abgabe_lektor_multitermin.php
 mode change 100644 => 100755 cis/private/lehre/abgabe_lektor_terminuebersicht.php
 mode change 100644 => 100755 cis/private/lehre/abgabe_lektor_zusatz.php
 mode change 100644 => 100755 cis/private/lehre/abgabe_student.php
 mode change 100644 => 100755 cis/private/lehre/abgabe_student_details.php
 mode change 100644 => 100755 cis/private/lehre/abgabe_student_file.php
 mode change 100644 => 100755 cis/private/lehre/abgabe_student_frameset.php
 mode change 100644 => 100755 cis/private/lehre/abmeldung.php
 mode change 100644 => 100755 cis/private/lehre/anwesenheitsliste.pdf.php
 mode change 100644 => 100755 cis/private/lehre/anwesenheitsliste.php
 mode change 100644 => 100755 cis/private/lehre/benotungstool/lvgesamtnote_worker.php
 mode change 100644 => 100755 cis/private/lehre/benotungstool/lvgesamtnoteeintragen.php
 mode change 100644 => 100755 cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php
 mode change 100644 => 100755 cis/private/lehre/benotungstool/nachpruefungeintragen.php
 mode change 100644 => 100755 cis/private/lehre/benotungstool/notenschluessel.php
 mode change 100644 => 100755 cis/private/lehre/covidstatusliste.php
 mode change 100644 => 100755 cis/private/lehre/feedback.php
 mode change 100644 => 100755 cis/private/lehre/fotoliste.pdf.php
 mode change 100644 => 100755 cis/private/lehre/index.html
 mode change 100644 => 100755 cis/private/lehre/lector_choice.php
 mode change 100644 => 100755 cis/private/lehre/lesson.php
 mode change 100644 => 100755 cis/private/lehre/notenliste.php
 mode change 100644 => 100755 cis/private/lehre/notenliste.xls.php
 mode change 100644 => 100755 cis/private/lehre/pruefung/index.php
 mode change 100644 => 100755 cis/private/lehre/pruefung/lektor_autocomplete.php
 mode change 100644 => 100755 cis/private/lehre/pruefung/pruefung.js.php
 mode change 100644 => 100755 cis/private/lehre/pruefung/pruefungsanmeldung.json.php
 mode change 100644 => 100755 cis/private/lehre/pruefung/pruefungsanmeldung.php
 mode change 100644 => 100755 cis/private/lehre/pruefung/pruefungsanmeldungen_liste.pdf.php
 mode change 100644 => 100755 cis/private/lehre/pruefung/pruefungsanmeldungen_liste.php
 mode change 100644 => 100755 cis/private/lehre/pruefung/pruefungsanmeldungen_liste_ohne_namen.php
 mode change 100644 => 100755 cis/private/lehre/pruefung/pruefungsanmeldungen_verwalten.php
 mode change 100644 => 100755 cis/private/lehre/pruefung/pruefungsbewertung.js.php
 mode change 100644 => 100755 cis/private/lehre/pruefung/pruefungsbewertung.json.php
 mode change 100644 => 100755 cis/private/lehre/pruefung/pruefungsbewertung.php
 mode change 100644 => 100755 cis/private/lehre/pruefung/pruefungsfenster_anlegen.php
 mode change 100644 => 100755 cis/private/lehre/pruefung/pruefungstermin.json.php
 mode change 100644 => 100755 cis/private/lehre/pruefung/pruefungstermin_aendern.php
 mode change 100644 => 100755 cis/private/lehre/pruefung/pruefungstermin_festlegen.php
 mode change 100644 => 100755 cis/private/lehre/pruefung/pruefungstermin_loeschen.php
 mode change 100644 => 100755 cis/private/lehre/semdownhlp.php
 mode change 100644 => 100755 cis/private/lehre/semupload.php
 mode change 100644 => 100755 cis/private/lehre/softgrid.php
 mode change 100644 => 100755 cis/private/lehre/upload.php
 mode change 100644 => 100755 cis/private/lvplan/belegt.php
 mode change 100644 => 100755 cis/private/lvplan/index.html
 mode change 100644 => 100755 cis/private/lvplan/index.php
 mode change 100644 => 100755 cis/private/lvplan/index_out.html
 mode change 100644 => 100755 cis/private/lvplan/lvplan_autocomplete.php
 mode change 100644 => 100755 cis/private/lvplan/raumsuche.php
 mode change 100644 => 100755 cis/private/lvplan/stpl_detail.php
 mode change 100644 => 100755 cis/private/lvplan/stpl_kalender.php
 mode change 100644 => 100755 cis/private/lvplan/stpl_reserve_list.php
 mode change 100644 => 100755 cis/private/lvplan/stpl_week.php
 mode change 100644 => 100755 cis/private/lvplan/stpl_week_anzahl_studenten.php
 mode change 100644 => 100755 cis/private/lvplan/verband_uebersicht.php
 mode change 100644 => 100755 cis/private/mailverteiler.php
 mode change 100644 => 100755 cis/private/open_grp.php
 mode change 100644 => 100755 cis/private/outgoing/akte.php
 mode change 100644 => 100755 cis/private/outgoing/akteupload.php
 mode change 100644 => 100755 cis/private/outgoing/index.html
 mode change 100644 => 100755 cis/private/outgoing/outgoing.php
 mode change 100644 => 100755 cis/private/outgoing/outgoing_autocomplete.php
 mode change 100644 => 100755 cis/private/outgoing/registration.php
 mode change 100644 => 100755 cis/private/pdfExport.php
 mode change 100644 => 100755 cis/private/pers_in_grp.php
 mode change 100644 => 100755 cis/private/profile/anwesenheit.php
 mode change 100644 => 100755 cis/private/profile/anwesenheit_lektor.php
 mode change 100644 => 100755 cis/private/profile/change_password.php
 mode change 100644 => 100755 cis/private/profile/dokumente.php
 mode change 100644 => 100755 cis/private/profile/freebusy.php
 mode change 100644 => 100755 cis/private/profile/index.html
 mode change 100644 => 100755 cis/private/profile/index.php
 mode change 100644 => 100755 cis/private/profile/lva_liste.php
 mode change 100644 => 100755 cis/private/profile/mitarbeiter_buchung.php
 mode change 100644 => 100755 cis/private/profile/studienplan.php
 mode change 100644 => 100755 cis/private/profile/urlaubsfreigabe.php
 mode change 100644 => 100755 cis/private/profile/urlaubstool.php
 mode change 100644 => 100755 cis/private/profile/urlaubstool_autocomplete.php
 mode change 100644 => 100755 cis/private/profile/zahlungen.php
 mode change 100644 => 100755 cis/private/profile/zahlungen_details.php
 mode change 100644 => 100755 cis/private/profile/zeitsperre.php
 mode change 100644 => 100755 cis/private/profile/zeitsperre_days.php
 mode change 100644 => 100755 cis/private/profile/zeitsperre_export.php
 mode change 100644 => 100755 cis/private/profile/zeitsperre_resturlaub.php
 mode change 100644 => 100755 cis/private/profile/zeitwunsch.php
 mode change 100644 => 100755 cis/private/profile/zeitwunsch_help.php
 mode change 100644 => 100755 cis/private/stud_in_grp.php
 mode change 100644 => 100755 cis/private/tools/ampelleiteruebersicht.php
 mode change 100644 => 100755 cis/private/tools/ampelverwaltung.php
 mode change 100644 => 100755 cis/private/tools/index.html
 mode change 100644 => 100755 cis/private/tools/notebook_registration.php
 mode change 100644 => 100755 cis/private/tools/projektabgabe.php
 mode change 100644 => 100755 cis/private/tools/projektabgabe_autocomplete.php
 mode change 100644 => 100755 cis/private/tools/suche.php
 mode change 100644 => 100755 cis/private/tools/zeitaufzeichnung.php
 mode change 100644 => 100755 cis/private/tools/zeitaufzeichnung_autocomplete.php
 mode change 100644 => 100755 cis/private/tools/zeitaufzeichnung_bisverwendung.php
 mode change 100644 => 100755 cis/private/tools/zeitaufzeichnung_projektliste.php
 mode change 100644 => 100755 cis/private/tools/zeitaufzeichnung_projektphasen.php
 mode change 100644 => 100755 cis/private/tools/zeitaufzeichnung_zeitsperren.php
 mode change 100644 => 100755 cis/public/accountactivation.php
 mode change 100644 => 100755 cis/public/bild.php
 mode change 100644 => 100755 cis/public/bildupload.php
 mode change 100644 => 100755 cis/public/coodle.php
 mode change 100644 => 100755 cis/public/freebusy.php
 mode change 100644 => 100755 cis/public/freebusy_coodle.php
 mode change 100644 => 100755 cis/public/freebusy_lvplan.php
 mode change 100644 => 100755 cis/public/freebusy_sogo.php
 mode change 100644 => 100755 cis/public/freebusy_zeitsperren.php
 mode change 100644 => 100755 cis/public/ical_coodle.php
 mode change 100644 => 100755 cis/public/incoming/akte.php
 mode change 100644 => 100755 cis/public/incoming/akteupload.php
 mode change 100644 => 100755 cis/public/incoming/auth.php
 mode change 100644 => 100755 cis/public/incoming/incoming.php
 mode change 100644 => 100755 cis/public/incoming/index.php
 mode change 100644 => 100755 cis/public/incoming/logout.php
 mode change 100644 => 100755 cis/public/incoming/lvinfo.php
 mode change 100644 => 100755 cis/public/incoming/registration.php
 mode change 100644 => 100755 cis/public/index.html
 mode change 100644 => 100755 cis/public/prestudententool/auth.php
 mode change 100644 => 100755 cis/public/prestudententool/index.php
 mode change 100644 => 100755 cis/public/prestudententool/logout.php
 mode change 100644 => 100755 cis/public/prestudententool/prestudent.php
 mode change 100644 => 100755 cis/public/testtool_test/MathML_Beispiel.jpg
 mode change 100644 => 100755 cis/public/testtool_test/audio_testfile.mp3
 mode change 100644 => 100755 cis/public/testtool_test/testseite.php
 mode change 100644 => 100755 cis/testtool/admin/Testtool.pdf
 mode change 100644 => 100755 cis/testtool/admin/add_gebiet.php
 mode change 100644 => 100755 cis/testtool/admin/auswertung.php
 mode change 100644 => 100755 cis/testtool/admin/auswertung_detail.php
 mode change 100644 => 100755 cis/testtool/admin/auswertung_detail_frage.php
 mode change 100644 => 100755 cis/testtool/admin/auswertung_detail_prestudent.php
 mode change 100644 => 100755 cis/testtool/admin/copy_gebiet.php
 mode change 100644 => 100755 cis/testtool/admin/edit_ablauf.php
 mode change 100644 => 100755 cis/testtool/admin/edit_gebiet.php
 mode change 100644 => 100755 cis/testtool/admin/gebieteAnheangen.php
 mode change 100644 => 100755 cis/testtool/admin/index.php
 mode change 100644 => 100755 cis/testtool/admin/uebersichtFragen.php
 mode change 100644 => 100755 cis/testtool/admin/uebersichtGebiete.php
 mode change 100644 => 100755 cis/testtool/audio-player/audio-player-noswfobject.js
 mode change 100644 => 100755 cis/testtool/audio-player/audio-player-uncompressed.js
 mode change 100644 => 100755 cis/testtool/audio-player/audio-player.js
 mode change 100644 => 100755 cis/testtool/audio-player/license.txt
 mode change 100644 => 100755 cis/testtool/audio-player/player.swf
 mode change 100644 => 100755 cis/testtool/bild.php
 mode change 100644 => 100755 cis/testtool/ctop.xsl
 mode change 100644 => 100755 cis/testtool/frage.php
 mode change 100644 => 100755 cis/testtool/gebietfertig.php
 mode change 100644 => 100755 cis/testtool/index.html
 mode change 100644 => 100755 cis/testtool/index.php
 mode change 100644 => 100755 cis/testtool/login.php
 mode change 100644 => 100755 cis/testtool/logout.html
 mode change 100644 => 100755 cis/testtool/mathml.xsl
 mode change 100644 => 100755 cis/testtool/menu.php
 mode change 100644 => 100755 cis/testtool/pmathml.xsl
 mode change 100644 => 100755 cis/testtool/prueflinggesperrt.php
 mode change 100644 => 100755 cis/testtool/sound.php
 mode change 100644 => 100755 cis/testtool/test/MathML_Beispiel.jpg
 mode change 100644 => 100755 cis/testtool/test/audio_testfile.mp3
 mode change 100644 => 100755 cis/testtool/test/testseite.php
 mode change 100644 => 100755 cis/testtool/topbar.html
 mode change 100644 => 100755 cis/testtool/topbar.php
 mode change 100644 => 100755 cms/admin.php
 mode change 100644 => 100755 cms/admin_dms.php
 mode change 100644 => 100755 cms/content.php
 mode change 100644 => 100755 cms/content_uebersicht.php
 mode change 100644 => 100755 cms/dms.php
 mode change 100644 => 100755 cms/image.php
 mode change 100644 => 100755 cms/index.html
 mode change 100644 => 100755 cms/menu.inc.php
 mode change 100644 => 100755 cms/menu/menu_addon.class.php
 mode change 100644 => 100755 cms/menu/menu_addon_freifaecher.inc.php
 mode change 100644 => 100755 cms/menu/menu_addon_lehrveranstaltungen.inc.php
 mode change 100644 => 100755 cms/menu/menu_addon_lehrveranstaltungen_studienplan.inc.php
 mode change 100644 => 100755 cms/menu/menu_addon_meinelehrfaecher.inc.php
 mode change 100644 => 100755 cms/menu/menu_addon_meinelv.inc.php
 mode change 100644 => 100755 cms/menu/menu_addon_spacer.inc.php
 mode change 100644 => 100755 cms/menu/menu_addon_test.inc.php
 mode change 100644 => 100755 cms/menu/menu_addon_urlaub.inc.php
 mode change 100644 => 100755 cms/menu/menu_addon_zeitsperren.inc.php
 mode change 100644 => 100755 cms/news.php
 mode change 100644 => 100755 cms/newsverwaltung.php
 mode change 100644 => 100755 cms/tinymce_dms.php
 mode change 100644 => 100755 composer.json
 mode change 100644 => 100755 composer.lock
 mode change 100644 => 100755 config/.gitignore
 mode change 100644 => 100755 config/cis.config-default.inc.php
 mode change 100644 => 100755 config/global.config-default.inc.php
 mode change 100644 => 100755 config/system.config-default.inc.php
 mode change 100644 => 100755 config/vilesci.config-default.inc.php
 mode change 100644 => 100755 config/wawi.config-default.inc.php
 mode change 100644 => 100755 content/DragAndDrop.js
 mode change 100644 => 100755 content/about.xul.php
 mode change 100644 => 100755 content/adressedialog.js.php
 mode change 100644 => 100755 content/adressedialog.xul.php
 mode change 100644 => 100755 content/akte.php
 mode change 100644 => 100755 content/akteupload.php
 mode change 100644 => 100755 content/anwesenheit.js.php
 mode change 100644 => 100755 content/anwesenheit.xul.php
 mode change 100644 => 100755 content/bankverbindungdialog.js.php
 mode change 100644 => 100755 content/bankverbindungdialog.xul.php
 mode change 100644 => 100755 content/betriebsmitteloverlay.js.php
 mode change 100644 => 100755 content/betriebsmitteloverlay.xul.php
 mode change 100644 => 100755 content/bild.php
 mode change 100644 => 100755 content/bildupload.php
 mode change 100644 => 100755 content/bindings.css
 mode change 100644 => 100755 content/bindings.xml.php
 mode change 100644 => 100755 content/datepicker/calendar.png
 mode change 100644 => 100755 content/datepicker/date.png
 mode change 100644 => 100755 content/datepicker/datepicker.css
 mode change 100644 => 100755 content/datepicker/datepicker.xml
 mode change 100644 => 100755 content/datepicker/navigation.png
 mode change 100644 => 100755 content/dokumentenakt.pdf.php
 mode change 100644 => 100755 content/dragboard.js.php
 mode change 100644 => 100755 content/fas.xul.php
 mode change 100644 => 100755 content/fasDBDML.php
 mode change 100644 => 100755 content/fasoverlay.js.php
 mode change 100644 => 100755 content/fasoverlay.xul.php
 mode change 100644 => 100755 content/functions.js.php
 mode change 100644 => 100755 content/funktionen.js.php
 mode change 100644 => 100755 content/funktionen.xul.php
 mode change 100644 => 100755 content/kontakt.js.php
 mode change 100644 => 100755 content/kontakt.xul.php
 mode change 100644 => 100755 content/kontaktdialog.js.php
 mode change 100644 => 100755 content/kontaktdialog.xul.php
 mode change 100644 => 100755 content/lvplanung/lehrveranstaltungDBDML.php
 mode change 100644 => 100755 content/lvplanung/lehrveranstaltungdetailoverlay.xul.php
 mode change 100644 => 100755 content/lvplanung/lehrveranstaltungnotenoverlay.xul.php
 mode change 100644 => 100755 content/lvplanung/lehrveranstaltungoverlay.js.php
 mode change 100644 => 100755 content/lvplanung/lehrveranstaltungoverlay.xul.php
 mode change 100644 => 100755 content/lvplanung/ressourcedialog.js.php
 mode change 100644 => 100755 content/lvplanung/ressourcedialog.xul.php
 mode change 100644 => 100755 content/lvplanung/stpl-details-dialog.js.php
 mode change 100644 => 100755 content/lvplanung/stpl-details-dialog.xul.php
 mode change 100644 => 100755 content/lvplanung/stpl-details-overlay.xul.php
 mode change 100644 => 100755 content/lvplanung/stpl-semester-overlay.js.php
 mode change 100644 => 100755 content/lvplanung/stpl-semester-overlay.xul.php
 mode change 100644 => 100755 content/lvplanung/stpl-week-overlay.js.php
 mode change 100644 => 100755 content/lvplanung/stpl-week-overlay.xul.php
 mode change 100644 => 100755 content/lvplanung/timetable-week.xul.php
 mode change 100644 => 100755 content/messages.js.php
 mode change 100644 => 100755 content/messages.xul.php
 mode change 100644 => 100755 content/mitarbeiter/lehrtaetigkeit.pdf.php
 mode change 100644 => 100755 content/mitarbeiter/mitarbeiterDBDML.php
 mode change 100644 => 100755 content/mitarbeiter/mitarbeiterbuchung.js.php
 mode change 100644 => 100755 content/mitarbeiter/mitarbeiterbuchungoverlay.xul.php
 mode change 100644 => 100755 content/mitarbeiter/mitarbeiterdetailoverlay.xul.php
 mode change 100644 => 100755 content/mitarbeiter/mitarbeiterfunktionoverlay.xul.php
 mode change 100644 => 100755 content/mitarbeiter/mitarbeiteroverlay.js.php
 mode change 100644 => 100755 content/mitarbeiter/mitarbeiteroverlay.xul.php
 mode change 100644 => 100755 content/mitarbeiter/mitarbeitervertrag.js.php
 mode change 100644 => 100755 content/mitarbeiter/mitarbeitervertragneudialog.js.php
 mode change 100644 => 100755 content/mitarbeiter/mitarbeitervertragneudialog.xul.php
 mode change 100644 => 100755 content/mitarbeiter/mitarbeitervertragoverlay.xul.php
 mode change 100644 => 100755 content/mitarbeiter/mitarbeiterverwendungdialog.js.php
 mode change 100644 => 100755 content/mitarbeiter/mitarbeiterverwendungdialog.xul.php
 mode change 100644 => 100755 content/notiz.xml.php
 mode change 100644 => 100755 content/notizdialog.js.php
 mode change 100644 => 100755 content/notizdialog.xul.php
 mode change 100644 => 100755 content/notizdokdownload.php
 mode change 100644 => 100755 content/notizdokupload.php
 mode change 100644 => 100755 content/pdfExport.php
 mode change 100644 => 100755 content/phpRequest.js.php
 mode change 100644 => 100755 content/planner.js.php
 mode change 100644 => 100755 content/planner.overlay.js.php
 mode change 100644 => 100755 content/planner.overlay.xul.php
 mode change 100644 => 100755 content/planner.xul.php
 mode change 100644 => 100755 content/projekt/GanttChart.svg
 mode change 100644 => 100755 content/projekt/bestellung.overlay.js.php
 mode change 100644 => 100755 content/projekt/bestellung.overlay.xul.php
 mode change 100644 => 100755 content/projekt/gantt.css
 mode change 100644 => 100755 content/projekt/gantt.overlay.js.php
 mode change 100644 => 100755 content/projekt/gantt.overlay.xul.php
 mode change 100644 => 100755 content/projekt/gantt.svg.css
 mode change 100644 => 100755 content/projekt/gantt.svg.php
 mode change 100644 => 100755 content/projekt/gantt.svg.xbl
 mode change 100644 => 100755 content/projekt/mantisdetail.overlay.xul.php
 mode change 100644 => 100755 content/projekt/parsedown.php
 mode change 100644 => 100755 content/projekt/projekt.overlay.js.php
 mode change 100644 => 100755 content/projekt/projekt.overlay.xul.php
 mode change 100644 => 100755 content/projekt/projekt_ressource.window.js.php
 mode change 100644 => 100755 content/projekt/projekt_ressource.window.xul.php
 mode change 100644 => 100755 content/projekt/projektdetail.overlay.xul.php
 mode change 100644 => 100755 content/projekt/projektdokument.overlay.js.php
 mode change 100644 => 100755 content/projekt/projektdokument.overlay.xul.php
 mode change 100644 => 100755 content/projekt/projektdokument.window.js.php
 mode change 100644 => 100755 content/projekt/projektdokument.window.xul.php
 mode change 100644 => 100755 content/projekt/projektphase.overlay.js.php
 mode change 100644 => 100755 content/projekt/projektphase.overlay.xul.php
 mode change 100644 => 100755 content/projekt/projektphasedetail.overlay.xul.php
 mode change 100644 => 100755 content/projekt/projekttask.overlay.js.php
 mode change 100644 => 100755 content/projekt/projekttask.overlay.xul.php
 mode change 100644 => 100755 content/projekt/projekttaskdetail.overlay.xul.php
 mode change 100644 => 100755 content/projekt/ressource.js.php
 mode change 100644 => 100755 content/projekt/ressource.overlay.js.php
 mode change 100644 => 100755 content/projekt/ressource.overlay.xul.php
 mode change 100644 => 100755 content/projekt/ressource.window.xul.php
 mode change 100644 => 100755 content/projekt/ressource.xml.php
 mode change 100644 => 100755 content/projekt/ressourcenauslastung.php
 mode change 100644 => 100755 content/projektbeschreibung.php
 mode change 100644 => 100755 content/statistik/StudierendeZGV.php
 mode change 100644 => 100755 content/statistik/abgaengerstatistik.php
 mode change 100644 => 100755 content/statistik/abschlusspruefungexport.xls.php
 mode change 100644 => 100755 content/statistik/absolventen.xls.php
 mode change 100644 => 100755 content/statistik/absolventenstatistik.php
 mode change 100644 => 100755 content/statistik/absolventenzahlen.php
 mode change 100644 => 100755 content/statistik/alvsstatistik.php
 mode change 100644 => 100755 content/statistik/bama_stromanalyse.php
 mode change 100644 => 100755 content/statistik/bama_studentenstrom.svg.php
 mode change 100644 => 100755 content/statistik/bewerberstatistik.php
 mode change 100644 => 100755 content/statistik/bewerberstatistik.svg.php
 mode change 100644 => 100755 content/statistik/dokumente.xls.php
 mode change 100644 => 100755 content/statistik/dropout.php
 mode change 100644 => 100755 content/statistik/dropoutZGV.php
 mode change 100644 => 100755 content/statistik/lehrauftragsliste_gst.xls.php
 mode change 100644 => 100755 content/statistik/lehrauftragsliste_mail.xls.php
 mode change 100644 => 100755 content/statistik/lvplanung.php
 mode change 100644 => 100755 content/statistik/lvplanung.xls.php
 mode change 100644 => 100755 content/statistik/mitarbeiterexport.xls.php
 mode change 100644 => 100755 content/statistik/mitarbeiterstatistik.php
 mode change 100644 => 100755 content/statistik/notenspiegel.php
 mode change 100644 => 100755 content/statistik/notenspiegel_erweitert.php
 mode change 100644 => 100755 content/statistik/oeh_beitraege.xls.php
 mode change 100644 => 100755 content/statistik/projektarbeitexport.xls.php
 mode change 100644 => 100755 content/statistik/studentenexportextended.xls.php
 mode change 100644 => 100755 content/statistik/studentenprosemester.php
 mode change 100644 => 100755 content/statistik/studentenstatistik.php
 mode change 100644 => 100755 content/statistik/studentenstatistik_lehrgaenge.php
 mode change 100644 => 100755 content/statistik/termine.xls.php
 mode change 100644 => 100755 content/statistik/vertragsuebersicht.xls.php
 mode change 100644 => 100755 content/student/aufnahmetermine.js.php
 mode change 100644 => 100755 content/student/aufnahmetermine.xul.php
 mode change 100644 => 100755 content/student/interessentdokumentedialog.js.php
 mode change 100644 => 100755 content/student/interessentdokumentedialog.xul.php
 mode change 100644 => 100755 content/student/interessentdokumenteoverlay.js.php
 mode change 100644 => 100755 content/student/interessentdokumenteoverlay.xul.php
 mode change 100644 => 100755 content/student/interessentoverlay.js.php
 mode change 100644 => 100755 content/student/studentDBDML.php
 mode change 100644 => 100755 content/student/studentabschlusspruefung.js.php
 mode change 100644 => 100755 content/student/studentabschlusspruefungoverlay.xul.php
 mode change 100644 => 100755 content/student/studentanrechnungenoverlay.xul.php
 mode change 100644 => 100755 content/student/studentdetailoverlay.xul.php
 mode change 100644 => 100755 content/student/studentenoverlay.xul.php
 mode change 100644 => 100755 content/student/studentgruppenoverlay.js.php
 mode change 100644 => 100755 content/student/studentgruppenoverlay.xul.php
 mode change 100644 => 100755 content/student/studentiooverlay.xul.php
 mode change 100644 => 100755 content/student/studentkontoneudialog.js.php
 mode change 100644 => 100755 content/student/studentkontoneudialog.xul.php
 mode change 100644 => 100755 content/student/studentkontooverlay.xul.php
 mode change 100644 => 100755 content/student/studentmobilitaetoverlay.js.php
 mode change 100644 => 100755 content/student/studentmobilitaetoverlay.xul.php
 mode change 100644 => 100755 content/student/studentnotenoverlay.xul.php
 mode change 100644 => 100755 content/student/studentoverlay.js.php
 mode change 100644 => 100755 content/student/studentprojektarbeit.js.php
 mode change 100644 => 100755 content/student/studentprojektarbeitoverlay.xul.php
 mode change 100644 => 100755 content/student/studentpruefungoverlay.xul.php
 mode change 100644 => 100755 content/student/studentrolledialog.js.php
 mode change 100644 => 100755 content/student/studentrolledialog.xul.php
 mode change 100644 => 100755 content/student/studentzeugnisoverlay.xul.php
 mode change 100644 => 100755 content/studenten.js
 mode change 100644 => 100755 content/tempus.js.php
 mode change 100644 => 100755 content/tempus.xul.php
 mode change 100644 => 100755 content/tempusDBDML.php
 mode change 100644 => 100755 content/tempusoverlay.js.php
 mode change 100644 => 100755 content/tempusoverlay.xul.php
 mode change 100644 => 100755 content/termine.js.php
 mode change 100644 => 100755 content/termine.xul.php
 mode change 100644 => 100755 content/udf.js.php
 mode change 100644 => 100755 content/udf.xul.php
 mode change 100644 => 100755 content/zutrittskarte.php
 mode change 100644 => 100755 favicon.ico
 mode change 100644 => 100755 include/DifferenceEngine/DifferenceEngine.php
 mode change 100644 => 100755 include/Excel/BIFFwriter.php
 mode change 100644 => 100755 include/Excel/File.php
 mode change 100644 => 100755 include/Excel/Format.php
 mode change 100644 => 100755 include/Excel/OLE.php
 mode change 100644 => 100755 include/Excel/PEAR.php
 mode change 100644 => 100755 include/Excel/PPS.php
 mode change 100644 => 100755 include/Excel/Parser.php
 mode change 100644 => 100755 include/Excel/Root.php
 mode change 100644 => 100755 include/Excel/Validator.php
 mode change 100644 => 100755 include/Excel/Workbook.php
 mode change 100644 => 100755 include/Excel/Worksheet.php
 mode change 100644 => 100755 include/Excel/Writer.php
 mode change 100644 => 100755 include/Excel/excel.php
 mode change 100644 => 100755 include/File/CSV.php
 mode change 100644 => 100755 include/File/Find.php
 mode change 100644 => 100755 include/File/Match.php
 mode change 100644 => 100755 include/File/Passwd.php
 mode change 100644 => 100755 include/File/SearchReplace.php
 mode change 100644 => 100755 include/File/Util.php
 mode change 100644 => 100755 include/Parser/Parsedown.php
 mode change 100644 => 100755 include/ablauf.class.php
 mode change 100644 => 100755 include/abschlusspruefung.class.php
 mode change 100644 => 100755 include/abschlusspruefung_antritt.class.php
 mode change 100644 => 100755 include/addon.class.php
 mode change 100644 => 100755 include/adresse.class.php
 mode change 100644 => 100755 include/adressentyp.class.php
 mode change 100644 => 100755 include/akadgrad.class.php
 mode change 100644 => 100755 include/akte.class.php
 mode change 100644 => 100755 include/ampel.class.php
 mode change 100644 => 100755 include/anrechnung.class.php
 mode change 100644 => 100755 include/antwort.class.php
 mode change 100644 => 100755 include/anwesenheit.class.php
 mode change 100644 => 100755 include/appdaten.class.php
 mode change 100644 => 100755 include/aufmerksamdurch.class.php
 mode change 100644 => 100755 include/auth_demo.class.php
 mode change 100644 => 100755 include/auth_mixed.class.php
 mode change 100644 => 100755 include/auth_session.class.php
 mode change 100644 => 100755 include/authentication.class.php
 mode change 100644 => 100755 include/bankverbindung.class.php
 mode change 100644 => 100755 include/basis.class.php
 mode change 100644 => 100755 include/basis_db.class.php
 mode change 100644 => 100755 include/beispiel.class.php
 mode change 100644 => 100755 include/benutzer.class.php
 mode change 100644 => 100755 include/benutzerberechtigung.class.php
 mode change 100644 => 100755 include/benutzerfunktion.class.php
 mode change 100644 => 100755 include/benutzergruppe.class.php
 mode change 100644 => 100755 include/benutzerlvstudiensemester.class.php
 mode change 100644 => 100755 include/berechtigung.class.php
 mode change 100644 => 100755 include/betriebsmittel.class.php
 mode change 100644 => 100755 include/betriebsmittel_betriebsmittelstatus.class.php
 mode change 100644 => 100755 include/betriebsmittelperson.class.php
 mode change 100644 => 100755 include/betriebsmittelstatus.class.php
 mode change 100644 => 100755 include/betriebsmitteltyp.class.php
 mode change 100644 => 100755 include/bewerbungstermin.class.php
 mode change 100644 => 100755 include/bisarchiv.class.php
 mode change 100644 => 100755 include/bisberufstaetigkeit.class.php
 mode change 100644 => 100755 include/bisfunktion.class.php
 mode change 100644 => 100755 include/bisio.class.php
 mode change 100644 => 100755 include/bisorgform.class.php
 mode change 100644 => 100755 include/bisverwendung.class.php
 mode change 100644 => 100755 include/buchung.class.php
 mode change 100644 => 100755 include/content.class.php
 mode change 100644 => 100755 include/coodle.class.php
 mode change 100644 => 100755 include/covid/covidhelper.class.php
 mode change 100644 => 100755 include/cronjob.class.php
 mode change 100644 => 100755 include/css/images/ui-bg_diagonals-thick_18_b81900_40x40.png
 mode change 100644 => 100755 include/css/images/ui-bg_diagonals-thick_20_666666_40x40.png
 mode change 100644 => 100755 include/css/images/ui-bg_flat_10_000000_40x100.png
 mode change 100644 => 100755 include/css/images/ui-bg_glass_100_f6f6f6_1x400.png
 mode change 100644 => 100755 include/css/images/ui-bg_glass_100_fdf5ce_1x400.png
 mode change 100644 => 100755 include/css/images/ui-bg_glass_65_ffffff_1x400.png
 mode change 100644 => 100755 include/css/images/ui-bg_gloss-wave_35_f6a828_500x100.png
 mode change 100644 => 100755 include/css/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
 mode change 100644 => 100755 include/css/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
 mode change 100644 => 100755 include/css/images/ui-icons_222222_256x240.png
 mode change 100644 => 100755 include/css/images/ui-icons_228ef1_256x240.png
 mode change 100644 => 100755 include/css/images/ui-icons_ef8c08_256x240.png
 mode change 100644 => 100755 include/css/images/ui-icons_ffd27a_256x240.png
 mode change 100644 => 100755 include/css/images/ui-icons_ffffff_256x240.png
 mode change 100644 => 100755 include/datum.class.php
 mode change 100644 => 100755 include/dms.class.php
 mode change 100644 => 100755 include/dokument.class.php
 mode change 100644 => 100755 include/dokument_export.class.php
 mode change 100644 => 100755 include/dvb.class.php
 mode change 100644 => 100755 include/ean13.function.php
 mode change 100644 => 100755 include/entwicklungsteam.class.php
 mode change 100644 => 100755 include/erhalter.class.php
 mode change 100644 => 100755 include/errorhandler.class.php
 mode change 100644 => 100755 include/ezcomponents/Base/CREDITS
 mode change 100644 => 100755 include/ezcomponents/Base/ChangeLog
 mode change 100644 => 100755 include/ezcomponents/Base/DESCRIPTION
 mode change 100644 => 100755 include/ezcomponents/Base/design/class_diagram.png
 mode change 100644 => 100755 include/ezcomponents/Base/design/design.txt
 mode change 100644 => 100755 include/ezcomponents/Base/docs/repos/Me/myclass1.php
 mode change 100644 => 100755 include/ezcomponents/Base/docs/repos/Me/myclass2.php
 mode change 100644 => 100755 include/ezcomponents/Base/docs/repos/You/yourclass1.php
 mode change 100644 => 100755 include/ezcomponents/Base/docs/repos/You/yourclass2.php
 mode change 100644 => 100755 include/ezcomponents/Base/docs/repos/autoloads/my_autoload.php
 mode change 100644 => 100755 include/ezcomponents/Base/docs/repos/autoloads/your_autoload.php
 mode change 100644 => 100755 include/ezcomponents/Base/docs/tutorial.txt
 mode change 100644 => 100755 include/ezcomponents/Base/docs/tutorial_autoload.php
 mode change 100644 => 100755 include/ezcomponents/Base/docs/tutorial_example_01.php
 mode change 100644 => 100755 include/ezcomponents/Base/docs/tutorial_example_02.php
 mode change 100644 => 100755 include/ezcomponents/Base/docs/tutorial_example_03.php
 mode change 100644 => 100755 include/ezcomponents/Base/docs/tutorial_lazy_initialization.php
 mode change 100644 => 100755 include/ezcomponents/Base/review-1.5.txt
 mode change 100644 => 100755 include/ezcomponents/Base/src/base.php
 mode change 100644 => 100755 include/ezcomponents/Base/src/exceptions/autoload.php
 mode change 100644 => 100755 include/ezcomponents/Base/src/exceptions/double_class_repository_prefix.php
 mode change 100644 => 100755 include/ezcomponents/Base/src/exceptions/exception.php
 mode change 100644 => 100755 include/ezcomponents/Base/src/exceptions/extension_not_found.php
 mode change 100644 => 100755 include/ezcomponents/Base/src/exceptions/file_exception.php
 mode change 100644 => 100755 include/ezcomponents/Base/src/exceptions/file_io.php
 mode change 100644 => 100755 include/ezcomponents/Base/src/exceptions/file_not_found.php
 mode change 100644 => 100755 include/ezcomponents/Base/src/exceptions/file_permission.php
 mode change 100644 => 100755 include/ezcomponents/Base/src/exceptions/init_callback_configured.php
 mode change 100644 => 100755 include/ezcomponents/Base/src/exceptions/invalid_callback_class.php
 mode change 100644 => 100755 include/ezcomponents/Base/src/exceptions/invalid_parent_class.php
 mode change 100644 => 100755 include/ezcomponents/Base/src/exceptions/property_not_found.php
 mode change 100644 => 100755 include/ezcomponents/Base/src/exceptions/property_permission.php
 mode change 100644 => 100755 include/ezcomponents/Base/src/exceptions/setting_not_found.php
 mode change 100644 => 100755 include/ezcomponents/Base/src/exceptions/setting_value.php
 mode change 100644 => 100755 include/ezcomponents/Base/src/exceptions/value.php
 mode change 100644 => 100755 include/ezcomponents/Base/src/exceptions/whatever.php
 mode change 100644 => 100755 include/ezcomponents/Base/src/ezc_bootstrap.php
 mode change 100644 => 100755 include/ezcomponents/Base/src/features.php
 mode change 100644 => 100755 include/ezcomponents/Base/src/file.php
 mode change 100644 => 100755 include/ezcomponents/Base/src/init.php
 mode change 100644 => 100755 include/ezcomponents/Base/src/interfaces/configuration_initializer.php
 mode change 100644 => 100755 include/ezcomponents/Base/src/interfaces/persistable.php
 mode change 100644 => 100755 include/ezcomponents/Base/src/options.php
 mode change 100644 => 100755 include/ezcomponents/Base/src/options/autoload.php
 mode change 100644 => 100755 include/ezcomponents/Base/src/struct.php
 mode change 100644 => 100755 include/ezcomponents/Base/src/structs/repository_directory.php
 mode change 100644 => 100755 include/ezcomponents/Base/tests/base_init_test.php
 mode change 100644 => 100755 include/ezcomponents/Base/tests/base_options_test.php
 mode change 100644 => 100755 include/ezcomponents/Base/tests/base_test.php
 mode change 100644 => 100755 include/ezcomponents/Base/tests/extra_repository/Translation/test.php
 mode change 100644 => 100755 include/ezcomponents/Base/tests/extra_repository/autoload/translation_autoload.php
 mode change 100644 => 100755 include/ezcomponents/Base/tests/features_test.php
 mode change 100644 => 100755 include/ezcomponents/Base/tests/file_calculate_relative_path_test.php
 mode change 100644 => 100755 include/ezcomponents/Base/tests/file_copy_recursive_test.php
 mode change 100644 => 100755 include/ezcomponents/Base/tests/file_find_recursive_test.php
 mode change 100644 => 100755 include/ezcomponents/Base/tests/file_is_absolute_path.php
 mode change 100644 => 100755 include/ezcomponents/Base/tests/file_remove_recursive_test.php
 mode change 100644 => 100755 include/ezcomponents/Base/tests/init/base_init_callback.php
 mode change 100644 => 100755 include/ezcomponents/Base/tests/init/base_init_class.php
 mode change 100644 => 100755 include/ezcomponents/Base/tests/struct_test.php
 mode change 100644 => 100755 include/ezcomponents/Base/tests/suite.php
 mode change 100644 => 100755 include/ezcomponents/Base/tests/test_options.php
 mode change 100644 => 100755 include/ezcomponents/Base/tests/test_repository/TestClasses/base_test_class.php
 mode change 100644 => 100755 include/ezcomponents/Base/tests/test_repository/TestClasses/base_test_class_number_two.php
 mode change 100644 => 100755 include/ezcomponents/Base/tests/test_repository/TestClasses/base_test_long_class.php
 mode change 100644 => 100755 include/ezcomponents/Base/tests/test_repository/autoload_files/basetest_autoload.php
 mode change 100644 => 100755 include/ezcomponents/Base/tests/test_repository/autoload_files/basetest_long_autoload.php
 mode change 100644 => 100755 include/ezcomponents/Base/tests/test_repository/autoload_files/object_autoload.php
 mode change 100644 => 100755 include/ezcomponents/Base/tests/test_repository/object/object.php
 mode change 100644 => 100755 include/ezcomponents/ChangeLog
 mode change 100644 => 100755 include/ezcomponents/Graph/CREDITS
 mode change 100644 => 100755 include/ezcomponents/Graph/ChangeLog
 mode change 100644 => 100755 include/ezcomponents/Graph/DESCRIPTION
 mode change 100644 => 100755 include/ezcomponents/Graph/design/class_diagram.png
 mode change 100644 => 100755 include/ezcomponents/Graph/design/design.txt
 mode change 100644 => 100755 include/ezcomponents/Graph/design/enhancements/interactive_data_points.txt
 mode change 100644 => 100755 include/ezcomponents/Graph/design/enhancements/multiple_axis.txt
 mode change 100644 => 100755 include/ezcomponents/Graph/design/requirements.txt
 mode change 100644 => 100755 include/ezcomponents/Graph/design/requirements/interactive_data_points.txt
 mode change 100644 => 100755 include/ezcomponents/Graph/design/requirements/multiple_axis.txt
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/examples/ez_green.php
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/examples/ez_red.php
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/examples/forum_evolution.php
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/examples/forum_month.php
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/examples/forum_weekly.php
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/examples/forum_year.php
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/examples/php_magazine.php
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/examples/wikipedia.php
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/img/tutorial_axis_datetime.svg.png
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/img/tutorial_axis_labeled.svg.png
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/img/tutorial_axis_numeric.svg.png
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/img/tutorial_bar_chart.svg.png
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/img/tutorial_bar_chart_3d.svg.png
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/img/tutorial_bar_chart_options.svg.png
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/img/tutorial_bar_line_chart.svg.png
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/img/tutorial_bar_options.svg.png
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/img/tutorial_chart_background.svg.png
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/img/tutorial_chart_legend.svg.png
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/img/tutorial_chart_title.svg.png
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/img/tutorial_complex_radar_chart.svg.png
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/img/tutorial_custom_odometer_chart.svg.png
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/img/tutorial_custom_palette.svg.png
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/img/tutorial_dataset_average.svg.png
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/img/tutorial_dataset_numeric.svg.png
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/img/tutorial_driver_flash.swf
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/img/tutorial_driver_gd.jpg
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/img/tutorial_driver_svg.svg.png
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/img/tutorial_legend_options.svg.png
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/img/tutorial_line_chart.svg.png
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/img/tutorial_line_chart_3d.svg.png
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/img/tutorial_line_chart_additional_axis.svg.png
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/img/tutorial_line_chart_markers.svg.png
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/img/tutorial_modified_palette.svg.png
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/img/tutorial_odometer_chart.svg.png
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/img/tutorial_pie_chart_3d.svg.png
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/img/tutorial_pie_chart_options.svg.png
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/img/tutorial_pie_chart_pimped.svg.png
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/img/tutorial_pie_options.svg.png
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/img/tutorial_radar_chart.svg.png
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/img/tutorial_reference_gd.html
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/img/tutorial_reference_gd.png
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/img/tutorial_reference_svg.svg
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/img/tutorial_renderer_3d.svg.png
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/img/tutorial_rotated_labels.svg.png
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/img/tutorial_simple_pie.svg.png
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/img/tutorial_stacked_bar_chart.svg.png
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/img/tutorial_user_palette.svg.png
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/tutorial.txt
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/tutorial/ez.png
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/tutorial/template.svg
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/tutorial/tutorial_autoload.php
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/tutorial/tutorial_axis_datetime.php
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/tutorial/tutorial_axis_labeled.php
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/tutorial/tutorial_axis_numeric.php
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/tutorial/tutorial_bar_chart.php
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/tutorial/tutorial_bar_chart_3d.php
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/tutorial/tutorial_bar_chart_options.php
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/tutorial/tutorial_bar_line_chart.php
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/tutorial/tutorial_bar_options.php
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/tutorial/tutorial_chart_background.php
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/tutorial/tutorial_chart_legend.php
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/tutorial/tutorial_chart_title.php
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/tutorial/tutorial_complex_radar_chart.php
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/tutorial/tutorial_custom_odometer_chart.php
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/tutorial/tutorial_custom_palette.php
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/tutorial/tutorial_custom_palette_palette.php
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/tutorial/tutorial_dataset_average.php
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/tutorial/tutorial_dataset_numeric.php
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/tutorial/tutorial_driver_cairo.php
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/tutorial/tutorial_driver_flash.php
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/tutorial/tutorial_driver_gd.php
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/tutorial/tutorial_driver_svg.php
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/tutorial/tutorial_font.fdb
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/tutorial/tutorial_font.pfb
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/tutorial/tutorial_font.ttf
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/tutorial/tutorial_legend_options.php
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/tutorial/tutorial_line_chart.php
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/tutorial/tutorial_line_chart_3d.php
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/tutorial/tutorial_line_chart_additional_axis.php
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/tutorial/tutorial_line_chart_markers.php
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/tutorial/tutorial_modified_palette.php
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/tutorial/tutorial_odometer_chart.php
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/tutorial/tutorial_output.php
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/tutorial/tutorial_pie_chart_3d.php
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/tutorial/tutorial_pie_chart_options.php
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/tutorial/tutorial_pie_chart_pimped.php
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/tutorial/tutorial_pie_options.php
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/tutorial/tutorial_radar_chart.php
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/tutorial/tutorial_reference_gd.php
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/tutorial/tutorial_reference_svg.php
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/tutorial/tutorial_renderer_3d.php
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/tutorial/tutorial_rotated_labels.php
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/tutorial/tutorial_simple_pie.php
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/tutorial/tutorial_stacked_bar_chart.php
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/tutorial/tutorial_user_palette.php
 mode change 100644 => 100755 include/ezcomponents/Graph/docs/tutorial/tutorial_wikipedia_data.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/axis/container.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/axis/date.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/axis/labeled.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/axis/logarithmic.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/axis/numeric.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/charts/bar.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/charts/line.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/charts/odometer.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/charts/pie.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/charts/radar.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/colors/color.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/colors/linear_gradient.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/colors/radial_gradient.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/data_container/base.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/data_container/single.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/datasets/array.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/datasets/average.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/datasets/base.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/datasets/numeric.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/datasets/property/axis.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/datasets/property/boolean.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/datasets/property/color.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/datasets/property/integer.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/datasets/property/string.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/driver/cairo.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/driver/flash.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/driver/gd.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/driver/svg.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/driver/svg_font.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/driver/verbose.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/element/axis.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/element/background.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/element/legend.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/element/text.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/exceptions/date_parsing.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/exceptions/exception.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/exceptions/flash_bitmap_type.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/exceptions/font_rendering.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/exceptions/font_type.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/exceptions/incompatible_driver.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/exceptions/invalid_assignement.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/exceptions/invalid_data.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/exceptions/invalid_data_source.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/exceptions/invalid_dimensions.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/exceptions/invalid_display_type.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/exceptions/invalid_id.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/exceptions/invalid_image_file.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/exceptions/invalid_keys.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/exceptions/no_data.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/exceptions/no_such_data.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/exceptions/no_such_dataset.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/exceptions/no_such_element.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/exceptions/not_rendered.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/exceptions/out_of_boundings.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/exceptions/out_of_logarithmical_boundings.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/exceptions/reducement_failed.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/exceptions/too_many_datasets.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/exceptions/unknown_color_definition.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/exceptions/unregular_steps.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/exceptions/unsupported_image_type.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/graph.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/interfaces/axis_label_renderer.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/interfaces/chart.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/interfaces/dataset_property.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/interfaces/driver.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/interfaces/element.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/interfaces/odometer_renderer.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/interfaces/palette.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/interfaces/radar_renderer.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/interfaces/renderer.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/interfaces/stacked_bar_renderer.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/math/boundings.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/math/matrix.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/math/polynom.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/math/rotation.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/math/transformation.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/math/translation.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/math/vector.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/options/cairo_driver.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/options/chart.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/options/driver.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/options/flash_driver.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/options/font.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/options/gd_driver.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/options/line_chart.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/options/odometer_chart.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/options/pie_chart.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/options/radar_chart.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/options/renderer.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/options/renderer_2d.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/options/renderer_3d.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/options/svg_driver.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/palette/black.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/palette/ez.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/palette/ez_blue.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/palette/ez_green.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/palette/ez_red.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/palette/tango.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/renderer/2d.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/renderer/3d.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/renderer/axis_label_boxed.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/renderer/axis_label_centered.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/renderer/axis_label_exact.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/renderer/axis_label_none.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/renderer/axis_label_radar.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/renderer/axis_label_rotated.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/structs/context.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/structs/coordinate.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/structs/step.php
 mode change 100644 => 100755 include/ezcomponents/Graph/src/tools.php
 mode change 100644 => 100755 include/ezcomponents/GraphDatabaseTiein/CREDITS
 mode change 100644 => 100755 include/ezcomponents/GraphDatabaseTiein/ChangeLog
 mode change 100644 => 100755 include/ezcomponents/GraphDatabaseTiein/DEPS
 mode change 100644 => 100755 include/ezcomponents/GraphDatabaseTiein/DESCRIPTION
 mode change 100644 => 100755 include/ezcomponents/GraphDatabaseTiein/TODO
 mode change 100644 => 100755 include/ezcomponents/GraphDatabaseTiein/design/class_diagram.png
 mode change 100644 => 100755 include/ezcomponents/GraphDatabaseTiein/design/design.txt
 mode change 100644 => 100755 include/ezcomponents/GraphDatabaseTiein/docs/img/tutorial_multiple.svg.png
 mode change 100644 => 100755 include/ezcomponents/GraphDatabaseTiein/docs/img/tutorial_simple.svg.png
 mode change 100644 => 100755 include/ezcomponents/GraphDatabaseTiein/docs/img/tutorial_single.svg.png
 mode change 100644 => 100755 include/ezcomponents/GraphDatabaseTiein/docs/tutorial.txt
 mode change 100644 => 100755 include/ezcomponents/GraphDatabaseTiein/docs/tutorial/tutorial_autoload.php
 mode change 100644 => 100755 include/ezcomponents/GraphDatabaseTiein/docs/tutorial/tutorial_insert_data.php
 mode change 100644 => 100755 include/ezcomponents/GraphDatabaseTiein/docs/tutorial/tutorial_multiple.php
 mode change 100644 => 100755 include/ezcomponents/GraphDatabaseTiein/docs/tutorial/tutorial_simple.php
 mode change 100644 => 100755 include/ezcomponents/GraphDatabaseTiein/docs/tutorial/tutorial_single.php
 mode change 100644 => 100755 include/ezcomponents/GraphDatabaseTiein/src/dataset.php
 mode change 100644 => 100755 include/ezcomponents/GraphDatabaseTiein/src/exceptions/exception.php
 mode change 100644 => 100755 include/ezcomponents/GraphDatabaseTiein/src/exceptions/missing_column.php
 mode change 100644 => 100755 include/ezcomponents/GraphDatabaseTiein/src/exceptions/statement_not_executed.php
 mode change 100644 => 100755 include/ezcomponents/GraphDatabaseTiein/src/exceptions/too_many_columns.php
 mode change 100644 => 100755 include/ezcomponents/GraphDatabaseTiein/tests/dataset_pdo_test.php
 mode change 100644 => 100755 include/ezcomponents/GraphDatabaseTiein/tests/suite.php
 mode change 100644 => 100755 include/ezcomponents/ImageAnalysis/CREDITS
 mode change 100644 => 100755 include/ezcomponents/ImageAnalysis/ChangeLog
 mode change 100644 => 100755 include/ezcomponents/ImageAnalysis/DESCRIPTION
 mode change 100644 => 100755 include/ezcomponents/ImageAnalysis/design/class_diagram.png
 mode change 100644 => 100755 include/ezcomponents/ImageAnalysis/design/imageanalysis.png
 mode change 100644 => 100755 include/ezcomponents/ImageAnalysis/design/imageanalysis.xml
 mode change 100644 => 100755 include/ezcomponents/ImageAnalysis/docs/example.php
 mode change 100644 => 100755 include/ezcomponents/ImageAnalysis/docs/img/imageanalysis_example_01.jpg
 mode change 100644 => 100755 include/ezcomponents/ImageAnalysis/docs/img/imageanalysis_example_02.jpg
 mode change 100644 => 100755 include/ezcomponents/ImageAnalysis/docs/img/imageanalysis_example_03.jpg
 mode change 100644 => 100755 include/ezcomponents/ImageAnalysis/docs/toby.jpg
 mode change 100644 => 100755 include/ezcomponents/ImageAnalysis/docs/tutorial.txt
 mode change 100644 => 100755 include/ezcomponents/ImageAnalysis/docs/tutorial_autoload.php
 mode change 100644 => 100755 include/ezcomponents/ImageAnalysis/docs/tutorial_example_01.php
 mode change 100644 => 100755 include/ezcomponents/ImageAnalysis/docs/tutorial_example_02.php
 mode change 100644 => 100755 include/ezcomponents/ImageAnalysis/docs/tutorial_example_03.php
 mode change 100644 => 100755 include/ezcomponents/ImageAnalysis/src/analyzer.php
 mode change 100644 => 100755 include/ezcomponents/ImageAnalysis/src/exceptions/exception.php
 mode change 100644 => 100755 include/ezcomponents/ImageAnalysis/src/exceptions/file_not_processable.php
 mode change 100644 => 100755 include/ezcomponents/ImageAnalysis/src/exceptions/invalid_handler.php
 mode change 100644 => 100755 include/ezcomponents/ImageAnalysis/src/handlers/imagemagick.php
 mode change 100644 => 100755 include/ezcomponents/ImageAnalysis/src/handlers/php.php
 mode change 100644 => 100755 include/ezcomponents/ImageAnalysis/src/interfaces/handler.php
 mode change 100644 => 100755 include/ezcomponents/ImageAnalysis/src/structs/analyzer_data.php
 mode change 100644 => 100755 include/ezcomponents/ImageAnalysis/tests/analyzer_test.php
 mode change 100644 => 100755 include/ezcomponents/ImageAnalysis/tests/data/gif_animated.gif
 mode change 100644 => 100755 include/ezcomponents/ImageAnalysis/tests/data/gif_nonanimated.gif
 mode change 100644 => 100755 include/ezcomponents/ImageAnalysis/tests/data/jpeg_exif.jpg
 mode change 100644 => 100755 include/ezcomponents/ImageAnalysis/tests/data/jpeg_noexif.jpg
 mode change 100644 => 100755 include/ezcomponents/ImageAnalysis/tests/data/png_nonanimated.png
 mode change 100644 => 100755 include/ezcomponents/ImageAnalysis/tests/data/svg.svg
 mode change 100644 => 100755 include/ezcomponents/ImageAnalysis/tests/data/tiff_exif.tiff
 mode change 100644 => 100755 include/ezcomponents/ImageAnalysis/tests/data/tiff_noexif.tiff
 mode change 100644 => 100755 include/ezcomponents/ImageAnalysis/tests/suite.php
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/CREDITS
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/ChangeLog
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/DEPS
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/DESCRIPTION
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/TODO
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/design/class_diagram.png
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/design/design.htm
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/design/design.txt
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/design/image.png
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/design/image.xml
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/design/image_exceptions.png
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/design/image_filters.png
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/docs/example_general.php
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/docs/example_singleton.php
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/docs/img/imageconversion_example_01_after.jpg
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/docs/img/imageconversion_example_01_before.bmp
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/docs/img/imageconversion_example_02_after.jpg
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/docs/img/imageconversion_example_02_before.jpg
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/docs/img/imageconversion_example_03_after.jpg
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/docs/img/imageconversion_example_03_before.jpg
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/docs/img/imageconversion_example_04_after.jpg
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/docs/img/imageconversion_example_04_before.jpg
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/docs/img/imageconversion_example_05_after.jpg
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/docs/img/imageconversion_example_05_before.jpg
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/docs/img/watermark.png
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/docs/jpeg.jpg
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/docs/tutorial.txt
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/docs/tutorial_autoload.php
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/docs/tutorial_example_01_simpleconvert.php
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/docs/tutorial_example_02_simpletrans.php
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/docs/tutorial_example_03_complextrans.php
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/docs/tutorial_example_04_watermark.php
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/docs/tutorial_example_05_thumbnail.php
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/review-1.3.4.txt
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/src/converter.php
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/src/exceptions/exception.php
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/src/exceptions/file_name_invalid.php
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/src/exceptions/file_not_processable.php
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/src/exceptions/filter_failed.php
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/src/exceptions/filter_not_available.php
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/src/exceptions/handler_not_available.php
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/src/exceptions/handler_settings_invalid.php
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/src/exceptions/invalid_filter_parameter.php
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/src/exceptions/invalid_reference.php
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/src/exceptions/mime_type_unsupported.php
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/src/exceptions/missing_filter_parameter.php
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/src/exceptions/transformation.php
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/src/exceptions/transformation_already_exists.php
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/src/exceptions/transformation_not_available.php
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/src/handlers/gd.php
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/src/handlers/gd_base.php
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/src/handlers/imagemagick.php
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/src/handlers/imagemagick_base.php
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/src/interfaces/colorspace.php
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/src/interfaces/effect.php
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/src/interfaces/geometry.php
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/src/interfaces/handler.php
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/src/interfaces/methodcall_handler.php
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/src/interfaces/thumbnail.php
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/src/interfaces/watermark.php
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/src/options/save_options.php
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/src/structs/converter_settings.php
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/src/structs/filter.php
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/src/structs/handler_settings.php
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/src/transformation.php
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/converter_test.php
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionConverterTest_testApplyFilterSuccessColorspace
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionConverterTest_testApplyFilterSuccessColorspaceDefinedHandler
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionConverterTest_testApplyFilterSuccessScale
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testColorspaceGrey
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testColorspaceMonochrome
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testColorspaceSepia
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCropNegativeOffset_1
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCropNegativeOffset_2
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCropNegativeOffset_3
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCropThumbnailHorizontal
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCropThumbnailVertical
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCropTransparent
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCrop_0_Offset
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCrop_1
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCrop_2
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCrop_3
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCrop_4
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testFillThumbnailHorizontal
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testFillThumbnailTooLargeColorArray
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testFillThumbnailVertical
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testScaleTransparent
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testWatermarkAbsoluteNoScale
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testWatermarkAbsoluteScale
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testWatermarkPercentNoScale
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testWatermarkPercentScale
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testBorder_2
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testBorder_5
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testColorspaceGrey
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testColorspaceMonochrome
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testColorspaceSepia
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCropNegativeOffset_1
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCropNegativeOffset_2
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCropNegativeOffset_3
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCropThumbnailHorizontal
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCropThumbnailVertical
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCrop_0_Offset
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCrop_1
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCrop_2
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCrop_3
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testFillThumbnailHorizontal
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testFillThumbnailTooLargeColorArray
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testFillThumbnailVertical
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testNoiseGaussian
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testNoiseImpulse
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testNoiseLaplacian
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testNoiseMultiplicative
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testNoisePoisson
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testNoiseUniform
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScale
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleDown_do
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleDown_dont
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleExact_1
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleExact_2
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleExact_3
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleHeightDown_1
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleHeightDown_2
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleHeightUp_1
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleHeightUp_2
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScalePercent_1
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScalePercent_2
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleUp_do
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleUp_dont
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleWidthBoth
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleWidthDown_1
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleWidthDown_2
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleWidthUp_1
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleWidthUp_2
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testSwirl_10
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testSwirl_100
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testSwirl_50
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testWatermarkAbsoluteNoScale
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testWatermarkAbsoluteScale
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testWatermarkPercentNoScale
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testWatermarkPercentScale
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerGdTest_testApplyFilterMultiple
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerGdTest_testApplyFilterSingle
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerGdTest_testConvertTransparentNonTransparent
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerGdTest_testSaveNewfileConvert
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerGdTest_testSaveNewfileNoconvert
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerGdTest_testSaveOldfileNoconvert
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerShellTest_testApplyFilterMultiple
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerShellTest_testApplyFilterSingle
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerShellTest_testConvertTransparentNonTransparent
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerTest_testSaveIllegalFileNameFailure
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerTest_testSaveNewfileConvert
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerTest_testSaveNewfileNoconvert
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerTest_testSaveOldfileNoconvert
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testMultiTransformjpeg
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testMultiTransformpng
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessGifAnimated
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessGif_1
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessGif_2
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessGif_3
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessJpeg_1
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessJpeg_2
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessJpeg_3
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessPng_1
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessPng_2
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessPng_3
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessPng_4
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformationChangingHandlersForFilters
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/gif_animated.gif
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/gif_nonanimated.gif
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/jpeg.jpg
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/png.png
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/png_transparent.png
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/text.txt
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/watermark.png
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/data/xpm.xpm
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/filtersgd_test.php
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/filtersshell_test.php
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/handler_test.php
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/handlergd_test.php
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/handlershell_test.php
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/save_options_test.php
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/suite.php
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/test_case.php
 mode change 100644 => 100755 include/ezcomponents/ImageConversion/tests/transformation_test.php
 mode change 100644 => 100755 include/ezcomponents/LICENSE
 mode change 100644 => 100755 include/ezcomponents/autoload/archive_autoload.php
 mode change 100644 => 100755 include/ezcomponents/autoload/authentication_autoload.php
 mode change 100644 => 100755 include/ezcomponents/autoload/authentication_database_autoload.php
 mode change 100644 => 100755 include/ezcomponents/autoload/authentication_openid_autoload.php
 mode change 100644 => 100755 include/ezcomponents/autoload/base_autoload.php
 mode change 100644 => 100755 include/ezcomponents/autoload/cache_autoload.php
 mode change 100644 => 100755 include/ezcomponents/autoload/configuration_autoload.php
 mode change 100644 => 100755 include/ezcomponents/autoload/console_autoload.php
 mode change 100644 => 100755 include/ezcomponents/autoload/db_autoload.php
 mode change 100644 => 100755 include/ezcomponents/autoload/db_schema_autoload.php
 mode change 100644 => 100755 include/ezcomponents/autoload/debug_autoload.php
 mode change 100644 => 100755 include/ezcomponents/autoload/document_autoload.php
 mode change 100644 => 100755 include/ezcomponents/autoload/execution_autoload.php
 mode change 100644 => 100755 include/ezcomponents/autoload/feed_autoload.php
 mode change 100644 => 100755 include/ezcomponents/autoload/file_autoload.php
 mode change 100644 => 100755 include/ezcomponents/autoload/graph_autoload.php
 mode change 100644 => 100755 include/ezcomponents/autoload/graph_database_autoload.php
 mode change 100644 => 100755 include/ezcomponents/autoload/image_analyzer_autoload.php
 mode change 100644 => 100755 include/ezcomponents/autoload/image_autoload.php
 mode change 100644 => 100755 include/ezcomponents/autoload/input_autoload.php
 mode change 100644 => 100755 include/ezcomponents/autoload/log_autoload.php
 mode change 100644 => 100755 include/ezcomponents/autoload/log_database_autoload.php
 mode change 100644 => 100755 include/ezcomponents/autoload/mail_autoload.php
 mode change 100644 => 100755 include/ezcomponents/autoload/persistent_autoload.php
 mode change 100644 => 100755 include/ezcomponents/autoload/persistent_object_autoload.php
 mode change 100644 => 100755 include/ezcomponents/autoload/php_generator_autoload.php
 mode change 100644 => 100755 include/ezcomponents/autoload/query_autoload.php
 mode change 100644 => 100755 include/ezcomponents/autoload/search_autoload.php
 mode change 100644 => 100755 include/ezcomponents/autoload/signal_autoload.php
 mode change 100644 => 100755 include/ezcomponents/autoload/system_autoload.php
 mode change 100644 => 100755 include/ezcomponents/autoload/template_autoload.php
 mode change 100644 => 100755 include/ezcomponents/autoload/template_translation_autoload.php
 mode change 100644 => 100755 include/ezcomponents/autoload/translation_autoload.php
 mode change 100644 => 100755 include/ezcomponents/autoload/translation_cache_autoload.php
 mode change 100644 => 100755 include/ezcomponents/autoload/tree_autoload.php
 mode change 100644 => 100755 include/ezcomponents/autoload/tree_db_autoload.php
 mode change 100644 => 100755 include/ezcomponents/autoload/tree_persistent_autoload.php
 mode change 100644 => 100755 include/ezcomponents/autoload/url_autoload.php
 mode change 100644 => 100755 include/ezcomponents/autoload/webdav_autoload.php
 mode change 100644 => 100755 include/ezcomponents/autoload/workflow_autoload.php
 mode change 100644 => 100755 include/ezcomponents/autoload/workflow_database_autoload.php
 mode change 100644 => 100755 include/ezcomponents/autoload/workflow_event_autoload.php
 mode change 100644 => 100755 include/ezcomponents/autoload/workflow_signal_autoload.php
 mode change 100644 => 100755 include/ezcomponents/descriptions.txt
 mode change 100644 => 100755 include/fachbereich.class.php
 mode change 100644 => 100755 include/feedback.class.php
 mode change 100644 => 100755 include/ferien.class.php
 mode change 100644 => 100755 include/filter.class.php
 mode change 100644 => 100755 include/firma.class.php
 mode change 100644 => 100755 include/fonts/glyphicons-halflings-regular.eot
 mode change 100644 => 100755 include/fonts/glyphicons-halflings-regular.svg
 mode change 100644 => 100755 include/fonts/glyphicons-halflings-regular.ttf
 mode change 100644 => 100755 include/fonts/glyphicons-halflings-regular.woff
 mode change 100644 => 100755 include/fotostatus.class.php
 mode change 100644 => 100755 include/frage.class.php
 mode change 100644 => 100755 include/freebusy.class.php
 mode change 100644 => 100755 include/functions.inc.php
 mode change 100644 => 100755 include/funktion.class.php
 mode change 100644 => 100755 include/gantt.class.php
 mode change 100644 => 100755 include/gebiet.class.php
 mode change 100644 => 100755 include/gemeinde.class.php
 mode change 100644 => 100755 include/geschaeftsjahr.class.php
 mode change 100644 => 100755 include/geschlecht.class.php
 mode change 100644 => 100755 include/globals.inc.php
 mode change 100644 => 100755 include/gruppe.class.php
 mode change 100644 => 100755 include/gruppemanager.class.php
 mode change 100644 => 100755 include/gsprogramm.class.php
 mode change 100644 => 100755 include/ical.class.php
 mode change 100644 => 100755 include/index.html
 mode change 100644 => 100755 include/infoscreen.class.php
 mode change 100644 => 100755 include/jahresplan.class.php
 mode change 100644 => 100755 include/js/JSONeditor/JSONeditor.html
 mode change 100644 => 100755 include/js/JSONeditor/JSONeditor.js
 mode change 100644 => 100755 include/js/JSONeditor/treeBuilderImages/Thumbs.db
 mode change 100644 => 100755 include/js/JSONeditor/treeBuilderImages/doc.gif
 mode change 100644 => 100755 include/js/JSONeditor/treeBuilderImages/docNode.gif
 mode change 100644 => 100755 include/js/JSONeditor/treeBuilderImages/docNodeLast.gif
 mode change 100644 => 100755 include/js/JSONeditor/treeBuilderImages/docNodeLastFirst.gif
 mode change 100644 => 100755 include/js/JSONeditor/treeBuilderImages/folder.gif
 mode change 100644 => 100755 include/js/JSONeditor/treeBuilderImages/folderNode.gif
 mode change 100644 => 100755 include/js/JSONeditor/treeBuilderImages/folderNodeFirst.gif
 mode change 100644 => 100755 include/js/JSONeditor/treeBuilderImages/folderNodeLast.gif
 mode change 100644 => 100755 include/js/JSONeditor/treeBuilderImages/folderNodeLastFirst.gif
 mode change 100644 => 100755 include/js/JSONeditor/treeBuilderImages/folderNodeOpen.gif
 mode change 100644 => 100755 include/js/JSONeditor/treeBuilderImages/folderNodeOpenFirst.gif
 mode change 100644 => 100755 include/js/JSONeditor/treeBuilderImages/folderNodeOpenLast.gif
 mode change 100644 => 100755 include/js/JSONeditor/treeBuilderImages/folderNodeOpenLastFirst.gif
 mode change 100644 => 100755 include/js/JSONeditor/treeBuilderImages/folderOpen.gif
 mode change 100644 => 100755 include/js/JSONeditor/treeBuilderImages/vertLine.gif
 mode change 100644 => 100755 include/js/colorpicker.js
 mode change 100644 => 100755 include/js/cropper.js
 mode change 100644 => 100755 include/js/croppie.js
 mode change 100644 => 100755 include/js/datecheck.js
 mode change 100644 => 100755 include/js/fullcalendar/fullcalendar.css
 mode change 100644 => 100755 include/js/fullcalendar/fullcalendar.js
 mode change 100644 => 100755 include/js/fullcalendar/fullcalendar.min.js
 mode change 100644 => 100755 include/js/fullcalendar/fullcalendar.print.css
 mode change 100644 => 100755 include/js/fullcalendar/gcal.js
 mode change 100644 => 100755 include/js/jqSOAPClient.js
 mode change 100644 => 100755 include/js/jqXMLUtils.js
 mode change 100644 => 100755 include/js/jquery.contextmenu.r2.js
 mode change 100644 => 100755 include/js/jquery.js
 mode change 100644 => 100755 include/js/jquery.ui.datepicker.translation.js
 mode change 100644 => 100755 include/js/jstree/README.txt
 mode change 100644 => 100755 include/js/jstree/_docs/!style.css
 mode change 100644 => 100755 include/js/jstree/_docs/_drive.png
 mode change 100644 => 100755 include/js/jstree/_docs/_html_data.html
 mode change 100644 => 100755 include/js/jstree/_docs/_json_data.json
 mode change 100644 => 100755 include/js/jstree/_docs/_search_data.json
 mode change 100644 => 100755 include/js/jstree/_docs/_search_result.json
 mode change 100644 => 100755 include/js/jstree/_docs/_xml_flat.xml
 mode change 100644 => 100755 include/js/jstree/_docs/_xml_nest.xml
 mode change 100644 => 100755 include/js/jstree/_docs/checkbox.html
 mode change 100644 => 100755 include/js/jstree/_docs/contextmenu.html
 mode change 100644 => 100755 include/js/jstree/_docs/cookies.html
 mode change 100644 => 100755 include/js/jstree/_docs/core.html
 mode change 100644 => 100755 include/js/jstree/_docs/crrm.html
 mode change 100644 => 100755 include/js/jstree/_docs/dnd.html
 mode change 100644 => 100755 include/js/jstree/_docs/hotkeys.html
 mode change 100644 => 100755 include/js/jstree/_docs/html_data.html
 mode change 100644 => 100755 include/js/jstree/_docs/index.html
 mode change 100644 => 100755 include/js/jstree/_docs/json_data.html
 mode change 100644 => 100755 include/js/jstree/_docs/languages.html
 mode change 100644 => 100755 include/js/jstree/_docs/logo.png
 mode change 100644 => 100755 include/js/jstree/_docs/search.html
 mode change 100644 => 100755 include/js/jstree/_docs/sort.html
 mode change 100644 => 100755 include/js/jstree/_docs/syntax/!script.js
 mode change 100644 => 100755 include/js/jstree/_docs/syntax/!style.css
 mode change 100644 => 100755 include/js/jstree/_docs/syntax/clipboard.swf
 mode change 100644 => 100755 include/js/jstree/_docs/syntax/help.png
 mode change 100644 => 100755 include/js/jstree/_docs/syntax/magnifier.png
 mode change 100644 => 100755 include/js/jstree/_docs/syntax/page_white_code.png
 mode change 100644 => 100755 include/js/jstree/_docs/syntax/page_white_copy.png
 mode change 100644 => 100755 include/js/jstree/_docs/syntax/printer.png
 mode change 100644 => 100755 include/js/jstree/_docs/syntax/wrapping.png
 mode change 100644 => 100755 include/js/jstree/_docs/themeroller.html
 mode change 100644 => 100755 include/js/jstree/_docs/themes.html
 mode change 100644 => 100755 include/js/jstree/_docs/types.html
 mode change 100644 => 100755 include/js/jstree/_docs/ui.html
 mode change 100644 => 100755 include/js/jstree/_docs/unique.html
 mode change 100644 => 100755 include/js/jstree/_docs/xml_data.html
 mode change 100644 => 100755 include/js/jstree/_lib/jquery.cookie.js
 mode change 100644 => 100755 include/js/jstree/_lib/jquery.hotkeys.js
 mode change 100644 => 100755 include/js/jstree/_lib/jquery.js
 mode change 100644 => 100755 include/js/jstree/icons/lehrveranstaltung.png
 mode change 100644 => 100755 include/js/jstree/icons/modul.png
 mode change 100644 => 100755 include/js/jstree/jquery.jstree.js
 mode change 100644 => 100755 include/js/jstree/themes/apple/bg.jpg
 mode change 100644 => 100755 include/js/jstree/themes/apple/d.png
 mode change 100644 => 100755 include/js/jstree/themes/apple/dot_for_ie.gif
 mode change 100644 => 100755 include/js/jstree/themes/apple/style.css
 mode change 100644 => 100755 include/js/jstree/themes/apple/throbber.gif
 mode change 100644 => 100755 include/js/jstree/themes/classic/d.gif
 mode change 100644 => 100755 include/js/jstree/themes/classic/d.png
 mode change 100644 => 100755 include/js/jstree/themes/classic/dot_for_ie.gif
 mode change 100644 => 100755 include/js/jstree/themes/classic/style.css
 mode change 100644 => 100755 include/js/jstree/themes/classic/throbber.gif
 mode change 100644 => 100755 include/js/jstree/themes/default-rtl/d.gif
 mode change 100644 => 100755 include/js/jstree/themes/default-rtl/d.png
 mode change 100644 => 100755 include/js/jstree/themes/default-rtl/dots.gif
 mode change 100644 => 100755 include/js/jstree/themes/default-rtl/style.css
 mode change 100644 => 100755 include/js/jstree/themes/default-rtl/throbber.gif
 mode change 100644 => 100755 include/js/jstree/themes/default/d.gif
 mode change 100644 => 100755 include/js/jstree/themes/default/d.png
 mode change 100644 => 100755 include/js/jstree/themes/default/style.css
 mode change 100644 => 100755 include/js/jstree/themes/default/throbber.gif
 mode change 100644 => 100755 include/js/mailcheck.js
 mode change 100644 => 100755 include/js/tablesort/icons/01_ascending.gif
 mode change 100644 => 100755 include/js/tablesort/icons/01_descending.gif
 mode change 100644 => 100755 include/js/tablesort/icons/01_unsorted.gif
 mode change 100644 => 100755 include/js/tablesort/table.css
 mode change 100644 => 100755 include/js/tablesort/table.js
 mode change 100644 => 100755 include/js/treeGrid/.gitignore
 mode change 100644 => 100755 include/js/treeGrid/CHANGELOG.txt
 mode change 100644 => 100755 include/js/treeGrid/LICENSE
 mode change 100644 => 100755 include/js/treeGrid/README.md
 mode change 100644 => 100755 include/js/treeGrid/css/jquery.treegrid.css
 mode change 100644 => 100755 include/js/treeGrid/examples/bootstrap-2.3.2/css/bootstrap-responsive.css
 mode change 100644 => 100755 include/js/treeGrid/examples/bootstrap-2.3.2/css/bootstrap-responsive.min.css
 mode change 100644 => 100755 include/js/treeGrid/examples/bootstrap-2.3.2/css/bootstrap.css
 mode change 100644 => 100755 include/js/treeGrid/examples/bootstrap-2.3.2/css/bootstrap.min.css
 mode change 100644 => 100755 include/js/treeGrid/examples/bootstrap-2.3.2/img/glyphicons-halflings-white.png
 mode change 100644 => 100755 include/js/treeGrid/examples/bootstrap-2.3.2/img/glyphicons-halflings.png
 mode change 100644 => 100755 include/js/treeGrid/examples/bootstrap-2.3.2/js/bootstrap.js
 mode change 100644 => 100755 include/js/treeGrid/examples/bootstrap-2.3.2/js/bootstrap.min.js
 mode change 100644 => 100755 include/js/treeGrid/examples/bootstrap-3.0.0/css/bootstrap-theme.css
 mode change 100644 => 100755 include/js/treeGrid/examples/bootstrap-3.0.0/css/bootstrap-theme.min.css
 mode change 100644 => 100755 include/js/treeGrid/examples/bootstrap-3.0.0/css/bootstrap.css
 mode change 100644 => 100755 include/js/treeGrid/examples/bootstrap-3.0.0/css/bootstrap.min.css
 mode change 100644 => 100755 include/js/treeGrid/examples/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.eot
 mode change 100644 => 100755 include/js/treeGrid/examples/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.svg
 mode change 100644 => 100755 include/js/treeGrid/examples/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.ttf
 mode change 100644 => 100755 include/js/treeGrid/examples/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.woff
 mode change 100644 => 100755 include/js/treeGrid/examples/bootstrap-3.0.0/js/bootstrap.js
 mode change 100644 => 100755 include/js/treeGrid/examples/bootstrap-3.0.0/js/bootstrap.min.js
 mode change 100644 => 100755 include/js/treeGrid/examples/example-basic.html
 mode change 100644 => 100755 include/js/treeGrid/examples/example-bootstrap-2.html
 mode change 100644 => 100755 include/js/treeGrid/examples/example-bootstrap-3.html
 mode change 100644 => 100755 include/js/treeGrid/examples/example-column.html
 mode change 100644 => 100755 include/js/treeGrid/examples/example-save-state.html
 mode change 100644 => 100755 include/js/treeGrid/img/collapse.png
 mode change 100644 => 100755 include/js/treeGrid/img/expand.png
 mode change 100644 => 100755 include/js/treeGrid/img/file.png
 mode change 100644 => 100755 include/js/treeGrid/img/folder.png
 mode change 100644 => 100755 include/js/treeGrid/index.html
 mode change 100644 => 100755 include/js/treeGrid/js/jquery-1.10.2.js
 mode change 100644 => 100755 include/js/treeGrid/js/jquery.cookie.js
 mode change 100644 => 100755 include/js/treeGrid/js/jquery.treegrid.bootstrap2.js
 mode change 100644 => 100755 include/js/treeGrid/js/jquery.treegrid.bootstrap3.js
 mode change 100644 => 100755 include/js/treeGrid/js/jquery.treegrid.js
 mode change 100644 => 100755 include/js/treeGrid/jstreegrid.js
 mode change 100644 => 100755 include/js/treeGrid/params.json
 mode change 100644 => 100755 include/js/treeGrid/styles.css
 mode change 100644 => 100755 include/js/treeGrid/test.html
 mode change 100644 => 100755 include/js/treeGrid/tests/qunit-1.12.0.css
 mode change 100644 => 100755 include/js/treeGrid/tests/qunit-1.12.0.js
 mode change 100644 => 100755 include/js/treeGrid/tests/tests.js
 mode change 100644 => 100755 include/js/treeGrid/treegrid.jquery.json
 mode change 100644 => 100755 include/kontakt.class.php
 mode change 100644 => 100755 include/konto.class.php
 mode change 100644 => 100755 include/legesamtnote.class.php
 mode change 100644 => 100755 include/lehre_tools.class.php
 mode change 100644 => 100755 include/lehreinheit.class.php
 mode change 100644 => 100755 include/lehreinheitgruppe.class.php
 mode change 100644 => 100755 include/lehreinheitmitarbeiter.class.php
 mode change 100644 => 100755 include/lehrelisthelper.class.php
 mode change 100644 => 100755 include/lehrfach.class.php
 mode change 100644 => 100755 include/lehrform.class.php
 mode change 100644 => 100755 include/lehrfunktion.class.php
 mode change 100644 => 100755 include/lehrmodus.class.php
 mode change 100644 => 100755 include/lehrstunde.class.php
 mode change 100644 => 100755 include/lehrtyp.class.php
 mode change 100644 => 100755 include/lehrveranstaltung.class.php
 mode change 100644 => 100755 include/lehrverband.class.php
 mode change 100644 => 100755 include/log.class.php
 mode change 100644 => 100755 include/lvangebot.class.php
 mode change 100644 => 100755 include/lvgesamtnote.class.php
 mode change 100644 => 100755 include/lvinfo.class.php
 mode change 100644 => 100755 include/lvregel.class.php
 mode change 100644 => 100755 include/mail.class.php
 mode change 100644 => 100755 include/mantis.class.php
 mode change 100644 => 100755 include/meta/angular-tablesorter.php
 mode change 100644 => 100755 include/meta/angular.php
 mode change 100644 => 100755 include/meta/easyui.php
 mode change 100644 => 100755 include/meta/jquery-tablesorter.php
 mode change 100644 => 100755 include/meta/jquery.php
 mode change 100644 => 100755 include/meta/js_utils.php
 mode change 100644 => 100755 include/meta/jsoneditor.php
 mode change 100644 => 100755 include/meta/php_utils.php
 mode change 100644 => 100755 include/mitarbeiter.class.php
 mode change 100644 => 100755 include/mobilitaet.class.php
 mode change 100644 => 100755 include/mobilitaetsprogramm.class.php
 mode change 100644 => 100755 include/nation.class.php
 mode change 100644 => 100755 include/nationengruppe.class.php
 mode change 100644 => 100755 include/news.class.php
 mode change 100644 => 100755 include/note.class.php
 mode change 100644 => 100755 include/notenschluessel.class.php
 mode change 100644 => 100755 include/notiz.class.php
 mode change 100644 => 100755 include/organisationseinheit.class.php
 mode change 100644 => 100755 include/organisationsform.class.php
 mode change 100644 => 100755 include/ort.class.php
 mode change 100644 => 100755 include/ortraumtyp.class.php
 mode change 100644 => 100755 include/pdf.class.php
 mode change 100644 => 100755 include/pdf.inc.php
 mode change 100644 => 100755 include/pdf/FAQ.htm
 mode change 100644 => 100755 include/pdf/doc/acceptpagebreak.htm
 mode change 100644 => 100755 include/pdf/doc/addfont.htm
 mode change 100644 => 100755 include/pdf/doc/addlink.htm
 mode change 100644 => 100755 include/pdf/doc/addpage.htm
 mode change 100644 => 100755 include/pdf/doc/aliasnbpages.htm
 mode change 100644 => 100755 include/pdf/doc/cell.htm
 mode change 100644 => 100755 include/pdf/doc/close.htm
 mode change 100644 => 100755 include/pdf/doc/error.htm
 mode change 100644 => 100755 include/pdf/doc/footer.htm
 mode change 100644 => 100755 include/pdf/doc/fpdf.htm
 mode change 100644 => 100755 include/pdf/doc/getstringwidth.htm
 mode change 100644 => 100755 include/pdf/doc/getx.htm
 mode change 100644 => 100755 include/pdf/doc/gety.htm
 mode change 100644 => 100755 include/pdf/doc/header.htm
 mode change 100644 => 100755 include/pdf/doc/image.htm
 mode change 100644 => 100755 include/pdf/doc/index.htm
 mode change 100644 => 100755 include/pdf/doc/line.htm
 mode change 100644 => 100755 include/pdf/doc/link.htm
 mode change 100644 => 100755 include/pdf/doc/ln.htm
 mode change 100644 => 100755 include/pdf/doc/multicell.htm
 mode change 100644 => 100755 include/pdf/doc/open.htm
 mode change 100644 => 100755 include/pdf/doc/output.htm
 mode change 100644 => 100755 include/pdf/doc/pageno.htm
 mode change 100644 => 100755 include/pdf/doc/rect.htm
 mode change 100644 => 100755 include/pdf/doc/setauthor.htm
 mode change 100644 => 100755 include/pdf/doc/setautopagebreak.htm
 mode change 100644 => 100755 include/pdf/doc/setcompression.htm
 mode change 100644 => 100755 include/pdf/doc/setcreator.htm
 mode change 100644 => 100755 include/pdf/doc/setdisplaymode.htm
 mode change 100644 => 100755 include/pdf/doc/setdrawcolor.htm
 mode change 100644 => 100755 include/pdf/doc/setfillcolor.htm
 mode change 100644 => 100755 include/pdf/doc/setfont.htm
 mode change 100644 => 100755 include/pdf/doc/setfontsize.htm
 mode change 100644 => 100755 include/pdf/doc/setkeywords.htm
 mode change 100644 => 100755 include/pdf/doc/setleftmargin.htm
 mode change 100644 => 100755 include/pdf/doc/setlinewidth.htm
 mode change 100644 => 100755 include/pdf/doc/setlink.htm
 mode change 100644 => 100755 include/pdf/doc/setmargins.htm
 mode change 100644 => 100755 include/pdf/doc/setrightmargin.htm
 mode change 100644 => 100755 include/pdf/doc/setsubject.htm
 mode change 100644 => 100755 include/pdf/doc/settextcolor.htm
 mode change 100644 => 100755 include/pdf/doc/settitle.htm
 mode change 100644 => 100755 include/pdf/doc/settopmargin.htm
 mode change 100644 => 100755 include/pdf/doc/setx.htm
 mode change 100644 => 100755 include/pdf/doc/setxy.htm
 mode change 100644 => 100755 include/pdf/doc/sety.htm
 mode change 100644 => 100755 include/pdf/doc/text.htm
 mode change 100644 => 100755 include/pdf/doc/write.htm
 mode change 100644 => 100755 include/pdf/font/courier.php
 mode change 100644 => 100755 include/pdf/font/helvetica.php
 mode change 100644 => 100755 include/pdf/font/helveticab.php
 mode change 100644 => 100755 include/pdf/font/helveticabi.php
 mode change 100644 => 100755 include/pdf/font/helveticai.php
 mode change 100644 => 100755 include/pdf/font/makefont/cp1250.map
 mode change 100644 => 100755 include/pdf/font/makefont/cp1251.map
 mode change 100644 => 100755 include/pdf/font/makefont/cp1252.map
 mode change 100644 => 100755 include/pdf/font/makefont/cp1253.map
 mode change 100644 => 100755 include/pdf/font/makefont/cp1254.map
 mode change 100644 => 100755 include/pdf/font/makefont/cp1255.map
 mode change 100644 => 100755 include/pdf/font/makefont/cp1257.map
 mode change 100644 => 100755 include/pdf/font/makefont/cp1258.map
 mode change 100644 => 100755 include/pdf/font/makefont/cp874.map
 mode change 100644 => 100755 include/pdf/font/makefont/iso-8859-1.map
 mode change 100644 => 100755 include/pdf/font/makefont/iso-8859-11.map
 mode change 100644 => 100755 include/pdf/font/makefont/iso-8859-15.map
 mode change 100644 => 100755 include/pdf/font/makefont/iso-8859-16.map
 mode change 100644 => 100755 include/pdf/font/makefont/iso-8859-2.map
 mode change 100644 => 100755 include/pdf/font/makefont/iso-8859-4.map
 mode change 100644 => 100755 include/pdf/font/makefont/iso-8859-5.map
 mode change 100644 => 100755 include/pdf/font/makefont/iso-8859-7.map
 mode change 100644 => 100755 include/pdf/font/makefont/iso-8859-9.map
 mode change 100644 => 100755 include/pdf/font/makefont/koi8-r.map
 mode change 100644 => 100755 include/pdf/font/makefont/koi8-u.map
 mode change 100644 => 100755 include/pdf/font/makefont/makefont.php
 mode change 100644 => 100755 include/pdf/font/symbol.php
 mode change 100644 => 100755 include/pdf/font/times.php
 mode change 100644 => 100755 include/pdf/font/timesb.php
 mode change 100644 => 100755 include/pdf/font/timesbi.php
 mode change 100644 => 100755 include/pdf/font/timesi.php
 mode change 100644 => 100755 include/pdf/font/zapfdingbats.php
 mode change 100644 => 100755 include/pdf/fpdf.css
 mode change 100644 => 100755 include/pdf/fpdf.php
 mode change 100644 => 100755 include/pdf/histo.htm
 mode change 100644 => 100755 include/pdf/install.txt
 mode change 100644 => 100755 include/person.class.php
 mode change 100644 => 100755 include/personlog.class.php
 mode change 100644 => 100755 include/pgsql.class.php
 mode change 100644 => 100755 include/phrasen.class.php
 mode change 100644 => 100755 include/preincoming.class.php
 mode change 100644 => 100755 include/preinteressent.class.php
 mode change 100644 => 100755 include/preoutgoing.class.php
 mode change 100644 => 100755 include/prestudent.class.php
 mode change 100644 => 100755 include/process.class.php
 mode change 100644 => 100755 include/projekt.class.php
 mode change 100644 => 100755 include/projektarbeit.class.php
 mode change 100644 => 100755 include/projektbenutzer.class.php
 mode change 100644 => 100755 include/projektbetreuer.class.php
 mode change 100644 => 100755 include/projektphase.class.php
 mode change 100644 => 100755 include/projekttask.class.php
 mode change 100644 => 100755 include/pruefling.class.php
 mode change 100644 => 100755 include/pruefung.class.php
 mode change 100644 => 100755 include/pruefungCis.class.php
 mode change 100644 => 100755 include/pruefungsanmeldung.class.php
 mode change 100644 => 100755 include/pruefungsfenster.class.php
 mode change 100644 => 100755 include/pruefungstermin.class.php
 mode change 100644 => 100755 include/raumtyp.class.php
 mode change 100644 => 100755 include/rdf.class.php
 mode change 100644 => 100755 include/reihungstest.class.php
 mode change 100644 => 100755 include/reservierung.class.php
 mode change 100644 => 100755 include/ressource.class.php
 mode change 100644 => 100755 include/rueckstellung.class.php
 mode change 100644 => 100755 include/sabredav/ChangeLog
 mode change 100644 => 100755 include/sabredav/LICENSE
 mode change 100644 => 100755 include/sabredav/README.md
 mode change 100644 => 100755 include/sabredav/bin/build.php
 mode change 100644 => 100755 include/sabredav/bin/googlecode_upload.py
 mode change 100644 => 100755 include/sabredav/bin/migrateto17.php
 mode change 100644 => 100755 include/sabredav/bin/naturalselection.py
 mode change 100644 => 100755 include/sabredav/bin/sabredav
 mode change 100644 => 100755 include/sabredav/bin/sabredav.php
 mode change 100644 => 100755 include/sabredav/bin/vobjectvalidate.php
 mode change 100644 => 100755 include/sabredav/composer.json
 mode change 100644 => 100755 include/sabredav/composer.lock
 mode change 100644 => 100755 include/sabredav/examples/addressbookserver.php
 mode change 100644 => 100755 include/sabredav/examples/basicauth.php
 mode change 100644 => 100755 include/sabredav/examples/calendarserver.php
 mode change 100644 => 100755 include/sabredav/examples/digestauth.php
 mode change 100644 => 100755 include/sabredav/examples/fileserver.php
 mode change 100644 => 100755 include/sabredav/examples/groupwareserver.php
 mode change 100644 => 100755 include/sabredav/examples/simplefsserver.php
 mode change 100644 => 100755 include/sabredav/examples/sql/mysql.addressbook.sql
 mode change 100644 => 100755 include/sabredav/examples/sql/mysql.calendars.sql
 mode change 100644 => 100755 include/sabredav/examples/sql/mysql.locks.sql
 mode change 100644 => 100755 include/sabredav/examples/sql/mysql.principals.sql
 mode change 100644 => 100755 include/sabredav/examples/sql/mysql.users.sql
 mode change 100644 => 100755 include/sabredav/examples/sql/pgsql.addressbook.sql
 mode change 100644 => 100755 include/sabredav/examples/sql/pgsql.calendars.sql
 mode change 100644 => 100755 include/sabredav/examples/sql/pgsql.locks.sql
 mode change 100644 => 100755 include/sabredav/examples/sql/pgsql.principals.sql
 mode change 100644 => 100755 include/sabredav/examples/sql/pgsql.users.sql
 mode change 100644 => 100755 include/sabredav/examples/sql/sqlite.addressbooks.sql
 mode change 100644 => 100755 include/sabredav/examples/sql/sqlite.calendars.sql
 mode change 100644 => 100755 include/sabredav/examples/sql/sqlite.locks.sql
 mode change 100644 => 100755 include/sabredav/examples/sql/sqlite.principals.sql
 mode change 100644 => 100755 include/sabredav/examples/sql/sqlite.users.sql
 mode change 100644 => 100755 include/sabredav/examples/webserver/apache2_htaccess.conf
 mode change 100644 => 100755 include/sabredav/examples/webserver/apache2_vhost.conf
 mode change 100644 => 100755 include/sabredav/examples/webserver/apache2_vhost_cgi.conf
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CalDAV/Backend/AbstractBackend.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CalDAV/Backend/BackendInterface.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CalDAV/Backend/NotificationSupport.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CalDAV/Backend/PDO.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CalDAV/Backend/SharingSupport.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CalDAV/Calendar.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CalDAV/CalendarObject.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CalDAV/CalendarQueryParser.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CalDAV/CalendarQueryValidator.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CalDAV/CalendarRootNode.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CalDAV/Exception/InvalidComponentType.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CalDAV/ICSExportPlugin.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CalDAV/ICalendar.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CalDAV/ICalendarObject.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CalDAV/IShareableCalendar.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CalDAV/ISharedCalendar.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CalDAV/Notifications/Collection.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CalDAV/Notifications/ICollection.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CalDAV/Notifications/INode.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CalDAV/Notifications/INotificationType.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CalDAV/Notifications/Node.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CalDAV/Notifications/Notification/Invite.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CalDAV/Notifications/Notification/InviteReply.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CalDAV/Notifications/Notification/SystemStatus.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CalDAV/Plugin.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CalDAV/Principal/Collection.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CalDAV/Principal/IProxyRead.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CalDAV/Principal/IProxyWrite.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CalDAV/Principal/ProxyRead.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CalDAV/Principal/ProxyWrite.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CalDAV/Principal/User.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CalDAV/Property/AllowedSharingModes.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CalDAV/Property/Invite.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CalDAV/Property/ScheduleCalendarTransp.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CalDAV/Property/SupportedCalendarData.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CalDAV/Property/SupportedCollationSet.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CalDAV/Schedule/IMip.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CalDAV/Schedule/IOutbox.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CalDAV/Schedule/Outbox.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CalDAV/ShareableCalendar.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CalDAV/SharedCalendar.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CalDAV/SharingPlugin.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CalDAV/UserCalendars.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CalDAV/Version.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CardDAV/AddressBook.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CardDAV/AddressBookQueryParser.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CardDAV/AddressBookRoot.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CardDAV/Backend/AbstractBackend.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CardDAV/Backend/BackendInterface.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CardDAV/Backend/PDO.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CardDAV/Card.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CardDAV/IAddressBook.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CardDAV/ICard.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CardDAV/IDirectory.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CardDAV/Plugin.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CardDAV/Property/SupportedAddressData.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CardDAV/UserAddressBooks.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CardDAV/VCFExportPlugin.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/CardDAV/Version.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Auth/Backend/AbstractBasic.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Auth/Backend/AbstractDigest.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Auth/Backend/Apache.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Auth/Backend/BackendInterface.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Auth/Backend/File.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Auth/Backend/PDO.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Auth/Plugin.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Browser/GuessContentType.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Browser/MapGetToPropFind.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Browser/Plugin.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Browser/assets/favicon.ico
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Browser/assets/icons/addressbook.png
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Browser/assets/icons/calendar.png
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Browser/assets/icons/card.png
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Browser/assets/icons/collection.png
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Browser/assets/icons/file.png
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Browser/assets/icons/parent.png
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Browser/assets/icons/principal.png
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Client.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Collection.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Exception.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Exception/BadRequest.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Exception/Conflict.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Exception/ConflictingLock.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Exception/FileNotFound.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Exception/Forbidden.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Exception/InsufficientStorage.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Exception/InvalidResourceType.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Exception/LengthRequired.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Exception/Locked.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Exception/MethodNotAllowed.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Exception/NotAuthenticated.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Exception/NotFound.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Exception/NotImplemented.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Exception/PaymentRequired.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Exception/PreconditionFailed.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Exception/ReportNotSupported.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Exception/ServiceUnavailable.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Exception/UnsupportedMediaType.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/FS/Directory.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/FS/File.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/FS/Node.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/FSExt/Directory.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/FSExt/File.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/FSExt/Node.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/File.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/ICollection.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/IExtendedCollection.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/IFile.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/INode.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/IProperties.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/IQuota.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Locks/Backend/AbstractBackend.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Locks/Backend/BackendInterface.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Locks/Backend/FS.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Locks/Backend/File.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Locks/Backend/PDO.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Locks/LockInfo.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Locks/Plugin.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Mount/Plugin.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Node.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/ObjectTree.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/PartialUpdate/IFile.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/PartialUpdate/IPatchSupport.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/PartialUpdate/Plugin.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Property.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Property/GetLastModified.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Property/Href.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Property/HrefList.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Property/IHref.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Property/LockDiscovery.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Property/ResourceType.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Property/Response.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Property/ResponseList.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Property/SupportedLock.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Property/SupportedReportSet.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/PropertyInterface.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Server.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/ServerPlugin.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/SimpleCollection.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/SimpleFile.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/StringUtil.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/TemporaryFileFilterPlugin.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Tree.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Tree/Filesystem.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/URLUtil.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/UUIDUtil.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/Version.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAV/XMLUtil.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAVACL/AbstractPrincipalCollection.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAVACL/Exception/AceConflict.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAVACL/Exception/NeedPrivileges.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAVACL/Exception/NoAbstract.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAVACL/Exception/NotRecognizedPrincipal.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAVACL/Exception/NotSupportedPrivilege.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAVACL/IACL.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAVACL/IPrincipal.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAVACL/IPrincipalCollection.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAVACL/Plugin.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAVACL/Principal.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAVACL/PrincipalBackend/AbstractBackend.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAVACL/PrincipalBackend/BackendInterface.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAVACL/PrincipalBackend/PDO.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAVACL/PrincipalCollection.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAVACL/Property/Acl.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAVACL/Property/AclRestrictions.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAVACL/Property/CurrentUserPrivilegeSet.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAVACL/Property/Principal.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAVACL/Property/SupportedPrivilegeSet.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/DAVACL/Version.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/HTTP/AWSAuth.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/HTTP/AbstractAuth.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/HTTP/BasicAuth.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/HTTP/DigestAuth.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/HTTP/Request.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/HTTP/Response.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/HTTP/Util.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/HTTP/Version.php
 mode change 100644 => 100755 include/sabredav/lib/Sabre/autoload.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CalDAV/Backend/AbstractPDOTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CalDAV/Backend/AbstractTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CalDAV/Backend/Mock.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CalDAV/Backend/PDOMySQLTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CalDAV/Backend/PDOSqliteTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CalDAV/CalendarObjectTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CalDAV/CalendarQueryParserTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CalDAV/CalendarQueryVAlarmTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CalDAV/CalendarQueryValidatorTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CalDAV/CalendarTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDbyDayTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CalDAV/ExpandEventsDoubleEventsTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CalDAV/FreeBusyReportTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CalDAV/FreeBusyRequestTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CalDAV/GetEventsByTimerangeTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CalDAV/ICSExportPluginTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CalDAV/Issue166Test.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CalDAV/Issue172Test.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CalDAV/Issue203Test.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CalDAV/Issue205Test.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CalDAV/Issue211Test.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CalDAV/Issue220Test.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CalDAV/Issue228Test.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CalDAV/Notifications/CollectionTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CalDAV/Notifications/NodeTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CalDAV/Notifications/Notification/InviteReplyTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CalDAV/Notifications/Notification/InviteTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CalDAV/Notifications/Notification/SystemStatusTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CalDAV/OutboxPostTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CalDAV/PluginTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CalDAV/Principal/CollectionTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CalDAV/Principal/ProxyReadTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CalDAV/Principal/ProxyWriteTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CalDAV/Principal/UserTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CalDAV/Property/AllowedSharingModesTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CalDAV/Property/InviteTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CalDAV/Property/ScheduleCalendarTranspTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CalDAV/Property/SupportedCalendarComponentSetTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CalDAV/Property/SupportedCalendarDataTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CalDAV/Property/SupportedCollationSetTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CalDAV/Schedule/IMip/Mock.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CalDAV/Schedule/OutboxTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CalDAV/ShareableCalendarTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CalDAV/SharedCalendarTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CalDAV/SharingPluginTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CalDAV/TestUtil.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CalDAV/UserCalendarsSharedCalendarsTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CalDAV/UserCalendarsTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CalDAV/ValidateICalTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CalDAV/VersionTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CardDAV/AbstractPluginTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CardDAV/AddressBookQueryParserTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CardDAV/AddressBookQueryTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CardDAV/AddressBookRootTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CardDAV/AddressBookTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CardDAV/Backend/AbstractPDOTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CardDAV/Backend/Mock.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CardDAV/Backend/PDOMySQLTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CardDAV/Backend/PDOSqliteTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CardDAV/CardTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CardDAV/IDirectoryTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CardDAV/MultiGetTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CardDAV/PluginTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CardDAV/Property/SupportedAddressDataTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CardDAV/SogoStripContentTypeTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CardDAV/TestUtil.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CardDAV/UserAddressBooksTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CardDAV/VCFExportTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CardDAV/ValidateFilterTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CardDAV/ValidateVCardTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/CardDAV/VersionTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/AbstractServer.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/Auth/Backend/AbstractBasicTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/Auth/Backend/AbstractDigestTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/Auth/Backend/AbstractPDOTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/Auth/Backend/ApacheTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/Auth/Backend/FileTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/Auth/Backend/Mock.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/Auth/Backend/PDOMySQLTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/Auth/Backend/PDOSqliteTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/Auth/PluginTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/BasicNodeTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/Browser/GuessContentTypeTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/Browser/MapGetToPropFindTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/Browser/PluginTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/ClientMock.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/ClientTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/Exception/LockedTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/Exception/PaymentRequiredTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/ExceptionTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/FSExt/FileTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/FSExt/NodeTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/FSExt/ServerTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/HTTPPreferParsingTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/HttpDeleteTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/HttpPutTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/Issue33Test.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/Locks/Backend/AbstractTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/Locks/Backend/FSTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/Locks/Backend/FileTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/Locks/Backend/PDOMySQLTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/Locks/Backend/PDOTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/Locks/GetIfConditionsTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/Locks/MSWordTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/Locks/PluginTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/Mock/Collection.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/Mock/File.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/Mount/PluginTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/ObjectTreeTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/PartialUpdate/FileMock.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/PartialUpdate/PluginTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/PartialUpdate/SpecificationTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/Property/GetLastModifiedTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/Property/HrefListTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/Property/HrefTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/Property/ResourceTypeTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/Property/ResponseListTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/Property/ResponseTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/Property/SupportedReportSetTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/ServerCopyMoveTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/ServerEventsTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/ServerMKCOLTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/ServerPluginTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/ServerPreconditionTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/ServerPropsTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/ServerRangeTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/ServerSimpleTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/ServerUpdatePropertiesTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/SimpleFileTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/StringUtilTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/TemporaryFileFilterTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/TestPlugin.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/Tree/FilesystemTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/TreeTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/URLUtilTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/UUIDUtilTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAV/XMLUtilTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAVACL/ACLMethodTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAVACL/AllowAccessTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAVACL/BlockAccessTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAVACL/Exception/AceConflictTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAVACL/Exception/NeedPrivilegesExceptionTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAVACL/Exception/NoAbstractTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAVACL/Exception/NotRecognizedPrincipalTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAVACL/Exception/NotSupportedPrivilegeTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAVACL/ExpandPropertiesTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAVACL/MockACLNode.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAVACL/MockPrincipal.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAVACL/PluginAdminTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAVACL/PluginPropertiesTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAVACL/PluginUpdatePropertiesTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAVACL/PrincipalBackend/AbstractPDOTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAVACL/PrincipalBackend/Mock.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAVACL/PrincipalBackend/PDOMySQLTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAVACL/PrincipalBackend/PDOSqliteTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAVACL/PrincipalCollectionTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAVACL/PrincipalPropertySearchTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAVACL/PrincipalSearchPropertySetTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAVACL/PrincipalTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAVACL/Property/ACLRestrictionsTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAVACL/Property/ACLTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAVACL/Property/CurrentUserPrivilegeSetTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAVACL/Property/PrincipalTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAVACL/Property/SupportedPrivilegeSetTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAVACL/SimplePluginTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAVACL/VersionTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/DAVServerTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/HTTP/AWSAuthTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/HTTP/BasicAuthTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/HTTP/DigestAuthTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/HTTP/RequestTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/HTTP/ResponseMock.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/HTTP/ResponseTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/HTTP/UtilTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/HTTP/VersionTest.php
 mode change 100644 => 100755 include/sabredav/tests/Sabre/TestUtil.php
 mode change 100644 => 100755 include/sabredav/tests/bootstrap.php
 mode change 100644 => 100755 include/sabredav/tests/composer.vobject3.json
 mode change 100644 => 100755 include/sabredav/tests/phpunit.xml
 mode change 100644 => 100755 include/sabredav/vendor/autoload.php
 mode change 100644 => 100755 include/sabredav/vendor/composer/ClassLoader.php
 mode change 100644 => 100755 include/sabredav/vendor/composer/autoload_classmap.php
 mode change 100644 => 100755 include/sabredav/vendor/composer/autoload_namespaces.php
 mode change 100644 => 100755 include/sabredav/vendor/composer/autoload_psr4.php
 mode change 100644 => 100755 include/sabredav/vendor/composer/autoload_real.php
 mode change 100644 => 100755 include/sabredav/vendor/composer/installed.json
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/.gitignore
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/.travis.yml
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/ChangeLog
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/LICENSE
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/README.md
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/bin/bench.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/bin/generateicalendardata.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/bin/vobjectvalidate.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/composer.json
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VAlarm.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VCalendar.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VCard.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VEvent.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VFreeBusy.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VJournal.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VTodo.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/DateTimeParser.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Document.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/ElementList.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/FreeBusyGenerator.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Node.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Parameter.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/ParseException.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Property.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Property/Compound.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Property/DateTime.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Property/MultiDateTime.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Reader.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/RecurrenceIterator.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Splitter/ICalendar.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Splitter/SplitterInterface.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Splitter/VCard.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/StringUtil.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/TimeZoneUtil.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Version.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/includes.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VAlarmTest.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VCalendarTest.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VCardTest.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VEventTest.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VFreeBusyTest.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VJournalTest.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VTodoTest.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/ComponentTest.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/DateTimeParserTest.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/DocumentTest.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/ElementListTest.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/EmClientTest.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/FreeBusyGeneratorTest.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Issue153Test.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Issue154Test.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Issue48Test.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Issue50Test.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/ParameterTest.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Property/CompoundTest.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Property/DateTimeTest.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Property/MultiDateTimeTest.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/PropertyTest.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/ReaderTest.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorFifthTuesdayProblemTest.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorIncorrectExpandTest.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorInfiniteLoopProblemTest.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorMinusOneProblemTest.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorMissingOverriddenTest.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorTest.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/SlashRTest.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Splitter/ICalendarTest.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Splitter/VCardTest.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/StringUtilTest.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/TimeZoneUtilTest.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/VersionTest.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/issue153.vcf
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/tests/bootstrap.php
 mode change 100644 => 100755 include/sabredav/vendor/sabre/vobject/tests/phpunit.xml
 mode change 100644 => 100755 include/sancho.inc.php
 mode change 100644 => 100755 include/schluesseltyp.class.php
 mode change 100644 => 100755 include/securimage/AHGBold.ttf
 mode change 100644 => 100755 include/securimage/LICENSE.txt
 mode change 100644 => 100755 include/securimage/README.FONT.txt
 mode change 100644 => 100755 include/securimage/README.txt
 mode change 100644 => 100755 include/securimage/WavFile.php
 mode change 100644 => 100755 include/securimage/audio/en/0.wav
 mode change 100644 => 100755 include/securimage/audio/en/1.wav
 mode change 100644 => 100755 include/securimage/audio/en/10.wav
 mode change 100644 => 100755 include/securimage/audio/en/11.wav
 mode change 100644 => 100755 include/securimage/audio/en/12.wav
 mode change 100644 => 100755 include/securimage/audio/en/13.wav
 mode change 100644 => 100755 include/securimage/audio/en/14.wav
 mode change 100644 => 100755 include/securimage/audio/en/15.wav
 mode change 100644 => 100755 include/securimage/audio/en/16.wav
 mode change 100644 => 100755 include/securimage/audio/en/17.wav
 mode change 100644 => 100755 include/securimage/audio/en/18.wav
 mode change 100644 => 100755 include/securimage/audio/en/19.wav
 mode change 100644 => 100755 include/securimage/audio/en/2.wav
 mode change 100644 => 100755 include/securimage/audio/en/20.wav
 mode change 100644 => 100755 include/securimage/audio/en/3.wav
 mode change 100644 => 100755 include/securimage/audio/en/4.wav
 mode change 100644 => 100755 include/securimage/audio/en/5.wav
 mode change 100644 => 100755 include/securimage/audio/en/6.wav
 mode change 100644 => 100755 include/securimage/audio/en/7.wav
 mode change 100644 => 100755 include/securimage/audio/en/8.wav
 mode change 100644 => 100755 include/securimage/audio/en/9.wav
 mode change 100644 => 100755 include/securimage/audio/en/A.wav
 mode change 100644 => 100755 include/securimage/audio/en/B.wav
 mode change 100644 => 100755 include/securimage/audio/en/C.wav
 mode change 100644 => 100755 include/securimage/audio/en/D.wav
 mode change 100644 => 100755 include/securimage/audio/en/E.wav
 mode change 100644 => 100755 include/securimage/audio/en/F.wav
 mode change 100644 => 100755 include/securimage/audio/en/G.wav
 mode change 100644 => 100755 include/securimage/audio/en/H.wav
 mode change 100644 => 100755 include/securimage/audio/en/I.wav
 mode change 100644 => 100755 include/securimage/audio/en/J.wav
 mode change 100644 => 100755 include/securimage/audio/en/K.wav
 mode change 100644 => 100755 include/securimage/audio/en/L.wav
 mode change 100644 => 100755 include/securimage/audio/en/M.wav
 mode change 100644 => 100755 include/securimage/audio/en/MINUS.wav
 mode change 100644 => 100755 include/securimage/audio/en/N.wav
 mode change 100644 => 100755 include/securimage/audio/en/O.wav
 mode change 100644 => 100755 include/securimage/audio/en/P.wav
 mode change 100644 => 100755 include/securimage/audio/en/PLUS.wav
 mode change 100644 => 100755 include/securimage/audio/en/Q.wav
 mode change 100644 => 100755 include/securimage/audio/en/R.wav
 mode change 100644 => 100755 include/securimage/audio/en/S.wav
 mode change 100644 => 100755 include/securimage/audio/en/T.wav
 mode change 100644 => 100755 include/securimage/audio/en/TIMES.wav
 mode change 100644 => 100755 include/securimage/audio/en/U.wav
 mode change 100644 => 100755 include/securimage/audio/en/V.wav
 mode change 100644 => 100755 include/securimage/audio/en/W.wav
 mode change 100644 => 100755 include/securimage/audio/en/X.wav
 mode change 100644 => 100755 include/securimage/audio/en/Y.wav
 mode change 100644 => 100755 include/securimage/audio/en/Z.wav
 mode change 100644 => 100755 include/securimage/audio/en/error.wav
 mode change 100644 => 100755 include/securimage/audio/noise/check-point-1.wav
 mode change 100644 => 100755 include/securimage/audio/noise/crowd-talking-1.wav
 mode change 100644 => 100755 include/securimage/audio/noise/crowd-talking-6.wav
 mode change 100644 => 100755 include/securimage/audio/noise/crowd-talking-7.wav
 mode change 100644 => 100755 include/securimage/audio/noise/kids-playing-1.wav
 mode change 100644 => 100755 include/securimage/backgrounds/bg3.jpg
 mode change 100644 => 100755 include/securimage/backgrounds/bg4.jpg
 mode change 100644 => 100755 include/securimage/backgrounds/bg5.jpg
 mode change 100644 => 100755 include/securimage/backgrounds/bg6.png
 mode change 100644 => 100755 include/securimage/captcha.html
 mode change 100644 => 100755 include/securimage/database/.htaccess
 mode change 100644 => 100755 include/securimage/database/index.html
 mode change 100644 => 100755 include/securimage/database/securimage.sq3
 mode change 100644 => 100755 include/securimage/images/audio_icon.png
 mode change 100644 => 100755 include/securimage/images/refresh.png
 mode change 100644 => 100755 include/securimage/securimage.php
 mode change 100644 => 100755 include/securimage/securimage_play.php
 mode change 100644 => 100755 include/securimage/securimage_play.swf
 mode change 100644 => 100755 include/securimage/securimage_show.php
 mode change 100644 => 100755 include/securimage/words/words.txt
 mode change 100644 => 100755 include/service.class.php
 mode change 100644 => 100755 include/sprache.class.php
 mode change 100644 => 100755 include/standort.class.php
 mode change 100644 => 100755 include/statistik.class.php
 mode change 100644 => 100755 include/statusgrund.class.php
 mode change 100644 => 100755 include/student.class.php
 mode change 100644 => 100755 include/studentnote.class.php
 mode change 100644 => 100755 include/studiengang.class.php
 mode change 100644 => 100755 include/studienjahr.class.php
 mode change 100644 => 100755 include/studienordnung.class.php
 mode change 100644 => 100755 include/studienplan.class.php
 mode change 100644 => 100755 include/studienplatz.class.php
 mode change 100644 => 100755 include/studiensemester.class.php
 mode change 100644 => 100755 include/studierendenantrag.class.php
 mode change 100644 => 100755 include/stunde.class.php
 mode change 100644 => 100755 include/stundenplan.class.php
 mode change 100644 => 100755 include/tags.class.php
 mode change 100644 => 100755 include/template.class.php
 mode change 100644 => 100755 include/tiny_mce/langs/de.js
 mode change 100644 => 100755 include/tiny_mce/langs/en.js
 mode change 100644 => 100755 include/tiny_mce/license.txt
 mode change 100644 => 100755 include/tiny_mce/plugins/advhr/css/advhr.css
 mode change 100644 => 100755 include/tiny_mce/plugins/advhr/editor_plugin.js
 mode change 100644 => 100755 include/tiny_mce/plugins/advhr/editor_plugin_src.js
 mode change 100644 => 100755 include/tiny_mce/plugins/advhr/js/rule.js
 mode change 100644 => 100755 include/tiny_mce/plugins/advhr/langs/de_dlg.js
 mode change 100644 => 100755 include/tiny_mce/plugins/advhr/langs/en_dlg.js
 mode change 100644 => 100755 include/tiny_mce/plugins/advhr/rule.htm
 mode change 100644 => 100755 include/tiny_mce/plugins/advimage/css/advimage.css
 mode change 100644 => 100755 include/tiny_mce/plugins/advimage/editor_plugin.js
 mode change 100644 => 100755 include/tiny_mce/plugins/advimage/editor_plugin_src.js
 mode change 100644 => 100755 include/tiny_mce/plugins/advimage/image.htm
 mode change 100644 => 100755 include/tiny_mce/plugins/advimage/img/sample.gif
 mode change 100644 => 100755 include/tiny_mce/plugins/advimage/js/image.js
 mode change 100644 => 100755 include/tiny_mce/plugins/advimage/langs/de_dlg.js
 mode change 100644 => 100755 include/tiny_mce/plugins/advimage/langs/en_dlg.js
 mode change 100644 => 100755 include/tiny_mce/plugins/advlink/css/advlink.css
 mode change 100644 => 100755 include/tiny_mce/plugins/advlink/editor_plugin.js
 mode change 100644 => 100755 include/tiny_mce/plugins/advlink/editor_plugin_src.js
 mode change 100644 => 100755 include/tiny_mce/plugins/advlink/js/advlink.js
 mode change 100644 => 100755 include/tiny_mce/plugins/advlink/langs/de_dlg.js
 mode change 100644 => 100755 include/tiny_mce/plugins/advlink/langs/en_dlg.js
 mode change 100644 => 100755 include/tiny_mce/plugins/advlink/link.htm
 mode change 100644 => 100755 include/tiny_mce/plugins/advlist/editor_plugin.js
 mode change 100644 => 100755 include/tiny_mce/plugins/advlist/editor_plugin_src.js
 mode change 100644 => 100755 include/tiny_mce/plugins/autoresize/editor_plugin.js
 mode change 100644 => 100755 include/tiny_mce/plugins/autoresize/editor_plugin_src.js
 mode change 100644 => 100755 include/tiny_mce/plugins/autosave/editor_plugin.js
 mode change 100644 => 100755 include/tiny_mce/plugins/autosave/editor_plugin_src.js
 mode change 100644 => 100755 include/tiny_mce/plugins/autosave/langs/en.js
 mode change 100644 => 100755 include/tiny_mce/plugins/bbcode/editor_plugin.js
 mode change 100644 => 100755 include/tiny_mce/plugins/bbcode/editor_plugin_src.js
 mode change 100644 => 100755 include/tiny_mce/plugins/contextmenu/editor_plugin.js
 mode change 100644 => 100755 include/tiny_mce/plugins/contextmenu/editor_plugin_src.js
 mode change 100644 => 100755 include/tiny_mce/plugins/directionality/editor_plugin.js
 mode change 100644 => 100755 include/tiny_mce/plugins/directionality/editor_plugin_src.js
 mode change 100644 => 100755 include/tiny_mce/plugins/emotions/editor_plugin.js
 mode change 100644 => 100755 include/tiny_mce/plugins/emotions/editor_plugin_src.js
 mode change 100644 => 100755 include/tiny_mce/plugins/emotions/emotions.htm
 mode change 100644 => 100755 include/tiny_mce/plugins/emotions/img/smiley-cool.gif
 mode change 100644 => 100755 include/tiny_mce/plugins/emotions/img/smiley-cry.gif
 mode change 100644 => 100755 include/tiny_mce/plugins/emotions/img/smiley-embarassed.gif
 mode change 100644 => 100755 include/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif
 mode change 100644 => 100755 include/tiny_mce/plugins/emotions/img/smiley-frown.gif
 mode change 100644 => 100755 include/tiny_mce/plugins/emotions/img/smiley-innocent.gif
 mode change 100644 => 100755 include/tiny_mce/plugins/emotions/img/smiley-kiss.gif
 mode change 100644 => 100755 include/tiny_mce/plugins/emotions/img/smiley-laughing.gif
 mode change 100644 => 100755 include/tiny_mce/plugins/emotions/img/smiley-money-mouth.gif
 mode change 100644 => 100755 include/tiny_mce/plugins/emotions/img/smiley-sealed.gif
 mode change 100644 => 100755 include/tiny_mce/plugins/emotions/img/smiley-smile.gif
 mode change 100644 => 100755 include/tiny_mce/plugins/emotions/img/smiley-surprised.gif
 mode change 100644 => 100755 include/tiny_mce/plugins/emotions/img/smiley-tongue-out.gif
 mode change 100644 => 100755 include/tiny_mce/plugins/emotions/img/smiley-undecided.gif
 mode change 100644 => 100755 include/tiny_mce/plugins/emotions/img/smiley-wink.gif
 mode change 100644 => 100755 include/tiny_mce/plugins/emotions/img/smiley-yell.gif
 mode change 100644 => 100755 include/tiny_mce/plugins/emotions/js/emotions.js
 mode change 100644 => 100755 include/tiny_mce/plugins/emotions/langs/de_dlg.js
 mode change 100644 => 100755 include/tiny_mce/plugins/emotions/langs/en_dlg.js
 mode change 100644 => 100755 include/tiny_mce/plugins/example/dialog.htm
 mode change 100644 => 100755 include/tiny_mce/plugins/example/editor_plugin.js
 mode change 100644 => 100755 include/tiny_mce/plugins/example/editor_plugin_src.js
 mode change 100644 => 100755 include/tiny_mce/plugins/example/img/example.gif
 mode change 100644 => 100755 include/tiny_mce/plugins/example/js/dialog.js
 mode change 100644 => 100755 include/tiny_mce/plugins/example/langs/en.js
 mode change 100644 => 100755 include/tiny_mce/plugins/example/langs/en_dlg.js
 mode change 100644 => 100755 include/tiny_mce/plugins/fullpage/css/fullpage.css
 mode change 100644 => 100755 include/tiny_mce/plugins/fullpage/editor_plugin.js
 mode change 100644 => 100755 include/tiny_mce/plugins/fullpage/editor_plugin_src.js
 mode change 100644 => 100755 include/tiny_mce/plugins/fullpage/fullpage.htm
 mode change 100644 => 100755 include/tiny_mce/plugins/fullpage/js/fullpage.js
 mode change 100644 => 100755 include/tiny_mce/plugins/fullpage/langs/de_dlg.js
 mode change 100644 => 100755 include/tiny_mce/plugins/fullpage/langs/en_dlg.js
 mode change 100644 => 100755 include/tiny_mce/plugins/fullscreen/editor_plugin.js
 mode change 100644 => 100755 include/tiny_mce/plugins/fullscreen/editor_plugin_src.js
 mode change 100644 => 100755 include/tiny_mce/plugins/fullscreen/fullscreen.htm
 mode change 100644 => 100755 include/tiny_mce/plugins/iespell/editor_plugin.js
 mode change 100644 => 100755 include/tiny_mce/plugins/iespell/editor_plugin_src.js
 mode change 100644 => 100755 include/tiny_mce/plugins/inlinepopups/editor_plugin.js
 mode change 100644 => 100755 include/tiny_mce/plugins/inlinepopups/editor_plugin_src.js
 mode change 100644 => 100755 include/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif
 mode change 100644 => 100755 include/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/button.gif
 mode change 100644 => 100755 include/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif
 mode change 100644 => 100755 include/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif
 mode change 100644 => 100755 include/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif
 mode change 100644 => 100755 include/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif
 mode change 100644 => 100755 include/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif
 mode change 100644 => 100755 include/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.css
 mode change 100644 => 100755 include/tiny_mce/plugins/inlinepopups/template.htm
 mode change 100644 => 100755 include/tiny_mce/plugins/insertdatetime/editor_plugin.js
 mode change 100644 => 100755 include/tiny_mce/plugins/insertdatetime/editor_plugin_src.js
 mode change 100644 => 100755 include/tiny_mce/plugins/layer/editor_plugin.js
 mode change 100644 => 100755 include/tiny_mce/plugins/layer/editor_plugin_src.js
 mode change 100644 => 100755 include/tiny_mce/plugins/legacyoutput/editor_plugin.js
 mode change 100644 => 100755 include/tiny_mce/plugins/legacyoutput/editor_plugin_src.js
 mode change 100644 => 100755 include/tiny_mce/plugins/media/css/media.css
 mode change 100644 => 100755 include/tiny_mce/plugins/media/editor_plugin.js
 mode change 100644 => 100755 include/tiny_mce/plugins/media/editor_plugin_src.js
 mode change 100644 => 100755 include/tiny_mce/plugins/media/js/embed.js
 mode change 100644 => 100755 include/tiny_mce/plugins/media/js/media.js
 mode change 100644 => 100755 include/tiny_mce/plugins/media/langs/de_dlg.js
 mode change 100644 => 100755 include/tiny_mce/plugins/media/langs/en_dlg.js
 mode change 100644 => 100755 include/tiny_mce/plugins/media/media.htm
 mode change 100644 => 100755 include/tiny_mce/plugins/media/moxieplayer.swf
 mode change 100644 => 100755 include/tiny_mce/plugins/nonbreaking/editor_plugin.js
 mode change 100644 => 100755 include/tiny_mce/plugins/nonbreaking/editor_plugin_src.js
 mode change 100644 => 100755 include/tiny_mce/plugins/noneditable/editor_plugin.js
 mode change 100644 => 100755 include/tiny_mce/plugins/noneditable/editor_plugin_src.js
 mode change 100644 => 100755 include/tiny_mce/plugins/pagebreak/editor_plugin.js
 mode change 100644 => 100755 include/tiny_mce/plugins/pagebreak/editor_plugin_src.js
 mode change 100644 => 100755 include/tiny_mce/plugins/paste/editor_plugin.js
 mode change 100644 => 100755 include/tiny_mce/plugins/paste/editor_plugin_src.js
 mode change 100644 => 100755 include/tiny_mce/plugins/paste/js/pastetext.js
 mode change 100644 => 100755 include/tiny_mce/plugins/paste/js/pasteword.js
 mode change 100644 => 100755 include/tiny_mce/plugins/paste/langs/de_dlg.js
 mode change 100644 => 100755 include/tiny_mce/plugins/paste/langs/en_dlg.js
 mode change 100644 => 100755 include/tiny_mce/plugins/paste/pastetext.htm
 mode change 100644 => 100755 include/tiny_mce/plugins/paste/pasteword.htm
 mode change 100644 => 100755 include/tiny_mce/plugins/preview/editor_plugin.js
 mode change 100644 => 100755 include/tiny_mce/plugins/preview/editor_plugin_src.js
 mode change 100644 => 100755 include/tiny_mce/plugins/preview/example.html
 mode change 100644 => 100755 include/tiny_mce/plugins/preview/jscripts/embed.js
 mode change 100644 => 100755 include/tiny_mce/plugins/preview/preview.html
 mode change 100644 => 100755 include/tiny_mce/plugins/print/editor_plugin.js
 mode change 100644 => 100755 include/tiny_mce/plugins/print/editor_plugin_src.js
 mode change 100644 => 100755 include/tiny_mce/plugins/save/editor_plugin.js
 mode change 100644 => 100755 include/tiny_mce/plugins/save/editor_plugin_src.js
 mode change 100644 => 100755 include/tiny_mce/plugins/searchreplace/css/searchreplace.css
 mode change 100644 => 100755 include/tiny_mce/plugins/searchreplace/editor_plugin.js
 mode change 100644 => 100755 include/tiny_mce/plugins/searchreplace/editor_plugin_src.js
 mode change 100644 => 100755 include/tiny_mce/plugins/searchreplace/js/searchreplace.js
 mode change 100644 => 100755 include/tiny_mce/plugins/searchreplace/langs/de_dlg.js
 mode change 100644 => 100755 include/tiny_mce/plugins/searchreplace/langs/en_dlg.js
 mode change 100644 => 100755 include/tiny_mce/plugins/searchreplace/searchreplace.htm
 mode change 100644 => 100755 include/tiny_mce/plugins/spellchecker/css/content.css
 mode change 100644 => 100755 include/tiny_mce/plugins/spellchecker/editor_plugin.js
 mode change 100644 => 100755 include/tiny_mce/plugins/spellchecker/editor_plugin_src.js
 mode change 100644 => 100755 include/tiny_mce/plugins/spellchecker/img/wline.gif
 mode change 100644 => 100755 include/tiny_mce/plugins/style/css/props.css
 mode change 100644 => 100755 include/tiny_mce/plugins/style/editor_plugin.js
 mode change 100644 => 100755 include/tiny_mce/plugins/style/editor_plugin_src.js
 mode change 100644 => 100755 include/tiny_mce/plugins/style/js/props.js
 mode change 100644 => 100755 include/tiny_mce/plugins/style/langs/de_dlg.js
 mode change 100644 => 100755 include/tiny_mce/plugins/style/langs/en_dlg.js
 mode change 100644 => 100755 include/tiny_mce/plugins/style/props.htm
 mode change 100644 => 100755 include/tiny_mce/plugins/tabfocus/editor_plugin.js
 mode change 100644 => 100755 include/tiny_mce/plugins/tabfocus/editor_plugin_src.js
 mode change 100644 => 100755 include/tiny_mce/plugins/table/cell.htm
 mode change 100644 => 100755 include/tiny_mce/plugins/table/css/cell.css
 mode change 100644 => 100755 include/tiny_mce/plugins/table/css/row.css
 mode change 100644 => 100755 include/tiny_mce/plugins/table/css/table.css
 mode change 100644 => 100755 include/tiny_mce/plugins/table/editor_plugin.js
 mode change 100644 => 100755 include/tiny_mce/plugins/table/editor_plugin_src.js
 mode change 100644 => 100755 include/tiny_mce/plugins/table/js/cell.js
 mode change 100644 => 100755 include/tiny_mce/plugins/table/js/merge_cells.js
 mode change 100644 => 100755 include/tiny_mce/plugins/table/js/row.js
 mode change 100644 => 100755 include/tiny_mce/plugins/table/js/table.js
 mode change 100644 => 100755 include/tiny_mce/plugins/table/langs/de_dlg.js
 mode change 100644 => 100755 include/tiny_mce/plugins/table/langs/en_dlg.js
 mode change 100644 => 100755 include/tiny_mce/plugins/table/merge_cells.htm
 mode change 100644 => 100755 include/tiny_mce/plugins/table/row.htm
 mode change 100644 => 100755 include/tiny_mce/plugins/table/table.htm
 mode change 100644 => 100755 include/tiny_mce/plugins/template/blank.htm
 mode change 100644 => 100755 include/tiny_mce/plugins/template/css/template.css
 mode change 100644 => 100755 include/tiny_mce/plugins/template/editor_plugin.js
 mode change 100644 => 100755 include/tiny_mce/plugins/template/editor_plugin_src.js
 mode change 100644 => 100755 include/tiny_mce/plugins/template/js/template.js
 mode change 100644 => 100755 include/tiny_mce/plugins/template/langs/de_dlg.js
 mode change 100644 => 100755 include/tiny_mce/plugins/template/langs/en_dlg.js
 mode change 100644 => 100755 include/tiny_mce/plugins/template/template.htm
 mode change 100644 => 100755 include/tiny_mce/plugins/visualchars/editor_plugin.js
 mode change 100644 => 100755 include/tiny_mce/plugins/visualchars/editor_plugin_src.js
 mode change 100644 => 100755 include/tiny_mce/plugins/wordc/langs/de_dlg.js
 mode change 100644 => 100755 include/tiny_mce/plugins/wordc/langs/en_dlg.js
 mode change 100644 => 100755 include/tiny_mce/plugins/wordcount/editor_plugin.js
 mode change 100644 => 100755 include/tiny_mce/plugins/wordcount/editor_plugin_src.js
 mode change 100644 => 100755 include/tiny_mce/plugins/xhtmlxtras/abbr.htm
 mode change 100644 => 100755 include/tiny_mce/plugins/xhtmlxtras/acronym.htm
 mode change 100644 => 100755 include/tiny_mce/plugins/xhtmlxtras/attributes.htm
 mode change 100644 => 100755 include/tiny_mce/plugins/xhtmlxtras/cite.htm
 mode change 100644 => 100755 include/tiny_mce/plugins/xhtmlxtras/css/attributes.css
 mode change 100644 => 100755 include/tiny_mce/plugins/xhtmlxtras/css/popup.css
 mode change 100644 => 100755 include/tiny_mce/plugins/xhtmlxtras/del.htm
 mode change 100644 => 100755 include/tiny_mce/plugins/xhtmlxtras/editor_plugin.js
 mode change 100644 => 100755 include/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js
 mode change 100644 => 100755 include/tiny_mce/plugins/xhtmlxtras/ins.htm
 mode change 100644 => 100755 include/tiny_mce/plugins/xhtmlxtras/js/abbr.js
 mode change 100644 => 100755 include/tiny_mce/plugins/xhtmlxtras/js/acronym.js
 mode change 100644 => 100755 include/tiny_mce/plugins/xhtmlxtras/js/attributes.js
 mode change 100644 => 100755 include/tiny_mce/plugins/xhtmlxtras/js/cite.js
 mode change 100644 => 100755 include/tiny_mce/plugins/xhtmlxtras/js/del.js
 mode change 100644 => 100755 include/tiny_mce/plugins/xhtmlxtras/js/element_common.js
 mode change 100644 => 100755 include/tiny_mce/plugins/xhtmlxtras/js/ins.js
 mode change 100644 => 100755 include/tiny_mce/plugins/xhtmlxtras/langs/de_dlg.js
 mode change 100644 => 100755 include/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js
 mode change 100644 => 100755 include/tiny_mce/themes/advanced/about.htm
 mode change 100644 => 100755 include/tiny_mce/themes/advanced/anchor.htm
 mode change 100644 => 100755 include/tiny_mce/themes/advanced/charmap.htm
 mode change 100644 => 100755 include/tiny_mce/themes/advanced/color_picker.htm
 mode change 100644 => 100755 include/tiny_mce/themes/advanced/editor_template.js
 mode change 100644 => 100755 include/tiny_mce/themes/advanced/editor_template_src.js
 mode change 100644 => 100755 include/tiny_mce/themes/advanced/image.htm
 mode change 100644 => 100755 include/tiny_mce/themes/advanced/img/colorpicker.jpg
 mode change 100644 => 100755 include/tiny_mce/themes/advanced/img/flash.gif
 mode change 100644 => 100755 include/tiny_mce/themes/advanced/img/icons.gif
 mode change 100644 => 100755 include/tiny_mce/themes/advanced/img/iframe.gif
 mode change 100644 => 100755 include/tiny_mce/themes/advanced/img/pagebreak.gif
 mode change 100644 => 100755 include/tiny_mce/themes/advanced/img/quicktime.gif
 mode change 100644 => 100755 include/tiny_mce/themes/advanced/img/realmedia.gif
 mode change 100644 => 100755 include/tiny_mce/themes/advanced/img/shockwave.gif
 mode change 100644 => 100755 include/tiny_mce/themes/advanced/img/trans.gif
 mode change 100644 => 100755 include/tiny_mce/themes/advanced/img/video.gif
 mode change 100644 => 100755 include/tiny_mce/themes/advanced/img/windowsmedia.gif
 mode change 100644 => 100755 include/tiny_mce/themes/advanced/js/about.js
 mode change 100644 => 100755 include/tiny_mce/themes/advanced/js/anchor.js
 mode change 100644 => 100755 include/tiny_mce/themes/advanced/js/charmap.js
 mode change 100644 => 100755 include/tiny_mce/themes/advanced/js/color_picker.js
 mode change 100644 => 100755 include/tiny_mce/themes/advanced/js/image.js
 mode change 100644 => 100755 include/tiny_mce/themes/advanced/js/link.js
 mode change 100644 => 100755 include/tiny_mce/themes/advanced/js/source_editor.js
 mode change 100644 => 100755 include/tiny_mce/themes/advanced/langs/de.js
 mode change 100644 => 100755 include/tiny_mce/themes/advanced/langs/de_dlg.js
 mode change 100644 => 100755 include/tiny_mce/themes/advanced/langs/en.js
 mode change 100644 => 100755 include/tiny_mce/themes/advanced/langs/en_dlg.js
 mode change 100644 => 100755 include/tiny_mce/themes/advanced/link.htm
 mode change 100644 => 100755 include/tiny_mce/themes/advanced/shortcuts.htm
 mode change 100644 => 100755 include/tiny_mce/themes/advanced/skins/default/content.css
 mode change 100644 => 100755 include/tiny_mce/themes/advanced/skins/default/dialog.css
 mode change 100644 => 100755 include/tiny_mce/themes/advanced/skins/default/img/buttons.png
 mode change 100644 => 100755 include/tiny_mce/themes/advanced/skins/default/img/items.gif
 mode change 100644 => 100755 include/tiny_mce/themes/advanced/skins/default/img/menu_arrow.gif
 mode change 100644 => 100755 include/tiny_mce/themes/advanced/skins/default/img/menu_check.gif
 mode change 100644 => 100755 include/tiny_mce/themes/advanced/skins/default/img/progress.gif
 mode change 100644 => 100755 include/tiny_mce/themes/advanced/skins/default/img/tabs.gif
 mode change 100644 => 100755 include/tiny_mce/themes/advanced/skins/default/ui.css
 mode change 100644 => 100755 include/tiny_mce/themes/advanced/skins/highcontrast/content.css
 mode change 100644 => 100755 include/tiny_mce/themes/advanced/skins/highcontrast/dialog.css
 mode change 100644 => 100755 include/tiny_mce/themes/advanced/skins/highcontrast/ui.css
 mode change 100644 => 100755 include/tiny_mce/themes/advanced/skins/o2k7/content.css
 mode change 100644 => 100755 include/tiny_mce/themes/advanced/skins/o2k7/dialog.css
 mode change 100644 => 100755 include/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png
 mode change 100644 => 100755 include/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_black.png
 mode change 100644 => 100755 include/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_silver.png
 mode change 100644 => 100755 include/tiny_mce/themes/advanced/skins/o2k7/ui.css
 mode change 100644 => 100755 include/tiny_mce/themes/advanced/skins/o2k7/ui_black.css
 mode change 100644 => 100755 include/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css
 mode change 100644 => 100755 include/tiny_mce/themes/advanced/source_editor.htm
 mode change 100644 => 100755 include/tiny_mce/themes/simple/editor_template.js
 mode change 100644 => 100755 include/tiny_mce/themes/simple/editor_template_src.js
 mode change 100644 => 100755 include/tiny_mce/themes/simple/img/icons.gif
 mode change 100644 => 100755 include/tiny_mce/themes/simple/langs/de.js
 mode change 100644 => 100755 include/tiny_mce/themes/simple/langs/en.js
 mode change 100644 => 100755 include/tiny_mce/themes/simple/skins/default/content.css
 mode change 100644 => 100755 include/tiny_mce/themes/simple/skins/default/ui.css
 mode change 100644 => 100755 include/tiny_mce/themes/simple/skins/o2k7/content.css
 mode change 100644 => 100755 include/tiny_mce/themes/simple/skins/o2k7/img/button_bg.png
 mode change 100644 => 100755 include/tiny_mce/themes/simple/skins/o2k7/ui.css
 mode change 100644 => 100755 include/tiny_mce/tiny_mce.js
 mode change 100644 => 100755 include/tiny_mce/tiny_mce_popup.js
 mode change 100644 => 100755 include/tiny_mce/tiny_mce_src.js
 mode change 100644 => 100755 include/tiny_mce/utils/editable_selects.js
 mode change 100644 => 100755 include/tiny_mce/utils/form_utils.js
 mode change 100644 => 100755 include/tiny_mce/utils/mctabs.js
 mode change 100644 => 100755 include/tiny_mce/utils/validate.js
 mode change 100644 => 100755 include/tw/abgabe_lektor_benotung.php
 mode change 100644 => 100755 include/tw/cis_menu_lv.inc.php
 mode change 100644 => 100755 include/tw/fas_zusatzmenues.inc.php
 mode change 100644 => 100755 include/tw/fas_zusatzmenues.js.php
 mode change 100644 => 100755 include/tw/generateZahlungsreferenz.inc.php
 mode change 100644 => 100755 include/tw/generatematrikelnr.inc.php
 mode change 100644 => 100755 include/tw/generateuid.inc.php
 mode change 100644 => 100755 include/tw/index.html
 mode change 100644 => 100755 include/tw/passwort.inc.php
 mode change 100644 => 100755 include/tw/serviceterminal.inc.php
 mode change 100644 => 100755 include/tw/vilesci_menu_main.inc.php
 mode change 100644 => 100755 include/tw/wawi_menu_main.inc.php
 mode change 100644 => 100755 include/udf.class.php
 mode change 100644 => 100755 include/uebung.class.php
 mode change 100644 => 100755 include/variable.class.php
 mode change 100644 => 100755 include/vendor_custom/angular-tablesorter/tablesort.css
 mode change 100644 => 100755 include/vendor_custom/easyui/easyui.css
 mode change 100644 => 100755 include/vendor_custom/easyui/icon.css
 mode change 100644 => 100755 include/vendor_custom/jquery-tablesorter/tablesort.css
 mode change 100644 => 100755 include/vertrag.class.php
 mode change 100644 => 100755 include/vorlage.class.php
 mode change 100644 => 100755 include/vorschlag.class.php
 mode change 100644 => 100755 include/wawi_aufteilung.class.php
 mode change 100644 => 100755 include/wawi_bestelldetail.class.php
 mode change 100644 => 100755 include/wawi_bestellstatus.class.php
 mode change 100644 => 100755 include/wawi_bestellung.class.php
 mode change 100644 => 100755 include/wawi_konto.class.php
 mode change 100644 => 100755 include/wawi_kostenstelle.class.php
 mode change 100644 => 100755 include/wawi_rechnung.class.php
 mode change 100644 => 100755 include/wawi_zahlungstyp.class.php
 mode change 100644 => 100755 include/webservicelog.class.php
 mode change 100644 => 100755 include/webservicerecht.class.php
 mode change 100644 => 100755 include/wochenplan.class.php
 mode change 100644 => 100755 include/xmlrpcutils/utils.php
 mode change 100644 => 100755 include/xsdformprinter/config.inc.php
 mode change 100644 => 100755 include/xsdformprinter/examples/shiporder.xml
 mode change 100644 => 100755 include/xsdformprinter/examples/shiporder1.xsd
 mode change 100644 => 100755 include/xsdformprinter/examples/shiporder2.xsd
 mode change 100644 => 100755 include/xsdformprinter/style.css
 mode change 100644 => 100755 include/xsdformprinter/types.php
 mode change 100644 => 100755 include/xsdformprinter/xfp.php
 mode change 100644 => 100755 include/xsdformprinter/xsdformprinter.php
 mode change 100644 => 100755 include/zeitaufzeichnung.class.php
 mode change 100644 => 100755 include/zeitaufzeichnung_gd.class.php
 mode change 100644 => 100755 include/zeitaufzeichnung_import.class.php
 mode change 100644 => 100755 include/zeitaufzeichnung_import_csv.class.php
 mode change 100644 => 100755 include/zeitaufzeichnung_import_post.class.php
 mode change 100644 => 100755 include/zeitsperre.class.php
 mode change 100644 => 100755 include/zeitwunsch.class.php
 mode change 100644 => 100755 include/zeitwunsch_gueltigkeit.class.php
 mode change 100644 => 100755 include/zeugnisnote.class.php
 mode change 100644 => 100755 include/zgv.class.php
 mode change 100644 => 100755 include/zweck.class.php
 mode change 100644 => 100755 index.ci.php
 mode change 100644 => 100755 index.cis.html
 mode change 100644 => 100755 index.vilesci.php
 mode change 100644 => 100755 locale/contents.rdf
 mode change 100644 => 100755 locale/de-AT/abgabetool.php
 mode change 100644 => 100755 locale/de-AT/anwesenheitsliste.php
 mode change 100644 => 100755 locale/de-AT/benotungstool.php
 mode change 100644 => 100755 locale/de-AT/buchungen.php
 mode change 100644 => 100755 locale/de-AT/contents.rdf
 mode change 100644 => 100755 locale/de-AT/coodle.php
 mode change 100644 => 100755 locale/de-AT/courseInformation.php
 mode change 100644 => 100755 locale/de-AT/dms_link.php
 mode change 100644 => 100755 locale/de-AT/errors.php
 mode change 100644 => 100755 locale/de-AT/eventkalender.php
 mode change 100644 => 100755 locale/de-AT/fas.dtd
 mode change 100644 => 100755 locale/de-AT/feedback.php
 mode change 100644 => 100755 locale/de-AT/freebusy.php
 mode change 100644 => 100755 locale/de-AT/freifach.php
 mode change 100644 => 100755 locale/de-AT/gesamtnote.php
 mode change 100644 => 100755 locale/de-AT/global.php
 mode change 100644 => 100755 locale/de-AT/incoming.php
 mode change 100644 => 100755 locale/de-AT/ktu.php
 mode change 100644 => 100755 locale/de-AT/lehre.php
 mode change 100644 => 100755 locale/de-AT/lehrveranstaltung.php
 mode change 100644 => 100755 locale/de-AT/lvaliste.php
 mode change 100644 => 100755 locale/de-AT/lvinfo.php
 mode change 100644 => 100755 locale/de-AT/lvplan.php
 mode change 100644 => 100755 locale/de-AT/mail.php
 mode change 100644 => 100755 locale/de-AT/mailverteiler.php
 mode change 100644 => 100755 locale/de-AT/menu.php
 mode change 100644 => 100755 locale/de-AT/news.php
 mode change 100644 => 100755 locale/de-AT/notebookregister.php
 mode change 100644 => 100755 locale/de-AT/notfallbestimmungen.php
 mode change 100644 => 100755 locale/de-AT/passwort.php
 mode change 100644 => 100755 locale/de-AT/personensuche.php
 mode change 100644 => 100755 locale/de-AT/planner.dtd
 mode change 100644 => 100755 locale/de-AT/profil.php
 mode change 100644 => 100755 locale/de-AT/pruefung.php
 mode change 100644 => 100755 locale/de-AT/reihungstest.php
 mode change 100644 => 100755 locale/de-AT/semesterplan.php
 mode change 100644 => 100755 locale/de-AT/services.php
 mode change 100644 => 100755 locale/de-AT/studienplan.php
 mode change 100644 => 100755 locale/de-AT/studierendenantrag.php
 mode change 100644 => 100755 locale/de-AT/telefonverzeichnis.php
 mode change 100644 => 100755 locale/de-AT/tempus.dtd
 mode change 100644 => 100755 locale/de-AT/testtool.php
 mode change 100644 => 100755 locale/de-AT/tools.php
 mode change 100644 => 100755 locale/de-AT/upload.php
 mode change 100644 => 100755 locale/de-AT/urlaubstool.php
 mode change 100644 => 100755 locale/de-AT/zeitaufzeichnung.php
 mode change 100644 => 100755 locale/de-AT/zeitsperre.php
 mode change 100644 => 100755 locale/de-AT/zeitwunsch.php
 mode change 100644 => 100755 locale/de-SFU/contents.rdf
 mode change 100644 => 100755 locale/de-SFU/fas.dtd
 mode change 100644 => 100755 locale/de-SFU/planner.dtd
 mode change 100644 => 100755 locale/de-SFU/tempus.dtd
 mode change 100644 => 100755 locale/en-US/abgabetool.php
 mode change 100644 => 100755 locale/en-US/anwesenheitsliste.php
 mode change 100644 => 100755 locale/en-US/benotungstool.php
 mode change 100644 => 100755 locale/en-US/contents.rdf
 mode change 100644 => 100755 locale/en-US/coodle.php
 mode change 100644 => 100755 locale/en-US/courseInformation.php
 mode change 100644 => 100755 locale/en-US/dms_link.php
 mode change 100644 => 100755 locale/en-US/errors.php
 mode change 100644 => 100755 locale/en-US/eventkalender.php
 mode change 100644 => 100755 locale/en-US/feedback.php
 mode change 100644 => 100755 locale/en-US/freebusy.php
 mode change 100644 => 100755 locale/en-US/freifach.php
 mode change 100644 => 100755 locale/en-US/gesamtnote.php
 mode change 100644 => 100755 locale/en-US/global.php
 mode change 100644 => 100755 locale/en-US/incoming.php
 mode change 100644 => 100755 locale/en-US/lehre.php
 mode change 100644 => 100755 locale/en-US/lvaliste.php
 mode change 100644 => 100755 locale/en-US/lvinfo.php
 mode change 100644 => 100755 locale/en-US/lvplan.php
 mode change 100644 => 100755 locale/en-US/mail.php
 mode change 100644 => 100755 locale/en-US/mailverteiler.php
 mode change 100644 => 100755 locale/en-US/menu.php
 mode change 100644 => 100755 locale/en-US/news.php
 mode change 100644 => 100755 locale/en-US/notebookregister.php
 mode change 100644 => 100755 locale/en-US/notfallbestimmungen.php
 mode change 100644 => 100755 locale/en-US/passwort.php
 mode change 100644 => 100755 locale/en-US/personensuche.php
 mode change 100644 => 100755 locale/en-US/profil.php
 mode change 100644 => 100755 locale/en-US/pruefung.php
 mode change 100644 => 100755 locale/en-US/reihungstest.php
 mode change 100644 => 100755 locale/en-US/semesterplan.php
 mode change 100644 => 100755 locale/en-US/services.php
 mode change 100644 => 100755 locale/en-US/studierendenantrag.php
 mode change 100644 => 100755 locale/en-US/telefonverzeichnis.php
 mode change 100644 => 100755 locale/en-US/tempus.dtd
 mode change 100644 => 100755 locale/en-US/testtool.php
 mode change 100644 => 100755 locale/en-US/tools.php
 mode change 100644 => 100755 locale/en-US/upload.php
 mode change 100644 => 100755 locale/en-US/urlaubstool.php
 mode change 100644 => 100755 locale/en-US/zeitaufzeichnung.php
 mode change 100644 => 100755 locale/en-US/zeitsperre.php
 mode change 100644 => 100755 locale/en-US/zeitwunsch.php
 mode change 100644 => 100755 locale/it-IT/abgabetool.php
 mode change 100644 => 100755 locale/it-IT/anwesenheitsliste.php
 mode change 100644 => 100755 locale/it-IT/benotungstool.php
 mode change 100644 => 100755 locale/it-IT/buchungen.php
 mode change 100644 => 100755 locale/it-IT/coodle.php
 mode change 100644 => 100755 locale/it-IT/courseInformation.php
 mode change 100644 => 100755 locale/it-IT/dms_link.php
 mode change 100644 => 100755 locale/it-IT/errors.php
 mode change 100644 => 100755 locale/it-IT/eventkalender.php
 mode change 100644 => 100755 locale/it-IT/feedback.php
 mode change 100644 => 100755 locale/it-IT/freebusy.php
 mode change 100644 => 100755 locale/it-IT/freifach.php
 mode change 100644 => 100755 locale/it-IT/gesamtnote.php
 mode change 100644 => 100755 locale/it-IT/global.php
 mode change 100644 => 100755 locale/it-IT/incoming.php
 mode change 100644 => 100755 locale/it-IT/lehre.php
 mode change 100644 => 100755 locale/it-IT/lvaliste.php
 mode change 100644 => 100755 locale/it-IT/lvinfo.php
 mode change 100644 => 100755 locale/it-IT/lvplan.php
 mode change 100644 => 100755 locale/it-IT/mail.php
 mode change 100644 => 100755 locale/it-IT/mailverteiler.php
 mode change 100644 => 100755 locale/it-IT/menu.php
 mode change 100644 => 100755 locale/it-IT/news.php
 mode change 100644 => 100755 locale/it-IT/notebookregister.php
 mode change 100644 => 100755 locale/it-IT/notfallbestimmungen.php
 mode change 100644 => 100755 locale/it-IT/passwort.php
 mode change 100644 => 100755 locale/it-IT/personensuche.php
 mode change 100644 => 100755 locale/it-IT/profil.php
 mode change 100644 => 100755 locale/it-IT/pruefung.php
 mode change 100644 => 100755 locale/it-IT/semesterplan.php
 mode change 100644 => 100755 locale/it-IT/services.php
 mode change 100644 => 100755 locale/it-IT/studienplan.php
 mode change 100644 => 100755 locale/it-IT/telefonverzeichnis.php
 mode change 100644 => 100755 locale/it-IT/testtool.php
 mode change 100644 => 100755 locale/it-IT/tools.php
 mode change 100644 => 100755 locale/it-IT/upload.php
 mode change 100644 => 100755 locale/it-IT/urlaubstool.php
 mode change 100644 => 100755 locale/it-IT/zeitaufzeichnung.php
 mode change 100644 => 100755 locale/it-IT/zeitsperre.php
 mode change 100644 => 100755 locale/it-IT/zeitwunsch.php
 mode change 100644 => 100755 public/css/AjaxLib.css
 mode change 100644 => 100755 public/css/Cis4/Cis.css
 mode change 100644 => 100755 public/css/Cis4/Cms.css
 mode change 100644 => 100755 public/css/Cis4/Legacy.css
 mode change 100644 => 100755 public/css/DialogLib.css
 mode change 100644 => 100755 public/css/Fhc.css
 mode change 100644 => 100755 public/css/FilterWidget.css
 mode change 100644 => 100755 public/css/Login.css
 mode change 100644 => 100755 public/css/NavigationWidget.css
 mode change 100644 => 100755 public/css/Tabulator.css
 mode change 100644 => 100755 public/css/Tabulator5.css
 mode change 100644 => 100755 public/css/TinyMCE5.css
 mode change 100644 => 100755 public/css/Widgets.css
 mode change 100644 => 100755 public/css/cis4.css
 mode change 100644 => 100755 public/css/cis_bs5.css
 mode change 100644 => 100755 public/css/codex/oehbeitrag.css
 mode change 100644 => 100755 public/css/codex/uhstat1.css
 mode change 100644 => 100755 public/css/components/FilterComponent.css
 mode change 100644 => 100755 public/css/components/FormUnderline.css
 mode change 100644 => 100755 public/css/components/NavigationComponent.css
 mode change 100644 => 100755 public/css/components/Profil.css
 mode change 100644 => 100755 public/css/components/calendar.css
 mode change 100644 => 100755 public/css/components/dashboard.css
 mode change 100644 => 100755 public/css/components/searchbar.css
 mode change 100644 => 100755 public/css/components/verticalsplit.css
 mode change 100644 => 100755 public/css/fhcomplete.css
 mode change 100644 => 100755 public/css/infocenter/infocenterDetails.css
 mode change 100644 => 100755 public/css/infocenter/infocenterPersonDataset.css
 mode change 100644 => 100755 public/css/issues/issuesDataset.css
 mode change 100644 => 100755 public/css/issues/issuesKonfiguration.css
 mode change 100644 => 100755 public/css/issues/issuesZustaendigkeiten.css
 mode change 100644 => 100755 public/css/lehre/anrechnung.css
 mode change 100644 => 100755 public/css/lehre/pruefungsprotokoll.css
 mode change 100644 => 100755 public/css/messaging/message.css
 mode change 100644 => 100755 public/css/sbadmin2/admintemplate.css
 mode change 100644 => 100755 public/css/sbadmin2/admintemplate_contentonly.css
 mode change 100644 => 100755 public/css/sbadmin2/tablesort_bootstrap.css
 mode change 100644 => 100755 public/css/tools/auswertung_fhtw.css
 mode change 100644 => 100755 public/css/tools/gradelist.css
 mode change 100644 => 100755 public/extensions/.placeholder
 mode change 100644 => 100755 public/images/icons/fa-user-check.png
 mode change 100644 => 100755 public/images/icons/fa-user-clock.png
 mode change 100644 => 100755 public/images/icons/fa-user-cog.png
 mode change 100644 => 100755 public/images/icons/fa-user-edit.png
 mode change 100644 => 100755 public/images/icons/fa-user-graduate.png
 mode change 100644 => 100755 public/images/icons/fa-user-lock.png
 mode change 100644 => 100755 public/images/icons/fa-user-minus.png
 mode change 100644 => 100755 public/images/icons/fa-user-ninja.png
 mode change 100644 => 100755 public/images/icons/fa-user-tag.png
 mode change 100644 => 100755 public/images/icons/fa-user-times.png
 mode change 100644 => 100755 public/images/icons/fa-users-cog.png
 mode change 100644 => 100755 public/images/loader.gif
 mode change 100644 => 100755 public/images/logo-300x160.png
 mode change 100644 => 100755 public/js/AjaxLib.js
 mode change 100644 => 100755 public/js/DialogLib.js
 mode change 100644 => 100755 public/js/FilterWidget.js
 mode change 100644 => 100755 public/js/Login.js
 mode change 100644 => 100755 public/js/NavigationWidget.js
 mode change 100644 => 100755 public/js/PhrasesLib.js
 mode change 100644 => 100755 public/js/RESTClient.js
 mode change 100644 => 100755 public/js/TableWidget.js
 mode change 100644 => 100755 public/js/UDFWidget.js
 mode change 100644 => 100755 public/js/apps/Cis.js
 mode change 100644 => 100755 public/js/apps/Cis/Cms.js
 mode change 100644 => 100755 public/js/apps/Cis/Documents.js
 mode change 100644 => 100755 public/js/apps/Cis/MyLv/Student.js
 mode change 100644 => 100755 public/js/apps/Cis/Profil.js
 mode change 100644 => 100755 public/js/apps/Cis/ProfilUpdateRequests.js
 mode change 100644 => 100755 public/js/apps/Cis/Stundenplan.js
 mode change 100644 => 100755 public/js/apps/Dashboard.js
 mode change 100644 => 100755 public/js/apps/Dashboard/Admin.js
 mode change 100644 => 100755 public/js/apps/Dashboard/Fhc.js
 mode change 100644 => 100755 public/js/apps/DashboardAdmin.js
 mode change 100644 => 100755 public/js/apps/LogsViewer/LogsViewer.js
 mode change 100644 => 100755 public/js/apps/LogsViewer/TabulatorSetup.js
 mode change 100644 => 100755 public/js/apps/TestSearch.js
 mode change 100644 => 100755 public/js/apps/api/dummyapi.php
 mode change 100644 => 100755 public/js/apps/api/fhcapifactory.js
 mode change 100644 => 100755 public/js/apps/api/profilUpdate.js
 mode change 100644 => 100755 public/js/apps/api/search.js
 mode change 100644 => 100755 public/js/apps/api/userdata.js
 mode change 100644 => 100755 public/js/apps/lehre/Antrag.js
 mode change 100644 => 100755 public/js/apps/lehre/Antrag/Leitung.js
 mode change 100644 => 100755 public/js/apps/lehre/Antrag/Lvzuweisung.js
 mode change 100644 => 100755 public/js/apps/lehre/Antrag/Student.js
 mode change 100644 => 100755 public/js/bootstrapper.js
 mode change 100644 => 100755 public/js/codex/oehbeitrag.js
 mode change 100644 => 100755 public/js/codex/uhstat1.js
 mode change 100644 => 100755 public/js/components/Base/Modal.js
 mode change 100644 => 100755 public/js/components/Base/Offcanvas.js
 mode change 100644 => 100755 public/js/components/Bootstrap/Alert.js
 mode change 100644 => 100755 public/js/components/Bootstrap/Confirm.js
 mode change 100644 => 100755 public/js/components/Bootstrap/Modal.js
 mode change 100644 => 100755 public/js/components/Bootstrap/Prompt.js
 mode change 100644 => 100755 public/js/components/Calendar/Abstract.js
 mode change 100644 => 100755 public/js/components/Calendar/Calendar.js
 mode change 100644 => 100755 public/js/components/Calendar/Header.js
 mode change 100644 => 100755 public/js/components/Calendar/Minimized.js
 mode change 100644 => 100755 public/js/components/Calendar/Month.js
 mode change 100644 => 100755 public/js/components/Calendar/Month/Page.js
 mode change 100644 => 100755 public/js/components/Calendar/Months.js
 mode change 100644 => 100755 public/js/components/Calendar/Pane.js
 mode change 100644 => 100755 public/js/components/Calendar/Week.js
 mode change 100644 => 100755 public/js/components/Calendar/Week/Page.js
 mode change 100644 => 100755 public/js/components/Calendar/Weeks.js
 mode change 100644 => 100755 public/js/components/Calendar/Years.js
 mode change 100644 => 100755 public/js/components/Calendar/Years/Page.js
 mode change 100644 => 100755 public/js/components/Cis/Menu.js
 mode change 100644 => 100755 public/js/components/Cis/Menu/Entry.js
 mode change 100644 => 100755 public/js/components/Cis/Mylv/Semester.js
 mode change 100644 => 100755 public/js/components/Cis/Mylv/Semester/Studiengang.js
 mode change 100644 => 100755 public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
 mode change 100644 => 100755 public/js/components/Cis/Mylv/Semester/Studiengang/Lv/Info.js
 mode change 100644 => 100755 public/js/components/Cis/Mylv/Semester/Studiengang/Lv/Pruefungen.js
 mode change 100644 => 100755 public/js/components/Cis/Mylv/Student.js
 mode change 100644 => 100755 public/js/components/Cis/Profil/EditProfil.js
 mode change 100644 => 100755 public/js/components/Cis/Profil/EditProfilSelect.js
 mode change 100644 => 100755 public/js/components/Cis/Profil/MitarbeiterProfil.js
 mode change 100644 => 100755 public/js/components/Cis/Profil/MitarbeiterViewProfil.js
 mode change 100644 => 100755 public/js/components/Cis/Profil/ProfilComponents/Adresse.js
 mode change 100644 => 100755 public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
 mode change 100644 => 100755 public/js/components/Cis/Profil/ProfilComponents/EditKontakt.js
 mode change 100644 => 100755 public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
 mode change 100644 => 100755 public/js/components/Cis/Profil/ProfilComponents/FhAusweisStatus.js
 mode change 100644 => 100755 public/js/components/Cis/Profil/ProfilComponents/Kontakt.js
 mode change 100644 => 100755 public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js
 mode change 100644 => 100755 public/js/components/Cis/Profil/ProfilComponents/ProfilEmails.js
 mode change 100644 => 100755 public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
 mode change 100644 => 100755 public/js/components/Cis/Profil/ProfilComponents/QuickLinks.js
 mode change 100644 => 100755 public/js/components/Cis/Profil/ProfilComponents/RoleInformation.js
 mode change 100644 => 100755 public/js/components/Cis/Profil/ProfilComponents/Status.js
 mode change 100644 => 100755 public/js/components/Cis/Profil/StudentProfil.js
 mode change 100644 => 100755 public/js/components/Cis/Profil/StudentViewProfil.js
 mode change 100644 => 100755 public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
 mode change 100644 => 100755 public/js/components/Dashboard/Admin.js
 mode change 100644 => 100755 public/js/components/Dashboard/Admin/Edit.js
 mode change 100644 => 100755 public/js/components/Dashboard/Admin/Presets.js
 mode change 100644 => 100755 public/js/components/Dashboard/Admin/Widgets.js
 mode change 100644 => 100755 public/js/components/Dashboard/Dashboard.js
 mode change 100644 => 100755 public/js/components/Dashboard/Item.js
 mode change 100644 => 100755 public/js/components/Dashboard/Section.js
 mode change 100644 => 100755 public/js/components/Dashboard/Widget/Picker.js
 mode change 100644 => 100755 public/js/components/DashboardWidget/Abstract.js
 mode change 100644 => 100755 public/js/components/DashboardWidget/Ampel.js
 mode change 100644 => 100755 public/js/components/DashboardWidget/Default.js
 mode change 100644 => 100755 public/js/components/DashboardWidget/News.js
 mode change 100644 => 100755 public/js/components/DashboardWidget/Stundenplan.js
 mode change 100644 => 100755 public/js/components/DashboardWidget/Url.js
 mode change 100644 => 100755 public/js/components/Drop/Grid.js
 mode change 100644 => 100755 public/js/components/Drop/Grid/Item.js
 mode change 100644 => 100755 public/js/components/Fetch.js
 create mode 100755 public/js/components/Form/Form.js
 create mode 100755 public/js/components/Form/Input.js
 create mode 100755 public/js/components/Form/Upload/Dms.js
 create mode 100755 public/js/components/Form/Upload/Image.js
 create mode 100755 public/js/components/Form/Validation.js
 mode change 100644 => 100755 public/js/components/Loader.js
 mode change 100644 => 100755 public/js/components/Studierendenantrag/Antrag.js
 mode change 100644 => 100755 public/js/components/Studierendenantrag/Form/Abmeldung.js
 mode change 100644 => 100755 public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
 mode change 100644 => 100755 public/js/components/Studierendenantrag/Form/Unterbrechung.js
 mode change 100644 => 100755 public/js/components/Studierendenantrag/Form/Wiederholung.js
 mode change 100644 => 100755 public/js/components/Studierendenantrag/Infoblock.js
 mode change 100644 => 100755 public/js/components/Studierendenantrag/Leitung.js
 mode change 100644 => 100755 public/js/components/Studierendenantrag/Leitung/Actions.js
 mode change 100644 => 100755 public/js/components/Studierendenantrag/Leitung/Actions/Columns.js
 mode change 100644 => 100755 public/js/components/Studierendenantrag/Leitung/Actions/New.js
 mode change 100644 => 100755 public/js/components/Studierendenantrag/Leitung/GrundPopup.js
 mode change 100644 => 100755 public/js/components/Studierendenantrag/Leitung/Header.js
 mode change 100644 => 100755 public/js/components/Studierendenantrag/Leitung/LvPopup.js
 mode change 100644 => 100755 public/js/components/Studierendenantrag/Leitung/Table.js
 mode change 100644 => 100755 public/js/components/Studierendenantrag/Lvzuweisung.js
 mode change 100644 => 100755 public/js/components/Studierendenantrag/Status.js
 mode change 100644 => 100755 public/js/components/filter/API.js
 mode change 100644 => 100755 public/js/components/filter/Filter.js
 mode change 100644 => 100755 public/js/components/filter/Filter/Columns.js
 mode change 100644 => 100755 public/js/components/filter/Filter/Config.js
 mode change 100644 => 100755 public/js/components/filter/Table/Download.js
 mode change 100644 => 100755 public/js/components/navigation/API.js
 mode change 100644 => 100755 public/js/components/navigation/Navigation.js
 mode change 100644 => 100755 public/js/components/searchbar/action.js
 mode change 100644 => 100755 public/js/components/searchbar/actions.js
 mode change 100644 => 100755 public/js/components/searchbar/employee.js
 mode change 100644 => 100755 public/js/components/searchbar/organisationunit.js
 mode change 100644 => 100755 public/js/components/searchbar/person.js
 mode change 100644 => 100755 public/js/components/searchbar/raum.js
 mode change 100644 => 100755 public/js/components/searchbar/searchbar.js
 mode change 100644 => 100755 public/js/components/verticalsplit/verticalsplit.js
 mode change 100644 => 100755 public/js/components/vueDatepicker.js.php
 mode change 100644 => 100755 public/js/composables/CalendarDate.js
 mode change 100644 => 100755 public/js/composables/Dashboard/CachedWidgetLoader.js
 mode change 100644 => 100755 public/js/composables/GridLogic.js
 mode change 100644 => 100755 public/js/composables/ObjectUtils.js
 mode change 100644 => 100755 public/js/infocenter/docUeberpruefung.js
 mode change 100644 => 100755 public/js/infocenter/infocenterDetails.js
 mode change 100644 => 100755 public/js/infocenter/infocenterPersonDataset.js
 mode change 100644 => 100755 public/js/infocenter/messageList.js
 mode change 100644 => 100755 public/js/infocenter/rueckstellung.js
 mode change 100644 => 100755 public/js/infocenter/stammdaten.js
 mode change 100644 => 100755 public/js/infocenter/zgvUeberpruefung.js
 mode change 100644 => 100755 public/js/issues/issuesDataset.js
 mode change 100644 => 100755 public/js/issues/issuesKonfiguration.js
 mode change 100644 => 100755 public/js/issues/issuesZustaendigkeiten.js
 mode change 100644 => 100755 public/js/issues/plausichecks.js
 mode change 100644 => 100755 public/js/lehre/anrechnung/adminAnrechnung.js
 mode change 100644 => 100755 public/js/lehre/anrechnung/approveAnrechnungDetail.js
 mode change 100644 => 100755 public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
 mode change 100644 => 100755 public/js/lehre/anrechnung/createAnrechnung.js
 mode change 100644 => 100755 public/js/lehre/anrechnung/requestAnrechnung.js
 mode change 100644 => 100755 public/js/lehre/anrechnung/reviewAnrechnungDetail.js
 mode change 100644 => 100755 public/js/lehre/anrechnung/reviewAnrechnungUebersicht.js
 mode change 100644 => 100755 public/js/lehre/lehrauftrag/acceptLehrauftrag.js
 mode change 100644 => 100755 public/js/lehre/lehrauftrag/approveLehrauftrag.js
 mode change 100644 => 100755 public/js/lehre/lehrauftrag/orderLehrauftrag.js
 mode change 100644 => 100755 public/js/lehre/lvplanung/zverfueg.js
 mode change 100644 => 100755 public/js/lehre/pruefungsprotokoll.js
 mode change 100644 => 100755 public/js/messaging/fasMessageWrite.js
 mode change 100644 => 100755 public/js/messaging/messageWrite.js
 mode change 100644 => 100755 public/js/messaging/messageWriteReply.js
 mode change 100644 => 100755 public/js/messaging/read.js
 mode change 100644 => 100755 public/js/messaging/write.js
 mode change 100644 => 100755 public/js/messaging/writeReply.js
 mode change 100644 => 100755 public/js/mixins/Phrasen.js
 mode change 100644 => 100755 public/js/person/benutzergruppe.js
 mode change 100644 => 100755 public/js/pivottable/pivot.de.js
 mode change 100644 => 100755 public/js/plugin/Phrasen.js
 mode change 100644 => 100755 public/js/tablesort/tablesort.js
 mode change 100644 => 100755 public/js/tabulator/filters/Dates.js
 mode change 100644 => 100755 public/media/.placeholder
 mode change 100644 => 100755 rdf/AntragAbmeldung.xml.php
 mode change 100644 => 100755 rdf/AntragAbmeldungStgl.xml.php
 mode change 100644 => 100755 rdf/AntragUnterbrechung.xml.php
 mode change 100644 => 100755 rdf/PHPRequest.txt
 mode change 100644 => 100755 rdf/abschlussbeurteilung.rdf.php
 mode change 100644 => 100755 rdf/abschlusspruefung.rdf.php
 mode change 100644 => 100755 rdf/abschlusspruefung_antritt.rdf.php
 mode change 100644 => 100755 rdf/accountinfoblatt.xml.php
 mode change 100644 => 100755 rdf/adresse.rdf.php
 mode change 100644 => 100755 rdf/adressentyp.rdf.php
 mode change 100644 => 100755 rdf/akadgrad.rdf.php
 mode change 100644 => 100755 rdf/akte.rdf.php
 mode change 100644 => 100755 rdf/anrechnung.rdf.php
 mode change 100644 => 100755 rdf/anrechnungbegruendung.rdf.php
 mode change 100644 => 100755 rdf/anwesenheit.rdf.php
 mode change 100644 => 100755 rdf/anwesenheitsliste.xml.php
 mode change 100644 => 100755 rdf/anzahlAnwesenheitenStudenplan.rdf.php
 mode change 100644 => 100755 rdf/aufenthaltfoerderung.rdf.php
 mode change 100644 => 100755 rdf/aufmerksamdurch.rdf.php
 mode change 100644 => 100755 rdf/aufnahmeschluessel.rdf.php
 mode change 100644 => 100755 rdf/aufnahmetermine.rdf.php
 mode change 100644 => 100755 rdf/aufwandstyp.rdf.php
 mode change 100644 => 100755 rdf/ausbildung.rdf.php
 mode change 100644 => 100755 rdf/ausbildungsvertrag.xml.php
 mode change 100644 => 100755 rdf/bankverbindung.rdf.php
 mode change 100644 => 100755 rdf/benutzer.rdf.php
 mode change 100644 => 100755 rdf/benutzerfunktion.rdf.php
 mode change 100644 => 100755 rdf/berufstaetigkeit.rdf.php
 mode change 100644 => 100755 rdf/beschaeftigungsart1.rdf.php
 mode change 100644 => 100755 rdf/beschaeftigungsart2.rdf.php
 mode change 100644 => 100755 rdf/beschaeftigungsausmass.rdf.php
 mode change 100644 => 100755 rdf/besonderequalifikation.rdf.php
 mode change 100644 => 100755 rdf/bestelldetail.rdf.php
 mode change 100644 => 100755 rdf/bestellung.rdf.php
 mode change 100644 => 100755 rdf/betreuerart.rdf.php
 mode change 100644 => 100755 rdf/betriebsmittel.rdf.php
 mode change 100644 => 100755 rdf/betriebsmittelperson.rdf.php
 mode change 100644 => 100755 rdf/betriebsmitteltyp.rdf.php
 mode change 100644 => 100755 rdf/bisfunktion.rdf.php
 mode change 100644 => 100755 rdf/bisio.rdf.php
 mode change 100644 => 100755 rdf/bisstandort.rdf.php
 mode change 100644 => 100755 rdf/bisverwendung.rdf.php
 mode change 100644 => 100755 rdf/buchungstyp.rdf.php
 mode change 100644 => 100755 rdf/diplomasupplement.xml.php
 mode change 100644 => 100755 rdf/dms.rdf.php
 mode change 100644 => 100755 rdf/dokument.rdf.php
 mode change 100644 => 100755 rdf/dokumentprestudent.rdf.php
 mode change 100644 => 100755 rdf/dokumenttyp.rdf.php
 mode change 100644 => 100755 rdf/entwicklungsteam.rdf.php
 mode change 100644 => 100755 rdf/erfolgsnachweis.rdf.php
 mode change 100644 => 100755 rdf/fachbereich.rdf.php
 mode change 100644 => 100755 rdf/fachbereich_menue.rdf.php
 mode change 100644 => 100755 rdf/firma.rdf.php
 mode change 100644 => 100755 rdf/funktion.rdf.php
 mode change 100644 => 100755 rdf/gemeinde.rdf.php
 mode change 100644 => 100755 rdf/geschlecht.rdf.php
 mode change 100644 => 100755 rdf/gruppen.rdf.php
 mode change 100644 => 100755 rdf/gsprogramm.rdf.php
 mode change 100644 => 100755 rdf/gsstudientyp.rdf.php
 mode change 100644 => 100755 rdf/hauptberuf.rdf.php
 mode change 100644 => 100755 rdf/index.html
 mode change 100644 => 100755 rdf/kontakt.rdf.php
 mode change 100644 => 100755 rdf/kontakttyp.rdf.php
 mode change 100644 => 100755 rdf/konto.rdf.php
 mode change 100644 => 100755 rdf/ktu_abschlusszeugnis.rdf.php
 mode change 100644 => 100755 rdf/ktu_honorarvertrag.xml.php
 mode change 100644 => 100755 rdf/ktu_lvinfo.xml.php
 mode change 100644 => 100755 rdf/learningagreement.rdf.php
 mode change 100644 => 100755 rdf/learningagreement_outgoing.rdf.php
 mode change 100644 => 100755 rdf/lehrauftrag.xml.php
 mode change 100644 => 100755 rdf/lehrauftrag_annehmen.xml.php
 mode change 100644 => 100755 rdf/lehreinheit-lvplan.rdf.php
 mode change 100644 => 100755 rdf/lehreinheit.rdf.php
 mode change 100644 => 100755 rdf/lehreinheit_direkt.rdf.php
 mode change 100644 => 100755 rdf/lehreinheitgruppe.rdf.php
 mode change 100644 => 100755 rdf/lehreinheitmitarbeiter.rdf.php
 mode change 100644 => 100755 rdf/lehrfach.rdf.php
 mode change 100644 => 100755 rdf/lehrform.rdf.php
 mode change 100644 => 100755 rdf/lehrfunktion.rdf.php
 mode change 100644 => 100755 rdf/lehrstunde.rdf.php
 mode change 100644 => 100755 rdf/lehrveranstaltung.rdf.php
 mode change 100644 => 100755 rdf/lehrveranstaltung_einheiten.rdf.php
 mode change 100644 => 100755 rdf/lehrveranstaltung_studienplan.rdf.php
 mode change 100644 => 100755 rdf/lehrveranstaltungszeugnis.rdf.php
 mode change 100644 => 100755 rdf/lehrveranstaltungszeugnis_ktu.rdf.php
 mode change 100644 => 100755 rdf/lehrverbandsgruppe.rdf.php
 mode change 100644 => 100755 rdf/lektoren.rdf.php
 mode change 100644 => 100755 rdf/lvangebot.rdf.php
 mode change 100644 => 100755 rdf/lvgesamtnote.rdf.php
 mode change 100644 => 100755 rdf/lvinfo.rdf.php
 mode change 100644 => 100755 rdf/mantis.rdf.php
 mode change 100644 => 100755 rdf/mantis_categories.rdf.php
 mode change 100644 => 100755 rdf/mantis_projects.rdf.php
 mode change 100644 => 100755 rdf/messages.rdf.php
 mode change 100644 => 100755 rdf/mitarbeiter.rdf.php
 mode change 100644 => 100755 rdf/mobilitaet.rdf.php
 mode change 100644 => 100755 rdf/mobilitaetsprogramm.rdf.php
 mode change 100644 => 100755 rdf/mobilitaetstyp.rdf.php
 mode change 100644 => 100755 rdf/nation.rdf.php
 mode change 100644 => 100755 rdf/note.rdf.php
 mode change 100644 => 100755 rdf/notiz.rdf.php
 mode change 100644 => 100755 rdf/organisationseinheit.rdf.php
 mode change 100644 => 100755 rdf/organisationseinheit_menue.rdf.php
 mode change 100644 => 100755 rdf/ort.rdf.php
 mode change 100644 => 100755 rdf/orte.rdf.php
 mode change 100644 => 100755 rdf/person.rdf.php
 mode change 100644 => 100755 rdf/personal.rdf.php
 mode change 100644 => 100755 rdf/prestudent.rdf.php
 mode change 100644 => 100755 rdf/prestudenthistorie.rdf.php
 mode change 100644 => 100755 rdf/prestudentrolle.rdf.php
 mode change 100644 => 100755 rdf/projekt.rdf.php
 mode change 100644 => 100755 rdf/projektarbeit.rdf.php
 mode change 100644 => 100755 rdf/projektbeschreibung.rdf.php
 mode change 100644 => 100755 rdf/projektbetreuer.rdf.php
 mode change 100644 => 100755 rdf/projektphase.rdf.php
 mode change 100644 => 100755 rdf/projekttask.rdf.php
 mode change 100644 => 100755 rdf/projekttyp.rdf.php
 mode change 100644 => 100755 rdf/pruefung.rdf.php
 mode change 100644 => 100755 rdf/pruefungstyp.rdf.php
 mode change 100644 => 100755 rdf/raumtyp.rdf.php
 mode change 100644 => 100755 rdf/reihungstest.rdf.php
 mode change 100644 => 100755 rdf/ressource.rdf.php
 mode change 100644 => 100755 rdf/sammelzeugnis.rdf.php
 mode change 100644 => 100755 rdf/sprache.rdf.php
 mode change 100644 => 100755 rdf/standort.rdf.php
 mode change 100644 => 100755 rdf/status.rdf.php
 mode change 100644 => 100755 rdf/statusbericht.rdf.php
 mode change 100644 => 100755 rdf/statusgrund.rdf.php
 mode change 100644 => 100755 rdf/student.rdf.php
 mode change 100644 => 100755 rdf/studienblatt.xml.php
 mode change 100644 => 100755 rdf/studienerfolg.rdf.php
 mode change 100644 => 100755 rdf/studiengang.rdf.php
 mode change 100644 => 100755 rdf/studienordnung.rdf.php
 mode change 100644 => 100755 rdf/studienplan.rdf.php
 mode change 100644 => 100755 rdf/studiensemester.rdf.php
 mode change 100644 => 100755 rdf/stundenplan_betriebsmittel.rdf.php
 mode change 100644 => 100755 rdf/termine.rdf.php
 mode change 100644 => 100755 rdf/undo.rdf.php
 mode change 100644 => 100755 rdf/vertrag.rdf.php
 mode change 100644 => 100755 rdf/vertragdetails.rdf.php
 mode change 100644 => 100755 rdf/vertragsstatus.rdf.php
 mode change 100644 => 100755 rdf/vertragstyp.rdf.php
 mode change 100644 => 100755 rdf/verwendung.rdf.php
 mode change 100644 => 100755 rdf/vorlage.rdf.php
 mode change 100644 => 100755 rdf/wawi_buchung.rdf.php
 mode change 100644 => 100755 rdf/wawi_buchungstyp.rdf.php
 mode change 100644 => 100755 rdf/wawi_konto.rdf.php
 mode change 100644 => 100755 rdf/wawi_kostenstelle.rdf.php
 mode change 100644 => 100755 rdf/zertifikat.rdf.php
 mode change 100644 => 100755 rdf/zeugnis.rdf.php
 mode change 100644 => 100755 rdf/zeugnisnote.rdf.php
 mode change 100644 => 100755 rdf/zgv.rdf.php
 mode change 100644 => 100755 rdf/zgvdoktor.rdf.php
 mode change 100644 => 100755 rdf/zgvmaster.rdf.php
 mode change 100644 => 100755 rdf/zweck.rdf.php
 mode change 100644 => 100755 skin/cis.css
 mode change 100644 => 100755 skin/colorpicker.css
 mode change 100644 => 100755 skin/croppie.css
 mode change 100644 => 100755 skin/fas.css
 mode change 100644 => 100755 skin/fhcomplete.css
 mode change 100644 => 100755 skin/fhcomplete_website.css
 mode change 100644 => 100755 skin/flexcrollstyles.css
 mode change 100644 => 100755 skin/images/CIS.ico
 mode change 100644 => 100755 skin/images/Calculator.png
 mode change 100644 => 100755 skin/images/Chart.svg
 mode change 100644 => 100755 skin/images/DeleteIcon.png
 mode change 100644 => 100755 skin/images/ExcelIcon.png
 mode change 100644 => 100755 skin/images/FAS.ico
 mode change 100644 => 100755 skin/images/Filter.svg
 mode change 100644 => 100755 skin/images/Graphs_clip_art.svg
 mode change 100644 => 100755 skin/images/NeuDokument.png
 mode change 100644 => 100755 skin/images/Report.svg
 mode change 100644 => 100755 skin/images/Statistik.svg
 mode change 100644 => 100755 skin/images/TWLogo_klein.gif
 mode change 100644 => 100755 skin/images/TWLogo_klein.jpg
 mode change 100644 => 100755 skin/images/Tempus.ico
 mode change 100644 => 100755 skin/images/Vilesci.ico
 mode change 100644 => 100755 skin/images/Wawi.ico
 mode change 100644 => 100755 skin/images/addKonto.png
 mode change 100644 => 100755 skin/images/ampel_gelb.png
 mode change 100644 => 100755 skin/images/ampel_gruen.png
 mode change 100644 => 100755 skin/images/ampel_rot.png
 mode change 100644 => 100755 skin/images/anmelden.png
 mode change 100644 => 100755 skin/images/application_form_delete.png
 mode change 100644 => 100755 skin/images/application_form_edit.png
 mode change 100644 => 100755 skin/images/application_go.png
 mode change 100644 => 100755 skin/images/application_home.png
 mode change 100644 => 100755 skin/images/arbeitspaket.png
 mode change 100644 => 100755 skin/images/arrow-next.png
 mode change 100644 => 100755 skin/images/arrow-previous.png
 mode change 100644 => 100755 skin/images/arrow-single-down-green.png
 mode change 100644 => 100755 skin/images/arrow-single-up-green.png
 mode change 100644 => 100755 skin/images/arrow_down.png
 mode change 100644 => 100755 skin/images/asc.gif
 mode change 100644 => 100755 skin/images/bg.gif
 mode change 100644 => 100755 skin/images/bg_.gif
 mode change 100644 => 100755 skin/images/bg_sort.gif
 mode change 100644 => 100755 skin/images/blank.gif
 mode change 100644 => 100755 skin/images/bold.png
 mode change 100644 => 100755 skin/images/bullet_arrow_down.png
 mode change 100644 => 100755 skin/images/bullet_arrow_right.png
 mode change 100644 => 100755 skin/images/bullet_go.png
 mode change 100644 => 100755 skin/images/bullet_green.png
 mode change 100644 => 100755 skin/images/bullet_red.png
 mode change 100644 => 100755 skin/images/button_admin.png
 mode change 100644 => 100755 skin/images/button_download.png
 mode change 100644 => 100755 skin/images/button_endnote.png
 mode change 100644 => 100755 skin/images/button_esnack.png
 mode change 100644 => 100755 skin/images/button_feedback.png
 mode change 100644 => 100755 skin/images/button_kreuzerltool.png
 mode change 100644 => 100755 skin/images/button_listen.png
 mode change 100644 => 100755 skin/images/button_lvinfo.png
 mode change 100644 => 100755 skin/images/button_lvplan.png
 mode change 100644 => 100755 skin/images/button_mail.gif
 mode change 100644 => 100755 skin/images/button_moodle.png
 mode change 100644 => 100755 skin/images/button_newsgroups.png
 mode change 100644 => 100755 skin/images/button_opus.png
 mode change 100644 => 100755 skin/images/button_pinboard.png
 mode change 100644 => 100755 skin/images/button_semplan.png
 mode change 100644 => 100755 skin/images/button_studiupload.png
 mode change 100644 => 100755 skin/images/cbox-check.gif
 mode change 100644 => 100755 skin/images/changed.png
 mode change 100644 => 100755 skin/images/check_black.png
 mode change 100644 => 100755 skin/images/checkbox_toggle.png
 mode change 100644 => 100755 skin/images/checkbox_uncheck.png
 mode change 100644 => 100755 skin/images/cis_logo.png
 mode change 100644 => 100755 skin/images/cis_logo_400px.png
 mode change 100644 => 100755 skin/images/cis_logo_weiss.png
 mode change 100644 => 100755 skin/images/clock_down.png
 mode change 100644 => 100755 skin/images/clock_up.png
 mode change 100644 => 100755 skin/images/colorpicker/blank.gif
 mode change 100644 => 100755 skin/images/colorpicker/colorpicker_background.png
 mode change 100644 => 100755 skin/images/colorpicker/colorpicker_hex.png
 mode change 100644 => 100755 skin/images/colorpicker/colorpicker_hsb_b.png
 mode change 100644 => 100755 skin/images/colorpicker/colorpicker_hsb_h.png
 mode change 100644 => 100755 skin/images/colorpicker/colorpicker_hsb_s.png
 mode change 100644 => 100755 skin/images/colorpicker/colorpicker_indic.gif
 mode change 100644 => 100755 skin/images/colorpicker/colorpicker_overlay.png
 mode change 100644 => 100755 skin/images/colorpicker/colorpicker_rgb_b.png
 mode change 100644 => 100755 skin/images/colorpicker/colorpicker_rgb_g.png
 mode change 100644 => 100755 skin/images/colorpicker/colorpicker_rgb_r.png
 mode change 100644 => 100755 skin/images/colorpicker/colorpicker_select.gif
 mode change 100644 => 100755 skin/images/colorpicker/colorpicker_submit.png
 mode change 100644 => 100755 skin/images/colorpicker/custom_background.png
 mode change 100644 => 100755 skin/images/colorpicker/custom_hex.png
 mode change 100644 => 100755 skin/images/colorpicker/custom_hsb_b.png
 mode change 100644 => 100755 skin/images/colorpicker/custom_hsb_h.png
 mode change 100644 => 100755 skin/images/colorpicker/custom_hsb_s.png
 mode change 100644 => 100755 skin/images/colorpicker/custom_indic.gif
 mode change 100644 => 100755 skin/images/colorpicker/custom_rgb_b.png
 mode change 100644 => 100755 skin/images/colorpicker/custom_rgb_g.png
 mode change 100644 => 100755 skin/images/colorpicker/custom_rgb_r.png
 mode change 100644 => 100755 skin/images/colorpicker/custom_submit - original.png
 mode change 100644 => 100755 skin/images/colorpicker/custom_submit.png
 mode change 100644 => 100755 skin/images/colorpicker/select.png
 mode change 100644 => 100755 skin/images/colorpicker/select2.png
 mode change 100644 => 100755 skin/images/colorpicker/slider.png
 mode change 100644 => 100755 skin/images/copy.png
 mode change 100644 => 100755 skin/images/cross.png
 mode change 100644 => 100755 skin/images/csv.ico
 mode change 100644 => 100755 skin/images/csv.png
 mode change 100644 => 100755 skin/images/csv_light.png
 mode change 100644 => 100755 skin/images/date_add.png
 mode change 100644 => 100755 skin/images/date_delete.png
 mode change 100644 => 100755 skin/images/date_edit.png
 mode change 100644 => 100755 skin/images/date_go.png
 mode change 100644 => 100755 skin/images/date_go_grau.png
 mode change 100644 => 100755 skin/images/date_magnify.png
 mode change 100644 => 100755 skin/images/delete.gif
 mode change 100644 => 100755 skin/images/delete.png
 mode change 100644 => 100755 skin/images/delete_round.png
 mode change 100644 => 100755 skin/images/delete_x.png
 mode change 100644 => 100755 skin/images/delete_x_grau.png
 mode change 100644 => 100755 skin/images/desc.gif
 mode change 100644 => 100755 skin/images/doc_icon.png
 mode change 100644 => 100755 skin/images/doppelampel_gelb.gif
 mode change 100644 => 100755 skin/images/doppelampel_grau.gif
 mode change 100644 => 100755 skin/images/doppelampel_rot.gif
 mode change 100644 => 100755 skin/images/doppelampel_rot_gelb.gif
 mode change 100644 => 100755 skin/images/down.png
 mode change 100644 => 100755 skin/images/down_lvplan.png
 mode change 100644 => 100755 skin/images/drucken.png
 mode change 100644 => 100755 skin/images/edit-paste.png
 mode change 100644 => 100755 skin/images/edit.png
 mode change 100644 => 100755 skin/images/edit_grau.png
 mode change 100644 => 100755 skin/images/edit_wawi.gif
 mode change 100644 => 100755 skin/images/email.png
 mode change 100644 => 100755 skin/images/entitlement-pot.png
 mode change 100644 => 100755 skin/images/entry.gif
 mode change 100644 => 100755 skin/images/eps-logo_full.gif
 mode change 100644 => 100755 skin/images/excel.gif
 mode change 100644 => 100755 skin/images/exclamation.png
 mode change 100644 => 100755 skin/images/eye.png
 mode change 100644 => 100755 skin/images/false.png
 mode change 100644 => 100755 skin/images/fh-complete_weiss.png
 mode change 100644 => 100755 skin/images/fh_complete_logo.png
 mode change 100644 => 100755 skin/images/fh_complete_logo_400x61.png
 mode change 100644 => 100755 skin/images/fh_logo.png
 mode change 100644 => 100755 skin/images/fh_technikum_wien_illustration_klein.png
 mode change 100644 => 100755 skin/images/fhcomplete.png
 mode change 100644 => 100755 skin/images/fhtw_logo.png
 mode change 100644 => 100755 skin/images/file.gif
 mode change 100644 => 100755 skin/images/flag-green.png
 mode change 100644 => 100755 skin/images/flag-red.png
 mode change 100644 => 100755 skin/images/flag-yellow.png
 mode change 100644 => 100755 skin/images/folder.gif
 mode change 100644 => 100755 skin/images/folderup.gif
 mode change 100644 => 100755 skin/images/green_point.gif
 mode change 100644 => 100755 skin/images/group.png
 mode change 100644 => 100755 skin/images/haken.gif
 mode change 100644 => 100755 skin/images/header_line.gif
 mode change 100644 => 100755 skin/images/header_testtool.png
 mode change 100644 => 100755 skin/images/help.png
 mode change 100644 => 100755 skin/images/html.png
 mode change 100644 => 100755 skin/images/html_light.png
 mode change 100644 => 100755 skin/images/ical1.0.png
 mode change 100644 => 100755 skin/images/ical1.0_light.png
 mode change 100644 => 100755 skin/images/ical2.0.png
 mode change 100644 => 100755 skin/images/ical2.0_light.png
 mode change 100644 => 100755 skin/images/img_icon.png
 mode change 100644 => 100755 skin/images/index.php
 mode change 100644 => 100755 skin/images/indicator.gif
 mode change 100644 => 100755 skin/images/info.png
 mode change 100644 => 100755 skin/images/information.png
 mode change 100644 => 100755 skin/images/invisible.png
 mode change 100644 => 100755 skin/images/italic.png
 mode change 100644 => 100755 skin/images/ja.png
 mode change 100644 => 100755 skin/images/justifycenter.png
 mode change 100644 => 100755 skin/images/justifyleft.png
 mode change 100644 => 100755 skin/images/justifyright.png
 mode change 100644 => 100755 skin/images/left.gif
 mode change 100644 => 100755 skin/images/left.png
 mode change 100644 => 100755 skin/images/left_lvplan.png
 mode change 100644 => 100755 skin/images/lehrtyp_.png
 mode change 100644 => 100755 skin/images/lehrtyp_2.png
 mode change 100644 => 100755 skin/images/lehrtyp_lf.png
 mode change 100644 => 100755 skin/images/lehrtyp_lv.png
 mode change 100644 => 100755 skin/images/lehrtyp_modul.png
 mode change 100644 => 100755 skin/images/list-add.png
 mode change 100644 => 100755 skin/images/liste.gif
 mode change 100644 => 100755 skin/images/lock.png
 mode change 100644 => 100755 skin/images/login.gif
 mode change 100644 => 100755 skin/images/logo.jpg
 mode change 100644 => 100755 skin/images/logo.png
 mode change 100644 => 100755 skin/images/logo_gmbh.jpg
 mode change 100644 => 100755 skin/images/lv.png
 mode change 100644 => 100755 skin/images/lvaMulti.png
 mode change 100644 => 100755 skin/images/lvaMultiDel.png
 mode change 100644 => 100755 skin/images/lvaSingle.png
 mode change 100644 => 100755 skin/images/lvaSingleDel.png
 mode change 100644 => 100755 skin/images/lvplan.png
 mode change 100644 => 100755 skin/images/map.png
 mode change 100644 => 100755 skin/images/markdown_button.png
 mode change 100644 => 100755 skin/images/menu_item.gif
 mode change 100644 => 100755 skin/images/menue.png
 mode change 100644 => 100755 skin/images/menue_hover.png
 mode change 100644 => 100755 skin/images/merge.png
 mode change 100644 => 100755 skin/images/milestone.png
 mode change 100644 => 100755 skin/images/modul.png
 mode change 100644 => 100755 skin/images/moreleft.png
 mode change 100644 => 100755 skin/images/moreleft_lvplan.png
 mode change 100644 => 100755 skin/images/moremoreleft.png
 mode change 100644 => 100755 skin/images/moremoreright.png
 mode change 100644 => 100755 skin/images/moreright.png
 mode change 100644 => 100755 skin/images/moreright_lvplan.png
 mode change 100644 => 100755 skin/images/nachgereicht.png
 mode change 100644 => 100755 skin/images/not-available.png
 mode change 100644 => 100755 skin/images/offen.png
 mode change 100644 => 100755 skin/images/ok.png
 mode change 100644 => 100755 skin/images/open.gif
 mode change 100644 => 100755 skin/images/openoffice0.jpg
 mode change 100644 => 100755 skin/images/organisationseinheit.png
 mode change 100644 => 100755 skin/images/outlook.ico
 mode change 100644 => 100755 skin/images/outlook.png
 mode change 100644 => 100755 skin/images/outlook_light.png
 mode change 100644 => 100755 skin/images/p.gif
 mode change 100644 => 100755 skin/images/page_go.png
 mode change 100644 => 100755 skin/images/page_green.png
 mode change 100644 => 100755 skin/images/pdf.ico
 mode change 100644 => 100755 skin/images/pdf_icon.png
 mode change 100644 => 100755 skin/images/pdfpic.gif
 mode change 100644 => 100755 skin/images/pencil.png
 mode change 100644 => 100755 skin/images/person.gif
 mode change 100644 => 100755 skin/images/photoupload.png
 mode change 100644 => 100755 skin/images/planner.ico
 mode change 100644 => 100755 skin/images/planner.png
 mode change 100644 => 100755 skin/images/planner_logo.png
 mode change 100644 => 100755 skin/images/planner_logo_weiss.png
 mode change 100644 => 100755 skin/images/plus.png
 mode change 100644 => 100755 skin/images/ppt_icon.png
 mode change 100644 => 100755 skin/images/preferences-system.png
 mode change 100644 => 100755 skin/images/printer.png
 mode change 100644 => 100755 skin/images/profilbild_dummy.jpg
 mode change 100644 => 100755 skin/images/projekt.png
 mode change 100644 => 100755 skin/images/projektphase.png
 mode change 100644 => 100755 skin/images/question.png
 mode change 100644 => 100755 skin/images/red_point.gif
 mode change 100644 => 100755 skin/images/refresh.png
 mode change 100644 => 100755 skin/images/repeat.png
 mode change 100644 => 100755 skin/images/right.gif
 mode change 100644 => 100755 skin/images/right.png
 mode change 100644 => 100755 skin/images/right_lvplan.png
 mode change 100644 => 100755 skin/images/round.png
 mode change 100644 => 100755 skin/images/sancho/sancho_footer.jpg
 mode change 100644 => 100755 skin/images/sancho/sancho_footer_DEFAULT.jpg
 mode change 100644 => 100755 skin/images/sancho/sancho_footer_DEFAULT_bw.jpg
 mode change 100644 => 100755 skin/images/sancho/sancho_footer_min_bw.jpg
 mode change 100644 => 100755 skin/images/sancho/sancho_footer_min_bw.xcf
 mode change 100644 => 100755 skin/images/sancho/sancho_header_DEFAULT.jpg
 mode change 100644 => 100755 skin/images/sancho/sancho_header_DEFAULT_bw.jpg
 mode change 100644 => 100755 skin/images/sancho/sancho_header_TEMPLATE - Kopie.xcf
 mode change 100644 => 100755 skin/images/sancho/sancho_header_TEMPLATE.xcf
 mode change 100644 => 100755 skin/images/sancho/sancho_header_ampel_overdue.jpg
 mode change 100644 => 100755 skin/images/sancho/sancho_header_confirm_timesheet.jpg
 mode change 100644 => 100755 skin/images/sancho/sancho_header_du_hast_neue_nachrichten.jpg
 mode change 100644 => 100755 skin/images/sancho/sancho_header_du_hast_verpflichtende_ampeln.jpg
 mode change 100644 => 100755 skin/images/sancho/sancho_header_min_bw.jpg
 mode change 100644 => 100755 skin/images/sancho/sancho_header_neue_nachrichten_in_ampelsystem.jpg
 mode change 100644 => 100755 skin/images/sancho/sancho_roboter.jpg
 mode change 100644 => 100755 skin/images/sancho/sancho_roboter_freigestellt.png
 mode change 100644 => 100755 skin/images/sancho_round_right_blue.png
 mode change 100644 => 100755 skin/images/sancho_round_right_grey.png
 mode change 100644 => 100755 skin/images/sancho_round_right_red.png
 mode change 100644 => 100755 skin/images/scrollbar_left_right.png
 mode change 100644 => 100755 skin/images/scrollbar_up_down.png
 mode change 100644 => 100755 skin/images/scrollbase_bottom.png
 mode change 100644 => 100755 skin/images/scrollbase_left.png
 mode change 100644 => 100755 skin/images/scrollbase_right.png
 mode change 100644 => 100755 skin/images/scrollbase_top.png
 mode change 100644 => 100755 skin/images/search.png
 mode change 100644 => 100755 skin/images/seperator.gif
 mode change 100644 => 100755 skin/images/service.png
 mode change 100644 => 100755 skin/images/spinner.gif
 mode change 100644 => 100755 skin/images/split-arrows.png
 mode change 100644 => 100755 skin/images/square_blue.png
 mode change 100644 => 100755 skin/images/statistic.png
 mode change 100644 => 100755 skin/images/sticky.png
 mode change 100644 => 100755 skin/images/system-index-search.png
 mode change 100644 => 100755 skin/images/tempus_logo.png
 mode change 100644 => 100755 skin/images/tempus_logo_weiss.png
 mode change 100644 => 100755 skin/images/testtool_button.png
 mode change 100644 => 100755 skin/images/testtool_button_hover.png
 mode change 100644 => 100755 skin/images/testtool_buttonleft.png
 mode change 100644 => 100755 skin/images/testtool_buttonright.png
 mode change 100644 => 100755 skin/images/text-x-generic_with_pencil.png
 mode change 100644 => 100755 skin/images/tick.png
 mode change 100644 => 100755 skin/images/timetable.png
 mode change 100644 => 100755 skin/images/transmit.png
 mode change 100644 => 100755 skin/images/tree-diagramm.png
 mode change 100644 => 100755 skin/images/true.png
 mode change 100644 => 100755 skin/images/tw_logo_02.jpg
 mode change 100644 => 100755 skin/images/ui-bg_diagonals-thick_18_b81900_40x40.png
 mode change 100644 => 100755 skin/images/ui-bg_diagonals-thick_20_666666_40x40.png
 mode change 100644 => 100755 skin/images/ui-bg_flat_0_aaaaaa_40x100.png
 mode change 100644 => 100755 skin/images/ui-bg_flat_10_000000_40x100.png
 mode change 100644 => 100755 skin/images/ui-bg_flat_75_ffffff_40x100.png
 mode change 100644 => 100755 skin/images/ui-bg_glass_100_f6f6f6_1x400.png
 mode change 100644 => 100755 skin/images/ui-bg_glass_100_fdf5ce_1x400.png
 mode change 100644 => 100755 skin/images/ui-bg_glass_55_fbf9ee_1x400.png
 mode change 100644 => 100755 skin/images/ui-bg_glass_65_ffffff_1x400.png
 mode change 100644 => 100755 skin/images/ui-bg_glass_75_dadada_1x400.png
 mode change 100644 => 100755 skin/images/ui-bg_glass_75_e6e6e6_1x400.png
 mode change 100644 => 100755 skin/images/ui-bg_glass_95_fef1ec_1x400.png
 mode change 100644 => 100755 skin/images/ui-bg_gloss-wave_35_f6a828_500x100.png
 mode change 100644 => 100755 skin/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
 mode change 100644 => 100755 skin/images/ui-bg_highlight-soft_75_cccccc_1x100.png
 mode change 100644 => 100755 skin/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
 mode change 100644 => 100755 skin/images/ui-icons_222222_256x240.png
 mode change 100644 => 100755 skin/images/ui-icons_228ef1_256x240.png
 mode change 100644 => 100755 skin/images/ui-icons_2e83ff_256x240.png
 mode change 100644 => 100755 skin/images/ui-icons_454545_256x240.png
 mode change 100644 => 100755 skin/images/ui-icons_888888_256x240.png
 mode change 100644 => 100755 skin/images/ui-icons_cd0a0a_256x240.png
 mode change 100644 => 100755 skin/images/ui-icons_ef8c08_256x240.png
 mode change 100644 => 100755 skin/images/ui-icons_ffd27a_256x240.png
 mode change 100644 => 100755 skin/images/ui-icons_ffffff_256x240.png
 mode change 100644 => 100755 skin/images/underline.png
 mode change 100644 => 100755 skin/images/up.png
 mode change 100644 => 100755 skin/images/upload.png
 mode change 100644 => 100755 skin/images/user_down.png
 mode change 100644 => 100755 skin/images/user_up.png
 mode change 100644 => 100755 skin/images/verplant_false.png
 mode change 100644 => 100755 skin/images/verplant_true.png
 mode change 100644 => 100755 skin/images/vilesci_addons.png
 mode change 100644 => 100755 skin/images/vilesci_admin.png
 mode change 100644 => 100755 skin/images/vilesci_farbverlauf.png
 mode change 100644 => 100755 skin/images/vilesci_farbverlauf_top.png
 mode change 100644 => 100755 skin/images/vilesci_inventar.png
 mode change 100644 => 100755 skin/images/vilesci_lehre.png
 mode change 100644 => 100755 skin/images/vilesci_logo.png
 mode change 100644 => 100755 skin/images/vilesci_logo_weiss.png
 mode change 100644 => 100755 skin/images/vilesci_lvplan.png
 mode change 100644 => 100755 skin/images/vilesci_personen.png
 mode change 100644 => 100755 skin/images/vilesci_stammdaten.png
 mode change 100644 => 100755 skin/images/vilesci_statistik.png
 mode change 100644 => 100755 skin/images/vilesci_wartung.png
 mode change 100644 => 100755 skin/images/wawi_logo.png
 mode change 100644 => 100755 skin/images/wawi_logo_sz.png
 mode change 100644 => 100755 skin/images/wawi_logo_weiss.png
 mode change 100644 => 100755 skin/images/x-office-presentation.svg
 mode change 100644 => 100755 skin/images/x-office-spreadsheet.svg
 mode change 100644 => 100755 skin/images/xls.png
 mode change 100644 => 100755 skin/images/xls_icon.png
 mode change 100644 => 100755 skin/images/xls_light.png
 mode change 100644 => 100755 skin/images/zip_icon.png
 mode change 100644 => 100755 skin/infoscreen.css
 mode change 100644 => 100755 skin/jquery-ui-1.9.2.custom.min.css
 mode change 100644 => 100755 skin/jquery.css
 mode change 100644 => 100755 skin/planner.css
 mode change 100644 => 100755 skin/print.css
 mode change 100644 => 100755 skin/simplecropper.css
 mode change 100644 => 100755 skin/sounds/inventar_error.ogg
 mode change 100644 => 100755 skin/sounds/testtool_demo.mp3
 mode change 100644 => 100755 skin/sounds/testtool_demo.ogg
 mode change 100644 => 100755 skin/style.css.php
 mode change 100644 => 100755 skin/styles/default/cis_logo_text_400x78.png
 mode change 100644 => 100755 skin/styles/default/header.png
 mode change 100644 => 100755 skin/styles/default/logo_250x130.png
 mode change 100644 => 100755 skin/styles/example.css
 mode change 100644 => 100755 skin/styles/example/description.txt
 mode change 100644 => 100755 skin/styles/example/line.jpg
 mode change 100644 => 100755 skin/styles/example/logo.jpg
 mode change 100644 => 100755 skin/styles/example/pixel.jpg
 mode change 100644 => 100755 skin/styles/example/screenshot.jpg
 mode change 100644 => 100755 skin/styles/fhb/description.txt
 mode change 100644 => 100755 skin/styles/fhb/logo.png
 mode change 100644 => 100755 skin/styles/fhb/logo_klein.jpg
 mode change 100644 => 100755 skin/styles/jquery.css
 mode change 100644 => 100755 skin/styles/mobile.css
 mode change 100644 => 100755 skin/styles/mobile/TWLogo_klein.jpg
 mode change 100644 => 100755 skin/styles/mobile/description.txt
 mode change 100644 => 100755 skin/styles/mobile/header_line.jpg
 mode change 100644 => 100755 skin/styles/mobile/screenshot.jpg
 mode change 100644 => 100755 skin/styles/stp.css
 mode change 100644 => 100755 skin/styles/stp/BannerLogo.jpg
 mode change 100644 => 100755 skin/styles/stp/KTULogo.jpg
 mode change 100644 => 100755 skin/styles/stp/KTULogo.png
 mode change 100644 => 100755 skin/styles/stp/abschlusspraesentation.jpg
 mode change 100644 => 100755 skin/styles/stp/absolventen.jpg
 mode change 100644 => 100755 skin/styles/stp/international_week.jpg
 mode change 100644 => 100755 skin/styles/stp/logo.jpg
 mode change 100644 => 100755 skin/styles/stp/logo.png
 mode change 100644 => 100755 skin/styles/stp/pitching.jpg
 mode change 100644 => 100755 skin/styles/stp/projektidee.jpg
 mode change 100644 => 100755 skin/styles/tinymce.css
 mode change 100644 => 100755 skin/styles/tw.css
 mode change 100644 => 100755 skin/styles/tw/TWLogo_klein.jpg
 mode change 100644 => 100755 skin/styles/tw/academy.jpg
 mode change 100644 => 100755 skin/styles/tw/cis_logo_text_400x78.png
 mode change 100644 => 100755 skin/styles/tw/description.txt
 mode change 100644 => 100755 skin/styles/tw/header.png
 mode change 100644 => 100755 skin/styles/tw/header_line.jpg
 mode change 100644 => 100755 skin/styles/tw/lageplan.jpg
 mode change 100644 => 100755 skin/styles/tw/logo.jpg
 mode change 100644 => 100755 skin/styles/tw/logo.png
 mode change 100644 => 100755 skin/styles/tw/logo_200x400.png
 mode change 100644 => 100755 skin/styles/tw/logo_250x130.png
 mode change 100644 => 100755 skin/styles/tw/logo_50x25.png
 mode change 100644 => 100755 skin/styles/tw/logo_academy.png
 mode change 100644 => 100755 skin/styles/tw/logo_klein.png
 mode change 100644 => 100755 skin/styles/tw/logo_ws_50x25.png
 mode change 100644 => 100755 skin/styles/tw/screenshot.jpg
 mode change 100644 => 100755 skin/styles/twgreen.css
 mode change 100644 => 100755 skin/styles/twgreen/description.txt
 mode change 100644 => 100755 skin/styles/twgreen/menu.jpg
 mode change 100644 => 100755 skin/styles/twgreen/screenshot.jpg
 mode change 100644 => 100755 skin/styles/twgreen/tw_gr_header.jpg
 mode change 100644 => 100755 skin/styles/twgreen/tw_gr_logo.jpg
 mode change 100644 => 100755 skin/tablesort.css
 mode change 100644 => 100755 skin/tempus.css
 mode change 100644 => 100755 skin/vilesci.css
 mode change 100644 => 100755 skin/wawi.css
 mode change 100644 => 100755 skin/widgets.css
 mode change 100644 => 100755 soap/datenverbund_client.php
 mode change 100644 => 100755 soap/fhcomplete.php
 mode change 100644 => 100755 soap/index.html
 mode change 100644 => 100755 soap/kartenverlaengerung.soap.php
 mode change 100644 => 100755 soap/kartenverlaengerung.test.php
 mode change 100644 => 100755 soap/kartenverlaengerung.wsdl.php
 mode change 100644 => 100755 soap/lehrveranstaltung.json.php
 mode change 100644 => 100755 soap/lehrveranstaltung.soap.php
 mode change 100644 => 100755 soap/lehrveranstaltung.wsdl.php
 mode change 100644 => 100755 soap/lvplan.soap.php
 mode change 100644 => 100755 soap/lvplan.wsdl.php
 mode change 100644 => 100755 soap/mitarbeiter.soap.php
 mode change 100644 => 100755 soap/mitarbeiter.wsdl.php
 mode change 100644 => 100755 soap/notiz.soap.php
 mode change 100644 => 100755 soap/notiz.wsdl.php
 mode change 100644 => 100755 soap/ort.soap.php
 mode change 100644 => 100755 soap/ort.wsdl.php
 mode change 100644 => 100755 soap/person.soap.php
 mode change 100644 => 100755 soap/person.wsdl.php
 mode change 100644 => 100755 soap/projekt.soap.php
 mode change 100644 => 100755 soap/projekt.wsdl.php
 mode change 100644 => 100755 soap/projekt_jquery_client.php
 mode change 100644 => 100755 soap/projektphase.soap.php
 mode change 100644 => 100755 soap/projektphase.wsdl.php
 mode change 100644 => 100755 soap/projekttask.soap.php
 mode change 100644 => 100755 soap/projekttask.wsdl.php
 mode change 100644 => 100755 soap/ressource.soap.php
 mode change 100644 => 100755 soap/ressource.wsdl.php
 mode change 100644 => 100755 soap/ressource_projekt.soap.php
 mode change 100644 => 100755 soap/ressource_projekt.wsdl.php
 mode change 100644 => 100755 soap/semesterticket.soap.php
 mode change 100644 => 100755 soap/semesterticket.wsdl.php
 mode change 100644 => 100755 soap/semesterticket_client.php
 mode change 100644 => 100755 soap/soap_test_lv.php
 mode change 100644 => 100755 soap/soap_test_lvplan.php
 mode change 100644 => 100755 soap/soap_test_mitarbeiter.php
 mode change 100644 => 100755 soap/soap_test_ort.php
 mode change 100644 => 100755 soap/soap_test_person.php
 mode change 100644 => 100755 soap/soap_test_student.php
 mode change 100644 => 100755 soap/stip.class.php
 mode change 100644 => 100755 soap/stip.soap.php
 mode change 100644 => 100755 soap/stip.wsdl.php
 mode change 100644 => 100755 soap/stip_client.php
 mode change 100644 => 100755 soap/stip_client_error.php
 mode change 100644 => 100755 soap/student.soap.php
 mode change 100644 => 100755 soap/student.wsdl.php
 mode change 100644 => 100755 soap/studienordnung.json.php
 mode change 100644 => 100755 soap/studienplan.json.php
 mode change 100644 => 100755 soap/test.soap.php
 mode change 100644 => 100755 soap/test.wsdl.php
 mode change 100644 => 100755 soap/test_client.php
 mode change 100644 => 100755 system/.htaccess_exmpl
 mode change 100644 => 100755 system/FH-Complete.txp
 mode change 100644 => 100755 system/FHComplete-3.3.sql
 mode change 100644 => 100755 system/FHCompleteTDM3PG83.xsl
 mode change 100644 => 100755 system/UnitTests/AppdatenTest.php
 mode change 100644 => 100755 system/UnitTests/FunctionsTest.php
 mode change 100644 => 100755 system/UnitTests/Studienordnung2Test.php
 mode change 100644 => 100755 system/UnitTests/StudienordnungTest.php
 mode change 100644 => 100755 system/UnitTests/StudienplanTest.php
 mode change 100644 => 100755 system/UnitTests/StudienplatzTest.php
 mode change 100644 => 100755 system/UnitTests/addons/studienplatzverwaltung/AqaClientTest.php
 mode change 100644 => 100755 system/UnitTests/addons/studienplatzverwaltung/AqaFoebisPersonTest.php
 mode change 100644 => 100755 system/UnitTests/addons/studienplatzverwaltung/AqaFoebisStgTest.php
 mode change 100644 => 100755 system/UnitTests/addons/studienplatzverwaltung/FunctionsTest.php
 mode change 100644 => 100755 system/UnitTests/addons/studienplatzverwaltung/StudienplatzverwaltungAPITest.php
 mode change 100644 => 100755 system/UnitTests/addons/studienplatzverwaltung/testfile.xml
 mode change 100644 => 100755 system/UnitTests/ut_studienordnung.php
 mode change 100644 => 100755 system/ampel_erinnerungsmail.php
 mode change 100644 => 100755 system/checkStudenten.php
 mode change 100644 => 100755 system/check_neue_lektoren.php
 mode change 100644 => 100755 system/check_studentlehrverband.php
 mode change 100644 => 100755 system/checkroles.php
 mode change 100644 => 100755 system/checksystem.php
 mode change 100644 => 100755 system/dbupdate_3.0.php
 mode change 100644 => 100755 system/dbupdate_3.1.php
 mode change 100644 => 100755 system/dbupdate_3.2.php
 mode change 100644 => 100755 system/dbupdate_3.2/migrate_reihungstest.php
 mode change 100644 => 100755 system/dbupdate_3.3.php
 mode change 100644 => 100755 system/dbupdate_3.4.php
 mode change 100644 => 100755 system/dbupdate_3.4/10001_tempus_mitarbeiter_kurzbz_bei_reservierungen_anzeigen.php
 mode change 100644 => 100755 system/dbupdate_3.4/17512_fehlercode_constraints.php
 mode change 100644 => 100755 system/dbupdate_3.4/19154_beurteilungsformulare_pruefungssenat.php
 mode change 100644 => 100755 system/dbupdate_3.4/24682_reihungstest_zugangscode_fuer_login.php
 mode change 100644 => 100755 system/dbupdate_3.4/24913_tabelle_raumtyp_neues_attribut_aktiv.php
 mode change 100644 => 100755 system/dbupdate_3.4/25003_notenimport_nachpruefung.php
 mode change 100644 => 100755 system/dbupdate_3.4/25999_C4_ma0594.php
 mode change 100644 => 100755 system/dbupdate_3.4/25999_cis4_cms.php
 mode change 100644 => 100755 system/dbupdate_3.4/26173_index_webservicelog.php
 mode change 100644 => 100755 system/dbupdate_3.4/27107_vilesci_erfassung_abwesenheiten_reinigung.php
 mode change 100644 => 100755 system/dbupdate_3.4/27351_digitalisierung_formulare.php
 mode change 100644 => 100755 system/dbupdate_3.4/27388_anrechnungen_zeitfenster_pflegen.php
 mode change 100644 => 100755 system/dbupdate_3.4/27949_infocenter_zurueckstellen_mit_grund.php
 mode change 100644 => 100755 system/dbupdate_3.4/28089_plausichecks_in_extension_hinzufuegen.php
 mode change 100644 => 100755 system/dbupdate_3.4/29133_einzelne_studiengaenge_aus_issuechecks_ausnehmen.php
 mode change 100644 => 100755 system/dbupdate_3.4/29529_infocenter_anpassungen.php
 mode change 100644 => 100755 system/dbupdate_3.4/29835_uhstat1_erfassung_der_uhstat1_daten_ueber_das_bewerbungstool.php
 mode change 100644 => 100755 system/dbupdate_3.4/30181_tabelle_anrechnung_neue_attribute_fuer_begruendung.php
 mode change 100644 => 100755 system/dbupdate_3.4/30537_anmerkung_in_tbl_rolleberechtigung.php
 mode change 100644 => 100755 system/dbupdate_3.4/33714_erhoehter_studienbeitrag_fuer_drittsaatenangehoerig.php
 mode change 100644 => 100755 system/dbupdate_3.4/dbupdate_dashboard.php
 mode change 100644 => 100755 system/dbupdate_3.4/example.php
 mode change 100644 => 100755 system/environment.php
 mode change 100644 => 100755 system/erinnerungsmail_coodle.php
 mode change 100644 => 100755 system/erinnerungsmail_sek_lehrauftrag.php
 mode change 100644 => 100755 system/erinnerungsmail_sek_preinteressent.php
 mode change 100644 => 100755 system/fehlerupdate.php
 mode change 100644 => 100755 system/filtersupdate.php
 mode change 100644 => 100755 system/generate_missing_sto.php
 mode change 100644 => 100755 system/generatestudienordnung.php
 mode change 100644 => 100755 system/konsistenzpruefung.php
 mode change 100644 => 100755 system/matrikelnummer_clearing_download.php
 mode change 100644 => 100755 system/matrikelnummer_clearing_import.php
 mode change 100644 => 100755 system/phpinfo.php
 mode change 100644 => 100755 system/phrasesupdate.php
 mode change 100644 => 100755 system/prestudentstatus_studienplan_id.php
 mode change 100644 => 100755 system/pruefung_bestaetigen.php
 mode change 100644 => 100755 system/services/systemd/phantomjs@.service
 mode change 100644 => 100755 system/services/systemd/unoconv@.service
 mode change 100644 => 100755 system/services/upstart/unoconv.conf
 mode change 100644 => 100755 system/sync/sync_stpldev_stpl.php
 mode change 100644 => 100755 system/system_check_sql.php
 mode change 100644 => 100755 system/templates/contentmittitel.xsd
 mode change 100644 => 100755 system/templates/contentmittitel_filterwidget_xslt_xhtml.xslt
 mode change 100644 => 100755 system/templates/contentmittitel_xslt_xhtml.xslt
 mode change 100644 => 100755 system/templates/contentohnetitel.xsd
 mode change 100644 => 100755 system/templates/contentohnetitel_xslt_xhtml.xslt
 mode change 100644 => 100755 system/templates/include.xsd
 mode change 100644 => 100755 system/templates/include_xslt_xhtml.xslt
 mode change 100644 => 100755 system/templates/news.xsd
 mode change 100644 => 100755 system/templates/news_infoscreen.xsd
 mode change 100644 => 100755 system/templates/news_infoscreen_xslt_xhtml.xslt
 mode change 100644 => 100755 system/templates/news_xslt_xhtml.xslt
 mode change 100644 => 100755 system/templates/redirect.xsd
 mode change 100644 => 100755 system/templates/redirect_xslt_xhtml.xslt
 mode change 100644 => 100755 system/vorlage_zip/AccountInfo.odt
 mode change 100644 => 100755 system/vorlage_zip/AntragAbmeldung.odt
 mode change 100644 => 100755 system/vorlage_zip/AntragAbmeldungStgl.odt
 mode change 100644 => 100755 system/vorlage_zip/AntragUnterbrechung.odt
 mode change 100644 => 100755 system/vorlage_zip/AnwListBarcode.odt
 mode change 100644 => 100755 system/vorlage_zip/Anwesenheitslist.odt
 mode change 100644 => 100755 system/vorlage_zip/AusbVerEng.odt
 mode change 100644 => 100755 system/vorlage_zip/Ausbildungsver.odt
 mode change 100644 => 100755 system/vorlage_zip/Bakkurkunde.odt
 mode change 100644 => 100755 system/vorlage_zip/BakkurkundeEng.odt
 mode change 100644 => 100755 system/vorlage_zip/Bakkzeugnis.odt
 mode change 100644 => 100755 system/vorlage_zip/BakkzeugnisEng.odt
 mode change 100644 => 100755 system/vorlage_zip/Bescheid.odt
 mode change 100644 => 100755 system/vorlage_zip/BescheidEng.odt
 mode change 100644 => 100755 system/vorlage_zip/Bestellung.odt
 mode change 100644 => 100755 system/vorlage_zip/Bewerberakt.odt
 mode change 100644 => 100755 system/vorlage_zip/DiplSupplement.odt
 mode change 100644 => 100755 system/vorlage_zip/DiplSupplementDebug.odt
 mode change 100644 => 100755 system/vorlage_zip/Diplomurkunde.odt
 mode change 100644 => 100755 system/vorlage_zip/DiplomurkundeEng.odt
 mode change 100644 => 100755 system/vorlage_zip/Diplomzeugnis.odt
 mode change 100644 => 100755 system/vorlage_zip/DiplomzeugnisEng.odt
 mode change 100644 => 100755 system/vorlage_zip/Erfolgsnachweis.odt
 mode change 100644 => 100755 system/vorlage_zip/FHB_Ausbildungsver.odt
 mode change 100644 => 100755 system/vorlage_zip/FHB_PrProtBA.odt
 mode change 100644 => 100755 system/vorlage_zip/FHB_PrProtMA.odt
 mode change 100644 => 100755 system/vorlage_zip/Inskription.odt
 mode change 100644 => 100755 system/vorlage_zip/InskriptionEng.odt
 mode change 100644 => 100755 system/vorlage_zip/KTU_Studienblatt.odt
 mode change 100644 => 100755 system/vorlage_zip/LVZeugnis.odt
 mode change 100644 => 100755 system/vorlage_zip/LVZeugnisEng.odt
 mode change 100644 => 100755 system/vorlage_zip/Lehrauftrag.odt
 mode change 100644 => 100755 system/vorlage_zip/Lehrtaetigkeit.odt
 mode change 100644 => 100755 system/vorlage_zip/PrProtBA.odt
 mode change 100644 => 100755 system/vorlage_zip/PrProtBAEng.odt
 mode change 100644 => 100755 system/vorlage_zip/PrProtMA.odt
 mode change 100644 => 100755 system/vorlage_zip/PrProtMAEng.odt
 mode change 100644 => 100755 system/vorlage_zip/PrProtMAEng_alt.odt
 mode change 100644 => 100755 system/vorlage_zip/PrProtMA_alt.odt
 mode change 100644 => 100755 system/vorlage_zip/Projektbeschr.odt
 mode change 100644 => 100755 system/vorlage_zip/Studienblatt.odt
 mode change 100644 => 100755 system/vorlage_zip/StudienblattEng.odt
 mode change 100644 => 100755 system/vorlage_zip/Studienerfolg.odt
 mode change 100644 => 100755 system/vorlage_zip/StudienerfolgEng.odt
 mode change 100644 => 100755 system/vorlage_zip/Studienordnung.odt
 mode change 100644 => 100755 system/vorlage_zip/Uebernahme.odt
 mode change 100644 => 100755 system/vorlage_zip/Zahlung.odt
 mode change 100644 => 100755 system/vorlage_zip/Zertifikat.odt
 mode change 100644 => 100755 system/vorlage_zip/Zertifikat_ktu.odt
 mode change 100644 => 100755 system/vorlage_zip/Zeugnis.odt
 mode change 100644 => 100755 system/vorlage_zip/ZeugnisEng.odt
 mode change 100644 => 100755 system/vorlage_zip/ZeugnisEngNeu.odt
 mode change 100644 => 100755 system/vorlage_zip/ZeugnisNeu.odt
 mode change 100644 => 100755 system/vorlage_zip/Zutrittskarte.odt
 mode change 100644 => 100755 system/vorlage_zip/fotoliste.odt
 mode change 100644 => 100755 system/vorlage_zip/statusbericht.ods
 mode change 100644 => 100755 system/xsl/AntragAbmeldung.xsl
 mode change 100644 => 100755 system/xsl/AntragAbmeldungStgl.xsl
 mode change 100644 => 100755 system/xsl/AntragUnterbrechung.xsl
 mode change 100644 => 100755 system/xsl/AnwListBarcode.xsl
 mode change 100644 => 100755 system/xsl/Anwesenheitsliste.xsl
 mode change 100644 => 100755 system/xsl/AusbVerEngHead_0.xsl
 mode change 100644 => 100755 system/xsl/AusbVerEng_0.xsl
 mode change 100644 => 100755 system/xsl/AusbildStatus_0.xsl
 mode change 100644 => 100755 system/xsl/Ausbildungsver_0.xsl
 mode change 100644 => 100755 system/xsl/Bewerberakt.xsl
 mode change 100644 => 100755 system/xsl/LehrveranstaltungszeugnisEng_0.xsl
 mode change 100644 => 100755 system/xsl/Lehrveranstaltungszeugnis_0.xsl
 mode change 100644 => 100755 system/xsl/Lehrveranstaltungszeugnis_Eng_9005.xsl
 mode change 100644 => 100755 system/xsl/PrProtBAEng_0.xsl
 mode change 100644 => 100755 system/xsl/PrProtBA_0.xsl
 mode change 100644 => 100755 system/xsl/PrProtMAEng_0.xsl
 mode change 100644 => 100755 system/xsl/PrProtMA_0.xsl
 mode change 100644 => 100755 system/xsl/Projektbeschr_0.xsl
 mode change 100644 => 100755 system/xsl/StudienblattEng_0.xsl
 mode change 100644 => 100755 system/xsl/Studienblatt_0.xsl
 mode change 100644 => 100755 system/xsl/Studienordnung_0.xsl
 mode change 100644 => 100755 system/xsl/Studienordnung_style_0.xml
 mode change 100644 => 100755 system/xsl/ZertifikatFreifaecher_0.xsl
 mode change 100644 => 100755 system/xsl/ZeugnisEng_0.xsl
 mode change 100644 => 100755 system/xsl/ZeugnisEng_Lehrgaenge.xsl
 mode change 100644 => 100755 system/xsl/Zeugnis_0.xsl
 mode change 100644 => 100755 system/xsl/Zeugnis_Lehrgaenge.xsl
 mode change 100644 => 100755 system/xsl/Zeugnis_style_0.xsl
 mode change 100644 => 100755 system/xsl/Zutrittskarte.xsl
 mode change 100644 => 100755 system/xsl/accountinfoblatt_0.xsl
 mode change 100644 => 100755 system/xsl/bachelorurkundeEng_0.xsl
 mode change 100644 => 100755 system/xsl/bachelorurkunde_0.xsl
 mode change 100644 => 100755 system/xsl/bakkzeugnisEng_0.xsl
 mode change 100644 => 100755 system/xsl/bakkzeugnis_0.xsl
 mode change 100644 => 100755 system/xsl/bescheid_0.xsl
 mode change 100644 => 100755 system/xsl/bescheid_style_0.xsl
 mode change 100644 => 100755 system/xsl/diplomaSuppDebug.xsl
 mode change 100644 => 100755 system/xsl/diplomaSupp_0.xsl
 mode change 100644 => 100755 system/xsl/diplomaSupp_style_0.xsl
 mode change 100644 => 100755 system/xsl/diplomurkundeEng_0.xsl
 mode change 100644 => 100755 system/xsl/diplomurkunde_0.xsl
 mode change 100644 => 100755 system/xsl/diplomzeugnisEng_0.xsl
 mode change 100644 => 100755 system/xsl/diplomzeugnis_0.xsl
 mode change 100644 => 100755 system/xsl/fotoliste_0.xsl
 mode change 100644 => 100755 system/xsl/inskription_0.xsl
 mode change 100644 => 100755 system/xsl/inskription_eng_0.xsl
 mode change 100644 => 100755 system/xsl/lehrauftrag_0.xsl
 mode change 100644 => 100755 system/xsl/lehrauftrag_style_0.xsl
 mode change 100644 => 100755 system/xsl/lehrtaetigkeit_0.xsl
 mode change 100644 => 100755 system/xsl/prprotokollbakk_0.xsl
 mode change 100644 => 100755 system/xsl/statusbericht.xsl
 mode change 100644 => 100755 system/xsl/studienerfolgEng_0.xsl
 mode change 100644 => 100755 system/xsl/studienerfolgEng_Lehrgaenge.xsl
 mode change 100644 => 100755 system/xsl/studienerfolg_0.xsl
 mode change 100644 => 100755 system/xsl/studienerfolg_Lehrgaenge.xsl
 mode change 100644 => 100755 system/xsl/uebernahmebestaetigung_0.xsl
 mode change 100644 => 100755 system/xsl/zahlung_0.xsl
 mode change 100644 => 100755 system/xsl/zahlung_style_0.xsl
 mode change 100644 => 100755 tests/codesniffer/FHComplete/Sniffs/Classes/FHCPropertyDeclarationSniff.php
 mode change 100644 => 100755 tests/codesniffer/FHComplete/Sniffs/Classes/FHCValidClassNameSniff.php
 mode change 100644 => 100755 tests/codesniffer/FHComplete/Sniffs/ControlStructures/FHCControlSignatureSniff.php
 mode change 100644 => 100755 tests/codesniffer/FHComplete/Sniffs/Methods/FHCMethodDeclarationSniff.php
 mode change 100644 => 100755 tests/codesniffer/FHComplete/ruleset.xml
 mode change 100644 => 100755 tests/phpmd/rulesets-dev-only.xml
 mode change 100644 => 100755 tests/phpmd/rulesets.xml
 mode change 100644 => 100755 version.php
 mode change 100644 => 100755 vilesci/admin/XPI/FASoProduktiv/FASonline.xpi
 mode change 100644 => 100755 vilesci/admin/XPI/FASoProduktiv/chrome/content/contents.rdf
 mode change 100644 => 100755 vilesci/admin/XPI/FASoProduktiv/chrome/content/fasonline.xul
 mode change 100644 => 100755 vilesci/admin/XPI/FASoProduktiv/chrome/fasonline.jar
 mode change 100644 => 100755 vilesci/admin/XPI/FASoProduktiv/install.js
 mode change 100644 => 100755 vilesci/admin/XPI/FASoProduktiv/install.rdf
 mode change 100644 => 100755 vilesci/admin/XPI/FASoProduktivSeamonkey2.0/FASonline.xpi
 mode change 100644 => 100755 vilesci/admin/XPI/FASoProduktivSeamonkey2.0/chrome.manifest
 mode change 100644 => 100755 vilesci/admin/XPI/FASoProduktivSeamonkey2.0/chrome/content/contents.rdf
 mode change 100644 => 100755 vilesci/admin/XPI/FASoProduktivSeamonkey2.0/chrome/content/fasonline.xul
 mode change 100644 => 100755 vilesci/admin/XPI/FASoProduktivSeamonkey2.0/chrome/fasonline.jar
 mode change 100644 => 100755 vilesci/admin/XPI/FASoProduktivSeamonkey2.0/chrome/skin/fasonline.png
 mode change 100644 => 100755 vilesci/admin/XPI/FASoProduktivSeamonkey2.0/install.rdf
 mode change 100644 => 100755 vilesci/admin/XPI/FASoStPoelten/FASonline.xpi
 mode change 100644 => 100755 vilesci/admin/XPI/FASoStPoelten/chrome/content/contents.rdf
 mode change 100644 => 100755 vilesci/admin/XPI/FASoStPoelten/chrome/content/fasonline.xul
 mode change 100644 => 100755 vilesci/admin/XPI/FASoStPoelten/chrome/fasonline.jar
 mode change 100644 => 100755 vilesci/admin/XPI/FASoStPoelten/install.js
 mode change 100644 => 100755 vilesci/admin/XPI/FASoStPoelten/install.rdf
 mode change 100644 => 100755 vilesci/admin/XPI/FASoStPoeltenDEV/FASoStPoelten2.xpi
 mode change 100644 => 100755 vilesci/admin/XPI/FASoStPoeltenDEV/chrome/content/contents.rdf
 mode change 100644 => 100755 vilesci/admin/XPI/FASoStPoeltenDEV/chrome/content/fasonline2.xul
 mode change 100644 => 100755 vilesci/admin/XPI/FASoStPoeltenDEV/chrome/fasonline2.jar
 mode change 100644 => 100755 vilesci/admin/XPI/FASoStPoeltenDEV/install.js
 mode change 100644 => 100755 vilesci/admin/XPI/FASoStPoeltenDEV/install.rdf
 mode change 100644 => 100755 vilesci/admin/XPI/FHCFas/FHCFas.xpi
 mode change 100644 => 100755 vilesci/admin/XPI/FHCFas/chrome/content/contents.rdf
 mode change 100644 => 100755 vilesci/admin/XPI/FHCFas/chrome/content/fhcfas.xul
 mode change 100644 => 100755 vilesci/admin/XPI/FHCFas/chrome/fhcfas.jar
 mode change 100644 => 100755 vilesci/admin/XPI/FHCFas/install.js
 mode change 100644 => 100755 vilesci/admin/XPI/FHCFas/install.rdf
 mode change 100644 => 100755 vilesci/admin/XPI/FHCTempus/FHCTempus.xpi
 mode change 100644 => 100755 vilesci/admin/XPI/FHCTempus/chrome/content/contents.rdf
 mode change 100644 => 100755 vilesci/admin/XPI/FHCTempus/chrome/content/fhctempus.xul
 mode change 100644 => 100755 vilesci/admin/XPI/FHCTempus/chrome/fhctempus.jar
 mode change 100644 => 100755 vilesci/admin/XPI/FHCTempus/install.js
 mode change 100644 => 100755 vilesci/admin/XPI/FHCTempus/install.rdf
 mode change 100644 => 100755 vilesci/admin/XPI/PlannerProduktiv/Planner.xpi
 mode change 100644 => 100755 vilesci/admin/XPI/PlannerProduktiv/chrome/content/contents.rdf
 mode change 100644 => 100755 vilesci/admin/XPI/PlannerProduktiv/chrome/content/planner.xul
 mode change 100644 => 100755 vilesci/admin/XPI/PlannerProduktiv/chrome/planner.jar
 mode change 100644 => 100755 vilesci/admin/XPI/PlannerProduktiv/install.js
 mode change 100644 => 100755 vilesci/admin/XPI/PlannerProduktiv/install.rdf
 mode change 100644 => 100755 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome.manifest
 mode change 100644 => 100755 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/appchoose.xul
 mode change 100644 => 100755 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/contents.rdf
 mode change 100644 => 100755 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/fas.xul
 mode change 100644 => 100755 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/fhcomplete.js
 mode change 100644 => 100755 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/fhcomplete.xul
 mode change 100644 => 100755 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/options.xul
 mode change 100644 => 100755 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/planner.xul
 mode change 100644 => 100755 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/statusbaroverlay.xul
 mode change 100644 => 100755 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/tempus.xul
 mode change 100644 => 100755 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/fhcomplete.jar
 mode change 100644 => 100755 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/fasonline.png
 mode change 100644 => 100755 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/fasonline15.png
 mode change 100644 => 100755 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/fasonline32.png
 mode change 100644 => 100755 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/fhcomplete.ico
 mode change 100644 => 100755 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/fhcomplete.png
 mode change 100644 => 100755 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/planner.png
 mode change 100644 => 100755 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/planner15.png
 mode change 100644 => 100755 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/planner32.png
 mode change 100644 => 100755 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/settings.png
 mode change 100644 => 100755 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/tempus.png
 mode change 100644 => 100755 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/tempus15.png
 mode change 100644 => 100755 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/tempus32.png
 mode change 100644 => 100755 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/defaults/preferences/defaults.js
 mode change 100644 => 100755 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/fhcomplete.xpi
 mode change 100644 => 100755 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/install.rdf
 mode change 100644 => 100755 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/make.sh
 mode change 100644 => 100755 vilesci/admin/XPI/TempusStPoelten/Tempus.xpi
 mode change 100644 => 100755 vilesci/admin/XPI/TempusStPoelten/chrome/content/contents.rdf
 mode change 100644 => 100755 vilesci/admin/XPI/TempusStPoelten/chrome/content/tempus.xul
 mode change 100644 => 100755 vilesci/admin/XPI/TempusStPoelten/chrome/tempus.jar
 mode change 100644 => 100755 vilesci/admin/XPI/TempusStPoelten/install.js
 mode change 100644 => 100755 vilesci/admin/XPI/TempusStPoelten/install.rdf
 mode change 100644 => 100755 vilesci/admin/XPI/TempusStPoeltenDEV/TempusStPoelten2.xpi
 mode change 100644 => 100755 vilesci/admin/XPI/TempusStPoeltenDEV/chrome/content/contents.rdf
 mode change 100644 => 100755 vilesci/admin/XPI/TempusStPoeltenDEV/chrome/content/tempus2.xul
 mode change 100644 => 100755 vilesci/admin/XPI/TempusStPoeltenDEV/chrome/tempus2.jar
 mode change 100644 => 100755 vilesci/admin/XPI/TempusStPoeltenDEV/install.js
 mode change 100644 => 100755 vilesci/admin/XPI/TempusStPoeltenDEV/install.rdf
 mode change 100644 => 100755 vilesci/admin/XPI/TempusStPoeltenExtern/TempusStPoeltenExtern.xpi
 mode change 100644 => 100755 vilesci/admin/XPI/TempusStPoeltenExtern/TempusStPoeltenExtern81.xpi
 mode change 100644 => 100755 vilesci/admin/XPI/TempusStPoeltenExtern/chrome/content/contents.rdf
 mode change 100644 => 100755 vilesci/admin/XPI/TempusStPoeltenExtern/chrome/content/tempusextern81.xul
 mode change 100644 => 100755 vilesci/admin/XPI/TempusStPoeltenExtern/chrome/tempusextern.jar
 mode change 100644 => 100755 vilesci/admin/XPI/TempusStPoeltenExtern/chrome/tempusextern81.jar
 mode change 100644 => 100755 vilesci/admin/XPI/TempusStPoeltenExtern/install.js
 mode change 100644 => 100755 vilesci/admin/XPI/TempusStPoeltenExtern/install.rdf
 mode change 100644 => 100755 vilesci/admin/XPI/TempusTWProduktiv/Tempusdev.xpi
 mode change 100644 => 100755 vilesci/admin/XPI/TempusTWProduktiv/chrome/content/contents.rdf
 mode change 100644 => 100755 vilesci/admin/XPI/TempusTWProduktiv/chrome/content/tempusdev.xul
 mode change 100644 => 100755 vilesci/admin/XPI/TempusTWProduktiv/chrome/tempusdev.jar
 mode change 100644 => 100755 vilesci/admin/XPI/TempusTWProduktiv/install.js
 mode change 100644 => 100755 vilesci/admin/XPI/TempusTWProduktiv/install.rdf
 mode change 100644 => 100755 vilesci/admin/XPI/orbit-1.8f5-MiK.xpi
 mode change 100644 => 100755 vilesci/bis/archiv.php
 mode change 100644 => 100755 vilesci/bis/bisdaten/.gitignore
 mode change 100644 => 100755 vilesci/bis/checkfunktion.php
 mode change 100644 => 100755 vilesci/bis/checkverwendung.php
 mode change 100644 => 100755 vilesci/bis/lehrgangsmeldung.php
 mode change 100644 => 100755 vilesci/bis/personal_generateverwendung.php
 mode change 100644 => 100755 vilesci/bis/personal_lektorenohnelehrauftrag.php
 mode change 100644 => 100755 vilesci/bis/personalimport.php
 mode change 100644 => 100755 vilesci/bis/personalmeldung.php
 mode change 100644 => 100755 vilesci/bis/personalmeldung_uebersicht.php
 mode change 100644 => 100755 vilesci/bis/studentenmeldung.php
 mode change 100644 => 100755 vilesci/cronjobs/bpk.php
 mode change 100644 => 100755 vilesci/cronjobs/cronjob.php
 mode change 100644 => 100755 vilesci/cronjobs/jobwatcher.php
 mode change 100644 => 100755 vilesci/cronjobs/lvplanwartung.php
 mode change 100644 => 100755 vilesci/cronjobs/matrikelnummern.php
 mode change 100644 => 100755 vilesci/cronjobs/testjob.php
 mode change 100644 => 100755 vilesci/fhausweis/bildpruefung.php
 mode change 100644 => 100755 vilesci/fhausweis/bildzuschnitt.php
 mode change 100644 => 100755 vilesci/fhausweis/imageupload.php
 mode change 100644 => 100755 vilesci/fhausweis/kartenausgabe.php
 mode change 100644 => 100755 vilesci/fhausweis/kartenkorrektur.php
 mode change 100644 => 100755 vilesci/fhausweis/kartenruecknahme.php
 mode change 100644 => 100755 vilesci/fhausweis/kartentausch.php
 mode change 100644 => 100755 vilesci/fhausweis/kartenverwaltung.php
 mode change 100644 => 100755 vilesci/fhausweis/kartezuweisen.php
 mode change 100644 => 100755 vilesci/fhausweis/search.php
 mode change 100644 => 100755 vilesci/fhausweis/verlaengerung.php
 mode change 100644 => 100755 vilesci/index.php
 mode change 100644 => 100755 vilesci/inventar/etiketten.php
 mode change 100644 => 100755 vilesci/inventar/inventar.php
 mode change 100644 => 100755 vilesci/inventar/inventar_afa.php
 mode change 100644 => 100755 vilesci/inventar/inventar_autocomplete.php
 mode change 100644 => 100755 vilesci/inventar/inventar_inventur.php
 mode change 100644 => 100755 vilesci/inventar/inventar_pflege.php
 mode change 100644 => 100755 vilesci/inventar/inventarliste.php
 mode change 100644 => 100755 vilesci/inventar/konto_detail.php
 mode change 100644 => 100755 vilesci/inventar/kostenstelle_detail.php
 mode change 100644 => 100755 vilesci/inventar/studiengang_detail.php
 mode change 100644 => 100755 vilesci/left.php
 mode change 100644 => 100755 vilesci/lehre/abgabe_assistenz.php
 mode change 100644 => 100755 vilesci/lehre/abgabe_assistenz_details.php
 mode change 100644 => 100755 vilesci/lehre/abgabe_assistenz_frameset.php
 mode change 100644 => 100755 vilesci/lehre/abgabe_assistenz_multitermin.php
 mode change 100644 => 100755 vilesci/lehre/abgabe_assistenz_zusatz.php
 mode change 100644 => 100755 vilesci/lehre/check/index.html
 mode change 100644 => 100755 vilesci/lehre/check/res_check.php
 mode change 100644 => 100755 vilesci/lehre/check/stdplan_check.php
 mode change 100644 => 100755 vilesci/lehre/check/ueberbuchung.php
 mode change 100644 => 100755 vilesci/lehre/check/verplanungsuebersicht.php
 mode change 100644 => 100755 vilesci/lehre/einheit_autocomplete.php
 mode change 100644 => 100755 vilesci/lehre/einheit_det.php
 mode change 100644 => 100755 vilesci/lehre/einheit_menu.php
 mode change 100644 => 100755 vilesci/lehre/ferienverwaltung.php
 mode change 100644 => 100755 vilesci/lehre/freifach.php
 mode change 100644 => 100755 vilesci/lehre/freifach_lektoren.php
 mode change 100644 => 100755 vilesci/lehre/freifach_studentenvorrueckung.php
 mode change 100644 => 100755 vilesci/lehre/incoming_delete.php
 mode change 100644 => 100755 vilesci/lehre/index.html
 mode change 100644 => 100755 vilesci/lehre/lehreinheiten_vorrueckung.php
 mode change 100644 => 100755 vilesci/lehre/lehrveranstaltung.php
 mode change 100644 => 100755 vilesci/lehre/lehrveranstaltung_details.php
 mode change 100644 => 100755 vilesci/lehre/lehrveranstaltung_frameset.html
 mode change 100644 => 100755 vilesci/lehre/lehrveranstaltung_kompatibel.php
 mode change 100644 => 100755 vilesci/lehre/lehrveranstaltung_lvangebot.php
 mode change 100644 => 100755 vilesci/lehre/lv_merge.php
 mode change 100644 => 100755 vilesci/lehre/lvangebot_autocomplete.php
 mode change 100644 => 100755 vilesci/lehre/lvplan_custom_sync.php
 mode change 100644 => 100755 vilesci/lehre/lvplanwartung.php
 mode change 100644 => 100755 vilesci/lehre/projektarbeitsbenotung.php
 mode change 100644 => 100755 vilesci/lehre/raumauslastung.php
 mode change 100644 => 100755 vilesci/lehre/raummitteilung.php
 mode change 100644 => 100755 vilesci/lehre/reservierung_autocomplete.php
 mode change 100644 => 100755 vilesci/lehre/reservierung_insert.php
 mode change 100644 => 100755 vilesci/lehre/saveStudienordnung.php
 mode change 100644 => 100755 vilesci/lehre/stpl_benutzer_kollision.php
 mode change 100644 => 100755 vilesci/lehre/stpl_benutzer_kollision_details.php
 mode change 100644 => 100755 vilesci/lehre/stpl_benutzer_kollision_frameset.html
 mode change 100644 => 100755 vilesci/lehre/studienordnung.inc.php
 mode change 100644 => 100755 vilesci/lehre/studienordnung.js
 mode change 100644 => 100755 vilesci/lehre/studienordnung.php
 mode change 100644 => 100755 vilesci/lehre/studienordnung_autocomplete.php
 mode change 100644 => 100755 vilesci/lehre/studienordnung_lvregel.js
 mode change 100644 => 100755 vilesci/lehre/studienplan_gueltigkeit.php
 mode change 100644 => 100755 vilesci/lehre/studienplan_vorrueckung.php
 mode change 100644 => 100755 vilesci/lehre/studienplan_zuteilung.php
 mode change 100644 => 100755 vilesci/lehre/zeitwuensche.php
 mode change 100644 => 100755 vilesci/main.php
 mode change 100644 => 100755 vilesci/personen/akteupdate.php
 mode change 100644 => 100755 vilesci/personen/aliquote_reduktion.json.php
 mode change 100644 => 100755 vilesci/personen/aliquote_reduktion.php
 mode change 100644 => 100755 vilesci/personen/anwesenheit.php
 mode change 100644 => 100755 vilesci/personen/anwesenheitslisten_barcode.php
 mode change 100644 => 100755 vilesci/personen/aufbaukurscheckliste.php
 mode change 100644 => 100755 vilesci/personen/funktion.php
 mode change 100644 => 100755 vilesci/personen/funktion_det.php
 mode change 100644 => 100755 vilesci/personen/import/interessentenimport.php
 mode change 100644 => 100755 vilesci/personen/import/mitarbeiterimport.php
 mode change 100644 => 100755 vilesci/personen/incoming_detail.php
 mode change 100644 => 100755 vilesci/personen/incoming_frameset.php
 mode change 100644 => 100755 vilesci/personen/incoming_lehrveranstaltungen.php
 mode change 100644 => 100755 vilesci/personen/incoming_uebersicht.php
 mode change 100644 => 100755 vilesci/personen/index.html
 mode change 100644 => 100755 vilesci/personen/institutsliste.php
 mode change 100644 => 100755 vilesci/personen/kontaktdaten_edit.php
 mode change 100644 => 100755 vilesci/personen/lehrveranstaltungen_json.php
 mode change 100644 => 100755 vilesci/personen/leistungsstipendium.php
 mode change 100644 => 100755 vilesci/personen/lektor_uebersicht.php
 mode change 100644 => 100755 vilesci/personen/outgoing_detail.php
 mode change 100644 => 100755 vilesci/personen/outgoing_frameset.php
 mode change 100644 => 100755 vilesci/personen/outgoing_uebersicht.php
 mode change 100644 => 100755 vilesci/personen/personen_anlegen.php
 mode change 100644 => 100755 vilesci/personen/personen_details.php
 mode change 100644 => 100755 vilesci/personen/personendetails.php
 mode change 100644 => 100755 vilesci/personen/preinteressent_anlegen.php
 mode change 100644 => 100755 vilesci/personen/preinteressent_detail.php
 mode change 100644 => 100755 vilesci/personen/preinteressent_frameset.html
 mode change 100644 => 100755 vilesci/personen/preinteressent_uebernahme.php
 mode change 100644 => 100755 vilesci/personen/preinteressent_uebersicht.php
 mode change 100644 => 100755 vilesci/personen/student_edit.php
 mode change 100644 => 100755 vilesci/personen/student_vorrueckung.php
 mode change 100644 => 100755 vilesci/personen/suche.php
 mode change 100644 => 100755 vilesci/personen/uniflow.csv.php
 mode change 100644 => 100755 vilesci/personen/urlaubsverwaltung.php
 mode change 100644 => 100755 vilesci/personen/wiederholer.php
 mode change 100644 => 100755 vilesci/personen/zeitwunsch.php
 mode change 100644 => 100755 vilesci/stammdaten/ampel_details.php
 mode change 100644 => 100755 vilesci/stammdaten/ampel_frameset.html
 mode change 100644 => 100755 vilesci/stammdaten/ampel_uebersicht.php
 mode change 100644 => 100755 vilesci/stammdaten/auswertung_fhtw.php
 mode change 100644 => 100755 vilesci/stammdaten/benutzerberechtigung_autocomplete.php
 mode change 100644 => 100755 vilesci/stammdaten/benutzerberechtigung_detailliste.php
 mode change 100644 => 100755 vilesci/stammdaten/benutzerberechtigung_details.php
 mode change 100644 => 100755 vilesci/stammdaten/benutzerberechtigung_frameset.html
 mode change 100644 => 100755 vilesci/stammdaten/benutzerberechtigung_uebersicht.php
 mode change 100644 => 100755 vilesci/stammdaten/berechtigungen.php
 mode change 100644 => 100755 vilesci/stammdaten/berechtigungrolle.php
 mode change 100644 => 100755 vilesci/stammdaten/betriebsmittel_details.php
 mode change 100644 => 100755 vilesci/stammdaten/betriebsmittel_frameset.php
 mode change 100644 => 100755 vilesci/stammdaten/betriebsmittel_uebersicht.php
 mode change 100644 => 100755 vilesci/stammdaten/buchung_typ.php
 mode change 100644 => 100755 vilesci/stammdaten/cronjobverwaltung.php
 mode change 100644 => 100755 vilesci/stammdaten/dokumentvorlagen_verwaltung.php
 mode change 100644 => 100755 vilesci/stammdaten/firma_details.php
 mode change 100644 => 100755 vilesci/stammdaten/firma_detailwork.php
 mode change 100644 => 100755 vilesci/stammdaten/firma_frameset.html
 mode change 100644 => 100755 vilesci/stammdaten/firma_uebersicht.php
 mode change 100644 => 100755 vilesci/stammdaten/firma_zusammen_details.php
 mode change 100644 => 100755 vilesci/stammdaten/firma_zusammen_uebersicht.php
 mode change 100644 => 100755 vilesci/stammdaten/gsprogramm.php
 mode change 100644 => 100755 vilesci/stammdaten/imexport/dabis.php
 mode change 100644 => 100755 vilesci/stammdaten/imexport/index.html
 mode change 100644 => 100755 vilesci/stammdaten/imexport/zutrittskarten/export.php
 mode change 100644 => 100755 vilesci/stammdaten/imexport/zutrittskarten/generatefromsipass.php
 mode change 100644 => 100755 vilesci/stammdaten/imexport/zutrittskarten/generatefromsipass_predelete.php
 mode change 100644 => 100755 vilesci/stammdaten/imexport/zutrittskarten/import.php
 mode change 100644 => 100755 vilesci/stammdaten/imexport/zutrittskarten/index.html
 mode change 100644 => 100755 vilesci/stammdaten/infoscreen_details.php
 mode change 100644 => 100755 vilesci/stammdaten/infoscreen_frameset.html
 mode change 100644 => 100755 vilesci/stammdaten/infoscreen_preview.php
 mode change 100644 => 100755 vilesci/stammdaten/infoscreen_uebersicht.php
 mode change 100644 => 100755 vilesci/stammdaten/lvbgruppenverwaltung.js
 mode change 100644 => 100755 vilesci/stammdaten/lvbgruppenverwaltung.php
 mode change 100644 => 100755 vilesci/stammdaten/lvbgruppenverwaltungDetail.php
 mode change 100644 => 100755 vilesci/stammdaten/lvbgruppenverwaltungTree.php
 mode change 100644 => 100755 vilesci/stammdaten/organisationseinheiten.php
 mode change 100644 => 100755 vilesci/stammdaten/personen_wartung.php
 mode change 100644 => 100755 vilesci/stammdaten/raum_details.php
 mode change 100644 => 100755 vilesci/stammdaten/raum_frameset.html
 mode change 100644 => 100755 vilesci/stammdaten/raum_uebersicht.php
 mode change 100644 => 100755 vilesci/stammdaten/reihungstest_administration.php
 mode change 100644 => 100755 vilesci/stammdaten/reihungstest_zusammenlegung.php
 mode change 100644 => 100755 vilesci/stammdaten/reihungstestverwaltung.php
 mode change 100644 => 100755 vilesci/stammdaten/reihungstestverwaltung_autocomplete.php
 mode change 100644 => 100755 vilesci/stammdaten/service_details.php
 mode change 100644 => 100755 vilesci/stammdaten/service_frameset.html
 mode change 100644 => 100755 vilesci/stammdaten/service_uebersicht.php
 mode change 100644 => 100755 vilesci/stammdaten/set_gemeinde.php
 mode change 100644 => 100755 vilesci/stammdaten/stammdaten_autocomplete.php
 mode change 100644 => 100755 vilesci/stammdaten/statistik_details.php
 mode change 100644 => 100755 vilesci/stammdaten/statistik_frameset.html
 mode change 100644 => 100755 vilesci/stammdaten/statistik_uebersicht.php
 mode change 100644 => 100755 vilesci/stammdaten/studiengang_details.js
 mode change 100644 => 100755 vilesci/stammdaten/studiengang_details.php
 mode change 100644 => 100755 vilesci/stammdaten/studiengang_dokumente.php
 mode change 100644 => 100755 vilesci/stammdaten/studiengang_edit.php
 mode change 100644 => 100755 vilesci/stammdaten/studiengang_frameset.html
 mode change 100644 => 100755 vilesci/stammdaten/studiengang_uebersicht.php
 mode change 100644 => 100755 vilesci/stammdaten/studiensemester.php
 mode change 100644 => 100755 vilesci/stammdaten/variablen_details.php
 mode change 100644 => 100755 vilesci/stammdaten/variablen_frameset.html
 mode change 100644 => 100755 vilesci/stammdaten/variablen_uebersicht.php
 mode change 100644 => 100755 vilesci/stammdaten/vertrag_typ.php
 mode change 100644 => 100755 vilesci/statistik/filter_details.php
 mode change 100644 => 100755 vilesci/statistik/filter_frameset.html
 mode change 100644 => 100755 vilesci/statistik/filter_overview.php
 mode change 100644 => 100755 vilesci/statistik/filter_vorschau.php
 mode change 100644 => 100755 vilesci/statistik/incoming.php
 mode change 100644 => 100755 vilesci/statistik/oehwaehlerverzeichnis.php
 mode change 100644 => 100755 vilesci/statistik/outgoing.php
 mode change 100644 => 100755 vilesci/statistik/statistik.php
 mode change 100644 => 100755 vilesci/statistik/statistik_frameset.php
 mode change 100644 => 100755 vilesci/statistik/statistik_sql.php
 mode change 100644 => 100755 vilesci/statistik/studenten_historie.php
 mode change 100644 => 100755 vilesci/statistik/studierendenliste_oeh.php
 mode change 100644 => 100755 vilesci/top.php
 mode change 100644 => 100755 wawi/auswertungen/aufteilung.php
 mode change 100644 => 100755 wawi/auswertungen/konto.php
 mode change 100644 => 100755 wawi/auswertungen/kostenstelle.php
 mode change 100644 => 100755 wawi/auswertungen/wawi_tags.php
 mode change 100644 => 100755 wawi/auth.php
 mode change 100644 => 100755 wawi/berechtigung.php
 mode change 100644 => 100755 wawi/bestellung.php
 mode change 100644 => 100755 wawi/budget.php
 mode change 100644 => 100755 wawi/check_bestellung.php
 mode change 100644 => 100755 wawi/firma.php
 mode change 100644 => 100755 wawi/home.php
 mode change 100644 => 100755 wawi/index.php
 mode change 100644 => 100755 wawi/kontouebersicht.php
 mode change 100644 => 100755 wawi/kostenstellenuebersicht.php
 mode change 100644 => 100755 wawi/login.php
 mode change 100644 => 100755 wawi/logout.php
 mode change 100644 => 100755 wawi/menu.php
 mode change 100644 => 100755 wawi/mwst.html
 mode change 100644 => 100755 wawi/pdfExport.txt
 mode change 100644 => 100755 wawi/rechnung.php
 mode change 100644 => 100755 wawi/wawi_autocomplete.php
 mode change 100644 => 100755 webdav/Caldav_Backend.php
 mode change 100644 => 100755 webdav/Principal.php
 mode change 100644 => 100755 webdav/auth.class.php
 mode change 100644 => 100755 webdav/google.txt
 mode change 100644 => 100755 webdav/lvplan.php

diff --git a/.gitignore b/.gitignore
old mode 100644
new mode 100755
diff --git a/CHANGELOG.md b/CHANGELOG.md
old mode 100644
new mode 100755
diff --git a/FHC-vendor/angular-tablesort/.gitignore b/FHC-vendor/angular-tablesort/.gitignore
old mode 100644
new mode 100755
diff --git a/FHC-vendor/angular-tablesort/LICENSE b/FHC-vendor/angular-tablesort/LICENSE
old mode 100644
new mode 100755
diff --git a/FHC-vendor/angular-tablesort/README.md b/FHC-vendor/angular-tablesort/README.md
old mode 100644
new mode 100755
diff --git a/FHC-vendor/angular-tablesort/bower.json b/FHC-vendor/angular-tablesort/bower.json
old mode 100644
new mode 100755
diff --git a/FHC-vendor/angular-tablesort/example.html b/FHC-vendor/angular-tablesort/example.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/angular-tablesort/index.js b/FHC-vendor/angular-tablesort/index.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/angular-tablesort/js/angular-tablesort.js b/FHC-vendor/angular-tablesort/js/angular-tablesort.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/angular-tablesort/package.json b/FHC-vendor/angular-tablesort/package.json
old mode 100644
new mode 100755
diff --git a/FHC-vendor/angular-tablesort/tablesort.css b/FHC-vendor/angular-tablesort/tablesort.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/changelog.txt b/FHC-vendor/easyui/changelog.txt
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/easyloader.js b/FHC-vendor/easyui/easyloader.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/jquery.easyui.min.js b/FHC-vendor/easyui/jquery.easyui.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/jquery.easyui.mobile.js b/FHC-vendor/easyui/jquery.easyui.mobile.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/jquery.min.js b/FHC-vendor/easyui/jquery.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/license_freeware.txt b/FHC-vendor/easyui/license_freeware.txt
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/locale/easyui-lang-af.js b/FHC-vendor/easyui/locale/easyui-lang-af.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/locale/easyui-lang-am.js b/FHC-vendor/easyui/locale/easyui-lang-am.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/locale/easyui-lang-ar.js b/FHC-vendor/easyui/locale/easyui-lang-ar.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/locale/easyui-lang-bg.js b/FHC-vendor/easyui/locale/easyui-lang-bg.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/locale/easyui-lang-ca.js b/FHC-vendor/easyui/locale/easyui-lang-ca.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/locale/easyui-lang-cs.js b/FHC-vendor/easyui/locale/easyui-lang-cs.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/locale/easyui-lang-cz.js b/FHC-vendor/easyui/locale/easyui-lang-cz.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/locale/easyui-lang-da.js b/FHC-vendor/easyui/locale/easyui-lang-da.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/locale/easyui-lang-de.js b/FHC-vendor/easyui/locale/easyui-lang-de.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/locale/easyui-lang-el.js b/FHC-vendor/easyui/locale/easyui-lang-el.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/locale/easyui-lang-en.js b/FHC-vendor/easyui/locale/easyui-lang-en.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/locale/easyui-lang-es.js b/FHC-vendor/easyui/locale/easyui-lang-es.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/locale/easyui-lang-fr.js b/FHC-vendor/easyui/locale/easyui-lang-fr.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/locale/easyui-lang-it.js b/FHC-vendor/easyui/locale/easyui-lang-it.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/locale/easyui-lang-jp.js b/FHC-vendor/easyui/locale/easyui-lang-jp.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/locale/easyui-lang-nl.js b/FHC-vendor/easyui/locale/easyui-lang-nl.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/locale/easyui-lang-pl.js b/FHC-vendor/easyui/locale/easyui-lang-pl.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/locale/easyui-lang-pt_BR.js b/FHC-vendor/easyui/locale/easyui-lang-pt_BR.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/locale/easyui-lang-ru.js b/FHC-vendor/easyui/locale/easyui-lang-ru.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/locale/easyui-lang-sv_SE.js b/FHC-vendor/easyui/locale/easyui-lang-sv_SE.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/locale/easyui-lang-tr.js b/FHC-vendor/easyui/locale/easyui-lang-tr.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/locale/easyui-lang-zh_CN.js b/FHC-vendor/easyui/locale/easyui-lang-zh_CN.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/locale/easyui-lang-zh_TW.js b/FHC-vendor/easyui/locale/easyui-lang-zh_TW.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/plugins/jquery.accordion.js b/FHC-vendor/easyui/plugins/jquery.accordion.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/plugins/jquery.calendar.js b/FHC-vendor/easyui/plugins/jquery.calendar.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/plugins/jquery.combo.js b/FHC-vendor/easyui/plugins/jquery.combo.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/plugins/jquery.combobox.js b/FHC-vendor/easyui/plugins/jquery.combobox.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/plugins/jquery.combogrid.js b/FHC-vendor/easyui/plugins/jquery.combogrid.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/plugins/jquery.combotree.js b/FHC-vendor/easyui/plugins/jquery.combotree.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/plugins/jquery.datagrid.js b/FHC-vendor/easyui/plugins/jquery.datagrid.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/plugins/jquery.datalist.js b/FHC-vendor/easyui/plugins/jquery.datalist.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/plugins/jquery.datebox.js b/FHC-vendor/easyui/plugins/jquery.datebox.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/plugins/jquery.datetimebox.js b/FHC-vendor/easyui/plugins/jquery.datetimebox.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/plugins/jquery.datetimespinner.js b/FHC-vendor/easyui/plugins/jquery.datetimespinner.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/plugins/jquery.dialog.js b/FHC-vendor/easyui/plugins/jquery.dialog.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/plugins/jquery.draggable.js b/FHC-vendor/easyui/plugins/jquery.draggable.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/plugins/jquery.droppable.js b/FHC-vendor/easyui/plugins/jquery.droppable.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/plugins/jquery.filebox.js b/FHC-vendor/easyui/plugins/jquery.filebox.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/plugins/jquery.form.js b/FHC-vendor/easyui/plugins/jquery.form.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/plugins/jquery.layout.js b/FHC-vendor/easyui/plugins/jquery.layout.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/plugins/jquery.linkbutton.js b/FHC-vendor/easyui/plugins/jquery.linkbutton.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/plugins/jquery.menu.js b/FHC-vendor/easyui/plugins/jquery.menu.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/plugins/jquery.menubutton.js b/FHC-vendor/easyui/plugins/jquery.menubutton.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/plugins/jquery.messager.js b/FHC-vendor/easyui/plugins/jquery.messager.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/plugins/jquery.mobile.js b/FHC-vendor/easyui/plugins/jquery.mobile.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/plugins/jquery.numberbox.js b/FHC-vendor/easyui/plugins/jquery.numberbox.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/plugins/jquery.numberspinner.js b/FHC-vendor/easyui/plugins/jquery.numberspinner.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/plugins/jquery.pagination.js b/FHC-vendor/easyui/plugins/jquery.pagination.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/plugins/jquery.panel.js b/FHC-vendor/easyui/plugins/jquery.panel.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/plugins/jquery.parser.js b/FHC-vendor/easyui/plugins/jquery.parser.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/plugins/jquery.progressbar.js b/FHC-vendor/easyui/plugins/jquery.progressbar.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/plugins/jquery.propertygrid.js b/FHC-vendor/easyui/plugins/jquery.propertygrid.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/plugins/jquery.resizable.js b/FHC-vendor/easyui/plugins/jquery.resizable.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/plugins/jquery.searchbox.js b/FHC-vendor/easyui/plugins/jquery.searchbox.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/plugins/jquery.slider.js b/FHC-vendor/easyui/plugins/jquery.slider.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/plugins/jquery.spinner.js b/FHC-vendor/easyui/plugins/jquery.spinner.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/plugins/jquery.splitbutton.js b/FHC-vendor/easyui/plugins/jquery.splitbutton.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/plugins/jquery.switchbutton.js b/FHC-vendor/easyui/plugins/jquery.switchbutton.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/plugins/jquery.tabs.js b/FHC-vendor/easyui/plugins/jquery.tabs.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/plugins/jquery.textbox.js b/FHC-vendor/easyui/plugins/jquery.textbox.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/plugins/jquery.timespinner.js b/FHC-vendor/easyui/plugins/jquery.timespinner.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/plugins/jquery.tooltip.js b/FHC-vendor/easyui/plugins/jquery.tooltip.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/plugins/jquery.tree.js b/FHC-vendor/easyui/plugins/jquery.tree.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/plugins/jquery.treegrid.js b/FHC-vendor/easyui/plugins/jquery.treegrid.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/plugins/jquery.validatebox.js b/FHC-vendor/easyui/plugins/jquery.validatebox.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/plugins/jquery.window.js b/FHC-vendor/easyui/plugins/jquery.window.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/readme.txt b/FHC-vendor/easyui/readme.txt
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/src/easyloader.js b/FHC-vendor/easyui/src/easyloader.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/src/jquery.accordion.js b/FHC-vendor/easyui/src/jquery.accordion.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/src/jquery.calendar.js b/FHC-vendor/easyui/src/jquery.calendar.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/src/jquery.combobox.js b/FHC-vendor/easyui/src/jquery.combobox.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/src/jquery.datebox.js b/FHC-vendor/easyui/src/jquery.datebox.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/src/jquery.draggable.js b/FHC-vendor/easyui/src/jquery.draggable.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/src/jquery.droppable.js b/FHC-vendor/easyui/src/jquery.droppable.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/src/jquery.form.js b/FHC-vendor/easyui/src/jquery.form.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/src/jquery.linkbutton.js b/FHC-vendor/easyui/src/jquery.linkbutton.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/src/jquery.menu.js b/FHC-vendor/easyui/src/jquery.menu.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/src/jquery.parser.js b/FHC-vendor/easyui/src/jquery.parser.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/src/jquery.progressbar.js b/FHC-vendor/easyui/src/jquery.progressbar.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/src/jquery.propertygrid.js b/FHC-vendor/easyui/src/jquery.propertygrid.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/src/jquery.resizable.js b/FHC-vendor/easyui/src/jquery.resizable.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/src/jquery.slider.js b/FHC-vendor/easyui/src/jquery.slider.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/src/jquery.tabs.js b/FHC-vendor/easyui/src/jquery.tabs.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/src/jquery.window.js b/FHC-vendor/easyui/src/jquery.window.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/black/accordion.css b/FHC-vendor/easyui/themes/black/accordion.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/black/calendar.css b/FHC-vendor/easyui/themes/black/calendar.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/black/combo.css b/FHC-vendor/easyui/themes/black/combo.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/black/combobox.css b/FHC-vendor/easyui/themes/black/combobox.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/black/datagrid.css b/FHC-vendor/easyui/themes/black/datagrid.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/black/datalist.css b/FHC-vendor/easyui/themes/black/datalist.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/black/datebox.css b/FHC-vendor/easyui/themes/black/datebox.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/black/dialog.css b/FHC-vendor/easyui/themes/black/dialog.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/black/easyui.css b/FHC-vendor/easyui/themes/black/easyui.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/black/filebox.css b/FHC-vendor/easyui/themes/black/filebox.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/black/images/accordion_arrows.png b/FHC-vendor/easyui/themes/black/images/accordion_arrows.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/black/images/blank.gif b/FHC-vendor/easyui/themes/black/images/blank.gif
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/black/images/calendar_arrows.png b/FHC-vendor/easyui/themes/black/images/calendar_arrows.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/black/images/combo_arrow.png b/FHC-vendor/easyui/themes/black/images/combo_arrow.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/black/images/datagrid_icons.png b/FHC-vendor/easyui/themes/black/images/datagrid_icons.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/black/images/datebox_arrow.png b/FHC-vendor/easyui/themes/black/images/datebox_arrow.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/black/images/layout_arrows.png b/FHC-vendor/easyui/themes/black/images/layout_arrows.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/black/images/linkbutton_bg.png b/FHC-vendor/easyui/themes/black/images/linkbutton_bg.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/black/images/loading.gif b/FHC-vendor/easyui/themes/black/images/loading.gif
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/black/images/menu_arrows.png b/FHC-vendor/easyui/themes/black/images/menu_arrows.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/black/images/messager_icons.png b/FHC-vendor/easyui/themes/black/images/messager_icons.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/black/images/pagination_icons.png b/FHC-vendor/easyui/themes/black/images/pagination_icons.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/black/images/panel_tools.png b/FHC-vendor/easyui/themes/black/images/panel_tools.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/black/images/searchbox_button.png b/FHC-vendor/easyui/themes/black/images/searchbox_button.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/black/images/slider_handle.png b/FHC-vendor/easyui/themes/black/images/slider_handle.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/black/images/spinner_arrows.png b/FHC-vendor/easyui/themes/black/images/spinner_arrows.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/black/images/tabs_icons.png b/FHC-vendor/easyui/themes/black/images/tabs_icons.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/black/images/tree_icons.png b/FHC-vendor/easyui/themes/black/images/tree_icons.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/black/images/validatebox_warning.png b/FHC-vendor/easyui/themes/black/images/validatebox_warning.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/black/layout.css b/FHC-vendor/easyui/themes/black/layout.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/black/linkbutton.css b/FHC-vendor/easyui/themes/black/linkbutton.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/black/menu.css b/FHC-vendor/easyui/themes/black/menu.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/black/menubutton.css b/FHC-vendor/easyui/themes/black/menubutton.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/black/messager.css b/FHC-vendor/easyui/themes/black/messager.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/black/numberbox.css b/FHC-vendor/easyui/themes/black/numberbox.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/black/pagination.css b/FHC-vendor/easyui/themes/black/pagination.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/black/panel.css b/FHC-vendor/easyui/themes/black/panel.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/black/progressbar.css b/FHC-vendor/easyui/themes/black/progressbar.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/black/propertygrid.css b/FHC-vendor/easyui/themes/black/propertygrid.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/black/searchbox.css b/FHC-vendor/easyui/themes/black/searchbox.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/black/slider.css b/FHC-vendor/easyui/themes/black/slider.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/black/spinner.css b/FHC-vendor/easyui/themes/black/spinner.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/black/splitbutton.css b/FHC-vendor/easyui/themes/black/splitbutton.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/black/switchbutton.css b/FHC-vendor/easyui/themes/black/switchbutton.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/black/tabs.css b/FHC-vendor/easyui/themes/black/tabs.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/black/textbox.css b/FHC-vendor/easyui/themes/black/textbox.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/black/tooltip.css b/FHC-vendor/easyui/themes/black/tooltip.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/black/tree.css b/FHC-vendor/easyui/themes/black/tree.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/black/validatebox.css b/FHC-vendor/easyui/themes/black/validatebox.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/black/window.css b/FHC-vendor/easyui/themes/black/window.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/bootstrap/accordion.css b/FHC-vendor/easyui/themes/bootstrap/accordion.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/bootstrap/calendar.css b/FHC-vendor/easyui/themes/bootstrap/calendar.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/bootstrap/combo.css b/FHC-vendor/easyui/themes/bootstrap/combo.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/bootstrap/combobox.css b/FHC-vendor/easyui/themes/bootstrap/combobox.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/bootstrap/datagrid.css b/FHC-vendor/easyui/themes/bootstrap/datagrid.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/bootstrap/datebox.css b/FHC-vendor/easyui/themes/bootstrap/datebox.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/bootstrap/dialog.css b/FHC-vendor/easyui/themes/bootstrap/dialog.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/bootstrap/easyui.css b/FHC-vendor/easyui/themes/bootstrap/easyui.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/bootstrap/filebox.css b/FHC-vendor/easyui/themes/bootstrap/filebox.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/bootstrap/images/accordion_arrows.png b/FHC-vendor/easyui/themes/bootstrap/images/accordion_arrows.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/bootstrap/images/blank.gif b/FHC-vendor/easyui/themes/bootstrap/images/blank.gif
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/bootstrap/images/calendar_arrows.png b/FHC-vendor/easyui/themes/bootstrap/images/calendar_arrows.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/bootstrap/images/combo_arrow.png b/FHC-vendor/easyui/themes/bootstrap/images/combo_arrow.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/bootstrap/images/datagrid_icons.png b/FHC-vendor/easyui/themes/bootstrap/images/datagrid_icons.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/bootstrap/images/datebox_arrow.png b/FHC-vendor/easyui/themes/bootstrap/images/datebox_arrow.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/bootstrap/images/layout_arrows.png b/FHC-vendor/easyui/themes/bootstrap/images/layout_arrows.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/bootstrap/images/linkbutton_bg.png b/FHC-vendor/easyui/themes/bootstrap/images/linkbutton_bg.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/bootstrap/images/loading.gif b/FHC-vendor/easyui/themes/bootstrap/images/loading.gif
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/bootstrap/images/menu_arrows.png b/FHC-vendor/easyui/themes/bootstrap/images/menu_arrows.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/bootstrap/images/messager_icons.png b/FHC-vendor/easyui/themes/bootstrap/images/messager_icons.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/bootstrap/images/pagination_icons.png b/FHC-vendor/easyui/themes/bootstrap/images/pagination_icons.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/bootstrap/images/panel_tools.png b/FHC-vendor/easyui/themes/bootstrap/images/panel_tools.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/bootstrap/images/searchbox_button.png b/FHC-vendor/easyui/themes/bootstrap/images/searchbox_button.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/bootstrap/images/slider_handle.png b/FHC-vendor/easyui/themes/bootstrap/images/slider_handle.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/bootstrap/images/spinner_arrows.png b/FHC-vendor/easyui/themes/bootstrap/images/spinner_arrows.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/bootstrap/images/tabs_icons.png b/FHC-vendor/easyui/themes/bootstrap/images/tabs_icons.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/bootstrap/images/tree_icons.png b/FHC-vendor/easyui/themes/bootstrap/images/tree_icons.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/bootstrap/images/validatebox_warning.png b/FHC-vendor/easyui/themes/bootstrap/images/validatebox_warning.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/bootstrap/layout.css b/FHC-vendor/easyui/themes/bootstrap/layout.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/bootstrap/linkbutton.css b/FHC-vendor/easyui/themes/bootstrap/linkbutton.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/bootstrap/menu.css b/FHC-vendor/easyui/themes/bootstrap/menu.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/bootstrap/menubutton.css b/FHC-vendor/easyui/themes/bootstrap/menubutton.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/bootstrap/messager.css b/FHC-vendor/easyui/themes/bootstrap/messager.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/bootstrap/numberbox.css b/FHC-vendor/easyui/themes/bootstrap/numberbox.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/bootstrap/pagination.css b/FHC-vendor/easyui/themes/bootstrap/pagination.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/bootstrap/panel.css b/FHC-vendor/easyui/themes/bootstrap/panel.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/bootstrap/progressbar.css b/FHC-vendor/easyui/themes/bootstrap/progressbar.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/bootstrap/propertygrid.css b/FHC-vendor/easyui/themes/bootstrap/propertygrid.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/bootstrap/searchbox.css b/FHC-vendor/easyui/themes/bootstrap/searchbox.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/bootstrap/slider.css b/FHC-vendor/easyui/themes/bootstrap/slider.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/bootstrap/spinner.css b/FHC-vendor/easyui/themes/bootstrap/spinner.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/bootstrap/splitbutton.css b/FHC-vendor/easyui/themes/bootstrap/splitbutton.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/bootstrap/switchbutton.css b/FHC-vendor/easyui/themes/bootstrap/switchbutton.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/bootstrap/tabs.css b/FHC-vendor/easyui/themes/bootstrap/tabs.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/bootstrap/textbox.css b/FHC-vendor/easyui/themes/bootstrap/textbox.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/bootstrap/tooltip.css b/FHC-vendor/easyui/themes/bootstrap/tooltip.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/bootstrap/tree.css b/FHC-vendor/easyui/themes/bootstrap/tree.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/bootstrap/validatebox.css b/FHC-vendor/easyui/themes/bootstrap/validatebox.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/bootstrap/window.css b/FHC-vendor/easyui/themes/bootstrap/window.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/color.css b/FHC-vendor/easyui/themes/color.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/default/accordion.css b/FHC-vendor/easyui/themes/default/accordion.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/default/calendar.css b/FHC-vendor/easyui/themes/default/calendar.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/default/combo.css b/FHC-vendor/easyui/themes/default/combo.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/default/combobox.css b/FHC-vendor/easyui/themes/default/combobox.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/default/datagrid.css b/FHC-vendor/easyui/themes/default/datagrid.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/default/datalist.css b/FHC-vendor/easyui/themes/default/datalist.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/default/datebox.css b/FHC-vendor/easyui/themes/default/datebox.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/default/dialog.css b/FHC-vendor/easyui/themes/default/dialog.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/default/easyui.css b/FHC-vendor/easyui/themes/default/easyui.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/default/filebox.css b/FHC-vendor/easyui/themes/default/filebox.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/default/images/accordion_arrows.png b/FHC-vendor/easyui/themes/default/images/accordion_arrows.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/default/images/blank.gif b/FHC-vendor/easyui/themes/default/images/blank.gif
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/default/images/calendar_arrows.png b/FHC-vendor/easyui/themes/default/images/calendar_arrows.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/default/images/combo_arrow.png b/FHC-vendor/easyui/themes/default/images/combo_arrow.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/default/images/datagrid_icons.png b/FHC-vendor/easyui/themes/default/images/datagrid_icons.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/default/images/datebox_arrow.png b/FHC-vendor/easyui/themes/default/images/datebox_arrow.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/default/images/layout_arrows.png b/FHC-vendor/easyui/themes/default/images/layout_arrows.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/default/images/linkbutton_bg.png b/FHC-vendor/easyui/themes/default/images/linkbutton_bg.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/default/images/loading.gif b/FHC-vendor/easyui/themes/default/images/loading.gif
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/default/images/menu_arrows.png b/FHC-vendor/easyui/themes/default/images/menu_arrows.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/default/images/messager_icons.png b/FHC-vendor/easyui/themes/default/images/messager_icons.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/default/images/pagination_icons.png b/FHC-vendor/easyui/themes/default/images/pagination_icons.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/default/images/panel_tools.png b/FHC-vendor/easyui/themes/default/images/panel_tools.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/default/images/searchbox_button.png b/FHC-vendor/easyui/themes/default/images/searchbox_button.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/default/images/slider_handle.png b/FHC-vendor/easyui/themes/default/images/slider_handle.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/default/images/spinner_arrows.png b/FHC-vendor/easyui/themes/default/images/spinner_arrows.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/default/images/tabs_icons.png b/FHC-vendor/easyui/themes/default/images/tabs_icons.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/default/images/tree_icons.png b/FHC-vendor/easyui/themes/default/images/tree_icons.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/default/images/validatebox_warning.png b/FHC-vendor/easyui/themes/default/images/validatebox_warning.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/default/layout.css b/FHC-vendor/easyui/themes/default/layout.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/default/linkbutton.css b/FHC-vendor/easyui/themes/default/linkbutton.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/default/menu.css b/FHC-vendor/easyui/themes/default/menu.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/default/menubutton.css b/FHC-vendor/easyui/themes/default/menubutton.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/default/messager.css b/FHC-vendor/easyui/themes/default/messager.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/default/numberbox.css b/FHC-vendor/easyui/themes/default/numberbox.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/default/pagination.css b/FHC-vendor/easyui/themes/default/pagination.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/default/panel.css b/FHC-vendor/easyui/themes/default/panel.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/default/progressbar.css b/FHC-vendor/easyui/themes/default/progressbar.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/default/propertygrid.css b/FHC-vendor/easyui/themes/default/propertygrid.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/default/searchbox.css b/FHC-vendor/easyui/themes/default/searchbox.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/default/slider.css b/FHC-vendor/easyui/themes/default/slider.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/default/spinner.css b/FHC-vendor/easyui/themes/default/spinner.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/default/splitbutton.css b/FHC-vendor/easyui/themes/default/splitbutton.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/default/switchbutton.css b/FHC-vendor/easyui/themes/default/switchbutton.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/default/tabs.css b/FHC-vendor/easyui/themes/default/tabs.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/default/textbox.css b/FHC-vendor/easyui/themes/default/textbox.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/default/tooltip.css b/FHC-vendor/easyui/themes/default/tooltip.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/default/tree.css b/FHC-vendor/easyui/themes/default/tree.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/default/validatebox.css b/FHC-vendor/easyui/themes/default/validatebox.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/default/window.css b/FHC-vendor/easyui/themes/default/window.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/gray/accordion.css b/FHC-vendor/easyui/themes/gray/accordion.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/gray/calendar.css b/FHC-vendor/easyui/themes/gray/calendar.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/gray/combo.css b/FHC-vendor/easyui/themes/gray/combo.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/gray/combobox.css b/FHC-vendor/easyui/themes/gray/combobox.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/gray/datagrid.css b/FHC-vendor/easyui/themes/gray/datagrid.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/gray/datalist.css b/FHC-vendor/easyui/themes/gray/datalist.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/gray/datebox.css b/FHC-vendor/easyui/themes/gray/datebox.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/gray/dialog.css b/FHC-vendor/easyui/themes/gray/dialog.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/gray/easyui.css b/FHC-vendor/easyui/themes/gray/easyui.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/gray/filebox.css b/FHC-vendor/easyui/themes/gray/filebox.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/gray/images/accordion_arrows.png b/FHC-vendor/easyui/themes/gray/images/accordion_arrows.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/gray/images/blank.gif b/FHC-vendor/easyui/themes/gray/images/blank.gif
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/gray/images/calendar_arrows.png b/FHC-vendor/easyui/themes/gray/images/calendar_arrows.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/gray/images/combo_arrow.png b/FHC-vendor/easyui/themes/gray/images/combo_arrow.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/gray/images/datagrid_icons.png b/FHC-vendor/easyui/themes/gray/images/datagrid_icons.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/gray/images/datebox_arrow.png b/FHC-vendor/easyui/themes/gray/images/datebox_arrow.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/gray/images/layout_arrows.png b/FHC-vendor/easyui/themes/gray/images/layout_arrows.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/gray/images/linkbutton_bg.png b/FHC-vendor/easyui/themes/gray/images/linkbutton_bg.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/gray/images/loading.gif b/FHC-vendor/easyui/themes/gray/images/loading.gif
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/gray/images/menu_arrows.png b/FHC-vendor/easyui/themes/gray/images/menu_arrows.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/gray/images/messager_icons.png b/FHC-vendor/easyui/themes/gray/images/messager_icons.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/gray/images/pagination_icons.png b/FHC-vendor/easyui/themes/gray/images/pagination_icons.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/gray/images/panel_tools.png b/FHC-vendor/easyui/themes/gray/images/panel_tools.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/gray/images/searchbox_button.png b/FHC-vendor/easyui/themes/gray/images/searchbox_button.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/gray/images/slider_handle.png b/FHC-vendor/easyui/themes/gray/images/slider_handle.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/gray/images/spinner_arrows.png b/FHC-vendor/easyui/themes/gray/images/spinner_arrows.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/gray/images/tabs_icons.png b/FHC-vendor/easyui/themes/gray/images/tabs_icons.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/gray/images/tree_icons.png b/FHC-vendor/easyui/themes/gray/images/tree_icons.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/gray/images/validatebox_warning.png b/FHC-vendor/easyui/themes/gray/images/validatebox_warning.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/gray/layout.css b/FHC-vendor/easyui/themes/gray/layout.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/gray/linkbutton.css b/FHC-vendor/easyui/themes/gray/linkbutton.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/gray/menu.css b/FHC-vendor/easyui/themes/gray/menu.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/gray/menubutton.css b/FHC-vendor/easyui/themes/gray/menubutton.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/gray/messager.css b/FHC-vendor/easyui/themes/gray/messager.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/gray/numberbox.css b/FHC-vendor/easyui/themes/gray/numberbox.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/gray/pagination.css b/FHC-vendor/easyui/themes/gray/pagination.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/gray/panel.css b/FHC-vendor/easyui/themes/gray/panel.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/gray/progressbar.css b/FHC-vendor/easyui/themes/gray/progressbar.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/gray/propertygrid.css b/FHC-vendor/easyui/themes/gray/propertygrid.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/gray/searchbox.css b/FHC-vendor/easyui/themes/gray/searchbox.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/gray/slider.css b/FHC-vendor/easyui/themes/gray/slider.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/gray/spinner.css b/FHC-vendor/easyui/themes/gray/spinner.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/gray/splitbutton.css b/FHC-vendor/easyui/themes/gray/splitbutton.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/gray/switchbutton.css b/FHC-vendor/easyui/themes/gray/switchbutton.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/gray/tabs.css b/FHC-vendor/easyui/themes/gray/tabs.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/gray/textbox.css b/FHC-vendor/easyui/themes/gray/textbox.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/gray/tooltip.css b/FHC-vendor/easyui/themes/gray/tooltip.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/gray/tree.css b/FHC-vendor/easyui/themes/gray/tree.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/gray/validatebox.css b/FHC-vendor/easyui/themes/gray/validatebox.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/gray/window.css b/FHC-vendor/easyui/themes/gray/window.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/icon.css b/FHC-vendor/easyui/themes/icon.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/icons/back.png b/FHC-vendor/easyui/themes/icons/back.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/icons/blank.gif b/FHC-vendor/easyui/themes/icons/blank.gif
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/icons/cancel.png b/FHC-vendor/easyui/themes/icons/cancel.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/icons/clear.png b/FHC-vendor/easyui/themes/icons/clear.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/icons/cut.png b/FHC-vendor/easyui/themes/icons/cut.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/icons/edit_add.png b/FHC-vendor/easyui/themes/icons/edit_add.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/icons/edit_remove.png b/FHC-vendor/easyui/themes/icons/edit_remove.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/icons/filesave.png b/FHC-vendor/easyui/themes/icons/filesave.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/icons/filter.png b/FHC-vendor/easyui/themes/icons/filter.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/icons/help.png b/FHC-vendor/easyui/themes/icons/help.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/icons/large_chart.png b/FHC-vendor/easyui/themes/icons/large_chart.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/icons/large_clipart.png b/FHC-vendor/easyui/themes/icons/large_clipart.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/icons/large_picture.png b/FHC-vendor/easyui/themes/icons/large_picture.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/icons/large_shapes.png b/FHC-vendor/easyui/themes/icons/large_shapes.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/icons/large_smartart.png b/FHC-vendor/easyui/themes/icons/large_smartart.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/icons/lock.png b/FHC-vendor/easyui/themes/icons/lock.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/icons/man.png b/FHC-vendor/easyui/themes/icons/man.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/icons/mini_add.png b/FHC-vendor/easyui/themes/icons/mini_add.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/icons/mini_edit.png b/FHC-vendor/easyui/themes/icons/mini_edit.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/icons/mini_refresh.png b/FHC-vendor/easyui/themes/icons/mini_refresh.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/icons/more.png b/FHC-vendor/easyui/themes/icons/more.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/icons/no.png b/FHC-vendor/easyui/themes/icons/no.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/icons/ok.png b/FHC-vendor/easyui/themes/icons/ok.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/icons/pencil.png b/FHC-vendor/easyui/themes/icons/pencil.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/icons/print.png b/FHC-vendor/easyui/themes/icons/print.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/icons/redo.png b/FHC-vendor/easyui/themes/icons/redo.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/icons/reload.png b/FHC-vendor/easyui/themes/icons/reload.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/icons/search.png b/FHC-vendor/easyui/themes/icons/search.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/icons/sum.png b/FHC-vendor/easyui/themes/icons/sum.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/icons/tip.png b/FHC-vendor/easyui/themes/icons/tip.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/icons/undo.png b/FHC-vendor/easyui/themes/icons/undo.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/metro/accordion.css b/FHC-vendor/easyui/themes/metro/accordion.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/metro/calendar.css b/FHC-vendor/easyui/themes/metro/calendar.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/metro/combo.css b/FHC-vendor/easyui/themes/metro/combo.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/metro/combobox.css b/FHC-vendor/easyui/themes/metro/combobox.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/metro/datagrid.css b/FHC-vendor/easyui/themes/metro/datagrid.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/metro/datalist.css b/FHC-vendor/easyui/themes/metro/datalist.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/metro/datebox.css b/FHC-vendor/easyui/themes/metro/datebox.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/metro/dialog.css b/FHC-vendor/easyui/themes/metro/dialog.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/metro/easyui.css b/FHC-vendor/easyui/themes/metro/easyui.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/metro/filebox.css b/FHC-vendor/easyui/themes/metro/filebox.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/metro/images/accordion_arrows.png b/FHC-vendor/easyui/themes/metro/images/accordion_arrows.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/metro/images/blank.gif b/FHC-vendor/easyui/themes/metro/images/blank.gif
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/metro/images/calendar_arrows.png b/FHC-vendor/easyui/themes/metro/images/calendar_arrows.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/metro/images/combo_arrow.png b/FHC-vendor/easyui/themes/metro/images/combo_arrow.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/metro/images/datagrid_icons.png b/FHC-vendor/easyui/themes/metro/images/datagrid_icons.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/metro/images/datebox_arrow.png b/FHC-vendor/easyui/themes/metro/images/datebox_arrow.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/metro/images/layout_arrows.png b/FHC-vendor/easyui/themes/metro/images/layout_arrows.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/metro/images/linkbutton_bg.png b/FHC-vendor/easyui/themes/metro/images/linkbutton_bg.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/metro/images/loading.gif b/FHC-vendor/easyui/themes/metro/images/loading.gif
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/metro/images/menu_arrows.png b/FHC-vendor/easyui/themes/metro/images/menu_arrows.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/metro/images/messager_icons.png b/FHC-vendor/easyui/themes/metro/images/messager_icons.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/metro/images/pagination_icons.png b/FHC-vendor/easyui/themes/metro/images/pagination_icons.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/metro/images/panel_tools.png b/FHC-vendor/easyui/themes/metro/images/panel_tools.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/metro/images/searchbox_button.png b/FHC-vendor/easyui/themes/metro/images/searchbox_button.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/metro/images/slider_handle.png b/FHC-vendor/easyui/themes/metro/images/slider_handle.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/metro/images/spinner_arrows.png b/FHC-vendor/easyui/themes/metro/images/spinner_arrows.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/metro/images/tabs_icons.png b/FHC-vendor/easyui/themes/metro/images/tabs_icons.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/metro/images/tree_icons.png b/FHC-vendor/easyui/themes/metro/images/tree_icons.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/metro/images/validatebox_warning.png b/FHC-vendor/easyui/themes/metro/images/validatebox_warning.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/metro/layout.css b/FHC-vendor/easyui/themes/metro/layout.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/metro/linkbutton.css b/FHC-vendor/easyui/themes/metro/linkbutton.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/metro/menu.css b/FHC-vendor/easyui/themes/metro/menu.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/metro/menubutton.css b/FHC-vendor/easyui/themes/metro/menubutton.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/metro/messager.css b/FHC-vendor/easyui/themes/metro/messager.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/metro/numberbox.css b/FHC-vendor/easyui/themes/metro/numberbox.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/metro/pagination.css b/FHC-vendor/easyui/themes/metro/pagination.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/metro/panel.css b/FHC-vendor/easyui/themes/metro/panel.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/metro/progressbar.css b/FHC-vendor/easyui/themes/metro/progressbar.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/metro/propertygrid.css b/FHC-vendor/easyui/themes/metro/propertygrid.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/metro/searchbox.css b/FHC-vendor/easyui/themes/metro/searchbox.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/metro/slider.css b/FHC-vendor/easyui/themes/metro/slider.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/metro/spinner.css b/FHC-vendor/easyui/themes/metro/spinner.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/metro/splitbutton.css b/FHC-vendor/easyui/themes/metro/splitbutton.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/metro/switchbutton.css b/FHC-vendor/easyui/themes/metro/switchbutton.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/metro/tabs.css b/FHC-vendor/easyui/themes/metro/tabs.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/metro/textbox.css b/FHC-vendor/easyui/themes/metro/textbox.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/metro/tooltip.css b/FHC-vendor/easyui/themes/metro/tooltip.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/metro/tree.css b/FHC-vendor/easyui/themes/metro/tree.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/metro/validatebox.css b/FHC-vendor/easyui/themes/metro/validatebox.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/metro/window.css b/FHC-vendor/easyui/themes/metro/window.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/mobile.css b/FHC-vendor/easyui/themes/mobile.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/easyui/themes/vilesci b/FHC-vendor/easyui/themes/vilesci
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/.gitattributes b/FHC-vendor/jquery-tablesorter/.gitattributes
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/.gitignore b/FHC-vendor/jquery-tablesorter/.gitignore
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/.jscsrc b/FHC-vendor/jquery-tablesorter/.jscsrc
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/CONTRIBUTING.md b/FHC-vendor/jquery-tablesorter/CONTRIBUTING.md
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/Gruntfile.js b/FHC-vendor/jquery-tablesorter/Gruntfile.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/README.md b/FHC-vendor/jquery-tablesorter/README.md
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/addons/pager/icons/first.png b/FHC-vendor/jquery-tablesorter/addons/pager/icons/first.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/addons/pager/icons/last.png b/FHC-vendor/jquery-tablesorter/addons/pager/icons/last.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/addons/pager/icons/loading.gif b/FHC-vendor/jquery-tablesorter/addons/pager/icons/loading.gif
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/addons/pager/icons/next.png b/FHC-vendor/jquery-tablesorter/addons/pager/icons/next.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/addons/pager/icons/prev.png b/FHC-vendor/jquery-tablesorter/addons/pager/icons/prev.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/addons/pager/jquery.tablesorter.pager.css b/FHC-vendor/jquery-tablesorter/addons/pager/jquery.tablesorter.pager.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/addons/pager/jquery.tablesorter.pager.js b/FHC-vendor/jquery-tablesorter/addons/pager/jquery.tablesorter.pager.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/beta-testing/example-pager-custom-controls.html b/FHC-vendor/jquery-tablesorter/beta-testing/example-pager-custom-controls.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/beta-testing/example-widget-column-reorder.html b/FHC-vendor/jquery-tablesorter/beta-testing/example-widget-column-reorder.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/beta-testing/pager-custom-controls.js b/FHC-vendor/jquery-tablesorter/beta-testing/pager-custom-controls.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/beta-testing/widget-reorder.js b/FHC-vendor/jquery-tablesorter/beta-testing/widget-reorder.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/bower.json b/FHC-vendor/jquery-tablesorter/bower.json
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/changelog.txt b/FHC-vendor/jquery-tablesorter/changelog.txt
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/css/bootstrap.less b/FHC-vendor/jquery-tablesorter/css/bootstrap.less
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/css/dragtable.mod.css b/FHC-vendor/jquery-tablesorter/css/dragtable.mod.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/css/filter.formatter.css b/FHC-vendor/jquery-tablesorter/css/filter.formatter.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/css/images/black-asc.gif b/FHC-vendor/jquery-tablesorter/css/images/black-asc.gif
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/css/images/black-desc.gif b/FHC-vendor/jquery-tablesorter/css/images/black-desc.gif
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/css/images/black-unsorted.gif b/FHC-vendor/jquery-tablesorter/css/images/black-unsorted.gif
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/css/images/bootstrap-black-unsorted.png b/FHC-vendor/jquery-tablesorter/css/images/bootstrap-black-unsorted.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/css/images/bootstrap-white-unsorted.png b/FHC-vendor/jquery-tablesorter/css/images/bootstrap-white-unsorted.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/css/images/dragtable-handle.png b/FHC-vendor/jquery-tablesorter/css/images/dragtable-handle.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/css/images/dragtable-handle.svg b/FHC-vendor/jquery-tablesorter/css/images/dragtable-handle.svg
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/css/images/dropbox-asc-hovered.png b/FHC-vendor/jquery-tablesorter/css/images/dropbox-asc-hovered.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/css/images/dropbox-asc.png b/FHC-vendor/jquery-tablesorter/css/images/dropbox-asc.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/css/images/dropbox-desc-hovered.png b/FHC-vendor/jquery-tablesorter/css/images/dropbox-desc-hovered.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/css/images/dropbox-desc.png b/FHC-vendor/jquery-tablesorter/css/images/dropbox-desc.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/css/images/green-asc.gif b/FHC-vendor/jquery-tablesorter/css/images/green-asc.gif
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/css/images/green-desc.gif b/FHC-vendor/jquery-tablesorter/css/images/green-desc.gif
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/css/images/green-header.gif b/FHC-vendor/jquery-tablesorter/css/images/green-header.gif
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/css/images/green-unsorted.gif b/FHC-vendor/jquery-tablesorter/css/images/green-unsorted.gif
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/css/images/ice-asc.gif b/FHC-vendor/jquery-tablesorter/css/images/ice-asc.gif
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/css/images/ice-desc.gif b/FHC-vendor/jquery-tablesorter/css/images/ice-desc.gif
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/css/images/ice-unsorted.gif b/FHC-vendor/jquery-tablesorter/css/images/ice-unsorted.gif
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/css/images/metro-black-asc.png b/FHC-vendor/jquery-tablesorter/css/images/metro-black-asc.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/css/images/metro-black-desc.png b/FHC-vendor/jquery-tablesorter/css/images/metro-black-desc.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/css/images/metro-loading.gif b/FHC-vendor/jquery-tablesorter/css/images/metro-loading.gif
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/css/images/metro-unsorted.png b/FHC-vendor/jquery-tablesorter/css/images/metro-unsorted.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/css/images/metro-white-asc.png b/FHC-vendor/jquery-tablesorter/css/images/metro-white-asc.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/css/images/metro-white-desc.png b/FHC-vendor/jquery-tablesorter/css/images/metro-white-desc.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/css/images/white-asc.gif b/FHC-vendor/jquery-tablesorter/css/images/white-asc.gif
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/css/images/white-desc.gif b/FHC-vendor/jquery-tablesorter/css/images/white-desc.gif
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/css/images/white-unsorted.gif b/FHC-vendor/jquery-tablesorter/css/images/white-unsorted.gif
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/css/metro.less b/FHC-vendor/jquery-tablesorter/css/metro.less
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/css/psd/green-asc.psd b/FHC-vendor/jquery-tablesorter/css/psd/green-asc.psd
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/css/psd/green-desc.psd b/FHC-vendor/jquery-tablesorter/css/psd/green-desc.psd
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/css/psd/green-unsorted.psd b/FHC-vendor/jquery-tablesorter/css/psd/green-unsorted.psd
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/css/psd/metro-style.psd b/FHC-vendor/jquery-tablesorter/css/psd/metro-style.psd
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/css/theme.black-ice.css b/FHC-vendor/jquery-tablesorter/css/theme.black-ice.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/css/theme.blue.css b/FHC-vendor/jquery-tablesorter/css/theme.blue.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/css/theme.bootstrap.css b/FHC-vendor/jquery-tablesorter/css/theme.bootstrap.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/css/theme.bootstrap_2.css b/FHC-vendor/jquery-tablesorter/css/theme.bootstrap_2.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/css/theme.dark.css b/FHC-vendor/jquery-tablesorter/css/theme.dark.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/css/theme.default.css b/FHC-vendor/jquery-tablesorter/css/theme.default.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/css/theme.dropbox.css b/FHC-vendor/jquery-tablesorter/css/theme.dropbox.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/css/theme.green.css b/FHC-vendor/jquery-tablesorter/css/theme.green.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/css/theme.grey.css b/FHC-vendor/jquery-tablesorter/css/theme.grey.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/css/theme.ice.css b/FHC-vendor/jquery-tablesorter/css/theme.ice.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/css/theme.jui.css b/FHC-vendor/jquery-tablesorter/css/theme.jui.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/css/theme.less b/FHC-vendor/jquery-tablesorter/css/theme.less
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/css/theme.metro-dark.css b/FHC-vendor/jquery-tablesorter/css/theme.metro-dark.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/dragtable.mod.min.css b/FHC-vendor/jquery-tablesorter/dist/css/dragtable.mod.min.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/filter.formatter.min.css b/FHC-vendor/jquery-tablesorter/dist/css/filter.formatter.min.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/black-asc.gif b/FHC-vendor/jquery-tablesorter/dist/css/images/black-asc.gif
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/black-desc.gif b/FHC-vendor/jquery-tablesorter/dist/css/images/black-desc.gif
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/black-unsorted.gif b/FHC-vendor/jquery-tablesorter/dist/css/images/black-unsorted.gif
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/bootstrap-black-unsorted.png b/FHC-vendor/jquery-tablesorter/dist/css/images/bootstrap-black-unsorted.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/bootstrap-white-unsorted.png b/FHC-vendor/jquery-tablesorter/dist/css/images/bootstrap-white-unsorted.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/dragtable-handle.png b/FHC-vendor/jquery-tablesorter/dist/css/images/dragtable-handle.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/dragtable-handle.svg b/FHC-vendor/jquery-tablesorter/dist/css/images/dragtable-handle.svg
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/dropbox-asc-hovered.png b/FHC-vendor/jquery-tablesorter/dist/css/images/dropbox-asc-hovered.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/dropbox-asc.png b/FHC-vendor/jquery-tablesorter/dist/css/images/dropbox-asc.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/dropbox-desc-hovered.png b/FHC-vendor/jquery-tablesorter/dist/css/images/dropbox-desc-hovered.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/dropbox-desc.png b/FHC-vendor/jquery-tablesorter/dist/css/images/dropbox-desc.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/first.png b/FHC-vendor/jquery-tablesorter/dist/css/images/first.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/green-asc.gif b/FHC-vendor/jquery-tablesorter/dist/css/images/green-asc.gif
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/green-desc.gif b/FHC-vendor/jquery-tablesorter/dist/css/images/green-desc.gif
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/green-header.gif b/FHC-vendor/jquery-tablesorter/dist/css/images/green-header.gif
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/green-unsorted.gif b/FHC-vendor/jquery-tablesorter/dist/css/images/green-unsorted.gif
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/ice-asc.gif b/FHC-vendor/jquery-tablesorter/dist/css/images/ice-asc.gif
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/ice-desc.gif b/FHC-vendor/jquery-tablesorter/dist/css/images/ice-desc.gif
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/ice-unsorted.gif b/FHC-vendor/jquery-tablesorter/dist/css/images/ice-unsorted.gif
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/last.png b/FHC-vendor/jquery-tablesorter/dist/css/images/last.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/loading.gif b/FHC-vendor/jquery-tablesorter/dist/css/images/loading.gif
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/metro-black-asc.png b/FHC-vendor/jquery-tablesorter/dist/css/images/metro-black-asc.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/metro-black-desc.png b/FHC-vendor/jquery-tablesorter/dist/css/images/metro-black-desc.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/metro-loading.gif b/FHC-vendor/jquery-tablesorter/dist/css/images/metro-loading.gif
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/metro-unsorted.png b/FHC-vendor/jquery-tablesorter/dist/css/images/metro-unsorted.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/metro-white-asc.png b/FHC-vendor/jquery-tablesorter/dist/css/images/metro-white-asc.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/metro-white-desc.png b/FHC-vendor/jquery-tablesorter/dist/css/images/metro-white-desc.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/next.png b/FHC-vendor/jquery-tablesorter/dist/css/images/next.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/prev.png b/FHC-vendor/jquery-tablesorter/dist/css/images/prev.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/white-asc.gif b/FHC-vendor/jquery-tablesorter/dist/css/images/white-asc.gif
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/white-desc.gif b/FHC-vendor/jquery-tablesorter/dist/css/images/white-desc.gif
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/white-unsorted.gif b/FHC-vendor/jquery-tablesorter/dist/css/images/white-unsorted.gif
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/jquery.tablesorter.pager.min.css b/FHC-vendor/jquery-tablesorter/dist/css/jquery.tablesorter.pager.min.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/less/bootstrap.less b/FHC-vendor/jquery-tablesorter/dist/css/less/bootstrap.less
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/less/metro.less b/FHC-vendor/jquery-tablesorter/dist/css/less/metro.less
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/less/theme.less b/FHC-vendor/jquery-tablesorter/dist/css/less/theme.less
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/theme.blackice.min.css b/FHC-vendor/jquery-tablesorter/dist/css/theme.blackice.min.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/theme.blue.min.css b/FHC-vendor/jquery-tablesorter/dist/css/theme.blue.min.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/theme.bootstrap.min.css b/FHC-vendor/jquery-tablesorter/dist/css/theme.bootstrap.min.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/theme.bootstrap_2.min.css b/FHC-vendor/jquery-tablesorter/dist/css/theme.bootstrap_2.min.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/theme.dark.min.css b/FHC-vendor/jquery-tablesorter/dist/css/theme.dark.min.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/theme.default.min.css b/FHC-vendor/jquery-tablesorter/dist/css/theme.default.min.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/theme.dropbox.min.css b/FHC-vendor/jquery-tablesorter/dist/css/theme.dropbox.min.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/theme.green.min.css b/FHC-vendor/jquery-tablesorter/dist/css/theme.green.min.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/theme.grey.min.css b/FHC-vendor/jquery-tablesorter/dist/css/theme.grey.min.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/theme.ice.min.css b/FHC-vendor/jquery-tablesorter/dist/css/theme.ice.min.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/theme.jui.min.css b/FHC-vendor/jquery-tablesorter/dist/css/theme.jui.min.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/theme.metro-dark.min.css b/FHC-vendor/jquery-tablesorter/dist/css/theme.metro-dark.min.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/extras/jquery.dragtable.mod.min.js b/FHC-vendor/jquery-tablesorter/dist/js/extras/jquery.dragtable.mod.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/extras/jquery.metadata.min.js b/FHC-vendor/jquery-tablesorter/dist/js/extras/jquery.metadata.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/extras/jquery.tablesorter.pager.min.js b/FHC-vendor/jquery-tablesorter/dist/js/extras/jquery.tablesorter.pager.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/extras/semver-mod.min.js b/FHC-vendor/jquery-tablesorter/dist/js/extras/semver-mod.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.combined.js b/FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.combined.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.combined.min.js b/FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.combined.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.js b/FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.min.js b/FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.widgets.js b/FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.widgets.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.widgets.min.js b/FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.widgets.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-extract.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-extract.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-iso8601.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-iso8601.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-month.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-month.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-range.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-range.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-two-digit-year.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-two-digit-year.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-weekday.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-weekday.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-duration.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-duration.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-feet-inch-fraction.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-feet-inch-fraction.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-file-type.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-file-type.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-globalize.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-globalize.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-ignore-articles.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-ignore-articles.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-image.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-image.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-input-select.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-input-select.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-metric.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-metric.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-named-numbers.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-named-numbers.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-network.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-network.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-roman.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-roman.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-alignChar.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-alignChar.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-build-table.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-build-table.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-chart.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-chart.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-columnSelector.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-columnSelector.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-columns.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-columns.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-cssStickyHeaders.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-cssStickyHeaders.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-editable.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-editable.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-filter-formatter-html5.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-filter-formatter-html5.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-filter-formatter-jui.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-filter-formatter-jui.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-filter-formatter-select2.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-filter-formatter-select2.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-filter-type-insideRange.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-filter-type-insideRange.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-filter.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-filter.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-formatter.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-formatter.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-grouping.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-grouping.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-headerTitles.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-headerTitles.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-lazyload.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-lazyload.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-math.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-math.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-output.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-output.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-pager.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-pager.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-print.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-print.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-reflow.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-reflow.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-repeatheaders.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-repeatheaders.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-resizable.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-resizable.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-saveSort.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-saveSort.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-scroller.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-scroller.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-sort2Hash.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-sort2Hash.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-sortTbodies.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-sortTbodies.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-staticRow.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-staticRow.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-stickyHeaders.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-stickyHeaders.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-storage.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-storage.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-toggle.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-toggle.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-uitheme.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-uitheme.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-view.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-view.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/assets/City0.json b/FHC-vendor/jquery-tablesorter/docs/assets/City0.json
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/assets/City1.json b/FHC-vendor/jquery-tablesorter/docs/assets/City1.json
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/assets/City2.json b/FHC-vendor/jquery-tablesorter/docs/assets/City2.json
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/assets/City3.json b/FHC-vendor/jquery-tablesorter/docs/assets/City3.json
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/assets/ajax-content.html b/FHC-vendor/jquery-tablesorter/docs/assets/ajax-content.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/assets/build.json b/FHC-vendor/jquery-tablesorter/docs/assets/build.json
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/assets/build.txt b/FHC-vendor/jquery-tablesorter/docs/assets/build.txt
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/assets/theme_switcher.json b/FHC-vendor/jquery-tablesorter/docs/assets/theme_switcher.json
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/bootstrap-v2.min.css b/FHC-vendor/jquery-tablesorter/docs/css/bootstrap-v2.min.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/bootstrap.min.css b/FHC-vendor/jquery-tablesorter/docs/css/bootstrap.min.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/images/glyphicons-halflings-white.png b/FHC-vendor/jquery-tablesorter/docs/css/images/glyphicons-halflings-white.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/images/glyphicons-halflings.png b/FHC-vendor/jquery-tablesorter/docs/css/images/glyphicons-halflings.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png b/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_flat_15_cd0a0a_40x100.png b/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_flat_15_cd0a0a_40x100.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_glass_100_e4f1fb_1x400.png b/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_glass_100_e4f1fb_1x400.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_glass_50_3baae3_1x400.png b/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_glass_50_3baae3_1x400.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_glass_80_d7ebf9_1x400.png b/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_glass_80_d7ebf9_1x400.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png b/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_highlight-hard_70_000000_1x100.png b/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_highlight-hard_70_000000_1x100.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_highlight-soft_100_deedf7_1x100.png b/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_highlight-soft_100_deedf7_1x100.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_highlight-soft_25_ffef8f_1x100.png b/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_highlight-soft_25_ffef8f_1x100.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/images/ui-icons_2694e8_256x240.png b/FHC-vendor/jquery-tablesorter/docs/css/images/ui-icons_2694e8_256x240.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/images/ui-icons_2e83ff_256x240.png b/FHC-vendor/jquery-tablesorter/docs/css/images/ui-icons_2e83ff_256x240.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/images/ui-icons_3d80b3_256x240.png b/FHC-vendor/jquery-tablesorter/docs/css/images/ui-icons_3d80b3_256x240.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/images/ui-icons_72a7cf_256x240.png b/FHC-vendor/jquery-tablesorter/docs/css/images/ui-icons_72a7cf_256x240.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/images/ui-icons_ffffff_256x240.png b/FHC-vendor/jquery-tablesorter/docs/css/images/ui-icons_ffffff_256x240.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/jq.css b/FHC-vendor/jquery-tablesorter/docs/css/jq.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/jquery-ui.min.css b/FHC-vendor/jquery-tablesorter/docs/css/jquery-ui.min.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/magnific-popup.css b/FHC-vendor/jquery-tablesorter/docs/css/magnific-popup.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/menu.css b/FHC-vendor/jquery-tablesorter/docs/css/menu.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/prettify.css b/FHC-vendor/jquery-tablesorter/docs/css/prettify.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/rangeslider.css b/FHC-vendor/jquery-tablesorter/docs/css/rangeslider.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/select2-3.4.6.min.css b/FHC-vendor/jquery-tablesorter/docs/css/select2-3.4.6.min.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/select2-spinner.gif b/FHC-vendor/jquery-tablesorter/docs/css/select2-spinner.gif
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/select2.png b/FHC-vendor/jquery-tablesorter/docs/css/select2.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/select2x2.png b/FHC-vendor/jquery-tablesorter/docs/css/select2x2.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/tipsy.css b/FHC-vendor/jquery-tablesorter/docs/css/tipsy.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-add-rows.html b/FHC-vendor/jquery-tablesorter/docs/example-add-rows.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-ajax.html b/FHC-vendor/jquery-tablesorter/docs/example-ajax.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-apply-widget.html b/FHC-vendor/jquery-tablesorter/docs/example-apply-widget.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-child-rows-filtered.html b/FHC-vendor/jquery-tablesorter/docs/example-child-rows-filtered.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-child-rows.html b/FHC-vendor/jquery-tablesorter/docs/example-child-rows.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-css-highlighting.html b/FHC-vendor/jquery-tablesorter/docs/example-css-highlighting.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-dragtable.html b/FHC-vendor/jquery-tablesorter/docs/example-dragtable.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-empty-table.html b/FHC-vendor/jquery-tablesorter/docs/example-empty-table.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-extending-defaults.html b/FHC-vendor/jquery-tablesorter/docs/example-extending-defaults.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-extractors-parsers.html b/FHC-vendor/jquery-tablesorter/docs/example-extractors-parsers.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-header-column-span.html b/FHC-vendor/jquery-tablesorter/docs/example-header-column-span.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-locale-sort.html b/FHC-vendor/jquery-tablesorter/docs/example-locale-sort.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-meta-headers.html b/FHC-vendor/jquery-tablesorter/docs/example-meta-headers.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-meta-parsers.html b/FHC-vendor/jquery-tablesorter/docs/example-meta-parsers.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-meta-sort-list.html b/FHC-vendor/jquery-tablesorter/docs/example-meta-sort-list.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-method-sortreset.html b/FHC-vendor/jquery-tablesorter/docs/example-method-sortreset.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-multiple-tbodies.html b/FHC-vendor/jquery-tablesorter/docs/example-multiple-tbodies.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-option-custom-sort.html b/FHC-vendor/jquery-tablesorter/docs/example-option-custom-sort.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-option-date-format.html b/FHC-vendor/jquery-tablesorter/docs/example-option-date-format.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-option-debug.html b/FHC-vendor/jquery-tablesorter/docs/example-option-debug.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-option-delay-init.html b/FHC-vendor/jquery-tablesorter/docs/example-option-delay-init.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-option-digits.html b/FHC-vendor/jquery-tablesorter/docs/example-option-digits.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-option-render-header.html b/FHC-vendor/jquery-tablesorter/docs/example-option-render-header.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-option-render-template.html b/FHC-vendor/jquery-tablesorter/docs/example-option-render-template.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-option-selectorsort.html b/FHC-vendor/jquery-tablesorter/docs/example-option-selectorsort.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-option-show-processing.html b/FHC-vendor/jquery-tablesorter/docs/example-option-show-processing.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-option-sort-append.html b/FHC-vendor/jquery-tablesorter/docs/example-option-sort-append.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-option-sort-empty.html b/FHC-vendor/jquery-tablesorter/docs/example-option-sort-empty.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-option-sort-force.html b/FHC-vendor/jquery-tablesorter/docs/example-option-sort-force.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-option-sort-key.html b/FHC-vendor/jquery-tablesorter/docs/example-option-sort-key.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-option-sort-list.html b/FHC-vendor/jquery-tablesorter/docs/example-option-sort-list.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-option-sort-order.html b/FHC-vendor/jquery-tablesorter/docs/example-option-sort-order.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-option-sortreset-sortrestart.html b/FHC-vendor/jquery-tablesorter/docs/example-option-sortreset-sortrestart.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-option-text-extraction.html b/FHC-vendor/jquery-tablesorter/docs/example-option-text-extraction.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-option-textsorter-semver.html b/FHC-vendor/jquery-tablesorter/docs/example-option-textsorter-semver.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-option-theme-metro-style.html b/FHC-vendor/jquery-tablesorter/docs/example-option-theme-metro-style.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-options-headers-digits-strings.html b/FHC-vendor/jquery-tablesorter/docs/example-options-headers-digits-strings.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-options-headers-locked.html b/FHC-vendor/jquery-tablesorter/docs/example-options-headers-locked.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-options-headers-order.html b/FHC-vendor/jquery-tablesorter/docs/example-options-headers-order.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-options-headers-parser.html b/FHC-vendor/jquery-tablesorter/docs/example-options-headers-parser.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-options-headers.html b/FHC-vendor/jquery-tablesorter/docs/example-options-headers.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-pager-ajax.html b/FHC-vendor/jquery-tablesorter/docs/example-pager-ajax.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-pager-filtered.html b/FHC-vendor/jquery-tablesorter/docs/example-pager-filtered.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-pager.html b/FHC-vendor/jquery-tablesorter/docs/example-pager.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-parsers-advanced.html b/FHC-vendor/jquery-tablesorter/docs/example-parsers-advanced.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-parsers-class-name.html b/FHC-vendor/jquery-tablesorter/docs/example-parsers-class-name.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-parsers-date-range.html b/FHC-vendor/jquery-tablesorter/docs/example-parsers-date-range.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-parsers-dates.html b/FHC-vendor/jquery-tablesorter/docs/example-parsers-dates.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-parsers-duration.html b/FHC-vendor/jquery-tablesorter/docs/example-parsers-duration.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-parsers-feet-inch-fraction.html b/FHC-vendor/jquery-tablesorter/docs/example-parsers-feet-inch-fraction.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-parsers-file-type.html b/FHC-vendor/jquery-tablesorter/docs/example-parsers-file-type.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-parsers-globalize.html b/FHC-vendor/jquery-tablesorter/docs/example-parsers-globalize.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-parsers-ignore-articles.html b/FHC-vendor/jquery-tablesorter/docs/example-parsers-ignore-articles.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-parsers-ip-address.html b/FHC-vendor/jquery-tablesorter/docs/example-parsers-ip-address.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-parsers-jquery-data.html b/FHC-vendor/jquery-tablesorter/docs/example-parsers-jquery-data.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-parsers-metric.html b/FHC-vendor/jquery-tablesorter/docs/example-parsers-metric.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-parsers-named-numbers.html b/FHC-vendor/jquery-tablesorter/docs/example-parsers-named-numbers.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-parsers-roman.html b/FHC-vendor/jquery-tablesorter/docs/example-parsers-roman.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-parsers.html b/FHC-vendor/jquery-tablesorter/docs/example-parsers.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-trigger-sort.html b/FHC-vendor/jquery-tablesorter/docs/example-trigger-sort.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-triggers.html b/FHC-vendor/jquery-tablesorter/docs/example-triggers.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-update-all.html b/FHC-vendor/jquery-tablesorter/docs/example-update-all.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-update-cell.html b/FHC-vendor/jquery-tablesorter/docs/example-update-cell.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-align-character.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-align-character.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-bootstrap-theme-v2.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-bootstrap-theme-v2.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-bootstrap-theme.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-bootstrap-theme.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-build-table.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-build-table.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-chart.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-chart.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-column-selector.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-column-selector.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-columns.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-columns.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-css-sticky-header.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-css-sticky-header.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-editable.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-editable.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-any-match.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-any-match.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-childrows.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-childrows.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-custom-search.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-custom-search.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-custom-search2.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-custom-search2.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-custom.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-custom.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-external-inputs.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-external-inputs.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-formatter-1.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-formatter-1.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-formatter-2.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-formatter-2.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-formatter-select2.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-formatter-select2.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-selectmenu.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-selectmenu.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-filter.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-filter.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-formatter.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-formatter.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-grouping-filter-childrows.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-grouping-filter-childrows.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-grouping.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-grouping.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-header-titles.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-header-titles.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-lazyload.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-lazyload.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-math.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-math.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-output.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-output.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-pager-ajax.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-pager-ajax.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-pager.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-pager.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-print.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-print.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-reflow.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-reflow.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-reflow1.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-reflow1.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-reflow2.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-reflow2.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-reflow3.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-reflow3.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-resizable.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-resizable.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-savesort.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-savesort.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-scroller.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-scroller.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-sort-tbodies.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-sort-tbodies.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-sort-to-hash.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-sort-to-hash.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-static-row.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-static-row.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-sticky-header.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-sticky-header.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-toggle-tablesorter.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-toggle-tablesorter.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-ui-theme.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-ui-theme.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-view.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-view.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-zebra.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-zebra.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widgets.html b/FHC-vendor/jquery-tablesorter/docs/example-widgets.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/fonts/glyphicons-halflings-regular.eot b/FHC-vendor/jquery-tablesorter/docs/fonts/glyphicons-halflings-regular.eot
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/fonts/glyphicons-halflings-regular.svg b/FHC-vendor/jquery-tablesorter/docs/fonts/glyphicons-halflings-regular.svg
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/fonts/glyphicons-halflings-regular.ttf b/FHC-vendor/jquery-tablesorter/docs/fonts/glyphicons-halflings-regular.ttf
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/fonts/glyphicons-halflings-regular.woff b/FHC-vendor/jquery-tablesorter/docs/fonts/glyphicons-halflings-regular.woff
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/fonts/glyphicons-halflings-regular.woff2 b/FHC-vendor/jquery-tablesorter/docs/fonts/glyphicons-halflings-regular.woff2
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/img/external.png b/FHC-vendor/jquery-tablesorter/docs/img/external.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/img/grid-default-thumb.png b/FHC-vendor/jquery-tablesorter/docs/img/grid-default-thumb.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/img/link.png b/FHC-vendor/jquery-tablesorter/docs/img/link.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/img/new-product-banner.png b/FHC-vendor/jquery-tablesorter/docs/img/new-product-banner.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/img/sale-banner.png b/FHC-vendor/jquery-tablesorter/docs/img/sale-banner.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/img/screens-blue.png b/FHC-vendor/jquery-tablesorter/docs/img/screens-blue.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/img/screens.png b/FHC-vendor/jquery-tablesorter/docs/img/screens.png
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/index.html b/FHC-vendor/jquery-tablesorter/docs/index.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/js/bootstrap.min.js b/FHC-vendor/jquery-tablesorter/docs/js/bootstrap.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/js/chili/jquery.chili-2.2.js b/FHC-vendor/jquery-tablesorter/docs/js/chili/jquery.chili-2.2.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/js/chili/recipes.js b/FHC-vendor/jquery-tablesorter/docs/js/chili/recipes.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/js/demo-build-table.js b/FHC-vendor/jquery-tablesorter/docs/js/demo-build-table.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/js/docs.js b/FHC-vendor/jquery-tablesorter/docs/js/docs.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/js/jquery-1.2.6.min.js b/FHC-vendor/jquery-tablesorter/docs/js/jquery-1.2.6.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/js/jquery-1.4.4.min.js b/FHC-vendor/jquery-tablesorter/docs/js/jquery-1.4.4.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/js/jquery-latest.min.js b/FHC-vendor/jquery-tablesorter/docs/js/jquery-latest.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/js/jquery-ui.min.js b/FHC-vendor/jquery-tablesorter/docs/js/jquery-ui.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/js/jquery.jui_theme_switch.min.js b/FHC-vendor/jquery-tablesorter/docs/js/jquery.jui_theme_switch.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/js/jquery.magnific-popup.min.js b/FHC-vendor/jquery-tablesorter/docs/js/jquery.magnific-popup.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/js/jquery.tipsy.min.js b/FHC-vendor/jquery-tablesorter/docs/js/jquery.tipsy.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/js/prettify.js b/FHC-vendor/jquery-tablesorter/docs/js/prettify.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/js/rangeslider.min.js b/FHC-vendor/jquery-tablesorter/docs/js/rangeslider.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/js/search-ie.js b/FHC-vendor/jquery-tablesorter/docs/js/search-ie.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/js/search.js b/FHC-vendor/jquery-tablesorter/docs/js/search.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/js/select2-3.4.6.min.js b/FHC-vendor/jquery-tablesorter/docs/js/select2-3.4.6.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/js/sugar.min.js b/FHC-vendor/jquery-tablesorter/docs/js/sugar.min.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/docs/themes.html b/FHC-vendor/jquery-tablesorter/docs/themes.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/example.json b/FHC-vendor/jquery-tablesorter/example.json
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/index.html b/FHC-vendor/jquery-tablesorter/index.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/extras/jquery.dragtable.mod.js b/FHC-vendor/jquery-tablesorter/js/extras/jquery.dragtable.mod.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/extras/jquery.metadata.js b/FHC-vendor/jquery-tablesorter/js/extras/jquery.metadata.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/extras/semver-mod.js b/FHC-vendor/jquery-tablesorter/js/extras/semver-mod.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/extras/semver.js b/FHC-vendor/jquery-tablesorter/js/extras/semver.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/jquery.tablesorter.combined.js b/FHC-vendor/jquery-tablesorter/js/jquery.tablesorter.combined.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/jquery.tablesorter.js b/FHC-vendor/jquery-tablesorter/js/jquery.tablesorter.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/jquery.tablesorter.widgets.js b/FHC-vendor/jquery-tablesorter/js/jquery.tablesorter.widgets.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/parsers/parser-date-extract.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-date-extract.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/parsers/parser-date-iso8601.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-date-iso8601.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/parsers/parser-date-month.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-date-month.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/parsers/parser-date-range.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-date-range.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/parsers/parser-date-two-digit-year.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-date-two-digit-year.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/parsers/parser-date-weekday.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-date-weekday.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/parsers/parser-date.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-date.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/parsers/parser-duration.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-duration.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/parsers/parser-feet-inch-fraction.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-feet-inch-fraction.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/parsers/parser-file-type.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-file-type.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/parsers/parser-globalize.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-globalize.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/parsers/parser-ignore-articles.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-ignore-articles.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/parsers/parser-image.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-image.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/parsers/parser-input-select.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-input-select.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/parsers/parser-metric.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-metric.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/parsers/parser-named-numbers.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-named-numbers.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/parsers/parser-network.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-network.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/parsers/parser-roman.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-roman.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-alignChar.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-alignChar.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-build-table.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-build-table.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-chart.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-chart.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-columnSelector.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-columnSelector.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-columns.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-columns.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-cssStickyHeaders.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-cssStickyHeaders.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-editable.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-editable.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-filter-formatter-html5.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-filter-formatter-html5.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-filter-formatter-jui.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-filter-formatter-jui.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-filter-formatter-select2.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-filter-formatter-select2.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-filter-type-insideRange.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-filter-type-insideRange.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-filter.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-filter.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-formatter.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-formatter.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-grouping.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-grouping.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-headerTitles.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-headerTitles.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-lazyload.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-lazyload.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-math.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-math.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-output.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-output.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-pager.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-pager.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-print.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-print.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-reflow.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-reflow.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-repeatheaders.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-repeatheaders.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-resizable.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-resizable.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-saveSort.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-saveSort.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-scroller.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-scroller.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-sort2Hash.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-sort2Hash.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-sortTbodies.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-sortTbodies.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-staticRow.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-staticRow.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-stickyHeaders.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-stickyHeaders.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-storage.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-storage.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-toggle.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-toggle.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-uitheme.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-uitheme.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-view.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-view.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/package.json b/FHC-vendor/jquery-tablesorter/package.json
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/tablesorter.jquery.json b/FHC-vendor/jquery-tablesorter/tablesorter.jquery.json
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/test.html b/FHC-vendor/jquery-tablesorter/test.html
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/testing/qunit-1.20.0.css b/FHC-vendor/jquery-tablesorter/testing/qunit-1.20.0.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/testing/qunit-1.20.0.js b/FHC-vendor/jquery-tablesorter/testing/qunit-1.20.0.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/testing/testing-ipv6.js b/FHC-vendor/jquery-tablesorter/testing/testing-ipv6.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/testing/testing-widgets.js b/FHC-vendor/jquery-tablesorter/testing/testing-widgets.js
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/testing/testing.css b/FHC-vendor/jquery-tablesorter/testing/testing.css
old mode 100644
new mode 100755
diff --git a/FHC-vendor/jquery-tablesorter/testing/testing.js b/FHC-vendor/jquery-tablesorter/testing/testing.js
old mode 100644
new mode 100755
diff --git a/LICENSE b/LICENSE
old mode 100644
new mode 100755
diff --git a/README.md b/README.md
old mode 100644
new mode 100755
diff --git a/addons/.gitignore b/addons/.gitignore
old mode 100644
new mode 100755
diff --git a/addons/CodingGuidelines.txt b/addons/CodingGuidelines.txt
old mode 100644
new mode 100755
diff --git a/addons/index.html b/addons/index.html
old mode 100644
new mode 100755
diff --git a/addons/template/cis/index.html b/addons/template/cis/index.html
old mode 100644
new mode 100755
diff --git a/addons/template/cis/init.js.php b/addons/template/cis/init.js.php
old mode 100644
new mode 100755
diff --git a/addons/template/cis/vorlage_profil_array.php b/addons/template/cis/vorlage_profil_array.php
old mode 100644
new mode 100755
diff --git a/addons/template/content/index.html b/addons/template/content/index.html
old mode 100644
new mode 100755
diff --git a/addons/template/content/init.js.php b/addons/template/content/init.js.php
old mode 100644
new mode 100755
diff --git a/addons/template/dbcheck.php b/addons/template/dbcheck.php
old mode 100644
new mode 100755
diff --git a/addons/template/index.html b/addons/template/index.html
old mode 100644
new mode 100755
diff --git a/addons/template/install.php b/addons/template/install.php
old mode 100644
new mode 100755
diff --git a/addons/template/locale/README.txt b/addons/template/locale/README.txt
old mode 100644
new mode 100755
diff --git a/addons/template/locale/index.html b/addons/template/locale/index.html
old mode 100644
new mode 100755
diff --git a/addons/template/soap/index.html b/addons/template/soap/index.html
old mode 100644
new mode 100755
diff --git a/addons/template/system/index.html b/addons/template/system/index.html
old mode 100644
new mode 100755
diff --git a/addons/template/system/vorlage_zip/README.txt b/addons/template/system/vorlage_zip/README.txt
old mode 100644
new mode 100755
diff --git a/addons/template/version.php b/addons/template/version.php
old mode 100644
new mode 100755
diff --git a/addons/template/vilesci/index.php b/addons/template/vilesci/index.php
old mode 100644
new mode 100755
diff --git a/addons/template/vilesci/init.js.php b/addons/template/vilesci/init.js.php
old mode 100644
new mode 100755
diff --git a/addons/template/vilesci/menu.inc.php b/addons/template/vilesci/menu.inc.php
old mode 100644
new mode 100755
diff --git a/addons/template/vilesci/vorlage_generateuid.inc.php b/addons/template/vilesci/vorlage_generateuid.inc.php
old mode 100644
new mode 100755
diff --git a/addons/template/vilesci/vorlage_passwort.inc.php b/addons/template/vilesci/vorlage_passwort.inc.php
old mode 100644
new mode 100755
diff --git a/addons/template/vilesci/vorlage_serviceterminal.inc.php b/addons/template/vilesci/vorlage_serviceterminal.inc.php
old mode 100644
new mode 100755
diff --git a/addons/template/xml/index.html b/addons/template/xml/index.html
old mode 100644
new mode 100755
diff --git a/application/cache/index.html b/application/cache/index.html
old mode 100644
new mode 100755
diff --git a/application/components/extensions/.placeholder b/application/components/extensions/.placeholder
old mode 100644
new mode 100755
diff --git a/application/components/filters/LogsViewer.php b/application/components/filters/LogsViewer.php
old mode 100644
new mode 100755
diff --git a/application/config/anrechnung.php b/application/config/anrechnung.php
old mode 100644
new mode 100755
diff --git a/application/config/auth.php b/application/config/auth.php
old mode 100644
new mode 100755
diff --git a/application/config/autoload.php b/application/config/autoload.php
old mode 100644
new mode 100755
diff --git a/application/config/config.php b/application/config/config.php
old mode 100644
new mode 100755
diff --git a/application/config/constants.php b/application/config/constants.php
old mode 100644
new mode 100755
diff --git a/application/config/core_includes.php b/application/config/core_includes.php
old mode 100644
new mode 100755
diff --git a/application/config/database.php b/application/config/database.php
old mode 100644
new mode 100755
diff --git a/application/config/doctypes.php b/application/config/doctypes.php
old mode 100644
new mode 100755
diff --git a/application/config/extensions/.placeholder b/application/config/extensions/.placeholder
old mode 100644
new mode 100755
diff --git a/application/config/foreign_chars.php b/application/config/foreign_chars.php
old mode 100644
new mode 100755
diff --git a/application/config/hooks.php b/application/config/hooks.php
old mode 100644
new mode 100755
diff --git a/application/config/index.html b/application/config/index.html
old mode 100644
new mode 100755
diff --git a/application/config/infocenter.php b/application/config/infocenter.php
old mode 100644
new mode 100755
diff --git a/application/config/jqm.php b/application/config/jqm.php
old mode 100644
new mode 100755
diff --git a/application/config/ldap.php b/application/config/ldap.php
old mode 100644
new mode 100755
diff --git a/application/config/mail.php b/application/config/mail.php
old mode 100644
new mode 100755
diff --git a/application/config/memcached.php b/application/config/memcached.php
old mode 100644
new mode 100755
diff --git a/application/config/message.php b/application/config/message.php
old mode 100644
new mode 100755
diff --git a/application/config/migration.php b/application/config/migration.php
old mode 100644
new mode 100755
diff --git a/application/config/mimes.php b/application/config/mimes.php
old mode 100644
new mode 100755
diff --git a/application/config/navigation.php b/application/config/navigation.php
old mode 100644
new mode 100755
diff --git a/application/config/permission.php b/application/config/permission.php
old mode 100644
new mode 100755
diff --git a/application/config/profiler.php b/application/config/profiler.php
old mode 100644
new mode 100755
diff --git a/application/config/rest.php b/application/config/rest.php
old mode 100644
new mode 100755
diff --git a/application/config/routes.php b/application/config/routes.php
old mode 100644
new mode 100755
diff --git a/application/config/studierendenantrag.php b/application/config/studierendenantrag.php
old mode 100644
new mode 100755
diff --git a/application/config/udfmasterschema.json b/application/config/udfmasterschema.json
old mode 100644
new mode 100755
diff --git a/application/config/user_agents.php b/application/config/user_agents.php
old mode 100644
new mode 100755
diff --git a/application/controllers/Cis/Auth.php b/application/controllers/Cis/Auth.php
old mode 100644
new mode 100755
diff --git a/application/controllers/Cis/Documents.php b/application/controllers/Cis/Documents.php
old mode 100644
new mode 100755
diff --git a/application/controllers/Cis/MyLv.php b/application/controllers/Cis/MyLv.php
old mode 100644
new mode 100755
diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
old mode 100644
new mode 100755
index 2969ecf9c..b442a49c7
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -24,6 +24,7 @@ class Profil extends Auth_Controller
 			'updateProfilRequest' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'deleteProfilRequest' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'selectProfilRequest' => ['student/anrechnung_beantragen:r', 'user:r'],
+			'insertFile' => ['student/anrechnung_beantragen:r', 'user:r'],
 
 		]);
 		$this->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
@@ -40,6 +41,7 @@ class Profil extends Auth_Controller
 		//? put the uid and pid inside the controller to reuse in controller
 		$this->uid = getAuthUID();
 		$this->pid = getAuthPersonID();
+		
 
 	}
 
@@ -67,6 +69,33 @@ class Profil extends Auth_Controller
 	}
 
 
+	public function insertFile(){
+		$this->load->library('DmsLib');
+		$this->load->model('DmsVersion_model','DmsVersionModel');
+		$files = $_FILES['files'];
+        $file_count = count($files['name']);
+
+        for ($i = 0; $i < $file_count; $i++) {
+            $_FILES['files']['name'] = $files['name'][$i];
+            $_FILES['files']['type'] = $files['type'][$i];
+            $_FILES['files']['tmp_name'] = $files['tmp_name'][$i];
+            $_FILES['files']['error'] = $files['error'][$i];
+            $_FILES['files']['size'] = $files['size'][$i];
+			//! ID CHANGES EVERYTIME AND TMP_FILENAME IS A HASH THAT ALSO CHANGES EVERYTIME
+			$this->DmsVersionModel->addSelect(["version"]);
+			$fileVersion = $this->DmsVersionModel->loadWhere(["filename"=>$_FILES['files']['tmp_name']]);
+			$fileVersion = hasData($fileVersion) ? getData($fileVersion)[0]->version : 0;
+			if($fileVersion) $fileVersion++;
+			
+            $res=$this->dmslib->upload(["kategorie_kurzbz"=>"dokumente","version"=>$fileVersion] , 'files');
+			echo json_encode($res);
+			echo "\n\n";
+		}
+
+		
+		
+	}
+
 
 	public function selectProfilRequest(){
 		$_GET = json_decode($this->input->raw_input_stream, true);
diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
old mode 100644
new mode 100755
diff --git a/application/controllers/Cis/Pub.php b/application/controllers/Cis/Pub.php
old mode 100644
new mode 100755
diff --git a/application/controllers/Cis/Stundenplan.php b/application/controllers/Cis/Stundenplan.php
old mode 100644
new mode 100755
diff --git a/application/controllers/Cis4.php b/application/controllers/Cis4.php
old mode 100644
new mode 100755
diff --git a/application/controllers/CisHmvc.php b/application/controllers/CisHmvc.php
old mode 100644
new mode 100755
diff --git a/application/controllers/CisHmvc/Cms.php b/application/controllers/CisHmvc/Cms.php
old mode 100644
new mode 100755
diff --git a/application/controllers/CisHmvc/Dashboard.php b/application/controllers/CisHmvc/Dashboard.php
old mode 100644
new mode 100755
diff --git a/application/controllers/CisHtml/Cms.php b/application/controllers/CisHtml/Cms.php
old mode 100644
new mode 100755
diff --git a/application/controllers/CisHtml/Dashboard.php b/application/controllers/CisHtml/Dashboard.php
old mode 100644
new mode 100755
diff --git a/application/controllers/CisVue/Cms.php b/application/controllers/CisVue/Cms.php
old mode 100644
new mode 100755
diff --git a/application/controllers/CisVue/Dashboard.php b/application/controllers/CisVue/Dashboard.php
old mode 100644
new mode 100755
diff --git a/application/controllers/Test.php b/application/controllers/Test.php
old mode 100644
new mode 100755
diff --git a/application/controllers/Vilesci.php b/application/controllers/Vilesci.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/index.html b/application/controllers/api/index.html
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/CheckUserAuth.php b/application/controllers/api/v1/CheckUserAuth.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/Test.php b/application/controllers/api/v1/Test.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/accounting/Aufteilung.php b/application/controllers/api/v1/accounting/Aufteilung.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/accounting/Bestelldetail.php b/application/controllers/api/v1/accounting/Bestelldetail.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/accounting/Bestelldetailtag.php b/application/controllers/api/v1/accounting/Bestelldetailtag.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/accounting/Bestellstatus.php b/application/controllers/api/v1/accounting/Bestellstatus.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/accounting/Bestellung.php b/application/controllers/api/v1/accounting/Bestellung.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/accounting/Bestellungtag.php b/application/controllers/api/v1/accounting/Bestellungtag.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/accounting/Buchung.php b/application/controllers/api/v1/accounting/Buchung.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/accounting/Buchungstyp.php b/application/controllers/api/v1/accounting/Buchungstyp.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/accounting/Budget.php b/application/controllers/api/v1/accounting/Budget.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/accounting/Konto.php b/application/controllers/api/v1/accounting/Konto.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/accounting/Kostenstelle.php b/application/controllers/api/v1/accounting/Kostenstelle.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/accounting/Rechnung.php b/application/controllers/api/v1/accounting/Rechnung.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/accounting/Rechnungsbetrag.php b/application/controllers/api/v1/accounting/Rechnungsbetrag.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/accounting/Rechnungstyp.php b/application/controllers/api/v1/accounting/Rechnungstyp.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/accounting/Vertrag.php b/application/controllers/api/v1/accounting/Vertrag.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/accounting/Vertragsstatus.php b/application/controllers/api/v1/accounting/Vertragsstatus.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/accounting/Vertragstyp.php b/application/controllers/api/v1/accounting/Vertragstyp.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/accounting/Zahlungstyp.php b/application/controllers/api/v1/accounting/Zahlungstyp.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/codex/Akadgrad.php b/application/controllers/api/v1/codex/Akadgrad.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/codex/Archiv.php b/application/controllers/api/v1/codex/Archiv.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/codex/Aufmerksamdurch.php b/application/controllers/api/v1/codex/Aufmerksamdurch.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/codex/Ausbildung.php b/application/controllers/api/v1/codex/Ausbildung.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/codex/Berufstaetigkeit.php b/application/controllers/api/v1/codex/Berufstaetigkeit.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/codex/Beschaeftigungsausmass.php b/application/controllers/api/v1/codex/Beschaeftigungsausmass.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/codex/Besqual.php b/application/controllers/api/v1/codex/Besqual.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/codex/Bisfunktion.php b/application/controllers/api/v1/codex/Bisfunktion.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/codex/Bisio.php b/application/controllers/api/v1/codex/Bisio.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/codex/Bisorgform.php b/application/controllers/api/v1/codex/Bisorgform.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/codex/Bisverwendung.php b/application/controllers/api/v1/codex/Bisverwendung.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/codex/Bundesland.php b/application/controllers/api/v1/codex/Bundesland.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/codex/Entwicklungsteam.php b/application/controllers/api/v1/codex/Entwicklungsteam.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/codex/Gemeinde.php b/application/controllers/api/v1/codex/Gemeinde.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/codex/Hauptberuf.php b/application/controllers/api/v1/codex/Hauptberuf.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/codex/Lehrform.php b/application/controllers/api/v1/codex/Lehrform.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/codex/Lgartcode.php b/application/controllers/api/v1/codex/Lgartcode.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/codex/Mobilitaetsprogramm.php b/application/controllers/api/v1/codex/Mobilitaetsprogramm.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/codex/Nation.php b/application/controllers/api/v1/codex/Nation.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/codex/Note.php b/application/controllers/api/v1/codex/Note.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/codex/Orgform.php b/application/controllers/api/v1/codex/Orgform.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/codex/Verwendung.php b/application/controllers/api/v1/codex/Verwendung.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/codex/Zgv.php b/application/controllers/api/v1/codex/Zgv.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/codex/Zgvdoktor.php b/application/controllers/api/v1/codex/Zgvdoktor.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/codex/Zgvgruppe.php b/application/controllers/api/v1/codex/Zgvgruppe.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/codex/Zgvmaster.php b/application/controllers/api/v1/codex/Zgvmaster.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/codex/Zweck.php b/application/controllers/api/v1/codex/Zweck.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/content/Ampel.php b/application/controllers/api/v1/content/Ampel.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/content/Content.php b/application/controllers/api/v1/content/Content.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/content/Contentchild.php b/application/controllers/api/v1/content/Contentchild.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/content/Contentgruppe.php b/application/controllers/api/v1/content/Contentgruppe.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/content/Contentlog.php b/application/controllers/api/v1/content/Contentlog.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/content/Contentsprache.php b/application/controllers/api/v1/content/Contentsprache.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/content/Dms.php b/application/controllers/api/v1/content/Dms.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/content/Infoscreen.php b/application/controllers/api/v1/content/Infoscreen.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/content/News.php b/application/controllers/api/v1/content/News.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/content/Template.php b/application/controllers/api/v1/content/Template.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/content/Veranstaltung.php b/application/controllers/api/v1/content/Veranstaltung.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/content/Veranstaltungskategorie.php b/application/controllers/api/v1/content/Veranstaltungskategorie.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/crm/Akte.php b/application/controllers/api/v1/crm/Akte.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/crm/Aufnahmeschluessel.php b/application/controllers/api/v1/crm/Aufnahmeschluessel.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/crm/Aufnahmetermin.php b/application/controllers/api/v1/crm/Aufnahmetermin.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/crm/Aufnahmetermintyp.php b/application/controllers/api/v1/crm/Aufnahmetermintyp.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/crm/Bewerbungstermine.php b/application/controllers/api/v1/crm/Bewerbungstermine.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/crm/Buchungstyp.php b/application/controllers/api/v1/crm/Buchungstyp.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/crm/Dokument.php b/application/controllers/api/v1/crm/Dokument.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/crm/Dokumentprestudent.php b/application/controllers/api/v1/crm/Dokumentprestudent.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/crm/Dokumentstudiengang.php b/application/controllers/api/v1/crm/Dokumentstudiengang.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/crm/Konto.php b/application/controllers/api/v1/crm/Konto.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/crm/Preincoming.php b/application/controllers/api/v1/crm/Preincoming.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/crm/Preinteressent.php b/application/controllers/api/v1/crm/Preinteressent.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/crm/Preinteressentstudiengang.php b/application/controllers/api/v1/crm/Preinteressentstudiengang.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/crm/Preoutgoing.php b/application/controllers/api/v1/crm/Preoutgoing.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/crm/Prestudent.php b/application/controllers/api/v1/crm/Prestudent.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/crm/Prestudentstatus.php b/application/controllers/api/v1/crm/Prestudentstatus.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/crm/Reihungstest.php b/application/controllers/api/v1/crm/Reihungstest.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/crm/RtPerson.php b/application/controllers/api/v1/crm/RtPerson.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/crm/Status.php b/application/controllers/api/v1/crm/Status.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/crm/Statusgrund.php b/application/controllers/api/v1/crm/Statusgrund.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/crm/Student.php b/application/controllers/api/v1/crm/Student.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/education/Abgabe.php b/application/controllers/api/v1/education/Abgabe.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/education/Abschlussbeurteilung.php b/application/controllers/api/v1/education/Abschlussbeurteilung.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/education/Abschlusspruefung.php b/application/controllers/api/v1/education/Abschlusspruefung.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/education/Anrechnung.php b/application/controllers/api/v1/education/Anrechnung.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/education/Anwesenheit.php b/application/controllers/api/v1/education/Anwesenheit.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/education/Beispiel.php b/application/controllers/api/v1/education/Beispiel.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/education/Betreuerart.php b/application/controllers/api/v1/education/Betreuerart.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/education/Feedback.php b/application/controllers/api/v1/education/Feedback.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/education/Legesamtnote.php b/application/controllers/api/v1/education/Legesamtnote.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/education/Lehreinheit.php b/application/controllers/api/v1/education/Lehreinheit.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/education/Lehreinheitgruppe.php b/application/controllers/api/v1/education/Lehreinheitgruppe.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/education/Lehreinheitmitarbeiter.php b/application/controllers/api/v1/education/Lehreinheitmitarbeiter.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/education/Lehrfach.php b/application/controllers/api/v1/education/Lehrfach.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/education/Lehrfunktion.php b/application/controllers/api/v1/education/Lehrfunktion.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/education/Lehrtyp.php b/application/controllers/api/v1/education/Lehrtyp.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/education/Lehrveranstaltung.php b/application/controllers/api/v1/education/Lehrveranstaltung.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/education/Lenotenschluessel.php b/application/controllers/api/v1/education/Lenotenschluessel.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/education/Lepruefung.php b/application/controllers/api/v1/education/Lepruefung.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/education/Lvangebot.php b/application/controllers/api/v1/education/Lvangebot.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/education/Lvgesamtnote.php b/application/controllers/api/v1/education/Lvgesamtnote.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/education/Lvinfo.php b/application/controllers/api/v1/education/Lvinfo.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/education/Lvregel.php b/application/controllers/api/v1/education/Lvregel.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/education/Lvregeltyp.php b/application/controllers/api/v1/education/Lvregeltyp.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/education/Notenschluessel.php b/application/controllers/api/v1/education/Notenschluessel.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/education/Notenschluesselaufteilung.php b/application/controllers/api/v1/education/Notenschluesselaufteilung.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/education/Notenschluesseluebung.php b/application/controllers/api/v1/education/Notenschluesseluebung.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/education/Notenschluesselzuordnung.php b/application/controllers/api/v1/education/Notenschluesselzuordnung.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/education/Paabgabe.php b/application/controllers/api/v1/education/Paabgabe.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/education/Paabgabetyp.php b/application/controllers/api/v1/education/Paabgabetyp.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/education/Projektarbeit.php b/application/controllers/api/v1/education/Projektarbeit.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/education/Projektbetreuer.php b/application/controllers/api/v1/education/Projektbetreuer.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/education/Projekttyp.php b/application/controllers/api/v1/education/Projekttyp.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/education/Pruefung.php b/application/controllers/api/v1/education/Pruefung.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/education/Pruefungsanmeldung.php b/application/controllers/api/v1/education/Pruefungsanmeldung.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/education/Pruefungsfenster.php b/application/controllers/api/v1/education/Pruefungsfenster.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/education/Pruefungsstatus.php b/application/controllers/api/v1/education/Pruefungsstatus.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/education/Pruefungstermin.php b/application/controllers/api/v1/education/Pruefungstermin.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/education/Pruefungstyp.php b/application/controllers/api/v1/education/Pruefungstyp.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/education/Studentbeispiel.php b/application/controllers/api/v1/education/Studentbeispiel.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/education/Studentlehrverband.php b/application/controllers/api/v1/education/Studentlehrverband.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/education/Studentuebung.php b/application/controllers/api/v1/education/Studentuebung.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/education/Uebung.php b/application/controllers/api/v1/education/Uebung.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/education/Zeugnis.php b/application/controllers/api/v1/education/Zeugnis.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/education/Zeugnisnote.php b/application/controllers/api/v1/education/Zeugnisnote.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/organisation/Erhalter.php b/application/controllers/api/v1/organisation/Erhalter.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/organisation/Fachbereich2.php b/application/controllers/api/v1/organisation/Fachbereich2.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/organisation/Ferien.php b/application/controllers/api/v1/organisation/Ferien.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/organisation/Geschaeftsjahr2.php b/application/controllers/api/v1/organisation/Geschaeftsjahr2.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/organisation/Gruppe.php b/application/controllers/api/v1/organisation/Gruppe.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/organisation/Lehrverband.php b/application/controllers/api/v1/organisation/Lehrverband.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/organisation/Organisationseinheit2.php b/application/controllers/api/v1/organisation/Organisationseinheit2.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/organisation/Organisationseinheittyp.php b/application/controllers/api/v1/organisation/Organisationseinheittyp.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/organisation/Semesterwochen.php b/application/controllers/api/v1/organisation/Semesterwochen.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/organisation/Service.php b/application/controllers/api/v1/organisation/Service.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/organisation/Standort.php b/application/controllers/api/v1/organisation/Standort.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/organisation/Statistik.php b/application/controllers/api/v1/organisation/Statistik.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/organisation/Studiengang2.php b/application/controllers/api/v1/organisation/Studiengang2.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/organisation/Studiengangstyp.php b/application/controllers/api/v1/organisation/Studiengangstyp.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/organisation/Studienjahr.php b/application/controllers/api/v1/organisation/Studienjahr.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/organisation/Studienordnung.php b/application/controllers/api/v1/organisation/Studienordnung.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/organisation/Studienordnungstatus.php b/application/controllers/api/v1/organisation/Studienordnungstatus.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/organisation/Studienplan.php b/application/controllers/api/v1/organisation/Studienplan.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/organisation/Studienplatz.php b/application/controllers/api/v1/organisation/Studienplatz.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/organisation/Studiensemester.php b/application/controllers/api/v1/organisation/Studiensemester.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/person/Adresse.php b/application/controllers/api/v1/person/Adresse.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/person/Bankverbindung.php b/application/controllers/api/v1/person/Bankverbindung.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/person/Benutzer.php b/application/controllers/api/v1/person/Benutzer.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/person/Benutzerfunktion.php b/application/controllers/api/v1/person/Benutzerfunktion.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/person/Benutzergruppe.php b/application/controllers/api/v1/person/Benutzergruppe.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/person/Fotostatus.php b/application/controllers/api/v1/person/Fotostatus.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/person/Freebusy.php b/application/controllers/api/v1/person/Freebusy.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/person/Freebusytyp.php b/application/controllers/api/v1/person/Freebusytyp.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/person/Kontakt.php b/application/controllers/api/v1/person/Kontakt.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/person/Kontaktmedium.php b/application/controllers/api/v1/person/Kontaktmedium.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/person/Kontakttyp.php b/application/controllers/api/v1/person/Kontakttyp.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/person/Notiz.php b/application/controllers/api/v1/person/Notiz.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/person/Notizzuordnung.php b/application/controllers/api/v1/person/Notizzuordnung.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/person/Person.php b/application/controllers/api/v1/person/Person.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/project/Aktivitaet.php b/application/controllers/api/v1/project/Aktivitaet.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/project/Aufwandstyp.php b/application/controllers/api/v1/project/Aufwandstyp.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/project/Projekt.php b/application/controllers/api/v1/project/Projekt.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/project/Projekt_ressource.php b/application/controllers/api/v1/project/Projekt_ressource.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/project/Projektphase.php b/application/controllers/api/v1/project/Projektphase.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/project/Projekttask.php b/application/controllers/api/v1/project/Projekttask.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/project/Ressource.php b/application/controllers/api/v1/project/Ressource.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/project/Scrumsprint.php b/application/controllers/api/v1/project/Scrumsprint.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/ressource/Betriebsmittel.php b/application/controllers/api/v1/ressource/Betriebsmittel.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/ressource/Betriebsmittelperson2.php b/application/controllers/api/v1/ressource/Betriebsmittelperson2.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/ressource/Betriebsmittelstatus.php b/application/controllers/api/v1/ressource/Betriebsmittelstatus.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/ressource/Betriebsmitteltyp.php b/application/controllers/api/v1/ressource/Betriebsmitteltyp.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/ressource/Coodle.php b/application/controllers/api/v1/ressource/Coodle.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/ressource/Erreichbarkeit.php b/application/controllers/api/v1/ressource/Erreichbarkeit.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/ressource/Firma.php b/application/controllers/api/v1/ressource/Firma.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/ressource/Firmatag.php b/application/controllers/api/v1/ressource/Firmatag.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/ressource/Firmentyp.php b/application/controllers/api/v1/ressource/Firmentyp.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/ressource/Funktion.php b/application/controllers/api/v1/ressource/Funktion.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/ressource/Lehrmittel.php b/application/controllers/api/v1/ressource/Lehrmittel.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/ressource/Mitarbeiter.php b/application/controllers/api/v1/ressource/Mitarbeiter.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/ressource/Ort.php b/application/controllers/api/v1/ressource/Ort.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/ressource/Ortraumtyp.php b/application/controllers/api/v1/ressource/Ortraumtyp.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/ressource/Personfunktionstandort.php b/application/controllers/api/v1/ressource/Personfunktionstandort.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/ressource/Raumtyp.php b/application/controllers/api/v1/ressource/Raumtyp.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/ressource/Reservierung.php b/application/controllers/api/v1/ressource/Reservierung.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/ressource/Stunde.php b/application/controllers/api/v1/ressource/Stunde.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/ressource/Stundenplan.php b/application/controllers/api/v1/ressource/Stundenplan.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/ressource/Stundenplandev.php b/application/controllers/api/v1/ressource/Stundenplandev.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/ressource/Zeitaufzeichnung.php b/application/controllers/api/v1/ressource/Zeitaufzeichnung.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/ressource/Zeitfenster.php b/application/controllers/api/v1/ressource/Zeitfenster.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/ressource/Zeitsperre.php b/application/controllers/api/v1/ressource/Zeitsperre.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/ressource/Zeitsperretyp.php b/application/controllers/api/v1/ressource/Zeitsperretyp.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/ressource/Zeitwunsch.php b/application/controllers/api/v1/ressource/Zeitwunsch.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/system/Appdaten.php b/application/controllers/api/v1/system/Appdaten.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/system/Benutzerrolle.php b/application/controllers/api/v1/system/Benutzerrolle.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/system/Berechtigung.php b/application/controllers/api/v1/system/Berechtigung.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/system/Cronjob.php b/application/controllers/api/v1/system/Cronjob.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/system/Filter.php b/application/controllers/api/v1/system/Filter.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/system/Log.php b/application/controllers/api/v1/system/Log.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/system/Message.php b/application/controllers/api/v1/system/Message.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/system/Phrase.php b/application/controllers/api/v1/system/Phrase.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/system/Rolle.php b/application/controllers/api/v1/system/Rolle.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/system/Rolleberechtigung.php b/application/controllers/api/v1/system/Rolleberechtigung.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/system/Server.php b/application/controllers/api/v1/system/Server.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/system/Sprache2.php b/application/controllers/api/v1/system/Sprache2.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/system/Tag.php b/application/controllers/api/v1/system/Tag.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/system/UDF.php b/application/controllers/api/v1/system/UDF.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/system/Variable.php b/application/controllers/api/v1/system/Variable.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/system/Vorlage.php b/application/controllers/api/v1/system/Vorlage.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/system/Vorlagestudiengang.php b/application/controllers/api/v1/system/Vorlagestudiengang.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/system/Webservicelog.php b/application/controllers/api/v1/system/Webservicelog.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/system/Webservicerecht.php b/application/controllers/api/v1/system/Webservicerecht.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/system/Webservicetyp.php b/application/controllers/api/v1/system/Webservicetyp.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/testtool/Ablauf.php b/application/controllers/api/v1/testtool/Ablauf.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/testtool/Antwort.php b/application/controllers/api/v1/testtool/Antwort.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/testtool/Frage.php b/application/controllers/api/v1/testtool/Frage.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/testtool/Gebiet.php b/application/controllers/api/v1/testtool/Gebiet.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/testtool/Kategorie.php b/application/controllers/api/v1/testtool/Kategorie.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/testtool/Kriterien.php b/application/controllers/api/v1/testtool/Kriterien.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/testtool/Pruefling.php b/application/controllers/api/v1/testtool/Pruefling.php
old mode 100644
new mode 100755
diff --git a/application/controllers/api/v1/testtool/Vorschlag.php b/application/controllers/api/v1/testtool/Vorschlag.php
old mode 100644
new mode 100755
diff --git a/application/controllers/codex/Oehbeitrag.php b/application/controllers/codex/Oehbeitrag.php
old mode 100644
new mode 100755
diff --git a/application/controllers/codex/UHSTAT1.php b/application/controllers/codex/UHSTAT1.php
old mode 100644
new mode 100755
diff --git a/application/controllers/components/Antrag/Abmeldung.php b/application/controllers/components/Antrag/Abmeldung.php
old mode 100644
new mode 100755
diff --git a/application/controllers/components/Antrag/Leitung.php b/application/controllers/components/Antrag/Leitung.php
old mode 100644
new mode 100755
diff --git a/application/controllers/components/Antrag/Unterbrechung.php b/application/controllers/components/Antrag/Unterbrechung.php
old mode 100644
new mode 100755
diff --git a/application/controllers/components/Antrag/Wiederholung.php b/application/controllers/components/Antrag/Wiederholung.php
old mode 100644
new mode 100755
diff --git a/application/controllers/components/Cis/Mylv.php b/application/controllers/components/Cis/Mylv.php
old mode 100644
new mode 100755
diff --git a/application/controllers/components/Cis/Stundenplan.php b/application/controllers/components/Cis/Stundenplan.php
old mode 100644
new mode 100755
diff --git a/application/controllers/components/CisVue.php b/application/controllers/components/CisVue.php
old mode 100644
new mode 100755
diff --git a/application/controllers/components/Filter.php b/application/controllers/components/Filter.php
old mode 100644
new mode 100755
diff --git a/application/controllers/components/Phrasen.php b/application/controllers/components/Phrasen.php
old mode 100644
new mode 100755
diff --git a/application/controllers/components/SearchBar.php b/application/controllers/components/SearchBar.php
old mode 100644
new mode 100755
diff --git a/application/controllers/crm/Statusgrund.php b/application/controllers/crm/Statusgrund.php
old mode 100644
new mode 100755
diff --git a/application/controllers/dashboard/Api.php b/application/controllers/dashboard/Api.php
old mode 100644
new mode 100755
diff --git a/application/controllers/dashboard/Config.php b/application/controllers/dashboard/Config.php
old mode 100644
new mode 100755
diff --git a/application/controllers/dashboard/Dashboard.php b/application/controllers/dashboard/Dashboard.php
old mode 100644
new mode 100755
diff --git a/application/controllers/dashboard/DashboardDemo.php b/application/controllers/dashboard/DashboardDemo.php
old mode 100644
new mode 100755
diff --git a/application/controllers/dashboard/Widget.php b/application/controllers/dashboard/Widget.php
old mode 100644
new mode 100755
diff --git a/application/controllers/extensions/.placeholder b/application/controllers/extensions/.placeholder
old mode 100644
new mode 100755
diff --git a/application/controllers/index.html b/application/controllers/index.html
old mode 100644
new mode 100755
diff --git a/application/controllers/jobs/AmpelMail.php b/application/controllers/jobs/AmpelMail.php
old mode 100644
new mode 100755
diff --git a/application/controllers/jobs/AnrechnungJob.php b/application/controllers/jobs/AnrechnungJob.php
old mode 100644
new mode 100755
diff --git a/application/controllers/jobs/AntragJob.php b/application/controllers/jobs/AntragJob.php
old mode 100644
new mode 100755
diff --git a/application/controllers/jobs/LVPlanJob.php b/application/controllers/jobs/LVPlanJob.php
old mode 100644
new mode 100755
diff --git a/application/controllers/jobs/LehrauftragJob.php b/application/controllers/jobs/LehrauftragJob.php
old mode 100644
new mode 100755
diff --git a/application/controllers/jobs/MailJob.php b/application/controllers/jobs/MailJob.php
old mode 100644
new mode 100755
diff --git a/application/controllers/jobs/OneTimeMessages.php b/application/controllers/jobs/OneTimeMessages.php
old mode 100644
new mode 100755
diff --git a/application/controllers/jobs/PlausiIssueProducer.php b/application/controllers/jobs/PlausiIssueProducer.php
old mode 100644
new mode 100755
diff --git a/application/controllers/jobs/Prestudentstatus.php b/application/controllers/jobs/Prestudentstatus.php
old mode 100644
new mode 100755
diff --git a/application/controllers/jobs/ReihungstestJob.php b/application/controllers/jobs/ReihungstestJob.php
old mode 100644
new mode 100755
diff --git a/application/controllers/lehre/Antrag/Attachment.php b/application/controllers/lehre/Antrag/Attachment.php
old mode 100644
new mode 100755
diff --git a/application/controllers/lehre/Antrag/Wiederholung.php b/application/controllers/lehre/Antrag/Wiederholung.php
old mode 100644
new mode 100755
diff --git a/application/controllers/lehre/Pruefungsprotokoll.php b/application/controllers/lehre/Pruefungsprotokoll.php
old mode 100644
new mode 100755
diff --git a/application/controllers/lehre/Studierendenantrag.php b/application/controllers/lehre/Studierendenantrag.php
old mode 100644
new mode 100755
diff --git a/application/controllers/lehre/anrechnung/AdminAnrechnung.php b/application/controllers/lehre/anrechnung/AdminAnrechnung.php
old mode 100644
new mode 100755
diff --git a/application/controllers/lehre/anrechnung/ApproveAnrechnungDetail.php b/application/controllers/lehre/anrechnung/ApproveAnrechnungDetail.php
old mode 100644
new mode 100755
diff --git a/application/controllers/lehre/anrechnung/ApproveAnrechnungUebersicht.php b/application/controllers/lehre/anrechnung/ApproveAnrechnungUebersicht.php
old mode 100644
new mode 100755
diff --git a/application/controllers/lehre/anrechnung/CreateAnrechnung.php b/application/controllers/lehre/anrechnung/CreateAnrechnung.php
old mode 100644
new mode 100755
diff --git a/application/controllers/lehre/anrechnung/RequestAnrechnung.php b/application/controllers/lehre/anrechnung/RequestAnrechnung.php
old mode 100644
new mode 100755
diff --git a/application/controllers/lehre/anrechnung/ReviewAnrechnungDetail.php b/application/controllers/lehre/anrechnung/ReviewAnrechnungDetail.php
old mode 100644
new mode 100755
diff --git a/application/controllers/lehre/anrechnung/ReviewAnrechnungUebersicht.php b/application/controllers/lehre/anrechnung/ReviewAnrechnungUebersicht.php
old mode 100644
new mode 100755
diff --git a/application/controllers/lehre/lehrauftrag/Lehrauftrag.php b/application/controllers/lehre/lehrauftrag/Lehrauftrag.php
old mode 100644
new mode 100755
diff --git a/application/controllers/lehre/lehrauftrag/LehrauftragAkzeptieren.php b/application/controllers/lehre/lehrauftrag/LehrauftragAkzeptieren.php
old mode 100644
new mode 100755
diff --git a/application/controllers/lehre/lehrauftrag/LehrauftragErteilen.php b/application/controllers/lehre/lehrauftrag/LehrauftragErteilen.php
old mode 100644
new mode 100755
diff --git a/application/controllers/lehre/lvplanung/AdminZeitverfuegbarkeit.php b/application/controllers/lehre/lvplanung/AdminZeitverfuegbarkeit.php
old mode 100644
new mode 100755
diff --git a/application/controllers/organisation/Reihungstest.php b/application/controllers/organisation/Reihungstest.php
old mode 100644
new mode 100755
diff --git a/application/controllers/organisation/Studienjahr.php b/application/controllers/organisation/Studienjahr.php
old mode 100644
new mode 100755
diff --git a/application/controllers/organisation/Studiensemester.php b/application/controllers/organisation/Studiensemester.php
old mode 100644
new mode 100755
diff --git a/application/controllers/person/BPKWartung.php b/application/controllers/person/BPKWartung.php
old mode 100644
new mode 100755
diff --git a/application/controllers/person/Gradelist.php b/application/controllers/person/Gradelist.php
old mode 100644
new mode 100755
diff --git a/application/controllers/person/Gruppenmanagement.php b/application/controllers/person/Gruppenmanagement.php
old mode 100644
new mode 100755
diff --git a/application/controllers/system/FAS_UDF.php b/application/controllers/system/FAS_UDF.php
old mode 100644
new mode 100755
diff --git a/application/controllers/system/Login.php b/application/controllers/system/Login.php
old mode 100644
new mode 100755
diff --git a/application/controllers/system/Logout.php b/application/controllers/system/Logout.php
old mode 100644
new mode 100755
diff --git a/application/controllers/system/LogsViewer.php b/application/controllers/system/LogsViewer.php
old mode 100644
new mode 100755
diff --git a/application/controllers/system/Navigation.php b/application/controllers/system/Navigation.php
old mode 100644
new mode 100755
diff --git a/application/controllers/system/Phrases.php b/application/controllers/system/Phrases.php
old mode 100644
new mode 100755
diff --git a/application/controllers/system/TestSearch.php b/application/controllers/system/TestSearch.php
old mode 100644
new mode 100755
diff --git a/application/controllers/system/Variables.php b/application/controllers/system/Variables.php
old mode 100644
new mode 100755
diff --git a/application/controllers/system/Vorlage.php b/application/controllers/system/Vorlage.php
old mode 100644
new mode 100755
diff --git a/application/controllers/system/aufnahme/PrestudentMultiAssign.php b/application/controllers/system/aufnahme/PrestudentMultiAssign.php
old mode 100644
new mode 100755
diff --git a/application/controllers/system/extensions/CLI_Manager.php b/application/controllers/system/extensions/CLI_Manager.php
old mode 100644
new mode 100755
diff --git a/application/controllers/system/extensions/Manager.php b/application/controllers/system/extensions/Manager.php
old mode 100644
new mode 100755
diff --git a/application/controllers/system/infocenter/InfoCenter.php b/application/controllers/system/infocenter/InfoCenter.php
old mode 100644
new mode 100755
diff --git a/application/controllers/system/infocenter/Rueckstellung.php b/application/controllers/system/infocenter/Rueckstellung.php
old mode 100644
new mode 100755
diff --git a/application/controllers/system/infocenter/ZGVUeberpruefung.php b/application/controllers/system/infocenter/ZGVUeberpruefung.php
old mode 100644
new mode 100755
diff --git a/application/controllers/system/issues/Issues.php b/application/controllers/system/issues/Issues.php
old mode 100644
new mode 100755
diff --git a/application/controllers/system/issues/IssuesKonfiguration.php b/application/controllers/system/issues/IssuesKonfiguration.php
old mode 100644
new mode 100755
diff --git a/application/controllers/system/issues/IssuesZustaendigkeiten.php b/application/controllers/system/issues/IssuesZustaendigkeiten.php
old mode 100644
new mode 100755
diff --git a/application/controllers/system/issues/Plausichecks.php b/application/controllers/system/issues/Plausichecks.php
old mode 100644
new mode 100755
diff --git a/application/controllers/system/jq/JobsQueueManager.php b/application/controllers/system/jq/JobsQueueManager.php
old mode 100644
new mode 100755
diff --git a/application/controllers/system/jq/JobsQueueViewer.php b/application/controllers/system/jq/JobsQueueViewer.php
old mode 100644
new mode 100755
diff --git a/application/controllers/system/messages/FASMessages.php b/application/controllers/system/messages/FASMessages.php
old mode 100644
new mode 100755
diff --git a/application/controllers/system/messages/MessageClient.php b/application/controllers/system/messages/MessageClient.php
old mode 100644
new mode 100755
diff --git a/application/controllers/system/messages/Messages.php b/application/controllers/system/messages/Messages.php
old mode 100644
new mode 100755
diff --git a/application/controllers/system/messages/ViewMessage.php b/application/controllers/system/messages/ViewMessage.php
old mode 100644
new mode 100755
diff --git a/application/controllers/widgets/Filters.php b/application/controllers/widgets/Filters.php
old mode 100644
new mode 100755
diff --git a/application/controllers/widgets/Language.php b/application/controllers/widgets/Language.php
old mode 100644
new mode 100755
diff --git a/application/controllers/widgets/Tables.php b/application/controllers/widgets/Tables.php
old mode 100644
new mode 100755
diff --git a/application/controllers/widgets/UDF.php b/application/controllers/widgets/UDF.php
old mode 100644
new mode 100755
diff --git a/application/core/API_Controller.php b/application/core/API_Controller.php
old mode 100644
new mode 100755
diff --git a/application/core/Auth_Controller.php b/application/core/Auth_Controller.php
old mode 100644
new mode 100755
diff --git a/application/core/CLI_Controller.php b/application/core/CLI_Controller.php
old mode 100644
new mode 100755
diff --git a/application/core/DB_Model.php b/application/core/DB_Model.php
old mode 100644
new mode 100755
diff --git a/application/core/FHC_Controller.php b/application/core/FHC_Controller.php
old mode 100644
new mode 100755
diff --git a/application/core/FS_Model.php b/application/core/FS_Model.php
old mode 100644
new mode 100755
diff --git a/application/core/IIssueResolvedChecker.php b/application/core/IIssueResolvedChecker.php
old mode 100644
new mode 100755
diff --git a/application/core/JOB_Controller.php b/application/core/JOB_Controller.php
old mode 100644
new mode 100755
diff --git a/application/core/JQW_Controller.php b/application/core/JQW_Controller.php
old mode 100644
new mode 100755
diff --git a/application/core/PlausiIssueProducer_Controller.php b/application/core/PlausiIssueProducer_Controller.php
old mode 100644
new mode 100755
diff --git a/application/core/RESTFul_Controller.php b/application/core/RESTFul_Controller.php
old mode 100644
new mode 100755
diff --git a/application/core/index.html b/application/core/index.html
old mode 100644
new mode 100755
diff --git a/application/extensions/.placeholder b/application/extensions/.placeholder
old mode 100644
new mode 100755
diff --git a/application/helpers/extensions/.placeholder b/application/helpers/extensions/.placeholder
old mode 100644
new mode 100755
diff --git a/application/helpers/hlp_authentication_helper.php b/application/helpers/hlp_authentication_helper.php
old mode 100644
new mode 100755
diff --git a/application/helpers/hlp_common_helper.php b/application/helpers/hlp_common_helper.php
old mode 100644
new mode 100755
diff --git a/application/helpers/hlp_header_helper.php b/application/helpers/hlp_header_helper.php
old mode 100644
new mode 100755
diff --git a/application/helpers/hlp_language_helper.php b/application/helpers/hlp_language_helper.php
old mode 100644
new mode 100755
diff --git a/application/helpers/hlp_return_object_helper.php b/application/helpers/hlp_return_object_helper.php
old mode 100644
new mode 100755
diff --git a/application/helpers/hlp_sancho_helper.php b/application/helpers/hlp_sancho_helper.php
old mode 100644
new mode 100755
diff --git a/application/helpers/hlp_session_helper.php b/application/helpers/hlp_session_helper.php
old mode 100644
new mode 100755
diff --git a/application/helpers/index.html b/application/helpers/index.html
old mode 100644
new mode 100755
diff --git a/application/hooks/extensions/.placeholder b/application/hooks/extensions/.placeholder
old mode 100644
new mode 100755
diff --git a/application/hooks/index.html b/application/hooks/index.html
old mode 100644
new mode 100755
diff --git a/application/index.html b/application/index.html
old mode 100644
new mode 100755
diff --git a/application/language/index.html b/application/language/index.html
old mode 100644
new mode 100755
diff --git a/application/libraries/AkteLib.php b/application/libraries/AkteLib.php
old mode 100644
new mode 100755
diff --git a/application/libraries/AnrechnungLib.php b/application/libraries/AnrechnungLib.php
old mode 100644
new mode 100755
diff --git a/application/libraries/AntragLib.php b/application/libraries/AntragLib.php
old mode 100644
new mode 100755
diff --git a/application/libraries/AuthLDAPLib.php b/application/libraries/AuthLDAPLib.php
old mode 100644
new mode 100755
diff --git a/application/libraries/AuthLib.php b/application/libraries/AuthLib.php
old mode 100644
new mode 100755
diff --git a/application/libraries/CisHmvc/Loader.php b/application/libraries/CisHmvc/Loader.php
old mode 100644
new mode 100755
diff --git a/application/libraries/CmsLib.php b/application/libraries/CmsLib.php
old mode 100644
new mode 100755
diff --git a/application/libraries/CryptLib.php b/application/libraries/CryptLib.php
old mode 100644
new mode 100755
diff --git a/application/libraries/DmsLib.php b/application/libraries/DmsLib.php
old mode 100644
new mode 100755
diff --git a/application/libraries/DocsboxLib.php b/application/libraries/DocsboxLib.php
old mode 100644
new mode 100755
diff --git a/application/libraries/DocumentLib.php b/application/libraries/DocumentLib.php
old mode 100644
new mode 100755
diff --git a/application/libraries/EPrintfLib.php b/application/libraries/EPrintfLib.php
old mode 100644
new mode 100755
diff --git a/application/libraries/ExtensionsLib.php b/application/libraries/ExtensionsLib.php
old mode 100644
new mode 100755
diff --git a/application/libraries/FilterCmptLib.php b/application/libraries/FilterCmptLib.php
old mode 100644
new mode 100755
diff --git a/application/libraries/FilterWidgetLib.php b/application/libraries/FilterWidgetLib.php
old mode 100644
new mode 100755
diff --git a/application/libraries/IssuesLib.php b/application/libraries/IssuesLib.php
old mode 100644
new mode 100755
diff --git a/application/libraries/JobsQueueLib.php b/application/libraries/JobsQueueLib.php
old mode 100644
new mode 100755
diff --git a/application/libraries/LogLib.php b/application/libraries/LogLib.php
old mode 100644
new mode 100755
diff --git a/application/libraries/MailLib.php b/application/libraries/MailLib.php
old mode 100644
new mode 100755
diff --git a/application/libraries/MessageLib.php b/application/libraries/MessageLib.php
old mode 100644
new mode 100755
diff --git a/application/libraries/NavigationLib.php b/application/libraries/NavigationLib.php
old mode 100644
new mode 100755
diff --git a/application/libraries/OrganisationseinheitLib.php b/application/libraries/OrganisationseinheitLib.php
old mode 100644
new mode 100755
diff --git a/application/libraries/PermissionLib.php b/application/libraries/PermissionLib.php
old mode 100644
new mode 100755
diff --git a/application/libraries/PersonLogLib.php b/application/libraries/PersonLogLib.php
old mode 100644
new mode 100755
diff --git a/application/libraries/PhrasesLib.php b/application/libraries/PhrasesLib.php
old mode 100644
new mode 100755
diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php
old mode 100644
new mode 100755
diff --git a/application/libraries/ReihungstestLib.php b/application/libraries/ReihungstestLib.php
old mode 100644
new mode 100755
diff --git a/application/libraries/SearchBarLib.php b/application/libraries/SearchBarLib.php
old mode 100644
new mode 100755
diff --git a/application/libraries/SignatureLib.php b/application/libraries/SignatureLib.php
old mode 100644
new mode 100755
diff --git a/application/libraries/StudienplanLib.php b/application/libraries/StudienplanLib.php
old mode 100644
new mode 100755
diff --git a/application/libraries/TableWidgetLib.php b/application/libraries/TableWidgetLib.php
old mode 100644
new mode 100755
diff --git a/application/libraries/UDFLib.php b/application/libraries/UDFLib.php
old mode 100644
new mode 100755
diff --git a/application/libraries/VariableLib.php b/application/libraries/VariableLib.php
old mode 100644
new mode 100755
diff --git a/application/libraries/VorlageLib.php b/application/libraries/VorlageLib.php
old mode 100644
new mode 100755
diff --git a/application/libraries/WidgetLib.php b/application/libraries/WidgetLib.php
old mode 100644
new mode 100755
diff --git a/application/libraries/dashboard/DashboardLib.php b/application/libraries/dashboard/DashboardLib.php
old mode 100644
new mode 100755
diff --git a/application/libraries/extensions/.placeholder b/application/libraries/extensions/.placeholder
old mode 100644
new mode 100755
diff --git a/application/libraries/index.html b/application/libraries/index.html
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/PlausicheckDefinitionLib.php b/application/libraries/issues/PlausicheckDefinitionLib.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/PlausicheckProducerLib.php b/application/libraries/issues/PlausicheckProducerLib.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/plausichecks/AbbrecherAktiv.php b/application/libraries/issues/plausichecks/AbbrecherAktiv.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/plausichecks/AbschlussstatusFehlt.php b/application/libraries/issues/plausichecks/AbschlussstatusFehlt.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/plausichecks/AktSemesterNull.php b/application/libraries/issues/plausichecks/AktSemesterNull.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/plausichecks/AktiverStudentOhneStatus.php b/application/libraries/issues/plausichecks/AktiverStudentOhneStatus.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/plausichecks/AktiverStudentstatusOhneKontobuchung.php b/application/libraries/issues/plausichecks/AktiverStudentstatusOhneKontobuchung.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/plausichecks/AusbildungssemPrestudentUngleichAusbildungssemStatus.php b/application/libraries/issues/plausichecks/AusbildungssemPrestudentUngleichAusbildungssemStatus.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/plausichecks/BewerberNichtZumRtAngetreten.php b/application/libraries/issues/plausichecks/BewerberNichtZumRtAngetreten.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/plausichecks/DatumAbschlusspruefungFehlt.php b/application/libraries/issues/plausichecks/DatumAbschlusspruefungFehlt.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/plausichecks/DatumSponsionFehlt.php b/application/libraries/issues/plausichecks/DatumSponsionFehlt.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/plausichecks/DatumStudiensemesterFalscheReihenfolge.php b/application/libraries/issues/plausichecks/DatumStudiensemesterFalscheReihenfolge.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/plausichecks/FalscheAnzahlAbschlusspruefungen.php b/application/libraries/issues/plausichecks/FalscheAnzahlAbschlusspruefungen.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/plausichecks/FalscheAnzahlHeimatadressen.php b/application/libraries/issues/plausichecks/FalscheAnzahlHeimatadressen.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/plausichecks/FalscheAnzahlZustelladressen.php b/application/libraries/issues/plausichecks/FalscheAnzahlZustelladressen.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/plausichecks/GbDatumWeitZurueck.php b/application/libraries/issues/plausichecks/GbDatumWeitZurueck.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/plausichecks/InaktiverStudentAktiverStatus.php b/application/libraries/issues/plausichecks/InaktiverStudentAktiverStatus.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/plausichecks/IncomingHeimatNationOesterreich.php b/application/libraries/issues/plausichecks/IncomingHeimatNationOesterreich.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/plausichecks/IncomingOhneIoDatensatz.php b/application/libraries/issues/plausichecks/IncomingOhneIoDatensatz.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/plausichecks/IncomingOrGsFoerderrelevant.php b/application/libraries/issues/plausichecks/IncomingOrGsFoerderrelevant.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/plausichecks/InskriptionVorLetzerBismeldung.php b/application/libraries/issues/plausichecks/InskriptionVorLetzerBismeldung.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/plausichecks/NationNichtOesterreichAberGemeinde.php b/application/libraries/issues/plausichecks/NationNichtOesterreichAberGemeinde.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/plausichecks/OrgformStgUngleichOrgformPrestudent.php b/application/libraries/issues/plausichecks/OrgformStgUngleichOrgformPrestudent.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/plausichecks/PlausiChecker.php b/application/libraries/issues/plausichecks/PlausiChecker.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/plausichecks/PrestudentMischformOhneOrgform.php b/application/libraries/issues/plausichecks/PrestudentMischformOhneOrgform.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/plausichecks/StgPrestudentUngleichStgStudent.php b/application/libraries/issues/plausichecks/StgPrestudentUngleichStgStudent.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/plausichecks/StgPrestudentUngleichStgStudienplan.php b/application/libraries/issues/plausichecks/StgPrestudentUngleichStgStudienplan.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/plausichecks/StudentstatusNachAbbrecher.php b/application/libraries/issues/plausichecks/StudentstatusNachAbbrecher.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/plausichecks/StudienplanUngueltig.php b/application/libraries/issues/plausichecks/StudienplanUngueltig.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/resolvers/CORE_INOUT_0001.php b/application/libraries/issues/resolvers/CORE_INOUT_0001.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/resolvers/CORE_INOUT_0002.php b/application/libraries/issues/resolvers/CORE_INOUT_0002.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/resolvers/CORE_INOUT_0003.php b/application/libraries/issues/resolvers/CORE_INOUT_0003.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/resolvers/CORE_INOUT_0004.php b/application/libraries/issues/resolvers/CORE_INOUT_0004.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/resolvers/CORE_INOUT_0005.php b/application/libraries/issues/resolvers/CORE_INOUT_0005.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/resolvers/CORE_INOUT_0006.php b/application/libraries/issues/resolvers/CORE_INOUT_0006.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/resolvers/CORE_INOUT_0007.php b/application/libraries/issues/resolvers/CORE_INOUT_0007.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/resolvers/CORE_INOUT_0008.php b/application/libraries/issues/resolvers/CORE_INOUT_0008.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/resolvers/CORE_INOUT_0009.php b/application/libraries/issues/resolvers/CORE_INOUT_0009.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/resolvers/CORE_PERSON_0001.php b/application/libraries/issues/resolvers/CORE_PERSON_0001.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/resolvers/CORE_PERSON_0002.php b/application/libraries/issues/resolvers/CORE_PERSON_0002.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/resolvers/CORE_PERSON_0003.php b/application/libraries/issues/resolvers/CORE_PERSON_0003.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/resolvers/CORE_PERSON_0004.php b/application/libraries/issues/resolvers/CORE_PERSON_0004.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/resolvers/CORE_STG_0001.php b/application/libraries/issues/resolvers/CORE_STG_0001.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/resolvers/CORE_STG_0002.php b/application/libraries/issues/resolvers/CORE_STG_0002.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/resolvers/CORE_STG_0003.php b/application/libraries/issues/resolvers/CORE_STG_0003.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/resolvers/CORE_STG_0004.php b/application/libraries/issues/resolvers/CORE_STG_0004.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0001.php b/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0001.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0002.php b/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0002.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0003.php b/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0003.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0004.php b/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0004.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0005.php b/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0005.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0006.php b/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0006.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0007.php b/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0007.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0008.php b/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0008.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0009.php b/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0009.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0010.php b/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0010.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0011.php b/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0011.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0012.php b/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0012.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0013.php b/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0013.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0014.php b/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0014.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0015.php b/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0015.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/resolvers/CORE_ZGV_0001.php b/application/libraries/issues/resolvers/CORE_ZGV_0001.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/resolvers/CORE_ZGV_0002.php b/application/libraries/issues/resolvers/CORE_ZGV_0002.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/resolvers/CORE_ZGV_0003.php b/application/libraries/issues/resolvers/CORE_ZGV_0003.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/resolvers/CORE_ZGV_0004.php b/application/libraries/issues/resolvers/CORE_ZGV_0004.php
old mode 100644
new mode 100755
diff --git a/application/libraries/issues/resolvers/CORE_ZGV_0005.php b/application/libraries/issues/resolvers/CORE_ZGV_0005.php
old mode 100644
new mode 100755
diff --git a/application/logs/index.html b/application/logs/index.html
old mode 100644
new mode 100755
diff --git a/application/models/CL/Messages_model.php b/application/models/CL/Messages_model.php
old mode 100644
new mode 100755
diff --git a/application/models/accounting/Aufteilung_model.php b/application/models/accounting/Aufteilung_model.php
old mode 100644
new mode 100755
diff --git a/application/models/accounting/Bestelldetail_model.php b/application/models/accounting/Bestelldetail_model.php
old mode 100644
new mode 100755
diff --git a/application/models/accounting/Bestelldetailtag_model.php b/application/models/accounting/Bestelldetailtag_model.php
old mode 100644
new mode 100755
diff --git a/application/models/accounting/Bestellstatus_model.php b/application/models/accounting/Bestellstatus_model.php
old mode 100644
new mode 100755
diff --git a/application/models/accounting/Bestellung_model.php b/application/models/accounting/Bestellung_model.php
old mode 100644
new mode 100755
diff --git a/application/models/accounting/Bestellungtag_model.php b/application/models/accounting/Bestellungtag_model.php
old mode 100644
new mode 100755
diff --git a/application/models/accounting/Buchung_model.php b/application/models/accounting/Buchung_model.php
old mode 100644
new mode 100755
diff --git a/application/models/accounting/Buchungstyp_model.php b/application/models/accounting/Buchungstyp_model.php
old mode 100644
new mode 100755
diff --git a/application/models/accounting/Budget_model.php b/application/models/accounting/Budget_model.php
old mode 100644
new mode 100755
diff --git a/application/models/accounting/Konto_model.php b/application/models/accounting/Konto_model.php
old mode 100644
new mode 100755
diff --git a/application/models/accounting/Kostenstelle_model.php b/application/models/accounting/Kostenstelle_model.php
old mode 100644
new mode 100755
diff --git a/application/models/accounting/Rechnung_model.php b/application/models/accounting/Rechnung_model.php
old mode 100644
new mode 100755
diff --git a/application/models/accounting/Rechnungsbetrag_model.php b/application/models/accounting/Rechnungsbetrag_model.php
old mode 100644
new mode 100755
diff --git a/application/models/accounting/Rechnungstyp_model.php b/application/models/accounting/Rechnungstyp_model.php
old mode 100644
new mode 100755
diff --git a/application/models/accounting/Vertrag_model.php b/application/models/accounting/Vertrag_model.php
old mode 100644
new mode 100755
diff --git a/application/models/accounting/Vertragsstatus_model.php b/application/models/accounting/Vertragsstatus_model.php
old mode 100644
new mode 100755
diff --git a/application/models/accounting/Vertragstyp_model.php b/application/models/accounting/Vertragstyp_model.php
old mode 100644
new mode 100755
diff --git a/application/models/accounting/Vertragvertragsstatus_model.php b/application/models/accounting/Vertragvertragsstatus_model.php
old mode 100644
new mode 100755
diff --git a/application/models/accounting/Zahlungstyp_model.php b/application/models/accounting/Zahlungstyp_model.php
old mode 100644
new mode 100755
diff --git a/application/models/codex/Abschluss_model.php b/application/models/codex/Abschluss_model.php
old mode 100644
new mode 100755
diff --git a/application/models/codex/Akadgrad_model.php b/application/models/codex/Akadgrad_model.php
old mode 100644
new mode 100755
diff --git a/application/models/codex/Archiv_model.php b/application/models/codex/Archiv_model.php
old mode 100644
new mode 100755
diff --git a/application/models/codex/Aufenthaltfoerderung_model.php b/application/models/codex/Aufenthaltfoerderung_model.php
old mode 100644
new mode 100755
diff --git a/application/models/codex/Aufmerksamdurch_model.php b/application/models/codex/Aufmerksamdurch_model.php
old mode 100644
new mode 100755
diff --git a/application/models/codex/Ausbildung_model.php b/application/models/codex/Ausbildung_model.php
old mode 100644
new mode 100755
diff --git a/application/models/codex/Berufstaetigkeit_model.php b/application/models/codex/Berufstaetigkeit_model.php
old mode 100644
new mode 100755
diff --git a/application/models/codex/Beschaeftigungsausmass_model.php b/application/models/codex/Beschaeftigungsausmass_model.php
old mode 100644
new mode 100755
diff --git a/application/models/codex/Besqual_model.php b/application/models/codex/Besqual_model.php
old mode 100644
new mode 100755
diff --git a/application/models/codex/Bisfunktion_model.php b/application/models/codex/Bisfunktion_model.php
old mode 100644
new mode 100755
diff --git a/application/models/codex/Bisio_model.php b/application/models/codex/Bisio_model.php
old mode 100644
new mode 100755
diff --git a/application/models/codex/Bisioaufenthaltfoerderung_model.php b/application/models/codex/Bisioaufenthaltfoerderung_model.php
old mode 100644
new mode 100755
diff --git a/application/models/codex/Bisiozweck_model.php b/application/models/codex/Bisiozweck_model.php
old mode 100644
new mode 100755
diff --git a/application/models/codex/Bisorgform_model.php b/application/models/codex/Bisorgform_model.php
old mode 100644
new mode 100755
diff --git a/application/models/codex/Bisverwendung_model.php b/application/models/codex/Bisverwendung_model.php
old mode 100644
new mode 100755
diff --git a/application/models/codex/Bundesland_model.php b/application/models/codex/Bundesland_model.php
old mode 100644
new mode 100755
diff --git a/application/models/codex/Entwicklungsteam_model.php b/application/models/codex/Entwicklungsteam_model.php
old mode 100644
new mode 100755
diff --git a/application/models/codex/Gemeinde_model.php b/application/models/codex/Gemeinde_model.php
old mode 100644
new mode 100755
diff --git a/application/models/codex/Gsprogramm_model.php b/application/models/codex/Gsprogramm_model.php
old mode 100644
new mode 100755
diff --git a/application/models/codex/Hauptberuf_model.php b/application/models/codex/Hauptberuf_model.php
old mode 100644
new mode 100755
diff --git a/application/models/codex/Lehrform_model.php b/application/models/codex/Lehrform_model.php
old mode 100644
new mode 100755
diff --git a/application/models/codex/Lgartcode_model.php b/application/models/codex/Lgartcode_model.php
old mode 100644
new mode 100755
diff --git a/application/models/codex/Mobilitaet_model.php b/application/models/codex/Mobilitaet_model.php
old mode 100644
new mode 100755
diff --git a/application/models/codex/Mobilitaetsprogramm_model.php b/application/models/codex/Mobilitaetsprogramm_model.php
old mode 100644
new mode 100755
diff --git a/application/models/codex/Nation_model.php b/application/models/codex/Nation_model.php
old mode 100644
new mode 100755
diff --git a/application/models/codex/Note_model.php b/application/models/codex/Note_model.php
old mode 100644
new mode 100755
diff --git a/application/models/codex/Oehbeitrag_model.php b/application/models/codex/Oehbeitrag_model.php
old mode 100644
new mode 100755
diff --git a/application/models/codex/Orgform_model.php b/application/models/codex/Orgform_model.php
old mode 100644
new mode 100755
diff --git a/application/models/codex/Uhstat1daten_model.php b/application/models/codex/Uhstat1daten_model.php
old mode 100644
new mode 100755
diff --git a/application/models/codex/Verwendung_model.php b/application/models/codex/Verwendung_model.php
old mode 100644
new mode 100755
diff --git a/application/models/codex/Zgv_model.php b/application/models/codex/Zgv_model.php
old mode 100644
new mode 100755
diff --git a/application/models/codex/Zgvdoktor_model.php b/application/models/codex/Zgvdoktor_model.php
old mode 100644
new mode 100755
diff --git a/application/models/codex/Zgvgruppe_model.php b/application/models/codex/Zgvgruppe_model.php
old mode 100644
new mode 100755
diff --git a/application/models/codex/Zgvmaster_model.php b/application/models/codex/Zgvmaster_model.php
old mode 100644
new mode 100755
diff --git a/application/models/codex/Zweck_model.php b/application/models/codex/Zweck_model.php
old mode 100644
new mode 100755
diff --git a/application/models/content/Ampel_model.php b/application/models/content/Ampel_model.php
old mode 100644
new mode 100755
diff --git a/application/models/content/Content_model.php b/application/models/content/Content_model.php
old mode 100644
new mode 100755
diff --git a/application/models/content/Contentchild_model.php b/application/models/content/Contentchild_model.php
old mode 100644
new mode 100755
diff --git a/application/models/content/Contentgruppe_model.php b/application/models/content/Contentgruppe_model.php
old mode 100644
new mode 100755
diff --git a/application/models/content/Contentlog_model.php b/application/models/content/Contentlog_model.php
old mode 100644
new mode 100755
diff --git a/application/models/content/Contentsprache_model.php b/application/models/content/Contentsprache_model.php
old mode 100644
new mode 100755
diff --git a/application/models/content/DmsFS_model.php b/application/models/content/DmsFS_model.php
old mode 100644
new mode 100755
diff --git a/application/models/content/DmsVersion_model.php b/application/models/content/DmsVersion_model.php
old mode 100644
new mode 100755
diff --git a/application/models/content/Dms_model.php b/application/models/content/Dms_model.php
old mode 100644
new mode 100755
diff --git a/application/models/content/Infoscreen_model.php b/application/models/content/Infoscreen_model.php
old mode 100644
new mode 100755
diff --git a/application/models/content/News_model.php b/application/models/content/News_model.php
old mode 100644
new mode 100755
diff --git a/application/models/content/TempFS_model.php b/application/models/content/TempFS_model.php
old mode 100644
new mode 100755
diff --git a/application/models/content/Template_model.php b/application/models/content/Template_model.php
old mode 100644
new mode 100755
diff --git a/application/models/content/Veranstaltung_model.php b/application/models/content/Veranstaltung_model.php
old mode 100644
new mode 100755
diff --git a/application/models/content/Veranstaltungskategorie_model.php b/application/models/content/Veranstaltungskategorie_model.php
old mode 100644
new mode 100755
diff --git a/application/models/crm/Akte_model.php b/application/models/crm/Akte_model.php
old mode 100644
new mode 100755
diff --git a/application/models/crm/Aufnahmeschluessel_model.php b/application/models/crm/Aufnahmeschluessel_model.php
old mode 100644
new mode 100755
diff --git a/application/models/crm/Bewerbungstermine_model.php b/application/models/crm/Bewerbungstermine_model.php
old mode 100644
new mode 100755
diff --git a/application/models/crm/Buchungstyp_model.php b/application/models/crm/Buchungstyp_model.php
old mode 100644
new mode 100755
diff --git a/application/models/crm/Dokument_model.php b/application/models/crm/Dokument_model.php
old mode 100644
new mode 100755
diff --git a/application/models/crm/Dokumentprestudent_model.php b/application/models/crm/Dokumentprestudent_model.php
old mode 100644
new mode 100755
diff --git a/application/models/crm/Dokumentstudiengang_model.php b/application/models/crm/Dokumentstudiengang_model.php
old mode 100644
new mode 100755
diff --git a/application/models/crm/Konto_model.php b/application/models/crm/Konto_model.php
old mode 100644
new mode 100755
diff --git a/application/models/crm/Preincoming_model.php b/application/models/crm/Preincoming_model.php
old mode 100644
new mode 100755
diff --git a/application/models/crm/Preinteressent_model.php b/application/models/crm/Preinteressent_model.php
old mode 100644
new mode 100755
diff --git a/application/models/crm/Preinteressentstudiengang_model.php b/application/models/crm/Preinteressentstudiengang_model.php
old mode 100644
new mode 100755
diff --git a/application/models/crm/Preoutgoing_model.php b/application/models/crm/Preoutgoing_model.php
old mode 100644
new mode 100755
diff --git a/application/models/crm/Prestudent_model.php b/application/models/crm/Prestudent_model.php
old mode 100644
new mode 100755
diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php
old mode 100644
new mode 100755
diff --git a/application/models/crm/Reihungstest_model.php b/application/models/crm/Reihungstest_model.php
old mode 100644
new mode 100755
diff --git a/application/models/crm/RtPerson_model.php b/application/models/crm/RtPerson_model.php
old mode 100644
new mode 100755
diff --git a/application/models/crm/RtStudienplan_model.php b/application/models/crm/RtStudienplan_model.php
old mode 100644
new mode 100755
diff --git a/application/models/crm/RueckstellungStatus_model.php b/application/models/crm/RueckstellungStatus_model.php
old mode 100644
new mode 100755
diff --git a/application/models/crm/Rueckstellung_model.php b/application/models/crm/Rueckstellung_model.php
old mode 100644
new mode 100755
diff --git a/application/models/crm/Status_model.php b/application/models/crm/Status_model.php
old mode 100644
new mode 100755
diff --git a/application/models/crm/Statusgrund_model.php b/application/models/crm/Statusgrund_model.php
old mode 100644
new mode 100755
diff --git a/application/models/crm/Student_model.php b/application/models/crm/Student_model.php
old mode 100644
new mode 100755
diff --git a/application/models/crm/ZGVPruefungStatus_model.php b/application/models/crm/ZGVPruefungStatus_model.php
old mode 100644
new mode 100755
diff --git a/application/models/crm/ZGVPruefung_model.php b/application/models/crm/ZGVPruefung_model.php
old mode 100644
new mode 100755
diff --git a/application/models/dashboard/Dashboard_Override_model.php b/application/models/dashboard/Dashboard_Override_model.php
old mode 100644
new mode 100755
diff --git a/application/models/dashboard/Dashboard_Preset_model.php b/application/models/dashboard/Dashboard_Preset_model.php
old mode 100644
new mode 100755
diff --git a/application/models/dashboard/Dashboard_Widget_model.php b/application/models/dashboard/Dashboard_Widget_model.php
old mode 100644
new mode 100755
diff --git a/application/models/dashboard/Dashboard_model.php b/application/models/dashboard/Dashboard_model.php
old mode 100644
new mode 100755
diff --git a/application/models/dashboard/Widget_model.php b/application/models/dashboard/Widget_model.php
old mode 100644
new mode 100755
diff --git a/application/models/education/Abgabe_model.php b/application/models/education/Abgabe_model.php
old mode 100644
new mode 100755
diff --git a/application/models/education/Abschlussbeurteilung_model.php b/application/models/education/Abschlussbeurteilung_model.php
old mode 100644
new mode 100755
diff --git a/application/models/education/Abschlusspruefung_model.php b/application/models/education/Abschlusspruefung_model.php
old mode 100644
new mode 100755
diff --git a/application/models/education/Anrechnung_model.php b/application/models/education/Anrechnung_model.php
old mode 100644
new mode 100755
diff --git a/application/models/education/Anrechnungbegruendung_model.php b/application/models/education/Anrechnungbegruendung_model.php
old mode 100644
new mode 100755
diff --git a/application/models/education/Anrechnungstatus_model.php b/application/models/education/Anrechnungstatus_model.php
old mode 100644
new mode 100755
diff --git a/application/models/education/Anrechnungszeitraum_model.php b/application/models/education/Anrechnungszeitraum_model.php
old mode 100644
new mode 100755
diff --git a/application/models/education/Anwesenheit_model.php b/application/models/education/Anwesenheit_model.php
old mode 100644
new mode 100755
diff --git a/application/models/education/Beispiel_model.php b/application/models/education/Beispiel_model.php
old mode 100644
new mode 100755
diff --git a/application/models/education/Betreuerart_model.php b/application/models/education/Betreuerart_model.php
old mode 100644
new mode 100755
diff --git a/application/models/education/Feedback_model.php b/application/models/education/Feedback_model.php
old mode 100644
new mode 100755
diff --git a/application/models/education/LeNotenschluessel_model.php b/application/models/education/LeNotenschluessel_model.php
old mode 100644
new mode 100755
diff --git a/application/models/education/LePruefung_model.php b/application/models/education/LePruefung_model.php
old mode 100644
new mode 100755
diff --git a/application/models/education/Legesamtnote_model.php b/application/models/education/Legesamtnote_model.php
old mode 100644
new mode 100755
diff --git a/application/models/education/Lehreinheit_model.php b/application/models/education/Lehreinheit_model.php
old mode 100644
new mode 100755
diff --git a/application/models/education/Lehreinheitgruppe_model.php b/application/models/education/Lehreinheitgruppe_model.php
old mode 100644
new mode 100755
diff --git a/application/models/education/Lehreinheitmitarbeiter_model.php b/application/models/education/Lehreinheitmitarbeiter_model.php
old mode 100644
new mode 100755
diff --git a/application/models/education/Lehrfach_model.php b/application/models/education/Lehrfach_model.php
old mode 100644
new mode 100755
diff --git a/application/models/education/Lehrfunktion_model.php b/application/models/education/Lehrfunktion_model.php
old mode 100644
new mode 100755
diff --git a/application/models/education/Lehrtyp_model.php b/application/models/education/Lehrtyp_model.php
old mode 100644
new mode 100755
diff --git a/application/models/education/Lehrveranstaltung_model.php b/application/models/education/Lehrveranstaltung_model.php
old mode 100644
new mode 100755
diff --git a/application/models/education/Lvangebot_model.php b/application/models/education/Lvangebot_model.php
old mode 100644
new mode 100755
diff --git a/application/models/education/Lvgesamtnote_model.php b/application/models/education/Lvgesamtnote_model.php
old mode 100644
new mode 100755
diff --git a/application/models/education/Lvinfo_model.php b/application/models/education/Lvinfo_model.php
old mode 100644
new mode 100755
diff --git a/application/models/education/Lvregel_model.php b/application/models/education/Lvregel_model.php
old mode 100644
new mode 100755
diff --git a/application/models/education/Lvregeltyp_model.php b/application/models/education/Lvregeltyp_model.php
old mode 100644
new mode 100755
diff --git a/application/models/education/Notenschluessel_model.php b/application/models/education/Notenschluessel_model.php
old mode 100644
new mode 100755
diff --git a/application/models/education/Notenschluesselaufteilung_model.php b/application/models/education/Notenschluesselaufteilung_model.php
old mode 100644
new mode 100755
diff --git a/application/models/education/Notenschluesseluebung_model.php b/application/models/education/Notenschluesseluebung_model.php
old mode 100644
new mode 100755
diff --git a/application/models/education/Notenschluesselzuordnung_model.php b/application/models/education/Notenschluesselzuordnung_model.php
old mode 100644
new mode 100755
diff --git a/application/models/education/Paabgabe_model.php b/application/models/education/Paabgabe_model.php
old mode 100644
new mode 100755
diff --git a/application/models/education/Paabgabetyp_model.php b/application/models/education/Paabgabetyp_model.php
old mode 100644
new mode 100755
diff --git a/application/models/education/Projektarbeit_model.php b/application/models/education/Projektarbeit_model.php
old mode 100644
new mode 100755
diff --git a/application/models/education/Projektbetreuer_model.php b/application/models/education/Projektbetreuer_model.php
old mode 100644
new mode 100755
diff --git a/application/models/education/Projekttyp_model.php b/application/models/education/Projekttyp_model.php
old mode 100644
new mode 100755
diff --git a/application/models/education/Pruefung_model.php b/application/models/education/Pruefung_model.php
old mode 100644
new mode 100755
diff --git a/application/models/education/Pruefungsanmeldung_model.php b/application/models/education/Pruefungsanmeldung_model.php
old mode 100644
new mode 100755
diff --git a/application/models/education/Pruefungsfenster_model.php b/application/models/education/Pruefungsfenster_model.php
old mode 100644
new mode 100755
diff --git a/application/models/education/Pruefungsstatus_model.php b/application/models/education/Pruefungsstatus_model.php
old mode 100644
new mode 100755
diff --git a/application/models/education/Pruefungstermin_model.php b/application/models/education/Pruefungstermin_model.php
old mode 100644
new mode 100755
diff --git a/application/models/education/Pruefungstyp_model.php b/application/models/education/Pruefungstyp_model.php
old mode 100644
new mode 100755
diff --git a/application/models/education/Studentbeispiel_model.php b/application/models/education/Studentbeispiel_model.php
old mode 100644
new mode 100755
diff --git a/application/models/education/Studentlehrverband_model.php b/application/models/education/Studentlehrverband_model.php
old mode 100644
new mode 100755
diff --git a/application/models/education/Studentuebung_model.php b/application/models/education/Studentuebung_model.php
old mode 100644
new mode 100755
diff --git a/application/models/education/Studierendenantrag_model.php b/application/models/education/Studierendenantrag_model.php
old mode 100644
new mode 100755
diff --git a/application/models/education/Studierendenantraglehrveranstaltung_model.php b/application/models/education/Studierendenantraglehrveranstaltung_model.php
old mode 100644
new mode 100755
diff --git a/application/models/education/Studierendenantragstatus_model.php b/application/models/education/Studierendenantragstatus_model.php
old mode 100644
new mode 100755
diff --git a/application/models/education/Uebung_model.php b/application/models/education/Uebung_model.php
old mode 100644
new mode 100755
diff --git a/application/models/education/Zeugnis_model.php b/application/models/education/Zeugnis_model.php
old mode 100644
new mode 100755
diff --git a/application/models/education/Zeugnisnote_model.php b/application/models/education/Zeugnisnote_model.php
old mode 100644
new mode 100755
diff --git a/application/models/extensions/.placeholder b/application/models/extensions/.placeholder
old mode 100644
new mode 100755
diff --git a/application/models/index.html b/application/models/index.html
old mode 100644
new mode 100755
diff --git a/application/models/organisation/Erhalter_model.php b/application/models/organisation/Erhalter_model.php
old mode 100644
new mode 100755
diff --git a/application/models/organisation/Fachbereich_model.php b/application/models/organisation/Fachbereich_model.php
old mode 100644
new mode 100755
diff --git a/application/models/organisation/Ferien_model.php b/application/models/organisation/Ferien_model.php
old mode 100644
new mode 100755
diff --git a/application/models/organisation/Geschaeftsjahr_model.php b/application/models/organisation/Geschaeftsjahr_model.php
old mode 100644
new mode 100755
diff --git a/application/models/organisation/Gruppe_model.php b/application/models/organisation/Gruppe_model.php
old mode 100644
new mode 100755
diff --git a/application/models/organisation/Lehrverband_model.php b/application/models/organisation/Lehrverband_model.php
old mode 100644
new mode 100755
diff --git a/application/models/organisation/Organisationseinheit_model.php b/application/models/organisation/Organisationseinheit_model.php
old mode 100644
new mode 100755
diff --git a/application/models/organisation/Organisationseinheittyp_model.php b/application/models/organisation/Organisationseinheittyp_model.php
old mode 100644
new mode 100755
diff --git a/application/models/organisation/Semesterwochen_model.php b/application/models/organisation/Semesterwochen_model.php
old mode 100644
new mode 100755
diff --git a/application/models/organisation/Service_model.php b/application/models/organisation/Service_model.php
old mode 100644
new mode 100755
diff --git a/application/models/organisation/Standort_model.php b/application/models/organisation/Standort_model.php
old mode 100644
new mode 100755
diff --git a/application/models/organisation/Statistik_model.php b/application/models/organisation/Statistik_model.php
old mode 100644
new mode 100755
diff --git a/application/models/organisation/Studiengang_model.php b/application/models/organisation/Studiengang_model.php
old mode 100644
new mode 100755
diff --git a/application/models/organisation/Studiengangstyp_model.php b/application/models/organisation/Studiengangstyp_model.php
old mode 100644
new mode 100755
diff --git a/application/models/organisation/Studienjahr_model.php b/application/models/organisation/Studienjahr_model.php
old mode 100644
new mode 100755
diff --git a/application/models/organisation/Studienordnung_model.php b/application/models/organisation/Studienordnung_model.php
old mode 100644
new mode 100755
diff --git a/application/models/organisation/Studienordnungstatus_model.php b/application/models/organisation/Studienordnungstatus_model.php
old mode 100644
new mode 100755
diff --git a/application/models/organisation/Studienplan_model.php b/application/models/organisation/Studienplan_model.php
old mode 100644
new mode 100755
diff --git a/application/models/organisation/Studienplatz_model.php b/application/models/organisation/Studienplatz_model.php
old mode 100644
new mode 100755
diff --git a/application/models/organisation/Studiensemester_model.php b/application/models/organisation/Studiensemester_model.php
old mode 100644
new mode 100755
diff --git a/application/models/person/Adresse_model.php b/application/models/person/Adresse_model.php
old mode 100644
new mode 100755
diff --git a/application/models/person/Adressentyp_model.php b/application/models/person/Adressentyp_model.php
old mode 100644
new mode 100755
diff --git a/application/models/person/Bankverbindung_model.php b/application/models/person/Bankverbindung_model.php
old mode 100644
new mode 100755
diff --git a/application/models/person/Benutzer_model.php b/application/models/person/Benutzer_model.php
old mode 100644
new mode 100755
diff --git a/application/models/person/Benutzerfunktion_model.php b/application/models/person/Benutzerfunktion_model.php
old mode 100644
new mode 100755
diff --git a/application/models/person/Benutzergruppe_model.php b/application/models/person/Benutzergruppe_model.php
old mode 100644
new mode 100755
diff --git a/application/models/person/Fotostatus_model.php b/application/models/person/Fotostatus_model.php
old mode 100644
new mode 100755
diff --git a/application/models/person/Fotostatusperson_model.php b/application/models/person/Fotostatusperson_model.php
old mode 100644
new mode 100755
diff --git a/application/models/person/Freebusy_model.php b/application/models/person/Freebusy_model.php
old mode 100644
new mode 100755
diff --git a/application/models/person/Freebusytyp_model.php b/application/models/person/Freebusytyp_model.php
old mode 100644
new mode 100755
diff --git a/application/models/person/Geschlecht_model.php b/application/models/person/Geschlecht_model.php
old mode 100644
new mode 100755
diff --git a/application/models/person/Kontakt_model.php b/application/models/person/Kontakt_model.php
old mode 100644
new mode 100755
diff --git a/application/models/person/Kontaktmedium_model.php b/application/models/person/Kontaktmedium_model.php
old mode 100644
new mode 100755
diff --git a/application/models/person/Kontakttyp_model.php b/application/models/person/Kontakttyp_model.php
old mode 100644
new mode 100755
diff --git a/application/models/person/Notiz_model.php b/application/models/person/Notiz_model.php
old mode 100644
new mode 100755
diff --git a/application/models/person/Notizzuordnung_model.php b/application/models/person/Notizzuordnung_model.php
old mode 100644
new mode 100755
diff --git a/application/models/person/Person_model.php b/application/models/person/Person_model.php
old mode 100644
new mode 100755
diff --git a/application/models/person/Profil_change_model.php b/application/models/person/Profil_change_model.php
old mode 100644
new mode 100755
diff --git a/application/models/project/Aktivitaet_model.php b/application/models/project/Aktivitaet_model.php
old mode 100644
new mode 100755
diff --git a/application/models/project/Aufwandstyp_model.php b/application/models/project/Aufwandstyp_model.php
old mode 100644
new mode 100755
diff --git a/application/models/project/Projekt_model.php b/application/models/project/Projekt_model.php
old mode 100644
new mode 100755
diff --git a/application/models/project/Projekt_ressource_model.php b/application/models/project/Projekt_ressource_model.php
old mode 100644
new mode 100755
diff --git a/application/models/project/Projektphase_model.php b/application/models/project/Projektphase_model.php
old mode 100644
new mode 100755
diff --git a/application/models/project/Projekttask_model.php b/application/models/project/Projekttask_model.php
old mode 100644
new mode 100755
diff --git a/application/models/project/Ressource_model.php b/application/models/project/Ressource_model.php
old mode 100644
new mode 100755
diff --git a/application/models/project/Scrumsprint_model.php b/application/models/project/Scrumsprint_model.php
old mode 100644
new mode 100755
diff --git a/application/models/ressource/Betriebsmittel_model.php b/application/models/ressource/Betriebsmittel_model.php
old mode 100644
new mode 100755
diff --git a/application/models/ressource/Betriebsmittelperson_model.php b/application/models/ressource/Betriebsmittelperson_model.php
old mode 100644
new mode 100755
diff --git a/application/models/ressource/Betriebsmittelstatus_model.php b/application/models/ressource/Betriebsmittelstatus_model.php
old mode 100644
new mode 100755
diff --git a/application/models/ressource/Betriebsmitteltyp_model.php b/application/models/ressource/Betriebsmitteltyp_model.php
old mode 100644
new mode 100755
diff --git a/application/models/ressource/Coodle_model.php b/application/models/ressource/Coodle_model.php
old mode 100644
new mode 100755
diff --git a/application/models/ressource/Erreichbarkeit_model.php b/application/models/ressource/Erreichbarkeit_model.php
old mode 100644
new mode 100755
diff --git a/application/models/ressource/Firma_model.php b/application/models/ressource/Firma_model.php
old mode 100644
new mode 100755
diff --git a/application/models/ressource/Firmatag_model.php b/application/models/ressource/Firmatag_model.php
old mode 100644
new mode 100755
diff --git a/application/models/ressource/Firmentyp_model.php b/application/models/ressource/Firmentyp_model.php
old mode 100644
new mode 100755
diff --git a/application/models/ressource/Funktion_model.php b/application/models/ressource/Funktion_model.php
old mode 100644
new mode 100755
diff --git a/application/models/ressource/Lehrmittel_model.php b/application/models/ressource/Lehrmittel_model.php
old mode 100644
new mode 100755
diff --git a/application/models/ressource/Mitarbeiter_model.php b/application/models/ressource/Mitarbeiter_model.php
old mode 100644
new mode 100755
diff --git a/application/models/ressource/Ort_model.php b/application/models/ressource/Ort_model.php
old mode 100644
new mode 100755
diff --git a/application/models/ressource/Ortraumtyp_model.php b/application/models/ressource/Ortraumtyp_model.php
old mode 100644
new mode 100755
diff --git a/application/models/ressource/Personfunktionstandort_model.php b/application/models/ressource/Personfunktionstandort_model.php
old mode 100644
new mode 100755
diff --git a/application/models/ressource/Raumtyp_model.php b/application/models/ressource/Raumtyp_model.php
old mode 100644
new mode 100755
diff --git a/application/models/ressource/Reservierung_model.php b/application/models/ressource/Reservierung_model.php
old mode 100644
new mode 100755
diff --git a/application/models/ressource/Stunde_model.php b/application/models/ressource/Stunde_model.php
old mode 100644
new mode 100755
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
old mode 100644
new mode 100755
diff --git a/application/models/ressource/Stundenplandev_model.php b/application/models/ressource/Stundenplandev_model.php
old mode 100644
new mode 100755
diff --git a/application/models/ressource/Zeitaufzeichnung_model.php b/application/models/ressource/Zeitaufzeichnung_model.php
old mode 100644
new mode 100755
diff --git a/application/models/ressource/Zeitsperre_model.php b/application/models/ressource/Zeitsperre_model.php
old mode 100644
new mode 100755
diff --git a/application/models/ressource/Zeitsperretyp_model.php b/application/models/ressource/Zeitsperretyp_model.php
old mode 100644
new mode 100755
diff --git a/application/models/ressource/Zeitwunsch_gueltigkeit_model.php b/application/models/ressource/Zeitwunsch_gueltigkeit_model.php
old mode 100644
new mode 100755
diff --git a/application/models/ressource/Zeitwunsch_model.php b/application/models/ressource/Zeitwunsch_model.php
old mode 100644
new mode 100755
diff --git a/application/models/system/Appdaten_model.php b/application/models/system/Appdaten_model.php
old mode 100644
new mode 100755
diff --git a/application/models/system/Attachment_model.php b/application/models/system/Attachment_model.php
old mode 100644
new mode 100755
diff --git a/application/models/system/Benutzerrolle_model.php b/application/models/system/Benutzerrolle_model.php
old mode 100644
new mode 100755
diff --git a/application/models/system/Berechtigung_model.php b/application/models/system/Berechtigung_model.php
old mode 100644
new mode 100755
diff --git a/application/models/system/Cronjob_model.php b/application/models/system/Cronjob_model.php
old mode 100644
new mode 100755
diff --git a/application/models/system/Dokument_model.php b/application/models/system/Dokument_model.php
old mode 100644
new mode 100755
diff --git a/application/models/system/Extensions_model.php b/application/models/system/Extensions_model.php
old mode 100644
new mode 100755
diff --git a/application/models/system/Fehler_model.php b/application/models/system/Fehler_model.php
old mode 100644
new mode 100755
diff --git a/application/models/system/Fehlerkonfiguration_model.php b/application/models/system/Fehlerkonfiguration_model.php
old mode 100644
new mode 100755
diff --git a/application/models/system/Fehlerkonfigurationstyp_model.php b/application/models/system/Fehlerkonfigurationstyp_model.php
old mode 100644
new mode 100755
diff --git a/application/models/system/Fehlerzustaendigkeiten_model.php b/application/models/system/Fehlerzustaendigkeiten_model.php
old mode 100644
new mode 100755
diff --git a/application/models/system/Filter_model.php b/application/models/system/Filter_model.php
old mode 100644
new mode 100755
diff --git a/application/models/system/Filters_model.php b/application/models/system/Filters_model.php
old mode 100644
new mode 100755
diff --git a/application/models/system/Issue_model.php b/application/models/system/Issue_model.php
old mode 100644
new mode 100755
diff --git a/application/models/system/JobStatuses_model.php b/application/models/system/JobStatuses_model.php
old mode 100644
new mode 100755
diff --git a/application/models/system/JobTriggers_model.php b/application/models/system/JobTriggers_model.php
old mode 100644
new mode 100755
diff --git a/application/models/system/JobTypes_model.php b/application/models/system/JobTypes_model.php
old mode 100644
new mode 100755
diff --git a/application/models/system/JobsQueue_model.php b/application/models/system/JobsQueue_model.php
old mode 100644
new mode 100755
diff --git a/application/models/system/Log_model.php b/application/models/system/Log_model.php
old mode 100644
new mode 100755
diff --git a/application/models/system/MessageToken_model.php b/application/models/system/MessageToken_model.php
old mode 100644
new mode 100755
diff --git a/application/models/system/Message_model.php b/application/models/system/Message_model.php
old mode 100644
new mode 100755
diff --git a/application/models/system/MsgStatus_model.php b/application/models/system/MsgStatus_model.php
old mode 100644
new mode 100755
diff --git a/application/models/system/PersonLock_model.php b/application/models/system/PersonLock_model.php
old mode 100644
new mode 100755
diff --git a/application/models/system/PersonLog_model.php b/application/models/system/PersonLog_model.php
old mode 100644
new mode 100755
diff --git a/application/models/system/Phrase_model.php b/application/models/system/Phrase_model.php
old mode 100644
new mode 100755
diff --git a/application/models/system/Phrasentext_model.php b/application/models/system/Phrasentext_model.php
old mode 100644
new mode 100755
diff --git a/application/models/system/Recipient_model.php b/application/models/system/Recipient_model.php
old mode 100644
new mode 100755
diff --git a/application/models/system/Rolle_model.php b/application/models/system/Rolle_model.php
old mode 100644
new mode 100755
diff --git a/application/models/system/Rolleberechtigung_model.php b/application/models/system/Rolleberechtigung_model.php
old mode 100644
new mode 100755
diff --git a/application/models/system/Server_model.php b/application/models/system/Server_model.php
old mode 100644
new mode 100755
diff --git a/application/models/system/Sprache_model.php b/application/models/system/Sprache_model.php
old mode 100644
new mode 100755
diff --git a/application/models/system/Tag_model.php b/application/models/system/Tag_model.php
old mode 100644
new mode 100755
diff --git a/application/models/system/UDF_model.php b/application/models/system/UDF_model.php
old mode 100644
new mode 100755
diff --git a/application/models/system/Variable_model.php b/application/models/system/Variable_model.php
old mode 100644
new mode 100755
diff --git a/application/models/system/Variablenname_model.php b/application/models/system/Variablenname_model.php
old mode 100644
new mode 100755
diff --git a/application/models/system/Vorlage_model.php b/application/models/system/Vorlage_model.php
old mode 100644
new mode 100755
diff --git a/application/models/system/Vorlagedokument_model.php b/application/models/system/Vorlagedokument_model.php
old mode 100644
new mode 100755
diff --git a/application/models/system/Vorlagestudiengang_model.php b/application/models/system/Vorlagestudiengang_model.php
old mode 100644
new mode 100755
diff --git a/application/models/system/Webservicelog_model.php b/application/models/system/Webservicelog_model.php
old mode 100644
new mode 100755
diff --git a/application/models/system/Webservicerecht_model.php b/application/models/system/Webservicerecht_model.php
old mode 100644
new mode 100755
diff --git a/application/models/system/Webservicetyp_model.php b/application/models/system/Webservicetyp_model.php
old mode 100644
new mode 100755
diff --git a/application/models/testtool/Ablauf_model.php b/application/models/testtool/Ablauf_model.php
old mode 100644
new mode 100755
diff --git a/application/models/testtool/Antwort_model.php b/application/models/testtool/Antwort_model.php
old mode 100644
new mode 100755
diff --git a/application/models/testtool/Frage_model.php b/application/models/testtool/Frage_model.php
old mode 100644
new mode 100755
diff --git a/application/models/testtool/Gebiet_model.php b/application/models/testtool/Gebiet_model.php
old mode 100644
new mode 100755
diff --git a/application/models/testtool/Kategorie_model.php b/application/models/testtool/Kategorie_model.php
old mode 100644
new mode 100755
diff --git a/application/models/testtool/Kriterien_model.php b/application/models/testtool/Kriterien_model.php
old mode 100644
new mode 100755
diff --git a/application/models/testtool/Pruefling_model.php b/application/models/testtool/Pruefling_model.php
old mode 100644
new mode 100755
diff --git a/application/models/testtool/Vorschlag_model.php b/application/models/testtool/Vorschlag_model.php
old mode 100644
new mode 100755
diff --git a/application/third_party/index.html b/application/third_party/index.html
old mode 100644
new mode 100755
diff --git a/application/tmp/.placeholder b/application/tmp/.placeholder
old mode 100644
new mode 100755
diff --git a/application/views/Cis/Cms/News/Xml/Address/Detailed.php b/application/views/Cis/Cms/News/Xml/Address/Detailed.php
old mode 100644
new mode 100755
diff --git a/application/views/Cis/Cms/News/Xml/Address/Short.php b/application/views/Cis/Cms/News/Xml/Address/Short.php
old mode 100644
new mode 100755
diff --git a/application/views/Cis/Cms/News/Xml/NewsExtras.php b/application/views/Cis/Cms/News/Xml/NewsExtras.php
old mode 100644
new mode 100755
diff --git a/application/views/Cis/Documents.php b/application/views/Cis/Documents.php
old mode 100644
new mode 100755
diff --git a/application/views/Cis/Login.php b/application/views/Cis/Login.php
old mode 100644
new mode 100755
diff --git a/application/views/Cis/MyLv.php b/application/views/Cis/MyLv.php
old mode 100644
new mode 100755
diff --git a/application/views/Cis/Profil.php b/application/views/Cis/Profil.php
old mode 100644
new mode 100755
diff --git a/application/views/Cis/ProfilUpdate.php b/application/views/Cis/ProfilUpdate.php
old mode 100644
new mode 100755
diff --git a/application/views/Cis/Stundenplan.php b/application/views/Cis/Stundenplan.php
old mode 100644
new mode 100755
diff --git a/application/views/CisHmvc/Cms/Content.php b/application/views/CisHmvc/Cms/Content.php
old mode 100644
new mode 100755
diff --git a/application/views/CisHmvc/Cms/Legacy.php b/application/views/CisHmvc/Cms/Legacy.php
old mode 100644
new mode 100755
diff --git a/application/views/CisHmvc/Dashboard.php b/application/views/CisHmvc/Dashboard.php
old mode 100644
new mode 100755
diff --git a/application/views/CisHmvc/Error.php b/application/views/CisHmvc/Error.php
old mode 100644
new mode 100755
diff --git a/application/views/CisHtml/Cms/Content.php b/application/views/CisHtml/Cms/Content.php
old mode 100644
new mode 100755
diff --git a/application/views/CisHtml/Dashboard.php b/application/views/CisHtml/Dashboard.php
old mode 100644
new mode 100755
diff --git a/application/views/CisHtml/Error.php b/application/views/CisHtml/Error.php
old mode 100644
new mode 100755
diff --git a/application/views/CisVue/Cms/Content.php b/application/views/CisVue/Cms/Content.php
old mode 100644
new mode 100755
diff --git a/application/views/CisVue/Dashboard.php b/application/views/CisVue/Dashboard.php
old mode 100644
new mode 100755
diff --git a/application/views/codex/oehbeitrag.php b/application/views/codex/oehbeitrag.php
old mode 100644
new mode 100755
diff --git a/application/views/codex/uhstat1.php b/application/views/codex/uhstat1.php
old mode 100644
new mode 100755
diff --git a/application/views/crm/statusEdit.php b/application/views/crm/statusEdit.php
old mode 100644
new mode 100755
diff --git a/application/views/crm/statusGrundList.php b/application/views/crm/statusGrundList.php
old mode 100644
new mode 100755
diff --git a/application/views/crm/statusList.php b/application/views/crm/statusList.php
old mode 100644
new mode 100755
diff --git a/application/views/crm/statusgrund.php b/application/views/crm/statusgrund.php
old mode 100644
new mode 100755
diff --git a/application/views/crm/statusgrundEdit.php b/application/views/crm/statusgrundEdit.php
old mode 100644
new mode 100755
diff --git a/application/views/crm/statusgrundNew.php b/application/views/crm/statusgrundNew.php
old mode 100644
new mode 100755
diff --git a/application/views/dashboard/dashboard_demo.php b/application/views/dashboard/dashboard_demo.php
old mode 100644
new mode 100755
diff --git a/application/views/dashboard/dashboard_demo_admin.php b/application/views/dashboard/dashboard_demo_admin.php
old mode 100644
new mode 100755
diff --git a/application/views/errors/cli/error_404.php b/application/views/errors/cli/error_404.php
old mode 100644
new mode 100755
diff --git a/application/views/errors/cli/error_db.php b/application/views/errors/cli/error_db.php
old mode 100644
new mode 100755
diff --git a/application/views/errors/cli/error_exception.php b/application/views/errors/cli/error_exception.php
old mode 100644
new mode 100755
diff --git a/application/views/errors/cli/error_general.php b/application/views/errors/cli/error_general.php
old mode 100644
new mode 100755
diff --git a/application/views/errors/cli/error_php.php b/application/views/errors/cli/error_php.php
old mode 100644
new mode 100755
diff --git a/application/views/errors/cli/index.html b/application/views/errors/cli/index.html
old mode 100644
new mode 100755
diff --git a/application/views/errors/html/error_404.php b/application/views/errors/html/error_404.php
old mode 100644
new mode 100755
diff --git a/application/views/errors/html/error_db.php b/application/views/errors/html/error_db.php
old mode 100644
new mode 100755
diff --git a/application/views/errors/html/error_exception.php b/application/views/errors/html/error_exception.php
old mode 100644
new mode 100755
diff --git a/application/views/errors/html/error_general.php b/application/views/errors/html/error_general.php
old mode 100644
new mode 100755
diff --git a/application/views/errors/html/error_php.php b/application/views/errors/html/error_php.php
old mode 100644
new mode 100755
diff --git a/application/views/errors/html/index.html b/application/views/errors/html/index.html
old mode 100644
new mode 100755
diff --git a/application/views/errors/index.html b/application/views/errors/index.html
old mode 100644
new mode 100755
diff --git a/application/views/extensions/.placeholder b/application/views/extensions/.placeholder
old mode 100644
new mode 100755
diff --git a/application/views/home.php b/application/views/home.php
old mode 100644
new mode 100755
diff --git a/application/views/index.html b/application/views/index.html
old mode 100644
new mode 100755
diff --git a/application/views/lehre/Antrag/Create.php b/application/views/lehre/Antrag/Create.php
old mode 100644
new mode 100755
diff --git a/application/views/lehre/Antrag/Leitung/List.php b/application/views/lehre/Antrag/Leitung/List.php
old mode 100644
new mode 100755
diff --git a/application/views/lehre/Antrag/Student/List.php b/application/views/lehre/Antrag/Student/List.php
old mode 100644
new mode 100755
diff --git a/application/views/lehre/Antrag/Wiederholung/Student.php b/application/views/lehre/Antrag/Wiederholung/Student.php
old mode 100644
new mode 100755
diff --git a/application/views/lehre/Antrag/Wiederholung/getLvs.rdf.php b/application/views/lehre/Antrag/Wiederholung/getLvs.rdf.php
old mode 100644
new mode 100755
diff --git a/application/views/lehre/Antrag/Wiederholung/moveLvs.rdf.php b/application/views/lehre/Antrag/Wiederholung/moveLvs.rdf.php
old mode 100644
new mode 100755
diff --git a/application/views/lehre/anrechnung/adminAnrechnung.php b/application/views/lehre/anrechnung/adminAnrechnung.php
old mode 100644
new mode 100755
diff --git a/application/views/lehre/anrechnung/adminAnrechnungData.php b/application/views/lehre/anrechnung/adminAnrechnungData.php
old mode 100644
new mode 100755
diff --git a/application/views/lehre/anrechnung/approveAnrechnungDetail.php b/application/views/lehre/anrechnung/approveAnrechnungDetail.php
old mode 100644
new mode 100755
diff --git a/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php b/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php
old mode 100644
new mode 100755
diff --git a/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php b/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
old mode 100644
new mode 100755
diff --git a/application/views/lehre/anrechnung/createAnrechnung.php b/application/views/lehre/anrechnung/createAnrechnung.php
old mode 100644
new mode 100755
diff --git a/application/views/lehre/anrechnung/createAnrechnungData.php b/application/views/lehre/anrechnung/createAnrechnungData.php
old mode 100644
new mode 100755
diff --git a/application/views/lehre/anrechnung/requestAnrechnung.php b/application/views/lehre/anrechnung/requestAnrechnung.php
old mode 100644
new mode 100755
diff --git a/application/views/lehre/anrechnung/requestAnrechnungImportant.php b/application/views/lehre/anrechnung/requestAnrechnungImportant.php
old mode 100644
new mode 100755
diff --git a/application/views/lehre/anrechnung/reviewAnrechnungDetail.php b/application/views/lehre/anrechnung/reviewAnrechnungDetail.php
old mode 100644
new mode 100755
diff --git a/application/views/lehre/anrechnung/reviewAnrechnungInfo.php b/application/views/lehre/anrechnung/reviewAnrechnungInfo.php
old mode 100644
new mode 100755
diff --git a/application/views/lehre/anrechnung/reviewAnrechnungUebersicht.php b/application/views/lehre/anrechnung/reviewAnrechnungUebersicht.php
old mode 100644
new mode 100755
diff --git a/application/views/lehre/anrechnung/reviewAnrechnungUebersichtData.php b/application/views/lehre/anrechnung/reviewAnrechnungUebersichtData.php
old mode 100644
new mode 100755
diff --git a/application/views/lehre/lehrauftrag/Dashboard.php b/application/views/lehre/lehrauftrag/Dashboard.php
old mode 100644
new mode 100755
diff --git a/application/views/lehre/lehrauftrag/LehrendeUebersicht.php b/application/views/lehre/lehrauftrag/LehrendeUebersicht.php
old mode 100644
new mode 100755
diff --git a/application/views/lehre/lehrauftrag/acceptLehrauftrag.php b/application/views/lehre/lehrauftrag/acceptLehrauftrag.php
old mode 100644
new mode 100755
diff --git a/application/views/lehre/lehrauftrag/acceptLehrauftragData.php b/application/views/lehre/lehrauftrag/acceptLehrauftragData.php
old mode 100644
new mode 100755
diff --git a/application/views/lehre/lehrauftrag/acceptLehrauftragHelp.php b/application/views/lehre/lehrauftrag/acceptLehrauftragHelp.php
old mode 100644
new mode 100755
diff --git a/application/views/lehre/lehrauftrag/approveLehrauftrag.php b/application/views/lehre/lehrauftrag/approveLehrauftrag.php
old mode 100644
new mode 100755
diff --git a/application/views/lehre/lehrauftrag/approveLehrauftragData.php b/application/views/lehre/lehrauftrag/approveLehrauftragData.php
old mode 100644
new mode 100755
diff --git a/application/views/lehre/lehrauftrag/approveLehrauftragHelp.php b/application/views/lehre/lehrauftrag/approveLehrauftragHelp.php
old mode 100644
new mode 100755
diff --git a/application/views/lehre/lehrauftrag/cancelledLehrauftragData.php b/application/views/lehre/lehrauftrag/cancelledLehrauftragData.php
old mode 100644
new mode 100755
diff --git a/application/views/lehre/lehrauftrag/orderLehrauftrag.php b/application/views/lehre/lehrauftrag/orderLehrauftrag.php
old mode 100644
new mode 100755
diff --git a/application/views/lehre/lehrauftrag/orderLehrauftragData.php b/application/views/lehre/lehrauftrag/orderLehrauftragData.php
old mode 100644
new mode 100755
diff --git a/application/views/lehre/lehrauftrag/orderLehrauftragHelp.php b/application/views/lehre/lehrauftrag/orderLehrauftragHelp.php
old mode 100644
new mode 100755
diff --git a/application/views/lehre/lvplanung/adminZeitverfuegbarkeit.php b/application/views/lehre/lvplanung/adminZeitverfuegbarkeit.php
old mode 100644
new mode 100755
diff --git a/application/views/lehre/lvplanung/adminZeitverfuegbarkeitData.php b/application/views/lehre/lvplanung/adminZeitverfuegbarkeitData.php
old mode 100644
new mode 100755
diff --git a/application/views/lehre/pruefungsprotokoll.php b/application/views/lehre/pruefungsprotokoll.php
old mode 100644
new mode 100755
diff --git a/application/views/lehre/pruefungsprotokollUebersicht.php b/application/views/lehre/pruefungsprotokollUebersicht.php
old mode 100644
new mode 100755
diff --git a/application/views/lehre/pruefungsprotokollUebersichtData.php b/application/views/lehre/pruefungsprotokollUebersichtData.php
old mode 100644
new mode 100755
diff --git a/application/views/organisation/reihungstest/ReihungstestUebersichtData.php b/application/views/organisation/reihungstest/ReihungstestUebersichtData.php
old mode 100644
new mode 100755
diff --git a/application/views/organisation/reihungstest/reihungstest.php b/application/views/organisation/reihungstest/reihungstest.php
old mode 100644
new mode 100755
diff --git a/application/views/organisation/studienjahr.php b/application/views/organisation/studienjahr.php
old mode 100644
new mode 100755
diff --git a/application/views/organisation/studienjahrEdit.php b/application/views/organisation/studienjahrEdit.php
old mode 100644
new mode 100755
diff --git a/application/views/organisation/studienjahrForm.php b/application/views/organisation/studienjahrForm.php
old mode 100644
new mode 100755
diff --git a/application/views/organisation/studienjahrNew.php b/application/views/organisation/studienjahrNew.php
old mode 100644
new mode 100755
diff --git a/application/views/organisation/studiensemester.php b/application/views/organisation/studiensemester.php
old mode 100644
new mode 100755
diff --git a/application/views/organisation/studiensemesterEdit.php b/application/views/organisation/studiensemesterEdit.php
old mode 100644
new mode 100755
diff --git a/application/views/organisation/studiensemesterForm.php b/application/views/organisation/studiensemesterForm.php
old mode 100644
new mode 100755
diff --git a/application/views/organisation/studiensemesterNew.php b/application/views/organisation/studiensemesterNew.php
old mode 100644
new mode 100755
diff --git a/application/views/person/bpk/bpkData.php b/application/views/person/bpk/bpkData.php
old mode 100644
new mode 100755
diff --git a/application/views/person/bpk/bpkDetails.php b/application/views/person/bpk/bpkDetails.php
old mode 100644
new mode 100755
diff --git a/application/views/person/bpk/bpkwartung.php b/application/views/person/bpk/bpkwartung.php
old mode 100644
new mode 100755
diff --git a/application/views/person/cli/view.php b/application/views/person/cli/view.php
old mode 100644
new mode 100755
diff --git a/application/views/person/gradelist/course.php b/application/views/person/gradelist/course.php
old mode 100644
new mode 100755
diff --git a/application/views/person/gradelist/gradelist.php b/application/views/person/gradelist/gradelist.php
old mode 100644
new mode 100755
diff --git a/application/views/person/gradelist/semester.php b/application/views/person/gradelist/semester.php
old mode 100644
new mode 100755
diff --git a/application/views/person/gruppenmanagement/benutzergruppe.php b/application/views/person/gruppenmanagement/benutzergruppe.php
old mode 100644
new mode 100755
diff --git a/application/views/person/gruppenmanagement/gruppenmanagement.php b/application/views/person/gruppenmanagement/gruppenmanagement.php
old mode 100644
new mode 100755
diff --git a/application/views/person/gruppenmanagement/gruppenmanagementData.php b/application/views/person/gruppenmanagement/gruppenmanagementData.php
old mode 100644
new mode 100755
diff --git a/application/views/person/index.php b/application/views/person/index.php
old mode 100644
new mode 100755
diff --git a/application/views/person/view.php b/application/views/person/view.php
old mode 100644
new mode 100755
diff --git a/application/views/system/aufnahme/prestudentMultiAssign.php b/application/views/system/aufnahme/prestudentMultiAssign.php
old mode 100644
new mode 100755
diff --git a/application/views/system/extensions/manager.php b/application/views/system/extensions/manager.php
old mode 100644
new mode 100755
diff --git a/application/views/system/fas_udf.php b/application/views/system/fas_udf.php
old mode 100644
new mode 100755
diff --git a/application/views/system/infocenter/absageModal.php b/application/views/system/infocenter/absageModal.php
old mode 100644
new mode 100755
diff --git a/application/views/system/infocenter/addNotiz.php b/application/views/system/infocenter/addNotiz.php
old mode 100644
new mode 100755
diff --git a/application/views/system/infocenter/anmerkungenZurBewerbung.php b/application/views/system/infocenter/anmerkungenZurBewerbung.php
old mode 100644
new mode 100755
diff --git a/application/views/system/infocenter/dokNachzureichend.php b/application/views/system/infocenter/dokNachzureichend.php
old mode 100644
new mode 100755
diff --git a/application/views/system/infocenter/dokpruefung.php b/application/views/system/infocenter/dokpruefung.php
old mode 100644
new mode 100755
diff --git a/application/views/system/infocenter/infocenter.php b/application/views/system/infocenter/infocenter.php
old mode 100644
new mode 100755
diff --git a/application/views/system/infocenter/infocenterAbgewiesen.php b/application/views/system/infocenter/infocenterAbgewiesen.php
old mode 100644
new mode 100755
diff --git a/application/views/system/infocenter/infocenterAbgewiesenData.php b/application/views/system/infocenter/infocenterAbgewiesenData.php
old mode 100644
new mode 100755
diff --git a/application/views/system/infocenter/infocenterAufgenommen.php b/application/views/system/infocenter/infocenterAufgenommen.php
old mode 100644
new mode 100755
diff --git a/application/views/system/infocenter/infocenterAufgenommenData.php b/application/views/system/infocenter/infocenterAufgenommenData.php
old mode 100644
new mode 100755
diff --git a/application/views/system/infocenter/infocenterData.php b/application/views/system/infocenter/infocenterData.php
old mode 100644
new mode 100755
diff --git a/application/views/system/infocenter/infocenterDetails.php b/application/views/system/infocenter/infocenterDetails.php
old mode 100644
new mode 100755
diff --git a/application/views/system/infocenter/infocenterFreigegeben.php b/application/views/system/infocenter/infocenterFreigegeben.php
old mode 100644
new mode 100755
diff --git a/application/views/system/infocenter/infocenterFreigegebenData.php b/application/views/system/infocenter/infocenterFreigegebenData.php
old mode 100644
new mode 100755
diff --git a/application/views/system/infocenter/infocenterReihungstestAbsolviert.php b/application/views/system/infocenter/infocenterReihungstestAbsolviert.php
old mode 100644
new mode 100755
diff --git a/application/views/system/infocenter/infocenterReihungstestAbsolviertData.php b/application/views/system/infocenter/infocenterReihungstestAbsolviertData.php
old mode 100644
new mode 100755
diff --git a/application/views/system/infocenter/infocenterZgvDetails.php b/application/views/system/infocenter/infocenterZgvDetails.php
old mode 100644
new mode 100755
diff --git a/application/views/system/infocenter/infocenterZgvUeberpruefung.php b/application/views/system/infocenter/infocenterZgvUeberpruefung.php
old mode 100644
new mode 100755
diff --git a/application/views/system/infocenter/infocenterZgvUeberpruefungData.php b/application/views/system/infocenter/infocenterZgvUeberpruefungData.php
old mode 100644
new mode 100755
diff --git a/application/views/system/infocenter/logs.php b/application/views/system/infocenter/logs.php
old mode 100644
new mode 100755
diff --git a/application/views/system/infocenter/messageList.php b/application/views/system/infocenter/messageList.php
old mode 100644
new mode 100755
diff --git a/application/views/system/infocenter/notizen.php b/application/views/system/infocenter/notizen.php
old mode 100644
new mode 100755
diff --git a/application/views/system/infocenter/stammdaten.php b/application/views/system/infocenter/stammdaten.php
old mode 100644
new mode 100755
diff --git a/application/views/system/infocenter/studiengangZgvInfo.php b/application/views/system/infocenter/studiengangZgvInfo.php
old mode 100644
new mode 100755
diff --git a/application/views/system/infocenter/zgvpruefungen.php b/application/views/system/infocenter/zgvpruefungen.php
old mode 100644
new mode 100755
diff --git a/application/views/system/issues/issues.php b/application/views/system/issues/issues.php
old mode 100644
new mode 100755
diff --git a/application/views/system/issues/issuesData.php b/application/views/system/issues/issuesData.php
old mode 100644
new mode 100755
diff --git a/application/views/system/issues/issuesKonfiguration.php b/application/views/system/issues/issuesKonfiguration.php
old mode 100644
new mode 100755
diff --git a/application/views/system/issues/issuesKonfigurationData.php b/application/views/system/issues/issuesKonfigurationData.php
old mode 100644
new mode 100755
diff --git a/application/views/system/issues/issuesZustaendigkeiten.php b/application/views/system/issues/issuesZustaendigkeiten.php
old mode 100644
new mode 100755
diff --git a/application/views/system/issues/issuesZustaendigkeitenData.php b/application/views/system/issues/issuesZustaendigkeitenData.php
old mode 100644
new mode 100755
diff --git a/application/views/system/issues/plausichecks.php b/application/views/system/issues/plausichecks.php
old mode 100644
new mode 100755
diff --git a/application/views/system/jq/jobsQueueViewer.php b/application/views/system/jq/jobsQueueViewer.php
old mode 100644
new mode 100755
diff --git a/application/views/system/jq/jobsQueueViewerData.php b/application/views/system/jq/jobsQueueViewerData.php
old mode 100644
new mode 100755
diff --git a/application/views/system/login/usernamePassword.php b/application/views/system/login/usernamePassword.php
old mode 100644
new mode 100755
diff --git a/application/views/system/logs/logsViewer.php b/application/views/system/logs/logsViewer.php
old mode 100644
new mode 100755
diff --git a/application/views/system/logs/testSearch.php b/application/views/system/logs/testSearch.php
old mode 100644
new mode 100755
diff --git a/application/views/system/messages/FAShtmlWriteTemplate.php b/application/views/system/messages/FAShtmlWriteTemplate.php
old mode 100644
new mode 100755
diff --git a/application/views/system/messages/ajaxRead.php b/application/views/system/messages/ajaxRead.php
old mode 100644
new mode 100755
diff --git a/application/views/system/messages/ajaxWrite.php b/application/views/system/messages/ajaxWrite.php
old mode 100644
new mode 100755
diff --git a/application/views/system/messages/ajaxWriteReply.php b/application/views/system/messages/ajaxWriteReply.php
old mode 100644
new mode 100755
diff --git a/application/views/system/messages/htmlMessageSentError.php b/application/views/system/messages/htmlMessageSentError.php
old mode 100644
new mode 100755
diff --git a/application/views/system/messages/htmlMessageSentSuccess.php b/application/views/system/messages/htmlMessageSentSuccess.php
old mode 100644
new mode 100755
diff --git a/application/views/system/messages/htmlRead.php b/application/views/system/messages/htmlRead.php
old mode 100644
new mode 100755
diff --git a/application/views/system/messages/htmlWriteReply.php b/application/views/system/messages/htmlWriteReply.php
old mode 100644
new mode 100755
diff --git a/application/views/system/messages/htmlWriteTemplate.php b/application/views/system/messages/htmlWriteTemplate.php
old mode 100644
new mode 100755
diff --git a/application/views/system/phrases/phraseinhaltEdit.php b/application/views/system/phrases/phraseinhaltEdit.php
old mode 100644
new mode 100755
diff --git a/application/views/system/phrases/phrases.php b/application/views/system/phrases/phrases.php
old mode 100644
new mode 100755
diff --git a/application/views/system/phrases/phrasesEdit.php b/application/views/system/phrases/phrasesEdit.php
old mode 100644
new mode 100755
diff --git a/application/views/system/phrases/phrasesList.php b/application/views/system/phrases/phrasesList.php
old mode 100644
new mode 100755
diff --git a/application/views/system/phrases/phrasesinhaltList.php b/application/views/system/phrases/phrasesinhaltList.php
old mode 100644
new mode 100755
diff --git a/application/views/system/vorlage/templateLinkDocuments.php b/application/views/system/vorlage/templateLinkDocuments.php
old mode 100644
new mode 100755
diff --git a/application/views/system/vorlage/templates.php b/application/views/system/vorlage/templates.php
old mode 100644
new mode 100755
diff --git a/application/views/system/vorlage/templatesEdit.php b/application/views/system/vorlage/templatesEdit.php
old mode 100644
new mode 100755
diff --git a/application/views/system/vorlage/templatesList.php b/application/views/system/vorlage/templatesList.php
old mode 100644
new mode 100755
diff --git a/application/views/system/vorlage/templatetextEdit.php b/application/views/system/vorlage/templatetextEdit.php
old mode 100644
new mode 100755
diff --git a/application/views/system/vorlage/templatetextList.php b/application/views/system/vorlage/templatetextList.php
old mode 100644
new mode 100755
diff --git a/application/views/system/vorlage/templatetextPreview.php b/application/views/system/vorlage/templatetextPreview.php
old mode 100644
new mode 100755
diff --git a/application/views/templates/CISHMVC-Footer.php b/application/views/templates/CISHMVC-Footer.php
old mode 100644
new mode 100755
diff --git a/application/views/templates/CISHMVC-Header.php b/application/views/templates/CISHMVC-Header.php
old mode 100644
new mode 100755
diff --git a/application/views/templates/CISHMVC-Menu/Entry.php b/application/views/templates/CISHMVC-Menu/Entry.php
old mode 100644
new mode 100755
diff --git a/application/views/templates/CISHTML-Footer.php b/application/views/templates/CISHTML-Footer.php
old mode 100644
new mode 100755
diff --git a/application/views/templates/CISHTML-Header.php b/application/views/templates/CISHTML-Header.php
old mode 100644
new mode 100755
diff --git a/application/views/templates/CISHTML-Menu/Entry.php b/application/views/templates/CISHTML-Menu/Entry.php
old mode 100644
new mode 100755
diff --git a/application/views/templates/CISHTML-Menu/EntryBase.php b/application/views/templates/CISHTML-Menu/EntryBase.php
old mode 100644
new mode 100755
diff --git a/application/views/templates/CISHTML-Menu/EntryInclude.php b/application/views/templates/CISHTML-Menu/EntryInclude.php
old mode 100644
new mode 100755
diff --git a/application/views/templates/CISVUE-Footer.php b/application/views/templates/CISVUE-Footer.php
old mode 100644
new mode 100755
diff --git a/application/views/templates/CISVUE-Header.php b/application/views/templates/CISVUE-Header.php
old mode 100644
new mode 100755
diff --git a/application/views/templates/FHC-Common.php b/application/views/templates/FHC-Common.php
old mode 100644
new mode 100755
diff --git a/application/views/templates/FHC-Footer.php b/application/views/templates/FHC-Footer.php
old mode 100644
new mode 100755
diff --git a/application/views/templates/FHC-Header.php b/application/views/templates/FHC-Header.php
old mode 100644
new mode 100755
diff --git a/application/views/templates/footer.php b/application/views/templates/footer.php
old mode 100644
new mode 100755
diff --git a/application/views/templates/header.php b/application/views/templates/header.php
old mode 100644
new mode 100755
diff --git a/application/views/templates/mailHTML.php b/application/views/templates/mailHTML.php
old mode 100644
new mode 100755
diff --git a/application/views/templates/mailTXT.php b/application/views/templates/mailTXT.php
old mode 100644
new mode 100755
diff --git a/application/views/templates/mailtemplates/interessentFreigabe.php b/application/views/templates/mailtemplates/interessentFreigabe.php
old mode 100644
new mode 100755
diff --git a/application/views/templates/vilesci.php b/application/views/templates/vilesci.php
old mode 100644
new mode 100755
diff --git a/application/views/test/Admin.php b/application/views/test/Admin.php
old mode 100644
new mode 100755
diff --git a/application/views/test/Test.php b/application/views/test/Test.php
old mode 100644
new mode 100755
diff --git a/application/views/widgets/checkbox.php b/application/views/widgets/checkbox.php
old mode 100644
new mode 100755
diff --git a/application/views/widgets/dropdown.php b/application/views/widgets/dropdown.php
old mode 100644
new mode 100755
diff --git a/application/views/widgets/filter/filter.php b/application/views/widgets/filter/filter.php
old mode 100644
new mode 100755
diff --git a/application/views/widgets/filter/filterOptions.php b/application/views/widgets/filter/filterOptions.php
old mode 100644
new mode 100755
diff --git a/application/views/widgets/filter/pivotUIDataset.php b/application/views/widgets/filter/pivotUIDataset.php
old mode 100644
new mode 100755
diff --git a/application/views/widgets/filter/saveFilter.php b/application/views/widgets/filter/saveFilter.php
old mode 100644
new mode 100755
diff --git a/application/views/widgets/filter/selectFields.php b/application/views/widgets/filter/selectFields.php
old mode 100644
new mode 100755
diff --git a/application/views/widgets/filter/selectFilters.php b/application/views/widgets/filter/selectFilters.php
old mode 100644
new mode 100755
diff --git a/application/views/widgets/filter/tableDataset.php b/application/views/widgets/filter/tableDataset.php
old mode 100644
new mode 100755
diff --git a/application/views/widgets/filter/tabulatorDataset.php b/application/views/widgets/filter/tabulatorDataset.php
old mode 100644
new mode 100755
diff --git a/application/views/widgets/jsoneditor.php b/application/views/widgets/jsoneditor.php
old mode 100644
new mode 100755
diff --git a/application/views/widgets/jsonforms.php b/application/views/widgets/jsonforms.php
old mode 100644
new mode 100755
diff --git a/application/views/widgets/mimetype.php b/application/views/widgets/mimetype.php
old mode 100644
new mode 100755
diff --git a/application/views/widgets/navigation.php b/application/views/widgets/navigation.php
old mode 100644
new mode 100755
diff --git a/application/views/widgets/navigationHeader.php b/application/views/widgets/navigationHeader.php
old mode 100644
new mode 100755
diff --git a/application/views/widgets/navigationMenu.php b/application/views/widgets/navigationMenu.php
old mode 100644
new mode 100755
diff --git a/application/views/widgets/phpjsonform.php b/application/views/widgets/phpjsonform.php
old mode 100644
new mode 100755
diff --git a/application/views/widgets/table/pivotUIDataset.php b/application/views/widgets/table/pivotUIDataset.php
old mode 100644
new mode 100755
diff --git a/application/views/widgets/table/table.php b/application/views/widgets/table/table.php
old mode 100644
new mode 100755
diff --git a/application/views/widgets/table/tableDataset.php b/application/views/widgets/table/tableDataset.php
old mode 100644
new mode 100755
diff --git a/application/views/widgets/table/tableHelpsite.php b/application/views/widgets/table/tableHelpsite.php
old mode 100644
new mode 100755
diff --git a/application/views/widgets/table/tabulatorDataset.php b/application/views/widgets/table/tabulatorDataset.php
old mode 100644
new mode 100755
diff --git a/application/views/widgets/textarea.php b/application/views/widgets/textarea.php
old mode 100644
new mode 100755
diff --git a/application/views/widgets/textfield.php b/application/views/widgets/textfield.php
old mode 100644
new mode 100755
diff --git a/application/views/widgets/tinymce.php b/application/views/widgets/tinymce.php
old mode 100644
new mode 100755
diff --git a/application/widgets/Aufnahmegruppe_widget.php b/application/widgets/Aufnahmegruppe_widget.php
old mode 100644
new mode 100755
diff --git a/application/widgets/Ausbildungssemester_widget.php b/application/widgets/Ausbildungssemester_widget.php
old mode 100644
new mode 100755
diff --git a/application/widgets/Dropdown_widget.php b/application/widgets/Dropdown_widget.php
old mode 100644
new mode 100755
diff --git a/application/widgets/FilterWidget.php b/application/widgets/FilterWidget.php
old mode 100644
new mode 100755
diff --git a/application/widgets/MultipleDropdown_widget.php b/application/widgets/MultipleDropdown_widget.php
old mode 100644
new mode 100755
diff --git a/application/widgets/Nation_widget.php b/application/widgets/Nation_widget.php
old mode 100644
new mode 100755
diff --git a/application/widgets/NavigationHeaderWidget.php b/application/widgets/NavigationHeaderWidget.php
old mode 100644
new mode 100755
diff --git a/application/widgets/NavigationMenuWidget.php b/application/widgets/NavigationMenuWidget.php
old mode 100644
new mode 100755
diff --git a/application/widgets/NavigationWidget.php b/application/widgets/NavigationWidget.php
old mode 100644
new mode 100755
diff --git a/application/widgets/Organisationseinheit_widget.php b/application/widgets/Organisationseinheit_widget.php
old mode 100644
new mode 100755
diff --git a/application/widgets/Orgform_widget.php b/application/widgets/Orgform_widget.php
old mode 100644
new mode 100755
diff --git a/application/widgets/Reihungstest_widget.php b/application/widgets/Reihungstest_widget.php
old mode 100644
new mode 100755
diff --git a/application/widgets/Sprache_widget.php b/application/widgets/Sprache_widget.php
old mode 100644
new mode 100755
diff --git a/application/widgets/Statusgrund_widget.php b/application/widgets/Statusgrund_widget.php
old mode 100644
new mode 100755
diff --git a/application/widgets/Studiengang_widget.php b/application/widgets/Studiengang_widget.php
old mode 100644
new mode 100755
diff --git a/application/widgets/Studiensemester_widget.php b/application/widgets/Studiensemester_widget.php
old mode 100644
new mode 100755
diff --git a/application/widgets/Stufe_widget.php b/application/widgets/Stufe_widget.php
old mode 100644
new mode 100755
diff --git a/application/widgets/TableWidget.php b/application/widgets/TableWidget.php
old mode 100644
new mode 100755
diff --git a/application/widgets/Vorlage_widget.php b/application/widgets/Vorlage_widget.php
old mode 100644
new mode 100755
diff --git a/application/widgets/Zgv_widget.php b/application/widgets/Zgv_widget.php
old mode 100644
new mode 100755
diff --git a/application/widgets/Zgvmaster_widget.php b/application/widgets/Zgvmaster_widget.php
old mode 100644
new mode 100755
diff --git a/application/widgets/extensions/.placeholder b/application/widgets/extensions/.placeholder
old mode 100644
new mode 100755
diff --git a/application/widgets/html/CheckboxWidget.php b/application/widgets/html/CheckboxWidget.php
old mode 100644
new mode 100755
diff --git a/application/widgets/html/DropdownWidget.php b/application/widgets/html/DropdownWidget.php
old mode 100644
new mode 100755
diff --git a/application/widgets/html/HTMLWidget.php b/application/widgets/html/HTMLWidget.php
old mode 100644
new mode 100755
diff --git a/application/widgets/html/TextareaWidget.php b/application/widgets/html/TextareaWidget.php
old mode 100644
new mode 100755
diff --git a/application/widgets/html/TextfieldWidget.php b/application/widgets/html/TextfieldWidget.php
old mode 100644
new mode 100755
diff --git a/application/widgets/jsoneditor_widget.php b/application/widgets/jsoneditor_widget.php
old mode 100644
new mode 100755
diff --git a/application/widgets/jsonforms_widget.php b/application/widgets/jsonforms_widget.php
old mode 100644
new mode 100755
diff --git a/application/widgets/mimetype_widget.php b/application/widgets/mimetype_widget.php
old mode 100644
new mode 100755
diff --git a/application/widgets/phpjsonform_widget.php b/application/widgets/phpjsonform_widget.php
old mode 100644
new mode 100755
diff --git a/application/widgets/tinymce_widget.php b/application/widgets/tinymce_widget.php
old mode 100644
new mode 100755
diff --git a/application/widgets/udf/CheckboxWidgetUDF.php b/application/widgets/udf/CheckboxWidgetUDF.php
old mode 100644
new mode 100755
diff --git a/application/widgets/udf/DropdownWidgetUDF.php b/application/widgets/udf/DropdownWidgetUDF.php
old mode 100644
new mode 100755
diff --git a/application/widgets/udf/TextareaWidgetUDF.php b/application/widgets/udf/TextareaWidgetUDF.php
old mode 100644
new mode 100755
diff --git a/application/widgets/udf/TextfieldWidgetUDF.php b/application/widgets/udf/TextfieldWidgetUDF.php
old mode 100644
new mode 100755
diff --git a/application/widgets/udf/UDFWidget.php b/application/widgets/udf/UDFWidget.php
old mode 100644
new mode 100755
diff --git a/cis.php b/cis.php
old mode 100644
new mode 100755
diff --git a/cis/ampel.php b/cis/ampel.php
old mode 100644
new mode 100755
diff --git a/cis/cisdocs/index.html b/cis/cisdocs/index.html
old mode 100644
new mode 100755
diff --git a/cis/cisdocs/muster_semesterplan.doc b/cis/cisdocs/muster_semesterplan.doc
old mode 100644
new mode 100755
diff --git a/cis/cisdocs/muster_semesterplan_index.html b/cis/cisdocs/muster_semesterplan_index.html
old mode 100644
new mode 100755
diff --git a/cis/cisdocs/vorlage_studienbrief.dot b/cis/cisdocs/vorlage_studienbrief.dot
old mode 100644
new mode 100755
diff --git a/cis/index.html b/cis/index.html
old mode 100644
new mode 100755
diff --git a/cis/index.php b/cis/index.php
old mode 100644
new mode 100755
diff --git a/cis/index_login.php b/cis/index_login.php
old mode 100644
new mode 100755
diff --git a/cis/infoterminal/feed.png b/cis/infoterminal/feed.png
old mode 100644
new mode 100755
diff --git a/cis/infoterminal/go-bottom.png b/cis/infoterminal/go-bottom.png
old mode 100644
new mode 100755
diff --git a/cis/infoterminal/go-top.png b/cis/infoterminal/go-top.png
old mode 100644
new mode 100755
diff --git a/cis/infoterminal/index.php b/cis/infoterminal/index.php
old mode 100644
new mode 100755
diff --git a/cis/infoterminal/informationsbildschirm.php b/cis/infoterminal/informationsbildschirm.php
old mode 100644
new mode 100755
diff --git a/cis/infoterminal/infoterm.css b/cis/infoterminal/infoterm.css
old mode 100644
new mode 100755
diff --git a/cis/infoterminal/keyboard.php b/cis/infoterminal/keyboard.php
old mode 100644
new mode 100755
diff --git a/cis/infoterminal/lvplan.php b/cis/infoterminal/lvplan.php
old mode 100644
new mode 100755
diff --git a/cis/infoterminal/system-users_in.png b/cis/infoterminal/system-users_in.png
old mode 100644
new mode 100755
diff --git a/cis/infoterminal/system-users_out.png b/cis/infoterminal/system-users_out.png
old mode 100644
new mode 100755
diff --git a/cis/infoterminal/tw_lageplan.jpg b/cis/infoterminal/tw_lageplan.jpg
old mode 100644
new mode 100755
diff --git a/cis/infoterminal/tw_logo_01.jpg b/cis/infoterminal/tw_logo_01.jpg
old mode 100644
new mode 100755
diff --git a/cis/infoterminal/twplan.gif b/cis/infoterminal/twplan.gif
old mode 100644
new mode 100755
diff --git a/cis/menu.php b/cis/menu.php
old mode 100644
new mode 100755
diff --git a/cis/private/bildupload.php b/cis/private/bildupload.php
old mode 100644
new mode 100755
diff --git a/cis/private/coodle/coodle_autocomplete.php b/cis/private/coodle/coodle_autocomplete.php
old mode 100644
new mode 100755
diff --git a/cis/private/coodle/coodle_events.php b/cis/private/coodle/coodle_events.php
old mode 100644
new mode 100755
diff --git a/cis/private/coodle/coodle_worker.php b/cis/private/coodle/coodle_worker.php
old mode 100644
new mode 100755
diff --git a/cis/private/coodle/index.html b/cis/private/coodle/index.html
old mode 100644
new mode 100755
diff --git a/cis/private/coodle/stammdaten.php b/cis/private/coodle/stammdaten.php
old mode 100644
new mode 100755
diff --git a/cis/private/coodle/termin.php b/cis/private/coodle/termin.php
old mode 100644
new mode 100755
diff --git a/cis/private/coodle/uebersicht.php b/cis/private/coodle/uebersicht.php
old mode 100644
new mode 100755
diff --git a/cis/private/crop.php b/cis/private/crop.php
old mode 100644
new mode 100755
diff --git a/cis/private/freifaecher/anmeldung.php b/cis/private/freifaecher/anmeldung.php
old mode 100644
new mode 100755
diff --git a/cis/private/freifaecher/anmeldungsuebersicht.php b/cis/private/freifaecher/anmeldungsuebersicht.php
old mode 100644
new mode 100755
diff --git a/cis/private/freifaecher/index.html b/cis/private/freifaecher/index.html
old mode 100644
new mode 100755
diff --git a/cis/private/index.html b/cis/private/index.html
old mode 100644
new mode 100755
diff --git a/cis/private/info/ersthelfer.php b/cis/private/info/ersthelfer.php
old mode 100644
new mode 100755
diff --git a/cis/private/info/handbuecher/Projektarbeitsabgabe_FHTW_Anleitung_A.pdf b/cis/private/info/handbuecher/Projektarbeitsabgabe_FHTW_Anleitung_A.pdf
old mode 100644
new mode 100755
diff --git a/cis/private/info/handbuecher/Projektarbeitsabgabe_FHTW_Anleitung_L.pdf b/cis/private/info/handbuecher/Projektarbeitsabgabe_FHTW_Anleitung_L.pdf
old mode 100644
new mode 100755
diff --git a/cis/private/info/handbuecher/Publikationsdatenbank_FHTW_Handbuch.pdf b/cis/private/info/handbuecher/Publikationsdatenbank_FHTW_Handbuch.pdf
old mode 100644
new mode 100755
diff --git a/cis/private/info/handbuecher/abgabetool_lektoren.pdf b/cis/private/info/handbuecher/abgabetool_lektoren.pdf
old mode 100644
new mode 100755
diff --git a/cis/private/info/handbuecher/abgabetool_studenten.pdf b/cis/private/info/handbuecher/abgabetool_studenten.pdf
old mode 100644
new mode 100755
diff --git a/cis/private/info/handbuecher/index.php b/cis/private/info/handbuecher/index.php
old mode 100644
new mode 100755
diff --git a/cis/private/info/index.html b/cis/private/info/index.html
old mode 100644
new mode 100755
diff --git a/cis/private/info/partnerhochschulen.php b/cis/private/info/partnerhochschulen.php
old mode 100644
new mode 100755
diff --git a/cis/private/info/service_uebersicht.php b/cis/private/info/service_uebersicht.php
old mode 100644
new mode 100755
diff --git a/cis/private/info/telefonverzeichnis.php b/cis/private/info/telefonverzeichnis.php
old mode 100644
new mode 100755
diff --git a/cis/private/jahresplan/index.html b/cis/private/jahresplan/index.html
old mode 100644
new mode 100755
diff --git a/cis/private/jahresplan/index.php b/cis/private/jahresplan/index.php
old mode 100644
new mode 100755
diff --git a/cis/private/jahresplan/jahresplan_bilder.php b/cis/private/jahresplan/jahresplan_bilder.php
old mode 100644
new mode 100755
diff --git a/cis/private/jahresplan/jahresplan_detail.php b/cis/private/jahresplan/jahresplan_detail.php
old mode 100644
new mode 100755
diff --git a/cis/private/jahresplan/jahresplan_funktionen.inc.php b/cis/private/jahresplan/jahresplan_funktionen.inc.php
old mode 100644
new mode 100755
diff --git a/cis/private/jahresplan/jahresplan_kategorie.php b/cis/private/jahresplan/jahresplan_kategorie.php
old mode 100644
new mode 100755
diff --git a/cis/private/jahresplan/jahresplan_reservierung.php b/cis/private/jahresplan/jahresplan_reservierung.php
old mode 100644
new mode 100755
diff --git a/cis/private/jahresplan/jahresplan_veranstaltung.php b/cis/private/jahresplan/jahresplan_veranstaltung.php
old mode 100644
new mode 100755
diff --git a/cis/private/lehre/abgabe_lektor.php b/cis/private/lehre/abgabe_lektor.php
old mode 100644
new mode 100755
diff --git a/cis/private/lehre/abgabe_lektor_details.php b/cis/private/lehre/abgabe_lektor_details.php
old mode 100644
new mode 100755
diff --git a/cis/private/lehre/abgabe_lektor_frameset.html b/cis/private/lehre/abgabe_lektor_frameset.html
old mode 100644
new mode 100755
diff --git a/cis/private/lehre/abgabe_lektor_multitermin.php b/cis/private/lehre/abgabe_lektor_multitermin.php
old mode 100644
new mode 100755
diff --git a/cis/private/lehre/abgabe_lektor_terminuebersicht.php b/cis/private/lehre/abgabe_lektor_terminuebersicht.php
old mode 100644
new mode 100755
diff --git a/cis/private/lehre/abgabe_lektor_zusatz.php b/cis/private/lehre/abgabe_lektor_zusatz.php
old mode 100644
new mode 100755
diff --git a/cis/private/lehre/abgabe_student.php b/cis/private/lehre/abgabe_student.php
old mode 100644
new mode 100755
diff --git a/cis/private/lehre/abgabe_student_details.php b/cis/private/lehre/abgabe_student_details.php
old mode 100644
new mode 100755
diff --git a/cis/private/lehre/abgabe_student_file.php b/cis/private/lehre/abgabe_student_file.php
old mode 100644
new mode 100755
diff --git a/cis/private/lehre/abgabe_student_frameset.php b/cis/private/lehre/abgabe_student_frameset.php
old mode 100644
new mode 100755
diff --git a/cis/private/lehre/abmeldung.php b/cis/private/lehre/abmeldung.php
old mode 100644
new mode 100755
diff --git a/cis/private/lehre/anwesenheitsliste.pdf.php b/cis/private/lehre/anwesenheitsliste.pdf.php
old mode 100644
new mode 100755
diff --git a/cis/private/lehre/anwesenheitsliste.php b/cis/private/lehre/anwesenheitsliste.php
old mode 100644
new mode 100755
diff --git a/cis/private/lehre/benotungstool/lvgesamtnote_worker.php b/cis/private/lehre/benotungstool/lvgesamtnote_worker.php
old mode 100644
new mode 100755
diff --git a/cis/private/lehre/benotungstool/lvgesamtnoteeintragen.php b/cis/private/lehre/benotungstool/lvgesamtnoteeintragen.php
old mode 100644
new mode 100755
diff --git a/cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php b/cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php
old mode 100644
new mode 100755
diff --git a/cis/private/lehre/benotungstool/nachpruefungeintragen.php b/cis/private/lehre/benotungstool/nachpruefungeintragen.php
old mode 100644
new mode 100755
diff --git a/cis/private/lehre/benotungstool/notenschluessel.php b/cis/private/lehre/benotungstool/notenschluessel.php
old mode 100644
new mode 100755
diff --git a/cis/private/lehre/covidstatusliste.php b/cis/private/lehre/covidstatusliste.php
old mode 100644
new mode 100755
diff --git a/cis/private/lehre/feedback.php b/cis/private/lehre/feedback.php
old mode 100644
new mode 100755
diff --git a/cis/private/lehre/fotoliste.pdf.php b/cis/private/lehre/fotoliste.pdf.php
old mode 100644
new mode 100755
diff --git a/cis/private/lehre/index.html b/cis/private/lehre/index.html
old mode 100644
new mode 100755
diff --git a/cis/private/lehre/lector_choice.php b/cis/private/lehre/lector_choice.php
old mode 100644
new mode 100755
diff --git a/cis/private/lehre/lesson.php b/cis/private/lehre/lesson.php
old mode 100644
new mode 100755
diff --git a/cis/private/lehre/notenliste.php b/cis/private/lehre/notenliste.php
old mode 100644
new mode 100755
diff --git a/cis/private/lehre/notenliste.xls.php b/cis/private/lehre/notenliste.xls.php
old mode 100644
new mode 100755
diff --git a/cis/private/lehre/pruefung/index.php b/cis/private/lehre/pruefung/index.php
old mode 100644
new mode 100755
diff --git a/cis/private/lehre/pruefung/lektor_autocomplete.php b/cis/private/lehre/pruefung/lektor_autocomplete.php
old mode 100644
new mode 100755
diff --git a/cis/private/lehre/pruefung/pruefung.js.php b/cis/private/lehre/pruefung/pruefung.js.php
old mode 100644
new mode 100755
diff --git a/cis/private/lehre/pruefung/pruefungsanmeldung.json.php b/cis/private/lehre/pruefung/pruefungsanmeldung.json.php
old mode 100644
new mode 100755
diff --git a/cis/private/lehre/pruefung/pruefungsanmeldung.php b/cis/private/lehre/pruefung/pruefungsanmeldung.php
old mode 100644
new mode 100755
diff --git a/cis/private/lehre/pruefung/pruefungsanmeldungen_liste.pdf.php b/cis/private/lehre/pruefung/pruefungsanmeldungen_liste.pdf.php
old mode 100644
new mode 100755
diff --git a/cis/private/lehre/pruefung/pruefungsanmeldungen_liste.php b/cis/private/lehre/pruefung/pruefungsanmeldungen_liste.php
old mode 100644
new mode 100755
diff --git a/cis/private/lehre/pruefung/pruefungsanmeldungen_liste_ohne_namen.php b/cis/private/lehre/pruefung/pruefungsanmeldungen_liste_ohne_namen.php
old mode 100644
new mode 100755
diff --git a/cis/private/lehre/pruefung/pruefungsanmeldungen_verwalten.php b/cis/private/lehre/pruefung/pruefungsanmeldungen_verwalten.php
old mode 100644
new mode 100755
diff --git a/cis/private/lehre/pruefung/pruefungsbewertung.js.php b/cis/private/lehre/pruefung/pruefungsbewertung.js.php
old mode 100644
new mode 100755
diff --git a/cis/private/lehre/pruefung/pruefungsbewertung.json.php b/cis/private/lehre/pruefung/pruefungsbewertung.json.php
old mode 100644
new mode 100755
diff --git a/cis/private/lehre/pruefung/pruefungsbewertung.php b/cis/private/lehre/pruefung/pruefungsbewertung.php
old mode 100644
new mode 100755
diff --git a/cis/private/lehre/pruefung/pruefungsfenster_anlegen.php b/cis/private/lehre/pruefung/pruefungsfenster_anlegen.php
old mode 100644
new mode 100755
diff --git a/cis/private/lehre/pruefung/pruefungstermin.json.php b/cis/private/lehre/pruefung/pruefungstermin.json.php
old mode 100644
new mode 100755
diff --git a/cis/private/lehre/pruefung/pruefungstermin_aendern.php b/cis/private/lehre/pruefung/pruefungstermin_aendern.php
old mode 100644
new mode 100755
diff --git a/cis/private/lehre/pruefung/pruefungstermin_festlegen.php b/cis/private/lehre/pruefung/pruefungstermin_festlegen.php
old mode 100644
new mode 100755
diff --git a/cis/private/lehre/pruefung/pruefungstermin_loeschen.php b/cis/private/lehre/pruefung/pruefungstermin_loeschen.php
old mode 100644
new mode 100755
diff --git a/cis/private/lehre/semdownhlp.php b/cis/private/lehre/semdownhlp.php
old mode 100644
new mode 100755
diff --git a/cis/private/lehre/semupload.php b/cis/private/lehre/semupload.php
old mode 100644
new mode 100755
diff --git a/cis/private/lehre/softgrid.php b/cis/private/lehre/softgrid.php
old mode 100644
new mode 100755
diff --git a/cis/private/lehre/upload.php b/cis/private/lehre/upload.php
old mode 100644
new mode 100755
diff --git a/cis/private/lvplan/belegt.php b/cis/private/lvplan/belegt.php
old mode 100644
new mode 100755
diff --git a/cis/private/lvplan/index.html b/cis/private/lvplan/index.html
old mode 100644
new mode 100755
diff --git a/cis/private/lvplan/index.php b/cis/private/lvplan/index.php
old mode 100644
new mode 100755
diff --git a/cis/private/lvplan/index_out.html b/cis/private/lvplan/index_out.html
old mode 100644
new mode 100755
diff --git a/cis/private/lvplan/lvplan_autocomplete.php b/cis/private/lvplan/lvplan_autocomplete.php
old mode 100644
new mode 100755
diff --git a/cis/private/lvplan/raumsuche.php b/cis/private/lvplan/raumsuche.php
old mode 100644
new mode 100755
diff --git a/cis/private/lvplan/stpl_detail.php b/cis/private/lvplan/stpl_detail.php
old mode 100644
new mode 100755
diff --git a/cis/private/lvplan/stpl_kalender.php b/cis/private/lvplan/stpl_kalender.php
old mode 100644
new mode 100755
diff --git a/cis/private/lvplan/stpl_reserve_list.php b/cis/private/lvplan/stpl_reserve_list.php
old mode 100644
new mode 100755
diff --git a/cis/private/lvplan/stpl_week.php b/cis/private/lvplan/stpl_week.php
old mode 100644
new mode 100755
diff --git a/cis/private/lvplan/stpl_week_anzahl_studenten.php b/cis/private/lvplan/stpl_week_anzahl_studenten.php
old mode 100644
new mode 100755
diff --git a/cis/private/lvplan/verband_uebersicht.php b/cis/private/lvplan/verband_uebersicht.php
old mode 100644
new mode 100755
diff --git a/cis/private/mailverteiler.php b/cis/private/mailverteiler.php
old mode 100644
new mode 100755
diff --git a/cis/private/open_grp.php b/cis/private/open_grp.php
old mode 100644
new mode 100755
diff --git a/cis/private/outgoing/akte.php b/cis/private/outgoing/akte.php
old mode 100644
new mode 100755
diff --git a/cis/private/outgoing/akteupload.php b/cis/private/outgoing/akteupload.php
old mode 100644
new mode 100755
diff --git a/cis/private/outgoing/index.html b/cis/private/outgoing/index.html
old mode 100644
new mode 100755
diff --git a/cis/private/outgoing/outgoing.php b/cis/private/outgoing/outgoing.php
old mode 100644
new mode 100755
diff --git a/cis/private/outgoing/outgoing_autocomplete.php b/cis/private/outgoing/outgoing_autocomplete.php
old mode 100644
new mode 100755
diff --git a/cis/private/outgoing/registration.php b/cis/private/outgoing/registration.php
old mode 100644
new mode 100755
diff --git a/cis/private/pdfExport.php b/cis/private/pdfExport.php
old mode 100644
new mode 100755
diff --git a/cis/private/pers_in_grp.php b/cis/private/pers_in_grp.php
old mode 100644
new mode 100755
diff --git a/cis/private/profile/anwesenheit.php b/cis/private/profile/anwesenheit.php
old mode 100644
new mode 100755
diff --git a/cis/private/profile/anwesenheit_lektor.php b/cis/private/profile/anwesenheit_lektor.php
old mode 100644
new mode 100755
diff --git a/cis/private/profile/change_password.php b/cis/private/profile/change_password.php
old mode 100644
new mode 100755
diff --git a/cis/private/profile/dokumente.php b/cis/private/profile/dokumente.php
old mode 100644
new mode 100755
diff --git a/cis/private/profile/freebusy.php b/cis/private/profile/freebusy.php
old mode 100644
new mode 100755
diff --git a/cis/private/profile/index.html b/cis/private/profile/index.html
old mode 100644
new mode 100755
diff --git a/cis/private/profile/index.php b/cis/private/profile/index.php
old mode 100644
new mode 100755
diff --git a/cis/private/profile/lva_liste.php b/cis/private/profile/lva_liste.php
old mode 100644
new mode 100755
diff --git a/cis/private/profile/mitarbeiter_buchung.php b/cis/private/profile/mitarbeiter_buchung.php
old mode 100644
new mode 100755
diff --git a/cis/private/profile/studienplan.php b/cis/private/profile/studienplan.php
old mode 100644
new mode 100755
diff --git a/cis/private/profile/urlaubsfreigabe.php b/cis/private/profile/urlaubsfreigabe.php
old mode 100644
new mode 100755
diff --git a/cis/private/profile/urlaubstool.php b/cis/private/profile/urlaubstool.php
old mode 100644
new mode 100755
diff --git a/cis/private/profile/urlaubstool_autocomplete.php b/cis/private/profile/urlaubstool_autocomplete.php
old mode 100644
new mode 100755
diff --git a/cis/private/profile/zahlungen.php b/cis/private/profile/zahlungen.php
old mode 100644
new mode 100755
diff --git a/cis/private/profile/zahlungen_details.php b/cis/private/profile/zahlungen_details.php
old mode 100644
new mode 100755
diff --git a/cis/private/profile/zeitsperre.php b/cis/private/profile/zeitsperre.php
old mode 100644
new mode 100755
diff --git a/cis/private/profile/zeitsperre_days.php b/cis/private/profile/zeitsperre_days.php
old mode 100644
new mode 100755
diff --git a/cis/private/profile/zeitsperre_export.php b/cis/private/profile/zeitsperre_export.php
old mode 100644
new mode 100755
diff --git a/cis/private/profile/zeitsperre_resturlaub.php b/cis/private/profile/zeitsperre_resturlaub.php
old mode 100644
new mode 100755
diff --git a/cis/private/profile/zeitwunsch.php b/cis/private/profile/zeitwunsch.php
old mode 100644
new mode 100755
diff --git a/cis/private/profile/zeitwunsch_help.php b/cis/private/profile/zeitwunsch_help.php
old mode 100644
new mode 100755
diff --git a/cis/private/stud_in_grp.php b/cis/private/stud_in_grp.php
old mode 100644
new mode 100755
diff --git a/cis/private/tools/ampelleiteruebersicht.php b/cis/private/tools/ampelleiteruebersicht.php
old mode 100644
new mode 100755
diff --git a/cis/private/tools/ampelverwaltung.php b/cis/private/tools/ampelverwaltung.php
old mode 100644
new mode 100755
diff --git a/cis/private/tools/index.html b/cis/private/tools/index.html
old mode 100644
new mode 100755
diff --git a/cis/private/tools/notebook_registration.php b/cis/private/tools/notebook_registration.php
old mode 100644
new mode 100755
diff --git a/cis/private/tools/projektabgabe.php b/cis/private/tools/projektabgabe.php
old mode 100644
new mode 100755
diff --git a/cis/private/tools/projektabgabe_autocomplete.php b/cis/private/tools/projektabgabe_autocomplete.php
old mode 100644
new mode 100755
diff --git a/cis/private/tools/suche.php b/cis/private/tools/suche.php
old mode 100644
new mode 100755
diff --git a/cis/private/tools/zeitaufzeichnung.php b/cis/private/tools/zeitaufzeichnung.php
old mode 100644
new mode 100755
diff --git a/cis/private/tools/zeitaufzeichnung_autocomplete.php b/cis/private/tools/zeitaufzeichnung_autocomplete.php
old mode 100644
new mode 100755
diff --git a/cis/private/tools/zeitaufzeichnung_bisverwendung.php b/cis/private/tools/zeitaufzeichnung_bisverwendung.php
old mode 100644
new mode 100755
diff --git a/cis/private/tools/zeitaufzeichnung_projektliste.php b/cis/private/tools/zeitaufzeichnung_projektliste.php
old mode 100644
new mode 100755
diff --git a/cis/private/tools/zeitaufzeichnung_projektphasen.php b/cis/private/tools/zeitaufzeichnung_projektphasen.php
old mode 100644
new mode 100755
diff --git a/cis/private/tools/zeitaufzeichnung_zeitsperren.php b/cis/private/tools/zeitaufzeichnung_zeitsperren.php
old mode 100644
new mode 100755
diff --git a/cis/public/accountactivation.php b/cis/public/accountactivation.php
old mode 100644
new mode 100755
diff --git a/cis/public/bild.php b/cis/public/bild.php
old mode 100644
new mode 100755
diff --git a/cis/public/bildupload.php b/cis/public/bildupload.php
old mode 100644
new mode 100755
diff --git a/cis/public/coodle.php b/cis/public/coodle.php
old mode 100644
new mode 100755
diff --git a/cis/public/freebusy.php b/cis/public/freebusy.php
old mode 100644
new mode 100755
diff --git a/cis/public/freebusy_coodle.php b/cis/public/freebusy_coodle.php
old mode 100644
new mode 100755
diff --git a/cis/public/freebusy_lvplan.php b/cis/public/freebusy_lvplan.php
old mode 100644
new mode 100755
diff --git a/cis/public/freebusy_sogo.php b/cis/public/freebusy_sogo.php
old mode 100644
new mode 100755
diff --git a/cis/public/freebusy_zeitsperren.php b/cis/public/freebusy_zeitsperren.php
old mode 100644
new mode 100755
diff --git a/cis/public/ical_coodle.php b/cis/public/ical_coodle.php
old mode 100644
new mode 100755
diff --git a/cis/public/incoming/akte.php b/cis/public/incoming/akte.php
old mode 100644
new mode 100755
diff --git a/cis/public/incoming/akteupload.php b/cis/public/incoming/akteupload.php
old mode 100644
new mode 100755
diff --git a/cis/public/incoming/auth.php b/cis/public/incoming/auth.php
old mode 100644
new mode 100755
diff --git a/cis/public/incoming/incoming.php b/cis/public/incoming/incoming.php
old mode 100644
new mode 100755
diff --git a/cis/public/incoming/index.php b/cis/public/incoming/index.php
old mode 100644
new mode 100755
diff --git a/cis/public/incoming/logout.php b/cis/public/incoming/logout.php
old mode 100644
new mode 100755
diff --git a/cis/public/incoming/lvinfo.php b/cis/public/incoming/lvinfo.php
old mode 100644
new mode 100755
diff --git a/cis/public/incoming/registration.php b/cis/public/incoming/registration.php
old mode 100644
new mode 100755
diff --git a/cis/public/index.html b/cis/public/index.html
old mode 100644
new mode 100755
diff --git a/cis/public/prestudententool/auth.php b/cis/public/prestudententool/auth.php
old mode 100644
new mode 100755
diff --git a/cis/public/prestudententool/index.php b/cis/public/prestudententool/index.php
old mode 100644
new mode 100755
diff --git a/cis/public/prestudententool/logout.php b/cis/public/prestudententool/logout.php
old mode 100644
new mode 100755
diff --git a/cis/public/prestudententool/prestudent.php b/cis/public/prestudententool/prestudent.php
old mode 100644
new mode 100755
diff --git a/cis/public/testtool_test/MathML_Beispiel.jpg b/cis/public/testtool_test/MathML_Beispiel.jpg
old mode 100644
new mode 100755
diff --git a/cis/public/testtool_test/audio_testfile.mp3 b/cis/public/testtool_test/audio_testfile.mp3
old mode 100644
new mode 100755
diff --git a/cis/public/testtool_test/testseite.php b/cis/public/testtool_test/testseite.php
old mode 100644
new mode 100755
diff --git a/cis/testtool/admin/Testtool.pdf b/cis/testtool/admin/Testtool.pdf
old mode 100644
new mode 100755
diff --git a/cis/testtool/admin/add_gebiet.php b/cis/testtool/admin/add_gebiet.php
old mode 100644
new mode 100755
diff --git a/cis/testtool/admin/auswertung.php b/cis/testtool/admin/auswertung.php
old mode 100644
new mode 100755
diff --git a/cis/testtool/admin/auswertung_detail.php b/cis/testtool/admin/auswertung_detail.php
old mode 100644
new mode 100755
diff --git a/cis/testtool/admin/auswertung_detail_frage.php b/cis/testtool/admin/auswertung_detail_frage.php
old mode 100644
new mode 100755
diff --git a/cis/testtool/admin/auswertung_detail_prestudent.php b/cis/testtool/admin/auswertung_detail_prestudent.php
old mode 100644
new mode 100755
diff --git a/cis/testtool/admin/copy_gebiet.php b/cis/testtool/admin/copy_gebiet.php
old mode 100644
new mode 100755
diff --git a/cis/testtool/admin/edit_ablauf.php b/cis/testtool/admin/edit_ablauf.php
old mode 100644
new mode 100755
diff --git a/cis/testtool/admin/edit_gebiet.php b/cis/testtool/admin/edit_gebiet.php
old mode 100644
new mode 100755
diff --git a/cis/testtool/admin/gebieteAnheangen.php b/cis/testtool/admin/gebieteAnheangen.php
old mode 100644
new mode 100755
diff --git a/cis/testtool/admin/index.php b/cis/testtool/admin/index.php
old mode 100644
new mode 100755
diff --git a/cis/testtool/admin/uebersichtFragen.php b/cis/testtool/admin/uebersichtFragen.php
old mode 100644
new mode 100755
diff --git a/cis/testtool/admin/uebersichtGebiete.php b/cis/testtool/admin/uebersichtGebiete.php
old mode 100644
new mode 100755
diff --git a/cis/testtool/audio-player/audio-player-noswfobject.js b/cis/testtool/audio-player/audio-player-noswfobject.js
old mode 100644
new mode 100755
diff --git a/cis/testtool/audio-player/audio-player-uncompressed.js b/cis/testtool/audio-player/audio-player-uncompressed.js
old mode 100644
new mode 100755
diff --git a/cis/testtool/audio-player/audio-player.js b/cis/testtool/audio-player/audio-player.js
old mode 100644
new mode 100755
diff --git a/cis/testtool/audio-player/license.txt b/cis/testtool/audio-player/license.txt
old mode 100644
new mode 100755
diff --git a/cis/testtool/audio-player/player.swf b/cis/testtool/audio-player/player.swf
old mode 100644
new mode 100755
diff --git a/cis/testtool/bild.php b/cis/testtool/bild.php
old mode 100644
new mode 100755
diff --git a/cis/testtool/ctop.xsl b/cis/testtool/ctop.xsl
old mode 100644
new mode 100755
diff --git a/cis/testtool/frage.php b/cis/testtool/frage.php
old mode 100644
new mode 100755
diff --git a/cis/testtool/gebietfertig.php b/cis/testtool/gebietfertig.php
old mode 100644
new mode 100755
diff --git a/cis/testtool/index.html b/cis/testtool/index.html
old mode 100644
new mode 100755
diff --git a/cis/testtool/index.php b/cis/testtool/index.php
old mode 100644
new mode 100755
diff --git a/cis/testtool/login.php b/cis/testtool/login.php
old mode 100644
new mode 100755
diff --git a/cis/testtool/logout.html b/cis/testtool/logout.html
old mode 100644
new mode 100755
diff --git a/cis/testtool/mathml.xsl b/cis/testtool/mathml.xsl
old mode 100644
new mode 100755
diff --git a/cis/testtool/menu.php b/cis/testtool/menu.php
old mode 100644
new mode 100755
diff --git a/cis/testtool/pmathml.xsl b/cis/testtool/pmathml.xsl
old mode 100644
new mode 100755
diff --git a/cis/testtool/prueflinggesperrt.php b/cis/testtool/prueflinggesperrt.php
old mode 100644
new mode 100755
diff --git a/cis/testtool/sound.php b/cis/testtool/sound.php
old mode 100644
new mode 100755
diff --git a/cis/testtool/test/MathML_Beispiel.jpg b/cis/testtool/test/MathML_Beispiel.jpg
old mode 100644
new mode 100755
diff --git a/cis/testtool/test/audio_testfile.mp3 b/cis/testtool/test/audio_testfile.mp3
old mode 100644
new mode 100755
diff --git a/cis/testtool/test/testseite.php b/cis/testtool/test/testseite.php
old mode 100644
new mode 100755
diff --git a/cis/testtool/topbar.html b/cis/testtool/topbar.html
old mode 100644
new mode 100755
diff --git a/cis/testtool/topbar.php b/cis/testtool/topbar.php
old mode 100644
new mode 100755
diff --git a/cms/admin.php b/cms/admin.php
old mode 100644
new mode 100755
diff --git a/cms/admin_dms.php b/cms/admin_dms.php
old mode 100644
new mode 100755
diff --git a/cms/content.php b/cms/content.php
old mode 100644
new mode 100755
diff --git a/cms/content_uebersicht.php b/cms/content_uebersicht.php
old mode 100644
new mode 100755
diff --git a/cms/dms.php b/cms/dms.php
old mode 100644
new mode 100755
diff --git a/cms/image.php b/cms/image.php
old mode 100644
new mode 100755
diff --git a/cms/index.html b/cms/index.html
old mode 100644
new mode 100755
diff --git a/cms/menu.inc.php b/cms/menu.inc.php
old mode 100644
new mode 100755
diff --git a/cms/menu/menu_addon.class.php b/cms/menu/menu_addon.class.php
old mode 100644
new mode 100755
diff --git a/cms/menu/menu_addon_freifaecher.inc.php b/cms/menu/menu_addon_freifaecher.inc.php
old mode 100644
new mode 100755
diff --git a/cms/menu/menu_addon_lehrveranstaltungen.inc.php b/cms/menu/menu_addon_lehrveranstaltungen.inc.php
old mode 100644
new mode 100755
diff --git a/cms/menu/menu_addon_lehrveranstaltungen_studienplan.inc.php b/cms/menu/menu_addon_lehrveranstaltungen_studienplan.inc.php
old mode 100644
new mode 100755
diff --git a/cms/menu/menu_addon_meinelehrfaecher.inc.php b/cms/menu/menu_addon_meinelehrfaecher.inc.php
old mode 100644
new mode 100755
diff --git a/cms/menu/menu_addon_meinelv.inc.php b/cms/menu/menu_addon_meinelv.inc.php
old mode 100644
new mode 100755
diff --git a/cms/menu/menu_addon_spacer.inc.php b/cms/menu/menu_addon_spacer.inc.php
old mode 100644
new mode 100755
diff --git a/cms/menu/menu_addon_test.inc.php b/cms/menu/menu_addon_test.inc.php
old mode 100644
new mode 100755
diff --git a/cms/menu/menu_addon_urlaub.inc.php b/cms/menu/menu_addon_urlaub.inc.php
old mode 100644
new mode 100755
diff --git a/cms/menu/menu_addon_zeitsperren.inc.php b/cms/menu/menu_addon_zeitsperren.inc.php
old mode 100644
new mode 100755
diff --git a/cms/news.php b/cms/news.php
old mode 100644
new mode 100755
diff --git a/cms/newsverwaltung.php b/cms/newsverwaltung.php
old mode 100644
new mode 100755
diff --git a/cms/tinymce_dms.php b/cms/tinymce_dms.php
old mode 100644
new mode 100755
diff --git a/composer.json b/composer.json
old mode 100644
new mode 100755
diff --git a/composer.lock b/composer.lock
old mode 100644
new mode 100755
diff --git a/config/.gitignore b/config/.gitignore
old mode 100644
new mode 100755
diff --git a/config/cis.config-default.inc.php b/config/cis.config-default.inc.php
old mode 100644
new mode 100755
diff --git a/config/global.config-default.inc.php b/config/global.config-default.inc.php
old mode 100644
new mode 100755
diff --git a/config/system.config-default.inc.php b/config/system.config-default.inc.php
old mode 100644
new mode 100755
diff --git a/config/vilesci.config-default.inc.php b/config/vilesci.config-default.inc.php
old mode 100644
new mode 100755
diff --git a/config/wawi.config-default.inc.php b/config/wawi.config-default.inc.php
old mode 100644
new mode 100755
diff --git a/content/DragAndDrop.js b/content/DragAndDrop.js
old mode 100644
new mode 100755
diff --git a/content/about.xul.php b/content/about.xul.php
old mode 100644
new mode 100755
diff --git a/content/adressedialog.js.php b/content/adressedialog.js.php
old mode 100644
new mode 100755
diff --git a/content/adressedialog.xul.php b/content/adressedialog.xul.php
old mode 100644
new mode 100755
diff --git a/content/akte.php b/content/akte.php
old mode 100644
new mode 100755
diff --git a/content/akteupload.php b/content/akteupload.php
old mode 100644
new mode 100755
diff --git a/content/anwesenheit.js.php b/content/anwesenheit.js.php
old mode 100644
new mode 100755
diff --git a/content/anwesenheit.xul.php b/content/anwesenheit.xul.php
old mode 100644
new mode 100755
diff --git a/content/bankverbindungdialog.js.php b/content/bankverbindungdialog.js.php
old mode 100644
new mode 100755
diff --git a/content/bankverbindungdialog.xul.php b/content/bankverbindungdialog.xul.php
old mode 100644
new mode 100755
diff --git a/content/betriebsmitteloverlay.js.php b/content/betriebsmitteloverlay.js.php
old mode 100644
new mode 100755
diff --git a/content/betriebsmitteloverlay.xul.php b/content/betriebsmitteloverlay.xul.php
old mode 100644
new mode 100755
diff --git a/content/bild.php b/content/bild.php
old mode 100644
new mode 100755
diff --git a/content/bildupload.php b/content/bildupload.php
old mode 100644
new mode 100755
diff --git a/content/bindings.css b/content/bindings.css
old mode 100644
new mode 100755
diff --git a/content/bindings.xml.php b/content/bindings.xml.php
old mode 100644
new mode 100755
diff --git a/content/datepicker/calendar.png b/content/datepicker/calendar.png
old mode 100644
new mode 100755
diff --git a/content/datepicker/date.png b/content/datepicker/date.png
old mode 100644
new mode 100755
diff --git a/content/datepicker/datepicker.css b/content/datepicker/datepicker.css
old mode 100644
new mode 100755
diff --git a/content/datepicker/datepicker.xml b/content/datepicker/datepicker.xml
old mode 100644
new mode 100755
diff --git a/content/datepicker/navigation.png b/content/datepicker/navigation.png
old mode 100644
new mode 100755
diff --git a/content/dokumentenakt.pdf.php b/content/dokumentenakt.pdf.php
old mode 100644
new mode 100755
diff --git a/content/dragboard.js.php b/content/dragboard.js.php
old mode 100644
new mode 100755
diff --git a/content/fas.xul.php b/content/fas.xul.php
old mode 100644
new mode 100755
diff --git a/content/fasDBDML.php b/content/fasDBDML.php
old mode 100644
new mode 100755
diff --git a/content/fasoverlay.js.php b/content/fasoverlay.js.php
old mode 100644
new mode 100755
diff --git a/content/fasoverlay.xul.php b/content/fasoverlay.xul.php
old mode 100644
new mode 100755
diff --git a/content/functions.js.php b/content/functions.js.php
old mode 100644
new mode 100755
diff --git a/content/funktionen.js.php b/content/funktionen.js.php
old mode 100644
new mode 100755
diff --git a/content/funktionen.xul.php b/content/funktionen.xul.php
old mode 100644
new mode 100755
diff --git a/content/kontakt.js.php b/content/kontakt.js.php
old mode 100644
new mode 100755
diff --git a/content/kontakt.xul.php b/content/kontakt.xul.php
old mode 100644
new mode 100755
diff --git a/content/kontaktdialog.js.php b/content/kontaktdialog.js.php
old mode 100644
new mode 100755
diff --git a/content/kontaktdialog.xul.php b/content/kontaktdialog.xul.php
old mode 100644
new mode 100755
diff --git a/content/lvplanung/lehrveranstaltungDBDML.php b/content/lvplanung/lehrveranstaltungDBDML.php
old mode 100644
new mode 100755
diff --git a/content/lvplanung/lehrveranstaltungdetailoverlay.xul.php b/content/lvplanung/lehrveranstaltungdetailoverlay.xul.php
old mode 100644
new mode 100755
diff --git a/content/lvplanung/lehrveranstaltungnotenoverlay.xul.php b/content/lvplanung/lehrveranstaltungnotenoverlay.xul.php
old mode 100644
new mode 100755
diff --git a/content/lvplanung/lehrveranstaltungoverlay.js.php b/content/lvplanung/lehrveranstaltungoverlay.js.php
old mode 100644
new mode 100755
diff --git a/content/lvplanung/lehrveranstaltungoverlay.xul.php b/content/lvplanung/lehrveranstaltungoverlay.xul.php
old mode 100644
new mode 100755
diff --git a/content/lvplanung/ressourcedialog.js.php b/content/lvplanung/ressourcedialog.js.php
old mode 100644
new mode 100755
diff --git a/content/lvplanung/ressourcedialog.xul.php b/content/lvplanung/ressourcedialog.xul.php
old mode 100644
new mode 100755
diff --git a/content/lvplanung/stpl-details-dialog.js.php b/content/lvplanung/stpl-details-dialog.js.php
old mode 100644
new mode 100755
diff --git a/content/lvplanung/stpl-details-dialog.xul.php b/content/lvplanung/stpl-details-dialog.xul.php
old mode 100644
new mode 100755
diff --git a/content/lvplanung/stpl-details-overlay.xul.php b/content/lvplanung/stpl-details-overlay.xul.php
old mode 100644
new mode 100755
diff --git a/content/lvplanung/stpl-semester-overlay.js.php b/content/lvplanung/stpl-semester-overlay.js.php
old mode 100644
new mode 100755
diff --git a/content/lvplanung/stpl-semester-overlay.xul.php b/content/lvplanung/stpl-semester-overlay.xul.php
old mode 100644
new mode 100755
diff --git a/content/lvplanung/stpl-week-overlay.js.php b/content/lvplanung/stpl-week-overlay.js.php
old mode 100644
new mode 100755
diff --git a/content/lvplanung/stpl-week-overlay.xul.php b/content/lvplanung/stpl-week-overlay.xul.php
old mode 100644
new mode 100755
diff --git a/content/lvplanung/timetable-week.xul.php b/content/lvplanung/timetable-week.xul.php
old mode 100644
new mode 100755
diff --git a/content/messages.js.php b/content/messages.js.php
old mode 100644
new mode 100755
diff --git a/content/messages.xul.php b/content/messages.xul.php
old mode 100644
new mode 100755
diff --git a/content/mitarbeiter/lehrtaetigkeit.pdf.php b/content/mitarbeiter/lehrtaetigkeit.pdf.php
old mode 100644
new mode 100755
diff --git a/content/mitarbeiter/mitarbeiterDBDML.php b/content/mitarbeiter/mitarbeiterDBDML.php
old mode 100644
new mode 100755
diff --git a/content/mitarbeiter/mitarbeiterbuchung.js.php b/content/mitarbeiter/mitarbeiterbuchung.js.php
old mode 100644
new mode 100755
diff --git a/content/mitarbeiter/mitarbeiterbuchungoverlay.xul.php b/content/mitarbeiter/mitarbeiterbuchungoverlay.xul.php
old mode 100644
new mode 100755
diff --git a/content/mitarbeiter/mitarbeiterdetailoverlay.xul.php b/content/mitarbeiter/mitarbeiterdetailoverlay.xul.php
old mode 100644
new mode 100755
diff --git a/content/mitarbeiter/mitarbeiterfunktionoverlay.xul.php b/content/mitarbeiter/mitarbeiterfunktionoverlay.xul.php
old mode 100644
new mode 100755
diff --git a/content/mitarbeiter/mitarbeiteroverlay.js.php b/content/mitarbeiter/mitarbeiteroverlay.js.php
old mode 100644
new mode 100755
diff --git a/content/mitarbeiter/mitarbeiteroverlay.xul.php b/content/mitarbeiter/mitarbeiteroverlay.xul.php
old mode 100644
new mode 100755
diff --git a/content/mitarbeiter/mitarbeitervertrag.js.php b/content/mitarbeiter/mitarbeitervertrag.js.php
old mode 100644
new mode 100755
diff --git a/content/mitarbeiter/mitarbeitervertragneudialog.js.php b/content/mitarbeiter/mitarbeitervertragneudialog.js.php
old mode 100644
new mode 100755
diff --git a/content/mitarbeiter/mitarbeitervertragneudialog.xul.php b/content/mitarbeiter/mitarbeitervertragneudialog.xul.php
old mode 100644
new mode 100755
diff --git a/content/mitarbeiter/mitarbeitervertragoverlay.xul.php b/content/mitarbeiter/mitarbeitervertragoverlay.xul.php
old mode 100644
new mode 100755
diff --git a/content/mitarbeiter/mitarbeiterverwendungdialog.js.php b/content/mitarbeiter/mitarbeiterverwendungdialog.js.php
old mode 100644
new mode 100755
diff --git a/content/mitarbeiter/mitarbeiterverwendungdialog.xul.php b/content/mitarbeiter/mitarbeiterverwendungdialog.xul.php
old mode 100644
new mode 100755
diff --git a/content/notiz.xml.php b/content/notiz.xml.php
old mode 100644
new mode 100755
diff --git a/content/notizdialog.js.php b/content/notizdialog.js.php
old mode 100644
new mode 100755
diff --git a/content/notizdialog.xul.php b/content/notizdialog.xul.php
old mode 100644
new mode 100755
diff --git a/content/notizdokdownload.php b/content/notizdokdownload.php
old mode 100644
new mode 100755
diff --git a/content/notizdokupload.php b/content/notizdokupload.php
old mode 100644
new mode 100755
diff --git a/content/pdfExport.php b/content/pdfExport.php
old mode 100644
new mode 100755
diff --git a/content/phpRequest.js.php b/content/phpRequest.js.php
old mode 100644
new mode 100755
diff --git a/content/planner.js.php b/content/planner.js.php
old mode 100644
new mode 100755
diff --git a/content/planner.overlay.js.php b/content/planner.overlay.js.php
old mode 100644
new mode 100755
diff --git a/content/planner.overlay.xul.php b/content/planner.overlay.xul.php
old mode 100644
new mode 100755
diff --git a/content/planner.xul.php b/content/planner.xul.php
old mode 100644
new mode 100755
diff --git a/content/projekt/GanttChart.svg b/content/projekt/GanttChart.svg
old mode 100644
new mode 100755
diff --git a/content/projekt/bestellung.overlay.js.php b/content/projekt/bestellung.overlay.js.php
old mode 100644
new mode 100755
diff --git a/content/projekt/bestellung.overlay.xul.php b/content/projekt/bestellung.overlay.xul.php
old mode 100644
new mode 100755
diff --git a/content/projekt/gantt.css b/content/projekt/gantt.css
old mode 100644
new mode 100755
diff --git a/content/projekt/gantt.overlay.js.php b/content/projekt/gantt.overlay.js.php
old mode 100644
new mode 100755
diff --git a/content/projekt/gantt.overlay.xul.php b/content/projekt/gantt.overlay.xul.php
old mode 100644
new mode 100755
diff --git a/content/projekt/gantt.svg.css b/content/projekt/gantt.svg.css
old mode 100644
new mode 100755
diff --git a/content/projekt/gantt.svg.php b/content/projekt/gantt.svg.php
old mode 100644
new mode 100755
diff --git a/content/projekt/gantt.svg.xbl b/content/projekt/gantt.svg.xbl
old mode 100644
new mode 100755
diff --git a/content/projekt/mantisdetail.overlay.xul.php b/content/projekt/mantisdetail.overlay.xul.php
old mode 100644
new mode 100755
diff --git a/content/projekt/parsedown.php b/content/projekt/parsedown.php
old mode 100644
new mode 100755
diff --git a/content/projekt/projekt.overlay.js.php b/content/projekt/projekt.overlay.js.php
old mode 100644
new mode 100755
diff --git a/content/projekt/projekt.overlay.xul.php b/content/projekt/projekt.overlay.xul.php
old mode 100644
new mode 100755
diff --git a/content/projekt/projekt_ressource.window.js.php b/content/projekt/projekt_ressource.window.js.php
old mode 100644
new mode 100755
diff --git a/content/projekt/projekt_ressource.window.xul.php b/content/projekt/projekt_ressource.window.xul.php
old mode 100644
new mode 100755
diff --git a/content/projekt/projektdetail.overlay.xul.php b/content/projekt/projektdetail.overlay.xul.php
old mode 100644
new mode 100755
diff --git a/content/projekt/projektdokument.overlay.js.php b/content/projekt/projektdokument.overlay.js.php
old mode 100644
new mode 100755
diff --git a/content/projekt/projektdokument.overlay.xul.php b/content/projekt/projektdokument.overlay.xul.php
old mode 100644
new mode 100755
diff --git a/content/projekt/projektdokument.window.js.php b/content/projekt/projektdokument.window.js.php
old mode 100644
new mode 100755
diff --git a/content/projekt/projektdokument.window.xul.php b/content/projekt/projektdokument.window.xul.php
old mode 100644
new mode 100755
diff --git a/content/projekt/projektphase.overlay.js.php b/content/projekt/projektphase.overlay.js.php
old mode 100644
new mode 100755
diff --git a/content/projekt/projektphase.overlay.xul.php b/content/projekt/projektphase.overlay.xul.php
old mode 100644
new mode 100755
diff --git a/content/projekt/projektphasedetail.overlay.xul.php b/content/projekt/projektphasedetail.overlay.xul.php
old mode 100644
new mode 100755
diff --git a/content/projekt/projekttask.overlay.js.php b/content/projekt/projekttask.overlay.js.php
old mode 100644
new mode 100755
diff --git a/content/projekt/projekttask.overlay.xul.php b/content/projekt/projekttask.overlay.xul.php
old mode 100644
new mode 100755
diff --git a/content/projekt/projekttaskdetail.overlay.xul.php b/content/projekt/projekttaskdetail.overlay.xul.php
old mode 100644
new mode 100755
diff --git a/content/projekt/ressource.js.php b/content/projekt/ressource.js.php
old mode 100644
new mode 100755
diff --git a/content/projekt/ressource.overlay.js.php b/content/projekt/ressource.overlay.js.php
old mode 100644
new mode 100755
diff --git a/content/projekt/ressource.overlay.xul.php b/content/projekt/ressource.overlay.xul.php
old mode 100644
new mode 100755
diff --git a/content/projekt/ressource.window.xul.php b/content/projekt/ressource.window.xul.php
old mode 100644
new mode 100755
diff --git a/content/projekt/ressource.xml.php b/content/projekt/ressource.xml.php
old mode 100644
new mode 100755
diff --git a/content/projekt/ressourcenauslastung.php b/content/projekt/ressourcenauslastung.php
old mode 100644
new mode 100755
diff --git a/content/projektbeschreibung.php b/content/projektbeschreibung.php
old mode 100644
new mode 100755
diff --git a/content/statistik/StudierendeZGV.php b/content/statistik/StudierendeZGV.php
old mode 100644
new mode 100755
diff --git a/content/statistik/abgaengerstatistik.php b/content/statistik/abgaengerstatistik.php
old mode 100644
new mode 100755
diff --git a/content/statistik/abschlusspruefungexport.xls.php b/content/statistik/abschlusspruefungexport.xls.php
old mode 100644
new mode 100755
diff --git a/content/statistik/absolventen.xls.php b/content/statistik/absolventen.xls.php
old mode 100644
new mode 100755
diff --git a/content/statistik/absolventenstatistik.php b/content/statistik/absolventenstatistik.php
old mode 100644
new mode 100755
diff --git a/content/statistik/absolventenzahlen.php b/content/statistik/absolventenzahlen.php
old mode 100644
new mode 100755
diff --git a/content/statistik/alvsstatistik.php b/content/statistik/alvsstatistik.php
old mode 100644
new mode 100755
diff --git a/content/statistik/bama_stromanalyse.php b/content/statistik/bama_stromanalyse.php
old mode 100644
new mode 100755
diff --git a/content/statistik/bama_studentenstrom.svg.php b/content/statistik/bama_studentenstrom.svg.php
old mode 100644
new mode 100755
diff --git a/content/statistik/bewerberstatistik.php b/content/statistik/bewerberstatistik.php
old mode 100644
new mode 100755
diff --git a/content/statistik/bewerberstatistik.svg.php b/content/statistik/bewerberstatistik.svg.php
old mode 100644
new mode 100755
diff --git a/content/statistik/dokumente.xls.php b/content/statistik/dokumente.xls.php
old mode 100644
new mode 100755
diff --git a/content/statistik/dropout.php b/content/statistik/dropout.php
old mode 100644
new mode 100755
diff --git a/content/statistik/dropoutZGV.php b/content/statistik/dropoutZGV.php
old mode 100644
new mode 100755
diff --git a/content/statistik/lehrauftragsliste_gst.xls.php b/content/statistik/lehrauftragsliste_gst.xls.php
old mode 100644
new mode 100755
diff --git a/content/statistik/lehrauftragsliste_mail.xls.php b/content/statistik/lehrauftragsliste_mail.xls.php
old mode 100644
new mode 100755
diff --git a/content/statistik/lvplanung.php b/content/statistik/lvplanung.php
old mode 100644
new mode 100755
diff --git a/content/statistik/lvplanung.xls.php b/content/statistik/lvplanung.xls.php
old mode 100644
new mode 100755
diff --git a/content/statistik/mitarbeiterexport.xls.php b/content/statistik/mitarbeiterexport.xls.php
old mode 100644
new mode 100755
diff --git a/content/statistik/mitarbeiterstatistik.php b/content/statistik/mitarbeiterstatistik.php
old mode 100644
new mode 100755
diff --git a/content/statistik/notenspiegel.php b/content/statistik/notenspiegel.php
old mode 100644
new mode 100755
diff --git a/content/statistik/notenspiegel_erweitert.php b/content/statistik/notenspiegel_erweitert.php
old mode 100644
new mode 100755
diff --git a/content/statistik/oeh_beitraege.xls.php b/content/statistik/oeh_beitraege.xls.php
old mode 100644
new mode 100755
diff --git a/content/statistik/projektarbeitexport.xls.php b/content/statistik/projektarbeitexport.xls.php
old mode 100644
new mode 100755
diff --git a/content/statistik/studentenexportextended.xls.php b/content/statistik/studentenexportextended.xls.php
old mode 100644
new mode 100755
diff --git a/content/statistik/studentenprosemester.php b/content/statistik/studentenprosemester.php
old mode 100644
new mode 100755
diff --git a/content/statistik/studentenstatistik.php b/content/statistik/studentenstatistik.php
old mode 100644
new mode 100755
diff --git a/content/statistik/studentenstatistik_lehrgaenge.php b/content/statistik/studentenstatistik_lehrgaenge.php
old mode 100644
new mode 100755
diff --git a/content/statistik/termine.xls.php b/content/statistik/termine.xls.php
old mode 100644
new mode 100755
diff --git a/content/statistik/vertragsuebersicht.xls.php b/content/statistik/vertragsuebersicht.xls.php
old mode 100644
new mode 100755
diff --git a/content/student/aufnahmetermine.js.php b/content/student/aufnahmetermine.js.php
old mode 100644
new mode 100755
diff --git a/content/student/aufnahmetermine.xul.php b/content/student/aufnahmetermine.xul.php
old mode 100644
new mode 100755
diff --git a/content/student/interessentdokumentedialog.js.php b/content/student/interessentdokumentedialog.js.php
old mode 100644
new mode 100755
diff --git a/content/student/interessentdokumentedialog.xul.php b/content/student/interessentdokumentedialog.xul.php
old mode 100644
new mode 100755
diff --git a/content/student/interessentdokumenteoverlay.js.php b/content/student/interessentdokumenteoverlay.js.php
old mode 100644
new mode 100755
diff --git a/content/student/interessentdokumenteoverlay.xul.php b/content/student/interessentdokumenteoverlay.xul.php
old mode 100644
new mode 100755
diff --git a/content/student/interessentoverlay.js.php b/content/student/interessentoverlay.js.php
old mode 100644
new mode 100755
diff --git a/content/student/studentDBDML.php b/content/student/studentDBDML.php
old mode 100644
new mode 100755
diff --git a/content/student/studentabschlusspruefung.js.php b/content/student/studentabschlusspruefung.js.php
old mode 100644
new mode 100755
diff --git a/content/student/studentabschlusspruefungoverlay.xul.php b/content/student/studentabschlusspruefungoverlay.xul.php
old mode 100644
new mode 100755
diff --git a/content/student/studentanrechnungenoverlay.xul.php b/content/student/studentanrechnungenoverlay.xul.php
old mode 100644
new mode 100755
diff --git a/content/student/studentdetailoverlay.xul.php b/content/student/studentdetailoverlay.xul.php
old mode 100644
new mode 100755
diff --git a/content/student/studentenoverlay.xul.php b/content/student/studentenoverlay.xul.php
old mode 100644
new mode 100755
diff --git a/content/student/studentgruppenoverlay.js.php b/content/student/studentgruppenoverlay.js.php
old mode 100644
new mode 100755
diff --git a/content/student/studentgruppenoverlay.xul.php b/content/student/studentgruppenoverlay.xul.php
old mode 100644
new mode 100755
diff --git a/content/student/studentiooverlay.xul.php b/content/student/studentiooverlay.xul.php
old mode 100644
new mode 100755
diff --git a/content/student/studentkontoneudialog.js.php b/content/student/studentkontoneudialog.js.php
old mode 100644
new mode 100755
diff --git a/content/student/studentkontoneudialog.xul.php b/content/student/studentkontoneudialog.xul.php
old mode 100644
new mode 100755
diff --git a/content/student/studentkontooverlay.xul.php b/content/student/studentkontooverlay.xul.php
old mode 100644
new mode 100755
diff --git a/content/student/studentmobilitaetoverlay.js.php b/content/student/studentmobilitaetoverlay.js.php
old mode 100644
new mode 100755
diff --git a/content/student/studentmobilitaetoverlay.xul.php b/content/student/studentmobilitaetoverlay.xul.php
old mode 100644
new mode 100755
diff --git a/content/student/studentnotenoverlay.xul.php b/content/student/studentnotenoverlay.xul.php
old mode 100644
new mode 100755
diff --git a/content/student/studentoverlay.js.php b/content/student/studentoverlay.js.php
old mode 100644
new mode 100755
diff --git a/content/student/studentprojektarbeit.js.php b/content/student/studentprojektarbeit.js.php
old mode 100644
new mode 100755
diff --git a/content/student/studentprojektarbeitoverlay.xul.php b/content/student/studentprojektarbeitoverlay.xul.php
old mode 100644
new mode 100755
diff --git a/content/student/studentpruefungoverlay.xul.php b/content/student/studentpruefungoverlay.xul.php
old mode 100644
new mode 100755
diff --git a/content/student/studentrolledialog.js.php b/content/student/studentrolledialog.js.php
old mode 100644
new mode 100755
diff --git a/content/student/studentrolledialog.xul.php b/content/student/studentrolledialog.xul.php
old mode 100644
new mode 100755
diff --git a/content/student/studentzeugnisoverlay.xul.php b/content/student/studentzeugnisoverlay.xul.php
old mode 100644
new mode 100755
diff --git a/content/studenten.js b/content/studenten.js
old mode 100644
new mode 100755
diff --git a/content/tempus.js.php b/content/tempus.js.php
old mode 100644
new mode 100755
diff --git a/content/tempus.xul.php b/content/tempus.xul.php
old mode 100644
new mode 100755
diff --git a/content/tempusDBDML.php b/content/tempusDBDML.php
old mode 100644
new mode 100755
diff --git a/content/tempusoverlay.js.php b/content/tempusoverlay.js.php
old mode 100644
new mode 100755
diff --git a/content/tempusoverlay.xul.php b/content/tempusoverlay.xul.php
old mode 100644
new mode 100755
diff --git a/content/termine.js.php b/content/termine.js.php
old mode 100644
new mode 100755
diff --git a/content/termine.xul.php b/content/termine.xul.php
old mode 100644
new mode 100755
diff --git a/content/udf.js.php b/content/udf.js.php
old mode 100644
new mode 100755
diff --git a/content/udf.xul.php b/content/udf.xul.php
old mode 100644
new mode 100755
diff --git a/content/zutrittskarte.php b/content/zutrittskarte.php
old mode 100644
new mode 100755
diff --git a/favicon.ico b/favicon.ico
old mode 100644
new mode 100755
diff --git a/include/DifferenceEngine/DifferenceEngine.php b/include/DifferenceEngine/DifferenceEngine.php
old mode 100644
new mode 100755
diff --git a/include/Excel/BIFFwriter.php b/include/Excel/BIFFwriter.php
old mode 100644
new mode 100755
diff --git a/include/Excel/File.php b/include/Excel/File.php
old mode 100644
new mode 100755
diff --git a/include/Excel/Format.php b/include/Excel/Format.php
old mode 100644
new mode 100755
diff --git a/include/Excel/OLE.php b/include/Excel/OLE.php
old mode 100644
new mode 100755
diff --git a/include/Excel/PEAR.php b/include/Excel/PEAR.php
old mode 100644
new mode 100755
diff --git a/include/Excel/PPS.php b/include/Excel/PPS.php
old mode 100644
new mode 100755
diff --git a/include/Excel/Parser.php b/include/Excel/Parser.php
old mode 100644
new mode 100755
diff --git a/include/Excel/Root.php b/include/Excel/Root.php
old mode 100644
new mode 100755
diff --git a/include/Excel/Validator.php b/include/Excel/Validator.php
old mode 100644
new mode 100755
diff --git a/include/Excel/Workbook.php b/include/Excel/Workbook.php
old mode 100644
new mode 100755
diff --git a/include/Excel/Worksheet.php b/include/Excel/Worksheet.php
old mode 100644
new mode 100755
diff --git a/include/Excel/Writer.php b/include/Excel/Writer.php
old mode 100644
new mode 100755
diff --git a/include/Excel/excel.php b/include/Excel/excel.php
old mode 100644
new mode 100755
diff --git a/include/File/CSV.php b/include/File/CSV.php
old mode 100644
new mode 100755
diff --git a/include/File/Find.php b/include/File/Find.php
old mode 100644
new mode 100755
diff --git a/include/File/Match.php b/include/File/Match.php
old mode 100644
new mode 100755
diff --git a/include/File/Passwd.php b/include/File/Passwd.php
old mode 100644
new mode 100755
diff --git a/include/File/SearchReplace.php b/include/File/SearchReplace.php
old mode 100644
new mode 100755
diff --git a/include/File/Util.php b/include/File/Util.php
old mode 100644
new mode 100755
diff --git a/include/Parser/Parsedown.php b/include/Parser/Parsedown.php
old mode 100644
new mode 100755
diff --git a/include/ablauf.class.php b/include/ablauf.class.php
old mode 100644
new mode 100755
diff --git a/include/abschlusspruefung.class.php b/include/abschlusspruefung.class.php
old mode 100644
new mode 100755
diff --git a/include/abschlusspruefung_antritt.class.php b/include/abschlusspruefung_antritt.class.php
old mode 100644
new mode 100755
diff --git a/include/addon.class.php b/include/addon.class.php
old mode 100644
new mode 100755
diff --git a/include/adresse.class.php b/include/adresse.class.php
old mode 100644
new mode 100755
diff --git a/include/adressentyp.class.php b/include/adressentyp.class.php
old mode 100644
new mode 100755
diff --git a/include/akadgrad.class.php b/include/akadgrad.class.php
old mode 100644
new mode 100755
diff --git a/include/akte.class.php b/include/akte.class.php
old mode 100644
new mode 100755
diff --git a/include/ampel.class.php b/include/ampel.class.php
old mode 100644
new mode 100755
diff --git a/include/anrechnung.class.php b/include/anrechnung.class.php
old mode 100644
new mode 100755
diff --git a/include/antwort.class.php b/include/antwort.class.php
old mode 100644
new mode 100755
diff --git a/include/anwesenheit.class.php b/include/anwesenheit.class.php
old mode 100644
new mode 100755
diff --git a/include/appdaten.class.php b/include/appdaten.class.php
old mode 100644
new mode 100755
diff --git a/include/aufmerksamdurch.class.php b/include/aufmerksamdurch.class.php
old mode 100644
new mode 100755
diff --git a/include/auth_demo.class.php b/include/auth_demo.class.php
old mode 100644
new mode 100755
diff --git a/include/auth_mixed.class.php b/include/auth_mixed.class.php
old mode 100644
new mode 100755
diff --git a/include/auth_session.class.php b/include/auth_session.class.php
old mode 100644
new mode 100755
diff --git a/include/authentication.class.php b/include/authentication.class.php
old mode 100644
new mode 100755
diff --git a/include/bankverbindung.class.php b/include/bankverbindung.class.php
old mode 100644
new mode 100755
diff --git a/include/basis.class.php b/include/basis.class.php
old mode 100644
new mode 100755
diff --git a/include/basis_db.class.php b/include/basis_db.class.php
old mode 100644
new mode 100755
diff --git a/include/beispiel.class.php b/include/beispiel.class.php
old mode 100644
new mode 100755
diff --git a/include/benutzer.class.php b/include/benutzer.class.php
old mode 100644
new mode 100755
diff --git a/include/benutzerberechtigung.class.php b/include/benutzerberechtigung.class.php
old mode 100644
new mode 100755
diff --git a/include/benutzerfunktion.class.php b/include/benutzerfunktion.class.php
old mode 100644
new mode 100755
diff --git a/include/benutzergruppe.class.php b/include/benutzergruppe.class.php
old mode 100644
new mode 100755
diff --git a/include/benutzerlvstudiensemester.class.php b/include/benutzerlvstudiensemester.class.php
old mode 100644
new mode 100755
diff --git a/include/berechtigung.class.php b/include/berechtigung.class.php
old mode 100644
new mode 100755
diff --git a/include/betriebsmittel.class.php b/include/betriebsmittel.class.php
old mode 100644
new mode 100755
diff --git a/include/betriebsmittel_betriebsmittelstatus.class.php b/include/betriebsmittel_betriebsmittelstatus.class.php
old mode 100644
new mode 100755
diff --git a/include/betriebsmittelperson.class.php b/include/betriebsmittelperson.class.php
old mode 100644
new mode 100755
diff --git a/include/betriebsmittelstatus.class.php b/include/betriebsmittelstatus.class.php
old mode 100644
new mode 100755
diff --git a/include/betriebsmitteltyp.class.php b/include/betriebsmitteltyp.class.php
old mode 100644
new mode 100755
diff --git a/include/bewerbungstermin.class.php b/include/bewerbungstermin.class.php
old mode 100644
new mode 100755
diff --git a/include/bisarchiv.class.php b/include/bisarchiv.class.php
old mode 100644
new mode 100755
diff --git a/include/bisberufstaetigkeit.class.php b/include/bisberufstaetigkeit.class.php
old mode 100644
new mode 100755
diff --git a/include/bisfunktion.class.php b/include/bisfunktion.class.php
old mode 100644
new mode 100755
diff --git a/include/bisio.class.php b/include/bisio.class.php
old mode 100644
new mode 100755
diff --git a/include/bisorgform.class.php b/include/bisorgform.class.php
old mode 100644
new mode 100755
diff --git a/include/bisverwendung.class.php b/include/bisverwendung.class.php
old mode 100644
new mode 100755
diff --git a/include/buchung.class.php b/include/buchung.class.php
old mode 100644
new mode 100755
diff --git a/include/content.class.php b/include/content.class.php
old mode 100644
new mode 100755
diff --git a/include/coodle.class.php b/include/coodle.class.php
old mode 100644
new mode 100755
diff --git a/include/covid/covidhelper.class.php b/include/covid/covidhelper.class.php
old mode 100644
new mode 100755
diff --git a/include/cronjob.class.php b/include/cronjob.class.php
old mode 100644
new mode 100755
diff --git a/include/css/images/ui-bg_diagonals-thick_18_b81900_40x40.png b/include/css/images/ui-bg_diagonals-thick_18_b81900_40x40.png
old mode 100644
new mode 100755
diff --git a/include/css/images/ui-bg_diagonals-thick_20_666666_40x40.png b/include/css/images/ui-bg_diagonals-thick_20_666666_40x40.png
old mode 100644
new mode 100755
diff --git a/include/css/images/ui-bg_flat_10_000000_40x100.png b/include/css/images/ui-bg_flat_10_000000_40x100.png
old mode 100644
new mode 100755
diff --git a/include/css/images/ui-bg_glass_100_f6f6f6_1x400.png b/include/css/images/ui-bg_glass_100_f6f6f6_1x400.png
old mode 100644
new mode 100755
diff --git a/include/css/images/ui-bg_glass_100_fdf5ce_1x400.png b/include/css/images/ui-bg_glass_100_fdf5ce_1x400.png
old mode 100644
new mode 100755
diff --git a/include/css/images/ui-bg_glass_65_ffffff_1x400.png b/include/css/images/ui-bg_glass_65_ffffff_1x400.png
old mode 100644
new mode 100755
diff --git a/include/css/images/ui-bg_gloss-wave_35_f6a828_500x100.png b/include/css/images/ui-bg_gloss-wave_35_f6a828_500x100.png
old mode 100644
new mode 100755
diff --git a/include/css/images/ui-bg_highlight-soft_100_eeeeee_1x100.png b/include/css/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
old mode 100644
new mode 100755
diff --git a/include/css/images/ui-bg_highlight-soft_75_ffe45c_1x100.png b/include/css/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
old mode 100644
new mode 100755
diff --git a/include/css/images/ui-icons_222222_256x240.png b/include/css/images/ui-icons_222222_256x240.png
old mode 100644
new mode 100755
diff --git a/include/css/images/ui-icons_228ef1_256x240.png b/include/css/images/ui-icons_228ef1_256x240.png
old mode 100644
new mode 100755
diff --git a/include/css/images/ui-icons_ef8c08_256x240.png b/include/css/images/ui-icons_ef8c08_256x240.png
old mode 100644
new mode 100755
diff --git a/include/css/images/ui-icons_ffd27a_256x240.png b/include/css/images/ui-icons_ffd27a_256x240.png
old mode 100644
new mode 100755
diff --git a/include/css/images/ui-icons_ffffff_256x240.png b/include/css/images/ui-icons_ffffff_256x240.png
old mode 100644
new mode 100755
diff --git a/include/datum.class.php b/include/datum.class.php
old mode 100644
new mode 100755
diff --git a/include/dms.class.php b/include/dms.class.php
old mode 100644
new mode 100755
diff --git a/include/dokument.class.php b/include/dokument.class.php
old mode 100644
new mode 100755
diff --git a/include/dokument_export.class.php b/include/dokument_export.class.php
old mode 100644
new mode 100755
diff --git a/include/dvb.class.php b/include/dvb.class.php
old mode 100644
new mode 100755
diff --git a/include/ean13.function.php b/include/ean13.function.php
old mode 100644
new mode 100755
diff --git a/include/entwicklungsteam.class.php b/include/entwicklungsteam.class.php
old mode 100644
new mode 100755
diff --git a/include/erhalter.class.php b/include/erhalter.class.php
old mode 100644
new mode 100755
diff --git a/include/errorhandler.class.php b/include/errorhandler.class.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/CREDITS b/include/ezcomponents/Base/CREDITS
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/ChangeLog b/include/ezcomponents/Base/ChangeLog
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/DESCRIPTION b/include/ezcomponents/Base/DESCRIPTION
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/design/class_diagram.png b/include/ezcomponents/Base/design/class_diagram.png
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/design/design.txt b/include/ezcomponents/Base/design/design.txt
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/docs/repos/Me/myclass1.php b/include/ezcomponents/Base/docs/repos/Me/myclass1.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/docs/repos/Me/myclass2.php b/include/ezcomponents/Base/docs/repos/Me/myclass2.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/docs/repos/You/yourclass1.php b/include/ezcomponents/Base/docs/repos/You/yourclass1.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/docs/repos/You/yourclass2.php b/include/ezcomponents/Base/docs/repos/You/yourclass2.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/docs/repos/autoloads/my_autoload.php b/include/ezcomponents/Base/docs/repos/autoloads/my_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/docs/repos/autoloads/your_autoload.php b/include/ezcomponents/Base/docs/repos/autoloads/your_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/docs/tutorial.txt b/include/ezcomponents/Base/docs/tutorial.txt
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/docs/tutorial_autoload.php b/include/ezcomponents/Base/docs/tutorial_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/docs/tutorial_example_01.php b/include/ezcomponents/Base/docs/tutorial_example_01.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/docs/tutorial_example_02.php b/include/ezcomponents/Base/docs/tutorial_example_02.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/docs/tutorial_example_03.php b/include/ezcomponents/Base/docs/tutorial_example_03.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/docs/tutorial_lazy_initialization.php b/include/ezcomponents/Base/docs/tutorial_lazy_initialization.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/review-1.5.txt b/include/ezcomponents/Base/review-1.5.txt
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/src/base.php b/include/ezcomponents/Base/src/base.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/src/exceptions/autoload.php b/include/ezcomponents/Base/src/exceptions/autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/src/exceptions/double_class_repository_prefix.php b/include/ezcomponents/Base/src/exceptions/double_class_repository_prefix.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/src/exceptions/exception.php b/include/ezcomponents/Base/src/exceptions/exception.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/src/exceptions/extension_not_found.php b/include/ezcomponents/Base/src/exceptions/extension_not_found.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/src/exceptions/file_exception.php b/include/ezcomponents/Base/src/exceptions/file_exception.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/src/exceptions/file_io.php b/include/ezcomponents/Base/src/exceptions/file_io.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/src/exceptions/file_not_found.php b/include/ezcomponents/Base/src/exceptions/file_not_found.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/src/exceptions/file_permission.php b/include/ezcomponents/Base/src/exceptions/file_permission.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/src/exceptions/init_callback_configured.php b/include/ezcomponents/Base/src/exceptions/init_callback_configured.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/src/exceptions/invalid_callback_class.php b/include/ezcomponents/Base/src/exceptions/invalid_callback_class.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/src/exceptions/invalid_parent_class.php b/include/ezcomponents/Base/src/exceptions/invalid_parent_class.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/src/exceptions/property_not_found.php b/include/ezcomponents/Base/src/exceptions/property_not_found.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/src/exceptions/property_permission.php b/include/ezcomponents/Base/src/exceptions/property_permission.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/src/exceptions/setting_not_found.php b/include/ezcomponents/Base/src/exceptions/setting_not_found.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/src/exceptions/setting_value.php b/include/ezcomponents/Base/src/exceptions/setting_value.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/src/exceptions/value.php b/include/ezcomponents/Base/src/exceptions/value.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/src/exceptions/whatever.php b/include/ezcomponents/Base/src/exceptions/whatever.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/src/ezc_bootstrap.php b/include/ezcomponents/Base/src/ezc_bootstrap.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/src/features.php b/include/ezcomponents/Base/src/features.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/src/file.php b/include/ezcomponents/Base/src/file.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/src/init.php b/include/ezcomponents/Base/src/init.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/src/interfaces/configuration_initializer.php b/include/ezcomponents/Base/src/interfaces/configuration_initializer.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/src/interfaces/persistable.php b/include/ezcomponents/Base/src/interfaces/persistable.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/src/options.php b/include/ezcomponents/Base/src/options.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/src/options/autoload.php b/include/ezcomponents/Base/src/options/autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/src/struct.php b/include/ezcomponents/Base/src/struct.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/src/structs/repository_directory.php b/include/ezcomponents/Base/src/structs/repository_directory.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/tests/base_init_test.php b/include/ezcomponents/Base/tests/base_init_test.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/tests/base_options_test.php b/include/ezcomponents/Base/tests/base_options_test.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/tests/base_test.php b/include/ezcomponents/Base/tests/base_test.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/tests/extra_repository/Translation/test.php b/include/ezcomponents/Base/tests/extra_repository/Translation/test.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/tests/extra_repository/autoload/translation_autoload.php b/include/ezcomponents/Base/tests/extra_repository/autoload/translation_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/tests/features_test.php b/include/ezcomponents/Base/tests/features_test.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/tests/file_calculate_relative_path_test.php b/include/ezcomponents/Base/tests/file_calculate_relative_path_test.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/tests/file_copy_recursive_test.php b/include/ezcomponents/Base/tests/file_copy_recursive_test.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/tests/file_find_recursive_test.php b/include/ezcomponents/Base/tests/file_find_recursive_test.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/tests/file_is_absolute_path.php b/include/ezcomponents/Base/tests/file_is_absolute_path.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/tests/file_remove_recursive_test.php b/include/ezcomponents/Base/tests/file_remove_recursive_test.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/tests/init/base_init_callback.php b/include/ezcomponents/Base/tests/init/base_init_callback.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/tests/init/base_init_class.php b/include/ezcomponents/Base/tests/init/base_init_class.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/tests/struct_test.php b/include/ezcomponents/Base/tests/struct_test.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/tests/suite.php b/include/ezcomponents/Base/tests/suite.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/tests/test_options.php b/include/ezcomponents/Base/tests/test_options.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/tests/test_repository/TestClasses/base_test_class.php b/include/ezcomponents/Base/tests/test_repository/TestClasses/base_test_class.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/tests/test_repository/TestClasses/base_test_class_number_two.php b/include/ezcomponents/Base/tests/test_repository/TestClasses/base_test_class_number_two.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/tests/test_repository/TestClasses/base_test_long_class.php b/include/ezcomponents/Base/tests/test_repository/TestClasses/base_test_long_class.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/tests/test_repository/autoload_files/basetest_autoload.php b/include/ezcomponents/Base/tests/test_repository/autoload_files/basetest_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/tests/test_repository/autoload_files/basetest_long_autoload.php b/include/ezcomponents/Base/tests/test_repository/autoload_files/basetest_long_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/tests/test_repository/autoload_files/object_autoload.php b/include/ezcomponents/Base/tests/test_repository/autoload_files/object_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Base/tests/test_repository/object/object.php b/include/ezcomponents/Base/tests/test_repository/object/object.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ChangeLog b/include/ezcomponents/ChangeLog
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/CREDITS b/include/ezcomponents/Graph/CREDITS
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/ChangeLog b/include/ezcomponents/Graph/ChangeLog
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/DESCRIPTION b/include/ezcomponents/Graph/DESCRIPTION
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/design/class_diagram.png b/include/ezcomponents/Graph/design/class_diagram.png
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/design/design.txt b/include/ezcomponents/Graph/design/design.txt
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/design/enhancements/interactive_data_points.txt b/include/ezcomponents/Graph/design/enhancements/interactive_data_points.txt
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/design/enhancements/multiple_axis.txt b/include/ezcomponents/Graph/design/enhancements/multiple_axis.txt
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/design/requirements.txt b/include/ezcomponents/Graph/design/requirements.txt
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/design/requirements/interactive_data_points.txt b/include/ezcomponents/Graph/design/requirements/interactive_data_points.txt
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/design/requirements/multiple_axis.txt b/include/ezcomponents/Graph/design/requirements/multiple_axis.txt
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/examples/ez_green.php b/include/ezcomponents/Graph/docs/examples/ez_green.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/examples/ez_red.php b/include/ezcomponents/Graph/docs/examples/ez_red.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/examples/forum_evolution.php b/include/ezcomponents/Graph/docs/examples/forum_evolution.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/examples/forum_month.php b/include/ezcomponents/Graph/docs/examples/forum_month.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/examples/forum_weekly.php b/include/ezcomponents/Graph/docs/examples/forum_weekly.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/examples/forum_year.php b/include/ezcomponents/Graph/docs/examples/forum_year.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/examples/php_magazine.php b/include/ezcomponents/Graph/docs/examples/php_magazine.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/examples/wikipedia.php b/include/ezcomponents/Graph/docs/examples/wikipedia.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_axis_datetime.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_axis_datetime.svg.png
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_axis_labeled.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_axis_labeled.svg.png
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_axis_numeric.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_axis_numeric.svg.png
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_bar_chart.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_bar_chart.svg.png
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_bar_chart_3d.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_bar_chart_3d.svg.png
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_bar_chart_options.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_bar_chart_options.svg.png
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_bar_line_chart.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_bar_line_chart.svg.png
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_bar_options.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_bar_options.svg.png
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_chart_background.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_chart_background.svg.png
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_chart_legend.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_chart_legend.svg.png
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_chart_title.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_chart_title.svg.png
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_complex_radar_chart.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_complex_radar_chart.svg.png
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_custom_odometer_chart.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_custom_odometer_chart.svg.png
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_custom_palette.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_custom_palette.svg.png
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_dataset_average.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_dataset_average.svg.png
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_dataset_numeric.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_dataset_numeric.svg.png
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_driver_flash.swf b/include/ezcomponents/Graph/docs/img/tutorial_driver_flash.swf
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_driver_gd.jpg b/include/ezcomponents/Graph/docs/img/tutorial_driver_gd.jpg
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_driver_svg.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_driver_svg.svg.png
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_legend_options.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_legend_options.svg.png
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_line_chart.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_line_chart.svg.png
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_line_chart_3d.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_line_chart_3d.svg.png
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_line_chart_additional_axis.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_line_chart_additional_axis.svg.png
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_line_chart_markers.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_line_chart_markers.svg.png
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_modified_palette.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_modified_palette.svg.png
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_odometer_chart.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_odometer_chart.svg.png
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_pie_chart_3d.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_pie_chart_3d.svg.png
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_pie_chart_options.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_pie_chart_options.svg.png
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_pie_chart_pimped.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_pie_chart_pimped.svg.png
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_pie_options.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_pie_options.svg.png
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_radar_chart.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_radar_chart.svg.png
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_reference_gd.html b/include/ezcomponents/Graph/docs/img/tutorial_reference_gd.html
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_reference_gd.png b/include/ezcomponents/Graph/docs/img/tutorial_reference_gd.png
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_reference_svg.svg b/include/ezcomponents/Graph/docs/img/tutorial_reference_svg.svg
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_renderer_3d.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_renderer_3d.svg.png
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_rotated_labels.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_rotated_labels.svg.png
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_simple_pie.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_simple_pie.svg.png
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_stacked_bar_chart.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_stacked_bar_chart.svg.png
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_user_palette.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_user_palette.svg.png
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/tutorial.txt b/include/ezcomponents/Graph/docs/tutorial.txt
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/tutorial/ez.png b/include/ezcomponents/Graph/docs/tutorial/ez.png
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/tutorial/template.svg b/include/ezcomponents/Graph/docs/tutorial/template.svg
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_autoload.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_axis_datetime.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_axis_datetime.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_axis_labeled.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_axis_labeled.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_axis_numeric.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_axis_numeric.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_bar_chart.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_bar_chart.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_bar_chart_3d.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_bar_chart_3d.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_bar_chart_options.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_bar_chart_options.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_bar_line_chart.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_bar_line_chart.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_bar_options.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_bar_options.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_chart_background.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_chart_background.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_chart_legend.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_chart_legend.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_chart_title.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_chart_title.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_complex_radar_chart.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_complex_radar_chart.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_custom_odometer_chart.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_custom_odometer_chart.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_custom_palette.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_custom_palette.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_custom_palette_palette.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_custom_palette_palette.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_dataset_average.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_dataset_average.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_dataset_numeric.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_dataset_numeric.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_driver_cairo.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_driver_cairo.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_driver_flash.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_driver_flash.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_driver_gd.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_driver_gd.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_driver_svg.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_driver_svg.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_font.fdb b/include/ezcomponents/Graph/docs/tutorial/tutorial_font.fdb
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_font.pfb b/include/ezcomponents/Graph/docs/tutorial/tutorial_font.pfb
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_font.ttf b/include/ezcomponents/Graph/docs/tutorial/tutorial_font.ttf
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_legend_options.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_legend_options.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_line_chart.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_line_chart.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_line_chart_3d.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_line_chart_3d.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_line_chart_additional_axis.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_line_chart_additional_axis.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_line_chart_markers.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_line_chart_markers.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_modified_palette.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_modified_palette.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_odometer_chart.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_odometer_chart.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_output.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_output.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_pie_chart_3d.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_pie_chart_3d.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_pie_chart_options.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_pie_chart_options.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_pie_chart_pimped.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_pie_chart_pimped.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_pie_options.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_pie_options.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_radar_chart.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_radar_chart.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_reference_gd.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_reference_gd.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_reference_svg.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_reference_svg.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_renderer_3d.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_renderer_3d.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_rotated_labels.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_rotated_labels.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_simple_pie.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_simple_pie.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_stacked_bar_chart.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_stacked_bar_chart.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_user_palette.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_user_palette.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_wikipedia_data.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_wikipedia_data.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/axis/container.php b/include/ezcomponents/Graph/src/axis/container.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/axis/date.php b/include/ezcomponents/Graph/src/axis/date.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/axis/labeled.php b/include/ezcomponents/Graph/src/axis/labeled.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/axis/logarithmic.php b/include/ezcomponents/Graph/src/axis/logarithmic.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/axis/numeric.php b/include/ezcomponents/Graph/src/axis/numeric.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/charts/bar.php b/include/ezcomponents/Graph/src/charts/bar.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/charts/line.php b/include/ezcomponents/Graph/src/charts/line.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/charts/odometer.php b/include/ezcomponents/Graph/src/charts/odometer.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/charts/pie.php b/include/ezcomponents/Graph/src/charts/pie.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/charts/radar.php b/include/ezcomponents/Graph/src/charts/radar.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/colors/color.php b/include/ezcomponents/Graph/src/colors/color.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/colors/linear_gradient.php b/include/ezcomponents/Graph/src/colors/linear_gradient.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/colors/radial_gradient.php b/include/ezcomponents/Graph/src/colors/radial_gradient.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/data_container/base.php b/include/ezcomponents/Graph/src/data_container/base.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/data_container/single.php b/include/ezcomponents/Graph/src/data_container/single.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/datasets/array.php b/include/ezcomponents/Graph/src/datasets/array.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/datasets/average.php b/include/ezcomponents/Graph/src/datasets/average.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/datasets/base.php b/include/ezcomponents/Graph/src/datasets/base.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/datasets/numeric.php b/include/ezcomponents/Graph/src/datasets/numeric.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/datasets/property/axis.php b/include/ezcomponents/Graph/src/datasets/property/axis.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/datasets/property/boolean.php b/include/ezcomponents/Graph/src/datasets/property/boolean.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/datasets/property/color.php b/include/ezcomponents/Graph/src/datasets/property/color.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/datasets/property/integer.php b/include/ezcomponents/Graph/src/datasets/property/integer.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/datasets/property/string.php b/include/ezcomponents/Graph/src/datasets/property/string.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/driver/cairo.php b/include/ezcomponents/Graph/src/driver/cairo.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/driver/flash.php b/include/ezcomponents/Graph/src/driver/flash.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/driver/gd.php b/include/ezcomponents/Graph/src/driver/gd.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/driver/svg.php b/include/ezcomponents/Graph/src/driver/svg.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/driver/svg_font.php b/include/ezcomponents/Graph/src/driver/svg_font.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/driver/verbose.php b/include/ezcomponents/Graph/src/driver/verbose.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/element/axis.php b/include/ezcomponents/Graph/src/element/axis.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/element/background.php b/include/ezcomponents/Graph/src/element/background.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/element/legend.php b/include/ezcomponents/Graph/src/element/legend.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/element/text.php b/include/ezcomponents/Graph/src/element/text.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/exceptions/date_parsing.php b/include/ezcomponents/Graph/src/exceptions/date_parsing.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/exceptions/exception.php b/include/ezcomponents/Graph/src/exceptions/exception.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/exceptions/flash_bitmap_type.php b/include/ezcomponents/Graph/src/exceptions/flash_bitmap_type.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/exceptions/font_rendering.php b/include/ezcomponents/Graph/src/exceptions/font_rendering.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/exceptions/font_type.php b/include/ezcomponents/Graph/src/exceptions/font_type.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/exceptions/incompatible_driver.php b/include/ezcomponents/Graph/src/exceptions/incompatible_driver.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/exceptions/invalid_assignement.php b/include/ezcomponents/Graph/src/exceptions/invalid_assignement.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/exceptions/invalid_data.php b/include/ezcomponents/Graph/src/exceptions/invalid_data.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/exceptions/invalid_data_source.php b/include/ezcomponents/Graph/src/exceptions/invalid_data_source.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/exceptions/invalid_dimensions.php b/include/ezcomponents/Graph/src/exceptions/invalid_dimensions.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/exceptions/invalid_display_type.php b/include/ezcomponents/Graph/src/exceptions/invalid_display_type.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/exceptions/invalid_id.php b/include/ezcomponents/Graph/src/exceptions/invalid_id.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/exceptions/invalid_image_file.php b/include/ezcomponents/Graph/src/exceptions/invalid_image_file.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/exceptions/invalid_keys.php b/include/ezcomponents/Graph/src/exceptions/invalid_keys.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/exceptions/no_data.php b/include/ezcomponents/Graph/src/exceptions/no_data.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/exceptions/no_such_data.php b/include/ezcomponents/Graph/src/exceptions/no_such_data.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/exceptions/no_such_dataset.php b/include/ezcomponents/Graph/src/exceptions/no_such_dataset.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/exceptions/no_such_element.php b/include/ezcomponents/Graph/src/exceptions/no_such_element.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/exceptions/not_rendered.php b/include/ezcomponents/Graph/src/exceptions/not_rendered.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/exceptions/out_of_boundings.php b/include/ezcomponents/Graph/src/exceptions/out_of_boundings.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/exceptions/out_of_logarithmical_boundings.php b/include/ezcomponents/Graph/src/exceptions/out_of_logarithmical_boundings.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/exceptions/reducement_failed.php b/include/ezcomponents/Graph/src/exceptions/reducement_failed.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/exceptions/too_many_datasets.php b/include/ezcomponents/Graph/src/exceptions/too_many_datasets.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/exceptions/unknown_color_definition.php b/include/ezcomponents/Graph/src/exceptions/unknown_color_definition.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/exceptions/unregular_steps.php b/include/ezcomponents/Graph/src/exceptions/unregular_steps.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/exceptions/unsupported_image_type.php b/include/ezcomponents/Graph/src/exceptions/unsupported_image_type.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/graph.php b/include/ezcomponents/Graph/src/graph.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/interfaces/axis_label_renderer.php b/include/ezcomponents/Graph/src/interfaces/axis_label_renderer.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/interfaces/chart.php b/include/ezcomponents/Graph/src/interfaces/chart.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/interfaces/dataset_property.php b/include/ezcomponents/Graph/src/interfaces/dataset_property.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/interfaces/driver.php b/include/ezcomponents/Graph/src/interfaces/driver.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/interfaces/element.php b/include/ezcomponents/Graph/src/interfaces/element.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/interfaces/odometer_renderer.php b/include/ezcomponents/Graph/src/interfaces/odometer_renderer.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/interfaces/palette.php b/include/ezcomponents/Graph/src/interfaces/palette.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/interfaces/radar_renderer.php b/include/ezcomponents/Graph/src/interfaces/radar_renderer.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/interfaces/renderer.php b/include/ezcomponents/Graph/src/interfaces/renderer.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/interfaces/stacked_bar_renderer.php b/include/ezcomponents/Graph/src/interfaces/stacked_bar_renderer.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/math/boundings.php b/include/ezcomponents/Graph/src/math/boundings.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/math/matrix.php b/include/ezcomponents/Graph/src/math/matrix.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/math/polynom.php b/include/ezcomponents/Graph/src/math/polynom.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/math/rotation.php b/include/ezcomponents/Graph/src/math/rotation.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/math/transformation.php b/include/ezcomponents/Graph/src/math/transformation.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/math/translation.php b/include/ezcomponents/Graph/src/math/translation.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/math/vector.php b/include/ezcomponents/Graph/src/math/vector.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/options/cairo_driver.php b/include/ezcomponents/Graph/src/options/cairo_driver.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/options/chart.php b/include/ezcomponents/Graph/src/options/chart.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/options/driver.php b/include/ezcomponents/Graph/src/options/driver.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/options/flash_driver.php b/include/ezcomponents/Graph/src/options/flash_driver.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/options/font.php b/include/ezcomponents/Graph/src/options/font.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/options/gd_driver.php b/include/ezcomponents/Graph/src/options/gd_driver.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/options/line_chart.php b/include/ezcomponents/Graph/src/options/line_chart.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/options/odometer_chart.php b/include/ezcomponents/Graph/src/options/odometer_chart.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/options/pie_chart.php b/include/ezcomponents/Graph/src/options/pie_chart.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/options/radar_chart.php b/include/ezcomponents/Graph/src/options/radar_chart.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/options/renderer.php b/include/ezcomponents/Graph/src/options/renderer.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/options/renderer_2d.php b/include/ezcomponents/Graph/src/options/renderer_2d.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/options/renderer_3d.php b/include/ezcomponents/Graph/src/options/renderer_3d.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/options/svg_driver.php b/include/ezcomponents/Graph/src/options/svg_driver.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/palette/black.php b/include/ezcomponents/Graph/src/palette/black.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/palette/ez.php b/include/ezcomponents/Graph/src/palette/ez.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/palette/ez_blue.php b/include/ezcomponents/Graph/src/palette/ez_blue.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/palette/ez_green.php b/include/ezcomponents/Graph/src/palette/ez_green.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/palette/ez_red.php b/include/ezcomponents/Graph/src/palette/ez_red.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/palette/tango.php b/include/ezcomponents/Graph/src/palette/tango.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/renderer/2d.php b/include/ezcomponents/Graph/src/renderer/2d.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/renderer/3d.php b/include/ezcomponents/Graph/src/renderer/3d.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/renderer/axis_label_boxed.php b/include/ezcomponents/Graph/src/renderer/axis_label_boxed.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/renderer/axis_label_centered.php b/include/ezcomponents/Graph/src/renderer/axis_label_centered.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/renderer/axis_label_exact.php b/include/ezcomponents/Graph/src/renderer/axis_label_exact.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/renderer/axis_label_none.php b/include/ezcomponents/Graph/src/renderer/axis_label_none.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/renderer/axis_label_radar.php b/include/ezcomponents/Graph/src/renderer/axis_label_radar.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/renderer/axis_label_rotated.php b/include/ezcomponents/Graph/src/renderer/axis_label_rotated.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/structs/context.php b/include/ezcomponents/Graph/src/structs/context.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/structs/coordinate.php b/include/ezcomponents/Graph/src/structs/coordinate.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/structs/step.php b/include/ezcomponents/Graph/src/structs/step.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/Graph/src/tools.php b/include/ezcomponents/Graph/src/tools.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/GraphDatabaseTiein/CREDITS b/include/ezcomponents/GraphDatabaseTiein/CREDITS
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/GraphDatabaseTiein/ChangeLog b/include/ezcomponents/GraphDatabaseTiein/ChangeLog
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/GraphDatabaseTiein/DEPS b/include/ezcomponents/GraphDatabaseTiein/DEPS
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/GraphDatabaseTiein/DESCRIPTION b/include/ezcomponents/GraphDatabaseTiein/DESCRIPTION
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/GraphDatabaseTiein/TODO b/include/ezcomponents/GraphDatabaseTiein/TODO
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/GraphDatabaseTiein/design/class_diagram.png b/include/ezcomponents/GraphDatabaseTiein/design/class_diagram.png
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/GraphDatabaseTiein/design/design.txt b/include/ezcomponents/GraphDatabaseTiein/design/design.txt
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/GraphDatabaseTiein/docs/img/tutorial_multiple.svg.png b/include/ezcomponents/GraphDatabaseTiein/docs/img/tutorial_multiple.svg.png
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/GraphDatabaseTiein/docs/img/tutorial_simple.svg.png b/include/ezcomponents/GraphDatabaseTiein/docs/img/tutorial_simple.svg.png
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/GraphDatabaseTiein/docs/img/tutorial_single.svg.png b/include/ezcomponents/GraphDatabaseTiein/docs/img/tutorial_single.svg.png
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/GraphDatabaseTiein/docs/tutorial.txt b/include/ezcomponents/GraphDatabaseTiein/docs/tutorial.txt
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/GraphDatabaseTiein/docs/tutorial/tutorial_autoload.php b/include/ezcomponents/GraphDatabaseTiein/docs/tutorial/tutorial_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/GraphDatabaseTiein/docs/tutorial/tutorial_insert_data.php b/include/ezcomponents/GraphDatabaseTiein/docs/tutorial/tutorial_insert_data.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/GraphDatabaseTiein/docs/tutorial/tutorial_multiple.php b/include/ezcomponents/GraphDatabaseTiein/docs/tutorial/tutorial_multiple.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/GraphDatabaseTiein/docs/tutorial/tutorial_simple.php b/include/ezcomponents/GraphDatabaseTiein/docs/tutorial/tutorial_simple.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/GraphDatabaseTiein/docs/tutorial/tutorial_single.php b/include/ezcomponents/GraphDatabaseTiein/docs/tutorial/tutorial_single.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/GraphDatabaseTiein/src/dataset.php b/include/ezcomponents/GraphDatabaseTiein/src/dataset.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/GraphDatabaseTiein/src/exceptions/exception.php b/include/ezcomponents/GraphDatabaseTiein/src/exceptions/exception.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/GraphDatabaseTiein/src/exceptions/missing_column.php b/include/ezcomponents/GraphDatabaseTiein/src/exceptions/missing_column.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/GraphDatabaseTiein/src/exceptions/statement_not_executed.php b/include/ezcomponents/GraphDatabaseTiein/src/exceptions/statement_not_executed.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/GraphDatabaseTiein/src/exceptions/too_many_columns.php b/include/ezcomponents/GraphDatabaseTiein/src/exceptions/too_many_columns.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/GraphDatabaseTiein/tests/dataset_pdo_test.php b/include/ezcomponents/GraphDatabaseTiein/tests/dataset_pdo_test.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/GraphDatabaseTiein/tests/suite.php b/include/ezcomponents/GraphDatabaseTiein/tests/suite.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageAnalysis/CREDITS b/include/ezcomponents/ImageAnalysis/CREDITS
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageAnalysis/ChangeLog b/include/ezcomponents/ImageAnalysis/ChangeLog
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageAnalysis/DESCRIPTION b/include/ezcomponents/ImageAnalysis/DESCRIPTION
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageAnalysis/design/class_diagram.png b/include/ezcomponents/ImageAnalysis/design/class_diagram.png
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageAnalysis/design/imageanalysis.png b/include/ezcomponents/ImageAnalysis/design/imageanalysis.png
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageAnalysis/design/imageanalysis.xml b/include/ezcomponents/ImageAnalysis/design/imageanalysis.xml
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageAnalysis/docs/example.php b/include/ezcomponents/ImageAnalysis/docs/example.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageAnalysis/docs/img/imageanalysis_example_01.jpg b/include/ezcomponents/ImageAnalysis/docs/img/imageanalysis_example_01.jpg
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageAnalysis/docs/img/imageanalysis_example_02.jpg b/include/ezcomponents/ImageAnalysis/docs/img/imageanalysis_example_02.jpg
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageAnalysis/docs/img/imageanalysis_example_03.jpg b/include/ezcomponents/ImageAnalysis/docs/img/imageanalysis_example_03.jpg
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageAnalysis/docs/toby.jpg b/include/ezcomponents/ImageAnalysis/docs/toby.jpg
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageAnalysis/docs/tutorial.txt b/include/ezcomponents/ImageAnalysis/docs/tutorial.txt
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageAnalysis/docs/tutorial_autoload.php b/include/ezcomponents/ImageAnalysis/docs/tutorial_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageAnalysis/docs/tutorial_example_01.php b/include/ezcomponents/ImageAnalysis/docs/tutorial_example_01.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageAnalysis/docs/tutorial_example_02.php b/include/ezcomponents/ImageAnalysis/docs/tutorial_example_02.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageAnalysis/docs/tutorial_example_03.php b/include/ezcomponents/ImageAnalysis/docs/tutorial_example_03.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageAnalysis/src/analyzer.php b/include/ezcomponents/ImageAnalysis/src/analyzer.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageAnalysis/src/exceptions/exception.php b/include/ezcomponents/ImageAnalysis/src/exceptions/exception.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageAnalysis/src/exceptions/file_not_processable.php b/include/ezcomponents/ImageAnalysis/src/exceptions/file_not_processable.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageAnalysis/src/exceptions/invalid_handler.php b/include/ezcomponents/ImageAnalysis/src/exceptions/invalid_handler.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageAnalysis/src/handlers/imagemagick.php b/include/ezcomponents/ImageAnalysis/src/handlers/imagemagick.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageAnalysis/src/handlers/php.php b/include/ezcomponents/ImageAnalysis/src/handlers/php.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageAnalysis/src/interfaces/handler.php b/include/ezcomponents/ImageAnalysis/src/interfaces/handler.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageAnalysis/src/structs/analyzer_data.php b/include/ezcomponents/ImageAnalysis/src/structs/analyzer_data.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageAnalysis/tests/analyzer_test.php b/include/ezcomponents/ImageAnalysis/tests/analyzer_test.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageAnalysis/tests/data/gif_animated.gif b/include/ezcomponents/ImageAnalysis/tests/data/gif_animated.gif
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageAnalysis/tests/data/gif_nonanimated.gif b/include/ezcomponents/ImageAnalysis/tests/data/gif_nonanimated.gif
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageAnalysis/tests/data/jpeg_exif.jpg b/include/ezcomponents/ImageAnalysis/tests/data/jpeg_exif.jpg
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageAnalysis/tests/data/jpeg_noexif.jpg b/include/ezcomponents/ImageAnalysis/tests/data/jpeg_noexif.jpg
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageAnalysis/tests/data/png_nonanimated.png b/include/ezcomponents/ImageAnalysis/tests/data/png_nonanimated.png
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageAnalysis/tests/data/svg.svg b/include/ezcomponents/ImageAnalysis/tests/data/svg.svg
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageAnalysis/tests/data/tiff_exif.tiff b/include/ezcomponents/ImageAnalysis/tests/data/tiff_exif.tiff
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageAnalysis/tests/data/tiff_noexif.tiff b/include/ezcomponents/ImageAnalysis/tests/data/tiff_noexif.tiff
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageAnalysis/tests/suite.php b/include/ezcomponents/ImageAnalysis/tests/suite.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/CREDITS b/include/ezcomponents/ImageConversion/CREDITS
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/ChangeLog b/include/ezcomponents/ImageConversion/ChangeLog
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/DEPS b/include/ezcomponents/ImageConversion/DEPS
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/DESCRIPTION b/include/ezcomponents/ImageConversion/DESCRIPTION
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/TODO b/include/ezcomponents/ImageConversion/TODO
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/design/class_diagram.png b/include/ezcomponents/ImageConversion/design/class_diagram.png
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/design/design.htm b/include/ezcomponents/ImageConversion/design/design.htm
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/design/design.txt b/include/ezcomponents/ImageConversion/design/design.txt
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/design/image.png b/include/ezcomponents/ImageConversion/design/image.png
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/design/image.xml b/include/ezcomponents/ImageConversion/design/image.xml
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/design/image_exceptions.png b/include/ezcomponents/ImageConversion/design/image_exceptions.png
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/design/image_filters.png b/include/ezcomponents/ImageConversion/design/image_filters.png
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/docs/example_general.php b/include/ezcomponents/ImageConversion/docs/example_general.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/docs/example_singleton.php b/include/ezcomponents/ImageConversion/docs/example_singleton.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/docs/img/imageconversion_example_01_after.jpg b/include/ezcomponents/ImageConversion/docs/img/imageconversion_example_01_after.jpg
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/docs/img/imageconversion_example_01_before.bmp b/include/ezcomponents/ImageConversion/docs/img/imageconversion_example_01_before.bmp
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/docs/img/imageconversion_example_02_after.jpg b/include/ezcomponents/ImageConversion/docs/img/imageconversion_example_02_after.jpg
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/docs/img/imageconversion_example_02_before.jpg b/include/ezcomponents/ImageConversion/docs/img/imageconversion_example_02_before.jpg
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/docs/img/imageconversion_example_03_after.jpg b/include/ezcomponents/ImageConversion/docs/img/imageconversion_example_03_after.jpg
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/docs/img/imageconversion_example_03_before.jpg b/include/ezcomponents/ImageConversion/docs/img/imageconversion_example_03_before.jpg
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/docs/img/imageconversion_example_04_after.jpg b/include/ezcomponents/ImageConversion/docs/img/imageconversion_example_04_after.jpg
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/docs/img/imageconversion_example_04_before.jpg b/include/ezcomponents/ImageConversion/docs/img/imageconversion_example_04_before.jpg
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/docs/img/imageconversion_example_05_after.jpg b/include/ezcomponents/ImageConversion/docs/img/imageconversion_example_05_after.jpg
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/docs/img/imageconversion_example_05_before.jpg b/include/ezcomponents/ImageConversion/docs/img/imageconversion_example_05_before.jpg
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/docs/img/watermark.png b/include/ezcomponents/ImageConversion/docs/img/watermark.png
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/docs/jpeg.jpg b/include/ezcomponents/ImageConversion/docs/jpeg.jpg
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/docs/tutorial.txt b/include/ezcomponents/ImageConversion/docs/tutorial.txt
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/docs/tutorial_autoload.php b/include/ezcomponents/ImageConversion/docs/tutorial_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/docs/tutorial_example_01_simpleconvert.php b/include/ezcomponents/ImageConversion/docs/tutorial_example_01_simpleconvert.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/docs/tutorial_example_02_simpletrans.php b/include/ezcomponents/ImageConversion/docs/tutorial_example_02_simpletrans.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/docs/tutorial_example_03_complextrans.php b/include/ezcomponents/ImageConversion/docs/tutorial_example_03_complextrans.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/docs/tutorial_example_04_watermark.php b/include/ezcomponents/ImageConversion/docs/tutorial_example_04_watermark.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/docs/tutorial_example_05_thumbnail.php b/include/ezcomponents/ImageConversion/docs/tutorial_example_05_thumbnail.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/review-1.3.4.txt b/include/ezcomponents/ImageConversion/review-1.3.4.txt
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/src/converter.php b/include/ezcomponents/ImageConversion/src/converter.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/src/exceptions/exception.php b/include/ezcomponents/ImageConversion/src/exceptions/exception.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/src/exceptions/file_name_invalid.php b/include/ezcomponents/ImageConversion/src/exceptions/file_name_invalid.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/src/exceptions/file_not_processable.php b/include/ezcomponents/ImageConversion/src/exceptions/file_not_processable.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/src/exceptions/filter_failed.php b/include/ezcomponents/ImageConversion/src/exceptions/filter_failed.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/src/exceptions/filter_not_available.php b/include/ezcomponents/ImageConversion/src/exceptions/filter_not_available.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/src/exceptions/handler_not_available.php b/include/ezcomponents/ImageConversion/src/exceptions/handler_not_available.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/src/exceptions/handler_settings_invalid.php b/include/ezcomponents/ImageConversion/src/exceptions/handler_settings_invalid.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/src/exceptions/invalid_filter_parameter.php b/include/ezcomponents/ImageConversion/src/exceptions/invalid_filter_parameter.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/src/exceptions/invalid_reference.php b/include/ezcomponents/ImageConversion/src/exceptions/invalid_reference.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/src/exceptions/mime_type_unsupported.php b/include/ezcomponents/ImageConversion/src/exceptions/mime_type_unsupported.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/src/exceptions/missing_filter_parameter.php b/include/ezcomponents/ImageConversion/src/exceptions/missing_filter_parameter.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/src/exceptions/transformation.php b/include/ezcomponents/ImageConversion/src/exceptions/transformation.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/src/exceptions/transformation_already_exists.php b/include/ezcomponents/ImageConversion/src/exceptions/transformation_already_exists.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/src/exceptions/transformation_not_available.php b/include/ezcomponents/ImageConversion/src/exceptions/transformation_not_available.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/src/handlers/gd.php b/include/ezcomponents/ImageConversion/src/handlers/gd.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/src/handlers/gd_base.php b/include/ezcomponents/ImageConversion/src/handlers/gd_base.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/src/handlers/imagemagick.php b/include/ezcomponents/ImageConversion/src/handlers/imagemagick.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/src/handlers/imagemagick_base.php b/include/ezcomponents/ImageConversion/src/handlers/imagemagick_base.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/src/interfaces/colorspace.php b/include/ezcomponents/ImageConversion/src/interfaces/colorspace.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/src/interfaces/effect.php b/include/ezcomponents/ImageConversion/src/interfaces/effect.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/src/interfaces/geometry.php b/include/ezcomponents/ImageConversion/src/interfaces/geometry.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/src/interfaces/handler.php b/include/ezcomponents/ImageConversion/src/interfaces/handler.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/src/interfaces/methodcall_handler.php b/include/ezcomponents/ImageConversion/src/interfaces/methodcall_handler.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/src/interfaces/thumbnail.php b/include/ezcomponents/ImageConversion/src/interfaces/thumbnail.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/src/interfaces/watermark.php b/include/ezcomponents/ImageConversion/src/interfaces/watermark.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/src/options/save_options.php b/include/ezcomponents/ImageConversion/src/options/save_options.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/src/structs/converter_settings.php b/include/ezcomponents/ImageConversion/src/structs/converter_settings.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/src/structs/filter.php b/include/ezcomponents/ImageConversion/src/structs/filter.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/src/structs/handler_settings.php b/include/ezcomponents/ImageConversion/src/structs/handler_settings.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/src/transformation.php b/include/ezcomponents/ImageConversion/src/transformation.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/converter_test.php b/include/ezcomponents/ImageConversion/tests/converter_test.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionConverterTest_testApplyFilterSuccessColorspace b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionConverterTest_testApplyFilterSuccessColorspace
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionConverterTest_testApplyFilterSuccessColorspaceDefinedHandler b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionConverterTest_testApplyFilterSuccessColorspaceDefinedHandler
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionConverterTest_testApplyFilterSuccessScale b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionConverterTest_testApplyFilterSuccessScale
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testColorspaceGrey b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testColorspaceGrey
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testColorspaceMonochrome b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testColorspaceMonochrome
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testColorspaceSepia b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testColorspaceSepia
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCropNegativeOffset_1 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCropNegativeOffset_1
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCropNegativeOffset_2 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCropNegativeOffset_2
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCropNegativeOffset_3 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCropNegativeOffset_3
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCropThumbnailHorizontal b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCropThumbnailHorizontal
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCropThumbnailVertical b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCropThumbnailVertical
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCropTransparent b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCropTransparent
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCrop_0_Offset b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCrop_0_Offset
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCrop_1 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCrop_1
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCrop_2 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCrop_2
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCrop_3 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCrop_3
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCrop_4 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCrop_4
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testFillThumbnailHorizontal b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testFillThumbnailHorizontal
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testFillThumbnailTooLargeColorArray b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testFillThumbnailTooLargeColorArray
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testFillThumbnailVertical b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testFillThumbnailVertical
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testScaleTransparent b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testScaleTransparent
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testWatermarkAbsoluteNoScale b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testWatermarkAbsoluteNoScale
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testWatermarkAbsoluteScale b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testWatermarkAbsoluteScale
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testWatermarkPercentNoScale b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testWatermarkPercentNoScale
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testWatermarkPercentScale b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testWatermarkPercentScale
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testBorder_2 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testBorder_2
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testBorder_5 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testBorder_5
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testColorspaceGrey b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testColorspaceGrey
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testColorspaceMonochrome b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testColorspaceMonochrome
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testColorspaceSepia b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testColorspaceSepia
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCropNegativeOffset_1 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCropNegativeOffset_1
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCropNegativeOffset_2 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCropNegativeOffset_2
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCropNegativeOffset_3 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCropNegativeOffset_3
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCropThumbnailHorizontal b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCropThumbnailHorizontal
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCropThumbnailVertical b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCropThumbnailVertical
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCrop_0_Offset b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCrop_0_Offset
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCrop_1 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCrop_1
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCrop_2 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCrop_2
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCrop_3 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCrop_3
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testFillThumbnailHorizontal b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testFillThumbnailHorizontal
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testFillThumbnailTooLargeColorArray b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testFillThumbnailTooLargeColorArray
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testFillThumbnailVertical b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testFillThumbnailVertical
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testNoiseGaussian b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testNoiseGaussian
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testNoiseImpulse b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testNoiseImpulse
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testNoiseLaplacian b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testNoiseLaplacian
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testNoiseMultiplicative b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testNoiseMultiplicative
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testNoisePoisson b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testNoisePoisson
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testNoiseUniform b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testNoiseUniform
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScale b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScale
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleDown_do b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleDown_do
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleDown_dont b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleDown_dont
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleExact_1 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleExact_1
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleExact_2 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleExact_2
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleExact_3 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleExact_3
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleHeightDown_1 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleHeightDown_1
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleHeightDown_2 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleHeightDown_2
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleHeightUp_1 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleHeightUp_1
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleHeightUp_2 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleHeightUp_2
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScalePercent_1 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScalePercent_1
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScalePercent_2 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScalePercent_2
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleUp_do b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleUp_do
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleUp_dont b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleUp_dont
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleWidthBoth b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleWidthBoth
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleWidthDown_1 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleWidthDown_1
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleWidthDown_2 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleWidthDown_2
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleWidthUp_1 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleWidthUp_1
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleWidthUp_2 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleWidthUp_2
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testSwirl_10 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testSwirl_10
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testSwirl_100 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testSwirl_100
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testSwirl_50 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testSwirl_50
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testWatermarkAbsoluteNoScale b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testWatermarkAbsoluteNoScale
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testWatermarkAbsoluteScale b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testWatermarkAbsoluteScale
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testWatermarkPercentNoScale b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testWatermarkPercentNoScale
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testWatermarkPercentScale b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testWatermarkPercentScale
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerGdTest_testApplyFilterMultiple b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerGdTest_testApplyFilterMultiple
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerGdTest_testApplyFilterSingle b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerGdTest_testApplyFilterSingle
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerGdTest_testConvertTransparentNonTransparent b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerGdTest_testConvertTransparentNonTransparent
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerGdTest_testSaveNewfileConvert b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerGdTest_testSaveNewfileConvert
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerGdTest_testSaveNewfileNoconvert b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerGdTest_testSaveNewfileNoconvert
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerGdTest_testSaveOldfileNoconvert b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerGdTest_testSaveOldfileNoconvert
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerShellTest_testApplyFilterMultiple b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerShellTest_testApplyFilterMultiple
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerShellTest_testApplyFilterSingle b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerShellTest_testApplyFilterSingle
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerShellTest_testConvertTransparentNonTransparent b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerShellTest_testConvertTransparentNonTransparent
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerTest_testSaveIllegalFileNameFailure b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerTest_testSaveIllegalFileNameFailure
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerTest_testSaveNewfileConvert b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerTest_testSaveNewfileConvert
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerTest_testSaveNewfileNoconvert b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerTest_testSaveNewfileNoconvert
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerTest_testSaveOldfileNoconvert b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerTest_testSaveOldfileNoconvert
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testMultiTransformjpeg b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testMultiTransformjpeg
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testMultiTransformpng b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testMultiTransformpng
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessGifAnimated b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessGifAnimated
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessGif_1 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessGif_1
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessGif_2 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessGif_2
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessGif_3 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessGif_3
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessJpeg_1 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessJpeg_1
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessJpeg_2 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessJpeg_2
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessJpeg_3 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessJpeg_3
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessPng_1 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessPng_1
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessPng_2 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessPng_2
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessPng_3 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessPng_3
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessPng_4 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessPng_4
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformationChangingHandlersForFilters b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformationChangingHandlersForFilters
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/gif_animated.gif b/include/ezcomponents/ImageConversion/tests/data/gif_animated.gif
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/gif_nonanimated.gif b/include/ezcomponents/ImageConversion/tests/data/gif_nonanimated.gif
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/jpeg.jpg b/include/ezcomponents/ImageConversion/tests/data/jpeg.jpg
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/png.png b/include/ezcomponents/ImageConversion/tests/data/png.png
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/png_transparent.png b/include/ezcomponents/ImageConversion/tests/data/png_transparent.png
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/text.txt b/include/ezcomponents/ImageConversion/tests/data/text.txt
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/watermark.png b/include/ezcomponents/ImageConversion/tests/data/watermark.png
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/data/xpm.xpm b/include/ezcomponents/ImageConversion/tests/data/xpm.xpm
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/filtersgd_test.php b/include/ezcomponents/ImageConversion/tests/filtersgd_test.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/filtersshell_test.php b/include/ezcomponents/ImageConversion/tests/filtersshell_test.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/handler_test.php b/include/ezcomponents/ImageConversion/tests/handler_test.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/handlergd_test.php b/include/ezcomponents/ImageConversion/tests/handlergd_test.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/handlershell_test.php b/include/ezcomponents/ImageConversion/tests/handlershell_test.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/save_options_test.php b/include/ezcomponents/ImageConversion/tests/save_options_test.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/suite.php b/include/ezcomponents/ImageConversion/tests/suite.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/test_case.php b/include/ezcomponents/ImageConversion/tests/test_case.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/ImageConversion/tests/transformation_test.php b/include/ezcomponents/ImageConversion/tests/transformation_test.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/LICENSE b/include/ezcomponents/LICENSE
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/autoload/archive_autoload.php b/include/ezcomponents/autoload/archive_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/autoload/authentication_autoload.php b/include/ezcomponents/autoload/authentication_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/autoload/authentication_database_autoload.php b/include/ezcomponents/autoload/authentication_database_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/autoload/authentication_openid_autoload.php b/include/ezcomponents/autoload/authentication_openid_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/autoload/base_autoload.php b/include/ezcomponents/autoload/base_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/autoload/cache_autoload.php b/include/ezcomponents/autoload/cache_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/autoload/configuration_autoload.php b/include/ezcomponents/autoload/configuration_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/autoload/console_autoload.php b/include/ezcomponents/autoload/console_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/autoload/db_autoload.php b/include/ezcomponents/autoload/db_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/autoload/db_schema_autoload.php b/include/ezcomponents/autoload/db_schema_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/autoload/debug_autoload.php b/include/ezcomponents/autoload/debug_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/autoload/document_autoload.php b/include/ezcomponents/autoload/document_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/autoload/execution_autoload.php b/include/ezcomponents/autoload/execution_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/autoload/feed_autoload.php b/include/ezcomponents/autoload/feed_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/autoload/file_autoload.php b/include/ezcomponents/autoload/file_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/autoload/graph_autoload.php b/include/ezcomponents/autoload/graph_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/autoload/graph_database_autoload.php b/include/ezcomponents/autoload/graph_database_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/autoload/image_analyzer_autoload.php b/include/ezcomponents/autoload/image_analyzer_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/autoload/image_autoload.php b/include/ezcomponents/autoload/image_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/autoload/input_autoload.php b/include/ezcomponents/autoload/input_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/autoload/log_autoload.php b/include/ezcomponents/autoload/log_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/autoload/log_database_autoload.php b/include/ezcomponents/autoload/log_database_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/autoload/mail_autoload.php b/include/ezcomponents/autoload/mail_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/autoload/persistent_autoload.php b/include/ezcomponents/autoload/persistent_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/autoload/persistent_object_autoload.php b/include/ezcomponents/autoload/persistent_object_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/autoload/php_generator_autoload.php b/include/ezcomponents/autoload/php_generator_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/autoload/query_autoload.php b/include/ezcomponents/autoload/query_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/autoload/search_autoload.php b/include/ezcomponents/autoload/search_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/autoload/signal_autoload.php b/include/ezcomponents/autoload/signal_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/autoload/system_autoload.php b/include/ezcomponents/autoload/system_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/autoload/template_autoload.php b/include/ezcomponents/autoload/template_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/autoload/template_translation_autoload.php b/include/ezcomponents/autoload/template_translation_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/autoload/translation_autoload.php b/include/ezcomponents/autoload/translation_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/autoload/translation_cache_autoload.php b/include/ezcomponents/autoload/translation_cache_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/autoload/tree_autoload.php b/include/ezcomponents/autoload/tree_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/autoload/tree_db_autoload.php b/include/ezcomponents/autoload/tree_db_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/autoload/tree_persistent_autoload.php b/include/ezcomponents/autoload/tree_persistent_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/autoload/url_autoload.php b/include/ezcomponents/autoload/url_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/autoload/webdav_autoload.php b/include/ezcomponents/autoload/webdav_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/autoload/workflow_autoload.php b/include/ezcomponents/autoload/workflow_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/autoload/workflow_database_autoload.php b/include/ezcomponents/autoload/workflow_database_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/autoload/workflow_event_autoload.php b/include/ezcomponents/autoload/workflow_event_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/autoload/workflow_signal_autoload.php b/include/ezcomponents/autoload/workflow_signal_autoload.php
old mode 100644
new mode 100755
diff --git a/include/ezcomponents/descriptions.txt b/include/ezcomponents/descriptions.txt
old mode 100644
new mode 100755
diff --git a/include/fachbereich.class.php b/include/fachbereich.class.php
old mode 100644
new mode 100755
diff --git a/include/feedback.class.php b/include/feedback.class.php
old mode 100644
new mode 100755
diff --git a/include/ferien.class.php b/include/ferien.class.php
old mode 100644
new mode 100755
diff --git a/include/filter.class.php b/include/filter.class.php
old mode 100644
new mode 100755
diff --git a/include/firma.class.php b/include/firma.class.php
old mode 100644
new mode 100755
diff --git a/include/fonts/glyphicons-halflings-regular.eot b/include/fonts/glyphicons-halflings-regular.eot
old mode 100644
new mode 100755
diff --git a/include/fonts/glyphicons-halflings-regular.svg b/include/fonts/glyphicons-halflings-regular.svg
old mode 100644
new mode 100755
diff --git a/include/fonts/glyphicons-halflings-regular.ttf b/include/fonts/glyphicons-halflings-regular.ttf
old mode 100644
new mode 100755
diff --git a/include/fonts/glyphicons-halflings-regular.woff b/include/fonts/glyphicons-halflings-regular.woff
old mode 100644
new mode 100755
diff --git a/include/fotostatus.class.php b/include/fotostatus.class.php
old mode 100644
new mode 100755
diff --git a/include/frage.class.php b/include/frage.class.php
old mode 100644
new mode 100755
diff --git a/include/freebusy.class.php b/include/freebusy.class.php
old mode 100644
new mode 100755
diff --git a/include/functions.inc.php b/include/functions.inc.php
old mode 100644
new mode 100755
diff --git a/include/funktion.class.php b/include/funktion.class.php
old mode 100644
new mode 100755
diff --git a/include/gantt.class.php b/include/gantt.class.php
old mode 100644
new mode 100755
diff --git a/include/gebiet.class.php b/include/gebiet.class.php
old mode 100644
new mode 100755
diff --git a/include/gemeinde.class.php b/include/gemeinde.class.php
old mode 100644
new mode 100755
diff --git a/include/geschaeftsjahr.class.php b/include/geschaeftsjahr.class.php
old mode 100644
new mode 100755
diff --git a/include/geschlecht.class.php b/include/geschlecht.class.php
old mode 100644
new mode 100755
diff --git a/include/globals.inc.php b/include/globals.inc.php
old mode 100644
new mode 100755
diff --git a/include/gruppe.class.php b/include/gruppe.class.php
old mode 100644
new mode 100755
diff --git a/include/gruppemanager.class.php b/include/gruppemanager.class.php
old mode 100644
new mode 100755
diff --git a/include/gsprogramm.class.php b/include/gsprogramm.class.php
old mode 100644
new mode 100755
diff --git a/include/ical.class.php b/include/ical.class.php
old mode 100644
new mode 100755
diff --git a/include/index.html b/include/index.html
old mode 100644
new mode 100755
diff --git a/include/infoscreen.class.php b/include/infoscreen.class.php
old mode 100644
new mode 100755
diff --git a/include/jahresplan.class.php b/include/jahresplan.class.php
old mode 100644
new mode 100755
diff --git a/include/js/JSONeditor/JSONeditor.html b/include/js/JSONeditor/JSONeditor.html
old mode 100644
new mode 100755
diff --git a/include/js/JSONeditor/JSONeditor.js b/include/js/JSONeditor/JSONeditor.js
old mode 100644
new mode 100755
diff --git a/include/js/JSONeditor/treeBuilderImages/Thumbs.db b/include/js/JSONeditor/treeBuilderImages/Thumbs.db
old mode 100644
new mode 100755
diff --git a/include/js/JSONeditor/treeBuilderImages/doc.gif b/include/js/JSONeditor/treeBuilderImages/doc.gif
old mode 100644
new mode 100755
diff --git a/include/js/JSONeditor/treeBuilderImages/docNode.gif b/include/js/JSONeditor/treeBuilderImages/docNode.gif
old mode 100644
new mode 100755
diff --git a/include/js/JSONeditor/treeBuilderImages/docNodeLast.gif b/include/js/JSONeditor/treeBuilderImages/docNodeLast.gif
old mode 100644
new mode 100755
diff --git a/include/js/JSONeditor/treeBuilderImages/docNodeLastFirst.gif b/include/js/JSONeditor/treeBuilderImages/docNodeLastFirst.gif
old mode 100644
new mode 100755
diff --git a/include/js/JSONeditor/treeBuilderImages/folder.gif b/include/js/JSONeditor/treeBuilderImages/folder.gif
old mode 100644
new mode 100755
diff --git a/include/js/JSONeditor/treeBuilderImages/folderNode.gif b/include/js/JSONeditor/treeBuilderImages/folderNode.gif
old mode 100644
new mode 100755
diff --git a/include/js/JSONeditor/treeBuilderImages/folderNodeFirst.gif b/include/js/JSONeditor/treeBuilderImages/folderNodeFirst.gif
old mode 100644
new mode 100755
diff --git a/include/js/JSONeditor/treeBuilderImages/folderNodeLast.gif b/include/js/JSONeditor/treeBuilderImages/folderNodeLast.gif
old mode 100644
new mode 100755
diff --git a/include/js/JSONeditor/treeBuilderImages/folderNodeLastFirst.gif b/include/js/JSONeditor/treeBuilderImages/folderNodeLastFirst.gif
old mode 100644
new mode 100755
diff --git a/include/js/JSONeditor/treeBuilderImages/folderNodeOpen.gif b/include/js/JSONeditor/treeBuilderImages/folderNodeOpen.gif
old mode 100644
new mode 100755
diff --git a/include/js/JSONeditor/treeBuilderImages/folderNodeOpenFirst.gif b/include/js/JSONeditor/treeBuilderImages/folderNodeOpenFirst.gif
old mode 100644
new mode 100755
diff --git a/include/js/JSONeditor/treeBuilderImages/folderNodeOpenLast.gif b/include/js/JSONeditor/treeBuilderImages/folderNodeOpenLast.gif
old mode 100644
new mode 100755
diff --git a/include/js/JSONeditor/treeBuilderImages/folderNodeOpenLastFirst.gif b/include/js/JSONeditor/treeBuilderImages/folderNodeOpenLastFirst.gif
old mode 100644
new mode 100755
diff --git a/include/js/JSONeditor/treeBuilderImages/folderOpen.gif b/include/js/JSONeditor/treeBuilderImages/folderOpen.gif
old mode 100644
new mode 100755
diff --git a/include/js/JSONeditor/treeBuilderImages/vertLine.gif b/include/js/JSONeditor/treeBuilderImages/vertLine.gif
old mode 100644
new mode 100755
diff --git a/include/js/colorpicker.js b/include/js/colorpicker.js
old mode 100644
new mode 100755
diff --git a/include/js/cropper.js b/include/js/cropper.js
old mode 100644
new mode 100755
diff --git a/include/js/croppie.js b/include/js/croppie.js
old mode 100644
new mode 100755
diff --git a/include/js/datecheck.js b/include/js/datecheck.js
old mode 100644
new mode 100755
diff --git a/include/js/fullcalendar/fullcalendar.css b/include/js/fullcalendar/fullcalendar.css
old mode 100644
new mode 100755
diff --git a/include/js/fullcalendar/fullcalendar.js b/include/js/fullcalendar/fullcalendar.js
old mode 100644
new mode 100755
diff --git a/include/js/fullcalendar/fullcalendar.min.js b/include/js/fullcalendar/fullcalendar.min.js
old mode 100644
new mode 100755
diff --git a/include/js/fullcalendar/fullcalendar.print.css b/include/js/fullcalendar/fullcalendar.print.css
old mode 100644
new mode 100755
diff --git a/include/js/fullcalendar/gcal.js b/include/js/fullcalendar/gcal.js
old mode 100644
new mode 100755
diff --git a/include/js/jqSOAPClient.js b/include/js/jqSOAPClient.js
old mode 100644
new mode 100755
diff --git a/include/js/jqXMLUtils.js b/include/js/jqXMLUtils.js
old mode 100644
new mode 100755
diff --git a/include/js/jquery.contextmenu.r2.js b/include/js/jquery.contextmenu.r2.js
old mode 100644
new mode 100755
diff --git a/include/js/jquery.js b/include/js/jquery.js
old mode 100644
new mode 100755
diff --git a/include/js/jquery.ui.datepicker.translation.js b/include/js/jquery.ui.datepicker.translation.js
old mode 100644
new mode 100755
diff --git a/include/js/jstree/README.txt b/include/js/jstree/README.txt
old mode 100644
new mode 100755
diff --git a/include/js/jstree/_docs/!style.css b/include/js/jstree/_docs/!style.css
old mode 100644
new mode 100755
diff --git a/include/js/jstree/_docs/_drive.png b/include/js/jstree/_docs/_drive.png
old mode 100644
new mode 100755
diff --git a/include/js/jstree/_docs/_html_data.html b/include/js/jstree/_docs/_html_data.html
old mode 100644
new mode 100755
diff --git a/include/js/jstree/_docs/_json_data.json b/include/js/jstree/_docs/_json_data.json
old mode 100644
new mode 100755
diff --git a/include/js/jstree/_docs/_search_data.json b/include/js/jstree/_docs/_search_data.json
old mode 100644
new mode 100755
diff --git a/include/js/jstree/_docs/_search_result.json b/include/js/jstree/_docs/_search_result.json
old mode 100644
new mode 100755
diff --git a/include/js/jstree/_docs/_xml_flat.xml b/include/js/jstree/_docs/_xml_flat.xml
old mode 100644
new mode 100755
diff --git a/include/js/jstree/_docs/_xml_nest.xml b/include/js/jstree/_docs/_xml_nest.xml
old mode 100644
new mode 100755
diff --git a/include/js/jstree/_docs/checkbox.html b/include/js/jstree/_docs/checkbox.html
old mode 100644
new mode 100755
diff --git a/include/js/jstree/_docs/contextmenu.html b/include/js/jstree/_docs/contextmenu.html
old mode 100644
new mode 100755
diff --git a/include/js/jstree/_docs/cookies.html b/include/js/jstree/_docs/cookies.html
old mode 100644
new mode 100755
diff --git a/include/js/jstree/_docs/core.html b/include/js/jstree/_docs/core.html
old mode 100644
new mode 100755
diff --git a/include/js/jstree/_docs/crrm.html b/include/js/jstree/_docs/crrm.html
old mode 100644
new mode 100755
diff --git a/include/js/jstree/_docs/dnd.html b/include/js/jstree/_docs/dnd.html
old mode 100644
new mode 100755
diff --git a/include/js/jstree/_docs/hotkeys.html b/include/js/jstree/_docs/hotkeys.html
old mode 100644
new mode 100755
diff --git a/include/js/jstree/_docs/html_data.html b/include/js/jstree/_docs/html_data.html
old mode 100644
new mode 100755
diff --git a/include/js/jstree/_docs/index.html b/include/js/jstree/_docs/index.html
old mode 100644
new mode 100755
diff --git a/include/js/jstree/_docs/json_data.html b/include/js/jstree/_docs/json_data.html
old mode 100644
new mode 100755
diff --git a/include/js/jstree/_docs/languages.html b/include/js/jstree/_docs/languages.html
old mode 100644
new mode 100755
diff --git a/include/js/jstree/_docs/logo.png b/include/js/jstree/_docs/logo.png
old mode 100644
new mode 100755
diff --git a/include/js/jstree/_docs/search.html b/include/js/jstree/_docs/search.html
old mode 100644
new mode 100755
diff --git a/include/js/jstree/_docs/sort.html b/include/js/jstree/_docs/sort.html
old mode 100644
new mode 100755
diff --git a/include/js/jstree/_docs/syntax/!script.js b/include/js/jstree/_docs/syntax/!script.js
old mode 100644
new mode 100755
diff --git a/include/js/jstree/_docs/syntax/!style.css b/include/js/jstree/_docs/syntax/!style.css
old mode 100644
new mode 100755
diff --git a/include/js/jstree/_docs/syntax/clipboard.swf b/include/js/jstree/_docs/syntax/clipboard.swf
old mode 100644
new mode 100755
diff --git a/include/js/jstree/_docs/syntax/help.png b/include/js/jstree/_docs/syntax/help.png
old mode 100644
new mode 100755
diff --git a/include/js/jstree/_docs/syntax/magnifier.png b/include/js/jstree/_docs/syntax/magnifier.png
old mode 100644
new mode 100755
diff --git a/include/js/jstree/_docs/syntax/page_white_code.png b/include/js/jstree/_docs/syntax/page_white_code.png
old mode 100644
new mode 100755
diff --git a/include/js/jstree/_docs/syntax/page_white_copy.png b/include/js/jstree/_docs/syntax/page_white_copy.png
old mode 100644
new mode 100755
diff --git a/include/js/jstree/_docs/syntax/printer.png b/include/js/jstree/_docs/syntax/printer.png
old mode 100644
new mode 100755
diff --git a/include/js/jstree/_docs/syntax/wrapping.png b/include/js/jstree/_docs/syntax/wrapping.png
old mode 100644
new mode 100755
diff --git a/include/js/jstree/_docs/themeroller.html b/include/js/jstree/_docs/themeroller.html
old mode 100644
new mode 100755
diff --git a/include/js/jstree/_docs/themes.html b/include/js/jstree/_docs/themes.html
old mode 100644
new mode 100755
diff --git a/include/js/jstree/_docs/types.html b/include/js/jstree/_docs/types.html
old mode 100644
new mode 100755
diff --git a/include/js/jstree/_docs/ui.html b/include/js/jstree/_docs/ui.html
old mode 100644
new mode 100755
diff --git a/include/js/jstree/_docs/unique.html b/include/js/jstree/_docs/unique.html
old mode 100644
new mode 100755
diff --git a/include/js/jstree/_docs/xml_data.html b/include/js/jstree/_docs/xml_data.html
old mode 100644
new mode 100755
diff --git a/include/js/jstree/_lib/jquery.cookie.js b/include/js/jstree/_lib/jquery.cookie.js
old mode 100644
new mode 100755
diff --git a/include/js/jstree/_lib/jquery.hotkeys.js b/include/js/jstree/_lib/jquery.hotkeys.js
old mode 100644
new mode 100755
diff --git a/include/js/jstree/_lib/jquery.js b/include/js/jstree/_lib/jquery.js
old mode 100644
new mode 100755
diff --git a/include/js/jstree/icons/lehrveranstaltung.png b/include/js/jstree/icons/lehrveranstaltung.png
old mode 100644
new mode 100755
diff --git a/include/js/jstree/icons/modul.png b/include/js/jstree/icons/modul.png
old mode 100644
new mode 100755
diff --git a/include/js/jstree/jquery.jstree.js b/include/js/jstree/jquery.jstree.js
old mode 100644
new mode 100755
diff --git a/include/js/jstree/themes/apple/bg.jpg b/include/js/jstree/themes/apple/bg.jpg
old mode 100644
new mode 100755
diff --git a/include/js/jstree/themes/apple/d.png b/include/js/jstree/themes/apple/d.png
old mode 100644
new mode 100755
diff --git a/include/js/jstree/themes/apple/dot_for_ie.gif b/include/js/jstree/themes/apple/dot_for_ie.gif
old mode 100644
new mode 100755
diff --git a/include/js/jstree/themes/apple/style.css b/include/js/jstree/themes/apple/style.css
old mode 100644
new mode 100755
diff --git a/include/js/jstree/themes/apple/throbber.gif b/include/js/jstree/themes/apple/throbber.gif
old mode 100644
new mode 100755
diff --git a/include/js/jstree/themes/classic/d.gif b/include/js/jstree/themes/classic/d.gif
old mode 100644
new mode 100755
diff --git a/include/js/jstree/themes/classic/d.png b/include/js/jstree/themes/classic/d.png
old mode 100644
new mode 100755
diff --git a/include/js/jstree/themes/classic/dot_for_ie.gif b/include/js/jstree/themes/classic/dot_for_ie.gif
old mode 100644
new mode 100755
diff --git a/include/js/jstree/themes/classic/style.css b/include/js/jstree/themes/classic/style.css
old mode 100644
new mode 100755
diff --git a/include/js/jstree/themes/classic/throbber.gif b/include/js/jstree/themes/classic/throbber.gif
old mode 100644
new mode 100755
diff --git a/include/js/jstree/themes/default-rtl/d.gif b/include/js/jstree/themes/default-rtl/d.gif
old mode 100644
new mode 100755
diff --git a/include/js/jstree/themes/default-rtl/d.png b/include/js/jstree/themes/default-rtl/d.png
old mode 100644
new mode 100755
diff --git a/include/js/jstree/themes/default-rtl/dots.gif b/include/js/jstree/themes/default-rtl/dots.gif
old mode 100644
new mode 100755
diff --git a/include/js/jstree/themes/default-rtl/style.css b/include/js/jstree/themes/default-rtl/style.css
old mode 100644
new mode 100755
diff --git a/include/js/jstree/themes/default-rtl/throbber.gif b/include/js/jstree/themes/default-rtl/throbber.gif
old mode 100644
new mode 100755
diff --git a/include/js/jstree/themes/default/d.gif b/include/js/jstree/themes/default/d.gif
old mode 100644
new mode 100755
diff --git a/include/js/jstree/themes/default/d.png b/include/js/jstree/themes/default/d.png
old mode 100644
new mode 100755
diff --git a/include/js/jstree/themes/default/style.css b/include/js/jstree/themes/default/style.css
old mode 100644
new mode 100755
diff --git a/include/js/jstree/themes/default/throbber.gif b/include/js/jstree/themes/default/throbber.gif
old mode 100644
new mode 100755
diff --git a/include/js/mailcheck.js b/include/js/mailcheck.js
old mode 100644
new mode 100755
diff --git a/include/js/tablesort/icons/01_ascending.gif b/include/js/tablesort/icons/01_ascending.gif
old mode 100644
new mode 100755
diff --git a/include/js/tablesort/icons/01_descending.gif b/include/js/tablesort/icons/01_descending.gif
old mode 100644
new mode 100755
diff --git a/include/js/tablesort/icons/01_unsorted.gif b/include/js/tablesort/icons/01_unsorted.gif
old mode 100644
new mode 100755
diff --git a/include/js/tablesort/table.css b/include/js/tablesort/table.css
old mode 100644
new mode 100755
diff --git a/include/js/tablesort/table.js b/include/js/tablesort/table.js
old mode 100644
new mode 100755
diff --git a/include/js/treeGrid/.gitignore b/include/js/treeGrid/.gitignore
old mode 100644
new mode 100755
diff --git a/include/js/treeGrid/CHANGELOG.txt b/include/js/treeGrid/CHANGELOG.txt
old mode 100644
new mode 100755
diff --git a/include/js/treeGrid/LICENSE b/include/js/treeGrid/LICENSE
old mode 100644
new mode 100755
diff --git a/include/js/treeGrid/README.md b/include/js/treeGrid/README.md
old mode 100644
new mode 100755
diff --git a/include/js/treeGrid/css/jquery.treegrid.css b/include/js/treeGrid/css/jquery.treegrid.css
old mode 100644
new mode 100755
diff --git a/include/js/treeGrid/examples/bootstrap-2.3.2/css/bootstrap-responsive.css b/include/js/treeGrid/examples/bootstrap-2.3.2/css/bootstrap-responsive.css
old mode 100644
new mode 100755
diff --git a/include/js/treeGrid/examples/bootstrap-2.3.2/css/bootstrap-responsive.min.css b/include/js/treeGrid/examples/bootstrap-2.3.2/css/bootstrap-responsive.min.css
old mode 100644
new mode 100755
diff --git a/include/js/treeGrid/examples/bootstrap-2.3.2/css/bootstrap.css b/include/js/treeGrid/examples/bootstrap-2.3.2/css/bootstrap.css
old mode 100644
new mode 100755
diff --git a/include/js/treeGrid/examples/bootstrap-2.3.2/css/bootstrap.min.css b/include/js/treeGrid/examples/bootstrap-2.3.2/css/bootstrap.min.css
old mode 100644
new mode 100755
diff --git a/include/js/treeGrid/examples/bootstrap-2.3.2/img/glyphicons-halflings-white.png b/include/js/treeGrid/examples/bootstrap-2.3.2/img/glyphicons-halflings-white.png
old mode 100644
new mode 100755
diff --git a/include/js/treeGrid/examples/bootstrap-2.3.2/img/glyphicons-halflings.png b/include/js/treeGrid/examples/bootstrap-2.3.2/img/glyphicons-halflings.png
old mode 100644
new mode 100755
diff --git a/include/js/treeGrid/examples/bootstrap-2.3.2/js/bootstrap.js b/include/js/treeGrid/examples/bootstrap-2.3.2/js/bootstrap.js
old mode 100644
new mode 100755
diff --git a/include/js/treeGrid/examples/bootstrap-2.3.2/js/bootstrap.min.js b/include/js/treeGrid/examples/bootstrap-2.3.2/js/bootstrap.min.js
old mode 100644
new mode 100755
diff --git a/include/js/treeGrid/examples/bootstrap-3.0.0/css/bootstrap-theme.css b/include/js/treeGrid/examples/bootstrap-3.0.0/css/bootstrap-theme.css
old mode 100644
new mode 100755
diff --git a/include/js/treeGrid/examples/bootstrap-3.0.0/css/bootstrap-theme.min.css b/include/js/treeGrid/examples/bootstrap-3.0.0/css/bootstrap-theme.min.css
old mode 100644
new mode 100755
diff --git a/include/js/treeGrid/examples/bootstrap-3.0.0/css/bootstrap.css b/include/js/treeGrid/examples/bootstrap-3.0.0/css/bootstrap.css
old mode 100644
new mode 100755
diff --git a/include/js/treeGrid/examples/bootstrap-3.0.0/css/bootstrap.min.css b/include/js/treeGrid/examples/bootstrap-3.0.0/css/bootstrap.min.css
old mode 100644
new mode 100755
diff --git a/include/js/treeGrid/examples/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.eot b/include/js/treeGrid/examples/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.eot
old mode 100644
new mode 100755
diff --git a/include/js/treeGrid/examples/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.svg b/include/js/treeGrid/examples/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.svg
old mode 100644
new mode 100755
diff --git a/include/js/treeGrid/examples/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.ttf b/include/js/treeGrid/examples/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.ttf
old mode 100644
new mode 100755
diff --git a/include/js/treeGrid/examples/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.woff b/include/js/treeGrid/examples/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.woff
old mode 100644
new mode 100755
diff --git a/include/js/treeGrid/examples/bootstrap-3.0.0/js/bootstrap.js b/include/js/treeGrid/examples/bootstrap-3.0.0/js/bootstrap.js
old mode 100644
new mode 100755
diff --git a/include/js/treeGrid/examples/bootstrap-3.0.0/js/bootstrap.min.js b/include/js/treeGrid/examples/bootstrap-3.0.0/js/bootstrap.min.js
old mode 100644
new mode 100755
diff --git a/include/js/treeGrid/examples/example-basic.html b/include/js/treeGrid/examples/example-basic.html
old mode 100644
new mode 100755
diff --git a/include/js/treeGrid/examples/example-bootstrap-2.html b/include/js/treeGrid/examples/example-bootstrap-2.html
old mode 100644
new mode 100755
diff --git a/include/js/treeGrid/examples/example-bootstrap-3.html b/include/js/treeGrid/examples/example-bootstrap-3.html
old mode 100644
new mode 100755
diff --git a/include/js/treeGrid/examples/example-column.html b/include/js/treeGrid/examples/example-column.html
old mode 100644
new mode 100755
diff --git a/include/js/treeGrid/examples/example-save-state.html b/include/js/treeGrid/examples/example-save-state.html
old mode 100644
new mode 100755
diff --git a/include/js/treeGrid/img/collapse.png b/include/js/treeGrid/img/collapse.png
old mode 100644
new mode 100755
diff --git a/include/js/treeGrid/img/expand.png b/include/js/treeGrid/img/expand.png
old mode 100644
new mode 100755
diff --git a/include/js/treeGrid/img/file.png b/include/js/treeGrid/img/file.png
old mode 100644
new mode 100755
diff --git a/include/js/treeGrid/img/folder.png b/include/js/treeGrid/img/folder.png
old mode 100644
new mode 100755
diff --git a/include/js/treeGrid/index.html b/include/js/treeGrid/index.html
old mode 100644
new mode 100755
diff --git a/include/js/treeGrid/js/jquery-1.10.2.js b/include/js/treeGrid/js/jquery-1.10.2.js
old mode 100644
new mode 100755
diff --git a/include/js/treeGrid/js/jquery.cookie.js b/include/js/treeGrid/js/jquery.cookie.js
old mode 100644
new mode 100755
diff --git a/include/js/treeGrid/js/jquery.treegrid.bootstrap2.js b/include/js/treeGrid/js/jquery.treegrid.bootstrap2.js
old mode 100644
new mode 100755
diff --git a/include/js/treeGrid/js/jquery.treegrid.bootstrap3.js b/include/js/treeGrid/js/jquery.treegrid.bootstrap3.js
old mode 100644
new mode 100755
diff --git a/include/js/treeGrid/js/jquery.treegrid.js b/include/js/treeGrid/js/jquery.treegrid.js
old mode 100644
new mode 100755
diff --git a/include/js/treeGrid/jstreegrid.js b/include/js/treeGrid/jstreegrid.js
old mode 100644
new mode 100755
diff --git a/include/js/treeGrid/params.json b/include/js/treeGrid/params.json
old mode 100644
new mode 100755
diff --git a/include/js/treeGrid/styles.css b/include/js/treeGrid/styles.css
old mode 100644
new mode 100755
diff --git a/include/js/treeGrid/test.html b/include/js/treeGrid/test.html
old mode 100644
new mode 100755
diff --git a/include/js/treeGrid/tests/qunit-1.12.0.css b/include/js/treeGrid/tests/qunit-1.12.0.css
old mode 100644
new mode 100755
diff --git a/include/js/treeGrid/tests/qunit-1.12.0.js b/include/js/treeGrid/tests/qunit-1.12.0.js
old mode 100644
new mode 100755
diff --git a/include/js/treeGrid/tests/tests.js b/include/js/treeGrid/tests/tests.js
old mode 100644
new mode 100755
diff --git a/include/js/treeGrid/treegrid.jquery.json b/include/js/treeGrid/treegrid.jquery.json
old mode 100644
new mode 100755
diff --git a/include/kontakt.class.php b/include/kontakt.class.php
old mode 100644
new mode 100755
diff --git a/include/konto.class.php b/include/konto.class.php
old mode 100644
new mode 100755
diff --git a/include/legesamtnote.class.php b/include/legesamtnote.class.php
old mode 100644
new mode 100755
diff --git a/include/lehre_tools.class.php b/include/lehre_tools.class.php
old mode 100644
new mode 100755
diff --git a/include/lehreinheit.class.php b/include/lehreinheit.class.php
old mode 100644
new mode 100755
diff --git a/include/lehreinheitgruppe.class.php b/include/lehreinheitgruppe.class.php
old mode 100644
new mode 100755
diff --git a/include/lehreinheitmitarbeiter.class.php b/include/lehreinheitmitarbeiter.class.php
old mode 100644
new mode 100755
diff --git a/include/lehrelisthelper.class.php b/include/lehrelisthelper.class.php
old mode 100644
new mode 100755
diff --git a/include/lehrfach.class.php b/include/lehrfach.class.php
old mode 100644
new mode 100755
diff --git a/include/lehrform.class.php b/include/lehrform.class.php
old mode 100644
new mode 100755
diff --git a/include/lehrfunktion.class.php b/include/lehrfunktion.class.php
old mode 100644
new mode 100755
diff --git a/include/lehrmodus.class.php b/include/lehrmodus.class.php
old mode 100644
new mode 100755
diff --git a/include/lehrstunde.class.php b/include/lehrstunde.class.php
old mode 100644
new mode 100755
diff --git a/include/lehrtyp.class.php b/include/lehrtyp.class.php
old mode 100644
new mode 100755
diff --git a/include/lehrveranstaltung.class.php b/include/lehrveranstaltung.class.php
old mode 100644
new mode 100755
diff --git a/include/lehrverband.class.php b/include/lehrverband.class.php
old mode 100644
new mode 100755
diff --git a/include/log.class.php b/include/log.class.php
old mode 100644
new mode 100755
diff --git a/include/lvangebot.class.php b/include/lvangebot.class.php
old mode 100644
new mode 100755
diff --git a/include/lvgesamtnote.class.php b/include/lvgesamtnote.class.php
old mode 100644
new mode 100755
diff --git a/include/lvinfo.class.php b/include/lvinfo.class.php
old mode 100644
new mode 100755
diff --git a/include/lvregel.class.php b/include/lvregel.class.php
old mode 100644
new mode 100755
diff --git a/include/mail.class.php b/include/mail.class.php
old mode 100644
new mode 100755
diff --git a/include/mantis.class.php b/include/mantis.class.php
old mode 100644
new mode 100755
diff --git a/include/meta/angular-tablesorter.php b/include/meta/angular-tablesorter.php
old mode 100644
new mode 100755
diff --git a/include/meta/angular.php b/include/meta/angular.php
old mode 100644
new mode 100755
diff --git a/include/meta/easyui.php b/include/meta/easyui.php
old mode 100644
new mode 100755
diff --git a/include/meta/jquery-tablesorter.php b/include/meta/jquery-tablesorter.php
old mode 100644
new mode 100755
diff --git a/include/meta/jquery.php b/include/meta/jquery.php
old mode 100644
new mode 100755
diff --git a/include/meta/js_utils.php b/include/meta/js_utils.php
old mode 100644
new mode 100755
diff --git a/include/meta/jsoneditor.php b/include/meta/jsoneditor.php
old mode 100644
new mode 100755
diff --git a/include/meta/php_utils.php b/include/meta/php_utils.php
old mode 100644
new mode 100755
diff --git a/include/mitarbeiter.class.php b/include/mitarbeiter.class.php
old mode 100644
new mode 100755
diff --git a/include/mobilitaet.class.php b/include/mobilitaet.class.php
old mode 100644
new mode 100755
diff --git a/include/mobilitaetsprogramm.class.php b/include/mobilitaetsprogramm.class.php
old mode 100644
new mode 100755
diff --git a/include/nation.class.php b/include/nation.class.php
old mode 100644
new mode 100755
diff --git a/include/nationengruppe.class.php b/include/nationengruppe.class.php
old mode 100644
new mode 100755
diff --git a/include/news.class.php b/include/news.class.php
old mode 100644
new mode 100755
diff --git a/include/note.class.php b/include/note.class.php
old mode 100644
new mode 100755
diff --git a/include/notenschluessel.class.php b/include/notenschluessel.class.php
old mode 100644
new mode 100755
diff --git a/include/notiz.class.php b/include/notiz.class.php
old mode 100644
new mode 100755
diff --git a/include/organisationseinheit.class.php b/include/organisationseinheit.class.php
old mode 100644
new mode 100755
diff --git a/include/organisationsform.class.php b/include/organisationsform.class.php
old mode 100644
new mode 100755
diff --git a/include/ort.class.php b/include/ort.class.php
old mode 100644
new mode 100755
diff --git a/include/ortraumtyp.class.php b/include/ortraumtyp.class.php
old mode 100644
new mode 100755
diff --git a/include/pdf.class.php b/include/pdf.class.php
old mode 100644
new mode 100755
diff --git a/include/pdf.inc.php b/include/pdf.inc.php
old mode 100644
new mode 100755
diff --git a/include/pdf/FAQ.htm b/include/pdf/FAQ.htm
old mode 100644
new mode 100755
diff --git a/include/pdf/doc/acceptpagebreak.htm b/include/pdf/doc/acceptpagebreak.htm
old mode 100644
new mode 100755
diff --git a/include/pdf/doc/addfont.htm b/include/pdf/doc/addfont.htm
old mode 100644
new mode 100755
diff --git a/include/pdf/doc/addlink.htm b/include/pdf/doc/addlink.htm
old mode 100644
new mode 100755
diff --git a/include/pdf/doc/addpage.htm b/include/pdf/doc/addpage.htm
old mode 100644
new mode 100755
diff --git a/include/pdf/doc/aliasnbpages.htm b/include/pdf/doc/aliasnbpages.htm
old mode 100644
new mode 100755
diff --git a/include/pdf/doc/cell.htm b/include/pdf/doc/cell.htm
old mode 100644
new mode 100755
diff --git a/include/pdf/doc/close.htm b/include/pdf/doc/close.htm
old mode 100644
new mode 100755
diff --git a/include/pdf/doc/error.htm b/include/pdf/doc/error.htm
old mode 100644
new mode 100755
diff --git a/include/pdf/doc/footer.htm b/include/pdf/doc/footer.htm
old mode 100644
new mode 100755
diff --git a/include/pdf/doc/fpdf.htm b/include/pdf/doc/fpdf.htm
old mode 100644
new mode 100755
diff --git a/include/pdf/doc/getstringwidth.htm b/include/pdf/doc/getstringwidth.htm
old mode 100644
new mode 100755
diff --git a/include/pdf/doc/getx.htm b/include/pdf/doc/getx.htm
old mode 100644
new mode 100755
diff --git a/include/pdf/doc/gety.htm b/include/pdf/doc/gety.htm
old mode 100644
new mode 100755
diff --git a/include/pdf/doc/header.htm b/include/pdf/doc/header.htm
old mode 100644
new mode 100755
diff --git a/include/pdf/doc/image.htm b/include/pdf/doc/image.htm
old mode 100644
new mode 100755
diff --git a/include/pdf/doc/index.htm b/include/pdf/doc/index.htm
old mode 100644
new mode 100755
diff --git a/include/pdf/doc/line.htm b/include/pdf/doc/line.htm
old mode 100644
new mode 100755
diff --git a/include/pdf/doc/link.htm b/include/pdf/doc/link.htm
old mode 100644
new mode 100755
diff --git a/include/pdf/doc/ln.htm b/include/pdf/doc/ln.htm
old mode 100644
new mode 100755
diff --git a/include/pdf/doc/multicell.htm b/include/pdf/doc/multicell.htm
old mode 100644
new mode 100755
diff --git a/include/pdf/doc/open.htm b/include/pdf/doc/open.htm
old mode 100644
new mode 100755
diff --git a/include/pdf/doc/output.htm b/include/pdf/doc/output.htm
old mode 100644
new mode 100755
diff --git a/include/pdf/doc/pageno.htm b/include/pdf/doc/pageno.htm
old mode 100644
new mode 100755
diff --git a/include/pdf/doc/rect.htm b/include/pdf/doc/rect.htm
old mode 100644
new mode 100755
diff --git a/include/pdf/doc/setauthor.htm b/include/pdf/doc/setauthor.htm
old mode 100644
new mode 100755
diff --git a/include/pdf/doc/setautopagebreak.htm b/include/pdf/doc/setautopagebreak.htm
old mode 100644
new mode 100755
diff --git a/include/pdf/doc/setcompression.htm b/include/pdf/doc/setcompression.htm
old mode 100644
new mode 100755
diff --git a/include/pdf/doc/setcreator.htm b/include/pdf/doc/setcreator.htm
old mode 100644
new mode 100755
diff --git a/include/pdf/doc/setdisplaymode.htm b/include/pdf/doc/setdisplaymode.htm
old mode 100644
new mode 100755
diff --git a/include/pdf/doc/setdrawcolor.htm b/include/pdf/doc/setdrawcolor.htm
old mode 100644
new mode 100755
diff --git a/include/pdf/doc/setfillcolor.htm b/include/pdf/doc/setfillcolor.htm
old mode 100644
new mode 100755
diff --git a/include/pdf/doc/setfont.htm b/include/pdf/doc/setfont.htm
old mode 100644
new mode 100755
diff --git a/include/pdf/doc/setfontsize.htm b/include/pdf/doc/setfontsize.htm
old mode 100644
new mode 100755
diff --git a/include/pdf/doc/setkeywords.htm b/include/pdf/doc/setkeywords.htm
old mode 100644
new mode 100755
diff --git a/include/pdf/doc/setleftmargin.htm b/include/pdf/doc/setleftmargin.htm
old mode 100644
new mode 100755
diff --git a/include/pdf/doc/setlinewidth.htm b/include/pdf/doc/setlinewidth.htm
old mode 100644
new mode 100755
diff --git a/include/pdf/doc/setlink.htm b/include/pdf/doc/setlink.htm
old mode 100644
new mode 100755
diff --git a/include/pdf/doc/setmargins.htm b/include/pdf/doc/setmargins.htm
old mode 100644
new mode 100755
diff --git a/include/pdf/doc/setrightmargin.htm b/include/pdf/doc/setrightmargin.htm
old mode 100644
new mode 100755
diff --git a/include/pdf/doc/setsubject.htm b/include/pdf/doc/setsubject.htm
old mode 100644
new mode 100755
diff --git a/include/pdf/doc/settextcolor.htm b/include/pdf/doc/settextcolor.htm
old mode 100644
new mode 100755
diff --git a/include/pdf/doc/settitle.htm b/include/pdf/doc/settitle.htm
old mode 100644
new mode 100755
diff --git a/include/pdf/doc/settopmargin.htm b/include/pdf/doc/settopmargin.htm
old mode 100644
new mode 100755
diff --git a/include/pdf/doc/setx.htm b/include/pdf/doc/setx.htm
old mode 100644
new mode 100755
diff --git a/include/pdf/doc/setxy.htm b/include/pdf/doc/setxy.htm
old mode 100644
new mode 100755
diff --git a/include/pdf/doc/sety.htm b/include/pdf/doc/sety.htm
old mode 100644
new mode 100755
diff --git a/include/pdf/doc/text.htm b/include/pdf/doc/text.htm
old mode 100644
new mode 100755
diff --git a/include/pdf/doc/write.htm b/include/pdf/doc/write.htm
old mode 100644
new mode 100755
diff --git a/include/pdf/font/courier.php b/include/pdf/font/courier.php
old mode 100644
new mode 100755
diff --git a/include/pdf/font/helvetica.php b/include/pdf/font/helvetica.php
old mode 100644
new mode 100755
diff --git a/include/pdf/font/helveticab.php b/include/pdf/font/helveticab.php
old mode 100644
new mode 100755
diff --git a/include/pdf/font/helveticabi.php b/include/pdf/font/helveticabi.php
old mode 100644
new mode 100755
diff --git a/include/pdf/font/helveticai.php b/include/pdf/font/helveticai.php
old mode 100644
new mode 100755
diff --git a/include/pdf/font/makefont/cp1250.map b/include/pdf/font/makefont/cp1250.map
old mode 100644
new mode 100755
diff --git a/include/pdf/font/makefont/cp1251.map b/include/pdf/font/makefont/cp1251.map
old mode 100644
new mode 100755
diff --git a/include/pdf/font/makefont/cp1252.map b/include/pdf/font/makefont/cp1252.map
old mode 100644
new mode 100755
diff --git a/include/pdf/font/makefont/cp1253.map b/include/pdf/font/makefont/cp1253.map
old mode 100644
new mode 100755
diff --git a/include/pdf/font/makefont/cp1254.map b/include/pdf/font/makefont/cp1254.map
old mode 100644
new mode 100755
diff --git a/include/pdf/font/makefont/cp1255.map b/include/pdf/font/makefont/cp1255.map
old mode 100644
new mode 100755
diff --git a/include/pdf/font/makefont/cp1257.map b/include/pdf/font/makefont/cp1257.map
old mode 100644
new mode 100755
diff --git a/include/pdf/font/makefont/cp1258.map b/include/pdf/font/makefont/cp1258.map
old mode 100644
new mode 100755
diff --git a/include/pdf/font/makefont/cp874.map b/include/pdf/font/makefont/cp874.map
old mode 100644
new mode 100755
diff --git a/include/pdf/font/makefont/iso-8859-1.map b/include/pdf/font/makefont/iso-8859-1.map
old mode 100644
new mode 100755
diff --git a/include/pdf/font/makefont/iso-8859-11.map b/include/pdf/font/makefont/iso-8859-11.map
old mode 100644
new mode 100755
diff --git a/include/pdf/font/makefont/iso-8859-15.map b/include/pdf/font/makefont/iso-8859-15.map
old mode 100644
new mode 100755
diff --git a/include/pdf/font/makefont/iso-8859-16.map b/include/pdf/font/makefont/iso-8859-16.map
old mode 100644
new mode 100755
diff --git a/include/pdf/font/makefont/iso-8859-2.map b/include/pdf/font/makefont/iso-8859-2.map
old mode 100644
new mode 100755
diff --git a/include/pdf/font/makefont/iso-8859-4.map b/include/pdf/font/makefont/iso-8859-4.map
old mode 100644
new mode 100755
diff --git a/include/pdf/font/makefont/iso-8859-5.map b/include/pdf/font/makefont/iso-8859-5.map
old mode 100644
new mode 100755
diff --git a/include/pdf/font/makefont/iso-8859-7.map b/include/pdf/font/makefont/iso-8859-7.map
old mode 100644
new mode 100755
diff --git a/include/pdf/font/makefont/iso-8859-9.map b/include/pdf/font/makefont/iso-8859-9.map
old mode 100644
new mode 100755
diff --git a/include/pdf/font/makefont/koi8-r.map b/include/pdf/font/makefont/koi8-r.map
old mode 100644
new mode 100755
diff --git a/include/pdf/font/makefont/koi8-u.map b/include/pdf/font/makefont/koi8-u.map
old mode 100644
new mode 100755
diff --git a/include/pdf/font/makefont/makefont.php b/include/pdf/font/makefont/makefont.php
old mode 100644
new mode 100755
diff --git a/include/pdf/font/symbol.php b/include/pdf/font/symbol.php
old mode 100644
new mode 100755
diff --git a/include/pdf/font/times.php b/include/pdf/font/times.php
old mode 100644
new mode 100755
diff --git a/include/pdf/font/timesb.php b/include/pdf/font/timesb.php
old mode 100644
new mode 100755
diff --git a/include/pdf/font/timesbi.php b/include/pdf/font/timesbi.php
old mode 100644
new mode 100755
diff --git a/include/pdf/font/timesi.php b/include/pdf/font/timesi.php
old mode 100644
new mode 100755
diff --git a/include/pdf/font/zapfdingbats.php b/include/pdf/font/zapfdingbats.php
old mode 100644
new mode 100755
diff --git a/include/pdf/fpdf.css b/include/pdf/fpdf.css
old mode 100644
new mode 100755
diff --git a/include/pdf/fpdf.php b/include/pdf/fpdf.php
old mode 100644
new mode 100755
diff --git a/include/pdf/histo.htm b/include/pdf/histo.htm
old mode 100644
new mode 100755
diff --git a/include/pdf/install.txt b/include/pdf/install.txt
old mode 100644
new mode 100755
diff --git a/include/person.class.php b/include/person.class.php
old mode 100644
new mode 100755
diff --git a/include/personlog.class.php b/include/personlog.class.php
old mode 100644
new mode 100755
diff --git a/include/pgsql.class.php b/include/pgsql.class.php
old mode 100644
new mode 100755
diff --git a/include/phrasen.class.php b/include/phrasen.class.php
old mode 100644
new mode 100755
diff --git a/include/preincoming.class.php b/include/preincoming.class.php
old mode 100644
new mode 100755
diff --git a/include/preinteressent.class.php b/include/preinteressent.class.php
old mode 100644
new mode 100755
diff --git a/include/preoutgoing.class.php b/include/preoutgoing.class.php
old mode 100644
new mode 100755
diff --git a/include/prestudent.class.php b/include/prestudent.class.php
old mode 100644
new mode 100755
diff --git a/include/process.class.php b/include/process.class.php
old mode 100644
new mode 100755
diff --git a/include/projekt.class.php b/include/projekt.class.php
old mode 100644
new mode 100755
diff --git a/include/projektarbeit.class.php b/include/projektarbeit.class.php
old mode 100644
new mode 100755
diff --git a/include/projektbenutzer.class.php b/include/projektbenutzer.class.php
old mode 100644
new mode 100755
diff --git a/include/projektbetreuer.class.php b/include/projektbetreuer.class.php
old mode 100644
new mode 100755
diff --git a/include/projektphase.class.php b/include/projektphase.class.php
old mode 100644
new mode 100755
diff --git a/include/projekttask.class.php b/include/projekttask.class.php
old mode 100644
new mode 100755
diff --git a/include/pruefling.class.php b/include/pruefling.class.php
old mode 100644
new mode 100755
diff --git a/include/pruefung.class.php b/include/pruefung.class.php
old mode 100644
new mode 100755
diff --git a/include/pruefungCis.class.php b/include/pruefungCis.class.php
old mode 100644
new mode 100755
diff --git a/include/pruefungsanmeldung.class.php b/include/pruefungsanmeldung.class.php
old mode 100644
new mode 100755
diff --git a/include/pruefungsfenster.class.php b/include/pruefungsfenster.class.php
old mode 100644
new mode 100755
diff --git a/include/pruefungstermin.class.php b/include/pruefungstermin.class.php
old mode 100644
new mode 100755
diff --git a/include/raumtyp.class.php b/include/raumtyp.class.php
old mode 100644
new mode 100755
diff --git a/include/rdf.class.php b/include/rdf.class.php
old mode 100644
new mode 100755
diff --git a/include/reihungstest.class.php b/include/reihungstest.class.php
old mode 100644
new mode 100755
diff --git a/include/reservierung.class.php b/include/reservierung.class.php
old mode 100644
new mode 100755
diff --git a/include/ressource.class.php b/include/ressource.class.php
old mode 100644
new mode 100755
diff --git a/include/rueckstellung.class.php b/include/rueckstellung.class.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/ChangeLog b/include/sabredav/ChangeLog
old mode 100644
new mode 100755
diff --git a/include/sabredav/LICENSE b/include/sabredav/LICENSE
old mode 100644
new mode 100755
diff --git a/include/sabredav/README.md b/include/sabredav/README.md
old mode 100644
new mode 100755
diff --git a/include/sabredav/bin/build.php b/include/sabredav/bin/build.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/bin/googlecode_upload.py b/include/sabredav/bin/googlecode_upload.py
old mode 100644
new mode 100755
diff --git a/include/sabredav/bin/migrateto17.php b/include/sabredav/bin/migrateto17.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/bin/naturalselection.py b/include/sabredav/bin/naturalselection.py
old mode 100644
new mode 100755
diff --git a/include/sabredav/bin/sabredav b/include/sabredav/bin/sabredav
old mode 100644
new mode 100755
diff --git a/include/sabredav/bin/sabredav.php b/include/sabredav/bin/sabredav.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/bin/vobjectvalidate.php b/include/sabredav/bin/vobjectvalidate.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/composer.json b/include/sabredav/composer.json
old mode 100644
new mode 100755
diff --git a/include/sabredav/composer.lock b/include/sabredav/composer.lock
old mode 100644
new mode 100755
diff --git a/include/sabredav/examples/addressbookserver.php b/include/sabredav/examples/addressbookserver.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/examples/basicauth.php b/include/sabredav/examples/basicauth.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/examples/calendarserver.php b/include/sabredav/examples/calendarserver.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/examples/digestauth.php b/include/sabredav/examples/digestauth.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/examples/fileserver.php b/include/sabredav/examples/fileserver.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/examples/groupwareserver.php b/include/sabredav/examples/groupwareserver.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/examples/simplefsserver.php b/include/sabredav/examples/simplefsserver.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/examples/sql/mysql.addressbook.sql b/include/sabredav/examples/sql/mysql.addressbook.sql
old mode 100644
new mode 100755
diff --git a/include/sabredav/examples/sql/mysql.calendars.sql b/include/sabredav/examples/sql/mysql.calendars.sql
old mode 100644
new mode 100755
diff --git a/include/sabredav/examples/sql/mysql.locks.sql b/include/sabredav/examples/sql/mysql.locks.sql
old mode 100644
new mode 100755
diff --git a/include/sabredav/examples/sql/mysql.principals.sql b/include/sabredav/examples/sql/mysql.principals.sql
old mode 100644
new mode 100755
diff --git a/include/sabredav/examples/sql/mysql.users.sql b/include/sabredav/examples/sql/mysql.users.sql
old mode 100644
new mode 100755
diff --git a/include/sabredav/examples/sql/pgsql.addressbook.sql b/include/sabredav/examples/sql/pgsql.addressbook.sql
old mode 100644
new mode 100755
diff --git a/include/sabredav/examples/sql/pgsql.calendars.sql b/include/sabredav/examples/sql/pgsql.calendars.sql
old mode 100644
new mode 100755
diff --git a/include/sabredav/examples/sql/pgsql.locks.sql b/include/sabredav/examples/sql/pgsql.locks.sql
old mode 100644
new mode 100755
diff --git a/include/sabredav/examples/sql/pgsql.principals.sql b/include/sabredav/examples/sql/pgsql.principals.sql
old mode 100644
new mode 100755
diff --git a/include/sabredav/examples/sql/pgsql.users.sql b/include/sabredav/examples/sql/pgsql.users.sql
old mode 100644
new mode 100755
diff --git a/include/sabredav/examples/sql/sqlite.addressbooks.sql b/include/sabredav/examples/sql/sqlite.addressbooks.sql
old mode 100644
new mode 100755
diff --git a/include/sabredav/examples/sql/sqlite.calendars.sql b/include/sabredav/examples/sql/sqlite.calendars.sql
old mode 100644
new mode 100755
diff --git a/include/sabredav/examples/sql/sqlite.locks.sql b/include/sabredav/examples/sql/sqlite.locks.sql
old mode 100644
new mode 100755
diff --git a/include/sabredav/examples/sql/sqlite.principals.sql b/include/sabredav/examples/sql/sqlite.principals.sql
old mode 100644
new mode 100755
diff --git a/include/sabredav/examples/sql/sqlite.users.sql b/include/sabredav/examples/sql/sqlite.users.sql
old mode 100644
new mode 100755
diff --git a/include/sabredav/examples/webserver/apache2_htaccess.conf b/include/sabredav/examples/webserver/apache2_htaccess.conf
old mode 100644
new mode 100755
diff --git a/include/sabredav/examples/webserver/apache2_vhost.conf b/include/sabredav/examples/webserver/apache2_vhost.conf
old mode 100644
new mode 100755
diff --git a/include/sabredav/examples/webserver/apache2_vhost_cgi.conf b/include/sabredav/examples/webserver/apache2_vhost_cgi.conf
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CalDAV/Backend/AbstractBackend.php b/include/sabredav/lib/Sabre/CalDAV/Backend/AbstractBackend.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CalDAV/Backend/BackendInterface.php b/include/sabredav/lib/Sabre/CalDAV/Backend/BackendInterface.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CalDAV/Backend/NotificationSupport.php b/include/sabredav/lib/Sabre/CalDAV/Backend/NotificationSupport.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CalDAV/Backend/PDO.php b/include/sabredav/lib/Sabre/CalDAV/Backend/PDO.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CalDAV/Backend/SharingSupport.php b/include/sabredav/lib/Sabre/CalDAV/Backend/SharingSupport.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CalDAV/Calendar.php b/include/sabredav/lib/Sabre/CalDAV/Calendar.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CalDAV/CalendarObject.php b/include/sabredav/lib/Sabre/CalDAV/CalendarObject.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CalDAV/CalendarQueryParser.php b/include/sabredav/lib/Sabre/CalDAV/CalendarQueryParser.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CalDAV/CalendarQueryValidator.php b/include/sabredav/lib/Sabre/CalDAV/CalendarQueryValidator.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CalDAV/CalendarRootNode.php b/include/sabredav/lib/Sabre/CalDAV/CalendarRootNode.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CalDAV/Exception/InvalidComponentType.php b/include/sabredav/lib/Sabre/CalDAV/Exception/InvalidComponentType.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CalDAV/ICSExportPlugin.php b/include/sabredav/lib/Sabre/CalDAV/ICSExportPlugin.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CalDAV/ICalendar.php b/include/sabredav/lib/Sabre/CalDAV/ICalendar.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CalDAV/ICalendarObject.php b/include/sabredav/lib/Sabre/CalDAV/ICalendarObject.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CalDAV/IShareableCalendar.php b/include/sabredav/lib/Sabre/CalDAV/IShareableCalendar.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CalDAV/ISharedCalendar.php b/include/sabredav/lib/Sabre/CalDAV/ISharedCalendar.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CalDAV/Notifications/Collection.php b/include/sabredav/lib/Sabre/CalDAV/Notifications/Collection.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CalDAV/Notifications/ICollection.php b/include/sabredav/lib/Sabre/CalDAV/Notifications/ICollection.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CalDAV/Notifications/INode.php b/include/sabredav/lib/Sabre/CalDAV/Notifications/INode.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CalDAV/Notifications/INotificationType.php b/include/sabredav/lib/Sabre/CalDAV/Notifications/INotificationType.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CalDAV/Notifications/Node.php b/include/sabredav/lib/Sabre/CalDAV/Notifications/Node.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CalDAV/Notifications/Notification/Invite.php b/include/sabredav/lib/Sabre/CalDAV/Notifications/Notification/Invite.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CalDAV/Notifications/Notification/InviteReply.php b/include/sabredav/lib/Sabre/CalDAV/Notifications/Notification/InviteReply.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CalDAV/Notifications/Notification/SystemStatus.php b/include/sabredav/lib/Sabre/CalDAV/Notifications/Notification/SystemStatus.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CalDAV/Plugin.php b/include/sabredav/lib/Sabre/CalDAV/Plugin.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CalDAV/Principal/Collection.php b/include/sabredav/lib/Sabre/CalDAV/Principal/Collection.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CalDAV/Principal/IProxyRead.php b/include/sabredav/lib/Sabre/CalDAV/Principal/IProxyRead.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CalDAV/Principal/IProxyWrite.php b/include/sabredav/lib/Sabre/CalDAV/Principal/IProxyWrite.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CalDAV/Principal/ProxyRead.php b/include/sabredav/lib/Sabre/CalDAV/Principal/ProxyRead.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CalDAV/Principal/ProxyWrite.php b/include/sabredav/lib/Sabre/CalDAV/Principal/ProxyWrite.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CalDAV/Principal/User.php b/include/sabredav/lib/Sabre/CalDAV/Principal/User.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CalDAV/Property/AllowedSharingModes.php b/include/sabredav/lib/Sabre/CalDAV/Property/AllowedSharingModes.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CalDAV/Property/Invite.php b/include/sabredav/lib/Sabre/CalDAV/Property/Invite.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CalDAV/Property/ScheduleCalendarTransp.php b/include/sabredav/lib/Sabre/CalDAV/Property/ScheduleCalendarTransp.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php b/include/sabredav/lib/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CalDAV/Property/SupportedCalendarData.php b/include/sabredav/lib/Sabre/CalDAV/Property/SupportedCalendarData.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CalDAV/Property/SupportedCollationSet.php b/include/sabredav/lib/Sabre/CalDAV/Property/SupportedCollationSet.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CalDAV/Schedule/IMip.php b/include/sabredav/lib/Sabre/CalDAV/Schedule/IMip.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CalDAV/Schedule/IOutbox.php b/include/sabredav/lib/Sabre/CalDAV/Schedule/IOutbox.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CalDAV/Schedule/Outbox.php b/include/sabredav/lib/Sabre/CalDAV/Schedule/Outbox.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CalDAV/ShareableCalendar.php b/include/sabredav/lib/Sabre/CalDAV/ShareableCalendar.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CalDAV/SharedCalendar.php b/include/sabredav/lib/Sabre/CalDAV/SharedCalendar.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CalDAV/SharingPlugin.php b/include/sabredav/lib/Sabre/CalDAV/SharingPlugin.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CalDAV/UserCalendars.php b/include/sabredav/lib/Sabre/CalDAV/UserCalendars.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CalDAV/Version.php b/include/sabredav/lib/Sabre/CalDAV/Version.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CardDAV/AddressBook.php b/include/sabredav/lib/Sabre/CardDAV/AddressBook.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CardDAV/AddressBookQueryParser.php b/include/sabredav/lib/Sabre/CardDAV/AddressBookQueryParser.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CardDAV/AddressBookRoot.php b/include/sabredav/lib/Sabre/CardDAV/AddressBookRoot.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CardDAV/Backend/AbstractBackend.php b/include/sabredav/lib/Sabre/CardDAV/Backend/AbstractBackend.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CardDAV/Backend/BackendInterface.php b/include/sabredav/lib/Sabre/CardDAV/Backend/BackendInterface.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CardDAV/Backend/PDO.php b/include/sabredav/lib/Sabre/CardDAV/Backend/PDO.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CardDAV/Card.php b/include/sabredav/lib/Sabre/CardDAV/Card.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CardDAV/IAddressBook.php b/include/sabredav/lib/Sabre/CardDAV/IAddressBook.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CardDAV/ICard.php b/include/sabredav/lib/Sabre/CardDAV/ICard.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CardDAV/IDirectory.php b/include/sabredav/lib/Sabre/CardDAV/IDirectory.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CardDAV/Plugin.php b/include/sabredav/lib/Sabre/CardDAV/Plugin.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CardDAV/Property/SupportedAddressData.php b/include/sabredav/lib/Sabre/CardDAV/Property/SupportedAddressData.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CardDAV/UserAddressBooks.php b/include/sabredav/lib/Sabre/CardDAV/UserAddressBooks.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CardDAV/VCFExportPlugin.php b/include/sabredav/lib/Sabre/CardDAV/VCFExportPlugin.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/CardDAV/Version.php b/include/sabredav/lib/Sabre/CardDAV/Version.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Auth/Backend/AbstractBasic.php b/include/sabredav/lib/Sabre/DAV/Auth/Backend/AbstractBasic.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Auth/Backend/AbstractDigest.php b/include/sabredav/lib/Sabre/DAV/Auth/Backend/AbstractDigest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Auth/Backend/Apache.php b/include/sabredav/lib/Sabre/DAV/Auth/Backend/Apache.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Auth/Backend/BackendInterface.php b/include/sabredav/lib/Sabre/DAV/Auth/Backend/BackendInterface.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Auth/Backend/File.php b/include/sabredav/lib/Sabre/DAV/Auth/Backend/File.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Auth/Backend/PDO.php b/include/sabredav/lib/Sabre/DAV/Auth/Backend/PDO.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Auth/Plugin.php b/include/sabredav/lib/Sabre/DAV/Auth/Plugin.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Browser/GuessContentType.php b/include/sabredav/lib/Sabre/DAV/Browser/GuessContentType.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Browser/MapGetToPropFind.php b/include/sabredav/lib/Sabre/DAV/Browser/MapGetToPropFind.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Browser/Plugin.php b/include/sabredav/lib/Sabre/DAV/Browser/Plugin.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Browser/assets/favicon.ico b/include/sabredav/lib/Sabre/DAV/Browser/assets/favicon.ico
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Browser/assets/icons/addressbook.png b/include/sabredav/lib/Sabre/DAV/Browser/assets/icons/addressbook.png
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Browser/assets/icons/calendar.png b/include/sabredav/lib/Sabre/DAV/Browser/assets/icons/calendar.png
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Browser/assets/icons/card.png b/include/sabredav/lib/Sabre/DAV/Browser/assets/icons/card.png
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Browser/assets/icons/collection.png b/include/sabredav/lib/Sabre/DAV/Browser/assets/icons/collection.png
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Browser/assets/icons/file.png b/include/sabredav/lib/Sabre/DAV/Browser/assets/icons/file.png
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Browser/assets/icons/parent.png b/include/sabredav/lib/Sabre/DAV/Browser/assets/icons/parent.png
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Browser/assets/icons/principal.png b/include/sabredav/lib/Sabre/DAV/Browser/assets/icons/principal.png
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Client.php b/include/sabredav/lib/Sabre/DAV/Client.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Collection.php b/include/sabredav/lib/Sabre/DAV/Collection.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Exception.php b/include/sabredav/lib/Sabre/DAV/Exception.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Exception/BadRequest.php b/include/sabredav/lib/Sabre/DAV/Exception/BadRequest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Exception/Conflict.php b/include/sabredav/lib/Sabre/DAV/Exception/Conflict.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Exception/ConflictingLock.php b/include/sabredav/lib/Sabre/DAV/Exception/ConflictingLock.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Exception/FileNotFound.php b/include/sabredav/lib/Sabre/DAV/Exception/FileNotFound.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Exception/Forbidden.php b/include/sabredav/lib/Sabre/DAV/Exception/Forbidden.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Exception/InsufficientStorage.php b/include/sabredav/lib/Sabre/DAV/Exception/InsufficientStorage.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Exception/InvalidResourceType.php b/include/sabredav/lib/Sabre/DAV/Exception/InvalidResourceType.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Exception/LengthRequired.php b/include/sabredav/lib/Sabre/DAV/Exception/LengthRequired.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php b/include/sabredav/lib/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Exception/Locked.php b/include/sabredav/lib/Sabre/DAV/Exception/Locked.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Exception/MethodNotAllowed.php b/include/sabredav/lib/Sabre/DAV/Exception/MethodNotAllowed.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Exception/NotAuthenticated.php b/include/sabredav/lib/Sabre/DAV/Exception/NotAuthenticated.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Exception/NotFound.php b/include/sabredav/lib/Sabre/DAV/Exception/NotFound.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Exception/NotImplemented.php b/include/sabredav/lib/Sabre/DAV/Exception/NotImplemented.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Exception/PaymentRequired.php b/include/sabredav/lib/Sabre/DAV/Exception/PaymentRequired.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Exception/PreconditionFailed.php b/include/sabredav/lib/Sabre/DAV/Exception/PreconditionFailed.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Exception/ReportNotSupported.php b/include/sabredav/lib/Sabre/DAV/Exception/ReportNotSupported.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php b/include/sabredav/lib/Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Exception/ServiceUnavailable.php b/include/sabredav/lib/Sabre/DAV/Exception/ServiceUnavailable.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Exception/UnsupportedMediaType.php b/include/sabredav/lib/Sabre/DAV/Exception/UnsupportedMediaType.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/FS/Directory.php b/include/sabredav/lib/Sabre/DAV/FS/Directory.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/FS/File.php b/include/sabredav/lib/Sabre/DAV/FS/File.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/FS/Node.php b/include/sabredav/lib/Sabre/DAV/FS/Node.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/FSExt/Directory.php b/include/sabredav/lib/Sabre/DAV/FSExt/Directory.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/FSExt/File.php b/include/sabredav/lib/Sabre/DAV/FSExt/File.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/FSExt/Node.php b/include/sabredav/lib/Sabre/DAV/FSExt/Node.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/File.php b/include/sabredav/lib/Sabre/DAV/File.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/ICollection.php b/include/sabredav/lib/Sabre/DAV/ICollection.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/IExtendedCollection.php b/include/sabredav/lib/Sabre/DAV/IExtendedCollection.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/IFile.php b/include/sabredav/lib/Sabre/DAV/IFile.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/INode.php b/include/sabredav/lib/Sabre/DAV/INode.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/IProperties.php b/include/sabredav/lib/Sabre/DAV/IProperties.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/IQuota.php b/include/sabredav/lib/Sabre/DAV/IQuota.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Locks/Backend/AbstractBackend.php b/include/sabredav/lib/Sabre/DAV/Locks/Backend/AbstractBackend.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Locks/Backend/BackendInterface.php b/include/sabredav/lib/Sabre/DAV/Locks/Backend/BackendInterface.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Locks/Backend/FS.php b/include/sabredav/lib/Sabre/DAV/Locks/Backend/FS.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Locks/Backend/File.php b/include/sabredav/lib/Sabre/DAV/Locks/Backend/File.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Locks/Backend/PDO.php b/include/sabredav/lib/Sabre/DAV/Locks/Backend/PDO.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Locks/LockInfo.php b/include/sabredav/lib/Sabre/DAV/Locks/LockInfo.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Locks/Plugin.php b/include/sabredav/lib/Sabre/DAV/Locks/Plugin.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Mount/Plugin.php b/include/sabredav/lib/Sabre/DAV/Mount/Plugin.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Node.php b/include/sabredav/lib/Sabre/DAV/Node.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/ObjectTree.php b/include/sabredav/lib/Sabre/DAV/ObjectTree.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/PartialUpdate/IFile.php b/include/sabredav/lib/Sabre/DAV/PartialUpdate/IFile.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/PartialUpdate/IPatchSupport.php b/include/sabredav/lib/Sabre/DAV/PartialUpdate/IPatchSupport.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/PartialUpdate/Plugin.php b/include/sabredav/lib/Sabre/DAV/PartialUpdate/Plugin.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Property.php b/include/sabredav/lib/Sabre/DAV/Property.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Property/GetLastModified.php b/include/sabredav/lib/Sabre/DAV/Property/GetLastModified.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Property/Href.php b/include/sabredav/lib/Sabre/DAV/Property/Href.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Property/HrefList.php b/include/sabredav/lib/Sabre/DAV/Property/HrefList.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Property/IHref.php b/include/sabredav/lib/Sabre/DAV/Property/IHref.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Property/LockDiscovery.php b/include/sabredav/lib/Sabre/DAV/Property/LockDiscovery.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Property/ResourceType.php b/include/sabredav/lib/Sabre/DAV/Property/ResourceType.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Property/Response.php b/include/sabredav/lib/Sabre/DAV/Property/Response.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Property/ResponseList.php b/include/sabredav/lib/Sabre/DAV/Property/ResponseList.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Property/SupportedLock.php b/include/sabredav/lib/Sabre/DAV/Property/SupportedLock.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Property/SupportedReportSet.php b/include/sabredav/lib/Sabre/DAV/Property/SupportedReportSet.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/PropertyInterface.php b/include/sabredav/lib/Sabre/DAV/PropertyInterface.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Server.php b/include/sabredav/lib/Sabre/DAV/Server.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/ServerPlugin.php b/include/sabredav/lib/Sabre/DAV/ServerPlugin.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/SimpleCollection.php b/include/sabredav/lib/Sabre/DAV/SimpleCollection.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/SimpleFile.php b/include/sabredav/lib/Sabre/DAV/SimpleFile.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/StringUtil.php b/include/sabredav/lib/Sabre/DAV/StringUtil.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/TemporaryFileFilterPlugin.php b/include/sabredav/lib/Sabre/DAV/TemporaryFileFilterPlugin.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Tree.php b/include/sabredav/lib/Sabre/DAV/Tree.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Tree/Filesystem.php b/include/sabredav/lib/Sabre/DAV/Tree/Filesystem.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/URLUtil.php b/include/sabredav/lib/Sabre/DAV/URLUtil.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/UUIDUtil.php b/include/sabredav/lib/Sabre/DAV/UUIDUtil.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/Version.php b/include/sabredav/lib/Sabre/DAV/Version.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAV/XMLUtil.php b/include/sabredav/lib/Sabre/DAV/XMLUtil.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAVACL/AbstractPrincipalCollection.php b/include/sabredav/lib/Sabre/DAVACL/AbstractPrincipalCollection.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAVACL/Exception/AceConflict.php b/include/sabredav/lib/Sabre/DAVACL/Exception/AceConflict.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAVACL/Exception/NeedPrivileges.php b/include/sabredav/lib/Sabre/DAVACL/Exception/NeedPrivileges.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAVACL/Exception/NoAbstract.php b/include/sabredav/lib/Sabre/DAVACL/Exception/NoAbstract.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAVACL/Exception/NotRecognizedPrincipal.php b/include/sabredav/lib/Sabre/DAVACL/Exception/NotRecognizedPrincipal.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAVACL/Exception/NotSupportedPrivilege.php b/include/sabredav/lib/Sabre/DAVACL/Exception/NotSupportedPrivilege.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAVACL/IACL.php b/include/sabredav/lib/Sabre/DAVACL/IACL.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAVACL/IPrincipal.php b/include/sabredav/lib/Sabre/DAVACL/IPrincipal.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAVACL/IPrincipalCollection.php b/include/sabredav/lib/Sabre/DAVACL/IPrincipalCollection.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAVACL/Plugin.php b/include/sabredav/lib/Sabre/DAVACL/Plugin.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAVACL/Principal.php b/include/sabredav/lib/Sabre/DAVACL/Principal.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAVACL/PrincipalBackend/AbstractBackend.php b/include/sabredav/lib/Sabre/DAVACL/PrincipalBackend/AbstractBackend.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAVACL/PrincipalBackend/BackendInterface.php b/include/sabredav/lib/Sabre/DAVACL/PrincipalBackend/BackendInterface.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAVACL/PrincipalBackend/PDO.php b/include/sabredav/lib/Sabre/DAVACL/PrincipalBackend/PDO.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAVACL/PrincipalCollection.php b/include/sabredav/lib/Sabre/DAVACL/PrincipalCollection.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAVACL/Property/Acl.php b/include/sabredav/lib/Sabre/DAVACL/Property/Acl.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAVACL/Property/AclRestrictions.php b/include/sabredav/lib/Sabre/DAVACL/Property/AclRestrictions.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAVACL/Property/CurrentUserPrivilegeSet.php b/include/sabredav/lib/Sabre/DAVACL/Property/CurrentUserPrivilegeSet.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAVACL/Property/Principal.php b/include/sabredav/lib/Sabre/DAVACL/Property/Principal.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAVACL/Property/SupportedPrivilegeSet.php b/include/sabredav/lib/Sabre/DAVACL/Property/SupportedPrivilegeSet.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/DAVACL/Version.php b/include/sabredav/lib/Sabre/DAVACL/Version.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/HTTP/AWSAuth.php b/include/sabredav/lib/Sabre/HTTP/AWSAuth.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/HTTP/AbstractAuth.php b/include/sabredav/lib/Sabre/HTTP/AbstractAuth.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/HTTP/BasicAuth.php b/include/sabredav/lib/Sabre/HTTP/BasicAuth.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/HTTP/DigestAuth.php b/include/sabredav/lib/Sabre/HTTP/DigestAuth.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/HTTP/Request.php b/include/sabredav/lib/Sabre/HTTP/Request.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/HTTP/Response.php b/include/sabredav/lib/Sabre/HTTP/Response.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/HTTP/Util.php b/include/sabredav/lib/Sabre/HTTP/Util.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/HTTP/Version.php b/include/sabredav/lib/Sabre/HTTP/Version.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/lib/Sabre/autoload.php b/include/sabredav/lib/Sabre/autoload.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CalDAV/Backend/AbstractPDOTest.php b/include/sabredav/tests/Sabre/CalDAV/Backend/AbstractPDOTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CalDAV/Backend/AbstractTest.php b/include/sabredav/tests/Sabre/CalDAV/Backend/AbstractTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CalDAV/Backend/Mock.php b/include/sabredav/tests/Sabre/CalDAV/Backend/Mock.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CalDAV/Backend/PDOMySQLTest.php b/include/sabredav/tests/Sabre/CalDAV/Backend/PDOMySQLTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CalDAV/Backend/PDOSqliteTest.php b/include/sabredav/tests/Sabre/CalDAV/Backend/PDOSqliteTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CalDAV/CalendarObjectTest.php b/include/sabredav/tests/Sabre/CalDAV/CalendarObjectTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CalDAV/CalendarQueryParserTest.php b/include/sabredav/tests/Sabre/CalDAV/CalendarQueryParserTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CalDAV/CalendarQueryVAlarmTest.php b/include/sabredav/tests/Sabre/CalDAV/CalendarQueryVAlarmTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CalDAV/CalendarQueryValidatorTest.php b/include/sabredav/tests/Sabre/CalDAV/CalendarQueryValidatorTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CalDAV/CalendarTest.php b/include/sabredav/tests/Sabre/CalDAV/CalendarTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDTest.php b/include/sabredav/tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDbyDayTest.php b/include/sabredav/tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDbyDayTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CalDAV/ExpandEventsDoubleEventsTest.php b/include/sabredav/tests/Sabre/CalDAV/ExpandEventsDoubleEventsTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CalDAV/FreeBusyReportTest.php b/include/sabredav/tests/Sabre/CalDAV/FreeBusyReportTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CalDAV/FreeBusyRequestTest.php b/include/sabredav/tests/Sabre/CalDAV/FreeBusyRequestTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CalDAV/GetEventsByTimerangeTest.php b/include/sabredav/tests/Sabre/CalDAV/GetEventsByTimerangeTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CalDAV/ICSExportPluginTest.php b/include/sabredav/tests/Sabre/CalDAV/ICSExportPluginTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CalDAV/Issue166Test.php b/include/sabredav/tests/Sabre/CalDAV/Issue166Test.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CalDAV/Issue172Test.php b/include/sabredav/tests/Sabre/CalDAV/Issue172Test.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CalDAV/Issue203Test.php b/include/sabredav/tests/Sabre/CalDAV/Issue203Test.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CalDAV/Issue205Test.php b/include/sabredav/tests/Sabre/CalDAV/Issue205Test.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CalDAV/Issue211Test.php b/include/sabredav/tests/Sabre/CalDAV/Issue211Test.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CalDAV/Issue220Test.php b/include/sabredav/tests/Sabre/CalDAV/Issue220Test.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CalDAV/Issue228Test.php b/include/sabredav/tests/Sabre/CalDAV/Issue228Test.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CalDAV/Notifications/CollectionTest.php b/include/sabredav/tests/Sabre/CalDAV/Notifications/CollectionTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CalDAV/Notifications/NodeTest.php b/include/sabredav/tests/Sabre/CalDAV/Notifications/NodeTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CalDAV/Notifications/Notification/InviteReplyTest.php b/include/sabredav/tests/Sabre/CalDAV/Notifications/Notification/InviteReplyTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CalDAV/Notifications/Notification/InviteTest.php b/include/sabredav/tests/Sabre/CalDAV/Notifications/Notification/InviteTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CalDAV/Notifications/Notification/SystemStatusTest.php b/include/sabredav/tests/Sabre/CalDAV/Notifications/Notification/SystemStatusTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CalDAV/OutboxPostTest.php b/include/sabredav/tests/Sabre/CalDAV/OutboxPostTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CalDAV/PluginTest.php b/include/sabredav/tests/Sabre/CalDAV/PluginTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CalDAV/Principal/CollectionTest.php b/include/sabredav/tests/Sabre/CalDAV/Principal/CollectionTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CalDAV/Principal/ProxyReadTest.php b/include/sabredav/tests/Sabre/CalDAV/Principal/ProxyReadTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CalDAV/Principal/ProxyWriteTest.php b/include/sabredav/tests/Sabre/CalDAV/Principal/ProxyWriteTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CalDAV/Principal/UserTest.php b/include/sabredav/tests/Sabre/CalDAV/Principal/UserTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CalDAV/Property/AllowedSharingModesTest.php b/include/sabredav/tests/Sabre/CalDAV/Property/AllowedSharingModesTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CalDAV/Property/InviteTest.php b/include/sabredav/tests/Sabre/CalDAV/Property/InviteTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CalDAV/Property/ScheduleCalendarTranspTest.php b/include/sabredav/tests/Sabre/CalDAV/Property/ScheduleCalendarTranspTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CalDAV/Property/SupportedCalendarComponentSetTest.php b/include/sabredav/tests/Sabre/CalDAV/Property/SupportedCalendarComponentSetTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CalDAV/Property/SupportedCalendarDataTest.php b/include/sabredav/tests/Sabre/CalDAV/Property/SupportedCalendarDataTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CalDAV/Property/SupportedCollationSetTest.php b/include/sabredav/tests/Sabre/CalDAV/Property/SupportedCollationSetTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CalDAV/Schedule/IMip/Mock.php b/include/sabredav/tests/Sabre/CalDAV/Schedule/IMip/Mock.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CalDAV/Schedule/OutboxTest.php b/include/sabredav/tests/Sabre/CalDAV/Schedule/OutboxTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CalDAV/ShareableCalendarTest.php b/include/sabredav/tests/Sabre/CalDAV/ShareableCalendarTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CalDAV/SharedCalendarTest.php b/include/sabredav/tests/Sabre/CalDAV/SharedCalendarTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CalDAV/SharingPluginTest.php b/include/sabredav/tests/Sabre/CalDAV/SharingPluginTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CalDAV/TestUtil.php b/include/sabredav/tests/Sabre/CalDAV/TestUtil.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CalDAV/UserCalendarsSharedCalendarsTest.php b/include/sabredav/tests/Sabre/CalDAV/UserCalendarsSharedCalendarsTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CalDAV/UserCalendarsTest.php b/include/sabredav/tests/Sabre/CalDAV/UserCalendarsTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CalDAV/ValidateICalTest.php b/include/sabredav/tests/Sabre/CalDAV/ValidateICalTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CalDAV/VersionTest.php b/include/sabredav/tests/Sabre/CalDAV/VersionTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CardDAV/AbstractPluginTest.php b/include/sabredav/tests/Sabre/CardDAV/AbstractPluginTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CardDAV/AddressBookQueryParserTest.php b/include/sabredav/tests/Sabre/CardDAV/AddressBookQueryParserTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CardDAV/AddressBookQueryTest.php b/include/sabredav/tests/Sabre/CardDAV/AddressBookQueryTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CardDAV/AddressBookRootTest.php b/include/sabredav/tests/Sabre/CardDAV/AddressBookRootTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CardDAV/AddressBookTest.php b/include/sabredav/tests/Sabre/CardDAV/AddressBookTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CardDAV/Backend/AbstractPDOTest.php b/include/sabredav/tests/Sabre/CardDAV/Backend/AbstractPDOTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CardDAV/Backend/Mock.php b/include/sabredav/tests/Sabre/CardDAV/Backend/Mock.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CardDAV/Backend/PDOMySQLTest.php b/include/sabredav/tests/Sabre/CardDAV/Backend/PDOMySQLTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CardDAV/Backend/PDOSqliteTest.php b/include/sabredav/tests/Sabre/CardDAV/Backend/PDOSqliteTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CardDAV/CardTest.php b/include/sabredav/tests/Sabre/CardDAV/CardTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CardDAV/IDirectoryTest.php b/include/sabredav/tests/Sabre/CardDAV/IDirectoryTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CardDAV/MultiGetTest.php b/include/sabredav/tests/Sabre/CardDAV/MultiGetTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CardDAV/PluginTest.php b/include/sabredav/tests/Sabre/CardDAV/PluginTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CardDAV/Property/SupportedAddressDataTest.php b/include/sabredav/tests/Sabre/CardDAV/Property/SupportedAddressDataTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CardDAV/SogoStripContentTypeTest.php b/include/sabredav/tests/Sabre/CardDAV/SogoStripContentTypeTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CardDAV/TestUtil.php b/include/sabredav/tests/Sabre/CardDAV/TestUtil.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CardDAV/UserAddressBooksTest.php b/include/sabredav/tests/Sabre/CardDAV/UserAddressBooksTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CardDAV/VCFExportTest.php b/include/sabredav/tests/Sabre/CardDAV/VCFExportTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CardDAV/ValidateFilterTest.php b/include/sabredav/tests/Sabre/CardDAV/ValidateFilterTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CardDAV/ValidateVCardTest.php b/include/sabredav/tests/Sabre/CardDAV/ValidateVCardTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/CardDAV/VersionTest.php b/include/sabredav/tests/Sabre/CardDAV/VersionTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/AbstractServer.php b/include/sabredav/tests/Sabre/DAV/AbstractServer.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/Auth/Backend/AbstractBasicTest.php b/include/sabredav/tests/Sabre/DAV/Auth/Backend/AbstractBasicTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/Auth/Backend/AbstractDigestTest.php b/include/sabredav/tests/Sabre/DAV/Auth/Backend/AbstractDigestTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/Auth/Backend/AbstractPDOTest.php b/include/sabredav/tests/Sabre/DAV/Auth/Backend/AbstractPDOTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/Auth/Backend/ApacheTest.php b/include/sabredav/tests/Sabre/DAV/Auth/Backend/ApacheTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/Auth/Backend/FileTest.php b/include/sabredav/tests/Sabre/DAV/Auth/Backend/FileTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/Auth/Backend/Mock.php b/include/sabredav/tests/Sabre/DAV/Auth/Backend/Mock.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/Auth/Backend/PDOMySQLTest.php b/include/sabredav/tests/Sabre/DAV/Auth/Backend/PDOMySQLTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/Auth/Backend/PDOSqliteTest.php b/include/sabredav/tests/Sabre/DAV/Auth/Backend/PDOSqliteTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/Auth/PluginTest.php b/include/sabredav/tests/Sabre/DAV/Auth/PluginTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/BasicNodeTest.php b/include/sabredav/tests/Sabre/DAV/BasicNodeTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/Browser/GuessContentTypeTest.php b/include/sabredav/tests/Sabre/DAV/Browser/GuessContentTypeTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/Browser/MapGetToPropFindTest.php b/include/sabredav/tests/Sabre/DAV/Browser/MapGetToPropFindTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/Browser/PluginTest.php b/include/sabredav/tests/Sabre/DAV/Browser/PluginTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/ClientMock.php b/include/sabredav/tests/Sabre/DAV/ClientMock.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/ClientTest.php b/include/sabredav/tests/Sabre/DAV/ClientTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/Exception/LockedTest.php b/include/sabredav/tests/Sabre/DAV/Exception/LockedTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/Exception/PaymentRequiredTest.php b/include/sabredav/tests/Sabre/DAV/Exception/PaymentRequiredTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/ExceptionTest.php b/include/sabredav/tests/Sabre/DAV/ExceptionTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/FSExt/FileTest.php b/include/sabredav/tests/Sabre/DAV/FSExt/FileTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/FSExt/NodeTest.php b/include/sabredav/tests/Sabre/DAV/FSExt/NodeTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/FSExt/ServerTest.php b/include/sabredav/tests/Sabre/DAV/FSExt/ServerTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/HTTPPreferParsingTest.php b/include/sabredav/tests/Sabre/DAV/HTTPPreferParsingTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/HttpDeleteTest.php b/include/sabredav/tests/Sabre/DAV/HttpDeleteTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/HttpPutTest.php b/include/sabredav/tests/Sabre/DAV/HttpPutTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/Issue33Test.php b/include/sabredav/tests/Sabre/DAV/Issue33Test.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/Locks/Backend/AbstractTest.php b/include/sabredav/tests/Sabre/DAV/Locks/Backend/AbstractTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/Locks/Backend/FSTest.php b/include/sabredav/tests/Sabre/DAV/Locks/Backend/FSTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/Locks/Backend/FileTest.php b/include/sabredav/tests/Sabre/DAV/Locks/Backend/FileTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/Locks/Backend/PDOMySQLTest.php b/include/sabredav/tests/Sabre/DAV/Locks/Backend/PDOMySQLTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/Locks/Backend/PDOTest.php b/include/sabredav/tests/Sabre/DAV/Locks/Backend/PDOTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/Locks/GetIfConditionsTest.php b/include/sabredav/tests/Sabre/DAV/Locks/GetIfConditionsTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/Locks/MSWordTest.php b/include/sabredav/tests/Sabre/DAV/Locks/MSWordTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/Locks/PluginTest.php b/include/sabredav/tests/Sabre/DAV/Locks/PluginTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/Mock/Collection.php b/include/sabredav/tests/Sabre/DAV/Mock/Collection.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/Mock/File.php b/include/sabredav/tests/Sabre/DAV/Mock/File.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/Mount/PluginTest.php b/include/sabredav/tests/Sabre/DAV/Mount/PluginTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/ObjectTreeTest.php b/include/sabredav/tests/Sabre/DAV/ObjectTreeTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/PartialUpdate/FileMock.php b/include/sabredav/tests/Sabre/DAV/PartialUpdate/FileMock.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/PartialUpdate/PluginTest.php b/include/sabredav/tests/Sabre/DAV/PartialUpdate/PluginTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/PartialUpdate/SpecificationTest.php b/include/sabredav/tests/Sabre/DAV/PartialUpdate/SpecificationTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/Property/GetLastModifiedTest.php b/include/sabredav/tests/Sabre/DAV/Property/GetLastModifiedTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/Property/HrefListTest.php b/include/sabredav/tests/Sabre/DAV/Property/HrefListTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/Property/HrefTest.php b/include/sabredav/tests/Sabre/DAV/Property/HrefTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/Property/ResourceTypeTest.php b/include/sabredav/tests/Sabre/DAV/Property/ResourceTypeTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/Property/ResponseListTest.php b/include/sabredav/tests/Sabre/DAV/Property/ResponseListTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/Property/ResponseTest.php b/include/sabredav/tests/Sabre/DAV/Property/ResponseTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/Property/SupportedReportSetTest.php b/include/sabredav/tests/Sabre/DAV/Property/SupportedReportSetTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/ServerCopyMoveTest.php b/include/sabredav/tests/Sabre/DAV/ServerCopyMoveTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/ServerEventsTest.php b/include/sabredav/tests/Sabre/DAV/ServerEventsTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/ServerMKCOLTest.php b/include/sabredav/tests/Sabre/DAV/ServerMKCOLTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/ServerPluginTest.php b/include/sabredav/tests/Sabre/DAV/ServerPluginTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/ServerPreconditionTest.php b/include/sabredav/tests/Sabre/DAV/ServerPreconditionTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/ServerPropsTest.php b/include/sabredav/tests/Sabre/DAV/ServerPropsTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/ServerRangeTest.php b/include/sabredav/tests/Sabre/DAV/ServerRangeTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/ServerSimpleTest.php b/include/sabredav/tests/Sabre/DAV/ServerSimpleTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/ServerUpdatePropertiesTest.php b/include/sabredav/tests/Sabre/DAV/ServerUpdatePropertiesTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/SimpleFileTest.php b/include/sabredav/tests/Sabre/DAV/SimpleFileTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/StringUtilTest.php b/include/sabredav/tests/Sabre/DAV/StringUtilTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/TemporaryFileFilterTest.php b/include/sabredav/tests/Sabre/DAV/TemporaryFileFilterTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/TestPlugin.php b/include/sabredav/tests/Sabre/DAV/TestPlugin.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/Tree/FilesystemTest.php b/include/sabredav/tests/Sabre/DAV/Tree/FilesystemTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/TreeTest.php b/include/sabredav/tests/Sabre/DAV/TreeTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/URLUtilTest.php b/include/sabredav/tests/Sabre/DAV/URLUtilTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/UUIDUtilTest.php b/include/sabredav/tests/Sabre/DAV/UUIDUtilTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAV/XMLUtilTest.php b/include/sabredav/tests/Sabre/DAV/XMLUtilTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAVACL/ACLMethodTest.php b/include/sabredav/tests/Sabre/DAVACL/ACLMethodTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAVACL/AllowAccessTest.php b/include/sabredav/tests/Sabre/DAVACL/AllowAccessTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAVACL/BlockAccessTest.php b/include/sabredav/tests/Sabre/DAVACL/BlockAccessTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAVACL/Exception/AceConflictTest.php b/include/sabredav/tests/Sabre/DAVACL/Exception/AceConflictTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAVACL/Exception/NeedPrivilegesExceptionTest.php b/include/sabredav/tests/Sabre/DAVACL/Exception/NeedPrivilegesExceptionTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAVACL/Exception/NoAbstractTest.php b/include/sabredav/tests/Sabre/DAVACL/Exception/NoAbstractTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAVACL/Exception/NotRecognizedPrincipalTest.php b/include/sabredav/tests/Sabre/DAVACL/Exception/NotRecognizedPrincipalTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAVACL/Exception/NotSupportedPrivilegeTest.php b/include/sabredav/tests/Sabre/DAVACL/Exception/NotSupportedPrivilegeTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAVACL/ExpandPropertiesTest.php b/include/sabredav/tests/Sabre/DAVACL/ExpandPropertiesTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAVACL/MockACLNode.php b/include/sabredav/tests/Sabre/DAVACL/MockACLNode.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAVACL/MockPrincipal.php b/include/sabredav/tests/Sabre/DAVACL/MockPrincipal.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAVACL/PluginAdminTest.php b/include/sabredav/tests/Sabre/DAVACL/PluginAdminTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAVACL/PluginPropertiesTest.php b/include/sabredav/tests/Sabre/DAVACL/PluginPropertiesTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAVACL/PluginUpdatePropertiesTest.php b/include/sabredav/tests/Sabre/DAVACL/PluginUpdatePropertiesTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAVACL/PrincipalBackend/AbstractPDOTest.php b/include/sabredav/tests/Sabre/DAVACL/PrincipalBackend/AbstractPDOTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAVACL/PrincipalBackend/Mock.php b/include/sabredav/tests/Sabre/DAVACL/PrincipalBackend/Mock.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAVACL/PrincipalBackend/PDOMySQLTest.php b/include/sabredav/tests/Sabre/DAVACL/PrincipalBackend/PDOMySQLTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAVACL/PrincipalBackend/PDOSqliteTest.php b/include/sabredav/tests/Sabre/DAVACL/PrincipalBackend/PDOSqliteTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAVACL/PrincipalCollectionTest.php b/include/sabredav/tests/Sabre/DAVACL/PrincipalCollectionTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAVACL/PrincipalPropertySearchTest.php b/include/sabredav/tests/Sabre/DAVACL/PrincipalPropertySearchTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAVACL/PrincipalSearchPropertySetTest.php b/include/sabredav/tests/Sabre/DAVACL/PrincipalSearchPropertySetTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAVACL/PrincipalTest.php b/include/sabredav/tests/Sabre/DAVACL/PrincipalTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAVACL/Property/ACLRestrictionsTest.php b/include/sabredav/tests/Sabre/DAVACL/Property/ACLRestrictionsTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAVACL/Property/ACLTest.php b/include/sabredav/tests/Sabre/DAVACL/Property/ACLTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAVACL/Property/CurrentUserPrivilegeSetTest.php b/include/sabredav/tests/Sabre/DAVACL/Property/CurrentUserPrivilegeSetTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAVACL/Property/PrincipalTest.php b/include/sabredav/tests/Sabre/DAVACL/Property/PrincipalTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAVACL/Property/SupportedPrivilegeSetTest.php b/include/sabredav/tests/Sabre/DAVACL/Property/SupportedPrivilegeSetTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAVACL/SimplePluginTest.php b/include/sabredav/tests/Sabre/DAVACL/SimplePluginTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAVACL/VersionTest.php b/include/sabredav/tests/Sabre/DAVACL/VersionTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/DAVServerTest.php b/include/sabredav/tests/Sabre/DAVServerTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/HTTP/AWSAuthTest.php b/include/sabredav/tests/Sabre/HTTP/AWSAuthTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/HTTP/BasicAuthTest.php b/include/sabredav/tests/Sabre/HTTP/BasicAuthTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/HTTP/DigestAuthTest.php b/include/sabredav/tests/Sabre/HTTP/DigestAuthTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/HTTP/RequestTest.php b/include/sabredav/tests/Sabre/HTTP/RequestTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/HTTP/ResponseMock.php b/include/sabredav/tests/Sabre/HTTP/ResponseMock.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/HTTP/ResponseTest.php b/include/sabredav/tests/Sabre/HTTP/ResponseTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/HTTP/UtilTest.php b/include/sabredav/tests/Sabre/HTTP/UtilTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/HTTP/VersionTest.php b/include/sabredav/tests/Sabre/HTTP/VersionTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/Sabre/TestUtil.php b/include/sabredav/tests/Sabre/TestUtil.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/bootstrap.php b/include/sabredav/tests/bootstrap.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/composer.vobject3.json b/include/sabredav/tests/composer.vobject3.json
old mode 100644
new mode 100755
diff --git a/include/sabredav/tests/phpunit.xml b/include/sabredav/tests/phpunit.xml
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/autoload.php b/include/sabredav/vendor/autoload.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/composer/ClassLoader.php b/include/sabredav/vendor/composer/ClassLoader.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/composer/autoload_classmap.php b/include/sabredav/vendor/composer/autoload_classmap.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/composer/autoload_namespaces.php b/include/sabredav/vendor/composer/autoload_namespaces.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/composer/autoload_psr4.php b/include/sabredav/vendor/composer/autoload_psr4.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/composer/autoload_real.php b/include/sabredav/vendor/composer/autoload_real.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/composer/installed.json b/include/sabredav/vendor/composer/installed.json
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/.gitignore b/include/sabredav/vendor/sabre/vobject/.gitignore
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/.travis.yml b/include/sabredav/vendor/sabre/vobject/.travis.yml
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/ChangeLog b/include/sabredav/vendor/sabre/vobject/ChangeLog
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/LICENSE b/include/sabredav/vendor/sabre/vobject/LICENSE
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/README.md b/include/sabredav/vendor/sabre/vobject/README.md
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/bin/bench.php b/include/sabredav/vendor/sabre/vobject/bin/bench.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/bin/generateicalendardata.php b/include/sabredav/vendor/sabre/vobject/bin/generateicalendardata.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/bin/vobjectvalidate.php b/include/sabredav/vendor/sabre/vobject/bin/vobjectvalidate.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/composer.json b/include/sabredav/vendor/sabre/vobject/composer.json
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VAlarm.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VAlarm.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VCalendar.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VCalendar.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VCard.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VCard.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VEvent.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VEvent.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VFreeBusy.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VFreeBusy.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VJournal.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VJournal.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VTodo.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VTodo.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/DateTimeParser.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/DateTimeParser.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Document.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Document.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/ElementList.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/ElementList.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/FreeBusyGenerator.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/FreeBusyGenerator.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Node.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Node.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Parameter.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Parameter.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/ParseException.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/ParseException.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Property.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Property.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Property/Compound.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Property/Compound.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Property/DateTime.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Property/DateTime.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Property/MultiDateTime.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Property/MultiDateTime.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Reader.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Reader.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/RecurrenceIterator.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/RecurrenceIterator.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Splitter/ICalendar.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Splitter/ICalendar.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Splitter/SplitterInterface.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Splitter/SplitterInterface.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Splitter/VCard.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Splitter/VCard.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/StringUtil.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/StringUtil.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/TimeZoneUtil.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/TimeZoneUtil.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Version.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Version.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/includes.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/includes.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VAlarmTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VAlarmTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VCalendarTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VCalendarTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VCardTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VCardTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VEventTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VEventTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VFreeBusyTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VFreeBusyTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VJournalTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VJournalTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VTodoTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VTodoTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/ComponentTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/ComponentTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/DateTimeParserTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/DateTimeParserTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/DocumentTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/DocumentTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/ElementListTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/ElementListTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/EmClientTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/EmClientTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/FreeBusyGeneratorTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/FreeBusyGeneratorTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Issue153Test.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Issue153Test.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Issue154Test.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Issue154Test.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Issue48Test.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Issue48Test.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Issue50Test.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Issue50Test.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/ParameterTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/ParameterTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Property/CompoundTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Property/CompoundTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Property/DateTimeTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Property/DateTimeTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Property/MultiDateTimeTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Property/MultiDateTimeTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/PropertyTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/PropertyTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/ReaderTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/ReaderTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorFifthTuesdayProblemTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorFifthTuesdayProblemTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorIncorrectExpandTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorIncorrectExpandTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorInfiniteLoopProblemTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorInfiniteLoopProblemTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorMinusOneProblemTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorMinusOneProblemTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorMissingOverriddenTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorMissingOverriddenTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/SlashRTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/SlashRTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Splitter/ICalendarTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Splitter/ICalendarTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Splitter/VCardTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Splitter/VCardTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/StringUtilTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/StringUtilTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/TimeZoneUtilTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/TimeZoneUtilTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/VersionTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/VersionTest.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/issue153.vcf b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/issue153.vcf
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/tests/bootstrap.php b/include/sabredav/vendor/sabre/vobject/tests/bootstrap.php
old mode 100644
new mode 100755
diff --git a/include/sabredav/vendor/sabre/vobject/tests/phpunit.xml b/include/sabredav/vendor/sabre/vobject/tests/phpunit.xml
old mode 100644
new mode 100755
diff --git a/include/sancho.inc.php b/include/sancho.inc.php
old mode 100644
new mode 100755
diff --git a/include/schluesseltyp.class.php b/include/schluesseltyp.class.php
old mode 100644
new mode 100755
diff --git a/include/securimage/AHGBold.ttf b/include/securimage/AHGBold.ttf
old mode 100644
new mode 100755
diff --git a/include/securimage/LICENSE.txt b/include/securimage/LICENSE.txt
old mode 100644
new mode 100755
diff --git a/include/securimage/README.FONT.txt b/include/securimage/README.FONT.txt
old mode 100644
new mode 100755
diff --git a/include/securimage/README.txt b/include/securimage/README.txt
old mode 100644
new mode 100755
diff --git a/include/securimage/WavFile.php b/include/securimage/WavFile.php
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/en/0.wav b/include/securimage/audio/en/0.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/en/1.wav b/include/securimage/audio/en/1.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/en/10.wav b/include/securimage/audio/en/10.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/en/11.wav b/include/securimage/audio/en/11.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/en/12.wav b/include/securimage/audio/en/12.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/en/13.wav b/include/securimage/audio/en/13.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/en/14.wav b/include/securimage/audio/en/14.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/en/15.wav b/include/securimage/audio/en/15.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/en/16.wav b/include/securimage/audio/en/16.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/en/17.wav b/include/securimage/audio/en/17.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/en/18.wav b/include/securimage/audio/en/18.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/en/19.wav b/include/securimage/audio/en/19.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/en/2.wav b/include/securimage/audio/en/2.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/en/20.wav b/include/securimage/audio/en/20.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/en/3.wav b/include/securimage/audio/en/3.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/en/4.wav b/include/securimage/audio/en/4.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/en/5.wav b/include/securimage/audio/en/5.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/en/6.wav b/include/securimage/audio/en/6.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/en/7.wav b/include/securimage/audio/en/7.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/en/8.wav b/include/securimage/audio/en/8.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/en/9.wav b/include/securimage/audio/en/9.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/en/A.wav b/include/securimage/audio/en/A.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/en/B.wav b/include/securimage/audio/en/B.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/en/C.wav b/include/securimage/audio/en/C.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/en/D.wav b/include/securimage/audio/en/D.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/en/E.wav b/include/securimage/audio/en/E.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/en/F.wav b/include/securimage/audio/en/F.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/en/G.wav b/include/securimage/audio/en/G.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/en/H.wav b/include/securimage/audio/en/H.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/en/I.wav b/include/securimage/audio/en/I.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/en/J.wav b/include/securimage/audio/en/J.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/en/K.wav b/include/securimage/audio/en/K.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/en/L.wav b/include/securimage/audio/en/L.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/en/M.wav b/include/securimage/audio/en/M.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/en/MINUS.wav b/include/securimage/audio/en/MINUS.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/en/N.wav b/include/securimage/audio/en/N.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/en/O.wav b/include/securimage/audio/en/O.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/en/P.wav b/include/securimage/audio/en/P.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/en/PLUS.wav b/include/securimage/audio/en/PLUS.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/en/Q.wav b/include/securimage/audio/en/Q.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/en/R.wav b/include/securimage/audio/en/R.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/en/S.wav b/include/securimage/audio/en/S.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/en/T.wav b/include/securimage/audio/en/T.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/en/TIMES.wav b/include/securimage/audio/en/TIMES.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/en/U.wav b/include/securimage/audio/en/U.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/en/V.wav b/include/securimage/audio/en/V.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/en/W.wav b/include/securimage/audio/en/W.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/en/X.wav b/include/securimage/audio/en/X.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/en/Y.wav b/include/securimage/audio/en/Y.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/en/Z.wav b/include/securimage/audio/en/Z.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/en/error.wav b/include/securimage/audio/en/error.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/noise/check-point-1.wav b/include/securimage/audio/noise/check-point-1.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/noise/crowd-talking-1.wav b/include/securimage/audio/noise/crowd-talking-1.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/noise/crowd-talking-6.wav b/include/securimage/audio/noise/crowd-talking-6.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/noise/crowd-talking-7.wav b/include/securimage/audio/noise/crowd-talking-7.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/audio/noise/kids-playing-1.wav b/include/securimage/audio/noise/kids-playing-1.wav
old mode 100644
new mode 100755
diff --git a/include/securimage/backgrounds/bg3.jpg b/include/securimage/backgrounds/bg3.jpg
old mode 100644
new mode 100755
diff --git a/include/securimage/backgrounds/bg4.jpg b/include/securimage/backgrounds/bg4.jpg
old mode 100644
new mode 100755
diff --git a/include/securimage/backgrounds/bg5.jpg b/include/securimage/backgrounds/bg5.jpg
old mode 100644
new mode 100755
diff --git a/include/securimage/backgrounds/bg6.png b/include/securimage/backgrounds/bg6.png
old mode 100644
new mode 100755
diff --git a/include/securimage/captcha.html b/include/securimage/captcha.html
old mode 100644
new mode 100755
diff --git a/include/securimage/database/.htaccess b/include/securimage/database/.htaccess
old mode 100644
new mode 100755
diff --git a/include/securimage/database/index.html b/include/securimage/database/index.html
old mode 100644
new mode 100755
diff --git a/include/securimage/database/securimage.sq3 b/include/securimage/database/securimage.sq3
old mode 100644
new mode 100755
diff --git a/include/securimage/images/audio_icon.png b/include/securimage/images/audio_icon.png
old mode 100644
new mode 100755
diff --git a/include/securimage/images/refresh.png b/include/securimage/images/refresh.png
old mode 100644
new mode 100755
diff --git a/include/securimage/securimage.php b/include/securimage/securimage.php
old mode 100644
new mode 100755
diff --git a/include/securimage/securimage_play.php b/include/securimage/securimage_play.php
old mode 100644
new mode 100755
diff --git a/include/securimage/securimage_play.swf b/include/securimage/securimage_play.swf
old mode 100644
new mode 100755
diff --git a/include/securimage/securimage_show.php b/include/securimage/securimage_show.php
old mode 100644
new mode 100755
diff --git a/include/securimage/words/words.txt b/include/securimage/words/words.txt
old mode 100644
new mode 100755
diff --git a/include/service.class.php b/include/service.class.php
old mode 100644
new mode 100755
diff --git a/include/sprache.class.php b/include/sprache.class.php
old mode 100644
new mode 100755
diff --git a/include/standort.class.php b/include/standort.class.php
old mode 100644
new mode 100755
diff --git a/include/statistik.class.php b/include/statistik.class.php
old mode 100644
new mode 100755
diff --git a/include/statusgrund.class.php b/include/statusgrund.class.php
old mode 100644
new mode 100755
diff --git a/include/student.class.php b/include/student.class.php
old mode 100644
new mode 100755
diff --git a/include/studentnote.class.php b/include/studentnote.class.php
old mode 100644
new mode 100755
diff --git a/include/studiengang.class.php b/include/studiengang.class.php
old mode 100644
new mode 100755
diff --git a/include/studienjahr.class.php b/include/studienjahr.class.php
old mode 100644
new mode 100755
diff --git a/include/studienordnung.class.php b/include/studienordnung.class.php
old mode 100644
new mode 100755
diff --git a/include/studienplan.class.php b/include/studienplan.class.php
old mode 100644
new mode 100755
diff --git a/include/studienplatz.class.php b/include/studienplatz.class.php
old mode 100644
new mode 100755
diff --git a/include/studiensemester.class.php b/include/studiensemester.class.php
old mode 100644
new mode 100755
diff --git a/include/studierendenantrag.class.php b/include/studierendenantrag.class.php
old mode 100644
new mode 100755
diff --git a/include/stunde.class.php b/include/stunde.class.php
old mode 100644
new mode 100755
diff --git a/include/stundenplan.class.php b/include/stundenplan.class.php
old mode 100644
new mode 100755
diff --git a/include/tags.class.php b/include/tags.class.php
old mode 100644
new mode 100755
diff --git a/include/template.class.php b/include/template.class.php
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/langs/de.js b/include/tiny_mce/langs/de.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/langs/en.js b/include/tiny_mce/langs/en.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/license.txt b/include/tiny_mce/license.txt
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/advhr/css/advhr.css b/include/tiny_mce/plugins/advhr/css/advhr.css
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/advhr/editor_plugin.js b/include/tiny_mce/plugins/advhr/editor_plugin.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/advhr/editor_plugin_src.js b/include/tiny_mce/plugins/advhr/editor_plugin_src.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/advhr/js/rule.js b/include/tiny_mce/plugins/advhr/js/rule.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/advhr/langs/de_dlg.js b/include/tiny_mce/plugins/advhr/langs/de_dlg.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/advhr/langs/en_dlg.js b/include/tiny_mce/plugins/advhr/langs/en_dlg.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/advhr/rule.htm b/include/tiny_mce/plugins/advhr/rule.htm
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/advimage/css/advimage.css b/include/tiny_mce/plugins/advimage/css/advimage.css
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/advimage/editor_plugin.js b/include/tiny_mce/plugins/advimage/editor_plugin.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/advimage/editor_plugin_src.js b/include/tiny_mce/plugins/advimage/editor_plugin_src.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/advimage/image.htm b/include/tiny_mce/plugins/advimage/image.htm
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/advimage/img/sample.gif b/include/tiny_mce/plugins/advimage/img/sample.gif
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/advimage/js/image.js b/include/tiny_mce/plugins/advimage/js/image.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/advimage/langs/de_dlg.js b/include/tiny_mce/plugins/advimage/langs/de_dlg.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/advimage/langs/en_dlg.js b/include/tiny_mce/plugins/advimage/langs/en_dlg.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/advlink/css/advlink.css b/include/tiny_mce/plugins/advlink/css/advlink.css
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/advlink/editor_plugin.js b/include/tiny_mce/plugins/advlink/editor_plugin.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/advlink/editor_plugin_src.js b/include/tiny_mce/plugins/advlink/editor_plugin_src.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/advlink/js/advlink.js b/include/tiny_mce/plugins/advlink/js/advlink.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/advlink/langs/de_dlg.js b/include/tiny_mce/plugins/advlink/langs/de_dlg.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/advlink/langs/en_dlg.js b/include/tiny_mce/plugins/advlink/langs/en_dlg.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/advlink/link.htm b/include/tiny_mce/plugins/advlink/link.htm
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/advlist/editor_plugin.js b/include/tiny_mce/plugins/advlist/editor_plugin.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/advlist/editor_plugin_src.js b/include/tiny_mce/plugins/advlist/editor_plugin_src.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/autoresize/editor_plugin.js b/include/tiny_mce/plugins/autoresize/editor_plugin.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/autoresize/editor_plugin_src.js b/include/tiny_mce/plugins/autoresize/editor_plugin_src.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/autosave/editor_plugin.js b/include/tiny_mce/plugins/autosave/editor_plugin.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/autosave/editor_plugin_src.js b/include/tiny_mce/plugins/autosave/editor_plugin_src.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/autosave/langs/en.js b/include/tiny_mce/plugins/autosave/langs/en.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/bbcode/editor_plugin.js b/include/tiny_mce/plugins/bbcode/editor_plugin.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/bbcode/editor_plugin_src.js b/include/tiny_mce/plugins/bbcode/editor_plugin_src.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/contextmenu/editor_plugin.js b/include/tiny_mce/plugins/contextmenu/editor_plugin.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/contextmenu/editor_plugin_src.js b/include/tiny_mce/plugins/contextmenu/editor_plugin_src.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/directionality/editor_plugin.js b/include/tiny_mce/plugins/directionality/editor_plugin.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/directionality/editor_plugin_src.js b/include/tiny_mce/plugins/directionality/editor_plugin_src.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/emotions/editor_plugin.js b/include/tiny_mce/plugins/emotions/editor_plugin.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/emotions/editor_plugin_src.js b/include/tiny_mce/plugins/emotions/editor_plugin_src.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/emotions/emotions.htm b/include/tiny_mce/plugins/emotions/emotions.htm
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/emotions/img/smiley-cool.gif b/include/tiny_mce/plugins/emotions/img/smiley-cool.gif
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/emotions/img/smiley-cry.gif b/include/tiny_mce/plugins/emotions/img/smiley-cry.gif
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/emotions/img/smiley-embarassed.gif b/include/tiny_mce/plugins/emotions/img/smiley-embarassed.gif
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif b/include/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/emotions/img/smiley-frown.gif b/include/tiny_mce/plugins/emotions/img/smiley-frown.gif
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/emotions/img/smiley-innocent.gif b/include/tiny_mce/plugins/emotions/img/smiley-innocent.gif
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/emotions/img/smiley-kiss.gif b/include/tiny_mce/plugins/emotions/img/smiley-kiss.gif
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/emotions/img/smiley-laughing.gif b/include/tiny_mce/plugins/emotions/img/smiley-laughing.gif
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/emotions/img/smiley-money-mouth.gif b/include/tiny_mce/plugins/emotions/img/smiley-money-mouth.gif
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/emotions/img/smiley-sealed.gif b/include/tiny_mce/plugins/emotions/img/smiley-sealed.gif
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/emotions/img/smiley-smile.gif b/include/tiny_mce/plugins/emotions/img/smiley-smile.gif
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/emotions/img/smiley-surprised.gif b/include/tiny_mce/plugins/emotions/img/smiley-surprised.gif
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/emotions/img/smiley-tongue-out.gif b/include/tiny_mce/plugins/emotions/img/smiley-tongue-out.gif
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/emotions/img/smiley-undecided.gif b/include/tiny_mce/plugins/emotions/img/smiley-undecided.gif
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/emotions/img/smiley-wink.gif b/include/tiny_mce/plugins/emotions/img/smiley-wink.gif
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/emotions/img/smiley-yell.gif b/include/tiny_mce/plugins/emotions/img/smiley-yell.gif
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/emotions/js/emotions.js b/include/tiny_mce/plugins/emotions/js/emotions.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/emotions/langs/de_dlg.js b/include/tiny_mce/plugins/emotions/langs/de_dlg.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/emotions/langs/en_dlg.js b/include/tiny_mce/plugins/emotions/langs/en_dlg.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/example/dialog.htm b/include/tiny_mce/plugins/example/dialog.htm
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/example/editor_plugin.js b/include/tiny_mce/plugins/example/editor_plugin.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/example/editor_plugin_src.js b/include/tiny_mce/plugins/example/editor_plugin_src.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/example/img/example.gif b/include/tiny_mce/plugins/example/img/example.gif
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/example/js/dialog.js b/include/tiny_mce/plugins/example/js/dialog.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/example/langs/en.js b/include/tiny_mce/plugins/example/langs/en.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/example/langs/en_dlg.js b/include/tiny_mce/plugins/example/langs/en_dlg.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/fullpage/css/fullpage.css b/include/tiny_mce/plugins/fullpage/css/fullpage.css
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/fullpage/editor_plugin.js b/include/tiny_mce/plugins/fullpage/editor_plugin.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/fullpage/editor_plugin_src.js b/include/tiny_mce/plugins/fullpage/editor_plugin_src.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/fullpage/fullpage.htm b/include/tiny_mce/plugins/fullpage/fullpage.htm
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/fullpage/js/fullpage.js b/include/tiny_mce/plugins/fullpage/js/fullpage.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/fullpage/langs/de_dlg.js b/include/tiny_mce/plugins/fullpage/langs/de_dlg.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/fullpage/langs/en_dlg.js b/include/tiny_mce/plugins/fullpage/langs/en_dlg.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/fullscreen/editor_plugin.js b/include/tiny_mce/plugins/fullscreen/editor_plugin.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/fullscreen/editor_plugin_src.js b/include/tiny_mce/plugins/fullscreen/editor_plugin_src.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/fullscreen/fullscreen.htm b/include/tiny_mce/plugins/fullscreen/fullscreen.htm
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/iespell/editor_plugin.js b/include/tiny_mce/plugins/iespell/editor_plugin.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/iespell/editor_plugin_src.js b/include/tiny_mce/plugins/iespell/editor_plugin_src.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/inlinepopups/editor_plugin.js b/include/tiny_mce/plugins/inlinepopups/editor_plugin.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/inlinepopups/editor_plugin_src.js b/include/tiny_mce/plugins/inlinepopups/editor_plugin_src.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif b/include/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/button.gif b/include/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/button.gif
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif b/include/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif b/include/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif b/include/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif b/include/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif b/include/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.css b/include/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.css
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/inlinepopups/template.htm b/include/tiny_mce/plugins/inlinepopups/template.htm
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/insertdatetime/editor_plugin.js b/include/tiny_mce/plugins/insertdatetime/editor_plugin.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/insertdatetime/editor_plugin_src.js b/include/tiny_mce/plugins/insertdatetime/editor_plugin_src.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/layer/editor_plugin.js b/include/tiny_mce/plugins/layer/editor_plugin.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/layer/editor_plugin_src.js b/include/tiny_mce/plugins/layer/editor_plugin_src.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/legacyoutput/editor_plugin.js b/include/tiny_mce/plugins/legacyoutput/editor_plugin.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/legacyoutput/editor_plugin_src.js b/include/tiny_mce/plugins/legacyoutput/editor_plugin_src.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/media/css/media.css b/include/tiny_mce/plugins/media/css/media.css
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/media/editor_plugin.js b/include/tiny_mce/plugins/media/editor_plugin.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/media/editor_plugin_src.js b/include/tiny_mce/plugins/media/editor_plugin_src.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/media/js/embed.js b/include/tiny_mce/plugins/media/js/embed.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/media/js/media.js b/include/tiny_mce/plugins/media/js/media.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/media/langs/de_dlg.js b/include/tiny_mce/plugins/media/langs/de_dlg.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/media/langs/en_dlg.js b/include/tiny_mce/plugins/media/langs/en_dlg.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/media/media.htm b/include/tiny_mce/plugins/media/media.htm
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/media/moxieplayer.swf b/include/tiny_mce/plugins/media/moxieplayer.swf
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/nonbreaking/editor_plugin.js b/include/tiny_mce/plugins/nonbreaking/editor_plugin.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/nonbreaking/editor_plugin_src.js b/include/tiny_mce/plugins/nonbreaking/editor_plugin_src.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/noneditable/editor_plugin.js b/include/tiny_mce/plugins/noneditable/editor_plugin.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/noneditable/editor_plugin_src.js b/include/tiny_mce/plugins/noneditable/editor_plugin_src.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/pagebreak/editor_plugin.js b/include/tiny_mce/plugins/pagebreak/editor_plugin.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/pagebreak/editor_plugin_src.js b/include/tiny_mce/plugins/pagebreak/editor_plugin_src.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/paste/editor_plugin.js b/include/tiny_mce/plugins/paste/editor_plugin.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/paste/editor_plugin_src.js b/include/tiny_mce/plugins/paste/editor_plugin_src.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/paste/js/pastetext.js b/include/tiny_mce/plugins/paste/js/pastetext.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/paste/js/pasteword.js b/include/tiny_mce/plugins/paste/js/pasteword.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/paste/langs/de_dlg.js b/include/tiny_mce/plugins/paste/langs/de_dlg.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/paste/langs/en_dlg.js b/include/tiny_mce/plugins/paste/langs/en_dlg.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/paste/pastetext.htm b/include/tiny_mce/plugins/paste/pastetext.htm
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/paste/pasteword.htm b/include/tiny_mce/plugins/paste/pasteword.htm
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/preview/editor_plugin.js b/include/tiny_mce/plugins/preview/editor_plugin.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/preview/editor_plugin_src.js b/include/tiny_mce/plugins/preview/editor_plugin_src.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/preview/example.html b/include/tiny_mce/plugins/preview/example.html
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/preview/jscripts/embed.js b/include/tiny_mce/plugins/preview/jscripts/embed.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/preview/preview.html b/include/tiny_mce/plugins/preview/preview.html
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/print/editor_plugin.js b/include/tiny_mce/plugins/print/editor_plugin.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/print/editor_plugin_src.js b/include/tiny_mce/plugins/print/editor_plugin_src.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/save/editor_plugin.js b/include/tiny_mce/plugins/save/editor_plugin.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/save/editor_plugin_src.js b/include/tiny_mce/plugins/save/editor_plugin_src.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/searchreplace/css/searchreplace.css b/include/tiny_mce/plugins/searchreplace/css/searchreplace.css
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/searchreplace/editor_plugin.js b/include/tiny_mce/plugins/searchreplace/editor_plugin.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/searchreplace/editor_plugin_src.js b/include/tiny_mce/plugins/searchreplace/editor_plugin_src.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/searchreplace/js/searchreplace.js b/include/tiny_mce/plugins/searchreplace/js/searchreplace.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/searchreplace/langs/de_dlg.js b/include/tiny_mce/plugins/searchreplace/langs/de_dlg.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/searchreplace/langs/en_dlg.js b/include/tiny_mce/plugins/searchreplace/langs/en_dlg.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/searchreplace/searchreplace.htm b/include/tiny_mce/plugins/searchreplace/searchreplace.htm
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/spellchecker/css/content.css b/include/tiny_mce/plugins/spellchecker/css/content.css
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/spellchecker/editor_plugin.js b/include/tiny_mce/plugins/spellchecker/editor_plugin.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/spellchecker/editor_plugin_src.js b/include/tiny_mce/plugins/spellchecker/editor_plugin_src.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/spellchecker/img/wline.gif b/include/tiny_mce/plugins/spellchecker/img/wline.gif
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/style/css/props.css b/include/tiny_mce/plugins/style/css/props.css
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/style/editor_plugin.js b/include/tiny_mce/plugins/style/editor_plugin.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/style/editor_plugin_src.js b/include/tiny_mce/plugins/style/editor_plugin_src.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/style/js/props.js b/include/tiny_mce/plugins/style/js/props.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/style/langs/de_dlg.js b/include/tiny_mce/plugins/style/langs/de_dlg.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/style/langs/en_dlg.js b/include/tiny_mce/plugins/style/langs/en_dlg.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/style/props.htm b/include/tiny_mce/plugins/style/props.htm
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/tabfocus/editor_plugin.js b/include/tiny_mce/plugins/tabfocus/editor_plugin.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/tabfocus/editor_plugin_src.js b/include/tiny_mce/plugins/tabfocus/editor_plugin_src.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/table/cell.htm b/include/tiny_mce/plugins/table/cell.htm
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/table/css/cell.css b/include/tiny_mce/plugins/table/css/cell.css
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/table/css/row.css b/include/tiny_mce/plugins/table/css/row.css
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/table/css/table.css b/include/tiny_mce/plugins/table/css/table.css
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/table/editor_plugin.js b/include/tiny_mce/plugins/table/editor_plugin.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/table/editor_plugin_src.js b/include/tiny_mce/plugins/table/editor_plugin_src.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/table/js/cell.js b/include/tiny_mce/plugins/table/js/cell.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/table/js/merge_cells.js b/include/tiny_mce/plugins/table/js/merge_cells.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/table/js/row.js b/include/tiny_mce/plugins/table/js/row.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/table/js/table.js b/include/tiny_mce/plugins/table/js/table.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/table/langs/de_dlg.js b/include/tiny_mce/plugins/table/langs/de_dlg.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/table/langs/en_dlg.js b/include/tiny_mce/plugins/table/langs/en_dlg.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/table/merge_cells.htm b/include/tiny_mce/plugins/table/merge_cells.htm
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/table/row.htm b/include/tiny_mce/plugins/table/row.htm
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/table/table.htm b/include/tiny_mce/plugins/table/table.htm
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/template/blank.htm b/include/tiny_mce/plugins/template/blank.htm
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/template/css/template.css b/include/tiny_mce/plugins/template/css/template.css
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/template/editor_plugin.js b/include/tiny_mce/plugins/template/editor_plugin.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/template/editor_plugin_src.js b/include/tiny_mce/plugins/template/editor_plugin_src.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/template/js/template.js b/include/tiny_mce/plugins/template/js/template.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/template/langs/de_dlg.js b/include/tiny_mce/plugins/template/langs/de_dlg.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/template/langs/en_dlg.js b/include/tiny_mce/plugins/template/langs/en_dlg.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/template/template.htm b/include/tiny_mce/plugins/template/template.htm
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/visualchars/editor_plugin.js b/include/tiny_mce/plugins/visualchars/editor_plugin.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/visualchars/editor_plugin_src.js b/include/tiny_mce/plugins/visualchars/editor_plugin_src.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/wordc/langs/de_dlg.js b/include/tiny_mce/plugins/wordc/langs/de_dlg.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/wordc/langs/en_dlg.js b/include/tiny_mce/plugins/wordc/langs/en_dlg.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/wordcount/editor_plugin.js b/include/tiny_mce/plugins/wordcount/editor_plugin.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/wordcount/editor_plugin_src.js b/include/tiny_mce/plugins/wordcount/editor_plugin_src.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/xhtmlxtras/abbr.htm b/include/tiny_mce/plugins/xhtmlxtras/abbr.htm
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/xhtmlxtras/acronym.htm b/include/tiny_mce/plugins/xhtmlxtras/acronym.htm
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/xhtmlxtras/attributes.htm b/include/tiny_mce/plugins/xhtmlxtras/attributes.htm
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/xhtmlxtras/cite.htm b/include/tiny_mce/plugins/xhtmlxtras/cite.htm
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/xhtmlxtras/css/attributes.css b/include/tiny_mce/plugins/xhtmlxtras/css/attributes.css
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/xhtmlxtras/css/popup.css b/include/tiny_mce/plugins/xhtmlxtras/css/popup.css
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/xhtmlxtras/del.htm b/include/tiny_mce/plugins/xhtmlxtras/del.htm
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/xhtmlxtras/editor_plugin.js b/include/tiny_mce/plugins/xhtmlxtras/editor_plugin.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js b/include/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/xhtmlxtras/ins.htm b/include/tiny_mce/plugins/xhtmlxtras/ins.htm
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/xhtmlxtras/js/abbr.js b/include/tiny_mce/plugins/xhtmlxtras/js/abbr.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/xhtmlxtras/js/acronym.js b/include/tiny_mce/plugins/xhtmlxtras/js/acronym.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/xhtmlxtras/js/attributes.js b/include/tiny_mce/plugins/xhtmlxtras/js/attributes.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/xhtmlxtras/js/cite.js b/include/tiny_mce/plugins/xhtmlxtras/js/cite.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/xhtmlxtras/js/del.js b/include/tiny_mce/plugins/xhtmlxtras/js/del.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/xhtmlxtras/js/element_common.js b/include/tiny_mce/plugins/xhtmlxtras/js/element_common.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/xhtmlxtras/js/ins.js b/include/tiny_mce/plugins/xhtmlxtras/js/ins.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/xhtmlxtras/langs/de_dlg.js b/include/tiny_mce/plugins/xhtmlxtras/langs/de_dlg.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js b/include/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/advanced/about.htm b/include/tiny_mce/themes/advanced/about.htm
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/advanced/anchor.htm b/include/tiny_mce/themes/advanced/anchor.htm
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/advanced/charmap.htm b/include/tiny_mce/themes/advanced/charmap.htm
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/advanced/color_picker.htm b/include/tiny_mce/themes/advanced/color_picker.htm
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/advanced/editor_template.js b/include/tiny_mce/themes/advanced/editor_template.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/advanced/editor_template_src.js b/include/tiny_mce/themes/advanced/editor_template_src.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/advanced/image.htm b/include/tiny_mce/themes/advanced/image.htm
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/advanced/img/colorpicker.jpg b/include/tiny_mce/themes/advanced/img/colorpicker.jpg
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/advanced/img/flash.gif b/include/tiny_mce/themes/advanced/img/flash.gif
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/advanced/img/icons.gif b/include/tiny_mce/themes/advanced/img/icons.gif
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/advanced/img/iframe.gif b/include/tiny_mce/themes/advanced/img/iframe.gif
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/advanced/img/pagebreak.gif b/include/tiny_mce/themes/advanced/img/pagebreak.gif
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/advanced/img/quicktime.gif b/include/tiny_mce/themes/advanced/img/quicktime.gif
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/advanced/img/realmedia.gif b/include/tiny_mce/themes/advanced/img/realmedia.gif
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/advanced/img/shockwave.gif b/include/tiny_mce/themes/advanced/img/shockwave.gif
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/advanced/img/trans.gif b/include/tiny_mce/themes/advanced/img/trans.gif
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/advanced/img/video.gif b/include/tiny_mce/themes/advanced/img/video.gif
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/advanced/img/windowsmedia.gif b/include/tiny_mce/themes/advanced/img/windowsmedia.gif
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/advanced/js/about.js b/include/tiny_mce/themes/advanced/js/about.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/advanced/js/anchor.js b/include/tiny_mce/themes/advanced/js/anchor.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/advanced/js/charmap.js b/include/tiny_mce/themes/advanced/js/charmap.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/advanced/js/color_picker.js b/include/tiny_mce/themes/advanced/js/color_picker.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/advanced/js/image.js b/include/tiny_mce/themes/advanced/js/image.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/advanced/js/link.js b/include/tiny_mce/themes/advanced/js/link.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/advanced/js/source_editor.js b/include/tiny_mce/themes/advanced/js/source_editor.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/advanced/langs/de.js b/include/tiny_mce/themes/advanced/langs/de.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/advanced/langs/de_dlg.js b/include/tiny_mce/themes/advanced/langs/de_dlg.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/advanced/langs/en.js b/include/tiny_mce/themes/advanced/langs/en.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/advanced/langs/en_dlg.js b/include/tiny_mce/themes/advanced/langs/en_dlg.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/advanced/link.htm b/include/tiny_mce/themes/advanced/link.htm
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/advanced/shortcuts.htm b/include/tiny_mce/themes/advanced/shortcuts.htm
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/advanced/skins/default/content.css b/include/tiny_mce/themes/advanced/skins/default/content.css
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/advanced/skins/default/dialog.css b/include/tiny_mce/themes/advanced/skins/default/dialog.css
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/advanced/skins/default/img/buttons.png b/include/tiny_mce/themes/advanced/skins/default/img/buttons.png
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/advanced/skins/default/img/items.gif b/include/tiny_mce/themes/advanced/skins/default/img/items.gif
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/advanced/skins/default/img/menu_arrow.gif b/include/tiny_mce/themes/advanced/skins/default/img/menu_arrow.gif
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/advanced/skins/default/img/menu_check.gif b/include/tiny_mce/themes/advanced/skins/default/img/menu_check.gif
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/advanced/skins/default/img/progress.gif b/include/tiny_mce/themes/advanced/skins/default/img/progress.gif
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/advanced/skins/default/img/tabs.gif b/include/tiny_mce/themes/advanced/skins/default/img/tabs.gif
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/advanced/skins/default/ui.css b/include/tiny_mce/themes/advanced/skins/default/ui.css
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/advanced/skins/highcontrast/content.css b/include/tiny_mce/themes/advanced/skins/highcontrast/content.css
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/advanced/skins/highcontrast/dialog.css b/include/tiny_mce/themes/advanced/skins/highcontrast/dialog.css
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/advanced/skins/highcontrast/ui.css b/include/tiny_mce/themes/advanced/skins/highcontrast/ui.css
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/advanced/skins/o2k7/content.css b/include/tiny_mce/themes/advanced/skins/o2k7/content.css
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/advanced/skins/o2k7/dialog.css b/include/tiny_mce/themes/advanced/skins/o2k7/dialog.css
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png b/include/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_black.png b/include/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_black.png
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_silver.png b/include/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_silver.png
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/advanced/skins/o2k7/ui.css b/include/tiny_mce/themes/advanced/skins/o2k7/ui.css
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/advanced/skins/o2k7/ui_black.css b/include/tiny_mce/themes/advanced/skins/o2k7/ui_black.css
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css b/include/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/advanced/source_editor.htm b/include/tiny_mce/themes/advanced/source_editor.htm
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/simple/editor_template.js b/include/tiny_mce/themes/simple/editor_template.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/simple/editor_template_src.js b/include/tiny_mce/themes/simple/editor_template_src.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/simple/img/icons.gif b/include/tiny_mce/themes/simple/img/icons.gif
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/simple/langs/de.js b/include/tiny_mce/themes/simple/langs/de.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/simple/langs/en.js b/include/tiny_mce/themes/simple/langs/en.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/simple/skins/default/content.css b/include/tiny_mce/themes/simple/skins/default/content.css
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/simple/skins/default/ui.css b/include/tiny_mce/themes/simple/skins/default/ui.css
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/simple/skins/o2k7/content.css b/include/tiny_mce/themes/simple/skins/o2k7/content.css
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/simple/skins/o2k7/img/button_bg.png b/include/tiny_mce/themes/simple/skins/o2k7/img/button_bg.png
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/themes/simple/skins/o2k7/ui.css b/include/tiny_mce/themes/simple/skins/o2k7/ui.css
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/tiny_mce.js b/include/tiny_mce/tiny_mce.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/tiny_mce_popup.js b/include/tiny_mce/tiny_mce_popup.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/tiny_mce_src.js b/include/tiny_mce/tiny_mce_src.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/utils/editable_selects.js b/include/tiny_mce/utils/editable_selects.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/utils/form_utils.js b/include/tiny_mce/utils/form_utils.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/utils/mctabs.js b/include/tiny_mce/utils/mctabs.js
old mode 100644
new mode 100755
diff --git a/include/tiny_mce/utils/validate.js b/include/tiny_mce/utils/validate.js
old mode 100644
new mode 100755
diff --git a/include/tw/abgabe_lektor_benotung.php b/include/tw/abgabe_lektor_benotung.php
old mode 100644
new mode 100755
diff --git a/include/tw/cis_menu_lv.inc.php b/include/tw/cis_menu_lv.inc.php
old mode 100644
new mode 100755
diff --git a/include/tw/fas_zusatzmenues.inc.php b/include/tw/fas_zusatzmenues.inc.php
old mode 100644
new mode 100755
diff --git a/include/tw/fas_zusatzmenues.js.php b/include/tw/fas_zusatzmenues.js.php
old mode 100644
new mode 100755
diff --git a/include/tw/generateZahlungsreferenz.inc.php b/include/tw/generateZahlungsreferenz.inc.php
old mode 100644
new mode 100755
diff --git a/include/tw/generatematrikelnr.inc.php b/include/tw/generatematrikelnr.inc.php
old mode 100644
new mode 100755
diff --git a/include/tw/generateuid.inc.php b/include/tw/generateuid.inc.php
old mode 100644
new mode 100755
diff --git a/include/tw/index.html b/include/tw/index.html
old mode 100644
new mode 100755
diff --git a/include/tw/passwort.inc.php b/include/tw/passwort.inc.php
old mode 100644
new mode 100755
diff --git a/include/tw/serviceterminal.inc.php b/include/tw/serviceterminal.inc.php
old mode 100644
new mode 100755
diff --git a/include/tw/vilesci_menu_main.inc.php b/include/tw/vilesci_menu_main.inc.php
old mode 100644
new mode 100755
diff --git a/include/tw/wawi_menu_main.inc.php b/include/tw/wawi_menu_main.inc.php
old mode 100644
new mode 100755
diff --git a/include/udf.class.php b/include/udf.class.php
old mode 100644
new mode 100755
diff --git a/include/uebung.class.php b/include/uebung.class.php
old mode 100644
new mode 100755
diff --git a/include/variable.class.php b/include/variable.class.php
old mode 100644
new mode 100755
diff --git a/include/vendor_custom/angular-tablesorter/tablesort.css b/include/vendor_custom/angular-tablesorter/tablesort.css
old mode 100644
new mode 100755
diff --git a/include/vendor_custom/easyui/easyui.css b/include/vendor_custom/easyui/easyui.css
old mode 100644
new mode 100755
diff --git a/include/vendor_custom/easyui/icon.css b/include/vendor_custom/easyui/icon.css
old mode 100644
new mode 100755
diff --git a/include/vendor_custom/jquery-tablesorter/tablesort.css b/include/vendor_custom/jquery-tablesorter/tablesort.css
old mode 100644
new mode 100755
diff --git a/include/vertrag.class.php b/include/vertrag.class.php
old mode 100644
new mode 100755
diff --git a/include/vorlage.class.php b/include/vorlage.class.php
old mode 100644
new mode 100755
diff --git a/include/vorschlag.class.php b/include/vorschlag.class.php
old mode 100644
new mode 100755
diff --git a/include/wawi_aufteilung.class.php b/include/wawi_aufteilung.class.php
old mode 100644
new mode 100755
diff --git a/include/wawi_bestelldetail.class.php b/include/wawi_bestelldetail.class.php
old mode 100644
new mode 100755
diff --git a/include/wawi_bestellstatus.class.php b/include/wawi_bestellstatus.class.php
old mode 100644
new mode 100755
diff --git a/include/wawi_bestellung.class.php b/include/wawi_bestellung.class.php
old mode 100644
new mode 100755
diff --git a/include/wawi_konto.class.php b/include/wawi_konto.class.php
old mode 100644
new mode 100755
diff --git a/include/wawi_kostenstelle.class.php b/include/wawi_kostenstelle.class.php
old mode 100644
new mode 100755
diff --git a/include/wawi_rechnung.class.php b/include/wawi_rechnung.class.php
old mode 100644
new mode 100755
diff --git a/include/wawi_zahlungstyp.class.php b/include/wawi_zahlungstyp.class.php
old mode 100644
new mode 100755
diff --git a/include/webservicelog.class.php b/include/webservicelog.class.php
old mode 100644
new mode 100755
diff --git a/include/webservicerecht.class.php b/include/webservicerecht.class.php
old mode 100644
new mode 100755
diff --git a/include/wochenplan.class.php b/include/wochenplan.class.php
old mode 100644
new mode 100755
diff --git a/include/xmlrpcutils/utils.php b/include/xmlrpcutils/utils.php
old mode 100644
new mode 100755
diff --git a/include/xsdformprinter/config.inc.php b/include/xsdformprinter/config.inc.php
old mode 100644
new mode 100755
diff --git a/include/xsdformprinter/examples/shiporder.xml b/include/xsdformprinter/examples/shiporder.xml
old mode 100644
new mode 100755
diff --git a/include/xsdformprinter/examples/shiporder1.xsd b/include/xsdformprinter/examples/shiporder1.xsd
old mode 100644
new mode 100755
diff --git a/include/xsdformprinter/examples/shiporder2.xsd b/include/xsdformprinter/examples/shiporder2.xsd
old mode 100644
new mode 100755
diff --git a/include/xsdformprinter/style.css b/include/xsdformprinter/style.css
old mode 100644
new mode 100755
diff --git a/include/xsdformprinter/types.php b/include/xsdformprinter/types.php
old mode 100644
new mode 100755
diff --git a/include/xsdformprinter/xfp.php b/include/xsdformprinter/xfp.php
old mode 100644
new mode 100755
diff --git a/include/xsdformprinter/xsdformprinter.php b/include/xsdformprinter/xsdformprinter.php
old mode 100644
new mode 100755
diff --git a/include/zeitaufzeichnung.class.php b/include/zeitaufzeichnung.class.php
old mode 100644
new mode 100755
diff --git a/include/zeitaufzeichnung_gd.class.php b/include/zeitaufzeichnung_gd.class.php
old mode 100644
new mode 100755
diff --git a/include/zeitaufzeichnung_import.class.php b/include/zeitaufzeichnung_import.class.php
old mode 100644
new mode 100755
diff --git a/include/zeitaufzeichnung_import_csv.class.php b/include/zeitaufzeichnung_import_csv.class.php
old mode 100644
new mode 100755
diff --git a/include/zeitaufzeichnung_import_post.class.php b/include/zeitaufzeichnung_import_post.class.php
old mode 100644
new mode 100755
diff --git a/include/zeitsperre.class.php b/include/zeitsperre.class.php
old mode 100644
new mode 100755
diff --git a/include/zeitwunsch.class.php b/include/zeitwunsch.class.php
old mode 100644
new mode 100755
diff --git a/include/zeitwunsch_gueltigkeit.class.php b/include/zeitwunsch_gueltigkeit.class.php
old mode 100644
new mode 100755
diff --git a/include/zeugnisnote.class.php b/include/zeugnisnote.class.php
old mode 100644
new mode 100755
diff --git a/include/zgv.class.php b/include/zgv.class.php
old mode 100644
new mode 100755
diff --git a/include/zweck.class.php b/include/zweck.class.php
old mode 100644
new mode 100755
diff --git a/index.ci.php b/index.ci.php
old mode 100644
new mode 100755
diff --git a/index.cis.html b/index.cis.html
old mode 100644
new mode 100755
diff --git a/index.vilesci.php b/index.vilesci.php
old mode 100644
new mode 100755
diff --git a/locale/contents.rdf b/locale/contents.rdf
old mode 100644
new mode 100755
diff --git a/locale/de-AT/abgabetool.php b/locale/de-AT/abgabetool.php
old mode 100644
new mode 100755
diff --git a/locale/de-AT/anwesenheitsliste.php b/locale/de-AT/anwesenheitsliste.php
old mode 100644
new mode 100755
diff --git a/locale/de-AT/benotungstool.php b/locale/de-AT/benotungstool.php
old mode 100644
new mode 100755
diff --git a/locale/de-AT/buchungen.php b/locale/de-AT/buchungen.php
old mode 100644
new mode 100755
diff --git a/locale/de-AT/contents.rdf b/locale/de-AT/contents.rdf
old mode 100644
new mode 100755
diff --git a/locale/de-AT/coodle.php b/locale/de-AT/coodle.php
old mode 100644
new mode 100755
diff --git a/locale/de-AT/courseInformation.php b/locale/de-AT/courseInformation.php
old mode 100644
new mode 100755
diff --git a/locale/de-AT/dms_link.php b/locale/de-AT/dms_link.php
old mode 100644
new mode 100755
diff --git a/locale/de-AT/errors.php b/locale/de-AT/errors.php
old mode 100644
new mode 100755
diff --git a/locale/de-AT/eventkalender.php b/locale/de-AT/eventkalender.php
old mode 100644
new mode 100755
diff --git a/locale/de-AT/fas.dtd b/locale/de-AT/fas.dtd
old mode 100644
new mode 100755
diff --git a/locale/de-AT/feedback.php b/locale/de-AT/feedback.php
old mode 100644
new mode 100755
diff --git a/locale/de-AT/freebusy.php b/locale/de-AT/freebusy.php
old mode 100644
new mode 100755
diff --git a/locale/de-AT/freifach.php b/locale/de-AT/freifach.php
old mode 100644
new mode 100755
diff --git a/locale/de-AT/gesamtnote.php b/locale/de-AT/gesamtnote.php
old mode 100644
new mode 100755
diff --git a/locale/de-AT/global.php b/locale/de-AT/global.php
old mode 100644
new mode 100755
diff --git a/locale/de-AT/incoming.php b/locale/de-AT/incoming.php
old mode 100644
new mode 100755
diff --git a/locale/de-AT/ktu.php b/locale/de-AT/ktu.php
old mode 100644
new mode 100755
diff --git a/locale/de-AT/lehre.php b/locale/de-AT/lehre.php
old mode 100644
new mode 100755
diff --git a/locale/de-AT/lehrveranstaltung.php b/locale/de-AT/lehrveranstaltung.php
old mode 100644
new mode 100755
diff --git a/locale/de-AT/lvaliste.php b/locale/de-AT/lvaliste.php
old mode 100644
new mode 100755
diff --git a/locale/de-AT/lvinfo.php b/locale/de-AT/lvinfo.php
old mode 100644
new mode 100755
diff --git a/locale/de-AT/lvplan.php b/locale/de-AT/lvplan.php
old mode 100644
new mode 100755
diff --git a/locale/de-AT/mail.php b/locale/de-AT/mail.php
old mode 100644
new mode 100755
diff --git a/locale/de-AT/mailverteiler.php b/locale/de-AT/mailverteiler.php
old mode 100644
new mode 100755
diff --git a/locale/de-AT/menu.php b/locale/de-AT/menu.php
old mode 100644
new mode 100755
diff --git a/locale/de-AT/news.php b/locale/de-AT/news.php
old mode 100644
new mode 100755
diff --git a/locale/de-AT/notebookregister.php b/locale/de-AT/notebookregister.php
old mode 100644
new mode 100755
diff --git a/locale/de-AT/notfallbestimmungen.php b/locale/de-AT/notfallbestimmungen.php
old mode 100644
new mode 100755
diff --git a/locale/de-AT/passwort.php b/locale/de-AT/passwort.php
old mode 100644
new mode 100755
diff --git a/locale/de-AT/personensuche.php b/locale/de-AT/personensuche.php
old mode 100644
new mode 100755
diff --git a/locale/de-AT/planner.dtd b/locale/de-AT/planner.dtd
old mode 100644
new mode 100755
diff --git a/locale/de-AT/profil.php b/locale/de-AT/profil.php
old mode 100644
new mode 100755
diff --git a/locale/de-AT/pruefung.php b/locale/de-AT/pruefung.php
old mode 100644
new mode 100755
diff --git a/locale/de-AT/reihungstest.php b/locale/de-AT/reihungstest.php
old mode 100644
new mode 100755
diff --git a/locale/de-AT/semesterplan.php b/locale/de-AT/semesterplan.php
old mode 100644
new mode 100755
diff --git a/locale/de-AT/services.php b/locale/de-AT/services.php
old mode 100644
new mode 100755
diff --git a/locale/de-AT/studienplan.php b/locale/de-AT/studienplan.php
old mode 100644
new mode 100755
diff --git a/locale/de-AT/studierendenantrag.php b/locale/de-AT/studierendenantrag.php
old mode 100644
new mode 100755
diff --git a/locale/de-AT/telefonverzeichnis.php b/locale/de-AT/telefonverzeichnis.php
old mode 100644
new mode 100755
diff --git a/locale/de-AT/tempus.dtd b/locale/de-AT/tempus.dtd
old mode 100644
new mode 100755
diff --git a/locale/de-AT/testtool.php b/locale/de-AT/testtool.php
old mode 100644
new mode 100755
diff --git a/locale/de-AT/tools.php b/locale/de-AT/tools.php
old mode 100644
new mode 100755
diff --git a/locale/de-AT/upload.php b/locale/de-AT/upload.php
old mode 100644
new mode 100755
diff --git a/locale/de-AT/urlaubstool.php b/locale/de-AT/urlaubstool.php
old mode 100644
new mode 100755
diff --git a/locale/de-AT/zeitaufzeichnung.php b/locale/de-AT/zeitaufzeichnung.php
old mode 100644
new mode 100755
diff --git a/locale/de-AT/zeitsperre.php b/locale/de-AT/zeitsperre.php
old mode 100644
new mode 100755
diff --git a/locale/de-AT/zeitwunsch.php b/locale/de-AT/zeitwunsch.php
old mode 100644
new mode 100755
diff --git a/locale/de-SFU/contents.rdf b/locale/de-SFU/contents.rdf
old mode 100644
new mode 100755
diff --git a/locale/de-SFU/fas.dtd b/locale/de-SFU/fas.dtd
old mode 100644
new mode 100755
diff --git a/locale/de-SFU/planner.dtd b/locale/de-SFU/planner.dtd
old mode 100644
new mode 100755
diff --git a/locale/de-SFU/tempus.dtd b/locale/de-SFU/tempus.dtd
old mode 100644
new mode 100755
diff --git a/locale/en-US/abgabetool.php b/locale/en-US/abgabetool.php
old mode 100644
new mode 100755
diff --git a/locale/en-US/anwesenheitsliste.php b/locale/en-US/anwesenheitsliste.php
old mode 100644
new mode 100755
diff --git a/locale/en-US/benotungstool.php b/locale/en-US/benotungstool.php
old mode 100644
new mode 100755
diff --git a/locale/en-US/contents.rdf b/locale/en-US/contents.rdf
old mode 100644
new mode 100755
diff --git a/locale/en-US/coodle.php b/locale/en-US/coodle.php
old mode 100644
new mode 100755
diff --git a/locale/en-US/courseInformation.php b/locale/en-US/courseInformation.php
old mode 100644
new mode 100755
diff --git a/locale/en-US/dms_link.php b/locale/en-US/dms_link.php
old mode 100644
new mode 100755
diff --git a/locale/en-US/errors.php b/locale/en-US/errors.php
old mode 100644
new mode 100755
diff --git a/locale/en-US/eventkalender.php b/locale/en-US/eventkalender.php
old mode 100644
new mode 100755
diff --git a/locale/en-US/feedback.php b/locale/en-US/feedback.php
old mode 100644
new mode 100755
diff --git a/locale/en-US/freebusy.php b/locale/en-US/freebusy.php
old mode 100644
new mode 100755
diff --git a/locale/en-US/freifach.php b/locale/en-US/freifach.php
old mode 100644
new mode 100755
diff --git a/locale/en-US/gesamtnote.php b/locale/en-US/gesamtnote.php
old mode 100644
new mode 100755
diff --git a/locale/en-US/global.php b/locale/en-US/global.php
old mode 100644
new mode 100755
diff --git a/locale/en-US/incoming.php b/locale/en-US/incoming.php
old mode 100644
new mode 100755
diff --git a/locale/en-US/lehre.php b/locale/en-US/lehre.php
old mode 100644
new mode 100755
diff --git a/locale/en-US/lvaliste.php b/locale/en-US/lvaliste.php
old mode 100644
new mode 100755
diff --git a/locale/en-US/lvinfo.php b/locale/en-US/lvinfo.php
old mode 100644
new mode 100755
diff --git a/locale/en-US/lvplan.php b/locale/en-US/lvplan.php
old mode 100644
new mode 100755
diff --git a/locale/en-US/mail.php b/locale/en-US/mail.php
old mode 100644
new mode 100755
diff --git a/locale/en-US/mailverteiler.php b/locale/en-US/mailverteiler.php
old mode 100644
new mode 100755
diff --git a/locale/en-US/menu.php b/locale/en-US/menu.php
old mode 100644
new mode 100755
diff --git a/locale/en-US/news.php b/locale/en-US/news.php
old mode 100644
new mode 100755
diff --git a/locale/en-US/notebookregister.php b/locale/en-US/notebookregister.php
old mode 100644
new mode 100755
diff --git a/locale/en-US/notfallbestimmungen.php b/locale/en-US/notfallbestimmungen.php
old mode 100644
new mode 100755
diff --git a/locale/en-US/passwort.php b/locale/en-US/passwort.php
old mode 100644
new mode 100755
diff --git a/locale/en-US/personensuche.php b/locale/en-US/personensuche.php
old mode 100644
new mode 100755
diff --git a/locale/en-US/profil.php b/locale/en-US/profil.php
old mode 100644
new mode 100755
diff --git a/locale/en-US/pruefung.php b/locale/en-US/pruefung.php
old mode 100644
new mode 100755
diff --git a/locale/en-US/reihungstest.php b/locale/en-US/reihungstest.php
old mode 100644
new mode 100755
diff --git a/locale/en-US/semesterplan.php b/locale/en-US/semesterplan.php
old mode 100644
new mode 100755
diff --git a/locale/en-US/services.php b/locale/en-US/services.php
old mode 100644
new mode 100755
diff --git a/locale/en-US/studierendenantrag.php b/locale/en-US/studierendenantrag.php
old mode 100644
new mode 100755
diff --git a/locale/en-US/telefonverzeichnis.php b/locale/en-US/telefonverzeichnis.php
old mode 100644
new mode 100755
diff --git a/locale/en-US/tempus.dtd b/locale/en-US/tempus.dtd
old mode 100644
new mode 100755
diff --git a/locale/en-US/testtool.php b/locale/en-US/testtool.php
old mode 100644
new mode 100755
diff --git a/locale/en-US/tools.php b/locale/en-US/tools.php
old mode 100644
new mode 100755
diff --git a/locale/en-US/upload.php b/locale/en-US/upload.php
old mode 100644
new mode 100755
diff --git a/locale/en-US/urlaubstool.php b/locale/en-US/urlaubstool.php
old mode 100644
new mode 100755
diff --git a/locale/en-US/zeitaufzeichnung.php b/locale/en-US/zeitaufzeichnung.php
old mode 100644
new mode 100755
diff --git a/locale/en-US/zeitsperre.php b/locale/en-US/zeitsperre.php
old mode 100644
new mode 100755
diff --git a/locale/en-US/zeitwunsch.php b/locale/en-US/zeitwunsch.php
old mode 100644
new mode 100755
diff --git a/locale/it-IT/abgabetool.php b/locale/it-IT/abgabetool.php
old mode 100644
new mode 100755
diff --git a/locale/it-IT/anwesenheitsliste.php b/locale/it-IT/anwesenheitsliste.php
old mode 100644
new mode 100755
diff --git a/locale/it-IT/benotungstool.php b/locale/it-IT/benotungstool.php
old mode 100644
new mode 100755
diff --git a/locale/it-IT/buchungen.php b/locale/it-IT/buchungen.php
old mode 100644
new mode 100755
diff --git a/locale/it-IT/coodle.php b/locale/it-IT/coodle.php
old mode 100644
new mode 100755
diff --git a/locale/it-IT/courseInformation.php b/locale/it-IT/courseInformation.php
old mode 100644
new mode 100755
diff --git a/locale/it-IT/dms_link.php b/locale/it-IT/dms_link.php
old mode 100644
new mode 100755
diff --git a/locale/it-IT/errors.php b/locale/it-IT/errors.php
old mode 100644
new mode 100755
diff --git a/locale/it-IT/eventkalender.php b/locale/it-IT/eventkalender.php
old mode 100644
new mode 100755
diff --git a/locale/it-IT/feedback.php b/locale/it-IT/feedback.php
old mode 100644
new mode 100755
diff --git a/locale/it-IT/freebusy.php b/locale/it-IT/freebusy.php
old mode 100644
new mode 100755
diff --git a/locale/it-IT/freifach.php b/locale/it-IT/freifach.php
old mode 100644
new mode 100755
diff --git a/locale/it-IT/gesamtnote.php b/locale/it-IT/gesamtnote.php
old mode 100644
new mode 100755
diff --git a/locale/it-IT/global.php b/locale/it-IT/global.php
old mode 100644
new mode 100755
diff --git a/locale/it-IT/incoming.php b/locale/it-IT/incoming.php
old mode 100644
new mode 100755
diff --git a/locale/it-IT/lehre.php b/locale/it-IT/lehre.php
old mode 100644
new mode 100755
diff --git a/locale/it-IT/lvaliste.php b/locale/it-IT/lvaliste.php
old mode 100644
new mode 100755
diff --git a/locale/it-IT/lvinfo.php b/locale/it-IT/lvinfo.php
old mode 100644
new mode 100755
diff --git a/locale/it-IT/lvplan.php b/locale/it-IT/lvplan.php
old mode 100644
new mode 100755
diff --git a/locale/it-IT/mail.php b/locale/it-IT/mail.php
old mode 100644
new mode 100755
diff --git a/locale/it-IT/mailverteiler.php b/locale/it-IT/mailverteiler.php
old mode 100644
new mode 100755
diff --git a/locale/it-IT/menu.php b/locale/it-IT/menu.php
old mode 100644
new mode 100755
diff --git a/locale/it-IT/news.php b/locale/it-IT/news.php
old mode 100644
new mode 100755
diff --git a/locale/it-IT/notebookregister.php b/locale/it-IT/notebookregister.php
old mode 100644
new mode 100755
diff --git a/locale/it-IT/notfallbestimmungen.php b/locale/it-IT/notfallbestimmungen.php
old mode 100644
new mode 100755
diff --git a/locale/it-IT/passwort.php b/locale/it-IT/passwort.php
old mode 100644
new mode 100755
diff --git a/locale/it-IT/personensuche.php b/locale/it-IT/personensuche.php
old mode 100644
new mode 100755
diff --git a/locale/it-IT/profil.php b/locale/it-IT/profil.php
old mode 100644
new mode 100755
diff --git a/locale/it-IT/pruefung.php b/locale/it-IT/pruefung.php
old mode 100644
new mode 100755
diff --git a/locale/it-IT/semesterplan.php b/locale/it-IT/semesterplan.php
old mode 100644
new mode 100755
diff --git a/locale/it-IT/services.php b/locale/it-IT/services.php
old mode 100644
new mode 100755
diff --git a/locale/it-IT/studienplan.php b/locale/it-IT/studienplan.php
old mode 100644
new mode 100755
diff --git a/locale/it-IT/telefonverzeichnis.php b/locale/it-IT/telefonverzeichnis.php
old mode 100644
new mode 100755
diff --git a/locale/it-IT/testtool.php b/locale/it-IT/testtool.php
old mode 100644
new mode 100755
diff --git a/locale/it-IT/tools.php b/locale/it-IT/tools.php
old mode 100644
new mode 100755
diff --git a/locale/it-IT/upload.php b/locale/it-IT/upload.php
old mode 100644
new mode 100755
diff --git a/locale/it-IT/urlaubstool.php b/locale/it-IT/urlaubstool.php
old mode 100644
new mode 100755
diff --git a/locale/it-IT/zeitaufzeichnung.php b/locale/it-IT/zeitaufzeichnung.php
old mode 100644
new mode 100755
diff --git a/locale/it-IT/zeitsperre.php b/locale/it-IT/zeitsperre.php
old mode 100644
new mode 100755
diff --git a/locale/it-IT/zeitwunsch.php b/locale/it-IT/zeitwunsch.php
old mode 100644
new mode 100755
diff --git a/public/css/AjaxLib.css b/public/css/AjaxLib.css
old mode 100644
new mode 100755
diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
old mode 100644
new mode 100755
diff --git a/public/css/Cis4/Cms.css b/public/css/Cis4/Cms.css
old mode 100644
new mode 100755
diff --git a/public/css/Cis4/Legacy.css b/public/css/Cis4/Legacy.css
old mode 100644
new mode 100755
diff --git a/public/css/DialogLib.css b/public/css/DialogLib.css
old mode 100644
new mode 100755
diff --git a/public/css/Fhc.css b/public/css/Fhc.css
old mode 100644
new mode 100755
diff --git a/public/css/FilterWidget.css b/public/css/FilterWidget.css
old mode 100644
new mode 100755
diff --git a/public/css/Login.css b/public/css/Login.css
old mode 100644
new mode 100755
diff --git a/public/css/NavigationWidget.css b/public/css/NavigationWidget.css
old mode 100644
new mode 100755
diff --git a/public/css/Tabulator.css b/public/css/Tabulator.css
old mode 100644
new mode 100755
diff --git a/public/css/Tabulator5.css b/public/css/Tabulator5.css
old mode 100644
new mode 100755
diff --git a/public/css/TinyMCE5.css b/public/css/TinyMCE5.css
old mode 100644
new mode 100755
diff --git a/public/css/Widgets.css b/public/css/Widgets.css
old mode 100644
new mode 100755
diff --git a/public/css/cis4.css b/public/css/cis4.css
old mode 100644
new mode 100755
diff --git a/public/css/cis_bs5.css b/public/css/cis_bs5.css
old mode 100644
new mode 100755
diff --git a/public/css/codex/oehbeitrag.css b/public/css/codex/oehbeitrag.css
old mode 100644
new mode 100755
diff --git a/public/css/codex/uhstat1.css b/public/css/codex/uhstat1.css
old mode 100644
new mode 100755
diff --git a/public/css/components/FilterComponent.css b/public/css/components/FilterComponent.css
old mode 100644
new mode 100755
diff --git a/public/css/components/FormUnderline.css b/public/css/components/FormUnderline.css
old mode 100644
new mode 100755
diff --git a/public/css/components/NavigationComponent.css b/public/css/components/NavigationComponent.css
old mode 100644
new mode 100755
diff --git a/public/css/components/Profil.css b/public/css/components/Profil.css
old mode 100644
new mode 100755
diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
old mode 100644
new mode 100755
diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
old mode 100644
new mode 100755
diff --git a/public/css/components/searchbar.css b/public/css/components/searchbar.css
old mode 100644
new mode 100755
diff --git a/public/css/components/verticalsplit.css b/public/css/components/verticalsplit.css
old mode 100644
new mode 100755
diff --git a/public/css/fhcomplete.css b/public/css/fhcomplete.css
old mode 100644
new mode 100755
diff --git a/public/css/infocenter/infocenterDetails.css b/public/css/infocenter/infocenterDetails.css
old mode 100644
new mode 100755
diff --git a/public/css/infocenter/infocenterPersonDataset.css b/public/css/infocenter/infocenterPersonDataset.css
old mode 100644
new mode 100755
diff --git a/public/css/issues/issuesDataset.css b/public/css/issues/issuesDataset.css
old mode 100644
new mode 100755
diff --git a/public/css/issues/issuesKonfiguration.css b/public/css/issues/issuesKonfiguration.css
old mode 100644
new mode 100755
diff --git a/public/css/issues/issuesZustaendigkeiten.css b/public/css/issues/issuesZustaendigkeiten.css
old mode 100644
new mode 100755
diff --git a/public/css/lehre/anrechnung.css b/public/css/lehre/anrechnung.css
old mode 100644
new mode 100755
diff --git a/public/css/lehre/pruefungsprotokoll.css b/public/css/lehre/pruefungsprotokoll.css
old mode 100644
new mode 100755
diff --git a/public/css/messaging/message.css b/public/css/messaging/message.css
old mode 100644
new mode 100755
diff --git a/public/css/sbadmin2/admintemplate.css b/public/css/sbadmin2/admintemplate.css
old mode 100644
new mode 100755
diff --git a/public/css/sbadmin2/admintemplate_contentonly.css b/public/css/sbadmin2/admintemplate_contentonly.css
old mode 100644
new mode 100755
diff --git a/public/css/sbadmin2/tablesort_bootstrap.css b/public/css/sbadmin2/tablesort_bootstrap.css
old mode 100644
new mode 100755
diff --git a/public/css/tools/auswertung_fhtw.css b/public/css/tools/auswertung_fhtw.css
old mode 100644
new mode 100755
diff --git a/public/css/tools/gradelist.css b/public/css/tools/gradelist.css
old mode 100644
new mode 100755
diff --git a/public/extensions/.placeholder b/public/extensions/.placeholder
old mode 100644
new mode 100755
diff --git a/public/images/icons/fa-user-check.png b/public/images/icons/fa-user-check.png
old mode 100644
new mode 100755
diff --git a/public/images/icons/fa-user-clock.png b/public/images/icons/fa-user-clock.png
old mode 100644
new mode 100755
diff --git a/public/images/icons/fa-user-cog.png b/public/images/icons/fa-user-cog.png
old mode 100644
new mode 100755
diff --git a/public/images/icons/fa-user-edit.png b/public/images/icons/fa-user-edit.png
old mode 100644
new mode 100755
diff --git a/public/images/icons/fa-user-graduate.png b/public/images/icons/fa-user-graduate.png
old mode 100644
new mode 100755
diff --git a/public/images/icons/fa-user-lock.png b/public/images/icons/fa-user-lock.png
old mode 100644
new mode 100755
diff --git a/public/images/icons/fa-user-minus.png b/public/images/icons/fa-user-minus.png
old mode 100644
new mode 100755
diff --git a/public/images/icons/fa-user-ninja.png b/public/images/icons/fa-user-ninja.png
old mode 100644
new mode 100755
diff --git a/public/images/icons/fa-user-tag.png b/public/images/icons/fa-user-tag.png
old mode 100644
new mode 100755
diff --git a/public/images/icons/fa-user-times.png b/public/images/icons/fa-user-times.png
old mode 100644
new mode 100755
diff --git a/public/images/icons/fa-users-cog.png b/public/images/icons/fa-users-cog.png
old mode 100644
new mode 100755
diff --git a/public/images/loader.gif b/public/images/loader.gif
old mode 100644
new mode 100755
diff --git a/public/images/logo-300x160.png b/public/images/logo-300x160.png
old mode 100644
new mode 100755
diff --git a/public/js/AjaxLib.js b/public/js/AjaxLib.js
old mode 100644
new mode 100755
diff --git a/public/js/DialogLib.js b/public/js/DialogLib.js
old mode 100644
new mode 100755
diff --git a/public/js/FilterWidget.js b/public/js/FilterWidget.js
old mode 100644
new mode 100755
diff --git a/public/js/Login.js b/public/js/Login.js
old mode 100644
new mode 100755
diff --git a/public/js/NavigationWidget.js b/public/js/NavigationWidget.js
old mode 100644
new mode 100755
diff --git a/public/js/PhrasesLib.js b/public/js/PhrasesLib.js
old mode 100644
new mode 100755
diff --git a/public/js/RESTClient.js b/public/js/RESTClient.js
old mode 100644
new mode 100755
diff --git a/public/js/TableWidget.js b/public/js/TableWidget.js
old mode 100644
new mode 100755
diff --git a/public/js/UDFWidget.js b/public/js/UDFWidget.js
old mode 100644
new mode 100755
diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js
old mode 100644
new mode 100755
diff --git a/public/js/apps/Cis/Cms.js b/public/js/apps/Cis/Cms.js
old mode 100644
new mode 100755
diff --git a/public/js/apps/Cis/Documents.js b/public/js/apps/Cis/Documents.js
old mode 100644
new mode 100755
diff --git a/public/js/apps/Cis/MyLv/Student.js b/public/js/apps/Cis/MyLv/Student.js
old mode 100644
new mode 100755
diff --git a/public/js/apps/Cis/Profil.js b/public/js/apps/Cis/Profil.js
old mode 100644
new mode 100755
diff --git a/public/js/apps/Cis/ProfilUpdateRequests.js b/public/js/apps/Cis/ProfilUpdateRequests.js
old mode 100644
new mode 100755
diff --git a/public/js/apps/Cis/Stundenplan.js b/public/js/apps/Cis/Stundenplan.js
old mode 100644
new mode 100755
diff --git a/public/js/apps/Dashboard.js b/public/js/apps/Dashboard.js
old mode 100644
new mode 100755
diff --git a/public/js/apps/Dashboard/Admin.js b/public/js/apps/Dashboard/Admin.js
old mode 100644
new mode 100755
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
old mode 100644
new mode 100755
diff --git a/public/js/apps/DashboardAdmin.js b/public/js/apps/DashboardAdmin.js
old mode 100644
new mode 100755
diff --git a/public/js/apps/LogsViewer/LogsViewer.js b/public/js/apps/LogsViewer/LogsViewer.js
old mode 100644
new mode 100755
diff --git a/public/js/apps/LogsViewer/TabulatorSetup.js b/public/js/apps/LogsViewer/TabulatorSetup.js
old mode 100644
new mode 100755
diff --git a/public/js/apps/TestSearch.js b/public/js/apps/TestSearch.js
old mode 100644
new mode 100755
diff --git a/public/js/apps/api/dummyapi.php b/public/js/apps/api/dummyapi.php
old mode 100644
new mode 100755
diff --git a/public/js/apps/api/fhcapifactory.js b/public/js/apps/api/fhcapifactory.js
old mode 100644
new mode 100755
diff --git a/public/js/apps/api/profilUpdate.js b/public/js/apps/api/profilUpdate.js
old mode 100644
new mode 100755
diff --git a/public/js/apps/api/search.js b/public/js/apps/api/search.js
old mode 100644
new mode 100755
diff --git a/public/js/apps/api/userdata.js b/public/js/apps/api/userdata.js
old mode 100644
new mode 100755
index be6092dd4..0fff20a31
--- a/public/js/apps/api/userdata.js
+++ b/public/js/apps/api/userdata.js
@@ -3,6 +3,15 @@ export default {
 
     //! API Calls for Profil Views
 
+    insertFile: function(dms) {
+        const url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router+
+                   `/Cis/Profil/insertFile`;
+                   
+        return axios.post(url,dms, {
+            headers: {'Content-Type': 'multipart/form-data'}
+          });
+    },
+
     selectProfilRequest: function(uid=null,id=null) {
         const url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router+
                    `/Cis/Profil/selectProfilRequest`;
diff --git a/public/js/apps/lehre/Antrag.js b/public/js/apps/lehre/Antrag.js
old mode 100644
new mode 100755
diff --git a/public/js/apps/lehre/Antrag/Leitung.js b/public/js/apps/lehre/Antrag/Leitung.js
old mode 100644
new mode 100755
diff --git a/public/js/apps/lehre/Antrag/Lvzuweisung.js b/public/js/apps/lehre/Antrag/Lvzuweisung.js
old mode 100644
new mode 100755
diff --git a/public/js/apps/lehre/Antrag/Student.js b/public/js/apps/lehre/Antrag/Student.js
old mode 100644
new mode 100755
diff --git a/public/js/bootstrapper.js b/public/js/bootstrapper.js
old mode 100644
new mode 100755
diff --git a/public/js/codex/oehbeitrag.js b/public/js/codex/oehbeitrag.js
old mode 100644
new mode 100755
diff --git a/public/js/codex/uhstat1.js b/public/js/codex/uhstat1.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Base/Modal.js b/public/js/components/Base/Modal.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Base/Offcanvas.js b/public/js/components/Base/Offcanvas.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Bootstrap/Alert.js b/public/js/components/Bootstrap/Alert.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Bootstrap/Confirm.js b/public/js/components/Bootstrap/Confirm.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Bootstrap/Modal.js b/public/js/components/Bootstrap/Modal.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Bootstrap/Prompt.js b/public/js/components/Bootstrap/Prompt.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Calendar/Abstract.js b/public/js/components/Calendar/Abstract.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Calendar/Calendar.js b/public/js/components/Calendar/Calendar.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Calendar/Header.js b/public/js/components/Calendar/Header.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Calendar/Minimized.js b/public/js/components/Calendar/Minimized.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Calendar/Month.js b/public/js/components/Calendar/Month.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Calendar/Month/Page.js b/public/js/components/Calendar/Month/Page.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Calendar/Months.js b/public/js/components/Calendar/Months.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Calendar/Pane.js b/public/js/components/Calendar/Pane.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Calendar/Week.js b/public/js/components/Calendar/Week.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Calendar/Weeks.js b/public/js/components/Calendar/Weeks.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Calendar/Years.js b/public/js/components/Calendar/Years.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Calendar/Years/Page.js b/public/js/components/Calendar/Years/Page.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Cis/Menu/Entry.js b/public/js/components/Cis/Menu/Entry.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Cis/Mylv/Semester.js b/public/js/components/Cis/Mylv/Semester.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang.js b/public/js/components/Cis/Mylv/Semester/Studiengang.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv/Info.js b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv/Info.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv/Pruefungen.js b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv/Pruefungen.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Cis/Mylv/Student.js b/public/js/components/Cis/Mylv/Student.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Cis/Profil/EditProfil.js b/public/js/components/Cis/Profil/EditProfil.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Cis/Profil/EditProfilSelect.js b/public/js/components/Cis/Profil/EditProfilSelect.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
old mode 100644
new mode 100755
index e2087880e..8b58970d5
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -10,6 +10,7 @@ import QuickLinks from "./ProfilComponents/QuickLinks.js";
 import ProfilEmails from "./ProfilComponents/ProfilEmails.js"
 import RoleInformation from "./ProfilComponents/RoleInformation.js";
 import ProfilInformation from "./ProfilComponents/ProfilInformation.js";
+import Dms from "../../Form/Upload/Dms.js";
 
 export default {
   components: {
@@ -24,9 +25,13 @@ export default {
     ProfilEmails,
     RoleInformation,
     ProfilInformation,
+    Dms,
   },
   data() {
     return {
+
+      //? used for dms component
+      dmsData:[],
      
       
       funktionen_table_options: {
@@ -137,6 +142,32 @@ export default {
   
   methods: {
 
+    testUpdload: function(){
+      let formData = new FormData();
+      for(let i = 0; i < this.dmsData.length; i++){
+        
+        formData.append("files[]",this.dmsData[i]);
+      }
+      
+      Vue.$fhcapi.UserData.insertFile(formData).then(res => {
+        console.log(res);
+      }).catch(err=>{
+        console.log(err);
+      })
+    },
+
+    //! delete later
+    stringifyFile(file) {
+			return JSON.stringify({
+				lastModified: file.lastModified,
+				lastModifiedDate: file.lastModifiedDate,
+				name: file.name,
+				size: file.size,
+				type: file.type
+			});
+		},
+    
+
     fetchProfilUpdates: function(){
       Vue.$fhcapi.UserData.selectProfilRequest().then((res)=>{
         
@@ -174,6 +205,9 @@ export default {
   },
 
   computed: {
+
+    
+
      profilInformation() {
       if (!this.data) {
         return {};
@@ -312,6 +346,9 @@ export default {
   template: ` 
 
   <div class="container-fluid text-break fhc-form"  >
+<pre>{{JSON.stringify(Array.from(dmsData).map(item=>{return stringifyFile(item);}),null,2)}}</pre>
+<button @click="testUpdload">upload</button>
+  <dms ref="upload" id="files" :noList="false" :multiple="true" v-model="dmsData" ></dms>
     
           <div class="row">
           
diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Cis/Profil/ProfilComponents/Adresse.js b/public/js/components/Cis/Profil/ProfilComponents/Adresse.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js b/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Cis/Profil/ProfilComponents/EditKontakt.js b/public/js/components/Cis/Profil/ProfilComponents/EditKontakt.js
old mode 100644
new mode 100755
index 1b885be05..2598529e0
--- a/public/js/components/Cis/Profil/ProfilComponents/EditKontakt.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/EditKontakt.js
@@ -1,10 +1,12 @@
 
 export default {
+  
     props:{
         data:Object,
     },
     data(){
         return{
+           
             originalValue:null,
         }
     },
@@ -39,7 +41,7 @@ export default {
     },
     template:
     `
-    <div class="gy-3 row align-items-center justify-content-center">
+    <div class="gy-3 row align-items-center justify-content-center">    
     
     <div v-if="!data.kontakt_id" class="col-12">
         
diff --git a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Cis/Profil/ProfilComponents/FhAusweisStatus.js b/public/js/components/Cis/Profil/ProfilComponents/FhAusweisStatus.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Cis/Profil/ProfilComponents/Kontakt.js b/public/js/components/Cis/Profil/ProfilComponents/Kontakt.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js b/public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Cis/Profil/ProfilComponents/ProfilEmails.js b/public/js/components/Cis/Profil/ProfilComponents/ProfilEmails.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Cis/Profil/ProfilComponents/QuickLinks.js b/public/js/components/Cis/Profil/ProfilComponents/QuickLinks.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Cis/Profil/ProfilComponents/RoleInformation.js b/public/js/components/Cis/Profil/ProfilComponents/RoleInformation.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Cis/Profil/ProfilComponents/Status.js b/public/js/components/Cis/Profil/ProfilComponents/Status.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Cis/Profil/StudentViewProfil.js b/public/js/components/Cis/Profil/StudentViewProfil.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Dashboard/Admin.js b/public/js/components/Dashboard/Admin.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Dashboard/Admin/Edit.js b/public/js/components/Dashboard/Admin/Edit.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Dashboard/Admin/Presets.js b/public/js/components/Dashboard/Admin/Presets.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Dashboard/Admin/Widgets.js b/public/js/components/Dashboard/Admin/Widgets.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Dashboard/Widget/Picker.js b/public/js/components/Dashboard/Widget/Picker.js
old mode 100644
new mode 100755
diff --git a/public/js/components/DashboardWidget/Abstract.js b/public/js/components/DashboardWidget/Abstract.js
old mode 100644
new mode 100755
diff --git a/public/js/components/DashboardWidget/Ampel.js b/public/js/components/DashboardWidget/Ampel.js
old mode 100644
new mode 100755
diff --git a/public/js/components/DashboardWidget/Default.js b/public/js/components/DashboardWidget/Default.js
old mode 100644
new mode 100755
diff --git a/public/js/components/DashboardWidget/News.js b/public/js/components/DashboardWidget/News.js
old mode 100644
new mode 100755
diff --git a/public/js/components/DashboardWidget/Stundenplan.js b/public/js/components/DashboardWidget/Stundenplan.js
old mode 100644
new mode 100755
diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Drop/Grid/Item.js b/public/js/components/Drop/Grid/Item.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Fetch.js b/public/js/components/Fetch.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Form/Form.js b/public/js/components/Form/Form.js
new file mode 100755
index 000000000..2257eb289
--- /dev/null
+++ b/public/js/components/Form/Form.js
@@ -0,0 +1,137 @@
+import FhcFragment from "../Fragment.js";
+
+export default {
+	components: {
+		FhcFragment
+	},
+	provide() {
+		return {
+			$registerToForm: component => {
+				if (this.inputs.indexOf(component) < 0)
+					this.inputs.push(component);
+			}
+		};
+	},
+	props: {
+		tag: {
+			type: String,
+			default: 'form'
+		}
+	},
+	data() {
+		return {
+			inputs: []
+		}
+	},
+	computed: {
+		sortedInputs() {
+			return this.inputs.reduce((a,c) => {
+				let name = c.name || '_default';
+				if (!a[name])
+					a[name] = [];
+				a[name].push(c);
+
+				if (c.lcType == 'checkbox' && name.substr(-1) == ']' && name.indexOf('[')) {
+					name = name.substr(0, name.lastIndexOf('['));
+					if (!a[name])
+						a[name] = [];
+					a[name].push(c);
+				}
+
+				return a;
+			}, {});
+		}
+	},
+	methods: {
+		_sendFeedbackToInput(inputs, feedback, valid) {
+			if (inputs.length) {
+				inputs.forEach(input => input.setFeedback(valid, feedback));
+				return false;
+			}
+			if (this.$fhcAlert) {
+				this.$fhcAlert[valid ? 'alertSuccess' : 'alertError'](feedback);
+				return false;
+			}
+			return true;
+		},
+		setFeedback(valid, feedback) {
+			if (Array.isArray(feedback)) {
+				let remaining = feedback.filter(fb => 
+					this._sendFeedbackToInput(
+						this.sortedInputs['_default'] || [],
+						fb,
+						valid
+					)
+				);
+				return remaining.length ? remaining : null;
+			}
+			if (typeof feedback === 'object') {
+				let remaining = Object.entries(feedback).filter(([name, fb]) => 
+					this._sendFeedbackToInput(
+						this.sortedInputs[name.split('.')[0] + name.split('.').slice(1).map(p => `[${p}]`).join("")] || this.sortedInputs['_default'] || [],
+						fb,
+						valid
+					)
+				);
+				return remaining.length ? Object.fromEntries(remaining) : null;
+			}
+
+			let remaining = this._sendFeedbackToInput(
+				this.sortedInputs['_default'] || [],
+				feedback,
+				valid
+			);
+			return remaining ? feedback : null;
+		},
+		clearValidation() {
+			this.inputs.forEach(input => input.clearValidation());
+		},
+		send(promise) {
+			return new Promise((resolve, reject) => {
+				promise.then(result => {
+					if (result?.status == 200 && result.data) {
+						if (typeof result.data !== 'object' || !result.data.hasOwnProperty('retval'))
+							// TODO(chris): IMPLEMENT! Error in API
+							return reject(result);
+						if (result.data.error)
+							// TODO(chris): IMPLEMENT! Error in API
+							return reject(result);
+						const data = result.data.retval;
+						// TODO(chris): check for something better/add new standardized return value
+						if (result.data.code == 1)
+							this.setFeedback(true, data);
+						return resolve(data);
+					}
+					// TODO(chris): IMPLEMENT! Wrong result object
+					reject(result);
+				}).catch(result => {
+					if (result?.response?.status == 400 && result.response.data) {
+						if (typeof result.response.data !== 'object' || !result.response.data.hasOwnProperty('retval'))
+							// TODO(chris): IMPLEMENT! Error in API
+							return reject(result);
+						this.clearValidation();
+						const remaining = this.setFeedback(
+							false,
+							result.response.data.retval
+						);
+						if (remaining) {
+							result.response.data.retval = remaining;
+							return reject(result);
+						}
+					} else if (result?.response?.status == 500) {
+						if (this.$fhcAlert)
+							this.$fhcAlert.handleSystemError(result);
+						else
+							return reject(result);
+					} else {
+						return reject(result);
+					}
+				});
+			});
+		}
+	},
+	template: `
+	<component :is="tag || 'FhcFragment'" v-bind="$attrs">
+		<slot></slot>
+	</component>`
+}
\ No newline at end of file
diff --git a/public/js/components/Form/Input.js b/public/js/components/Form/Input.js
new file mode 100755
index 000000000..1fc318523
--- /dev/null
+++ b/public/js/components/Form/Input.js
@@ -0,0 +1,278 @@
+import FhcFragment from "../Fragment.js";
+
+let _uuid = {};
+
+export default {
+	inheritAttrs: false,
+	components: {
+		FhcFragment
+	},
+	inject: [
+		'$registerToForm'
+	],
+	props: {
+		bsFeedback: Boolean,
+		noAutoClass: Boolean,
+		noFeedback: Boolean,
+		inputGroup: Boolean,
+		type: String,
+		name: String,
+		containerClass: [String, Array, Object]
+	},
+	data() {
+		return {
+			valid: undefined,
+			feedback: []
+		}
+	},
+	computed: {
+		hasContainer() {
+			if (!this.bsFeedback)
+				return true;
+			if (this.containerClass)
+				return true;
+			if (this.autoContainerClass)
+				return true;
+			return false;
+		},
+		acc() {
+			if (!this.containerClass)
+				return {};
+			if (typeof this.containerClass === 'string' || this.containerClass instanceof String)
+				return this.containerClass.split(' ').reduce((a,c) => {a[c] = true; return a}, {});
+			if (Array.isArray(this.containerClass))
+				return this.containerClass.reduce((a,c) => {a[c] = true; return a}, {});
+			return this.containerClass;
+		},
+		autoContainerClass() {
+			if (this.noAutoClass)
+				return this.acc;
+			
+			const acc = {...this.acc};
+			
+			if (this.inputGroup)
+				acc['input-group-item'] = true;
+
+			if (this.lcType == 'radio' || this.lcType == 'checkbox')
+				acc['form-check'] = true;
+			
+			if (this.inputGroup && acc['form-check']) {
+				acc['input-group-item'] = false;
+				acc['form-check'] = false;
+				acc['input-group-text'] = true;
+			}
+			return acc;
+		},
+		lcType() {
+			if (!this.type)
+				return 'text';
+			return this.type.toLowerCase();
+		},
+		tag() {
+			switch (this.lcType) {
+				case 'textarea':
+				case 'select':
+					return this.lcType;
+				case 'datepicker':
+					return 'VueDatePicker';
+				case 'autocomplete':
+					return 'PvAutocomplete';
+				case 'uploadimage':
+					return 'UploadImage';
+				case 'uploadfile':
+				case 'uploaddms':
+					return 'UploadDms';
+				default:
+					return 'input';
+			}
+		},
+		validationClass() {
+			const classes = [];
+			if (this.valid)
+				classes.push('is-valid');
+			else if (this.valid === false)
+				classes.push('is-invalid');
+			
+			if (!this.noAutoClass) {
+				let c = this.$attrs.class ? this.$attrs.class.split(' ') : [];
+				switch (this.lcType) {
+					// TODO(chris): complete list!
+					case 'select':
+						if (!c.includes('form-select'))
+							classes.push('form-select');
+						break;
+					case 'range':
+						if (!c.includes('form-range'))
+							classes.push('form-range');
+						break;
+					case 'radio':
+					case 'checkbox':
+						// TODO(chris): maybe different handling?
+						if (!c.includes('form-check-input') && !c.includes('btn-check'))
+							classes.push('form-check-input');
+						break;
+					case 'autocomplete':
+					case 'datepicker':
+						classes.push('p-0');
+						classes.push('border-0');
+					case 'color':
+						if (!c.includes('form-control-color'))
+							classes.push('form-control-color');
+					case 'text':
+					case 'number':
+					case 'password':
+					case 'textarea':
+						if (!c.includes('form-control'))
+							classes.push('form-control');
+						break;
+				}
+			}
+
+			return classes;
+		},
+		feedbackClass() {
+			if (!this.feedback || this.feedback === true)
+				return '';
+			if (!this.bsFeedback)
+				return {
+					'valid-tooltip': this.valid === true,
+					'invalid-tooltip': this.valid === false
+				};
+			return {
+				'valid-feedback': this.valid === true,
+				'invalid-feedback': this.valid === false
+			};
+		},
+		modelValueCmp: {
+			get() {
+				return this.$attrs.modelValue;
+			},
+			set(v) {
+				this.$emit('update:modelValue', v);
+			}
+		},
+		idCmp() {
+			let uuid = this.$attrs.id;
+			if (this.lcType == 'datepicker')
+				uuid = this.$attrs.uid;
+			if (!uuid && this.$attrs.label)
+				uuid = 'fhc-form-input';
+			if (!uuid)
+				return undefined;
+			if (this.lcType == 'datepicker')
+				uuid = 'dp-input-' + uuid;
+			if (_uuid[uuid] === undefined)
+				_uuid[uuid] = 0;
+			return uuid + '-' + (_uuid[uuid]++);
+		}
+	},
+	methods: {
+		clearValidation() {
+			this.valid = undefined;
+			this.feedback = [];
+		},
+		setFeedback(valid, feedback) {
+			if (!feedback)
+				feedback = [];
+			if (!Array.isArray(feedback))
+				feedback = [feedback];
+			this.valid = valid;
+			this.feedback = feedback;
+		},
+		_loadComponents() {
+			if (this.tag == 'VueDatePicker' && !this._.components.VueDatePicker) {
+				this._.components.VueDatePicker = Vue.defineAsyncComponent(() => import("../vueDatepicker.js.php"));
+			} else if (this.tag == 'PvAutocomplete' && !this._.components.PvAutocomplete) {
+				this._.components.PvAutocomplete = Vue.defineAsyncComponent(() => import(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + "/public/js/components/primevue/autocomplete/autocomplete.esm.min.js"));
+			} else if (this.tag == 'UploadImage' && !this._.components.UploadImage) {
+				this._.components.UploadImage = Vue.defineAsyncComponent(() => import("./Upload/Image.js"));
+			} else if (this.tag == 'UploadDms' && !this._.components.UploadDms) {
+				this._.components.UploadDms = Vue.defineAsyncComponent(() => import("./Upload/Dms.js"));
+			}
+		}
+	},
+	beforeMount() {
+		this._loadComponents();
+	},
+	beforeUpdate() {
+		this._loadComponents();
+	},
+	mounted() {
+		if (this.$registerToForm)
+			this.$registerToForm(this);
+	},
+	template: `
+	<component :is="!hasContainer ? 'FhcFragment' : 'div'" class="position-relative" :class="autoContainerClass">
+		<label v-if="$attrs.label && lcType != 'radio' && lcType != 'checkbox'" :for="idCmp">{{$attrs.label}}</label>
+		<input v-if="tag == 'input'" :type="lcType" v-model="modelValueCmp" v-bind="$attrs" :id="idCmp" :name="name" :class="validationClass" :modelValue="undefined" @input="clearValidation(); $emit('input', $event)">
+		<textarea v-else-if="tag == 'textarea'" v-model="modelValueCmp" v-bind="$attrs" :id="idCmp" :name="name" :class="validationClass" :modelValue="undefined" @input="clearValidation(); $emit('input', $event)"></textarea>
+		<select v-else-if="tag == 'select'" v-model="modelValueCmp" v-bind="$attrs" :id="idCmp" :name="name" :class="validationClass" :modelValue="undefined" @input="clearValidation(); $emit('input', $event)">
+			<slot></slot>
+		</select>
+		<component
+			v-else-if="tag == 'VueDatePicker'"
+			:is="tag"
+			:type="type"
+			v-model="modelValueCmp"
+			v-bind="$attrs"
+			:uid="idCmp ? idCmp.substr(9) : idCmp"
+			:name="name"
+			:class="validationClass"
+			:input-class-name=
+			"[...Object.entries({'form-control': !noAutoClass, 'is-valid': valid === true, 'is-invalid': valid === false}).reduce((a,[k,v]) => {if(v) a.push(k);return a}, []), ...($attrs['input-class-name'] ? $attrs['input-class-name'].split(' ') : [])].join(' ')"
+			@update:model-value="clearValidation"
+			>
+			<slot></slot>
+		</component>
+		<component
+			v-else-if="tag == 'PvAutocomplete'"
+			:is="tag"
+			:type="type"
+			v-model="modelValueCmp"
+			v-bind="$attrs"
+			:id="idCmp"
+			:input-props="{name}"
+			:class="validationClass"
+			:input-class="[...Object.entries({'form-control': !noAutoClass, 'is-valid': valid === true, 'is-invalid': valid === false}).reduce((a,[k,v]) => {if(v) a.push(k);return a}, []), ...($attrs['input-class'] ? $attrs['input-class'].split(' ') : [])].join(' ')"
+			@update:model-value="clearValidation"
+			>
+			<slot></slot>
+		</component>
+		<component
+			v-else-if="tag == 'UploadDms'"
+			:is="tag"
+			:type="type"
+			v-model="modelValueCmp"
+			v-bind="$attrs"
+			:id="idCmp"
+			:name="name"
+			:class="validationClass"
+			:input-class="validationClass"
+			:no-list="inputGroup"
+			@update:model-value="clearValidation"
+			>
+			<slot></slot>
+		</component>
+		<component
+			v-else
+			:is="tag"
+			:type="type"
+			v-model="modelValueCmp"
+			v-bind="$attrs"
+			:id="idCmp"
+			:name="name"
+			:class="validationClass"
+			@update:model-value="clearValidation"
+			>
+			<slot></slot>
+		</component>
+		<label v-if="$attrs.label && (lcType == 'radio' || lcType == 'checkbox')" :for="idCmp" :class="!noAutoClass && 'form-check-label'">{{$attrs.label}}</label>
+		<div v-if="valid !== undefined && feedback.length && !noFeedback" :class="feedbackClass">
+			<template v-for="(msg, i) in feedback" :key="i">
+				<hr v-if="i" class="m-0">
+				{{msg}}
+			</template>
+		</div>
+	</component>
+	`
+}
\ No newline at end of file
diff --git a/public/js/components/Form/Upload/Dms.js b/public/js/components/Form/Upload/Dms.js
new file mode 100755
index 000000000..6d55cfb09
--- /dev/null
+++ b/public/js/components/Form/Upload/Dms.js
@@ -0,0 +1,90 @@
+export default {
+	emits: [
+		'update:modelValue'
+	],
+	props: {
+		modelValue: {
+			type: [ FileList, Array ],
+			required: true
+		},
+		multiple: Boolean,
+		id: String,
+		name: String,
+		inputClass: [String, Array, Object],
+		noList: Boolean
+	},
+	methods: {
+		stringifyFile(file) {
+			return JSON.stringify({
+				lastModified: file.lastModified,
+				lastModifiedDate: file.lastModifiedDate,
+				name: file.name,
+				size: file.size,
+				type: file.type
+			});
+		},
+		addFiles(event) {
+			if (!this.multiple)
+				return this.$emit('update:modelValue', event.target.files);
+			
+			const dt = new DataTransfer();
+			const doubles = [];
+			for (var file of this.modelValue) {
+				dt.items.add(file);
+				doubles.push(this.stringifyFile(file));
+			}
+			console.log("files",event.target.files);
+			for (var file of event.target.files) {
+				// NOTE(chris): deep check (with FileReader) would require an async function so we only check the basic attributes
+				if (doubles.indexOf(this.stringifyFile(file)) < 0)
+					dt.items.add(file);
+			}
+			console.log(Array.isArray(dt.files));
+			console.log(typeof(dt.files));
+			this.$emit('update:modelValue', dt.files);
+		},
+		removeFile(id) {
+			const fileToRemove = Array.from(this.modelValue)[id];
+			
+			const dt = new DataTransfer();
+			for (var file of this.modelValue) {
+				if (file !== fileToRemove)
+					dt.items.add(file);
+			}
+			this.$emit('update:modelValue', dt.files);
+		}
+	},
+	watch: {
+		modelValue(n) {
+			if (n instanceof FileList)
+				return this.$refs.upload.files = n;
+
+			const dt = new DataTransfer();
+			const dms = [];
+			for (var file of n) {
+				if (file instanceof File) {
+					dt.items.add(file);
+				} else {
+					const dmsFile = new File([JSON.stringify(file)], file.name, {
+						type: 'application/x.fhc-dms+json'
+					});
+					dt.items.add(dmsFile);
+				}
+			}
+			this.$emit('update:modelValue', dt.files);
+		}
+	},
+	template: `
+	<div class="form-upload-dms">
+		<input ref="upload" class="form-control" :class="inputClass" :id="id" :name="name" :multiple="multiple" type="file" @change="addFiles">
+		<ul v-if="modelValue.length && multiple && !noList" class="list-unstyled m-0">
+			<li v-for="(file, index) in modelValue" :key="index" class="d-flex mx-1 mt-1">
+				<span class="col-auto"><i class="fa fa-file me-1"></i></span>
+				<span class="col">{{ file.name }}</span>
+				<button class="col-auto btn btn-outline-secondary btn-p-0" @click="removeFile(index)">
+					<i class="fa fa-close"></i>
+				</button>
+			</li>
+		</ul>
+	</div>`
+}
\ No newline at end of file
diff --git a/public/js/components/Form/Upload/Image.js b/public/js/components/Form/Upload/Image.js
new file mode 100755
index 000000000..b0b8d5b78
--- /dev/null
+++ b/public/js/components/Form/Upload/Image.js
@@ -0,0 +1,62 @@
+export default {
+	emits: [
+		'update:modelValue'
+	],
+	props: {
+		modelValue: String
+	},
+	computed: {
+		valueAsBase64DataString() {
+			if (!this.modelValue || this.modelValue.substring(0, 10) == 'data:image')
+				return this.modelValue;
+			return 'data:image/jpeg;charset=utf-8;base64,' + this.modelValue;
+		}
+	},
+	methods: {
+		openUploadDialog() {
+			this.$refs.fileInput.click();
+		},
+		pickFile() {
+			let file = this.$refs.fileInput.files;
+			if (file && file[0]) {
+				let reader = new FileReader();
+				reader.onload = e => {
+					this.$emit('update:modelValue', e.target.result);
+				}
+				reader.readAsDataURL(file[0]);
+			}
+		},
+		deleteImage() {
+			this.$emit('update:modelValue', '');
+		}
+	},
+	template: `
+	<div class="form-upload-image">
+		<template v-if="modelValue">
+			<img class="img-thumbnail" :src="valueAsBase64DataString" />
+			<div class="fotobutton">
+				<div class="d-grid gap-2 d-md-flex">
+					<button type="button" class="btn btn-outline-dark btn-sm" @click="deleteImage">
+						<i class="fa fa-close"></i>
+					</button>
+					<button type="button" class="btn btn-outline-dark btn-sm" @click="openUploadDialog">
+						<i class="fa fa-pen"></i>
+					</button>
+				</div>
+			</div>
+		</template>
+		<template v-else>
+			<slot>
+				<svg class="bd-placeholder-img img-thumbnail" xmlns="http://www.w3.org/2000/svg" role="img" aria-label="A generic square placeholder image with a white border around it, making it resemble a photograph taken with an old instant camera: 200x200" preserveAspectRatio="xMidYMid slice" focusable="false"><title>A generic square placeholder image with a white border around it, making it resemble a photograph taken with an old instant camera</title><rect width="100%" height="100%" fill="#868e96"></rect><text x="50%" y="50%" fill="#dee2e6" dy=".3em"></text></svg>
+			</slot>
+			<div class="fotobutton-visible">
+				<div class="d-grid gap-2 d-md-flex">
+					<button type="button" class="btn btn-outline-dark btn-sm" @click="openUploadDialog">
+						<i class="fa fa-pen"></i>
+					</button>
+				</div>
+			</div>
+		</template>
+		<input :id="$attrs.id" class="d-none" type="file" ref="fileInput" @input="pickFile" accept="image/*">
+	</div>`
+}
\ No newline at end of file
diff --git a/public/js/components/Form/Validation.js b/public/js/components/Form/Validation.js
new file mode 100755
index 000000000..8e8be6afa
--- /dev/null
+++ b/public/js/components/Form/Validation.js
@@ -0,0 +1,38 @@
+const FEEDBACK_DEFAULT = {
+	success: [],
+	danger: []
+};
+export default {
+	inject: [
+		'$registerToForm'
+	],
+	data() {
+		return {
+			feedback: FEEDBACK_DEFAULT
+		};
+	},
+	methods: {
+		clearValidation() {
+			this.feedback = FEEDBACK_DEFAULT;
+		},
+		setFeedback(valid, feedback) {
+			if (!feedback)
+				feedback = [];
+			if (!Array.isArray(feedback))
+				feedback = [feedback];
+			this.feedback[valid ? 'success' : 'danger'] = feedback;
+		}
+	},
+	mounted() {
+		if (this.$registerToForm)
+			this.$registerToForm(this);
+	},
+	template: `
+	<template v-for="(arr, key) in feedback" :key="key">
+		<div v-for="msg in arr" :key="msg" class="alert alert-dismissible fade show" :class="'alert-' + key" role="alert">
+			{{msg}}
+			<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+		</div>
+	</template>
+	`
+};
\ No newline at end of file
diff --git a/public/js/components/Loader.js b/public/js/components/Loader.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Studierendenantrag/Antrag.js b/public/js/components/Studierendenantrag/Antrag.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Studierendenantrag/Form/Abmeldung.js b/public/js/components/Studierendenantrag/Form/Abmeldung.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js b/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Studierendenantrag/Form/Unterbrechung.js b/public/js/components/Studierendenantrag/Form/Unterbrechung.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Studierendenantrag/Form/Wiederholung.js b/public/js/components/Studierendenantrag/Form/Wiederholung.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Studierendenantrag/Infoblock.js b/public/js/components/Studierendenantrag/Infoblock.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Studierendenantrag/Leitung.js b/public/js/components/Studierendenantrag/Leitung.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Studierendenantrag/Leitung/Actions.js b/public/js/components/Studierendenantrag/Leitung/Actions.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Studierendenantrag/Leitung/Actions/Columns.js b/public/js/components/Studierendenantrag/Leitung/Actions/Columns.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Studierendenantrag/Leitung/Actions/New.js b/public/js/components/Studierendenantrag/Leitung/Actions/New.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Studierendenantrag/Leitung/GrundPopup.js b/public/js/components/Studierendenantrag/Leitung/GrundPopup.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Studierendenantrag/Leitung/Header.js b/public/js/components/Studierendenantrag/Leitung/Header.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Studierendenantrag/Leitung/LvPopup.js b/public/js/components/Studierendenantrag/Leitung/LvPopup.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Studierendenantrag/Leitung/Table.js b/public/js/components/Studierendenantrag/Leitung/Table.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Studierendenantrag/Lvzuweisung.js b/public/js/components/Studierendenantrag/Lvzuweisung.js
old mode 100644
new mode 100755
diff --git a/public/js/components/Studierendenantrag/Status.js b/public/js/components/Studierendenantrag/Status.js
old mode 100644
new mode 100755
diff --git a/public/js/components/filter/API.js b/public/js/components/filter/API.js
old mode 100644
new mode 100755
diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
old mode 100644
new mode 100755
diff --git a/public/js/components/filter/Filter/Columns.js b/public/js/components/filter/Filter/Columns.js
old mode 100644
new mode 100755
diff --git a/public/js/components/filter/Filter/Config.js b/public/js/components/filter/Filter/Config.js
old mode 100644
new mode 100755
diff --git a/public/js/components/filter/Table/Download.js b/public/js/components/filter/Table/Download.js
old mode 100644
new mode 100755
diff --git a/public/js/components/navigation/API.js b/public/js/components/navigation/API.js
old mode 100644
new mode 100755
diff --git a/public/js/components/navigation/Navigation.js b/public/js/components/navigation/Navigation.js
old mode 100644
new mode 100755
diff --git a/public/js/components/searchbar/action.js b/public/js/components/searchbar/action.js
old mode 100644
new mode 100755
diff --git a/public/js/components/searchbar/actions.js b/public/js/components/searchbar/actions.js
old mode 100644
new mode 100755
diff --git a/public/js/components/searchbar/employee.js b/public/js/components/searchbar/employee.js
old mode 100644
new mode 100755
diff --git a/public/js/components/searchbar/organisationunit.js b/public/js/components/searchbar/organisationunit.js
old mode 100644
new mode 100755
diff --git a/public/js/components/searchbar/person.js b/public/js/components/searchbar/person.js
old mode 100644
new mode 100755
diff --git a/public/js/components/searchbar/raum.js b/public/js/components/searchbar/raum.js
old mode 100644
new mode 100755
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
old mode 100644
new mode 100755
diff --git a/public/js/components/verticalsplit/verticalsplit.js b/public/js/components/verticalsplit/verticalsplit.js
old mode 100644
new mode 100755
diff --git a/public/js/components/vueDatepicker.js.php b/public/js/components/vueDatepicker.js.php
old mode 100644
new mode 100755
diff --git a/public/js/composables/CalendarDate.js b/public/js/composables/CalendarDate.js
old mode 100644
new mode 100755
diff --git a/public/js/composables/Dashboard/CachedWidgetLoader.js b/public/js/composables/Dashboard/CachedWidgetLoader.js
old mode 100644
new mode 100755
diff --git a/public/js/composables/GridLogic.js b/public/js/composables/GridLogic.js
old mode 100644
new mode 100755
diff --git a/public/js/composables/ObjectUtils.js b/public/js/composables/ObjectUtils.js
old mode 100644
new mode 100755
diff --git a/public/js/infocenter/docUeberpruefung.js b/public/js/infocenter/docUeberpruefung.js
old mode 100644
new mode 100755
diff --git a/public/js/infocenter/infocenterDetails.js b/public/js/infocenter/infocenterDetails.js
old mode 100644
new mode 100755
diff --git a/public/js/infocenter/infocenterPersonDataset.js b/public/js/infocenter/infocenterPersonDataset.js
old mode 100644
new mode 100755
diff --git a/public/js/infocenter/messageList.js b/public/js/infocenter/messageList.js
old mode 100644
new mode 100755
diff --git a/public/js/infocenter/rueckstellung.js b/public/js/infocenter/rueckstellung.js
old mode 100644
new mode 100755
diff --git a/public/js/infocenter/stammdaten.js b/public/js/infocenter/stammdaten.js
old mode 100644
new mode 100755
diff --git a/public/js/infocenter/zgvUeberpruefung.js b/public/js/infocenter/zgvUeberpruefung.js
old mode 100644
new mode 100755
diff --git a/public/js/issues/issuesDataset.js b/public/js/issues/issuesDataset.js
old mode 100644
new mode 100755
diff --git a/public/js/issues/issuesKonfiguration.js b/public/js/issues/issuesKonfiguration.js
old mode 100644
new mode 100755
diff --git a/public/js/issues/issuesZustaendigkeiten.js b/public/js/issues/issuesZustaendigkeiten.js
old mode 100644
new mode 100755
diff --git a/public/js/issues/plausichecks.js b/public/js/issues/plausichecks.js
old mode 100644
new mode 100755
diff --git a/public/js/lehre/anrechnung/adminAnrechnung.js b/public/js/lehre/anrechnung/adminAnrechnung.js
old mode 100644
new mode 100755
diff --git a/public/js/lehre/anrechnung/approveAnrechnungDetail.js b/public/js/lehre/anrechnung/approveAnrechnungDetail.js
old mode 100644
new mode 100755
diff --git a/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js b/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
old mode 100644
new mode 100755
diff --git a/public/js/lehre/anrechnung/createAnrechnung.js b/public/js/lehre/anrechnung/createAnrechnung.js
old mode 100644
new mode 100755
diff --git a/public/js/lehre/anrechnung/requestAnrechnung.js b/public/js/lehre/anrechnung/requestAnrechnung.js
old mode 100644
new mode 100755
diff --git a/public/js/lehre/anrechnung/reviewAnrechnungDetail.js b/public/js/lehre/anrechnung/reviewAnrechnungDetail.js
old mode 100644
new mode 100755
diff --git a/public/js/lehre/anrechnung/reviewAnrechnungUebersicht.js b/public/js/lehre/anrechnung/reviewAnrechnungUebersicht.js
old mode 100644
new mode 100755
diff --git a/public/js/lehre/lehrauftrag/acceptLehrauftrag.js b/public/js/lehre/lehrauftrag/acceptLehrauftrag.js
old mode 100644
new mode 100755
diff --git a/public/js/lehre/lehrauftrag/approveLehrauftrag.js b/public/js/lehre/lehrauftrag/approveLehrauftrag.js
old mode 100644
new mode 100755
diff --git a/public/js/lehre/lehrauftrag/orderLehrauftrag.js b/public/js/lehre/lehrauftrag/orderLehrauftrag.js
old mode 100644
new mode 100755
diff --git a/public/js/lehre/lvplanung/zverfueg.js b/public/js/lehre/lvplanung/zverfueg.js
old mode 100644
new mode 100755
diff --git a/public/js/lehre/pruefungsprotokoll.js b/public/js/lehre/pruefungsprotokoll.js
old mode 100644
new mode 100755
diff --git a/public/js/messaging/fasMessageWrite.js b/public/js/messaging/fasMessageWrite.js
old mode 100644
new mode 100755
diff --git a/public/js/messaging/messageWrite.js b/public/js/messaging/messageWrite.js
old mode 100644
new mode 100755
diff --git a/public/js/messaging/messageWriteReply.js b/public/js/messaging/messageWriteReply.js
old mode 100644
new mode 100755
diff --git a/public/js/messaging/read.js b/public/js/messaging/read.js
old mode 100644
new mode 100755
diff --git a/public/js/messaging/write.js b/public/js/messaging/write.js
old mode 100644
new mode 100755
diff --git a/public/js/messaging/writeReply.js b/public/js/messaging/writeReply.js
old mode 100644
new mode 100755
diff --git a/public/js/mixins/Phrasen.js b/public/js/mixins/Phrasen.js
old mode 100644
new mode 100755
diff --git a/public/js/person/benutzergruppe.js b/public/js/person/benutzergruppe.js
old mode 100644
new mode 100755
diff --git a/public/js/pivottable/pivot.de.js b/public/js/pivottable/pivot.de.js
old mode 100644
new mode 100755
diff --git a/public/js/plugin/Phrasen.js b/public/js/plugin/Phrasen.js
old mode 100644
new mode 100755
diff --git a/public/js/tablesort/tablesort.js b/public/js/tablesort/tablesort.js
old mode 100644
new mode 100755
diff --git a/public/js/tabulator/filters/Dates.js b/public/js/tabulator/filters/Dates.js
old mode 100644
new mode 100755
diff --git a/public/media/.placeholder b/public/media/.placeholder
old mode 100644
new mode 100755
diff --git a/rdf/AntragAbmeldung.xml.php b/rdf/AntragAbmeldung.xml.php
old mode 100644
new mode 100755
diff --git a/rdf/AntragAbmeldungStgl.xml.php b/rdf/AntragAbmeldungStgl.xml.php
old mode 100644
new mode 100755
diff --git a/rdf/AntragUnterbrechung.xml.php b/rdf/AntragUnterbrechung.xml.php
old mode 100644
new mode 100755
diff --git a/rdf/PHPRequest.txt b/rdf/PHPRequest.txt
old mode 100644
new mode 100755
diff --git a/rdf/abschlussbeurteilung.rdf.php b/rdf/abschlussbeurteilung.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/abschlusspruefung.rdf.php b/rdf/abschlusspruefung.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/abschlusspruefung_antritt.rdf.php b/rdf/abschlusspruefung_antritt.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/accountinfoblatt.xml.php b/rdf/accountinfoblatt.xml.php
old mode 100644
new mode 100755
diff --git a/rdf/adresse.rdf.php b/rdf/adresse.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/adressentyp.rdf.php b/rdf/adressentyp.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/akadgrad.rdf.php b/rdf/akadgrad.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/akte.rdf.php b/rdf/akte.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/anrechnung.rdf.php b/rdf/anrechnung.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/anrechnungbegruendung.rdf.php b/rdf/anrechnungbegruendung.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/anwesenheit.rdf.php b/rdf/anwesenheit.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/anwesenheitsliste.xml.php b/rdf/anwesenheitsliste.xml.php
old mode 100644
new mode 100755
diff --git a/rdf/anzahlAnwesenheitenStudenplan.rdf.php b/rdf/anzahlAnwesenheitenStudenplan.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/aufenthaltfoerderung.rdf.php b/rdf/aufenthaltfoerderung.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/aufmerksamdurch.rdf.php b/rdf/aufmerksamdurch.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/aufnahmeschluessel.rdf.php b/rdf/aufnahmeschluessel.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/aufnahmetermine.rdf.php b/rdf/aufnahmetermine.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/aufwandstyp.rdf.php b/rdf/aufwandstyp.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/ausbildung.rdf.php b/rdf/ausbildung.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/ausbildungsvertrag.xml.php b/rdf/ausbildungsvertrag.xml.php
old mode 100644
new mode 100755
diff --git a/rdf/bankverbindung.rdf.php b/rdf/bankverbindung.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/benutzer.rdf.php b/rdf/benutzer.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/benutzerfunktion.rdf.php b/rdf/benutzerfunktion.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/berufstaetigkeit.rdf.php b/rdf/berufstaetigkeit.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/beschaeftigungsart1.rdf.php b/rdf/beschaeftigungsart1.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/beschaeftigungsart2.rdf.php b/rdf/beschaeftigungsart2.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/beschaeftigungsausmass.rdf.php b/rdf/beschaeftigungsausmass.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/besonderequalifikation.rdf.php b/rdf/besonderequalifikation.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/bestelldetail.rdf.php b/rdf/bestelldetail.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/bestellung.rdf.php b/rdf/bestellung.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/betreuerart.rdf.php b/rdf/betreuerart.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/betriebsmittel.rdf.php b/rdf/betriebsmittel.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/betriebsmittelperson.rdf.php b/rdf/betriebsmittelperson.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/betriebsmitteltyp.rdf.php b/rdf/betriebsmitteltyp.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/bisfunktion.rdf.php b/rdf/bisfunktion.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/bisio.rdf.php b/rdf/bisio.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/bisstandort.rdf.php b/rdf/bisstandort.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/bisverwendung.rdf.php b/rdf/bisverwendung.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/buchungstyp.rdf.php b/rdf/buchungstyp.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/diplomasupplement.xml.php b/rdf/diplomasupplement.xml.php
old mode 100644
new mode 100755
diff --git a/rdf/dms.rdf.php b/rdf/dms.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/dokument.rdf.php b/rdf/dokument.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/dokumentprestudent.rdf.php b/rdf/dokumentprestudent.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/dokumenttyp.rdf.php b/rdf/dokumenttyp.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/entwicklungsteam.rdf.php b/rdf/entwicklungsteam.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/erfolgsnachweis.rdf.php b/rdf/erfolgsnachweis.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/fachbereich.rdf.php b/rdf/fachbereich.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/fachbereich_menue.rdf.php b/rdf/fachbereich_menue.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/firma.rdf.php b/rdf/firma.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/funktion.rdf.php b/rdf/funktion.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/gemeinde.rdf.php b/rdf/gemeinde.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/geschlecht.rdf.php b/rdf/geschlecht.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/gruppen.rdf.php b/rdf/gruppen.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/gsprogramm.rdf.php b/rdf/gsprogramm.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/gsstudientyp.rdf.php b/rdf/gsstudientyp.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/hauptberuf.rdf.php b/rdf/hauptberuf.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/index.html b/rdf/index.html
old mode 100644
new mode 100755
diff --git a/rdf/kontakt.rdf.php b/rdf/kontakt.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/kontakttyp.rdf.php b/rdf/kontakttyp.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/konto.rdf.php b/rdf/konto.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/ktu_abschlusszeugnis.rdf.php b/rdf/ktu_abschlusszeugnis.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/ktu_honorarvertrag.xml.php b/rdf/ktu_honorarvertrag.xml.php
old mode 100644
new mode 100755
diff --git a/rdf/ktu_lvinfo.xml.php b/rdf/ktu_lvinfo.xml.php
old mode 100644
new mode 100755
diff --git a/rdf/learningagreement.rdf.php b/rdf/learningagreement.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/learningagreement_outgoing.rdf.php b/rdf/learningagreement_outgoing.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/lehrauftrag.xml.php b/rdf/lehrauftrag.xml.php
old mode 100644
new mode 100755
diff --git a/rdf/lehrauftrag_annehmen.xml.php b/rdf/lehrauftrag_annehmen.xml.php
old mode 100644
new mode 100755
diff --git a/rdf/lehreinheit-lvplan.rdf.php b/rdf/lehreinheit-lvplan.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/lehreinheit.rdf.php b/rdf/lehreinheit.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/lehreinheit_direkt.rdf.php b/rdf/lehreinheit_direkt.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/lehreinheitgruppe.rdf.php b/rdf/lehreinheitgruppe.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/lehreinheitmitarbeiter.rdf.php b/rdf/lehreinheitmitarbeiter.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/lehrfach.rdf.php b/rdf/lehrfach.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/lehrform.rdf.php b/rdf/lehrform.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/lehrfunktion.rdf.php b/rdf/lehrfunktion.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/lehrstunde.rdf.php b/rdf/lehrstunde.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/lehrveranstaltung.rdf.php b/rdf/lehrveranstaltung.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/lehrveranstaltung_einheiten.rdf.php b/rdf/lehrveranstaltung_einheiten.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/lehrveranstaltung_studienplan.rdf.php b/rdf/lehrveranstaltung_studienplan.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/lehrveranstaltungszeugnis.rdf.php b/rdf/lehrveranstaltungszeugnis.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/lehrveranstaltungszeugnis_ktu.rdf.php b/rdf/lehrveranstaltungszeugnis_ktu.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/lehrverbandsgruppe.rdf.php b/rdf/lehrverbandsgruppe.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/lektoren.rdf.php b/rdf/lektoren.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/lvangebot.rdf.php b/rdf/lvangebot.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/lvgesamtnote.rdf.php b/rdf/lvgesamtnote.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/lvinfo.rdf.php b/rdf/lvinfo.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/mantis.rdf.php b/rdf/mantis.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/mantis_categories.rdf.php b/rdf/mantis_categories.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/mantis_projects.rdf.php b/rdf/mantis_projects.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/messages.rdf.php b/rdf/messages.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/mitarbeiter.rdf.php b/rdf/mitarbeiter.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/mobilitaet.rdf.php b/rdf/mobilitaet.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/mobilitaetsprogramm.rdf.php b/rdf/mobilitaetsprogramm.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/mobilitaetstyp.rdf.php b/rdf/mobilitaetstyp.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/nation.rdf.php b/rdf/nation.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/note.rdf.php b/rdf/note.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/notiz.rdf.php b/rdf/notiz.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/organisationseinheit.rdf.php b/rdf/organisationseinheit.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/organisationseinheit_menue.rdf.php b/rdf/organisationseinheit_menue.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/ort.rdf.php b/rdf/ort.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/orte.rdf.php b/rdf/orte.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/person.rdf.php b/rdf/person.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/personal.rdf.php b/rdf/personal.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/prestudent.rdf.php b/rdf/prestudent.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/prestudenthistorie.rdf.php b/rdf/prestudenthistorie.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/prestudentrolle.rdf.php b/rdf/prestudentrolle.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/projekt.rdf.php b/rdf/projekt.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/projektarbeit.rdf.php b/rdf/projektarbeit.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/projektbeschreibung.rdf.php b/rdf/projektbeschreibung.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/projektbetreuer.rdf.php b/rdf/projektbetreuer.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/projektphase.rdf.php b/rdf/projektphase.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/projekttask.rdf.php b/rdf/projekttask.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/projekttyp.rdf.php b/rdf/projekttyp.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/pruefung.rdf.php b/rdf/pruefung.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/pruefungstyp.rdf.php b/rdf/pruefungstyp.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/raumtyp.rdf.php b/rdf/raumtyp.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/reihungstest.rdf.php b/rdf/reihungstest.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/ressource.rdf.php b/rdf/ressource.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/sammelzeugnis.rdf.php b/rdf/sammelzeugnis.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/sprache.rdf.php b/rdf/sprache.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/standort.rdf.php b/rdf/standort.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/status.rdf.php b/rdf/status.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/statusbericht.rdf.php b/rdf/statusbericht.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/statusgrund.rdf.php b/rdf/statusgrund.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/student.rdf.php b/rdf/student.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/studienblatt.xml.php b/rdf/studienblatt.xml.php
old mode 100644
new mode 100755
diff --git a/rdf/studienerfolg.rdf.php b/rdf/studienerfolg.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/studiengang.rdf.php b/rdf/studiengang.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/studienordnung.rdf.php b/rdf/studienordnung.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/studienplan.rdf.php b/rdf/studienplan.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/studiensemester.rdf.php b/rdf/studiensemester.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/stundenplan_betriebsmittel.rdf.php b/rdf/stundenplan_betriebsmittel.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/termine.rdf.php b/rdf/termine.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/undo.rdf.php b/rdf/undo.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/vertrag.rdf.php b/rdf/vertrag.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/vertragdetails.rdf.php b/rdf/vertragdetails.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/vertragsstatus.rdf.php b/rdf/vertragsstatus.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/vertragstyp.rdf.php b/rdf/vertragstyp.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/verwendung.rdf.php b/rdf/verwendung.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/vorlage.rdf.php b/rdf/vorlage.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/wawi_buchung.rdf.php b/rdf/wawi_buchung.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/wawi_buchungstyp.rdf.php b/rdf/wawi_buchungstyp.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/wawi_konto.rdf.php b/rdf/wawi_konto.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/wawi_kostenstelle.rdf.php b/rdf/wawi_kostenstelle.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/zertifikat.rdf.php b/rdf/zertifikat.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/zeugnis.rdf.php b/rdf/zeugnis.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/zeugnisnote.rdf.php b/rdf/zeugnisnote.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/zgv.rdf.php b/rdf/zgv.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/zgvdoktor.rdf.php b/rdf/zgvdoktor.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/zgvmaster.rdf.php b/rdf/zgvmaster.rdf.php
old mode 100644
new mode 100755
diff --git a/rdf/zweck.rdf.php b/rdf/zweck.rdf.php
old mode 100644
new mode 100755
diff --git a/skin/cis.css b/skin/cis.css
old mode 100644
new mode 100755
diff --git a/skin/colorpicker.css b/skin/colorpicker.css
old mode 100644
new mode 100755
diff --git a/skin/croppie.css b/skin/croppie.css
old mode 100644
new mode 100755
diff --git a/skin/fas.css b/skin/fas.css
old mode 100644
new mode 100755
diff --git a/skin/fhcomplete.css b/skin/fhcomplete.css
old mode 100644
new mode 100755
diff --git a/skin/fhcomplete_website.css b/skin/fhcomplete_website.css
old mode 100644
new mode 100755
diff --git a/skin/flexcrollstyles.css b/skin/flexcrollstyles.css
old mode 100644
new mode 100755
diff --git a/skin/images/CIS.ico b/skin/images/CIS.ico
old mode 100644
new mode 100755
diff --git a/skin/images/Calculator.png b/skin/images/Calculator.png
old mode 100644
new mode 100755
diff --git a/skin/images/Chart.svg b/skin/images/Chart.svg
old mode 100644
new mode 100755
diff --git a/skin/images/DeleteIcon.png b/skin/images/DeleteIcon.png
old mode 100644
new mode 100755
diff --git a/skin/images/ExcelIcon.png b/skin/images/ExcelIcon.png
old mode 100644
new mode 100755
diff --git a/skin/images/FAS.ico b/skin/images/FAS.ico
old mode 100644
new mode 100755
diff --git a/skin/images/Filter.svg b/skin/images/Filter.svg
old mode 100644
new mode 100755
diff --git a/skin/images/Graphs_clip_art.svg b/skin/images/Graphs_clip_art.svg
old mode 100644
new mode 100755
diff --git a/skin/images/NeuDokument.png b/skin/images/NeuDokument.png
old mode 100644
new mode 100755
diff --git a/skin/images/Report.svg b/skin/images/Report.svg
old mode 100644
new mode 100755
diff --git a/skin/images/Statistik.svg b/skin/images/Statistik.svg
old mode 100644
new mode 100755
diff --git a/skin/images/TWLogo_klein.gif b/skin/images/TWLogo_klein.gif
old mode 100644
new mode 100755
diff --git a/skin/images/TWLogo_klein.jpg b/skin/images/TWLogo_klein.jpg
old mode 100644
new mode 100755
diff --git a/skin/images/Tempus.ico b/skin/images/Tempus.ico
old mode 100644
new mode 100755
diff --git a/skin/images/Vilesci.ico b/skin/images/Vilesci.ico
old mode 100644
new mode 100755
diff --git a/skin/images/Wawi.ico b/skin/images/Wawi.ico
old mode 100644
new mode 100755
diff --git a/skin/images/addKonto.png b/skin/images/addKonto.png
old mode 100644
new mode 100755
diff --git a/skin/images/ampel_gelb.png b/skin/images/ampel_gelb.png
old mode 100644
new mode 100755
diff --git a/skin/images/ampel_gruen.png b/skin/images/ampel_gruen.png
old mode 100644
new mode 100755
diff --git a/skin/images/ampel_rot.png b/skin/images/ampel_rot.png
old mode 100644
new mode 100755
diff --git a/skin/images/anmelden.png b/skin/images/anmelden.png
old mode 100644
new mode 100755
diff --git a/skin/images/application_form_delete.png b/skin/images/application_form_delete.png
old mode 100644
new mode 100755
diff --git a/skin/images/application_form_edit.png b/skin/images/application_form_edit.png
old mode 100644
new mode 100755
diff --git a/skin/images/application_go.png b/skin/images/application_go.png
old mode 100644
new mode 100755
diff --git a/skin/images/application_home.png b/skin/images/application_home.png
old mode 100644
new mode 100755
diff --git a/skin/images/arbeitspaket.png b/skin/images/arbeitspaket.png
old mode 100644
new mode 100755
diff --git a/skin/images/arrow-next.png b/skin/images/arrow-next.png
old mode 100644
new mode 100755
diff --git a/skin/images/arrow-previous.png b/skin/images/arrow-previous.png
old mode 100644
new mode 100755
diff --git a/skin/images/arrow-single-down-green.png b/skin/images/arrow-single-down-green.png
old mode 100644
new mode 100755
diff --git a/skin/images/arrow-single-up-green.png b/skin/images/arrow-single-up-green.png
old mode 100644
new mode 100755
diff --git a/skin/images/arrow_down.png b/skin/images/arrow_down.png
old mode 100644
new mode 100755
diff --git a/skin/images/asc.gif b/skin/images/asc.gif
old mode 100644
new mode 100755
diff --git a/skin/images/bg.gif b/skin/images/bg.gif
old mode 100644
new mode 100755
diff --git a/skin/images/bg_.gif b/skin/images/bg_.gif
old mode 100644
new mode 100755
diff --git a/skin/images/bg_sort.gif b/skin/images/bg_sort.gif
old mode 100644
new mode 100755
diff --git a/skin/images/blank.gif b/skin/images/blank.gif
old mode 100644
new mode 100755
diff --git a/skin/images/bold.png b/skin/images/bold.png
old mode 100644
new mode 100755
diff --git a/skin/images/bullet_arrow_down.png b/skin/images/bullet_arrow_down.png
old mode 100644
new mode 100755
diff --git a/skin/images/bullet_arrow_right.png b/skin/images/bullet_arrow_right.png
old mode 100644
new mode 100755
diff --git a/skin/images/bullet_go.png b/skin/images/bullet_go.png
old mode 100644
new mode 100755
diff --git a/skin/images/bullet_green.png b/skin/images/bullet_green.png
old mode 100644
new mode 100755
diff --git a/skin/images/bullet_red.png b/skin/images/bullet_red.png
old mode 100644
new mode 100755
diff --git a/skin/images/button_admin.png b/skin/images/button_admin.png
old mode 100644
new mode 100755
diff --git a/skin/images/button_download.png b/skin/images/button_download.png
old mode 100644
new mode 100755
diff --git a/skin/images/button_endnote.png b/skin/images/button_endnote.png
old mode 100644
new mode 100755
diff --git a/skin/images/button_esnack.png b/skin/images/button_esnack.png
old mode 100644
new mode 100755
diff --git a/skin/images/button_feedback.png b/skin/images/button_feedback.png
old mode 100644
new mode 100755
diff --git a/skin/images/button_kreuzerltool.png b/skin/images/button_kreuzerltool.png
old mode 100644
new mode 100755
diff --git a/skin/images/button_listen.png b/skin/images/button_listen.png
old mode 100644
new mode 100755
diff --git a/skin/images/button_lvinfo.png b/skin/images/button_lvinfo.png
old mode 100644
new mode 100755
diff --git a/skin/images/button_lvplan.png b/skin/images/button_lvplan.png
old mode 100644
new mode 100755
diff --git a/skin/images/button_mail.gif b/skin/images/button_mail.gif
old mode 100644
new mode 100755
diff --git a/skin/images/button_moodle.png b/skin/images/button_moodle.png
old mode 100644
new mode 100755
diff --git a/skin/images/button_newsgroups.png b/skin/images/button_newsgroups.png
old mode 100644
new mode 100755
diff --git a/skin/images/button_opus.png b/skin/images/button_opus.png
old mode 100644
new mode 100755
diff --git a/skin/images/button_pinboard.png b/skin/images/button_pinboard.png
old mode 100644
new mode 100755
diff --git a/skin/images/button_semplan.png b/skin/images/button_semplan.png
old mode 100644
new mode 100755
diff --git a/skin/images/button_studiupload.png b/skin/images/button_studiupload.png
old mode 100644
new mode 100755
diff --git a/skin/images/cbox-check.gif b/skin/images/cbox-check.gif
old mode 100644
new mode 100755
diff --git a/skin/images/changed.png b/skin/images/changed.png
old mode 100644
new mode 100755
diff --git a/skin/images/check_black.png b/skin/images/check_black.png
old mode 100644
new mode 100755
diff --git a/skin/images/checkbox_toggle.png b/skin/images/checkbox_toggle.png
old mode 100644
new mode 100755
diff --git a/skin/images/checkbox_uncheck.png b/skin/images/checkbox_uncheck.png
old mode 100644
new mode 100755
diff --git a/skin/images/cis_logo.png b/skin/images/cis_logo.png
old mode 100644
new mode 100755
diff --git a/skin/images/cis_logo_400px.png b/skin/images/cis_logo_400px.png
old mode 100644
new mode 100755
diff --git a/skin/images/cis_logo_weiss.png b/skin/images/cis_logo_weiss.png
old mode 100644
new mode 100755
diff --git a/skin/images/clock_down.png b/skin/images/clock_down.png
old mode 100644
new mode 100755
diff --git a/skin/images/clock_up.png b/skin/images/clock_up.png
old mode 100644
new mode 100755
diff --git a/skin/images/colorpicker/blank.gif b/skin/images/colorpicker/blank.gif
old mode 100644
new mode 100755
diff --git a/skin/images/colorpicker/colorpicker_background.png b/skin/images/colorpicker/colorpicker_background.png
old mode 100644
new mode 100755
diff --git a/skin/images/colorpicker/colorpicker_hex.png b/skin/images/colorpicker/colorpicker_hex.png
old mode 100644
new mode 100755
diff --git a/skin/images/colorpicker/colorpicker_hsb_b.png b/skin/images/colorpicker/colorpicker_hsb_b.png
old mode 100644
new mode 100755
diff --git a/skin/images/colorpicker/colorpicker_hsb_h.png b/skin/images/colorpicker/colorpicker_hsb_h.png
old mode 100644
new mode 100755
diff --git a/skin/images/colorpicker/colorpicker_hsb_s.png b/skin/images/colorpicker/colorpicker_hsb_s.png
old mode 100644
new mode 100755
diff --git a/skin/images/colorpicker/colorpicker_indic.gif b/skin/images/colorpicker/colorpicker_indic.gif
old mode 100644
new mode 100755
diff --git a/skin/images/colorpicker/colorpicker_overlay.png b/skin/images/colorpicker/colorpicker_overlay.png
old mode 100644
new mode 100755
diff --git a/skin/images/colorpicker/colorpicker_rgb_b.png b/skin/images/colorpicker/colorpicker_rgb_b.png
old mode 100644
new mode 100755
diff --git a/skin/images/colorpicker/colorpicker_rgb_g.png b/skin/images/colorpicker/colorpicker_rgb_g.png
old mode 100644
new mode 100755
diff --git a/skin/images/colorpicker/colorpicker_rgb_r.png b/skin/images/colorpicker/colorpicker_rgb_r.png
old mode 100644
new mode 100755
diff --git a/skin/images/colorpicker/colorpicker_select.gif b/skin/images/colorpicker/colorpicker_select.gif
old mode 100644
new mode 100755
diff --git a/skin/images/colorpicker/colorpicker_submit.png b/skin/images/colorpicker/colorpicker_submit.png
old mode 100644
new mode 100755
diff --git a/skin/images/colorpicker/custom_background.png b/skin/images/colorpicker/custom_background.png
old mode 100644
new mode 100755
diff --git a/skin/images/colorpicker/custom_hex.png b/skin/images/colorpicker/custom_hex.png
old mode 100644
new mode 100755
diff --git a/skin/images/colorpicker/custom_hsb_b.png b/skin/images/colorpicker/custom_hsb_b.png
old mode 100644
new mode 100755
diff --git a/skin/images/colorpicker/custom_hsb_h.png b/skin/images/colorpicker/custom_hsb_h.png
old mode 100644
new mode 100755
diff --git a/skin/images/colorpicker/custom_hsb_s.png b/skin/images/colorpicker/custom_hsb_s.png
old mode 100644
new mode 100755
diff --git a/skin/images/colorpicker/custom_indic.gif b/skin/images/colorpicker/custom_indic.gif
old mode 100644
new mode 100755
diff --git a/skin/images/colorpicker/custom_rgb_b.png b/skin/images/colorpicker/custom_rgb_b.png
old mode 100644
new mode 100755
diff --git a/skin/images/colorpicker/custom_rgb_g.png b/skin/images/colorpicker/custom_rgb_g.png
old mode 100644
new mode 100755
diff --git a/skin/images/colorpicker/custom_rgb_r.png b/skin/images/colorpicker/custom_rgb_r.png
old mode 100644
new mode 100755
diff --git a/skin/images/colorpicker/custom_submit - original.png b/skin/images/colorpicker/custom_submit - original.png
old mode 100644
new mode 100755
diff --git a/skin/images/colorpicker/custom_submit.png b/skin/images/colorpicker/custom_submit.png
old mode 100644
new mode 100755
diff --git a/skin/images/colorpicker/select.png b/skin/images/colorpicker/select.png
old mode 100644
new mode 100755
diff --git a/skin/images/colorpicker/select2.png b/skin/images/colorpicker/select2.png
old mode 100644
new mode 100755
diff --git a/skin/images/colorpicker/slider.png b/skin/images/colorpicker/slider.png
old mode 100644
new mode 100755
diff --git a/skin/images/copy.png b/skin/images/copy.png
old mode 100644
new mode 100755
diff --git a/skin/images/cross.png b/skin/images/cross.png
old mode 100644
new mode 100755
diff --git a/skin/images/csv.ico b/skin/images/csv.ico
old mode 100644
new mode 100755
diff --git a/skin/images/csv.png b/skin/images/csv.png
old mode 100644
new mode 100755
diff --git a/skin/images/csv_light.png b/skin/images/csv_light.png
old mode 100644
new mode 100755
diff --git a/skin/images/date_add.png b/skin/images/date_add.png
old mode 100644
new mode 100755
diff --git a/skin/images/date_delete.png b/skin/images/date_delete.png
old mode 100644
new mode 100755
diff --git a/skin/images/date_edit.png b/skin/images/date_edit.png
old mode 100644
new mode 100755
diff --git a/skin/images/date_go.png b/skin/images/date_go.png
old mode 100644
new mode 100755
diff --git a/skin/images/date_go_grau.png b/skin/images/date_go_grau.png
old mode 100644
new mode 100755
diff --git a/skin/images/date_magnify.png b/skin/images/date_magnify.png
old mode 100644
new mode 100755
diff --git a/skin/images/delete.gif b/skin/images/delete.gif
old mode 100644
new mode 100755
diff --git a/skin/images/delete.png b/skin/images/delete.png
old mode 100644
new mode 100755
diff --git a/skin/images/delete_round.png b/skin/images/delete_round.png
old mode 100644
new mode 100755
diff --git a/skin/images/delete_x.png b/skin/images/delete_x.png
old mode 100644
new mode 100755
diff --git a/skin/images/delete_x_grau.png b/skin/images/delete_x_grau.png
old mode 100644
new mode 100755
diff --git a/skin/images/desc.gif b/skin/images/desc.gif
old mode 100644
new mode 100755
diff --git a/skin/images/doc_icon.png b/skin/images/doc_icon.png
old mode 100644
new mode 100755
diff --git a/skin/images/doppelampel_gelb.gif b/skin/images/doppelampel_gelb.gif
old mode 100644
new mode 100755
diff --git a/skin/images/doppelampel_grau.gif b/skin/images/doppelampel_grau.gif
old mode 100644
new mode 100755
diff --git a/skin/images/doppelampel_rot.gif b/skin/images/doppelampel_rot.gif
old mode 100644
new mode 100755
diff --git a/skin/images/doppelampel_rot_gelb.gif b/skin/images/doppelampel_rot_gelb.gif
old mode 100644
new mode 100755
diff --git a/skin/images/down.png b/skin/images/down.png
old mode 100644
new mode 100755
diff --git a/skin/images/down_lvplan.png b/skin/images/down_lvplan.png
old mode 100644
new mode 100755
diff --git a/skin/images/drucken.png b/skin/images/drucken.png
old mode 100644
new mode 100755
diff --git a/skin/images/edit-paste.png b/skin/images/edit-paste.png
old mode 100644
new mode 100755
diff --git a/skin/images/edit.png b/skin/images/edit.png
old mode 100644
new mode 100755
diff --git a/skin/images/edit_grau.png b/skin/images/edit_grau.png
old mode 100644
new mode 100755
diff --git a/skin/images/edit_wawi.gif b/skin/images/edit_wawi.gif
old mode 100644
new mode 100755
diff --git a/skin/images/email.png b/skin/images/email.png
old mode 100644
new mode 100755
diff --git a/skin/images/entitlement-pot.png b/skin/images/entitlement-pot.png
old mode 100644
new mode 100755
diff --git a/skin/images/entry.gif b/skin/images/entry.gif
old mode 100644
new mode 100755
diff --git a/skin/images/eps-logo_full.gif b/skin/images/eps-logo_full.gif
old mode 100644
new mode 100755
diff --git a/skin/images/excel.gif b/skin/images/excel.gif
old mode 100644
new mode 100755
diff --git a/skin/images/exclamation.png b/skin/images/exclamation.png
old mode 100644
new mode 100755
diff --git a/skin/images/eye.png b/skin/images/eye.png
old mode 100644
new mode 100755
diff --git a/skin/images/false.png b/skin/images/false.png
old mode 100644
new mode 100755
diff --git a/skin/images/fh-complete_weiss.png b/skin/images/fh-complete_weiss.png
old mode 100644
new mode 100755
diff --git a/skin/images/fh_complete_logo.png b/skin/images/fh_complete_logo.png
old mode 100644
new mode 100755
diff --git a/skin/images/fh_complete_logo_400x61.png b/skin/images/fh_complete_logo_400x61.png
old mode 100644
new mode 100755
diff --git a/skin/images/fh_logo.png b/skin/images/fh_logo.png
old mode 100644
new mode 100755
diff --git a/skin/images/fh_technikum_wien_illustration_klein.png b/skin/images/fh_technikum_wien_illustration_klein.png
old mode 100644
new mode 100755
diff --git a/skin/images/fhcomplete.png b/skin/images/fhcomplete.png
old mode 100644
new mode 100755
diff --git a/skin/images/fhtw_logo.png b/skin/images/fhtw_logo.png
old mode 100644
new mode 100755
diff --git a/skin/images/file.gif b/skin/images/file.gif
old mode 100644
new mode 100755
diff --git a/skin/images/flag-green.png b/skin/images/flag-green.png
old mode 100644
new mode 100755
diff --git a/skin/images/flag-red.png b/skin/images/flag-red.png
old mode 100644
new mode 100755
diff --git a/skin/images/flag-yellow.png b/skin/images/flag-yellow.png
old mode 100644
new mode 100755
diff --git a/skin/images/folder.gif b/skin/images/folder.gif
old mode 100644
new mode 100755
diff --git a/skin/images/folderup.gif b/skin/images/folderup.gif
old mode 100644
new mode 100755
diff --git a/skin/images/green_point.gif b/skin/images/green_point.gif
old mode 100644
new mode 100755
diff --git a/skin/images/group.png b/skin/images/group.png
old mode 100644
new mode 100755
diff --git a/skin/images/haken.gif b/skin/images/haken.gif
old mode 100644
new mode 100755
diff --git a/skin/images/header_line.gif b/skin/images/header_line.gif
old mode 100644
new mode 100755
diff --git a/skin/images/header_testtool.png b/skin/images/header_testtool.png
old mode 100644
new mode 100755
diff --git a/skin/images/help.png b/skin/images/help.png
old mode 100644
new mode 100755
diff --git a/skin/images/html.png b/skin/images/html.png
old mode 100644
new mode 100755
diff --git a/skin/images/html_light.png b/skin/images/html_light.png
old mode 100644
new mode 100755
diff --git a/skin/images/ical1.0.png b/skin/images/ical1.0.png
old mode 100644
new mode 100755
diff --git a/skin/images/ical1.0_light.png b/skin/images/ical1.0_light.png
old mode 100644
new mode 100755
diff --git a/skin/images/ical2.0.png b/skin/images/ical2.0.png
old mode 100644
new mode 100755
diff --git a/skin/images/ical2.0_light.png b/skin/images/ical2.0_light.png
old mode 100644
new mode 100755
diff --git a/skin/images/img_icon.png b/skin/images/img_icon.png
old mode 100644
new mode 100755
diff --git a/skin/images/index.php b/skin/images/index.php
old mode 100644
new mode 100755
diff --git a/skin/images/indicator.gif b/skin/images/indicator.gif
old mode 100644
new mode 100755
diff --git a/skin/images/info.png b/skin/images/info.png
old mode 100644
new mode 100755
diff --git a/skin/images/information.png b/skin/images/information.png
old mode 100644
new mode 100755
diff --git a/skin/images/invisible.png b/skin/images/invisible.png
old mode 100644
new mode 100755
diff --git a/skin/images/italic.png b/skin/images/italic.png
old mode 100644
new mode 100755
diff --git a/skin/images/ja.png b/skin/images/ja.png
old mode 100644
new mode 100755
diff --git a/skin/images/justifycenter.png b/skin/images/justifycenter.png
old mode 100644
new mode 100755
diff --git a/skin/images/justifyleft.png b/skin/images/justifyleft.png
old mode 100644
new mode 100755
diff --git a/skin/images/justifyright.png b/skin/images/justifyright.png
old mode 100644
new mode 100755
diff --git a/skin/images/left.gif b/skin/images/left.gif
old mode 100644
new mode 100755
diff --git a/skin/images/left.png b/skin/images/left.png
old mode 100644
new mode 100755
diff --git a/skin/images/left_lvplan.png b/skin/images/left_lvplan.png
old mode 100644
new mode 100755
diff --git a/skin/images/lehrtyp_.png b/skin/images/lehrtyp_.png
old mode 100644
new mode 100755
diff --git a/skin/images/lehrtyp_2.png b/skin/images/lehrtyp_2.png
old mode 100644
new mode 100755
diff --git a/skin/images/lehrtyp_lf.png b/skin/images/lehrtyp_lf.png
old mode 100644
new mode 100755
diff --git a/skin/images/lehrtyp_lv.png b/skin/images/lehrtyp_lv.png
old mode 100644
new mode 100755
diff --git a/skin/images/lehrtyp_modul.png b/skin/images/lehrtyp_modul.png
old mode 100644
new mode 100755
diff --git a/skin/images/list-add.png b/skin/images/list-add.png
old mode 100644
new mode 100755
diff --git a/skin/images/liste.gif b/skin/images/liste.gif
old mode 100644
new mode 100755
diff --git a/skin/images/lock.png b/skin/images/lock.png
old mode 100644
new mode 100755
diff --git a/skin/images/login.gif b/skin/images/login.gif
old mode 100644
new mode 100755
diff --git a/skin/images/logo.jpg b/skin/images/logo.jpg
old mode 100644
new mode 100755
diff --git a/skin/images/logo.png b/skin/images/logo.png
old mode 100644
new mode 100755
diff --git a/skin/images/logo_gmbh.jpg b/skin/images/logo_gmbh.jpg
old mode 100644
new mode 100755
diff --git a/skin/images/lv.png b/skin/images/lv.png
old mode 100644
new mode 100755
diff --git a/skin/images/lvaMulti.png b/skin/images/lvaMulti.png
old mode 100644
new mode 100755
diff --git a/skin/images/lvaMultiDel.png b/skin/images/lvaMultiDel.png
old mode 100644
new mode 100755
diff --git a/skin/images/lvaSingle.png b/skin/images/lvaSingle.png
old mode 100644
new mode 100755
diff --git a/skin/images/lvaSingleDel.png b/skin/images/lvaSingleDel.png
old mode 100644
new mode 100755
diff --git a/skin/images/lvplan.png b/skin/images/lvplan.png
old mode 100644
new mode 100755
diff --git a/skin/images/map.png b/skin/images/map.png
old mode 100644
new mode 100755
diff --git a/skin/images/markdown_button.png b/skin/images/markdown_button.png
old mode 100644
new mode 100755
diff --git a/skin/images/menu_item.gif b/skin/images/menu_item.gif
old mode 100644
new mode 100755
diff --git a/skin/images/menue.png b/skin/images/menue.png
old mode 100644
new mode 100755
diff --git a/skin/images/menue_hover.png b/skin/images/menue_hover.png
old mode 100644
new mode 100755
diff --git a/skin/images/merge.png b/skin/images/merge.png
old mode 100644
new mode 100755
diff --git a/skin/images/milestone.png b/skin/images/milestone.png
old mode 100644
new mode 100755
diff --git a/skin/images/modul.png b/skin/images/modul.png
old mode 100644
new mode 100755
diff --git a/skin/images/moreleft.png b/skin/images/moreleft.png
old mode 100644
new mode 100755
diff --git a/skin/images/moreleft_lvplan.png b/skin/images/moreleft_lvplan.png
old mode 100644
new mode 100755
diff --git a/skin/images/moremoreleft.png b/skin/images/moremoreleft.png
old mode 100644
new mode 100755
diff --git a/skin/images/moremoreright.png b/skin/images/moremoreright.png
old mode 100644
new mode 100755
diff --git a/skin/images/moreright.png b/skin/images/moreright.png
old mode 100644
new mode 100755
diff --git a/skin/images/moreright_lvplan.png b/skin/images/moreright_lvplan.png
old mode 100644
new mode 100755
diff --git a/skin/images/nachgereicht.png b/skin/images/nachgereicht.png
old mode 100644
new mode 100755
diff --git a/skin/images/not-available.png b/skin/images/not-available.png
old mode 100644
new mode 100755
diff --git a/skin/images/offen.png b/skin/images/offen.png
old mode 100644
new mode 100755
diff --git a/skin/images/ok.png b/skin/images/ok.png
old mode 100644
new mode 100755
diff --git a/skin/images/open.gif b/skin/images/open.gif
old mode 100644
new mode 100755
diff --git a/skin/images/openoffice0.jpg b/skin/images/openoffice0.jpg
old mode 100644
new mode 100755
diff --git a/skin/images/organisationseinheit.png b/skin/images/organisationseinheit.png
old mode 100644
new mode 100755
diff --git a/skin/images/outlook.ico b/skin/images/outlook.ico
old mode 100644
new mode 100755
diff --git a/skin/images/outlook.png b/skin/images/outlook.png
old mode 100644
new mode 100755
diff --git a/skin/images/outlook_light.png b/skin/images/outlook_light.png
old mode 100644
new mode 100755
diff --git a/skin/images/p.gif b/skin/images/p.gif
old mode 100644
new mode 100755
diff --git a/skin/images/page_go.png b/skin/images/page_go.png
old mode 100644
new mode 100755
diff --git a/skin/images/page_green.png b/skin/images/page_green.png
old mode 100644
new mode 100755
diff --git a/skin/images/pdf.ico b/skin/images/pdf.ico
old mode 100644
new mode 100755
diff --git a/skin/images/pdf_icon.png b/skin/images/pdf_icon.png
old mode 100644
new mode 100755
diff --git a/skin/images/pdfpic.gif b/skin/images/pdfpic.gif
old mode 100644
new mode 100755
diff --git a/skin/images/pencil.png b/skin/images/pencil.png
old mode 100644
new mode 100755
diff --git a/skin/images/person.gif b/skin/images/person.gif
old mode 100644
new mode 100755
diff --git a/skin/images/photoupload.png b/skin/images/photoupload.png
old mode 100644
new mode 100755
diff --git a/skin/images/planner.ico b/skin/images/planner.ico
old mode 100644
new mode 100755
diff --git a/skin/images/planner.png b/skin/images/planner.png
old mode 100644
new mode 100755
diff --git a/skin/images/planner_logo.png b/skin/images/planner_logo.png
old mode 100644
new mode 100755
diff --git a/skin/images/planner_logo_weiss.png b/skin/images/planner_logo_weiss.png
old mode 100644
new mode 100755
diff --git a/skin/images/plus.png b/skin/images/plus.png
old mode 100644
new mode 100755
diff --git a/skin/images/ppt_icon.png b/skin/images/ppt_icon.png
old mode 100644
new mode 100755
diff --git a/skin/images/preferences-system.png b/skin/images/preferences-system.png
old mode 100644
new mode 100755
diff --git a/skin/images/printer.png b/skin/images/printer.png
old mode 100644
new mode 100755
diff --git a/skin/images/profilbild_dummy.jpg b/skin/images/profilbild_dummy.jpg
old mode 100644
new mode 100755
diff --git a/skin/images/projekt.png b/skin/images/projekt.png
old mode 100644
new mode 100755
diff --git a/skin/images/projektphase.png b/skin/images/projektphase.png
old mode 100644
new mode 100755
diff --git a/skin/images/question.png b/skin/images/question.png
old mode 100644
new mode 100755
diff --git a/skin/images/red_point.gif b/skin/images/red_point.gif
old mode 100644
new mode 100755
diff --git a/skin/images/refresh.png b/skin/images/refresh.png
old mode 100644
new mode 100755
diff --git a/skin/images/repeat.png b/skin/images/repeat.png
old mode 100644
new mode 100755
diff --git a/skin/images/right.gif b/skin/images/right.gif
old mode 100644
new mode 100755
diff --git a/skin/images/right.png b/skin/images/right.png
old mode 100644
new mode 100755
diff --git a/skin/images/right_lvplan.png b/skin/images/right_lvplan.png
old mode 100644
new mode 100755
diff --git a/skin/images/round.png b/skin/images/round.png
old mode 100644
new mode 100755
diff --git a/skin/images/sancho/sancho_footer.jpg b/skin/images/sancho/sancho_footer.jpg
old mode 100644
new mode 100755
diff --git a/skin/images/sancho/sancho_footer_DEFAULT.jpg b/skin/images/sancho/sancho_footer_DEFAULT.jpg
old mode 100644
new mode 100755
diff --git a/skin/images/sancho/sancho_footer_DEFAULT_bw.jpg b/skin/images/sancho/sancho_footer_DEFAULT_bw.jpg
old mode 100644
new mode 100755
diff --git a/skin/images/sancho/sancho_footer_min_bw.jpg b/skin/images/sancho/sancho_footer_min_bw.jpg
old mode 100644
new mode 100755
diff --git a/skin/images/sancho/sancho_footer_min_bw.xcf b/skin/images/sancho/sancho_footer_min_bw.xcf
old mode 100644
new mode 100755
diff --git a/skin/images/sancho/sancho_header_DEFAULT.jpg b/skin/images/sancho/sancho_header_DEFAULT.jpg
old mode 100644
new mode 100755
diff --git a/skin/images/sancho/sancho_header_DEFAULT_bw.jpg b/skin/images/sancho/sancho_header_DEFAULT_bw.jpg
old mode 100644
new mode 100755
diff --git a/skin/images/sancho/sancho_header_TEMPLATE - Kopie.xcf b/skin/images/sancho/sancho_header_TEMPLATE - Kopie.xcf
old mode 100644
new mode 100755
diff --git a/skin/images/sancho/sancho_header_TEMPLATE.xcf b/skin/images/sancho/sancho_header_TEMPLATE.xcf
old mode 100644
new mode 100755
diff --git a/skin/images/sancho/sancho_header_ampel_overdue.jpg b/skin/images/sancho/sancho_header_ampel_overdue.jpg
old mode 100644
new mode 100755
diff --git a/skin/images/sancho/sancho_header_confirm_timesheet.jpg b/skin/images/sancho/sancho_header_confirm_timesheet.jpg
old mode 100644
new mode 100755
diff --git a/skin/images/sancho/sancho_header_du_hast_neue_nachrichten.jpg b/skin/images/sancho/sancho_header_du_hast_neue_nachrichten.jpg
old mode 100644
new mode 100755
diff --git a/skin/images/sancho/sancho_header_du_hast_verpflichtende_ampeln.jpg b/skin/images/sancho/sancho_header_du_hast_verpflichtende_ampeln.jpg
old mode 100644
new mode 100755
diff --git a/skin/images/sancho/sancho_header_min_bw.jpg b/skin/images/sancho/sancho_header_min_bw.jpg
old mode 100644
new mode 100755
diff --git a/skin/images/sancho/sancho_header_neue_nachrichten_in_ampelsystem.jpg b/skin/images/sancho/sancho_header_neue_nachrichten_in_ampelsystem.jpg
old mode 100644
new mode 100755
diff --git a/skin/images/sancho/sancho_roboter.jpg b/skin/images/sancho/sancho_roboter.jpg
old mode 100644
new mode 100755
diff --git a/skin/images/sancho/sancho_roboter_freigestellt.png b/skin/images/sancho/sancho_roboter_freigestellt.png
old mode 100644
new mode 100755
diff --git a/skin/images/sancho_round_right_blue.png b/skin/images/sancho_round_right_blue.png
old mode 100644
new mode 100755
diff --git a/skin/images/sancho_round_right_grey.png b/skin/images/sancho_round_right_grey.png
old mode 100644
new mode 100755
diff --git a/skin/images/sancho_round_right_red.png b/skin/images/sancho_round_right_red.png
old mode 100644
new mode 100755
diff --git a/skin/images/scrollbar_left_right.png b/skin/images/scrollbar_left_right.png
old mode 100644
new mode 100755
diff --git a/skin/images/scrollbar_up_down.png b/skin/images/scrollbar_up_down.png
old mode 100644
new mode 100755
diff --git a/skin/images/scrollbase_bottom.png b/skin/images/scrollbase_bottom.png
old mode 100644
new mode 100755
diff --git a/skin/images/scrollbase_left.png b/skin/images/scrollbase_left.png
old mode 100644
new mode 100755
diff --git a/skin/images/scrollbase_right.png b/skin/images/scrollbase_right.png
old mode 100644
new mode 100755
diff --git a/skin/images/scrollbase_top.png b/skin/images/scrollbase_top.png
old mode 100644
new mode 100755
diff --git a/skin/images/search.png b/skin/images/search.png
old mode 100644
new mode 100755
diff --git a/skin/images/seperator.gif b/skin/images/seperator.gif
old mode 100644
new mode 100755
diff --git a/skin/images/service.png b/skin/images/service.png
old mode 100644
new mode 100755
diff --git a/skin/images/spinner.gif b/skin/images/spinner.gif
old mode 100644
new mode 100755
diff --git a/skin/images/split-arrows.png b/skin/images/split-arrows.png
old mode 100644
new mode 100755
diff --git a/skin/images/square_blue.png b/skin/images/square_blue.png
old mode 100644
new mode 100755
diff --git a/skin/images/statistic.png b/skin/images/statistic.png
old mode 100644
new mode 100755
diff --git a/skin/images/sticky.png b/skin/images/sticky.png
old mode 100644
new mode 100755
diff --git a/skin/images/system-index-search.png b/skin/images/system-index-search.png
old mode 100644
new mode 100755
diff --git a/skin/images/tempus_logo.png b/skin/images/tempus_logo.png
old mode 100644
new mode 100755
diff --git a/skin/images/tempus_logo_weiss.png b/skin/images/tempus_logo_weiss.png
old mode 100644
new mode 100755
diff --git a/skin/images/testtool_button.png b/skin/images/testtool_button.png
old mode 100644
new mode 100755
diff --git a/skin/images/testtool_button_hover.png b/skin/images/testtool_button_hover.png
old mode 100644
new mode 100755
diff --git a/skin/images/testtool_buttonleft.png b/skin/images/testtool_buttonleft.png
old mode 100644
new mode 100755
diff --git a/skin/images/testtool_buttonright.png b/skin/images/testtool_buttonright.png
old mode 100644
new mode 100755
diff --git a/skin/images/text-x-generic_with_pencil.png b/skin/images/text-x-generic_with_pencil.png
old mode 100644
new mode 100755
diff --git a/skin/images/tick.png b/skin/images/tick.png
old mode 100644
new mode 100755
diff --git a/skin/images/timetable.png b/skin/images/timetable.png
old mode 100644
new mode 100755
diff --git a/skin/images/transmit.png b/skin/images/transmit.png
old mode 100644
new mode 100755
diff --git a/skin/images/tree-diagramm.png b/skin/images/tree-diagramm.png
old mode 100644
new mode 100755
diff --git a/skin/images/true.png b/skin/images/true.png
old mode 100644
new mode 100755
diff --git a/skin/images/tw_logo_02.jpg b/skin/images/tw_logo_02.jpg
old mode 100644
new mode 100755
diff --git a/skin/images/ui-bg_diagonals-thick_18_b81900_40x40.png b/skin/images/ui-bg_diagonals-thick_18_b81900_40x40.png
old mode 100644
new mode 100755
diff --git a/skin/images/ui-bg_diagonals-thick_20_666666_40x40.png b/skin/images/ui-bg_diagonals-thick_20_666666_40x40.png
old mode 100644
new mode 100755
diff --git a/skin/images/ui-bg_flat_0_aaaaaa_40x100.png b/skin/images/ui-bg_flat_0_aaaaaa_40x100.png
old mode 100644
new mode 100755
diff --git a/skin/images/ui-bg_flat_10_000000_40x100.png b/skin/images/ui-bg_flat_10_000000_40x100.png
old mode 100644
new mode 100755
diff --git a/skin/images/ui-bg_flat_75_ffffff_40x100.png b/skin/images/ui-bg_flat_75_ffffff_40x100.png
old mode 100644
new mode 100755
diff --git a/skin/images/ui-bg_glass_100_f6f6f6_1x400.png b/skin/images/ui-bg_glass_100_f6f6f6_1x400.png
old mode 100644
new mode 100755
diff --git a/skin/images/ui-bg_glass_100_fdf5ce_1x400.png b/skin/images/ui-bg_glass_100_fdf5ce_1x400.png
old mode 100644
new mode 100755
diff --git a/skin/images/ui-bg_glass_55_fbf9ee_1x400.png b/skin/images/ui-bg_glass_55_fbf9ee_1x400.png
old mode 100644
new mode 100755
diff --git a/skin/images/ui-bg_glass_65_ffffff_1x400.png b/skin/images/ui-bg_glass_65_ffffff_1x400.png
old mode 100644
new mode 100755
diff --git a/skin/images/ui-bg_glass_75_dadada_1x400.png b/skin/images/ui-bg_glass_75_dadada_1x400.png
old mode 100644
new mode 100755
diff --git a/skin/images/ui-bg_glass_75_e6e6e6_1x400.png b/skin/images/ui-bg_glass_75_e6e6e6_1x400.png
old mode 100644
new mode 100755
diff --git a/skin/images/ui-bg_glass_95_fef1ec_1x400.png b/skin/images/ui-bg_glass_95_fef1ec_1x400.png
old mode 100644
new mode 100755
diff --git a/skin/images/ui-bg_gloss-wave_35_f6a828_500x100.png b/skin/images/ui-bg_gloss-wave_35_f6a828_500x100.png
old mode 100644
new mode 100755
diff --git a/skin/images/ui-bg_highlight-soft_100_eeeeee_1x100.png b/skin/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
old mode 100644
new mode 100755
diff --git a/skin/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/skin/images/ui-bg_highlight-soft_75_cccccc_1x100.png
old mode 100644
new mode 100755
diff --git a/skin/images/ui-bg_highlight-soft_75_ffe45c_1x100.png b/skin/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
old mode 100644
new mode 100755
diff --git a/skin/images/ui-icons_222222_256x240.png b/skin/images/ui-icons_222222_256x240.png
old mode 100644
new mode 100755
diff --git a/skin/images/ui-icons_228ef1_256x240.png b/skin/images/ui-icons_228ef1_256x240.png
old mode 100644
new mode 100755
diff --git a/skin/images/ui-icons_2e83ff_256x240.png b/skin/images/ui-icons_2e83ff_256x240.png
old mode 100644
new mode 100755
diff --git a/skin/images/ui-icons_454545_256x240.png b/skin/images/ui-icons_454545_256x240.png
old mode 100644
new mode 100755
diff --git a/skin/images/ui-icons_888888_256x240.png b/skin/images/ui-icons_888888_256x240.png
old mode 100644
new mode 100755
diff --git a/skin/images/ui-icons_cd0a0a_256x240.png b/skin/images/ui-icons_cd0a0a_256x240.png
old mode 100644
new mode 100755
diff --git a/skin/images/ui-icons_ef8c08_256x240.png b/skin/images/ui-icons_ef8c08_256x240.png
old mode 100644
new mode 100755
diff --git a/skin/images/ui-icons_ffd27a_256x240.png b/skin/images/ui-icons_ffd27a_256x240.png
old mode 100644
new mode 100755
diff --git a/skin/images/ui-icons_ffffff_256x240.png b/skin/images/ui-icons_ffffff_256x240.png
old mode 100644
new mode 100755
diff --git a/skin/images/underline.png b/skin/images/underline.png
old mode 100644
new mode 100755
diff --git a/skin/images/up.png b/skin/images/up.png
old mode 100644
new mode 100755
diff --git a/skin/images/upload.png b/skin/images/upload.png
old mode 100644
new mode 100755
diff --git a/skin/images/user_down.png b/skin/images/user_down.png
old mode 100644
new mode 100755
diff --git a/skin/images/user_up.png b/skin/images/user_up.png
old mode 100644
new mode 100755
diff --git a/skin/images/verplant_false.png b/skin/images/verplant_false.png
old mode 100644
new mode 100755
diff --git a/skin/images/verplant_true.png b/skin/images/verplant_true.png
old mode 100644
new mode 100755
diff --git a/skin/images/vilesci_addons.png b/skin/images/vilesci_addons.png
old mode 100644
new mode 100755
diff --git a/skin/images/vilesci_admin.png b/skin/images/vilesci_admin.png
old mode 100644
new mode 100755
diff --git a/skin/images/vilesci_farbverlauf.png b/skin/images/vilesci_farbverlauf.png
old mode 100644
new mode 100755
diff --git a/skin/images/vilesci_farbverlauf_top.png b/skin/images/vilesci_farbverlauf_top.png
old mode 100644
new mode 100755
diff --git a/skin/images/vilesci_inventar.png b/skin/images/vilesci_inventar.png
old mode 100644
new mode 100755
diff --git a/skin/images/vilesci_lehre.png b/skin/images/vilesci_lehre.png
old mode 100644
new mode 100755
diff --git a/skin/images/vilesci_logo.png b/skin/images/vilesci_logo.png
old mode 100644
new mode 100755
diff --git a/skin/images/vilesci_logo_weiss.png b/skin/images/vilesci_logo_weiss.png
old mode 100644
new mode 100755
diff --git a/skin/images/vilesci_lvplan.png b/skin/images/vilesci_lvplan.png
old mode 100644
new mode 100755
diff --git a/skin/images/vilesci_personen.png b/skin/images/vilesci_personen.png
old mode 100644
new mode 100755
diff --git a/skin/images/vilesci_stammdaten.png b/skin/images/vilesci_stammdaten.png
old mode 100644
new mode 100755
diff --git a/skin/images/vilesci_statistik.png b/skin/images/vilesci_statistik.png
old mode 100644
new mode 100755
diff --git a/skin/images/vilesci_wartung.png b/skin/images/vilesci_wartung.png
old mode 100644
new mode 100755
diff --git a/skin/images/wawi_logo.png b/skin/images/wawi_logo.png
old mode 100644
new mode 100755
diff --git a/skin/images/wawi_logo_sz.png b/skin/images/wawi_logo_sz.png
old mode 100644
new mode 100755
diff --git a/skin/images/wawi_logo_weiss.png b/skin/images/wawi_logo_weiss.png
old mode 100644
new mode 100755
diff --git a/skin/images/x-office-presentation.svg b/skin/images/x-office-presentation.svg
old mode 100644
new mode 100755
diff --git a/skin/images/x-office-spreadsheet.svg b/skin/images/x-office-spreadsheet.svg
old mode 100644
new mode 100755
diff --git a/skin/images/xls.png b/skin/images/xls.png
old mode 100644
new mode 100755
diff --git a/skin/images/xls_icon.png b/skin/images/xls_icon.png
old mode 100644
new mode 100755
diff --git a/skin/images/xls_light.png b/skin/images/xls_light.png
old mode 100644
new mode 100755
diff --git a/skin/images/zip_icon.png b/skin/images/zip_icon.png
old mode 100644
new mode 100755
diff --git a/skin/infoscreen.css b/skin/infoscreen.css
old mode 100644
new mode 100755
diff --git a/skin/jquery-ui-1.9.2.custom.min.css b/skin/jquery-ui-1.9.2.custom.min.css
old mode 100644
new mode 100755
diff --git a/skin/jquery.css b/skin/jquery.css
old mode 100644
new mode 100755
diff --git a/skin/planner.css b/skin/planner.css
old mode 100644
new mode 100755
diff --git a/skin/print.css b/skin/print.css
old mode 100644
new mode 100755
diff --git a/skin/simplecropper.css b/skin/simplecropper.css
old mode 100644
new mode 100755
diff --git a/skin/sounds/inventar_error.ogg b/skin/sounds/inventar_error.ogg
old mode 100644
new mode 100755
diff --git a/skin/sounds/testtool_demo.mp3 b/skin/sounds/testtool_demo.mp3
old mode 100644
new mode 100755
diff --git a/skin/sounds/testtool_demo.ogg b/skin/sounds/testtool_demo.ogg
old mode 100644
new mode 100755
diff --git a/skin/style.css.php b/skin/style.css.php
old mode 100644
new mode 100755
diff --git a/skin/styles/default/cis_logo_text_400x78.png b/skin/styles/default/cis_logo_text_400x78.png
old mode 100644
new mode 100755
diff --git a/skin/styles/default/header.png b/skin/styles/default/header.png
old mode 100644
new mode 100755
diff --git a/skin/styles/default/logo_250x130.png b/skin/styles/default/logo_250x130.png
old mode 100644
new mode 100755
diff --git a/skin/styles/example.css b/skin/styles/example.css
old mode 100644
new mode 100755
diff --git a/skin/styles/example/description.txt b/skin/styles/example/description.txt
old mode 100644
new mode 100755
diff --git a/skin/styles/example/line.jpg b/skin/styles/example/line.jpg
old mode 100644
new mode 100755
diff --git a/skin/styles/example/logo.jpg b/skin/styles/example/logo.jpg
old mode 100644
new mode 100755
diff --git a/skin/styles/example/pixel.jpg b/skin/styles/example/pixel.jpg
old mode 100644
new mode 100755
diff --git a/skin/styles/example/screenshot.jpg b/skin/styles/example/screenshot.jpg
old mode 100644
new mode 100755
diff --git a/skin/styles/fhb/description.txt b/skin/styles/fhb/description.txt
old mode 100644
new mode 100755
diff --git a/skin/styles/fhb/logo.png b/skin/styles/fhb/logo.png
old mode 100644
new mode 100755
diff --git a/skin/styles/fhb/logo_klein.jpg b/skin/styles/fhb/logo_klein.jpg
old mode 100644
new mode 100755
diff --git a/skin/styles/jquery.css b/skin/styles/jquery.css
old mode 100644
new mode 100755
diff --git a/skin/styles/mobile.css b/skin/styles/mobile.css
old mode 100644
new mode 100755
diff --git a/skin/styles/mobile/TWLogo_klein.jpg b/skin/styles/mobile/TWLogo_klein.jpg
old mode 100644
new mode 100755
diff --git a/skin/styles/mobile/description.txt b/skin/styles/mobile/description.txt
old mode 100644
new mode 100755
diff --git a/skin/styles/mobile/header_line.jpg b/skin/styles/mobile/header_line.jpg
old mode 100644
new mode 100755
diff --git a/skin/styles/mobile/screenshot.jpg b/skin/styles/mobile/screenshot.jpg
old mode 100644
new mode 100755
diff --git a/skin/styles/stp.css b/skin/styles/stp.css
old mode 100644
new mode 100755
diff --git a/skin/styles/stp/BannerLogo.jpg b/skin/styles/stp/BannerLogo.jpg
old mode 100644
new mode 100755
diff --git a/skin/styles/stp/KTULogo.jpg b/skin/styles/stp/KTULogo.jpg
old mode 100644
new mode 100755
diff --git a/skin/styles/stp/KTULogo.png b/skin/styles/stp/KTULogo.png
old mode 100644
new mode 100755
diff --git a/skin/styles/stp/abschlusspraesentation.jpg b/skin/styles/stp/abschlusspraesentation.jpg
old mode 100644
new mode 100755
diff --git a/skin/styles/stp/absolventen.jpg b/skin/styles/stp/absolventen.jpg
old mode 100644
new mode 100755
diff --git a/skin/styles/stp/international_week.jpg b/skin/styles/stp/international_week.jpg
old mode 100644
new mode 100755
diff --git a/skin/styles/stp/logo.jpg b/skin/styles/stp/logo.jpg
old mode 100644
new mode 100755
diff --git a/skin/styles/stp/logo.png b/skin/styles/stp/logo.png
old mode 100644
new mode 100755
diff --git a/skin/styles/stp/pitching.jpg b/skin/styles/stp/pitching.jpg
old mode 100644
new mode 100755
diff --git a/skin/styles/stp/projektidee.jpg b/skin/styles/stp/projektidee.jpg
old mode 100644
new mode 100755
diff --git a/skin/styles/tinymce.css b/skin/styles/tinymce.css
old mode 100644
new mode 100755
diff --git a/skin/styles/tw.css b/skin/styles/tw.css
old mode 100644
new mode 100755
diff --git a/skin/styles/tw/TWLogo_klein.jpg b/skin/styles/tw/TWLogo_klein.jpg
old mode 100644
new mode 100755
diff --git a/skin/styles/tw/academy.jpg b/skin/styles/tw/academy.jpg
old mode 100644
new mode 100755
diff --git a/skin/styles/tw/cis_logo_text_400x78.png b/skin/styles/tw/cis_logo_text_400x78.png
old mode 100644
new mode 100755
diff --git a/skin/styles/tw/description.txt b/skin/styles/tw/description.txt
old mode 100644
new mode 100755
diff --git a/skin/styles/tw/header.png b/skin/styles/tw/header.png
old mode 100644
new mode 100755
diff --git a/skin/styles/tw/header_line.jpg b/skin/styles/tw/header_line.jpg
old mode 100644
new mode 100755
diff --git a/skin/styles/tw/lageplan.jpg b/skin/styles/tw/lageplan.jpg
old mode 100644
new mode 100755
diff --git a/skin/styles/tw/logo.jpg b/skin/styles/tw/logo.jpg
old mode 100644
new mode 100755
diff --git a/skin/styles/tw/logo.png b/skin/styles/tw/logo.png
old mode 100644
new mode 100755
diff --git a/skin/styles/tw/logo_200x400.png b/skin/styles/tw/logo_200x400.png
old mode 100644
new mode 100755
diff --git a/skin/styles/tw/logo_250x130.png b/skin/styles/tw/logo_250x130.png
old mode 100644
new mode 100755
diff --git a/skin/styles/tw/logo_50x25.png b/skin/styles/tw/logo_50x25.png
old mode 100644
new mode 100755
diff --git a/skin/styles/tw/logo_academy.png b/skin/styles/tw/logo_academy.png
old mode 100644
new mode 100755
diff --git a/skin/styles/tw/logo_klein.png b/skin/styles/tw/logo_klein.png
old mode 100644
new mode 100755
diff --git a/skin/styles/tw/logo_ws_50x25.png b/skin/styles/tw/logo_ws_50x25.png
old mode 100644
new mode 100755
diff --git a/skin/styles/tw/screenshot.jpg b/skin/styles/tw/screenshot.jpg
old mode 100644
new mode 100755
diff --git a/skin/styles/twgreen.css b/skin/styles/twgreen.css
old mode 100644
new mode 100755
diff --git a/skin/styles/twgreen/description.txt b/skin/styles/twgreen/description.txt
old mode 100644
new mode 100755
diff --git a/skin/styles/twgreen/menu.jpg b/skin/styles/twgreen/menu.jpg
old mode 100644
new mode 100755
diff --git a/skin/styles/twgreen/screenshot.jpg b/skin/styles/twgreen/screenshot.jpg
old mode 100644
new mode 100755
diff --git a/skin/styles/twgreen/tw_gr_header.jpg b/skin/styles/twgreen/tw_gr_header.jpg
old mode 100644
new mode 100755
diff --git a/skin/styles/twgreen/tw_gr_logo.jpg b/skin/styles/twgreen/tw_gr_logo.jpg
old mode 100644
new mode 100755
diff --git a/skin/tablesort.css b/skin/tablesort.css
old mode 100644
new mode 100755
diff --git a/skin/tempus.css b/skin/tempus.css
old mode 100644
new mode 100755
diff --git a/skin/vilesci.css b/skin/vilesci.css
old mode 100644
new mode 100755
diff --git a/skin/wawi.css b/skin/wawi.css
old mode 100644
new mode 100755
diff --git a/skin/widgets.css b/skin/widgets.css
old mode 100644
new mode 100755
diff --git a/soap/datenverbund_client.php b/soap/datenverbund_client.php
old mode 100644
new mode 100755
diff --git a/soap/fhcomplete.php b/soap/fhcomplete.php
old mode 100644
new mode 100755
diff --git a/soap/index.html b/soap/index.html
old mode 100644
new mode 100755
diff --git a/soap/kartenverlaengerung.soap.php b/soap/kartenverlaengerung.soap.php
old mode 100644
new mode 100755
diff --git a/soap/kartenverlaengerung.test.php b/soap/kartenverlaengerung.test.php
old mode 100644
new mode 100755
diff --git a/soap/kartenverlaengerung.wsdl.php b/soap/kartenverlaengerung.wsdl.php
old mode 100644
new mode 100755
diff --git a/soap/lehrveranstaltung.json.php b/soap/lehrveranstaltung.json.php
old mode 100644
new mode 100755
diff --git a/soap/lehrveranstaltung.soap.php b/soap/lehrveranstaltung.soap.php
old mode 100644
new mode 100755
diff --git a/soap/lehrveranstaltung.wsdl.php b/soap/lehrveranstaltung.wsdl.php
old mode 100644
new mode 100755
diff --git a/soap/lvplan.soap.php b/soap/lvplan.soap.php
old mode 100644
new mode 100755
diff --git a/soap/lvplan.wsdl.php b/soap/lvplan.wsdl.php
old mode 100644
new mode 100755
diff --git a/soap/mitarbeiter.soap.php b/soap/mitarbeiter.soap.php
old mode 100644
new mode 100755
diff --git a/soap/mitarbeiter.wsdl.php b/soap/mitarbeiter.wsdl.php
old mode 100644
new mode 100755
diff --git a/soap/notiz.soap.php b/soap/notiz.soap.php
old mode 100644
new mode 100755
diff --git a/soap/notiz.wsdl.php b/soap/notiz.wsdl.php
old mode 100644
new mode 100755
diff --git a/soap/ort.soap.php b/soap/ort.soap.php
old mode 100644
new mode 100755
diff --git a/soap/ort.wsdl.php b/soap/ort.wsdl.php
old mode 100644
new mode 100755
diff --git a/soap/person.soap.php b/soap/person.soap.php
old mode 100644
new mode 100755
diff --git a/soap/person.wsdl.php b/soap/person.wsdl.php
old mode 100644
new mode 100755
diff --git a/soap/projekt.soap.php b/soap/projekt.soap.php
old mode 100644
new mode 100755
diff --git a/soap/projekt.wsdl.php b/soap/projekt.wsdl.php
old mode 100644
new mode 100755
diff --git a/soap/projekt_jquery_client.php b/soap/projekt_jquery_client.php
old mode 100644
new mode 100755
diff --git a/soap/projektphase.soap.php b/soap/projektphase.soap.php
old mode 100644
new mode 100755
diff --git a/soap/projektphase.wsdl.php b/soap/projektphase.wsdl.php
old mode 100644
new mode 100755
diff --git a/soap/projekttask.soap.php b/soap/projekttask.soap.php
old mode 100644
new mode 100755
diff --git a/soap/projekttask.wsdl.php b/soap/projekttask.wsdl.php
old mode 100644
new mode 100755
diff --git a/soap/ressource.soap.php b/soap/ressource.soap.php
old mode 100644
new mode 100755
diff --git a/soap/ressource.wsdl.php b/soap/ressource.wsdl.php
old mode 100644
new mode 100755
diff --git a/soap/ressource_projekt.soap.php b/soap/ressource_projekt.soap.php
old mode 100644
new mode 100755
diff --git a/soap/ressource_projekt.wsdl.php b/soap/ressource_projekt.wsdl.php
old mode 100644
new mode 100755
diff --git a/soap/semesterticket.soap.php b/soap/semesterticket.soap.php
old mode 100644
new mode 100755
diff --git a/soap/semesterticket.wsdl.php b/soap/semesterticket.wsdl.php
old mode 100644
new mode 100755
diff --git a/soap/semesterticket_client.php b/soap/semesterticket_client.php
old mode 100644
new mode 100755
diff --git a/soap/soap_test_lv.php b/soap/soap_test_lv.php
old mode 100644
new mode 100755
diff --git a/soap/soap_test_lvplan.php b/soap/soap_test_lvplan.php
old mode 100644
new mode 100755
diff --git a/soap/soap_test_mitarbeiter.php b/soap/soap_test_mitarbeiter.php
old mode 100644
new mode 100755
diff --git a/soap/soap_test_ort.php b/soap/soap_test_ort.php
old mode 100644
new mode 100755
diff --git a/soap/soap_test_person.php b/soap/soap_test_person.php
old mode 100644
new mode 100755
diff --git a/soap/soap_test_student.php b/soap/soap_test_student.php
old mode 100644
new mode 100755
diff --git a/soap/stip.class.php b/soap/stip.class.php
old mode 100644
new mode 100755
diff --git a/soap/stip.soap.php b/soap/stip.soap.php
old mode 100644
new mode 100755
diff --git a/soap/stip.wsdl.php b/soap/stip.wsdl.php
old mode 100644
new mode 100755
diff --git a/soap/stip_client.php b/soap/stip_client.php
old mode 100644
new mode 100755
diff --git a/soap/stip_client_error.php b/soap/stip_client_error.php
old mode 100644
new mode 100755
diff --git a/soap/student.soap.php b/soap/student.soap.php
old mode 100644
new mode 100755
diff --git a/soap/student.wsdl.php b/soap/student.wsdl.php
old mode 100644
new mode 100755
diff --git a/soap/studienordnung.json.php b/soap/studienordnung.json.php
old mode 100644
new mode 100755
diff --git a/soap/studienplan.json.php b/soap/studienplan.json.php
old mode 100644
new mode 100755
diff --git a/soap/test.soap.php b/soap/test.soap.php
old mode 100644
new mode 100755
diff --git a/soap/test.wsdl.php b/soap/test.wsdl.php
old mode 100644
new mode 100755
diff --git a/soap/test_client.php b/soap/test_client.php
old mode 100644
new mode 100755
diff --git a/system/.htaccess_exmpl b/system/.htaccess_exmpl
old mode 100644
new mode 100755
diff --git a/system/FH-Complete.txp b/system/FH-Complete.txp
old mode 100644
new mode 100755
diff --git a/system/FHComplete-3.3.sql b/system/FHComplete-3.3.sql
old mode 100644
new mode 100755
diff --git a/system/FHCompleteTDM3PG83.xsl b/system/FHCompleteTDM3PG83.xsl
old mode 100644
new mode 100755
diff --git a/system/UnitTests/AppdatenTest.php b/system/UnitTests/AppdatenTest.php
old mode 100644
new mode 100755
diff --git a/system/UnitTests/FunctionsTest.php b/system/UnitTests/FunctionsTest.php
old mode 100644
new mode 100755
diff --git a/system/UnitTests/Studienordnung2Test.php b/system/UnitTests/Studienordnung2Test.php
old mode 100644
new mode 100755
diff --git a/system/UnitTests/StudienordnungTest.php b/system/UnitTests/StudienordnungTest.php
old mode 100644
new mode 100755
diff --git a/system/UnitTests/StudienplanTest.php b/system/UnitTests/StudienplanTest.php
old mode 100644
new mode 100755
diff --git a/system/UnitTests/StudienplatzTest.php b/system/UnitTests/StudienplatzTest.php
old mode 100644
new mode 100755
diff --git a/system/UnitTests/addons/studienplatzverwaltung/AqaClientTest.php b/system/UnitTests/addons/studienplatzverwaltung/AqaClientTest.php
old mode 100644
new mode 100755
diff --git a/system/UnitTests/addons/studienplatzverwaltung/AqaFoebisPersonTest.php b/system/UnitTests/addons/studienplatzverwaltung/AqaFoebisPersonTest.php
old mode 100644
new mode 100755
diff --git a/system/UnitTests/addons/studienplatzverwaltung/AqaFoebisStgTest.php b/system/UnitTests/addons/studienplatzverwaltung/AqaFoebisStgTest.php
old mode 100644
new mode 100755
diff --git a/system/UnitTests/addons/studienplatzverwaltung/FunctionsTest.php b/system/UnitTests/addons/studienplatzverwaltung/FunctionsTest.php
old mode 100644
new mode 100755
diff --git a/system/UnitTests/addons/studienplatzverwaltung/StudienplatzverwaltungAPITest.php b/system/UnitTests/addons/studienplatzverwaltung/StudienplatzverwaltungAPITest.php
old mode 100644
new mode 100755
diff --git a/system/UnitTests/addons/studienplatzverwaltung/testfile.xml b/system/UnitTests/addons/studienplatzverwaltung/testfile.xml
old mode 100644
new mode 100755
diff --git a/system/UnitTests/ut_studienordnung.php b/system/UnitTests/ut_studienordnung.php
old mode 100644
new mode 100755
diff --git a/system/ampel_erinnerungsmail.php b/system/ampel_erinnerungsmail.php
old mode 100644
new mode 100755
diff --git a/system/checkStudenten.php b/system/checkStudenten.php
old mode 100644
new mode 100755
diff --git a/system/check_neue_lektoren.php b/system/check_neue_lektoren.php
old mode 100644
new mode 100755
diff --git a/system/check_studentlehrverband.php b/system/check_studentlehrverband.php
old mode 100644
new mode 100755
diff --git a/system/checkroles.php b/system/checkroles.php
old mode 100644
new mode 100755
diff --git a/system/checksystem.php b/system/checksystem.php
old mode 100644
new mode 100755
diff --git a/system/dbupdate_3.0.php b/system/dbupdate_3.0.php
old mode 100644
new mode 100755
diff --git a/system/dbupdate_3.1.php b/system/dbupdate_3.1.php
old mode 100644
new mode 100755
diff --git a/system/dbupdate_3.2.php b/system/dbupdate_3.2.php
old mode 100644
new mode 100755
diff --git a/system/dbupdate_3.2/migrate_reihungstest.php b/system/dbupdate_3.2/migrate_reihungstest.php
old mode 100644
new mode 100755
diff --git a/system/dbupdate_3.3.php b/system/dbupdate_3.3.php
old mode 100644
new mode 100755
diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
old mode 100644
new mode 100755
diff --git a/system/dbupdate_3.4/10001_tempus_mitarbeiter_kurzbz_bei_reservierungen_anzeigen.php b/system/dbupdate_3.4/10001_tempus_mitarbeiter_kurzbz_bei_reservierungen_anzeigen.php
old mode 100644
new mode 100755
diff --git a/system/dbupdate_3.4/17512_fehlercode_constraints.php b/system/dbupdate_3.4/17512_fehlercode_constraints.php
old mode 100644
new mode 100755
diff --git a/system/dbupdate_3.4/19154_beurteilungsformulare_pruefungssenat.php b/system/dbupdate_3.4/19154_beurteilungsformulare_pruefungssenat.php
old mode 100644
new mode 100755
diff --git a/system/dbupdate_3.4/24682_reihungstest_zugangscode_fuer_login.php b/system/dbupdate_3.4/24682_reihungstest_zugangscode_fuer_login.php
old mode 100644
new mode 100755
diff --git a/system/dbupdate_3.4/24913_tabelle_raumtyp_neues_attribut_aktiv.php b/system/dbupdate_3.4/24913_tabelle_raumtyp_neues_attribut_aktiv.php
old mode 100644
new mode 100755
diff --git a/system/dbupdate_3.4/25003_notenimport_nachpruefung.php b/system/dbupdate_3.4/25003_notenimport_nachpruefung.php
old mode 100644
new mode 100755
diff --git a/system/dbupdate_3.4/25999_C4_ma0594.php b/system/dbupdate_3.4/25999_C4_ma0594.php
old mode 100644
new mode 100755
diff --git a/system/dbupdate_3.4/25999_cis4_cms.php b/system/dbupdate_3.4/25999_cis4_cms.php
old mode 100644
new mode 100755
diff --git a/system/dbupdate_3.4/26173_index_webservicelog.php b/system/dbupdate_3.4/26173_index_webservicelog.php
old mode 100644
new mode 100755
diff --git a/system/dbupdate_3.4/27107_vilesci_erfassung_abwesenheiten_reinigung.php b/system/dbupdate_3.4/27107_vilesci_erfassung_abwesenheiten_reinigung.php
old mode 100644
new mode 100755
diff --git a/system/dbupdate_3.4/27351_digitalisierung_formulare.php b/system/dbupdate_3.4/27351_digitalisierung_formulare.php
old mode 100644
new mode 100755
diff --git a/system/dbupdate_3.4/27388_anrechnungen_zeitfenster_pflegen.php b/system/dbupdate_3.4/27388_anrechnungen_zeitfenster_pflegen.php
old mode 100644
new mode 100755
diff --git a/system/dbupdate_3.4/27949_infocenter_zurueckstellen_mit_grund.php b/system/dbupdate_3.4/27949_infocenter_zurueckstellen_mit_grund.php
old mode 100644
new mode 100755
diff --git a/system/dbupdate_3.4/28089_plausichecks_in_extension_hinzufuegen.php b/system/dbupdate_3.4/28089_plausichecks_in_extension_hinzufuegen.php
old mode 100644
new mode 100755
diff --git a/system/dbupdate_3.4/29133_einzelne_studiengaenge_aus_issuechecks_ausnehmen.php b/system/dbupdate_3.4/29133_einzelne_studiengaenge_aus_issuechecks_ausnehmen.php
old mode 100644
new mode 100755
diff --git a/system/dbupdate_3.4/29529_infocenter_anpassungen.php b/system/dbupdate_3.4/29529_infocenter_anpassungen.php
old mode 100644
new mode 100755
diff --git a/system/dbupdate_3.4/29835_uhstat1_erfassung_der_uhstat1_daten_ueber_das_bewerbungstool.php b/system/dbupdate_3.4/29835_uhstat1_erfassung_der_uhstat1_daten_ueber_das_bewerbungstool.php
old mode 100644
new mode 100755
diff --git a/system/dbupdate_3.4/30181_tabelle_anrechnung_neue_attribute_fuer_begruendung.php b/system/dbupdate_3.4/30181_tabelle_anrechnung_neue_attribute_fuer_begruendung.php
old mode 100644
new mode 100755
diff --git a/system/dbupdate_3.4/30537_anmerkung_in_tbl_rolleberechtigung.php b/system/dbupdate_3.4/30537_anmerkung_in_tbl_rolleberechtigung.php
old mode 100644
new mode 100755
diff --git a/system/dbupdate_3.4/33714_erhoehter_studienbeitrag_fuer_drittsaatenangehoerig.php b/system/dbupdate_3.4/33714_erhoehter_studienbeitrag_fuer_drittsaatenangehoerig.php
old mode 100644
new mode 100755
diff --git a/system/dbupdate_3.4/dbupdate_dashboard.php b/system/dbupdate_3.4/dbupdate_dashboard.php
old mode 100644
new mode 100755
diff --git a/system/dbupdate_3.4/example.php b/system/dbupdate_3.4/example.php
old mode 100644
new mode 100755
diff --git a/system/environment.php b/system/environment.php
old mode 100644
new mode 100755
diff --git a/system/erinnerungsmail_coodle.php b/system/erinnerungsmail_coodle.php
old mode 100644
new mode 100755
diff --git a/system/erinnerungsmail_sek_lehrauftrag.php b/system/erinnerungsmail_sek_lehrauftrag.php
old mode 100644
new mode 100755
diff --git a/system/erinnerungsmail_sek_preinteressent.php b/system/erinnerungsmail_sek_preinteressent.php
old mode 100644
new mode 100755
diff --git a/system/fehlerupdate.php b/system/fehlerupdate.php
old mode 100644
new mode 100755
diff --git a/system/filtersupdate.php b/system/filtersupdate.php
old mode 100644
new mode 100755
diff --git a/system/generate_missing_sto.php b/system/generate_missing_sto.php
old mode 100644
new mode 100755
diff --git a/system/generatestudienordnung.php b/system/generatestudienordnung.php
old mode 100644
new mode 100755
diff --git a/system/konsistenzpruefung.php b/system/konsistenzpruefung.php
old mode 100644
new mode 100755
diff --git a/system/matrikelnummer_clearing_download.php b/system/matrikelnummer_clearing_download.php
old mode 100644
new mode 100755
diff --git a/system/matrikelnummer_clearing_import.php b/system/matrikelnummer_clearing_import.php
old mode 100644
new mode 100755
diff --git a/system/phpinfo.php b/system/phpinfo.php
old mode 100644
new mode 100755
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
old mode 100644
new mode 100755
diff --git a/system/prestudentstatus_studienplan_id.php b/system/prestudentstatus_studienplan_id.php
old mode 100644
new mode 100755
diff --git a/system/pruefung_bestaetigen.php b/system/pruefung_bestaetigen.php
old mode 100644
new mode 100755
diff --git a/system/services/systemd/phantomjs@.service b/system/services/systemd/phantomjs@.service
old mode 100644
new mode 100755
diff --git a/system/services/systemd/unoconv@.service b/system/services/systemd/unoconv@.service
old mode 100644
new mode 100755
diff --git a/system/services/upstart/unoconv.conf b/system/services/upstart/unoconv.conf
old mode 100644
new mode 100755
diff --git a/system/sync/sync_stpldev_stpl.php b/system/sync/sync_stpldev_stpl.php
old mode 100644
new mode 100755
diff --git a/system/system_check_sql.php b/system/system_check_sql.php
old mode 100644
new mode 100755
diff --git a/system/templates/contentmittitel.xsd b/system/templates/contentmittitel.xsd
old mode 100644
new mode 100755
diff --git a/system/templates/contentmittitel_filterwidget_xslt_xhtml.xslt b/system/templates/contentmittitel_filterwidget_xslt_xhtml.xslt
old mode 100644
new mode 100755
diff --git a/system/templates/contentmittitel_xslt_xhtml.xslt b/system/templates/contentmittitel_xslt_xhtml.xslt
old mode 100644
new mode 100755
diff --git a/system/templates/contentohnetitel.xsd b/system/templates/contentohnetitel.xsd
old mode 100644
new mode 100755
diff --git a/system/templates/contentohnetitel_xslt_xhtml.xslt b/system/templates/contentohnetitel_xslt_xhtml.xslt
old mode 100644
new mode 100755
diff --git a/system/templates/include.xsd b/system/templates/include.xsd
old mode 100644
new mode 100755
diff --git a/system/templates/include_xslt_xhtml.xslt b/system/templates/include_xslt_xhtml.xslt
old mode 100644
new mode 100755
diff --git a/system/templates/news.xsd b/system/templates/news.xsd
old mode 100644
new mode 100755
diff --git a/system/templates/news_infoscreen.xsd b/system/templates/news_infoscreen.xsd
old mode 100644
new mode 100755
diff --git a/system/templates/news_infoscreen_xslt_xhtml.xslt b/system/templates/news_infoscreen_xslt_xhtml.xslt
old mode 100644
new mode 100755
diff --git a/system/templates/news_xslt_xhtml.xslt b/system/templates/news_xslt_xhtml.xslt
old mode 100644
new mode 100755
diff --git a/system/templates/redirect.xsd b/system/templates/redirect.xsd
old mode 100644
new mode 100755
diff --git a/system/templates/redirect_xslt_xhtml.xslt b/system/templates/redirect_xslt_xhtml.xslt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/AccountInfo.odt b/system/vorlage_zip/AccountInfo.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/AntragAbmeldung.odt b/system/vorlage_zip/AntragAbmeldung.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/AntragAbmeldungStgl.odt b/system/vorlage_zip/AntragAbmeldungStgl.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/AntragUnterbrechung.odt b/system/vorlage_zip/AntragUnterbrechung.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/AnwListBarcode.odt b/system/vorlage_zip/AnwListBarcode.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/Anwesenheitslist.odt b/system/vorlage_zip/Anwesenheitslist.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/AusbVerEng.odt b/system/vorlage_zip/AusbVerEng.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/Ausbildungsver.odt b/system/vorlage_zip/Ausbildungsver.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/Bakkurkunde.odt b/system/vorlage_zip/Bakkurkunde.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/BakkurkundeEng.odt b/system/vorlage_zip/BakkurkundeEng.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/Bakkzeugnis.odt b/system/vorlage_zip/Bakkzeugnis.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/BakkzeugnisEng.odt b/system/vorlage_zip/BakkzeugnisEng.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/Bescheid.odt b/system/vorlage_zip/Bescheid.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/BescheidEng.odt b/system/vorlage_zip/BescheidEng.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/Bestellung.odt b/system/vorlage_zip/Bestellung.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/Bewerberakt.odt b/system/vorlage_zip/Bewerberakt.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/DiplSupplement.odt b/system/vorlage_zip/DiplSupplement.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/DiplSupplementDebug.odt b/system/vorlage_zip/DiplSupplementDebug.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/Diplomurkunde.odt b/system/vorlage_zip/Diplomurkunde.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/DiplomurkundeEng.odt b/system/vorlage_zip/DiplomurkundeEng.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/Diplomzeugnis.odt b/system/vorlage_zip/Diplomzeugnis.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/DiplomzeugnisEng.odt b/system/vorlage_zip/DiplomzeugnisEng.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/Erfolgsnachweis.odt b/system/vorlage_zip/Erfolgsnachweis.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/FHB_Ausbildungsver.odt b/system/vorlage_zip/FHB_Ausbildungsver.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/FHB_PrProtBA.odt b/system/vorlage_zip/FHB_PrProtBA.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/FHB_PrProtMA.odt b/system/vorlage_zip/FHB_PrProtMA.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/Inskription.odt b/system/vorlage_zip/Inskription.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/InskriptionEng.odt b/system/vorlage_zip/InskriptionEng.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/KTU_Studienblatt.odt b/system/vorlage_zip/KTU_Studienblatt.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/LVZeugnis.odt b/system/vorlage_zip/LVZeugnis.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/LVZeugnisEng.odt b/system/vorlage_zip/LVZeugnisEng.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/Lehrauftrag.odt b/system/vorlage_zip/Lehrauftrag.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/Lehrtaetigkeit.odt b/system/vorlage_zip/Lehrtaetigkeit.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/PrProtBA.odt b/system/vorlage_zip/PrProtBA.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/PrProtBAEng.odt b/system/vorlage_zip/PrProtBAEng.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/PrProtMA.odt b/system/vorlage_zip/PrProtMA.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/PrProtMAEng.odt b/system/vorlage_zip/PrProtMAEng.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/PrProtMAEng_alt.odt b/system/vorlage_zip/PrProtMAEng_alt.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/PrProtMA_alt.odt b/system/vorlage_zip/PrProtMA_alt.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/Projektbeschr.odt b/system/vorlage_zip/Projektbeschr.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/Studienblatt.odt b/system/vorlage_zip/Studienblatt.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/StudienblattEng.odt b/system/vorlage_zip/StudienblattEng.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/Studienerfolg.odt b/system/vorlage_zip/Studienerfolg.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/StudienerfolgEng.odt b/system/vorlage_zip/StudienerfolgEng.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/Studienordnung.odt b/system/vorlage_zip/Studienordnung.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/Uebernahme.odt b/system/vorlage_zip/Uebernahme.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/Zahlung.odt b/system/vorlage_zip/Zahlung.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/Zertifikat.odt b/system/vorlage_zip/Zertifikat.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/Zertifikat_ktu.odt b/system/vorlage_zip/Zertifikat_ktu.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/Zeugnis.odt b/system/vorlage_zip/Zeugnis.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/ZeugnisEng.odt b/system/vorlage_zip/ZeugnisEng.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/ZeugnisEngNeu.odt b/system/vorlage_zip/ZeugnisEngNeu.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/ZeugnisNeu.odt b/system/vorlage_zip/ZeugnisNeu.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/Zutrittskarte.odt b/system/vorlage_zip/Zutrittskarte.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/fotoliste.odt b/system/vorlage_zip/fotoliste.odt
old mode 100644
new mode 100755
diff --git a/system/vorlage_zip/statusbericht.ods b/system/vorlage_zip/statusbericht.ods
old mode 100644
new mode 100755
diff --git a/system/xsl/AntragAbmeldung.xsl b/system/xsl/AntragAbmeldung.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/AntragAbmeldungStgl.xsl b/system/xsl/AntragAbmeldungStgl.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/AntragUnterbrechung.xsl b/system/xsl/AntragUnterbrechung.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/AnwListBarcode.xsl b/system/xsl/AnwListBarcode.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/Anwesenheitsliste.xsl b/system/xsl/Anwesenheitsliste.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/AusbVerEngHead_0.xsl b/system/xsl/AusbVerEngHead_0.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/AusbVerEng_0.xsl b/system/xsl/AusbVerEng_0.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/AusbildStatus_0.xsl b/system/xsl/AusbildStatus_0.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/Ausbildungsver_0.xsl b/system/xsl/Ausbildungsver_0.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/Bewerberakt.xsl b/system/xsl/Bewerberakt.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/LehrveranstaltungszeugnisEng_0.xsl b/system/xsl/LehrveranstaltungszeugnisEng_0.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/Lehrveranstaltungszeugnis_0.xsl b/system/xsl/Lehrveranstaltungszeugnis_0.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/Lehrveranstaltungszeugnis_Eng_9005.xsl b/system/xsl/Lehrveranstaltungszeugnis_Eng_9005.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/PrProtBAEng_0.xsl b/system/xsl/PrProtBAEng_0.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/PrProtBA_0.xsl b/system/xsl/PrProtBA_0.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/PrProtMAEng_0.xsl b/system/xsl/PrProtMAEng_0.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/PrProtMA_0.xsl b/system/xsl/PrProtMA_0.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/Projektbeschr_0.xsl b/system/xsl/Projektbeschr_0.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/StudienblattEng_0.xsl b/system/xsl/StudienblattEng_0.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/Studienblatt_0.xsl b/system/xsl/Studienblatt_0.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/Studienordnung_0.xsl b/system/xsl/Studienordnung_0.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/Studienordnung_style_0.xml b/system/xsl/Studienordnung_style_0.xml
old mode 100644
new mode 100755
diff --git a/system/xsl/ZertifikatFreifaecher_0.xsl b/system/xsl/ZertifikatFreifaecher_0.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/ZeugnisEng_0.xsl b/system/xsl/ZeugnisEng_0.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/ZeugnisEng_Lehrgaenge.xsl b/system/xsl/ZeugnisEng_Lehrgaenge.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/Zeugnis_0.xsl b/system/xsl/Zeugnis_0.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/Zeugnis_Lehrgaenge.xsl b/system/xsl/Zeugnis_Lehrgaenge.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/Zeugnis_style_0.xsl b/system/xsl/Zeugnis_style_0.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/Zutrittskarte.xsl b/system/xsl/Zutrittskarte.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/accountinfoblatt_0.xsl b/system/xsl/accountinfoblatt_0.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/bachelorurkundeEng_0.xsl b/system/xsl/bachelorurkundeEng_0.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/bachelorurkunde_0.xsl b/system/xsl/bachelorurkunde_0.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/bakkzeugnisEng_0.xsl b/system/xsl/bakkzeugnisEng_0.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/bakkzeugnis_0.xsl b/system/xsl/bakkzeugnis_0.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/bescheid_0.xsl b/system/xsl/bescheid_0.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/bescheid_style_0.xsl b/system/xsl/bescheid_style_0.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/diplomaSuppDebug.xsl b/system/xsl/diplomaSuppDebug.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/diplomaSupp_0.xsl b/system/xsl/diplomaSupp_0.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/diplomaSupp_style_0.xsl b/system/xsl/diplomaSupp_style_0.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/diplomurkundeEng_0.xsl b/system/xsl/diplomurkundeEng_0.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/diplomurkunde_0.xsl b/system/xsl/diplomurkunde_0.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/diplomzeugnisEng_0.xsl b/system/xsl/diplomzeugnisEng_0.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/diplomzeugnis_0.xsl b/system/xsl/diplomzeugnis_0.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/fotoliste_0.xsl b/system/xsl/fotoliste_0.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/inskription_0.xsl b/system/xsl/inskription_0.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/inskription_eng_0.xsl b/system/xsl/inskription_eng_0.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/lehrauftrag_0.xsl b/system/xsl/lehrauftrag_0.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/lehrauftrag_style_0.xsl b/system/xsl/lehrauftrag_style_0.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/lehrtaetigkeit_0.xsl b/system/xsl/lehrtaetigkeit_0.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/prprotokollbakk_0.xsl b/system/xsl/prprotokollbakk_0.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/statusbericht.xsl b/system/xsl/statusbericht.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/studienerfolgEng_0.xsl b/system/xsl/studienerfolgEng_0.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/studienerfolgEng_Lehrgaenge.xsl b/system/xsl/studienerfolgEng_Lehrgaenge.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/studienerfolg_0.xsl b/system/xsl/studienerfolg_0.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/studienerfolg_Lehrgaenge.xsl b/system/xsl/studienerfolg_Lehrgaenge.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/uebernahmebestaetigung_0.xsl b/system/xsl/uebernahmebestaetigung_0.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/zahlung_0.xsl b/system/xsl/zahlung_0.xsl
old mode 100644
new mode 100755
diff --git a/system/xsl/zahlung_style_0.xsl b/system/xsl/zahlung_style_0.xsl
old mode 100644
new mode 100755
diff --git a/tests/codesniffer/FHComplete/Sniffs/Classes/FHCPropertyDeclarationSniff.php b/tests/codesniffer/FHComplete/Sniffs/Classes/FHCPropertyDeclarationSniff.php
old mode 100644
new mode 100755
diff --git a/tests/codesniffer/FHComplete/Sniffs/Classes/FHCValidClassNameSniff.php b/tests/codesniffer/FHComplete/Sniffs/Classes/FHCValidClassNameSniff.php
old mode 100644
new mode 100755
diff --git a/tests/codesniffer/FHComplete/Sniffs/ControlStructures/FHCControlSignatureSniff.php b/tests/codesniffer/FHComplete/Sniffs/ControlStructures/FHCControlSignatureSniff.php
old mode 100644
new mode 100755
diff --git a/tests/codesniffer/FHComplete/Sniffs/Methods/FHCMethodDeclarationSniff.php b/tests/codesniffer/FHComplete/Sniffs/Methods/FHCMethodDeclarationSniff.php
old mode 100644
new mode 100755
diff --git a/tests/codesniffer/FHComplete/ruleset.xml b/tests/codesniffer/FHComplete/ruleset.xml
old mode 100644
new mode 100755
diff --git a/tests/phpmd/rulesets-dev-only.xml b/tests/phpmd/rulesets-dev-only.xml
old mode 100644
new mode 100755
diff --git a/tests/phpmd/rulesets.xml b/tests/phpmd/rulesets.xml
old mode 100644
new mode 100755
diff --git a/version.php b/version.php
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/FASoProduktiv/FASonline.xpi b/vilesci/admin/XPI/FASoProduktiv/FASonline.xpi
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/FASoProduktiv/chrome/content/contents.rdf b/vilesci/admin/XPI/FASoProduktiv/chrome/content/contents.rdf
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/FASoProduktiv/chrome/content/fasonline.xul b/vilesci/admin/XPI/FASoProduktiv/chrome/content/fasonline.xul
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/FASoProduktiv/chrome/fasonline.jar b/vilesci/admin/XPI/FASoProduktiv/chrome/fasonline.jar
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/FASoProduktiv/install.js b/vilesci/admin/XPI/FASoProduktiv/install.js
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/FASoProduktiv/install.rdf b/vilesci/admin/XPI/FASoProduktiv/install.rdf
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/FASoProduktivSeamonkey2.0/FASonline.xpi b/vilesci/admin/XPI/FASoProduktivSeamonkey2.0/FASonline.xpi
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/FASoProduktivSeamonkey2.0/chrome.manifest b/vilesci/admin/XPI/FASoProduktivSeamonkey2.0/chrome.manifest
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/FASoProduktivSeamonkey2.0/chrome/content/contents.rdf b/vilesci/admin/XPI/FASoProduktivSeamonkey2.0/chrome/content/contents.rdf
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/FASoProduktivSeamonkey2.0/chrome/content/fasonline.xul b/vilesci/admin/XPI/FASoProduktivSeamonkey2.0/chrome/content/fasonline.xul
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/FASoProduktivSeamonkey2.0/chrome/fasonline.jar b/vilesci/admin/XPI/FASoProduktivSeamonkey2.0/chrome/fasonline.jar
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/FASoProduktivSeamonkey2.0/chrome/skin/fasonline.png b/vilesci/admin/XPI/FASoProduktivSeamonkey2.0/chrome/skin/fasonline.png
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/FASoProduktivSeamonkey2.0/install.rdf b/vilesci/admin/XPI/FASoProduktivSeamonkey2.0/install.rdf
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/FASoStPoelten/FASonline.xpi b/vilesci/admin/XPI/FASoStPoelten/FASonline.xpi
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/FASoStPoelten/chrome/content/contents.rdf b/vilesci/admin/XPI/FASoStPoelten/chrome/content/contents.rdf
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/FASoStPoelten/chrome/content/fasonline.xul b/vilesci/admin/XPI/FASoStPoelten/chrome/content/fasonline.xul
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/FASoStPoelten/chrome/fasonline.jar b/vilesci/admin/XPI/FASoStPoelten/chrome/fasonline.jar
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/FASoStPoelten/install.js b/vilesci/admin/XPI/FASoStPoelten/install.js
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/FASoStPoelten/install.rdf b/vilesci/admin/XPI/FASoStPoelten/install.rdf
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/FASoStPoeltenDEV/FASoStPoelten2.xpi b/vilesci/admin/XPI/FASoStPoeltenDEV/FASoStPoelten2.xpi
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/FASoStPoeltenDEV/chrome/content/contents.rdf b/vilesci/admin/XPI/FASoStPoeltenDEV/chrome/content/contents.rdf
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/FASoStPoeltenDEV/chrome/content/fasonline2.xul b/vilesci/admin/XPI/FASoStPoeltenDEV/chrome/content/fasonline2.xul
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/FASoStPoeltenDEV/chrome/fasonline2.jar b/vilesci/admin/XPI/FASoStPoeltenDEV/chrome/fasonline2.jar
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/FASoStPoeltenDEV/install.js b/vilesci/admin/XPI/FASoStPoeltenDEV/install.js
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/FASoStPoeltenDEV/install.rdf b/vilesci/admin/XPI/FASoStPoeltenDEV/install.rdf
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/FHCFas/FHCFas.xpi b/vilesci/admin/XPI/FHCFas/FHCFas.xpi
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/FHCFas/chrome/content/contents.rdf b/vilesci/admin/XPI/FHCFas/chrome/content/contents.rdf
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/FHCFas/chrome/content/fhcfas.xul b/vilesci/admin/XPI/FHCFas/chrome/content/fhcfas.xul
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/FHCFas/chrome/fhcfas.jar b/vilesci/admin/XPI/FHCFas/chrome/fhcfas.jar
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/FHCFas/install.js b/vilesci/admin/XPI/FHCFas/install.js
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/FHCFas/install.rdf b/vilesci/admin/XPI/FHCFas/install.rdf
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/FHCTempus/FHCTempus.xpi b/vilesci/admin/XPI/FHCTempus/FHCTempus.xpi
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/FHCTempus/chrome/content/contents.rdf b/vilesci/admin/XPI/FHCTempus/chrome/content/contents.rdf
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/FHCTempus/chrome/content/fhctempus.xul b/vilesci/admin/XPI/FHCTempus/chrome/content/fhctempus.xul
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/FHCTempus/chrome/fhctempus.jar b/vilesci/admin/XPI/FHCTempus/chrome/fhctempus.jar
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/FHCTempus/install.js b/vilesci/admin/XPI/FHCTempus/install.js
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/FHCTempus/install.rdf b/vilesci/admin/XPI/FHCTempus/install.rdf
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/PlannerProduktiv/Planner.xpi b/vilesci/admin/XPI/PlannerProduktiv/Planner.xpi
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/PlannerProduktiv/chrome/content/contents.rdf b/vilesci/admin/XPI/PlannerProduktiv/chrome/content/contents.rdf
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/PlannerProduktiv/chrome/content/planner.xul b/vilesci/admin/XPI/PlannerProduktiv/chrome/content/planner.xul
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/PlannerProduktiv/chrome/planner.jar b/vilesci/admin/XPI/PlannerProduktiv/chrome/planner.jar
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/PlannerProduktiv/install.js b/vilesci/admin/XPI/PlannerProduktiv/install.js
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/PlannerProduktiv/install.rdf b/vilesci/admin/XPI/PlannerProduktiv/install.rdf
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome.manifest b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome.manifest
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/appchoose.xul b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/appchoose.xul
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/contents.rdf b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/contents.rdf
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/fas.xul b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/fas.xul
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/fhcomplete.js b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/fhcomplete.js
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/fhcomplete.xul b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/fhcomplete.xul
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/options.xul b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/options.xul
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/planner.xul b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/planner.xul
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/statusbaroverlay.xul b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/statusbaroverlay.xul
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/tempus.xul b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/tempus.xul
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/fhcomplete.jar b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/fhcomplete.jar
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/fasonline.png b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/fasonline.png
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/fasonline15.png b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/fasonline15.png
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/fasonline32.png b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/fasonline32.png
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/fhcomplete.ico b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/fhcomplete.ico
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/fhcomplete.png b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/fhcomplete.png
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/planner.png b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/planner.png
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/planner15.png b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/planner15.png
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/planner32.png b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/planner32.png
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/settings.png b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/settings.png
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/tempus.png b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/tempus.png
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/tempus15.png b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/tempus15.png
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/tempus32.png b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/tempus32.png
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/defaults/preferences/defaults.js b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/defaults/preferences/defaults.js
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/fhcomplete.xpi b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/fhcomplete.xpi
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/install.rdf b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/install.rdf
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/make.sh b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/make.sh
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/TempusStPoelten/Tempus.xpi b/vilesci/admin/XPI/TempusStPoelten/Tempus.xpi
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/TempusStPoelten/chrome/content/contents.rdf b/vilesci/admin/XPI/TempusStPoelten/chrome/content/contents.rdf
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/TempusStPoelten/chrome/content/tempus.xul b/vilesci/admin/XPI/TempusStPoelten/chrome/content/tempus.xul
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/TempusStPoelten/chrome/tempus.jar b/vilesci/admin/XPI/TempusStPoelten/chrome/tempus.jar
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/TempusStPoelten/install.js b/vilesci/admin/XPI/TempusStPoelten/install.js
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/TempusStPoelten/install.rdf b/vilesci/admin/XPI/TempusStPoelten/install.rdf
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/TempusStPoeltenDEV/TempusStPoelten2.xpi b/vilesci/admin/XPI/TempusStPoeltenDEV/TempusStPoelten2.xpi
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/TempusStPoeltenDEV/chrome/content/contents.rdf b/vilesci/admin/XPI/TempusStPoeltenDEV/chrome/content/contents.rdf
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/TempusStPoeltenDEV/chrome/content/tempus2.xul b/vilesci/admin/XPI/TempusStPoeltenDEV/chrome/content/tempus2.xul
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/TempusStPoeltenDEV/chrome/tempus2.jar b/vilesci/admin/XPI/TempusStPoeltenDEV/chrome/tempus2.jar
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/TempusStPoeltenDEV/install.js b/vilesci/admin/XPI/TempusStPoeltenDEV/install.js
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/TempusStPoeltenDEV/install.rdf b/vilesci/admin/XPI/TempusStPoeltenDEV/install.rdf
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/TempusStPoeltenExtern/TempusStPoeltenExtern.xpi b/vilesci/admin/XPI/TempusStPoeltenExtern/TempusStPoeltenExtern.xpi
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/TempusStPoeltenExtern/TempusStPoeltenExtern81.xpi b/vilesci/admin/XPI/TempusStPoeltenExtern/TempusStPoeltenExtern81.xpi
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/TempusStPoeltenExtern/chrome/content/contents.rdf b/vilesci/admin/XPI/TempusStPoeltenExtern/chrome/content/contents.rdf
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/TempusStPoeltenExtern/chrome/content/tempusextern81.xul b/vilesci/admin/XPI/TempusStPoeltenExtern/chrome/content/tempusextern81.xul
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/TempusStPoeltenExtern/chrome/tempusextern.jar b/vilesci/admin/XPI/TempusStPoeltenExtern/chrome/tempusextern.jar
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/TempusStPoeltenExtern/chrome/tempusextern81.jar b/vilesci/admin/XPI/TempusStPoeltenExtern/chrome/tempusextern81.jar
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/TempusStPoeltenExtern/install.js b/vilesci/admin/XPI/TempusStPoeltenExtern/install.js
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/TempusStPoeltenExtern/install.rdf b/vilesci/admin/XPI/TempusStPoeltenExtern/install.rdf
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/TempusTWProduktiv/Tempusdev.xpi b/vilesci/admin/XPI/TempusTWProduktiv/Tempusdev.xpi
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/TempusTWProduktiv/chrome/content/contents.rdf b/vilesci/admin/XPI/TempusTWProduktiv/chrome/content/contents.rdf
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/TempusTWProduktiv/chrome/content/tempusdev.xul b/vilesci/admin/XPI/TempusTWProduktiv/chrome/content/tempusdev.xul
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/TempusTWProduktiv/chrome/tempusdev.jar b/vilesci/admin/XPI/TempusTWProduktiv/chrome/tempusdev.jar
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/TempusTWProduktiv/install.js b/vilesci/admin/XPI/TempusTWProduktiv/install.js
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/TempusTWProduktiv/install.rdf b/vilesci/admin/XPI/TempusTWProduktiv/install.rdf
old mode 100644
new mode 100755
diff --git a/vilesci/admin/XPI/orbit-1.8f5-MiK.xpi b/vilesci/admin/XPI/orbit-1.8f5-MiK.xpi
old mode 100644
new mode 100755
diff --git a/vilesci/bis/archiv.php b/vilesci/bis/archiv.php
old mode 100644
new mode 100755
diff --git a/vilesci/bis/bisdaten/.gitignore b/vilesci/bis/bisdaten/.gitignore
old mode 100644
new mode 100755
diff --git a/vilesci/bis/checkfunktion.php b/vilesci/bis/checkfunktion.php
old mode 100644
new mode 100755
diff --git a/vilesci/bis/checkverwendung.php b/vilesci/bis/checkverwendung.php
old mode 100644
new mode 100755
diff --git a/vilesci/bis/lehrgangsmeldung.php b/vilesci/bis/lehrgangsmeldung.php
old mode 100644
new mode 100755
diff --git a/vilesci/bis/personal_generateverwendung.php b/vilesci/bis/personal_generateverwendung.php
old mode 100644
new mode 100755
diff --git a/vilesci/bis/personal_lektorenohnelehrauftrag.php b/vilesci/bis/personal_lektorenohnelehrauftrag.php
old mode 100644
new mode 100755
diff --git a/vilesci/bis/personalimport.php b/vilesci/bis/personalimport.php
old mode 100644
new mode 100755
diff --git a/vilesci/bis/personalmeldung.php b/vilesci/bis/personalmeldung.php
old mode 100644
new mode 100755
diff --git a/vilesci/bis/personalmeldung_uebersicht.php b/vilesci/bis/personalmeldung_uebersicht.php
old mode 100644
new mode 100755
diff --git a/vilesci/bis/studentenmeldung.php b/vilesci/bis/studentenmeldung.php
old mode 100644
new mode 100755
diff --git a/vilesci/cronjobs/bpk.php b/vilesci/cronjobs/bpk.php
old mode 100644
new mode 100755
diff --git a/vilesci/cronjobs/cronjob.php b/vilesci/cronjobs/cronjob.php
old mode 100644
new mode 100755
diff --git a/vilesci/cronjobs/jobwatcher.php b/vilesci/cronjobs/jobwatcher.php
old mode 100644
new mode 100755
diff --git a/vilesci/cronjobs/lvplanwartung.php b/vilesci/cronjobs/lvplanwartung.php
old mode 100644
new mode 100755
diff --git a/vilesci/cronjobs/matrikelnummern.php b/vilesci/cronjobs/matrikelnummern.php
old mode 100644
new mode 100755
diff --git a/vilesci/cronjobs/testjob.php b/vilesci/cronjobs/testjob.php
old mode 100644
new mode 100755
diff --git a/vilesci/fhausweis/bildpruefung.php b/vilesci/fhausweis/bildpruefung.php
old mode 100644
new mode 100755
diff --git a/vilesci/fhausweis/bildzuschnitt.php b/vilesci/fhausweis/bildzuschnitt.php
old mode 100644
new mode 100755
diff --git a/vilesci/fhausweis/imageupload.php b/vilesci/fhausweis/imageupload.php
old mode 100644
new mode 100755
diff --git a/vilesci/fhausweis/kartenausgabe.php b/vilesci/fhausweis/kartenausgabe.php
old mode 100644
new mode 100755
diff --git a/vilesci/fhausweis/kartenkorrektur.php b/vilesci/fhausweis/kartenkorrektur.php
old mode 100644
new mode 100755
diff --git a/vilesci/fhausweis/kartenruecknahme.php b/vilesci/fhausweis/kartenruecknahme.php
old mode 100644
new mode 100755
diff --git a/vilesci/fhausweis/kartentausch.php b/vilesci/fhausweis/kartentausch.php
old mode 100644
new mode 100755
diff --git a/vilesci/fhausweis/kartenverwaltung.php b/vilesci/fhausweis/kartenverwaltung.php
old mode 100644
new mode 100755
diff --git a/vilesci/fhausweis/kartezuweisen.php b/vilesci/fhausweis/kartezuweisen.php
old mode 100644
new mode 100755
diff --git a/vilesci/fhausweis/search.php b/vilesci/fhausweis/search.php
old mode 100644
new mode 100755
diff --git a/vilesci/fhausweis/verlaengerung.php b/vilesci/fhausweis/verlaengerung.php
old mode 100644
new mode 100755
diff --git a/vilesci/index.php b/vilesci/index.php
old mode 100644
new mode 100755
diff --git a/vilesci/inventar/etiketten.php b/vilesci/inventar/etiketten.php
old mode 100644
new mode 100755
diff --git a/vilesci/inventar/inventar.php b/vilesci/inventar/inventar.php
old mode 100644
new mode 100755
diff --git a/vilesci/inventar/inventar_afa.php b/vilesci/inventar/inventar_afa.php
old mode 100644
new mode 100755
diff --git a/vilesci/inventar/inventar_autocomplete.php b/vilesci/inventar/inventar_autocomplete.php
old mode 100644
new mode 100755
diff --git a/vilesci/inventar/inventar_inventur.php b/vilesci/inventar/inventar_inventur.php
old mode 100644
new mode 100755
diff --git a/vilesci/inventar/inventar_pflege.php b/vilesci/inventar/inventar_pflege.php
old mode 100644
new mode 100755
diff --git a/vilesci/inventar/inventarliste.php b/vilesci/inventar/inventarliste.php
old mode 100644
new mode 100755
diff --git a/vilesci/inventar/konto_detail.php b/vilesci/inventar/konto_detail.php
old mode 100644
new mode 100755
diff --git a/vilesci/inventar/kostenstelle_detail.php b/vilesci/inventar/kostenstelle_detail.php
old mode 100644
new mode 100755
diff --git a/vilesci/inventar/studiengang_detail.php b/vilesci/inventar/studiengang_detail.php
old mode 100644
new mode 100755
diff --git a/vilesci/left.php b/vilesci/left.php
old mode 100644
new mode 100755
diff --git a/vilesci/lehre/abgabe_assistenz.php b/vilesci/lehre/abgabe_assistenz.php
old mode 100644
new mode 100755
diff --git a/vilesci/lehre/abgabe_assistenz_details.php b/vilesci/lehre/abgabe_assistenz_details.php
old mode 100644
new mode 100755
diff --git a/vilesci/lehre/abgabe_assistenz_frameset.php b/vilesci/lehre/abgabe_assistenz_frameset.php
old mode 100644
new mode 100755
diff --git a/vilesci/lehre/abgabe_assistenz_multitermin.php b/vilesci/lehre/abgabe_assistenz_multitermin.php
old mode 100644
new mode 100755
diff --git a/vilesci/lehre/abgabe_assistenz_zusatz.php b/vilesci/lehre/abgabe_assistenz_zusatz.php
old mode 100644
new mode 100755
diff --git a/vilesci/lehre/check/index.html b/vilesci/lehre/check/index.html
old mode 100644
new mode 100755
diff --git a/vilesci/lehre/check/res_check.php b/vilesci/lehre/check/res_check.php
old mode 100644
new mode 100755
diff --git a/vilesci/lehre/check/stdplan_check.php b/vilesci/lehre/check/stdplan_check.php
old mode 100644
new mode 100755
diff --git a/vilesci/lehre/check/ueberbuchung.php b/vilesci/lehre/check/ueberbuchung.php
old mode 100644
new mode 100755
diff --git a/vilesci/lehre/check/verplanungsuebersicht.php b/vilesci/lehre/check/verplanungsuebersicht.php
old mode 100644
new mode 100755
diff --git a/vilesci/lehre/einheit_autocomplete.php b/vilesci/lehre/einheit_autocomplete.php
old mode 100644
new mode 100755
diff --git a/vilesci/lehre/einheit_det.php b/vilesci/lehre/einheit_det.php
old mode 100644
new mode 100755
diff --git a/vilesci/lehre/einheit_menu.php b/vilesci/lehre/einheit_menu.php
old mode 100644
new mode 100755
diff --git a/vilesci/lehre/ferienverwaltung.php b/vilesci/lehre/ferienverwaltung.php
old mode 100644
new mode 100755
diff --git a/vilesci/lehre/freifach.php b/vilesci/lehre/freifach.php
old mode 100644
new mode 100755
diff --git a/vilesci/lehre/freifach_lektoren.php b/vilesci/lehre/freifach_lektoren.php
old mode 100644
new mode 100755
diff --git a/vilesci/lehre/freifach_studentenvorrueckung.php b/vilesci/lehre/freifach_studentenvorrueckung.php
old mode 100644
new mode 100755
diff --git a/vilesci/lehre/incoming_delete.php b/vilesci/lehre/incoming_delete.php
old mode 100644
new mode 100755
diff --git a/vilesci/lehre/index.html b/vilesci/lehre/index.html
old mode 100644
new mode 100755
diff --git a/vilesci/lehre/lehreinheiten_vorrueckung.php b/vilesci/lehre/lehreinheiten_vorrueckung.php
old mode 100644
new mode 100755
diff --git a/vilesci/lehre/lehrveranstaltung.php b/vilesci/lehre/lehrveranstaltung.php
old mode 100644
new mode 100755
diff --git a/vilesci/lehre/lehrveranstaltung_details.php b/vilesci/lehre/lehrveranstaltung_details.php
old mode 100644
new mode 100755
diff --git a/vilesci/lehre/lehrveranstaltung_frameset.html b/vilesci/lehre/lehrveranstaltung_frameset.html
old mode 100644
new mode 100755
diff --git a/vilesci/lehre/lehrveranstaltung_kompatibel.php b/vilesci/lehre/lehrveranstaltung_kompatibel.php
old mode 100644
new mode 100755
diff --git a/vilesci/lehre/lehrveranstaltung_lvangebot.php b/vilesci/lehre/lehrveranstaltung_lvangebot.php
old mode 100644
new mode 100755
diff --git a/vilesci/lehre/lv_merge.php b/vilesci/lehre/lv_merge.php
old mode 100644
new mode 100755
diff --git a/vilesci/lehre/lvangebot_autocomplete.php b/vilesci/lehre/lvangebot_autocomplete.php
old mode 100644
new mode 100755
diff --git a/vilesci/lehre/lvplan_custom_sync.php b/vilesci/lehre/lvplan_custom_sync.php
old mode 100644
new mode 100755
diff --git a/vilesci/lehre/lvplanwartung.php b/vilesci/lehre/lvplanwartung.php
old mode 100644
new mode 100755
diff --git a/vilesci/lehre/projektarbeitsbenotung.php b/vilesci/lehre/projektarbeitsbenotung.php
old mode 100644
new mode 100755
diff --git a/vilesci/lehre/raumauslastung.php b/vilesci/lehre/raumauslastung.php
old mode 100644
new mode 100755
diff --git a/vilesci/lehre/raummitteilung.php b/vilesci/lehre/raummitteilung.php
old mode 100644
new mode 100755
diff --git a/vilesci/lehre/reservierung_autocomplete.php b/vilesci/lehre/reservierung_autocomplete.php
old mode 100644
new mode 100755
diff --git a/vilesci/lehre/reservierung_insert.php b/vilesci/lehre/reservierung_insert.php
old mode 100644
new mode 100755
diff --git a/vilesci/lehre/saveStudienordnung.php b/vilesci/lehre/saveStudienordnung.php
old mode 100644
new mode 100755
diff --git a/vilesci/lehre/stpl_benutzer_kollision.php b/vilesci/lehre/stpl_benutzer_kollision.php
old mode 100644
new mode 100755
diff --git a/vilesci/lehre/stpl_benutzer_kollision_details.php b/vilesci/lehre/stpl_benutzer_kollision_details.php
old mode 100644
new mode 100755
diff --git a/vilesci/lehre/stpl_benutzer_kollision_frameset.html b/vilesci/lehre/stpl_benutzer_kollision_frameset.html
old mode 100644
new mode 100755
diff --git a/vilesci/lehre/studienordnung.inc.php b/vilesci/lehre/studienordnung.inc.php
old mode 100644
new mode 100755
diff --git a/vilesci/lehre/studienordnung.js b/vilesci/lehre/studienordnung.js
old mode 100644
new mode 100755
diff --git a/vilesci/lehre/studienordnung.php b/vilesci/lehre/studienordnung.php
old mode 100644
new mode 100755
diff --git a/vilesci/lehre/studienordnung_autocomplete.php b/vilesci/lehre/studienordnung_autocomplete.php
old mode 100644
new mode 100755
diff --git a/vilesci/lehre/studienordnung_lvregel.js b/vilesci/lehre/studienordnung_lvregel.js
old mode 100644
new mode 100755
diff --git a/vilesci/lehre/studienplan_gueltigkeit.php b/vilesci/lehre/studienplan_gueltigkeit.php
old mode 100644
new mode 100755
diff --git a/vilesci/lehre/studienplan_vorrueckung.php b/vilesci/lehre/studienplan_vorrueckung.php
old mode 100644
new mode 100755
diff --git a/vilesci/lehre/studienplan_zuteilung.php b/vilesci/lehre/studienplan_zuteilung.php
old mode 100644
new mode 100755
diff --git a/vilesci/lehre/zeitwuensche.php b/vilesci/lehre/zeitwuensche.php
old mode 100644
new mode 100755
diff --git a/vilesci/main.php b/vilesci/main.php
old mode 100644
new mode 100755
diff --git a/vilesci/personen/akteupdate.php b/vilesci/personen/akteupdate.php
old mode 100644
new mode 100755
diff --git a/vilesci/personen/aliquote_reduktion.json.php b/vilesci/personen/aliquote_reduktion.json.php
old mode 100644
new mode 100755
diff --git a/vilesci/personen/aliquote_reduktion.php b/vilesci/personen/aliquote_reduktion.php
old mode 100644
new mode 100755
diff --git a/vilesci/personen/anwesenheit.php b/vilesci/personen/anwesenheit.php
old mode 100644
new mode 100755
diff --git a/vilesci/personen/anwesenheitslisten_barcode.php b/vilesci/personen/anwesenheitslisten_barcode.php
old mode 100644
new mode 100755
diff --git a/vilesci/personen/aufbaukurscheckliste.php b/vilesci/personen/aufbaukurscheckliste.php
old mode 100644
new mode 100755
diff --git a/vilesci/personen/funktion.php b/vilesci/personen/funktion.php
old mode 100644
new mode 100755
diff --git a/vilesci/personen/funktion_det.php b/vilesci/personen/funktion_det.php
old mode 100644
new mode 100755
diff --git a/vilesci/personen/import/interessentenimport.php b/vilesci/personen/import/interessentenimport.php
old mode 100644
new mode 100755
diff --git a/vilesci/personen/import/mitarbeiterimport.php b/vilesci/personen/import/mitarbeiterimport.php
old mode 100644
new mode 100755
diff --git a/vilesci/personen/incoming_detail.php b/vilesci/personen/incoming_detail.php
old mode 100644
new mode 100755
diff --git a/vilesci/personen/incoming_frameset.php b/vilesci/personen/incoming_frameset.php
old mode 100644
new mode 100755
diff --git a/vilesci/personen/incoming_lehrveranstaltungen.php b/vilesci/personen/incoming_lehrveranstaltungen.php
old mode 100644
new mode 100755
diff --git a/vilesci/personen/incoming_uebersicht.php b/vilesci/personen/incoming_uebersicht.php
old mode 100644
new mode 100755
diff --git a/vilesci/personen/index.html b/vilesci/personen/index.html
old mode 100644
new mode 100755
diff --git a/vilesci/personen/institutsliste.php b/vilesci/personen/institutsliste.php
old mode 100644
new mode 100755
diff --git a/vilesci/personen/kontaktdaten_edit.php b/vilesci/personen/kontaktdaten_edit.php
old mode 100644
new mode 100755
diff --git a/vilesci/personen/lehrveranstaltungen_json.php b/vilesci/personen/lehrveranstaltungen_json.php
old mode 100644
new mode 100755
diff --git a/vilesci/personen/leistungsstipendium.php b/vilesci/personen/leistungsstipendium.php
old mode 100644
new mode 100755
diff --git a/vilesci/personen/lektor_uebersicht.php b/vilesci/personen/lektor_uebersicht.php
old mode 100644
new mode 100755
diff --git a/vilesci/personen/outgoing_detail.php b/vilesci/personen/outgoing_detail.php
old mode 100644
new mode 100755
diff --git a/vilesci/personen/outgoing_frameset.php b/vilesci/personen/outgoing_frameset.php
old mode 100644
new mode 100755
diff --git a/vilesci/personen/outgoing_uebersicht.php b/vilesci/personen/outgoing_uebersicht.php
old mode 100644
new mode 100755
diff --git a/vilesci/personen/personen_anlegen.php b/vilesci/personen/personen_anlegen.php
old mode 100644
new mode 100755
diff --git a/vilesci/personen/personen_details.php b/vilesci/personen/personen_details.php
old mode 100644
new mode 100755
diff --git a/vilesci/personen/personendetails.php b/vilesci/personen/personendetails.php
old mode 100644
new mode 100755
diff --git a/vilesci/personen/preinteressent_anlegen.php b/vilesci/personen/preinteressent_anlegen.php
old mode 100644
new mode 100755
diff --git a/vilesci/personen/preinteressent_detail.php b/vilesci/personen/preinteressent_detail.php
old mode 100644
new mode 100755
diff --git a/vilesci/personen/preinteressent_frameset.html b/vilesci/personen/preinteressent_frameset.html
old mode 100644
new mode 100755
diff --git a/vilesci/personen/preinteressent_uebernahme.php b/vilesci/personen/preinteressent_uebernahme.php
old mode 100644
new mode 100755
diff --git a/vilesci/personen/preinteressent_uebersicht.php b/vilesci/personen/preinteressent_uebersicht.php
old mode 100644
new mode 100755
diff --git a/vilesci/personen/student_edit.php b/vilesci/personen/student_edit.php
old mode 100644
new mode 100755
diff --git a/vilesci/personen/student_vorrueckung.php b/vilesci/personen/student_vorrueckung.php
old mode 100644
new mode 100755
diff --git a/vilesci/personen/suche.php b/vilesci/personen/suche.php
old mode 100644
new mode 100755
diff --git a/vilesci/personen/uniflow.csv.php b/vilesci/personen/uniflow.csv.php
old mode 100644
new mode 100755
diff --git a/vilesci/personen/urlaubsverwaltung.php b/vilesci/personen/urlaubsverwaltung.php
old mode 100644
new mode 100755
diff --git a/vilesci/personen/wiederholer.php b/vilesci/personen/wiederholer.php
old mode 100644
new mode 100755
diff --git a/vilesci/personen/zeitwunsch.php b/vilesci/personen/zeitwunsch.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/ampel_details.php b/vilesci/stammdaten/ampel_details.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/ampel_frameset.html b/vilesci/stammdaten/ampel_frameset.html
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/ampel_uebersicht.php b/vilesci/stammdaten/ampel_uebersicht.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/auswertung_fhtw.php b/vilesci/stammdaten/auswertung_fhtw.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/benutzerberechtigung_autocomplete.php b/vilesci/stammdaten/benutzerberechtigung_autocomplete.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/benutzerberechtigung_detailliste.php b/vilesci/stammdaten/benutzerberechtigung_detailliste.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/benutzerberechtigung_details.php b/vilesci/stammdaten/benutzerberechtigung_details.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/benutzerberechtigung_frameset.html b/vilesci/stammdaten/benutzerberechtigung_frameset.html
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/benutzerberechtigung_uebersicht.php b/vilesci/stammdaten/benutzerberechtigung_uebersicht.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/berechtigungen.php b/vilesci/stammdaten/berechtigungen.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/berechtigungrolle.php b/vilesci/stammdaten/berechtigungrolle.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/betriebsmittel_details.php b/vilesci/stammdaten/betriebsmittel_details.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/betriebsmittel_frameset.php b/vilesci/stammdaten/betriebsmittel_frameset.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/betriebsmittel_uebersicht.php b/vilesci/stammdaten/betriebsmittel_uebersicht.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/buchung_typ.php b/vilesci/stammdaten/buchung_typ.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/cronjobverwaltung.php b/vilesci/stammdaten/cronjobverwaltung.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/dokumentvorlagen_verwaltung.php b/vilesci/stammdaten/dokumentvorlagen_verwaltung.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/firma_details.php b/vilesci/stammdaten/firma_details.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/firma_detailwork.php b/vilesci/stammdaten/firma_detailwork.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/firma_frameset.html b/vilesci/stammdaten/firma_frameset.html
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/firma_uebersicht.php b/vilesci/stammdaten/firma_uebersicht.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/firma_zusammen_details.php b/vilesci/stammdaten/firma_zusammen_details.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/firma_zusammen_uebersicht.php b/vilesci/stammdaten/firma_zusammen_uebersicht.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/gsprogramm.php b/vilesci/stammdaten/gsprogramm.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/imexport/dabis.php b/vilesci/stammdaten/imexport/dabis.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/imexport/index.html b/vilesci/stammdaten/imexport/index.html
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/imexport/zutrittskarten/export.php b/vilesci/stammdaten/imexport/zutrittskarten/export.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/imexport/zutrittskarten/generatefromsipass.php b/vilesci/stammdaten/imexport/zutrittskarten/generatefromsipass.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/imexport/zutrittskarten/generatefromsipass_predelete.php b/vilesci/stammdaten/imexport/zutrittskarten/generatefromsipass_predelete.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/imexport/zutrittskarten/import.php b/vilesci/stammdaten/imexport/zutrittskarten/import.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/imexport/zutrittskarten/index.html b/vilesci/stammdaten/imexport/zutrittskarten/index.html
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/infoscreen_details.php b/vilesci/stammdaten/infoscreen_details.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/infoscreen_frameset.html b/vilesci/stammdaten/infoscreen_frameset.html
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/infoscreen_preview.php b/vilesci/stammdaten/infoscreen_preview.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/infoscreen_uebersicht.php b/vilesci/stammdaten/infoscreen_uebersicht.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/lvbgruppenverwaltung.js b/vilesci/stammdaten/lvbgruppenverwaltung.js
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/lvbgruppenverwaltung.php b/vilesci/stammdaten/lvbgruppenverwaltung.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/lvbgruppenverwaltungDetail.php b/vilesci/stammdaten/lvbgruppenverwaltungDetail.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/lvbgruppenverwaltungTree.php b/vilesci/stammdaten/lvbgruppenverwaltungTree.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/organisationseinheiten.php b/vilesci/stammdaten/organisationseinheiten.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/personen_wartung.php b/vilesci/stammdaten/personen_wartung.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/raum_details.php b/vilesci/stammdaten/raum_details.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/raum_frameset.html b/vilesci/stammdaten/raum_frameset.html
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/raum_uebersicht.php b/vilesci/stammdaten/raum_uebersicht.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/reihungstest_administration.php b/vilesci/stammdaten/reihungstest_administration.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/reihungstest_zusammenlegung.php b/vilesci/stammdaten/reihungstest_zusammenlegung.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/reihungstestverwaltung.php b/vilesci/stammdaten/reihungstestverwaltung.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/reihungstestverwaltung_autocomplete.php b/vilesci/stammdaten/reihungstestverwaltung_autocomplete.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/service_details.php b/vilesci/stammdaten/service_details.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/service_frameset.html b/vilesci/stammdaten/service_frameset.html
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/service_uebersicht.php b/vilesci/stammdaten/service_uebersicht.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/set_gemeinde.php b/vilesci/stammdaten/set_gemeinde.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/stammdaten_autocomplete.php b/vilesci/stammdaten/stammdaten_autocomplete.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/statistik_details.php b/vilesci/stammdaten/statistik_details.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/statistik_frameset.html b/vilesci/stammdaten/statistik_frameset.html
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/statistik_uebersicht.php b/vilesci/stammdaten/statistik_uebersicht.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/studiengang_details.js b/vilesci/stammdaten/studiengang_details.js
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/studiengang_details.php b/vilesci/stammdaten/studiengang_details.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/studiengang_dokumente.php b/vilesci/stammdaten/studiengang_dokumente.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/studiengang_edit.php b/vilesci/stammdaten/studiengang_edit.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/studiengang_frameset.html b/vilesci/stammdaten/studiengang_frameset.html
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/studiengang_uebersicht.php b/vilesci/stammdaten/studiengang_uebersicht.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/studiensemester.php b/vilesci/stammdaten/studiensemester.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/variablen_details.php b/vilesci/stammdaten/variablen_details.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/variablen_frameset.html b/vilesci/stammdaten/variablen_frameset.html
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/variablen_uebersicht.php b/vilesci/stammdaten/variablen_uebersicht.php
old mode 100644
new mode 100755
diff --git a/vilesci/stammdaten/vertrag_typ.php b/vilesci/stammdaten/vertrag_typ.php
old mode 100644
new mode 100755
diff --git a/vilesci/statistik/filter_details.php b/vilesci/statistik/filter_details.php
old mode 100644
new mode 100755
diff --git a/vilesci/statistik/filter_frameset.html b/vilesci/statistik/filter_frameset.html
old mode 100644
new mode 100755
diff --git a/vilesci/statistik/filter_overview.php b/vilesci/statistik/filter_overview.php
old mode 100644
new mode 100755
diff --git a/vilesci/statistik/filter_vorschau.php b/vilesci/statistik/filter_vorschau.php
old mode 100644
new mode 100755
diff --git a/vilesci/statistik/incoming.php b/vilesci/statistik/incoming.php
old mode 100644
new mode 100755
diff --git a/vilesci/statistik/oehwaehlerverzeichnis.php b/vilesci/statistik/oehwaehlerverzeichnis.php
old mode 100644
new mode 100755
diff --git a/vilesci/statistik/outgoing.php b/vilesci/statistik/outgoing.php
old mode 100644
new mode 100755
diff --git a/vilesci/statistik/statistik.php b/vilesci/statistik/statistik.php
old mode 100644
new mode 100755
diff --git a/vilesci/statistik/statistik_frameset.php b/vilesci/statistik/statistik_frameset.php
old mode 100644
new mode 100755
diff --git a/vilesci/statistik/statistik_sql.php b/vilesci/statistik/statistik_sql.php
old mode 100644
new mode 100755
diff --git a/vilesci/statistik/studenten_historie.php b/vilesci/statistik/studenten_historie.php
old mode 100644
new mode 100755
diff --git a/vilesci/statistik/studierendenliste_oeh.php b/vilesci/statistik/studierendenliste_oeh.php
old mode 100644
new mode 100755
diff --git a/vilesci/top.php b/vilesci/top.php
old mode 100644
new mode 100755
diff --git a/wawi/auswertungen/aufteilung.php b/wawi/auswertungen/aufteilung.php
old mode 100644
new mode 100755
diff --git a/wawi/auswertungen/konto.php b/wawi/auswertungen/konto.php
old mode 100644
new mode 100755
diff --git a/wawi/auswertungen/kostenstelle.php b/wawi/auswertungen/kostenstelle.php
old mode 100644
new mode 100755
diff --git a/wawi/auswertungen/wawi_tags.php b/wawi/auswertungen/wawi_tags.php
old mode 100644
new mode 100755
diff --git a/wawi/auth.php b/wawi/auth.php
old mode 100644
new mode 100755
diff --git a/wawi/berechtigung.php b/wawi/berechtigung.php
old mode 100644
new mode 100755
diff --git a/wawi/bestellung.php b/wawi/bestellung.php
old mode 100644
new mode 100755
diff --git a/wawi/budget.php b/wawi/budget.php
old mode 100644
new mode 100755
diff --git a/wawi/check_bestellung.php b/wawi/check_bestellung.php
old mode 100644
new mode 100755
diff --git a/wawi/firma.php b/wawi/firma.php
old mode 100644
new mode 100755
diff --git a/wawi/home.php b/wawi/home.php
old mode 100644
new mode 100755
diff --git a/wawi/index.php b/wawi/index.php
old mode 100644
new mode 100755
diff --git a/wawi/kontouebersicht.php b/wawi/kontouebersicht.php
old mode 100644
new mode 100755
diff --git a/wawi/kostenstellenuebersicht.php b/wawi/kostenstellenuebersicht.php
old mode 100644
new mode 100755
diff --git a/wawi/login.php b/wawi/login.php
old mode 100644
new mode 100755
diff --git a/wawi/logout.php b/wawi/logout.php
old mode 100644
new mode 100755
diff --git a/wawi/menu.php b/wawi/menu.php
old mode 100644
new mode 100755
diff --git a/wawi/mwst.html b/wawi/mwst.html
old mode 100644
new mode 100755
diff --git a/wawi/pdfExport.txt b/wawi/pdfExport.txt
old mode 100644
new mode 100755
diff --git a/wawi/rechnung.php b/wawi/rechnung.php
old mode 100644
new mode 100755
diff --git a/wawi/wawi_autocomplete.php b/wawi/wawi_autocomplete.php
old mode 100644
new mode 100755
diff --git a/webdav/Caldav_Backend.php b/webdav/Caldav_Backend.php
old mode 100644
new mode 100755
diff --git a/webdav/Principal.php b/webdav/Principal.php
old mode 100644
new mode 100755
diff --git a/webdav/auth.class.php b/webdav/auth.class.php
old mode 100644
new mode 100755
diff --git a/webdav/google.txt b/webdav/google.txt
old mode 100644
new mode 100755
diff --git a/webdav/lvplan.php b/webdav/lvplan.php
old mode 100644
new mode 100755

From 3362eb8e3141b4fdbb00df86c81cd7c76cddbbd0 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 30 Jan 2024 15:59:56 +0100
Subject: [PATCH 0364/1461] changing the text_input component to accept
 documents for the name or the title of a PersonUpdateRequest

---
 application/controllers/Cis/Profil.php        | 32 +++++--
 public/js/components/Cis/Profil/EditProfil.js | 41 +++++++-
 .../components/Cis/Profil/EditProfilSelect.js | 22 +++--
 .../Cis/Profil/MitarbeiterProfil.js           | 46 +++------
 .../ProfilComponents/FetchProfilUpdates.js    | 23 ++++-
 .../Cis/Profil/ProfilComponents/Status.js     | 10 +-
 .../ProfilComponents/TextInputDokument.js     | 93 +++++++++++++++++++
 .../Cis/ProfilUpdate/AcceptDenyUpdate.js      | 13 ++-
 8 files changed, 214 insertions(+), 66 deletions(-)
 create mode 100644 public/js/components/Cis/Profil/ProfilComponents/TextInputDokument.js

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index b442a49c7..ee5d781b3 100755
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -70,6 +70,15 @@ class Profil extends Auth_Controller
 
 
 	public function insertFile(){
+
+		//? Version des Dokuments
+		/*$this->DmsVersionModel->addSelect(["version"]);
+			$fileVersion = $this->DmsVersionModel->loadWhere(["name"=>$_FILES['files']['name'], "mimetype"=>$_FILES['files']['type']]);
+			$fileVersion = hasData($fileVersion) ? getData($fileVersion)[0]->version : 0;
+			if($fileVersion) $fileVersion++; */
+
+		$res=[];
+
 		$this->load->library('DmsLib');
 		$this->load->model('DmsVersion_model','DmsVersionModel');
 		$files = $_FILES['files'];
@@ -81,19 +90,22 @@ class Profil extends Auth_Controller
             $_FILES['files']['tmp_name'] = $files['tmp_name'][$i];
             $_FILES['files']['error'] = $files['error'][$i];
             $_FILES['files']['size'] = $files['size'][$i];
-			//! ID CHANGES EVERYTIME AND TMP_FILENAME IS A HASH THAT ALSO CHANGES EVERYTIME
-			$this->DmsVersionModel->addSelect(["version"]);
-			$fileVersion = $this->DmsVersionModel->loadWhere(["filename"=>$_FILES['files']['tmp_name']]);
-			$fileVersion = hasData($fileVersion) ? getData($fileVersion)[0]->version : 0;
-			if($fileVersion) $fileVersion++;
 			
-            $res=$this->dmslib->upload(["kategorie_kurzbz"=>"dokumente","version"=>$fileVersion] , 'files');
-			echo json_encode($res);
-			echo "\n\n";
+			$dms = [
+				"kategorie_kurzbz"=>"dokumente",
+				"version"=>0, 
+				"name"=>$_FILES['files']['name'],
+				"mimetype"=>$_FILES['files']['type'],
+				"beschreibung"=>$this->uid . " Profil Änderung",
+				"insertvon"=>$this->uid,
+				"insertamum"=>"NOW()",
+			];
+            $tmp_res=$this->dmslib->upload($dms , 'files');
+			$tmp_res = hasData($tmp_res)? getData($tmp_res) : null;
+			array_push($res,$tmp_res);
 		}
 
-		
-		
+		echo json_encode($res);
 	}
 
 
diff --git a/public/js/components/Cis/Profil/EditProfil.js b/public/js/components/Cis/Profil/EditProfil.js
index 47ffd19fd..fda28d537 100755
--- a/public/js/components/Cis/Profil/EditProfil.js
+++ b/public/js/components/Cis/Profil/EditProfil.js
@@ -38,10 +38,22 @@ export default {
   },
 
   methods: {
-    submitProfilChange(){
+    async submitProfilChange(){
+      //? when the update contains a file upload 
+      
         //TODO: check if the updated value is different from the original value before submitting the request
        if(this.topic && this.profilUpdate){
 
+        if(this.profilUpdate.files){
+          
+          const fileIDs = await this.uploadFiles(this.profilUpdate.files);
+          
+          if(fileIDs){
+            
+            this.profilUpdate.files=fileIDs;
+            console.log("here is the update",this.profilUpdate);
+          };
+        }
         //? inserts new row in public.tbl_cis_profil_update 
         //* calls the update api call if an update field is present in the data that was passed to the module
         Vue.$fhcapi.UserData[this.editData.update?'updateProfilRequest':'insertProfilRequest'](this.topic,this.profilUpdate).then((res)=>{
@@ -53,13 +65,31 @@ export default {
           }else{
             this.result= false;
             this.hide();
-            console.log(res.data);
             Alert.popup("Ein Fehler ist aufgetreten: "+ JSON.stringify(res.data.retval));
-          } 
-         
+          }
         });
+        
+        
     }
     },
+
+    //? uploads files to the dms table and returns an array with the ids of the created files
+     uploadFiles: async function(files){
+      let formData = new FormData();
+      for(let i = 0; i < files.length; i++){
+        
+        formData.append("files[]",files[i]);
+      }
+      
+      return await Vue.$fhcapi.UserData.insertFile(formData).then(res => {
+        /* returns file information as 
+        [{"name":"example.png", "dms_id":282531}] */
+        return res.data.map(file => { return {dms_id:file.dms_id, name:file.client_name}});
+      }).catch(err=>{
+        console.log(err);
+        return null;
+      })
+    }, 
   },
   computed: {
   },
@@ -100,7 +130,8 @@ export default {
     </template>
     <!-- optional footer -->
     <template   v-slot:footer>
-      <button class="btn btn-outline-danger " @click="hide">Abbrechen</button>    
+      
+    <button class="btn btn-outline-danger " @click="hide">Abbrechen</button>    
       <button v-if="profilUpdate"  @click="submitProfilChange" role="button" class="btn btn-primary">Senden</button>
     </template>
     <!-- end of optional footer --> 
diff --git a/public/js/components/Cis/Profil/EditProfilSelect.js b/public/js/components/Cis/Profil/EditProfilSelect.js
index c91ddd683..0d28d47f9 100755
--- a/public/js/components/Cis/Profil/EditProfilSelect.js
+++ b/public/js/components/Cis/Profil/EditProfilSelect.js
@@ -3,6 +3,7 @@ import EditKontakt from "./ProfilComponents/EditKontakt.js";
 import Adresse from "./ProfilComponents/Adresse.js";
 import EditAdresse from "./ProfilComponents/EditAdresse.js";
 import Status from "./ProfilComponents/Status.js";
+import TextInputDokument from "./ProfilComponents/TextInputDokument.js";
 
 export default {
     components: {
@@ -11,10 +12,11 @@ export default {
       Adresse,
       EditAdresse,
       Status,
+      TextInputDokument,
     },
     props: {
 
-      //! this should throw an error in the js console, have to check later
+      
       list:Object,
   
       //? Prop used to determine how many options the select should initially show
@@ -48,6 +50,7 @@ export default {
         data:null,
         breadcrumbItems:[],
         topic:null,
+        properties:null,
       }
     },
   
@@ -100,13 +103,16 @@ export default {
       profilUpdateEmit: function(event){
         
         //? passes the updated profil information to the parent component
+        
         this.$emit('update:profilUpdate',event);
       },
+
+      
       updateOptions: function(event, item){
-        
+        this.properties = item;
         this.data=item.data; 
-        this.view=item.view; 
-        
+        this.view=item.view;    
+        console.log("properties",this.properties);
         if(item.title){
           //? emits the selected topic to the parent component
           this.topic= item.title;
@@ -132,6 +138,8 @@ export default {
       
     },
     created() {
+      //? JSON parse and stringify are used to deep clone the objects 
+      this.properties = {...this.list};
       this.data = JSON.parse(JSON.stringify(this.list.data));
       this.view = JSON.parse(JSON.stringify(this.list.view));
       
@@ -142,6 +150,7 @@ export default {
    
     template: `
     <template v-if="!view">
+    
     <div  class="list-group">
     <template v-for="item in data">
       <div class="d-flex flex-row align-items-center">
@@ -176,8 +185,9 @@ export default {
     <!-- if it not a normal text input field then reder the custom edit input component -->
     <!-- custom component is required to emit an profilUpdate event to register the new entered value --> 
     <template v-else>
-      <!-- both v-bind="list" and :data="data" pass a data prop, in this case the last one is the one that gets taken -->
-      <component @profilUpdate="profilUpdateEmit"  :is="view" v-bind="list" :data="data"></component>
+    
+      <!-- receives two events, one for normal data update and one when a file has to be stored to the database -->
+      <component @profilUpdate="profilUpdateEmit"   :is="view" v-bind="properties" :data="data" ></component>
     </template>
    `,
   };
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 8b58970d5..4b99c8eed 100755
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -10,7 +10,7 @@ import QuickLinks from "./ProfilComponents/QuickLinks.js";
 import ProfilEmails from "./ProfilComponents/ProfilEmails.js"
 import RoleInformation from "./ProfilComponents/RoleInformation.js";
 import ProfilInformation from "./ProfilComponents/ProfilInformation.js";
-import Dms from "../../Form/Upload/Dms.js";
+
 
 export default {
   components: {
@@ -25,13 +25,10 @@ export default {
     ProfilEmails,
     RoleInformation,
     ProfilInformation,
-    Dms,
   },
   data() {
     return {
 
-      //? used for dms component
-      dmsData:[],
      
       
       funktionen_table_options: {
@@ -142,30 +139,8 @@ export default {
   
   methods: {
 
-    testUpdload: function(){
-      let formData = new FormData();
-      for(let i = 0; i < this.dmsData.length; i++){
-        
-        formData.append("files[]",this.dmsData[i]);
-      }
-      
-      Vue.$fhcapi.UserData.insertFile(formData).then(res => {
-        console.log(res);
-      }).catch(err=>{
-        console.log(err);
-      })
-    },
+   
 
-    //! delete later
-    stringifyFile(file) {
-			return JSON.stringify({
-				lastModified: file.lastModified,
-				lastModifiedDate: file.lastModifiedDate,
-				name: file.name,
-				size: file.size,
-				type: file.type
-			});
-		},
     
 
     fetchProfilUpdates: function(){
@@ -277,14 +252,17 @@ export default {
             
             vorname: {
               title:"vorname",
-              view:"text_input",
+              view:"TextInputDokument",
+              withFiles:true,
               data:{
                 titel:"vorname",
                 value:this.data.vorname,
+                
               }},
               nachname: {
                 title:"nachname",
-                view:"text_input",
+                view:"TextInputDokument",
+                withFiles:true,
                 data:{
                   titel:"nachname",
                   value:this.data.nachname,
@@ -292,7 +270,8 @@ export default {
               },
               titel:{
                 title:"titel",
-                view:"text_input",
+                view:"TextInputDokument",
+                withFiles:true,
                 data:{
                   titel:"titel",
                   value:this.data.titel,
@@ -300,7 +279,8 @@ export default {
               },
               postnomen:{
                 title:"postnomen",
-                view:"text_input",
+                view:"TextInputDokument",
+                withFiles:true,
                 data:{
                   titel:"postnomen",
                   value:this.data.postnomen,
@@ -346,9 +326,7 @@ export default {
   template: ` 
 
   <div class="container-fluid text-break fhc-form"  >
-<pre>{{JSON.stringify(Array.from(dmsData).map(item=>{return stringifyFile(item);}),null,2)}}</pre>
-<button @click="testUpdload">upload</button>
-  <dms ref="upload" id="files" :noList="false" :multiple="true" v-model="dmsData" ></dms>
+
     
           <div class="row">
           
diff --git a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
index 4a145e268..ecc997c48 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
@@ -36,7 +36,7 @@ export default {
                 case "Add Kontakte" : return status ==='pending'? "EditKontakt": "Status"; break;
                 case "Delete Adressen" :  return status ==='pending'? "Adresse": "Status" ; break;
                 case "Delete Kontakte" : return status ==='pending'? "Kontakt": "Status"; break;
-                default: return status ==='pending'? "text_input": "Status"; break;
+                default: return status ==='pending'? "TextInputDokument": "Status"; break;
             }
         },
         openModal(updateRequest) {
@@ -45,27 +45,40 @@ export default {
             let data = null;
             let content =null;
 
-            if(view === "text_input"){
-                
+           
+            if(view === "TextInputDokument"){
+                // this should be the files : updateRequest.requested_change.files
                 data = {
                     titel:updateRequest.topic,
-                    value: updateRequest.requested_change,
+                    value: updateRequest.requested_change.value,
+                    
                 };
+
+                
+                
             }
             else{
                 data = updateRequest.requested_change;
             }
                 
-           
+            const exampleFile = updateRequest.requested_change.files.map(file=>{return new File(["files[]"], file.name);})
+            const exampleFileList = new DataTransfer();
+            exampleFile.forEach(file => {
+                exampleFileList.items.add(file);
+            })
+            
 
             content={
                 view:view,
                 data:data,
+                withFiles:view==="TextInputDokument" ? true:false,
                 update:true,
                 topic:updateRequest.topic,
+                files: view==="TextInputDokument" ? exampleFileList.files:null,
                 
             }
 
+
             //? adds the status information if the profil update request was rejected or accepted
             if(updateRequest.status !== 'pending'){
                 content['status']= updateRequest.status;
diff --git a/public/js/components/Cis/Profil/ProfilComponents/Status.js b/public/js/components/Cis/Profil/ProfilComponents/Status.js
index 0092f984e..d9277145f 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/Status.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/Status.js
@@ -71,10 +71,16 @@ export default {
     {{cardHeader}} 
     </div>
     <div class="card-body">
-    <div v-if="getComponentView === 'text_input'"  class="form-underline mb-2">
+    <template v-if="getComponentView === 'text_input'">
+    <div   class="form-underline mb-2">
     <div class="form-underline-titel">{{topic}}</div>
-    <span  class="form-underline-content">{{data}} </span>
+    <span  class="form-underline-content">{{data.value}} </span>
     </div>
+    <div class="ms-2">
+    <p>files:</p>
+    <p v-for="file in data.files">{{file}}</p>
+    </div>
+    </template>
     <component v-else :is="getComponentView" :data="data"></component>
     
     </div>
diff --git a/public/js/components/Cis/Profil/ProfilComponents/TextInputDokument.js b/public/js/components/Cis/Profil/ProfilComponents/TextInputDokument.js
new file mode 100644
index 000000000..4312d9747
--- /dev/null
+++ b/public/js/components/Cis/Profil/ProfilComponents/TextInputDokument.js
@@ -0,0 +1,93 @@
+import Dms from "../../../Form/Upload/Dms.js";
+
+
+export default {
+    data(){
+        return {
+            dmsData:[],
+            originalValue:null,
+            originalFiles:null,
+        }
+    },
+    components:{
+        Dms,
+    },
+    props:{
+       
+        data:{
+            type:Object,
+        },
+        withFiles:{
+            type:Boolean,
+            default:false,
+        },
+        files:{
+            type:FileList,
+        },
+        update:{
+            type:Boolean,
+        }
+    },
+    computed: {
+        isChanged: function(){
+            if(this.update ){
+                if(this.originalFiles !== this.dmsData || this.originalValue !== JSON.stringify(this.data)){
+                    return true;
+                }else{
+                    return false;
+                }
+            }else{
+                //? controls whether the user is allowed to send the profil update or not
+                if(this.withFiles && !this.dmsData.length) {return false;}     
+                return JSON.stringify(this.data) !== Vue.toRaw(this.originalValue);
+            }
+            
+        }
+
+    },
+    emits:["profilUpdate"],
+    watch: {
+        //? watcher to trigger the event emit when a file was uploaded or removed
+        dmsData(value) {
+          this.emitChanges();
+          console.log("dmsData",this.dmsData);
+          console.log("original files",Vue.toRaw(this.originalFiles));
+          console.log("compare",this.dmsData == Vue.toRaw(this.originalFiles));
+        }
+      },
+    methods:{
+
+        emitChanges: function(){
+            if(this.isChanged){
+                
+                this.$emit('profilUpdate', this.withFiles?{value:this.data.value, files:this.dmsData}:{value:this.data.value});
+            }else{
+                
+                this.$emit('profilUpdate',null);
+            }  
+        },
+        
+    },
+    created(){
+        
+        this.originalValue = JSON.stringify(this.data);
+        this.originalFiles = this.files;
+
+        if(this.files){
+            this.dmsData = this.files;
+        }
+        
+    },
+    template:`
+   
+    <div class="form-underline">
+    <div class="form-underline-titel">{{data.titel?data.titel:"titel"}}</div>
+
+    <input  class="form-control" @input="emitChanges"  v-model="data.value" :placeholder="data.value">
+  
+    
+    <dms v-if="withFiles" id="files" :noList="false" :multiple="true" v-model="dmsData"  ></dms>
+
+    </div>
+    `,
+}
\ No newline at end of file
diff --git a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
index f7cd05e31..e3b86d548 100755
--- a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
+++ b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
@@ -98,7 +98,7 @@ export default {
     },
   },
   created() {
-    console.log("data passed as prop",this.data);
+   
 
   },
   mounted() {
@@ -181,12 +181,17 @@ export default {
     <div class="card">
     <div class="card-header">update</div>
     <div class="card-body">
-    
-    <div v-if="getComponentView==='text_input'" class="form-underline mb-2">
+    <template v-if="getComponentView==='text_input'">
+    <div  class="form-underline mb-2">
       <div class="form-underline-titel">{{data.topic}}</div>
 
-      <span  class="form-underline-content" >{{data.requested_change}}</span>
+      <span  class="form-underline-content" >{{data.requested_change.value}}</span>
     </div>
+    <div class="ms-2">
+    <p>files:</p>
+    <p v-for="file in data.requested_change.files">{{file}}</p>
+    </div>
+    </template>
 
 
     <component v-else :is="getComponentView" :data="data.requested_change"></component>

From df1fe01abea69de85a3555134a9783144f788926 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 31 Jan 2024 09:05:23 +0100
Subject: [PATCH 0365/1461] makes watcher eager and aligns files vertically

---
 public/js/components/Form/Upload/Dms.js | 38 ++++++++++++++-----------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/public/js/components/Form/Upload/Dms.js b/public/js/components/Form/Upload/Dms.js
index 6d55cfb09..fd6af9858 100755
--- a/public/js/components/Form/Upload/Dms.js
+++ b/public/js/components/Form/Upload/Dms.js
@@ -55,30 +55,34 @@ export default {
 		}
 	},
 	watch: {
-		modelValue(n) {
-			if (n instanceof FileList)
-				return this.$refs.upload.files = n;
-
-			const dt = new DataTransfer();
-			const dms = [];
-			for (var file of n) {
-				if (file instanceof File) {
-					dt.items.add(file);
-				} else {
-					const dmsFile = new File([JSON.stringify(file)], file.name, {
-						type: 'application/x.fhc-dms+json'
-					});
-					dt.items.add(dmsFile);
+		modelValue:{
+			handler(n) {
+				if (n instanceof FileList)
+					return this.$refs.upload.files = n;
+	
+				const dt = new DataTransfer();
+				const dms = [];
+				for (var file of n) {
+					if (file instanceof File) {
+						dt.items.add(file);
+					} else {
+						const dmsFile = new File([JSON.stringify(file)], file.name, {
+							type: 'application/x.fhc-dms+json'
+						});
+						dt.items.add(dmsFile);
+					}
 				}
-			}
-			this.$emit('update:modelValue', dt.files);
+				this.$emit('update:modelValue', dt.files);
+			},
+			immediate:true
 		}
 	},
 	template: `
 	<div class="form-upload-dms">
+	
 		<input ref="upload" class="form-control" :class="inputClass" :id="id" :name="name" :multiple="multiple" type="file" @change="addFiles">
 		<ul v-if="modelValue.length && multiple && !noList" class="list-unstyled m-0">
-			<li v-for="(file, index) in modelValue" :key="index" class="d-flex mx-1 mt-1">
+			<li v-for="(file, index) in modelValue" :key="index" class="d-flex mx-1 mt-1 align-items-center">
 				<span class="col-auto"><i class="fa fa-file me-1"></i></span>
 				<span class="col">{{ file.name }}</span>
 				<button class="col-auto btn btn-outline-secondary btn-p-0" @click="removeFile(index)">

From 6f081e41368da23bb75783180aef09eb226dffca Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 31 Jan 2024 09:15:48 +0100
Subject: [PATCH 0366/1461] removes logs

---
 public/js/components/Form/Upload/Dms.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/public/js/components/Form/Upload/Dms.js b/public/js/components/Form/Upload/Dms.js
index fd6af9858..6a31ca545 100755
--- a/public/js/components/Form/Upload/Dms.js
+++ b/public/js/components/Form/Upload/Dms.js
@@ -33,14 +33,11 @@ export default {
 				dt.items.add(file);
 				doubles.push(this.stringifyFile(file));
 			}
-			console.log("files",event.target.files);
 			for (var file of event.target.files) {
 				// NOTE(chris): deep check (with FileReader) would require an async function so we only check the basic attributes
 				if (doubles.indexOf(this.stringifyFile(file)) < 0)
 					dt.items.add(file);
 			}
-			console.log(Array.isArray(dt.files));
-			console.log(typeof(dt.files));
 			this.$emit('update:modelValue', dt.files);
 		},
 		removeFile(id) {

From 0e69e432da5e0c223de96900b92d99a35f7a8a85 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 31 Jan 2024 14:26:54 +0100
Subject: [PATCH 0367/1461] fixes a lot of bugs and adds the
 inseramum/insertvon/updateamum/updatevon fields to the cis_profil_update db
 table

---
 application/controllers/Cis/Profil.php        | 46 +++++++++----------
 .../models/person/Profil_change_model.php     | 30 +++++++++---
 public/js/apps/Cis/ProfilUpdateRequests.js    | 38 ++-------------
 public/js/apps/api/userdata.js                | 11 ++++-
 public/js/components/Cis/Profil/EditProfil.js | 36 +++++++++++----
 .../ProfilComponents/FetchProfilUpdates.js    | 30 ++++++------
 .../Cis/Profil/ProfilComponents/Status.js     |  2 +-
 .../ProfilComponents/TextInputDokument.js     | 38 +++++++--------
 .../Cis/ProfilUpdate/AcceptDenyUpdate.js      |  2 +-
 public/js/components/Form/Upload/Dms.js       |  7 +--
 system/dbupdate_3.4.php                       |  2 +-
 system/dbupdate_3.4/25999_C4_ma0594.php       |  5 +-
 12 files changed, 128 insertions(+), 119 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index ee5d781b3..76d225374 100755
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -25,7 +25,8 @@ class Profil extends Auth_Controller
 			'deleteProfilRequest' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'selectProfilRequest' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'insertFile' => ['student/anrechnung_beantragen:r', 'user:r'],
-
+			'getProfilRequestFiles' => ['student/anrechnung_beantragen:r', 'user:r'],
+			
 		]);
 		$this->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
 		$this->load->model('crm/Student_model', 'StudentModel');
@@ -130,6 +131,10 @@ class Profil extends Auth_Controller
 	}
 
 
+	public function getProfilRequestFiles(){
+		$id = json_decode($this->input->raw_input_stream);
+		echo json_encode($this->ProfilChangeModel->getFilesFromChangeRequest($id));
+	}
 
 	public function insertProfilRequest()
 	{
@@ -137,7 +142,7 @@ class Profil extends Auth_Controller
 		$json = json_decode($this->input->raw_input_stream);
 		$payload = $json->payload;
 	
-		$identifier = property_exists($json->payload,"kontakt_id")? "kontakt_id" : "adresse_id";
+		$identifier = property_exists($json->payload,"kontakt_id")? "kontakt_id" : (property_exists($json->payload,"adresse_id")? "adresse_id" : null);
 		
 		$name = $this->PersonModel->getFullName($this->uid);
 		if(isError($name)){
@@ -145,7 +150,7 @@ class Profil extends Auth_Controller
 			var_dump($name);
 			return;
 		}
-		$data = ["topic"=>$json->topic,"uid" => $this->uid, "name"=>getData($name), "requested_change" => json_encode($payload), "change_timestamp" => "NOW()","status"=>"pending" ];
+		$data = ["topic"=>$json->topic,"uid" => $this->uid, "name"=>getData($name), "requested_change" => json_encode($payload), "insertamum" => "NOW()", "insertvon"=>$this->uid,"status"=>"pending" ];
 
 		//? loops over all updateRequests from a user to validate if the new request is valid
 		$res = $this->ProfilChangeModel->loadWhere(["uid"=>$this->uid]);
@@ -165,22 +170,23 @@ class Profil extends Auth_Controller
 				return;
 			}
 
-			elseif(!isset($payload->add) && !isset($payload->delete) && $update_request->topic == $json->topic ){
-				//? if it is not a delete or add request than the topic in combination with the uid of the user have to be unique
+			elseif(!$identifier && $update_request->topic == $json->topic ){
+				//? if it is not a delete or add request than the topic has to be unique
 				echo json_encode(error("A request to change " . $json->topic . " is already open"));
 				return;
 			}
 		}}
 		
-			$insert_res = $this->ProfilChangeModel->insert($data);
+			$insertID = $this->ProfilChangeModel->insert($data);
 				
-			if(isError($insert_res)){
+			if(isError($insertID)){
 				//catch error
 			}else{
-				$editTimestamp = $this->ProfilChangeModel->getTimestamp($insert_res->retval);
+				$insertID = hasData($insertID)? getData($insertID): null;
+				$editTimestamp = $this->ProfilChangeModel->getTimestamp($insertID);
 				
-				$insert_res->retval = date_create($editTimestamp)->format('d.m.Y');
-				echo json_encode($insert_res);
+				$date = success(date_create($editTimestamp)->format('d.m.Y'));
+				echo json_encode($date);
 			}
 	}
 
@@ -189,24 +195,16 @@ class Profil extends Auth_Controller
 
 		$json = json_decode($this->input->raw_input_stream);
 		
-
-		$data = ["topic"=>$json->topic,"uid" => $this->uid, "requested_change" => json_encode($json->payload), "change_timestamp" => "NOW()","status"=>"pending" ];
-
-		//? gets all the requested changes from a user
 		
-		if(isSuccess($this->ProfilChangeModel->addSelect(["profil_update_id"])) ){
-			$requestID = $this->ProfilChangeModel->loadWhere(["uid"=>$this->uid,"topic"=>$json->topic]);
-			$requestID = hasData($requestID) ? getData($requestID)[0]->profil_update_id : null;
-		};
-		
-		$update_res =$this->ProfilChangeModel->update([$requestID],$data);
-		if(isError($update_res)){
+		$updateID =$this->ProfilChangeModel->update([$json->ID],["requested_change" => json_encode($json->payload), "updateamum" => "NOW()", "updatevon" => $this->uid]);
+		if(isError($updateID)){
 			//catch error
 		}else{
-			$editTimestamp = $this->ProfilChangeModel->getTimestamp($update_res->retval[0]);
+			$updateID = hasData($updateID)? getData($updateID)[0]: null;
+			$editTimestamp = $this->ProfilChangeModel->getTimestamp($updateID,true);
 			
-			$update_res->retval = date_create($editTimestamp)->format('d.m.Y'); 
-			echo json_encode($update_res);
+			$date = success(date_create($editTimestamp)->format('d.m.Y')); 
+			echo json_encode($date);
 		}
 	}
 
diff --git a/application/models/person/Profil_change_model.php b/application/models/person/Profil_change_model.php
index 9a229f308..ea272493c 100755
--- a/application/models/person/Profil_change_model.php
+++ b/application/models/person/Profil_change_model.php
@@ -17,11 +17,30 @@ class Profil_change_model extends DB_Model
 	/**
 	 * getTimestamp
 	 * returns insert or update timestamp of a certain profil update
+	 * 
+	 * @param boolean $update: conditional whether to return insertamum or updateamum
 	 */
-	public function getTimestamp($uid){
-		$this->addSelect(['change_timestamp']);
-		$res = $this->load([$uid]);
-		return hasData($res) ? getData($res)[0]->change_timestamp : null;
+	public function getTimestamp($id, $update=false){
+		$selectStatement = $update? 'updateamum' : 'insertamum';
+		$this->addSelect([$selectStatement]);
+		$res = $this->load([$id]);
+		return hasData($res) ? getData($res)[0]->$selectStatement : null;
+	}
+
+	/**
+	 * getFilesFromChangeRequest
+	 * 
+	 * returns all files associated to a profil update request in the following format:
+	 * {dms_id:123 , name:"test"}
+	 * 
+	 * @param boolean $profil_update_id primary key of the profil update request
+	 * @return Array 
+	 */
+	public function getFilesFromChangeRequest($profil_update_id){
+		$this->addSelect(["requested_change"]);
+		$res = $this->load([$profil_update_id]);
+		$res = hasData($res) ? getData($res)[0] : null;
+		return json_decode($res->requested_change)->files?:null;
 	}
 
 	/**
@@ -36,7 +55,6 @@ class Profil_change_model extends DB_Model
 		if(!is_null($uid)){
 			$whereClause['uid']=$uid;
 		}
-		//?
 		if(!is_null($id)){
 			$whereClause['profil_update_id']=$id;
 		}
@@ -49,7 +67,7 @@ class Profil_change_model extends DB_Model
 				
 				foreach($res->retval as $update){
 					$update->requested_change = json_decode($update->requested_change);
-					$update->change_timestamp = !is_null($update->change_timestamp)?date_create($update->change_timestamp)->format('d.m.Y'):null;
+					$update->insertamum = !is_null($update->insertamum)?date_create($update->insertamum)->format('d.m.Y'):null;
 					$update->status_timestamp = !is_null($update->status_timestamp)?date_create($update->status_timestamp)->format('d.m.Y'):null;
 					 
 				}
diff --git a/public/js/apps/Cis/ProfilUpdateRequests.js b/public/js/apps/Cis/ProfilUpdateRequests.js
index 74f3e98c2..6f7fd773b 100755
--- a/public/js/apps/Cis/ProfilUpdateRequests.js
+++ b/public/js/apps/Cis/ProfilUpdateRequests.js
@@ -45,8 +45,8 @@ const app = Vue.createApp({
                       //responsive:0,
                     },
                     {
-                      title: "Date",
-                      field: "change_timestamp",
+                      title: "Insert Date",
+                      field: "insertamum",
                       resizable: true,
                       headerFilter: true,
                       minWidth: 200,
@@ -109,41 +109,11 @@ const app = Vue.createApp({
       
     },
     methods:{
-        sideMenuFunction: function(){
-            console.log("test from the side menu");
-        },
-        collapseFormatter: function(data){
-          //data - an array of objects containing the column title and value for each cell
-          var container = document.createElement("div");
-          container.classList.add("tabulator-collapsed-row");
-          container.classList.add("text-break");
-          
-          var list = document.createElement("div");
-          list.classList.add("row");
-          
-          
-          container.appendChild(list);
-          
-          data.forEach(function(col){
-            let item = document.createElement("div");
-            item.classList.add("col-12");
-          
-            
-            item.innerHTML = Object.keys(JSON.parse(col.value)).map(key => {return key+'<br/>'});
-            
-          
-            list.appendChild(item);
-         
-          });
-          
-          return Object.keys(data).length ? container : "";
-          },
+        
+      
     },
     created(){
 
-        Vue.$fhcapi.ProfilUpdate.getProfilUpdateRequest().then((res)=>{
-          console.log(res.data);
-        })
 
 
     },
diff --git a/public/js/apps/api/userdata.js b/public/js/apps/api/userdata.js
index 0fff20a31..956f78f90 100755
--- a/public/js/apps/api/userdata.js
+++ b/public/js/apps/api/userdata.js
@@ -12,6 +12,13 @@ export default {
           });
     },
 
+    getProfilRequestFiles: function(requestID) {
+        const url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router+
+                   `/Cis/Profil/getProfilRequestFiles`;
+                   
+        return axios.post(url,requestID);
+    },
+
     selectProfilRequest: function(uid=null,id=null) {
         const url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router+
                    `/Cis/Profil/selectProfilRequest`;
@@ -26,11 +33,11 @@ export default {
         return axios.post(url,{topic, payload});
     },
 
-    updateProfilRequest: function(topic, payload) {
+    updateProfilRequest: function(topic, payload, ID) {
         const url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router+
                    `/Cis/Profil/updateProfilRequest`;
                    
-        return axios.post(url,{topic, payload});
+        return axios.post(url,{topic, payload, ID});
     },
 
     deleteProfilRequest: function(requestID){
diff --git a/public/js/components/Cis/Profil/EditProfil.js b/public/js/components/Cis/Profil/EditProfil.js
index fda28d537..40a7caaf4 100755
--- a/public/js/components/Cis/Profil/EditProfil.js
+++ b/public/js/components/Cis/Profil/EditProfil.js
@@ -47,7 +47,7 @@ export default {
         if(this.profilUpdate.files){
           
           const fileIDs = await this.uploadFiles(this.profilUpdate.files);
-          
+         
           if(fileIDs){
             
             this.profilUpdate.files=fileIDs;
@@ -55,9 +55,8 @@ export default {
           };
         }
         //? inserts new row in public.tbl_cis_profil_update 
-        //* calls the update api call if an update field is present in the data that was passed to the module
-        Vue.$fhcapi.UserData[this.editData.update?'updateProfilRequest':'insertProfilRequest'](this.topic,this.profilUpdate).then((res)=>{
-          
+        //* calls the update api call if an update field is present in the data that was passed to the modal
+        const handleApiResponse = (res)=>{
           if(res.data.error == 0){
             this.result= true;
             this.hide();
@@ -67,7 +66,15 @@ export default {
             this.hide();
             Alert.popup("Ein Fehler ist aufgetreten: "+ JSON.stringify(res.data.retval));
           }
-        });
+        }
+        
+        this.editData.updateID? 
+        Vue.$fhcapi.UserData.updateProfilRequest(this.topic,this.profilUpdate,this.editData.updateID).then((res)=>{
+          handleApiResponse(res);
+        }):
+        Vue.$fhcapi.UserData.insertProfilRequest(this.topic,this.profilUpdate).then((res)=>{
+          handleApiResponse(res);
+        })
         
         
     }
@@ -75,20 +82,29 @@ export default {
 
     //? uploads files to the dms table and returns an array with the ids of the created files
      uploadFiles: async function(files){
+      let updatedFiles = [];
+      if(this.editData.updateID){ //? if we are updating an already existing profilRequest
+        const existingFiles = await Vue.$fhcapi.UserData.getProfilRequestFiles(this.editData.updateID).then(res => {return res.data});
+        updatedFiles = [...existingFiles];
+      }
       let formData = new FormData();
       for(let i = 0; i < files.length; i++){
-        
-        formData.append("files[]",files[i]);
+        if(files[i].type!=='application/x.fhc-dms+json')
+          formData.append("files[]",files[i]);        
       }
       
-      return await Vue.$fhcapi.UserData.insertFile(formData).then(res => {
+      await Vue.$fhcapi.UserData.insertFile(formData).then(res => {
         /* returns file information as 
         [{"name":"example.png", "dms_id":282531}] */
-        return res.data.map(file => { return {dms_id:file.dms_id, name:file.client_name}});
+        console.log(res)
+        updatedFiles = updatedFiles.concat(res.data?.map(file => {  return {dms_id:file.dms_id, name:file.client_name}}));
       }).catch(err=>{
         console.log(err);
-        return null;
+        
       })
+
+      return updatedFiles;
+
     }, 
   },
   computed: {
diff --git a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
index ecc997c48..e32b96897 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
@@ -44,37 +44,41 @@ export default {
             let view = this.getView(updateRequest.topic,updateRequest.status);
             let data = null;
             let content =null;
+            let files =null;
+            let withFiles = false;
 
            
             if(view === "TextInputDokument"){
-                // this should be the files : updateRequest.requested_change.files
+             
                 data = {
                     titel:updateRequest.topic,
                     value: updateRequest.requested_change.value,
                     
-                };
-
-                
-                
+                }; 
+                if(updateRequest.requested_change.files.length){
+                const FILE = updateRequest.requested_change.files?.map(file=>{return new File(["files[]"], file.name);})
+                const FILELIST = new DataTransfer();
+                FILE.forEach(file => {
+                    FILELIST.items.add(file);
+                })
+                files=updateRequest.requested_change.files;
+                }
+                withFiles = true;
             }
             else{
                 data = updateRequest.requested_change;
             }
                 
-            const exampleFile = updateRequest.requested_change.files.map(file=>{return new File(["files[]"], file.name);})
-            const exampleFileList = new DataTransfer();
-            exampleFile.forEach(file => {
-                exampleFileList.items.add(file);
-            })
+            
             
 
             content={
+                updateID:updateRequest.profil_update_id,
                 view:view,
                 data:data,
-                withFiles:view==="TextInputDokument" ? true:false,
-                update:true,
+                withFiles:withFiles,
                 topic:updateRequest.topic,
-                files: view==="TextInputDokument" ? exampleFileList.files:null,
+                files: files,
                 
             }
 
diff --git a/public/js/components/Cis/Profil/ProfilComponents/Status.js b/public/js/components/Cis/Profil/ProfilComponents/Status.js
index d9277145f..535252ec2 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/Status.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/Status.js
@@ -32,7 +32,7 @@ export default {
         status:{type:String},
         status_message:{type:String},
         status_timestamp:{type:String},
-        update:{type:Boolean},
+        updateID:{type:Number},
         topic:{type:String},
     },
     created(){
diff --git a/public/js/components/Cis/Profil/ProfilComponents/TextInputDokument.js b/public/js/components/Cis/Profil/ProfilComponents/TextInputDokument.js
index 4312d9747..257c4c39f 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/TextInputDokument.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/TextInputDokument.js
@@ -24,23 +24,15 @@ export default {
         files:{
             type:FileList,
         },
-        update:{
+        updateID:{
             type:Boolean,
         }
     },
     computed: {
         isChanged: function(){
-            if(this.update ){
-                if(this.originalFiles !== this.dmsData || this.originalValue !== JSON.stringify(this.data)){
-                    return true;
-                }else{
-                    return false;
-                }
-            }else{
-                //? controls whether the user is allowed to send the profil update or not
-                if(this.withFiles && !this.dmsData.length) {return false;}     
-                return JSON.stringify(this.data) !== Vue.toRaw(this.originalValue);
-            }
+            //? controls whether the user is allowed to send the profil update or not
+            if(this.withFiles && !this.dmsData.length) {return false;}     
+            return JSON.stringify(this.data) !== Vue.toRaw(this.originalValue);
             
         }
 
@@ -49,16 +41,14 @@ export default {
     watch: {
         //? watcher to trigger the event emit when a file was uploaded or removed
         dmsData(value) {
-          this.emitChanges();
-          console.log("dmsData",this.dmsData);
-          console.log("original files",Vue.toRaw(this.originalFiles));
-          console.log("compare",this.dmsData == Vue.toRaw(this.originalFiles));
+                this.emitChanges();
+                
         }
       },
     methods:{
-
+        
         emitChanges: function(){
-            if(this.isChanged){
+            if(this.updateID || this.isChanged){
                 
                 this.$emit('profilUpdate', this.withFiles?{value:this.data.value, files:this.dmsData}:{value:this.data.value});
             }else{
@@ -68,13 +58,19 @@ export default {
         },
         
     },
-    created(){
+    mounted(){
         
         this.originalValue = JSON.stringify(this.data);
-        this.originalFiles = this.files;
+        
 
         if(this.files){
             this.dmsData = this.files;
+
+            for(let i=0; i < this.dmsData.length; i++){
+                console.log("here",this.dmsData[i]);
+            }
+            
+            this.originalFiles=null;
         }
         
     },
@@ -86,7 +82,7 @@ export default {
     <input  class="form-control" @input="emitChanges"  v-model="data.value" :placeholder="data.value">
   
     
-    <dms v-if="withFiles" id="files" :noList="false" :multiple="true" v-model="dmsData"  ></dms>
+    <dms ref="update" v-if="withFiles" id="files" :noList="false" :multiple="true" v-model="dmsData"  ></dms>
 
     </div>
     `,
diff --git a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
index e3b86d548..e5e5e59bb 100755
--- a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
+++ b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
@@ -171,7 +171,7 @@ export default {
     <div  class="form-underline mb-2 col">
       <div class="form-underline-titel">Date of Request:</div>
 
-      <span  class="form-underline-content" >{{data.change_timestamp}}</span>
+      <span  class="form-underline-content" >{{data.insertamum}}</span>
     </div>
 
     </div>
diff --git a/public/js/components/Form/Upload/Dms.js b/public/js/components/Form/Upload/Dms.js
index 6a31ca545..0416436db 100755
--- a/public/js/components/Form/Upload/Dms.js
+++ b/public/js/components/Form/Upload/Dms.js
@@ -52,8 +52,7 @@ export default {
 		}
 	},
 	watch: {
-		modelValue:{
-			handler(n) {
+		modelValue(n) {
 				if (n instanceof FileList)
 					return this.$refs.upload.files = n;
 	
@@ -71,12 +70,10 @@ export default {
 				}
 				this.$emit('update:modelValue', dt.files);
 			},
-			immediate:true
-		}
 	},
 	template: `
 	<div class="form-upload-dms">
-	
+	<pre>{{JSON.stringify(Array.from(modelValue).map(item => stringifyFile(item)),null,2)}}</pre>
 		<input ref="upload" class="form-control" :class="inputClass" :id="id" :name="name" :multiple="multiple" type="file" @change="addFiles">
 		<ul v-if="modelValue.length && multiple && !noList" class="list-unstyled m-0">
 			<li v-for="(file, index) in modelValue" :key="index" class="d-flex mx-1 mt-1 align-items-center">
diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index 060238d46..cce0d9bb9 100755
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -223,7 +223,7 @@ $tabellen=array(
 	"public.tbl_benutzerfunktion"  => array("benutzerfunktion_id","fachbereich_kurzbz","uid","oe_kurzbz","funktion_kurzbz","semester", "datum_von","datum_bis", "updateamum","updatevon","insertamum","insertvon","ext_id","bezeichnung","wochenstunden"),
 	"public.tbl_benutzergruppe"  => array("uid","gruppe_kurzbz","studiensemester_kurzbz","updateamum","updatevon","insertamum","insertvon","ext_id"),
 	"public.tbl_bewerbungstermine" => array("bewerbungstermin_id","studiengang_kz","studiensemester_kurzbz","beginn","ende","nachfrist","nachfrist_ende","anmerkung", "insertamum", "insertvon", "updateamum", "updatevon","studienplan_id","nationengruppe_kurzbz"),
-	"public.tbl_cis_profil_update" => array("profil_update_id","topic","uid","requested_change","change_timestamp"),
+	"public.tbl_cis_profil_update" => array("profil_update_id","uid","name","topic","requested_change", "updateamum", "updatevon", "insertamum", "insertvon", "status", "status_timestamp", "status_message"),
 	"public.tbl_buchungstyp"  => array("buchungstyp_kurzbz","beschreibung","standardbetrag","standardtext","aktiv","credit_points"),
 	"public.tbl_dokument"  => array("dokument_kurzbz","bezeichnung","ext_id","bezeichnung_mehrsprachig","dokumentbeschreibung_mehrsprachig","ausstellungsdetails"),
 	"public.tbl_dokumentprestudent"  => array("dokument_kurzbz","prestudent_id","mitarbeiter_uid","datum","updateamum","updatevon","insertamum","insertvon","ext_id"),
diff --git a/system/dbupdate_3.4/25999_C4_ma0594.php b/system/dbupdate_3.4/25999_C4_ma0594.php
index 1017ef94a..e9df68b19 100755
--- a/system/dbupdate_3.4/25999_C4_ma0594.php
+++ b/system/dbupdate_3.4/25999_C4_ma0594.php
@@ -8,7 +8,10 @@
                 name TEXT NOT NULL,
                 topic VARCHAR(32) NOT NULL,
                 requested_change jsonb NOT NULL,
-                change_timestamp TIMESTAMP NOT NULL,
+                updateamum TIMESTAMP NULL,
+                updatevon VARCHAR(32) NULL,
+                insertamum TIMESTAMP NOT NULL,
+                insertvon VARCHAR(32) NOT NULL,
                 status VARCHAR(32) NOT NULL,
                 status_timestamp TIMESTAMP NULL,
                 status_message TEXT NULL,

From 1460e6ed8020d8b20b7782cbad5783eb3c2765a0 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 31 Jan 2024 15:22:03 +0100
Subject: [PATCH 0368/1461] modifing uploaded files int the fetchProfilUpdates
 component works correctly

---
 application/controllers/Cis/Profil.php        |   6 +-
 .../models/person/Profil_change_model.php     |   2 +-
 public/js/apps/Cis/ProfilUpdateRequests.js    | 224 +++++++--------
 public/js/apps/api/userdata.js                | 139 +++++-----
 public/js/components/Cis/Profil/EditProfil.js | 150 +++++-----
 .../components/Cis/Profil/EditProfilSelect.js | 261 ++++++++----------
 .../ProfilComponents/FetchProfilUpdates.js    | 220 +++++++--------
 .../Cis/Profil/ProfilComponents/Status.js     |  67 +++--
 .../ProfilComponents/TextInputDokument.js     | 139 +++++-----
 .../Cis/ProfilUpdate/AcceptDenyUpdate.js      |  92 +++---
 public/js/components/Form/Upload/Dms.js       |   1 -
 11 files changed, 640 insertions(+), 661 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index 76d225374..8e40c3f29 100755
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -77,11 +77,15 @@ class Profil extends Auth_Controller
 			$fileVersion = $this->DmsVersionModel->loadWhere(["name"=>$_FILES['files']['name'], "mimetype"=>$_FILES['files']['type']]);
 			$fileVersion = hasData($fileVersion) ? getData($fileVersion)[0]->version : 0;
 			if($fileVersion) $fileVersion++; */
-
+		if(!count($_FILES)){
+			echo json_encode([]);
+			return;
+		}
 		$res=[];
 
 		$this->load->library('DmsLib');
 		$this->load->model('DmsVersion_model','DmsVersionModel');
+		
 		$files = $_FILES['files'];
         $file_count = count($files['name']);
 
diff --git a/application/models/person/Profil_change_model.php b/application/models/person/Profil_change_model.php
index ea272493c..b207db716 100755
--- a/application/models/person/Profil_change_model.php
+++ b/application/models/person/Profil_change_model.php
@@ -40,7 +40,7 @@ class Profil_change_model extends DB_Model
 		$this->addSelect(["requested_change"]);
 		$res = $this->load([$profil_update_id]);
 		$res = hasData($res) ? getData($res)[0] : null;
-		return json_decode($res->requested_change)->files?:null;
+		return json_decode($res->requested_change)->files?:[];
 	}
 
 	/**
diff --git a/public/js/apps/Cis/ProfilUpdateRequests.js b/public/js/apps/Cis/ProfilUpdateRequests.js
index 6f7fd773b..58287d27f 100755
--- a/public/js/apps/Cis/ProfilUpdateRequests.js
+++ b/public/js/apps/Cis/ProfilUpdateRequests.js
@@ -1,134 +1,122 @@
 import fhcapifactory from "../api/fhcapifactory.js";
-import {CoreFilterCmpt} from "../../components/filter/Filter.js";
+import { CoreFilterCmpt } from "../../components/filter/Filter.js";
 import AcceptDenyUpdate from "../../components/Cis/ProfilUpdate/AcceptDenyUpdate.js";
 Vue.$fhcapi = fhcapifactory;
 
-
-
-
 const app = Vue.createApp({
-    components:{
-        CoreFilterCmpt,
-        
-    },
-    data(){
-        return{
-          
-            profil_updates_table_options:{
-              ajaxURL:FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/Cis/ProfilUpdate/getAllRequests',
-                height:600,
-                layout:'fitColumns',
-                
-                  columns: [
-                    {
-                      title: "UID",
-                      field: "uid",
-                      minWidth: 200,
-                      resizable:true,
-                      headerFilter: true,
-                      //responsive:0,
-                    },
-                    {
-                      title: "Name",
-                      field: "name",
-                      minWidth: 200,
-                      resizable:true,
-                      headerFilter: true,
-                      //responsive:0,
-                    },
-                    {
-                      title: "Topic",
-                      field: "topic",
-                      resizable: true,
-                      minWidth: 200,
-                      headerFilter: true,
-                      //responsive:0,
-                    },
-                    {
-                      title: "Insert Date",
-                      field: "insertamum",
-                      resizable: true,
-                      headerFilter: true,
-                      minWidth: 200,
-                      //responsive:0,
-                    },
-                    {
-                      title: "Status",
-                      field: "status",
-                      hozAlign:'center',
-                      headerFilter: true,
-                      formatter: function(cell,para){
-                        let res =Object.getPrototypeOf(cell);
-                        //console.log(res);
-                        
-                        switch(cell.getValue()){
-                          case "pending": return "<i class='fa fa-circle-info text-info fa-lg'></i> pending";
-                          case "accepted": return "<i class='fa fa-circle-check text-success fa-lg'></i> accepted";
-                          case "rejected": return "<i class='fa-solid fa-circle-xmark text-danger fa-lg '></i> rejected";
-                          default: return "<p>default</p>";
-                        }
-                      },
-                      
-                      resizable: true,
-                      minWidth: 200,
-                      //responsive:0,
-                    },
-                    {
-                      title: "View",
-                      formatter:function(){ return "<i class='fa fa-eye'></i>";},
-                      resizable: true,
-                      minWidth: 200,
-                      hozAlign: 'center',
-                      cellClick:(e, cell)=>{
-                        //! function that is called when clicking on a row in the table
-                        
-                        let cellData = cell.getRow().getData();
-                        
-                        AcceptDenyUpdate.popup({value:cellData}).then(res=>{
-                          console.log("res of the modal: ",res);
-                          //? refetches the data, if any request was denied or accepted
-                          //* setData will call the ajaxURL again to refresh the data 
-                          this.$refs.UpdatesTable.tabulator.setData();
-                        }).catch(e=>{
-                          //? catches the rejected Promise if the result of the modal was falsy
-                          console.log("catch of the modal: ",e);
-                        });
-                      
-                          
-                      },
-                      //responsive:0,
-                    },
-                    
-                    
-                    
-                  ],
+  components: {
+    CoreFilterCmpt,
+  },
+  data() {
+    return {
+      profil_updates_table_options: {
+        ajaxURL:
+          FHC_JS_DATA_STORAGE_OBJECT.app_root +
+          FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+          "/Cis/ProfilUpdate/getAllRequests",
+        height: 600,
+        layout: "fitColumns",
+
+        columns: [
+          {
+            title: "UID",
+            field: "uid",
+            minWidth: 200,
+            resizable: true,
+            headerFilter: true,
+            //responsive:0,
+          },
+          {
+            title: "Name",
+            field: "name",
+            minWidth: 200,
+            resizable: true,
+            headerFilter: true,
+            //responsive:0,
+          },
+          {
+            title: "Topic",
+            field: "topic",
+            resizable: true,
+            minWidth: 200,
+            headerFilter: true,
+            //responsive:0,
+          },
+          {
+            title: "Insert Date",
+            field: "insertamum",
+            resizable: true,
+            headerFilter: true,
+            minWidth: 200,
+            //responsive:0,
+          },
+          {
+            title: "Status",
+            field: "status",
+            hozAlign: "center",
+            headerFilter: true,
+            formatter: function (cell, para) {
+              let res = Object.getPrototypeOf(cell);
+              //console.log(res);
+
+              switch (cell.getValue()) {
+                case "pending":
+                  return "<i class='fa fa-circle-info text-info fa-lg'></i> pending";
+                case "accepted":
+                  return "<i class='fa fa-circle-check text-success fa-lg'></i> accepted";
+                case "rejected":
+                  return "<i class='fa-solid fa-circle-xmark text-danger fa-lg '></i> rejected";
+                default:
+                  return "<p>default</p>";
+              }
             },
-        }
-    },
-    computed:{
-      
-    },
-    methods:{
-        
-      
-    },
-    created(){
 
+            resizable: true,
+            minWidth: 200,
+            //responsive:0,
+          },
+          {
+            title: "View",
+            formatter: function () {
+              return "<i class='fa fa-eye'></i>";
+            },
+            resizable: true,
+            minWidth: 200,
+            hozAlign: "center",
+            cellClick: (e, cell) => {
+              //! function that is called when clicking on a row in the table
 
+              let cellData = cell.getRow().getData();
 
-    },
-    mounted(){
-
-        
-    },
-    template:`
+              AcceptDenyUpdate.popup({ value: cellData })
+                .then((res) => {
+                  console.log("res of the modal: ", res);
+                  //? refetches the data, if any request was denied or accepted
+                  //* setData will call the ajaxURL again to refresh the data
+                  this.$refs.UpdatesTable.tabulator.setData();
+                })
+                .catch((e) => {
+                  //? catches the rejected Promise if the result of the modal was falsy
+                  console.log("catch of the modal: ", e);
+                });
+            },
+            //responsive:0,
+          },
+        ],
+      },
+    };
+  },
+  computed: {},
+  methods: {},
+  created() {},
+  mounted() {},
+  template: `
     <div>
     
     
     <core-filter-cmpt title="Update Requests"  ref="UpdatesTable" :tabulator-options="profil_updates_table_options" tableOnly :sideMenu="false" />
 
     </div>`,
+});
 
-})
-
-app.mount('#content');
\ No newline at end of file
+app.mount("#content");
diff --git a/public/js/apps/api/userdata.js b/public/js/apps/api/userdata.js
index 956f78f90..c924d7b10 100755
--- a/public/js/apps/api/userdata.js
+++ b/public/js/apps/api/userdata.js
@@ -1,80 +1,87 @@
 export default {
+  //! API Calls for Profil Views
 
+  insertFile: function (dms) {
+    const url =
+      FHC_JS_DATA_STORAGE_OBJECT.app_root +
+      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+      `/Cis/Profil/insertFile`;
 
-    //! API Calls for Profil Views
+    return axios.post(url, dms, {
+      headers: { "Content-Type": "multipart/form-data" },
+    });
+  },
 
-    insertFile: function(dms) {
-        const url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router+
-                   `/Cis/Profil/insertFile`;
-                   
-        return axios.post(url,dms, {
-            headers: {'Content-Type': 'multipart/form-data'}
-          });
-    },
+  getProfilRequestFiles: function (requestID) {
+    const url =
+      FHC_JS_DATA_STORAGE_OBJECT.app_root +
+      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+      `/Cis/Profil/getProfilRequestFiles`;
 
-    getProfilRequestFiles: function(requestID) {
-        const url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router+
-                   `/Cis/Profil/getProfilRequestFiles`;
-                   
-        return axios.post(url,requestID);
-    },
+    return axios.post(url, requestID);
+  },
 
-    selectProfilRequest: function(uid=null,id=null) {
-        const url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router+
-                   `/Cis/Profil/selectProfilRequest`;
-                   
-        return axios.get(url,{uid:uid, id:id});
-    },
-    
-    insertProfilRequest: function(topic, payload) {
-        const url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router+
-                   `/Cis/Profil/insertProfilRequest`;
-                   
-        return axios.post(url,{topic, payload});
-    },
+  selectProfilRequest: function (uid = null, id = null) {
+    const url =
+      FHC_JS_DATA_STORAGE_OBJECT.app_root +
+      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+      `/Cis/Profil/selectProfilRequest`;
 
-    updateProfilRequest: function(topic, payload, ID) {
-        const url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router+
-                   `/Cis/Profil/updateProfilRequest`;
-                   
-        return axios.post(url,{topic, payload, ID});
-    },
+    return axios.get(url, { uid: uid, id: id });
+  },
 
-    deleteProfilRequest: function(requestID){
-        const url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router+
-        `/Cis/Profil/deleteProfilRequest`;
+  insertProfilRequest: function (topic, payload) {
+    const url =
+      FHC_JS_DATA_STORAGE_OBJECT.app_root +
+      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+      `/Cis/Profil/insertProfilRequest`;
 
-        return axios.post(url,requestID);
-    },
+    return axios.post(url, { topic, payload });
+  },
 
-    getEditProfil: function() {
-        const url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router+
-                   `/Cis/Profil/getEditProfil`;
-        return axios.get(url);
-    },
-    
-    isMitarbeiterOrStudent: function(uid) {
-        const url = FHC_JS_DATA_STORAGE_OBJECT.app_root 
-                  + `cis.php/Cis/Profil/isMitarbeiterOrStudent/${uid}`;
-        return axios.get(url);
-    },
+  updateProfilRequest: function (topic, payload, ID) {
+    const url =
+      FHC_JS_DATA_STORAGE_OBJECT.app_root +
+      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+      `/Cis/Profil/updateProfilRequest`;
 
-    getView: function(uid) {
-        const url = FHC_JS_DATA_STORAGE_OBJECT.app_root 
-                  + `cis.php/Cis/Profil/getView/${uid}`;
-        return axios.get(url);
-    },
- 
-    sperre_foto_function: function(value) {
-        const url = FHC_JS_DATA_STORAGE_OBJECT.app_root 
-                  + `cis.php/Cis/Profil/foto_sperre_function/${value}`;
-        return axios.get(url);
-    },
+    return axios.post(url, { topic, payload, ID });
+  },
 
-    
-   
+  deleteProfilRequest: function (requestID) {
+    const url =
+      FHC_JS_DATA_STORAGE_OBJECT.app_root +
+      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+      `/Cis/Profil/deleteProfilRequest`;
 
+    return axios.post(url, requestID);
+  },
 
-    
- 
-};
\ No newline at end of file
+  getEditProfil: function () {
+    const url =
+      FHC_JS_DATA_STORAGE_OBJECT.app_root +
+      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+      `/Cis/Profil/getEditProfil`;
+    return axios.get(url);
+  },
+
+  isMitarbeiterOrStudent: function (uid) {
+    const url =
+      FHC_JS_DATA_STORAGE_OBJECT.app_root +
+      `cis.php/Cis/Profil/isMitarbeiterOrStudent/${uid}`;
+    return axios.get(url);
+  },
+
+  getView: function (uid) {
+    const url =
+      FHC_JS_DATA_STORAGE_OBJECT.app_root + `cis.php/Cis/Profil/getView/${uid}`;
+    return axios.get(url);
+  },
+
+  sperre_foto_function: function (value) {
+    const url =
+      FHC_JS_DATA_STORAGE_OBJECT.app_root +
+      `cis.php/Cis/Profil/foto_sperre_function/${value}`;
+    return axios.get(url);
+  },
+};
diff --git a/public/js/components/Cis/Profil/EditProfil.js b/public/js/components/Cis/Profil/EditProfil.js
index 40a7caaf4..b8782f5ef 100755
--- a/public/js/components/Cis/Profil/EditProfil.js
+++ b/public/js/components/Cis/Profil/EditProfil.js
@@ -10,7 +10,6 @@ export default {
   },
   mixins: [BsModal],
   props: {
-
     value: Object,
     title: String,
     /*
@@ -27,96 +26,113 @@ export default {
   },
   data() {
     return {
-      topic:null,
-      profilUpdate:null,      
+      topic: null,
+      profilUpdate: null,
       editData: this.value,
-      breadcrumb:null,
-      
+      breadcrumb: null,
+
       result: false,
       info: null,
-    }
+    };
   },
 
   methods: {
-    async submitProfilChange(){
-      //? when the update contains a file upload 
-      
-        //TODO: check if the updated value is different from the original value before submitting the request
-       if(this.topic && this.profilUpdate){
+    async submitProfilChange() {
+      //? when the update contains a file upload
 
-        if(this.profilUpdate.files){
-          
+      //TODO: check if the updated value is different from the original value before submitting the request
+      if (this.topic && this.profilUpdate) {
+        if (this.profilUpdate.files) {
           const fileIDs = await this.uploadFiles(this.profilUpdate.files);
-         
-          if(fileIDs){
-            
-            this.profilUpdate.files=fileIDs;
-            console.log("here is the update",this.profilUpdate);
-          };
-        }
-        //? inserts new row in public.tbl_cis_profil_update 
-        //* calls the update api call if an update field is present in the data that was passed to the modal
-        const handleApiResponse = (res)=>{
-          if(res.data.error == 0){
-            this.result= true;
-            this.hide();
-            Alert.popup("Ihre Anfrage wurde erfolgreich gesendet. Bitte warten Sie, während sich das Team um Ihre Anfrage kümmert.");
-          }else{
-            this.result= false;
-            this.hide();
-            Alert.popup("Ein Fehler ist aufgetreten: "+ JSON.stringify(res.data.retval));
+
+          if (fileIDs) {
+            this.profilUpdate.files = fileIDs;
+            console.log("here is the update", this.profilUpdate);
           }
         }
-        
-        this.editData.updateID? 
-        Vue.$fhcapi.UserData.updateProfilRequest(this.topic,this.profilUpdate,this.editData.updateID).then((res)=>{
-          handleApiResponse(res);
-        }):
-        Vue.$fhcapi.UserData.insertProfilRequest(this.topic,this.profilUpdate).then((res)=>{
-          handleApiResponse(res);
-        })
-        
-        
-    }
+        //? inserts new row in public.tbl_cis_profil_update
+        //* calls the update api call if an update field is present in the data that was passed to the modal
+        const handleApiResponse = (res) => {
+          if (res.data.error == 0) {
+            this.result = true;
+            this.hide();
+            Alert.popup(
+              "Ihre Anfrage wurde erfolgreich gesendet. Bitte warten Sie, während sich das Team um Ihre Anfrage kümmert."
+            );
+          } else {
+            this.result = false;
+            this.hide();
+            Alert.popup(
+              "Ein Fehler ist aufgetreten: " + JSON.stringify(res.data.retval)
+            );
+          }
+        };
+
+        this.editData.updateID
+          ? Vue.$fhcapi.UserData.updateProfilRequest(
+              this.topic,
+              this.profilUpdate,
+              this.editData.updateID
+            ).then((res) => {
+              handleApiResponse(res);
+            })
+          : Vue.$fhcapi.UserData.insertProfilRequest(
+              this.topic,
+              this.profilUpdate
+            ).then((res) => {
+              handleApiResponse(res);
+            });
+      }
     },
 
-    //? uploads files to the dms table and returns an array with the ids of the created files
-     uploadFiles: async function(files){
+    uploadFiles: async function (files) {
       let updatedFiles = [];
-      if(this.editData.updateID){ //? if we are updating an already existing profilRequest
-        const existingFiles = await Vue.$fhcapi.UserData.getProfilRequestFiles(this.editData.updateID).then(res => {return res.data});
-        updatedFiles = [...existingFiles];
+
+      if (this.editData.updateID) {
+        //? if we are updating an already existing profilRequest
+        const existingFiles = await Vue.$fhcapi.UserData.getProfilRequestFiles(
+          this.editData.updateID
+        ).then((res) => {
+          return res.data;
+        });
+        updatedFiles = [...existingFiles.filter((file) => {
+          for(let j=0; j<files.length; j++) {
+            if (file.name === files[j].name)
+              return true;
+          }
+        })];
       }
+
       let formData = new FormData();
-      for(let i = 0; i < files.length; i++){
-        if(files[i].type!=='application/x.fhc-dms+json')
-          formData.append("files[]",files[i]);        
+      for (let i = 0; i < files.length; i++) {
+        if (files[i].type !== "application/x.fhc-dms+json")
+          formData.append("files[]", files[i]);
       }
-      
-      await Vue.$fhcapi.UserData.insertFile(formData).then(res => {
-        /* returns file information as 
+
+      await Vue.$fhcapi.UserData.insertFile(formData)
+        .then((res) => {
+          /* returns file information as 
         [{"name":"example.png", "dms_id":282531}] */
-        console.log(res)
-        updatedFiles = updatedFiles.concat(res.data?.map(file => {  return {dms_id:file.dms_id, name:file.client_name}}));
-      }).catch(err=>{
-        console.log(err);
-        
-      })
+
+          updatedFiles = updatedFiles.concat(
+            res.data?.map((file) => {
+              return { dms_id: file.dms_id, name: file.client_name };
+            })
+          );
+        })
+        .catch((err) => {
+          console.log(err);
+        });
 
       return updatedFiles;
-
-    }, 
-  },
-  computed: {
+    },
   },
+  computed: {},
   created() {
-
-    if(this.editData.topic){
+    if (this.editData.topic) {
       //? if the topic was passed through the prop add it to the component
       this.topic = this.editData.topic;
     }
-   
-
   },
   mounted() {
     this.modal = this.$refs.modalContainer.modal;
diff --git a/public/js/components/Cis/Profil/EditProfilSelect.js b/public/js/components/Cis/Profil/EditProfilSelect.js
index 0d28d47f9..f69ef5a5e 100755
--- a/public/js/components/Cis/Profil/EditProfilSelect.js
+++ b/public/js/components/Cis/Profil/EditProfilSelect.js
@@ -6,149 +6,133 @@ import Status from "./ProfilComponents/Status.js";
 import TextInputDokument from "./ProfilComponents/TextInputDokument.js";
 
 export default {
-    components: {
-      Kontakt,
-      EditKontakt,
-      Adresse,
-      EditAdresse,
-      Status,
-      TextInputDokument,
-    },
-    props: {
+  components: {
+    Kontakt,
+    EditKontakt,
+    Adresse,
+    EditAdresse,
+    Status,
+    TextInputDokument,
+  },
+  props: {
+    list: Object,
 
-      
-      list:Object,
-  
-      //? Prop used to determine how many options the select should initially show
-      size:{
-        type:Number,
-        default: null,
-      },
-      //? Content for the aria label of the select
-      ariaLabel:{
-        type:String,
-        required:true,
-      },
-      profilUpdate:String,
-      topic:String,
-      breadcrumb:String,
-
-     
+    //? Prop used to determine how many options the select should initially show
+    size: {
+      type: Number,
+      default: null,
     },
-    emits:{
-        //? update:modelValue event is needed to notify the v-model when the value has changed
-        ['update:profilUpdate']:null,
-        ['update:topic']:null,
-        ['update:breadcrumb']:null,
-        submit:null,
-        select:null,
-
+    //? Content for the aria label of the select
+    ariaLabel: {
+      type: String,
+      required: true,
     },
-    data() {
-      return {
-        view:null,
-        data:null,
-        breadcrumbItems:[],
-        topic:null,
-        properties:null,
+    profilUpdate: String,
+    topic: String,
+    breadcrumb: String,
+  },
+  emits: {
+    //? update:modelValue event is needed to notify the v-model when the value has changed
+    ["update:profilUpdate"]: null,
+    ["update:topic"]: null,
+    ["update:breadcrumb"]: null,
+    submit: null,
+    select: null,
+  },
+  data() {
+    return {
+      view: null,
+      data: null,
+      breadcrumbItems: [],
+      topic: null,
+      properties: null,
+    };
+  },
+
+  methods: {
+    addItem: function () {
+      this.view =
+        this.topic == "Private Kontakte" ? "EditKontakt" : "EditAdresse";
+
+      //? updates the topic when a Kontakt or an Address should be added
+      this.topic =
+        this.topic == "Private Kontakte" ? "Add Kontakte" : "Add Adressen";
+      this.$emit("update:topic", this.topic);
+      this.breadcrumbItems.push(this.topic);
+      this.$emit("update:breadcrumb", this.breadcrumbItems);
+
+      this.data =
+        this.view == "EditAdresse"
+          ? {
+              //? add flag
+              add: true,
+              adresse_id: null,
+              strasse: null,
+              typ: null,
+              plz: null,
+              ort: null,
+            }
+          : {
+              //? add flag
+              add: true,
+              kontakt_id: null,
+              kontakttyp: null,
+              kontakt: null,
+              anmerkung: null,
+              zustellung: false,
+            };
+    },
+
+    deleteItem: function (item) {
+      //? delete flag
+      item.data.delete = true;
+      this.$emit("update:profilUpdate", item.data);
+      //? updates the topic when a Kontakt or an Address should be deleted
+      this.topic = item.data.kontakt ? "Delete Kontakte" : "Delete Adressen";
+      this.$emit("update:topic", this.topic);
+
+      this.$emit("submit");
+    },
+
+    profilUpdateEmit: function (event) {
+      //? passes the updated profil information to the parent component
+
+      this.$emit("update:profilUpdate", event);
+    },
+
+    updateOptions: function (event, item) {
+      this.properties = item;
+      this.data = item.data;
+      this.view = item.view;
+      console.log("properties", this.properties);
+      if (item.title) {
+        //? emits the selected topic to the parent component
+        this.topic = item.title;
+        this.$emit("update:topic", this.topic);
+
+        //? emits the new item for the breadcrumb in the parent component
+        this.breadcrumbItems.push(item.title);
+      } else {
+        if (item.data.kontakttyp) {
+          this.breadcrumbItems.push(item.data.kontakttyp);
+          this.breadcrumbItems.push(item.data.kontakt);
+        } else if (item.data.strasse) {
+          this.breadcrumbItems.push(item.data.strasse);
+        }
       }
+      this.$emit("update:breadcrumb", this.breadcrumbItems);
     },
-  
-    methods: {
+  },
+  computed: {},
+  created() {
+    //? JSON parse and stringify are used to deep clone the objects
+    this.properties = { ...this.list };
+    this.data = JSON.parse(JSON.stringify(this.list.data));
+    this.view = JSON.parse(JSON.stringify(this.list.view));
+  },
+  mounted() {},
 
-      addItem: function(){
-        
-        
-        this.view= this.topic == "Private Kontakte"?"EditKontakt":"EditAdresse" ;
-        
-        //? updates the topic when a Kontakt or an Address should be added
-        this.topic = this.topic == "Private Kontakte"?"Add Kontakte":"Add Adressen"
-        this.$emit('update:topic',this.topic);
-        this.breadcrumbItems.push(this.topic);
-        this.$emit('update:breadcrumb',this.breadcrumbItems);
-        
-        this.data= this.view=="EditAdresse"?
-        {
-          //? add flag
-          add:true,
-          adresse_id: null,
-          strasse: null,
-          typ: null,
-          plz: null,
-          ort: null
-        }: {
-          //? add flag
-          add:true,
-          kontakt_id: null,
-          kontakttyp: null,
-          kontakt: null,
-          anmerkung: null,
-          zustellung: false
-        }
-        
-        
-      },
-
-      deleteItem: function(item){
-        //? delete flag 
-        item.data.delete = true;
-        this.$emit('update:profilUpdate',item.data);
-        //? updates the topic when a Kontakt or an Address should be deleted
-        this.topic = item.data.kontakt?"Delete Kontakte":"Delete Adressen";
-        this.$emit('update:topic',this.topic);
-
-        this.$emit('submit');
-      },
-
-      profilUpdateEmit: function(event){
-        
-        //? passes the updated profil information to the parent component
-        
-        this.$emit('update:profilUpdate',event);
-      },
-
-      
-      updateOptions: function(event, item){
-        this.properties = item;
-        this.data=item.data; 
-        this.view=item.view;    
-        console.log("properties",this.properties);
-        if(item.title){
-          //? emits the selected topic to the parent component
-          this.topic= item.title;
-          this.$emit('update:topic',this.topic);
-        
-          //? emits the new item for the breadcrumb in the parent component
-          this.breadcrumbItems.push(item.title);
-        }else{
-          if(item.data.kontakttyp){
-            this.breadcrumbItems.push(item.data.kontakttyp);
-            this.breadcrumbItems.push(item.data.kontakt);
-          }else if(item.data.strasse){
-            this.breadcrumbItems.push(item.data.strasse);
-          }
-        }
-        this.$emit('update:breadcrumb',this.breadcrumbItems);
-        
-      },
-     
-    },
-    computed: {
-      
-      
-    },
-    created() {
-      //? JSON parse and stringify are used to deep clone the objects 
-      this.properties = {...this.list};
-      this.data = JSON.parse(JSON.stringify(this.list.data));
-      this.view = JSON.parse(JSON.stringify(this.list.view));
-      
-        
-    },
-    mounted() {
-    },
-   
-    template: `
+  template: `
     <template v-if="!view">
     
     <div  class="list-group">
@@ -190,5 +174,4 @@ export default {
       <component @profilUpdate="profilUpdateEmit"   :is="view" v-bind="properties" :data="data" ></component>
     </template>
    `,
-  };
-  
\ No newline at end of file
+};
diff --git a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
index e32b96897..70f81ec42 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
@@ -1,123 +1,117 @@
-
 import EditProfil from "../EditProfil.js";
 //? EditProfil is the modal used to edit the profil updates
 export default {
-    props:{
-        data:{
-            type:Object,
-        },
+  props: {
+    data: {
+      type: Object,
     },
+  },
 
-    emits:["fetchUpdates"],
-    
-    data(){
-        return {
-            
+  emits: ["fetchUpdates"],
+
+  data() {
+    return {};
+  },
+  methods: {
+    deleteRequest: function (item) {
+      Vue.$fhcapi.UserData.deleteProfilRequest(item.profil_update_id).then(
+        (res) => {
+          if (res.data.error) {
+            //? open alert
+            console.log(res.data);
+          } else {
+            this.$emit("fetchUpdates");
+          }
         }
+      );
     },
-    methods:{
-       
-        deleteRequest: function(item){
-            
-            Vue.$fhcapi.UserData.deleteProfilRequest(item.profil_update_id).then((res)=>{
-                if(res.data.error){
-                    //? open alert
-                    console.log(res.data);                    
-                }else{
-                    this.$emit('fetchUpdates');
-                }
-            });
-        },
-        getView: function(topic,status){
-            switch(topic){
-                case "Private Kontakte" : return status ==='pending'? "EditKontakt": "Status"; break;
-                case "Private Adressen" : return status ==='pending'? "EditAdresse": "Status"; break;
-                case "Add Adressen" : return status ==='pending'? "EditAdresse": "Status"; break;
-                case "Add Kontakte" : return status ==='pending'? "EditKontakt": "Status"; break;
-                case "Delete Adressen" :  return status ==='pending'? "Adresse": "Status" ; break;
-                case "Delete Kontakte" : return status ==='pending'? "Kontakt": "Status"; break;
-                default: return status ==='pending'? "TextInputDokument": "Status"; break;
-            }
-        },
-        openModal(updateRequest) {
-
-            let view = this.getView(updateRequest.topic,updateRequest.status);
-            let data = null;
-            let content =null;
-            let files =null;
-            let withFiles = false;
-
-           
-            if(view === "TextInputDokument"){
-             
-                data = {
-                    titel:updateRequest.topic,
-                    value: updateRequest.requested_change.value,
-                    
-                }; 
-                if(updateRequest.requested_change.files.length){
-                const FILE = updateRequest.requested_change.files?.map(file=>{return new File(["files[]"], file.name);})
-                const FILELIST = new DataTransfer();
-                FILE.forEach(file => {
-                    FILELIST.items.add(file);
-                })
-                files=updateRequest.requested_change.files;
-                }
-                withFiles = true;
-            }
-            else{
-                data = updateRequest.requested_change;
-            }
-                
-            
-            
-
-            content={
-                updateID:updateRequest.profil_update_id,
-                view:view,
-                data:data,
-                withFiles:withFiles,
-                topic:updateRequest.topic,
-                files: files,
-                
-            }
-
-
-            //? adds the status information if the profil update request was rejected or accepted
-            if(updateRequest.status !== 'pending'){
-                content['status']= updateRequest.status;
-                content['status_message']= updateRequest.status_message;
-                content['status_timestamp']=updateRequest.status_timestamp;
-            }
-
-            //? only show the popup if also the right content is available
-            if(content){
-            EditProfil.popup({ 
-                
-                value:content,
-               
-              }).then((res) => {
-                if(res === true){
-                    this.$emit('fetchUpdates');
-                }
-                
-              }).catch(e => {
-                // Wenn der User das Modal abbricht ohne Änderungen
-               
-              });
-            
-            }
-           
-          
-          }, 
+    getView: function (topic, status) {
+      switch (topic) {
+        case "Private Kontakte":
+          return status === "pending" ? "EditKontakt" : "Status";
+          break;
+        case "Private Adressen":
+          return status === "pending" ? "EditAdresse" : "Status";
+          break;
+        case "Add Adressen":
+          return status === "pending" ? "EditAdresse" : "Status";
+          break;
+        case "Add Kontakte":
+          return status === "pending" ? "EditKontakt" : "Status";
+          break;
+        case "Delete Adressen":
+          return status === "pending" ? "Adresse" : "Status";
+          break;
+        case "Delete Kontakte":
+          return status === "pending" ? "Kontakt" : "Status";
+          break;
+        default:
+          return status === "pending" ? "TextInputDokument" : "Status";
+          break;
+      }
     },
-    created(){
-        
+    openModal(updateRequest) {
+      let view = this.getView(updateRequest.topic, updateRequest.status);
+      let data = null;
+      let content = null;
+      let files = null;
+      let withFiles = false;
+
+      if (view === "TextInputDokument") {
+        data = {
+          titel: updateRequest.topic,
+          value: updateRequest.requested_change.value,
+        };
+        if (updateRequest.requested_change.files.length) {
+          const FILE = updateRequest.requested_change.files?.map((file) => {
+            return new File(["files[]"], file.name);
+          });
+          const FILELIST = new DataTransfer();
+          FILE.forEach((file) => {
+            FILELIST.items.add(file);
+          });
+          files = updateRequest.requested_change.files;
+        }
+        withFiles = true;
+      } else {
+        data = updateRequest.requested_change;
+      }
+
+      content = {
+        updateID: updateRequest.profil_update_id,
+        view: view,
+        data: data,
+        withFiles: withFiles,
+        topic: updateRequest.topic,
+        files: files,
+      };
+
+      //? adds the status information if the profil update request was rejected or accepted
+      if (updateRequest.status !== "pending") {
+        content["status"] = updateRequest.status;
+        content["status_message"] = updateRequest.status_message;
+        content["status_timestamp"] = updateRequest.status_timestamp;
+      }
+
+      //? only show the popup if also the right content is available
+      if (content) {
+        EditProfil.popup({
+          value: content,
+        })
+          .then((res) => {
+            if (res === true) {
+              this.$emit("fetchUpdates");
+            }
+          })
+          .catch((e) => {
+            // Wenn der User das Modal abbricht ohne Änderungen
+          });
+      }
     },
-    computed:{
-        
-    },
-    template:`
+  },
+  created() {},
+  computed: {},
+  template: `
    
     <div  class="card text-nowrap" >
                       <div class="card-header">
@@ -177,5 +171,5 @@ export default {
     </div>
 
     
-    `
-};
\ No newline at end of file
+    `,
+};
diff --git a/public/js/components/Cis/Profil/ProfilComponents/Status.js b/public/js/components/Cis/Profil/ProfilComponents/Status.js
index 535252ec2..2eebbf8fa 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/Status.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/Status.js
@@ -2,42 +2,38 @@ import Adresse from "./Adresse.js";
 import Kontakt from "./Kontakt.js";
 
 export default {
-    components:{
-        Adresse,
-        Kontakt,
+  components: {
+    Adresse,
+    Kontakt,
+  },
+  data() {
+    return {};
+  },
+  computed: {
+    getComponentView: function () {
+      let title = this.topic.toLowerCase();
+      if (title.includes("adressen")) return "Adresse";
+      else if (title.includes("kontakte")) return "Kontakt";
+      else return "text_input";
     },
-    data(){
-        return {
-
-        }
+    cardHeader: function () {
+      let title = this.topic.toLowerCase();
+      if (title.includes("delete")) return "Delete";
+      else if (title.includes("add")) return "Add";
+      else return "Update";
     },
-    computed:{
-        getComponentView: function(){
-            let title = this.topic.toLowerCase();
-            if(title.includes("adressen")) return "Adresse";
-            else if(title.includes("kontakte"))return "Kontakt";
-            else return "text_input";
-            
-        },
-        cardHeader: function(){
-            let title = this.topic.toLowerCase();
-            if(title.includes("delete")) return "Delete";
-            else if(title.includes("add")) return "Add";
-            else return "Update";
-        }
-    },
-    props:{
-        data:{type:Object},
-        view:{type:String},
-        status:{type:String},
-        status_message:{type:String},
-        status_timestamp:{type:String},
-        updateID:{type:Number},
-        topic:{type:String},
-    },
-    created(){
-
-    },template:`
+  },
+  props: {
+    data: { type: Object },
+    view: { type: String },
+    status: { type: String },
+    status_message: { type: String },
+    status_timestamp: { type: String },
+    updateID: { type: Number },
+    topic: { type: String },
+  },
+  created() {},
+  template: `
     <div class="row">
 
     <div class="col">
@@ -86,5 +82,4 @@ export default {
     </div>
     </div>
     `,
-
-}
\ No newline at end of file
+};
diff --git a/public/js/components/Cis/Profil/ProfilComponents/TextInputDokument.js b/public/js/components/Cis/Profil/ProfilComponents/TextInputDokument.js
index 257c4c39f..5f5ca9375 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/TextInputDokument.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/TextInputDokument.js
@@ -1,89 +1,86 @@
 import Dms from "../../../Form/Upload/Dms.js";
 
-
 export default {
-    data(){
-        return {
-            dmsData:[],
-            originalValue:null,
-            originalFiles:null,
-        }
+  data() {
+    return {
+      dmsData: [],
+      originalValue: null,
+      originalFiles: null,
+    };
+  },
+  components: {
+    Dms,
+  },
+  props: {
+    data: {
+      type: Object,
     },
-    components:{
-        Dms,
+    withFiles: {
+      type: Boolean,
+      default: false,
     },
-    props:{
-       
-        data:{
-            type:Object,
-        },
-        withFiles:{
-            type:Boolean,
-            default:false,
-        },
-        files:{
-            type:FileList,
-        },
-        updateID:{
-            type:Boolean,
-        }
+    files: {
+      type: FileList,
     },
-    computed: {
-        isChanged: function(){
-            //? controls whether the user is allowed to send the profil update or not
-            if(this.withFiles && !this.dmsData.length) {return false;}     
-            return JSON.stringify(this.data) !== Vue.toRaw(this.originalValue);
-            
-        }
+    updateID: {
+      type: Boolean,
+    },
+  },
+  computed: {
+    isChanged: function () {
+      //? controls whether the user is allowed to send the profil update or not
+      if (this.withFiles && !this.dmsData.length) {
+        return false;
+      }
+      return JSON.stringify(this.data) !== Vue.toRaw(this.originalValue);
+    },
+  },
+  emits: ["profilUpdate"],
+  watch: {
+    //? watcher to trigger the event emit when a file was uploaded or removed
+    dmsData(value) {
+      this.emitChanges();
+    },
+  },
+  methods: {
+    emitChanges: function () {
+      if (this.updateID || this.isChanged) {
+        this.$emit(
+          "profilUpdate",
+          this.withFiles
+            ? { value: this.data.value, files: this.dmsData }
+            : { value: this.data.value }
+        );
+      } else {
+        this.$emit("profilUpdate", null);
+      }
+    },
+  },
+  mounted() {
+    this.originalValue = JSON.stringify(this.data);
 
-    },
-    emits:["profilUpdate"],
-    watch: {
-        //? watcher to trigger the event emit when a file was uploaded or removed
-        dmsData(value) {
-                this.emitChanges();
-                
-        }
-      },
-    methods:{
-        
-        emitChanges: function(){
-            if(this.updateID || this.isChanged){
-                
-                this.$emit('profilUpdate', this.withFiles?{value:this.data.value, files:this.dmsData}:{value:this.data.value});
-            }else{
-                
-                this.$emit('profilUpdate',null);
-            }  
-        },
-        
-    },
-    mounted(){
-        
-        this.originalValue = JSON.stringify(this.data);
-        
+    if (this.files) {
+      this.dmsData = this.files;
 
-        if(this.files){
-            this.dmsData = this.files;
+      for (let i = 0; i < this.dmsData.length; i++) {
+        console.log("here", this.dmsData[i]);
+      }
 
-            for(let i=0; i < this.dmsData.length; i++){
-                console.log("here",this.dmsData[i]);
-            }
-            
-            this.originalFiles=null;
-        }
-        
-    },
-    template:`
+      this.originalFiles = null;
+    }
+  },
+  template: `
    
+    <p style="opacity:0.8" class="ms-2" v-if="withFiles && !updateID">Please update your {{data.titel}} and upload the corresponding Document for proof</p>
+
     <div class="form-underline">
     <div class="form-underline-titel">{{data.titel?data.titel:"titel"}}</div>
-
-    <input  class="form-control" @input="emitChanges"  v-model="data.value" :placeholder="data.value">
+    
+    <input  class="mb-2 form-control" @input="emitChanges"  v-model="data.value" :placeholder="data.value">
   
     
     <dms ref="update" v-if="withFiles" id="files" :noList="false" :multiple="true" v-model="dmsData"  ></dms>
 
     </div>
     `,
-}
\ No newline at end of file
+};
diff --git a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
index e5e5e59bb..3c808b913 100755
--- a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
+++ b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
@@ -3,23 +3,21 @@ import Alert from "../../Bootstrap/Alert.js";
 import Kontakt from "../Profil/ProfilComponents/Kontakt.js";
 import Adresse from "../Profil/ProfilComponents/Adresse.js";
 
-
 export default {
   components: {
     BsModal,
     Alert,
     Kontakt,
     Adresse,
-   
   },
   mixins: [BsModal],
   props: {
-    title:{
-        type:String,
-        default:"Profil Update Request"
+    title: {
+      type: String,
+      default: "Profil Update Request",
     },
     value: {
-        type:Object,
+      type: Object,
     },
     /*
      * NOTE(chris):
@@ -34,73 +32,71 @@ export default {
     onShownBsModal: Function,
   },
   data() {
-    return {      
+    return {
       data: this.value,
       //? result is returned from the Promise when the modal is closed
       result: false,
       info: null,
-    }
+    };
   },
 
   methods: {
-    acceptRequest: function(){
-      
-      Vue.$fhcapi.ProfilUpdate.acceptProfilRequest(this.data).then(res =>{
-        console.log("res",res);
-        console.log("res.data",res.data);
+    acceptRequest: function () {
+      Vue.$fhcapi.ProfilUpdate.acceptProfilRequest(this.data).then((res) => {
+        console.log("res", res);
+        console.log("res.data", res.data);
         this.result = true;
-      })
+      });
       this.hide();
     },
 
-    denyRequest: function(){
+    denyRequest: function () {
       console.log(this.data.profil_update_id);
-      Vue.$fhcapi.ProfilUpdate.denyProfilRequest(this.data).then(res =>{
-        console.log("res",res);
-        console.log("res.data",res.data);
+      Vue.$fhcapi.ProfilUpdate.denyProfilRequest(this.data).then((res) => {
+        console.log("res", res);
+        console.log("res.data", res.data);
         this.result = true;
-      })
+      });
       this.hide();
     },
-    
-    submitProfilChange(){
-        //TODO: check if the updated value is different from the original value before submitting the request
-       if(false){
 
-        //? inserts new row in public.tbl_cis_profil_update 
+    submitProfilChange() {
+      //TODO: check if the updated value is different from the original value before submitting the request
+      if (false) {
+        //? inserts new row in public.tbl_cis_profil_update
         //* calls the update api call if an update field is present in the data that was passed to the module
-        Vue.$fhcapi.UserData[this.editData.update?'updateProfilRequest':'insertProfilRequest'](this.topic,this.profilUpdate).then((res)=>{
-          
-          if(res.data.error == 0){
-            this.result= true;
+        Vue.$fhcapi.UserData[
+          this.editData.update ? "updateProfilRequest" : "insertProfilRequest"
+        ](this.topic, this.profilUpdate).then((res) => {
+          if (res.data.error == 0) {
+            this.result = true;
             this.hide();
-            Alert.popup("Ihre Anfrage wurde erfolgreich gesendet. Bitte warten Sie, während sich das Team um Ihre Anfrage kümmert.");
-          }else{
-            this.result= false;
+            Alert.popup(
+              "Ihre Anfrage wurde erfolgreich gesendet. Bitte warten Sie, während sich das Team um Ihre Anfrage kümmert."
+            );
+          } else {
+            this.result = false;
             this.hide();
-            Alert.popup("Ein Fehler ist aufgetreten: "+ JSON.stringify(res.data.retval));
-          } 
-         
+            Alert.popup(
+              "Ein Fehler ist aufgetreten: " + JSON.stringify(res.data.retval)
+            );
+          }
         });
-    }
+      }
     },
   },
   computed: {
-    getComponentView: function(){
-        
-        if(this.data.topic.toLowerCase().includes("kontakt")){
-            return "kontakt";
-        }else if (this.data.topic.toLowerCase().includes("adresse")){
-            return "adresse";
-        }else{
-            return "text_input";
-        }
+    getComponentView: function () {
+      if (this.data.topic.toLowerCase().includes("kontakt")) {
+        return "kontakt";
+      } else if (this.data.topic.toLowerCase().includes("adresse")) {
+        return "adresse";
+      } else {
+        return "text_input";
+      }
     },
   },
-  created() {
-   
-
-  },
+  created() {},
   mounted() {
     this.modal = this.$refs.modalContainer.modal;
   },
diff --git a/public/js/components/Form/Upload/Dms.js b/public/js/components/Form/Upload/Dms.js
index 0416436db..3184a7e0b 100755
--- a/public/js/components/Form/Upload/Dms.js
+++ b/public/js/components/Form/Upload/Dms.js
@@ -73,7 +73,6 @@ export default {
 	},
 	template: `
 	<div class="form-upload-dms">
-	<pre>{{JSON.stringify(Array.from(modelValue).map(item => stringifyFile(item)),null,2)}}</pre>
 		<input ref="upload" class="form-control" :class="inputClass" :id="id" :name="name" :multiple="multiple" type="file" @change="addFiles">
 		<ul v-if="modelValue.length && multiple && !noList" class="list-unstyled m-0">
 			<li v-for="(file, index) in modelValue" :key="index" class="d-flex mx-1 mt-1 align-items-center">

From d813f55a9be775d355b32b571c784ad628605c61 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 1 Feb 2024 14:08:55 +0100
Subject: [PATCH 0369/1461] makes it possible to display documents when
 reviewing profil update requests

---
 application/controllers/Cis/Profil.php        | 17 +++++++++-
 application/controllers/Cis/ProfilUpdate.php  | 15 ++++++++-
 public/js/apps/api/userdata.js                |  9 ++++++
 public/js/components/Cis/Profil/EditProfil.js | 31 ++++++++++++++-----
 .../Cis/Profil/ProfilComponents/Status.js     | 13 ++++++--
 .../Cis/ProfilUpdate/AcceptDenyUpdate.js      | 11 +++++--
 6 files changed, 80 insertions(+), 16 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index 8e40c3f29..eae64452f 100755
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -26,7 +26,8 @@ class Profil extends Auth_Controller
 			'selectProfilRequest' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'insertFile' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'getProfilRequestFiles' => ['student/anrechnung_beantragen:r', 'user:r'],
-			
+			'deleteOldVersionFiles' => ['student/anrechnung_beantragen:r', 'user:r'],
+						
 		]);
 		$this->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
 		$this->load->model('crm/Student_model', 'StudentModel');
@@ -38,6 +39,8 @@ class Profil extends Auth_Controller
 		$this->load->model('ressource/Betriebsmittelperson_model', 'BetriebsmittelpersonModel');
 		$this->load->model('person/Kontakt_model', 'KontaktModel');
 		$this->load->model('person/Profil_change_model', 'ProfilChangeModel');
+		$this->load->model('content/DmsVersion_model', 'DmsVersionModel');
+		
 
 		//? put the uid and pid inside the controller to reuse in controller
 		$this->uid = getAuthUID();
@@ -114,6 +117,18 @@ class Profil extends Auth_Controller
 	}
 
 
+	public function deleteOldVersionFiles(){
+		//? table dms_version has a composite primary key with dms_id and dms_version
+		$file_array = json_decode($this->input->raw_input_stream);
+		$res =[];
+		foreach($file_array as $value){
+			
+			array_push($res, $this->DmsVersionModel->delete([$value,0]));
+		}
+		echo json_encode($res);
+	}
+
+
 	public function selectProfilRequest(){
 		$_GET = json_decode($this->input->raw_input_stream, true);
 		$uid = $this->input->get('uid');
diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
index 24db74ddd..5e6d1df18 100755
--- a/application/controllers/Cis/ProfilUpdate.php
+++ b/application/controllers/Cis/ProfilUpdate.php
@@ -15,6 +15,7 @@ class ProfilUpdate extends Auth_Controller
 			'getAllRequests' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'acceptProfilRequest'=>['user:r'],
 			'denyProfilRequest'=>['user:r'],
+			'show'=>['user:r'],
 
 		]);
 		
@@ -31,6 +32,17 @@ class ProfilUpdate extends Auth_Controller
 		$this->load->view('Cis/ProfilUpdate');
 	}
 
+	public function show($dms_id){
+		$this->load->library('DmsLib');
+		//? downloads the file using the dms_id
+		$file = $this->dmslib->download($dms_id);
+		$file = hasData($file) ? getData($file) : null;
+		//? returns the downloaded file to the user
+		$res = $this->outputFile($file);
+
+		echo json_encode($res);
+	}
+
 	public function getAllRequests(){
 		$res = $this->ProfilChangeModel->getProfilUpdate();
 		$res = hasData($res)? getData($res) : null;
@@ -87,7 +99,8 @@ class ProfilUpdate extends Auth_Controller
 				case "titel": $topic ="titelpre"; break;
 				case "postnomen": $topic = "titelpost"; break;
 			}
-			$result = $this->PersonModel->update($personID,[$topic=>$requested_change]);
+			
+			$result = $this->PersonModel->update($personID,[$topic=>$requested_change["value"]]);
 			if(isError($result)){
 				echo json_encode(error("was not able to update Person Information: " . $topic . " with value : " . $requested_change));
 				return;
diff --git a/public/js/apps/api/userdata.js b/public/js/apps/api/userdata.js
index c924d7b10..cc8fb5e58 100755
--- a/public/js/apps/api/userdata.js
+++ b/public/js/apps/api/userdata.js
@@ -12,6 +12,15 @@ export default {
     });
   },
 
+  deleteOldVersionFiles: function (files) {
+    const url =
+      FHC_JS_DATA_STORAGE_OBJECT.app_root +
+      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+      `/Cis/Profil/deleteOldVersionFiles`;
+
+    return axios.post(url, files);
+  },
+
   getProfilRequestFiles: function (requestID) {
     const url =
       FHC_JS_DATA_STORAGE_OBJECT.app_root +
diff --git a/public/js/components/Cis/Profil/EditProfil.js b/public/js/components/Cis/Profil/EditProfil.js
index b8782f5ef..8f5a2d824 100755
--- a/public/js/components/Cis/Profil/EditProfil.js
+++ b/public/js/components/Cis/Profil/EditProfil.js
@@ -44,7 +44,7 @@ export default {
       if (this.topic && this.profilUpdate) {
         if (this.profilUpdate.files) {
           const fileIDs = await this.uploadFiles(this.profilUpdate.files);
-
+         
           if (fileIDs) {
             this.profilUpdate.files = fileIDs;
             console.log("here is the update", this.profilUpdate);
@@ -95,12 +95,26 @@ export default {
         ).then((res) => {
           return res.data;
         });
-        updatedFiles = [...existingFiles.filter((file) => {
-          for(let j=0; j<files.length; j++) {
-            if (file.name === files[j].name)
-              return true;
-          }
-        })];
+
+        let filesToKeep = [];
+        let filesToDelete = [];
+        console.log(existingFiles);
+        console.log(files);
+        existingFiles.forEach((file) => {
+          Array.from(files).some((f) => f.name === file.name)
+            ? filesToKeep.push(file)
+            : filesToDelete.push(file.dms_id);
+        });
+        
+        //? only keeps the newest version of the documents and deletes the old versions in the database
+        Vue.$fhcapi.UserData.deleteOldVersionFiles(
+          filesToDelete
+        ).then((res) => {
+          console.log(res);
+        });  
+       
+
+        updatedFiles = [...filesToKeep];
       }
 
       let formData = new FormData();
@@ -116,7 +130,8 @@ export default {
 
           updatedFiles = updatedFiles.concat(
             res.data?.map((file) => {
-              return { dms_id: file.dms_id, name: file.client_name };
+              console.log("here are the files:",file);
+              return { dms_id: file.dms_id, name: file.client_name};
             })
           );
         })
diff --git a/public/js/components/Cis/Profil/ProfilComponents/Status.js b/public/js/components/Cis/Profil/ProfilComponents/Status.js
index 2eebbf8fa..3107ce8dc 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/Status.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/Status.js
@@ -9,6 +9,13 @@ export default {
   data() {
     return {};
   },
+  methods:{
+    getDocumentLink: function(dms_id){
+      return FHC_JS_DATA_STORAGE_OBJECT.app_root +
+          FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+          `/Cis/ProfilUpdate/show/${dms_id}`;
+    }
+  },
   computed: {
     getComponentView: function () {
       let title = this.topic.toLowerCase();
@@ -72,9 +79,9 @@ export default {
     <div class="form-underline-titel">{{topic}}</div>
     <span  class="form-underline-content">{{data.value}} </span>
     </div>
-    <div class="ms-2">
-    <p>files:</p>
-    <p v-for="file in data.files">{{file}}</p>
+    <div v-if="data.files?.length" class="ms-2">
+    
+    <a target="_blank" :href="getDocumentLink(file.dms_id)" v-for="file in data.files">{{file.name}}</a>
     </div>
     </template>
     <component v-else :is="getComponentView" :data="data"></component>
diff --git a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
index 3c808b913..ee0b48241 100755
--- a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
+++ b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
@@ -41,6 +41,11 @@ export default {
   },
 
   methods: {
+    getDocumentLink: function(dms_id){
+      return FHC_JS_DATA_STORAGE_OBJECT.app_root +
+          FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+          `/Cis/ProfilUpdate/show/${dms_id}`;
+    },
     acceptRequest: function () {
       Vue.$fhcapi.ProfilUpdate.acceptProfilRequest(this.data).then((res) => {
         console.log("res", res);
@@ -183,9 +188,9 @@ export default {
 
       <span  class="form-underline-content" >{{data.requested_change.value}}</span>
     </div>
-    <div class="ms-2">
-    <p>files:</p>
-    <p v-for="file in data.requested_change.files">{{file}}</p>
+    <div v-if="data.requested_change.files.length" class="ms-2">
+    <!--<p>files:</p>-->
+    <a  v-for="file in data.requested_change.files" target="_blank" :href="getDocumentLink(file.dms_id)" >{{file.name}}</a>
     </div>
     </template>
 

From e5182a20ac7a51eeb80db798f0c8cd146dcd02ad Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 1 Feb 2024 15:27:24 +0100
Subject: [PATCH 0370/1461] adds a select to the profilUpdateRequests to change
 display between only pending and all requests

---
 application/controllers/Cis/ProfilUpdate.php | 10 ++++
 public/js/apps/Cis/ProfilUpdateRequests.js   | 53 +++++++++++++++++---
 2 files changed, 57 insertions(+), 6 deletions(-)

diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
index 5e6d1df18..c075221b0 100755
--- a/application/controllers/Cis/ProfilUpdate.php
+++ b/application/controllers/Cis/ProfilUpdate.php
@@ -16,6 +16,7 @@ class ProfilUpdate extends Auth_Controller
 			'acceptProfilRequest'=>['user:r'],
 			'denyProfilRequest'=>['user:r'],
 			'show'=>['user:r'],
+			'getPendingRequests'=>['user:r'], 
 
 		]);
 		
@@ -49,6 +50,15 @@ class ProfilUpdate extends Auth_Controller
 		echo json_encode($res);
 	}
 
+	public function getPendingRequests(){
+		$res = $this->ProfilChangeModel->loadWhere(["status"=>"pending"]);
+		
+		$res = hasData($res)? getData($res) : [];
+		
+		
+		echo json_encode($res);
+	}
+
 	public function acceptProfilRequest(){
 
 		$_POST = json_decode($this->input->raw_input_stream,true);
diff --git a/public/js/apps/Cis/ProfilUpdateRequests.js b/public/js/apps/Cis/ProfilUpdateRequests.js
index 58287d27f..7ce7e130e 100755
--- a/public/js/apps/Cis/ProfilUpdateRequests.js
+++ b/public/js/apps/Cis/ProfilUpdateRequests.js
@@ -9,11 +9,21 @@ const app = Vue.createApp({
   },
   data() {
     return {
+      showAll: false,
       profil_updates_table_options: {
-        ajaxURL:
-          FHC_JS_DATA_STORAGE_OBJECT.app_root +
-          FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-          "/Cis/ProfilUpdate/getAllRequests",
+        ajaxURL:FHC_JS_DATA_STORAGE_OBJECT.app_root +
+        FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+        `/Cis/ProfilUpdate/`,
+
+        ajaxURLGenerator: (url,config,params)=>{
+          //? this function needs to be an array function in order to access the this properties of the Vue component
+          if(this.showAll){
+            return url +"getAllRequests";
+          }else{
+            return url +"getPendingRequests";
+          }
+          
+        },
         height: 600,
         layout: "fitColumns",
 
@@ -106,13 +116,44 @@ const app = Vue.createApp({
       },
     };
   },
-  computed: {},
-  methods: {},
+  computed: {
+    getFetchUrl: function(){
+      let url = FHC_JS_DATA_STORAGE_OBJECT.app_root +
+      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+      `/Cis/ProfilUpdate/`;
+      if(this.showAll){
+        url+"getAllRequests";
+      }else{
+        url+"getPendingRequests";
+      }
+      return url;
+    }
+  },
+  methods: {
+    updateData: function(){
+      
+      this.$refs.UpdatesTable.tabulator.setData(); 
+       /* 
+        console.log(this.profil_updates_table_options.ajaxURL);
+       */
+    }
+  },
   created() {},
   mounted() {},
   template: `
     <div>
     
+    <div  class="form-underline flex-fill ">
+      <div class="form-underline-titel">Show Profil Requests</div>
+
+      <select class="mb-2 " v-model="showAll" @change="updateData" class="form-select" aria-label="Profil updates display selection">
+        <option :selected="true" :value="false">Only Pending Requests</option>
+        <option :value="true">All Requests</option>
+      </select>
+  
+    </div>
+
+ 
     
     <core-filter-cmpt title="Update Requests"  ref="UpdatesTable" :tabulator-options="profil_updates_table_options" tableOnly :sideMenu="false" />
 

From c88da53c0314d2d6aabeedbd78f93cd26084b765 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 2 Feb 2024 09:49:07 +0100
Subject: [PATCH 0371/1461] only allows to user to send profil updates when the
 input doesn't correspond the original values

---
 .../ProfilComponents/TextInputDokument.js     | 47 ++++++++++++-------
 1 file changed, 30 insertions(+), 17 deletions(-)

diff --git a/public/js/components/Cis/Profil/ProfilComponents/TextInputDokument.js b/public/js/components/Cis/Profil/ProfilComponents/TextInputDokument.js
index 5f5ca9375..3b79ee2db 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/TextInputDokument.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/TextInputDokument.js
@@ -5,7 +5,6 @@ export default {
     return {
       dmsData: [],
       originalValue: null,
-      originalFiles: null,
     };
   },
   components: {
@@ -20,19 +19,40 @@ export default {
       default: false,
     },
     files: {
-      type: FileList,
+      type: Array,
     },
     updateID: {
       type: Boolean,
     },
   },
   computed: {
-    isChanged: function () {
-      //? controls whether the user is allowed to send the profil update or not
-      if (this.withFiles && !this.dmsData.length) {
-        return false;
+    didFilesChange: function () {
+      let res = false;
+      //? case in which the profilRequest has already associated files 
+      if(this.files){ 
+        Array.from(this.dmsData).forEach((file) => {
+          if (this.files.some((f) => f.name !== file.name)) {
+            res = true;
+          }
+        });
+        return !(this.dmsData.length == this.files.length) || res;
       }
-      return JSON.stringify(this.data) !== Vue.toRaw(this.originalValue);
+      //? case in which the user creates a new profilRequest
+      else{  
+        return Array.from(this.dmsData).length? true:false;
+      }
+    },
+    didDataChange: function(){
+      return JSON.stringify(this.data) !== this.originalValue;
+    },
+    isChanged: function () {
+      if (this.withFiles) {
+        if(this.updateID){
+          return this.didDataChange || this.didFilesChange;
+        }
+        return this.didDataChange && this.didFilesChange;
+      }
+      return this.didDataChange
     },
   },
   emits: ["profilUpdate"],
@@ -44,7 +64,7 @@ export default {
   },
   methods: {
     emitChanges: function () {
-      if (this.updateID || this.isChanged) {
+      if (this.isChanged) {
         this.$emit(
           "profilUpdate",
           this.withFiles
@@ -57,20 +77,13 @@ export default {
     },
   },
   mounted() {
-    this.originalValue = JSON.stringify(this.data);
+    this.originalValue = JSON.stringify(Vue.toRaw(this.data));
 
     if (this.files) {
       this.dmsData = this.files;
-
-      for (let i = 0; i < this.dmsData.length; i++) {
-        console.log("here", this.dmsData[i]);
-      }
-
-      this.originalFiles = null;
     }
   },
   template: `
-   
     <p style="opacity:0.8" class="ms-2" v-if="withFiles && !updateID">Please update your {{data.titel}} and upload the corresponding Document for proof</p>
 
     <div class="form-underline">
@@ -79,7 +92,7 @@ export default {
     <input  class="mb-2 form-control" @input="emitChanges"  v-model="data.value" :placeholder="data.value">
   
     
-    <dms ref="update" v-if="withFiles" id="files" :noList="false" :multiple="true" v-model="dmsData"  ></dms>
+    <dms ref="update" v-if="withFiles" id="files" :noList="false" :multiple="true" v-model="dmsData" @update:model-value="didFilesChange"  ></dms>
 
     </div>
     `,

From 2fcbbcac840c6cfd35a98d504bc74e7b5b3d749e Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 2 Feb 2024 15:10:46 +0100
Subject: [PATCH 0372/1461] refactor NotizComponent

---
 .../controllers/components/stv/Notiz.php      |  13 +-
 public/js/components/Notiz/NotizComponent.js  | 526 ++++++++++++++++++
 .../Notiz/{Notiz.js => NotizForm.js}          |   1 +
 .../Studentenverwaltung/Details/Notizen.js    | 361 +-----------
 4 files changed, 544 insertions(+), 357 deletions(-)
 create mode 100644 public/js/components/Notiz/NotizComponent.js
 rename public/js/components/Notiz/{Notiz.js => NotizForm.js} (99%)

diff --git a/application/controllers/components/stv/Notiz.php b/application/controllers/components/stv/Notiz.php
index f370e8abe..ddf10b8a9 100644
--- a/application/controllers/components/stv/Notiz.php
+++ b/application/controllers/components/stv/Notiz.php
@@ -127,11 +127,11 @@ class Notiz extends FHC_Controller
 		$titel = $this->input->post('titel');
 		$text = $this->input->post('text');
 		$erledigt = $this->input->post('erledigt');
-		$verfasser_uid = isset($_POST['verfasser_uid']) ? $_POST['verfasser_uid'] : $uid;
+		$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('von');
-		$ende = $this->input->post('bis');
+		$start = $this->input->post('Von');
+		$ende = $this->input->post('Bis');
 
 		//Speichern der Notiz und Notizzuordnung inkl Prüfung ob valid type
 		$result = $this->NotizModel->addNotizForType($type, $id, $titel, $text, $uid, $start, $ende, $erledigt, $verfasser_uid, $bearbeiter_uid);
@@ -220,12 +220,12 @@ class Notiz extends FHC_Controller
 		$uid = getAuthUID();
 		$titel = $this->input->post('titel');
 		$text = $this->input->post('text');
-		$verfasser_uid = isset($_POST['verfasser_uid']) ? $_POST['verfasser_uid'] : null;
+		$verfasser_uid = $this->input->post('verfasser');
 		$bearbeiter_uid = isset($_POST['bearbeiter']) ? $_POST['bearbeiter'] : $uid;
 		$erledigt = $this->input->post('erledigt');
 		//$type = $this->input->post('typeId'); //soll auch dieser geändert werden können?
-		$start = $this->input->post('von');
-		$ende = $this->input->post('bis');
+		$start = $this->input->post('Von');
+		$ende = $this->input->post('Bis');
 
 		$result = $this->NotizModel->update(
 			[
@@ -252,6 +252,7 @@ class Notiz extends FHC_Controller
 		//update(1) laden aller bereits mit dieser notiz_id verknüpften DMS-Einträge
 		$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
 		$this->NotizdokumentModel->addJoin('campus.tbl_dms_version', 'dms_id');
+		$dms_uploaded = null;
 
 		$result = $this->NotizdokumentModel->loadWhere(array('notiz_id' => $notiz_id));
 		if (isError($result))
diff --git a/public/js/components/Notiz/NotizComponent.js b/public/js/components/Notiz/NotizComponent.js
new file mode 100644
index 000000000..5f7ea9993
--- /dev/null
+++ b/public/js/components/Notiz/NotizComponent.js
@@ -0,0 +1,526 @@
+import VueDatePicker from '../vueDatepicker.js.php';
+import PvAutoComplete from "../../../../index.ci.php/public/js/components/primevue/autocomplete/autocomplete.esm.min.js";
+import FormUploadDms from '../Form/Upload/Dms.js';
+import {CoreRESTClient} from "../../RESTClient";
+import {CoreFilterCmpt} from "../filter/Filter.js";
+import BsModal from "../Bootstrap/Modal";
+
+
+export default {
+	components: {
+		CoreFilterCmpt,
+		VueDatePicker,
+		PvAutoComplete,
+		FormUploadDms,
+		BsModal
+	},
+	props: [
+		'typeId',
+		'id',
+		'showErweitert',
+		'showDocument'
+		],
+	data(){
+		return {
+			tabulatorOptions: {
+				ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Notiz/getNotizen/' + this.id + '/' + this.typeId),
+				columns: [
+					{title: "Titel", field: "titel"},
+					{title: "Text", field: "text_stripped", width: 250},
+					{title:  "VerfasserIn", field: "verfasser_uid"},
+					{title: "BearbeiterIn", field: "bearbeiter_uid", visible: false},
+					{title: "Start", field: "start", visible: false},
+					{title: "Ende", field: "ende", visible: false},
+					{title: "Dokumente", field: "countdoc"},
+					{title: "Erledigt", field: "erledigt", visible: false},
+					{title: "Notiz_id", field: "notiz_id", visible: false},
+					{title: "Notizzuordnung_id", field: "notizzuordnung_id", visible: false},
+					{title: "letzte Änderung", field: "lastupdate", visible: false},
+					{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.addEventListener('click', (event) =>
+								this.actionEditNotiz(cell.getData().notiz_id)
+							);
+							container.append(button);
+
+							button = document.createElement('button');
+							button.className = 'btn btn-outline-secondary btn-action';
+							button.innerHTML = '<i class="fa fa-xmark"></i>';
+							button.addEventListener('click', () =>
+								this.actionDeleteNotiz(cell.getData().notiz_id)
+							);
+							container.append(button);
+
+							return container;
+						},
+						frozen: true
+					}
+				],
+				layout: 'fitDataFill',
+				layoutColumnsOnNewData: false,
+				height: '250',
+				selectableRangeMode: 'click',
+				selectable: true,
+				index: 'notiz_id'
+			},
+			tabulatorEvents: [],
+			notizen: [],
+			multiupload: true,
+			mitarbeiter: [],
+			filteredMitarbeiter: [],
+			zwischenvar: '',
+			editorInitialized: false,
+			editor: null,
+			notizData: {
+				typeId: this.typeId,
+				titel: null,
+				statusNew: true,
+				text: null,
+				lastChange: null,
+				von: null,
+				bis: null,
+				document: null,
+				erledigt: false,
+				verfasser: null,
+				bearbeiter: null,
+				anhang: []
+			},
+		};
+	},
+	methods: {
+		actionDeleteNotiz(notiz_id){
+			this.loadNotiz(notiz_id).then(() => {
+				if(this.notizen.notiz_id) {
+					this.$refs.deleteNotizModal.show();
+				}
+			});
+		},
+		actionEditNotiz(notiz_id){
+			this.loadNotiz(notiz_id).then(() => {
+				console.log(this.notizen);
+				if(this.notizen.notiz_id) {
+					this.notizData.titel = this.notizen.titel;
+					this.notizData.statusNew = false;
+					this.notizData.text = this.notizen.text;
+					this.notizData.lastChange = this.notizen.lastupdate;
+					this.notizData.von = this.notizen.start;
+					this.notizData.bis = this.notizen.ende;
+					this.notizData.document = this.notizen.dms_id;
+					this.notizData.erledigt = this.notizen.erledigt;
+					this.notizData.verfasser = this.notizen.verfasser_uid; //todo(manu) better
+					this.notizData.intVerfasser = this.notizen.verfasser_uid;
+					this.notizData.intBearbeiter = this.notizen.bearbeiter_uid; //todo(manu) better
+					this.notizData.bearbeiter = this.notizen.bearbeiter_uid;
+				}
+			})
+				.then(() => {
+					if(this.notizen.dms_id){
+						console.log("loadEntries with " + this.notizen.notiz_id);
+						this.loadDocEntries(this.notizen.notiz_id);
+					}
+				});
+		},
+		actionNewNotiz(){
+			this.resetFormData();
+		},
+		addNewNotiz(notizData) {
+			const formData = new FormData();
+
+			formData.append('data', JSON.stringify(this.notizData));
+			Object.entries(this.notizData.anhang).forEach(([k, v]) => formData.append(k, v));
+			CoreRESTClient.post(
+				'components/stv/Notiz/addNewNotiz/' + this.id,
+				formData,
+				{ Headers: { "Content-Type": "multipart/form-data" } }
+			).then(response => {
+				if (!response.data.error) {
+					this.$fhcAlert.alertSuccess('Anlegen von neuer Notiz erfolgreich');
+					this.resetFormData();
+					this.reload();
+				} else {
+					const errorData = response.data.retval;
+					Object.entries(errorData).forEach(entry => {
+						const [key, value] = entry;
+						this.$fhcAlert.alertError(value);
+					});
+				}
+			}).catch(error => {
+				if (error.response) {
+					this.$fhcAlert.alertError(error.response.data);
+				}
+			}).finally(() => {
+				window.scrollTo(0, 0);
+			});
+		},
+		deleteNotiz(notiz_id){
+			CoreRESTClient.post('components/stv/Notiz/deleteNotiz/' + notiz_id)
+				.then(response => {
+					if (!response.data.error) {
+						this.$fhcAlert.alertSuccess('Löschen erfolgreich');
+						this.$refs.deleteNotizModal.hide();
+						this.reload();
+					} else {
+						this.$fhcAlert.alertError('Keine Notiz mit Id ' + notiz_id + ' gefunden');
+					}
+				}).catch(error => {
+				this.$fhcAlert.alertError('Fehler bei Löschroutine aufgetreten');
+			}).finally(()=> {
+				window.scrollTo(0, 0);
+			});
+		},
+		loadNotiz(notiz_id){
+			return CoreRESTClient.get(
+				'components/stv/Notiz/loadNotiz/' + notiz_id)
+				.then(
+					result => {
+						if(result.data.retval) {
+							this.notizen = result.data.retval;
+							//console.log(this.notizen);
+						}
+						else {
+							this.notizen = {};
+							this.$fhcAlert.alertError('Keine Notiz mit Id ' + notiz_id + ' gefunden');
+						}
+						return result;
+					}
+				);
+		},
+		loadDocEntries(notiz_id){
+			return CoreRESTClient.get('components/stv/Notiz/loadDokumente/' + notiz_id)
+				.then(
+					result => {
+						if(result.data.retval) {
+							this.notizData.anhang = result.data.retval;
+							console.log(this.notizData.anhang);
+						}
+						else
+						{
+							this.notizData.anhang = {};
+							this.$fhcAlert.alertError('Kein Dokumenteneintrag mit NotizId ' + notiz_id + ' gefunden');
+						}
+						return result;
+					}
+				);
+		},
+		updateNotiz(notiz_id){
+			const formData = new FormData();
+			formData.append('data', JSON.stringify(this.notizData));
+			Object.entries(this.notizData.anhang).forEach(([k, v]) => formData.append(k, v));
+
+			CoreRESTClient.post(
+				'components/stv/Notiz/updateNotiz/' + notiz_id,
+				formData,
+				{ Headers: { "Content-Type": "multipart/form-data" } }
+			).then(response => {
+				if (!response.data.error) {
+					this.$fhcAlert.alertSuccess('Update von Notiz erfolgreich');
+					this.resetFormData();
+					this.reload();
+				} else {
+					const errorData = response.data.retval;
+					Object.entries(errorData).forEach(entry => {
+						const [key, value] = entry;
+						this.$fhcAlert.alertError(value);
+					});
+				}
+			}).catch(error => {
+				this.$fhcAlert.alertError('Fehler bei Updateroutine aufgetreten');
+			}).finally(() => {
+				window.scrollTo(0, 0);
+			});
+		},
+		reload(){
+			this.$refs.table.reloadTable();
+		},
+		resetFormData() {
+			this.$refs.formc.reset();
+			this.notizData = {
+				typeId: this.typeId,
+				titel: null,
+				statusNew: true,
+				text: null,
+				lastChange: null,
+				von: null,
+				bis: null,
+				document: null,
+				erledigt: false,
+				verfasser: this.uid,
+				bearbeiter: null,
+				anhang: []
+			};
+		},
+		getUid(){
+			CoreRESTClient
+				.get('components/stv/Notiz/getUid')
+				.then(result => {
+					if(result.data.retval) {
+						this.notizData.intVerfasser = result.data.retval;
+					}
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		search(event) {
+			return CoreRESTClient
+				.get('components/stv/Notiz/getMitarbeiter/' + event.query)
+				.then(result => {
+					this.filteredMitarbeiter = CoreRESTClient.getData(result.data);
+				});
+		},
+/*		initTinyMCE() {
+
+			const vm = this;
+			tinymce.init({
+				target: this.$refs.editor, //Important: not selector: to enable multiple import of component
+				//height: 800,
+				//plugins: ['lists'],
+				//toolbar: " blocks | bold italic underline | alignleft aligncenter alignright alignjustify",
+				toolbar: 'styleselect | bold italic underline | alignleft aligncenter alignright alignjustify',
+				style_formats: [
+					{ title: 'Blocks', block: 'div' },
+					{ title: 'Paragraph', block: 'p' },
+					{ title: 'Heading 1', block: 'h1' },
+					{ title: 'Heading 2', block: 'h2' },
+					{ title: 'Heading 3', block: 'h3' },
+					{ title: 'Heading 4', block: 'h4' },
+					{ title: 'Heading 5', block: 'h5' },
+					{ title: 'Heading 6', block: 'h6' },
+				],
+				autoresize_bottom_margin: 16,
+
+				setup: (editor) => {
+					vm.editor = editor;
+
+					editor.on('input', () => {
+						const newContent = editor.getContent();
+						vm.intText =  newContent;
+					});
+				},
+			});
+		},*/
+	},
+	created(){
+		this.getUid();
+	},
+	async mounted() {
+		await this.$p.loadCategory(['notiz','global']);
+
+		let cm = this.$refs.table.tabulator.columnManager;
+
+		cm.getColumnByField('verfasser_uid').component.updateDefinition({
+			title: this.$p.t('notiz', 'verfasser')
+		});
+		cm.getColumnByField('titel').component.updateDefinition({
+			title: this.$p.t('global', 'titel')
+		});
+		cm.getColumnByField('text_stripped').component.updateDefinition({
+			title: this.$p.t('global', 'text')
+		});
+		cm.getColumnByField('bearbeiter_uid').component.updateDefinition({
+			title: this.$p.t('notiz', 'bearbeiter')
+		});
+		cm.getColumnByField('start').component.updateDefinition({
+			title: this.$p.t('global', 'gueltigVon')
+		});
+		cm.getColumnByField('ende').component.updateDefinition({
+			title: this.$p.t('global', 'gueltigBis')
+		});
+		cm.getColumnByField('countdoc').component.updateDefinition({
+			title: this.$p.t('notiz', 'document')
+		});
+		cm.getColumnByField('erledigt').component.updateDefinition({
+			title: this.$p.t('notiz', 'erledigt')
+		});
+		cm.getColumnByField('lastupdate').component.updateDefinition({
+			title: this.$p.t('notiz', 'letzte_aenderung')
+		});
+	},
+/*	mounted() {
+		this.initTinyMCE();
+	},*/
+/*	watch: {
+		intText: function(newVal) {
+			const tinymcsVal = this.editor.getContent();
+
+			if (tinymcsVal != newVal) {
+				//Inhalt des Editors aktualisieren
+				this.editor.setContent(newVal);
+			}
+		},
+	},*/
+	beforeDestroy() {
+		this.editor.destroy();
+	},
+	watch: {
+		//Watcher für autocomplete Bearbeiter und Verfasser
+		'notizData.intBearbeiter': {
+			handler(newVal) {
+				if(typeof newVal === 'object') {
+					this.notizData.bearbeiter = newVal.mitarbeiter_uid;
+				}
+			},
+			deep: true
+		},
+		'notizData.intVerfasser': {
+			handler(newVal) {
+				if(typeof newVal === 'object') {
+					this.notizData.verfasser = newVal.mitarbeiter_uid;
+				}
+			},
+			deep: true
+		}
+	},
+	template: `
+	<div class="notiz-notiz">
+
+		<!--Modal: deleteNotizModal-->
+		<BsModal ref="deleteNotizModal">
+			<template #title>Notiz löschen</template>
+			<template #default>
+				<p>Notiz wirklich löschen?</p>
+			</template>
+			<template #footer>
+				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">Abbrechen</button>
+				<button ref="Close" type="button" class="btn btn-primary" @click="deleteNotiz(notizen.notiz_id)">OK</button>
+			</template>
+		</BsModal>
+		
+		<core-filter-cmpt
+			ref="table"
+			:tabulator-options="tabulatorOptions"
+			:tabulator-events="tabulatorEvents"
+			table-only
+			:side-menu="false"
+			reload
+			new-btn-show
+			new-btn-label="Neu"
+			@click:new="actionNewNotiz"
+			>
+		</core-filter-cmpt>
+		<br><br>
+	
+		<form ref="formc" @submit.prevent class="row pt-3">
+		<br><br>
+			<div class="pt-2">
+				<div class="row mb-3">
+					<div class="col-sm-7">
+						<span class="small">[{{notizData.typeId}}]</span>
+					</div>
+				</div>
+				
+				<div class="row mb-3">
+					<div class="col-sm-7">
+						<p v-if="notizData.statusNew" class="fw-bold"> {{$p.t('notiz','notiz_new')}}</p>
+						<p v-else class="fw-bold">{{$p.t('notiz','notiz_edit')}}</p>
+					</div>
+				</div>
+	
+				<div class="row mb-3">
+					<label for="titel" class="form-label col-sm-2">{{$p.t('global','titel')}}</label>
+					<div class="col-sm-7">
+						<input type="text" v-model="notizData.titel" class="form-control">
+					</div>
+				</div>
+							
+				<div class="row mb-3">
+					<label for="text" class="form-label col-sm-2">{{$p.t('global','text')}}</label>
+						
+					<!--Todo(manu) make TINYMCE optional	-->	
+					<!-- TinyMce 5 -->
+<!--					<div class="col-sm-7">
+						<textarea ref="editor" rows="5" cols="75" class="form-control"></textarea>
+					</div>
+					-->
+
+					<div class="col-sm-7">
+						<textarea rows="5" cols="75" v-model="notizData.text" class="form-control"></textarea>
+					</div>
+				
+				</div>
+	
+			<!-- show Documentupload-->
+			<div v-if="showDocument">
+				<div class="row mb-3">
+				
+					<label for="text" class="form-label col-sm-2">{{$p.t('notiz','document')}}</label>
+					<div  class="col-sm-7 py-3">
+						<!--Upload Component-->
+						<FormUploadDms ref="upload" id="file" multiple v-model="notizData.anhang"></FormUploadDms>
+					</div>
+				
+				</div>
+			</div>
+			
+			<!-- show Details-->
+			<div v-if="showErweitert">
+			
+				<div class="row mb-3">
+					<label for="bis" class="form-label col-sm-2">{{$p.t('notiz','verfasser')}}</label>
+					<div class="col-sm-3">
+						<PvAutoComplete v-model="notizData.intVerfasser" optionLabel="mitarbeiter"  :suggestions="filteredMitarbeiter" @complete="search" minLength="3"/>
+					</div>
+					
+					<label for="von" class="form-label col-sm-1">{{$p.t('global','gueltigVon')}}</label>
+					<div class="col-sm-3">
+						<vue-date-picker
+							id="von"
+							v-model="notizData.Von"
+							clearable="false"
+							auto-apply
+							:enable-time-picker="false"
+							format="dd.MM.yyyy"
+							preview-format="dd.MM.yyyy"></vue-date-picker>
+					</div>
+				</div>
+				
+				<div class="row mb-3">
+					<label for="bis" class="form-label col-sm-2">{{$p.t('notiz','bearbeiter')}}</label>
+					<div class="col-sm-3">
+						<PvAutoComplete v-model="notizData.intBearbeiter" optionLabel="mitarbeiter" :suggestions="filteredMitarbeiter" @complete="search" minlength="3"/>
+					</div>
+					
+					
+					<label for="bis" class="form-label col-sm-1">{{$p.t('global','gueltigBis')}}</label>
+					<div class="col-sm-3">
+						<vue-date-picker
+							id="bis"
+							v-model="notizData.Bis"
+							clearable="false"
+							auto-apply
+							:enable-time-picker="false"
+							format="dd.MM.yyyy"
+							preview-format="dd.MM.yyyy"></vue-date-picker>
+					</div>				
+					
+				</div>
+									
+				<div class="row mb-3">
+					<label for="bis" class="form-label col-sm-2">{{$p.t('notiz','erledigt')}}</label>
+					<div class="col-sm-1">
+						<input type="checkbox" v-model="notizData.erledigt">
+					</div>
+				</div>
+				
+			</div>
+			
+			<div class="row mb-3">
+				<label for="lastChange" class="form-label col-sm-2 small">{{$p.t('notiz','letzte_aenderung')}}</label>
+				<div class="col-sm-7">
+					<p class="small">{{notizData.lastChange}}</p>
+				</div>
+			</div>
+			
+			<button v-if="notizData.statusNew"  type="button" class="btn btn-primary" @click="addNewNotiz()"> {{$p.t('studierendenantrag', 'btn_new')}}</button>
+			<button v-else type="button" class="btn btn-primary" @click="updateNotiz(notizen.notiz_id)"> {{$p.t('ui', 'speichern')}}</button>
+					
+		</form>
+		
+	</div>`
+}
+
diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/NotizForm.js
similarity index 99%
rename from public/js/components/Notiz/Notiz.js
rename to public/js/components/Notiz/NotizForm.js
index 988c6d7ec..b65e2be20 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/NotizForm.js
@@ -174,6 +174,7 @@ export default {
 
 			if (tinymcsVal != newVal) {
 				//Inhalt des Editors aktualisieren
+				//Todo(manu) hier gibts ein problem mit update function
 				this.editor.setContent(newVal);
 			}
 		},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
index 131b4fd55..31a92a9e7 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
@@ -1,369 +1,28 @@
-import {CoreRESTClient} from "../../../../RESTClient.js";
-import {CoreFilterCmpt} from "../../../filter/Filter.js";
-import Notiz from "../../../Notiz/Notiz.js";
-import BsModal from "../../../Bootstrap/Modal";
+import NotizComponent from "../../../Notiz/NotizComponent.js";
 
 export default {
 	components: {
-		CoreRESTClient,
-		CoreFilterCmpt,
-		Notiz,
-		BsModal
+		NotizComponent
 	},
 	props: {
 		modelValue: Object
 	},
 	data(){
 		return {
-			tabulatorOptions: {
-				ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Notiz/getNotizen/' + this.modelValue.person_id + '/person_id'),
-				//ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Notiz/getNotizen/' + this.modelValue.person_id + '/' + this.formData.typeId),
-				columns: [
-					{title: "Titel", field: "titel"},
-					{title: "Text", field: "text_stripped", width: 250},
-					{title:  "VerfasserIn", field: "verfasser_uid"},
-					{title: "BearbeiterIn", field: "bearbeiter_uid", visible: false},
-					{title: "Start", field: "start", visible: false},
-					{title: "Ende", field: "ende", visible: false},
-					{title: "Dokumente", field: "countdoc"},
-					{title: "Erledigt", field: "erledigt", visible: false},
-					{title: "Notiz_id", field: "notiz_id", visible: false},
-					{title: "Notizzuordnung_id", field: "notizzuordnung_id", visible: false},
-					{title: "letzte Änderung", field: "lastupdate", visible: false},
-					{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.addEventListener('click', (event) =>
-							this.actionEditNotiz(cell.getData().notiz_id)
-						);
-						container.append(button);
-
-						button = document.createElement('button');
-						button.className = 'btn btn-outline-secondary btn-action';
-						button.innerHTML = '<i class="fa fa-xmark"></i>';
-						button.addEventListener('click', () =>
-							this.actionDeleteNotiz(cell.getData().notiz_id)
-						);
-						container.append(button);
-
-						return container;
-						},
-						frozen: true
-					}
-				],
-
-				layout: 'fitDataFill',
-				layoutColumnsOnNewData: false,
-				height: '250',
-				selectableRangeMode: 'click',
-				selectable: true,
-				index: 'notiz_id',
-/*				rowClick: (e, row) => {
-					const notizId = row.getData().notiz_id;
-					console.log(notizId);
-					this.actionEditNotiz(notizId);
-				},*/
-			},
-			tabulatorEvents: [],
-			notizen: [],
-			uid: '',
-			intVerfasser: '',
-			filteredMitarbeiter: [],
-			formData: {
-				typeId: 'person_id',
-				titel: null,
-				statusNew: true,
-				text: null,
-				lastChange: null,
-				von: null,
-				bis: null,
-				document: null,
-				erledigt: false,
-				verfasser: this.uid,
-				bearbeiter: null,
-				anhang: []
-			},
 			showErweitert: true, //show details verfasser, bearbeiter, von, bis, erledigt
 			showDocument: true, //show upload documents
 		};
 	},
-	methods:{
-		actionDeleteNotiz(notiz_id){
-			this.loadNotiz(notiz_id).then(() => {
-				if(this.notizen.notiz_id) {
-					this.$refs.deleteNotizModal.show();
-				}
-			});
-		},
-		actionEditNotiz(notiz_id){
-			this.loadNotiz(notiz_id).then(() => {
-				if(this.notizen.notiz_id) {
-					this.formData.titel = this.notizen.titel;
-					this.formData.statusNew = false;
-					this.formData.text = this.notizen.text;
-					this.formData.lastChange = this.notizen.lastupdate;
-					this.formData.von = this.notizen.start;
-					this.formData.bis = this.notizen.ende;
-					this.formData.document = this.notizen.dms_id;
-					this.formData.erledigt = this.notizen.erledigt;
-					this.formData.verfasser = this.notizen.verfasser_uid;
-					this.formData.bearbeiter = this.notizen.bearbeiter_uid;
-				}
-			})
-				.then(() => {
-					if(this.notizen.dms_id){
-						console.log("loadEntries with " + this.notizen.notiz_id);
-						this.loadDocEntries(this.notizen.notiz_id);
-					}
-				});
-		},
-		actionNewNotiz(){
-			this.resetFormData();
-			this.formData.typeId = 'person_id';
-			this.formData.titel = '';
-			this.formData.statusNew = true;
-			this.formData.text = null;
-			this.formData.lastChange = null;
-			this.formData.von = null;
-			this.formData.bis = null;
-			this.formData.document = null;
-			this.formData.erledigt = false;
-			this.formData.verfasser = this.uid;
-			this.formData.bearbeiter = null;
-			this.formData.anhang = [];
-		},
-		addNewNotiz(notizData) {
-			const formData = new FormData();
-
-			formData.append('data', JSON.stringify(this.formData));
-			Object.entries(this.formData.anhang).forEach(([k, v]) => formData.append(k, v));
-			CoreRESTClient.post(
-				'components/stv/Notiz/addNewNotiz/' + this.modelValue.person_id,
-				formData,
-				{ Headers: { "Content-Type": "multipart/form-data" } }
-			).then(response => {
-				if (!response.data.error) {
-					this.$fhcAlert.alertSuccess('Anlegen von neuer Notiz erfolgreich');
-					this.resetFormData();
-					this.reload();
-				} else {
-					const errorData = response.data.retval;
-					Object.entries(errorData).forEach(entry => {
-						const [key, value] = entry;
-						this.$fhcAlert.alertError(value);
-					});
-				}
-			}).catch(error => {
-				if (error.response) {
-					this.$fhcAlert.alertError(error.response.data);
-				}
-			}).finally(() => {
-				window.scrollTo(0, 0);
-			});
-		},
-		deleteNotiz(notiz_id){
-			CoreRESTClient.post('components/stv/Notiz/deleteNotiz/' + notiz_id)
-				.then(response => {
-					if (!response.data.error) {
-						this.$fhcAlert.alertSuccess('Löschen erfolgreich');
-						this.$refs.deleteNotizModal.hide();
-						this.reload();
-					} else {
-						this.$fhcAlert.alertError('Keine Notiz mit Id ' + notiz_id + ' gefunden');
-					}
-				}).catch(error => {
-					this.$fhcAlert.alertError('Fehler bei Löschroutine aufgetreten');
-				}).finally(()=> {
-					window.scrollTo(0, 0);
-				});
-		},
-		loadDocEntries(notiz_id){
-			return CoreRESTClient.get('components/stv/Notiz/loadDokumente/' + notiz_id)
-				.then(
-					result => {
-						if(result.data.retval) {
-							this.formData.anhang = result.data.retval;
-							console.log(this.formData.anhang);
-						}
-						else
-						{
-							this.formData.anhang = {};
-							this.$fhcAlert.alertError('Kein Dokumenteneintrag mit NotizId ' + notiz_id + ' gefunden');
-						}
-						return result;
-					}
-				);
-		},
-		loadNotiz(notiz_id){
-			return CoreRESTClient.get(
-				'components/stv/Notiz/loadNotiz/' + notiz_id)
-				.then(
-					result => {
-						if(result.data.retval) {
-							this.notizen = result.data.retval;
-							//console.log(this.notizen);
-						}
-						else {
-							this.notizen = {};
-							this.$fhcAlert.alertError('Keine Notiz mit Id ' + notiz_id + ' gefunden');
-						}
-						return result;
-					}
-				);
-		},
-		reload(){
-			this.$refs.table.reloadTable();
-		},
-		resetFormData(){
-			this.$refs.form.reset();
-			this.formData = {
-				typeId: 'person_id',
-				titel: null,
-				statusNew: true,
-				text: null,
-				lastChange: null,
-				von: null,
-				bis: null,
-				document: null,
-				erledigt: false,
-				verfasser: this.uid,
-				bearbeiter: null,
-				anhang: []
-			};
-		},
-		updateNotiz(notiz_id){
-			const formData = new FormData();
-
-			formData.append('data', JSON.stringify(this.formData));
-			Object.entries(this.formData.anhang).forEach(([k, v]) => formData.append(k, v));
-			//console.log(this.formData);
-
-			CoreRESTClient.post(
-				'components/stv/Notiz/updateNotiz/' + notiz_id,
-				formData,
-				{ Headers: { "Content-Type": "multipart/form-data" } }
-			).then(response => {
-				if (!response.data.error) {
-					this.$fhcAlert.alertSuccess('Update von Notiz erfolgreich');
-					this.resetFormData();
-					this.reload();
-				} else {
-					const errorData = response.data.retval;
-					Object.entries(errorData).forEach(entry => {
-						const [key, value] = entry;
-						this.$fhcAlert.alertError(value);
-					});
-				}
-			}).catch(error => {
-				this.$fhcAlert.alertError('Fehler bei Updateroutine aufgetreten');
-			}).finally(() => {
-				window.scrollTo(0, 0);
-			});
-		},
-	},
-	created(){
-		CoreRESTClient
-			.get('components/stv/Notiz/getUid')
-			.then(result => {
-				if(result.data.retval) {
-					this.formData.verfasser = result.data.retval;
-				}
-			})
-			.catch(this.$fhcAlert.handleSystemError);
-	},
-	async mounted() {
-		await this.$p.loadCategory(['notiz','global']);
-
-		let cm = this.$refs.table.tabulator.columnManager;
-
-		cm.getColumnByField('verfasser_uid').component.updateDefinition({
-			title: this.$p.t('notiz', 'verfasser')
-		});
-		cm.getColumnByField('titel').component.updateDefinition({
-			title: this.$p.t('global', 'titel')
-		});
-		cm.getColumnByField('text_stripped').component.updateDefinition({
-			title: this.$p.t('global', 'text')
-		});
-		cm.getColumnByField('bearbeiter_uid').component.updateDefinition({
-			title: this.$p.t('notiz', 'bearbeiter')
-		});
-		cm.getColumnByField('start').component.updateDefinition({
-			title: this.$p.t('global', 'gueltigVon')
-		});
-		cm.getColumnByField('ende').component.updateDefinition({
-			title: this.$p.t('global', 'gueltigBis')
-		});
-		cm.getColumnByField('countdoc').component.updateDefinition({
-			title: this.$p.t('notiz', 'document')
-		});
-		cm.getColumnByField('erledigt').component.updateDefinition({
-			title: this.$p.t('notiz', 'erledigt')
-		});
-		cm.getColumnByField('lastupdate').component.updateDefinition({
-			title: this.$p.t('notiz', 'letzte_aenderung')
-		});
-	},
-/*	computed: {
-		},*/
 	template: `
 	<div class="stv-details-details h-100 pb-3">
-
-		<!--Modal: deleteNotizModal-->
-		<BsModal ref="deleteNotizModal">
-			<template #title>Notiz löschen</template>
-			<template #default>
-				<p>Notiz wirklich löschen?</p>
-			</template>
-			<template #footer>
-				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">Abbrechen</button>
-				<button ref="Close" type="button" class="btn btn-primary" @click="deleteNotiz(notizen.notiz_id)">OK</button>
-			</template>
-		</BsModal>
-		
-		<core-filter-cmpt
-		ref="table"
-		:tabulator-options="tabulatorOptions"
-		:tabulator-events="tabulatorEvents"
-		table-only
-		:side-menu="false"
-		reload
-		new-btn-show
-		new-btn-label="Neu"
-		@click:new="actionNewNotiz"
-		>
-	</core-filter-cmpt>
-
-	<br>
-	<hr>
-		<Notiz
-			ref="form"
-			:showErweitert="showErweitert"
-			:showDocument="showDocument"
-			v-model:typeId="formData.typeId"
-			v-model:titel="formData.titel"
-			v-model:text="formData.text"
-			:lastChange="formData.lastChange"
-			v-model:statusNew="formData.statusNew"
-			v-model:von="formData.von"
-			v-model:bis="formData.bis"
-			v-model:document="formData.document"
-			v-model:erledigt="formData.erledigt"
-			v-model:verfasser="formData.verfasser"
-			v-model:bearbeiter="formData.bearbeiter"
-			v-model:anhang="formData.anhang"
-		>
-		</Notiz>
-			
-		<button v-if="formData.statusNew"  type="button" class="btn btn-primary" @click="addNewNotiz()"> {{$p.t('studierendenantrag', 'btn_new')}}</button>
-		<button v-else type="button" class="btn btn-primary" @click="updateNotiz(notizen.notiz_id)"> {{$p.t('ui', 'speichern')}}</button>
-	
+		<NotizComponent
+			ref="formc"
+			typeId="person_id"
+			:id="modelValue.person_id"
+			:showErweitert=true
+			:showDocument=true
+			>		
+		</NotizComponent>
 	</div>
 	`
 };

From 23853e4a19377f3ec8fae2f2d48e7febe710cdae Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 5 Feb 2024 07:56:24 +0100
Subject: [PATCH 0373/1461] temp

---
 public/js/components/Notiz/NotizComponent.js  |   4 +-
 public/js/components/Notiz/NotizForm.js       | 295 ------------------
 .../Studentenverwaltung/Details/Notizen.js    |  23 ++
 3 files changed, 25 insertions(+), 297 deletions(-)
 delete mode 100644 public/js/components/Notiz/NotizForm.js

diff --git a/public/js/components/Notiz/NotizComponent.js b/public/js/components/Notiz/NotizComponent.js
index 5f7ea9993..0d6dbae69 100644
--- a/public/js/components/Notiz/NotizComponent.js
+++ b/public/js/components/Notiz/NotizComponent.js
@@ -65,7 +65,7 @@ export default {
 				],
 				layout: 'fitDataFill',
 				layoutColumnsOnNewData: false,
-				height: '250',
+				height: '150',
 				selectableRangeMode: 'click',
 				selectable: true,
 				index: 'notiz_id'
@@ -403,7 +403,7 @@ export default {
 			@click:new="actionNewNotiz"
 			>
 		</core-filter-cmpt>
-		<br><br>
+		<br>
 	
 		<form ref="formc" @submit.prevent class="row pt-3">
 		<br><br>
diff --git a/public/js/components/Notiz/NotizForm.js b/public/js/components/Notiz/NotizForm.js
deleted file mode 100644
index b65e2be20..000000000
--- a/public/js/components/Notiz/NotizForm.js
+++ /dev/null
@@ -1,295 +0,0 @@
-import VueDatePicker from '../vueDatepicker.js.php';
-import PvAutoComplete from "../../../../index.ci.php/public/js/components/primevue/autocomplete/autocomplete.esm.min.js";
-import File from '../Form/Upload/File.js';
-import FormUploadDms from '../Form/Upload/Dms.js';
-import {CoreRESTClient} from "../../RESTClient";
-
-
-export default {
-	components: {
-		VueDatePicker,
-		File,
-		PvAutoComplete,
-		FormUploadDms
-	},
-	props: [
-		'typeId',
-		'titel',
-		'text',
-		'lastChange',
-		'von',
-		'bis',
-		'statusNew',
-		'document',
-		'erledigt',
-		'verfasser',
-		'bearbeiter',
-		'showErweitert',
-		'showDocument',
-		'anhang'
-		],
-	data(){
-		return {
-			multiupload: true,
-			mitarbeiter: [],
-			filteredMitarbeiter: [],
-			zwischenvar: '',
-			editorInitialized: false,
-			editor: null
-		}
-	},
-	computed: {
-		intTitel: {
-			get() {
-				return this.titel;
-			},
-			set(value) {
-				this.$emit('update:titel', value);
-			}
-		},
-		intText: {
-			get() {
-				return this.text;
-			},
-			set(value) {
-				this.$emit('update:text', value);
-			}
-		},
-		intVon: {
-			get() {
-				return this.von;
-			},
-			set(value) {
-				const tempVon = new Date(value).toISOString().split('T')[0];
-				this.$emit('update:von', tempVon);
-			}
-		},
-		intBis: {
-			get() {
-				return this.bis;
-			},
-			set(value) {
-				const tempBis = new Date(value).toISOString().split('T')[0];
-				this.$emit('update:bis', tempBis);
-			}
-		},
-		intDocument: {
-			get() {
-				return this.document;
-			},
-			set(value) {
-				this.$emit('update:document', value);
-			}
-		},
-		intErledigt: {
-			get() {
-				return this.erledigt;
-			},
-			set(value) {
-				this.$emit('update:erledigt', value);
-			}
-		},
-		intVerfasser: {
-			get() {
-				return this.verfasser;
-			},
-			set(value) {
-				//this.$emit('update:verfasser', value);
-				this.$emit('update:verfasser', value.mitarbeiter_uid);
-			}
-		},
-		intBearbeiter: {
-			get() {
-				return this.bearbeiter;
-			},
-			set(value) {
-				if(value)
-				{
-					this.$emit('update:bearbeiter', value.mitarbeiter_uid);
-				}
-				else
-					this.$emit('update:bearbeiter', value);
-			}
-		},
-		intAnhang: {
-			get() {
-				return this.anhang;
-			},
-			set(value) {
-				this.$emit('update:anhang', value);
-			}
-		}
-	},
-	methods: {
-		reset() {
-			this.$refs.form.reset();
-			this.intAnhang = null;
-		},
-
-		search(event) {
-			return CoreRESTClient
-				.get('components/stv/Notiz/getMitarbeiter/' + event.query)
-				.then(result => {
-					this.filteredMitarbeiter = CoreRESTClient.getData(result.data);
-				});
-		},
-		initTinyMCE() {
-
-			const vm = this;
-			tinymce.init({
-				target: this.$refs.editor, //Important: not selector: to enable multiple import of component
-				//height: 800,
-				//plugins: ['lists'],
-				//toolbar: " blocks | bold italic underline | alignleft aligncenter alignright alignjustify",
-				toolbar: 'styleselect | bold italic underline | alignleft aligncenter alignright alignjustify',
-				style_formats: [
-					{ title: 'Blocks', block: 'div' },
-					{ title: 'Paragraph', block: 'p' },
-					{ title: 'Heading 1', block: 'h1' },
-					{ title: 'Heading 2', block: 'h2' },
-					{ title: 'Heading 3', block: 'h3' },
-					{ title: 'Heading 4', block: 'h4' },
-					{ title: 'Heading 5', block: 'h5' },
-					{ title: 'Heading 6', block: 'h6' },
-				],
-				autoresize_bottom_margin: 16,
-
-				setup: (editor) => {
-					vm.editor = editor;
-
-					editor.on('input', () => {
-						const newContent = editor.getContent();
-						vm.intText =  newContent;
-					});
-				},
-			});
-		},
-	},
-	mounted() {
-		this.initTinyMCE();
-	},
-	watch: {
-		intText: function(newVal) {
-			const tinymcsVal = this.editor.getContent();
-
-			if (tinymcsVal != newVal) {
-				//Inhalt des Editors aktualisieren
-				//Todo(manu) hier gibts ein problem mit update function
-				this.editor.setContent(newVal);
-			}
-		},
-	},
-	beforeDestroy() {
-		this.editor.destroy();
-	},
-	template: `
-	<div class="notiz-notiz">
-	
-		<form ref="form" @submit.prevent class="row">
-			<div>
-				<div class="row mb-3">
-					<div class="col-sm-7">
-						<span class="small">[{{typeId}}]</span>
-					</div>
-				</div>
-				
-				<div class="row mb-3">
-					<div class="col-sm-7">
-						<p v-if="statusNew" class="fw-bold"> {{$p.t('notiz','notiz_new')}}</p>
-						<p v-else class="fw-bold">{{$p.t('notiz','notiz_edit')}}</p>
-					</div>
-				</div>
-	
-				<div class="row mb-3">
-					<label for="titel" class="form-label col-sm-2">{{$p.t('global','titel')}}</label>
-					<div class="col-sm-7">
-						<input type="text" v-model="intTitel" class="form-control">
-					</div>
-				</div>
-							
-				<div class="row mb-3">
-					<label for="text" class="form-label col-sm-2">{{$p.t('global','text')}}</label>
-								
-					<!-- TinyMce 5 -->
-					<div class="col-sm-7">
-						<textarea ref="editor" rows="5" cols="75" class="form-control"></textarea>
-					</div>
-				
-				</div>
-	
-			<!-- show Documentupload-->
-			<div v-if="showDocument">
-				<div class="row mb-3">
-				
-					<label for="text" class="form-label col-sm-2">{{$p.t('notiz','document')}}</label>
-					<div  class="col-sm-7 py-3">
-						<!--Upload Component-->
-						<FormUploadDms ref="upload" id="file" multiple v-model="intAnhang"></FormUploadDms>
-					</div>
-				
-				</div>
-			</div>
-			
-			<!-- show Details-->
-			<div v-if="showErweitert">
-			
-				<div class="row mb-3">
-					<label for="bis" class="form-label col-sm-2">{{$p.t('notiz','verfasser')}}</label>
-					<div class="col-sm-3">
-						<PvAutoComplete v-model="intVerfasser" optionLabel="mitarbeiter"  :suggestions="filteredMitarbeiter" @complete="search" minLength="3"/>
-					</div>
-					
-					<label for="von" class="form-label col-sm-1">{{$p.t('global','gueltigVon')}}</label>
-					<div class="col-sm-3">
-						<vue-date-picker
-							id="von"
-							v-model="intVon"
-							clearable="false"
-							auto-apply
-							:enable-time-picker="false"
-							format="dd.MM.yyyy"
-							preview-format="dd.MM.yyyy"></vue-date-picker>
-					</div>
-				</div>
-				
-				<div class="row mb-3">
-					<label for="bis" class="form-label col-sm-2">{{$p.t('notiz','bearbeiter')}}</label>
-					<div class="col-sm-3">
-						<PvAutoComplete v-model="intBearbeiter" optionLabel="mitarbeiter" :suggestions="filteredMitarbeiter" @complete="search" minlength="3"/>
-					</div>
-					
-					
-					<label for="bis" class="form-label col-sm-1">{{$p.t('global','gueltigBis')}}</label>
-					<div class="col-sm-3">
-						<vue-date-picker
-							id="bis"
-							v-model="intBis"
-							clearable="false"
-							auto-apply
-							:enable-time-picker="false"
-							format="dd.MM.yyyy"
-							preview-format="dd.MM.yyyy"></vue-date-picker>
-					</div>				
-					
-				</div>
-									
-				<div class="row mb-3">
-					<label for="bis" class="form-label col-sm-2">{{$p.t('notiz','erledigt')}}</label>
-					<div class="col-sm-1">
-						<input type="checkbox" v-model="intErledigt">
-					</div>
-				</div>
-			</div>
-			
-			<div class="row mb-3">
-				<label for="lastChange" class="form-label col-sm-2 small">{{$p.t('notiz','letzte_aenderung')}}</label>
-				<div class="col-sm-7">
-					<p class="small">{{this.lastChange}}</p>
-				</div>
-			</div>
-					
-		</form>
-		
-	</div>`
-}
-
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
index 31a92a9e7..498096ad3 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
@@ -15,6 +15,7 @@ export default {
 	},
 	template: `
 	<div class="stv-details-details h-100 pb-3">
+		<h3>Notizen</h3>
 		<NotizComponent
 			ref="formc"
 			typeId="person_id"
@@ -23,6 +24,28 @@ export default {
 			:showDocument=true
 			>		
 		</NotizComponent>
+		
+		<br><br>
+		<h3>Test prestudentId</h3>
+		<NotizComponent
+			ref="formc"
+			typeId="prestudent_id"
+			:id="modelValue.prestudent_id"
+			:showErweitert=false
+			:showDocument=true
+			>		
+		</NotizComponent>
+		
+		<br><br>
+		<h3>Test Projekt</h3>
+		<NotizComponent
+			ref="formc"
+			typeId="projekt_kurzbz"
+			:id="ZeitErfassung"
+			:showErweitert=true
+			:showDocument=false
+			>		
+		</NotizComponent>
 	</div>
 	`
 };

From 6e55382d15180bdc9b64c7b7fb620c512830fc3d Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 5 Feb 2024 09:52:27 +0100
Subject: [PATCH 0374/1461] adds zustelladresse as a field to EditKontakte
 component

---
 application/controllers/Cis/Profil.php        | 48 +++++++++---
 application/controllers/Cis/ProfilUpdate.php  | 11 ++-
 public/js/components/Cis/Profil/EditProfil.js | 23 +++---
 .../components/Cis/Profil/EditProfilSelect.js |  3 +-
 .../Cis/Profil/MitarbeiterProfil.js           | 66 +++++++++++------
 .../Profil/ProfilComponents/EditAdresse.js    | 17 ++++-
 .../js/components/Cis/Profil/StudentProfil.js | 73 ++++++++++++-------
 7 files changed, 164 insertions(+), 77 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index eae64452f..f2afcff1b 100755
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -27,8 +27,12 @@ class Profil extends Auth_Controller
 			'insertFile' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'getProfilRequestFiles' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'deleteOldVersionFiles' => ['student/anrechnung_beantragen:r', 'user:r'],
+			'test' => ['student/anrechnung_beantragen:r', 'user:r'],
 						
 		]);
+
+		
+
 		$this->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
 		$this->load->model('crm/Student_model', 'StudentModel');
 		$this->load->model('person/Benutzer_model', 'BenutzerModel');
@@ -40,13 +44,16 @@ class Profil extends Auth_Controller
 		$this->load->model('person/Kontakt_model', 'KontaktModel');
 		$this->load->model('person/Profil_change_model', 'ProfilChangeModel');
 		$this->load->model('content/DmsVersion_model', 'DmsVersionModel');
-		
+		$this->load->model('DmsVersion_model','DmsVersionModel');
+
+		$this->load->library('DmsLib');
 
 		//? put the uid and pid inside the controller to reuse in controller
 		$this->uid = getAuthUID();
 		$this->pid = getAuthPersonID();
 		
 
+
 	}
 
 	// -----------------------------------------------------------------------------------------------------------------
@@ -84,14 +91,15 @@ class Profil extends Auth_Controller
 			echo json_encode([]);
 			return;
 		}
-		$res=[];
+		
 
-		$this->load->library('DmsLib');
-		$this->load->model('DmsVersion_model','DmsVersionModel');
+		
 		
 		$files = $_FILES['files'];
         $file_count = count($files['name']);
 
+		$res=[];
+
         for ($i = 0; $i < $file_count; $i++) {
             $_FILES['files']['name'] = $files['name'][$i];
             $_FILES['files']['type'] = $files['type'][$i];
@@ -100,7 +108,7 @@ class Profil extends Auth_Controller
             $_FILES['files']['size'] = $files['size'][$i];
 			
 			$dms = [
-				"kategorie_kurzbz"=>"dokumente",
+				"kategorie_kurzbz"=>"profil_aenderung",
 				"version"=>0, 
 				"name"=>$_FILES['files']['name'],
 				"mimetype"=>$_FILES['files']['type'],
@@ -118,16 +126,37 @@ class Profil extends Auth_Controller
 
 
 	public function deleteOldVersionFiles(){
-		//? table dms_version has a composite primary key with dms_id and dms_version
 		$file_array = json_decode($this->input->raw_input_stream);
+		if(!isset($file_array) || !sizeof($file_array)){
+			return;
+		}
+		
 		$res =[];
-		foreach($file_array as $value){
+		foreach($file_array as $id){
+			//? delete all the different versions of the dms_file
 			
-			array_push($res, $this->DmsVersionModel->delete([$value,0]));
+			$zwischen_res = $this->DmsVersionModel->loadWhere(["dms_id"=>$id]);
+			$zwischen_res = hasData($zwischen_res) ? getData($zwischen_res) : null;
+			if(isset($zwischen_res)){
+				$zwischen_res = array_map(function($item){ return $item->version;},$zwischen_res);
+				foreach($zwischen_res as $version){
+					array_push($res, $this->DmsVersionModel->delete([$id,$version]));
+				}
+			}else{
+				echo json_encode(error("No version of the file has been found"));
+			}
 		}
 		echo json_encode($res);
 	}
 
+	public function test(){
+		
+		// Loads permission lib
+		$this->load->library('PermissionLib');
+		var_dump($this->permissionlib->getOE_isEntitledFor());
+	}
+
+
 
 	public function selectProfilRequest(){
 		$_GET = json_decode($this->input->raw_input_stream, true);
@@ -529,9 +558,8 @@ class Profil extends Auth_Controller
 
 		if (
 
-			isSuccess($adresse_res = $this->AdresseModel->addSelect(["adresse_id","strasse", "tbl_adressentyp.bezeichnung as typ", "plz", "ort"])) &&
+			isSuccess($adresse_res = $this->AdresseModel->addSelect(["adresse_id","strasse", "tbl_adressentyp.bezeichnung as typ", "plz", "ort","zustelladresse"])) &&
 			isSuccess($adresse_res = $this->AdresseModel->addOrder("zustelladresse", "DESC")) &&
-			isSuccess($adresse_res = $this->AdresseModel->addOrder("sort")) &&
 			isSuccess($adresse_res = $this->AdresseModel->addJoin("tbl_adressentyp", "typ=adressentyp_kurzbz"))
 		) {
 			$adresse_res = $this->AdresseModel->loadWhere(array("person_id" => $this->pid));
diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
index c075221b0..ac1815d6e 100755
--- a/application/controllers/Cis/ProfilUpdate.php
+++ b/application/controllers/Cis/ProfilUpdate.php
@@ -37,6 +37,7 @@ class ProfilUpdate extends Auth_Controller
 		$this->load->library('DmsLib');
 		//? downloads the file using the dms_id
 		$file = $this->dmslib->download($dms_id);
+		
 		$file = hasData($file) ? getData($file) : null;
 		//? returns the downloaded file to the user
 		$res = $this->outputFile($file);
@@ -148,8 +149,9 @@ class ProfilUpdate extends Auth_Controller
 		if(array_key_exists('add',$requested_change) && $requested_change['add']){
 			//? removes add flag
 			unset($requested_change['add']);
-			//? fields like insertvon are not filled when inserting new row
 			$requested_change['person_id'] = $personID;
+			$requested_change['insertamum'] = "NOW()";
+			$requested_change['insertvon'] = getAuthUID();
 			$insertID = $this->KontaktModel->insert($requested_change);
 			
 		}
@@ -159,6 +161,8 @@ class ProfilUpdate extends Auth_Controller
 		}
 		//! UPDATE
 		else{
+			$requested_change['updateamum']="NOW()";
+			$requested_change['updatemvon']=getAuthUID();
 			$this->KontaktModel->update($kontakt_id,$requested_change);
 		}
 		return isset($insertID) ? $insertID : null;
@@ -181,7 +185,8 @@ class ProfilUpdate extends Auth_Controller
 		if(array_key_exists('add',$requested_change) && $requested_change['add']){
 			//? removes add flag
 			unset($requested_change['add']);
-			//? fields like insertvon are not filled when inserting new row
+			$requested_change['insertamum']="NOW()";
+			$requested_change['insertvon']=getAuthUID();
 			$requested_change['person_id'] = $personID;
 			//TODO: zustelladresse, heimatadresse, rechnungsadresse und nation werden nicht beachtet
 			$insertID = $this->AdresseModel->insert($requested_change);
@@ -192,6 +197,8 @@ class ProfilUpdate extends Auth_Controller
 		}
 		//! UPDATE
 		else{
+			$requested_change['updateamum']	= "NOW()";
+			$requested_change['updatevon'] = getAuthUID();
 			$this->AdresseModel->update($adresse_id,$requested_change);
 		}
 		return isset($insertID)? $insertID : null;
diff --git a/public/js/components/Cis/Profil/EditProfil.js b/public/js/components/Cis/Profil/EditProfil.js
index 8f5a2d824..2963f7371 100755
--- a/public/js/components/Cis/Profil/EditProfil.js
+++ b/public/js/components/Cis/Profil/EditProfil.js
@@ -38,16 +38,12 @@ export default {
 
   methods: {
     async submitProfilChange() {
-      //? when the update contains a file upload
-
-      //TODO: check if the updated value is different from the original value before submitting the request
       if (this.topic && this.profilUpdate) {
         if (this.profilUpdate.files) {
           const fileIDs = await this.uploadFiles(this.profilUpdate.files);
          
           if (fileIDs) {
             this.profilUpdate.files = fileIDs;
-            console.log("here is the update", this.profilUpdate);
           }
         }
         //? inserts new row in public.tbl_cis_profil_update
@@ -98,8 +94,6 @@ export default {
 
         let filesToKeep = [];
         let filesToDelete = [];
-        console.log(existingFiles);
-        console.log(files);
         existingFiles.forEach((file) => {
           Array.from(files).some((f) => f.name === file.name)
             ? filesToKeep.push(file)
@@ -107,11 +101,13 @@ export default {
         });
         
         //? only keeps the newest version of the documents and deletes the old versions in the database
-        Vue.$fhcapi.UserData.deleteOldVersionFiles(
-          filesToDelete
-        ).then((res) => {
-          console.log(res);
-        });  
+        if(filesToDelete.length > 0) {
+          Vue.$fhcapi.UserData.deleteOldVersionFiles(
+            filesToDelete
+          ).then((res) => {
+            console.log(res);
+          });  
+        }
        
 
         updatedFiles = [...filesToKeep];
@@ -122,7 +118,7 @@ export default {
         if (files[i].type !== "application/x.fhc-dms+json")
           formData.append("files[]", files[i]);
       }
-
+      if(Array.from(formData).length > 0){
       await Vue.$fhcapi.UserData.insertFile(formData)
         .then((res) => {
           /* returns file information as 
@@ -130,7 +126,6 @@ export default {
 
           updatedFiles = updatedFiles.concat(
             res.data?.map((file) => {
-              console.log("here are the files:",file);
               return { dms_id: file.dms_id, name: file.client_name};
             })
           );
@@ -138,6 +133,7 @@ export default {
         .catch((err) => {
           console.log(err);
         });
+      }
 
       return updatedFiles;
     },
@@ -163,6 +159,7 @@ export default {
     </template>
     <template v-slot:default>
 
+
     <nav aria-label="breadcrumb" class="ps-2  ">
       <ol class="breadcrumb ">
         <li class="breadcrumb-item"  v-for="element in breadcrumb">{{element}}</li>
diff --git a/public/js/components/Cis/Profil/EditProfilSelect.js b/public/js/components/Cis/Profil/EditProfilSelect.js
index f69ef5a5e..e0463b21d 100755
--- a/public/js/components/Cis/Profil/EditProfilSelect.js
+++ b/public/js/components/Cis/Profil/EditProfilSelect.js
@@ -71,6 +71,7 @@ export default {
               typ: null,
               plz: null,
               ort: null,
+              zustelladresse:null,
             }
           : {
               //? add flag
@@ -104,7 +105,6 @@ export default {
       this.properties = item;
       this.data = item.data;
       this.view = item.view;
-      console.log("properties", this.properties);
       if (item.title) {
         //? emits the selected topic to the parent component
         this.topic = item.title;
@@ -160,6 +160,7 @@ export default {
     
 
     <div v-else-if="view==='text_input'" class="form-underline">
+   
       <div class="form-underline-titel">{{data.titel?data.titel:'titel'}}</div>
 
       <input  class="form-control" @input="$emit('update:profilUpdate',data.value)"  v-model="data.value" :placeholder="data.value">
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 4b99c8eed..147553152 100755
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -339,6 +339,20 @@ export default {
                 </div>
               </div>
 
+              <!-- Bearbeiten Button -->
+
+              <div class="row mb-3 ">
+              <div class="col">
+              <button @click="showModal" type="button" class="text-start  w-100 btn btn-outline-secondary" >
+                <div class="row">
+                  <div class="col-auto">
+                    <i class="fa fa-edit"></i>
+                  </div>
+                  <div class="col-auto">Bearbeiten</div>
+                </div>
+              </button>
+              </div>
+              </div>
             
               <div v-if="data.profilUpdates" class="row mb-3">
                 <div class="col">
@@ -473,30 +487,9 @@ export default {
               <!-- START OF SIDE PANEL -->
               <div  class="col-md-4 col-xxl-3 col-sm-12 text-break" >
               
-              <!-- Bearbeiten Button -->
-  
-              <div class="row d-none d-md-block mb-3">
-              <div class="col mb-3">
-              <button @click="showModal" type="button" class="text-start  w-100 btn btn-outline-secondary" >
-                <div class="row">
-                  <div class="col-2">
-                    <i class="fa fa-edit"></i>
-                  </div>
-                  <div class="col-10">Bearbeiten</div>
-                </div>
-              </button>
-              </div>
-              </div>
+            
 
-              <div v-if="data.profilUpdates" class="row d-none d-md-block mb-3">
-              <div class="col mb-3">
-
-
-                      <!-- PROFIL UPDATES -->
-                      <fetch-profil-updates @fetchUpdates="fetchProfilUpdates" :data="data.profilUpdates"></fetch-profil-updates>
-                  
-                  </div>    
-                  </div>
+             
               <div  class="row d-none d-md-block mb-3">
                 
                 <div class="col">
@@ -509,6 +502,33 @@ export default {
                   </div>
                 </div>
 
+                <!-- Bearbeiten Button -->
+
+                <div class="row d-none d-md-block ">
+                <div class="col mb-3">
+                <button @click="showModal" type="button" class="text-start  w-100 btn btn-outline-secondary" >
+                  <div class="row">
+                    <div class="col-auto">
+                      <i class="fa fa-edit"></i>
+                    </div>
+                    <div class="col-auto">Bearbeiten</div>
+                  </div>
+                </button>
+                </div>
+                </div>
+
+                <div v-if="data.profilUpdates" class="row d-none d-md-block mb-3">
+                <div class="col mb-3">
+  
+  
+                    <!-- PROFIL UPDATES -->
+                    <fetch-profil-updates @fetchUpdates="fetchProfilUpdates" :data="data.profilUpdates"></fetch-profil-updates>
+                
+                </div>    
+                </div>
+
+                
+
                 <div class="row mb-3" >
                 <div class="col-12">
                   <!-- AUSWEIS STATUS -->
diff --git a/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js b/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
index 015a5ef5f..039a008f1 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
@@ -8,7 +8,12 @@ export default {
     methods:{
         updateValue: function(event,bind){
             //? sets the value of a property to null when an empty string is entered to keep the isChanged function valid 
-            this.data[bind] = event.target.value === "" ? null : event.target.value;
+            if(bind ==="zustelladresse"){
+                this.data[bind] = event.target.checked;
+            }else{
+                this.data[bind] = event.target.value === "" ? null : event.target.value;
+            }
+            
             this.$emit('profilUpdate',this.isChanged?this.data:null);
         },
     },
@@ -28,7 +33,7 @@ export default {
     template:`
    
      <div class="gy-3 row justify-content-center align-items-center">
-    
+       
     <!-- column 1 in the address row -->
     
       
@@ -84,6 +89,14 @@ export default {
         
             </div>
         </div>
+        <div class="col-12 order-5">
+            <div class="form-check">
+                <input class="form-check-input" type="checkbox" @change="updateValue($event,'zustelladresse')" :checked="data.zustelladresse" id="flexCheckDefault">
+                <label class="form-check-label" for="flexCheckDefault">
+                    Zustelladresse
+                </label>
+            </div>
+        </div>
     </div>
     `
 
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index e1063b7eb..0a3b9a8dd 100755
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -181,14 +181,16 @@ export default {
           
           vorname: {
             title:"vorname",
-            view:"text_input",
+            view:"TextInputDokument",
+            withFiles:true,
             data:{
               titel:"vorname",
               value:this.data.vorname,
             }},
             nachname: {
               title:"nachname",
-              view:"text_input",
+              view:"TextInputDokument",
+              withFiles:true,
               data:{
                 titel:"nachname",
                 value:this.data.nachname,
@@ -196,7 +198,8 @@ export default {
             },
             titel:{
               title:"titel",
-              view:"text_input",
+              view:"TextInputDokument",
+              withFiles:true,
               data:{
                 titel:"titel",
                 value:this.data.titel,
@@ -204,7 +207,8 @@ export default {
             },
             postnomen:{
               title:"postnomen",
-              view:"text_input",
+              view:"TextInputDokument",
+              withFiles:true,
               data:{
                 titel:"postnomen",
                 value:this.data.postnomen,
@@ -266,6 +270,21 @@ export default {
                 </div>
               </div>
 
+              <!-- Bearbeiten Button -->
+  
+              <div class="row ">
+              <div class="col mb-3">
+              <button @click="showModal" type="button" class="text-start  w-100 btn btn-outline-secondary" >
+                <div class="row">
+                  <div class="col-2">
+                    <i class="fa fa-edit"></i>
+                  </div>
+                  <div class="col-10">Bearbeiten</div>
+                </div>
+              </button>
+              </div>
+              </div>
+
               <div v-if="data.profilUpdates" class="row mb-3">
                 <div class="col">
                   <!-- MOBILE PROFIL UPDATES -->  
@@ -426,28 +445,6 @@ export default {
               <!-- START OF SIDE PANEL -->
               <div  class="col-md-4 col-xxl-3 col-sm-12 text-break" >
 
-
-              <!-- Bearbeiten Button -->
-  
-              <div class="row d-none d-md-block mb-3">
-              <div class="col mb-3">
-              <button @click="showModal" type="button" class="text-start  w-100 btn btn-outline-secondary" >
-                <div class="row">
-                  <div class="col-2">
-                    <i class="fa fa-edit"></i>
-                  </div>
-                  <div class="col-10">Bearbeiten</div>
-                </div>
-              </button>
-              </div>
-              </div>
-
-                <div v-if="data.profilUpdates" class="row d-none d-md-block mb-3">
-                <div class="col mb-3">
-                    <!-- PROFIL UPDATES -->
-                    <fetch-profil-updates @fetchUpdates="fetchProfilUpdates" :data="data.profilUpdates"></fetch-profil-updates>
-                </div>    
-                </div>
               
                 <div  class="row d-none d-md-block mb-3">
                   <div class="col">
@@ -459,6 +456,30 @@ export default {
                   </div>
                 </div>
 
+                <!-- Bearbeiten Button -->
+  
+                <div class="row d-none d-md-block">
+                <div class="col mb-3">
+                <button @click="showModal" type="button" class="text-start  w-100 btn btn-outline-secondary" >
+                  <div class="row">
+                    <div class="col-2">
+                      <i class="fa fa-edit"></i>
+                    </div>
+                    <div class="col-10">Bearbeiten</div>
+                  </div>
+                </button>
+                </div>
+                </div>
+
+                <div v-if="data.profilUpdates" class="row d-none d-md-block mb-3">
+                <div class="col mb-3">
+                    <!-- PROFIL UPDATES -->
+                    <fetch-profil-updates @fetchUpdates="fetchProfilUpdates" :data="data.profilUpdates"></fetch-profil-updates>
+                </div>    
+                </div>
+
+                
+
                 <div class="row mb-3" >
                 
                 

From a2d0f9e39abac80c12994d12c1294ef9e953fb7d Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 5 Feb 2024 11:17:07 +0100
Subject: [PATCH 0375/1461] funciton that queries the ProfilUpdates now takes a
 associative array instead of multiple separate parameters

---
 application/controllers/Cis/Profil.php        | 20 +++++++------------
 application/controllers/Cis/ProfilUpdate.php  | 20 ++++++++-----------
 .../models/person/Profil_change_model.php     | 11 ++--------
 public/js/apps/Cis/ProfilUpdateRequests.js    | 10 +++++-----
 .../Cis/ProfilUpdate/AcceptDenyUpdate.js      |  4 +++-
 5 files changed, 25 insertions(+), 40 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index f2afcff1b..5f69264ed 100755
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -162,17 +162,12 @@ class Profil extends Auth_Controller
 		$_GET = json_decode($this->input->raw_input_stream, true);
 		$uid = $this->input->get('uid');
 		$id = $this->input->get('id');
+		$whereClause=['uid'=> $this->uid];
 		
+		if(isset($uid)) $whereClause['uid'] = $uid;
+		if(isset($id)) $whereClause['id'] = $id;
 		
-		if($uid && $id){
-			$res= $this->ProfilChangeModel->getProfilUpdate($uid, $id);
-		}elseif($uid){
-			$res= $this->ProfilChangeModel->getProfilUpdate($uid);
-		}elseif($id){
-			$res= $this->ProfilChangeModel->getProfilUpdate($this->uid, $id);
-		}else{
-			$res= $this->ProfilChangeModel->getProfilUpdate($this->uid);
-		}
+		$res= $this->ProfilChangeModel->getProfilUpdate($whereClause);
 
 		echo json_encode($res);
 		
@@ -659,7 +654,7 @@ class Profil extends Auth_Controller
 
 
 		//? querying if the user has profil update requests
-		$profilUpdates = $this->ProfilChangeModel->getProfilUpdate($this->uid);
+		$profilUpdates = $this->ProfilChangeModel->getProfilUpdate(['uid'=>$this->uid]);
 		if(isError($profilUpdates)){
 			//error handling
 		}else{
@@ -769,9 +764,8 @@ class Profil extends Auth_Controller
 
 		if (
 
-			isSuccess($adresse_res = $this->AdresseModel->addSelect(["adresse_id","strasse", "tbl_adressentyp.bezeichnung as adr_typ", "plz", "ort"])) &&
+			isSuccess($adresse_res = $this->AdresseModel->addSelect(["adresse_id","strasse", "tbl_adressentyp.bezeichnung as adr_typ", "plz", "ort","zustelladresse"])) &&
 			isSuccess($adresse_res = $this->AdresseModel->addOrder("zustelladresse", "DESC")) &&
-			isSuccess($adresse_res = $this->AdresseModel->addOrder("sort")) &&
 			isSuccess($adresse_res = $this->AdresseModel->addJoin("tbl_adressentyp", "typ=adressentyp_kurzbz"))
 		) {
 			$adresse_res = $this->AdresseModel->loadWhere(array("person_id" => $this->pid));
@@ -866,7 +860,7 @@ class Profil extends Auth_Controller
 		}
 
 		//? querying if the user has profil update requests
-		$profilUpdates = $this->ProfilChangeModel->getProfilUpdate($this->uid);
+		$profilUpdates = $this->ProfilChangeModel->getProfilUpdate(['uid'=>$this->uid]);
 		if(isError($profilUpdates)){
 			//error handling
 		}else{
diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
index ac1815d6e..9411640f7 100755
--- a/application/controllers/Cis/ProfilUpdate.php
+++ b/application/controllers/Cis/ProfilUpdate.php
@@ -12,11 +12,11 @@ class ProfilUpdate extends Auth_Controller
 	public function __construct(){
 		parent::__construct([
 			'index' => ['student/anrechnung_beantragen:r', 'user:r'], // TODO(chris): permissions?
-			'getAllRequests' => ['student/anrechnung_beantragen:r', 'user:r'],
+			'getProfilUpdates' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'acceptProfilRequest'=>['user:r'],
 			'denyProfilRequest'=>['user:r'],
 			'show'=>['user:r'],
-			'getPendingRequests'=>['user:r'], 
+			
 
 		]);
 		
@@ -45,20 +45,16 @@ class ProfilUpdate extends Auth_Controller
 		echo json_encode($res);
 	}
 
-	public function getAllRequests(){
-		$res = $this->ProfilChangeModel->getProfilUpdate();
+	public function getProfilUpdates($status=null){
+		if(isset($status)){
+			$res = $this->ProfilChangeModel->getProfilUpdate(["status"=>$status]);
+		}else{
+			$res = $this->ProfilChangeModel->getProfilUpdate();
+		}
 		$res = hasData($res)? getData($res) : null;
 		echo json_encode($res);
 	}
 
-	public function getPendingRequests(){
-		$res = $this->ProfilChangeModel->loadWhere(["status"=>"pending"]);
-		
-		$res = hasData($res)? getData($res) : [];
-		
-		
-		echo json_encode($res);
-	}
 
 	public function acceptProfilRequest(){
 
diff --git a/application/models/person/Profil_change_model.php b/application/models/person/Profil_change_model.php
index b207db716..134395dd6 100755
--- a/application/models/person/Profil_change_model.php
+++ b/application/models/person/Profil_change_model.php
@@ -49,15 +49,7 @@ class Profil_change_model extends DB_Model
 	 * returns a profil update with id 
 	 * returns all profil updates if id is set to null
 	 */
-	public function getProfilUpdate($uid=null,$id=null){
-		$whereClause=[];
-
-		if(!is_null($uid)){
-			$whereClause['uid']=$uid;
-		}
-		if(!is_null($id)){
-			$whereClause['profil_update_id']=$id;
-		}
+	public function getProfilUpdate($whereClause=null){
 		
 		$res = $this->loadWhere($whereClause);
 		if(isError($res)){
@@ -68,6 +60,7 @@ class Profil_change_model extends DB_Model
 				foreach($res->retval as $update){
 					$update->requested_change = json_decode($update->requested_change);
 					$update->insertamum = !is_null($update->insertamum)?date_create($update->insertamum)->format('d.m.Y'):null;
+					$update->updateamum = !is_null($update->updateamum)?date_create($update->updateamum)->format('d.m.Y'):null;
 					$update->status_timestamp = !is_null($update->status_timestamp)?date_create($update->status_timestamp)->format('d.m.Y'):null;
 					 
 				}
diff --git a/public/js/apps/Cis/ProfilUpdateRequests.js b/public/js/apps/Cis/ProfilUpdateRequests.js
index 7ce7e130e..9b7ad48d4 100755
--- a/public/js/apps/Cis/ProfilUpdateRequests.js
+++ b/public/js/apps/Cis/ProfilUpdateRequests.js
@@ -18,9 +18,9 @@ const app = Vue.createApp({
         ajaxURLGenerator: (url,config,params)=>{
           //? this function needs to be an array function in order to access the this properties of the Vue component
           if(this.showAll){
-            return url +"getAllRequests";
+            return url +"getProfilUpdates";
           }else{
-            return url +"getPendingRequests";
+            return url +"getProfilUpdates/pending";
           }
           
         },
@@ -97,7 +97,7 @@ const app = Vue.createApp({
               //! function that is called when clicking on a row in the table
 
               let cellData = cell.getRow().getData();
-
+              console.log("cellData",cellData);
               AcceptDenyUpdate.popup({ value: cellData })
                 .then((res) => {
                   console.log("res of the modal: ", res);
@@ -146,8 +146,8 @@ const app = Vue.createApp({
     <div  class="form-underline flex-fill ">
       <div class="form-underline-titel">Show Profil Requests</div>
 
-      <select class="mb-2 " v-model="showAll" @change="updateData" class="form-select" aria-label="Profil updates display selection">
-        <option :selected="true" :value="false">Only Pending Requests</option>
+      <select class="mb-4 " v-model="showAll" @change="updateData" class="form-select" aria-label="Profil updates display selection">
+        <option :selected="true" :value="false">Pending Requests</option>
         <option :value="true">All Requests</option>
       </select>
   
diff --git a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
index ee0b48241..ca05ae500 100755
--- a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
+++ b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
@@ -3,6 +3,7 @@ import Alert from "../../Bootstrap/Alert.js";
 import Kontakt from "../Profil/ProfilComponents/Kontakt.js";
 import Adresse from "../Profil/ProfilComponents/Adresse.js";
 
+
 export default {
   components: {
     BsModal,
@@ -119,6 +120,7 @@ export default {
 
     <template v-slot:default>
 
+    
     <!-- debugging prints 
     <pre>{{JSON.stringify(data.profil_update_id,null,2)}}</pre>
     <pre>view {{getComponentView}}</pre>
@@ -188,7 +190,7 @@ export default {
 
       <span  class="form-underline-content" >{{data.requested_change.value}}</span>
     </div>
-    <div v-if="data.requested_change.files.length" class="ms-2">
+    <div v-if="data.requested_change.files?.length" class="ms-2">
     <!--<p>files:</p>-->
     <a  v-for="file in data.requested_change.files" target="_blank" :href="getDocumentLink(file.dms_id)" >{{file.name}}</a>
     </div>

From 4faaa78ee1dd370273bbb73871873a9e4553efd3 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 5 Feb 2024 13:16:51 +0100
Subject: [PATCH 0376/1461] also shows the zustelladresse checkbox when viewing
 an Adresse component in the hr View for Profil Updates

---
 application/controllers/Cis/ProfilUpdate.php  |  2 +-
 public/js/apps/Cis/ProfilUpdateRequests.js    |  4 +--
 .../Cis/Profil/ProfilComponents/Adresse.js    | 26 +++++++++++++++++--
 .../Cis/ProfilUpdate/AcceptDenyUpdate.js      |  2 +-
 4 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
index 9411640f7..44fce82af 100755
--- a/application/controllers/Cis/ProfilUpdate.php
+++ b/application/controllers/Cis/ProfilUpdate.php
@@ -80,7 +80,7 @@ class ProfilUpdate extends Auth_Controller
 			$insertID = $this->handleAdresse($requested_change, $personID);
 			$insertID = hasData($insertID) ? getData($insertID) : null;
 			if(isset($insertID)) {
-				$requested_change['kontakt_id'] = $insertID;
+				$requested_change['adresse_id'] = $insertID;
 				$update_res = $this->updateRequestedChange($id,$requested_change);
 				if(isError($update_res)){
 					echo json_encode(error("was not able to add addresse_id " . $insertID . " to profilRequest " . $id ));
diff --git a/public/js/apps/Cis/ProfilUpdateRequests.js b/public/js/apps/Cis/ProfilUpdateRequests.js
index 9b7ad48d4..126fc5fed 100755
--- a/public/js/apps/Cis/ProfilUpdateRequests.js
+++ b/public/js/apps/Cis/ProfilUpdateRequests.js
@@ -97,7 +97,7 @@ const app = Vue.createApp({
               //! function that is called when clicking on a row in the table
 
               let cellData = cell.getRow().getData();
-              console.log("cellData",cellData);
+              
               AcceptDenyUpdate.popup({ value: cellData })
                 .then((res) => {
                   console.log("res of the modal: ", res);
@@ -144,7 +144,7 @@ const app = Vue.createApp({
     <div>
     
     <div  class="form-underline flex-fill ">
-      <div class="form-underline-titel">Show Profil Requests</div>
+      <div class="form-underline-titel">Show </div>
 
       <select class="mb-4 " v-model="showAll" @change="updateData" class="form-select" aria-label="Profil updates display selection">
         <option :selected="true" :value="false">Pending Requests</option>
diff --git a/public/js/components/Cis/Profil/ProfilComponents/Adresse.js b/public/js/components/Cis/Profil/ProfilComponents/Adresse.js
index 1c2d3b442..c51442647 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/Adresse.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/Adresse.js
@@ -1,5 +1,12 @@
 export default {
-    props:{data:Object, view:String},
+    props:{
+        data:Object,
+        view:String,
+        withZustelladresse:{
+            type:Boolean,
+            default:false,
+        },
+    },
     data(){
         return{}
     },
@@ -7,6 +14,7 @@ export default {
         
     },
     template:`
+    
     <div class="gy-2 row justify-content-center align-items-center">
     
     <!-- column 1 in the address row -->
@@ -27,6 +35,9 @@ export default {
         </div>
         
     <!-- column 2 in the address row -->
+        
+      
+        
         <div  class="offset-1 offset-sm-0 offset-xl-1 offset-xxl-0 order-2 order-sm-4 order-xl-2 order-xxl-4 col-11 col-sm-5  col-xl-11 col-xxl-5  ">
             
 
@@ -43,12 +54,23 @@ export default {
             <span class="form-underline-content">{{data.ort}} </span>
             </div>
         </div>
-        <div  class="offset-1 offset-sm-0 order-4 order-sm-2 order-xl-4 order-xxl-2 col-11 col-sm-3 col-xl-4 col-xxl-3 ">
+        <div  class=" offset-1 offset-sm-0 order-4 order-sm-2 order-xl-4 order-xxl-2 col-11 col-sm-3 col-xl-4 col-xxl-3 ">
             <div class="form-underline ">
             <div class="form-underline-titel">PLZ</div>
             <span class="form-underline-content">{{data.plz}} </span>
             </div>
         </div>
+
+        <div v-if="withZustelladresse" class="order-5 offset-1 col-11">
+        <div class="form-underline ">
+        <div class="form-underline-titel">Zustelladresse</div>
+            <div class="ms-2 form-check ">
+                <input class="form-check-input" type="checkbox"  @click.prevent :checked="data.zustelladresse"  >
+               
+            </div>
+
+        </div>
+        </div>
     </div>
     `
 
diff --git a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
index ca05ae500..7f342a41e 100755
--- a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
+++ b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
@@ -197,7 +197,7 @@ export default {
     </template>
 
 
-    <component v-else :is="getComponentView" :data="data.requested_change"></component>
+    <component v-else :is="getComponentView" :withZustelladresse="getComponentView==='adresse'?true:false" :data="data.requested_change"></component>
     </div>
     </div>
     </div>

From ff88581ecd3850d847aa83903b625147c37c57bf Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 5 Feb 2024 14:26:38 +0100
Subject: [PATCH 0377/1461] stores the value of the selection to show all or
 only the pending Profil update requests in the sessionStorage

---
 public/js/apps/Cis/ProfilUpdateRequests.js    | 16 ++++++++++------
 .../Cis/ProfilUpdate/AcceptDenyUpdate.js      | 19 ++++++++++---------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/public/js/apps/Cis/ProfilUpdateRequests.js b/public/js/apps/Cis/ProfilUpdateRequests.js
index 126fc5fed..24e33110e 100755
--- a/public/js/apps/Cis/ProfilUpdateRequests.js
+++ b/public/js/apps/Cis/ProfilUpdateRequests.js
@@ -130,16 +130,20 @@ const app = Vue.createApp({
     }
   },
   methods: {
-    updateData: function(){
+    updateData: function(event){
       
       this.$refs.UpdatesTable.tabulator.setData(); 
-       /* 
-        console.log(this.profil_updates_table_options.ajaxURL);
-       */
+      //? store the selected view in the session storage of the browser
+      sessionStorage.setItem("showAll",event.target.value);
     }
   },
-  created() {},
-  mounted() {},
+  mounted() {
+    if(!(sessionStorage.getItem("showAll")===null))
+    {
+      this.showAll = sessionStorage.getItem("showAll");
+    }
+   
+  },
   template: `
     <div>
     
diff --git a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
index 7f342a41e..896a2edf9 100755
--- a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
+++ b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
@@ -144,15 +144,6 @@ export default {
 
 
     
-    <div  class="form-underline mb-2 col">
-      <div class="form-underline-titel">Status message: </div>
-      <!-- only status timestamp and status message can be null in the database -->
-      <span  class="form-underline-content" >{{data.status_message? data.status_message : '-'}}</span>
-    </div>
-
-
-
-
     <div  class="form-underline mb-2 col">
       <div class="form-underline-titel">UserID: </div>
 
@@ -179,6 +170,16 @@ export default {
 
     </div>
 
+    <!-- Row with the status message is only visible if the request is not pending and the message is not empty -->
+    <div v-if="data.status !=='pending' && data.status_message" class="row">
+    <div class="col">
+    <div  class="form-underline mb-2 ">
+    <div class="form-underline-titel">Status message</div>
+    <textarea  class="form-control" rows="4" disabled>{{data.status_message}} </textarea>
+    </div>
+    </div>
+    </div>
+
     <div class="row my-4">
     <div class="col ">
     <div class="card">

From c6d4c34cadd38eb405fb58acb47faacc934d78ce Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 5 Feb 2024 15:32:03 +0100
Subject: [PATCH 0378/1461] define AnwesenheitenByLektor in
 system/filtersupdate.php

---
 system/filtersupdate.php | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/system/filtersupdate.php b/system/filtersupdate.php
index cc9abfb98..618fedfa5 100644
--- a/system/filtersupdate.php
+++ b/system/filtersupdate.php
@@ -1278,6 +1278,38 @@ $filters = array(
 			}
 		',
 		'oe_kurzbz' => null,
+	),
+	array(
+		'app' => 'core',
+		'dataset_name' => 'AnwesenheitenByLektor',
+		'filter_kurzbz' => 'anwByLektor',
+		'description' => '{AnwesenheitenByLektor}',
+		'sort' => 2,
+		'default_filter' => true,
+		'filter' => '
+			{
+				"name": "Anwesenheiten By Lektor",
+				"columns": [
+					{"name": "Vorname"},
+					{"name": "Nachname"},
+					{"name": "Aktuelles Datum"},
+					{"name": "Summe"}
+				],
+				"filters": [
+					{
+						"name": "Aktuelles Datum",
+						"operation": "ncontains",
+						"condition": "anw"
+					},
+					{
+						"name": "Aktuelles Datum",
+						"operation": "contains",
+						"condition": "abw"
+					}
+				]
+			}
+		',
+		'oe_kurzbz' => null,
 	)
 );
 

From f47650f5e9037ba2ee2cd9145f706382de81a107 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 5 Feb 2024 15:33:51 +0100
Subject: [PATCH 0379/1461] shows a menu when right clicking a profil update
 request in the hr view

---
 public/js/apps/Cis/ProfilUpdateRequests.js    | 81 +++++++++++++++----
 .../Cis/ProfilUpdate/AcceptDenyUpdate.js      | 21 +++--
 2 files changed, 77 insertions(+), 25 deletions(-)

diff --git a/public/js/apps/Cis/ProfilUpdateRequests.js b/public/js/apps/Cis/ProfilUpdateRequests.js
index 24e33110e..21bf32444 100755
--- a/public/js/apps/Cis/ProfilUpdateRequests.js
+++ b/public/js/apps/Cis/ProfilUpdateRequests.js
@@ -11,6 +11,59 @@ const app = Vue.createApp({
     return {
       showAll: false,
       profil_updates_table_options: {
+        
+       
+        rowContextMenu: (e, component)=>{
+
+          let menu =[];
+          if(component.getData().status === "pending"){
+            menu.push(
+              
+                {
+                    label:"<i class='fa fa-check'></i> Accept Request",
+                    action:(e, column)=>{
+                      Vue.$fhcapi.ProfilUpdate.acceptProfilRequest(column.getData()).then((res) => {
+                        this.$refs.UpdatesTable.tabulator.setData();
+                      });
+                   
+                    }
+                },
+                {
+                    separator:true,
+                },
+                {
+                    label:" <i style='width:16px' class='text-center fa fa-xmark'></i> Deny Request",
+                    action:(e, column)=>{
+                      
+                      Vue.$fhcapi.ProfilUpdate.denyProfilRequest(column.getData()).then((res) => {
+                        this.$refs.UpdatesTable.tabulator.setData();
+                      });
+                    }
+                },
+                {
+                    separator:true,
+                },
+                {
+                    label:"<i class='fa fa-eye'></i> Show Request",
+                    action:(e, column)=>{
+                      this.showModal(column.getData());
+                    }
+                }
+              
+            );
+          }else{
+            menu.push(
+              {
+                label:"<i class='fa fa-eye'></i> Show Request",
+                action:(e, column)=>{
+                  this.showModal(column.getData());
+                }
+              }
+            )
+          }
+          return menu;
+
+        } ,
         ajaxURL:FHC_JS_DATA_STORAGE_OBJECT.app_root +
         FHC_JS_DATA_STORAGE_OBJECT.ci_router +
         `/Cis/ProfilUpdate/`,
@@ -66,8 +119,6 @@ const app = Vue.createApp({
             hozAlign: "center",
             headerFilter: true,
             formatter: function (cell, para) {
-              let res = Object.getPrototypeOf(cell);
-              //console.log(res);
 
               switch (cell.getValue()) {
                 case "pending":
@@ -95,20 +146,9 @@ const app = Vue.createApp({
             hozAlign: "center",
             cellClick: (e, cell) => {
               //! function that is called when clicking on a row in the table
-
               let cellData = cell.getRow().getData();
+              this.showModal(cellData);
               
-              AcceptDenyUpdate.popup({ value: cellData })
-                .then((res) => {
-                  console.log("res of the modal: ", res);
-                  //? refetches the data, if any request was denied or accepted
-                  //* setData will call the ajaxURL again to refresh the data
-                  this.$refs.UpdatesTable.tabulator.setData();
-                })
-                .catch((e) => {
-                  //? catches the rejected Promise if the result of the modal was falsy
-                  console.log("catch of the modal: ", e);
-                });
             },
             //responsive:0,
           },
@@ -130,6 +170,19 @@ const app = Vue.createApp({
     }
   },
   methods: {
+    showModal: function(value){
+      AcceptDenyUpdate.popup({ value: value })
+                .then((res) => {
+                  console.log("res of the modal: ", res);
+                  //? refetches the data, if any request was denied or accepted
+                  //* setData will call the ajaxURL again to refresh the data
+                  this.$refs.UpdatesTable.tabulator.setData();
+                })
+                .catch((e) => {
+                  //? catches the rejected Promise if the result of the modal was falsy
+                  console.log("catch of the modal: ", e);
+                });
+    },
     updateData: function(event){
       
       this.$refs.UpdatesTable.tabulator.setData(); 
diff --git a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
index 896a2edf9..0e6c0c3d3 100755
--- a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
+++ b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
@@ -49,18 +49,14 @@ export default {
     },
     acceptRequest: function () {
       Vue.$fhcapi.ProfilUpdate.acceptProfilRequest(this.data).then((res) => {
-        console.log("res", res);
-        console.log("res.data", res.data);
         this.result = true;
       });
       this.hide();
     },
 
     denyRequest: function () {
-      console.log(this.data.profil_update_id);
+      
       Vue.$fhcapi.ProfilUpdate.denyProfilRequest(this.data).then((res) => {
-        console.log("res", res);
-        console.log("res.data", res.data);
         this.result = true;
       });
       this.hide();
@@ -129,14 +125,14 @@ export default {
     -->
     
    <div class="row">
-    <div  class="form-underline mb-2 col">
+    <div  class="form-underline mb-2 col-12 col-sm-6">
       <div class="form-underline-titel">Status: </div>
 
       <span  class="form-underline-content" >{{data.status}}</span>
     </div>
 
 
-    <div  class="form-underline mb-2 col">
+    <div v-if="data.status!=='pending'" class="form-underline mb-2 col-12 col-sm-6">
       <div class="form-underline-titel">Date of Status: </div>
       <!-- only status timestamp and status message can be null in the database -->
       <span  class="form-underline-content" >{{data.status_timestamp?data.status_timestamp:'-'}}</span>
@@ -144,16 +140,19 @@ export default {
 
 
     
-    <div  class="form-underline mb-2 col">
+    <div  class="form-underline mb-2 col-12 col-sm-6">
       <div class="form-underline-titel">UserID: </div>
 
       <span  class="form-underline-content" >{{data.uid}}</span>
     </div>
 
+    <div  class="form-underline mb-2 col-12 col-sm-6">
+      <div class="form-underline-titel">Name: </div>
 
+      <span  class="form-underline-content" >{{data.name}}</span>
+    </div>
 
-
-    <div  class="form-underline mb-2 col">
+    <div  class="form-underline mb-2 col-12 col-sm-6">
       <div class="form-underline-titel">Topic of Request: </div>
 
       <span  class="form-underline-content" >{{data.topic}}</span>
@@ -162,7 +161,7 @@ export default {
 
 
 
-    <div  class="form-underline mb-2 col">
+    <div  class="form-underline mb-2 col-12 col-sm-6">
       <div class="form-underline-titel">Date of Request:</div>
 
       <span  class="form-underline-content" >{{data.insertamum}}</span>

From 1ddf5a8370ba5f76786d9fd30bce18b4f56042f9 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 6 Feb 2024 08:08:17 +0100
Subject: [PATCH 0380/1461] Notizcomponent: Tinymce optional

---
 .../controllers/components/stv/Notiz.php      |  8 +-
 public/js/components/Notiz/NotizComponent.js  | 81 ++++++++++---------
 .../Studentenverwaltung/Details/Notizen.js    | 19 ++---
 3 files changed, 55 insertions(+), 53 deletions(-)

diff --git a/application/controllers/components/stv/Notiz.php b/application/controllers/components/stv/Notiz.php
index ddf10b8a9..4918e6627 100644
--- a/application/controllers/components/stv/Notiz.php
+++ b/application/controllers/components/stv/Notiz.php
@@ -224,8 +224,8 @@ class Notiz extends FHC_Controller
 		$bearbeiter_uid = isset($_POST['bearbeiter']) ? $_POST['bearbeiter'] : $uid;
 		$erledigt = $this->input->post('erledigt');
 		//$type = $this->input->post('typeId'); //soll auch dieser geändert werden können?
-		$start = $this->input->post('Von');
-		$ende = $this->input->post('Bis');
+		$start = $this->input->post('von');
+		$ende = $this->input->post('bis');
 
 		$result = $this->NotizModel->update(
 			[
@@ -443,7 +443,7 @@ class Notiz extends FHC_Controller
 	public function titel_required($value)
 	{
 		if (empty($value)) {
-			$this->form_validation->set_message('titel_required',  $this->p->t('ui','error_fieldRequired',['field' => 'Titel']));
+			$this->form_validation->set_message('titel_required', $this->p->t('ui', 'error_fieldRequired', ['field' => 'Titel']));
 			return false;
 		}
 		else
@@ -455,7 +455,7 @@ class Notiz extends FHC_Controller
 	public function text_required($value)
 	{
 		if (empty($value)) {
-			$this->form_validation->set_message('text_required', $this->p->t('ui','error_fieldRequired',['field' => 'Text']));
+			$this->form_validation->set_message('text_required', $this->p->t('ui', 'error_fieldRequired', ['field' => 'Text']));
 			return false;
 		}
 		else
diff --git a/public/js/components/Notiz/NotizComponent.js b/public/js/components/Notiz/NotizComponent.js
index 0d6dbae69..dd0abab23 100644
--- a/public/js/components/Notiz/NotizComponent.js
+++ b/public/js/components/Notiz/NotizComponent.js
@@ -18,7 +18,8 @@ export default {
 		'typeId',
 		'id',
 		'showErweitert',
-		'showDocument'
+		'showDocument',
+		'showTinyMCE'
 		],
 	data(){
 		return {
@@ -45,7 +46,9 @@ export default {
 							let button = document.createElement('button');
 							button.className = 'btn btn-outline-secondary btn-action';
 							button.innerHTML = '<i class="fa fa-edit"></i>';
-							button.addEventListener('click', (event) =>
+							button.addEventListener(
+								'click',
+								(event) =>
 								this.actionEditNotiz(cell.getData().notiz_id)
 							);
 							container.append(button);
@@ -53,7 +56,9 @@ export default {
 							button = document.createElement('button');
 							button.className = 'btn btn-outline-secondary btn-action';
 							button.innerHTML = '<i class="fa fa-xmark"></i>';
-							button.addEventListener('click', () =>
+							button.addEventListener(
+								'click',
+								() =>
 								this.actionDeleteNotiz(cell.getData().notiz_id)
 							);
 							container.append(button);
@@ -61,8 +66,7 @@ export default {
 							return container;
 						},
 						frozen: true
-					}
-				],
+				}],
 				layout: 'fitDataFill',
 				layoutColumnsOnNewData: false,
 				height: '150',
@@ -109,14 +113,15 @@ export default {
 					this.notizData.titel = this.notizen.titel;
 					this.notizData.statusNew = false;
 					this.notizData.text = this.notizen.text;
+					this.notizData.intText = this.notizen.text;
 					this.notizData.lastChange = this.notizen.lastupdate;
 					this.notizData.von = this.notizen.start;
 					this.notizData.bis = this.notizen.ende;
 					this.notizData.document = this.notizen.dms_id;
 					this.notizData.erledigt = this.notizen.erledigt;
-					this.notizData.verfasser = this.notizen.verfasser_uid; //todo(manu) better
+					this.notizData.verfasser = this.notizen.verfasser_uid;
 					this.notizData.intVerfasser = this.notizen.verfasser_uid;
-					this.notizData.intBearbeiter = this.notizen.bearbeiter_uid; //todo(manu) better
+					this.notizData.intBearbeiter = this.notizen.bearbeiter_uid;
 					this.notizData.bearbeiter = this.notizen.bearbeiter_uid;
 				}
 			})
@@ -170,19 +175,17 @@ export default {
 						this.$fhcAlert.alertError('Keine Notiz mit Id ' + notiz_id + ' gefunden');
 					}
 				}).catch(error => {
-				this.$fhcAlert.alertError('Fehler bei Löschroutine aufgetreten');
-			}).finally(()=> {
-				window.scrollTo(0, 0);
-			});
+					this.$fhcAlert.alertError('Fehler bei Löschroutine aufgetreten');
+				}).finally(()=> {
+					window.scrollTo(0, 0);
+				});
 		},
 		loadNotiz(notiz_id){
-			return CoreRESTClient.get(
-				'components/stv/Notiz/loadNotiz/' + notiz_id)
+			return CoreRESTClient.get('components/stv/Notiz/loadNotiz/' + notiz_id)
 				.then(
 					result => {
 						if(result.data.retval) {
 							this.notizen = result.data.retval;
-							//console.log(this.notizen);
 						}
 						else {
 							this.notizen = {};
@@ -273,7 +276,7 @@ export default {
 					this.filteredMitarbeiter = CoreRESTClient.getData(result.data);
 				});
 		},
-/*		initTinyMCE() {
+		initTinyMCE() {
 
 			const vm = this;
 			tinymce.init({
@@ -299,16 +302,22 @@ export default {
 
 					editor.on('input', () => {
 						const newContent = editor.getContent();
-						vm.intText =  newContent;
+						vm.notizData.text = newContent;
+						//vm.text =  newContent;
+						console.log('vm.text: ' + newContent);
 					});
 				},
 			});
-		},*/
+		},
+		updateText(value) {
+			this.notizData.text = value;
+		}
 	},
 	created(){
 		this.getUid();
 	},
 	async mounted() {
+		this.initTinyMCE();
 		await this.$p.loadCategory(['notiz','global']);
 
 		let cm = this.$refs.table.tabulator.columnManager;
@@ -341,11 +350,9 @@ export default {
 			title: this.$p.t('notiz', 'letzte_aenderung')
 		});
 	},
-/*	mounted() {
-		this.initTinyMCE();
-	},*/
-/*	watch: {
-		intText: function(newVal) {
+	watch: {
+		//watcher für Tinymce-Textfeld
+		'notizData.text': function (newVal) {
 			const tinymcsVal = this.editor.getContent();
 
 			if (tinymcsVal != newVal) {
@@ -353,11 +360,6 @@ export default {
 				this.editor.setContent(newVal);
 			}
 		},
-	},*/
-	beforeDestroy() {
-		this.editor.destroy();
-	},
-	watch: {
 		//Watcher für autocomplete Bearbeiter und Verfasser
 		'notizData.intBearbeiter': {
 			handler(newVal) {
@@ -376,6 +378,9 @@ export default {
 			deep: true
 		}
 	},
+	beforeDestroy() {
+		this.editor.destroy();
+	},
 	template: `
 	<div class="notiz-notiz">
 
@@ -431,14 +436,18 @@ export default {
 				<div class="row mb-3">
 					<label for="text" class="form-label col-sm-2">{{$p.t('global','text')}}</label>
 						
-					<!--Todo(manu) make TINYMCE optional	-->	
 					<!-- TinyMce 5 -->
-<!--					<div class="col-sm-7">
-						<textarea ref="editor" rows="5" cols="75" class="form-control"></textarea>
+					<div v-if="showTinyMCE"class="col-sm-7">
+						<textarea
+						ref="editor"
+						rows="5"
+						cols="75"
+						class="form-control"
+						:value="notizData.text"
+     					@input="updateText"></textarea>
 					</div>
-					-->
-
-					<div class="col-sm-7">
+					
+					<div v-else class="col-sm-7">
 						<textarea rows="5" cols="75" v-model="notizData.text" class="form-control"></textarea>
 					</div>
 				
@@ -470,7 +479,7 @@ export default {
 					<div class="col-sm-3">
 						<vue-date-picker
 							id="von"
-							v-model="notizData.Von"
+							v-model="notizData.von"
 							clearable="false"
 							auto-apply
 							:enable-time-picker="false"
@@ -490,13 +499,13 @@ export default {
 					<div class="col-sm-3">
 						<vue-date-picker
 							id="bis"
-							v-model="notizData.Bis"
+							v-model="notizData.bis"
 							clearable="false"
 							auto-apply
 							:enable-time-picker="false"
 							format="dd.MM.yyyy"
 							preview-format="dd.MM.yyyy"></vue-date-picker>
-					</div>				
+					</div>
 					
 				</div>
 									
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
index 498096ad3..6281401df 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
@@ -9,8 +9,10 @@ export default {
 	},
 	data(){
 		return {
-			showErweitert: true, //show details verfasser, bearbeiter, von, bis, erledigt
+/*			showErweitert: true, //show details verfasser, bearbeiter, von, bis, erledigt
 			showDocument: true, //show upload documents
+			showTinyMCE: true
+ */
 		};
 	},
 	template: `
@@ -22,7 +24,8 @@ export default {
 			:id="modelValue.person_id"
 			:showErweitert=true
 			:showDocument=true
-			>		
+			:showTinyMCE=true
+			>
 		</NotizComponent>
 		
 		<br><br>
@@ -33,19 +36,9 @@ export default {
 			:id="modelValue.prestudent_id"
 			:showErweitert=false
 			:showDocument=true
-			>		
+			>
 		</NotizComponent>
 		
-		<br><br>
-		<h3>Test Projekt</h3>
-		<NotizComponent
-			ref="formc"
-			typeId="projekt_kurzbz"
-			:id="ZeitErfassung"
-			:showErweitert=true
-			:showDocument=false
-			>		
-		</NotizComponent>
 	</div>
 	`
 };

From 3d2c7e4026f99efd442152e55d94e2892d976543 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 6 Feb 2024 11:26:45 +0100
Subject: [PATCH 0381/1461] sorts the data of the profil updates before
 displaying them in a table and tooltips have been added to the hr profil
 update requests table

---
 public/js/apps/Cis/Profil.js                  | 23 +++++++
 public/js/apps/Cis/ProfilUpdateRequests.js    | 61 +++++++++++++++++--
 .../components/Cis/Profil/EditProfilSelect.js |  1 +
 .../Cis/Profil/MitarbeiterProfil.js           |  5 ++
 .../ProfilComponents/TextInputDokument.js     |  2 +-
 5 files changed, 86 insertions(+), 6 deletions(-)

diff --git a/public/js/apps/Cis/Profil.js b/public/js/apps/Cis/Profil.js
index a490eddc5..952df4e0e 100755
--- a/public/js/apps/Cis/Profil.js
+++ b/public/js/apps/Cis/Profil.js
@@ -44,6 +44,29 @@ const app = Vue.createApp({
 		ViewStudentProfil,
 		ViewMitarbeiterProfil,
 	},
+	provide: {
+		
+		
+		  sortProfilUpdates: (ele1,ele2)=>{
+
+			let result = 0;
+			if(ele1.status === 'pending'){
+			  result= -1;
+			}
+			else if(ele1.status === 'accepted'){
+			  result= ele2.status ==='rejected'? -1 : 1;
+			}
+			else{
+			  result= 1;
+			}
+			//? if they have the same status the insert date is used for ordering
+			if(ele1.status === ele2.status){
+			  result= new Date(ele2.insertamum.split('.').reverse().join('-')) - new Date(ele1.insertamum.split('.').reverse().join('-'));
+			}
+			return result;
+		  }
+		
+	},
 	data() {
 		return {
 			view:null,
diff --git a/public/js/apps/Cis/ProfilUpdateRequests.js b/public/js/apps/Cis/ProfilUpdateRequests.js
index 21bf32444..9a9766cb6 100755
--- a/public/js/apps/Cis/ProfilUpdateRequests.js
+++ b/public/js/apps/Cis/ProfilUpdateRequests.js
@@ -3,6 +3,25 @@ import { CoreFilterCmpt } from "../../components/filter/Filter.js";
 import AcceptDenyUpdate from "../../components/Cis/ProfilUpdate/AcceptDenyUpdate.js";
 Vue.$fhcapi = fhcapifactory;
 
+const sortProfilUpdates = (ele1,ele2)=>{
+
+  let result = 0;
+  if(ele1.status === 'pending'){
+    result= -1;
+  }
+  else if(ele1.status === 'accepted'){
+    result= ele2.status ==='rejected'? -1 : 1;
+  }
+  else{
+    result= 1;
+  }
+  //? if they have the same status the insert date is used for ordering
+  if(ele1.status === ele2.status){
+    result= new Date(ele2.insertamum.split('.').reverse().join('-')) - new Date(ele1.insertamum.split('.').reverse().join('-'));
+  }
+  return result;
+  };
+
 const app = Vue.createApp({
   components: {
     CoreFilterCmpt,
@@ -12,7 +31,39 @@ const app = Vue.createApp({
       showAll: false,
       profil_updates_table_options: {
         
-       
+        ajaxResponse:function(url, params, response){
+            //url - the URL of the request
+            //params - the parameters passed with the request
+            //response - the JSON object returned in the body of the response.
+            //? sorts the response data from the backend
+            response.sort(sortProfilUpdates);
+            return response;  
+        },
+        //? adds tooltip with the status message of a profil update request if its status is not pending
+        columnDefaults:{
+          tooltip:function(e, cell, onRendered){
+              //e - mouseover event
+              //cell - cell component
+              //onRendered - onRendered callback registration function
+              let statusMessage = cell.getData().status_message;
+              let statusDate = cell.getData().status_timestamp;
+              let status = cell.getData().status;
+              if(!statusMessage){
+                return null;
+              }
+              let el = document.createElement("div");
+              el.classList.add("border","border-dark");
+              
+              let statusDateEl = document.createElement("p");
+              statusDateEl.innerHTML = "Request was "+ status + " on " + statusDate ;
+              let statusMessageEl = document.createElement("span");
+              statusMessageEl.innerHTML = "Status message: " + statusMessage ;
+              
+              el.appendChild(statusDateEl);
+              el.appendChild(statusMessageEl);  
+              return el; 
+          },
+      },
         rowContextMenu: (e, component)=>{
 
           let menu =[];
@@ -79,7 +130,7 @@ const app = Vue.createApp({
         },
         height: 600,
         layout: "fitColumns",
-
+       
         columns: [
           {
             title: "UID",
@@ -122,11 +173,11 @@ const app = Vue.createApp({
 
               switch (cell.getValue()) {
                 case "pending":
-                  return "<i class='fa fa-circle-info text-info fa-lg'></i> pending";
+                  return "<div class='row justify-content-center'><div class='col-2'><i class='fa fa-circle-info text-info fa-lg'></i></div> <div class='col-4'><span>pending</span></div></div>";
                 case "accepted":
-                  return "<i class='fa fa-circle-check text-success fa-lg'></i> accepted";
+                  return "<div class='row justify-content-center'><div class='col-2'><i class='fa fa-circle-check text-success fa-lg'></i></div> <div class='col-4'><span>accepted</span></div></div>";
                 case "rejected":
-                  return "<i class='fa-solid fa-circle-xmark text-danger fa-lg '></i> rejected";
+                  return "<div class='row justify-content-center'><div class='col-2'><i class='fa-solid fa-circle-xmark text-danger fa-lg '></i></div> <div class='col-4'><span>rejected</span></div></div>";
                 default:
                   return "<p>default</p>";
               }
diff --git a/public/js/components/Cis/Profil/EditProfilSelect.js b/public/js/components/Cis/Profil/EditProfilSelect.js
index e0463b21d..615ddcc18 100755
--- a/public/js/components/Cis/Profil/EditProfilSelect.js
+++ b/public/js/components/Cis/Profil/EditProfilSelect.js
@@ -95,6 +95,7 @@ export default {
       this.$emit("submit");
     },
 
+    //TODO: REWRITE THIS TO USE PROVIDE AND INJECT
     profilUpdateEmit: function (event) {
       //? passes the updated profil information to the parent component
 
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 147553152..214d30113 100755
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -26,6 +26,7 @@ export default {
     RoleInformation,
     ProfilInformation,
   },
+  inject: ['sortProfilUpdates'],
   data() {
     return {
 
@@ -163,6 +164,7 @@ export default {
             .then((res) =>{
               if(!res.error){
                 this.data.profilUpdates = res.data.retval;
+                this.data.profilUpdates.sort(this.sortProfilUpdates);
               }else{
                 alert("Error when fetching profile updates: " +res.data.retval);
               }
@@ -242,6 +244,9 @@ export default {
  
   created() {
 
+    //? sorts the profil Updates: pending -> accepted -> rejected
+    this.data.profilUpdates.sort(this.sortProfilUpdates);
+
       this.data.editData = {
         view:null,
         data:{
diff --git a/public/js/components/Cis/Profil/ProfilComponents/TextInputDokument.js b/public/js/components/Cis/Profil/ProfilComponents/TextInputDokument.js
index 3b79ee2db..22149fb0e 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/TextInputDokument.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/TextInputDokument.js
@@ -84,7 +84,7 @@ export default {
     }
   },
   template: `
-    <p style="opacity:0.8" class="ms-2" v-if="withFiles && !updateID">Please update your {{data.titel}} and upload the corresponding Document for proof</p>
+    <p style="opacity:0.8" class="ms-2" v-if="withFiles && !updateID">Please update your {{data.titel}} and upload the corresponding Document of proof</p>
 
     <div class="form-underline">
     <div class="form-underline-titel">{{data.titel?data.titel:"titel"}}</div>

From 1e260a178ce635678318ebf8f4a0e74ee7a853e5 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 6 Feb 2024 16:24:43 +0100
Subject: [PATCH 0382/1461] trying to restructure where editData is created

---
 public/js/apps/Cis/Profil.js                  | 196 +++++++++++++-----
 public/js/components/Cis/Profil/EditProfil.js |   5 +
 .../Cis/Profil/MitarbeiterProfil.js           |  80 +------
 .../ProfilComponents/FetchProfilUpdates.js    |   1 +
 4 files changed, 153 insertions(+), 129 deletions(-)

diff --git a/public/js/apps/Cis/Profil.js b/public/js/apps/Cis/Profil.js
index 952df4e0e..12a037973 100755
--- a/public/js/apps/Cis/Profil.js
+++ b/public/js/apps/Cis/Profil.js
@@ -44,9 +44,62 @@ const app = Vue.createApp({
 		ViewStudentProfil,
 		ViewMitarbeiterProfil,
 	},
-	provide: {
+	data() {
+		return {
+			editData: this.filteredEditData,
+			view:null,
+			data:null,
+			// notfound is null by default, but contains an UID if no user exists with that UID
+			notFoundUID:null,
+			
+		}
+	},
+	//? use function syntax for provide so that we can access `this`
+	provide() {
+		return {
 		
+			editData:this.editData,
+			collapseFunction:  (e, column)=> {
 		
+				//* check if property doesn't exist already and add it to the reactive this properties
+				if(this[e.target.id] === undefined){
+				this[e.target.id] = true
+			
+				} 
+				this[e.target.id]=!this[e.target.id];
+			
+				//* gets all event icons of the different rows to use the onClick event later
+				let allClickableIcons = column._column.cells.map((row) => {
+				return row.element.children[0];
+				});
+			
+				//* changes the icon that shows or hides all the collapsed columns
+				//* if the replace function does not find the class to replace, it just simply returns false
+				if (this[e.target.id]) {
+				e.target.classList.replace("fa-angle-up", "fa-angle-down");
+				} else {
+				e.target.classList.replace("fa-angle-down", "fa-angle-up");
+				}
+			
+				//* changes the icon for every collapsed column to open or closed
+				if (this[e.target.id]) {
+				allClickableIcons
+					.filter((column) => {
+					return !column.classList.contains("open");
+					})
+					.forEach((col) => {
+					col.click();
+					});
+				} else {
+				allClickableIcons
+					.filter((column) => {
+					return column.classList.contains("open");
+					})
+					.forEach((col) => {
+					col.click();
+					});
+				}
+		  },
 		  sortProfilUpdates: (ele1,ele2)=>{
 
 			let result = 0;
@@ -65,64 +118,95 @@ const app = Vue.createApp({
 			}
 			return result;
 		  }
-		
-	},
-	data() {
-		return {
-			view:null,
-			data:null,
-			// notfound is null by default, but contains an UID if no user exists with that UID
-			notFoundUID:null,
-			
 		}
+		
 	},
-	methods: {
-		//? arrow function because it references to the this element of the components that use the function
-		collapseFunction: function (e, column) {
-		
-		  //* check if property doesn't exist already and add it to the reactive this properties
-		  if(this[e.target.id] === undefined){
-			this[e.target.id] = true
-		
-		  } 
-		  this[e.target.id]=!this[e.target.id];
-	  
-		  //* gets all event icons of the different rows to use the onClick event later
-		  let allClickableIcons = column._column.cells.map((row) => {
-			return row.element.children[0];
-		  });
-	  
-		  //* changes the icon that shows or hides all the collapsed columns
-		  //* if the replace function does not find the class to replace, it just simply returns false
-		  if (this[e.target.id]) {
-			e.target.classList.replace("fa-angle-up", "fa-angle-down");
-		  } else {
-			e.target.classList.replace("fa-angle-down", "fa-angle-up");
-		  }
-	  
-		  //* changes the icon for every collapsed column to open or closed
-		  if (this[e.target.id]) {
-			allClickableIcons
-			  .filter((column) => {
-				return !column.classList.contains("open");
-			  })
-			  .forEach((col) => {
-				col.click();
-			  });
-		  } else {
-			allClickableIcons
-			  .filter((column) => {
-				return column.classList.contains("open");
-			  })
-			  .forEach((col) => {
-				col.click();
-			  });
-		  }
-		},
+	computed:{
 
-		
-        
+		filteredEditData(){
+			if(!this.data){
+				return;
+			}
+			
+			
+			return {
+			  view:null,
+			  data:{
+			  Personen_Informationen : {
+				title:"Personen Informationen",
+				view:null,
+				data:{
+				  
+				  vorname: {
+					title:"vorname",
+					view:"TextInputDokument",
+					withFiles:true,
+					data:{
+					  titel:"vorname",
+					  value:this.data.vorname,
+					  
+					}},
+					nachname: {
+					  title:"nachname",
+					  view:"TextInputDokument",
+					  withFiles:true,
+					  data:{
+						titel:"nachname",
+						value:this.data.nachname,
+					  }
+					},
+					titel:{
+					  title:"titel",
+					  view:"TextInputDokument",
+					  withFiles:true,
+					  data:{
+						titel:"titel",
+						value:this.data.titel,
+					  }
+					},
+					postnomen:{
+					  title:"postnomen",
+					  view:"TextInputDokument",
+					  withFiles:true,
+					  data:{
+						titel:"postnomen",
+						value:this.data.postnomen,
+					  }
+					},
+				  }
+				},
+				Private_Kontakte: {
+				  title:"Private Kontakte" ,
+				  data:this.data.kontakte.filter(item => {
+					return !this.data.profilUpdates.some((update) => update.status ==='pending' && update.requested_change?.kontakt_id === item.kontakt_id);
+				  }).map(kontakt => {
+					return {
+					  listview:'Kontakt',
+					  view:'EditKontakt',
+					  data:kontakt
+					}})
+				 },
+				Private_Adressen: {
+				  title: "Private Adressen",
+				  data:this.data.adressen.filter(item => {
+					return !this.data.profilUpdates.some(update => {
+					  return  update.status ==='pending' &&  update.requested_change?.adresse_id == item.adresse_id;
+					})
+				  }).map(kontakt => {
+					return {
+					  listview:'Adresse',
+					  view:'EditAdresse',
+					  data:kontakt
+					}})
+				 },
+				},
+			 
+			};
+		  },
+	  
 	},
+
+
 	created(){
 
 		let path = location.pathname;
@@ -145,7 +229,7 @@ const app = Vue.createApp({
 	},
 	template:`
 	<div>
-
+		<pre>{{JSON.stringify(data.profilUpdates.length,null,2)}}</pre>
 		<div v-if="notFoundUID">
 		
 			<h3>Es wurden keine oder mehrere Profile für {{this.notFoundUID}} gefunden</h3>
diff --git a/public/js/components/Cis/Profil/EditProfil.js b/public/js/components/Cis/Profil/EditProfil.js
index 2963f7371..413a60416 100755
--- a/public/js/components/Cis/Profil/EditProfil.js
+++ b/public/js/components/Cis/Profil/EditProfil.js
@@ -24,6 +24,11 @@ export default {
     onShowBsModal: Function,
     onShownBsModal: Function,
   },
+/*   provide(){
+    return {
+      topic: computed(()=> "test"),
+    }
+  }, */
   data() {
     return {
       topic: null,
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 214d30113..da1812ca2 100755
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -26,7 +26,7 @@ export default {
     RoleInformation,
     ProfilInformation,
   },
-  inject: ['sortProfilUpdates'],
+  inject: ['sortProfilUpdates','collapseFunction','editData'],
   data() {
     return {
 
@@ -56,7 +56,7 @@ export default {
             headerFilter: false,
             formatter: "responsiveCollapse",
             maxWidth: 40,
-            headerClick: this.$parent.collapseFunction,
+            headerClick: this.collapseFunction,
           },
           {
             title: "Bezeichnung",
@@ -108,7 +108,7 @@ export default {
             headerFilter: false,
             formatter: "responsiveCollapse",
             maxWidth: 40,
-            headerClick: this.$parent.collapseFunction,
+            headerClick: this.collapseFunction,
           },
           {
             title: "Betriebsmittel",
@@ -148,7 +148,7 @@ export default {
       Vue.$fhcapi.UserData.selectProfilRequest().then((res)=>{
         
         if(!res.error){
-          this.data.profilUpdates = res.data.retval?.length ? res.data.retval : null ; 
+          this.data.profilUpdates = res.data.retval?.length ? res.data.retval.sort(this.sortProfilUpdates) : null ; 
         }
       });
     },
@@ -156,7 +156,7 @@ export default {
     showModal() {
 
       EditProfil.popup({ 
-          value:JSON.parse(JSON.stringify(this.data.editData)),
+          value:JSON.parse(JSON.stringify(this.editData)),
           title:"Profil bearbeiten",
         }).then((popup_result) => {
           if(popup_result){
@@ -165,6 +165,7 @@ export default {
               if(!res.error){
                 this.data.profilUpdates = res.data.retval;
                 this.data.profilUpdates.sort(this.sortProfilUpdates);
+                
               }else{
                 alert("Error when fetching profile updates: " +res.data.retval);
               }
@@ -247,73 +248,7 @@ export default {
     //? sorts the profil Updates: pending -> accepted -> rejected
     this.data.profilUpdates.sort(this.sortProfilUpdates);
 
-      this.data.editData = {
-        view:null,
-        data:{
-        Personen_Informationen : {
-          title:"Personen Informationen",
-          view:null,
-          data:{
-            
-            vorname: {
-              title:"vorname",
-              view:"TextInputDokument",
-              withFiles:true,
-              data:{
-                titel:"vorname",
-                value:this.data.vorname,
-                
-              }},
-              nachname: {
-                title:"nachname",
-                view:"TextInputDokument",
-                withFiles:true,
-                data:{
-                  titel:"nachname",
-                  value:this.data.nachname,
-                }
-              },
-              titel:{
-                title:"titel",
-                view:"TextInputDokument",
-                withFiles:true,
-                data:{
-                  titel:"titel",
-                  value:this.data.titel,
-                }
-              },
-              postnomen:{
-                title:"postnomen",
-                view:"TextInputDokument",
-                withFiles:true,
-                data:{
-                  titel:"postnomen",
-                  value:this.data.postnomen,
-                }
-              },
-            }
-          },
-          Private_Kontakte: {
-            title:"Private Kontakte" ,
-            data:this.privateKontakte.map(kontakt => {
-              return {
-                listview:'Kontakt',
-                view:'EditKontakt',
-                data:kontakt
-              }})
-           },
-          Private_Adressen: {
-            title: "Private Adressen",
-            data:this.privateAdressen.map(kontakt => {
-              return {
-                listview:'Adresse',
-                view:'EditAdresse',
-                data:kontakt
-              }})
-           },
-          },
-       
-      };
+      
 
   },
   mounted() {
@@ -331,7 +266,6 @@ export default {
   template: ` 
 
   <div class="container-fluid text-break fhc-form"  >
-
     
           <div class="row">
           
diff --git a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
index 70f81ec42..01f71760c 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
@@ -97,6 +97,7 @@ export default {
       if (content) {
         EditProfil.popup({
           value: content,
+          title: updateRequest.topic,
         })
           .then((res) => {
             if (res === true) {

From d56dbdf563c0ee933b87dc1c87bc18770c452d58 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 7 Feb 2024 09:28:30 +0100
Subject: [PATCH 0383/1461] Adaptierung Notizcomponent: teleport datepicker,
 tinymce mount conditionally, fehlerhandling missing id and type

---
 .../controllers/components/stv/Notiz.php      | 15 ---------
 application/models/person/Notiz_model.php     | 18 +++++------
 public/js/components/Notiz/NotizComponent.js  | 31 +++++++++++-------
 .../Studentenverwaltung/Details/Notizen.js    | 32 ++++++++++++-------
 .../Studentenverwaltung/Details/Prestudent.js |  0
 5 files changed, 47 insertions(+), 49 deletions(-)
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js

diff --git a/application/controllers/components/stv/Notiz.php b/application/controllers/components/stv/Notiz.php
index 4918e6627..7b78b06f8 100644
--- a/application/controllers/components/stv/Notiz.php
+++ b/application/controllers/components/stv/Notiz.php
@@ -100,21 +100,6 @@ class Notiz extends FHC_Controller
 			}
 		}
 
-		//Überprüfung ob type übergeben wurde (via Funktions- oder Postparameter)
-		$type = null;
-		if ($paramTyp)
-			$type = $paramTyp;
-		if(isset($_POST['typeId']))
-			$type = $this->input->post('typeId');
-
-		if(!$type)
-		{
-			$result = error('kein Type für ID vorhanden', ERROR);
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-
-			return $this->outputJson(getError($result));
-		}
-
 		//Form Validation
 		$this->form_validation->set_rules('titel', 'titel', 'callback_titel_required');
 		$this->form_validation->set_rules('text', 'text', 'callback_text_required');
diff --git a/application/models/person/Notiz_model.php b/application/models/person/Notiz_model.php
index ea0d7d361..2822cac47 100644
--- a/application/models/person/Notiz_model.php
+++ b/application/models/person/Notiz_model.php
@@ -152,6 +152,13 @@ class Notiz_model extends DB_Model
 		$verfasser_uid = null,
 		$bearbeiter_uid = null
 	) {
+
+		//check, ob id und type valid
+		if (!isset($id) || ($id == "undefined")) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return error("Id(". $id. ') ist keine gültige ID!');
+		}
+
 		// Loads model Notizzuordnung_model
 		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
 
@@ -160,17 +167,8 @@ class Notiz_model extends DB_Model
 		if (isError($result))
 		{
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-
-			$result = error($result->retval, EXIT_ERROR);
-			return $result;
+			return error($type . ' ist kein gültiger ID_TYP!');
 		}
-/*
-		if(!$isValidType)
-		{
-			//Todo manu (correct return to controller)
-			$msg = "datatype " . $type . " not implemented for notes";
-			return error($msg, EXIT_ERROR);
-		}*/
 
 		// Start DB transaction
 		$this->db->trans_start(false);
diff --git a/public/js/components/Notiz/NotizComponent.js b/public/js/components/Notiz/NotizComponent.js
index dd0abab23..eb8b8dd1d 100644
--- a/public/js/components/Notiz/NotizComponent.js
+++ b/public/js/components/Notiz/NotizComponent.js
@@ -67,7 +67,7 @@ export default {
 						},
 						frozen: true
 				}],
-				layout: 'fitDataFill',
+				layout: 'fitColumns',
 				layoutColumnsOnNewData: false,
 				height: '150',
 				selectableRangeMode: 'click',
@@ -135,7 +135,7 @@ export default {
 		actionNewNotiz(){
 			this.resetFormData();
 		},
-		addNewNotiz(notizData) {
+		addNewNotiz() {
 			const formData = new FormData();
 
 			formData.append('data', JSON.stringify(this.notizData));
@@ -158,6 +158,7 @@ export default {
 				}
 			}).catch(error => {
 				if (error.response) {
+					console.log(error.response);
 					this.$fhcAlert.alertError(error.response.data);
 				}
 			}).finally(() => {
@@ -303,8 +304,6 @@ export default {
 					editor.on('input', () => {
 						const newContent = editor.getContent();
 						vm.notizData.text = newContent;
-						//vm.text =  newContent;
-						console.log('vm.text: ' + newContent);
 					});
 				},
 			});
@@ -317,7 +316,10 @@ export default {
 		this.getUid();
 	},
 	async mounted() {
-		this.initTinyMCE();
+		if(this.showTinyMCE){
+			this.initTinyMCE();
+		}
+
 		await this.$p.loadCategory(['notiz','global']);
 
 		let cm = this.$refs.table.tabulator.columnManager;
@@ -353,11 +355,13 @@ export default {
 	watch: {
 		//watcher für Tinymce-Textfeld
 		'notizData.text': function (newVal) {
-			const tinymcsVal = this.editor.getContent();
+			if(this.showTinyMCE) {
+				const tinymcsVal = this.editor.getContent();
 
-			if (tinymcsVal != newVal) {
-				//Inhalt des Editors aktualisieren
-				this.editor.setContent(newVal);
+				if (tinymcsVal != newVal) {
+					//Inhalt des Editors aktualisieren
+					this.editor.setContent(newVal);
+				}
 			}
 		},
 		//Watcher für autocomplete Bearbeiter und Verfasser
@@ -379,7 +383,9 @@ export default {
 		}
 	},
 	beforeDestroy() {
-		this.editor.destroy();
+		if(this.showTinyMCE) {
+			this.editor.destroy();
+		}
 	},
 	template: `
 	<div class="notiz-notiz">
@@ -484,6 +490,7 @@ export default {
 							auto-apply
 							:enable-time-picker="false"
 							format="dd.MM.yyyy"
+							:teleport="true"
 							preview-format="dd.MM.yyyy"></vue-date-picker>
 					</div>
 				</div>
@@ -504,6 +511,7 @@ export default {
 							auto-apply
 							:enable-time-picker="false"
 							format="dd.MM.yyyy"
+							:teleport="true"
 							preview-format="dd.MM.yyyy"></vue-date-picker>
 					</div>
 					
@@ -528,8 +536,7 @@ export default {
 			<button v-if="notizData.statusNew"  type="button" class="btn btn-primary" @click="addNewNotiz()"> {{$p.t('studierendenantrag', 'btn_new')}}</button>
 			<button v-else type="button" class="btn btn-primary" @click="updateNotiz(notizen.notiz_id)"> {{$p.t('ui', 'speichern')}}</button>
 					
-		</form>
-		
+		</form>		
 	</div>`
 }
 
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
index 6281401df..3b95ed156 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
@@ -7,14 +7,6 @@ export default {
 	props: {
 		modelValue: Object
 	},
-	data(){
-		return {
-/*			showErweitert: true, //show details verfasser, bearbeiter, von, bis, erledigt
-			showDocument: true, //show upload documents
-			showTinyMCE: true
- */
-		};
-	},
 	template: `
 	<div class="stv-details-details h-100 pb-3">
 		<h3>Notizen</h3>
@@ -24,21 +16,37 @@ export default {
 			:id="modelValue.person_id"
 			:showErweitert=true
 			:showDocument=true
-			:showTinyMCE=true
+			:showTinyMCE="true"
 			>
 		</NotizComponent>
 		
-		<br><br>
+<!--		<br><br>
 		<h3>Test prestudentId</h3>
 		<NotizComponent
 			ref="formc"
 			typeId="prestudent_id"
 			:id="modelValue.prestudent_id"
-			:showErweitert=false
-			:showDocument=true
 			>
 		</NotizComponent>
 		
+		<br><br>
+		<h3>Test mitarbeiter_uid</h3>
+		<NotizComponent
+			ref="formc"
+			typeId="uid"
+			:id="'ma0068'"
+			>
+		</NotizComponent>-->
+		
+<!--		<br><br>
+		<h3>Test projekt</h3>
+		<NotizComponent
+			ref="formc"
+			typeId="projekt_kurzbz"
+			:id="'Studentenausweis'"
+			>
+		</NotizComponent>-->
+		
 	</div>
 	`
 };
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
new file mode 100644
index 000000000..e69de29bb

From 286c7be83d9d341a53058e3d8aa6bb824cf894ab Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 7 Feb 2024 13:25:50 +0100
Subject: [PATCH 0384/1461] only displays profil update requests the uid has
 permissions for (mitarbeiter/stammdaten or student/stammdaten), also fixes
 bug and adds JSON.parse to get the value in the sessionStorage

---
 application/controllers/Cis/Profil.php        |  19 ++--
 application/controllers/Cis/ProfilUpdate.php  |  20 ++--
 .../models/person/Profil_change_model.php     |  50 ++++++---
 public/js/apps/Cis/Profil.js                  |   8 +-
 public/js/apps/Cis/ProfilUpdateRequests.js    |  10 +-
 public/js/components/Cis/Profil/EditProfil.js |   4 +-
 .../Cis/Profil/MitarbeiterProfil.js           |  33 ++----
 .../js/components/Cis/Profil/StudentProfil.js | 101 ++----------------
 8 files changed, 88 insertions(+), 157 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index 5f69264ed..8e7c1a26a 100755
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -16,7 +16,7 @@ class Profil extends Auth_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'index' => ['student/anrechnung_beantragen:r', 'user:r'], // TODO(chris): permissions?
+			'index' => ['student/anrechnung_beantragen:r', 'user:r'], 
 			'foto_sperre_function' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'getView' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'View' => ['student/anrechnung_beantragen:r', 'user:r'],
@@ -63,6 +63,16 @@ class Profil extends Auth_Controller
 	 * @return void
 	 */
 
+	 public function test(){
+		
+		// Loads permission lib
+		$this->load->library('PermissionLib');
+		$mit_daten =$this->permissionlib->isBerechtigt('mitarbeiter/stammdaten','suid');
+		var_dump($mit_daten);
+		$stud_daten = $this->permissionlib->isBerechtigt('student/stammdaten','suid');
+		var_dump($stud_daten);
+	}
+
 
 	public function index()
 	{
@@ -149,12 +159,7 @@ class Profil extends Auth_Controller
 		echo json_encode($res);
 	}
 
-	public function test(){
-		
-		// Loads permission lib
-		$this->load->library('PermissionLib');
-		var_dump($this->permissionlib->getOE_isEntitledFor());
-	}
+	
 
 
 
diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
index 44fce82af..bb4f1d407 100755
--- a/application/controllers/Cis/ProfilUpdate.php
+++ b/application/controllers/Cis/ProfilUpdate.php
@@ -11,10 +11,10 @@ class ProfilUpdate extends Auth_Controller
 
 	public function __construct(){
 		parent::__construct([
-			'index' => ['student/anrechnung_beantragen:r', 'user:r'], // TODO(chris): permissions?
-			'getProfilUpdates' => ['student/anrechnung_beantragen:r', 'user:r'],
-			'acceptProfilRequest'=>['user:r'],
-			'denyProfilRequest'=>['user:r'],
+			'index' => ['student/stammdaten:r','mitarbeiter/stammdaten:r'],
+			'getProfilUpdates' => ['student/stammdaten:r','mitarbeiter/stammdaten:r'],
+			'acceptProfilRequest'=>['student/stammdaten:rw','mitarbeiter/stammdaten:rw'],
+			'denyProfilRequest'=>['student/stammdaten:rw','mitarbeiter/stammdaten:rw'],
 			'show'=>['user:r'],
 			
 
@@ -46,12 +46,16 @@ class ProfilUpdate extends Auth_Controller
 	}
 
 	public function getProfilUpdates($status=null){
+		$this->load->library('PermissionLib');
+		$studentBerechtigung = $this->permissionlib->isBerechtigt('student/stammdaten','s');
+		$mitarbeiterBerechtigung = $this->permissionlib->isBerechtigt('mitarbeiter/stammdaten','s');
+		
+		$options = ["mitarbeiterView"=>$mitarbeiterBerechtigung,"studentView"=>$studentBerechtigung];
 		if(isset($status)){
-			$res = $this->ProfilChangeModel->getProfilUpdate(["status"=>$status]);
-		}else{
-			$res = $this->ProfilChangeModel->getProfilUpdate();
+			$options['status'] = $status;
 		}
-		$res = hasData($res)? getData($res) : null;
+		$res = $this->ProfilChangeModel->getProfilUpdate($options);
+		
 		echo json_encode($res);
 	}
 
diff --git a/application/models/person/Profil_change_model.php b/application/models/person/Profil_change_model.php
index 134395dd6..e364b33e2 100755
--- a/application/models/person/Profil_change_model.php
+++ b/application/models/person/Profil_change_model.php
@@ -12,6 +12,9 @@ class Profil_change_model extends DB_Model
 		$this->pk = ['profil_update_id'];
         $this->hasSequence = true;
 
+
+		$this->load->model('crm/Student_model','StudentModel');
+		$this->load->model('ressource/Mitarbeiter_model','MitarbeiterModel');
 	}
 
 	/**
@@ -50,22 +53,41 @@ class Profil_change_model extends DB_Model
 	 * returns all profil updates if id is set to null
 	 */
 	public function getProfilUpdate($whereClause=null){
-		
-		$res = $this->loadWhere($whereClause);
-		if(isError($res)){
-			// catch error
-		}else{
-			if(hasData($res)){
-				
-				foreach($res->retval as $update){
-					$update->requested_change = json_decode($update->requested_change);
-					$update->insertamum = !is_null($update->insertamum)?date_create($update->insertamum)->format('d.m.Y'):null;
-					$update->updateamum = !is_null($update->updateamum)?date_create($update->updateamum)->format('d.m.Y'):null;
-					$update->status_timestamp = !is_null($update->status_timestamp)?date_create($update->status_timestamp)->format('d.m.Y'):null;
-					 
-				}
+		$res =[];
+		if($whereClause["studentView"]) {
+			$this->addJoin('tbl_student','tbl_student.student_uid=tbl_cis_profil_update.uid');
+			$studentRequests = $this->loadWhere(isset($whereClause['status']) && $whereClause['status']? ['status'=>$whereClause['status']]:[]);
+			if(isError($studentRequests)) return error("db error: ". getData($studentRequests));
+			$studentRequests = getData($studentRequests)?:[]; 
+			foreach($studentRequests as $request){
+				array_push($res,$request);
 			}
 		}
+		if($whereClause["mitarbeiterView"]) {
+			$this->addJoin('tbl_mitarbeiter','tbl_mitarbeiter.mitarbeiter_uid=tbl_cis_profil_update.uid');
+			$mitarbeiterRequests = $this->loadWhere(isset($whereClause['status']) && $whereClause['status']? ['status'=>$whereClause['status']]:[]);
+			if(isError($mitarbeiterRequests)) return error("db error: ". getData($mitarbeiterRequests));
+			$mitarbeiterRequests = getData($mitarbeiterRequests)?:[]; 
+			foreach($mitarbeiterRequests as $request){
+				array_push($res,$request);
+			}
+		}
+		
+		
+	
+		if($res){
+			
+			foreach($res as $update){
+			
+				
+				$update->requested_change = json_decode($update->requested_change);
+				$update->insertamum = !is_null($update->insertamum)?date_create($update->insertamum)->format('d.m.Y'):null;
+				$update->updateamum = !is_null($update->updateamum)?date_create($update->updateamum)->format('d.m.Y'):null;
+				$update->status_timestamp = !is_null($update->status_timestamp)?date_create($update->status_timestamp)->format('d.m.Y'):null;
+					
+			}
+		}
+		
 		return $res;
 
 	}
diff --git a/public/js/apps/Cis/Profil.js b/public/js/apps/Cis/Profil.js
index 12a037973..935dd2ab2 100755
--- a/public/js/apps/Cis/Profil.js
+++ b/public/js/apps/Cis/Profil.js
@@ -46,7 +46,7 @@ const app = Vue.createApp({
 	},
 	data() {
 		return {
-			editData: this.filteredEditData,
+			
 			view:null,
 			data:null,
 			// notfound is null by default, but contains an UID if no user exists with that UID
@@ -58,7 +58,7 @@ const app = Vue.createApp({
 	provide() {
 		return {
 		
-			editData:this.editData,
+			
 			collapseFunction:  (e, column)=> {
 		
 				//* check if property doesn't exist already and add it to the reactive this properties
@@ -229,14 +229,14 @@ const app = Vue.createApp({
 	},
 	template:`
 	<div>
-		<pre>{{JSON.stringify(data.profilUpdates.length,null,2)}}</pre>
+	
 		<div v-if="notFoundUID">
 		
 			<h3>Es wurden keine oder mehrere Profile für {{this.notFoundUID}} gefunden</h3>
 
 		</div>
 
-		<component v-else :is="view" :data="data" ></component>
+		<component v-else :is="view" :data="data" :editData="filteredEditData" ></component>
 	
 	</div>`
 	
diff --git a/public/js/apps/Cis/ProfilUpdateRequests.js b/public/js/apps/Cis/ProfilUpdateRequests.js
index 9a9766cb6..0d936fe97 100755
--- a/public/js/apps/Cis/ProfilUpdateRequests.js
+++ b/public/js/apps/Cis/ProfilUpdateRequests.js
@@ -36,7 +36,9 @@ const app = Vue.createApp({
             //params - the parameters passed with the request
             //response - the JSON object returned in the body of the response.
             //? sorts the response data from the backend
+            if(response)
             response.sort(sortProfilUpdates);
+            
             return response;  
         },
         //? adds tooltip with the status message of a profil update request if its status is not pending
@@ -122,11 +124,11 @@ const app = Vue.createApp({
         ajaxURLGenerator: (url,config,params)=>{
           //? this function needs to be an array function in order to access the this properties of the Vue component
           if(this.showAll){
-            return url +"getProfilUpdates";
+           return url +"getProfilUpdates";
           }else{
             return url +"getProfilUpdates/pending";
           }
-          
+       
         },
         height: 600,
         layout: "fitColumns",
@@ -238,13 +240,13 @@ const app = Vue.createApp({
       
       this.$refs.UpdatesTable.tabulator.setData(); 
       //? store the selected view in the session storage of the browser
-      sessionStorage.setItem("showAll",event.target.value);
+      sessionStorage.setItem("showAll",JSON.stringify(event.target.value));
     }
   },
   mounted() {
     if(!(sessionStorage.getItem("showAll")===null))
     {
-      this.showAll = sessionStorage.getItem("showAll");
+      this.showAll = JSON.parse(sessionStorage.getItem("showAll"));
     }
    
   },
diff --git a/public/js/components/Cis/Profil/EditProfil.js b/public/js/components/Cis/Profil/EditProfil.js
index 413a60416..07e62cd30 100755
--- a/public/js/components/Cis/Profil/EditProfil.js
+++ b/public/js/components/Cis/Profil/EditProfil.js
@@ -109,9 +109,7 @@ export default {
         if(filesToDelete.length > 0) {
           Vue.$fhcapi.UserData.deleteOldVersionFiles(
             filesToDelete
-          ).then((res) => {
-            console.log(res);
-          });  
+          );
         }
        
 
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index da1812ca2..979246d45 100755
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -26,7 +26,7 @@ export default {
     RoleInformation,
     ProfilInformation,
   },
-  inject: ['sortProfilUpdates','collapseFunction','editData'],
+  inject: ['sortProfilUpdates','collapseFunction'],
   data() {
     return {
 
@@ -136,6 +136,7 @@ export default {
 
   props: {
 		data: Object,
+    editData: Object,
 	},
   
   methods: {
@@ -218,33 +219,11 @@ export default {
       };
     },
 
-    personEmails() {
-      return this.data?.emails ? this.data.emails : [];
-    },
-
-    privateKontakte() {
-      if (!this.data) {
-        return {};
-      }
-
-      return this.data.kontakte;
-      
-    },
-
-    privateAdressen() {
-      if (!this.data) {
-        return {};
-      }
-
-      return this.data.adressen;
-      
-    },
-    
 
   },
  
   created() {
-
+    
     //? sorts the profil Updates: pending -> accepted -> rejected
     this.data.profilUpdates.sort(this.sortProfilUpdates);
 
@@ -348,7 +327,7 @@ export default {
                     <div class="row mb-4">
                     <div class="col">
                     <!-- EMAILS -->
-                    <profil-emails :data="personEmails" ></profil-emails>
+                    <profil-emails :data="data.emails" ></profil-emails>
                     </div>
                     </div>
 
@@ -365,7 +344,7 @@ export default {
                           <div class="card-body ">
                             
                             <div  class="gy-3  row ">
-                            <div v-for="element in privateKontakte" class="col-12">
+                            <div v-for="element in data.kontakte" class="col-12">
                             
                             <Kontakt :data="element"></Kontakt>
                             
@@ -387,7 +366,7 @@ export default {
                             <div class="card-body">
                             
                               <div class="gy-3 row ">
-                                <div v-for="element in privateAdressen" class="col-12">
+                                <div v-for="element in data.adressen" class="col-12">
                                 <Adresse :data="element"></Adresse>
                                  
                               </div>
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index 0a3b9a8dd..bf926c82e 100755
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -24,6 +24,7 @@ export default {
     FetchProfilUpdates,
 
   },
+  inject:['sortProfilUpdates'],
   data() {
     return {
       
@@ -76,14 +77,17 @@ export default {
     };
   },
 
-  props: ["data"],
+  props: {
+    data:Object,
+    editData:Object,
+  },
   methods: {
 
     fetchProfilUpdates: function(){
       Vue.$fhcapi.UserData.selectProfilRequest().then((res)=>{
         
         if(!res.error){
-          this.data.profilUpdates = res.data.retval?.length ? res.data.retval : null ; 
+          this.data.profilUpdates = res.data.retval?.length ? res.data.retval.sort(this.sortProfilUpdates) : null ; 
         }
       });
     },
@@ -91,14 +95,14 @@ export default {
     showModal() {
 
       EditProfil.popup({ 
-          value:JSON.parse(JSON.stringify(this.data.editData)),
+          value:JSON.parse(JSON.stringify(this.editData)),
           title:"Profil bearbeiten",
         }).then((popup_result) => {
           if(popup_result){
             Vue.$fhcapi.UserData.selectProfilRequest()
             .then((res) =>{
               if(!res.error){
-                this.data.profilUpdates = res.data.retval;
+                this.data.profilUpdates = res.data.retval.sort(this.sortProfilUpdates);
               }else{
                 alert("Error when fetching profile updates: " +res.data.retval);
               }
@@ -133,10 +137,6 @@ export default {
       };
     },
 
-    personEmails() {
-      return this.data?.emails ? this.data.emails : [];
-    },
-
    
     roleInformation() {
       if (!this.data) {
@@ -154,89 +154,10 @@ export default {
       };
     },
 
-    privateKontakte() {
-      if (!this.data) {
-        return {};
-      }
-      return this.data.kontakte;
-    },
-
-    privateAdressen() {
-      if (!this.data) {
-        return {};
-      }
-      return this.data.adressen;
-    },
     
   },
 
   created(){
-    this.data.editData = {
-      view:null,
-      data:{
-      Personen_Informationen : {
-        title:"Personen Informationen",
-        view:null,
-        data:{
-          
-          vorname: {
-            title:"vorname",
-            view:"TextInputDokument",
-            withFiles:true,
-            data:{
-              titel:"vorname",
-              value:this.data.vorname,
-            }},
-            nachname: {
-              title:"nachname",
-              view:"TextInputDokument",
-              withFiles:true,
-              data:{
-                titel:"nachname",
-                value:this.data.nachname,
-              }
-            },
-            titel:{
-              title:"titel",
-              view:"TextInputDokument",
-              withFiles:true,
-              data:{
-                titel:"titel",
-                value:this.data.titel,
-              }
-            },
-            postnomen:{
-              title:"postnomen",
-              view:"TextInputDokument",
-              withFiles:true,
-              data:{
-                titel:"postnomen",
-                value:this.data.postnomen,
-              }
-            },
-          }
-        },
-        Private_Kontakte: {
-          title:"Private Kontakte" ,
-          data:this.privateKontakte.map(kontakt => {
-            return {
-              listview:'Kontakt',
-              view:'EditKontakt',
-              data:kontakt
-            }})
-         },
-        Private_Adressen: {
-          title: "Private Adressen",
-          data:this.privateAdressen.map(kontakt => {
-            return {
-              listview:'Adresse',
-              view:'EditAdresse',
-              data:kontakt
-            }})
-         },
-        },
-     
-    };
   },
 
   mounted() {
@@ -361,7 +282,7 @@ export default {
                     <div class="row mb-4">
                     <div class="col">
                     <!-- EMAILS -->
-                    <profil-emails :data="personEmails" ></profil-emails>
+                    <profil-emails :data="data.emails" ></profil-emails>
                     </div>
                     </div>
 
@@ -379,7 +300,7 @@ export default {
                           <div class="card-body ">
                             
                             <div  class="gy-3  row ">
-                            <div v-for="element in privateKontakte" class="col-12">
+                            <div v-for="element in data.kontakte" class="col-12">
                             
                             <Kontakt :data="element"></Kontakt>
                             
@@ -400,7 +321,7 @@ export default {
                           <div class="card-body">
                           
                             <div class="gy-3 row ">
-                              <div v-for="element in privateAdressen" class="col-12">
+                              <div v-for="element in data.adressen" class="col-12">
                               <Adresse :data="element"></Adresse>
                                
                             </div>

From 9362aea0cf2bb6a4f2d19dc72ce06ea146143632 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 7 Feb 2024 14:21:25 +0100
Subject: [PATCH 0385/1461] when user does not have permissions to accept/deny
 a profil update request it is notified via alert modal

---
 application/controllers/Cis/ProfilUpdate.php  |  10 +-
 .../models/person/Profil_change_model.php     |  10 +-
 public/js/apps/Cis/ProfilUpdateRequests.js    | 259 +++++++++---------
 .../js/components/Cis/Profil/StudentProfil.js |   6 +-
 .../Cis/ProfilUpdate/AcceptDenyUpdate.js      |  30 +-
 5 files changed, 146 insertions(+), 169 deletions(-)

diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
index bb4f1d407..b1bb8887a 100755
--- a/application/controllers/Cis/ProfilUpdate.php
+++ b/application/controllers/Cis/ProfilUpdate.php
@@ -46,15 +46,9 @@ class ProfilUpdate extends Auth_Controller
 	}
 
 	public function getProfilUpdates($status=null){
-		$this->load->library('PermissionLib');
-		$studentBerechtigung = $this->permissionlib->isBerechtigt('student/stammdaten','s');
-		$mitarbeiterBerechtigung = $this->permissionlib->isBerechtigt('mitarbeiter/stammdaten','s');
 		
-		$options = ["mitarbeiterView"=>$mitarbeiterBerechtigung,"studentView"=>$studentBerechtigung];
-		if(isset($status)){
-			$options['status'] = $status;
-		}
-		$res = $this->ProfilChangeModel->getProfilUpdate($options);
+		
+		$res = $this->ProfilChangeModel->getProfilUpdate(isset($status)?['status'=>$status]:null);
 		
 		echo json_encode($res);
 	}
diff --git a/application/models/person/Profil_change_model.php b/application/models/person/Profil_change_model.php
index e364b33e2..104f17974 100755
--- a/application/models/person/Profil_change_model.php
+++ b/application/models/person/Profil_change_model.php
@@ -15,6 +15,8 @@ class Profil_change_model extends DB_Model
 
 		$this->load->model('crm/Student_model','StudentModel');
 		$this->load->model('ressource/Mitarbeiter_model','MitarbeiterModel');
+
+		$this->load->library('PermissionLib');
 	}
 
 	/**
@@ -53,8 +55,12 @@ class Profil_change_model extends DB_Model
 	 * returns all profil updates if id is set to null
 	 */
 	public function getProfilUpdate($whereClause=null){
+		
+		$studentBerechtigung = $this->permissionlib->isBerechtigt('student/stammdaten','s');
+		$mitarbeiterBerechtigung = $this->permissionlib->isBerechtigt('mitarbeiter/stammdaten','s');
+		
 		$res =[];
-		if($whereClause["studentView"]) {
+		if($studentBerechtigung) {
 			$this->addJoin('tbl_student','tbl_student.student_uid=tbl_cis_profil_update.uid');
 			$studentRequests = $this->loadWhere(isset($whereClause['status']) && $whereClause['status']? ['status'=>$whereClause['status']]:[]);
 			if(isError($studentRequests)) return error("db error: ". getData($studentRequests));
@@ -63,7 +69,7 @@ class Profil_change_model extends DB_Model
 				array_push($res,$request);
 			}
 		}
-		if($whereClause["mitarbeiterView"]) {
+		if($mitarbeiterBerechtigung) {
 			$this->addJoin('tbl_mitarbeiter','tbl_mitarbeiter.mitarbeiter_uid=tbl_cis_profil_update.uid');
 			$mitarbeiterRequests = $this->loadWhere(isset($whereClause['status']) && $whereClause['status']? ['status'=>$whereClause['status']]:[]);
 			if(isError($mitarbeiterRequests)) return error("db error: ". getData($mitarbeiterRequests));
diff --git a/public/js/apps/Cis/ProfilUpdateRequests.js b/public/js/apps/Cis/ProfilUpdateRequests.js
index 0d936fe97..9a6b9548f 100755
--- a/public/js/apps/Cis/ProfilUpdateRequests.js
+++ b/public/js/apps/Cis/ProfilUpdateRequests.js
@@ -1,26 +1,26 @@
 import fhcapifactory from "../api/fhcapifactory.js";
 import { CoreFilterCmpt } from "../../components/filter/Filter.js";
 import AcceptDenyUpdate from "../../components/Cis/ProfilUpdate/AcceptDenyUpdate.js";
+import Alert from "../../components/Bootstrap/Alert.js";
 Vue.$fhcapi = fhcapifactory;
 
-const sortProfilUpdates = (ele1,ele2)=>{
-
+const sortProfilUpdates = (ele1, ele2) => {
   let result = 0;
-  if(ele1.status === 'pending'){
-    result= -1;
-  }
-  else if(ele1.status === 'accepted'){
-    result= ele2.status ==='rejected'? -1 : 1;
-  }
-  else{
-    result= 1;
+  if (ele1.status === "pending") {
+    result = -1;
+  } else if (ele1.status === "accepted") {
+    result = ele2.status === "rejected" ? -1 : 1;
+  } else {
+    result = 1;
   }
   //? if they have the same status the insert date is used for ordering
-  if(ele1.status === ele2.status){
-    result= new Date(ele2.insertamum.split('.').reverse().join('-')) - new Date(ele1.insertamum.split('.').reverse().join('-'));
+  if (ele1.status === ele2.status) {
+    result =
+      new Date(ele2.insertamum.split(".").reverse().join("-")) -
+      new Date(ele1.insertamum.split(".").reverse().join("-"));
   }
   return result;
-  };
+};
 
 const app = Vue.createApp({
   components: {
@@ -30,109 +30,110 @@ const app = Vue.createApp({
     return {
       showAll: false,
       profil_updates_table_options: {
-        
-        ajaxResponse:function(url, params, response){
-            //url - the URL of the request
-            //params - the parameters passed with the request
-            //response - the JSON object returned in the body of the response.
-            //? sorts the response data from the backend
-            if(response)
-            response.sort(sortProfilUpdates);
-            
-            return response;  
+        ajaxResponse: function (url, params, response) {
+          //url - the URL of the request
+          //params - the parameters passed with the request
+          //response - the JSON object returned in the body of the response.
+          //? sorts the response data from the backend
+          if (response) response.sort(sortProfilUpdates);
+
+          return response;
         },
         //? adds tooltip with the status message of a profil update request if its status is not pending
-        columnDefaults:{
-          tooltip:function(e, cell, onRendered){
-              //e - mouseover event
-              //cell - cell component
-              //onRendered - onRendered callback registration function
-              let statusMessage = cell.getData().status_message;
-              let statusDate = cell.getData().status_timestamp;
-              let status = cell.getData().status;
-              if(!statusMessage){
-                return null;
-              }
-              let el = document.createElement("div");
-              el.classList.add("border","border-dark");
-              
-              let statusDateEl = document.createElement("p");
-              statusDateEl.innerHTML = "Request was "+ status + " on " + statusDate ;
-              let statusMessageEl = document.createElement("span");
-              statusMessageEl.innerHTML = "Status message: " + statusMessage ;
-              
-              el.appendChild(statusDateEl);
-              el.appendChild(statusMessageEl);  
-              return el; 
-          },
-      },
-        rowContextMenu: (e, component)=>{
+        columnDefaults: {
+          tooltip: function (e, cell, onRendered) {
+            //e - mouseover event
+            //cell - cell component
+            //onRendered - onRendered callback registration function
+            let statusMessage = cell.getData().status_message;
+            let statusDate = cell.getData().status_timestamp;
+            let status = cell.getData().status;
+            if (!statusMessage) {
+              return null;
+            }
+            let el = document.createElement("div");
+            el.classList.add("border", "border-dark");
 
-          let menu =[];
-          if(component.getData().status === "pending"){
-            menu.push(
-              
-                {
-                    label:"<i class='fa fa-check'></i> Accept Request",
-                    action:(e, column)=>{
-                      Vue.$fhcapi.ProfilUpdate.acceptProfilRequest(column.getData()).then((res) => {
-                        this.$refs.UpdatesTable.tabulator.setData();
-                      });
-                   
-                    }
-                },
-                {
-                    separator:true,
-                },
-                {
-                    label:" <i style='width:16px' class='text-center fa fa-xmark'></i> Deny Request",
-                    action:(e, column)=>{
-                      
-                      Vue.$fhcapi.ProfilUpdate.denyProfilRequest(column.getData()).then((res) => {
-                        this.$refs.UpdatesTable.tabulator.setData();
-                      });
-                    }
-                },
-                {
-                    separator:true,
-                },
-                {
-                    label:"<i class='fa fa-eye'></i> Show Request",
-                    action:(e, column)=>{
-                      this.showModal(column.getData());
-                    }
-                }
-              
-            );
-          }else{
+            let statusDateEl = document.createElement("p");
+            statusDateEl.innerHTML =
+              "Request was " + status + " on " + statusDate;
+            let statusMessageEl = document.createElement("span");
+            statusMessageEl.innerHTML = "Status message: " + statusMessage;
+
+            el.appendChild(statusDateEl);
+            el.appendChild(statusMessageEl);
+            return el;
+          },
+        },
+        rowContextMenu: (e, component) => {
+          let menu = [];
+          if (component.getData().status === "pending") {
             menu.push(
               {
-                label:"<i class='fa fa-eye'></i> Show Request",
-                action:(e, column)=>{
+                label: "<i class='fa fa-check'></i> Accept Request",
+                action: (e, column) => {
+                  Vue.$fhcapi.ProfilUpdate.acceptProfilRequest(column.getData())
+                    .then((res) => {
+                      console.log("here");
+                      this.$refs.UpdatesTable.tabulator.setData();
+                    })
+                    .catch((e) => {
+                      Alert.popup(Vue.h('div',{innerHTML:e.response.data}));
+                    });
+                },
+              },
+              {
+                separator: true,
+              },
+              {
+                label:
+                  " <i style='width:16px' class='text-center fa fa-xmark'></i> Deny Request",
+                action: (e, column) => {
+                  Vue.$fhcapi.ProfilUpdate.denyProfilRequest(
+                    column.getData()
+                  ).then((res) => {
+                    this.$refs.UpdatesTable.tabulator.setData();
+                  }).catch((e) => {
+                    Alert.popup(Vue.h('div',{innerHTML:e.response.data}));
+                  });
+                },
+              },
+              {
+                separator: true,
+              },
+              {
+                label: "<i class='fa fa-eye'></i> Show Request",
+                action: (e, column) => {
                   this.showModal(column.getData());
-                }
+                },
               }
-            )
+            );
+          } else {
+            menu.push({
+              label: "<i class='fa fa-eye'></i> Show Request",
+              action: (e, column) => {
+                this.showModal(column.getData());
+              },
+            });
           }
           return menu;
+        },
+        ajaxURL:
+          FHC_JS_DATA_STORAGE_OBJECT.app_root +
+          FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+          `/Cis/ProfilUpdate/`,
 
-        } ,
-        ajaxURL:FHC_JS_DATA_STORAGE_OBJECT.app_root +
-        FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-        `/Cis/ProfilUpdate/`,
-
-        ajaxURLGenerator: (url,config,params)=>{
+        ajaxURLGenerator: (url, config, params) => {
           //? this function needs to be an array function in order to access the this properties of the Vue component
-          if(this.showAll){
-           return url +"getProfilUpdates";
-          }else{
-            return url +"getProfilUpdates/pending";
+          if (this.showAll) {
+            return url + "getProfilUpdates";
+          } else {
+            return url + "getProfilUpdates/pending";
           }
-       
         },
         height: 600,
         layout: "fitColumns",
-       
+
         columns: [
           {
             title: "UID",
@@ -172,7 +173,6 @@ const app = Vue.createApp({
             hozAlign: "center",
             headerFilter: true,
             formatter: function (cell, para) {
-
               switch (cell.getValue()) {
                 case "pending":
                   return "<div class='row justify-content-center'><div class='col-2'><i class='fa fa-circle-info text-info fa-lg'></i></div> <div class='col-4'><span>pending</span></div></div>";
@@ -201,7 +201,6 @@ const app = Vue.createApp({
               //! function that is called when clicking on a row in the table
               let cellData = cell.getRow().getData();
               this.showModal(cellData);
-              
             },
             //responsive:0,
           },
@@ -210,45 +209,43 @@ const app = Vue.createApp({
     };
   },
   computed: {
-    getFetchUrl: function(){
-      let url = FHC_JS_DATA_STORAGE_OBJECT.app_root +
-      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-      `/Cis/ProfilUpdate/`;
-      if(this.showAll){
-        url+"getAllRequests";
-      }else{
-        url+"getPendingRequests";
+    getFetchUrl: function () {
+      let url =
+        FHC_JS_DATA_STORAGE_OBJECT.app_root +
+        FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+        `/Cis/ProfilUpdate/`;
+      if (this.showAll) {
+        url + "getAllRequests";
+      } else {
+        url + "getPendingRequests";
       }
       return url;
-    }
+    },
   },
   methods: {
-    showModal: function(value){
+    showModal: function (value) {
       AcceptDenyUpdate.popup({ value: value })
-                .then((res) => {
-                  console.log("res of the modal: ", res);
-                  //? refetches the data, if any request was denied or accepted
-                  //* setData will call the ajaxURL again to refresh the data
-                  this.$refs.UpdatesTable.tabulator.setData();
-                })
-                .catch((e) => {
-                  //? catches the rejected Promise if the result of the modal was falsy
-                  console.log("catch of the modal: ", e);
-                });
+        .then((res) => {
+          console.log("res of the modal: ", res);
+          //? refetches the data, if any request was denied or accepted
+          //* setData will call the ajaxURL again to refresh the data
+          this.$refs.UpdatesTable.tabulator.setData();
+        })
+        .catch((e) => {
+          //? catches the rejected Promise if the result of the modal was falsy
+          console.log("catch of the modal: ", e);
+        });
     },
-    updateData: function(event){
-      
-      this.$refs.UpdatesTable.tabulator.setData(); 
+    updateData: function (event) {
+      this.$refs.UpdatesTable.tabulator.setData();
       //? store the selected view in the session storage of the browser
-      sessionStorage.setItem("showAll",JSON.stringify(event.target.value));
-    }
+      sessionStorage.setItem("showAll", JSON.stringify(event.target.value));
+    },
   },
   mounted() {
-    if(!(sessionStorage.getItem("showAll")===null))
-    {
+    if (!(sessionStorage.getItem("showAll") === null)) {
       this.showAll = JSON.parse(sessionStorage.getItem("showAll"));
     }
-   
   },
   template: `
     <div>
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index bf926c82e..4fc8bedf9 100755
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -87,7 +87,7 @@ export default {
       Vue.$fhcapi.UserData.selectProfilRequest().then((res)=>{
         
         if(!res.error){
-          this.data.profilUpdates = res.data.retval?.length ? res.data.retval.sort(this.sortProfilUpdates) : null ; 
+          this.data.profilUpdates = res.data?.length ? res.data.sort(this.sortProfilUpdates) : null ; 
         }
       });
     },
@@ -102,9 +102,9 @@ export default {
             Vue.$fhcapi.UserData.selectProfilRequest()
             .then((res) =>{
               if(!res.error){
-                this.data.profilUpdates = res.data.retval.sort(this.sortProfilUpdates);
+                this.data.profilUpdates = res.data.sort(this.sortProfilUpdates);
               }else{
-                alert("Error when fetching profile updates: " +res.data.retval);
+                alert("Error when fetching profile updates: " +res.data);
               }
             })
             .catch(err=>alert(err));
diff --git a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
index 0e6c0c3d3..12b1d7d32 100755
--- a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
+++ b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
@@ -7,7 +7,6 @@ import Adresse from "../Profil/ProfilComponents/Adresse.js";
 export default {
   components: {
     BsModal,
-    Alert,
     Kontakt,
     Adresse,
   },
@@ -50,6 +49,8 @@ export default {
     acceptRequest: function () {
       Vue.$fhcapi.ProfilUpdate.acceptProfilRequest(this.data).then((res) => {
         this.result = true;
+      }).catch((e) => {
+        Alert.popup(Vue.h('div',{innerHTML:e.response.data}));
       });
       this.hide();
     },
@@ -58,34 +59,13 @@ export default {
       
       Vue.$fhcapi.ProfilUpdate.denyProfilRequest(this.data).then((res) => {
         this.result = true;
+      }).catch((e) => {
+        Alert.popup(Vue.h('div',{innerHTML:e.response.data}));
       });
       this.hide();
     },
 
-    submitProfilChange() {
-      //TODO: check if the updated value is different from the original value before submitting the request
-      if (false) {
-        //? inserts new row in public.tbl_cis_profil_update
-        //* calls the update api call if an update field is present in the data that was passed to the module
-        Vue.$fhcapi.UserData[
-          this.editData.update ? "updateProfilRequest" : "insertProfilRequest"
-        ](this.topic, this.profilUpdate).then((res) => {
-          if (res.data.error == 0) {
-            this.result = true;
-            this.hide();
-            Alert.popup(
-              "Ihre Anfrage wurde erfolgreich gesendet. Bitte warten Sie, während sich das Team um Ihre Anfrage kümmert."
-            );
-          } else {
-            this.result = false;
-            this.hide();
-            Alert.popup(
-              "Ein Fehler ist aufgetreten: " + JSON.stringify(res.data.retval)
-            );
-          }
-        });
-      }
-    },
+   
   },
   computed: {
     getComponentView: function () {

From 3739581a298f5e5a295097416e853e950be386cc Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 7 Feb 2024 16:25:39 +0100
Subject: [PATCH 0386/1461] db tabellen anpassung

---
 application/controllers/Cis/ProfilUpdate.php |  2 +-
 public/js/apps/Cis/ProfilUpdateRequests.js   |  7 +-
 system/dbupdate_3.4.php                      |  2 +-
 system/dbupdate_3.4/25999_C4_ma0594.php      | 90 +++++++++++++++-----
 4 files changed, 73 insertions(+), 28 deletions(-)

diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
index b1bb8887a..17eddfe41 100755
--- a/application/controllers/Cis/ProfilUpdate.php
+++ b/application/controllers/Cis/ProfilUpdate.php
@@ -15,7 +15,7 @@ class ProfilUpdate extends Auth_Controller
 			'getProfilUpdates' => ['student/stammdaten:r','mitarbeiter/stammdaten:r'],
 			'acceptProfilRequest'=>['student/stammdaten:rw','mitarbeiter/stammdaten:rw'],
 			'denyProfilRequest'=>['student/stammdaten:rw','mitarbeiter/stammdaten:rw'],
-			'show'=>['user:r'],
+			'show'=>['student/stammdaten:r','mitarbeiter/stammdaten:r'],
 			
 
 		]);
diff --git a/public/js/apps/Cis/ProfilUpdateRequests.js b/public/js/apps/Cis/ProfilUpdateRequests.js
index 9a6b9548f..43c7257d5 100755
--- a/public/js/apps/Cis/ProfilUpdateRequests.js
+++ b/public/js/apps/Cis/ProfilUpdateRequests.js
@@ -226,15 +226,12 @@ const app = Vue.createApp({
     showModal: function (value) {
       AcceptDenyUpdate.popup({ value: value })
         .then((res) => {
-          console.log("res of the modal: ", res);
+          
           //? refetches the data, if any request was denied or accepted
           //* setData will call the ajaxURL again to refresh the data
           this.$refs.UpdatesTable.tabulator.setData();
         })
-        .catch((e) => {
-          //? catches the rejected Promise if the result of the modal was falsy
-          console.log("catch of the modal: ", e);
-        });
+        
     },
     updateData: function (event) {
       this.$refs.UpdatesTable.tabulator.setData();
diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index cce0d9bb9..48fc8ff73 100755
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -223,7 +223,7 @@ $tabellen=array(
 	"public.tbl_benutzerfunktion"  => array("benutzerfunktion_id","fachbereich_kurzbz","uid","oe_kurzbz","funktion_kurzbz","semester", "datum_von","datum_bis", "updateamum","updatevon","insertamum","insertvon","ext_id","bezeichnung","wochenstunden"),
 	"public.tbl_benutzergruppe"  => array("uid","gruppe_kurzbz","studiensemester_kurzbz","updateamum","updatevon","insertamum","insertvon","ext_id"),
 	"public.tbl_bewerbungstermine" => array("bewerbungstermin_id","studiengang_kz","studiensemester_kurzbz","beginn","ende","nachfrist","nachfrist_ende","anmerkung", "insertamum", "insertvon", "updateamum", "updatevon","studienplan_id","nationengruppe_kurzbz"),
-	"public.tbl_cis_profil_update" => array("profil_update_id","uid","name","topic","requested_change", "updateamum", "updatevon", "insertamum", "insertvon", "status", "status_timestamp", "status_message"),
+	"public.tbl_profil_update" => array("profil_update_id","uid","name","topic","requested_change", "updateamum", "updatevon", "insertamum", "insertvon", "status", "status_timestamp", "status_message", "attachment_id"),
 	"public.tbl_buchungstyp"  => array("buchungstyp_kurzbz","beschreibung","standardbetrag","standardtext","aktiv","credit_points"),
 	"public.tbl_dokument"  => array("dokument_kurzbz","bezeichnung","ext_id","bezeichnung_mehrsprachig","dokumentbeschreibung_mehrsprachig","ausstellungsdetails"),
 	"public.tbl_dokumentprestudent"  => array("dokument_kurzbz","prestudent_id","mitarbeiter_uid","datum","updateamum","updatevon","insertamum","insertvon","ext_id"),
diff --git a/system/dbupdate_3.4/25999_C4_ma0594.php b/system/dbupdate_3.4/25999_C4_ma0594.php
index e9df68b19..01a2005c3 100755
--- a/system/dbupdate_3.4/25999_C4_ma0594.php
+++ b/system/dbupdate_3.4/25999_C4_ma0594.php
@@ -1,8 +1,54 @@
 <?php
     
-    if(!$result = @$db->db_query("SELECT 1 FROM public.tbl_cis_profil_update LIMIT 1"))
+    if(!$result = @$db->db_query("SELECT 1 FROM public.tbl_profil_update_status LIMIT 1"))
     {
-        $qry = "CREATE TABLE public.tbl_cis_profil_update (
+
+        $qry = " CREATE TABLE public.tbl_profil_update_status (
+            status_kurzbz VARCHAR(32) NOT NULL,
+            beschreibung VARCHAR(256) NULL,
+            CONSTRAINT tbl_profil_update_status_pk PRIMARY KEY(status_kurzbz)
+        );
+
+        INSERT INTO public.tbl_profil_update_status VALUES  ('pending','Profil Änderungen die neu erstellt wurden und noch nicht akzeptiert oder abgelehnt wurden'),
+                                                            ('accepted','Profil Änderungen die akzeptiert wurden'),
+                                                            ('rejected','Profil Änderungen die abgelehn wurden');";
+
+        if(!$db->db_query($qry))
+        echo '<strong>public.tbl_profil_update_status: '.$db->db_last_error().'</strong><br>';
+    else
+        echo '<br>public.tbl_profil_update_status: table created';
+    }
+
+    if(!$result = @$db->db_query("SELECT 1 FROM public.tbl_profil_update_topic LIMIT 1"))
+    {
+
+        $qry="CREATE TABLE public.tbl_profil_update_topic (
+            topic_kurzbz VARCHAR(32) NOT NULL,
+            beschreibung VARCHAR(256) NULL,
+            CONSTRAINT tbl_profil_update_topic_pk PRIMARY KEY(topic_kurzbz)
+        );
+
+        INSERT INTO public.tbl_profil_update_topic VALUES   ('vorname','Vorname aktualisieren'),
+                                                            ('nachname','Nachname aktualisieren'),
+                                                            ('titel','Titel aktualisieren'),
+                                                            ('postnomen','Postnomen aktualisieren'),
+                                                            ('Private Kontakte','Kontakt aktualisieren'),
+                                                            ('Delete Kontakte','Kontakt löschen'),
+                                                            ('Add Kontakte','Kontakt hinzufügen'),
+                                                            ('Private Adressen','Adresse aktualisieren'),
+                                                            ('Delete Adressen','Adresse löschen'),
+                                                            ('Add Adressen','Adresse hinzufügen');";
+
+        if(!$db->db_query($qry))
+        echo '<strong>public.tbl_profil_update_topic: '.$db->db_last_error().'</strong><br>';
+    else
+        echo '<br>public.tbl_profil_update_topic: table created';
+    }
+
+    if(!$result = @$db->db_query("SELECT 1 FROM public.tbl_profil_update LIMIT 1"))
+    {
+        
+            $qry = "CREATE TABLE public.tbl_profil_update (
                 profil_update_id INTEGER NOT NULL,
                 uid VARCHAR(32) NOT NULL,
                 name TEXT NOT NULL,
@@ -15,41 +61,43 @@
                 status VARCHAR(32) NOT NULL,
                 status_timestamp TIMESTAMP NULL,
                 status_message TEXT NULL,
-                CONSTRAINT tbl_cis_profil_update_pk PRIMARY KEY(profil_update_id),
-                CONSTRAINT tbl_cis_profil_update_fk FOREIGN KEY(uid) REFERENCES public.tbl_benutzer(uid)
-            );
+                attachment_id  bigint NULL,
+                CONSTRAINT tbl_profil_update_pk PRIMARY KEY(profil_update_id),
+                CONSTRAINT tbl_profil_update_fk FOREIGN KEY(uid) REFERENCES public.tbl_benutzer(uid),
+                CONSTRAINT tbl_profil_update_status_fk FOREIGN KEY(status) REFERENCES public.tbl_profil_update_status(status_kurzbz),
+                CONSTRAINT tbl_profil_update_topic_fk FOREIGN KEY(topic) REFERENCES public.tbl_profil_update_topic(topic_kurzbz),
+                CONSTRAINT tbl_profil_update_attachment_fk FOREIGN KEY(attachment_id) REFERENCES campus.tbl_dms(dms_id)
+            );            
 
-            CREATE SEQUENCE public.tbl_cis_profil_update_id_seq
+            CREATE SEQUENCE public.tbl_profil_update_id_seq
 			 INCREMENT BY 1
 			 NO MAXVALUE
 			 NO MINVALUE
 			 CACHE 1;
              
-		    ALTER TABLE public.tbl_cis_profil_update ALTER COLUMN profil_update_id SET DEFAULT nextval('public.tbl_cis_profil_update_id_seq');
-            ALTER SEQUENCE public.tbl_cis_profil_update_id_seq OWNED BY public.tbl_cis_profil_update.profil_update_id;
-            ALTER TABLE public.tbl_cis_profil_update ADD CONSTRAINT tbl_cis_profil_update_restricted_status CHECK (status IN ('pending','accepted','rejected'));
-            --ALTER TABLE public.tbl_cis_profil_update ADD CONSTRAINT cis_profil_udpate_topic_uid_unique UNIQUE (uid,topic);
-
-            GRANT SELECT, INSERT, UPDATE, DELETE ON public.tbl_cis_profil_update TO vilesci;
-            GRANT SELECT, INSERT, UPDATE, DELETE ON public.tbl_cis_profil_update TO web; 
-            GRANT SELECT, UPDATE ON public.tbl_cis_profil_update_id_seq TO vilesci;
-            GRANT SELECT, UPDATE ON public.tbl_cis_profil_update_id_seq TO web;";
+		    ALTER TABLE public.tbl_profil_update ALTER COLUMN profil_update_id SET DEFAULT nextval('public.tbl_profil_update_id_seq');
+            ALTER SEQUENCE public.tbl_profil_update_id_seq OWNED BY public.tbl_profil_update.profil_update_id;
+            
+            GRANT SELECT, INSERT, UPDATE, DELETE ON public.tbl_profil_update TO vilesci;
+            GRANT SELECT, INSERT, UPDATE, DELETE ON public.tbl_profil_update TO web; 
+            GRANT SELECT, UPDATE ON public.tbl_profil_update_id_seq TO vilesci;
+            GRANT SELECT, UPDATE ON public.tbl_profil_update_id_seq TO web;";
 
 
         if(!$db->db_query($qry))
-            echo '<strong>public.tbl_cis_profil_update: '.$db->db_last_error().'</strong><br>';
+            echo '<strong>public.tbl_profil_update: '.$db->db_last_error().'</strong><br>';
         else
-            echo '<br>public.tbl_cis_profil_update: table created';
+            echo '<br>public.tbl_profil_update: table created';
     }
 
     
     //? would add a column if the column is missing in the table
-  /*   if(!$result = @$db->db_query("SELECT topic FROM public.tbl_cis_profil_update LIMIT 1"))
+  /*   if(!$result = @$db->db_query("SELECT topic FROM public.tbl_profil_update LIMIT 1"))
     {
-        $qry = "ALTER TABLE public.tbl_cis_profil_update ADD COLUMN topic varchar(32) NOT NULL;";
+        $qry = "ALTER TABLE public.tbl_profil_update ADD COLUMN topic varchar(32) NOT NULL;";
 
         if(!$db->db_query($qry))
-            echo '<strong>public.tbl_cis_profil_update: '.$db->db_last_error().'</strong><br>';
+            echo '<strong>public.tbl_profil_update: '.$db->db_last_error().'</strong><br>';
         else
-            echo '<br>public.tbl_cis_profil_update: Spalte topic hinzugefuegt';
+            echo '<br>public.tbl_profil_update: Spalte topic hinzugefuegt';
     }  */
\ No newline at end of file

From fa1871a05946c6a8fbad200c1abab6acc8ad97e0 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 7 Feb 2024 16:34:00 +0100
Subject: [PATCH 0387/1461] adopting profil controllers/models/views to db
 table change

---
 application/controllers/Cis/Profil.php        | 22 +++++++++----------
 application/controllers/Cis/ProfilUpdate.php  |  8 +++----
 ...ange_model.php => Profil_update_model.php} | 12 +++++-----
 public/js/apps/Cis/Profil.js                  |  4 ++--
 .../Cis/Profil/MitarbeiterProfil.js           |  2 +-
 5 files changed, 24 insertions(+), 24 deletions(-)
 rename application/models/person/{Profil_change_model.php => Profil_update_model.php} (85%)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index 8e7c1a26a..ab7a60e80 100755
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -42,7 +42,7 @@ class Profil extends Auth_Controller
 		$this->load->model('person/Benutzergruppe_model', 'BenutzergruppeModel');
 		$this->load->model('ressource/Betriebsmittelperson_model', 'BetriebsmittelpersonModel');
 		$this->load->model('person/Kontakt_model', 'KontaktModel');
-		$this->load->model('person/Profil_change_model', 'ProfilChangeModel');
+		$this->load->model('person/Profil_update_model', 'ProfilUpdateModel');
 		$this->load->model('content/DmsVersion_model', 'DmsVersionModel');
 		$this->load->model('DmsVersion_model','DmsVersionModel');
 
@@ -172,7 +172,7 @@ class Profil extends Auth_Controller
 		if(isset($uid)) $whereClause['uid'] = $uid;
 		if(isset($id)) $whereClause['id'] = $id;
 		
-		$res= $this->ProfilChangeModel->getProfilUpdate($whereClause);
+		$res= $this->ProfilUpdateModel->getProfilUpdate($whereClause);
 
 		echo json_encode($res);
 		
@@ -181,7 +181,7 @@ class Profil extends Auth_Controller
 
 	public function getProfilRequestFiles(){
 		$id = json_decode($this->input->raw_input_stream);
-		echo json_encode($this->ProfilChangeModel->getFilesFromChangeRequest($id));
+		echo json_encode($this->ProfilUpdateModel->getFilesFromChangeRequest($id));
 	}
 
 	public function insertProfilRequest()
@@ -201,7 +201,7 @@ class Profil extends Auth_Controller
 		$data = ["topic"=>$json->topic,"uid" => $this->uid, "name"=>getData($name), "requested_change" => json_encode($payload), "insertamum" => "NOW()", "insertvon"=>$this->uid,"status"=>"pending" ];
 
 		//? loops over all updateRequests from a user to validate if the new request is valid
-		$res = $this->ProfilChangeModel->loadWhere(["uid"=>$this->uid]);
+		$res = $this->ProfilUpdateModel->loadWhere(["uid"=>$this->uid]);
 		$res = hasData($res) ? getData($res) : null;
 		
 		if($res){
@@ -225,13 +225,13 @@ class Profil extends Auth_Controller
 			}
 		}}
 		
-			$insertID = $this->ProfilChangeModel->insert($data);
+			$insertID = $this->ProfilUpdateModel->insert($data);
 				
 			if(isError($insertID)){
 				//catch error
 			}else{
 				$insertID = hasData($insertID)? getData($insertID): null;
-				$editTimestamp = $this->ProfilChangeModel->getTimestamp($insertID);
+				$editTimestamp = $this->ProfilUpdateModel->getTimestamp($insertID);
 				
 				$date = success(date_create($editTimestamp)->format('d.m.Y'));
 				echo json_encode($date);
@@ -244,12 +244,12 @@ class Profil extends Auth_Controller
 		$json = json_decode($this->input->raw_input_stream);
 		
 		
-		$updateID =$this->ProfilChangeModel->update([$json->ID],["requested_change" => json_encode($json->payload), "updateamum" => "NOW()", "updatevon" => $this->uid]);
+		$updateID =$this->ProfilUpdateModel->update([$json->ID],["requested_change" => json_encode($json->payload), "updateamum" => "NOW()", "updatevon" => $this->uid]);
 		if(isError($updateID)){
 			//catch error
 		}else{
 			$updateID = hasData($updateID)? getData($updateID)[0]: null;
-			$editTimestamp = $this->ProfilChangeModel->getTimestamp($updateID,true);
+			$editTimestamp = $this->ProfilUpdateModel->getTimestamp($updateID,true);
 			
 			$date = success(date_create($editTimestamp)->format('d.m.Y')); 
 			echo json_encode($date);
@@ -259,7 +259,7 @@ class Profil extends Auth_Controller
 	public function deleteProfilRequest(){
 
 		$json = json_decode($this->input->raw_input_stream);
-		$delete_res = $this->ProfilChangeModel->delete([$json]);
+		$delete_res = $this->ProfilUpdateModel->delete([$json]);
 		echo json_encode($delete_res);
 	}
 
@@ -659,7 +659,7 @@ class Profil extends Auth_Controller
 
 
 		//? querying if the user has profil update requests
-		$profilUpdates = $this->ProfilChangeModel->getProfilUpdate(['uid'=>$this->uid]);
+		$profilUpdates = $this->ProfilUpdateModel->getProfilUpdate(['uid'=>$this->uid]);
 		if(isError($profilUpdates)){
 			//error handling
 		}else{
@@ -865,7 +865,7 @@ class Profil extends Auth_Controller
 		}
 
 		//? querying if the user has profil update requests
-		$profilUpdates = $this->ProfilChangeModel->getProfilUpdate(['uid'=>$this->uid]);
+		$profilUpdates = $this->ProfilUpdateModel->getProfilUpdate(['uid'=>$this->uid]);
 		if(isError($profilUpdates)){
 			//error handling
 		}else{
diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
index 17eddfe41..c35b808bd 100755
--- a/application/controllers/Cis/ProfilUpdate.php
+++ b/application/controllers/Cis/ProfilUpdate.php
@@ -21,7 +21,7 @@ class ProfilUpdate extends Auth_Controller
 		]);
 		
 
-		$this->load->model('person/Profil_change_model','ProfilChangeModel');
+		$this->load->model('person/Profil_update_model','ProfilUpdateModel');
 		$this->load->model('person/Kontakt_model','KontaktModel');
 		$this->load->model('person/Adresse_model','AdresseModel');
 		$this->load->model('person/Adressentyp_model', 'AdressenTypModel');
@@ -48,7 +48,7 @@ class ProfilUpdate extends Auth_Controller
 	public function getProfilUpdates($status=null){
 		
 		
-		$res = $this->ProfilChangeModel->getProfilUpdate(isset($status)?['status'=>$status]:null);
+		$res = $this->ProfilUpdateModel->getProfilUpdate(isset($status)?['status'=>$status]:null);
 		
 		echo json_encode($res);
 	}
@@ -125,11 +125,11 @@ class ProfilUpdate extends Auth_Controller
 	}
 
 	private function updateRequestedChange($id, $requested_change){
-		return $this->ProfilChangeModel->update([$id], ['requested_change'=>json_encode($requested_change)]);
+		return $this->ProfilUpdateModel->update([$id], ['requested_change'=>json_encode($requested_change)]);
 	}
 
 	private function setStatusOnUpdateRequest($id, $status, $status_message ){ 
-		return $this->ProfilChangeModel->update([$id], ["status"=>$status,"status_timestamp"=>"NOW()","status_message"=>$status_message]);
+		return $this->ProfilUpdateModel->update([$id], ["status"=>$status,"status_timestamp"=>"NOW()","status_message"=>$status_message]);
 	}
 
 
diff --git a/application/models/person/Profil_change_model.php b/application/models/person/Profil_update_model.php
similarity index 85%
rename from application/models/person/Profil_change_model.php
rename to application/models/person/Profil_update_model.php
index 104f17974..c71aa5b98 100755
--- a/application/models/person/Profil_change_model.php
+++ b/application/models/person/Profil_update_model.php
@@ -1,6 +1,6 @@
 <?php
 
-class Profil_change_model extends DB_Model
+class Profil_update_model extends DB_Model
 {
 	/**
 	 * Constructor
@@ -8,7 +8,7 @@ class Profil_change_model extends DB_Model
 	public function __construct()
 	{
 		parent::__construct();
-		$this->dbTable = 'public.tbl_cis_profil_update';
+		$this->dbTable = 'public.tbl_profil_update';
 		$this->pk = ['profil_update_id'];
         $this->hasSequence = true;
 
@@ -61,8 +61,8 @@ class Profil_change_model extends DB_Model
 		
 		$res =[];
 		if($studentBerechtigung) {
-			$this->addJoin('tbl_student','tbl_student.student_uid=tbl_cis_profil_update.uid');
-			$studentRequests = $this->loadWhere(isset($whereClause['status']) && $whereClause['status']? ['status'=>$whereClause['status']]:[]);
+			$this->addJoin('tbl_student','tbl_student.student_uid=tbl_profil_update.uid');
+			$studentRequests = $this->loadWhere($whereClause);
 			if(isError($studentRequests)) return error("db error: ". getData($studentRequests));
 			$studentRequests = getData($studentRequests)?:[]; 
 			foreach($studentRequests as $request){
@@ -70,8 +70,8 @@ class Profil_change_model extends DB_Model
 			}
 		}
 		if($mitarbeiterBerechtigung) {
-			$this->addJoin('tbl_mitarbeiter','tbl_mitarbeiter.mitarbeiter_uid=tbl_cis_profil_update.uid');
-			$mitarbeiterRequests = $this->loadWhere(isset($whereClause['status']) && $whereClause['status']? ['status'=>$whereClause['status']]:[]);
+			$this->addJoin('tbl_mitarbeiter','tbl_mitarbeiter.mitarbeiter_uid=tbl_profil_update.uid');
+			$mitarbeiterRequests = $this->loadWhere($whereClause);
 			if(isError($mitarbeiterRequests)) return error("db error: ". getData($mitarbeiterRequests));
 			$mitarbeiterRequests = getData($mitarbeiterRequests)?:[]; 
 			foreach($mitarbeiterRequests as $request){
diff --git a/public/js/apps/Cis/Profil.js b/public/js/apps/Cis/Profil.js
index 935dd2ab2..334ffa270 100755
--- a/public/js/apps/Cis/Profil.js
+++ b/public/js/apps/Cis/Profil.js
@@ -178,7 +178,7 @@ const app = Vue.createApp({
 				Private_Kontakte: {
 				  title:"Private Kontakte" ,
 				  data:this.data.kontakte.filter(item => {
-					return !this.data.profilUpdates.some((update) => update.status ==='pending' && update.requested_change?.kontakt_id === item.kontakt_id);
+					return !this.data.profilUpdates?.some((update) => update.status ==='pending' && update.requested_change?.kontakt_id === item.kontakt_id);
 				  }).map(kontakt => {
 					return {
 					  listview:'Kontakt',
@@ -189,7 +189,7 @@ const app = Vue.createApp({
 				Private_Adressen: {
 				  title: "Private Adressen",
 				  data:this.data.adressen.filter(item => {
-					return !this.data.profilUpdates.some(update => {
+					return !this.data.profilUpdates?.some(update => {
 					  return  update.status ==='pending' &&  update.requested_change?.adresse_id == item.adresse_id;
 					})
 				  }).map(kontakt => {
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 979246d45..e50ec2429 100755
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -225,7 +225,7 @@ export default {
   created() {
     
     //? sorts the profil Updates: pending -> accepted -> rejected
-    this.data.profilUpdates.sort(this.sortProfilUpdates);
+    this.data.profilUpdates?.sort(this.sortProfilUpdates);
 
       
 

From 9d6159c2021869d5f1188455202584480047d7a2 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 7 Feb 2024 17:54:52 +0100
Subject: [PATCH 0388/1461] Start Prestudent Tab - Forms

---
 .../controllers/components/stv/Config.php     |  12 +-
 .../controllers/components/stv/Prestudent.php | 110 ++++++
 .../Studentenverwaltung/Details/Prestudent.js | 338 ++++++++++++++++++
 3 files changed, 456 insertions(+), 4 deletions(-)
 create mode 100644 application/controllers/components/stv/Prestudent.php

diff --git a/application/controllers/components/stv/Config.php b/application/controllers/components/stv/Config.php
index efc93e3d8..5c6b52c9c 100644
--- a/application/controllers/components/stv/Config.php
+++ b/application/controllers/components/stv/Config.php
@@ -19,18 +19,22 @@ class Config extends FHC_Controller
 			'title' => 'Details',
 			'component' => './Stv/Studentenverwaltung/Details/Details.js'
 		];
+		$result['notizen'] = [
+			'title' => 'Notizen',
+			'component' => './Stv/Studentenverwaltung/Details/Notizen.js'
+		];
 		$result['kontakt'] = [
 			'title' => 'Kontakt',
 			'component' => './Stv/Studentenverwaltung/Details/Kontakt.js'
 		];
+		$result['prestudent'] = [
+			'title' => 'PreStudentIn',
+			'component' => './Stv/Studentenverwaltung/Details/Prestudent.js'
+		];
 		$result['noten'] = [
 			'title' => 'Noten',
 			'component' => './Stv/Studentenverwaltung/Details/Noten.js'
 		];
-		$result['notizen'] = [
-			'title' => 'Notizen',
-			'component' => './Stv/Studentenverwaltung/Details/Notizen.js'
-		];
 
 		Events::trigger('stv_conf_student', function & () use (&$result) {
 			return $result;
diff --git a/application/controllers/components/stv/Prestudent.php b/application/controllers/components/stv/Prestudent.php
new file mode 100644
index 000000000..c045a4be2
--- /dev/null
+++ b/application/controllers/components/stv/Prestudent.php
@@ -0,0 +1,110 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+
+class Prestudent extends FHC_Controller
+{
+	public function __construct()
+	{
+		parent::__construct();
+
+		// Load Libraries
+		$this->load->library('AuthLib');
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+
+		// Load language phrases
+		/*		$this->loadPhrases([
+					'ui'
+				]);*/
+	}
+
+	public function get($prestudent_id)
+	{
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+		$this->PrestudentModel->addSelect('*');
+		$result = $this->PrestudentModel->loadWhere(['prestudent_id' => $prestudent_id]);
+
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->outputJson(getError($result));
+		} elseif (!hasData($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_NOT_FOUND);
+			$this->outputJson('NOT FOUND');
+		} else {
+			$this->outputJson(current(getData($result)));
+		}
+	}
+
+	public function getBezeichnungZgv(){
+		$this->load->model('codex/Zgv_model', 'ZgvModel');
+
+		$this->ZgvModel->addOrder('zgv_code');
+
+		$result = $this->ZgvModel->load();
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+		}
+		$this->outputJson($result);
+	}
+
+	public function getAusbildung(){
+		$this->load->model('codex/Ausbildung_model', 'AusbildungModel');
+
+		$this->AusbildungModel->addOrder('ausbildungcode');
+
+		$result = $this->AusbildungModel->load();
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+		}
+		$this->outputJson($result);
+	}
+
+	public function getAufmerksamdurch(){
+		$this->load->model('codex/Aufmerksamdurch_model', 'AufmerksamdurchModel');
+
+		$this->AufmerksamdurchModel->addOrder('aufmerksamdurch_kurzbz');
+
+		$result = $this->AufmerksamdurchModel->load();
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+		}
+		$this->outputJson($result);
+	}
+
+	public function getBerufstaetigkeit(){
+		$this->load->model('codex/Berufstaetigkeit_model', 'BerufstaetigkeitModel');
+
+		$this->BerufstaetigkeitModel->addOrder('berufstaetigkeit_code');
+
+		$result = $this->BerufstaetigkeitModel->load();
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+		}
+		$this->outputJson($result);
+	}
+
+	public function getTypenStg(){
+		$this->load->model('organisation/Studiengangstyp_model', 'StudiengangstypModel');
+
+		$this->StudiengangstypModel->addOrder('typ');
+
+		$result = $this->StudiengangstypModel->load();
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+		}
+		$data = $result->retval;
+
+		//filter NullValues
+		$filteredData = array_filter($data, function ($entry) {
+			return $entry->bezeichnung !== null;
+		});
+		$result->retval = $filteredData;
+
+		$this->outputJson($result);
+	}
+
+
+}
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
index e69de29bb..e1c6a1ccd 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
@@ -0,0 +1,338 @@
+import {CoreRESTClient} from '../../../../RESTClient.js';
+import FormForm from '../../../Form/Form.js';
+import FormInput from '../../../Form/Input.js';
+
+export default {
+	components: {
+		CoreRESTClient,
+		FormForm,
+		FormInput
+	},
+	inject: {
+		lists: {
+			from: 'lists'
+		}
+	},
+	props: {
+		modelValue: Object
+	},
+	data(){
+		return {
+			data: [],
+			listZgvs: [],
+			listStgs: [],
+			listAusbildung: [],
+			listAufmerksamdurch: [],
+			listBerufe: [],
+			listStgTyp: [],
+			listFoerderrelevant: []
+		};
+	},
+	methods: {
+		loadData(prestudent_id){
+			console.log("prestudent_id: " + prestudent_id);
+			return CoreRESTClient.get('components/stv/Zusatzfelder/loadData/' + prestudent_id)
+				.then(
+					result => {
+						if(result)
+							this.data = result.data.retval;
+						else
+						{
+							this.data = [];
+							this.$fhcAlert.alertError('Keine Prestudent_id ' + prestudent_id + ' gefunden');
+						}
+						return result;
+					}
+				);
+		},
+		updatePrestudent() {
+			CoreRESTClient
+				.get('components/stv/Prestudent/get/' + this.modelValue.prestudent_id)
+				.then(result => result.data)
+				.then(result => {
+					this.data = result;
+					console.log(result);
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+	},
+	created() {
+		this.updatePrestudent();
+		CoreRESTClient
+			.get('components/stv/Prestudent/getBezeichnungZGV')
+			.then(result => CoreRESTClient.getData(result.data) || [])
+			.then(result => {
+				this.listZgvs = result;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+		CoreRESTClient
+			.get('components/stv/Lists/getStgs')
+			.then(result => CoreRESTClient.getData(result.data) || [])
+			.then(result => {
+				this.listStgs = result;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+		CoreRESTClient
+			.get('components/stv/Prestudent/getAusbildung')
+			.then(result => CoreRESTClient.getData(result.data) || [])
+			.then(result => {
+				this.listAusbildung = result;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+		CoreRESTClient
+			.get('components/stv/Prestudent/getAufmerksamdurch')
+			.then(result => CoreRESTClient.getData(result.data) || [])
+			.then(result => {
+				this.listAufmerksamdurch = result;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+		CoreRESTClient
+			.get('components/stv/Prestudent/getBerufstaetigkeit')
+			.then(result => CoreRESTClient.getData(result.data) || [])
+			.then(result => {
+				this.listBerufe = result;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+		CoreRESTClient
+			.get('components/stv/Prestudent/getTypenStg')
+			.then(result => CoreRESTClient.getData(result.data) || [])
+			.then(result => {
+				this.listStgTyp = result;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+	},
+	template: `
+	<div class="stv-details-details h-100 pb-3">
+		<form-form ref="form" class="stv-details-prestudent" @submit.prevent="save">
+		<!--<form ref="form">-->
+			<fieldset class="overflow-hidden">
+				<legend>Zugangsvoraussetzungen für {{modelValue.nachname}} {{modelValue.vorname}}</legend>
+	<!--				<template v-if="data">-->
+						<div class="row mb-3">
+							<form-input
+								container-class="col-3"
+								label="Prestudent_id"
+								type="text"
+								v-model="data.prestudent_id"
+								name="prestudent_id"
+								readonly
+								>
+							</form-input>
+							<form-input
+								container-class="col-3"
+								label="Person_id"
+								type="text"
+								v-model="data.person_id"
+								name="person_id"
+								readonly
+								>
+							</form-input>
+						</div>
+						<div class="row mb-3">
+							<form-input
+								container-class="col-3"
+								label="ZGV"
+								type="select"
+								v-model="data.zgv_code"
+								name="zgvcode"
+								>
+							<option v-for="zgv in listZgvs" :key="zgv.zgv_code" :value="zgv.zgv_code">{{zgv.zgv_bez}}</option>
+							</form-input>
+							<form-input
+								container-class="col-3"
+								label="ZGV Ort"
+								type="text"
+								v-model="data.zgvort"
+								name="zgvort"
+								>
+							</form-input>
+							<form-input
+								container-class="col-3"
+								label="ZGV Datum"
+								type="DatePicker"
+								v-model="data.zgvdatum"
+								name="zgvdatum"
+								no-today
+								auto-apply
+								:enable-time-picker="false"
+								format="dd.MM.yyyy"
+								preview-format="dd.MM.yyyy"
+								:teleport="true"
+								>
+							</form-input>
+							<form-input
+								container-class="col-3"
+								label="ZGV Nation"
+								type="select"
+								v-model="data.zgvnation"
+								name="zgvnation"
+								>
+								<!-- TODO(chris): gesperrte nationen können nicht ausgewählt werden! Um das zu realisieren müsste man ein pseudo select machen -->
+								<option v-for="nation in lists.nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
+							</form-input>
+						</div>
+						<div class="row mb-3">
+							<form-input
+								container-class="col-3"
+								label="ZGV Master"
+								type="text"
+								v-model="data.zgvmas_code"
+								name="zgvmascode"
+								>
+								<option v-for="zgv in listZgvs" :key="zgv.zgv_code" :value="zgv.zgv_code">{{zgv.zgv_bez}}</option>
+							</form-input>
+							<form-input
+								container-class="col-3"
+								label="ZGV Master Ort"
+								type="text"
+								v-model="data.zgvmaort"
+								name="zgvmaort"
+								>
+							</form-input>
+							<form-input
+								container-class="col-3"
+								label="ZGV Master Datum"
+								type="DatePicker"
+								v-model="data.zgvmadatum"
+								name="zgvmadatum"
+								no-today
+								auto-apply
+								:enable-time-picker="false"
+								format="dd.MM.yyyy"
+								preview-format="dd.MM.yyyy"
+								:teleport="true"
+								>
+							</form-input>
+							<form-input
+								container-class="col-3"
+								label="ZGV Master Nation"
+								type="select"
+								v-model="data.zgvmanation"
+								name="zgvmanation"
+								>
+								<!-- TODO(chris): gesperrte nationen können nicht ausgewählt werden! Um das zu realisieren müsste man ein pseudo select machen -->
+								<option v-for="nation in lists.nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
+							</form-input>
+						</div>
+		<!--			</template>-->
+			</fieldset>
+			<fieldset class="overflow-hidden">
+				<legend>PrestudentIn</legend>
+				
+					<div class="row mb-3">
+						<form-input
+							container-class="col-4"
+							label="Aufmerksam durch"
+							type="select"
+							v-model="data.aufmerksamdurch_kurzbz"
+							name="aufmerksamDurch"
+							>
+							<option v-for="adurch in listAufmerksamdurch" :key="adurch.aufmerksamdurch_kurzbz" :value="adurch.aufmerksamdurch_kurzbz">{{adurch.beschreibung}}</option>
+						</form-input>
+						<form-input
+							container-class="col-4"
+							label="Berufstätigkeit"
+							type="select"
+							v-model="data.berufstaetigkeit_code"
+							name="berufstaetigkeit_code"
+							>
+							<option v-for="beruf in listBerufe" :key="beruf.berufstaetigkeit_code" :value="beruf.berufstaetigkeit_code">{{beruf.berufstaetigkeit_bez}} </option>
+						</form-input>
+						<form-input
+							container-class="col-4"
+							label="Ausbildung"
+							type="select"
+							v-model="data.ausbildungcode"
+							name="ausbildungcode"
+							>
+							<option v-for="ausbld in listAusbildung" :key="ausbld.ausbildungcode" :value="ausbld.ausbildungcode">{{ausbld.ausbildungbez}} </option>
+						</form-input>
+					</div>
+					
+					<div class="row mb-3">
+						<form-input
+							container-class="col-4"
+							label="Studiengang"
+							type="select"
+							v-model="data.studiengang_kz"
+							name="studiengang_kz"
+							disabled
+							>
+							<option v-for="stg in listStgs" :key="stg.studiengang_kz" :value="stg.studiengang_kz">{{stg.kuerzel}} - {{stg.bezeichnung}} </option>
+						</form-input>
+						<form-input
+							container-class="col-4"
+							label="Studientyp"
+							type="select"
+							v-model="data.gsstudientyp_kurzbz"
+							name="gsstudientyp_kurzbz"
+							>
+							<option v-for="typ in listStgTyp" :key="typ.typ" :value="typ.typ">{{typ.bezeichnung}} </option>
+						</form-input>
+					</div>
+					
+					<div class="row mb-3">
+						<form-input
+							container-class="col-5"
+							label="Anmerkung"
+							type="text"
+							v-model="data.anmerkung"
+							name="anmerkung"
+							>
+						</form-input>
+						<div class="col-2 pt-4 d-flex align-items-center">
+							<form-input
+								container-class="form-check"
+								label="Bismelden"
+								type="checkbox"
+								v-model="data.bismelden"
+								name="bismelden"
+								>
+							</form-input>
+						</div>
+						<div class="col-2 pt-4 d-flex align-items-center">
+							<form-input
+								container-class="form-check"
+								label="Duales Studium"
+								type="checkbox"
+								v-model="data.dual"
+								name="dual"
+								>
+							</form-input>
+						</div>
+						<form-input
+							container-class="col-2"
+							label="Förderrelevant"
+							type="select"
+							v-model="data.foerderrelevant"
+							name="foerderrelevant"
+							>
+							<option :value="" selected >wie Studiengang</option>
+							<option :value="true">ja</option>
+							<option :value="false">nein</option>
+						</form-input>
+						<form-input
+							container-class="col-1"
+							label="Priorität"
+							type="text"
+							v-model="data.priorisierung"
+							name="priorisierung"
+							>
+						</form-input>
+					</div>
+				
+			</fieldset>
+		
+		</form-form>
+		
+		<br>
+		{{modelValue}}
+		<hr>
+		{{data}}
+		<hr>
+		{{listStgTyp}}
+		
+		
+	</div>
+	`
+};
\ No newline at end of file

From 89bc5a5d9dbeb01f562e8a6c583bcfeffea6cab3 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 8 Feb 2024 11:48:14 +0100
Subject: [PATCH 0389/1461] Assistenten koennen nur Profil Aenderungen von
 Studenten ansehen deren Organisationseinheit in den Berechtigung des
 Assistenten vorhanden sind (und kleiner sessionStorage fix der einen String
 zu Boolean converted)

---
 .../models/person/Profil_update_model.php     | 24 ++++++++++++--
 public/js/apps/Cis/ProfilUpdateRequests.js    | 33 +++++++++++--------
 2 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/application/models/person/Profil_update_model.php b/application/models/person/Profil_update_model.php
index c71aa5b98..2fbecb27c 100755
--- a/application/models/person/Profil_update_model.php
+++ b/application/models/person/Profil_update_model.php
@@ -58,11 +58,30 @@ class Profil_update_model extends DB_Model
 		
 		$studentBerechtigung = $this->permissionlib->isBerechtigt('student/stammdaten','s');
 		$mitarbeiterBerechtigung = $this->permissionlib->isBerechtigt('mitarbeiter/stammdaten','s');
+		$oe_berechtigung = $this->permissionlib->getOE_isEntitledFor('student/stammdaten');
 		
 		$res =[];
+		
 		if($studentBerechtigung) {
-			$this->addJoin('tbl_student','tbl_student.student_uid=tbl_profil_update.uid');
-			$studentRequests = $this->loadWhere($whereClause);
+			//? Nur wenn der/die AssistentIn auch die Berechtigung in der gleichen Organisationseinheit des Studenten hat
+			$parameters = [];
+			$query="
+			SELECT * FROM public.tbl_profil_update 
+			JOIN public.tbl_student ON public.tbl_student.student_uid=public.tbl_profil_update.uid
+			JOIN public.tbl_prestudent ON public.tbl_prestudent.prestudent_id=public.tbl_student.prestudent_id
+			JOIN public.tbl_studiengang ON public.tbl_studiengang.studiengang_kz=public.tbl_prestudent.studiengang_kz
+			JOIN public.tbl_organisationseinheit ON public.tbl_organisationseinheit.oe_kurzbz=public.tbl_studiengang.oe_kurzbz
+			Where public.tbl_studiengang.oe_kurzbz IN ? ";
+			$parameters[]=$oe_berechtigung;
+			if($whereClause){
+				foreach($whereClause as $key=>$value){
+					$parameters[] = $value;
+					$query .=  " AND ".$key." = ?";
+				} 
+			}
+			
+			$studentRequests =$this->execReadOnlyQuery($query,$parameters);
+			
 			if(isError($studentRequests)) return error("db error: ". getData($studentRequests));
 			$studentRequests = getData($studentRequests)?:[]; 
 			foreach($studentRequests as $request){
@@ -70,6 +89,7 @@ class Profil_update_model extends DB_Model
 			}
 		}
 		if($mitarbeiterBerechtigung) {
+			
 			$this->addJoin('tbl_mitarbeiter','tbl_mitarbeiter.mitarbeiter_uid=tbl_profil_update.uid');
 			$mitarbeiterRequests = $this->loadWhere($whereClause);
 			if(isError($mitarbeiterRequests)) return error("db error: ". getData($mitarbeiterRequests));
diff --git a/public/js/apps/Cis/ProfilUpdateRequests.js b/public/js/apps/Cis/ProfilUpdateRequests.js
index 43c7257d5..188406e84 100755
--- a/public/js/apps/Cis/ProfilUpdateRequests.js
+++ b/public/js/apps/Cis/ProfilUpdateRequests.js
@@ -29,7 +29,22 @@ const app = Vue.createApp({
   data() {
     return {
       showAll: false,
+      
       profil_updates_table_options: {
+        ajaxURL:
+          FHC_JS_DATA_STORAGE_OBJECT.app_root +
+          FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+          `/Cis/ProfilUpdate/`,
+
+        ajaxURLGenerator: (url, config, params) => {
+          //? this function needs to be an array function in order to access the this properties of the Vue component
+          console.log("showAll printed here:", this.showAll);
+          if (this.showAll) {
+            return url + "getProfilUpdates";
+          } else {
+            return url + "getProfilUpdates/pending";
+          }
+        },
         ajaxResponse: function (url, params, response) {
           //url - the URL of the request
           //params - the parameters passed with the request
@@ -118,19 +133,7 @@ const app = Vue.createApp({
           }
           return menu;
         },
-        ajaxURL:
-          FHC_JS_DATA_STORAGE_OBJECT.app_root +
-          FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-          `/Cis/ProfilUpdate/`,
-
-        ajaxURLGenerator: (url, config, params) => {
-          //? this function needs to be an array function in order to access the this properties of the Vue component
-          if (this.showAll) {
-            return url + "getProfilUpdates";
-          } else {
-            return url + "getProfilUpdates/pending";
-          }
-        },
+        
         height: 600,
         layout: "fitColumns",
 
@@ -241,7 +244,9 @@ const app = Vue.createApp({
   },
   mounted() {
     if (!(sessionStorage.getItem("showAll") === null)) {
-      this.showAll = JSON.parse(sessionStorage.getItem("showAll"));
+      //? converting string into a boolean: https://sentry.io/answers/how-can-i-convert-a-string-to-a-boolean-in-javascript/
+      this.showAll = sessionStorage.getItem("showAll")==="true";
+      
     }
   },
   template: `

From cda13ac7053ba8d57aceb89f084e051592eafe1c Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 8 Feb 2024 13:47:03 +0100
Subject: [PATCH 0390/1461] makes the send button in the profil update popup
 disabled instead of not showing it

---
 application/controllers/Cis/Profil.php        | 21 +++--------
 application/controllers/Cis/ProfilUpdate.php  |  6 ++--
 .../models/person/Profil_update_model.php     | 36 ++++++++++++++-----
 public/js/apps/Cis/ProfilUpdateRequests.js    |  5 ++-
 public/js/components/Cis/Profil/EditProfil.js |  3 +-
 .../js/components/Cis/Profil/StudentProfil.js |  3 ++
 6 files changed, 42 insertions(+), 32 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index ab7a60e80..06c829763 100755
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -27,7 +27,7 @@ class Profil extends Auth_Controller
 			'insertFile' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'getProfilRequestFiles' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'deleteOldVersionFiles' => ['student/anrechnung_beantragen:r', 'user:r'],
-			'test' => ['student/anrechnung_beantragen:r', 'user:r'],
+			
 						
 		]);
 
@@ -63,17 +63,6 @@ class Profil extends Auth_Controller
 	 * @return void
 	 */
 
-	 public function test(){
-		
-		// Loads permission lib
-		$this->load->library('PermissionLib');
-		$mit_daten =$this->permissionlib->isBerechtigt('mitarbeiter/stammdaten','suid');
-		var_dump($mit_daten);
-		$stud_daten = $this->permissionlib->isBerechtigt('student/stammdaten','suid');
-		var_dump($stud_daten);
-	}
-
-
 	public function index()
 	{
 		$this->load->view('Cis/Profil');
@@ -172,7 +161,7 @@ class Profil extends Auth_Controller
 		if(isset($uid)) $whereClause['uid'] = $uid;
 		if(isset($id)) $whereClause['id'] = $id;
 		
-		$res= $this->ProfilUpdateModel->getProfilUpdate($whereClause);
+		$res= $this->ProfilUpdateModel->getProfilUpdatesWhere($whereClause);
 
 		echo json_encode($res);
 		
@@ -201,7 +190,7 @@ class Profil extends Auth_Controller
 		$data = ["topic"=>$json->topic,"uid" => $this->uid, "name"=>getData($name), "requested_change" => json_encode($payload), "insertamum" => "NOW()", "insertvon"=>$this->uid,"status"=>"pending" ];
 
 		//? loops over all updateRequests from a user to validate if the new request is valid
-		$res = $this->ProfilUpdateModel->loadWhere(["uid"=>$this->uid]);
+		$res = $this->ProfilUpdateModel->getProfilUpdatesWhere(["uid"=>$this->uid]);
 		$res = hasData($res) ? getData($res) : null;
 		
 		if($res){
@@ -659,7 +648,7 @@ class Profil extends Auth_Controller
 
 
 		//? querying if the user has profil update requests
-		$profilUpdates = $this->ProfilUpdateModel->getProfilUpdate(['uid'=>$this->uid]);
+		$profilUpdates = $this->ProfilUpdateModel->getProfilUpdatesWhere(['uid'=>$this->uid]);
 		if(isError($profilUpdates)){
 			//error handling
 		}else{
@@ -865,7 +854,7 @@ class Profil extends Auth_Controller
 		}
 
 		//? querying if the user has profil update requests
-		$profilUpdates = $this->ProfilUpdateModel->getProfilUpdate(['uid'=>$this->uid]);
+		$profilUpdates = $this->ProfilUpdateModel->getProfilUpdatesWhere(['uid'=>$this->uid]);
 		if(isError($profilUpdates)){
 			//error handling
 		}else{
diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
index c35b808bd..7e39d6310 100755
--- a/application/controllers/Cis/ProfilUpdate.php
+++ b/application/controllers/Cis/ProfilUpdate.php
@@ -12,7 +12,7 @@ class ProfilUpdate extends Auth_Controller
 	public function __construct(){
 		parent::__construct([
 			'index' => ['student/stammdaten:r','mitarbeiter/stammdaten:r'],
-			'getProfilUpdates' => ['student/stammdaten:r','mitarbeiter/stammdaten:r'],
+			'getProfilUpdateWithPermission' => ['student/stammdaten:r','mitarbeiter/stammdaten:r'],
 			'acceptProfilRequest'=>['student/stammdaten:rw','mitarbeiter/stammdaten:rw'],
 			'denyProfilRequest'=>['student/stammdaten:rw','mitarbeiter/stammdaten:rw'],
 			'show'=>['student/stammdaten:r','mitarbeiter/stammdaten:r'],
@@ -45,10 +45,10 @@ class ProfilUpdate extends Auth_Controller
 		echo json_encode($res);
 	}
 
-	public function getProfilUpdates($status=null){
+	public function getProfilUpdateWithPermission($status=null){
 		
 		
-		$res = $this->ProfilUpdateModel->getProfilUpdate(isset($status)?['status'=>$status]:null);
+		$res = $this->ProfilUpdateModel->getProfilUpdateWithPermission(isset($status)?['status'=>$status]:null);
 		
 		echo json_encode($res);
 	}
diff --git a/application/models/person/Profil_update_model.php b/application/models/person/Profil_update_model.php
index 2fbecb27c..d316feab0 100755
--- a/application/models/person/Profil_update_model.php
+++ b/application/models/person/Profil_update_model.php
@@ -48,13 +48,30 @@ class Profil_update_model extends DB_Model
 		return json_decode($res->requested_change)->files?:[];
 	}
 
+
+	public function getProfilUpdatesWhere($whereClause){
+		$res = $this->loadWhere($whereClause);
+		if(isError($res)){
+			return error("Could not load public.tbl_profil_update with whereClause");
+		}
+		$res = hasData($res) ? getData($res) : [];
+		if($res){
+			foreach($res as $request){
+				$this->formatProfilRequest($request);
+			}
+		}
+		return $res;
+
+	}
+	
+
 	/**
 	 * 
 	 * getProfilUpdate
 	 * returns a profil update with id 
 	 * returns all profil updates if id is set to null
 	 */
-	public function getProfilUpdate($whereClause=null){
+	public function getProfilUpdateWithPermission($whereClause=null){
 		
 		$studentBerechtigung = $this->permissionlib->isBerechtigt('student/stammdaten','s');
 		$mitarbeiterBerechtigung = $this->permissionlib->isBerechtigt('mitarbeiter/stammdaten','s');
@@ -103,14 +120,8 @@ class Profil_update_model extends DB_Model
 	
 		if($res){
 			
-			foreach($res as $update){
-			
-				
-				$update->requested_change = json_decode($update->requested_change);
-				$update->insertamum = !is_null($update->insertamum)?date_create($update->insertamum)->format('d.m.Y'):null;
-				$update->updateamum = !is_null($update->updateamum)?date_create($update->updateamum)->format('d.m.Y'):null;
-				$update->status_timestamp = !is_null($update->status_timestamp)?date_create($update->status_timestamp)->format('d.m.Y'):null;
-					
+			foreach($res as $request){
+				$this->formatProfilRequest($request);
 			}
 		}
 		
@@ -118,4 +129,11 @@ class Profil_update_model extends DB_Model
 
 	}
 
+	private function formatProfilRequest($request){
+				$request->requested_change = json_decode($request->requested_change);
+				$request->insertamum = !is_null($request->insertamum)?date_create($request->insertamum)->format('d.m.Y'):null;
+				$request->updateamum = !is_null($request->updateamum)?date_create($request->updateamum)->format('d.m.Y'):null;
+				$request->status_timestamp = !is_null($request->status_timestamp)?date_create($request->status_timestamp)->format('d.m.Y'):null;
+	}
+
 }
diff --git a/public/js/apps/Cis/ProfilUpdateRequests.js b/public/js/apps/Cis/ProfilUpdateRequests.js
index 188406e84..7982c8519 100755
--- a/public/js/apps/Cis/ProfilUpdateRequests.js
+++ b/public/js/apps/Cis/ProfilUpdateRequests.js
@@ -38,11 +38,10 @@ const app = Vue.createApp({
 
         ajaxURLGenerator: (url, config, params) => {
           //? this function needs to be an array function in order to access the this properties of the Vue component
-          console.log("showAll printed here:", this.showAll);
           if (this.showAll) {
-            return url + "getProfilUpdates";
+            return url + "getProfilUpdateWithPermission";
           } else {
-            return url + "getProfilUpdates/pending";
+            return url + "getProfilUpdateWithPermission/pending";
           }
         },
         ajaxResponse: function (url, params, response) {
diff --git a/public/js/components/Cis/Profil/EditProfil.js b/public/js/components/Cis/Profil/EditProfil.js
index 07e62cd30..6ca410214 100755
--- a/public/js/components/Cis/Profil/EditProfil.js
+++ b/public/js/components/Cis/Profil/EditProfil.js
@@ -43,6 +43,7 @@ export default {
 
   methods: {
     async submitProfilChange() {
+      //? check if data is valid before making a request
       if (this.topic && this.profilUpdate) {
         if (this.profilUpdate.files) {
           const fileIDs = await this.uploadFiles(this.profilUpdate.files);
@@ -179,7 +180,7 @@ export default {
     <template   v-slot:footer>
       
     <button class="btn btn-outline-danger " @click="hide">Abbrechen</button>    
-      <button v-if="profilUpdate"  @click="submitProfilChange" role="button" class="btn btn-primary">Senden</button>
+      <button :disabled="!profilUpdate"  @click="submitProfilChange" role="button" class="btn btn-primary">Senden</button>
     </template>
     <!-- end of optional footer --> 
   </bs-modal>`,
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index 4fc8bedf9..c1c647a96 100755
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -158,6 +158,9 @@ export default {
   },
 
   created(){
+
+    //? sorts the profil Updates: pending -> accepted -> rejected
+    this.data.profilUpdates?.sort(this.sortProfilUpdates);
   },
 
   mounted() {

From c5f69d0e44a222cc9e84ea2c69719f7cf44a4e3a Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 9 Feb 2024 08:36:33 +0100
Subject: [PATCH 0391/1461] Prestudent: Form und Save/Upload Logic

---
 application/config/stv.php                    |   0
 .../controllers/components/stv/Prestudent.php | 133 +++++++++
 .../Studentenverwaltung/Details/Prestudent.js | 281 +++++++++++++++---
 3 files changed, 375 insertions(+), 39 deletions(-)
 create mode 100644 application/config/stv.php

diff --git a/application/config/stv.php b/application/config/stv.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/application/controllers/components/stv/Prestudent.php b/application/controllers/components/stv/Prestudent.php
index c045a4be2..2b08b549c 100644
--- a/application/controllers/components/stv/Prestudent.php
+++ b/application/controllers/components/stv/Prestudent.php
@@ -38,6 +38,114 @@ class Prestudent extends FHC_Controller
 		}
 	}
 
+	public function updatePrestudent($prestudent_id)
+	{
+		$this->load->library('form_validation');
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+/*		$result = $this->PrestudentModel->loadWhere(['prestudent_id' =>$prestudent_id]);
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson(getError($result));
+		} elseif (!hasData($result)) {
+			return $this->outputJson(getError($result));
+		} else {
+			$prestudentData = current(getData($result));
+		}
+
+		var_dump($prestudentData);*/
+
+		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+		$deltaData = $_POST[0];
+
+		if(!$prestudent_id)
+		{
+			return $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+		}
+
+		//Todo(manu) updateamum, updatevon ergänzen
+		$uid = getAuthUID();
+
+		$array_allowed_props_prestudent = [
+			'aufmerksamdurch_kurzbz',
+			'studiengang_kz',
+			'gsstudientyp_kurzbz',
+			'person_id',
+			'berufstaetigkeit_code',
+			'ausbildungcode',
+			'zgv_code',
+			'zgvort',
+			'zgvdatum',
+			'zgvnation',
+			'zgvmas_code',
+			'zgvmaort',
+			'zgvmadatum',
+			'zgvmanation',
+			'facheinschlberuf',
+			'bismelden',
+			'anmerkung',
+			'dual',
+			'zgvdoktor_code', //Todo(Manu) tabelle leer? db zum testen
+			'zgvdoktorort',
+			'zgvdoktordatum',
+			'zgvdoktornation',
+			'aufnahmegruppe_kurzbz',
+			'priorisierung',
+			'foerderrelevant',
+			'zgv_erfuellt',
+			'zgvmas_erfuellt',
+			'zgvdoktor_erfuellt',
+			'mentor',
+			'aufnahmeschluessel',
+			'standort_code'
+		];
+
+/*		foreach ($array_allowed_props_prestudent as $prop)
+		{
+
+
+		}*/
+
+/*		"insertamum": "2021-05-27 13:03:08",
+		"insertvon": "online",
+		"updateamum": "2022-10-10 15:37:31.903056",
+		"updatevon": "poeckl", "ext_id": null,*/
+
+		$update_prestudent = array();
+		foreach ($array_allowed_props_prestudent as $prop)
+		{
+			$val = isset($deltaData[$prop]) ? $deltaData[$prop] : null;
+			if ($val !== null) {
+				$update_prestudent[$prop] = $val;
+			}
+		}
+/*
+		var_dump("update Array");
+		var_dump($update_prestudent);*/
+
+
+
+		if (count($update_prestudent) && $prestudent_id === null) {
+			$this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST);
+			// TODO(manu): phrase
+			return $this->outputJson("Kein/e PrestudentIn vorhanden!");
+		}
+
+		if (count($update_prestudent))
+		{
+			$result = $this->PrestudentModel->update(
+				$prestudent_id,
+				$update_prestudent
+			);
+			if (isError($result)) {
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return $this->outputJson(getError($result));
+			}
+			return $this->outputJsonSuccess(true);
+		}
+
+	}
+
 	public function getBezeichnungZgv(){
 		$this->load->model('codex/Zgv_model', 'ZgvModel');
 
@@ -50,6 +158,30 @@ class Prestudent extends FHC_Controller
 		$this->outputJson($result);
 	}
 
+	public function getBezeichnungDZgv(){
+		$this->load->model('codex/Zgvdoktor_model', 'ZgvdoktorModel');
+
+		$this->ZgvdoktorModel->addOrder('zgvdoktor_code');
+
+		$result = $this->ZgvdoktorModel->load();
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+		}
+		$this->outputJson($result);
+	}
+
+	public function getBezeichnungMZgv(){
+		$this->load->model('codex/Zgvmaster_model', 'ZgvmasterModel');
+
+		$this->ZgvmasterModel->addOrder('zgvmas_code');
+
+		$result = $this->ZgvmasterModel->load();
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+		}
+		$this->outputJson($result);
+	}
+
 	public function getAusbildung(){
 		$this->load->model('codex/Ausbildung_model', 'AusbildungModel');
 
@@ -87,6 +219,7 @@ class Prestudent extends FHC_Controller
 	}
 
 	public function getTypenStg(){
+		//TODO(manu) hier soll bis.tbl_gsstudientyp herangezogen werden
 		$this->load->model('organisation/Studiengangstyp_model', 'StudiengangstypModel');
 
 		$this->StudiengangstypModel->addOrder('typ');
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
index e1c6a1ccd..7c79bf6b2 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
@@ -18,46 +18,89 @@ export default {
 	},
 	data(){
 		return {
+			config: {},
 			data: [],
 			listZgvs: [],
+			listZgvsmaster: [],
+			listZgvsdoktor: [],
 			listStgs: [],
 			listAusbildung: [],
 			listAufmerksamdurch: [],
 			listBerufe: [],
 			listStgTyp: [],
-			listFoerderrelevant: []
+			listFoerderrelevant: [],
+			initialFormData: {},
+			deltaArray: [],
+			actionUpdate: false
 		};
 	},
+	watch: {
+	},
+
 	methods: {
-		loadData(prestudent_id){
-			console.log("prestudent_id: " + prestudent_id);
-			return CoreRESTClient.get('components/stv/Zusatzfelder/loadData/' + prestudent_id)
-				.then(
-					result => {
-						if(result)
-							this.data = result.data.retval;
-						else
-						{
-							this.data = [];
-							this.$fhcAlert.alertError('Keine Prestudent_id ' + prestudent_id + ' gefunden');
-						}
-						return result;
-					}
-				);
-		},
-		updatePrestudent() {
+		loadPrestudent() {
 			CoreRESTClient
 				.get('components/stv/Prestudent/get/' + this.modelValue.prestudent_id)
 				.then(result => result.data)
 				.then(result => {
 					this.data = result;
-					console.log(result);
+					//neue DataVariable um ein Delta der vorgenommenen Änderungen berechnen zu können
+					this.initialFormData = {...this.data};
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
+		updatePrestudent(){
+			this.detectChanges();
+
+/*			this.$nextTick(() => {
+
+				if (this.actionUpdate) {
+					console.log("Action");*/
+					//todo(manu) checken, ob überhaupt eine Änderung vorgenommen wurde
+					CoreRESTClient.post('components/stv/Prestudent/updatePrestudent/' + this.modelValue.prestudent_id,
+						this.deltaArray
+					).then(response => {
+						if (!response.data.error) {
+							this.$fhcAlert.alertSuccess('Speichern erfolgreich');
+							this.deltaArray = [];
+							this.actionUpdate = false;
+						} else {
+							const errorData = response.data.retval;
+							Object.entries(errorData).forEach(entry => {
+								const [key, value] = entry;
+								this.$fhcAlert.alertError(value);
+							});
+						}
+					}).catch(error => {
+						this.statusMsg = 'Error in Catch';
+						this.$fhcAlert.alertError('Fehler bei Speicherroutine aufgetreten');
+					}).finally(() => {
+						window.scrollTo(0, 0);
+					});
+
+/*				} else {
+					console.log("no action");
+				}
+			});*/
+
+
+
+		},
+		detectChanges() {
+			const delta = {};
+			for (const key in this.data) {
+				if (this.data[key] !== this.initialFormData[key]) {
+					delta[key] = this.data[key];
+					this.actionUpdate = true;
+				}
+			}
+			this.deltaArray.push(delta);
+		},
 	},
 	created() {
-		this.updatePrestudent();
+		this.loadPrestudent();
+		//initiale Daten nach dem Laden
+		//this.initialFormData = {...this.data};
 		CoreRESTClient
 			.get('components/stv/Prestudent/getBezeichnungZGV')
 			.then(result => CoreRESTClient.getData(result.data) || [])
@@ -65,6 +108,20 @@ export default {
 				this.listZgvs = result;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
+		CoreRESTClient
+			.get('components/stv/Prestudent/getBezeichnungMZGV')
+			.then(result => CoreRESTClient.getData(result.data) || [])
+			.then(result => {
+				this.listZgvsmaster = result;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+		CoreRESTClient
+			.get('components/stv/Prestudent/getBezeichnungDZGV')
+			.then(result => CoreRESTClient.getData(result.data) || [])
+			.then(result => {
+				this.listZgvsdoktor = result;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
 		CoreRESTClient
 			.get('components/stv/Lists/getStgs')
 			.then(result => CoreRESTClient.getData(result.data) || [])
@@ -101,9 +158,21 @@ export default {
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 	},
+	mounted(){
+		fetch('config/stv')
+			.then(result => result.json())
+			.then(result => {
+				this.config = result;
+				console.log('Konfiguration geladen:', this.config);
+			})
+			.catch(error => console.error('Fehler beim Laden der Konfiguration:', error));
+	},
 	template: `
 	<div class="stv-details-details h-100 pb-3">
-		<form-form ref="form" class="stv-details-prestudent" @submit.prevent="save">
+		<form-form ref="form" class="stv-details-prestudent" @submit.prevent="updatePrestudent">
+		<div class="position-sticky top-0 z-1">
+			<button type="submit" class="btn btn-primary position-absolute top-0 end-0" >Speichern</button>
+		</div>
 		<!--<form ref="form">-->
 			<fieldset class="overflow-hidden">
 				<legend>Zugangsvoraussetzungen für {{modelValue.nachname}} {{modelValue.vorname}}</legend>
@@ -175,11 +244,11 @@ export default {
 							<form-input
 								container-class="col-3"
 								label="ZGV Master"
-								type="text"
+								type="select"
 								v-model="data.zgvmas_code"
 								name="zgvmascode"
 								>
-								<option v-for="zgv in listZgvs" :key="zgv.zgv_code" :value="zgv.zgv_code">{{zgv.zgv_bez}}</option>
+								<option v-for="mzgv in listZgvsmaster" :key="mzgv.zgvmas_code" :value="mzgv.zgvmas_code">{{mzgv.zgvmas_bez}}</option>
 							</form-input>
 							<form-input
 								container-class="col-3"
@@ -214,6 +283,86 @@ export default {
 								<option v-for="nation in lists.nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
 							</form-input>
 						</div>
+						<!--ZGV Doktor Todo(manu) Config -->
+						<div class="row mb-3">
+							<form-input
+								container-class="col-3"
+								label="ZGV Doktor"
+								type="select"
+								v-model="data.zgvdoktor_code"
+								name="zgvdoktor_code"
+								>
+								<option v-for="zgv in listZgvsdoktor" :key="zgv.zgvdoktor_code" :value="zgv.zgvdoktor_code">{{zgv.zgvdoktor_bez}}</option>
+							</form-input>
+							<form-input
+								container-class="col-3"
+								label="ZGV Doktor Ort"
+								type="text"
+								v-model="data.zgvdoktorort"
+								name="zgvdoktorort"
+								>
+							</form-input>
+							<form-input
+								container-class="col-3"
+								label="ZGV Doktor Datum"
+								type="DatePicker"
+								v-model="data.zgvdoktordatum"
+								name="zgvdoktordatum"
+								no-today
+								auto-apply
+								:enable-time-picker="false"
+								format="dd.MM.yyyy"
+								preview-format="dd.MM.yyyy"
+								:teleport="true"
+								>
+							</form-input>
+							<form-input
+								container-class="col-3"
+								label="ZGV Doktor Nation"
+								type="select"
+								v-model="data.zgvdoktornation"
+								name="zgvdoktornation"
+								>
+								<!-- TODO(chris): gesperrte nationen können nicht ausgewählt werden! Um das zu realisieren müsste man ein pseudo select machen -->
+								<option v-for="nation in lists.nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
+							</form-input>
+						</div>
+																		
+						<div class="row mb-3">
+							<div class="col-3 pt-4 d-flex align-items-center">
+								<form-input
+									container-class="form-check"
+									label="ZGV erfüllt"
+									type="checkbox"
+									v-model="data.zgv_erfuellt"
+									name="zgv_erfuellt"
+									>
+								</form-input>
+							</div>
+							<div class="col-3 pt-4 d-flex align-items-center">
+								<form-input
+									container-class="form-check"
+									label="ZGV Master erfüllt"
+									type="checkbox"
+									v-model="data.zgvmas_erfuellt"
+									name="zgvmas_erfuellt"
+									>
+								</form-input>
+							</div>
+							<div class="col-3 pt-4 d-flex align-items-center">
+								<form-input
+									container-class="form-check"
+									label="ZGV Doktor erfüllt"
+									type="checkbox"
+									v-model="data.zgvdoktor_erfuellt"
+									name="zgvdoktor_erfuellt"
+									>
+								</form-input>
+							</div>
+						</div>
+						
+						
+						
 		<!--			</template>-->
 			</fieldset>
 			<fieldset class="overflow-hidden">
@@ -249,6 +398,40 @@ export default {
 						</form-input>
 					</div>
 					
+					<div class="row mb-3">
+						<form-input
+							container-class="col-4"
+							label="Aufnahmeschlüssel"
+							type="text"
+							v-model="data.aufnahmeschluessel"
+							name="aufnahmeschluessel"
+							>
+						</form-input>
+						
+						<div class="col-4 pt-4 d-flex align-items-center">
+							<form-input
+								container-class="form-check"
+								label="Facheinschlägig berufstätig"
+								type="checkbox"
+								v-model="data.facheinschlberuf"
+								name="facheinschlberuf"
+								>
+							</form-input>
+						</div>
+						
+						<!--Todo(manu) validierung Integer, liste hier null-->
+						<form-input
+							container-class="col-4"
+							label="Bisstandort"
+							type="text"
+							v-model="data.standort_code"
+							name="standort_code"
+							disabled
+							>
+						</form-input>
+					 
+					</div>
+					
 					<div class="row mb-3">
 						<form-input
 							container-class="col-4"
@@ -300,17 +483,21 @@ export default {
 								>
 							</form-input>
 						</div>
-						<form-input
-							container-class="col-2"
-							label="Förderrelevant"
-							type="select"
-							v-model="data.foerderrelevant"
-							name="foerderrelevant"
-							>
-							<option :value="" selected >wie Studiengang</option>
-							<option :value="true">ja</option>
-							<option :value="false">nein</option>
-						</form-input>
+					<!--	Todo(manu) hier soll ein select ausgewählt werden??-->
+						<div class="col-2 pt-4 d-flex align-items-center">
+							<form-input
+								container-class="form-check"
+								label="Förderrelevant"
+								type="checkbox" 
+								v-model="data.foerderrelevant"
+								name="foerderrelevant"
+								>
+	<!--							<option :value="" selected >wie Studiengang</option>
+								<option :value="true">ja</option>
+								<option :value="false">nein</option>-->
+							</form-input>
+						</div>
+						<!--	Todo(manu) an Recht basis/prestudent hänaen -->
 						<form-input
 							container-class="col-1"
 							label="Priorität"
@@ -320,18 +507,34 @@ export default {
 							>
 						</form-input>
 					</div>
+					
+					<div class="row mb-3">
+						<form-input
+							container-class="col-5"
+							label="MentorIn"
+							type="text"
+							v-model="data.mentor"
+							name="mentor"
+							>
+						</form-input>
+					</div>
 				
 			</fieldset>
 		
 		</form-form>
 		
 		<br>
-		{{modelValue}}
+<!--		<hr>
+		Data: {{data}}
+		<hr>-->
+
+<!--		<hr>
+		DeltaArray: {{deltaArray}}
+		<br>
+		to update: {{actionUpdate}}
 		<hr>
-		{{data}}
-		<hr>
-		{{listStgTyp}}
-		
+		InitialData: {{initialFormData}}-->
+	
 		
 	</div>
 	`

From 898f40e8a5afacda8abdada3b0a6a539d804c8f3 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 9 Feb 2024 12:14:14 +0100
Subject: [PATCH 0392/1461] hidden fields ZGV depending on Config entries

---
 application/config/stv.php                    |  0
 application/views/Studentenverwaltung.php     | 10 ++++++-
 .../js/components/Stv/Studentenverwaltung.js  |  2 ++
 .../Studentenverwaltung/Details/Prestudent.js | 29 ++++++++++---------
 4 files changed, 26 insertions(+), 15 deletions(-)
 delete mode 100644 application/config/stv.php

diff --git a/application/config/stv.php b/application/config/stv.php
deleted file mode 100644
index e69de29bb..000000000
diff --git a/application/views/Studentenverwaltung.php b/application/views/Studentenverwaltung.php
index 01b616397..54354578e 100644
--- a/application/views/Studentenverwaltung.php
+++ b/application/views/Studentenverwaltung.php
@@ -31,6 +31,14 @@
 	$this->load->view('templates/FHC-Header', $includesArray);
 ?>
 
+<?php
+$configArray = [
+	'generateAlias' => !defined('GENERATE_ALIAS_STUDENT') ? true : GENERATE_ALIAS_STUDENT,
+	'showZgvDoktor' => !defined('ZGV_DOKTOR_ANZEIGEN') ? true : ZGV_DOKTOR_ANZEIGEN,
+	'showZgvErfuellt' => !defined('ZGV_ERFUELLT_ANZEIGEN') ? true : ZGV_ERFUELLT_ANZEIGEN
+];
+?>
+
 	<div id="main">
 		<router-view
 			default-semester="<?= $variables['semester_aktuell']; ?>"
@@ -38,7 +46,7 @@
 			stv-root="<?= site_url('Studentenverwaltung'); ?>"
 			cis-root="<?= CIS_ROOT; ?>"
 			:permissions="<?= htmlspecialchars(json_encode($permissions)); ?>"
-			:config="<?= htmlspecialchars(json_encode(['generateAlias' => !defined('GENERATE_ALIAS_STUDENT') ? true : GENERATE_ALIAS_STUDENT])); ?>"
+			:config="<?=  htmlspecialchars(json_encode($configArray)); ?>"
 			>
 		</router-view>
 	</div>
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 908a98ae3..e097dc92e 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -46,6 +46,8 @@ export default {
 			cisRoot: this.cisRoot,
 			activeAddonBewerbung: this.activeAddons.split(';').includes('bewerbung'),
 			configGenerateAlias: this.config.generateAlias,
+			configShowZgvDoktor: this.config.showZgvDoktor,
+			configShowZgvErfuellt: this.config.showZgvErfuellt,
 			hasBpkPermission: this.permissions['student/bpk'],
 			hasAliasPermission: this.permissions['student/alias'],
 			lists: this.lists
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
index 7c79bf6b2..e27cf3a14 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
@@ -11,14 +11,21 @@ export default {
 	inject: {
 		lists: {
 			from: 'lists'
-		}
+		},
+		showZgvErfuellt: {
+			from: 'configShowZgvErfuellt',
+			default: false
+		},
+		showZgvDoktor: {
+			from: 'configShowZgvDoktor',
+			default: false
+		},
 	},
 	props: {
 		modelValue: Object
 	},
 	data(){
 		return {
-			config: {},
 			data: [],
 			listZgvs: [],
 			listZgvsmaster: [],
@@ -158,15 +165,7 @@ export default {
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 	},
-	mounted(){
-		fetch('config/stv')
-			.then(result => result.json())
-			.then(result => {
-				this.config = result;
-				console.log('Konfiguration geladen:', this.config);
-			})
-			.catch(error => console.error('Fehler beim Laden der Konfiguration:', error));
-	},
+	mounted(){},
 	template: `
 	<div class="stv-details-details h-100 pb-3">
 		<form-form ref="form" class="stv-details-prestudent" @submit.prevent="updatePrestudent">
@@ -284,7 +283,7 @@ export default {
 							</form-input>
 						</div>
 						<!--ZGV Doktor Todo(manu) Config -->
-						<div class="row mb-3">
+						<div v-if="showZgvDoktor" class="row mb-3">
 							<form-input
 								container-class="col-3"
 								label="ZGV Doktor"
@@ -328,7 +327,7 @@ export default {
 							</form-input>
 						</div>
 																		
-						<div class="row mb-3">
+						<div v-if="showZgvErfuellt" class="row mb-3">
 							<div class="col-3 pt-4 d-flex align-items-center">
 								<form-input
 									container-class="form-check"
@@ -349,7 +348,7 @@ export default {
 									>
 								</form-input>
 							</div>
-							<div class="col-3 pt-4 d-flex align-items-center">
+							<div v-if="showZgvDoktor" class="col-3 pt-4 d-flex align-items-center">
 								<form-input
 									container-class="form-check"
 									label="ZGV Doktor erfüllt"
@@ -524,6 +523,8 @@ export default {
 		</form-form>
 		
 		<br>
+		
+		{{showZgvDoktor}} || {{generateAlias}} || {{showZgvErfuellt}} 
 <!--		<hr>
 		Data: {{data}}
 		<hr>-->

From 43492add0b788ef05291e7b5f36b441a22180729 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 9 Feb 2024 13:55:08 +0100
Subject: [PATCH 0393/1461] changes how files are attached/replaced to a profil
 update

---
 application/controllers/Cis/Profil.php        | 186 +-------------
 application/controllers/Cis/ProfilUpdate.php  | 234 +++++++++++++++++-
 .../models/person/Profil_update_model.php     |   1 +
 public/js/apps/api/profilUpdate.js            |  78 +++++-
 public/js/apps/api/userdata.js                |  71 ------
 public/js/components/Cis/Profil/EditProfil.js | 105 ++++----
 .../Cis/Profil/MitarbeiterProfil.js           |   8 +-
 .../ProfilComponents/FetchProfilUpdates.js    |  22 +-
 .../ProfilComponents/TextInputDokument.js     |  31 ++-
 .../js/components/Cis/Profil/StudentProfil.js |   4 +-
 10 files changed, 395 insertions(+), 345 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index 06c829763..c20fb9907 100755
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -20,13 +20,7 @@ class Profil extends Auth_Controller
 			'foto_sperre_function' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'getView' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'View' => ['student/anrechnung_beantragen:r', 'user:r'],
-			'insertProfilRequest' => ['student/anrechnung_beantragen:r', 'user:r'],
-			'updateProfilRequest' => ['student/anrechnung_beantragen:r', 'user:r'],
-			'deleteProfilRequest' => ['student/anrechnung_beantragen:r', 'user:r'],
-			'selectProfilRequest' => ['student/anrechnung_beantragen:r', 'user:r'],
-			'insertFile' => ['student/anrechnung_beantragen:r', 'user:r'],
-			'getProfilRequestFiles' => ['student/anrechnung_beantragen:r', 'user:r'],
-			'deleteOldVersionFiles' => ['student/anrechnung_beantragen:r', 'user:r'],
+			
 			
 						
 		]);
@@ -44,11 +38,9 @@ class Profil extends Auth_Controller
 		$this->load->model('person/Kontakt_model', 'KontaktModel');
 		$this->load->model('person/Profil_update_model', 'ProfilUpdateModel');
 		$this->load->model('content/DmsVersion_model', 'DmsVersionModel');
-		$this->load->model('DmsVersion_model','DmsVersionModel');
 
-		$this->load->library('DmsLib');
 
-		//? put the uid and pid inside the controller to reuse in controller
+		//? put the uid and pid inside the controller for reusability
 		$this->uid = getAuthUID();
 		$this->pid = getAuthPersonID();
 		
@@ -79,178 +71,6 @@ class Profil extends Auth_Controller
 	}
 
 
-	public function insertFile(){
-
-		//? Version des Dokuments
-		/*$this->DmsVersionModel->addSelect(["version"]);
-			$fileVersion = $this->DmsVersionModel->loadWhere(["name"=>$_FILES['files']['name'], "mimetype"=>$_FILES['files']['type']]);
-			$fileVersion = hasData($fileVersion) ? getData($fileVersion)[0]->version : 0;
-			if($fileVersion) $fileVersion++; */
-		if(!count($_FILES)){
-			echo json_encode([]);
-			return;
-		}
-		
-
-		
-		
-		$files = $_FILES['files'];
-        $file_count = count($files['name']);
-
-		$res=[];
-
-        for ($i = 0; $i < $file_count; $i++) {
-            $_FILES['files']['name'] = $files['name'][$i];
-            $_FILES['files']['type'] = $files['type'][$i];
-            $_FILES['files']['tmp_name'] = $files['tmp_name'][$i];
-            $_FILES['files']['error'] = $files['error'][$i];
-            $_FILES['files']['size'] = $files['size'][$i];
-			
-			$dms = [
-				"kategorie_kurzbz"=>"profil_aenderung",
-				"version"=>0, 
-				"name"=>$_FILES['files']['name'],
-				"mimetype"=>$_FILES['files']['type'],
-				"beschreibung"=>$this->uid . " Profil Änderung",
-				"insertvon"=>$this->uid,
-				"insertamum"=>"NOW()",
-			];
-            $tmp_res=$this->dmslib->upload($dms , 'files');
-			$tmp_res = hasData($tmp_res)? getData($tmp_res) : null;
-			array_push($res,$tmp_res);
-		}
-
-		echo json_encode($res);
-	}
-
-
-	public function deleteOldVersionFiles(){
-		$file_array = json_decode($this->input->raw_input_stream);
-		if(!isset($file_array) || !sizeof($file_array)){
-			return;
-		}
-		
-		$res =[];
-		foreach($file_array as $id){
-			//? delete all the different versions of the dms_file
-			
-			$zwischen_res = $this->DmsVersionModel->loadWhere(["dms_id"=>$id]);
-			$zwischen_res = hasData($zwischen_res) ? getData($zwischen_res) : null;
-			if(isset($zwischen_res)){
-				$zwischen_res = array_map(function($item){ return $item->version;},$zwischen_res);
-				foreach($zwischen_res as $version){
-					array_push($res, $this->DmsVersionModel->delete([$id,$version]));
-				}
-			}else{
-				echo json_encode(error("No version of the file has been found"));
-			}
-		}
-		echo json_encode($res);
-	}
-
-	
-
-
-
-	public function selectProfilRequest(){
-		$_GET = json_decode($this->input->raw_input_stream, true);
-		$uid = $this->input->get('uid');
-		$id = $this->input->get('id');
-		$whereClause=['uid'=> $this->uid];
-		
-		if(isset($uid)) $whereClause['uid'] = $uid;
-		if(isset($id)) $whereClause['id'] = $id;
-		
-		$res= $this->ProfilUpdateModel->getProfilUpdatesWhere($whereClause);
-
-		echo json_encode($res);
-		
-	}
-
-
-	public function getProfilRequestFiles(){
-		$id = json_decode($this->input->raw_input_stream);
-		echo json_encode($this->ProfilUpdateModel->getFilesFromChangeRequest($id));
-	}
-
-	public function insertProfilRequest()
-	{
-
-		$json = json_decode($this->input->raw_input_stream);
-		$payload = $json->payload;
-	
-		$identifier = property_exists($json->payload,"kontakt_id")? "kontakt_id" : (property_exists($json->payload,"adresse_id")? "adresse_id" : null);
-		
-		$name = $this->PersonModel->getFullName($this->uid);
-		if(isError($name)){
-			// error handling
-			var_dump($name);
-			return;
-		}
-		$data = ["topic"=>$json->topic,"uid" => $this->uid, "name"=>getData($name), "requested_change" => json_encode($payload), "insertamum" => "NOW()", "insertvon"=>$this->uid,"status"=>"pending" ];
-
-		//? loops over all updateRequests from a user to validate if the new request is valid
-		$res = $this->ProfilUpdateModel->getProfilUpdatesWhere(["uid"=>$this->uid]);
-		$res = hasData($res) ? getData($res) : null;
-		
-		if($res){
-		$pending_changes = array_filter($res, function($element) {
-			return $element->status == 'pending';
-		});
-		foreach($pending_changes as $update_request){
-			$existing_change = json_decode($update_request->requested_change);
-			
-			 //? the user can add as many new kontakt/adresse as he likes
-			if( !isset($payload->add) && property_exists($existing_change,$identifier) && property_exists($payload,$identifier) && $existing_change->$identifier == $payload->$identifier){
-				//? the kontakt_id / adresse_id of a change has to be unique 
-				echo json_encode(error("cannot change the same resource twice"));
-				return;
-			}
-
-			elseif(!$identifier && $update_request->topic == $json->topic ){
-				//? if it is not a delete or add request than the topic has to be unique
-				echo json_encode(error("A request to change " . $json->topic . " is already open"));
-				return;
-			}
-		}}
-		
-			$insertID = $this->ProfilUpdateModel->insert($data);
-				
-			if(isError($insertID)){
-				//catch error
-			}else{
-				$insertID = hasData($insertID)? getData($insertID): null;
-				$editTimestamp = $this->ProfilUpdateModel->getTimestamp($insertID);
-				
-				$date = success(date_create($editTimestamp)->format('d.m.Y'));
-				echo json_encode($date);
-			}
-	}
-
-	public function updateProfilRequest()
-	{
-
-		$json = json_decode($this->input->raw_input_stream);
-		
-		
-		$updateID =$this->ProfilUpdateModel->update([$json->ID],["requested_change" => json_encode($json->payload), "updateamum" => "NOW()", "updatevon" => $this->uid]);
-		if(isError($updateID)){
-			//catch error
-		}else{
-			$updateID = hasData($updateID)? getData($updateID)[0]: null;
-			$editTimestamp = $this->ProfilUpdateModel->getTimestamp($updateID,true);
-			
-			$date = success(date_create($editTimestamp)->format('d.m.Y')); 
-			echo json_encode($date);
-		}
-	}
-
-	public function deleteProfilRequest(){
-
-		$json = json_decode($this->input->raw_input_stream);
-		$delete_res = $this->ProfilUpdateModel->delete([$json]);
-		echo json_encode($delete_res);
-	}
 
 
 
@@ -758,7 +578,7 @@ class Profil extends Auth_Controller
 
 		if (
 
-			isSuccess($adresse_res = $this->AdresseModel->addSelect(["adresse_id","strasse", "tbl_adressentyp.bezeichnung as adr_typ", "plz", "ort","zustelladresse"])) &&
+			isSuccess($adresse_res = $this->AdresseModel->addSelect(["adresse_id","strasse", "tbl_adressentyp.bezeichnung as typ", "plz", "ort","zustelladresse"])) &&
 			isSuccess($adresse_res = $this->AdresseModel->addOrder("zustelladresse", "DESC")) &&
 			isSuccess($adresse_res = $this->AdresseModel->addJoin("tbl_adressentyp", "typ=adressentyp_kurzbz"))
 		) {
diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
index 7e39d6310..9672892fa 100755
--- a/application/controllers/Cis/ProfilUpdate.php
+++ b/application/controllers/Cis/ProfilUpdate.php
@@ -16,8 +16,15 @@ class ProfilUpdate extends Auth_Controller
 			'acceptProfilRequest'=>['student/stammdaten:rw','mitarbeiter/stammdaten:rw'],
 			'denyProfilRequest'=>['student/stammdaten:rw','mitarbeiter/stammdaten:rw'],
 			'show'=>['student/stammdaten:r','mitarbeiter/stammdaten:r'],
+		
+			'insertProfilRequest' => ['student/anrechnung_beantragen:r', 'user:r'],
+			'updateProfilRequest' => ['student/anrechnung_beantragen:r', 'user:r'],
+			'deleteProfilRequest' => ['student/anrechnung_beantragen:r', 'user:r'],
+			'selectProfilRequest' => ['student/anrechnung_beantragen:r', 'user:r'],
+			'insertFile' => ['student/anrechnung_beantragen:r', 'user:r'],
+			'getProfilRequestFiles' => ['student/anrechnung_beantragen:r', 'user:r'],
+			
 			
-
 		]);
 		
 
@@ -26,6 +33,12 @@ class ProfilUpdate extends Auth_Controller
 		$this->load->model('person/Adresse_model','AdresseModel');
 		$this->load->model('person/Adressentyp_model', 'AdressenTypModel');
 		$this->load->model('person/Person_model','PersonModel');
+
+		$this->load->library('DmsLib');
+
+		//? put the uid and pid inside the controller for reusability
+		$this->uid = getAuthUID();
+		$this->pid = getAuthPersonID();
 	}
 
 
@@ -45,6 +58,221 @@ class ProfilUpdate extends Auth_Controller
 		echo json_encode($res);
 	}
 
+
+
+
+	public function insertFile($replace){
+		$replace = json_decode($replace);
+		
+		if(!count($_FILES)){
+			echo json_encode([]);
+			return;
+		}
+		
+		//? if replace is set it contains the profil_update_id in which the attachment_id has to be replaced
+		if(isset($replace)){
+			$this->ProfilUpdateModel->addSelect(["attachment_id"]);
+			$attachmentID = $this->ProfilUpdateModel->load([$replace]);
+			if(isError($attachmentID)){
+				return json_encode(error("Error loading ProfilUpdate resource"));
+			}
+			//? get the attachmentID
+			$dms_id = hasData($attachmentID) ? getData($attachmentID)[0]->attachment_id : null;
+			
+			//? delete old dms_file of Profil Update
+			$this->deleteOldVersionFile($dms_id);
+		}
+		
+		
+		$files = $_FILES['files'];
+        $file_count = count($files['name']);
+		
+		$res=[];
+
+        for ($i = 0; $i < $file_count; $i++) {
+            $_FILES['files']['name'] = $files['name'][$i];
+            $_FILES['files']['type'] = $files['type'][$i];
+            $_FILES['files']['tmp_name'] = $files['tmp_name'][$i];
+            $_FILES['files']['error'] = $files['error'][$i];
+            $_FILES['files']['size'] = $files['size'][$i];
+			
+			$dms = [
+				"kategorie_kurzbz"=>"profil_aenderung",
+				"version"=>0, 
+				"name"=>$_FILES['files']['name'],
+				"mimetype"=>$_FILES['files']['type'],
+				"beschreibung"=>$this->uid . " Profil Änderung",
+				"insertvon"=>$this->uid,
+				"insertamum"=>"NOW()",
+			];
+			
+            $tmp_res=$this->dmslib->upload($dms , 'files');
+			$tmp_res = hasData($tmp_res)? getData($tmp_res) : null;
+			array_push($res,$tmp_res);
+		}
+
+		echo json_encode($res);
+	}
+
+
+
+	private function deleteOldVersionFile($dms_id){
+		if(!isset($dms_id)){
+			return;
+		}
+
+		//? collect all the results of the deleted versions in an array 
+		$res =	array();
+		
+		//? delete all the different versions of the dms_file
+		$dmsVersions = $this->DmsVersionModel->loadWhere(["dms_id"=>$dms_id]);
+		$dmsVersions = hasData($dmsVersions) ? getData($dmsVersions) : null;
+		if(isset($dmsVersions)){
+			$zwischen_res = array_map(function($item){ return $item->version;},$dmsVersions);
+			foreach($zwischen_res as $version){
+				array_push($res, $this->DmsVersionModel->delete([$dms_id,$version]));
+			}
+		}else{
+			echo json_encode(error("No version of the file has been found"));
+		}
+		
+		//? returns a result for each deleted dms_file
+		return $res;
+	}
+
+	
+
+
+
+	public function selectProfilRequest(){
+		$_GET = json_decode($this->input->raw_input_stream, true);
+		$uid = $this->input->get('uid');
+		$id = $this->input->get('id');
+		$whereClause=['uid'=> $this->uid];
+		
+		if(isset($uid)) $whereClause['uid'] = $uid;
+		if(isset($id)) $whereClause['id'] = $id;
+		
+		$res= $this->ProfilUpdateModel->getProfilUpdatesWhere($whereClause);
+
+		echo json_encode($res);
+		
+	}
+
+
+	public function getProfilRequestFiles(){
+		$id = json_decode($this->input->raw_input_stream);
+
+		$this->ProfilUpdateModel->addSelect(["attachment_id"]);
+		$attachmentID = $this->ProfilUpdateModel->load([$id]);
+		if(isError($attachmentID)){
+			return json_encode(error("Error loading ProfilUpdate resource"));
+		}
+		//? get the attachmentID
+		$dms_id = hasData($attachmentID) ? getData($attachmentID)[0]->attachment_id : null;
+		
+		//? get the name to the file
+		$this->DmsVersionModel->addSelect(["name", "dms_id"]);
+		$attachment = $this->DmsVersionModel->load([$dms_id,0]);
+		if(isError($attachment)){
+			return json_encode(error("Error loading DmsVersion resource"));
+		}
+		$attachment = hasData($attachment) ? getData($attachment) : null;
+		
+		//? returns {name:..., dms_id:...}
+		echo json_encode($attachment);
+	}
+
+	public function insertProfilRequest()
+	{
+
+		$json = json_decode($this->input->raw_input_stream);
+		$payload = $json->payload;
+		
+		$identifier = property_exists($json->payload,"kontakt_id")? "kontakt_id" : (property_exists($json->payload,"adresse_id")? "adresse_id" : null);
+		
+		$name = $this->PersonModel->getFullName($this->uid);
+		if(isError($name)){
+			// error handling
+			var_dump($name);
+			return;
+		}
+		$data = ["topic"=>$json->topic,"uid" => $this->uid, "name"=>getData($name), "requested_change" => json_encode($payload), "insertamum" => "NOW()", "insertvon"=>$this->uid,"status"=>"pending" ];
+		//? insert fileID in the dataset if sent with post request
+		if(isset($json->fileID)){
+			$data['attachment_id'] = $json->fileID;
+			
+		} 
+		
+
+		//? loops over all updateRequests from a user to validate if the new request is valid
+		$res = $this->ProfilUpdateModel->getProfilUpdatesWhere(["uid"=>$this->uid]);
+		$res = hasData($res) ? getData($res) : null;
+		
+		if($res){
+		$pending_changes = array_filter($res, function($element) {
+			return $element->status == 'pending';
+		});
+		foreach($pending_changes as $update_request){
+			$existing_change = json_decode($update_request->requested_change);
+			
+			 //? the user can add as many new kontakt/adresse as he likes
+			if( !isset($payload->add) && property_exists($existing_change,$identifier) && property_exists($payload,$identifier) && $existing_change->$identifier == $payload->$identifier){
+				//? the kontakt_id / adresse_id of a change has to be unique 
+				echo json_encode(error("cannot change the same resource twice"));
+				return;
+			}
+
+			elseif(!$identifier && $update_request->topic == $json->topic ){
+				//? if it is not a delete or add request than the topic has to be unique
+				echo json_encode(error("A request to change " . $json->topic . " is already open"));
+				return;
+			}
+		}}
+		
+			$insertID = $this->ProfilUpdateModel->insert($data);
+				
+			if(isError($insertID)){
+				//catch error
+			}else{
+				$insertID = hasData($insertID)? getData($insertID): null;
+				$editTimestamp = $this->ProfilUpdateModel->getTimestamp($insertID);
+				
+				$date = success(date_create($editTimestamp)->format('d.m.Y'));
+				echo json_encode($date);
+			}
+	}
+
+	public function updateProfilRequest()
+	{
+		$json = json_decode($this->input->raw_input_stream);
+		
+		$updateData = ["requested_change" => json_encode($json->payload), "updateamum" => "NOW()", "updatevon" => $this->uid];
+		if(isset($json->fileID)){
+			$updateData['attachment_id'] = json_decode($json->fileID);
+		}
+		$updateID =$this->ProfilUpdateModel->update([$json->ID],$updateData);
+		//? insert fileID in the dataset if sent with post request
+		
+		if(isError($updateID)){
+			//catch error
+		}else{
+			$updateID = hasData($updateID)? getData($updateID)[0]: null;
+			$editTimestamp = $this->ProfilUpdateModel->getTimestamp($updateID,true);
+			
+			$date = success(date_create($editTimestamp)->format('d.m.Y')); 
+			echo json_encode($date);
+		}
+	}
+
+	public function deleteProfilRequest(){
+
+		$json = json_decode($this->input->raw_input_stream);
+		$delete_res = $this->ProfilUpdateModel->delete([$json]);
+		echo json_encode($delete_res);
+	}
+
+
 	public function getProfilUpdateWithPermission($status=null){
 		
 		
@@ -125,11 +353,11 @@ class ProfilUpdate extends Auth_Controller
 	}
 
 	private function updateRequestedChange($id, $requested_change){
-		return $this->ProfilUpdateModel->update([$id], ['requested_change'=>json_encode($requested_change)]);
+		return $this->update([$id], ['requested_change'=>json_encode($requested_change)]);
 	}
 
 	private function setStatusOnUpdateRequest($id, $status, $status_message ){ 
-		return $this->ProfilUpdateModel->update([$id], ["status"=>$status,"status_timestamp"=>"NOW()","status_message"=>$status_message]);
+		return $this->update([$id], ["status"=>$status,"status_timestamp"=>"NOW()","status_message"=>$status_message]);
 	}
 
 
diff --git a/application/models/person/Profil_update_model.php b/application/models/person/Profil_update_model.php
index d316feab0..5bdbc3c32 100755
--- a/application/models/person/Profil_update_model.php
+++ b/application/models/person/Profil_update_model.php
@@ -49,6 +49,7 @@ class Profil_update_model extends DB_Model
 	}
 
 
+	//? queries the tbl_profil_updates without permissions of the user
 	public function getProfilUpdatesWhere($whereClause){
 		$res = $this->loadWhere($whereClause);
 		if(isError($res)){
diff --git a/public/js/apps/api/profilUpdate.js b/public/js/apps/api/profilUpdate.js
index 7f0bdc63e..93311fa00 100755
--- a/public/js/apps/api/profilUpdate.js
+++ b/public/js/apps/api/profilUpdate.js
@@ -15,6 +15,82 @@ export default {
     denyProfilRequest: function(payload){
         const url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/Cis/ProfilUpdate/denyProfilRequest';
         return axios.post(url,payload);
-    }
+    },
+
+    replaceProfilUpdateAttachment: function (dms) {
+        const url =
+          FHC_JS_DATA_STORAGE_OBJECT.app_root +
+          FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+          `/Cis/ProfilUpdate/replaceProfilUpdateAttachment`;
+    
+          return axios.post(url, dms, {
+            headers: { "Content-Type": "multipart/form-data" },
+          });
+      },
+
+
+      //? new reuquests
+      insertFile: function (dms,replace=null) {
+        const url =
+          FHC_JS_DATA_STORAGE_OBJECT.app_root +
+          FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+          `/Cis/ProfilUpdate/insertFile/${replace}`;
+    
+        return axios.post(url, dms, {
+          headers: { "Content-Type": "multipart/form-data" },
+        });
+      },
+    
+   
+    
+      getProfilRequestFiles: function (requestID) {
+        const url =
+          FHC_JS_DATA_STORAGE_OBJECT.app_root +
+          FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+          `/Cis/ProfilUpdate/getProfilRequestFiles`;
+    
+        return axios.post(url, requestID);
+      },
+    
+      selectProfilRequest: function (uid = null, id = null) {
+        const url =
+          FHC_JS_DATA_STORAGE_OBJECT.app_root +
+          FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+          `/Cis/ProfilUpdate/selectProfilRequest`;
+    
+        return axios.get(url, { uid: uid, id: id });
+      },
+    
+      
+    
+    
+      insertProfilRequest: function (topic, payload, fileID=null) {
+        const url =
+          FHC_JS_DATA_STORAGE_OBJECT.app_root +
+          FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+          `/Cis/ProfilUpdate/insertProfilRequest`;
+    
+        return axios.post(url, { topic, payload, ...(fileID?{fileID:fileID}:{}) });
+      },
+    
+      updateProfilRequest: function (topic, payload, ID, fileID=null) {
+        const url =
+          FHC_JS_DATA_STORAGE_OBJECT.app_root +
+          FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+          `/Cis/ProfilUpdate/updateProfilRequest`;
+    
+        return axios.post(url, { topic, payload, ID, ...(fileID?{fileID:fileID}:{}) });
+      },
+    
+      deleteProfilRequest: function (requestID) {
+        const url =
+          FHC_JS_DATA_STORAGE_OBJECT.app_root +
+          FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+          `/Cis/ProfilUpdate/deleteProfilRequest`;
+    
+        return axios.post(url, requestID);
+      },
+    
+    
 
 }
\ No newline at end of file
diff --git a/public/js/apps/api/userdata.js b/public/js/apps/api/userdata.js
index cc8fb5e58..9e75b6f3a 100755
--- a/public/js/apps/api/userdata.js
+++ b/public/js/apps/api/userdata.js
@@ -1,78 +1,7 @@
 export default {
   //! API Calls for Profil Views
 
-  insertFile: function (dms) {
-    const url =
-      FHC_JS_DATA_STORAGE_OBJECT.app_root +
-      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-      `/Cis/Profil/insertFile`;
 
-    return axios.post(url, dms, {
-      headers: { "Content-Type": "multipart/form-data" },
-    });
-  },
-
-  deleteOldVersionFiles: function (files) {
-    const url =
-      FHC_JS_DATA_STORAGE_OBJECT.app_root +
-      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-      `/Cis/Profil/deleteOldVersionFiles`;
-
-    return axios.post(url, files);
-  },
-
-  getProfilRequestFiles: function (requestID) {
-    const url =
-      FHC_JS_DATA_STORAGE_OBJECT.app_root +
-      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-      `/Cis/Profil/getProfilRequestFiles`;
-
-    return axios.post(url, requestID);
-  },
-
-  selectProfilRequest: function (uid = null, id = null) {
-    const url =
-      FHC_JS_DATA_STORAGE_OBJECT.app_root +
-      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-      `/Cis/Profil/selectProfilRequest`;
-
-    return axios.get(url, { uid: uid, id: id });
-  },
-
-  insertProfilRequest: function (topic, payload) {
-    const url =
-      FHC_JS_DATA_STORAGE_OBJECT.app_root +
-      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-      `/Cis/Profil/insertProfilRequest`;
-
-    return axios.post(url, { topic, payload });
-  },
-
-  updateProfilRequest: function (topic, payload, ID) {
-    const url =
-      FHC_JS_DATA_STORAGE_OBJECT.app_root +
-      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-      `/Cis/Profil/updateProfilRequest`;
-
-    return axios.post(url, { topic, payload, ID });
-  },
-
-  deleteProfilRequest: function (requestID) {
-    const url =
-      FHC_JS_DATA_STORAGE_OBJECT.app_root +
-      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-      `/Cis/Profil/deleteProfilRequest`;
-
-    return axios.post(url, requestID);
-  },
-
-  getEditProfil: function () {
-    const url =
-      FHC_JS_DATA_STORAGE_OBJECT.app_root +
-      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-      `/Cis/Profil/getEditProfil`;
-    return axios.get(url);
-  },
 
   isMitarbeiterOrStudent: function (uid) {
     const url =
diff --git a/public/js/components/Cis/Profil/EditProfil.js b/public/js/components/Cis/Profil/EditProfil.js
index 6ca410214..8a83b32ba 100755
--- a/public/js/components/Cis/Profil/EditProfil.js
+++ b/public/js/components/Cis/Profil/EditProfil.js
@@ -24,16 +24,13 @@ export default {
     onShowBsModal: Function,
     onShownBsModal: Function,
   },
-/*   provide(){
-    return {
-      topic: computed(()=> "test"),
-    }
-  }, */
+  
   data() {
     return {
       topic: null,
       profilUpdate: null,
       editData: this.value,
+      fileID:null,
       breadcrumb: null,
 
       result: false,
@@ -41,17 +38,29 @@ export default {
     };
   },
 
+  provide(){
+    return {
+      updateFileID: this.updateFileIDFunction,
+    }
+  }, 
+
   methods: {
+
+    updateFileIDFunction: function(newFileID){
+      this.fileID = newFileID;
+    },
+
     async submitProfilChange() {
       //? check if data is valid before making a request
       if (this.topic && this.profilUpdate) {
-        if (this.profilUpdate.files) {
-          const fileIDs = await this.uploadFiles(this.profilUpdate.files);
-         
-          if (fileIDs) {
-            this.profilUpdate.files = fileIDs;
-          }
+        
+        //? if profil update contains any attachment
+        if (this.fileID) {
+          const fileData = await this.uploadFiles(this.fileID);
+          
+          this.fileID = fileData? fileData : null;
         }
+
         //? inserts new row in public.tbl_cis_profil_update
         //* calls the update api call if an update field is present in the data that was passed to the modal
         const handleApiResponse = (res) => {
@@ -71,16 +80,19 @@ export default {
         };
 
         this.editData.updateID
-          ? Vue.$fhcapi.UserData.updateProfilRequest(
+          ? Vue.$fhcapi.ProfilUpdate.updateProfilRequest(
               this.topic,
               this.profilUpdate,
-              this.editData.updateID
+              this.editData.updateID,
+              this.fileID[0]
             ).then((res) => {
               handleApiResponse(res);
             })
-          : Vue.$fhcapi.UserData.insertProfilRequest(
+          : Vue.$fhcapi.ProfilUpdate.insertProfilRequest(
               this.topic,
-              this.profilUpdate
+              this.profilUpdate,
+              this.fileID[0]
+
             ).then((res) => {
               handleApiResponse(res);
             });
@@ -91,55 +103,31 @@ export default {
       let updatedFiles = [];
 
       if (this.editData.updateID) {
-        //? if we are updating an already existing profilRequest
-        const existingFiles = await Vue.$fhcapi.UserData.getProfilRequestFiles(
-          this.editData.updateID
-        ).then((res) => {
-          return res.data;
-        });
-
-        let filesToKeep = [];
-        let filesToDelete = [];
-        existingFiles.forEach((file) => {
-          Array.from(files).some((f) => f.name === file.name)
-            ? filesToKeep.push(file)
-            : filesToDelete.push(file.dms_id);
-        });
         
-        //? only keeps the newest version of the documents and deletes the old versions in the database
-        if(filesToDelete.length > 0) {
-          Vue.$fhcapi.UserData.deleteOldVersionFiles(
-            filesToDelete
-          );
-        }
-       
-
-        updatedFiles = [...filesToKeep];
       }
 
-      let formData = new FormData();
-      for (let i = 0; i < files.length; i++) {
-        if (files[i].type !== "application/x.fhc-dms+json")
-          formData.append("files[]", files[i]);
-      }
-      if(Array.from(formData).length > 0){
-      await Vue.$fhcapi.UserData.insertFile(formData)
-        .then((res) => {
-          /* returns file information as 
-        [{"name":"example.png", "dms_id":282531}] */
-
-          updatedFiles = updatedFiles.concat(
-            res.data?.map((file) => {
-              return { dms_id: file.dms_id, name: file.client_name};
-            })
-          );
+      
+      
+      if (files[0].type !== "application/x.fhc-dms+json"){
+        let formData = new FormData();
+        formData.append("files[]", files[0]);
+        const result = this.editData.updateID ?
+        //? updating old attachment by replacing
+        //* second parameter of api request insertFile checks if the file has to be replaced or not
+        await Vue.$fhcapi.ProfilUpdate.insertFile(formData,this.editData.updateID).then(res => {
+          return res.data?.map((file) => file.dms_id);
         })
-        .catch((err) => {
-          console.log(err);
-        });
+        :
+        //? fresh insert of new attachment
+        await Vue.$fhcapi.ProfilUpdate.insertFile(formData).then(res => {
+          return res.data?.map((file) => file.dms_id);
+        })
+        return result;
+      }else{
+        //? attachment hasn't been replaced
+        return false;
       }
 
-      return updatedFiles;
     },
   },
   computed: {},
@@ -163,7 +151,6 @@ export default {
     </template>
     <template v-slot:default>
 
-
     <nav aria-label="breadcrumb" class="ps-2  ">
       <ol class="breadcrumb ">
         <li class="breadcrumb-item"  v-for="element in breadcrumb">{{element}}</li>
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index e50ec2429..db650ec7a 100755
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -146,7 +146,7 @@ export default {
     
 
     fetchProfilUpdates: function(){
-      Vue.$fhcapi.UserData.selectProfilRequest().then((res)=>{
+      Vue.$fhcapi.ProfilUpdate.selectProfilRequest().then((res)=>{
         
         if(!res.error){
           this.data.profilUpdates = res.data.retval?.length ? res.data.retval.sort(this.sortProfilUpdates) : null ; 
@@ -161,7 +161,7 @@ export default {
           title:"Profil bearbeiten",
         }).then((popup_result) => {
           if(popup_result){
-            Vue.$fhcapi.UserData.selectProfilRequest()
+            Vue.$fhcapi.ProfilUpdate.selectProfilRequest()
             .then((res) =>{
               if(!res.error){
                 this.data.profilUpdates = res.data.retval;
@@ -223,12 +223,8 @@ export default {
   },
  
   created() {
-    
     //? sorts the profil Updates: pending -> accepted -> rejected
     this.data.profilUpdates?.sort(this.sortProfilUpdates);
-
-      
-
   },
   mounted() {
     
diff --git a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
index 01f71760c..59ee70255 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
@@ -14,7 +14,7 @@ export default {
   },
   methods: {
     deleteRequest: function (item) {
-      Vue.$fhcapi.UserData.deleteProfilRequest(item.profil_update_id).then(
+      Vue.$fhcapi.ProfilUpdate.deleteProfilRequest(item.profil_update_id).then(
         (res) => {
           if (res.data.error) {
             //? open alert
@@ -50,7 +50,7 @@ export default {
           break;
       }
     },
-    openModal(updateRequest) {
+    async openModal(updateRequest) {
       let view = this.getView(updateRequest.topic, updateRequest.status);
       let data = null;
       let content = null;
@@ -62,17 +62,15 @@ export default {
           titel: updateRequest.topic,
           value: updateRequest.requested_change.value,
         };
-        if (updateRequest.requested_change.files.length) {
-          const FILE = updateRequest.requested_change.files?.map((file) => {
-            return new File(["files[]"], file.name);
-          });
-          const FILELIST = new DataTransfer();
-          FILE.forEach((file) => {
-            FILELIST.items.add(file);
-          });
-          files = updateRequest.requested_change.files;
+
+        const filesFromDatabase = await Vue.$fhcapi.ProfilUpdate.getProfilRequestFiles(updateRequest.profil_update_id).then(res=>{
+          return res.data;
+        });
+
+        files= filesFromDatabase;
+        if(files){
+          withFiles = true;
         }
-        withFiles = true;
       } else {
         data = updateRequest.requested_change;
       }
diff --git a/public/js/components/Cis/Profil/ProfilComponents/TextInputDokument.js b/public/js/components/Cis/Profil/ProfilComponents/TextInputDokument.js
index 22149fb0e..b050d3ebd 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/TextInputDokument.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/TextInputDokument.js
@@ -25,8 +25,10 @@ export default {
       type: Boolean,
     },
   },
+  inject:["updateFileID"],
   computed: {
     didFilesChange: function () {
+      this.updateFileID(this.dmsData);
       let res = false;
       //? case in which the profilRequest has already associated files 
       if(this.files){ 
@@ -48,7 +50,7 @@ export default {
     isChanged: function () {
       if (this.withFiles) {
         if(this.updateID){
-          return this.didDataChange || this.didFilesChange;
+          return (this.didDataChange || this.didFilesChange) && this.dmsData.length;
         }
         return this.didDataChange && this.didFilesChange;
       }
@@ -63,13 +65,20 @@ export default {
     },
   },
   methods: {
+    stringifyFile(file) {
+			return JSON.stringify({
+				lastModified: file.lastModified,
+				lastModifiedDate: file.lastModifiedDate,
+				name: file.name,
+				size: file.size,
+				type: file.type
+			});
+		},
     emitChanges: function () {
       if (this.isChanged) {
+        
         this.$emit(
-          "profilUpdate",
-          this.withFiles
-            ? { value: this.data.value, files: this.dmsData }
-            : { value: this.data.value }
+          "profilUpdate", { value: this.data.value }
         );
       } else {
         this.$emit("profilUpdate", null);
@@ -84,6 +93,7 @@ export default {
     }
   },
   template: `
+  
     <p style="opacity:0.8" class="ms-2" v-if="withFiles && !updateID">Please update your {{data.titel}} and upload the corresponding Document of proof</p>
 
     <div class="form-underline">
@@ -91,9 +101,14 @@ export default {
     
     <input  class="mb-2 form-control" @input="emitChanges"  v-model="data.value" :placeholder="data.value">
   
-    
-    <dms ref="update" v-if="withFiles" id="files" :noList="false" :multiple="true" v-model="dmsData" @update:model-value="didFilesChange"  ></dms>
-
+    <div class="row gx-2">
+    <div class="col">
+    <dms ref="update" v-if="withFiles" id="files" name="files" :multiple="false" v-model="dmsData" @update:model-value="didFilesChange"  ></dms>
+    </div>
+    <div class="col-auto">
+    <button @click="dmsData=[]" class="btn btn-danger"><i style="color:white" class="fa fa-trash"></i></button>
+    </div>
+    </div>
     </div>
     `,
 };
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index c1c647a96..8fcd5332c 100755
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -84,7 +84,7 @@ export default {
   methods: {
 
     fetchProfilUpdates: function(){
-      Vue.$fhcapi.UserData.selectProfilRequest().then((res)=>{
+      Vue.$fhcapi.ProfilUpdate.selectProfilRequest().then((res)=>{
         
         if(!res.error){
           this.data.profilUpdates = res.data?.length ? res.data.sort(this.sortProfilUpdates) : null ; 
@@ -99,7 +99,7 @@ export default {
           title:"Profil bearbeiten",
         }).then((popup_result) => {
           if(popup_result){
-            Vue.$fhcapi.UserData.selectProfilRequest()
+            Vue.$fhcapi.ProfilUpdate.selectProfilRequest()
             .then((res) =>{
               if(!res.error){
                 this.data.profilUpdates = res.data.sort(this.sortProfilUpdates);

From bbf6616cd900c3e97577588f374d51db6b7f3c0f Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 9 Feb 2024 14:41:29 +0100
Subject: [PATCH 0394/1461] corrects the display of links to attachments of a
 profil update request

---
 application/controllers/Cis/ProfilUpdate.php       |  5 ++---
 application/models/person/Profil_update_model.php  |  6 ++++--
 public/js/apps/Cis/ProfilUpdateRequests.js         |  1 -
 .../Profil/ProfilComponents/FetchProfilUpdates.js  |  2 +-
 .../Cis/Profil/ProfilComponents/Status.js          | 14 ++++++++++----
 .../Cis/ProfilUpdate/AcceptDenyUpdate.js           | 14 ++++++++++----
 6 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
index 9672892fa..b2c2d3c1b 100755
--- a/application/controllers/Cis/ProfilUpdate.php
+++ b/application/controllers/Cis/ProfilUpdate.php
@@ -178,7 +178,6 @@ class ProfilUpdate extends Auth_Controller
 			return json_encode(error("Error loading DmsVersion resource"));
 		}
 		$attachment = hasData($attachment) ? getData($attachment) : null;
-		
 		//? returns {name:..., dms_id:...}
 		echo json_encode($attachment);
 	}
@@ -353,11 +352,11 @@ class ProfilUpdate extends Auth_Controller
 	}
 
 	private function updateRequestedChange($id, $requested_change){
-		return $this->update([$id], ['requested_change'=>json_encode($requested_change)]);
+		return $this->ProfilUpdateModel->update([$id], ['requested_change'=>json_encode($requested_change)]);
 	}
 
 	private function setStatusOnUpdateRequest($id, $status, $status_message ){ 
-		return $this->update([$id], ["status"=>$status,"status_timestamp"=>"NOW()","status_message"=>$status_message]);
+		return $this->ProfilUpdateModel->update([$id], ["status"=>$status,"status_timestamp"=>"NOW()","status_message"=>$status_message]);
 	}
 
 
diff --git a/application/models/person/Profil_update_model.php b/application/models/person/Profil_update_model.php
index 5bdbc3c32..f9aa59c1c 100755
--- a/application/models/person/Profil_update_model.php
+++ b/application/models/person/Profil_update_model.php
@@ -84,7 +84,9 @@ class Profil_update_model extends DB_Model
 			//? Nur wenn der/die AssistentIn auch die Berechtigung in der gleichen Organisationseinheit des Studenten hat
 			$parameters = [];
 			$query="
-			SELECT * FROM public.tbl_profil_update 
+			SELECT
+			profil_update_id, uid, name, topic, requested_change, tbl_profil_update.updateamum, tbl_profil_update.updatevon, tbl_profil_update.insertamum, tbl_profil_update.insertvon, status, status_timestamp, status_message, attachment_id 
+			FROM public.tbl_profil_update 
 			JOIN public.tbl_student ON public.tbl_student.student_uid=public.tbl_profil_update.uid
 			JOIN public.tbl_prestudent ON public.tbl_prestudent.prestudent_id=public.tbl_student.prestudent_id
 			JOIN public.tbl_studiengang ON public.tbl_studiengang.studiengang_kz=public.tbl_prestudent.studiengang_kz
@@ -107,7 +109,7 @@ class Profil_update_model extends DB_Model
 			}
 		}
 		if($mitarbeiterBerechtigung) {
-			
+			$this->addSelect(["profil_update_id", "uid", "name", "topic", "requested_change", "tbl_profil_update.updateamum", "tbl_profil_update.updatevon", "tbl_profil_update.insertamum", "tbl_profil_update.insertvon", "status", "status_timestamp", "status_message", "attachment_id"]);
 			$this->addJoin('tbl_mitarbeiter','tbl_mitarbeiter.mitarbeiter_uid=tbl_profil_update.uid');
 			$mitarbeiterRequests = $this->loadWhere($whereClause);
 			if(isError($mitarbeiterRequests)) return error("db error: ". getData($mitarbeiterRequests));
diff --git a/public/js/apps/Cis/ProfilUpdateRequests.js b/public/js/apps/Cis/ProfilUpdateRequests.js
index 7982c8519..411ac425b 100755
--- a/public/js/apps/Cis/ProfilUpdateRequests.js
+++ b/public/js/apps/Cis/ProfilUpdateRequests.js
@@ -88,7 +88,6 @@ const app = Vue.createApp({
                 action: (e, column) => {
                   Vue.$fhcapi.ProfilUpdate.acceptProfilRequest(column.getData())
                     .then((res) => {
-                      console.log("here");
                       this.$refs.UpdatesTable.tabulator.setData();
                     })
                     .catch((e) => {
diff --git a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
index 59ee70255..b249d8120 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
@@ -131,7 +131,7 @@ export default {
                 <tr v-for="item in data" :style="item.status=='accepted'?'background-color:lightgreen':item.status==='rejected'?'background-color:lightcoral':''">
                 <td class="align-middle text-wrap ">{{item.topic}}</td>
                 <td class="align-middle " >{{item.status}}</td>
-                <td class="align-middle">{{item.change_timestamp}}</td>
+                <td class="align-middle">{{item.status_timestamp}}</td>
                 
                 <template v-if="item.status === 'pending'">
                 <td>
diff --git a/public/js/components/Cis/Profil/ProfilComponents/Status.js b/public/js/components/Cis/Profil/ProfilComponents/Status.js
index 3107ce8dc..488a71b16 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/Status.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/Status.js
@@ -7,7 +7,9 @@ export default {
     Kontakt,
   },
   data() {
-    return {};
+    return {
+      files:null,
+    };
   },
   methods:{
     getDocumentLink: function(dms_id){
@@ -39,7 +41,11 @@ export default {
     updateID: { type: Number },
     topic: { type: String },
   },
-  created() {},
+  created() {
+    Vue.$fhcapi.ProfilUpdate.getProfilRequestFiles(this.updateID).then((res) =>{
+      this.files = res.data;
+    })
+  },
   template: `
     <div class="row">
 
@@ -79,9 +85,9 @@ export default {
     <div class="form-underline-titel">{{topic}}</div>
     <span  class="form-underline-content">{{data.value}} </span>
     </div>
-    <div v-if="data.files?.length" class="ms-2">
+    <div v-if="files?.length" class="ms-2">
     
-    <a target="_blank" :href="getDocumentLink(file.dms_id)" v-for="file in data.files">{{file.name}}</a>
+    <a target="_blank" :href="getDocumentLink(file.dms_id)" v-for="file in files">{{file.name}}</a>
     </div>
     </template>
     <component v-else :is="getComponentView" :data="data"></component>
diff --git a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
index 12b1d7d32..fbc0ee0c7 100755
--- a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
+++ b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
@@ -37,6 +37,7 @@ export default {
       //? result is returned from the Promise when the modal is closed
       result: false,
       info: null,
+      files:null,
     };
   },
 
@@ -78,7 +79,12 @@ export default {
       }
     },
   },
-  created() {},
+  created() {
+   
+     Vue.$fhcapi.ProfilUpdate.getProfilRequestFiles(this.data.profil_update_id).then((res) =>{
+      this.files=res.data;
+    }) 
+  },
   mounted() {
     this.modal = this.$refs.modalContainer.modal;
   },
@@ -170,9 +176,9 @@ export default {
 
       <span  class="form-underline-content" >{{data.requested_change.value}}</span>
     </div>
-    <div v-if="data.requested_change.files?.length" class="ms-2">
-    <!--<p>files:</p>-->
-    <a  v-for="file in data.requested_change.files" target="_blank" :href="getDocumentLink(file.dms_id)" >{{file.name}}</a>
+    <div v-if="files?.length" class="ms-2">
+    
+    <a  v-for="file in files" target="_blank" :href="getDocumentLink(file.dms_id)" >{{file.name}}</a>
     </div>
     </template>
 

From 90012856dc3ae74a7a4be14206bc49bf8f44dc6c Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 9 Feb 2024 15:21:53 +0100
Subject: [PATCH 0395/1461] EditAdresse layout change

---
 public/js/apps/Cis/ProfilUpdateRequests.js    |  3 +++
 .../Profil/ProfilComponents/EditAdresse.js    | 27 ++++++++++---------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/public/js/apps/Cis/ProfilUpdateRequests.js b/public/js/apps/Cis/ProfilUpdateRequests.js
index 411ac425b..fb810652c 100755
--- a/public/js/apps/Cis/ProfilUpdateRequests.js
+++ b/public/js/apps/Cis/ProfilUpdateRequests.js
@@ -118,6 +118,7 @@ const app = Vue.createApp({
                 label: "<i class='fa fa-eye'></i> Show Request",
                 action: (e, column) => {
                   this.showModal(column.getData());
+                    
                 },
               }
             );
@@ -231,6 +232,8 @@ const app = Vue.createApp({
           //? refetches the data, if any request was denied or accepted
           //* setData will call the ajaxURL again to refresh the data
           this.$refs.UpdatesTable.tabulator.setData();
+        }).catch(err=>{
+         
         })
         
     },
diff --git a/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js b/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
index 039a008f1..f3140452d 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
@@ -18,6 +18,18 @@ export default {
         },
     },
     computed:{
+        ortLayoutClasses: function(){
+            return this.showKontaktTyp?[
+                'col-12', 
+                'col-sm-7',
+                'col-xl-12',
+                'col-xxl-7',
+            ]:['col-12'];
+        },
+        showKontaktTyp: function(){
+            let kontaktTypen = ["Nebenwohnsitz","Hauptwohnsitz"];
+            return kontaktTypen.includes(this.data.typ) || !this.data.typ
+        },
         isChanged: function(){
             if(!this.data.strasse || !this.data.plz || !this.data.ort || !this.data.typ){
                
@@ -34,7 +46,6 @@ export default {
    
      <div class="gy-3 row justify-content-center align-items-center">
        
-    <!-- column 1 in the address row -->
     
       
         <div  class="col-12 col-sm-9 col-xl-12 col-xxl-9 order-1">
@@ -48,23 +59,15 @@ export default {
 
         </div>
         
-    <!-- column 2 in the address row -->
-        <div  class=" order-2 order-sm-4 order-xl-3 order-xxl-4 col-12 col-sm-5  col-xl-8 col-xxl-5  ">
+        <div v-if="showKontaktTyp" class=" order-2 order-sm-4 order-xl-3 order-xxl-4 col-12 col-sm-5  col-xl-8 col-xxl-5  ">
             
-            
-            
-        
-    
             <div  class="form-underline">
                 <div class="form-underline-titel">Kontakttyp</div>
         
-                <select :value="data.typ" @change="updateValue($event,'typ')" class="form-select" aria-label="Select Kontakttyp">
+                <select  :value="data.typ" @change="updateValue($event,'typ')" class="form-select" aria-label="Select Kontakttyp">
                     <option selected></option>
-                    <option value="Rechnungsadresse">Rechnungsadresse</option>
                     <option value="Nebenwohnsitz">Nebenwohnsitz</option>
-                    <option value="Homeoffice">Homeoffice</option>
                     <option value="Hauptwohnsitz">Hauptwohnsitz</option>
-                    <option value="Firma">Firma</option>
                 </select>    
             </div>
         
@@ -73,7 +76,7 @@ export default {
             </template>
 
         </div>
-        <div  class="order-3 order-sm-3 order-xl-2 order-xxl-3 col-12 col-sm-7  col-xl-12 col-xxl-7 ">
+        <div  class="order-3 order-sm-3 order-xl-2 order-xxl-3 " :class="ortLayoutClasses">
             
             <div class="form-underline ">
             <div class="form-underline-titel">Ort</div>

From b21d3448cb85027565909b81caaf05fcfa5231fc Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 12 Feb 2024 09:07:51 +0100
Subject: [PATCH 0396/1461] fixes some data handling errors in controller
 functions

---
 application/controllers/Cis/ProfilUpdate.php         |  8 ++++----
 application/models/person/Profil_update_model.php    |  1 +
 public/js/components/Cis/Profil/MitarbeiterProfil.js | 10 ++++++----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
index b2c2d3c1b..6f2aa2bc0 100755
--- a/application/controllers/Cis/ProfilUpdate.php
+++ b/application/controllers/Cis/ProfilUpdate.php
@@ -206,22 +206,22 @@ class ProfilUpdate extends Auth_Controller
 
 		//? loops over all updateRequests from a user to validate if the new request is valid
 		$res = $this->ProfilUpdateModel->getProfilUpdatesWhere(["uid"=>$this->uid]);
-		$res = hasData($res) ? getData($res) : null;
 		
 		if($res){
 		$pending_changes = array_filter($res, function($element) {
 			return $element->status == 'pending';
 		});
 		foreach($pending_changes as $update_request){
-			$existing_change = json_decode($update_request->requested_change);
+			$existing_change = $update_request->requested_change;
 			
 			 //? the user can add as many new kontakt/adresse as he likes
-			if( !isset($payload->add) && property_exists($existing_change,$identifier) && property_exists($payload,$identifier) && $existing_change->$identifier == $payload->$identifier){
+			 
+			 if( !isset($payload->add) && property_exists($existing_change,$identifier) && property_exists($payload,$identifier) && $existing_change->$identifier == $payload->$identifier){
 				//? the kontakt_id / adresse_id of a change has to be unique 
 				echo json_encode(error("cannot change the same resource twice"));
 				return;
 			}
-
+			
 			elseif(!$identifier && $update_request->topic == $json->topic ){
 				//? if it is not a delete or add request than the topic has to be unique
 				echo json_encode(error("A request to change " . $json->topic . " is already open"));
diff --git a/application/models/person/Profil_update_model.php b/application/models/person/Profil_update_model.php
index f9aa59c1c..05643af59 100755
--- a/application/models/person/Profil_update_model.php
+++ b/application/models/person/Profil_update_model.php
@@ -51,6 +51,7 @@ class Profil_update_model extends DB_Model
 
 	//? queries the tbl_profil_updates without permissions of the user
 	public function getProfilUpdatesWhere($whereClause){
+		
 		$res = $this->loadWhere($whereClause);
 		if(isError($res)){
 			return error("Could not load public.tbl_profil_update with whereClause");
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index db650ec7a..a17c9a235 100755
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -149,7 +149,7 @@ export default {
       Vue.$fhcapi.ProfilUpdate.selectProfilRequest().then((res)=>{
         
         if(!res.error){
-          this.data.profilUpdates = res.data.retval?.length ? res.data.retval.sort(this.sortProfilUpdates) : null ; 
+          this.data.profilUpdates = res.data?.length ? res.data.sort(this.sortProfilUpdates) : null ; 
         }
       });
     },
@@ -164,14 +164,16 @@ export default {
             Vue.$fhcapi.ProfilUpdate.selectProfilRequest()
             .then((res) =>{
               if(!res.error){
-                this.data.profilUpdates = res.data.retval;
+                this.data.profilUpdates = res.data;
                 this.data.profilUpdates.sort(this.sortProfilUpdates);
                 
               }else{
-                alert("Error when fetching profile updates: " +res.data.retval);
+                console.log("Error when fetching profile updates: " +res.data);
               }
             })
-            .catch(err=>alert(err));
+            .catch(err=>{
+              console.log(err);
+            });
           }
         }).catch((e) => {
           // Wenn der User das Modal abbricht ohne Änderungen

From a21a5ce0445d9adf92191d4386c6b8f6978d7e4a Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 12 Feb 2024 09:18:33 +0100
Subject: [PATCH 0397/1461] edit field priority only with right
 basis/prestudent

---
 application/controllers/Studentenverwaltung.php        |  4 +++-
 public/js/components/Stv/Studentenverwaltung.js        |  1 +
 .../Stv/Studentenverwaltung/Details/Prestudent.js      | 10 ++++++++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/application/controllers/Studentenverwaltung.php b/application/controllers/Studentenverwaltung.php
index d2574c500..29a04e51d 100644
--- a/application/controllers/Studentenverwaltung.php
+++ b/application/controllers/Studentenverwaltung.php
@@ -21,7 +21,9 @@ class Studentenverwaltung extends FHC_Controller
 		$this->load->view('Studentenverwaltung', [
 			'permissions' => [
 				'student/bpk' => $this->permissionlib->isBerechtigt('student/bpk'),
-				'student/alias' => $this->permissionlib->isBerechtigt('student/alias')
+				'student/alias' => $this->permissionlib->isBerechtigt('student/alias'),
+				'basis/prestudent' => $this->permissionlib->isBerechtigt('basis/prestudent'),
+
 			],
 			'variables' => [
 				'semester_aktuell' => $this->variablelib->getVar('semester_aktuell')
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index e097dc92e..4706b5b93 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -50,6 +50,7 @@ export default {
 			configShowZgvErfuellt: this.config.showZgvErfuellt,
 			hasBpkPermission: this.permissions['student/bpk'],
 			hasAliasPermission: this.permissions['student/alias'],
+			hasPrestudentPermission: this.permissions['basis/prestudent'],
 			lists: this.lists
 		}
 	},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
index e27cf3a14..4043e2aa5 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
@@ -20,6 +20,10 @@ export default {
 			from: 'configShowZgvDoktor',
 			default: false
 		},
+		hasPrestudentPermission: {
+			from: 'hasPrestudentPermission',
+			default: false
+		},
 	},
 	props: {
 		modelValue: Object
@@ -41,6 +45,8 @@ export default {
 			actionUpdate: false
 		};
 	},
+	computed: {
+	},
 	watch: {
 	},
 
@@ -496,13 +502,13 @@ export default {
 								<option :value="false">nein</option>-->
 							</form-input>
 						</div>
-						<!--	Todo(manu) an Recht basis/prestudent hänaen -->
 						<form-input
 							container-class="col-1"
 							label="Priorität"
 							type="text"
 							v-model="data.priorisierung"
 							name="priorisierung"
+							:disabled="!hasPrestudentPermission"
 							>
 						</form-input>
 					</div>
@@ -524,7 +530,7 @@ export default {
 		
 		<br>
 		
-		{{showZgvDoktor}} || {{generateAlias}} || {{showZgvErfuellt}} 
+		{{hasPrestudentPermission}}
 <!--		<hr>
 		Data: {{data}}
 		<hr>-->

From 824423f3eaa4ca4b2df440275840f5a503884d8c Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 12 Feb 2024 11:00:35 +0100
Subject: [PATCH 0398/1461] Update Fkt getTypenStg()

---
 .../controllers/components/stv/Prestudent.php | 51 ++++++++++---------
 .../models/education/Gsstudientyp_model.php   | 14 +++++
 2 files changed, 41 insertions(+), 24 deletions(-)
 create mode 100644 application/models/education/Gsstudientyp_model.php

diff --git a/application/controllers/components/stv/Prestudent.php b/application/controllers/components/stv/Prestudent.php
index 2b08b549c..1c456db10 100644
--- a/application/controllers/components/stv/Prestudent.php
+++ b/application/controllers/components/stv/Prestudent.php
@@ -146,67 +146,78 @@ class Prestudent extends FHC_Controller
 
 	}
 
-	public function getBezeichnungZgv(){
+	public function getBezeichnungZgv()
+	{
 		$this->load->model('codex/Zgv_model', 'ZgvModel');
 
 		$this->ZgvModel->addOrder('zgv_code');
 
 		$result = $this->ZgvModel->load();
-		if (isError($result)) {
+		if (isError($result))
+		{
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 		}
 		$this->outputJson($result);
 	}
 
-	public function getBezeichnungDZgv(){
+	public function getBezeichnungDZgv()
+	{
 		$this->load->model('codex/Zgvdoktor_model', 'ZgvdoktorModel');
 
 		$this->ZgvdoktorModel->addOrder('zgvdoktor_code');
 
 		$result = $this->ZgvdoktorModel->load();
-		if (isError($result)) {
+		if (isError($result))
+		{
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 		}
 		$this->outputJson($result);
 	}
 
-	public function getBezeichnungMZgv(){
+	public function getBezeichnungMZgv()
+	{
 		$this->load->model('codex/Zgvmaster_model', 'ZgvmasterModel');
 
 		$this->ZgvmasterModel->addOrder('zgvmas_code');
 
 		$result = $this->ZgvmasterModel->load();
-		if (isError($result)) {
+		if (isError($result))
+		{
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 		}
 		$this->outputJson($result);
 	}
 
-	public function getAusbildung(){
+	public function getAusbildung()
+	{
 		$this->load->model('codex/Ausbildung_model', 'AusbildungModel');
 
 		$this->AusbildungModel->addOrder('ausbildungcode');
 
 		$result = $this->AusbildungModel->load();
-		if (isError($result)) {
+		if (isError($result))
+		{
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 		}
 		$this->outputJson($result);
 	}
 
-	public function getAufmerksamdurch(){
+	public function getAufmerksamdurch()
+	{
 		$this->load->model('codex/Aufmerksamdurch_model', 'AufmerksamdurchModel');
 
 		$this->AufmerksamdurchModel->addOrder('aufmerksamdurch_kurzbz');
 
 		$result = $this->AufmerksamdurchModel->load();
-		if (isError($result)) {
+		if (isError($result))
+		{
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 		}
 		$this->outputJson($result);
 	}
 
-	public function getBerufstaetigkeit(){
+	public function getBerufstaetigkeit()
+	{
 		$this->load->model('codex/Berufstaetigkeit_model', 'BerufstaetigkeitModel');
 
 		$this->BerufstaetigkeitModel->addOrder('berufstaetigkeit_code');
@@ -218,24 +229,16 @@ class Prestudent extends FHC_Controller
 		$this->outputJson($result);
 	}
 
-	public function getTypenStg(){
-		//TODO(manu) hier soll bis.tbl_gsstudientyp herangezogen werden
-		$this->load->model('organisation/Studiengangstyp_model', 'StudiengangstypModel');
+	public function getTypenStg()
+	{
+		$this->load->model('education/Gsstudientyp_model', 'GsstudientypModel');
 
-		$this->StudiengangstypModel->addOrder('typ');
+		$this->GsstudientypModel->addOrder('gsstudientyp_kurzbz');
 
-		$result = $this->StudiengangstypModel->load();
+		$result = $this->GsstudientypModel->load();
 		if (isError($result)) {
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 		}
-		$data = $result->retval;
-
-		//filter NullValues
-		$filteredData = array_filter($data, function ($entry) {
-			return $entry->bezeichnung !== null;
-		});
-		$result->retval = $filteredData;
-
 		$this->outputJson($result);
 	}
 
diff --git a/application/models/education/Gsstudientyp_model.php b/application/models/education/Gsstudientyp_model.php
new file mode 100644
index 000000000..ca9106d99
--- /dev/null
+++ b/application/models/education/Gsstudientyp_model.php
@@ -0,0 +1,14 @@
+<?php
+class Gsstudientyp_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_gsstudientyp';
+		$this->pk = 'gsstudientyp_kurzbz';
+	}
+}
\ No newline at end of file

From a09a3503388f6ab839ef13d8bab9dc8fc7da1cec Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 12 Feb 2024 11:30:49 +0100
Subject: [PATCH 0399/1461] =?UTF-8?q?berechtigungen=20f=C3=BCr=20die=20Ans?=
 =?UTF-8?q?icht=20von=20Profil=20Update=20Dokumente?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/Cis/ProfilUpdate.php | 42 ++++++++++++++++----
 1 file changed, 34 insertions(+), 8 deletions(-)

diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
index 6f2aa2bc0..9cf5e4863 100755
--- a/application/controllers/Cis/ProfilUpdate.php
+++ b/application/controllers/Cis/ProfilUpdate.php
@@ -15,7 +15,7 @@ class ProfilUpdate extends Auth_Controller
 			'getProfilUpdateWithPermission' => ['student/stammdaten:r','mitarbeiter/stammdaten:r'],
 			'acceptProfilRequest'=>['student/stammdaten:rw','mitarbeiter/stammdaten:rw'],
 			'denyProfilRequest'=>['student/stammdaten:rw','mitarbeiter/stammdaten:rw'],
-			'show'=>['student/stammdaten:r','mitarbeiter/stammdaten:r'],
+			'show'=>['student/anrechnung_beantragen:r'],
 		
 			'insertProfilRequest' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'updateProfilRequest' => ['student/anrechnung_beantragen:r', 'user:r'],
@@ -33,8 +33,12 @@ class ProfilUpdate extends Auth_Controller
 		$this->load->model('person/Adresse_model','AdresseModel');
 		$this->load->model('person/Adressentyp_model', 'AdressenTypModel');
 		$this->load->model('person/Person_model','PersonModel');
+		$this->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
+		$this->load->model('crm/Student_model', 'StudentModel');
+
 
 		$this->load->library('DmsLib');
+		$this->load->library('PermissionLib');
 
 		//? put the uid and pid inside the controller for reusability
 		$this->uid = getAuthUID();
@@ -47,15 +51,37 @@ class ProfilUpdate extends Auth_Controller
 	}
 
 	public function show($dms_id){
-		$this->load->library('DmsLib');
-		//? downloads the file using the dms_id
-		$file = $this->dmslib->download($dms_id);
 		
-		$file = hasData($file) ? getData($file) : null;
-		//? returns the downloaded file to the user
-		$res = $this->outputFile($file);
+		$profil_update = $this->ProfilUpdateModel->loadWhere(['attachment_id'=>$dms_id]);
+		$profil_update = hasData($profil_update) ? getData($profil_update) : null;
+		
+		//? checks if an profil update exists with the dms_id requested from the user
+		if($profil_update){ 
+			
+			$is_mitarbeiter_profil_update = $this->MitarbeiterModel->isMitarbeiter($profil_update->uid);
+			$is_student_profil_update = $this->StudentModel->isStudent($profil_update->uid);
 
-		echo json_encode($res);
+			if(
+				$this->permissionlib->isBerechtigt('student/stammdaten:r') && $is_student_profil_update || 
+				$this->permissionlib->isBerechtigt('mitarbeiter/stammdaten:r') && $is_mitarbeiter_profil_update || 
+				$this->uid == $profil_update->uid)
+			{
+				$file = $this->dmslib->download($dms_id);
+				$file = hasData($file) ? getData($file) : null;
+				//? returns the downloaded file to the user
+				$res = $this->outputFile($file);
+				echo json_encode($res);	
+
+			}else{
+				show_error("Missing necessary permissions");
+				return;
+			}
+			
+		}else{
+			show_error("The requested document is not an attachment for any profil update");
+			return;
+		}
+		
 	}
 
 

From 6aa0bbb037fee5f0ec96e02fd09c01d0919aa181 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 12 Feb 2024 12:27:15 +0100
Subject: [PATCH 0400/1461] fixed little bug with fileOutput

---
 application/controllers/Cis/ProfilUpdate.php | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
index 9cf5e4863..0cc5cb05b 100755
--- a/application/controllers/Cis/ProfilUpdate.php
+++ b/application/controllers/Cis/ProfilUpdate.php
@@ -53,11 +53,10 @@ class ProfilUpdate extends Auth_Controller
 	public function show($dms_id){
 		
 		$profil_update = $this->ProfilUpdateModel->loadWhere(['attachment_id'=>$dms_id]);
-		$profil_update = hasData($profil_update) ? getData($profil_update) : null;
+		$profil_update = hasData($profil_update) ? getData($profil_update)[0] : null;
 		
 		//? checks if an profil update exists with the dms_id requested from the user
 		if($profil_update){ 
-			
 			$is_mitarbeiter_profil_update = $this->MitarbeiterModel->isMitarbeiter($profil_update->uid);
 			$is_student_profil_update = $this->StudentModel->isStudent($profil_update->uid);
 
@@ -66,11 +65,15 @@ class ProfilUpdate extends Auth_Controller
 				$this->permissionlib->isBerechtigt('mitarbeiter/stammdaten:r') && $is_mitarbeiter_profil_update || 
 				$this->uid == $profil_update->uid)
 			{
-				$file = $this->dmslib->download($dms_id);
-				$file = hasData($file) ? getData($file) : null;
-				//? returns the downloaded file to the user
-				$res = $this->outputFile($file);
-				echo json_encode($res);	
+
+				// Get file to be downloaded from DMS
+				$newFilename= $this->uid."/document_".$dms_id;
+				$download = $this->dmslib->download($dms_id, $newFilename);
+				if (isError($download)) return $download;
+				
+				// Download file
+				$this->outputFile(getData($download));
+				
 
 			}else{
 				show_error("Missing necessary permissions");
@@ -133,6 +136,7 @@ class ProfilUpdate extends Auth_Controller
 			];
 			
             $tmp_res=$this->dmslib->upload($dms , 'files');
+			
 			$tmp_res = hasData($tmp_res)? getData($tmp_res) : null;
 			array_push($res,$tmp_res);
 		}

From 78bffb1348fdb937e1d64599c1beb990aaa9f5c6 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 12 Feb 2024 14:08:26 +0100
Subject: [PATCH 0401/1461] little bugfix

---
 application/controllers/Cis/ProfilUpdate.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
index 0cc5cb05b..93167a0b3 100755
--- a/application/controllers/Cis/ProfilUpdate.php
+++ b/application/controllers/Cis/ProfilUpdate.php
@@ -15,7 +15,7 @@ class ProfilUpdate extends Auth_Controller
 			'getProfilUpdateWithPermission' => ['student/stammdaten:r','mitarbeiter/stammdaten:r'],
 			'acceptProfilRequest'=>['student/stammdaten:rw','mitarbeiter/stammdaten:rw'],
 			'denyProfilRequest'=>['student/stammdaten:rw','mitarbeiter/stammdaten:rw'],
-			'show'=>['student/anrechnung_beantragen:r'],
+			'show'=>['student/anrechnung_beantragen:r','user:r'],
 		
 			'insertProfilRequest' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'updateProfilRequest' => ['student/anrechnung_beantragen:r', 'user:r'],
@@ -51,21 +51,20 @@ class ProfilUpdate extends Auth_Controller
 	}
 
 	public function show($dms_id){
-		
+	
 		$profil_update = $this->ProfilUpdateModel->loadWhere(['attachment_id'=>$dms_id]);
 		$profil_update = hasData($profil_update) ? getData($profil_update)[0] : null;
 		
 		//? checks if an profil update exists with the dms_id requested from the user
 		if($profil_update){ 
-			$is_mitarbeiter_profil_update = $this->MitarbeiterModel->isMitarbeiter($profil_update->uid);
-			$is_student_profil_update = $this->StudentModel->isStudent($profil_update->uid);
-
+			$is_mitarbeiter_profil_update = getData($this->MitarbeiterModel->isMitarbeiter($profil_update->uid));
+			$is_student_profil_update = getData($this->StudentModel->isStudent($profil_update->uid));
+			
 			if(
 				$this->permissionlib->isBerechtigt('student/stammdaten:r') && $is_student_profil_update || 
 				$this->permissionlib->isBerechtigt('mitarbeiter/stammdaten:r') && $is_mitarbeiter_profil_update || 
 				$this->uid == $profil_update->uid)
 			{
-
 				// Get file to be downloaded from DMS
 				$newFilename= $this->uid."/document_".$dms_id;
 				$download = $this->dmslib->download($dms_id, $newFilename);

From f4197f090b8edb9290656d21ea361a9a6791c237 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 12 Feb 2024 15:11:00 +0100
Subject: [PATCH 0402/1461] Component Gesamthistorie

---
 .../controllers/components/stv/Prestudent.php | 16 +++++++
 application/models/crm/Prestudent_model.php   | 26 ++++++++++++
 .../Studentenverwaltung/Details/Prestudent.js | 39 +++++++++++------
 .../Details/Prestudent/History.js             | 42 +++++++++++++++++++
 .../Details/Prestudent/Status.js              |  0
 5 files changed, 110 insertions(+), 13 deletions(-)
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js

diff --git a/application/controllers/components/stv/Prestudent.php b/application/controllers/components/stv/Prestudent.php
index 1c456db10..40c5d32f6 100644
--- a/application/controllers/components/stv/Prestudent.php
+++ b/application/controllers/components/stv/Prestudent.php
@@ -43,6 +43,8 @@ class Prestudent extends FHC_Controller
 		$this->load->library('form_validation');
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 
+		//Todo(manu) Validierungen
+
 /*		$result = $this->PrestudentModel->loadWhere(['prestudent_id' =>$prestudent_id]);
 		if (isError($result)) {
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
@@ -146,6 +148,20 @@ class Prestudent extends FHC_Controller
 
 	}
 
+	public function getHistoryPrestudents($person_id)
+	{
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+		$result = $this->PrestudentModel->getHistoryPrestudents($person_id);
+		if (isError($result))
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+		}
+
+		$this->outputJson(getData($result) ?: []);
+
+	}
+
 	public function getBezeichnungZgv()
 	{
 		$this->load->model('codex/Zgv_model', 'ZgvModel');
diff --git a/application/models/crm/Prestudent_model.php b/application/models/crm/Prestudent_model.php
index 7b24b8769..55c06dc21 100644
--- a/application/models/crm/Prestudent_model.php
+++ b/application/models/crm/Prestudent_model.php
@@ -700,4 +700,30 @@ class Prestudent_model extends DB_Model
 		return $this->execQuery($query, array($prestudent_id));
 	}
 
+	/**
+	 * Gets history of all prestudents, person given
+	 * @param int $person_id
+	 * @return object
+	 */
+	public function getHistoryPrestudents($person_id)
+	{
+		$query = "
+			SELECT ps.studiensemester_kurzbz, p.priorisierung, p.studiengang_kz, sg.kurzbzlang, sg.orgform_kurzbz, ps.status_kurzbz, s.student_uid, sp.bezeichnung, ps.ausbildungssemester,
+			       CONCAT(ps.status_kurzbz, ' (', ps.ausbildungssemester, '. Semester)') as status
+			FROM public.tbl_prestudent p
+			JOIN (
+					SELECT DISTINCT ON(prestudent_id) *
+						FROM public.tbl_prestudentstatus
+						WHERE prestudent_id IN (SELECT prestudent_id FROM public.tbl_prestudent WHERE person_id = ?)
+					ORDER BY prestudent_id, datum desc, insertamum desc
+				) ps USING(prestudent_id)
+			JOIN public.tbl_status USING(status_kurzbz)
+			JOIN public.tbl_studiengang sg USING(studiengang_kz)
+			LEFT JOIN lehre.tbl_studienplan sp USING (studienplan_id)
+			LEFT JOIN public.tbl_student s USING (prestudent_id)
+			ORDER BY p.priorisierung
+		";
+
+		return $this->execQuery($query, array($person_id));
+	}
 }
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
index 4043e2aa5..b7a616db9 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
@@ -1,12 +1,16 @@
 import {CoreRESTClient} from '../../../../RESTClient.js';
 import FormForm from '../../../Form/Form.js';
 import FormInput from '../../../Form/Input.js';
+import TblHistory from "./Prestudent/History.js";
+/*import TblStatus from "./Prestudent/Status.js";*/
 
 export default {
 	components: {
 		CoreRESTClient,
 		FormForm,
-		FormInput
+		FormInput,
+		TblHistory,
+/*		TblStatus*/
 	},
 	inject: {
 		lists: {
@@ -42,7 +46,7 @@ export default {
 			listFoerderrelevant: [],
 			initialFormData: {},
 			deltaArray: [],
-			actionUpdate: false
+			actionUpdate: false,
 		};
 	},
 	computed: {
@@ -112,6 +116,13 @@ export default {
 	},
 	created() {
 		this.loadPrestudent();
+/*		CoreRESTClient
+			.get('components/stv/Prestudent/getHistoryPrestudents/'+ this.modelValue.person_id)
+			.then(result => CoreRESTClient.getData(result.data) || [])
+			.then(result => {
+				this.historyPrestudents = result;
+			})
+			.catch(this.$fhcAlert.handleSystemError);*/
 		//initiale Daten nach dem Laden
 		//this.initialFormData = {...this.data};
 		CoreRESTClient
@@ -410,6 +421,7 @@ export default {
 							type="text"
 							v-model="data.aufnahmeschluessel"
 							name="aufnahmeschluessel"
+							disabled							
 							>
 						</form-input>
 						
@@ -529,18 +541,19 @@ export default {
 		</form-form>
 		
 		<br>
-		
-		{{hasPrestudentPermission}}
-<!--		<hr>
-		Data: {{data}}
-		<hr>-->
+		<div class="row mb-3">
+			<div class="col-6">
+				<legend>Status</legend>
+<!--				<TblStatus :prestudent_id="modelValue.prestudent_id"></TblStatus>	-->	
+			</div>
+			
+			<div class="col-6">
+				<legend>Gesamthistorie</legend>
+				<TblHistory :person_id="modelValue.person_id"></TblHistory>		
+			</div>
+				
+		</div>
 
-<!--		<hr>
-		DeltaArray: {{deltaArray}}
-		<br>
-		to update: {{actionUpdate}}
-		<hr>
-		InitialData: {{initialFormData}}-->
 	
 		
 	</div>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
new file mode 100644
index 000000000..fd280fd5a
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
@@ -0,0 +1,42 @@
+import {CoreFilterCmpt} from "../../../../filter/Filter.js";
+import {CoreRESTClient} from "../../../../../RESTClient";
+
+export default{
+	components: {
+		CoreFilterCmpt
+	},
+	props: {
+		person_id: String
+	},
+	data() {
+		return {
+			tabulatorOptions: {
+				ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Prestudent/getHistoryPrestudents/' + this.person_id),
+				//autoColumns: true,
+				columns:[
+					{title:"StSem", field:"studiensemester_kurzbz"},
+					{title:"Prio", field:"priorisierung"},
+					{title:"Stg", field:"kurzbzlang"},
+					{title:"Orgform", field:"orgform_kurzbz"},
+					{title:"Studienplan", field:"bezeichnung"},
+					{title:"UID", field:"student_uid"},
+					{title:"Status", field:"status"}
+				],
+				layout: 'fitDataFill',
+				layoutColumnsOnNewData:	false,
+				height:	'auto',
+				selectable:	false,
+			},
+		}
+	},
+	template: `
+		<div class="stv-list h-100 pt-3">
+			<core-filter-cmpt
+				ref="table"
+				:tabulator-options="tabulatorOptions"
+				table-only
+				:side-menu="false"
+			>
+		</core-filter-cmpt>
+		</div>`
+}
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
new file mode 100644
index 000000000..e69de29bb

From 4b898bd976d1a9337fcaca07429d4feff958861e Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 12 Feb 2024 15:58:52 +0100
Subject: [PATCH 0403/1461] queries full name of user that created
 profil_update using join in Profil_update_model

---
 application/controllers/Cis/Profil.php        |  4 +--
 application/controllers/Cis/ProfilUpdate.php  | 16 ++++++----
 .../models/person/Profil_update_model.php     | 15 +++++++--
 public/js/apps/Cis/ProfilUpdateRequests.js    |  9 +++---
 public/js/components/Cis/Profil/EditProfil.js |  4 +--
 .../Profil/ProfilComponents/EditAdresse.js    | 32 +++++++++++++------
 6 files changed, 52 insertions(+), 28 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index c20fb9907..12585f4f5 100755
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -367,7 +367,7 @@ class Profil extends Auth_Controller
 
 		if (
 
-			isSuccess($adresse_res = $this->AdresseModel->addSelect(["adresse_id","strasse", "tbl_adressentyp.bezeichnung as typ", "plz", "ort","zustelladresse"])) &&
+			isSuccess($adresse_res = $this->AdresseModel->addSelect(["adresse_id","strasse", "tbl_adressentyp.bezeichnung as typ", "plz", "ort","zustelladresse","heimatadresse"])) &&
 			isSuccess($adresse_res = $this->AdresseModel->addOrder("zustelladresse", "DESC")) &&
 			isSuccess($adresse_res = $this->AdresseModel->addJoin("tbl_adressentyp", "typ=adressentyp_kurzbz"))
 		) {
@@ -578,7 +578,7 @@ class Profil extends Auth_Controller
 
 		if (
 
-			isSuccess($adresse_res = $this->AdresseModel->addSelect(["adresse_id","strasse", "tbl_adressentyp.bezeichnung as typ", "plz", "ort","zustelladresse"])) &&
+			isSuccess($adresse_res = $this->AdresseModel->addSelect(["adresse_id","strasse", "tbl_adressentyp.bezeichnung as typ", "plz", "ort","zustelladresse","heimatadresse"])) &&
 			isSuccess($adresse_res = $this->AdresseModel->addOrder("zustelladresse", "DESC")) &&
 			isSuccess($adresse_res = $this->AdresseModel->addJoin("tbl_adressentyp", "typ=adressentyp_kurzbz"))
 		) {
diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
index 93167a0b3..ba38ff0d2 100755
--- a/application/controllers/Cis/ProfilUpdate.php
+++ b/application/controllers/Cis/ProfilUpdate.php
@@ -213,19 +213,21 @@ class ProfilUpdate extends Auth_Controller
 
 	public function insertProfilRequest()
 	{
+		//! deprecated code
+		//? Name of user is now queried in the database table model Profil_update_model.php
+		/* $name = $this->PersonModel->getFullName($this->uid);
+		if(isError($name)){
+			// error handling
+			var_dump($name);
+			return;
+		} */
 
 		$json = json_decode($this->input->raw_input_stream);
 		$payload = $json->payload;
 		
 		$identifier = property_exists($json->payload,"kontakt_id")? "kontakt_id" : (property_exists($json->payload,"adresse_id")? "adresse_id" : null);
 		
-		$name = $this->PersonModel->getFullName($this->uid);
-		if(isError($name)){
-			// error handling
-			var_dump($name);
-			return;
-		}
-		$data = ["topic"=>$json->topic,"uid" => $this->uid, "name"=>getData($name), "requested_change" => json_encode($payload), "insertamum" => "NOW()", "insertvon"=>$this->uid,"status"=>"pending" ];
+		$data = ["topic"=>$json->topic,"uid" => $this->uid, "requested_change" => json_encode($payload), "insertamum" => "NOW()", "insertvon"=>$this->uid,"status"=>"pending" ];
 		//? insert fileID in the dataset if sent with post request
 		if(isset($json->fileID)){
 			$data['attachment_id'] = $json->fileID;
diff --git a/application/models/person/Profil_update_model.php b/application/models/person/Profil_update_model.php
index 05643af59..497da5621 100755
--- a/application/models/person/Profil_update_model.php
+++ b/application/models/person/Profil_update_model.php
@@ -51,7 +51,13 @@ class Profil_update_model extends DB_Model
 
 	//? queries the tbl_profil_updates without permissions of the user
 	public function getProfilUpdatesWhere($whereClause){
-		
+		if(array_key_exists("uid",$whereClause)){
+			$whereClause["public.tbl_profil_update.uid"]= $whereClause["uid"];
+			unset($whereClause["uid"]);
+		}
+		$this->addSelect(["public.tbl_profil_update.*","public.tbl_person.vorname"]);
+		$this->addJoin("public.tbl_benutzer","public.tbl_benutzer.uid = public.tbl_profil_update.uid");
+		$this->addJoin("public.tbl_person","public.tbl_person.person_id = public.tbl_benutzer.person_id");
 		$res = $this->loadWhere($whereClause);
 		if(isError($res)){
 			return error("Could not load public.tbl_profil_update with whereClause");
@@ -86,10 +92,11 @@ class Profil_update_model extends DB_Model
 			$parameters = [];
 			$query="
 			SELECT
-			profil_update_id, uid, name, topic, requested_change, tbl_profil_update.updateamum, tbl_profil_update.updatevon, tbl_profil_update.insertamum, tbl_profil_update.insertvon, status, status_timestamp, status_message, attachment_id 
+			profil_update_id, tbl_profil_update.uid, (tbl_person.vorname || ' ' || tbl_person.nachname) AS name , topic, requested_change, tbl_profil_update.updateamum, tbl_profil_update.updatevon, tbl_profil_update.insertamum, tbl_profil_update.insertvon, status, status_timestamp, status_message, attachment_id 
 			FROM public.tbl_profil_update 
 			JOIN public.tbl_student ON public.tbl_student.student_uid=public.tbl_profil_update.uid
 			JOIN public.tbl_prestudent ON public.tbl_prestudent.prestudent_id=public.tbl_student.prestudent_id
+			JOIN public.tbl_person ON public.tbl_prestudent.person_id=public.tbl_person.person_id
 			JOIN public.tbl_studiengang ON public.tbl_studiengang.studiengang_kz=public.tbl_prestudent.studiengang_kz
 			JOIN public.tbl_organisationseinheit ON public.tbl_organisationseinheit.oe_kurzbz=public.tbl_studiengang.oe_kurzbz
 			Where public.tbl_studiengang.oe_kurzbz IN ? ";
@@ -110,8 +117,10 @@ class Profil_update_model extends DB_Model
 			}
 		}
 		if($mitarbeiterBerechtigung) {
-			$this->addSelect(["profil_update_id", "uid", "name", "topic", "requested_change", "tbl_profil_update.updateamum", "tbl_profil_update.updatevon", "tbl_profil_update.insertamum", "tbl_profil_update.insertvon", "status", "status_timestamp", "status_message", "attachment_id"]);
+			$this->addSelect(["profil_update_id", "tbl_profil_update.uid", "(tbl_person.vorname || ' ' || tbl_person.nachname) AS name", "topic", "requested_change", "tbl_profil_update.updateamum", "tbl_profil_update.updatevon", "tbl_profil_update.insertamum", "tbl_profil_update.insertvon", "status", "status_timestamp", "status_message", "attachment_id"]);
 			$this->addJoin('tbl_mitarbeiter','tbl_mitarbeiter.mitarbeiter_uid=tbl_profil_update.uid');
+			$this->addJoin('tbl_benutzer','tbl_benutzer.uid=tbl_profil_update.uid');
+			$this->addJoin('tbl_person','tbl_benutzer.person_id=tbl_person.person_id');
 			$mitarbeiterRequests = $this->loadWhere($whereClause);
 			if(isError($mitarbeiterRequests)) return error("db error: ". getData($mitarbeiterRequests));
 			$mitarbeiterRequests = getData($mitarbeiterRequests)?:[]; 
diff --git a/public/js/apps/Cis/ProfilUpdateRequests.js b/public/js/apps/Cis/ProfilUpdateRequests.js
index fb810652c..007a08f90 100755
--- a/public/js/apps/Cis/ProfilUpdateRequests.js
+++ b/public/js/apps/Cis/ProfilUpdateRequests.js
@@ -55,7 +55,7 @@ const app = Vue.createApp({
         },
         //? adds tooltip with the status message of a profil update request if its status is not pending
         columnDefaults: {
-          tooltip: function (e, cell, onRendered) {
+          tooltip: (e, cell, onRendered) =>{
             //e - mouseover event
             //cell - cell component
             //onRendered - onRendered callback registration function
@@ -68,7 +68,8 @@ const app = Vue.createApp({
             let el = document.createElement("div");
             el.classList.add("border", "border-dark");
 
-            let statusDateEl = document.createElement("p");
+            let statusDateEl = document.createElement("span");
+            statusDateEl.classList.add("d-block","mb-1");
             statusDateEl.innerHTML =
               "Request was " + status + " on " + statusDate;
             let statusMessageEl = document.createElement("span");
@@ -240,7 +241,7 @@ const app = Vue.createApp({
     updateData: function (event) {
       this.$refs.UpdatesTable.tabulator.setData();
       //? store the selected view in the session storage of the browser
-      sessionStorage.setItem("showAll", JSON.stringify(event.target.value));
+      sessionStorage.setItem("showAll", event.target.value);
     },
   },
   mounted() {
@@ -252,7 +253,7 @@ const app = Vue.createApp({
   },
   template: `
     <div>
-    
+  
     <div  class="form-underline flex-fill ">
       <div class="form-underline-titel">Show </div>
 
diff --git a/public/js/components/Cis/Profil/EditProfil.js b/public/js/components/Cis/Profil/EditProfil.js
index 8a83b32ba..26cf7eeaa 100755
--- a/public/js/components/Cis/Profil/EditProfil.js
+++ b/public/js/components/Cis/Profil/EditProfil.js
@@ -84,14 +84,14 @@ export default {
               this.topic,
               this.profilUpdate,
               this.editData.updateID,
-              this.fileID[0]
+              this.fileID? this.fileID[0]: null
             ).then((res) => {
               handleApiResponse(res);
             })
           : Vue.$fhcapi.ProfilUpdate.insertProfilRequest(
               this.topic,
               this.profilUpdate,
-              this.fileID[0]
+              this.fileID? this.fileID[0]: null
 
             ).then((res) => {
               handleApiResponse(res);
diff --git a/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js b/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
index f3140452d..db4865eac 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
@@ -8,7 +8,7 @@ export default {
     methods:{
         updateValue: function(event,bind){
             //? sets the value of a property to null when an empty string is entered to keep the isChanged function valid 
-            if(bind ==="zustelladresse"){
+            if(bind ==="zustelladresse" || bind ==="heimatadresse"){
                 this.data[bind] = event.target.checked;
             }else{
                 this.data[bind] = event.target.value === "" ? null : event.target.value;
@@ -46,7 +46,26 @@ export default {
    
      <div class="gy-3 row justify-content-center align-items-center">
        
-    
+     <div class="col-12 ">
+        
+       
+            <div class="form-check mb-2">
+                <input class="form-check-input" type="checkbox" @change="updateValue($event,'zustelladresse')" :checked="data.zustelladresse" id="flexCheckDefault">
+                <label class="form-check-label" for="flexCheckDefault">
+                    Zustelladresse
+                </label>
+            </div>
+        
+       
+            <div class="form-check mb-2">
+                <input class="form-check-input" type="checkbox" @change="updateValue($event,'heimatadresse')" :checked="data.heimatadresse" id="flexCheckDefault">
+                <label class="form-check-label" for="flexCheckDefault">
+                    Heimatadresse
+                </label>
+            </div>
+            
+            
+        </div>
       
         <div  class="col-12 col-sm-9 col-xl-12 col-xxl-9 order-1">
 
@@ -92,14 +111,7 @@ export default {
         
             </div>
         </div>
-        <div class="col-12 order-5">
-            <div class="form-check">
-                <input class="form-check-input" type="checkbox" @change="updateValue($event,'zustelladresse')" :checked="data.zustelladresse" id="flexCheckDefault">
-                <label class="form-check-label" for="flexCheckDefault">
-                    Zustelladresse
-                </label>
-            </div>
-        </div>
+       
     </div>
     `
 

From 9ac523c0879e568a6fff1e4744a9c3230e4a8834 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 12 Feb 2024 16:00:17 +0100
Subject: [PATCH 0404/1461] deletes column name from public.tbl_profil_update

---
 system/dbupdate_3.4.php                 | 2 +-
 system/dbupdate_3.4/25999_C4_ma0594.php | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index 48fc8ff73..b39f2c400 100755
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -223,7 +223,6 @@ $tabellen=array(
 	"public.tbl_benutzerfunktion"  => array("benutzerfunktion_id","fachbereich_kurzbz","uid","oe_kurzbz","funktion_kurzbz","semester", "datum_von","datum_bis", "updateamum","updatevon","insertamum","insertvon","ext_id","bezeichnung","wochenstunden"),
 	"public.tbl_benutzergruppe"  => array("uid","gruppe_kurzbz","studiensemester_kurzbz","updateamum","updatevon","insertamum","insertvon","ext_id"),
 	"public.tbl_bewerbungstermine" => array("bewerbungstermin_id","studiengang_kz","studiensemester_kurzbz","beginn","ende","nachfrist","nachfrist_ende","anmerkung", "insertamum", "insertvon", "updateamum", "updatevon","studienplan_id","nationengruppe_kurzbz"),
-	"public.tbl_profil_update" => array("profil_update_id","uid","name","topic","requested_change", "updateamum", "updatevon", "insertamum", "insertvon", "status", "status_timestamp", "status_message", "attachment_id"),
 	"public.tbl_buchungstyp"  => array("buchungstyp_kurzbz","beschreibung","standardbetrag","standardtext","aktiv","credit_points"),
 	"public.tbl_dokument"  => array("dokument_kurzbz","bezeichnung","ext_id","bezeichnung_mehrsprachig","dokumentbeschreibung_mehrsprachig","ausstellungsdetails"),
 	"public.tbl_dokumentprestudent"  => array("dokument_kurzbz","prestudent_id","mitarbeiter_uid","datum","updateamum","updatevon","insertamum","insertvon","ext_id"),
@@ -274,6 +273,7 @@ $tabellen=array(
 	"public.tbl_preoutgoing_status" => array("preoutgoing_status_kurzbz","bezeichnung"),
 	"public.tbl_prestudent"  => array("prestudent_id","aufmerksamdurch_kurzbz","person_id","studiengang_kz","berufstaetigkeit_code","ausbildungcode","zgv_code","zgvort","zgvdatum","zgvmas_code","zgvmaort","zgvmadatum","aufnahmeschluessel","facheinschlberuf","reihungstest_id","anmeldungreihungstest","reihungstestangetreten","rt_gesamtpunkte","rt_punkte1","rt_punkte2","bismelden","anmerkung","dual","insertamum","insertvon","updateamum","updatevon","ext_id","ausstellungsstaat","rt_punkte3", "zgvdoktor_code", "zgvdoktorort", "zgvdoktordatum","mentor","zgvnation","zgvmanation","zgvdoktornation","gsstudientyp_kurzbz","aufnahmegruppe_kurzbz","udf_values","priorisierung","foerderrelevant","standort_code","zgv_erfuellt","zgvmas_erfuellt","zgvdoktor_erfuellt"),
 	"public.tbl_prestudentstatus"  => array("prestudent_id","status_kurzbz","studiensemester_kurzbz","ausbildungssemester","datum","orgform_kurzbz","insertamum","insertvon","updateamum","updatevon","ext_id","studienplan_id","bestaetigtam","bestaetigtvon","fgm","faktiv", "anmerkung","bewerbung_abgeschicktamum","rt_stufe","statusgrund_id"),
+	"public.tbl_profil_update" => array("profil_update_id","uid","topic","requested_change", "updateamum", "updatevon", "insertamum", "insertvon", "status", "status_timestamp", "status_message", "attachment_id"),
 	"public.tbl_raumtyp"  => array("raumtyp_kurzbz","beschreibung","kosten"),
 	"public.tbl_reihungstest"  => array("reihungstest_id","studiengang_kz","ort_kurzbz","anmerkung","datum","uhrzeit","updateamum","updatevon","insertamum","insertvon","ext_id","freigeschaltet","max_teilnehmer","oeffentlich","studiensemester_kurzbz","aufnahmegruppe_kurzbz","stufe","anmeldefrist","zugangs_ueberpruefung","zugangscode"),
 	"public.tbl_rt_ort" => array("rt_id","ort_kurzbz","uid"),
diff --git a/system/dbupdate_3.4/25999_C4_ma0594.php b/system/dbupdate_3.4/25999_C4_ma0594.php
index 01a2005c3..12a8a68b6 100755
--- a/system/dbupdate_3.4/25999_C4_ma0594.php
+++ b/system/dbupdate_3.4/25999_C4_ma0594.php
@@ -51,7 +51,6 @@
             $qry = "CREATE TABLE public.tbl_profil_update (
                 profil_update_id INTEGER NOT NULL,
                 uid VARCHAR(32) NOT NULL,
-                name TEXT NOT NULL,
                 topic VARCHAR(32) NOT NULL,
                 requested_change jsonb NOT NULL,
                 updateamum TIMESTAMP NULL,

From 24b467cd906456b2145396d9502b2a0e489dd3f6 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 12 Feb 2024 16:29:19 +0100
Subject: [PATCH 0405/1461] show different options for address types if the
 user is a mitarbeiter or a student

---
 public/js/apps/api/userdata.js                |  6 +--
 .../Profil/ProfilComponents/EditAdresse.js    | 16 ++++++--
 .../ProfilComponents/FetchProfilUpdates.js    | 38 ++++++++++++-------
 3 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/public/js/apps/api/userdata.js b/public/js/apps/api/userdata.js
index 9e75b6f3a..c44b2af98 100755
--- a/public/js/apps/api/userdata.js
+++ b/public/js/apps/api/userdata.js
@@ -3,11 +3,11 @@ export default {
 
 
 
-  isMitarbeiterOrStudent: function (uid) {
+  getMitarbeiter: function (student_id) {
     const url =
       FHC_JS_DATA_STORAGE_OBJECT.app_root +
-      `cis.php/Cis/Profil/isMitarbeiterOrStudent/${uid}`;
-    return axios.get(url);
+      `cis.php/api/v1/crm/Student/getStudent`;
+    return axios.get(url,{student_id:student_id});
   },
 
   getView: function (uid) {
diff --git a/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js b/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
index db4865eac..584aa25b3 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
@@ -1,5 +1,11 @@
 export default {
-    props:{data:Object},
+    props:{
+        data:Object,
+        isMitarbeiter:{
+            type: Boolean,
+            default: false,
+        },
+    },
     data(){
         return{
             originalValue:null,
@@ -78,7 +84,7 @@ export default {
 
         </div>
         
-        <div v-if="showKontaktTyp" class=" order-2 order-sm-4 order-xl-3 order-xxl-4 col-12 col-sm-5  col-xl-8 col-xxl-5  ">
+        <div class=" order-2 order-sm-4 order-xl-3 order-xxl-4 col-12 col-sm-5  col-xl-8 col-xxl-5  ">
             
             <div  class="form-underline">
                 <div class="form-underline-titel">Kontakttyp</div>
@@ -87,6 +93,9 @@ export default {
                     <option selected></option>
                     <option value="Nebenwohnsitz">Nebenwohnsitz</option>
                     <option value="Hauptwohnsitz">Hauptwohnsitz</option>
+                    <option v-if="isMitarbeiter" value="Homeoffice">Homeoffice</option>
+                    <option v-if="isMitarbeiter" value="Rechnungsadresse">Rechnungsadresse</option>
+                  
                 </select>    
             </div>
         
@@ -95,7 +104,8 @@ export default {
             </template>
 
         </div>
-        <div  class="order-3 order-sm-3 order-xl-2 order-xxl-3 " :class="ortLayoutClasses">
+
+        <div  class="order-3 order-sm-3 order-xl-2 order-xxl-3 col-12 col-sm-7 col-xl-12 col-xxl-7 " >
             
             <div class="form-underline ">
             <div class="form-underline-titel">Ort</div>
diff --git a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
index b249d8120..422d0c2d4 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
@@ -26,32 +26,38 @@ export default {
       );
     },
     getView: function (topic, status) {
+
+      if(!(status === "pending")){
+        return "Status";
+      }
+
       switch (topic) {
         case "Private Kontakte":
-          return status === "pending" ? "EditKontakt" : "Status";
-          break;
-        case "Private Adressen":
-          return status === "pending" ? "EditAdresse" : "Status";
-          break;
-        case "Add Adressen":
-          return status === "pending" ? "EditAdresse" : "Status";
+          return "EditKontakt";
           break;
         case "Add Kontakte":
-          return status === "pending" ? "EditKontakt" : "Status";
-          break;
-        case "Delete Adressen":
-          return status === "pending" ? "Adresse" : "Status";
+          return "EditKontakt";
           break;
         case "Delete Kontakte":
-          return status === "pending" ? "Kontakt" : "Status";
+          return "Kontakt";
+          break;
+        case "Private Adressen":
+          return "EditAdresse";
+          break;
+        case "Add Adressen":
+          return "EditAdresse";
+          break;
+        case "Delete Adressen":
+          return "Adresse";
           break;
         default:
-          return status === "pending" ? "TextInputDokument" : "Status";
+          return "TextInputDokument";
           break;
       }
     },
     async openModal(updateRequest) {
       let view = this.getView(updateRequest.topic, updateRequest.status);
+      
       let data = null;
       let content = null;
       let files = null;
@@ -84,6 +90,12 @@ export default {
         files: files,
       };
 
+      //?TODO: check if updateRequest.uid is a mitarbeiter, if so add the flag isMitarbeiter:true
+      /* if(view === "EditAdresse"){
+        const getMitarbeiter = await Vue.$fhcapi.UserData.getMitarbeiter(updateRequest.uid);
+        console.log(getMitarbeiter);
+      } */
+
       //? adds the status information if the profil update request was rejected or accepted
       if (updateRequest.status !== "pending") {
         content["status"] = updateRequest.status;

From 7ec24bfc7bc10de2f7ed9a288e1bd46cce4e9d5d Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 13 Feb 2024 10:45:00 +0100
Subject: [PATCH 0406/1461] Component Status: Tabelle

---
 .../controllers/components/stv/Prestudent.php |  12 +-
 application/models/crm/Prestudent_model.php   |  46 ++++-
 .../Studentenverwaltung/Details/Prestudent.js |  24 ++-
 .../Details/Prestudent/Status.js              | 164 ++++++++++++++++++
 4 files changed, 236 insertions(+), 10 deletions(-)

diff --git a/application/controllers/components/stv/Prestudent.php b/application/controllers/components/stv/Prestudent.php
index 40c5d32f6..855d53a56 100644
--- a/application/controllers/components/stv/Prestudent.php
+++ b/application/controllers/components/stv/Prestudent.php
@@ -157,9 +157,19 @@ class Prestudent extends FHC_Controller
 		{
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 		}
-
 		$this->outputJson(getData($result) ?: []);
+	}
 
+	public function getHistoryPrestudent($prestudent_id)
+	{
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+		$result = $this->PrestudentModel->getHistoryPrestudent($prestudent_id);
+		if (isError($result))
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+		}
+		$this->outputJson(getData($result) ?: []);
 	}
 
 	public function getBezeichnungZgv()
diff --git a/application/models/crm/Prestudent_model.php b/application/models/crm/Prestudent_model.php
index 55c06dc21..a8dab8a6a 100644
--- a/application/models/crm/Prestudent_model.php
+++ b/application/models/crm/Prestudent_model.php
@@ -701,7 +701,7 @@ class Prestudent_model extends DB_Model
 	}
 
 	/**
-	 * Gets history of all prestudents, person given
+	 * Gets history of all prestudents, person_id given
 	 * @param int $person_id
 	 * @return object
 	 */
@@ -726,4 +726,48 @@ class Prestudent_model extends DB_Model
 
 		return $this->execQuery($query, array($person_id));
 	}
+
+	/**
+	 * Gets history of prestudent, prestudent_id given
+	 * @param int $prestudent_id
+	 * @return object
+	 */
+	public function getHistoryPrestudent($prestudent_id)
+	{
+		$query = "
+			SELECT 
+			    ps.status_kurzbz, 
+			    ps.studiensemester_kurzbz, 
+			    ps.ausbildungssemester, 
+			    CASE WHEN ps.status_kurzbz = 'Student' THEN CONCAT(lv.semester, lv.verband, lv.gruppe) END AS lehrverband, 
+			    ps.datum, 
+			    TO_CHAR(ps.datum::timestamp, 'DD.MM.YYYY') AS format_datum,
+			    sp.bezeichnung, 
+			    ps.bestaetigtam, 
+			    TO_CHAR(ps.bestaetigtam::timestamp, 'DD.MM.YYYY') AS format_bestaetigtam,
+			    ps.bewerbung_abgeschicktamum,
+			    TO_CHAR(ps.bewerbung_abgeschicktamum::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS format_bewerbung_abgeschicktamum,
+			    stg.statusgrund_kurzbz,
+				ps.orgform_kurzbz,
+				ps.prestudent_id,
+				sp.studienplan_id,
+				ps.anmerkung,
+				ps.bestaetigtvon,
+				ps.insertamum,
+				ps.insertvon,
+				ps.updateamum,
+				ps.updatevon
+			FROM public.tbl_prestudentstatus ps
+			JOIN public.tbl_student st USING (prestudent_id)
+			JOIN public.tbl_studentlehrverband lv ON (st.student_uid = lv.student_uid)
+			JOIN public.tbl_studiengang sg ON (lv.studiengang_kz = sg.studiengang_kz)
+			LEFT JOIN lehre.tbl_studienplan sp USING (studienplan_id)
+			LEFT JOIN public.tbl_status_grund stg USING (statusgrund_id)
+			WHERE prestudent_id = ?
+			and lv.studiensemester_kurzbz = ps.studiensemester_kurzbz
+			ORDER BY datum DESC
+		";
+
+		return $this->execQuery($query, array($prestudent_id));
+	}
 }
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
index b7a616db9..394a6de27 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
@@ -2,7 +2,7 @@ import {CoreRESTClient} from '../../../../RESTClient.js';
 import FormForm from '../../../Form/Form.js';
 import FormInput from '../../../Form/Input.js';
 import TblHistory from "./Prestudent/History.js";
-/*import TblStatus from "./Prestudent/Status.js";*/
+import TblStatus from "./Prestudent/Status.js";
 
 export default {
 	components: {
@@ -10,7 +10,7 @@ export default {
 		FormForm,
 		FormInput,
 		TblHistory,
-/*		TblStatus*/
+		TblStatus
 	},
 	inject: {
 		lists: {
@@ -541,18 +541,26 @@ export default {
 		</form-form>
 		
 		<br>
-		<div class="row mb-3">
-			<div class="col-6">
+		
+		<div class="col-12 pb-3">
+			<legend>Status</legend>
+			<TblStatus :prestudent_id="modelValue.prestudent_id"></TblStatus>		
+		</div>
+		
+		<hr>
+		
+<!--		<div class="row mb-3">
+			<div class="col-8">
 				<legend>Status</legend>
-<!--				<TblStatus :prestudent_id="modelValue.prestudent_id"></TblStatus>	-->	
-			</div>
+				<TblStatus :prestudent_id="modelValue.prestudent_id"></TblStatus>		
+			</div>-->
 			
-			<div class="col-6">
+			<div class="col-8">
 				<legend>Gesamthistorie</legend>
 				<TblHistory :person_id="modelValue.person_id"></TblHistory>		
 			</div>
 				
-		</div>
+<!--		</div>-->
 
 	
 		
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
index e69de29bb..777a94e9e 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
@@ -0,0 +1,164 @@
+import {CoreFilterCmpt} from "../../../../filter/Filter.js";
+import {CoreRESTClient} from "../../../../../RESTClient";
+
+export default{
+	components: {
+		CoreFilterCmpt
+	},
+	props: {
+		prestudent_id: String
+	},
+	data() {
+		return {
+			tabulatorOptions: {
+				ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Prestudent/getHistoryPrestudent/' + this.prestudent_id),
+				//autoColumns: true,
+				columns:[
+					{title:"Kurzbz", field:"status_kurzbz"},
+					{title:"StSem", field:"studiensemester_kurzbz"},
+					{title:"Sem", field:"ausbildungssemester"},
+					{title:"Lehrverband", field:"lehrverband"},
+					{title:"Datum", field:"format_datum"},
+					{title:"Studienplan", field:"bezeichnung"},
+					{title:"BestätigtAm", field:"format_bestaetigtam"},
+					{title:"AbgeschicktAm", field:"format_bewerbung_abgeschicktamum"},
+					{title:"Statusgrund", field:"statusgrund_kurzbz"},
+					{title:"Organisationsform", field:"ps.orgform_kurzbz"},
+					{title:"PrestudentInId", field:"prestudent_id"},
+					{title:"StudienplanId", field:"studienplan_id"},
+					{title:"Anmerkung", field:"anmerkung"},
+					{title:"BestätigtVon", field:"bestaetigtvon"},
+					{title:"InsertAmUm", field:"insertamum"},
+					{title:"InsertVon", field:"insertvon"},
+					{title:"UpdateAmUm", field:"updateamum"},
+					{title:"UpdateVon", field:"updatevon"},
+				],
+				layout: 'fitDataFill',
+				layoutColumnsOnNewData:	false,
+				height:	'auto',
+				selectable:	false,
+				rowClickMenu:[
+					{
+						label:"Bearbeiten",
+						action:function(e, row){
+							console.log("bearbeiten: " + row.getData().status_kurzbz + ' '  + row.getData().prestudent_id);
+						}
+					},
+					{
+						separator:true,
+					},
+					{
+						disabled:true,
+						label:"Status bestätigen",
+						action:function(e, column){
+							column.move("col");
+						}
+					},
+					{
+						separator:true,
+					},
+					{
+						disabled:true,
+						label:"Neuen Status hinzufügen",
+						action:function(e, column){
+							column.move("col");
+						}
+					},
+					{
+						separator:true,
+					},
+					{
+						disabled:true,
+						label:"Entfernen",
+						action:function(e, column){
+							column.move("col");
+						}
+					},
+					{
+						separator:true,
+					},
+					{
+						disabled:true,
+						label:"Status vorrücken",
+						action:function(e, column){
+							column.move("col");
+						}
+					},
+					{
+						separator:true,
+					},
+					{
+						label:"<i class='fas fa-check-square'></i> Select Row",
+						action:function(e, row){
+							row.select();
+						}
+					},
+				],
+/*				rowContextMenu:[
+					{
+						label:"Bearbeiten",
+						action:function(e, column){
+							console.log("bearbeiten" + column);
+							column.hide();
+						}
+					},
+					{
+						separator:true,
+					},
+					{
+						disabled:true,
+						label:"Status bestätigen",
+						action:function(e, column){
+							column.move("col");
+						}
+					},
+					{
+						separator:true,
+					},
+					{
+						disabled:true,
+						label:"Neuen Status hinzufügen",
+						action:function(e, column){
+							column.move("col");
+						}
+					},
+					{
+						separator:true,
+					},
+					{
+						disabled:true,
+						label:"Entfernen",
+						action:function(e, column){
+							column.move("col");
+						}
+					},
+					{
+						separator:true,
+					},
+					{
+						disabled:true,
+						label:"Status vorrücken",
+						action:function(e, column){
+							column.move("col");
+						}
+					},
+				]*/
+			},
+		}
+	},
+	template: `
+		<div class="stv-list h-100 pt-3">
+			<core-filter-cmpt
+				ref="table"
+				:tabulator-options="tabulatorOptions"
+				:tabulator-events="tabulatorEvents"
+				table-only
+				:side-menu="false"
+				reload
+				new-btn-show
+				new-btn-label="Neu"
+				@click:new="actionNewAdress"
+			>
+		</core-filter-cmpt>
+		</div>`
+}
\ No newline at end of file

From 92f2f5108c915e2933e2f0f45935ad5eb3ee5ba3 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 13 Feb 2024 11:39:57 +0100
Subject: [PATCH 0407/1461] refactor of Profil.php to reuse function
 functionalities

---
 application/controllers/Cis/Profil.php | 902 ++++++++++---------------
 1 file changed, 350 insertions(+), 552 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index 12585f4f5..efb465146 100755
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -71,97 +71,16 @@ class Profil extends Auth_Controller
 	}
 
 
-
-
-
 	private function viewMitarbeiterProfil($uid)
 	{
-
-
-		if (
-			isSuccess($this->PersonModel->addSelect('gruppe_kurzbz, beschreibung')) &&
-			isSuccess($this->PersonModel->addJoin('tbl_benutzer', 'person_id')) &&
-			isSuccess($this->PersonModel->addJoin('tbl_benutzergruppe', 'uid')) &&
-			isSuccess($this->PersonModel->addJoin('tbl_gruppe', 'gruppe_kurzbz'))
-		) {
-
-			$mailverteiler_res = $this->PersonModel->loadWhere(array('mailgrp' => true, 'uid' => $uid));
-			if (isError($mailverteiler_res)) {
-				// catch error
-			}
-			$mailverteiler_res = hasData($mailverteiler_res) ? getData($mailverteiler_res) : null;
-
-			$mailverteiler_res = array_map(function ($element) {
-				$element->mailto = "mailto:" . $element->gruppe_kurzbz . "@" . DOMAIN;
-				return $element; }, $mailverteiler_res);
-		}
-
-
-
-
-		if (
-			//! Summe der Wochenstunden wird jetzt in der hr/tbl_dienstverhaeltnis gespeichert
-			isSuccess($this->BenutzerfunktionModel->addSelect(["tbl_benutzerfunktion.bezeichnung as Bezeichnung", "tbl_organisationseinheit.bezeichnung as Organisationseinheit", "datum_von as Gültig_von", "datum_bis as Gültig_bis", "wochenstunden as Wochenstunden"])) &&
-			isSuccess($this->BenutzerfunktionModel->addJoin("tbl_organisationseinheit", "oe_kurzbz"))
-		) {
-			$benutzer_funktion_res = $this->BenutzerfunktionModel->loadWhere(array('uid' => $uid));
-			if (isError($benutzer_funktion_res)) {
-				// error handling
-			} else {
-				$benutzer_funktion_res = hasData($benutzer_funktion_res) ? getData($benutzer_funktion_res) : null;
-			}
-		}
-
-		if (isSuccess($this->BenutzerModel->addSelect(["alias"]))) {
-			$benutzer_res = $this->BenutzerModel->load([$uid]);
-			if (isError($benutzer_res)) {
-				// error handling
-			} else {
-				$benutzer_res = hasData($benutzer_res) ? getData($benutzer_res)[0] : null;
-			}
-		}
-
-		if (
-			isSuccess($this->BenutzerModel->addSelect(["foto", "foto_sperre", "anrede", "titelpost", "titelpre", "vorname", "nachname"]))
-			&& isSuccess($this->BenutzerModel->addJoin("tbl_person", "person_id"))
-		) {
-
-			$person_res = $this->BenutzerModel->load([$uid]);
-			if (isError($person_res)) {
-				// error handling
-			} else {
-				$person_res = hasData($person_res) ? getData($person_res)[0] : null;
-			}
-		}
-
-
-		if (
-			isSuccess($this->MitarbeiterModel->addSelect(["kurzbz", "telefonklappe", "alias", "ort_kurzbz"]))
-			&& isSuccess($this->MitarbeiterModel->addJoin("tbl_benutzer", "tbl_benutzer.uid = tbl_mitarbeiter.mitarbeiter_uid"))
-		) {
-			$mitarbeiter_res = $this->MitarbeiterModel->load($uid);
-			if (isError($mitarbeiter_res)) {
-				// error handling
-			} else {
-				$mitarbeiter_res = hasData($mitarbeiter_res) ? getData($mitarbeiter_res)[0] : null;
-			}
-		}
-
-		//? querying the telefon number of the office
-		if (
-			isSuccess($this->MitarbeiterModel->addSelect(["kontakt"])) &&
-			isSuccess($this->MitarbeiterModel->addJoin("tbl_kontakt", "tbl_mitarbeiter.standort_id = tbl_kontakt.standort_id"))
-
-
-		) {
-			$this->MitarbeiterModel->addLimit(1);
-			$telefon_res = $this->MitarbeiterModel->loadWhere(["mitarbeiter_uid" => $uid, "kontakttyp" => "telefon"]);
-			if (isError($telefon_res)) {
-				// error handling
-			} else {
-				$telefon_res = hasData($telefon_res) ? getData($telefon_res)[0] : null;
-			}
-		}
+		
+		$mailverteiler_res = $this->getMailverteiler($uid);
+		$benutzer_funktion_res = $this->getBenutzerFunktion($uid);
+		$benutzer_res = $this->getBenutzerAlias($uid);
+		$person_res = $this->getPersonInfo($uid);
+		$mitarbeiter_res = $this->getMitarbeiterInfo($uid);
+		$telefon_res = $this->getTelefonInfo($uid);
+		
 
 
 		$res = new stdClass();
@@ -169,15 +88,9 @@ class Profil extends Auth_Controller
 
 
 		//? Person Info
-		$res->foto = $person_res->foto;
-		$res->foto_sperre = $person_res->foto_sperre;
-
-		$res->anrede = $person_res->anrede;
-		$res->titelpre = $person_res->titelpre;
-		$res->titelpost = $person_res->titelpost;
-		$res->vorname = $person_res->vorname;
-		$res->nachname = $person_res->nachname;
-
+		foreach($person_res as $key => $val){
+			$res->$key = $val;
+		}
 
 		//? Mitarbeiter Info
 		foreach ($mitarbeiter_res as $key => $val) {
@@ -186,11 +99,11 @@ class Profil extends Auth_Controller
 		}
 		//? Email Info 
 		$intern_email = array();
-		$intern_email += array("type" => "intern");
-		$intern_email += array("email" => $uid . "@" . DOMAIN);
+		$intern_email["type"] = "intern";
+		$intern_email["email"] = $uid . "@" . DOMAIN;
 		$extern_email = array();
-		$extern_email += array("type" => "alias");
-		$extern_email += array("email" => $benutzer_res->alias . "@" . DOMAIN);
+		$extern_email["type"] = "alias";
+		$extern_email["email"] = $benutzer_res->alias . "@" . DOMAIN;
 		$res->emails = array($intern_email, $extern_email);
 
 		//? Benutzerfunktion Info
@@ -210,99 +123,34 @@ class Profil extends Auth_Controller
 	private function viewStudentProfil($uid)
 	{
 
-		if (
-			isSuccess($this->PersonModel->addSelect('gruppe_kurzbz, beschreibung')) &&
-			isSuccess($this->PersonModel->addJoin('tbl_benutzer', 'person_id')) &&
-			isSuccess($this->PersonModel->addJoin('tbl_benutzergruppe', 'uid')) &&
-			isSuccess($this->PersonModel->addJoin('tbl_gruppe', 'gruppe_kurzbz'))
-		) {
+		$mailverteiler_res = $this->getMailverteiler($uid);
+		$person_res = $this->getPersonInfo($uid);
+		$student_res = $this->getStudentInfo($uid);
+		$matr_res = $this->getMatrikelNummer($uid);
 
-			$mailverteiler_res = $this->PersonModel->loadWhere(array('mailgrp' => true, 'uid' => $uid));
-			if (isError($mailverteiler_res)) {
-				// catch error
-			}
-			$mailverteiler_res = hasData($mailverteiler_res) ? getData($mailverteiler_res) : null;
-
-			$mailverteiler_res = array_map(function ($element) {
-				$element->mailto = "mailto:" . $element->gruppe_kurzbz . "@" . DOMAIN;
-				return $element; }, $mailverteiler_res);
-		}
-
-
-
-		if (
-			isSuccess($this->BenutzerModel->addSelect(["foto", "foto_sperre", "anrede", "titelpost", "titelpre", "vorname", "nachname"]))
-			&& isSuccess($this->BenutzerModel->addJoin("tbl_person", "person_id"))
-		) {
-
-			$person_res = $this->BenutzerModel->load([$uid]);
-			if (isError($person_res)) {
-				// error handling
-			} else {
-				$person_res = hasData($person_res) ? getData($person_res)[0] : null;
-			}
-		}
-
-
-		//? personenkennzeichen ist die Spalte Matrikelnr in der Tabelle Student
-		if (
-			isSuccess($this->StudentModel->addSelect(['tbl_studiengang.bezeichnung as studiengang', 'tbl_student.semester', 'tbl_student.verband', 'tbl_student.gruppe', 'tbl_student.matrikelnr as personenkennzeichen']))
-			&& isSuccess($this->StudentModel->addJoin('tbl_studiengang', "tbl_studiengang.studiengang_kz=tbl_student.studiengang_kz"))
-		) {
-			$student_res = $this->StudentModel->load([$uid]);
-			if (isError($student_res)) {
-				// catch error
-			}
-			$student_res = hasData($student_res) ? getData($student_res)[0] : null;
-
-		}
-
-
-
-		//? Matrikelnummer ist die Spalte matr_nr in Person
-		if (
-			isSuccess($this->BenutzerModel->addSelect(["matr_nr"]))
-			&& isSuccess($this->BenutzerModel->addJoin("tbl_person", "person_id"))
-		) {
-			$matr_res = $this->BenutzerModel->load([$uid]);
-			if (isError($matr_res)) {
-				// catch error
-			} else {
-				$matr_res = hasData($matr_res) ? getData($matr_res)[0] : [];
-
-			}
-		}
+		
 
 		$res = new stdClass();
 
-
-		$res->foto = $person_res->foto;
 		$res->username = $uid;
 
-		$res->anrede = $person_res->anrede;
-		$res->titel = $person_res->titelpre;
-		$res->vorname = $person_res->vorname;
-		$res->nachname = $person_res->nachname;
-
-
-		$res->postnomen = $person_res->titelpost;
-
-		$intern_email = array();
-		$intern_email += array("type" => "intern");
-		$intern_email += array("email" => $uid . "@" . DOMAIN);
-
-		$res->emails = array($intern_email);
-
-
-
-
-		$res->matrikelnummer = $matr_res->matr_nr;
-		foreach ($student_res as $key => $value) {
+		//? Person Information
+		foreach($person_res as $key => $value){
 			$res->$key = $value;
 		}
 
+		//? Student Information
+		foreach ($student_res as $key => $value) {
+			$res->$key = $value;
+		}
+		
 
+		$intern_email = array();
+		$intern_email["type"] = "intern";
+		$intern_email["email"] = $uid . "@" . DOMAIN;
 
+		$res->emails = [$intern_email];
+		$res->matrikelnummer = $matr_res->matr_nr;
 		$res->mailverteiler = $mailverteiler_res;
 
 		return $res;
@@ -313,212 +161,50 @@ class Profil extends Auth_Controller
 	private function mitarbeiterProfil()
 	{
 
-
-		//? betriebsmittel soll nur der user selber sehen
-		if (
-
-			isSuccess($this->BetriebsmittelpersonModel->addSelect(["CONCAT(betriebsmitteltyp, ' ' ,beschreibung) as Betriebsmittel", "nummer as Nummer", "ausgegebenam as Ausgegeben_am"]))
-
-		) {
-			//? betriebsmittel are not needed in a view
-			$betriebsmittelperson_res = $this->BetriebsmittelpersonModel->getBetriebsmittel($this->pid);
-			if (isError($betriebsmittelperson_res)) {
-				// error handling
-			} else {
-				$betriebsmittelperson_res = hasData($betriebsmittelperson_res) ? getData($betriebsmittelperson_res) : null;
-			}
-		}
-
-		if (
-
-			//? kontaktdaten soll auch nur der user selbst sehen
-			//DISTINCT ON (kontakttyp)
-			isSuccess($this->KontaktModel->addSelect(['kontakttyp','kontakt_id','kontakt', 'tbl_kontakt.anmerkung', 'tbl_kontakt.zustellung'])) &&
-			isSuccess($this->KontaktModel->addJoin('public.tbl_standort', 'standort_id', 'LEFT')) &&
-			isSuccess($this->KontaktModel->addJoin('public.tbl_firma', 'firma_id', 'LEFT')) &&
-			isSuccess($this->KontaktModel->addOrder('kontakttyp, kontakt, tbl_kontakt.updateamum, tbl_kontakt.insertamum'))
-		) {
-			$kontakte_res = $this->KontaktModel->loadWhere(array('person_id' => $this->pid));
-			if (isError($kontakte_res)) {
-				// handle error	
-			} else {
-				$kontakte_res = hasData($kontakte_res) ? getData($kontakte_res) : null;
-				
-				
-			}
-
-		}
-
-
-		//$this->MitarbeiterModel->load($this->uid);
-
-		//? FH Ausweis Austellungsdatum soll auch nur der user selbst sehen
-		$zutrittskarte_ausgegebenam = $this->BetriebsmittelpersonModel->getBetriebsmittelByUid($this->uid, "Zutrittskarte");
-		if (isError($zutrittskarte_ausgegebenam)) {
-			// error handling
-		} else {
-			$zutrittskarte_ausgegebenam = hasData($zutrittskarte_ausgegebenam) ? getData($zutrittskarte_ausgegebenam)[0]->ausgegebenam : null;
-			//? formats the date from 01-01-2000 to 01.01.2000
-			$zutrittskarte_ausgegebenam = str_replace("-", ".", $zutrittskarte_ausgegebenam);
-		}
-
-
-		//? Die Adressen soll auch nur der user selber sehen
-
-		if (
-
-			isSuccess($adresse_res = $this->AdresseModel->addSelect(["adresse_id","strasse", "tbl_adressentyp.bezeichnung as typ", "plz", "ort","zustelladresse","heimatadresse"])) &&
-			isSuccess($adresse_res = $this->AdresseModel->addOrder("zustelladresse", "DESC")) &&
-			isSuccess($adresse_res = $this->AdresseModel->addJoin("tbl_adressentyp", "typ=adressentyp_kurzbz"))
-		) {
-			$adresse_res = $this->AdresseModel->loadWhere(array("person_id" => $this->pid));
-			if (isError($adresse_res)) {
-				// error handling
-			} else {
-				$adresse_res = hasData($adresse_res) ? getData($adresse_res) : null;
-			}
-		}
-
-		//? die folgenden Informationen darf nur der eigene user sehen
-
-
-
-
-
-		if (
-			isSuccess($this->PersonModel->addSelect('gruppe_kurzbz, beschreibung')) &&
-			isSuccess($this->PersonModel->addJoin('tbl_benutzer', 'person_id')) &&
-			isSuccess($this->PersonModel->addJoin('tbl_benutzergruppe', 'uid')) &&
-			isSuccess($this->PersonModel->addJoin('tbl_gruppe', 'gruppe_kurzbz'))
-		) {
-
-			$mailverteiler_res = $this->PersonModel->loadWhere(array('mailgrp' => true, 'uid' => $this->uid));
-			if (isError($mailverteiler_res)) {
-				// catch error
-			}
-			$mailverteiler_res = hasData($mailverteiler_res) ? getData($mailverteiler_res) : null;
-
-			$mailverteiler_res = array_map(function ($element) {
-				$element->mailto = "mailto:" . $element->gruppe_kurzbz . "@" . DOMAIN;
-				return $element; }, $mailverteiler_res);
-		}
-
-
-
-		if (
-			isSuccess($this->BenutzerModel->addSelect(["foto", "foto_sperre", "anrede", "titelpost", "titelpre", "vorname", "nachname", "gebort", "gebdatum"]))
-			&& isSuccess($this->BenutzerModel->addJoin("tbl_person", "person_id"))
-		) {
-
-			$person_res = $this->BenutzerModel->load([$this->uid]);
-			if (isError($person_res)) {
-				// error handling
-			} else {
-				$person_res = hasData($person_res) ? getData($person_res)[0] : null;
-			}
-		}
-
-
-		if (
-			//! Summe der Wochenstunden wird jetzt in der hr/tbl_dienstverhaeltnis gespeichert
-			isSuccess($this->BenutzerfunktionModel->addSelect(["tbl_benutzerfunktion.bezeichnung as Bezeichnung", "tbl_organisationseinheit.bezeichnung as Organisationseinheit", "datum_von as Gültig_von", "datum_bis as Gültig_bis", "wochenstunden as Wochenstunden"])) &&
-			isSuccess($this->BenutzerfunktionModel->addJoin("tbl_organisationseinheit", "oe_kurzbz"))
-		) {
-			$benutzer_funktion_res = $this->BenutzerfunktionModel->loadWhere(array('uid' => $this->uid));
-			if (isError($benutzer_funktion_res)) {
-				// error handling
-			} else {
-				$benutzer_funktion_res = hasData($benutzer_funktion_res) ? getData($benutzer_funktion_res) : null;
-			}
-		}
-
-
-		//? querying the telefon number of the office
-		if (
-			isSuccess($this->MitarbeiterModel->addSelect(["mitarbeiter_uid"])) &&
-			isSuccess($this->MitarbeiterModel->addJoin("tbl_kontakt", "tbl_mitarbeiter.standort_id = tbl_kontakt.standort_id"))
-
-
-		) {
-			$this->MitarbeiterModel->addLimit(1);
-			$telefon_res = $this->MitarbeiterModel->loadWhere(["mitarbeiter_uid" => $this->uid, "kontakttyp" => "telefon"]);
-			if (isError($telefon_res)) {
-				// error handling
-			} else {
-				$telefon_res = hasData($telefon_res) ? getData($telefon_res)[0] : null;
-			}
-		}
-
-
-
-
-
-		if (
-			isSuccess($this->MitarbeiterModel->addSelect(["kurzbz", "tbl_mitarbeiter.telefonklappe", "alias", "ort_kurzbz"]))
-			&& isSuccess($this->MitarbeiterModel->addJoin("tbl_benutzer", "tbl_benutzer.uid = tbl_mitarbeiter.mitarbeiter_uid"))
-
-		) {
-			$mitarbeiter_res = $this->MitarbeiterModel->load($this->uid);
-			if (isError($mitarbeiter_res)) {
-				// error handling
-			} else {
-				$mitarbeiter_res = hasData($mitarbeiter_res) ? getData($mitarbeiter_res)[0] : null;
-			}
-		}
-
-
-		//? querying if the user has profil update requests
-		$profilUpdates = $this->ProfilUpdateModel->getProfilUpdatesWhere(['uid'=>$this->uid]);
-		if(isError($profilUpdates)){
-			//error handling
-		}else{
-			//? array containing all the requested profil information changes from the current user
-			$profilUpdates = hasData($profilUpdates) ? getData($profilUpdates) : null;
-			
-		} 
+		$zutrittskarte_ausgegebenam = $this->getZutrittskarteDatum($this->uid);
+		$adresse_res = $this->getAdressenInfo($this->pid);
+		$kontakte_res = $this->getKontaktInfo($this->pid);
+		$mailverteiler_res = $this->getMailverteiler($this->uid);
+		$person_res = $this->getPersonInfo($this->uid,true);
+		$benutzer_funktion_res = $this->getBenutzerFunktion($this->uid);
+		$betriebsmittelperson_res = $this->getBetriebsmittelInfo($this->pid);
+		$profilUpdates = $this->getProfilUpdates($this->uid);
+		$telefon_res = $this->getTelefonInfo($this->uid);
+		$mitarbeiter_res = $this->getMitarbeiterInfo($this->uid);
 
 		$res = new stdClass();
-		$res->foto = $person_res->foto;
-		$res->foto_sperre = $person_res->foto_sperre;
+
 		$res->username = $this->uid;
 
-		$res->anrede = $person_res->anrede;
-		$res->titel = $person_res->titelpre;
-		$res->vorname = $person_res->vorname;
-		$res->nachname = $person_res->nachname;
-
-		$res->gebort = $person_res->gebort;
-		$res->gebdatum = $person_res->gebdatum;
-
-		$res->postnomen = $person_res->titelpost;
+		//? Person Information
+		foreach($person_res as $key => $value){
+			$res->$key = $value;
+		}
 
+		//? Mitarbeiter Information
+		foreach ($mitarbeiter_res as $key => $value) {
+			$res->$key = $value;
+		}
 
 		$res->adressen = $adresse_res;
 		$res->zutrittsdatum = $zutrittskarte_ausgegebenam;
 		$res->kontakte = $kontakte_res;
 		$res->mittel = $betriebsmittelperson_res;
-
 		$res->mailverteiler = $mailverteiler_res;
-
-		foreach ($mitarbeiter_res as $key => $value) {
-			$res->$key = $value;
-		}
+		
 		$intern_email = array();
-		$intern_email += array("type" => "intern");
-		$intern_email += array("email" => $this->uid . "@" . DOMAIN);
+		$intern_email["type"] = "intern";
+		$intern_email["email"] = $this->uid . "@" . DOMAIN;
 		$extern_email = array();
-		$extern_email += array("type" => "alias");
-		$extern_email += array("email" => $mitarbeiter_res->alias . "@" . DOMAIN);
-		$res->emails = array($intern_email, $extern_email);
+		$extern_email["type"] = "alias";
+		$extern_email["email"] = $mitarbeiter_res->alias . "@" . DOMAIN;
+		$res->emails = [$intern_email, $extern_email];
 
 		$res->funktionen = $benutzer_funktion_res;
 
-		//telefon nummer von dem Standort
 		$res->standort_telefon = $telefon_res;
 
-		$res->profilUpdates = $profilUpdates?: null;
-		
-		
+		$res->profilUpdates = $profilUpdates;
 
 		return $res;
 	}
@@ -526,212 +212,57 @@ class Profil extends Auth_Controller
 
 	private function studentProfil()
 	{
-
-
-
-		//? betriebsmittel soll nur der user selber sehen
-		if (
-
-			isSuccess($this->BetriebsmittelpersonModel->addSelect(["CONCAT(betriebsmitteltyp, ' ' ,beschreibung) as Betriebsmittel", "nummer as Nummer", "ausgegebenam as Ausgegeben_am"]))
-
-		) {
-			//? betriebsmittel are not needed in a view
-			$betriebsmittelperson_res = $this->BetriebsmittelpersonModel->getBetriebsmittel($this->pid);
-			if (isError($betriebsmittelperson_res)) {
-				// error handling
-			} else {
-				$betriebsmittelperson_res = hasData($betriebsmittelperson_res) ? getData($betriebsmittelperson_res) : null;
-			}
-		}
-
-		if (
-
-			//? kontaktdaten soll auch nur der user selbst sehen
-			//DISTINCT ON (kontakttyp) 
-			isSuccess($this->KontaktModel->addSelect(['kontakttyp', 'kontakt_id', 'kontakt', 'tbl_kontakt.anmerkung', 'tbl_kontakt.zustellung'])) &&
-			isSuccess($this->KontaktModel->addJoin('public.tbl_standort', 'standort_id', 'LEFT')) &&
-			isSuccess($this->KontaktModel->addJoin('public.tbl_firma', 'firma_id', 'LEFT')) &&
-			isSuccess($this->KontaktModel->addOrder('kontakttyp, kontakt, tbl_kontakt.updateamum, tbl_kontakt.insertamum'))
-		) {
-			$kontakte_res = $this->KontaktModel->loadWhere(array('person_id' => $this->pid));
-			if (isError($kontakte_res)) {
-				// handle error	
-			} else {
-				$kontakte_res = hasData($kontakte_res) ? getData($kontakte_res) : null;
-				
-			}
-
-		}
-
-		//? FH Ausweis Austellungsdatum soll auch nur der user selbst sehen
-		$zutrittskarte_ausgegebenam = $this->BetriebsmittelpersonModel->getBetriebsmittelByUid($this->uid, "Zutrittskarte");
-		if (isError($zutrittskarte_ausgegebenam)) {
-			// error handling
-		} else {
-			$zutrittskarte_ausgegebenam = hasData($zutrittskarte_ausgegebenam) ? getData($zutrittskarte_ausgegebenam)[0]->ausgegebenam : null;
-			//? formats the date from 01-01-2000 to 01.01.2000
-			$zutrittskarte_ausgegebenam = str_replace("-", ".", $zutrittskarte_ausgegebenam);
-		}
-
-
-		//? Die Adressen soll auch nur der user selber sehen
-
-		if (
-
-			isSuccess($adresse_res = $this->AdresseModel->addSelect(["adresse_id","strasse", "tbl_adressentyp.bezeichnung as typ", "plz", "ort","zustelladresse","heimatadresse"])) &&
-			isSuccess($adresse_res = $this->AdresseModel->addOrder("zustelladresse", "DESC")) &&
-			isSuccess($adresse_res = $this->AdresseModel->addJoin("tbl_adressentyp", "typ=adressentyp_kurzbz"))
-		) {
-			$adresse_res = $this->AdresseModel->loadWhere(array("person_id" => $this->pid));
-			if (isError($adresse_res)) {
-				// error handling
-			} else {
-				$adresse_res = hasData($adresse_res) ? getData($adresse_res) : null;
-			}
-		}
-
-		//? die folgenden Informationen darf nur der eigene user sehen
-
-
-
-
-
-		if (
-			isSuccess($this->PersonModel->addSelect('gruppe_kurzbz, beschreibung')) &&
-			isSuccess($this->PersonModel->addJoin('tbl_benutzer', 'person_id')) &&
-			isSuccess($this->PersonModel->addJoin('tbl_benutzergruppe', 'uid')) &&
-			isSuccess($this->PersonModel->addJoin('tbl_gruppe', 'gruppe_kurzbz'))
-		) {
-
-			$mailverteiler_res = $this->PersonModel->loadWhere(array('mailgrp' => true, 'uid' => $this->uid));
-			if (isError($mailverteiler_res)) {
-				// catch error
-			}
-			$mailverteiler_res = hasData($mailverteiler_res) ? getData($mailverteiler_res) : null;
-
-			$mailverteiler_res = array_map(function ($element) {
-				$element->mailto = "mailto:" . $element->gruppe_kurzbz . "@" . DOMAIN;
-				return $element; }, $mailverteiler_res);
-		}
-
-
-
-		if (
-			isSuccess($this->BenutzerModel->addSelect(["foto", "foto_sperre", "anrede", "titelpost", "titelpre", "vorname", "nachname", "gebort", "gebdatum"]))
-			&& isSuccess($this->BenutzerModel->addJoin("tbl_person", "person_id"))
-		) {
-
-			$person_res = $this->BenutzerModel->load([$this->uid]);
-			if (isError($person_res)) {
-				// error handling
-			} else {
-				$person_res = hasData($person_res) ? getData($person_res)[0] : null;
-			}
-		}
-
-		if (
-
-			isSuccess($this->BenutzergruppeModel->addSelect(['bezeichnung']))
-			&& isSuccess($this->BenutzergruppeModel->addJoin('tbl_gruppe', 'gruppe_kurzbz'))
-		) {
-			$zutrittsgruppe_res = $this->BenutzergruppeModel->loadWhere(array("uid" => $this->uid, "zutrittssystem" => true));
-			if (isError($zutrittsgruppe_res)) {
-				// catch error
-			}
-			$zutrittsgruppe_res = hasData($zutrittsgruppe_res) ? getData($zutrittsgruppe_res) : null;
-
-		}
-
-
-
-		//? personenkennzeichen ist die Spalte Matrikelnr in der Tabelle Student
-		if (
-			isSuccess($this->StudentModel->addSelect(['tbl_studiengang.bezeichnung as studiengang', 'tbl_student.semester', 'tbl_student.verband', 'tbl_student.gruppe', 'tbl_student.matrikelnr as personenkennzeichen']))
-			&& isSuccess($this->StudentModel->addJoin('tbl_studiengang', "tbl_studiengang.studiengang_kz=tbl_student.studiengang_kz"))
-		) {
-			$student_res = $this->StudentModel->load([$this->uid]);
-			if (isError($student_res)) {
-				// catch error
-			}
-			$student_res = hasData($student_res) ? getData($student_res)[0] : null;
-
-		}
-
-
-
-		//? Matrikelnummer ist die Spalte matr_nr in Person
-		if (
-			isSuccess($this->BenutzerModel->addSelect(["matr_nr"]))
-			&& isSuccess($this->BenutzerModel->addJoin("tbl_person", "person_id"))
-		) {
-			$matr_res = $this->BenutzerModel->load([$this->uid]);
-			if (isError($matr_res)) {
-				// catch error
-			} else {
-				$matr_res = hasData($matr_res) ? getData($matr_res)[0] : [];
-
-			}
-		}
-
-		//? querying if the user has profil update requests
-		$profilUpdates = $this->ProfilUpdateModel->getProfilUpdatesWhere(['uid'=>$this->uid]);
-		if(isError($profilUpdates)){
-			//error handling
-		}else{
-			//? array containing all the requested profil information changes from the current user
-			$profilUpdates = hasData($profilUpdates) ? getData($profilUpdates) : null;
-			
-		} 
+		$betriebsmittelperson_res = $this->getBetriebsmittelInfo($this->pid);
+		$kontakte_res = $this->getKontaktInfo($this->pid);
+		$zutrittskarte_ausgegebenam = $this->getZutrittskarteDatum($this->uid);
+		$adresse_res = $this->getAdressenInfo($this->pid);
+		$mailverteiler_res = $this->getMailverteiler($this->uid);
+		$person_res = $this->getPersonInfo($this->uid, true);
+		$zutrittsgruppe_res = $this->getZutrittsgruppen($this->uid);
+		$student_res = $this->getStudentInfo($this->uid);
+		$matr_res = $this->getMatrikelNummer($this->uid);
+		$profilUpdates = $this->getProfilUpdates($this->uid);
 
 
 		$res = new stdClass();
 
 
-		$res->foto = $person_res->foto;
-		$res->foto_sperre = $person_res->foto_sperre;
 		$res->username = $this->uid;
 
-		$res->anrede = $person_res->anrede;
-		$res->titel = $person_res->titelpre;
-		$res->vorname = $person_res->vorname;
-		$res->nachname = $person_res->nachname;
-
-		$res->gebort = $person_res->gebort;
-		$res->gebdatum = $person_res->gebdatum;
-
-		$res->postnomen = $person_res->titelpost;
+		//? Person Information
+		foreach($person_res as $key => $value){
+			$res->$key = $value;
+		}
 
+		//? Student Information
+		foreach ($student_res as $key => $value) {
+			$res->$key = trim($value);
+		}
 
 		$intern_email = array();
-		$intern_email += array("type" => "intern");
-		$intern_email += array("email" => $this->uid . "@" . DOMAIN);
+		$intern_email["type"] = "intern";
+		$intern_email["email"] = $this->uid . "@" . DOMAIN;
 
-		$res->emails = array($intern_email);
+		$res->emails = [$intern_email];
 		$res->adressen = $adresse_res;
 		$res->zutrittsdatum = $zutrittskarte_ausgegebenam;
 		$res->kontakte = $kontakte_res;
 		$res->mittel = $betriebsmittelperson_res;
 		$res->matrikelnummer = $matr_res->matr_nr;
-		foreach ($student_res as $key => $value) {
-			$res->$key = trim($value);
-		}
+		
 		$res->zuttritsgruppen = $zutrittsgruppe_res;
 
 
 
 		$res->mailverteiler = $mailverteiler_res;
-		$res->profilUpdates = $profilUpdates?: null;
+		$res->profilUpdates = $profilUpdates;
 	
-		
 		return $res;
-
-
-
 	}
 
 	public function getView($uid)
 	{
-
+		//TODO: refactor
 
 		$uid = $uid != "Profil" ? $uid : null;
 
@@ -792,7 +323,7 @@ class Profil extends Auth_Controller
 
 	}
 
-	public function foto_sperre_function($value)
+	public function foto_sperre_function($value) //TODO: refactor function
 	{
 		//? Nur der Index User hat die Erlaubniss das Profilbild zu sperren 
 		$res = $this->PersonModel->update($this->pid, array("foto_sperre" => $value));
@@ -815,4 +346,271 @@ class Profil extends Auth_Controller
 		echo json_encode($res);
 	}
 
+
+
+
+	//? queries the Mailverteiler of a benutzer
+	private function getMailverteiler($uid){
+		$mailverteiler_res = null;
+		if (
+			isSuccess($this->PersonModel->addSelect('gruppe_kurzbz, beschreibung')) &&
+			isSuccess($this->PersonModel->addJoin('tbl_benutzer', 'person_id')) &&
+			isSuccess($this->PersonModel->addJoin('tbl_benutzergruppe', 'uid')) &&
+			isSuccess($this->PersonModel->addJoin('tbl_gruppe', 'gruppe_kurzbz'))
+		) {
+
+			$mailverteiler_res = $this->PersonModel->loadWhere(array('mailgrp' => true, 'uid' => $uid));
+			if (isError($mailverteiler_res)) {
+				// catch error
+			}
+			$mailverteiler_res = hasData($mailverteiler_res) ? getData($mailverteiler_res) : null;
+
+			$mailverteiler_res = array_map(function ($element) {
+				$element->mailto = "mailto:" . $element->gruppe_kurzbz . "@" . DOMAIN;
+				return $element; }, $mailverteiler_res);
+		}
+
+		
+		return $mailverteiler_res;
+	}
+
+	private function getBenutzerFunktion($uid){
+		$benutzer_funktion_res = null;
+		if (
+			//! Summe der Wochenstunden wird jetzt in der hr/tbl_dienstverhaeltnis gespeichert
+			isSuccess($this->BenutzerfunktionModel->addSelect(["tbl_benutzerfunktion.bezeichnung as Bezeichnung", "tbl_organisationseinheit.bezeichnung as Organisationseinheit", "datum_von as Gültig_von", "datum_bis as Gültig_bis", "wochenstunden as Wochenstunden"])) &&
+			isSuccess($this->BenutzerfunktionModel->addJoin("tbl_organisationseinheit", "oe_kurzbz"))
+		) {
+			$benutzer_funktion_res = $this->BenutzerfunktionModel->loadWhere(array('uid' => $uid));
+			if (isError($benutzer_funktion_res)) {
+				// error handling
+			} else {
+				$benutzer_funktion_res = hasData($benutzer_funktion_res) ? getData($benutzer_funktion_res) : null;
+			}
+		}
+		
+		return $benutzer_funktion_res;
+	}
+
+	private function getBetriebsmittelInfo($pid){
+		$betriebsmittelperson_res = null;
+		if (
+
+			isSuccess($this->BetriebsmittelpersonModel->addSelect(["CONCAT(betriebsmitteltyp, ' ' ,beschreibung) as Betriebsmittel", "nummer as Nummer", "ausgegebenam as Ausgegeben_am"]))
+
+		) {
+			//? betriebsmittel are not needed in a view
+			$betriebsmittelperson_res = $this->BetriebsmittelpersonModel->getBetriebsmittel($pid);
+			if (isError($betriebsmittelperson_res)) {
+				// error handling
+			} else {
+				$betriebsmittelperson_res = hasData($betriebsmittelperson_res) ? getData($betriebsmittelperson_res) : null;
+			}
+		}
+		return $betriebsmittelperson_res;
+	}
+
+	private function getBenutzerAlias($uid){
+		$benutzer_res = null;
+		if (isSuccess($this->BenutzerModel->addSelect(["alias"]))) {
+			$benutzer_res = $this->BenutzerModel->load([$uid]);
+			if (isError($benutzer_res)) {
+				// error handling
+			} else {
+				$benutzer_res = hasData($benutzer_res) ? getData($benutzer_res)[0] : null;
+			}
+		}
+		return $benutzer_res;
+	}
+
+	private function getPersonInfo($uid, $geburtsInfo = null){
+		
+		$person_res = null;
+		$selectClause = ["foto", "anrede", "titelpost as postnomen", "titelpre as titel", "vorname", "nachname"];
+		//? $geburtsInfo flag checks whether gebort and gebdatum should also be added to the query
+		if($geburtsInfo){
+			array_push($selectClause,"gebort");
+			array_push($selectClause,"gebdatum");
+			array_push($selectClause,"foto_sperre");
+		}
+		if (
+			isSuccess($this->BenutzerModel->addSelect($selectClause))
+			&& isSuccess($this->BenutzerModel->addJoin("tbl_person", "person_id"))
+		) {
+
+			$person_res = $this->BenutzerModel->load([$uid]);
+			if (isError($person_res)) {
+				// error handling
+			} else {
+				$person_res = hasData($person_res) ? getData($person_res)[0] : null;
+			}
+		}
+		return $person_res;
+	}
+
+	private function getMitarbeiterInfo($uid){
+		$mitarbeiter_res = null;
+		if (
+			isSuccess($this->MitarbeiterModel->addSelect(["kurzbz", "telefonklappe", "alias", "ort_kurzbz"]))
+			&& isSuccess($this->MitarbeiterModel->addJoin("tbl_benutzer", "tbl_benutzer.uid = tbl_mitarbeiter.mitarbeiter_uid"))
+		) {
+			$mitarbeiter_res = $this->MitarbeiterModel->load($uid);
+			if (isError($mitarbeiter_res)) {
+				// error handling
+			} else {
+				$mitarbeiter_res = hasData($mitarbeiter_res) ? getData($mitarbeiter_res)[0] : null;
+			}
+		}
+		return $mitarbeiter_res;
+	}
+
+	private function getTelefonInfo($uid){
+		$telefon_res = null;
+		if (
+			isSuccess($this->MitarbeiterModel->addSelect(["kontakt"])) &&
+			isSuccess($this->MitarbeiterModel->addJoin("tbl_kontakt", "tbl_mitarbeiter.standort_id = tbl_kontakt.standort_id"))
+
+
+		) {
+			$this->MitarbeiterModel->addLimit(1);
+			$telefon_res = $this->MitarbeiterModel->loadWhere(["mitarbeiter_uid" => $uid, "kontakttyp" => "telefon"]);
+			if (isError($telefon_res)) {
+				// error handling
+			} else {
+				$telefon_res = hasData($telefon_res) ? getData($telefon_res)[0] : null;
+			}
+		}
+		return $telefon_res;
+
+		
+	}
+
+
+	private function getStudentInfo($uid){
+
+		$student_res = null;
+
+		//? personenkennzeichen ist die Spalte Matrikelnr in der Tabelle Student
+		if (
+			isSuccess($this->StudentModel->addSelect(['tbl_studiengang.bezeichnung as studiengang', 'tbl_student.semester', 'tbl_student.verband', 'tbl_student.gruppe', 'tbl_student.matrikelnr as personenkennzeichen']))
+			&& isSuccess($this->StudentModel->addJoin('tbl_studiengang', "tbl_studiengang.studiengang_kz=tbl_student.studiengang_kz"))
+		) {
+			$student_res = $this->StudentModel->load([$uid]);
+			if (isError($student_res)) {
+				// catch error
+			}
+			$student_res = hasData($student_res) ? getData($student_res)[0] : null;
+
+		}
+
+		return $student_res;
+	}
+
+
+	private function getProfilUpdates($uid){
+		$profilUpdates = null;
+		$profilUpdates = $this->ProfilUpdateModel->getProfilUpdatesWhere(['uid'=>$uid]);
+		if(isError($profilUpdates)){
+			//error handling
+		}else{
+			//? array containing all the requested profil information changes from the current user
+			$profilUpdates = hasData($profilUpdates) ? getData($profilUpdates) : null;
+			
+		} 
+		return $profilUpdates;
+	}
+
+	private function getMatrikelNummer($uid){
+		$matr_res = null;
+		if (
+			isSuccess($this->BenutzerModel->addSelect(["matr_nr"]))
+			&& isSuccess($this->BenutzerModel->addJoin("tbl_person", "person_id"))
+		) {
+			$matr_res = $this->BenutzerModel->load([$uid]);
+			if (isError($matr_res)) {
+				// catch error
+			} else {
+				$matr_res = hasData($matr_res) ? getData($matr_res)[0] : [];
+
+			}
+		}
+		return $matr_res;
+	}
+
+	private function getZutrittsgruppen($uid){
+		$zutrittsgruppe_res = null;
+		if (
+
+			isSuccess($this->BenutzergruppeModel->addSelect(['bezeichnung']))
+			&& isSuccess($this->BenutzergruppeModel->addJoin('tbl_gruppe', 'gruppe_kurzbz'))
+		) {
+			$zutrittsgruppe_res = $this->BenutzergruppeModel->loadWhere(array("uid" => $uid, "zutrittssystem" => true));
+			if (isError($zutrittsgruppe_res)) {
+				// catch error
+			}
+			$zutrittsgruppe_res = hasData($zutrittsgruppe_res) ? getData($zutrittsgruppe_res) : null;
+
+		}
+		return $zutrittsgruppe_res;
+	}
+
+	private function getAdressenInfo($pid){
+		$adresse_res = null;
+		if (
+
+			isSuccess($adresse_res = $this->AdresseModel->addSelect(["adresse_id","strasse", "tbl_adressentyp.bezeichnung as typ", "plz", "ort","zustelladresse","heimatadresse"])) &&
+			isSuccess($adresse_res = $this->AdresseModel->addOrder("zustelladresse", "DESC")) &&
+			isSuccess($adresse_res = $this->AdresseModel->addJoin("tbl_adressentyp", "typ=adressentyp_kurzbz"))
+		) {
+			$adresse_res = $this->AdresseModel->loadWhere(array("person_id" => $pid));
+			if (isError($adresse_res)) {
+				// error handling
+			} else {
+				$adresse_res = hasData($adresse_res) ? getData($adresse_res) : null;
+			}
+		}
+		
+		return $adresse_res;
+	}
+
+	private function getKontaktInfo($pid){
+		$kontakte_res = null;
+		if (
+
+			//? kontaktdaten soll auch nur der user selbst sehen
+			//DISTINCT ON (kontakttyp)
+			isSuccess($this->KontaktModel->addSelect(['kontakttyp','kontakt_id','kontakt', 'tbl_kontakt.anmerkung', 'tbl_kontakt.zustellung'])) &&
+			isSuccess($this->KontaktModel->addJoin('public.tbl_standort', 'standort_id', 'LEFT')) &&
+			isSuccess($this->KontaktModel->addJoin('public.tbl_firma', 'firma_id', 'LEFT')) &&
+			isSuccess($this->KontaktModel->addOrder('kontakttyp, kontakt, tbl_kontakt.updateamum, tbl_kontakt.insertamum'))
+		) {
+			$kontakte_res = $this->KontaktModel->loadWhere(array('person_id' => $pid));
+			if (isError($kontakte_res)) {
+				// handle error	
+			} else {
+				$kontakte_res = hasData($kontakte_res) ? getData($kontakte_res) : null;
+				
+				
+			}
+
+		}
+		
+		return $kontakte_res;
+	}
+
+	private function getZutrittskarteDatum($uid){
+		$zutrittskarte_ausgegebenam = null;
+		$zutrittskarte_ausgegebenam = $this->BetriebsmittelpersonModel->getBetriebsmittelByUid($uid, "Zutrittskarte");
+		if (isError($zutrittskarte_ausgegebenam)) {
+			// error handling
+		} else {
+			$zutrittskarte_ausgegebenam = hasData($zutrittskarte_ausgegebenam) ? getData($zutrittskarte_ausgegebenam)[0]->ausgegebenam : null;
+			//? formats the date from 01-01-2000 to 01.01.2000
+			$zutrittskarte_ausgegebenam = str_replace("-", ".", $zutrittskarte_ausgegebenam);
+		}
+
+		
+		return $zutrittskarte_ausgegebenam;
+	}
+
 }

From 1be8c27cb5e8621c49c71d2546ad1dff5aa59825 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 13 Feb 2024 13:37:10 +0100
Subject: [PATCH 0408/1461] checks the permissions of a user when accepting or
 denying a profil update

---
 application/controllers/Cis/ProfilUpdate.php | 56 ++++++++++++++++++--
 public/js/apps/Cis/ProfilUpdateRequests.js   |  1 +
 public/js/apps/api/profilUpdate.js           |  3 +-
 3 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
index ba38ff0d2..503eb2a7e 100755
--- a/application/controllers/Cis/ProfilUpdate.php
+++ b/application/controllers/Cis/ProfilUpdate.php
@@ -24,7 +24,6 @@ class ProfilUpdate extends Auth_Controller
 			'insertFile' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'getProfilRequestFiles' => ['student/anrechnung_beantragen:r', 'user:r'],
 			
-			
 		]);
 		
 
@@ -35,6 +34,7 @@ class ProfilUpdate extends Auth_Controller
 		$this->load->model('person/Person_model','PersonModel');
 		$this->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
 		$this->load->model('crm/Student_model', 'StudentModel');
+		$this->load->model('person/Benutzer_model', 'BenutzerModel');
 
 
 		$this->load->library('DmsLib');
@@ -311,6 +311,25 @@ class ProfilUpdate extends Auth_Controller
 		echo json_encode($res);
 	}
 
+	
+	private function checkIfPermissionsContainStudentOE($student_uid){
+
+		$oe_berechtigung = $this->permissionlib->getOE_isEntitledFor('student/stammdaten');
+		
+		//? query that checks if the oe_berechtigungen is contained in the organisations_einheiten that are connected to the studiengang of the student
+		$query ="SELECT TRUE
+		FROM public.tbl_student
+		JOIN public.tbl_prestudent ON public.tbl_student.prestudent_id = public.tbl_prestudent.prestudent_id
+		JOIN public.tbl_studiengang ON tbl_prestudent.studiengang_kz = public.tbl_studiengang.studiengang_kz
+		JOIN public.tbl_organisationseinheit ON public.tbl_organisationseinheit.oe_kurzbz = public.tbl_studiengang.oe_kurzbz
+		WHERE public.tbl_student.student_uid = ? AND public.tbl_studiengang.oe_kurzbz IN ?
+		LIMIT 1;";
+		//TODO: hardcoded student_uid replace with variable student_uid
+		$res = $this->StudentModel->execReadOnlyQuery($query,[$student_uid,$oe_berechtigung]);
+		return hasData($res) ? true : false;
+		
+	}
+
 
 	public function acceptProfilRequest(){
 
@@ -331,6 +350,17 @@ class ProfilUpdate extends Auth_Controller
 		if(!isset($id) || !isset($uid) || !isset($personID) || !isset($requested_change) || !isset($topic)){
 			return json_encode(error("missing required information"));
 		}
+
+		$is_mitarbeiter_profil_update = getData($this->MitarbeiterModel->isMitarbeiter($uid));
+		$is_student_profil_update = getData($this->StudentModel->isStudent($uid));
+
+		
+		//? check if the permissions are set correctly
+		if(
+			$this->permissionlib->isBerechtigt('student/stammdaten:rw') && $is_student_profil_update && $this->checkIfPermissionsContainStudentOE($uid) || 
+			$this->permissionlib->isBerechtigt('mitarbeiter/stammdaten:rw') && $is_mitarbeiter_profil_update 
+		)
+		{
 		
 		if(is_array($requested_change) && array_key_exists("adresse_id",$requested_change)){
 			$insertID = $this->handleAdresse($requested_change, $personID);
@@ -369,17 +399,37 @@ class ProfilUpdate extends Auth_Controller
 				return;
 			}
 		}
-		
+
 		echo json_encode($this->setStatusOnUpdateRequest($id, "accepted", $status_message, $requested_change));
+	}else{
+		show_error("You have not the necessary permissions to accept this profil_update");
+	}
+		
+		
 	}
 
 	public function denyProfilRequest(){
 		
 		$_POST = json_decode($this->input->raw_input_stream,true);
 		$id = $this->input->post('profil_update_id',true);
+		$uid = $this->input->post('uid',true);
 		$status_message = $this->input->post('status_message',true);
+
+		$is_mitarbeiter_profil_update = getData($this->MitarbeiterModel->isMitarbeiter($uid));
+		$is_student_profil_update = getData($this->StudentModel->isStudent($uid));
+
+
+		if(
+			$this->permissionlib->isBerechtigt('student/stammdaten:rw') && $is_student_profil_update && $this->checkIfPermissionsContainStudentOE($uid) || 
+			$this->permissionlib->isBerechtigt('mitarbeiter/stammdaten:rw') && $is_mitarbeiter_profil_update 
+		)
+		{
+			echo json_encode($this->setStatusOnUpdateRequest($id, "rejected", $status_message));
+		}else{
+			show_error("You have not the necessary permissions to accept this profil_update");
+		}
+		
 		
-		echo json_encode($this->setStatusOnUpdateRequest($id, "rejected", $status_message));
 	}
 
 	private function updateRequestedChange($id, $requested_change){
diff --git a/public/js/apps/Cis/ProfilUpdateRequests.js b/public/js/apps/Cis/ProfilUpdateRequests.js
index 007a08f90..cfc824b90 100755
--- a/public/js/apps/Cis/ProfilUpdateRequests.js
+++ b/public/js/apps/Cis/ProfilUpdateRequests.js
@@ -245,6 +245,7 @@ const app = Vue.createApp({
     },
   },
   mounted() {
+
     if (!(sessionStorage.getItem("showAll") === null)) {
       //? converting string into a boolean: https://sentry.io/answers/how-can-i-convert-a-string-to-a-boolean-in-javascript/
       this.showAll = sessionStorage.getItem("showAll")==="true";
diff --git a/public/js/apps/api/profilUpdate.js b/public/js/apps/api/profilUpdate.js
index 93311fa00..a46a92c9d 100755
--- a/public/js/apps/api/profilUpdate.js
+++ b/public/js/apps/api/profilUpdate.js
@@ -39,8 +39,7 @@ export default {
         return axios.post(url, dms, {
           headers: { "Content-Type": "multipart/form-data" },
         });
-      },
-    
+      },   
    
     
       getProfilRequestFiles: function (requestID) {

From 66b843be1bfc2ca826c7a1e65b7000f5b4cde75a Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 13 Feb 2024 14:20:01 +0100
Subject: [PATCH 0409/1461] hides the profil updates list if no profil update
 is present

---
 application/controllers/Cis/Profil.php        | 24 +++++++++++++++++--
 public/js/apps/api/userdata.js                | 14 +++++++++++
 .../Cis/Profil/MitarbeiterProfil.js           |  4 ++--
 .../ProfilComponents/FetchProfilUpdates.js    | 12 ++++++----
 .../js/components/Cis/Profil/StudentProfil.js |  4 ++--
 5 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index efb465146..d90054fae 100755
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -20,9 +20,9 @@ class Profil extends Auth_Controller
 			'foto_sperre_function' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'getView' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'View' => ['student/anrechnung_beantragen:r', 'user:r'],
+			'isMitarbeiter' => ['student/anrechnung_beantragen:r', 'user:r'],
+			'isStudent' => ['student/anrechnung_beantragen:r', 'user:r'],
 			
-			
-						
 		]);
 
 		
@@ -613,4 +613,24 @@ class Profil extends Auth_Controller
 		return $zutrittskarte_ausgegebenam;
 	}
 
+	//? foreward declaration of the function isStudent in Student_model.php
+	public function isStudent($uid){
+		$result = $this->StudentModel->isStudent($uid);
+		if(!isSuccess($result)){
+			show_error("error when calling Student_model function isStudent with uid ".$uid);
+		}
+		$result = getData($result);
+		echo json_encode($result);
+	}
+
+	//? foreward declaration of the function isMitarbeiter in Mitarbeiter_model.php
+	public function isMitarbeiter($uid){
+		$result = $this->MitarbeiterModel->isMitarbeiter($uid);
+		if(!isSuccess($result)){
+			show_error("error when calling Mitarbeiter_model function isMitarbeiter with uid ".$uid);
+		}
+		$result = getData($result);
+		echo json_encode($result);
+	}
+
 }
diff --git a/public/js/apps/api/userdata.js b/public/js/apps/api/userdata.js
index c44b2af98..02b82dde8 100755
--- a/public/js/apps/api/userdata.js
+++ b/public/js/apps/api/userdata.js
@@ -22,4 +22,18 @@ export default {
       `cis.php/Cis/Profil/foto_sperre_function/${value}`;
     return axios.get(url);
   },
+
+  isStudent: function (uid) {
+    const url =
+      FHC_JS_DATA_STORAGE_OBJECT.app_root +
+      `cis.php/Cis/Profil/isStudent/${uid}`;
+    return axios.get(url);
+  },
+
+  isMitarbeiter: function (uid) {
+    const url =
+      FHC_JS_DATA_STORAGE_OBJECT.app_root +
+      `cis.php/Cis/Profil/isMitarbeiter/${uid}`;
+    return axios.get(url);
+  },
 };
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index a17c9a235..3a8a9684f 100755
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -273,7 +273,7 @@ export default {
               <div v-if="data.profilUpdates" class="row mb-3">
                 <div class="col">
                   <!-- MOBILE PROFIL UPDATES -->  
-                  <fetch-profil-updates @fetchUpdates="fetchProfilUpdates" :data="data.profilUpdates"></fetch-profil-updates>
+                  <fetch-profil-updates v-if="data.profilUpdates && data.profilUpdates.length" @fetchUpdates="fetchProfilUpdates" :data="data.profilUpdates"></fetch-profil-updates>
                 </div>
               </div>
 
@@ -438,7 +438,7 @@ export default {
   
   
                     <!-- PROFIL UPDATES -->
-                    <fetch-profil-updates @fetchUpdates="fetchProfilUpdates" :data="data.profilUpdates"></fetch-profil-updates>
+                    <fetch-profil-updates v-if="data.profilUpdates && data.profilUpdates.length" @fetchUpdates="fetchProfilUpdates" :data="data.profilUpdates"></fetch-profil-updates>
                 
                 </div>    
                 </div>
diff --git a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
index 422d0c2d4..b91eaa73e 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
@@ -91,10 +91,14 @@ export default {
       };
 
       //?TODO: check if updateRequest.uid is a mitarbeiter, if so add the flag isMitarbeiter:true
-      /* if(view === "EditAdresse"){
-        const getMitarbeiter = await Vue.$fhcapi.UserData.getMitarbeiter(updateRequest.uid);
-        console.log(getMitarbeiter);
-      } */
+      if(view === "EditAdresse"){
+        console.log("uid",updateRequest.uid);
+        const isMitarbeiter = await Vue.$fhcapi.UserData.isMitarbeiter(updateRequest.uid).then(res => res.data);
+        console.log(typeof(isMitarbeiter));
+        if(isMitarbeiter){
+          content['isMitarbeiter']=isMitarbeiter;
+        }
+      } 
 
       //? adds the status information if the profil update request was rejected or accepted
       if (updateRequest.status !== "pending") {
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index 8fcd5332c..4e3aedd7c 100755
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -212,7 +212,7 @@ export default {
               <div v-if="data.profilUpdates" class="row mb-3">
                 <div class="col">
                   <!-- MOBILE PROFIL UPDATES -->  
-                  <fetch-profil-updates @fetchUpdates="fetchProfilUpdates" :data="data.profilUpdates"></fetch-profil-updates>
+                  <fetch-profil-updates v-if="data.profilUpdates && data.profilUpdates.length" @fetchUpdates="fetchProfilUpdates" :data="data.profilUpdates"></fetch-profil-updates>
                 </div>
               </div>
 
@@ -398,7 +398,7 @@ export default {
                 <div v-if="data.profilUpdates" class="row d-none d-md-block mb-3">
                 <div class="col mb-3">
                     <!-- PROFIL UPDATES -->
-                    <fetch-profil-updates @fetchUpdates="fetchProfilUpdates" :data="data.profilUpdates"></fetch-profil-updates>
+                    <fetch-profil-updates v-if="data.profilUpdates && data.profilUpdates.length" @fetchUpdates="fetchProfilUpdates" :data="data.profilUpdates"></fetch-profil-updates>
                 </div>    
                 </div>
 

From 409221434abf84039ad0732cfbdc2d9c8d81f8f9 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 13 Feb 2024 14:25:07 +0100
Subject: [PATCH 0410/1461] removes the checkbox for heimatadresse because it
 should not be changed by the user

---
 application/controllers/Cis/Profil.php                   | 4 ++--
 .../Cis/Profil/ProfilComponents/EditAdresse.js           | 9 ++-------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index d90054fae..da5b62298 100755
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -557,8 +557,8 @@ class Profil extends Auth_Controller
 	private function getAdressenInfo($pid){
 		$adresse_res = null;
 		if (
-
-			isSuccess($adresse_res = $this->AdresseModel->addSelect(["adresse_id","strasse", "tbl_adressentyp.bezeichnung as typ", "plz", "ort","zustelladresse","heimatadresse"])) &&
+			
+			isSuccess($adresse_res = $this->AdresseModel->addSelect(["adresse_id","strasse", "tbl_adressentyp.bezeichnung as typ", "plz", "ort","zustelladresse"])) &&
 			isSuccess($adresse_res = $this->AdresseModel->addOrder("zustelladresse", "DESC")) &&
 			isSuccess($adresse_res = $this->AdresseModel->addJoin("tbl_adressentyp", "typ=adressentyp_kurzbz"))
 		) {
diff --git a/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js b/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
index 584aa25b3..e8878a886 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
@@ -14,7 +14,7 @@ export default {
     methods:{
         updateValue: function(event,bind){
             //? sets the value of a property to null when an empty string is entered to keep the isChanged function valid 
-            if(bind ==="zustelladresse" || bind ==="heimatadresse"){
+            if(bind ==="zustelladresse" ){
                 this.data[bind] = event.target.checked;
             }else{
                 this.data[bind] = event.target.value === "" ? null : event.target.value;
@@ -63,12 +63,7 @@ export default {
             </div>
         
        
-            <div class="form-check mb-2">
-                <input class="form-check-input" type="checkbox" @change="updateValue($event,'heimatadresse')" :checked="data.heimatadresse" id="flexCheckDefault">
-                <label class="form-check-label" for="flexCheckDefault">
-                    Heimatadresse
-                </label>
-            </div>
+           
             
             
         </div>

From 6140e15139e56765f41414e16a1f9fa79d0e80e1 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Tue, 13 Feb 2024 14:50:26 +0100
Subject: [PATCH 0411/1461] Removed unused tabulatorAdditionalColumns property.
 Instead additional cols like 'action buttons' are now checked by index.

---
 public/js/components/filter/Filter.js | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index efb24fb57..69b64d383 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -55,8 +55,6 @@ export const CoreFilterCmpt = {
 		},
 		tabulatorOptions: Object,
 		tabulatorEvents: Array,
-		// TODO check to remove
-		tabulatorAdditionalColumns: Array,
 		tableOnly: Boolean,
 		reload: Boolean,
 		download: {
@@ -141,15 +139,12 @@ export const CoreFilterCmpt = {
 				for (let col of columns)
 				{
 					// If the column has to be displayed or not
-					col.visible = selectedFields.indexOf(col.field) >= 0;
-					// TODO additionalCols wieder löschen?
-					// if (col.formatter == 'rowSelection')
-					// 	col.visible = true;
-					if (
-						col.formatter == 'rowSelection'
-						|| (this.tabulatorAdditionalColumns && this.tabulatorAdditionalColumns.indexOf(col.field) >= 0)
-					)
+					/* fields.indexOf(col.field) == -1; ensures displaying formatter colums
+					e.g. column with rowSelection checkboxes or with custom formatted action buttons */
+					col.visible = selectedFields.indexOf(col.field) >= 0 || fields.indexOf(col.field) == -1;
 
+					if (col.formatter == 'rowSelection')
+						col.visible = true;
 
 					if (col.hasOwnProperty('resizable'))
 						col.resizable = col.visible;

From 8f81426fa4e7d1c32c94183ff72dbd9e45d0b72d Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Tue, 13 Feb 2024 14:54:42 +0100
Subject: [PATCH 0412/1461] Corrected error when using alertMultiple and
 handleSystemMessage

---
 public/js/plugin/FhcAlert.js | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/public/js/plugin/FhcAlert.js b/public/js/plugin/FhcAlert.js
index 079039aed..307064d76 100644
--- a/public/js/plugin/FhcAlert.js
+++ b/public/js/plugin/FhcAlert.js
@@ -237,7 +237,7 @@ export default {
 			alertMultiple(messageArray, severity = 'info', title = 'Info', sticky = false){
 				// Check, if array has only string values
 				if (messageArray.every(message => typeof message === 'string')) {
-					messageArray.every(message => this.alertDefault(severity, title, message, sticky));
+					messageArray.forEach(message => this.alertDefault(severity, title, message, sticky));
 					return true;
 				}
 				return false;
@@ -281,21 +281,24 @@ export default {
 			handleSystemMessage(message) {
 				// Message is string
 				if (typeof message === 'string')
-					return fhcerror.alertWarning(message);
+					return $fhcAlert.alertWarning(message);
 
 				// Message is array of strings
 				if (Array.isArray(message)) {
 					// If Array has only Strings
 					if (message.every(msg => typeof msg === 'string'))
-						return message.every(fhcerror.alertWarning);
+						return message.every($fhcAlert.alertWarning);
 
 					// If Array has only Objects
 					if (message.every(msg => typeof msg === 'object') && msg !== null) {
 						return message.every(msg => {
 							if (msg.hasOwnProperty('data') && msg.data.hasOwnProperty('retval')) {
-								fhcerror.alertWarning(JSON.stringify(msg.data.retval));
+								$fhcAlert.alertWarning(JSON.stringify(msg.data.retval));
 							} else {
-								fhcerror.alertSystemError(JSON.stringify(msg));
+								console.log('FhcAlert systemError');
+								console.log(msg);
+								console.log(JSON.stringify(msg));
+								$fhcAlert.alertSystemError(JSON.stringify(msg));
 							}
 						});
 					}
@@ -305,15 +308,15 @@ export default {
 				if (typeof message === 'object' && message !== null){
 					if (message.hasOwnProperty('data') && message.data.hasOwnProperty('retval')) {
 						// NOTE(chris): changed: alertSystemError => alertWarning
-						fhcerror.alertWarning(JSON.stringify(message.data.retval));
+						$fhcAlert.alertWarning(JSON.stringify(message.data.retval));
 					} else {
-						fhcerror.alertSystemError(JSON.stringify(message));
+						$fhcAlert.alertSystemError(JSON.stringify(message));
 					}
 					return;
 				}
 
 				// Fallback
-				fhcerror.alertSystemError('alertSystemError throws Generic Error\r\nError Controller Path: ' + FHC_JS_DATA_STORAGE_OBJECT.called_path + '/' +  FHC_JS_DATA_STORAGE_OBJECT.called_method);
+				$fhcAlert.alertSystemError('alertSystemError throws Generic Error\r\nError Controller Path: ' + FHC_JS_DATA_STORAGE_OBJECT.called_path + '/' +  FHC_JS_DATA_STORAGE_OBJECT.called_method);
 			},
 			resetFormValidation(form) {
 				const event = new Event('fhc-form-reset');

From 5ee241d9146a009e89edcdc561f3186e52dd687f Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 13 Feb 2024 15:30:23 +0100
Subject: [PATCH 0413/1461] now editAdressen shows a warning message if a new
 adresse is marked as zustelladresse

---
 application/controllers/Cis/Profil.php        | 53 ++++++++++++-------
 public/js/apps/api/userdata.js                |  7 +++
 .../components/Cis/Profil/EditProfilSelect.js |  2 +-
 .../Profil/ProfilComponents/EditAdresse.js    | 29 +++++++++-
 4 files changed, 69 insertions(+), 22 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index da5b62298..50a4c21a4 100755
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -22,6 +22,7 @@ class Profil extends Auth_Controller
 			'View' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'isMitarbeiter' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'isStudent' => ['student/anrechnung_beantragen:r', 'user:r'],
+			'getZustellAdresse' => ['student/anrechnung_beantragen:r', 'user:r'],
 			
 		]);
 
@@ -70,6 +71,36 @@ class Profil extends Auth_Controller
 
 	}
 
+	//? foreward declaration of the function isStudent in Student_model.php
+	public function isStudent($uid){
+		$result = $this->StudentModel->isStudent($uid);
+		if(!isSuccess($result)){
+			show_error("error when calling Student_model function isStudent with uid ".$uid);
+		}
+		$result = getData($result);
+		echo json_encode($result);
+	}
+
+	//? foreward declaration of the function isMitarbeiter in Mitarbeiter_model.php
+	public function isMitarbeiter($uid){
+		$result = $this->MitarbeiterModel->isMitarbeiter($uid);
+		if(!isSuccess($result)){
+			show_error("error when calling Mitarbeiter_model function isMitarbeiter with uid ".$uid);
+		}
+		$result = getData($result);
+		echo json_encode($result);
+	}
+
+	public function getZustellAdresse(){
+		$this->AdresseModel->addSelect(["adresse_id"]);
+		$adressen_res = $this->AdresseModel->loadWhere(['person_id'=>$this->pid, 'zustelladresse'=>true]);
+		$adressen_res = hasData($adressen_res) ? getData($adressen_res): null;
+		$adressen_res = array_map(function($item){
+			return $item->adresse_id;
+		},$adressen_res);
+		echo json_encode($adressen_res);
+	}
+
 
 	private function viewMitarbeiterProfil($uid)
 	{
@@ -557,7 +588,7 @@ class Profil extends Auth_Controller
 	private function getAdressenInfo($pid){
 		$adresse_res = null;
 		if (
-			
+
 			isSuccess($adresse_res = $this->AdresseModel->addSelect(["adresse_id","strasse", "tbl_adressentyp.bezeichnung as typ", "plz", "ort","zustelladresse"])) &&
 			isSuccess($adresse_res = $this->AdresseModel->addOrder("zustelladresse", "DESC")) &&
 			isSuccess($adresse_res = $this->AdresseModel->addJoin("tbl_adressentyp", "typ=adressentyp_kurzbz"))
@@ -613,24 +644,6 @@ class Profil extends Auth_Controller
 		return $zutrittskarte_ausgegebenam;
 	}
 
-	//? foreward declaration of the function isStudent in Student_model.php
-	public function isStudent($uid){
-		$result = $this->StudentModel->isStudent($uid);
-		if(!isSuccess($result)){
-			show_error("error when calling Student_model function isStudent with uid ".$uid);
-		}
-		$result = getData($result);
-		echo json_encode($result);
-	}
-
-	//? foreward declaration of the function isMitarbeiter in Mitarbeiter_model.php
-	public function isMitarbeiter($uid){
-		$result = $this->MitarbeiterModel->isMitarbeiter($uid);
-		if(!isSuccess($result)){
-			show_error("error when calling Mitarbeiter_model function isMitarbeiter with uid ".$uid);
-		}
-		$result = getData($result);
-		echo json_encode($result);
-	}
+	
 
 }
diff --git a/public/js/apps/api/userdata.js b/public/js/apps/api/userdata.js
index 02b82dde8..0c4c049a7 100755
--- a/public/js/apps/api/userdata.js
+++ b/public/js/apps/api/userdata.js
@@ -36,4 +36,11 @@ export default {
       `cis.php/Cis/Profil/isMitarbeiter/${uid}`;
     return axios.get(url);
   },
+
+  getZustellAdresse: function () {
+    const url =
+      FHC_JS_DATA_STORAGE_OBJECT.app_root +
+      `cis.php/Cis/Profil/getZustellAdresse`;
+    return axios.get(url);
+  },
 };
diff --git a/public/js/components/Cis/Profil/EditProfilSelect.js b/public/js/components/Cis/Profil/EditProfilSelect.js
index 615ddcc18..a78a58d7b 100755
--- a/public/js/components/Cis/Profil/EditProfilSelect.js
+++ b/public/js/components/Cis/Profil/EditProfilSelect.js
@@ -71,7 +71,7 @@ export default {
               typ: null,
               plz: null,
               ort: null,
-              zustelladresse:null,
+              zustelladresse:false,
             }
           : {
               //? add flag
diff --git a/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js b/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
index e8878a886..4f7240893 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
@@ -9,6 +9,7 @@ export default {
     data(){
         return{
             originalValue:null,
+            zustellAdressenCount:null,
         }
     },
     methods:{
@@ -24,6 +25,20 @@ export default {
         },
     },
     computed:{
+        showZustellAdressenWarning: function(){
+            if(this.zustellAdressenCount){
+                
+                if(this.zustellAdressenCount.includes(this.data.adresse_id)){
+                    //? if the adresse was already saved
+                    return false;
+                }
+                return this.zustellAdressenCount > 0 && this.data.zustelladresse;
+            }
+            //? if this.zustellAdressenCount is still not set by the api call and is still null
+            return false;
+            
+
+        },
         ortLayoutClasses: function(){
             return this.showKontaktTyp?[
                 'col-12', 
@@ -45,13 +60,25 @@ export default {
         },
     },
     created(){
+        Vue.$fhcapi.UserData.getZustellAdresse().then(res => {
+            
+            this.zustellAdressenCount = res.data;
+        })
         this.originalValue = JSON.stringify(this.data);
         
     },
     template:`
    
      <div class="gy-3 row justify-content-center align-items-center">
-       
+     
+     
+     <div v-if="showZustellAdressenWarning" class="col-12 ">
+     <div class="card bg-danger mx-2">
+     <div class="card-body text-white ">
+     <span>!Achtung: Eine deiner Adressen ist bereits als Zustelladresse gespeichert, sind sie sicher, dass sie die aktuelle Adresse stattdessen als Zustelladresse speichern wollen?</span>
+     </div>
+     </div>
+     </div>
      <div class="col-12 ">
         
        

From bfba05753e52063567e41b21528ea74ff11505a1 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 14 Feb 2024 08:56:25 +0100
Subject: [PATCH 0414/1461] also shows the zustellungs warning when there is
 more than one kontakt marked as zustellung

---
 application/controllers/Cis/Profil.php        | 11 +++++++
 public/js/apps/api/userdata.js                |  7 ++++
 .../Profil/ProfilComponents/EditAdresse.js    |  8 +++--
 .../Profil/ProfilComponents/EditKontakt.js    | 33 ++++++++++++++++++-
 4 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index 50a4c21a4..0a6046c1c 100755
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -23,6 +23,7 @@ class Profil extends Auth_Controller
 			'isMitarbeiter' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'isStudent' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'getZustellAdresse' => ['student/anrechnung_beantragen:r', 'user:r'],
+			'getZustellKontakt' => ['student/anrechnung_beantragen:r', 'user:r'],
 			
 		]);
 
@@ -101,6 +102,16 @@ class Profil extends Auth_Controller
 		echo json_encode($adressen_res);
 	}
 
+	public function getZustellKontakt(){
+		$this->KontaktModel->addSelect(["kontakt_id"]);
+		$kontakt_res = $this->KontaktModel->loadWhere(['person_id'=>$this->pid, 'zustellung'=>true]);
+		$kontakt_res = hasData($kontakt_res) ? getData($kontakt_res): null;
+		$kontakt_res = array_map(function($item){
+			return $item->kontakt_id;
+		},$kontakt_res);
+		echo json_encode($kontakt_res);
+	}
+
 
 	private function viewMitarbeiterProfil($uid)
 	{
diff --git a/public/js/apps/api/userdata.js b/public/js/apps/api/userdata.js
index 0c4c049a7..8395c4ca8 100755
--- a/public/js/apps/api/userdata.js
+++ b/public/js/apps/api/userdata.js
@@ -43,4 +43,11 @@ export default {
       `cis.php/Cis/Profil/getZustellAdresse`;
     return axios.get(url);
   },
+
+  getZustellKontakt: function () {
+    const url =
+      FHC_JS_DATA_STORAGE_OBJECT.app_root +
+      `cis.php/Cis/Profil/getZustellKontakt`;
+    return axios.get(url);
+  },
 };
diff --git a/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js b/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
index 4f7240893..6a64452e0 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
@@ -32,7 +32,7 @@ export default {
                     //? if the adresse was already saved
                     return false;
                 }
-                return this.zustellAdressenCount > 0 && this.data.zustelladresse;
+                return this.zustellAdressenCount>0 && this.data.zustelladresse;
             }
             //? if this.zustellAdressenCount is still not set by the api call and is still null
             return false;
@@ -62,7 +62,7 @@ export default {
     created(){
         Vue.$fhcapi.UserData.getZustellAdresse().then(res => {
             
-            this.zustellAdressenCount = res.data;
+            this.zustellAdressenCount = res.data?.length;
         })
         this.originalValue = JSON.stringify(this.data);
         
@@ -72,6 +72,7 @@ export default {
      <div class="gy-3 row justify-content-center align-items-center">
      
      
+     <!-- warning message for too many zustellungs Adressen -->
      <div v-if="showZustellAdressenWarning" class="col-12 ">
      <div class="card bg-danger mx-2">
      <div class="card-body text-white ">
@@ -79,6 +80,9 @@ export default {
      </div>
      </div>
      </div>
+     <!-- End of warning -->
+
+
      <div class="col-12 ">
         
        
diff --git a/public/js/components/Cis/Profil/ProfilComponents/EditKontakt.js b/public/js/components/Cis/Profil/ProfilComponents/EditKontakt.js
index 2598529e0..491319aae 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/EditKontakt.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/EditKontakt.js
@@ -8,6 +8,7 @@ export default {
         return{
            
             originalValue:null,
+            zustellKontaktCount:null,
         }
     },
     methods:{
@@ -27,6 +28,20 @@ export default {
         },
     },
     computed:{
+        showZustellKontakteWarning: function(){
+            if(this.zustellKontaktCount){
+                
+                if(this.zustellKontaktCount.includes(this.data.kontakt_id)){
+                    //? if the adresse was already saved
+                    return false;
+                }
+                return this.zustellKontaktCount>0 && this.data.zustellung;
+            }
+            //? if this.zustellAdressenCount is still not set by the api call and is still null
+            return false;
+            
+
+        },
         isChanged: function(){
             //? returns true if the original passed data object was changed 
             if(!this.data.kontakt || !this.data.kontakttyp) {return false;}
@@ -35,14 +50,30 @@ export default {
     },
     created(){
 
-        this.originalValue = JSON.stringify(this.data);
+        Vue.$fhcapi.UserData.getZustellKontakt().then(res => {
+            
+            this.zustellKontaktCount = res.data?.length;
+        })
        
+        this.originalValue = JSON.stringify(this.data);
         
     },
     template:
     `
+    
     <div class="gy-3 row align-items-center justify-content-center">    
     
+    
+    <!-- warning message for too many zustellungs Kontakte -->
+    <div v-if="showZustellKontakteWarning" class="col-12 ">
+    <div class="card bg-danger mx-2">
+    <div class="card-body text-white ">
+    <span>!Achtung: Eine deiner Kontakte ist bereits als Zustellungskontakt gespeichert, sind sie sicher, dass sie den aktuellen Kontakt stattdessen als Zustellkontakt speichern wollen?</span>
+    </div>
+    </div>
+    </div>
+    <!-- End of warning -->
+
     <div v-if="!data.kontakt_id" class="col-12">
         
     

From 65a9b8c80fba27db0cf8d801b8a2961f14821c2a Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 14 Feb 2024 09:01:40 +0100
Subject: [PATCH 0415/1461] little fix

---
 .../js/components/Cis/Profil/ProfilComponents/EditAdresse.js  | 4 ++--
 .../js/components/Cis/Profil/ProfilComponents/EditKontakt.js  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js b/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
index 6a64452e0..466ba18a6 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
@@ -32,7 +32,7 @@ export default {
                     //? if the adresse was already saved
                     return false;
                 }
-                return this.zustellAdressenCount>0 && this.data.zustelladresse;
+                return this.zustellAdressenCount.length && this.data.zustelladresse;
             }
             //? if this.zustellAdressenCount is still not set by the api call and is still null
             return false;
@@ -62,7 +62,7 @@ export default {
     created(){
         Vue.$fhcapi.UserData.getZustellAdresse().then(res => {
             
-            this.zustellAdressenCount = res.data?.length;
+            this.zustellAdressenCount = res.data;
         })
         this.originalValue = JSON.stringify(this.data);
         
diff --git a/public/js/components/Cis/Profil/ProfilComponents/EditKontakt.js b/public/js/components/Cis/Profil/ProfilComponents/EditKontakt.js
index 491319aae..ff91517c1 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/EditKontakt.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/EditKontakt.js
@@ -35,7 +35,7 @@ export default {
                     //? if the adresse was already saved
                     return false;
                 }
-                return this.zustellKontaktCount>0 && this.data.zustellung;
+                return this.zustellKontaktCount.length && this.data.zustellung;
             }
             //? if this.zustellAdressenCount is still not set by the api call and is still null
             return false;
@@ -52,7 +52,7 @@ export default {
 
         Vue.$fhcapi.UserData.getZustellKontakt().then(res => {
             
-            this.zustellKontaktCount = res.data?.length;
+            this.zustellKontaktCount = res.data;
         })
        
         this.originalValue = JSON.stringify(this.data);

From b655c4021aebdff4258741b6bd6f79ff4192a9a3 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 14 Feb 2024 11:42:20 +0100
Subject: [PATCH 0416/1461] instead of calculating how many zustelladressen or
 zustellkontakte a user has in the backend, it is calculated in the client
 side to prevent an extra api call

---
 application/controllers/Cis/ProfilUpdate.php  | 32 ++++++++++++++++
 public/js/apps/Cis/Profil.js                  | 38 ++++++++++++++++---
 public/js/components/Cis/Profil/EditProfil.js |  6 ++-
 .../Cis/Profil/MitarbeiterProfil.js           |  8 ++--
 .../Cis/Profil/MitarbeiterViewProfil.js       |  3 +-
 .../Profil/ProfilComponents/EditAdresse.js    |  8 ++--
 .../Profil/ProfilComponents/EditKontakt.js    | 16 ++++----
 .../ProfilComponents/FetchProfilUpdates.js    |  9 +++--
 .../js/components/Cis/Profil/StudentProfil.js | 10 +++--
 9 files changed, 97 insertions(+), 33 deletions(-)

diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
index 503eb2a7e..e4ff7cc93 100755
--- a/application/controllers/Cis/ProfilUpdate.php
+++ b/application/controllers/Cis/ProfilUpdate.php
@@ -23,6 +23,8 @@ class ProfilUpdate extends Auth_Controller
 			'selectProfilRequest' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'insertFile' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'getProfilRequestFiles' => ['student/anrechnung_beantragen:r', 'user:r'],
+			'handleDupplicateZustellKontakte' => ['student/anrechnung_beantragen:r', 'user:r'],
+			
 			
 		]);
 		
@@ -332,6 +334,7 @@ class ProfilUpdate extends Auth_Controller
 
 
 	public function acceptProfilRequest(){
+		
 
 		$_POST = json_decode($this->input->raw_input_stream,true);
 		$id = $this->input->post('profil_update_id',true);
@@ -455,6 +458,8 @@ class ProfilUpdate extends Auth_Controller
 			$requested_change['insertamum'] = "NOW()";
 			$requested_change['insertvon'] = getAuthUID();
 			$insertID = $this->KontaktModel->insert($requested_change);
+			//TODO: check if the user has two zustelladressen or zustellkontakte
+			$this->handleDupplicateZustellKontakte($requested_change['zustellung']);
 			
 		}
 		//! DELETE
@@ -485,6 +490,7 @@ class ProfilUpdate extends Auth_Controller
 		
 		//! ADD
 		if(array_key_exists('add',$requested_change) && $requested_change['add']){
+			
 			//? removes add flag
 			unset($requested_change['add']);
 			$requested_change['insertamum']="NOW()";
@@ -492,6 +498,7 @@ class ProfilUpdate extends Auth_Controller
 			$requested_change['person_id'] = $personID;
 			//TODO: zustelladresse, heimatadresse, rechnungsadresse und nation werden nicht beachtet
 			$insertID = $this->AdresseModel->insert($requested_change);
+			
 		}
 		//! DELETE
 		elseif(array_key_exists('delete',$requested_change) && $requested_change['delete']){
@@ -505,4 +512,29 @@ class ProfilUpdate extends Auth_Controller
 		}
 		return isset($insertID)? $insertID : null;
 	}
+
+
+	public function handleDupplicateZustellKontakte($zustellung){
+
+		$this->PersonModel->addSelect("public.tbl_kontakt.kontakt_id");
+		$this->PersonModel->addJoin("public.tbl_kontakt","public.tbl_kontakt.person_id = public.tbl_person.person_id");
+		$zustellKontakteCount = $this->PersonModel->loadWhere(["public.tbl_person.person_id"=>$this->pid, "zustellung"=>TRUE]);
+		if(!isSuccess($zustellKontakteCount)){
+			return error("error in the query");
+		}
+		$zustellKontakteCount = hasData($zustellKontakteCount) ? getData($zustellKontakteCount) : null;
+		
+
+		if($zustellung && count($zustellKontakteCount)>0){
+			echo $zustellKontakteCount[0];
+		}
+	}
+
+	private function getZustelladressenCount(){
+		
+	}
+
+	public function getZustellkontakteCount(){
+		
+	}
 }
\ No newline at end of file
diff --git a/public/js/apps/Cis/Profil.js b/public/js/apps/Cis/Profil.js
index 334ffa270..980823e4f 100755
--- a/public/js/apps/Cis/Profil.js
+++ b/public/js/apps/Cis/Profil.js
@@ -57,8 +57,9 @@ const app = Vue.createApp({
 	//? use function syntax for provide so that we can access `this`
 	provide() {
 		return {
-		
-			
+
+			getZustellkontakteCount: this.zustellKontakteCount,
+			getZustelladressenCount: this.zustellAdressenCount,
 			collapseFunction:  (e, column)=> {
 		
 				//* check if property doesn't exist already and add it to the reactive this properties
@@ -121,7 +122,36 @@ const app = Vue.createApp({
 		}
 		
 	},
+	methods:{
+		zustellAdressenCount(){
+			if(!this.data || !this.data.adressen){
+				
+				return null;
+			}
+
+			return this.data.adressen.filter(adresse => {
+				return adresse.zustelladresse;
+			}).map(adr => {
+				
+				return adr.adresse_id;
+			});
+			
+		},
+
+		zustellKontakteCount(){
+			if(!this.data || !this.data.kontakte){
+				return null;
+			}
+
+			return this.data.kontakte.filter(kontakt => {
+				return kontakt.zustellung;
+			}).map(kon =>{
+				return kon.kontakt_id;
+			});
+		},
+	},
 	computed:{
+		
 
 		filteredEditData(){
 			if(!this.data){
@@ -218,13 +248,9 @@ const app = Vue.createApp({
 				this.notFoundUID=uid;
 			}else{
 				this.view = res.data?.view;
-
 				this.data = res.data?.data;
-			
-				
 			}
 			
-			
 		});
 	},
 	template:`
diff --git a/public/js/components/Cis/Profil/EditProfil.js b/public/js/components/Cis/Profil/EditProfil.js
index 26cf7eeaa..6c7093262 100755
--- a/public/js/components/Cis/Profil/EditProfil.js
+++ b/public/js/components/Cis/Profil/EditProfil.js
@@ -12,6 +12,8 @@ export default {
   props: {
     value: Object,
     title: String,
+    zustelladressenCount: Function,
+    zustellkontakteCount: Function,
     /*
      * NOTE(chris):
      * Hack to expose in "emits" declared events to $props which we use
@@ -41,6 +43,8 @@ export default {
   provide(){
     return {
       updateFileID: this.updateFileIDFunction,
+      zustellAdresseCount:this.zustelladressenCount,
+      zustellKontaktCount:this.zustellkontakteCount,
     }
   }, 
 
@@ -144,6 +148,7 @@ export default {
     return BsModal.popup.bind(this)(null, options);
   },
   template: `
+
   <bs-modal ref="modalContainer" v-bind="$props" body-class="" dialog-class="modal-lg" class="bootstrap-alert" backdrop="false" >
     
   <template v-if="title" v-slot:title>
@@ -158,7 +163,6 @@ export default {
       </ol>
     </nav>
 
-   
     <edit-profil-select @submit="submitProfilChange" v-model:breadcrumb="breadcrumb" v-model:topic="topic" v-model:profilUpdate="profilUpdate" ariaLabel="test" :list="editData"></edit-profil-select>
    
 
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 3a8a9684f..70bd8bbe6 100755
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -26,7 +26,7 @@ export default {
     RoleInformation,
     ProfilInformation,
   },
-  inject: ['sortProfilUpdates','collapseFunction'],
+  inject: ['sortProfilUpdates','collapseFunction','getZustellkontakteCount','getZustelladressenCount'],
   data() {
     return {
 
@@ -158,6 +158,8 @@ export default {
 
       EditProfil.popup({ 
           value:JSON.parse(JSON.stringify(this.editData)),
+          zustelladressenCount:this.getZustelladressenCount,
+          zustellkontakteCount:this.getZustellkontakteCount,
           title:"Profil bearbeiten",
         }).then((popup_result) => {
           if(popup_result){
@@ -241,7 +243,7 @@ export default {
   },
 
   template: ` 
-
+ 
   <div class="container-fluid text-break fhc-form"  >
     
           <div class="row">
@@ -273,7 +275,7 @@ export default {
               <div v-if="data.profilUpdates" class="row mb-3">
                 <div class="col">
                   <!-- MOBILE PROFIL UPDATES -->  
-                  <fetch-profil-updates v-if="data.profilUpdates && data.profilUpdates.length" @fetchUpdates="fetchProfilUpdates" :data="data.profilUpdates"></fetch-profil-updates>
+                  <fetch-profil-updates v-if="data.profilUpdates && data.profilUpdates.length" @fetchUpdates="fetchProfilUpdates"  :data="data.profilUpdates" ></fetch-profil-updates>
                 </div>
               </div>
 
diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
index 77b74d437..659a1ed52 100755
--- a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
@@ -15,6 +15,7 @@ export default {
     ProfilEmails,
     ProfilInformation,
   },
+  inject: ['collapseFunction'],
   data() {
     return {
       collapseIconFunktionen: true,
@@ -45,7 +46,7 @@ export default {
             headerFilter: false,
             formatter: "responsiveCollapse",
             maxWidth: 40,
-            headerClick: this.$parent.collapseFunction,
+            headerClick: this.collapseFunction,
           },
           {
             title: "Bezeichnung",
diff --git a/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js b/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
index 466ba18a6..5aad87037 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
@@ -6,6 +6,7 @@ export default {
             default: false,
         },
     },
+    inject:["zustellAdresseCount"],
     data(){
         return{
             originalValue:null,
@@ -60,15 +61,12 @@ export default {
         },
     },
     created(){
-        Vue.$fhcapi.UserData.getZustellAdresse().then(res => {
-            
-            this.zustellAdressenCount = res.data;
-        })
+        console.log(this.getZustelladressenCount)
         this.originalValue = JSON.stringify(this.data);
+        this.zustellAdressenCount = this.zustellAdresseCount();
         
     },
     template:`
-   
      <div class="gy-3 row justify-content-center align-items-center">
      
      
diff --git a/public/js/components/Cis/Profil/ProfilComponents/EditKontakt.js b/public/js/components/Cis/Profil/ProfilComponents/EditKontakt.js
index ff91517c1..0624e7016 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/EditKontakt.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/EditKontakt.js
@@ -8,9 +8,11 @@ export default {
         return{
            
             originalValue:null,
-            zustellKontaktCount:null,
+            zustellKontakteCount:null,
+           
         }
     },
+    inject:["zustellKontaktCount"],
     methods:{
         updateValue: function(event,bind){
 
@@ -29,13 +31,13 @@ export default {
     },
     computed:{
         showZustellKontakteWarning: function(){
-            if(this.zustellKontaktCount){
+            if(this.zustellKontakteCount){
                 
-                if(this.zustellKontaktCount.includes(this.data.kontakt_id)){
+                if(this.zustellKontakteCount.includes(this.data.kontakt_id)){
                     //? if the adresse was already saved
                     return false;
                 }
-                return this.zustellKontaktCount.length && this.data.zustellung;
+                return this.zustellKontakteCount.length && this.data.zustellung;
             }
             //? if this.zustellAdressenCount is still not set by the api call and is still null
             return false;
@@ -50,13 +52,9 @@ export default {
     },
     created(){
 
-        Vue.$fhcapi.UserData.getZustellKontakt().then(res => {
-            
-            this.zustellKontaktCount = res.data;
-        })
        
         this.originalValue = JSON.stringify(this.data);
-        
+        this.zustellKontakteCount = this.zustellKontaktCount();
     },
     template:
     `
diff --git a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
index b91eaa73e..3aed5d62f 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
@@ -6,9 +6,9 @@ export default {
       type: Object,
     },
   },
+  inject:['getZustellkontakteCount','getZustelladressenCount'],
 
   emits: ["fetchUpdates"],
-
   data() {
     return {};
   },
@@ -88,13 +88,13 @@ export default {
         withFiles: withFiles,
         topic: updateRequest.topic,
         files: files,
+        
       };
 
       //?TODO: check if updateRequest.uid is a mitarbeiter, if so add the flag isMitarbeiter:true
       if(view === "EditAdresse"){
-        console.log("uid",updateRequest.uid);
         const isMitarbeiter = await Vue.$fhcapi.UserData.isMitarbeiter(updateRequest.uid).then(res => res.data);
-        console.log(typeof(isMitarbeiter));
+
         if(isMitarbeiter){
           content['isMitarbeiter']=isMitarbeiter;
         }
@@ -112,6 +112,8 @@ export default {
         EditProfil.popup({
           value: content,
           title: updateRequest.topic,
+          zustellkontakteCount:this.getZustellkontakteCount,
+          zustelladressenCount:this.getZustelladressenCount,
         })
           .then((res) => {
             if (res === true) {
@@ -127,7 +129,6 @@ export default {
   created() {},
   computed: {},
   template: `
-   
     <div  class="card text-nowrap" >
                       <div class="card-header">
                       Profil Updates
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index 4e3aedd7c..ef6c72672 100755
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -24,7 +24,7 @@ export default {
     FetchProfilUpdates,
 
   },
-  inject:['sortProfilUpdates'],
+  inject:['sortProfilUpdates','collapseFunction','getZustellkontakteCount','getZustelladressenCount'],
   data() {
     return {
       
@@ -51,7 +51,7 @@ export default {
             headerFilter: false,
             formatter: "responsiveCollapse",
             maxWidth: 40,
-            headerClick: this.$parent.collapseFunction,
+            headerClick: this.collapseFunction,
           },
           {
             title: "Betriebsmittel",
@@ -97,6 +97,8 @@ export default {
       EditProfil.popup({ 
           value:JSON.parse(JSON.stringify(this.editData)),
           title:"Profil bearbeiten",
+          zustelladressenCount:this.getZustelladressenCount,
+          zustellkontakteCount:this.getZustellkontakteCount,
         }).then((popup_result) => {
           if(popup_result){
             Vue.$fhcapi.ProfilUpdate.selectProfilRequest()
@@ -212,7 +214,7 @@ export default {
               <div v-if="data.profilUpdates" class="row mb-3">
                 <div class="col">
                   <!-- MOBILE PROFIL UPDATES -->  
-                  <fetch-profil-updates v-if="data.profilUpdates && data.profilUpdates.length" @fetchUpdates="fetchProfilUpdates" :data="data.profilUpdates"></fetch-profil-updates>
+                  <fetch-profil-updates v-if="data.profilUpdates && data.profilUpdates.length" @fetchUpdates="fetchProfilUpdates"  :data="data.profilUpdates"></fetch-profil-updates>
                 </div>
               </div>
 
@@ -398,7 +400,7 @@ export default {
                 <div v-if="data.profilUpdates" class="row d-none d-md-block mb-3">
                 <div class="col mb-3">
                     <!-- PROFIL UPDATES -->
-                    <fetch-profil-updates v-if="data.profilUpdates && data.profilUpdates.length" @fetchUpdates="fetchProfilUpdates" :data="data.profilUpdates"></fetch-profil-updates>
+                    <fetch-profil-updates v-if="data.profilUpdates && data.profilUpdates.length" @fetchUpdates="fetchProfilUpdates"  :data="data.profilUpdates"></fetch-profil-updates>
                 </div>    
                 </div>
 

From 5758d7cf4fa8c6f385e7a3d17da088e6ad7f5202 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 14 Feb 2024 14:18:31 +0100
Subject: [PATCH 0417/1461] overrides old zustelladressen/kontakte when
 changing or adding a new zustelladresse/kontakt

---
 application/controllers/Cis/ProfilUpdate.php  | 109 ++++++++++++++----
 public/js/apps/Cis/Profil.js                  |   4 +-
 .../Profil/ProfilComponents/EditAdresse.js    |   1 -
 3 files changed, 86 insertions(+), 28 deletions(-)

diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
index e4ff7cc93..c9ce93f4c 100755
--- a/application/controllers/Cis/ProfilUpdate.php
+++ b/application/controllers/Cis/ProfilUpdate.php
@@ -23,7 +23,6 @@ class ProfilUpdate extends Auth_Controller
 			'selectProfilRequest' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'insertFile' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'getProfilRequestFiles' => ['student/anrechnung_beantragen:r', 'user:r'],
-			'handleDupplicateZustellKontakte' => ['student/anrechnung_beantragen:r', 'user:r'],
 			
 			
 		]);
@@ -247,8 +246,12 @@ class ProfilUpdate extends Auth_Controller
 		foreach($pending_changes as $update_request){
 			$existing_change = $update_request->requested_change;
 			
+			 //? the user cannot delete a zustelladresse/kontakt
+			 if( isset($payload->delete) && $payload->{$identifier=="kontakt_id"? "zustellung":"zustelladresse"}){
+				echo json_encode(error("cannot delete resource marked as zustellung"));
+				return;
+			 }
 			 //? the user can add as many new kontakt/adresse as he likes
-			 
 			 if( !isset($payload->add) && property_exists($existing_change,$identifier) && property_exists($payload,$identifier) && $existing_change->$identifier == $payload->$identifier){
 				//? the kontakt_id / adresse_id of a change has to be unique 
 				echo json_encode(error("cannot change the same resource twice"));
@@ -458,8 +461,15 @@ class ProfilUpdate extends Auth_Controller
 			$requested_change['insertamum'] = "NOW()";
 			$requested_change['insertvon'] = getAuthUID();
 			$insertID = $this->KontaktModel->insert($requested_change);
-			//TODO: check if the user has two zustelladressen or zustellkontakte
-			$this->handleDupplicateZustellKontakte($requested_change['zustellung']);
+			$insert_kontakt_id = $insertID;
+			if(isError($insert_kontakt_id)){
+				show_error("was not able to insert new kontakt");
+			}
+			$insert_kontakt_id = hasData($insert_kontakt_id)? getData($insert_kontakt_id):null;
+			if($insert_kontakt_id){
+				$this->handleDupplicateZustellKontakte($requested_change['zustellung'],$insert_kontakt_id);
+			}
+			
 			
 		}
 		//! DELETE
@@ -469,8 +479,18 @@ class ProfilUpdate extends Auth_Controller
 		//! UPDATE
 		else{
 			$requested_change['updateamum']="NOW()";
-			$requested_change['updatemvon']=getAuthUID();
-			$this->KontaktModel->update($kontakt_id,$requested_change);
+			$requested_change['updatevon']=getAuthUID();
+			var_dump($requested_change);
+			
+			$update_kontakt_id = $this->KontaktModel->update($kontakt_id,$requested_change);
+
+			if(isError($update_kontakt_id)){
+				show_error("was not able to update kontakt");
+			}
+			$update_kontakt_id = hasData($update_kontakt_id) ? getData($update_kontakt_id) : null;
+			if($update_kontakt_id){
+				$this->handleDupplicateZustellKontakte($requested_change['zustellung'],$update_kontakt_id);
+			}
 		}
 		return isset($insertID) ? $insertID : null;
 	}
@@ -498,7 +518,15 @@ class ProfilUpdate extends Auth_Controller
 			$requested_change['person_id'] = $personID;
 			//TODO: zustelladresse, heimatadresse, rechnungsadresse und nation werden nicht beachtet
 			$insertID = $this->AdresseModel->insert($requested_change);
-			
+			$insert_adresse_id = $insertID;
+			if(isError($insert_adresse_id)){
+				show_error("was not able to insert new adresse");
+			}
+			$insert_adresse_id = hasData($insert_adresse_id) ? getData($insert_adresse_id) : null;
+			if($insert_adresse_id){
+				$this->handleDupplicateZustellAdressen($requested_change['zustelladresse'],$insert_adresse_id);
+			}
+		
 		}
 		//! DELETE
 		elseif(array_key_exists('delete',$requested_change) && $requested_change['delete']){
@@ -508,33 +536,64 @@ class ProfilUpdate extends Auth_Controller
 		else{
 			$requested_change['updateamum']	= "NOW()";
 			$requested_change['updatevon'] = getAuthUID();
-			$this->AdresseModel->update($adresse_id,$requested_change);
+			$update_adresse_id = $this->AdresseModel->update($adresse_id,$requested_change);
+			if(isError($update_adresse_id)){
+				show_error("was not able to insert new adresse");
+			}
+			$update_adresse_id = hasData($update_adresse_id) ? getData($update_adresse_id) : null;
+			if($update_adresse_id){
+				$this->handleDupplicateZustellAdressen($requested_change['zustelladresse'],$update_adresse_id);
+			}
 		}
 		return isset($insertID)? $insertID : null;
 	}
 
 
-	public function handleDupplicateZustellKontakte($zustellung){
+	private function handleDupplicateZustellKontakte($zustellung, $kontakt_id){
+		if($zustellung){
+			$this->PersonModel->addSelect("public.tbl_kontakt.kontakt_id");
+			$this->PersonModel->addJoin("public.tbl_kontakt","public.tbl_kontakt.person_id = public.tbl_person.person_id");
+			$zustellKontakteArray = $this->PersonModel->loadWhere(["public.tbl_person.person_id"=>$this->pid, "zustellung"=>TRUE]);
+			if(!isSuccess($zustellKontakteArray)){
+				return error("error when querying zustellkontakte");
+			}
+			$zustellKontakteArray = hasData($zustellKontakteArray) ? getData($zustellKontakteArray) : null;
 
-		$this->PersonModel->addSelect("public.tbl_kontakt.kontakt_id");
-		$this->PersonModel->addJoin("public.tbl_kontakt","public.tbl_kontakt.person_id = public.tbl_person.person_id");
-		$zustellKontakteCount = $this->PersonModel->loadWhere(["public.tbl_person.person_id"=>$this->pid, "zustellung"=>TRUE]);
-		if(!isSuccess($zustellKontakteCount)){
-			return error("error in the query");
-		}
-		$zustellKontakteCount = hasData($zustellKontakteCount) ? getData($zustellKontakteCount) : null;
-		
-
-		if($zustellung && count($zustellKontakteCount)>0){
-			echo $zustellKontakteCount[0];
+			if($zustellung && count($zustellKontakteArray)>0){
+				$zustellKontakteArray = array_filter($zustellKontakteArray, function($kontakt) use ($kontakt_id){
+					return $kontakt->kontakt_id != $kontakt_id;
+				});
+				foreach($zustellKontakteArray as $kontakt){
+					$this->KontaktModel->update($kontakt->kontakt_id,["zustellung"=>FALSE]);
+				}
+				
+			}
 		}
 	}
 
-	private function getZustelladressenCount(){
-		
+	private function handleDupplicateZustellAdressen($zustellung, $adresse_id){
+		if($zustellung){
+			$this->PersonModel->addSelect("public.tbl_adresse.adresse_id");
+			$this->PersonModel->addJoin("public.tbl_adresse","public.tbl_adresse.person_id = public.tbl_person.person_id");
+			$zustellAdressenArray = $this->PersonModel->loadWhere(["public.tbl_person.person_id"=>$this->pid, "zustelladresse"=>TRUE]);
+			if(!isSuccess($zustellAdressenArray)){
+				return error("error when querying zustelladressen");
+			}
+			$zustellAdressenArray = hasData($zustellAdressenArray) ? getData($zustellAdressenArray) : null;
+
+			if($zustellung && count($zustellAdressenArray)>0){
+				
+				$zustellAdressenArray = array_filter($zustellAdressenArray, function($adresse) use ($adresse_id){
+				
+					return $adresse->adresse_id != $adresse_id;
+				});
+				foreach($zustellAdressenArray as $adresse){
+					$this->AdresseModel->update($adresse->adresse_id,["zustelladresse"=>FALSE]);
+				}
+				
+			}
+		}
 	}
 
-	public function getZustellkontakteCount(){
-		
-	}
+	
 }
\ No newline at end of file
diff --git a/public/js/apps/Cis/Profil.js b/public/js/apps/Cis/Profil.js
index 980823e4f..c20382783 100755
--- a/public/js/apps/Cis/Profil.js
+++ b/public/js/apps/Cis/Profil.js
@@ -36,7 +36,7 @@ Vue.$collapseFormatter  = function(data){
 
   
 
-const app = Vue.createApp({
+const testapp = Vue.createApp({
 	
 	components: {
 		StudentProfil,
@@ -268,4 +268,4 @@ const app = Vue.createApp({
 	
 	
 });
-app.mount("#content");
\ No newline at end of file
+testapp.mount("#content");
\ No newline at end of file
diff --git a/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js b/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
index 5aad87037..0726f8580 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
@@ -61,7 +61,6 @@ export default {
         },
     },
     created(){
-        console.log(this.getZustelladressenCount)
         this.originalValue = JSON.stringify(this.data);
         this.zustellAdressenCount = this.zustellAdresseCount();
         

From 028be08ec3a3152025a1ad9d027bcba662423a49 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 14 Feb 2024 14:38:21 +0100
Subject: [PATCH 0418/1461] fixes little bug with profil update checking

---
 application/controllers/Cis/ProfilUpdate.php | 25 ++++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
index c9ce93f4c..44d9af5ea 100755
--- a/application/controllers/Cis/ProfilUpdate.php
+++ b/application/controllers/Cis/ProfilUpdate.php
@@ -239,6 +239,23 @@ class ProfilUpdate extends Auth_Controller
 		//? loops over all updateRequests from a user to validate if the new request is valid
 		$res = $this->ProfilUpdateModel->getProfilUpdatesWhere(["uid"=>$this->uid]);
 		
+		//? the user cannot delete a zustelladresse/kontakt
+		if( isset($payload->delete) && $payload->{$identifier=="kontakt_id"? "zustellung":"zustelladresse"}){
+			echo json_encode(error("cannot delete resource marked as zustellung"));
+			return;
+		 }
+		 
+		 //? if the user tries to delete a adresse, checks whether the adresse is a heimatadresse, if so an error is raised
+		 if( isset($payload->delete) && $identifier == "adresse_id"){
+			$adr = $this->AdresseModel->load($payload->$identifier);
+			$adr = getData($adr)[0];
+			if($adr->heimatadresse){
+				echo json_encode(error("cannot delete adresse marked as heimatadresse"));
+				return;
+			}
+			
+		 }
+
 		if($res){
 		$pending_changes = array_filter($res, function($element) {
 			return $element->status == 'pending';
@@ -246,11 +263,9 @@ class ProfilUpdate extends Auth_Controller
 		foreach($pending_changes as $update_request){
 			$existing_change = $update_request->requested_change;
 			
-			 //? the user cannot delete a zustelladresse/kontakt
-			 if( isset($payload->delete) && $payload->{$identifier=="kontakt_id"? "zustellung":"zustelladresse"}){
-				echo json_encode(error("cannot delete resource marked as zustellung"));
-				return;
-			 }
+			 
+			 
+
 			 //? the user can add as many new kontakt/adresse as he likes
 			 if( !isset($payload->add) && property_exists($existing_change,$identifier) && property_exists($payload,$identifier) && $existing_change->$identifier == $payload->$identifier){
 				//? the kontakt_id / adresse_id of a change has to be unique 

From fd260a63078f908eb4762838739c32c1d076f684 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 15 Feb 2024 09:59:27 +0100
Subject: [PATCH 0419/1461] changes the check if a user has permissions to
 accept or deny a profil update

---
 application/controllers/Cis/Profil.php        | 42 +------------
 application/controllers/Cis/ProfilUpdate.php  | 63 +++++++++++++------
 .../models/person/Profil_update_model.php     |  9 +--
 public/js/apps/api/profilUpdate.js            |  9 +++
 4 files changed, 60 insertions(+), 63 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index 0a6046c1c..050490220 100755
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -115,31 +115,27 @@ class Profil extends Auth_Controller
 
 	private function viewMitarbeiterProfil($uid)
 	{
-		
 		$mailverteiler_res = $this->getMailverteiler($uid);
 		$benutzer_funktion_res = $this->getBenutzerFunktion($uid);
 		$benutzer_res = $this->getBenutzerAlias($uid);
 		$person_res = $this->getPersonInfo($uid);
 		$mitarbeiter_res = $this->getMitarbeiterInfo($uid);
 		$telefon_res = $this->getTelefonInfo($uid);
-		
-
 
 		$res = new stdClass();
 		$res->username = $uid;
 
-
 		//? Person Info
 		foreach($person_res as $key => $val){
 			$res->$key = $val;
 		}
-
+	
 		//? Mitarbeiter Info
 		foreach ($mitarbeiter_res as $key => $val) {
 			$res->$key = $val;
 
 		}
-		//? Email Info 
+
 		$intern_email = array();
 		$intern_email["type"] = "intern";
 		$intern_email["email"] = $uid . "@" . DOMAIN;
@@ -148,32 +144,23 @@ class Profil extends Auth_Controller
 		$extern_email["email"] = $benutzer_res->alias . "@" . DOMAIN;
 		$res->emails = array($intern_email, $extern_email);
 
-		//? Benutzerfunktion Info
 		$res->funktionen = $benutzer_funktion_res;
-
-		//? Mailverteiler Info
 		$res->mailverteiler = $mailverteiler_res;
-
 		$res->standort_telefon = isset($telefon_res)? $telefon_res->kontakt : null;
 
 		return $res;
-
 	}
 
 
 
 	private function viewStudentProfil($uid)
 	{
-
 		$mailverteiler_res = $this->getMailverteiler($uid);
 		$person_res = $this->getPersonInfo($uid);
 		$student_res = $this->getStudentInfo($uid);
 		$matr_res = $this->getMatrikelNummer($uid);
 
-		
-
 		$res = new stdClass();
-
 		$res->username = $uid;
 
 		//? Person Information
@@ -185,7 +172,6 @@ class Profil extends Auth_Controller
 		foreach ($student_res as $key => $value) {
 			$res->$key = $value;
 		}
-		
 
 		$intern_email = array();
 		$intern_email["type"] = "intern";
@@ -196,8 +182,6 @@ class Profil extends Auth_Controller
 		$res->mailverteiler = $mailverteiler_res;
 
 		return $res;
-
-
 	}
 
 	private function mitarbeiterProfil()
@@ -215,7 +199,6 @@ class Profil extends Auth_Controller
 		$mitarbeiter_res = $this->getMitarbeiterInfo($this->uid);
 
 		$res = new stdClass();
-
 		$res->username = $this->uid;
 
 		//? Person Information
@@ -243,9 +226,7 @@ class Profil extends Auth_Controller
 		$res->emails = [$intern_email, $extern_email];
 
 		$res->funktionen = $benutzer_funktion_res;
-
 		$res->standort_telefon = $telefon_res;
-
 		$res->profilUpdates = $profilUpdates;
 
 		return $res;
@@ -265,10 +246,7 @@ class Profil extends Auth_Controller
 		$matr_res = $this->getMatrikelNummer($this->uid);
 		$profilUpdates = $this->getProfilUpdates($this->uid);
 
-
 		$res = new stdClass();
-
-
 		$res->username = $this->uid;
 
 		//? Person Information
@@ -291,11 +269,7 @@ class Profil extends Auth_Controller
 		$res->kontakte = $kontakte_res;
 		$res->mittel = $betriebsmittelperson_res;
 		$res->matrikelnummer = $matr_res->matr_nr;
-		
 		$res->zuttritsgruppen = $zutrittsgruppe_res;
-
-
-
 		$res->mailverteiler = $mailverteiler_res;
 		$res->profilUpdates = $profilUpdates;
 	
@@ -305,35 +279,27 @@ class Profil extends Auth_Controller
 	public function getView($uid)
 	{
 		//TODO: refactor
-
 		$uid = $uid != "Profil" ? $uid : null;
 
-
-
 		$isMitarbeiter = null;
 		if ($uid) {
-
 			if (isSuccess($this->PersonModel->addSelect(["person_id"]))) {
 				$pid = $this->PersonModel->getByUid($uid);
 				$pid = hasData($pid) ? getData($pid)[0] : null;
-
 			}
 			if (!$pid) {
 				//! if no Person_ID was found, null is returned and the vue component will show a 404 View
 				return null;
 			}
-
 			$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter($uid);
 		} else
 			$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter($this->uid);
 
-
 		if (isError($isMitarbeiter)) {
 			//catch error
 		}
 		$isMitarbeiter = hasData($isMitarbeiter) ? getData($isMitarbeiter) : null;
 
-
 		$res = new stdClass();
 
 		if ($uid == $this->uid || !$uid) {
@@ -359,8 +325,6 @@ class Profil extends Auth_Controller
 
 			}
 		}
-
-
 		echo json_encode($res);
 
 	}
@@ -368,7 +332,7 @@ class Profil extends Auth_Controller
 	public function foto_sperre_function($value) //TODO: refactor function
 	{
 		//? Nur der Index User hat die Erlaubniss das Profilbild zu sperren 
-		$res = $this->PersonModel->update($this->pid, array("foto_sperre" => $value));
+		$res = $this->PersonModel->update($this->pid, ["foto_sperre" => $value]);
 
 		if (isError($res)) {
 			echo json_encode("error encountered when updating foto_sperre");
diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
index 44d9af5ea..feea69ac2 100755
--- a/application/controllers/Cis/ProfilUpdate.php
+++ b/application/controllers/Cis/ProfilUpdate.php
@@ -23,6 +23,7 @@ class ProfilUpdate extends Auth_Controller
 			'selectProfilRequest' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'insertFile' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'getProfilRequestFiles' => ['student/anrechnung_beantragen:r', 'user:r'],
+			"sendMailTest" => ['student/anrechnung_beantragen:r', 'user:r'],
 			
 			
 		]);
@@ -51,6 +52,28 @@ class ProfilUpdate extends Auth_Controller
 		$this->load->view('Cis/ProfilUpdate');
 	}
 
+	public function sendMailTest(){
+		$this->load->helper('hlp_sancho_helper');
+		$isStudent_res = $this->StudentModel->isStudent($this->uid);
+		if(!isSuccess($isStudent_res)){
+			show_error("was not able to check whether the uid is a student");
+		}
+		$isStudent_res = getData($isStudent_res);
+		if($isStudent_res){
+			//? Send email to the Studiengangsassistentinnen
+			$this->PersonModel->addSelect(["public.tbl_studiengang.email"]);
+			$this->PersonModel->addJoin("public.tbl_prestudent","public.tbl_person.person_id = public.tbl_prestudent.person_id");
+			$this->PersonModel->addJoin("public.tbl_studiengang","public.tbl_studiengang.studiengang_kz = public.tbl_prestudent.studiengang_kz");
+			$this->PersonModel->loadWhere(["public.tbl_person.person_id"=>$this->pid,"public.tbl_prestudent."]);
+			
+		}else{
+			//? user is not a student therefore he is a mitarbeiter, send email to Personalverwaltung
+		}
+		//$vorlage_kurzbz, $vorlage_data, $to, $subject
+		//sendSanchoMail("MessageMailTXT",["href"=>'test'],"simongschnell@gmail.com","subject");
+	}
+
+
 	public function show($dms_id){
 	
 		$profil_update = $this->ProfilUpdateModel->loadWhere(['attachment_id'=>$dms_id]);
@@ -263,9 +286,6 @@ class ProfilUpdate extends Auth_Controller
 		foreach($pending_changes as $update_request){
 			$existing_change = $update_request->requested_change;
 			
-			 
-			 
-
 			 //? the user can add as many new kontakt/adresse as he likes
 			 if( !isset($payload->add) && property_exists($existing_change,$identifier) && property_exists($payload,$identifier) && $existing_change->$identifier == $payload->$identifier){
 				//? the kontakt_id / adresse_id of a change has to be unique 
@@ -332,22 +352,25 @@ class ProfilUpdate extends Auth_Controller
 	}
 
 	
-	private function checkIfPermissionsContainStudentOE($student_uid){
+	private function getOE_from_student($student_uid){
 
-		$oe_berechtigung = $this->permissionlib->getOE_isEntitledFor('student/stammdaten');
-		
-		//? query that checks if the oe_berechtigungen is contained in the organisations_einheiten that are connected to the studiengang of the student
-		$query ="SELECT TRUE
+		//? returns the oe_einheit eines Studenten 
+		$query ="SELECT public.tbl_studiengang.oe_kurzbz
 		FROM public.tbl_student
-		JOIN public.tbl_prestudent ON public.tbl_student.prestudent_id = public.tbl_prestudent.prestudent_id
-		JOIN public.tbl_studiengang ON tbl_prestudent.studiengang_kz = public.tbl_studiengang.studiengang_kz
-		JOIN public.tbl_organisationseinheit ON public.tbl_organisationseinheit.oe_kurzbz = public.tbl_studiengang.oe_kurzbz
-		WHERE public.tbl_student.student_uid = ? AND public.tbl_studiengang.oe_kurzbz IN ?
-		LIMIT 1;";
-		//TODO: hardcoded student_uid replace with variable student_uid
-		$res = $this->StudentModel->execReadOnlyQuery($query,[$student_uid,$oe_berechtigung]);
-		return hasData($res) ? true : false;
+		JOIN public.tbl_studiengang ON tbl_student.studiengang_kz = public.tbl_studiengang.studiengang_kz
+		WHERE public.tbl_student.student_uid = ?;";
 		
+		$res = $this->StudentModel->execReadOnlyQuery($query,[$student_uid]);
+		if(!isSuccess($res)){
+			show_error("was not able to query the oe_einheit of Student: ".$student_uid);
+		}
+		$res = hasData($res) ? getData($res) : [];
+		$res = array_map(
+			function($item){
+			return $item->oe_kurzbz;
+			},$res
+		);
+		return $res;
 	}
 
 
@@ -378,8 +401,8 @@ class ProfilUpdate extends Auth_Controller
 		
 		//? check if the permissions are set correctly
 		if(
-			$this->permissionlib->isBerechtigt('student/stammdaten:rw') && $is_student_profil_update && $this->checkIfPermissionsContainStudentOE($uid) || 
-			$this->permissionlib->isBerechtigt('mitarbeiter/stammdaten:rw') && $is_mitarbeiter_profil_update 
+			$this->permissionlib->isBerechtigt('student/stammdaten',"suid",$this->getOE_from_student($uid)) && $is_student_profil_update || 
+			$this->permissionlib->isBerechtigt('mitarbeiter/stammdaten',"suid") && $is_mitarbeiter_profil_update 
 		)
 		{
 		
@@ -441,8 +464,8 @@ class ProfilUpdate extends Auth_Controller
 
 
 		if(
-			$this->permissionlib->isBerechtigt('student/stammdaten:rw') && $is_student_profil_update && $this->checkIfPermissionsContainStudentOE($uid) || 
-			$this->permissionlib->isBerechtigt('mitarbeiter/stammdaten:rw') && $is_mitarbeiter_profil_update 
+			$this->permissionlib->isBerechtigt('student/stammdaten',"suid",$this->getOE_from_student($uid)) && $is_student_profil_update || 
+			$this->permissionlib->isBerechtigt('mitarbeiter/stammdaten',"suid") && $is_mitarbeiter_profil_update 
 		)
 		{
 			echo json_encode($this->setStatusOnUpdateRequest($id, "rejected", $status_message));
diff --git a/application/models/person/Profil_update_model.php b/application/models/person/Profil_update_model.php
index 497da5621..c04935fce 100755
--- a/application/models/person/Profil_update_model.php
+++ b/application/models/person/Profil_update_model.php
@@ -88,6 +88,8 @@ class Profil_update_model extends DB_Model
 		$res =[];
 		
 		if($studentBerechtigung) {
+
+			
 			//? Nur wenn der/die AssistentIn auch die Berechtigung in der gleichen Organisationseinheit des Studenten hat
 			$parameters = [];
 			$query="
@@ -95,10 +97,9 @@ class Profil_update_model extends DB_Model
 			profil_update_id, tbl_profil_update.uid, (tbl_person.vorname || ' ' || tbl_person.nachname) AS name , topic, requested_change, tbl_profil_update.updateamum, tbl_profil_update.updatevon, tbl_profil_update.insertamum, tbl_profil_update.insertvon, status, status_timestamp, status_message, attachment_id 
 			FROM public.tbl_profil_update 
 			JOIN public.tbl_student ON public.tbl_student.student_uid=public.tbl_profil_update.uid
-			JOIN public.tbl_prestudent ON public.tbl_prestudent.prestudent_id=public.tbl_student.prestudent_id
-			JOIN public.tbl_person ON public.tbl_prestudent.person_id=public.tbl_person.person_id
-			JOIN public.tbl_studiengang ON public.tbl_studiengang.studiengang_kz=public.tbl_prestudent.studiengang_kz
-			JOIN public.tbl_organisationseinheit ON public.tbl_organisationseinheit.oe_kurzbz=public.tbl_studiengang.oe_kurzbz
+			JOIN public.tbl_benutzer ON public.tbl_benutzer.uid = public.tbl_student.student_uid
+			JOIN public.tbl_person ON public.tbl_benutzer.person_id=public.tbl_person.person_id
+			JOIN public.tbl_studiengang ON public.tbl_studiengang.studiengang_kz=public.tbl_student.studiengang_kz
 			Where public.tbl_studiengang.oe_kurzbz IN ? ";
 			$parameters[]=$oe_berechtigung;
 			if($whereClause){
diff --git a/public/js/apps/api/profilUpdate.js b/public/js/apps/api/profilUpdate.js
index a46a92c9d..b7fc3a644 100755
--- a/public/js/apps/api/profilUpdate.js
+++ b/public/js/apps/api/profilUpdate.js
@@ -89,6 +89,15 @@ export default {
     
         return axios.post(url, requestID);
       },
+
+      sendMailTest: function(){
+        const url =
+        FHC_JS_DATA_STORAGE_OBJECT.app_root +
+        FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+        `/Cis/ProfilUpdate/sendMailTest`;
+  
+        return axios.get(url);
+      },
     
     
 

From 279fbe51c357ef3af59436f29372848c81377db5 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 15 Feb 2024 14:24:07 +0100
Subject: [PATCH 0420/1461] sendMail function now gets all the studiengang
 emails of an active student or sends the mail to personalverwaltung if it is
 a mitarbeiter

---
 application/controllers/Cis/ProfilUpdate.php  | 32 ++++++++++++++++---
 .../Profil/ProfilComponents/EditKontakt.js    |  3 +-
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
index feea69ac2..a433997b5 100755
--- a/application/controllers/Cis/ProfilUpdate.php
+++ b/application/controllers/Cis/ProfilUpdate.php
@@ -54,6 +54,7 @@ class ProfilUpdate extends Auth_Controller
 
 	public function sendMailTest(){
 		$this->load->helper('hlp_sancho_helper');
+		
 		$isStudent_res = $this->StudentModel->isStudent($this->uid);
 		if(!isSuccess($isStudent_res)){
 			show_error("was not able to check whether the uid is a student");
@@ -61,13 +62,36 @@ class ProfilUpdate extends Auth_Controller
 		$isStudent_res = getData($isStudent_res);
 		if($isStudent_res){
 			//? Send email to the Studiengangsassistentinnen
-			$this->PersonModel->addSelect(["public.tbl_studiengang.email"]);
-			$this->PersonModel->addJoin("public.tbl_prestudent","public.tbl_person.person_id = public.tbl_prestudent.person_id");
-			$this->PersonModel->addJoin("public.tbl_studiengang","public.tbl_studiengang.studiengang_kz = public.tbl_prestudent.studiengang_kz");
-			$this->PersonModel->loadWhere(["public.tbl_person.person_id"=>$this->pid,"public.tbl_prestudent."]);
+			$this->StudentModel->addSelect(["public.tbl_studiengang.email"]);
+			$this->StudentModel->addJoin("public.tbl_benutzer","public.tbl_benutzer.uid = public.tbl_student.student_uid");
+			$this->StudentModel->addJoin("public.tbl_prestudent","public.tbl_benutzer.person_id = public.tbl_prestudent.person_id");
+			$this->StudentModel->addJoin("public.tbl_prestudentstatus","public.tbl_prestudentstatus.prestudent_id = public.tbl_prestudent.prestudent_id");
+			$this->StudentModel->addJoin("public.tbl_studiengang","public.tbl_studiengang.studiengang_kz = public.tbl_prestudent.studiengang_kz");
+			//? multiple checks
+			//* check if the benutzer itself is active
+			//* check if the student status is Student or Diplomand (active students)
+			$this->StudentModel->db->where_in("public.tbl_prestudentstatus.status_kurzbz",['Student','Diplomand']);
+			$res = $this->StudentModel->loadWhere(["public.tbl_benutzer.aktiv"=>TRUE,"public.tbl_student.student_uid"=>$this->uid]);
+			$res = hasData($res) ? getData($res) : null;
+			echo json_encode($res);
 			
 		}else{
+			
+			$this->MitarbeiterModel->addSelect([TRUE]);
+			$this->MitarbeiterModel->addJoin("public.tbl_benutzer","public.tbl_benutzer.uid = public.tbl_mitarbeiter.mitarbeiter_uid");
+			//? check if the the userID is a mitarbeiter and if the benutzer is active
+			$res = $this->MitarbeiterModel->loadWhere(["public.tbl_mitarbeiter.mitarbeiter_uid"=>$this->uid,"public.tbl_benutzer.aktiv"=>TRUE]);
+			if(!isSuccess($res)){
+				show_error("was not able to query the mitarbeiter and benutzer by the uid: ". $this->uid);
+			}
+			if(hasData($res)){
+				echo json_encode(MAIL_GST);
+			}else{
+				show_error("no Mitarbeiter with uid: ".$this->uid ." found");
+			}
+			
 			//? user is not a student therefore he is a mitarbeiter, send email to Personalverwaltung
+			//? use constant variable MAIL_GST to mail to the personalverwaltung
 		}
 		//$vorlage_kurzbz, $vorlage_data, $to, $subject
 		//sendSanchoMail("MessageMailTXT",["href"=>'test'],"simongschnell@gmail.com","subject");
diff --git a/public/js/components/Cis/Profil/ProfilComponents/EditKontakt.js b/public/js/components/Cis/Profil/ProfilComponents/EditKontakt.js
index 0624e7016..c042891b8 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/EditKontakt.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/EditKontakt.js
@@ -57,6 +57,7 @@ export default {
         this.zustellKontakteCount = this.zustellKontaktCount();
     },
     template:
+    /*html*/
     `
     
     <div class="gy-3 row align-items-center justify-content-center">    
@@ -96,7 +97,7 @@ export default {
         <!-- rendering KONTAKT emails -->
    
 
-        <div  class="form-underline">
+        <div class="form-underline">
         <div class="form-underline-titel">{{data.kontakttyp?data.kontakttyp:'Kontakt'}}</div>
     
         <input :disabled="data.kontakttyp?false:true"  class="form-control"   :value="data.kontakt" @input="updateValue($event,'kontakt')" :placeholder="data.kontakt">

From 6eeeb8b4b7725aef33382038cde38e222caa5326 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 15 Feb 2024 15:09:41 +0100
Subject: [PATCH 0421/1461] send email

---
 application/controllers/Cis/ProfilUpdate.php  |  11 +-
 .../models/person/Profil_update_model.php     | 124 +++++++++---------
 2 files changed, 70 insertions(+), 65 deletions(-)

diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
index a433997b5..e0085960f 100755
--- a/application/controllers/Cis/ProfilUpdate.php
+++ b/application/controllers/Cis/ProfilUpdate.php
@@ -54,6 +54,7 @@ class ProfilUpdate extends Auth_Controller
 
 	public function sendMailTest(){
 		$this->load->helper('hlp_sancho_helper');
+		$emails = [];
 		
 		$isStudent_res = $this->StudentModel->isStudent($this->uid);
 		if(!isSuccess($isStudent_res)){
@@ -76,7 +77,8 @@ class ProfilUpdate extends Auth_Controller
 			echo json_encode($res);
 			
 		}else{
-			
+			//? user is not a student therefore he is a mitarbeiter, send email to Personalverwaltung
+			//? use constant variable MAIL_GST to mail to the personalverwaltung
 			$this->MitarbeiterModel->addSelect([TRUE]);
 			$this->MitarbeiterModel->addJoin("public.tbl_benutzer","public.tbl_benutzer.uid = public.tbl_mitarbeiter.mitarbeiter_uid");
 			//? check if the the userID is a mitarbeiter and if the benutzer is active
@@ -85,16 +87,15 @@ class ProfilUpdate extends Auth_Controller
 				show_error("was not able to query the mitarbeiter and benutzer by the uid: ". $this->uid);
 			}
 			if(hasData($res)){
-				echo json_encode(MAIL_GST);
+				array_push($emails,MAIL_GST);
 			}else{
 				show_error("no Mitarbeiter with uid: ".$this->uid ." found");
 			}
 			
-			//? user is not a student therefore he is a mitarbeiter, send email to Personalverwaltung
-			//? use constant variable MAIL_GST to mail to the personalverwaltung
 		}
 		//$vorlage_kurzbz, $vorlage_data, $to, $subject
-		//sendSanchoMail("MessageMailTXT",["href"=>'test'],"simongschnell@gmail.com","subject");
+		$mail_res=sendSanchoMail("MessagecatchemMailTXT",["href"=>'test'],"ma0594@fh-technikum.at","test");
+		var_dump($mail_res);
 	}
 
 
diff --git a/application/models/person/Profil_update_model.php b/application/models/person/Profil_update_model.php
index c04935fce..7ed6fb659 100755
--- a/application/models/person/Profil_update_model.php
+++ b/application/models/person/Profil_update_model.php
@@ -10,11 +10,11 @@ class Profil_update_model extends DB_Model
 		parent::__construct();
 		$this->dbTable = 'public.tbl_profil_update';
 		$this->pk = ['profil_update_id'];
-        $this->hasSequence = true;
+		$this->hasSequence = true;
 
 
-		$this->load->model('crm/Student_model','StudentModel');
-		$this->load->model('ressource/Mitarbeiter_model','MitarbeiterModel');
+		$this->load->model('crm/Student_model', 'StudentModel');
+		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
 
 		$this->load->library('PermissionLib');
 	}
@@ -25,8 +25,9 @@ class Profil_update_model extends DB_Model
 	 * 
 	 * @param boolean $update: conditional whether to return insertamum or updateamum
 	 */
-	public function getTimestamp($id, $update=false){
-		$selectStatement = $update? 'updateamum' : 'insertamum';
+	public function getTimestamp($id, $update = false)
+	{
+		$selectStatement = $update ? 'updateamum' : 'insertamum';
 		$this->addSelect([$selectStatement]);
 		$res = $this->load([$id]);
 		return hasData($res) ? getData($res)[0]->$selectStatement : null;
@@ -41,37 +42,39 @@ class Profil_update_model extends DB_Model
 	 * @param boolean $profil_update_id primary key of the profil update request
 	 * @return Array 
 	 */
-	public function getFilesFromChangeRequest($profil_update_id){
+	public function getFilesFromChangeRequest($profil_update_id)
+	{
 		$this->addSelect(["requested_change"]);
 		$res = $this->load([$profil_update_id]);
 		$res = hasData($res) ? getData($res)[0] : null;
-		return json_decode($res->requested_change)->files?:[];
+		return json_decode($res->requested_change)->files ?: [];
 	}
 
 
 	//? queries the tbl_profil_updates without permissions of the user
-	public function getProfilUpdatesWhere($whereClause){
-		if(array_key_exists("uid",$whereClause)){
-			$whereClause["public.tbl_profil_update.uid"]= $whereClause["uid"];
+	public function getProfilUpdatesWhere($whereClause)
+	{
+		if (array_key_exists("uid", $whereClause)) {
+			$whereClause["public.tbl_profil_update.uid"] = $whereClause["uid"];
 			unset($whereClause["uid"]);
 		}
-		$this->addSelect(["public.tbl_profil_update.*","public.tbl_person.vorname"]);
-		$this->addJoin("public.tbl_benutzer","public.tbl_benutzer.uid = public.tbl_profil_update.uid");
-		$this->addJoin("public.tbl_person","public.tbl_person.person_id = public.tbl_benutzer.person_id");
+		$this->addSelect(["public.tbl_profil_update.*", "public.tbl_person.vorname"]);
+		$this->addJoin("public.tbl_benutzer", "public.tbl_benutzer.uid = public.tbl_profil_update.uid");
+		$this->addJoin("public.tbl_person", "public.tbl_person.person_id = public.tbl_benutzer.person_id");
 		$res = $this->loadWhere($whereClause);
-		if(isError($res)){
+		if (isError($res)) {
 			return error("Could not load public.tbl_profil_update with whereClause");
 		}
 		$res = hasData($res) ? getData($res) : [];
-		if($res){
-			foreach($res as $request){
+		if ($res) {
+			foreach ($res as $request) {
 				$this->formatProfilRequest($request);
 			}
 		}
 		return $res;
 
 	}
-	
+
 
 	/**
 	 * 
@@ -79,20 +82,21 @@ class Profil_update_model extends DB_Model
 	 * returns a profil update with id 
 	 * returns all profil updates if id is set to null
 	 */
-	public function getProfilUpdateWithPermission($whereClause=null){
-		
-		$studentBerechtigung = $this->permissionlib->isBerechtigt('student/stammdaten','s');
-		$mitarbeiterBerechtigung = $this->permissionlib->isBerechtigt('mitarbeiter/stammdaten','s');
-		$oe_berechtigung = $this->permissionlib->getOE_isEntitledFor('student/stammdaten');
-		
-		$res =[];
-		
-		if($studentBerechtigung) {
+	public function getProfilUpdateWithPermission($whereClause = null)
+	{
+
+		$studentBerechtigung = $this->permissionlib->isBerechtigt('student/stammdaten', 's');
+		$mitarbeiterBerechtigung = $this->permissionlib->isBerechtigt('mitarbeiter/stammdaten', 's');
+		$oe_berechtigung = $this->permissionlib->getOE_isEntitledFor('student/stammdaten');
+
+		$res = [];
+
+		if ($studentBerechtigung) {
+
 
-			
 			//? Nur wenn der/die AssistentIn auch die Berechtigung in der gleichen Organisationseinheit des Studenten hat
 			$parameters = [];
-			$query="
+			$query = "
 			SELECT
 			profil_update_id, tbl_profil_update.uid, (tbl_person.vorname || ' ' || tbl_person.nachname) AS name , topic, requested_change, tbl_profil_update.updateamum, tbl_profil_update.updatevon, tbl_profil_update.insertamum, tbl_profil_update.insertvon, status, status_timestamp, status_message, attachment_id 
 			FROM public.tbl_profil_update 
@@ -101,53 +105,53 @@ class Profil_update_model extends DB_Model
 			JOIN public.tbl_person ON public.tbl_benutzer.person_id=public.tbl_person.person_id
 			JOIN public.tbl_studiengang ON public.tbl_studiengang.studiengang_kz=public.tbl_student.studiengang_kz
 			Where public.tbl_studiengang.oe_kurzbz IN ? ";
-			$parameters[]=$oe_berechtigung;
-			if($whereClause){
-				foreach($whereClause as $key=>$value){
+			$parameters[] = $oe_berechtigung;
+			if ($whereClause) {
+				foreach ($whereClause as $key => $value) {
 					$parameters[] = $value;
-					$query .=  " AND ".$key." = ?";
-				} 
+					$query .= " AND " . $key . " = ?";
+				}
 			}
-			
-			$studentRequests =$this->execReadOnlyQuery($query,$parameters);
-			
-			if(isError($studentRequests)) return error("db error: ". getData($studentRequests));
-			$studentRequests = getData($studentRequests)?:[]; 
-			foreach($studentRequests as $request){
-				array_push($res,$request);
+
+			$studentRequests = $this->execReadOnlyQuery($query, $parameters);
+
+			if (isError($studentRequests))
+				return error("db error: " . getData($studentRequests));
+			$studentRequests = getData($studentRequests) ?: [];
+			foreach ($studentRequests as $request) {
+				array_push($res, $request);
 			}
 		}
-		if($mitarbeiterBerechtigung) {
+		if ($mitarbeiterBerechtigung) {
 			$this->addSelect(["profil_update_id", "tbl_profil_update.uid", "(tbl_person.vorname || ' ' || tbl_person.nachname) AS name", "topic", "requested_change", "tbl_profil_update.updateamum", "tbl_profil_update.updatevon", "tbl_profil_update.insertamum", "tbl_profil_update.insertvon", "status", "status_timestamp", "status_message", "attachment_id"]);
-			$this->addJoin('tbl_mitarbeiter','tbl_mitarbeiter.mitarbeiter_uid=tbl_profil_update.uid');
-			$this->addJoin('tbl_benutzer','tbl_benutzer.uid=tbl_profil_update.uid');
-			$this->addJoin('tbl_person','tbl_benutzer.person_id=tbl_person.person_id');
+			$this->addJoin('tbl_mitarbeiter', 'tbl_mitarbeiter.mitarbeiter_uid=tbl_profil_update.uid');
+			$this->addJoin('tbl_benutzer', 'tbl_benutzer.uid=tbl_profil_update.uid');
+			$this->addJoin('tbl_person', 'tbl_benutzer.person_id=tbl_person.person_id');
 			$mitarbeiterRequests = $this->loadWhere($whereClause);
-			if(isError($mitarbeiterRequests)) return error("db error: ". getData($mitarbeiterRequests));
-			$mitarbeiterRequests = getData($mitarbeiterRequests)?:[]; 
-			foreach($mitarbeiterRequests as $request){
-				array_push($res,$request);
+			if (isError($mitarbeiterRequests))
+				return error("db error: " . getData($mitarbeiterRequests));
+			$mitarbeiterRequests = getData($mitarbeiterRequests) ?: [];
+			foreach ($mitarbeiterRequests as $request) {
+				array_push($res, $request);
 			}
 		}
-		
-		
-	
-		if($res){
-			
-			foreach($res as $request){
+		if ($res) {
+
+			foreach ($res as $request) {
 				$this->formatProfilRequest($request);
 			}
 		}
-		
+
 		return $res;
 
 	}
 
-	private function formatProfilRequest($request){
-				$request->requested_change = json_decode($request->requested_change);
-				$request->insertamum = !is_null($request->insertamum)?date_create($request->insertamum)->format('d.m.Y'):null;
-				$request->updateamum = !is_null($request->updateamum)?date_create($request->updateamum)->format('d.m.Y'):null;
-				$request->status_timestamp = !is_null($request->status_timestamp)?date_create($request->status_timestamp)->format('d.m.Y'):null;
+	private function formatProfilRequest($request)
+	{
+		$request->requested_change = json_decode($request->requested_change);
+		$request->insertamum = !is_null($request->insertamum) ? date_create($request->insertamum)->format('d.m.Y') : null;
+		$request->updateamum = !is_null($request->updateamum) ? date_create($request->updateamum)->format('d.m.Y') : null;
+		$request->status_timestamp = !is_null($request->status_timestamp) ? date_create($request->status_timestamp)->format('d.m.Y') : null;
 	}
 
 }

From 34b995ed6d1ae26a7c6e7b1c17b13bd00a147755 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 15 Feb 2024 16:20:54 +0100
Subject: [PATCH 0422/1461] adds dms_kategorie for profil updates as an insert
 into statement in the dbupdate file

---
 public/js/components/Cis/Profil/EditProfil.js         |  1 +
 public/js/components/Cis/Profil/MitarbeiterProfil.js  |  3 +--
 .../Cis/Profil/ProfilComponents/QuickLinks.js         |  2 +-
 system/dbupdate_3.4/25999_C4_ma0594.php               | 11 ++++++++++-
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/public/js/components/Cis/Profil/EditProfil.js b/public/js/components/Cis/Profil/EditProfil.js
index 6c7093262..51322aa70 100755
--- a/public/js/components/Cis/Profil/EditProfil.js
+++ b/public/js/components/Cis/Profil/EditProfil.js
@@ -124,6 +124,7 @@ export default {
         :
         //? fresh insert of new attachment
         await Vue.$fhcapi.ProfilUpdate.insertFile(formData).then(res => {
+          console.log(res.data);
           return res.data?.map((file) => file.dms_id);
         })
         return result;
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 70bd8bbe6..418495119 100755
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -242,7 +242,7 @@ export default {
 
   },
 
-  template: ` 
+  template: /*html*/` 
  
   <div class="container-fluid text-break fhc-form"  >
     
@@ -253,7 +253,6 @@ export default {
               <div class="row mb-3">
                 <div class="col">
                 <!-- MOBILE QUICK LINKS -->     
-                  <quick-links :mobile="true"></quick-links>
                 </div>
               </div>
 
diff --git a/public/js/components/Cis/Profil/ProfilComponents/QuickLinks.js b/public/js/components/Cis/Profil/ProfilComponents/QuickLinks.js
index 7a78d2041..39f744c52 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/QuickLinks.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/QuickLinks.js
@@ -43,7 +43,7 @@ export default{
                
                  
    
-                <div @['show.bs.collapse']="collapseOpen=true;" @['hide.bs.collapse']="collapseOpen=false;" class="mt-1 collapse" id="quickLinks">
+                <div @[\`show.bs.collapse\`]="collapseOpen=true;" @[\`hide.bs.collapse\`]="collapseOpen=false;" class="mt-1 collapse" id="quickLinks">
                   
                   <div class="list-group">
                    
diff --git a/system/dbupdate_3.4/25999_C4_ma0594.php b/system/dbupdate_3.4/25999_C4_ma0594.php
index 12a8a68b6..f11cb135b 100755
--- a/system/dbupdate_3.4/25999_C4_ma0594.php
+++ b/system/dbupdate_3.4/25999_C4_ma0594.php
@@ -89,7 +89,16 @@
             echo '<br>public.tbl_profil_update: table created';
     }
 
-    
+    if(!$result = @$db->db_query("SELECT 1 FROM campus.tbl_dms_kategorie WHERE campus.tbl_dms_kategorie.kategorie_kurzbz = 'profil_aenderung' LIMIT 1"))
+    {
+      
+        $qry = "INSERT INTO campus.tbl_dms_kategorie VALUES ('profil_aenderung','Dokumente für Profil Änderungen','Dokumente die Belegen ob man eine neue Adresse angemeldet hat oder seinen Namen geändert hat','dokumente',NULL,NULL);";
+
+        if(!$db->db_query($qry))
+            echo '<strong>INSERT OF DMS_KATEGORIE profil_aenderung ERROR : '.$db->db_last_error().'</strong><br>';
+        else
+            echo '<br>INSERT OF DMS_KATEGORIE profil_aenderung was successful';
+    }
     //? would add a column if the column is missing in the table
   /*   if(!$result = @$db->db_query("SELECT topic FROM public.tbl_profil_update LIMIT 1"))
     {

From 6a5b2db79df8380c13a7d4a09f0e03f80c730734 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 15 Feb 2024 17:02:16 +0100
Subject: [PATCH 0423/1461] Start Actions New, Edit, Delete

---
 .../controllers/components/stv/Prestudent.php |  52 +-
 .../controllers/components/stv/Status.php     | 171 +++++
 application/models/crm/Prestudent_model.php   |   4 +
 .../Details/Prestudent/Status.js              | 692 ++++++++++++++----
 4 files changed, 774 insertions(+), 145 deletions(-)
 create mode 100644 application/controllers/components/stv/Status.php

diff --git a/application/controllers/components/stv/Prestudent.php b/application/controllers/components/stv/Prestudent.php
index 855d53a56..3851a0144 100644
--- a/application/controllers/components/stv/Prestudent.php
+++ b/application/controllers/components/stv/Prestudent.php
@@ -160,18 +160,6 @@ class Prestudent extends FHC_Controller
 		$this->outputJson(getData($result) ?: []);
 	}
 
-	public function getHistoryPrestudent($prestudent_id)
-	{
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-
-		$result = $this->PrestudentModel->getHistoryPrestudent($prestudent_id);
-		if (isError($result))
-		{
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-		}
-		$this->outputJson(getData($result) ?: []);
-	}
-
 	public function getBezeichnungZgv()
 	{
 		$this->load->model('codex/Zgv_model', 'ZgvModel');
@@ -268,5 +256,45 @@ class Prestudent extends FHC_Controller
 		$this->outputJson($result);
 	}
 
+	public function getStudiensemester()
+	{
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
+		$this->StudiensemesterModel->addOrder('start', 'DESC');
+		$this->StudiensemesterModel->addLimit(20);
+
+		$result = $this->StudiensemesterModel->load();
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+		}
+		$this->outputJson($result);
+	}
+
+	public function getStudienplaene($prestudent_id)
+	{
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+		$result = $this->PrestudentModel->loadWhere(
+			array('prestudent_id' => $prestudent_id)
+		);
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+		}
+
+		$result = current(getData($result));
+		$studiengang_kz = $result->studiengang_kz;
+
+		$this->load->model('organisation/Studienplan_model', 'StudienplanModel');
+
+		$this->StudienplanModel->addOrder('studienplan_id', 'DESC');
+
+		$result = $this->StudienplanModel->getStudienplaene($studiengang_kz);
+
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+		}
+		$this->outputJson($result);
+	}
+
 
 }
\ No newline at end of file
diff --git a/application/controllers/components/stv/Status.php b/application/controllers/components/stv/Status.php
new file mode 100644
index 000000000..fa0ea5a80
--- /dev/null
+++ b/application/controllers/components/stv/Status.php
@@ -0,0 +1,171 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+
+class Status extends FHC_Controller
+{
+	public function __construct()
+	{
+		parent::__construct();
+
+		// Load Libraries
+		$this->load->library('AuthLib');
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+
+		// Load language phrases
+		/*		$this->loadPhrases([
+					'ui'
+				]);*/
+	}
+
+	public function getHistoryPrestudent($prestudent_id)
+	{
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+		$result = $this->PrestudentModel->getHistoryPrestudent($prestudent_id);
+		if (isError($result))
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+		}
+		$this->outputJson(getData($result) ?: []);
+	}
+
+	public function getStatusgruende()
+	{
+		$this->load->model('crm/Statusgrund_model', 'StatusgrundModel');
+
+		$result = $this->StatusgrundModel->load();
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+		}
+		$this->outputJson($result);
+	}
+
+	public function addNewStatus($prestudent_id)
+	{
+/*		$this->load->library('form_validation');
+
+
+		if ($this->form_validation->run() == false)
+		{
+			return $this->outputJsonError($this->form_validation->error_array());
+		}*/
+
+		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
+
+		//var_dump($_POST);
+
+		$status_kurzbz = $this->input->post('status_kurzbz');
+		$ausbildungssemester = $this->input->post('ausbildungssemester');
+		$datum = $this->input->post('datum');
+		$bestaetigtam = $this->input->post('bestaetigtam');
+		$bewerbung_abgeschicktamum = $this->input->post('bewerbung_abgeschicktamum');
+		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
+		$studienplan_id = $this->input->post('studienplan_id');
+		$anmerkung  = $this->input->post('anmerkung ');
+		$statusgrund_id = $this->input->post('statusgrund_id');
+		$rt_stufe = $this->input->post('rt_stufe');
+		$bestaetigtvon = $this->input->post('bestaetigtvon');
+
+		// Start DB transaction
+		//$this->db->trans_start(false);
+
+		$result = $this->PrestudentstatusModel->insert(
+			[
+				'prestudent_id' => $prestudent_id,
+				'status_kurzbz' => $status_kurzbz,
+				'bewerbung_abgeschicktamum' => $bewerbung_abgeschicktamum,
+				'studiensemester_kurzbz' => $studiensemester_kurzbz,
+				'studienplan_id' => $studienplan_id,
+				'ausbildungssemester' => $ausbildungssemester,
+				'anmerkung' => $anmerkung,
+				'statusgrund_id' => $statusgrund_id,
+				'insertvon' => 'uid',
+				'insertamum' => date('c'),
+				'bestaetigtam' => $bestaetigtam,
+				'bestaetigtvon' => $bestaetigtvon,
+				'datum' => $datum,
+				'rt_stufe' => $rt_stufe
+			]
+		);
+		if (isError($result))
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson(getError($result));
+		}
+		return $this->outputJsonSuccess(true);
+	}
+
+	public function loadStatus()
+	{
+		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+
+		$prestudent_id = $this->input->post('prestudent_id');
+		$status_kurzbz = $this->input->post('status_kurzbz');
+		$ausbildungssemester = $this->input->post('ausbildungssemester');
+		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
+		//echo $prestudent_id . $status_kurzbz . $ausbildungssemester . $studiensemester_kurzbz;
+
+
+		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
+
+		$result = $this->PrestudentstatusModel->loadWhere(
+			array(
+				'prestudent_id' => $prestudent_id,
+				'status_kurzbz' => $status_kurzbz,
+				'ausbildungssemester' => $ausbildungssemester,
+				'studiensemester_kurzbz' => $studiensemester_kurzbz
+			)
+		);
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->outputJson($result);
+		}
+
+		elseif (!hasData($result)) {
+			$this->outputJson($result);
+		}
+		else
+		{
+			//var_dump($result);
+			$this->outputJsonSuccess(current(getData($result)));
+		}
+	}
+
+	public function deleteStatus()
+	{
+		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+
+		$prestudent_id = $this->input->post('prestudent_id');
+		$status_kurzbz = $this->input->post('status_kurzbz');
+		$ausbildungssemester = $this->input->post('ausbildungssemester');
+		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
+
+		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
+
+		$result = $this->PrestudentstatusModel->delete(
+			array(
+				'prestudent_id' => $prestudent_id,
+				'status_kurzbz' => $status_kurzbz,
+				'ausbildungssemester' => $ausbildungssemester,
+				'studiensemester_kurzbz' => $studiensemester_kurzbz
+			)
+		);
+
+		if (isError($result))
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->outputJson($result);
+		}
+		elseif (!hasData($result)) {
+			$this->outputJson($result);
+		}
+		return $this->outputJsonSuccess(current(getData($result)));
+	}
+
+
+
+}
diff --git a/application/models/crm/Prestudent_model.php b/application/models/crm/Prestudent_model.php
index a8dab8a6a..0d0399bed 100644
--- a/application/models/crm/Prestudent_model.php
+++ b/application/models/crm/Prestudent_model.php
@@ -754,8 +754,10 @@ class Prestudent_model extends DB_Model
 				ps.anmerkung,
 				ps.bestaetigtvon,
 				ps.insertamum,
+				TO_CHAR(ps.insertamum::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS format_insertamum,
 				ps.insertvon,
 				ps.updateamum,
+				TO_CHAR(ps.updateamum::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS format_updateamum,
 				ps.updatevon
 			FROM public.tbl_prestudentstatus ps
 			JOIN public.tbl_student st USING (prestudent_id)
@@ -768,6 +770,8 @@ class Prestudent_model extends DB_Model
 			ORDER BY datum DESC
 		";
 
+	//	var_dump($query);
+
 		return $this->execQuery($query, array($prestudent_id));
 	}
 }
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
index 777a94e9e..6acb6259b 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
@@ -1,9 +1,15 @@
 import {CoreFilterCmpt} from "../../../../filter/Filter.js";
 import {CoreRESTClient} from "../../../../../RESTClient";
+import BsModal from "../../../../Bootstrap/Modal.js";
+import FormForm from '../../../../Form/Form.js';
+import FormInput from '../../../../Form/Input.js';
 
 export default{
 	components: {
-		CoreFilterCmpt
+		CoreFilterCmpt,
+		BsModal,
+		FormForm,
+		FormInput,
 	},
 	props: {
 		prestudent_id: String
@@ -11,143 +17,562 @@ export default{
 	data() {
 		return {
 			tabulatorOptions: {
-				ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Prestudent/getHistoryPrestudent/' + this.prestudent_id),
+				ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Status/getHistoryPrestudent/' + this.prestudent_id),
 				//autoColumns: true,
-				columns:[
-					{title:"Kurzbz", field:"status_kurzbz"},
-					{title:"StSem", field:"studiensemester_kurzbz"},
-					{title:"Sem", field:"ausbildungssemester"},
-					{title:"Lehrverband", field:"lehrverband"},
-					{title:"Datum", field:"format_datum"},
-					{title:"Studienplan", field:"bezeichnung"},
-					{title:"BestätigtAm", field:"format_bestaetigtam"},
-					{title:"AbgeschicktAm", field:"format_bewerbung_abgeschicktamum"},
-					{title:"Statusgrund", field:"statusgrund_kurzbz"},
-					{title:"Organisationsform", field:"ps.orgform_kurzbz"},
-					{title:"PrestudentInId", field:"prestudent_id"},
-					{title:"StudienplanId", field:"studienplan_id"},
-					{title:"Anmerkung", field:"anmerkung"},
-					{title:"BestätigtVon", field:"bestaetigtvon"},
-					{title:"InsertAmUm", field:"insertamum"},
-					{title:"InsertVon", field:"insertvon"},
-					{title:"UpdateAmUm", field:"updateamum"},
-					{title:"UpdateVon", field:"updatevon"},
+				columns: [
+					{title: "Kurzbz", field: "status_kurzbz", tooltip: true},
+					{title: "StSem", field: "studiensemester_kurzbz"},
+					{title: "Sem", field: "ausbildungssemester"},
+					{title: "Lehrverband", field: "lehrverband"},
+					{title: "Datum", field: "format_datum"},
+					{title: "Studienplan", field: "bezeichnung"},
+					{title: "BestätigtAm", field: "format_bestaetigtam"},
+					{title: "AbgeschicktAm", field: "format_bewerbung_abgeschicktamum"},
+					{title: "Statusgrund", field: "statusgrund_kurzbz", visible: false},
+					{title: "Organisationsform", field: "ps.orgform_kurzbz", visible: false},
+					{title: "PrestudentInId", field: "prestudent_id", visible: false},
+					{title: "StudienplanId", field: "studienplan_id", visible: false},
+					{title: "Anmerkung", field: "anmerkung", visible: false},
+					{title: "BestätigtVon", field: "bestaetigtvon", visible: false},
+					{title: "InsertAmUm", field: "format_insertamum", visible: false},
+					{title: "InsertVon", field: "insertvon", visible: false},
+					{title: "UpdateAmUm", field: "format_updateamum", visible: false},
+					{title: "UpdateVon", field: "updatevon", visible: false},
+					{
+						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-forward"></i>';
+							button.title = 'Status vorrücken';
+							button.addEventListener('click', () =>
+								this.actionAdvanceStatus(cell.getData().status_kurzbz, cell.getData().studiensemester_kurzbz, cell.getData().ausbildungssemester)
+							);
+							container.append(button);
+
+							button = document.createElement('button');
+							button.className = 'btn btn-outline-secondary btn-action';
+							button.innerHTML = '<i class="fa fa-check"></i>';
+							button.title = 'Status bestätigen';
+							button.addEventListener('click', () =>
+								this.actionConfirmStatus(cell.getData().status_kurzbz, cell.getData().studiensemester_kurzbz, cell.getData().ausbildungssemester)
+							);
+							container.append(button);
+
+							button = document.createElement('button');
+							button.className = 'btn btn-outline-secondary btn-action';
+							button.innerHTML = '<i class="fa fa-edit"></i>';
+							button.title = 'Status bearbeiten';
+							button.addEventListener('click', (event) =>
+								this.actionEditStatus(cell.getData().status_kurzbz, cell.getData().studiensemester_kurzbz, cell.getData().ausbildungssemester)
+							);
+							container.append(button);
+
+							button = document.createElement('button');
+							button.className = 'btn btn-outline-secondary btn-action';
+							button.innerHTML = '<i class="fa fa-xmark"></i>';
+							button.title = 'Status löschen';
+							button.addEventListener('click', () =>
+								this.actionDeleteStatus(cell.getData().status_kurzbz, cell.getData().studiensemester_kurzbz, cell.getData().ausbildungssemester)
+							);
+							container.append(button);
+
+							return container;
+						},
+						frozen: true
+					},
 				],
 				layout: 'fitDataFill',
-				layoutColumnsOnNewData:	false,
-				height:	'auto',
-				selectable:	false,
-				rowClickMenu:[
-					{
-						label:"Bearbeiten",
-						action:function(e, row){
-							console.log("bearbeiten: " + row.getData().status_kurzbz + ' '  + row.getData().prestudent_id);
-						}
-					},
-					{
-						separator:true,
-					},
-					{
-						disabled:true,
-						label:"Status bestätigen",
-						action:function(e, column){
-							column.move("col");
-						}
-					},
-					{
-						separator:true,
-					},
-					{
-						disabled:true,
-						label:"Neuen Status hinzufügen",
-						action:function(e, column){
-							column.move("col");
-						}
-					},
-					{
-						separator:true,
-					},
-					{
-						disabled:true,
-						label:"Entfernen",
-						action:function(e, column){
-							column.move("col");
-						}
-					},
-					{
-						separator:true,
-					},
-					{
-						disabled:true,
-						label:"Status vorrücken",
-						action:function(e, column){
-							column.move("col");
-						}
-					},
-					{
-						separator:true,
-					},
-					{
-						label:"<i class='fas fa-check-square'></i> Select Row",
-						action:function(e, row){
-							row.select();
-						}
-					},
-				],
-/*				rowContextMenu:[
-					{
-						label:"Bearbeiten",
-						action:function(e, column){
-							console.log("bearbeiten" + column);
-							column.hide();
-						}
-					},
-					{
-						separator:true,
-					},
-					{
-						disabled:true,
-						label:"Status bestätigen",
-						action:function(e, column){
-							column.move("col");
-						}
-					},
-					{
-						separator:true,
-					},
-					{
-						disabled:true,
-						label:"Neuen Status hinzufügen",
-						action:function(e, column){
-							column.move("col");
-						}
-					},
-					{
-						separator:true,
-					},
-					{
-						disabled:true,
-						label:"Entfernen",
-						action:function(e, column){
-							column.move("col");
-						}
-					},
-					{
-						separator:true,
-					},
-					{
-						disabled:true,
-						label:"Status vorrücken",
-						action:function(e, column){
-							column.move("col");
-						}
-					},
-				]*/
+				layoutColumnsOnNewData: false,
+				height: 'auto',
+				selectable: false,
 			},
+			tabulatorEvents: [],
+			statusData: {},
+			listStudiensemester: [],
+			//maySem: [0,1,2,4,6,7],
+			maxSem:  Array.from({ length: 11 }, (_, index) => index),
+			listStudienplaene: [],
+			aufnahmestufen: {'': '-- keine Auswahl --', 1: 1, 2: 2, 3: 3},
+			listStatusgruende: []
 		}
 	},
+	computed: {
+		gruende() {
+			return this.listStatusgruende.filter(grund => grund.status_kurzbz == this.statusData.status_kurzbz);
+		},
+	},
+	methods:{
+		actionNewStatus(){
+			console.log("Action: Neuen Status hinzufügen");
+			this.$refs.newStatusModal.show();
+		},
+		actionEditStatus(status, stdsem, ausbildungssemester){
+			console.log("Action: Status bearbeiten: (" + status + ": " + stdsem + "/" + ausbildungssemester + ")")
+			this.loadStatus({
+				'prestudent_id': this.prestudent_id,
+				'status_kurzbz': status,
+				'studiensemester_kurzbz': stdsem,
+				'ausbildungssemester': ausbildungssemester
+			}).then(() => {
+				if(this.statusData)
+					this.$refs.editStatusModal.show();
+			});
+		},
+		actionDeleteStatus(status, stdsem, ausbildungssemester){
+			console.log("Action: Status löschen: (" + status + ": " + stdsem + "/" + ausbildungssemester + ")")
+			//this.$refs.deleteStatusModal.show();
+
+			this.loadStatus({
+				'prestudent_id': this.prestudent_id,
+				'status_kurzbz': status,
+				'studiensemester_kurzbz': stdsem,
+				'ausbildungssemester': ausbildungssemester
+			}).then(() => {
+				if(this.statusData)
+					this.$refs.deleteStatusModal.show();
+			});
+		},
+		actionAdvanceStatus(status, stdsem, ausbildungssemester){
+			console.log("Action: Status vorrücken: (" + status + ": " + stdsem + "/" + ausbildungssemester + ")")
+			//this.$refs.deleteStatusModal.show();
+
+			/*			this.loadStatus(status_id).then(() => {
+							if(this.statusData.bankverbindung_id)
+								this.$refs.deleteStatusModal.show();
+						});*/
+		},
+		actionConfirmStatus(status, stdsem, ausbildungssemester){
+			console.log("Action: Status bestätigen: (" + status + ": " + stdsem + "/" + ausbildungssemester + ")")
+			//this.$refs.deleteStatusModal.show();
+
+			/*			this.loadStatus(status_id).then(() => {
+							if(this.statusData.bankverbindung_id)
+								this.$refs.deleteStatusModal.show();
+						});*/
+		},
+		addNewStatus(statusData){
+			CoreRESTClient.post('components/stv/Status/addNewStatus/' + this.prestudent_id,
+				this.statusData
+		).then(response => {
+				if (!response.data.error) {
+					this.$fhcAlert.alertSuccess('Speichern erfolgreich');
+					this.hideModal('newStatusModal');
+					this.resetModal();
+				} else {
+					const errorData = response.data.retval;
+					Object.entries(errorData).forEach(entry => {
+						const [key, value] = entry;
+						this.$fhcAlert.alertError(value);
+					});
+				}
+			}).catch(error => {
+				this.$fhcAlert.alertError('Fehler bei Speichern Status aufgetreten');
+			}).finally(() => {
+				window.scrollTo(0, 0);
+				this.reload();
+			});
+		},
+		loadStatus(status_id){
+			return CoreRESTClient.post('components/stv/Status/loadStatus/',
+				status_id)
+				.then(
+					result => {
+						if(result.data.retval)
+							this.statusData = result.data.retval;
+						else
+						{
+							this.statusData = {};
+							this.$fhcAlert.alertError('Kein Status mit Id ' + status_id + ' gefunden');
+						}
+						return result;
+					}
+				);
+		},
+		reload(){
+			this.$refs.table.reloadTable();
+		},
+		hideModal(modalRef){
+			this.$refs[modalRef].hide();
+		},
+		resetModal(){
+			this.statusData = {};
+		},
+	},
+	created(){
+		CoreRESTClient
+			.get('components/stv/Prestudent/getStudiensemester')
+			.then(result => CoreRESTClient.getData(result.data) || [])
+			.then(result => {
+				this.listStudiensemester = result;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+		CoreRESTClient
+			.get('components/stv/Prestudent/getStudienplaene/' + this.prestudent_id)
+			.then(result => CoreRESTClient.getData(result.data) || [])
+			.then(result => {
+				this.listStudienplaene = result;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+		CoreRESTClient
+			.get('components/stv/Status/getStatusgruende/')
+			.then(result => CoreRESTClient.getData(result.data) || [])
+			.then(result => {
+				this.listStatusgruende = result;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+	},
 	template: `
 		<div class="stv-list h-100 pt-3">
+		
+		
+		<p>TestData</p>
+		{{statusData}}
+		
+			<!--Modal: Add New Status-->
+			<BsModal ref="newStatusModal">
+				<template #title>Neuen Status hinzufügen</template>
+				
+					<form-form class="row g-3" ref="statusData">
+					
+						<div class="row mb-3">
+							<label for="status_kurzbz" class="form-label col-sm-4">Rolle</label>
+							<div class="col-sm-6">
+<!--								<form-input type="text" :readonly="readonly" class="form-control" id="status_kurzbz" v-model="statusData['status_kurzbz']">-->
+								<form-input
+									required 
+									v-model="statusData['status_kurzbz']"
+									name="status_kurzbz"
+									type="select"
+									>
+									<option  value="Interessent">InteressentIn</option>
+									<option  value="Bewerber">BewerberIn</option>
+									<option  value="Aufgenommener">Aufgenommene/r</option>
+									<option  value="Student">StudentIn</option>
+									<option  value="Unterbrecher">UnterbrecherIn</option>
+									<option  value="Diplomand">DiplomandIn</option>
+									<option  value="Incoming">Incoming</option>
+								</form-input>
+							</div>
+						</div>
+						<div class="row mb-3">									   
+							<label for="studiensemester_kurzbz" class="form-label col-sm-4">Studiensemester</label>
+							<div class="col-sm-6">
+								<form-input 
+									:readonly="readonly" 
+									type="select"
+									name="studiensemester_kurzbz" 
+									v-model="statusData['studiensemester_kurzbz']"
+								> <!--TODO(manu) default aktueller Eintrag-->
+									<option v-for="sem in listStudiensemester" :key="sem.studiensemester_kurzbz" :value="sem.studiensemester_kurzbz">{{sem.studiensemester_kurzbz}}</option>
+								</form-input>
+							</div>
+						</div>
+						<!-- TODO(manu) if(defined('VORRUECKUNG_STATUS_MAX_SEMESTER') && VORRUECKUNG_STATUS_MAX_SEMESTER==false)-->
+						<div class="row mb-3">
+							<label for="ausbildungssemester" class="form-label col-sm-4">Ausbildungssemester</label>
+							<div class="col-sm-6">
+								<form-input 
+									type="select" 
+									:readonly="readonly" 
+									name="ausbildungssemester" 
+									v-model="statusData['ausbildungssemester']"
+								>
+								 <option v-for="number in maxSem" :key="number" :value="number">{{ number }}</option>
+								</form-input>
+							</div>
+						</div>
+						
+						<div class="row mb-3">
+							<label for="datum" class="form-label col-sm-4">Datum</label>
+							<div class="col-sm-6">
+								<form-input 
+									type="DatePicker" 
+									:readonly="readonly" 
+									name="datum" 
+									v-model="statusData['datum']"
+									auto-apply
+									:enable-time-picker="false"
+									format="dd.MM.yyyy"
+									preview-format="dd.MM.yyyy"
+									:teleport="true"
+								></form-input>
+							</div>
+						</div>
+						<div class="row mb-3">									   
+							<label for="bestaetigtam" class="form-label col-sm-4">Bestätigt am</label>
+							<div class="col-sm-6">
+								<form-input 
+									type="DatePicker" 
+									:readonly="readonly" 
+									name="datum" 
+									v-model="statusData['bestaetigtam']"
+									auto-apply
+									:enable-time-picker="false"
+									format="dd.MM.yyyy"
+									preview-format="dd.MM.yyyy"
+									:teleport="true"
+								></form-input>
+							</div>
+						</div>
+						<div class="row mb-3">
+							<label for="bewerbung_abgeschicktamum" class="form-label col-sm-4">B. abgeschickt am</label>
+							<div class="col-sm-6">
+								<form-input 
+									type="DatePicker" 
+									:readonly="readonly" 
+									name="datum" 
+									v-model="statusData['bewerbung_abgeschicktamum']"
+									auto-apply
+									:enable-time-picker="false"
+									format="dd.MM.yyyy"
+									preview-format="dd.MM.yyyy"
+									:teleport="true"
+								></form-input>
+							</div>
+						</div>
+						<div class="row mb-3">
+							<label for="bezeichnung" class="form-label col-sm-4">Studienplan</label>
+							<div class="col-sm-6">
+								<form-input 
+									:readonly="readonly" 
+									type="select"
+									name="studienplan" 
+									v-model="statusData['studienplan_id']"
+								>									
+									<option v-for="sp in listStudienplaene" :key="sp.studienplan_id" :value="sp.studienplan_id">{{sp.bezeichnung}}</option>
+								</form-input>
+							</div>
+						</div>
+						<div class="row mb-3">
+							<label for="anmerkung" class="form-label col-sm-4">Anmerkung</label>
+							<div class="col-sm-6">
+								<form-input 
+									type="text"
+									name="anmerkung" 
+									v-model="statusData['anmerkung']"
+								>									
+								</form-input>
+							</div>
+						</div>
+						
+						<div class="row mb-3">									   
+							<label for="aufnahmestufe" class="form-label col-sm-4">Aufnahmestufe</label>
+							<div class="col-sm-6">
+								<form-input 
+								type="select" 
+								:readonly="readonly" 
+								name="aufnahmestufe" 
+								v-model="statusData['rt_stufe']"
+								>
+								<option v-for="entry in aufnahmestufen" :key="entry" :value="entry">{{entry}}</option>
+								</form-input>
+							</div>
+						</div>
+						
+						<!--TODO(manu): ganzes Feld ausblenden, wenn kein Statusgrund?-->
+						<div class="row mb-3">
+							<label for="grund" class="form-label col-sm-4">Grund</label>
+							<div class="col-sm-6">
+								<form-input 
+									type="select" 
+									:readonly="readonly" 
+									name="statusgrund" 
+									v-model="statusData['statusgrund_id']"
+								>
+								<option v-for="grund in gruende" :key="grund.statusgrund_id" :value="grund.statusgrund_id">{{grund.beschreibung[0]}}</option>
+								</form-input>
+							</div>
+						</div>
+					
+					</form-form>
+					
+				<template #footer>
+						<button type="button" class="btn btn-primary" @click="addNewStatus()">OK</button>
+				</template>
+								
+			</BsModal>
+			
+			<!--Modal: Edit Status-->
+			<BsModal ref="editStatusModal">
+				<template #title>Status bearbeiten</template>
+					<form-form class="row g-3" ref="statusData">
+					
+						<div class="row mb-3">
+							<label for="status_kurzbz" class="form-label col-sm-4">Rolle</label>
+							<div class="col-sm-6">
+<!--								<form-input type="text" :readonly="readonly" class="form-control" id="status_kurzbz" v-model="statusData['status_kurzbz']">-->
+								<form-input
+									required 
+									v-model="statusData['status_kurzbz']"
+									name="status_kurzbz"
+									type="select"
+									>
+									<option  value="Interessent">InteressentIn</option>
+									<option  value="Bewerber">BewerberIn</option>
+									<option  value="Aufgenommener">Aufgenommene/r</option>
+									<option  value="Student">StudentIn</option>
+									<option  value="Unterbrecher">UnterbrecherIn</option>
+									<option  value="Diplomand">DiplomandIn</option>
+									<option  value="Incoming">Incoming</option>
+								</form-input>
+							</div>
+						</div>
+						<div class="row mb-3">									   
+							<label for="studiensemester_kurzbz" class="form-label col-sm-4">Studiensemester</label>
+							<div class="col-sm-6">
+								<form-input 
+									:readonly="readonly" 
+									type="select"
+									name="studiensemester_kurzbz" 
+									v-model="statusData['studiensemester_kurzbz']"
+								> <!--TODO(manu) default aktueller Eintrag-->
+									<option v-for="sem in listStudiensemester" :key="sem.studiensemester_kurzbz" :value="sem.studiensemester_kurzbz">{{sem.studiensemester_kurzbz}}</option>
+								</form-input>f
+							</div>
+						</div>
+						<!-- TODO(manu) if(defined('VORRUECKUNG_STATUS_MAX_SEMESTER') && VORRUECKUNG_STATUS_MAX_SEMESTER==false)-->
+						<div class="row mb-3">
+							<label for="ausbildungssemester" class="form-label col-sm-4">Ausbildungssemester</label>
+							<div class="col-sm-6">
+								<form-input 
+									type="select" 
+									:readonly="readonly" 
+									name="ausbildungssemester" 
+									v-model="statusData['ausbildungssemester']"
+								>
+								 <option v-for="number in maxSem" :key="number" :value="number">{{ number }}</option>
+								</form-input>
+							</div>
+						</div>
+						
+						<div class="row mb-3">
+							<label for="datum" class="form-label col-sm-4">Datum</label>
+							<div class="col-sm-6">
+								<form-input 
+									type="DatePicker" 
+									:readonly="readonly" 
+									name="datum" 
+									v-model="statusData['datum']"
+									auto-apply
+									:enable-time-picker="false"
+									format="dd.MM.yyyy"
+									preview-format="dd.MM.yyyy"
+									:teleport="true"
+								></form-input>
+							</div>
+						</div>
+						<div class="row mb-3">									   
+							<label for="bestaetigtam" class="form-label col-sm-4">Bestätigt am</label>
+							<div class="col-sm-6">
+								<form-input 
+									type="DatePicker" 
+									:readonly="readonly" 
+									name="datum" 
+									v-model="statusData['bestaetigtam']"
+									auto-apply
+									:enable-time-picker="false"
+									format="dd.MM.yyyy"
+									preview-format="dd.MM.yyyy"
+									:teleport="true"
+								></form-input>
+							</div>
+						</div>
+						<div class="row mb-3">
+							<label for="bewerbung_abgeschicktamum" class="form-label col-sm-4">B. abgeschickt am</label>
+							<div class="col-sm-6">
+								<form-input 
+									type="DatePicker" 
+									:readonly="readonly" 
+									name="datum" 
+									v-model="statusData['bewerbung_abgeschicktamum']"
+									auto-apply
+									:enable-time-picker="false"
+									format="dd.MM.yyyy"
+									preview-format="dd.MM.yyyy"
+									:teleport="true"
+								></form-input>
+							</div>
+						</div>
+						<div class="row mb-3">
+							<label for="bezeichnung" class="form-label col-sm-4">Studienplan</label>
+							<div class="col-sm-6">
+								<form-input 
+									:readonly="readonly" 
+									type="select"
+									name="studienplan" 
+									v-model="statusData['studienplan_id']"
+								>									
+									<option v-for="sp in listStudienplaene" :key="sp.studienplan_id" :value="sp.studienplan_id">{{sp.bezeichnung}}</option>
+								</form-input>
+							</div>
+						</div>
+						<div class="row mb-3">
+							<label for="anmerkung" class="form-label col-sm-4">Anmerkung</label>
+							<div class="col-sm-6">
+								<form-input 
+									type="text"
+									name="anmerkung" 
+									v-model="statusData['anmerkung']"
+								>									
+								</form-input>
+							</div>
+						</div>
+						
+						<div class="row mb-3">									   
+							<label for="aufnahmestufe" class="form-label col-sm-4">Aufnahmestufe</label>
+							<div class="col-sm-6">
+								<form-input 
+								type="select" 
+								:readonly="readonly" 
+								name="aufnahmestufe" 
+								v-model="statusData['rt_stufe']"
+								>
+								<option v-for="entry in aufnahmestufen" :key="entry" :value="entry">{{entry}}</option>
+								</form-input>
+							</div>
+						</div>
+						
+						<!--TODO(manu): ganzes Feld ausblenden, wenn kein Statusgrund?-->
+						<div class="row mb-3">
+							<label for="grund" class="form-label col-sm-4">Grund</label>
+							<div class="col-sm-6">
+								<form-input 
+									type="select" 
+									:readonly="readonly" 
+									name="statusgrund" 
+									v-model="statusData['statusgrund_id']"
+								>
+								<option v-for="grund in gruende" :key="grund.statusgrund_id" :value="grund.statusgrund_id">{{grund.beschreibung[0]}}</option>
+								</form-input>
+							</div>
+						</div>
+					
+					</form-form>
+					
+				<template #footer>
+						<button type="button" class="btn btn-primary" @click="editStatus()">OK</button>
+				</template>
+								
+			</BsModal>
+		
+			<!--Modal: Delete Status-->
+			<BsModal ref="deleteStatusModal">
+				<template #title>Status löschen</template> 
+				<template #default>
+					<p>Prestudentstatus {{statusData.status_kurzbz}} (id: {{statusData.prestudent_id}}  
+					/ {{statusData.studiensemester_kurzbz}}) im {{statusData.ausbildungssemester}}. Ausbildungssemester wirklich löschen?</p>
+				</template>									
+				<template #footer>
+					<button ref="Close" type="button" class="btn btn-primary" @click="deleteStatus()">OK</button>
+				</template>
+			</BsModal>
+			
+			
 			<core-filter-cmpt
 				ref="table"
 				:tabulator-options="tabulatorOptions"
@@ -156,9 +581,10 @@ export default{
 				:side-menu="false"
 				reload
 				new-btn-show
-				new-btn-label="Neu"
-				@click:new="actionNewAdress"
+				new-btn-label="Status"
+				@click:new="actionNewStatus"
 			>
 		</core-filter-cmpt>
+		
 		</div>`
-}
\ No newline at end of file
+};
\ No newline at end of file

From 501224b9b72a071f1ce584c5e8fc8f0e961c0690 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 16 Feb 2024 14:33:49 +0100
Subject: [PATCH 0424/1461] =?UTF-8?q?sends=20emails=20on=20insertion=20of?=
 =?UTF-8?q?=20an=20profil=20update=20to=20the=20studieng=C3=A4nge=20in=20c?=
 =?UTF-8?q?ase=20of=20students=20and=20to=20hr=20in=20case=20of=20a=20mita?=
 =?UTF-8?q?rbeiter?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/Cis/ProfilUpdate.php  | 145 ++++++++++--------
 public/js/apps/api/profilUpdate.js            |   7 -
 .../ProfilComponents/FetchProfilUpdates.js    |   2 +-
 system/dbupdate_3.4/25999_C4_ma0594.php       |   8 +-
 4 files changed, 83 insertions(+), 79 deletions(-)

diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
index e0085960f..7fa00e4ae 100755
--- a/application/controllers/Cis/ProfilUpdate.php
+++ b/application/controllers/Cis/ProfilUpdate.php
@@ -23,7 +23,6 @@ class ProfilUpdate extends Auth_Controller
 			'selectProfilRequest' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'insertFile' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'getProfilRequestFiles' => ['student/anrechnung_beantragen:r', 'user:r'],
-			"sendMailTest" => ['student/anrechnung_beantragen:r', 'user:r'],
 			
 			
 		]);
@@ -52,50 +51,77 @@ class ProfilUpdate extends Auth_Controller
 		$this->load->view('Cis/ProfilUpdate');
 	}
 
-	public function sendMailTest(){
+
+	private function sendEmail_onProfilUpdate_acceptionRejection($uid){
+
+	}
+
+
+	private function sendEmail_onProfilUpdate_insertion($uid,$topic){
 		$this->load->helper('hlp_sancho_helper');
 		$emails = [];
-		
-		$isStudent_res = $this->StudentModel->isStudent($this->uid);
-		if(!isSuccess($isStudent_res)){
-			show_error("was not able to check whether the uid is a student");
+
+		$isMitarbeiter_res = $this->MitarbeiterModel->isMitarbeiter($uid);
+		if(isError($isMitarbeiter_res)){
+			show_error("was not able to check whether ".$uid." is a mitarbeiter");
 		}
-		$isStudent_res = getData($isStudent_res);
-		if($isStudent_res){
-			//? Send email to the Studiengangsassistentinnen
-			$this->StudentModel->addSelect(["public.tbl_studiengang.email"]);
-			$this->StudentModel->addJoin("public.tbl_benutzer","public.tbl_benutzer.uid = public.tbl_student.student_uid");
-			$this->StudentModel->addJoin("public.tbl_prestudent","public.tbl_benutzer.person_id = public.tbl_prestudent.person_id");
-			$this->StudentModel->addJoin("public.tbl_prestudentstatus","public.tbl_prestudentstatus.prestudent_id = public.tbl_prestudent.prestudent_id");
-			$this->StudentModel->addJoin("public.tbl_studiengang","public.tbl_studiengang.studiengang_kz = public.tbl_prestudent.studiengang_kz");
-			//? multiple checks
-			//* check if the benutzer itself is active
-			//* check if the student status is Student or Diplomand (active students)
-			$this->StudentModel->db->where_in("public.tbl_prestudentstatus.status_kurzbz",['Student','Diplomand']);
-			$res = $this->StudentModel->loadWhere(["public.tbl_benutzer.aktiv"=>TRUE,"public.tbl_student.student_uid"=>$this->uid]);
-			$res = hasData($res) ? getData($res) : null;
-			echo json_encode($res);
-			
-		}else{
+		$isMitarbeiter_res = getData($isMitarbeiter_res);
+		
+		//! if the $uid is a mitarbeiter and student, only the hr is notified by email
+		if($isMitarbeiter_res){
 			//? user is not a student therefore he is a mitarbeiter, send email to Personalverwaltung
 			//? use constant variable MAIL_GST to mail to the personalverwaltung
 			$this->MitarbeiterModel->addSelect([TRUE]);
 			$this->MitarbeiterModel->addJoin("public.tbl_benutzer","public.tbl_benutzer.uid = public.tbl_mitarbeiter.mitarbeiter_uid");
 			//? check if the the userID is a mitarbeiter and if the benutzer is active
-			$res = $this->MitarbeiterModel->loadWhere(["public.tbl_mitarbeiter.mitarbeiter_uid"=>$this->uid,"public.tbl_benutzer.aktiv"=>TRUE]);
-			if(!isSuccess($res)){
-				show_error("was not able to query the mitarbeiter and benutzer by the uid: ". $this->uid);
+			$res = $this->MitarbeiterModel->loadWhere(["public.tbl_mitarbeiter.mitarbeiter_uid"=>$uid,"public.tbl_benutzer.aktiv"=>TRUE]);
+			if(isError($res)){
+				show_error("was not able to query the mitarbeiter and benutzer by the uid: ". $uid);
 			}
 			if(hasData($res)){
 				array_push($emails,MAIL_GST);
 			}else{
-				show_error("no Mitarbeiter with uid: ".$this->uid ." found");
+				show_error("no Mitarbeiter with uid: ".$uid ." found");
+			}
+		}else{
+			//? if it is not a mitarbeiter, check whether it is a student and send email to studiengang
+			$isStudent_res = $this->StudentModel->isStudent($uid);
+			if(isError($isStudent_res)){
+				show_error("was not able to check whether ".$uid." is a student");
+			}
+			$isStudent_res = getData($isStudent_res);
+			if($isStudent_res){
+				//? Send email to the Studiengangsassistentinnen
+				$this->StudentModel->addSelect(["public.tbl_studiengang.email"]);
+				$this->StudentModel->addJoin("public.tbl_benutzer","public.tbl_benutzer.uid = public.tbl_student.student_uid");
+				$this->StudentModel->addJoin("public.tbl_prestudent","public.tbl_benutzer.person_id = public.tbl_prestudent.person_id");
+				$this->StudentModel->addJoin("public.tbl_prestudentstatus","public.tbl_prestudentstatus.prestudent_id = public.tbl_prestudent.prestudent_id");
+				$this->StudentModel->addJoin("public.tbl_studiengang","public.tbl_studiengang.studiengang_kz = public.tbl_prestudent.studiengang_kz");
+				//* check if the benutzer itself is active
+				//* check if the student status is Student or Diplomand (active students)
+				$this->StudentModel->db->where_in("public.tbl_prestudentstatus.status_kurzbz",['Student','Diplomand']);
+				$res = $this->StudentModel->loadWhere(["public.tbl_benutzer.aktiv"=>TRUE,"public.tbl_student.student_uid"=>$uid]);
+				if(isError($res)){
+					show_error(getData($res));
+				}else{
+					$res = hasData($res) ? getData($res) : [];
+					foreach($res as $emailObj){
+						array_push($emails,$emailObj->email);
+					}
+				}
 			}
-			
 		}
-		//$vorlage_kurzbz, $vorlage_data, $to, $subject
-		$mail_res=sendSanchoMail("MessagecatchemMailTXT",["href"=>'test'],"ma0594@fh-technikum.at","test");
-		var_dump($mail_res);
+		$mail_res =[];
+		//? sending email
+		foreach($emails as $email){
+			array_push($mail_res,sendSanchoMail("profil_update",['uid'=>$uid,'topic'=>$topic,'href'=>'https://c3p0.ma0594.technikum-wien.at/fh-core/cis.php/Cis/ProfilUpdate'],$email,("Profil Änderung von ".$uid)));
+		}
+		foreach($mail_res as $m_res){
+			if(!$m_res){
+				show_error("error occured when sending email.");		
+			}
+		}
+		
 	}
 
 
@@ -136,8 +162,6 @@ class ProfilUpdate extends Auth_Controller
 	}
 
 
-
-
 	public function insertFile($replace){
 		$replace = json_decode($replace);
 		
@@ -183,8 +207,8 @@ class ProfilUpdate extends Auth_Controller
 				"insertamum"=>"NOW()",
 			];
 			
-            $tmp_res=$this->dmslib->upload($dms , 'files');
-			
+            $tmp_res=$this->dmslib->upload($dms , 'files', array("jpg", "png", "pdf"));
+			var_dump($tmp_res);
 			$tmp_res = hasData($tmp_res)? getData($tmp_res) : null;
 			array_push($res,$tmp_res);
 		}
@@ -193,7 +217,6 @@ class ProfilUpdate extends Auth_Controller
 	}
 
 
-
 	private function deleteOldVersionFile($dms_id){
 		if(!isset($dms_id)){
 			return;
@@ -218,9 +241,6 @@ class ProfilUpdate extends Auth_Controller
 		return $res;
 	}
 
-	
-
-
 
 	public function selectProfilRequest(){
 		$_GET = json_decode($this->input->raw_input_stream, true);
@@ -262,27 +282,18 @@ class ProfilUpdate extends Auth_Controller
 
 	public function insertProfilRequest()
 	{
-		//! deprecated code
-		//? Name of user is now queried in the database table model Profil_update_model.php
-		/* $name = $this->PersonModel->getFullName($this->uid);
-		if(isError($name)){
-			// error handling
-			var_dump($name);
-			return;
-		} */
-
 		$json = json_decode($this->input->raw_input_stream);
+
 		$payload = $json->payload;
-		
 		$identifier = property_exists($json->payload,"kontakt_id")? "kontakt_id" : (property_exists($json->payload,"adresse_id")? "adresse_id" : null);
 		
 		$data = ["topic"=>$json->topic,"uid" => $this->uid, "requested_change" => json_encode($payload), "insertamum" => "NOW()", "insertvon"=>$this->uid,"status"=>"pending" ];
+		
 		//? insert fileID in the dataset if sent with post request
 		if(isset($json->fileID)){
 			$data['attachment_id'] = $json->fileID;
 			
 		} 
-		
 
 		//? loops over all updateRequests from a user to validate if the new request is valid
 		$res = $this->ProfilUpdateModel->getProfilUpdatesWhere(["uid"=>$this->uid]);
@@ -293,49 +304,49 @@ class ProfilUpdate extends Auth_Controller
 			return;
 		 }
 		 
-		 //? if the user tries to delete a adresse, checks whether the adresse is a heimatadresse, if so an error is raised
-		 if( isset($payload->delete) && $identifier == "adresse_id"){
+		//? if the user tries to delete a adresse, checks whether the adresse is a heimatadresse, if so an error is raised
+		if( isset($payload->delete) && $identifier == "adresse_id"){
 			$adr = $this->AdresseModel->load($payload->$identifier);
 			$adr = getData($adr)[0];
 			if($adr->heimatadresse){
 				echo json_encode(error("cannot delete adresse marked as heimatadresse"));
 				return;
 			}
-			
-		 }
+		}
 
 		if($res){
 		$pending_changes = array_filter($res, function($element) {
 			return $element->status == 'pending';
 		});
+
 		foreach($pending_changes as $update_request){
 			$existing_change = $update_request->requested_change;
 			
-			 //? the user can add as many new kontakt/adresse as he likes
+			 //? the user can add as many new kontakte/adressen as he likes
 			 if( !isset($payload->add) && property_exists($existing_change,$identifier) && property_exists($payload,$identifier) && $existing_change->$identifier == $payload->$identifier){
 				//? the kontakt_id / adresse_id of a change has to be unique 
 				echo json_encode(error("cannot change the same resource twice"));
 				return;
 			}
 			
+			//? if it is not updating any kontakt/adresse, the topic has to be unique
 			elseif(!$identifier && $update_request->topic == $json->topic ){
-				//? if it is not a delete or add request than the topic has to be unique
 				echo json_encode(error("A request to change " . $json->topic . " is already open"));
 				return;
 			}
 		}}
 		
-			$insertID = $this->ProfilUpdateModel->insert($data);
-				
-			if(isError($insertID)){
-				//catch error
-			}else{
-				$insertID = hasData($insertID)? getData($insertID): null;
-				$editTimestamp = $this->ProfilUpdateModel->getTimestamp($insertID);
-				
-				$date = success(date_create($editTimestamp)->format('d.m.Y'));
-				echo json_encode($date);
-			}
+		$insertID = $this->ProfilUpdateModel->insert($data);
+			
+		if(isError($insertID)){
+			show_error(getData($insertID));
+		}else{
+			$insertID = hasData($insertID)? getData($insertID): null;
+			
+			//? sends emails to the correspondents of the $uid
+			$this->sendEmail_onProfilUpdate_insertion($this->uid,$json->topic);
+			echo json_encode($insertID);
+		}
 	}
 
 	public function updateProfilRequest()
diff --git a/public/js/apps/api/profilUpdate.js b/public/js/apps/api/profilUpdate.js
index b7fc3a644..e432b16cb 100755
--- a/public/js/apps/api/profilUpdate.js
+++ b/public/js/apps/api/profilUpdate.js
@@ -90,14 +90,7 @@ export default {
         return axios.post(url, requestID);
       },
 
-      sendMailTest: function(){
-        const url =
-        FHC_JS_DATA_STORAGE_OBJECT.app_root +
-        FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-        `/Cis/ProfilUpdate/sendMailTest`;
   
-        return axios.get(url);
-      },
     
     
 
diff --git a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
index 3aed5d62f..add17735e 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
@@ -148,7 +148,7 @@ export default {
                 <tr v-for="item in data" :style="item.status=='accepted'?'background-color:lightgreen':item.status==='rejected'?'background-color:lightcoral':''">
                 <td class="align-middle text-wrap ">{{item.topic}}</td>
                 <td class="align-middle " >{{item.status}}</td>
-                <td class="align-middle">{{item.status_timestamp}}</td>
+                <td class="align-middle">{{item.status_timestamp?item.status_timestamp:item.insertamum}}</td>
                 
                 <template v-if="item.status === 'pending'">
                 <td>
diff --git a/system/dbupdate_3.4/25999_C4_ma0594.php b/system/dbupdate_3.4/25999_C4_ma0594.php
index f11cb135b..2000669ac 100755
--- a/system/dbupdate_3.4/25999_C4_ma0594.php
+++ b/system/dbupdate_3.4/25999_C4_ma0594.php
@@ -1,6 +1,6 @@
 <?php
     
-    if(!$result = @$db->db_query("SELECT 1 FROM public.tbl_profil_update_status LIMIT 1"))
+     if(!$result = @$db->db_query("SELECT 1 FROM public.tbl_profil_update_status LIMIT 1"))
     {
 
         $qry = " CREATE TABLE public.tbl_profil_update_status (
@@ -88,10 +88,10 @@
         else
             echo '<br>public.tbl_profil_update: table created';
     }
-
-    if(!$result = @$db->db_query("SELECT 1 FROM campus.tbl_dms_kategorie WHERE campus.tbl_dms_kategorie.kategorie_kurzbz = 'profil_aenderung' LIMIT 1"))
+ 
+    if(!$result = @$db->db_query("SELECT 1 FROM campus.tbl_dms_kategorie WHERE kategorie_kurzbz = 'profil_aenderung' LIMIT 1"))
     {
-      
+      echo "HELLLOUUU";
         $qry = "INSERT INTO campus.tbl_dms_kategorie VALUES ('profil_aenderung','Dokumente für Profil Änderungen','Dokumente die Belegen ob man eine neue Adresse angemeldet hat oder seinen Namen geändert hat','dokumente',NULL,NULL);";
 
         if(!$db->db_query($qry))

From 318087c572149cfcd7599c19a6bf6409e0c65b29 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 16 Feb 2024 15:37:20 +0100
Subject: [PATCH 0425/1461] sends email to the user if a profil update was
 accepted or rejected

---
 application/controllers/Cis/ProfilUpdate.php  | 22 ++++++++++---------
 public/js/components/Cis/Profil/EditProfil.js |  9 +-------
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
index 7fa00e4ae..550bd3595 100755
--- a/application/controllers/Cis/ProfilUpdate.php
+++ b/application/controllers/Cis/ProfilUpdate.php
@@ -52,8 +52,13 @@ class ProfilUpdate extends Auth_Controller
 	}
 
 
-	private function sendEmail_onProfilUpdate_acceptionRejection($uid){
-
+	private function sendEmail_onProfilUpdate_response($uid,$topic,$status){
+		$this->load->helper('hlp_sancho_helper');
+		$email = $uid . "@" . DOMAIN;
+		$mail_res = sendSanchoMail("profil_update_response",['topic'=>$topic,'status'=>$status,'href'=>'https://c3p0.ma0594.technikum-wien.at/fh-core/cis.php/Cis/Profil'],$email,("Profil Änderung ".$status));
+		if(!$mail_res){
+			show_error("failed to send email to " . $email);
+		}
 	}
 
 
@@ -208,7 +213,6 @@ class ProfilUpdate extends Auth_Controller
 			];
 			
             $tmp_res=$this->dmslib->upload($dms , 'files', array("jpg", "png", "pdf"));
-			var_dump($tmp_res);
 			$tmp_res = hasData($tmp_res)? getData($tmp_res) : null;
 			array_push($res,$tmp_res);
 		}
@@ -345,7 +349,7 @@ class ProfilUpdate extends Auth_Controller
 			
 			//? sends emails to the correspondents of the $uid
 			$this->sendEmail_onProfilUpdate_insertion($this->uid,$json->topic);
-			echo json_encode($insertID);
+			echo json_encode(success($insertID));
 		}
 	}
 
@@ -364,10 +368,7 @@ class ProfilUpdate extends Auth_Controller
 			//catch error
 		}else{
 			$updateID = hasData($updateID)? getData($updateID)[0]: null;
-			$editTimestamp = $this->ProfilUpdateModel->getTimestamp($updateID,true);
-			
-			$date = success(date_create($editTimestamp)->format('d.m.Y')); 
-			echo json_encode($date);
+			echo json_encode(success($updateID));
 		}
 	}
 
@@ -479,7 +480,7 @@ class ProfilUpdate extends Auth_Controller
 				return;
 			}
 		}
-
+		$this->sendEmail_onProfilUpdate_response($uid,$topic,"accepted");
 		echo json_encode($this->setStatusOnUpdateRequest($id, "accepted", $status_message, $requested_change));
 	}else{
 		show_error("You have not the necessary permissions to accept this profil_update");
@@ -493,6 +494,7 @@ class ProfilUpdate extends Auth_Controller
 		$_POST = json_decode($this->input->raw_input_stream,true);
 		$id = $this->input->post('profil_update_id',true);
 		$uid = $this->input->post('uid',true);
+		$topic = $this->input->post('topic',true);
 		$status_message = $this->input->post('status_message',true);
 
 		$is_mitarbeiter_profil_update = getData($this->MitarbeiterModel->isMitarbeiter($uid));
@@ -504,6 +506,7 @@ class ProfilUpdate extends Auth_Controller
 			$this->permissionlib->isBerechtigt('mitarbeiter/stammdaten',"suid") && $is_mitarbeiter_profil_update 
 		)
 		{
+			$this->sendEmail_onProfilUpdate_response($uid,$topic,"rejected");
 			echo json_encode($this->setStatusOnUpdateRequest($id, "rejected", $status_message));
 		}else{
 			show_error("You have not the necessary permissions to accept this profil_update");
@@ -554,7 +557,6 @@ class ProfilUpdate extends Auth_Controller
 		else{
 			$requested_change['updateamum']="NOW()";
 			$requested_change['updatevon']=getAuthUID();
-			var_dump($requested_change);
 			
 			$update_kontakt_id = $this->KontaktModel->update($kontakt_id,$requested_change);
 
diff --git a/public/js/components/Cis/Profil/EditProfil.js b/public/js/components/Cis/Profil/EditProfil.js
index 51322aa70..d72925639 100755
--- a/public/js/components/Cis/Profil/EditProfil.js
+++ b/public/js/components/Cis/Profil/EditProfil.js
@@ -103,14 +103,7 @@ export default {
       }
     },
 
-    uploadFiles: async function (files) {
-      let updatedFiles = [];
-
-      if (this.editData.updateID) {
-        
-      }
-
-      
+    uploadFiles: async function (files) {  
       
       if (files[0].type !== "application/x.fhc-dms+json"){
         let formData = new FormData();

From 2d5aea2bb8b916bb364e0ab0e37668190b60b602 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 19 Feb 2024 09:14:45 +0100
Subject: [PATCH 0426/1461] translates the english status into a german version
 for the email vorlage

---
 application/controllers/Cis/ProfilUpdate.php         | 9 ++++++++-
 public/js/components/Cis/Profil/MitarbeiterProfil.js | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
index 550bd3595..df7dd4ae8 100755
--- a/application/controllers/Cis/ProfilUpdate.php
+++ b/application/controllers/Cis/ProfilUpdate.php
@@ -53,12 +53,18 @@ class ProfilUpdate extends Auth_Controller
 
 
 	private function sendEmail_onProfilUpdate_response($uid,$topic,$status){
+		
 		$this->load->helper('hlp_sancho_helper');
 		$email = $uid . "@" . DOMAIN;
-		$mail_res = sendSanchoMail("profil_update_response",['topic'=>$topic,'status'=>$status,'href'=>'https://c3p0.ma0594.technikum-wien.at/fh-core/cis.php/Cis/Profil'],$email,("Profil Änderung ".$status));
+		
+		//? translation of the english version of the status to german
+		$status_de = $status == 'accepted' ? 'akzeptiert' : 'abgelehnt';
+
+		$mail_res = sendSanchoMail("profil_update_response",['topic'=>$topic,'status_de'=>$status_de,'status_en'=>$status,'href'=>'https://c3p0.ma0594.technikum-wien.at/fh-core/cis.php/Cis/Profil'],$email,("Profil Änderung ".$status));
 		if(!$mail_res){
 			show_error("failed to send email to " . $email);
 		}
+		var_dump($mail_res);
 	}
 
 
@@ -481,6 +487,7 @@ class ProfilUpdate extends Auth_Controller
 			}
 		}
 		$this->sendEmail_onProfilUpdate_response($uid,$topic,"accepted");
+		
 		echo json_encode($this->setStatusOnUpdateRequest($id, "accepted", $status_message, $requested_change));
 	}else{
 		show_error("You have not the necessary permissions to accept this profil_update");
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 418495119..818858473 100755
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -243,7 +243,7 @@ export default {
   },
 
   template: /*html*/` 
- 
+ <pre>test</pre>
   <div class="container-fluid text-break fhc-form"  >
     
           <div class="row">

From 2e9cc2b2912d8fccd6e899a77a8794e2e884828c Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 19 Feb 2024 14:36:45 +0100
Subject: [PATCH 0427/1461] /ProfilUpdate/id/ was added to the ProfilUpdate
 controller to automatically open the necessary profil_update on startup of
 the page, this functionality is used when sending emails with the link to the
 profil_update

---
 application/controllers/Cis/ProfilUpdate.php  |  20 +-
 application/views/Cis/ProfilUpdate.php        |   3 +-
 public/js/apps/Cis/ProfilUpdateRequests.js    | 264 +---------------
 public/js/components/Cis/Profil/EditProfil.js |   1 +
 .../Cis/Profil/MitarbeiterProfil.js           |   1 -
 .../Cis/ProfilUpdate/ProfilUpdateView.js      | 297 ++++++++++++++++++
 6 files changed, 318 insertions(+), 268 deletions(-)
 create mode 100644 public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js

diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
index df7dd4ae8..a16248a3b 100755
--- a/application/controllers/Cis/ProfilUpdate.php
+++ b/application/controllers/Cis/ProfilUpdate.php
@@ -12,6 +12,7 @@ class ProfilUpdate extends Auth_Controller
 	public function __construct(){
 		parent::__construct([
 			'index' => ['student/stammdaten:r','mitarbeiter/stammdaten:r'],
+			'id' => ['student/stammdaten:r','mitarbeiter/stammdaten:r'],
 			'getProfilUpdateWithPermission' => ['student/stammdaten:r','mitarbeiter/stammdaten:r'],
 			'acceptProfilRequest'=>['student/stammdaten:rw','mitarbeiter/stammdaten:rw'],
 			'denyProfilRequest'=>['student/stammdaten:rw','mitarbeiter/stammdaten:rw'],
@@ -25,6 +26,7 @@ class ProfilUpdate extends Auth_Controller
 			'getProfilRequestFiles' => ['student/anrechnung_beantragen:r', 'user:r'],
 			
 			
+			
 		]);
 		
 
@@ -51,6 +53,9 @@ class ProfilUpdate extends Auth_Controller
 		$this->load->view('Cis/ProfilUpdate');
 	}
 
+	public function id($profil_update_id=null){
+		$this->load->view('Cis/ProfilUpdate',['profil_update_id'=>$profil_update_id]);
+	}
 
 	private function sendEmail_onProfilUpdate_response($uid,$topic,$status){
 		
@@ -60,15 +65,15 @@ class ProfilUpdate extends Auth_Controller
 		//? translation of the english version of the status to german
 		$status_de = $status == 'accepted' ? 'akzeptiert' : 'abgelehnt';
 
-		$mail_res = sendSanchoMail("profil_update_response",['topic'=>$topic,'status_de'=>$status_de,'status_en'=>$status,'href'=>'https://c3p0.ma0594.technikum-wien.at/fh-core/cis.php/Cis/Profil'],$email,("Profil Änderung ".$status));
+		$mail_res = sendSanchoMail("profil_update_response",['topic'=>$topic,'status_de'=>$status_de,'status_en'=>$status,'href'=>APP_ROOT.'Cis/Profil'],$email,("Profil Änderung ".$status));
 		if(!$mail_res){
 			show_error("failed to send email to " . $email);
 		}
-		var_dump($mail_res);
 	}
 
 
-	private function sendEmail_onProfilUpdate_insertion($uid,$topic){
+	private function sendEmail_onProfilUpdate_insertion($uid,$profil_update_id,$topic){
+		
 		$this->load->helper('hlp_sancho_helper');
 		$emails = [];
 
@@ -125,7 +130,7 @@ class ProfilUpdate extends Auth_Controller
 		$mail_res =[];
 		//? sending email
 		foreach($emails as $email){
-			array_push($mail_res,sendSanchoMail("profil_update",['uid'=>$uid,'topic'=>$topic,'href'=>'https://c3p0.ma0594.technikum-wien.at/fh-core/cis.php/Cis/ProfilUpdate'],$email,("Profil Änderung von ".$uid)));
+			array_push($mail_res,sendSanchoMail("profil_update",['uid'=>$uid,'topic'=>$topic,'href'=>APP_ROOT.'Cis/ProfilUpdate/id/'.$profil_update_id],$email,("Profil Änderung von ".$uid)));
 		}
 		foreach($mail_res as $m_res){
 			if(!$m_res){
@@ -153,7 +158,7 @@ class ProfilUpdate extends Auth_Controller
 			{
 				// Get file to be downloaded from DMS
 				$newFilename= $this->uid."/document_".$dms_id;
-				$download = $this->dmslib->download($dms_id, $newFilename);
+				$download = $this->dmslib->download($dms_id);
 				if (isError($download)) return $download;
 				
 				// Download file
@@ -219,6 +224,7 @@ class ProfilUpdate extends Auth_Controller
 			];
 			
             $tmp_res=$this->dmslib->upload($dms , 'files', array("jpg", "png", "pdf"));
+			
 			$tmp_res = hasData($tmp_res)? getData($tmp_res) : null;
 			array_push($res,$tmp_res);
 		}
@@ -292,6 +298,7 @@ class ProfilUpdate extends Auth_Controller
 
 	public function insertProfilRequest()
 	{
+		
 		$json = json_decode($this->input->raw_input_stream);
 
 		$payload = $json->payload;
@@ -354,7 +361,7 @@ class ProfilUpdate extends Auth_Controller
 			$insertID = hasData($insertID)? getData($insertID): null;
 			
 			//? sends emails to the correspondents of the $uid
-			$this->sendEmail_onProfilUpdate_insertion($this->uid,$json->topic);
+			$this->sendEmail_onProfilUpdate_insertion($this->uid,$insertID,$json->topic);
 			echo json_encode(success($insertID));
 		}
 	}
@@ -374,6 +381,7 @@ class ProfilUpdate extends Auth_Controller
 			//catch error
 		}else{
 			$updateID = hasData($updateID)? getData($updateID)[0]: null;
+			//TODO: should an email be sent to the responsable people when the user changes his profil update
 			echo json_encode(success($updateID));
 		}
 	}
diff --git a/application/views/Cis/ProfilUpdate.php b/application/views/Cis/ProfilUpdate.php
index 1c50bf458..ff303b159 100755
--- a/application/views/Cis/ProfilUpdate.php
+++ b/application/views/Cis/ProfilUpdate.php
@@ -8,8 +8,9 @@ $includesArray = ['title'=> 'Profil Änderungen',
 $this->load->view('templates/CISHTML-Header',$includesArray);
 ?>
 
-<div id="content">
 
+<div id="content">
+<profil-update-view id="<?php echo isset($profil_update_id)?$profil_update_id:null ?>"></profil-update-view>
 </div>
 
 <?php $this->load->view('templates/CISHTML-Footer',$includesArray); ?>
\ No newline at end of file
diff --git a/public/js/apps/Cis/ProfilUpdateRequests.js b/public/js/apps/Cis/ProfilUpdateRequests.js
index cfc824b90..5132b84bb 100755
--- a/public/js/apps/Cis/ProfilUpdateRequests.js
+++ b/public/js/apps/Cis/ProfilUpdateRequests.js
@@ -1,275 +1,19 @@
 import fhcapifactory from "../api/fhcapifactory.js";
-import { CoreFilterCmpt } from "../../components/filter/Filter.js";
-import AcceptDenyUpdate from "../../components/Cis/ProfilUpdate/AcceptDenyUpdate.js";
-import Alert from "../../components/Bootstrap/Alert.js";
+import ProfilUpdateView from "../../components/Cis/ProfilUpdate/ProfilUpdateView.js";
 Vue.$fhcapi = fhcapifactory;
 
-const sortProfilUpdates = (ele1, ele2) => {
-  let result = 0;
-  if (ele1.status === "pending") {
-    result = -1;
-  } else if (ele1.status === "accepted") {
-    result = ele2.status === "rejected" ? -1 : 1;
-  } else {
-    result = 1;
-  }
-  //? if they have the same status the insert date is used for ordering
-  if (ele1.status === ele2.status) {
-    result =
-      new Date(ele2.insertamum.split(".").reverse().join("-")) -
-      new Date(ele1.insertamum.split(".").reverse().join("-"));
-  }
-  return result;
-};
+
 
 const app = Vue.createApp({
   components: {
-    CoreFilterCmpt,
+    ['profil-update-view']:ProfilUpdateView
+    
   },
   data() {
     return {
-      showAll: false,
-      
-      profil_updates_table_options: {
-        ajaxURL:
-          FHC_JS_DATA_STORAGE_OBJECT.app_root +
-          FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-          `/Cis/ProfilUpdate/`,
-
-        ajaxURLGenerator: (url, config, params) => {
-          //? this function needs to be an array function in order to access the this properties of the Vue component
-          if (this.showAll) {
-            return url + "getProfilUpdateWithPermission";
-          } else {
-            return url + "getProfilUpdateWithPermission/pending";
-          }
-        },
-        ajaxResponse: function (url, params, response) {
-          //url - the URL of the request
-          //params - the parameters passed with the request
-          //response - the JSON object returned in the body of the response.
-          //? sorts the response data from the backend
-          if (response) response.sort(sortProfilUpdates);
-
-          return response;
-        },
-        //? adds tooltip with the status message of a profil update request if its status is not pending
-        columnDefaults: {
-          tooltip: (e, cell, onRendered) =>{
-            //e - mouseover event
-            //cell - cell component
-            //onRendered - onRendered callback registration function
-            let statusMessage = cell.getData().status_message;
-            let statusDate = cell.getData().status_timestamp;
-            let status = cell.getData().status;
-            if (!statusMessage) {
-              return null;
-            }
-            let el = document.createElement("div");
-            el.classList.add("border", "border-dark");
-
-            let statusDateEl = document.createElement("span");
-            statusDateEl.classList.add("d-block","mb-1");
-            statusDateEl.innerHTML =
-              "Request was " + status + " on " + statusDate;
-            let statusMessageEl = document.createElement("span");
-            statusMessageEl.innerHTML = "Status message: " + statusMessage;
-
-            el.appendChild(statusDateEl);
-            el.appendChild(statusMessageEl);
-            return el;
-          },
-        },
-        rowContextMenu: (e, component) => {
-          let menu = [];
-          if (component.getData().status === "pending") {
-            menu.push(
-              {
-                label: "<i class='fa fa-check'></i> Accept Request",
-                action: (e, column) => {
-                  Vue.$fhcapi.ProfilUpdate.acceptProfilRequest(column.getData())
-                    .then((res) => {
-                      this.$refs.UpdatesTable.tabulator.setData();
-                    })
-                    .catch((e) => {
-                      Alert.popup(Vue.h('div',{innerHTML:e.response.data}));
-                    });
-                },
-              },
-              {
-                separator: true,
-              },
-              {
-                label:
-                  " <i style='width:16px' class='text-center fa fa-xmark'></i> Deny Request",
-                action: (e, column) => {
-                  Vue.$fhcapi.ProfilUpdate.denyProfilRequest(
-                    column.getData()
-                  ).then((res) => {
-                    this.$refs.UpdatesTable.tabulator.setData();
-                  }).catch((e) => {
-                    Alert.popup(Vue.h('div',{innerHTML:e.response.data}));
-                  });
-                },
-              },
-              {
-                separator: true,
-              },
-              {
-                label: "<i class='fa fa-eye'></i> Show Request",
-                action: (e, column) => {
-                  this.showModal(column.getData());
-                    
-                },
-              }
-            );
-          } else {
-            menu.push({
-              label: "<i class='fa fa-eye'></i> Show Request",
-              action: (e, column) => {
-                this.showModal(column.getData());
-              },
-            });
-          }
-          return menu;
-        },
-        
-        height: 600,
-        layout: "fitColumns",
-
-        columns: [
-          {
-            title: "UID",
-            field: "uid",
-            minWidth: 200,
-            resizable: true,
-            headerFilter: true,
-            //responsive:0,
-          },
-          {
-            title: "Name",
-            field: "name",
-            minWidth: 200,
-            resizable: true,
-            headerFilter: true,
-            //responsive:0,
-          },
-          {
-            title: "Topic",
-            field: "topic",
-            resizable: true,
-            minWidth: 200,
-            headerFilter: true,
-            //responsive:0,
-          },
-          {
-            title: "Insert Date",
-            field: "insertamum",
-            resizable: true,
-            headerFilter: true,
-            minWidth: 200,
-            //responsive:0,
-          },
-          {
-            title: "Status",
-            field: "status",
-            hozAlign: "center",
-            headerFilter: true,
-            formatter: function (cell, para) {
-              switch (cell.getValue()) {
-                case "pending":
-                  return "<div class='row justify-content-center'><div class='col-2'><i class='fa fa-circle-info text-info fa-lg'></i></div> <div class='col-4'><span>pending</span></div></div>";
-                case "accepted":
-                  return "<div class='row justify-content-center'><div class='col-2'><i class='fa fa-circle-check text-success fa-lg'></i></div> <div class='col-4'><span>accepted</span></div></div>";
-                case "rejected":
-                  return "<div class='row justify-content-center'><div class='col-2'><i class='fa-solid fa-circle-xmark text-danger fa-lg '></i></div> <div class='col-4'><span>rejected</span></div></div>";
-                default:
-                  return "<p>default</p>";
-              }
-            },
-
-            resizable: true,
-            minWidth: 200,
-            //responsive:0,
-          },
-          {
-            title: "View",
-            formatter: function () {
-              return "<i class='fa fa-eye'></i>";
-            },
-            resizable: true,
-            minWidth: 200,
-            hozAlign: "center",
-            cellClick: (e, cell) => {
-              //! function that is called when clicking on a row in the table
-              let cellData = cell.getRow().getData();
-              this.showModal(cellData);
-            },
-            //responsive:0,
-          },
-        ],
-      },
-    };
-  },
-  computed: {
-    getFetchUrl: function () {
-      let url =
-        FHC_JS_DATA_STORAGE_OBJECT.app_root +
-        FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-        `/Cis/ProfilUpdate/`;
-      if (this.showAll) {
-        url + "getAllRequests";
-      } else {
-        url + "getPendingRequests";
-      }
-      return url;
-    },
-  },
-  methods: {
-    showModal: function (value) {
-      AcceptDenyUpdate.popup({ value: value })
-        .then((res) => {
-          
-          //? refetches the data, if any request was denied or accepted
-          //* setData will call the ajaxURL again to refresh the data
-          this.$refs.UpdatesTable.tabulator.setData();
-        }).catch(err=>{
-         
-        })
-        
-    },
-    updateData: function (event) {
-      this.$refs.UpdatesTable.tabulator.setData();
-      //? store the selected view in the session storage of the browser
-      sessionStorage.setItem("showAll", event.target.value);
-    },
-  },
-  mounted() {
-
-    if (!(sessionStorage.getItem("showAll") === null)) {
-      //? converting string into a boolean: https://sentry.io/answers/how-can-i-convert-a-string-to-a-boolean-in-javascript/
-      this.showAll = sessionStorage.getItem("showAll")==="true";
-      
     }
   },
-  template: `
-    <div>
   
-    <div  class="form-underline flex-fill ">
-      <div class="form-underline-titel">Show </div>
-
-      <select class="mb-4 " v-model="showAll" @change="updateData" class="form-select" aria-label="Profil updates display selection">
-        <option :selected="true" :value="false">Pending Requests</option>
-        <option :value="true">All Requests</option>
-      </select>
-  
-    </div>
-
- 
-    
-    <core-filter-cmpt title="Update Requests"  ref="UpdatesTable" :tabulator-options="profil_updates_table_options" tableOnly :sideMenu="false" />
-
-    </div>`,
 });
 
 app.mount("#content");
diff --git a/public/js/components/Cis/Profil/EditProfil.js b/public/js/components/Cis/Profil/EditProfil.js
index d72925639..9fac1ffbe 100755
--- a/public/js/components/Cis/Profil/EditProfil.js
+++ b/public/js/components/Cis/Profil/EditProfil.js
@@ -114,6 +114,7 @@ export default {
         await Vue.$fhcapi.ProfilUpdate.insertFile(formData,this.editData.updateID).then(res => {
           return res.data?.map((file) => file.dms_id);
         })
+        
         :
         //? fresh insert of new attachment
         await Vue.$fhcapi.ProfilUpdate.insertFile(formData).then(res => {
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 818858473..96587dd1c 100755
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -243,7 +243,6 @@ export default {
   },
 
   template: /*html*/` 
- <pre>test</pre>
   <div class="container-fluid text-break fhc-form"  >
     
           <div class="row">
diff --git a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
new file mode 100644
index 000000000..e04bf321b
--- /dev/null
+++ b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
@@ -0,0 +1,297 @@
+
+import { CoreFilterCmpt } from "../../filter/Filter.js";
+import AcceptDenyUpdate from "./AcceptDenyUpdate.js";
+import Alert from "../../../components/Bootstrap/Alert.js";
+
+
+const sortProfilUpdates = (ele1, ele2) => {
+  let result = 0;
+  if (ele1.status === "pending") {
+    result = -1;
+  } else if (ele1.status === "accepted") {
+    result = ele2.status === "rejected" ? -1 : 1;
+  } else {
+    result = 1;
+  }
+  //? if they have the same status the insert date is used for ordering
+  if (ele1.status === ele2.status) {
+    result =
+      new Date(ele2.insertamum.split(".").reverse().join("-")) -
+      new Date(ele1.insertamum.split(".").reverse().join("-"));
+  }
+  return result;
+};
+
+export default{
+  components: {
+    CoreFilterCmpt,
+  },
+  props:{
+    id:{
+        type:Number,
+    }
+  },
+  data() {
+    return {
+      
+      showAll: false,
+      events:[],
+      profil_update_id:Number(this.id),
+      profil_updates_table_options: {
+        
+        ajaxURL:
+          FHC_JS_DATA_STORAGE_OBJECT.app_root +
+          FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+          `/Cis/ProfilUpdate/`,
+
+        ajaxURLGenerator: (url, config, params) => {
+          //? this function needs to be an array function in order to access the this properties of the Vue component
+          if (this.showAll) {
+            return url + "getProfilUpdateWithPermission";
+          } else {
+            return url + "getProfilUpdateWithPermission/pending";
+          }
+        },
+        ajaxResponse: function (url, params, response) {
+          //url - the URL of the request
+          //params - the parameters passed with the request
+          //response - the JSON object returned in the body of the response.
+          //? sorts the response data from the backend
+          if (response) response.sort(sortProfilUpdates);
+
+          return response;
+        },
+        //? adds tooltip with the status message of a profil update request if its status is not pending
+        columnDefaults: {
+          tooltip: (e, cell, onRendered) =>{
+            //e - mouseover event
+            //cell - cell component
+            //onRendered - onRendered callback registration function
+            let statusMessage = cell.getData().status_message;
+            let statusDate = cell.getData().status_timestamp;
+            let status = cell.getData().status;
+            if (!statusMessage) {
+              return null;
+            }
+            let el = document.createElement("div");
+            el.classList.add("border", "border-dark");
+
+            let statusDateEl = document.createElement("span");
+            statusDateEl.classList.add("d-block","mb-1");
+            statusDateEl.innerHTML =
+              "Request was " + status + " on " + statusDate;
+            let statusMessageEl = document.createElement("span");
+            statusMessageEl.innerHTML = "Status message: " + statusMessage;
+
+            el.appendChild(statusDateEl);
+            el.appendChild(statusMessageEl);
+            return el;
+          },
+        },
+        rowContextMenu: (e, component) => {
+          let menu = [];
+          if (component.getData().status === "pending") {
+            menu.push(
+              {
+                label: "<i class='fa fa-check'></i> Accept Request",
+                action: (e, column) => {
+                  Vue.$fhcapi.ProfilUpdate.acceptProfilRequest(column.getData())
+                    .then((res) => {
+                      this.$refs.UpdatesTable.tabulator.setData();
+                    })
+                    .catch((e) => {
+                      Alert.popup(Vue.h('div',{innerHTML:e.response.data}));
+                    });
+                },
+              },
+              {
+                separator: true,
+              },
+              {
+                label:
+                  " <i style='width:16px' class='text-center fa fa-xmark'></i> Deny Request",
+                action: (e, column) => {
+                  Vue.$fhcapi.ProfilUpdate.denyProfilRequest(
+                    column.getData()
+                  ).then((res) => {
+                    this.$refs.UpdatesTable.tabulator.setData();
+                  }).catch((e) => {
+                    Alert.popup(Vue.h('div',{innerHTML:e.response.data}));
+                  });
+                },
+              },
+              {
+                separator: true,
+              },
+              {
+                label: "<i class='fa fa-eye'></i> Show Request",
+                action: (e, column) => {
+                  this.showModal(column.getData());
+                    
+                },
+              }
+            );
+          } else {
+            menu.push({
+              label: "<i class='fa fa-eye'></i> Show Request",
+              action: (e, column) => {
+                this.showModal(column.getData());
+              },
+            });
+          }
+          return menu;
+        },
+        
+        height: 600,
+        layout: "fitColumns",
+
+        columns: [
+          {
+            title: "UID",
+            field: "uid",
+            minWidth: 200,
+            resizable: true,
+            headerFilter: true,
+            //responsive:0,
+          },
+          {
+            title: "Name",
+            field: "name",
+            minWidth: 200,
+            resizable: true,
+            headerFilter: true,
+            //responsive:0,
+          },
+          {
+            title: "Topic",
+            field: "topic",
+            resizable: true,
+            minWidth: 200,
+            headerFilter: true,
+            //responsive:0,
+          },
+          {
+            title: "Insert Date",
+            field: "insertamum",
+            resizable: true,
+            headerFilter: true,
+            minWidth: 200,
+            //responsive:0,
+          },
+          {
+            title: "Status",
+            field: "status",
+            hozAlign: "center",
+            headerFilter: true,
+            formatter: function (cell, para) {
+              switch (cell.getValue()) {
+                case "pending":
+                  return "<div class='row justify-content-center'><div class='col-2'><i class='fa fa-circle-info text-info fa-lg'></i></div> <div class='col-4'><span>pending</span></div></div>";
+                case "accepted":
+                  return "<div class='row justify-content-center'><div class='col-2'><i class='fa fa-circle-check text-success fa-lg'></i></div> <div class='col-4'><span>accepted</span></div></div>";
+                case "rejected":
+                  return "<div class='row justify-content-center'><div class='col-2'><i class='fa-solid fa-circle-xmark text-danger fa-lg '></i></div> <div class='col-4'><span>rejected</span></div></div>";
+                default:
+                  return "<p>default</p>";
+              }
+            },
+
+            resizable: true,
+            minWidth: 200,
+            //responsive:0,
+          },
+          {
+            title: "View",
+            formatter: function () {
+              return "<i class='fa fa-eye'></i>";
+            },
+            resizable: true,
+            minWidth: 200,
+            hozAlign: "center",
+            cellClick: (e, cell) => {
+              //! function that is called when clicking on a row in the table
+              let cellData = cell.getRow().getData();
+              this.showModal(cellData);
+            },
+            //responsive:0,
+          },
+        ],
+      },
+    };
+  },
+  computed: {
+    getFetchUrl: function () {
+      let url =
+        FHC_JS_DATA_STORAGE_OBJECT.app_root +
+        FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+        `/Cis/ProfilUpdate/`;
+      if (this.showAll) {
+        url + "getAllRequests";
+      } else {
+        url + "getPendingRequests";
+      }
+      return url;
+    },
+  },
+  methods: {
+   
+    showModal: function (value) {
+      AcceptDenyUpdate.popup({ value: value })
+        .then((res) => {
+          
+          //? refetches the data, if any request was denied or accepted
+          //* setData will call the ajaxURL again to refresh the data
+          this.$refs.UpdatesTable.tabulator.setData();
+        }).catch(err=>{
+         
+        })
+        
+    },
+    updateData: function (event) {
+      this.$refs.UpdatesTable.tabulator.setData();
+      //? store the selected view in the session storage of the browser
+      sessionStorage.setItem("showAll", event.target.value);
+    },
+  },
+
+  mounted() {
+
+    //? opens the AcceptDenyUpdate Modal if the a preselected profil_update_id was passed to the component (used for email links)
+    if(this.profil_update_id){
+        
+        this.$refs.UpdatesTable.tabulator.on("dataProcessed", ()=>{
+        const arrayRowData = this.$refs.UpdatesTable.tabulator.getData().filter(row => {
+            return row.profil_update_id === this.profil_update_id;
+        });
+        if(arrayRowData.length){
+            this.showModal(arrayRowData[0]);
+        }
+        })
+    }
+   
+
+    if (!(sessionStorage.getItem("showAll") === null)) {
+      //? converting string into a boolean: https://sentry.io/answers/how-can-i-convert-a-string-to-a-boolean-in-javascript/
+      this.showAll = sessionStorage.getItem("showAll")==="true";
+      
+    }
+  },
+  template: `
+    <div>
+    
+    <div  class="form-underline flex-fill ">
+      <div class="form-underline-titel">Show </div>
+
+      <select class="mb-4 " v-model="showAll" @change="updateData" class="form-select" aria-label="Profil updates display selection">
+        <option :selected="true" :value="false">Pending Requests</option>
+        <option :value="true">All Requests</option>
+      </select>
+  
+    </div>
+
+ 
+    
+    <core-filter-cmpt title="Update Requests"  ref="UpdatesTable" :tabulatorEvents="events" :tabulator-options="profil_updates_table_options" tableOnly :sideMenu="false" />
+
+    </div>`,
+};

From 1afb9130c0f88a5b84a3387d710f03d8dac73e3c Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 19 Feb 2024 15:12:16 +0100
Subject: [PATCH 0428/1461] adds a loading animation when waiting for the
 emails to be sent out when inserting a new profil update request

---
 public/js/components/Cis/Profil/EditProfil.js | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/public/js/components/Cis/Profil/EditProfil.js b/public/js/components/Cis/Profil/EditProfil.js
index 9fac1ffbe..8686c3ff8 100755
--- a/public/js/components/Cis/Profil/EditProfil.js
+++ b/public/js/components/Cis/Profil/EditProfil.js
@@ -1,12 +1,14 @@
 import BsModal from "../../Bootstrap/Modal.js";
 import Alert from "../../Bootstrap/Alert.js";
 import EditProfilSelect from "./EditProfilSelect.js";
+import Loader from "../../../components/Loader.js"
 
 export default {
   components: {
     BsModal,
     Alert,
     EditProfilSelect,
+    Loader
   },
   mixins: [BsModal],
   props: {
@@ -34,6 +36,7 @@ export default {
       editData: this.value,
       fileID:null,
       breadcrumb: null,
+      loading:false,
 
       result: false,
       info: null,
@@ -68,6 +71,7 @@ export default {
         //? inserts new row in public.tbl_cis_profil_update
         //* calls the update api call if an update field is present in the data that was passed to the modal
         const handleApiResponse = (res) => {
+          this.$refs.loaderRef.hide();
           if (res.data.error == 0) {
             this.result = true;
             this.hide();
@@ -83,6 +87,11 @@ export default {
           }
         };
 
+        //? shows the loading modal and hides the EditProfil modal without returning the result promise
+        this.$refs.loaderRef.show();
+        //* v-show on EditProfil modal binded to this.loading
+        this.loading=true;
+        
         this.editData.updateID
           ? Vue.$fhcapi.ProfilUpdate.updateProfilRequest(
               this.topic,
@@ -135,22 +144,26 @@ export default {
       //? if the topic was passed through the prop add it to the component
       this.topic = this.editData.topic;
     }
+    
   },
   mounted() {
     this.modal = this.$refs.modalContainer.modal;
+    
   },
   popup(options) {
     return BsModal.popup.bind(this)(null, options);
   },
   template: `
-
-  <bs-modal ref="modalContainer" v-bind="$props" body-class="" dialog-class="modal-lg" class="bootstrap-alert" backdrop="false" >
+  <loader ref="loaderRef"></loader>
+  <bs-modal v-show="!loading" ref="modalContainer" v-bind="$props" body-class="" dialog-class="modal-lg" class="bootstrap-alert" backdrop="false" >
     
   <template v-if="title" v-slot:title>
       {{title }}  
     </template>
     <template v-slot:default>
-
+    
+    <div >
+    
     <nav aria-label="breadcrumb" class="ps-2  ">
       <ol class="breadcrumb ">
         <li class="breadcrumb-item"  v-for="element in breadcrumb">{{element}}</li>
@@ -159,11 +172,11 @@ export default {
     </nav>
 
     <edit-profil-select @submit="submitProfilChange" v-model:breadcrumb="breadcrumb" v-model:topic="topic" v-model:profilUpdate="profilUpdate" ariaLabel="test" :list="editData"></edit-profil-select>
-   
+    </div>
 
     </template>
     <!-- optional footer -->
-    <template   v-slot:footer>
+    <template  v-slot:footer>
       
     <button class="btn btn-outline-danger " @click="hide">Abbrechen</button>    
       <button :disabled="!profilUpdate"  @click="submitProfilChange" role="button" class="btn btn-primary">Senden</button>

From 47abce4aad32a2e1f248baaafd5af64c3dccbebe Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 20 Feb 2024 10:50:35 +0100
Subject: [PATCH 0429/1461] handles the loading modal in the root Profil app
 when inserting a new profil update that may takes some time because it has to
 send out emails

---
 public/js/apps/Cis/Profil.js                  | 26 ++++++++++++++++---
 public/js/components/Cis/Profil/EditProfil.js | 20 ++++++++------
 .../Cis/Profil/MitarbeiterProfil.js           | 10 +++----
 .../js/components/Cis/Profil/StudentProfil.js |  3 ++-
 4 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/public/js/apps/Cis/Profil.js b/public/js/apps/Cis/Profil.js
index c20382783..5e772a23c 100755
--- a/public/js/apps/Cis/Profil.js
+++ b/public/js/apps/Cis/Profil.js
@@ -4,6 +4,8 @@ import MitarbeiterProfil from "../../components/Cis/Profil/MitarbeiterProfil.js"
 import ViewStudentProfil from "../../components/Cis/Profil/StudentViewProfil.js";
 import ViewMitarbeiterProfil from "../../components/Cis/Profil/MitarbeiterViewProfil.js";
 import fhcapifactory from "../api/fhcapifactory.js";
+import Loading from "../../components/Loader.js";
+
 
 Vue.$fhcapi = fhcapifactory;
 Vue.$collapseFormatter  = function(data){
@@ -43,10 +45,12 @@ const testapp = Vue.createApp({
 		MitarbeiterProfil,
 		ViewStudentProfil,
 		ViewMitarbeiterProfil,
+		Loading,
 	},
 	data() {
 		return {
-			
+			//? loading property is used for showing/hiding the loading modal
+			loading:false,
 			view:null,
 			data:null,
 			// notfound is null by default, but contains an UID if no user exists with that UID
@@ -57,7 +61,10 @@ const testapp = Vue.createApp({
 	//? use function syntax for provide so that we can access `this`
 	provide() {
 		return {
-
+			setLoading: (newValue)=>{
+				console.log(this);
+				this.loading = newValue;
+			},
 			getZustellkontakteCount: this.zustellKontakteCount,
 			getZustelladressenCount: this.zustellAdressenCount,
 			collapseFunction:  (e, column)=> {
@@ -236,6 +243,14 @@ const testapp = Vue.createApp({
 	  
 	},
 
+	watch:{
+		loading:function(newValue,oldValue){
+			if(newValue){this.$refs.loadingModalRef.show();}else{
+				this.$refs.loadingModalRef.hide();
+			}
+		}
+	},
+
 
 	created(){
 
@@ -261,8 +276,11 @@ const testapp = Vue.createApp({
 			<h3>Es wurden keine oder mehrere Profile für {{this.notFoundUID}} gefunden</h3>
 
 		</div>
-
-		<component v-else :is="view" :data="data" :editData="filteredEditData" ></component>
+		<div v-else>
+		<loading ref="loadingModalRef" :timeout="0"></loading>
+		<component  :is="view" :data="data" :editData="filteredEditData" ></component>
+		</div>
+		
 	
 	</div>`
 	
diff --git a/public/js/components/Cis/Profil/EditProfil.js b/public/js/components/Cis/Profil/EditProfil.js
index 8686c3ff8..0b56b7fd7 100755
--- a/public/js/components/Cis/Profil/EditProfil.js
+++ b/public/js/components/Cis/Profil/EditProfil.js
@@ -16,6 +16,7 @@ export default {
     title: String,
     zustelladressenCount: Function,
     zustellkontakteCount: Function,
+    setLoading:Function,
     /*
      * NOTE(chris):
      * Hack to expose in "emits" declared events to $props which we use
@@ -71,7 +72,10 @@ export default {
         //? inserts new row in public.tbl_cis_profil_update
         //* calls the update api call if an update field is present in the data that was passed to the modal
         const handleApiResponse = (res) => {
-          this.$refs.loaderRef.hide();
+          //? toggles the loading to false and closes the loading modal
+          this.loading = false;
+          this.setLoading(false);
+
           if (res.data.error == 0) {
             this.result = true;
             this.hide();
@@ -87,13 +91,13 @@ export default {
           }
         };
 
-        //? shows the loading modal and hides the EditProfil modal without returning the result promise
-        this.$refs.loaderRef.show();
         //* v-show on EditProfil modal binded to this.loading
+        //? hides the EditProfil modal and shows the loading modal by calling a callback that was passed as prop from the parent component
         this.loading=true;
+        this.setLoading(true);
         
         this.editData.updateID
-          ? Vue.$fhcapi.ProfilUpdate.updateProfilRequest(
+          ?  Vue.$fhcapi.ProfilUpdate.updateProfilRequest(
               this.topic,
               this.profilUpdate,
               this.editData.updateID,
@@ -101,7 +105,7 @@ export default {
             ).then((res) => {
               handleApiResponse(res);
             })
-          : Vue.$fhcapi.ProfilUpdate.insertProfilRequest(
+          :  Vue.$fhcapi.ProfilUpdate.insertProfilRequest(
               this.topic,
               this.profilUpdate,
               this.fileID? this.fileID[0]: null
@@ -140,6 +144,7 @@ export default {
   },
   computed: {},
   created() {
+    
     if (this.editData.topic) {
       //? if the topic was passed through the prop add it to the component
       this.topic = this.editData.topic;
@@ -148,13 +153,11 @@ export default {
   },
   mounted() {
     this.modal = this.$refs.modalContainer.modal;
-    
   },
   popup(options) {
     return BsModal.popup.bind(this)(null, options);
   },
   template: `
-  <loader ref="loaderRef"></loader>
   <bs-modal v-show="!loading" ref="modalContainer" v-bind="$props" body-class="" dialog-class="modal-lg" class="bootstrap-alert" backdrop="false" >
     
   <template v-if="title" v-slot:title>
@@ -177,7 +180,8 @@ export default {
     </template>
     <!-- optional footer -->
     <template  v-slot:footer>
-      
+    <loader  ref="loaderRef" :timeout="0"></loader>
+        
     <button class="btn btn-outline-danger " @click="hide">Abbrechen</button>    
       <button :disabled="!profilUpdate"  @click="submitProfilChange" role="button" class="btn btn-primary">Senden</button>
     </template>
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 96587dd1c..a4044ee88 100755
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -26,11 +26,10 @@ export default {
     RoleInformation,
     ProfilInformation,
   },
-  inject: ['sortProfilUpdates','collapseFunction','getZustellkontakteCount','getZustelladressenCount'],
+  inject: ['sortProfilUpdates','collapseFunction','getZustellkontakteCount','getZustelladressenCount','setLoading'],
   data() {
     return {
 
-     
       
       funktionen_table_options: {
         height: 300,
@@ -141,9 +140,6 @@ export default {
   
   methods: {
 
-   
-
-    
 
     fetchProfilUpdates: function(){
       Vue.$fhcapi.ProfilUpdate.selectProfilRequest().then((res)=>{
@@ -161,7 +157,10 @@ export default {
           zustelladressenCount:this.getZustelladressenCount,
           zustellkontakteCount:this.getZustellkontakteCount,
           title:"Profil bearbeiten",
+          setLoading:this.setLoading,
+
         }).then((popup_result) => {
+          console.log("hello test");
           if(popup_result){
             Vue.$fhcapi.ProfilUpdate.selectProfilRequest()
             .then((res) =>{
@@ -178,6 +177,7 @@ export default {
             });
           }
         }).catch((e) => {
+          console.log("catch");
           // Wenn der User das Modal abbricht ohne Änderungen
          
         });
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index ef6c72672..ad9513655 100755
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -24,7 +24,7 @@ export default {
     FetchProfilUpdates,
 
   },
-  inject:['sortProfilUpdates','collapseFunction','getZustellkontakteCount','getZustelladressenCount'],
+  inject:['sortProfilUpdates','collapseFunction','getZustellkontakteCount','getZustelladressenCount','setLoading'],
   data() {
     return {
       
@@ -99,6 +99,7 @@ export default {
           title:"Profil bearbeiten",
           zustelladressenCount:this.getZustelladressenCount,
           zustellkontakteCount:this.getZustellkontakteCount,
+          setLoading:this.setLoading,
         }).then((popup_result) => {
           if(popup_result){
             Vue.$fhcapi.ProfilUpdate.selectProfilRequest()

From 6f7bca6eabc5b7b609234dabcd90f62b240cf2f9 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 20 Feb 2024 14:32:28 +0100
Subject: [PATCH 0430/1461] adds loading modal to ProfilUpdateView

---
 public/js/apps/Cis/Profil.js                  |  4 ++--
 public/js/apps/Cis/ProfilUpdateRequests.js    | 11 +++++++---
 .../Cis/ProfilUpdate/AcceptDenyUpdate.js      | 16 +++++++++++++--
 .../Cis/ProfilUpdate/ProfilUpdateView.js      | 20 ++++++++++++++++---
 4 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/public/js/apps/Cis/Profil.js b/public/js/apps/Cis/Profil.js
index 5e772a23c..26897039a 100755
--- a/public/js/apps/Cis/Profil.js
+++ b/public/js/apps/Cis/Profil.js
@@ -62,7 +62,7 @@ const testapp = Vue.createApp({
 	provide() {
 		return {
 			setLoading: (newValue)=>{
-				console.log(this);
+				
 				this.loading = newValue;
 			},
 			getZustellkontakteCount: this.zustellKontakteCount,
@@ -273,7 +273,7 @@ const testapp = Vue.createApp({
 	
 		<div v-if="notFoundUID">
 		
-			<h3>Es wurden keine oder mehrere Profile für {{this.notFoundUID}} gefunden</h3>
+			<h3>Es wurde keine Person mit der UID {{this.notFoundUID}} gefunden</h3>
 
 		</div>
 		<div v-else>
diff --git a/public/js/apps/Cis/ProfilUpdateRequests.js b/public/js/apps/Cis/ProfilUpdateRequests.js
index 5132b84bb..5bd4d894e 100755
--- a/public/js/apps/Cis/ProfilUpdateRequests.js
+++ b/public/js/apps/Cis/ProfilUpdateRequests.js
@@ -1,18 +1,23 @@
 import fhcapifactory from "../api/fhcapifactory.js";
 import ProfilUpdateView from "../../components/Cis/ProfilUpdate/ProfilUpdateView.js";
+
 Vue.$fhcapi = fhcapifactory;
 
 
 
 const app = Vue.createApp({
   components: {
-    ['profil-update-view']:ProfilUpdateView
-    
+    ['profil-update-view']:ProfilUpdateView,
+ 
   },
+ 
   data() {
     return {
+   
     }
-  },
+  },methods:{
+   
+  }
   
 });
 
diff --git a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
index fbc0ee0c7..ed13eae03 100755
--- a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
+++ b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
@@ -19,6 +19,10 @@ export default {
     value: {
       type: Object,
     },
+    setLoading:{
+      type: Function,
+    },
+
     /*
      * NOTE(chris):
      * Hack to expose in "emits" declared events to $props which we use
@@ -34,6 +38,7 @@ export default {
   data() {
     return {
       data: this.value,
+      loading: false,
       //? result is returned from the Promise when the modal is closed
       result: false,
       info: null,
@@ -48,7 +53,11 @@ export default {
           `/Cis/ProfilUpdate/show/${dms_id}`;
     },
     acceptRequest: function () {
+      this.loading = true;
+      this.setLoading(true);
       Vue.$fhcapi.ProfilUpdate.acceptProfilRequest(this.data).then((res) => {
+        this.setLoading(false);
+        this.loading = false;
         this.result = true;
       }).catch((e) => {
         Alert.popup(Vue.h('div',{innerHTML:e.response.data}));
@@ -56,9 +65,12 @@ export default {
       this.hide();
     },
 
-    denyRequest: function () {
-      
+    denyRequest: async function () {
+      this.loading = true;
+      this.setLoading(true);
       Vue.$fhcapi.ProfilUpdate.denyProfilRequest(this.data).then((res) => {
+        this.setLoading(false);
+        this.loading = false;
         this.result = true;
       }).catch((e) => {
         Alert.popup(Vue.h('div',{innerHTML:e.response.data}));
diff --git a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
index e04bf321b..2c0bc1c2e 100644
--- a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
+++ b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
@@ -2,6 +2,7 @@
 import { CoreFilterCmpt } from "../../filter/Filter.js";
 import AcceptDenyUpdate from "./AcceptDenyUpdate.js";
 import Alert from "../../../components/Bootstrap/Alert.js";
+import Loading from "../../../components/Loader.js";
 
 
 const sortProfilUpdates = (ele1, ele2) => {
@@ -25,6 +26,7 @@ const sortProfilUpdates = (ele1, ele2) => {
 export default{
   components: {
     CoreFilterCmpt,
+    Loading,
   },
   props:{
     id:{
@@ -33,7 +35,7 @@ export default{
   },
   data() {
     return {
-      
+      loading:false,
       showAll: false,
       events:[],
       profil_update_id:Number(this.id),
@@ -234,9 +236,12 @@ export default{
     },
   },
   methods: {
+    setLoading: function(newValue){
+      this.loading = newValue;
+    },
    
     showModal: function (value) {
-      AcceptDenyUpdate.popup({ value: value })
+      AcceptDenyUpdate.popup({ value: value, setLoading:this.setLoading })
         .then((res) => {
           
           //? refetches the data, if any request was denied or accepted
@@ -253,6 +258,15 @@ export default{
       sessionStorage.setItem("showAll", event.target.value);
     },
   },
+  watch:{
+    loading: function(newValue, oldValue){
+      if(newValue){
+        this.$refs.loadingModalRef.show();
+      }else{
+        this.$refs.loadingModalRef.hide();
+      }
+    }
+  },
 
   mounted() {
 
@@ -289,7 +303,7 @@ export default{
   
     </div>
 
- 
+    <loading ref="loadingModalRef" :timeout="0"></loading>
     
     <core-filter-cmpt title="Update Requests"  ref="UpdatesTable" :tabulatorEvents="events" :tabulator-options="profil_updates_table_options" tableOnly :sideMenu="false" />
 

From 1bed062a014bb80dd703999b7bf1e74b13c08a33 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 20 Feb 2024 15:57:17 +0100
Subject: [PATCH 0431/1461] querying the right data for the EditAdresse Nation
 and Gemeinde Fields

---
 application/controllers/Cis/Profil.php        | 62 ++++++++++++++++++-
 public/js/apps/api/userdata.js                |  8 +--
 .../Profil/ProfilComponents/EditAdresse.js    | 30 +++++++++
 3 files changed, 93 insertions(+), 7 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index 050490220..defb753a7 100755
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -24,6 +24,7 @@ class Profil extends Auth_Controller
 			'isStudent' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'getZustellAdresse' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'getZustellKontakt' => ['student/anrechnung_beantragen:r', 'user:r'],
+			'getAllNationen' => ['student/anrechnung_beantragen:r', 'user:r'],
 			
 		]);
 
@@ -353,6 +354,63 @@ class Profil extends Auth_Controller
 	}
 
 
+	public function getAllNationen(){
+		$this->load->model('codex/Nation_model',"NationModel");
+		$this->NationModel->addSelect(["nation_code as code","langtext"]);
+		$nation_res = $this->NationModel->load();
+		if(isError($nation_res)){
+			show_error("error while trying to query table codex.tbl_nation");
+		}
+		$nation_res = hasData($nation_res) ? getData($nation_res) : null;
+		echo json_encode($nation_res);
+
+	}
+
+	//TODO: use the old query check to get the correct values to display for the user in case he selected the nation Austria (A)
+	/* if($_POST['nation']=='A')
+	{
+		if(is_numeric($_POST['plz']) && $_POST['plz']<32000)
+		{
+			$qry = "SELECT * FROM bis.tbl_gemeinde WHERE lower(name)=lower(".$db->db_add_param($_POST['gemeinde']).")
+					AND plz=".$db->db_add_param($_POST['plz']);
+			if($db->db_query($qry))
+			{
+				if($row = $db->db_fetch_object())
+				{
+					$adresse->gemeinde = $row->name;
+				}
+				else
+				{
+					$error = true;
+					$errormsg = 'Gemeinde ist ungueltig';
+					$return = false;
+				}
+			}
+			else
+			{
+				$error = true;
+				$errormsg = 'Fehler beim Ermitteln der Gemeinde';
+				$return = false;
+			}
+		}
+		else
+		{
+			$error = true;
+			$errormsg = 'Postleitzahl ist fuer diese Nation ungueltig';
+			$return = false;
+		}
+	} */
+	public function getAllGemeinden(){
+		$this->load->model('public/Gemeinde_model',"NationModel");
+		$this->NationModel->addSelect(["langtext"]);
+		$nation_res = $this->NationModel->load();
+		if(isError($nation_res)){
+			show_error("error while trying to query table codex.tbl_nation");
+		}
+		$nation_res = hasData($nation_res) ? getData($nation_res) : null;
+		echo json_encode($nation_res);
+
+	}
 
 
 	//? queries the Mailverteiler of a benutzer
@@ -564,9 +622,9 @@ class Profil extends Auth_Controller
 		$adresse_res = null;
 		if (
 
-			isSuccess($adresse_res = $this->AdresseModel->addSelect(["adresse_id","strasse", "tbl_adressentyp.bezeichnung as typ", "plz", "ort","zustelladresse"])) &&
+			isSuccess($adresse_res = $this->AdresseModel->addSelect(["adresse_id","strasse", "tbl_adressentyp.bezeichnung as typ", "plz", "ort","zustelladresse","gemeinde","nation"])) &&
 			isSuccess($adresse_res = $this->AdresseModel->addOrder("zustelladresse", "DESC")) &&
-			isSuccess($adresse_res = $this->AdresseModel->addJoin("tbl_adressentyp", "typ=adressentyp_kurzbz"))
+			isSuccess($adresse_res = $this->AdresseModel->addJoin("tbl_adressentyp", "typ=adressentyp_kurzbz")) 
 		) {
 			$adresse_res = $this->AdresseModel->loadWhere(array("person_id" => $pid));
 			if (isError($adresse_res)) {
diff --git a/public/js/apps/api/userdata.js b/public/js/apps/api/userdata.js
index 8395c4ca8..1fdc9c661 100755
--- a/public/js/apps/api/userdata.js
+++ b/public/js/apps/api/userdata.js
@@ -1,13 +1,11 @@
 export default {
   //! API Calls for Profil Views
 
-
-
-  getMitarbeiter: function (student_id) {
+  getAllNationen:function(){
     const url =
       FHC_JS_DATA_STORAGE_OBJECT.app_root +
-      `cis.php/api/v1/crm/Student/getStudent`;
-    return axios.get(url,{student_id:student_id});
+      `cis.php/Cis/Profil/getAllNationen`;
+    return axios.get(url);
   },
 
   getView: function (uid) {
diff --git a/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js b/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
index 0726f8580..e6fb3877f 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
@@ -9,6 +9,7 @@ export default {
     inject:["zustellAdresseCount"],
     data(){
         return{
+            nationenList:[],
             originalValue:null,
             zustellAdressenCount:null,
         }
@@ -61,6 +62,15 @@ export default {
         },
     },
     created(){
+        
+        Vue.$fhcapi.UserData.getAllNationen().then(res => {
+            this.nationenList = res.data;
+        });
+
+        //? same for Gemeinde
+        /* Vue.$fhcapi.UserData.getAllNationen().then(res => {
+            this.nationenList = res.data;
+        }); */
         this.originalValue = JSON.stringify(this.data);
         this.zustellAdressenCount = this.zustellAdresseCount();
         
@@ -96,6 +106,7 @@ export default {
             
         </div>
       
+      
         <div  class="col-12 col-sm-9 col-xl-12 col-xxl-9 order-1">
 
         <div class="form-underline ">
@@ -144,6 +155,25 @@ export default {
         
             </div>
         </div>
+        <div class="col-6 order-5">
+        <div class="form-underline ">
+        <div class="form-underline-titel">Gemeinde</div>
+
+        <input  class="form-control" :value="data.gemeinde" @input="updateValue($event,'gemeinde')" :placeholder="data.gemeinde">
+    
+        </div>
+        </div>
+        <div class="col-6 order-5 ">
+        <div class="form-underline ">
+        <div class="form-underline-titel">nation</div>
+            <select  :value="data.nation" @change="updateValue($event,'nation')" class="form-select" aria-label="Select Kontakttyp">
+                <option selected></option>
+                <option :value="nation.code" v-for="nation in nationenList">{{nation.langtext}}</option>
+            
+            </select> 
+        
+        </div>
+        </div>
        
     </div>
     `

From 2a393f008774b790d9e703b6026bae619c3f793e Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 21 Feb 2024 12:31:41 +0100
Subject: [PATCH 0432/1461] adds the fields gemeinde and nation to the
 EditAdresse Component and adds autocomplete for the gemeinde if the nation is
 A

---
 application/controllers/Cis/Profil.php        | 67 ++++++++-----------
 public/js/apps/api/userdata.js                |  7 ++
 .../Profil/ProfilComponents/EditAdresse.js    | 53 ++++++++-------
 3 files changed, 63 insertions(+), 64 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index defb753a7..0591eef60 100755
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -25,6 +25,7 @@ class Profil extends Auth_Controller
 			'getZustellAdresse' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'getZustellKontakt' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'getAllNationen' => ['student/anrechnung_beantragen:r', 'user:r'],
+			'getGemeinden' => ['student/anrechnung_beantragen:r', 'user:r'],
 			
 		]);
 
@@ -366,49 +367,35 @@ class Profil extends Auth_Controller
 
 	}
 
-	//TODO: use the old query check to get the correct values to display for the user in case he selected the nation Austria (A)
-	/* if($_POST['nation']=='A')
-	{
-		if(is_numeric($_POST['plz']) && $_POST['plz']<32000)
-		{
-			$qry = "SELECT * FROM bis.tbl_gemeinde WHERE lower(name)=lower(".$db->db_add_param($_POST['gemeinde']).")
-					AND plz=".$db->db_add_param($_POST['plz']);
-			if($db->db_query($qry))
-			{
-				if($row = $db->db_fetch_object())
-				{
-					$adresse->gemeinde = $row->name;
-				}
-				else
-				{
-					$error = true;
-					$errormsg = 'Gemeinde ist ungueltig';
-					$return = false;
+
+	public function getGemeinden(){
+		
+		$nation = $this->input->get('nation',true);
+		//? json_decode on zip to transform zip from string to integer
+		$zip = json_decode($this->input->get('zip',true));
+		
+		$this->load->model('codex/Gemeinde_model',"GemeindeModel");
+		$this->GemeindeModel->addSelect(["name"]);
+		if($nation == "A"){
+			if(isset($zip) && $zip>999 && $zip <32000){
+
+				$gemeinde_res = $this->GemeindeModel->loadWhere(['ortschaftskennziffer'=>$zip]);
+				if(isError($gemeinde_res)){
+					show_error("error while trying to query bis.tbl_gemeinde");
 				}
+				$gemeinde_res = hasData($gemeinde_res) ? getData($gemeinde_res) : null;
+				$gemeinde_res = array_map(function($obj){
+					return $obj->name;
+				},$gemeinde_res);
+				echo json_encode($gemeinde_res);
+
+			}else{
+				echo json_encode(error("ortschaftskennziffer code was not valid"));
 			}
-			else
-			{
-				$error = true;
-				$errormsg = 'Fehler beim Ermitteln der Gemeinde';
-				$return = false;
-			}
+		}else{
+			echo json_encode(error("Nation was not 'A' (Austria)"));
 		}
-		else
-		{
-			$error = true;
-			$errormsg = 'Postleitzahl ist fuer diese Nation ungueltig';
-			$return = false;
-		}
-	} */
-	public function getAllGemeinden(){
-		$this->load->model('public/Gemeinde_model',"NationModel");
-		$this->NationModel->addSelect(["langtext"]);
-		$nation_res = $this->NationModel->load();
-		if(isError($nation_res)){
-			show_error("error while trying to query table codex.tbl_nation");
-		}
-		$nation_res = hasData($nation_res) ? getData($nation_res) : null;
-		echo json_encode($nation_res);
+		
 
 	}
 
diff --git a/public/js/apps/api/userdata.js b/public/js/apps/api/userdata.js
index 1fdc9c661..defea2cbb 100755
--- a/public/js/apps/api/userdata.js
+++ b/public/js/apps/api/userdata.js
@@ -1,6 +1,13 @@
 export default {
   //! API Calls for Profil Views
 
+  getGemeinden: function(nation,zip=null){
+    const url =
+      FHC_JS_DATA_STORAGE_OBJECT.app_root +
+      `cis.php/Cis/Profil/getGemeinden`;
+    return axios.get(url,{params:{nation:nation,zip:zip}});
+  },
+
   getAllNationen:function(){
     const url =
       FHC_JS_DATA_STORAGE_OBJECT.app_root +
diff --git a/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js b/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
index e6fb3877f..4ba07c603 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
@@ -9,12 +9,29 @@ export default {
     inject:["zustellAdresseCount"],
     data(){
         return{
+            gemeinden:[],
+            selectedNation:null,
             nationenList:[],
             originalValue:null,
             zustellAdressenCount:null,
         }
     },
     methods:{
+       
+
+        getGemeinde: function(){
+            //? only query the gemeinde is the nation is Austria and the PLZ is greater than 999 and less than 32000
+            if(this.data.nation && this.data.nation ==="A" && (this.data.plz && (this.data.plz >999 && this.data.plz <32000))){
+                Vue.$fhcapi.UserData.getGemeinden(this.data.nation,this.data.plz).then(res => {
+                    
+                    if(res.data.length){
+                        this.gemeinden = res.data;
+                    }
+                })
+            }else{
+                this.gemeinden = [];
+            }
+        },
         updateValue: function(event,bind){
             //? sets the value of a property to null when an empty string is entered to keep the isChanged function valid 
             if(bind ==="zustelladresse" ){
@@ -38,20 +55,6 @@ export default {
             }
             //? if this.zustellAdressenCount is still not set by the api call and is still null
             return false;
-            
-
-        },
-        ortLayoutClasses: function(){
-            return this.showKontaktTyp?[
-                'col-12', 
-                'col-sm-7',
-                'col-xl-12',
-                'col-xxl-7',
-            ]:['col-12'];
-        },
-        showKontaktTyp: function(){
-            let kontaktTypen = ["Nebenwohnsitz","Hauptwohnsitz"];
-            return kontaktTypen.includes(this.data.typ) || !this.data.typ
         },
         isChanged: function(){
             if(!this.data.strasse || !this.data.plz || !this.data.ort || !this.data.typ){
@@ -61,23 +64,23 @@ export default {
             return this.originalValue !== JSON.stringify(this.data);
         },
     },
+   
     created(){
         
         Vue.$fhcapi.UserData.getAllNationen().then(res => {
             this.nationenList = res.data;
+            this.getGemeinde();
         });
 
-        //? same for Gemeinde
-        /* Vue.$fhcapi.UserData.getAllNationen().then(res => {
-            this.nationenList = res.data;
-        }); */
+
         this.originalValue = JSON.stringify(this.data);
         this.zustellAdressenCount = this.zustellAdresseCount();
         
     },
     template:`
+
      <div class="gy-3 row justify-content-center align-items-center">
-     
+     <pre> {{JSON.stringify(gemeinden,null,2)}}</pre>
      
      <!-- warning message for too many zustellungs Adressen -->
      <div v-if="showZustellAdressenWarning" class="col-12 ">
@@ -151,22 +154,24 @@ export default {
             <div class="form-underline ">
             <div class="form-underline-titel">PLZ</div>
     
-            <input  class="form-control" :value="data.plz" @input="updateValue($event,'plz')" :placeholder="data.plz">
+            <input  class="form-control" :value="data.plz" @input="updateValue($event,'plz')" @input="getGemeinde" :placeholder="data.plz">
         
             </div>
         </div>
         <div class="col-6 order-5">
+       
         <div class="form-underline ">
         <div class="form-underline-titel">Gemeinde</div>
-
-        <input  class="form-control" :value="data.gemeinde" @input="updateValue($event,'gemeinde')" :placeholder="data.gemeinde">
-    
+        <input :value="data.gemeinde" @input="updateValue($event,'gemeinde')"  type="text" class="form-control" id="gemeineInput" list="gemeindeOptions">
+        <datalist id="gemeindeOptions">
+          <option v-for="option in gemeinden" :value="option">
+        </datalist>
         </div>
         </div>
         <div class="col-6 order-5 ">
         <div class="form-underline ">
         <div class="form-underline-titel">nation</div>
-            <select  :value="data.nation" @change="updateValue($event,'nation')" class="form-select" aria-label="Select Kontakttyp">
+            <select  :value="data.nation" @change="updateValue($event,'nation')" @change="getGemeinde" class="form-select" aria-label="Select Kontakttyp">
                 <option selected></option>
                 <option :value="nation.code" v-for="nation in nationenList">{{nation.langtext}}</option>
             

From 4edd242f0925c86cc96b87557addada36458ccc8 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 21 Feb 2024 15:44:41 +0100
Subject: [PATCH 0433/1461] adds documentation to the Profil.php controller not
 finished

---
 application/controllers/Cis/Profil.php | 437 +++++++++++++------------
 1 file changed, 228 insertions(+), 209 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index 0591eef60..020fd0e56 100755
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -234,7 +234,11 @@ class Profil extends Auth_Controller
 		return $res;
 	}
 
-
+	/**
+	 * function that returns the data used for the corresponding view
+	 * @access private 
+	 * @return stdClass all the information corresponding to a view of a user
+	 */
 	private function studentProfil()
 	{
 		$betriebsmittelperson_res = $this->getBetriebsmittelInfo($this->pid);
@@ -278,6 +282,12 @@ class Profil extends Auth_Controller
 		return $res;
 	}
 
+	/**
+	 * function that returns the data used for the corresponding view
+	 * @access public
+	 * @param  boolean $uid the userID used to identify which information should be retrieved for which view 
+	 * @return stdClass all the information corresponding to a view of a user
+	 */
 	public function getView($uid)
 	{
 		//TODO: refactor
@@ -331,30 +341,33 @@ class Profil extends Auth_Controller
 
 	}
 
-	public function foto_sperre_function($value) //TODO: refactor function
+	/**
+	 * update column foto_sperre in public.tbl_person
+	 * @access public
+	 * @param  boolean $value  new value for the column
+	 * @return boolean the new value added to the column in public.tbl_person
+	 */
+	public function foto_sperre_function($value) 
 	{
-		//? Nur der Index User hat die Erlaubniss das Profilbild zu sperren 
 		$res = $this->PersonModel->update($this->pid, ["foto_sperre" => $value]);
-
 		if (isError($res)) {
-			echo json_encode("error encountered when updating foto_sperre");
-			return;
-			// error handling
-		} else {
-			//? select the value of the column foto_sperre to return 
-			if (isSuccess($this->PersonModel->addSelect("foto_sperre"))) {
-				$res = $this->PersonModel->load($this->pid);
-				if (isError($res)) {
-					// error handling
-				}
-				$res = hasData($res) ? getData($res)[0] : null;
-			}
-
+			show_error("error while trying to update table public.tbl_person");
+		} 
+		$this->PersonModel->addSelect("foto_sperre");
+		$res = $this->PersonModel->load($this->pid);
+		if (isError($res)) {
+			show_error("error while trying to query table public.tbl_person");
 		}
+		$res = hasData($res) ? getData($res)[0] : null;
 		echo json_encode($res);
 	}
 
-
+	/**
+	 * gets all nations in the table bis.tbl_nation
+	 *
+	 * @access public
+	 * @return array all the nations in table bis.tbl_nation
+	 */
 	public function getAllNationen(){
 		$this->load->model('codex/Nation_model',"NationModel");
 		$this->NationModel->addSelect(["nation_code as code","langtext"]);
@@ -364,18 +377,22 @@ class Profil extends Auth_Controller
 		}
 		$nation_res = hasData($nation_res) ? getData($nation_res) : null;
 		echo json_encode($nation_res);
-
 	}
 
-
+	/**
+	 * gets specific gemeinden which are related to the ZIP and the Nation passed in the body of the get request
+	 * @access public
+	 * @var    $_GET function uses GET request payload
+	 * @return boolean the new value added to the column in public.tbl_person
+	 */
 	public function getGemeinden(){
-		
+		/** @var $nation value parsed out of the body of the get request */	
 		$nation = $this->input->get('nation',true);
-		//? json_decode on zip to transform zip from string to integer
+		/** @var $zip value parsed out of the body of the get request and converted to a php integer with json_decode */
 		$zip = json_decode($this->input->get('zip',true));
 		
 		$this->load->model('codex/Gemeinde_model',"GemeindeModel");
-		$this->GemeindeModel->addSelect(["name"]);
+		$this->GemeindeModel->addSelect(["DISTINCT name"]);
 		if($nation == "A"){
 			if(isset($zip) && $zip>999 && $zip <32000){
 
@@ -395,272 +412,274 @@ class Profil extends Auth_Controller
 		}else{
 			echo json_encode(error("Nation was not 'A' (Austria)"));
 		}
-		
-
 	}
 
-
-	//? queries the Mailverteiler of a benutzer
+	/**
+	 * gets all the mailverteiler using the tables: tbl_benutzer, tbl_benutzergruppe, tbl_gruppe
+	 * @access private
+	 * @param  integer $uid  the userID used to retrieve the mailverteiler 
+	 * @return array returns the mailvertailer corresponding to a userID 
+	 */
 	private function getMailverteiler($uid){
-		$mailverteiler_res = null;
-		if (
-			isSuccess($this->PersonModel->addSelect('gruppe_kurzbz, beschreibung')) &&
-			isSuccess($this->PersonModel->addJoin('tbl_benutzer', 'person_id')) &&
-			isSuccess($this->PersonModel->addJoin('tbl_benutzergruppe', 'uid')) &&
-			isSuccess($this->PersonModel->addJoin('tbl_gruppe', 'gruppe_kurzbz'))
-		) {
+		$this->PersonModel->addSelect('gruppe_kurzbz, beschreibung');
+		$this->PersonModel->addJoin('tbl_benutzer', 'person_id');
+		$this->PersonModel->addJoin('tbl_benutzergruppe', 'uid');
+		$this->PersonModel->addJoin('tbl_gruppe', 'gruppe_kurzbz');
 
-			$mailverteiler_res = $this->PersonModel->loadWhere(array('mailgrp' => true, 'uid' => $uid));
-			if (isError($mailverteiler_res)) {
-				// catch error
-			}
-			$mailverteiler_res = hasData($mailverteiler_res) ? getData($mailverteiler_res) : null;
-
-			$mailverteiler_res = array_map(function ($element) {
-				$element->mailto = "mailto:" . $element->gruppe_kurzbz . "@" . DOMAIN;
-				return $element; }, $mailverteiler_res);
+		$mailverteiler_res = $this->PersonModel->loadWhere(array('mailgrp' => true, 'uid' => $uid));
+		if (isError($mailverteiler_res)) {
+			show_error("was not able the query the table public.tbl_benutzer:".getData($mailverteiler_res));
 		}
-
-		
+		$mailverteiler_res = hasData($mailverteiler_res) ? getData($mailverteiler_res) : null;
+		$mailverteiler_res = array_map(function ($element) {
+			$element->mailto = "mailto:" . $element->gruppe_kurzbz . "@" . DOMAIN;
+			return $element; 
+		}, $mailverteiler_res);
 		return $mailverteiler_res;
 	}
 
+	/**
+	 * gets all the Benutzerfunktionen of a corresponding user
+	 * @access private
+	 * @param  integer $uid  the userID used to retrieve the Benutzerfunktionen 
+	 * @return array returns the Benutzerfunktionen corresponding to a userID 
+	 */
 	private function getBenutzerFunktion($uid){
-		$benutzer_funktion_res = null;
-		if (
-			//! Summe der Wochenstunden wird jetzt in der hr/tbl_dienstverhaeltnis gespeichert
-			isSuccess($this->BenutzerfunktionModel->addSelect(["tbl_benutzerfunktion.bezeichnung as Bezeichnung", "tbl_organisationseinheit.bezeichnung as Organisationseinheit", "datum_von as Gültig_von", "datum_bis as Gültig_bis", "wochenstunden as Wochenstunden"])) &&
-			isSuccess($this->BenutzerfunktionModel->addJoin("tbl_organisationseinheit", "oe_kurzbz"))
-		) {
-			$benutzer_funktion_res = $this->BenutzerfunktionModel->loadWhere(array('uid' => $uid));
-			if (isError($benutzer_funktion_res)) {
-				// error handling
-			} else {
-				$benutzer_funktion_res = hasData($benutzer_funktion_res) ? getData($benutzer_funktion_res) : null;
-			}
+		$this->BenutzerfunktionModel->addSelect(["tbl_benutzerfunktion.bezeichnung as Bezeichnung", "tbl_organisationseinheit.bezeichnung as Organisationseinheit", "datum_von as Gültig_von", "datum_bis as Gültig_bis", "wochenstunden as Wochenstunden"]);
+		$this->BenutzerfunktionModel->addJoin("tbl_organisationseinheit", "oe_kurzbz");
+	
+		$benutzer_funktion_res = $this->BenutzerfunktionModel->loadWhere(array('uid' => $uid));
+		if (isError($benutzer_funktion_res)) {
+			show_error("was not able the query the table public.tbl_benutzerfunktion:".getData($benutzer_funktion_res));
 		}
-		
+		$benutzer_funktion_res = hasData($benutzer_funktion_res) ? getData($benutzer_funktion_res) : null;
 		return $benutzer_funktion_res;
 	}
 
+	/**
+	 * gets all the Betriebsmittel of a corresponding user
+	 * @access private
+	 * @param  integer $uid  the userID used to retrieve the Betriebsmittel 
+	 * @return array returns the Betriebsmittel corresponding to a userID 
+	 */
 	private function getBetriebsmittelInfo($pid){
-		$betriebsmittelperson_res = null;
-		if (
+		$this->BetriebsmittelpersonModel->addSelect(["CONCAT(betriebsmitteltyp, ' ' ,beschreibung) as Betriebsmittel", "nummer as Nummer", "ausgegebenam as Ausgegeben_am"]);
 
-			isSuccess($this->BetriebsmittelpersonModel->addSelect(["CONCAT(betriebsmitteltyp, ' ' ,beschreibung) as Betriebsmittel", "nummer as Nummer", "ausgegebenam as Ausgegeben_am"]))
-
-		) {
-			//? betriebsmittel are not needed in a view
-			$betriebsmittelperson_res = $this->BetriebsmittelpersonModel->getBetriebsmittel($pid);
-			if (isError($betriebsmittelperson_res)) {
-				// error handling
-			} else {
-				$betriebsmittelperson_res = hasData($betriebsmittelperson_res) ? getData($betriebsmittelperson_res) : null;
-			}
+		//? betriebsmittel are not needed in a view
+		$betriebsmittelperson_res = $this->BetriebsmittelpersonModel->getBetriebsmittel($pid);
+		if (isError($betriebsmittelperson_res)) {
+			show_error("was not able the query the table public.tbl_betriebsmittelperson:".getData($betriebsmittelperson_res));
 		}
+		$betriebsmittelperson_res = hasData($betriebsmittelperson_res) ? getData($betriebsmittelperson_res) : null;
 		return $betriebsmittelperson_res;
 	}
 
+	/**
+	 * gets the alias of a corresponding user
+	 * @access private
+	 * @param  integer $uid the userID used to get the alias
+	 * @return string the alias of the userID
+	 */
 	private function getBenutzerAlias($uid){
-		$benutzer_res = null;
-		if (isSuccess($this->BenutzerModel->addSelect(["alias"]))) {
-			$benutzer_res = $this->BenutzerModel->load([$uid]);
-			if (isError($benutzer_res)) {
-				// error handling
-			} else {
-				$benutzer_res = hasData($benutzer_res) ? getData($benutzer_res)[0] : null;
-			}
+		$this->BenutzerModel->addSelect(["alias"]);
+		$benutzer_res = $this->BenutzerModel->load([$uid]);
+		if (isError($benutzer_res)) {
+			show_error("was not able the query the table public.tbl_benutzer:".getData($benutzer_res));
+		} else {
+			$benutzer_res = hasData($benutzer_res) ? getData($benutzer_res)[0] : null;
 		}
+	
 		return $benutzer_res;
 	}
 
+	/**
+	 * gets the person information corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the person information
+	 * @param  integer $geburtsInfo flag wether to add the columns gebort, gebdatum, foto_sperre or not
+	 * @return array all the person informaion corresponding to a userID
+	 */
 	private function getPersonInfo($uid, $geburtsInfo = null){
-		
-		$person_res = null;
 		$selectClause = ["foto", "anrede", "titelpost as postnomen", "titelpre as titel", "vorname", "nachname"];
-		//? $geburtsInfo flag checks whether gebort and gebdatum should also be added to the query
+		/** @param integer $geburtsInfo */
 		if($geburtsInfo){
 			array_push($selectClause,"gebort");
 			array_push($selectClause,"gebdatum");
 			array_push($selectClause,"foto_sperre");
 		}
-		if (
-			isSuccess($this->BenutzerModel->addSelect($selectClause))
-			&& isSuccess($this->BenutzerModel->addJoin("tbl_person", "person_id"))
-		) {
-
-			$person_res = $this->BenutzerModel->load([$uid]);
-			if (isError($person_res)) {
-				// error handling
-			} else {
-				$person_res = hasData($person_res) ? getData($person_res)[0] : null;
-			}
+		$this->BenutzerModel->addSelect($selectClause);
+		$this->BenutzerModel->addJoin("tbl_person", "person_id");
+	
+		$person_res = $this->BenutzerModel->load([$uid]);
+		if (isError($person_res)) {
+			show_error("was not able the query the table public.tbl_benutzer:".getData($person_res));
+		} else {
+			$person_res = hasData($person_res) ? getData($person_res)[0] : null;
 		}
+		
 		return $person_res;
 	}
 
+	/**
+	 * gets the mitarbeiter information corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the mitarbeiter information
+	 * @return array all the mitarbeiter informaion corresponding to a userID
+	 */
 	private function getMitarbeiterInfo($uid){
-		$mitarbeiter_res = null;
-		if (
-			isSuccess($this->MitarbeiterModel->addSelect(["kurzbz", "telefonklappe", "alias", "ort_kurzbz"]))
-			&& isSuccess($this->MitarbeiterModel->addJoin("tbl_benutzer", "tbl_benutzer.uid = tbl_mitarbeiter.mitarbeiter_uid"))
-		) {
-			$mitarbeiter_res = $this->MitarbeiterModel->load($uid);
-			if (isError($mitarbeiter_res)) {
-				// error handling
-			} else {
-				$mitarbeiter_res = hasData($mitarbeiter_res) ? getData($mitarbeiter_res)[0] : null;
-			}
+		$this->MitarbeiterModel->addSelect(["kurzbz", "telefonklappe", "alias", "ort_kurzbz"]);
+		$this->MitarbeiterModel->addJoin("tbl_benutzer", "tbl_benutzer.uid = tbl_mitarbeiter.mitarbeiter_uid");
+		$mitarbeiter_res = $this->MitarbeiterModel->load($uid);
+		if (isError($mitarbeiter_res)) {
+			show_error("was not able the query the table public.tbl_mitarbeiter:".getData($mitarbeiter_res));
+		} else {
+			$mitarbeiter_res = hasData($mitarbeiter_res) ? getData($mitarbeiter_res)[0] : null;
 		}
+	
 		return $mitarbeiter_res;
 	}
 
+	/**
+	 * gets the telefon information corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the telefon information
+	 * @return array all the telefon informaion corresponding to a userID
+	 */
 	private function getTelefonInfo($uid){
-		$telefon_res = null;
-		if (
-			isSuccess($this->MitarbeiterModel->addSelect(["kontakt"])) &&
-			isSuccess($this->MitarbeiterModel->addJoin("tbl_kontakt", "tbl_mitarbeiter.standort_id = tbl_kontakt.standort_id"))
-
-
-		) {
-			$this->MitarbeiterModel->addLimit(1);
-			$telefon_res = $this->MitarbeiterModel->loadWhere(["mitarbeiter_uid" => $uid, "kontakttyp" => "telefon"]);
-			if (isError($telefon_res)) {
-				// error handling
-			} else {
-				$telefon_res = hasData($telefon_res) ? getData($telefon_res)[0] : null;
-			}
+		$this->MitarbeiterModel->addSelect(["kontakt"]);
+		$this->MitarbeiterModel->addJoin("tbl_kontakt", "tbl_mitarbeiter.standort_id = tbl_kontakt.standort_id");
+		$this->MitarbeiterModel->addLimit(1);
+		$telefon_res = $this->MitarbeiterModel->loadWhere(["mitarbeiter_uid" => $uid, "kontakttyp" => "telefon"]);
+		if (isError($telefon_res)) {
+			show_error("was not able the query the table public.tbl_mitarbeiter:".getData($telefon_res));
 		}
+		$telefon_res = hasData($telefon_res) ? getData($telefon_res)[0] : null;
 		return $telefon_res;
-
-		
 	}
 
-
+	/**
+	 * gets the student information corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the student information
+	 * @return array all the student informaion corresponding to a userID
+	 */
 	private function getStudentInfo($uid){
-
-		$student_res = null;
-
-		//? personenkennzeichen ist die Spalte Matrikelnr in der Tabelle Student
-		if (
-			isSuccess($this->StudentModel->addSelect(['tbl_studiengang.bezeichnung as studiengang', 'tbl_student.semester', 'tbl_student.verband', 'tbl_student.gruppe', 'tbl_student.matrikelnr as personenkennzeichen']))
-			&& isSuccess($this->StudentModel->addJoin('tbl_studiengang', "tbl_studiengang.studiengang_kz=tbl_student.studiengang_kz"))
-		) {
-			$student_res = $this->StudentModel->load([$uid]);
-			if (isError($student_res)) {
-				// catch error
-			}
-			$student_res = hasData($student_res) ? getData($student_res)[0] : null;
-
+		$this->StudentModel->addSelect(['tbl_studiengang.bezeichnung as studiengang', 'tbl_student.semester', 'tbl_student.verband', 'tbl_student.gruppe', 'tbl_student.matrikelnr as personenkennzeichen']);
+		$this->StudentModel->addJoin('tbl_studiengang', "tbl_studiengang.studiengang_kz=tbl_student.studiengang_kz");
+		
+		$student_res = $this->StudentModel->load([$uid]);
+		if (isError($student_res)) {
+			show_error("was not able the query the table public.tbl_student:".getData($student_res));
 		}
-
+		$student_res = hasData($student_res) ? getData($student_res)[0] : null;
 		return $student_res;
 	}
 
-
+	/**
+	 * gets the profil updates corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the profil updates
+	 * @return array all the profil updates corresponding to a userID
+	 */
 	private function getProfilUpdates($uid){
-		$profilUpdates = null;
 		$profilUpdates = $this->ProfilUpdateModel->getProfilUpdatesWhere(['uid'=>$uid]);
 		if(isError($profilUpdates)){
-			//error handling
-		}else{
-			//? array containing all the requested profil information changes from the current user
-			$profilUpdates = hasData($profilUpdates) ? getData($profilUpdates) : null;
-			
-		} 
+			show_error("was not able the query the table public.tbl_profil_update:".getData($profilUpdates));
+		}
+		$profilUpdates = hasData($profilUpdates) ? getData($profilUpdates) : null;
 		return $profilUpdates;
 	}
 
+	/**
+	 * gets the Matrikelnummer corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the Matrikelnummer
+	 * @return integer the Matrikelnummer corresponding to a userID
+	 */
 	private function getMatrikelNummer($uid){
-		$matr_res = null;
-		if (
-			isSuccess($this->BenutzerModel->addSelect(["matr_nr"]))
-			&& isSuccess($this->BenutzerModel->addJoin("tbl_person", "person_id"))
-		) {
-			$matr_res = $this->BenutzerModel->load([$uid]);
-			if (isError($matr_res)) {
-				// catch error
-			} else {
-				$matr_res = hasData($matr_res) ? getData($matr_res)[0] : [];
-
-			}
+		$this->BenutzerModel->addSelect(["matr_nr"]);
+		$this->BenutzerModel->addJoin("tbl_person", "person_id");
+	
+		$matr_res = $this->BenutzerModel->load([$uid]);
+		if (isError($matr_res)) {
+			show_error("was not able the query the table public.tbl_benutzer:".getData($matr_res));
 		}
+		$matr_res = hasData($matr_res) ? getData($matr_res)[0] : [];
 		return $matr_res;
 	}
 
+	/**
+	 * gets the Zutrittsgruppen corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the Zutrittsgruppen
+	 * @return array all the Zutrittsgruppen corresponding to a userID
+	 */
 	private function getZutrittsgruppen($uid){
-		$zutrittsgruppe_res = null;
-		if (
-
-			isSuccess($this->BenutzergruppeModel->addSelect(['bezeichnung']))
-			&& isSuccess($this->BenutzergruppeModel->addJoin('tbl_gruppe', 'gruppe_kurzbz'))
-		) {
-			$zutrittsgruppe_res = $this->BenutzergruppeModel->loadWhere(array("uid" => $uid, "zutrittssystem" => true));
-			if (isError($zutrittsgruppe_res)) {
-				// catch error
-			}
-			$zutrittsgruppe_res = hasData($zutrittsgruppe_res) ? getData($zutrittsgruppe_res) : null;
-
+		$this->BenutzergruppeModel->addSelect(['bezeichnung']);
+		$this->BenutzergruppeModel->addJoin('tbl_gruppe', 'gruppe_kurzbz');
+	
+		$zutrittsgruppe_res = $this->BenutzergruppeModel->loadWhere(array("uid" => $uid, "zutrittssystem" => true));
+		if (isError($zutrittsgruppe_res)) {
+			show_error("was not able the query the table public.tbl_benutzergruppe:".getData($zutrittsgruppe_res));
 		}
+		$zutrittsgruppe_res = hasData($zutrittsgruppe_res) ? getData($zutrittsgruppe_res) : null;
 		return $zutrittsgruppe_res;
 	}
 
+	/**
+	 * gets the address information corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the address information
+	 * @return array all the address information corresponding to a userID
+	 */
 	private function getAdressenInfo($pid){
-		$adresse_res = null;
-		if (
-
-			isSuccess($adresse_res = $this->AdresseModel->addSelect(["adresse_id","strasse", "tbl_adressentyp.bezeichnung as typ", "plz", "ort","zustelladresse","gemeinde","nation"])) &&
-			isSuccess($adresse_res = $this->AdresseModel->addOrder("zustelladresse", "DESC")) &&
-			isSuccess($adresse_res = $this->AdresseModel->addJoin("tbl_adressentyp", "typ=adressentyp_kurzbz")) 
-		) {
-			$adresse_res = $this->AdresseModel->loadWhere(array("person_id" => $pid));
-			if (isError($adresse_res)) {
-				// error handling
-			} else {
-				$adresse_res = hasData($adresse_res) ? getData($adresse_res) : null;
-			}
-		}
+		$adresse_res = $this->AdresseModel->addSelect(["adresse_id","strasse", "tbl_adressentyp.bezeichnung as typ", "plz", "ort","zustelladresse","gemeinde","nation"]);
+		$adresse_res = $this->AdresseModel->addOrder("zustelladresse", "DESC");
+		$adresse_res = $this->AdresseModel->addJoin("tbl_adressentyp", "typ=adressentyp_kurzbz");
 		
+		$adresse_res = $this->AdresseModel->loadWhere(["person_id" => $pid]);
+		if (isError($adresse_res)) {
+			show_error("was not able the query the table public.tbl_adresse:".getData($adresse_res));
+		}
+		$adresse_res = hasData($adresse_res) ? getData($adresse_res) : null;
 		return $adresse_res;
 	}
 
+	/**
+	 * gets the kontakt information corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the kontakt information
+	 * @return array all the kontakt information corresponding to a userID
+	 */
 	private function getKontaktInfo($pid){
-		$kontakte_res = null;
-		if (
-
-			//? kontaktdaten soll auch nur der user selbst sehen
-			//DISTINCT ON (kontakttyp)
-			isSuccess($this->KontaktModel->addSelect(['kontakttyp','kontakt_id','kontakt', 'tbl_kontakt.anmerkung', 'tbl_kontakt.zustellung'])) &&
-			isSuccess($this->KontaktModel->addJoin('public.tbl_standort', 'standort_id', 'LEFT')) &&
-			isSuccess($this->KontaktModel->addJoin('public.tbl_firma', 'firma_id', 'LEFT')) &&
-			isSuccess($this->KontaktModel->addOrder('kontakttyp, kontakt, tbl_kontakt.updateamum, tbl_kontakt.insertamum'))
-		) {
-			$kontakte_res = $this->KontaktModel->loadWhere(array('person_id' => $pid));
-			if (isError($kontakte_res)) {
-				// handle error	
-			} else {
-				$kontakte_res = hasData($kontakte_res) ? getData($kontakte_res) : null;
-				
-				
-			}
-
+		$this->KontaktModel->addSelect(['kontakttyp','kontakt_id','kontakt', 'tbl_kontakt.anmerkung', 'tbl_kontakt.zustellung']);
+		$this->KontaktModel->addJoin('public.tbl_standort', 'standort_id', 'LEFT');
+		$this->KontaktModel->addJoin('public.tbl_firma', 'firma_id', 'LEFT');
+		$this->KontaktModel->addOrder('kontakttyp, kontakt, tbl_kontakt.updateamum, tbl_kontakt.insertamum');
+	
+		$kontakte_res = $this->KontaktModel->loadWhere(['person_id' => $pid]);
+		if (isError($kontakte_res)) {
+			show_error("was not able the query the table public.tbl_kontakt:".getData($kontakte_res));
 		}
-		
+		$kontakte_res = hasData($kontakte_res) ? getData($kontakte_res) : null;		
 		return $kontakte_res;
 	}
 
+	/**
+	 * gets the date of issue of the FH access card corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the date of issue of the FH access card
+	 * @return string the date of issue of the FH access card corresponding to a userID
+	 */
 	private function getZutrittskarteDatum($uid){
-		$zutrittskarte_ausgegebenam = null;
 		$zutrittskarte_ausgegebenam = $this->BetriebsmittelpersonModel->getBetriebsmittelByUid($uid, "Zutrittskarte");
 		if (isError($zutrittskarte_ausgegebenam)) {
-			// error handling
-		} else {
-			$zutrittskarte_ausgegebenam = hasData($zutrittskarte_ausgegebenam) ? getData($zutrittskarte_ausgegebenam)[0]->ausgegebenam : null;
-			//? formats the date from 01-01-2000 to 01.01.2000
-			$zutrittskarte_ausgegebenam = str_replace("-", ".", $zutrittskarte_ausgegebenam);
-		}
+			show_error("was not able the query the table wavi.tbl_bentriebsmittelperson:".getData($zutrittskarte_ausgegebenam));
+		} 
+		$zutrittskarte_ausgegebenam = hasData($zutrittskarte_ausgegebenam) ? getData($zutrittskarte_ausgegebenam)[0]->ausgegebenam : null;
 
-		
+		//? formats date from 01-01-2000 to 01.01.2000
+		$zutrittskarte_ausgegebenam = str_replace("-", ".", $zutrittskarte_ausgegebenam);
 		return $zutrittskarte_ausgegebenam;
 	}
 

From 0b84e1b6088d5b4017d54d85dff76ce1c0424c1e Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 22 Feb 2024 09:00:53 +0100
Subject: [PATCH 0434/1461] finishes documentation on Profil.php controller

---
 application/controllers/Cis/Profil.php        | 608 ++++++++++--------
 .../models/person/Profil_update_model.php     |   9 +-
 2 files changed, 334 insertions(+), 283 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index 020fd0e56..71f9335a5 100755
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -3,9 +3,6 @@
 if (!defined('BASEPATH'))
 	exit('No direct script access allowed');
 
-/**
- *
- */
 class Profil extends Auth_Controller
 {
 
@@ -16,7 +13,7 @@ class Profil extends Auth_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'index' => ['student/anrechnung_beantragen:r', 'user:r'], 
+			'index' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'foto_sperre_function' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'getView' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'View' => ['student/anrechnung_beantragen:r', 'user:r'],
@@ -26,10 +23,8 @@ class Profil extends Auth_Controller
 			'getZustellKontakt' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'getAllNationen' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'getGemeinden' => ['student/anrechnung_beantragen:r', 'user:r'],
-			
-		]);
 
-		
+		]);
 
 		$this->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
 		$this->load->model('crm/Student_model', 'StudentModel');
@@ -47,22 +42,22 @@ class Profil extends Auth_Controller
 		//? put the uid and pid inside the controller for reusability
 		$this->uid = getAuthUID();
 		$this->pid = getAuthPersonID();
-		
-
-
 	}
 
 	// -----------------------------------------------------------------------------------------------------------------
 	// Public methods
 
 	/**
-	 * @return void
+	 * index loads the Profil view
+	 * @access public
+	 * @return void 
 	 */
-
 	public function index()
 	{
 		$this->load->view('Cis/Profil');
 	}
+
+
 	public function View($uid)
 	{
 
@@ -74,212 +69,68 @@ class Profil extends Auth_Controller
 
 	}
 
-	//? foreward declaration of the function isStudent in Student_model.php
-	public function isStudent($uid){
+	/**
+	 * checks whether a specific userID is a mitarbeiter or not (foreword declaration of the function isMitarbeiter in Mitarbeiter_model.php)
+	 * @access public
+	 * @param  $uid the userID used to check if it is a mitarbeiter
+	 * @return boolean 
+	 */
+	public function isStudent($uid)
+	{
 		$result = $this->StudentModel->isStudent($uid);
-		if(!isSuccess($result)){
-			show_error("error when calling Student_model function isStudent with uid ".$uid);
+		if (isError($result)) {
+			show_error("error when calling Student_model function isStudent with uid " . $uid);
 		}
 		$result = getData($result);
 		echo json_encode($result);
 	}
 
-	//? foreward declaration of the function isMitarbeiter in Mitarbeiter_model.php
-	public function isMitarbeiter($uid){
-		$result = $this->MitarbeiterModel->isMitarbeiter($uid);
-		if(!isSuccess($result)){
-			show_error("error when calling Mitarbeiter_model function isMitarbeiter with uid ".$uid);
-		}
-		$result = getData($result);
-		echo json_encode($result);
-	}
-
-	public function getZustellAdresse(){
-		$this->AdresseModel->addSelect(["adresse_id"]);
-		$adressen_res = $this->AdresseModel->loadWhere(['person_id'=>$this->pid, 'zustelladresse'=>true]);
-		$adressen_res = hasData($adressen_res) ? getData($adressen_res): null;
-		$adressen_res = array_map(function($item){
-			return $item->adresse_id;
-		},$adressen_res);
-		echo json_encode($adressen_res);
-	}
-
-	public function getZustellKontakt(){
-		$this->KontaktModel->addSelect(["kontakt_id"]);
-		$kontakt_res = $this->KontaktModel->loadWhere(['person_id'=>$this->pid, 'zustellung'=>true]);
-		$kontakt_res = hasData($kontakt_res) ? getData($kontakt_res): null;
-		$kontakt_res = array_map(function($item){
-			return $item->kontakt_id;
-		},$kontakt_res);
-		echo json_encode($kontakt_res);
-	}
-
-
-	private function viewMitarbeiterProfil($uid)
-	{
-		$mailverteiler_res = $this->getMailverteiler($uid);
-		$benutzer_funktion_res = $this->getBenutzerFunktion($uid);
-		$benutzer_res = $this->getBenutzerAlias($uid);
-		$person_res = $this->getPersonInfo($uid);
-		$mitarbeiter_res = $this->getMitarbeiterInfo($uid);
-		$telefon_res = $this->getTelefonInfo($uid);
-
-		$res = new stdClass();
-		$res->username = $uid;
-
-		//? Person Info
-		foreach($person_res as $key => $val){
-			$res->$key = $val;
-		}
-	
-		//? Mitarbeiter Info
-		foreach ($mitarbeiter_res as $key => $val) {
-			$res->$key = $val;
-
-		}
-
-		$intern_email = array();
-		$intern_email["type"] = "intern";
-		$intern_email["email"] = $uid . "@" . DOMAIN;
-		$extern_email = array();
-		$extern_email["type"] = "alias";
-		$extern_email["email"] = $benutzer_res->alias . "@" . DOMAIN;
-		$res->emails = array($intern_email, $extern_email);
-
-		$res->funktionen = $benutzer_funktion_res;
-		$res->mailverteiler = $mailverteiler_res;
-		$res->standort_telefon = isset($telefon_res)? $telefon_res->kontakt : null;
-
-		return $res;
-	}
-
-
-
-	private function viewStudentProfil($uid)
-	{
-		$mailverteiler_res = $this->getMailverteiler($uid);
-		$person_res = $this->getPersonInfo($uid);
-		$student_res = $this->getStudentInfo($uid);
-		$matr_res = $this->getMatrikelNummer($uid);
-
-		$res = new stdClass();
-		$res->username = $uid;
-
-		//? Person Information
-		foreach($person_res as $key => $value){
-			$res->$key = $value;
-		}
-
-		//? Student Information
-		foreach ($student_res as $key => $value) {
-			$res->$key = $value;
-		}
-
-		$intern_email = array();
-		$intern_email["type"] = "intern";
-		$intern_email["email"] = $uid . "@" . DOMAIN;
-
-		$res->emails = [$intern_email];
-		$res->matrikelnummer = $matr_res->matr_nr;
-		$res->mailverteiler = $mailverteiler_res;
-
-		return $res;
-	}
-
-	private function mitarbeiterProfil()
-	{
-
-		$zutrittskarte_ausgegebenam = $this->getZutrittskarteDatum($this->uid);
-		$adresse_res = $this->getAdressenInfo($this->pid);
-		$kontakte_res = $this->getKontaktInfo($this->pid);
-		$mailverteiler_res = $this->getMailverteiler($this->uid);
-		$person_res = $this->getPersonInfo($this->uid,true);
-		$benutzer_funktion_res = $this->getBenutzerFunktion($this->uid);
-		$betriebsmittelperson_res = $this->getBetriebsmittelInfo($this->pid);
-		$profilUpdates = $this->getProfilUpdates($this->uid);
-		$telefon_res = $this->getTelefonInfo($this->uid);
-		$mitarbeiter_res = $this->getMitarbeiterInfo($this->uid);
-
-		$res = new stdClass();
-		$res->username = $this->uid;
-
-		//? Person Information
-		foreach($person_res as $key => $value){
-			$res->$key = $value;
-		}
-
-		//? Mitarbeiter Information
-		foreach ($mitarbeiter_res as $key => $value) {
-			$res->$key = $value;
-		}
-
-		$res->adressen = $adresse_res;
-		$res->zutrittsdatum = $zutrittskarte_ausgegebenam;
-		$res->kontakte = $kontakte_res;
-		$res->mittel = $betriebsmittelperson_res;
-		$res->mailverteiler = $mailverteiler_res;
-		
-		$intern_email = array();
-		$intern_email["type"] = "intern";
-		$intern_email["email"] = $this->uid . "@" . DOMAIN;
-		$extern_email = array();
-		$extern_email["type"] = "alias";
-		$extern_email["email"] = $mitarbeiter_res->alias . "@" . DOMAIN;
-		$res->emails = [$intern_email, $extern_email];
-
-		$res->funktionen = $benutzer_funktion_res;
-		$res->standort_telefon = $telefon_res;
-		$res->profilUpdates = $profilUpdates;
-
-		return $res;
-	}
-
 	/**
-	 * function that returns the data used for the corresponding view
-	 * @access private 
-	 * @return stdClass all the information corresponding to a view of a user
+	 * checks whether a specific userID is a mitarbeiter or not (foreword declaration of the function isMitarbeiter in Mitarbeiter_model.php)
+	 * @access public
+	 * @param  $uid the userID used to check if it is a mitarbeiter
+	 * @return boolean 
 	 */
-	private function studentProfil()
+	public function isMitarbeiter($uid)
 	{
-		$betriebsmittelperson_res = $this->getBetriebsmittelInfo($this->pid);
-		$kontakte_res = $this->getKontaktInfo($this->pid);
-		$zutrittskarte_ausgegebenam = $this->getZutrittskarteDatum($this->uid);
-		$adresse_res = $this->getAdressenInfo($this->pid);
-		$mailverteiler_res = $this->getMailverteiler($this->uid);
-		$person_res = $this->getPersonInfo($this->uid, true);
-		$zutrittsgruppe_res = $this->getZutrittsgruppen($this->uid);
-		$student_res = $this->getStudentInfo($this->uid);
-		$matr_res = $this->getMatrikelNummer($this->uid);
-		$profilUpdates = $this->getProfilUpdates($this->uid);
-
-		$res = new stdClass();
-		$res->username = $this->uid;
-
-		//? Person Information
-		foreach($person_res as $key => $value){
-			$res->$key = $value;
+		$result = $this->MitarbeiterModel->isMitarbeiter($uid);
+		if (isError($result)) {
+			show_error("error when calling Mitarbeiter_model function isMitarbeiter with uid " . $uid);
 		}
+		$result = getData($result);
+		echo json_encode($result);
+	}
 
-		//? Student Information
-		foreach ($student_res as $key => $value) {
-			$res->$key = trim($value);
-		}
+	/**
+	 * gets the adressen that are marked as zustell from the currenlty logged in user
+	 * @access public
+	 * @return array a list of adresse_id's 
+	 */
+	public function getZustellAdresse()
+	{
+		$this->AdresseModel->addSelect(["adresse_id"]);
+		$adressen_res = $this->AdresseModel->loadWhere(['person_id' => $this->pid, 'zustelladresse' => true]);
+		$adressen_res = hasData($adressen_res) ? getData($adressen_res) : null;
+		$adressen_res = array_map(function ($item) {
+			return $item->adresse_id;
+		}, $adressen_res);
+		echo json_encode($adressen_res);
+	}
 
-		$intern_email = array();
-		$intern_email["type"] = "intern";
-		$intern_email["email"] = $this->uid . "@" . DOMAIN;
-
-		$res->emails = [$intern_email];
-		$res->adressen = $adresse_res;
-		$res->zutrittsdatum = $zutrittskarte_ausgegebenam;
-		$res->kontakte = $kontakte_res;
-		$res->mittel = $betriebsmittelperson_res;
-		$res->matrikelnummer = $matr_res->matr_nr;
-		$res->zuttritsgruppen = $zutrittsgruppe_res;
-		$res->mailverteiler = $mailverteiler_res;
-		$res->profilUpdates = $profilUpdates;
-	
-		return $res;
+	/**
+	 * gets the kontakte that are marked as zustell from the currenlty logged in user
+	 * @access public
+	 * @return array a list of kontakt_id's 
+	 */
+	public function getZustellKontakt()
+	{
+		$this->KontaktModel->addSelect(["kontakt_id"]);
+		$kontakt_res = $this->KontaktModel->loadWhere(['person_id' => $this->pid, 'zustellung' => true]);
+		$kontakt_res = hasData($kontakt_res) ? getData($kontakt_res) : null;
+		$kontakt_res = array_map(function ($item) {
+			return $item->kontakt_id;
+		}, $kontakt_res);
+		echo json_encode($kontakt_res);
 	}
 
 	/**
@@ -347,12 +198,12 @@ class Profil extends Auth_Controller
 	 * @param  boolean $value  new value for the column
 	 * @return boolean the new value added to the column in public.tbl_person
 	 */
-	public function foto_sperre_function($value) 
+	public function foto_sperre_function($value)
 	{
 		$res = $this->PersonModel->update($this->pid, ["foto_sperre" => $value]);
 		if (isError($res)) {
 			show_error("error while trying to update table public.tbl_person");
-		} 
+		}
 		$this->PersonModel->addSelect("foto_sperre");
 		$res = $this->PersonModel->load($this->pid);
 		if (isError($res)) {
@@ -368,11 +219,12 @@ class Profil extends Auth_Controller
 	 * @access public
 	 * @return array all the nations in table bis.tbl_nation
 	 */
-	public function getAllNationen(){
-		$this->load->model('codex/Nation_model',"NationModel");
-		$this->NationModel->addSelect(["nation_code as code","langtext"]);
+	public function getAllNationen()
+	{
+		$this->load->model('codex/Nation_model', "NationModel");
+		$this->NationModel->addSelect(["nation_code as code", "langtext"]);
 		$nation_res = $this->NationModel->load();
-		if(isError($nation_res)){
+		if (isError($nation_res)) {
 			show_error("error while trying to query table codex.tbl_nation");
 		}
 		$nation_res = hasData($nation_res) ? getData($nation_res) : null;
@@ -385,33 +237,220 @@ class Profil extends Auth_Controller
 	 * @var    $_GET function uses GET request payload
 	 * @return boolean the new value added to the column in public.tbl_person
 	 */
-	public function getGemeinden(){
-		/** @var $nation value parsed out of the body of the get request */	
-		$nation = $this->input->get('nation',true);
+	public function getGemeinden()
+	{
+		/** @var $nation value parsed out of the body of the get request */
+		$nation = $this->input->get('nation', true);
 		/** @var $zip value parsed out of the body of the get request and converted to a php integer with json_decode */
-		$zip = json_decode($this->input->get('zip',true));
-		
-		$this->load->model('codex/Gemeinde_model',"GemeindeModel");
-		$this->GemeindeModel->addSelect(["DISTINCT name"]);
-		if($nation == "A"){
-			if(isset($zip) && $zip>999 && $zip <32000){
+		$zip = json_decode($this->input->get('zip', true));
 
-				$gemeinde_res = $this->GemeindeModel->loadWhere(['ortschaftskennziffer'=>$zip]);
-				if(isError($gemeinde_res)){
+		$this->load->model('codex/Gemeinde_model', "GemeindeModel");
+		$this->GemeindeModel->addSelect(["DISTINCT name"]);
+		if ($nation == "A") {
+			if (isset($zip) && $zip > 999 && $zip < 32000) {
+
+				$gemeinde_res = $this->GemeindeModel->loadWhere(['ortschaftskennziffer' => $zip]);
+				if (isError($gemeinde_res)) {
 					show_error("error while trying to query bis.tbl_gemeinde");
 				}
 				$gemeinde_res = hasData($gemeinde_res) ? getData($gemeinde_res) : null;
-				$gemeinde_res = array_map(function($obj){
+				$gemeinde_res = array_map(function ($obj) {
 					return $obj->name;
-				},$gemeinde_res);
+				}, $gemeinde_res);
 				echo json_encode($gemeinde_res);
 
-			}else{
+			} else {
 				echo json_encode(error("ortschaftskennziffer code was not valid"));
 			}
-		}else{
+		} else {
 			echo json_encode(error("Nation was not 'A' (Austria)"));
 		}
+	}	
+
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Private methods
+
+	/**
+	 * function that returns the data used for viewing another mitarbeiter profile
+	 * @access private 
+	 * @param  integer $uid the userID to retrieve the mitarbeiter data
+	 * @return stdClass restricted mitarbeiter data
+	 */
+	private function viewMitarbeiterProfil($uid)
+	{
+		$mailverteiler_res = $this->getMailverteiler($uid);
+		$benutzer_funktion_res = $this->getBenutzerFunktion($uid);
+		$benutzer_res = $this->getBenutzerAlias($uid);
+		$person_res = $this->getPersonInfo($uid);
+		$mitarbeiter_res = $this->getMitarbeiterInfo($uid);
+		$telefon_res = $this->getTelefonInfo($uid);
+
+		$res = new stdClass();
+		$res->username = $uid;
+
+		//? Person Info
+		foreach ($person_res as $key => $val) {
+			$res->$key = $val;
+		}
+
+		//? Mitarbeiter Info
+		foreach ($mitarbeiter_res as $key => $val) {
+			$res->$key = $val;
+
+		}
+
+		$intern_email = array();
+		$intern_email["type"] = "intern";
+		$intern_email["email"] = $uid . "@" . DOMAIN;
+		$extern_email = array();
+		$extern_email["type"] = "alias";
+		$extern_email["email"] = $benutzer_res->alias . "@" . DOMAIN;
+		$res->emails = array($intern_email, $extern_email);
+
+		$res->funktionen = $benutzer_funktion_res;
+		$res->mailverteiler = $mailverteiler_res;
+		$res->standort_telefon = isset($telefon_res) ? $telefon_res->kontakt : null;
+
+		return $res;
+	}
+
+	/**
+	 * function that returns the data used for viewing another student profile
+	 * @access private 
+	 * @param  integer $uid the userID to retrieve the student data
+	 * @return stdClass restricted student data
+	 */
+	private function viewStudentProfil($uid)
+	{
+		$mailverteiler_res = $this->getMailverteiler($uid);
+		$person_res = $this->getPersonInfo($uid);
+		$student_res = $this->getStudentInfo($uid);
+		$matr_res = $this->getMatrikelNummer($uid);
+
+		$res = new stdClass();
+		$res->username = $uid;
+
+		//? Person Information
+		foreach ($person_res as $key => $value) {
+			$res->$key = $value;
+		}
+
+		//? Student Information
+		foreach ($student_res as $key => $value) {
+			$res->$key = $value;
+		}
+
+		$intern_email = array();
+		$intern_email["type"] = "intern";
+		$intern_email["email"] = $uid . "@" . DOMAIN;
+
+		$res->emails = [$intern_email];
+		$res->matrikelnummer = $matr_res->matr_nr;
+		$res->mailverteiler = $mailverteiler_res;
+
+		return $res;
+	}
+
+	/**
+	 * function that returns the data used for the mitarbeiter profile
+	 * @access private 
+	 * @return stdClass mitarbeiter data
+	 */
+	private function mitarbeiterProfil()
+	{
+
+		$zutrittskarte_ausgegebenam = $this->getZutrittskarteDatum($this->uid);
+		$adresse_res = $this->getAdressenInfo($this->pid);
+		$kontakte_res = $this->getKontaktInfo($this->pid);
+		$mailverteiler_res = $this->getMailverteiler($this->uid);
+		$person_res = $this->getPersonInfo($this->uid, true);
+		$benutzer_funktion_res = $this->getBenutzerFunktion($this->uid);
+		$betriebsmittelperson_res = $this->getBetriebsmittelInfo($this->pid);
+		$profilUpdates = $this->getProfilUpdates($this->uid);
+		$telefon_res = $this->getTelefonInfo($this->uid);
+		$mitarbeiter_res = $this->getMitarbeiterInfo($this->uid);
+
+		$res = new stdClass();
+		$res->username = $this->uid;
+
+		//? Person Information
+		foreach ($person_res as $key => $value) {
+			$res->$key = $value;
+		}
+
+		//? Mitarbeiter Information
+		foreach ($mitarbeiter_res as $key => $value) {
+			$res->$key = $value;
+		}
+
+		$res->adressen = $adresse_res;
+		$res->zutrittsdatum = $zutrittskarte_ausgegebenam;
+		$res->kontakte = $kontakte_res;
+		$res->mittel = $betriebsmittelperson_res;
+		$res->mailverteiler = $mailverteiler_res;
+
+		$intern_email = array();
+		$intern_email["type"] = "intern";
+		$intern_email["email"] = $this->uid . "@" . DOMAIN;
+		$extern_email = array();
+		$extern_email["type"] = "alias";
+		$extern_email["email"] = $mitarbeiter_res->alias . "@" . DOMAIN;
+		$res->emails = [$intern_email, $extern_email];
+
+		$res->funktionen = $benutzer_funktion_res;
+		$res->standort_telefon = $telefon_res;
+		$res->profilUpdates = $profilUpdates;
+
+		return $res;
+	}
+
+	/**
+	 * function that returns the data used for the student profile
+	 * @access private 
+	 * @return stdClass student data
+	 */
+	private function studentProfil()
+	{
+		$betriebsmittelperson_res = $this->getBetriebsmittelInfo($this->pid);
+		$kontakte_res = $this->getKontaktInfo($this->pid);
+		$zutrittskarte_ausgegebenam = $this->getZutrittskarteDatum($this->uid);
+		$adresse_res = $this->getAdressenInfo($this->pid);
+		$mailverteiler_res = $this->getMailverteiler($this->uid);
+		$person_res = $this->getPersonInfo($this->uid, true);
+		$zutrittsgruppe_res = $this->getZutrittsgruppen($this->uid);
+		$student_res = $this->getStudentInfo($this->uid);
+		$matr_res = $this->getMatrikelNummer($this->uid);
+		$profilUpdates = $this->getProfilUpdates($this->uid);
+
+		$res = new stdClass();
+		$res->username = $this->uid;
+
+		//? Person Information
+		foreach ($person_res as $key => $value) {
+			$res->$key = $value;
+		}
+
+		//? Student Information
+		foreach ($student_res as $key => $value) {
+			$res->$key = trim($value);
+		}
+
+		$intern_email = array();
+		$intern_email["type"] = "intern";
+		$intern_email["email"] = $this->uid . "@" . DOMAIN;
+
+		$res->emails = [$intern_email];
+		$res->adressen = $adresse_res;
+		$res->zutrittsdatum = $zutrittskarte_ausgegebenam;
+		$res->kontakte = $kontakte_res;
+		$res->mittel = $betriebsmittelperson_res;
+		$res->matrikelnummer = $matr_res->matr_nr;
+		$res->zuttritsgruppen = $zutrittsgruppe_res;
+		$res->mailverteiler = $mailverteiler_res;
+		$res->profilUpdates = $profilUpdates;
+
+		return $res;
 	}
 
 	/**
@@ -420,7 +459,8 @@ class Profil extends Auth_Controller
 	 * @param  integer $uid  the userID used to retrieve the mailverteiler 
 	 * @return array returns the mailvertailer corresponding to a userID 
 	 */
-	private function getMailverteiler($uid){
+	private function getMailverteiler($uid)
+	{
 		$this->PersonModel->addSelect('gruppe_kurzbz, beschreibung');
 		$this->PersonModel->addJoin('tbl_benutzer', 'person_id');
 		$this->PersonModel->addJoin('tbl_benutzergruppe', 'uid');
@@ -428,12 +468,12 @@ class Profil extends Auth_Controller
 
 		$mailverteiler_res = $this->PersonModel->loadWhere(array('mailgrp' => true, 'uid' => $uid));
 		if (isError($mailverteiler_res)) {
-			show_error("was not able the query the table public.tbl_benutzer:".getData($mailverteiler_res));
+			show_error("was not able to query the table public.tbl_benutzer:" . getData($mailverteiler_res));
 		}
 		$mailverteiler_res = hasData($mailverteiler_res) ? getData($mailverteiler_res) : null;
 		$mailverteiler_res = array_map(function ($element) {
 			$element->mailto = "mailto:" . $element->gruppe_kurzbz . "@" . DOMAIN;
-			return $element; 
+			return $element;
 		}, $mailverteiler_res);
 		return $mailverteiler_res;
 	}
@@ -444,13 +484,14 @@ class Profil extends Auth_Controller
 	 * @param  integer $uid  the userID used to retrieve the Benutzerfunktionen 
 	 * @return array returns the Benutzerfunktionen corresponding to a userID 
 	 */
-	private function getBenutzerFunktion($uid){
+	private function getBenutzerFunktion($uid)
+	{
 		$this->BenutzerfunktionModel->addSelect(["tbl_benutzerfunktion.bezeichnung as Bezeichnung", "tbl_organisationseinheit.bezeichnung as Organisationseinheit", "datum_von as Gültig_von", "datum_bis as Gültig_bis", "wochenstunden as Wochenstunden"]);
 		$this->BenutzerfunktionModel->addJoin("tbl_organisationseinheit", "oe_kurzbz");
-	
+
 		$benutzer_funktion_res = $this->BenutzerfunktionModel->loadWhere(array('uid' => $uid));
 		if (isError($benutzer_funktion_res)) {
-			show_error("was not able the query the table public.tbl_benutzerfunktion:".getData($benutzer_funktion_res));
+			show_error("was not able to query the table public.tbl_benutzerfunktion:" . getData($benutzer_funktion_res));
 		}
 		$benutzer_funktion_res = hasData($benutzer_funktion_res) ? getData($benutzer_funktion_res) : null;
 		return $benutzer_funktion_res;
@@ -462,13 +503,14 @@ class Profil extends Auth_Controller
 	 * @param  integer $uid  the userID used to retrieve the Betriebsmittel 
 	 * @return array returns the Betriebsmittel corresponding to a userID 
 	 */
-	private function getBetriebsmittelInfo($pid){
+	private function getBetriebsmittelInfo($pid)
+	{
 		$this->BetriebsmittelpersonModel->addSelect(["CONCAT(betriebsmitteltyp, ' ' ,beschreibung) as Betriebsmittel", "nummer as Nummer", "ausgegebenam as Ausgegeben_am"]);
 
 		//? betriebsmittel are not needed in a view
 		$betriebsmittelperson_res = $this->BetriebsmittelpersonModel->getBetriebsmittel($pid);
 		if (isError($betriebsmittelperson_res)) {
-			show_error("was not able the query the table public.tbl_betriebsmittelperson:".getData($betriebsmittelperson_res));
+			show_error("was not able to query the table public.tbl_betriebsmittelperson:" . getData($betriebsmittelperson_res));
 		}
 		$betriebsmittelperson_res = hasData($betriebsmittelperson_res) ? getData($betriebsmittelperson_res) : null;
 		return $betriebsmittelperson_res;
@@ -480,15 +522,16 @@ class Profil extends Auth_Controller
 	 * @param  integer $uid the userID used to get the alias
 	 * @return string the alias of the userID
 	 */
-	private function getBenutzerAlias($uid){
+	private function getBenutzerAlias($uid)
+	{
 		$this->BenutzerModel->addSelect(["alias"]);
 		$benutzer_res = $this->BenutzerModel->load([$uid]);
 		if (isError($benutzer_res)) {
-			show_error("was not able the query the table public.tbl_benutzer:".getData($benutzer_res));
+			show_error("was not able to query the table public.tbl_benutzer:" . getData($benutzer_res));
 		} else {
 			$benutzer_res = hasData($benutzer_res) ? getData($benutzer_res)[0] : null;
 		}
-	
+
 		return $benutzer_res;
 	}
 
@@ -499,24 +542,25 @@ class Profil extends Auth_Controller
 	 * @param  integer $geburtsInfo flag wether to add the columns gebort, gebdatum, foto_sperre or not
 	 * @return array all the person informaion corresponding to a userID
 	 */
-	private function getPersonInfo($uid, $geburtsInfo = null){
+	private function getPersonInfo($uid, $geburtsInfo = null)
+	{
 		$selectClause = ["foto", "anrede", "titelpost as postnomen", "titelpre as titel", "vorname", "nachname"];
 		/** @param integer $geburtsInfo */
-		if($geburtsInfo){
-			array_push($selectClause,"gebort");
-			array_push($selectClause,"gebdatum");
-			array_push($selectClause,"foto_sperre");
+		if ($geburtsInfo) {
+			array_push($selectClause, "gebort");
+			array_push($selectClause, "gebdatum");
+			array_push($selectClause, "foto_sperre");
 		}
 		$this->BenutzerModel->addSelect($selectClause);
 		$this->BenutzerModel->addJoin("tbl_person", "person_id");
-	
+
 		$person_res = $this->BenutzerModel->load([$uid]);
 		if (isError($person_res)) {
-			show_error("was not able the query the table public.tbl_benutzer:".getData($person_res));
+			show_error("was not able to query the table public.tbl_benutzer:" . getData($person_res));
 		} else {
 			$person_res = hasData($person_res) ? getData($person_res)[0] : null;
 		}
-		
+
 		return $person_res;
 	}
 
@@ -526,16 +570,17 @@ class Profil extends Auth_Controller
 	 * @param  integer $uid the userID used to get the mitarbeiter information
 	 * @return array all the mitarbeiter informaion corresponding to a userID
 	 */
-	private function getMitarbeiterInfo($uid){
+	private function getMitarbeiterInfo($uid)
+	{
 		$this->MitarbeiterModel->addSelect(["kurzbz", "telefonklappe", "alias", "ort_kurzbz"]);
 		$this->MitarbeiterModel->addJoin("tbl_benutzer", "tbl_benutzer.uid = tbl_mitarbeiter.mitarbeiter_uid");
 		$mitarbeiter_res = $this->MitarbeiterModel->load($uid);
 		if (isError($mitarbeiter_res)) {
-			show_error("was not able the query the table public.tbl_mitarbeiter:".getData($mitarbeiter_res));
+			show_error("was not able to query the table public.tbl_mitarbeiter:" . getData($mitarbeiter_res));
 		} else {
 			$mitarbeiter_res = hasData($mitarbeiter_res) ? getData($mitarbeiter_res)[0] : null;
 		}
-	
+
 		return $mitarbeiter_res;
 	}
 
@@ -545,13 +590,14 @@ class Profil extends Auth_Controller
 	 * @param  integer $uid the userID used to get the telefon information
 	 * @return array all the telefon informaion corresponding to a userID
 	 */
-	private function getTelefonInfo($uid){
+	private function getTelefonInfo($uid)
+	{
 		$this->MitarbeiterModel->addSelect(["kontakt"]);
 		$this->MitarbeiterModel->addJoin("tbl_kontakt", "tbl_mitarbeiter.standort_id = tbl_kontakt.standort_id");
 		$this->MitarbeiterModel->addLimit(1);
 		$telefon_res = $this->MitarbeiterModel->loadWhere(["mitarbeiter_uid" => $uid, "kontakttyp" => "telefon"]);
 		if (isError($telefon_res)) {
-			show_error("was not able the query the table public.tbl_mitarbeiter:".getData($telefon_res));
+			show_error("was not able to query the table public.tbl_mitarbeiter:" . getData($telefon_res));
 		}
 		$telefon_res = hasData($telefon_res) ? getData($telefon_res)[0] : null;
 		return $telefon_res;
@@ -563,13 +609,14 @@ class Profil extends Auth_Controller
 	 * @param  integer $uid the userID used to get the student information
 	 * @return array all the student informaion corresponding to a userID
 	 */
-	private function getStudentInfo($uid){
+	private function getStudentInfo($uid)
+	{
 		$this->StudentModel->addSelect(['tbl_studiengang.bezeichnung as studiengang', 'tbl_student.semester', 'tbl_student.verband', 'tbl_student.gruppe', 'tbl_student.matrikelnr as personenkennzeichen']);
 		$this->StudentModel->addJoin('tbl_studiengang', "tbl_studiengang.studiengang_kz=tbl_student.studiengang_kz");
-		
+
 		$student_res = $this->StudentModel->load([$uid]);
 		if (isError($student_res)) {
-			show_error("was not able the query the table public.tbl_student:".getData($student_res));
+			show_error("was not able to query the table public.tbl_student:" . getData($student_res));
 		}
 		$student_res = hasData($student_res) ? getData($student_res)[0] : null;
 		return $student_res;
@@ -581,11 +628,12 @@ class Profil extends Auth_Controller
 	 * @param  integer $uid the userID used to get the profil updates
 	 * @return array all the profil updates corresponding to a userID
 	 */
-	private function getProfilUpdates($uid){
-		$profilUpdates = $this->ProfilUpdateModel->getProfilUpdatesWhere(['uid'=>$uid]);
-		if(isError($profilUpdates)){
-			show_error("was not able the query the table public.tbl_profil_update:".getData($profilUpdates));
-		}
+	private function getProfilUpdates($uid)
+	{
+		$profilUpdates = $this->ProfilUpdateModel->getProfilUpdatesWhere(['uid' => $uid]);
+		if (isError($profilUpdates)) {
+			show_error("was not able to query the table public.tbl_profil_update:" . getData($profilUpdates));
+		} 
 		$profilUpdates = hasData($profilUpdates) ? getData($profilUpdates) : null;
 		return $profilUpdates;
 	}
@@ -596,13 +644,14 @@ class Profil extends Auth_Controller
 	 * @param  integer $uid the userID used to get the Matrikelnummer
 	 * @return integer the Matrikelnummer corresponding to a userID
 	 */
-	private function getMatrikelNummer($uid){
+	private function getMatrikelNummer($uid)
+	{
 		$this->BenutzerModel->addSelect(["matr_nr"]);
 		$this->BenutzerModel->addJoin("tbl_person", "person_id");
-	
+
 		$matr_res = $this->BenutzerModel->load([$uid]);
 		if (isError($matr_res)) {
-			show_error("was not able the query the table public.tbl_benutzer:".getData($matr_res));
+			show_error("was not able to query the table public.tbl_benutzer:" . getData($matr_res));
 		}
 		$matr_res = hasData($matr_res) ? getData($matr_res)[0] : [];
 		return $matr_res;
@@ -614,13 +663,14 @@ class Profil extends Auth_Controller
 	 * @param  integer $uid the userID used to get the Zutrittsgruppen
 	 * @return array all the Zutrittsgruppen corresponding to a userID
 	 */
-	private function getZutrittsgruppen($uid){
+	private function getZutrittsgruppen($uid)
+	{
 		$this->BenutzergruppeModel->addSelect(['bezeichnung']);
 		$this->BenutzergruppeModel->addJoin('tbl_gruppe', 'gruppe_kurzbz');
-	
+
 		$zutrittsgruppe_res = $this->BenutzergruppeModel->loadWhere(array("uid" => $uid, "zutrittssystem" => true));
 		if (isError($zutrittsgruppe_res)) {
-			show_error("was not able the query the table public.tbl_benutzergruppe:".getData($zutrittsgruppe_res));
+			show_error("was not able to query the table public.tbl_benutzergruppe:" . getData($zutrittsgruppe_res));
 		}
 		$zutrittsgruppe_res = hasData($zutrittsgruppe_res) ? getData($zutrittsgruppe_res) : null;
 		return $zutrittsgruppe_res;
@@ -632,14 +682,15 @@ class Profil extends Auth_Controller
 	 * @param  integer $uid the userID used to get the address information
 	 * @return array all the address information corresponding to a userID
 	 */
-	private function getAdressenInfo($pid){
-		$adresse_res = $this->AdresseModel->addSelect(["adresse_id","strasse", "tbl_adressentyp.bezeichnung as typ", "plz", "ort","zustelladresse","gemeinde","nation"]);
+	private function getAdressenInfo($pid)
+	{
+		$adresse_res = $this->AdresseModel->addSelect(["adresse_id", "strasse", "tbl_adressentyp.bezeichnung as typ", "plz", "ort", "zustelladresse", "gemeinde", "nation"]);
 		$adresse_res = $this->AdresseModel->addOrder("zustelladresse", "DESC");
 		$adresse_res = $this->AdresseModel->addJoin("tbl_adressentyp", "typ=adressentyp_kurzbz");
-		
+
 		$adresse_res = $this->AdresseModel->loadWhere(["person_id" => $pid]);
 		if (isError($adresse_res)) {
-			show_error("was not able the query the table public.tbl_adresse:".getData($adresse_res));
+			show_error("was not able to query the table public.tbl_adresse:" . getData($adresse_res));
 		}
 		$adresse_res = hasData($adresse_res) ? getData($adresse_res) : null;
 		return $adresse_res;
@@ -651,17 +702,18 @@ class Profil extends Auth_Controller
 	 * @param  integer $uid the userID used to get the kontakt information
 	 * @return array all the kontakt information corresponding to a userID
 	 */
-	private function getKontaktInfo($pid){
-		$this->KontaktModel->addSelect(['kontakttyp','kontakt_id','kontakt', 'tbl_kontakt.anmerkung', 'tbl_kontakt.zustellung']);
+	private function getKontaktInfo($pid)
+	{
+		$this->KontaktModel->addSelect(['kontakttyp', 'kontakt_id', 'kontakt', 'tbl_kontakt.anmerkung', 'tbl_kontakt.zustellung']);
 		$this->KontaktModel->addJoin('public.tbl_standort', 'standort_id', 'LEFT');
 		$this->KontaktModel->addJoin('public.tbl_firma', 'firma_id', 'LEFT');
 		$this->KontaktModel->addOrder('kontakttyp, kontakt, tbl_kontakt.updateamum, tbl_kontakt.insertamum');
-	
+
 		$kontakte_res = $this->KontaktModel->loadWhere(['person_id' => $pid]);
 		if (isError($kontakte_res)) {
-			show_error("was not able the query the table public.tbl_kontakt:".getData($kontakte_res));
+			show_error("was not able to query the table public.tbl_kontakt:" . getData($kontakte_res));
 		}
-		$kontakte_res = hasData($kontakte_res) ? getData($kontakte_res) : null;		
+		$kontakte_res = hasData($kontakte_res) ? getData($kontakte_res) : null;
 		return $kontakte_res;
 	}
 
@@ -671,11 +723,12 @@ class Profil extends Auth_Controller
 	 * @param  integer $uid the userID used to get the date of issue of the FH access card
 	 * @return string the date of issue of the FH access card corresponding to a userID
 	 */
-	private function getZutrittskarteDatum($uid){
+	private function getZutrittskarteDatum($uid)
+	{
 		$zutrittskarte_ausgegebenam = $this->BetriebsmittelpersonModel->getBetriebsmittelByUid($uid, "Zutrittskarte");
 		if (isError($zutrittskarte_ausgegebenam)) {
-			show_error("was not able the query the table wavi.tbl_bentriebsmittelperson:".getData($zutrittskarte_ausgegebenam));
-		} 
+			show_error("was not able to query the table wavi.tbl_bentriebsmittelperson:" . getData($zutrittskarte_ausgegebenam));
+		}
 		$zutrittskarte_ausgegebenam = hasData($zutrittskarte_ausgegebenam) ? getData($zutrittskarte_ausgegebenam)[0]->ausgegebenam : null;
 
 		//? formats date from 01-01-2000 to 01.01.2000
@@ -683,6 +736,5 @@ class Profil extends Auth_Controller
 		return $zutrittskarte_ausgegebenam;
 	}
 
-	
 
 }
diff --git a/application/models/person/Profil_update_model.php b/application/models/person/Profil_update_model.php
index 7ed6fb659..c2304d069 100755
--- a/application/models/person/Profil_update_model.php
+++ b/application/models/person/Profil_update_model.php
@@ -62,12 +62,11 @@ class Profil_update_model extends DB_Model
 		$this->addJoin("public.tbl_benutzer", "public.tbl_benutzer.uid = public.tbl_profil_update.uid");
 		$this->addJoin("public.tbl_person", "public.tbl_person.person_id = public.tbl_benutzer.person_id");
 		$res = $this->loadWhere($whereClause);
-		if (isError($res)) {
-			return error("Could not load public.tbl_profil_update with whereClause");
+		if(isError($res)){
+			return $res;
 		}
-		$res = hasData($res) ? getData($res) : [];
-		if ($res) {
-			foreach ($res as $request) {
+		if(hasData($res)){
+			foreach (getData($res) as $request) {
 				$this->formatProfilRequest($request);
 			}
 		}

From 63a06dfef2753e7bbd2d1afdfbc992ea030b7f20 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 22 Feb 2024 10:30:18 +0100
Subject: [PATCH 0435/1461] WIP api controller backend; WIP adapting queries to
 new db schema;

---
 application/libraries/FilterCmptLib.php | 5 +++--
 public/js/components/filter/API.js      | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/application/libraries/FilterCmptLib.php b/application/libraries/FilterCmptLib.php
index 8b13ae3e5..cd934d1ae 100644
--- a/application/libraries/FilterCmptLib.php
+++ b/application/libraries/FilterCmptLib.php
@@ -177,7 +177,7 @@ class FilterCmptLib
 		$session = $this->getSession();
 
 		// If session is NOT empty -> a filter was already loaded
-		if ($session != null)
+		if (false && $session != null)
 		{
 			// Retrieve the filterId stored in the session
 			$sessionFilterId = $this->_getSessionElement(FilterCmptLib::FILTER_ID);
@@ -221,7 +221,7 @@ class FilterCmptLib
 		}
 
 		// If the session is empty -> first time that this filter is loaded
-		if ($session == null)
+		if (true || $session == null)
 		{
 			// Load filter definition data from DB
 			$definition = $this->_loadDefinition(
@@ -565,6 +565,7 @@ class FilterCmptLib
 			getAuthPersonId()
 		);
 
+
 		// If filters were loaded
 		if (hasData($filters))
 		{
diff --git a/public/js/components/filter/API.js b/public/js/components/filter/API.js
index ff09c452d..fae45b44e 100644
--- a/public/js/components/filter/API.js
+++ b/public/js/components/filter/API.js
@@ -124,6 +124,8 @@ export const CoreFilterAPIs = {
 	 *
 	 */
 	getFilter: function(wsParams) {
+		console.log(wsParams)
+		debugger
 		return CoreRESTClient.get(
                         'components/Filter/getFilter',
                         {

From 989f1ecf026671554bb5ded3d5af54be3a70f6ad Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 22 Feb 2024 11:50:08 +0100
Subject: [PATCH 0436/1461] finishes the documentation in Profil.php controller
 and refactors getView

---
 application/controllers/Cis/Profil.php        | 75 +++++++++----------
 public/js/apps/Cis/Profil.js                  | 16 ++--
 .../Cis/Profil/MitarbeiterProfil.js           |  3 +-
 .../Profil/ProfilComponents/EditAdresse.js    |  2 +-
 .../js/components/Cis/Profil/StudentProfil.js |  2 +-
 5 files changed, 47 insertions(+), 51 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index 71f9335a5..b8b6fa685 100755
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -46,6 +46,7 @@ class Profil extends Auth_Controller
 
 	// -----------------------------------------------------------------------------------------------------------------
 	// Public methods
+	
 
 	/**
 	 * index loads the Profil view
@@ -57,16 +58,14 @@ class Profil extends Auth_Controller
 		$this->load->view('Cis/Profil');
 	}
 
-
+	/**
+	 * redirects to the index function (needed to allow calling this URI)
+	 * @access public
+	 * @return void 
+	 */
 	public function View($uid)
 	{
-
-		if ($uid === $this->uid) {
-			$this->index();
-		} else {
-			$this->load->view('Cis/Profil');
-		}
-
+		$this->load->view('Cis/Profil');
 	}
 
 	/**
@@ -135,38 +134,22 @@ class Profil extends Auth_Controller
 
 	/**
 	 * function that returns the data used for the corresponding view
+	 * the client side parses the @param $uid and calls this function to get the data to the correct view 
 	 * @access public
 	 * @param  boolean $uid the userID used to identify which information should be retrieved for which view 
-	 * @return stdClass all the information corresponding to a view of a user
+	 * @return stdClass all the data corresponding to a view of a user
 	 */
 	public function getView($uid)
 	{
-		//TODO: refactor
-		$uid = $uid != "Profil" ? $uid : null;
-
-		$isMitarbeiter = null;
-		if ($uid) {
-			if (isSuccess($this->PersonModel->addSelect(["person_id"]))) {
-				$pid = $this->PersonModel->getByUid($uid);
-				$pid = hasData($pid) ? getData($pid)[0] : null;
-			}
-			if (!$pid) {
-				//! if no Person_ID was found, null is returned and the vue component will show a 404 View
-				return null;
-			}
-			$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter($uid);
-		} else
-			$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter($this->uid);
-
-		if (isError($isMitarbeiter)) {
-			//catch error
-		}
-		$isMitarbeiter = hasData($isMitarbeiter) ? getData($isMitarbeiter) : null;
-
 		$res = new stdClass();
-
-		if ($uid == $this->uid || !$uid) {
-			// if the $uid is empty, then no payload was supplied and the own profile is being requested
+		
+		// if parsing the URL did not found a UID then the UID of the logged in user is used
+		if($uid =="Profil" || $uid == $this->uid){
+			$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter($this->uid);
+			if (isError($isMitarbeiter)) {
+				show_error("error while checking if UID: ".$this->uid." is a mitarbeiter");
+			}
+			$isMitarbeiter = getData($isMitarbeiter);
 			if ($isMitarbeiter) {
 				$res->view = "MitarbeiterProfil";
 				$res->data = $this->mitarbeiterProfil();
@@ -176,8 +159,23 @@ class Profil extends Auth_Controller
 				$res->data = $this->studentProfil();
 				$res->data->pid = $this->pid;
 			}
-		} elseif ($uid) {
-			// if an $uid was passed as payload to the function then the user is trying to view another profile
+		}
+		// UID is availabe when accessing Profil/View/:uid
+		else{ 
+			$this->PersonModel->addSelect(["person_id"]);
+			$pid = $this->PersonModel->getByUid($uid);
+			if(isError($pid)){
+				show_error("error while trying to update table public.tbl_person while searching for a person with UID: ".$uid);
+			}
+			$pid = hasData($pid) ? getData($pid)[0] : null;
+			if(!$pid){
+				show_error("Person with UID: ".$uid." does not exist");
+			}
+			$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter($uid);
+			if (isError($isMitarbeiter)) {
+				show_error("error while checking if UID: ".$uid." is a mitarbeiter");
+			}
+			$isMitarbeiter = getData($isMitarbeiter);
 			if ($isMitarbeiter) {
 				$res->view = "ViewMitarbeiterProfil";
 				$res->data = $this->viewMitarbeiterProfil($uid);
@@ -185,11 +183,9 @@ class Profil extends Auth_Controller
 			} else {
 				$res->view = "ViewStudentProfil";
 				$res->data = $this->viewStudentProfil($uid);
-
 			}
 		}
 		echo json_encode($res);
-
 	}
 
 	/**
@@ -245,7 +241,8 @@ class Profil extends Auth_Controller
 		$zip = json_decode($this->input->get('zip', true));
 
 		$this->load->model('codex/Gemeinde_model', "GemeindeModel");
-		$this->GemeindeModel->addSelect(["DISTINCT name"]);
+		$this->GemeindeModel->addDistinct();
+		$this->GemeindeModel->addSelect(["name"]);
 		if ($nation == "A") {
 			if (isset($zip) && $zip > 999 && $zip < 32000) {
 
diff --git a/public/js/apps/Cis/Profil.js b/public/js/apps/Cis/Profil.js
index 26897039a..476bf6c36 100755
--- a/public/js/apps/Cis/Profil.js
+++ b/public/js/apps/Cis/Profil.js
@@ -1,4 +1,3 @@
-//import ProfilView from "../../components/Cis/Profil/Profil.js";
 import StudentProfil from "../../components/Cis/Profil/StudentProfil.js";
 import MitarbeiterProfil from "../../components/Cis/Profil/MitarbeiterProfil.js";
 import ViewStudentProfil from "../../components/Cis/Profil/StudentViewProfil.js";
@@ -6,7 +5,6 @@ import ViewMitarbeiterProfil from "../../components/Cis/Profil/MitarbeiterViewPr
 import fhcapifactory from "../api/fhcapifactory.js";
 import Loading from "../../components/Loader.js";
 
-
 Vue.$fhcapi = fhcapifactory;
 Vue.$collapseFormatter  = function(data){
 	//data - an array of objects containing the column title and value for each cell
@@ -38,7 +36,7 @@ Vue.$collapseFormatter  = function(data){
 
   
 
-const testapp = Vue.createApp({
+const profilApp = Vue.createApp({
 	
 	components: {
 		StudentProfil,
@@ -214,7 +212,7 @@ const testapp = Vue.createApp({
 				},
 				Private_Kontakte: {
 				  title:"Private Kontakte" ,
-				  data:this.data.kontakte.filter(item => {
+				  data:this.data.kontakte?.filter(item => {
 					return !this.data.profilUpdates?.some((update) => update.status ==='pending' && update.requested_change?.kontakt_id === item.kontakt_id);
 				  }).map(kontakt => {
 					return {
@@ -225,7 +223,7 @@ const testapp = Vue.createApp({
 				 },
 				Private_Adressen: {
 				  title: "Private Adressen",
-				  data:this.data.adressen.filter(item => {
+				  data:this.data.adressen?.filter(item => {
 					return !this.data.profilUpdates?.some(update => {
 					  return  update.status ==='pending' &&  update.requested_change?.adresse_id == item.adresse_id;
 					})
@@ -254,10 +252,9 @@ const testapp = Vue.createApp({
 
 	created(){
 
-		let path = location.pathname;
+		//? uid contains the last part of the uri
+		let uid = location.pathname.split('/').pop();
 		
-		let uid = path.substring(path.lastIndexOf('/')).replace("/","");
-
 		Vue.$fhcapi.UserData.getView(uid).then((res)=>{
 			if(!res.data){
 				this.notFoundUID=uid;
@@ -286,4 +283,5 @@ const testapp = Vue.createApp({
 	
 	
 });
-testapp.mount("#content");
\ No newline at end of file
+
+profilApp.mount("#content");
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index a4044ee88..5ed6a4b02 100755
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -251,7 +251,8 @@ export default {
              
               <div class="row mb-3">
                 <div class="col">
-                <!-- MOBILE QUICK LINKS -->     
+                <!-- MOBILE QUICK LINKS --> 
+                <quick-links :mobile="true"></quick-links>    
                 </div>
               </div>
 
diff --git a/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js b/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
index 4ba07c603..d8cfc5e0c 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
@@ -80,7 +80,7 @@ export default {
     template:`
 
      <div class="gy-3 row justify-content-center align-items-center">
-     <pre> {{JSON.stringify(gemeinden,null,2)}}</pre>
+     
      
      <!-- warning message for too many zustellungs Adressen -->
      <div v-if="showZustellAdressenWarning" class="col-12 ">
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index ad9513655..735007ed5 100755
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -182,7 +182,7 @@ export default {
    
   },
 
-  template: ` 
+  template:/*html*/ ` 
 
   <div class="container-fluid text-break fhc-form"  >
     <!-- ROW --> 

From f09692edd1b4b6d7b0e8c4e3179fb1fd7c13b9e1 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 22 Feb 2024 15:04:24 +0100
Subject: [PATCH 0437/1461] adds primevue autocomplete field for EditAdresse

---
 application/views/Cis/Profil.php              |  1 +
 public/js/apps/Cis/Profil.js                  |  1 +
 public/js/components/Bootstrap/Modal.js       |  2 +
 .../Profil/ProfilComponents/EditAdresse.js    | 41 ++++++++++++-------
 4 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/application/views/Cis/Profil.php b/application/views/Cis/Profil.php
index 99d2c0ae4..cb3d28711 100755
--- a/application/views/Cis/Profil.php
+++ b/application/views/Cis/Profil.php
@@ -3,6 +3,7 @@ $includesArray = array(
 	'title' => 'Stundenplan',
 	'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'],
 	
 );
diff --git a/public/js/apps/Cis/Profil.js b/public/js/apps/Cis/Profil.js
index 476bf6c36..0575ce64e 100755
--- a/public/js/apps/Cis/Profil.js
+++ b/public/js/apps/Cis/Profil.js
@@ -284,4 +284,5 @@ const profilApp = Vue.createApp({
 	
 });
 
+profilApp.use(primevue.config.default,{zIndex: {overlay: 9999}});
 profilApp.mount("#content");
diff --git a/public/js/components/Bootstrap/Modal.js b/public/js/components/Bootstrap/Modal.js
index 3a41ffe1c..18adf96d2 100755
--- a/public/js/components/Bootstrap/Modal.js
+++ b/public/js/components/Bootstrap/Modal.js
@@ -90,6 +90,8 @@ export default {
 				}
 			});
 			const wrapper = document.createElement("div");
+			if (primevue)
+				instance.use(primevue.config.default, {zIndex: {overlay: 9999}})
 			instance.use(Phrasen); // TODO(chris): find a more dynamic way
 			instance.mount(wrapper);
 			document.body.appendChild(wrapper);
diff --git a/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js b/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
index d8cfc5e0c..626a6e0cb 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
@@ -1,5 +1,9 @@
 export default {
+    components:{
+        AutoComplete: primevue.autocomplete
+    },
     props:{
+        
         data:Object,
         isMitarbeiter:{
             type: Boolean,
@@ -16,9 +20,17 @@ export default {
             zustellAdressenCount:null,
         }
     },
+    watch:{
+        'data.gemeinde': function(newValue, oldValue){
+            this.$emit('profilUpdate',this.isChanged?this.data:null);
+        },
+    },
     methods:{
-       
 
+        autocompleteSearch: function(event){
+            this.gemeinden = this.gemeinden.map(gemeinde => gemeinde);     
+        },
+       
         getGemeinde: function(){
             //? only query the gemeinde is the nation is Austria and the PLZ is greater than 999 and less than 32000
             if(this.data.nation && this.data.nation ==="A" && (this.data.plz && (this.data.plz >999 && this.data.plz <32000))){
@@ -32,6 +44,7 @@ export default {
                 this.gemeinden = [];
             }
         },
+
         updateValue: function(event,bind){
             //? sets the value of a property to null when an empty string is entered to keep the isChanged function valid 
             if(bind ==="zustelladresse" ){
@@ -43,6 +56,7 @@ export default {
             this.$emit('profilUpdate',this.isChanged?this.data:null);
         },
     },
+
     computed:{
         showZustellAdressenWarning: function(){
             if(this.zustellAdressenCount){
@@ -57,7 +71,7 @@ export default {
             return false;
         },
         isChanged: function(){
-            if(!this.data.strasse || !this.data.plz || !this.data.ort || !this.data.typ){
+            if(!this.data.strasse || !this.data.plz || !this.data.ort || !this.data.typ ){
                
                 return false;
             }
@@ -76,9 +90,9 @@ export default {
         this.originalValue = JSON.stringify(this.data);
         this.zustellAdressenCount = this.zustellAdresseCount();
         
-    },
-    template:`
-
+    },       
+    
+    template:/*html*/`
      <div class="gy-3 row justify-content-center align-items-center">
      
      
@@ -113,7 +127,7 @@ export default {
         <div  class="col-12 col-sm-9 col-xl-12 col-xxl-9 order-1">
 
         <div class="form-underline ">
-        <div class="form-underline-titel">Strasse</div>
+        <div class="form-underline-titel">Strasse*</div>
         <input  class="form-control" :value="data.strasse" @input="updateValue($event,'strasse')" :placeholder="data.strasse">
         
         </div>
@@ -124,7 +138,7 @@ export default {
         <div class=" order-2 order-sm-4 order-xl-3 order-xxl-4 col-12 col-sm-5  col-xl-8 col-xxl-5  ">
             
             <div  class="form-underline">
-                <div class="form-underline-titel">Kontakttyp</div>
+                <div class="form-underline-titel">Kontakttyp*</div>
         
                 <select  :value="data.typ" @change="updateValue($event,'typ')" class="form-select" aria-label="Select Kontakttyp">
                     <option selected></option>
@@ -145,14 +159,14 @@ export default {
         <div  class="order-3 order-sm-3 order-xl-2 order-xxl-3 col-12 col-sm-7 col-xl-12 col-xxl-7 " >
             
             <div class="form-underline ">
-            <div class="form-underline-titel">Ort</div>
+            <div class="form-underline-titel">Ort*</div>
             <input  class="form-control" :value="data.ort" @input="updateValue($event,'ort')" :placeholder="data.ort">
         
             </div>
         </div>
         <div  class="order-4 order-sm-2 order-xl-4 order-xxl-2 col-12 col-sm-3 col-xl-4 col-xxl-3 ">
             <div class="form-underline ">
-            <div class="form-underline-titel">PLZ</div>
+            <div class="form-underline-titel">PLZ*</div>
     
             <input  class="form-control" :value="data.plz" @input="updateValue($event,'plz')" @input="getGemeinde" :placeholder="data.plz">
         
@@ -161,16 +175,13 @@ export default {
         <div class="col-6 order-5">
        
         <div class="form-underline ">
-        <div class="form-underline-titel">Gemeinde</div>
-        <input :value="data.gemeinde" @input="updateValue($event,'gemeinde')"  type="text" class="form-control" id="gemeineInput" list="gemeindeOptions">
-        <datalist id="gemeindeOptions">
-          <option v-for="option in gemeinden" :value="option">
-        </datalist>
+        <div class="form-underline-titel">Gemeinde*</div>
+        <auto-complete class="w-100" v-model="data.gemeinde" dropdown :forceSelection="data.nation ==='A'?true:false" :suggestions="gemeinden" @complete="autocompleteSearch" ></auto-complete>
         </div>
         </div>
         <div class="col-6 order-5 ">
         <div class="form-underline ">
-        <div class="form-underline-titel">nation</div>
+        <div class="form-underline-titel">Nation*</div>
             <select  :value="data.nation" @change="updateValue($event,'nation')" @change="getGemeinde" class="form-select" aria-label="Select Kontakttyp">
                 <option selected></option>
                 <option :value="nation.code" v-for="nation in nationenList">{{nation.langtext}}</option>

From 843ddad987785d5dcefcb0b8b538248b8fa561fa Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 23 Feb 2024 12:28:26 +0100
Subject: [PATCH 0438/1461] Statuschecks, Berechtigungen, add new Status

---
 .../controllers/Studentenverwaltung.php       |   4 +
 .../controllers/components/stv/Status.php     | 225 ++++++++++++-
 application/models/crm/Prestudent_model.php   |  81 +++--
 .../models/crm/Prestudentstatus_model.php     | 315 ++++++++++++++++++
 application/models/crm/Student_model.php      |  21 ++
 .../js/components/Stv/Studentenverwaltung.js  |   7 +-
 .../Studentenverwaltung/Details/Prestudent.js |  32 +-
 .../Details/Prestudent/Status.js              | 176 ++++++++--
 8 files changed, 802 insertions(+), 59 deletions(-)

diff --git a/application/controllers/Studentenverwaltung.php b/application/controllers/Studentenverwaltung.php
index 29a04e51d..bd8ef7aa9 100644
--- a/application/controllers/Studentenverwaltung.php
+++ b/application/controllers/Studentenverwaltung.php
@@ -23,6 +23,10 @@ class Studentenverwaltung extends FHC_Controller
 				'student/bpk' => $this->permissionlib->isBerechtigt('student/bpk'),
 				'student/alias' => $this->permissionlib->isBerechtigt('student/alias'),
 				'basis/prestudent' => $this->permissionlib->isBerechtigt('basis/prestudent'),
+				'assistenz_stgs' => $this->permissionlib->getSTG_isEntitledFor('assistenz'),
+				'admin' => $this->permissionlib->isBerechtigt('admin'),
+				'assistenz_schreibrechte' => $this->permissionlib->isBerechtigt('assistenz','suid'),
+				'student/keine_studdatuspruefung' => $this->permissionlib->isBerechtigt('student/keine_studdatuspruefung')
 
 			],
 			'variables' => [
diff --git a/application/controllers/components/stv/Status.php b/application/controllers/components/stv/Status.php
index fa0ea5a80..a4ad5fd62 100644
--- a/application/controllers/components/stv/Status.php
+++ b/application/controllers/components/stv/Status.php
@@ -13,6 +13,7 @@ class Status extends FHC_Controller
 		// Load Libraries
 		$this->load->library('AuthLib');
 		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+		$this->load->library('PermissionLib');
 
 		// Load language phrases
 		/*		$this->loadPhrases([
@@ -53,11 +54,42 @@ class Status extends FHC_Controller
 			return $this->outputJsonError($this->form_validation->error_array());
 		}*/
 
+		//check rights
+		//get Studiengang von prestudent_id
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+		$this->PrestudentModel->addJoin('public.tbl_person p', 'ON (p.person_id = public.tbl_prestudent.person_id)');
+		$result = $this->PrestudentModel->load([
+			'prestudent_id'=> $prestudent_id,
+		]);
+		if(isError($result))
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson(getError($result));
+		}
+		$result = current(getData($result));
+
+		//Variablen für Statuscheck
+		$stg = $result->studiengang_kz;
+		$reihungstest_angetreten = $result->reihungstestangetreten;
+		$name = trim($result->vorname . " ". $result->nachname);
+		$zgv_code = $result->zgv_code;
+
+		//TODO(Manu) check: Annahme, dass hier immer suid bei Berechtigung STG vergeben wird!
+		$granted_Ass = $this->permissionlib->getSTG_isEntitledFor('assistenz');
+		$granted_Adm = $this->permissionlib->getSTG_isEntitledFor('admin');
+		$granted = array_merge($granted_Ass, $granted_Adm);
+
+		if(!in_array($stg, $granted)){
+			$result = "Sie haben keine Schreibrechte fuer diesen Studiengang!";
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson($result);
+		}
+
 		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
 		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
 
 		//var_dump($_POST);
-
+		$uid = getAuthUID();
 		$status_kurzbz = $this->input->post('status_kurzbz');
 		$ausbildungssemester = $this->input->post('ausbildungssemester');
 		$datum = $this->input->post('datum');
@@ -65,7 +97,7 @@ class Status extends FHC_Controller
 		$bewerbung_abgeschicktamum = $this->input->post('bewerbung_abgeschicktamum');
 		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
 		$studienplan_id = $this->input->post('studienplan_id');
-		$anmerkung  = $this->input->post('anmerkung ');
+		$anmerkung  = $this->input->post('anmerkung');
 		$statusgrund_id = $this->input->post('statusgrund_id');
 		$rt_stufe = $this->input->post('rt_stufe');
 		$bestaetigtvon = $this->input->post('bestaetigtvon');
@@ -73,6 +105,123 @@ class Status extends FHC_Controller
 		// Start DB transaction
 		//$this->db->trans_start(false);
 
+		//GET lastStatus
+		$result = $this->PrestudentstatusModel->getLastStatus($prestudent_id);
+
+		if (isError($result))
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson(getError($result));
+		}
+		$lastStatusData = current(getData($result));
+		//var_dump($lastStatusData);
+
+		//Different handling depending on newStatus
+		if($status_kurzbz == 'Absolvent' || $status_kurzbz == 'Diplomand')
+		{
+			//$studiensemester = $semester_aktuell; //TODO(Manu) oder ist hier defaultsemester gemeint?
+			$ausbildungssemester = $lastStatusData->ausbildungssemester;
+		}
+
+		if($status_kurzbz != 'Student')
+		{
+			$ausbildungssemester = $lastStatusData->ausbildungssemester;
+		}
+
+		//check if Rolle already exists
+		$result = $this->PrestudentstatusModel->checkIfExistingPrestudentRolle($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester);
+		if (isError($result))
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson(getError($result));
+			//return $this->outputJson("DEBUG: in Funktion checkIfExistingPrestudentRolle");
+		}
+
+		//Check ob Reihungstest berücksichtigt werden soll
+		if(REIHUNGSTEST_CHECK)
+		{
+			if($status_kurzbz=='Bewerber' && !$reihungstest_angetreten)
+			{
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return $this->outputJson($name . ": Um einen Interessenten zum Bewerber zu machen, muss die Person das Reihungstestverfahren abgeschlossen haben");
+			}
+		}
+
+		//Check ZGV
+		if(!defined("ZGV_CHECK") || ZGV_CHECK)
+		{
+			if($status_kurzbz=='Bewerber' && $zgv_code=='')
+			{
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return $this->outputJson($name . ": Um einen Interessenten zum Bewerber zu machen, muss die Zugangsvoraussetzung eingetragen sein.");
+			}
+		}
+
+		//Check ZGV-Master
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+		$result = $this->StudiengangModel->load([
+			'studiengang_kz'=> $stg
+		]);
+		if(isError($result))
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson(getError($result));
+		}
+		$result = current(getData($result));
+		$typ = $result->typ;
+
+		if(!defined("ZGV_CHECK") || ZGV_CHECK)
+		{
+			if($status_kurzbz=='Bewerber' && $zgv_code=='' && $typ=='m')
+			{
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return $this->outputJson($name . ": Um einen Interessenten zum Bewerber zu machen, muss die Zugangsvoraussetzung Master eingetragen sein.");
+			}
+		}
+
+		//check if bewerberstatus exists
+		if($status_kurzbz == 'Aufgenommener' || $status_kurzbz == 'Wartender')
+		{
+			//TODO(manu) Wartender NICHT in Liste!? nur in diesem Code
+			//FAS: Aufnahme ist möglich: Beispiel prestudent_id = 129629
+
+			$result = $this->PrestudentstatusModel->checkIfExistingBewerberstatus($prestudent_id);
+			if (isError($result))
+			{
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return $this->outputJson(getError($result));
+			}
+		}
+
+		//TODO(Manu) permission not working here...
+		$hasPermissionToSkipStatusCheck =  $this->permissionlib->isBerechtigt('student/keine_studdatuspruefung');
+		/*		var_dump($hasPermissionToSkipStatusCheck);
+
+				$basis =  $this->permissionlib->isBerechtigt('basis/prestudent');
+				var_dump($basis);*/
+		if(!$hasPermissionToSkipStatusCheck)
+		{
+			//Block STATUSCHECKS
+			$new_status_datum = isset($datum) ? $datum  : date('Y-m-d');
+			$result = $this->PrestudentstatusModel->checkDatumNewStatus($new_status_datum);
+			if (isError($result))
+			{
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return $this->outputJson(getError($result));
+			}
+
+			$result = $this->PrestudentstatusModel->checkIfValidStatusHistory($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $new_status_datum, $ausbildungssemester);
+			if (isError($result))
+			{
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return $this->outputJson(getError($result));
+				//return $this->outputJson("DEBUG: in Funktion checkIfValidStatusHistory");
+			}
+			$statusArr = $result; //wenn return result ok
+
+		}
+
+
 		$result = $this->PrestudentstatusModel->insert(
 			[
 				'prestudent_id' => $prestudent_id,
@@ -83,7 +232,7 @@ class Status extends FHC_Controller
 				'ausbildungssemester' => $ausbildungssemester,
 				'anmerkung' => $anmerkung,
 				'statusgrund_id' => $statusgrund_id,
-				'insertvon' => 'uid',
+				'insertvon' => $uid,
 				'insertamum' => date('c'),
 				'bestaetigtam' => $bestaetigtam,
 				'bestaetigtvon' => $bestaetigtvon,
@@ -94,8 +243,10 @@ class Status extends FHC_Controller
 		if (isError($result))
 		{
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson(getError($result));
+			//return $this->outputJson(getError($result));
+			return $this->outputJson("DEBUG: in insert Funktion");
 		}
+
 		return $this->outputJsonSuccess(true);
 	}
 
@@ -143,6 +294,13 @@ class Status extends FHC_Controller
 		$status_kurzbz = $this->input->post('status_kurzbz');
 		$ausbildungssemester = $this->input->post('ausbildungssemester');
 		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
+/*		var_dump($prestudent_id);
+		var_dump($status_kurzbz);*/
+
+		//var_dump($_POST);
+
+		//Todo(manu)
+		//Löschen auch aus anderen Tabellen
 
 		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
 
@@ -166,6 +324,65 @@ class Status extends FHC_Controller
 		return $this->outputJsonSuccess(current(getData($result)));
 	}
 
+	public function updateStatus($prestudent_id)
+	{
+		/*		$this->load->library('form_validation');
 
 
+				if ($this->form_validation->run() == false)
+				{
+					return $this->outputJsonError($this->form_validation->error_array());
+				}*/
+
+		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
+
+		var_dump($_POST);
+
+		$uid = getAuthUID();
+		//$prestudent_id = $this->input->post('prestudent_id');
+		$status_kurzbz = $this->input->post('status_kurzbz');
+		$ausbildungssemester = $this->input->post('ausbildungssemester');
+		$datum = $this->input->post('datum');
+		$bestaetigtam = $this->input->post('bestaetigtam');
+		$bewerbung_abgeschicktamum = $this->input->post('bewerbung_abgeschicktamum');
+		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
+		$studienplan_id = $this->input->post('studienplan_id');
+		$anmerkung  = $this->input->post('anmerkung ');
+		$statusgrund_id = $this->input->post('statusgrund_id');
+		$rt_stufe = $this->input->post('rt_stufe');
+		$bestaetigtvon = $this->input->post('bestaetigtvon');
+
+		// Start DB transaction
+		//$this->db->trans_start(false);
+
+		$result = $this->PrestudentstatusModel->update(
+			[
+				'prestudent_id' => $prestudent_id,
+				'status_kurzbz' => $status_kurzbz,
+				'studiensemester_kurzbz' => $studiensemester_kurzbz,
+				'ausbildungssemester' => $ausbildungssemester,
+			],
+			[
+
+				'bewerbung_abgeschicktamum' => $bewerbung_abgeschicktamum,
+				'studienplan_id' => $studienplan_id,
+				'anmerkung' => $anmerkung,
+				'statusgrund_id' => $statusgrund_id,
+				'updatevon' => $uid,
+				'updateamum' => date('c'),
+				'bestaetigtam' => $bestaetigtam,
+				'bestaetigtvon' => $bestaetigtvon,
+				'datum' => $datum,
+				'rt_stufe' => $rt_stufe
+			]
+		);
+		if (isError($result))
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson(getError($result));
+		}
+		return $this->outputJsonSuccess(true);
+	}
+
 }
diff --git a/application/models/crm/Prestudent_model.php b/application/models/crm/Prestudent_model.php
index 0d0399bed..742a823f5 100644
--- a/application/models/crm/Prestudent_model.php
+++ b/application/models/crm/Prestudent_model.php
@@ -734,20 +734,26 @@ class Prestudent_model extends DB_Model
 	 */
 	public function getHistoryPrestudent($prestudent_id)
 	{
-		$query = "
+		//TODO(Manu) refactor
+		$this->load->model('crm/Student_model', 'StudentModel');
+
+		$result = $this->StudentModel->checkIfUID($prestudent_id);
+
+		if(isError($result))
+		{
+			$query = "
 			SELECT 
-			    ps.status_kurzbz, 
-			    ps.studiensemester_kurzbz, 
-			    ps.ausbildungssemester, 
-			    CASE WHEN ps.status_kurzbz = 'Student' THEN CONCAT(lv.semester, lv.verband, lv.gruppe) END AS lehrverband, 
-			    ps.datum, 
-			    TO_CHAR(ps.datum::timestamp, 'DD.MM.YYYY') AS format_datum,
-			    sp.bezeichnung, 
-			    ps.bestaetigtam, 
-			    TO_CHAR(ps.bestaetigtam::timestamp, 'DD.MM.YYYY') AS format_bestaetigtam,
-			    ps.bewerbung_abgeschicktamum,
-			    TO_CHAR(ps.bewerbung_abgeschicktamum::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS format_bewerbung_abgeschicktamum,
-			    stg.statusgrund_kurzbz,
+				ps.status_kurzbz, 
+				ps.studiensemester_kurzbz, 
+				ps.ausbildungssemester,
+				ps.datum, 
+				TO_CHAR(ps.datum::timestamp, 'DD.MM.YYYY') AS format_datum,
+				sp.bezeichnung, 
+				ps.bestaetigtam, 
+				TO_CHAR(ps.bestaetigtam::timestamp, 'DD.MM.YYYY') AS format_bestaetigtam,
+				ps.bewerbung_abgeschicktamum,
+				TO_CHAR(ps.bewerbung_abgeschicktamum::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS format_bewerbung_abgeschicktamum,
+				stg.statusgrund_kurzbz,
 				ps.orgform_kurzbz,
 				ps.prestudent_id,
 				sp.studienplan_id,
@@ -760,17 +766,54 @@ class Prestudent_model extends DB_Model
 				TO_CHAR(ps.updateamum::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS format_updateamum,
 				ps.updatevon
 			FROM public.tbl_prestudentstatus ps
-			JOIN public.tbl_student st USING (prestudent_id)
-			JOIN public.tbl_studentlehrverband lv ON (st.student_uid = lv.student_uid)
-			JOIN public.tbl_studiengang sg ON (lv.studiengang_kz = sg.studiengang_kz)
+			LEFT JOIN public.tbl_student st USING (prestudent_id)
+			LEFT JOIN public.tbl_studiengang sg ON (st.studiengang_kz = sg.studiengang_kz)
 			LEFT JOIN lehre.tbl_studienplan sp USING (studienplan_id)
 			LEFT JOIN public.tbl_status_grund stg USING (statusgrund_id)
 			WHERE prestudent_id = ?
-			and lv.studiensemester_kurzbz = ps.studiensemester_kurzbz
-			ORDER BY datum DESC
+			ORDER BY datum DESC		
 		";
+		}
+		else
+		{
+			$query = "
+				SELECT 
+					ps.status_kurzbz, 
+					ps.studiensemester_kurzbz, 
+					ps.ausbildungssemester, 
+					CASE WHEN ps.status_kurzbz IN ('Student', 'Diplomand') THEN CONCAT(lv.semester, lv.verband, lv.gruppe) END AS lehrverband, 
+					ps.datum, 
+					TO_CHAR(ps.datum::timestamp, 'DD.MM.YYYY') AS format_datum,
+					sp.bezeichnung, 
+					ps.bestaetigtam, 
+					TO_CHAR(ps.bestaetigtam::timestamp, 'DD.MM.YYYY') AS format_bestaetigtam,
+					ps.bewerbung_abgeschicktamum,
+					TO_CHAR(ps.bewerbung_abgeschicktamum::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS format_bewerbung_abgeschicktamum,
+					stg.statusgrund_kurzbz,
+					ps.orgform_kurzbz,
+					ps.prestudent_id,
+					sp.studienplan_id,
+					ps.anmerkung,
+					ps.bestaetigtvon,
+					ps.insertamum,
+					TO_CHAR(ps.insertamum::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS format_insertamum,
+					ps.insertvon,
+					ps.updateamum,
+					TO_CHAR(ps.updateamum::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS format_updateamum,
+					ps.updatevon
+				FROM public.tbl_prestudentstatus ps
+				JOIN public.tbl_student st USING (prestudent_id)
+				JOIN public.tbl_studentlehrverband lv ON (st.student_uid = lv.student_uid)
+				JOIN public.tbl_studiengang sg ON (lv.studiengang_kz = sg.studiengang_kz)
+				LEFT JOIN lehre.tbl_studienplan sp USING (studienplan_id)
+				LEFT JOIN public.tbl_status_grund stg USING (statusgrund_id)
+				WHERE prestudent_id = ?
+				and lv.studiensemester_kurzbz = ps.studiensemester_kurzbz
+				ORDER BY datum DESC
+			";
+
+		}
 
-	//	var_dump($query);
 
 		return $this->execQuery($query, array($prestudent_id));
 	}
diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php
index 08c081153..84d281877 100644
--- a/application/models/crm/Prestudentstatus_model.php
+++ b/application/models/crm/Prestudentstatus_model.php
@@ -338,4 +338,319 @@ class Prestudentstatus_model extends DB_Model
 
 		return $this;
 	}
+
+	/**
+	 * Check if Rolle already exists
+	 * @param integer $prestudent_id
+	 * @param string $status_kurzbz
+	 * @param string $studiensemester_kurzbz
+	 * @param integer $ausbildungssemester
+	 * @return error if already exists, success if not
+	 * Copy from studentDBDML.php
+	 */
+	public function checkIfExistingPrestudentRolle($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester)
+	{
+		$qry = "SELECT
+					*
+				FROM 
+				    public.tbl_prestudentstatus
+				WHERE
+					prestudent_id = ? 
+				AND 
+				    status_kurzbz = ?
+				AND
+				    studiensemester_kurzbz = ?
+				AND
+				    ausbildungssemester = ?";
+
+		$result = $this->execQuery($qry, array($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester));
+
+		if (isError($result))
+		{
+			return error($result);
+		}
+		elseif (!hasData($result)) {
+			return success($result);
+		}
+		else
+		{
+			return error('Diese Rolle ist bereits vorhanden: ' . $prestudent_id . ' / ' . $studiensemester_kurzbz  . ' : ' . $status_kurzbz . ' /' . $ausbildungssemester . ')');
+		}
+	}
+
+	/**
+	 * Check if Rolle there is an existing Bewerberstatus
+	 * @param integer $prestudent_id
+	 * @return error if no bewerberstatus, success if existing
+	 */
+	public function checkIfExistingBewerberstatus($prestudent_id)
+	{
+		$qry = "SELECT
+					*
+				FROM 
+				    public.tbl_prestudentstatus
+				WHERE
+					prestudent_id = ? 
+				AND 
+				    status_kurzbz = 'Bewerber'";
+
+		$result = $this->execQuery($qry, array($prestudent_id));
+
+		if (isError($result))
+		{
+			return error($result);
+		}
+		elseif (!hasData($result)) {
+			return error("Person muss zuerst zum Bewerber gemacht werden! " . $prestudent_id );
+		}
+		else
+		{
+			return success($result);
+		}
+	}
+
+	/**
+	 * Check if Datum New Status is in the Past
+	 * @param integer $prestudent_id
+	 * @return error if in past
+	 */
+	public function checkDatumNewStatus($new_status_datum)
+	{
+		$today = new DateTime('today');
+		$new_status_datum = new DateTime($new_status_datum);
+
+		if($new_status_datum < $today)
+		{
+			return error("Datum eines neuen Statuseintrags darf nicht in der Vergangenheit liegen ");
+		}
+
+		else
+		{
+			return success();
+		}
+	}
+
+	/**
+	 * Check if History of StatusData is valid
+	 * @param integer $prestudent_id
+	 * @return error if not valid, array StatusArr if valid
+	 */
+	public function checkIfValidStatusHistory($prestudent_id, $status_kurzbz, $new_status_studiensemester_kurzbz, $new_status_datum, $new_status_ausbildungssemester, $old_status_studiensemester_kurzbz = '', $old_status_ausbildungssemester = '')
+	{
+		//$isNewStatus = $this->checkIfNewStatus($prestudent_id,  $status_kurzbz);
+		$isNewStatus =  $old_status_studiensemester_kurzbz == '' && $old_status_ausbildungssemester == '';
+
+		//get start studiensemester
+		$result = $this->StudiensemesterModel->load([
+			'studiensemester_kurzbz' => $new_status_studiensemester_kurzbz
+		]);
+		if(isError($result))
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson(getError($result));
+		}
+		elseif(!hasData($result)) {
+			return error("Kein Eintrag für Studiensemester vorhanden! :-/" . $new_status_studiensemester_kurzbz);
+		}
+
+		$studiensemester = current($result->retval);
+		$new_status_semesterstart = $studiensemester->start;
+
+		//print_r($new_status_semesterstart);
+
+		//get all prestudentstati
+		$resultPs = $this->getAllPrestudentstatiWithStudiensemester($prestudent_id);
+		if (isError($resultPs))
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson(getError($resultPs));
+		}
+		$resultArr = $resultPs->retval;
+		$statusArr = array();
+
+		$newStatusInserted = false;
+		$new_status_datum_form = new DateTime($new_status_datum);
+		$new_status_semesterstart_form = new DateTime($new_status_semesterstart);
+
+		foreach ($resultArr as $row)
+		{
+/*			print_r($row->studiensemester_start . " >= " . $row->datum  . " UND ");
+			print_r($new_status_semesterstart  . " >= " . $new_status_datum . " ? ");*/
+
+			$studiensemester_start = new DateTime($row->studiensemester_start);
+			$status_datum = new DateTime ($row->datum);
+
+
+			if ($new_status_datum_form >= $status_datum && $new_status_semesterstart_form >= $studiensemester_start) {
+
+				if (!$newStatusInserted)
+				{
+					// neuer Status erstmals größer als Datum eines bestehenden Status -> neuen Status EINMALIG einfügen für spätere Statusprüfung
+					$neuer_status = new stdClass();
+					$neuer_status->status_kurzbz = $status_kurzbz;
+					$neuer_status->studiensemester_kurzbz = $new_status_studiensemester_kurzbz;
+					$neuer_status->datum = $new_status_datum;
+					$neuer_status->ausbildungssemester = $new_status_ausbildungssemester;
+					$statusArr[] = $neuer_status;
+					$newStatusInserted = true;
+				}
+				$statusArr[] = $row;
+			}
+			elseif($new_status_datum_form <= $status_datum && $new_status_semesterstart_form <= $studiensemester_start){
+				$statusArr[] = $row;
+				//print_r( "cond 2 met\n");
+
+			}
+			else
+			{
+				return error("Datum des Statuseintrags muss nach dem Statusdatum, das Semesterstartdatum nach Semesterstartdatum des vorherigen Statuseintrags sein");
+				//	print_r( "cond not met" . $count . "\n");
+			}
+
+		}
+		//var_dump($statusArr);
+
+		$endstatusArr = array('Absolvent', 'Abbrecher');
+		// Über alle gespeicherten Status gehen und Statusabfolge prüfen
+		for ($i = 0; $i < count($statusArr); $i++) {
+			$curr_status = $statusArr[$i];
+			$curr_status_kurzbz = $curr_status->status_kurzbz;
+			$curr_status_ausbildungssemester = $curr_status->ausbildungssemester;
+			$next_idx = $i - 1; //absteigend sortiert, nächster Status ist vorheriger Eintrag
+			$next_status = isset($statusArr[$next_idx]) ? $statusArr[$next_idx] : null;
+
+			// Abbrecher- oder Absolventenstatus muss Endstatus sein
+			if (isset($next_status) && in_array($curr_status_kurzbz, $endstatusArr)) {
+
+				return error("Nach Abbrecher- und Absolventenstatus darf kein anderer Status mehr eingetragen werden");
+			}
+
+			// wenn Unterbrecher auf Unterbrecher folgt, muss Ausbildungssemester gleich sein
+			//TODO(Manu) check, warum hier automatisch ausbildungssemester korrigiert wird
+			if (
+				$curr_status_kurzbz == 'Unterbrecher' && isset($next_status) && $next_status->status_kurzbz == 'Unterbrecher'
+				&& $curr_status_ausbildungssemester != $next_status->ausbildungssemester
+			)
+			{
+				return error("Aufeinanderfolgende Unterbrecher müssen gleiches Ausbildungssemester haben");
+			}
+
+			// wenn Abbrecher auf Unterbrecher folgt, muss Ausbildungssemester gleich sein
+			//TODO(Manu) check, warum hier automatisch ausbildungssemester korrigiert wird
+			if (
+				isset($next_status) && $curr_status_kurzbz == 'Unterbrecher'
+				&& $next_status->status_kurzbz == 'Abbrecher' && $curr_status_ausbildungssemester != $next_status->ausbildungssemester
+			)
+			{
+				return error("Unterbrecher und folgender Abbrecher müssen gleiches Ausbildungssemester haben");
+			}
+
+			// keine Studenten nach Diplomand Status
+			if (
+				isset($next_status) && $curr_status_kurzbz == 'Diplomand' && $next_status->status_kurzbz == 'Student'
+			)
+			{
+				return error("Nach Diplomantenstatus darf kein Studentenstatus mehr eingetragen werden");
+			}
+
+		}
+
+		//return $statusArr; //rot
+		//return $resultPs->retval; //rot
+		//TODO(Manu) check, warum Fehlermeldung bei anderem returnwert!
+		return $resultPs;
+	}
+
+	public function miniFunction()
+	{
+		$array = [
+			'key1' => 'value1',
+			'key2' => 'value2',
+			'key3' => 'value3'
+		];
+
+		return $array;
+	}
+
+	public function checkStatusabfolge($statusArr)
+	{
+		$endstatusArr = array('Absolvent', 'Abbrecher');
+		$statusArr = json_decode($statusArr);
+
+		//var_dump($statusArr);
+		var_dump($statusArr[0]->status_kurzbz);
+		// Prüfungen den Prestudentstatus betreffend
+		// Über alle gespeicherten Status gehen und Statusabfolge prüfen
+/*		for ($i = 0; $i < count($statusArr); $i++) {
+			$curr_status = $statusArr[$i];
+			$curr_status_kurzbz = $curr_status->status_kurzbz;
+			$curr_status_ausbildungssemester = $curr_status->ausbildungssemester;
+			$next_idx = $i - 1; //absteigend sortiert, nächster Status ist vorheriger Eintrag
+			$next_status = isset($statusArr[$next_idx]) ? $statusArr[$next_idx] : null;
+
+			// Abbrecher- oder Absolventenstatus muss Endstatus sein
+			if (isset($next_status) && in_array($curr_status_kurzbz, $endstatusArr)) {
+
+				return error("Nach Abbrecher- und Absolventenstatus darf kein anderer Status mehr eingetragen werden");
+			}
+		}*/
+
+		return $endstatusArr;
+
+	}
+
+	public function getAllPrestudentstatiWithStudiensemester($prestudent_id, $old_status_studiensemester_kurzbz = '', $old_status_ausbildungssemester = '')
+	{
+
+		$isNewStatus =  $old_status_studiensemester_kurzbz == '' && $old_status_ausbildungssemester == '';
+
+		$qry = "
+		SELECT public.tbl_prestudentstatus.status_kurzbz, 
+				public.tbl_prestudentstatus.studiensemester_kurzbz, 
+				public.tbl_prestudentstatus.ausbildungssemester, 
+				public.tbl_prestudentstatus.datum, 
+				s.start AS studiensemester_start 
+				FROM public.tbl_prestudentstatus 
+				JOIN public.tbl_studiensemester s USING (studiensemester_kurzbz) 
+				WHERE prestudent_id = ? 
+				ORDER BY public.tbl_prestudentstatus.datum DESC, 
+				public.tbl_prestudentstatus.insertamum DESC, 
+				public.tbl_prestudentstatus.ext_id DESC
+		";
+
+		$result = $this->execQuery($qry, array($prestudent_id));
+
+		if (isError($result))
+		{
+			return error($result);
+		}
+		if (!hasData($result)) {
+			return error('No Statusdata vorhanden');
+		}
+
+		return $result;
+
+
+
+/*		$this->addSelect($this->dbTable . '.status_kurzbz');
+		$this->addSelect($this->dbTable . '.studiensemester_kurzbz');
+		$this->addSelect($this->dbTable . '.ausbildungssemester');
+		$this->addSelect($this->dbTable . '.datum');
+		$this->addSelect('s.start AS studiensemester_start');
+
+		$this->addJoin('public.tbl_studiensemester s', 'studiensemester_kurzbz');
+		$this->addOrder($this->dbTable . '.datum', 'DESC');
+		$this->addOrder($this->dbTable . '.insertamum', 'DESC');
+
+		$this->addOrder($this->dbTable . '.ext_id', 'DESC');
+
+		return $this->loadWhere([
+			'prestudent_id' => $prestudent_id
+			]
+		);*/
+
+
+	}
+
+
 }
diff --git a/application/models/crm/Student_model.php b/application/models/crm/Student_model.php
index e27fa68dc..d307c36c0 100644
--- a/application/models/crm/Student_model.php
+++ b/application/models/crm/Student_model.php
@@ -67,6 +67,27 @@ class Student_model extends DB_Model
 		return $result->retval[0]->student_uid;
 	}
 
+	/**
+	 * Get students UID by PrestudentID.
+	 * @param $prestudent_id
+	 * @return mixed
+	 */
+	public function checkIfUID($prestudent_id)
+	{
+		$this->addSelect('student_uid');
+
+		$result = $this->loadWhere(
+			array('prestudent_id' => $prestudent_id)
+		);
+
+		if (!hasData($result))
+		{
+			return error($result);
+		}
+
+		return $result->retval[0]->student_uid;
+	}
+
 	public function searchStudent($filter)
 	{
 		$this->addSelect('vorname, nachname, gebdatum, person.person_id, student_uid');
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 4706b5b93..5a6e62a38 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -51,7 +51,12 @@ export default {
 			hasBpkPermission: this.permissions['student/bpk'],
 			hasAliasPermission: this.permissions['student/alias'],
 			hasPrestudentPermission: this.permissions['basis/prestudent'],
-			lists: this.lists
+			hasAssistenzPermissionForStgs: this.permissions['assistenz_stgs'],
+			hasSchreibrechtAss: this.permissions['assistenz_schreibrechte'],
+			hasAdminPermission: this.permissions['admin'],
+			//hasPermissionToSkipStatusCheck: this.permission['student/keine_studdatuspruefung'],
+			lists: this.lists,
+			defaultSemester: this.defaultSemester
 		}
 	},
 	data() {
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
index 394a6de27..aaab14983 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
@@ -28,9 +28,20 @@ export default {
 			from: 'hasPrestudentPermission',
 			default: false
 		},
+		hasAssistenzPermission: {
+			from: 'hasAssistenzPermission',
+			default: false
+		},
+		hasAdminPermission: {
+			from: 'hasAdminPermission',
+			default: false
+		},
+		defaultSemester: {
+			from: 'defaultSemester',
+		}
 	},
 	props: {
-		modelValue: Object
+		modelValue: Object,
 	},
 	data(){
 		return {
@@ -541,6 +552,8 @@ export default {
 		</form-form>
 		
 		<br>
+
+<!--		{{defaultSemester}} | {{hasAdminPermission}} | {{hasAdminPermission}}-->
 		
 		<div class="col-12 pb-3">
 			<legend>Status</legend>
@@ -549,18 +562,13 @@ export default {
 		
 		<hr>
 		
-<!--		<div class="row mb-3">
-			<div class="col-8">
-				<legend>Status</legend>
-				<TblStatus :prestudent_id="modelValue.prestudent_id"></TblStatus>		
-			</div>-->
-			
-			<div class="col-8">
-				<legend>Gesamthistorie</legend>
-				<TblHistory :person_id="modelValue.person_id"></TblHistory>		
-			</div>
+		
+		<div class="col-8">
+			<legend>Gesamthistorie</legend>
+			<TblHistory :person_id="modelValue.person_id"></TblHistory>		
+		</div>
 				
-<!--		</div>-->
+
 
 	
 		
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
index 6acb6259b..b7e2c1b93 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
@@ -11,6 +11,35 @@ export default{
 		FormForm,
 		FormInput,
 	},
+	inject: {
+		defaultSemester: {
+			from: 'defaultSemester',
+		},
+		hasPermissionToSkipStatusCheck: {
+			from: 'hasPermissionToSkipStatusCheck',
+			default: false
+		},
+		hasPrestudentPermission: {
+			from: 'hasPrestudentPermission',
+			default: false
+		},
+		hasAssistenzPermission: {
+			from: 'hasAssistenzPermission',
+			default: false
+		},
+		hasAdminPermission: {
+			from: 'hasAdminPermission',
+			default: false
+		},
+		hasAssistenzPermissionForStgs: {
+			from: 'hasAssistenzPermissionForStgs',
+			default: false
+		},
+		hasSchreibrechtAss: {
+			from: 'hasSchreibrechtAss',
+			default: false
+		}
+	},
 	props: {
 		prestudent_id: String
 	},
@@ -94,11 +123,11 @@ export default{
 			tabulatorEvents: [],
 			statusData: {},
 			listStudiensemester: [],
-			//maySem: [0,1,2,4,6,7],
 			maxSem:  Array.from({ length: 11 }, (_, index) => index),
 			listStudienplaene: [],
 			aufnahmestufen: {'': '-- keine Auswahl --', 1: 1, 2: 2, 3: 3},
-			listStatusgruende: []
+			listStatusgruende: [],
+			statusId: {}
 		}
 	},
 	computed: {
@@ -106,19 +135,25 @@ export default{
 			return this.listStatusgruende.filter(grund => grund.status_kurzbz == this.statusData.status_kurzbz);
 		},
 	},
-	methods:{
-		actionNewStatus(){
+	methods: {
+		actionNewStatus() {
 			console.log("Action: Neuen Status hinzufügen");
+			this.statusData.status_kurzbz = 'Interessent';
+			this.statusData.studiensemester_kurzbz = this.defaultSemester;
+			this.statusData.ausbildungssemester = 1;
+			this.statusData.datum = this.getDefaultDate();
+			this.statusData.bestaetigtam = this.getDefaultDate();
 			this.$refs.newStatusModal.show();
 		},
 		actionEditStatus(status, stdsem, ausbildungssemester){
 			console.log("Action: Status bearbeiten: (" + status + ": " + stdsem + "/" + ausbildungssemester + ")")
-			this.loadStatus({
+			this.statusId = {
 				'prestudent_id': this.prestudent_id,
 				'status_kurzbz': status,
 				'studiensemester_kurzbz': stdsem,
 				'ausbildungssemester': ausbildungssemester
-			}).then(() => {
+			};
+			this.loadStatus(this.statusId).then(() => {
 				if(this.statusData)
 					this.$refs.editStatusModal.show();
 			});
@@ -126,8 +161,19 @@ export default{
 		actionDeleteStatus(status, stdsem, ausbildungssemester){
 			console.log("Action: Status löschen: (" + status + ": " + stdsem + "/" + ausbildungssemester + ")")
 			//this.$refs.deleteStatusModal.show();
+			this.statusId = {
+				'prestudent_id': this.prestudent_id,
+				'status_kurzbz': status,
+				'studiensemester_kurzbz': stdsem,
+				'ausbildungssemester': ausbildungssemester
+			};
 
-			this.loadStatus({
+			this.loadStatus(this.statusId).then(() => {
+				if(this.statusData)
+					this.$refs.deleteStatusModal.show();
+			});
+
+/*			this.loadStatus({
 				'prestudent_id': this.prestudent_id,
 				'status_kurzbz': status,
 				'studiensemester_kurzbz': stdsem,
@@ -135,7 +181,7 @@ export default{
 			}).then(() => {
 				if(this.statusData)
 					this.$refs.deleteStatusModal.show();
-			});
+			});*/
 		},
 		actionAdvanceStatus(status, stdsem, ausbildungssemester){
 			console.log("Action: Status vorrücken: (" + status + ": " + stdsem + "/" + ausbildungssemester + ")")
@@ -155,7 +201,7 @@ export default{
 								this.$refs.deleteStatusModal.show();
 						});*/
 		},
-		addNewStatus(statusData){
+		addNewStatus(){
 			CoreRESTClient.post('components/stv/Status/addNewStatus/' + this.prestudent_id,
 				this.statusData
 		).then(response => {
@@ -171,12 +217,61 @@ export default{
 					});
 				}
 			}).catch(error => {
-				this.$fhcAlert.alertError('Fehler bei Speichern Status aufgetreten');
+				if (error.response) {
+					console.log(error.response);
+					this.$fhcAlert.alertError(error.response.data);
+				}
 			}).finally(() => {
 				window.scrollTo(0, 0);
 				this.reload();
 			});
 		},
+		deleteStatus(status_id){
+			return CoreRESTClient.post('components/stv/Status/deleteStatus/',
+				status_id)
+				.then(
+					result => {
+						if(!result.data.error) {
+							this.$fhcAlert.alertSuccess('Löschen erfolgreich');
+							this.hideModal('deleteStatusModal');
+							this.resetModal();
+						}
+						else
+						{
+							const errorData = result.data.retval;
+							this.$fhcAlert.alertError('Kein Status mit Id ' + status_id + ' gefunden');
+						}
+/*						return result;*/
+					}).catch(error => {
+					this.$fhcAlert.alertError('Fehler bei Löschen von Status aufgetreten');
+				}).finally(() => {
+					window.scrollTo(0, 0);
+					this.reload();
+				});
+		},
+		editStatus(status_id){
+			return CoreRESTClient.post('components/stv/Status/updateStatus/' + this.prestudent_id,
+				this.statusData)
+				.then(
+					result => {
+						if(!result.data.error) {
+							this.$fhcAlert.alertSuccess('Bearbeitung Status erfolgreich');
+							this.hideModal('editStatusModal');
+							this.resetModal();
+						}
+						else
+						{
+							const errorData = result.data.retval;
+							this.$fhcAlert.alertError('Kein Status mit Id ' + status_id + ' gefunden');
+						}
+						/*						return result;*/
+					}).catch(error => {
+					this.$fhcAlert.alertError('Fehler beim Bearbeiten des Status aufgetreten');
+				}).finally(() => {
+					window.scrollTo(0, 0);
+					this.reload();
+				});
+		},
 		loadStatus(status_id){
 			return CoreRESTClient.post('components/stv/Status/loadStatus/',
 				status_id)
@@ -201,7 +296,12 @@ export default{
 		},
 		resetModal(){
 			this.statusData = {};
+			this.statusId = {};
 		},
+		getDefaultDate() {
+			const today = new Date();
+			return today;
+		}
 	},
 	created(){
 		CoreRESTClient
@@ -230,13 +330,23 @@ export default{
 		<div class="stv-list h-100 pt-3">
 		
 		
-		<p>TestData</p>
+<!--		<p>TestData</p>
 		{{statusData}}
+		<hr>-->
+<!--		Berechtigungen:
+			Skip Check: {{hasPermissionToSkipStatusCheck}} |
+			Admin: {{hasAdminPermission}} |
+			Studiengaenge: {{hasAssistenzPermissionForStgs}} |
+			Schreibrecht ASS: {{hasSchreibrechtAss}}-->
+		
+<!--		<hr>
+		<p>{{statusId}}</p>	-->
 		
 			<!--Modal: Add New Status-->
 			<BsModal ref="newStatusModal">
+			<!--TODO(manu) check stati: in FAs Absolvent, Abbrecher, Wartender nicht in Liste-->
 				<template #title>Neuen Status hinzufügen</template>
-				
+							
 					<form-form class="row g-3" ref="statusData">
 					
 						<div class="row mb-3">
@@ -256,6 +366,8 @@ export default{
 									<option  value="Unterbrecher">UnterbrecherIn</option>
 									<option  value="Diplomand">DiplomandIn</option>
 									<option  value="Incoming">Incoming</option>
+									<option  value="Absolvent">AbsolventIn</option>
+									<option  value="Abbrecher">AbbrecherIn</option>
 								</form-input>
 							</div>
 						</div>
@@ -267,8 +379,8 @@ export default{
 									type="select"
 									name="studiensemester_kurzbz" 
 									v-model="statusData['studiensemester_kurzbz']"
-								> <!--TODO(manu) default aktueller Eintrag-->
-									<option v-for="sem in listStudiensemester" :key="sem.studiensemester_kurzbz" :value="sem.studiensemester_kurzbz">{{sem.studiensemester_kurzbz}}</option>
+								>
+									<option v-for="sem in listStudiensemester" :key="sem.studiensemester_kurzbz" :value="sem.studiensemester_kurzbz"  :selected="sem.studiensemester_kurzbz === defaultSemester">{{sem.studiensemester_kurzbz}}</option>
 								</form-input>
 							</div>
 						</div>
@@ -280,7 +392,7 @@ export default{
 									type="select" 
 									:readonly="readonly" 
 									name="ausbildungssemester" 
-									v-model="statusData['ausbildungssemester']"
+									v-model="statusData.ausbildungssemester"
 								>
 								 <option v-for="number in maxSem" :key="number" :value="number">{{ number }}</option>
 								</form-input>
@@ -294,7 +406,7 @@ export default{
 									type="DatePicker" 
 									:readonly="readonly" 
 									name="datum" 
-									v-model="statusData['datum']"
+									v-model="statusData.datum"
 									auto-apply
 									:enable-time-picker="false"
 									format="dd.MM.yyyy"
@@ -310,7 +422,7 @@ export default{
 									type="DatePicker" 
 									:readonly="readonly" 
 									name="datum" 
-									v-model="statusData['bestaetigtam']"
+									v-model="statusData.bestaetigtam"
 									auto-apply
 									:enable-time-picker="false"
 									format="dd.MM.yyyy"
@@ -320,7 +432,7 @@ export default{
 							</div>
 						</div>
 						<div class="row mb-3">
-							<label for="bewerbung_abgeschicktamum" class="form-label col-sm-4">B. abgeschickt am</label>
+							<label for="bewerbung_abgeschicktamum" class="form-label col-sm-4">Bewerbung abgeschickt am</label>
 							<div class="col-sm-6">
 								<form-input 
 									type="DatePicker" 
@@ -399,6 +511,7 @@ export default{
 			
 			<!--Modal: Edit Status-->
 			<BsModal ref="editStatusModal">
+			<!--TODO(manu) check stati: in FAs Absolvent, Abbrecher, Wartender nicht in Liste-->
 				<template #title>Status bearbeiten</template>
 					<form-form class="row g-3" ref="statusData">
 					
@@ -419,6 +532,8 @@ export default{
 									<option  value="Unterbrecher">UnterbrecherIn</option>
 									<option  value="Diplomand">DiplomandIn</option>
 									<option  value="Incoming">Incoming</option>
+									<option  value="Absolvent">AbsolventIn</option>
+									<option  value="Abbrecher">AbbrecherIn</option>
 								</form-input>
 							</div>
 						</div>
@@ -432,7 +547,7 @@ export default{
 									v-model="statusData['studiensemester_kurzbz']"
 								> <!--TODO(manu) default aktueller Eintrag-->
 									<option v-for="sem in listStudiensemester" :key="sem.studiensemester_kurzbz" :value="sem.studiensemester_kurzbz">{{sem.studiensemester_kurzbz}}</option>
-								</form-input>f
+								</form-input>
 							</div>
 						</div>
 						<!-- TODO(manu) if(defined('VORRUECKUNG_STATUS_MAX_SEMESTER') && VORRUECKUNG_STATUS_MAX_SEMESTER==false)-->
@@ -555,7 +670,7 @@ export default{
 					</form-form>
 					
 				<template #footer>
-						<button type="button" class="btn btn-primary" @click="editStatus()">OK</button>
+						<button type="button" class="btn btn-primary" @click="editStatus(statusId)">OK</button>
 				</template>
 								
 			</BsModal>
@@ -565,10 +680,25 @@ export default{
 				<template #title>Status löschen</template> 
 				<template #default>
 					<p>Prestudentstatus {{statusData.status_kurzbz}} (id: {{statusData.prestudent_id}}  
-					/ {{statusData.studiensemester_kurzbz}}) im {{statusData.ausbildungssemester}}. Ausbildungssemester wirklich löschen?</p>
-				</template>									
+					/ {{statusData.studiensemester_kurzbz}}) im {{statusData.ausbildungssemester}}. Ausbildungssemester wirklich löschen?</p>					
+				</template>	
+<!--				<template #footer>
+					<button 
+						ref="Close" 
+						type="button" 
+						class="btn btn-primary" 
+						@click="deleteStatus({
+							'prestudent_id': statusData.prestudent_id,
+							'status_kurzbz': statusData.studiensemester_kurzbz,
+							'studiensemester_kurzbz': statusData.studiensemester_kurzbz,
+							'ausbildungssemester': statusData.ausbildungssemester
+						})">OK</button>
+				</template>	-->							
+<!--				<template #footer>
+					<button ref="Close" type="button" class="btn btn-primary" @click="deleteStatus(statusData.prestudent_id, statusData.status_kurzbz, statusData.ausbildungssemester, statusData.studiensemester_kurzbz)">OK</button>
+				</template>-->
 				<template #footer>
-					<button ref="Close" type="button" class="btn btn-primary" @click="deleteStatus()">OK</button>
+					<button ref="Close" type="button" class="btn btn-primary" @click="deleteStatus(statusId)">OK</button>
 				</template>
 			</BsModal>
 			

From 21f7099878bbed36c9bdb7382b15bef8419376ee Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 23 Feb 2024 14:32:06 +0100
Subject: [PATCH 0439/1461] refactor

---
 application/models/content/Content_model.php  |  9 +++
 .../views/templates/CISHTML-Header.php        |  2 +-
 public/js/apps/Cis/Profil.js                  |  7 +++
 public/js/components/Cis/Profil/EditProfil.js |  2 +-
 .../components/Cis/Profil/EditProfilSelect.js | 57 +++++++------------
 .../Cis/Profil/MitarbeiterProfil.js           |  2 +-
 6 files changed, 39 insertions(+), 40 deletions(-)

diff --git a/application/models/content/Content_model.php b/application/models/content/Content_model.php
index 0a196f9fb..ef073fcf3 100755
--- a/application/models/content/Content_model.php
+++ b/application/models/content/Content_model.php
@@ -149,6 +149,15 @@ class Content_model extends DB_Model
 						"menu_open": false,
 						"aktiv": true,
 						"childs": []
+					},
+					{
+						"content_id": 1000007,
+						"template_kurzbz": "redirect",
+						"titel": "Anrechnung",
+						"content": "<content><url><![CDATA[' . site_url('/lehre/anrechnung/RequestAnrechnung') . ']]></url><target><![CDATA[]]></target></content>",
+						"menu_open": false,
+						"aktiv": true,
+						"childs": []
 					}
 				]
 			}');
diff --git a/application/views/templates/CISHTML-Header.php b/application/views/templates/CISHTML-Header.php
index 838b242c2..58d6f2443 100755
--- a/application/views/templates/CISHTML-Header.php
+++ b/application/views/templates/CISHTML-Header.php
@@ -46,7 +46,7 @@ if (!isset($menu)) {
 				<img src="<?= site_url('Cis/Pub/bild/person/' . getAuthPersonId()); ?>" class="avatar rounded-circle"/>
 			</button>
 			<ul id="nav-user-menu" class="collapse list-unstyled" aria-labelledby="nav-user-btn">
-				<li><a class="btn btn-level-2 rounded-0 d-block" href="/cis.php/Cis/Profil" id="menu-profil">Profil</a></li>
+				<li><a class="btn btn-level-2 rounded-0 d-block" href="<?= site_url('Cis/Profil'); ?>" id="menu-profil">Profil</a></li>
 				<li><a class="btn btn-level-2 rounded-0 d-block" href="#">Ampeln</a></li>
 				<li><hr class="dropdown-divider"></li>
 				<li><a class="btn btn-level-2 rounded-0 d-block" href="<?= site_url('Cis/Auth/logout'); ?>">Logout</a></li>
diff --git a/public/js/apps/Cis/Profil.js b/public/js/apps/Cis/Profil.js
index 0575ce64e..c8219eb94 100755
--- a/public/js/apps/Cis/Profil.js
+++ b/public/js/apps/Cis/Profil.js
@@ -234,6 +234,13 @@ const profilApp = Vue.createApp({
 					  data:kontakt
 					}})
 				 },
+				 Password_Change : {
+					title:"Passwort Ändern",
+					view:"ChangePassword",
+					data:{
+					  test:"testvalue",
+					  }
+					},
 				},
 			 
 			};
diff --git a/public/js/components/Cis/Profil/EditProfil.js b/public/js/components/Cis/Profil/EditProfil.js
index 0b56b7fd7..1b87950c0 100755
--- a/public/js/components/Cis/Profil/EditProfil.js
+++ b/public/js/components/Cis/Profil/EditProfil.js
@@ -174,7 +174,7 @@ export default {
       </ol>
     </nav>
 
-    <edit-profil-select @submit="submitProfilChange" v-model:breadcrumb="breadcrumb" v-model:topic="topic" v-model:profilUpdate="profilUpdate" ariaLabel="test" :list="editData"></edit-profil-select>
+    <edit-profil-select @submit="submitProfilChange" v-model:breadcrumb="breadcrumb" v-model:topic="topic" v-model:profilUpdate="profilUpdate" ariaLabel="select" :list="editData"></edit-profil-select>
     </div>
 
     </template>
diff --git a/public/js/components/Cis/Profil/EditProfilSelect.js b/public/js/components/Cis/Profil/EditProfilSelect.js
index a78a58d7b..ebf61f2ff 100755
--- a/public/js/components/Cis/Profil/EditProfilSelect.js
+++ b/public/js/components/Cis/Profil/EditProfilSelect.js
@@ -71,7 +71,7 @@ export default {
               typ: null,
               plz: null,
               ort: null,
-              zustelladresse:false,
+              zustelladresse: false,
             }
           : {
               //? add flag
@@ -133,47 +133,30 @@ export default {
   },
   mounted() {},
 
-  template: `
+  template: /*html*/ `
     <template v-if="!view">
-    
-    <div  class="list-group">
-    <template v-for="item in data">
-      <div class="d-flex flex-row align-items-center">
-      <button style="position:relative" type="button" class=" list-group-item list-group-item-action" @click="updateOptions($event,item)" >
-      
-        <p v-if="item.title" class="my-1"   >{{item.title}}</p>
-        <!-- this is used for multiple elements in the select -->
-        <div class="my-2 me-4" v-else>
-        <component  :is="item.listview" v-bind="item"></component>
-        </div>
-      </button>
-      <button v-if="item.listview" @click="deleteItem(item)" type="button" class="mx-3 btn btn-danger btn-circle"><i class="fa fa-trash"></i>
+      <div  class="list-group">
+        <template v-for="item in data">
+          <div class="d-flex flex-row align-items-center">
+            <button style="position:relative" type="button" class=" list-group-item list-group-item-action" @click="updateOptions($event,item)" >
+              <!-- render title of options -->
+              <p v-if="item.title" class="my-1"   >{{item.title}}</p>
+              <!-- else render list view of items -->
+              <div v-else class="my-2 me-4" >
+                <component :is="item.listview" v-bind="item"></component>
+              </div>
+            </button>
+            <button v-if="item.listview" @click="deleteItem(item)" type="button" class="mx-3 btn btn-danger btn-circle"><i class="fa fa-trash"></i>
+          </div>
+        </template>
+      </div>
+      <div v-if="Array.isArray(data)" class="mt-4 d-flex justify-content-center">
+        <button @click="addItem" type="button" class="btn btn-primary btn-circle"><i class="fa fa-plus"></i>
       </div>
-      </template>
-    </div>
-    <div v-if="Array.isArray(data)" class="mt-4 d-flex justify-content-center">
-      
-      <button @click="addItem" type="button" class="btn btn-primary btn-circle"><i class="fa fa-plus"></i>
-      
-    </div>
-    
     </template>
     
-
-    <div v-else-if="view==='text_input'" class="form-underline">
-   
-      <div class="form-underline-titel">{{data.titel?data.titel:'titel'}}</div>
-
-      <input  class="form-control" @input="$emit('update:profilUpdate',data.value)"  v-model="data.value" :placeholder="data.value">
-    </div>
-
-
-    <!-- if it not a normal text input field then reder the custom edit input component -->
-    <!-- custom component is required to emit an profilUpdate event to register the new entered value --> 
     <template v-else>
-    
-      <!-- receives two events, one for normal data update and one when a file has to be stored to the database -->
-      <component @profilUpdate="profilUpdateEmit"   :is="view" v-bind="properties" :data="data" ></component>
+      <component @profilUpdate="profilUpdateEmit" :is="view" v-bind="properties" :data="data" ></component>
     </template>
    `,
 };
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 5ed6a4b02..600d6ccb8 100755
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -160,7 +160,7 @@ export default {
           setLoading:this.setLoading,
 
         }).then((popup_result) => {
-          console.log("hello test");
+          
           if(popup_result){
             Vue.$fhcapi.ProfilUpdate.selectProfilRequest()
             .then((res) =>{

From 8ccc621a91a4c4a8e0c5076e8e9f327bf8eb1096 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 27 Feb 2024 11:42:42 +0100
Subject: [PATCH 0440/1461] Finalized db schema changes for
 Anwesenheitskontrolle and Checkin; Multiple Lektor scenario not being managed
 yet; reworked frontend requests towards API Controller to not confuse vue
 router; WIP UX;

---
 public/js/components/filter/Filter.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index 64a75c910..49cbd0024 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -271,6 +271,7 @@ export const CoreFilterCmpt = {
 
 			if (CoreRESTClient.hasData(response))
 			{
+
 				let data = CoreRESTClient.getData(response);
 				this.filterName = data.filterName;
 				this.dataset = data.dataset;
@@ -278,7 +279,7 @@ export const CoreFilterCmpt = {
 
 				this.fields = data.fields;
 				this.selectedFields = data.selectedFields;
-				this.notSelectedFields = this.fields.filter(x => this.selectedFields.indexOf(x) === -1);
+				// this.notSelectedFields = this.fields.filter(x => this.selectedFields.indexOf(x) === -1);
 				this.filterFields = [];
 
 				for (let i = 0; i < data.datasetMetadata.length; i++)
@@ -291,7 +292,7 @@ export const CoreFilterCmpt = {
 							filter.type = data.datasetMetadata[i].type;
 
 							this.filterFields.push(filter);
-							//break;
+						//break;
 						}
 					}
 				}
@@ -406,6 +407,7 @@ export const CoreFilterCmpt = {
 		 * Used to start/refresh the FetchCmpt
 		 */
 		startFetchCmpt: function(apiFunction, apiFunctionParameters, dataFetchedCallback) {
+
 			// Assign the function api of the FetchCmpt binded property
 			this.fetchCmptApiFunction = apiFunction;
 

From 88df5057fbcfbca2f720f454a1a1e7dde60d3a64 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 27 Feb 2024 16:53:37 +0100
Subject: [PATCH 0441/1461] =?UTF-8?q?Update,=20Vorr=C3=BCcken,=20Delete,?=
 =?UTF-8?q?=20Refactoring=20Statusvalidations?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controllers/components/stv/Status.php     | 427 ++++++++++++++++--
 application/models/crm/Prestudent_model.php   |   8 +-
 .../models/crm/Prestudentstatus_model.php     | 130 +++---
 application/models/crm/Student_model.php      |  55 ++-
 .../education/Studentlehrverband_model.php    |  35 ++
 .../Details/Prestudent/Status.js              |  73 ++-
 6 files changed, 597 insertions(+), 131 deletions(-)

diff --git a/application/controllers/components/stv/Status.php b/application/controllers/components/stv/Status.php
index a4ad5fd62..1618a3d52 100644
--- a/application/controllers/components/stv/Status.php
+++ b/application/controllers/components/stv/Status.php
@@ -55,7 +55,6 @@ class Status extends FHC_Controller
 		}*/
 
 		//check rights
-		//get Studiengang von prestudent_id
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 		$this->PrestudentModel->addJoin('public.tbl_person p', 'ON (p.person_id = public.tbl_prestudent.person_id)');
 		$result = $this->PrestudentModel->load([
@@ -75,8 +74,8 @@ class Status extends FHC_Controller
 		$zgv_code = $result->zgv_code;
 
 		//TODO(Manu) check: Annahme, dass hier immer suid bei Berechtigung STG vergeben wird!
-		$granted_Ass = $this->permissionlib->getSTG_isEntitledFor('assistenz');
-		$granted_Adm = $this->permissionlib->getSTG_isEntitledFor('admin');
+		$granted_Ass = $this->permissionlib->getSTG_isEntitledFor('assistenz') ? $this->permissionlib->getSTG_isEntitledFor('assistenz') : [];
+		$granted_Adm = $this->permissionlib->getSTG_isEntitledFor('admin') ? $this->permissionlib->getSTG_isEntitledFor('admin') : [];
 		$granted = array_merge($granted_Ass, $granted_Adm);
 
 		if(!in_array($stg, $granted)){
@@ -88,7 +87,6 @@ class Status extends FHC_Controller
 		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
 		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
 
-		//var_dump($_POST);
 		$uid = getAuthUID();
 		$status_kurzbz = $this->input->post('status_kurzbz');
 		$ausbildungssemester = $this->input->post('ausbildungssemester');
@@ -100,7 +98,7 @@ class Status extends FHC_Controller
 		$anmerkung  = $this->input->post('anmerkung');
 		$statusgrund_id = $this->input->post('statusgrund_id');
 		$rt_stufe = $this->input->post('rt_stufe');
-		$bestaetigtvon = $this->input->post('bestaetigtvon');
+		$bestaetigtvon = $uid;
 
 		// Start DB transaction
 		//$this->db->trans_start(false);
@@ -123,10 +121,11 @@ class Status extends FHC_Controller
 			$ausbildungssemester = $lastStatusData->ausbildungssemester;
 		}
 
-		if($status_kurzbz != 'Student')
+		//Todo(manu) check if this check makes sense?
+/*		if($status_kurzbz != 'Student')
 		{
 			$ausbildungssemester = $lastStatusData->ausbildungssemester;
-		}
+		}*/
 
 		//check if Rolle already exists
 		$result = $this->PrestudentstatusModel->checkIfExistingPrestudentRolle($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester);
@@ -134,8 +133,13 @@ class Status extends FHC_Controller
 		{
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 			return $this->outputJson(getError($result));
-			//return $this->outputJson("DEBUG: in Funktion checkIfExistingPrestudentRolle");
 		}
+		if($result->retval == '1')
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson($result->code);
+		}
+
 
 		//Check ob Reihungstest berücksichtigt werden soll
 		if(REIHUNGSTEST_CHECK)
@@ -185,7 +189,24 @@ class Status extends FHC_Controller
 			//TODO(manu) Wartender NICHT in Liste!? nur in diesem Code
 			//FAS: Aufnahme ist möglich: Beispiel prestudent_id = 129629
 
-			$result = $this->PrestudentstatusModel->checkIfExistingBewerberstatus($prestudent_id);
+			$result = $this->PrestudentstatusModel->checkIfExistingBewerberstatus($prestudent_id, $name);
+			if (isError($result))
+			{
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return $this->outputJson(getError($result));
+			}
+			if($result->retval == "0")
+			{
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return $this->outputJson($result->code);
+			}
+		}
+
+		//check if studentrolle already exists
+		if($status_kurzbz == 'Student')
+		{
+			$this->load->model('crm/Student_model', 'StudentModel');
+			$result = $this->StudentModel->checkIfExistingStudentRolle($prestudent_id);
 			if (isError($result))
 			{
 				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
@@ -215,13 +236,9 @@ class Status extends FHC_Controller
 			{
 				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 				return $this->outputJson(getError($result));
-				//return $this->outputJson("DEBUG: in Funktion checkIfValidStatusHistory");
 			}
-			$statusArr = $result; //wenn return result ok
-
 		}
 
-
 		$result = $this->PrestudentstatusModel->insert(
 			[
 				'prestudent_id' => $prestudent_id,
@@ -243,8 +260,7 @@ class Status extends FHC_Controller
 		if (isError($result))
 		{
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			//return $this->outputJson(getError($result));
-			return $this->outputJson("DEBUG: in insert Funktion");
+			return $this->outputJson(getError($result));
 		}
 
 		return $this->outputJsonSuccess(true);
@@ -258,8 +274,6 @@ class Status extends FHC_Controller
 		$status_kurzbz = $this->input->post('status_kurzbz');
 		$ausbildungssemester = $this->input->post('ausbildungssemester');
 		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
-		//echo $prestudent_id . $status_kurzbz . $ausbildungssemester . $studiensemester_kurzbz;
-
 
 		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
 
@@ -281,29 +295,74 @@ class Status extends FHC_Controller
 		}
 		else
 		{
-			//var_dump($result);
 			$this->outputJsonSuccess(current(getData($result)));
 		}
 	}
 
 	public function deleteStatus()
 	{
+		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
+
 		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
 
 		$prestudent_id = $this->input->post('prestudent_id');
 		$status_kurzbz = $this->input->post('status_kurzbz');
 		$ausbildungssemester = $this->input->post('ausbildungssemester');
 		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
-/*		var_dump($prestudent_id);
-		var_dump($status_kurzbz);*/
 
-		//var_dump($_POST);
+		//TODO(Manu) check: warum sind beim Löschen andere Berechtigungen?
+		//ich darf keine Stati anlegen, aber löschen, wenn mehr als einer übrig???
+/*		$granted_Ass = $this->permissionlib->getSTG_isEntitledFor('assistenz');
+		$granted_Adm = $this->permissionlib->getSTG_isEntitledFor('admin');
+		$granted = array_merge($granted_Ass, $granted_Adm);
 
-		//Todo(manu)
-		//Löschen auch aus anderen Tabellen
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+		$result = $this->PrestudentModel->load([
+			'prestudent_id'=> $prestudent_id,
+		]);
+		if(isError($result))
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson(getError($result));
+		}
+		$result = current(getData($result));
+		$stg = $result->studiengang_kz;
 
-		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
+		if(!in_array($stg, $granted))
+		{
+			$result = "Sie haben keine Schreibrechte fuer diesen Studiengang!";
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson($result);
+		}*/
 
+		$isBerechtigtAdmin = $this->permissionlib->isBerechtigt('admin', null, 'suid');
+		$isBerechtigtNoStudstatusCheck = $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung', null, 'suid');
+
+
+		if($status_kurzbz=="Student" && !$isBerechtigtAdmin && !$isBerechtigtNoStudstatusCheck)
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson("Studentenrolle kann nur durch den Administrator geloescht werden");
+		}
+
+
+		if(!$isBerechtigtAdmin && !$isBerechtigtNoStudstatusCheck)
+		{
+			//check if last status
+			$result = $this->PrestudentstatusModel->checkIfLastStatusEntry($prestudent_id);
+			if (isError($result))
+			{
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return $this->outputJson($result);
+			}
+			if($result->retval == "1")
+			{
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return $this->outputJson($result->code);
+			}
+		}
+
+		//Delete Status
 		$result = $this->PrestudentstatusModel->delete(
 			array(
 				'prestudent_id' => $prestudent_id,
@@ -312,20 +371,88 @@ class Status extends FHC_Controller
 				'studiensemester_kurzbz' => $studiensemester_kurzbz
 			)
 		);
-
 		if (isError($result))
 		{
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 			$this->outputJson($result);
 		}
-		elseif (!hasData($result)) {
+		elseif(!hasData($result)) {
 			$this->outputJson($result);
 		}
-		return $this->outputJsonSuccess(current(getData($result)));
+		//return $this->outputJsonSuccess(current(getData($result)));
+
+		// Delete Studentlehrverband if no Status left
+		$result = $this->PrestudentstatusModel->getLastStatus($prestudent_id, $studiensemester_kurzbz);
+
+		if(isError($result))
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson(getError($result));
+		}
+		if(!hasData($result))
+		{
+			//get student_uid
+			$this->load->model('crm/Student_model', 'StudentModel');
+			$result = $this->StudentModel->checkIfUid($prestudent_id);
+			if(isError($result))
+			{
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return $this->outputJson(getError($result));
+			}
+			$student_uid = $result->retval;
+
+			$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
+			$result = $this->StudentlehrverbandModel->delete(
+				array(
+					'student_uid' => $student_uid,
+					'studiensemester_kurzbz' => $studiensemester_kurzbz
+				)
+			);
+			if (isError($result))
+			{
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				$this->outputJson("Fehler beim Löschen der Lehrverbandszuordnung");
+			}
+			if(!hasData($result)) {
+				$this->outputJson($result);
+			}
+			return $this->outputJsonSuccess(true);
+		}
+		//TODO(manu) $this->db->trans_start(false); and rollback?
+		//TODO(manu) ganzen Prestudenten löschen, wenn kein Eintrag mehr
+		return $this->outputJsonSuccess(true);
+
+
 	}
 
-	public function updateStatus($prestudent_id)
+	public function updateStatus($key_prestudent_id, $key_status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester)
 	{
+		//TODO(Manu) check: Annahme, dass hier immer suid bei Berechtigung STG vergeben wird!
+		$granted_Ass = $this->permissionlib->getSTG_isEntitledFor('assistenz') ? $this->permissionlib->getSTG_isEntitledFor('assistenz') : [];
+		$granted_Adm = $this->permissionlib->getSTG_isEntitledFor('admin') ? $this->permissionlib->getSTG_isEntitledFor('admin') : [];
+		$granted = array_merge($granted_Ass, $granted_Adm);
+
+		//get Studiengang von prestudent_id
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+		$result = $this->PrestudentModel->load([
+			'prestudent_id'=> $key_prestudent_id,
+		]);
+		if(isError($result))
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson(getError($result));
+		}
+		$result = current(getData($result));
+
+		$stg = $result->studiengang_kz;
+
+		if(!in_array($stg, $granted)){
+			$result = "Sie haben keine Schreibrechte fuer diesen Studiengang!";
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson($result);
+		}
+		//var_dump($key_prestudent_id, $key_status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester);
+
 		/*		$this->load->library('form_validation');
 
 
@@ -337,10 +464,8 @@ class Status extends FHC_Controller
 		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
 		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
 
-		var_dump($_POST);
-
 		$uid = getAuthUID();
-		//$prestudent_id = $this->input->post('prestudent_id');
+		$prestudent_id = $this->input->post('prestudent_id');
 		$status_kurzbz = $this->input->post('status_kurzbz');
 		$ausbildungssemester = $this->input->post('ausbildungssemester');
 		$datum = $this->input->post('datum');
@@ -348,23 +473,74 @@ class Status extends FHC_Controller
 		$bewerbung_abgeschicktamum = $this->input->post('bewerbung_abgeschicktamum');
 		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
 		$studienplan_id = $this->input->post('studienplan_id');
-		$anmerkung  = $this->input->post('anmerkung ');
+		$anmerkung  = $this->input->post('anmerkung');
 		$statusgrund_id = $this->input->post('statusgrund_id');
 		$rt_stufe = $this->input->post('rt_stufe');
-		$bestaetigtvon = $this->input->post('bestaetigtvon');
+		$bestaetigtvon = $uid;
 
 		// Start DB transaction
 		//$this->db->trans_start(false);
 
+		//check if Rolle already exists
+		if(($key_studiensemester_kurzbz != $studiensemester_kurzbz)
+			|| ($key_ausbildungssemester != $ausbildungssemester))
+			{
+				$result = $this->PrestudentstatusModel->checkIfExistingPrestudentRolle($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester);
+				if (isError($result))
+				{
+					$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+					return $this->outputJson(getError($result));
+				}
+				if($result->retval == '1')
+				{
+					$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+					return $this->outputJson($result->code);
+				}
+			}
+
+		//TODO(Manu) permission not working here...
+		$hasPermissionToSkipStatusCheck =  $this->permissionlib->isBerechtigt('student/keine_studdatuspruefung');
+		/*		var_dump($hasPermissionToSkipStatusCheck);
+
+				$basis =  $this->permissionlib->isBerechtigt('basis/prestudent');
+				var_dump($basis);*/
+		if(!$hasPermissionToSkipStatusCheck)
+		{
+			//Block STATUSCHECKS
+			//bei update wohl nicht?
+/*			$new_status_datum = isset($datum) ? $datum  : date('Y-m-d');
+			$result = $this->PrestudentstatusModel->checkDatumNewStatus($new_status_datum);
+			if (isError($result))
+			{
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return $this->outputJson(getError($result));
+			}*/
+
+			$new_status_datum = isset($datum) ? $datum  : date('Y-m-d');
+
+			$result = $this->PrestudentstatusModel->checkIfValidStatusHistory($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $new_status_datum, $ausbildungssemester);
+			if (isError($result))
+			{
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return $this->outputJson(getError($result));
+				//return $this->outputJson("DEBUG: in Funktion checkIfValidStatusHistory");
+			}
+			$statusArr = $result; //wenn return result ok
+
+		}
+
 		$result = $this->PrestudentstatusModel->update(
+			[
+				'prestudent_id' => $key_prestudent_id,
+				'status_kurzbz' => $key_status_kurzbz,
+				'studiensemester_kurzbz' => $key_studiensemester_kurzbz,
+				'ausbildungssemester' => $key_ausbildungssemester,
+			],
 			[
 				'prestudent_id' => $prestudent_id,
 				'status_kurzbz' => $status_kurzbz,
 				'studiensemester_kurzbz' => $studiensemester_kurzbz,
 				'ausbildungssemester' => $ausbildungssemester,
-			],
-			[
-
 				'bewerbung_abgeschicktamum' => $bewerbung_abgeschicktamum,
 				'studienplan_id' => $studienplan_id,
 				'anmerkung' => $anmerkung,
@@ -382,7 +558,186 @@ class Status extends FHC_Controller
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 			return $this->outputJson(getError($result));
 		}
+		if (!hasData($result)) {
+			return error('No Statusdata vorhanden');
+		}
 		return $this->outputJsonSuccess(true);
 	}
 
+	public function advanceStatus($key_prestudent_id, $key_status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester)
+	{
+		//TODO(Manu) check: Annahme, dass hier immer suid bei Berechtigung STG vergeben wird!
+		$granted_Ass = $this->permissionlib->getSTG_isEntitledFor('assistenz') ? $this->permissionlib->getSTG_isEntitledFor('assistenz') : [];
+		$granted_Adm = $this->permissionlib->getSTG_isEntitledFor('admin') ? $this->permissionlib->getSTG_isEntitledFor('admin') : [];
+		$granted = array_merge($granted_Ass, $granted_Adm);
+
+		//get Studiengang von prestudent_id
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+		$result = $this->PrestudentModel->load([
+			'prestudent_id'=> $key_prestudent_id,
+		]);
+		if(isError($result))
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson(getError($result));
+		}
+		$result = current(getData($result));
+
+		$stg = $result->studiengang_kz;
+
+		if(!in_array($stg, $granted)){
+			$result = "Sie haben keine Schreibrechte fuer diesen Studiengang!";
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson($result);
+		}
+
+		//Data Vorrücken
+		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
+
+		$result = $this->PrestudentstatusModel->loadWhere(
+			array(
+				'prestudent_id' => $key_prestudent_id,
+				'status_kurzbz' => $key_status_kurzbz,
+				'ausbildungssemester' => $key_ausbildungssemester,
+				'studiensemester_kurzbz' => $key_studiensemester_kurzbz
+			)
+		);
+
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->outputJson($result);
+		}
+
+		elseif (!hasData($result)) {
+			$this->outputJson($result);
+		}
+		else
+		{
+			$statusData = current(getData($result));
+		}
+
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+		$result = $this->StudiensemesterModel->getNextFrom($key_studiensemester_kurzbz);
+
+		if (isError($result))
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson(getError($result));
+		}
+		$studiensem_next = current(getData($result));
+		$studiensem_next = $studiensem_next->studiensemester_kurzbz;
+
+		$ausbildungssem_next = $key_ausbildungssemester+1;
+
+		//check if Rolle already exists
+		$result = $this->PrestudentstatusModel->checkIfExistingPrestudentRolle($key_prestudent_id, $key_status_kurzbz, $studiensem_next, $ausbildungssem_next);
+		if (isError($result))
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson(getError($result));
+		}
+		if($result->retval == '1')
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson($result->code);
+		}
+
+		//check if studentrolle already exists
+		if($key_status_kurzbz == 'Student')
+		{
+			$this->load->model('crm/Student_model', 'StudentModel');
+			$result = $this->StudentModel->checkIfExistingStudentRolle($key_prestudent_id);
+			if (isError($result))
+			{
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return $this->outputJson(getError($result));
+			}
+			if ($result->retval == "0")
+			{
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return $this->outputJson($result->code);
+			}
+		}
+
+		//insert prestudentstatus
+		$uid = getAuthUID();
+		$result = $this->PrestudentstatusModel->insert(
+			[
+				'prestudent_id' => $key_prestudent_id,
+				'status_kurzbz' => $key_status_kurzbz,
+				'studiensemester_kurzbz' => $studiensem_next,
+				'ausbildungssemester' => $ausbildungssem_next,
+				'insertamum' => date('c'),
+				'insertvon' => $uid,
+				'bestaetigtam' => date('c'),
+				'bestaetigtvon' => $uid,
+				'studienplan_id' => $statusData->studienplan_id,
+				'datum' => date('c'),
+				'anmerkung' => $statusData->anmerkung
+
+			]
+		);
+		if (isError($result))
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			//return $this->outputJson(getError($result));
+			return $this->outputJson("DEBUG: in insert Funktion");
+		}
+
+		//Studentlehrverband anlegen
+		$this->load->model('crm/Student_model', 'StudentModel');
+		$result = $this->StudentModel->checkIfUid($key_prestudent_id);
+		if(isError($result))
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson(getError($result));
+		}
+		$student_uid = $result->retval;
+
+		//check if Lehrverband exists
+		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
+		$result = $this->StudentlehrverbandModel->checkIfLehrverbandExists($student_uid, $studiensem_next);
+		if (isError($result))
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson(getError($result));
+		}
+		if ($result->retval == "0")
+		{
+			//load Data Lehrverband
+			$result = $this->StudentlehrverbandModel->load(
+				[
+					'student_uid' => $student_uid,
+					'studiensemester_kurzbz' => $key_studiensemester_kurzbz
+				]);
+			if (isError($result))
+			{
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+
+				return $this->outputJson("Error in insert Studentlehrverband");
+			}
+			$lvbData = current(getData($result));
+
+			$result = $this->StudentlehrverbandModel->insert(
+				[
+					'student_uid' => $student_uid,
+					'studiensemester_kurzbz' => $studiensem_next,
+					'semester' => $ausbildungssem_next,
+					'verband' => $lvbData->verband,
+					'gruppe' => $lvbData->gruppe,
+					'insertamum' => date('c'),
+					'insertvon' => $uid,
+					'studiengang_kz' => $lvbData->studiengang_kz
+				]);
+			if (isError($result))
+			{
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+
+				return $this->outputJson("Error in insert Studentlehrverband");
+			}
+		}
+		return $this->outputJsonSuccess(true);
+
+	}
+
 }
diff --git a/application/models/crm/Prestudent_model.php b/application/models/crm/Prestudent_model.php
index 742a823f5..08653c481 100644
--- a/application/models/crm/Prestudent_model.php
+++ b/application/models/crm/Prestudent_model.php
@@ -740,6 +740,10 @@ class Prestudent_model extends DB_Model
 		$result = $this->StudentModel->checkIfUID($prestudent_id);
 
 		if(isError($result))
+		{
+			return getData($result);
+		}
+		if($result->retval != "0")
 		{
 			$query = "
 			SELECT 
@@ -778,7 +782,7 @@ class Prestudent_model extends DB_Model
 		{
 			$query = "
 				SELECT 
-					ps.status_kurzbz, 
+					ps.status_kurzbz2, 
 					ps.studiensemester_kurzbz, 
 					ps.ausbildungssemester, 
 					CASE WHEN ps.status_kurzbz IN ('Student', 'Diplomand') THEN CONCAT(lv.semester, lv.verband, lv.gruppe) END AS lehrverband, 
@@ -813,8 +817,6 @@ class Prestudent_model extends DB_Model
 			";
 
 		}
-
-
 		return $this->execQuery($query, array($prestudent_id));
 	}
 }
diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php
index 84d281877..e824ebaf3 100644
--- a/application/models/crm/Prestudentstatus_model.php
+++ b/application/models/crm/Prestudentstatus_model.php
@@ -345,7 +345,7 @@ class Prestudentstatus_model extends DB_Model
 	 * @param string $status_kurzbz
 	 * @param string $studiensemester_kurzbz
 	 * @param integer $ausbildungssemester
-	 * @return error if already exists, success if not
+	 * @return 1: if Rolle exists, 0: if it doesn't
 	 * Copy from studentDBDML.php
 	 */
 	public function checkIfExistingPrestudentRolle($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester)
@@ -369,12 +369,13 @@ class Prestudentstatus_model extends DB_Model
 		{
 			return error($result);
 		}
-		elseif (!hasData($result)) {
-			return success($result);
+		elseif (!hasData($result))
+		{
+			return success(0);
 		}
 		else
 		{
-			return error('Diese Rolle ist bereits vorhanden: ' . $prestudent_id . ' / ' . $studiensemester_kurzbz  . ' : ' . $status_kurzbz . ' /' . $ausbildungssemester . ')');
+			return success("1","Diese Rolle ist bereits vorhanden!");
 		}
 	}
 
@@ -383,7 +384,7 @@ class Prestudentstatus_model extends DB_Model
 	 * @param integer $prestudent_id
 	 * @return error if no bewerberstatus, success if existing
 	 */
-	public function checkIfExistingBewerberstatus($prestudent_id)
+	public function checkIfExistingBewerberstatus($prestudent_id, $name = null)
 	{
 		$qry = "SELECT
 					*
@@ -400,8 +401,10 @@ class Prestudentstatus_model extends DB_Model
 		{
 			return error($result);
 		}
-		elseif (!hasData($result)) {
-			return error("Person muss zuerst zum Bewerber gemacht werden! " . $prestudent_id );
+		elseif (!hasData($result))
+		{
+			$person = $name ? $name : "Person";
+			return success("0",  $person . " muss zuerst zum Bewerber gemacht werden!");
 		}
 		else
 		{
@@ -409,6 +412,50 @@ class Prestudentstatus_model extends DB_Model
 		}
 	}
 
+	/**
+	 * Check if there is only one prestudentstatus left
+	 * @param integer $prestudent_id
+	 * @return success("1") if last prestudentstatusentry, else success("0")
+	 */
+	public function checkIfLastStatusEntry($prestudent_id)
+	{
+		$qry = "SELECT
+					COUNT(*) as anzahl
+				FROM 
+				    public.tbl_prestudentstatus
+				WHERE
+					prestudent_id = ? ";
+
+		$result = $this->execQuery($qry, array($prestudent_id));
+
+		if (isError($result))
+		{
+			return error($result);
+		}
+		else
+		{
+			$resultObject = current(getData($result));
+
+			if (property_exists($resultObject, 'anzahl'))
+			{
+				$anzahl = (int) $resultObject->anzahl;
+				if ($anzahl <= 1 )
+				{
+					return success ("1", "Die letzte Rolle kann nur durch den Administrator geloescht werden");
+					//return error("Die letzte Rolle kann nur durch den Administrator geloescht werden");
+				}
+				else
+					return success("0", $anzahl . " Rollen vorhanden");
+					//return success($anzahl);
+
+			}
+			else
+			{
+				return error("PrestudentstatusModel: Error During Check if Last Status Entry.");
+			}
+		}
+	}
+
 	/**
 	 * Check if Datum New Status is in the Past
 	 * @param integer $prestudent_id
@@ -456,8 +503,6 @@ class Prestudentstatus_model extends DB_Model
 		$studiensemester = current($result->retval);
 		$new_status_semesterstart = $studiensemester->start;
 
-		//print_r($new_status_semesterstart);
-
 		//get all prestudentstati
 		$resultPs = $this->getAllPrestudentstatiWithStudiensemester($prestudent_id);
 		if (isError($resultPs))
@@ -474,9 +519,6 @@ class Prestudentstatus_model extends DB_Model
 
 		foreach ($resultArr as $row)
 		{
-/*			print_r($row->studiensemester_start . " >= " . $row->datum  . " UND ");
-			print_r($new_status_semesterstart  . " >= " . $new_status_datum . " ? ");*/
-
 			$studiensemester_start = new DateTime($row->studiensemester_start);
 			$status_datum = new DateTime ($row->datum);
 
@@ -498,17 +540,14 @@ class Prestudentstatus_model extends DB_Model
 			}
 			elseif($new_status_datum_form <= $status_datum && $new_status_semesterstart_form <= $studiensemester_start){
 				$statusArr[] = $row;
-				//print_r( "cond 2 met\n");
 
 			}
 			else
 			{
 				return error("Datum des Statuseintrags muss nach dem Statusdatum, das Semesterstartdatum nach Semesterstartdatum des vorherigen Statuseintrags sein");
-				//	print_r( "cond not met" . $count . "\n");
 			}
 
 		}
-		//var_dump($statusArr);
 
 		$endstatusArr = array('Absolvent', 'Abbrecher');
 		// Über alle gespeicherten Status gehen und Statusabfolge prüfen
@@ -526,7 +565,6 @@ class Prestudentstatus_model extends DB_Model
 			}
 
 			// wenn Unterbrecher auf Unterbrecher folgt, muss Ausbildungssemester gleich sein
-			//TODO(Manu) check, warum hier automatisch ausbildungssemester korrigiert wird
 			if (
 				$curr_status_kurzbz == 'Unterbrecher' && isset($next_status) && $next_status->status_kurzbz == 'Unterbrecher'
 				&& $curr_status_ausbildungssemester != $next_status->ausbildungssemester
@@ -536,7 +574,6 @@ class Prestudentstatus_model extends DB_Model
 			}
 
 			// wenn Abbrecher auf Unterbrecher folgt, muss Ausbildungssemester gleich sein
-			//TODO(Manu) check, warum hier automatisch ausbildungssemester korrigiert wird
 			if (
 				isset($next_status) && $curr_status_kurzbz == 'Unterbrecher'
 				&& $next_status->status_kurzbz == 'Abbrecher' && $curr_status_ausbildungssemester != $next_status->ausbildungssemester
@@ -561,47 +598,10 @@ class Prestudentstatus_model extends DB_Model
 		return $resultPs;
 	}
 
-	public function miniFunction()
-	{
-		$array = [
-			'key1' => 'value1',
-			'key2' => 'value2',
-			'key3' => 'value3'
-		];
-
-		return $array;
-	}
-
-	public function checkStatusabfolge($statusArr)
-	{
-		$endstatusArr = array('Absolvent', 'Abbrecher');
-		$statusArr = json_decode($statusArr);
-
-		//var_dump($statusArr);
-		var_dump($statusArr[0]->status_kurzbz);
-		// Prüfungen den Prestudentstatus betreffend
-		// Über alle gespeicherten Status gehen und Statusabfolge prüfen
-/*		for ($i = 0; $i < count($statusArr); $i++) {
-			$curr_status = $statusArr[$i];
-			$curr_status_kurzbz = $curr_status->status_kurzbz;
-			$curr_status_ausbildungssemester = $curr_status->ausbildungssemester;
-			$next_idx = $i - 1; //absteigend sortiert, nächster Status ist vorheriger Eintrag
-			$next_status = isset($statusArr[$next_idx]) ? $statusArr[$next_idx] : null;
-
-			// Abbrecher- oder Absolventenstatus muss Endstatus sein
-			if (isset($next_status) && in_array($curr_status_kurzbz, $endstatusArr)) {
-
-				return error("Nach Abbrecher- und Absolventenstatus darf kein anderer Status mehr eingetragen werden");
-			}
-		}*/
-
-		return $endstatusArr;
-
-	}
-
 	public function getAllPrestudentstatiWithStudiensemester($prestudent_id, $old_status_studiensemester_kurzbz = '', $old_status_ausbildungssemester = '')
 	{
 
+		//Todo(manu) check isNewStatus
 		$isNewStatus =  $old_status_studiensemester_kurzbz == '' && $old_status_ausbildungssemester == '';
 
 		$qry = "
@@ -630,26 +630,6 @@ class Prestudentstatus_model extends DB_Model
 
 		return $result;
 
-
-
-/*		$this->addSelect($this->dbTable . '.status_kurzbz');
-		$this->addSelect($this->dbTable . '.studiensemester_kurzbz');
-		$this->addSelect($this->dbTable . '.ausbildungssemester');
-		$this->addSelect($this->dbTable . '.datum');
-		$this->addSelect('s.start AS studiensemester_start');
-
-		$this->addJoin('public.tbl_studiensemester s', 'studiensemester_kurzbz');
-		$this->addOrder($this->dbTable . '.datum', 'DESC');
-		$this->addOrder($this->dbTable . '.insertamum', 'DESC');
-
-		$this->addOrder($this->dbTable . '.ext_id', 'DESC');
-
-		return $this->loadWhere([
-			'prestudent_id' => $prestudent_id
-			]
-		);*/
-
-
 	}
 
 
diff --git a/application/models/crm/Student_model.php b/application/models/crm/Student_model.php
index d307c36c0..9ccaff1a4 100644
--- a/application/models/crm/Student_model.php
+++ b/application/models/crm/Student_model.php
@@ -80,12 +80,20 @@ class Student_model extends DB_Model
 			array('prestudent_id' => $prestudent_id)
 		);
 
-		if (!hasData($result))
+		if(isError($result))
 		{
-			return error($result);
+			return error("0", "Error while checking student_uid");
 		}
 
-		return $result->retval[0]->student_uid;
+		if (!hasData($result))
+		{
+			return success("0","Keine Student_uid vorhanden");
+		}
+
+		$student_uid = $result->retval[0]->student_uid;
+
+		return success ($student_uid);
+
 	}
 
 	public function searchStudent($filter)
@@ -113,4 +121,45 @@ class Student_model extends DB_Model
 	{
 		return $student_uid . '@' . DOMAIN;
 	}
+
+	/**
+	 * Check if StudentenRolle already exists
+	 * @param integer $prestudent_id
+	 * @return 0 if not exists, count(rollen) if it does
+	 * Copy from studentDBDML.php
+	 */
+	public function checkIfExistingStudentRolle($prestudent_id)
+	{
+		$qry = "SELECT 
+    				count(*) as anzahl 
+				FROM 
+				    public.tbl_student 
+				WHERE 
+				    prestudent_id = ? ";
+
+		$result = $this->execQuery($qry, array($prestudent_id));
+
+		if (isError($result))
+		{
+			return error($result);
+		}
+		else {
+			$resultObject = current(getData($result));
+
+			if (property_exists($resultObject, 'anzahl')) {
+				$resultValue = (int) $resultObject->anzahl;
+
+				if ($resultValue > 0)
+				{
+					return success($resultValue, $resultValue . " vorhandene Rollen");
+				}
+				else
+				{
+					return success("0", "Ein Studentenstatus kann hier nur hinzugefuegt werden wenn die Person bereits Student ist. Um einen Bewerber zum Studenten zu machen waehlen Sie bitte unter 'Status aendern' den Punkt 'Student'");
+				}
+			} else {
+				return error("StudentModel: Error During Check if Existing Student Rolle.");
+			}
+		}
+	}
 }
diff --git a/application/models/education/Studentlehrverband_model.php b/application/models/education/Studentlehrverband_model.php
index 765429396..e27b14b00 100644
--- a/application/models/education/Studentlehrverband_model.php
+++ b/application/models/education/Studentlehrverband_model.php
@@ -12,4 +12,39 @@ class Studentlehrverband_model extends DB_Model
 		$this->pk = array('studiensemester_kurzbz', 'student_uid');
 		$this->hasSequence = false;
 	}
+
+	/**
+	 * Check if Rolle already exists
+	 * @param integer $prestudent_id
+	 * @param string $status_kurzbz
+	 * @param string $studiensemester_kurzbz
+	 * @param integer $ausbildungssemester
+	 * @return 1: if Rolle exists, 0: if it doesn't
+	 */
+	public function checkIfLehrverbandExists($student_uid, $studiensemester_kurzbz)
+	{
+		$qry = "SELECT
+					*
+				FROM 
+				    public.tbl_studentlehrverband
+				WHERE
+					student_uid = ? 
+				AND
+				    studiensemester_kurzbz = ?";
+
+		$result = $this->execQuery($qry, array($student_uid, $studiensemester_kurzbz));
+
+		if (isError($result))
+		{
+			return error($result);
+		}
+		elseif (!hasData($result))
+		{
+			return success("0", "Kein Lehrverband vorhanden!");
+		}
+		else
+		{
+			return success("1","Lehrverband vorhanden!");
+		}
+	}
 }
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
index b7e2c1b93..1d83db1b1 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
@@ -186,11 +186,16 @@ export default{
 		actionAdvanceStatus(status, stdsem, ausbildungssemester){
 			console.log("Action: Status vorrücken: (" + status + ": " + stdsem + "/" + ausbildungssemester + ")")
 			//this.$refs.deleteStatusModal.show();
-
-			/*			this.loadStatus(status_id).then(() => {
-							if(this.statusData.bankverbindung_id)
-								this.$refs.deleteStatusModal.show();
-						});*/
+			this.statusId = {
+				'prestudent_id': this.prestudent_id,
+				'status_kurzbz': status,
+				'studiensemester_kurzbz': stdsem,
+				'ausbildungssemester': ausbildungssemester
+			};
+			this.loadStatus(this.statusId).then(() => {
+				if(this.statusData)
+					this.advanceStatus(this.statusId);
+			});
 		},
 		actionConfirmStatus(status, stdsem, ausbildungssemester){
 			console.log("Action: Status bestätigen: (" + status + ": " + stdsem + "/" + ausbildungssemester + ")")
@@ -226,6 +231,33 @@ export default{
 				this.reload();
 			});
 		},
+		advanceStatus(statusId){
+			return CoreRESTClient.post('components/stv/Status/advanceStatus/' +
+				this.statusId.prestudent_id + '/' +
+				this.statusId.status_kurzbz + '/' +
+				this.statusId.studiensemester_kurzbz + '/' +
+				this.statusId.ausbildungssemester)
+				.then(
+					result => {
+						if(!result.data.error) {
+							this.$fhcAlert.alertSuccess('Vorrückung Status erfolgreich');
+						}
+						else
+						{
+							const errorData = result.data.retval;
+							this.$fhcAlert.alertError('Kein Status mit Id ' + status_id + ' gefunden');
+						}
+						/*						return result;*/
+					}).catch(error => {
+					if (error.response) {
+						console.log(error.response);
+						this.$fhcAlert.alertError(error.response.data);
+					}
+				}).finally(() => {
+					window.scrollTo(0, 0);
+					this.reload();
+				});
+		},
 		deleteStatus(status_id){
 			return CoreRESTClient.post('components/stv/Status/deleteStatus/',
 				status_id)
@@ -243,14 +275,21 @@ export default{
 						}
 /*						return result;*/
 					}).catch(error => {
-					this.$fhcAlert.alertError('Fehler bei Löschen von Status aufgetreten');
+					if (error.response) {
+						//console.log(error.response);
+						this.$fhcAlert.alertError(error.response.data);
+					}
 				}).finally(() => {
 					window.scrollTo(0, 0);
 					this.reload();
 				});
 		},
-		editStatus(status_id){
-			return CoreRESTClient.post('components/stv/Status/updateStatus/' + this.prestudent_id,
+		editStatus(){
+			return CoreRESTClient.post('components/stv/Status/updateStatus/' +
+				this.statusId.prestudent_id + '/' +
+				this.statusId.status_kurzbz + '/' +
+				this.statusId.studiensemester_kurzbz + '/' +
+				this.statusId.ausbildungssemester,
 				this.statusData)
 				.then(
 					result => {
@@ -266,7 +305,10 @@ export default{
 						}
 						/*						return result;*/
 					}).catch(error => {
-					this.$fhcAlert.alertError('Fehler beim Bearbeiten des Status aufgetreten');
+					if (error.response) {
+						console.log(error.response);
+						this.$fhcAlert.alertError(error.response.data);
+					}
 				}).finally(() => {
 					window.scrollTo(0, 0);
 					this.reload();
@@ -330,17 +372,17 @@ export default{
 		<div class="stv-list h-100 pt-3">
 		
 		
-<!--		<p>TestData</p>
+		<p>TestData</p>
 		{{statusData}}
-		<hr>-->
+		<hr>
 <!--		Berechtigungen:
 			Skip Check: {{hasPermissionToSkipStatusCheck}} |
 			Admin: {{hasAdminPermission}} |
 			Studiengaenge: {{hasAssistenzPermissionForStgs}} |
 			Schreibrecht ASS: {{hasSchreibrechtAss}}-->
 		
-<!--		<hr>
-		<p>{{statusId}}</p>	-->
+		<hr>
+		<p>{{statusId}}</p>	
 		
 			<!--Modal: Add New Status-->
 			<BsModal ref="newStatusModal">
@@ -515,6 +557,8 @@ export default{
 				<template #title>Status bearbeiten</template>
 					<form-form class="row g-3" ref="statusData">
 					
+					 <input type="hidden" id="statusId" name="statusId" value="statusData.statusId">
+					
 						<div class="row mb-3">
 							<label for="status_kurzbz" class="form-label col-sm-4">Rolle</label>
 							<div class="col-sm-6">
@@ -524,6 +568,7 @@ export default{
 									v-model="statusData['status_kurzbz']"
 									name="status_kurzbz"
 									type="select"
+									disabled
 									>
 									<option  value="Interessent">InteressentIn</option>
 									<option  value="Bewerber">BewerberIn</option>
@@ -670,7 +715,7 @@ export default{
 					</form-form>
 					
 				<template #footer>
-						<button type="button" class="btn btn-primary" @click="editStatus(statusId)">OK</button>
+						<button type="button" class="btn btn-primary" @click="editStatus()">OK</button>
 				</template>
 								
 			</BsModal>

From 77e31f2da6421164c7efd60021b38304e0649079 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 29 Feb 2024 10:58:45 +0100
Subject: [PATCH 0442/1461] Delete Prestudent

---
 .../controllers/components/stv/Status.php     | 94 ++++++++++++++-----
 application/models/crm/Prestudent_model.php   |  4 +-
 .../models/crm/Prestudentstatus_model.php     | 14 ++-
 application/models/crm/Student_model.php      |  2 +-
 .../Studentenverwaltung/Details/Prestudent.js |  1 +
 .../Details/Prestudent/Status.js              | 14 +--
 6 files changed, 90 insertions(+), 39 deletions(-)

diff --git a/application/controllers/components/stv/Status.php b/application/controllers/components/stv/Status.php
index 1618a3d52..fa1ec9295 100644
--- a/application/controllers/components/stv/Status.php
+++ b/application/controllers/components/stv/Status.php
@@ -111,7 +111,14 @@ class Status extends FHC_Controller
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 			return $this->outputJson(getError($result));
 		}
-		$lastStatusData = current(getData($result));
+		elseif(!hasData($result))
+		{
+			$lastStatusData = [];
+/*			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson("donn holt nittan");*/
+		}
+		else
+			$lastStatusData = current(getData($result));
 		//var_dump($lastStatusData);
 
 		//Different handling depending on newStatus
@@ -214,7 +221,7 @@ class Status extends FHC_Controller
 			}
 		}
 
-		//TODO(Manu) permission not working here...
+		//TODO(Manu) check permission...
 		$hasPermissionToSkipStatusCheck =  $this->permissionlib->isBerechtigt('student/keine_studdatuspruefung');
 		/*		var_dump($hasPermissionToSkipStatusCheck);
 
@@ -309,8 +316,9 @@ class Status extends FHC_Controller
 		$status_kurzbz = $this->input->post('status_kurzbz');
 		$ausbildungssemester = $this->input->post('ausbildungssemester');
 		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
+		$deletePrestudent = false;
 
-		//TODO(Manu) check: warum sind beim Löschen andere Berechtigungen?
+		//TODO(Manu) check permissions: warum sind beim Löschen andere Berechtigungen?
 		//ich darf keine Stati anlegen, aber löschen, wenn mehr als einer übrig???
 /*		$granted_Ass = $this->permissionlib->getSTG_isEntitledFor('assistenz');
 		$granted_Adm = $this->permissionlib->getSTG_isEntitledFor('admin');
@@ -346,22 +354,28 @@ class Status extends FHC_Controller
 		}
 
 
-		if(!$isBerechtigtAdmin && !$isBerechtigtNoStudstatusCheck)
+		//check if last status
+		$result = $this->PrestudentstatusModel->checkIfLastStatusEntry($prestudent_id);
+		if (isError($result))
 		{
-			//check if last status
-			$result = $this->PrestudentstatusModel->checkIfLastStatusEntry($prestudent_id);
-			if (isError($result))
-			{
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson($result);
-			}
-			if($result->retval == "1")
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson($result);
+		}
+		if($result->retval == "1")
+		{
+			//Berechtigungen nach Check prüfen!
+			if(!$isBerechtigtAdmin && !$isBerechtigtNoStudstatusCheck)
 			{
 				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 				return $this->outputJson($result->code);
 			}
+			else
+			{
+				$deletePrestudent = true;
+			}
 		}
 
+		//TODO(manu) $this->db->trans_start(false); and rollback?
 		//Delete Status
 		$result = $this->PrestudentstatusModel->delete(
 			array(
@@ -376,29 +390,31 @@ class Status extends FHC_Controller
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 			$this->outputJson($result);
 		}
-		elseif(!hasData($result)) {
+		if(!hasData($result)) {
 			$this->outputJson($result);
 		}
-		//return $this->outputJsonSuccess(current(getData($result)));
 
-		// Delete Studentlehrverband if no Status left
+		//Delete Studentlehrverband if no Status left
 		$result = $this->PrestudentstatusModel->getLastStatus($prestudent_id, $studiensemester_kurzbz);
 
-		if(isError($result))
-		{
+		if (isError($result)) {
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 			return $this->outputJson(getError($result));
 		}
-		if(!hasData($result))
+		if (!hasData($result))
 		{
 			//get student_uid
 			$this->load->model('crm/Student_model', 'StudentModel');
 			$result = $this->StudentModel->checkIfUid($prestudent_id);
-			if(isError($result))
+			if (isError($result))
 			{
 				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 				return $this->outputJson(getError($result));
 			}
+			if (!hasData($result))
+			{
+				$this->outputJson($result);
+			}
 			$student_uid = $result->retval;
 
 			$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
@@ -413,16 +429,42 @@ class Status extends FHC_Controller
 				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 				$this->outputJson("Fehler beim Löschen der Lehrverbandszuordnung");
 			}
-			if(!hasData($result)) {
+			if (!hasData($result))
+			{
+				$this->outputJson($result);
+				var_dump("no data2");
+			}
+			$this->outputJsonSuccess(true);
+
+		}
+
+		//Delete Prestudent if no data is left
+		if($deletePrestudent)
+		{
+			//TODO(manu) check all connected tables and delete them
+			//es wird noch auf prestudent_dokumentprestudent verwiesen
+			//löschen zuerst von Doks
+			$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+			$result = $this->PrestudentModel->delete(
+				array(
+					'prestudent_id' => $prestudent_id
+				)
+			);
+			if (isError($result))
+			{
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 				$this->outputJson($result);
 			}
-			return $this->outputJsonSuccess(true);
+			if(!hasData($result))
+			{
+				$this->outputJson($result);
+			}
+			$this->outputJson($result);
+
+
 		}
-		//TODO(manu) $this->db->trans_start(false); and rollback?
-		//TODO(manu) ganzen Prestudenten löschen, wenn kein Eintrag mehr
+
 		return $this->outputJsonSuccess(true);
-
-
 	}
 
 	public function updateStatus($key_prestudent_id, $key_status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester)
@@ -498,7 +540,7 @@ class Status extends FHC_Controller
 				}
 			}
 
-		//TODO(Manu) permission not working here...
+		//TODO(Manu) check permissions
 		$hasPermissionToSkipStatusCheck =  $this->permissionlib->isBerechtigt('student/keine_studdatuspruefung');
 		/*		var_dump($hasPermissionToSkipStatusCheck);
 
diff --git a/application/models/crm/Prestudent_model.php b/application/models/crm/Prestudent_model.php
index 08653c481..1938e661a 100644
--- a/application/models/crm/Prestudent_model.php
+++ b/application/models/crm/Prestudent_model.php
@@ -743,7 +743,7 @@ class Prestudent_model extends DB_Model
 		{
 			return getData($result);
 		}
-		if($result->retval != "0")
+		if($result->retval == "0") //wenn kein studentlehrband eingetragen
 		{
 			$query = "
 			SELECT 
@@ -782,7 +782,7 @@ class Prestudent_model extends DB_Model
 		{
 			$query = "
 				SELECT 
-					ps.status_kurzbz2, 
+					ps.status_kurzbz, 
 					ps.studiensemester_kurzbz, 
 					ps.ausbildungssemester, 
 					CASE WHEN ps.status_kurzbz IN ('Student', 'Diplomand') THEN CONCAT(lv.semester, lv.verband, lv.gruppe) END AS lehrverband, 
diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php
index e824ebaf3..593a13452 100644
--- a/application/models/crm/Prestudentstatus_model.php
+++ b/application/models/crm/Prestudentstatus_model.php
@@ -504,13 +504,19 @@ class Prestudentstatus_model extends DB_Model
 		$new_status_semesterstart = $studiensemester->start;
 
 		//get all prestudentstati
+		//TODO(manu) errorlogic
 		$resultPs = $this->getAllPrestudentstatiWithStudiensemester($prestudent_id);
 		if (isError($resultPs))
 		{
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson(getError($resultPs));
+			$resultArr = [];
 		}
-		$resultArr = $resultPs->retval;
+		if(!hasData($resultPs))
+		{
+			$resultArr = [];
+		}
+		else
+			$resultArr = $resultPs->retval;
+
 		$statusArr = array();
 
 		$newStatusInserted = false;
@@ -625,7 +631,7 @@ class Prestudentstatus_model extends DB_Model
 			return error($result);
 		}
 		if (!hasData($result)) {
-			return error('No Statusdata vorhanden');
+			return success("0",'No Statusdata vorhanden');
 		}
 
 		return $result;
diff --git a/application/models/crm/Student_model.php b/application/models/crm/Student_model.php
index 9ccaff1a4..364524df9 100644
--- a/application/models/crm/Student_model.php
+++ b/application/models/crm/Student_model.php
@@ -82,7 +82,7 @@ class Student_model extends DB_Model
 
 		if(isError($result))
 		{
-			return error("0", "Error while checking student_uid");
+			return error( "Error while checking student_uid");
 		}
 
 		if (!hasData($result))
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
index aaab14983..7f3517ee9 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
@@ -198,6 +198,7 @@ export default {
 	<div class="stv-details-details h-100 pb-3">
 		<form-form ref="form" class="stv-details-prestudent" @submit.prevent="updatePrestudent">
 		<div class="position-sticky top-0 z-1">
+		<!--TODO(manu) Button inactiv setzen, wenn keine Änderungen-->
 			<button type="submit" class="btn btn-primary position-absolute top-0 end-0" >Speichern</button>
 		</div>
 		<!--<form ref="form">-->
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
index 1d83db1b1..4969d9b55 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
@@ -200,11 +200,13 @@ export default{
 		actionConfirmStatus(status, stdsem, ausbildungssemester){
 			console.log("Action: Status bestätigen: (" + status + ": " + stdsem + "/" + ausbildungssemester + ")")
 			//this.$refs.deleteStatusModal.show();
-
-			/*			this.loadStatus(status_id).then(() => {
-							if(this.statusData.bankverbindung_id)
-								this.$refs.deleteStatusModal.show();
-						});*/
+			this.statusId = {
+				'prestudent_id': this.prestudent_id,
+				'status_kurzbz': status,
+				'studiensemester_kurzbz': stdsem,
+				'ausbildungssemester': ausbildungssemester
+			};
+			console.log(this.statusId);
 		},
 		addNewStatus(){
 			CoreRESTClient.post('components/stv/Status/addNewStatus/' + this.prestudent_id,
@@ -590,7 +592,7 @@ export default{
 									type="select"
 									name="studiensemester_kurzbz" 
 									v-model="statusData['studiensemester_kurzbz']"
-								> <!--TODO(manu) default aktueller Eintrag-->
+								>
 									<option v-for="sem in listStudiensemester" :key="sem.studiensemester_kurzbz" :value="sem.studiensemester_kurzbz">{{sem.studiensemester_kurzbz}}</option>
 								</form-input>
 							</div>

From 7a6d095b780e426bc3fefda216317d8a740e6c2e Mon Sep 17 00:00:00 2001
From: Werner Masik <werner@gefi.at>
Date: Thu, 29 Feb 2024 17:09:59 +0100
Subject: [PATCH 0443/1461] create db tables for fristenmanagement

---
 .../dbupdate_3.4/37107_fristenmanagement.php  | 62 +++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 system/dbupdate_3.4/37107_fristenmanagement.php

diff --git a/system/dbupdate_3.4/37107_fristenmanagement.php b/system/dbupdate_3.4/37107_fristenmanagement.php
new file mode 100644
index 000000000..84b828008
--- /dev/null
+++ b/system/dbupdate_3.4/37107_fristenmanagement.php
@@ -0,0 +1,62 @@
+<?php
+if (! defined('DB_NAME')) exit('No direct script access allowed');
+
+if ($result = $db->db_query("SELECT * FROM information_schema.tables WHERE table_name='tbl_dienstverhaeltnis' AND table_schema='hr'"))
+{
+	if ($db->db_num_rows($result) == 0)
+	{
+		$qry = "
+        CREATE TABLE IF NOT EXISTS hr.tbl_frist (
+            frist_id bigserial NOT NULL,
+            mitarbeiter_uid character varying(32) NOT NULL,
+            ereignis_kurzbz character varying(32) NOT NULL,
+            bezeichnung varchar(255),
+            datum date,
+            status_kurzbz character varying(32) NOT NULL,
+            parameter jsonb NOT NULL,
+            insertvon character varying(32) NOT NULL,
+            insertamum timestamp without time zone DEFAULT now() NOT NULL,
+            updatevon character varying(32),
+            updateamum timestamp without time zone,
+            CONSTRAINT tbl_frist_pkey PRIMARY KEY (frist_id)
+        );
+
+        CREATE TABLE IF NOT EXISTS hr.tbl_frist_ereignis (
+            ereignis_kurzbz character varying(32) NOT NULL,
+            bezeichnung varchar(32) NOT NULL,
+            manuell boolean DEFAULT FALSE,
+            CONSTRAINT tbl_ereignis_pkey PRIMARY KEY (ereignis_kurzbz)
+        );
+
+        COMMENT ON TABLE hr.tbl_frist_status IS E'Key-Table of fristen (deadline) events';
+
+        CREATE TABLE IF NOT EXISTS hr.tbl_frist_status
+            status_kurzbz character varying(32) NOT NULL,
+            bezeichnung varchar(32),
+            CONSTRAINT tbl_frist_status_pk PRIMARY KEY (status_kurzbz)
+        );
+
+        COMMENT ON TABLE hr.tbl_frist_status IS E'Key-Table of fristen status (new, done)';
+
+        ALTER TABLE hr.tbl_frist ADD CONSTRAINT hr.tbl_frist_mitarbeiter_uid_fk FOREIGN KEY (mitarbeiter_uid)
+		REFERENCES public.tbl_mitarbeiter (mitarbeiter_uid) MATCH FULL
+		ON DELETE SET NULL ON UPDATE CASCADE;
+
+        ALTER TABLE hr.tbl_frist ADD CONSTRAINT hr.tbl_frist_ereignis_kurzbz_fk FOREIGN KEY (ereignis_kurzbz)
+		REFERENCES hr.tbl_frist_ereignis (ereignis_kurzbz) MATCH FULL
+		ON DELETE SET NULL ON UPDATE CASCADE;
+
+        ALTER TABLE hr.tbl_frist ADD CONSTRAINT hr.tbl_frist_status_kurzbz_fk FOREIGN KEY (status_kurzbz)
+		REFERENCES hr.tbl_frist_status (status_kurzbz) MATCH FULL
+		ON DELETE SET NULL ON UPDATE CASCADE;
+
+
+
+        ";
+    
+        if (! $db->db_query($qry))
+            echo '<strong>Fristenmanagement: ' . $db->db_last_error() . '</strong><br>';
+        else
+            echo 'Fristenmanagementtabellen wurden neu erstellt';
+    }
+}

From ccf01100bb0bcc1c0c2dfa94db0b5777698ea47c Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 1 Mar 2024 15:36:10 +0100
Subject: [PATCH 0444/1461] adds new classes because alert-info/warning/... are
 not consistent in the new bootstrap versions

---
 .../lehre/anrechnung/requestAnrechnung.php    |  13 ++-
 .../anrechnung/requestAnrechnungImportant.php | 107 +++++++++---------
 public/css/lehre/anrechnung.css               |  41 +++++++
 .../js/lehre/anrechnung/requestAnrechnung.js  |  18 +--
 4 files changed, 112 insertions(+), 67 deletions(-)

diff --git a/application/views/lehre/anrechnung/requestAnrechnung.php b/application/views/lehre/anrechnung/requestAnrechnung.php
index 18fd66a67..c2212adbc 100644
--- a/application/views/lehre/anrechnung/requestAnrechnung.php
+++ b/application/views/lehre/anrechnung/requestAnrechnung.php
@@ -10,7 +10,7 @@ $this->load->view(
 		'title' => $this->p->t('anrechnung', 'antragStellen'),
 		'jquery3' => true,
 		'jqueryui1' => true,
-		'bootstrap3' => true,
+		'bootstrap5' => true,
 		'fontawesome4' => true,
 		'ajaxlib' => true,
 		'dialoglib' => true,
@@ -54,6 +54,9 @@ $this->load->view(
 			'public/js/bootstrapper.js',
 			'public/js/lehre/anrechnung/requestAnrechnung.js'
 
+		),
+		'customCSSs' => array(
+			'public/css/lehre/anrechnung.css'
 		)
 	)
 );
@@ -79,7 +82,7 @@ $this->load->view(
 		<!-- end header-->
 		
         <div class="row">
-            <div class="col-xs-8">
+            <div class="col-8">
 				<!-- Antragsdaten, Dokument Upload, Notiz-->
 				<div class="row">
 					<div class="col-lg-12">
@@ -261,7 +264,7 @@ $this->load->view(
 											   title="<?php echo $this->p->t('ui', 'uploadTooltipText'); ?>">
 												<i class="fa fa-lg fa-question-circle-o" aria-hidden="true"></i>
 											</span>
-											<a class="pull-right <?php echo !empty($anrechnungData->dms_id) ? '' : 'hidden' ?>"
+											<a class="pull-right <?php echo !empty($anrechnungData->dms_id) ? '' : 'visually-hidden' ?>"
 											   id="requestAnrechnung-downloadDocLink"
 											   href="<?php echo current_url() . '/download?dms_id=' . $anrechnungData->dms_id; ?>"
 											   target="_blank"><?php echo htmlentities($anrechnungData->dokumentname) ?>
@@ -316,7 +319,7 @@ $this->load->view(
 				</div>
 				<br><br><br><br>
             </div>
-            <div class="col-xs-4">
+            <div class="col-4">
 				 <!-- Status panel -->
                 <div class="alert text-center" id="requestAnrechnung-status">Status: <b><span class="text-uppercase" id="requestAnrechnung-status_kurzbz"
                              data-status_kurzbz="<?php echo $anrechnungData->status_kurzbz ?>">
@@ -324,7 +327,7 @@ $this->load->view(
                         </span></b>
 				</div>
 				<!-- Sperregrund panel (hidden by default) -->
-				<div class="alert alert-danger text-center hidden" id="requestAnrechnung-sperre"
+				<div class="alert alert-danger text-center visually-hidden" id="requestAnrechnung-sperre"
 					 data-anrechnung_id="<?php echo empty($anrechnungData->anrechnung_id) ? '' : $anrechnungData->anrechnung_id; ?>"
 					 data-expired="<?php echo json_encode($is_expired); ?>"
 					 data-blocked="<?php echo json_encode($is_blocked) ?>">
diff --git a/application/views/lehre/anrechnung/requestAnrechnungImportant.php b/application/views/lehre/anrechnung/requestAnrechnungImportant.php
index 8cacb9c26..26c37f8ae 100644
--- a/application/views/lehre/anrechnung/requestAnrechnungImportant.php
+++ b/application/views/lehre/anrechnung/requestAnrechnungImportant.php
@@ -1,70 +1,71 @@
-<div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
-    <!--    Beantragung: Fristen panel -->
-    <div class="panel panel-info">
-        <div class="panel-heading" role="tab" id="headingOne">
-            <h4 class="panel-title">
-                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseOne"
-                   aria-expanded="true" aria-controls="collapseOne">
-                    <i class="fa fa-lg fa-info-circle" aria-hidden="true"></i>&ensp;
-					<?php echo $this->p->t('anrechnung', 'requestAnrechnungInfoFristenTitle'); ?>
-                </a>
-            </h4>
+
+
+    <div class="accordion" id="accordionExample">
+       <!--    Beantragung: Fristen panel -->
+  <div class="accordion-item">
+    <h2 class="accordion-header">
+        <div  class="bg-info-subtle accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
+        <div class="d-flex">
+        
+        <i class="me-2 fa fa-lg fa-info-circle" aria-hidden="true"></i>&ensp;
+				<?php echo $this->p->t('anrechnung', 'requestAnrechnungInfoFristenTitle'); ?>
+        
         </div>
-        <div id="collapseOne" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingOne">
-            <div class="panel-body">
-				<?php echo $this->p->t('anrechnung', 'requestAnrechnungInfoFristenBody'); ?>
-            </div>
         </div>
+    </h2>
+    <div id="collapseOne" class="accordion-collapse collapse show" data-bs-parent="#accordionExample">
+      <div class="accordion-body">
+      <?php echo $this->p->t('anrechnung', 'requestAnrechnungInfoFristenBody'); ?>
+      </div>
     </div>
-    <!--    Referenzbeispiele ECTS Berechnung panel -->
-    <div class="panel panel-info">
-        <div class="panel-heading" role="tab" id="headingBegruendung">
-            <h4 class="panel-title">
-                <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseBegruendung"
-                   aria-expanded="false" aria-controls="collapseBegruendung">
-                    <i class="fa fa-lg fa-info-circle" aria-hidden="true"></i>&ensp;
+  </div>
+  <!--    Referenzbeispiele ECTS Berechnung panel -->
+  <div class="accordion-item">
+    <h2 class="accordion-header">
+        <div class="bg-info-subtle accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseTwo" aria-expanded="false" aria-controls="collapseTwo">
+        <div class="d-flex">
+        <i class="me-2 fa fa-lg fa-info-circle" aria-hidden="true"></i>&ensp;
 					<?php echo $this->p->t('anrechnung', 'requestAnrechnungInfoEctsBerechnungTitle'); ?>
-                </a>
-            </h4>
         </div>
-        <div id="collapseBegruendung" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingBegruendung">
-            <div class="panel-body">
-				<?php echo $this->p->t('anrechnung', 'requestAnrechnungInfoEctsBerechnungBody'); ?>
-            </div>
         </div>
+    </h2>
+    <div id="collapseTwo" class="accordion-collapse collapse" data-bs-parent="#accordionExample">
+      <div class="accordion-body">
+      <?php echo $this->p->t('anrechnung', 'requestAnrechnungInfoEctsBerechnungBody'); ?>
+      </div>
     </div>
-    <!--    Nachweisdokumente: Voraussetzung panel -->
-    <div class="panel panel-info">
-        <div class="panel-heading" role="tab" id="headingTwo">
-            <h4 class="panel-title">
-                <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo"
-                   aria-expanded="false" aria-controls="collapseTwo">
-                    <i class="fa fa-lg fa-info-circle" aria-hidden="true"></i>&ensp;
+  </div>
+  <!--    Nachweisdokumente: Voraussetzung panel -->
+  <div class="accordion-item">
+    <h2 class="accordion-header">
+    <div class="d-flex">
+        <div class="bg-info-subtle accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseThree" aria-expanded="false" aria-controls="collapseThree">
+        <i class="me-2 fa fa-lg fa-info-circle" aria-hidden="true"></i>&ensp;
 					<?php echo $this->p->t('anrechnung', 'requestAnrechnungInfoNachweisdokumenteTitle'); ?>
-                </a>
-            </h4>
         </div>
-        <div id="collapseTwo" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingTwo">
-            <div class="panel-body">
-				<?php echo $this->p->t('anrechnung', 'requestAnrechnungInfoNachweisdokumenteBody'); ?>
-            </div>
         </div>
+    </h2>
+    <div id="collapseThree" class="accordion-collapse collapse" data-bs-parent="#accordionExample">
+      <div class="accordion-body">
+      <?php echo $this->p->t('anrechnung', 'requestAnrechnungInfoNachweisdokumenteBody'); ?>
+      </div>
     </div>
+  </div>
     <!--    Herkunft der Kenntnisse: Angaben panel -->
-    <div class="panel panel-info">
-        <div class="panel-heading" role="tab" id="headingThree">
-            <h4 class="panel-title">
-                <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseThree"
-                   aria-expanded="false" aria-controls="collapseThree">
-                    <i class="fa fa-lg fa-info-circle" aria-hidden="true"></i>&ensp;
+  <div class="accordion-item">
+    <h2 class="accordion-header">
+        <div class="bg-info-subtle accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseFour" aria-expanded="false" aria-controls="collapseFour">
+        <div class="d-flex">
+        <i class="me-2 fa fa-lg fa-info-circle" aria-hidden="true"></i>&ensp;
 					<?php echo $this->p->t('anrechnung', 'requestAnrechnungInfoHerkunftKenntnisseTitle'); ?>
-                </a>
-            </h4>
         </div>
-        <div id="collapseThree" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingThree">
-            <div class="panel-body">
-				<?php echo $this->p->t('anrechnung', 'requestAnrechnungInfoHerkunftKenntnisseBody'); ?>
-            </div>
         </div>
+    </h2>
+    <div id="collapseFour" class="accordion-collapse collapse" data-bs-parent="#accordionExample">
+      <div class="accordion-body">
+      <?php echo $this->p->t('anrechnung', 'requestAnrechnungInfoHerkunftKenntnisseBody'); ?>
+      </div>
     </div>
+  </div>
+
 </div>
\ No newline at end of file
diff --git a/public/css/lehre/anrechnung.css b/public/css/lehre/anrechnung.css
index 36956d79c..a2a974a12 100644
--- a/public/css/lehre/anrechnung.css
+++ b/public/css/lehre/anrechnung.css
@@ -1,7 +1,48 @@
+
 .select-w500 {
     width: 500px;
 }
 
 .pl-15 {
     padding-left: 15px !important;
+}
+
+.bg-info-subtle{
+    background-color: #D9EDF7 !important; 
+    color: #31708F !important;
+    border-style: solid !important;
+    border-width: 1px !important;
+    border-color: #bce8f1 !important;
+}
+
+.bg-warning-subtle{
+    background-color: #FFF3CD !important; 
+    color: #664D03 !important;
+    border-style: solid !important;
+    border-width: 1px !important;
+    border-color: #FFE69C !important;
+}
+
+.bg-success-subtle{
+    background-color: #D1E7DD !important; 
+    color: #0A3622 !important;
+    border-style: solid !important;
+    border-width: 1px !important;
+    border-color: #A3CFBB !important;
+}
+
+.bg-danger-subtle{
+    background-color: #F8D7DA !important; 
+    color: #672B31 !important;
+    border-style: solid !important;
+    border-width: 1px !important;
+    border-color: #F1AEB5 !important;
+}
+
+.bg-primary-subtle{
+    background-color: #CFE2FF !important; 
+    color: #052C65 !important;
+    border-style: solid !important;
+    border-width: 1px !important;
+    border-color: #9EC5FE !important;
 }
\ No newline at end of file
diff --git a/public/js/lehre/anrechnung/requestAnrechnung.js b/public/js/lehre/anrechnung/requestAnrechnung.js
index 2947aebe9..a1462082a 100644
--- a/public/js/lehre/anrechnung/requestAnrechnung.js
+++ b/public/js/lehre/anrechnung/requestAnrechnung.js
@@ -138,17 +138,17 @@ var requestAnrechnung = {
 
         switch (status_kurzbz) {
             case ANRECHNUNGSTATUS_APPROVED:
-                $('#requestAnrechnung-status_kurzbz').closest('div').addClass('alert-success');
+                $('#requestAnrechnung-status_kurzbz').closest('div').addClass('bg-success-subtle');
                 break;
             case ANRECHNUNGSTATUS_REJECTED:
-                $('#requestAnrechnung-status_kurzbz').closest('div').addClass('alert-danger');
+                $('#requestAnrechnung-status_kurzbz').closest('div').addClass('bg-danger-subtle');
                 break;
             case '':
-                $('#requestAnrechnung-status_kurzbz').closest('div').addClass('alert-info');
+                $('#requestAnrechnung-status_kurzbz').closest('div').addClass('bg-info-subtle');
                 $('#requestAnrechnung-status_kurzbz').text(FHC_PhrasesLib.t("ui", "neu"));
                 break;
             default:
-                $('#requestAnrechnung-status_kurzbz').closest('div').addClass('alert-warning');
+                $('#requestAnrechnung-status_kurzbz').closest('div').addClass('bg-warning-subtle');
                 $('#requestAnrechnung-status_kurzbz').text(FHC_PhrasesLib.t("ui", "inBearbeitung"));
         }
     },
@@ -186,7 +186,7 @@ var requestAnrechnung = {
 
             // Show sperre panel
             $('#requestAnrechnung-sperre')
-                .removeClass('hidden')
+                .removeClass('visually-hidden')
                 .html(function(){
                     let sperregrund = FHC_PhrasesLib.t('global', 'bearbeitungGesperrt') + ': ';
 
@@ -232,11 +232,11 @@ var requestAnrechnung = {
     formatAnrechnungIsApplied: function (antragdatum, dms_id, filename){
         $('#requestAnrechnung-antragdatum').text(antragdatum);
         $('#requestAnrechnung-status_kurzbz').text(FHC_PhrasesLib.t("ui", "inBearbeitung"));
-        $('#requestAnrechnung-status_kurzbz').closest('div').addClass('alert-warning');
+        $('#requestAnrechnung-status_kurzbz').closest('div').addClass('bg-warning-subtle');
 
         // Display File-Downloadlink
         $('#requestAnrechnung-downloadDocLink')
-            .removeClass('hidden')
+            .removeClass('visually-hidden')
             .attr('href', 'RequestAnrechnung/download?dms_id=' + dms_id)
             .html(filename);
 
@@ -286,7 +286,7 @@ var requestAnrechnung = {
         {
             $('#requestAnrechnung-maxEctsUeberschrittenMsg')
                 .html("<br><b>Die Höchstgrenze für Anrechnungen gem. § 12 Abs. 3 Fachhochschulgesetz ist überschritten. </b><i class=\"fa fa-lg fa-info-circle\"></i></br>")
-                .addClass('bg-danger text-danger')
+                .addClass('bg-danger-subtle')
                 .tooltip({
                     title: FHC_PhrasesLib.t("anrechnung", "anrechnungEctsTooltipTextBeiUeberschreitung"),
                     placement: 'right',
@@ -347,7 +347,7 @@ var requestAnrechnung = {
                     ? [(sumEctsSchulisch + sumEctsBeruflich + ects), sumEctsSchulisch, (sumEctsBeruflich  + ects)] // beruflich
                     : [(sumEctsSchulisch + sumEctsBeruflich + ects), (sumEctsSchulisch + ects), sumEctsBeruflich])) // schulisch
             .append('<i class="fa fa-lg fa-info-circle"></i>')
-            .addClass('bg-danger text-danger')
+            .addClass('bg-danger-subtle')
             .tooltip({
                 title: FHC_PhrasesLib.t("anrechnung", "anrechnungEctsTooltipTextBeiUeberschreitung"),
                 placement: 'right',

From c60f7ed8b0e467644299be9233cf8e8adee1cf3a Mon Sep 17 00:00:00 2001
From: Werner Masik <werner@gefi.at>
Date: Fri, 1 Mar 2024 15:43:15 +0100
Subject: [PATCH 0445/1461] dbUpdate for fristenmanagement completed

---
 system/dbupdate_3.4.php                       |  4 ++++
 .../dbupdate_3.4/37107_fristenmanagement.php  | 20 ++++++++++++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index c8669de28..d32185c6e 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -49,6 +49,7 @@ require_once('dbupdate_3.4/30181_tabelle_anrechnung_neue_attribute_fuer_begruend
 require_once('dbupdate_3.4/29529_infocenter_anpassungen.php');
 require_once('dbupdate_3.4/29835_uhstat1_erfassung_der_uhstat1_daten_ueber_das_bewerbungstool.php');
 require_once('dbupdate_3.4/33714_erhoehter_studienbeitrag_fuer_drittsaatenangehoerig.php');
+require_once('dbupdate_3.4/37107_fristenmanagement.php');
 
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
@@ -176,6 +177,9 @@ $tabellen=array(
 	"hr.tbl_gehaltsbestandteil" => array("gehaltsbestandteil_id","dienstverhaeltnis_id","vertragsbestandteil_id","gehaltstyp_kurzbz","von","bis","anmerkung","grundbetrag","betrag_valorisiert","valorisierungssperre","insertamum", "insertvon","updateamum","updatevon","valorisierung","auszahlungen"),
 	"hr.tbl_gehaltshistorie" => array("gehaltshistorie_id", "datum","betrag","gehaltsbestandteil_id","mitarbeiter_uid"),
 	"hr.tbl_gehaltstyp" => array("gehaltstyp_kurzbz","bezeichnung","valorisierung","sort","aktiv"),
+	"hr.tbl_frist" => array("frist_id","mitarbeiter_uid","ereignis_kurzbz","bezeichnung","datum","status_kurzbz","parameter","insertvon","insertamum","updatevon","updateamum"),
+	"hr.tbl_frist_ereignis" => array("ereignis_kurzbz","bezeichnung","manuell"),
+	"hr.tbl_frist_status" => array("status_kurzbz", "bezeichnung"),
 	"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"),
diff --git a/system/dbupdate_3.4/37107_fristenmanagement.php b/system/dbupdate_3.4/37107_fristenmanagement.php
index 84b828008..678f41d67 100644
--- a/system/dbupdate_3.4/37107_fristenmanagement.php
+++ b/system/dbupdate_3.4/37107_fristenmanagement.php
@@ -28,9 +28,9 @@ if ($result = $db->db_query("SELECT * FROM information_schema.tables WHERE table
             CONSTRAINT tbl_ereignis_pkey PRIMARY KEY (ereignis_kurzbz)
         );
 
-        COMMENT ON TABLE hr.tbl_frist_status IS E'Key-Table of fristen (deadline) events';
+        COMMENT ON TABLE hr.tbl_frist_ereignis IS E'Key-Table of fristen (deadline) events';
 
-        CREATE TABLE IF NOT EXISTS hr.tbl_frist_status
+        CREATE TABLE IF NOT EXISTS hr.tbl_frist_status (
             status_kurzbz character varying(32) NOT NULL,
             bezeichnung varchar(32),
             CONSTRAINT tbl_frist_status_pk PRIMARY KEY (status_kurzbz)
@@ -38,18 +38,28 @@ if ($result = $db->db_query("SELECT * FROM information_schema.tables WHERE table
 
         COMMENT ON TABLE hr.tbl_frist_status IS E'Key-Table of fristen status (new, done)';
 
-        ALTER TABLE hr.tbl_frist ADD CONSTRAINT hr.tbl_frist_mitarbeiter_uid_fk FOREIGN KEY (mitarbeiter_uid)
+        ALTER TABLE hr.tbl_frist ADD CONSTRAINT tbl_frist_mitarbeiter_uid_fk FOREIGN KEY (mitarbeiter_uid)
 		REFERENCES public.tbl_mitarbeiter (mitarbeiter_uid) MATCH FULL
 		ON DELETE SET NULL ON UPDATE CASCADE;
 
-        ALTER TABLE hr.tbl_frist ADD CONSTRAINT hr.tbl_frist_ereignis_kurzbz_fk FOREIGN KEY (ereignis_kurzbz)
+        ALTER TABLE hr.tbl_frist ADD CONSTRAINT tbl_frist_ereignis_kurzbz_fk FOREIGN KEY (ereignis_kurzbz)
 		REFERENCES hr.tbl_frist_ereignis (ereignis_kurzbz) MATCH FULL
 		ON DELETE SET NULL ON UPDATE CASCADE;
 
-        ALTER TABLE hr.tbl_frist ADD CONSTRAINT hr.tbl_frist_status_kurzbz_fk FOREIGN KEY (status_kurzbz)
+        ALTER TABLE hr.tbl_frist ADD CONSTRAINT tbl_frist_status_kurzbz_fk FOREIGN KEY (status_kurzbz)
 		REFERENCES hr.tbl_frist_status (status_kurzbz) MATCH FULL
 		ON DELETE SET NULL ON UPDATE CASCADE;
 
+        GRANT SELECT, UPDATE, INSERT, DELETE ON hr.tbl_frist TO vilesci;
+        GRANT SELECT, UPDATE, INSERT, DELETE ON hr.tbl_frist_status TO vilesci;
+        GRANT SELECT, UPDATE, INSERT, DELETE ON hr.tbl_frist_ereignis TO vilesci;
+
+        INSERT INTO hr.tbl_frist_status(status_kurzbz, bezeichnung) VALUES('neu','Neu');
+        INSERT INTO hr.tbl_frist_status(status_kurzbz, bezeichnung) VALUES('erledigt','Erledigt');
+
+        INSERT INTO hr.tbl_frist_ereignis(ereignis_kurzbz, bezeichnung) VALUES('dv_beginn','DV Beginn');
+        INSERT INTO hr.tbl_frist_ereignis(ereignis_kurzbz, bezeichnung) VALUES('dv_ende','DV Ende');
+
 
 
         ";

From b98794a292daa684352d24bd05875c78ab0c55a2 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 4 Mar 2024 08:40:08 +0100
Subject: [PATCH 0446/1461] fix bug Validierung checkifExistingStudentRolle

---
 application/controllers/components/stv/Status.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/application/controllers/components/stv/Status.php b/application/controllers/components/stv/Status.php
index fa1ec9295..4c5770779 100644
--- a/application/controllers/components/stv/Status.php
+++ b/application/controllers/components/stv/Status.php
@@ -219,6 +219,11 @@ class Status extends FHC_Controller
 				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 				return $this->outputJson(getError($result));
 			}
+			if($result->retval == "0")
+			{
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return $this->outputJson($result->code);
+			}
 		}
 
 		//TODO(Manu) check permission...

From a7f1e43225ffc563b18f4dffdc2f9c8b23181334 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 4 Mar 2024 10:10:35 +0100
Subject: [PATCH 0447/1461] Status als eigener Tab

---
 .../controllers/components/stv/Config.php      |  4 ++++
 application/models/crm/Student_model.php       |  3 ++-
 .../Studentenverwaltung/Details/Prestudent.js  | 17 +++++------------
 .../Details/Prestudent/Status.js               |  2 +-
 .../Stv/Studentenverwaltung/Details/Status.js  | 18 ++++++++++++++++++
 5 files changed, 30 insertions(+), 14 deletions(-)
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Status.js

diff --git a/application/controllers/components/stv/Config.php b/application/controllers/components/stv/Config.php
index 5c6b52c9c..47842822c 100644
--- a/application/controllers/components/stv/Config.php
+++ b/application/controllers/components/stv/Config.php
@@ -31,6 +31,10 @@ class Config extends FHC_Controller
 			'title' => 'PreStudentIn',
 			'component' => './Stv/Studentenverwaltung/Details/Prestudent.js'
 		];
+		$result['status'] = [
+			'title' => 'Status',
+			'component' => './Stv/Studentenverwaltung/Details/Status.js'
+		];
 		$result['noten'] = [
 			'title' => 'Noten',
 			'component' => './Stv/Studentenverwaltung/Details/Noten.js'
diff --git a/application/models/crm/Student_model.php b/application/models/crm/Student_model.php
index 364524df9..e6df423d4 100644
--- a/application/models/crm/Student_model.php
+++ b/application/models/crm/Student_model.php
@@ -143,7 +143,8 @@ class Student_model extends DB_Model
 		{
 			return error($result);
 		}
-		else {
+		else
+		{
 			$resultObject = current(getData($result));
 
 			if (property_exists($resultObject, 'anzahl')) {
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
index 7f3517ee9..6f067795c 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
@@ -554,24 +554,17 @@ export default {
 		
 		<br>
 
-<!--		{{defaultSemester}} | {{hasAdminPermission}} | {{hasAdminPermission}}-->
-		
-		<div class="col-12 pb-3">
-			<legend>Status</legend>
-			<TblStatus :prestudent_id="modelValue.prestudent_id"></TblStatus>		
-		</div>
-		
-		<hr>
-		
 		
 		<div class="col-8">
 			<legend>Gesamthistorie</legend>
 			<TblHistory :person_id="modelValue.person_id"></TblHistory>		
 		</div>
+		
+<!--		<div class="col-12 pb-3">
+			<legend>Status</legend>
+			<TblStatus :prestudent_id="modelValue.prestudent_id"></TblStatus>		
+		</div>-->
 				
-
-
-	
 		
 	</div>
 	`
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
index 4969d9b55..97e47dfa1 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
@@ -356,7 +356,7 @@ export default{
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 		CoreRESTClient
-			.get('components/stv/Prestudent/getStudienplaene/' + this.prestudent_id)
+			.get('components/stv/Prestudent/getStudienplaene/' + this.modelValue.prestudent_id)
 			.then(result => CoreRESTClient.getData(result.data) || [])
 			.then(result => {
 				this.listStudienplaene = result;
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Status.js b/public/js/components/Stv/Studentenverwaltung/Details/Status.js
new file mode 100644
index 000000000..b7ecc556d
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Status.js
@@ -0,0 +1,18 @@
+import TblStatus from "./Prestudent/Status.js";
+
+export default {
+	components: {
+		TblStatus
+	},
+	props: {
+		modelValue: Object,
+	},
+	template: `
+	<div class="stv-details-details h-100 pb-3">
+			<div class="col-12 pb-3">
+			<legend>Status</legend>
+			<TblStatus :prestudent_id="modelValue.prestudent_id"></TblStatus>		
+		</div>
+		</div>
+	`
+}
\ No newline at end of file

From 84ba0dbb642dde94406106ac0bb7e8a65250457f Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 4 Mar 2024 13:47:55 +0100
Subject: [PATCH 0448/1461] bootstrap 5 upgrade (tooltips,cards,margins,..)

---
 .../lehre/anrechnung/requestAnrechnung.php    | 243 +++++++++---------
 public/css/lehre/anrechnung.css               |   9 +-
 2 files changed, 126 insertions(+), 126 deletions(-)

diff --git a/application/views/lehre/anrechnung/requestAnrechnung.php b/application/views/lehre/anrechnung/requestAnrechnung.php
index c2212adbc..28ef017c4 100644
--- a/application/views/lehre/anrechnung/requestAnrechnung.php
+++ b/application/views/lehre/anrechnung/requestAnrechnung.php
@@ -68,14 +68,14 @@ $this->load->view(
     }
 </style>
 
-<div id="page-wrapper">
+<div  id="page-wrapper">
     <div class="container-fluid">
         <!-- header -->
         <div class="row">
-            <div class="col-lg-12 page-header">
-                <h3>
+            <div class="col-12 mt-4 mb-3 pb-2 border-bottom">
+                <h3 class="fw-normal mt-2 mb-1">
 					<?php echo $this->p->t('anrechnung', 'anerkennungNachgewiesenerKenntnisse'); ?>
-                    <small>| <?php echo $this->p->t('anrechnung', 'antragStellen'); ?></small>
+                    <small class="text-secondary fs-6">| <?php echo $this->p->t('anrechnung', 'antragStellen'); ?></small>
                 </h3>
             </div>
         </div>
@@ -84,8 +84,8 @@ $this->load->view(
         <div class="row">
             <div class="col-8">
 				<!-- Antragsdaten, Dokument Upload, Notiz-->
-				<div class="row">
-					<div class="col-lg-12">
+				<div class="row mb-5">
+					<div class="col-12">
 						<form id="requestAnrechnung-form">
 							<input type="hidden" name="anrechnung_id" id="anrechnung_id" value="<?php echo $anrechnungData->anrechnung_id ?>">
 							<input type="hidden" name="lv_id" value="<?php echo $antragData->lv_id ?>">
@@ -94,19 +94,19 @@ $this->load->view(
                             <input type="hidden" name="sumEctsSchulisch" value="<?php echo $antragData->sumEctsSchulisch ?>">
                             <input type="hidden" name="sumEctsBeruflich" value="<?php echo $antragData->sumEctsBeruflich ?>">
                             <!-- Antragsdaten -->
-							<div class="row">
-								<div class="col-lg-12">
-									<div class="panel panel-default">
-										<div class="panel-heading">
-											<span class="text-uppercase"><b><?php echo $this->p->t('anrechnung', 'antrag'); ?></b></span>&emsp;
-											<span class="requestAnrechnung-anrechnungInfoTooltip" data-toggle="tooltip" data-placement="right"
-												  title="<?php echo $this->p->t('anrechnung', 'anrechnungInfoTooltipText'); ?>">
+							<div class="row mb-3">
+								<div class="col-12">
+									<div class="card">
+										<div class="card-header">
+											<span class="text-uppercase fw-bold"><?php echo $this->p->t('anrechnung', 'antrag'); ?></span>&emsp;
+											<span  data-toggle="tooltip" data-bs-placement="right"
+												  data-bs-html="true" data-bs-title="<?php echo $this->p->t('anrechnung', 'anrechnungInfoTooltipText'); ?>">
 												<i class="fa fa-lg fa-info-circle" aria-hidden="true"></i>
 											</span>
-											<span class="pull-right"><?php echo $this->p->t('anrechnung', 'antragdatum'); ?>: <span
+											<span class="float-end"><?php echo $this->p->t('anrechnung', 'antragdatum'); ?>: <span
 														id="requestAnrechnung-antragdatum"><?php echo !empty($anrechnungData->anrechnung_id) ? $anrechnungData->insertamum : '-' ?></span></span>
 										</div>
-										<table class="panel-body table table-bordered table-condensed">
+										<table class="card-body table table-bordered table-condensed mb-0">
 											<tbody>
 											<tr>
 												<th><?php echo ucfirst($this->p->t('person', 'studentIn')); ?></th>
@@ -135,10 +135,10 @@ $this->load->view(
                                             <tr>
                                                 <th>
                                                     <?php echo $this->p->t('anrechnung', 'bisherAngerechneteEcts'); ?>
-                                                    <span data-toggle="tooltip" data-placement="right"
-                                                        title="<?php echo $this->p->t('anrechnung', 'anrechnungEctsTooltipText'); ?>">
+                                                    <div class="d-inline" data-toggle="tooltip" data-bs-placement="right"
+                                                        data-bs-html="true" data-bs-title="<?php echo $this->p->t('anrechnung', 'anrechnungEctsTooltipText'); ?>">
                                                         <i class="fa fa-lg fa-info-circle" aria-hidden="true"></i>
-                                                    </span>
+                                                    </div>
                                                 </th>
                                                 <td colspan="3">
                                                     Total ECTS: <span id="sumEctsTotal"><?php echo number_format($antragData->sumEctsSchulisch + $antragData->sumEctsBeruflich, 1) ?></span>
@@ -163,176 +163,169 @@ $this->load->view(
 								</div>
 							</div>
 							<!-- Antrag mit Checkboxen -->
-							<div class="row">
-								<div class="col-lg-12">
-									<div class="well" style="border:solid black 3px">
-										<span><?php echo $this->p->t('anrechnung', 'antragStellenText'); ?></span>&emsp;
-										<div class="checkbox">
-											<label>
-												<input type="radio" name="begruendung" value="1" required
-													<?php echo $anrechnungData->begruendung_id == '1' ? 'checked' : ''; ?> />
+							<div class="row mb-3">
+								<div class="col-12">
+									<div class="border border-dark border-3 rounded p-3" >
+										<p ><?php echo $this->p->t('anrechnung', 'antragStellenText'); ?></p>
+										<div class="ps-3 ">
+										
+											<div class="form-check mb-1">
+												<input class="form-check-input" type="radio" name="begruendung" value="1" <?php echo $anrechnungData->begruendung_id == '1' ? 'checked' : ''; ?> required />
 												<?php echo $this->p->t('anrechnung', 'antragStellenWegenZeugnis'); ?>&emsp;
-												<span id="requestAnrechnung-anrechnungGrundZeugnisTooltip" data-toggle="tooltip" data-placement="right"
-													  title="<?php echo $this->p->t('anrechnung', 'anrechnungGrundZeugnisTooltipText'); ?>" />
-												<i class="fa fa-lg fa-info-circle" aria-hidden="true"></i>
-											</span>
-											</label>
-										</div>
-                                        <div class="checkbox">
-                                            <label>
-                                                <input type="radio" name="begruendung" value="5" required
-                                                    <?php echo $anrechnungData->begruendung_id == '5' ? 'checked' : ''; ?> />
-                                                <?php echo $this->p->t('anrechnung', 'antragStellenWegenHochschulzeugnis'); ?>&emsp;
-                                                <span id="requestAnrechnung-anrechnungGrundHochschulzeugnisTooltip" data-toggle="tooltip" data-placement="right"
-                                                      title="<?php echo $this->p->t('anrechnung', 'anrechnungGrundZeugnisTooltipText'); ?>" />
-                                                <i class="fa fa-lg fa-info-circle" aria-hidden="true"></i>
-                                                </span>
-                                            </label>
-                                        </div>
-										<div class="checkbox">
-											<label>
-												<input type="radio" name="begruendung" value="4" required
-													<?php echo $anrechnungData->begruendung_id == '4' ? 'checked' : ''; ?>>
+												<div class="d-inline" id="requestAnrechnung-anrechnungGrundZeugnisTooltip" data-toggle="tooltip" data-bs-placement="right" data-bs-html="true"
+														data-bs-title="<?php echo $this->p->t('anrechnung', 'anrechnungGrundZeugnisTooltipText'); ?>" >
+													<i class="fa fa-lg fa-info-circle" aria-hidden="true"></i>
+												</div>
+											</div>
+											<div class="form-check mb-1">
+												<input class="form-check-input" type="radio" name="begruendung" value="5" <?php echo $anrechnungData->begruendung_id == '5' ? 'checked' : ''; ?>  required />
+												<?php echo $this->p->t('anrechnung', 'antragStellenWegenHochschulzeugnis'); ?>&emsp;
+												<div class="d-inline" id="requestAnrechnung-anrechnungGrundHochschulzeugnisTooltip" data-toggle="tooltip" data-bs-placement="right" data-bs-html="true"
+                                                      data-bs-title="<?php echo $this->p->t('anrechnung', 'anrechnungGrundZeugnisTooltipText'); ?>">
+                                                	<i class="fa fa-lg fa-info-circle" aria-hidden="true"></i>
+                                                </div>
+											</div>
+											<div class="form-check mb-1">
+												<input class="form-check-input" type="radio" name="begruendung" value="4" <?php echo $anrechnungData->begruendung_id == '4' ? 'checked' : ''; ?>  required />
 												<?php echo $this->p->t('anrechnung', 'antragStellenWegenPraxis'); ?>&emsp;
-												<span id="requestAnrechnung-anrechnungGrundBerufTooltip" data-toggle="tooltip" data-placement="right"
-													  title="<?php echo $this->p->t('anrechnung', 'anrechnungGrundBerufTooltipText'); ?>">
-												<i class="fa fa-lg fa-info-circle" aria-hidden="true"></i>
-											</span>
-											</label>
+												<div class="d-inline" id="requestAnrechnung-anrechnungGrundBerufTooltip" data-toggle="tooltip" data-bs-placement="right" data-bs-html="true"
+													  data-bs-title="<?php echo $this->p->t('anrechnung', 'anrechnungGrundBerufTooltipText'); ?>">
+													<i class="fa fa-lg fa-info-circle" aria-hidden="true"></i>
+												</div>
+											</div>
+											
+                                        
+										
 										</div>
 									</div>
 								</div>
 							</div>
                             <!-- Begruendung ECTS -->
-                            <div class="row">
-                                <div class="col-lg-12">
-                                    <div class="panel panel-default">
-                                        <div class="panel-heading">
-                                            <b><?php echo $this->p->t('anrechnung', 'begruendungEcts'); ?></b>&emsp;
-                                            <span class="requestAnrechnung-anrechnungInfoTooltip" data-toggle="tooltip" data-placement="right"
-                                                  title="<?php echo $this->p->t('anrechnung', 'anrechnungBegruendungEctsTooltipText'); ?>">
+                            <div class="row mb-3">
+                                <div class="col-12">
+                                    <div class="card">
+                                        <div class="card-header">
+                                            <span class="fw-bold"><?php echo $this->p->t('anrechnung', 'begruendungEcts'); ?></span>&emsp;
+                                            <div class="d-inline" data-toggle="tooltip" data-bs-placement="right" data-bs-html="true" data-bs-title="<?php echo $this->p->t('anrechnung', 'anrechnungBegruendungEctsTooltipText'); ?>">
                                                 <i class="fa fa-lg fa-info-circle" aria-hidden="true"></i>
-                                            </span>
+                                            </div>
+											
                                         </div>
-                                        <div class="panel-body">
+                                        <div class="card-body">
                                             <textarea class="form-control" name="begruendung_ects" rows="1" id="requestAnrechnung-begruendungEcts"
                                                       maxlength="<?php echo CHAR_LENGTH150 ?>" required><?php echo $anrechnungData->begruendung_ects; ?></textarea>
-                                            <small><span class="text-muted pull-right"><?php echo $this->p->t('ui', 'maxZeichen'); ?> :<span id="requestAnrechnung-begruendungEcts-charCounter"><?php echo CHAR_LENGTH150 ?></span></span></small>
+                                            <small><span class="text-muted float-end"><?php echo $this->p->t('ui', 'maxZeichen'); ?> :<span id="requestAnrechnung-begruendungEcts-charCounter"><?php echo CHAR_LENGTH150 ?></span></span></small>
                                         </div>
                                     </div>
                                 </div>
                             </div>
                             <!-- Begruendung LV Inhalt -->
-                            <div class="row">
-                                <div class="col-lg-12">
-                                    <div class="panel panel-default">
-                                        <div class="panel-heading">
-                                            <b><?php echo $this->p->t('anrechnung', 'begruendungLvinhalt'); ?></b>&emsp;
-                                            <span class="requestAnrechnung-anrechnungInfoTooltip" data-toggle="tooltip" data-placement="right"
-                                                  title="<?php echo $this->p->t('anrechnung', 'anrechnungBegruendungLvinhaltTooltipText'); ?>">
+                            <div class="row mb-3">
+                                <div class="col-12">
+                                    <div class="card">
+                                        <div class="card-header">
+                                            <span class="fw-bold"><?php echo $this->p->t('anrechnung', 'begruendungLvinhalt'); ?></span>&emsp;
+                                            <div class="d-inline" data-toggle="tooltip" data-bs-placement="right"
+                                                  data-bs-html="true" data-bs-title="<?php echo $this->p->t('anrechnung', 'anrechnungBegruendungLvinhaltTooltipText'); ?>">
                                                 <i class="fa fa-lg fa-info-circle" aria-hidden="true"></i>
-                                            </span>
+                                            </div>
                                         </div>
-                                        <div class="panel-body">
+                                        <div class="card-body">
                                             <textarea class="form-control" name="begruendung_lvinhalt" rows="7" id="requestAnrechnung-begruendungLvinhalt"
                                                       minlength="<?php echo CHAR_LENGTH500 ?>"
                                                       maxlength="<?php echo CHAR_LENGTH1000 ?>" required><?php echo $anrechnungData->begruendung_lvinhalt; ?></textarea>
-                                            <small><span class="text-muted pull-right">&nbsp;/&nbsp;<?php echo $this->p->t('ui', 'maxZeichen'); ?> :<span id="requestAnrechnung-begruendungLvinhalt-charCounterMax"><?php echo CHAR_LENGTH1000 ?></span></span></small>
-                                            <small><span class="text-muted pull-right"><?php echo $this->p->t('ui', 'fehlendeMinZeichen'); ?> :<span id="requestAnrechnung-begruendungLvinhalt-charCounterMin"><?php echo CHAR_LENGTH500 ?></span></span></small>
+                                            <small><span class="text-muted float-end">&nbsp;/&nbsp;<?php echo $this->p->t('ui', 'maxZeichen'); ?> :<span id="requestAnrechnung-begruendungLvinhalt-charCounterMax"><?php echo CHAR_LENGTH1000 ?></span></span></small>
+                                            <small><span class="text-muted float-end"><?php echo $this->p->t('ui', 'fehlendeMinZeichen'); ?> :<span id="requestAnrechnung-begruendungLvinhalt-charCounterMin"><?php echo CHAR_LENGTH500 ?></span></span></small>
                                         </div>
                                     </div>
                                 </div>
                             </div>
 							<!-- Dokument Upload-->
-							<div class="row">
-								<div class="col-lg-12">
-									<div class="panel panel-default">
-										<div class="panel-heading">
-											<b><?php echo $this->p->t('anrechnung', 'nachweisdokumente'); ?></b>&emsp;
-											<span class="requestAnrechnung-anrechnungInfoTooltip" data-toggle="tooltip" data-placement="right"
-												  title="<?php echo $this->p->t('anrechnung', 'anrechnungGrundAllgemeinTooltipText'); ?>">
+							<div class="row mb-3">
+								<div class="col-12">
+									<div class="card">
+										<div class="card-header">
+											<span class="fw-bold"><?php echo $this->p->t('anrechnung', 'nachweisdokumente'); ?></span>&emsp;
+											<div class="d-inline" data-toggle="tooltip" data-bs-placement="right" data-bs-html="true" data-bs-title="<?php echo $this->p->t('anrechnung', 'anrechnungGrundAllgemeinTooltipText'); ?>">
 												<i class="fa fa-lg fa-info-circle" aria-hidden="true"></i>
-											</span>
-										</div>
-										<div class="form-inline panel-body">
-											<div class="form-group">
-												<input type="file" id="requestAnrechnung-uploadfile"
-													   name="uploadfile" accept=".pdf" size="50" data-maxsize="<?php echo (int)ini_get('upload_max_filesize') * 1024 * 1024 ?>"
-													   required>
 											</div>
-											<span id="requestAnrechnung-uploadTooltip" data-toggle="tooltip" data-placement="right"
-											   title="<?php echo $this->p->t('ui', 'uploadTooltipText'); ?>">
-												<i class="fa fa-lg fa-question-circle-o" aria-hidden="true"></i>
-											</span>
-											<a class="pull-right <?php echo !empty($anrechnungData->dms_id) ? '' : 'visually-hidden' ?>"
-											   id="requestAnrechnung-downloadDocLink"
-											   href="<?php echo current_url() . '/download?dms_id=' . $anrechnungData->dms_id; ?>"
-											   target="_blank"><?php echo htmlentities($anrechnungData->dokumentname) ?>
-											</a>
+										</div>
+										<div class=" card-body">
+											<div class="input-group d-flex align-items-center ">
+												<input class="form-control flex-fill" type="file" id="requestAnrechnung-uploadfile"
+														name="uploadfile" accept=".pdf" size="50" data-maxsize="<?php echo (int)ini_get('upload_max_filesize') * 1024 * 1024 ?>"
+														required>
+												<div class="mx-4 " id="requestAnrechnung-uploadTooltip" data-toggle="tooltip" data-bs-placement="right" data-bs-html="true"
+											   		data-bs-title="<?php echo $this->p->t('ui', 'uploadTooltipText'); ?>">
+													<i class="fa fa-lg fa-question-circle-o" aria-hidden="true"></i>
+												</div>
+												<a class="mx-4 float-end <?php echo !empty($anrechnungData->dms_id) ? '' : 'visually-hidden' ?>"
+													id="requestAnrechnung-downloadDocLink"
+													href="<?php echo current_url() . '/download?dms_id=' . $anrechnungData->dms_id; ?>"
+													target="_blank"><?php echo htmlentities($anrechnungData->dokumentname) ?>
+												</a>
+											</div>
+												
+											
+											
 										</div>
 									</div>
 								</div>
 							</div>
 							<!-- Herkunft der Kenntnisse -->
-							<div class="row">
-								<div class="col-lg-12">
-									<div class="row">
-										<div class="col-lg-12">
-											<div class="panel panel-default">
-												<div class="panel-heading">
-													<b><?php echo $this->p->t('anrechnung', 'herkunftDerKenntnisse'); ?></b>&emsp;
-													<span class="requestAnrechnung-anrechnungInfoTooltip" data-toggle="tooltip" data-placement="right"
-														  title="<?php echo $this->p->t('anrechnung', 'anrechnungInfoTooltipText'); ?>">
+							<div class="row mb-3">
+								<div class="col-12">
+									
+											<div class="card">
+												<div class="card-header">
+													<span class="fw-bold"><?php echo $this->p->t('anrechnung', 'herkunftDerKenntnisse'); ?></span>&emsp;
+													<div class="d-inline" data-toggle="tooltip" data-bs-placement="right" data-bs-html="true" data-bs-title="<?php echo $this->p->t('anrechnung', 'anrechnungInfoTooltipText'); ?>">
 														<i class="fa fa-lg fa-info-circle" aria-hidden="true"></i>
-													</span>
+													</div>
 												</div>
-												<div class="panel-body">
+												<div class="card-body">
 													<textarea class="form-control" name="anmerkung" rows="1" id="requestAnrechnung-herkunftDerKenntnisse"
                                                               maxlength="<?php echo CHAR_LENGTH125 ?>" required><?php echo $anrechnungData->anmerkung; ?></textarea>
-													<small><span class="text-muted pull-right"><?php echo $this->p->t('ui', 'maxZeichen'); ?> :<span id="requestAnrechnung-herkunftDerKenntnisse-charCounter"><?php echo CHAR_LENGTH125 ?></span></span></small>
+													<small><span class="text-muted float-end"><?php echo $this->p->t('ui', 'maxZeichen'); ?> :<span id="requestAnrechnung-herkunftDerKenntnisse-charCounter"><?php echo CHAR_LENGTH125 ?></span></span></small>
 												</div>
 											</div>
 										</div>
-									</div>
-								</div>
+									
 							</div>
 							<!-- Bestaetigung-->
-							<div class="row">
-								<div class="col-lg-12">
-									<div class="well" style="border:solid black 3px">
-										<div class="checkbox">
-											<label>
-												<input type="checkbox" name="bestaetigung" required>
-												<b><?php echo $this->p->t('anrechnung', 'bestaetigungstext'); ?></b>
-											</label>
-										</div>
+							<div class="row mb-3">
+								<div class="col-12">
+									<div class="border border-3 rounded border-dark p-3" >
+										
+											<div class="form-check">
+											<input class="form-check-input" type="checkbox" name="bestaetigung" required>
+											<small  class=" fw-bold"><?php echo $this->p->t('anrechnung', 'bestaetigungstext'); ?></small>
+											</div>
 									</div>
 								</div>
 							</div>
 							<!-- Button 'Anrechnung beantragen'-->
-							<div class="pull-right">
+							<div class="float-end">
 								<input type="submit" id="requestAnrechnung-apply-anrechnung" class="btn btn-primary"
 									   value="<?php echo $this->p->t('anrechnung', 'anrechnungBeantragen'); ?>">
 							</div>
 						</form>
 					</div>
 				</div>
-				<br><br><br><br>
             </div>
             <div class="col-4">
 				 <!-- Status panel -->
-                <div class="alert text-center" id="requestAnrechnung-status">Status: <b><span class="text-uppercase" id="requestAnrechnung-status_kurzbz"
+                <div class="alert text-center" id="requestAnrechnung-status">Status: <span class="fw-bold text-uppercase" id="requestAnrechnung-status_kurzbz"
                              data-status_kurzbz="<?php echo $anrechnungData->status_kurzbz ?>">
                             <?php echo $anrechnungData->status; ?>
-                        </span></b>
+                        </span>
 				</div>
 				<!-- Sperregrund panel (hidden by default) -->
-				<div class="alert alert-danger text-center visually-hidden" id="requestAnrechnung-sperre"
+				<div class="alert bg-danger-subtle text-center visually-hidden" id="requestAnrechnung-sperre"
 					 data-anrechnung_id="<?php echo empty($anrechnungData->anrechnung_id) ? '' : $anrechnungData->anrechnung_id; ?>"
 					 data-expired="<?php echo json_encode($is_expired); ?>"
 					 data-blocked="<?php echo json_encode($is_blocked) ?>">
 				</div>
-                <br>
 				<?php $this->load->view('lehre/anrechnung/requestAnrechnungImportant'); ?>
             </div>
         </div>
diff --git a/public/css/lehre/anrechnung.css b/public/css/lehre/anrechnung.css
index a2a974a12..226d006b1 100644
--- a/public/css/lehre/anrechnung.css
+++ b/public/css/lehre/anrechnung.css
@@ -45,4 +45,11 @@
     border-style: solid !important;
     border-width: 1px !important;
     border-color: #9EC5FE !important;
-}
\ No newline at end of file
+}
+
+.alert-box{
+    padding: 1rem 1rem;
+    margin-bottom: 1rem;
+    border-radius: .25rem;
+}
+

From dd309e972b391159d710b05a849589c2dae5bc09 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 4 Mar 2024 15:03:49 +0100
Subject: [PATCH 0449/1461] js alert messages update, need to update the
 phrasesupdate.php

---
 .../lehre/anrechnung/requestAnrechnung.php    | 36 +++++++++++--------
 .../js/lehre/anrechnung/requestAnrechnung.js  | 36 ++++++++++++-------
 system/phrasesupdate.php                      |  2 +-
 3 files changed, 47 insertions(+), 27 deletions(-)

diff --git a/application/views/lehre/anrechnung/requestAnrechnung.php b/application/views/lehre/anrechnung/requestAnrechnung.php
index 28ef017c4..65ee23177 100644
--- a/application/views/lehre/anrechnung/requestAnrechnung.php
+++ b/application/views/lehre/anrechnung/requestAnrechnung.php
@@ -99,10 +99,10 @@ $this->load->view(
 									<div class="card">
 										<div class="card-header">
 											<span class="text-uppercase fw-bold"><?php echo $this->p->t('anrechnung', 'antrag'); ?></span>&emsp;
-											<span  data-toggle="tooltip" data-bs-placement="right"
+											<div class="d-inline"  data-bs-toggle="tooltip" data-bs-placement="right"
 												  data-bs-html="true" data-bs-title="<?php echo $this->p->t('anrechnung', 'anrechnungInfoTooltipText'); ?>">
 												<i class="fa fa-lg fa-info-circle" aria-hidden="true"></i>
-											</span>
+											</div>
 											<span class="float-end"><?php echo $this->p->t('anrechnung', 'antragdatum'); ?>: <span
 														id="requestAnrechnung-antragdatum"><?php echo !empty($anrechnungData->anrechnung_id) ? $anrechnungData->insertamum : '-' ?></span></span>
 										</div>
@@ -134,8 +134,8 @@ $this->load->view(
 											</tr>
                                             <tr>
                                                 <th>
-                                                    <?php echo $this->p->t('anrechnung', 'bisherAngerechneteEcts'); ?>
-                                                    <div class="d-inline" data-toggle="tooltip" data-bs-placement="right"
+                                                    <?php echo $this->p->t('anrechnung', 'bisherAngerechneteEcts'); ?>&emsp;
+                                                    <div class="d-inline" data-bs-toggle="tooltip" data-bs-placement="right"
                                                         data-bs-html="true" data-bs-title="<?php echo $this->p->t('anrechnung', 'anrechnungEctsTooltipText'); ?>">
                                                         <i class="fa fa-lg fa-info-circle" aria-hidden="true"></i>
                                                     </div>
@@ -144,7 +144,7 @@ $this->load->view(
                                                     Total ECTS: <span id="sumEctsTotal"><?php echo number_format($antragData->sumEctsSchulisch + $antragData->sumEctsBeruflich, 1) ?></span>
                                                     [ Schulisch: <span id="sumEctsSchulisch"><?php echo $antragData->sumEctsSchulisch ?></span> |
                                                     Beruflich: <span id="sumEctsBeruflich"><?php echo $antragData->sumEctsBeruflich ?></span> ]
-                                                    <span id="requestAnrechnung-maxEctsUeberschrittenMsg"></span>
+                                                    <div class="p-1 d-inline-flex align-items-center" id="requestAnrechnung-maxEctsUeberschrittenMsg"></div>
                                                 </td>
                                             </tr>
 											<tr>
@@ -167,31 +167,39 @@ $this->load->view(
 								<div class="col-12">
 									<div class="border border-dark border-3 rounded p-3" >
 										<p ><?php echo $this->p->t('anrechnung', 'antragStellenText'); ?></p>
+										
 										<div class="ps-3 ">
 										
-											<div class="form-check mb-1">
+											<div  class="form-check mb-1">
+											
 												<input class="form-check-input" type="radio" name="begruendung" value="1" <?php echo $anrechnungData->begruendung_id == '1' ? 'checked' : ''; ?> required />
 												<?php echo $this->p->t('anrechnung', 'antragStellenWegenZeugnis'); ?>&emsp;
-												<div class="d-inline" id="requestAnrechnung-anrechnungGrundZeugnisTooltip" data-toggle="tooltip" data-bs-placement="right" data-bs-html="true"
+												<div class="d-inline" id="requestAnrechnung-anrechnungGrundZeugnisTooltip" data-bs-toggle="tooltip" data-bs-placement="right" data-bs-html="true"
 														data-bs-title="<?php echo $this->p->t('anrechnung', 'anrechnungGrundZeugnisTooltipText'); ?>" >
 													<i class="fa fa-lg fa-info-circle" aria-hidden="true"></i>
 												</div>
+											
 											</div>
+										
 											<div class="form-check mb-1">
+											
 												<input class="form-check-input" type="radio" name="begruendung" value="5" <?php echo $anrechnungData->begruendung_id == '5' ? 'checked' : ''; ?>  required />
 												<?php echo $this->p->t('anrechnung', 'antragStellenWegenHochschulzeugnis'); ?>&emsp;
-												<div class="d-inline" id="requestAnrechnung-anrechnungGrundHochschulzeugnisTooltip" data-toggle="tooltip" data-bs-placement="right" data-bs-html="true"
+												<div class="d-inline" id="requestAnrechnung-anrechnungGrundHochschulzeugnisTooltip" data-bs-toggle="tooltip" data-bs-placement="right" data-bs-html="true"
                                                       data-bs-title="<?php echo $this->p->t('anrechnung', 'anrechnungGrundZeugnisTooltipText'); ?>">
                                                 	<i class="fa fa-lg fa-info-circle" aria-hidden="true"></i>
                                                 </div>
+										
 											</div>
 											<div class="form-check mb-1">
+											
 												<input class="form-check-input" type="radio" name="begruendung" value="4" <?php echo $anrechnungData->begruendung_id == '4' ? 'checked' : ''; ?>  required />
 												<?php echo $this->p->t('anrechnung', 'antragStellenWegenPraxis'); ?>&emsp;
-												<div class="d-inline" id="requestAnrechnung-anrechnungGrundBerufTooltip" data-toggle="tooltip" data-bs-placement="right" data-bs-html="true"
+												<div class="d-inline" id="requestAnrechnung-anrechnungGrundBerufTooltip" data-bs-toggle="tooltip" data-bs-placement="right" data-bs-html="true"
 													  data-bs-title="<?php echo $this->p->t('anrechnung', 'anrechnungGrundBerufTooltipText'); ?>">
 													<i class="fa fa-lg fa-info-circle" aria-hidden="true"></i>
 												</div>
+											
 											</div>
 											
                                         
@@ -206,7 +214,7 @@ $this->load->view(
                                     <div class="card">
                                         <div class="card-header">
                                             <span class="fw-bold"><?php echo $this->p->t('anrechnung', 'begruendungEcts'); ?></span>&emsp;
-                                            <div class="d-inline" data-toggle="tooltip" data-bs-placement="right" data-bs-html="true" data-bs-title="<?php echo $this->p->t('anrechnung', 'anrechnungBegruendungEctsTooltipText'); ?>">
+                                            <div class="d-inline" data-bs-toggle="tooltip" data-bs-placement="right" data-bs-html="true" data-bs-title="<?php echo $this->p->t('anrechnung', 'anrechnungBegruendungEctsTooltipText'); ?>">
                                                 <i class="fa fa-lg fa-info-circle" aria-hidden="true"></i>
                                             </div>
 											
@@ -225,7 +233,7 @@ $this->load->view(
                                     <div class="card">
                                         <div class="card-header">
                                             <span class="fw-bold"><?php echo $this->p->t('anrechnung', 'begruendungLvinhalt'); ?></span>&emsp;
-                                            <div class="d-inline" data-toggle="tooltip" data-bs-placement="right"
+                                            <div class="d-inline" data-bs-toggle="tooltip" data-bs-placement="right"
                                                   data-bs-html="true" data-bs-title="<?php echo $this->p->t('anrechnung', 'anrechnungBegruendungLvinhaltTooltipText'); ?>">
                                                 <i class="fa fa-lg fa-info-circle" aria-hidden="true"></i>
                                             </div>
@@ -246,7 +254,7 @@ $this->load->view(
 									<div class="card">
 										<div class="card-header">
 											<span class="fw-bold"><?php echo $this->p->t('anrechnung', 'nachweisdokumente'); ?></span>&emsp;
-											<div class="d-inline" data-toggle="tooltip" data-bs-placement="right" data-bs-html="true" data-bs-title="<?php echo $this->p->t('anrechnung', 'anrechnungGrundAllgemeinTooltipText'); ?>">
+											<div class="d-inline" data-bs-toggle="tooltip" data-bs-placement="right" data-bs-html="true" data-bs-title="<?php echo $this->p->t('anrechnung', 'anrechnungGrundAllgemeinTooltipText'); ?>">
 												<i class="fa fa-lg fa-info-circle" aria-hidden="true"></i>
 											</div>
 										</div>
@@ -255,7 +263,7 @@ $this->load->view(
 												<input class="form-control flex-fill" type="file" id="requestAnrechnung-uploadfile"
 														name="uploadfile" accept=".pdf" size="50" data-maxsize="<?php echo (int)ini_get('upload_max_filesize') * 1024 * 1024 ?>"
 														required>
-												<div class="mx-4 " id="requestAnrechnung-uploadTooltip" data-toggle="tooltip" data-bs-placement="right" data-bs-html="true"
+												<div class="mx-4 " id="requestAnrechnung-uploadTooltip" data-bs-toggle="tooltip" data-bs-placement="right" data-bs-html="true"
 											   		data-bs-title="<?php echo $this->p->t('ui', 'uploadTooltipText'); ?>">
 													<i class="fa fa-lg fa-question-circle-o" aria-hidden="true"></i>
 												</div>
@@ -279,7 +287,7 @@ $this->load->view(
 											<div class="card">
 												<div class="card-header">
 													<span class="fw-bold"><?php echo $this->p->t('anrechnung', 'herkunftDerKenntnisse'); ?></span>&emsp;
-													<div class="d-inline" data-toggle="tooltip" data-bs-placement="right" data-bs-html="true" data-bs-title="<?php echo $this->p->t('anrechnung', 'anrechnungInfoTooltipText'); ?>">
+													<div class="d-inline" data-bs-toggle="tooltip" data-bs-placement="right" data-bs-html="true" data-bs-title="<?php echo $this->p->t('anrechnung', 'anrechnungInfoTooltipText'); ?>">
 														<i class="fa fa-lg fa-info-circle" aria-hidden="true"></i>
 													</div>
 												</div>
diff --git a/public/js/lehre/anrechnung/requestAnrechnung.js b/public/js/lehre/anrechnung/requestAnrechnung.js
index a1462082a..a07bd3f18 100644
--- a/public/js/lehre/anrechnung/requestAnrechnung.js
+++ b/public/js/lehre/anrechnung/requestAnrechnung.js
@@ -62,7 +62,7 @@ $(function(){
                     var msgBeiEctsUeberschreitung = requestAnrechnung.getMsgBeiEctsUeberschreitung(begruendung_id, ectsLv, sumEctsSchulisch, sumEctsBeruflich);
 
                     // Add to Checkbox text
-                    $(this).closest('label').append(msgBeiEctsUeberschreitung);
+                    $(this).closest('div').append(msgBeiEctsUeberschreitung);
                 }
                  return;
             }
@@ -76,7 +76,7 @@ $(function(){
                     var msgBeiEctsUeberschreitung = requestAnrechnung.getMsgBeiEctsUeberschreitung(begruendung_id, ectsLv, sumEctsSchulisch, sumEctsBeruflich);
 
                     // Add to Checkbox text
-                    $(this).closest('label').append(msgBeiEctsUeberschreitung);
+                    $(this).closest('div').append(msgBeiEctsUeberschreitung);
                 }
             }
 
@@ -196,7 +196,7 @@ var requestAnrechnung = {
                     else if (is_blocked){
                         sperregrund += FHC_PhrasesLib.t('anrechnung', 'benotungDerLV');
                     }
-                    return "<b>"+ sperregrund + "</b>";
+                    return "<span class='fw-bold'>"+ sperregrund + "</span>";
                 })
 
             // Disable all form elements
@@ -204,7 +204,7 @@ var requestAnrechnung = {
         }
     },
     initTooltips: function (){
-        $('[data-toggle="tooltip"]').tooltip({
+        $('[data-bs-toggle="tooltip"]').tooltip({
                 delay: { "show": 200, "hide": 200 },
                 html: true
             }
@@ -281,11 +281,11 @@ var requestAnrechnung = {
         if(
             (parseFloat($('#sumEctsSchulisch').text())) > 60 ||
             (parseFloat($('#sumEctsBeruflich').text())) > 60 ||
-            (parseFloat($('#sumEctsSchulisch').text()) + parseFloat($('#sumEctsBeruflich').text())) > 90
+            (parseFloat($('#sumEctsSchulisch').text()) + parseFloat($('#sumEctsBeruflich').text())) > 90 
         )
         {
             $('#requestAnrechnung-maxEctsUeberschrittenMsg')
-                .html("<br><b>Die Höchstgrenze für Anrechnungen gem. § 12 Abs. 3 Fachhochschulgesetz ist überschritten. </b><i class=\"fa fa-lg fa-info-circle\"></i></br>")
+                .html("<span class='flex-fill fw-bold'>Die Höchstgrenze für Anrechnungen gem. § 12 Abs. 3 Fachhochschulgesetz ist überschritten. </span><i class='mx-4 fa fa-lg fa-info-circle'></i>")
                 .addClass('bg-danger-subtle')
                 .tooltip({
                     title: FHC_PhrasesLib.t("anrechnung", "anrechnungEctsTooltipTextBeiUeberschreitung"),
@@ -296,6 +296,14 @@ var requestAnrechnung = {
     },
     alertIfMaxEctsExceededInsideBegruendungsbox: function(){
         let status_kurzbz = $('#requestAnrechnung-status_kurzbz').data('status_kurzbz');
+                    
+        
+                //TODO: used for debugging
+                /* 
+                    var msgBeiEctsUeberschreitung = requestAnrechnung.getMsgBeiEctsUeberschreitung(begruendung_id, ectsLv, sumEctsSchulisch, sumEctsBeruflich);
+
+                    // Add to Checkbox text
+                    $('#requestAnrechnung-form :input[name="begruendung"]:checked').closest('div').append(msgBeiEctsUeberschreitung); */
 
         if (status_kurzbz != ' ' && status_kurzbz != ANRECHNUNGSTATUS_APPROVED)
         {
@@ -309,7 +317,7 @@ var requestAnrechnung = {
             {
                 return;
             }
-
+            
             // If max ECTS is ecceeded
             if (begruendung_id == 4)
             {
@@ -321,7 +329,7 @@ var requestAnrechnung = {
                     var msgBeiEctsUeberschreitung = requestAnrechnung.getMsgBeiEctsUeberschreitung(begruendung_id, ectsLv, sumEctsSchulisch, sumEctsBeruflich);
 
                     // Add to Checkbox text
-                    $('#requestAnrechnung-form :input[name="begruendung"]:checked').closest('label').append(msgBeiEctsUeberschreitung);
+                    $('#requestAnrechnung-form :input[name="begruendung"]:checked').closest('div').append(msgBeiEctsUeberschreitung);
                 }
             }
             else
@@ -334,18 +342,22 @@ var requestAnrechnung = {
                     var msgBeiEctsUeberschreitung = requestAnrechnung.getMsgBeiEctsUeberschreitung(begruendung_id, ectsLv, sumEctsSchulisch, sumEctsBeruflich);
 
                     // Add to Checkbox text
-                    $('#requestAnrechnung-form :input[name="begruendung"]:checked').closest('label').append(msgBeiEctsUeberschreitung);
+                    $('#requestAnrechnung-form :input[name="begruendung"]:checked').closest('div').append(msgBeiEctsUeberschreitung);
                 }
             }
         }
     },
     getMsgBeiEctsUeberschreitung: function(begruendung_id, ects, sumEctsSchulisch, sumEctsBeruflich){
 
-        return $('<span id="sumEctsMsg"></span>')
-            .html(FHC_PhrasesLib.t("anrechnung", "anrechnungEctsTextBeiUeberschreitung",
+        const phraseUsed = '<span class="d-block">Die Höchstgrenze für Anrechnungen gem. § 12 Abs. 3 Fachhochschulgesetz wird überschritten.</span><span class=" fw-bold">Bisherige ECTS + ECTS dieser LV: Total: {0} [ Schulisch: {1}  | Beruflich: {2}  ]</span>&emsp;';
+
+        //TODO: needed:
+        /* FHC_PhrasesLib.t("anrechnung", "anrechnungEctsTextBeiUeberschreitung",
                 begruendung_id == 4
                     ? [(sumEctsSchulisch + sumEctsBeruflich + ects), sumEctsSchulisch, (sumEctsBeruflich  + ects)] // beruflich
-                    : [(sumEctsSchulisch + sumEctsBeruflich + ects), (sumEctsSchulisch + ects), sumEctsBeruflich])) // schulisch
+                    : [(sumEctsSchulisch + sumEctsBeruflich + ects), (sumEctsSchulisch + ects), sumEctsBeruflich]) */
+        return $('<div class="p-1" id="sumEctsMsg"></div>')
+            .html(phraseUsed) // schulisch
             .append('<i class="fa fa-lg fa-info-circle"></i>')
             .addClass('bg-danger-subtle')
             .tooltip({
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 35b49d1f4..c23354d54 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -11643,7 +11643,7 @@ Any unusual occurrences
         'phrases' => array(
             array(
                 'sprache' => 'German',
-                'text' => '<br>Die Höchstgrenze für Anrechnungen gem. § 12 Abs. 3 Fachhochschulgesetz wird überschritten.<br><b>Bisherige ECTS + ECTS dieser LV: Total: {0} [ Schulisch: {1}  | Beruflich: {2}  ]</b> ',
+                'text' => 'Die Höchstgrenze für Anrechnungen gem. § 12 Abs. 3 Fachhochschulgesetz wird überschritten.<span class="fw-bold">Bisherige ECTS + ECTS dieser LV: Total: {0} [ Schulisch: {1}  | Beruflich: {2}  ]</span>',
                 'description' => '',
                 'insertvon' => 'system'
             ),

From b7a1236acc55f7674a6e70c6b4e792c2798eb003 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 4 Mar 2024 15:06:08 +0100
Subject: [PATCH 0450/1461] anrechnung.css update

---
 public/css/lehre/anrechnung.css | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/public/css/lehre/anrechnung.css b/public/css/lehre/anrechnung.css
index 226d006b1..17096e014 100644
--- a/public/css/lehre/anrechnung.css
+++ b/public/css/lehre/anrechnung.css
@@ -47,9 +47,4 @@
     border-color: #9EC5FE !important;
 }
 
-.alert-box{
-    padding: 1rem 1rem;
-    margin-bottom: 1rem;
-    border-radius: .25rem;
-}
 

From caac612a0d4247c7ce3155b0c97472dc010f7c6b Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 4 Mar 2024 15:45:54 +0100
Subject: [PATCH 0451/1461] confirm status and add transactions

---
 .../controllers/components/stv/Status.php     | 145 ++++++++++++++++--
 .../Studentenverwaltung/Details/Prestudent.js |   6 +-
 .../Details/Prestudent/Status.js              |  52 ++++---
 3 files changed, 164 insertions(+), 39 deletions(-)

diff --git a/application/controllers/components/stv/Status.php b/application/controllers/components/stv/Status.php
index 4c5770779..d29c32982 100644
--- a/application/controllers/components/stv/Status.php
+++ b/application/controllers/components/stv/Status.php
@@ -100,9 +100,6 @@ class Status extends FHC_Controller
 		$rt_stufe = $this->input->post('rt_stufe');
 		$bestaetigtvon = $uid;
 
-		// Start DB transaction
-		//$this->db->trans_start(false);
-
 		//GET lastStatus
 		$result = $this->PrestudentstatusModel->getLastStatus($prestudent_id);
 
@@ -114,12 +111,9 @@ class Status extends FHC_Controller
 		elseif(!hasData($result))
 		{
 			$lastStatusData = [];
-/*			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson("donn holt nittan");*/
 		}
 		else
 			$lastStatusData = current(getData($result));
-		//var_dump($lastStatusData);
 
 		//Different handling depending on newStatus
 		if($status_kurzbz == 'Absolvent' || $status_kurzbz == 'Diplomand')
@@ -251,6 +245,9 @@ class Status extends FHC_Controller
 			}
 		}
 
+		// Start DB transaction
+		$this->db->trans_start(false);
+
 		$result = $this->PrestudentstatusModel->insert(
 			[
 				'prestudent_id' => $prestudent_id,
@@ -269,13 +266,21 @@ class Status extends FHC_Controller
 				'rt_stufe' => $rt_stufe
 			]
 		);
-		if (isError($result))
+
+		// Transaction complete!
+		$this->db->trans_complete();
+
+		if ($this->db->trans_status() === false || isError($result))
 		{
+			$this->db->trans_rollback();
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 			return $this->outputJson(getError($result));
 		}
-
-		return $this->outputJsonSuccess(true);
+		else
+		{
+			$this->db->trans_commit();
+			return $this->outputJsonSuccess(true);
+		}
 	}
 
 	public function loadStatus()
@@ -380,6 +385,9 @@ class Status extends FHC_Controller
 			}
 		}
 
+		// Start DB transaction
+		$this->db->trans_start(false);
+
 		//TODO(manu) $this->db->trans_start(false); and rollback?
 		//Delete Status
 		$result = $this->PrestudentstatusModel->delete(
@@ -390,15 +398,22 @@ class Status extends FHC_Controller
 				'studiensemester_kurzbz' => $studiensemester_kurzbz
 			)
 		);
-		if (isError($result))
+
+		// Transaction complete!
+		$this->db->trans_complete();
+
+		if ( $this->db->trans_status() === false || isError($result))
 		{
+			$this->db->trans_rollback();
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			$this->outputJson($result);
+			return $this->outputJson($result);
 		}
 		if(!hasData($result)) {
 			$this->outputJson($result);
 		}
 
+		$this->db->trans_commit();
+
 		//Delete Studentlehrverband if no Status left
 		$result = $this->PrestudentstatusModel->getLastStatus($prestudent_id, $studiensemester_kurzbz);
 
@@ -706,6 +721,9 @@ class Status extends FHC_Controller
 			}
 		}
 
+		// Start DB transaction
+		$this->db->trans_start(false);
+
 		//insert prestudentstatus
 		$uid = getAuthUID();
 		$result = $this->PrestudentstatusModel->insert(
@@ -721,14 +739,17 @@ class Status extends FHC_Controller
 				'studienplan_id' => $statusData->studienplan_id,
 				'datum' => date('c'),
 				'anmerkung' => $statusData->anmerkung
-
 			]
 		);
-		if (isError($result))
+
+		// Transaction complete!
+		$this->db->trans_complete();
+
+		if ($this->db->trans_status() === false || isError($result))
 		{
+			$this->db->trans_rollback();
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			//return $this->outputJson(getError($result));
-			return $this->outputJson("DEBUG: in insert Funktion");
+			return $this->outputJson(getError($result));
 		}
 
 		//Studentlehrverband anlegen
@@ -778,13 +799,105 @@ class Status extends FHC_Controller
 				]);
 			if (isError($result))
 			{
+				$this->db->trans_rollback();
 				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 
 				return $this->outputJson("Error in insert Studentlehrverband");
 			}
 		}
+		$this->db->trans_commit();
+		return $this->outputJsonSuccess(true);
+	}
+
+	public function confirmStatus($key_prestudent_id, $key_status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester)
+	{
+		$uid = getAuthUID();
+		//TODO(Manu) check: Annahme, dass hier immer suid bei Berechtigung STG vergeben wird!
+		$granted_Ass = $this->permissionlib->getSTG_isEntitledFor('assistenz') ? $this->permissionlib->getSTG_isEntitledFor('assistenz') : [];
+		$granted_Adm = $this->permissionlib->getSTG_isEntitledFor('admin') ? $this->permissionlib->getSTG_isEntitledFor('admin') : [];
+		$granted = array_merge($granted_Ass, $granted_Adm);
+
+		//get Studiengang von prestudent_id
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+		$result = $this->PrestudentModel->load([
+			'prestudent_id'=> $key_prestudent_id,
+		]);
+		if(isError($result))
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson(getError($result));
+		}
+		$result = current(getData($result));
+
+		$stg = $result->studiengang_kz;
+
+		if(!in_array($stg, $granted)){
+			$result = "Sie haben keine Schreibrechte fuer diesen Studiengang!";
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson($result);
+		}
+
+		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
+
+		$result = $this->PrestudentstatusModel->loadWhere(
+			array(
+				'prestudent_id' => $key_prestudent_id,
+				'status_kurzbz' => $key_status_kurzbz,
+				'ausbildungssemester' => $key_ausbildungssemester,
+				'studiensemester_kurzbz' => $key_studiensemester_kurzbz
+			)
+		);
+
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->outputJson($result);
+		}
+
+		elseif (!hasData($result)) {
+			$this->outputJson($result);
+		}
+		else
+		{
+			$statusData = current(getData($result));
+		}
+
+		//check if Status is unconfirmed.. TODO(manu) check further conditions? Status < Student
+		if($statusData->bestaetigtam != NULL)
+		{
+			$result = "Der Status ist bereits bestätigt!";
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson($result);
+		}
+
+		//check if Bewerbung abgeschickt
+		if($statusData->bewerbung_abgeschicktamum == NULL)
+		{
+			$result = "Die Bewerbung wurde noch nicht abgeschickt und kann deshalb nicht bestaetigt werden!";
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson($result);
+		}
+
+		$result = $this->PrestudentstatusModel->update(
+			[
+				'prestudent_id' => $key_prestudent_id,
+				'status_kurzbz' => $key_status_kurzbz,
+				'studiensemester_kurzbz' => $key_studiensemester_kurzbz,
+				'ausbildungssemester' => $key_ausbildungssemester,
+			],
+			[
+				'bestaetigtam' => date('c'),
+				'bestaetigtvon' => $uid
+			]
+		);
+		if (isError($result))
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson(getError($result));
+		}
+		if (!hasData($result)) {
+			return error('No Statusdata vorhanden');
+		}
 		return $this->outputJsonSuccess(true);
 
 	}
-
 }
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
index 6f067795c..c4015114d 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
@@ -111,8 +111,6 @@ export default {
 				}
 			});*/
 
-
-
 		},
 		detectChanges() {
 			const delta = {};
@@ -537,7 +535,7 @@ export default {
 						</form-input>
 					</div>
 					
-					<div class="row mb-3">
+<!--					<div class="row mb-3">
 						<form-input
 							container-class="col-5"
 							label="MentorIn"
@@ -546,7 +544,7 @@ export default {
 							name="mentor"
 							>
 						</form-input>
-					</div>
+					</div>-->
 				
 			</fieldset>
 		
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
index 97e47dfa1..03effa24b 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
@@ -206,7 +206,10 @@ export default{
 				'studiensemester_kurzbz': stdsem,
 				'ausbildungssemester': ausbildungssemester
 			};
-			console.log(this.statusId);
+			this.loadStatus(this.statusId).then(() => {
+				if(this.statusData)
+					this.confirmStatus(this.statusId);
+			});
 		},
 		addNewStatus(){
 			CoreRESTClient.post('components/stv/Status/addNewStatus/' + this.prestudent_id,
@@ -260,6 +263,33 @@ export default{
 					this.reload();
 				});
 		},
+		confirmStatus(statusId){
+			return CoreRESTClient.post('components/stv/Status/confirmStatus/' +
+				this.statusId.prestudent_id + '/' +
+				this.statusId.status_kurzbz + '/' +
+				this.statusId.studiensemester_kurzbz + '/' +
+				this.statusId.ausbildungssemester)
+				.then(
+					result => {
+						if(!result.data.error) {
+							this.$fhcAlert.alertSuccess('Bestätigung Status erfolgreich');
+						}
+						else
+						{
+							const errorData = result.data.retval;
+							this.$fhcAlert.alertError('Kein Status mit Id ' + status_id + ' gefunden');
+						}
+						/*						return result;*/
+					}).catch(error => {
+					if (error.response) {
+						console.log(error.response);
+						this.$fhcAlert.alertError(error.response.data);
+					}
+				}).finally(() => {
+					window.scrollTo(0, 0);
+					this.reload();
+				});
+		},
 		deleteStatus(status_id){
 			return CoreRESTClient.post('components/stv/Status/deleteStatus/',
 				status_id)
@@ -356,7 +386,7 @@ export default{
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 		CoreRESTClient
-			.get('components/stv/Prestudent/getStudienplaene/' + this.modelValue.prestudent_id)
+			.get('components/stv/Prestudent/getStudienplaene/' + this.prestudent_id)
 			.then(result => CoreRESTClient.getData(result.data) || [])
 			.then(result => {
 				this.listStudienplaene = result;
@@ -388,7 +418,6 @@ export default{
 		
 			<!--Modal: Add New Status-->
 			<BsModal ref="newStatusModal">
-			<!--TODO(manu) check stati: in FAs Absolvent, Abbrecher, Wartender nicht in Liste-->
 				<template #title>Neuen Status hinzufügen</template>
 							
 					<form-form class="row g-3" ref="statusData">
@@ -428,7 +457,7 @@ export default{
 								</form-input>
 							</div>
 						</div>
-						<!-- TODO(manu) if(defined('VORRUECKUNG_STATUS_MAX_SEMESTER') && VORRUECKUNG_STATUS_MAX_SEMESTER==false)-->
+						<!-- TODO(manu) if(defined('VORRUECKUNG_STATUS_MAX_SEMESTER') && VORRUECKUNG_STATUS_MAX_SEMESTER==false) 100 Semester-->
 						<div class="row mb-3">
 							<label for="ausbildungssemester" class="form-label col-sm-4">Ausbildungssemester</label>
 							<div class="col-sm-6">
@@ -729,21 +758,6 @@ export default{
 					<p>Prestudentstatus {{statusData.status_kurzbz}} (id: {{statusData.prestudent_id}}  
 					/ {{statusData.studiensemester_kurzbz}}) im {{statusData.ausbildungssemester}}. Ausbildungssemester wirklich löschen?</p>					
 				</template>	
-<!--				<template #footer>
-					<button 
-						ref="Close" 
-						type="button" 
-						class="btn btn-primary" 
-						@click="deleteStatus({
-							'prestudent_id': statusData.prestudent_id,
-							'status_kurzbz': statusData.studiensemester_kurzbz,
-							'studiensemester_kurzbz': statusData.studiensemester_kurzbz,
-							'ausbildungssemester': statusData.ausbildungssemester
-						})">OK</button>
-				</template>	-->							
-<!--				<template #footer>
-					<button ref="Close" type="button" class="btn btn-primary" @click="deleteStatus(statusData.prestudent_id, statusData.status_kurzbz, statusData.ausbildungssemester, statusData.studiensemester_kurzbz)">OK</button>
-				</template>-->
 				<template #footer>
 					<button ref="Close" type="button" class="btn btn-primary" @click="deleteStatus(statusId)">OK</button>
 				</template>

From 861f8a728873f4f6124c76d9190663bb7ed19eae Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 5 Mar 2024 08:47:45 +0100
Subject: [PATCH 0452/1461] Prestudent: Button Save inactive, if there are
 changes

---
 .../Studentenverwaltung/Details/Prestudent.js | 51 ++++++++++---------
 1 file changed, 28 insertions(+), 23 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
index c4015114d..9407355cd 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
@@ -56,13 +56,32 @@ export default {
 			listStgTyp: [],
 			listFoerderrelevant: [],
 			initialFormData: {},
-			deltaArray: [],
-			actionUpdate: false,
+			deltaArray: {},
+			actionUpdate: false
 		};
 	},
 	computed: {
+		deltaLength() {
+			return Object.keys(this.deltaArray).length;
+		}
 	},
 	watch: {
+		data: {
+			// TODO(chris): use @input instead?
+			handler(n) {
+
+				const delta = {};
+				for (const key in this.data) {
+					if (this.data[key] !== this.initialFormData[key]) {
+						delta[key] = this.data[key];
+						this.actionUpdate = true;
+					}
+				}
+				//this.deltaArray.push(delta);
+				this.deltaArray = delta;
+			},
+			deep: true
+		}
 	},
 
 	methods: {
@@ -78,13 +97,6 @@ export default {
 				.catch(this.$fhcAlert.handleSystemError);
 		},
 		updatePrestudent(){
-			this.detectChanges();
-
-/*			this.$nextTick(() => {
-
-				if (this.actionUpdate) {
-					console.log("Action");*/
-					//todo(manu) checken, ob überhaupt eine Änderung vorgenommen wurde
 					CoreRESTClient.post('components/stv/Prestudent/updatePrestudent/' + this.modelValue.prestudent_id,
 						this.deltaArray
 					).then(response => {
@@ -105,14 +117,9 @@ export default {
 					}).finally(() => {
 						window.scrollTo(0, 0);
 					});
-
-/*				} else {
-					console.log("no action");
-				}
-			});*/
-
 		},
-		detectChanges() {
+/* //besser im watch teil, dann wird Änderung immer verfolgt
+detectChanges() {
 			const delta = {};
 			for (const key in this.data) {
 				if (this.data[key] !== this.initialFormData[key]) {
@@ -121,7 +128,7 @@ export default {
 				}
 			}
 			this.deltaArray.push(delta);
-		},
+		},*/
 	},
 	created() {
 		this.loadPrestudent();
@@ -196,13 +203,11 @@ export default {
 	<div class="stv-details-details h-100 pb-3">
 		<form-form ref="form" class="stv-details-prestudent" @submit.prevent="updatePrestudent">
 		<div class="position-sticky top-0 z-1">
-		<!--TODO(manu) Button inactiv setzen, wenn keine Änderungen-->
-			<button type="submit" class="btn btn-primary position-absolute top-0 end-0" >Speichern</button>
+			<button type="submit" class="btn btn-primary position-absolute top-0 end-0" :disabled="!deltaLength">Speichern</button>
 		</div>
-		<!--<form ref="form">-->
 			<fieldset class="overflow-hidden">
 				<legend>Zugangsvoraussetzungen für {{modelValue.nachname}} {{modelValue.vorname}}</legend>
-	<!--				<template v-if="data">-->
+
 						<div class="row mb-3">
 							<form-input
 								container-class="col-3"
@@ -552,8 +557,8 @@ export default {
 		
 		<br>
 
-		
-		<div class="col-8">
+					
+		<div class="col-8 d-flex justify-content-center">
 			<legend>Gesamthistorie</legend>
 			<TblHistory :person_id="modelValue.person_id"></TblHistory>		
 		</div>

From 35bf6a2efd592972dbc1641d5f8830f2933448b4 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 5 Mar 2024 09:31:50 +0100
Subject: [PATCH 0453/1461] Tab Status: show Dropdown Statusgruende only if
 exisiting

---
 .../Details/Prestudent/Status.js              | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
index 03effa24b..450ca6283 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
@@ -127,13 +127,26 @@ export default{
 			listStudienplaene: [],
 			aufnahmestufen: {'': '-- keine Auswahl --', 1: 1, 2: 2, 3: 3},
 			listStatusgruende: [],
-			statusId: {}
+			statusId: {},
+			gruendeLength: {}
 		}
 	},
 	computed: {
 		gruende() {
 			return this.listStatusgruende.filter(grund => grund.status_kurzbz == this.statusData.status_kurzbz);
 		},
+/*		gruendeLength() {
+			//return Object.keys(this.gruende).length;
+			return 33;
+		}*/
+	},
+	watch: {
+		data: {
+			handler(n) {
+				const start = this.status_kurzbz;
+			},
+			deep: true
+		}
 	},
 	methods: {
 		actionNewStatus() {
@@ -407,6 +420,9 @@ export default{
 		<p>TestData</p>
 		{{statusData}}
 		<hr>
+		{{gruende}}
+		{{gruendeLength}}
+		
 <!--		Berechtigungen:
 			Skip Check: {{hasPermissionToSkipStatusCheck}} |
 			Admin: {{hasAdminPermission}} |
@@ -558,9 +574,8 @@ export default{
 								</form-input>
 							</div>
 						</div>
-						
-						<!--TODO(manu): ganzes Feld ausblenden, wenn kein Statusgrund?-->
-						<div class="row mb-3">
+										
+						<div v-if="gruende.length > 0" class="row mb-3">
 							<label for="grund" class="form-label col-sm-4">Grund</label>
 							<div class="col-sm-6">
 								<form-input 
@@ -584,7 +599,6 @@ export default{
 			
 			<!--Modal: Edit Status-->
 			<BsModal ref="editStatusModal">
-			<!--TODO(manu) check stati: in FAs Absolvent, Abbrecher, Wartender nicht in Liste-->
 				<template #title>Status bearbeiten</template>
 					<form-form class="row g-3" ref="statusData">
 					
@@ -728,8 +742,7 @@ export default{
 							</div>
 						</div>
 						
-						<!--TODO(manu): ganzes Feld ausblenden, wenn kein Statusgrund?-->
-						<div class="row mb-3">
+						<div v-if="gruende.length > 0" class="row mb-3">
 							<label for="grund" class="form-label col-sm-4">Grund</label>
 							<div class="col-sm-6">
 								<form-input 

From 144a872c988c26490f0a5f6e329f7278d3e1d873 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 5 Mar 2024 09:36:16 +0100
Subject: [PATCH 0454/1461] adds cutsom cis css style which lowers the overall
 font size

---
 application/views/lehre/anrechnung/requestAnrechnung.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/application/views/lehre/anrechnung/requestAnrechnung.php b/application/views/lehre/anrechnung/requestAnrechnung.php
index 65ee23177..83d7bcca5 100644
--- a/application/views/lehre/anrechnung/requestAnrechnung.php
+++ b/application/views/lehre/anrechnung/requestAnrechnung.php
@@ -14,6 +14,7 @@ $this->load->view(
 		'fontawesome4' => true,
 		'ajaxlib' => true,
 		'dialoglib' => true,
+		'cis'=>true,
 		'phrases' => array(
 			'global' => array(
 				'anerkennungNachgewiesenerKenntnisse',
@@ -306,7 +307,7 @@ $this->load->view(
 									<div class="border border-3 rounded border-dark p-3" >
 										
 											<div class="form-check">
-											<input class="form-check-input" type="checkbox" name="bestaetigung" required>
+											<input class="form-check-input border-3" type="checkbox" name="bestaetigung" required>
 											<small  class=" fw-bold"><?php echo $this->p->t('anrechnung', 'bestaetigungstext'); ?></small>
 											</div>
 									</div>

From 91c01f36f4e69820c9acf941cb03b583566ed62d Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 5 Mar 2024 10:34:01 +0100
Subject: [PATCH 0455/1461] css

---
 public/css/Tabulator5.css                         |  8 +++++++-
 .../Details/Prestudent/Status.js                  | 15 ---------------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/public/css/Tabulator5.css b/public/css/Tabulator5.css
index 2c7fa9117..c5e0b6486 100644
--- a/public/css/Tabulator5.css
+++ b/public/css/Tabulator5.css
@@ -1,4 +1,4 @@
-@import '../../vendor/olifolkerd/tabulator5/dist/css/tabulator_bootstrap5.min.css';
+@import '../../vendor/olifolkerd/tabulator5/dist/css/tabulator_simple.min.css';
 
 /* Apply borders and background to Cell instead of the Row
  * otherwise frozen columns won't look good (columns behind
@@ -38,6 +38,12 @@
 .tabulator .tabulator-col-resize-handle:last-of-type {
 	z-index: 999999;
 }
+.tabulator-cell .btn {
+   padding: 0 .5rem;
+   max-height: 22px;
+   min-width: 30px;
+}
+
 .tabulator {
 	font-size: 1rem;
 }
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
index 450ca6283..3b7c5a341 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
@@ -135,18 +135,6 @@ export default{
 		gruende() {
 			return this.listStatusgruende.filter(grund => grund.status_kurzbz == this.statusData.status_kurzbz);
 		},
-/*		gruendeLength() {
-			//return Object.keys(this.gruende).length;
-			return 33;
-		}*/
-	},
-	watch: {
-		data: {
-			handler(n) {
-				const start = this.status_kurzbz;
-			},
-			deep: true
-		}
 	},
 	methods: {
 		actionNewStatus() {
@@ -419,9 +407,6 @@ export default{
 		
 		<p>TestData</p>
 		{{statusData}}
-		<hr>
-		{{gruende}}
-		{{gruendeLength}}
 		
 <!--		Berechtigungen:
 			Skip Check: {{hasPermissionToSkipStatusCheck}} |

From aadaa3f2a3847eabf2df770ba2b5fe6945a6da81 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 5 Mar 2024 15:18:14 +0100
Subject: [PATCH 0456/1461] Revert "css"

This reverts commit 91c01f36f4e69820c9acf941cb03b583566ed62d.
---
 public/css/Tabulator5.css                         |  8 +-------
 .../Details/Prestudent/Status.js                  | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/public/css/Tabulator5.css b/public/css/Tabulator5.css
index c5e0b6486..2c7fa9117 100644
--- a/public/css/Tabulator5.css
+++ b/public/css/Tabulator5.css
@@ -1,4 +1,4 @@
-@import '../../vendor/olifolkerd/tabulator5/dist/css/tabulator_simple.min.css';
+@import '../../vendor/olifolkerd/tabulator5/dist/css/tabulator_bootstrap5.min.css';
 
 /* Apply borders and background to Cell instead of the Row
  * otherwise frozen columns won't look good (columns behind
@@ -38,12 +38,6 @@
 .tabulator .tabulator-col-resize-handle:last-of-type {
 	z-index: 999999;
 }
-.tabulator-cell .btn {
-   padding: 0 .5rem;
-   max-height: 22px;
-   min-width: 30px;
-}
-
 .tabulator {
 	font-size: 1rem;
 }
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
index 3b7c5a341..450ca6283 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
@@ -135,6 +135,18 @@ export default{
 		gruende() {
 			return this.listStatusgruende.filter(grund => grund.status_kurzbz == this.statusData.status_kurzbz);
 		},
+/*		gruendeLength() {
+			//return Object.keys(this.gruende).length;
+			return 33;
+		}*/
+	},
+	watch: {
+		data: {
+			handler(n) {
+				const start = this.status_kurzbz;
+			},
+			deep: true
+		}
 	},
 	methods: {
 		actionNewStatus() {
@@ -407,6 +419,9 @@ export default{
 		
 		<p>TestData</p>
 		{{statusData}}
+		<hr>
+		{{gruende}}
+		{{gruendeLength}}
 		
 <!--		Berechtigungen:
 			Skip Check: {{hasPermissionToSkipStatusCheck}} |

From e41e24be04d1f7b19c6e71a41abb35e8be7ad875 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 5 Mar 2024 15:38:51 +0100
Subject: [PATCH 0457/1461] adding the option to add css classes to the
 HTMLWidget

---
 .../approveAnrechnungUebersicht.php           | 43 +++++++++++--------
 .../approveAnrechnungUebersichtData.php       |  2 +-
 .../lehre/anrechnung/requestAnrechnung.php    |  4 +-
 application/views/widgets/dropdown.php        |  1 +
 application/widgets/html/HTMLWidget.php       |  1 +
 5 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php b/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php
index 988d6c227..cf5f4b363 100644
--- a/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php
+++ b/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php
@@ -5,11 +5,12 @@ $this->load->view(
 		'title' => $this->p->t('anrechnung', 'anrechnungenGenehmigen'),
 		'jquery3' => true,
 		'jqueryui1' => true,
-		'bootstrap3' => true,
+		'bootstrap5' => true,
 		'fontawesome4' => true,
 		'tabulator4' => true,
 		'ajaxlib' => true,
 		'dialoglib' => true,
+        'cis'=>true,
 		'tablewidget' => true,
 		'phrases' => array(
 			'global' => array(
@@ -80,7 +81,7 @@ $this->load->view(
 			)
 		),
 		'customJSs' => array(
-			'public/js/bootstrapper.js',
+			//'public/js/bootstrapper5.js',
 			'public/js/lehre/anrechnung/approveAnrechnungUebersicht.js'
 		)
 	)
@@ -89,20 +90,23 @@ $this->load->view(
 
 <div id="page-wrapper">
     <div class="container-fluid">
-        <!-- title -->
+        <!-- header -->
         <div class="row">
-            <div class="col-lg-12 page-header">
-                <h3>
+            <div class="col-12 mt-5 mb-3 pb-2 border-bottom">
+                <h3 class="fw-normal ">
 					<?php echo $this->p->t('anrechnung', 'anrechnungenGenehmigen'); ?>
-                    <small>| <?php echo ucfirst($this->p->t('global', 'uebersicht')); ?></small>
+                    <small class="text-secondary fs-6">| <?php echo ucfirst($this->p->t('global', 'uebersicht')); ?></small>
                 </h3>
             </div>
         </div>
+    
+        <!-- end header -->
+
         <!-- dropdown studiensemester -->
         <div class="row">
-            <div class="col-lg-12">
-                <form id="formApproveAnrechnungUebersicht" class="form-inline" action="" method="get" data-readonly="<?php echo json_encode($hasReadOnlyAccess)?>" data-createaccess="<?php echo json_encode($hasCreateAnrechnungAccess)?>">
-                    <div class="form-group">
+            <div class="col-12">
+                <form id="formApproveAnrechnungUebersicht" class="row align-items-center" action="" method="get" data-readonly="<?php echo json_encode($hasReadOnlyAccess)?>" data-createaccess="<?php echo json_encode($hasCreateAnrechnungAccess)?>">
+                    <div class="col-auto">
 						<?php
 						echo $this->widgetlib->widget(
 							'Studiensemester_widget',
@@ -111,13 +115,15 @@ $this->load->view(
 							),
 							array(
 								'name' => 'studiensemester',
-								'id' => 'studiensemester'
+								'id'=>'studiensemester',
+                                'class'=>'form-select w-auto ',
 							)
 						);
 						?>
                     </div>
+                    
                     <button type="submit"
-                            class="btn btn-default form-group"><?php echo ucfirst($this->p->t('ui', 'anzeigen')); ?></button>
+                            class="btn btn-outline-secondary col-auto"><?php echo ucfirst($this->p->t('ui', 'anzeigen')); ?></button>
                 </form>
             </div>
         </div>
@@ -132,6 +138,7 @@ $this->load->view(
             <div class="panel panel-default panel-body" style="display: none"
                  id="approveAnrechnungUebersicht-begruendung-panel">
                 <div>
+                
                     <h4 class="panel panel-body panel-danger text-danger"><?php echo $this->p->t('anrechnung', 'genehmigungenNegativQuestion'); ?></h4>
                     &nbsp;<b><?php echo $this->p->t('anrechnung', 'bitteBegruendungAngeben'); ?>
                     <span class="text-danger">
@@ -193,35 +200,35 @@ $this->load->view(
         <!-- Filter buttons / Submit buttons-->
         <div class="row">
             <!-- Filter buttons -->
-            <div class="col-xs-4 col-md-5">
+            <div class="col-4 col-md-5">
                 <div class="btn-toolbar" role="toolbar">
                     <div class="btn-group" role="group">
-                        <button id="show-inProgressDP" class="btn btn-default btn-clearfilter" type="button"
+                        <button id="show-inProgressDP" class="btn btn-outline-secondary btn-clearfilter" type="button"
                                 data-toggle="tooltip" data-placement="left"
                                 title="<?php echo $this->p->t('ui', 'alleInBearbeitungSTGL'); ?>">
                                     <i class='fa fa-eye'></i>
                         </button>
-                        <button id="show-inProgressLektor" class="btn btn-default btn-clearfilter" type="button"
+                        <button id="show-inProgressLektor" class="btn btn-outline-secondary btn-clearfilter" type="button"
                                 data-toggle="tooltip" data-placement="left"
                                 title="<?php echo $this->p->t('ui', 'alleInBearbeitungLektor'); ?>"><i
                                     class='fa fa-clock-o'></i>
                         </button>
-                        <button id="show-recommended" class="btn btn-default btn-clearfilter" type="button"
+                        <button id="show-recommended" class="btn btn-outline-secondary btn-clearfilter" type="button"
                                 data-toggle="tooltip" data-placement="left"
                                 title="<?php echo $this->p->t('ui', 'nurEmpfohleneAnzeigen'); ?>"><i
                                     class='fa fa-thumbs-o-up'></i>
                         </button>
-                        <button id="show-not-recommended" class="btn btn-default btn-clearfilter" type="button"
+                        <button id="show-not-recommended" class="btn btn-outline-secondary btn-clearfilter" type="button"
                                 data-toggle="tooltip" data-placement="left"
                                 title="<?php echo $this->p->t('ui', 'nurNichtEmpfohleneAnzeigen'); ?>"><i
                                     class='fa fa-thumbs-o-down'></i>
                         </button>
-                        <button id="show-approved" class="btn btn-default btn-clearfilter" type="button"
+                        <button id="show-approved" class="btn btn-outline-secondary btn-clearfilter" type="button"
                                 data-toggle="tooltip" data-placement="left"
                                 title="<?php echo $this->p->t('ui', 'nurGenehmigteAnzeigen'); ?>"><i
                                     class='fa fa-check'></i>
                         </button>
-                        <button id="show-rejected" class="btn btn-default btn-clearfilter" type="button"
+                        <button id="show-rejected" class="btn btn-outline-secondary btn-clearfilter" type="button"
                                 data-toggle="tooltip" data-placement="left"
                                 title="<?php echo $this->p->t('ui', 'nurAbgelehnteAnzeigen'); ?>"><i
                                     class='fa fa-times'></i>
diff --git a/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php b/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
index cbc824aa6..7551a59c8 100644
--- a/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
+++ b/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
@@ -218,7 +218,7 @@ $filterWidgetArray = array(
             func_tableBuilt(this);
         },
         tableWidgetFooter: {
-			selectButtons: true
+			selectButtons: false
 		},
 		selectableCheck: function(row){
             return func_selectableCheck(row);
diff --git a/application/views/lehre/anrechnung/requestAnrechnung.php b/application/views/lehre/anrechnung/requestAnrechnung.php
index 83d7bcca5..9f6482e85 100644
--- a/application/views/lehre/anrechnung/requestAnrechnung.php
+++ b/application/views/lehre/anrechnung/requestAnrechnung.php
@@ -73,8 +73,8 @@ $this->load->view(
     <div class="container-fluid">
         <!-- header -->
         <div class="row">
-            <div class="col-12 mt-4 mb-3 pb-2 border-bottom">
-                <h3 class="fw-normal mt-2 mb-1">
+            <div class="col-12 mt-5 mb-3 pb-2 border-bottom">
+                <h3 class="fw-normal">
 					<?php echo $this->p->t('anrechnung', 'anerkennungNachgewiesenerKenntnisse'); ?>
                     <small class="text-secondary fs-6">| <?php echo $this->p->t('anrechnung', 'antragStellen'); ?></small>
                 </h3>
diff --git a/application/views/widgets/dropdown.php b/application/views/widgets/dropdown.php
index 51db6d536..f61141a4b 100644
--- a/application/views/widgets/dropdown.php
+++ b/application/views/widgets/dropdown.php
@@ -34,6 +34,7 @@
 					<?php HTMLWidget::printAttribute(${HTMLWidget::HTML_ARG_NAME}, HTMLWidget::REGEX); ?>
 					<?php HTMLWidget::printAttribute(${HTMLWidget::HTML_ARG_NAME}, HTMLWidget::TITLE); ?>
 					<?php HTMLWidget::printAttribute(${HTMLWidget::HTML_ARG_NAME}, HTMLWidget::DISABLED, false); ?>
+					<?php HTMLWidget::printAttribute(${HTMLWidget::HTML_ARG_NAME}, HTMLWidget::STYLE); ?>
 				>
 					<?php
 						$elements = ${DropdownWidget::WIDGET_DATA_ELEMENTS_ARRAY_NAME};
diff --git a/application/widgets/html/HTMLWidget.php b/application/widgets/html/HTMLWidget.php
index 0034edfd9..366008beb 100644
--- a/application/widgets/html/HTMLWidget.php
+++ b/application/widgets/html/HTMLWidget.php
@@ -27,6 +27,7 @@ class HTMLWidget extends Widget
 	const MIN_LENGTH = 'min-length';
 	const PLACEHOLDER = 'placeholder';
 	const DISABLED = 'disabled';
+	const STYLE = 'class';
 
 	/**
 	 * It gets also the htmlArgs array as parameter, it will be used to set the HTML properties

From 5b795c2ccf1ec96abf770f276da356519801d518 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 5 Mar 2024 16:36:43 +0100
Subject: [PATCH 0458/1461] phrases update merge conflict

---
 system/phrasesupdate.php | 81 ++++++++++++++++++++++++++--------------
 1 file changed, 52 insertions(+), 29 deletions(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 9200b48a3..2d862f608 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -24506,60 +24506,83 @@ array(
 		)
 	),
 	
-	//TODO(Manu) finish merge 
-/*		'phrase' => 'firma_zusatz',
-		'phrases' => array(
+	//TODO(Manu) location missing!
 	array(
 		'app' => 'core',
 		'category' => 'person',
-		'phrase' => 'standort',
+		'phrase' => 'firma_zusatz',
+		'phrases' => array(
+			array(
 				'sprache' => 'German',
 				'text' => 'Firmenzusatz',
-				<<<<<<< HEAD
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
 				'text' => 'add.company info',
-				<<<<<<< HEAD
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
 		'phrase' => 'firma',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
 				'text' => 'Firma',
-				<<<<<<< HEAD
-				'text' => 'location',
-				
-				<<<<<<< HEAD
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'company',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
 		'category' => 'person',
 		'phrase' => 'adresse_new',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
 				'text' => 'Adresse anlegen',
-				
-				<<<<<<< HEAD
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
 				'text' => 'create address',
-				<<<<<<< HEAD
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
 		'category' => 'person',
 		'phrase' => 'adresse_edit',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
 				'text' => 'Adresse bearbeiten',
-				
-				<<<<<<< HEAD
-				'text' => 'edit address',
-				
-				<<<<<<< HEAD
-		'category' => 'person',
-		'phrase' => 'adresse_delete',
-		'phrases' => array(
+				'description' => '',
+				'insertvon' => 'system'
+			),
 			array(
-				'sprache' => 'German',
-				'text' => 'Adresse löschen',
-				
-				<<<<<<< HEAD
-				'text' => 'delete address',
-	
-	*/
-	
+				'sprache' => 'English',
+				'text' => 'edit address',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'person',

From fdbbba5038816e010dd189c278f053120096ca6a Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 5 Mar 2024 16:42:06 +0100
Subject: [PATCH 0459/1461] add phrase location

---
 system/phrasesupdate.php | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 2d862f608..1796dbf5f 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -24505,8 +24505,25 @@ array(
 			)
 		)
 	),
-	
-	//TODO(Manu) location missing!
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'standort',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Standort',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'location',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'person',

From 77666e5210d7616453bd69390b5a2183f4b169c0 Mon Sep 17 00:00:00 2001
From: Werner Masik <werner@gefi.at>
Date: Wed, 6 Mar 2024 08:27:39 +0100
Subject: [PATCH 0460/1461] added column verantwortlich_uid

---
 system/dbupdate_3.4/37107_fristenmanagement.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/system/dbupdate_3.4/37107_fristenmanagement.php b/system/dbupdate_3.4/37107_fristenmanagement.php
index 678f41d67..d63bae80d 100644
--- a/system/dbupdate_3.4/37107_fristenmanagement.php
+++ b/system/dbupdate_3.4/37107_fristenmanagement.php
@@ -8,7 +8,8 @@ if ($result = $db->db_query("SELECT * FROM information_schema.tables WHERE table
 		$qry = "
         CREATE TABLE IF NOT EXISTS hr.tbl_frist (
             frist_id bigserial NOT NULL,
-            mitarbeiter_uid character varying(32) NOT NULL,
+            mitarbeiter_uid character varying(32),
+            verantwortlich_uid character varying(32),
             ereignis_kurzbz character varying(32) NOT NULL,
             bezeichnung varchar(255),
             datum date,
@@ -42,6 +43,10 @@ if ($result = $db->db_query("SELECT * FROM information_schema.tables WHERE table
 		REFERENCES public.tbl_mitarbeiter (mitarbeiter_uid) MATCH FULL
 		ON DELETE SET NULL ON UPDATE CASCADE;
 
+        ALTER TABLE hr.tbl_frist ADD CONSTRAINT tbl_frist_verantwortlich_uid_fk FOREIGN KEY (verantwortlich_uid)
+		REFERENCES public.tbl_mitarbeiter (mitarbeiter_uid) MATCH FULL
+		ON DELETE SET NULL ON UPDATE CASCADE;
+
         ALTER TABLE hr.tbl_frist ADD CONSTRAINT tbl_frist_ereignis_kurzbz_fk FOREIGN KEY (ereignis_kurzbz)
 		REFERENCES hr.tbl_frist_ereignis (ereignis_kurzbz) MATCH FULL
 		ON DELETE SET NULL ON UPDATE CASCADE;
@@ -55,6 +60,7 @@ if ($result = $db->db_query("SELECT * FROM information_schema.tables WHERE table
         GRANT SELECT, UPDATE, INSERT, DELETE ON hr.tbl_frist_ereignis TO vilesci;
 
         INSERT INTO hr.tbl_frist_status(status_kurzbz, bezeichnung) VALUES('neu','Neu');
+        INSERT INTO hr.tbl_frist_status(status_kurzbz, bezeichnung) VALUES('in_bearbeitung','In Bearbeitung');
         INSERT INTO hr.tbl_frist_status(status_kurzbz, bezeichnung) VALUES('erledigt','Erledigt');
 
         INSERT INTO hr.tbl_frist_ereignis(ereignis_kurzbz, bezeichnung) VALUES('dv_beginn','DV Beginn');

From 464799d22b45d7b0ef2d581a52a933ac4ddda2c1 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 6 Mar 2024 14:46:21 +0100
Subject: [PATCH 0461/1461] tabulator upgrade

---
 .../approveAnrechnungUebersicht.php           | 74 ++++++++++---------
 .../approveAnrechnungUebersichtData.php       |  6 +-
 application/views/templates/FHC-Footer.php    |  1 +
 public/js/TableWidget.js                      |  1 +
 .../anrechnung/approveAnrechnungUebersicht.js | 21 ++++--
 5 files changed, 62 insertions(+), 41 deletions(-)

diff --git a/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php b/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php
index cf5f4b363..71e4ac1e7 100644
--- a/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php
+++ b/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php
@@ -7,7 +7,8 @@ $this->load->view(
 		'jqueryui1' => true,
 		'bootstrap5' => true,
 		'fontawesome4' => true,
-		'tabulator4' => true,
+		'tabulator5' => true,
+        'tabulator5JQuery' => true,
 		'ajaxlib' => true,
 		'dialoglib' => true,
         'cis'=>true,
@@ -83,6 +84,9 @@ $this->load->view(
 		'customJSs' => array(
 			//'public/js/bootstrapper5.js',
 			'public/js/lehre/anrechnung/approveAnrechnungUebersicht.js'
+		),
+		'customCSSs' => array(
+			'public/css/lehre/anrechnung.css'
 		)
 	)
 );
@@ -129,65 +133,67 @@ $this->load->view(
         </div>
         <!-- Tabelle -->
         <div class="row">
-            <div class="col-xs-12">
+            <div class="col-12">
                 <?php $this->load->view('lehre/anrechnung/approveAnrechnungUebersichtData.php'); ?>
             </div>
         </div>
         <!-- Genehmigen / Ablehnen Panel -->
         <div class="row">
-            <div class="panel panel-default panel-body" style="display: none"
+            <div  class="border border-1 mb-4" style="display: none"
                  id="approveAnrechnungUebersicht-begruendung-panel">
-                <div>
+                <div class="mb-4 col-12">
                 
-                    <h4 class="panel panel-body panel-danger text-danger"><?php echo $this->p->t('anrechnung', 'genehmigungenNegativQuestion'); ?></h4>
-                    &nbsp;<b><?php echo $this->p->t('anrechnung', 'bitteBegruendungAngeben'); ?>
-                    <span class="text-danger">
-                        <?php echo $this->p->t('anrechnung', 'begruendungWirdFuerAlleUebernommen'); ?>
-                    </span></b>
-                    <br><br>
-                    <ol class="list-group">
+                    <h4 class="card card-body border-danger text-danger my-3"><?php echo $this->p->t('anrechnung', 'genehmigungenNegativQuestion'); ?></h4>
+                    <div class="mb-4">
+                        <b><?php echo $this->p->t('anrechnung', 'bitteBegruendungAngeben'); ?>
+                        <span class="text-danger">
+                            <?php echo $this->p->t('anrechnung', 'begruendungWirdFuerAlleUebernommen'); ?>
+                        </span></b>
+                    </div>
+                    <ol class="list-group mb-4">
                         <li class="list-group-item"><?php echo $this->p->t('anrechnung', 'genehmigungNegativPruefungNichtMoeglich'); ?>
-                            <span class="btn-copyIntoTextarea pull-right" data-toggle="tooltip" data-placement="left"
+                            <span role="button" class="btn-copyIntoTextarea float-end" data-bs-toggle="tooltip" data-bs-placement="left"
                                title="<?php echo $this->p->t('ui', 'textUebernehmen'); ?>">
                                 <i class="fa fa-clipboard fa-lg" aria-hidden="true"></i>
                             </span>
                         </li>
                         <li class="list-group-item"><?php echo $this->p->t('anrechnung', 'genehmigungNegativEctsHoechstgrenzeUeberschritten'); ?>
-                            <span class="btn-copyIntoTextarea pull-right" data-toggle="tooltip" data-placement="left"
+                            <span role="button" class="btn-copyIntoTextarea float-end" data-bs-toggle="tooltip" data-bs-placement="left"
                                   title="<?php echo $this->p->t('ui', 'textUebernehmen'); ?>">
                                 <i class="fa fa-clipboard fa-lg" aria-hidden="true"></i>
                             </span>
                         </li>
-                        <li class="list-group-item disabled"><?php echo $this->p->t('anrechnung', 'genehmigungNegativKenntnisseNichtGleichwertigWeilHinweis'); ?></li>
+                        <li class="list-group-item  list-group-item-secondary"><?php echo $this->p->t('anrechnung', 'genehmigungNegativKenntnisseNichtGleichwertigWeilHinweis'); ?></li>
                     </ol>
                     <textarea class="form-control" name="begruendung" id="approveAnrechnungUebersicht-begruendung"
                               rows="2"
                               placeholder="<?php echo $this->p->t('anrechnung', 'textUebernehmenOderEigenenBegruendungstext'); ?>" required></textarea>
                 </div>
-                <br>
+               
                 <!-- Action Button 'Abbrechen'-->
-                <div class="pull-right">
+                <div class="mb-4 d-flex justify-content-end" >
                     <button id="approveAnrechnungUebersicht-begruendung-abbrechen"
-                            class="btn btn-default btn-w200" type="reset">
+                            class="btn btn-outline-secondary btn-w200 ms-1" type="reset">
 						<?php echo ucfirst($this->p->t('ui', 'abbrechen')); ?>
                     </button>
                     <button id="approveAnrechnungUebersicht-reject-anrechnungen-confirm"
-                            class="btn btn-primary btn-w200" type="button">
+                            class="btn btn-primary btn-w200 ms-1" type="button">
 						<?php echo ucfirst($this->p->t('ui', 'bestaetigen')); ?>
                     </button>
                 </div>
             </div>
-            <div class="panel panel-default panel-body" style="display: none"
+            
+            <div class="border border-1 mb-4" style="display: none"
                  id="approveAnrechnungUebersicht-genehmigung-panel">
                 <div>
-                    <h4 class="panel panel-body panel-success text-success"><?php echo $this->p->t('anrechnung', 'genehmigungenPositivQuestion'); ?></h4>
-                    &ensp;<?php echo $this->p->t('anrechnung', 'genehmigungenPositiv'); ?><br><br>
+                    <h4 class="card card-body border-success text-success my-3"><?php echo $this->p->t('anrechnung', 'genehmigungenPositivQuestion'); ?></h4>
+                    <div class="ps-2 mb-4"><?php echo $this->p->t('anrechnung', 'genehmigungenPositiv'); ?></div>
                 </div>
                 <br>
                 <!-- Action Button 'Abbrechen'-->
-                <div class="pull-right">
+                <div class="mb-4 d-flex justify-content-end">
                     <button id="approveAnrechnungUebersicht-empfehlung-abbrechen"
-                            class="btn btn-default btn-w200" type="reset">
+                            class="btn btn-outline-secondary btn-w200" type="reset">
 						<?php echo ucfirst($this->p->t('ui', 'abbrechen')); ?>
                     </button>
                     <button id="approveAnrechnungUebersicht-approve-anrechnungen-confirm"
@@ -204,49 +210,49 @@ $this->load->view(
                 <div class="btn-toolbar" role="toolbar">
                     <div class="btn-group" role="group">
                         <button id="show-inProgressDP" class="btn btn-outline-secondary btn-clearfilter" type="button"
-                                data-toggle="tooltip" data-placement="left"
+                                data-bs-toggle="tooltip" data-bs-placement="left"
                                 title="<?php echo $this->p->t('ui', 'alleInBearbeitungSTGL'); ?>">
                                     <i class='fa fa-eye'></i>
                         </button>
                         <button id="show-inProgressLektor" class="btn btn-outline-secondary btn-clearfilter" type="button"
-                                data-toggle="tooltip" data-placement="left"
+                                data-bs-toggle="tooltip" data-bs-placement="left"
                                 title="<?php echo $this->p->t('ui', 'alleInBearbeitungLektor'); ?>"><i
                                     class='fa fa-clock-o'></i>
                         </button>
                         <button id="show-recommended" class="btn btn-outline-secondary btn-clearfilter" type="button"
-                                data-toggle="tooltip" data-placement="left"
+                                data-bs-toggle="tooltip" data-bs-placement="left"
                                 title="<?php echo $this->p->t('ui', 'nurEmpfohleneAnzeigen'); ?>"><i
                                     class='fa fa-thumbs-o-up'></i>
                         </button>
                         <button id="show-not-recommended" class="btn btn-outline-secondary btn-clearfilter" type="button"
-                                data-toggle="tooltip" data-placement="left"
+                                data-bs-toggle="tooltip" data-bs-placement="left"
                                 title="<?php echo $this->p->t('ui', 'nurNichtEmpfohleneAnzeigen'); ?>"><i
                                     class='fa fa-thumbs-o-down'></i>
                         </button>
                         <button id="show-approved" class="btn btn-outline-secondary btn-clearfilter" type="button"
-                                data-toggle="tooltip" data-placement="left"
+                                data-bs-toggle="tooltip" data-bs-placement="left"
                                 title="<?php echo $this->p->t('ui', 'nurGenehmigteAnzeigen'); ?>"><i
                                     class='fa fa-check'></i>
                         </button>
                         <button id="show-rejected" class="btn btn-outline-secondary btn-clearfilter" type="button"
-                                data-toggle="tooltip" data-placement="left"
+                                data-bs-toggle="tooltip" data-bs-placement="left"
                                 title="<?php echo $this->p->t('ui', 'nurAbgelehnteAnzeigen'); ?>"><i
                                     class='fa fa-times'></i>
                         </button>
                     </div>
-						<a type="button" id="approveAnrechnungUebersicht-create-anrechnung" class="btn btn-default" style="margin-left: 20px;" href='<?php echo site_url('lehre/anrechnung/createAnrechnung') ?>' target='_blank'>
+						<a type="button" id="approveAnrechnungUebersicht-create-anrechnung" class="btn btn-outline-secondary ms-4"  href='<?php echo site_url('lehre/anrechnung/createAnrechnung') ?>' target='_blank'>
 							<i class='fa fa-plus' aria-hidden='true'></i> <?php echo $this->p->t('global', 'antragAnlegen'); ?>
 						</a>
 				</div>
             </div>
             <!-- Action Buttons 'Genehmigen', Ablehnen, 'Empfehlung anfordern'-->
-            <div class="col-xs-8 col-md-7">
-                <div class="pull-right">
+            <div class="col-8 col-md-7">
+                <div class="d-flex justify-content-end">
                     <button id="approveAnrechnungUebersicht-request-recommendation"
-                            class="btn btn-default btn-w200 btn-mr50" type="button">
+                            class="btn btn-outline-secondary btn-w200 me-5" type="button">
                         <?php echo ucfirst($this->p->t('anrechnung', 'empfehlungAnfordern')); ?></button>
                     <button id="approveAnrechnungUebersicht-reject-anrechnungen-ask"
-                            class="btn btn-danger btn-w200" type="button">
+                            class="btn btn-danger btn-w200 me-1" type="button">
                         <?php echo ucfirst($this->p->t('global', 'ablehnen')); ?></button>
                     <button id="approveAnrechnungUebersicht-approve-anrechnungen-ask"
                             class="btn btn-primary btn-w200" type="button">
diff --git a/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php b/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
index 7551a59c8..2eb7acb9a 100644
--- a/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
+++ b/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
@@ -215,7 +215,8 @@ $filterWidgetArray = array(
         selectableRangeMode: "click",   // allow range selection using shift end click on end of range
         selectablePersistence:false,    // deselect previously selected rows when table is filtered, sorted or paginated
         tableBuilt: function(){
-            func_tableBuilt(this);
+			
+            //func_tableBuilt(this);
         },
         tableWidgetFooter: {
 			selectButtons: false
@@ -224,7 +225,7 @@ $filterWidgetArray = array(
             return func_selectableCheck(row);
         },
         rowFormatter:function(row){
-            func_rowFormatter(row);
+            func_rowFormatter(row,this);
         },
         rowSelectionChanged:function(data, rows){
             func_rowSelectionChanged(data, rows);
@@ -253,6 +254,7 @@ $filterWidgetArray = array(
 		ectsSumSchulisch: {visible: false, headerFilter:"input", align:"right"},
 		ectsSumBeruflich: {visible: false, headerFilter:"input", align:"right"},
 		begruendung: {headerFilter:"input", visible: true},
+		
 		student: {headerFilter:"input"},
 		zgv: {headerFilter:"input"},
 		dokument_bezeichnung: {headerFilter:"input", formatter:"link", formatterParams: paramLookup_dokBez},
diff --git a/application/views/templates/FHC-Footer.php b/application/views/templates/FHC-Footer.php
index 3daac26cd..1fca0df2b 100644
--- a/application/views/templates/FHC-Footer.php
+++ b/application/views/templates/FHC-Footer.php
@@ -100,6 +100,7 @@
 	// Tabulator 5 JS
 	if ($tabulator5 === true) generateJSsInclude('vendor/olifolkerd/tabulator5/dist/js/tabulator.min.js');
 
+	if ($tabulator5JQuery === true) generateJSsInclude('vendor/olifolkerd/tabulator5/dist/js/jquery_wrapper.js');
 	// Tinymce 3 JS
 	if ($tinymce3 === true) generateJSsInclude('include/tiny_mce/tiny_mce.js');
 
diff --git a/public/js/TableWidget.js b/public/js/TableWidget.js
index 9ae1b836c..1d0b36405 100644
--- a/public/js/TableWidget.js
+++ b/public/js/TableWidget.js
@@ -562,6 +562,7 @@ var FHC_TableWidget = {
 
 				// Renders the tabulator
 				tableWidgetDiv.find("#tableWidgetTabulator").tabulator(options);
+				
 			}
 		}
 
diff --git a/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js b/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
index a2bc5daff..bd7423671 100644
--- a/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
+++ b/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
@@ -17,6 +17,15 @@ var tabulator = null; // Set in tableBuilt function.
 // Array with accumulated LV ECTS by Prestudent. Used to find out if max ECTS are exceeded.
 var selectedPrestudentWithAccumulatedLvEcts = [];
 
+
+
+let ttw = $('div[tableUniqueId="approveAnrechnungUebersicht"]');
+ttw.tabulator("on","tableBuilt", function(){
+    console.log("this is just a test");
+});
+
+
+
 // -----------------------------------------------------------------------------------------------------------------
 // Mutators - setter methods to manipulate table data when entering the tabulator
 // -----------------------------------------------------------------------------------------------------------------
@@ -147,6 +156,8 @@ var format_ectsSumBisherUndNeu = function(cell, formatterParams, onRendered){
 
 // Formats the rows
 function func_rowFormatter(row){
+    
+
     let status_kurzbz = row.getData().status_kurzbz;
 
     // If status is anything else then 'Bearbeitet von STGL-Leitung'
@@ -157,7 +168,7 @@ function func_rowFormatter(row){
 
         // ...but leave url links selectable
         row.getCell('dokument_bezeichnung').getElement().firstChild.style["pointerEvents"] = "auto";
-        row.getCell('details').getElement().firstChild.style["pointerEvents"] = "auto";
+        //row.getCell('details').getElement().firstChild.style["pointerEvents"] = "auto";
 
         // Color background grey
         row.getElement().style["background-color"] = COLOR_LIGHTGREY;   // default
@@ -660,16 +671,16 @@ var approveAnrechnung = {
 
         switch (status_kurzbz) {
             case ANRECHNUNGSTATUS_APPROVED:
-                $('#requestAnrechnung-status_kurzbz').closest('div').addClass('alert-success');
+                $('#requestAnrechnung-status_kurzbz').closest('div').addClass('bg-success-subtle');
                 break;
             case ANRECHNUNGSTATUS_REJECTED:
-                $('#requestAnrechnung-status_kurzbz').closest('div').addClass('alert-danger');
+                $('#requestAnrechnung-status_kurzbz').closest('div').addClass('bg-danger-subtle');
                 break;
             case '':
-                $('#requestAnrechnung-status_kurzbz').closest('div').addClass('alert-info');
+                $('#requestAnrechnung-status_kurzbz').closest('div').addClass('bg-info-subtle');
                 break;
             default:
-                $('#requestAnrechnung-status_kurzbz').closest('div').addClass('alert-warning');
+                $('#requestAnrechnung-status_kurzbz').closest('div').addClass('bg-warning-subtle');
         }
     },
     disableEditElements: function()

From 96e0bfa72c2032898adf54130637f078ad4abb14 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 7 Mar 2024 11:08:43 +0100
Subject: [PATCH 0462/1461] changes how the EditProfil Modal passes props to
 its children

---
 application/controllers/Cis/ProfilUpdate.php  |  6 +-
 .../models/person/Profil_update_model.php     |  1 +
 public/css/components/Profil.css              | 12 ---
 public/js/components/Cis/Profil/EditProfil.js |  8 +-
 .../Cis/Profil/MitarbeiterProfil.js           | 76 +++++++++----------
 .../Profil/ProfilComponents/EditAdresse.js    |  4 +-
 .../Profil/ProfilComponents/EditKontakt.js    |  4 +-
 .../js/components/Cis/Profil/StudentProfil.js | 61 ++++++++-------
 8 files changed, 82 insertions(+), 90 deletions(-)

diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
index a16248a3b..6b42356dc 100755
--- a/application/controllers/Cis/ProfilUpdate.php
+++ b/application/controllers/Cis/ProfilUpdate.php
@@ -268,7 +268,7 @@ class ProfilUpdate extends Auth_Controller
 		if(isset($id)) $whereClause['id'] = $id;
 		
 		$res= $this->ProfilUpdateModel->getProfilUpdatesWhere($whereClause);
-
+		$res = hasData($res) ? getData($res) : null;
 		echo json_encode($res);
 		
 	}
@@ -314,6 +314,10 @@ class ProfilUpdate extends Auth_Controller
 
 		//? loops over all updateRequests from a user to validate if the new request is valid
 		$res = $this->ProfilUpdateModel->getProfilUpdatesWhere(["uid"=>$this->uid]);
+		if(isError($res)){
+			show_error("Error occured while querying the profil update requests of UID: ".$uid);
+		}
+		$res = hasData($res)? getData($res):null;
 		
 		//? the user cannot delete a zustelladresse/kontakt
 		if( isset($payload->delete) && $payload->{$identifier=="kontakt_id"? "zustellung":"zustelladresse"}){
diff --git a/application/models/person/Profil_update_model.php b/application/models/person/Profil_update_model.php
index c2304d069..a49fc4c24 100755
--- a/application/models/person/Profil_update_model.php
+++ b/application/models/person/Profil_update_model.php
@@ -70,6 +70,7 @@ class Profil_update_model extends DB_Model
 				$this->formatProfilRequest($request);
 			}
 		}
+		
 		return $res;
 
 	}
diff --git a/public/css/components/Profil.css b/public/css/components/Profil.css
index d9b725cb6..aa9932cd7 100755
--- a/public/css/components/Profil.css
+++ b/public/css/components/Profil.css
@@ -1,18 +1,6 @@
 
 
-@media (max-width: 991px) {
-    
-    .md-invisible{
-        display:none;
-    }
-  }
 
-  @media (min-width: 992px) {
-    
-    .lg-invisible{
-        display:none;
-    }
-  }
 
 .image-lock{
   height:22px; 
diff --git a/public/js/components/Cis/Profil/EditProfil.js b/public/js/components/Cis/Profil/EditProfil.js
index 1b87950c0..56082ec34 100755
--- a/public/js/components/Cis/Profil/EditProfil.js
+++ b/public/js/components/Cis/Profil/EditProfil.js
@@ -16,7 +16,6 @@ export default {
     title: String,
     zustelladressenCount: Function,
     zustellkontakteCount: Function,
-    setLoading:Function,
     /*
      * NOTE(chris):
      * Hack to expose in "emits" declared events to $props which we use
@@ -43,12 +42,10 @@ export default {
       info: null,
     };
   },
-
+  inject:["setLoading"],
   provide(){
     return {
       updateFileID: this.updateFileIDFunction,
-      zustellAdresseCount:this.zustelladressenCount,
-      zustellKontaktCount:this.zustellkontakteCount,
     }
   }, 
 
@@ -164,13 +161,10 @@ export default {
       {{title }}  
     </template>
     <template v-slot:default>
-    
     <div >
-    
     <nav aria-label="breadcrumb" class="ps-2  ">
       <ol class="breadcrumb ">
         <li class="breadcrumb-item"  v-for="element in breadcrumb">{{element}}</li>
-      
       </ol>
     </nav>
 
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 600d6ccb8..b9be77463 100755
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -26,10 +26,10 @@ export default {
     RoleInformation,
     ProfilInformation,
   },
-  inject: ['sortProfilUpdates','collapseFunction','getZustellkontakteCount','getZustelladressenCount','setLoading'],
+  inject: ['sortProfilUpdates','collapseFunction'],
   data() {
     return {
-
+      showModal:false,
       
       funktionen_table_options: {
         height: 300,
@@ -139,7 +139,38 @@ export default {
 	},
   
   methods: {
+    hideEditProfilModal: function(){
+      
+      //? checks the editModal component property result, if the user made a successful request or not
+      if(this.$refs.editModal.result){
+        Vue.$fhcapi.ProfilUpdate.selectProfilRequest()
+        .then((request) =>{
+          if(!request.error){
+            this.data.profilUpdates = request.data;
+            this.data.profilUpdates.sort(this.sortProfilUpdates);
+            
+          }else{
+            console.log("Error when fetching profile updates: " +res.data);
+          }
+        })
+        .catch(err=>{
+          console.log(err);
+        });
+      }else{
+        // when modal was closed without submitting request
+      }
+      this.showModal=false;
+     
+    },
 
+    showEditProfilModal() {
+      this.showModal = true;
+      // after a state change, wait for the DOM updates to complete
+      Vue.nextTick(()=>{
+        this.$refs.editModal.show();
+      });
+      
+    },
 
     fetchProfilUpdates: function(){
       Vue.$fhcapi.ProfilUpdate.selectProfilRequest().then((res)=>{
@@ -149,42 +180,7 @@ export default {
         }
       });
     },
-  
-    showModal() {
 
-      EditProfil.popup({ 
-          value:JSON.parse(JSON.stringify(this.editData)),
-          zustelladressenCount:this.getZustelladressenCount,
-          zustellkontakteCount:this.getZustellkontakteCount,
-          title:"Profil bearbeiten",
-          setLoading:this.setLoading,
-
-        }).then((popup_result) => {
-          
-          if(popup_result){
-            Vue.$fhcapi.ProfilUpdate.selectProfilRequest()
-            .then((res) =>{
-              if(!res.error){
-                this.data.profilUpdates = res.data;
-                this.data.profilUpdates.sort(this.sortProfilUpdates);
-                
-              }else{
-                console.log("Error when fetching profile updates: " +res.data);
-              }
-            })
-            .catch(err=>{
-              console.log(err);
-            });
-          }
-        }).catch((e) => {
-          console.log("catch");
-          // Wenn der User das Modal abbricht ohne Änderungen
-         
-        });
-    },
-  
-    
-    
   },
 
   computed: {
@@ -244,7 +240,7 @@ export default {
 
   template: /*html*/` 
   <div class="container-fluid text-break fhc-form"  >
-    
+    <edit-profil v-if="showModal" ref="editModal" @hideBsModal="hideEditProfilModal" :value="JSON.parse(JSON.stringify(editData))" title="Profil bearbeiten"></edit-profil>
           <div class="row">
           
               <div  class="d-md-none col-12 ">
@@ -260,7 +256,7 @@ export default {
 
               <div class="row mb-3 ">
               <div class="col">
-              <button @click="showModal" type="button" class="text-start  w-100 btn btn-outline-secondary" >
+              <button @click="showEditProfilModal" type="button" class="text-start  w-100 btn btn-outline-secondary" >
                 <div class="row">
                   <div class="col-auto">
                     <i class="fa fa-edit"></i>
@@ -423,7 +419,7 @@ export default {
 
                 <div class="row d-none d-md-block ">
                 <div class="col mb-3">
-                <button @click="showModal" type="button" class="text-start  w-100 btn btn-outline-secondary" >
+                <button @click="showEditProfilModal" type="button" class="text-start  w-100 btn btn-outline-secondary" >
                   <div class="row">
                     <div class="col-auto">
                       <i class="fa fa-edit"></i>
diff --git a/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js b/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
index 626a6e0cb..8ddc12fe2 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
@@ -10,7 +10,7 @@ export default {
             default: false,
         },
     },
-    inject:["zustellAdresseCount"],
+    inject:["getZustelladressenCount"],
     data(){
         return{
             gemeinden:[],
@@ -88,7 +88,7 @@ export default {
 
 
         this.originalValue = JSON.stringify(this.data);
-        this.zustellAdressenCount = this.zustellAdresseCount();
+        this.zustellAdressenCount = this.getZustelladressenCount();
         
     },       
     
diff --git a/public/js/components/Cis/Profil/ProfilComponents/EditKontakt.js b/public/js/components/Cis/Profil/ProfilComponents/EditKontakt.js
index c042891b8..06368c097 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/EditKontakt.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/EditKontakt.js
@@ -12,7 +12,7 @@ export default {
            
         }
     },
-    inject:["zustellKontaktCount"],
+    inject:["getZustellkontakteCount"],
     methods:{
         updateValue: function(event,bind){
 
@@ -54,7 +54,7 @@ export default {
 
        
         this.originalValue = JSON.stringify(this.data);
-        this.zustellKontakteCount = this.zustellKontaktCount();
+        this.zustellKontakteCount = this.getZustellkontakteCount();
     },
     template:
     /*html*/
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index 735007ed5..f26920479 100755
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -22,12 +22,13 @@ export default {
     RoleInformation,
     ProfilInformation,
     FetchProfilUpdates,
+    EditProfil
 
   },
-  inject:['sortProfilUpdates','collapseFunction','getZustellkontakteCount','getZustelladressenCount','setLoading'],
+  inject:['sortProfilUpdates','collapseFunction'],
   data() {
     return {
-      
+      showModal: false,
       collapseIconBetriebsmittel: true,
       zutrittsgruppen_table_options: {
         height: 200,
@@ -92,30 +93,37 @@ export default {
       });
     },
     
-    showModal() {
-
-      EditProfil.popup({ 
-          value:JSON.parse(JSON.stringify(this.editData)),
-          title:"Profil bearbeiten",
-          zustelladressenCount:this.getZustelladressenCount,
-          zustellkontakteCount:this.getZustellkontakteCount,
-          setLoading:this.setLoading,
-        }).then((popup_result) => {
-          if(popup_result){
-            Vue.$fhcapi.ProfilUpdate.selectProfilRequest()
-            .then((res) =>{
-              if(!res.error){
-                this.data.profilUpdates = res.data.sort(this.sortProfilUpdates);
-              }else{
-                alert("Error when fetching profile updates: " +res.data);
-              }
-            })
-            .catch(err=>alert(err));
+    hideEditProfilModal: function(){
+      
+      //? checks the editModal component property result, if the user made a successful request or not
+      if(this.$refs.editModal.result){
+        Vue.$fhcapi.ProfilUpdate.selectProfilRequest()
+        .then((request) =>{
+          if(!request.error){
+            this.data.profilUpdates = request.data;
+            this.data.profilUpdates.sort(this.sortProfilUpdates);
+            
+          }else{
+            console.log("Error when fetching profile updates: " +res.data);
           }
-        }).catch((e) => {
-          // Wenn der User das Modal abbricht ohne Änderungen
-         
+        })
+        .catch(err=>{
+          console.log(err);
         });
+      }else{
+        // when modal was closed without submitting request
+      }
+      this.showModal=false;
+     
+    },
+
+    showEditProfilModal() {
+      this.showModal = true;
+      // after a state change, wait for the DOM updates to complete
+      Vue.nextTick(()=>{
+        this.$refs.editModal.show();
+      });
+      
     },
    
   },
@@ -185,6 +193,7 @@ export default {
   template:/*html*/ ` 
 
   <div class="container-fluid text-break fhc-form"  >
+  <edit-profil v-if="showModal" ref="editModal" @hideBsModal="hideEditProfilModal" :value="JSON.parse(JSON.stringify(editData))" title="Profil bearbeiten" ></edit-profil>
     <!-- ROW --> 
           <div class="row">
           <!-- HIDDEN QUICK LINKS -->
@@ -201,7 +210,7 @@ export default {
   
               <div class="row ">
               <div class="col mb-3">
-              <button @click="showModal" type="button" class="text-start  w-100 btn btn-outline-secondary" >
+              <button @click="showEditProfilModal" type="button" class="text-start  w-100 btn btn-outline-secondary" >
                 <div class="row">
                   <div class="col-2">
                     <i class="fa fa-edit"></i>
@@ -387,7 +396,7 @@ export default {
   
                 <div class="row d-none d-md-block">
                 <div class="col mb-3">
-                <button @click="showModal" type="button" class="text-start  w-100 btn btn-outline-secondary" >
+                <button @click="showEditProfilModal" type="button" class="text-start  w-100 btn btn-outline-secondary" >
                   <div class="row">
                     <div class="col-2">
                       <i class="fa fa-edit"></i>

From b1411549f31f912ac4289d18676345142440a43a Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 7 Mar 2024 11:14:58 +0100
Subject: [PATCH 0463/1461] better folder structure for Cis Profil

---
 public/js/components/Cis/Profil/MitarbeiterProfil.js |  2 +-
 .../Profil/ProfilComponents/FetchProfilUpdates.js    |  2 +-
 .../Cis/Profil/{ => ProfilModal}/EditProfil.js       |  6 +++---
 .../EditProfilComponents}/EditAdresse.js             |  0
 .../EditProfilComponents}/EditKontakt.js             |  0
 .../EditProfilComponents}/Status.js                  |  4 ++--
 .../EditProfilComponents}/TextInputDokument.js       |  2 +-
 .../Cis/Profil/{ => ProfilModal}/EditProfilSelect.js | 12 ++++++------
 public/js/components/Cis/Profil/StudentProfil.js     |  2 +-
 9 files changed, 15 insertions(+), 15 deletions(-)
 rename public/js/components/Cis/Profil/{ => ProfilModal}/EditProfil.js (97%)
 rename public/js/components/Cis/Profil/{ProfilComponents => ProfilModal/EditProfilComponents}/EditAdresse.js (100%)
 rename public/js/components/Cis/Profil/{ProfilComponents => ProfilModal/EditProfilComponents}/EditKontakt.js (100%)
 rename public/js/components/Cis/Profil/{ProfilComponents => ProfilModal/EditProfilComponents}/Status.js (95%)
 rename public/js/components/Cis/Profil/{ProfilComponents => ProfilModal/EditProfilComponents}/TextInputDokument.js (98%)
 rename public/js/components/Cis/Profil/{ => ProfilModal}/EditProfilSelect.js (92%)

diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index b9be77463..aa4467ce8 100755
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -1,6 +1,6 @@
 
 import { CoreFilterCmpt } from "../../../components/filter/Filter.js";
-import EditProfil from "./EditProfil.js";
+import EditProfil from "./ProfilModal/EditProfil.js";
 import Adresse from "./ProfilComponents/Adresse.js";
 import Kontakt from "./ProfilComponents/Kontakt.js";
 import FetchProfilUpdates from "./ProfilComponents/FetchProfilUpdates.js";
diff --git a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
index add17735e..373b3f22c 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
@@ -1,4 +1,4 @@
-import EditProfil from "../EditProfil.js";
+import EditProfil from "../ProfilModal/EditProfil.js";
 //? EditProfil is the modal used to edit the profil updates
 export default {
   props: {
diff --git a/public/js/components/Cis/Profil/EditProfil.js b/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
similarity index 97%
rename from public/js/components/Cis/Profil/EditProfil.js
rename to public/js/components/Cis/Profil/ProfilModal/EditProfil.js
index 56082ec34..db94c7cf1 100755
--- a/public/js/components/Cis/Profil/EditProfil.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
@@ -1,7 +1,7 @@
-import BsModal from "../../Bootstrap/Modal.js";
-import Alert from "../../Bootstrap/Alert.js";
+import BsModal from "../../../Bootstrap/Modal.js";
+import Alert from "../../../Bootstrap/Alert.js";
 import EditProfilSelect from "./EditProfilSelect.js";
-import Loader from "../../../components/Loader.js"
+import Loader from "../../../Loader.js"
 
 export default {
   components: {
diff --git a/public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js
similarity index 100%
rename from public/js/components/Cis/Profil/ProfilComponents/EditAdresse.js
rename to public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js
diff --git a/public/js/components/Cis/Profil/ProfilComponents/EditKontakt.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditKontakt.js
similarity index 100%
rename from public/js/components/Cis/Profil/ProfilComponents/EditKontakt.js
rename to public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditKontakt.js
diff --git a/public/js/components/Cis/Profil/ProfilComponents/Status.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/Status.js
similarity index 95%
rename from public/js/components/Cis/Profil/ProfilComponents/Status.js
rename to public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/Status.js
index 488a71b16..5322e00f0 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/Status.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/Status.js
@@ -1,5 +1,5 @@
-import Adresse from "./Adresse.js";
-import Kontakt from "./Kontakt.js";
+import Adresse from "../../ProfilComponents/Adresse.js";
+import Kontakt from "../../ProfilComponents/Kontakt.js";
 
 export default {
   components: {
diff --git a/public/js/components/Cis/Profil/ProfilComponents/TextInputDokument.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/TextInputDokument.js
similarity index 98%
rename from public/js/components/Cis/Profil/ProfilComponents/TextInputDokument.js
rename to public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/TextInputDokument.js
index b050d3ebd..268751521 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/TextInputDokument.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/TextInputDokument.js
@@ -1,4 +1,4 @@
-import Dms from "../../../Form/Upload/Dms.js";
+import Dms from "../../../../Form/Upload/Dms.js";
 
 export default {
   data() {
diff --git a/public/js/components/Cis/Profil/EditProfilSelect.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilSelect.js
similarity index 92%
rename from public/js/components/Cis/Profil/EditProfilSelect.js
rename to public/js/components/Cis/Profil/ProfilModal/EditProfilSelect.js
index ebf61f2ff..3028384e2 100755
--- a/public/js/components/Cis/Profil/EditProfilSelect.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfilSelect.js
@@ -1,9 +1,9 @@
-import Kontakt from "./ProfilComponents/Kontakt.js";
-import EditKontakt from "./ProfilComponents/EditKontakt.js";
-import Adresse from "./ProfilComponents/Adresse.js";
-import EditAdresse from "./ProfilComponents/EditAdresse.js";
-import Status from "./ProfilComponents/Status.js";
-import TextInputDokument from "./ProfilComponents/TextInputDokument.js";
+import Kontakt from "../ProfilComponents/Kontakt.js";
+import EditKontakt from "./EditProfilComponents/EditKontakt.js";
+import Adresse from "../ProfilComponents/Adresse.js";
+import EditAdresse from "./EditProfilComponents/EditAdresse.js";
+import Status from "./EditProfilComponents/Status.js";
+import TextInputDokument from "./EditProfilComponents/TextInputDokument.js";
 
 export default {
   components: {
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index f26920479..821b4b960 100755
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -8,7 +8,7 @@ import ProfilEmails from "./ProfilComponents/ProfilEmails.js";
 import RoleInformation from "./ProfilComponents/RoleInformation.js";
 import ProfilInformation from "./ProfilComponents/ProfilInformation.js";
 import FetchProfilUpdates from "./ProfilComponents/FetchProfilUpdates.js";
-import EditProfil from "./EditProfil.js";
+import EditProfil from "./ProfilModal/EditProfil.js";
 
 export default {
   components: {

From 7eda02f366bb25d84176f5c0c76edf500faed711 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 7 Mar 2024 11:46:05 +0100
Subject: [PATCH 0464/1461] adds include variable tabulator5JQuery to
 FHC-Common.php

---
 application/views/templates/FHC-Common.php | 1 +
 application/views/templates/FHC-Footer.php | 2 +-
 public/js/TableWidget.js                   | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/application/views/templates/FHC-Common.php b/application/views/templates/FHC-Common.php
index 072ff1d7f..dd399f354 100644
--- a/application/views/templates/FHC-Common.php
+++ b/application/views/templates/FHC-Common.php
@@ -23,6 +23,7 @@
 	$tablesorter2 = isset($tablesorter2) ? $tablesorter2 : false;
 	$tabulator4 = isset($tabulator4) ? $tabulator4 : false;
 	$tabulator5 = isset($tabulator5) ? $tabulator5 : false;
+	$tabulator5JQuery = isset($tabulator5JQuery) ? $tabulator5JQuery : false;
 	$tinymce3 = isset($tinymce3) ? $tinymce3 : false;
 	$tinymce5 = isset($tinymce5) ? $tinymce5 : false;
 	$vue3 = isset($vue3) ? $vue3 : false;
diff --git a/application/views/templates/FHC-Footer.php b/application/views/templates/FHC-Footer.php
index 1fca0df2b..c17e49de7 100644
--- a/application/views/templates/FHC-Footer.php
+++ b/application/views/templates/FHC-Footer.php
@@ -99,7 +99,7 @@
 
 	// Tabulator 5 JS
 	if ($tabulator5 === true) generateJSsInclude('vendor/olifolkerd/tabulator5/dist/js/tabulator.min.js');
-
+	// Tabulator 5 JQuery
 	if ($tabulator5JQuery === true) generateJSsInclude('vendor/olifolkerd/tabulator5/dist/js/jquery_wrapper.js');
 	// Tinymce 3 JS
 	if ($tinymce3 === true) generateJSsInclude('include/tiny_mce/tiny_mce.js');
diff --git a/public/js/TableWidget.js b/public/js/TableWidget.js
index 1d0b36405..e5a510b22 100644
--- a/public/js/TableWidget.js
+++ b/public/js/TableWidget.js
@@ -562,6 +562,8 @@ var FHC_TableWidget = {
 
 				// Renders the tabulator
 				tableWidgetDiv.find("#tableWidgetTabulator").tabulator(options);
+				tableWidgetDiv.find("#tableWidgetTabulator").tabulator("on","tableBuilt",()=>{console.log("table build")});
+				
 				
 			}
 		}

From 3a9f6a0edd1744b06c951c4c81757d13210acb30 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 7 Mar 2024 14:20:46 +0100
Subject: [PATCH 0465/1461] check Meldestichtag, update function
 getHistoryPrestudent

---
 .../controllers/components/stv/Status.php     | 83 +++++++++++++++++-
 .../models/codex/Bismeldestichtag_model.php   | 72 ++++++++++++++++
 application/models/crm/Prestudent_model.php   | 84 ++++++-------------
 .../models/crm/Prestudentstatus_model.php     |  4 +-
 4 files changed, 177 insertions(+), 66 deletions(-)

diff --git a/application/controllers/components/stv/Status.php b/application/controllers/components/stv/Status.php
index d29c32982..ec46d7d16 100644
--- a/application/controllers/components/stv/Status.php
+++ b/application/controllers/components/stv/Status.php
@@ -78,6 +78,8 @@ class Status extends FHC_Controller
 		$granted_Adm = $this->permissionlib->getSTG_isEntitledFor('admin') ? $this->permissionlib->getSTG_isEntitledFor('admin') : [];
 		$granted = array_merge($granted_Ass, $granted_Adm);
 
+		$isStudent = false;
+
 		if(!in_array($stg, $granted)){
 			$result = "Sie haben keine Schreibrechte fuer diesen Studiengang!";
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
@@ -142,7 +144,7 @@ class Status extends FHC_Controller
 		}
 
 
-		//Check ob Reihungstest berücksichtigt werden soll
+		//Check Reihungstest
 		if(REIHUNGSTEST_CHECK)
 		{
 			if($status_kurzbz=='Bewerber' && !$reihungstest_angetreten)
@@ -218,6 +220,10 @@ class Status extends FHC_Controller
 				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 				return $this->outputJson($result->code);
 			}
+			if($result->retval != "0")
+			{
+				$isStudent = true;
+			}
 		}
 
 		//TODO(Manu) check permission...
@@ -243,6 +249,25 @@ class Status extends FHC_Controller
 				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 				return $this->outputJson(getError($result));
 			}
+
+			//check if Bismeldestichtag erreicht
+			$this->load->model('codex/Bismeldestichtag_model', 'BismeldestichtagModel');
+			$result = $this->BismeldestichtagModel->checkIfMeldestichtagErreicht($new_status_datum);
+			if (isError($result))
+			{
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return $this->outputJson(getError($result));
+			}
+			if($result->retval == "1")
+			{
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return $this->outputJson(getError($result->code));
+			}
+/*			if($result->retval == "0")
+			{
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return $this->outputJson($result->code);
+			}*/
 		}
 
 		// Start DB transaction
@@ -276,11 +301,61 @@ class Status extends FHC_Controller
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 			return $this->outputJson(getError($result));
 		}
-		else
+
+		if($isStudent)
 		{
-			$this->db->trans_commit();
-			return $this->outputJsonSuccess(true);
+			//Studentlehrverband anlegen
+			$this->load->model('crm/Student_model', 'StudentModel');
+			$result = $this->StudentModel->checkIfUid($prestudent_id);
+			if (isError($result)) {
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return $this->outputJson(getError($result));
+			}
+			$student_uid = $result->retval;
+
+			//check if Lehrverband exists
+			$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
+			$result = $this->StudentlehrverbandModel->checkIfLehrverbandExists($student_uid, $studiensemester_kurzbz);
+			if (isError($result)) {
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return $this->outputJson(getError($result));
+			}
+			if ($result->retval == "0") {
+				//load Data Lehrverband
+				$result = $this->StudentlehrverbandModel->load(
+					[
+						'student_uid' => $student_uid,
+						'studiensemester_kurzbz' => $studiensemester_kurzbz
+					]);
+				if (isError($result)) {
+					$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+
+					return $this->outputJson("Error in insert Studentlehrverband");
+				}
+				$lvbData = current(getData($result));
+
+				$result = $this->StudentlehrverbandModel->insert(
+					[
+						'student_uid' => $student_uid,
+						'studiensemester_kurzbz' => $studiensemester_kurzbz,
+						'semester' => $ausbildungssemester,
+						'verband' => $lvbData->verband,
+						'gruppe' => $lvbData->gruppe,
+						'insertamum' => date('c'),
+						'insertvon' => $uid,
+						'studiengang_kz' => $lvbData->studiengang_kz
+					]);
+				if (isError($result)) {
+					$this->db->trans_rollback();
+					$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+
+					return $this->outputJson("Error in insert Studentlehrverband");
+				}
+			}
 		}
+		$this->db->trans_commit();
+		return $this->outputJsonSuccess(true);
+
 	}
 
 	public function loadStatus()
diff --git a/application/models/codex/Bismeldestichtag_model.php b/application/models/codex/Bismeldestichtag_model.php
index 1a45f0fbd..e0491de01 100644
--- a/application/models/codex/Bismeldestichtag_model.php
+++ b/application/models/codex/Bismeldestichtag_model.php
@@ -11,4 +11,76 @@ class Bismeldestichtag_model extends DB_Model
 		$this->dbTable = 'bis.tbl_bismeldestichtag';
 		$this->pk = 'meldestichtag_id';
 	}
+
+	public function getLastReachedMeldestichtag($studiensemester_kurzbz = null)
+	{
+		$qry = "
+				SELECT
+					meldestichtag_id, meldestichtag, studiensemester_kurzbz, insertamum, insertvon, updateamum, updatevon
+				FROM
+					bis.tbl_bismeldestichtag
+				WHERE
+					meldestichtag < NOW()
+		";
+
+		if (isset($studiensemester_kurzbz))
+		{
+			$qry .=	"
+				AND
+					studiensemester_kurzbz= ?";
+		}
+
+		$qry .= "
+				ORDER BY
+					meldestichtag DESC
+				LIMIT 1;";
+
+		$result = $this->execQuery($qry, array($studiensemester_kurzbz));
+
+		if (isError($result))
+		{
+			return error($result);
+		}
+		if (!hasData($result)) {
+			return success("0",'Kein Meldestichtag vorhanden');
+		}
+		return $result;
+
+	}
+
+	/**
+	 * Prüft, ob Meldestichtag für ein bestimmtes Statusdatum und Studiensemester erreicht ist.
+	 *
+	 * @param $status_datum
+	 * @return boolean true wenn erreicht, oder false
+	 */
+	public function checkIfMeldestichtagErreicht($status_datum)
+	{
+		$erreicht = false;
+		// letztes erreichtes Bismeldedatum holen
+		$result = $this->getLastReachedMeldestichtag();
+		if (isError($result))
+		{
+			return error($result);
+		}
+		if (!hasData($result)) {
+			return success("0",'No Statusdata vorhanden');
+		}
+		$stichtag = current(getData($result));
+		$stichtag = $stichtag->meldestichtag;
+		var_dump($status_datum . " < " . $stichtag . "?");
+
+		// Prüfen, ob Studentstatusdatum oder Studiensemester vor dem Stichtagsdatum liegen
+		if (isset($statusDatum))
+		{
+			if (isset($stichtag))
+				$erreicht = $statusDatum < $stichtag;
+		}
+
+		if($erreicht)
+			return success("1", "Studentstatus mit Datum oder Semesterende vor erreichtem Meldestichtag können nicht hinzugefügt werden");
+
+		return success("0", "Meldestatus nicht erreicht");
+	}
+
 }
diff --git a/application/models/crm/Prestudent_model.php b/application/models/crm/Prestudent_model.php
index 1938e661a..e045eaf84 100644
--- a/application/models/crm/Prestudent_model.php
+++ b/application/models/crm/Prestudent_model.php
@@ -734,58 +734,15 @@ class Prestudent_model extends DB_Model
 	 */
 	public function getHistoryPrestudent($prestudent_id)
 	{
-		//TODO(Manu) refactor
-		$this->load->model('crm/Student_model', 'StudentModel');
-
-		$result = $this->StudentModel->checkIfUID($prestudent_id);
-
-		if(isError($result))
-		{
-			return getData($result);
-		}
-		if($result->retval == "0") //wenn kein studentlehrband eingetragen
-		{
-			$query = "
-			SELECT 
-				ps.status_kurzbz, 
-				ps.studiensemester_kurzbz, 
-				ps.ausbildungssemester,
-				ps.datum, 
-				TO_CHAR(ps.datum::timestamp, 'DD.MM.YYYY') AS format_datum,
-				sp.bezeichnung, 
-				ps.bestaetigtam, 
-				TO_CHAR(ps.bestaetigtam::timestamp, 'DD.MM.YYYY') AS format_bestaetigtam,
-				ps.bewerbung_abgeschicktamum,
-				TO_CHAR(ps.bewerbung_abgeschicktamum::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS format_bewerbung_abgeschicktamum,
-				stg.statusgrund_kurzbz,
-				ps.orgform_kurzbz,
-				ps.prestudent_id,
-				sp.studienplan_id,
-				ps.anmerkung,
-				ps.bestaetigtvon,
-				ps.insertamum,
-				TO_CHAR(ps.insertamum::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS format_insertamum,
-				ps.insertvon,
-				ps.updateamum,
-				TO_CHAR(ps.updateamum::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS format_updateamum,
-				ps.updatevon
-			FROM public.tbl_prestudentstatus ps
-			LEFT JOIN public.tbl_student st USING (prestudent_id)
-			LEFT JOIN public.tbl_studiengang sg ON (st.studiengang_kz = sg.studiengang_kz)
-			LEFT JOIN lehre.tbl_studienplan sp USING (studienplan_id)
-			LEFT JOIN public.tbl_status_grund stg USING (statusgrund_id)
-			WHERE prestudent_id = ?
-			ORDER BY datum DESC		
-		";
-		}
-		else
-		{
-			$query = "
-				SELECT 
+		$query = "
+					SELECT 
 					ps.status_kurzbz, 
 					ps.studiensemester_kurzbz, 
-					ps.ausbildungssemester, 
-					CASE WHEN ps.status_kurzbz IN ('Student', 'Diplomand') THEN CONCAT(lv.semester, lv.verband, lv.gruppe) END AS lehrverband, 
+					ps.ausbildungssemester,
+					CASE WHEN ps.status_kurzbz IN ('Student', 'Diplomand')
+					THEN CONCAT(lv.semester, lv.verband, lv.gruppe)
+					ELSE ''
+					END AS lehrverband, 
 					ps.datum, 
 					TO_CHAR(ps.datum::timestamp, 'DD.MM.YYYY') AS format_datum,
 					sp.bezeichnung, 
@@ -804,19 +761,26 @@ class Prestudent_model extends DB_Model
 					ps.insertvon,
 					ps.updateamum,
 					TO_CHAR(ps.updateamum::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS format_updateamum,
-					ps.updatevon
-				FROM public.tbl_prestudentstatus ps
-				JOIN public.tbl_student st USING (prestudent_id)
-				JOIN public.tbl_studentlehrverband lv ON (st.student_uid = lv.student_uid)
-				JOIN public.tbl_studiengang sg ON (lv.studiengang_kz = sg.studiengang_kz)
-				LEFT JOIN lehre.tbl_studienplan sp USING (studienplan_id)
-				LEFT JOIN public.tbl_status_grund stg USING (statusgrund_id)
+					ps.updatevon 
+				FROM 
+					public.tbl_prestudentstatus ps
+				JOIN 
+					public.tbl_student st USING (prestudent_id)
+				JOIN 
+					public.tbl_studiengang sg ON (st.studiengang_kz = sg.studiengang_kz)
+				LEFT JOIN 
+					lehre.tbl_studienplan sp USING (studienplan_id) 
+				LEFT JOIN 
+					public.tbl_status_grund stg USING (statusgrund_id) 
+				LEFT JOIN 
+					public.tbl_studentlehrverband lv ON 
+						(st.student_uid = lv.student_uid 
+							 AND st.student_uid IS NOT NULL 
+							 AND lv.studiensemester_kurzbz = ps.studiensemester_kurzbz)
 				WHERE prestudent_id = ?
-				and lv.studiensemester_kurzbz = ps.studiensemester_kurzbz
 				ORDER BY datum DESC
-			";
+		";
 
-		}
 		return $this->execQuery($query, array($prestudent_id));
 	}
 }
diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php
index 593a13452..d3f99801c 100644
--- a/application/models/crm/Prestudentstatus_model.php
+++ b/application/models/crm/Prestudentstatus_model.php
@@ -593,7 +593,7 @@ class Prestudentstatus_model extends DB_Model
 				isset($next_status) && $curr_status_kurzbz == 'Diplomand' && $next_status->status_kurzbz == 'Student'
 			)
 			{
-				return error("Nach Diplomantenstatus darf kein Studentenstatus mehr eingetragen werden");
+				return error("Nach Diplomandenstatus darf kein Studentenstatus mehr eingetragen werden");
 			}
 
 		}
@@ -611,7 +611,7 @@ class Prestudentstatus_model extends DB_Model
 		$isNewStatus =  $old_status_studiensemester_kurzbz == '' && $old_status_ausbildungssemester == '';
 
 		$qry = "
-		SELECT public.tbl_prestudentstatus.status_kurzbz, 
+				SELECT public.tbl_prestudentstatus.status_kurzbz, 
 				public.tbl_prestudentstatus.studiensemester_kurzbz, 
 				public.tbl_prestudentstatus.ausbildungssemester, 
 				public.tbl_prestudentstatus.datum, 

From 1b65f6f4e6b1793550ed3094485828e51a0b1427 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 7 Mar 2024 14:48:11 +0100
Subject: [PATCH 0466/1461] trying to add callbacks after the tabulator called
 the tableBuilt event with jquery

---
 .../approveAnrechnungUebersicht.php           |  2 +-
 .../approveAnrechnungUebersichtData.php       |  2 +-
 public/js/TableWidget.js                      |  2 +-
 .../anrechnung/approveAnrechnungUebersicht.js | 47 +++++++++----------
 4 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php b/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php
index 71e4ac1e7..ad46b72fd 100644
--- a/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php
+++ b/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php
@@ -132,7 +132,7 @@ $this->load->view(
             </div>
         </div>
         <!-- Tabelle -->
-        <div class="row">
+        <div class="row mb-4">
             <div class="col-12">
                 <?php $this->load->view('lehre/anrechnung/approveAnrechnungUebersichtData.php'); ?>
             </div>
diff --git a/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php b/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
index 2eb7acb9a..54453bc8e 100644
--- a/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
+++ b/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
@@ -216,7 +216,7 @@ $filterWidgetArray = array(
         selectablePersistence:false,    // deselect previously selected rows when table is filtered, sorted or paginated
         tableBuilt: function(){
 			
-            //func_tableBuilt(this);
+            func_tableBuilt(this);
         },
         tableWidgetFooter: {
 			selectButtons: false
diff --git a/public/js/TableWidget.js b/public/js/TableWidget.js
index e5a510b22..338925fc1 100644
--- a/public/js/TableWidget.js
+++ b/public/js/TableWidget.js
@@ -562,7 +562,7 @@ var FHC_TableWidget = {
 
 				// Renders the tabulator
 				tableWidgetDiv.find("#tableWidgetTabulator").tabulator(options);
-				tableWidgetDiv.find("#tableWidgetTabulator").tabulator("on","tableBuilt",()=>{console.log("table build")});
+				//tableWidgetDiv.find("#tableWidgetTabulator").tabulator("on","tableBuilt",()=>{console.log("table build")});
 				
 				
 			}
diff --git a/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js b/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
index bd7423671..2f4a4dafe 100644
--- a/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
+++ b/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
@@ -19,12 +19,6 @@ var selectedPrestudentWithAccumulatedLvEcts = [];
 
 
 
-let ttw = $('div[tableUniqueId="approveAnrechnungUebersicht"]');
-ttw.tabulator("on","tableBuilt", function(){
-    console.log("this is just a test");
-});
-
-
 
 // -----------------------------------------------------------------------------------------------------------------
 // Mutators - setter methods to manipulate table data when entering the tabulator
@@ -79,22 +73,20 @@ function func_tableBuilt(table) {
     // Store table in global var
     tabulator = table;
 
-    table.addColumn(
-        {
-            title: "Details",
-            field: 'details',
-            align: "center",
-            width: 100,
-            formatter: "link",
-            formatterParams:{
-                label:"Details",
-                url:function(cell){
-                    return  BASE_URL + "/" + APPROVE_ANRECHNUNG_DETAIL_URI + "?anrechnung_id=" + cell.getData().anrechnung_id
-                },
-                target:"_blank"
-            }
-        }, true  // place column on the very left
-    );
+    table.tabulator("addColumn",{
+        title: "Details",
+        field: 'details',
+        align: "center",
+        width: 100,
+        formatter: "link",
+        formatterParams:{
+            label:"Details",
+            url:function(cell){
+                return  BASE_URL + "/" + APPROVE_ANRECHNUNG_DETAIL_URI + "?anrechnung_id=" + cell.getData().anrechnung_id
+            },
+            target:"_blank"
+        }
+    }, true);   // place column on the very left
 
     // Set focus on filterbutton
     let filters = table.getFilters();
@@ -252,13 +244,20 @@ function tableWidgetHook_selectAllButton(tableWidgetDiv){
 }
 
 
-$(function(){
 
+
+$(function(){
     const genehmigung_panel = $('#approveAnrechnungUebersicht-genehmigung-panel');
     const begruendung_panel = $('#approveAnrechnungUebersicht-begruendung-panel');
     const hasReadOnlyAccess = $('#formApproveAnrechnungUebersicht').data('readonly');
     const hasCreateAnrechnungAccess = $('#formApproveAnrechnungUebersicht').data('createaccess');
 
+
+
+
+    var tab = $('div[tableUniqueId="approveAnrechnungUebersicht"]'); 
+    tab.on("tableBuilt",()=>func_tableBuilt(tab));
+
     // Pruefen ob Promise unterstuetzt wird
     // Tabulator funktioniert nicht mit IE
     var canPromise = !! window.Promise;
@@ -363,7 +362,7 @@ $(function(){
 
         begruendung_panel.css('display', 'none');
 
-        if (genehmigung_panel.is(":hidden"))
+        if (genehmigung_panel.is(":hidden")) 
         {
             // Show begruendung panel if is hidden
             genehmigung_panel.slideDown(400, function() {

From aa7982fea9e496b6e6bbe51aaf22583a13249e0a Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 8 Mar 2024 12:34:26 +0100
Subject: [PATCH 0467/1461] adds jquery adjustments

---
 .../approveAnrechnungUebersicht.php           |  2 +-
 .../approveAnrechnungUebersichtData.php       | 15 +++---
 .../anrechnung/approveAnrechnungUebersicht.js | 47 ++++++++++++++-----
 3 files changed, 43 insertions(+), 21 deletions(-)

diff --git a/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php b/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php
index ad46b72fd..b9972539b 100644
--- a/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php
+++ b/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php
@@ -96,7 +96,7 @@ $this->load->view(
     <div class="container-fluid">
         <!-- header -->
         <div class="row">
-            <div class="col-12 mt-5 mb-3 pb-2 border-bottom">
+            <div class="col-12 mt-4 mb-2 page-header border-bottom">
                 <h3 class="fw-normal ">
 					<?php echo $this->p->t('anrechnung', 'anrechnungenGenehmigen'); ?>
                     <small class="text-secondary fs-6">| <?php echo ucfirst($this->p->t('global', 'uebersicht')); ?></small>
diff --git a/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php b/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
index 54453bc8e..879fe12b6 100644
--- a/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
+++ b/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
@@ -214,10 +214,7 @@ $filterWidgetArray = array(
         selectable: true,               // allow row selection
         selectableRangeMode: "click",   // allow range selection using shift end click on end of range
         selectablePersistence:false,    // deselect previously selected rows when table is filtered, sorted or paginated
-        tableBuilt: function(){
-			
-            func_tableBuilt(this);
-        },
+        
         tableWidgetFooter: {
 			selectButtons: false
 		},
@@ -227,10 +224,12 @@ $filterWidgetArray = array(
         rowFormatter:function(row){
             func_rowFormatter(row,this);
         },
-        rowSelectionChanged:function(data, rows){
-            func_rowSelectionChanged(data, rows);
-        },
-        tooltips: function(cell){
+		columnDefaults:{
+			tooltip:true,
+		}
+		//! not working
+		columnDefaults:{
+        tooltip:function(e, cell, onRendered){
             return func_tooltips(cell);
         }
 	 }', // tabulator properties
diff --git a/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js b/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
index 2f4a4dafe..ed03cfa71 100644
--- a/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
+++ b/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
@@ -73,7 +73,8 @@ function func_tableBuilt(table) {
     // Store table in global var
     tabulator = table;
 
-    table.tabulator("addColumn",{
+
+    table.find("#tableWidgetTabulator").tabulator("addColumn",{
         title: "Details",
         field: 'details',
         align: "center",
@@ -89,7 +90,8 @@ function func_tableBuilt(table) {
     }, true);   // place column on the very left
 
     // Set focus on filterbutton
-    let filters = table.getFilters();
+   
+    let filters = table.find("#tableWidgetTabulator").tabulator("getFilters");
     if (filters.length > 0){
         approveAnrechnung.focusFilterbuttonIfTableStartsWithStoredFilter(filters);
     }
@@ -181,18 +183,21 @@ function func_selectableCheck(row){
 // Calculate dynamically sum of all LV ECTS by Student and display, when maximum ECTS are exceeded.
 // data = selected data, rows = selected rows
 function func_rowSelectionChanged(data, rows){
-
+    
     if (tabulator != null)
     {
         // Sum up over all anzurechnenden LV-ECTS by Prestudent
         selectedPrestudentWithAccumulatedLvEcts = approveAnrechnung.getSumLvEctsByPreStudent(data);
 
         // Loop through all active rows
-        var rowManager = tabulator.rowManager;
-        for (var i = 0; i < rowManager.activeRows.length; i++) {
+        var selectedRows = tabulator.find("#tableWidgetTabulator").tabulator("getSelectedRows");
+        for (var i = 0; i < selectedRows.length; i++) {
 
             // Reinitialize row -> triggers formatters.
-            rowManager.activeRows[i].reinitialize();
+            //selectedRows[i].rerenderRowCells(true);
+            //! rowManager.activeRows[i].reinitialize();
+            selectedRows[i].reformat();
+            
         }
 
         // Show number of selected rows.
@@ -202,8 +207,9 @@ function func_rowSelectionChanged(data, rows){
 
 // Returns tooltip
 function func_tooltips(cell) {
+    console.log(cell);
     // Return tooltip if row is unselectable
-    if (!func_selectableCheck(cell.getRow())){
+    if (true || !func_selectableCheck(cell.getRow())){
         return FHC_PhrasesLib.t("ui", "nichtSelektierbarAufgrundVon") + 'Status';
     }
 }
@@ -253,11 +259,28 @@ $(function(){
     const hasCreateAnrechnungAccess = $('#formApproveAnrechnungUebersicht').data('createaccess');
 
 
-
-
-    var tab = $('div[tableUniqueId="approveAnrechnungUebersicht"]'); 
-    tab.on("tableBuilt",()=>func_tableBuilt(tab));
-
+    $(document).on("tableInit", function(event, table) {
+        
+       table.find("#tableWidgetTabulator").tabulator("on","tableBuilt",()=>{
+        func_tableBuilt(table)
+        var el =$('#download-csv');
+        
+        $('#download-csv').click( function()
+			{
+                console.log("here")
+				// BOM for correct UTF-8 char output
+				table.find("#tableWidgetTabulator").tabulator("download", "csv", "data.csv", { bom:true });
+		})
+        console.log(el);
+        });
+       table.find("#tableWidgetTabulator").tabulator("on","rowSelectionChanged",func_rowSelectionChanged);
+       
+        /*  table.tabulator("on","dataLoaded", function() {
+            // do something
+            console.log("data was loaded");
+        }); */
+    });
+	
     // Pruefen ob Promise unterstuetzt wird
     // Tabulator funktioniert nicht mit IE
     var canPromise = !! window.Promise;

From a49075bcb753fae77f7fedaf2ae3a8b05117e320 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 12 Mar 2024 07:52:51 +0100
Subject: [PATCH 0468/1461] check Bismeldestichtag, refactor Lehrverband

---
 .../controllers/components/stv/Status.php     | 335 ++++++++++++------
 .../models/codex/Bismeldestichtag_model.php   |  29 +-
 .../education/Studentlehrverband_model.php    |  12 +-
 .../models/organisation/Lehrverband_model.php |  33 ++
 public/css/Studentenverwaltung.css            |   7 +
 .../Details/Prestudent/Status.js              |  77 ++--
 6 files changed, 349 insertions(+), 144 deletions(-)

diff --git a/application/controllers/components/stv/Status.php b/application/controllers/components/stv/Status.php
index ec46d7d16..80bc69e17 100644
--- a/application/controllers/components/stv/Status.php
+++ b/application/controllers/components/stv/Status.php
@@ -44,17 +44,24 @@ class Status extends FHC_Controller
 		$this->outputJson($result);
 	}
 
+	public function getLastBismeldestichtag()
+	{
+		$this->load->model('codex/Bismeldestichtag_model', 'BismeldestichtagModel');
+
+		$result = $this->BismeldestichtagModel->getLastReachedMeldestichtag();
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+		}
+		$this->outputJson($result);
+	}
+
 	public function addNewStatus($prestudent_id)
 	{
-/*		$this->load->library('form_validation');
+		$granted_Ass = $this->permissionlib->getSTG_isEntitledFor('assistenz') ? $this->permissionlib->getSTG_isEntitledFor('assistenz') : [];
+		$granted_Adm = $this->permissionlib->getSTG_isEntitledFor('admin') ? $this->permissionlib->getSTG_isEntitledFor('admin') : [];
+		$granted = array_merge($granted_Ass, $granted_Adm);
 
-
-		if ($this->form_validation->run() == false)
-		{
-			return $this->outputJsonError($this->form_validation->error_array());
-		}*/
-
-		//check rights
+		//get Studiengang von prestudent_id
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 		$this->PrestudentModel->addJoin('public.tbl_person p', 'ON (p.person_id = public.tbl_prestudent.person_id)');
 		$result = $this->PrestudentModel->load([
@@ -73,11 +80,6 @@ class Status extends FHC_Controller
 		$name = trim($result->vorname . " ". $result->nachname);
 		$zgv_code = $result->zgv_code;
 
-		//TODO(Manu) check: Annahme, dass hier immer suid bei Berechtigung STG vergeben wird!
-		$granted_Ass = $this->permissionlib->getSTG_isEntitledFor('assistenz') ? $this->permissionlib->getSTG_isEntitledFor('assistenz') : [];
-		$granted_Adm = $this->permissionlib->getSTG_isEntitledFor('admin') ? $this->permissionlib->getSTG_isEntitledFor('admin') : [];
-		$granted = array_merge($granted_Ass, $granted_Adm);
-
 		$isStudent = false;
 
 		if(!in_array($stg, $granted)){
@@ -125,10 +127,10 @@ class Status extends FHC_Controller
 		}
 
 		//Todo(manu) check if this check makes sense?
-/*		if($status_kurzbz != 'Student')
-		{
-			$ausbildungssemester = $lastStatusData->ausbildungssemester;
-		}*/
+		/*		if($status_kurzbz != 'Student')
+				{
+					$ausbildungssemester = $lastStatusData->ausbildungssemester;
+				}*/
 
 		//check if Rolle already exists
 		$result = $this->PrestudentstatusModel->checkIfExistingPrestudentRolle($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester);
@@ -226,7 +228,6 @@ class Status extends FHC_Controller
 			}
 		}
 
-		//TODO(Manu) check permission...
 		$hasPermissionToSkipStatusCheck =  $this->permissionlib->isBerechtigt('student/keine_studdatuspruefung');
 		/*		var_dump($hasPermissionToSkipStatusCheck);
 
@@ -263,13 +264,9 @@ class Status extends FHC_Controller
 				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 				return $this->outputJson(getError($result->code));
 			}
-/*			if($result->retval == "0")
-			{
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson($result->code);
-			}*/
 		}
 
+
 		// Start DB transaction
 		$this->db->trans_start(false);
 
@@ -279,9 +276,8 @@ class Status extends FHC_Controller
 				'status_kurzbz' => $status_kurzbz,
 				'bewerbung_abgeschicktamum' => $bewerbung_abgeschicktamum,
 				'studiensemester_kurzbz' => $studiensemester_kurzbz,
-				'studienplan_id' => $studienplan_id,
+				'studienplan_id' => $lastStatusData->studienplan_id,
 				'ausbildungssemester' => $ausbildungssemester,
-				'anmerkung' => $anmerkung,
 				'statusgrund_id' => $statusgrund_id,
 				'insertvon' => $uid,
 				'insertamum' => date('c'),
@@ -304,7 +300,6 @@ class Status extends FHC_Controller
 
 		if($isStudent)
 		{
-			//Studentlehrverband anlegen
 			$this->load->model('crm/Student_model', 'StudentModel');
 			$result = $this->StudentModel->checkIfUid($prestudent_id);
 			if (isError($result)) {
@@ -313,38 +308,67 @@ class Status extends FHC_Controller
 			}
 			$student_uid = $result->retval;
 
-			//check if Lehrverband exists
+			//load student
+			$result = $this->StudentModel->loadWhere(
+				array(
+					'student_uid' => $student_uid
+				)
+			);
+			if (isError($result)) {
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				$this->outputJson($result);
+			}
+			if (!hasData($result)) {
+				$this->outputJson($result);
+			}
+			$studentData = current(getData($result));
+			$verband = $studentData->verband == '' ? '' : $studentData->verband;
+			$gruppe = $studentData->gruppe == '' ? '' : $studentData->gruppe;
+
+			//check if Studentlehrverband exists
 			$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
-			$result = $this->StudentlehrverbandModel->checkIfLehrverbandExists($student_uid, $studiensemester_kurzbz);
+			$result = $this->StudentlehrverbandModel->checkIfStudentLehrverbandExists($student_uid, $studiensemester_kurzbz);
 			if (isError($result)) {
 				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 				return $this->outputJson(getError($result));
 			}
-			if ($result->retval == "0") {
-				//load Data Lehrverband
-				$result = $this->StudentlehrverbandModel->load(
-					[
-						'student_uid' => $student_uid,
-						'studiensemester_kurzbz' => $studiensemester_kurzbz
-					]);
-				if (isError($result)) {
-					$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-
-					return $this->outputJson("Error in insert Studentlehrverband");
-				}
-				$lvbData = current(getData($result));
-
+			if ($result->retval == "0")
+			{
 				$result = $this->StudentlehrverbandModel->insert(
 					[
 						'student_uid' => $student_uid,
 						'studiensemester_kurzbz' => $studiensemester_kurzbz,
 						'semester' => $ausbildungssemester,
-						'verband' => $lvbData->verband,
-						'gruppe' => $lvbData->gruppe,
+						'verband' => $verband,
+						'gruppe' => $gruppe,
 						'insertamum' => date('c'),
 						'insertvon' => $uid,
-						'studiengang_kz' => $lvbData->studiengang_kz
+						'studiengang_kz' => $studentData->studiengang_kz
 					]);
+
+				if (isError($result)) {
+					$this->db->trans_rollback();
+					$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+
+					return $this->outputJson("Error in insert Studentlehrverband");
+				}
+			}
+			else
+			{
+				$result = $this->StudentlehrverbandModel->update(
+					[
+						'student_uid' => $student_uid,
+						'studiensemester_kurzbz' => $studiensemester_kurzbz
+					],
+					[
+						'semester' => $ausbildungssemester,
+						'verband' => $verband,
+						'gruppe' => $gruppe,
+						'updateamum' => date('c'),
+						'updatevon' => $uid,
+						'studiengang_kz' => $studentData->studiengang_kz
+					]);
+
 				if (isError($result)) {
 					$this->db->trans_rollback();
 					$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
@@ -354,10 +378,12 @@ class Status extends FHC_Controller
 			}
 		}
 		$this->db->trans_commit();
-		return $this->outputJsonSuccess(true);
 
+		return $this->outputJsonSuccess(true);
 	}
 
+
+
 	public function loadStatus()
 	{
 		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
@@ -405,28 +431,28 @@ class Status extends FHC_Controller
 
 		//TODO(Manu) check permissions: warum sind beim Löschen andere Berechtigungen?
 		//ich darf keine Stati anlegen, aber löschen, wenn mehr als einer übrig???
-/*		$granted_Ass = $this->permissionlib->getSTG_isEntitledFor('assistenz');
-		$granted_Adm = $this->permissionlib->getSTG_isEntitledFor('admin');
-		$granted = array_merge($granted_Ass, $granted_Adm);
+		/*		$granted_Ass = $this->permissionlib->getSTG_isEntitledFor('assistenz');
+				$granted_Adm = $this->permissionlib->getSTG_isEntitledFor('admin');
+				$granted = array_merge($granted_Ass, $granted_Adm);
 
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-		$result = $this->PrestudentModel->load([
-			'prestudent_id'=> $prestudent_id,
-		]);
-		if(isError($result))
-		{
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson(getError($result));
-		}
-		$result = current(getData($result));
-		$stg = $result->studiengang_kz;
+				$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+				$result = $this->PrestudentModel->load([
+					'prestudent_id'=> $prestudent_id,
+				]);
+				if(isError($result))
+				{
+					$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+					return $this->outputJson(getError($result));
+				}
+				$result = current(getData($result));
+				$stg = $result->studiengang_kz;
 
-		if(!in_array($stg, $granted))
-		{
-			$result = "Sie haben keine Schreibrechte fuer diesen Studiengang!";
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson($result);
-		}*/
+				if(!in_array($stg, $granted))
+				{
+					$result = "Sie haben keine Schreibrechte fuer diesen Studiengang!";
+					$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+					return $this->outputJson($result);
+				}*/
 
 		$isBerechtigtAdmin = $this->permissionlib->isBerechtigt('admin', null, 'suid');
 		$isBerechtigtNoStudstatusCheck = $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung', null, 'suid');
@@ -564,11 +590,13 @@ class Status extends FHC_Controller
 
 	public function updateStatus($key_prestudent_id, $key_status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester)
 	{
-		//TODO(Manu) check: Annahme, dass hier immer suid bei Berechtigung STG vergeben wird!
+		$hasPermissionToSkipStatusCheck =  $this->permissionlib->isBerechtigt('student/keine_studdatuspruefung');
 		$granted_Ass = $this->permissionlib->getSTG_isEntitledFor('assistenz') ? $this->permissionlib->getSTG_isEntitledFor('assistenz') : [];
 		$granted_Adm = $this->permissionlib->getSTG_isEntitledFor('admin') ? $this->permissionlib->getSTG_isEntitledFor('admin') : [];
 		$granted = array_merge($granted_Ass, $granted_Adm);
 
+		$isStudent = false;
+
 		//get Studiengang von prestudent_id
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 		$result = $this->PrestudentModel->load([
@@ -588,6 +616,9 @@ class Status extends FHC_Controller
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 			return $this->outputJson($result);
 		}
+
+
+
 		//var_dump($key_prestudent_id, $key_status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester);
 
 		/*		$this->load->library('form_validation');
@@ -615,57 +646,134 @@ class Status extends FHC_Controller
 		$rt_stufe = $this->input->post('rt_stufe');
 		$bestaetigtvon = $uid;
 
-		// Start DB transaction
-		//$this->db->trans_start(false);
+		//check if Bismeldestichtag erreicht
+		if(!$hasPermissionToSkipStatusCheck)
+		{
+			$this->load->model('codex/Bismeldestichtag_model', 'BismeldestichtagModel');
+			$result = $this->BismeldestichtagModel->checkIfMeldestichtagErreicht($datum, $studiensemester_kurzbz);
+			if (isError($result)) {
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return $this->outputJson(getError($result));
+			}
+			if ($result->retval == "1") {
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				//return $this->outputJson(getError($result->code));
+				//Fehlermeldung überschrieben, passender
+				return $this->outputJson("Meldestichtag erreicht - Bearbeiten nicht mehr möglich");
+			}
+		}
 
 		//check if Rolle already exists
 		if(($key_studiensemester_kurzbz != $studiensemester_kurzbz)
 			|| ($key_ausbildungssemester != $ausbildungssemester))
+		{
+			$result = $this->PrestudentstatusModel->checkIfExistingPrestudentRolle($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester);
+			if (isError($result))
 			{
-				$result = $this->PrestudentstatusModel->checkIfExistingPrestudentRolle($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester);
-				if (isError($result))
-				{
-					$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-					return $this->outputJson(getError($result));
-				}
-				if($result->retval == '1')
-				{
-					$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-					return $this->outputJson($result->code);
-				}
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return $this->outputJson(getError($result));
 			}
+			if($result->retval == '1')
+			{
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return $this->outputJson($result->code);
+			}
+		}
+
+		//check if studentrolle already exists
+		if($status_kurzbz == 'Student')
+		{
+			$this->load->model('crm/Student_model', 'StudentModel');
+			$result = $this->StudentModel->checkIfExistingStudentRolle($prestudent_id);
+			if (isError($result))
+			{
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return $this->outputJson(getError($result));
+			}
+			if($result->retval == "0")
+			{
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return $this->outputJson($result->code);
+			}
+			if($result->retval != "0")
+			{
+				$isStudent = true;
+			}
+		}
 
-		//TODO(Manu) check permissions
-		$hasPermissionToSkipStatusCheck =  $this->permissionlib->isBerechtigt('student/keine_studdatuspruefung');
-		/*		var_dump($hasPermissionToSkipStatusCheck);
 
-				$basis =  $this->permissionlib->isBerechtigt('basis/prestudent');
-				var_dump($basis);*/
 		if(!$hasPermissionToSkipStatusCheck)
 		{
 			//Block STATUSCHECKS
-			//bei update wohl nicht?
-/*			$new_status_datum = isset($datum) ? $datum  : date('Y-m-d');
-			$result = $this->PrestudentstatusModel->checkDatumNewStatus($new_status_datum);
+
+			//$new_status_datum = isset($datum) ? $datum  : date('Y-m-d');
+
+			$result = $this->PrestudentstatusModel->checkIfValidStatusHistory($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $datum, $ausbildungssemester);
 			if (isError($result))
 			{
 				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 				return $this->outputJson(getError($result));
-			}*/
-
-			$new_status_datum = isset($datum) ? $datum  : date('Y-m-d');
-
-			$result = $this->PrestudentstatusModel->checkIfValidStatusHistory($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $new_status_datum, $ausbildungssemester);
-			if (isError($result))
-			{
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson(getError($result));
-				//return $this->outputJson("DEBUG: in Funktion checkIfValidStatusHistory");
 			}
-			$statusArr = $result; //wenn return result ok
-
 		}
 
+
+		// Start DB transaction
+		$this->db->trans_start(false);
+
+		if($isStudent)
+		{
+			//Studentlehrverband anlegen
+			$this->load->model('crm/Student_model', 'StudentModel');
+			$result = $this->StudentModel->checkIfUid($prestudent_id);
+			if (isError($result)) {
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return $this->outputJson(getError($result));
+			}
+			$student_uid = $result->retval;
+
+			//check if Lehrverband exists
+			$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
+			$result = $this->StudentlehrverbandModel->checkIfLehrverbandExists($student_uid, $studiensemester_kurzbz);
+			if (isError($result)) {
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return $this->outputJson(getError($result));
+			}
+			if ($result->retval == "0") {
+				//load Data Studentlehrverband
+				$result = $this->StudentlehrverbandModel->load(
+					[
+						'student_uid' => $student_uid,
+						'studiensemester_kurzbz' => $studiensemester_kurzbz
+					]);
+				if (isError($result)) {
+					$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+
+					return $this->outputJson("Error in insert Studentlehrverband");
+				}
+				$lvbData = current(getData($result));
+
+				$result = $this->StudentlehrverbandModel->insert(
+					[
+						'student_uid' => $student_uid,
+						'studiensemester_kurzbz' => $studiensemester_kurzbz,
+						'semester' => $ausbildungssemester,
+						'verband' => $lvbData->verband,
+						'gruppe' => $lvbData->gruppe,
+						'insertamum' => date('c'),
+						'insertvon' => $uid,
+						'studiengang_kz' => $lvbData->studiengang_kz
+					]);
+
+				if (isError($result))
+				{
+					$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+
+					return $this->outputJson("Error in insert Studentlehrverband");
+				}
+			}
+		}
+
+		//update status
 		$result = $this->PrestudentstatusModel->update(
 			[
 				'prestudent_id' => $key_prestudent_id,
@@ -690,20 +798,24 @@ class Status extends FHC_Controller
 				'rt_stufe' => $rt_stufe
 			]
 		);
-		if (isError($result))
+
+		// Transaction complete!
+		$this->db->trans_complete();
+
+		if ($this->db->trans_status() === false || isError($result))
 		{
+			$this->db->trans_rollback();
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 			return $this->outputJson(getError($result));
 		}
-		if (!hasData($result)) {
-			return error('No Statusdata vorhanden');
-		}
+
+
+		$this->db->trans_commit();
 		return $this->outputJsonSuccess(true);
 	}
 
 	public function advanceStatus($key_prestudent_id, $key_status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester)
 	{
-		//TODO(Manu) check: Annahme, dass hier immer suid bei Berechtigung STG vergeben wird!
 		$granted_Ass = $this->permissionlib->getSTG_isEntitledFor('assistenz') ? $this->permissionlib->getSTG_isEntitledFor('assistenz') : [];
 		$granted_Adm = $this->permissionlib->getSTG_isEntitledFor('admin') ? $this->permissionlib->getSTG_isEntitledFor('admin') : [];
 		$granted = array_merge($granted_Ass, $granted_Adm);
@@ -827,6 +939,7 @@ class Status extends FHC_Controller
 			return $this->outputJson(getError($result));
 		}
 
+		//TodoManu -> check if student, was wenn kein Studentstatus
 		//Studentlehrverband anlegen
 		$this->load->model('crm/Student_model', 'StudentModel');
 		$result = $this->StudentModel->checkIfUid($key_prestudent_id);
@@ -837,9 +950,9 @@ class Status extends FHC_Controller
 		}
 		$student_uid = $result->retval;
 
-		//check if Lehrverband exists
+		//check if Studentehrverband exists
 		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
-		$result = $this->StudentlehrverbandModel->checkIfLehrverbandExists($student_uid, $studiensem_next);
+		$result = $this->StudentlehrverbandModel->checkIfStudentlehrverbandExists($student_uid, $studiensem_next);
 		if (isError($result))
 		{
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
@@ -847,7 +960,7 @@ class Status extends FHC_Controller
 		}
 		if ($result->retval == "0")
 		{
-			//load Data Lehrverband
+			//load Data Studentlehrverband
 			$result = $this->StudentlehrverbandModel->load(
 				[
 					'student_uid' => $student_uid,
@@ -860,6 +973,7 @@ class Status extends FHC_Controller
 				return $this->outputJson("Error in insert Studentlehrverband");
 			}
 			$lvbData = current(getData($result));
+			var_dump($lvbData);
 
 			$result = $this->StudentlehrverbandModel->insert(
 				[
@@ -881,6 +995,7 @@ class Status extends FHC_Controller
 			}
 		}
 		$this->db->trans_commit();
+
 		return $this->outputJsonSuccess(true);
 	}
 
@@ -961,7 +1076,9 @@ class Status extends FHC_Controller
 			],
 			[
 				'bestaetigtam' => date('c'),
-				'bestaetigtvon' => $uid
+				'bestaetigtvon' => $uid,
+				'updateamum='=> date('c'),
+				'updatevon=' => $uid
 			]
 		);
 		if (isError($result))
diff --git a/application/models/codex/Bismeldestichtag_model.php b/application/models/codex/Bismeldestichtag_model.php
index e0491de01..329a4248c 100644
--- a/application/models/codex/Bismeldestichtag_model.php
+++ b/application/models/codex/Bismeldestichtag_model.php
@@ -1,7 +1,6 @@
 <?php
 class Bismeldestichtag_model extends DB_Model
 {
-
 	/**
 	 * Constructor
 	 */
@@ -54,9 +53,29 @@ class Bismeldestichtag_model extends DB_Model
 	 * @param $status_datum
 	 * @return boolean true wenn erreicht, oder false
 	 */
-	public function checkIfMeldestichtagErreicht($status_datum)
+	public function checkIfMeldestichtagErreicht($status_datum, $studiensemester_kurzbz = null)
 	{
 		$erreicht = false;
+
+		if (isset($studiensemester_kurzbz))
+		{
+			// Studiensemesterende holen
+			$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+			$result = $this->StudiensemesterModel->loadWhere(
+				array(
+					'studiensemester_kurzbz' => $studiensemester_kurzbz
+				)
+			);
+			if(isError($result))
+			{
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return $this->outputJson(getError($result));
+			}
+			$result = current(getData($result));
+
+			$studiensemester_ende = $result->ende;
+		}
+
 		// letztes erreichtes Bismeldedatum holen
 		$result = $this->getLastReachedMeldestichtag();
 		if (isError($result))
@@ -68,7 +87,6 @@ class Bismeldestichtag_model extends DB_Model
 		}
 		$stichtag = current(getData($result));
 		$stichtag = $stichtag->meldestichtag;
-		var_dump($status_datum . " < " . $stichtag . "?");
 
 		// Prüfen, ob Studentstatusdatum oder Studiensemester vor dem Stichtagsdatum liegen
 		if (isset($statusDatum))
@@ -77,6 +95,11 @@ class Bismeldestichtag_model extends DB_Model
 				$erreicht = $statusDatum < $stichtag;
 		}
 
+		if (isset($studiensemester_ende))
+		{
+			$erreicht = $erreicht || $studiensemester_ende < $stichtag;
+		}
+
 		if($erreicht)
 			return success("1", "Studentstatus mit Datum oder Semesterende vor erreichtem Meldestichtag können nicht hinzugefügt werden");
 
diff --git a/application/models/education/Studentlehrverband_model.php b/application/models/education/Studentlehrverband_model.php
index e27b14b00..632dd302b 100644
--- a/application/models/education/Studentlehrverband_model.php
+++ b/application/models/education/Studentlehrverband_model.php
@@ -14,14 +14,12 @@ class Studentlehrverband_model extends DB_Model
 	}
 
 	/**
-	 * Check if Rolle already exists
-	 * @param integer $prestudent_id
-	 * @param string $status_kurzbz
+	 * Check if Studentlehrverband already exists
+	 * @param string $student_id
 	 * @param string $studiensemester_kurzbz
-	 * @param integer $ausbildungssemester
 	 * @return 1: if Rolle exists, 0: if it doesn't
 	 */
-	public function checkIfLehrverbandExists($student_uid, $studiensemester_kurzbz)
+	public function checkIfStudentlehrverbandExists($student_uid, $studiensemester_kurzbz)
 	{
 		$qry = "SELECT
 					*
@@ -40,11 +38,11 @@ class Studentlehrverband_model extends DB_Model
 		}
 		elseif (!hasData($result))
 		{
-			return success("0", "Kein Lehrverband vorhanden!");
+			return success("0", "Kein Studentlehrverband vorhanden!");
 		}
 		else
 		{
-			return success("1","Lehrverband vorhanden!");
+			return success("1","Studentlehrverband vorhanden!");
 		}
 	}
 }
diff --git a/application/models/organisation/Lehrverband_model.php b/application/models/organisation/Lehrverband_model.php
index 953e4b7b2..43c0ac917 100644
--- a/application/models/organisation/Lehrverband_model.php
+++ b/application/models/organisation/Lehrverband_model.php
@@ -11,4 +11,37 @@ class Lehrverband_model extends DB_Model
 		$this->dbTable = 'public.tbl_lehrverband';
 		$this->pk = array('gruppe', 'verband', 'semester', 'studiengang_kz');
 	}
+
+	/**
+	 * Check if Lehrverband already exists
+	 * @param string $student_id
+	 * @param string $studiensemester_kurzbz
+	 * @return 1: if Rolle exists, 0: if it doesn't
+	 */
+	public function checkIfLehrverbandExists($student_uid, $studiensemester_kurzbz)
+	{
+		$qry = "SELECT
+					*
+				FROM 
+				    public.tbl_studentlehrverband
+				WHERE
+					student_uid = ? 
+				AND
+				    studiensemester_kurzbz = ?";
+
+		$result = $this->execQuery($qry, array($student_uid, $studiensemester_kurzbz));
+
+		if (isError($result))
+		{
+			return error($result);
+		}
+		elseif (!hasData($result))
+		{
+			return success("0", "Kein Lehrverband vorhanden!");
+		}
+		else
+		{
+			return success("1","Lehrverband vorhanden!");
+		}
+	}
 }
diff --git a/public/css/Studentenverwaltung.css b/public/css/Studentenverwaltung.css
index 3f12660ff..f77988451 100644
--- a/public/css/Studentenverwaltung.css
+++ b/public/css/Studentenverwaltung.css
@@ -40,6 +40,13 @@ html {
 	width: 0%;
 }
 
+.tabulator-row.disabled.tabulator-row-odd .tabulator-cell {
+	color: var(--gray-400);
+}
+.tabulator-row.disabled.tabulator-row-even .tabulator-cell {
+	color: var(--gray-500);
+}
+
 @media (min-width: 768px) {
 	#sidebarMenu {
 		visibility: visible!important;
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
index 450ca6283..c55c8a39d 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
@@ -71,11 +71,20 @@ export default{
 						title: 'Aktionen', field: 'actions',
 						minWidth: 150, // Ensures Action-buttons will be always fully displayed
 						formatter: (cell, formatterParams, onRendered) => {
+
+
+							//let disableButton = false;
+							//const rowData = this.row.getData();
+
+
 							let container = document.createElement('div');
 							container.className = "d-flex gap-2";
 
 							let button = document.createElement('button');
-							button.className = 'btn btn-outline-secondary btn-action';
+							if (this.dataMeldestichtag && this.dataMeldestichtag > cell.getData().datum)
+								button.className = 'btn btn-outline-secondary btn-action disabled';
+							else
+								button.className = 'btn btn-outline-secondary btn-action';
 							button.innerHTML = '<i class="fa fa-forward"></i>';
 							button.title = 'Status vorrücken';
 							button.addEventListener('click', () =>
@@ -84,7 +93,10 @@ export default{
 							container.append(button);
 
 							button = document.createElement('button');
-							button.className = 'btn btn-outline-secondary btn-action';
+							if (this.dataMeldestichtag && this.dataMeldestichtag > cell.getData().datum)
+								button.className = 'btn btn-outline-secondary btn-action disabled';
+							else
+								button.className = 'btn btn-outline-secondary btn-action';
 							button.innerHTML = '<i class="fa fa-check"></i>';
 							button.title = 'Status bestätigen';
 							button.addEventListener('click', () =>
@@ -93,7 +105,10 @@ export default{
 							container.append(button);
 
 							button = document.createElement('button');
-							button.className = 'btn btn-outline-secondary btn-action';
+							if (this.dataMeldestichtag && this.dataMeldestichtag > cell.getData().datum)
+								button.className = 'btn btn-outline-secondary btn-action disabled';
+							else
+								button.className = 'btn btn-outline-secondary btn-action';
 							button.innerHTML = '<i class="fa fa-edit"></i>';
 							button.title = 'Status bearbeiten';
 							button.addEventListener('click', (event) =>
@@ -102,7 +117,10 @@ export default{
 							container.append(button);
 
 							button = document.createElement('button');
-							button.className = 'btn btn-outline-secondary btn-action';
+							if (this.dataMeldestichtag && this.dataMeldestichtag > cell.getData().datum)
+								button.className = 'btn btn-outline-secondary btn-action disabled';
+							else
+								button.className = 'btn btn-outline-secondary btn-action';
 							button.innerHTML = '<i class="fa fa-xmark"></i>';
 							button.title = 'Status löschen';
 							button.addEventListener('click', () =>
@@ -115,6 +133,14 @@ export default{
 						frozen: true
 					},
 				],
+				rowFormatter: (row) => {
+					const rowData = row.getData();
+					if (this.dataMeldestichtag && this.dataMeldestichtag > rowData.datum)
+					{
+						row.getElement().classList.add('disabled');
+
+					}
+				},
 				layout: 'fitDataFill',
 				layoutColumnsOnNewData: false,
 				height: 'auto',
@@ -128,17 +154,15 @@ export default{
 			aufnahmestufen: {'': '-- keine Auswahl --', 1: 1, 2: 2, 3: 3},
 			listStatusgruende: [],
 			statusId: {},
-			gruendeLength: {}
+			gruendeLength: {},
+			dataMeldestichtag: null,
+			stichtag: {}
 		}
 	},
 	computed: {
 		gruende() {
 			return this.listStatusgruende.filter(grund => grund.status_kurzbz == this.statusData.status_kurzbz);
 		},
-/*		gruendeLength() {
-			//return Object.keys(this.gruende).length;
-			return 33;
-		}*/
 	},
 	watch: {
 		data: {
@@ -185,16 +209,6 @@ export default{
 				if(this.statusData)
 					this.$refs.deleteStatusModal.show();
 			});
-
-/*			this.loadStatus({
-				'prestudent_id': this.prestudent_id,
-				'status_kurzbz': status,
-				'studiensemester_kurzbz': stdsem,
-				'ausbildungssemester': ausbildungssemester
-			}).then(() => {
-				if(this.statusData)
-					this.$refs.deleteStatusModal.show();
-			});*/
 		},
 		actionAdvanceStatus(status, stdsem, ausbildungssemester){
 			console.log("Action: Status vorrücken: (" + status + ": " + stdsem + "/" + ausbildungssemester + ")")
@@ -227,7 +241,7 @@ export default{
 		addNewStatus(){
 			CoreRESTClient.post('components/stv/Status/addNewStatus/' + this.prestudent_id,
 				this.statusData
-		).then(response => {
+			).then(response => {
 				if (!response.data.error) {
 					this.$fhcAlert.alertSuccess('Speichern erfolgreich');
 					this.hideModal('newStatusModal');
@@ -318,7 +332,7 @@ export default{
 							const errorData = result.data.retval;
 							this.$fhcAlert.alertError('Kein Status mit Id ' + status_id + ' gefunden');
 						}
-/*						return result;*/
+						/*						return result;*/
 					}).catch(error => {
 					if (error.response) {
 						//console.log(error.response);
@@ -412,16 +426,25 @@ export default{
 				this.listStatusgruende = result;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
+		CoreRESTClient
+			.get('components/stv/Status/getLastBismeldestichtag/')
+			.then(result => CoreRESTClient.getData(result.data) || [])
+			.then(result => {
+				this.dataMeldestichtag = result[0].meldestichtag;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
 	},
 	template: `
 		<div class="stv-list h-100 pt-3">
 		
 		
 		<p>TestData</p>
-		{{statusData}}
-		<hr>
-		{{gruende}}
-		{{gruendeLength}}
+
+		Bismeldestichtag
+		{{dataMeldestichtag }}
+		
+		
+
 		
 <!--		Berechtigungen:
 			Skip Check: {{hasPermissionToSkipStatusCheck}} |
@@ -602,6 +625,10 @@ export default{
 				<template #title>Status bearbeiten</template>
 					<form-form class="row g-3" ref="statusData">
 					
+					<div v-if="statusData.datum < dataMeldestichtag ">
+						<b>Meldestichtag erreicht - Bearbeiten nicht mehr möglich</b>
+					</div>
+					
 					 <input type="hidden" id="statusId" name="statusId" value="statusData.statusId">
 					
 						<div class="row mb-3">

From 691bbaaf82b920292ee27937877f397ad29e2e98 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 12 Mar 2024 09:59:21 +0100
Subject: [PATCH 0469/1461] workaround for tabulator jquery_wrapper

---
 .../approveAnrechnungUebersichtData.php       |  9 +-
 application/views/templates/FHC-Footer.php    |  2 +-
 public/js/tabulator/jquery_wrapper.js         | 84 +++++++++++++++++++
 3 files changed, 90 insertions(+), 5 deletions(-)
 create mode 100644 public/js/tabulator/jquery_wrapper.js

diff --git a/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php b/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
index 879fe12b6..24a49bed2 100644
--- a/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
+++ b/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
@@ -225,12 +225,13 @@ $filterWidgetArray = array(
             func_rowFormatter(row,this);
         },
 		columnDefaults:{
-			tooltip:true,
-		}
+			tooltip:true
+		},
 		//! not working
 		columnDefaults:{
-        tooltip:function(e, cell, onRendered){
-            return func_tooltips(cell);
+			tooltip:function(e, cell, onRendered){
+				return func_tooltips(cell);
+			}
         }
 	 }', // tabulator properties
 	'datasetRepFieldsDefs' => '{
diff --git a/application/views/templates/FHC-Footer.php b/application/views/templates/FHC-Footer.php
index c17e49de7..1bec5984e 100644
--- a/application/views/templates/FHC-Footer.php
+++ b/application/views/templates/FHC-Footer.php
@@ -100,7 +100,7 @@
 	// Tabulator 5 JS
 	if ($tabulator5 === true) generateJSsInclude('vendor/olifolkerd/tabulator5/dist/js/tabulator.min.js');
 	// Tabulator 5 JQuery
-	if ($tabulator5JQuery === true) generateJSsInclude('vendor/olifolkerd/tabulator5/dist/js/jquery_wrapper.js');
+	if ($tabulator5JQuery === true) generateJSsInclude('public/js/tabulator/jquery_wrapper.js');
 	// Tinymce 3 JS
 	if ($tinymce3 === true) generateJSsInclude('include/tiny_mce/tiny_mce.js');
 
diff --git a/public/js/tabulator/jquery_wrapper.js b/public/js/tabulator/jquery_wrapper.js
new file mode 100644
index 000000000..9b11095ec
--- /dev/null
+++ b/public/js/tabulator/jquery_wrapper.js
@@ -0,0 +1,84 @@
+/*
+ * This file is part of the Tabulator package.
+ *
+ * (c) Oliver Folkerd <oliver.folkerd@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * Full Documentation & Demos can be found at: http://olifolkerd.github.io/tabulator/
+ *
+ */
+
+(function (root, factory) {
+	"use strict";
+	if (typeof define === 'function' && define.amd) {
+		define(['jquery', 'tabulator', 'jquery-ui'], factory);
+	}
+	else if(typeof module !== 'undefined' && module.exports) {
+		module.exports = factory(
+			require('jquery'),
+			require('tabulator'),
+			require('jquery-ui')
+		);
+	}
+	else {
+		factory(root.jQuery, root.Tabulator);
+	}
+}(this, function ($, Tabulator) {
+
+	$.widget("ui.tabulator", {
+		_create:function(){
+			var options = Object.assign({}, this.options);
+			var props = [];
+
+			delete options.create;
+			delete options.disabled;
+
+			this.table = new Tabulator(this.element[0], options);
+			window.table = this.table;
+
+                        console.log(this.table);
+                        props = Object.getOwnPropertyNames(Object.getPrototypeOf(Object.getPrototypeOf(this.table)));
+                        props = props.concat(Object.getOwnPropertyNames(this.table));
+                        console.log(props);
+
+                        const that = this;
+                        this.table.on("tableBuilt", function(){
+                          console.log('bhbuilt begin');
+                          console.log(this);
+                          props = Object.getOwnPropertyNames(Object.getPrototypeOf(Object.getPrototypeOf(this)));
+                          props = props.concat(Object.getOwnPropertyNames(this));
+                          for(let key of props){
+                                  if( key === 'download' ) console.log('download: ' + typeof this[key]);
+                                  if(typeof this[key] === "function" && key.charAt(0) !== "_"){
+                                          that[key] = this[key].bind(this);
+                                  }
+                          }
+                          console.log(props);
+                          console.log('bhbuilt end');
+                        });
+
+			//retrieve properties on prototype
+			props = Object.getOwnPropertyNames(Object.getPrototypeOf(Object.getPrototypeOf(this.table)));
+
+			//retrieve properties added by modules
+			props = props.concat(Object.getOwnPropertyNames(this.table));
+
+			//map tabulator functions to jquery wrapper
+			for(let key of props){
+				if(typeof this.table[key] === "function" && key.charAt(0) !== "_"){
+					this[key] = this.table[key].bind(this.table);
+				}
+			}
+		},
+
+		_setOption: function(option, value){
+			console.error("Tabulator jQuery wrapper does not support setting options after the table has been instantiated");
+		},
+
+		_destroy: function(option, value){
+			this.table.destroy();
+		},
+	});
+}));

From 1dc4f5b56abb6a708eabe3bb394945da313df80f Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 12 Mar 2024 12:28:59 +0100
Subject: [PATCH 0470/1461] upgrading tableWidget to tabulator 5 with custom
 jquery_wrapper

---
 .../approveAnrechnungUebersichtData.php       |  4 +-
 public/js/TableWidget.js                      | 63 ++++++++++++-------
 .../anrechnung/approveAnrechnungUebersicht.js | 32 ++++------
 public/js/tabulator/jquery_wrapper.js         |  1 +
 4 files changed, 54 insertions(+), 46 deletions(-)

diff --git a/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php b/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
index 24a49bed2..1948f847b 100644
--- a/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
+++ b/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
@@ -224,9 +224,7 @@ $filterWidgetArray = array(
         rowFormatter:function(row){
             func_rowFormatter(row,this);
         },
-		columnDefaults:{
-			tooltip:true
-		},
+		
 		//! not working
 		columnDefaults:{
 			tooltip:function(e, cell, onRendered){
diff --git a/public/js/TableWidget.js b/public/js/TableWidget.js
index 338925fc1..0a1166bf8 100644
--- a/public/js/TableWidget.js
+++ b/public/js/TableWidget.js
@@ -263,15 +263,19 @@ var FHC_TableWidget = {
 			})
 
 			// Click-Event to toggle column-picker columns
-			tableWidgetDiv.find('.btn-select-col').on('click', function()
+			//! was changed to be added when the table was built first
+			tableWidgetDiv.find("#tableWidgetTabulator").tabulator("on","tableBuilt",()=>{
+				tableWidgetDiv.find('.btn-select-col').on('click', function()
 			{
 				var selected = this.value;
-
+				
 				tableWidgetDiv.find("#tableWidgetTabulator").tabulator('toggleColumn', selected);
 
 				// toggle class to color button as selected / deselected
 				$(this).toggleClass('btn-select-col-selected').blur();	// blur removes automatic focus
 			})
+			});
+			
 		}
 	},
 
@@ -550,19 +554,27 @@ var FHC_TableWidget = {
 				options.tooltipsHeader = (typeof options.tooltipsHeader == 'undefined') ? true : options.tooltipsHeader;					// set header tooltip with column title
 				options.placeholder = _func_placeholder();	// display text when table is empty
 
-				if (typeof options.rowSelectionChanged == 'undefined')
-				{
-					options.rowSelectionChanged = function(data, rows){
-						_func_rowSelectionChanged(data, rows);
-					};
-				}
-				options.columnVisibilityChanged = function(column, visible) {
-					_func_columnVisibilityChanged(column, visible);
-				};
+				// OLD tabulator v4
+				// if (typeof options.rowSelectionChanged == 'undefined')
+				// {
+				// 	options.rowSelectionChanged = function(data, rows){
+				// 		_func_rowSelectionChanged(data, rows);
+				// 	};
+				// }
+				
+				// OLD tabulator v4
+				// options.columnVisibilityChanged = function(column, visible) {
+				// 	_func_columnVisibilityChanged(column, visible);
+				// };
 
 				// Renders the tabulator
 				tableWidgetDiv.find("#tableWidgetTabulator").tabulator(options);
-				//tableWidgetDiv.find("#tableWidgetTabulator").tabulator("on","tableBuilt",()=>{console.log("table build")});
+				tableWidgetDiv.find("#tableWidgetTabulator").tabulator("on","rowSelectionChanged",_func_rowSelectionChanged);
+				tableWidgetDiv.find("#tableWidgetTabulator").tabulator("on","columnVisibilityChanged",_func_columnVisibilityChanged);
+				
+				// notify other js files that work on the tabulator instance that the tabulator is initialized by triggering the event tableInit
+				
+				
 				
 				
 			}
@@ -573,16 +585,23 @@ var FHC_TableWidget = {
 		// -------------------------------------------------------------------------------------------------------------
 
 		// Render tableWidgetHeader
-		if (typeof options.tableWidgetHeader == 'undefined' ||
+		
+			
+			if (typeof options.tableWidgetHeader == 'undefined' ||
 			(typeof options.tableWidgetHeader != 'undefined' && options.tableWidgetHeader != false))
-		{
-			var tabulatorHeaderHTML = _renderTabulatorHeaderHTML(tableWidgetDiv);
-			tableWidgetDiv.find('#tableWidgetHeader').append(tabulatorHeaderHTML);
+			{
+				var tabulatorHeaderHTML = _renderTabulatorHeaderHTML(tableWidgetDiv);
+				tableWidgetDiv.find('#tableWidgetHeader').append(tabulatorHeaderHTML);
 
-			// Render the collapsable div triggered by button in tableWidgetHeader
-			var tabulatorHeaderCollapseHTML = _renderTabulatorHeaderCollapseHTML(tableWidgetDiv);
-			tableWidgetDiv.find('#tableWidgetHeader').after(tabulatorHeaderCollapseHTML);
-		}
+				tableWidgetDiv.find("#tableWidgetTabulator").tabulator("on","tableBuilt",()=>{
+					
+					// Render the collapsable div triggered by button in tableWidgetHeader
+					var tabulatorHeaderCollapseHTML = _renderTabulatorHeaderCollapseHTML(tableWidgetDiv);
+					tableWidgetDiv.find('#tableWidgetHeader').after(tabulatorHeaderCollapseHTML);
+				});
+			}
+		
+		
 
 		/**
 		 * 	tableWidgetFooter is NOT rendered by default.
@@ -795,7 +814,7 @@ function _renderTabulatorHeaderHTML(tableWidgetDiv){
 }
 
 // Returns collapsable HTML element for TableWidget header buttons
-function _renderTabulatorHeaderCollapseHTML(tableWidgetDiv){
+function _renderTabulatorHeaderCollapseHTML(tableWidgetDiv,arrayTabulatorColumns){
 
 	var tableUniqueId = tableWidgetDiv.attr('tableUniqueId');
 
@@ -810,7 +829,7 @@ function _renderTabulatorHeaderCollapseHTML(tableWidgetDiv){
 	tabulatorHeaderCollapseHTML += '<div class="panel-heading" role="tab" id="headingOne">';
 	tabulatorHeaderCollapseHTML += '<h5 class="panel-title">';
 	tabulatorHeaderCollapseHTML += '' +
-		'<a role="button" data-toggle="collapse" data-parent="#accordion" ' +
+		'<a role="button" data-bs-toggle="collapse" data-bs-parent="#accordion" ' +
 		'href="#selectColumns-' + tableUniqueId + '" ' +
 		'aria-expanded="false" aria-controls="selectColumns">' +
 		FHC_PhrasesLib.t("ui", "spaltenEinstellen") +
diff --git a/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js b/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
index ed03cfa71..0b399beab 100644
--- a/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
+++ b/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
@@ -69,15 +69,12 @@ function hf_schreibberechtigt(headerValue, rowValue){
 // Adds column details
 // Sets focus on filterbutton, if table starts with stored filter.
 function func_tableBuilt(table) {
-
     // Store table in global var
     tabulator = table;
-
-
-    table.find("#tableWidgetTabulator").tabulator("addColumn",{
+    table.tabulator("addColumn",{
         title: "Details",
         field: 'details',
-        align: "center",
+        hozAlign: "center",
         width: 100,
         formatter: "link",
         formatterParams:{
@@ -252,28 +249,21 @@ function tableWidgetHook_selectAllButton(tableWidgetDiv){
 
 
 
+
+
 $(function(){
     const genehmigung_panel = $('#approveAnrechnungUebersicht-genehmigung-panel');
     const begruendung_panel = $('#approveAnrechnungUebersicht-begruendung-panel');
     const hasReadOnlyAccess = $('#formApproveAnrechnungUebersicht').data('readonly');
     const hasCreateAnrechnungAccess = $('#formApproveAnrechnungUebersicht').data('createaccess');
-
-
-    $(document).on("tableInit", function(event, table) {
+   
+   
+    $(document).on("tableInit", function(event) {
+     
+        func_tableBuilt($("#tableWidgetTabulator"))
         
-       table.find("#tableWidgetTabulator").tabulator("on","tableBuilt",()=>{
-        func_tableBuilt(table)
-        var el =$('#download-csv');
-        
-        $('#download-csv').click( function()
-			{
-                console.log("here")
-				// BOM for correct UTF-8 char output
-				table.find("#tableWidgetTabulator").tabulator("download", "csv", "data.csv", { bom:true });
-		})
-        console.log(el);
-        });
-       table.find("#tableWidgetTabulator").tabulator("on","rowSelectionChanged",func_rowSelectionChanged);
+       
+       //table.tabulator("on","rowSelectionChanged",func_rowSelectionChanged);
        
         /*  table.tabulator("on","dataLoaded", function() {
             // do something
diff --git a/public/js/tabulator/jquery_wrapper.js b/public/js/tabulator/jquery_wrapper.js
index 9b11095ec..d93e9bf7c 100644
--- a/public/js/tabulator/jquery_wrapper.js
+++ b/public/js/tabulator/jquery_wrapper.js
@@ -57,6 +57,7 @@
                           }
                           console.log(props);
                           console.log('bhbuilt end');
+						  $(document).trigger("tableInit");
                         });
 
 			//retrieve properties on prototype

From 70418b8ff68d6ac8c3f3387e1c10251bb6c4a019 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 12 Mar 2024 14:28:01 +0100
Subject: [PATCH 0471/1461] updates TableWidget.js functions that are no longer
 valid in tabulator5

---
 .../approveAnrechnungUebersichtData.php       | 14 ++--
 public/js/TableWidget.js                      | 77 +++++++++++++------
 2 files changed, 59 insertions(+), 32 deletions(-)

diff --git a/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php b/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
index 1948f847b..754bf7ccb 100644
--- a/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
+++ b/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
@@ -238,7 +238,7 @@ $filterWidgetArray = array(
 		begruendung_id: {visible: false, headerFilter:"input"},
 		dms_id: {visible: false, headerFilter:"input"},
 		schreibberechtigt: {
-			formatter:"tickCross", align:"center", 
+			formatter:"tickCross", hozAlign:"center", 
 		    headerFilter:"tickCross", headerFilterParams:{tristate: true}, headerFilterFunc: hf_schreibberechtigt
 		},
 		studiensemester_kurzbz: {visible: false, headerFilter:"input"},
@@ -247,22 +247,22 @@ $filterWidgetArray = array(
 		orgform_kurzbz: {headerFilter:"input"},
 		ausbildungssemester: {headerFilter:"input"},
 		lv_bezeichnung: {headerFilter:"input"},
-		ects: {headerFilter:"input", align:"center"},
+		ects: {headerFilter:"input", hozAlign:"center"},
 		ectsSumBisherUndNeu: {formatter: format_ectsSumBisherUndNeu},
-		ectsSumSchulisch: {visible: false, headerFilter:"input", align:"right"},
-		ectsSumBeruflich: {visible: false, headerFilter:"input", align:"right"},
+		ectsSumSchulisch: {visible: false, headerFilter:"input", hozAlign:"right"},
+		ectsSumBeruflich: {visible: false, headerFilter:"input", hozAlign:"right"},
 		begruendung: {headerFilter:"input", visible: true},
 		
 		student: {headerFilter:"input"},
 		zgv: {headerFilter:"input"},
 		dokument_bezeichnung: {headerFilter:"input", formatter:"link", formatterParams: paramLookup_dokBez},
 		anmerkung_student: {headerFilter:"input"},
-		antragsdatum: {align:"center", headerFilter:"input", mutator: mut_formatStringDate},
-		empfehlung_anrechnung: {headerFilter:"input", align:"center", formatter: format_empfehlung_anrechnung, headerFilterFunc: hf_filterTrueFalse},
+		antragsdatum: {hozAlign:"center", headerFilter:"input", mutator: mut_formatStringDate},
+		empfehlung_anrechnung: {headerFilter:"input", hozAlign:"center", formatter: format_empfehlung_anrechnung, headerFilterFunc: hf_filterTrueFalse},
 		status_kurzbz: {visible: false, headerFilter:"input"},
 		status_bezeichnung: {headerFilter:"input"},
 		prestudent_id: {visible: false, headerFilter:"input"},
-		empfehlungsanfrageAm: {visible: false, align:"center", headerFilter:"input", mutator: mut_formatStringDate},
+		empfehlungsanfrageAm: {visible: false, hozAlign:"center", headerFilter:"input", mutator: mut_formatStringDate},
 		empfehlungsanfrageAn: {visible: false, headerFilter:"input"}
 	 }', // col properties
 );
diff --git a/public/js/TableWidget.js b/public/js/TableWidget.js
index 0a1166bf8..36bbf6288 100644
--- a/public/js/TableWidget.js
+++ b/public/js/TableWidget.js
@@ -161,6 +161,42 @@ var FHC_TableWidget = {
 		FHC_TableWidget._renderDataset(tableWidgetDiv, data);
 
 		FHC_TableWidget._turnOnEvents(tableWidgetDiv); // turns all the events off
+
+		FHC_TableWidget._onTableBuilt(tableWidgetDiv, data);
+	},
+
+
+	_onTableBuilt: function(tableWidgetDiv, data) {
+		var options = FHC_TableWidget._getRepresentationOptions(data);
+
+		tableWidgetDiv.find("#tableWidgetTabulator").tabulator("on","tableBuilt",()=>{
+
+			if (typeof options.tableWidgetHeader == 'undefined' ||
+			(typeof options.tableWidgetHeader != 'undefined' && options.tableWidgetHeader != false))
+			{
+				// renders the table headers
+				var tabulatorHeaderCollapseHTML = _renderTabulatorHeaderCollapseHTML(tableWidgetDiv);
+				tableWidgetDiv.find('#tableWidgetHeader').after(tabulatorHeaderCollapseHTML);	
+			}
+			
+			
+			// makes the table headers toggle visibility when clicking on them
+			tableWidgetDiv.find('.btn-select-col').on('click', function()
+			{
+				var selected = this.value;
+				
+				tableWidgetDiv.find("#tableWidgetTabulator").tabulator('toggleColumn', selected);
+
+				// toggle class to color button as selected / deselected
+				$(this).toggleClass('btn-select-col-selected').blur();	// blur removes automatic focus
+			})
+
+				
+			
+		
+			
+
+		})
 	},
 
 	/**
@@ -263,18 +299,7 @@ var FHC_TableWidget = {
 			})
 
 			// Click-Event to toggle column-picker columns
-			//! was changed to be added when the table was built first
-			tableWidgetDiv.find("#tableWidgetTabulator").tabulator("on","tableBuilt",()=>{
-				tableWidgetDiv.find('.btn-select-col').on('click', function()
-			{
-				var selected = this.value;
-				
-				tableWidgetDiv.find("#tableWidgetTabulator").tabulator('toggleColumn', selected);
-
-				// toggle class to color button as selected / deselected
-				$(this).toggleClass('btn-select-col-selected').blur();	// blur removes automatic focus
-			})
-			});
+			//! this event was moved to the _onTableBuilt function
 			
 		}
 	},
@@ -298,6 +323,8 @@ var FHC_TableWidget = {
 		{
 			FHC_TableWidget._renderDatasetTabulator(tableWidgetDiv, data); // ...render the tabulator GUI
 		}
+
+		
 	},
 
 	/**
@@ -545,13 +572,18 @@ var FHC_TableWidget = {
 			if (data.hasOwnProperty("dataset") && $.isArray(data.dataset))
 			{
 				if (options == null) options = {};
-
+				
+				options.columnDefaults={
+					// set header tooltip with column title
+					//! the old keyword is tooltipsHeader, the new keyword for the option is headerTooltip
+					headerTooltip: (typeof options.columnDefaults.tooltipsHeader == 'undefined') ? true : options.columnDefaults.tooltipsHeader
+				}
 				options.columns = arrayTabulatorColumns;
 				options.data = data.dataset;
                 options.persistence = (typeof options.persistence == 'undefined') ? true : options.persistence;			// enables persistence (default store in localStorage if available, else in cookie)
                 options.persistenceID = (typeof options.persistenceID == 'undefined') ?  data.tableUniqueId : options.persistenceID;  // persistenceID to store persistence data seperately for multiple tables
 				options.movableColumns = (typeof options.movableColumns == 'undefined') ? true : options.movableColumns;				// allows changing column order
-				options.tooltipsHeader = (typeof options.tooltipsHeader == 'undefined') ? true : options.tooltipsHeader;					// set header tooltip with column title
+				
 				options.placeholder = _func_placeholder();	// display text when table is empty
 
 				// OLD tabulator v4
@@ -569,14 +601,11 @@ var FHC_TableWidget = {
 
 				// Renders the tabulator
 				tableWidgetDiv.find("#tableWidgetTabulator").tabulator(options);
+
+				//! the following callbacks need to be attached after the table has built in tabulator version 5+
 				tableWidgetDiv.find("#tableWidgetTabulator").tabulator("on","rowSelectionChanged",_func_rowSelectionChanged);
 				tableWidgetDiv.find("#tableWidgetTabulator").tabulator("on","columnVisibilityChanged",_func_columnVisibilityChanged);
 				
-				// notify other js files that work on the tabulator instance that the tabulator is initialized by triggering the event tableInit
-				
-				
-				
-				
 			}
 		}
 
@@ -593,12 +622,10 @@ var FHC_TableWidget = {
 				var tabulatorHeaderHTML = _renderTabulatorHeaderHTML(tableWidgetDiv);
 				tableWidgetDiv.find('#tableWidgetHeader').append(tabulatorHeaderHTML);
 
-				tableWidgetDiv.find("#tableWidgetTabulator").tabulator("on","tableBuilt",()=>{
-					
-					// Render the collapsable div triggered by button in tableWidgetHeader
-					var tabulatorHeaderCollapseHTML = _renderTabulatorHeaderCollapseHTML(tableWidgetDiv);
-					tableWidgetDiv.find('#tableWidgetHeader').after(tabulatorHeaderCollapseHTML);
-				});
+
+				// Render the collapsable div triggered by button in tableWidgetHeader
+				//! this rendering was moved to the _onTableBuilt function
+				
 			}
 		
 		

From 77ebf1d85732f21c18708e956d8b2ec9afc8e28f Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 12 Mar 2024 15:08:33 +0100
Subject: [PATCH 0472/1461] Apply to changes from master

---
 public/js/apps/Studentenverwaltung.js         |  8 ++++----
 .../Stv/Studentenverwaltung/List.js           | 13 +++++++-----
 system/phrasesupdate.php                      | 20 -------------------
 3 files changed, 12 insertions(+), 29 deletions(-)

diff --git a/public/js/apps/Studentenverwaltung.js b/public/js/apps/Studentenverwaltung.js
index e1dacf792..dc3e7522b 100644
--- a/public/js/apps/Studentenverwaltung.js
+++ b/public/js/apps/Studentenverwaltung.js
@@ -18,8 +18,8 @@
 import FhcStudentenverwaltung from "../components/Stv/Studentenverwaltung.js";
 import fhcapifactory from "./api/fhcapifactory.js";
 
-import FhcAlert from "../plugin/FhcAlert.js";
-import FhcPhrasen from "../plugin/Phrasen.js";
+import FhcApi from "../plugin/FhcApi.js";
+import Phrasen from "../plugin/Phrasen.js";
 
 //import PrimeVue form "../../../../index.ci.php/public/js/components/primevue/config/config.esm.min.js");
 //const PrimeVue = await import(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + "/public/js/components/primevue/config/config.esm.min.js").default;
@@ -47,7 +47,7 @@ import(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_route
 				overlay: 1100
 			}
 		})
-		.use(FhcAlert)
-		.use(FhcPhrasen)
+		.use(FhcApi)
+		.use(Phrasen)
 		.mount('#main');
 });
diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index f3e1b1bc0..c9c5ecb26 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -112,11 +112,14 @@ export default {
 			this.lastSelected = first ? undefined : this.selected;
 			if (url)
 				url = CoreRESTClient._generateRouterURI(url);
-			if (!this.$refs.table.tableBuilt)
-				this.$refs.table.tabulator.on("tableBuilt", () => {
-					this.$refs.table.tabulator.setData(url);
-				});
-			else
+			if (!this.$refs.table.tableBuilt) {
+				if (!this.$refs.table.tabulator) {
+					this.tabulatorOptions.ajaxURL = url;
+				} else
+					this.$refs.table.tabulator.on("tableBuilt", () => {
+						this.$refs.table.tabulator.setData(url);
+					});
+			} else
 				this.$refs.table.tabulator.setData(url);
 		},
 		onKeydown(e) { // TODO(chris): this should be in the filter component
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 597527f09..a7dabcf79 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -2281,26 +2281,6 @@ $phrases = array(
 			)
 		)
 	),
-	array(
-		'app' => 'core',
-		'category' => 'person',
-		'phrase' => 'plz',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'plz',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'code',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
 	array(
 		'app' => 'core',
 		'category' => 'person',

From 6722fde9c9195ad6579e4766d9b46b5785d343ae Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 12 Mar 2024 15:33:24 +0100
Subject: [PATCH 0473/1461] adapts approveAnrechnungUebersicht for the new
 tabultor5 functions

---
 .../approveAnrechnungUebersichtData.php       | 15 +++++++-------
 public/js/TableWidget.js                      |  3 ++-
 .../anrechnung/approveAnrechnungUebersicht.js | 20 +++++++++++--------
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php b/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
index 754bf7ccb..6c5c9e74f 100644
--- a/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
+++ b/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
@@ -209,8 +209,13 @@ $filterWidgetArray = array(
 		layout: "fitColumns",           // fit columns to width of table
 		persistenceID: "approveAnrechnungUebersicht_V1",
 		autoResize: false, 				// prevent auto resizing of table (false to allow adapting table size when cols are (de-)activated
-	    headerFilterPlaceholder: " ",
-        index: "anrechnung_id",             // assign specific column as unique id (important for row indexing)
+	    columnDefaults:{
+			headerFilterPlaceholder: " ",
+			tooltip:function(e, cell, onRendered){
+				return func_tooltips(cell);
+			},
+		},
+		index: "anrechnung_id",             // assign specific column as unique id (important for row indexing)
         selectable: true,               // allow row selection
         selectableRangeMode: "click",   // allow range selection using shift end click on end of range
         selectablePersistence:false,    // deselect previously selected rows when table is filtered, sorted or paginated
@@ -225,12 +230,6 @@ $filterWidgetArray = array(
             func_rowFormatter(row,this);
         },
 		
-		//! not working
-		columnDefaults:{
-			tooltip:function(e, cell, onRendered){
-				return func_tooltips(cell);
-			}
-        }
 	 }', // tabulator properties
 	'datasetRepFieldsDefs' => '{
 		anrechnung_id: {visible: false, headerFilter:"input"},
diff --git a/public/js/TableWidget.js b/public/js/TableWidget.js
index 36bbf6288..8f1f2f1fb 100644
--- a/public/js/TableWidget.js
+++ b/public/js/TableWidget.js
@@ -572,7 +572,8 @@ var FHC_TableWidget = {
 			if (data.hasOwnProperty("dataset") && $.isArray(data.dataset))
 			{
 				if (options == null) options = {};
-				
+				console.log("header tooltips here:",options.columnDefaults.tooltipsHeader);
+				console.log("tooltips here:",options.columnDefaults.tooltip);
 				options.columnDefaults={
 					// set header tooltip with column title
 					//! the old keyword is tooltipsHeader, the new keyword for the option is headerTooltip
diff --git a/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js b/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
index 0b399beab..4ca43376d 100644
--- a/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
+++ b/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
@@ -74,7 +74,7 @@ function func_tableBuilt(table) {
     table.tabulator("addColumn",{
         title: "Details",
         field: 'details',
-        hozAlign: "center",
+        hozAlign: 'center',
         width: 100,
         formatter: "link",
         formatterParams:{
@@ -148,7 +148,6 @@ var format_ectsSumBisherUndNeu = function(cell, formatterParams, onRendered){
 // Formats the rows
 function func_rowFormatter(row){
     
-
     let status_kurzbz = row.getData().status_kurzbz;
 
     // If status is anything else then 'Bearbeitet von STGL-Leitung'
@@ -168,6 +167,7 @@ function func_rowFormatter(row){
 
 // Formats row selectable/unselectable
 function func_selectableCheck(row){
+    console.log("entered here in selectable check")
     let status_kurzbz = row.getData().status_kurzbz;
 
     return (
@@ -187,13 +187,17 @@ function func_rowSelectionChanged(data, rows){
         selectedPrestudentWithAccumulatedLvEcts = approveAnrechnung.getSumLvEctsByPreStudent(data);
 
         // Loop through all active rows
-        var selectedRows = tabulator.find("#tableWidgetTabulator").tabulator("getSelectedRows");
-        for (var i = 0; i < selectedRows.length; i++) {
+        // rowManager
+        //! getting the rowManager throught the tabulator instance saved in the window object (saved in the jquery_wrapper) of the browser
+        var rowManager = window.table.rowManager;
+        for (var i = 0; i < rowManager.activeRows.length; i++) {
 
             // Reinitialize row -> triggers formatters.
             //selectedRows[i].rerenderRowCells(true);
-            //! rowManager.activeRows[i].reinitialize();
-            selectedRows[i].reformat();
+            //selectedRows[i].reformat();
+            
+            rowManager.activeRows[i].reinitialize();
+            
             
         }
 
@@ -204,7 +208,7 @@ function func_rowSelectionChanged(data, rows){
 
 // Returns tooltip
 function func_tooltips(cell) {
-    console.log(cell);
+    console.log("TOOLTIP DEBUG",cell);
     // Return tooltip if row is unselectable
     if (true || !func_selectableCheck(cell.getRow())){
         return FHC_PhrasesLib.t("ui", "nichtSelektierbarAufgrundVon") + 'Status';
@@ -263,7 +267,7 @@ $(function(){
         func_tableBuilt($("#tableWidgetTabulator"))
         
        
-       //table.tabulator("on","rowSelectionChanged",func_rowSelectionChanged);
+        $("#tableWidgetTabulator").tabulator("on","rowSelectionChanged",func_rowSelectionChanged);
        
         /*  table.tabulator("on","dataLoaded", function() {
             // do something

From e28627a676d78bfc25ba0b82a55db1c5e9deddb7 Mon Sep 17 00:00:00 2001
From: Werner Masik <werner@gefi.at>
Date: Tue, 12 Mar 2024 17:34:13 +0100
Subject: [PATCH 0474/1461] removed verantwortlich column from tbl_frist

---
 system/dbupdate_3.4/37107_fristenmanagement.php | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/system/dbupdate_3.4/37107_fristenmanagement.php b/system/dbupdate_3.4/37107_fristenmanagement.php
index d63bae80d..68811fd18 100644
--- a/system/dbupdate_3.4/37107_fristenmanagement.php
+++ b/system/dbupdate_3.4/37107_fristenmanagement.php
@@ -1,15 +1,14 @@
 <?php
 if (! defined('DB_NAME')) exit('No direct script access allowed');
 
-if ($result = $db->db_query("SELECT * FROM information_schema.tables WHERE table_name='tbl_dienstverhaeltnis' AND table_schema='hr'"))
+if ($result = $db->db_query("SELECT * FROM information_schema.tables WHERE table_name='tbl_frist' AND table_schema='hr'"))
 {
 	if ($db->db_num_rows($result) == 0)
 	{
 		$qry = "
         CREATE TABLE IF NOT EXISTS hr.tbl_frist (
             frist_id bigserial NOT NULL,
-            mitarbeiter_uid character varying(32),
-            verantwortlich_uid character varying(32),
+            mitarbeiter_uid character varying(32),            
             ereignis_kurzbz character varying(32) NOT NULL,
             bezeichnung varchar(255),
             datum date,
@@ -43,10 +42,6 @@ if ($result = $db->db_query("SELECT * FROM information_schema.tables WHERE table
 		REFERENCES public.tbl_mitarbeiter (mitarbeiter_uid) MATCH FULL
 		ON DELETE SET NULL ON UPDATE CASCADE;
 
-        ALTER TABLE hr.tbl_frist ADD CONSTRAINT tbl_frist_verantwortlich_uid_fk FOREIGN KEY (verantwortlich_uid)
-		REFERENCES public.tbl_mitarbeiter (mitarbeiter_uid) MATCH FULL
-		ON DELETE SET NULL ON UPDATE CASCADE;
-
         ALTER TABLE hr.tbl_frist ADD CONSTRAINT tbl_frist_ereignis_kurzbz_fk FOREIGN KEY (ereignis_kurzbz)
 		REFERENCES hr.tbl_frist_ereignis (ereignis_kurzbz) MATCH FULL
 		ON DELETE SET NULL ON UPDATE CASCADE;

From 1816f3f5f613f5e82a55453c77017a5ab71d1275 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 13 Mar 2024 10:22:10 +0100
Subject: [PATCH 0475/1461] fully upgrades the approveAnrechnungUebersicht to
 tabulator5

---
 .../approveAnrechnungUebersicht.php           |  2 +-
 .../approveAnrechnungUebersichtData.php       | 18 +++++++-----
 public/js/TableWidget.js                      | 10 ++++---
 .../anrechnung/approveAnrechnungUebersicht.js | 29 +++++++------------
 public/js/tabulator/jquery_wrapper.js         |  2 +-
 5 files changed, 28 insertions(+), 33 deletions(-)

diff --git a/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php b/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php
index b9972539b..67ab4c233 100644
--- a/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php
+++ b/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php
@@ -193,7 +193,7 @@ $this->load->view(
                 <!-- Action Button 'Abbrechen'-->
                 <div class="mb-4 d-flex justify-content-end">
                     <button id="approveAnrechnungUebersicht-empfehlung-abbrechen"
-                            class="btn btn-outline-secondary btn-w200" type="reset">
+                            class="me-1 btn btn-outline-secondary btn-w200" type="reset">
 						<?php echo ucfirst($this->p->t('ui', 'abbrechen')); ?>
                     </button>
                     <button id="approveAnrechnungUebersicht-approve-anrechnungen-confirm"
diff --git a/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php b/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
index 6c5c9e74f..24a6caeb3 100644
--- a/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
+++ b/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
@@ -204,24 +204,19 @@ $filterWidgetArray = array(
 		ucfirst($this->p->t('anrechnung', 'empfehlungsanfrageAm')),
 		ucfirst($this->p->t('anrechnung', 'empfehlungsanfrageAn'))
 	),
+
 	'datasetRepOptions' => '{
+		
 		height: func_height(this),
 		layout: "fitColumns",           // fit columns to width of table
 		persistenceID: "approveAnrechnungUebersicht_V1",
 		autoResize: false, 				// prevent auto resizing of table (false to allow adapting table size when cols are (de-)activated
-	    columnDefaults:{
-			headerFilterPlaceholder: " ",
-			tooltip:function(e, cell, onRendered){
-				return func_tooltips(cell);
-			},
-		},
 		index: "anrechnung_id",             // assign specific column as unique id (important for row indexing)
         selectable: true,               // allow row selection
         selectableRangeMode: "click",   // allow range selection using shift end click on end of range
         selectablePersistence:false,    // deselect previously selected rows when table is filtered, sorted or paginated
-        
         tableWidgetFooter: {
-			selectButtons: false
+			selectButtons: true  // tableWidgetFooter properties are checked in _renderTabulatorFooterHTML function
 		},
 		selectableCheck: function(row){
             return func_selectableCheck(row);
@@ -229,8 +224,15 @@ $filterWidgetArray = array(
         rowFormatter:function(row){
             func_rowFormatter(row,this);
         },
+		columnDefaults:{
+			headerFilterPlaceholder: " ",
+			tooltip:function(e, cell, onRendered){
+				return func_tooltips(cell);
+			}
+		}
 		
 	 }', // tabulator properties
+
 	'datasetRepFieldsDefs' => '{
 		anrechnung_id: {visible: false, headerFilter:"input"},
 		lehrveranstaltung_id: {visible: false, headerFilter:"input"},
diff --git a/public/js/TableWidget.js b/public/js/TableWidget.js
index 8f1f2f1fb..32121e9c0 100644
--- a/public/js/TableWidget.js
+++ b/public/js/TableWidget.js
@@ -557,7 +557,7 @@ var FHC_TableWidget = {
 	 * The data to be displayed are retrived from the parameter data
 	 */
 	_renderDatasetTabulator: function(tableWidgetDiv, data) {
-
+		
 		// Checks if options were given and returns them
 		var options = FHC_TableWidget._getRepresentationOptions(data);
 		// Checks if record fields definitions were given and returns them
@@ -641,6 +641,7 @@ var FHC_TableWidget = {
  		 */
 		if (typeof options.tableWidgetFooter != 'undefined' && options.tableWidgetFooter != null)
 		{
+			console.log("this are the options i am intereseted in:",options)
 			var tabulatorFooterHTML = _renderTabulatorFooterHTML(options.tableWidgetFooter);
 			tableWidgetDiv.find('#tableWidgetFooter').append(tabulatorFooterHTML);
 		}
@@ -718,7 +719,7 @@ var FHC_TableWidget = {
 	_getRepresentationOptions: function(data) {
 
 		var options = {}; // eventually contains options fot the representation
-
+		console.log("here is the data before it was parsed",data.datasetRepresentationOptions)
 		// Checks if options were given
 		if (data.hasOwnProperty("datasetRepresentationOptions") && data.datasetRepresentationOptions != "")
 		{
@@ -730,7 +731,7 @@ var FHC_TableWidget = {
 				options = tmpOptions;
 			}
 		}
-
+		
 		return options;
 	},
 
@@ -909,10 +910,11 @@ function _renderTabulatorHeaderCollapseHTML(tableWidgetDiv,arrayTabulatorColumns
 function _renderTabulatorFooterHTML(tableWidgetFooterOptions){
 
 	var tabulatorFooterHTML = '';
-
+	console.log("footer options",tableWidgetFooterOptions)
 	// If property selectButtons is true, render 'Alle auswaehlen / Alle abwaehlen' buttons
 	if (typeof tableWidgetFooterOptions.selectButtons != 'undefined' && tableWidgetFooterOptions.selectButtons == true)
 	{
+		
 		tabulatorFooterHTML += '<div class="btn-toolbar" role="toolbar">';
 		tabulatorFooterHTML += '<div class="btn-group" role="group">';
 		tabulatorFooterHTML += '' +
diff --git a/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js b/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
index 4ca43376d..f351776d1 100644
--- a/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
+++ b/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
@@ -179,7 +179,7 @@ function func_selectableCheck(row){
 
 // Calculate dynamically sum of all LV ECTS by Student and display, when maximum ECTS are exceeded.
 // data = selected data, rows = selected rows
-function func_rowSelectionChanged(data, rows){
+function func_rowSelectionChanged(data, rows, tabulatorInstance){
     
     if (tabulator != null)
     {
@@ -187,15 +187,12 @@ function func_rowSelectionChanged(data, rows){
         selectedPrestudentWithAccumulatedLvEcts = approveAnrechnung.getSumLvEctsByPreStudent(data);
 
         // Loop through all active rows
-        // rowManager
-        //! getting the rowManager throught the tabulator instance saved in the window object (saved in the jquery_wrapper) of the browser
-        var rowManager = window.table.rowManager;
+        
+        var rowManager = tabulatorInstance.rowManager;
+
         for (var i = 0; i < rowManager.activeRows.length; i++) {
 
             // Reinitialize row -> triggers formatters.
-            //selectedRows[i].rerenderRowCells(true);
-            //selectedRows[i].reformat();
-            
             rowManager.activeRows[i].reinitialize();
             
             
@@ -261,18 +258,14 @@ $(function(){
     const hasReadOnlyAccess = $('#formApproveAnrechnungUebersicht').data('readonly');
     const hasCreateAnrechnungAccess = $('#formApproveAnrechnungUebersicht').data('createaccess');
    
-   
-    $(document).on("tableInit", function(event) {
-     
+    // tableInit is called in the jquery_wrapper when the tableBuilt event was finished
+    $(document).on("tableInit", function(event,tabulatorInstance) {
+     console.log("instance",tabulatorInstance);
         func_tableBuilt($("#tableWidgetTabulator"))
         
+        // event rowSelectionChanged now has to be attached to the tabulator after instantiation and after the tableBuilt event
+        $("#tableWidgetTabulator").tabulator("on","rowSelectionChanged",(data,rows)=>{func_rowSelectionChanged(data,rows,tabulatorInstance)});
        
-        $("#tableWidgetTabulator").tabulator("on","rowSelectionChanged",func_rowSelectionChanged);
-       
-        /*  table.tabulator("on","dataLoaded", function() {
-            // do something
-            console.log("data was loaded");
-        }); */
     });
 	
     // Pruefen ob Promise unterstuetzt wird
@@ -301,6 +294,7 @@ $(function(){
         approveAnrechnung.disableCreateAnrechnungButton();
     }
 
+    //! this function should not be needed in the approveAnrechnungUebersicht
     // Set status alert color
     approveAnrechnung.setStatusAlertColor();
 
@@ -664,14 +658,11 @@ $(function(){
     // Break Genehmigung abgeben
     $('#approveAnrechnungUebersicht-empfehlung-abbrechen').click(function(){
         genehmigung_panel.slideUp('slow');
-
     })
 
     // Break Ablehnung abgeben
     $('#approveAnrechnungUebersicht-begruendung-abbrechen').click(function(){
-
         begruendung_panel.slideUp('slow');
-
     })
 
     // Copy Begruendung into textarea
diff --git a/public/js/tabulator/jquery_wrapper.js b/public/js/tabulator/jquery_wrapper.js
index d93e9bf7c..041829d04 100644
--- a/public/js/tabulator/jquery_wrapper.js
+++ b/public/js/tabulator/jquery_wrapper.js
@@ -57,7 +57,7 @@
                           }
                           console.log(props);
                           console.log('bhbuilt end');
-						  $(document).trigger("tableInit");
+						  $(document).trigger("tableInit",[this]);
                         });
 
 			//retrieve properties on prototype

From e7480eb9ff69818a2369af7fb2a4355167c39e7f Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 13 Mar 2024 12:23:45 +0100
Subject: [PATCH 0476/1461] hotfix, editProfil modal in fetchProfilUpdates
 component

---
 application/controllers/Cis/Profil.php        |   2 +-
 public/js/apps/Cis/Profil.js                  |  39 +++++--
 .../Cis/Profil/MitarbeiterProfil.js           |   2 +-
 .../ProfilComponents/FetchProfilUpdates.js    | 107 ++++++++++++++++--
 .../EditProfilComponents/EditAdresse.js       |   3 +-
 .../EditProfilComponents/EditKontakt.js       |  10 +-
 6 files changed, 143 insertions(+), 20 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index b8b6fa685..7ed1454ed 100755
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -246,7 +246,7 @@ class Profil extends Auth_Controller
 		if ($nation == "A") {
 			if (isset($zip) && $zip > 999 && $zip < 32000) {
 
-				$gemeinde_res = $this->GemeindeModel->loadWhere(['ortschaftskennziffer' => $zip]);
+				$gemeinde_res = $this->GemeindeModel->loadWhere(['plz' => $zip]);
 				if (isError($gemeinde_res)) {
 					show_error("error while trying to query bis.tbl_gemeinde");
 				}
diff --git a/public/js/apps/Cis/Profil.js b/public/js/apps/Cis/Profil.js
index c8219eb94..d0ffacbb8 100755
--- a/public/js/apps/Cis/Profil.js
+++ b/public/js/apps/Cis/Profil.js
@@ -148,11 +148,36 @@ const profilApp = Vue.createApp({
 				return null;
 			}
 
+
 			return this.data.kontakte.filter(kontakt => {
 				return kontakt.zustellung;
 			}).map(kon =>{
 				return kon.kontakt_id;
 			});
+
+			//TODO counting the zustellKontakte/Adresse does not work correctly
+			/* let kontakteArray = [];
+			
+			if(this.data.profilUpdates.length){
+				kontakteArray = kontakteArray.concat(this.data.profilUpdates.filter((update)=>
+				{
+					
+					return update.requested_change.zustellung;
+				}).map((kontant)=>{
+					return kontant.requested_change.kontakt_id
+				}))
+
+			}
+			
+			if(!this.data.profilUpdates.length || !this.data.kontakte.every(kontakt=> this.data.profilUpdates.some(update=>update.requested_change.kontakt_id == kontakt.kontakt_id))){
+				kontakteArray = kontakteArray.concat(this.data.kontakte.filter(kontakt => {
+					return kontakt.zustellung;
+				}).map(kon =>{
+					return kon.kontakt_id;
+				}));
+			}
+			
+			return [...(new Set(kontakteArray))]; */
 		},
 	},
 	computed:{
@@ -234,13 +259,13 @@ const profilApp = Vue.createApp({
 					  data:kontakt
 					}})
 				 },
-				 Password_Change : {
-					title:"Passwort Ändern",
-					view:"ChangePassword",
-					data:{
-					  test:"testvalue",
-					  }
-					},
+				//  Password_Change : {
+				// 	title:"Passwort Ändern",
+				// 	view:"ChangePassword",
+				// 	data:{
+				// 	  test:"testvalue",
+				// 	  }
+				// 	},
 				},
 			 
 			};
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index aa4467ce8..5b851b654 100755
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -174,7 +174,6 @@ export default {
 
     fetchProfilUpdates: function(){
       Vue.$fhcapi.ProfilUpdate.selectProfilRequest().then((res)=>{
-        
         if(!res.error){
           this.data.profilUpdates = res.data?.length ? res.data.sort(this.sortProfilUpdates) : null ; 
         }
@@ -240,6 +239,7 @@ export default {
 
   template: /*html*/` 
   <div class="container-fluid text-break fhc-form"  >
+  
     <edit-profil v-if="showModal" ref="editModal" @hideBsModal="hideEditProfilModal" :value="JSON.parse(JSON.stringify(editData))" title="Profil bearbeiten"></edit-profil>
           <div class="row">
           
diff --git a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
index 373b3f22c..16225f896 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
@@ -1,6 +1,7 @@
 import EditProfil from "../ProfilModal/EditProfil.js";
 //? EditProfil is the modal used to edit the profil updates
 export default {
+  components:{EditProfil},
   props: {
     data: {
       type: Object,
@@ -10,9 +11,93 @@ export default {
 
   emits: ["fetchUpdates"],
   data() {
-    return {};
+    return {
+      showUpdateModal:false,
+      content:null,
+      editProfilTitle:"Profil bearbeiten",
+    };
   },
   methods: {
+
+    hideEditProfilModal: function(){
+      
+      //? checks the editModal component property result, if the user made a successful request or not
+      if(this.$refs.updateEditModal.result){
+        this.$emit("fetchUpdates");
+      }else{
+        // when modal was closed without submitting request
+      }
+      this.showUpdateModal=false;
+     
+    },
+
+    async showEditProfilModal(updateRequest) {
+      let view = this.getView(updateRequest.topic, updateRequest.status);
+      
+      let data = null;
+      let content = null;
+      let files = null;
+      let withFiles = false;
+
+      if (view === "TextInputDokument") {
+        data = {
+          titel: updateRequest.topic,
+          value: updateRequest.requested_change.value,
+        };
+
+        const filesFromDatabase = await Vue.$fhcapi.ProfilUpdate.getProfilRequestFiles(updateRequest.profil_update_id).then(res=>{
+          return res.data;
+        });
+
+        files= filesFromDatabase;
+        if(files){
+          withFiles = true;
+        }
+      } else {
+        data = updateRequest.requested_change;
+      }
+
+      content = {
+        updateID: updateRequest.profil_update_id,
+        view: view,
+        data: data,
+        withFiles: withFiles,
+        topic: updateRequest.topic,
+        files: files,
+        
+      };
+
+      //?TODO: check if updateRequest.uid is a mitarbeiter, if so add the flag isMitarbeiter:true
+      if(view === "EditAdresse"){
+        const isMitarbeiter = await Vue.$fhcapi.UserData.isMitarbeiter(updateRequest.uid).then(res => res.data);
+
+        if(isMitarbeiter){
+          content['isMitarbeiter']=isMitarbeiter;
+        }
+      } 
+
+      //? adds the status information if the profil update request was rejected or accepted
+      if (updateRequest.status !== "pending") {
+        content["status"] = updateRequest.status;
+        content["status_message"] = updateRequest.status_message;
+        content["status_timestamp"] = updateRequest.status_timestamp;
+      }
+
+      //? update data of the reactive content
+      this.content = content;
+      this.editProfilTitle = updateRequest.topic;
+
+      //? only show the popup if also the right content is available
+      if (content) {
+        this.showUpdateModal = true;
+        // after a state change, wait for the DOM updates to complete
+        Vue.nextTick(()=>{
+          this.$refs.updateEditModal.show();
+        });
+      }
+      
+    },
+
     deleteRequest: function (item) {
       Vue.$fhcapi.ProfilUpdate.deleteProfilRequest(item.profil_update_id).then(
         (res) => {
@@ -55,6 +140,9 @@ export default {
           break;
       }
     },
+
+
+    // OLD way to open the editProfil modal, which was dynamically added to the html and then removed
     async openModal(updateRequest) {
       let view = this.getView(updateRequest.topic, updateRequest.status);
       
@@ -126,15 +214,20 @@ export default {
       }
     },
   },
-  created() {},
+  created() {
+
+   
+  },
   computed: {},
   template: `
-    <div  class="card text-nowrap" >
+    <div  class="card " >
+    
+    <edit-profil v-if="showUpdateModal" ref="updateEditModal" @hideBsModal="hideEditProfilModal" :value="content" :title="editProfilTitle"></edit-profil>
                       <div class="card-header">
                       Profil Updates
                       </div>
                       <div class="card-body" >
-    <div class="table-responsive">
+    <div class="table-responsive text-nowrap">
         <table class="m-0  table  table-hover">
             <thead >
                 <tr >
@@ -155,11 +248,11 @@ export default {
                 
                 <div class="d-flex flex-row justify-content-evenly">
                 <template v-if="item.topic.toLowerCase().includes('delete')">
-                <div  class="align-middle text-center"><i role="button" @click="openModal(item)" class="fa fa-eye"></i></div>
+                <div  class="align-middle text-center"><i role="button" @click="showEditProfilModal(item)" class="fa fa-eye"></i></div>
                 </template>
 
                 <template v-else >
-                <div class="align-middle text-center" ><i style="color:#00639c" @click="openModal(item)" role="button" class="fa fa-edit"></i></div>
+                <div class="align-middle text-center" ><i style="color:#00639c" @click="showEditProfilModal(item)" role="button" class="fa fa-edit"></i></div>
                 </template>
                 
                 <div class="align-middle text-center"><i style="color:red" role="button" @click="deleteRequest(item)" class="fa fa-trash"></i></div>
@@ -172,7 +265,7 @@ export default {
                 
                 <td  class="align-middle text-center">
                 <div class="d-flex flex-row justify-content-evenly">
-                <i  role="button" @click="openModal(item)" class="fa fa-eye"></i>
+                <i  role="button" @click="showEditProfilModal(item)" class="fa fa-eye"></i>
                 </div>
                 </td>
                 
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js
index 8ddc12fe2..840f23c4b 100755
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js
@@ -54,6 +54,8 @@ export default {
             }
             
             this.$emit('profilUpdate',this.isChanged?this.data:null);
+            // update the zustellAdressen count
+            this.zustellAdressenCount = this.getZustelladressenCount();
         },
     },
 
@@ -95,7 +97,6 @@ export default {
     template:/*html*/`
      <div class="gy-3 row justify-content-center align-items-center">
      
-     
      <!-- warning message for too many zustellungs Adressen -->
      <div v-if="showZustellAdressenWarning" class="col-12 ">
      <div class="card bg-danger mx-2">
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditKontakt.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditKontakt.js
index 06368c097..4823c88c1 100755
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditKontakt.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditKontakt.js
@@ -14,6 +14,10 @@ export default {
     },
     inject:["getZustellkontakteCount"],
     methods:{
+
+        getNewKontanteCount:function(){
+            console.log(this.getZustellkontakteCount());
+        },
         updateValue: function(event,bind){
 
             if(bind === 'zustellung'){
@@ -25,12 +29,13 @@ export default {
             
             
             this.$emit('profilUpdate',this.isChanged?this.data:null);
-            
+            this.zustellKontakteCount = this.getZustellkontakteCount();
             
         },
     },
     computed:{
         showZustellKontakteWarning: function(){
+
             if(this.zustellKontakteCount){
                 
                 if(this.zustellKontakteCount.includes(this.data.kontakt_id)){
@@ -61,8 +66,7 @@ export default {
     `
     
     <div class="gy-3 row align-items-center justify-content-center">    
-    
-    
+
     <!-- warning message for too many zustellungs Kontakte -->
     <div v-if="showZustellKontakteWarning" class="col-12 ">
     <div class="card bg-danger mx-2">

From 87384f42f99b3ae7b2990dbe1fb7c7998f3eefef Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 13 Mar 2024 13:31:53 +0100
Subject: [PATCH 0477/1461] Update Logik Lehrverband: as function, with
 transactions

---
 .../controllers/components/stv/Status.php     | 165 +++++-------------
 .../education/Studentlehrverband_model.php    | 111 ++++++++++++
 .../models/organisation/Lehrverband_model.php |  28 +--
 3 files changed, 174 insertions(+), 130 deletions(-)

diff --git a/application/controllers/components/stv/Status.php b/application/controllers/components/stv/Status.php
index 80bc69e17..60e740133 100644
--- a/application/controllers/components/stv/Status.php
+++ b/application/controllers/components/stv/Status.php
@@ -57,10 +57,6 @@ class Status extends FHC_Controller
 
 	public function addNewStatus($prestudent_id)
 	{
-		$granted_Ass = $this->permissionlib->getSTG_isEntitledFor('assistenz') ? $this->permissionlib->getSTG_isEntitledFor('assistenz') : [];
-		$granted_Adm = $this->permissionlib->getSTG_isEntitledFor('admin') ? $this->permissionlib->getSTG_isEntitledFor('admin') : [];
-		$granted = array_merge($granted_Ass, $granted_Adm);
-
 		//get Studiengang von prestudent_id
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 		$this->PrestudentModel->addJoin('public.tbl_person p', 'ON (p.person_id = public.tbl_prestudent.person_id)');
@@ -82,7 +78,8 @@ class Status extends FHC_Controller
 
 		$isStudent = false;
 
-		if(!in_array($stg, $granted)){
+		if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg) )
+		{
 			$result = "Sie haben keine Schreibrechte fuer diesen Studiengang!";
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 			return $this->outputJson($result);
@@ -98,8 +95,7 @@ class Status extends FHC_Controller
 		$bestaetigtam = $this->input->post('bestaetigtam');
 		$bewerbung_abgeschicktamum = $this->input->post('bewerbung_abgeschicktamum');
 		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
-		$studienplan_id = $this->input->post('studienplan_id');
-		$anmerkung  = $this->input->post('anmerkung');
+		$anmerkung = $this->input->post('anmerkung');
 		$statusgrund_id = $this->input->post('statusgrund_id');
 		$rt_stufe = $this->input->post('rt_stufe');
 		$bestaetigtvon = $uid;
@@ -120,13 +116,13 @@ class Status extends FHC_Controller
 			$lastStatusData = current(getData($result));
 
 		//Different handling depending on newStatus
-		if($status_kurzbz == 'Absolvent' || $status_kurzbz == 'Diplomand')
+		//Todo(manu) check if these checks makes sense?
+/*		if($status_kurzbz == 'Absolvent' || $status_kurzbz == 'Diplomand')
 		{
 			//$studiensemester = $semester_aktuell; //TODO(Manu) oder ist hier defaultsemester gemeint?
 			$ausbildungssemester = $lastStatusData->ausbildungssemester;
-		}
+		}*/
 
-		//Todo(manu) check if this check makes sense?
 		/*		if($status_kurzbz != 'Student')
 				{
 					$ausbildungssemester = $lastStatusData->ausbildungssemester;
@@ -208,7 +204,8 @@ class Status extends FHC_Controller
 		}
 
 		//check if studentrolle already exists
-		if($status_kurzbz == 'Student')
+		//TODO(manu) eigener Code für Diplomand?
+		if($status_kurzbz == 'Student' || $status_kurzbz == 'Diplomand' )
 		{
 			$this->load->model('crm/Student_model', 'StudentModel');
 			$result = $this->StudentModel->checkIfExistingStudentRolle($prestudent_id);
@@ -228,12 +225,12 @@ class Status extends FHC_Controller
 			}
 		}
 
-		$hasPermissionToSkipStatusCheck =  $this->permissionlib->isBerechtigt('student/keine_studdatuspruefung');
-		/*		var_dump($hasPermissionToSkipStatusCheck);
+		$isBerechtigtNoStudstatusCheck =  $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung');
+		/*		var_dump(isBerechtigtNoStudstatusCheck);
 
 				$basis =  $this->permissionlib->isBerechtigt('basis/prestudent');
 				var_dump($basis);*/
-		if(!$hasPermissionToSkipStatusCheck)
+		if(!$isBerechtigtNoStudstatusCheck)
 		{
 			//Block STATUSCHECKS
 			$new_status_datum = isset($datum) ? $datum  : date('Y-m-d');
@@ -268,7 +265,7 @@ class Status extends FHC_Controller
 
 
 		// Start DB transaction
-		$this->db->trans_start(false);
+		$this->db->trans_begin(); // Beginnen der Transaktion
 
 		$result = $this->PrestudentstatusModel->insert(
 			[
@@ -278,6 +275,7 @@ class Status extends FHC_Controller
 				'studiensemester_kurzbz' => $studiensemester_kurzbz,
 				'studienplan_id' => $lastStatusData->studienplan_id,
 				'ausbildungssemester' => $ausbildungssemester,
+				'anmerkung' => $anmerkung,
 				'statusgrund_id' => $statusgrund_id,
 				'insertvon' => $uid,
 				'insertamum' => date('c'),
@@ -288,9 +286,6 @@ class Status extends FHC_Controller
 			]
 		);
 
-		// Transaction complete!
-		$this->db->trans_complete();
-
 		if ($this->db->trans_status() === false || isError($result))
 		{
 			$this->db->trans_rollback();
@@ -321,60 +316,20 @@ class Status extends FHC_Controller
 			if (!hasData($result)) {
 				$this->outputJson($result);
 			}
+
 			$studentData = current(getData($result));
 			$verband = $studentData->verband == '' ? '' : $studentData->verband;
 			$gruppe = $studentData->gruppe == '' ? '' : $studentData->gruppe;
+			$studiengang_kz = $studentData->studiengang_kz;
 
-			//check if Studentlehrverband exists
+			//process studentlehrverband
 			$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
-			$result = $this->StudentlehrverbandModel->checkIfStudentLehrverbandExists($student_uid, $studiensemester_kurzbz);
-			if (isError($result)) {
+			$result = $this->StudentlehrverbandModel->processStudentlehrverband($student_uid, $studiengang_kz, $ausbildungssemester, $verband, $gruppe, $studiensemester_kurzbz);
+			if ($this->db->trans_status() === false || isError($result))
+			{
+				$this->db->trans_rollback();
 				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson(getError($result));
-			}
-			if ($result->retval == "0")
-			{
-				$result = $this->StudentlehrverbandModel->insert(
-					[
-						'student_uid' => $student_uid,
-						'studiensemester_kurzbz' => $studiensemester_kurzbz,
-						'semester' => $ausbildungssemester,
-						'verband' => $verband,
-						'gruppe' => $gruppe,
-						'insertamum' => date('c'),
-						'insertvon' => $uid,
-						'studiengang_kz' => $studentData->studiengang_kz
-					]);
-
-				if (isError($result)) {
-					$this->db->trans_rollback();
-					$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-
-					return $this->outputJson("Error in insert Studentlehrverband");
-				}
-			}
-			else
-			{
-				$result = $this->StudentlehrverbandModel->update(
-					[
-						'student_uid' => $student_uid,
-						'studiensemester_kurzbz' => $studiensemester_kurzbz
-					],
-					[
-						'semester' => $ausbildungssemester,
-						'verband' => $verband,
-						'gruppe' => $gruppe,
-						'updateamum' => date('c'),
-						'updatevon' => $uid,
-						'studiengang_kz' => $studentData->studiengang_kz
-					]);
-
-				if (isError($result)) {
-					$this->db->trans_rollback();
-					$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-
-					return $this->outputJson("Error in insert Studentlehrverband");
-				}
+				return $this->outputJson($result->code);
 			}
 		}
 		$this->db->trans_commit();
@@ -429,31 +384,6 @@ class Status extends FHC_Controller
 		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
 		$deletePrestudent = false;
 
-		//TODO(Manu) check permissions: warum sind beim Löschen andere Berechtigungen?
-		//ich darf keine Stati anlegen, aber löschen, wenn mehr als einer übrig???
-		/*		$granted_Ass = $this->permissionlib->getSTG_isEntitledFor('assistenz');
-				$granted_Adm = $this->permissionlib->getSTG_isEntitledFor('admin');
-				$granted = array_merge($granted_Ass, $granted_Adm);
-
-				$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-				$result = $this->PrestudentModel->load([
-					'prestudent_id'=> $prestudent_id,
-				]);
-				if(isError($result))
-				{
-					$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-					return $this->outputJson(getError($result));
-				}
-				$result = current(getData($result));
-				$stg = $result->studiengang_kz;
-
-				if(!in_array($stg, $granted))
-				{
-					$result = "Sie haben keine Schreibrechte fuer diesen Studiengang!";
-					$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-					return $this->outputJson($result);
-				}*/
-
 		$isBerechtigtAdmin = $this->permissionlib->isBerechtigt('admin', null, 'suid');
 		$isBerechtigtNoStudstatusCheck = $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung', null, 'suid');
 
@@ -590,11 +520,6 @@ class Status extends FHC_Controller
 
 	public function updateStatus($key_prestudent_id, $key_status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester)
 	{
-		$hasPermissionToSkipStatusCheck =  $this->permissionlib->isBerechtigt('student/keine_studdatuspruefung');
-		$granted_Ass = $this->permissionlib->getSTG_isEntitledFor('assistenz') ? $this->permissionlib->getSTG_isEntitledFor('assistenz') : [];
-		$granted_Adm = $this->permissionlib->getSTG_isEntitledFor('admin') ? $this->permissionlib->getSTG_isEntitledFor('admin') : [];
-		$granted = array_merge($granted_Ass, $granted_Adm);
-
 		$isStudent = false;
 
 		//get Studiengang von prestudent_id
@@ -611,14 +536,13 @@ class Status extends FHC_Controller
 
 		$stg = $result->studiengang_kz;
 
-		if(!in_array($stg, $granted)){
+		if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg) )
+		{
 			$result = "Sie haben keine Schreibrechte fuer diesen Studiengang!";
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 			return $this->outputJson($result);
 		}
 
-
-
 		//var_dump($key_prestudent_id, $key_status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester);
 
 		/*		$this->load->library('form_validation');
@@ -647,7 +571,7 @@ class Status extends FHC_Controller
 		$bestaetigtvon = $uid;
 
 		//check if Bismeldestichtag erreicht
-		if(!$hasPermissionToSkipStatusCheck)
+		if(!isBerechtigtNoStudstatusCheck)
 		{
 			$this->load->model('codex/Bismeldestichtag_model', 'BismeldestichtagModel');
 			$result = $this->BismeldestichtagModel->checkIfMeldestichtagErreicht($datum, $studiensemester_kurzbz);
@@ -681,7 +605,7 @@ class Status extends FHC_Controller
 		}
 
 		//check if studentrolle already exists
-		if($status_kurzbz == 'Student')
+		if($status_kurzbz == 'Student' || $status_kurzbz == 'Diplomand')
 		{
 			$this->load->model('crm/Student_model', 'StudentModel');
 			$result = $this->StudentModel->checkIfExistingStudentRolle($prestudent_id);
@@ -702,7 +626,7 @@ class Status extends FHC_Controller
 		}
 
 
-		if(!$hasPermissionToSkipStatusCheck)
+		if(!isBerechtigtNoStudstatusCheck)
 		{
 			//Block STATUSCHECKS
 
@@ -722,7 +646,7 @@ class Status extends FHC_Controller
 
 		if($isStudent)
 		{
-			//Studentlehrverband anlegen
+			//check Studentlehrverband
 			$this->load->model('crm/Student_model', 'StudentModel');
 			$result = $this->StudentModel->checkIfUid($prestudent_id);
 			if (isError($result)) {
@@ -733,7 +657,7 @@ class Status extends FHC_Controller
 
 			//check if Lehrverband exists
 			$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
-			$result = $this->StudentlehrverbandModel->checkIfLehrverbandExists($student_uid, $studiensemester_kurzbz);
+			$result = $this->StudentlehrverbandModel->checkIfStudentlehrverbandExists($student_uid, $studiensemester_kurzbz);
 			if (isError($result)) {
 				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 				return $this->outputJson(getError($result));
@@ -768,7 +692,7 @@ class Status extends FHC_Controller
 				{
 					$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 
-					return $this->outputJson("Error in insert Studentlehrverband");
+					return $this->outputJson("Error during insert Studentlehrverband");
 				}
 			}
 		}
@@ -816,10 +740,6 @@ class Status extends FHC_Controller
 
 	public function advanceStatus($key_prestudent_id, $key_status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester)
 	{
-		$granted_Ass = $this->permissionlib->getSTG_isEntitledFor('assistenz') ? $this->permissionlib->getSTG_isEntitledFor('assistenz') : [];
-		$granted_Adm = $this->permissionlib->getSTG_isEntitledFor('admin') ? $this->permissionlib->getSTG_isEntitledFor('admin') : [];
-		$granted = array_merge($granted_Ass, $granted_Adm);
-
 		//get Studiengang von prestudent_id
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 		$result = $this->PrestudentModel->load([
@@ -834,12 +754,14 @@ class Status extends FHC_Controller
 
 		$stg = $result->studiengang_kz;
 
-		if(!in_array($stg, $granted)){
+		if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg) )
+		{
 			$result = "Sie haben keine Schreibrechte fuer diesen Studiengang!";
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 			return $this->outputJson($result);
 		}
 
+
 		//Data Vorrücken
 		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
 
@@ -939,7 +861,7 @@ class Status extends FHC_Controller
 			return $this->outputJson(getError($result));
 		}
 
-		//TodoManu -> check if student, was wenn kein Studentstatus
+		//TODO(manu)-> check if student, was wenn kein Studentstatus
 		//Studentlehrverband anlegen
 		$this->load->model('crm/Student_model', 'StudentModel');
 		$result = $this->StudentModel->checkIfUid($key_prestudent_id);
@@ -950,7 +872,7 @@ class Status extends FHC_Controller
 		}
 		$student_uid = $result->retval;
 
-		//check if Studentehrverband exists
+		//check if Studentlehrverband exists
 		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
 		$result = $this->StudentlehrverbandModel->checkIfStudentlehrverbandExists($student_uid, $studiensem_next);
 		if (isError($result))
@@ -973,7 +895,13 @@ class Status extends FHC_Controller
 				return $this->outputJson("Error in insert Studentlehrverband");
 			}
 			$lvbData = current(getData($result));
-			var_dump($lvbData);
+		//	var_dump($lvbData);
+
+			//Check Lehrverband!
+			//check if exists lvb mit studiengang_kz, semester, verband
+/*			$this->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
+			$result = $this->LehrverbandModel->checkIfLehrverbandExists($student_uid, $studiensem_next);*/
+
 
 			$result = $this->StudentlehrverbandModel->insert(
 				[
@@ -1002,10 +930,6 @@ class Status extends FHC_Controller
 	public function confirmStatus($key_prestudent_id, $key_status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester)
 	{
 		$uid = getAuthUID();
-		//TODO(Manu) check: Annahme, dass hier immer suid bei Berechtigung STG vergeben wird!
-		$granted_Ass = $this->permissionlib->getSTG_isEntitledFor('assistenz') ? $this->permissionlib->getSTG_isEntitledFor('assistenz') : [];
-		$granted_Adm = $this->permissionlib->getSTG_isEntitledFor('admin') ? $this->permissionlib->getSTG_isEntitledFor('admin') : [];
-		$granted = array_merge($granted_Ass, $granted_Adm);
 
 		//get Studiengang von prestudent_id
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
@@ -1021,7 +945,8 @@ class Status extends FHC_Controller
 
 		$stg = $result->studiengang_kz;
 
-		if(!in_array($stg, $granted)){
+		if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg) )
+		{
 			$result = "Sie haben keine Schreibrechte fuer diesen Studiengang!";
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 			return $this->outputJson($result);
@@ -1077,8 +1002,8 @@ class Status extends FHC_Controller
 			[
 				'bestaetigtam' => date('c'),
 				'bestaetigtvon' => $uid,
-				'updateamum='=> date('c'),
-				'updatevon=' => $uid
+				'updateamum' => date('c'),
+				'updatevon' => $uid
 			]
 		);
 		if (isError($result))
diff --git a/application/models/education/Studentlehrverband_model.php b/application/models/education/Studentlehrverband_model.php
index 632dd302b..38791a812 100644
--- a/application/models/education/Studentlehrverband_model.php
+++ b/application/models/education/Studentlehrverband_model.php
@@ -45,4 +45,115 @@ class Studentlehrverband_model extends DB_Model
 			return success("1","Studentlehrverband vorhanden!");
 		}
 	}
+
+	public function processStudentlehrverband($student_uid, $studiengang_kz, $ausbildungssemester, $verband, $gruppe, $studiensemester_kurzbz)
+	{
+		$uid = getAuthUID();
+		$this->db->trans_begin(); // Start Transaktion
+
+		$this->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
+		$result = $this->LehrverbandModel->checkIfLehrverbandExists($studiengang_kz, $ausbildungssemester, $verband, $gruppe);
+		if (isError($result)) {
+			$this->db->trans_rollback();
+			return error("0", "Error during update Lehrverband");
+		}
+
+		if ($result->retval == "0") {
+			// Übergeordneten Lehrverband check and/or insert
+			$result = $this->LehrverbandModel->checkIfLehrverbandExists($studiengang_kz, $ausbildungssemester, '', '');
+			if (isError($result)) {
+				$this->db->trans_rollback();
+				return error("0", "Error during update Lehrverband");
+			}
+
+			if ($result->retval == "0")
+			{
+				$result = $this->LehrverbandModel->insert([
+					'studiengang_kz' => $studiengang_kz,
+					'semester' => $ausbildungssemester,
+					'verband' => '',
+					'gruppe' => '',
+					'aktiv' => true,
+					'bezeichnung' => 'Ab-Unterbrecher'
+				]);
+
+				if ($this->db->trans_status() === false || isError($result))
+				{
+					$this->db->trans_rollback();
+					return error("0", "Error during insert lehrverband übergeordnet");
+				}
+			}
+
+			// Lehrverband insert
+			$bezeichnung = $verband == 'A' ? ' Abbrecher' : 'Unterbrecher';
+			$result = $this->LehrverbandModel->insert([
+				'studiengang_kz' => $studiengang_kz,
+				'semester' => $ausbildungssemester,
+				'verband' => $verband,
+				'gruppe' => $gruppe,
+				'bezeichnung' => $bezeichnung,
+				'aktiv' => true
+			]);
+
+			if ($this->db->trans_status() === false || isError($result)) {
+				$this->db->trans_rollback();
+				return error("0", "Error during insert lehrverband");
+			}
+		}
+
+		// Studentlehrverband insert or update
+		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
+		$result = $this->StudentlehrverbandModel->checkIfStudentLehrverbandExists($student_uid, $studiensemester_kurzbz);
+		if (isError($result)) {
+			$this->db->trans_rollback();
+			return error(getError($result));
+		}
+
+		if ($result->retval == "0") {
+			$result = $this->StudentlehrverbandModel->insert([
+				'student_uid' => $student_uid,
+				'studiensemester_kurzbz' => $studiensemester_kurzbz,
+				'semester' => $ausbildungssemester,
+				'verband' => $verband,
+				'gruppe' => $gruppe,
+				'insertamum' => date('c'),
+				'insertvon' => $uid,
+				'studiengang_kz' => $studiengang_kz
+			]);
+			if ($this->db->trans_status() === false || isError($result)) {
+				$this->db->trans_rollback();
+				return error("0", "Error during insert studentlehrverband");
+			}
+		}
+		else
+		{
+			$result = $this->StudentlehrverbandModel->update(
+				[
+					'student_uid' => $student_uid,
+					'studiensemester_kurzbz' => $studiensemester_kurzbz
+				],
+				[
+					'semester' => $ausbildungssemester,
+					'verband' => $verband,
+					'gruppe' => $gruppe,
+					'updateamum' => date('c'),
+					'updatevon' => $uid,
+					'studiengang_kz' => $studiengang_kz
+				]
+			);
+			if ($this->db->trans_status() === false || isError($result)) {
+				$this->db->trans_rollback();
+				return error("0", "Error during update studentlehrverband");
+			}
+		}
+
+		// finish transaktion
+		if ($this->db->trans_status() === false || isError($result)) {
+			$this->db->trans_rollback();
+			return error("0", "Error during insert/update Studentlehrverband");
+		} else {
+			$this->db->trans_commit();
+			return success();
+		}
+	}
 }
diff --git a/application/models/organisation/Lehrverband_model.php b/application/models/organisation/Lehrverband_model.php
index 43c0ac917..2336e3408 100644
--- a/application/models/organisation/Lehrverband_model.php
+++ b/application/models/organisation/Lehrverband_model.php
@@ -14,28 +14,36 @@ class Lehrverband_model extends DB_Model
 
 	/**
 	 * Check if Lehrverband already exists
-	 * @param string $student_id
-	 * @param string $studiensemester_kurzbz
-	 * @return 1: if Rolle exists, 0: if it doesn't
+	 * @param Integer $studiengang_kz
+	 * @param Integer $semester
+	 * @param char $verband
+	 * @param char $gruppe
+	 * @return 1: if Lehrverband exists, 0: if it doesn't
 	 */
-	public function checkIfLehrverbandExists($student_uid, $studiensemester_kurzbz)
+	public function checkIfLehrverbandExists($studiengang_kz, $semester, $verband, $gruppe)
 	{
 		$qry = "SELECT
 					*
 				FROM 
-				    public.tbl_studentlehrverband
+				    public.tbl_lehrverband
 				WHERE
-					student_uid = ? 
+					studiengang_kz = ? 
 				AND
-				    studiensemester_kurzbz = ?";
+				    semester = ?
+				AND
+				    verband = ?
+				AND
+				    gruppe = ?
+				    
+				    ";
 
-		$result = $this->execQuery($qry, array($student_uid, $studiensemester_kurzbz));
+		$result = $this->execQuery($qry, array($studiengang_kz, $semester, $verband, $gruppe));
 
-		if (isError($result))
+		if(isError($result))
 		{
 			return error($result);
 		}
-		elseif (!hasData($result))
+		elseif(!hasData($result))
 		{
 			return success("0", "Kein Lehrverband vorhanden!");
 		}

From c0e6552c085786fbf72720f14efb0ab38dc10601 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 13 Mar 2024 13:44:08 +0100
Subject: [PATCH 0478/1461] fixes zustellKontakteCount in EditKontakt

---
 public/js/apps/Cis/Profil.js                  | 25 ++++++++++---------
 .../EditProfilComponents/EditKontakt.js       | 20 ++++-----------
 2 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/public/js/apps/Cis/Profil.js b/public/js/apps/Cis/Profil.js
index d0ffacbb8..6f0eec2c8 100755
--- a/public/js/apps/Cis/Profil.js
+++ b/public/js/apps/Cis/Profil.js
@@ -148,17 +148,10 @@ const profilApp = Vue.createApp({
 				return null;
 			}
 
-
-			return this.data.kontakte.filter(kontakt => {
-				return kontakt.zustellung;
-			}).map(kon =>{
-				return kon.kontakt_id;
-			});
-
-			//TODO counting the zustellKontakte/Adresse does not work correctly
-			/* let kontakteArray = [];
+			//TODO: not sure if how it is implemented is the best way
+			let kontakteArray = [];
 			
-			if(this.data.profilUpdates.length){
+			if(this.data.profilUpdates?.length){
 				kontakteArray = kontakteArray.concat(this.data.profilUpdates.filter((update)=>
 				{
 					
@@ -169,7 +162,7 @@ const profilApp = Vue.createApp({
 
 			}
 			
-			if(!this.data.profilUpdates.length || !this.data.kontakte.every(kontakt=> this.data.profilUpdates.some(update=>update.requested_change.kontakt_id == kontakt.kontakt_id))){
+			if(!this.data.profilUpdates?.length || !this.data.kontakte.filter(kontakt => kontakt.zustellung).every(kontakt=> this.data.profilUpdates.some(update=>update.requested_change.kontakt_id == kontakt.kontakt_id))){
 				kontakteArray = kontakteArray.concat(this.data.kontakte.filter(kontakt => {
 					return kontakt.zustellung;
 				}).map(kon =>{
@@ -177,7 +170,15 @@ const profilApp = Vue.createApp({
 				}));
 			}
 			
-			return [...(new Set(kontakteArray))]; */
+			return [...(new Set(kontakteArray))]; 
+
+			// OLD version
+			// return this.data.kontakte.filter(kontakt => {
+			// 	return kontakt.zustellung;
+			// }).map(kon =>{
+			// 	return kon.kontakt_id;
+			// });
+
 		},
 	},
 	computed:{
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditKontakt.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditKontakt.js
index 4823c88c1..1a0bc94b9 100755
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditKontakt.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditKontakt.js
@@ -15,9 +15,7 @@ export default {
     inject:["getZustellkontakteCount"],
     methods:{
 
-        getNewKontanteCount:function(){
-            console.log(this.getZustellkontakteCount());
-        },
+        
         updateValue: function(event,bind){
 
             if(bind === 'zustellung'){
@@ -35,19 +33,11 @@ export default {
     },
     computed:{
         showZustellKontakteWarning: function(){
-
-            if(this.zustellKontakteCount){
-                
-                if(this.zustellKontakteCount.includes(this.data.kontakt_id)){
-                    //? if the adresse was already saved
-                    return false;
-                }
-                return this.zustellKontakteCount.length && this.data.zustellung;
+            // if zustellKontakteCount is not 0 and the own kontakt has the flag zustellung set to true
+            if(!this.zustellKontakteCount.includes(this.data.kontakt_id)){
+                return this.data.zustellung && this.zustellKontakteCount.length 
             }
-            //? if this.zustellAdressenCount is still not set by the api call and is still null
-            return false;
-            
-
+            return this.zustellKontakteCount.length >=2 && this.data.zustellung;
         },
         isChanged: function(){
             //? returns true if the original passed data object was changed 

From 3c2190b2800cf0ccea6c3cca07a79c12154d493e Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 13 Mar 2024 14:01:29 +0100
Subject: [PATCH 0479/1461] fixes zustellAdressenCount for EditAdresse and
 formats code files

---
 public/js/apps/Cis/Profil.js                  | 613 ++++++++++--------
 .../Cis/Profil/MitarbeiterProfil.js           |  92 ++-
 .../ProfilComponents/FetchProfilUpdates.js    |  97 +--
 .../EditProfilComponents/EditAdresse.js       | 189 +++---
 .../EditProfilComponents/EditKontakt.js       | 104 ++-
 5 files changed, 572 insertions(+), 523 deletions(-)

diff --git a/public/js/apps/Cis/Profil.js b/public/js/apps/Cis/Profil.js
index 6f0eec2c8..40bedaf97 100755
--- a/public/js/apps/Cis/Profil.js
+++ b/public/js/apps/Cis/Profil.js
@@ -6,299 +6,350 @@ import fhcapifactory from "../api/fhcapifactory.js";
 import Loading from "../../components/Loader.js";
 
 Vue.$fhcapi = fhcapifactory;
-Vue.$collapseFormatter  = function(data){
-	//data - an array of objects containing the column title and value for each cell
-	var container = document.createElement("div");
-	container.classList.add("tabulator-collapsed-row");
-	container.classList.add("text-break");
-  
-	var list = document.createElement("div");
-	list.classList.add("row");
-	
-	
-	container.appendChild(list);
-  
-	data.forEach(function(col){
-		let item = document.createElement("div");
-		item.classList.add("col-6");
-		let item2 = document.createElement("div");
-		item2.classList.add("col-6");
-		
-		item.innerHTML = "<strong>" + col.title + "</strong>";
-		item2.innerHTML = col.value?col.value:"-";
-		
-		list.appendChild(item);
-		list.appendChild(item2);
-	});
-  
-	return Object.keys(data).length ? container : "";
-  };
+Vue.$collapseFormatter = function (data) {
+  //data - an array of objects containing the column title and value for each cell
+  var container = document.createElement("div");
+  container.classList.add("tabulator-collapsed-row");
+  container.classList.add("text-break");
 
-  
+  var list = document.createElement("div");
+  list.classList.add("row");
+
+  container.appendChild(list);
+
+  data.forEach(function (col) {
+    let item = document.createElement("div");
+    item.classList.add("col-6");
+    let item2 = document.createElement("div");
+    item2.classList.add("col-6");
+
+    item.innerHTML = "<strong>" + col.title + "</strong>";
+    item2.innerHTML = col.value ? col.value : "-";
+
+    list.appendChild(item);
+    list.appendChild(item2);
+  });
+
+  return Object.keys(data).length ? container : "";
+};
 
 const profilApp = Vue.createApp({
-	
-	components: {
-		StudentProfil,
-		MitarbeiterProfil,
-		ViewStudentProfil,
-		ViewMitarbeiterProfil,
-		Loading,
-	},
-	data() {
-		return {
-			//? loading property is used for showing/hiding the loading modal
-			loading:false,
-			view:null,
-			data:null,
-			// notfound is null by default, but contains an UID if no user exists with that UID
-			notFoundUID:null,
-			
-		}
-	},
-	//? use function syntax for provide so that we can access `this`
-	provide() {
-		return {
-			setLoading: (newValue)=>{
-				
-				this.loading = newValue;
-			},
-			getZustellkontakteCount: this.zustellKontakteCount,
-			getZustelladressenCount: this.zustellAdressenCount,
-			collapseFunction:  (e, column)=> {
-		
-				//* check if property doesn't exist already and add it to the reactive this properties
-				if(this[e.target.id] === undefined){
-				this[e.target.id] = true
-			
-				} 
-				this[e.target.id]=!this[e.target.id];
-			
-				//* gets all event icons of the different rows to use the onClick event later
-				let allClickableIcons = column._column.cells.map((row) => {
-				return row.element.children[0];
-				});
-			
-				//* changes the icon that shows or hides all the collapsed columns
-				//* if the replace function does not find the class to replace, it just simply returns false
-				if (this[e.target.id]) {
-				e.target.classList.replace("fa-angle-up", "fa-angle-down");
-				} else {
-				e.target.classList.replace("fa-angle-down", "fa-angle-up");
-				}
-			
-				//* changes the icon for every collapsed column to open or closed
-				if (this[e.target.id]) {
-				allClickableIcons
-					.filter((column) => {
-					return !column.classList.contains("open");
-					})
-					.forEach((col) => {
-					col.click();
-					});
-				} else {
-				allClickableIcons
-					.filter((column) => {
-					return column.classList.contains("open");
-					})
-					.forEach((col) => {
-					col.click();
-					});
-				}
-		  },
-		  sortProfilUpdates: (ele1,ele2)=>{
+  components: {
+    StudentProfil,
+    MitarbeiterProfil,
+    ViewStudentProfil,
+    ViewMitarbeiterProfil,
+    Loading,
+  },
 
-			let result = 0;
-			if(ele1.status === 'pending'){
-			  result= -1;
-			}
-			else if(ele1.status === 'accepted'){
-			  result= ele2.status ==='rejected'? -1 : 1;
-			}
-			else{
-			  result= 1;
-			}
-			//? if they have the same status the insert date is used for ordering
-			if(ele1.status === ele2.status){
-			  result= new Date(ele2.insertamum.split('.').reverse().join('-')) - new Date(ele1.insertamum.split('.').reverse().join('-'));
-			}
-			return result;
-		  }
-		}
-		
-	},
-	methods:{
-		zustellAdressenCount(){
-			if(!this.data || !this.data.adressen){
-				
-				return null;
-			}
+  data() {
+    return {
+      //? loading property is used for showing/hiding the loading modal
+      loading: false,
+      view: null,
+      data: null,
+      // notfound is null by default, but contains an UID if no user exists with that UID
+      notFoundUID: null,
+    };
+  },
 
-			return this.data.adressen.filter(adresse => {
-				return adresse.zustelladresse;
-			}).map(adr => {
-				
-				return adr.adresse_id;
-			});
-			
-		},
+  //? use function syntax for provide so that we can access `this`
+  provide() {
+    return {
+      setLoading: (newValue) => {
+        this.loading = newValue;
+      },
+      getZustellkontakteCount: this.zustellKontakteCount,
+      getZustelladressenCount: this.zustellAdressenCount,
+      collapseFunction: (e, column) => {
+        //* check if property doesn't exist already and add it to the reactive this properties
+        if (this[e.target.id] === undefined) {
+          this[e.target.id] = true;
+        }
+        this[e.target.id] = !this[e.target.id];
 
-		zustellKontakteCount(){
-			if(!this.data || !this.data.kontakte){
-				return null;
-			}
+        //* gets all event icons of the different rows to use the onClick event later
+        let allClickableIcons = column._column.cells.map((row) => {
+          return row.element.children[0];
+        });
 
-			//TODO: not sure if how it is implemented is the best way
-			let kontakteArray = [];
-			
-			if(this.data.profilUpdates?.length){
-				kontakteArray = kontakteArray.concat(this.data.profilUpdates.filter((update)=>
-				{
-					
-					return update.requested_change.zustellung;
-				}).map((kontant)=>{
-					return kontant.requested_change.kontakt_id
-				}))
+        //* changes the icon that shows or hides all the collapsed columns
+        //* if the replace function does not find the class to replace, it just simply returns false
+        if (this[e.target.id]) {
+          e.target.classList.replace("fa-angle-up", "fa-angle-down");
+        } else {
+          e.target.classList.replace("fa-angle-down", "fa-angle-up");
+        }
 
-			}
-			
-			if(!this.data.profilUpdates?.length || !this.data.kontakte.filter(kontakt => kontakt.zustellung).every(kontakt=> this.data.profilUpdates.some(update=>update.requested_change.kontakt_id == kontakt.kontakt_id))){
-				kontakteArray = kontakteArray.concat(this.data.kontakte.filter(kontakt => {
-					return kontakt.zustellung;
-				}).map(kon =>{
-					return kon.kontakt_id;
-				}));
-			}
-			
-			return [...(new Set(kontakteArray))]; 
+        //* changes the icon for every collapsed column to open or closed
+        if (this[e.target.id]) {
+          allClickableIcons
+            .filter((column) => {
+              return !column.classList.contains("open");
+            })
+            .forEach((col) => {
+              col.click();
+            });
+        } else {
+          allClickableIcons
+            .filter((column) => {
+              return column.classList.contains("open");
+            })
+            .forEach((col) => {
+              col.click();
+            });
+        }
+      },
+      sortProfilUpdates: (ele1, ele2) => {
+        let result = 0;
+        if (ele1.status === "pending") {
+          result = -1;
+        } else if (ele1.status === "accepted") {
+          result = ele2.status === "rejected" ? -1 : 1;
+        } else {
+          result = 1;
+        }
+        //? if they have the same status the insert date is used for ordering
+        if (ele1.status === ele2.status) {
+          result =
+            new Date(ele2.insertamum.split(".").reverse().join("-")) -
+            new Date(ele1.insertamum.split(".").reverse().join("-"));
+        }
+        return result;
+      },
+    };
+  },
 
-			// OLD version
-			// return this.data.kontakte.filter(kontakt => {
-			// 	return kontakt.zustellung;
-			// }).map(kon =>{
-			// 	return kon.kontakt_id;
-			// });
+  methods: {
+    zustellAdressenCount() {
+      if (!this.data || !this.data.adressen) {
+        return null;
+      }
 
-		},
-	},
-	computed:{
-		
+      let adressenArray = [];
+      if (this.data.profilUpdates?.length) {
+        adressenArray = adressenArray.concat(
+          this.data.profilUpdates
+            .filter((update) => {
+              return update.requested_change.zustelladresse;
+            })
+            .map((adresse) => {
+              return adresse.requested_change.adresse_id;
+            })
+        );
+      }
 
-		filteredEditData(){
-			if(!this.data){
-				return;
-			}
-			
-			
-			return {
-			  view:null,
-			  data:{
-			  Personen_Informationen : {
-				title:"Personen Informationen",
-				view:null,
-				data:{
-				  
-				  vorname: {
-					title:"vorname",
-					view:"TextInputDokument",
-					withFiles:true,
-					data:{
-					  titel:"vorname",
-					  value:this.data.vorname,
-					  
-					}},
-					nachname: {
-					  title:"nachname",
-					  view:"TextInputDokument",
-					  withFiles:true,
-					  data:{
-						titel:"nachname",
-						value:this.data.nachname,
-					  }
-					},
-					titel:{
-					  title:"titel",
-					  view:"TextInputDokument",
-					  withFiles:true,
-					  data:{
-						titel:"titel",
-						value:this.data.titel,
-					  }
-					},
-					postnomen:{
-					  title:"postnomen",
-					  view:"TextInputDokument",
-					  withFiles:true,
-					  data:{
-						titel:"postnomen",
-						value:this.data.postnomen,
-					  }
-					},
-				  }
-				},
-				Private_Kontakte: {
-				  title:"Private Kontakte" ,
-				  data:this.data.kontakte?.filter(item => {
-					return !this.data.profilUpdates?.some((update) => update.status ==='pending' && update.requested_change?.kontakt_id === item.kontakt_id);
-				  }).map(kontakt => {
-					return {
-					  listview:'Kontakt',
-					  view:'EditKontakt',
-					  data:kontakt
-					}})
-				 },
-				Private_Adressen: {
-				  title: "Private Adressen",
-				  data:this.data.adressen?.filter(item => {
-					return !this.data.profilUpdates?.some(update => {
-					  return  update.status ==='pending' &&  update.requested_change?.adresse_id == item.adresse_id;
-					})
-				  }).map(kontakt => {
-					return {
-					  listview:'Adresse',
-					  view:'EditAdresse',
-					  data:kontakt
-					}})
-				 },
-				//  Password_Change : {
-				// 	title:"Passwort Ändern",
-				// 	view:"ChangePassword",
-				// 	data:{
-				// 	  test:"testvalue",
-				// 	  }
-				// 	},
-				},
-			 
-			};
-		  },
-	  
-	},
+      if (
+        !this.data.profilUpdates?.length ||
+        !this.data.adressen
+          .filter((adresse) => adresse.zustelladresse)
+          .every((adresse) =>
+            this.data.profilUpdates.some(
+              (update) =>
+                update.requested_change.adresse_id == adresse.adresse_id
+            )
+          )
+      ) {
+        adressenArray = adressenArray.concat(
+          this.data.adressen
+            .filter((adresse) => {
+              return adresse.zustelladresse;
+            })
+            .map((adr) => {
+              return adr.adresse_id;
+            })
+        );
+      }
 
-	watch:{
-		loading:function(newValue,oldValue){
-			if(newValue){this.$refs.loadingModalRef.show();}else{
-				this.$refs.loadingModalRef.hide();
-			}
-		}
-	},
+      return [...new Set(adressenArray)];
 
+      // OLD version
+      // return this.data.adressen.filter(adresse => {
+      // 	return adresse.zustelladresse;
+      // }).map(adr => {
 
-	created(){
+      // 	return adr.adresse_id;
+      // });
+    },
 
-		//? uid contains the last part of the uri
-		let uid = location.pathname.split('/').pop();
-		
-		Vue.$fhcapi.UserData.getView(uid).then((res)=>{
-			if(!res.data){
-				this.notFoundUID=uid;
-			}else{
-				this.view = res.data?.view;
-				this.data = res.data?.data;
-			}
-			
-		});
-	},
-	template:`
+    zustellKontakteCount() {
+      if (!this.data || !this.data.kontakte) {
+        return null;
+      }
+
+      //TODO: not sure if how it is implemented is the best way
+      let kontakteArray = [];
+
+      if (this.data.profilUpdates?.length) {
+        kontakteArray = kontakteArray.concat(
+          this.data.profilUpdates
+            .filter((update) => {
+              return update.requested_change.zustellung;
+            })
+            .map((kontant) => {
+              return kontant.requested_change.kontakt_id;
+            })
+        );
+      }
+
+      if (
+        !this.data.profilUpdates?.length ||
+        !this.data.kontakte
+          .filter((kontakt) => kontakt.zustellung)
+          .every((kontakt) =>
+            this.data.profilUpdates.some(
+              (update) =>
+                update.requested_change.kontakt_id == kontakt.kontakt_id
+            )
+          )
+      ) {
+        kontakteArray = kontakteArray.concat(
+          this.data.kontakte
+            .filter((kontakt) => {
+              return kontakt.zustellung;
+            })
+            .map((kon) => {
+              return kon.kontakt_id;
+            })
+        );
+      }
+
+      return [...new Set(kontakteArray)];
+
+      // OLD version
+      // return this.data.kontakte.filter(kontakt => {
+      // 	return kontakt.zustellung;
+      // }).map(kon =>{
+      // 	return kon.kontakt_id;
+      // });
+    },
+  },
+
+  computed: {
+    filteredEditData() {
+      if (!this.data) {
+        return;
+      }
+
+      return {
+        view: null,
+        data: {
+          Personen_Informationen: {
+            title: "Personen Informationen",
+            view: null,
+            data: {
+              vorname: {
+                title: "vorname",
+                view: "TextInputDokument",
+                withFiles: true,
+                data: {
+                  titel: "vorname",
+                  value: this.data.vorname,
+                },
+              },
+              nachname: {
+                title: "nachname",
+                view: "TextInputDokument",
+                withFiles: true,
+                data: {
+                  titel: "nachname",
+                  value: this.data.nachname,
+                },
+              },
+              titel: {
+                title: "titel",
+                view: "TextInputDokument",
+                withFiles: true,
+                data: {
+                  titel: "titel",
+                  value: this.data.titel,
+                },
+              },
+              postnomen: {
+                title: "postnomen",
+                view: "TextInputDokument",
+                withFiles: true,
+                data: {
+                  titel: "postnomen",
+                  value: this.data.postnomen,
+                },
+              },
+            },
+          },
+          Private_Kontakte: {
+            title: "Private Kontakte",
+            data: this.data.kontakte
+              ?.filter((item) => {
+                return !this.data.profilUpdates?.some(
+                  (update) =>
+                    update.status === "pending" &&
+                    update.requested_change?.kontakt_id === item.kontakt_id
+                );
+              })
+              .map((kontakt) => {
+                return {
+                  listview: "Kontakt",
+                  view: "EditKontakt",
+                  data: kontakt,
+                };
+              }),
+          },
+          Private_Adressen: {
+            title: "Private Adressen",
+            data: this.data.adressen
+              ?.filter((item) => {
+                return !this.data.profilUpdates?.some((update) => {
+                  return (
+                    update.status === "pending" &&
+                    update.requested_change?.adresse_id == item.adresse_id
+                  );
+                });
+              })
+              .map((kontakt) => {
+                return {
+                  listview: "Adresse",
+                  view: "EditAdresse",
+                  data: kontakt,
+                };
+              }),
+          },
+          //  Password_Change : {
+          // 	title:"Passwort Ändern",
+          // 	view:"ChangePassword",
+          // 	data:{
+          // 	  test:"testvalue",
+          // 	  }
+          // 	},
+        },
+      };
+    },
+  },
+
+  watch: {
+    loading: function (newValue, oldValue) {
+      if (newValue) {
+        this.$refs.loadingModalRef.show();
+      } else {
+        this.$refs.loadingModalRef.hide();
+      }
+    },
+  },
+
+  created() {
+    //? uid contains the last part of the uri
+    let uid = location.pathname.split("/").pop();
+
+    Vue.$fhcapi.UserData.getView(uid).then((res) => {
+      if (!res.data) {
+        this.notFoundUID = uid;
+      } else {
+        this.view = res.data?.view;
+        this.data = res.data?.data;
+      }
+    });
+  },
+  
+  template: `
 	<div>
 	
 		<div v-if="notFoundUID">
@@ -312,10 +363,8 @@ const profilApp = Vue.createApp({
 		</div>
 		
 	
-	</div>`
-	
-	
+	</div>`,
 });
 
-profilApp.use(primevue.config.default,{zIndex: {overlay: 9999}});
+profilApp.use(primevue.config.default, { zIndex: { overlay: 9999 } });
 profilApp.mount("#content");
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 5b851b654..952dcd948 100755
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -1,17 +1,15 @@
-
 import { CoreFilterCmpt } from "../../../components/filter/Filter.js";
 import EditProfil from "./ProfilModal/EditProfil.js";
 import Adresse from "./ProfilComponents/Adresse.js";
 import Kontakt from "./ProfilComponents/Kontakt.js";
 import FetchProfilUpdates from "./ProfilComponents/FetchProfilUpdates.js";
-import Mailverteiler from "./ProfilComponents/Mailverteiler.js"; 
+import Mailverteiler from "./ProfilComponents/Mailverteiler.js";
 import AusweisStatus from "./ProfilComponents/FhAusweisStatus.js";
 import QuickLinks from "./ProfilComponents/QuickLinks.js";
-import ProfilEmails from "./ProfilComponents/ProfilEmails.js"
+import ProfilEmails from "./ProfilComponents/ProfilEmails.js";
 import RoleInformation from "./ProfilComponents/RoleInformation.js";
 import ProfilInformation from "./ProfilComponents/ProfilInformation.js";
 
-
 export default {
   components: {
     CoreFilterCmpt,
@@ -26,11 +24,13 @@ export default {
     RoleInformation,
     ProfilInformation,
   },
-  inject: ['sortProfilUpdates','collapseFunction'],
+
+  inject: ["sortProfilUpdates", "collapseFunction"],
+
   data() {
     return {
-      showModal:false,
-      
+      showModal: false,
+
       funktionen_table_options: {
         height: 300,
         layout: "fitColumns",
@@ -91,6 +91,7 @@ export default {
           },
         ],
       },
+
       betriebsmittel_table_options: {
         height: 300,
         layout: "fitColumns",
@@ -134,59 +135,53 @@ export default {
   },
 
   props: {
-		data: Object,
+    data: Object,
     editData: Object,
-	},
-  
+  },
+
   methods: {
-    hideEditProfilModal: function(){
-      
+    hideEditProfilModal: function () {
       //? checks the editModal component property result, if the user made a successful request or not
-      if(this.$refs.editModal.result){
+      if (this.$refs.editModal.result) {
         Vue.$fhcapi.ProfilUpdate.selectProfilRequest()
-        .then((request) =>{
-          if(!request.error){
-            this.data.profilUpdates = request.data;
-            this.data.profilUpdates.sort(this.sortProfilUpdates);
-            
-          }else{
-            console.log("Error when fetching profile updates: " +res.data);
-          }
-        })
-        .catch(err=>{
-          console.log(err);
-        });
-      }else{
+          .then((request) => {
+            if (!request.error) {
+              this.data.profilUpdates = request.data;
+              this.data.profilUpdates.sort(this.sortProfilUpdates);
+            } else {
+              console.log("Error when fetching profile updates: " + res.data);
+            }
+          })
+          .catch((err) => {
+            console.log(err);
+          });
+      } else {
         // when modal was closed without submitting request
       }
-      this.showModal=false;
-     
+      this.showModal = false;
     },
 
     showEditProfilModal() {
       this.showModal = true;
       // after a state change, wait for the DOM updates to complete
-      Vue.nextTick(()=>{
+      Vue.nextTick(() => {
         this.$refs.editModal.show();
       });
-      
     },
 
-    fetchProfilUpdates: function(){
-      Vue.$fhcapi.ProfilUpdate.selectProfilRequest().then((res)=>{
-        if(!res.error){
-          this.data.profilUpdates = res.data?.length ? res.data.sort(this.sortProfilUpdates) : null ; 
+    fetchProfilUpdates: function () {
+      Vue.$fhcapi.ProfilUpdate.selectProfilRequest().then((res) => {
+        if (!res.error) {
+          this.data.profilUpdates = res.data?.length
+            ? res.data.sort(this.sortProfilUpdates)
+            : null;
         }
       });
     },
-
   },
 
   computed: {
-
-    
-
-     profilInformation() {
+    profilInformation() {
       if (!this.data) {
         return {};
       }
@@ -198,9 +193,8 @@ export default {
         Anrede: this.data.anrede,
         Titel: this.data.titel,
         Postnomen: this.data.postnomen,
-        foto_sperre:this.data.foto_sperre,
-        foto:this.data.foto,
-
+        foto_sperre: this.data.foto_sperre,
+        foto: this.data.foto,
       };
     },
 
@@ -213,20 +207,21 @@ export default {
         Geburtsdatum: this.data.gebdatum,
         Geburtsort: this.data.gebort,
         Kurzzeichen: this.data.kurzbz,
-        Telefon:  (this.data.standort_telefon?this.data.standort_telefon:"") + " " + this.data.telefonklappe,
+        Telefon:
+          (this.data.standort_telefon ? this.data.standort_telefon : "") +
+          " " +
+          this.data.telefonklappe,
         Büro: this.data.ort_kurzbz,
       };
     },
-
-
   },
- 
+
   created() {
     //? sorts the profil Updates: pending -> accepted -> rejected
     this.data.profilUpdates?.sort(this.sortProfilUpdates);
   },
+  
   mounted() {
-    
     this.$refs.betriebsmittelTable.tabulator.on("tableBuilt", () => {
       this.$refs.betriebsmittelTable.tabulator.setData(this.data.mittel);
     });
@@ -234,10 +229,9 @@ export default {
     this.$refs.funktionenTable.tabulator.on("tableBuilt", () => {
       this.$refs.funktionenTable.tabulator.setData(this.data.funktionen);
     });
-
   },
 
-  template: /*html*/` 
+  template: /*html*/ ` 
   <div class="container-fluid text-break fhc-form"  >
   
     <edit-profil v-if="showModal" ref="editModal" @hideBsModal="hideEditProfilModal" :value="JSON.parse(JSON.stringify(editData))" title="Profil bearbeiten"></edit-profil>
diff --git a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
index 16225f896..9ca6889ef 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
@@ -1,39 +1,39 @@
 import EditProfil from "../ProfilModal/EditProfil.js";
 //? EditProfil is the modal used to edit the profil updates
 export default {
-  components:{EditProfil},
+  components: { EditProfil },
   props: {
     data: {
       type: Object,
     },
   },
-  inject:['getZustellkontakteCount','getZustelladressenCount'],
+
+  inject: ["getZustellkontakteCount", "getZustelladressenCount"],
 
   emits: ["fetchUpdates"],
+
   data() {
     return {
-      showUpdateModal:false,
-      content:null,
-      editProfilTitle:"Profil bearbeiten",
+      showUpdateModal: false,
+      content: null,
+      editProfilTitle: "Profil bearbeiten",
     };
   },
-  methods: {
 
-    hideEditProfilModal: function(){
-      
+  methods: {
+    hideEditProfilModal: function () {
       //? checks the editModal component property result, if the user made a successful request or not
-      if(this.$refs.updateEditModal.result){
+      if (this.$refs.updateEditModal.result) {
         this.$emit("fetchUpdates");
-      }else{
+      } else {
         // when modal was closed without submitting request
       }
-      this.showUpdateModal=false;
-     
+      this.showUpdateModal = false;
     },
 
     async showEditProfilModal(updateRequest) {
       let view = this.getView(updateRequest.topic, updateRequest.status);
-      
+
       let data = null;
       let content = null;
       let files = null;
@@ -45,12 +45,15 @@ export default {
           value: updateRequest.requested_change.value,
         };
 
-        const filesFromDatabase = await Vue.$fhcapi.ProfilUpdate.getProfilRequestFiles(updateRequest.profil_update_id).then(res=>{
-          return res.data;
-        });
+        const filesFromDatabase =
+          await Vue.$fhcapi.ProfilUpdate.getProfilRequestFiles(
+            updateRequest.profil_update_id
+          ).then((res) => {
+            return res.data;
+          });
 
-        files= filesFromDatabase;
-        if(files){
+        files = filesFromDatabase;
+        if (files) {
           withFiles = true;
         }
       } else {
@@ -64,17 +67,18 @@ export default {
         withFiles: withFiles,
         topic: updateRequest.topic,
         files: files,
-        
       };
 
       //?TODO: check if updateRequest.uid is a mitarbeiter, if so add the flag isMitarbeiter:true
-      if(view === "EditAdresse"){
-        const isMitarbeiter = await Vue.$fhcapi.UserData.isMitarbeiter(updateRequest.uid).then(res => res.data);
+      if (view === "EditAdresse") {
+        const isMitarbeiter = await Vue.$fhcapi.UserData.isMitarbeiter(
+          updateRequest.uid
+        ).then((res) => res.data);
 
-        if(isMitarbeiter){
-          content['isMitarbeiter']=isMitarbeiter;
+        if (isMitarbeiter) {
+          content["isMitarbeiter"] = isMitarbeiter;
         }
-      } 
+      }
 
       //? adds the status information if the profil update request was rejected or accepted
       if (updateRequest.status !== "pending") {
@@ -91,11 +95,10 @@ export default {
       if (content) {
         this.showUpdateModal = true;
         // after a state change, wait for the DOM updates to complete
-        Vue.nextTick(()=>{
+        Vue.nextTick(() => {
           this.$refs.updateEditModal.show();
         });
       }
-      
     },
 
     deleteRequest: function (item) {
@@ -111,8 +114,7 @@ export default {
       );
     },
     getView: function (topic, status) {
-
-      if(!(status === "pending")){
+      if (!(status === "pending")) {
         return "Status";
       }
 
@@ -141,11 +143,10 @@ export default {
       }
     },
 
-
     // OLD way to open the editProfil modal, which was dynamically added to the html and then removed
     async openModal(updateRequest) {
       let view = this.getView(updateRequest.topic, updateRequest.status);
-      
+
       let data = null;
       let content = null;
       let files = null;
@@ -157,12 +158,15 @@ export default {
           value: updateRequest.requested_change.value,
         };
 
-        const filesFromDatabase = await Vue.$fhcapi.ProfilUpdate.getProfilRequestFiles(updateRequest.profil_update_id).then(res=>{
-          return res.data;
-        });
+        const filesFromDatabase =
+          await Vue.$fhcapi.ProfilUpdate.getProfilRequestFiles(
+            updateRequest.profil_update_id
+          ).then((res) => {
+            return res.data;
+          });
 
-        files= filesFromDatabase;
-        if(files){
+        files = filesFromDatabase;
+        if (files) {
           withFiles = true;
         }
       } else {
@@ -176,17 +180,18 @@ export default {
         withFiles: withFiles,
         topic: updateRequest.topic,
         files: files,
-        
       };
 
       //?TODO: check if updateRequest.uid is a mitarbeiter, if so add the flag isMitarbeiter:true
-      if(view === "EditAdresse"){
-        const isMitarbeiter = await Vue.$fhcapi.UserData.isMitarbeiter(updateRequest.uid).then(res => res.data);
+      if (view === "EditAdresse") {
+        const isMitarbeiter = await Vue.$fhcapi.UserData.isMitarbeiter(
+          updateRequest.uid
+        ).then((res) => res.data);
 
-        if(isMitarbeiter){
-          content['isMitarbeiter']=isMitarbeiter;
+        if (isMitarbeiter) {
+          content["isMitarbeiter"] = isMitarbeiter;
         }
-      } 
+      }
 
       //? adds the status information if the profil update request was rejected or accepted
       if (updateRequest.status !== "pending") {
@@ -200,8 +205,8 @@ export default {
         EditProfil.popup({
           value: content,
           title: updateRequest.topic,
-          zustellkontakteCount:this.getZustellkontakteCount,
-          zustelladressenCount:this.getZustelladressenCount,
+          zustellkontakteCount: this.getZustellkontakteCount,
+          zustelladressenCount: this.getZustelladressenCount,
         })
           .then((res) => {
             if (res === true) {
@@ -214,11 +219,11 @@ export default {
       }
     },
   },
-  created() {
 
-   
-  },
+  created() {},
+
   computed: {},
+  
   template: `
     <div  class="card " >
     
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js
index 840f23c4b..3220818b5 100755
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js
@@ -1,100 +1,106 @@
 export default {
-    components:{
-        AutoComplete: primevue.autocomplete
-    },
-    props:{
-        
-        data:Object,
-        isMitarbeiter:{
-            type: Boolean,
-            default: false,
-        },
-    },
-    inject:["getZustelladressenCount"],
-    data(){
-        return{
-            gemeinden:[],
-            selectedNation:null,
-            nationenList:[],
-            originalValue:null,
-            zustellAdressenCount:null,
-        }
-    },
-    watch:{
-        'data.gemeinde': function(newValue, oldValue){
-            this.$emit('profilUpdate',this.isChanged?this.data:null);
-        },
-    },
-    methods:{
+  components: {
+    AutoComplete: primevue.autocomplete,
+  },
 
-        autocompleteSearch: function(event){
-            this.gemeinden = this.gemeinden.map(gemeinde => gemeinde);     
-        },
-       
-        getGemeinde: function(){
-            //? only query the gemeinde is the nation is Austria and the PLZ is greater than 999 and less than 32000
-            if(this.data.nation && this.data.nation ==="A" && (this.data.plz && (this.data.plz >999 && this.data.plz <32000))){
-                Vue.$fhcapi.UserData.getGemeinden(this.data.nation,this.data.plz).then(res => {
-                    
-                    if(res.data.length){
-                        this.gemeinden = res.data;
-                    }
-                })
-            }else{
-                this.gemeinden = [];
+  props: {
+    data: Object,
+    isMitarbeiter: {
+      type: Boolean,
+      default: false,
+    },
+  },
+
+  inject: ["getZustelladressenCount"],
+
+  data() {
+    return {
+      gemeinden: [],
+      selectedNation: null,
+      nationenList: [],
+      originalValue: null,
+      zustellAdressenCount: null,
+    };
+  },
+
+  watch: {
+    "data.gemeinde": function (newValue, oldValue) {
+      this.$emit("profilUpdate", this.isChanged ? this.data : null);
+    },
+  },
+  
+  methods: {
+    autocompleteSearch: function (event) {
+      this.gemeinden = this.gemeinden.map((gemeinde) => gemeinde);
+    },
+
+    getGemeinde: function () {
+      //? only query the gemeinde is the nation is Austria and the PLZ is greater than 999 and less than 32000
+      if (
+        this.data.nation &&
+        this.data.nation === "A" &&
+        this.data.plz &&
+        this.data.plz > 999 &&
+        this.data.plz < 32000
+      ) {
+        Vue.$fhcapi.UserData.getGemeinden(this.data.nation, this.data.plz).then(
+          (res) => {
+            if (res.data.length) {
+              this.gemeinden = res.data;
             }
-        },
-
-        updateValue: function(event,bind){
-            //? sets the value of a property to null when an empty string is entered to keep the isChanged function valid 
-            if(bind ==="zustelladresse" ){
-                this.data[bind] = event.target.checked;
-            }else{
-                this.data[bind] = event.target.value === "" ? null : event.target.value;
-            }
-            
-            this.$emit('profilUpdate',this.isChanged?this.data:null);
-            // update the zustellAdressen count
-            this.zustellAdressenCount = this.getZustelladressenCount();
-        },
+          }
+        );
+      } else {
+        this.gemeinden = [];
+      }
     },
 
-    computed:{
-        showZustellAdressenWarning: function(){
-            if(this.zustellAdressenCount){
-                
-                if(this.zustellAdressenCount.includes(this.data.adresse_id)){
-                    //? if the adresse was already saved
-                    return false;
-                }
-                return this.zustellAdressenCount.length && this.data.zustelladresse;
-            }
-            //? if this.zustellAdressenCount is still not set by the api call and is still null
-            return false;
-        },
-        isChanged: function(){
-            if(!this.data.strasse || !this.data.plz || !this.data.ort || !this.data.typ ){
-               
-                return false;
-            }
-            return this.originalValue !== JSON.stringify(this.data);
-        },
+    updateValue: function (event, bind) {
+      //? sets the value of a property to null when an empty string is entered to keep the isChanged function valid
+      if (bind === "zustelladresse") {
+        this.data[bind] = event.target.checked;
+      } else {
+        this.data[bind] = event.target.value === "" ? null : event.target.value;
+      }
+
+      this.$emit("profilUpdate", this.isChanged ? this.data : null);
+      // update the zustellAdressen count
+      this.zustellAdressenCount = this.getZustelladressenCount();
     },
-   
-    created(){
-        
-        Vue.$fhcapi.UserData.getAllNationen().then(res => {
-            this.nationenList = res.data;
-            this.getGemeinde();
-        });
+  },
 
+  computed: {
+    showZustellAdressenWarning: function () {
+      // if zustellAdressenCount is not 0 and the own kontakt has the flag zustellung set to true
+      if (!this.zustellAdressenCount.includes(this.data.adresse_id)) {
+        return this.data.zustelladresse && this.zustellAdressenCount.length;
+      }
+      return this.zustellAdressenCount.length >= 2 && this.data.zustelladresse;
+    },
+    isChanged: function () {
+      if (
+        !this.data.strasse ||
+        !this.data.plz ||
+        !this.data.ort ||
+        !this.data.typ
+      ) {
+        return false;
+      }
+      return this.originalValue !== JSON.stringify(this.data);
+    },
+  },
 
-        this.originalValue = JSON.stringify(this.data);
-        this.zustellAdressenCount = this.getZustelladressenCount();
-        
-    },       
-    
-    template:/*html*/`
+  created() {
+    Vue.$fhcapi.UserData.getAllNationen().then((res) => {
+      this.nationenList = res.data;
+      this.getGemeinde();
+    });
+
+    this.originalValue = JSON.stringify(this.data);
+    this.zustellAdressenCount = this.getZustelladressenCount();
+  },
+
+  template: /*html*/ `
      <div class="gy-3 row justify-content-center align-items-center">
      
      <!-- warning message for too many zustellungs Adressen -->
@@ -193,6 +199,5 @@ export default {
         </div>
        
     </div>
-    `
-
-};
\ No newline at end of file
+    `,
+};
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditKontakt.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditKontakt.js
index 1a0bc94b9..6b99ff955 100755
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditKontakt.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditKontakt.js
@@ -1,57 +1,53 @@
-
 export default {
+  props: {
+    data: Object,
+  },
+
+  data() {
+    return {
+      originalValue: null,
+      zustellKontakteCount: null,
+    };
+  },
+
+  inject: ["getZustellkontakteCount"],
+
+  methods: {
+    updateValue: function (event, bind) {
+      if (bind === "zustellung") {
+        this.data[bind] = event.target.checked;
+      } else {
+        //? sets the value of a property to null when an empty string is entered to keep the isChanged function valid
+        this.data[bind] = event.target.value === "" ? null : event.target.value;
+      }
+      this.$emit("profilUpdate", this.isChanged ? this.data : null);
+      this.zustellKontakteCount = this.getZustellkontakteCount();
+    },
+  },
+
+  computed: {
+    showZustellKontakteWarning: function () {
+      // if zustellKontakteCount is not 0 and the own kontakt has the flag zustellung set to true
+      if (!this.zustellKontakteCount.includes(this.data.kontakt_id)) {
+        return this.data.zustellung && this.zustellKontakteCount.length;
+      }
+      return this.zustellKontakteCount.length >= 2 && this.data.zustellung;
+    },
+    isChanged: function () {
+      //? returns true if the original passed data object was changed
+      if (!this.data.kontakt || !this.data.kontakttyp) {
+        return false;
+      }
+      return JSON.stringify(this.data) !== this.originalValue;
+    },
+  },
+
+  created() {
+    this.originalValue = JSON.stringify(this.data);
+    this.zustellKontakteCount = this.getZustellkontakteCount();
+  },
   
-    props:{
-        data:Object,
-    },
-    data(){
-        return{
-           
-            originalValue:null,
-            zustellKontakteCount:null,
-           
-        }
-    },
-    inject:["getZustellkontakteCount"],
-    methods:{
-
-        
-        updateValue: function(event,bind){
-
-            if(bind === 'zustellung'){
-                this.data[bind] = event.target.checked;    
-            }else{
-                //? sets the value of a property to null when an empty string is entered to keep the isChanged function valid
-                this.data[bind] = event.target.value === ""  ? null: event.target.value;
-            }
-            
-            
-            this.$emit('profilUpdate',this.isChanged?this.data:null);
-            this.zustellKontakteCount = this.getZustellkontakteCount();
-            
-        },
-    },
-    computed:{
-        showZustellKontakteWarning: function(){
-            // if zustellKontakteCount is not 0 and the own kontakt has the flag zustellung set to true
-            if(!this.zustellKontakteCount.includes(this.data.kontakt_id)){
-                return this.data.zustellung && this.zustellKontakteCount.length 
-            }
-            return this.zustellKontakteCount.length >=2 && this.data.zustellung;
-        },
-        isChanged: function(){
-            //? returns true if the original passed data object was changed 
-            if(!this.data.kontakt || !this.data.kontakttyp) {return false;}
-            return JSON.stringify(this.data) !== this.originalValue;
-        }
-    },
-    created(){
-
-       
-        this.originalValue = JSON.stringify(this.data);
-        this.zustellKontakteCount = this.getZustellkontakteCount();
-    },
-    template:
+  template:
     /*html*/
     `
     
@@ -132,5 +128,5 @@ export default {
    
     </div>
   </div>
-    `
-};
\ No newline at end of file
+    `,
+};

From 9ae3a6dc29bbbcc6ed12c895a6e8729ebc7b38c8 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 13 Mar 2024 14:25:01 +0100
Subject: [PATCH 0480/1461] Form Input: label as prop

---
 public/js/components/Form/Input.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/public/js/components/Form/Input.js b/public/js/components/Form/Input.js
index accd30a0e..e36658160 100644
--- a/public/js/components/Form/Input.js
+++ b/public/js/components/Form/Input.js
@@ -24,7 +24,8 @@ export default {
 		inputGroup: Boolean,
 		type: String,
 		name: String,
-		containerClass: [String, Array, Object]
+		containerClass: [String, Array, Object],
+		label: String
 	},
 	data() {
 		return {
@@ -174,7 +175,7 @@ export default {
 			let uuid = this.$attrs.id;
 			if (this.lcType == 'datepicker')
 				uuid = this.$attrs.uid;
-			if (!uuid && this.$attrs.label)
+			if (!uuid && this.label)
 				uuid = 'fhc-form-input';
 			if (!uuid)
 				return undefined;
@@ -236,7 +237,7 @@ export default {
 	},
 	template: `
 	<component :is="!hasContainer ? 'FhcFragment' : 'div'" class="position-relative" :class="autoContainerClass">
-		<label v-if="$attrs.label && lcType != 'radio' && lcType != 'checkbox'" :for="idCmp">{{$attrs.label}}</label>
+		<label v-if="label && lcType != 'radio' && lcType != 'checkbox'" :for="idCmp">{{label}}</label>
 		<input v-if="tag == 'input'" :type="lcType" ref="input" v-model="modelValueCmp" v-bind="$attrs" :id="idCmp" :name="name" :class="validationClass" :modelValue="undefined" @input="clearValidationForThisName(); $emit('input', $event)">
 		<textarea v-else-if="tag == 'textarea'" ref="input" v-model="modelValueCmp" v-bind="$attrs" :id="idCmp" :name="name" :class="validationClass" :modelValue="undefined" @input="clearValidationForThisName(); $emit('input', $event)"></textarea>
 		<select v-else-if="tag == 'select'" ref="input" v-model="modelValueCmp" v-bind="$attrs" :id="idCmp" :name="name" :class="validationClass" :modelValue="undefined" @input="clearValidationForThisName(); $emit('input', $event)">
@@ -303,7 +304,7 @@ export default {
 			>
 			<slot></slot>
 		</component>
-		<label v-if="$attrs.label && (lcType == 'radio' || lcType == 'checkbox')" :for="idCmp" :class="!noAutoClass && 'form-check-label'">{{$attrs.label}}</label>
+		<label v-if="label && (lcType == 'radio' || lcType == 'checkbox')" :for="idCmp" :class="!noAutoClass && 'form-check-label'">{{label}}</label>
 		<div v-if="valid !== undefined && feedback.length && !noFeedback" :class="feedbackClass">
 			<template v-for="(msg, i) in feedback" :key="i">
 				<hr v-if="i" class="m-0">

From 8a835cb7f8c2c49fff7af211f1b01415dedc6728 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 13 Mar 2024 14:44:56 +0100
Subject: [PATCH 0481/1461] reset searchbar.js fixing searchbar style

---
 public/js/components/searchbar/searchbar.js | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index be3ebec7a..7c0993e8a 100755
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -27,13 +27,13 @@ export default {
       organisationunit: organisationunit
     },
     template: `
-          <form ref="searchform" class="d-flex me-3 position-relative" action="javascript:void(0);" 
+          <form ref="searchform" class="d-flex me-3" action="javascript:void(0);" 
             @focusin="this.searchfocusin" @focusout="this.searchfocusout">
             <div class="input-group me-2 bg-white">
                 <input ref="searchbox" @keyup="this.search" @focus="this.showsearchresult" 
-                    v-model="this.searchsettings.searchstr" class="form-control"
-                    type="search" placeholder="Suche..." aria-label="Search">
-                <button ref="settingsbutton" @click="this.togglesettings" class="btn btn-light border-start" type="button" id="search-filter"><i class="fas fa-cog"></i></button>
+                    v-model="this.searchsettings.searchstr" class="form-control" 
+                    type="search" placeholder="Search" aria-label="Search">
+                <button ref="settingsbutton" @click="this.togglesettings" class="btn btn-outline-secondary" type="button" id="search-filter"><i class="fas fa-cog"></i></button>
             </div>            
         
             <div v-show="this.showresult" ref="result" 
@@ -46,7 +46,6 @@ export default {
               <template v-else="" v-for="res in this.searchresult">
                 <person v-if="res.type === 'person'" :res="res" :actions="this.searchoptions.actions.person" @actionexecuted="this.hideresult"></person>
                 <employee v-else-if="res.type === 'mitarbeiter'" :res="res" :actions="this.searchoptions.actions.employee" @actionexecuted="this.hideresult"></employee>
-                <employee v-else-if="res.type === 'mitarbeiter_ohne_zuordnung'" :res="res" :actions="this.searchoptions.actions.employee" @actionexecuted="this.hideresult"></employee>
                 <organisationunit v-else-if="res.type === 'organisationunit'" :res="res" :actions="this.searchoptions.actions.organisationunit" @actionexecuted="this.hideresult"></organisationunit>
                 <raum v-else-if="res.type === 'raum'" :res="res" :actions="this.searchoptions.actions.raum" @actionexecuted="this.hideresult"></raum>
                 <div v-else="">Unbekannter Ergebnistyp: '{{ res.type }}'.</div>
@@ -79,13 +78,16 @@ export default {
         calcSearchResultExtent: function() {
             var rect = this.$refs.searchbox.getBoundingClientRect();
             //console.log(window.innerWidth + ' ' + window.innerHeight + ' ' + JSON.stringify(rect));
-             this.$refs.result.style.height = Math.floor(window.innerHeight * 0.80) + 'px';
+            this.$refs.result.style.top = Math.floor(rect.bottom + 3) + 'px';
+            this.$refs.result.style.right = Math.floor(window.innerWidth - rect.right) + 'px';
+            this.$refs.result.style.width = Math.floor(window.innerWidth * 0.75) + 'px';
+            this.$refs.result.style.height = Math.floor(window.innerHeight * 0.75) + 'px';
         },
         search: function() {
             if( this.searchtimer !== null ) {
                 clearTimeout(this.searchtimer);
             }
-            if( this.searchsettings.searchstr.length >= 2 ) {
+            if( this.searchsettings.searchstr.length >= 3 ) {
                 this.calcSearchResultExtent();
                 this.searchtimer = setTimeout(
                     this.callsearchapi,

From e32c68e0e35de5b49d6e2d535b26478a6f840cb2 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 14 Mar 2024 10:32:39 +0100
Subject: [PATCH 0482/1461] update function advanceStatus

---
 .../controllers/components/stv/Status.php     | 126 ++++++++++--------
 1 file changed, 68 insertions(+), 58 deletions(-)

diff --git a/application/controllers/components/stv/Status.php b/application/controllers/components/stv/Status.php
index 60e740133..5e8843a70 100644
--- a/application/controllers/components/stv/Status.php
+++ b/application/controllers/components/stv/Status.php
@@ -117,11 +117,11 @@ class Status extends FHC_Controller
 
 		//Different handling depending on newStatus
 		//Todo(manu) check if these checks makes sense?
-/*		if($status_kurzbz == 'Absolvent' || $status_kurzbz == 'Diplomand')
-		{
-			//$studiensemester = $semester_aktuell; //TODO(Manu) oder ist hier defaultsemester gemeint?
-			$ausbildungssemester = $lastStatusData->ausbildungssemester;
-		}*/
+		/*		if($status_kurzbz == 'Absolvent' || $status_kurzbz == 'Diplomand')
+				{
+					//$studiensemester = $semester_aktuell; //TODO(Manu) oder ist hier defaultsemester gemeint?
+					$ausbildungssemester = $lastStatusData->ausbildungssemester;
+				}*/
 
 		/*		if($status_kurzbz != 'Student')
 				{
@@ -293,6 +293,8 @@ class Status extends FHC_Controller
 			return $this->outputJson(getError($result));
 		}
 
+
+
 		if($isStudent)
 		{
 			$this->load->model('crm/Student_model', 'StudentModel');
@@ -322,6 +324,16 @@ class Status extends FHC_Controller
 			$gruppe = $studentData->gruppe == '' ? '' : $studentData->gruppe;
 			$studiengang_kz = $studentData->studiengang_kz;
 
+			//Handle Abbrecher and Unterbrecher
+			//TODO (manu) implement later with multiactions
+			// not active yet: works only for "status ändern" in FAS
+			/*			if($status_kurzbz == 'Abbrecher' || $status_kurzbz == 'Unterbrecher')
+						{
+							$ausbildungssemester = 0;
+							$gruppe = '';
+							$verband = $status_kurzbz == 'Abbrecher' ? 'A' : 'B';
+						}*/
+
 			//process studentlehrverband
 			$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
 			$result = $this->StudentlehrverbandModel->processStudentlehrverband($student_uid, $studiengang_kz, $ausbildungssemester, $verband, $gruppe, $studiensemester_kurzbz);
@@ -331,7 +343,29 @@ class Status extends FHC_Controller
 				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 				return $this->outputJson($result->code);
 			}
+
+			//Student updaten (fuer Abbrecher und Unterbrecher)
+			//not active yet: works only for "status ändern" in FAS
+			/*			$result = $this->StudentModel->update(
+							[
+								'student_uid' => $student_uid
+							],
+							[
+								'studiengang_kz' => $studiengang_kz,
+								'semester' => $ausbildungssemester,
+								'verband' => $verband,
+								'gruppe' => $gruppe,
+								'updateamum' => date('c'),
+								'updatevon' => $uid
+						]);
+						if ($this->db->trans_status() === false || isError($result))
+						{
+							$this->db->trans_rollback();
+							$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+							return $this->outputJson($result->code);
+						}*/
 		}
+
 		$this->db->trans_commit();
 
 		return $this->outputJsonSuccess(true);
@@ -740,6 +774,8 @@ class Status extends FHC_Controller
 
 	public function advanceStatus($key_prestudent_id, $key_status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester)
 	{
+		$isStudent = false;
+
 		//get Studiengang von prestudent_id
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 		$result = $this->PrestudentModel->load([
@@ -809,6 +845,7 @@ class Status extends FHC_Controller
 		}
 		if($result->retval == '1')
 		{
+			$isStudent = true;
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 			return $this->outputJson($result->code);
 		}
@@ -831,7 +868,7 @@ class Status extends FHC_Controller
 		}
 
 		// Start DB transaction
-		$this->db->trans_start(false);
+		$this->db->trans_begin();
 
 		//insert prestudentstatus
 		$uid = getAuthUID();
@@ -851,18 +888,13 @@ class Status extends FHC_Controller
 			]
 		);
 
-		// Transaction complete!
-		$this->db->trans_complete();
-
-		if ($this->db->trans_status() === false || isError($result))
+		if (isError($result))
 		{
 			$this->db->trans_rollback();
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 			return $this->outputJson(getError($result));
 		}
 
-		//TODO(manu)-> check if student, was wenn kein Studentstatus
-		//Studentlehrverband anlegen
 		$this->load->model('crm/Student_model', 'StudentModel');
 		$result = $this->StudentModel->checkIfUid($key_prestudent_id);
 		if(isError($result))
@@ -872,56 +904,34 @@ class Status extends FHC_Controller
 		}
 		$student_uid = $result->retval;
 
-		//check if Studentlehrverband exists
+		//process studentlehrverband
 		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
-		$result = $this->StudentlehrverbandModel->checkIfStudentlehrverbandExists($student_uid, $studiensem_next);
-		if (isError($result))
-		{
+		$result = $this->StudentlehrverbandModel->loadWhere(
+			array(
+				'student_uid' => $student_uid,
+				'studiensemester_kurzbz' => $key_studiensemester_kurzbz
+			)
+		);
+		if (isError($result)) {
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson(getError($result));
+			$this->outputJson($result);
 		}
-		if ($result->retval == "0")
-		{
-			//load Data Studentlehrverband
-			$result = $this->StudentlehrverbandModel->load(
-				[
-					'student_uid' => $student_uid,
-					'studiensemester_kurzbz' => $key_studiensemester_kurzbz
-				]);
-			if (isError($result))
-			{
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-
-				return $this->outputJson("Error in insert Studentlehrverband");
-			}
-			$lvbData = current(getData($result));
-		//	var_dump($lvbData);
-
-			//Check Lehrverband!
-			//check if exists lvb mit studiengang_kz, semester, verband
-/*			$this->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
-			$result = $this->LehrverbandModel->checkIfLehrverbandExists($student_uid, $studiensem_next);*/
-
-
-			$result = $this->StudentlehrverbandModel->insert(
-				[
-					'student_uid' => $student_uid,
-					'studiensemester_kurzbz' => $studiensem_next,
-					'semester' => $ausbildungssem_next,
-					'verband' => $lvbData->verband,
-					'gruppe' => $lvbData->gruppe,
-					'insertamum' => date('c'),
-					'insertvon' => $uid,
-					'studiengang_kz' => $lvbData->studiengang_kz
-				]);
-			if (isError($result))
-			{
-				$this->db->trans_rollback();
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-
-				return $this->outputJson("Error in insert Studentlehrverband");
-			}
+		if (!hasData($result)) {
+			$this->outputJson($result);
 		}
+
+		//Data of current Semester
+		$studentlvbData = current(getData($result));
+
+		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
+				$result = $this->StudentlehrverbandModel->processStudentlehrverband($student_uid, $studentlvbData->studiengang_kz, $ausbildungssem_next, $studentlvbData->verband, $studentlvbData->gruppe, $studiensem_next);
+				if ($this->db->trans_status() === false || isError($result))
+				{
+					$this->db->trans_rollback();
+					$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+					return $this->outputJson($result->code);
+				}
+
 		$this->db->trans_commit();
 
 		return $this->outputJsonSuccess(true);

From ac508a9f199397c02a890c886541bc814080bfae Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 14 Mar 2024 11:02:45 +0100
Subject: [PATCH 0483/1461] bug Anzeige Orgform

---
 .../controllers/components/stv/Status.php     | 45 +++++++++++--------
 .../Details/Prestudent/Status.js              |  2 +-
 2 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/application/controllers/components/stv/Status.php b/application/controllers/components/stv/Status.php
index 5e8843a70..99f750d4d 100644
--- a/application/controllers/components/stv/Status.php
+++ b/application/controllers/components/stv/Status.php
@@ -187,7 +187,7 @@ class Status extends FHC_Controller
 		//check if bewerberstatus exists
 		if($status_kurzbz == 'Aufgenommener' || $status_kurzbz == 'Wartender')
 		{
-			//TODO(manu) Wartender NICHT in Liste!? nur in diesem Code
+			//TODO(manu) erst später für multiactions releveant
 			//FAS: Aufnahme ist möglich: Beispiel prestudent_id = 129629
 
 			$result = $this->PrestudentstatusModel->checkIfExistingBewerberstatus($prestudent_id, $name);
@@ -346,24 +346,31 @@ class Status extends FHC_Controller
 
 			//Student updaten (fuer Abbrecher und Unterbrecher)
 			//not active yet: works only for "status ändern" in FAS
-			/*			$result = $this->StudentModel->update(
-							[
-								'student_uid' => $student_uid
-							],
-							[
-								'studiengang_kz' => $studiengang_kz,
-								'semester' => $ausbildungssemester,
-								'verband' => $verband,
-								'gruppe' => $gruppe,
-								'updateamum' => date('c'),
-								'updatevon' => $uid
-						]);
-						if ($this->db->trans_status() === false || isError($result))
-						{
-							$this->db->trans_rollback();
-							$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-							return $this->outputJson($result->code);
-						}*/
+			//Later for multiactions
+
+			/*
+			if($status_kurzbz == 'Abbrecher' || $status_kurzbz == 'Unterbrecher')
+			{
+				$result = $this->StudentModel->update(
+								[
+									'student_uid' => $student_uid
+								],
+								[
+									'studiengang_kz' => $studiengang_kz,
+									'semester' => $ausbildungssemester,
+									'verband' => $verband,
+									'gruppe' => $gruppe,
+									'updateamum' => date('c'),
+									'updatevon' => $uid
+							]);
+							if ($this->db->trans_status() === false || isError($result))
+							{
+								$this->db->trans_rollback();
+								$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+								return $this->outputJson($result->code);
+							}
+				}
+			*/
 		}
 
 		$this->db->trans_commit();
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
index c55c8a39d..23c503109 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
@@ -58,7 +58,7 @@ export default{
 					{title: "BestätigtAm", field: "format_bestaetigtam"},
 					{title: "AbgeschicktAm", field: "format_bewerbung_abgeschicktamum"},
 					{title: "Statusgrund", field: "statusgrund_kurzbz", visible: false},
-					{title: "Organisationsform", field: "ps.orgform_kurzbz", visible: false},
+					{title: "Organisationsform", field: "orgform_kurzbz", visible: false},
 					{title: "PrestudentInId", field: "prestudent_id", visible: false},
 					{title: "StudienplanId", field: "studienplan_id", visible: false},
 					{title: "Anmerkung", field: "anmerkung", visible: false},

From 8556632f904305d6951244c7058e27d1ebe1d06a Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 14 Mar 2024 11:36:42 +0100
Subject: [PATCH 0484/1461] updating approveAnrechnungDetail to boostrap5

---
 .../anrechnung/approveAnrechnungDetail.php    | 183 +++++++++---------
 .../approveAnrechnungUebersicht.php           |   2 +-
 .../lehre/anrechnung/requestAnrechnung.php    |   2 +-
 public/css/lehre/anrechnung.css               |   9 +-
 4 files changed, 102 insertions(+), 94 deletions(-)

diff --git a/application/views/lehre/anrechnung/approveAnrechnungDetail.php b/application/views/lehre/anrechnung/approveAnrechnungDetail.php
index 0970b6edd..aa1bf13d0 100644
--- a/application/views/lehre/anrechnung/approveAnrechnungDetail.php
+++ b/application/views/lehre/anrechnung/approveAnrechnungDetail.php
@@ -5,7 +5,7 @@ $this->load->view(
 		'title' => $this->p->t('anrechnung', 'anrechnungenGenehmigen'),
 		'jquery3' => true,
 		'jqueryui1' => true,
-		'bootstrap3' => true,
+		'bootstrap5' => true,
 		'fontawesome4' => true,
 		'ajaxlib' => true,
 		'dialoglib' => true,
@@ -50,7 +50,8 @@ $this->load->view(
             )
 		),
 		'customCSSs' => array(
-			'public/css/Tabulator.css'
+			'public/css/Tabulator.css',
+			'public/css/lehre/anrechnung.css'
 		),
 		'customJSs' => array(
 			'public/js/bootstrapper.js',
@@ -65,58 +66,58 @@ $this->load->view(
     <div class="container-fluid">
         <!-- header  -->
         <div class="row">
-            <div class="col-lg-12 page-header">
-                <h3>
+            <div class="col-12 my-4 page-header border-bottom">
+                <h3 class="fw-normal ">
 					<?php echo $this->p->t('anrechnung', 'anrechnungenGenehmigen'); ?>
-                    <small>| <?php echo $this->p->t('global', 'detailsicht'); ?></small>
+                    <small class="text-secondary fs-6">| <?php echo $this->p->t('global', 'detailsicht'); ?></small>
                 </h3>
             </div>
         </div>
 		<!--end header -->
 		
-        <div class="row" id="approveAnrechnungDetail-generell" data-readonly="<?php echo json_encode($hasReadOnlyAccess)?>">
-            <div class="col-xs-8">
+        <div class="row " id="approveAnrechnungDetail-generell" data-readonly="<?php echo json_encode($hasReadOnlyAccess)?>">
+            <div class="col-8">
 				<!-- Antragsdaten -->
-				<div class="row">
-					<div class="col-lg-12">
-						<div class="panel panel-default">
-							<div class="panel-heading">
+				<div class="row mb-4">
+					<div class="col-12">
+						<div class="card">
+							<div class="card-header">
 								<span class="text-uppercase"><b><?php echo $this->p->t('anrechnung', 'antrag'); ?></b></span>&emsp;
 								<span class="approveAnrechnungDetail-anrechnungInfoTooltip"
-									  data-toggle="tooltip" data-placement="right"
+									  data-bs-toggle="tooltip" data-bs-placement="right"
 									  title="<?php echo $this->p->t('anrechnung', 'anrechnungInfoTooltipText'); ?>">
 													<i class="fa fa-lg fa-info-circle" aria-hidden="true"></i>
 												</span>
-								<span class="pull-right"><?php echo $this->p->t('anrechnung', 'antragdatum'); ?>: <span
+								<span class="float-end"><?php echo $this->p->t('anrechnung', 'antragdatum'); ?>: <span
 											id="approveAnrechnung-status"><?php echo !empty($anrechnungData->anrechnung_id) ? $anrechnungData->insertamum : '-' ?></span></span>
 							</div>
-							<div class="panel-body">
+							<div class="card-body">
 								<div class="row">
-									<div class="col-lg-4">
-										<table class="table table-bordered table-condensed table-fixed">
+									<div class="col-4">
+										<table class="table table-bordered table-condensed table-fixed mb-0">
 											<tbody>
 											<tr>
-												<th class="col-xs-5"><?php echo ucfirst($this->p->t('person', 'studentIn')); ?></th>
+												<th class="col-5"><?php echo ucfirst($this->p->t('person', 'studentIn')); ?></th>
 												<td><?php echo $antragData->vorname . ' ' . $antragData->nachname; ?></td>
 											</tr>
 											<tr>
-												<th class="col-xs-5"><?php echo $this->p->t('person', 'personenkennzeichen'); ?></th>
+												<th class="col-5"><?php echo $this->p->t('person', 'personenkennzeichen'); ?></th>
 												<td><?php echo $antragData->matrikelnr ?></td>
 											</tr>
 											<tr>
-												<th class="col-xs-5"><?php echo ucfirst($this->p->t('lehre', 'studiensemester')); ?></th>
+												<th class="col-5"><?php echo ucfirst($this->p->t('lehre', 'studiensemester')); ?></th>
 												<td><?php echo $antragData->studiensemester_kurzbz ?></td>
 											</tr>
 											<tr>
-												<th class="col-xs-5"><?php echo ucfirst($this->p->t('lehre', 'studiengang')); ?></th>
+												<th class="col-5"><?php echo ucfirst($this->p->t('lehre', 'studiengang')); ?></th>
 												<td><?php echo $antragData->stg_bezeichnung ?></td>
 											</tr>
 											<tr>
-												<th class="col-xs-5"><?php echo $this->p->t('lehre', 'lehrveranstaltung'); ?></th>
+												<th class="col-5"><?php echo $this->p->t('lehre', 'lehrveranstaltung'); ?></th>
 												<td><?php echo $antragData->lv_bezeichnung ?></td>
 											</tr>
                                             <tr>
-                                                <th class="col-xs-5"><?php echo $this->p->t('lehre', 'lektorInnen'); ?></th>
+                                                <th class="col-5"><?php echo $this->p->t('lehre', 'lektorInnen'); ?></th>
                                                 <td>
 													<?php $len = count($antragData->lektoren) - 1 ?>
 													<?php foreach ($antragData->lektoren as $key => $lektor): ?>
@@ -126,14 +127,14 @@ $this->load->view(
                                                 </td>
                                             </tr>
                                             <tr>
-                                                <th class="col-xs-5"><?php echo $this->p->t('lehre', 'ects'); ?></th>
+                                                <th class="col-5"><?php echo $this->p->t('lehre', 'ects'); ?></th>
                                                 <td><span id="ects"><?php echo $antragData->ects ?></span></td>
                                             </tr>
                                             <tr>
-                                                <th class="col-xs-5">
+                                                <th class="col-5">
 													<?php echo $this->p->t('anrechnung', 'bisherAngerechneteEcts'); ?>
                                                     <span class="approveAnrechnungDetail-anrechnungEctsTooltip"
-                                                          data-toggle="tooltip" data-placement="right"
+                                                          data-bs-toggle="tooltip" data-bs-placement="right"
                                                           title="<?php echo $this->p->t('anrechnung', 'anrechnungEctsTooltipText'); ?>">
 													<i class="fa fa-lg fa-info-circle" aria-hidden="true"></i>
 												</span>
@@ -149,35 +150,35 @@ $this->load->view(
 											</tbody>
 										</table>
 									</div>
-									<div class="col-lg-8">
-										<table class="table table-bordered table-condensed table-fixed">
+									<div class="col-8">
+										<table class="table table-bordered table-condensed table-fixed mb-0">
 											<tbody>
 
 											<tr>
-												<th class="col-xs-3"><?php echo ucfirst($this->p->t('global', 'zgv')); ?></th>
+												<th class="col-3"><?php echo ucfirst($this->p->t('global', 'zgv')); ?></th>
 												<td><?php echo $antragData->zgv ?></td>
 											</tr>
 											<tr>
-												<th class="col-xs-4"><?php echo $this->p->t('anrechnung', 'herkunftDerKenntnisse'); ?></th>
+												<th class="col-4"><?php echo $this->p->t('anrechnung', 'herkunftDerKenntnisse'); ?></th>
 												<td><?php echo $anrechnungData->anmerkung ?></td>
 											</tr>
 											<tr>
-												<th class="col-xs-4"><?php echo $this->p->t('anrechnung', 'nachweisdokumente'); ?></th>
+												<th class="col-4"><?php echo $this->p->t('anrechnung', 'nachweisdokumente'); ?></th>
 												<td>
 													<a href="<?php echo current_url() . '/download?dms_id=' . $anrechnungData->dms_id; ?>"
 													   target="_blank"><?php echo htmlentities($anrechnungData->dokumentname) ?></a>
 												</td>
 											</tr>
                                             <tr>
-                                                <th class="col-xs-4"><?php echo $this->p->t('global', 'begruendung'); ?></th>
+                                                <th class="col-4"><?php echo $this->p->t('global', 'begruendung'); ?></th>
                                                 <td><span id="begruendung_id" data-begruendung_id="<?php echo $anrechnungData->begruendung_id ?>" ><?php echo $anrechnungData->begruendung ?></span></td>
                                             </tr>
                                             <tr>
-                                                <th class="col-xs-4"><?php echo $this->p->t('anrechnung', 'begruendungEctsLabel'); ?></th>
+                                                <th class="col-4"><?php echo $this->p->t('anrechnung', 'begruendungEctsLabel'); ?></th>
                                                 <td><span><?php echo $anrechnungData->begruendung_ects ?></span></td>
                                             </tr>
                                             <tr>
-                                                <th class="col-xs-4"><?php echo $this->p->t('anrechnung', 'begruendungLvinhaltLabel'); ?></th>
+                                                <th class="col-4"><?php echo $this->p->t('anrechnung', 'begruendungLvinhaltLabel'); ?></th>
                                                 <td><span><?php echo $anrechnungData->begruendung_lvinhalt ?></span></td>
                                             </tr>
 											</tbody>
@@ -190,12 +191,12 @@ $this->load->view(
 				</div>
 				<!-- Empfehlungsdaten -->
 				<div class="row">
-					<div class="col-lg-12">
-						<div class="panel panel-default" id="approveAnrechnungDetail-empfehlung"
+					<div class="col-12">
+						<div class="card " id="approveAnrechnungDetail-empfehlung"
 								 data-empfehlung="<?php echo json_encode($empfehlungData->empfehlung) ?>">
-								<div class="panel-heading">
+								<div class="card-header">
 									<span class="text-uppercase"><b><?php echo $this->p->t('anrechnung', 'empfehlung'); ?></b></span>&emsp;
-									<div class="pull-right">
+									<div class="float-end">
 										<?php echo $this->p->t('anrechnung', 'empfehlungVon'); ?>:
 										<span id="approveAnrechnungDetail-empfehlungVon"><?php echo $empfehlungData->empfehlung_von ?></span>
 										&emsp;|&emsp;
@@ -203,42 +204,42 @@ $this->load->view(
 										<span id="approveAnrechnungDetail-empfehlungAm"><?php echo $empfehlungData->empfehlung_am ?></span>
 									</div>
 								</div>
-								<div class="panel-body">
+								<div class="card-body">
 									<div class="row">
-										<div class="col-lg-6">
+										<div class="col-6">
 											<form id="form-empfehlung">
 												<input type="hidden" name="anrechnung_id" value="<?php echo $anrechnungData->anrechnung_id ?>">
                                                 <input type="hidden" name="ects" value="<?php echo $antragData->ects ?>">
                                                 <input type="hidden" name="sumEctsSchulisch" value="<?php echo $antragData->sumEctsSchulisch ?>">
                                                 <input type="hidden" name="sumEctsBeruflich" value="<?php echo $antragData->sumEctsBeruflich ?>">
-												<table class="table table-bordered table-condensed table-fixed">
+												<table class="table table-bordered table-condensed table-fixed mb-0">
 													<tbody>
 													<tr>
-														<th class="col-xs-4"><?php echo ucfirst($this->p->t('anrechnung', 'empfehlungsanfrageAm')); ?></th>
+														<th class="col-4"><?php echo ucfirst($this->p->t('anrechnung', 'empfehlungsanfrageAm')); ?></th>
 														<td id="approveAnrechnungDetail-empfehlungDetail-empfehlungsanfrageAm">
 															<?php echo $empfehlungData->empfehlungsanfrageAm; ?>
 														</td>
 													</tr>
 													<tr>
-														<th class="col-xs-4"><?php echo $this->p->t('anrechnung', 'empfehlungsanfrageAn'); ?></th>
+														<th class="col-4"><?php echo $this->p->t('anrechnung', 'empfehlungsanfrageAn'); ?></th>
 														<td id="approveAnrechnungDetail-empfehlungDetail-empfehlungsanfrageAn">
 															<?php echo $empfehlungData->empfehlungsanfrageAn; ?>
 														</td>
 													</tr>
 													<tr>
-														<th class="col-xs-4"><?php echo ucfirst($this->p->t('anrechnung', 'empfehlungAm')); ?></th>
+														<th class="col-4"><?php echo ucfirst($this->p->t('anrechnung', 'empfehlungAm')); ?></th>
 														<td><?php echo $empfehlungData->empfehlung_am ?></td>
 													</tr>
 													<tr>
-														<th class="col-xs-4"><?php echo ucfirst($this->p->t('anrechnung', 'empfehlungVon')); ?></th>
+														<th class="col-4"><?php echo ucfirst($this->p->t('anrechnung', 'empfehlungVon')); ?></th>
 														<td><?php echo $empfehlungData->empfehlung_von ?></td>
 													</tr>
 													<tr>
-														<th class="col-xs-4"><?php echo $this->p->t('anrechnung', 'empfehlung'); ?></th>
+														<th class="col-4"><?php echo $this->p->t('anrechnung', 'empfehlung'); ?></th>
 														<td id="approveAnrechnungDetail-empfehlungDetail-empfehlung"></td>
 													</tr>
 													<tr>
-														<th class="col-xs-4"><?php echo $this->p->t('global', 'begruendung'); ?></th>
+														<th class="col-4"><?php echo $this->p->t('global', 'begruendung'); ?></th>
 														<td id="approveAnrechnungDetail-empfehlungDetail-begruendung">
 															<?php echo htmlentities($empfehlungData->begruendung) ?>
 														</td>
@@ -247,29 +248,29 @@ $this->load->view(
 												</table>
 											</form>
 										</div>
-										<div class="col-lg-6">
+										<div class="col-6">
 											<form id="form-empfehlungNotiz">
 												<input type="hidden" name="anrechnung_id"
 													   value="<?php echo $anrechnungData->anrechnung_id ?>">
 												<input type="hidden" name="notiz_id"
 													   value="<?php echo $empfehlungData->notiz_id ?>">
-												<div class="form-group">
-													<label class="text-center">
+												<div class="form-row mb-3">
+													<label class="fw-bold text-center mb-2">
 														<?php echo ucfirst($this->p->t('global', 'notiz')); ?>
 													</label>
 													<textarea name="empfehlungText" rows="4"><?php echo htmlentities($empfehlungData->notiz) ?></textarea>
 												</div>
-												<input type="submit" class="btn btn-default pull-right" value="<?php echo ucfirst($this->p->t('ui', 'speichern')); ?>">
+												<input type="submit" class="btn btn-outline-secondary float-end" value="<?php echo ucfirst($this->p->t('ui', 'speichern')); ?>">
 											</form>
 										</div>
 									</div>
 								</div>
 							</div>
 					  
-						<div class="pull-right">
+						<div class="mt-4 mb-5 d-flex justify-content-end">
 							<button id="approveAnrechnungDetail-withdraw-request-recommedation"
-									class="btn btn-default btn-w200 <?php echo (is_null($empfehlungData->empfehlung) &&
-										$anrechnungData->status_kurzbz == 'inProgressLektor') ? '' : 'hidden' ?>"
+									class="me-1 btn btn-outline-secondary btn-w200 <?php echo (is_null($empfehlungData->empfehlung) &&
+										$anrechnungData->status_kurzbz == 'inProgressLektor') ? '' : 'visually-hidden' ?>"
 									type="button">
 								<?php echo ucfirst($this->p->t('global', 'zuruecknehmen')); ?>
 							</button>
@@ -280,14 +281,14 @@ $this->load->view(
 						</div>
 					</div>
 				</div>
-				<br><br>
+				
 				<!-- Genehmigungssdaten -->
 				<div class="row">
-					<div class="col-lg-12">
-						<div class="panel panel-default">
-							<div class="panel-heading">
+					<div class="col-12">
+						<div class="card my-4">
+							<div class="card-header">
 								<span class="text-uppercase"><b><?php echo $this->p->t('anrechnung', 'genehmigung'); ?></b></span>&emsp;
-								<div class="pull-right">
+								<div class="float-end">
 									<?php echo $this->p->t('anrechnung', 'abgeschlossenVon'); ?>:
 									<span id="approveAnrechnungDetail-abgeschlossenVon"><?php echo $genehmigungData->abgeschlossen_von ?></span>
 									&emsp;|&emsp;
@@ -295,22 +296,22 @@ $this->load->view(
 									<span id="approveAnrechnungDetail-abgeschlossenAm"><?php echo $genehmigungData->abgeschlossen_am ?></span>
 								</div>
 							</div>
-							<div class="panel-body" id="approveAnrechnungDetail-genehmigungDetail">
+							<div class="card-body" id="approveAnrechnungDetail-genehmigungDetail">
 								<!-- Infopanel: Noch nicht genehmigt / abgelehnt -->
-								<div class="panel panel-default panel-body <?php echo is_null($genehmigungData->genehmigung) ? '' : 'hidden' ?>"
+								<div class="card  card-body my-3 <?php echo is_null($genehmigungData->genehmigung) ? '' : 'visually-hidden' ?>"
 									 id="approveAnrechnungDetail-genehmigungDetail-genehmigungIsNull">
 									<?php echo $this->p->t('anrechnung', 'nochKeineGenehmigung'); ?>
 								</div>
 								<!-- Infopanel: Genehmigt -->
-								<div class="alert alert-success <?php echo $genehmigungData->genehmigung === true ? '' : 'hidden' ?>" id="approveAnrechnungDetail-genehmigungDetail-genehmigungIsPositiv">
+								<div class="card card-body bg-success-subtle my-3 <?php echo $genehmigungData->genehmigung === true ? '' : 'visually-hidden' ?>" id="approveAnrechnungDetail-genehmigungDetail-genehmigungIsPositiv">
 									<b><?php echo $this->p->t('anrechnung', 'genehmigungPositiv'); ?></b>
 								</div>
 								<!-- Infopanel: Abgelehnt -->
-								<div class="<?php echo $genehmigungData->genehmigung === false ? '' : 'hidden' ?>" id="approveAnrechnungDetail-genehmigungDetail-genehmigungIsNegativ">
-									<div class="alert alert-danger">
+								<div class="<?php echo $genehmigungData->genehmigung === false ? '' : 'visually-hidden' ?>" id="approveAnrechnungDetail-genehmigungDetail-genehmigungIsNegativ">
+									<div class="card card-body bg-danger-subtle my-3">
 										<b><?php echo $this->p->t('anrechnung', 'genehmigungNegativ'); ?></b>
 									</div>
-									<div class="well"><b><?php echo $this->p->t('global', 'begruendung'); ?>
+									<div class="card card-body bg-secondary-subtle my-3"><b><?php echo $this->p->t('global', 'begruendung'); ?>
 											: </b>
 										<span id="approveAnrechnungDetail-genehmigungDetail-begruendung"><?php echo htmlentities($genehmigungData->notiz) ?></span>
 									</div>
@@ -321,36 +322,36 @@ $this->load->view(
 								<!-- Ablehnen -->
 								<div style="display: none" id="approveAnrechnungDetail-begruendung-panel">
 									<div>
-										<h4 class="panel panel-body panel-danger text-danger"><?php echo $this->p->t('anrechnung', 'genehmigungNegativQuestion'); ?></h4>
-                                        <ul class="list-group">
+										<h4 class="card card-body bg-danger-subtle my-3"><?php echo $this->p->t('anrechnung', 'genehmigungNegativQuestion'); ?></h4>
+                                        <ul class="list-group my-3">
 											<li class="list-group-item">
 												<span><?php echo $this->p->t('anrechnung', 'genehmigungNegativPruefungNichtMoeglich'); ?></span>
-												<span class="btn-copyIntoTextarea pull-right" data-toggle="tooltip"
-													  data-placement="right"
+												<span class="btn-copyIntoTextarea float-end" data-bs-toggle="tooltip"
+													  data-bs-placement="right"
 													  title="<?php echo $this->p->t('ui', 'textUebernehmen'); ?>">
 													<i class="fa fa-clipboard fa-lg" aria-hidden="true"></i>
 												</span>
 											</li>
                                             <li class="list-group-item">
                                                 <span><?php echo $this->p->t('anrechnung', 'genehmigungNegativEctsHoechstgrenzeUeberschritten'); ?></span>
-                                                <span class="btn-copyIntoTextarea pull-right" data-toggle="tooltip"
-                                                      data-placement="right"
+                                                <span class="btn-copyIntoTextarea float-end" data-bs-toggle="tooltip"
+                                                      data-bs-placement="right"
                                                       title="<?php echo $this->p->t('ui', 'textUebernehmen'); ?>">
 													<i class="fa fa-clipboard fa-lg" aria-hidden="true"></i>
 												</span>
                                             </li>
 											<li class="list-group-item">
 												<span><?php echo $this->p->t('anrechnung', 'genehmigungNegativKenntnisseNichtGleichwertigWeil'); ?></span>
-												<span class="btn-copyIntoTextarea pull-right" data-toggle="tooltip"
-													  data-placement="right"
+												<span class="btn-copyIntoTextarea float-end" data-bs-toggle="tooltip"
+													  data-bs-placement="right"
 													  title="<?php echo $this->p->t('ui', 'textUebernehmen'); ?>">
 													<i class="fa fa-clipboard fa-lg" aria-hidden="true"></i>
 												</span>
 											</li>
 											<li class="list-group-item">
 												<span><?php echo $this->p->t('anrechnung', 'genehmigungNegativEmpfehlungstextUebernehmen'); ?></span>
-												<span id="empfehlungstextUebernehmen" class="btn-copyIntoTextarea pull-right" data-toggle="tooltip"
-													  data-placement="right"
+												<span id="empfehlungstextUebernehmen" class="btn-copyIntoTextarea float-end" data-bs-toggle="tooltip"
+													  data-bs-placement="right"
 													  title="<?php echo $this->p->t('ui', 'textUebernehmen'); ?>">
 													<i class="fa fa-clipboard fa-lg" aria-hidden="true"></i>
 												</span>
@@ -359,16 +360,16 @@ $this->load->view(
                                                 <span><?php echo $this->p->t('anrechnung', 'andereBegruendung'); ?></span>
                                             </li>
 										</ul>
-										<textarea class="form-control" name="begruendung"
+										<textarea class="my-3 form-control" name="begruendung"
 												  id="approveAnrechnungDetail-begruendung"
 												  rows="2"
                                                   placeholder="<?php echo $this->p->t('anrechnung', 'textUebernehmenOderEigenenBegruendungstext'); ?>" required></textarea>
 									</div>
-									<br>
+									
 									<!-- Action Button 'Abbrechen'-->
-									<div class="pull-right">
+									<div class="float-end">
 										<button id="approveAnrechnungDetail-begruendung-abbrechen"
-												class="btn btn-default btn-w200" type="reset">
+												class="me-1 btn btn-outline-secondary btn-w200" type="reset">
 											<?php echo ucfirst($this->p->t('ui', 'abbrechen')); ?>
 										</button>
 										<button id="approveAnrechnungDetail-reject-anrechnung-confirm"
@@ -379,15 +380,15 @@ $this->load->view(
 								</div>
 								<!-- Genehmigen -->
 								<div style="display: none" id="approveAnrechnungDetail-genehmigung-panel">
-									<div>
-										<h4 class="panel panel-body panel-success text-success"><?php echo $this->p->t('anrechnung', 'genehmigungPositivQuestion'); ?></h4>
-					&ensp;					<?php echo $this->p->t('anrechnung', 'genehmigungPositivSubquestion'); ?>
+									<div class="my-3">
+										<h4 class="card card-body bg-success-subtle "><?php echo $this->p->t('anrechnung', 'genehmigungPositivQuestion'); ?></h4>
+										<span><?php echo $this->p->t('anrechnung', 'genehmigungPositivSubquestion'); ?></span>
 									</div>
-									<br>
+									
 									<!-- Action Button 'Abbrechen'-->
-									<div class="pull-right">
+									<div class="float-end">
 										<button id="approveAnrechnungDetail-genehmigung-abbrechen"
-												class="btn btn-default btn-w200" type="reset">
+												class="me-1 btn btn-outline-secondary btn-w200" type="reset">
 											<?php echo ucfirst($this->p->t('ui', 'abbrechen')); ?>
 										</button>
 										<button id="approveAnrechnungDetail-approve-anrechnung-confirm"
@@ -400,19 +401,19 @@ $this->load->view(
 							</div>
 						</div>
 						<!-- Button Gehenhmigen / Ablehnen / Zurücknehmen -->
-						<div class="pull-right">
+						<div class="float-end mb-5">
 							<button id="approveAnrechnungDetail-withdraw-anrechnung-approvement"
-									class="btn btn-default btn-w200 <?php echo ($anrechnungData->status_kurzbz == 'approved' ||
-										$anrechnungData->status_kurzbz == 'rejected') ? '' : 'hidden' ?>"
+									class="me-1 btn btn-outline-secondary btn-w200 <?php echo ($anrechnungData->status_kurzbz == 'approved' ||
+										$anrechnungData->status_kurzbz == 'rejected') ? '' : 'visually-hidden' ?>"
 									type="button">
 								<?php echo ucfirst($this->p->t('global', 'zuruecknehmen')); ?>
 							</button>
-							<button id="approveAnrechnungDetail-reject-anrechnung-ask" class="btn btn-danger btn-w200"
+							<button id="approveAnrechnungDetail-reject-anrechnung-ask" class="me-1 btn btn-danger btn-w200"
 									type="button"
 								<?php echo $anrechnungData->status_kurzbz == 'inProgressDP' ? '' : 'disabled' ?>>
 								<?php echo ucfirst($this->p->t('global', 'ablehnen')); ?>
 							</button>
-							<button id="approveAnrechnungDetail-approve-anrechnung-ask" class="btn btn-primary btn-w200"
+							<button id="approveAnrechnungDetail-approve-anrechnung-ask" class="me-1 btn btn-primary btn-w200"
 									type="button"
 								<?php echo $anrechnungData->status_kurzbz == 'inProgressDP' ? '' : 'disabled' ?>>
 								<?php echo ucfirst($this->p->t('global', 'genehmigen')); ?>
@@ -420,10 +421,10 @@ $this->load->view(
 						</div>
 					</div>
 				</div>
-				<br><br><br><br>
+				
             </div>
 
-            <div class="col-xs-4">
+            <div class="col-4">
 				<!-- -Statusleiste -->
                 <div class="alert text-center">
                     Status: <b><span class="text-uppercase" id="approveAnrechnungDetail-status_kurzbz"
diff --git a/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php b/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php
index 67ab4c233..f7841964c 100644
--- a/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php
+++ b/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php
@@ -96,7 +96,7 @@ $this->load->view(
     <div class="container-fluid">
         <!-- header -->
         <div class="row">
-            <div class="col-12 mt-4 mb-2 page-header border-bottom">
+            <div class="col-12 my-4 page-header border-bottom">
                 <h3 class="fw-normal ">
 					<?php echo $this->p->t('anrechnung', 'anrechnungenGenehmigen'); ?>
                     <small class="text-secondary fs-6">| <?php echo ucfirst($this->p->t('global', 'uebersicht')); ?></small>
diff --git a/application/views/lehre/anrechnung/requestAnrechnung.php b/application/views/lehre/anrechnung/requestAnrechnung.php
index 9f6482e85..b5b33bc32 100644
--- a/application/views/lehre/anrechnung/requestAnrechnung.php
+++ b/application/views/lehre/anrechnung/requestAnrechnung.php
@@ -73,7 +73,7 @@ $this->load->view(
     <div class="container-fluid">
         <!-- header -->
         <div class="row">
-            <div class="col-12 mt-5 mb-3 pb-2 border-bottom">
+            <div class="col-12 my-4 page-header border-bottom">
                 <h3 class="fw-normal">
 					<?php echo $this->p->t('anrechnung', 'anerkennungNachgewiesenerKenntnisse'); ?>
                     <small class="text-secondary fs-6">| <?php echo $this->p->t('anrechnung', 'antragStellen'); ?></small>
diff --git a/public/css/lehre/anrechnung.css b/public/css/lehre/anrechnung.css
index 17096e014..73e75d571 100644
--- a/public/css/lehre/anrechnung.css
+++ b/public/css/lehre/anrechnung.css
@@ -7,8 +7,15 @@
     padding-left: 15px !important;
 }
 
+.bg-secondary-subtle{
+    background-color: #E9ECEF !important; 
+    border-style: solid !important;
+    border-width: 1px !important;
+    border-color: #DEE2E6 !important;
+}
+
 .bg-info-subtle{
-    background-color: #D9EDF7 !important; 
+    background-color: #E9ECEF !important; 
     color: #31708F !important;
     border-style: solid !important;
     border-width: 1px !important;

From 4f8d62081463454b5930fe00bf1ef4251ab51c0f Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 14 Mar 2024 15:42:20 +0100
Subject: [PATCH 0485/1461] refactor updateStatus

---
 .../controllers/components/stv/Status.php     | 142 ++++++++----------
 1 file changed, 60 insertions(+), 82 deletions(-)

diff --git a/application/controllers/components/stv/Status.php b/application/controllers/components/stv/Status.php
index 99f750d4d..2e6fd89cc 100644
--- a/application/controllers/components/stv/Status.php
+++ b/application/controllers/components/stv/Status.php
@@ -562,6 +562,7 @@ class Status extends FHC_Controller
 	public function updateStatus($key_prestudent_id, $key_status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester)
 	{
 		$isStudent = false;
+		$isBerechtigtNoStudstatusCheck =  $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung');
 
 		//get Studiengang von prestudent_id
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
@@ -584,16 +585,6 @@ class Status extends FHC_Controller
 			return $this->outputJson($result);
 		}
 
-		//var_dump($key_prestudent_id, $key_status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester);
-
-		/*		$this->load->library('form_validation');
-
-
-				if ($this->form_validation->run() == false)
-				{
-					return $this->outputJsonError($this->form_validation->error_array());
-				}*/
-
 		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
 		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
 
@@ -612,17 +603,19 @@ class Status extends FHC_Controller
 		$bestaetigtvon = $uid;
 
 		//check if Bismeldestichtag erreicht
-		if(!isBerechtigtNoStudstatusCheck)
+		if(!$isBerechtigtNoStudstatusCheck)
 		{
+			//Fas only check datum
 			$this->load->model('codex/Bismeldestichtag_model', 'BismeldestichtagModel');
-			$result = $this->BismeldestichtagModel->checkIfMeldestichtagErreicht($datum, $studiensemester_kurzbz);
+/*			$result = $this->BismeldestichtagModel->checkIfMeldestichtagErreicht($datum, $studiensemester_kurzbz);*/
+			$result = $this->BismeldestichtagModel->checkIfMeldestichtagErreicht($datum);
 			if (isError($result)) {
 				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 				return $this->outputJson(getError($result));
 			}
 			if ($result->retval == "1") {
 				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				//return $this->outputJson(getError($result->code));
+				//return $this->outputJson($result->code);
 				//Fehlermeldung überschrieben, passender
 				return $this->outputJson("Meldestichtag erreicht - Bearbeiten nicht mehr möglich");
 			}
@@ -671,8 +664,6 @@ class Status extends FHC_Controller
 		{
 			//Block STATUSCHECKS
 
-			//$new_status_datum = isset($datum) ? $datum  : date('Y-m-d');
-
 			$result = $this->PrestudentstatusModel->checkIfValidStatusHistory($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $datum, $ausbildungssemester);
 			if (isError($result))
 			{
@@ -683,62 +674,10 @@ class Status extends FHC_Controller
 
 
 		// Start DB transaction
-		$this->db->trans_start(false);
-
-		if($isStudent)
-		{
-			//check Studentlehrverband
-			$this->load->model('crm/Student_model', 'StudentModel');
-			$result = $this->StudentModel->checkIfUid($prestudent_id);
-			if (isError($result)) {
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson(getError($result));
-			}
-			$student_uid = $result->retval;
-
-			//check if Lehrverband exists
-			$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
-			$result = $this->StudentlehrverbandModel->checkIfStudentlehrverbandExists($student_uid, $studiensemester_kurzbz);
-			if (isError($result)) {
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson(getError($result));
-			}
-			if ($result->retval == "0") {
-				//load Data Studentlehrverband
-				$result = $this->StudentlehrverbandModel->load(
-					[
-						'student_uid' => $student_uid,
-						'studiensemester_kurzbz' => $studiensemester_kurzbz
-					]);
-				if (isError($result)) {
-					$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-
-					return $this->outputJson("Error in insert Studentlehrverband");
-				}
-				$lvbData = current(getData($result));
-
-				$result = $this->StudentlehrverbandModel->insert(
-					[
-						'student_uid' => $student_uid,
-						'studiensemester_kurzbz' => $studiensemester_kurzbz,
-						'semester' => $ausbildungssemester,
-						'verband' => $lvbData->verband,
-						'gruppe' => $lvbData->gruppe,
-						'insertamum' => date('c'),
-						'insertvon' => $uid,
-						'studiengang_kz' => $lvbData->studiengang_kz
-					]);
-
-				if (isError($result))
-				{
-					$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-
-					return $this->outputJson("Error during insert Studentlehrverband");
-				}
-			}
-		}
+		$this->db->trans_begin();
 
 		//update status
+		var_dump($ausbildungssemester, $studiensemester_kurzbz);
 		$result = $this->PrestudentstatusModel->update(
 			[
 				'prestudent_id' => $key_prestudent_id,
@@ -747,7 +686,6 @@ class Status extends FHC_Controller
 				'ausbildungssemester' => $key_ausbildungssemester,
 			],
 			[
-				'prestudent_id' => $prestudent_id,
 				'status_kurzbz' => $status_kurzbz,
 				'studiensemester_kurzbz' => $studiensemester_kurzbz,
 				'ausbildungssemester' => $ausbildungssemester,
@@ -763,11 +701,7 @@ class Status extends FHC_Controller
 				'rt_stufe' => $rt_stufe
 			]
 		);
-
-		// Transaction complete!
-		$this->db->trans_complete();
-
-		if ($this->db->trans_status() === false || isError($result))
+		if (isError($result))
 		{
 			$this->db->trans_rollback();
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
@@ -775,6 +709,46 @@ class Status extends FHC_Controller
 		}
 
 
+		if($isStudent)
+		{
+			//check Studentlehrverband
+			$this->load->model('crm/Student_model', 'StudentModel');
+			$result = $this->StudentModel->checkIfUid($prestudent_id);
+			if (isError($result)) {
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return $this->outputJson(getError($result));
+			}
+			$student_uid = $result->retval;
+
+			//process studentlehrverband
+			$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
+			$result = $this->StudentlehrverbandModel->loadWhere(
+				array(
+					'student_uid' => $student_uid,
+					'studiensemester_kurzbz' => $studiensemester_kurzbz
+				)
+			);
+			if (isError($result)) {
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				$this->outputJson($result);
+			}
+			if (!hasData($result)) {
+				$this->outputJson($result);
+			}
+
+			//Data of current Semester
+			$studentlvbData = current(getData($result));
+
+			$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
+			$result = $this->StudentlehrverbandModel->processStudentlehrverband($student_uid,  $studentlvbData->studiengang_kz, $ausbildungssemester, $studentlvbData->verband, $studentlvbData->gruppe, $studiensemester_kurzbz);
+			if ($this->db->trans_status() === false || isError($result))
+			{
+				$this->db->trans_rollback();
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return $this->outputJson($result->code);
+			}
+		}
+
 		$this->db->trans_commit();
 		return $this->outputJsonSuccess(true);
 	}
@@ -931,13 +905,13 @@ class Status extends FHC_Controller
 		$studentlvbData = current(getData($result));
 
 		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
-				$result = $this->StudentlehrverbandModel->processStudentlehrverband($student_uid, $studentlvbData->studiengang_kz, $ausbildungssem_next, $studentlvbData->verband, $studentlvbData->gruppe, $studiensem_next);
-				if ($this->db->trans_status() === false || isError($result))
-				{
-					$this->db->trans_rollback();
-					$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-					return $this->outputJson($result->code);
-				}
+		$result = $this->StudentlehrverbandModel->processStudentlehrverband($student_uid, $studentlvbData->studiengang_kz, $ausbildungssem_next, $studentlvbData->verband, $studentlvbData->gruppe, $studiensem_next);
+		if ($this->db->trans_status() === false || isError($result))
+		{
+			$this->db->trans_rollback();
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson($result->code);
+		}
 
 		$this->db->trans_commit();
 
@@ -1017,6 +991,10 @@ class Status extends FHC_Controller
 				'ausbildungssemester' => $key_ausbildungssemester,
 			],
 			[
+				'prestudent_id' => $key_prestudent_id,
+				'status_kurzbz' => $key_status_kurzbz,
+				'studiensemester_kurzbz' => $key_studiensemester_kurzbz,
+				'ausbildungssemester' => $key_ausbildungssemester,
 				'bestaetigtam' => date('c'),
 				'bestaetigtvon' => $uid,
 				'updateamum' => date('c'),

From 465ab736ee570ae5bb7a4af2c50d0693981467cf Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 15 Mar 2024 11:18:31 +0100
Subject: [PATCH 0486/1461] changed AnrechnungenInfo panel to bootstrap5
 accordion

---
 .../lehre/anrechnung/reviewAnrechnungInfo.php | 138 +++++++++---------
 1 file changed, 71 insertions(+), 67 deletions(-)

diff --git a/application/views/lehre/anrechnung/reviewAnrechnungInfo.php b/application/views/lehre/anrechnung/reviewAnrechnungInfo.php
index 7e658ffcb..2364869e6 100644
--- a/application/views/lehre/anrechnung/reviewAnrechnungInfo.php
+++ b/application/views/lehre/anrechnung/reviewAnrechnungInfo.php
@@ -1,82 +1,86 @@
-<div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
-    <div class="panel panel-info">
-        <div class="panel-heading" role="tab" id="headingOne">
-            <h4 class="panel-title">
-                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseOne"
-                   aria-expanded="true" aria-controls="collapseOne">
-                    <i class="fa fa-lg fa-info-circle" aria-hidden="true"></i>&ensp;
-	                <?php echo $this->p->t('anrechnung', 'reviewAnrechnungInfoFristenTitle'); ?>
-                </a>
-            </h4>
+
+<div class="accordion" id="requestAnrechnungImportant">
+       <!--    Beantragung: Fristen panel -->
+  <div class="accordion-item">
+    <h2 class="accordion-header">
+        <div  class="bg-info-subtle accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#Beantragung" aria-expanded="true" aria-controls="Beantragung">
+        <div class="d-flex">
+        
+            <i class="fa fa-lg fa-info-circle" aria-hidden="true"></i>&ensp;
+	        <?php echo $this->p->t('anrechnung', 'reviewAnrechnungInfoFristenTitle'); ?>
+        
         </div>
-        <div id="collapseOne" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingOne">
-            <div class="panel-body">
-	            <?php echo $this->p->t('anrechnung', 'reviewAnrechnungInfoFristenBody'); ?>
-            </div>
         </div>
+    </h2>
+    <div id="Beantragung" class="accordion-collapse collapse show" data-bs-parent="#requestAnrechnungImportant">
+      <div class="accordion-body">
+      <?php echo $this->p->t('anrechnung', 'reviewAnrechnungInfoFristenBody'); ?>
+      </div>
     </div>
-    <div class="panel panel-info">
-        <div class="panel-heading" role="tab" id="headingBegruendung">
-            <h4 class="panel-title">
-                <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseBegruendung"
-                   aria-expanded="false" aria-controls="collapseBegruendung">
-                    <i class="fa fa-lg fa-info-circle" aria-hidden="true"></i>&ensp;
-					<?php echo $this->p->t('anrechnung', 'requestAnrechnungInfoEctsBerechnungTitle'); ?>
-                </a>
-            </h4>
+  </div>
+  <!--    Referenzbeispiele ECTS Berechnung panel -->
+  <div class="accordion-item">
+    <h2 class="accordion-header">
+        <div class="bg-info-subtle accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#Referenzbeispiele" aria-expanded="false" aria-controls="Referenzbeispiele">
+        <div class="d-flex">
+            <i class="fa fa-lg fa-info-circle" aria-hidden="true"></i>&ensp;
+			<?php echo $this->p->t('anrechnung', 'requestAnrechnungInfoEctsBerechnungTitle'); ?>
         </div>
-        <div id="collapseBegruendung" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingBegruendung">
-            <div class="panel-body">
-				<?php echo $this->p->t('anrechnung', 'requestAnrechnungInfoEctsBerechnungBody'); ?>
-            </div>
         </div>
+    </h2>
+    <div id="Referenzbeispiele" class="accordion-collapse collapse" data-bs-parent="#requestAnrechnungImportant">
+      <div class="accordion-body">
+        <?php echo $this->p->t('anrechnung', 'requestAnrechnungInfoEctsBerechnungBody'); ?>
+      </div>
     </div>
-    <div class="panel panel-info">
-        <div class="panel-heading" role="tab" id="headingZero">
-            <h4 class="panel-title">
-                <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseZero"
-                   aria-expanded="true" aria-controls="collapseZero">
-                    <i class="fa fa-lg fa-info-circle" aria-hidden="true"></i>&ensp;
-	                <?php echo $this->p->t('anrechnung', 'reviewAnrechnungInfoAntragVoraussetungenTitle'); ?>
-                </a>
-            </h4>
+  </div>
+  <!--    Antrag: Voraussetzungen panel -->
+  <div class="accordion-item">
+    <h2 class="accordion-header">
+    <div class="d-flex">
+        <div class="bg-info-subtle accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#Antrag" aria-expanded="false" aria-controls="Antrag">
+            <i class="fa fa-lg fa-info-circle" aria-hidden="true"></i>&ensp;
+	        <?php echo $this->p->t('anrechnung', 'reviewAnrechnungInfoAntragVoraussetungenTitle'); ?>
         </div>
-        <div id="collapseZero" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingZero">
-            <div class="panel-body">
-	            <?php echo $this->p->t('anrechnung', 'reviewAnrechnungInfoAntragVoraussetungenBody'); ?>
-            </div>
         </div>
+    </h2>
+    <div id="Antrag" class="accordion-collapse collapse" data-bs-parent="#requestAnrechnungImportant">
+      <div class="accordion-body">
+      <?php echo $this->p->t('anrechnung', 'reviewAnrechnungInfoAntragVoraussetungenBody'); ?>
+      </div>
     </div>
-    <div class="panel panel-info">
-        <div class="panel-heading" role="tab" id="headingTwo">
-            <h4 class="panel-title">
-                <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo"
-                   aria-expanded="false" aria-controls="collapseTwo">
-                    <i class="fa fa-lg fa-info-circle" aria-hidden="true"></i>&ensp;
-	                <?php echo $this->p->t('anrechnung', 'reviewAnrechnungInfoNachweisdokumenteTitle'); ?>
-                </a>
-            </h4>
+  </div>
+   <!--    Nachweisdokumente: Voraussetzung panel -->
+  <div class="accordion-item">
+    <h2 class="accordion-header">
+        <div class="bg-info-subtle accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#Nachweisdokumente" aria-expanded="false" aria-controls="Nachweisdokumente">
+        <div class="d-flex">
+            <i class="fa fa-lg fa-info-circle" aria-hidden="true"></i>&ensp;
+	        <?php echo $this->p->t('anrechnung', 'reviewAnrechnungInfoNachweisdokumenteTitle'); ?>
         </div>
-        <div id="collapseTwo" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingTwo">
-            <div class="panel-body">
-	            <?php echo $this->p->t('anrechnung', 'reviewAnrechnungInfoNachweisdokumenteBody'); ?>
-            </div>
         </div>
+    </h2>
+    <div id="Nachweisdokumente" class="accordion-collapse collapse" data-bs-parent="#requestAnrechnungImportant">
+      <div class="accordion-body">
+      <?php echo $this->p->t('anrechnung', 'reviewAnrechnungInfoNachweisdokumenteBody'); ?>
+      </div>
     </div>
-    <div class="panel panel-info">
-        <div class="panel-heading" role="tab" id="headingThree">
-            <h4 class="panel-title">
-                <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseThree"
-                   aria-expanded="false" aria-controls="collapseThree">
-                    <i class="fa fa-lg fa-info-circle" aria-hidden="true"></i>&ensp;
-	                <?php echo $this->p->t('anrechnung', 'reviewAnrechnungInfoHerkunftKenntnisseTitle'); ?>
-                </a>
-            </h4>
+  </div>
+    <!--    Herkunft der Kenntnisse: Angaben panel -->
+  <div class="accordion-item">
+    <h2 class="accordion-header">
+        <div class="bg-info-subtle accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#HerkunftKenntnisse" aria-expanded="false" aria-controls="HerkunftKenntnisse">
+        <div class="d-flex">
+            <i class="fa fa-lg fa-info-circle" aria-hidden="true"></i>&ensp;
+	        <?php echo $this->p->t('anrechnung', 'reviewAnrechnungInfoHerkunftKenntnisseTitle'); ?>
         </div>
-        <div id="collapseThree" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingThree">
-            <div class="panel-body">
-	            <?php echo $this->p->t('anrechnung', 'reviewAnrechnungInfoHerkunftKenntnisseBody'); ?>
-            </div>
         </div>
+    </h2>
+    <div id="HerkunftKenntnisse" class="accordion-collapse collapse" data-bs-parent="#requestAnrechnungImportant">
+      <div class="accordion-body">
+        <?php echo $this->p->t('anrechnung', 'reviewAnrechnungInfoHerkunftKenntnisseBody'); ?>
+      </div>
     </div>
-</div>
\ No newline at end of file
+  </div>
+
+</div>

From 868d10ffd6c99861cf9e030d8a2e3211111c24d3 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 15 Mar 2024 11:56:16 +0100
Subject: [PATCH 0487/1461] adds bg-secondary-subtle to the color palette and
 fixes buttons that are disabled and have a title attribute

---
 public/css/lehre/anrechnung.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/css/lehre/anrechnung.css b/public/css/lehre/anrechnung.css
index 73e75d571..dfae318f4 100644
--- a/public/css/lehre/anrechnung.css
+++ b/public/css/lehre/anrechnung.css
@@ -15,11 +15,11 @@
 }
 
 .bg-info-subtle{
-    background-color: #E9ECEF !important; 
+    background-color: #D9EDF7 !important; 
     color: #31708F !important;
     border-style: solid !important;
     border-width: 1px !important;
-    border-color: #bce8f1 !important;
+    border-color: #BCE8F1 !important;
 }
 
 .bg-warning-subtle{

From 9360c8a470c25aa8a5ec674a10a2faf521ce090a Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 15 Mar 2024 11:57:11 +0100
Subject: [PATCH 0488/1461] migrates approveAnrechnungDetail to bootstrap5 and
 adds little adjustments to requestAnrechungImportant

---
 .../anrechnung/approveAnrechnungDetail.php     |  2 +-
 .../anrechnung/requestAnrechnungImportant.php  | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/application/views/lehre/anrechnung/approveAnrechnungDetail.php b/application/views/lehre/anrechnung/approveAnrechnungDetail.php
index aa1bf13d0..944ec6f2f 100644
--- a/application/views/lehre/anrechnung/approveAnrechnungDetail.php
+++ b/application/views/lehre/anrechnung/approveAnrechnungDetail.php
@@ -134,7 +134,7 @@ $this->load->view(
                                                 <th class="col-5">
 													<?php echo $this->p->t('anrechnung', 'bisherAngerechneteEcts'); ?>
                                                     <span class="approveAnrechnungDetail-anrechnungEctsTooltip"
-                                                          data-bs-toggle="tooltip" data-bs-placement="right"
+                                                          data-bs-toggle="tooltip" data-bs-placement="right" data-bs-html="true"
                                                           title="<?php echo $this->p->t('anrechnung', 'anrechnungEctsTooltipText'); ?>">
 													<i class="fa fa-lg fa-info-circle" aria-hidden="true"></i>
 												</span>
diff --git a/application/views/lehre/anrechnung/requestAnrechnungImportant.php b/application/views/lehre/anrechnung/requestAnrechnungImportant.php
index 26c37f8ae..0ee13d422 100644
--- a/application/views/lehre/anrechnung/requestAnrechnungImportant.php
+++ b/application/views/lehre/anrechnung/requestAnrechnungImportant.php
@@ -1,10 +1,10 @@
 
 
-    <div class="accordion" id="accordionExample">
+    <div class="accordion" id="requestAnrechnungImportant">
        <!--    Beantragung: Fristen panel -->
   <div class="accordion-item">
     <h2 class="accordion-header">
-        <div  class="bg-info-subtle accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
+        <div  class="bg-info-subtle accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#Beantragung" aria-expanded="true" aria-controls="Beantragung">
         <div class="d-flex">
         
         <i class="me-2 fa fa-lg fa-info-circle" aria-hidden="true"></i>&ensp;
@@ -13,7 +13,7 @@
         </div>
         </div>
     </h2>
-    <div id="collapseOne" class="accordion-collapse collapse show" data-bs-parent="#accordionExample">
+    <div id="Beantragung" class="accordion-collapse collapse show" data-bs-parent="#requestAnrechnungImportant">
       <div class="accordion-body">
       <?php echo $this->p->t('anrechnung', 'requestAnrechnungInfoFristenBody'); ?>
       </div>
@@ -22,14 +22,14 @@
   <!--    Referenzbeispiele ECTS Berechnung panel -->
   <div class="accordion-item">
     <h2 class="accordion-header">
-        <div class="bg-info-subtle accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseTwo" aria-expanded="false" aria-controls="collapseTwo">
+        <div class="bg-info-subtle accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#Referenzbeispiele" aria-expanded="false" aria-controls="Referenzbeispiele">
         <div class="d-flex">
         <i class="me-2 fa fa-lg fa-info-circle" aria-hidden="true"></i>&ensp;
 					<?php echo $this->p->t('anrechnung', 'requestAnrechnungInfoEctsBerechnungTitle'); ?>
         </div>
         </div>
     </h2>
-    <div id="collapseTwo" class="accordion-collapse collapse" data-bs-parent="#accordionExample">
+    <div id="Referenzbeispiele" class="accordion-collapse collapse" data-bs-parent="#requestAnrechnungImportant">
       <div class="accordion-body">
       <?php echo $this->p->t('anrechnung', 'requestAnrechnungInfoEctsBerechnungBody'); ?>
       </div>
@@ -39,13 +39,13 @@
   <div class="accordion-item">
     <h2 class="accordion-header">
     <div class="d-flex">
-        <div class="bg-info-subtle accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseThree" aria-expanded="false" aria-controls="collapseThree">
+        <div class="bg-info-subtle accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#Nachweisdokumente" aria-expanded="false" aria-controls="Nachweisdokumente">
         <i class="me-2 fa fa-lg fa-info-circle" aria-hidden="true"></i>&ensp;
 					<?php echo $this->p->t('anrechnung', 'requestAnrechnungInfoNachweisdokumenteTitle'); ?>
         </div>
         </div>
     </h2>
-    <div id="collapseThree" class="accordion-collapse collapse" data-bs-parent="#accordionExample">
+    <div id="Nachweisdokumente" class="accordion-collapse collapse" data-bs-parent="#requestAnrechnungImportant">
       <div class="accordion-body">
       <?php echo $this->p->t('anrechnung', 'requestAnrechnungInfoNachweisdokumenteBody'); ?>
       </div>
@@ -54,14 +54,14 @@
     <!--    Herkunft der Kenntnisse: Angaben panel -->
   <div class="accordion-item">
     <h2 class="accordion-header">
-        <div class="bg-info-subtle accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseFour" aria-expanded="false" aria-controls="collapseFour">
+        <div class="bg-info-subtle accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#HerkunftKenntnisse" aria-expanded="false" aria-controls="HerkunftKenntnisse">
         <div class="d-flex">
         <i class="me-2 fa fa-lg fa-info-circle" aria-hidden="true"></i>&ensp;
 					<?php echo $this->p->t('anrechnung', 'requestAnrechnungInfoHerkunftKenntnisseTitle'); ?>
         </div>
         </div>
     </h2>
-    <div id="collapseFour" class="accordion-collapse collapse" data-bs-parent="#accordionExample">
+    <div id="HerkunftKenntnisse" class="accordion-collapse collapse" data-bs-parent="#requestAnrechnungImportant">
       <div class="accordion-body">
       <?php echo $this->p->t('anrechnung', 'requestAnrechnungInfoHerkunftKenntnisseBody'); ?>
       </div>

From f9c894307d6d70e109da95d40de5923c73e9401f Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 15 Mar 2024 11:58:31 +0100
Subject: [PATCH 0489/1461] buttons with attribute disabled and title fix

---
 public/css/lehre/anrechnung.css | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/public/css/lehre/anrechnung.css b/public/css/lehre/anrechnung.css
index dfae318f4..925c1a357 100644
--- a/public/css/lehre/anrechnung.css
+++ b/public/css/lehre/anrechnung.css
@@ -55,3 +55,9 @@
 }
 
 
+/* html attribute disabled and title don't work together, sets the pointer-event to auto in order to see the title toolip */
+.btn:disabled {
+    pointer-events: auto !important;
+    cursor: default;
+}
+

From cc461aab8bb743db94c9286b77ddf3452a12195c Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 15 Mar 2024 12:52:00 +0100
Subject: [PATCH 0490/1461] updates js file of approveAnrechnungDetail to be
 bootstrap5 conform

---
 .../anrechnung/approveAnrechnungDetail.php    |  2 +-
 .../anrechnung/approveAnrechnungDetail.js     | 66 +++++++++----------
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/application/views/lehre/anrechnung/approveAnrechnungDetail.php b/application/views/lehre/anrechnung/approveAnrechnungDetail.php
index 944ec6f2f..c2d2a6053 100644
--- a/application/views/lehre/anrechnung/approveAnrechnungDetail.php
+++ b/application/views/lehre/anrechnung/approveAnrechnungDetail.php
@@ -143,7 +143,7 @@ $this->load->view(
                                                     Total: <span id="sumEctsTotal"><?php echo number_format($antragData->sumEctsSchulisch + $antragData->sumEctsBeruflich, 1) ?></span>
                                                     [Schulisch: <span id="sumEctsSchulisch" value="<?php echo $antragData->sumEctsSchulisch ?>"><?php echo $antragData->sumEctsSchulisch ?></span> /
                                                     Beruflich: <span id="sumEctsBeruflich" value="<?php echo $antragData->sumEctsBeruflich ?>"><?php echo $antragData->sumEctsBeruflich ?></span> ]
-                                                    <span id="sumEctsMsg"></span>
+                                                    <div class="p-1 align-items-center" id="sumEctsMsg"></div>
                                                 </td>
                                             </tr>
 											
diff --git a/public/js/lehre/anrechnung/approveAnrechnungDetail.js b/public/js/lehre/anrechnung/approveAnrechnungDetail.js
index 3a40503b5..51eed609c 100644
--- a/public/js/lehre/anrechnung/approveAnrechnungDetail.js
+++ b/public/js/lehre/anrechnung/approveAnrechnungDetail.js
@@ -394,16 +394,16 @@ var approveAnrechnungDetail = {
 
         switch (status_kurzbz) {
             case ANRECHNUNGSTATUS_APPROVED:
-                $('#approveAnrechnungDetail-status_kurzbz').closest('div').addClass('alert-success');
+                $('#approveAnrechnungDetail-status_kurzbz').closest('div').addClass('bg-success-subtle');
                 break;
             case ANRECHNUNGSTATUS_REJECTED:
-                $('#approveAnrechnungDetail-status_kurzbz').closest('div').addClass('alert-danger');
+                $('#approveAnrechnungDetail-status_kurzbz').closest('div').addClass('bg-danger-subtle');
                 break;
             case '':
-                $('#approveAnrechnungDetail-status_kurzbz').closest('div').addClass('alert-info');
+                $('#approveAnrechnungDetail-status_kurzbz').closest('div').addClass('bg-info-subtle');
                 break;
             default:
-                $('#approveAnrechnungDetail-status_kurzbz').closest('div').addClass('alert-warning');
+                $('#approveAnrechnungDetail-status_kurzbz').closest('div').addClass('bg-warning-subtle');
         }
     },
     setEmpfehlungstext: function () {
@@ -425,7 +425,7 @@ var approveAnrechnungDetail = {
         }
     },
     initTooltips: function (){
-        $('[data-toggle="tooltip"]').tooltip({
+        $('[data-bs-toggle="tooltip"]').tooltip({
                 delay: { "show": 200, "hide": 200 },
                 html: true
         }
@@ -499,14 +499,14 @@ var approveAnrechnungDetail = {
         $('#approveAnrechnungDetail-request-recommendation').prop('disabled', true);
         $('#approveAnrechnungDetail-approve-anrechnung-ask').prop('disabled', true);
         $('#approveAnrechnungDetail-reject-anrechnung-ask').prop('disabled', true);
-        $('#approveAnrechnungDetail-withdraw-request-recommedation').removeClass('hidden');
+        $('#approveAnrechnungDetail-withdraw-request-recommedation').removeClass('visually-hidden');
     },
     formatGenehmigungIsPositiv: function(abgeschlossenAm, abgeschlossenVon, statusKurzbz, statusBezeichnung){
-        $('#approveAnrechnungDetail-genehmigungDetail-genehmigungIsNull').addClass('hidden');
-        $('#approveAnrechnungDetail-genehmigungDetail-genehmigungIsNegativ').addClass('hidden');
-        $('#approveAnrechnungDetail-genehmigungDetail-genehmigungIsPositiv').removeClass('hidden');
+        $('#approveAnrechnungDetail-genehmigungDetail-genehmigungIsNull').addClass('visually-hidden');
+        $('#approveAnrechnungDetail-genehmigungDetail-genehmigungIsNegativ').addClass('visually-hidden');
+        $('#approveAnrechnungDetail-genehmigungDetail-genehmigungIsPositiv').removeClass('visually-hidden');
         $('#approveAnrechnungDetail-status_kurzbz').text(statusBezeichnung);
-        $('#approveAnrechnungDetail-status_kurzbz').closest('div').removeClass('alert-warning').addClass('alert-success');
+        $('#approveAnrechnungDetail-status_kurzbz').closest('div').removeClass('bg-warning-subtle').addClass('bg-success-subtle');
         $('#approveAnrechnungDetail-status_kurzbz').data('status_kurzbz', statusKurzbz);
         $('#approveAnrechnungDetail-abgeschlossenAm').text(abgeschlossenAm);
         $('#approveAnrechnungDetail-abgeschlossenVon').text(abgeschlossenVon);
@@ -515,14 +515,14 @@ var approveAnrechnungDetail = {
         $('#approveAnrechnungDetail-reject-anrechnung-ask').prop('disabled', true);
 
         // Show button to withdraw approval
-        $('#approveAnrechnungDetail-withdraw-anrechnung-approvement').removeClass('hidden');
+        $('#approveAnrechnungDetail-withdraw-anrechnung-approvement').removeClass('visually-hidden');
     },
     formatGenehmigungIsNegativ: function(abgeschlossenAm, abgeschlossenVon, statusKurzbz, statusBezeichnung, begruendung){
-        $('#approveAnrechnungDetail-genehmigungDetail-genehmigungIsNull').addClass('hidden');
-        $('#approveAnrechnungDetail-genehmigungDetail-genehmigungIsPositiv').addClass('hidden');
-        $('#approveAnrechnungDetail-genehmigungDetail-genehmigungIsNegativ').removeClass('hidden');
+        $('#approveAnrechnungDetail-genehmigungDetail-genehmigungIsNull').addClass('visually-hidden');
+        $('#approveAnrechnungDetail-genehmigungDetail-genehmigungIsPositiv').addClass('visually-hidden');
+        $('#approveAnrechnungDetail-genehmigungDetail-genehmigungIsNegativ').removeClass('visually-hidden');
         $('#approveAnrechnungDetail-status_kurzbz').text(statusBezeichnung);
-        $('#approveAnrechnungDetail-status_kurzbz').closest('div').removeClass('alert-warning').addClass('alert-danger');
+        $('#approveAnrechnungDetail-status_kurzbz').closest('div').removeClass('bg-warning-subtle').addClass('bg-danger-subtle');
         $('#approveAnrechnungDetail-status_kurzbz').data('status_kurzbz', statusKurzbz);
         $('#approveAnrechnungDetail-abgeschlossenAm').text(abgeschlossenAm);
         $('#approveAnrechnungDetail-abgeschlossenVon').text(abgeschlossenVon);
@@ -532,18 +532,18 @@ var approveAnrechnungDetail = {
         $('#approveAnrechnungDetail-reject-anrechnung-ask').prop('disabled', true);
 
         // Show button to withdraw approval
-        $('#approveAnrechnungDetail-withdraw-anrechnung-approvement').removeClass('hidden');
+        $('#approveAnrechnungDetail-withdraw-anrechnung-approvement').removeClass('visually-hidden');
     },
     formatGenehmigungIsWithdrawed: function (statusBezeichnung){
         let empfehlung = $('#approveAnrechnungDetail-empfehlung').data('empfehlung'); // null / false / true
 
         $('#approveAnrechnungDetail-status_kurzbz').text(statusBezeichnung);
-        $('#approveAnrechnungDetail-status_kurzbz').closest('div').removeClass('alert-danger').removeClass('alert-success');
-        $('#approveAnrechnungDetail-status_kurzbz').closest('div').addClass('alert-warning');
+        $('#approveAnrechnungDetail-status_kurzbz').closest('div').removeClass('bg-danger-subtle').removeClass('bg-success-subtle');
+        $('#approveAnrechnungDetail-status_kurzbz').closest('div').addClass('bg-warning-subtle');
 
-        $('#approveAnrechnungDetail-genehmigungDetail-genehmigungIsNull').removeClass('hidden');
-        $('#approveAnrechnungDetail-genehmigungDetail-genehmigungIsPositiv').addClass('hidden');
-        $('#approveAnrechnungDetail-genehmigungDetail-genehmigungIsNegativ').addClass('hidden');
+        $('#approveAnrechnungDetail-genehmigungDetail-genehmigungIsNull').removeClass('visually-hidden');
+        $('#approveAnrechnungDetail-genehmigungDetail-genehmigungIsPositiv').addClass('visually-hidden');
+        $('#approveAnrechnungDetail-genehmigungDetail-genehmigungIsNegativ').addClass('visually-hidden');
 
         $('#approveAnrechnungDetail-abgeschlossenAm').text('-');
         $('#approveAnrechnungDetail-abgeschlossenVon').text('-');
@@ -556,12 +556,12 @@ var approveAnrechnungDetail = {
         $('#approveAnrechnungDetail-approve-anrechnung-ask').prop('disabled', false);
         $('#approveAnrechnungDetail-reject-anrechnung-ask').prop('disabled', false);
         // Hide button to withdraw approval
-        $('#approveAnrechnungDetail-withdraw-anrechnung-approvement').addClass('hidden');
+        $('#approveAnrechnungDetail-withdraw-anrechnung-approvement').addClass('visually-hidden');
     },
     formatEmpfehlungIsWithdrawed: function (statusBezeichnung){
         $('#approveAnrechnungDetail-status_kurzbz').text(statusBezeichnung);
 
-        $('#approveAnrechnungDetail-empfehlungDetail-empfehlungIsNull').removeClass('hidden');
+        $('#approveAnrechnungDetail-empfehlungDetail-empfehlungIsNull').removeClass('visually-hidden');
         $('#approveAnrechnungDetail-empfehlungDetail-empfehlungsanfrageAm').html('-');
         $('#approveAnrechnungDetail-empfehlungDetail-empfehlungsanfrageAn').html('-');
 
@@ -569,7 +569,7 @@ var approveAnrechnungDetail = {
         $('#approveAnrechnungDetail-approve-anrechnung-ask').prop('disabled', false);
         $('#approveAnrechnungDetail-reject-anrechnung-ask').prop('disabled', false);
         // Hide button to withdraw approval
-        $('#approveAnrechnungDetail-withdraw-request-recommedation').addClass('hidden');
+        $('#approveAnrechnungDetail-withdraw-request-recommedation').addClass('visually-hidden');
     },
     sumUpEcts: function(){
         var ects = parseFloat($('#ects').text());
@@ -616,8 +616,9 @@ var approveAnrechnungDetail = {
 
          $('#sumEctsTotal').text(sumEctsSchulisch + sumEctsBeruflich - ects);
     },
+    
     alertIfMaxEctsExceeded: function(){
-        var begruendung_id = $('#begruendung_id').data('begruendung_id');
+    
         if (begruendung_id == 5)
         {
             return;
@@ -627,20 +628,19 @@ var approveAnrechnungDetail = {
             (begruendung_id != 4 && (parseFloat($('#ects').text()) + parseFloat($('#sumEctsSchulisch').text()))) > 60 ||
             (begruendung_id == 4 && (parseFloat($('#ects').text()) + parseFloat($('#sumEctsBeruflich').text()))) > 60 ||
             (parseFloat($('#ects').text()) + parseFloat($('#sumEctsSchulisch').text()) + parseFloat($('#sumEctsBeruflich').text())) > 90
-        )
-        {
+        ){
+       
             $('#sumEctsMsg')
-                .html("<br><b>ACHTUNG! Bei Anrechnung von LV: Überschreitung der Höchstgrenze für Anrechnungen gem. § 12 Abs. 3 Fachhochschulgesetz</b><i class=\"fa fa-lg fa-info-circle\"></i></br>")
-                .addClass('bg-danger text-danger')
+                .html("<span class='flex-fill fw-bold'>Die Höchstgrenze für Anrechnungen gem. § 12 Abs. 3 Fachhochschulgesetz ist überschritten. </span><i class='mx-4 fa fa-lg fa-info-circle'></i>")
+                .addClass('bg-danger-subtle')
                 .tooltip({
                     title: FHC_PhrasesLib.t("anrechnung", "anrechnungEctsTooltipTextBeiUeberschreitung"),
                     placement: 'right',
                     html: true
-                });
-        }
-        else
+            });
+        }else
         {
             $('#sumEctsMsg').html('').css('border', 'none');
         }
-    }
+    },
 }
\ No newline at end of file

From 183cb1ac1786a59714a4806848b5406ca547a238 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 15 Mar 2024 12:52:21 +0100
Subject: [PATCH 0491/1461] little adjustments on requestAnrechnung

---
 .../lehre/anrechnung/requestAnrechnung.php    |  2 +-
 .../js/lehre/anrechnung/requestAnrechnung.js  | 21 +++++--------------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/application/views/lehre/anrechnung/requestAnrechnung.php b/application/views/lehre/anrechnung/requestAnrechnung.php
index b5b33bc32..907b55038 100644
--- a/application/views/lehre/anrechnung/requestAnrechnung.php
+++ b/application/views/lehre/anrechnung/requestAnrechnung.php
@@ -145,7 +145,7 @@ $this->load->view(
                                                     Total ECTS: <span id="sumEctsTotal"><?php echo number_format($antragData->sumEctsSchulisch + $antragData->sumEctsBeruflich, 1) ?></span>
                                                     [ Schulisch: <span id="sumEctsSchulisch"><?php echo $antragData->sumEctsSchulisch ?></span> |
                                                     Beruflich: <span id="sumEctsBeruflich"><?php echo $antragData->sumEctsBeruflich ?></span> ]
-                                                    <div class="p-1 d-inline-flex align-items-center" id="requestAnrechnung-maxEctsUeberschrittenMsg"></div>
+                                                    <div class="p-1 align-items-center" id="requestAnrechnung-maxEctsUeberschrittenMsg"></div>
                                                 </td>
                                             </tr>
 											<tr>
diff --git a/public/js/lehre/anrechnung/requestAnrechnung.js b/public/js/lehre/anrechnung/requestAnrechnung.js
index a07bd3f18..81bb010be 100644
--- a/public/js/lehre/anrechnung/requestAnrechnung.js
+++ b/public/js/lehre/anrechnung/requestAnrechnung.js
@@ -279,9 +279,10 @@ var requestAnrechnung = {
     alertIfMaxEctsExceeded: function(){
 
         if(
-            (parseFloat($('#sumEctsSchulisch').text())) > 60 ||
-            (parseFloat($('#sumEctsBeruflich').text())) > 60 ||
-            (parseFloat($('#sumEctsSchulisch').text()) + parseFloat($('#sumEctsBeruflich').text())) > 90 
+            true
+            // (parseFloat($('#sumEctsSchulisch').text())) > 60 ||
+            // (parseFloat($('#sumEctsBeruflich').text())) > 60 ||
+            // (parseFloat($('#sumEctsSchulisch').text()) + parseFloat($('#sumEctsBeruflich').text())) > 90 
         )
         {
             $('#requestAnrechnung-maxEctsUeberschrittenMsg')
@@ -297,14 +298,7 @@ var requestAnrechnung = {
     alertIfMaxEctsExceededInsideBegruendungsbox: function(){
         let status_kurzbz = $('#requestAnrechnung-status_kurzbz').data('status_kurzbz');
                     
-        
-                //TODO: used for debugging
-                /* 
-                    var msgBeiEctsUeberschreitung = requestAnrechnung.getMsgBeiEctsUeberschreitung(begruendung_id, ectsLv, sumEctsSchulisch, sumEctsBeruflich);
-
-                    // Add to Checkbox text
-                    $('#requestAnrechnung-form :input[name="begruendung"]:checked').closest('div').append(msgBeiEctsUeberschreitung); */
-
+   
         if (status_kurzbz != ' ' && status_kurzbz != ANRECHNUNGSTATUS_APPROVED)
         {
             var ectsLv = parseFloat($('#ects').text());
@@ -351,11 +345,6 @@ var requestAnrechnung = {
 
         const phraseUsed = '<span class="d-block">Die Höchstgrenze für Anrechnungen gem. § 12 Abs. 3 Fachhochschulgesetz wird überschritten.</span><span class=" fw-bold">Bisherige ECTS + ECTS dieser LV: Total: {0} [ Schulisch: {1}  | Beruflich: {2}  ]</span>&emsp;';
 
-        //TODO: needed:
-        /* FHC_PhrasesLib.t("anrechnung", "anrechnungEctsTextBeiUeberschreitung",
-                begruendung_id == 4
-                    ? [(sumEctsSchulisch + sumEctsBeruflich + ects), sumEctsSchulisch, (sumEctsBeruflich  + ects)] // beruflich
-                    : [(sumEctsSchulisch + sumEctsBeruflich + ects), (sumEctsSchulisch + ects), sumEctsBeruflich]) */
         return $('<div class="p-1" id="sumEctsMsg"></div>')
             .html(phraseUsed) // schulisch
             .append('<i class="fa fa-lg fa-info-circle"></i>')

From 5ecac3cb998be5284686098d55a949ebc1aca7de Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 15 Mar 2024 15:01:55 +0100
Subject: [PATCH 0492/1461] migrates createAnrechnung to bootstrap 5 and
 tabulator 5

---
 .../lehre/anrechnung/createAnrechnung.php     | 78 +++++++++----------
 .../lehre/anrechnung/createAnrechnungData.php | 12 +--
 .../js/lehre/anrechnung/createAnrechnung.js   | 36 ++++++++-
 3 files changed, 76 insertions(+), 50 deletions(-)

diff --git a/application/views/lehre/anrechnung/createAnrechnung.php b/application/views/lehre/anrechnung/createAnrechnung.php
index e3cc9cad1..0ed7a8027 100644
--- a/application/views/lehre/anrechnung/createAnrechnung.php
+++ b/application/views/lehre/anrechnung/createAnrechnung.php
@@ -5,11 +5,13 @@ $this->load->view(
 		'title' => $this->p->t('anrechnung', 'neueAnrechnung'),
 		'jquery3' => true,
 		'jqueryui1' => true,
-		'bootstrap3' => true,
+		'bootstrap5' => true,
 		'fontawesome4' => true,
 		'ajaxlib' => true,
 		'dialoglib' => true,
-		'tabulator4' => true,
+		'tabulator5' => true,
+        'tabulator5JQuery' => true,
+		'cis'=>true,
 		'tablewidget' => true,
 		'phrases' => array(
 			'global' => array(
@@ -42,20 +44,20 @@ $this->load->view(
 <div class="container-fluid">
 
 <!-- Title -->
-<div class="row">
-	<div class="col-lg-12 page-header">
-		<h3>
+<div class="row  my-4">
+	<div class="col-12 border-bottom">
+		<h3 class="fw-normal">
 			<?php echo $this->p->t('anrechnung', 'neueAnrechnung'); ?>
-			<small>| <?php echo $this->p->t('global', 'antragAnlegen'); ?></small>
+			<small class="text-secondary fs-6">| <?php echo $this->p->t('global', 'antragAnlegen'); ?></small>
 		</h3>
 	</div>
 </div>
 
 <!-- Studiensemester Dropdown -->
-<div class="row">
-	<div class="col-xs-12">
-		<form class="form-inline" action="" method="get">
-			<div class="form-group">
+<div class="row my-4">
+	<div class="col-12">
+		<form class="row align-items-center" action="" method="get">
+			<div class="col-auto">
 				<?php
 				echo $this->widgetlib->widget(
 					'Studiensemester_widget',
@@ -64,13 +66,14 @@ $this->load->view(
 					),
 					array(
 						'name' => 'studiensemester',
-						'id' => 'studiensemester'
+						'id' => 'studiensemester',
+						'class'=>'form-select w-auto ',
 					)
 				);
 				?>
 			</div>
 			<button type="submit"
-					class="btn btn-default form-group">
+					class="btn btn-outline-secondary col-auto">
 				<?php echo ucfirst($this->p->t('ui', 'anzeigen')); ?>
 			</button>
 		</form>
@@ -78,29 +81,28 @@ $this->load->view(
 </div>
 
 <!-- StudentInnen Table -->
-<div class="row">
-	<div class="col-lg-10">
+<div class="row  my-4">
+	<div class="col-10">
 		<?php $this->load->view('lehre/anrechnung/createAnrechnungData.php'); ?>
 	</div>
 </div>
-<br><br>
 <!-- FORM START ------------------------------------------------------------------------------------------------------->
 <form id="createAnrechnung-form">
 <input name="prestudent_id" id="prestudent_id" type="hidden" value="" data-prestudent_id = "" >
 <input name="studiensemester_kurzbz" id="studiensemester_kurzbz" type="hidden" value="<?php echo $studiensemester_selected ?>">
-<div class="row">
-	<div class="col-lg-10">
-		<table class="table table-condensed table-bordered">
+<div class="row my-4">
+	<div class="col-10">
+		<table class="table table-condensed table-bordered mb-0">
 			<!-- StudentIn -->
 			<tr>
-				<th class="col-xs-5 col-lg-2"><label><?php echo $this->p->t('person', 'studentIn'); ?></label></th>
-				<td><span id="student" class="pl-15"></span></td>
+				<th class="col-5 col-lg-2"><label><?php echo $this->p->t('person', 'studentIn'); ?></label></th>
+				<td><span id="student" class="ps-3"></span></td>
 			</tr>
 			<!-- Selectmenu Lehrveranstaltungen -->
 			<tr>
-				<th class="col-xs-5 col-lg-2"><?php echo $this->p->t('lehre', 'lehrveranstaltung'); ?> *</th>
+				<th class="col-5 col-lg-2"><?php echo $this->p->t('lehre', 'lehrveranstaltung'); ?> *</th>
 				<td>
-					<select name="lehrveranstaltung_id" id="select-lehrveranstaltung" class="form-control select-w500">
+					<select name="lehrveranstaltung_id" id="select-lehrveranstaltung" class="form-select select-w500">
 						<option value="" <?php echo set_select('lehrveranstaltung', '', true); ?> >
 							<?php echo $this->p->t('ui', 'bitteWaehlen'); ?>
 						</option>
@@ -109,9 +111,9 @@ $this->load->view(
 			</tr>
 			<!-- Select Anrechnungbegruendungen -->
 			<tr>
-				<th class="col-xs-5 col-lg-2"><?php echo $this->p->t('global', 'begruendung'); ?> *</th>
+				<th class="col-5 col-lg-2"><?php echo $this->p->t('global', 'begruendung'); ?> *</th>
 				<td>
-					<select name="begruendung_id" id="select-begruendung" class="form-control select-w500">
+					<select name="begruendung_id" id="select-begruendung" class="form-select select-w500">
 						<option value="" <?php echo set_select('begruendung', '', true); ?> >
 							<?php echo $this->p->t('ui', 'bitteWaehlen'); ?>
 						</option>
@@ -126,7 +128,7 @@ $this->load->view(
 			</tr>
 			<!-- Submit Herkunft der Kenntnisse -->
 			<tr>
-				<th class="col-xs-5 col-lg-2"><?php echo $this->p->t('anrechnung', 'herkunftDerKenntnisse'); ?></th>
+				<th class="col-5 col-lg-2"><?php echo $this->p->t('anrechnung', 'herkunftDerKenntnisse'); ?></th>
 				<td>
 					<?php echo form_textarea(array(
 						'name' => 'herkunftKenntnisse',
@@ -136,31 +138,27 @@ $this->load->view(
 			</tr>
 			<!-- Submit Upload Nachweisdokumente -->
 			<tr>
-				<th class="col-xs-5 col-lg-2"><?php echo $this->p->t('anrechnung', 'nachweisdokumente'); ?> *</th>
-				<td>
-					<div><?php echo form_upload(array(
-							'name' => 'uploadfile',
-							'accept' => '.pdf',
-							'size' => '50',
-							'required' => 'required',
-							'enctype' => "multipart/form-data"
-							)); ?>
-					</div>
-					<a class="pull-right" id="download-nachweisdokumente"></a>
+				<th class="col-5 col-lg-2 "><?php echo $this->p->t('anrechnung', 'nachweisdokumente'); ?> *</th>
+				<td class="d-flex input-group align-items-center">
+					
+					<input class="form-control flex-fill" type="file" id="requestAnrechnung-uploadfile"
+						name="uploadfile" accept=".pdf" size="50" data-maxsize="<?php echo (int)ini_get('upload_max_filesize') * 1024 * 1024 ?>"
+						required>
+							
 				</td>
 			</tr>
 		</table>
 	</div>
 </div>
 
-<div class="row">
-	<div class="col-lg-10">
+<div class="row my-4">
+	<div class="col-10">
 		<!-- Submit Button -->
-		<button class="btn btn-primary btn-w200 pull-right" id="createAnrechnung-submit" type="submit" value="submit">
+		<button class="btn btn-primary btn-w200 float-end" id="createAnrechnung-submit" type="submit" value="submit">
 			<?php echo $this->p->t('global', 'antragAnlegen'); ?>
 		</button>
 		<!-- Open new Anrechnung Button (hidden by default) -->
-		<a type="button" class="btn btn-default btn-mr10 pull-right hidden" id="createAnrechnung-openAnrechnung" target="_blank"></a>
+		<a type="button" class="btn btn-outline-secondary me-1 float-end visually-hidden" id="createAnrechnung-openAnrechnung" target="_blank"></a>
 	</div>
 </div>
 
diff --git a/application/views/lehre/anrechnung/createAnrechnungData.php b/application/views/lehre/anrechnung/createAnrechnungData.php
index c09d8926c..a0994189a 100644
--- a/application/views/lehre/anrechnung/createAnrechnungData.php
+++ b/application/views/lehre/anrechnung/createAnrechnungData.php
@@ -56,17 +56,13 @@ $filterWidgetArray = array(
 		layout: "fitColumns",           // fit columns to width of table
 		persistentLayout:true,
 		autoResize: false, 				// prevent auto resizing of table (false to allow adapting table size when cols are (de-)activated
-	    headerFilterPlaceholder: " ",
         index: "prestudent_id",         // assign specific column as unique id (important for row indexing)
         selectable: 1,                  // allow row selection
         selectablePersistence:false,    // deselect previously selected rows when table is filtered, sorted or paginated
-        rowSelected: function(row) {
-	        func_rowSelected(row);
-        },
-        rowSelectionChanged:function(data, rows){
-            func_rowSelectionChanged(data, rows);
-        },
-		tableWidgetHeader: false
+		tableWidgetHeader: false,
+		columnDefaults:{
+			headerFilterPlaceholder: " ",
+		}
 	 }',
 	'datasetRepFieldsDefs' => '{
 		prestudent_id:          {visible: false, headerFilter:"input"},
diff --git a/public/js/lehre/anrechnung/createAnrechnung.js b/public/js/lehre/anrechnung/createAnrechnung.js
index 176821f2c..fd4e02a2b 100644
--- a/public/js/lehre/anrechnung/createAnrechnung.js
+++ b/public/js/lehre/anrechnung/createAnrechnung.js
@@ -1,5 +1,16 @@
 $(function () {
 
+    // tableInit is called in the jquery_wrapper when the tableBuilt event was finished
+    $(document).on("tableInit", function(event,tabulatorInstance) {
+        
+           // event rowSelected needs to be attached as a callback to the tableBuilt event in tabulator5
+           $("#tableWidgetTabulator").tabulator("on","rowSelected",(row)=>{func_rowSelected(row)});
+           // event rowSelectionChanged needs to be attached as a callback to the tableBuilt event in tabulator5
+           $("#tableWidgetTabulator").tabulator("on","rowSelectionChanged",(data,rows)=>{func_rowSelectionChanged(data,rows)});
+          
+    });
+
+
     // Disable all form fields by default
     createAnrechnung.disableFormFields();
 
@@ -8,6 +19,13 @@ $(function () {
 
         e.preventDefault();
 
+        var fileInput = $('#requestAnrechnung-uploadfile');
+        const uploadMaxFilesize = $('#requestAnrechnung-uploadfile').data('maxsize')  ; // in byte
+        if (!createAnrechnung.fileSizeOk(fileInput, uploadMaxFilesize)) // in byte
+        {
+            return FHC_DialogLib.alertWarning(FHC_PhrasesLib.t("ui", "errorDokumentZuGross"));
+        }
+
         FHC_AjaxClient.ajaxCallPost(
             FHC_JS_DATA_STORAGE_OBJECT.called_path + "/create",
             {
@@ -93,6 +111,20 @@ function func_rowSelectionChanged(data, rows){
 // ---------------------------------------------------------------------------------------------------------------------
 
 var createAnrechnung = {
+    fileSizeOk: function(fileInput, maxSize){
+
+        if (fileInput.get(0).files.length){
+
+            var fileSize = fileInput.get(0).files[0].size; // in bytes
+
+            if (fileSize > maxSize)
+            {
+                return false;
+            }
+
+            return true;
+        }
+    },
     emptyFormFields: function(){
 
         // Empty field StudentIn
@@ -102,7 +134,7 @@ var createAnrechnung = {
         $('#createAnrechnung-form :input:not([type=hidden])').val('');
 
         // Hide eventually displayed button to open Anrechnung
-        $('#createAnrechnung-openAnrechnung').addClass('hidden');
+        $('#createAnrechnung-openAnrechnung').addClass('visually-hidden');
     },
     disableFormFields: function(){
         let prestudent_id = $('#prestudent_id').data('prestudent_id');
@@ -152,7 +184,7 @@ var createAnrechnung = {
     displayButtonToOpenAnrechnung: function(anrechnung_id){
         // Display button to open Anrechnung in new tab
         $('#createAnrechnung-openAnrechnung')
-            .removeClass('hidden')
+            .removeClass('visually-hidden')
             .attr('href', 'ApproveAnrechnungDetail/?anrechnung_id=' + anrechnung_id)
             .html('<i class="fa fa-external-link" aria-hidden="true"></i> ' + FHC_PhrasesLib.t("global", "antragBearbeiten"));
     }

From 83ccc933053b7f9a69af5c42772188076836780d Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 15 Mar 2024 15:02:17 +0100
Subject: [PATCH 0493/1461] little adjustments and migrations

---
 .../views/lehre/anrechnung/approveAnrechnungDetail.php        | 3 ++-
 .../views/lehre/anrechnung/approveAnrechnungUebersicht.php    | 2 +-
 application/views/lehre/anrechnung/requestAnrechnung.php      | 2 +-
 public/js/TableWidget.js                                      | 4 +---
 public/js/lehre/anrechnung/approveAnrechnungUebersicht.js     | 2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/application/views/lehre/anrechnung/approveAnrechnungDetail.php b/application/views/lehre/anrechnung/approveAnrechnungDetail.php
index c2d2a6053..3b7c7f57b 100644
--- a/application/views/lehre/anrechnung/approveAnrechnungDetail.php
+++ b/application/views/lehre/anrechnung/approveAnrechnungDetail.php
@@ -6,6 +6,7 @@ $this->load->view(
 		'jquery3' => true,
 		'jqueryui1' => true,
 		'bootstrap5' => true,
+		'cis'=>true,
 		'fontawesome4' => true,
 		'ajaxlib' => true,
 		'dialoglib' => true,
@@ -66,7 +67,7 @@ $this->load->view(
     <div class="container-fluid">
         <!-- header  -->
         <div class="row">
-            <div class="col-12 my-4 page-header border-bottom">
+            <div class="col-12 my-4 border-bottom">
                 <h3 class="fw-normal ">
 					<?php echo $this->p->t('anrechnung', 'anrechnungenGenehmigen'); ?>
                     <small class="text-secondary fs-6">| <?php echo $this->p->t('global', 'detailsicht'); ?></small>
diff --git a/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php b/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php
index f7841964c..02a104e6f 100644
--- a/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php
+++ b/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php
@@ -96,7 +96,7 @@ $this->load->view(
     <div class="container-fluid">
         <!-- header -->
         <div class="row">
-            <div class="col-12 my-4 page-header border-bottom">
+            <div class="col-12 my-4 border-bottom">
                 <h3 class="fw-normal ">
 					<?php echo $this->p->t('anrechnung', 'anrechnungenGenehmigen'); ?>
                     <small class="text-secondary fs-6">| <?php echo ucfirst($this->p->t('global', 'uebersicht')); ?></small>
diff --git a/application/views/lehre/anrechnung/requestAnrechnung.php b/application/views/lehre/anrechnung/requestAnrechnung.php
index 907b55038..a4c33347a 100644
--- a/application/views/lehre/anrechnung/requestAnrechnung.php
+++ b/application/views/lehre/anrechnung/requestAnrechnung.php
@@ -73,7 +73,7 @@ $this->load->view(
     <div class="container-fluid">
         <!-- header -->
         <div class="row">
-            <div class="col-12 my-4 page-header border-bottom">
+            <div class="col-12 my-4 border-bottom">
                 <h3 class="fw-normal">
 					<?php echo $this->p->t('anrechnung', 'anerkennungNachgewiesenerKenntnisse'); ?>
                     <small class="text-secondary fs-6">| <?php echo $this->p->t('anrechnung', 'antragStellen'); ?></small>
diff --git a/public/js/TableWidget.js b/public/js/TableWidget.js
index 32121e9c0..3aa1367cf 100644
--- a/public/js/TableWidget.js
+++ b/public/js/TableWidget.js
@@ -572,12 +572,10 @@ var FHC_TableWidget = {
 			if (data.hasOwnProperty("dataset") && $.isArray(data.dataset))
 			{
 				if (options == null) options = {};
-				console.log("header tooltips here:",options.columnDefaults.tooltipsHeader);
-				console.log("tooltips here:",options.columnDefaults.tooltip);
 				options.columnDefaults={
 					// set header tooltip with column title
 					//! the old keyword is tooltipsHeader, the new keyword for the option is headerTooltip
-					headerTooltip: (typeof options.columnDefaults.tooltipsHeader == 'undefined') ? true : options.columnDefaults.tooltipsHeader
+					headerTooltip: (typeof options.columnDefaults?.tooltipsHeader == 'undefined') ? true : options.columnDefaults?.tooltipsHeader
 				}
 				options.columns = arrayTabulatorColumns;
 				options.data = data.dataset;
diff --git a/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js b/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
index f351776d1..4b89c36b7 100644
--- a/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
+++ b/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
@@ -260,7 +260,7 @@ $(function(){
    
     // tableInit is called in the jquery_wrapper when the tableBuilt event was finished
     $(document).on("tableInit", function(event,tabulatorInstance) {
-     console.log("instance",tabulatorInstance);
+     
         func_tableBuilt($("#tableWidgetTabulator"))
         
         // event rowSelectionChanged now has to be attached to the tabulator after instantiation and after the tableBuilt event

From 72bf2525b79b1bbd986084717afc881fcdcd0ee9 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 18 Mar 2024 10:14:05 +0100
Subject: [PATCH 0494/1461] updating reviewAnrechnungUebersicht to bootstrap5
 and tabulator5

---
 .../approveAnrechnungUebersicht.php           |  4 +-
 .../anrechnung/reviewAnrechnungUebersicht.php | 92 ++++++++++---------
 .../reviewAnrechnungUebersichtData.php        | 16 ++--
 .../anrechnung/approveAnrechnungUebersicht.js |  2 +-
 .../anrechnung/reviewAnrechnungUebersicht.js  | 21 ++++-
 5 files changed, 73 insertions(+), 62 deletions(-)

diff --git a/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php b/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php
index 02a104e6f..a63682cf0 100644
--- a/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php
+++ b/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php
@@ -185,11 +185,11 @@ $this->load->view(
             
             <div class="border border-1 mb-4" style="display: none"
                  id="approveAnrechnungUebersicht-genehmigung-panel">
-                <div>
+                <div class="mb-4">
                     <h4 class="card card-body border-success text-success my-3"><?php echo $this->p->t('anrechnung', 'genehmigungenPositivQuestion'); ?></h4>
                     <div class="ps-2 mb-4"><?php echo $this->p->t('anrechnung', 'genehmigungenPositiv'); ?></div>
                 </div>
-                <br>
+                
                 <!-- Action Button 'Abbrechen'-->
                 <div class="mb-4 d-flex justify-content-end">
                     <button id="approveAnrechnungUebersicht-empfehlung-abbrechen"
diff --git a/application/views/lehre/anrechnung/reviewAnrechnungUebersicht.php b/application/views/lehre/anrechnung/reviewAnrechnungUebersicht.php
index 7485a1812..0c2cbc297 100644
--- a/application/views/lehre/anrechnung/reviewAnrechnungUebersicht.php
+++ b/application/views/lehre/anrechnung/reviewAnrechnungUebersicht.php
@@ -5,9 +5,11 @@ $this->load->view(
 		'title' => $this->p->t('anrechnung', 'anrechnungenPruefen'),
 		'jquery3' => true,
 		'jqueryui1' => true,
-		'bootstrap3' => true,
+		'bootstrap5' => true,
 		'fontawesome4' => true,
-		'tabulator4' => true,
+		'tabulator5' => true,
+        'tabulator5JQuery' => true,
+        'cis'=>true,
 		'ajaxlib' => true,
 		'dialoglib' => true,
 		'tablewidget' => true,
@@ -84,18 +86,18 @@ $this->load->view(
     <div class="container-fluid">
         <!-- title -->
         <div class="row">
-            <div class="col-lg-12 page-header">
-                <h3>
+            <div class="col-12 my-4 border-bottom">
+                <h3 class="fw-normal">
 					<?php echo $this->p->t('anrechnung', 'anrechnungenPruefen'); ?>
-                    <small>| <?php echo ucfirst($this->p->t('global', 'uebersicht')); ?></small>
+                    <small class="text-secondary fs-6">| <?php echo ucfirst($this->p->t('global', 'uebersicht')); ?></small>
                 </h3>
             </div>
         </div>
         <!-- dropdown studiensemester -->
         <div class="row">
-            <div class="col-lg-12">
-                <form id="formApproveAnrechnungUebersicht" class="form-inline" action="" method="get">
-                    <div class="form-group">
+            <div class="col-12">
+                <form id="formApproveAnrechnungUebersicht" class="row align-items-center" action="" method="get">
+                    <div class="col-auto">
 						<?php
 						echo $this->widgetlib->widget(
 							'Studiensemester_widget',
@@ -104,42 +106,45 @@ $this->load->view(
 							),
 							array(
 								'name' => 'studiensemester',
-								'id' => 'studiensemester'
+								'id' => 'studiensemester',
+                                'class'=>'form-select w-auto ',
 							)
 						);
 						?>
                     </div>
                     <button type="submit"
-                            class="btn btn-default form-group"><?php echo ucfirst($this->p->t('ui', 'anzeigen')); ?></button>
+                            class="btn btn-outline-secondary col-auto"><?php echo ucfirst($this->p->t('ui', 'anzeigen')); ?></button>
                 </form>
             </div>
         </div>
         <!-- Tabelle -->
         <div class="row">
-            <div class="col-xs-12">
+            <div class="col-12">
 				<?php $this->load->view('lehre/anrechnung/reviewAnrechnungUebersichtData.php');?>
             </div>
         </div>
         <!-- Empfehlung / Nicht Empfehlung Panel -->
         <div class="row">
-            <div class="panel panel-default panel-body" style="display: none"
+            <div class="border border-1 mb-4" style="display: none"
                  id="reviewAnrechnungUebersicht-begruendung-panel">
-                <div>
-                    <h4 class="panel panel-body panel-danger text-danger"><?php echo $this->p->t('anrechnung', 'empfehlungenNegativQuestion'); ?></h4>
+                <div class="mb-4 col-12">
+                    <h4 class="card card-body border-danger text-danger my-3"><?php echo $this->p->t('anrechnung', 'empfehlungenNegativQuestion'); ?></h4>
+                    <div class="mb-4">
                     <b><span>&ensp;<?php echo $this->p->t('anrechnung', 'bitteBegruendungAngeben'); ?></span>
                         <span class="text-danger">
                         <?php echo $this->p->t('anrechnung', 'begruendungWirdFuerAlleUebernommen'); ?>
                         </span></b>
-                    <br><br>
-                    <ul class="list-group">
+                        </div>
+                    
+                    <ul class="list-group mb-4">
                         <li class="list-group-item">
                             <span><?php echo $this->p->t('anrechnung', 'empfehlungNegativPruefungNichtMoeglich'); ?></span>
-                            <span class="btn-copyIntoTextarea pull-right" data-toggle="tooltip" data-placement="right"
+                            <span class="btn-copyIntoTextarea float-end" data-bs-toggle="tooltip" data-bs-placement="right"
                                   title="<?php echo $this->p->t('ui', 'textUebernehmen'); ?>">
                                 <i class="fa fa-clipboard fa-lg" aria-hidden="true"></i>
                             </span>
                         </li>
-                        <li class="list-group-item disabled">
+                        <li class="list-group-item list-group-item-secondary">
                             <?php echo $this->p->t('anrechnung', 'empfehlungNegativKenntnisseNichtGleichwertigWeilHinweis'); ?>
                         </li>
                     </ul>
@@ -148,11 +153,11 @@ $this->load->view(
                               placeholder="<?php echo $this->p->t('anrechnung', 'textUebernehmenOderEigenenBegruendungstext'); ?>"
                               required></textarea>
                 </div>
-                <br>
+                
                 <!-- Action Button Abbrechen & Bestaetigen-->
-                <div class="pull-right">
+                <div class=" mb-4 d-flex justify-content-end">
                     <button id="reviewAnrechnungUebersicht-begruendung-abbrechen"
-                            class="btn btn-default btn-w200" type="reset">
+                            class="me-1 btn btn-outline-secondary btn-w200" type="reset">
 						<?php echo ucfirst($this->p->t('ui', 'abbrechen')); ?>
                     </button>
                     <button id="reviewAnrechnungUebersicht-dont-recommend-anrechnungen-confirm"
@@ -161,17 +166,17 @@ $this->load->view(
                     </button>
                 </div>
             </div>
-            <div class="panel panel-default panel-body" style="display: none"
+            <div class="border border-1 mb-4" style="display: none"
                  id="reviewAnrechnungUebersicht-empfehlung-panel">
-                <div>
-                    <h4 class="panel panel-body panel-success text-success"><?php echo $this->p->t('anrechnung', 'empfehlungenPositivQuestion'); ?></h4>
-                    &ensp;<?php echo $this->p->t('anrechnung', 'empfehlungenPositiv'); ?><br><br>
+                <div class="mb-4" >
+                    <h4 class="card card-body border-success text-success my-3"><?php echo $this->p->t('anrechnung', 'empfehlungenPositivQuestion'); ?></h4>
+                    <div class="ps-2 mb-4"><?php echo $this->p->t('anrechnung', 'empfehlungenPositiv'); ?></div>
                 </div>
-                <br>
+                
                 <!-- Action Button 'Abbrechen'-->
-                <div class="pull-right">
+                <div class="mb-4 d-flex justify-content-end">
                     <button id="reviewAnrechnungUebersicht-empfehlung-abbrechen"
-                            class="btn btn-default btn-w200" type="reset">
+                            class="me-1 btn btn-outline-secondary btn-w200" type="reset">
 						<?php echo ucfirst($this->p->t('ui', 'abbrechen')); ?>
                     </button>
                     <button id="reviewAnrechnungUebersicht-recommend-anrechnungen-confirm"
@@ -181,35 +186,34 @@ $this->load->view(
                 </div>
             </div>
         </div>
-
+        <!-- Filter buttons / Submit buttons-->
         <div class="row">
-
             <!-- Filter buttons -->
-            <div class="col-xs-3">
+            <div class="col-3">
                 <div class="btn-toolbar" role="toolbar">
                     <div class="btn-group" role="group">
-                        <button id="show-need-recommendation" class="btn btn-default btn-clearfilter" type="button"
-                                data-toggle="tooltip" data-placement="left"
+                        <button id="show-need-recommendation" class="btn btn-outline-secondary btn-clearfilter" type="button"
+                                data-bs-toggle="tooltip" data-bs-placement="left" data-bs-html="true"
                                 title="<?php echo $this->p->t('ui', 'nurFehlendeEmpfehlungenAnzeigen'); ?>"><i
                                     class='fa fa-eye'></i>
                         </button>
-                        <button id="show-recommended" class="btn btn-default btn-clearfilter" type="button"
-                                data-toggle="tooltip" data-placement="left"
+                        <button id="show-recommended" class="btn btn-outline-secondary btn-clearfilter" type="button"
+                                data-bs-toggle="tooltip" data-bs-placement="left" data-bs-html="true"
                                 title="<?php echo $this->p->t('ui', 'nurEmpfohleneAnzeigen'); ?>"><i
                                     class='fa fa-thumbs-o-up'></i>
                         </button>
-                        <button id="show-not-recommended" class="btn btn-default btn-clearfilter" type="button"
-                                data-toggle="tooltip" data-placement="left"
+                        <button id="show-not-recommended" class="btn btn-outline-secondary btn-clearfilter" type="button"
+                                data-bs-toggle="tooltip" data-bs-placement="left" data-bs-html="true"
                                 title="<?php echo $this->p->t('ui', 'nurNichtEmpfohleneAnzeigen'); ?>"><i
                                     class='fa fa-thumbs-o-down'></i>
                         </button>
-                        <button id="show-approved" class="btn btn-default btn-clearfilter" type="button"
-                                data-toggle="tooltip" data-placement="left"
+                        <button id="show-approved" class="btn btn-outline-secondary btn-clearfilter" type="button"
+                                data-bs-toggle="tooltip" data-bs-placement="left" data-bs-html="true"
                                 title="<?php echo $this->p->t('ui', 'nurGenehmigteAnzeigen'); ?>"><i
                                     class='fa fa-check'></i>
                         </button>
-                        <button id="show-rejected" class="btn btn-default btn-clearfilter" type="button"
-                                data-toggle="tooltip" data-placement="left"
+                        <button id="show-rejected" class="btn btn-outline-secondary btn-clearfilter" type="button"
+                                data-bs-toggle="tooltip" data-bs-placement="left" data-bs-html="true"
                                 title="<?php echo $this->p->t('ui', 'nurAbgelehnteAnzeigen'); ?>"><i
                                     class='fa fa-times'></i>
                         </button>
@@ -218,10 +222,10 @@ $this->load->view(
             </div>
 
             <!-- Action Buttons 'Empfehlen', 'Nicht empfehlen'-->
-            <div class="col-xs-9">
-                <div class="pull-right">
+            <div class="col-9">
+                <div class="d-flex justify-content-end">
                     <button id="reviewAnrechnungUebersicht-dont-recommend-anrechnungen-ask"
-                            class="btn btn-danger btn-w200" type="button">
+                            class="me-1 btn btn-danger btn-w200" type="button">
                         <?php echo ucfirst($this->p->t('anrechnung', 'nichtEmpfehlen')); ?></button>
                     <button id="reviewAnrechnungUebersicht-recommend-anrechnungen-ask"
                             class="btn btn-primary btn-w200" type="button">
diff --git a/application/views/lehre/anrechnung/reviewAnrechnungUebersichtData.php b/application/views/lehre/anrechnung/reviewAnrechnungUebersichtData.php
index 30ae3d72b..b88617ced 100644
--- a/application/views/lehre/anrechnung/reviewAnrechnungUebersichtData.php
+++ b/application/views/lehre/anrechnung/reviewAnrechnungUebersichtData.php
@@ -157,15 +157,11 @@ $filterWidgetArray = array(
 		persistentLayout:true,
 		persistentSort:true,
 		autoResize: false, 				// prevent auto resizing of table (false to allow adapting table size when cols are (de-)activated
-	    headerFilterPlaceholder: " ",
 	    initialHeaderFilter: [{field:"empfehlungsberechtigt", value: true}], 
         index: "anrechnung_id",             // assign specific column as unique id (important for row indexing)
         selectable: true,               // allow row selection
         selectableRangeMode: "click",   // allow range selection using shift end click on end of range
         selectablePersistence:false,    // deselect previously selected rows when table is filtered, sorted or paginated
-        tableBuilt: function(){
-            func_tableBuilt(this);
-        },
         tableWidgetFooter: {
 			selectButtons: true
 		},
@@ -175,12 +171,12 @@ $filterWidgetArray = array(
         rowFormatter:function(row){
             func_rowFormatter(row);
         },
-         rowUpdated:function(row){
-            func_rowUpdated(row);
-        },
-        tooltips: function(cell){
-            return func_tooltips(cell);
-        }
+        columnDefaults:{
+			headerFilterPlaceholder: " ",
+			tooltip:(cell)=>{func_tooltips(cell)},
+			
+		}
+        
 	 }', // tabulator properties
 	'datasetRepFieldsDefs' => '{
 		empfehlungsberechtigt: {formatter:"tickCross", align:"center", headerTooltip:"Berechtigt wenn man die LV leitet oder wenn der LV keine LV-Leitung zugeordnet ist.",
diff --git a/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js b/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
index 4b89c36b7..371268c1e 100644
--- a/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
+++ b/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
@@ -263,7 +263,7 @@ $(function(){
      
         func_tableBuilt($("#tableWidgetTabulator"))
         
-        // event rowSelectionChanged now has to be attached to the tabulator after instantiation and after the tableBuilt event
+        // event rowSelectionChanged needs to be attached as a callback to the tableBuilt event in tabulator5
         $("#tableWidgetTabulator").tabulator("on","rowSelectionChanged",(data,rows)=>{func_rowSelectionChanged(data,rows,tabulatorInstance)});
        
     });
diff --git a/public/js/lehre/anrechnung/reviewAnrechnungUebersicht.js b/public/js/lehre/anrechnung/reviewAnrechnungUebersicht.js
index c71b85274..7ae03d875 100644
--- a/public/js/lehre/anrechnung/reviewAnrechnungUebersicht.js
+++ b/public/js/lehre/anrechnung/reviewAnrechnungUebersicht.js
@@ -59,7 +59,7 @@ function hf_empfehlungsberechtigt(headerValue, rowValue){
 
 // Adds column details
 function func_tableBuilt(table) {
-    table.addColumn(
+    table.tabulator("addColumn",
         {
             title: "Details",
             field: 'details',
@@ -149,6 +149,7 @@ function paramLookup_dokBez(cell){
  * (Ignore rows that are approved, rejected or in request for recommendation)
  */
 function tableWidgetHook_selectAllButton(tableWidgetDiv){
+    
     var resultRows = tableWidgetDiv.find("#tableWidgetTabulator").tabulator('getRows', true)
         .filter(row =>
             row.getData().status_kurzbz == ANRECHNUNGSTATUS_PROGRESSED_BY_LEKTOR
@@ -173,6 +174,16 @@ $(function(){
         return;
     }
 
+
+    $(document).on("tableInit", function(event,tabulatorInstance) {
+     
+        func_tableBuilt($("#tableWidgetTabulator"))
+
+        // event rowUpdated needs to be attached as a callback to the tableBuilt event in tabulator5
+        $("#tableWidgetTabulator").tabulator("on","rowUpdated",(row)=>{func_rowUpdated(row)})
+       
+    });
+
     // Redraw table on resize to fit tabulators height to windows height
     window.addEventListener('resize', function(){
         $('#tableWidgetTabulator').tabulator('setHeight', $(window).height() * 0.50);
@@ -432,16 +443,16 @@ var reviewAnrechnung = {
 
         switch (status_kurzbz) {
             case ANRECHNUNGSTATUS_APPROVED:
-                $('#reviewAnrechnung-status_kurzbz').closest('div').addClass('alert-success');
+                $('#reviewAnrechnung-status_kurzbz').closest('div').addClass('bg-success-subtle');
                 break;
             case ANRECHNUNGSTATUS_REJECTED:
-                $('#reviewAnrechnung-status_kurzbz').closest('div').addClass('alert-danger');
+                $('#reviewAnrechnung-status_kurzbz').closest('div').addClass('bg-danger-subtle');
                 break;
             case '':
-                $('#reviewAnrechnung-status_kurzbz').closest('div').addClass('alert-info');
+                $('#reviewAnrechnung-status_kurzbz').closest('div').addClass('bg-info-subtle');
                 break;
             default:
-                $('#reviewAnrechnung-status_kurzbz').closest('div').addClass('alert-warning');
+                $('#reviewAnrechnung-status_kurzbz').closest('div').addClass('bg-warning-subtle');
         }
     },
     copyIntoTextarea: function(elem){

From 44260ddb4d8766d626f283138f7f5d51e0fc6957 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 18 Mar 2024 10:58:14 +0100
Subject: [PATCH 0495/1461] basic link to Anwesenheit Extension from
 cis_menu_lv.inc.php checking on CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN in
 global.config-default.inc.php

---
 config/global.config-default.inc.php |  1 +
 include/tw/cis_menu_lv.inc.php       | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/config/global.config-default.inc.php b/config/global.config-default.inc.php
index d12b23828..c9c86955c 100644
--- a/config/global.config-default.inc.php
+++ b/config/global.config-default.inc.php
@@ -27,6 +27,7 @@ define('CIS_LEHRVERANSTALTUNG_SEMESTERINFO_ANZEIGEN',true);
 define('CIS_LEHRVERANSTALTUNG_LEHRFACH_ANZEIGEN',false);
 define('CIS_LEHRVERANSTALTUNG_GESAMTNOTE_ANZEIGEN', true);
 define('CIS_LEHRVERANSTALTUNG_ANRECHNUNG_ANZEIGEN', true);
+define('CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN', true);
 
 // Im CIS Menue Links bei Modulen anzeigen wenn Lehrauftrag
 define('CIS_LEHRVERANSTALTUNG_MODULE_LINK',true);
diff --git a/include/tw/cis_menu_lv.inc.php b/include/tw/cis_menu_lv.inc.php
index 16abdc48a..bbcbe2e98 100644
--- a/include/tw/cis_menu_lv.inc.php
+++ b/include/tw/cis_menu_lv.inc.php
@@ -240,6 +240,28 @@ function checkZeilenUmbruch()
 		);
 	}
 
+	// Anwesenheiten neu
+	if(CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN && $angemeldet)
+	{
+
+		$link='';
+		$name='';
+		$text='';
+
+		$name = 'Anwesenheiten NEU';
+		$link= APP_ROOT."index.ci.php/extensions/FHC-Core-Anwesenheiten/?stg_kz=$studiengang_kz&sem=$semester&lvid=$lvid&stsem=$angezeigtes_stsem";
+
+		$menu[]=array
+		(
+			'id'=>'core_menu_anwesenheitslisten',
+			'position'=>'40',
+			'name'=> $name,
+			'icon'=>'../../../skin/images/button_listen.png',
+			'link'=>$link,
+			'text'=>$text
+		);
+	}
+
 	//FEEDBACK
 	if((!defined('CIS_LEHRVERANSTALTUNG_FEEDBACK_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_FEEDBACK_ANZEIGEN) && $angemeldet)
 	{

From 571bf8ebadcb851a80de0914c927b7687e50ca2e Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 18 Mar 2024 11:02:26 +0100
Subject: [PATCH 0496/1461] update reviewAnrechnungenDetail to Bootatrap5 and
 little styling fixes for other Detail views

---
 .../anrechnung/approveAnrechnungDetail.php    |   4 +-
 .../approveAnrechnungUebersicht.php           |   4 +-
 .../anrechnung/reviewAnrechnungDetail.php     | 149 +++++++++---------
 .../lehre/anrechnung/reviewAnrechnungInfo.php |   2 +-
 4 files changed, 81 insertions(+), 78 deletions(-)

diff --git a/application/views/lehre/anrechnung/approveAnrechnungDetail.php b/application/views/lehre/anrechnung/approveAnrechnungDetail.php
index 3b7c7f57b..e5ccbe127 100644
--- a/application/views/lehre/anrechnung/approveAnrechnungDetail.php
+++ b/application/views/lehre/anrechnung/approveAnrechnungDetail.php
@@ -427,13 +427,13 @@ $this->load->view(
 
             <div class="col-4">
 				<!-- -Statusleiste -->
-                <div class="alert text-center">
+                <div class="mb-5 alert text-center">
                     Status: <b><span class="text-uppercase" id="approveAnrechnungDetail-status_kurzbz"
                              data-status_kurzbz="<?php echo $anrechnungData->status_kurzbz ?>">
                             <?php echo $anrechnungData->status; ?>
                         </span></b>
                 </div>
-                <br>
+                
 				<!-- Infopanels -->
 				<?php $this->load->view('lehre/anrechnung/reviewAnrechnungInfo'); ?>
             </div>
diff --git a/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php b/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php
index a63682cf0..c0541c8ce 100644
--- a/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php
+++ b/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php
@@ -173,11 +173,11 @@ $this->load->view(
                 <!-- Action Button 'Abbrechen'-->
                 <div class="mb-4 d-flex justify-content-end" >
                     <button id="approveAnrechnungUebersicht-begruendung-abbrechen"
-                            class="btn btn-outline-secondary btn-w200 ms-1" type="reset">
+                            class="me-1 btn btn-outline-secondary btn-w200 " type="reset">
 						<?php echo ucfirst($this->p->t('ui', 'abbrechen')); ?>
                     </button>
                     <button id="approveAnrechnungUebersicht-reject-anrechnungen-confirm"
-                            class="btn btn-primary btn-w200 ms-1" type="button">
+                            class="btn btn-primary btn-w200 " type="button">
 						<?php echo ucfirst($this->p->t('ui', 'bestaetigen')); ?>
                     </button>
                 </div>
diff --git a/application/views/lehre/anrechnung/reviewAnrechnungDetail.php b/application/views/lehre/anrechnung/reviewAnrechnungDetail.php
index 08d23d8c4..0b2e39ddd 100644
--- a/application/views/lehre/anrechnung/reviewAnrechnungDetail.php
+++ b/application/views/lehre/anrechnung/reviewAnrechnungDetail.php
@@ -5,7 +5,8 @@ $this->load->view(
 		'title' => $this->p->t('anrechnung', 'anrechnungenPruefen'),
 		'jquery3' => true,
 		'jqueryui1' => true,
-		'bootstrap3' => true,
+		'bootstrap5' => true,
+		'cis' => true,
 		'fontawesome4' => true,
 		'ajaxlib' => true,
 		'dialoglib' => true,
@@ -42,7 +43,8 @@ $this->load->view(
             )
 		),
 		'customCSSs' => array(
-			'public/css/Tabulator.css'
+			'public/css/Tabulator.css',
+			'public/css/lehre/anrechnung.css'
 		),
 		'customJSs' => array(
 			'public/js/bootstrapper.js',
@@ -51,68 +53,68 @@ $this->load->view(
 		)
 	)
 );
-?>
+?> 
 
 <div id="page-wrapper">
     <div class="container-fluid">
         <!-- title -->
         <div class="row">
-            <div class="col-lg-12 page-header">
-                <h3>
+            <div class="col-12 my-4 border-bottom">
+                <h3 class="fw-normal ">
 					<?php echo $this->p->t('anrechnung', 'anrechnungenPruefen'); ?>
-                    <small>| <?php echo $this->p->t('global', 'detailsicht'); ?></small>
+                    <small class="text-secondary fs-6">| <?php echo $this->p->t('global', 'detailsicht'); ?></small>
                 </h3>
             </div>
         </div>
 
         <div class="row">
-            <div class="col-xs-8">
+            <div class="col-8">
 				<!-- Antragsdaten -->
-				<div class="row">
-					<div class="col-lg-12">
-						<div class="panel panel-default">
-							<div class="panel-heading">
+				<div class="row mb-4">
+					<div class="col-12">
+						<div class="card">
+							<div class="card-header">
 								<span class="text-uppercase"><b><?php echo $this->p->t('anrechnung', 'antrag'); ?></b></span>
 								</span>&emsp;
-								<span class="reviewAnrechnungDetail-anrechnungInfoTooltip" data-toggle="tooltip"
-									  data-placement="right"
+								<span class="reviewAnrechnungDetail-anrechnungInfoTooltip" data-bs-toggle="tooltip"
+									  data-bs-placement="right" data-bs-html="true"
 									  title="<?php echo $this->p->t('anrechnung', 'anrechnungInfoTooltipText'); ?>">
 													<i class="fa fa-lg fa-info-circle" aria-hidden="true"></i>
 												</span>
-								<span class="pull-right"><?php echo $this->p->t('anrechnung', 'antragdatum'); ?>: <span
+								<span class="float-end"><?php echo $this->p->t('anrechnung', 'antragdatum'); ?>: <span
 											id="reviewAnrechnung-status"><?php echo !empty($anrechnungData->anrechnung_id) ? $anrechnungData->insertamum : '-' ?></span></span>
 							</div>
-							<div class="panel-body">
+							<div class="card-body">
 								<div class="row">
-									<div class="col-lg-4">
-										<table class="table table-bordered table-condensed table-fixed">
+									<div class="col-4">
+										<table class="table table-bordered table-condensed table-fixed mb-0">
 											<tbody>
 											<tr>
-												<th class="col-xs-5"><?php echo ucfirst($this->p->t('person', 'studentIn')); ?></th>
+												<th class="col-5"><?php echo ucfirst($this->p->t('person', 'studentIn')); ?></th>
 												<td><?php echo $antragData->vorname . ' ' . $antragData->nachname; ?></td>
 											</tr>
 											<tr>
-												<th class="col-xs-5"><?php echo $this->p->t('person', 'personenkennzeichen'); ?></th>
+												<th class="col-5"><?php echo $this->p->t('person', 'personenkennzeichen'); ?></th>
 												<td><?php echo $antragData->matrikelnr ?></td>
 											</tr>
 											<tr>
-												<th class="col-xs-5"><?php echo ucfirst($this->p->t('lehre', 'studiensemester')); ?></th>
+												<th class="col-5"><?php echo ucfirst($this->p->t('lehre', 'studiensemester')); ?></th>
 												<td><?php echo $antragData->studiensemester_kurzbz ?></td>
 											</tr>
 											<tr>
-												<th class="col-xs-5"><?php echo ucfirst($this->p->t('lehre', 'studiengang')); ?></th>
+												<th class="col-5"><?php echo ucfirst($this->p->t('lehre', 'studiengang')); ?></th>
 												<td><?php echo $antragData->stg_bezeichnung ?></td>
 											</tr>
 											<tr>
-												<th class="col-xs-5"><?php echo $this->p->t('lehre', 'lehrveranstaltung'); ?></th>
+												<th class="col-5"><?php echo $this->p->t('lehre', 'lehrveranstaltung'); ?></th>
 												<td><?php echo $antragData->lv_bezeichnung ?></td>
 											</tr>
                                             <tr>
-                                                <th class="col-xs-5"><?php echo $this->p->t('lehre', 'ects'); ?></th>
+                                                <th class="col-5"><?php echo $this->p->t('lehre', 'ects'); ?></th>
                                                 <td><?php echo $antragData->ects ?></td>
                                             </tr>
                                             <tr>
-                                                <th class="col-xs-5"><?php echo $this->p->t('lehre', 'lektorInnen'); ?></th>
+                                                <th class="col-5"><?php echo $this->p->t('lehre', 'lektorInnen'); ?></th>
                                                 <td>
 													<?php $len = count($antragData->lektoren) - 1 ?>
 													<?php foreach ($antragData->lektoren as $key => $lektor): ?>
@@ -124,31 +126,31 @@ $this->load->view(
 											</tbody>
 										</table>
 									</div>
-									<div class="col-lg-8">
-										<table class="table table-bordered table-condensed table-fixed">
+									<div class="col-8">
+										<table class="table table-bordered table-condensed table-fixed mb-0">
 											<tbody>
 
 											<tr>
-												<th class="col-xs-4"><?php echo ucfirst($this->p->t('global', 'zgv')); ?></th>
+												<th class="col-4"><?php echo ucfirst($this->p->t('global', 'zgv')); ?></th>
 												<td><?php echo $antragData->zgv ?></td>
 											</tr>
 											<tr>
-												<th class="col-xs-4"><?php echo $this->p->t('anrechnung', 'herkunftDerKenntnisse'); ?></th>
+												<th class="col-4"><?php echo $this->p->t('anrechnung', 'herkunftDerKenntnisse'); ?></th>
 												<td><?php echo $anrechnungData->anmerkung ?></td>
 											</tr>
 											<tr>
-												<th class="col-xs-4"><?php echo $this->p->t('anrechnung', 'nachweisdokumente'); ?></th>
+												<th class="col-4"><?php echo $this->p->t('anrechnung', 'nachweisdokumente'); ?></th>
 												<td>
 													<a href="<?php echo current_url() . '/download?dms_id=' . $anrechnungData->dms_id; ?>"
 													   target="_blank"><?php echo htmlentities($anrechnungData->dokumentname) ?></a>
 												</td>
 											</tr>
                                             <tr>
-                                                <th class="col-xs-4"><?php echo $this->p->t('anrechnung', 'begruendungEctsLabel'); ?></th>
+                                                <th class="col-4"><?php echo $this->p->t('anrechnung', 'begruendungEctsLabel'); ?></th>
                                                 <td><span><?php echo $anrechnungData->begruendung_ects ?></span></td>
                                             </tr>
                                             <tr>
-                                                <th class="col-xs-4"><?php echo $this->p->t('anrechnung', 'begruendungLvinhaltLabel'); ?></th>
+                                                <th class="col-4"><?php echo $this->p->t('anrechnung', 'begruendungLvinhaltLabel'); ?></th>
                                                 <td><span><?php echo $anrechnungData->begruendung_lvinhalt ?></span></td>
                                             </tr>
 											</tbody>
@@ -162,11 +164,11 @@ $this->load->view(
 				</div>
 				<!-- Empfehlungsdaten -->
 				<div class="row">
-					<div class="col-lg-12">
-						<div class="panel panel-default" id="reviewAnrechnungDetail-empfehlung" data-empfehlung="<?php echo json_encode($empfehlungData->empfehlung) ?>">
-							<div class="panel-heading">
+					<div class="col-12">
+						<div class="card mb-4" id="reviewAnrechnungDetail-empfehlung" data-empfehlung="<?php echo json_encode($empfehlungData->empfehlung) ?>">
+							<div class="card-header">
 								<span class="text-uppercase"><b><?php echo $this->p->t('anrechnung', 'empfehlung'); ?></b></span>
-								<div class="pull-right">
+								<div class="float-end">
 									<?php echo $this->p->t('anrechnung', 'empfehlungVon'); ?>:
 									<span id="reviewAnrechnungDetail-empfehlungVon"><?php echo $empfehlungData->empfehlung_von ?></span>
 									&emsp;|&emsp;
@@ -175,41 +177,41 @@ $this->load->view(
 
 								</div>
 							</div>
-							<div class="panel-body">
+							<div class="card-body">
 								<div class="row">
-									<div class="col-lg-6">
-										<table class="table table-bordered table-condensed table-fixed">
+									<div class="col-6">
+										<table class="table table-bordered table-condensed table-fixed mb-0">
 												<tbody>
 												<tr>
-													<th class="col-xs-4"><?php echo ucfirst($this->p->t('anrechnung', 'empfehlungsanfrageAm')); ?></th>
+													<th class="col-4"><?php echo ucfirst($this->p->t('anrechnung', 'empfehlungsanfrageAm')); ?></th>
 													<td id="reviewAnrechnungDetail-empfehlungDetail-empfehlungsanfrageAm">
 														<?php echo $empfehlungData->empfehlungsanfrageAm; ?>
 													</td>
 												</tr>
 												<tr>
-													<th class="col-xs-4"><?php echo $this->p->t('anrechnung', 'empfehlungsanfrageAn'); ?></th>
+													<th class="col-4"><?php echo $this->p->t('anrechnung', 'empfehlungsanfrageAn'); ?></th>
 													<td id="reviewAnrechnungDetail-empfehlungDetail-empfehlungsanfrageAn">
 														<?php echo $empfehlungData->empfehlungsanfrageAn; ?>
 													</td>
 												</tr>
 												<tr>
-													<th class="col-xs-4"><?php echo ucfirst($this->p->t('anrechnung', 'empfehlungAm')); ?></th>
+													<th class="col-4"><?php echo ucfirst($this->p->t('anrechnung', 'empfehlungAm')); ?></th>
 													<td id="reviewAnrechnungDetail-empfehlungDetail-empfehlungAm">
 														<?php echo $empfehlungData->empfehlung_am ?>
 													</td>
 												</tr>
 												<tr>
-													<th class="col-xs-4"><?php echo ucfirst($this->p->t('anrechnung', 'empfehlungVon')); ?></th>
+													<th class="col-4"><?php echo ucfirst($this->p->t('anrechnung', 'empfehlungVon')); ?></th>
 													<td id="reviewAnrechnungDetail-empfehlungDetail-empfehlungVon">
 														<?php echo $empfehlungData->empfehlung_von ?>
 													</td>
 												</tr>
 												<tr>
-													<th class="col-xs-4"><?php echo $this->p->t('anrechnung', 'empfehlung'); ?></th>
+													<th class="col-4"><?php echo $this->p->t('anrechnung', 'empfehlung'); ?></th>
 													<td id="reviewAnrechnungDetail-empfehlungDetail-empfehlung"></td>
 												</tr>
 												<tr>
-													<th class="col-xs-4"><?php echo $this->p->t('global', 'begruendung'); ?></th>
+													<th class="col-4"><?php echo $this->p->t('global', 'begruendung'); ?></th>
 													<td id="reviewAnrechnungDetail-empfehlungDetail-begruendung">
 														<?php echo htmlentities($empfehlungData->begruendung) ?>
 													</td>
@@ -217,10 +219,10 @@ $this->load->view(
 												</tbody>
 											</table>
 									</div>
-									<div class="col-lg-6">
+									<div class="col-6">
 										<div>
-											<label class="text-center">
-												<?php echo ucfirst($this->p->t('global', 'notizDerSTGL')); ?>
+											<label class="text-center mb-2">
+												<b><?php echo ucfirst($this->p->t('global', 'notizDerSTGL')); ?></b>
 											</label>
 											<textarea rows="4" readonly><?php echo htmlentities($empfehlungData->notiz) ?></textarea>
 										</div>
@@ -231,22 +233,22 @@ $this->load->view(
 								<input type="hidden" name="anrechnung_id"
 									   value="<?php echo $anrechnungData->anrechnung_id ?>">
 								<!-- Nicht empfehlen panel (hidden) -->
-								<div class="panel panel-default panel-body" style="display: none" id="reviewAnrechnungDetail-begruendung-panel">
-									<div>
-										<h4 class="panel panel-body panel-danger text-danger"><?php echo $this->p->t('anrechnung', 'empfehlungNegativQuestion'); ?></h4>
-                                        <ul class="list-group">
+								<div class="card card-body" style="display: none" id="reviewAnrechnungDetail-begruendung-panel">
+									<div class="mb-4">
+										<h4 class="card card-body bg-danger-subtle my-3"><?php echo $this->p->t('anrechnung', 'empfehlungNegativQuestion'); ?></h4>
+                                        <ul class="list-group mb-4">
 											<li class="list-group-item">
 												<span><?php echo $this->p->t('anrechnung', 'empfehlungNegativPruefungNichtMoeglich'); ?></span>&emsp;
-												<span class="btn-copyIntoTextarea pull-right" data-toggle="tooltip"
-													  data-placement="right"
+												<span class="btn-copyIntoTextarea float-end" data-bs-toggle="tooltip"
+													  data-bs-placement="right" data-bs-html="true"
 													  title="<?php echo $this->p->t('ui', 'textUebernehmen'); ?>">
 													<i class="fa fa-clipboard fa-lg" aria-hidden="true"></i>
 												</span>
 											</li>
 											<li class="list-group-item">
 												<span><?php echo $this->p->t('anrechnung', 'empfehlungNegativKenntnisseNichtGleichwertigWeil'); ?></span>&emsp;
-												<span class="btn-copyIntoTextarea pull-right" data-toggle="tooltip"
-													  data-placement="right"
+												<span class="btn-copyIntoTextarea float-end" data-bs-toggle="tooltip"
+													  data-bs-placement="right" data-bs-html="true"
 													  title="<?php echo $this->p->t('ui', 'textUebernehmen'); ?>">
 													<i class="fa fa-clipboard fa-lg" aria-hidden="true"></i>
 												</span>
@@ -255,17 +257,17 @@ $this->load->view(
                                                 <span><?php echo $this->p->t('anrechnung', 'andereBegruendung'); ?></span>
                                             </li>
 										</ul>
-										<textarea class="form-control" name="begruendung"
+										<textarea class="my-3 form-control" name="begruendung"
 												  id="reviewAnrechnungDetail-begruendung"
 												  rows="2"
                                                   placeholder="<?php echo $this->p->t('anrechnung', 'textUebernehmenOderEigenenBegruendungstext'); ?>"
                                                   required></textarea>
 									</div>
-									<br>
+									
 									<!-- Button Abbrechen & Bestaetigen-->
-									<div class="pull-right">
+									<div class="d-flex justify-content-end">
 										<button id="reviewAnrechnungDetail-begruendung-abbrechen"
-												class="btn btn-default btn-w200" type="reset">
+												class="me-1 btn btn-outline-secondary btn-w200" type="reset">
 											<?php echo ucfirst($this->p->t('ui', 'abbrechen')); ?>
 										</button>
 										<button id="reviewAnrechnungDetail-dont-recommend-anrechnung-confirm"
@@ -275,17 +277,17 @@ $this->load->view(
 									</div>
 								</div>
 								<!-- Empfehlen panel (hidden)-->
-								<div class="panel panel-default panel-body" style="display: none" id="reviewAnrechnungDetail-empfehlung-panel">
-									<div>
-										<h4 class="panel panel-body panel-success text-success"><?php echo $this->p->t('anrechnung', 'empfehlungPositivQuestion'); ?></h4>
-										&ensp;<?php echo $this->p->t('anrechnung', 'empfehlungPositivSubquestion'); ?>
-										<br><br>
+								<div class="card card-body" style="display: none" id="reviewAnrechnungDetail-empfehlung-panel">
+									<div class="my-3">
+										<h4 class="card card-body bg-success-subtle"><?php echo $this->p->t('anrechnung', 'empfehlungPositivQuestion'); ?></h4>
+										<span ><?php echo $this->p->t('anrechnung', 'empfehlungPositivSubquestion'); ?>
+										</span>
 									</div>
-									<br>
+									
 									<!-- Action Button Abbrechen & Bestaetigen-->
-									<div class="pull-right">
+									<div class="d-flex justify-content-end">
 										<button id="reviewAnrechnungDetail-empfehlung-abbrechen"
-												class="btn btn-default btn-w200" type="reset">
+												class="me-1 btn btn-outline-secondary btn-w200" type="reset">
 											<?php echo ucfirst($this->p->t('ui', 'abbrechen')); ?>
 										</button>
 										<button id="reviewAnrechnungDetail-recommend-anrechnung-confirm"
@@ -297,8 +299,8 @@ $this->load->view(
 							</form>
 						</div>
 						<!-- Button Empfehlen / Nicht Empfehlen -->
-						<div class="pull-right">
-							<button id="reviewAnrechnungDetail-dont-recommend-anrechnung-ask" class="btn btn-danger btn-w200"
+						<div class="float-end mb-5">
+							<button id="reviewAnrechnungDetail-dont-recommend-anrechnung-ask" class="me-1 btn btn-danger btn-w200"
 									type="button"
 								<?php echo (is_null($empfehlungData->empfehlung) && $isEmpfehlungsberechtigt) ? '' : 'disabled' ?>>
 								<?php echo ucfirst($this->p->t('anrechnung', 'nichtEmpfehlen')); ?>
@@ -313,17 +315,18 @@ $this->load->view(
 				</div>
             </div>
 
-            <div class="col-xs-4">
-                <div class="alert text-center">
+            <div class="col-4 ">
+                <div class="mb-5 alert text-center">
                     Status:
                     <b><span class="text-uppercase" id="reviewAnrechnungDetail-status_kurzbz"
                              data-status_kurzbz="<?php echo $anrechnungData->status_kurzbz ?>">
                             <?php echo $anrechnungData->status; ?>
                         </span></b>
                 </div>
-                <br>
+                
 				<?php $this->load->view('lehre/anrechnung/reviewAnrechnungInfo'); ?>
-            </div>
+				
+			</div>
         </div>
 
     </div>
diff --git a/application/views/lehre/anrechnung/reviewAnrechnungInfo.php b/application/views/lehre/anrechnung/reviewAnrechnungInfo.php
index 2364869e6..c5d30987c 100644
--- a/application/views/lehre/anrechnung/reviewAnrechnungInfo.php
+++ b/application/views/lehre/anrechnung/reviewAnrechnungInfo.php
@@ -50,7 +50,7 @@
       </div>
     </div>
   </div>
-   <!--    Nachweisdokumente: Voraussetzung panel -->
+   <!--  Nachweisdokumente: Voraussetzung panel -->
   <div class="accordion-item">
     <h2 class="accordion-header">
         <div class="bg-info-subtle accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#Nachweisdokumente" aria-expanded="false" aria-controls="Nachweisdokumente">

From 961526925c432e723fa95ba373a5fbd9388810ae Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 18 Mar 2024 11:07:12 +0100
Subject: [PATCH 0497/1461] updates reviewAnrechnungDetail.js to change the
 correct bootstrap5 classes in the javascript

---
 public/js/lehre/anrechnung/reviewAnrechnungDetail.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/public/js/lehre/anrechnung/reviewAnrechnungDetail.js b/public/js/lehre/anrechnung/reviewAnrechnungDetail.js
index e8142ea05..4f7de743f 100644
--- a/public/js/lehre/anrechnung/reviewAnrechnungDetail.js
+++ b/public/js/lehre/anrechnung/reviewAnrechnungDetail.js
@@ -205,16 +205,16 @@ var reviewAnrechnung = {
 
         switch (status_kurzbz) {
             case ANRECHNUNGSTATUS_APPROVED:
-                $('#reviewAnrechnungDetail-status_kurzbz').closest('div').addClass('alert-success');
+                $('#reviewAnrechnungDetail-status_kurzbz').closest('div').addClass('bg-success-subtle');
                 break;
             case ANRECHNUNGSTATUS_REJECTED:
-                $('#reviewAnrechnungDetail-status_kurzbz').closest('div').addClass('alert-danger');
+                $('#reviewAnrechnungDetail-status_kurzbz').closest('div').addClass('bg-danger-subtle');
                 break;
             case '':
-                $('#reviewAnrechnungDetail-status_kurzbz').closest('div').addClass('alert-info');
+                $('#reviewAnrechnungDetail-status_kurzbz').closest('div').addClass('bg-info-subtle');
                 break;
             default:
-                $('#reviewAnrechnungDetail-status_kurzbz').closest('div').addClass('alert-warning');
+                $('#reviewAnrechnungDetail-status_kurzbz').closest('div').addClass('bg-warning-stubtle');
         }
     },
     setEmpfehlungstext: function () {
@@ -236,7 +236,7 @@ var reviewAnrechnung = {
         }
     },
     initTooltips: function (){
-        $('[data-toggle="tooltip"]').tooltip({
+        $('[data-bs-toggle="tooltip"]').tooltip({
                 delay: { "show": 200, "hide": 200 },
                 html: true
         }

From 3cdc051861bebf9f5727fcbe4f79a9177e80bccd Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 18 Mar 2024 11:42:34 +0100
Subject: [PATCH 0498/1461] updates adminAnrechnung view to bootstrap5

---
 .../lehre/anrechnung/adminAnrechnung.php      | 50 ++++++++++---------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/application/views/lehre/anrechnung/adminAnrechnung.php b/application/views/lehre/anrechnung/adminAnrechnung.php
index cb9a55c18..75cd94b42 100644
--- a/application/views/lehre/anrechnung/adminAnrechnung.php
+++ b/application/views/lehre/anrechnung/adminAnrechnung.php
@@ -3,11 +3,13 @@ $includesArray = array(
     'title' => $this->p->t('anrechnung', 'anrechnungenVerwalten'),
     'jquery3' => true,
     'jqueryui1' => true,
-    'bootstrap3' => true,
+    'bootstrap5' => true,
     'fontawesome6' => true,
     'ajaxlib' => true,
     'dialoglib' => true,
-    'tabulator4' => true,
+    'tabulator5' => true,
+    'tabulator5JQuery' => true,
+    'cis'=>true,
     'tablewidget' => true,
     'sbadmintemplate3' => true,
     'navigationwidget' => true,
@@ -48,7 +50,8 @@ $includesArray = array(
         'public/js/lehre/anrechnung/adminAnrechnung.js'
     ),
     'customCSSs' => array(
-        'public/css/sbadmin2/tablesort_bootstrap.css'
+        'public/css/sbadmin2/tablesort_bootstrap.css',
+        'public/css/lehre/anrechnung.css',
     )
 );
 
@@ -63,24 +66,22 @@ $this->load->view('templates/FHC-Header', $includesArray);
         <div class="container-fluid">
 
             <!--Titel-->
-            <div class="page-header">
+            <div class="my-4 border-bottom page-header">
                 <h3><?php echo $this->p->t('anrechnung', 'anrechnungenVerwalten'); ?></h3>
-            </div><br>
+            </div>
 
             <!--Untertitel-->
-            <h4><?php echo $this->p->t('anrechnung', 'anrechnungszeitraumFestlegen'); ?></h4><br>
-
-            <div class="row">
-                <div class="col-xs-4">
-                    <button class="btn btn-primary azrOpenModal" data-toggle="modal" data-target="#azrModal">
-                        <i class="fa fa-plus"></i> <?php echo $this->p->t('anrechnung', 'anrechnungszeitraumHinzufuegen'); ?>
-                    </button>
-                </div>
-            </div>
+            <h4 class="my-4"><?php echo $this->p->t('anrechnung', 'anrechnungszeitraumFestlegen'); ?></h4>
+            
+            
+            <button class="btn btn-primary azrOpenModal" data-bs-toggle="modal" data-bs-target="#azrModal"  >
+                <i class="fa fa-plus"></i> <?php echo $this->p->t('anrechnung', 'anrechnungszeitraumHinzufuegen'); ?>
+            </button>
+              
 
             <!-- Tabelle -->
             <div class="row">
-                <div class="col-lg-12">
+                <div class="col-12">
                     <?php $this->load->view('lehre/anrechnung/adminAnrechnungData.php'); ?>
                 </div>
             </div>
@@ -91,14 +92,14 @@ $this->load->view('templates/FHC-Header', $includesArray);
                 <div class="modal-content">
                     <div class="modal-header">
                         <h5 class="modal-title" id="azrModalLabel"></h5>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close" ></button>
                     </div>
-                    <div class="modal-body">
+                    <div class="modal-body my-4">
                         <div class="row">
                             <input type="hidden" id="anrechnungszeitraum_id" value="">
                             <input type="hidden" id="defaultStudiensemester_kurzbz" value="<?php echo $studiensemester_kurzbz ?>">
-                            <div class="col-xs-4">
-                                <label for="studiensemester" class="small">Studiensemester</label>
+                            <div class="col-4">
+                                <label for="studiensemester" class="fw-bold small">Studiensemester</label>
                                 <?php
                                 echo $this->widgetlib->widget(
                                     'Studiensemester_widget',
@@ -107,17 +108,18 @@ $this->load->view('templates/FHC-Header', $includesArray);
                                     ),
                                     array(
                                         'name' => 'studiensemester',
-                                        'id' => 'studiensemester'
+                                        'id' => 'studiensemester',
+                                        'class'=>'form-select w-auto ',
                                     )
                                 );
                                 ?>
                             </div>
-                            <div class="col-xs-4">
-                                <label for="azrStart" class="small">Anr.-Zeitraum Start</label>
+                            <div class="col-4">
+                                <label for="azrStart" class="fw-bold small">Anr.-Zeitraum Start</label>
                                 <input type="date" id="azrStart" value="" class="form-control" required>
                             </div>
-                            <div class="col-xs-4">
-                                <label for="azrEnde" class="small">Anr.-Zeitraum Ende</label>
+                            <div class="col-4">
+                                <label for="azrEnde" class="fw-bold small">Anr.-Zeitraum Ende</label>
                                 <input type="date" id="azrEnde" value="" class="form-control" required>
                             </div>
                         </div>

From 92cb4dedef949c013d15e74d0ce8dedabbfbe229 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 18 Mar 2024 11:49:54 +0100
Subject: [PATCH 0499/1461] migrates adminAnrechnungData and adminAnrechnung.js
 to use tabulator5

---
 .../views/lehre/anrechnung/adminAnrechnungData.php    |  7 +++----
 public/js/lehre/anrechnung/adminAnrechnung.js         | 11 ++++++++---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/application/views/lehre/anrechnung/adminAnrechnungData.php b/application/views/lehre/anrechnung/adminAnrechnungData.php
index 652c349d8..adf909c0a 100644
--- a/application/views/lehre/anrechnung/adminAnrechnungData.php
+++ b/application/views/lehre/anrechnung/adminAnrechnungData.php
@@ -24,13 +24,12 @@ $filterWidgetArray = array(
 		layout: "fitDataFill",           
 		persistentLayout:true,
 		autoResize: false, 				// prevent auto resizing of table (false to allow adapting table size when cols are (de-)activated
-	    headerFilterPlaceholder: " ",
         index: "anrechnungszeitraum_id",         // assign specific column as unique id (important for row indexing)
         selectable: false,                  // allow row selection
 		tableWidgetHeader: true,
-		tableBuilt: function(){
-            func_tableBuilt(this);
-        },
+		columnDefaults:{
+			headerFilterPlaceholder: " ",
+		}
 	 }',
 	'datasetRepFieldsDefs' => '{
 		anrechnungszeitraum_id: {visible: false, headerFilter:"input"},
diff --git a/public/js/lehre/anrechnung/adminAnrechnung.js b/public/js/lehre/anrechnung/adminAnrechnung.js
index 51412bff0..3c5ac3b5a 100644
--- a/public/js/lehre/anrechnung/adminAnrechnung.js
+++ b/public/js/lehre/anrechnung/adminAnrechnung.js
@@ -3,7 +3,7 @@
 
 // Add Edit and Update Buttons to table rows
 function func_tableBuilt(table) {
-    table.addColumn(
+    table.tabulator("addColumn",
         {
             title: "Aktion",
             align: "center",
@@ -39,7 +39,7 @@ var addActionButtons = function(cell) {
     editBtn.innerHTML = "<i class=\"fa fa-edit\"></i>";
     editBtn.classList.add("azrEditBtn");
     editBtn.classList.add("btn");
-    editBtn.classList.add("btn-default");
+    editBtn.classList.add("btn-outline-secondary");
     editBtn.addEventListener("click", function(){
         adminAnrechnung.editRow(cell);
     });
@@ -52,7 +52,7 @@ var addActionButtons = function(cell) {
     delBtn.innerHTML = "<i class=\"fa fa-times\"></i>";
     delBtn.classList.add("azrDeleteBtn");
     delBtn.classList.add("btn");
-    delBtn.classList.add("btn-default");
+    delBtn.classList.add("btn-outline-secondary");
     delBtn.style.marginLeft = '5px';
     delBtn.addEventListener("click", function(){
         adminAnrechnung.deleteRow(cell);
@@ -70,6 +70,11 @@ var addActionButtons = function(cell) {
 
 $(function () {
 
+    $(document).on("tableInit", function(event,tabulatorInstance) {
+        // tablutBuilt has to be attached as a callback the the tabulator in tabulator5
+        func_tableBuilt($("#tableWidgetTabulator"))
+    });
+
     // Empty Modal fields on 'Anrechnungszeitraum hinzufuegen'
     $(document).on('click', '.azrOpenModal', function(){
 

From acac5dfc65db0cceba45e60792393860f9e69d61 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 18 Mar 2024 15:17:14 +0100
Subject: [PATCH 0500/1461] trying to independenly restyle the navigationWidget

---
 .../lehre/lehrauftrag/approveLehrauftrag.php  |  14 +-
 .../lehrauftrag/approveLehrauftragData.php    |  15 +--
 application/views/widgets/navigation.php      |   2 +-
 application/views/widgets/navigationMenu.php  |   4 +-
 public/css/navbar.css                         | 122 ++++++++++++++++++
 .../lehre/lehrauftrag/approveLehrauftrag.js   |  14 +-
 public/js/navbar.js                           |  32 +++++
 7 files changed, 184 insertions(+), 19 deletions(-)
 create mode 100644 public/css/navbar.css
 create mode 100644 public/js/navbar.js

diff --git a/application/views/lehre/lehrauftrag/approveLehrauftrag.php b/application/views/lehre/lehrauftrag/approveLehrauftrag.php
index 300d1314d..3ee1934f5 100644
--- a/application/views/lehre/lehrauftrag/approveLehrauftrag.php
+++ b/application/views/lehre/lehrauftrag/approveLehrauftrag.php
@@ -6,10 +6,12 @@ $this->load->view(
         'jquery3' => true,
         'jqueryui1' => true,
         'jquerycheckboxes1' => true,
-        'bootstrap3' => true,
+        'bootstrap5' => true,
         'fontawesome4' => true,
         'sbadmintemplate3' => true,
-        'tabulator4' => true,
+        'tabulator5' => true,
+        'tabulator5JQuery' => true,
+        'cis'=>true,
         'momentjs2' => true,
         'ajaxlib' => true,
         'dialoglib' => true,
@@ -88,9 +90,13 @@ $this->load->view(
             )
         ),
         'customJSs' => array(
-                'public/js/bootstrapper.js',
+               
                 'public/js/lehre/lehrauftrag/approveLehrauftrag.js'
-        )
+        ),
+        'customCSSs' => array(
+               
+            'public/css/navbar.css'
+    )
     )
 );
 ?>
diff --git a/application/views/lehre/lehrauftrag/approveLehrauftragData.php b/application/views/lehre/lehrauftrag/approveLehrauftragData.php
index 4f0c61193..5a9323108 100644
--- a/application/views/lehre/lehrauftrag/approveLehrauftragData.php
+++ b/application/views/lehre/lehrauftrag/approveLehrauftragData.php
@@ -346,7 +346,6 @@ $filterWidgetArray = array(
 		layout: "fitColumns",			// fit columns to width of table
 		layoutColumnsOnNewData: true,	// ajust column widths to the data each time TableWidget is loaded
 		autoResize: false, 				// prevent auto resizing of table (false to allow adapting table size when cols are (de-)activated
-	    headerFilterPlaceholder: " ",
 	    groupBy:"lehrveranstaltung_id",
 	    groupToggleElement:"header",	//toggle group on click anywhere in the group header
 	    groupHeader: function(value, count, data, group){
@@ -361,22 +360,16 @@ $filterWidgetArray = array(
             return func_selectableCheck(row);
         },
         initialFilter: func_initialFilter(),
-        rowUpdated:function(row){
-             func_rowUpdated(row);
-        },
         rowFormatter:function(row)
         {
             func_rowFormatter(row);
-        },
-        renderStarted:function(){
-            func_renderStarted(this);
-        },
-        tableBuilt: function(){
-            func_tableBuilt(this);
         },
 		tableWidgetFooter: {
 			selectButtons: true
-		}
+		},
+        columnDefaults:{
+            headerFilterPlaceholder: " ",
+        }
     }', // tabulator properties
     'datasetRepFieldsDefs' => '{
         // column status is built dynamically in funcTableBuilt(),
diff --git a/application/views/widgets/navigation.php b/application/views/widgets/navigation.php
index efc953f5f..b49e4ce61 100644
--- a/application/views/widgets/navigation.php
+++ b/application/views/widgets/navigation.php
@@ -1,4 +1,4 @@
-<nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0">
+<nav class="fhc-navbar fhc-navbar-default fhc-navbar-static-top" role="navigation" style="margin-bottom: 0">
 	<?php
 		// Header
 		echo $this->widgetlib->widget('NavigationHeaderWidget');
diff --git a/application/views/widgets/navigationMenu.php b/application/views/widgets/navigationMenu.php
index 42dd901fb..bfc58a6a3 100644
--- a/application/views/widgets/navigationMenu.php
+++ b/application/views/widgets/navigationMenu.php
@@ -1,6 +1,6 @@
-<div class="navbar-default sidebar" role="navigation">
+<div class="fhc-navbar-default sidebar" role="navigation">
 	<div class="sidebar-nav navbar-collapse">
-		<ul class="nav" id="side-menu"></ul>
+		<ul class="fhc-nav" id="side-menu"></ul>
 	</div>
 	<i id="collapseinicon" title="show Menu" class="fa fa-angle-double-right fa-fw"></i>
 </div>
diff --git a/public/css/navbar.css b/public/css/navbar.css
new file mode 100644
index 000000000..2d6c3cdfe
--- /dev/null
+++ b/public/css/navbar.css
@@ -0,0 +1,122 @@
+
+nav {
+    display: block;
+  }
+
+  .fhc-navbar {
+    position: relative;
+    min-height: 50px;
+    margin-bottom: 20px;
+    border: 1px solid transparent;
+      border-top-color: transparent;
+      border-top-width: 1px;
+      border-right-color: transparent;
+      border-right-width: 1px;
+      border-bottom-color: transparent;
+      border-bottom-width: 1px;
+      border-left-color: transparent;
+      border-left-width: 1px;
+  }
+
+  
+
+  @media (min-width: 768px){
+    .fhc-navbar {
+        border-radius: 4px;
+      }
+    }
+
+
+
+  .fhc-navbar-static-top {
+    z-index: 1000;
+    border-width: 0 0 1px;
+  }
+
+  @media (min-width: 768px){
+    .fhc-navbar-static-top {
+      border-radius: 0;
+    }
+    
+  }
+
+  .fhc-navbar-default {
+    background-color: #f8f8f8;
+    border-color: #e7e7e7;
+  }
+
+  @media (min-width: 768px){
+  .navbar-header {
+    float: left;
+  }
+}
+
+.fhc-navbar-default .navbar-collapse, .fhc-navbar-default .fhc-navbar-form {
+    border-color: #e7e7e7;
+  }
+
+  ol, ul {
+    margin-top: 0;
+    margin-bottom: 10px;
+  }
+
+  .fhc-nav {
+    padding-left: 0;
+    margin-bottom: 0;
+    list-style: none;
+  }
+
+  .fhc-nav > li {
+    position: relative;
+    display: block;
+  }
+
+  .fhc-nav > li > a {
+    position: relative;
+    display: block;
+    padding: 10px 15px;
+  }
+
+  .text-right {
+    text-align: right;
+  }
+
+  .dropdown-toggle::after {
+    content:none;
+  }
+
+.fhc-nav li a {
+    text-decoration: none;
+   
+}
+
+
+
+.dropdown-menu {
+    position: absolute;
+    top: 100%;
+    left: 0;
+    z-index: 1000;
+    display: none;
+    float: left;
+    min-width: 160px;
+    padding: 5px 0;
+    margin: 2px 0 0;
+    font-size: 14px;
+    text-align: left;
+    list-style: none;
+    background-color: #fff;
+    background-clip: padding-box;
+    border: 1px solid #ccc;
+    border: 1px solid rgba(0,0,0,.15);
+    border-radius: 4px;
+    -webkit-box-shadow: 0 6px 12px rgba(0,0,0,.175);
+    box-shadow: 0 6px 12px rgba(0,0,0,.175);
+  }
+
+
+  .open > .dropdown-menu {
+    display: block;
+  }
+
+
diff --git a/public/js/lehre/lehrauftrag/approveLehrauftrag.js b/public/js/lehre/lehrauftrag/approveLehrauftrag.js
index c16016cf5..d5fd0c83d 100644
--- a/public/js/lehre/lehrauftrag/approveLehrauftrag.js
+++ b/public/js/lehre/lehrauftrag/approveLehrauftrag.js
@@ -225,7 +225,7 @@ function func_selectableCheck(row){
 // Adds column status
 function func_tableBuilt(table) {
     // Add status column to table
-    table.addColumn(
+    table.tabulator("addColumn",
         {
             title: "<i class='fa fa-user-o'></i>",
             field: "status",
@@ -498,6 +498,18 @@ $(function() {
         $('#tableWidgetTabulator').tabulator('redraw', true);
     });
 
+    // tableInit is called in the jquery_wrapper when the tableBuilt event was finished
+    $(document).on("tableInit", function(event,tabulatorInstance) {
+     
+        func_tableBuilt($("#tableWidgetTabulator"))
+        
+        // event renderStarted needs to be attached as a callback to the tableBuilt event in tabulator5
+        $("#tableWidgetTabulator").tabulator("on","renderStarted",()=>{func_renderStarted(tabulatorInstance)});
+        // event renderStarted needs to be attached as a callback to the tableBuilt event in tabulator5
+        $("#tableWidgetTabulator").tabulator("on","rowUpdated",(row)=>{func_rowUpdated(row)});
+       
+    });
+
     // Show all rows
     $("#show-all").click(function(){
         $('#tableWidgetTabulator').tabulator('clearFilter');
diff --git a/public/js/navbar.js b/public/js/navbar.js
new file mode 100644
index 000000000..8b764d366
--- /dev/null
+++ b/public/js/navbar.js
@@ -0,0 +1,32 @@
+function(t) {
+    var e = a(this);
+    if (!e.is(".disabled, :disabled")) {
+      var i = l(e),
+        o = i.hasClass("open");
+      if (s(), !o) {
+        "ontouchstart" in document.documentElement && !i.closest(".navbar-nav").length && a(document.createElement("div")).addClass("dropdown-backdrop").insertAfter(a(this)).on("click", s);
+        var n = {
+          relatedTarget: this
+        };
+        if (i.trigger(t = a.Event("show.bs.dropdown", n)), t.isDefaultPrevented()) return;
+        e.trigger("focus").attr("aria-expanded", "true"), i.toggleClass("open").trigger(a.Event("shown.bs.dropdown", n))
+      }
+      return !1
+    }
+  },
+
+  function(t) {
+    if (/(38|40|27|32)/.test(t.which) && !/input|textarea/i.test(t.target.tagName)) {
+      var e = a(this);
+      if (t.preventDefault(), t.stopPropagation(), !e.is(".disabled, :disabled")) {
+        var i = l(e),
+          o = i.hasClass("open");
+        if (!o && 27 != t.which || o && 27 == t.which) return 27 == t.which && i.find(r).trigger("focus"), e.trigger("click");
+        var n = i.find(".dropdown-menu li:not(.disabled):visible a");
+        if (n.length) {
+          var s = n.index(t.target);
+          38 == t.which && 0 < s && s--, 40 == t.which && s < n.length - 1 && s++, ~s || (s = 0), n.eq(s).trigger("focus")
+        }
+      }
+    }
+  }
\ No newline at end of file

From 54b2dce3d671818cb6eb7a309ec91a4d3b94c582 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 19 Mar 2024 10:58:59 +0100
Subject: [PATCH 0501/1461] update DeleteStatus and Prestudent, with Logs and
 Transactions

---
 .../controllers/components/stv/Status.php     | 360 +++++++++++++++++-
 1 file changed, 340 insertions(+), 20 deletions(-)

diff --git a/application/controllers/components/stv/Status.php b/application/controllers/components/stv/Status.php
index 2e6fd89cc..8f31ccc8c 100644
--- a/application/controllers/components/stv/Status.php
+++ b/application/controllers/components/stv/Status.php
@@ -435,7 +435,6 @@ class Status extends FHC_Controller
 			return $this->outputJson("Studentenrolle kann nur durch den Administrator geloescht werden");
 		}
 
-
 		//check if last status
 		$result = $this->PrestudentstatusModel->checkIfLastStatusEntry($prestudent_id);
 		if (isError($result))
@@ -458,11 +457,10 @@ class Status extends FHC_Controller
 		}
 
 		// Start DB transaction
-		$this->db->trans_start(false);
+		$this->db->trans_begin();
 
-		//TODO(manu) $this->db->trans_start(false); and rollback?
-		//Delete Status
-		$result = $this->PrestudentstatusModel->delete(
+		//load rolle für LOG sqlundo
+		$result = $this->PrestudentstatusModel->loadWhere(
 			array(
 				'prestudent_id' => $prestudent_id,
 				'status_kurzbz' => $status_kurzbz,
@@ -470,26 +468,123 @@ class Status extends FHC_Controller
 				'studiensemester_kurzbz' => $studiensemester_kurzbz
 			)
 		);
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson($result);
+		}
+		if (!hasData($result)) {
+			return $this->outputJson($result);
+		}
 
-		// Transaction complete!
-		$this->db->trans_complete();
+		//Data of current Rolle
+		$statusData = current(getData($result));
+		//var_dump($statusData);
+
+		$datum = $statusData->datum == '' ? 'null' : $statusData->datum;
+		$insertamum = $statusData->insertamum == '' ? 'null' : $statusData->insertamum;
+		$insertvon = $statusData->insertvon == '' ? 'null' : $statusData->insertvon;
+		$updateamum = $statusData->updateamum == '' ? 'null' : $statusData->updateamum;
+		$updatevon = $statusData->updatevon == '' ? 'null' : $statusData->updatevon;
+		$ext_id = $statusData->ext_id == '' ? 'null' : $statusData->ext_id;
+		$orgform_kurzbz = $statusData->orgform_kurzbz == '' ? 'null' : $statusData->orgform_kurzbz;
+		$bestaetigtam = $statusData->bestaetigtam == '' ? 'null' : $statusData->bestaetigtam;
+		$bestaetigtvon = $statusData->bestaetigtvon == '' ? 'null' : $statusData->bestaetigtvon;
+		$anmerkung = $statusData->anmerkung == '' ? 'null' : $statusData->anmerkung;
+		$bewerbung_abgeschicktamum = $statusData->bewerbung_abgeschicktamum == '' ? 'null' : $statusData->bewerbung_abgeschicktamum;
+		$studienplan_id = $statusData->studienplan_id == '' ? 'null' : $statusData->studienplan_id;
+		$rt_stufe = $statusData->rt_stufe == '' ? 'null' : $statusData->rt_stufe;
+		$statusgrund_id = $statusData->statusgrund_id == '' ? 'null' : $statusData->statusgrund_id;
+
+		$quotes_datum = $datum == "null" ? " " : "'";
+		$quotes_insertamum = $insertamum == "null" ? " " : "'";
+		$quotes_insertvon = $insertvon == "null" ? " " : "'";
+		$quotes_updateamum = $updateamum == "null" ? " " : "'";
+		$quotes_updatevon = $updatevon == "null" ? " " : "'";
+		$quotes_ext_id = $ext_id == "null" ? " " : "'";
+		$quotes_orgform_kurzbz = $orgform_kurzbz == "null" ? " " : "'";
+		$quotes_bestaetigtam = $bestaetigtam == "null" ? " " : "'";
+		$quotes_bestaetigtvon = $bestaetigtvon == "null" ? " " : "'";
+		$quotes_anmerkung = $anmerkung == "null" ? " " : "'";
+		$quotes_bewerbung_abgeschicktamum = $bewerbung_abgeschicktamum == "null" ? " " : "'";
+		$quotes_studienplan_id = $studienplan_id == "null" ? " " : "'";
+		$quotes_rt_stufe = $rt_stufe == "null" ? " " : "'";
+		$quotes_statusgrund_id = $statusgrund_id == "null" ? " " : "'";
+
+$sqlundo =
+	"
+	INSERT INTO public.tbl_prestudentstatus(prestudent_id, status_kurzbz, studiensemester_kurzbz, ausbildungssemester, datum, insertamum, insertvon, updateamum, updatevon, ext_id, orgform_kurzbz, bestaetigtam, bestaetigtvon, anmerkung, bewerbung_abgeschicktamum, studienplan_id,  rt_stufe, statusgrund_id) 
+	VALUES('" . $prestudent_id . "','" . $status_kurzbz . "','" . $studiensemester_kurzbz . "','" . $ausbildungssemester . "',"
+	. $quotes_datum . $datum . $quotes_datum . ","
+	. $quotes_insertamum . $insertamum . $quotes_insertamum . ","
+	. $quotes_insertvon . $insertvon . $quotes_insertvon . ","
+	. $quotes_updateamum . $updateamum . $quotes_updateamum . ","
+	. $quotes_updatevon . $updatevon . $quotes_updatevon . ","
+	. $quotes_ext_id . $ext_id . $quotes_ext_id . ","
+	. $quotes_orgform_kurzbz . $orgform_kurzbz . $quotes_orgform_kurzbz . ","
+	. $quotes_bestaetigtam . $bestaetigtam . $quotes_bestaetigtam . ","
+	. $quotes_bestaetigtvon . $bestaetigtvon . $quotes_bestaetigtvon . ","
+	. $quotes_anmerkung . $anmerkung . $quotes_anmerkung . ","
+	. $quotes_bewerbung_abgeschicktamum . $bewerbung_abgeschicktamum . $quotes_bewerbung_abgeschicktamum . ","
+	. $quotes_studienplan_id . $studienplan_id . $quotes_studienplan_id . ","
+	. $quotes_rt_stufe . $rt_stufe . $quotes_rt_stufe . ","
+	. $quotes_statusgrund_id . $statusgrund_id . $quotes_statusgrund_id . ");
+	";
+
+		//Delete Status
+		$result = $this->PrestudentstatusModel->delete(
+			[
+				'prestudent_id' => $prestudent_id,
+				'status_kurzbz' => $status_kurzbz,
+				'ausbildungssemester' => $ausbildungssemester,
+				'studiensemester_kurzbz' => $studiensemester_kurzbz
+			]
+		);
 
 		if ( $this->db->trans_status() === false || isError($result))
+		//if (isError($result))
 		{
 			$this->db->trans_rollback();
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 			return $this->outputJson($result);
 		}
-		if(!hasData($result)) {
+		if(!hasData($result))
+		{
 			$this->outputJson($result);
 		}
 
-		$this->db->trans_commit();
+		//save log delete prestudentstatus
+		$uid = getAuthUID();
+		$beschreibung = 'Loeschen der Rolle ' . $status_kurzbz . " bei " . $prestudent_id;
+		$sql = "DELETE FROM public.tbl_prestudentstatus
+                WHERE prestudent_id = " . $prestudent_id . "
+			  AND status_kurzbz = '" . $status_kurzbz . "'
+			  AND ausbildungssemester ='" . $ausbildungssemester . "'
+			  AND studiensemester_kurzbz = '" . $studiensemester_kurzbz . "'";
+
+		$this->load->model('system/Log_model', 'LogModel');
+		$result = $this->LogModel->insert([
+			'mitarbeiter_uid' => $uid,
+			'beschreibung' => $beschreibung,
+			'sql' => $sql,
+			'sqlundo' => $sqlundo
+			]);
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson(getError($result));
+		}
+		if (!hasData($result))
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson(getError($result));
+		}
+
+		$logId = $result->retval;
 
 		//Delete Studentlehrverband if no Status left
 		$result = $this->PrestudentstatusModel->getLastStatus($prestudent_id, $studiensemester_kurzbz);
 
-		if (isError($result)) {
+		if (isError($result))
+		{
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 			return $this->outputJson(getError($result));
 		}
@@ -516,28 +611,30 @@ class Status extends FHC_Controller
 					'studiensemester_kurzbz' => $studiensemester_kurzbz
 				)
 			);
-			if (isError($result))
+			if ($this->db->trans_status() === false || isError($result))
 			{
+				$this->db->trans_rollback();
 				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 				$this->outputJson("Fehler beim Löschen der Lehrverbandszuordnung");
 			}
 			if (!hasData($result))
 			{
 				$this->outputJson($result);
-				var_dump("no data2");
+				var_dump("no data Löschen der Lehrverbandszuordnung");
 			}
 			$this->outputJsonSuccess(true);
-
 		}
 
 		//Delete Prestudent if no data is left
+
 		if($deletePrestudent)
 		{
-			//TODO(manu) check all connected tables and delete them
-			//es wird noch auf prestudent_dokumentprestudent verwiesen
-			//löschen zuerst von Doks
-			$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-			$result = $this->PrestudentModel->delete(
+			//TODO(manu) check all connected tables
+
+			//check if existing dokumentprestudent
+			$output = "";
+			$this->load->model('crm/Dokumentprestudent_model', 'DokumentprestudentModel');
+			$result = $this->DokumentprestudentModel->loadWhere(
 				array(
 					'prestudent_id' => $prestudent_id
 				)
@@ -547,15 +644,238 @@ class Status extends FHC_Controller
 				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 				$this->outputJson($result);
 			}
+			if (hasData($result))
+			{
+				$documentPrestudent = $result->retval;
+				foreach ($documentPrestudent as $doc)
+				{
+					$output .=  ' '. $doc->dokument_kurzbz;
+				}
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return 	$this->outputJson("Achtung, es sind noch zu loeschende Dokumente vorhanden: " . $output);
+			}
+
+			//check if Anrechnungen tbl_anrechnung
+			$output_anrechnungen = '';
+			$this->load->model('education/Anrechnung_model', 'AnrechnungModel');
+			$result = $this->AnrechnungModel->loadWhere(
+				array(
+					'prestudent_id' => $prestudent_id
+				)
+			);
+			if (isError($result))
+			{
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				$this->outputJson($result);
+			}
+			if (hasData($result))
+			{
+				$anrechnungPrestudent = $result->retval;
+				foreach ($anrechnungPrestudent as $anr)
+				{
+					$output_anrechnungen .=  ' '. $anr->anrechnung_id;
+				}
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return 	$this->outputJson("Achtung, es sind mit dieser Prestudent_id verbundene Anrechnungen vorhanden (id) : " . $output_anrechnungen);
+			}
+
+			//DELETE Prestudent
+
+			//save log delete prestudent
+			$uid = getAuthUID();
+			$beschreibung = 'Loeschen der Prestudent ID ' . $prestudent_id;
+			$sql = "DELETE FROM public.tbl_prestudent
+                WHERE prestudent_id = " . $prestudent_id ;
+
+			//load prestudent für LOG sqlundo
+			$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+			$result = $this->PrestudentModel->loadWhere(
+				array(
+					'prestudent_id' => $prestudent_id
+				)
+			);
+			if (isError($result)) {
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return $this->outputJson($result);
+			}
+			if (!hasData($result)) {
+				return $this->outputJson($result);
+			}
+
+			//Data of current Prestudent
+			$prestudentData = current(getData($result));
+
+			$aufmerksamdurch_kurzbz = $prestudentData->aufmerksamdurch_kurzbz == '' ? 'null' : $prestudentData->aufmerksamdurch_kurzbz;
+			$studiengang_kz = $prestudentData->studiengang_kz == '' ? 'null' : $prestudentData->studiengang_kz;
+			$berufstaetigkeit_code = $prestudentData->berufstaetigkeit_code == '' ? 'null' : $prestudentData->berufstaetigkeit_code;
+			$ausbildungcode = $prestudentData->ausbildungcode == '' ? 'null' : $prestudentData->ausbildungcode;
+			$zgv_code = $prestudentData->zgv_code == '' ? 'null' : $prestudentData->zgv_code;
+			$zgvort = $prestudentData->zgvort == '' ? 'null' : $prestudentData->zgvort;
+			$zgvdatum = $prestudentData->zgvdatum == '' ? 'null' : $prestudentData->zgvdatum;
+			$zgvnation = $prestudentData->zgvnation == '' ? 'null' : $prestudentData->zgvnation;
+			$zgv_erfuellt = $prestudentData->zgv_erfuellt == '' ? 'null' : $prestudentData->zgv_erfuellt;
+			$zgvmas_code = $prestudentData->zgvmas_code == '' ? 'null' : $prestudentData->zgvmas_code;
+			$zgvmaort = $prestudentData->zgvmaort == '' ? 'null' : $prestudentData->zgvmaort;
+			$zgvmadatum = $prestudentData->zgvmadatum == '' ? 'null' : $prestudentData->zgvmadatum;
+			$zgvmanation = $prestudentData->zgvmanation == '' ? 'null' : $prestudentData->zgvmanation;
+			$zgvmas_erfuellt = $prestudentData->zgvmas_erfuellt == '' ? 'null' : $prestudentData->zgvmas_erfuellt;
+			$aufnahmeschluessel = $prestudentData->aufnahmeschluessel == '' ? 'null' : $prestudentData->aufnahmeschluessel;
+			$facheinschlberuf = $prestudentData->facheinschlberuf == '' ? 'null' : $prestudentData->facheinschlberuf;
+			$anmeldungreihungstest = $prestudentData->anmeldungreihungstest == '' ? 'null' : $prestudentData->anmeldungreihungstest;
+			$reihungstestangetreten = $prestudentData->reihungstestangetreten == 1 ? 'true' : 'false';
+			$reihungstest_id = $prestudentData->reihungstest_id == '' ? 'null' : $prestudentData->reihungstest_id;
+			$rt_gesamtpunkte = $prestudentData->rt_gesamtpunkte == '' ? 'null' : $prestudentData->rt_gesamtpunkte;
+			$rt_punkte1 = $prestudentData->rt_punkte1 == '' ? 'null' : $prestudentData->rt_punkte1;
+			$rt_punkte2 = $prestudentData->rt_punkte2 == '' ? 'null' : $prestudentData->rt_punkte2;
+			$rt_punkte3 = $prestudentData->rt_punkte3 == '' ? 'null' : $prestudentData->rt_punkte3;
+			$bismelden = $prestudentData->bismelden == 1 ? 'true' : 'false';
+			$person_id = $prestudentData->person_id == '' ? 'null' : $prestudentData->person_id;
+			$anmerkung = $prestudentData->anmerkung == '' ? 'null' : $prestudentData->anmerkung;
+			$mentor = $prestudentData->mentor == '' ? 'null' : $prestudentData->mentor;
+			$ext_id = $prestudentData->ext_id == '' ? 'null' : $prestudentData->ext_id;
+			$dual = $prestudentData->dual == 1 ? 'true' : 'false';
+			$ausstellungsstaat = $prestudentData->ausstellungsstaat == '' ? 'null' : $prestudentData->ausstellungsstaat;
+			$zgvdoktor_code = $prestudentData->zgvdoktor_code == '' ? 'null' : $prestudentData->zgvdoktor_code;
+			$zgvdoktorort = $prestudentData->zgvdoktorort == '' ? 'null' : $prestudentData->zgvdoktorort;
+			$zgvdoktordatum = $prestudentData->zgvdoktordatum == '' ? 'null' : $prestudentData->zgvdoktordatum;
+			$zgvdoktornation = $prestudentData->zgvdoktornation == '' ? 'null' : $prestudentData->zgvdoktornation;
+			$gsstudientyp_kurzbz = $prestudentData->gsstudientyp_kurzbz == '' ? 'null' : $prestudentData->gsstudientyp_kurzbz;
+			$aufnahmegruppe_kurzbz = $prestudentData->aufnahmegruppe_kurzbz == '' ? 'null' : $prestudentData->aufnahmegruppe_kurzbz;
+			$priorisierung = $prestudentData->priorisierung == '' ? 'null' : $prestudentData->priorisierung;
+			$zgvdoktor_erfuellt= $prestudentData->zgvdoktor_erfuellt == '' ? 'null' : $prestudentData->zgvdoktor_erfuellt;
+
+			$quotes_aufmerksamdurch_kurzbz = $aufmerksamdurch_kurzbz == "null" ? " " : "'";
+			$quotes_studiengang_kz = $studiengang_kz == "null" ? " " : "'";
+			$quotes_berufstaetigkeit_code = $berufstaetigkeit_code == "null" ? " " : "'";
+			$quotes_ausbildungcode = $ausbildungcode == "null" ? " " : "'";
+			$quotes_zgv_code = $zgv_code == "null" ? " " : "'";
+			$quotes_zgvort = $zgvort == "null" ? " " : "'";
+			$quotes_zgvdatum = $zgvdatum == "null" ? " " : "'";
+			$quotes_zgvnation = $zgvnation == "null" ? " " : "'";
+			$quotes_zgv_erfuellt = $zgv_erfuellt == "null" ? " " : "'";
+			$quotes_zgvmas_code = $zgvmas_code == "null" ? " " : "'";
+			$quotes_zgvmaort = $zgvmaort == "null" ? " " : "'";
+			$quotes_zgvmadatum = $zgvmadatum == "null" ? " " : "'";
+			$quotes_zgvmanation = $zgvmanation == "null" ? " " : "'";
+			$quotes_zgvmas_erfuellt = $zgvmas_erfuellt == "null" ? " " : "'";
+			$quotes_aufnahmeschluessel = $aufnahmeschluessel == "null" ? " " : "'";
+			$quotes_facheinschlberuf = $facheinschlberuf == "null" ? " " : "'";
+			$quotes_anmeldungreihungstest = $anmeldungreihungstest == "null" ? " " : "'";
+			$quotes_reihungstestangetreten = $reihungstestangetreten == "null" ? " " : "'";
+			$quotes_reihungstest_id = $reihungstest_id == "null" ? " " : "'";
+			$quotes_rt_gesamtpunkte = $rt_gesamtpunkte == "null" ? " " : "'";
+			$quotes_rt_punkte1 = $rt_punkte1 == "null" ? " " : "'";
+			$quotes_rt_punkte2 = $rt_punkte2 == "null" ? " " : "'";
+			$quotes_rt_punkte3 = $rt_punkte3 == "null" ? " " : "'";
+			$quotes_bismelden = $bismelden == "null" ? " " : "'";
+			$quotes_person_id = $person_id == "null" ? " " : "'";
+			$quotes_anmerkung = $anmerkung == "null" ? " " : "'";
+			$quotes_mentor = $mentor == "null" ? " " : "'";
+			$quotes_ext_id = $ext_id == "null" ? " " : "'";
+			$quotes_dual = $dual == "null" ? " " : "'";
+			$quotes_ausstellungsstaat = $ausstellungsstaat == "null" ? " " : "'";
+			$quotes_zgvdoktor_code = $zgvdoktor_code == "null" ? " " : "'";
+			$quotes_zgvdoktorort = $zgvdoktorort == "null" ? " " : "'";
+			$quotes_zgvdoktordatum = $zgvdoktordatum == "null" ? " " : "'";
+			$quotes_zgvdoktornation = $zgvdoktornation == "null" ? " " : "'";
+			$quotes_gsstudientyp_kurzbz = $gsstudientyp_kurzbz == "null" ? " " : "'";
+			$quotes_aufnahmegruppe_kurzbz = $aufnahmegruppe_kurzbz == "null" ? " " : "'";
+			$quotes_priorisierung = $priorisierung == "null" ? " " : "'";
+			$quotes_zgvdoktor_erfuellt = $zgvdoktor_erfuellt == "null" ? " " : "'";
+
+
+			$sqlundo =
+				"
+	INSERT INTO public.tbl_prestudent(prestudent_id, aufmerksamdurch_kurzbz, studiengang_kz, berufstaetigkeit_code, ausbildungcode,
+				zgv_code, zgvort, zgvdatum, zgvnation,zgv_erfuellt, zgvmas_code, zgvmaort, zgvmadatum, zgvmanation,zgvmas_erfuellt,
+				aufnahmeschluessel, facheinschlberuf, anmeldungreihungstest, reihungstestangetreten, reihungstest_id,
+				rt_gesamtpunkte, rt_punkte1, rt_punkte2, rt_punkte3, bismelden, person_id, anmerkung, mentor, ext_id,
+				dual, ausstellungsstaat, zgvdoktor_code, zgvdoktorort, zgvdoktordatum, zgvdoktornation,
+				gsstudientyp_kurzbz, aufnahmegruppe_kurzbz, priorisierung, zgvdoktor_erfuellt) 
+	VALUES('" . $prestudent_id . "',"
+				. $quotes_aufmerksamdurch_kurzbz . $aufmerksamdurch_kurzbz . $quotes_aufmerksamdurch_kurzbz . ","
+				. $quotes_studiengang_kz . $studiengang_kz . $quotes_studiengang_kz . ","
+				. $quotes_berufstaetigkeit_code . $berufstaetigkeit_code . $quotes_berufstaetigkeit_code . ","
+				. $quotes_ausbildungcode . $ausbildungcode . $quotes_ausbildungcode . ","
+				. $quotes_zgv_code . $zgv_code . $quotes_zgv_code . ","
+				. $quotes_zgvort . $zgvort . $quotes_zgvort . ","
+				. $quotes_zgvdatum . $zgvdatum . $quotes_zgvdatum . ","
+				. $quotes_zgvnation . $zgvnation . $quotes_zgvnation . ","
+				. $quotes_zgv_erfuellt . $zgv_erfuellt . $quotes_zgv_erfuellt . ","
+				. $quotes_zgvmas_code . $zgvmas_code . $quotes_zgvmas_code . ","
+				. $quotes_zgvmaort . $zgvmaort . $quotes_zgvmaort . ","
+				. $quotes_zgvmadatum . $zgvmadatum . $quotes_zgvmadatum . ","
+				. $quotes_zgvmanation . $zgvmanation . $quotes_zgvmanation . ","
+				. $quotes_zgvmas_erfuellt . $zgvmas_erfuellt . $quotes_zgvmas_erfuellt . ","
+				. $quotes_aufnahmeschluessel . $aufnahmeschluessel . $quotes_aufnahmeschluessel . ","
+				. $quotes_facheinschlberuf . $facheinschlberuf . $quotes_facheinschlberuf . ","
+				. $quotes_anmeldungreihungstest . $anmeldungreihungstest . $quotes_anmeldungreihungstest . ","
+				. $quotes_reihungstestangetreten . $reihungstestangetreten . $quotes_reihungstestangetreten . ","
+				. $quotes_reihungstest_id . $reihungstest_id . $quotes_reihungstest_id . ","
+				. $quotes_rt_gesamtpunkte . $rt_gesamtpunkte . $quotes_rt_gesamtpunkte . ","
+				. $quotes_rt_punkte1 . $rt_punkte1 . $quotes_rt_punkte1 . ","
+				. $quotes_rt_punkte2 . $rt_punkte2 . $quotes_rt_punkte2 . ","
+				. $quotes_rt_punkte3 . $rt_punkte3 . $quotes_rt_punkte3 . ","
+				. $quotes_bismelden . $bismelden . $quotes_bismelden . ","
+				. $quotes_person_id . $person_id . $quotes_person_id . ","
+				. $quotes_anmerkung . $anmerkung . $quotes_anmerkung . ","
+				. $quotes_mentor . $mentor . $quotes_mentor . ","
+				. $quotes_ext_id . $ext_id . $quotes_ext_id . ","
+				. $quotes_dual . $dual . $quotes_dual . ","
+				. $quotes_ausstellungsstaat . $ausstellungsstaat . $quotes_ausstellungsstaat . ","
+				. $quotes_zgvdoktor_code . $zgvdoktor_code . $quotes_zgvdoktor_code . ","
+				. $quotes_zgvdoktorort . $zgvdoktorort . $quotes_zgvdoktorort . ","
+				. $quotes_zgvdoktordatum . $zgvdoktordatum . $quotes_zgvdoktordatum . ","
+				. $quotes_zgvdoktornation . $zgvdoktornation . $quotes_zgvdoktornation . ","
+				. $quotes_gsstudientyp_kurzbz . $gsstudientyp_kurzbz . $quotes_gsstudientyp_kurzbz . ","
+				. $quotes_aufnahmegruppe_kurzbz . $aufnahmegruppe_kurzbz . $quotes_aufnahmegruppe_kurzbz . ","
+				. $quotes_priorisierung . $priorisierung . $quotes_priorisierung . ","
+				. $quotes_zgvdoktor_erfuellt . $zgvdoktor_erfuellt . $quotes_zgvdoktor_erfuellt . ");
+	";
+
+			$this->load->model('system/Log_model', 'LogModel');
+			$result = $this->LogModel->insert([
+				'mitarbeiter_uid' => $uid,
+				'beschreibung' => $beschreibung,
+				'sql' => $sql,
+				'sqlundo' => $sqlundo
+			]);
+			if (isError($result)) {
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return $this->outputJson(getError($result));
+			}
+			if (!hasData($result))
+			{
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return $this->outputJson(getError($result));
+			}
+
+			$logId = $result->retval;
+
+			//independent transaction
+			$this->db->trans_start();
+
+			$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+			$result = $this->PrestudentModel->delete(
+				array(
+					'prestudent_id' => $prestudent_id
+				)
+			);
+			if ($this->db->trans_status() === FALSE)
+			{
+				$this->db->trans_rollback();
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				$this->outputJson($result);
+			}
 			if(!hasData($result))
 			{
 				$this->outputJson($result);
 			}
+			$this->db->trans_commit();
 			$this->outputJson($result);
 
-
 		}
-
+		$this->db->trans_commit();
 		return $this->outputJsonSuccess(true);
 	}
 

From a495ff9b98d7f6ba98b969694e495b4d06d5f46e Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 19 Mar 2024 14:31:50 +0100
Subject: [PATCH 0502/1461] =?UTF-8?q?Popup=20L=C3=B6schen=20bei=20letzter?=
 =?UTF-8?q?=20Rolle?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controllers/components/stv/Status.php     | 25 ++++++++++--
 .../Details/Prestudent/Status.js              | 38 +++++++++++++++++--
 2 files changed, 55 insertions(+), 8 deletions(-)

diff --git a/application/controllers/components/stv/Status.php b/application/controllers/components/stv/Status.php
index 8f31ccc8c..3db792c2e 100644
--- a/application/controllers/components/stv/Status.php
+++ b/application/controllers/components/stv/Status.php
@@ -55,6 +55,22 @@ class Status extends FHC_Controller
 		$this->outputJson($result);
 	}
 
+	public function isLastStatus($prestudent_id)
+	{
+		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
+		$result = $this->PrestudentstatusModel->checkIfLastStatusEntry($prestudent_id);
+		if (isError($result))
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson($result);
+		}
+		if($result->retval == "1")
+		{
+				return $this->outputJson($result->retval);
+		}
+		$this->outputJson($result);
+	}
+
 	public function addNewStatus($prestudent_id)
 	{
 		//get Studiengang von prestudent_id
@@ -627,7 +643,7 @@ $sqlundo =
 
 		//Delete Prestudent if no data is left
 
-		if($deletePrestudent)
+		if($deletePrestudent && $isBerechtigtAdmin)
 		{
 			//TODO(manu) check all connected tables
 
@@ -652,7 +668,7 @@ $sqlundo =
 					$output .=  ' '. $doc->dokument_kurzbz;
 				}
 				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return 	$this->outputJson("Achtung, es sind noch zu loeschende Dokumente vorhanden: " . $output);
+				return 	$this->outputJson("Es sind noch zu loeschende Dokumente vorhanden: " . $output);
 			}
 
 			//check if Anrechnungen tbl_anrechnung
@@ -676,7 +692,7 @@ $sqlundo =
 					$output_anrechnungen .=  ' '. $anr->anrechnung_id;
 				}
 				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return 	$this->outputJson("Achtung, es sind mit dieser Prestudent_id verbundene Anrechnungen vorhanden (id) : " . $output_anrechnungen);
+				return 	$this->outputJson("Mit dieser Prestudent_id sind verbundene Anrechnungen vorhanden (id) : " . $output_anrechnungen);
 			}
 
 			//DELETE Prestudent
@@ -1222,7 +1238,8 @@ $sqlundo =
 		}
 
 		//Data of current Semester
-		$studentlvbData = current(getData($result));
+		$result = getData($result) ? : [];
+		$studentlvbData = current($result);
 
 		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
 		$result = $this->StudentlehrverbandModel->processStudentlehrverband($student_uid, $studentlvbData->studiengang_kz, $ausbildungssem_next, $studentlvbData->verband, $studentlvbData->gruppe, $studiensem_next);
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
index 23c503109..ebf37ea86 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
@@ -156,7 +156,8 @@ export default{
 			statusId: {},
 			gruendeLength: {},
 			dataMeldestichtag: null,
-			stichtag: {}
+			stichtag: {},
+			isLastStatus: {}
 		}
 	},
 	computed: {
@@ -205,6 +206,8 @@ export default{
 				'ausbildungssemester': ausbildungssemester
 			};
 
+			this.checkIfLastStatus();
+
 			this.loadStatus(this.statusId).then(() => {
 				if(this.statusData)
 					this.$refs.deleteStatusModal.show();
@@ -306,8 +309,8 @@ export default{
 							const errorData = result.data.retval;
 							this.$fhcAlert.alertError('Kein Status mit Id ' + status_id + ' gefunden');
 						}
-						/*						return result;*/
-					}).catch(error => {
+					}
+					).catch(error => {
 					if (error.response) {
 						console.log(error.response);
 						this.$fhcAlert.alertError(error.response.data);
@@ -373,6 +376,24 @@ export default{
 					this.reload();
 				});
 		},
+		checkIfLastStatus(){
+			return CoreRESTClient.get('components/stv/Status/isLastStatus/' + this.prestudent_id)
+				.then(
+					result => {
+						if(result.data){
+							this.isLastStatus = result.data;
+						} else {
+							this.isLastStatus = {};
+						}
+						return result;
+					}).catch(error => {
+						if (error.response) {
+							console.log(error.response);
+							this.$fhcAlert.alertError(error.response.data);
+						}
+					}
+				);
+		},
 		loadStatus(status_id){
 			return CoreRESTClient.post('components/stv/Status/loadStatus/',
 				status_id)
@@ -439,6 +460,9 @@ export default{
 		
 		
 		<p>TestData</p>
+		
+		isLastStatus: {{isLastStatus}}
+		<br>
 
 		Bismeldestichtag
 		{{dataMeldestichtag }}
@@ -795,8 +819,14 @@ export default{
 			<BsModal ref="deleteStatusModal">
 				<template #title>Status löschen</template> 
 				<template #default>
+				<div v-if="isLastStatus == 1">
+					<p>Das Loeschen der letzten Rolle loescht auch den gesamten Prestudent-Datensatz! Moechten Sie fortfahren?</p>
+				</div>
+				<div v-else>
 					<p>Prestudentstatus {{statusData.status_kurzbz}} (id: {{statusData.prestudent_id}}  
-					/ {{statusData.studiensemester_kurzbz}}) im {{statusData.ausbildungssemester}}. Ausbildungssemester wirklich löschen?</p>					
+					/ {{statusData.studiensemester_kurzbz}}) im {{statusData.ausbildungssemester}}. Ausbildungssemester wirklich löschen?</p>
+				</div>
+					
 				</template>	
 				<template #footer>
 					<button ref="Close" type="button" class="btn btn-primary" @click="deleteStatus(statusId)">OK</button>

From de15d43bb74253a28cbae45d411b6dcecaac4fee Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 19 Mar 2024 15:29:28 +0100
Subject: [PATCH 0503/1461] adds bootstrapVersion flag to the tableWidget
 options to render bootstrap3 classes or bootstrap5 classes

---
 application/libraries/TableWidgetLib.php      |  2 +
 .../approveAnrechnungUebersichtData.php       |  1 +
 application/widgets/TableWidget.php           | 14 +++-
 public/js/TableWidget.js                      | 71 +++++++++++++------
 public/js/navbar.js                           | 32 ---------
 5 files changed, 67 insertions(+), 53 deletions(-)
 delete mode 100644 public/js/navbar.js

diff --git a/application/libraries/TableWidgetLib.php b/application/libraries/TableWidgetLib.php
index 3af99cca7..feda0d67c 100644
--- a/application/libraries/TableWidgetLib.php
+++ b/application/libraries/TableWidgetLib.php
@@ -26,6 +26,8 @@ class TableWidgetLib
 {
 	const TABLE_UNIQUE_ID = 'tableUniqueId'; // TableWidget unique id
 
+	const TABLE_BOOTSTRAP_VERSION = 'bootstrapVersion'; // TableWidget bootstrap version
+
 	// TableWidget session name
 	const SESSION_NAME = 'FHC_TABLE_WIDGET';
 
diff --git a/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php b/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
index 24a6caeb3..398389e90 100644
--- a/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
+++ b/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
@@ -172,6 +172,7 @@ $query.= '	FROM anrechnungen
 
 $filterWidgetArray = array(
 	'query' => $query,
+	'bootstrapVersion' => 5,
 	'tableUniqueId' => 'approveAnrechnungUebersicht',
 	'requiredPermissions' => 'lehre/anrechnung_genehmigen',
 	'datasetRepresentation' => 'tabulator',
diff --git a/application/widgets/TableWidget.php b/application/widgets/TableWidget.php
index e59efce10..be368fc2c 100644
--- a/application/widgets/TableWidget.php
+++ b/application/widgets/TableWidget.php
@@ -35,6 +35,9 @@ class TableWidget extends Widget
 	// Required permissions to use this TableWidget
 	private $_requiredPermissions;
 
+	// optional bootstrap version can be set to use different bootstrap classes 
+	private $_bootstrapVersion=3;
+
 	// SQL statement
 	private $_query;
 
@@ -92,8 +95,9 @@ class TableWidget extends Widget
 	 */
 	public function display($widgetData)
 	{
+		
 		$this->view(self::WIDGET_URL_TABLE, array(
-			'tableUniqueId' => $widgetData[TableWidgetLib::TABLE_UNIQUE_ID]
+			'tableUniqueId' => $widgetData[TableWidgetLib::TABLE_UNIQUE_ID],
 		)); // GUI starts here
 	}
 
@@ -135,6 +139,7 @@ class TableWidget extends Widget
 
 		// Initialize class properties
 		$this->_requiredPermissions = null;
+		$this->_bootstrapVersion = null;
 		$this->_reloadDataset = true; // by default the dataset is NOT cached in session
 		$this->_query = null;
 		$this->_additionalColumns = null;
@@ -154,6 +159,12 @@ class TableWidget extends Widget
 			$this->_requiredPermissions = $args[TableWidgetLib::REQUIRED_PERMISSIONS];
 		}
 
+		// Retrieved the optional tableWindget Bootstrap version
+		if (isset($args[TableWidgetLib::TABLE_BOOTSTRAP_VERSION]) && !isEmptyString($args[TableWidgetLib::TABLE_BOOTSTRAP_VERSION]))
+		{
+			$this->_bootstrapVersion = $args[TableWidgetLib::TABLE_BOOTSTRAP_VERSION];
+		}
+
 		// How to retrieve data for the table: SQL statement or a result from DB
 		if (isset($args[TableWidgetLib::QUERY]))
 		{
@@ -349,6 +360,7 @@ class TableWidget extends Widget
 				$this->tablewidgetlib->setSession(
 					array(
 						TableWidgetLib::TABLE_UNIQUE_ID => $tableUniqueId, // table unique id
+						TableWidgetLib::TABLE_BOOTSTRAP_VERSION => $this->_bootstrapVersion, // bootstrap version for tableWidget
 						TableWidgetLib::SESSION_FIELDS => $this->tablewidgetlib->getExecutedQueryListFields(), // all the fields of the dataset
 						TableWidgetLib::SESSION_COLUMNS_ALIASES => $this->_columnsAliases, // all the fields aliases
 						TableWidgetLib::SESSION_ADDITIONAL_COLUMNS => $this->_additionalColumns, // additional columns
diff --git a/public/js/TableWidget.js b/public/js/TableWidget.js
index 3aa1367cf..a6b8a10b1 100644
--- a/public/js/TableWidget.js
+++ b/public/js/TableWidget.js
@@ -20,6 +20,7 @@ var FHC_TableWidget = {
 
 	_datasetRepresentation: null, // contains the current data representation
 
+	_bootstrapVersion:3,
 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods
 
@@ -152,6 +153,8 @@ var FHC_TableWidget = {
 
 		FHC_TableWidget._setDatasetRepresentation(data); // set what type of dataset representation was choosen
 
+		FHC_TableWidget._setBootstrapVersion(data); // set the bootstrap version used for the tableWidget
+
 		var tableWidgetDiv = $('div[tableUniqueId="' + data.tableUniqueId + '"]');
 
 		FHC_TableWidget._turnOffEvents(tableWidgetDiv); // turns all the events off
@@ -163,6 +166,7 @@ var FHC_TableWidget = {
 		FHC_TableWidget._turnOnEvents(tableWidgetDiv); // turns all the events off
 
 		FHC_TableWidget._onTableBuilt(tableWidgetDiv, data);
+		
 	},
 
 
@@ -766,6 +770,11 @@ var FHC_TableWidget = {
 		}
 	},
 
+	_setBootstrapVersion: function(data) {
+
+		_bootstrapVersion = data.bootstrapVersion
+	},
+
 	_getTableWidgetUniqueIdArray: function() {
 
 		var tableWidgetUniqueIdArray = [];
@@ -817,17 +826,17 @@ function _renderTabulatorHeaderHTML(tableWidgetDiv){
 	tabulatorHeaderHTML += '<div class="btn-toolbar pull-right" role="toolbar">';
 	tabulatorHeaderHTML += '<div class="btn-group" role="group">';
 	tabulatorHeaderHTML += '' +
-		'<button id="download-csv" class="btn btn-default" type="button" ' +
+		`<button id="download-csv" class="btn ${_bootstrapVersion==3?'btn-default':'btn-outline-secondary'}" type="button" ` +
 		'data-toggle="tooltip" data-placement="left" title="Download CSV">' +
 		'<small>CSV&nbsp;&nbsp;</small><i class="fa fa-arrow-down"></i>' +
 		'</button>';
 	tabulatorHeaderHTML += '' +
-		'<button id="help" class="btn btn-default" type="button" ' +
+		`<button id="help" class="btn ${_bootstrapVersion==3?'btn-default':'btn-outline-secondary'}" type="button" ` +
 		'data-toggle="collapse tooltip" data-target="tabulatorHelp-'+ tableUniqueId + '" data-placement="left" ' +
 		'title="' + FHC_PhrasesLib.t("ui", "hilfe") + '"><i class="fa fa-question"></i>' +
 		'</button>';
 	tabulatorHeaderHTML += '' +
-		'<button id="settings" class="btn btn-default" type="button" ' +
+		`<button id="settings" class="btn ${_bootstrapVersion==3?'btn-default':'btn-outline-secondary'}" type="button" ` +
 		'data-toggle="collapse tooltip" data-target="tabulatorSettings-'+ tableUniqueId + '" data-placement="left" ' +
 		'title="' + FHC_PhrasesLib.t("ui", "tabelleneinstellungen") + '" ' +
 		'aria-expanded="false" aria-controls="tabulatorSettings-'+ tableUniqueId + '">' +
@@ -848,15 +857,15 @@ function _renderTabulatorHeaderCollapseHTML(tableWidgetDiv,arrayTabulatorColumns
 	var tabulatorHeaderCollapseHTML = '';
 
 	// CollapseHTML 'Settings'
+	if(_bootstrapVersion==3){
 	tabulatorHeaderCollapseHTML += '<div class="row">';
 	tabulatorHeaderCollapseHTML += '<div class="col-lg-12 collapse" id="tabulatorSettings-'+ tableUniqueId + '">';
-	tabulatorHeaderCollapseHTML += '<div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">';
-
-	tabulatorHeaderCollapseHTML += '<div class="panel panel-default">';
-	tabulatorHeaderCollapseHTML += '<div class="panel-heading" role="tab" id="headingOne">';
+	tabulatorHeaderCollapseHTML += `<div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">`;
+	tabulatorHeaderCollapseHTML += `<div class="panel panel-default">`;
+	tabulatorHeaderCollapseHTML += `<div class="panel-heading" role="tab" id="headingOne">`;
 	tabulatorHeaderCollapseHTML += '<h5 class="panel-title">';
 	tabulatorHeaderCollapseHTML += '' +
-		'<a role="button" data-bs-toggle="collapse" data-bs-parent="#accordion" ' +
+		'<a role="button" data-toggle="collapse" data-parent="#accordion" ' +
 		'href="#selectColumns-' + tableUniqueId + '" ' +
 		'aria-expanded="false" aria-controls="selectColumns">' +
 		FHC_PhrasesLib.t("ui", "spaltenEinstellen") +
@@ -867,7 +876,24 @@ function _renderTabulatorHeaderCollapseHTML(tableWidgetDiv,arrayTabulatorColumns
 		'role="tabpanel" aria-labelledby="headingOne">';
 	tabulatorHeaderCollapseHTML += '<div class="panel-body">';
 	tabulatorHeaderCollapseHTML += '<div class="btn-group" role="group">';
-
+	}else{
+		tabulatorHeaderCollapseHTML += '<div class="row">';
+		tabulatorHeaderCollapseHTML += '<div class="col-12 collapse" id="tabulatorSettings-'+ tableUniqueId + '">';
+		tabulatorHeaderCollapseHTML += `<div class="accordion" id="accordion" role="tablist" aria-multiselectable="true">`;
+		tabulatorHeaderCollapseHTML += `<div class="accordion-item">`;
+		tabulatorHeaderCollapseHTML += `<h5 class="accordion-header" role="tab" id="headingOne">`;
+		tabulatorHeaderCollapseHTML += '' +
+			'<a role="button" data-bs-toggle="collapse" data-bs-parent="#accordion" ' +
+			'href="#selectColumns-' + tableUniqueId + '" ' +
+			'aria-expanded="false" aria-controls="selectColumns">' +
+			FHC_PhrasesLib.t("ui", "spaltenEinstellen") +
+			'</a>';
+		tabulatorHeaderCollapseHTML += '</h5>';
+		tabulatorHeaderCollapseHTML += '<div id="selectColumns-' + tableUniqueId + '" class="accordion-collapse collapse show" ' +
+			'role="tabpanel" aria-labelledby="headingOne" data-bs-parent="#accordion">';
+		tabulatorHeaderCollapseHTML += '<div class="accordion-body">';
+		tabulatorHeaderCollapseHTML += '<div class="btn-group" role="group">';
+	}
 	// Create column picker (Spalten einstellen)
 	tableWidgetDiv.find('#tableWidgetTabulator').tabulator('getColumns').forEach(function(column)
 	{
@@ -882,25 +908,28 @@ function _renderTabulatorHeaderCollapseHTML(tableWidgetDiv,arrayTabulatorColumns
 		{
 			if ($.inArray(field, tableWidgetBlacklistArray_columnUnselectable) < 0)
 			{
-				tabulatorHeaderCollapseHTML += '<button type="button" class="btn btn-default btn-sm btn-select-col ' + btn_select_col_selected +'" aria-pressed="true" id="btn-' + field + '" value="' + field + '">' + title + '</button>';
+				tabulatorHeaderCollapseHTML += `<button type="button" class="btn ${_bootstrapVersion==3?'btn-default':'btn-outline-secondary'} btn-sm btn-select-col ` + btn_select_col_selected +'" aria-pressed="true" id="btn-' + field + '" value="' + field + '">' + title + '</button>';
 			}
 		}
 		// Else provide all tabulator fields as pickable columns
 		else
 		{
-			tabulatorHeaderCollapseHTML += '<button type="button" class="btn btn-default btn-sm btn-select-col ' + btn_select_col_selected +'" aria-pressed="true" id="btn-' + field + '" value="' + field + '">' + title + '</button>';
+			tabulatorHeaderCollapseHTML += `<button type="button" class="btn ${_bootstrapVersion==3?'btn-default':'btn-outline-secondary'} btn-sm btn-select-col ` + btn_select_col_selected +'" aria-pressed="true" id="btn-' + field + '" value="' + field + '">' + title + '</button>';
 		}
 	});
 
-	tabulatorHeaderCollapseHTML += '</div>'; // end btn-group
-	tabulatorHeaderCollapseHTML += '</div>'; // end panel-body
-	tabulatorHeaderCollapseHTML += '</div>'; // end panel-collapse
-	tabulatorHeaderCollapseHTML += '</div>'; // end panel
+	
+		tabulatorHeaderCollapseHTML += '</div>'; // end btn-group
+		tabulatorHeaderCollapseHTML += '</div>'; // end panel-body / accordion-body
+		tabulatorHeaderCollapseHTML += '</div>'; // end panel-collapse / accordion-collapse
+		tabulatorHeaderCollapseHTML += '</div>'; // end panel / accordion-item
 
-	tabulatorHeaderCollapseHTML += '</div>'; // end panel-group
-	tabulatorHeaderCollapseHTML += ' </div>'; // end col
-	tabulatorHeaderCollapseHTML += ' </div>'; // end row
+		tabulatorHeaderCollapseHTML += '</div>'; // end panel-group / accordion
+		tabulatorHeaderCollapseHTML += ' </div>'; // end col
+		tabulatorHeaderCollapseHTML += ' </div>'; // end row
 
+	
+	
 	return tabulatorHeaderCollapseHTML;
 }
 
@@ -916,11 +945,13 @@ function _renderTabulatorFooterHTML(tableWidgetFooterOptions){
 		tabulatorFooterHTML += '<div class="btn-toolbar" role="toolbar">';
 		tabulatorFooterHTML += '<div class="btn-group" role="group">';
 		tabulatorFooterHTML += '' +
-			'<button id="select-all" class="btn btn-default pull-left" type="button">'
+		// pull-right is a fontawesome class that adds float right style
+			`<button id="select-all" class="btn ${_bootstrapVersion==3?'btn-default':'btn-outline-secondary'} pull-right" type="button">`
 			+ FHC_PhrasesLib.t("ui", "alleAuswaehlen") + '' +
 			'</button>';
 		tabulatorFooterHTML += '' +
-			'<button id="deselect-all" class="btn btn-default pull-left" type="button">'
+		// pull-right is a fontawesome class that adds float right style
+			`<button id="deselect-all" class="btn ${_bootstrapVersion==3?'btn-default':'btn-outline-secondary'} pull-right" type="button">`
 			+ FHC_PhrasesLib.t("ui", "alleAbwaehlen") + '' +
 			'</button>';
 		tabulatorFooterHTML += '' +
diff --git a/public/js/navbar.js b/public/js/navbar.js
deleted file mode 100644
index 8b764d366..000000000
--- a/public/js/navbar.js
+++ /dev/null
@@ -1,32 +0,0 @@
-function(t) {
-    var e = a(this);
-    if (!e.is(".disabled, :disabled")) {
-      var i = l(e),
-        o = i.hasClass("open");
-      if (s(), !o) {
-        "ontouchstart" in document.documentElement && !i.closest(".navbar-nav").length && a(document.createElement("div")).addClass("dropdown-backdrop").insertAfter(a(this)).on("click", s);
-        var n = {
-          relatedTarget: this
-        };
-        if (i.trigger(t = a.Event("show.bs.dropdown", n)), t.isDefaultPrevented()) return;
-        e.trigger("focus").attr("aria-expanded", "true"), i.toggleClass("open").trigger(a.Event("shown.bs.dropdown", n))
-      }
-      return !1
-    }
-  },
-
-  function(t) {
-    if (/(38|40|27|32)/.test(t.which) && !/input|textarea/i.test(t.target.tagName)) {
-      var e = a(this);
-      if (t.preventDefault(), t.stopPropagation(), !e.is(".disabled, :disabled")) {
-        var i = l(e),
-          o = i.hasClass("open");
-        if (!o && 27 != t.which || o && 27 == t.which) return 27 == t.which && i.find(r).trigger("focus"), e.trigger("click");
-        var n = i.find(".dropdown-menu li:not(.disabled):visible a");
-        if (n.length) {
-          var s = n.index(t.target);
-          38 == t.which && 0 < s && s--, 40 == t.which && s < n.length - 1 && s++, ~s || (s = 0), n.eq(s).trigger("focus")
-        }
-      }
-    }
-  }
\ No newline at end of file

From 426a43955247d8b7e3ad1ae09881186886b75608 Mon Sep 17 00:00:00 2001
From: Werner Masik <werner@gefi.at>
Date: Wed, 20 Mar 2024 00:13:55 +0100
Subject: [PATCH 0504/1461] added sort column to frist

---
 .../dbupdate_3.4/37107_fristenmanagement.php  | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/system/dbupdate_3.4/37107_fristenmanagement.php b/system/dbupdate_3.4/37107_fristenmanagement.php
index 68811fd18..eeb32380e 100644
--- a/system/dbupdate_3.4/37107_fristenmanagement.php
+++ b/system/dbupdate_3.4/37107_fristenmanagement.php
@@ -25,6 +25,7 @@ if ($result = $db->db_query("SELECT * FROM information_schema.tables WHERE table
             ereignis_kurzbz character varying(32) NOT NULL,
             bezeichnung varchar(32) NOT NULL,
             manuell boolean DEFAULT FALSE,
+            sort smallint,
             CONSTRAINT tbl_ereignis_pkey PRIMARY KEY (ereignis_kurzbz)
         );
 
@@ -33,6 +34,7 @@ if ($result = $db->db_query("SELECT * FROM information_schema.tables WHERE table
         CREATE TABLE IF NOT EXISTS hr.tbl_frist_status (
             status_kurzbz character varying(32) NOT NULL,
             bezeichnung varchar(32),
+            sort smallint,
             CONSTRAINT tbl_frist_status_pk PRIMARY KEY (status_kurzbz)
         );
 
@@ -54,13 +56,19 @@ if ($result = $db->db_query("SELECT * FROM information_schema.tables WHERE table
         GRANT SELECT, UPDATE, INSERT, DELETE ON hr.tbl_frist_status TO vilesci;
         GRANT SELECT, UPDATE, INSERT, DELETE ON hr.tbl_frist_ereignis TO vilesci;
 
-        INSERT INTO hr.tbl_frist_status(status_kurzbz, bezeichnung) VALUES('neu','Neu');
-        INSERT INTO hr.tbl_frist_status(status_kurzbz, bezeichnung) VALUES('in_bearbeitung','In Bearbeitung');
-        INSERT INTO hr.tbl_frist_status(status_kurzbz, bezeichnung) VALUES('erledigt','Erledigt');
-
-        INSERT INTO hr.tbl_frist_ereignis(ereignis_kurzbz, bezeichnung) VALUES('dv_beginn','DV Beginn');
-        INSERT INTO hr.tbl_frist_ereignis(ereignis_kurzbz, bezeichnung) VALUES('dv_ende','DV Ende');
+        INSERT INTO hr.tbl_frist_status(status_kurzbz, bezeichnung, sort) VALUES('neu','Neu', 1);
+        INSERT INTO hr.tbl_frist_status(status_kurzbz, bezeichnung, sort) VALUES('in_bearbeitung','In Bearbeitung', 2);
+        INSERT INTO hr.tbl_frist_status(status_kurzbz, bezeichnung, sort) VALUES('erledigt','Erledigt', 3);
 
+        INSERT INTO hr.tbl_frist_ereignis(ereignis_kurzbz, bezeichnung, sort) VALUES('dv_beginn','DV Beginn', 1);
+        INSERT INTO hr.tbl_frist_ereignis(ereignis_kurzbz, bezeichnung, sort) VALUES('dv_ende','DV Ende', 2);
+        INSERT INTO hr.tbl_frist_ereignis(ereignis_kurzbz, bezeichnung, sort) VALUES('stunden_beginn','Stunden Beginn', 3);
+        INSERT INTO hr.tbl_frist_ereignis(ereignis_kurzbz, bezeichnung, sort) VALUES('stunden_ende','Stunden Ende', 4);
+        INSERT INTO hr.tbl_frist_ereignis(ereignis_kurzbz, bezeichnung, sort) VALUES('karenz_beginn','Karenz Beginn', 5);
+        INSERT INTO hr.tbl_frist_ereignis(ereignis_kurzbz, bezeichnung, sort) VALUES('karenz_ende','Karenz Ende', 6);
+        INSERT INTO hr.tbl_frist_ereignis(ereignis_kurzbz, bezeichnung, sort) VALUES('zeitaufzeichnung_beginn','Zeitaufzeichnung Beginn', 7);
+        INSERT INTO hr.tbl_frist_ereignis(ereignis_kurzbz, bezeichnung, sort) VALUES('zeitaufzeichnung_ende','Zeitaufzeichnung Ende', 8);
+        INSERT INTO hr.tbl_frist_ereignis (ereignis_kurzbz , bezeichnung, manuell, sort) VALUES('manuell','Manuell', true, 9);
 
 
         ";

From 10e57dae2de4ec405964059ef33b8792931f8307 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Wed, 20 Mar 2024 09:38:08 +0100
Subject: [PATCH 0505/1461] Adapted style of .tabulator-cell .btn to be squared
 and increased padding

---
 public/css/Tabulator5.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/css/Tabulator5.css b/public/css/Tabulator5.css
index b755f0d76..49e15ab37 100644
--- a/public/css/Tabulator5.css
+++ b/public/css/Tabulator5.css
@@ -40,7 +40,7 @@
 }
 
 .tabulator-cell .btn {
-	padding: 0 .5rem;
-	max-height: 22px;
-	min-width: 30px;
+	padding: 0 .7rem;
+	min-height: 25px;
+	min-width: 25px;
 }

From 842e62b0dd4ae5173f97a816e9fc2d610958ff92 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Wed, 20 Mar 2024 09:42:23 +0100
Subject: [PATCH 0506/1461] Fixed Input.js error causing to keep last entries'
 first letter in form inputs, even when formdata was emptied

---
 public/js/components/Form/Input.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Form/Input.js b/public/js/components/Form/Input.js
index 11ad357a5..b4f87f501 100644
--- a/public/js/components/Form/Input.js
+++ b/public/js/components/Form/Input.js
@@ -160,12 +160,12 @@ export default {
 		},
 		modelValueCmp: {
 			get() {
-				if (this.$attrs.modelValue === undefined)
+				if (!this.$attrs.hasOwnProperty('modelValue'))
 					return this.modelValueDummy;
 				return this.$attrs.modelValue;
 			},
 			set(v) {
-				if (this.$attrs.modelValue === undefined)
+				if (!this.$attrs.hasOwnProperty('modelValue'))
 					this.modelValueDummy = v;
 				this.$emit('update:modelValue', v);
 			}

From 6eae83f4eba76848ca63eae121de16d43d72dc43 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Wed, 20 Mar 2024 09:45:25 +0100
Subject: [PATCH 0507/1461] Added primevues autocomplete slot template to
 Input.js

Now, when using the Input Component with type 'autocomplete', it is possible to add also primevues built in slot templates there
---
 public/js/components/Form/Input.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/public/js/components/Form/Input.js b/public/js/components/Form/Input.js
index b4f87f501..ccd7e856d 100644
--- a/public/js/components/Form/Input.js
+++ b/public/js/components/Form/Input.js
@@ -242,6 +242,7 @@ export default {
 		<select v-else-if="tag == 'select'" ref="input" v-model="modelValueCmp" v-bind="$attrs" :id="idCmp" :name="name" :class="validationClass" :modelValue="undefined" @input="clearValidationForThisName(); $emit('input', $event)">
 			<slot></slot>
 		</select>
+
 		<component
 			v-else-if="tag == 'VueDatePicker'"
 			ref="input"
@@ -272,6 +273,17 @@ export default {
 			@update:model-value="clearValidationForThisName"
 			>
 			<slot></slot>
+			<template #chip="data"><slot name="chip" v-bind="data"></slot></template>
+			<template #header="data"><slot name="header" v-bind="data"></slot></template>
+			<template #footer="data"><slot name="footer" v-bind="data"></slot></template>
+			<template #option="data"><slot name="option" v-bind="data"></slot></template>
+			<template #optiongroup="data"><slot name="optiongroup" v-bind="data"></slot></template>
+			<template #content="data"><slot name="content" v-bind="data"></slot></template>
+			<template #loader="data"><slot name="loader" v-bind="data"></slot></template>
+			<template #empty="data"><slot name="empty" v-bind="data"></slot></template>
+			<template #dropdownicon="data"><slot name="dropdownicon" v-bind="data"></slot></template>
+			<template #removetokenicon="data"><slot name="removetokenicon" v-bind="data"></slot></template>
+			<template #loadingicon="data"><slot name="loadingicon" v-bind="data"></slot></template>
 		</component>
 		<component
 			v-else-if="tag == 'UploadDms'"

From f6eceb892d4f4580d1ff8868b69ac9b1bf0ff04f Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Wed, 20 Mar 2024 09:52:26 +0100
Subject: [PATCH 0508/1461] Added label property 'class' to Input.js

...which fixes style issues when creating input-group buttons using the Input.js component
---
 public/js/components/Form/Input.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Form/Input.js b/public/js/components/Form/Input.js
index ccd7e856d..0940701a5 100644
--- a/public/js/components/Form/Input.js
+++ b/public/js/components/Form/Input.js
@@ -236,7 +236,7 @@ export default {
 	},
 	template: `
 	<component :is="!hasContainer ? 'FhcFragment' : 'div'" class="position-relative" :class="autoContainerClass">
-		<label v-if="$attrs.label && lcType != 'radio' && lcType != 'checkbox'" :for="idCmp">{{$attrs.label}}</label>
+		<label v-if="$attrs.label && lcType != 'radio' && lcType != 'checkbox'" :class="!noAutoClass && 'form-label'" :for="idCmp">{{$attrs.label}}</label>
 		<input v-if="tag == 'input'" :type="lcType" ref="input" v-model="modelValueCmp" v-bind="$attrs" :id="idCmp" :name="name" :class="validationClass" :modelValue="undefined" @input="clearValidationForThisName(); $emit('input', $event)">
 		<textarea v-else-if="tag == 'textarea'" ref="input" v-model="modelValueCmp" v-bind="$attrs" :id="idCmp" :name="name" :class="validationClass" :modelValue="undefined" @input="clearValidationForThisName(); $emit('input', $event)"></textarea>
 		<select v-else-if="tag == 'select'" ref="input" v-model="modelValueCmp" v-bind="$attrs" :id="idCmp" :name="name" :class="validationClass" :modelValue="undefined" @input="clearValidationForThisName(); $emit('input', $event)">

From bc798bd0b480cad471a9aa9843fdc197181fabe3 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Wed, 20 Mar 2024 09:58:25 +0100
Subject: [PATCH 0509/1461] Added uniqueId prop to Filter.js to fix URL using
 apiFunctionParameters.filterUniqueId

---
 public/js/components/filter/Filter.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index c447798a8..d76e716fd 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -65,6 +65,7 @@ export const CoreFilterCmpt = {
 		newBtnClass: [String, Array, Object],
 		newBtnDisabled: Boolean,
 		newBtnLabel: String,
+		uniqueId: String,
 		// TODO soll im master kommen?
 		idField: String,
 		parentIdField: String
@@ -452,6 +453,9 @@ export const CoreFilterCmpt = {
 			apiFunctionParameters.filterUniqueId = FHC_JS_DATA_STORAGE_OBJECT.called_path + "/" + FHC_JS_DATA_STORAGE_OBJECT.called_method;
 			apiFunctionParameters.filterType = this.filterType;
 
+			if (this.uniqueId)
+				apiFunctionParameters.filterUniqueId += '_' + this.uniqueId;
+
 			// Assign parameters to the FetchCmpt binded properties
 			this.fetchCmptApiFunctionParams = apiFunctionParameters;
 			// Assign data fetch callback to the FetchCmpt binded properties

From 78a16982f87005a3498bdfdf1348b216c2c719be Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 20 Mar 2024 13:25:32 +0100
Subject: [PATCH 0510/1461] updates the tableHelpsite to use bootstrap5 classes
 if the bootstrapVersion flag is set to 5

---
 application/views/widgets/table/table.php     |  4 +++-
 .../views/widgets/table/tableHelpsite.php     | 23 +++++++++++++------
 public/css/Tabulator5.css                     | 11 +++++++++
 3 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/application/views/widgets/table/table.php b/application/views/widgets/table/table.php
index 35d66988a..6cd49c61c 100644
--- a/application/views/widgets/table/table.php
+++ b/application/views/widgets/table/table.php
@@ -12,7 +12,9 @@
 		<div id="tableDatasetActionsTop"></div>
 
 		<!-- TableWidget table -->
-		<?php TableWidget::loadViewDataset(); ?>
+		<div class="border border-2 mb-4">
+			<?php TableWidget::loadViewDataset(); ?>
+		</div>
 
 		<!-- Table info bottom -->
 		<div id="tableDatasetActionsBottom"></div>
diff --git a/application/views/widgets/table/tableHelpsite.php b/application/views/widgets/table/tableHelpsite.php
index 56523f7da..fa864c634 100644
--- a/application/views/widgets/table/tableHelpsite.php
+++ b/application/views/widgets/table/tableHelpsite.php
@@ -1,10 +1,19 @@
 <!--CollapseHTML 'Help'-->
 <div class="row">
 	<div class="col-lg-12 collapse" id="tabulatorHelp-<?php echo $tableUniqueId; ?>">
-		<div class="well">
+		<div class="mb-4 " 
+			 style="<?php 
+				if(isset($bootstrapVersion) && $bootstrapVersion==5)
+				{ 
+					echo "border: 1px solid #ccc;
+      					  border-radius: 4px;
+      					  padding: 15px;
+      					  background-color: #f5f5f5;";
+				} ?>"
+			>
    
 			<h4><?php echo ucfirst($this->p->t('ui', 'tabelleneinstellungen')); ?></h4>
-			<div class="panel panel-body">
+			<div class=" <?php echo (isset($bootstrapVersion) && $bootstrapVersion==5)?"card card-body":"panel panel-body" ?>">
 				<b><?php echo $this->p->t('table', 'spaltenEinAusblenden'); ?></b>
 				<p>
                     <ul>
@@ -25,11 +34,11 @@
 			<br> <!--end panel-body-->
 			
 			<h4><?php echo $this->p->t('table', 'zeilenAuswaehlen'); ?></h4>
-			<div class="panel panel-body">
-				<ul>
-					<li><?php echo $this->p->t('table', 'zeilenAuswaehlenEinzeln'); ?></li>
-					<li><?php echo $this->p->t('table', 'zeilenAuswaehlenBereich'); ?></li>
-					<li><?php echo $this->p->t('table', 'zeilenAuswaehlenAlle'); ?></li>
+			<div class="<?php echo (isset($bootstrapVersion) && $bootstrapVersion==5)?"card card-body":"panel panel-body" ?>">
+				<ul class="mb-0">
+					<li class="mb-1"><?php echo $this->p->t('table', 'zeilenAuswaehlenEinzeln'); ?></li>
+					<li class="mb-1"><?php echo $this->p->t('table', 'zeilenAuswaehlenBereich'); ?></li>
+					<li class="mb-1"><?php echo $this->p->t('table', 'zeilenAuswaehlenAlle'); ?></li>
 				</ul>
 			</div>
 			<br> <!--end panel-body-->
diff --git a/public/css/Tabulator5.css b/public/css/Tabulator5.css
index b755f0d76..7c7c9ed57 100644
--- a/public/css/Tabulator5.css
+++ b/public/css/Tabulator5.css
@@ -44,3 +44,14 @@
 	max-height: 22px;
 	min-width: 30px;
 }
+
+.btn-select-col-selected
+{
+	background-color: #e6e6e6;
+}
+
+.accordion-item-dark, .accordion-item-dark:focus{
+	background-color:#CED4DA !important;
+	 border-color:#ADB5BD !important;
+	 box-shadow: none !important;
+}

From 59f25bd3a2e66355cf3dd53d90209c8695296e49 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 20 Mar 2024 13:26:23 +0100
Subject: [PATCH 0511/1461] adding the bootstrapVersion flag to the
 /widget/table view to dynamically render css classes + little fixes

---
 application/widgets/TableWidget.php           |  1 +
 public/js/TableWidget.js                      | 20 +++++++++----------
 .../js/lehre/anrechnung/requestAnrechnung.js  |  8 ++++----
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/application/widgets/TableWidget.php b/application/widgets/TableWidget.php
index be368fc2c..5ac0bec0f 100644
--- a/application/widgets/TableWidget.php
+++ b/application/widgets/TableWidget.php
@@ -98,6 +98,7 @@ class TableWidget extends Widget
 		
 		$this->view(self::WIDGET_URL_TABLE, array(
 			'tableUniqueId' => $widgetData[TableWidgetLib::TABLE_UNIQUE_ID],
+			'bootstrapVersion' => $widgetData[TableWidgetLib::TABLE_BOOTSTRAP_VERSION],
 		)); // GUI starts here
 	}
 
diff --git a/public/js/TableWidget.js b/public/js/TableWidget.js
index a6b8a10b1..ee43066ce 100644
--- a/public/js/TableWidget.js
+++ b/public/js/TableWidget.js
@@ -626,8 +626,6 @@ var FHC_TableWidget = {
 				tableWidgetDiv.find('#tableWidgetHeader').append(tabulatorHeaderHTML);
 
 
-				// Render the collapsable div triggered by button in tableWidgetHeader
-				//! this rendering was moved to the _onTableBuilt function
 				
 			}
 		
@@ -858,7 +856,7 @@ function _renderTabulatorHeaderCollapseHTML(tableWidgetDiv,arrayTabulatorColumns
 
 	// CollapseHTML 'Settings'
 	if(_bootstrapVersion==3){
-	tabulatorHeaderCollapseHTML += '<div class="row">';
+	tabulatorHeaderCollapseHTML += '<div class="row ">';
 	tabulatorHeaderCollapseHTML += '<div class="col-lg-12 collapse" id="tabulatorSettings-'+ tableUniqueId + '">';
 	tabulatorHeaderCollapseHTML += `<div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">`;
 	tabulatorHeaderCollapseHTML += `<div class="panel panel-default">`;
@@ -877,22 +875,22 @@ function _renderTabulatorHeaderCollapseHTML(tableWidgetDiv,arrayTabulatorColumns
 	tabulatorHeaderCollapseHTML += '<div class="panel-body">';
 	tabulatorHeaderCollapseHTML += '<div class="btn-group" role="group">';
 	}else{
-		tabulatorHeaderCollapseHTML += '<div class="row">';
+		tabulatorHeaderCollapseHTML += '<div class="row my-4">';
 		tabulatorHeaderCollapseHTML += '<div class="col-12 collapse" id="tabulatorSettings-'+ tableUniqueId + '">';
 		tabulatorHeaderCollapseHTML += `<div class="accordion" id="accordion" role="tablist" aria-multiselectable="true">`;
 		tabulatorHeaderCollapseHTML += `<div class="accordion-item">`;
-		tabulatorHeaderCollapseHTML += `<h5 class="accordion-header" role="tab" id="headingOne">`;
+		tabulatorHeaderCollapseHTML += `<h5  class=" accordion-header" role="tab" id="headingOne">`;
 		tabulatorHeaderCollapseHTML += '' +
-			'<a role="button" data-bs-toggle="collapse" data-bs-parent="#accordion" ' +
+			'<a role="button"  class="accordion-item-dark text-dark accordion-button" data-bs-toggle="collapse" data-bs-parent="#accordion" ' +
 			'href="#selectColumns-' + tableUniqueId + '" ' +
 			'aria-expanded="false" aria-controls="selectColumns">' +
 			FHC_PhrasesLib.t("ui", "spaltenEinstellen") +
 			'</a>';
 		tabulatorHeaderCollapseHTML += '</h5>';
-		tabulatorHeaderCollapseHTML += '<div id="selectColumns-' + tableUniqueId + '" class="accordion-collapse collapse show" ' +
+		tabulatorHeaderCollapseHTML += '<div id="selectColumns-' + tableUniqueId + '" class="accordion-collapse collapse " ' +
 			'role="tabpanel" aria-labelledby="headingOne" data-bs-parent="#accordion">';
-		tabulatorHeaderCollapseHTML += '<div class="accordion-body">';
-		tabulatorHeaderCollapseHTML += '<div class="btn-group" role="group">';
+		tabulatorHeaderCollapseHTML += '<div class=" accordion-body ">';
+		tabulatorHeaderCollapseHTML += '<div class="d-flex flex-row flex-wrap btn-group" role="group">';
 	}
 	// Create column picker (Spalten einstellen)
 	tableWidgetDiv.find('#tableWidgetTabulator').tabulator('getColumns').forEach(function(column)
@@ -908,13 +906,13 @@ function _renderTabulatorHeaderCollapseHTML(tableWidgetDiv,arrayTabulatorColumns
 		{
 			if ($.inArray(field, tableWidgetBlacklistArray_columnUnselectable) < 0)
 			{
-				tabulatorHeaderCollapseHTML += `<button type="button" class="btn ${_bootstrapVersion==3?'btn-default':'btn-outline-secondary'} btn-sm btn-select-col ` + btn_select_col_selected +'" aria-pressed="true" id="btn-' + field + '" value="' + field + '">' + title + '</button>';
+				tabulatorHeaderCollapseHTML += `<button type="button" style="flex:0 0 auto " class="btn ${_bootstrapVersion==3?'btn-default':'btn-outline-secondary flex-shrink-1'} btn-sm btn-select-col ` + btn_select_col_selected +'" aria-pressed="true" id="btn-' + field + '" value="' + field + '">' + title + '</button>';
 			}
 		}
 		// Else provide all tabulator fields as pickable columns
 		else
 		{
-			tabulatorHeaderCollapseHTML += `<button type="button" class="btn ${_bootstrapVersion==3?'btn-default':'btn-outline-secondary'} btn-sm btn-select-col ` + btn_select_col_selected +'" aria-pressed="true" id="btn-' + field + '" value="' + field + '">' + title + '</button>';
+			tabulatorHeaderCollapseHTML += `<button type="button" style="flex:0 0 auto " class="btn ${_bootstrapVersion==3?'btn-default':'btn-outline-secondary flex-shrink-1'} btn-sm btn-select-col ` + btn_select_col_selected +'" aria-pressed="true" id="btn-' + field + '" value="' + field + '">' + title + '</button>';
 		}
 	});
 
diff --git a/public/js/lehre/anrechnung/requestAnrechnung.js b/public/js/lehre/anrechnung/requestAnrechnung.js
index 81bb010be..abc967c66 100644
--- a/public/js/lehre/anrechnung/requestAnrechnung.js
+++ b/public/js/lehre/anrechnung/requestAnrechnung.js
@@ -279,10 +279,10 @@ var requestAnrechnung = {
     alertIfMaxEctsExceeded: function(){
 
         if(
-            true
-            // (parseFloat($('#sumEctsSchulisch').text())) > 60 ||
-            // (parseFloat($('#sumEctsBeruflich').text())) > 60 ||
-            // (parseFloat($('#sumEctsSchulisch').text()) + parseFloat($('#sumEctsBeruflich').text())) > 90 
+        
+             (parseFloat($('#sumEctsSchulisch').text())) > 60 ||
+             (parseFloat($('#sumEctsBeruflich').text())) > 60 ||
+             (parseFloat($('#sumEctsSchulisch').text()) + parseFloat($('#sumEctsBeruflich').text())) > 90 
         )
         {
             $('#requestAnrechnung-maxEctsUeberschrittenMsg')

From 1b4a2f2d7a4a74be11bc4aaa38e39f04c318a341 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 21 Mar 2024 07:58:37 +0100
Subject: [PATCH 0512/1461] Refactor right hasPermissionToSkipStatusCheck

---
 .../controllers/Studentenverwaltung.php       |  2 +-
 .../controllers/components/stv/Status.php     |  9 ++--
 .../js/components/Stv/Studentenverwaltung.js  |  2 +-
 .../Studentenverwaltung/Details/Prestudent.js |  5 +++
 .../Details/Prestudent/Status.js              | 44 +++++++++++++------
 .../Stv/Studentenverwaltung/Details/Status.js |  2 +-
 6 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/application/controllers/Studentenverwaltung.php b/application/controllers/Studentenverwaltung.php
index bd8ef7aa9..0c27f3aba 100644
--- a/application/controllers/Studentenverwaltung.php
+++ b/application/controllers/Studentenverwaltung.php
@@ -26,7 +26,7 @@ class Studentenverwaltung extends FHC_Controller
 				'assistenz_stgs' => $this->permissionlib->getSTG_isEntitledFor('assistenz'),
 				'admin' => $this->permissionlib->isBerechtigt('admin'),
 				'assistenz_schreibrechte' => $this->permissionlib->isBerechtigt('assistenz','suid'),
-				'student/keine_studdatuspruefung' => $this->permissionlib->isBerechtigt('student/keine_studdatuspruefung')
+				'student/keine_studstatuspruefung' => $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung')
 
 			],
 			'variables' => [
diff --git a/application/controllers/components/stv/Status.php b/application/controllers/components/stv/Status.php
index 3db792c2e..772567106 100644
--- a/application/controllers/components/stv/Status.php
+++ b/application/controllers/components/stv/Status.php
@@ -242,10 +242,7 @@ class Status extends FHC_Controller
 		}
 
 		$isBerechtigtNoStudstatusCheck =  $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung');
-		/*		var_dump(isBerechtigtNoStudstatusCheck);
 
-				$basis =  $this->permissionlib->isBerechtigt('basis/prestudent');
-				var_dump($basis);*/
 		if(!$isBerechtigtNoStudstatusCheck)
 		{
 			//Block STATUSCHECKS
@@ -636,7 +633,7 @@ $sqlundo =
 			if (!hasData($result))
 			{
 				$this->outputJson($result);
-				var_dump("no data Löschen der Lehrverbandszuordnung");
+				//var_dump("no data Löschen der Lehrverbandszuordnung");
 			}
 			$this->outputJsonSuccess(true);
 		}
@@ -996,7 +993,7 @@ $sqlundo =
 		}
 
 
-		if(!isBerechtigtNoStudstatusCheck)
+		if(!$isBerechtigtNoStudstatusCheck)
 		{
 			//Block STATUSCHECKS
 
@@ -1013,7 +1010,7 @@ $sqlundo =
 		$this->db->trans_begin();
 
 		//update status
-		var_dump($ausbildungssemester, $studiensemester_kurzbz);
+		//var_dump($ausbildungssemester, $studiensemester_kurzbz);
 		$result = $this->PrestudentstatusModel->update(
 			[
 				'prestudent_id' => $key_prestudent_id,
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 5a6e62a38..6279f57b5 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -54,7 +54,7 @@ export default {
 			hasAssistenzPermissionForStgs: this.permissions['assistenz_stgs'],
 			hasSchreibrechtAss: this.permissions['assistenz_schreibrechte'],
 			hasAdminPermission: this.permissions['admin'],
-			//hasPermissionToSkipStatusCheck: this.permission['student/keine_studdatuspruefung'],
+			hasPermissionToSkipStatusCheck: this.permissions['student/keine_studstatuspruefung'],
 			lists: this.lists,
 			defaultSemester: this.defaultSemester
 		}
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
index 9407355cd..b59a50b55 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
@@ -28,6 +28,10 @@ export default {
 			from: 'hasPrestudentPermission',
 			default: false
 		},
+/*		hasPermissionToSkipStatusCheck: {
+			from: 'hasPermissionToSkipStatusCheck',
+			default: false
+		},*/
 		hasAssistenzPermission: {
 			from: 'hasAssistenzPermission',
 			default: false
@@ -201,6 +205,7 @@ detectChanges() {
 	mounted(){},
 	template: `
 	<div class="stv-details-details h-100 pb-3">
+<!--	TEST: {{modelValue}} -->
 		<form-form ref="form" class="stv-details-prestudent" @submit.prevent="updatePrestudent">
 		<div class="position-sticky top-0 z-1">
 			<button type="submit" class="btn btn-primary position-absolute top-0 end-0" :disabled="!deltaLength">Speichern</button>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
index ebf37ea86..b2b3eeda3 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
@@ -41,7 +41,8 @@ export default{
 		}
 	},
 	props: {
-		prestudent_id: String
+		prestudent_id: String,
+		studiengang_kz: String
 	},
 	data() {
 		return {
@@ -81,7 +82,7 @@ export default{
 							container.className = "d-flex gap-2";
 
 							let button = document.createElement('button');
-							if (this.dataMeldestichtag && this.dataMeldestichtag > cell.getData().datum)
+							if (this.dataMeldestichtag && this.dataMeldestichtag > cell.getData().datum && !this.hasPermissionToSkipStatusCheck)
 								button.className = 'btn btn-outline-secondary btn-action disabled';
 							else
 								button.className = 'btn btn-outline-secondary btn-action';
@@ -93,7 +94,7 @@ export default{
 							container.append(button);
 
 							button = document.createElement('button');
-							if (this.dataMeldestichtag && this.dataMeldestichtag > cell.getData().datum)
+							if (this.dataMeldestichtag && this.dataMeldestichtag > cell.getData().datum && !this.hasPermissionToSkipStatusCheck)
 								button.className = 'btn btn-outline-secondary btn-action disabled';
 							else
 								button.className = 'btn btn-outline-secondary btn-action';
@@ -105,7 +106,7 @@ export default{
 							container.append(button);
 
 							button = document.createElement('button');
-							if (this.dataMeldestichtag && this.dataMeldestichtag > cell.getData().datum)
+							if (this.dataMeldestichtag && this.dataMeldestichtag > cell.getData().datum && !this.hasPermissionToSkipStatusCheck)
 								button.className = 'btn btn-outline-secondary btn-action disabled';
 							else
 								button.className = 'btn btn-outline-secondary btn-action';
@@ -117,7 +118,7 @@ export default{
 							container.append(button);
 
 							button = document.createElement('button');
-							if (this.dataMeldestichtag && this.dataMeldestichtag > cell.getData().datum)
+							if (this.dataMeldestichtag && this.dataMeldestichtag > cell.getData().datum && !this.hasPermissionToSkipStatusCheck)
 								button.className = 'btn btn-outline-secondary btn-action disabled';
 							else
 								button.className = 'btn btn-outline-secondary btn-action';
@@ -157,13 +158,23 @@ export default{
 			gruendeLength: {},
 			dataMeldestichtag: null,
 			stichtag: {},
-			isLastStatus: {}
+			isLastStatus: {},
+			hasPermissionThisStg: {}
 		}
 	},
 	computed: {
 		gruende() {
 			return this.listStatusgruende.filter(grund => grund.status_kurzbz == this.statusData.status_kurzbz);
 		},
+		arrayStg(){
+			let stgInteger = this.hasAssistenzPermissionForStgs.map(item => {
+				return parseInt(item); // Wandelt jeden String in eine ganze Zahl um
+			});
+			return stgInteger;
+		},
+		hasPermissionCurrentStg(){
+			return this.arrayStg.includes(this.studiengang_kz);
+		}
 	},
 	watch: {
 		data: {
@@ -459,25 +470,32 @@ export default{
 		<div class="stv-list h-100 pt-3">
 		
 		
-		<p>TestData</p>
+<!--		<p>TestData</p>
 		
-		isLastStatus: {{isLastStatus}}
+		{{hasPermissionCurrentStg}}
+		<hr>
+
+		
+<!--		isLastStatus: {{isLastStatus}}
 		<br>
 
 		Bismeldestichtag
-		{{dataMeldestichtag }}
-		
+		{{dataMeldestichtag }}-->
 		
+<!--		{{arrayStg}}-->
 
 		
 <!--		Berechtigungen:
 			Skip Check: {{hasPermissionToSkipStatusCheck}} |
 			Admin: {{hasAdminPermission}} |
-			Studiengaenge: {{hasAssistenzPermissionForStgs}} |
-			Schreibrecht ASS: {{hasSchreibrechtAss}}-->
+			Studiengaenge:  |
+			Schreibrecht ASS: {{hasSchreibrechtAss}} ||
+			Basis Prestudent: {{hasPrestudentPermission}} ||
+			Recht für Studiengang {{studiengang_kz}} : {{hasPermissionCurrentStg}}-->
 		
 		<hr>
-		<p>{{statusId}}</p>	
+<!--		<p>{{hasAssistenzPermissionForStgs}}</p>	
+		{{this.hasAssistenzPermissionForStgs.includes("476")}}-->
 		
 			<!--Modal: Add New Status-->
 			<BsModal ref="newStatusModal">
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Status.js b/public/js/components/Stv/Studentenverwaltung/Details/Status.js
index b7ecc556d..623fcb597 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Status.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Status.js
@@ -11,7 +11,7 @@ export default {
 	<div class="stv-details-details h-100 pb-3">
 			<div class="col-12 pb-3">
 			<legend>Status</legend>
-			<TblStatus :prestudent_id="modelValue.prestudent_id"></TblStatus>		
+			<TblStatus :prestudent_id="modelValue.prestudent_id" :studiengang_kz="modelValue.studiengang_kz"></TblStatus>		
 		</div>
 		</div>
 	`

From 081a2d69f5033597eb4faa04ef440d7be593ad1e Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 21 Mar 2024 08:49:28 +0100
Subject: [PATCH 0513/1461] set version 3 as the default version of bootstrap
 for the tableWidget

---
 application/widgets/TableWidget.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/widgets/TableWidget.php b/application/widgets/TableWidget.php
index 5ac0bec0f..c48308258 100644
--- a/application/widgets/TableWidget.php
+++ b/application/widgets/TableWidget.php
@@ -140,7 +140,7 @@ class TableWidget extends Widget
 
 		// Initialize class properties
 		$this->_requiredPermissions = null;
-		$this->_bootstrapVersion = null;
+		$this->_bootstrapVersion = 3;
 		$this->_reloadDataset = true; // by default the dataset is NOT cached in session
 		$this->_query = null;
 		$this->_additionalColumns = null;

From 47dfb66b8d9c780891f07f8d54fe43bb4c0031ff Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 21 Mar 2024 09:27:44 +0100
Subject: [PATCH 0514/1461] replacing string concatenation with string literals
 for tableWidget Header and Footer

---
 public/js/TableWidget.js | 170 ++++++++++++++++++---------------------
 1 file changed, 77 insertions(+), 93 deletions(-)

diff --git a/public/js/TableWidget.js b/public/js/TableWidget.js
index ee43066ce..893a69c5f 100644
--- a/public/js/TableWidget.js
+++ b/public/js/TableWidget.js
@@ -589,23 +589,10 @@ var FHC_TableWidget = {
 				
 				options.placeholder = _func_placeholder();	// display text when table is empty
 
-				// OLD tabulator v4
-				// if (typeof options.rowSelectionChanged == 'undefined')
-				// {
-				// 	options.rowSelectionChanged = function(data, rows){
-				// 		_func_rowSelectionChanged(data, rows);
-				// 	};
-				// }
-				
-				// OLD tabulator v4
-				// options.columnVisibilityChanged = function(column, visible) {
-				// 	_func_columnVisibilityChanged(column, visible);
-				// };
-
 				// Renders the tabulator
 				tableWidgetDiv.find("#tableWidgetTabulator").tabulator(options);
 
-				//! the following callbacks need to be attached after the table has built in tabulator version 5+
+				//! callbacks that need to be attached after the table has built in tabulator version 5+
 				tableWidgetDiv.find("#tableWidgetTabulator").tabulator("on","rowSelectionChanged",_func_rowSelectionChanged);
 				tableWidgetDiv.find("#tableWidgetTabulator").tabulator("on","columnVisibilityChanged",_func_columnVisibilityChanged);
 				
@@ -821,28 +808,33 @@ function _renderTabulatorHeaderHTML(tableWidgetDiv){
 	var tableUniqueId = tableWidgetDiv.attr('tableUniqueId');
 
 	var tabulatorHeaderHTML = '';
-	tabulatorHeaderHTML += '<div class="btn-toolbar pull-right" role="toolbar">';
-	tabulatorHeaderHTML += '<div class="btn-group" role="group">';
-	tabulatorHeaderHTML += '' +
-		`<button id="download-csv" class="btn ${_bootstrapVersion==3?'btn-default':'btn-outline-secondary'}" type="button" ` +
-		'data-toggle="tooltip" data-placement="left" title="Download CSV">' +
-		'<small>CSV&nbsp;&nbsp;</small><i class="fa fa-arrow-down"></i>' +
-		'</button>';
-	tabulatorHeaderHTML += '' +
-		`<button id="help" class="btn ${_bootstrapVersion==3?'btn-default':'btn-outline-secondary'}" type="button" ` +
-		'data-toggle="collapse tooltip" data-target="tabulatorHelp-'+ tableUniqueId + '" data-placement="left" ' +
-		'title="' + FHC_PhrasesLib.t("ui", "hilfe") + '"><i class="fa fa-question"></i>' +
-		'</button>';
-	tabulatorHeaderHTML += '' +
-		`<button id="settings" class="btn ${_bootstrapVersion==3?'btn-default':'btn-outline-secondary'}" type="button" ` +
-		'data-toggle="collapse tooltip" data-target="tabulatorSettings-'+ tableUniqueId + '" data-placement="left" ' +
-		'title="' + FHC_PhrasesLib.t("ui", "tabelleneinstellungen") + '" ' +
-		'aria-expanded="false" aria-controls="tabulatorSettings-'+ tableUniqueId + '">' +
-		'<i class="fa fa-cog"></i>' +
-		'</button>';
-	tabulatorHeaderHTML += '</div>';
-	tabulatorHeaderHTML += '</div>';
-	tabulatorHeaderHTML += '<br><br><br>';
+	tabulatorHeaderHTML += 
+	`<div class="btn-toolbar pull-right" role="toolbar">
+		<div class="btn-group" role="group">
+			<!-- CSV Download button -->
+			<button id="download-csv" class="btn ${_bootstrapVersion==3?'btn-default':'btn-outline-secondary'}" type="button" 
+			data-toggle="tooltip" data-placement="left" title="Download CSV">
+				<small>
+					CSV&nbsp;&nbsp;
+				</small>
+				<i class="fa fa-arrow-down"></i>
+			</button>
+			<!-- Hilfe Button -->
+			<button id="help" class="btn ${_bootstrapVersion==3?'btn-default':'btn-outline-secondary'}" type="button"
+			data-toggle="collapse tooltip" data-target="tabulatorHelp-${tableUniqueId}" data-placement="left" 
+			title="${FHC_PhrasesLib.t("ui", "hilfe")}">
+				<i class="fa fa-question"></i>
+			</button>
+			<!-- Settings Button -->
+			<button id="settings" class="btn ${_bootstrapVersion==3?'btn-default':'btn-outline-secondary'}" type="button" 
+			data-toggle="collapse tooltip" data-target="tabulatorSettings-${tableUniqueId}" data-placement="left"
+			title="${FHC_PhrasesLib.t("ui", "tabelleneinstellungen")}" 
+			aria-expanded="false" aria-controls="tabulatorSettings-${tableUniqueId}">
+				<i class="fa fa-cog"></i>
+			</button>
+		</div>
+	</div>
+	<br><br><br>`;
 
 	return tabulatorHeaderHTML;
 }
@@ -856,41 +848,39 @@ function _renderTabulatorHeaderCollapseHTML(tableWidgetDiv,arrayTabulatorColumns
 
 	// CollapseHTML 'Settings'
 	if(_bootstrapVersion==3){
-	tabulatorHeaderCollapseHTML += '<div class="row ">';
-	tabulatorHeaderCollapseHTML += '<div class="col-lg-12 collapse" id="tabulatorSettings-'+ tableUniqueId + '">';
-	tabulatorHeaderCollapseHTML += `<div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">`;
-	tabulatorHeaderCollapseHTML += `<div class="panel panel-default">`;
-	tabulatorHeaderCollapseHTML += `<div class="panel-heading" role="tab" id="headingOne">`;
-	tabulatorHeaderCollapseHTML += '<h5 class="panel-title">';
-	tabulatorHeaderCollapseHTML += '' +
-		'<a role="button" data-toggle="collapse" data-parent="#accordion" ' +
-		'href="#selectColumns-' + tableUniqueId + '" ' +
-		'aria-expanded="false" aria-controls="selectColumns">' +
-		FHC_PhrasesLib.t("ui", "spaltenEinstellen") +
-		'</a>';
-	tabulatorHeaderCollapseHTML += '</h5>';
-	tabulatorHeaderCollapseHTML += '</div>'; // end panel-heading
-	tabulatorHeaderCollapseHTML += '<div id="selectColumns-' + tableUniqueId + '" class="panel-collapse collapse" ' +
-		'role="tabpanel" aria-labelledby="headingOne">';
-	tabulatorHeaderCollapseHTML += '<div class="panel-body">';
-	tabulatorHeaderCollapseHTML += '<div class="btn-group" role="group">';
+	tabulatorHeaderCollapseHTML += `
+	<div class="row ">
+		<div class="col-lg-12 collapse" id="tabulatorSettings-${tableUniqueId}">
+			<div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
+				<div class="panel panel-default">
+					<div class="panel-heading" role="tab" id="headingOne">
+						<h5 class="panel-title">
+							<a role="button" data-toggle="collapse" data-parent="#accordion" 
+							href="#selectColumns-${tableUniqueId}" 
+							aria-expanded="false" aria-controls="selectColumns">
+							${FHC_PhrasesLib.t("ui", "spaltenEinstellen")} 
+							</a>
+						</h5>
+					</div>
+					<div id="selectColumns-${tableUniqueId}" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
+						<div class="panel-body">
+							<div class="btn-group" role="group">`
 	}else{
-		tabulatorHeaderCollapseHTML += '<div class="row my-4">';
-		tabulatorHeaderCollapseHTML += '<div class="col-12 collapse" id="tabulatorSettings-'+ tableUniqueId + '">';
-		tabulatorHeaderCollapseHTML += `<div class="accordion" id="accordion" role="tablist" aria-multiselectable="true">`;
-		tabulatorHeaderCollapseHTML += `<div class="accordion-item">`;
-		tabulatorHeaderCollapseHTML += `<h5  class=" accordion-header" role="tab" id="headingOne">`;
-		tabulatorHeaderCollapseHTML += '' +
-			'<a role="button"  class="accordion-item-dark text-dark accordion-button" data-bs-toggle="collapse" data-bs-parent="#accordion" ' +
-			'href="#selectColumns-' + tableUniqueId + '" ' +
-			'aria-expanded="false" aria-controls="selectColumns">' +
-			FHC_PhrasesLib.t("ui", "spaltenEinstellen") +
-			'</a>';
-		tabulatorHeaderCollapseHTML += '</h5>';
-		tabulatorHeaderCollapseHTML += '<div id="selectColumns-' + tableUniqueId + '" class="accordion-collapse collapse " ' +
-			'role="tabpanel" aria-labelledby="headingOne" data-bs-parent="#accordion">';
-		tabulatorHeaderCollapseHTML += '<div class=" accordion-body ">';
-		tabulatorHeaderCollapseHTML += '<div class="d-flex flex-row flex-wrap btn-group" role="group">';
+		tabulatorHeaderCollapseHTML += 
+		`<div class="row my-4">
+			<div class="col-12 collapse" id="tabulatorSettings-${tableUniqueId}">
+				<div class="accordion" id="accordion" role="tablist" aria-multiselectable="true">
+					<div class="accordion-item">
+						<h5  class=" accordion-header" role="tab" id="headingOne">		
+							<a role="button"  class="accordion-item-dark text-dark accordion-button" data-bs-toggle="collapse" data-bs-parent="#accordion" 
+							href="#selectColumns-${tableUniqueId}" 
+							aria-expanded="false" aria-controls="selectColumns">
+							${FHC_PhrasesLib.t("ui", "spaltenEinstellen")}
+							</a>
+						</h5>
+						<div id="selectColumns-${tableUniqueId}" class="accordion-collapse collapse" role="tabpanel" aria-labelledby="headingOne" data-bs-parent="#accordion">
+							<div class=" accordion-body ">
+								<div class="d-flex flex-row flex-wrap btn-group" role="group">`;
 	}
 	// Create column picker (Spalten einstellen)
 	tableWidgetDiv.find('#tableWidgetTabulator').tabulator('getColumns').forEach(function(column)
@@ -906,13 +896,13 @@ function _renderTabulatorHeaderCollapseHTML(tableWidgetDiv,arrayTabulatorColumns
 		{
 			if ($.inArray(field, tableWidgetBlacklistArray_columnUnselectable) < 0)
 			{
-				tabulatorHeaderCollapseHTML += `<button type="button" style="flex:0 0 auto " class="btn ${_bootstrapVersion==3?'btn-default':'btn-outline-secondary flex-shrink-1'} btn-sm btn-select-col ` + btn_select_col_selected +'" aria-pressed="true" id="btn-' + field + '" value="' + field + '">' + title + '</button>';
+				tabulatorHeaderCollapseHTML += `<button type="button" style="flex:0 0 auto " class="btn ${_bootstrapVersion==3?'btn-default':'btn-outline-secondary flex-shrink-1'} btn-sm btn-select-col ${btn_select_col_selected} " aria-pressed="true" id="btn-${field}" value="${field}">${title}</button>`;
 			}
 		}
 		// Else provide all tabulator fields as pickable columns
 		else
 		{
-			tabulatorHeaderCollapseHTML += `<button type="button" style="flex:0 0 auto " class="btn ${_bootstrapVersion==3?'btn-default':'btn-outline-secondary flex-shrink-1'} btn-sm btn-select-col ` + btn_select_col_selected +'" aria-pressed="true" id="btn-' + field + '" value="' + field + '">' + title + '</button>';
+			tabulatorHeaderCollapseHTML += `<button type="button" style="flex:0 0 auto " class="btn ${_bootstrapVersion==3?'btn-default':'btn-outline-secondary flex-shrink-1'} btn-sm btn-select-col ${btn_select_col_selected} " aria-pressed="true" id="btn-${field}" value="${field}">${title}</button>`;
 		}
 	});
 
@@ -921,7 +911,6 @@ function _renderTabulatorHeaderCollapseHTML(tableWidgetDiv,arrayTabulatorColumns
 		tabulatorHeaderCollapseHTML += '</div>'; // end panel-body / accordion-body
 		tabulatorHeaderCollapseHTML += '</div>'; // end panel-collapse / accordion-collapse
 		tabulatorHeaderCollapseHTML += '</div>'; // end panel / accordion-item
-
 		tabulatorHeaderCollapseHTML += '</div>'; // end panel-group / accordion
 		tabulatorHeaderCollapseHTML += ' </div>'; // end col
 		tabulatorHeaderCollapseHTML += ' </div>'; // end row
@@ -939,26 +928,21 @@ function _renderTabulatorFooterHTML(tableWidgetFooterOptions){
 	// If property selectButtons is true, render 'Alle auswaehlen / Alle abwaehlen' buttons
 	if (typeof tableWidgetFooterOptions.selectButtons != 'undefined' && tableWidgetFooterOptions.selectButtons == true)
 	{
-		
-		tabulatorFooterHTML += '<div class="btn-toolbar" role="toolbar">';
-		tabulatorFooterHTML += '<div class="btn-group" role="group">';
-		tabulatorFooterHTML += '' +
-		// pull-right is a fontawesome class that adds float right style
-			`<button id="select-all" class="btn ${_bootstrapVersion==3?'btn-default':'btn-outline-secondary'} pull-right" type="button">`
-			+ FHC_PhrasesLib.t("ui", "alleAuswaehlen") + '' +
-			'</button>';
-		tabulatorFooterHTML += '' +
-		// pull-right is a fontawesome class that adds float right style
-			`<button id="deselect-all" class="btn ${_bootstrapVersion==3?'btn-default':'btn-outline-secondary'} pull-right" type="button">`
-			+ FHC_PhrasesLib.t("ui", "alleAbwaehlen") + '' +
-			'</button>';
-		tabulatorFooterHTML += '' +
-			'<span id="number-selected" style="margin-left: 20px; line-height: 2; font-weight: normal">'
-			+ FHC_PhrasesLib.t("ui", "ausgewaehlteZeilen") + ': <strong>0</strong>' +
-			'</span>';
-		tabulatorFooterHTML += '</div>';
-		tabulatorFooterHTML += '</div>';
-		tabulatorFooterHTML += '</br></br>';
+		tabulatorFooterHTML += 
+		`<div class="btn-toolbar" role="toolbar">
+			<div class="btn-group" role="group">
+				<button id="select-all" class="btn ${_bootstrapVersion==3?'btn-default':'btn-outline-secondary'} pull-right" type="button">
+			 		${FHC_PhrasesLib.t("ui", "alleAuswaehlen")}
+				</button>
+				<button id="deselect-all" class="btn ${_bootstrapVersion==3?'btn-default':'btn-outline-secondary'} pull-right" type="button">
+					${FHC_PhrasesLib.t("ui", "alleAbwaehlen")}
+				</button>
+				<span id="number-selected" style="margin-left: 20px; line-height: 2; font-weight: normal">
+					${FHC_PhrasesLib.t("ui", "ausgewaehlteZeilen")} : <strong>0</strong>
+				</span>
+			</div>
+		</div>
+		</br></br>`;
 	}
 
 	return tabulatorFooterHTML;

From 27715c7f5ffcf0052532ee446461186210e1750e Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 21 Mar 2024 13:28:51 +0100
Subject: [PATCH 0515/1461] update prestudent: uft8-coding, foerderrelevant,
 permissions

---
 .../controllers/components/stv/Prestudent.php | 59 +++++++++++++------
 .../Studentenverwaltung/Details/Prestudent.js | 55 +++++++----------
 2 files changed, 60 insertions(+), 54 deletions(-)

diff --git a/application/controllers/components/stv/Prestudent.php b/application/controllers/components/stv/Prestudent.php
index 3851a0144..7cc6bc768 100644
--- a/application/controllers/components/stv/Prestudent.php
+++ b/application/controllers/components/stv/Prestudent.php
@@ -13,6 +13,7 @@ class Prestudent extends FHC_Controller
 		// Load Libraries
 		$this->load->library('AuthLib');
 		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+		$this->load->library('PermissionLib');
 
 		// Load language phrases
 		/*		$this->loadPhrases([
@@ -57,15 +58,36 @@ class Prestudent extends FHC_Controller
 
 		var_dump($prestudentData);*/
 
+		//get Studiengang von prestudent_id
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+		$result = $this->PrestudentModel->load([
+			'prestudent_id'=> $prestudent_id,
+		]);
+		if(isError($result))
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson(getError($result));
+		}
+		$result = current(getData($result));
+
+		$stg = $result->studiengang_kz;
+
+		if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg) )
+		{
+			$result = "Sie haben keine Schreibrechte fuer diesen Studiengang!";
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson($result);
+		}
+
 		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-		$deltaData = $_POST[0];
+
+		$deltaData = $_POST;
 
 		if(!$prestudent_id)
 		{
 			return $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 		}
 
-		//Todo(manu) updateamum, updatevon ergänzen
 		$uid = getAuthUID();
 
 		$array_allowed_props_prestudent = [
@@ -87,7 +109,7 @@ class Prestudent extends FHC_Controller
 			'bismelden',
 			'anmerkung',
 			'dual',
-			'zgvdoktor_code', //Todo(Manu) tabelle leer? db zum testen
+			'zgvdoktor_code',
 			'zgvdoktorort',
 			'zgvdoktordatum',
 			'zgvdoktornation',
@@ -102,31 +124,30 @@ class Prestudent extends FHC_Controller
 			'standort_code'
 		];
 
-/*		foreach ($array_allowed_props_prestudent as $prop)
-		{
-
-
-		}*/
-
-/*		"insertamum": "2021-05-27 13:03:08",
-		"insertvon": "online",
-		"updateamum": "2022-10-10 15:37:31.903056",
-		"updatevon": "poeckl", "ext_id": null,*/
-
 		$update_prestudent = array();
 		foreach ($array_allowed_props_prestudent as $prop)
 		{
 			$val = isset($deltaData[$prop]) ? $deltaData[$prop] : null;
-			if ($val !== null) {
+			if ($val !== null || $prop == 'foerderrelevant') {
 				$update_prestudent[$prop] = $val;
 			}
 		}
-/*
-		var_dump("update Array");
-		var_dump($update_prestudent);*/
 
+		$update_prestudent['updateamum'] = date('c');
+		$update_prestudent['updatevon'] = $uid;
 
+		function utf8_decode_if_string($value) {
+			if (is_string($value)) {
+				return utf8_decode($value);
+			} else {
+				return $value;
+			}
+		}
+		$update_prestudent_encoded = array_map('utf8_decode_if_string', $update_prestudent);
 
+		//utf8-decode for special chars (eg tag der offenen Tür, FH-Führer)
+		//$update_prestudent_encoded = array_map('utf8_decode', $update_prestudent);
+		var_dump($update_prestudent_encoded);
 		if (count($update_prestudent) && $prestudent_id === null) {
 			$this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST);
 			// TODO(manu): phrase
@@ -137,7 +158,7 @@ class Prestudent extends FHC_Controller
 		{
 			$result = $this->PrestudentModel->update(
 				$prestudent_id,
-				$update_prestudent
+				$update_prestudent_encoded
 			);
 			if (isError($result)) {
 				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
index b59a50b55..c56ef4286 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
@@ -57,8 +57,12 @@ export default {
 			listAusbildung: [],
 			listAufmerksamdurch: [],
 			listBerufe: [],
+			listFoerderrelevant: [
+				{ text: 'wie Studiengang', value: null },
+				{ text: 'Ja', value: true },
+				{ text: 'Nein', value: false }
+			],
 			listStgTyp: [],
-			listFoerderrelevant: [],
 			initialFormData: {},
 			deltaArray: {},
 			actionUpdate: false
@@ -493,7 +497,7 @@ detectChanges() {
 					
 					<div class="row mb-3">
 						<form-input
-							container-class="col-5"
+							container-class="col-4"
 							label="Anmerkung"
 							type="text"
 							v-model="data.anmerkung"
@@ -520,20 +524,16 @@ detectChanges() {
 								>
 							</form-input>
 						</div>
-					<!--	Todo(manu) hier soll ein select ausgewählt werden??-->
-						<div class="col-2 pt-4 d-flex align-items-center">
-							<form-input
-								container-class="form-check"
-								label="Förderrelevant"
-								type="checkbox" 
-								v-model="data.foerderrelevant"
-								name="foerderrelevant"
-								>
-	<!--							<option :value="" selected >wie Studiengang</option>
-								<option :value="true">ja</option>
-								<option :value="false">nein</option>-->
-							</form-input>
-						</div>
+						<form-input
+							container-class="col-3"
+							label="förderrelevant"
+							type="select"
+							v-model="data.foerderrelevant"
+							name="foerderrelevant"
+							>
+							<option v-for="entry in listFoerderrelevant" :value="entry.value">{{entry.text}}</option>
+						</form-input>
+						
 						<form-input
 							container-class="col-1"
 							label="Priorität"
@@ -543,19 +543,9 @@ detectChanges() {
 							:disabled="!hasPrestudentPermission"
 							>
 						</form-input>
+						</div>
 					</div>
-					
-<!--					<div class="row mb-3">
-						<form-input
-							container-class="col-5"
-							label="MentorIn"
-							type="text"
-							v-model="data.mentor"
-							name="mentor"
-							>
-						</form-input>
-					</div>-->
-				
+									
 			</fieldset>
 		
 		</form-form>
@@ -563,16 +553,11 @@ detectChanges() {
 		<br>
 
 					
-		<div class="col-8 d-flex justify-content-center">
+		<div class="col-6 pb-3">
 			<legend>Gesamthistorie</legend>
 			<TblHistory :person_id="modelValue.person_id"></TblHistory>		
 		</div>
-		
-<!--		<div class="col-12 pb-3">
-			<legend>Status</legend>
-			<TblStatus :prestudent_id="modelValue.prestudent_id"></TblStatus>		
-		</div>-->
-				
+					
 		
 	</div>
 	`

From a8c60c105dbe72e28e4361bd54a255956821444f Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 21 Mar 2024 13:42:43 +0100
Subject: [PATCH 0516/1461] migrating approveLehrauftrag to tabulator5

---
 .../lehre/lehrauftrag/approveLehrauftrag.php  | 10 ++--
 .../lehrauftrag/approveLehrauftragData.php    |  2 +-
 public/css/Tabulator5.css                     | 51 +++++++++++++++++++
 public/js/TableWidget.js                      |  4 +-
 .../lehre/lehrauftrag/approveLehrauftrag.js   | 42 +++++++--------
 5 files changed, 78 insertions(+), 31 deletions(-)

diff --git a/application/views/lehre/lehrauftrag/approveLehrauftrag.php b/application/views/lehre/lehrauftrag/approveLehrauftrag.php
index 3ee1934f5..fa706f64f 100644
--- a/application/views/lehre/lehrauftrag/approveLehrauftrag.php
+++ b/application/views/lehre/lehrauftrag/approveLehrauftrag.php
@@ -6,7 +6,7 @@ $this->load->view(
         'jquery3' => true,
         'jqueryui1' => true,
         'jquerycheckboxes1' => true,
-        'bootstrap5' => true,
+        'bootstrap3' => true,
         'fontawesome4' => true,
         'sbadmintemplate3' => true,
         'tabulator5' => true,
@@ -90,13 +90,9 @@ $this->load->view(
             )
         ),
         'customJSs' => array(
-               
+                'public/js/bootstrapper.js',       
                 'public/js/lehre/lehrauftrag/approveLehrauftrag.js'
-        ),
-        'customCSSs' => array(
-               
-            'public/css/navbar.css'
-    )
+        )
     )
 );
 ?>
diff --git a/application/views/lehre/lehrauftrag/approveLehrauftragData.php b/application/views/lehre/lehrauftrag/approveLehrauftragData.php
index 5a9323108..4900a91c4 100644
--- a/application/views/lehre/lehrauftrag/approveLehrauftragData.php
+++ b/application/views/lehre/lehrauftrag/approveLehrauftragData.php
@@ -404,7 +404,7 @@ $filterWidgetArray = array(
         vertrag_id: {visible: false},
         vertrag_stunden: {visible: false},
         vertrag_betrag: {visible: false},
-        mitarbeiter_uid: {visible: false, headerFilter:"input"},
+        mitarbeiter_uid: {visible: false, headerFilter:"input"},func_initialFilter
         bestellt: {align:"center", headerFilter:"input", mutator: mut_formatStringDate, tooltip: bestellt_tooltip},
         erteilt: {align:"center", headerFilter:"input", mutator: mut_formatStringDate, tooltip: erteilt_tooltip},
         akzeptiert: {align:"center", headerFilter:"input", mutator: mut_formatStringDate, tooltip: akzeptiert_tooltip},
diff --git a/public/css/Tabulator5.css b/public/css/Tabulator5.css
index 7c7c9ed57..863ae867f 100644
--- a/public/css/Tabulator5.css
+++ b/public/css/Tabulator5.css
@@ -39,6 +39,57 @@
 	z-index: 999999;
 }
 
+/* using bootstrap background classes to style the background color of tabulator rows */
+/* bg-warning */
+/* odd-rows */
+.tabulator-headers .tabulator-frozen.bg-warning,
+.tabulator-row.tabulator-row-odd .tabulator-frozen.bg-warning,
+.tabulator-row.tabulator-row-odd .tabulator-cell.bg-warning {
+	background-color: #fcf8e3;
+	
+}
+/* even-rows */
+.tabulator-headers .tabulator-frozen.bg-warning,
+.tabulator-row.tabulator-row-even .tabulator-frozen.bg-warning,
+.tabulator-row.tabulator-row-even .tabulator-cell.bg-warning {
+	background-color: #fcf8e3;
+	
+}
+
+/* bg-success */
+/* odd-rows */
+.tabulator-headers .tabulator-frozen.bg-success,
+.tabulator-row.tabulator-row-odd .tabulator-frozen.bg-success,
+.tabulator-row.tabulator-row-odd .tabulator-cell.bg-success {
+	background-color: #dff0d8;
+	
+}
+/* even-rows */
+.tabulator-headers .tabulator-frozen.bg-success,
+.tabulator-row.tabulator-row-even .tabulator-frozen.bg-success,
+.tabulator-row.tabulator-row-even .tabulator-cell.bg-success {
+	background-color: #dff0d8;
+	
+}
+
+/* bg-info */
+/* odd-rows */
+.tabulator-headers .tabulator-frozen.bg-info,
+.tabulator-row.tabulator-row-odd .tabulator-frozen.bg-info,
+.tabulator-row.tabulator-row-odd .tabulator-cell.bg-info {
+	background-color: #d9edf7;
+	
+}
+/* even-rows */
+.tabulator-headers .tabulator-frozen.bg-info,
+.tabulator-row.tabulator-row-even .tabulator-frozen.bg-info,
+.tabulator-row.tabulator-row-even .tabulator-cell.bg-info {
+	background-color: #d9edf7;
+	
+}
+
+
+
 .tabulator-cell .btn {
 	padding: 0 .5rem;
 	max-height: 22px;
diff --git a/public/js/TableWidget.js b/public/js/TableWidget.js
index 893a69c5f..e8ec539e2 100644
--- a/public/js/TableWidget.js
+++ b/public/js/TableWidget.js
@@ -931,10 +931,10 @@ function _renderTabulatorFooterHTML(tableWidgetFooterOptions){
 		tabulatorFooterHTML += 
 		`<div class="btn-toolbar" role="toolbar">
 			<div class="btn-group" role="group">
-				<button id="select-all" class="btn ${_bootstrapVersion==3?'btn-default':'btn-outline-secondary'} pull-right" type="button">
+				<button id="select-all" class="btn ${_bootstrapVersion==3?'btn-default pull-left':'btn-outline-secondary float-start'} " type="button">
 			 		${FHC_PhrasesLib.t("ui", "alleAuswaehlen")}
 				</button>
-				<button id="deselect-all" class="btn ${_bootstrapVersion==3?'btn-default':'btn-outline-secondary'} pull-right" type="button">
+				<button id="deselect-all" class="btn ${_bootstrapVersion==3?'btn-default pull-left':'btn-outline-secondary float-start'} " type="button">
 					${FHC_PhrasesLib.t("ui", "alleAbwaehlen")}
 				</button>
 				<span id="number-selected" style="margin-left: 20px; line-height: 2; font-weight: normal">
diff --git a/public/js/lehre/lehrauftrag/approveLehrauftrag.js b/public/js/lehre/lehrauftrag/approveLehrauftrag.js
index d5fd0c83d..ef11e38d2 100644
--- a/public/js/lehre/lehrauftrag/approveLehrauftrag.js
+++ b/public/js/lehre/lehrauftrag/approveLehrauftrag.js
@@ -177,10 +177,10 @@ function func_rowFormatter(row){
         {
             cell.getElement().classList.add('bg-success')                   // akzeptiert
         }
-        else
-        {
-            row.getElement().style["background-color"] = COLOR_LIGHTGREY;   // default
-        }
+        
+        // Die default Farbe wird bereits in Tabulator5.css file festgesetzt
+        // row.getElement().style["background-color"] = COLOR_LIGHTGREY;   // default
+        
     });
 }
 
@@ -225,7 +225,7 @@ function func_selectableCheck(row){
 // Adds column status
 function func_tableBuilt(table) {
     // Add status column to table
-    table.tabulator("addColumn",
+    table.addColumn(
         {
             title: "<i class='fa fa-user-o'></i>",
             field: "status",
@@ -469,8 +469,12 @@ status_tooltip = function(cell){
     }
 }
 
-// Generates bestellt tooltip
-bestellt_tooltip = function(cell){
+// Generates bestellt tooltipPhrase
+bestellt_tooltip = function(e, cell, onRendered){
+    //e - mouseover event
+    //cell - cell component
+    //onRendered - onRendered callback registration function
+    
     if (cell.getRow().getData().bestellt_von != null)
     {
         return FHC_PhrasesLib.t("ui", "bestelltVon") + cell.getRow().getData().bestellt_von;
@@ -478,14 +482,22 @@ bestellt_tooltip = function(cell){
 }
 
 // Generates erteilt tooltip
-erteilt_tooltip = function(cell){
+erteilt_tooltip = function(e, cell, onRendered){
+    //e - mouseover event
+    //cell - cell component
+    //onRendered - onRendered callback registration function
+
     if (cell.getRow().getData().erteilt_von != null) {
         return FHC_PhrasesLib.t("ui", "erteiltVon") + cell.getRow().getData().erteilt_von;
     }
 }
 
 // Generates akzeptiert tooltip
-akzeptiert_tooltip = function(cell){
+akzeptiert_tooltip = function(e, cell, onRendered){
+    //e - mouseover event
+    //cell - cell component
+    //onRendered - onRendered callback registration function
+
     if (cell.getRow().getData().akzeptiert_von != null) {
         return FHC_PhrasesLib.t("ui", "angenommenVon") + cell.getRow().getData().akzeptiert_von;
     }
@@ -498,18 +510,6 @@ $(function() {
         $('#tableWidgetTabulator').tabulator('redraw', true);
     });
 
-    // tableInit is called in the jquery_wrapper when the tableBuilt event was finished
-    $(document).on("tableInit", function(event,tabulatorInstance) {
-     
-        func_tableBuilt($("#tableWidgetTabulator"))
-        
-        // event renderStarted needs to be attached as a callback to the tableBuilt event in tabulator5
-        $("#tableWidgetTabulator").tabulator("on","renderStarted",()=>{func_renderStarted(tabulatorInstance)});
-        // event renderStarted needs to be attached as a callback to the tableBuilt event in tabulator5
-        $("#tableWidgetTabulator").tabulator("on","rowUpdated",(row)=>{func_rowUpdated(row)});
-       
-    });
-
     // Show all rows
     $("#show-all").click(function(){
         $('#tableWidgetTabulator').tabulator('clearFilter');

From 57e5626fe42be9faea4fe480af76e2034500ff69 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 21 Mar 2024 13:52:56 +0100
Subject: [PATCH 0517/1461] reset the navbar to use bootstrap3

---
 application/views/widgets/navigation.php     |   2 +-
 application/views/widgets/navigationMenu.php |   4 +-
 public/css/navbar.css                        | 122 -------------------
 3 files changed, 3 insertions(+), 125 deletions(-)
 delete mode 100644 public/css/navbar.css

diff --git a/application/views/widgets/navigation.php b/application/views/widgets/navigation.php
index b49e4ce61..efc953f5f 100644
--- a/application/views/widgets/navigation.php
+++ b/application/views/widgets/navigation.php
@@ -1,4 +1,4 @@
-<nav class="fhc-navbar fhc-navbar-default fhc-navbar-static-top" role="navigation" style="margin-bottom: 0">
+<nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0">
 	<?php
 		// Header
 		echo $this->widgetlib->widget('NavigationHeaderWidget');
diff --git a/application/views/widgets/navigationMenu.php b/application/views/widgets/navigationMenu.php
index bfc58a6a3..42dd901fb 100644
--- a/application/views/widgets/navigationMenu.php
+++ b/application/views/widgets/navigationMenu.php
@@ -1,6 +1,6 @@
-<div class="fhc-navbar-default sidebar" role="navigation">
+<div class="navbar-default sidebar" role="navigation">
 	<div class="sidebar-nav navbar-collapse">
-		<ul class="fhc-nav" id="side-menu"></ul>
+		<ul class="nav" id="side-menu"></ul>
 	</div>
 	<i id="collapseinicon" title="show Menu" class="fa fa-angle-double-right fa-fw"></i>
 </div>
diff --git a/public/css/navbar.css b/public/css/navbar.css
deleted file mode 100644
index 2d6c3cdfe..000000000
--- a/public/css/navbar.css
+++ /dev/null
@@ -1,122 +0,0 @@
-
-nav {
-    display: block;
-  }
-
-  .fhc-navbar {
-    position: relative;
-    min-height: 50px;
-    margin-bottom: 20px;
-    border: 1px solid transparent;
-      border-top-color: transparent;
-      border-top-width: 1px;
-      border-right-color: transparent;
-      border-right-width: 1px;
-      border-bottom-color: transparent;
-      border-bottom-width: 1px;
-      border-left-color: transparent;
-      border-left-width: 1px;
-  }
-
-  
-
-  @media (min-width: 768px){
-    .fhc-navbar {
-        border-radius: 4px;
-      }
-    }
-
-
-
-  .fhc-navbar-static-top {
-    z-index: 1000;
-    border-width: 0 0 1px;
-  }
-
-  @media (min-width: 768px){
-    .fhc-navbar-static-top {
-      border-radius: 0;
-    }
-    
-  }
-
-  .fhc-navbar-default {
-    background-color: #f8f8f8;
-    border-color: #e7e7e7;
-  }
-
-  @media (min-width: 768px){
-  .navbar-header {
-    float: left;
-  }
-}
-
-.fhc-navbar-default .navbar-collapse, .fhc-navbar-default .fhc-navbar-form {
-    border-color: #e7e7e7;
-  }
-
-  ol, ul {
-    margin-top: 0;
-    margin-bottom: 10px;
-  }
-
-  .fhc-nav {
-    padding-left: 0;
-    margin-bottom: 0;
-    list-style: none;
-  }
-
-  .fhc-nav > li {
-    position: relative;
-    display: block;
-  }
-
-  .fhc-nav > li > a {
-    position: relative;
-    display: block;
-    padding: 10px 15px;
-  }
-
-  .text-right {
-    text-align: right;
-  }
-
-  .dropdown-toggle::after {
-    content:none;
-  }
-
-.fhc-nav li a {
-    text-decoration: none;
-   
-}
-
-
-
-.dropdown-menu {
-    position: absolute;
-    top: 100%;
-    left: 0;
-    z-index: 1000;
-    display: none;
-    float: left;
-    min-width: 160px;
-    padding: 5px 0;
-    margin: 2px 0 0;
-    font-size: 14px;
-    text-align: left;
-    list-style: none;
-    background-color: #fff;
-    background-clip: padding-box;
-    border: 1px solid #ccc;
-    border: 1px solid rgba(0,0,0,.15);
-    border-radius: 4px;
-    -webkit-box-shadow: 0 6px 12px rgba(0,0,0,.175);
-    box-shadow: 0 6px 12px rgba(0,0,0,.175);
-  }
-
-
-  .open > .dropdown-menu {
-    display: block;
-  }
-
-

From 1a76231df0273d7a8568ab60d951e3db1e5fe3c8 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 21 Mar 2024 14:37:28 +0100
Subject: [PATCH 0518/1461] migrated orderLehrauftrag to tabulator5

---
 .../lehre/lehrauftrag/orderLehrauftrag.php    |  4 +-
 .../lehrauftrag/orderLehrauftragData.php      | 18 ++----
 public/css/Tabulator5.css                     |  4 ++
 public/css/cis_bs5.css                        | 45 +++++++++++++++
 .../lehre/lehrauftrag/approveLehrauftrag.js   |  2 +-
 .../js/lehre/lehrauftrag/orderLehrauftrag.js  | 55 +++++++++++++++----
 6 files changed, 102 insertions(+), 26 deletions(-)

diff --git a/application/views/lehre/lehrauftrag/orderLehrauftrag.php b/application/views/lehre/lehrauftrag/orderLehrauftrag.php
index f0d8e14f1..fbab8490a 100644
--- a/application/views/lehre/lehrauftrag/orderLehrauftrag.php
+++ b/application/views/lehre/lehrauftrag/orderLehrauftrag.php
@@ -9,7 +9,9 @@ $this->load->view(
         'bootstrap3' => true,
         'fontawesome4' => true,
         'sbadmintemplate3' => true,
-        'tabulator4' => true,
+        'tabulator5' => true,
+        'tabulator5JQuery' => true,
+        'cis'=> true,
         'momentjs2' => true,
         'ajaxlib' => true,
         'dialoglib' => true,
diff --git a/application/views/lehre/lehrauftrag/orderLehrauftragData.php b/application/views/lehre/lehrauftrag/orderLehrauftragData.php
index 85b663d4a..fd756ffb7 100644
--- a/application/views/lehre/lehrauftrag/orderLehrauftragData.php
+++ b/application/views/lehre/lehrauftrag/orderLehrauftragData.php
@@ -376,7 +376,6 @@ $filterWidgetArray = array(
 		layout:"fitColumns",            // fit columns to width of table
 		layoutColumnsOnNewData: true,	// ajust column widths to the data each time TableWidget is loaded
 		autoResize: false, 				// prevent auto resizing of table (false to allow adapting table size when cols are (de-)activated
-		headerFilterPlaceholder: " ",
 		groupBy:"lehrveranstaltung_id",
 		groupToggleElement:"header",    //toggle group on click anywhere in the group header
 		groupHeader: function(value, count, data, group){
@@ -390,24 +389,15 @@ $filterWidgetArray = array(
         selectableCheck: function(row){
             return func_selectableCheck(row);
         },
-        rowUpdated:function(row){
-            func_rowUpdated(row);
-        },
         rowFormatter:function(row){
             func_rowFormatter(row);
-        },
-        renderStarted:function(){
-            func_renderStarted(this);
-        },
-        tableBuilt: function(){
-            func_tableBuilt(this);
-        },
-        dataLoaded: function(data){
-            func_dataLoaded(data, this);
         },
 		tableWidgetFooter: {
 			selectButtons: true
-		}
+		},
+        columnDefaults:{
+            headerFilterPlaceholder:" ",
+        }
     }', // tabulator properties
     'datasetRepFieldsDefs' => '{
         // column status is built dynamically in funcTableBuilt()
diff --git a/public/css/Tabulator5.css b/public/css/Tabulator5.css
index 863ae867f..a60b175d8 100644
--- a/public/css/Tabulator5.css
+++ b/public/css/Tabulator5.css
@@ -88,6 +88,10 @@
 	
 }
 
+/* special bootstrap5 styling for tableWidget and their accordion-item ::after content */
+.accordion-button::after{
+	content:none !important;
+}
 
 
 .tabulator-cell .btn {
diff --git a/public/css/cis_bs5.css b/public/css/cis_bs5.css
index 48a5bfb1b..91c5aea9d 100644
--- a/public/css/cis_bs5.css
+++ b/public/css/cis_bs5.css
@@ -64,6 +64,7 @@ h6, .h6 {
 
 .tabulator {
 	font-size: var(--bs-body-font-size);
+	
 }
 
 .fhc-container .tabulator {
@@ -93,6 +94,50 @@ h6, .h6 {
 	background-color: #ececec;
 }
 
+
+/* using bootstrap background classes to style the background color of tabulator rows */
+/* bg-warning */
+/* odd-rows */
+.fhc-container .tabulator .tabulator-row.tabulator-row-odd .tabulator-frozen.bg-warning,
+.fhc-container .tabulator .tabulator-row.tabulator-row-odd .tabulator-cell.bg-warning {
+	background-color: #fcf8e3;
+	
+}
+/* even-rows */
+.fhc-container .tabulator .tabulator-row.tabulator-row-even .tabulator-frozen.bg-warning,
+.fhc-container .tabulator .tabulator-row.tabulator-row-even .tabulator-cell.bg-warning {
+	background-color: #fcf8e3;
+	
+}
+
+/* bg-success */
+/* odd-rows */
+.fhc-container .tabulator .tabulator-row.tabulator-row-odd .tabulator-frozen.bg-success,
+.fhc-container .tabulator .tabulator-row.tabulator-row-odd .tabulator-cell.bg-success {
+	background-color: #dff0d8;
+	
+}
+/* even-rows */
+.fhc-container .tabulator .tabulator-row.tabulator-row-even .tabulator-frozen.bg-success,
+.fhc-container .tabulator .tabulator-row.tabulator-row-even .tabulator-cell.bg-success {
+	background-color: #dff0d8;
+	
+}
+
+/* bg-info */
+/* odd-rows */
+.fhc-container .tabulator .tabulator-row.tabulator-row-odd .tabulator-frozen.bg-info,
+.fhc-container .tabulator .tabulator-row.tabulator-row-odd .tabulator-cell.bg-info {
+	background-color: #d9edf7;
+	
+}
+/* even-rows */
+.fhc-container .tabulator .tabulator-row.tabulator-row-even .tabulator-frozen.bg-info,
+.fhc-container .tabulator .tabulator-row.tabulator-row-even .tabulator-cell.bg-info {
+	background-color: #d9edf7;
+	
+}
+
 .fhc-container .tabulator .tabulator-col,
 .fhc-container .tabulator .tabulator-cell {
 	border-right: 1px solid #dee2e6;
diff --git a/public/js/lehre/lehrauftrag/approveLehrauftrag.js b/public/js/lehre/lehrauftrag/approveLehrauftrag.js
index ef11e38d2..f40742617 100644
--- a/public/js/lehre/lehrauftrag/approveLehrauftrag.js
+++ b/public/js/lehre/lehrauftrag/approveLehrauftrag.js
@@ -178,7 +178,7 @@ function func_rowFormatter(row){
             cell.getElement().classList.add('bg-success')                   // akzeptiert
         }
         
-        // Die default Farbe wird bereits in Tabulator5.css file festgesetzt
+        // default color is already set in the Tabulator5.css file that gets loaded the Header flag tabulator5
         // row.getElement().style["background-color"] = COLOR_LIGHTGREY;   // default
         
     });
diff --git a/public/js/lehre/lehrauftrag/orderLehrauftrag.js b/public/js/lehre/lehrauftrag/orderLehrauftrag.js
index 06db3ce60..e1be95d7f 100644
--- a/public/js/lehre/lehrauftrag/orderLehrauftrag.js
+++ b/public/js/lehre/lehrauftrag/orderLehrauftrag.js
@@ -48,7 +48,11 @@ var mut_formatStringDate = function(value, data, type, params, component) {
 // -----------------------------------------------------------------------------------------------------------------
 
 // Formats null values to a string number '0.00'
-var form_formatNulltoStringNumber = function(cell, formatterParams){
+var form_formatNulltoStringNumber = function(cell, formatterParams, onRendered){
+    //cell - the cell component
+    //formatterParams - parameters set for the column
+    //onRendered - function to call when the formatter has been rendered
+
 	if (cell.getValue() == null){
 		if (formatterParams.precision == 1)
 		{
@@ -195,10 +199,10 @@ function func_rowFormatter(row){
 		{
 			cell.getElement().classList.add('bg-success')					   // akzeptiert
 		}
-		else
-		{
-			row.getElement().style["background-color"] = COLOR_LIGHTGREY;	   // default
-		}
+		
+		// default color is already set in the Tabulator5.css file that gets loaded the Header flag tabulator5
+        // row.getElement().style["background-color"] = COLOR_LIGHTGREY;   // default
+        
 	});
 }
 
@@ -246,7 +250,7 @@ function func_selectableCheck(row){
 // Adds column status
 function func_tableBuilt(table) {
 	// Add status column to table
-	table.addColumn(
+	table.tabulator("addColumn",
 		{
 			title: "<i class='fa fa-user-o'></i>",
 			field: "status",
@@ -437,7 +441,10 @@ status_formatter = function(cell, formatterParams, onRendered){
 };
 
 // Generates status tooltip
-status_tooltip = function(cell){
+status_tooltip = function(e, cell, onRendered){
+	//e - mouseover event
+	//cell - cell component
+	//onRendered - onRendered callback registration function
 
 	var is_dummy = (cell.getRow().getData().personalnummer <= 0 && cell.getRow().getData().personalnummer != null);
 	var is_mitarbeiter = cell.getRow().getData().mitarbeiter_uid != null;
@@ -523,7 +530,11 @@ status_tooltip = function(cell){
 }
 
 // Generates bestellt tooltip
-bestellt_tooltip = function(cell){
+bestellt_tooltip = function(e, cell, onRendered){
+	//e - mouseover event
+	//cell - cell component
+	//onRendered - onRendered callback registration function
+
 	if (cell.getRow().getData().bestellt_von != null)
 	{
 		return FHC_PhrasesLib.t("ui", "bestelltVon") + cell.getRow().getData().bestellt_von;
@@ -531,14 +542,22 @@ bestellt_tooltip = function(cell){
 }
 
 // Generates erteilt tooltip
-erteilt_tooltip = function(cell){
+erteilt_tooltip = function(e, cell, onRendered){
+	//e - mouseover event
+	//cell - cell component
+	//onRendered - onRendered callback registration function
+
 	if (cell.getRow().getData().erteilt_von != null) {
 		return FHC_PhrasesLib.t("ui", "erteiltVon") + cell.getRow().getData().erteilt_von;
 	}
 }
 
 // Generates akzeptiert tooltip
-akzeptiert_tooltip = function(cell){
+akzeptiert_tooltip = function(e, cell, onRendered){
+	//e - mouseover event
+	//cell - cell component
+	//onRendered - onRendered callback registration function
+
 	if (cell.getRow().getData().akzeptiert_von != null) {
 		return FHC_PhrasesLib.t("ui", "angenommenVon") + cell.getRow().getData().akzeptiert_von;
 	}
@@ -546,6 +565,22 @@ akzeptiert_tooltip = function(cell){
 
 $(function() {
 
+	// tableInit is called in the jquery_wrapper when the tableBuilt event was finished
+    $(document).on("tableInit", function(event,tabulatorInstance) {
+     
+        func_tableBuilt($("#tableWidgetTabulator"))
+        
+        // event rowUpdated needs to be attached as a callback to the tableBuilt event in tabulator5
+        $("#tableWidgetTabulator").tabulator("on","rowUpdated",(row)=>{func_rowUpdated(row)});
+       
+		// event renderStarted needs to be attached as a callback to the tableBuilt event in tabulator5
+        $("#tableWidgetTabulator").tabulator("on","renderStarted",()=>{func_renderStarted(tabulatorInstance)});
+		
+		// event dataLoaded needs to be attached as a callback to the tableBuilt event in tabulator5
+        $("#tableWidgetTabulator").tabulator("on","dataLoaded",(data)=>{func_dataLoaded(data,tabulatorInstance)});
+		
+    });
+
 	// Redraw table on resize to fit tabulators height to windows height
 	window.addEventListener('resize', function(){
 		$('#tableWidgetTabulator').tabulator('setHeight', $(window).height() * 0.50);

From 72b19987bdd65a110c2a8f87c7689d2160a69880 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 21 Mar 2024 14:46:03 +0100
Subject: [PATCH 0519/1461] removes unnecessary debugging prints

---
 public/js/TableWidget.js                      |  5 ++-
 .../anrechnung/approveAnrechnungUebersicht.js |  1 -
 public/js/tabulator/jquery_wrapper.js         | 32 +++++++------------
 3 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/public/js/TableWidget.js b/public/js/TableWidget.js
index e8ec539e2..57a03e665 100644
--- a/public/js/TableWidget.js
+++ b/public/js/TableWidget.js
@@ -628,7 +628,6 @@ var FHC_TableWidget = {
  		 */
 		if (typeof options.tableWidgetFooter != 'undefined' && options.tableWidgetFooter != null)
 		{
-			console.log("this are the options i am intereseted in:",options)
 			var tabulatorFooterHTML = _renderTabulatorFooterHTML(options.tableWidgetFooter);
 			tableWidgetDiv.find('#tableWidgetFooter').append(tabulatorFooterHTML);
 		}
@@ -706,7 +705,7 @@ var FHC_TableWidget = {
 	_getRepresentationOptions: function(data) {
 
 		var options = {}; // eventually contains options fot the representation
-		console.log("here is the data before it was parsed",data.datasetRepresentationOptions)
+		
 		// Checks if options were given
 		if (data.hasOwnProperty("datasetRepresentationOptions") && data.datasetRepresentationOptions != "")
 		{
@@ -924,7 +923,7 @@ function _renderTabulatorHeaderCollapseHTML(tableWidgetDiv,arrayTabulatorColumns
 function _renderTabulatorFooterHTML(tableWidgetFooterOptions){
 
 	var tabulatorFooterHTML = '';
-	console.log("footer options",tableWidgetFooterOptions)
+
 	// If property selectButtons is true, render 'Alle auswaehlen / Alle abwaehlen' buttons
 	if (typeof tableWidgetFooterOptions.selectButtons != 'undefined' && tableWidgetFooterOptions.selectButtons == true)
 	{
diff --git a/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js b/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
index 371268c1e..c56cd403b 100644
--- a/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
+++ b/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
@@ -167,7 +167,6 @@ function func_rowFormatter(row){
 
 // Formats row selectable/unselectable
 function func_selectableCheck(row){
-    console.log("entered here in selectable check")
     let status_kurzbz = row.getData().status_kurzbz;
 
     return (
diff --git a/public/js/tabulator/jquery_wrapper.js b/public/js/tabulator/jquery_wrapper.js
index 041829d04..e5ef2e088 100644
--- a/public/js/tabulator/jquery_wrapper.js
+++ b/public/js/tabulator/jquery_wrapper.js
@@ -38,27 +38,17 @@
 			this.table = new Tabulator(this.element[0], options);
 			window.table = this.table;
 
-                        console.log(this.table);
-                        props = Object.getOwnPropertyNames(Object.getPrototypeOf(Object.getPrototypeOf(this.table)));
-                        props = props.concat(Object.getOwnPropertyNames(this.table));
-                        console.log(props);
-
-                        const that = this;
-                        this.table.on("tableBuilt", function(){
-                          console.log('bhbuilt begin');
-                          console.log(this);
-                          props = Object.getOwnPropertyNames(Object.getPrototypeOf(Object.getPrototypeOf(this)));
-                          props = props.concat(Object.getOwnPropertyNames(this));
-                          for(let key of props){
-                                  if( key === 'download' ) console.log('download: ' + typeof this[key]);
-                                  if(typeof this[key] === "function" && key.charAt(0) !== "_"){
-                                          that[key] = this[key].bind(this);
-                                  }
-                          }
-                          console.log(props);
-                          console.log('bhbuilt end');
-						  $(document).trigger("tableInit",[this]);
-                        });
+			const that = this;
+   			this.table.on("tableBuilt", function(){
+      			props = Object.getOwnPropertyNames(Object.getPrototypeOf(Object.getPrototypeOf(this)));
+         		props = props.concat(Object.getOwnPropertyNames(this));
+           		for(let key of props){
+					if(typeof this[key] === "function" && key.charAt(0) !== "_"){
+     					that[key] = this[key].bind(this);
+					}
+     			}
+				$(document).trigger("tableInit",[this]);
+    		});
 
 			//retrieve properties on prototype
 			props = Object.getOwnPropertyNames(Object.getPrototypeOf(Object.getPrototypeOf(this.table)));

From 7dec1178e4429b7de3a960dd045ec98aa25592d0 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 21 Mar 2024 14:51:04 +0100
Subject: [PATCH 0520/1461] changes the parameter list of the tooltip function
 in tabulator 5 for approveAnrechnungUebersicht and reviewAnrechungUebersicht

---
 public/js/lehre/anrechnung/approveAnrechnungUebersicht.js | 6 +++++-
 public/js/lehre/anrechnung/reviewAnrechnungUebersicht.js  | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js b/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
index c56cd403b..123049ed7 100644
--- a/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
+++ b/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
@@ -203,7 +203,11 @@ function func_rowSelectionChanged(data, rows, tabulatorInstance){
 }
 
 // Returns tooltip
-function func_tooltips(cell) {
+function func_tooltips(e, cell, onRendered){
+    //e - mouseover event
+    //cell - cell component
+    //onRendered - onRendered callback registration function
+    
     console.log("TOOLTIP DEBUG",cell);
     // Return tooltip if row is unselectable
     if (true || !func_selectableCheck(cell.getRow())){
diff --git a/public/js/lehre/anrechnung/reviewAnrechnungUebersicht.js b/public/js/lehre/anrechnung/reviewAnrechnungUebersicht.js
index 7ae03d875..ff6ae5839 100644
--- a/public/js/lehre/anrechnung/reviewAnrechnungUebersicht.js
+++ b/public/js/lehre/anrechnung/reviewAnrechnungUebersicht.js
@@ -115,7 +115,11 @@ function func_rowUpdated(row){
 }
 
 // Returns tooltip
-function func_tooltips(cell) {
+function func_tooltips(e, cell, onRendered){
+    //e - mouseover event
+    //cell - cell component
+    //onRendered - onRendered callback registration functionfunction
+    
     // Return tooltip if row is unselectable
     if (!func_selectableCheck(cell.getRow())){
         return FHC_PhrasesLib.t("ui", "nichtSelektierbarAufgrundVon") + 'Status';

From 9038910303ea0af3827ee98dce7b5ee8212a12d4 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 22 Mar 2024 10:36:57 +0100
Subject: [PATCH 0521/1461] phrases

---
 .../controllers/components/stv/Prestudent.php |   5 +-
 .../Studentenverwaltung/Details/Prestudent.js |  92 +--
 .../Details/Prestudent/History.js             |  11 +
 .../Details/Prestudent/Status.js              | 131 ++--
 system/phrasesupdate.php                      | 727 +++++++++++++++---
 5 files changed, 751 insertions(+), 215 deletions(-)

diff --git a/application/controllers/components/stv/Prestudent.php b/application/controllers/components/stv/Prestudent.php
index 7cc6bc768..3b71ff73e 100644
--- a/application/controllers/components/stv/Prestudent.php
+++ b/application/controllers/components/stv/Prestudent.php
@@ -136,6 +136,7 @@ class Prestudent extends FHC_Controller
 		$update_prestudent['updateamum'] = date('c');
 		$update_prestudent['updatevon'] = $uid;
 
+		//utf8-decode for special chars (eg tag der offenen Tür, FH-Führer)
 		function utf8_decode_if_string($value) {
 			if (is_string($value)) {
 				return utf8_decode($value);
@@ -145,9 +146,7 @@ class Prestudent extends FHC_Controller
 		}
 		$update_prestudent_encoded = array_map('utf8_decode_if_string', $update_prestudent);
 
-		//utf8-decode for special chars (eg tag der offenen Tür, FH-Führer)
-		//$update_prestudent_encoded = array_map('utf8_decode', $update_prestudent);
-		var_dump($update_prestudent_encoded);
+
 		if (count($update_prestudent) && $prestudent_id === null) {
 			$this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST);
 			// TODO(manu): phrase
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
index c56ef4286..008e581fa 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
@@ -28,10 +28,6 @@ export default {
 			from: 'hasPrestudentPermission',
 			default: false
 		},
-/*		hasPermissionToSkipStatusCheck: {
-			from: 'hasPermissionToSkipStatusCheck',
-			default: false
-		},*/
 		hasAssistenzPermission: {
 			from: 'hasAssistenzPermission',
 			default: false
@@ -126,29 +122,9 @@ export default {
 						window.scrollTo(0, 0);
 					});
 		},
-/* //besser im watch teil, dann wird Änderung immer verfolgt
-detectChanges() {
-			const delta = {};
-			for (const key in this.data) {
-				if (this.data[key] !== this.initialFormData[key]) {
-					delta[key] = this.data[key];
-					this.actionUpdate = true;
-				}
-			}
-			this.deltaArray.push(delta);
-		},*/
 	},
 	created() {
 		this.loadPrestudent();
-/*		CoreRESTClient
-			.get('components/stv/Prestudent/getHistoryPrestudents/'+ this.modelValue.person_id)
-			.then(result => CoreRESTClient.getData(result.data) || [])
-			.then(result => {
-				this.historyPrestudents = result;
-			})
-			.catch(this.$fhcAlert.handleSystemError);*/
-		//initiale Daten nach dem Laden
-		//this.initialFormData = {...this.data};
 		CoreRESTClient
 			.get('components/stv/Prestudent/getBezeichnungZGV')
 			.then(result => CoreRESTClient.getData(result.data) || [])
@@ -206,7 +182,6 @@ detectChanges() {
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 	},
-	mounted(){},
 	template: `
 	<div class="stv-details-details h-100 pb-3">
 <!--	TEST: {{modelValue}} -->
@@ -215,7 +190,7 @@ detectChanges() {
 			<button type="submit" class="btn btn-primary position-absolute top-0 end-0" :disabled="!deltaLength">Speichern</button>
 		</div>
 			<fieldset class="overflow-hidden">
-				<legend>Zugangsvoraussetzungen für {{modelValue.nachname}} {{modelValue.vorname}}</legend>
+				<legend>{{$p.t('lehre', 'title_zgv')}} {{modelValue.nachname}} {{modelValue.vorname}}</legend>
 
 						<div class="row mb-3">
 							<form-input
@@ -249,7 +224,7 @@ detectChanges() {
 							</form-input>
 							<form-input
 								container-class="col-3"
-								label="ZGV Ort"
+								:label="$p.t('infocenter', 'zgvOrt')"
 								type="text"
 								v-model="data.zgvort"
 								name="zgvort"
@@ -257,7 +232,7 @@ detectChanges() {
 							</form-input>
 							<form-input
 								container-class="col-3"
-								label="ZGV Datum"
+								:label="$p.t('infocenter', 'zgvDatum')"
 								type="DatePicker"
 								v-model="data.zgvdatum"
 								name="zgvdatum"
@@ -271,7 +246,7 @@ detectChanges() {
 							</form-input>
 							<form-input
 								container-class="col-3"
-								label="ZGV Nation"
+								:label="$p.t('infocenter', 'zgvNation')"
 								type="select"
 								v-model="data.zgvnation"
 								name="zgvnation"
@@ -283,7 +258,7 @@ detectChanges() {
 						<div class="row mb-3">
 							<form-input
 								container-class="col-3"
-								label="ZGV Master"
+								:label="$p.t('lehre', 'zgvMaster')"
 								type="select"
 								v-model="data.zgvmas_code"
 								name="zgvmascode"
@@ -292,7 +267,7 @@ detectChanges() {
 							</form-input>
 							<form-input
 								container-class="col-3"
-								label="ZGV Master Ort"
+								:label="$p.t('lehre', 'zgvMasterOrt')"
 								type="text"
 								v-model="data.zgvmaort"
 								name="zgvmaort"
@@ -300,7 +275,7 @@ detectChanges() {
 							</form-input>
 							<form-input
 								container-class="col-3"
-								label="ZGV Master Datum"
+								:label="$p.t('lehre', 'zgvMasterDatum')"
 								type="DatePicker"
 								v-model="data.zgvmadatum"
 								name="zgvmadatum"
@@ -314,7 +289,7 @@ detectChanges() {
 							</form-input>
 							<form-input
 								container-class="col-3"
-								label="ZGV Master Nation"
+								:label="$p.t('lehre', 'zgvMasterNation')"
 								type="select"
 								v-model="data.zgvmanation"
 								name="zgvmanation"
@@ -327,7 +302,7 @@ detectChanges() {
 						<div v-if="showZgvDoktor" class="row mb-3">
 							<form-input
 								container-class="col-3"
-								label="ZGV Doktor"
+								:label="$p.t('lehre', 'zgvDoktor')"
 								type="select"
 								v-model="data.zgvdoktor_code"
 								name="zgvdoktor_code"
@@ -336,7 +311,7 @@ detectChanges() {
 							</form-input>
 							<form-input
 								container-class="col-3"
-								label="ZGV Doktor Ort"
+								:label="$p.t('lehre', 'zgvDoktorOrt')"
 								type="text"
 								v-model="data.zgvdoktorort"
 								name="zgvdoktorort"
@@ -344,7 +319,7 @@ detectChanges() {
 							</form-input>
 							<form-input
 								container-class="col-3"
-								label="ZGV Doktor Datum"
+								:label="$p.t('lehre', 'zgvDoktorDatum')"
 								type="DatePicker"
 								v-model="data.zgvdoktordatum"
 								name="zgvdoktordatum"
@@ -358,7 +333,7 @@ detectChanges() {
 							</form-input>
 							<form-input
 								container-class="col-3"
-								label="ZGV Doktor Nation"
+								:label="$p.t('lehre', 'zgvDoktorNation')"
 								type="select"
 								v-model="data.zgvdoktornation"
 								name="zgvdoktornation"
@@ -372,7 +347,7 @@ detectChanges() {
 							<div class="col-3 pt-4 d-flex align-items-center">
 								<form-input
 									container-class="form-check"
-									label="ZGV erfüllt"
+									:label="$p.t('infocenter', 'zgvErfuellt')"
 									type="checkbox"
 									v-model="data.zgv_erfuellt"
 									name="zgv_erfuellt"
@@ -382,7 +357,7 @@ detectChanges() {
 							<div class="col-3 pt-4 d-flex align-items-center">
 								<form-input
 									container-class="form-check"
-									label="ZGV Master erfüllt"
+									:label="$p.t('infocenter', 'zgvMasterErfuellt')"
 									type="checkbox"
 									v-model="data.zgvmas_erfuellt"
 									name="zgvmas_erfuellt"
@@ -392,7 +367,7 @@ detectChanges() {
 							<div v-if="showZgvDoktor" class="col-3 pt-4 d-flex align-items-center">
 								<form-input
 									container-class="form-check"
-									label="ZGV Doktor erfüllt"
+									:label="$p.t('infocenter', 'zgvDoktorErfuellt')"
 									type="checkbox"
 									v-model="data.zgvdoktor_erfuellt"
 									name="zgvdoktor_erfuellt"
@@ -411,7 +386,7 @@ detectChanges() {
 					<div class="row mb-3">
 						<form-input
 							container-class="col-4"
-							label="Aufmerksam durch"
+							:label="$p.t('person', 'aufmerksamDurch')"
 							type="select"
 							v-model="data.aufmerksamdurch_kurzbz"
 							name="aufmerksamDurch"
@@ -420,7 +395,7 @@ detectChanges() {
 						</form-input>
 						<form-input
 							container-class="col-4"
-							label="Berufstätigkeit"
+							:label="$p.t('person', 'berufstaetigkeit')"
 							type="select"
 							v-model="data.berufstaetigkeit_code"
 							name="berufstaetigkeit_code"
@@ -429,7 +404,7 @@ detectChanges() {
 						</form-input>
 						<form-input
 							container-class="col-4"
-							label="Ausbildung"
+							:label="$p.t('person', 'ausbildung')"
 							type="select"
 							v-model="data.ausbildungcode"
 							name="ausbildungcode"
@@ -452,7 +427,7 @@ detectChanges() {
 						<div class="col-4 pt-4 d-flex align-items-center">
 							<form-input
 								container-class="form-check"
-								label="Facheinschlägig berufstätig"
+								:label="$p.t('person', 'facheinschlaegigBerufstaetig')"
 								type="checkbox"
 								v-model="data.facheinschlberuf"
 								name="facheinschlberuf"
@@ -463,7 +438,7 @@ detectChanges() {
 						<!--Todo(manu) validierung Integer, liste hier null-->
 						<form-input
 							container-class="col-4"
-							label="Bisstandort"
+							:label="$p.t('person', 'bisstandort')"
 							type="text"
 							v-model="data.standort_code"
 							name="standort_code"
@@ -476,7 +451,7 @@ detectChanges() {
 					<div class="row mb-3">
 						<form-input
 							container-class="col-4"
-							label="Studiengang"
+							:label="$p.t('lehre', 'studiengang')"
 							type="select"
 							v-model="data.studiengang_kz"
 							name="studiengang_kz"
@@ -486,7 +461,7 @@ detectChanges() {
 						</form-input>
 						<form-input
 							container-class="col-4"
-							label="Studientyp"
+							:label="$p.t('lehre', 'studientyp')"
 							type="select"
 							v-model="data.gsstudientyp_kurzbz"
 							name="gsstudientyp_kurzbz"
@@ -498,7 +473,7 @@ detectChanges() {
 					<div class="row mb-3">
 						<form-input
 							container-class="col-4"
-							label="Anmerkung"
+							:label="$p.t('global', 'anmerkung')"
 							type="text"
 							v-model="data.anmerkung"
 							name="anmerkung"
@@ -507,7 +482,7 @@ detectChanges() {
 						<div class="col-2 pt-4 d-flex align-items-center">
 							<form-input
 								container-class="form-check"
-								label="Bismelden"
+								:label="$p.t('person', 'bismelden')"
 								type="checkbox"
 								v-model="data.bismelden"
 								name="bismelden"
@@ -517,7 +492,7 @@ detectChanges() {
 						<div class="col-2 pt-4 d-flex align-items-center">
 							<form-input
 								container-class="form-check"
-								label="Duales Studium"
+								:label="$p.t('lehre', 'dual')"
 								type="checkbox"
 								v-model="data.dual"
 								name="dual"
@@ -526,7 +501,7 @@ detectChanges() {
 						</div>
 						<form-input
 							container-class="col-3"
-							label="förderrelevant"
+							:label="$p.t('lehre', 'foerderrelevant')"
 							type="select"
 							v-model="data.foerderrelevant"
 							name="foerderrelevant"
@@ -536,7 +511,7 @@ detectChanges() {
 						
 						<form-input
 							container-class="col-1"
-							label="Priorität"
+							:label="$p.t('lehre', 'prioritaet')"
 							type="text"
 							v-model="data.priorisierung"
 							name="priorisierung"
@@ -544,16 +519,11 @@ detectChanges() {
 							>
 						</form-input>
 						</div>
-					</div>
-									
-			</fieldset>
-		
+					</fieldset>
+										
 		</form-form>
-		
-		<br>
-
-					
-		<div class="col-6 pb-3">
+		<br>				
+		<div class="col-8">
 			<legend>Gesamthistorie</legend>
 			<TblHistory :person_id="modelValue.person_id"></TblHistory>		
 		</div>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
index fd280fd5a..78c004538 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
@@ -29,6 +29,17 @@ export default{
 			},
 		}
 	},
+	async mounted(){
+		await this.$p.loadCategory(['lehre']);
+
+		cm.getColumnByField('orgform_kurzbz').component.updateDefinition({
+			title: this.$p.t('lehre', 'Organisationsform')
+		});
+
+		cm.getColumnByField('bezeichnung').component.updateDefinition({
+			title: this.$p.t('lehre', 'studienplan')
+		});
+	},
 	template: `
 		<div class="stv-list h-100 pt-3">
 			<core-filter-cmpt
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
index b2b3eeda3..6a800e4c9 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
@@ -466,45 +466,67 @@ export default{
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 	},
+	async mounted(){
+		await this.$p.loadCategory(['lehre','global','person']);
+
+		let cm = this.$refs.table.tabulator.columnManager;
+
+/*		cm.getColumnByField('lehrverband').component.updateDefinition({
+			title: this.$p.t('lehre', 'lehrverband')
+		});*/
+
+		cm.getColumnByField('format_bestaetigtam').component.updateDefinition({
+			title: this.$p.t('lehre', 'bestaetigt_am')
+		});
+
+		cm.getColumnByField('format_bewerbung_abgeschicktamum').component.updateDefinition({
+			title: this.$p.t('lehre', 'bewerbung_abgeschickt_am')
+		});
+
+		cm.getColumnByField('bezeichnung').component.updateDefinition({
+			title: this.$p.t('lehre', 'studienplan')
+		});
+
+		cm.getColumnByField('actions').component.updateDefinition({
+			title: this.$p.t('global', 'aktionen')
+		});
+
+		cm.getColumnByField('format_datum').component.updateDefinition({
+			title: this.$p.t('global', 'datum')
+		});
+
+		cm.getColumnByField('anmerkung').component.updateDefinition({
+			title: this.$p.t('global', 'anmerkung')
+		});
+
+/*		cm.getColumnByField('format_bestaetigtam').component.updateDefinition({
+			title: this.$p.t('lehre', 'bestaetigt_am')
+		});*/
+
+		cm.getColumnByField('bestaetigtvon').component.updateDefinition({
+			title: this.$p.t('lehre', 'bestaetigt_von')
+		});
+
+		cm.getColumnByField('format_insertamum').component.updateDefinition({
+			title: this.$p.t('lehre', 'insert_am')
+		});
+
+		cm.getColumnByField('insertvon').component.updateDefinition({
+			title: this.$p.t('lehre', 'insert_von')
+		});
+	},
 	template: `
 		<div class="stv-list h-100 pt-3">
 		
-		
-<!--		<p>TestData</p>
-		
-		{{hasPermissionCurrentStg}}
-		<hr>
-
-		
-<!--		isLastStatus: {{isLastStatus}}
-		<br>
-
-		Bismeldestichtag
-		{{dataMeldestichtag }}-->
-		
-<!--		{{arrayStg}}-->
-
-		
-<!--		Berechtigungen:
-			Skip Check: {{hasPermissionToSkipStatusCheck}} |
-			Admin: {{hasAdminPermission}} |
-			Studiengaenge:  |
-			Schreibrecht ASS: {{hasSchreibrechtAss}} ||
-			Basis Prestudent: {{hasPrestudentPermission}} ||
-			Recht für Studiengang {{studiengang_kz}} : {{hasPermissionCurrentStg}}-->
-		
-		<hr>
-<!--		<p>{{hasAssistenzPermissionForStgs}}</p>	
-		{{this.hasAssistenzPermissionForStgs.includes("476")}}-->
-		
+				
 			<!--Modal: Add New Status-->
 			<BsModal ref="newStatusModal">
-				<template #title>Neuen Status hinzufügen</template>
+				<template #title>{{$p.t('lehre', 'status_new')}}</template>
 							
 					<form-form class="row g-3" ref="statusData">
 					
 						<div class="row mb-3">
-							<label for="status_kurzbz" class="form-label col-sm-4">Rolle</label>
+							<label for="status_kurzbz" class="form-label col-sm-4">{{$p.t('lehre', 'status_rolle')}}</label>
 							<div class="col-sm-6">
 <!--								<form-input type="text" :readonly="readonly" class="form-control" id="status_kurzbz" v-model="statusData['status_kurzbz']">-->
 								<form-input
@@ -526,7 +548,7 @@ export default{
 							</div>
 						</div>
 						<div class="row mb-3">									   
-							<label for="studiensemester_kurzbz" class="form-label col-sm-4">Studiensemester</label>
+							<label for="studiensemester_kurzbz" class="form-label col-sm-4">{{$p.t('lehre', 'studiensemester')}}</label>
 							<div class="col-sm-6">
 								<form-input 
 									:readonly="readonly" 
@@ -540,7 +562,7 @@ export default{
 						</div>
 						<!-- TODO(manu) if(defined('VORRUECKUNG_STATUS_MAX_SEMESTER') && VORRUECKUNG_STATUS_MAX_SEMESTER==false) 100 Semester-->
 						<div class="row mb-3">
-							<label for="ausbildungssemester" class="form-label col-sm-4">Ausbildungssemester</label>
+							<label for="ausbildungssemester" class="form-label col-sm-4">{{$p.t('lehre', 'ausbildungssemester')}}</label>
 							<div class="col-sm-6">
 								<form-input 
 									type="select" 
@@ -554,7 +576,7 @@ export default{
 						</div>
 						
 						<div class="row mb-3">
-							<label for="datum" class="form-label col-sm-4">Datum</label>
+							<label for="datum" class="form-label col-sm-4">{{$p.t('global', 'datum')}}</label>
 							<div class="col-sm-6">
 								<form-input 
 									type="DatePicker" 
@@ -570,7 +592,7 @@ export default{
 							</div>
 						</div>
 						<div class="row mb-3">									   
-							<label for="bestaetigtam" class="form-label col-sm-4">Bestätigt am</label>
+							<label for="bestaetigtam" class="form-label col-sm-4">{{$p.t('lehre', 'bestaetigt_am')}}</label>
 							<div class="col-sm-6">
 								<form-input 
 									type="DatePicker" 
@@ -586,7 +608,7 @@ export default{
 							</div>
 						</div>
 						<div class="row mb-3">
-							<label for="bewerbung_abgeschicktamum" class="form-label col-sm-4">Bewerbung abgeschickt am</label>
+							<label for="bewerbung_abgeschicktamum" class="form-label col-sm-4">{{$p.t('lehre', 'bewerbung_abgeschickt_am')}}</label>
 							<div class="col-sm-6">
 								<form-input 
 									type="DatePicker" 
@@ -602,7 +624,7 @@ export default{
 							</div>
 						</div>
 						<div class="row mb-3">
-							<label for="bezeichnung" class="form-label col-sm-4">Studienplan</label>
+							<label for="bezeichnung" class="form-label col-sm-4">{{$p.t('lehre', 'studienplan')}}</label>
 							<div class="col-sm-6">
 								<form-input 
 									:readonly="readonly" 
@@ -615,7 +637,7 @@ export default{
 							</div>
 						</div>
 						<div class="row mb-3">
-							<label for="anmerkung" class="form-label col-sm-4">Anmerkung</label>
+							<label for="anmerkung" class="form-label col-sm-4">{{$p.t('global', 'anmerkung')}}</label>
 							<div class="col-sm-6">
 								<form-input 
 									type="text"
@@ -627,7 +649,7 @@ export default{
 						</div>
 						
 						<div class="row mb-3">									   
-							<label for="aufnahmestufe" class="form-label col-sm-4">Aufnahmestufe</label>
+							<label for="aufnahmestufe" class="form-label col-sm-4">{{$p.t('lehre', 'aufnahmestufe')}}</label>
 							<div class="col-sm-6">
 								<form-input 
 								type="select" 
@@ -641,7 +663,7 @@ export default{
 						</div>
 										
 						<div v-if="gruende.length > 0" class="row mb-3">
-							<label for="grund" class="form-label col-sm-4">Grund</label>
+							<label for="grund" class="form-label col-sm-4">{{$p.t('studierendenantrag', 'antrag_grund')}}</label>
 							<div class="col-sm-6">
 								<form-input 
 									type="select" 
@@ -664,17 +686,17 @@ export default{
 			
 			<!--Modal: Edit Status-->
 			<BsModal ref="editStatusModal">
-				<template #title>Status bearbeiten</template>
+				<template #title>{{$p.t('lehre', 'status_edit')}}</template>
 					<form-form class="row g-3" ref="statusData">
 					
 					<div v-if="statusData.datum < dataMeldestichtag ">
-						<b>Meldestichtag erreicht - Bearbeiten nicht mehr möglich</b>
+						<b>{{$p.t('bismeldestichtag', 'meldestichtag_erreicht')}}</b>
 					</div>
 					
 					 <input type="hidden" id="statusId" name="statusId" value="statusData.statusId">
 					
 						<div class="row mb-3">
-							<label for="status_kurzbz" class="form-label col-sm-4">Rolle</label>
+							<label for="status_kurzbz" class="form-label col-sm-4">{{$p.t('lehre', 'status_rolle')}}</label>
 							<div class="col-sm-6">
 <!--								<form-input type="text" :readonly="readonly" class="form-control" id="status_kurzbz" v-model="statusData['status_kurzbz']">-->
 								<form-input
@@ -697,7 +719,7 @@ export default{
 							</div>
 						</div>
 						<div class="row mb-3">									   
-							<label for="studiensemester_kurzbz" class="form-label col-sm-4">Studiensemester</label>
+							<label for="studiensemester_kurzbz" class="form-label col-sm-4">{{$p.t('lehre', 'studiensemester')}}</label>
 							<div class="col-sm-6">
 								<form-input 
 									:readonly="readonly" 
@@ -711,7 +733,7 @@ export default{
 						</div>
 						<!-- TODO(manu) if(defined('VORRUECKUNG_STATUS_MAX_SEMESTER') && VORRUECKUNG_STATUS_MAX_SEMESTER==false)-->
 						<div class="row mb-3">
-							<label for="ausbildungssemester" class="form-label col-sm-4">Ausbildungssemester</label>
+							<label for="ausbildungssemester" class="form-label col-sm-4">{{$p.t('lehre', 'ausbildungssemester')}}</label>
 							<div class="col-sm-6">
 								<form-input 
 									type="select" 
@@ -725,7 +747,7 @@ export default{
 						</div>
 						
 						<div class="row mb-3">
-							<label for="datum" class="form-label col-sm-4">Datum</label>
+							<label for="datum" class="form-label col-sm-4">{{$p.t('global', 'datum')}}</label>
 							<div class="col-sm-6">
 								<form-input 
 									type="DatePicker" 
@@ -741,7 +763,7 @@ export default{
 							</div>
 						</div>
 						<div class="row mb-3">									   
-							<label for="bestaetigtam" class="form-label col-sm-4">Bestätigt am</label>
+							<label for="bestaetigtam" class="form-label col-sm-4">{{$p.t('lehre', 'bestaetigt_am')}}</label>
 							<div class="col-sm-6">
 								<form-input 
 									type="DatePicker" 
@@ -757,7 +779,7 @@ export default{
 							</div>
 						</div>
 						<div class="row mb-3">
-							<label for="bewerbung_abgeschicktamum" class="form-label col-sm-4">B. abgeschickt am</label>
+							<label for="bewerbung_abgeschicktamum" class="form-label col-sm-4">{{$p.t('lehre', 'bewerbung_abgeschickt_am')}}</label>
 							<div class="col-sm-6">
 								<form-input 
 									type="DatePicker" 
@@ -773,7 +795,7 @@ export default{
 							</div>
 						</div>
 						<div class="row mb-3">
-							<label for="bezeichnung" class="form-label col-sm-4">Studienplan</label>
+							<label for="bezeichnung" class="form-label col-sm-4">{{$p.t('lehre', 'studienplan')}}</label>
 							<div class="col-sm-6">
 								<form-input 
 									:readonly="readonly" 
@@ -786,7 +808,7 @@ export default{
 							</div>
 						</div>
 						<div class="row mb-3">
-							<label for="anmerkung" class="form-label col-sm-4">Anmerkung</label>
+							<label for="anmerkung" class="form-label col-sm-4">{{$p.t('global', 'anmerkung')}}</label>
 							<div class="col-sm-6">
 								<form-input 
 									type="text"
@@ -798,7 +820,7 @@ export default{
 						</div>
 						
 						<div class="row mb-3">									   
-							<label for="aufnahmestufe" class="form-label col-sm-4">Aufnahmestufe</label>
+							<label for="aufnahmestufe" class="form-label col-sm-4">{{$p.t('lehre', 'aufnahmestufe')}}</label>
 							<div class="col-sm-6">
 								<form-input 
 								type="select" 
@@ -812,7 +834,7 @@ export default{
 						</div>
 						
 						<div v-if="gruende.length > 0" class="row mb-3">
-							<label for="grund" class="form-label col-sm-4">Grund</label>
+							<label for="grund" class="form-label col-sm-4">{{$p.t('studierendenantrag', 'antrag_grund')}}</label>
 							<div class="col-sm-6">
 								<form-input 
 									type="select" 
@@ -835,14 +857,13 @@ export default{
 		
 			<!--Modal: Delete Status-->
 			<BsModal ref="deleteStatusModal">
-				<template #title>Status löschen</template> 
+				<template #title>{{$p.t('lehre', 'status_edit')}}</template> 
 				<template #default>
 				<div v-if="isLastStatus == 1">
-					<p>Das Loeschen der letzten Rolle loescht auch den gesamten Prestudent-Datensatz! Moechten Sie fortfahren?</p>
+					<p>{{$p.t('lehre', 'last_status_confirm_delete')}}</p>
 				</div>
 				<div v-else>
-					<p>Prestudentstatus {{statusData.status_kurzbz}} (id: {{statusData.prestudent_id}}  
-					/ {{statusData.studiensemester_kurzbz}}) im {{statusData.ausbildungssemester}}. Ausbildungssemester wirklich löschen?</p>
+					<p>{{$p.t('lehre', 'status_confirm_delete')}}</p>
 				</div>
 					
 				</template>	
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 706d84a0a..cc09201d5 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -23038,7 +23038,7 @@ array(
 				'insertvon' => 'system'
 				)
 		)
-	)
+	),
 	// Personalverwaltung begin
 	array(
 		'app' => 'core',
@@ -24990,25 +24990,6 @@ array(
 			)
 		)
 	),
-	array(
-		'app' => 'core',
-		'category' => 'person',
-		'phrase' => 'standort',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Standort',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'location',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
 	array(
 		'app' => 'core',
 		'category' => 'person',
@@ -25161,82 +25142,6 @@ array(
 			)
 		)
 	),
-	array(
-		'app' => 'core',
-		'category' => 'person',
-		'phrase' => 'kontonr',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Kontonummer',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Address',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'core',
-		'category' => 'person',
-		'phrase' => 'anschrift',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Anschrift',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Address',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'core',
-		'category' => 'person',
-		'phrase' => 'verrechnung',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Verrechnung',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Billing',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'core',
-		'category' => 'person',
-		'phrase' => 'blz',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'BLZ',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Bank code',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
 	array(
 		'app' => 'core',
 		'category' => 'person',
@@ -25351,6 +25256,636 @@ array(
 			)
 		)
 	),
+	//Status
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'status_rolle',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Rolle',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'role',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'status_new',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Neuen Status hinzufügen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'add new status',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'status_edit',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Status bearbeiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'edit status',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'status_delete',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Status löschen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'delete status',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'bestaetigt_am',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bestätigt am',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'confirmed on',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'bestaetigt_von',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bestätigt von',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'confirmed by',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'insert_am',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'InsertAmUm',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'inserted on',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'insert_von',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'InsertVon',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'inserted by',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'bewerbung_abgeschickt_am',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bewerbung abgeschickt am',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'application sent on',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'aufnahmestufe',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Aufnahmestufe',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'entrance level',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'bismeldestichtag',
+		'phrase' => 'meldestichtag_erreicht',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Meldestichtag erreicht - Bearbeiten nicht mehr möglich',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'report target date reached - editing no longer possible',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+		),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'status_confirm_delete',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Prestudentstatus wirklich löschen?',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Really delete prestudent status?',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+			'app' => 'core',
+			'category' => 'lehre',
+			'phrase' => 'last_status_confirm_delete',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Das Löschen der letzten Rolle löscht auch den gesamten Prestudent-Datensatz! Möchten Sie fortfahren?',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Deleting the last role also deletes the entire Prestudent record! Do you want to continue?',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+	//Prestudent
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'title_zgv',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zugangsvoraussetzungen für ',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Access requirements for ',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'zgvMaster',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'ZGV Master',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'ZGV master',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'zgvMasterOrt',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'ZGV Master Ort',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'ZGV master place',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'zgvMasterDatum',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'ZGV Master Datum',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'ZGV master date',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'zgvMasterNation',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'ZGV Master Nation',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'ZGV master nation',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'zgvMasterErfuellt',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'ZGV Master erfüllt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'ZGV master fulfilled',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'zgvDoktor',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'ZGV Doktor',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'ZGV doctor',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'zgvDoktorOrt',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'ZGV Doktor Ort',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'ZGV doctor place',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'zgvDoktorDatum',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'ZGV Doktor Datum',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'ZGV doctor date',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'zgvDoktorNation',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'ZGV Doktor Nation',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'ZGV doctor nation',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'zgvDoktorErfuellt',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'ZGV Doktor erfüllt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'ZGV doctor fulfilled',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'aufmerksamDurch',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Aufmerksam durch',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'been brought to attention by',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'berufstaetigkeit',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Berufstätigkeit',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'professional activity',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'facheinschlaegigBerufstaetig',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Facheinschlägig berufstätig',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'employed in a relevant field',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'bisstandort',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bisstandort',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'bis location',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'studientyp',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Studientyp',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'study type',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'dual',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Duales Studium',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'dual study',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'foerderrelevant',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'förderrelevant',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'relevant for funding',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'prioritaet',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Priorität',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'priority',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'title_history',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gesamthistorie',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Overall history',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 );
 
 

From 1b3c052c124b80f3275208163d609454fc418e84 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 22 Mar 2024 13:00:05 +0100
Subject: [PATCH 0522/1461] codesniffer

---
 .../controllers/components/stv/Prestudent.php |  10 +-
 .../controllers/components/stv/Status.php     | 148 ++++++++++-----
 .../Details/Prestudent/Status.js              | 168 +++++++++---------
 3 files changed, 188 insertions(+), 138 deletions(-)

diff --git a/application/controllers/components/stv/Prestudent.php b/application/controllers/components/stv/Prestudent.php
index 3b71ff73e..1a47b2162 100644
--- a/application/controllers/components/stv/Prestudent.php
+++ b/application/controllers/components/stv/Prestudent.php
@@ -72,7 +72,7 @@ class Prestudent extends FHC_Controller
 
 		$stg = $result->studiengang_kz;
 
-		if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg) )
+		if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg))
 		{
 			$result = "Sie haben keine Schreibrechte fuer diesen Studiengang!";
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
@@ -137,7 +137,8 @@ class Prestudent extends FHC_Controller
 		$update_prestudent['updatevon'] = $uid;
 
 		//utf8-decode for special chars (eg tag der offenen Tür, FH-Führer)
-		function utf8_decode_if_string($value) {
+		function utf8_decode_if_string($value)
+		{
 			if (is_string($value)) {
 				return utf8_decode($value);
 			} else {
@@ -165,7 +166,6 @@ class Prestudent extends FHC_Controller
 			}
 			return $this->outputJsonSuccess(true);
 		}
-
 	}
 
 	public function getHistoryPrestudents($person_id)
@@ -315,6 +315,4 @@ class Prestudent extends FHC_Controller
 		}
 		$this->outputJson($result);
 	}
-
-
-}
\ No newline at end of file
+}
diff --git a/application/controllers/components/stv/Status.php b/application/controllers/components/stv/Status.php
index 772567106..ac880be37 100644
--- a/application/controllers/components/stv/Status.php
+++ b/application/controllers/components/stv/Status.php
@@ -16,9 +16,9 @@ class Status extends FHC_Controller
 		$this->load->library('PermissionLib');
 
 		// Load language phrases
-		/*		$this->loadPhrases([
-					'ui'
-				]);*/
+		$this->loadPhrases([
+					'ui', 'bismeldestichtag','lehre'
+				]);
 	}
 
 	public function getHistoryPrestudent($prestudent_id)
@@ -94,7 +94,7 @@ class Status extends FHC_Controller
 
 		$isStudent = false;
 
-		if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg) )
+		if(!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg))
 		{
 			$result = "Sie haben keine Schreibrechte fuer diesen Studiengang!";
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
@@ -132,10 +132,10 @@ class Status extends FHC_Controller
 			$lastStatusData = current(getData($result));
 
 		//Different handling depending on newStatus
-		//Todo(manu) check if these checks makes sense?
+		//Todo(manu) check later with multiactions
 		/*		if($status_kurzbz == 'Absolvent' || $status_kurzbz == 'Diplomand')
 				{
-					//$studiensemester = $semester_aktuell; //TODO(Manu) oder ist hier defaultsemester gemeint?
+					//$studiensemester = $semester_aktuell;
 					$ausbildungssemester = $lastStatusData->ausbildungssemester;
 				}*/
 
@@ -145,7 +145,12 @@ class Status extends FHC_Controller
 				}*/
 
 		//check if Rolle already exists
-		$result = $this->PrestudentstatusModel->checkIfExistingPrestudentRolle($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester);
+		$result = $this->PrestudentstatusModel->checkIfExistingPrestudentRolle(
+			$prestudent_id,
+			$status_kurzbz,
+			$studiensemester_kurzbz,
+			$ausbildungssemester
+		);
 		if (isError($result))
 		{
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
@@ -221,7 +226,7 @@ class Status extends FHC_Controller
 
 		//check if studentrolle already exists
 		//TODO(manu) eigener Code für Diplomand?
-		if($status_kurzbz == 'Student' || $status_kurzbz == 'Diplomand' )
+		if($status_kurzbz == 'Student' || $status_kurzbz == 'Diplomand')
 		{
 			$this->load->model('crm/Student_model', 'StudentModel');
 			$result = $this->StudentModel->checkIfExistingStudentRolle($prestudent_id);
@@ -254,7 +259,13 @@ class Status extends FHC_Controller
 				return $this->outputJson(getError($result));
 			}
 
-			$result = $this->PrestudentstatusModel->checkIfValidStatusHistory($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $new_status_datum, $ausbildungssemester);
+			$result = $this->PrestudentstatusModel->checkIfValidStatusHistory(
+				$prestudent_id,
+				$status_kurzbz,
+				$studiensemester_kurzbz,
+				$new_status_datum,
+				$ausbildungssemester
+			);
 			if (isError($result))
 			{
 				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
@@ -349,7 +360,14 @@ class Status extends FHC_Controller
 
 			//process studentlehrverband
 			$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
-			$result = $this->StudentlehrverbandModel->processStudentlehrverband($student_uid, $studiengang_kz, $ausbildungssemester, $verband, $gruppe, $studiensemester_kurzbz);
+			$result = $this->StudentlehrverbandModel->processStudentlehrverband(
+				$student_uid,
+				$studiengang_kz,
+				$ausbildungssemester,
+				$verband,
+				$gruppe,
+				$studiensemester_kurzbz
+			);
 			if ($this->db->trans_status() === false || isError($result))
 			{
 				$this->db->trans_rollback();
@@ -359,7 +377,7 @@ class Status extends FHC_Controller
 
 			//Student updaten (fuer Abbrecher und Unterbrecher)
 			//not active yet: works only for "status ändern" in FAS
-			//Later for multiactions
+			//Todo(Manu) Later for multiactions
 
 			/*
 			if($status_kurzbz == 'Abbrecher' || $status_kurzbz == 'Unterbrecher')
@@ -491,7 +509,6 @@ class Status extends FHC_Controller
 
 		//Data of current Rolle
 		$statusData = current(getData($result));
-		//var_dump($statusData);
 
 		$datum = $statusData->datum == '' ? 'null' : $statusData->datum;
 		$insertamum = $statusData->insertamum == '' ? 'null' : $statusData->insertamum;
@@ -523,25 +540,27 @@ class Status extends FHC_Controller
 		$quotes_rt_stufe = $rt_stufe == "null" ? " " : "'";
 		$quotes_statusgrund_id = $statusgrund_id == "null" ? " " : "'";
 
-$sqlundo =
-	"
-	INSERT INTO public.tbl_prestudentstatus(prestudent_id, status_kurzbz, studiensemester_kurzbz, ausbildungssemester, datum, insertamum, insertvon, updateamum, updatevon, ext_id, orgform_kurzbz, bestaetigtam, bestaetigtvon, anmerkung, bewerbung_abgeschicktamum, studienplan_id,  rt_stufe, statusgrund_id) 
-	VALUES('" . $prestudent_id . "','" . $status_kurzbz . "','" . $studiensemester_kurzbz . "','" . $ausbildungssemester . "',"
-	. $quotes_datum . $datum . $quotes_datum . ","
-	. $quotes_insertamum . $insertamum . $quotes_insertamum . ","
-	. $quotes_insertvon . $insertvon . $quotes_insertvon . ","
-	. $quotes_updateamum . $updateamum . $quotes_updateamum . ","
-	. $quotes_updatevon . $updatevon . $quotes_updatevon . ","
-	. $quotes_ext_id . $ext_id . $quotes_ext_id . ","
-	. $quotes_orgform_kurzbz . $orgform_kurzbz . $quotes_orgform_kurzbz . ","
-	. $quotes_bestaetigtam . $bestaetigtam . $quotes_bestaetigtam . ","
-	. $quotes_bestaetigtvon . $bestaetigtvon . $quotes_bestaetigtvon . ","
-	. $quotes_anmerkung . $anmerkung . $quotes_anmerkung . ","
-	. $quotes_bewerbung_abgeschicktamum . $bewerbung_abgeschicktamum . $quotes_bewerbung_abgeschicktamum . ","
-	. $quotes_studienplan_id . $studienplan_id . $quotes_studienplan_id . ","
-	. $quotes_rt_stufe . $rt_stufe . $quotes_rt_stufe . ","
-	. $quotes_statusgrund_id . $statusgrund_id . $quotes_statusgrund_id . ");
-	";
+		$sqlundo =
+			"
+			INSERT INTO public.tbl_prestudentstatus(prestudent_id, status_kurzbz, studiensemester_kurzbz, ausbildungssemester, 
+			    datum, insertamum, insertvon, updateamum, updatevon, ext_id, orgform_kurzbz, bestaetigtam, bestaetigtvon, 
+			    anmerkung, bewerbung_abgeschicktamum, studienplan_id,  rt_stufe, statusgrund_id) 
+			VALUES('" . $prestudent_id . "','" . $status_kurzbz . "','" . $studiensemester_kurzbz . "','" . $ausbildungssemester . "',"
+			. $quotes_datum . $datum . $quotes_datum . ","
+			. $quotes_insertamum . $insertamum . $quotes_insertamum . ","
+			. $quotes_insertvon . $insertvon . $quotes_insertvon . ","
+			. $quotes_updateamum . $updateamum . $quotes_updateamum . ","
+			. $quotes_updatevon . $updatevon . $quotes_updatevon . ","
+			. $quotes_ext_id . $ext_id . $quotes_ext_id . ","
+			. $quotes_orgform_kurzbz . $orgform_kurzbz . $quotes_orgform_kurzbz . ","
+			. $quotes_bestaetigtam . $bestaetigtam . $quotes_bestaetigtam . ","
+			. $quotes_bestaetigtvon . $bestaetigtvon . $quotes_bestaetigtvon . ","
+			. $quotes_anmerkung . $anmerkung . $quotes_anmerkung . ","
+			. $quotes_bewerbung_abgeschicktamum . $bewerbung_abgeschicktamum . $quotes_bewerbung_abgeschicktamum . ","
+			. $quotes_studienplan_id . $studienplan_id . $quotes_studienplan_id . ","
+			. $quotes_rt_stufe . $rt_stufe . $quotes_rt_stufe . ","
+			. $quotes_statusgrund_id . $statusgrund_id . $quotes_statusgrund_id . ");
+			";
 
 		//Delete Status
 		$result = $this->PrestudentstatusModel->delete(
@@ -553,8 +572,7 @@ $sqlundo =
 			]
 		);
 
-		if ( $this->db->trans_status() === false || isError($result))
-		//if (isError($result))
+		if($this->db->trans_status() === false || isError($result))
 		{
 			$this->db->trans_rollback();
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
@@ -698,7 +716,7 @@ $sqlundo =
 			$uid = getAuthUID();
 			$beschreibung = 'Loeschen der Prestudent ID ' . $prestudent_id;
 			$sql = "DELETE FROM public.tbl_prestudent
-                WHERE prestudent_id = " . $prestudent_id ;
+                WHERE prestudent_id = " . $prestudent_id;
 
 			//load prestudent für LOG sqlundo
 			$this->load->model('crm/Prestudent_model', 'PrestudentModel');
@@ -874,7 +892,7 @@ $sqlundo =
 					'prestudent_id' => $prestudent_id
 				)
 			);
-			if ($this->db->trans_status() === FALSE)
+			if ($this->db->trans_status() === false)
 			{
 				$this->db->trans_rollback();
 				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
@@ -886,7 +904,6 @@ $sqlundo =
 			}
 			$this->db->trans_commit();
 			$this->outputJson($result);
-
 		}
 		$this->db->trans_commit();
 		return $this->outputJsonSuccess(true);
@@ -911,7 +928,7 @@ $sqlundo =
 
 		$stg = $result->studiengang_kz;
 
-		if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg) )
+		if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg))
 		{
 			$result = "Sie haben keine Schreibrechte fuer diesen Studiengang!";
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
@@ -950,7 +967,11 @@ $sqlundo =
 				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 				//return $this->outputJson($result->code);
 				//Fehlermeldung überschrieben, passender
-				return $this->outputJson("Meldestichtag erreicht - Bearbeiten nicht mehr möglich");
+				//TODO(Manu) phrase
+				//$this->p->t('bismeldestichtag','meldestichtag_erreicht');
+				//return $this->outputJson($this->p->t('bismeldestichtag','status_confirm_delete'));
+				return $this->outputJson($this->p->t('lehre', 'meldestichtag_erreicht'));
+				//return $this->outputJson("Meldestichtag erreicht - Bearbeiten nicht mehr möglich");
 			}
 		}
 
@@ -958,7 +979,12 @@ $sqlundo =
 		if(($key_studiensemester_kurzbz != $studiensemester_kurzbz)
 			|| ($key_ausbildungssemester != $ausbildungssemester))
 		{
-			$result = $this->PrestudentstatusModel->checkIfExistingPrestudentRolle($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester);
+			$result = $this->PrestudentstatusModel->checkIfExistingPrestudentRolle(
+				$prestudent_id,
+				$status_kurzbz,
+				$studiensemester_kurzbz,
+				$ausbildungssemester
+			);
 			if (isError($result))
 			{
 				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
@@ -997,7 +1023,13 @@ $sqlundo =
 		{
 			//Block STATUSCHECKS
 
-			$result = $this->PrestudentstatusModel->checkIfValidStatusHistory($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $datum, $ausbildungssemester);
+			$result = $this->PrestudentstatusModel->checkIfValidStatusHistory(
+				$prestudent_id,
+				$status_kurzbz,
+				$studiensemester_kurzbz,
+				$datum,
+				$ausbildungssemester
+			);
 			if (isError($result))
 			{
 				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
@@ -1073,7 +1105,14 @@ $sqlundo =
 			$studentlvbData = current(getData($result));
 
 			$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
-			$result = $this->StudentlehrverbandModel->processStudentlehrverband($student_uid,  $studentlvbData->studiengang_kz, $ausbildungssemester, $studentlvbData->verband, $studentlvbData->gruppe, $studiensemester_kurzbz);
+			$result = $this->StudentlehrverbandModel->processStudentlehrverband(
+				$student_uid,
+				$studentlvbData->studiengang_kz,
+				$ausbildungssemester,
+				$studentlvbData->verband,
+				$studentlvbData->gruppe,
+				$studiensemester_kurzbz
+			);
 			if ($this->db->trans_status() === false || isError($result))
 			{
 				$this->db->trans_rollback();
@@ -1104,7 +1143,7 @@ $sqlundo =
 
 		$stg = $result->studiengang_kz;
 
-		if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg) )
+		if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg))
 		{
 			$result = "Sie haben keine Schreibrechte fuer diesen Studiengang!";
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
@@ -1151,7 +1190,12 @@ $sqlundo =
 		$ausbildungssem_next = $key_ausbildungssemester+1;
 
 		//check if Rolle already exists
-		$result = $this->PrestudentstatusModel->checkIfExistingPrestudentRolle($key_prestudent_id, $key_status_kurzbz, $studiensem_next, $ausbildungssem_next);
+		$result = $this->PrestudentstatusModel->checkIfExistingPrestudentRolle(
+			$key_prestudent_id,
+			$key_status_kurzbz,
+			$studiensem_next,
+			$ausbildungssem_next
+		);
 		if (isError($result))
 		{
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
@@ -1239,7 +1283,14 @@ $sqlundo =
 		$studentlvbData = current($result);
 
 		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
-		$result = $this->StudentlehrverbandModel->processStudentlehrverband($student_uid, $studentlvbData->studiengang_kz, $ausbildungssem_next, $studentlvbData->verband, $studentlvbData->gruppe, $studiensem_next);
+		$result = $this->StudentlehrverbandModel->processStudentlehrverband(
+			$student_uid,
+			$studentlvbData->studiengang_kz,
+			$ausbildungssem_next,
+			$studentlvbData->verband,
+			$studentlvbData->gruppe,
+			$studiensem_next
+		);
 		if ($this->db->trans_status() === false || isError($result))
 		{
 			$this->db->trans_rollback();
@@ -1270,7 +1321,7 @@ $sqlundo =
 
 		$stg = $result->studiengang_kz;
 
-		if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg) )
+		if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg))
 		{
 			$result = "Sie haben keine Schreibrechte fuer diesen Studiengang!";
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
@@ -1301,8 +1352,8 @@ $sqlundo =
 			$statusData = current(getData($result));
 		}
 
-		//check if Status is unconfirmed.. TODO(manu) check further conditions? Status < Student
-		if($statusData->bestaetigtam != NULL)
+		//check if Status is unconfirmed..
+		if($statusData->bestaetigtam != null)
 		{
 			$result = "Der Status ist bereits bestätigt!";
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
@@ -1310,7 +1361,7 @@ $sqlundo =
 		}
 
 		//check if Bewerbung abgeschickt
-		if($statusData->bewerbung_abgeschicktamum == NULL)
+		if($statusData->bewerbung_abgeschicktamum == null)
 		{
 			$result = "Die Bewerbung wurde noch nicht abgeschickt und kann deshalb nicht bestaetigt werden!";
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
@@ -1344,6 +1395,5 @@ $sqlundo =
 			return error('No Statusdata vorhanden');
 		}
 		return $this->outputJsonSuccess(true);
-
 	}
 }
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
index 6a800e4c9..79eec07cc 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
@@ -88,7 +88,9 @@ export default{
 								button.className = 'btn btn-outline-secondary btn-action';
 							button.innerHTML = '<i class="fa fa-forward"></i>';
 							button.title = 'Status vorrücken';
-							button.addEventListener('click', () =>
+							button.addEventListener(
+								'click',
+								() =>
 								this.actionAdvanceStatus(cell.getData().status_kurzbz, cell.getData().studiensemester_kurzbz, cell.getData().ausbildungssemester)
 							);
 							container.append(button);
@@ -528,9 +530,9 @@ export default{
 						<div class="row mb-3">
 							<label for="status_kurzbz" class="form-label col-sm-4">{{$p.t('lehre', 'status_rolle')}}</label>
 							<div class="col-sm-6">
-<!--								<form-input type="text" :readonly="readonly" class="form-control" id="status_kurzbz" v-model="statusData['status_kurzbz']">-->
+							<!--<form-input type="text" :readonly="readonly" class="form-control" id="status_kurzbz" v-model="statusData['status_kurzbz']">-->
 								<form-input
-									required 
+									required
 									v-model="statusData['status_kurzbz']"
 									name="status_kurzbz"
 									type="select"
@@ -547,13 +549,13 @@ export default{
 								</form-input>
 							</div>
 						</div>
-						<div class="row mb-3">									   
+						<div class="row mb-3">		   
 							<label for="studiensemester_kurzbz" class="form-label col-sm-4">{{$p.t('lehre', 'studiensemester')}}</label>
 							<div class="col-sm-6">
-								<form-input 
-									:readonly="readonly" 
+								<form-input
+									:readonly="readonly"
 									type="select"
-									name="studiensemester_kurzbz" 
+									name="studiensemester_kurzbz"
 									v-model="statusData['studiensemester_kurzbz']"
 								>
 									<option v-for="sem in listStudiensemester" :key="sem.studiensemester_kurzbz" :value="sem.studiensemester_kurzbz"  :selected="sem.studiensemester_kurzbz === defaultSemester">{{sem.studiensemester_kurzbz}}</option>
@@ -564,10 +566,10 @@ export default{
 						<div class="row mb-3">
 							<label for="ausbildungssemester" class="form-label col-sm-4">{{$p.t('lehre', 'ausbildungssemester')}}</label>
 							<div class="col-sm-6">
-								<form-input 
-									type="select" 
-									:readonly="readonly" 
-									name="ausbildungssemester" 
+								<form-input
+									type="select"
+									:readonly="readonly"
+									name="ausbildungssemester"
 									v-model="statusData.ausbildungssemester"
 								>
 								 <option v-for="number in maxSem" :key="number" :value="number">{{ number }}</option>
@@ -578,10 +580,10 @@ export default{
 						<div class="row mb-3">
 							<label for="datum" class="form-label col-sm-4">{{$p.t('global', 'datum')}}</label>
 							<div class="col-sm-6">
-								<form-input 
-									type="DatePicker" 
-									:readonly="readonly" 
-									name="datum" 
+								<form-input
+									type="DatePicker"
+									:readonly="readonly"
+									name="datum"
 									v-model="statusData.datum"
 									auto-apply
 									:enable-time-picker="false"
@@ -591,13 +593,13 @@ export default{
 								></form-input>
 							</div>
 						</div>
-						<div class="row mb-3">									   
+						<div class="row mb-3">
 							<label for="bestaetigtam" class="form-label col-sm-4">{{$p.t('lehre', 'bestaetigt_am')}}</label>
 							<div class="col-sm-6">
-								<form-input 
-									type="DatePicker" 
-									:readonly="readonly" 
-									name="datum" 
+								<form-input
+									type="DatePicker"
+									:readonly="readonly"
+									name="datum"
 									v-model="statusData.bestaetigtam"
 									auto-apply
 									:enable-time-picker="false"
@@ -610,10 +612,10 @@ export default{
 						<div class="row mb-3">
 							<label for="bewerbung_abgeschicktamum" class="form-label col-sm-4">{{$p.t('lehre', 'bewerbung_abgeschickt_am')}}</label>
 							<div class="col-sm-6">
-								<form-input 
-									type="DatePicker" 
-									:readonly="readonly" 
-									name="datum" 
+								<form-input
+									type="DatePicker"
+									:readonly="readonly"
+									name="datum"
 									v-model="statusData['bewerbung_abgeschicktamum']"
 									auto-apply
 									:enable-time-picker="false"
@@ -626,12 +628,12 @@ export default{
 						<div class="row mb-3">
 							<label for="bezeichnung" class="form-label col-sm-4">{{$p.t('lehre', 'studienplan')}}</label>
 							<div class="col-sm-6">
-								<form-input 
-									:readonly="readonly" 
+								<form-input
+									:readonly="readonly"
 									type="select"
-									name="studienplan" 
+									name="studienplan"
 									v-model="statusData['studienplan_id']"
-								>									
+								>		
 									<option v-for="sp in listStudienplaene" :key="sp.studienplan_id" :value="sp.studienplan_id">{{sp.bezeichnung}}</option>
 								</form-input>
 							</div>
@@ -639,22 +641,22 @@ export default{
 						<div class="row mb-3">
 							<label for="anmerkung" class="form-label col-sm-4">{{$p.t('global', 'anmerkung')}}</label>
 							<div class="col-sm-6">
-								<form-input 
+								<form-input
 									type="text"
-									name="anmerkung" 
+									name="anmerkung"
 									v-model="statusData['anmerkung']"
-								>									
+								>						
 								</form-input>
 							</div>
 						</div>
 						
-						<div class="row mb-3">									   
+						<div class="row mb-3">								   
 							<label for="aufnahmestufe" class="form-label col-sm-4">{{$p.t('lehre', 'aufnahmestufe')}}</label>
 							<div class="col-sm-6">
-								<form-input 
-								type="select" 
-								:readonly="readonly" 
-								name="aufnahmestufe" 
+								<form-input
+								type="select"
+								:readonly="readonly"
+								name="aufnahmestufe"
 								v-model="statusData['rt_stufe']"
 								>
 								<option v-for="entry in aufnahmestufen" :key="entry" :value="entry">{{entry}}</option>
@@ -665,10 +667,10 @@ export default{
 						<div v-if="gruende.length > 0" class="row mb-3">
 							<label for="grund" class="form-label col-sm-4">{{$p.t('studierendenantrag', 'antrag_grund')}}</label>
 							<div class="col-sm-6">
-								<form-input 
-									type="select" 
-									:readonly="readonly" 
-									name="statusgrund" 
+								<form-input
+									type="select"
+									:readonly="readonly"
+									name="statusgrund"
 									v-model="statusData['statusgrund_id']"
 								>
 								<option v-for="grund in gruende" :key="grund.statusgrund_id" :value="grund.statusgrund_id">{{grund.beschreibung[0]}}</option>
@@ -689,7 +691,7 @@ export default{
 				<template #title>{{$p.t('lehre', 'status_edit')}}</template>
 					<form-form class="row g-3" ref="statusData">
 					
-					<div v-if="statusData.datum < dataMeldestichtag ">
+					<div v-if="statusData.datum < dataMeldestichtag">
 						<b>{{$p.t('bismeldestichtag', 'meldestichtag_erreicht')}}</b>
 					</div>
 					
@@ -700,7 +702,7 @@ export default{
 							<div class="col-sm-6">
 <!--								<form-input type="text" :readonly="readonly" class="form-control" id="status_kurzbz" v-model="statusData['status_kurzbz']">-->
 								<form-input
-									required 
+									required
 									v-model="statusData['status_kurzbz']"
 									name="status_kurzbz"
 									type="select"
@@ -718,13 +720,13 @@ export default{
 								</form-input>
 							</div>
 						</div>
-						<div class="row mb-3">									   
+						<div class="row mb-3">							   
 							<label for="studiensemester_kurzbz" class="form-label col-sm-4">{{$p.t('lehre', 'studiensemester')}}</label>
 							<div class="col-sm-6">
-								<form-input 
-									:readonly="readonly" 
+								<form-input
+									:readonly="readonly"
 									type="select"
-									name="studiensemester_kurzbz" 
+									name="studiensemester_kurzbz"
 									v-model="statusData['studiensemester_kurzbz']"
 								>
 									<option v-for="sem in listStudiensemester" :key="sem.studiensemester_kurzbz" :value="sem.studiensemester_kurzbz">{{sem.studiensemester_kurzbz}}</option>
@@ -735,10 +737,10 @@ export default{
 						<div class="row mb-3">
 							<label for="ausbildungssemester" class="form-label col-sm-4">{{$p.t('lehre', 'ausbildungssemester')}}</label>
 							<div class="col-sm-6">
-								<form-input 
-									type="select" 
-									:readonly="readonly" 
-									name="ausbildungssemester" 
+								<form-input
+									type="select"
+									:readonly="readonly"
+									name="ausbildungssemester"
 									v-model="statusData['ausbildungssemester']"
 								>
 								 <option v-for="number in maxSem" :key="number" :value="number">{{ number }}</option>
@@ -749,10 +751,10 @@ export default{
 						<div class="row mb-3">
 							<label for="datum" class="form-label col-sm-4">{{$p.t('global', 'datum')}}</label>
 							<div class="col-sm-6">
-								<form-input 
-									type="DatePicker" 
-									:readonly="readonly" 
-									name="datum" 
+								<form-input
+									type="DatePicker"
+									:readonly="readonly"
+									name="datum"
 									v-model="statusData['datum']"
 									auto-apply
 									:enable-time-picker="false"
@@ -762,13 +764,13 @@ export default{
 								></form-input>
 							</div>
 						</div>
-						<div class="row mb-3">									   
+						<div class="row mb-3">					   
 							<label for="bestaetigtam" class="form-label col-sm-4">{{$p.t('lehre', 'bestaetigt_am')}}</label>
 							<div class="col-sm-6">
-								<form-input 
-									type="DatePicker" 
-									:readonly="readonly" 
-									name="datum" 
+								<form-input
+									type="DatePicker"
+									:readonly="readonly"
+									name="datum"
 									v-model="statusData['bestaetigtam']"
 									auto-apply
 									:enable-time-picker="false"
@@ -781,10 +783,10 @@ export default{
 						<div class="row mb-3">
 							<label for="bewerbung_abgeschicktamum" class="form-label col-sm-4">{{$p.t('lehre', 'bewerbung_abgeschickt_am')}}</label>
 							<div class="col-sm-6">
-								<form-input 
-									type="DatePicker" 
-									:readonly="readonly" 
-									name="datum" 
+								<form-input
+									type="DatePicker"
+									:readonly="readonly"
+									name="datum"
 									v-model="statusData['bewerbung_abgeschicktamum']"
 									auto-apply
 									:enable-time-picker="false"
@@ -797,12 +799,12 @@ export default{
 						<div class="row mb-3">
 							<label for="bezeichnung" class="form-label col-sm-4">{{$p.t('lehre', 'studienplan')}}</label>
 							<div class="col-sm-6">
-								<form-input 
-									:readonly="readonly" 
+								<form-input
+									:readonly="readonly"
 									type="select"
-									name="studienplan" 
+									name="studienplan"
 									v-model="statusData['studienplan_id']"
-								>									
+								>
 									<option v-for="sp in listStudienplaene" :key="sp.studienplan_id" :value="sp.studienplan_id">{{sp.bezeichnung}}</option>
 								</form-input>
 							</div>
@@ -810,22 +812,22 @@ export default{
 						<div class="row mb-3">
 							<label for="anmerkung" class="form-label col-sm-4">{{$p.t('global', 'anmerkung')}}</label>
 							<div class="col-sm-6">
-								<form-input 
+								<form-input
 									type="text"
-									name="anmerkung" 
+									name="anmerkung"
 									v-model="statusData['anmerkung']"
-								>									
+								>				
 								</form-input>
 							</div>
 						</div>
 						
-						<div class="row mb-3">									   
+						<div class="row mb-3">				   
 							<label for="aufnahmestufe" class="form-label col-sm-4">{{$p.t('lehre', 'aufnahmestufe')}}</label>
 							<div class="col-sm-6">
-								<form-input 
-								type="select" 
-								:readonly="readonly" 
-								name="aufnahmestufe" 
+								<form-input
+								type="select"
+								:readonly="readonly"
+								name="aufnahmestufe"
 								v-model="statusData['rt_stufe']"
 								>
 								<option v-for="entry in aufnahmestufen" :key="entry" :value="entry">{{entry}}</option>
@@ -836,10 +838,10 @@ export default{
 						<div v-if="gruende.length > 0" class="row mb-3">
 							<label for="grund" class="form-label col-sm-4">{{$p.t('studierendenantrag', 'antrag_grund')}}</label>
 							<div class="col-sm-6">
-								<form-input 
-									type="select" 
-									:readonly="readonly" 
-									name="statusgrund" 
+								<form-input
+									type="select"
+									:readonly="readonly"
+									name="statusgrund"
 									v-model="statusData['statusgrund_id']"
 								>
 								<option v-for="grund in gruende" :key="grund.statusgrund_id" :value="grund.statusgrund_id">{{grund.beschreibung[0]}}</option>
@@ -857,7 +859,7 @@ export default{
 		
 			<!--Modal: Delete Status-->
 			<BsModal ref="deleteStatusModal">
-				<template #title>{{$p.t('lehre', 'status_edit')}}</template> 
+				<template #title>{{$p.t('lehre', 'status_edit')}}</template>
 				<template #default>
 				<div v-if="isLastStatus == 1">
 					<p>{{$p.t('lehre', 'last_status_confirm_delete')}}</p>
@@ -866,13 +868,12 @@ export default{
 					<p>{{$p.t('lehre', 'status_confirm_delete')}}</p>
 				</div>
 					
-				</template>	
+				</template>
 				<template #footer>
 					<button ref="Close" type="button" class="btn btn-primary" @click="deleteStatus(statusId)">OK</button>
 				</template>
 			</BsModal>
-			
-			
+				
 			<core-filter-cmpt
 				ref="table"
 				:tabulator-options="tabulatorOptions"
@@ -887,4 +888,5 @@ export default{
 		</core-filter-cmpt>
 		
 		</div>`
+
 };
\ No newline at end of file

From 927ed934c0be294396cfbee519e8849da6c6d0bb Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Fri, 22 Mar 2024 14:12:17 +0100
Subject: [PATCH 0523/1461] =?UTF-8?q?new=20Controller=20&=20routes=20for?=
 =?UTF-8?q?=20Landing=20Page;=20Fixed=20querying=20students=20for=20n=20LE?=
 =?UTF-8?q?;=20Pictures=20in=20LektorOverview=20&=20Detailview;=20WIP=20Se?=
 =?UTF-8?q?tupComponent=20to=20select=20missing=20parameters=20in=20case;?=
 =?UTF-8?q?=20added=20highcharts=20library=20as=20pure=20JS;=20WIP=20desig?=
 =?UTF-8?q?ning=20Charts=20based=20on=20role=20&=20parameter=20input=20or?=
 =?UTF-8?q?=20setup;=20Integration=20in=20old=20cis=20via=20Mein=20Cis/Mei?=
 =?UTF-8?q?ne=20LV=20aswell=20as=20Studium/Studieng=C3=A4nge=20currently?=
 =?UTF-8?q?=20as=20"Anwesenheiten=20NEU";=20WIP=20Landing=20Page=20Design;?=
 =?UTF-8?q?=20WIP=20LE=20Selection=20from=20Stundenplan=20Entries=20with?=
 =?UTF-8?q?=20appropriate=20Classification;=20defined=20settings=20for=20Q?=
 =?UTF-8?q?R=20Regeneration=20and=20showing=20time=20left=20on=20a=20progr?=
 =?UTF-8?q?ess=20bar;=20entry=20query=20parameters=20are=20being=20handled?=
 =?UTF-8?q?=20inside=20globalProperties,=20controller=20parameters=20are?=
 =?UTF-8?q?=20still=20inside=20permissions=20array;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/tw/cis_menu_lv.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/tw/cis_menu_lv.inc.php b/include/tw/cis_menu_lv.inc.php
index bbcbe2e98..e55677f02 100644
--- a/include/tw/cis_menu_lv.inc.php
+++ b/include/tw/cis_menu_lv.inc.php
@@ -249,7 +249,7 @@ function checkZeilenUmbruch()
 		$text='';
 
 		$name = 'Anwesenheiten NEU';
-		$link= APP_ROOT."index.ci.php/extensions/FHC-Core-Anwesenheiten/?stg_kz=$studiengang_kz&sem=$semester&lvid=$lvid&stsem=$angezeigtes_stsem";
+		$link= APP_ROOT."index.ci.php/extensions/FHC-Core-Anwesenheiten/?stg_kz=$studiengang_kz&sem=$semester&lvid=$lvid&sem_kurzbz=$angezeigtes_stsem";
 
 		$menu[]=array
 		(

From b907f01ebb5a68d0346c1c74f0842b7f3ccd8674 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 25 Mar 2024 09:09:40 +0100
Subject: [PATCH 0524/1461] Phrases History and Status, Formvalidation
 Prestudent

---
 .../controllers/components/stv/Prestudent.php | 40 +++++++++----------
 .../Studentenverwaltung/Details/Prestudent.js |  7 +++-
 .../Details/Prestudent/History.js             |  5 ++-
 .../Details/Prestudent/Status.js              |  6 ++-
 system/phrasesupdate.php                      | 21 +++++++++-
 5 files changed, 53 insertions(+), 26 deletions(-)

diff --git a/application/controllers/components/stv/Prestudent.php b/application/controllers/components/stv/Prestudent.php
index 1a47b2162..093126272 100644
--- a/application/controllers/components/stv/Prestudent.php
+++ b/application/controllers/components/stv/Prestudent.php
@@ -16,9 +16,9 @@ class Prestudent extends FHC_Controller
 		$this->load->library('PermissionLib');
 
 		// Load language phrases
-		/*		$this->loadPhrases([
-					'ui'
-				]);*/
+		$this->loadPhrases([
+			'ui', 'studierendenantrag'
+		]);
 	}
 
 	public function get($prestudent_id)
@@ -44,20 +44,6 @@ class Prestudent extends FHC_Controller
 		$this->load->library('form_validation');
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 
-		//Todo(manu) Validierungen
-
-/*		$result = $this->PrestudentModel->loadWhere(['prestudent_id' =>$prestudent_id]);
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson(getError($result));
-		} elseif (!hasData($result)) {
-			return $this->outputJson(getError($result));
-		} else {
-			$prestudentData = current(getData($result));
-		}
-
-		var_dump($prestudentData);*/
-
 		//get Studiengang von prestudent_id
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 		$result = $this->PrestudentModel->load([
@@ -74,13 +60,25 @@ class Prestudent extends FHC_Controller
 
 		if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg))
 		{
-			$result = "Sie haben keine Schreibrechte fuer diesen Studiengang!";
+			$result =  $this->p->t('lehre','error_keineSchreibrechte');
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 			return $this->outputJson($result);
 		}
 
+		//TODO(Manu) neuer API Controller
 		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
 
+
+		//Form validation
+		$this->form_validation->set_rules('priorisierung', 'Priorisierung', 'numeric', [
+			'numeric' => $this->p->t('ui','error_fieldNotNumeric',['field' => 'Priorisierung'])
+		]);
+
+		if ($this->form_validation->run() == false)
+		{
+			return $this->outputJsonError($this->form_validation->error_array());
+		}
+
 		$deltaData = $_POST;
 
 		if(!$prestudent_id)
@@ -147,11 +145,11 @@ class Prestudent extends FHC_Controller
 		}
 		$update_prestudent_encoded = array_map('utf8_decode_if_string', $update_prestudent);
 
-
 		if (count($update_prestudent) && $prestudent_id === null) {
 			$this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST);
-			// TODO(manu): phrase
-			return $this->outputJson("Kein/e PrestudentIn vorhanden!");
+			// TODO(manu): check phrase
+			//return $this->outputJson("Kein/e PrestudentIn vorhanden!");
+			return $this->outputJson($this->p->t('studierendenantrag','error_no_prestudent', $prestudent_id));
 		}
 
 		if (count($update_prestudent))
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
index 008e581fa..3c33c7d55 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
@@ -116,8 +116,11 @@ export default {
 							});
 						}
 					}).catch(error => {
-						this.statusMsg = 'Error in Catch';
-						this.$fhcAlert.alertError('Fehler bei Speicherroutine aufgetreten');
+						if (error.response && error.response.data) {
+							this.$fhcAlert.alertError(error.response.data);
+						} else {
+							this.$fhcAlert.alertError("Fehler bei Speicherroutine aufgetreten");
+						}
 					}).finally(() => {
 						window.scrollTo(0, 0);
 					});
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
index 78c004538..54a42bba8 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
@@ -22,6 +22,7 @@ export default{
 					{title:"UID", field:"student_uid"},
 					{title:"Status", field:"status"}
 				],
+			//	tabulatorEvents: [],
 				layout: 'fitDataFill',
 				layoutColumnsOnNewData:	false,
 				height:	'auto',
@@ -32,8 +33,10 @@ export default{
 	async mounted(){
 		await this.$p.loadCategory(['lehre']);
 
+		let cm = this.$refs.table.tabulator.columnManager;
+
 		cm.getColumnByField('orgform_kurzbz').component.updateDefinition({
-			title: this.$p.t('lehre', 'Organisationsform')
+			title: this.$p.t('lehre', 'organisationsform')
 		});
 
 		cm.getColumnByField('bezeichnung').component.updateDefinition({
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
index 79eec07cc..22b64a393 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
@@ -375,7 +375,11 @@ export default{
 						}
 						else
 						{
-							const errorData = result.data.retval;
+/*							const errorData = result.data.retval;
+							Object.entries(errorData).forEach(entry => {
+								const [key, value] = entry;
+								this.$fhcAlert.alertError(value);
+							});*/
 							this.$fhcAlert.alertError('Kein Status mit Id ' + status_id + ' gefunden');
 						}
 						/*						return result;*/
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index cc09201d5..8f53c4bf6 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -21991,7 +21991,7 @@ array(
 	),
 	array(
 		'app' => 'core',
-		'category' => 'studierendenantrag',
+		'category' => 'studierendenantrag',q
 		'phrase' => 'error_no_prestudent',
 		'insertvon' => 'system',
 		'phrases' => array(
@@ -25886,6 +25886,25 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'error_keineSchreibrechte',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Sie haben keine Schreibrechte fuer diesen Studiengang!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'You do not have writing rights for this course!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 );
 
 

From 65c7db7ae4a3eca8e874b1a4fd7ee7d69321e5c8 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 25 Mar 2024 13:28:28 +0100
Subject: [PATCH 0525/1461] bugfix phrases tabulator, refactor Prestudent.js
 using FHCAPI_CONTROLLER

---
 .../api/frontend/v1/stv/Prestudent.php        | 301 ++++++++++++++++++
 .../api/frontend/v1/stv/Status.php            |   0
 .../controllers/components/stv/Prestudent.php |   4 +-
 .../models/crm/Prestudentstatus_model.php     |  11 +-
 .../Studentenverwaltung/Details/Prestudent.js |  86 +++--
 .../Details/Prestudent/History.js             |  38 ++-
 .../Details/Prestudent/Status.js              |  99 +++---
 system/phrasesupdate.php                      |  19 ++
 8 files changed, 442 insertions(+), 116 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/stv/Prestudent.php
 create mode 100644 application/controllers/api/frontend/v1/stv/Status.php

diff --git a/application/controllers/api/frontend/v1/stv/Prestudent.php b/application/controllers/api/frontend/v1/stv/Prestudent.php
new file mode 100644
index 000000000..1663e0dae
--- /dev/null
+++ b/application/controllers/api/frontend/v1/stv/Prestudent.php
@@ -0,0 +1,301 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+
+class Prestudent extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'get' => ['admin:r', 'assistenz:r'],
+			'updatePrestudent' =>  ['admin:w', 'assistenz:w'],
+			'getHistoryPrestudents' => ['admin:r', 'assistenz:r'],
+			'getBezeichnungZGV' => 'admin:r', // TODO(manu): self::PERM_LOGGED
+			'getBezeichnungDZgv' => 'admin:r', // TODO(manu): self::PERM_LOGGED
+			'getBezeichnungMZgv' => 'admin:r', // TODO(manu): self::PERM_LOGGED
+			'getAusbildung' => 'admin:r', // TODO(manu): self::PERM_LOGGED
+			'getAufmerksamdurch' => 'admin:r', // TODO(manu): self::PERM_LOGGED
+			'getBerufstaetigkeit' => 'admin:r', // TODO(manu): self::PERM_LOGGED
+			'getTypenStg' => 'admin:r', // TODO(manu): self::PERM_LOGGED
+			'getStudiensemester' => 'admin:r', // TODO(manu): self::PERM_LOGGED
+			'getStudienplaene' => 'admin:r', // TODO(manu): self::PERM_LOGGED
+		]);
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui', 'studierendenantrag'
+		]);
+	}
+
+	public function get($prestudent_id)
+	{
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+		$this->PrestudentModel->addSelect('*');
+		$result = $this->PrestudentModel->loadWhere(['prestudent_id' => $prestudent_id]);
+
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		} elseif (!hasData($result)) {
+			return show_404();
+		} else {
+			$this->terminateWithSuccess(current(getData($result)));
+		}
+	}
+
+	public function updatePrestudent($prestudent_id)
+	{
+		$this->load->library('form_validation');
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+		//get Studiengang von prestudent_id
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+		$result = $this->PrestudentModel->load([
+			'prestudent_id'=> $prestudent_id,
+		]);
+		if(isError($result))
+		{
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		$result = current(getData($result));
+
+		$stg = $result->studiengang_kz;
+
+		//Form validation
+		$this->form_validation->set_rules('priorisierung', 'Priorisierung', 'numeric', [
+			'numeric' => $this->p->t('ui','error_fieldNotNumeric',['field' => 'Priorisierung'])
+		]);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$deltaData = $_POST;
+
+		$uid = getAuthUID();
+
+		$array_allowed_props_prestudent = [
+			'aufmerksamdurch_kurzbz',
+			'studiengang_kz',
+			'gsstudientyp_kurzbz',
+			'person_id',
+			'berufstaetigkeit_code',
+			'ausbildungcode',
+			'zgv_code',
+			'zgvort',
+			'zgvdatum',
+			'zgvnation',
+			'zgvmas_code',
+			'zgvmaort',
+			'zgvmadatum',
+			'zgvmanation',
+			'facheinschlberuf',
+			'bismelden',
+			'anmerkung',
+			'dual',
+			'zgvdoktor_code',
+			'zgvdoktorort',
+			'zgvdoktordatum',
+			'zgvdoktornation',
+			'aufnahmegruppe_kurzbz',
+			'priorisierung',
+			'foerderrelevant',
+			'zgv_erfuellt',
+			'zgvmas_erfuellt',
+			'zgvdoktor_erfuellt',
+			'mentor',
+			'aufnahmeschluessel',
+			'standort_code'
+		];
+
+		$update_prestudent = array();
+		foreach ($array_allowed_props_prestudent as $prop)
+		{
+			$val = isset($deltaData[$prop]) ? $deltaData[$prop] : null;
+			if ($val !== null || $prop == 'foerderrelevant') {
+				$update_prestudent[$prop] = $val;
+			}
+		}
+
+		$update_prestudent['updateamum'] = date('c');
+		$update_prestudent['updatevon'] = $uid;
+
+		//utf8-decode for special chars (eg tag der offenen Tür, FH-Führer)
+		function utf8_decode_if_string($value)
+		{
+			if (is_string($value)) {
+				return utf8_decode($value);
+			} else {
+				return $value;
+			}
+		}
+		$update_prestudent_encoded = array_map('utf8_decode_if_string', $update_prestudent);
+
+		if (count($update_prestudent))
+		{
+			$result = $this->PrestudentModel->update(
+				$prestudent_id,
+				$update_prestudent_encoded
+			);
+			if (isError($result)) {
+				$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			}
+			return $this->terminateWithSuccess(true);
+		}
+	}
+
+	public function getHistoryPrestudents($person_id)
+	{
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+		$result = $this->PrestudentModel->getHistoryPrestudents($person_id);
+		if (isError($result))
+		{
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess(getData($result) ?: []);
+	}
+
+	public function getBezeichnungZGV()
+	{
+		$this->load->model('codex/Zgv_model', 'ZgvModel');
+
+		$this->ZgvModel->addOrder('zgv_code');
+
+		$result = $this->ZgvModel->load();
+		if (isError($result))
+		{
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess(getData($result) ?: []);
+	}
+
+	public function getBezeichnungDZgv()
+	{
+		$this->load->model('codex/Zgvdoktor_model', 'ZgvdoktorModel');
+
+		$this->ZgvdoktorModel->addOrder('zgvdoktor_code');
+
+		$result = $this->ZgvdoktorModel->load();
+		if (isError($result))
+		{
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess(getData($result) ?: []);
+	}
+
+	public function getBezeichnungMZgv()
+	{
+		$this->load->model('codex/Zgvmaster_model', 'ZgvmasterModel');
+
+		$this->ZgvmasterModel->addOrder('zgvmas_code');
+
+		$result = $this->ZgvmasterModel->load();
+		if (isError($result))
+		{
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess(getData($result) ?: []);
+	}
+
+	public function getAusbildung()
+	{
+		$this->load->model('codex/Ausbildung_model', 'AusbildungModel');
+
+		$this->AusbildungModel->addOrder('ausbildungcode');
+
+		$result = $this->AusbildungModel->load();
+		if (isError($result))
+		{
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess(getData($result) ?: []);
+	}
+
+	public function getAufmerksamdurch()
+	{
+		$this->load->model('codex/Aufmerksamdurch_model', 'AufmerksamdurchModel');
+
+		$this->AufmerksamdurchModel->addOrder('aufmerksamdurch_kurzbz');
+
+		$result = $this->AufmerksamdurchModel->load();
+		if (isError($result))
+		{
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess(getData($result) ?: []);
+	}
+
+	public function getBerufstaetigkeit()
+	{
+		$this->load->model('codex/Berufstaetigkeit_model', 'BerufstaetigkeitModel');
+
+		$this->BerufstaetigkeitModel->addOrder('berufstaetigkeit_code');
+
+		$result = $this->BerufstaetigkeitModel->load();
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess(getData($result) ?: []);
+	}
+
+	public function getTypenStg()
+	{
+		$this->load->model('education/Gsstudientyp_model', 'GsstudientypModel');
+
+		$this->GsstudientypModel->addOrder('gsstudientyp_kurzbz');
+
+		$result = $this->GsstudientypModel->load();
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess(getData($result) ?: []);
+	}
+
+	public function getStudiensemester()
+	{
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
+		$this->StudiensemesterModel->addOrder('start', 'DESC');
+		$this->StudiensemesterModel->addLimit(20);
+
+		$result = $this->StudiensemesterModel->load();
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess(getData($result) ?: []);
+	}
+
+	public function getStudienplaene($prestudent_id)
+	{
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+		$result = $this->PrestudentModel->loadWhere(
+			array('prestudent_id' => $prestudent_id)
+		);
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+
+		$result = current(getData($result));
+		$studiengang_kz = $result->studiengang_kz;
+
+		$this->load->model('organisation/Studienplan_model', 'StudienplanModel');
+
+		$this->StudienplanModel->addOrder('studienplan_id', 'DESC');
+
+		$result = $this->StudienplanModel->getStudienplaene($studiengang_kz);
+
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess(getData($result) ?: []);
+	}
+}
diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/application/controllers/components/stv/Prestudent.php b/application/controllers/components/stv/Prestudent.php
index 093126272..2a1364c87 100644
--- a/application/controllers/components/stv/Prestudent.php
+++ b/application/controllers/components/stv/Prestudent.php
@@ -13,7 +13,7 @@ class Prestudent extends FHC_Controller
 		// Load Libraries
 		$this->load->library('AuthLib');
 		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-		$this->load->library('PermissionLib');
+
 
 		// Load language phrases
 		$this->loadPhrases([
@@ -65,7 +65,7 @@ class Prestudent extends FHC_Controller
 			return $this->outputJson($result);
 		}
 
-		//TODO(Manu) neuer API Controller
+		//TODO(Manu)  API Controller
 		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
 
 
diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php
index d3f99801c..db860f1e6 100644
--- a/application/models/crm/Prestudentstatus_model.php
+++ b/application/models/crm/Prestudentstatus_model.php
@@ -15,6 +15,15 @@ class Prestudentstatus_model extends DB_Model
 		$this->dbTable = 'public.tbl_prestudentstatus';
 		$this->pk = array('ausbildungssemester', 'studiensemester_kurzbz', 'status_kurzbz', 'prestudent_id');
 		$this->hasSequence = false;
+
+/*		$CI =& get_instance();
+
+		$CI->load->library('PhrasesLib');
+
+		// Load language phrases
+		$CI->loadPhrases([
+			'ui', 'lehre'
+		]);*/
 	}
 
 	/**
@@ -375,7 +384,7 @@ class Prestudentstatus_model extends DB_Model
 		}
 		else
 		{
-			return success("1","Diese Rolle ist bereits vorhanden!");
+			return success("1", $this->p->t('studierendenantrag','error_rolleBereitsVorhanden'));
 		}
 	}
 
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
index 3c33c7d55..cd3afe91a 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
@@ -90,8 +90,8 @@ export default {
 
 	methods: {
 		loadPrestudent() {
-			CoreRESTClient
-				.get('components/stv/Prestudent/get/' + this.modelValue.prestudent_id)
+			this.$fhcApi
+				.get('api/frontend/v1/stv/prestudent/get/' + this.modelValue.prestudent_id)
 				.then(result => result.data)
 				.then(result => {
 					this.data = result;
@@ -101,85 +101,73 @@ export default {
 				.catch(this.$fhcAlert.handleSystemError);
 		},
 		updatePrestudent(){
-					CoreRESTClient.post('components/stv/Prestudent/updatePrestudent/' + this.modelValue.prestudent_id,
-						this.deltaArray
-					).then(response => {
-						if (!response.data.error) {
-							this.$fhcAlert.alertSuccess('Speichern erfolgreich');
-							this.deltaArray = [];
-							this.actionUpdate = false;
-						} else {
-							const errorData = response.data.retval;
-							Object.entries(errorData).forEach(entry => {
-								const [key, value] = entry;
-								this.$fhcAlert.alertError(value);
-							});
-						}
-					}).catch(error => {
-						if (error.response && error.response.data) {
-							this.$fhcAlert.alertError(error.response.data);
-						} else {
-							this.$fhcAlert.alertError("Fehler bei Speicherroutine aufgetreten");
-						}
-					}).finally(() => {
-						window.scrollTo(0, 0);
-					});
+			this.$refs.form
+				.post('api/frontend/v1/stv/prestudent/updatePrestudent/' + this.modelValue.prestudent_id, this.deltaArray)
+				.then(response => {
+					this.$fhcAlert.alertSuccess('Speichern erfolgreich');
+					this.deltaArray = [];
+					this.actionUpdate = false;
+				})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					window.scrollTo(0, 0);
+				});
 		},
 	},
 	created() {
 		this.loadPrestudent();
-		CoreRESTClient
-			.get('components/stv/Prestudent/getBezeichnungZGV')
-			.then(result => CoreRESTClient.getData(result.data) || [])
+		this.$fhcApi
+			.get('api/frontend/v1/stv/prestudent/getBezeichnungZGV')
+			.then(result => result.data)
 			.then(result => {
 				this.listZgvs = result;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
-		CoreRESTClient
-			.get('components/stv/Prestudent/getBezeichnungMZGV')
-			.then(result => CoreRESTClient.getData(result.data) || [])
+		this.$fhcApi
+			.get('api/frontend/v1/stv/prestudent/getBezeichnungMZgv')
+			.then(result => result.data)
 			.then(result => {
 				this.listZgvsmaster = result;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
-		CoreRESTClient
-			.get('components/stv/Prestudent/getBezeichnungDZGV')
-			.then(result => CoreRESTClient.getData(result.data) || [])
+		this.$fhcApi
+			.get('api/frontend/v1/stv/prestudent/getBezeichnungDZgv')
+			.then(result => result.data)
 			.then(result => {
 				this.listZgvsdoktor = result;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
-		CoreRESTClient
+		CoreRESTClient //TODO(manu) FHCAPI
 			.get('components/stv/Lists/getStgs')
 			.then(result => CoreRESTClient.getData(result.data) || [])
 			.then(result => {
 				this.listStgs = result;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
-		CoreRESTClient
-			.get('components/stv/Prestudent/getAusbildung')
-			.then(result => CoreRESTClient.getData(result.data) || [])
+		this.$fhcApi
+			.get('api/frontend/v1/stv/prestudent/getAusbildung')
+			.then(result => result.data)
 			.then(result => {
 				this.listAusbildung = result;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
-		CoreRESTClient
-			.get('components/stv/Prestudent/getAufmerksamdurch')
-			.then(result => CoreRESTClient.getData(result.data) || [])
+		this.$fhcApi
+			.get('api/frontend/v1/stv/prestudent/getAufmerksamdurch')
+			.then(result => result.data)
 			.then(result => {
 				this.listAufmerksamdurch = result;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
-		CoreRESTClient
-			.get('components/stv/Prestudent/getBerufstaetigkeit')
-			.then(result => CoreRESTClient.getData(result.data) || [])
+		this.$fhcApi
+			.get('api/frontend/v1/stv/prestudent/getBerufstaetigkeit')
+			.then(result => result.data)
 			.then(result => {
 				this.listBerufe = result;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
-		CoreRESTClient
-			.get('components/stv/Prestudent/getTypenStg')
-			.then(result => CoreRESTClient.getData(result.data) || [])
+		this.$fhcApi
+			.get('api/frontend/v1/stv/prestudent/getTypenStg')
+			.then(result => result.data)
 			.then(result => {
 				this.listStgTyp = result;
 			})
@@ -192,7 +180,7 @@ export default {
 		<div class="position-sticky top-0 z-1">
 			<button type="submit" class="btn btn-primary position-absolute top-0 end-0" :disabled="!deltaLength">Speichern</button>
 		</div>
-			<fieldset class="overflow-hidden">
+			<fieldset>
 				<legend>{{$p.t('lehre', 'title_zgv')}} {{modelValue.nachname}} {{modelValue.vorname}}</legend>
 
 						<div class="row mb-3">
@@ -383,7 +371,7 @@ export default {
 						
 		<!--			</template>-->
 			</fieldset>
-			<fieldset class="overflow-hidden">
+			<fieldset>
 				<legend>PrestudentIn</legend>
 				
 					<div class="row mb-3">
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
index 54a42bba8..41a5241db 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
@@ -1,5 +1,4 @@
 import {CoreFilterCmpt} from "../../../../filter/Filter.js";
-import {CoreRESTClient} from "../../../../../RESTClient";
 
 export default{
 	components: {
@@ -11,7 +10,9 @@ export default{
 	data() {
 		return {
 			tabulatorOptions: {
-				ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Prestudent/getHistoryPrestudents/' + this.person_id),
+				ajaxURL: 'api/frontend/v1/stv/Prestudent/getHistoryPrestudents/' + this.person_id,
+				ajaxRequestFunc: this.$fhcApi.get,
+				ajaxResponse: (url, params, response) => response.data,
 				//autoColumns: true,
 				columns:[
 					{title:"StSem", field:"studiensemester_kurzbz"},
@@ -22,7 +23,24 @@ export default{
 					{title:"UID", field:"student_uid"},
 					{title:"Status", field:"status"}
 				],
-			//	tabulatorEvents: [],
+				tabulatorEvents: [
+					{
+						event: 'tableBuilt',
+						handler: async () => {
+							await this.$p.loadCategory(['lehre']);
+
+							let cm = this.$refs.table.tabulator.columnManager;
+
+							cm.getColumnByField('orgform_kurzbz').component.updateDefinition({
+								title: this.$p.t('lehre', 'organisationsform')
+							});
+
+							cm.getColumnByField('bezeichnung').component.updateDefinition({
+								title: this.$p.t('lehre', 'studienplan')
+							});
+						}
+					}
+				],
 				layout: 'fitDataFill',
 				layoutColumnsOnNewData:	false,
 				height:	'auto',
@@ -30,24 +48,12 @@ export default{
 			},
 		}
 	},
-	async mounted(){
-		await this.$p.loadCategory(['lehre']);
-
-		let cm = this.$refs.table.tabulator.columnManager;
-
-		cm.getColumnByField('orgform_kurzbz').component.updateDefinition({
-			title: this.$p.t('lehre', 'organisationsform')
-		});
-
-		cm.getColumnByField('bezeichnung').component.updateDefinition({
-			title: this.$p.t('lehre', 'studienplan')
-		});
-	},
 	template: `
 		<div class="stv-list h-100 pt-3">
 			<core-filter-cmpt
 				ref="table"
 				:tabulator-options="tabulatorOptions"
+				:tabulator-events="tabulatorEvents"
 				table-only
 				:side-menu="false"
 			>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
index 22b64a393..2fc00a642 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
@@ -149,7 +149,56 @@ export default{
 				height: 'auto',
 				selectable: false,
 			},
-			tabulatorEvents: [],
+			tabulatorEvents: [
+				{
+					event: 'tableBuilt',
+					handler: async () => {
+						await this.$p.loadCategory(['lehre','global','person']);
+
+						let cm = this.$refs.table.tabulator.columnManager;
+
+						/*		cm.getColumnByField('lehrverband').component.updateDefinition({
+									title: this.$p.t('lehre', 'lehrverband')
+								});*/
+
+						cm.getColumnByField('format_bestaetigtam').component.updateDefinition({
+							title: this.$p.t('lehre', 'bestaetigt_am')
+						});
+
+						cm.getColumnByField('format_bewerbung_abgeschicktamum').component.updateDefinition({
+							title: this.$p.t('lehre', 'bewerbung_abgeschickt_am')
+						});
+
+						cm.getColumnByField('bezeichnung').component.updateDefinition({
+							title: this.$p.t('lehre', 'studienplan')
+						});
+
+						cm.getColumnByField('actions').component.updateDefinition({
+							title: this.$p.t('global', 'aktionen')
+						});
+
+						cm.getColumnByField('format_datum').component.updateDefinition({
+							title: this.$p.t('global', 'datum')
+						});
+
+						cm.getColumnByField('anmerkung').component.updateDefinition({
+							title: this.$p.t('global', 'anmerkung')
+						});
+
+						cm.getColumnByField('bestaetigtvon').component.updateDefinition({
+							title: this.$p.t('lehre', 'bestaetigt_von')
+						});
+
+						cm.getColumnByField('format_insertamum').component.updateDefinition({
+							title: this.$p.t('lehre', 'insert_am')
+						});
+
+						cm.getColumnByField('insertvon').component.updateDefinition({
+							title: this.$p.t('lehre', 'insert_von')
+						});
+					}
+				}
+			],
 			statusData: {},
 			listStudiensemester: [],
 			maxSem:  Array.from({ length: 11 }, (_, index) => index),
@@ -472,54 +521,8 @@ export default{
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 	},
-	async mounted(){
-		await this.$p.loadCategory(['lehre','global','person']);
+	mounted(){
 
-		let cm = this.$refs.table.tabulator.columnManager;
-
-/*		cm.getColumnByField('lehrverband').component.updateDefinition({
-			title: this.$p.t('lehre', 'lehrverband')
-		});*/
-
-		cm.getColumnByField('format_bestaetigtam').component.updateDefinition({
-			title: this.$p.t('lehre', 'bestaetigt_am')
-		});
-
-		cm.getColumnByField('format_bewerbung_abgeschicktamum').component.updateDefinition({
-			title: this.$p.t('lehre', 'bewerbung_abgeschickt_am')
-		});
-
-		cm.getColumnByField('bezeichnung').component.updateDefinition({
-			title: this.$p.t('lehre', 'studienplan')
-		});
-
-		cm.getColumnByField('actions').component.updateDefinition({
-			title: this.$p.t('global', 'aktionen')
-		});
-
-		cm.getColumnByField('format_datum').component.updateDefinition({
-			title: this.$p.t('global', 'datum')
-		});
-
-		cm.getColumnByField('anmerkung').component.updateDefinition({
-			title: this.$p.t('global', 'anmerkung')
-		});
-
-/*		cm.getColumnByField('format_bestaetigtam').component.updateDefinition({
-			title: this.$p.t('lehre', 'bestaetigt_am')
-		});*/
-
-		cm.getColumnByField('bestaetigtvon').component.updateDefinition({
-			title: this.$p.t('lehre', 'bestaetigt_von')
-		});
-
-		cm.getColumnByField('format_insertamum').component.updateDefinition({
-			title: this.$p.t('lehre', 'insert_am')
-		});
-
-		cm.getColumnByField('insertvon').component.updateDefinition({
-			title: this.$p.t('lehre', 'insert_von')
-		});
 	},
 	template: `
 		<div class="stv-list h-100 pt-3">
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 8f53c4bf6..753991992 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -25905,6 +25905,25 @@ array(
 			)
 		)
 	),
+	array(
+			'app' => 'core',
+			'category' => 'lehre',
+			'phrase' => 'error_rolleBereitsVorhanden',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Diese Rolle ist bereits vorhanden!',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'This role already exists!',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
 );
 
 

From 3023cd2e94c9ae0b1f743b8ab64f9b771aa01347 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 27 Mar 2024 11:23:38 +0100
Subject: [PATCH 0526/1461] Refactor status for api-controller, add phrases for
 alerts

---
 .../api/frontend/v1/stv/Prestudent.php        |   38 +-
 .../api/frontend/v1/stv/Status.php            | 1362 ++++++++++++++++
 .../controllers/components/stv/Prestudent.php |  316 ----
 .../controllers/components/stv/Status.php     | 1399 -----------------
 .../models/crm/Prestudentstatus_model.php     |   16 +-
 .../Studentenverwaltung/Details/Prestudent.js |    1 -
 .../Details/Prestudent/Status.js              |  170 +-
 system/phrasesupdate.php                      |  251 ++-
 8 files changed, 1688 insertions(+), 1865 deletions(-)
 delete mode 100644 application/controllers/components/stv/Prestudent.php
 delete mode 100644 application/controllers/components/stv/Status.php

diff --git a/application/controllers/api/frontend/v1/stv/Prestudent.php b/application/controllers/api/frontend/v1/stv/Prestudent.php
index 1663e0dae..93a6c381b 100644
--- a/application/controllers/api/frontend/v1/stv/Prestudent.php
+++ b/application/controllers/api/frontend/v1/stv/Prestudent.php
@@ -12,24 +12,23 @@ class Prestudent extends FHCAPI_Controller
 			'get' => ['admin:r', 'assistenz:r'],
 			'updatePrestudent' =>  ['admin:w', 'assistenz:w'],
 			'getHistoryPrestudents' => ['admin:r', 'assistenz:r'],
-			'getBezeichnungZGV' => 'admin:r', // TODO(manu): self::PERM_LOGGED
-			'getBezeichnungDZgv' => 'admin:r', // TODO(manu): self::PERM_LOGGED
-			'getBezeichnungMZgv' => 'admin:r', // TODO(manu): self::PERM_LOGGED
-			'getAusbildung' => 'admin:r', // TODO(manu): self::PERM_LOGGED
-			'getAufmerksamdurch' => 'admin:r', // TODO(manu): self::PERM_LOGGED
-			'getBerufstaetigkeit' => 'admin:r', // TODO(manu): self::PERM_LOGGED
-			'getTypenStg' => 'admin:r', // TODO(manu): self::PERM_LOGGED
-			'getStudiensemester' => 'admin:r', // TODO(manu): self::PERM_LOGGED
-			'getStudienplaene' => 'admin:r', // TODO(manu): self::PERM_LOGGED
+			'getBezeichnungZGV' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
+			'getBezeichnungDZgv' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
+			'getBezeichnungMZgv' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
+			'getAusbildung' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
+			'getAufmerksamdurch' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
+			'getBerufstaetigkeit' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
+			'getTypenStg' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
+			'getStudiensemester' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
+			'getStudienplaene' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
 		]);
 
 		// Load Libraries
 		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
 
-
 		// Load language phrases
 		$this->loadPhrases([
-			'ui', 'studierendenantrag'
+			'ui', 'studierendenantrag', 'lehre'
 		]);
 	}
 
@@ -40,13 +39,15 @@ class Prestudent extends FHCAPI_Controller
 		$this->PrestudentModel->addSelect('*');
 		$result = $this->PrestudentModel->loadWhere(['prestudent_id' => $prestudent_id]);
 
-		if (isError($result)) {
+		if (isError($result))
+		{
 			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		} elseif (!hasData($result)) {
-			return show_404();
-		} else {
-			$this->terminateWithSuccess(current(getData($result)));
 		}
+		if(!hasData($result))
+		{
+			return show_404();
+		}
+		$this->terminateWithSuccess(current(getData($result)));
 	}
 
 	public function updatePrestudent($prestudent_id)
@@ -67,6 +68,11 @@ class Prestudent extends FHCAPI_Controller
 
 		$stg = $result->studiengang_kz;
 
+		if(!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg))
+		{
+			return $this->terminateWithError($this->p->t('lehre','error_keineSchreibrechte'), self::ERROR_TYPE_GENERAL);
+		}
+
 		//Form validation
 		$this->form_validation->set_rules('priorisierung', 'Priorisierung', 'numeric', [
 			'numeric' => $this->p->t('ui','error_fieldNotNumeric',['field' => 'Priorisierung'])
diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index e69de29bb..00602cf95 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -0,0 +1,1362 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+
+class Status extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'getHistoryPrestudent' => ['admin:r', 'assistenz:r'],
+			'addNewStatus' => ['admin:r', 'assistenz:r', 'student/keine_studstatuspruefung'],
+			'getStatusgruende' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
+			'getLastBismeldestichtag' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
+			'isLastStatus' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
+			'deleteStatus' => ['admin:r','assistenz:r'],
+			'loadStatus' => ['admin:r', 'assistenz:r'],
+			'updateStatus' => ['admin:r', 'assistenz:r'],
+			'advanceStatus' => ['admin:r', 'assistenz:r'],
+			'confirmStatus' => ['admin:r', 'assistenz:r']
+		]);
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui', 'bismeldestichtag','lehre'
+		]);
+	}
+
+	public function getHistoryPrestudent($prestudent_id)
+	{
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+		$result = $this->PrestudentModel->getHistoryPrestudent($prestudent_id);
+		if (isError($result))
+		{
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess((getData($result) ?: []));
+	}
+
+	public function getStatusgruende()
+	{
+		$this->load->model('crm/Statusgrund_model', 'StatusgrundModel');
+
+		$result = $this->StatusgrundModel->load();
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess(getData($result) ?: []);
+	}
+
+	public function getLastBismeldestichtag()
+	{
+		$this->load->model('codex/Bismeldestichtag_model', 'BismeldestichtagModel');
+
+		$result = $this->BismeldestichtagModel->getLastReachedMeldestichtag();
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess($result);
+	}
+
+	public function isLastStatus($prestudent_id)
+	{
+		//TODO(Manu) translate here
+		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
+		$result = $this->PrestudentstatusModel->checkIfLastStatusEntry($prestudent_id);
+		if (isError($result))
+		{
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		if($result->retval == "1")
+		{
+			//return $this->outputJson($result->retval);
+			return $this->terminateWithError("Die letzte Rolle kann nur durch den Administrator geloescht werden", self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess($result);
+	}
+
+	public function addNewStatus($prestudent_id)
+	{
+		//get Studiengang von prestudent_id
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+		$this->PrestudentModel->addJoin('public.tbl_person p', 'ON (p.person_id = public.tbl_prestudent.person_id)');
+		$result = $this->PrestudentModel->load([
+			'prestudent_id'=> $prestudent_id,
+		]);
+		if(isError($result))
+		{
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		$result = current(getData($result));
+
+		//Variablen für Statuscheck
+		$stg = $result->studiengang_kz;
+		$reihungstest_angetreten = $result->reihungstestangetreten;
+		$name = trim($result->vorname . " ". $result->nachname);
+		$zgv_code = $result->zgv_code;
+
+		$isStudent = false;
+
+		if(!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg))
+		{
+			$result =  $this->p->t('lehre','error_keineSchreibrechte');
+
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+
+		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
+
+		$uid = getAuthUID();
+		$status_kurzbz = $this->input->post('status_kurzbz');
+		$ausbildungssemester = $this->input->post('ausbildungssemester');
+		$datum = $this->input->post('datum');
+		$bestaetigtam = $this->input->post('bestaetigtam');
+		$bewerbung_abgeschicktamum = $this->input->post('bewerbung_abgeschicktamum');
+		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
+		$anmerkung = $this->input->post('anmerkung');
+		$statusgrund_id = $this->input->post('statusgrund_id');
+		$rt_stufe = $this->input->post('rt_stufe');
+		$bestaetigtvon = $uid;
+
+		//GET lastStatus
+		$result = $this->PrestudentstatusModel->getLastStatus($prestudent_id);
+
+		if (isError($result))
+		{
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		elseif(!hasData($result))
+		{
+			$lastStatusData = [];
+		}
+		else
+			$lastStatusData = current(getData($result));
+
+		//Different handling depending on newStatus
+		//Todo(manu) check later with multiactions
+		/*		if($status_kurzbz == 'Absolvent' || $status_kurzbz == 'Diplomand')
+				{
+					//$studiensemester = $semester_aktuell;
+					$ausbildungssemester = $lastStatusData->ausbildungssemester;
+				}*/
+
+		/*		if($status_kurzbz != 'Student')
+				{
+					$ausbildungssemester = $lastStatusData->ausbildungssemester;
+				}*/
+
+		//check if Rolle already exists
+		$result = $this->PrestudentstatusModel->checkIfExistingPrestudentRolle(
+			$prestudent_id,
+			$status_kurzbz,
+			$studiensemester_kurzbz,
+			$ausbildungssemester
+		);
+
+		if (isError($result))
+		{
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+/*			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson(getError($result));*/
+		}
+		if($result->retval == '1')
+		{
+/*			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson($result->code);*/
+			return $this->terminateWithError($this->p->t('lehre','error_rolleBereitsVorhanden'), self::ERROR_TYPE_GENERAL);
+			//return $this->terminateWithError("test error_rolleBereitsVorhanden", self::ERROR_TYPE_GENERAL);
+		}
+
+
+		//Check Reihungstest
+		//TODO(manu) erst später für multiactions releveant
+		if(REIHUNGSTEST_CHECK)
+		{
+			if($status_kurzbz=='Bewerber' && !$reihungstest_angetreten)
+			{
+/*				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return $this->outputJson($name . ": Um einen Interessenten zum Bewerber zu machen, muss die Person das Reihungstestverfahren abgeschlossen haben");*/
+				return $this->terminateWithError($this->p->t('lehre','error_keinReihungstestverfahren', $name), self::ERROR_TYPE_GENERAL);
+			}
+		}
+
+		//Check ZGV
+		//TODO(manu) erst später für multiactions releveant
+		if(!defined("ZGV_CHECK") || ZGV_CHECK)
+		{
+			if($status_kurzbz=='Bewerber' && $zgv_code=='')
+			{
+/*				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return $this->outputJson($name . ": Um einen Interessenten zum Bewerber zu machen, muss die Zugangsvoraussetzung eingetragen sein.");*/
+				return $this->terminateWithError($this->p->t('lehre','error_ZGVNichtEingetragen', $name), self::ERROR_TYPE_GENERAL);
+
+			}
+		}
+
+		//Check ZGV-Master
+		//TODO(manu) erst später für multiactions releveant
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+		$result = $this->StudiengangModel->load([
+			'studiengang_kz'=> $stg
+		]);
+		if(isError($result))
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson(getError($result));
+		}
+		$result = current(getData($result));
+		$typ = $result->typ;
+
+		if(!defined("ZGV_CHECK") || ZGV_CHECK)
+		{
+			if($status_kurzbz=='Bewerber' && $zgv_code=='' && $typ=='m')
+			{
+/*				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return $this->outputJson($name . ": Um einen Interessenten zum Bewerber zu machen, muss die Zugangsvoraussetzung Master eingetragen sein.");*/
+				return $this->terminateWithError($this->p->t('lehre','error_ZGVMasterNichtEingetragen', $name), self::ERROR_TYPE_GENERAL);
+			}
+		}
+
+		//check if bewerberstatus exists
+		if($status_kurzbz == 'Aufgenommener' || $status_kurzbz == 'Wartender')
+		{
+			//TODO(manu) erst später für multiactions releveant
+			//FAS: Aufnahme ist möglich: Beispiel prestudent_id = 129629
+
+			$result = $this->PrestudentstatusModel->checkIfExistingBewerberstatus($prestudent_id, $name);
+			if (isError($result))
+			{
+/*				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return $this->outputJson(getError($result));*/
+				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			}
+			if($result->retval == "0")
+			{
+/*				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return $this->outputJson($result->code);*/
+				return $this->terminateWithError($this->p->t('lehre','error_keinBewerber', $name), self::ERROR_TYPE_GENERAL);
+			}
+		}
+
+		//check if studentrolle already exists
+		//TODO(manu) eigener Code für Diplomand?
+		if($status_kurzbz == 'Student' || $status_kurzbz == 'Diplomand')
+		{
+			$this->load->model('crm/Student_model', 'StudentModel');
+			$result = $this->StudentModel->checkIfExistingStudentRolle($prestudent_id);
+			if (isError($result))
+			{
+				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			}
+			if($result->retval == "0")
+			{
+/*				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return $this->outputJson($result->code);*/
+				return $this->terminateWithError($this->p->t('lehre','error_noStudstatus'), self::ERROR_TYPE_GENERAL);
+			}
+			if($result->retval != "0")
+			{
+				$isStudent = true;
+			}
+		}
+
+		$isBerechtigtNoStudstatusCheck =  $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung');
+
+		if(!$isBerechtigtNoStudstatusCheck)
+		{
+			//Block STATUSCHECKS
+			$new_status_datum = isset($datum) ? $datum  : date('Y-m-d');
+			$result = $this->PrestudentstatusModel->checkDatumNewStatus($new_status_datum);
+			if (isError($result))
+			{
+/*				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return $this->outputJson(getError($result));*/
+				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			}
+
+			$result = $this->PrestudentstatusModel->checkIfValidStatusHistory(
+				$prestudent_id,
+				$status_kurzbz,
+				$studiensemester_kurzbz,
+				$new_status_datum,
+				$ausbildungssemester
+			);
+			if (isError($result))
+			{
+				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			}
+
+			//check if Bismeldestichtag erreicht
+			$this->load->model('codex/Bismeldestichtag_model', 'BismeldestichtagModel');
+			$result = $this->BismeldestichtagModel->checkIfMeldestichtagErreicht($new_status_datum);
+			if (isError($result))
+			{
+				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			}
+			if($result->retval == "1")
+			{
+				return $this->terminateWithError($this->p->t('lehre','error_dataVorMeldestichtag'), self::ERROR_TYPE_GENERAL);
+			}
+		}
+
+
+		// Start DB transaction
+		$this->db->trans_begin(); // Beginnen der Transaktion
+
+		$result = $this->PrestudentstatusModel->insert(
+			[
+				'prestudent_id' => $prestudent_id,
+				'status_kurzbz' => $status_kurzbz,
+				'bewerbung_abgeschicktamum' => $bewerbung_abgeschicktamum,
+				'studiensemester_kurzbz' => $studiensemester_kurzbz,
+				'studienplan_id' => $lastStatusData->studienplan_id,
+				'ausbildungssemester' => $ausbildungssemester,
+				'anmerkung' => $anmerkung,
+				'statusgrund_id' => $statusgrund_id,
+				'insertvon' => $uid,
+				'insertamum' => date('c'),
+				'bestaetigtam' => $bestaetigtam,
+				'bestaetigtvon' => $bestaetigtvon,
+				'datum' => $datum,
+				'rt_stufe' => $rt_stufe
+			]
+		);
+
+		if ($this->db->trans_status() === false || isError($result))
+		{
+			$this->db->trans_rollback();
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+
+
+
+		if($isStudent)
+		{
+			$this->load->model('crm/Student_model', 'StudentModel');
+			$result = $this->StudentModel->checkIfUid($prestudent_id);
+			if (isError($result)) {
+				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			}
+			$student_uid = $result->retval;
+
+			//load student
+			$result = $this->StudentModel->loadWhere(
+				array(
+					'student_uid' => $student_uid
+				)
+			);
+			if (isError($result))
+			{
+				$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			}
+
+			$studentData = current(getData($result) ? : []);
+			$verband = $studentData->verband == '' ? '' : $studentData->verband;
+			$gruppe = $studentData->gruppe == '' ? '' : $studentData->gruppe;
+			$studiengang_kz = $studentData->studiengang_kz;
+
+			//Handle Abbrecher and Unterbrecher
+			//TODO (manu) implement later with multiactions
+			// not active yet: works only for "status ändern" in FAS
+			/*			if($status_kurzbz == 'Abbrecher' || $status_kurzbz == 'Unterbrecher')
+						{
+							$ausbildungssemester = 0;
+							$gruppe = '';
+							$verband = $status_kurzbz == 'Abbrecher' ? 'A' : 'B';
+						}*/
+
+			//process studentlehrverband
+			$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
+			$result = $this->StudentlehrverbandModel->processStudentlehrverband(
+				$student_uid,
+				$studiengang_kz,
+				$ausbildungssemester,
+				$verband,
+				$gruppe,
+				$studiensemester_kurzbz
+			);
+			if ($this->db->trans_status() === false || isError($result))
+			{
+				$this->db->trans_rollback();
+/*				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return $this->outputJson($result->code);*/
+				return $this->terminateWithError($this->p->t('lehre','error_duringInsertUpdateLehrverband'), self::ERROR_TYPE_GENERAL);
+			}
+
+			//Student updaten (fuer Abbrecher und Unterbrecher)
+			//not active yet: works only for "status ändern" in FAS
+			//Todo(Manu) Later for multiactions
+
+			/*
+			if($status_kurzbz == 'Abbrecher' || $status_kurzbz == 'Unterbrecher')
+			{
+				$result = $this->StudentModel->update(
+								[
+									'student_uid' => $student_uid
+								],
+								[
+									'studiengang_kz' => $studiengang_kz,
+									'semester' => $ausbildungssemester,
+									'verband' => $verband,
+									'gruppe' => $gruppe,
+									'updateamum' => date('c'),
+									'updatevon' => $uid
+							]);
+							if ($this->db->trans_status() === false || isError($result))
+							{
+								$this->db->trans_rollback();
+								$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+								return $this->outputJson($result->code);
+							}
+				}
+			*/
+		}
+
+		$this->db->trans_commit();
+
+		return $this->outputJsonSuccess(true);
+	}
+
+	public function loadStatus()
+	{
+		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+
+		$prestudent_id = $this->input->post('prestudent_id');
+		$status_kurzbz = $this->input->post('status_kurzbz');
+		$ausbildungssemester = $this->input->post('ausbildungssemester');
+		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
+
+		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
+
+		$result = $this->PrestudentstatusModel->loadWhere(
+			array(
+				'prestudent_id' => $prestudent_id,
+				'status_kurzbz' => $status_kurzbz,
+				'ausbildungssemester' => $ausbildungssemester,
+				'studiensemester_kurzbz' => $studiensemester_kurzbz
+			)
+		);
+		if (isError($result))
+		{
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+
+		elseif (!hasData($result))
+		{
+			$this->terminateWithError($this->p->t('lehre','error_noStatusFound'), self::ERROR_TYPE_GENERAL);
+		}
+		else
+		{
+			$this->terminateWithSuccess(current(getData($result)));
+		}
+	}
+
+	public function deleteStatus()
+	{
+
+		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
+
+		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+
+		$prestudent_id = $this->input->post('prestudent_id');
+		$status_kurzbz = $this->input->post('status_kurzbz');
+		$ausbildungssemester = $this->input->post('ausbildungssemester');
+		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
+		$deletePrestudent = false;
+
+		//get Studiengang von prestudent_id
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+		$result = $this->PrestudentModel->load([
+			'prestudent_id'=> $prestudent_id,
+		]);
+		if(isError($result))
+		{
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		$result = current(getData($result));
+
+		$stg = $result->studiengang_kz;
+
+		$isBerechtigtAdmin = $this->permissionlib->isBerechtigt('admin', null, 'suid');
+		$isBerechtigtNoStudstatusCheck = $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung', null, 'suid');
+
+		if(!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg))
+		{
+			return $this->terminateWithError($this->p->t('lehre','error_keineSchreibrechte'), self::ERROR_TYPE_GENERAL);
+		}
+
+		if($status_kurzbz=="Student" && !$isBerechtigtAdmin && !$isBerechtigtNoStudstatusCheck)
+		{
+			return $this->terminateWithError($this->p->t('lehre','error_onlyAdminDeleteRolleStudent'), self::ERROR_TYPE_GENERAL);
+		}
+
+		//check if last status
+		$result = $this->PrestudentstatusModel->checkIfLastStatusEntry($prestudent_id);
+		//return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+
+		if (isError($result))
+		{
+/*			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson($result);*/
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		if($result->retval == "1")
+		{
+			//Berechtigungen nach Check prüfen!
+			if(!$isBerechtigtAdmin && !$isBerechtigtNoStudstatusCheck)
+			{
+				return $this->terminateWithError($this->p->t('lehre','error_onlyAdminDeleteLastStatus'), self::ERROR_TYPE_GENERAL);
+			}
+			else
+			{
+				$deletePrestudent = true;
+			}
+		}
+
+		// Start DB transaction
+		$this->db->trans_begin();
+
+		//load rolle für LOG sqlundo
+		$result = $this->PrestudentstatusModel->loadWhere(
+			array(
+				'prestudent_id' => $prestudent_id,
+				'status_kurzbz' => $status_kurzbz,
+				'ausbildungssemester' => $ausbildungssemester,
+				'studiensemester_kurzbz' => $studiensemester_kurzbz
+			)
+		);
+
+		if (isError($result))
+		{
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		if (!hasData($result)) {
+			return $this->terminateWithError($this->p->t('lehre','error_noStatusFound'), self::ERROR_TYPE_GENERAL);
+
+		}
+
+		//Data of current Rolle
+		$statusData = current(getData($result));
+
+		$datum = $statusData->datum == '' ? 'null' : $statusData->datum;
+		$insertamum = $statusData->insertamum == '' ? 'null' : $statusData->insertamum;
+		$insertvon = $statusData->insertvon == '' ? 'null' : $statusData->insertvon;
+		$updateamum = $statusData->updateamum == '' ? 'null' : $statusData->updateamum;
+		$updatevon = $statusData->updatevon == '' ? 'null' : $statusData->updatevon;
+		$ext_id = $statusData->ext_id == '' ? 'null' : $statusData->ext_id;
+		$orgform_kurzbz = $statusData->orgform_kurzbz == '' ? 'null' : $statusData->orgform_kurzbz;
+		$bestaetigtam = $statusData->bestaetigtam == '' ? 'null' : $statusData->bestaetigtam;
+		$bestaetigtvon = $statusData->bestaetigtvon == '' ? 'null' : $statusData->bestaetigtvon;
+		$anmerkung = $statusData->anmerkung == '' ? 'null' : $statusData->anmerkung;
+		$bewerbung_abgeschicktamum = $statusData->bewerbung_abgeschicktamum == '' ? 'null' : $statusData->bewerbung_abgeschicktamum;
+		$studienplan_id = $statusData->studienplan_id == '' ? 'null' : $statusData->studienplan_id;
+		$rt_stufe = $statusData->rt_stufe == '' ? 'null' : $statusData->rt_stufe;
+		$statusgrund_id = $statusData->statusgrund_id == '' ? 'null' : $statusData->statusgrund_id;
+
+		$quotes_datum = $datum == "null" ? " " : "'";
+		$quotes_insertamum = $insertamum == "null" ? " " : "'";
+		$quotes_insertvon = $insertvon == "null" ? " " : "'";
+		$quotes_updateamum = $updateamum == "null" ? " " : "'";
+		$quotes_updatevon = $updatevon == "null" ? " " : "'";
+		$quotes_ext_id = $ext_id == "null" ? " " : "'";
+		$quotes_orgform_kurzbz = $orgform_kurzbz == "null" ? " " : "'";
+		$quotes_bestaetigtam = $bestaetigtam == "null" ? " " : "'";
+		$quotes_bestaetigtvon = $bestaetigtvon == "null" ? " " : "'";
+		$quotes_anmerkung = $anmerkung == "null" ? " " : "'";
+		$quotes_bewerbung_abgeschicktamum = $bewerbung_abgeschicktamum == "null" ? " " : "'";
+		$quotes_studienplan_id = $studienplan_id == "null" ? " " : "'";
+		$quotes_rt_stufe = $rt_stufe == "null" ? " " : "'";
+		$quotes_statusgrund_id = $statusgrund_id == "null" ? " " : "'";
+
+		$sqlundo =
+			"
+			INSERT INTO public.tbl_prestudentstatus(prestudent_id, status_kurzbz, studiensemester_kurzbz, ausbildungssemester, 
+			    datum, insertamum, insertvon, updateamum, updatevon, ext_id, orgform_kurzbz, bestaetigtam, bestaetigtvon, 
+			    anmerkung, bewerbung_abgeschicktamum, studienplan_id,  rt_stufe, statusgrund_id) 
+			VALUES('" . $prestudent_id . "','" . $status_kurzbz . "','" . $studiensemester_kurzbz . "','" . $ausbildungssemester . "',"
+			. $quotes_datum . $datum . $quotes_datum . ","
+			. $quotes_insertamum . $insertamum . $quotes_insertamum . ","
+			. $quotes_insertvon . $insertvon . $quotes_insertvon . ","
+			. $quotes_updateamum . $updateamum . $quotes_updateamum . ","
+			. $quotes_updatevon . $updatevon . $quotes_updatevon . ","
+			. $quotes_ext_id . $ext_id . $quotes_ext_id . ","
+			. $quotes_orgform_kurzbz . $orgform_kurzbz . $quotes_orgform_kurzbz . ","
+			. $quotes_bestaetigtam . $bestaetigtam . $quotes_bestaetigtam . ","
+			. $quotes_bestaetigtvon . $bestaetigtvon . $quotes_bestaetigtvon . ","
+			. $quotes_anmerkung . $anmerkung . $quotes_anmerkung . ","
+			. $quotes_bewerbung_abgeschicktamum . $bewerbung_abgeschicktamum . $quotes_bewerbung_abgeschicktamum . ","
+			. $quotes_studienplan_id . $studienplan_id . $quotes_studienplan_id . ","
+			. $quotes_rt_stufe . $rt_stufe . $quotes_rt_stufe . ","
+			. $quotes_statusgrund_id . $statusgrund_id . $quotes_statusgrund_id . ");
+			";
+
+		//Delete Status
+		$result = $this->PrestudentstatusModel->delete(
+			[
+				'prestudent_id' => $prestudent_id,
+				'status_kurzbz' => $status_kurzbz,
+				'ausbildungssemester' => $ausbildungssemester,
+				'studiensemester_kurzbz' => $studiensemester_kurzbz
+			]
+		);
+
+		if($this->db->trans_status() === false || isError($result))
+		{
+			$this->db->trans_rollback();
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		if(!hasData($result))
+		{
+			return $this->terminateWithError($this->p->t('lehre','error_noStatusFound'), self::ERROR_TYPE_GENERAL);
+
+		}
+
+		//save log delete prestudentstatus
+		$uid = getAuthUID();
+		$beschreibung = 'Loeschen der Rolle ' . $status_kurzbz . " bei " . $prestudent_id;
+		$sql = "DELETE FROM public.tbl_prestudentstatus
+                WHERE prestudent_id = " . $prestudent_id . "
+			  AND status_kurzbz = '" . $status_kurzbz . "'
+			  AND ausbildungssemester ='" . $ausbildungssemester . "'
+			  AND studiensemester_kurzbz = '" . $studiensemester_kurzbz . "'";
+
+		$this->load->model('system/Log_model', 'LogModel');
+		$result = $this->LogModel->insert([
+			'mitarbeiter_uid' => $uid,
+			'beschreibung' => $beschreibung,
+			'sql' => $sql,
+			'sqlundo' => $sqlundo
+		]);
+		if (isError($result) || !hasData($result))
+		{
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+
+		$logId = $result->retval;
+
+		//Delete Studentlehrverband if no Status left
+		$result = $this->PrestudentstatusModel->checkIfLastStatusEntry($prestudent_id, true);
+
+		if (isError($result))
+		{
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		if ($result->retval == "1")
+		{
+			//get student_uid
+			$this->load->model('crm/Student_model', 'StudentModel');
+			$result = $this->StudentModel->checkIfUid($prestudent_id);
+			if (isError($result))
+			{
+				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			}
+			if (!hasData($result))
+			{
+				return $this->terminateWithError($this->p->t('studierendenantrag','error_no_student_for_prestudent'), self::ERROR_TYPE_GENERAL);
+			}
+			$student_uid = $result->retval;
+
+			$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
+			$result = $this->StudentlehrverbandModel->delete(
+				array(
+					'student_uid' => $student_uid,
+					'studiensemester_kurzbz' => $studiensemester_kurzbz
+				)
+			);
+			if ($this->db->trans_status() === false || isError($result) || !hasData($result))
+			{
+				$this->db->trans_rollback();
+
+				return $this->terminateWithError($this->p->t('lehre','error_duringDeleteLehrverband'), self::ERROR_TYPE_GENERAL);
+			}
+
+			$this->terminateWithSuccess(true);
+
+		}
+		//Delete Prestudent if no data is left
+
+		if($deletePrestudent && $isBerechtigtAdmin)
+		{
+			//TODO(manu) check all connected tables, Handling of Deletion
+			//check if existing dokumentprestudent
+			$this->load->model('crm/Dokumentprestudent_model', 'DokumentprestudentModel');
+			$result = $this->DokumentprestudentModel->loadWhere(
+				array(
+					'prestudent_id' => $prestudent_id
+				)
+			);
+			if (isError($result))
+			{
+				$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+
+			}
+			if (hasData($result))
+			{
+				return $this->terminateWithError("Es sind noch zu loeschende Dokumente vorhanden: ", self::ERROR_TYPE_GENERAL);
+			}
+
+			//check if Anrechnungen tbl_anrechnung
+			$output_anrechnungen = '';
+			$this->load->model('education/Anrechnung_model', 'AnrechnungModel');
+			$result = $this->AnrechnungModel->loadWhere(
+				array(
+					'prestudent_id' => $prestudent_id
+				)
+			);
+			if (isError($result))
+			{
+				$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			}
+			if (hasData($result))
+			{
+				return $this->terminateWithError("Mit dieser Prestudent_id sind verbundene Anrechnungen vorhanden!", self::ERROR_TYPE_GENERAL);
+			}
+
+			//DELETE Prestudent
+
+			//save log delete prestudent
+			$uid = getAuthUID();
+			$beschreibung = 'Loeschen der Prestudent ID ' . $prestudent_id;
+			$sql = "DELETE FROM public.tbl_prestudent
+                WHERE prestudent_id = " . $prestudent_id;
+
+			//load prestudent für LOG sqlundo
+			$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+			$result = $this->PrestudentModel->loadWhere(
+				array(
+					'prestudent_id' => $prestudent_id
+				)
+			);
+			if (isError($result) || !hasData($result))
+			{
+				//TODO(Manu) in these case: löschen stautus erlauben aber rückmeldung, dass Prestudent nicht gelöscht wurde
+				return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			}
+
+			//Data of current Prestudent
+			$prestudentData = current(getData($result));
+
+			$aufmerksamdurch_kurzbz = $prestudentData->aufmerksamdurch_kurzbz == '' ? 'null' : $prestudentData->aufmerksamdurch_kurzbz;
+			$studiengang_kz = $prestudentData->studiengang_kz == '' ? 'null' : $prestudentData->studiengang_kz;
+			$berufstaetigkeit_code = $prestudentData->berufstaetigkeit_code == '' ? 'null' : $prestudentData->berufstaetigkeit_code;
+			$ausbildungcode = $prestudentData->ausbildungcode == '' ? 'null' : $prestudentData->ausbildungcode;
+			$zgv_code = $prestudentData->zgv_code == '' ? 'null' : $prestudentData->zgv_code;
+			$zgvort = $prestudentData->zgvort == '' ? 'null' : $prestudentData->zgvort;
+			$zgvdatum = $prestudentData->zgvdatum == '' ? 'null' : $prestudentData->zgvdatum;
+			$zgvnation = $prestudentData->zgvnation == '' ? 'null' : $prestudentData->zgvnation;
+			$zgv_erfuellt = $prestudentData->zgv_erfuellt == '' ? 'null' : $prestudentData->zgv_erfuellt;
+			$zgvmas_code = $prestudentData->zgvmas_code == '' ? 'null' : $prestudentData->zgvmas_code;
+			$zgvmaort = $prestudentData->zgvmaort == '' ? 'null' : $prestudentData->zgvmaort;
+			$zgvmadatum = $prestudentData->zgvmadatum == '' ? 'null' : $prestudentData->zgvmadatum;
+			$zgvmanation = $prestudentData->zgvmanation == '' ? 'null' : $prestudentData->zgvmanation;
+			$zgvmas_erfuellt = $prestudentData->zgvmas_erfuellt == '' ? 'null' : $prestudentData->zgvmas_erfuellt;
+			$aufnahmeschluessel = $prestudentData->aufnahmeschluessel == '' ? 'null' : $prestudentData->aufnahmeschluessel;
+			$facheinschlberuf = $prestudentData->facheinschlberuf == '' ? 'null' : $prestudentData->facheinschlberuf;
+			$anmeldungreihungstest = $prestudentData->anmeldungreihungstest == '' ? 'null' : $prestudentData->anmeldungreihungstest;
+			$reihungstestangetreten = $prestudentData->reihungstestangetreten == 1 ? 'true' : 'false';
+			$reihungstest_id = $prestudentData->reihungstest_id == '' ? 'null' : $prestudentData->reihungstest_id;
+			$rt_gesamtpunkte = $prestudentData->rt_gesamtpunkte == '' ? 'null' : $prestudentData->rt_gesamtpunkte;
+			$rt_punkte1 = $prestudentData->rt_punkte1 == '' ? 'null' : $prestudentData->rt_punkte1;
+			$rt_punkte2 = $prestudentData->rt_punkte2 == '' ? 'null' : $prestudentData->rt_punkte2;
+			$rt_punkte3 = $prestudentData->rt_punkte3 == '' ? 'null' : $prestudentData->rt_punkte3;
+			$bismelden = $prestudentData->bismelden == 1 ? 'true' : 'false';
+			$person_id = $prestudentData->person_id == '' ? 'null' : $prestudentData->person_id;
+			$anmerkung = $prestudentData->anmerkung == '' ? 'null' : $prestudentData->anmerkung;
+			$mentor = $prestudentData->mentor == '' ? 'null' : $prestudentData->mentor;
+			$ext_id = $prestudentData->ext_id == '' ? 'null' : $prestudentData->ext_id;
+			$dual = $prestudentData->dual == 1 ? 'true' : 'false';
+			$ausstellungsstaat = $prestudentData->ausstellungsstaat == '' ? 'null' : $prestudentData->ausstellungsstaat;
+			$zgvdoktor_code = $prestudentData->zgvdoktor_code == '' ? 'null' : $prestudentData->zgvdoktor_code;
+			$zgvdoktorort = $prestudentData->zgvdoktorort == '' ? 'null' : $prestudentData->zgvdoktorort;
+			$zgvdoktordatum = $prestudentData->zgvdoktordatum == '' ? 'null' : $prestudentData->zgvdoktordatum;
+			$zgvdoktornation = $prestudentData->zgvdoktornation == '' ? 'null' : $prestudentData->zgvdoktornation;
+			$gsstudientyp_kurzbz = $prestudentData->gsstudientyp_kurzbz == '' ? 'null' : $prestudentData->gsstudientyp_kurzbz;
+			$aufnahmegruppe_kurzbz = $prestudentData->aufnahmegruppe_kurzbz == '' ? 'null' : $prestudentData->aufnahmegruppe_kurzbz;
+			$priorisierung = $prestudentData->priorisierung == '' ? 'null' : $prestudentData->priorisierung;
+			$zgvdoktor_erfuellt= $prestudentData->zgvdoktor_erfuellt == '' ? 'null' : $prestudentData->zgvdoktor_erfuellt;
+
+			$quotes_aufmerksamdurch_kurzbz = $aufmerksamdurch_kurzbz == "null" ? " " : "'";
+			$quotes_studiengang_kz = $studiengang_kz == "null" ? " " : "'";
+			$quotes_berufstaetigkeit_code = $berufstaetigkeit_code == "null" ? " " : "'";
+			$quotes_ausbildungcode = $ausbildungcode == "null" ? " " : "'";
+			$quotes_zgv_code = $zgv_code == "null" ? " " : "'";
+			$quotes_zgvort = $zgvort == "null" ? " " : "'";
+			$quotes_zgvdatum = $zgvdatum == "null" ? " " : "'";
+			$quotes_zgvnation = $zgvnation == "null" ? " " : "'";
+			$quotes_zgv_erfuellt = $zgv_erfuellt == "null" ? " " : "'";
+			$quotes_zgvmas_code = $zgvmas_code == "null" ? " " : "'";
+			$quotes_zgvmaort = $zgvmaort == "null" ? " " : "'";
+			$quotes_zgvmadatum = $zgvmadatum == "null" ? " " : "'";
+			$quotes_zgvmanation = $zgvmanation == "null" ? " " : "'";
+			$quotes_zgvmas_erfuellt = $zgvmas_erfuellt == "null" ? " " : "'";
+			$quotes_aufnahmeschluessel = $aufnahmeschluessel == "null" ? " " : "'";
+			$quotes_facheinschlberuf = $facheinschlberuf == "null" ? " " : "'";
+			$quotes_anmeldungreihungstest = $anmeldungreihungstest == "null" ? " " : "'";
+			$quotes_reihungstestangetreten = $reihungstestangetreten == "null" ? " " : "'";
+			$quotes_reihungstest_id = $reihungstest_id == "null" ? " " : "'";
+			$quotes_rt_gesamtpunkte = $rt_gesamtpunkte == "null" ? " " : "'";
+			$quotes_rt_punkte1 = $rt_punkte1 == "null" ? " " : "'";
+			$quotes_rt_punkte2 = $rt_punkte2 == "null" ? " " : "'";
+			$quotes_rt_punkte3 = $rt_punkte3 == "null" ? " " : "'";
+			$quotes_bismelden = $bismelden == "null" ? " " : "'";
+			$quotes_person_id = $person_id == "null" ? " " : "'";
+			$quotes_anmerkung = $anmerkung == "null" ? " " : "'";
+			$quotes_mentor = $mentor == "null" ? " " : "'";
+			$quotes_ext_id = $ext_id == "null" ? " " : "'";
+			$quotes_dual = $dual == "null" ? " " : "'";
+			$quotes_ausstellungsstaat = $ausstellungsstaat == "null" ? " " : "'";
+			$quotes_zgvdoktor_code = $zgvdoktor_code == "null" ? " " : "'";
+			$quotes_zgvdoktorort = $zgvdoktorort == "null" ? " " : "'";
+			$quotes_zgvdoktordatum = $zgvdoktordatum == "null" ? " " : "'";
+			$quotes_zgvdoktornation = $zgvdoktornation == "null" ? " " : "'";
+			$quotes_gsstudientyp_kurzbz = $gsstudientyp_kurzbz == "null" ? " " : "'";
+			$quotes_aufnahmegruppe_kurzbz = $aufnahmegruppe_kurzbz == "null" ? " " : "'";
+			$quotes_priorisierung = $priorisierung == "null" ? " " : "'";
+			$quotes_zgvdoktor_erfuellt = $zgvdoktor_erfuellt == "null" ? " " : "'";
+
+
+			$sqlundo =
+				"
+	INSERT INTO public.tbl_prestudent(prestudent_id, aufmerksamdurch_kurzbz, studiengang_kz, berufstaetigkeit_code, ausbildungcode,
+				zgv_code, zgvort, zgvdatum, zgvnation,zgv_erfuellt, zgvmas_code, zgvmaort, zgvmadatum, zgvmanation,zgvmas_erfuellt,
+				aufnahmeschluessel, facheinschlberuf, anmeldungreihungstest, reihungstestangetreten, reihungstest_id,
+				rt_gesamtpunkte, rt_punkte1, rt_punkte2, rt_punkte3, bismelden, person_id, anmerkung, mentor, ext_id,
+				dual, ausstellungsstaat, zgvdoktor_code, zgvdoktorort, zgvdoktordatum, zgvdoktornation,
+				gsstudientyp_kurzbz, aufnahmegruppe_kurzbz, priorisierung, zgvdoktor_erfuellt) 
+	VALUES('" . $prestudent_id . "',"
+				. $quotes_aufmerksamdurch_kurzbz . $aufmerksamdurch_kurzbz . $quotes_aufmerksamdurch_kurzbz . ","
+				. $quotes_studiengang_kz . $studiengang_kz . $quotes_studiengang_kz . ","
+				. $quotes_berufstaetigkeit_code . $berufstaetigkeit_code . $quotes_berufstaetigkeit_code . ","
+				. $quotes_ausbildungcode . $ausbildungcode . $quotes_ausbildungcode . ","
+				. $quotes_zgv_code . $zgv_code . $quotes_zgv_code . ","
+				. $quotes_zgvort . $zgvort . $quotes_zgvort . ","
+				. $quotes_zgvdatum . $zgvdatum . $quotes_zgvdatum . ","
+				. $quotes_zgvnation . $zgvnation . $quotes_zgvnation . ","
+				. $quotes_zgv_erfuellt . $zgv_erfuellt . $quotes_zgv_erfuellt . ","
+				. $quotes_zgvmas_code . $zgvmas_code . $quotes_zgvmas_code . ","
+				. $quotes_zgvmaort . $zgvmaort . $quotes_zgvmaort . ","
+				. $quotes_zgvmadatum . $zgvmadatum . $quotes_zgvmadatum . ","
+				. $quotes_zgvmanation . $zgvmanation . $quotes_zgvmanation . ","
+				. $quotes_zgvmas_erfuellt . $zgvmas_erfuellt . $quotes_zgvmas_erfuellt . ","
+				. $quotes_aufnahmeschluessel . $aufnahmeschluessel . $quotes_aufnahmeschluessel . ","
+				. $quotes_facheinschlberuf . $facheinschlberuf . $quotes_facheinschlberuf . ","
+				. $quotes_anmeldungreihungstest . $anmeldungreihungstest . $quotes_anmeldungreihungstest . ","
+				. $quotes_reihungstestangetreten . $reihungstestangetreten . $quotes_reihungstestangetreten . ","
+				. $quotes_reihungstest_id . $reihungstest_id . $quotes_reihungstest_id . ","
+				. $quotes_rt_gesamtpunkte . $rt_gesamtpunkte . $quotes_rt_gesamtpunkte . ","
+				. $quotes_rt_punkte1 . $rt_punkte1 . $quotes_rt_punkte1 . ","
+				. $quotes_rt_punkte2 . $rt_punkte2 . $quotes_rt_punkte2 . ","
+				. $quotes_rt_punkte3 . $rt_punkte3 . $quotes_rt_punkte3 . ","
+				. $quotes_bismelden . $bismelden . $quotes_bismelden . ","
+				. $quotes_person_id . $person_id . $quotes_person_id . ","
+				. $quotes_anmerkung . $anmerkung . $quotes_anmerkung . ","
+				. $quotes_mentor . $mentor . $quotes_mentor . ","
+				. $quotes_ext_id . $ext_id . $quotes_ext_id . ","
+				. $quotes_dual . $dual . $quotes_dual . ","
+				. $quotes_ausstellungsstaat . $ausstellungsstaat . $quotes_ausstellungsstaat . ","
+				. $quotes_zgvdoktor_code . $zgvdoktor_code . $quotes_zgvdoktor_code . ","
+				. $quotes_zgvdoktorort . $zgvdoktorort . $quotes_zgvdoktorort . ","
+				. $quotes_zgvdoktordatum . $zgvdoktordatum . $quotes_zgvdoktordatum . ","
+				. $quotes_zgvdoktornation . $zgvdoktornation . $quotes_zgvdoktornation . ","
+				. $quotes_gsstudientyp_kurzbz . $gsstudientyp_kurzbz . $quotes_gsstudientyp_kurzbz . ","
+				. $quotes_aufnahmegruppe_kurzbz . $aufnahmegruppe_kurzbz . $quotes_aufnahmegruppe_kurzbz . ","
+				. $quotes_priorisierung . $priorisierung . $quotes_priorisierung . ","
+				. $quotes_zgvdoktor_erfuellt . $zgvdoktor_erfuellt . $quotes_zgvdoktor_erfuellt . ");
+	";
+
+			$this->load->model('system/Log_model', 'LogModel');
+			$result = $this->LogModel->insert([
+				'mitarbeiter_uid' => $uid,
+				'beschreibung' => $beschreibung,
+				'sql' => $sql,
+				'sqlundo' => $sqlundo
+			]);
+			if (isError($result) || !hasData($result))
+			{
+				return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			}
+
+			//$logId = $result->retval;
+
+			//independent transaction
+			$this->db->trans_start();
+
+			$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+			$result = $this->PrestudentModel->delete(
+				array(
+					'prestudent_id' => $prestudent_id
+				)
+			);
+			if ($this->db->trans_status() === false)
+			{
+				$this->db->trans_rollback();
+				$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			}
+			$this->db->trans_commit();
+			$this->terminateWithSuccess($result);
+		}
+		$this->db->trans_commit();
+
+		return $this->terminateWithSuccess(true);
+	}
+
+	public function updateStatus($key_prestudent_id, $key_status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester)
+	{
+		$isStudent = false;
+		$isBerechtigtNoStudstatusCheck =  $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung');
+
+		//get Studiengang von prestudent_id
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+		$result = $this->PrestudentModel->load([
+			'prestudent_id'=> $key_prestudent_id,
+		]);
+		if(isError($result))
+		{
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		$result = current(getData($result));
+
+		$stg = $result->studiengang_kz;
+
+		if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg))
+		{
+			return $this->terminateWithError($this->p->t('lehre','error_keineSchreibrechte'), self::ERROR_TYPE_GENERAL);
+		}
+
+		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
+
+		$uid = getAuthUID();
+		$prestudent_id = $this->input->post('prestudent_id');
+		$status_kurzbz = $this->input->post('status_kurzbz');
+		$ausbildungssemester = $this->input->post('ausbildungssemester');
+		$datum = $this->input->post('datum');
+		$bestaetigtam = $this->input->post('bestaetigtam');
+		$bewerbung_abgeschicktamum = $this->input->post('bewerbung_abgeschicktamum');
+		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
+		$studienplan_id = $this->input->post('studienplan_id');
+		$anmerkung  = $this->input->post('anmerkung');
+		$statusgrund_id = $this->input->post('statusgrund_id');
+		$rt_stufe = $this->input->post('rt_stufe');
+		$bestaetigtvon = $uid;
+
+		//check if Bismeldestichtag erreicht
+		if(!$isBerechtigtNoStudstatusCheck)
+		{
+			// only check datum (without semester)
+			$this->load->model('codex/Bismeldestichtag_model', 'BismeldestichtagModel');
+			/*			$result = $this->BismeldestichtagModel->checkIfMeldestichtagErreicht($datum, $studiensemester_kurzbz);*/
+			$result = $this->BismeldestichtagModel->checkIfMeldestichtagErreicht($datum);
+			if (isError($result))
+			{
+				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			}
+			if ($result->retval == "1")
+			{
+				return $this->terminateWithError($this->p->t('lehre','error_dataVorMeldestichtag'), self::ERROR_TYPE_GENERAL);
+			}
+		}
+
+		//check if Rolle already exists
+		if(($key_studiensemester_kurzbz != $studiensemester_kurzbz)
+			|| ($key_ausbildungssemester != $ausbildungssemester))
+		{
+			$result = $this->PrestudentstatusModel->checkIfExistingPrestudentRolle(
+				$prestudent_id,
+				$status_kurzbz,
+				$studiensemester_kurzbz,
+				$ausbildungssemester
+			);
+			if (isError($result))
+			{
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return $this->outputJson(getError($result));
+			}
+			if($result->retval == '1')
+			{
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return $this->outputJson($result->code);
+			}
+		}
+
+		//check if studentrolle already exists
+		if($status_kurzbz == 'Student' || $status_kurzbz == 'Diplomand')
+		{
+			$this->load->model('crm/Student_model', 'StudentModel');
+			$result = $this->StudentModel->checkIfExistingStudentRolle($prestudent_id);
+			if (isError($result))
+			{
+				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			}
+			if($result->retval == "0")
+			{
+				return $this->terminateWithError($this->p->t('lehre','error_noStudstatus'), self::ERROR_TYPE_GENERAL);
+			}
+			if($result->retval != "0")
+			{
+				$isStudent = true;
+			}
+		}
+
+
+		if(!$isBerechtigtNoStudstatusCheck)
+		{
+			//Block STATUSCHECKS
+
+			$result = $this->PrestudentstatusModel->checkIfValidStatusHistory(
+				$prestudent_id,
+				$status_kurzbz,
+				$studiensemester_kurzbz,
+				$datum,
+				$ausbildungssemester
+			);
+			if (isError($result))
+			{
+				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			}
+		}
+
+
+		// Start DB transaction
+		$this->db->trans_begin();
+
+		//update status
+		$result = $this->PrestudentstatusModel->update(
+			[
+				'prestudent_id' => $key_prestudent_id,
+				'status_kurzbz' => $key_status_kurzbz,
+				'studiensemester_kurzbz' => $key_studiensemester_kurzbz,
+				'ausbildungssemester' => $key_ausbildungssemester,
+			],
+			[
+				'status_kurzbz' => $status_kurzbz,
+				'studiensemester_kurzbz' => $studiensemester_kurzbz,
+				'ausbildungssemester' => $ausbildungssemester,
+				'bewerbung_abgeschicktamum' => $bewerbung_abgeschicktamum,
+				'studienplan_id' => $studienplan_id,
+				'anmerkung' => $anmerkung,
+				'statusgrund_id' => $statusgrund_id,
+				'updatevon' => $uid,
+				'updateamum' => date('c'),
+				'bestaetigtam' => $bestaetigtam,
+				'bestaetigtvon' => $bestaetigtvon,
+				'datum' => $datum,
+				'rt_stufe' => $rt_stufe
+			]
+		);
+		if (isError($result))
+		{
+			$this->db->trans_rollback();
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson(getError($result));
+		}
+
+
+		if($isStudent)
+		{
+			//check Studentlehrverband
+			$this->load->model('crm/Student_model', 'StudentModel');
+			$result = $this->StudentModel->checkIfUid($prestudent_id);
+			if (isError($result))
+			{
+				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			}
+			if (!hasData($result))
+			{
+				$this->terminateWithError($this->p->t('lehre','error_no_student_for_prestudent'), self::ERROR_TYPE_GENERAL);
+			}
+			$student_uid = $result->retval;
+
+			//process studentlehrverband
+			$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
+			$result = $this->StudentlehrverbandModel->loadWhere(
+				array(
+					'student_uid' => $student_uid,
+					'studiensemester_kurzbz' => $studiensemester_kurzbz
+				)
+			);
+			if (isError($result))
+			{
+				$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			}
+
+			//Data of current Semester
+			$studentlvbData = current(getData($result) ? : []);
+
+			$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
+			$result = $this->StudentlehrverbandModel->processStudentlehrverband(
+				$student_uid,
+				$studentlvbData->studiengang_kz,
+				$ausbildungssemester,
+				$studentlvbData->verband,
+				$studentlvbData->gruppe,
+				$studiensemester_kurzbz
+			);
+			if ($this->db->trans_status() === false || isError($result))
+			{
+				$this->db->trans_rollback();
+				return $this->terminateWithError($this->p->t('lehre','error_duringInsertUpdateLehrverband'), self::ERROR_TYPE_GENERAL);
+			}
+		}
+		$this->db->trans_commit();
+		return $this->outputJsonSuccess(true);
+	}
+
+	public function advanceStatus($key_prestudent_id, $key_status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester)
+	{
+		$isStudent = false;
+
+		//get Studiengang von prestudent_id
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+		$result = $this->PrestudentModel->load([
+			'prestudent_id'=> $key_prestudent_id,
+		]);
+		if(isError($result))
+		{
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		$result = current(getData($result));
+
+		$stg = $result->studiengang_kz;
+
+		if(!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg))
+		{
+			return $this->terminateWithError($this->p->t('lehre','error_keineSchreibrechte'), self::ERROR_TYPE_GENERAL);
+		}
+
+		//Data Vorrücken
+		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
+
+		$result = $this->PrestudentstatusModel->loadWhere(
+			array(
+				'prestudent_id' => $key_prestudent_id,
+				'status_kurzbz' => $key_status_kurzbz,
+				'ausbildungssemester' => $key_ausbildungssemester,
+				'studiensemester_kurzbz' => $key_studiensemester_kurzbz
+			)
+		);
+
+		if (isError($result))
+		{
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+
+		elseif (!hasData($result))
+		{
+			return $this->terminateWithError($this->p->t('lehre','error_noStatusFound'), self::ERROR_TYPE_GENERAL);
+		}
+		else
+		{
+			$statusData = current(getData($result));
+		}
+
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+		$result = $this->StudiensemesterModel->getNextFrom($key_studiensemester_kurzbz);
+
+		if (isError($result))
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson(getError($result));
+		}
+		$studiensem_next = current(getData($result));
+		$studiensem_next = $studiensem_next->studiensemester_kurzbz;
+
+		$ausbildungssem_next = $key_ausbildungssemester+1;
+
+		//check if Rolle already exists
+		$result = $this->PrestudentstatusModel->checkIfExistingPrestudentRolle(
+			$key_prestudent_id,
+			$key_status_kurzbz,
+			$studiensem_next,
+			$ausbildungssem_next
+		);
+		if (isError($result))
+		{
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		if($result->retval == '1')
+		{
+			return $this->terminateWithError($this->p->t('lehre','error_rolleBereitsVorhanden'), self::ERROR_TYPE_GENERAL);
+		}
+
+		//check if studentrolle already exists
+		if($key_status_kurzbz == 'Student')
+		{
+			$this->load->model('crm/Student_model', 'StudentModel');
+			$result = $this->StudentModel->checkIfExistingStudentRolle($key_prestudent_id);
+			if (isError($result))
+			{
+				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			}
+			if ($result->retval == "0")
+			{
+				return $this->terminateWithError($this->p->t('lehre','error_noStudstatus'), self::ERROR_TYPE_GENERAL);
+			}
+		}
+
+		// Start DB transaction
+		$this->db->trans_begin();
+
+		//insert prestudentstatus
+		$uid = getAuthUID();
+		$result = $this->PrestudentstatusModel->insert(
+			[
+				'prestudent_id' => $key_prestudent_id,
+				'status_kurzbz' => $key_status_kurzbz,
+				'studiensemester_kurzbz' => $studiensem_next,
+				'ausbildungssemester' => $ausbildungssem_next,
+				'insertamum' => date('c'),
+				'insertvon' => $uid,
+				'bestaetigtam' => date('c'),
+				'bestaetigtvon' => $uid,
+				'studienplan_id' => $statusData->studienplan_id,
+				'datum' => date('c'),
+				'anmerkung' => $statusData->anmerkung
+			]
+		);
+
+		if (isError($result))
+		{
+			$this->db->trans_rollback();
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+
+		$this->load->model('crm/Student_model', 'StudentModel');
+		$result = $this->StudentModel->checkIfUid($key_prestudent_id);
+		if(isError($result))
+		{
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		if (!hasData($result))
+		{
+			$this->terminateWithError($this->p->t('lehre','error_no_student_for_prestudent'), self::ERROR_TYPE_GENERAL);
+		}
+		$student_uid = $result->retval;
+
+		//process studentlehrverband
+		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
+		$result = $this->StudentlehrverbandModel->loadWhere(
+			array(
+				'student_uid' => $student_uid,
+				'studiensemester_kurzbz' => $key_studiensemester_kurzbz
+			)
+		);
+		if (isError($result))
+		{
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+
+		//Data of current Semester
+		$result = getData($result) ? : [];
+		$studentlvbData = current($result);
+
+		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
+		$result = $this->StudentlehrverbandModel->processStudentlehrverband(
+			$student_uid,
+			$studentlvbData->studiengang_kz,
+			$ausbildungssem_next,
+			$studentlvbData->verband,
+			$studentlvbData->gruppe,
+			$studiensem_next
+		);
+		if ($this->db->trans_status() === false || isError($result))
+		{
+			$this->db->trans_rollback();
+			return $this->terminateWithError($this->p->t('lehre','error_duringInsertUpdateLehrverband'), self::ERROR_TYPE_GENERAL);
+		}
+
+		$this->db->trans_commit();
+
+		return $this->outputJsonSuccess(true);
+	}
+
+	public function confirmStatus($key_prestudent_id, $key_status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester)
+	{
+		$uid = getAuthUID();
+
+		//get Studiengang von prestudent_id
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+		$result = $this->PrestudentModel->load([
+			'prestudent_id'=> $key_prestudent_id,
+		]);
+		if(isError($result))
+		{
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		$result = current(getData($result));
+
+		$stg = $result->studiengang_kz;
+
+		if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg))
+		{
+			return $this->terminateWithError($this->p->t('lehre','error_keineSchreibrechte'), self::ERROR_TYPE_GENERAL);
+		}
+
+		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
+
+		$result = $this->PrestudentstatusModel->loadWhere(
+			array(
+				'prestudent_id' => $key_prestudent_id,
+				'status_kurzbz' => $key_status_kurzbz,
+				'ausbildungssemester' => $key_ausbildungssemester,
+				'studiensemester_kurzbz' => $key_studiensemester_kurzbz
+			)
+		);
+
+		if (isError($result))
+		{
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+
+		elseif (!hasData($result))
+		{
+			return $this->terminateWithError($this->p->t('lehre','error_noStatusFound'), self::ERROR_TYPE_GENERAL);
+		}
+
+		$statusData = current(getData($result));
+
+		//check if Status is unconfirmed..
+		if($statusData->bestaetigtam != null)
+		{
+			//return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			return $this->terminateWithError($this->p->t('lehre','error_statusConfirmedYet'), self::ERROR_TYPE_GENERAL);
+		}
+
+		//check if Bewerbung abgeschickt
+		if($statusData->bewerbung_abgeschicktamum == null)
+		{
+			return $this->terminateWithError($this->p->t('lehre','error_bewerbungNochNichtAbgeschickt'), self::ERROR_TYPE_GENERAL);
+		}
+
+		$result = $this->PrestudentstatusModel->update(
+			[
+				'prestudent_id' => $key_prestudent_id,
+				'status_kurzbz' => $key_status_kurzbz,
+				'studiensemester_kurzbz' => $key_studiensemester_kurzbz,
+				'ausbildungssemester' => $key_ausbildungssemester,
+			],
+			[
+				'prestudent_id' => $key_prestudent_id,
+				'status_kurzbz' => $key_status_kurzbz,
+				'studiensemester_kurzbz' => $key_studiensemester_kurzbz,
+				'ausbildungssemester' => $key_ausbildungssemester,
+				'bestaetigtam' => date('c'),
+				'bestaetigtvon' => $uid,
+				'updateamum' => date('c'),
+				'updatevon' => $uid
+			]
+		);
+		if (isError($result))
+		{
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->outputJsonSuccess(true);
+	}
+}
diff --git a/application/controllers/components/stv/Prestudent.php b/application/controllers/components/stv/Prestudent.php
deleted file mode 100644
index 2a1364c87..000000000
--- a/application/controllers/components/stv/Prestudent.php
+++ /dev/null
@@ -1,316 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use \DateTime as DateTime;
-
-class Prestudent extends FHC_Controller
-{
-	public function __construct()
-	{
-		parent::__construct();
-
-		// Load Libraries
-		$this->load->library('AuthLib');
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-
-
-		// Load language phrases
-		$this->loadPhrases([
-			'ui', 'studierendenantrag'
-		]);
-	}
-
-	public function get($prestudent_id)
-	{
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-
-		$this->PrestudentModel->addSelect('*');
-		$result = $this->PrestudentModel->loadWhere(['prestudent_id' => $prestudent_id]);
-
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			$this->outputJson(getError($result));
-		} elseif (!hasData($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_NOT_FOUND);
-			$this->outputJson('NOT FOUND');
-		} else {
-			$this->outputJson(current(getData($result)));
-		}
-	}
-
-	public function updatePrestudent($prestudent_id)
-	{
-		$this->load->library('form_validation');
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-
-		//get Studiengang von prestudent_id
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-		$result = $this->PrestudentModel->load([
-			'prestudent_id'=> $prestudent_id,
-		]);
-		if(isError($result))
-		{
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson(getError($result));
-		}
-		$result = current(getData($result));
-
-		$stg = $result->studiengang_kz;
-
-		if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg))
-		{
-			$result =  $this->p->t('lehre','error_keineSchreibrechte');
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson($result);
-		}
-
-		//TODO(Manu)  API Controller
-		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-
-
-		//Form validation
-		$this->form_validation->set_rules('priorisierung', 'Priorisierung', 'numeric', [
-			'numeric' => $this->p->t('ui','error_fieldNotNumeric',['field' => 'Priorisierung'])
-		]);
-
-		if ($this->form_validation->run() == false)
-		{
-			return $this->outputJsonError($this->form_validation->error_array());
-		}
-
-		$deltaData = $_POST;
-
-		if(!$prestudent_id)
-		{
-			return $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-		}
-
-		$uid = getAuthUID();
-
-		$array_allowed_props_prestudent = [
-			'aufmerksamdurch_kurzbz',
-			'studiengang_kz',
-			'gsstudientyp_kurzbz',
-			'person_id',
-			'berufstaetigkeit_code',
-			'ausbildungcode',
-			'zgv_code',
-			'zgvort',
-			'zgvdatum',
-			'zgvnation',
-			'zgvmas_code',
-			'zgvmaort',
-			'zgvmadatum',
-			'zgvmanation',
-			'facheinschlberuf',
-			'bismelden',
-			'anmerkung',
-			'dual',
-			'zgvdoktor_code',
-			'zgvdoktorort',
-			'zgvdoktordatum',
-			'zgvdoktornation',
-			'aufnahmegruppe_kurzbz',
-			'priorisierung',
-			'foerderrelevant',
-			'zgv_erfuellt',
-			'zgvmas_erfuellt',
-			'zgvdoktor_erfuellt',
-			'mentor',
-			'aufnahmeschluessel',
-			'standort_code'
-		];
-
-		$update_prestudent = array();
-		foreach ($array_allowed_props_prestudent as $prop)
-		{
-			$val = isset($deltaData[$prop]) ? $deltaData[$prop] : null;
-			if ($val !== null || $prop == 'foerderrelevant') {
-				$update_prestudent[$prop] = $val;
-			}
-		}
-
-		$update_prestudent['updateamum'] = date('c');
-		$update_prestudent['updatevon'] = $uid;
-
-		//utf8-decode for special chars (eg tag der offenen Tür, FH-Führer)
-		function utf8_decode_if_string($value)
-		{
-			if (is_string($value)) {
-				return utf8_decode($value);
-			} else {
-				return $value;
-			}
-		}
-		$update_prestudent_encoded = array_map('utf8_decode_if_string', $update_prestudent);
-
-		if (count($update_prestudent) && $prestudent_id === null) {
-			$this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST);
-			// TODO(manu): check phrase
-			//return $this->outputJson("Kein/e PrestudentIn vorhanden!");
-			return $this->outputJson($this->p->t('studierendenantrag','error_no_prestudent', $prestudent_id));
-		}
-
-		if (count($update_prestudent))
-		{
-			$result = $this->PrestudentModel->update(
-				$prestudent_id,
-				$update_prestudent_encoded
-			);
-			if (isError($result)) {
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson(getError($result));
-			}
-			return $this->outputJsonSuccess(true);
-		}
-	}
-
-	public function getHistoryPrestudents($person_id)
-	{
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-
-		$result = $this->PrestudentModel->getHistoryPrestudents($person_id);
-		if (isError($result))
-		{
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-		}
-		$this->outputJson(getData($result) ?: []);
-	}
-
-	public function getBezeichnungZgv()
-	{
-		$this->load->model('codex/Zgv_model', 'ZgvModel');
-
-		$this->ZgvModel->addOrder('zgv_code');
-
-		$result = $this->ZgvModel->load();
-		if (isError($result))
-		{
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-		}
-		$this->outputJson($result);
-	}
-
-	public function getBezeichnungDZgv()
-	{
-		$this->load->model('codex/Zgvdoktor_model', 'ZgvdoktorModel');
-
-		$this->ZgvdoktorModel->addOrder('zgvdoktor_code');
-
-		$result = $this->ZgvdoktorModel->load();
-		if (isError($result))
-		{
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-		}
-		$this->outputJson($result);
-	}
-
-	public function getBezeichnungMZgv()
-	{
-		$this->load->model('codex/Zgvmaster_model', 'ZgvmasterModel');
-
-		$this->ZgvmasterModel->addOrder('zgvmas_code');
-
-		$result = $this->ZgvmasterModel->load();
-		if (isError($result))
-		{
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-		}
-		$this->outputJson($result);
-	}
-
-	public function getAusbildung()
-	{
-		$this->load->model('codex/Ausbildung_model', 'AusbildungModel');
-
-		$this->AusbildungModel->addOrder('ausbildungcode');
-
-		$result = $this->AusbildungModel->load();
-		if (isError($result))
-		{
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-		}
-		$this->outputJson($result);
-	}
-
-	public function getAufmerksamdurch()
-	{
-		$this->load->model('codex/Aufmerksamdurch_model', 'AufmerksamdurchModel');
-
-		$this->AufmerksamdurchModel->addOrder('aufmerksamdurch_kurzbz');
-
-		$result = $this->AufmerksamdurchModel->load();
-		if (isError($result))
-		{
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-		}
-		$this->outputJson($result);
-	}
-
-	public function getBerufstaetigkeit()
-	{
-		$this->load->model('codex/Berufstaetigkeit_model', 'BerufstaetigkeitModel');
-
-		$this->BerufstaetigkeitModel->addOrder('berufstaetigkeit_code');
-
-		$result = $this->BerufstaetigkeitModel->load();
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-		}
-		$this->outputJson($result);
-	}
-
-	public function getTypenStg()
-	{
-		$this->load->model('education/Gsstudientyp_model', 'GsstudientypModel');
-
-		$this->GsstudientypModel->addOrder('gsstudientyp_kurzbz');
-
-		$result = $this->GsstudientypModel->load();
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-		}
-		$this->outputJson($result);
-	}
-
-	public function getStudiensemester()
-	{
-		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-
-		$this->StudiensemesterModel->addOrder('start', 'DESC');
-		$this->StudiensemesterModel->addLimit(20);
-
-		$result = $this->StudiensemesterModel->load();
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-		}
-		$this->outputJson($result);
-	}
-
-	public function getStudienplaene($prestudent_id)
-	{
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-
-		$result = $this->PrestudentModel->loadWhere(
-			array('prestudent_id' => $prestudent_id)
-		);
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-		}
-
-		$result = current(getData($result));
-		$studiengang_kz = $result->studiengang_kz;
-
-		$this->load->model('organisation/Studienplan_model', 'StudienplanModel');
-
-		$this->StudienplanModel->addOrder('studienplan_id', 'DESC');
-
-		$result = $this->StudienplanModel->getStudienplaene($studiengang_kz);
-
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-		}
-		$this->outputJson($result);
-	}
-}
diff --git a/application/controllers/components/stv/Status.php b/application/controllers/components/stv/Status.php
deleted file mode 100644
index ac880be37..000000000
--- a/application/controllers/components/stv/Status.php
+++ /dev/null
@@ -1,1399 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use \DateTime as DateTime;
-
-class Status extends FHC_Controller
-{
-	public function __construct()
-	{
-		parent::__construct();
-
-		// Load Libraries
-		$this->load->library('AuthLib');
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-		$this->load->library('PermissionLib');
-
-		// Load language phrases
-		$this->loadPhrases([
-					'ui', 'bismeldestichtag','lehre'
-				]);
-	}
-
-	public function getHistoryPrestudent($prestudent_id)
-	{
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-
-		$result = $this->PrestudentModel->getHistoryPrestudent($prestudent_id);
-		if (isError($result))
-		{
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-		}
-		$this->outputJson(getData($result) ?: []);
-	}
-
-	public function getStatusgruende()
-	{
-		$this->load->model('crm/Statusgrund_model', 'StatusgrundModel');
-
-		$result = $this->StatusgrundModel->load();
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-		}
-		$this->outputJson($result);
-	}
-
-	public function getLastBismeldestichtag()
-	{
-		$this->load->model('codex/Bismeldestichtag_model', 'BismeldestichtagModel');
-
-		$result = $this->BismeldestichtagModel->getLastReachedMeldestichtag();
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-		}
-		$this->outputJson($result);
-	}
-
-	public function isLastStatus($prestudent_id)
-	{
-		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
-		$result = $this->PrestudentstatusModel->checkIfLastStatusEntry($prestudent_id);
-		if (isError($result))
-		{
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson($result);
-		}
-		if($result->retval == "1")
-		{
-				return $this->outputJson($result->retval);
-		}
-		$this->outputJson($result);
-	}
-
-	public function addNewStatus($prestudent_id)
-	{
-		//get Studiengang von prestudent_id
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-		$this->PrestudentModel->addJoin('public.tbl_person p', 'ON (p.person_id = public.tbl_prestudent.person_id)');
-		$result = $this->PrestudentModel->load([
-			'prestudent_id'=> $prestudent_id,
-		]);
-		if(isError($result))
-		{
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson(getError($result));
-		}
-		$result = current(getData($result));
-
-		//Variablen für Statuscheck
-		$stg = $result->studiengang_kz;
-		$reihungstest_angetreten = $result->reihungstestangetreten;
-		$name = trim($result->vorname . " ". $result->nachname);
-		$zgv_code = $result->zgv_code;
-
-		$isStudent = false;
-
-		if(!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg))
-		{
-			$result = "Sie haben keine Schreibrechte fuer diesen Studiengang!";
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson($result);
-		}
-
-		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
-
-		$uid = getAuthUID();
-		$status_kurzbz = $this->input->post('status_kurzbz');
-		$ausbildungssemester = $this->input->post('ausbildungssemester');
-		$datum = $this->input->post('datum');
-		$bestaetigtam = $this->input->post('bestaetigtam');
-		$bewerbung_abgeschicktamum = $this->input->post('bewerbung_abgeschicktamum');
-		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
-		$anmerkung = $this->input->post('anmerkung');
-		$statusgrund_id = $this->input->post('statusgrund_id');
-		$rt_stufe = $this->input->post('rt_stufe');
-		$bestaetigtvon = $uid;
-
-		//GET lastStatus
-		$result = $this->PrestudentstatusModel->getLastStatus($prestudent_id);
-
-		if (isError($result))
-		{
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson(getError($result));
-		}
-		elseif(!hasData($result))
-		{
-			$lastStatusData = [];
-		}
-		else
-			$lastStatusData = current(getData($result));
-
-		//Different handling depending on newStatus
-		//Todo(manu) check later with multiactions
-		/*		if($status_kurzbz == 'Absolvent' || $status_kurzbz == 'Diplomand')
-				{
-					//$studiensemester = $semester_aktuell;
-					$ausbildungssemester = $lastStatusData->ausbildungssemester;
-				}*/
-
-		/*		if($status_kurzbz != 'Student')
-				{
-					$ausbildungssemester = $lastStatusData->ausbildungssemester;
-				}*/
-
-		//check if Rolle already exists
-		$result = $this->PrestudentstatusModel->checkIfExistingPrestudentRolle(
-			$prestudent_id,
-			$status_kurzbz,
-			$studiensemester_kurzbz,
-			$ausbildungssemester
-		);
-		if (isError($result))
-		{
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson(getError($result));
-		}
-		if($result->retval == '1')
-		{
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson($result->code);
-		}
-
-
-		//Check Reihungstest
-		if(REIHUNGSTEST_CHECK)
-		{
-			if($status_kurzbz=='Bewerber' && !$reihungstest_angetreten)
-			{
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson($name . ": Um einen Interessenten zum Bewerber zu machen, muss die Person das Reihungstestverfahren abgeschlossen haben");
-			}
-		}
-
-		//Check ZGV
-		if(!defined("ZGV_CHECK") || ZGV_CHECK)
-		{
-			if($status_kurzbz=='Bewerber' && $zgv_code=='')
-			{
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson($name . ": Um einen Interessenten zum Bewerber zu machen, muss die Zugangsvoraussetzung eingetragen sein.");
-			}
-		}
-
-		//Check ZGV-Master
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-		$result = $this->StudiengangModel->load([
-			'studiengang_kz'=> $stg
-		]);
-		if(isError($result))
-		{
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson(getError($result));
-		}
-		$result = current(getData($result));
-		$typ = $result->typ;
-
-		if(!defined("ZGV_CHECK") || ZGV_CHECK)
-		{
-			if($status_kurzbz=='Bewerber' && $zgv_code=='' && $typ=='m')
-			{
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson($name . ": Um einen Interessenten zum Bewerber zu machen, muss die Zugangsvoraussetzung Master eingetragen sein.");
-			}
-		}
-
-		//check if bewerberstatus exists
-		if($status_kurzbz == 'Aufgenommener' || $status_kurzbz == 'Wartender')
-		{
-			//TODO(manu) erst später für multiactions releveant
-			//FAS: Aufnahme ist möglich: Beispiel prestudent_id = 129629
-
-			$result = $this->PrestudentstatusModel->checkIfExistingBewerberstatus($prestudent_id, $name);
-			if (isError($result))
-			{
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson(getError($result));
-			}
-			if($result->retval == "0")
-			{
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson($result->code);
-			}
-		}
-
-		//check if studentrolle already exists
-		//TODO(manu) eigener Code für Diplomand?
-		if($status_kurzbz == 'Student' || $status_kurzbz == 'Diplomand')
-		{
-			$this->load->model('crm/Student_model', 'StudentModel');
-			$result = $this->StudentModel->checkIfExistingStudentRolle($prestudent_id);
-			if (isError($result))
-			{
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson(getError($result));
-			}
-			if($result->retval == "0")
-			{
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson($result->code);
-			}
-			if($result->retval != "0")
-			{
-				$isStudent = true;
-			}
-		}
-
-		$isBerechtigtNoStudstatusCheck =  $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung');
-
-		if(!$isBerechtigtNoStudstatusCheck)
-		{
-			//Block STATUSCHECKS
-			$new_status_datum = isset($datum) ? $datum  : date('Y-m-d');
-			$result = $this->PrestudentstatusModel->checkDatumNewStatus($new_status_datum);
-			if (isError($result))
-			{
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson(getError($result));
-			}
-
-			$result = $this->PrestudentstatusModel->checkIfValidStatusHistory(
-				$prestudent_id,
-				$status_kurzbz,
-				$studiensemester_kurzbz,
-				$new_status_datum,
-				$ausbildungssemester
-			);
-			if (isError($result))
-			{
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson(getError($result));
-			}
-
-			//check if Bismeldestichtag erreicht
-			$this->load->model('codex/Bismeldestichtag_model', 'BismeldestichtagModel');
-			$result = $this->BismeldestichtagModel->checkIfMeldestichtagErreicht($new_status_datum);
-			if (isError($result))
-			{
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson(getError($result));
-			}
-			if($result->retval == "1")
-			{
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson(getError($result->code));
-			}
-		}
-
-
-		// Start DB transaction
-		$this->db->trans_begin(); // Beginnen der Transaktion
-
-		$result = $this->PrestudentstatusModel->insert(
-			[
-				'prestudent_id' => $prestudent_id,
-				'status_kurzbz' => $status_kurzbz,
-				'bewerbung_abgeschicktamum' => $bewerbung_abgeschicktamum,
-				'studiensemester_kurzbz' => $studiensemester_kurzbz,
-				'studienplan_id' => $lastStatusData->studienplan_id,
-				'ausbildungssemester' => $ausbildungssemester,
-				'anmerkung' => $anmerkung,
-				'statusgrund_id' => $statusgrund_id,
-				'insertvon' => $uid,
-				'insertamum' => date('c'),
-				'bestaetigtam' => $bestaetigtam,
-				'bestaetigtvon' => $bestaetigtvon,
-				'datum' => $datum,
-				'rt_stufe' => $rt_stufe
-			]
-		);
-
-		if ($this->db->trans_status() === false || isError($result))
-		{
-			$this->db->trans_rollback();
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson(getError($result));
-		}
-
-
-
-		if($isStudent)
-		{
-			$this->load->model('crm/Student_model', 'StudentModel');
-			$result = $this->StudentModel->checkIfUid($prestudent_id);
-			if (isError($result)) {
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson(getError($result));
-			}
-			$student_uid = $result->retval;
-
-			//load student
-			$result = $this->StudentModel->loadWhere(
-				array(
-					'student_uid' => $student_uid
-				)
-			);
-			if (isError($result)) {
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				$this->outputJson($result);
-			}
-			if (!hasData($result)) {
-				$this->outputJson($result);
-			}
-
-			$studentData = current(getData($result));
-			$verband = $studentData->verband == '' ? '' : $studentData->verband;
-			$gruppe = $studentData->gruppe == '' ? '' : $studentData->gruppe;
-			$studiengang_kz = $studentData->studiengang_kz;
-
-			//Handle Abbrecher and Unterbrecher
-			//TODO (manu) implement later with multiactions
-			// not active yet: works only for "status ändern" in FAS
-			/*			if($status_kurzbz == 'Abbrecher' || $status_kurzbz == 'Unterbrecher')
-						{
-							$ausbildungssemester = 0;
-							$gruppe = '';
-							$verband = $status_kurzbz == 'Abbrecher' ? 'A' : 'B';
-						}*/
-
-			//process studentlehrverband
-			$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
-			$result = $this->StudentlehrverbandModel->processStudentlehrverband(
-				$student_uid,
-				$studiengang_kz,
-				$ausbildungssemester,
-				$verband,
-				$gruppe,
-				$studiensemester_kurzbz
-			);
-			if ($this->db->trans_status() === false || isError($result))
-			{
-				$this->db->trans_rollback();
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson($result->code);
-			}
-
-			//Student updaten (fuer Abbrecher und Unterbrecher)
-			//not active yet: works only for "status ändern" in FAS
-			//Todo(Manu) Later for multiactions
-
-			/*
-			if($status_kurzbz == 'Abbrecher' || $status_kurzbz == 'Unterbrecher')
-			{
-				$result = $this->StudentModel->update(
-								[
-									'student_uid' => $student_uid
-								],
-								[
-									'studiengang_kz' => $studiengang_kz,
-									'semester' => $ausbildungssemester,
-									'verband' => $verband,
-									'gruppe' => $gruppe,
-									'updateamum' => date('c'),
-									'updatevon' => $uid
-							]);
-							if ($this->db->trans_status() === false || isError($result))
-							{
-								$this->db->trans_rollback();
-								$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-								return $this->outputJson($result->code);
-							}
-				}
-			*/
-		}
-
-		$this->db->trans_commit();
-
-		return $this->outputJsonSuccess(true);
-	}
-
-
-
-	public function loadStatus()
-	{
-		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-
-		$prestudent_id = $this->input->post('prestudent_id');
-		$status_kurzbz = $this->input->post('status_kurzbz');
-		$ausbildungssemester = $this->input->post('ausbildungssemester');
-		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
-
-		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
-
-		$result = $this->PrestudentstatusModel->loadWhere(
-			array(
-				'prestudent_id' => $prestudent_id,
-				'status_kurzbz' => $status_kurzbz,
-				'ausbildungssemester' => $ausbildungssemester,
-				'studiensemester_kurzbz' => $studiensemester_kurzbz
-			)
-		);
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			$this->outputJson($result);
-		}
-
-		elseif (!hasData($result)) {
-			$this->outputJson($result);
-		}
-		else
-		{
-			$this->outputJsonSuccess(current(getData($result)));
-		}
-	}
-
-	public function deleteStatus()
-	{
-		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
-
-		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-
-		$prestudent_id = $this->input->post('prestudent_id');
-		$status_kurzbz = $this->input->post('status_kurzbz');
-		$ausbildungssemester = $this->input->post('ausbildungssemester');
-		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
-		$deletePrestudent = false;
-
-		$isBerechtigtAdmin = $this->permissionlib->isBerechtigt('admin', null, 'suid');
-		$isBerechtigtNoStudstatusCheck = $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung', null, 'suid');
-
-
-		if($status_kurzbz=="Student" && !$isBerechtigtAdmin && !$isBerechtigtNoStudstatusCheck)
-		{
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson("Studentenrolle kann nur durch den Administrator geloescht werden");
-		}
-
-		//check if last status
-		$result = $this->PrestudentstatusModel->checkIfLastStatusEntry($prestudent_id);
-		if (isError($result))
-		{
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson($result);
-		}
-		if($result->retval == "1")
-		{
-			//Berechtigungen nach Check prüfen!
-			if(!$isBerechtigtAdmin && !$isBerechtigtNoStudstatusCheck)
-			{
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson($result->code);
-			}
-			else
-			{
-				$deletePrestudent = true;
-			}
-		}
-
-		// Start DB transaction
-		$this->db->trans_begin();
-
-		//load rolle für LOG sqlundo
-		$result = $this->PrestudentstatusModel->loadWhere(
-			array(
-				'prestudent_id' => $prestudent_id,
-				'status_kurzbz' => $status_kurzbz,
-				'ausbildungssemester' => $ausbildungssemester,
-				'studiensemester_kurzbz' => $studiensemester_kurzbz
-			)
-		);
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson($result);
-		}
-		if (!hasData($result)) {
-			return $this->outputJson($result);
-		}
-
-		//Data of current Rolle
-		$statusData = current(getData($result));
-
-		$datum = $statusData->datum == '' ? 'null' : $statusData->datum;
-		$insertamum = $statusData->insertamum == '' ? 'null' : $statusData->insertamum;
-		$insertvon = $statusData->insertvon == '' ? 'null' : $statusData->insertvon;
-		$updateamum = $statusData->updateamum == '' ? 'null' : $statusData->updateamum;
-		$updatevon = $statusData->updatevon == '' ? 'null' : $statusData->updatevon;
-		$ext_id = $statusData->ext_id == '' ? 'null' : $statusData->ext_id;
-		$orgform_kurzbz = $statusData->orgform_kurzbz == '' ? 'null' : $statusData->orgform_kurzbz;
-		$bestaetigtam = $statusData->bestaetigtam == '' ? 'null' : $statusData->bestaetigtam;
-		$bestaetigtvon = $statusData->bestaetigtvon == '' ? 'null' : $statusData->bestaetigtvon;
-		$anmerkung = $statusData->anmerkung == '' ? 'null' : $statusData->anmerkung;
-		$bewerbung_abgeschicktamum = $statusData->bewerbung_abgeschicktamum == '' ? 'null' : $statusData->bewerbung_abgeschicktamum;
-		$studienplan_id = $statusData->studienplan_id == '' ? 'null' : $statusData->studienplan_id;
-		$rt_stufe = $statusData->rt_stufe == '' ? 'null' : $statusData->rt_stufe;
-		$statusgrund_id = $statusData->statusgrund_id == '' ? 'null' : $statusData->statusgrund_id;
-
-		$quotes_datum = $datum == "null" ? " " : "'";
-		$quotes_insertamum = $insertamum == "null" ? " " : "'";
-		$quotes_insertvon = $insertvon == "null" ? " " : "'";
-		$quotes_updateamum = $updateamum == "null" ? " " : "'";
-		$quotes_updatevon = $updatevon == "null" ? " " : "'";
-		$quotes_ext_id = $ext_id == "null" ? " " : "'";
-		$quotes_orgform_kurzbz = $orgform_kurzbz == "null" ? " " : "'";
-		$quotes_bestaetigtam = $bestaetigtam == "null" ? " " : "'";
-		$quotes_bestaetigtvon = $bestaetigtvon == "null" ? " " : "'";
-		$quotes_anmerkung = $anmerkung == "null" ? " " : "'";
-		$quotes_bewerbung_abgeschicktamum = $bewerbung_abgeschicktamum == "null" ? " " : "'";
-		$quotes_studienplan_id = $studienplan_id == "null" ? " " : "'";
-		$quotes_rt_stufe = $rt_stufe == "null" ? " " : "'";
-		$quotes_statusgrund_id = $statusgrund_id == "null" ? " " : "'";
-
-		$sqlundo =
-			"
-			INSERT INTO public.tbl_prestudentstatus(prestudent_id, status_kurzbz, studiensemester_kurzbz, ausbildungssemester, 
-			    datum, insertamum, insertvon, updateamum, updatevon, ext_id, orgform_kurzbz, bestaetigtam, bestaetigtvon, 
-			    anmerkung, bewerbung_abgeschicktamum, studienplan_id,  rt_stufe, statusgrund_id) 
-			VALUES('" . $prestudent_id . "','" . $status_kurzbz . "','" . $studiensemester_kurzbz . "','" . $ausbildungssemester . "',"
-			. $quotes_datum . $datum . $quotes_datum . ","
-			. $quotes_insertamum . $insertamum . $quotes_insertamum . ","
-			. $quotes_insertvon . $insertvon . $quotes_insertvon . ","
-			. $quotes_updateamum . $updateamum . $quotes_updateamum . ","
-			. $quotes_updatevon . $updatevon . $quotes_updatevon . ","
-			. $quotes_ext_id . $ext_id . $quotes_ext_id . ","
-			. $quotes_orgform_kurzbz . $orgform_kurzbz . $quotes_orgform_kurzbz . ","
-			. $quotes_bestaetigtam . $bestaetigtam . $quotes_bestaetigtam . ","
-			. $quotes_bestaetigtvon . $bestaetigtvon . $quotes_bestaetigtvon . ","
-			. $quotes_anmerkung . $anmerkung . $quotes_anmerkung . ","
-			. $quotes_bewerbung_abgeschicktamum . $bewerbung_abgeschicktamum . $quotes_bewerbung_abgeschicktamum . ","
-			. $quotes_studienplan_id . $studienplan_id . $quotes_studienplan_id . ","
-			. $quotes_rt_stufe . $rt_stufe . $quotes_rt_stufe . ","
-			. $quotes_statusgrund_id . $statusgrund_id . $quotes_statusgrund_id . ");
-			";
-
-		//Delete Status
-		$result = $this->PrestudentstatusModel->delete(
-			[
-				'prestudent_id' => $prestudent_id,
-				'status_kurzbz' => $status_kurzbz,
-				'ausbildungssemester' => $ausbildungssemester,
-				'studiensemester_kurzbz' => $studiensemester_kurzbz
-			]
-		);
-
-		if($this->db->trans_status() === false || isError($result))
-		{
-			$this->db->trans_rollback();
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson($result);
-		}
-		if(!hasData($result))
-		{
-			$this->outputJson($result);
-		}
-
-		//save log delete prestudentstatus
-		$uid = getAuthUID();
-		$beschreibung = 'Loeschen der Rolle ' . $status_kurzbz . " bei " . $prestudent_id;
-		$sql = "DELETE FROM public.tbl_prestudentstatus
-                WHERE prestudent_id = " . $prestudent_id . "
-			  AND status_kurzbz = '" . $status_kurzbz . "'
-			  AND ausbildungssemester ='" . $ausbildungssemester . "'
-			  AND studiensemester_kurzbz = '" . $studiensemester_kurzbz . "'";
-
-		$this->load->model('system/Log_model', 'LogModel');
-		$result = $this->LogModel->insert([
-			'mitarbeiter_uid' => $uid,
-			'beschreibung' => $beschreibung,
-			'sql' => $sql,
-			'sqlundo' => $sqlundo
-			]);
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson(getError($result));
-		}
-		if (!hasData($result))
-		{
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson(getError($result));
-		}
-
-		$logId = $result->retval;
-
-		//Delete Studentlehrverband if no Status left
-		$result = $this->PrestudentstatusModel->getLastStatus($prestudent_id, $studiensemester_kurzbz);
-
-		if (isError($result))
-		{
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson(getError($result));
-		}
-		if (!hasData($result))
-		{
-			//get student_uid
-			$this->load->model('crm/Student_model', 'StudentModel');
-			$result = $this->StudentModel->checkIfUid($prestudent_id);
-			if (isError($result))
-			{
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson(getError($result));
-			}
-			if (!hasData($result))
-			{
-				$this->outputJson($result);
-			}
-			$student_uid = $result->retval;
-
-			$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
-			$result = $this->StudentlehrverbandModel->delete(
-				array(
-					'student_uid' => $student_uid,
-					'studiensemester_kurzbz' => $studiensemester_kurzbz
-				)
-			);
-			if ($this->db->trans_status() === false || isError($result))
-			{
-				$this->db->trans_rollback();
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				$this->outputJson("Fehler beim Löschen der Lehrverbandszuordnung");
-			}
-			if (!hasData($result))
-			{
-				$this->outputJson($result);
-				//var_dump("no data Löschen der Lehrverbandszuordnung");
-			}
-			$this->outputJsonSuccess(true);
-		}
-
-		//Delete Prestudent if no data is left
-
-		if($deletePrestudent && $isBerechtigtAdmin)
-		{
-			//TODO(manu) check all connected tables
-
-			//check if existing dokumentprestudent
-			$output = "";
-			$this->load->model('crm/Dokumentprestudent_model', 'DokumentprestudentModel');
-			$result = $this->DokumentprestudentModel->loadWhere(
-				array(
-					'prestudent_id' => $prestudent_id
-				)
-			);
-			if (isError($result))
-			{
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				$this->outputJson($result);
-			}
-			if (hasData($result))
-			{
-				$documentPrestudent = $result->retval;
-				foreach ($documentPrestudent as $doc)
-				{
-					$output .=  ' '. $doc->dokument_kurzbz;
-				}
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return 	$this->outputJson("Es sind noch zu loeschende Dokumente vorhanden: " . $output);
-			}
-
-			//check if Anrechnungen tbl_anrechnung
-			$output_anrechnungen = '';
-			$this->load->model('education/Anrechnung_model', 'AnrechnungModel');
-			$result = $this->AnrechnungModel->loadWhere(
-				array(
-					'prestudent_id' => $prestudent_id
-				)
-			);
-			if (isError($result))
-			{
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				$this->outputJson($result);
-			}
-			if (hasData($result))
-			{
-				$anrechnungPrestudent = $result->retval;
-				foreach ($anrechnungPrestudent as $anr)
-				{
-					$output_anrechnungen .=  ' '. $anr->anrechnung_id;
-				}
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return 	$this->outputJson("Mit dieser Prestudent_id sind verbundene Anrechnungen vorhanden (id) : " . $output_anrechnungen);
-			}
-
-			//DELETE Prestudent
-
-			//save log delete prestudent
-			$uid = getAuthUID();
-			$beschreibung = 'Loeschen der Prestudent ID ' . $prestudent_id;
-			$sql = "DELETE FROM public.tbl_prestudent
-                WHERE prestudent_id = " . $prestudent_id;
-
-			//load prestudent für LOG sqlundo
-			$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-			$result = $this->PrestudentModel->loadWhere(
-				array(
-					'prestudent_id' => $prestudent_id
-				)
-			);
-			if (isError($result)) {
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson($result);
-			}
-			if (!hasData($result)) {
-				return $this->outputJson($result);
-			}
-
-			//Data of current Prestudent
-			$prestudentData = current(getData($result));
-
-			$aufmerksamdurch_kurzbz = $prestudentData->aufmerksamdurch_kurzbz == '' ? 'null' : $prestudentData->aufmerksamdurch_kurzbz;
-			$studiengang_kz = $prestudentData->studiengang_kz == '' ? 'null' : $prestudentData->studiengang_kz;
-			$berufstaetigkeit_code = $prestudentData->berufstaetigkeit_code == '' ? 'null' : $prestudentData->berufstaetigkeit_code;
-			$ausbildungcode = $prestudentData->ausbildungcode == '' ? 'null' : $prestudentData->ausbildungcode;
-			$zgv_code = $prestudentData->zgv_code == '' ? 'null' : $prestudentData->zgv_code;
-			$zgvort = $prestudentData->zgvort == '' ? 'null' : $prestudentData->zgvort;
-			$zgvdatum = $prestudentData->zgvdatum == '' ? 'null' : $prestudentData->zgvdatum;
-			$zgvnation = $prestudentData->zgvnation == '' ? 'null' : $prestudentData->zgvnation;
-			$zgv_erfuellt = $prestudentData->zgv_erfuellt == '' ? 'null' : $prestudentData->zgv_erfuellt;
-			$zgvmas_code = $prestudentData->zgvmas_code == '' ? 'null' : $prestudentData->zgvmas_code;
-			$zgvmaort = $prestudentData->zgvmaort == '' ? 'null' : $prestudentData->zgvmaort;
-			$zgvmadatum = $prestudentData->zgvmadatum == '' ? 'null' : $prestudentData->zgvmadatum;
-			$zgvmanation = $prestudentData->zgvmanation == '' ? 'null' : $prestudentData->zgvmanation;
-			$zgvmas_erfuellt = $prestudentData->zgvmas_erfuellt == '' ? 'null' : $prestudentData->zgvmas_erfuellt;
-			$aufnahmeschluessel = $prestudentData->aufnahmeschluessel == '' ? 'null' : $prestudentData->aufnahmeschluessel;
-			$facheinschlberuf = $prestudentData->facheinschlberuf == '' ? 'null' : $prestudentData->facheinschlberuf;
-			$anmeldungreihungstest = $prestudentData->anmeldungreihungstest == '' ? 'null' : $prestudentData->anmeldungreihungstest;
-			$reihungstestangetreten = $prestudentData->reihungstestangetreten == 1 ? 'true' : 'false';
-			$reihungstest_id = $prestudentData->reihungstest_id == '' ? 'null' : $prestudentData->reihungstest_id;
-			$rt_gesamtpunkte = $prestudentData->rt_gesamtpunkte == '' ? 'null' : $prestudentData->rt_gesamtpunkte;
-			$rt_punkte1 = $prestudentData->rt_punkte1 == '' ? 'null' : $prestudentData->rt_punkte1;
-			$rt_punkte2 = $prestudentData->rt_punkte2 == '' ? 'null' : $prestudentData->rt_punkte2;
-			$rt_punkte3 = $prestudentData->rt_punkte3 == '' ? 'null' : $prestudentData->rt_punkte3;
-			$bismelden = $prestudentData->bismelden == 1 ? 'true' : 'false';
-			$person_id = $prestudentData->person_id == '' ? 'null' : $prestudentData->person_id;
-			$anmerkung = $prestudentData->anmerkung == '' ? 'null' : $prestudentData->anmerkung;
-			$mentor = $prestudentData->mentor == '' ? 'null' : $prestudentData->mentor;
-			$ext_id = $prestudentData->ext_id == '' ? 'null' : $prestudentData->ext_id;
-			$dual = $prestudentData->dual == 1 ? 'true' : 'false';
-			$ausstellungsstaat = $prestudentData->ausstellungsstaat == '' ? 'null' : $prestudentData->ausstellungsstaat;
-			$zgvdoktor_code = $prestudentData->zgvdoktor_code == '' ? 'null' : $prestudentData->zgvdoktor_code;
-			$zgvdoktorort = $prestudentData->zgvdoktorort == '' ? 'null' : $prestudentData->zgvdoktorort;
-			$zgvdoktordatum = $prestudentData->zgvdoktordatum == '' ? 'null' : $prestudentData->zgvdoktordatum;
-			$zgvdoktornation = $prestudentData->zgvdoktornation == '' ? 'null' : $prestudentData->zgvdoktornation;
-			$gsstudientyp_kurzbz = $prestudentData->gsstudientyp_kurzbz == '' ? 'null' : $prestudentData->gsstudientyp_kurzbz;
-			$aufnahmegruppe_kurzbz = $prestudentData->aufnahmegruppe_kurzbz == '' ? 'null' : $prestudentData->aufnahmegruppe_kurzbz;
-			$priorisierung = $prestudentData->priorisierung == '' ? 'null' : $prestudentData->priorisierung;
-			$zgvdoktor_erfuellt= $prestudentData->zgvdoktor_erfuellt == '' ? 'null' : $prestudentData->zgvdoktor_erfuellt;
-
-			$quotes_aufmerksamdurch_kurzbz = $aufmerksamdurch_kurzbz == "null" ? " " : "'";
-			$quotes_studiengang_kz = $studiengang_kz == "null" ? " " : "'";
-			$quotes_berufstaetigkeit_code = $berufstaetigkeit_code == "null" ? " " : "'";
-			$quotes_ausbildungcode = $ausbildungcode == "null" ? " " : "'";
-			$quotes_zgv_code = $zgv_code == "null" ? " " : "'";
-			$quotes_zgvort = $zgvort == "null" ? " " : "'";
-			$quotes_zgvdatum = $zgvdatum == "null" ? " " : "'";
-			$quotes_zgvnation = $zgvnation == "null" ? " " : "'";
-			$quotes_zgv_erfuellt = $zgv_erfuellt == "null" ? " " : "'";
-			$quotes_zgvmas_code = $zgvmas_code == "null" ? " " : "'";
-			$quotes_zgvmaort = $zgvmaort == "null" ? " " : "'";
-			$quotes_zgvmadatum = $zgvmadatum == "null" ? " " : "'";
-			$quotes_zgvmanation = $zgvmanation == "null" ? " " : "'";
-			$quotes_zgvmas_erfuellt = $zgvmas_erfuellt == "null" ? " " : "'";
-			$quotes_aufnahmeschluessel = $aufnahmeschluessel == "null" ? " " : "'";
-			$quotes_facheinschlberuf = $facheinschlberuf == "null" ? " " : "'";
-			$quotes_anmeldungreihungstest = $anmeldungreihungstest == "null" ? " " : "'";
-			$quotes_reihungstestangetreten = $reihungstestangetreten == "null" ? " " : "'";
-			$quotes_reihungstest_id = $reihungstest_id == "null" ? " " : "'";
-			$quotes_rt_gesamtpunkte = $rt_gesamtpunkte == "null" ? " " : "'";
-			$quotes_rt_punkte1 = $rt_punkte1 == "null" ? " " : "'";
-			$quotes_rt_punkte2 = $rt_punkte2 == "null" ? " " : "'";
-			$quotes_rt_punkte3 = $rt_punkte3 == "null" ? " " : "'";
-			$quotes_bismelden = $bismelden == "null" ? " " : "'";
-			$quotes_person_id = $person_id == "null" ? " " : "'";
-			$quotes_anmerkung = $anmerkung == "null" ? " " : "'";
-			$quotes_mentor = $mentor == "null" ? " " : "'";
-			$quotes_ext_id = $ext_id == "null" ? " " : "'";
-			$quotes_dual = $dual == "null" ? " " : "'";
-			$quotes_ausstellungsstaat = $ausstellungsstaat == "null" ? " " : "'";
-			$quotes_zgvdoktor_code = $zgvdoktor_code == "null" ? " " : "'";
-			$quotes_zgvdoktorort = $zgvdoktorort == "null" ? " " : "'";
-			$quotes_zgvdoktordatum = $zgvdoktordatum == "null" ? " " : "'";
-			$quotes_zgvdoktornation = $zgvdoktornation == "null" ? " " : "'";
-			$quotes_gsstudientyp_kurzbz = $gsstudientyp_kurzbz == "null" ? " " : "'";
-			$quotes_aufnahmegruppe_kurzbz = $aufnahmegruppe_kurzbz == "null" ? " " : "'";
-			$quotes_priorisierung = $priorisierung == "null" ? " " : "'";
-			$quotes_zgvdoktor_erfuellt = $zgvdoktor_erfuellt == "null" ? " " : "'";
-
-
-			$sqlundo =
-				"
-	INSERT INTO public.tbl_prestudent(prestudent_id, aufmerksamdurch_kurzbz, studiengang_kz, berufstaetigkeit_code, ausbildungcode,
-				zgv_code, zgvort, zgvdatum, zgvnation,zgv_erfuellt, zgvmas_code, zgvmaort, zgvmadatum, zgvmanation,zgvmas_erfuellt,
-				aufnahmeschluessel, facheinschlberuf, anmeldungreihungstest, reihungstestangetreten, reihungstest_id,
-				rt_gesamtpunkte, rt_punkte1, rt_punkte2, rt_punkte3, bismelden, person_id, anmerkung, mentor, ext_id,
-				dual, ausstellungsstaat, zgvdoktor_code, zgvdoktorort, zgvdoktordatum, zgvdoktornation,
-				gsstudientyp_kurzbz, aufnahmegruppe_kurzbz, priorisierung, zgvdoktor_erfuellt) 
-	VALUES('" . $prestudent_id . "',"
-				. $quotes_aufmerksamdurch_kurzbz . $aufmerksamdurch_kurzbz . $quotes_aufmerksamdurch_kurzbz . ","
-				. $quotes_studiengang_kz . $studiengang_kz . $quotes_studiengang_kz . ","
-				. $quotes_berufstaetigkeit_code . $berufstaetigkeit_code . $quotes_berufstaetigkeit_code . ","
-				. $quotes_ausbildungcode . $ausbildungcode . $quotes_ausbildungcode . ","
-				. $quotes_zgv_code . $zgv_code . $quotes_zgv_code . ","
-				. $quotes_zgvort . $zgvort . $quotes_zgvort . ","
-				. $quotes_zgvdatum . $zgvdatum . $quotes_zgvdatum . ","
-				. $quotes_zgvnation . $zgvnation . $quotes_zgvnation . ","
-				. $quotes_zgv_erfuellt . $zgv_erfuellt . $quotes_zgv_erfuellt . ","
-				. $quotes_zgvmas_code . $zgvmas_code . $quotes_zgvmas_code . ","
-				. $quotes_zgvmaort . $zgvmaort . $quotes_zgvmaort . ","
-				. $quotes_zgvmadatum . $zgvmadatum . $quotes_zgvmadatum . ","
-				. $quotes_zgvmanation . $zgvmanation . $quotes_zgvmanation . ","
-				. $quotes_zgvmas_erfuellt . $zgvmas_erfuellt . $quotes_zgvmas_erfuellt . ","
-				. $quotes_aufnahmeschluessel . $aufnahmeschluessel . $quotes_aufnahmeschluessel . ","
-				. $quotes_facheinschlberuf . $facheinschlberuf . $quotes_facheinschlberuf . ","
-				. $quotes_anmeldungreihungstest . $anmeldungreihungstest . $quotes_anmeldungreihungstest . ","
-				. $quotes_reihungstestangetreten . $reihungstestangetreten . $quotes_reihungstestangetreten . ","
-				. $quotes_reihungstest_id . $reihungstest_id . $quotes_reihungstest_id . ","
-				. $quotes_rt_gesamtpunkte . $rt_gesamtpunkte . $quotes_rt_gesamtpunkte . ","
-				. $quotes_rt_punkte1 . $rt_punkte1 . $quotes_rt_punkte1 . ","
-				. $quotes_rt_punkte2 . $rt_punkte2 . $quotes_rt_punkte2 . ","
-				. $quotes_rt_punkte3 . $rt_punkte3 . $quotes_rt_punkte3 . ","
-				. $quotes_bismelden . $bismelden . $quotes_bismelden . ","
-				. $quotes_person_id . $person_id . $quotes_person_id . ","
-				. $quotes_anmerkung . $anmerkung . $quotes_anmerkung . ","
-				. $quotes_mentor . $mentor . $quotes_mentor . ","
-				. $quotes_ext_id . $ext_id . $quotes_ext_id . ","
-				. $quotes_dual . $dual . $quotes_dual . ","
-				. $quotes_ausstellungsstaat . $ausstellungsstaat . $quotes_ausstellungsstaat . ","
-				. $quotes_zgvdoktor_code . $zgvdoktor_code . $quotes_zgvdoktor_code . ","
-				. $quotes_zgvdoktorort . $zgvdoktorort . $quotes_zgvdoktorort . ","
-				. $quotes_zgvdoktordatum . $zgvdoktordatum . $quotes_zgvdoktordatum . ","
-				. $quotes_zgvdoktornation . $zgvdoktornation . $quotes_zgvdoktornation . ","
-				. $quotes_gsstudientyp_kurzbz . $gsstudientyp_kurzbz . $quotes_gsstudientyp_kurzbz . ","
-				. $quotes_aufnahmegruppe_kurzbz . $aufnahmegruppe_kurzbz . $quotes_aufnahmegruppe_kurzbz . ","
-				. $quotes_priorisierung . $priorisierung . $quotes_priorisierung . ","
-				. $quotes_zgvdoktor_erfuellt . $zgvdoktor_erfuellt . $quotes_zgvdoktor_erfuellt . ");
-	";
-
-			$this->load->model('system/Log_model', 'LogModel');
-			$result = $this->LogModel->insert([
-				'mitarbeiter_uid' => $uid,
-				'beschreibung' => $beschreibung,
-				'sql' => $sql,
-				'sqlundo' => $sqlundo
-			]);
-			if (isError($result)) {
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson(getError($result));
-			}
-			if (!hasData($result))
-			{
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson(getError($result));
-			}
-
-			$logId = $result->retval;
-
-			//independent transaction
-			$this->db->trans_start();
-
-			$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-			$result = $this->PrestudentModel->delete(
-				array(
-					'prestudent_id' => $prestudent_id
-				)
-			);
-			if ($this->db->trans_status() === false)
-			{
-				$this->db->trans_rollback();
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				$this->outputJson($result);
-			}
-			if(!hasData($result))
-			{
-				$this->outputJson($result);
-			}
-			$this->db->trans_commit();
-			$this->outputJson($result);
-		}
-		$this->db->trans_commit();
-		return $this->outputJsonSuccess(true);
-	}
-
-	public function updateStatus($key_prestudent_id, $key_status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester)
-	{
-		$isStudent = false;
-		$isBerechtigtNoStudstatusCheck =  $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung');
-
-		//get Studiengang von prestudent_id
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-		$result = $this->PrestudentModel->load([
-			'prestudent_id'=> $key_prestudent_id,
-		]);
-		if(isError($result))
-		{
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson(getError($result));
-		}
-		$result = current(getData($result));
-
-		$stg = $result->studiengang_kz;
-
-		if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg))
-		{
-			$result = "Sie haben keine Schreibrechte fuer diesen Studiengang!";
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson($result);
-		}
-
-		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
-
-		$uid = getAuthUID();
-		$prestudent_id = $this->input->post('prestudent_id');
-		$status_kurzbz = $this->input->post('status_kurzbz');
-		$ausbildungssemester = $this->input->post('ausbildungssemester');
-		$datum = $this->input->post('datum');
-		$bestaetigtam = $this->input->post('bestaetigtam');
-		$bewerbung_abgeschicktamum = $this->input->post('bewerbung_abgeschicktamum');
-		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
-		$studienplan_id = $this->input->post('studienplan_id');
-		$anmerkung  = $this->input->post('anmerkung');
-		$statusgrund_id = $this->input->post('statusgrund_id');
-		$rt_stufe = $this->input->post('rt_stufe');
-		$bestaetigtvon = $uid;
-
-		//check if Bismeldestichtag erreicht
-		if(!$isBerechtigtNoStudstatusCheck)
-		{
-			//Fas only check datum
-			$this->load->model('codex/Bismeldestichtag_model', 'BismeldestichtagModel');
-/*			$result = $this->BismeldestichtagModel->checkIfMeldestichtagErreicht($datum, $studiensemester_kurzbz);*/
-			$result = $this->BismeldestichtagModel->checkIfMeldestichtagErreicht($datum);
-			if (isError($result)) {
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson(getError($result));
-			}
-			if ($result->retval == "1") {
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				//return $this->outputJson($result->code);
-				//Fehlermeldung überschrieben, passender
-				//TODO(Manu) phrase
-				//$this->p->t('bismeldestichtag','meldestichtag_erreicht');
-				//return $this->outputJson($this->p->t('bismeldestichtag','status_confirm_delete'));
-				return $this->outputJson($this->p->t('lehre', 'meldestichtag_erreicht'));
-				//return $this->outputJson("Meldestichtag erreicht - Bearbeiten nicht mehr möglich");
-			}
-		}
-
-		//check if Rolle already exists
-		if(($key_studiensemester_kurzbz != $studiensemester_kurzbz)
-			|| ($key_ausbildungssemester != $ausbildungssemester))
-		{
-			$result = $this->PrestudentstatusModel->checkIfExistingPrestudentRolle(
-				$prestudent_id,
-				$status_kurzbz,
-				$studiensemester_kurzbz,
-				$ausbildungssemester
-			);
-			if (isError($result))
-			{
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson(getError($result));
-			}
-			if($result->retval == '1')
-			{
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson($result->code);
-			}
-		}
-
-		//check if studentrolle already exists
-		if($status_kurzbz == 'Student' || $status_kurzbz == 'Diplomand')
-		{
-			$this->load->model('crm/Student_model', 'StudentModel');
-			$result = $this->StudentModel->checkIfExistingStudentRolle($prestudent_id);
-			if (isError($result))
-			{
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson(getError($result));
-			}
-			if($result->retval == "0")
-			{
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson($result->code);
-			}
-			if($result->retval != "0")
-			{
-				$isStudent = true;
-			}
-		}
-
-
-		if(!$isBerechtigtNoStudstatusCheck)
-		{
-			//Block STATUSCHECKS
-
-			$result = $this->PrestudentstatusModel->checkIfValidStatusHistory(
-				$prestudent_id,
-				$status_kurzbz,
-				$studiensemester_kurzbz,
-				$datum,
-				$ausbildungssemester
-			);
-			if (isError($result))
-			{
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson(getError($result));
-			}
-		}
-
-
-		// Start DB transaction
-		$this->db->trans_begin();
-
-		//update status
-		//var_dump($ausbildungssemester, $studiensemester_kurzbz);
-		$result = $this->PrestudentstatusModel->update(
-			[
-				'prestudent_id' => $key_prestudent_id,
-				'status_kurzbz' => $key_status_kurzbz,
-				'studiensemester_kurzbz' => $key_studiensemester_kurzbz,
-				'ausbildungssemester' => $key_ausbildungssemester,
-			],
-			[
-				'status_kurzbz' => $status_kurzbz,
-				'studiensemester_kurzbz' => $studiensemester_kurzbz,
-				'ausbildungssemester' => $ausbildungssemester,
-				'bewerbung_abgeschicktamum' => $bewerbung_abgeschicktamum,
-				'studienplan_id' => $studienplan_id,
-				'anmerkung' => $anmerkung,
-				'statusgrund_id' => $statusgrund_id,
-				'updatevon' => $uid,
-				'updateamum' => date('c'),
-				'bestaetigtam' => $bestaetigtam,
-				'bestaetigtvon' => $bestaetigtvon,
-				'datum' => $datum,
-				'rt_stufe' => $rt_stufe
-			]
-		);
-		if (isError($result))
-		{
-			$this->db->trans_rollback();
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson(getError($result));
-		}
-
-
-		if($isStudent)
-		{
-			//check Studentlehrverband
-			$this->load->model('crm/Student_model', 'StudentModel');
-			$result = $this->StudentModel->checkIfUid($prestudent_id);
-			if (isError($result)) {
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson(getError($result));
-			}
-			$student_uid = $result->retval;
-
-			//process studentlehrverband
-			$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
-			$result = $this->StudentlehrverbandModel->loadWhere(
-				array(
-					'student_uid' => $student_uid,
-					'studiensemester_kurzbz' => $studiensemester_kurzbz
-				)
-			);
-			if (isError($result)) {
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				$this->outputJson($result);
-			}
-			if (!hasData($result)) {
-				$this->outputJson($result);
-			}
-
-			//Data of current Semester
-			$studentlvbData = current(getData($result));
-
-			$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
-			$result = $this->StudentlehrverbandModel->processStudentlehrverband(
-				$student_uid,
-				$studentlvbData->studiengang_kz,
-				$ausbildungssemester,
-				$studentlvbData->verband,
-				$studentlvbData->gruppe,
-				$studiensemester_kurzbz
-			);
-			if ($this->db->trans_status() === false || isError($result))
-			{
-				$this->db->trans_rollback();
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson($result->code);
-			}
-		}
-
-		$this->db->trans_commit();
-		return $this->outputJsonSuccess(true);
-	}
-
-	public function advanceStatus($key_prestudent_id, $key_status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester)
-	{
-		$isStudent = false;
-
-		//get Studiengang von prestudent_id
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-		$result = $this->PrestudentModel->load([
-			'prestudent_id'=> $key_prestudent_id,
-		]);
-		if(isError($result))
-		{
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson(getError($result));
-		}
-		$result = current(getData($result));
-
-		$stg = $result->studiengang_kz;
-
-		if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg))
-		{
-			$result = "Sie haben keine Schreibrechte fuer diesen Studiengang!";
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson($result);
-		}
-
-
-		//Data Vorrücken
-		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
-
-		$result = $this->PrestudentstatusModel->loadWhere(
-			array(
-				'prestudent_id' => $key_prestudent_id,
-				'status_kurzbz' => $key_status_kurzbz,
-				'ausbildungssemester' => $key_ausbildungssemester,
-				'studiensemester_kurzbz' => $key_studiensemester_kurzbz
-			)
-		);
-
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			$this->outputJson($result);
-		}
-
-		elseif (!hasData($result)) {
-			$this->outputJson($result);
-		}
-		else
-		{
-			$statusData = current(getData($result));
-		}
-
-		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-		$result = $this->StudiensemesterModel->getNextFrom($key_studiensemester_kurzbz);
-
-		if (isError($result))
-		{
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson(getError($result));
-		}
-		$studiensem_next = current(getData($result));
-		$studiensem_next = $studiensem_next->studiensemester_kurzbz;
-
-		$ausbildungssem_next = $key_ausbildungssemester+1;
-
-		//check if Rolle already exists
-		$result = $this->PrestudentstatusModel->checkIfExistingPrestudentRolle(
-			$key_prestudent_id,
-			$key_status_kurzbz,
-			$studiensem_next,
-			$ausbildungssem_next
-		);
-		if (isError($result))
-		{
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson(getError($result));
-		}
-		if($result->retval == '1')
-		{
-			$isStudent = true;
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson($result->code);
-		}
-
-		//check if studentrolle already exists
-		if($key_status_kurzbz == 'Student')
-		{
-			$this->load->model('crm/Student_model', 'StudentModel');
-			$result = $this->StudentModel->checkIfExistingStudentRolle($key_prestudent_id);
-			if (isError($result))
-			{
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson(getError($result));
-			}
-			if ($result->retval == "0")
-			{
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson($result->code);
-			}
-		}
-
-		// Start DB transaction
-		$this->db->trans_begin();
-
-		//insert prestudentstatus
-		$uid = getAuthUID();
-		$result = $this->PrestudentstatusModel->insert(
-			[
-				'prestudent_id' => $key_prestudent_id,
-				'status_kurzbz' => $key_status_kurzbz,
-				'studiensemester_kurzbz' => $studiensem_next,
-				'ausbildungssemester' => $ausbildungssem_next,
-				'insertamum' => date('c'),
-				'insertvon' => $uid,
-				'bestaetigtam' => date('c'),
-				'bestaetigtvon' => $uid,
-				'studienplan_id' => $statusData->studienplan_id,
-				'datum' => date('c'),
-				'anmerkung' => $statusData->anmerkung
-			]
-		);
-
-		if (isError($result))
-		{
-			$this->db->trans_rollback();
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson(getError($result));
-		}
-
-		$this->load->model('crm/Student_model', 'StudentModel');
-		$result = $this->StudentModel->checkIfUid($key_prestudent_id);
-		if(isError($result))
-		{
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson(getError($result));
-		}
-		$student_uid = $result->retval;
-
-		//process studentlehrverband
-		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
-		$result = $this->StudentlehrverbandModel->loadWhere(
-			array(
-				'student_uid' => $student_uid,
-				'studiensemester_kurzbz' => $key_studiensemester_kurzbz
-			)
-		);
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			$this->outputJson($result);
-		}
-		if (!hasData($result)) {
-			$this->outputJson($result);
-		}
-
-		//Data of current Semester
-		$result = getData($result) ? : [];
-		$studentlvbData = current($result);
-
-		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
-		$result = $this->StudentlehrverbandModel->processStudentlehrverband(
-			$student_uid,
-			$studentlvbData->studiengang_kz,
-			$ausbildungssem_next,
-			$studentlvbData->verband,
-			$studentlvbData->gruppe,
-			$studiensem_next
-		);
-		if ($this->db->trans_status() === false || isError($result))
-		{
-			$this->db->trans_rollback();
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson($result->code);
-		}
-
-		$this->db->trans_commit();
-
-		return $this->outputJsonSuccess(true);
-	}
-
-	public function confirmStatus($key_prestudent_id, $key_status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester)
-	{
-		$uid = getAuthUID();
-
-		//get Studiengang von prestudent_id
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-		$result = $this->PrestudentModel->load([
-			'prestudent_id'=> $key_prestudent_id,
-		]);
-		if(isError($result))
-		{
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson(getError($result));
-		}
-		$result = current(getData($result));
-
-		$stg = $result->studiengang_kz;
-
-		if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg))
-		{
-			$result = "Sie haben keine Schreibrechte fuer diesen Studiengang!";
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson($result);
-		}
-
-		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
-
-		$result = $this->PrestudentstatusModel->loadWhere(
-			array(
-				'prestudent_id' => $key_prestudent_id,
-				'status_kurzbz' => $key_status_kurzbz,
-				'ausbildungssemester' => $key_ausbildungssemester,
-				'studiensemester_kurzbz' => $key_studiensemester_kurzbz
-			)
-		);
-
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			$this->outputJson($result);
-		}
-
-		elseif (!hasData($result)) {
-			$this->outputJson($result);
-		}
-		else
-		{
-			$statusData = current(getData($result));
-		}
-
-		//check if Status is unconfirmed..
-		if($statusData->bestaetigtam != null)
-		{
-			$result = "Der Status ist bereits bestätigt!";
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson($result);
-		}
-
-		//check if Bewerbung abgeschickt
-		if($statusData->bewerbung_abgeschicktamum == null)
-		{
-			$result = "Die Bewerbung wurde noch nicht abgeschickt und kann deshalb nicht bestaetigt werden!";
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson($result);
-		}
-
-		$result = $this->PrestudentstatusModel->update(
-			[
-				'prestudent_id' => $key_prestudent_id,
-				'status_kurzbz' => $key_status_kurzbz,
-				'studiensemester_kurzbz' => $key_studiensemester_kurzbz,
-				'ausbildungssemester' => $key_ausbildungssemester,
-			],
-			[
-				'prestudent_id' => $key_prestudent_id,
-				'status_kurzbz' => $key_status_kurzbz,
-				'studiensemester_kurzbz' => $key_studiensemester_kurzbz,
-				'ausbildungssemester' => $key_ausbildungssemester,
-				'bestaetigtam' => date('c'),
-				'bestaetigtvon' => $uid,
-				'updateamum' => date('c'),
-				'updatevon' => $uid
-			]
-		);
-		if (isError($result))
-		{
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson(getError($result));
-		}
-		if (!hasData($result)) {
-			return error('No Statusdata vorhanden');
-		}
-		return $this->outputJsonSuccess(true);
-	}
-}
diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php
index db860f1e6..624912fe2 100644
--- a/application/models/crm/Prestudentstatus_model.php
+++ b/application/models/crm/Prestudentstatus_model.php
@@ -384,7 +384,8 @@ class Prestudentstatus_model extends DB_Model
 		}
 		else
 		{
-			return success("1", $this->p->t('studierendenantrag','error_rolleBereitsVorhanden'));
+			//TODO(manu) nur retval übergeben
+			return success("1", $this->p->t('lehre','error_rolleBereitsVorhanden'));
 		}
 	}
 
@@ -426,14 +427,20 @@ class Prestudentstatus_model extends DB_Model
 	 * @param integer $prestudent_id
 	 * @return success("1") if last prestudentstatusentry, else success("0")
 	 */
-	public function checkIfLastStatusEntry($prestudent_id)
+	public function checkIfLastStatusEntry($prestudent_id, $isStudent=false )
 	{
 		$qry = "SELECT
 					COUNT(*) as anzahl
 				FROM 
 				    public.tbl_prestudentstatus
 				WHERE
-					prestudent_id = ? ";
+					prestudent_id = ?
+				";
+
+		if($isStudent)
+		{
+			$qry .= "AND status_kurzbz = 'Student'";
+		}
 
 		$result = $this->execQuery($qry, array($prestudent_id));
 
@@ -451,11 +458,9 @@ class Prestudentstatus_model extends DB_Model
 				if ($anzahl <= 1 )
 				{
 					return success ("1", "Die letzte Rolle kann nur durch den Administrator geloescht werden");
-					//return error("Die letzte Rolle kann nur durch den Administrator geloescht werden");
 				}
 				else
 					return success("0", $anzahl . " Rollen vorhanden");
-					//return success($anzahl);
 
 			}
 			else
@@ -479,7 +484,6 @@ class Prestudentstatus_model extends DB_Model
 		{
 			return error("Datum eines neuen Statuseintrags darf nicht in der Vergangenheit liegen ");
 		}
-
 		else
 		{
 			return success();
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
index cd3afe91a..351902339 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
@@ -81,7 +81,6 @@ export default {
 						this.actionUpdate = true;
 					}
 				}
-				//this.deltaArray.push(delta);
 				this.deltaArray = delta;
 			},
 			deep: true
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
index 2fc00a642..cf4f7728a 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
@@ -1,5 +1,4 @@
 import {CoreFilterCmpt} from "../../../../filter/Filter.js";
-import {CoreRESTClient} from "../../../../../RESTClient";
 import BsModal from "../../../../Bootstrap/Modal.js";
 import FormForm from '../../../../Form/Form.js';
 import FormInput from '../../../../Form/Input.js';
@@ -47,8 +46,9 @@ export default{
 	data() {
 		return {
 			tabulatorOptions: {
-				ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Status/getHistoryPrestudent/' + this.prestudent_id),
-				//autoColumns: true,
+				ajaxURL: 'api/frontend/v1/stv/Status/getHistoryPrestudent/' + this.prestudent_id,
+				ajaxRequestFunc: this.$fhcApi.get,
+				ajaxResponse: (url, params, response) => response.data,
 				columns: [
 					{title: "Kurzbz", field: "status_kurzbz", tooltip: true},
 					{title: "StSem", field: "studiensemester_kurzbz"},
@@ -237,7 +237,6 @@ export default{
 	},
 	methods: {
 		actionNewStatus() {
-			console.log("Action: Neuen Status hinzufügen");
 			this.statusData.status_kurzbz = 'Interessent';
 			this.statusData.studiensemester_kurzbz = this.defaultSemester;
 			this.statusData.ausbildungssemester = 1;
@@ -246,7 +245,6 @@ export default{
 			this.$refs.newStatusModal.show();
 		},
 		actionEditStatus(status, stdsem, ausbildungssemester){
-			console.log("Action: Status bearbeiten: (" + status + ": " + stdsem + "/" + ausbildungssemester + ")")
 			this.statusId = {
 				'prestudent_id': this.prestudent_id,
 				'status_kurzbz': status,
@@ -259,8 +257,6 @@ export default{
 			});
 		},
 		actionDeleteStatus(status, stdsem, ausbildungssemester){
-			console.log("Action: Status löschen: (" + status + ": " + stdsem + "/" + ausbildungssemester + ")")
-			//this.$refs.deleteStatusModal.show();
 			this.statusId = {
 				'prestudent_id': this.prestudent_id,
 				'status_kurzbz': status,
@@ -276,8 +272,6 @@ export default{
 			});
 		},
 		actionAdvanceStatus(status, stdsem, ausbildungssemester){
-			console.log("Action: Status vorrücken: (" + status + ": " + stdsem + "/" + ausbildungssemester + ")")
-			//this.$refs.deleteStatusModal.show();
 			this.statusId = {
 				'prestudent_id': this.prestudent_id,
 				'status_kurzbz': status,
@@ -290,8 +284,6 @@ export default{
 			});
 		},
 		actionConfirmStatus(status, stdsem, ausbildungssemester){
-			console.log("Action: Status bestätigen: (" + status + ": " + stdsem + "/" + ausbildungssemester + ")")
-			//this.$refs.deleteStatusModal.show();
 			this.statusId = {
 				'prestudent_id': this.prestudent_id,
 				'status_kurzbz': status,
@@ -304,112 +296,67 @@ export default{
 			});
 		},
 		addNewStatus(){
-			CoreRESTClient.post('components/stv/Status/addNewStatus/' + this.prestudent_id,
+			this.$fhcApi.post('api/frontend/v1/stv/status/addNewStatus/' + this.prestudent_id,
 				this.statusData
 			).then(response => {
-				if (!response.data.error) {
 					this.$fhcAlert.alertSuccess('Speichern erfolgreich');
 					this.hideModal('newStatusModal');
 					this.resetModal();
-				} else {
-					const errorData = response.data.retval;
-					Object.entries(errorData).forEach(entry => {
-						const [key, value] = entry;
-						this.$fhcAlert.alertError(value);
-					});
-				}
-			}).catch(error => {
-				if (error.response) {
-					console.log(error.response);
-					this.$fhcAlert.alertError(error.response.data);
-				}
-			}).finally(() => {
+			}).catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
 				window.scrollTo(0, 0);
 				this.reload();
 			});
 		},
 		advanceStatus(statusId){
-			return CoreRESTClient.post('components/stv/Status/advanceStatus/' +
+			return this.$fhcApi.post('api/frontend/v1/stv/status/advanceStatus/' +
 				this.statusId.prestudent_id + '/' +
 				this.statusId.status_kurzbz + '/' +
 				this.statusId.studiensemester_kurzbz + '/' +
 				this.statusId.ausbildungssemester)
 				.then(
 					result => {
-						if(!result.data.error) {
 							this.$fhcAlert.alertSuccess('Vorrückung Status erfolgreich');
-						}
-						else
-						{
-							const errorData = result.data.retval;
-							this.$fhcAlert.alertError('Kein Status mit Id ' + status_id + ' gefunden');
-						}
-						/*						return result;*/
-					}).catch(error => {
-					if (error.response) {
-						console.log(error.response);
-						this.$fhcAlert.alertError(error.response.data);
-					}
-				}).finally(() => {
+					})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
 					window.scrollTo(0, 0);
 					this.reload();
 				});
 		},
 		confirmStatus(statusId){
-			return CoreRESTClient.post('components/stv/Status/confirmStatus/' +
+			return this.$fhcApi.post('api/frontend/v1/stv/status/confirmStatus/' +
 				this.statusId.prestudent_id + '/' +
 				this.statusId.status_kurzbz + '/' +
 				this.statusId.studiensemester_kurzbz + '/' +
 				this.statusId.ausbildungssemester)
 				.then(
 					result => {
-						if(!result.data.error) {
 							this.$fhcAlert.alertSuccess('Bestätigung Status erfolgreich');
-						}
-						else
-						{
-							const errorData = result.data.retval;
-							this.$fhcAlert.alertError('Kein Status mit Id ' + status_id + ' gefunden');
-						}
-					}
-					).catch(error => {
-					if (error.response) {
-						console.log(error.response);
-						this.$fhcAlert.alertError(error.response.data);
-					}
-				}).finally(() => {
-					window.scrollTo(0, 0);
+					})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+/*					window.scrollTo(0, 0);*/
 					this.reload();
 				});
 		},
 		deleteStatus(status_id){
-			return CoreRESTClient.post('components/stv/Status/deleteStatus/',
+			return this.$fhcApi.post('api/frontend/v1/stv/status/deleteStatus/',
 				status_id)
 				.then(
 					result => {
-						if(!result.data.error) {
 							this.$fhcAlert.alertSuccess('Löschen erfolgreich');
 							this.hideModal('deleteStatusModal');
 							this.resetModal();
-						}
-						else
-						{
-							const errorData = result.data.retval;
-							this.$fhcAlert.alertError('Kein Status mit Id ' + status_id + ' gefunden');
-						}
-						/*						return result;*/
-					}).catch(error => {
-					if (error.response) {
-						//console.log(error.response);
-						this.$fhcAlert.alertError(error.response.data);
-					}
-				}).finally(() => {
+					})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
 					window.scrollTo(0, 0);
 					this.reload();
 				});
 		},
 		editStatus(){
-			return CoreRESTClient.post('components/stv/Status/updateStatus/' +
+			return this.$fhcApi.post('api/frontend/v1/stv/status/updateStatus/' +
 				this.statusId.prestudent_id + '/' +
 				this.statusId.status_kurzbz + '/' +
 				this.statusId.studiensemester_kurzbz + '/' +
@@ -417,33 +364,19 @@ export default{
 				this.statusData)
 				.then(
 					result => {
-						if(!result.data.error) {
 							this.$fhcAlert.alertSuccess('Bearbeitung Status erfolgreich');
 							this.hideModal('editStatusModal');
 							this.resetModal();
-						}
-						else
-						{
-/*							const errorData = result.data.retval;
-							Object.entries(errorData).forEach(entry => {
-								const [key, value] = entry;
-								this.$fhcAlert.alertError(value);
-							});*/
-							this.$fhcAlert.alertError('Kein Status mit Id ' + status_id + ' gefunden');
-						}
-						/*						return result;*/
-					}).catch(error => {
-					if (error.response) {
-						console.log(error.response);
-						this.$fhcAlert.alertError(error.response.data);
-					}
-				}).finally(() => {
+					})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
 					window.scrollTo(0, 0);
 					this.reload();
 				});
 		},
 		checkIfLastStatus(){
-			return CoreRESTClient.get('components/stv/Status/isLastStatus/' + this.prestudent_id)
+			return this.$fhcApi
+				.get('api/frontend/v1/stv/status/isLastStatus/' + this.prestudent_id)
 				.then(
 					result => {
 						if(result.data){
@@ -452,29 +385,17 @@ export default{
 							this.isLastStatus = {};
 						}
 						return result;
-					}).catch(error => {
-						if (error.response) {
-							console.log(error.response);
-							this.$fhcAlert.alertError(error.response.data);
-						}
-					}
-				);
+					})
+				.catch(this.$fhcAlert.handleSystemError);
 		},
 		loadStatus(status_id){
-			return CoreRESTClient.post('components/stv/Status/loadStatus/',
+			return this.$fhcApi.post('api/frontend/v1/stv/status/loadStatus/',
 				status_id)
-				.then(
-					result => {
-						if(result.data.retval)
-							this.statusData = result.data.retval;
-						else
-						{
-							this.statusData = {};
-							this.$fhcAlert.alertError('Kein Status mit Id ' + status_id + ' gefunden');
-						}
+					.then(result => {
+							this.statusData = result.data;
 						return result;
-					}
-				);
+					})
+				.catch(this.$fhcAlert.handleSystemError);
 		},
 		reload(){
 			this.$refs.table.reloadTable();
@@ -492,32 +413,32 @@ export default{
 		}
 	},
 	created(){
-		CoreRESTClient
-			.get('components/stv/Prestudent/getStudiensemester')
-			.then(result => CoreRESTClient.getData(result.data) || [])
+		this.$fhcApi
+			.get('api/frontend/v1/stv/prestudent/getStudiensemester')
+			.then(result => result.data)
 			.then(result => {
 				this.listStudiensemester = result;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
-		CoreRESTClient
-			.get('components/stv/Prestudent/getStudienplaene/' + this.prestudent_id)
-			.then(result => CoreRESTClient.getData(result.data) || [])
+		this.$fhcApi
+			.get('api/frontend/v1/stv/prestudent/getStudienplaene/' + this.prestudent_id)
+			.then(result => result.data)
 			.then(result => {
 				this.listStudienplaene = result;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
-		CoreRESTClient
-			.get('components/stv/Status/getStatusgruende/')
-			.then(result => CoreRESTClient.getData(result.data) || [])
+		this.$fhcApi
+			.get('api/frontend/v1/stv/status/getStatusgruende/')
+			.then(result => result.data)
 			.then(result => {
 				this.listStatusgruende = result;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
-		CoreRESTClient
-			.get('components/stv/Status/getLastBismeldestichtag/')
-			.then(result => CoreRESTClient.getData(result.data) || [])
+		this.$fhcApi
+			.get('api/frontend/v1/stv/status/getLastBismeldestichtag/')
+			.then(result => result.data)
 			.then(result => {
-				this.dataMeldestichtag = result[0].meldestichtag;
+				this.dataMeldestichtag = result.retval[0].meldestichtag;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 	},
@@ -526,7 +447,6 @@ export default{
 	},
 	template: `
 		<div class="stv-list h-100 pt-3">
-		
 				
 			<!--Modal: Add New Status-->
 			<BsModal ref="newStatusModal">
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 753991992..8e4581fc9 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -21991,7 +21991,7 @@ array(
 	),
 	array(
 		'app' => 'core',
-		'category' => 'studierendenantrag',q
+		'category' => 'studierendenantrag',
 		'phrase' => 'error_no_prestudent',
 		'insertvon' => 'system',
 		'phrases' => array(
@@ -25893,7 +25893,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Sie haben keine Schreibrechte fuer diesen Studiengang!',
+				'text' => 'Sie haben keine Schreibrechte für diesen Studiengang!',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -25924,6 +25924,253 @@ array(
 				)
 			)
 		),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'error_keinReihungstestverfahren',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '{name}: Um einen Interessenten zum Bewerber zu machen, muss die Person das Reihungstestverfahren abgeschlossen haben!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '{name}: In order to turn an interested party into an applicant the person must have completed the ranking test process!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'error_ZGVNichtEingetragen',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '{name}: Um einen Interessenten zum Bewerber zu machen, muss die Zugangsvoraussetzung eingetragen sein!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '{name}: In order to turn an interested party into an applicant, the entry requirements must be entered!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'error_ZGVMasterNichtEingetragen',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '{name}: Um einen Interessenten zum Bewerber zu machen, muss die Zugangsvoraussetzung Master eingetragen sein!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '{name}: In order to turn an interested party into an applicant, the entry requirements for master studies must be entered!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'error_keinBewerber',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '{name} muss zuerst zum Bewerber gemacht werden!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '{name} must be made an applicant first!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'error_noStudstatus',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ein Studentenstatus kann hier nur hinzugefuegt werden wenn die Person bereits Student ist. Um einen Bewerber zum Studenten zu machen waehlen Sie bitte unter "Status aendern" den Punkt "Student"',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Student status can only be added here if the person is already a student. To turn an applicant into a student, please select "Student" under "Change status".',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'error_dataVorMeldestichtag',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Studentstatus mit Datum oder Semesterende vor erreichtem Meldestichtag kann nicht hinzugefügt werden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Student status with a date or end of semester before the reporting deadline cannot be added',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'error_duringInsertUpdateLehrverband',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler beim Ermitteln bzw Aktualisieren des Lehrverbands: es wurden keine Änderungen in der Datenbank gespeichert',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error during insert or update of Lehrverband: no changes were saved in the database',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'error_duringDeleteLehrverband',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler beim Löschen des Lehrverbands: es wurden keine Änderungen in der Datenbank gespeichert',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error during deletion of Lehrverband: no changes were saved in the database',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'error_onlyAdminDeleteRolleStudent',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Studentenrolle kann nur durch den Administrator geloescht werden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error during insert or update of Lehrverband: no changes were saved in the database',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'error_onlyAdminDeleteLastStatus',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Die letzte Rolle kann nur durch den Administrator geloescht werden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The last role can only be deleted by the administrator',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'error_noStatusFound',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler: Status nicht gefunden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error: Status not found',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'error_statusConfirmedYet',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Der Status ist bereits bestätigt!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The status is already confirmed!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'error_bewerbungNochNichtAbgeschickt',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Die Bewerbung wurde noch nicht abgeschickt und kann deshalb nicht bestaetigt werden!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The application has not yet been sent and therefore cannot be confirmed!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 );
 
 

From d34f5b92f461b409ae52fd4048774e618ef1bb9f Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Thu, 28 Mar 2024 13:14:34 +0100
Subject: [PATCH 0527/1461] Added new phrases for softwarebereitstellung- and
 for core app

---
 system/phrasesupdate.php | 1262 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 1261 insertions(+), 1 deletion(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 6441d4d42..952daee55 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -24436,7 +24436,1267 @@ array(
 				'insertvon' => 'system'
 			)
 		)
-	)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'gespeichert',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gespeichert',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Saved',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'geloescht',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gelöscht',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Deleted',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'softwareUndLizenzManagement',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Software- und Lizenzmanagement',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Software- and License Management',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'raumzuordnung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Raumzuordnung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Location Assignment',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'raum',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Raum',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Location',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'statusSetzen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Status setzen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Set status',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'hierarchieAnsicht',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Hierarchie-Ansicht',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Hierarchy view',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'aufgeklappt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'aufgeklappt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'unfolded',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'lizenzserver',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Lizenzserver',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'License server',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'softwareZuordnung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Software-Zuordnung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Software assignment',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'zuordnungUeberSoftware',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zuordnung über Software',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Assignment via Software',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'zuordnungUeberImage',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zuordnung über Image',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Assignment via Image',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'verfuegbarkeitBearbeiten',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Verfügbarkeit bearbeiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Edit availability',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'softwareAnlegen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Software anlegen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Add software',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'softwareAuswaehlen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Software auswählen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Select software',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'softwareBearbeiten',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Software bearbeiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Edit software',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'softwareimageUndZugeordneteRaeumeKopieren',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Softwareimage und zugeordnete Räume kopieren',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Copy software image and assigned rooms',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'softwareimageAnlegen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Softwareimage anlegen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Add Softwareimage',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'imageAuswaehlen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Image auswählen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Select image',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'softwareimageBearbeiten',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Softwareimage bearbeiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Edit Softwareimage',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'raumZuImageAnlegen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Raum zu Image anlegen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Add location to image',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'raumZuImageBearbeiten',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Raum zu Image bearbeiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Edit location assigned to image',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'lizenzserverAnlegen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Lizenzserver anlegen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Add license server',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'lizenzserverBearbeiten',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Lizenzserver bearbeiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Edit license server',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'bezeichnung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bezeichnung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Name',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'betriebssystem',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Betriebssystem',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Operating System',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'verfuegbarkeitStart',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Verfügbarkeit Start',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Availability start',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'verfuegbarkeitEnde',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Verfügbarkeit Ende',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Availability end',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'softwaretyp',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Softwaretyp',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Softwaretype',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'softwareKurzbz',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Software Kurzbz',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Software',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'hersteller',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Hersteller',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Producer',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'verantwortliche',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Verantwortliche',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Responsible',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'uebergeordneteSoftware',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Übergeordnete Software',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Parent Software',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'ansprechpartner',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ansprechpartner',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Contact person',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'ansprechpartnerIntern',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ansprechpartner intern',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Contact person internal',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'ansprechpartnerExtern',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ansprechpartner extern',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Contact person external',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'anmerkungIntern',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'anmerkungIntern',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Note internal',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'zugeordneteImages',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zugeordnete Images',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Assigned images',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'lizenzart',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Lizenz-Art',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'License type',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'lizenzserverKurzbz',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Lizenzserver-Kurzbz',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Licenseserver',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'lizenzAnzahl',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Lizenz-Anzahl',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'License number',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'lizenzLaufzeit',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Lizenz-Laufzeit',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'License term',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'kostentraegerOe',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kostenträger-OE',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Cost unit',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'lizenzKosten',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Lizenz-Kosten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'License costs',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'euroProJahr',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '€/Jahr',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '€/year',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'alleWaehlen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Alle wählen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Select all',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'softwareverwaltung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Softwareverwaltung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Software Management',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'imageverwaltung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Imageverwaltung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Image Management',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'lizenzserververwaltung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Lizenzserververwaltung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Licenseserver Management',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'sucheNachRaum',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Suche nach Raum',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Search by location',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'insertvon',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Erstellt von',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Inserted by',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'insertamum',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Erstellt am',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Inserted on',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'updatevon',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Geändert von',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Updated by',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'updateamum',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Geändert am',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Updated on',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'speichern',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Speichern',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Save',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'loeschen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Löschen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Delete',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'loeschenNichtMoeglichSoftwareBereitsZugeordnet',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Löschen nicht möglich, da Software bereits zugeordnet wurde',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Delete',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'existiertBereits',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Existiert bereits',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Already exists',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'datumEndeVorDatumStart',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Datumende vor Datumstart',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Enddate after startdate',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'ui',
+		'phrase' => 'existiertBereitsInKombinationMitDerVersion',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Existiert bereits in Kombination mit der Version',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Already exists in combination with the Version',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'ui',
+		'phrase' => 'nichtGleichzeitigUntergeordnetUndUebergeordnet',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Software kann einer anderen Software nicht gleichzeitig untergeordnet und übergeordnet sein',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Software cannot be both subordinate and superior to other software at the same time',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'imageverwaltungImageCopySuccessText',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Falls vorhanden, wurden zugeordnete Räume mitkopiert. Nicht jedoch zugeordnete Software. Diese muss dem neuen Image über die Softwareverwaltungstabelle zugeordnet werden.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'If available, assigned rooms were also copied. However, not associated software. This must be assigned to the new image via the software management table.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'loeschenNichtMoeglichSoftwareBereitsZugeordnet',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Löschen nicht möglich, da bereits Software zugeordnet wurde.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Deletion not possible because software has already been assigned.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 );
 
 

From 05516f2952f9b9fcb5a76badd2ba5176e9ce30b7 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Thu, 28 Mar 2024 13:19:31 +0100
Subject: [PATCH 0528/1461] Fixed: issue with component tabs not recognizing
 loaded phrases

Vue.computed ensures loading phrase reactively when phrases are loaded
---
 public/js/components/Tabs.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Tabs.js b/public/js/components/Tabs.js
index 8090a9d29..9054c8fda 100644
--- a/public/js/components/Tabs.js
+++ b/public/js/components/Tabs.js
@@ -71,7 +71,7 @@ export default {
 
 					tabs[key] = {
 						component: Vue.markRaw(Vue.defineAsyncComponent(() => import(item.component))),
-						title: item.title || key,
+						title: Vue.computed(() => item.title || key),
 						config: item.config,
 						key
 					}
@@ -83,7 +83,7 @@ export default {
 
 					tabs[key] = {
 						component: Vue.markRaw(Vue.defineAsyncComponent(() => import(item.component))),
-						title: item.title || key,
+						title: Vue.computed(() => item.title || key),
 						config: item.config,
 						key
 					}

From abfd92e38748e9bf58a3e61063c587a47f566b89 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 28 Mar 2024 15:35:26 +0100
Subject: [PATCH 0529/1461] Fetch: check for intermediate properties of error
 object

---
 public/js/components/Fetch.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Fetch.js b/public/js/components/Fetch.js
index 9a34e1a3f..f683c0655 100644
--- a/public/js/components/Fetch.js
+++ b/public/js/components/Fetch.js
@@ -99,7 +99,7 @@ export const CoreFetchCmpt = {
 		 *
 		 */
 		errorHandler: function(error) {
-			if (error.response.data.retval)
+			if (error.response?.data?.retval)
 				this.setError(error.response.data.retval);
 			else
 				this.setError(error.message);

From 24641d1444ce52aff0604000afb8e7da45224a3b Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 28 Mar 2024 15:35:43 +0100
Subject: [PATCH 0530/1461] Tabs: use computed on titles

---
 public/js/components/Tabs.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Tabs.js b/public/js/components/Tabs.js
index 36b6406c5..085c63566 100644
--- a/public/js/components/Tabs.js
+++ b/public/js/components/Tabs.js
@@ -71,7 +71,7 @@ export default {
 
 					tabs[key] = {
 						component: Vue.markRaw(Vue.defineAsyncComponent(() => import(item.component))),
-						title: item.title || key,
+						title: Vue.computed(() => item.title || key),
 						config: item.config,
 						key
 					}
@@ -83,7 +83,7 @@ export default {
 
 					tabs[key] = {
 						component: Vue.markRaw(Vue.defineAsyncComponent(() => import(item.component))),
-						title: item.title || key,
+						title: Vue.computed(() => item.title || key),
 						config: item.config,
 						key
 					}

From 46fff01eaad1f3b7285d648cd952a818de9b883b Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 28 Mar 2024 15:37:50 +0100
Subject: [PATCH 0531/1461] Form_validation: extra functions

---
 application/helpers/hlp_common_helper.php     | 38 +++++++++++++++++
 .../language/english/form_validation_lang.php | 42 +++++++++++++++++++
 2 files changed, 80 insertions(+)
 create mode 100644 application/language/english/form_validation_lang.php

diff --git a/application/helpers/hlp_common_helper.php b/application/helpers/hlp_common_helper.php
index 3e682e56c..688fae965 100644
--- a/application/helpers/hlp_common_helper.php
+++ b/application/helpers/hlp_common_helper.php
@@ -422,3 +422,41 @@ function isValidDate($dateString)
 		return false;
 	}
 }
+
+
+// ------------------------------------------------------------------------
+// Collection of utility functions for form validation purposes
+// ------------------------------------------------------------------------
+
+/**
+ * check if string can be converted to a date
+ */
+function is_valid_date($dateString)
+{
+	try
+	{
+		return (new DateTime($dateString)) !== false;
+	}
+	catch(Exception $e)
+	{
+		return false;
+	}
+}
+
+/**
+ * check if given permissions are met
+ */
+function has_write_permissions($value, $permissions = '')
+{
+	if (!$permissions)
+		$permissions = $value; // TODO(chris): ??
+	$permissions = explode(',', $permissions);
+
+	$CI =& get_instance();
+	$CI->load->library('PermissionLib');
+	return $CI->permissionlib->hasAtLeastOne(
+		$permissions,
+		'sometable',
+		'w'
+	);
+}
diff --git a/application/language/english/form_validation_lang.php b/application/language/english/form_validation_lang.php
new file mode 100644
index 000000000..9e942f8e5
--- /dev/null
+++ b/application/language/english/form_validation_lang.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * CodeIgniter
+ *
+ * An open source application development framework for PHP
+ *
+ * This content is released under the MIT License (MIT)
+ *
+ * Copyright (c) 2019 - 2022, CodeIgniter Foundation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @package	CodeIgniter
+ * @author	EllisLab Dev Team
+ * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
+ * @copyright	Copyright (c) 2014 - 2019, British Columbia Institute of Technology (https://bcit.ca/)
+ * @copyright	Copyright (c) 2019 - 2022, CodeIgniter Foundation (https://codeigniter.com/)
+ * @license	https://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
+ * @since	Version 1.0.0
+ * @filesource
+ */
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+$lang['form_validation_has_write_permissions']	= 'You have no rights to edit {field} field.';
+$lang['form_validation_is_valid_date']	= 'The date format is invalid or out of range.';
\ No newline at end of file

From b1c094383f7855f21ede40bf7481b0436e315669 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 28 Mar 2024 15:38:50 +0100
Subject: [PATCH 0532/1461] Udf Component

---
 .../controllers/api/frontend/v1/Udf.php       | 142 ++++++++++++++++
 application/core/DB_Model.php                 |  17 ++
 application/libraries/UDFLib.php              | 156 ++++++++++++++++++
 public/js/components/Udf/Udf.js               | 156 ++++++++++++++++++
 4 files changed, 471 insertions(+)
 create mode 100644 application/controllers/api/frontend/v1/Udf.php
 create mode 100644 public/js/components/Udf/Udf.js

diff --git a/application/controllers/api/frontend/v1/Udf.php b/application/controllers/api/frontend/v1/Udf.php
new file mode 100644
index 000000000..99ed2a10d
--- /dev/null
+++ b/application/controllers/api/frontend/v1/Udf.php
@@ -0,0 +1,142 @@
+<?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');
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the UDFLib (back-end)
+ * Provides data to the ajax get calls about the Udf component
+ * Listens to ajax post calls to change the Udf data
+ * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
+ */
+class Udf extends FHCAPI_Controller
+{
+	/**
+	 * Calls the parent's constructor and prepares the UDFLib
+	 */
+	public function __construct()
+	{
+		// TODO(chris): permissions
+		// NOTE: UdfLib has its own permissions checks
+		parent::__construct([
+			'load' => 'admin:r',#self::PERM_LOGGED,
+			'save' => 'admin:r'#self::PERM_LOGGED
+		]);
+
+		// Libraries
+		$this->load->library('form_validation');
+		$this->load->library('UDFLib');
+		
+		// Models
+		$this->load->model($this->getTargetModelPath(), 'TargetModel');
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * Load all UDFs for a dataset
+	 *
+	 * @return void
+	 */
+	public function load()
+	{
+		$pks = $this->TargetModel->getPks();
+		foreach ($pks as $id)
+			$this->form_validation->set_rules($id, $id, 'required');
+		
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+
+		$id = [];
+		foreach ($pks as $pk)
+			$id[$pk] = $this->input->post($pk);
+		if (!is_array($this->TargetModel->getPk()))
+			$id = current($id);
+
+		$result = $this->udflib->getFieldArray($this->TargetModel, $id);
+
+		#$fields = $this->getDataOrTerminateWithError($result);
+		if (isError($result))
+			$this->terminateWithError(getError($result));
+		$fields = $result->retval;
+
+		$this->terminateWithSuccess($fields);
+	}
+
+	/**
+	 * Saves UDFs to a dataset
+	 *
+	 * @return void
+	 */
+	public function save()
+	{
+		$pks = $this->TargetModel->getPks();
+		foreach ($pks as $id)
+			$this->form_validation->set_rules($id, $id, 'required');
+
+		$result = $this->udflib->getCiValidations($this->TargetModel, $this->input->post());
+		
+		#$fieldValidations = $this->getDataOrTerminateWithError($result);
+		if (isError($result))
+			$this->terminateWithError(getError($result));
+		$fieldvalidations = $result->retval;
+
+		$this->form_validation->set_rules($fieldvalidations);
+
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+
+		$id = [];
+		$fields = $this->input->post();
+		foreach ($pks as $pk) {
+			$id[$pk] = $fields[$pk];
+			unset($fields[$pk]);
+		}
+		if (!is_array($this->TargetModel->getPk()))
+			$id = current($id);
+
+		$result = $this->TargetModel->update($id, $fields);
+
+		#$this->getDataOrTerminateWithError($result);
+		if (isError($result))
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+
+		$this->terminateWithSuccess(array_fill_keys(array_keys($fields), ''));
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Private methods
+
+	/**
+	 * Get the path to the target model from the url
+	 *
+	 * @return string
+	 */
+	private function getTargetModelPath()
+	{
+		$ci_model_path = array_slice($this->uri->rsegments, 2);
+		if ($ci_model_path)
+			$ci_model_path[] = ucfirst(array_pop($ci_model_path)) . '_model';
+		return implode(DIRECTORY_SEPARATOR, $ci_model_path);
+	}
+}
\ No newline at end of file
diff --git a/application/core/DB_Model.php b/application/core/DB_Model.php
index 79040dc66..c799de516 100644
--- a/application/core/DB_Model.php
+++ b/application/core/DB_Model.php
@@ -827,6 +827,23 @@ class DB_Model extends CI_Model
 		return $result;
 	}
 
+	public function getDbTable()
+	{
+		return $this->dbTable;
+	}
+
+	public function getPk()
+	{
+		return $this->pk;
+	}
+
+	public function getPks()
+	{
+		if (is_array($this->pk))
+			return $this->pk;
+		return [$this->pk];
+	}
+
 	// ------------------------------------------------------------------------------------------
 	// Protected methods
 
diff --git a/application/libraries/UDFLib.php b/application/libraries/UDFLib.php
index c5f0d3e98..2fa5dd0d4 100644
--- a/application/libraries/UDFLib.php
+++ b/application/libraries/UDFLib.php
@@ -65,6 +65,8 @@ class UDFLib
 
 	private $_udfUniqueId; // Property that contains the UDF widget unique id
 
+	private $_definition_cache = [];
+
 	/**
 	 * Gets CI instance
 	 */
@@ -613,6 +615,160 @@ class UDFLib
 		);
 	}
 
+	/**
+	 * Gets the UDF definitions for a model
+	 *
+	 * @param DB_Model			$targetModel
+	 *
+	 * @return stdClass
+	 */
+	public function getDefinitionForModel($targetModel)
+	{
+		$dbTable = $targetModel->getDbTable();
+		if (!isset($this->_definition_cache[$dbTable])) {
+			$this->_ci->load->model('system/UDF_model', 'UDFModel');
+			list($schema, $table) = explode('.', $dbTable);
+			$result = $this->_ci->UDFModel->loadWhere([
+				'schema' => $schema,
+				'table' => $table
+			]);
+			if (isError($result))
+				return $result;
+
+			$this->_definition_cache[$dbTable] = json_decode(current($result->retval)->jsons, true);
+		}
+		return success($this->_definition_cache[$dbTable]);
+	}
+
+	/**
+	 * Gets the UDFs for db entry with translated params and resolved listValues for dropdowns
+	 *
+	 * @param DB_Model			$targetModel
+	 * @param mixed				$id
+	 *
+	 * @return stdClass
+	 */
+	public function getFieldArray($targetModel, $id)
+	{
+		// Load Libraries
+		$this->_ci->load->library('PhrasesLib');
+		$this->_ci->load->library('PermissionLib');
+
+		$result = $this->getDefinitionForModel($targetModel);
+		if (isError($result))
+			return $result;
+		$definitions = getData($result);
+	
+		usort($definitions, function ($a, $b) {
+			return $a[self::SORT] - $b[self::SORT];
+		});
+
+		$values = $targetModel->getUDFs($id);
+
+		$fields = [];
+		foreach ($definitions as $field) {
+			// check read permissions
+			if (!$this->_ci->permissionlib->hasAtLeastOne(
+				$field[self::REQUIRED_PERMISSIONS_PARAMETER],
+				self::PERMISSION_TABLE_METHOD,
+				self::PERMISSION_TYPE_READ
+			))
+				continue;
+
+			// set value
+			if (isset($values[$field[self::NAME]])) {
+				$field['value'] = $values[$field[self::NAME]];
+			} elseif (isset($field['defaultValue'])) {
+				$field['value'] = $field['defaultValue'];
+			} elseif (isset($field[self::TYPE]) && $field[self::TYPE] == 'checkbox') {
+				$field['value'] = false;
+			} else {
+				$field['value'] = '';
+			}
+
+			// translate params
+			foreach ([self::LABEL, self::TITLE, self::PLACEHOLDER] as $key) {
+				if (isset($field[$key])) {
+					$res = $this->_ci->phraseslib->getPhrases(self::PHRASES_APP_NAME, getUserLanguage(), $field[$key], null, null, 'no');
+					if (hasData($res))
+						$field[$key] = current(getData($res))->text;
+				}
+			}
+
+			// check write permissions
+			$field['disabled'] = !$this->_ci->permissionlib->hasAtLeastOne(
+				$field[self::REQUIRED_PERMISSIONS_PARAMETER],
+				self::PERMISSION_TABLE_METHOD,
+				self::PERMISSION_TYPE_WRITE
+			);
+			
+			// set listValues for dropdowns
+			if (isset($field[self::LIST_VALUES])) {
+				if (isset($field[self::LIST_VALUES]['enum'])) {
+					$field['options'] = $field[self::LIST_VALUES]['enum'];
+				} elseif (isset($field[self::LIST_VALUES]['sql'])) {
+					$res = $this->_ci->UDFModel->execReadOnlyQuery($field[self::LIST_VALUES]['sql']);
+					$field['options'] = hasData($res) ? getData($res) : [];
+				}
+			}
+
+			// add to array
+			$fields[] = $field;
+		}
+		return success($fields);
+	}
+
+	/**
+	 * Gets a validation config array for CI form_validation
+	 *
+	 * @param DB_Model			$targetModel
+	 * @param array				(optional) $filter
+	 *
+	 * @return stdClass
+	 */
+	public function getCiValidations($targetModel, $filter = null)
+	{
+		$result = $this->getDefinitionForModel($targetModel);
+		if (isError($result))
+			return $result;
+		$definitions = getData($result);
+
+		$result = [];
+		foreach ($definitions as $def) {
+			if ($filter && !isset($filter[$def['name']]))
+				continue;
+			$validations = [];
+			if (isset($def['requiredPermissions']))
+				$validations[] = 'has_write_permissions[' . implode(',', $def['requiredPermissions']) . ']';
+			if (isset($def['required']))
+				$validations[] = 'required';
+			if (isset($def['validation'])) {
+				if (isset($def['validation']['max-value']))
+					$validations[] = 'less_than_equal_to[' . $def['validation']['max-value'] . ']';
+				if (isset($def['validation']['min-value']))
+					$validations[] = 'greater_than_equal_to[' . $def['validation']['min-value'] . ']';
+				if (isset($def['validation']['max-length']))
+					$validations[] = 'max_length[' . $def['validation']['max-length'] . ']';
+				if (isset($def['validation']['min-length']))
+					$validations[] = 'min_length[' . $def['validation']['min-length'] . ']';
+				if (isset($def['validation']['regex']) && is_array($def['validation']['regex'])) {
+					foreach ($def['validation']['regex'] as $regex) {
+						if ($regex['language'] == 'php') {
+							$validations[] = 'regex_match[' . $regex['expression'] . ']';
+						}
+					}
+				}
+			}
+			if ($validations)
+				$result[] = [
+					'field' => $def['name'],
+					'label' => $def['title'],
+					'rules' => $validations
+				];
+		}
+		return success($result);
+	}
+
 	// -------------------------------------------------------------------------------------------------
 	// Private methods
 	//
diff --git a/public/js/components/Udf/Udf.js b/public/js/components/Udf/Udf.js
new file mode 100644
index 000000000..e9cc3c60a
--- /dev/null
+++ b/public/js/components/Udf/Udf.js
@@ -0,0 +1,156 @@
+import { CoreFetchCmpt } from '../Fetch.js';
+import FormInput from '../Form/Input.js';
+
+
+export default {
+	components: {
+		CoreFetchCmpt,
+		FormInput
+	},
+	emits: [
+		'update:modelValue',
+		'load'
+	],
+	props: {
+		// CodeIgniter model (eg: crm/prestudent)
+		ciModel: {
+			type: String,
+			required: true
+		},
+		// Primarykey(s) of the record (eg: {prestudent_id: 12345})
+		pk: {
+			type: Object,
+			required: true
+		},
+		// The values as associative array
+		modelValue: Object,
+		// Show only fields with a name that exists in the filter
+		filter: [String, Array]
+	},
+	data() {
+		return {
+			fields: [],
+			backupModelValue: {}
+		};
+	},
+	computed: {
+		filterArray() {
+			if (!this.filter || Array.isArray(this.filter))
+				return this.filter;
+			return [this.filter];
+		},
+		filteredFields() {
+			if (!this.filterArray)
+				return this.fields;
+			return this.fields.filter(el => this.filterArray.includes(el.name));
+		},
+		filteredValues() {
+			return this.filteredFields.reduce((r,e) => (r[e.name] = this.internModelValue[e.name], r), {});
+		},
+		internModelValue: {
+			get() {
+				return this.modelValue || this.backupModelValue;
+			},
+			set(value) {
+				this.backupModelValue = value;
+				this.$emit('update:modelValue', value);
+				this.originalValues
+			}
+		}
+	},
+	watch: {
+		pk(n, o) {
+			if (!this.$refs.fetch)
+				return; // NOTE(chris): no initial load yet
+			
+			if (Object.keys(o).length == Object.keys(n).length
+				&& Object.keys(o).every(key => n.hasOwnProperty(key) && o[key] === n[key]))
+				return; // NOTE(chris): old and new are the same
+
+			this.$nextTick(this.$refs.fetch.fetchData);
+		}
+	},
+	methods: {
+		loadF(params) {
+			// TODO(chris): move to fhcapi.factory
+			return this.$fhcApi
+				.post('/api/frontend/v1/udf/load/' + params.ciModel, params.pk);
+		},
+		init(result) {
+			const fields = result.map(el => {
+				switch (el.type) {
+				case 'textfield':
+					el.type = 'text';
+					break;
+				case 'date':
+					el.type = 'Datepicker';
+					el.clearable = el.hasOwnProperty('clearable') ? el.clearable : false
+					el.autoApply = el.hasOwnProperty('autoApply') ? el.autoApply : true
+					el.enableTimePicker = el.hasOwnProperty('enableTimePicker') ? el.enableTimePicker : false
+					el.format = el.hasOwnProperty('format') ? el.format : "dd.MM.yyyy"
+					el.previewFormat = el.hasOwnProperty('previewFormat') ? el.previewFormat : "dd.MM.yyyy"
+					el.teleport = el.hasOwnProperty('teleport') ? el.teleport : true
+					break;
+				case 'multipledropdown':
+					el.multiple = true;
+				case 'dropdown':
+					el.type = 'select';
+					el.options = el.options.map(item => {
+						if (Array.isArray(item))
+							return {
+								id: item[0],
+								description: item[1]
+							};
+							if (typeof item === 'object')
+								return item;
+							return {
+								id: item,
+								description: item
+							};
+						});
+					break;
+				}
+				return el;
+			});
+			const values = fields.reduce((a,c) => {
+				a[c.name] = c.value;
+				return a;
+			}, {});
+
+			this.internModelValue = {...this.internModelValue, ...values};
+			this.fields = fields;
+			this.$emit('load', values);
+		}
+	},
+	template: `
+	<div class="core-udf row">
+		<core-fetch-cmpt
+			ref="fetch"
+			:api-function="loadF"
+			:api-function-parameters="{ ciModel, pk }"
+			@data-fetched="init"
+			>
+			<template #default>
+				<div v-for="field in filteredFields" :key="field.name" class="col">
+					<form-input
+						v-model="internModelValue[field.name]"
+						:name="field.name"
+						:label="field.title"
+						:type="field.type"
+						:multiple="field.multiple"
+						:title="field.description"
+						:disabled="field.disabled"
+						:clearable="field.clearable"
+						:auto-apply="field.autoApply"
+						:enable-time-picker="field.enableTimePicker"
+						:format="field.format"
+						:preview-format="field.previewFormat"
+						:teleport="field.teleport"
+						>
+						<option v-for="value in field.options" :key="value.id" :value="value.id">{{value.description}}</option>
+					</form-input>
+				</div>
+			</template>
+		</core-fetch-cmpt>
+	</div>`
+}
\ No newline at end of file

From c6f4fbb0b864835555b58583f68ebfe99a1f0093 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 28 Mar 2024 15:39:19 +0100
Subject: [PATCH 0533/1461] Use Udf Component

---
 .../api/frontend/v1/stv/Student.php           | 588 ++++++++++++++++++
 .../Studentenverwaltung/Details/Details.js    |  39 +-
 .../Stv/Studentenverwaltung/List/New.js       |  15 +-
 3 files changed, 622 insertions(+), 20 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/stv/Student.php

diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php
new file mode 100644
index 000000000..101d34863
--- /dev/null
+++ b/application/controllers/api/frontend/v1/stv/Student.php
@@ -0,0 +1,588 @@
+<?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 \DateTime as DateTime;
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the back-end
+ * Provides data to the ajax get calls about a Student
+ * Listens to ajax post calls to change the Student data
+ * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
+ */
+class Student extends FHCAPI_Controller
+{
+	/**
+	 * Calls the parent's constructor and prepares libraries and phrases
+	 */
+	public function __construct()
+	{
+		// TODO(chris): permissions
+		parent::__construct([
+			'get' => ['admin:r', 'assistenz:r'],
+			'save' => ['admin:w', 'assistenz:w'],
+			'check' => ['admin:w', 'assistenz:w'],
+			'add' => ['admin:w', 'assistenz:w']
+		]);
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui'
+		]);
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * Get details for a prestudent
+	 *
+	 * @param string			$prestudent_id
+	 * @return void
+	 */
+	public function get($prestudent_id)
+	{
+		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
+
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+		$this->PrestudentModel->addSelect('p.*');
+		$this->PrestudentModel->addSelect('s.student_uid');
+		$this->PrestudentModel->addSelect('matrikelnr');
+		$this->PrestudentModel->addSelect('b.aktiv');
+		$this->PrestudentModel->addSelect('v.semester');
+		$this->PrestudentModel->addSelect('v.verband');
+		$this->PrestudentModel->addSelect('v.gruppe');
+		$this->PrestudentModel->addSelect('b.alias');
+
+		if (defined('ACTIVE_ADDONS') && strpos(ACTIVE_ADDONS, 'bewerbung') !== false) {
+			$this->PrestudentModel->addSelect(
+				"(
+					SELECT kontakt 
+					FROM public.tbl_kontakt 
+					WHERE kontakttyp='email' 
+					AND person_id=p.person_id 
+					AND zustellung 
+					ORDER BY kontakt_id 
+					LIMIT 1
+				) AS email_privat",
+				false
+			);
+		}
+
+		$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id', 'LEFT');
+		$this->PrestudentModel->addJoin('public.tbl_benutzer b', 'student_uid = uid', 'LEFT');
+		$this->PrestudentModel->addJoin(
+			'public.tbl_studentlehrverband v',
+			'b.uid = v.student_uid AND v.studiensemester_kurzbz = ' . $this->PrestudentModel->escape($studiensemester_kurzbz),
+			'LEFT'
+		);
+		$this->PrestudentModel->addJoin('public.tbl_person p', 'p.person_id = tbl_prestudent.person_id');
+
+		$result = $this->PrestudentModel->loadWhere(['prestudent_id' => $prestudent_id]);
+		
+		#$student = $this->getDataOrTerminateWithError($result);
+		if (isError($result))
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		$student = $result->retval;
+		
+		if (!$student)
+			return show_404();
+
+		$this->terminateWithSuccess(current($student));
+	}
+
+	/**
+	 * Saves data to a prestudent
+	 *
+	 * @param string			$prestudent_id
+	 * @return void
+	 */
+	public function save($prestudent_id)
+	{
+		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
+
+		$this->load->model('person/Person_model', 'PersonModel');
+		$this->load->model('crm/Student_model', 'StudentModel');
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
+
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('gebdatum', 'Geburtsdatum', 'is_valid_date');
+
+		$this->form_validation->set_rules('semester', 'Semester', 'integer');
+
+		$this->load->library('UDFLib');
+		
+		$result = $this->udflib->getCiValidations($this->PersonModel, $this->input->post());
+
+		#$fieldValidations = $this->getDataOrTerminateWithError($result);
+		if (isError($result))
+			$this->terminateWithError(getError($result));
+		$fieldvalidations = $result->retval;
+
+		$this->form_validation->set_rules($fieldvalidations);
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$result = $this->StudentModel->loadWhere(['prestudent_id' => $prestudent_id]);
+		
+		#$student = $this->getDataOrTerminateWithError($result);
+		if (isError($result))
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		$student = $result->retval;
+
+		$uid = $student ? current($student)->student_uid : null;
+
+		$result = $this->PrestudentModel->loadWhere(['prestudent_id' => $prestudent_id]);
+
+		#$person = $this->getDataOrTerminateWithError($result);
+		if (isError($result))
+			$this->terminateWithError(getError($result));
+		$person = $result->retval;
+
+		$person_id = $person ? current($person)->person_id : null;
+
+		
+		$array_allowed_props_lehrverband = ['verband', 'semester', 'gruppe'];
+		$update_lehrverband = array();
+		foreach ($array_allowed_props_lehrverband as $prop) {
+			$val = $this->input->post($prop);
+			if ($val !== null) {
+				$update_lehrverband[$prop] = $val;
+			}
+		}
+
+		$array_allowed_props_person = [
+			'anrede',
+			'bpk',
+			'titelpre',
+			'titelpost',
+			'nachname',
+			'vorname',
+			'vornamen',
+			'wahlname',
+			'gebdatum',
+			'gebort',
+			'geburtsnation',
+			'svnr',
+			'ersatzkennzeichen',
+			'staatsbuergerschaft',
+			'matr_nr',
+			'sprache',
+			'geschlecht',
+			'familienstand',
+			'foto',
+			'anmerkung',
+			'homepage'
+		];
+		
+		// add UDFs
+		$result = $this->udflib->getDefinitionForModel($this->PersonModel);
+
+		#$definitions = $this->getDataOrTerminateWithError($result);
+		if (isError($result))
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		$definitions = $result->retval;
+
+		foreach ($definitions as $def)
+			$array_allowed_props_person[] = $def['name'];
+
+		$update_person = array();
+		foreach ($array_allowed_props_person as $prop) {
+			$val = $this->input->post($prop);
+			if ($val !== null) {
+				$update_person[$prop] = $val;
+			}
+		}
+
+		$array_allowed_props_student = ['matrikelnr'];
+		$update_student = array();
+		foreach ($array_allowed_props_student as $prop) {
+			$val = $this->input->post($prop);
+			if ($val !== null) {
+				$update_student[$prop] = $val;
+			}
+		}
+
+		// Check PKs
+		if (count($update_lehrverband) + count($update_student) && $uid === null) {
+			// TODO(chris): phrase
+			$this->terminateWithValidationErrors(['' => "Kein/e StudentIn vorhanden!"]);
+		}
+		if (count($update_person) && $person_id === null) {
+			// TODO(chris): phrase
+			$this->terminateWithValidationErrors(['' => "Keine Person vorhanden!"]);
+		}
+
+		// Do Updates
+		if (count($update_lehrverband)) {
+			$result = $this->StudentlehrverbandModel->update([
+				'studiensemester_kurzbz' => $studiensemester_kurzbz,
+				'student_uid' => $uid
+			], $update_lehrverband);
+			#$this->getDataOrTerminateWithError($result);
+			if (isError($result))
+				$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+
+		if (count($update_person)) {
+			$result = $this->PersonModel->update(
+				$person_id,
+				$update_person
+			);
+			#$this->getDataOrTerminateWithError($result);
+			if (isError($result))
+				$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+
+
+		if (count($update_student)) {
+			$result = $this->StudentModel->update(
+				[$uid],
+				$update_student
+			);
+			#$this->getDataOrTerminateWithError($result);
+			if (isError($result))
+				$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+
+		$this->terminateWithSuccess(array_fill_keys(array_merge(
+			array_keys($update_lehrverband),
+			array_keys($update_person),
+			array_keys($update_student)
+		), ''));
+	}
+
+	public function check()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('gebdatum', 'Geburtsdatum', 'callback_isValidDate', [
+			'isValidDate' => $this->p->t('ui', 'error_invalid_date')
+		]);
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$vorname = $this->input->post('vorname');
+		$nachname = $this->input->post('nachname');
+		$gebdatum = $this->input->post('gebdatum');
+
+		if (!$vorname && !$nachname && !$gebdatum)
+			$this->terminateWithValidationErrors(['At least one of vorname, nachname or gebdatum must be set']);
+
+		$this->load->model('person/Person_model', 'PersonModel');
+
+		if ($gebdatum)
+			$this->PersonModel->db->where('gebdatum', (new DateTime($gebdatum))->format('Y-m-d'));
+		if ($vorname && $nachname) {
+			$this->PersonModel->db->or_group_start();
+			$this->PersonModel->db->where('LOWER(nachname)', 'LOWER(' . $this->PersonModel->db->escape($nachname) . ')', false);
+			$this->PersonModel->db->where('LOWER(vorname)', 'LOWER(' . $this->PersonModel->db->escape($vorname) . ')', false);
+			$this->PersonModel->db->group_end();
+		} elseif ($nachname) {
+			$this->PersonModel->db->or_where('LOWER(nachname)', 'LOWER(' . $this->PersonModel->escape($nachname) . ')', false);
+		}
+
+		$result = $this->PersonModel->load();
+
+		#$data = $this->getDataOrTerminateWithError($result);
+		if (isError($result))
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		$data = $result->retval;
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function add()
+	{
+		if (!$this->input->post('person_id')) {
+			if (!isset($_POST['address']) || !is_array($_POST['address']))
+				$_POST['address'] = [];
+			$_POST['address']['func'] = 1;
+		}
+		if ($this->input->post('incoming')) {
+			$_POST['ausbildungssemester'] = 0;
+		}
+
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('nachname', 'Nachname', 'callback_requiredIfNotPersonId', [
+			'requiredIfNotPersonId' => $this->p->t('ui', 'error_required')
+		]);
+		$this->form_validation->set_rules('geschlecht', 'Geschlecht', 'callback_requiredIfNotPersonId', [
+			'requiredIfNotPersonId' => $this->p->t('ui', 'error_required')
+		]);
+		$this->form_validation->set_rules('gebdatum', 'Geburtsdatum', 'callback_isValidDate', [
+			'isValidDate' => $this->p->t('ui', 'error_invalid_date')
+		]);
+		$this->form_validation->set_rules('address[func]', 'Address', 'required|integer|less_than[2]|greater_than[-2]');
+		$this->form_validation->set_rules('address[plz]', 'PLZ', 'callback_requiredIfAddressFunc', [
+			'requiredIfAddressFunc' => $this->p->t('ui', 'error_required')
+		]);
+		$this->form_validation->set_rules('address[gemeinde]', 'Gemeinde', 'callback_requiredIfAddressFunc', [
+			'requiredIfAddressFunc' => $this->p->t('ui', 'error_required')
+		]);
+		$this->form_validation->set_rules('address[ort]', 'Ort', 'callback_requiredIfAddressFunc', [
+			'requiredIfAddressFunc' => $this->p->t('ui', 'error_required')
+		]);
+		$this->form_validation->set_rules('address[address]', 'Adresse', 'callback_requiredIfAddressFunc', [
+			'requiredIfAddressFunc' => $this->p->t('ui', 'error_required')
+		]);
+		$this->form_validation->set_rules('email', 'E-Mail', 'valid_email');
+		$this->form_validation->set_rules('studiengang_kz', 'Studiengang', 'required');
+		$this->form_validation->set_rules('studiensemester_kurzbz', 'Studiensemester', 'required');
+		$this->form_validation->set_rules('ausbildungssemester', 'Ausbildungssemester', 'required|integer|less_than[9]|greater_than[-1]');
+		// TODO(chris): validate studienplan with studiengang, semester and orgform?
+		// TODO(chris): validate person_id, studiengang_kz, studiensemester_kurzbz, orgform_kurzbz, nation, gemeinde, ort, geschlecht?
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		// TODO(chris): This should be in a library
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
+
+		$this->db->trans_start();
+
+		$result = $this->addInteressent();
+
+		$this->db->trans_complete();
+
+		if ($this->db->trans_status() === FALSE)
+			$this->terminateWithError('TODO(chris): TEXT', self::ERROR_TYPE_GENERAL);
+
+		$this->terminateWithSuccess($result);
+	}
+
+	protected function addInteressent()
+	{
+		// Person anlegen wenn nötig
+		$person_id = $this->input->post('person_id');
+		if (!$person_id) {
+			$this->load->model('person/Person_model', 'PersonModel');
+			
+			$data = [
+				'nachname' => $this->input->post('nachname'),
+				'insertamum' => date('c'),
+				'insertvon' => getAuthUID(),
+				'zugangscode' => uniqid(),
+				'aktiv' => true
+			];
+			if ($this->input->post('anrede'))
+				$data['anrede'] = $this->input->post('anrede');
+			if ($this->input->post('titelpre'))
+				$data['titelpre'] = $this->input->post('titelpre');
+			if ($this->input->post('titelpost'))
+				$data['titelpost'] = $this->input->post('titelpost');
+			if ($this->input->post('vorname'))
+				$data['vorname'] = $this->input->post('vorname');
+			if ($this->input->post('vornamen'))
+				$data['vornamen'] = $this->input->post('vornamen');
+			if ($this->input->post('wahlname'))
+				$data['wahlname'] = $this->input->post('wahlname');
+			if ($this->input->post('geschlecht'))
+				$data['geschlecht'] = $this->input->post('geschlecht');
+			if ($this->input->post('gebdatum'))
+				$data['gebdatum'] = (new DateTime($this->input->post('datum_obj')))->format('Y-m-d');
+			if ($this->input->post('geburtsnation'))
+				$data['geburtsnation'] = $this->input->post('geburtsnation');
+			if ($this->input->post('staatsbuergerschaft'))
+				$data['staatsbuergerschaft'] = $this->input->post('staatsbuergerschaft');
+
+			$result = $this->PersonModel->insert($data);
+			if (isError($result))
+				return $result;
+			$person_id = getData($result);
+		}
+
+		// Addresse anlegen
+		$anlegen = $this->input->post('address[func]');
+		if ($anlegen) {
+			$this->load->model('person/Adresse_model', 'AdresseModel');
+
+			$data = [
+				'nation' => $this->input->post('address[nation]'),
+				'strasse' => $this->input->post('address[address]'),
+				'plz' => $this->input->post('address[plz]'),
+				'ort' => $this->input->post('address[ort]'),
+				'gemeinde' => $this->input->post('address[gemeinde]'),
+				'typ' => 'h',
+				'zustelladresse' => true,
+			];
+			if ($anlegen < 0) { // Überschreiben
+				$this->AdresseModel->addOrder('zustelladresse', 'DESC');
+				$this->AdresseModel->addOrder('sort');
+				$result = $this->AdresseModel->loadWhere([
+					'person_id' => $person_id
+				]);
+				if (isError($result))
+					return $result;
+				if (hasData($result)) {
+					$address = current(getData($result));
+
+					$data['updateamum'] = date('c');
+					$data['updatevon'] = getAuthUID();
+
+					$result = $this->AdresseModel->update($address->adresse_id, $data);
+					if (isError($result))
+						return $result;
+				} else {
+					//Wenn keine Adrese vorhanden ist dann eine neue Anlegen
+					$anlegen = 1;
+					$data['heimatadresse'] = true;
+				}
+			}
+			if ($anlegen > 0) {
+				$data['person_id'] = $person_id;
+				$data['insertamum'] = date('c');
+				$data['insertvon'] = getAuthUID();
+				if (!isset($data['heimatadresse']))
+					$data['heimatadresse'] = !$this->input->post('person_id');
+				
+				$result = $this->AdresseModel->insert($data);
+				if (isError($result))
+					return $result;
+			}
+		}
+		
+		// Kontaktdaten
+		$kontaktdaten = [];
+		foreach (['email', 'telefon', 'mobil'] as $k) {
+			$v = $this->input->post($k);
+			if ($v)
+				$kontaktdaten[$k] = $v;
+		}
+		if (count($kontaktdaten)) {
+			$this->load->model('person/Kontakt_model', 'KontaktModel');
+
+			foreach ($kontaktdaten as $typ => $kontakt) {
+				$data = [
+					'person_id' => $person_id,
+					'kontakttyp' => $typ,
+					'kontakt' => $kontakt,
+					'zustellung' => true,
+					'insertamum' => date('c'),
+					'insertvon' => getAuthUID()
+				];
+				$result = $this->KontaktModel->insert($data);
+				if (isError($result))
+					return $result;
+			}
+		}
+
+		// Prestudent anlegen
+		$data = [
+			'aufmerksamdurch_kurzbz' => 'k.A.',
+			'person_id' => $person_id,
+			'studiengang_kz' => $this->input->post('studiengang_kz'),
+			'ausbildungcode' => $this->input->post('letzteausbildung'),
+			'anmerkung' => $this->input->post('anmerkungen'),
+			'reihungstestangetreten' => false,
+			'bismelden' => true
+		];
+		$ausbildungsart = $this->input->post('ausbildungsart');
+		if ($ausbildungsart)
+			$data['anmerkung'] .= ' Ausbildungsart:' . $ausbildungsart;
+		// Incomings und ausserordentliche sind bei Meldung nicht förderrelevant
+		$incoming = $this->input->post('incoming');
+		if ($incoming || substr($data['studiengang_kz'], 0, 1) == '9')
+			$data['foerderrelevant'] = false;
+		// Wenn die Person schon im System erfasst ist, dann die ZGV des Datensatzes uebernehmen
+		$this->PrestudentModel->addOrder('zgvmas_code');
+		$this->PrestudentModel->addOrder('zgv_code', 'DESC');
+		$this->PrestudentModel->addLimit(1);
+		$result = $this->PrestudentModel->loadWhere([
+			'person_id' => $person_id
+		]);
+		if (isError($result))
+			return $result;
+		if (hasData($result)) {
+			$prestudent = current(getData($result));
+			if ($prestudent->zgv_code) {
+				$data['zgv_code'] = $prestudent->zgv_code;
+				$data['zgvort'] = $prestudent->zgvort;
+				$data['zgvdatum'] = $prestudent->zgvdatum;
+
+				$data['zgvmas_code'] = $prestudent->zgvmas_code;
+				$data['zgvmaort'] = $prestudent->zgvmaort;
+				$data['zgvmadatum'] = $prestudent->zgvmadatum;
+			}
+		}
+		// Prestudent speichern
+		$result = $this->PrestudentModel->insert($data);
+		if (isError($result))
+			return $result;
+		$prestudent_id = getData($result);
+
+		// Prestudent Rolle Anlegen
+		$data = [
+			'prestudent_id' => $prestudent_id,
+			'status_kurzbz' => $incoming ? 'Incoming' : 'Interessent',
+			'studiensemester_kurzbz' => $this->input->post('studiensemester_kurzbz'),
+			'ausbildungssemester' => $this->input->post('ausbildungssemester') ?: 0,
+			'orgform_kurzbz' => $this->input->post('orgform_kurzbz') ?: null,
+			'studienplan_id' => $this->input->post('studienplan_id') ?: null,
+			'datum' => date('Y-m-d'),
+			'insertamum' => date('c'),
+			'insertvon' => getAuthUID()
+		];
+		$result = $this->PrestudentstatusModel->insert($data);
+		if (isError($result))
+			return $result;
+
+		if ($incoming) {
+			// TODO(chris): IMPLEMENT!
+			//Matrikelnummer und UID generieren
+			//Benutzerdatensatz anlegen
+			//Studentendatensatz anlegen
+			//StudentLehrverband anlegen
+		}
+
+		// TODO(chris): DEBUG
+		/*$result = $this->PrestudentModel->loadWhere([
+			'pestudent_id' => 1
+		]);
+		if (isError($result)) {
+			return $result;
+		}*/
+
+		return success(true);
+	}
+
+	public function requiredIfNotPersonId($value)
+	{
+		if (isset($_POST['person_id']))
+			return true;
+		return !!$value;
+	}
+	
+	public function requiredIfAddressFunc($value)
+	{
+		if (!$_POST['address']['func'])
+			return true;
+		return !!$value;
+	}
+}
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
index 0c988179f..7866f1c97 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
@@ -1,14 +1,17 @@
 import {CoreRESTClient} from '../../../../RESTClient.js';
-import FormForm from '../../../Form/Form.js';
+import CoreForm from '../../../Form/Form.js';
 import FormInput from '../../../Form/Input.js';
 import FormUploadImage from '../../../Form/Upload/Image.js';
 
+import CoreUdf from '../../../Udf/Udf.js';
+
 
 export default {
 	components: {
-		FormForm,
+		CoreForm,
 		FormInput,
-		FormUploadImage
+		FormUploadImage,
+		CoreUdf
 	},
 	inject: {
 		showBpk: {
@@ -39,6 +42,7 @@ export default {
 	},
 	data() {
 		return {
+			test: {udf_viaf: 'TEST'},
 			familienstaende: {
 				"": "--keine Auswahl--",
 				"g": "geschieden",
@@ -49,6 +53,7 @@ export default {
 			original: null,
 			data: null,
 			changed: {},
+			udfChanges: false,
 			studentIn: null,
 			gebDatumIsValid: false,
 			gebDatumIsInvalid: false
@@ -90,25 +95,33 @@ export default {
 	},
 	methods: {
 		updateStudent(n) {
-			CoreRESTClient
-				.get('components/stv/Student/get/' + n.prestudent_id)
-				.then(result => result.data)
+			// TODO(chris): move to fhcapi.factory
+			this.$fhcApi
+				.get('api/frontend/v1/stv/student/get/' + n.prestudent_id)
 				.then(result => {
-					this.data = result;
+					this.data = result.data;
 					if (!this.data.familienstand)
 						this.data.familienstand = '';
-					this.original = {...this.data};
+					this.original = {...(this.original || {}), ...this.data};
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
 		save() {
+			if (!this.changedLength)
+				return;
+
+			this.$refs.form.clearValidation();
 			this.$refs.form
-				.send(CoreRESTClient.post('components/stv/Student/save/' + this.modelValue.prestudent_id, this.changed))
+				.post('api/frontend/v1/stv/student/save/' + this.modelValue.prestudent_id, this.changed)
 				.then(result => {
 					this.original = {...this.data};
 					this.changed = {};
+					this.$refs.form.setFeedback(true, result.data);
 				})
-				.catch(this.$fhcAlert.handleSystemError);
+				.catch(this.$fhcAlert.handleSystemError)
+		},
+		udfsLoaded(udfs) {
+			this.original = {...(this.original || {}), ...udfs};
 		}
 	},
 	created() {
@@ -117,7 +130,7 @@ export default {
 	//TODO(chris): Phrasen
 	//TODO(chris): Geburtszeit? Anzahl der Kinder?
 	template: `
-	<form-form ref="form" class="stv-details-details" @submit.prevent="save">
+	<core-form ref="form" class="stv-details-details" @submit.prevent="save">
 		<div class="position-sticky top-0 z-1">
 			<button type="submit" class="btn btn-primary position-absolute top-0 end-0" :disabled="!changedLength">Speichern</button>
 		</div>
@@ -235,6 +248,7 @@ export default {
 						:enable-time-picker="false"
 						format="dd.MM.yyyy"
 						preview-format="dd.MM.yyyy"
+						teleport
  						>
 					</form-input>
 					<form-input
@@ -362,6 +376,7 @@ export default {
 			<div v-else>
 				Loading...
 			</div>
+			<core-udf @load="udfsLoaded" v-model="data" class="row-cols-3 g-3 mb-3" ci-model="person/person" :pk="{person_id:modelValue.person_id}"></core-udf>
 		</fieldset>
 		<fieldset v-if="data?.student_uid" class="overflow-hidden">
 			<legend>StudentIn</legend>
@@ -441,5 +456,5 @@ export default {
 				Loading...
 			</div>
 		</fieldset>
-	</form-form>`
+	</core-form>`
 };
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/List/New.js b/public/js/components/Stv/Studentenverwaltung/List/New.js
index 7bba76e51..acc9781de 100644
--- a/public/js/components/Stv/Studentenverwaltung/List/New.js
+++ b/public/js/components/Stv/Studentenverwaltung/List/New.js
@@ -106,18 +106,16 @@ export default {
 				return;
 
 			this.abortController.suggestions = new AbortController();
-			CoreRESTClient
-				.post('components/stv/student/check', {
+			// TODO(chris): move to fhcapi.factory
+			this.$fhcapi
+				.post('api/frontend/v1/stv/student/check', {
 					vorname: this.formData.vorname,
 					nachname: this.formData.nachname,
 					gebdatum: this.formData.gebdatum
 				}, {
 					signal: this.abortController.suggestions.signal
 				})
-				.then(result => CoreRESTClient.getData(result.data) || [])
-				.then(result => {
-					this.suggestions = result;
-				})
+				.then(result => this.suggestions = result.data)
 				.catch(error => {
 					// NOTE(chris): repeat request
 					if (error.code != "ERR_CANCELED")
@@ -191,13 +189,14 @@ export default {
 			if (data.studiensemester_kurzbz === undefined)
 				data.studiensemester_kurzbz = this.studiensemesterKurzbz;
 
+			// TODO(chris): move to fhcapi.factory
 			this.$refs.form
-				.send(CoreRESTClient.post('components/stv/student/add', data))
+				.send('api/frontend/v1/stv/student/add', data)
 				.then(result => {
 					this.$fhcAlert.alertSuccess('Gespeichert');
 					this.$refs.modal.hide();
 				})
-				.catch(console.error);
+				.catch(this.$fhcAlert.handleSystemError);
 		}
 	},
 	created() {

From 8ffc8a20d3668703b05d6994c733767533b13d4b Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 29 Mar 2024 14:27:45 +0100
Subject: [PATCH 0534/1461] s&d

---
 content/student/studentoverlay.js.php          | 12 ++++++++++++
 content/student/studentpruefungoverlay.xul.php | 12 +++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/content/student/studentoverlay.js.php b/content/student/studentoverlay.js.php
index 11a4d862f..8d423e49e 100644
--- a/content/student/studentoverlay.js.php
+++ b/content/student/studentoverlay.js.php
@@ -5139,6 +5139,7 @@ function StudentPruefungNeu()
 	document.getElementById('student-pruefung-menulist-note').value='9';
 	document.getElementById('student-pruefung-textbox-datum').value='<?php echo date('d.m.Y');?>';
 	document.getElementById('student-pruefung-textbox-anmerkung').value='';
+	StudentPruefungTypChange();
 }
 
 // ****
@@ -5190,6 +5191,16 @@ function StudentPruefungLVAChange()
 	LEDropDown.selectedIndex=-1;
 }
 
+// ****
+// * Wenn der Typ der Pruefung geaendert wird, dann wird ein Hinweistext angezeigt.
+// ****
+function StudentPruefungTypChange()
+{
+	var typ = document.getElementById('student-pruefung-menulist-typ').value;
+	var hinweisid = document.getElementById('student-pruefung-textbox-datum-hinweis');
+	hinweisid.hidden = (typ != 'kommPruef');
+}
+
 // ****
 // * Speichert die Pruefung
 // ****
@@ -5424,6 +5435,7 @@ function StudentPruefungAuswahl()
 	document.getElementById('student-pruefung-checkbox-neu').checked=false;
 	document.getElementById('student-pruefung-textbox-pruefung_id').value=pruefung_id;
 	document.getElementById('student-pruefung-textbox-punkte').value=punkte;
+	StudentPruefungTypChange();
 }
 
 function StudentPruefungFilterStsem()
diff --git a/content/student/studentpruefungoverlay.xul.php b/content/student/studentpruefungoverlay.xul.php
index 2c2a3970a..6fcbca6de 100644
--- a/content/student/studentpruefungoverlay.xul.php
+++ b/content/student/studentpruefungoverlay.xul.php
@@ -203,7 +203,8 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 										<label value="Typ" control="student-pruefung-menulist-typ"/>
 										<menulist id="student-pruefung-menulist-typ" disabled="true"
 										          datasources="<?php echo APP_ROOT; ?>rdf/pruefungstyp.rdf.php?abschluss=false" flex="1"
-										          ref="http://www.technikum-wien.at/pruefungstyp/liste" >
+										          ref="http://www.technikum-wien.at/pruefungstyp/liste"
+										          oncommand="StudentPruefungTypChange()">
 											<template>
 												<menupopup>
 													<menuitem value="rdf:http://www.technikum-wien.at/pruefungstyp/rdf#pruefungstyp_kurzbz"
@@ -251,6 +252,15 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 					      					<spacer flex="1" />
 					      				</hbox>
 									</row>
+									<row id="student-pruefung-textbox-datum-hinweis" hidden="true">
+										<label></label>
+										<hbox>
+					      					<image height="17" width="17" class="alert-icon"/>
+					      					<description class="small-margin">
+					      						Bitte das Datum der Benotung eintragen und nicht das Datum der Prüfung.
+					      					</description>
+					      				</hbox>
+									</row>
 					      			<row>
 					      				<label value="Anmerkung" control="student-pruefung-textbox-anmerkung"/>
 							      		<textbox id="student-pruefung-textbox-anmerkung" disabled="true" maxlength="256"/>

From 2d88ee031ca267f32e61397ce97f844edf6c62fd Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 2 Apr 2024 09:12:26 +0200
Subject: [PATCH 0535/1461] refactor Tab Kontakt api Controller, Phrases alerts

---
 .../api/frontend/v1/stv/Kontakt.php           | 710 ++++++++++++++++++
 .../Studentenverwaltung/Details/Kontakt.js    |   2 -
 .../Details/Kontakt/Address.js                | 184 ++---
 .../Details/Kontakt/Bankaccount.js            | 125 ++-
 .../Details/Kontakt/Contact.js                | 149 ++--
 system/phrasesupdate.php                      |  77 ++
 6 files changed, 975 insertions(+), 272 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/stv/Kontakt.php

diff --git a/application/controllers/api/frontend/v1/stv/Kontakt.php b/application/controllers/api/frontend/v1/stv/Kontakt.php
new file mode 100644
index 000000000..517388b39
--- /dev/null
+++ b/application/controllers/api/frontend/v1/stv/Kontakt.php
@@ -0,0 +1,710 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+
+class Kontakt extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'getAdressen' => ['admin:r', 'assistenz:r'],
+			'addNewAddress' => ['admin:r', 'assistenz:r'],
+			'addNewContact' => ['admin:r', 'assistenz:r'],
+			'addNewBankverbindung' => ['admin:r', 'assistenz:r'],
+			'updateAddress' => ['admin:r', 'assistenz:r'],
+			'updateContact' => ['admin:r', 'assistenz:r'],
+			'updateBankverbindung' => ['admin:r', 'assistenz:r'],
+			'loadAddress' => ['admin:r', 'assistenz:r'],
+			'loadContact' => ['admin:r', 'assistenz:r'],
+			'loadBankverbindung' => ['admin:r', 'assistenz:r'],
+			'deleteAddress' => ['admin:r', 'assistenz:r'],
+			'deleteContact' => ['admin:r','assistenz:r'],
+			'deleteBankverbindung' => ['admin:r','assistenz:r'],
+			'getAdressentypen' => ['admin:r', 'assistenz:r'],
+			'getKontakttypen' => ['admin:r', 'assistenz:r'],
+			'getFirmen' => ['admin:r', 'assistenz:r'],
+			'getStandorte' => ['admin:r', 'assistenz:r'],
+			'getKontakte' => ['admin:r', 'assistenz:r'],
+			'getBankverbindung' => ['admin:r', 'assistenz:r'],
+
+		]);
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+		$this->load->library('form_validation');
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui'
+		]);
+	}
+
+	public function getAdressen($person_id)
+	{
+		$this->load->model('person/Adresse_model', 'AdresseModel');
+
+		$this->AdresseModel->addSelect('public.tbl_adresse.*');
+		$this->AdresseModel->addSelect('t.*');
+		$this->AdresseModel->addSelect('f.firma_id');
+		$this->AdresseModel->addSelect('f.name as firmenname');
+		$this->AdresseModel->addJoin('public.tbl_adressentyp t', 'ON (t.adressentyp_kurzbz = public.tbl_adresse.typ)');
+		$this->AdresseModel->addJoin('public.tbl_firma f', 'ON (f.firma_id = public.tbl_adresse.firma_id)', 'LEFT');
+
+		$result = $this->AdresseModel->loadWhere(
+			array('person_id' => $person_id)
+		);
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess((getData($result) ?: []));
+	}
+
+	public function addNewAddress($person_id)
+	{
+		$_POST = json_decode($this->input->raw_input_stream, true);
+
+		$this->form_validation->set_rules('plz', 'PLZ', 'required|numeric', [
+			'required' => $this->p->t('ui','error_fieldRequired',['field' => 'PLZ']),
+			'numeric' => $this->p->t('ui','error_fieldNotNumeric',['field' => 'PLZ'])
+		]);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$this->load->model('person/Adresse_model', 'AdresseModel');
+
+		$uid = getAuthUID();
+		$co_name = isset($_POST['co_name']) ? $_POST['co_name'] : null;
+		$strasse = isset($_POST['strasse']) ? $_POST['strasse'] : null;
+		$ort = isset($_POST['ort']) ? $_POST['ort'] : null;
+		$gemeinde = isset($_POST['gemeinde']) ? $_POST['gemeinde'] : null;
+		$nation = isset($_POST['nation']) ? $_POST['nation'] : null;
+		$name = isset($_POST['name']) ? $_POST['name'] : null;
+		$typ = isset($_POST['typ']) ? $_POST['typ'] : null;
+		$anmerkung = isset($_POST['anmerkung']) ? $_POST['anmerkung'] : null;
+
+		if(isset($_POST['firma']))
+		{
+			$firma_id = $_POST['firma']['firma_id'];
+		}
+		else
+			$firma_id = null;
+
+		$result = $this->AdresseModel->insert(
+			[
+				'person_id' => $person_id,
+				'strasse' =>  $strasse,
+				'insertvon' => $uid,
+				'insertamum' => date('c'),
+				'plz' => $_POST['plz'],
+				'ort' => $ort,
+				'gemeinde' => $gemeinde,
+				'nation' => $nation,
+				'heimatadresse' => $_POST['heimatadresse'],
+				'zustelladresse' => $_POST['zustelladresse'],
+				'co_name' => $co_name,
+				'typ' => $typ,
+				'firma_id' => $firma_id,
+				'name' => $name,
+				'rechnungsadresse' => $_POST['rechnungsadresse'],
+				'anmerkung' => $anmerkung
+
+			]
+		);
+		if (isError($result))
+		{
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->outputJsonSuccess(true);
+	}
+
+	public function updateAddress($address_id)
+	{
+		$uid = getAuthUID();
+		$_POST = json_decode($this->input->raw_input_stream, true);
+
+		$this->form_validation->set_rules('plz', 'PLZ', 'required|numeric', [
+			'required' => $this->p->t('ui','error_fieldRequired',['field' => 'PLZ']),
+			'numeric' => $this->p->t('ui','error_fieldNotNumeric',['field' => 'PLZ'])
+		]);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$this->load->model('person/Adresse_model', 'AdresseModel');
+
+		if(!$address_id)
+		{
+			return $this->terminateWithError($this->p->t('ui','error_missingId',['id'=> 'Adresse_id']), self::ERROR_TYPE_GENERAL);
+		}
+
+		if(isset($_POST['firma']))
+		{
+			$firma_id = $_POST['firma']['firma_id'];
+		}
+		else
+			$firma_id = null;
+
+		$person_id = isset($_POST['person_id']) ? $_POST['person_id'] : null;
+		$co_name = isset($_POST['co_name']) ? $_POST['co_name'] : null;
+		$strasse = isset($_POST['strasse']) ? $_POST['strasse'] : null;
+		$ort = isset($_POST['ort']) ? $_POST['ort'] : null;
+		$gemeinde = isset($_POST['gemeinde']) ? $_POST['gemeinde'] : null;
+		$nation = isset($_POST['nation']) ? $_POST['nation'] : null;
+		$name = isset($_POST['name']) ? $_POST['name'] : null;
+		$typ = isset($_POST['typ']) ? $_POST['typ'] : null;
+		$anmerkung = isset($_POST['anmerkung']) ? $_POST['anmerkung'] : null;
+
+		$result = $this->AdresseModel->update(
+			[
+				'adresse_id' => $address_id
+			],
+			[	'person_id' => $person_id,
+				'strasse' =>  $strasse,
+				'updatevon' => $uid,
+				'updateamum' => date('c'),
+				'plz' => $_POST['plz'],
+				'ort' => $ort,
+				'gemeinde' => $gemeinde,
+				'nation' => $nation,
+				'heimatadresse' => $_POST['heimatadresse'],
+				'zustelladresse' => $_POST['zustelladresse'],
+				'co_name' => $co_name,
+				'typ' => $typ,
+				'firma_id' => $firma_id,
+				'name' => $name,
+				'rechnungsadresse' => $_POST['rechnungsadresse'],
+				'anmerkung' => $anmerkung
+			]
+		);
+
+		if (isError($result))
+		{
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->outputJsonSuccess(true);
+	}
+
+	public function loadAddress($adresse_id)
+	{
+		$this->load->model('person/Adresse_model', 'AdresseModel');
+
+		$this->AdresseModel->addSelect('public.tbl_adresse.*');
+		$this->AdresseModel->addSelect('t.*');
+		$this->AdresseModel->addSelect('f.firma_id');
+		$this->AdresseModel->addSelect('f.name as firmenname');
+		$this->AdresseModel->addJoin('public.tbl_adressentyp t', 'ON (t.adressentyp_kurzbz = public.tbl_adresse.typ)');
+		$this->AdresseModel->addJoin('public.tbl_firma f', 'ON (f.firma_id = public.tbl_adresse.firma_id)', 'LEFT');
+
+		$this->AdresseModel->addLimit(1);
+
+		$result = $this->AdresseModel->loadWhere(
+			array('adresse_id' => $adresse_id)
+		);
+		if (isError($result)) {
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+
+		if (!hasData($result))
+		{
+			return $this->terminateWithError($this->p->t('ui','error_missingId',['id'=> 'Adresse_id']), self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess(current(getData($result)) ? : null);
+	}
+
+	public function deleteAddress($adresse_id)
+	{
+		$this->load->model('person/Adresse_model', 'AdresseModel');
+
+		$result = $this->AdresseModel->delete(
+			array('adresse_id' => $adresse_id)
+		);
+
+		if (isError($result))
+		{
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		if (!hasData($result))
+		{
+			return $this->terminateWithError($this->p->t('ui','error_missingId',['id'=> 'Adresse_id']), self::ERROR_TYPE_GENERAL);
+		}
+		//return $this->outputJsonSuccess(current(getData($result)));
+		return $this->terminateWithSuccess(current(getData($result)) ? : null);
+	}
+
+	public function getAdressentypen()
+	{
+		$this->load->model('person/Adressentyp_model', 'AdressentypModel');
+
+		$result = $this->AdressentypModel->load();
+		if (isError($result))
+		{
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess(getData($result) ?: []);
+	}
+
+	public function getFirmen($searchString)
+	{
+		$this->load->model('ressource/firma_model', 'FirmaModel');
+
+		$result = $this->FirmaModel->searchFirmen($searchString);
+		if (isError($result)) {
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess($result ?: []);
+	}
+
+	public function getStandorte($searchString)
+	{
+		$this->load->model('organisation/standort_model', 'StandortModel');
+
+		$result = $this->StandortModel->searchStandorte($searchString);
+		if (isError($result)) {
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess($result ?: []);
+	}
+
+	public function getKontakte($person_id)
+	{
+		$this->load->model('person/Kontakt_model', 'KontaktModel');
+		$this->load->model('organisation/standort_model', 'StandortModel');
+		$this->KontaktModel->addSelect("*,
+			TO_CHAR (CASE 
+					WHEN public.tbl_kontakt.updateamum >= public.tbl_kontakt.insertamum 
+					THEN public.tbl_kontakt.updateamum 
+					ELSE public.tbl_kontakt.insertamum 
+				END::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS lastUpdate");
+		$this->StandortModel->addJoin('public.tbl_standort st', 'ON (public.tbl_kontakt.standort_id = st.standort_id)', 'LEFT');
+
+		$result = $this->KontaktModel->loadWhere(
+			array('person_id' => $person_id)
+		);
+
+		if (isError($result))
+		{
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess((getData($result) ?: []));
+	}
+
+	public function getKontakttypen()
+	{
+		$this->load->model('person/Kontakttyp_model', 'KontakttypModel');
+
+		$result = $this->KontakttypModel->load();
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		} else {
+			$this->terminateWithSuccess(getData($result) ?: []);
+		}
+	}
+
+	public function loadContact($kontakt_id)
+	{
+		$this->load->model('person/Kontakt_model', 'KontaktModel');
+
+		$this->KontaktModel->addSelect('public.tbl_kontakt.*');
+		$this->KontaktModel->addSelect('st.kurzbz');
+		$this->KontaktModel->addJoin('public.tbl_standort st', 'ON (public.tbl_kontakt.standort_id = st.standort_id)', 'LEFT');
+
+		$this->KontaktModel->addLimit(1);
+
+		$result = $this->KontaktModel->loadWhere(
+			array('kontakt_id' => $kontakt_id)
+		);
+		if (isError($result)) {
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		if (!hasData($result))
+		{
+			return $this->terminateWithError($this->p->t('ui','error_missingId',['id'=> 'Kontakt_id']), self::ERROR_TYPE_GENERAL);
+		}
+		//	$this->outputJsonSuccess(current(getData($result)));
+		$this->terminateWithSuccess(current(getData($result)));
+	}
+
+	public function addNewContact($person_id)
+	{
+		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+
+		if(($_POST['kontakttyp'] == 'email' && isset($_POST['kontakt'])))
+			$this->form_validation->set_rules('kontakt', 'Kontakt', 'valid_email', [
+				'valid_email' => $this->p->t('ui','error_fieldNoValidEmail',['field' => 'Kontakt'])
+			]);
+		else
+			$this->form_validation->set_rules('kontakt', 'Kontakt', 'required', [
+				'required' => $this->p->t('ui','error_fieldRequired',['field' => 'Kontakt'])
+			]);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$this->load->model('person/Kontakt_model', 'KontaktModel');
+
+		if(isset($_POST['standort']))
+		{
+			$standort_id = $_POST['standort']['standort_id'];
+		}
+		else
+			$standort_id = null;
+
+		$uid = getAuthUID();
+
+		$kontakttyp = $this->input->post('kontakttyp');
+		$anmerkung = $this->input->post('anmerkung');
+		$kontakt = $this->input->post('kontakt');
+		$ext_id = $this->input->post('ext_id');
+
+		$result = $this->KontaktModel->insert(
+			[
+				'person_id' => $person_id,
+				'kontakttyp' =>  $kontakttyp,
+				'anmerkung' => $anmerkung,
+				'kontakt' => $kontakt,
+				'zustellung' => $_POST['zustellung'],
+				'insertvon' => $uid,
+				'insertamum' => date('c'),
+				'standort_id' => $standort_id,
+				'ext_id' => $ext_id
+			]
+		);
+
+		if (isError($result))
+		{
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		return $this->outputJsonSuccess(true);
+	}
+
+	public function updateContact($kontakt_id)
+	{
+		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+
+		$this->load->model('person/Kontakt_model', 'KontaktModel');
+
+		if(!$kontakt_id)
+		{
+			return $this->terminateWithError($this->p->t('ui','error_missingId',['id'=> 'Kontakt_id']), self::ERROR_TYPE_GENERAL);
+		}
+
+		if(($_POST['kontakttyp'] == 'email' && isset($_POST['kontakt'])))
+			$this->form_validation->set_rules('kontakt', 'Kontakt', 'valid_email', [
+				'valid_email' => $this->p->t('ui','error_fieldNoValidEmail',['field' => 'Kontakt'])
+			]);
+		else
+			$this->form_validation->set_rules('kontakt', 'Kontakt', 'required', [
+				'required' => $this->p->t('ui','error_fieldRequired',['field' => 'Kontakt'])
+			]);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		if(isset($_POST['standort']))
+		{
+			$standort_id = $_POST['standort']['standort_id'];
+		}
+		else
+			$standort_id = null;
+
+		$uid = getAuthUID();
+		$kontakttyp = $this->input->post('kontakttyp');
+		$anmerkung = $this->input->post('anmerkung');
+		$kontakt = $this->input->post('kontakt');
+		$ext_id = $this->input->post('ext_id');
+		$person_id = $this->input->post('person_id');
+
+		$result = $this->KontaktModel->update(
+			[
+				'kontakt_id' => $kontakt_id
+			],
+			[
+				'person_id' => $person_id,
+				'kontakttyp' =>  $kontakttyp,
+				'anmerkung' => $anmerkung,
+				'kontakt' => $kontakt,
+				'zustellung' => $_POST['zustellung'],
+				'insertvon' => 	$uid,
+				'insertamum' => date('c'),
+				'standort_id' => $standort_id,
+				'ext_id' => $ext_id
+			]
+		);
+
+		if (isError($result))
+		{
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->outputJsonSuccess(true);
+	}
+
+	public function deleteContact($kontakt_id)
+	{
+		$this->load->model('person/Kontakt_model', 'KontaktModel');
+
+		$result = $this->KontaktModel->delete(
+			array('kontakt_id' => $kontakt_id)
+		);
+
+		if (isError($result))
+		{
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		elseif (!hasData($result))
+		{
+			return $this->terminateWithError($this->p->t('ui','error_missingId',['id'=> 'Kontakt_id']), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess(current(getData($result)) ? : null);
+	}
+
+
+	public function getBankverbindung($person_id)
+	{
+		$this->load->model('person/Bankverbindung_model', 'BankverbindungModel');
+
+		$this->BankverbindungModel->addSelect('*');
+
+		$result = $this->BankverbindungModel->loadWhere(
+			array('person_id' => $person_id)
+		);
+		if (isError($result))
+		{
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess((getData($result) ?: []));
+	}
+
+	public function addNewBankverbindung($person_id)
+	{
+		$this->load->library('form_validation');
+		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+
+		$this->form_validation->set_rules('iban', 'IBAN', 'required', [
+			'required' => $this->p->t('ui','error_fieldRequired',['field' => 'IBAN'])
+		]);
+
+		$this->form_validation->set_rules('typ', 'TYP', 'required', [
+			'required' => $this->p->t('ui','error_fieldRequired',['field' => 'TYP'])
+		]);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$this->load->model('person/Bankverbindung_model', 'BankverbindungModel');
+
+		$ext_id = $this->input->post('ext_id');
+		$oe_kurzbz = $this->input->post('oe_kurzbz');
+		$orgform_kurzbz = $this->input->post('orgform_kurzbz');
+		$name = $this->input->post('name');
+		$anschrift = $this->input->post('anschrift');
+		$bic = $this->input->post('bic');
+		$blz  = $this->input->post('blz ');
+		$kontonr = $this->input->post('kontonr');
+
+		$result = $this->BankverbindungModel->insert(
+			[
+				'person_id' => $person_id,
+				'name' => $name,
+				'anschrift' => $anschrift,
+				'bic' => $bic,
+				'iban' => $_POST['iban'],
+				'blz' => $blz,
+				'kontonr' => $kontonr,
+				'insertvon' => 'uid',
+				'insertamum' => date('c'),
+				'typ' => $_POST['typ'],
+				'verrechnung' => $_POST['verrechnung'],
+				'ext_id' => $ext_id,
+				'oe_kurzbz' => $oe_kurzbz,
+				'orgform_kurzbz' => $orgform_kurzbz
+			]
+		);
+		if (isError($result))
+		{
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		return $this->outputJsonSuccess(true);
+	}
+
+	public function loadBankverbindung($bankverbindung_id)
+	{
+		$this->load->model('person/Bankverbindung_model', 'BankverbindungModel');
+
+		$this->BankverbindungModel->addSelect('*');
+
+		$this->BankverbindungModel->addLimit(1);
+
+		$result = $this->BankverbindungModel->loadWhere(
+			array('bankverbindung_id' => $bankverbindung_id)
+		);
+		if (isError($result))
+		{
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+
+		if (!hasData($result))
+		{
+			return $this->terminateWithError($this->p->t('ui','error_missingId',['id'=> 'Bankverbindung_id']), self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess(current(getData($result)));
+	}
+
+	public function updateBankverbindung($bankverbindung_id)
+	{
+		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+
+		$this->form_validation->set_rules('iban', 'IBAN', 'required', [
+			'required' => $this->p->t('ui','error_fieldRequired',['field' => 'IBAN'])
+		]);
+
+		$this->form_validation->set_rules('typ', 'TYP', 'required', [
+			'required' => $this->p->t('ui','error_fieldRequired',['field' => 'TYP'])
+		]);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$this->load->model('person/Bankverbindung_model', 'BankverbindungModel');
+
+		if(!$bankverbindung_id)
+		{
+			return $this->terminateWithError($this->p->t('ui','error_missingId',['id'=> 'Bankverbindung_id']), self::ERROR_TYPE_GENERAL);
+		}
+
+		$uid = getAuthUID();
+
+		$result = $this->BankverbindungModel->update(
+			[
+				'bankverbindung_id' => $bankverbindung_id
+			],
+			[
+				'person_id' => $_POST['person_id'],
+				'name' => $_POST['name'],
+				'anschrift' => $_POST['anschrift'],
+				'bic' => $_POST['bic'],
+				'iban' => $_POST['iban'],
+				'blz' => $_POST['blz'],
+				'kontonr' => $_POST['kontonr'],
+				'updatevon' => $uid,
+				'updateamum' => date('c'),
+				'typ' => $_POST['typ'],
+				'verrechnung' => $_POST['verrechnung'],
+				'ext_id' => $_POST['ext_id'],
+				'oe_kurzbz' => $_POST['oe_kurzbz'],
+				'orgform_kurzbz' => $_POST['orgform_kurzbz']
+			]
+		);
+
+		if (isError($result))
+		{
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->outputJsonSuccess(true);
+	}
+
+	public function deleteBankverbindung($bankverbindung_id)
+	{
+		$this->load->model('person/Bankverbindung_model', 'BankverbindungModel');
+
+		$result = $this->BankverbindungModel->delete(
+			array('bankverbindung_id' => $bankverbindung_id)
+		);
+
+		if (isError($result))
+		{
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		if (!hasData($result))
+		{
+			$this->outputJson($result);
+		}
+		return $this->terminateWithSuccess(current(getData($result)) ? : null);
+	}
+
+/*	public function plz_required($value)
+	{
+		if (empty($value)) {
+			$this->form_validation->set_message('plz_required',  $this->p->t('ui','error_fieldRequired',['field' => 'PLZ']));
+			return false;
+		}
+		else
+		{
+			return true;
+		}
+	}*/
+
+/*	public function kontakt_required($value)
+	{
+		if (empty($value)) {
+			$this->form_validation->set_message('kontakt_required',  $this->p->t('ui','error_fieldRequired',['field' => 'Kontakt']));
+			return false;
+		}
+		else
+		{
+			return true;
+		}
+	}
+
+	public function iban_required($value)
+	{
+		if (empty($value)) {
+			$this->form_validation->set_message('iban_required',  $this->p->t('ui','error_fieldRequired',['field' => 'IBANoff']));
+			return false;
+		}
+		else
+		{
+			return true;
+		}
+	}
+
+	public function typ_required($value)
+	{
+		if (empty($value)) {
+			$this->form_validation->set_message('typ_required',  $this->p->t('ui','error_fieldRequired',['field' => 'Typ']));
+			return false;
+		}
+		else
+		{
+			return true;
+		}
+	}*/
+
+/*	public function plz_numeric($value)
+	{
+		if (!is_numeric($value)) {
+			$this->form_validation->set_message('plz_numeric',  $this->p->t('ui','error_fieldNotNumeric',['field' => 'PLZ']));
+			return false;
+		}
+		else
+		{
+			return true;
+		}
+	}*/
+
+	public function kontakt_valid_email($email)
+	{
+		if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
+			$this->form_validation->set_message('kontakt_valid_email',  $this->p->t('ui','error_fieldNoValidEmail',['field' => 'Kontakt']));
+			return false;
+		}
+		else
+		{
+			return true;
+		}
+	}
+}
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt.js
index 2adc5129d..ce718d61b 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt.js
@@ -2,8 +2,6 @@ import AddressList from "./Kontakt/Address.js";
 import ContactList from "./Kontakt/Contact.js";
 import BankaccountList from "./Kontakt/Bankaccount.js";
 
-import PvToast from "../../../../../../index.ci.php/public/js/components/primevue/toast/toast.esm.min.js";
-import PvAutoComplete from "../../../../../../index.ci.php/public/js/components/primevue/autocomplete/autocomplete.esm.min.js";
 export default {
 	components: {
 		AddressList,
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
index b9edfb634..6d0ba0750 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
@@ -17,7 +17,9 @@ export default{
 	data() {
 		return{
 			tabulatorOptions: {
-				ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Kontakt/getAdressen/' + this.uid),
+				ajaxURL: 'api/frontend/v1/stv/Kontakt/getAdressen/' + this.uid,
+				ajaxRequestFunc: this.$fhcApi.get,
+				ajaxResponse: (url, params, response) => response.data,
 				//autoColumns: true,
 				columns:[
 					{title:"Typ", field:"bezeichnung"},
@@ -80,7 +82,55 @@ export default{
 				selectable:	true,
 				index: 'adresse_id',
 			},
-			tabulatorEvents: [],
+			tabulatorEvents: [
+				{
+					event: 'tableBuilt',
+					handler: async () => {
+						await this.$p.loadCategory(['notiz','global','person']);
+						let cm = this.$refs.table.tabulator.columnManager;
+
+						cm.getColumnByField('bezeichnung').component.updateDefinition({
+							title: this.$p.t('global', 'typ')
+						});
+						cm.getColumnByField('strasse').component.updateDefinition({
+							title: this.$p.t('person', 'strasse')
+						});
+						cm.getColumnByField('plz').component.updateDefinition({
+							title: this.$p.t('person', 'plz')
+						});
+						cm.getColumnByField('ort').component.updateDefinition({
+							title: this.$p.t('person', 'ort')
+						});
+						cm.getColumnByField('gemeinde').component.updateDefinition({
+							title: this.$p.t('person', 'gemeinde')
+						});
+						cm.getColumnByField('nation').component.updateDefinition({
+							title: this.$p.t('person', 'nation')
+						});
+						cm.getColumnByField('heimatadresse').component.updateDefinition({
+							title: this.$p.t('person', 'heimatadresse')
+						});
+						cm.getColumnByField('co_name').component.updateDefinition({
+							title: this.$p.t('person', 'co_name')
+						});
+						cm.getColumnByField('name').component.updateDefinition({
+							title: this.$p.t('person', 'firma_zusatz')
+						});
+						cm.getColumnByField('firmenname').component.updateDefinition({
+							title: this.$p.t('person', 'firma')
+						});
+						cm.getColumnByField('updateamum').component.updateDefinition({
+							title: this.$p.t('notiz', 'letzte_aenderung')
+						});
+						cm.getColumnByField('rechnungsadresse').component.updateDefinition({
+							title: this.$p.t('person', 'rechnungsadresse')
+						});
+						cm.getColumnByField('anmerkung').component.updateDefinition({
+							title: this.$p.t('notiz', 'document')
+						});
+					}
+				}
+			],
 			addressData: {
 				zustelladresse: true,
 				heimatadresse: true,
@@ -132,29 +182,20 @@ export default{
 			this.loadAdress(adress_id).then(() => {
 				if(this.addressData.adresse_id)
 					if(this.addressData.heimatadresse)
-						this.$fhcAlert.alertError("Heimatadressen dürfen nicht gelöscht werden, da diese für die BIS-Meldung relevant sind. Um die Adresse dennoch zu löschen, entfernen sie das Häkchen bei Heimatadresse!");
+						this.$fhcAlert.alertError(this.$p.t('person', 'error_deleteHomeAdress'));
 					else
 						this.$refs.deleteAdressModal.show();
 			});
 		},
 		addNewAddress(addressData) {
-			CoreRESTClient.post('components/stv/Kontakt/addNewAddress/' + this.uid,
+			this.$fhcApi.post('api/frontend/v1/stv/kontakt/addNewAddress/' + this.uid,
 				this.addressData
 			).then(response => {
-				if (!response.data.error) {
-					this.$fhcAlert.alertSuccess('Speichern erfolgreich');
+				this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 					this.hideModal('newAdressModal');
 					this.resetModal();
-				} else {
-					const errorData = response.data.retval;
-					Object.entries(errorData).forEach(entry => {
-						const [key, value] = entry;
-						this.$fhcAlert.alertError(value);
-					});
-				}
-			}).catch(error => {
-				this.$fhcAlert.alertError('Fehler bei Speicherroutine aufgetreten');
-			}).finally(() => {
+			}).catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
 				window.scrollTo(0, 0);
 				this.reload();
 			});
@@ -163,60 +204,38 @@ export default{
 			this.$refs.table.reloadTable();
 		},
 		loadAdress(adress_id){
-			return CoreRESTClient.get('components/stv/Kontakt/loadAddress/' + adress_id)
-				.then(
-					result => {
-						if(result.data.retval)
-							this.addressData = result.data.retval;
-						else
-						{
-							this.addressData = {};
-							this.$fhcAlert.alertError('Keine Adresse mit Id ' + adress_id + ' gefunden');
-						}
+			return this.$fhcApi.get('api/frontend/v1/stv/kontakt/loadAddress/' + adress_id)
+				.then(result => {
+						this.addressData = result.data;
 						return result;
-					}
-			);
+				})
+				.catch(this.$fhcAlert.handleSystemError);
 		},
 		updateAddress(adress_id){
-			CoreRESTClient.post('components/stv/Kontakt/updateAddress/' + adress_id,
+			this.$fhcApi.post('api/frontend/v1/stv/kontakt/updateAddress/' + adress_id,
 				this.addressData
 			).then(response => {
-				if (!response.data.error) {
-					this.$fhcAlert.alertSuccess('Speichern erfolgreich');
+				this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 					this.hideModal('editAdressModal');
 					this.resetModal();
-				} else {
-					const errorData = response.data.retval;
-					Object.entries(errorData).forEach(entry => {
-						const [key, value] = entry;
-						this.$fhcAlert.alertError(value);
-					});
-				}
-			}).catch(error => {
-				this.statusMsg = 'Error in Catch';
-				this.$fhcAlert.alertError('Fehler bei Speicherroutine aufgetreten');
-			}).finally(() => {
+			}).catch(this.$fhcAlert.handleSystemError)
+			.finally(() => {
 				window.scrollTo(0, 0);
 				this.reload();
 			});
 		},
 		deleteAddress(adress_id){
-			CoreRESTClient.post('components/stv/Kontakt/deleteAddress/' + adress_id)
+			this.$fhcApi.post('api/frontend/v1/stv/kontakt/deleteAddress/' + adress_id)
 				.then(response => {
-					if (!response.data.error) {
-						this.$fhcAlert.alertSuccess('Löschen erfolgreich');
-					} else {
-						this.$fhcAlert.alertError('Keine Adresse mit Id ' + adress_id + ' gefunden');
-					}
-				}).catch(error => {
-					this.$fhcAlert.alertError('Fehler bei Löschroutine aufgetreten');
-				}).finally(()=> {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
+				}).catch(this.$fhcAlert.handleSystemError)
+				.finally(()=> {
 					window.scrollTo(0, 0);
 					this.hideModal('deleteAdressModal');
 					this.reload();
 				});
 		},
-		loadPlaces() {
+		loadPlaces() { //TODO(manu) Refactor API-controller
 			if (this.abortController.places)
 				this.abortController.places.abort();
 			if (this.addressData.nation != 'A' || !this.addressData.plz)
@@ -241,10 +260,10 @@ export default{
 				});*/
 		},
 		search(event) {
-			return CoreRESTClient
-				.get('components/stv/Kontakt/getFirmen/' + event.query)
+			return this.$fhcApi
+				.get('api/frontend/v1/stv/kontakt/getFirmen/' + event.query)
 				.then(result => {
-					this.filteredFirmen = CoreRESTClient.getData(result.data);
+					this.filteredFirmen = result.data.retval;
 				});
 		},
 		reload(){
@@ -266,59 +285,12 @@ export default{
 				this.nations = result;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
-		CoreRESTClient
-			.get('components/stv/Kontakt/getAdressentypen')
+		this.$fhcApi
+			.get('api/frontend/v1/stv/kontakt/getAdressentypen')
 			.then(result => {
 				this.adressentypen = result.data;
 			})
-			.catch(err => {
-				console.error(err.response.data || err.message);
-			});
-	},
-	async mounted() {
-		await this.$p.loadCategory(['notiz','global','person']);
-
-		let cm = this.$refs.table.tabulator.columnManager;
-
-		cm.getColumnByField('bezeichnung').component.updateDefinition({
-			title: this.$p.t('global', 'typ')
-		});
-		cm.getColumnByField('strasse').component.updateDefinition({
-			title: this.$p.t('person', 'strasse')
-		});
-		cm.getColumnByField('plz').component.updateDefinition({
-			title: this.$p.t('person', 'plz')
-		});
-		cm.getColumnByField('ort').component.updateDefinition({
-			title: this.$p.t('person', 'ort')
-		});
-		cm.getColumnByField('gemeinde').component.updateDefinition({
-			title: this.$p.t('person', 'gemeinde')
-		});
-		cm.getColumnByField('nation').component.updateDefinition({
-			title: this.$p.t('person', 'nation')
-		});
-		cm.getColumnByField('heimatadresse').component.updateDefinition({
-			title: this.$p.t('person', 'heimatadresse')
-		});
-		cm.getColumnByField('co_name').component.updateDefinition({
-			title: this.$p.t('person', 'co_name')
-		});
-		cm.getColumnByField('name').component.updateDefinition({
-			title: this.$p.t('person', 'firma_zusatz')
-		});
-		cm.getColumnByField('firmenname').component.updateDefinition({
-			title: this.$p.t('person', 'firma')
-		});
-		cm.getColumnByField('updateamum').component.updateDefinition({
-			title: this.$p.t('notiz', 'letzte_aenderung')
-		});
-		cm.getColumnByField('rechnungsadresse').component.updateDefinition({
-			title: this.$p.t('person', 'rechnungsadresse')
-		});
-		cm.getColumnByField('anmerkung').component.updateDefinition({
-			title: this.$p.t('notiz', 'document')
-		});
+			.catch(this.$fhcAlert.handleSystemError)
 	},
 	template: `
 		<div class="stv-list h-100 pt-3">
@@ -590,7 +562,7 @@ export default{
 			:side-menu="false"
 			reload
 			new-btn-show
-			new-btn-label="Neu"
+			new-btn-label="Adresse"
 			@click:new="actionNewAdress"
 			>
 				<button v-if="reload" class="btn btn-outline-warning" aria-label="Reload">
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
index 0c6e6dda7..ed58e55ae 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
@@ -1,5 +1,4 @@
 import {CoreFilterCmpt} from "../../../../filter/Filter.js";
-import {CoreRESTClient} from "../../../../../RESTClient";
 import BsModal from "../../../../Bootstrap/Modal.js";
 
 export default{
@@ -13,7 +12,9 @@ export default{
 	data() {
 		return{
 			tabulatorOptions: {
-				ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Kontakt/getBankverbindung/' + this.uid),
+				ajaxURL: 'api/frontend/v1/stv/Kontakt/getBankverbindung/' + this.uid,
+				ajaxRequestFunc: this.$fhcApi.get,
+				ajaxResponse: (url, params, response) => response.data,
 				columns:[
 					{title:"Name", field:"name"},
 					{title:"Anschrift", field:"anschrift", visible:false},
@@ -76,7 +77,32 @@ export default{
 				selectable:	true,
 				index: 'bankverbindung_id',
 			},
-			tabulatorEvents: [],
+			tabulatorEvents: [
+				{
+					event: 'tableBuilt',
+					handler: async() => {
+						await this.$p.loadCategory(['global','person']);
+
+						let cm = this.$refs.table.tabulator.columnManager;
+
+						cm.getColumnByField('anschrift').component.updateDefinition({
+							title: this.$p.t('person', 'anschrift')
+						});
+						cm.getColumnByField('kontonr').component.updateDefinition({
+							title: this.$p.t('person', 'kontonr')
+						});
+						cm.getColumnByField('blz').component.updateDefinition({
+							title: this.$p.t('person', 'blz')
+						});
+						cm.getColumnByField('typ').component.updateDefinition({
+							title: this.$p.t('global', 'typ')
+						});
+						cm.getColumnByField('verrechnung').component.updateDefinition({
+							title: this.$p.t('person', 'verrechnung')
+						});
+					}
+				}
+			],
 			lastSelected: null,
 			bankverbindungData: {
 				verrechnung: true,
@@ -105,80 +131,46 @@ export default{
 			});
 		},
 		addNewBankverbindung(bankverbindungData) {
-			CoreRESTClient.post('components/stv/Kontakt/addNewBankverbindung/' + this.uid,
+			this.$fhcApi.post('api/frontend/v1/stv/kontakt/addNewBankverbindung/' + this.uid,
 				this.bankverbindungData
 			).then(response => {
-				if (!response.data.error) {
-					this.$fhcAlert.alertSuccess('Speichern erfolgreich');
-/*					this.$refs.newBankverbindungModal.hide();*/
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 					this.hideModal('newBankverbindungModal');
 					this.resetModal();
-				} else {
-					const errorData = response.data.retval;
-					Object.entries(errorData).forEach(entry => {
-						const [key, value] = entry;
-						this.$fhcAlert.alertError('Das Feld ' + key + ' ist erforderlich');
-					});
-					this.statusCode = 0;
-					this.statusMsg = response.data;
-				}
-			}).catch(error => {
-				this.$fhcAlert.alertError('Fehler bei Speicherroutine aufgetreten');
-			}).finally(() => {
+			}).catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
 				window.scrollTo(0, 0);
 				this.reload();
 			});
 		},
 		loadBankverbindung(bankverbindung_id){
-			return CoreRESTClient.get('components/stv/Kontakt/loadBankverbindung/' + bankverbindung_id)
+			return this.$fhcApi.get('api/frontend/v1/stv/kontakt/loadBankverbindung/' + bankverbindung_id)
 				.then(
 				result => {
-					if(!result.data.retval || result.data.retval.length < 1)
-					{
-						this.bankverbindungData = {};
-						this.$fhcAlert.alertError('Keine Bankverbindung mit Id ' + bankverbindung_id + ' gefunden');
-					}
-					else
-					{
-						this.bankverbindungData = result.data.retval;
-					}
+					this.bankverbindungData = result.data;
 					return result;
-				}
-			);
+				})
+				.catch(this.$fhcAlert.handleSystemError);
 		},
 		updateBankverbindung(bankverbindung_id){
-			CoreRESTClient.post('components/stv/Kontakt/updateBankverbindung/' + bankverbindung_id,
+			this.$fhcApi.post('api/frontend/v1/stv/kontakt/updateBankverbindung/' + bankverbindung_id,
 				this.bankverbindungData)
 				.then(response => {
-					if (!response.data.error) {
-						this.$fhcAlert.alertSuccess('Speichern erfolgreich');
-						this.hideModal('editBankverbindungModal');
-						this.resetModal();
-					} else {
-						const errorData = response.data.retval;
-						Object.entries(errorData).forEach(entry => {
-							const [key, value] = entry;
-							this.$fhcAlert.alertError('Das Feld ' + key + ' ist erforderlich');
-						});
-					}
-			}).catch(error => {
-				this.$fhcAlert.alertError('Fehler bei Speicherroutine aufgetreten');
-			}).finally(() => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+					this.hideModal('editBankverbindungModal');
+					this.resetModal();
+			}).catch(this.$fhcAlert.handleSystemError)
+			.finally(() => {
 				window.scrollTo(0, 0);
 				this.reload();
 			});
 		},
 		deleteBankverbindung(bankverbindung_id){
-			CoreRESTClient.post('components/stv/Kontakt/deleteBankverbindung/' + bankverbindung_id)
+			this.$fhcApi.post('api/frontend/v1/stv/kontakt/deleteBankverbindung/' + bankverbindung_id)
 				.then(response => {
-					if (!response.data.error || response.data === []) {
-						this.$fhcAlert.alertSuccess('Löschen erfolgreich');
-					} else {
-						this.$fhcAlert.alertError('Keine Adresse mit Id ' + bankverbindung_id + ' gefunden');
-					}
-				}).catch(error => {
-				this.$fhcAlert.alertError('Fehler bei Löschroutine aufgetreten');
-			}).finally(()=> {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
+				}).catch(this.$fhcAlert.handleSystemError)
+			.finally(()=> {
 				window.scrollTo(0, 0);
 				this.hideModal('deleteBankverbindungModal');
 				this.resetModal();
@@ -196,27 +188,6 @@ export default{
 			this.bankverbindungData = this.initData;
 		},
 	},
-	async mounted() {
-		await this.$p.loadCategory(['global','person']);
-
-		let cm = this.$refs.table.tabulator.columnManager;
-
-		cm.getColumnByField('anschrift').component.updateDefinition({
-			title: this.$p.t('person', 'anschrift')
-		});
-		cm.getColumnByField('kontonr').component.updateDefinition({
-			title: this.$p.t('person', 'kontonr')
-		});
-		cm.getColumnByField('blz').component.updateDefinition({
-			title: this.$p.t('person', 'blz')
-		});
-		cm.getColumnByField('typ').component.updateDefinition({
-			title: this.$p.t('global', 'typ')
-		});
-		cm.getColumnByField('verrechnung').component.updateDefinition({
-			title: this.$p.t('person', 'verrechnung')
-		});
-	},
 	template: `	
 		<div class="stv-list h-100 pt-3">
 		
@@ -370,7 +341,7 @@ export default{
 			:side-menu="false"
 			reload
 			new-btn-show
-			new-btn-label="Neu"
+			new-btn-label="Bankverbindung"
 			@click:new="actionNewBankverbindung"
 		>
 		</core-filter-cmpt>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
index d901fa7e1..ef6c475ae 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
@@ -16,7 +16,9 @@ export default{
 	data() {
 		return{
 			tabulatorOptions: {
-				ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Kontakt/getKontakte/' + this.uid),
+				ajaxURL: 'api/frontend/v1/stv/Kontakt/getKontakte/' + this.uid,
+				ajaxRequestFunc: this.$fhcApi.get,
+				ajaxResponse: (url, params, response) => response.data,
 				columns:[
 					{title:"Typ", field:"kontakttyp"},
 					{title:"Kontakt", field:"kontakt"},
@@ -65,7 +67,35 @@ export default{
 				selectable:	true,
 				index: 'kontakt_id'
 			},
-			tabulatorEvents: [],
+			tabulatorEvents: [
+				{
+					event: 'tableBuilt',
+					handler: async() => {
+						await this.$p.loadCategory(['notiz','global','person']);
+
+						let cm = this.$refs.table.tabulator.columnManager;
+
+						cm.getColumnByField('kontakttyp').component.updateDefinition({
+							title: this.$p.t('global', 'typ')
+						});
+						cm.getColumnByField('kontakt').component.updateDefinition({
+							title: this.$p.t('global', 'kontakt')
+						});
+						cm.getColumnByField('zustellung').component.updateDefinition({
+							title: this.$p.t('person', 'zustellung')
+						});
+						cm.getColumnByField('anmerkung').component.updateDefinition({
+							title: this.$p.t('global', 'anmerkung')
+						});
+						cm.getColumnByField('kurzbz').component.updateDefinition({
+							title: this.$p.t('person', 'firma')
+						});
+						cm.getColumnByField('lastupdate').component.updateDefinition({
+							title: this.$p.t('notiz', 'letzte_aenderung')
+						});
+				}
+			}
+			],
 			lastSelected: null,
 			contactData: {
 				zustellung: true,
@@ -94,79 +124,50 @@ export default{
 			this.$refs.deleteContactModal.show();
 		},
 		addNewContact(formData) {
-			CoreRESTClient.post('components/stv/Kontakt/addNewContact/' + this.uid,
+			this.$fhcApi.post('api/frontend/v1/stv/kontakt/addNewContact/' + this.uid,
 				this.contactData)
 				.then(response => {
-					if (!response.data.error) {
-						this.$fhcAlert.alertSuccess('Speichern erfolgreich');
+						this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 						this.hideModal("newContactModal");
 						this.resetModal();
-					} else {
-						const errorData = response.data.retval;
-						Object.entries(errorData).forEach(entry => {
-							const [key, value] = entry;
-							this.$fhcAlert.alertError(value);
-						});
-					}
-			}).catch(error => {
-				this.$fhcAlert.alertError('Fehler bei Speicherroutine aufgetreten');
-			}).finally(() => {
+				}).catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
 				window.scrollTo(0, 0);
 				this.reload();
 			});
 		},
 		loadContact(contact_id){
-			return CoreRESTClient.get('components/stv/Kontakt/loadContact/' + contact_id)
+			return this.$fhcApi.get('api/frontend/v1/stv/kontakt/loadContact/' + contact_id)
 				.then(
 					result => {
-						if(result.data.retval)
-							this.contactData = result.data.retval;
-						else
-						{
-							this.contactData = {};
-							this.$fhcAlert.alertError('Kein Kontakt mit Id ' + contact_id + ' gefunden');
-						}
+						this.contactData = result.data;
 						return result;
-					}
-			);
+					})
+				.catch(this.$fhcAlert.handleSystemError);
 		},
 		deleteContact(kontakt_id){
-			CoreRESTClient.post('components/stv/Kontakt/deleteContact/' + kontakt_id)
+			this.$fhcApi.post('api/frontend/v1/stv/kontakt/deleteContact/' + kontakt_id)
 				.then(response => {
-					if (!response.data.error) {
-						this.$fhcAlert.alertSuccess('Löschen erfolgreich');
-					} else {
-						this.$fhcAlert.alertError('Keine Adresse mit Id ' + kontakt_id + ' gefunden');
-					}
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
 				})
-				.catch(error => {
-					this.$fhcAlert.alertError('Fehler bei Löschroutine aufgetreten');
-			}).finally(()=> {
-				window.scrollTo(0, 0);
-				this.hideModal('deleteContactModal');
-				this.resetModal();
-				this.reload();
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(()=> {
+					window.scrollTo(0, 0);
+					this.hideModal('deleteContactModal');
+					this.resetModal();
+					this.reload();
 			});
 		},
 		updateContact(kontakt_id){
-			CoreRESTClient.post('components/stv/Kontakt/updateContact/' + kontakt_id,
+			this.$fhcApi.post('api/frontend/v1/stv/kontakt/updateContact/' + kontakt_id,
 				this.contactData).
 			then(response => {
-				if (!response.data.error) {
-					this.$fhcAlert.alertSuccess('Speichern erfolgreich');
-					this.hideModal('editContactModal');
-					this.resetModal();
-					this.reload();
-				} else {
-					const errorData = response.data.retval;
-					Object.entries(errorData).forEach(entry => {
-						const [key, value] = entry;
-						this.$fhcAlert.alertError(value);
-					});
-				}
-			}).catch(error => {
-				this.$fhcAlert.alertError('Fehler bei Speicherroutine aufgetreten');
-			}).finally(() => {
+				this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+				this.hideModal('editContactModal');
+				this.resetModal();
+				this.reload();
+			}).catch(this.$fhcAlert.handleSystemError)
+			.finally(()=> {
 				window.scrollTo(0, 0);
 				this.reload();
 			});
@@ -178,10 +179,10 @@ export default{
 			this.$refs.table.reloadTable();
 		},
 		search(event) {
-			return CoreRESTClient
-				.get('components/stv/Kontakt/getStandorte/' + event.query)
+			return this.$fhcApi
+				.get('api/frontend/v1/stv/kontakt/getStandorte/' + event.query)
 					.then(result => {
-						this.filteredStandorte = CoreRESTClient.getData(result.data);
+						this.filteredStandorte = result.data.retval;
 				});
 		},
 		resetModal(){
@@ -190,38 +191,12 @@ export default{
 		},
 	},
 	created(){
-		CoreRESTClient
-			.get('components/stv/Kontakt/getKontakttypen')
+		this.$fhcApi
+			.get('api/frontend/v1/stv/kontakt/getKontakttypen')
 			.then(result => {
 				this.kontakttypen = result.data;
 			})
-			.catch(err => {
-				console.error(err.response.data || err.message);
-			});
-	},
-	async mounted() {
-		await this.$p.loadCategory(['notiz','global','person']);
-
-		let cm = this.$refs.table.tabulator.columnManager;
-
-		cm.getColumnByField('kontakttyp').component.updateDefinition({
-			title: this.$p.t('global', 'typ')
-		});
-		cm.getColumnByField('kontakt').component.updateDefinition({
-			title: this.$p.t('global', 'kontakt')
-		});
-		cm.getColumnByField('zustellung').component.updateDefinition({
-			title: this.$p.t('person', 'zustellung')
-		});
-		cm.getColumnByField('anmerkung').component.updateDefinition({
-			title: this.$p.t('global', 'anmerkung')
-		});
-		cm.getColumnByField('kurzbz').component.updateDefinition({
-			title: this.$p.t('person', 'firma')
-		});
-		cm.getColumnByField('lastupdate').component.updateDefinition({
-			title: this.$p.t('notiz', 'letzte_aenderung')
-		});
+			.catch(this.$fhcAlert.handleSystemError);
 	},
 	template: `	
 		<div class="stv-list h-100 pt-3">
@@ -348,7 +323,7 @@ export default{
 			:side-menu="false"
 			reload
 			new-btn-show
-			new-btn-label="Neu"
+			new-btn-label="Kontakt"
 			@click:new="actionNewContact"
 			>
 		</core-filter-cmpt>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 8e4581fc9..2e82a250a 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -26171,6 +26171,83 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'error_missingId',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Id {id} nicht gefunden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Missing Id {id}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'error_deleteHomeAdress',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Heimatadressen dürfen nicht gelöscht werden, da diese für die BIS-Meldung relevant sind. Um die Adresse dennoch zu löschen, entfernen sie das Häkchen bei Heimatadresse!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Home addresses may not be deleted as they are relevant for the BIS report. To delete the address anyway, uncheck the home address box!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'successSave',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Speichern erfolgreich',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Successfully saved',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'successDelete',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Löschen erfolgreich',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Delete successful',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+
 );
 
 

From ab3c63103055ec787a4ecc7821746bc136c56189 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 2 Apr 2024 09:22:59 +0200
Subject: [PATCH 0536/1461] update Phrases Status

---
 .../api/frontend/v1/stv/Status.php            |  8 ++--
 .../Studentenverwaltung/Details/Prestudent.js |  2 +-
 .../Details/Prestudent/Status.js              | 14 +++----
 system/phrasesupdate.php                      | 39 ++++++++++++++++++-
 4 files changed, 50 insertions(+), 13 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 00602cf95..2f6f9aa6d 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -26,7 +26,7 @@ class Status extends FHCAPI_Controller
 
 		// Load language phrases
 		$this->loadPhrases([
-			'ui', 'bismeldestichtag','lehre'
+			'ui', 'bismeldestichtag','lehre','studierendenantrag'
 		]);
 	}
 
@@ -659,7 +659,7 @@ class Status extends FHCAPI_Controller
 			}
 			if (!hasData($result))
 			{
-				return $this->terminateWithError($this->p->t('studierendenantrag','error_no_student_for_prestudent'), self::ERROR_TYPE_GENERAL);
+				return $this->terminateWithError($this->p->t('studierendenantrag','error_no_student_for_prestudent',['prestudent_id' => $prestudent_id]), self::ERROR_TYPE_GENERAL);
 			}
 			$student_uid = $result->retval;
 
@@ -1070,7 +1070,7 @@ class Status extends FHCAPI_Controller
 			}
 			if (!hasData($result))
 			{
-				$this->terminateWithError($this->p->t('lehre','error_no_student_for_prestudent'), self::ERROR_TYPE_GENERAL);
+				$this->terminateWithError($this->p->t('studierendenantrag','error_no_student_for_prestudent',['prestudent_id' => $prestudent_id]), self::ERROR_TYPE_GENERAL);
 			}
 			$student_uid = $result->retval;
 
@@ -1236,7 +1236,7 @@ class Status extends FHCAPI_Controller
 		}
 		if (!hasData($result))
 		{
-			$this->terminateWithError($this->p->t('lehre','error_no_student_for_prestudent'), self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError($this->p->t('studierendenantrag','error_no_student_for_prestudent', ['prestudent_id' => $prestudent_id]), self::ERROR_TYPE_GENERAL);
 		}
 		$student_uid = $result->retval;
 
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
index 351902339..3d723a570 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
@@ -103,7 +103,7 @@ export default {
 			this.$refs.form
 				.post('api/frontend/v1/stv/prestudent/updatePrestudent/' + this.modelValue.prestudent_id, this.deltaArray)
 				.then(response => {
-					this.$fhcAlert.alertSuccess('Speichern erfolgreich');
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 					this.deltaArray = [];
 					this.actionUpdate = false;
 				})
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
index cf4f7728a..1538ad9aa 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
@@ -299,7 +299,7 @@ export default{
 			this.$fhcApi.post('api/frontend/v1/stv/status/addNewStatus/' + this.prestudent_id,
 				this.statusData
 			).then(response => {
-					this.$fhcAlert.alertSuccess('Speichern erfolgreich');
+				this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 					this.hideModal('newStatusModal');
 					this.resetModal();
 			}).catch(this.$fhcAlert.handleSystemError)
@@ -316,7 +316,7 @@ export default{
 				this.statusId.ausbildungssemester)
 				.then(
 					result => {
-							this.$fhcAlert.alertSuccess('Vorrückung Status erfolgreich');
+						this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successAdvance'));
 					})
 				.catch(this.$fhcAlert.handleSystemError)
 				.finally(() => {
@@ -332,7 +332,7 @@ export default{
 				this.statusId.ausbildungssemester)
 				.then(
 					result => {
-							this.$fhcAlert.alertSuccess('Bestätigung Status erfolgreich');
+						this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successConfirm'));
 					})
 				.catch(this.$fhcAlert.handleSystemError)
 				.finally(() => {
@@ -345,7 +345,7 @@ export default{
 				status_id)
 				.then(
 					result => {
-							this.$fhcAlert.alertSuccess('Löschen erfolgreich');
+						this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
 							this.hideModal('deleteStatusModal');
 							this.resetModal();
 					})
@@ -364,9 +364,9 @@ export default{
 				this.statusData)
 				.then(
 					result => {
-							this.$fhcAlert.alertSuccess('Bearbeitung Status erfolgreich');
-							this.hideModal('editStatusModal');
-							this.resetModal();
+						this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+						this.hideModal('editStatusModal');
+						this.resetModal();
 					})
 				.catch(this.$fhcAlert.handleSystemError)
 				.finally(() => {
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 2e82a250a..b0da7a7c5 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -26247,7 +26247,44 @@ array(
 			)
 		)
 	),
-
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'successAdvance',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Vorrückung Status erfolgreich',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Advance status successful',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'successConfirm',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bestätigung Status erfolgreich',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Confirmation status successful',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 );
 
 

From e29dfd99f38bc03a400e221a18334f36d3c648f0 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 2 Apr 2024 12:34:51 +0200
Subject: [PATCH 0537/1461] migrate
 approveLehrauftrag/acceptLehrauftrag/orderLehrauftrag to tabulator 5

---
 .../approveAnrechnungUebersichtData.php       |  7 ++-
 .../reviewAnrechnungUebersichtData.php        |  7 ++-
 .../lehre/lehrauftrag/acceptLehrauftrag.php   |  4 +-
 .../lehrauftrag/acceptLehrauftragData.php     | 20 +++-----
 .../lehrauftrag/approveLehrauftragData.php    |  2 +-
 public/js/TableWidget.js                      |  1 -
 .../anrechnung/approveAnrechnungUebersicht.js | 14 +++---
 .../js/lehre/lehrauftrag/acceptLehrauftrag.js | 49 ++++++++++++++++---
 .../lehre/lehrauftrag/approveLehrauftrag.js   | 19 ++++++-
 .../js/lehre/lehrauftrag/orderLehrauftrag.js  |  2 +-
 public/js/tabulator/jquery_wrapper.js         |  1 +
 11 files changed, 89 insertions(+), 37 deletions(-)

diff --git a/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php b/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
index 398389e90..6dbd9e2a7 100644
--- a/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
+++ b/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
@@ -226,10 +226,13 @@ $filterWidgetArray = array(
             func_rowFormatter(row,this);
         },
 		columnDefaults:{
-			headerFilterPlaceholder: " ",
+			
+			//columnDefaults tooltip did not work
+			
 			tooltip:function(e, cell, onRendered){
 				return func_tooltips(cell);
-			}
+			},
+			headerFilterPlaceholder: " ",
 		}
 		
 	 }', // tabulator properties
diff --git a/application/views/lehre/anrechnung/reviewAnrechnungUebersichtData.php b/application/views/lehre/anrechnung/reviewAnrechnungUebersichtData.php
index b88617ced..c7b6a5089 100644
--- a/application/views/lehre/anrechnung/reviewAnrechnungUebersichtData.php
+++ b/application/views/lehre/anrechnung/reviewAnrechnungUebersichtData.php
@@ -172,8 +172,13 @@ $filterWidgetArray = array(
             func_rowFormatter(row);
         },
         columnDefaults:{
+
+			//columnDefaults tooltip did not work
+
+			tooltip:(cell)=>{tooltip:function(e, cell, onRendered){
+				func_tooltips(e,cell,onRendered);
+			},
 			headerFilterPlaceholder: " ",
-			tooltip:(cell)=>{func_tooltips(cell)},
 			
 		}
         
diff --git a/application/views/lehre/lehrauftrag/acceptLehrauftrag.php b/application/views/lehre/lehrauftrag/acceptLehrauftrag.php
index 6c65559d9..96345288e 100644
--- a/application/views/lehre/lehrauftrag/acceptLehrauftrag.php
+++ b/application/views/lehre/lehrauftrag/acceptLehrauftrag.php
@@ -9,7 +9,9 @@ $this->load->view(
 		'bootstrap3' => true,
 		'fontawesome4' => true,
 		'sbadmintemplate' => false,
-		'tabulator4' => true,
+		'tabulator5' => true,
+        'tabulator5JQuery' => true,
+        'cis'=>true,
 		'momentjs2' => true,
 		'ajaxlib' => true,
 		'dialoglib' => true,
diff --git a/application/views/lehre/lehrauftrag/acceptLehrauftragData.php b/application/views/lehre/lehrauftrag/acceptLehrauftragData.php
index fcd9b953c..0a4674e12 100644
--- a/application/views/lehre/lehrauftrag/acceptLehrauftragData.php
+++ b/application/views/lehre/lehrauftrag/acceptLehrauftragData.php
@@ -330,7 +330,7 @@ $filterWidgetArray = array(
 		height: func_height(this),
 		layout: "fitColumns",           // fit columns to width of table
 		autoResize: false, 				// prevent auto resizing of table (false to allow adapting table size when cols are (de-)activated
-	    headerFilterPlaceholder: " ",
+	    
         index: "row_index",             // assign specific column as unique id (important for row indexing)
         selectable: true,               // allow row selection
         selectableRangeMode: "click",   // allow range selection using shift end click on end of range
@@ -338,24 +338,16 @@ $filterWidgetArray = array(
         selectableCheck: function(row){
             return func_selectableCheck(row);
         },
-        rowUpdated:function(row){
-            func_rowUpdated(row);
-        },
         rowFormatter:function(row){
             func_rowFormatter(row);
         },
-        tableBuilt: function(){
-            func_tableBuilt(this);
-        },
-        renderComplete:function(){
-            func_renderComplete(this);
-        },
-         renderStarted:function(){
-            func_renderStarted(this);
-        },
+      
 		tableWidgetFooter: {
 			selectButtons: true
-		}
+		},
+        columnsDefaults:{
+            headerFilterPlaceholder: " ",
+        }
     }', // tabulator properties
     'datasetRepFieldsDefs' => '{
         row_index: {visible:false},     // necessary for row indexing
diff --git a/application/views/lehre/lehrauftrag/approveLehrauftragData.php b/application/views/lehre/lehrauftrag/approveLehrauftragData.php
index 4900a91c4..5a9323108 100644
--- a/application/views/lehre/lehrauftrag/approveLehrauftragData.php
+++ b/application/views/lehre/lehrauftrag/approveLehrauftragData.php
@@ -404,7 +404,7 @@ $filterWidgetArray = array(
         vertrag_id: {visible: false},
         vertrag_stunden: {visible: false},
         vertrag_betrag: {visible: false},
-        mitarbeiter_uid: {visible: false, headerFilter:"input"},func_initialFilter
+        mitarbeiter_uid: {visible: false, headerFilter:"input"},
         bestellt: {align:"center", headerFilter:"input", mutator: mut_formatStringDate, tooltip: bestellt_tooltip},
         erteilt: {align:"center", headerFilter:"input", mutator: mut_formatStringDate, tooltip: erteilt_tooltip},
         akzeptiert: {align:"center", headerFilter:"input", mutator: mut_formatStringDate, tooltip: akzeptiert_tooltip},
diff --git a/public/js/TableWidget.js b/public/js/TableWidget.js
index 57a03e665..69b7d79cf 100644
--- a/public/js/TableWidget.js
+++ b/public/js/TableWidget.js
@@ -727,7 +727,6 @@ var FHC_TableWidget = {
 	_getRepresentationFieldsDefinitions: function(data) {
 
 		var fieldsDefinitions = {}; // eventually contains record fields definitions
-
 		// Checks if record fields definitions was given as parameter
 		if (data.hasOwnProperty("datasetRepresentationFieldsDefinitions") && data.datasetRepresentationFieldsDefinitions != "")
 		{
diff --git a/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js b/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
index 123049ed7..b7f19a015 100644
--- a/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
+++ b/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
@@ -203,16 +203,16 @@ function func_rowSelectionChanged(data, rows, tabulatorInstance){
 }
 
 // Returns tooltip
-function func_tooltips(e, cell, onRendered){
+function func_tooltips(){
     //e - mouseover event
     //cell - cell component
     //onRendered - onRendered callback registration function
-    
-    console.log("TOOLTIP DEBUG",cell);
-    // Return tooltip if row is unselectable
-    if (true || !func_selectableCheck(cell.getRow())){
-        return FHC_PhrasesLib.t("ui", "nichtSelektierbarAufgrundVon") + 'Status';
-    }
+    console.log("here");
+    // console.log("TOOLTIP DEBUG",cell);
+    // // Return tooltip if row is unselectable
+    // if (true || !func_selectableCheck(cell.getRow())){
+    //     return FHC_PhrasesLib.t("ui", "nichtSelektierbarAufgrundVon") + 'Status';
+    // }
 }
 
 // Formats empfehlung_anrechnung
diff --git a/public/js/lehre/lehrauftrag/acceptLehrauftrag.js b/public/js/lehre/lehrauftrag/acceptLehrauftrag.js
index 08a0645bc..c8f5b88bd 100644
--- a/public/js/lehre/lehrauftrag/acceptLehrauftrag.js
+++ b/public/js/lehre/lehrauftrag/acceptLehrauftrag.js
@@ -51,7 +51,7 @@ var mut_formatStringDate = function(value, data, type, params, component) {
 // -----------------------------------------------------------------------------------------------------------------
 
 // Formats null values to a string number '0.00'
-var form_formatNulltoStringNumber = function(cell, formatterParams){
+var form_formatNulltoStringNumber = function(cell, formatterParams, onRendered){
 	if (cell.getValue() == null){
 		if (formatterParams.precision == 1)
 		{
@@ -69,7 +69,7 @@ var form_formatNulltoStringNumber = function(cell, formatterParams){
 // -----------------------------------------------------------------------------------------------------------------
 
 // Filters values using comparison operator or just by string comparison
-function hf_filterStringnumberWithOperator(headerValue, rowValue, rowData){
+function hf_filterStringnumberWithOperator(headerValue, rowValue, rowData, filterParams){
 
 	// If string starts with <, <=, >, >=, !=, ==, compare values with that operator
 	var operator = '';
@@ -346,7 +346,11 @@ status_formatter = function(cell, formatterParams, onRendered){
 };
 
 // Generates status tooltip
-status_tooltip = function(cell){
+status_tooltip = function(e, cell, onRendered){
+	//e - mouseover event
+	//cell - cell component
+	//onRendered - onRendered callback registration function
+
 	var bestellt = cell.getRow().getData().bestellt;
 	var erteilt = cell.getRow().getData().erteilt;
 	var akzeptiert = cell.getRow().getData().akzeptiert;
@@ -403,7 +407,11 @@ status_tooltip = function(cell){
 }
 
 // Generates bestellt tooltip
-bestellt_tooltip = function(cell){
+bestellt_tooltip = function(e, cell, onRendered){
+	//e - mouseover event
+	//cell - cell component
+	//onRendered - onRendered callback registration function
+
 	if (cell.getRow().getData().bestellt_von != null)
 	{
 		return FHC_PhrasesLib.t("ui", "bestelltVon") + cell.getRow().getData().bestellt_von;
@@ -411,21 +419,33 @@ bestellt_tooltip = function(cell){
 }
 
 // Generates erteilt tooltip
-erteilt_tooltip = function(cell){
+erteilt_tooltip = function(e, cell, onRendered){
+	//e - mouseover event
+	//cell - cell component
+	//onRendered - onRendered callback registration function
+
 	if (cell.getRow().getData().erteilt_von != null) {
 		return FHC_PhrasesLib.t("ui", "erteiltVon") + cell.getRow().getData().erteilt_von;
 	}
 }
 
 // Generates akzeptiert tooltip
-akzeptiert_tooltip = function(cell){
+akzeptiert_tooltip = function(e, cell, onRendered){
+	//e - mouseover event
+	//cell - cell component
+	//onRendered - onRendered callback registration function
+
 	if (cell.getRow().getData().akzeptiert_von != null) {
 		return FHC_PhrasesLib.t("ui", "angenommenVon") + cell.getRow().getData().akzeptiert_von;
 	}
 }
 
 // Generates storniert tooltip
-storniert_tooltip = function(cell){
+storniert_tooltip = function(e, cell, onRendered){
+	//e - mouseover event
+	//cell - cell component
+	//onRendered - onRendered callback registration function
+	
 	if (cell.getRow().getData().storniert_von != null) {
 		return FHC_PhrasesLib.t("ui", "storniertVon") + cell.getRow().getData().storniert_von;
 	}
@@ -434,6 +454,21 @@ storniert_tooltip = function(cell){
 $(function() {
 	// Pruefen ob Promise unterstuetzt wird
 	// Tabulator funktioniert nicht mit IE
+
+
+	// tableInit is called in the jquery_wrapper when the tableBuilt event was finished
+    $(document).on("tableInit", function(event,tabulatorInstance) {
+		
+		//passing the tabulator instance because the acceptLehrauftrag site loads two tabulator tables
+        func_tableBuilt(tabulatorInstance)
+        
+        // using the tabulator instance instead of the jquery object because the site loads two different tabulator tables
+		tabulatorInstance.on("renderComplete",()=>{func_renderComplete(tabulatorInstance)});
+		tabulatorInstance.on("renderStarted",()=>{func_renderStarted(tabulatorInstance)});
+		tabulatorInstance.on("rowUpdated",(row)=>{func_rowUpdated(row)});
+       
+    });
+
 	var canPromise = !! window.Promise;
 	if(!canPromise)
 	{
diff --git a/public/js/lehre/lehrauftrag/approveLehrauftrag.js b/public/js/lehre/lehrauftrag/approveLehrauftrag.js
index f40742617..6ce0414fa 100644
--- a/public/js/lehre/lehrauftrag/approveLehrauftrag.js
+++ b/public/js/lehre/lehrauftrag/approveLehrauftrag.js
@@ -225,7 +225,7 @@ function func_selectableCheck(row){
 // Adds column status
 function func_tableBuilt(table) {
     // Add status column to table
-    table.addColumn(
+    table.tabulator("addColumn",
         {
             title: "<i class='fa fa-user-o'></i>",
             field: "status",
@@ -402,7 +402,11 @@ status_formatter = function(cell, formatterParams, onRendered){
 };
 
 // Generates status tooltip
-status_tooltip = function(cell){
+status_tooltip = function(e, cell, onRendered){
+    //e - mouseover event
+    //cell - cell component
+    //onRendered - onRendered callback registration function
+    
     var is_dummy = (cell.getRow().getData().personalnummer <= 0 && cell.getRow().getData().personalnummer != null);
 
     var bestellt = cell.getRow().getData().bestellt;
@@ -504,6 +508,17 @@ akzeptiert_tooltip = function(e, cell, onRendered){
 }
 $(function() {
 
+    // tableInit is called in the jquery_wrapper when the tableBuilt event was finished
+    $(document).on("tableInit", function(event,tabulatorInstance) {
+     
+        func_tableBuilt($("#tableWidgetTabulator"))
+        
+        // event rowSelectionChanged needs to be attached as a callback to the tableBuilt event in tabulator5
+        $("#tableWidgetTabulator").tabulator("on","renderStarted",()=>func_renderStarted(tabulatorInstance));
+        $("#tableWidgetTabulator").tabulator("on","rowUpdated",(row)=>func_rowUpdated(row));
+       
+    });
+
     // Redraw table on resize to fit tabulators height to windows height
     window.addEventListener('resize', function(){
         $('#tableWidgetTabulator').tabulator('setHeight', $(window).height() * 0.50);
diff --git a/public/js/lehre/lehrauftrag/orderLehrauftrag.js b/public/js/lehre/lehrauftrag/orderLehrauftrag.js
index e1be95d7f..9eb5da144 100644
--- a/public/js/lehre/lehrauftrag/orderLehrauftrag.js
+++ b/public/js/lehre/lehrauftrag/orderLehrauftrag.js
@@ -70,7 +70,7 @@ var form_formatNulltoStringNumber = function(cell, formatterParams, onRendered){
 // -----------------------------------------------------------------------------------------------------------------
 
 // Filters values using comparison operator or just by string comparison
-function hf_filterStringnumberWithOperator(headerValue, rowValue, rowData){
+function hf_filterStringnumberWithOperator(headerValue, rowValue, rowData, filterParams){
 
 	// If string starts with <, <=, >, >=, !=, ==, compare values with that operator
 	var operator = '';
diff --git a/public/js/tabulator/jquery_wrapper.js b/public/js/tabulator/jquery_wrapper.js
index e5ef2e088..a5ccb92b0 100644
--- a/public/js/tabulator/jquery_wrapper.js
+++ b/public/js/tabulator/jquery_wrapper.js
@@ -47,6 +47,7 @@
      					that[key] = this[key].bind(this);
 					}
      			}
+				console.log("here the table is building")
 				$(document).trigger("tableInit",[this]);
     		});
 

From d8fb36543fcf44a5c4a43bb91b90bebae83af021 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 2 Apr 2024 12:46:51 +0200
Subject: [PATCH 0538/1461] migrates adminZeitverfuegbarkeit to tabulator5

---
 .../views/lehre/lvplanung/adminZeitverfuegbarkeit.php  |  4 +++-
 .../lehre/lvplanung/adminZeitverfuegbarkeitData.php    | 10 ++++------
 public/js/lehre/lvplanung/zverfueg.js                  |  9 +++++++++
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/application/views/lehre/lvplanung/adminZeitverfuegbarkeit.php b/application/views/lehre/lvplanung/adminZeitverfuegbarkeit.php
index cd5aefea2..753fdbc78 100644
--- a/application/views/lehre/lvplanung/adminZeitverfuegbarkeit.php
+++ b/application/views/lehre/lvplanung/adminZeitverfuegbarkeit.php
@@ -9,7 +9,9 @@ $this->load->view(
         'fontawesome4' => true,
         'momentjs2' => true,
         'ajaxlib' => true,
-        'tabulator4' => true,
+        'tabulator5' => true,
+        'tabulator5JQuery' => true,
+        'cis'=>true,
         'tablewidget' => true,
         'navigationwidget' => true,
         'sbadmintemplate3' => true,
diff --git a/application/views/lehre/lvplanung/adminZeitverfuegbarkeitData.php b/application/views/lehre/lvplanung/adminZeitverfuegbarkeitData.php
index 81a683cff..558593441 100644
--- a/application/views/lehre/lvplanung/adminZeitverfuegbarkeitData.php
+++ b/application/views/lehre/lvplanung/adminZeitverfuegbarkeitData.php
@@ -42,16 +42,14 @@ $filterWidgetArray = array(
     'datasetRepOptions' => '{
 		layout: "fitColumns",           // fit columns to width of table
 		autoResize: false, 				// prevent auto resizing of table (false to allow adapting table size when cols are (de-)activated
-	    headerFilterPlaceholder: " ",
         index: "zeitsperre_id",             // assign specific column as unique id (important for row indexing)
         selectable: 1,               // allow row selection
         tableWidgetHeader: false,
-        rowSelected: function(row) {
-            func_rowSelected(row);
+        columnDefaults:{
+            headerFilterPlaceholder: " ",
         },
-        rowDeselected: function(row) {
-            func_rowDeselected(row);
-        }
+       
+      
     }', // tabulator properties
     'datasetRepFieldsDefs' => '{
         zeitsperre_id: {visible:false},
diff --git a/public/js/lehre/lvplanung/zverfueg.js b/public/js/lehre/lvplanung/zverfueg.js
index 6bb5419ce..6202bf1be 100644
--- a/public/js/lehre/lvplanung/zverfueg.js
+++ b/public/js/lehre/lvplanung/zverfueg.js
@@ -1,4 +1,13 @@
 $(function(){
+
+    // tableInit is called in the jquery_wrapper when the tableBuilt event was finished
+    $(document).on("tableInit", function(event,tabulatorInstance) {
+    
+        $("#tableWidgetTabulator").tabulator("on","rowDeselected",(row)=>func_rowDeselected(row));
+        $("#tableWidgetTabulator").tabulator("on","rowSelected",(row)=>func_rowSelected(row));
+        
+    });
+
     var studiensemesterStart = $("#studsemStart").val();
 
     Zverfueg.initDatepicker(studiensemesterStart);

From 4e3ab802b63f64bcf3e3ff6a768a029659817434 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 2 Apr 2024 12:49:33 +0200
Subject: [PATCH 0539/1461] removes unnecessary debugging log

---
 public/js/tabulator/jquery_wrapper.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/tabulator/jquery_wrapper.js b/public/js/tabulator/jquery_wrapper.js
index a5ccb92b0..c51c7eea0 100644
--- a/public/js/tabulator/jquery_wrapper.js
+++ b/public/js/tabulator/jquery_wrapper.js
@@ -47,7 +47,7 @@
      					that[key] = this[key].bind(this);
 					}
      			}
-				console.log("here the table is building")
+				
 				$(document).trigger("tableInit",[this]);
     		});
 

From e33d863732449b7b39419b126d51bfbbb41ec0d6 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 2 Apr 2024 13:03:52 +0200
Subject: [PATCH 0540/1461] upgrades pruefungsprotokollUebersicht to tabulator
 5

---
 application/views/lehre/pruefungsprotokollUebersicht.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/application/views/lehre/pruefungsprotokollUebersicht.php b/application/views/lehre/pruefungsprotokollUebersicht.php
index c5c545d42..6b203f843 100644
--- a/application/views/lehre/pruefungsprotokollUebersicht.php
+++ b/application/views/lehre/pruefungsprotokollUebersicht.php
@@ -9,6 +9,9 @@
 			'bootstrap3' => true,
 			'fontawesome4' => true,
 			'tablesorter2' => true,
+			'tabulator5' => true,
+			'tabulator5JQuery' => true,
+			'cis'=>true,
 			'ajaxlib' => true,
 			'dialoglib' => true,
 			'tablewidget' => true,

From 51a65495aac8cfdd9828d132b1b83b4982faba4e Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 2 Apr 2024 15:31:56 +0200
Subject: [PATCH 0541/1461] corrects the insertion of the dms_kategorie
 profil_aenderung in the checksystem

---
 .../Cis/Profil/ProfilModal/EditProfil.js      |  1 -
 system/dbupdate_3.4/25999_C4_ma0594.php       | 31 +++++++++----------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfil.js b/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
index db94c7cf1..6ef7ccef8 100755
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
@@ -128,7 +128,6 @@ export default {
         :
         //? fresh insert of new attachment
         await Vue.$fhcapi.ProfilUpdate.insertFile(formData).then(res => {
-          console.log(res.data);
           return res.data?.map((file) => file.dms_id);
         })
         return result;
diff --git a/system/dbupdate_3.4/25999_C4_ma0594.php b/system/dbupdate_3.4/25999_C4_ma0594.php
index 2000669ac..071d33bf7 100755
--- a/system/dbupdate_3.4/25999_C4_ma0594.php
+++ b/system/dbupdate_3.4/25999_C4_ma0594.php
@@ -89,23 +89,20 @@
             echo '<br>public.tbl_profil_update: table created';
     }
  
-    if(!$result = @$db->db_query("SELECT 1 FROM campus.tbl_dms_kategorie WHERE kategorie_kurzbz = 'profil_aenderung' LIMIT 1"))
+    // adds the dms_kategorie profil_aenderung to the database
+    if($result = @$db->db_query("SELECT * FROM campus.tbl_dms_kategorie WHERE kategorie_kurzbz='profil_aenderung'"))
     {
-      echo "HELLLOUUU";
-        $qry = "INSERT INTO campus.tbl_dms_kategorie VALUES ('profil_aenderung','Dokumente für Profil Änderungen','Dokumente die Belegen ob man eine neue Adresse angemeldet hat oder seinen Namen geändert hat','dokumente',NULL,NULL);";
 
-        if(!$db->db_query($qry))
-            echo '<strong>INSERT OF DMS_KATEGORIE profil_aenderung ERROR : '.$db->db_last_error().'</strong><br>';
-        else
-            echo '<br>INSERT OF DMS_KATEGORIE profil_aenderung was successful';
+        if($db->db_num_rows($result) == 0){
+            
+            $qry = "INSERT INTO campus.tbl_dms_kategorie VALUES ('profil_aenderung','Dokumente fuer Profil Aenderungen','Dokumente die Belegen ob man eine neue Adresse angemeldet hat oder seinen Namen geaendert hat','dokumente',NULL,NULL);";
+
+            if(!$db->db_query($qry))
+                echo '<strong>INSERT OF DMS_KATEGORIE profil_aenderung ERROR : '.$db->db_last_error().'</strong><br>';
+            else
+                echo '<br>INSERT OF DMS_KATEGORIE profil_aenderung was successful';
+        }
+        
     }
-    //? would add a column if the column is missing in the table
-  /*   if(!$result = @$db->db_query("SELECT topic FROM public.tbl_profil_update LIMIT 1"))
-    {
-        $qry = "ALTER TABLE public.tbl_profil_update ADD COLUMN topic varchar(32) NOT NULL;";
-
-        if(!$db->db_query($qry))
-            echo '<strong>public.tbl_profil_update: '.$db->db_last_error().'</strong><br>';
-        else
-            echo '<br>public.tbl_profil_update: Spalte topic hinzugefuegt';
-    }  */
\ No newline at end of file
+    
+    
\ No newline at end of file

From a2d71d3a8dcd7500516c25fc79a20ba3b0410df4 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 2 Apr 2024 16:38:29 +0200
Subject: [PATCH 0542/1461] adjusts how the AcceptDenyModal is used and
 included in the ProfilUpdateView

---
 .../Cis/Profil/ProfilModal/EditProfil.js      |  6 ++-
 .../Cis/ProfilUpdate/AcceptDenyUpdate.js      |  6 ++-
 .../Cis/ProfilUpdate/ProfilUpdateView.js      | 47 +++++++++++++++----
 3 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfil.js b/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
index 6ef7ccef8..39705baa0 100755
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
@@ -101,6 +101,8 @@ export default {
               this.fileID? this.fileID[0]: null
             ).then((res) => {
               handleApiResponse(res);
+            }).catch((err) => {
+              console.error(err);
             })
           :  Vue.$fhcapi.ProfilUpdate.insertProfilRequest(
               this.topic,
@@ -109,7 +111,9 @@ export default {
 
             ).then((res) => {
               handleApiResponse(res);
-            });
+            }).catch((err) => {
+              console.error(err);
+            })
       }
     },
 
diff --git a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
index ed13eae03..f09aa8edd 100755
--- a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
+++ b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
@@ -61,8 +61,10 @@ export default {
         this.result = true;
       }).catch((e) => {
         Alert.popup(Vue.h('div',{innerHTML:e.response.data}));
+      }).finally(()=>{
+        this.hide();
       });
-      this.hide();
+      
     },
 
     denyRequest: async function () {
@@ -105,7 +107,7 @@ export default {
   },
   template: `
 
-  <bs-modal ref="modalContainer" v-bind="$props" body-class="" dialog-class="modal-lg" class="bootstrap-alert" backdrop="false" >
+  <bs-modal v-show="!loading" ref="modalContainer" v-bind="$props" body-class="" dialog-class="modal-lg" class="bootstrap-alert" backdrop="false" >
     
     <template v-slot:title>
       {{title}}  
diff --git a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
index 2c0bc1c2e..6eae5ab83 100644
--- a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
+++ b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
@@ -27,6 +27,7 @@ export default{
   components: {
     CoreFilterCmpt,
     Loading,
+    AcceptDenyUpdate,
   },
   props:{
     id:{
@@ -35,6 +36,8 @@ export default{
   },
   data() {
     return {
+      showModal: false,
+      modalData: null,
       loading:false,
       showAll: false,
       events:[],
@@ -128,7 +131,7 @@ export default{
               {
                 label: "<i class='fa fa-eye'></i> Show Request",
                 action: (e, column) => {
-                  this.showModal(column.getData());
+                  this.showAcceptDenyModal(column.getData());
                     
                 },
               }
@@ -137,7 +140,7 @@ export default{
             menu.push({
               label: "<i class='fa fa-eye'></i> Show Request",
               action: (e, column) => {
-                this.showModal(column.getData());
+                this.showAcceptDenyModal(column.getData());
               },
             });
           }
@@ -213,7 +216,7 @@ export default{
             cellClick: (e, cell) => {
               //! function that is called when clicking on a row in the table
               let cellData = cell.getRow().getData();
-              this.showModal(cellData);
+              this.showAcceptDenyModal(cellData);
             },
             //responsive:0,
           },
@@ -239,8 +242,34 @@ export default{
     setLoading: function(newValue){
       this.loading = newValue;
     },
-   
-    showModal: function (value) {
+    hideAcceptDenyModal: function () {
+      //? checks the AcceptDenyModal component property result, if the user made a successful request or not
+     
+      if (this.$refs.AcceptDenyModal.result) {
+          //? refetches the data, if any request was denied or accepted
+          //* setData will call the ajaxURL again to refresh the data
+          
+          this.$refs.UpdatesTable.tabulator.setData();
+      } else {
+        // when modal was closed without submitting request
+      }
+      this.showModal = false;
+      this.modalData = null;
+    },
+
+    showAcceptDenyModal(value) {
+      this.modalData = value;
+      if(!this.modalData){
+        return;
+      }
+      this.showModal = true;
+      
+      // after a state change, wait for the DOM updates to complete
+      Vue.nextTick(() => {
+        this.$refs.AcceptDenyModal.show();
+      });
+    },
+    /* showModal: function (value) {
       AcceptDenyUpdate.popup({ value: value, setLoading:this.setLoading })
         .then((res) => {
           
@@ -251,7 +280,7 @@ export default{
          
         })
         
-    },
+    }, */
     updateData: function (event) {
       this.$refs.UpdatesTable.tabulator.setData();
       //? store the selected view in the session storage of the browser
@@ -270,7 +299,7 @@ export default{
 
   mounted() {
 
-    //? opens the AcceptDenyUpdate Modal if the a preselected profil_update_id was passed to the component (used for email links)
+    //? opens the AcceptDenyUpdate Modal if a preselected profil_update_id was passed to the component (used for email links)
     if(this.profil_update_id){
         
         this.$refs.UpdatesTable.tabulator.on("dataProcessed", ()=>{
@@ -278,7 +307,7 @@ export default{
             return row.profil_update_id === this.profil_update_id;
         });
         if(arrayRowData.length){
-            this.showModal(arrayRowData[0]);
+            this.showAcceptDenyModal(arrayRowData[0]);
         }
         })
     }
@@ -293,6 +322,8 @@ export default{
   template: `
     <div>
     
+    <accept-deny-update v-if="showModal" ref="AcceptDenyModal" @hideBsModal="hideAcceptDenyModal" :value="JSON.parse(JSON.stringify(modalData))" :setLoading="setLoading" ></accept-deny-update>
+    
     <div  class="form-underline flex-fill ">
       <div class="form-underline-titel">Show </div>
 

From 5cabac62d7ce7b58f5d669f6e6fc242e962909ae Mon Sep 17 00:00:00 2001
From: Werner Masik <werner@gefi.at>
Date: Tue, 2 Apr 2024 18:33:37 +0200
Subject: [PATCH 0543/1461] add frist events for befristung

---
 system/dbupdate_3.4/37107_fristenmanagement.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/system/dbupdate_3.4/37107_fristenmanagement.php b/system/dbupdate_3.4/37107_fristenmanagement.php
index eeb32380e..c1b465107 100644
--- a/system/dbupdate_3.4/37107_fristenmanagement.php
+++ b/system/dbupdate_3.4/37107_fristenmanagement.php
@@ -68,7 +68,9 @@ if ($result = $db->db_query("SELECT * FROM information_schema.tables WHERE table
         INSERT INTO hr.tbl_frist_ereignis(ereignis_kurzbz, bezeichnung, sort) VALUES('karenz_ende','Karenz Ende', 6);
         INSERT INTO hr.tbl_frist_ereignis(ereignis_kurzbz, bezeichnung, sort) VALUES('zeitaufzeichnung_beginn','Zeitaufzeichnung Beginn', 7);
         INSERT INTO hr.tbl_frist_ereignis(ereignis_kurzbz, bezeichnung, sort) VALUES('zeitaufzeichnung_ende','Zeitaufzeichnung Ende', 8);
-        INSERT INTO hr.tbl_frist_ereignis (ereignis_kurzbz , bezeichnung, manuell, sort) VALUES('manuell','Manuell', true, 9);
+        INSERT INTO hr.tbl_frist_ereignis(ereignis_kurzbz, bezeichnung, sort) VALUES('befristung_beginn','Befristung Beginn', 9);
+        INSERT INTO hr.tbl_frist_ereignis(ereignis_kurzbz, bezeichnung, sort) VALUES('befristung_ende','Befristung Ende', 10);
+        INSERT INTO hr.tbl_frist_ereignis (ereignis_kurzbz , bezeichnung, manuell, sort) VALUES('manuell','Manuell', true, 11);
 
 
         ";

From 2951b2a0d1b8c92ec41b031eab92bbfa293080de Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 3 Apr 2024 10:26:26 +0200
Subject: [PATCH 0544/1461] Start Tab Betriebsmittel

---
 .../api/frontend/v1/stv/Betriebsmittel.php    |  90 +++++
 .../controllers/components/stv/Config.php     |   4 +
 .../Betriebsmittel/Betriebsmittel.js          | 323 ++++++++++++++++++
 .../Details/Betriebsmittel.js                 |  25 ++
 4 files changed, 442 insertions(+)
 create mode 100644 application/controllers/api/frontend/v1/stv/Betriebsmittel.php
 create mode 100644 public/js/components/Betriebsmittel/Betriebsmittel.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Betriebsmittel.js

diff --git a/application/controllers/api/frontend/v1/stv/Betriebsmittel.php b/application/controllers/api/frontend/v1/stv/Betriebsmittel.php
new file mode 100644
index 000000000..d2cc870ff
--- /dev/null
+++ b/application/controllers/api/frontend/v1/stv/Betriebsmittel.php
@@ -0,0 +1,90 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+
+class Betriebsmittel extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'getAllBetriebsmittel' => ['admin:r', 'assistenz:r'],
+			'addNewBetriebsmittel' => ['admin:r', 'assistenz:r'],
+			'updateBetriebsmittel' => ['admin:r', 'assistenz:r'],
+			'loadBetriebsmittel' => ['admin:r', 'assistenz:r'],
+			'getTypenBetriebsmittel' => ['admin:r', 'assistenz:r']
+		]);
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+		$this->load->library('form_validation');
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui'
+		]);
+	}
+
+	public function getAllBetriebsmittel($uid, $person_id)
+	{
+		$this->load->model('ressource/Betriebsmittelperson_model', 'BetriebsmittelpersonModel');
+
+		//uid
+		//$result = $this->BetriebsmittelpersonModel->getBetriebsmittelByUid($uid);
+
+		//person_id
+		$result = $this->BetriebsmittelpersonModel->getBetriebsmittel($person_id);
+
+		if (isError($result))
+		{
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+
+		$this->terminateWithSuccess((getData($result) ?: []));
+	}
+
+	public function loadBetriebsmittel()
+	{
+		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+
+		$betriebsmittel_id = $this->input->post('betriebsmittel_id');
+
+		$this->load->model('ressource/Betriebsmittel_model', 'BetriebsmittelModel');
+
+
+		$result = $this->BetriebsmittelModel->loadWhere(
+			array(
+				'betriebsmittel_id' => $betriebsmittel_id
+			)
+		);
+		if (isError($result))
+		{
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+
+		elseif (!hasData($result))
+		{
+			$this->terminateWithError("no Betriebsmittel with ID found: " . $betriebsmittel_id, self::ERROR_TYPE_GENERAL);
+		}
+
+	//	var_dump($result);
+
+		$this->terminateWithSuccess(getData($result) ? : []);
+
+	}
+
+	public function getTypenBetriebsmittel()
+	{
+		$this->load->model('ressource/Betriebsmitteltyp_model', 'BetriebsmitteltypModel');
+
+		$result = $this->BetriebsmitteltypModel->load();
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess(getData($result) ?: []);
+	}
+
+}
+
+
diff --git a/application/controllers/components/stv/Config.php b/application/controllers/components/stv/Config.php
index 47842822c..45c26c966 100644
--- a/application/controllers/components/stv/Config.php
+++ b/application/controllers/components/stv/Config.php
@@ -35,6 +35,10 @@ class Config extends FHC_Controller
 			'title' => 'Status',
 			'component' => './Stv/Studentenverwaltung/Details/Status.js'
 		];
+		$result['betriebsmittel'] = [
+			'title' => 'Betriebsmittel',
+			'component' => './Stv/Studentenverwaltung/Details/Betriebsmittel.js'
+		];
 		$result['noten'] = [
 			'title' => 'Noten',
 			'component' => './Stv/Studentenverwaltung/Details/Noten.js'
diff --git a/public/js/components/Betriebsmittel/Betriebsmittel.js b/public/js/components/Betriebsmittel/Betriebsmittel.js
new file mode 100644
index 000000000..6ea8f2022
--- /dev/null
+++ b/public/js/components/Betriebsmittel/Betriebsmittel.js
@@ -0,0 +1,323 @@
+import VueDatePicker from '../vueDatepicker.js.php';
+import {CoreFilterCmpt} from "../filter/Filter.js";
+import BsModal from "../Bootstrap/Modal";
+import FormForm from '../Form/Form.js';
+import FormInput from '../Form/Input.js';
+
+export default {
+	components: {
+		CoreFilterCmpt,
+		VueDatePicker,
+		BsModal,
+		FormForm,
+		FormInput,
+	},
+	props: [
+		'person_id',
+		'uid'
+		],
+	data(){
+		return {
+			tabulatorOptions: {
+			//	ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Betriebsmittel/getBetriebsmittel/' + this.id + '/' + this.typeId),
+				ajaxURL: 'api/frontend/v1/stv/Betriebsmittel/getAllBetriebsmittel/' + this.uid + '/' + this.person_id,
+				ajaxRequestFunc: this.$fhcApi.get,
+				ajaxResponse: (url, params, response) => response.data,
+				columns: [
+					{title: "Nummer", field: "nummer"},
+					{title:  "PersonId", field: "person_id"},
+					{title: "Typ", field: "betriebsmitteltyp"},
+					{title:  "Retourdatum", field: "retouram"},
+					{title:  "Beschreibung", field: "beschreibung"},
+					{title:  "Uid", field: "uid"},
+					{title:  "Anmerkung", field: "anmerkung", visible: false},
+					{title:  "Kaution", field: "kaution", visible: false},
+					{title:  "Ausgabedatum", field: "ausgegebenam", visible: false},
+					{title: "Betriebsmittel_id", field: "betriebsmittel_id", visible: false},
+					{title: "Betriebsmittelperson_id", field: "betriebsmittelperson_id", visible: false},
+					{
+						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-print"></i>';
+							button.title = 'Übernahmebestätigung drucken';
+							button.addEventListener(
+								'click',
+								(event) =>
+									this.actionPrintConfirmation(cell.getData().betriebsmittel_id)
+							);
+							container.append(button);
+
+							button = document.createElement('button');
+							button.className = 'btn btn-outline-secondary btn-action';
+							button.innerHTML = '<i class="fa fa-edit"></i>';
+							button.title = 'Betriebsmittel bearbeiten';
+							button.addEventListener(
+								'click',
+								(event) =>
+									this.actionEditBetriebsmittel(cell.getData().betriebsmittel_id)
+							);
+							container.append(button);
+
+							button = document.createElement('button');
+							button.className = 'btn btn-outline-secondary btn-action';
+							button.innerHTML = '<i class="fa fa-xmark"></i>';
+							button.title = 'Betriebsmittel löschen';
+							button.addEventListener(
+								'click',
+								() =>
+									this.actionDeleteBetriebsmittel(cell.getData().betriebsmittel_id)
+							);
+							container.append(button);
+
+							return container;
+						},
+						frozen: true
+					}],
+				layout: 'fitColumns',
+				layoutColumnsOnNewData: false,
+				height: '150',
+				selectableRangeMode: 'click',
+				selectable: true,
+				//index: 'betriebsmittel_id'
+			},
+			tabulatorEvents: [],
+			betriebsmittelData: {},
+			betriebsmittel_id: {},
+			listBetriebsmitteltyp: []
+		};
+	},
+	methods: {
+		actionEditBetriebsmittel(betriebsmittel_id){
+			console.log("id: " + betriebsmittel_id);
+			this.loadBetriebsmittel(betriebsmittel_id).then(() => {
+				if(this.betriebsmittelData)
+					this.$refs.editBetriebsmittelModal.show();
+			});
+		},
+		actionPrintConfirmation(betriebsmittel_id){
+			console.log("actionPrintConfirmation of id: " + betriebsmittel_id);
+/*			this.loadBetriebsmittel(betriebsmittel_id).then(() => {
+
+				if(this.betriebsmittelData)
+					this.$refs.editBetriebsmittelModal.show();
+			});*/
+		},
+		loadBetriebsmittel(betriebsmittel_id){
+			//console.log("2 " + betriebsmittel_id);
+			return this.$fhcApi.post('api/frontend/v1/stv/betriebsmittel/loadBetriebsmittel/',
+				betriebsmittel_id)
+				.then(result => {
+					//console.log("in load"  + result);
+					this.betriebsmittelData = result.data;
+					return result;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+	},
+
+	created(){
+		this.$fhcApi
+			.get('api/frontend/v1/stv/betriebsmittel/getTypenBetriebsmittel')
+			.then(result => result.data)
+			.then(result => {
+				this.listBetriebsmitteltyp = result;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+	},
+/*	async mounted() {
+		if(this.showTinyMCE){
+			this.initTinyMCE();
+		}
+
+		await this.$p.loadCategory(['notiz','global']);
+
+		let cm = this.$refs.table.tabulator.columnManager;
+
+		cm.getColumnByField('verfasser_uid').component.updateDefinition({
+			title: this.$p.t('notiz', 'verfasser')
+		});
+		cm.getColumnByField('titel').component.updateDefinition({
+			title: this.$p.t('global', 'titel')
+		});
+		cm.getColumnByField('text_stripped').component.updateDefinition({
+			title: this.$p.t('global', 'text')
+		});
+		cm.getColumnByField('bearbeiter_uid').component.updateDefinition({
+			title: this.$p.t('notiz', 'bearbeiter')
+		});
+		cm.getColumnByField('start').component.updateDefinition({
+			title: this.$p.t('global', 'gueltigVon')
+		});
+		cm.getColumnByField('ende').component.updateDefinition({
+			title: this.$p.t('global', 'gueltigBis')
+		});
+		cm.getColumnByField('countdoc').component.updateDefinition({
+			title: this.$p.t('notiz', 'document')
+		});
+		cm.getColumnByField('erledigt').component.updateDefinition({
+			title: this.$p.t('notiz', 'erledigt')
+		});
+		cm.getColumnByField('lastupdate').component.updateDefinition({
+			title: this.$p.t('notiz', 'letzte_aenderung')
+		});
+	},*/
+	template: `
+	<div class="betriebsmittel-betriebsmittel">
+	
+			<!--Modal: editBetriebsmittelModal-->
+		<BsModal ref="editBetriebsmittelModal">
+		
+			<template #title>Details</template>
+			
+		
+			<form-form class="row g-3" ref="betriebsmittelData">
+				
+						<div class="row mb-3">								   
+							<label for="typ" class="form-label col-sm-4">Typ</label>
+							<div class="col-sm-6">
+								<form-input
+								type="select"
+								name="typ"
+								v-model="betriebsmittelData['typ']"
+								>
+								<option v-for="entry in listBetriebsmitteltyp" :key="entry.betriebsmitteltyp" :value="entry.betriebsmitteltyp">{{entry.betriebsmitteltyp}}</option>
+								</form-input>
+							</div>
+						</div>
+						
+						<div class="row mb-3">
+							<label for="nummer" class="form-label col-sm-4">Nummer </label>
+							<div class="col-sm-6">
+								<form-input
+									type="text"
+									name="nummer"
+									v-model="betriebsmittelData['nummer2']"
+								>						
+								</form-input>
+							</div>
+						</div>
+						
+						<div class="row mb-3">
+							<label for="nummer2" class="form-label col-sm-4">Nummer2</label>
+							<div class="col-sm-6">
+								<form-input
+									type="text"
+									name="nummer"
+									v-model="betriebsmittelData['nummer2']"
+								>						
+								</form-input>
+							</div>
+						</div>
+					
+						<div class="row mb-3">
+							<label for="bechreibung" class="form-label col-sm-4">Beschreibung</label>
+							<div class="col-sm-6">
+								<form-input
+									type="textarea"
+									name="beschreibung"
+									v-model="betriebsmittelData['beschreibung']"
+								>						
+								</form-input>
+							</div>
+						</div>
+						
+						<div class="row mb-3">
+							<label for="kaution" class="form-label col-sm-4">Kaution</label>
+							<div class="col-sm-6">
+								<form-input
+									type="text"
+									name="kaution"
+									v-model="betriebsmittelData['kaution']"
+								>						
+								</form-input>
+							</div>
+						</div>
+						
+				<div class="row mb-3">
+							<label for="anmerkung" class="form-label col-sm-4">Anmerkung</label>
+							<div class="col-sm-6">
+								<form-input
+									type="textarea"
+									name="anmerkung"
+									v-model="betriebsmittelData['anmerkung']"
+								>						
+								</form-input>
+							</div>
+						</div>
+						
+						<div class="row mb-3">
+							<label for="ausgegebenam" class="form-label col-sm-4">Ausgegeben am</label>
+							<div class="col-sm-6">
+								<form-input
+									type="DatePicker"
+									:readonly="readonly"
+									name="datum"
+									v-model="betriebsmittelData['ausgegebenam']"
+									auto-apply
+									:enable-time-picker="false"
+									format="dd.MM.yyyy"
+									preview-format="dd.MM.yyyy"
+									:teleport="true"
+								></form-input>
+							</div>
+						</div>
+						
+						<div class="row mb-3">
+							<label for="retouram" class="form-label col-sm-4">Retour am</label>
+							<div class="col-sm-6">
+								<form-input
+									type="DatePicker"
+									:readonly="readonly"
+									name="datum"
+									v-model="betriebsmittelData['retouram']"
+									auto-apply
+									:enable-time-picker="false"
+									format="dd.MM.yyyy"
+									preview-format="dd.MM.yyyy"
+									:teleport="true"
+								></form-input>
+							</div>
+						</div>
+				
+			</form-form>
+			
+			<template #footer>
+				<button ref="Close" type="button" class="btn btn-primary" @click="editBetriebsmittel(betriebsmittelData.betriebsmittel_id)">Speichern</button>
+			</template>
+		</BsModal>
+
+		<!--Modal: deleteBetriebsmittelModal-->
+<!--		<BsModal ref="deleteBetriebsmittelModal">
+			<template #title>Betriebsmittel löschen</template>
+			<template #default>
+				<p>Betriebsmittel wirklich löschen?</p>
+			</template>
+			<template #footer>
+				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">Abbrechen</button>
+				<button ref="Close" type="button" class="btn btn-primary" @click="deleteBetriebsmittel(notizen.notiz_id)">OK</button>
+			</template>
+		</BsModal>-->
+
+		<core-filter-cmpt
+			ref="table"
+			:tabulator-options="tabulatorOptions"
+			:tabulator-events="tabulatorEvents"
+			table-only
+			:side-menu="false"
+			reload
+			new-btn-show
+			new-btn-label="Betriebsmittel"
+			@click:new="actionNewBetriebsmittel"
+			>
+		</core-filter-cmpt>
+		<br>
+		
+	</div>`
+}
+
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Betriebsmittel.js b/public/js/components/Stv/Studentenverwaltung/Details/Betriebsmittel.js
new file mode 100644
index 000000000..ec8a4dfc1
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Betriebsmittel.js
@@ -0,0 +1,25 @@
+import Betriebsmittel from "../../../Betriebsmittel/Betriebsmittel.js";
+
+export default {
+	components: {
+		Betriebsmittel
+	},
+	props: {
+		modelValue: Object
+	},
+	template: `
+	<div class="stv-details-details h-100 pb-3">
+		<h3>Betriebsmittel</h3>
+		<Betriebsmittel
+			ref="formc"
+			:person_id="modelValue.person_id"
+			:uid="modelValue.uid"
+			>
+		</Betriebsmittel>	
+		{{modelValue}}	
+		<hr>
+		{{modelValue.person_id}}
+	</div>
+	`
+};
+

From 9907ee226738d54afeb02b800bdae4156debeffa Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Wed, 3 Apr 2024 11:45:43 +0200
Subject: [PATCH 0545/1461] Added phrase global/zeilenAuswaehlen

---
 system/phrasesupdate.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index d2b6f86a7..6a631d5d2 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -25899,6 +25899,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'zeilenAuswaehlen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zeilen auswählen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Select rows',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 );
 
 

From dd2f982e956b205a2dca9a35ef91ee0f75012d13 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 3 Apr 2024 14:33:35 +0200
Subject: [PATCH 0546/1461] adding the uniqueID jquery identifier to
 acceptLehrvertrag.js

---
 public/js/lehre/lehrauftrag/acceptLehrauftrag.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/public/js/lehre/lehrauftrag/acceptLehrauftrag.js b/public/js/lehre/lehrauftrag/acceptLehrauftrag.js
index c8f5b88bd..e9dbe4263 100644
--- a/public/js/lehre/lehrauftrag/acceptLehrauftrag.js
+++ b/public/js/lehre/lehrauftrag/acceptLehrauftrag.js
@@ -11,6 +11,9 @@ const APP_ROOT = FHC_JS_DATA_STORAGE_OBJECT.app_root;
 
 const COLOR_LIGHTGREY = "#f5f5f5";
 
+const TABLE_CANCELLED_LEHRAUFTRAG = '[tableuniqueid = cancelledLehrauftrag] #tableWidgetTabulator';
+const TABLE_ACCEPT_LEHRAUFTRAG = '[tableuniqueid = acceptLehrauftrag] #tableWidgetTabulator';
+
 /**
  * PNG icons used in status- and filter buttons
  * Setting png icons is a workaround to use font-awsome 5.9.0 icons until system can be updated to newer font awsome version.
@@ -461,7 +464,7 @@ $(function() {
 		
 		//passing the tabulator instance because the acceptLehrauftrag site loads two tabulator tables
         func_tableBuilt(tabulatorInstance)
-        
+		
         // using the tabulator instance instead of the jquery object because the site loads two different tabulator tables
 		tabulatorInstance.on("renderComplete",()=>{func_renderComplete(tabulatorInstance)});
 		tabulatorInstance.on("renderStarted",()=>{func_renderStarted(tabulatorInstance)});

From 2132fe76ae556d1c0769e794071ba9be966aa318 Mon Sep 17 00:00:00 2001
From: KarpAlex <karpenko@technikum-wien.at>
Date: Wed, 3 Apr 2024 17:39:00 +0200
Subject: [PATCH 0547/1461] added Plausicheck: students in DUAL Studiengang
 should have set boolean value dual to true, plausicheck bugfixes (loading
 model, remove unnecessary property)

---
 .../controllers/jobs/IssueResolver.php        |   1 +
 .../issues/PlausicheckDefinitionLib.php       |   3 +-
 .../issues/PlausicheckProducerLib.php         |   3 +-
 .../DualesStudiumOhneMarkierung.php           | 143 ++++++++++++++++++
 .../InaktiverStudentAktiverStatus.php         |   1 +
 .../resolvers/CORE_STUDENTSTATUS_0016.php     |  36 +++++
 system/fehlerupdate.php                       |   8 +
 7 files changed, 192 insertions(+), 3 deletions(-)
 create mode 100644 application/libraries/issues/plausichecks/DualesStudiumOhneMarkierung.php
 create mode 100644 application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0016.php

diff --git a/application/controllers/jobs/IssueResolver.php b/application/controllers/jobs/IssueResolver.php
index cf97b7f68..be66a6b23 100755
--- a/application/controllers/jobs/IssueResolver.php
+++ b/application/controllers/jobs/IssueResolver.php
@@ -45,6 +45,7 @@ class IssueResolver extends IssueResolver_Controller
 			'CORE_STUDENTSTATUS_0013' => 'CORE_STUDENTSTATUS_0013',
 			'CORE_STUDENTSTATUS_0014' => 'CORE_STUDENTSTATUS_0014',
 			'CORE_STUDENTSTATUS_0015' => 'CORE_STUDENTSTATUS_0015',
+			'CORE_STUDENTSTATUS_0016' => 'CORE_STUDENTSTATUS_0016',
 			'CORE_PERSON_0001' => 'CORE_PERSON_0001',
 			'CORE_PERSON_0002' => 'CORE_PERSON_0002',
 			'CORE_PERSON_0003' => 'CORE_PERSON_0003',
diff --git a/application/libraries/issues/PlausicheckDefinitionLib.php b/application/libraries/issues/PlausicheckDefinitionLib.php
index cef28a736..b44a5ce19 100644
--- a/application/libraries/issues/PlausicheckDefinitionLib.php
+++ b/application/libraries/issues/PlausicheckDefinitionLib.php
@@ -33,7 +33,8 @@ class PlausicheckDefinitionLib
 		'PrestudentMischformOhneOrgform' => 'PrestudentMischformOhneOrgform',
 		'StgPrestudentUngleichStgStudienplan' => 'StgPrestudentUngleichStgStudienplan',
 		'StgPrestudentUngleichStgStudent' => 'StgPrestudentUngleichStgStudent',
-		'StudentstatusNachAbbrecher' => 'StudentstatusNachAbbrecher'
+		'StudentstatusNachAbbrecher' => 'StudentstatusNachAbbrecher',
+		'DualesStudiumOhneMarkierung' => 'DualesStudiumOhneMarkierung'
 		//'StudienplanUngueltig' => 'StudienplanUngueltig'
 	);
 
diff --git a/application/libraries/issues/PlausicheckProducerLib.php b/application/libraries/issues/PlausicheckProducerLib.php
index c32f1f863..3a51e2b1e 100644
--- a/application/libraries/issues/PlausicheckProducerLib.php
+++ b/application/libraries/issues/PlausicheckProducerLib.php
@@ -12,8 +12,7 @@ class PlausicheckProducerLib
 
 	private $_ci; // ci instance
 	private $_extensionName; // name of extension
-	private $_app; // name of application
-	private $_konfiguration = array(); // konfigratio parameters
+	private $_konfiguration = array(); // configuration parameters
 
 	public function __construct($params = null)
 	{
diff --git a/application/libraries/issues/plausichecks/DualesStudiumOhneMarkierung.php b/application/libraries/issues/plausichecks/DualesStudiumOhneMarkierung.php
new file mode 100644
index 000000000..3951f6d76
--- /dev/null
+++ b/application/libraries/issues/plausichecks/DualesStudiumOhneMarkierung.php
@@ -0,0 +1,143 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+require_once('PlausiChecker.php');
+
+/**
+ *
+ */
+class DualesStudiumOhneMarkierung extends PlausiChecker
+{
+	public function executePlausiCheck($params)
+	{
+		$results = array();
+
+		// get parameters from config
+		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
+
+		// pass parameters needed for plausicheck
+		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
+		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
+
+		// get all students failing the plausicheck
+		$prestudentRes = $this->getDualesStudiumOhneMarkierung(
+			$studiensemester_kurzbz,
+			$studiengang_kz,
+			null,
+			$exkludierte_studiengang_kz
+		);
+
+		if (isError($prestudentRes)) return $prestudentRes;
+
+		if (hasData($prestudentRes))
+		{
+			$prestudents = getData($prestudentRes);
+
+			// populate results with data necessary for writing issues
+			foreach ($prestudents as $prestudent)
+			{
+				$results[] = array(
+					'person_id' => $prestudent->person_id,
+					'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz,
+					'fehlertext_params' => array(
+						'prestudent_id' => $prestudent->prestudent_id,
+						'studienplan' => $prestudent->studienplan
+					),
+					'resolution_params' => array(
+						'prestudent_id' => $prestudent->prestudent_id,
+						'studiensemester_kurzbz' => $prestudent->studiensemester_kurzbz
+					)
+				);
+			}
+		}
+
+		// return the results
+		return success($results);
+	}
+
+	/**
+	 * All prestudents in dual Studiengang should have set the dual flag to true.
+	 * @param studiensemester_kurzbz string check is to be executed for certain Studiensemester
+	 * @param studiengang_kz int if check is to be executed for certain Studiengang
+	 * @param prestudent_id int if check is to be executed only for one prestudent
+	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
+	 * @return success with prestudents or error
+	 */
+	public function getDualesStudiumOhneMarkierung(
+		$studiensemester_kurzbz,
+		$studiengang_kz = null,
+		$prestudent_id = null,
+		$exkludierte_studiengang_kz = null
+	) {
+		$params = array($studiensemester_kurzbz);
+
+		$qry = "
+			SELECT
+				DISTINCT pre.person_id, pre.prestudent_id,
+				stpl.bezeichnung AS studienplan,
+				status.studiensemester_kurzbz,
+				status.ausbildungssemester,
+				stg.oe_kurzbz AS prestudent_stg_oe_kurzbz
+			FROM
+				public.tbl_prestudent pre
+				JOIN public.tbl_prestudentstatus status USING(prestudent_id)
+				JOIN public.tbl_person USING(person_id)
+				JOIN lehre.tbl_studienplan stpl USING(studienplan_id)
+				JOIN public.tbl_studiengang stg ON pre.studiengang_kz = stg.studiengang_kz
+				JOIN public.tbl_studiensemester sem USING(studiensemester_kurzbz)
+			WHERE
+				(stpl.orgform_kurzbz = 'DUA' OR status.orgform_kurzbz = 'DUA')
+				AND pre.dual = FALSE
+				AND status.studiensemester_kurzbz=?
+				AND pre.bismelden
+				AND stg.melderelevant
+				AND NOT EXISTS (
+					SELECT 1
+					FROM
+						public.tbl_prestudentstatus
+						JOIN lehre.tbl_studienplan USING(studienplan_id)
+						JOIN public.tbl_studiensemester USING(studiensemester_kurzbz)
+					WHERE
+						prestudent_id = pre.prestudent_id
+						AND
+						(
+							-- if there is a newer non-dual status, dual has not to be set
+							(
+								(
+									tbl_studienplan.orgform_kurzbz <> stpl.orgform_kurzbz
+									OR status.orgform_kurzbz <> tbl_prestudentstatus.orgform_kurzbz
+								)
+								AND
+								(
+									tbl_studiensemester.ende::date > sem.ende::date
+									OR (tbl_studiensemester.ende::date = sem.ende::date AND tbl_prestudentstatus.datum::date > status.datum::date)
+								)
+							)
+							OR
+								-- exclude Abgewiesene - they are not reported
+								tbl_prestudentstatus.status_kurzbz = 'Abgewiesener'
+						)
+				)";
+
+		if (isset($studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz = ?";
+			$params[] = $studiengang_kz;
+		}
+
+		if (isset($prestudent_id))
+		{
+			$qry .= " AND pre.prestudent_id = ?";
+			$params[] = $prestudent_id;
+		}
+
+		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz NOT IN ?";
+			$params[] = $exkludierte_studiengang_kz;
+		}
+
+		return $this->_db->execReadOnlyQuery($qry, $params);
+	}
+}
diff --git a/application/libraries/issues/plausichecks/InaktiverStudentAktiverStatus.php b/application/libraries/issues/plausichecks/InaktiverStudentAktiverStatus.php
index dead2b1e7..59965e238 100644
--- a/application/libraries/issues/plausichecks/InaktiverStudentAktiverStatus.php
+++ b/application/libraries/issues/plausichecks/InaktiverStudentAktiverStatus.php
@@ -67,6 +67,7 @@ class InaktiverStudentAktiverStatus extends PlausiChecker
 		$prestudent_id = null,
 		$exkludierte_studiengang_kz = null
 	) {
+		$this->_ci->load->model('organisation/studiensemester_model', 'StudiensemesterModel');
 		$aktStudiensemesterRes = $this->_ci->StudiensemesterModel->getAkt();
 
 		if (isError($aktStudiensemesterRes)) return $aktStudiensemesterRes;
diff --git a/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0016.php b/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0016.php
new file mode 100644
index 000000000..0bba1ddff
--- /dev/null
+++ b/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0016.php
@@ -0,0 +1,36 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * Student in dual Studiengang should have set the dual flag to true.
+ */
+class CORE_STUDENTSTATUS_0016 implements IIssueResolvedChecker
+{
+	public function checkIfIssueIsResolved($params)
+	{
+		if (!isset($params['prestudent_id']) || !is_numeric($params['prestudent_id']))
+			return error('Prestudent Id missing, issue_id: '.$params['issue_id']);
+
+		if (!isset($params['studiensemester_kurzbz']) || isEmptyString($params['studiensemester_kurzbz']))
+			return error('Studiensemester missing, issue_id: '.$params['issue_id']);
+
+		$this->_ci =& get_instance(); // get code igniter instance
+
+		$this->_ci->load->library('issues/plausichecks/DualesStudiumOhneMarkierung');
+
+		// check if issue persists
+		$checkRes = $this->_ci->dualesstudiumohnemarkierung->getDualesStudiumOhneMarkierung(
+			$params['studiensemester_kurzbz'],
+			null,
+			$params['prestudent_id']
+		);
+
+		if (isError($checkRes)) return $checkRes;
+
+		if (hasData($checkRes))
+			return success(false); // not resolved if issue is still present
+		else
+			return success(true); // resolved otherwise
+	}
+}
diff --git a/system/fehlerupdate.php b/system/fehlerupdate.php
index f29323c7c..89446982d 100644
--- a/system/fehlerupdate.php
+++ b/system/fehlerupdate.php
@@ -285,6 +285,14 @@ $fehlerArr = array(
 		'fehlertyp_kurzbz' => 'error',
 		'app' => 'core'
 	),
+	array(
+		'fehlercode' => 'CORE_STUDENTSTATUS_0016',
+		'fehler_kurzbz' => 'DualesStudiumOhneMarkierung',
+		'fehlercode_extern' => null,
+		'fehlertext' => 'StudentIn in dualem Studiengang nicht als dual markiert (prestudent_id %s, Studienplan %s)',
+		'fehlertyp_kurzbz' => 'error',
+		'app' => 'core'
+	),
 	array(
 		'fehlercode' => 'CORE_PERSON_0001',
 		'fehler_kurzbz' => 'GbDatumWeitZurueck',

From 2e5f53f59a6a9abeddb4c478e6ff35a2ab6c1777 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 4 Apr 2024 09:36:46 +0200
Subject: [PATCH 0548/1461] changes tabulator cell alignment in tabulator5

---
 .../anrechnung/reviewAnrechnungUebersichtData.php    |  2 +-
 .../lehre/lehrauftrag/acceptLehrauftragData.php      | 10 +++++-----
 .../lehre/lehrauftrag/approveLehrauftragData.php     | 12 ++++++------
 .../lehre/lehrauftrag/cancelledLehrauftragData.php   |  6 +++---
 .../views/lehre/lehrauftrag/orderLehrauftragData.php | 12 ++++++------
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/application/views/lehre/anrechnung/reviewAnrechnungUebersichtData.php b/application/views/lehre/anrechnung/reviewAnrechnungUebersichtData.php
index c7b6a5089..6bdd796a4 100644
--- a/application/views/lehre/anrechnung/reviewAnrechnungUebersichtData.php
+++ b/application/views/lehre/anrechnung/reviewAnrechnungUebersichtData.php
@@ -184,7 +184,7 @@ $filterWidgetArray = array(
         
 	 }', // tabulator properties
 	'datasetRepFieldsDefs' => '{
-		empfehlungsberechtigt: {formatter:"tickCross", align:"center", headerTooltip:"Berechtigt wenn man die LV leitet oder wenn der LV keine LV-Leitung zugeordnet ist.",
+		empfehlungsberechtigt: {formatter:"tickCross", hozAlign:"center", headerTooltip:"Berechtigt wenn man die LV leitet oder wenn der LV keine LV-Leitung zugeordnet ist.",
 		    headerFilter:"tickCross", headerFilterParams:{"tristate": true}, headerFilterFunc: hf_empfehlungsberechtigt
         },
 		anrechnung_id: {visible: false, headerFilter:"input"},
diff --git a/application/views/lehre/lehrauftrag/acceptLehrauftragData.php b/application/views/lehre/lehrauftrag/acceptLehrauftragData.php
index 0a4674e12..a69bcb51f 100644
--- a/application/views/lehre/lehrauftrag/acceptLehrauftragData.php
+++ b/application/views/lehre/lehrauftrag/acceptLehrauftragData.php
@@ -367,11 +367,11 @@ $filterWidgetArray = array(
         orgform_kurzbz: {visible: false, headerFilter:"input"},
         person_id: {visible: false, headerFilter:"input"},
         lv_oe_kurzbz: {visible: false, headerFilter:"input"},
-        stunden: {align:"right", formatter: form_formatNulltoStringNumber, formatterParams:{precision:2},
+        stunden: {hozAlign:"right", formatter: form_formatNulltoStringNumber, formatterParams:{precision:2},
             headerFilter:"input", headerFilterFunc: hf_filterStringnumberWithOperator,
             bottomCalc:"sum", bottomCalcParams:{precision:2}
 		},
-        betrag: {align:"right", formatter: form_formatNulltoStringNumber,
+        betrag: {hozAlign:"right", formatter: form_formatNulltoStringNumber,
             headerFilter:"input", headerFilterFunc: hf_filterStringnumberWithOperator,
             bottomCalc:"sum", bottomCalcParams:{precision:2}, bottomCalcFormatter:"money", bottomCalcFormatterParams:{decimal: ",", thousand: ".", symbol:"€"}
 		},
@@ -379,9 +379,9 @@ $filterWidgetArray = array(
         vertrag_stunden: {visible: false},
         vertrag_betrag: {visible: false},
         mitarbeiter_uid: {visible: false, headerFilter:"input"},
-        bestellt: {align:"center", headerFilter:"input", mutator: mut_formatStringDate, tooltip: bestellt_tooltip},
-        erteilt: {align:"center", headerFilter:"input", mutator: mut_formatStringDate, tooltip: erteilt_tooltip},
-        akzeptiert: {align:"center", headerFilter:"input", mutator: mut_formatStringDate, tooltip: akzeptiert_tooltip},
+        bestellt: {hozAlign:"center", headerFilter:"input", mutator: mut_formatStringDate, tooltip: bestellt_tooltip},
+        erteilt: {hozAlign:"center", headerFilter:"input", mutator: mut_formatStringDate, tooltip: erteilt_tooltip},
+        akzeptiert: {hozAlign:"center", headerFilter:"input", mutator: mut_formatStringDate, tooltip: akzeptiert_tooltip},
         bestellt_von: {visible: false, headerFilter:"input"},
         erteilt_von: {visible: false, headerFilter:"input"},
         akzeptiert_von: {visible: false, headerFilter:"input"}
diff --git a/application/views/lehre/lehrauftrag/approveLehrauftragData.php b/application/views/lehre/lehrauftrag/approveLehrauftragData.php
index 5a9323108..7dd3822a6 100644
--- a/application/views/lehre/lehrauftrag/approveLehrauftragData.php
+++ b/application/views/lehre/lehrauftrag/approveLehrauftragData.php
@@ -393,21 +393,21 @@ $filterWidgetArray = array(
         person_id: {visible: false, headerFilter:"input"},
         lv_oe_kurzbz: {visible: false, headerFilter:"input"},
         lektor: {headerFilter:"input", widthGrow: 2},
-        stunden: {align:"right",  formatter: form_formatNulltoStringNumber, formatterParams:{precision:2},
+        stunden: {hozAlign:"right",  formatter: form_formatNulltoStringNumber, formatterParams:{precision:2},
             headerFilter:"input", headerFilterFunc: hf_filterStringnumberWithOperator,
             bottomCalc:"sum", bottomCalcParams:{precision:2}},
-		stundensatz: {visible: true, align:"right", formatter: form_formatNulltoStringNumber,
+		stundensatz: {visible: true, hozAlign:"right", formatter: form_formatNulltoStringNumber,
 			headerFilter:"input", headerFilterFunc: hf_filterStringnumberWithOperator},
-        betrag: {align:"right", formatter: form_formatNulltoStringNumber,
+        betrag: {hozAlign:"right", formatter: form_formatNulltoStringNumber,
             headerFilter:"input", headerFilterFunc: hf_filterStringnumberWithOperator,
             bottomCalc:"sum", bottomCalcParams:{precision:2}, bottomCalcFormatter:"money", bottomCalcFormatterParams:{decimal: ",", thousand: ".", symbol:"€"}},
         vertrag_id: {visible: false},
         vertrag_stunden: {visible: false},
         vertrag_betrag: {visible: false},
         mitarbeiter_uid: {visible: false, headerFilter:"input"},
-        bestellt: {align:"center", headerFilter:"input", mutator: mut_formatStringDate, tooltip: bestellt_tooltip},
-        erteilt: {align:"center", headerFilter:"input", mutator: mut_formatStringDate, tooltip: erteilt_tooltip},
-        akzeptiert: {align:"center", headerFilter:"input", mutator: mut_formatStringDate, tooltip: akzeptiert_tooltip},
+        bestellt: {hozAlign:"center", headerFilter:"input", mutator: mut_formatStringDate, tooltip: bestellt_tooltip},
+        erteilt: {hozAlign:"center", headerFilter:"input", mutator: mut_formatStringDate, tooltip: erteilt_tooltip},
+        akzeptiert: {hozAlign:"center", headerFilter:"input", mutator: mut_formatStringDate, tooltip: akzeptiert_tooltip},
         bestellt_von: {visible: false, headerFilter:"input"},
         erteilt_von: {visible: false, headerFilter:"input"},
         akzeptiert_von: {visible: false, headerFilter:"input"},
diff --git a/application/views/lehre/lehrauftrag/cancelledLehrauftragData.php b/application/views/lehre/lehrauftrag/cancelledLehrauftragData.php
index a3efb66b3..57ed579fa 100644
--- a/application/views/lehre/lehrauftrag/cancelledLehrauftragData.php
+++ b/application/views/lehre/lehrauftrag/cancelledLehrauftragData.php
@@ -83,16 +83,16 @@ $tableWidgetArray = array(
         vertragstyp_kurzbz: {minWidth: 200},
         bezeichnung: {minWidth: 200},
         vertragsstunden: {
-            align:"right", formatter: form_formatNulltoStringNumber, formatterParams:{precision:1},
+            hozAlign:"right", formatter: form_formatNulltoStringNumber, formatterParams:{precision:1},
             bottomCalc:"sum", bottomCalcParams:{precision:1},
             minWidth: 200
         },
         betrag: {
-            align:"right", formatter: form_formatNulltoStringNumber,
+            hozAlign:"right", formatter: form_formatNulltoStringNumber,
             bottomCalc:"sum", bottomCalcParams:{precision:2}, bottomCalcFormatter:"money", bottomCalcFormatterParams:{decimal: ",", thousand: ".", symbol:"€"},
             minWidth: 200
         },
-        storniert: {align:"center", mutator: mut_formatStringDate, tooltip: storniert_tooltip, minWidth: 200},
+        storniert: {hozAlign:"center", mutator: mut_formatStringDate, tooltip: storniert_tooltip, minWidth: 200},
         storniert_von: {visible: false},
         letzterStatus_vorStorniert: {visible: false}
     }', // col properties
diff --git a/application/views/lehre/lehrauftrag/orderLehrauftragData.php b/application/views/lehre/lehrauftrag/orderLehrauftragData.php
index fd756ffb7..f5b5cf6ce 100644
--- a/application/views/lehre/lehrauftrag/orderLehrauftragData.php
+++ b/application/views/lehre/lehrauftrag/orderLehrauftragData.php
@@ -422,12 +422,12 @@ $filterWidgetArray = array(
         person_id: {visible: false, headerFilter:"input"},
         lv_oe_kurzbz: {headerFilter:"input"},
         lektor: {headerFilter:"input", widthGrow: 2},
-        stunden: {align:"right", formatter: form_formatNulltoStringNumber, formatterParams:{precision:2},
+        stunden: {hozAlign:"right", formatter: form_formatNulltoStringNumber, formatterParams:{precision:2},
             headerFilter:"input", headerFilterFunc: hf_filterStringnumberWithOperator,
             bottomCalc:"sum", bottomCalcParams:{precision:2}},
-        stundensatz: {visible: true, align:"right", formatter: form_formatNulltoStringNumber,
+        stundensatz: {visible: true, hozAlign:"right", formatter: form_formatNulltoStringNumber,
             headerFilter:"input", headerFilterFunc: hf_filterStringnumberWithOperator},
-        betrag: {align:"right", formatter: form_formatNulltoStringNumber,
+        betrag: {hozAlign:"right", formatter: form_formatNulltoStringNumber,
             headerFilter:"input", headerFilterFunc: hf_filterStringnumberWithOperator,
             bottomCalc:"sum", bottomCalcParams:{precision:2}, bottomCalcFormatter:"money",
             bottomCalcFormatterParams:{decimal: ",", thousand: ".", symbol:"€"}},
@@ -435,9 +435,9 @@ $filterWidgetArray = array(
         vertrag_stunden: {visible: false},
         vertrag_betrag: {visible: false},
         mitarbeiter_uid: {visible: false, headerFilter:"input"},
-        bestellt: {align:"center", headerFilter:"input", mutator: mut_formatStringDate, tooltip: bestellt_tooltip},
-        erteilt: {align:"center", headerFilter:"input", mutator: mut_formatStringDate, tooltip: erteilt_tooltip},
-        akzeptiert: {align:"center", headerFilter:"input", mutator: mut_formatStringDate, tooltip: akzeptiert_tooltip},
+        bestellt: {hozAlign:"center", headerFilter:"input", mutator: mut_formatStringDate, tooltip: bestellt_tooltip},
+        erteilt: {hozAlign:"center", headerFilter:"input", mutator: mut_formatStringDate, tooltip: erteilt_tooltip},
+        akzeptiert: {hozAlign:"center", headerFilter:"input", mutator: mut_formatStringDate, tooltip: akzeptiert_tooltip},
         bestellt_von: {visible: false, headerFilter:"input"},
         erteilt_von: {visible: false, headerFilter:"input"},
         akzeptiert_von: {visible: false, headerFilter:"input"}

From 6af2a0116605c8f07b7f855b19a294c5340b1079 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 4 Apr 2024 09:55:41 +0200
Subject: [PATCH 0549/1461] tabulator5 migration changes

---
 .../reviewAnrechnungUebersichtData.php          |  6 +++---
 .../lehre/lehrauftrag/acceptLehrauftragData.php |  1 -
 .../lehrauftrag/cancelledLehrauftragData.php    |  7 +------
 .../js/lehre/lehrauftrag/acceptLehrauftrag.js   | 17 +++++++++++++----
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/application/views/lehre/anrechnung/reviewAnrechnungUebersichtData.php b/application/views/lehre/anrechnung/reviewAnrechnungUebersichtData.php
index 6bdd796a4..1d17af2ee 100644
--- a/application/views/lehre/anrechnung/reviewAnrechnungUebersichtData.php
+++ b/application/views/lehre/anrechnung/reviewAnrechnungUebersichtData.php
@@ -195,14 +195,14 @@ $filterWidgetArray = array(
 		studiengang_kz: {visible: false, headerFilter:"input"},
 		stg_bezeichnung: {headerFilter:"input"},
 		lv_bezeichnung: {headerFilter:"input"},
-		ects: {headerFilter:"input", align:"center"},
+		ects: {headerFilter:"input", hozAlign:"center"},
 		student: {headerFilter:"input"},
 		begruendung: {headerFilter:"input"},
 		zgv: {headerFilter:"input"},
 		dokument_bezeichnung: {headerFilter:"input", formatter:"link", formatterParams: paramLookup_dokBez},
 		anmerkung_student: {headerFilter:"input"},
-		antragsdatum: {align:"center", headerFilter:"input", mutator: mut_formatStringDate},
-		empfehlung_anrechnung: {headerFilter:"input", align:"center", formatter: format_empfehlung_anrechnung, headerFilterFunc: hf_filterTrueFalse},
+		antragsdatum: {hozAlign:"center", headerFilter:"input", mutator: mut_formatStringDate},
+		empfehlung_anrechnung: {headerFilter:"input", hozAlign:"center", formatter: format_empfehlung_anrechnung, headerFilterFunc: hf_filterTrueFalse},
 		status_kurzbz: {visible: false, headerFilter:"input"},
 		status_bezeichnung: {headerFilter:"input"}
 	 }', // col properties
diff --git a/application/views/lehre/lehrauftrag/acceptLehrauftragData.php b/application/views/lehre/lehrauftrag/acceptLehrauftragData.php
index a69bcb51f..fcc4759db 100644
--- a/application/views/lehre/lehrauftrag/acceptLehrauftragData.php
+++ b/application/views/lehre/lehrauftrag/acceptLehrauftragData.php
@@ -330,7 +330,6 @@ $filterWidgetArray = array(
 		height: func_height(this),
 		layout: "fitColumns",           // fit columns to width of table
 		autoResize: false, 				// prevent auto resizing of table (false to allow adapting table size when cols are (de-)activated
-	    
         index: "row_index",             // assign specific column as unique id (important for row indexing)
         selectable: true,               // allow row selection
         selectableRangeMode: "click",   // allow range selection using shift end click on end of range
diff --git a/application/views/lehre/lehrauftrag/cancelledLehrauftragData.php b/application/views/lehre/lehrauftrag/cancelledLehrauftragData.php
index 57ed579fa..f446cae25 100644
--- a/application/views/lehre/lehrauftrag/cancelledLehrauftragData.php
+++ b/application/views/lehre/lehrauftrag/cancelledLehrauftragData.php
@@ -70,12 +70,7 @@ $tableWidgetArray = array(
         selectableCheck: function(row){
             return func_selectableCheck(row);
         },
-         renderComplete:function(){
-            func_renderComplete(this);
-        },
-        tableBuilt: function(){
-            func_tableBuilt(this);
-        },
+         
     }', // tabulator properties
 	'datasetRepFieldsDefs' => '{
         vertrag_id: {visible: false},
diff --git a/public/js/lehre/lehrauftrag/acceptLehrauftrag.js b/public/js/lehre/lehrauftrag/acceptLehrauftrag.js
index e9dbe4263..f50229d49 100644
--- a/public/js/lehre/lehrauftrag/acceptLehrauftrag.js
+++ b/public/js/lehre/lehrauftrag/acceptLehrauftrag.js
@@ -466,10 +466,19 @@ $(function() {
         func_tableBuilt(tabulatorInstance)
 		
         // using the tabulator instance instead of the jquery object because the site loads two different tabulator tables
-		tabulatorInstance.on("renderComplete",()=>{func_renderComplete(tabulatorInstance)});
-		tabulatorInstance.on("renderStarted",()=>{func_renderStarted(tabulatorInstance)});
-		tabulatorInstance.on("rowUpdated",(row)=>{func_rowUpdated(row)});
-       
+		let uniqueTableID = tabulatorInstance.parentElement.parentElement.parentElement.attributes.tableUniqueId.value;
+		switch(uniqueTableID){
+			case "cancelledLehrauftrag": 
+				tabulatorInstance.on("renderComplete",()=>{func_renderComplete(tabulatorInstance)});
+				break;
+			case "acceptLehrauftrag": 
+				tabulatorInstance.on("renderComplete",()=>{func_renderComplete(tabulatorInstance)});
+				tabulatorInstance.on("renderStarted",()=>{func_renderStarted(tabulatorInstance)});
+				tabulatorInstance.on("rowUpdated",(row)=>{func_rowUpdated(row)});
+				break;
+			default: break;
+		}
+		
     });
 
 	var canPromise = !! window.Promise;

From c1cb2904e6b497ec5e19da7301d9ec01c00dc74d Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 4 Apr 2024 15:02:47 +0200
Subject: [PATCH 0550/1461] adding phrases for Profil and ProfilUpdate

---
 public/js/apps/Cis/Profil.js                  |   2 +
 .../Cis/Profil/MitarbeiterProfil.js           |  18 +-
 .../Cis/Profil/MitarbeiterViewProfil.js       |  44 +-
 .../Cis/Profil/ProfilComponents/Adresse.js    |  12 +-
 .../ProfilComponents/FetchProfilUpdates.js    |  14 +-
 .../ProfilComponents/FhAusweisStatus.js       |   4 +-
 .../Cis/Profil/ProfilComponents/Kontakt.js    |  10 +-
 .../Profil/ProfilComponents/Mailverteiler.js  |   6 +-
 .../Profil/ProfilComponents/ProfilEmails.js   |  12 +-
 .../ProfilComponents/ProfilInformation.js     |   9 +-
 .../Cis/Profil/ProfilComponents/QuickLinks.js |  24 +-
 .../Cis/Profil/ProfilModal/EditProfil.js      |   6 +-
 .../EditProfilComponents/EditAdresse.js       |  24 +-
 .../EditProfilComponents/EditKontakt.js       |  42 +-
 .../EditProfilComponents/Status.js            |   8 +-
 .../EditProfilComponents/TextInputDokument.js |   6 +-
 .../js/components/Cis/Profil/StudentProfil.js |  56 +-
 .../Cis/Profil/StudentViewProfil.js           |  53 +-
 system/phrasesupdate.php                      | 670 +++++++++++++++++-
 19 files changed, 767 insertions(+), 253 deletions(-)

diff --git a/public/js/apps/Cis/Profil.js b/public/js/apps/Cis/Profil.js
index 40bedaf97..62905e2d9 100755
--- a/public/js/apps/Cis/Profil.js
+++ b/public/js/apps/Cis/Profil.js
@@ -4,6 +4,7 @@ import ViewStudentProfil from "../../components/Cis/Profil/StudentViewProfil.js"
 import ViewMitarbeiterProfil from "../../components/Cis/Profil/MitarbeiterViewProfil.js";
 import fhcapifactory from "../api/fhcapifactory.js";
 import Loading from "../../components/Loader.js";
+import Phrasen from "../../plugin/Phrasen.js";
 
 Vue.$fhcapi = fhcapifactory;
 Vue.$collapseFormatter = function (data) {
@@ -367,4 +368,5 @@ const profilApp = Vue.createApp({
 });
 
 profilApp.use(primevue.config.default, { zIndex: { overlay: 9999 } });
+profilApp.use(Phrasen);
 profilApp.mount("#content");
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 952dcd948..db4b2253f 100755
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -234,7 +234,7 @@ export default {
   template: /*html*/ ` 
   <div class="container-fluid text-break fhc-form"  >
   
-    <edit-profil v-if="showModal" ref="editModal" @hideBsModal="hideEditProfilModal" :value="JSON.parse(JSON.stringify(editData))" title="Profil bearbeiten"></edit-profil>
+    <edit-profil v-if="showModal" ref="editModal" @hideBsModal="hideEditProfilModal" :value="JSON.parse(JSON.stringify(editData))" title="$p.t('profil','profilBearbeiten')"></edit-profil>
           <div class="row">
           
               <div  class="d-md-none col-12 ">
@@ -255,7 +255,7 @@ export default {
                   <div class="col-auto">
                     <i class="fa fa-edit"></i>
                   </div>
-                  <div class="col-auto">Bearbeiten</div>
+                  <div class="col-auto">{{$p.t('ui','bearbeiten')}}</div>
                 </div>
               </button>
               </div>
@@ -289,7 +289,7 @@ export default {
                      <div class="col">
                      
                      <!-- PROFIL INFORMATION -->
-                     <profil-information title="MitarbeiterIn" :data="profilInformation"></profil-information>
+                     <profil-information title="$p.t('profil','mitarbeiterIn')" :data="profilInformation"></profil-information>
 
 
 		                 </div>
@@ -300,7 +300,7 @@ export default {
                      <div  class=" col-lg-12">
         
                     <!-- MITARBEITER INFO -->
-                    <role-information title="Mitarbeiter Information" :data="roleInformation"></role-information>
+                    <role-information title="$p.t('profil','mitarbeiterInformation')" :data="roleInformation"></role-information>
 
 
                      </div> 
@@ -328,7 +328,7 @@ export default {
                       
                       <div class="card">
                           <div class="card-header">
-                            Private Kontakte
+                            {{$p.t('profil','privateKontakte')}}
                           </div>
                           <div class="card-body ">
                             
@@ -351,7 +351,7 @@ export default {
                       <!-- PRIVATE ADRESSEN-->
 
                       <div class="card">
-                          <div class="card-header">Private Adressen</div>
+                          <div class="card-header">{{$p.t('profil','privateAdressen')}}</div>
                             <div class="card-body">
                             
                               <div class="gy-3 row ">
@@ -377,14 +377,14 @@ export default {
 
                   <!-- FUNKTIONEN TABELLE -->
                  
-                    <core-filter-cmpt title="Funktionen"  ref="funktionenTable" :tabulator-options="funktionen_table_options"  tableOnly :sideMenu="false" />
+                    <core-filter-cmpt title="$p.t('person','funktionen')"  ref="funktionenTable" :tabulator-options="funktionen_table_options"  tableOnly :sideMenu="false" />
                   
                     </div>
 
                   <div class="col-12 mb-4" >
 
                   <!-- BETRIEBSMITTEL TABELLE -->
-                    <core-filter-cmpt title="Entlehnte Betriebsmittel"  ref="betriebsmittelTable" :tabulator-options="betriebsmittel_table_options" tableOnly :sideMenu="false" />
+                    <core-filter-cmpt title="$p.t('profil','entlehnteBetriebsmittel')"  ref="betriebsmittelTable" :tabulator-options="betriebsmittel_table_options" tableOnly :sideMenu="false" />
                   </div>
 
                 </div>
@@ -418,7 +418,7 @@ export default {
                     <div class="col-auto">
                       <i class="fa fa-edit"></i>
                     </div>
-                    <div class="col-auto">Bearbeiten</div>
+                    <div class="col-auto">{{$p.t('ui','bearbeiten')}}</div>
                   </div>
                 </button>
                 </div>
diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
index 659a1ed52..53d5267c8 100755
--- a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
@@ -145,7 +145,7 @@ export default {
    
   },
 
-  template: ` 
+  template: /*html*/` 
 
   <div class="container-fluid text-break fhc-form"  >
     <!-- ROW --> 
@@ -158,10 +158,6 @@ export default {
               </div>
               <!-- END OF HIDDEN QUCK LINKS -->
 
-
-            
-
-
               <!-- MAIN PANNEL -->
               <div class="col-sm-12 col-md-8 col-xxl-9 ">
                 <!-- ROW WITH PROFIL IMAGE AND INFORMATION -->
@@ -174,27 +170,13 @@ export default {
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<!-- FIRST KAESTCHEN -->
-                      <div  class="col-lg-12 col-xl-6 ">
+                     <!-- FIRST KAESTCHEN -->
+                     <div  class="col-lg-12 col-xl-6 ">
                      <div class="row mb-4">
                      <div class="col">
                      
                         <!-- Profil Informationen -->
-                        <profil-information title="MitarbeiterIn" :data="profilInformation"></profil-information>
+                        <profil-information title="$p.t('profil','mitarbeiterIn')" :data="profilInformation"></profil-information>
                      
 		                </div>
                     </div>
@@ -204,11 +186,6 @@ export default {
                       <!-- START OF SECOND PROFIL  INFORMATION COLUMN -->
                      
 
-
-                     
-
-
-              
                     <!-- END OF PROFIL INFORMATION ROW -->
                     <!-- INFORMATION CONTENT END -->
                     </div>
@@ -230,7 +207,7 @@ export default {
                     <div  class=" col-lg-12">
        
                     <!-- roleInformation -->
-                    <role-information :data="roleInformation" title="Mitarbeiter Information"></role-information>
+                    <role-information :data="roleInformation" title="$p.t('profil','mitarbeiterInformation')"></role-information>
 
                     </div>  
                            
@@ -262,7 +239,7 @@ export default {
 
                 <!-- FIRST TABLE -->
                   <div class="col-12 mb-4" >
-                    <core-filter-cmpt title="Funktionen"  ref="funktionenTable" :tabulator-options="funktionen_table_options"  tableOnly :sideMenu="false" />
+                    <core-filter-cmpt title="$p.t('person','funktionen')"  ref="funktionenTable" :tabulator-options="funktionen_table_options"  tableOnly :sideMenu="false" />
                   </div>
 
                
@@ -270,18 +247,9 @@ export default {
                 <!-- END OF THE ROW WITH THE TABLES UNDER THE PROFIL INFORMATION -->
                 </div>
 
-
-
-
-
-
-
               <!-- END OF MAIN CONTENT COL -->
               </div>
 
-
-
-
               <!-- START OF SIDE PANEL -->
               <div  class="col-md-4 col-xxl-3 col-sm-12 text-break" >
 
diff --git a/public/js/components/Cis/Profil/ProfilComponents/Adresse.js b/public/js/components/Cis/Profil/ProfilComponents/Adresse.js
index c51442647..8da928d32 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/Adresse.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/Adresse.js
@@ -13,7 +13,7 @@ export default {
     created(){
         
     },
-    template:`
+    template:/*html*/`
     
     <div class="gy-2 row justify-content-center align-items-center">
     
@@ -27,7 +27,7 @@ export default {
         <div  class="col-11 col-sm-8 col-xl-11 col-xxl-8 order-1">
 
         <div class="form-underline ">
-        <div class="form-underline-titel">Strasse</div>
+        <div class="form-underline-titel">{{$p.t('person','strasse')}}</div>
         <span class="form-underline-content">{{data.strasse}} </span>
         </div>
 
@@ -42,7 +42,7 @@ export default {
             
 
             <div class="form-underline ">
-            <div class="form-underline-titel">Typ</div>
+            <div class="form-underline-titel">{{$p.t('global','typ')}}</div>
             <span class="form-underline-content">{{data.typ}} </span>
             </div>
 
@@ -50,20 +50,20 @@ export default {
         <div  class="offset-1 order-3 order-sm-3 col-11 col-sm-6  col-xl-7 col-xxl-6 ">
             
             <div class="form-underline ">
-            <div class="form-underline-titel">Ort</div>
+            <div class="form-underline-titel">{{$p.t('person','ort')}}</div>
             <span class="form-underline-content">{{data.ort}} </span>
             </div>
         </div>
         <div  class=" offset-1 offset-sm-0 order-4 order-sm-2 order-xl-4 order-xxl-2 col-11 col-sm-3 col-xl-4 col-xxl-3 ">
             <div class="form-underline ">
-            <div class="form-underline-titel">PLZ</div>
+            <div class="form-underline-titel">{{$p.t('person','plz')}}</div>
             <span class="form-underline-content">{{data.plz}} </span>
             </div>
         </div>
 
         <div v-if="withZustelladresse" class="order-5 offset-1 col-11">
         <div class="form-underline ">
-        <div class="form-underline-titel">Zustelladresse</div>
+        <div class="form-underline-titel">{{$p.t('person','zustelladresse')}}</div>
             <div class="ms-2 form-check ">
                 <input class="form-check-input" type="checkbox"  @click.prevent :checked="data.zustelladresse"  >
                
diff --git a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
index 9ca6889ef..a23956f7f 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
@@ -16,7 +16,7 @@ export default {
     return {
       showUpdateModal: false,
       content: null,
-      editProfilTitle: "Profil bearbeiten",
+      editProfilTitle: this.$p.t('profil','profilBearbeiten'),
     };
   },
 
@@ -224,22 +224,22 @@ export default {
 
   computed: {},
   
-  template: `
+  template: /*html*/`
     <div  class="card " >
     
     <edit-profil v-if="showUpdateModal" ref="updateEditModal" @hideBsModal="hideEditProfilModal" :value="content" :title="editProfilTitle"></edit-profil>
                       <div class="card-header">
-                      Profil Updates
+                      {{$p.t('profilUpdate','profilUpdates')}}
                       </div>
                       <div class="card-body" >
     <div class="table-responsive text-nowrap">
         <table class="m-0  table  table-hover">
             <thead >
                 <tr >
-                <th scope="col">Topic</th>
-                <th scope="col">Status</th>
-                <th scope="col">Date</th>
-                <th class="text-center" scope="col">Action</th>
+                <th scope="col">{{$p.t('profilUpdate','topic')}}</th>
+                <th scope="col">{{$p.t('global','status')}}</th>
+                <th scope="col">{{$p.t('global','datum')}}</th>
+                <th class="text-center" scope="col">{{$p.t('ui','aktion')}}</th>
                 </tr>
             </thead>
             <tbody>
diff --git a/public/js/components/Cis/Profil/ProfilComponents/FhAusweisStatus.js b/public/js/components/Cis/Profil/ProfilComponents/FhAusweisStatus.js
index 25bd41708..15da181c2 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/FhAusweisStatus.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/FhAusweisStatus.js
@@ -9,10 +9,10 @@ export default {
 
         }
     },
-    template: `
+    template: /*html*/`
     <div class="card">
         <div class="card-body">
-        <span>Der FH Ausweis ist am <b>{{data}}</b> ausgegeben worden.</span>
+        <span>{{$p.t('profil','fhAusweisStatus',data)}}</span>
         </div>
     </div>`,
 }
\ No newline at end of file
diff --git a/public/js/components/Cis/Profil/ProfilComponents/Kontakt.js b/public/js/components/Cis/Profil/ProfilComponents/Kontakt.js
index 3bc7ecd72..7b5c25a0c 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/Kontakt.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/Kontakt.js
@@ -11,7 +11,7 @@ export default{
     created(){
 
     }, 
-    template:`
+    template:/*html*/`
     <div class="gy-2 row align-items-center justify-content-center">
     <div class="col-1 text-center" >
     
@@ -21,20 +21,17 @@ export default{
         
         <!-- rendering KONTAKT emails -->
    
-        
         <div  class="form-underline ">
         <div class="form-underline-titel">{{data.kontakttyp}}</div>
         <a v-if="data.kontakt.includes('@')" role="link" :aria-disabled="view?true:false" :href="!view?('mailto:'+data.kontakt):null" class="form-underline-content">{{data.kontakt}} </a>
         <a v-else role="link" :aria-disabled="view?true:false" :href="!view?('tel:'+data.kontakt):null" class="form-underline-content">{{data.kontakt}} </a>
         </div>
           
-       
-
     </div>
     <div v-if="data?.anmerkung" class="offset-1 offset-md-0 offset-xl-1 offset-xxl-0 order-2 order-sm-1 col-10  col-md-4   col-xl-9 col-xxl-4   ">
         
     <div  class="form-underline ">
-    <div class="form-underline-titel">Anmerkung</div>
+    <div class="form-underline-titel">{{$p.t('global','anmerkung')}}</div>
     <span  class="form-underline-content">{{data.anmerkung}} </span>
     </div>
 
@@ -49,8 +46,5 @@ export default{
 </div>
   </div>
     
-    
-    
-    
     `,
 };
\ No newline at end of file
diff --git a/public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js b/public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js
index 15f4efcf8..2d612b661 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js
@@ -1,12 +1,12 @@
 export default {
     props: {
         data: Object,
-        title: { type: String, default: "Mailverteilers" },
+        title: { type: String, default: this.$p.t('profil','mailverteiler') },
     },
     data() {
         return {};
     },
-    template: `
+    template: /*html*/`
     <div class="card">
    
         <div class="card-header">
@@ -14,7 +14,7 @@ export default {
         </div>
         <div class="card-body">
         
-        <h6 class="card-title">Sie sind Mitglied in folgenden Verteilern:</h6>
+        <h6 class="card-title">{{$p.t('profil','mailverteilerMitglied')}}</h6>
         <div  class="card-text row text-break mb-2" v-for="verteiler in data">
             <div class="col-12 ">
             <div class="row">  
diff --git a/public/js/components/Cis/Profil/ProfilComponents/ProfilEmails.js b/public/js/components/Cis/Profil/ProfilComponents/ProfilEmails.js
index 5de2be8ad..f24a3778a 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/ProfilEmails.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/ProfilEmails.js
@@ -7,7 +7,7 @@ export default {
     props:{
         title:{
             type:String,
-            default:"Mails",
+            default:this.$p.t('person','email'),
         },
         data:{
             type:Array,
@@ -21,18 +21,8 @@ export default {
    
     <div class="card-body">
 
-
-
-   
-
-      
-
-      
-
       <!-- HIER SIND DIE EMAILS -->
   
-
-  
       <div  class="gy-3 row justify-content-center ">
       <div v-for="email in data" class="col-12 ">
   
diff --git a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
index fe3b18380..418ceccc5 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
@@ -57,15 +57,8 @@ export default {
     </div>
     <div class="card-body">
     
-     
-
-
-
 <div  class="gy-3 row justify-content-center align-items-center">
-
-
-
-
+=
 <!-- SQUEEZING THE IMAGE INSIDE THE FIRST INFORMATION COLUMN -->
 <!-- START OF THE FIRST ROW WITH THE PROFIL IMAGE -->
 <div class="col-12 col-sm-6 mb-2">
diff --git a/public/js/components/Cis/Profil/ProfilComponents/QuickLinks.js b/public/js/components/Cis/Profil/ProfilComponents/QuickLinks.js
index 39f744c52..ed121b8d8 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/QuickLinks.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/QuickLinks.js
@@ -7,7 +7,7 @@ export default{
         },
         title:{
             type:String,
-            default: "Quick Links",
+            default: this.$p.t('profil','quickLinks'),
         },
         mobile:{
             type:Boolean,
@@ -28,28 +28,22 @@ export default{
 
         }
     },
-    template:`
+    template:/*html*/`
     <div class="card">
     <template v-if="mobile">
     
-                
-               
                <button class="btn btn-outline-primary"  data-bs-toggle="collapse"  data-bs-target="#quickLinks" :aria-expanded="collapseOpen" aria-controls="quickLinks" >
                {{title}}
                <i class="fa " :class="collapseOpen?'fa-chevron-up':'fa-chevron-down'"></i> 
                </button>
-             
-                
-               
-                 
-   
+    
                 <div @[\`show.bs.collapse\`]="collapseOpen=true;" @[\`hide.bs.collapse\`]="collapseOpen=false;" class="mt-1 collapse" id="quickLinks">
                   
                   <div class="list-group">
                    
-                    <a href="#" class="list-group-item list-group-item-action">Zeitwünsche</a>
-                    <a href="#" class="list-group-item list-group-item-action">Lehrveranstaltungen</a>
-                    <a href="#" class="list-group-item list-group-item-action ">Zeitsperren</a>
+                    <a href="#" class="list-group-item list-group-item-action">{{$p.t('profil','zeitwuensche')}}</a>
+                    <a href="#" class="list-group-item list-group-item-action">{{$p.t('profil','lehrveranstaltungen')}}</a>
+                    <a href="#" class="list-group-item list-group-item-action ">{{$p.t('profil','zeitsperren')}}</a>
                   </div>
                   </div>
                 
@@ -63,9 +57,9 @@ export default{
     <div class="card-body">
     
      
-      <a style="text-decoration:none" class="my-1 d-block" href="#">Zeitwuensche</a>
-      <a style="text-decoration:none" class="my-1 d-block" href="#">Lehrveranstaltungen</a>
-      <a style="text-decoration:none" class="my-1 d-block" href="#">Zeitsperren</a>
+      <a style="text-decoration:none" class="my-1 d-block" href="#">{{$p.t('profil','zeitwuensche')}}</a>
+      <a style="text-decoration:none" class="my-1 d-block" href="#">{{$p.t('profil','lehrveranstaltungen')}}</a>
+      <a style="text-decoration:none" class="my-1 d-block" href="#">{{$p.t('profil','zeitsperren')}}</a>
 
     </div>
   
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfil.js b/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
index 39705baa0..6da5113a9 100755
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
@@ -157,7 +157,7 @@ export default {
   popup(options) {
     return BsModal.popup.bind(this)(null, options);
   },
-  template: `
+  template: /*html*/`
   <bs-modal v-show="!loading" ref="modalContainer" v-bind="$props" body-class="" dialog-class="modal-lg" class="bootstrap-alert" backdrop="false" >
     
   <template v-if="title" v-slot:title>
@@ -179,8 +179,8 @@ export default {
     <template  v-slot:footer>
     <loader  ref="loaderRef" :timeout="0"></loader>
         
-    <button class="btn btn-outline-danger " @click="hide">Abbrechen</button>    
-      <button :disabled="!profilUpdate"  @click="submitProfilChange" role="button" class="btn btn-primary">Senden</button>
+    <button class="btn btn-outline-danger " @click="hide">{{$p.t('ui','cancel')}}</button>    
+      <button :disabled="!profilUpdate"  @click="submitProfilChange" role="button" class="btn btn-primary">{{$p.t('ui','senden')}}</button>
     </template>
     <!-- end of optional footer --> 
   </bs-modal>`,
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js
index 3220818b5..19d5b8c92 100755
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js
@@ -107,7 +107,7 @@ export default {
      <div v-if="showZustellAdressenWarning" class="col-12 ">
      <div class="card bg-danger mx-2">
      <div class="card-body text-white ">
-     <span>!Achtung: Eine deiner Adressen ist bereits als Zustelladresse gespeichert, sind sie sicher, dass sie die aktuelle Adresse stattdessen als Zustelladresse speichern wollen?</span>
+     <span>{{$p.t('profilUpdate','zustelladresseWarning')}}</span>
      </div>
      </div>
      </div>
@@ -120,7 +120,7 @@ export default {
             <div class="form-check mb-2">
                 <input class="form-check-input" type="checkbox" @change="updateValue($event,'zustelladresse')" :checked="data.zustelladresse" id="flexCheckDefault">
                 <label class="form-check-label" for="flexCheckDefault">
-                    Zustelladresse
+                    {{$p.t('person','zustelladresse')}}
                 </label>
             </div>
         
@@ -134,7 +134,7 @@ export default {
         <div  class="col-12 col-sm-9 col-xl-12 col-xxl-9 order-1">
 
         <div class="form-underline ">
-        <div class="form-underline-titel">Strasse*</div>
+        <div class="form-underline-titel">{{$p.t('person','strasse')}}*</div>
         <input  class="form-control" :value="data.strasse" @input="updateValue($event,'strasse')" :placeholder="data.strasse">
         
         </div>
@@ -145,14 +145,14 @@ export default {
         <div class=" order-2 order-sm-4 order-xl-3 order-xxl-4 col-12 col-sm-5  col-xl-8 col-xxl-5  ">
             
             <div  class="form-underline">
-                <div class="form-underline-titel">Kontakttyp*</div>
+                <div class="form-underline-titel">{{$p.t('profilUpdate','kontaktTyp')}}*</div>
         
                 <select  :value="data.typ" @change="updateValue($event,'typ')" class="form-select" aria-label="Select Kontakttyp">
                     <option selected></option>
-                    <option value="Nebenwohnsitz">Nebenwohnsitz</option>
-                    <option value="Hauptwohnsitz">Hauptwohnsitz</option>
-                    <option v-if="isMitarbeiter" value="Homeoffice">Homeoffice</option>
-                    <option v-if="isMitarbeiter" value="Rechnungsadresse">Rechnungsadresse</option>
+                    <option value="Nebenwohnsitz">{{$p.t('profilUpdate','nebenwohnsitz')}}</option>
+                    <option value="Hauptwohnsitz">{{$p.t('profilUpdate','hauptwohnsitz')}}</option>
+                    <option v-if="isMitarbeiter" value="Homeoffice">{{$p.t('profilUpdate','homeoffice')}}</option>
+                    <option v-if="isMitarbeiter" value="Rechnungsadresse">{{$p.t('profilUpdate','rechnungsadresse')}}</option>
                   
                 </select>    
             </div>
@@ -166,14 +166,14 @@ export default {
         <div  class="order-3 order-sm-3 order-xl-2 order-xxl-3 col-12 col-sm-7 col-xl-12 col-xxl-7 " >
             
             <div class="form-underline ">
-            <div class="form-underline-titel">Ort*</div>
+            <div class="form-underline-titel">{{$p.t('person','ort')}}*</div>
             <input  class="form-control" :value="data.ort" @input="updateValue($event,'ort')" :placeholder="data.ort">
         
             </div>
         </div>
         <div  class="order-4 order-sm-2 order-xl-4 order-xxl-2 col-12 col-sm-3 col-xl-4 col-xxl-3 ">
             <div class="form-underline ">
-            <div class="form-underline-titel">PLZ*</div>
+            <div class="form-underline-titel">{{$p.t('person','plz')}}*</div>
     
             <input  class="form-control" :value="data.plz" @input="updateValue($event,'plz')" @input="getGemeinde" :placeholder="data.plz">
         
@@ -182,13 +182,13 @@ export default {
         <div class="col-6 order-5">
        
         <div class="form-underline ">
-        <div class="form-underline-titel">Gemeinde*</div>
+        <div class="form-underline-titel">{{$p.t('person','gemeinde')}}*</div>
         <auto-complete class="w-100" v-model="data.gemeinde" dropdown :forceSelection="data.nation ==='A'?true:false" :suggestions="gemeinden" @complete="autocompleteSearch" ></auto-complete>
         </div>
         </div>
         <div class="col-6 order-5 ">
         <div class="form-underline ">
-        <div class="form-underline-titel">Nation*</div>
+        <div class="form-underline-titel">{{$p.t('person','nation')}}*</div>
             <select  :value="data.nation" @change="updateValue($event,'nation')" @change="getGemeinde" class="form-select" aria-label="Select Kontakttyp">
                 <option selected></option>
                 <option :value="nation.code" v-for="nation in nationenList">{{nation.langtext}}</option>
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditKontakt.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditKontakt.js
index 6b99ff955..03bd8dcd7 100755
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditKontakt.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditKontakt.js
@@ -57,7 +57,7 @@ export default {
     <div v-if="showZustellKontakteWarning" class="col-12 ">
     <div class="card bg-danger mx-2">
     <div class="card-body text-white ">
-    <span>!Achtung: Eine deiner Kontakte ist bereits als Zustellungskontakt gespeichert, sind sie sicher, dass sie den aktuellen Kontakt stattdessen als Zustellkontakt speichern wollen?</span>
+    <span>{{$p.t('profilUpdate','zustellkontakteWarning')}}</span>
     </div>
     </div>
     </div>
@@ -67,16 +67,16 @@ export default {
         
     
         <div  class="form-underline">
-            <div class="form-underline-titel">Kontakttyp</div>
+            <div class="form-underline-titel">{{$p.t('profilUpdate','kontaktTyp')}}</div>
     
             <select :value="data.kontakttyp" @change="updateValue($event,'kontakttyp')" class="form-select" aria-label="Select Kontakttyp">
                 <option selected></option>
-                <option value="email">E-mail</option>
-                <option value="telefon">Telefonnummer</option>
-                <option value="notfallkontakt">Notfallkontakt</option>
-                <option value="mobil">Mobiltelefonnummer</option>
-                <option value="homepage">Homepage</option>
-                <option value="fax">Faxnummer</option>
+                <option value="email">{{$p.t('person','email')}}</option>
+                <option value="telefon">{{$p.t('person','telefon')}}</option>
+                <option value="notfallkontakt">{{$p.t('profilUpdate','notfallkontakt')}}</option>
+                <option value="mobil">{{$p.t('profilUpdate','mobiltelefonnummer')}}</option>
+                <option value="homepage">{{$p.t('profilUpdate','homepage')}}</option>
+                <option value="fax">{{$p.t('profilUpdate','faxnummer')}}</option>
                 
             </select>    
         </div>
@@ -88,44 +88,26 @@ export default {
    
 
         <div class="form-underline">
-        <div class="form-underline-titel">{{data.kontakttyp?data.kontakttyp:'Kontakt'}}</div>
+        <div class="form-underline-titel">{{data.kontakttyp?data.kontakttyp:$p.t('global','kontakt')}}</div>
     
         <input :disabled="data.kontakttyp?false:true"  class="form-control"   :value="data.kontakt" @input="updateValue($event,'kontakt')" :placeholder="data.kontakt">
         </div>
 
-    
-          
-       
-
     </div>
     <div class="col-12">
         
     <div  class="form-underline">
-    <div class="form-underline-titel">Anmerkung</div>
+    <div class="form-underline-titel">{{$p.t('global','anmerkung')}}</div>
 
     <input  class="form-control" :value="data.anmerkung" @input="updateValue($event,'anmerkung')" :placeholder="data.anmerkung">
     </div>
 
-  
-
-  
     </div>
-    
-  
-  
   
     <div  class="d-flex flex-row justify-content-start col-12  allign-middle">
-        
-   
-    
-        <span style="opacity: 0.65; font-size: .85rem; " class="px-2">Zustellungs Kontakt</span>
+        <span style="opacity: 0.65; font-size: .85rem; " class="px-2">{{$p.t('profilUpdate','zustellungsKontakt')}}</span>
 
-        <input class="form-check-input " type="checkbox" :checked="data.zustellung" @change="updateValue($event,'zustellung')" id="flexCheckDefault">
-    
-    
- 
-
-   
+        <input class="form-check-input " type="checkbox" :checked="data.zustellung" @change="updateValue($event,'zustellung')" id="flexCheckDefault">   
     </div>
   </div>
     `,
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/Status.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/Status.js
index 5322e00f0..30795af1d 100755
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/Status.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/Status.js
@@ -46,19 +46,19 @@ export default {
       this.files = res.data;
     })
   },
-  template: `
+  template: /*html*/`
     <div class="row">
 
     <div class="col">
     <div  class="form-underline mb-2">
-    <div class="form-underline-titel">Status</div>
+    <div class="form-underline-titel">{{$p.t('global','status')}}</div>
     <span  class="form-underline-content">{{status}} </span>
     </div>
     </div>
 
     <div class="col">
     <div  class="form-underline mb-2">
-    <div class="form-underline-titel">Date</div>
+    <div class="form-underline-titel">{{$p.t('global','datum')}}</div>
     <span  class="form-underline-content">{{status_timestamp}} </span>
     </div>
     </div>
@@ -67,7 +67,7 @@ export default {
     <div class="row">
     <div class="col">
     <div v-if="status_message" class="form-underline mb-2 ">
-    <div class="form-underline-titel">Status message</div>
+    <div class="form-underline-titel">{{$p.t('profilUpdate','statusMessage')}}</div>
     <textarea  class="form-control" rows="4" disabled>{{status_message}} </textarea>
     </div>
     </div>
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/TextInputDokument.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/TextInputDokument.js
index 268751521..0f85867cc 100644
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/TextInputDokument.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/TextInputDokument.js
@@ -92,12 +92,12 @@ export default {
       this.dmsData = this.files;
     }
   },
-  template: `
+  template: /*html*/`
   
-    <p style="opacity:0.8" class="ms-2" v-if="withFiles && !updateID">Please update your {{data.titel}} and upload the corresponding Document of proof</p>
+    <p style="opacity:0.8" class="ms-2" v-if="withFiles && !updateID">{{$p.t('profilUpdate','profilUpdateInformationMessage',data.titel)}}</p>
 
     <div class="form-underline">
-    <div class="form-underline-titel">{{data.titel?data.titel:"titel"}}</div>
+    <div class="form-underline-titel">{{data.titel?data.titel:$p.t('global','titel')}}</div>
     
     <input  class="mb-2 form-control" @input="emitChanges"  v-model="data.value" :placeholder="data.value">
   
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index 821b4b960..0eb7e8770 100755
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -193,7 +193,7 @@ export default {
   template:/*html*/ ` 
 
   <div class="container-fluid text-break fhc-form"  >
-  <edit-profil v-if="showModal" ref="editModal" @hideBsModal="hideEditProfilModal" :value="JSON.parse(JSON.stringify(editData))" title="Profil bearbeiten" ></edit-profil>
+  <edit-profil v-if="showModal" ref="editModal" @hideBsModal="hideEditProfilModal" :value="JSON.parse(JSON.stringify(editData))" title="$p.t('profil','profilBearbeiten')" ></edit-profil>
     <!-- ROW --> 
           <div class="row">
           <!-- HIDDEN QUICK LINKS -->
@@ -215,7 +215,7 @@ export default {
                   <div class="col-2">
                     <i class="fa fa-edit"></i>
                   </div>
-                  <div class="col-10">Bearbeiten</div>
+                  <div class="col-10">{{$p.t('ui','bearbeiten')}}</div>
                 </div>
               </button>
               </div>
@@ -245,27 +245,12 @@ export default {
                     <!-- ROW WITH THE PROFIL INFORMATION --> 
                     <div class="row mb-4 ">
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
                     <div  class="col-lg-12 col-xl-6 ">
                     <div class="row mb-4">
                     <div class="col">
                     
                     <!-- PROFIL INFORMATION -->
-                    <profil-information title="StudentIn" :data="profilInformation"></profil-information>
+                    <profil-information title="$p.t('profil','studentIn')" :data="profilInformation"></profil-information>
 
 
                     </div>
@@ -276,7 +261,7 @@ export default {
                     <div  class=" col-lg-12">
        
                    <!-- MITARBEITER INFO -->
-                   <role-information title="Student Information" :data="roleInformation"></role-information>
+                   <role-information title="$p.t('profil','studentInformation')" :data="roleInformation"></role-information>
 
 
                     </div> 
@@ -288,11 +273,6 @@ export default {
                    
                    </div>
 
-
-
-
-
-
                     <div  class="col-xl-6 col-lg-12 ">
                     <div class="row mb-4">
                     <div class="col">
@@ -310,7 +290,7 @@ export default {
                       
                       <div class="card">
                           <div class="card-header">
-                            Private Kontakte
+                            {{$p.t('profil','privateKontakte')}}
                           </div>
                           <div class="card-body ">
                             
@@ -332,7 +312,7 @@ export default {
                     <!-- PRIVATE ADRESSEN-->
 
                     <div class="card">
-                        <div class="card-header">Private Adressen</div>
+                        <div class="card-header">{{$p.t('profil','privateAdressen')}}</div>
                           <div class="card-body">
                           
                             <div class="gy-3 row ">
@@ -356,28 +336,19 @@ export default {
                 <div class="row">
 
                   <div class="col-12 mb-4" >
-                    <core-filter-cmpt title="Entlehnte Betriebsmittel"  ref="betriebsmittelTable" :tabulator-options="betriebsmittel_table_options" tableOnly :sideMenu="false" />
+                    <core-filter-cmpt title="$p.t('profil','entlehnteBetriebsmittel')"  ref="betriebsmittelTable" :tabulator-options="betriebsmittel_table_options" tableOnly :sideMenu="false" />
                   </div> 
 
                   <div class="col-12 mb-4" >
-                    <core-filter-cmpt title="Zutrittsgruppen" ref="zutrittsgruppenTable" :tabulator-options="zutrittsgruppen_table_options"  tableOnly :sideMenu="false" noColumnFilter />
+                    <core-filter-cmpt title="$p.t('profil','zutrittsGruppen')" ref="zutrittsgruppenTable" :tabulator-options="zutrittsgruppen_table_options"  tableOnly :sideMenu="false" noColumnFilter />
             
                   </div>
 
                 </div>
 
-
-
-
-
-
-
               <!-- END OF MAIN CONTENT COL -->
               </div>
 
-
-
-
               <!-- START OF SIDE PANEL -->
               <div  class="col-md-4 col-xxl-3 col-sm-12 text-break" >
 
@@ -401,7 +372,7 @@ export default {
                     <div class="col-2">
                       <i class="fa fa-edit"></i>
                     </div>
-                    <div class="col-10">Bearbeiten</div>
+                    <div class="col-10">{{$p.t('ui','bearbeiten')}}</div>
                   </div>
                 </button>
                 </div>
@@ -441,10 +412,6 @@ export default {
                   <!-- HIER SIND DIE MAILVERTEILER -->
                    <mailverteiler :data="data?.mailverteiler"></mailverteiler>
 
-
-
-
-
                   </div>
 
                 <!-- END OF THE SECOND ROW IN THE SIDE PANEL -->
@@ -453,11 +420,6 @@ export default {
                 <!-- END OF SIDE PANEL -->
               </div>
 
-
-            
-
-
-
           <!-- END OF CONTAINER ROW-->
           
       </div>
diff --git a/public/js/components/Cis/Profil/StudentViewProfil.js b/public/js/components/Cis/Profil/StudentViewProfil.js
index 3996f1950..8f09a11af 100755
--- a/public/js/components/Cis/Profil/StudentViewProfil.js
+++ b/public/js/components/Cis/Profil/StudentViewProfil.js
@@ -73,7 +73,7 @@ export default {
    
   },
 
-  template: ` 
+  template: /*html*/` 
 
   <div class="container-fluid text-break fhc-form"  >
     <!-- ROW --> 
@@ -86,10 +86,6 @@ export default {
               </div>
               <!-- END OF HIDDEN QUCK LINKS -->
 
-
-            
-
-
               <!-- MAIN PANNEL -->
               <div class="col-sm-12 col-md-8 col-xxl-9 ">
                 <!-- ROW WITH PROFIL IMAGE AND INFORMATION -->
@@ -100,42 +96,19 @@ export default {
                     <!-- ROW WITH THE PROFIL INFORMATION --> 
                     <div class="row mb-4">
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<!-- FIRST KAESTCHEN -->
-                      <div  class="col-lg-12 col-xl-6 ">
+                     <!-- FIRST KAESTCHEN -->
+                    
+                     <div  class="col-lg-12 col-xl-6 ">
                      <div class="row mb-4">
                      <div class="col">
                      
-                        <profil-information :data="profilInformation" title="StudentIn"></profil-information>
+                        <profil-information :data="profilInformation" title="$p.t('profil','studentIn')"></profil-information>
                      
 		                </div>
                     </div>
                   
-
-
                       <!-- START OF SECOND PROFIL  INFORMATION COLUMN -->
                      
-
-
-                     
-
-
-              
                     <!-- END OF PROFIL INFORMATION ROW -->
                     <!-- INFORMATION CONTENT END -->
                     </div>
@@ -155,19 +128,14 @@ export default {
 
                     <div  class=" col-lg-12">
        
-                    <role-information title="Student Information" :data="roleInformation"></role-information>
+                    <role-information title="$p.t('profil','studentInformation')" :data="roleInformation"></role-information>
 
                     </div>  
-                           
-
-
+                       
                      </div>
 
                      <!-- END OF SECOND ROW OF SECOND COLUMN IN MAIN CONTENT -->
                   
-
-
-
                     <!-- END OF THE SECOND INFORMATION COLUMN -->
                     </div>
 
@@ -181,9 +149,6 @@ export default {
               <!-- END OF MAIN CONTENT COL -->
               </div>
 
-
-
-
               <!-- START OF SIDE PANEL -->
               <div  class="col-md-4 col-xxl-3 col-sm-12 text-break" >
 
@@ -220,10 +185,6 @@ export default {
               </div>
 
 
-            
-
-
-
           <!-- END OF CONTAINER ROW-->
           
       </div>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 642f6d57e..329b30e9b 100755
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -24156,7 +24156,675 @@ array(
 					'insertvon' => 'system'
 				)
 			)
-		)
+		),
+		// Profil Phrasen start
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'privateKontakte',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Private Kontakte',
+					'description' => 'Profil Kategorie in der die ganzen privaten Kontakte einer Person aufgelistet werden',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Private Contacts',
+					'description' => 'Profile category in which all private contacts of a person are listed',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'privateKontakte',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Private Kontakte',
+					'description' => 'Profil Kategorie in der die ganzen privaten Kontakte einer Person aufgelistet werden',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Private Contacts',
+					'description' => 'Profile category in which all private contacts of a person are listed',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'privateAdressen',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Private Adressen',
+					'description' => 'Profil Kategorie in der die ganzen privaten Adressen einer Person aufgelistet werden',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Private Addresses',
+					'description' => 'Profile category in which all private addresses of a person are listed',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'profilBearbeiten',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Profil bearbeiten',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'edit profil',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'mitarbeiterIn',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'MitarbeiterIn',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Employee',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'entlehnteBetriebsmittel',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Entlehnte Betriebsmittel',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Borrowed Company Resources',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'mitarbeiterInformation',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Mitarbeiter Information',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Employee Information',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'studentIn',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'StudentIn',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Student',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'studentInformation',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Student Information',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Student Information',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'zutrittsGruppen',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Zutrittsgruppen',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Access groups',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'fhAusweisStatus',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Der FH Ausweis ist am <b>{0}</b> ausgegeben worden.',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'The FH ID card was issued on <b>{0}</b>',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'mailverteiler',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Mailverteiler',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Mailing list',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'mailverteilerMitglied',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Sie sind Mitglied in folgenden Mailverteilern:',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'You are a member of the following mailing lists:',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'quickLinks',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Quick Links',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Quick Links',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'zeitwuensche',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Zeitwünsche',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Time wishes',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'lehrveranstaltungen',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Lehrveranstaltungen',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Courses',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'zeitsperren',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Zeitsperren',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Time locks',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		// Profil Phrasen end
+		// ProfilUpdate Phrasen start
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'profilUpdates',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Profil Updates',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Profile Updates',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'topic',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Thema',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'topic',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'zustelladresseWarning',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => '!Achtung: Eine deiner Adressen ist bereits als Zustelladresse gespeichert, sind sie sicher, dass sie die aktuelle Adresse stattdessen als Zustelladresse speichern wollen?',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => '!Attention: One of your addresses is already saved as a delivery address, are you sure you want to save the current address as a delivery address instead?',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'zustellkontakteWarning',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => '!Achtung: Eine deiner Kontakte ist bereits als Zustellungskontakt gespeichert, sind sie sicher, dass sie den aktuellen Kontakt stattdessen als Zustellkontakt speichern wollen?',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => '!Attention: One of your contacts is already saved as a delivery contact, are you sure you want to save the current contact as a delivery contact instead?',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'kontaktTyp',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Kontakttyp',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'contact type',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'nebenwohnsitz',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Nebenwohnsitz',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'secondary residence',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'hauptwohnsitz',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Hauptwohnsitz',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'main residence',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'homeoffice',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Homeoffice',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Homeoffice',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'rechnungsadresse',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Rechnungsadresse',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Billing address',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'notfallkontakt',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Notfallkontakt',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Emergency contact',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'mobiltelefonnummer',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Mobiltelefonnummer',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Cell phone number',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'homepage',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Homepage',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Homepage',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'faxnummer',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Faxnummer',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Fax number',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'zustellungsKontakt',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Zustellungs Kontakt',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Delivery contact',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'statusMessage',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Status Mitteilung',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Status message',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'profilUpdateInformationMessage',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Erneuern Sie ihr {0} und laden Sie die passenden Beweisdokumente hoch',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Please update your {0} and upload the corresponding Document of proof',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		
+		
+		
+		// profilUpdate Phrasen ende
+
 );
 
 

From a5daa63da41e372b73f14387c479303293dc9487 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 4 Apr 2024 16:28:24 +0200
Subject: [PATCH 0551/1461] Table, Form, Backend Crud Betriebsmittel

---
 .../api/frontend/v1/stv/Betriebsmittel.php    | 226 ++++++++-
 .../models/ressource/Betriebsmittel_model.php |  15 +
 .../Betriebsmittel/Betriebsmittel.js          | 448 ++++++++++++------
 .../Details/Betriebsmittel.js                 |   3 -
 4 files changed, 526 insertions(+), 166 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Betriebsmittel.php b/application/controllers/api/frontend/v1/stv/Betriebsmittel.php
index d2cc870ff..fb7464148 100644
--- a/application/controllers/api/frontend/v1/stv/Betriebsmittel.php
+++ b/application/controllers/api/frontend/v1/stv/Betriebsmittel.php
@@ -13,9 +13,14 @@ class Betriebsmittel extends FHCAPI_Controller
 			'addNewBetriebsmittel' => ['admin:r', 'assistenz:r'],
 			'updateBetriebsmittel' => ['admin:r', 'assistenz:r'],
 			'loadBetriebsmittel' => ['admin:r', 'assistenz:r'],
+			'deleteBetriebsmittel' => ['admin:r', 'assistenz:r'],
 			'getTypenBetriebsmittel' => ['admin:r', 'assistenz:r']
 		]);
 
+		//Load Models
+		$this->load->model('ressource/Betriebsmittel_model', 'BetriebsmittelModel');
+		$this->load->model('ressource/Betriebsmittelperson_model', 'BetriebsmittelpersonModel');
+
 		// Load Libraries
 		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
 		$this->load->library('form_validation');
@@ -28,8 +33,6 @@ class Betriebsmittel extends FHCAPI_Controller
 
 	public function getAllBetriebsmittel($uid, $person_id)
 	{
-		$this->load->model('ressource/Betriebsmittelperson_model', 'BetriebsmittelpersonModel');
-
 		//uid
 		//$result = $this->BetriebsmittelpersonModel->getBetriebsmittelByUid($uid);
 
@@ -41,6 +44,175 @@ class Betriebsmittel extends FHCAPI_Controller
 			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 		}
 
+		//all
+		$this->terminateWithSuccess((getData($result) ?: []));
+	}
+
+	public function addNewBetriebsmittel()
+	{
+		//TODO(Manu) Berechtigungen
+/*		if(!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg))
+		{
+			$result =  $this->p->t('lehre','error_keineSchreibrechte');
+
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}*/
+
+
+		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+
+		$uid_user = getAuthUID();
+		$betriebsmitteltyp = $this->input->post('betriebsmitteltyp');
+		$nummer = $this->input->post('nummer');
+		$nummer2 = $this->input->post('nummer2');
+		$beschreibung = $this->input->post('beschreibung');
+		$kaution = $this->input->post('kaution');
+		$anmerkung = $this->input->post('anmerkung');
+		$ausgegebenam = $this->input->post('ausgegebenam');
+		$retouram = $this->input->post('retouram');
+		$person_id = $this->input->post('person_id');
+		$uid = $this->input->post('uid');
+
+		// Start DB transaction
+		$this->db->trans_begin();
+
+		$result = $this->BetriebsmittelModel->insert(
+			[
+				'betriebsmitteltyp' => $betriebsmitteltyp,
+				'nummer' => $nummer,
+				'nummer2' => $nummer2,
+				'beschreibung' => $beschreibung,
+				'anmerkung' => $anmerkung,
+				'insertvon' => $uid_user,
+				'insertamum' => date('c')
+			]
+		);
+		if($this->db->trans_status() === false || isError($result))
+		{
+			$this->db->trans_rollback();
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		$betriebsmittel_id = $result->retval;
+
+		$result = $this->BetriebsmittelpersonModel->insert(
+			[
+				'betriebsmittel_id' => $betriebsmittel_id,
+				'person_id' => $person_id,
+				'kaution' => $kaution,
+				'anmerkung' => $anmerkung,
+				'ausgegebenam' => $ausgegebenam,
+				'retouram ' => $retouram,
+				'insertvon' => $uid_user,
+				'insertamum' => date('c'),
+				'uid' => $uid
+			]
+		);
+
+		if($this->db->trans_status() === false || isError($result))
+		{
+			$this->db->trans_rollback();
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+
+		$this->db->trans_commit();
+		return $this->terminateWithSuccess(true);
+
+	}
+
+	public function updateBetriebsmittel()
+	{
+		//TODO(Manu) Berechtigungen
+		/*		if(!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg))
+				{
+					$result =  $this->p->t('lehre','error_keineSchreibrechte');
+
+					return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+				}*/
+
+
+		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+
+		$uid_user = getAuthUID();
+
+		$betriebsmittel_id = $this->input->post('betriebsmittel_id');
+		$betriebsmittelperson_id = $this->input->post('betriebsmittelperson_id');
+		$betriebsmitteltyp = $this->input->post('betriebsmitteltyp');
+		$nummer = $this->input->post('nummer');
+		$nummer2 = $this->input->post('nummer2');
+		$beschreibung = $this->input->post('beschreibung');
+		$kaution = $this->input->post('kaution');
+		$anmerkung = $this->input->post('anmerkung');
+		$ausgegebenam = $this->input->post('ausgegebenam');
+		$retouram = $this->input->post('retouram');
+		$person_id = $this->input->post('person_id');
+		$uid = $this->input->post('uid');
+
+		// Start DB transaction
+		$this->db->trans_begin();
+
+		$result = $this->BetriebsmittelpersonModel->update(
+			[
+				'betriebsmittelperson_id' => $betriebsmittelperson_id,
+
+			],
+			[
+				'person_id' => $person_id,
+				'uid' => $uid,
+				'kaution' => $kaution,
+				'anmerkung' => $anmerkung,
+				'ausgegebenam' => $ausgegebenam,
+				'retouram ' => $retouram,
+				'insertvon' => $uid_user,
+				'insertamum' => date('c')
+			]
+		);
+
+		if($this->db->trans_status() === false || isError($result))
+			{
+				$this->db->trans_rollback();
+				return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			}
+
+
+		$result = $this->BetriebsmittelModel->update(
+			[
+				'betriebsmittel_id' => $betriebsmittel_id
+			],
+			[
+				'betriebsmitteltyp' => $betriebsmitteltyp,
+				'nummer' => $nummer,
+				'nummer2' => $nummer2,
+				'beschreibung' => $beschreibung,
+				'anmerkung' => $anmerkung,
+				'updatevon' => $uid_user,
+				'updateamum' => date('c')
+			]
+		);
+		if($this->db->trans_status() === false || isError($result))
+		{
+			$this->db->trans_rollback();
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+
+		$this->db->trans_commit();
+		return $this->terminateWithSuccess(true);
+
+	}
+
+	//TODO(Manu) defaultmässig ersten Eintrag in Edit Modus
+	public function getFirstBetriebsmittel($uid, $person_id)
+	{
+		//uid
+		//$result = $this->BetriebsmittelpersonModel->getFirstBetriebsmittelByUid($uid);
+
+		//person_id
+		$result = $this->BetriebsmittelpersonModel->getFirstBetriebsmittelByUid($person_id);
+
+		if (isError($result))
+		{
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+
 		$this->terminateWithSuccess((getData($result) ?: []));
 	}
 
@@ -48,29 +220,56 @@ class Betriebsmittel extends FHCAPI_Controller
 	{
 		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
 
-		$betriebsmittel_id = $this->input->post('betriebsmittel_id');
+		$betriebsmittelperson_id = $this->input->post('betriebsmittelperson_id');
 
-		$this->load->model('ressource/Betriebsmittel_model', 'BetriebsmittelModel');
+		//$this->terminateWithError("id in function api: " . $betriebsmittelperson_id, self::ERROR_TYPE_GENERAL);
 
+		$this->BetriebsmittelpersonModel->addJoin('wawi.tbl_betriebsmittel', 'betriebsmittel_id');
+
+		$result = $this->BetriebsmittelpersonModel->loadWhere(
+		array('betriebsmittelperson_id' => $betriebsmittelperson_id));
 
-		$result = $this->BetriebsmittelModel->loadWhere(
-			array(
-				'betriebsmittel_id' => $betriebsmittel_id
-			)
-		);
 		if (isError($result))
 		{
 			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
 
-		elseif (!hasData($result))
+		if (!hasData($result))
 		{
-			$this->terminateWithError("no Betriebsmittel with ID found: " . $betriebsmittel_id, self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError("no Betriebsmittelperson with ID found: " . $betriebsmittelperson_id, self::ERROR_TYPE_GENERAL);
 		}
 
 	//	var_dump($result);
 
-		$this->terminateWithSuccess(getData($result) ? : []);
+		$this->terminateWithSuccess(current(getData($result)));
+
+	}
+
+	public function deleteBetriebsmittel()
+	{
+		//var_dump($betriebsmittelperson_id);
+
+		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+
+		$betriebsmittelperson_id = $this->input->post('betriebsmittelperson_id');
+
+		//return $this->terminateWithError("Betriebsmittelperson " . $betriebsmittelperson_id . " wird gelöscht",self::ERROR_TYPE_GENERAL);
+
+
+		$result = $this->BetriebsmittelpersonModel->delete(
+			array('betriebsmittelperson_id' => $betriebsmittelperson_id,
+				)
+		);
+
+		if (isError($result))
+		{
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		if (!hasData($result))
+		{
+			return $this->terminateWithError($this->p->t('ui','error_missingId',['id'=> 'Betriebsmittelperson_id']), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->outputJsonSuccess(current(getData($result)));
 
 	}
 
@@ -79,7 +278,8 @@ class Betriebsmittel extends FHCAPI_Controller
 		$this->load->model('ressource/Betriebsmitteltyp_model', 'BetriebsmitteltypModel');
 
 		$result = $this->BetriebsmitteltypModel->load();
-		if (isError($result)) {
+		if (isError($result))
+		{
 			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 		}
 		return $this->terminateWithSuccess(getData($result) ?: []);
diff --git a/application/models/ressource/Betriebsmittel_model.php b/application/models/ressource/Betriebsmittel_model.php
index 849a9199f..a3a6e252f 100644
--- a/application/models/ressource/Betriebsmittel_model.php
+++ b/application/models/ressource/Betriebsmittel_model.php
@@ -11,4 +11,19 @@ class Betriebsmittel_model extends DB_Model
 		$this->dbTable = 'wawi.tbl_betriebsmittel';
 		$this->pk = 'betriebsmittel_id';
 	}
+
+	/**
+	 * getBetriebsmittelById
+	 */
+/*	public function loadBetriebsmittel($betriebsmittelperson_id){
+		$query = "
+			SELECT *
+			FROM wawi.tbl_betriebsmittelperson
+			JOIN wawi.tbl_betriebsmittel ON (wawi.tbl_betriebsmittelperson.betriebsmittel_id = wawi.tbl_betriebsmittel.betriebsmittel_id)
+			WHERE wawi.tbl_betriebsmittelperson.betriebsmittelperson_id  = ? 
+		";
+
+		return $this->execQuery($query, array($betriebsmittelperson_id));
+	}*/
+
 }
diff --git a/public/js/components/Betriebsmittel/Betriebsmittel.js b/public/js/components/Betriebsmittel/Betriebsmittel.js
index 6ea8f2022..1345d4f60 100644
--- a/public/js/components/Betriebsmittel/Betriebsmittel.js
+++ b/public/js/components/Betriebsmittel/Betriebsmittel.js
@@ -27,6 +27,9 @@ export default {
 					{title: "Nummer", field: "nummer"},
 					{title:  "PersonId", field: "person_id"},
 					{title: "Typ", field: "betriebsmitteltyp"},
+					{title: "insertVon", field: "insertvon"}, //Test
+					{title: "insertAmUm", field: "insertamum"}, //TESt
+					{title: "Betriebsmittelperson_id", field: "betriebsmittelperson_id"},
 					{title:  "Retourdatum", field: "retouram"},
 					{title:  "Beschreibung", field: "beschreibung"},
 					{title:  "Uid", field: "uid"},
@@ -34,7 +37,7 @@ export default {
 					{title:  "Kaution", field: "kaution", visible: false},
 					{title:  "Ausgabedatum", field: "ausgegebenam", visible: false},
 					{title: "Betriebsmittel_id", field: "betriebsmittel_id", visible: false},
-					{title: "Betriebsmittelperson_id", field: "betriebsmittelperson_id", visible: false},
+/*					{title: "Betriebsmittelperson_id", field: "betriebsmittelperson_id", visible: false},*/
 					{
 						title: 'Aktionen', field: 'actions',
 						minWidth: 150, // Ensures Action-buttons will be always fully displayed
@@ -49,7 +52,7 @@ export default {
 							button.addEventListener(
 								'click',
 								(event) =>
-									this.actionPrintConfirmation(cell.getData().betriebsmittel_id)
+									this.actionPrintConfirmation(cell.getData().betriebsmittelperson_id)
 							);
 							container.append(button);
 
@@ -60,7 +63,7 @@ export default {
 							button.addEventListener(
 								'click',
 								(event) =>
-									this.actionEditBetriebsmittel(cell.getData().betriebsmittel_id)
+									this.actionEditBetriebsmittel(cell.getData().betriebsmittelperson_id)
 							);
 							container.append(button);
 
@@ -71,7 +74,7 @@ export default {
 							button.addEventListener(
 								'click',
 								() =>
-									this.actionDeleteBetriebsmittel(cell.getData().betriebsmittel_id)
+									this.actionDeleteBetriebsmittel(cell.getData().betriebsmittelperson_id)
 							);
 							container.append(button);
 
@@ -84,43 +87,165 @@ export default {
 				height: '150',
 				selectableRangeMode: 'click',
 				selectable: true,
-				//index: 'betriebsmittel_id'
+				//index: 'betriebsmittel_id',
 			},
-			tabulatorEvents: [],
+			//tableData: [],
+			tabulatorEvents: [
+				{
+/*					event: 'rowSelectionChanged',
+					handler: this.rowSelectionChanged*/
+/*					handler: (e, row.getData().betriebsmittelperson_id) => {
+						// Handler-Funktion, die aufgerufen wird, wenn das Ereignis ausgelöst wird
+						//this.rowSelectionChanged(row.getData().betriebsmittelperson_id);
+					//	console.log("Selected Row Data:", row.getData());
+						//console.log(cell.getData().betriebsmittelperson_id);
+					}*/
+				},
+
+			],
 			betriebsmittelData: {},
-			betriebsmittel_id: {},
-			listBetriebsmitteltyp: []
+			betriebsmittelperson_id : null,
+			listBetriebsmitteltyp: [],
+			formData: {},
+			statusNew: true
 		};
 	},
 	methods: {
-		actionEditBetriebsmittel(betriebsmittel_id){
-			console.log("id: " + betriebsmittel_id);
-			this.loadBetriebsmittel(betriebsmittel_id).then(() => {
-				if(this.betriebsmittelData)
-					this.$refs.editBetriebsmittelModal.show();
+		rowSelectionChanged(data) {
+			//console.log("Selected Row Data:", data[0].betriebsmittelperson_id);
+			this.param_id = {
+				'betriebsmittelperson_id':  data[0].betriebsmittelperson_id};
+
+			this.loadBetriebsmittel(this.param_id);
+		},
+		actionEditBetriebsmittel(betriebsmittelperson_id){
+			console.log("action EditBM: id: " + betriebsmittelperson_id);
+			this.statusNew = false;
+			this.loadBetriebsmittel(betriebsmittelperson_id);
+/*			this.loadBetriebsmittel(betriebsmittelperson_id).then(() => {
+				/!*				if(this.formData) {
+									this.$refs.deleteBetriebsmittelModal.show();
+								}*!/
+				console.log("nach load" + betriebsmittelperson_id);
+
+			});*/
+		},
+		actionNewBetriebsmittel(){
+			console.log("action newBM: person " + this.person_id);
+			this.resetModal();
+			this.statusNew = true;
+			this.formData.ausgegebenam = this.getDefaultDate();
+			this.reload();
+		},
+		actionDeleteBetriebsmittel(betriebsmittelperson_id){
+			console.log("Löschen von Datensatz mit id: " + betriebsmittelperson_id);
+
+			this.loadBetriebsmittel(betriebsmittelperson_id).then(() => {
+/*				if(this.formData) {
+					this.$refs.deleteBetriebsmittelModal.show();
+				}*/
+				console.log("nach load" + betriebsmittelperson_id);
+				this.$refs.deleteBetriebsmittelModal.show();
 			});
 		},
-		actionPrintConfirmation(betriebsmittel_id){
-			console.log("actionPrintConfirmation of id: " + betriebsmittel_id);
-/*			this.loadBetriebsmittel(betriebsmittel_id).then(() => {
+		actionPrintConfirmation(betriebsmittelperson_id){
+			console.log("actionPrintConfirmation of id: " + betriebsmittelperson_id);
+/*			this.loadBetriebsmittel(betriebsmittelperson_id).then(() => {
 
 				if(this.betriebsmittelData)
 					this.$refs.editBetriebsmittelModal.show();
 			});*/
 		},
-		loadBetriebsmittel(betriebsmittel_id){
-			//console.log("2 " + betriebsmittel_id);
+		addNewBetriebsmittel(){
+			this.param_id = {
+				'uid':  this.uid,
+				'person_id': this.person_id,
+				...this.formData
+			};
+			//this.combinedObj = { ...this.param_id, ...this.formData };
+			this.$fhcApi.post('api/frontend/v1/stv/betriebsmittel/addNewBetriebsmittel/',
+				this.param_id
+			).then(response => {
+				console.log(response);
+				this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+			//	this.hideModal('newBetriebsmittelModal');
+				this.resetModal();
+			}).catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					window.scrollTo(0, 0);
+					this.reload();
+				});
+		},
+		deleteBetriebsmittel(betriebsmittelperson_id){
+			console.log("Delete mit id: " + betriebsmittelperson_id);
+			this.param = {
+				'betriebsmittelperson_id': betriebsmittelperson_id
+			};
+			console.log( "param_id" + this.param + "|" );
+			return this.$fhcApi.post('api/frontend/v1/stv/betriebsmittel/deleteBetriebsmittel/',
+				this.param)
+				.then(
+					result => {
+						this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
+						this.hideModal('deleteBetriebsmittelModal');
+						this.resetModal();
+					})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					window.scrollTo(0, 0);
+					this.reload();
+				});
+		},
+		updateBetriebsmittel(){
+			this.param = {
+				'uid':  this.uid,
+				'person_id': this.person_id,
+				...this.formData
+			};
+			this.$fhcApi.post('api/frontend/v1/stv/betriebsmittel/updateBetriebsmittel/',
+				this.param
+			).then(response => {
+				//console.log(response);
+				this.$fhcAlert.alertSuccess(this.$p.t('ui', 'editSave'));
+				//	this.hideModal('newBetriebsmittelModal');
+				this.resetModal();
+			}).catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					window.scrollTo(0, 0);
+					this.reload();
+				});
+		},
+		loadBetriebsmittel(betriebsmittelperson_id){
+			console.log("loadBetriebsmittel id:" + betriebsmittelperson_id);
+			this.resetModal();
+			this.statusNew = false;
+			this.param_id = {
+				'betriebsmittelperson_id':  betriebsmittelperson_id
+			};
 			return this.$fhcApi.post('api/frontend/v1/stv/betriebsmittel/loadBetriebsmittel/',
-				betriebsmittel_id)
+				this.param_id)
+				.then(result => result.data)
 				.then(result => {
-					//console.log("in load"  + result);
-					this.betriebsmittelData = result.data;
-					return result;
+					this.formData = result;
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
+		reload(){
+			this.$refs.table.reloadTable();
+		},
+		hideModal(modalRef){
+			this.$refs[modalRef].hide();
+		},
+		resetModal(){
+			this.formData = {};
+			this.betriebsmittelperson_id = {};
+			this.statusNew = true;
+		},
+		getDefaultDate() {
+			const today = new Date();
+			return today;
+		}
 	},
-
 	created(){
 		this.$fhcApi
 			.get('api/frontend/v1/stv/betriebsmittel/getTypenBetriebsmittel')
@@ -130,6 +255,17 @@ export default {
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 	},
+	mounted(){
+/*		this.$refs.table.on("rowSelected", (row) => {
+			// Hier können Sie auf das ausgewählte Zeilenobjekt zugreifen und entsprechende Aktionen durchführen
+			console.log("Selected Row:", row.getData());
+		});*/
+
+		//this.$refs.newBetriebsmittelModal.show();
+		//loadFirstEntry for the form
+		console.log("mounted");
+		//console.log(this.$refs.table.tableData);
+	},
 /*	async mounted() {
 		if(this.showTinyMCE){
 			this.initTinyMCE();
@@ -170,139 +306,17 @@ export default {
 	template: `
 	<div class="betriebsmittel-betriebsmittel">
 	
-			<!--Modal: editBetriebsmittelModal-->
-		<BsModal ref="editBetriebsmittelModal">
-		
-			<template #title>Details</template>
-			
-		
-			<form-form class="row g-3" ref="betriebsmittelData">
-				
-						<div class="row mb-3">								   
-							<label for="typ" class="form-label col-sm-4">Typ</label>
-							<div class="col-sm-6">
-								<form-input
-								type="select"
-								name="typ"
-								v-model="betriebsmittelData['typ']"
-								>
-								<option v-for="entry in listBetriebsmitteltyp" :key="entry.betriebsmitteltyp" :value="entry.betriebsmitteltyp">{{entry.betriebsmitteltyp}}</option>
-								</form-input>
-							</div>
-						</div>
-						
-						<div class="row mb-3">
-							<label for="nummer" class="form-label col-sm-4">Nummer </label>
-							<div class="col-sm-6">
-								<form-input
-									type="text"
-									name="nummer"
-									v-model="betriebsmittelData['nummer2']"
-								>						
-								</form-input>
-							</div>
-						</div>
-						
-						<div class="row mb-3">
-							<label for="nummer2" class="form-label col-sm-4">Nummer2</label>
-							<div class="col-sm-6">
-								<form-input
-									type="text"
-									name="nummer"
-									v-model="betriebsmittelData['nummer2']"
-								>						
-								</form-input>
-							</div>
-						</div>
-					
-						<div class="row mb-3">
-							<label for="bechreibung" class="form-label col-sm-4">Beschreibung</label>
-							<div class="col-sm-6">
-								<form-input
-									type="textarea"
-									name="beschreibung"
-									v-model="betriebsmittelData['beschreibung']"
-								>						
-								</form-input>
-							</div>
-						</div>
-						
-						<div class="row mb-3">
-							<label for="kaution" class="form-label col-sm-4">Kaution</label>
-							<div class="col-sm-6">
-								<form-input
-									type="text"
-									name="kaution"
-									v-model="betriebsmittelData['kaution']"
-								>						
-								</form-input>
-							</div>
-						</div>
-						
-				<div class="row mb-3">
-							<label for="anmerkung" class="form-label col-sm-4">Anmerkung</label>
-							<div class="col-sm-6">
-								<form-input
-									type="textarea"
-									name="anmerkung"
-									v-model="betriebsmittelData['anmerkung']"
-								>						
-								</form-input>
-							</div>
-						</div>
-						
-						<div class="row mb-3">
-							<label for="ausgegebenam" class="form-label col-sm-4">Ausgegeben am</label>
-							<div class="col-sm-6">
-								<form-input
-									type="DatePicker"
-									:readonly="readonly"
-									name="datum"
-									v-model="betriebsmittelData['ausgegebenam']"
-									auto-apply
-									:enable-time-picker="false"
-									format="dd.MM.yyyy"
-									preview-format="dd.MM.yyyy"
-									:teleport="true"
-								></form-input>
-							</div>
-						</div>
-						
-						<div class="row mb-3">
-							<label for="retouram" class="form-label col-sm-4">Retour am</label>
-							<div class="col-sm-6">
-								<form-input
-									type="DatePicker"
-									:readonly="readonly"
-									name="datum"
-									v-model="betriebsmittelData['retouram']"
-									auto-apply
-									:enable-time-picker="false"
-									format="dd.MM.yyyy"
-									preview-format="dd.MM.yyyy"
-									:teleport="true"
-								></form-input>
-							</div>
-						</div>
-				
-			</form-form>
-			
-			<template #footer>
-				<button ref="Close" type="button" class="btn btn-primary" @click="editBetriebsmittel(betriebsmittelData.betriebsmittel_id)">Speichern</button>
-			</template>
-		</BsModal>
-
 		<!--Modal: deleteBetriebsmittelModal-->
-<!--		<BsModal ref="deleteBetriebsmittelModal">
+		<BsModal ref="deleteBetriebsmittelModal">
 			<template #title>Betriebsmittel löschen</template>
 			<template #default>
-				<p>Betriebsmittel wirklich löschen?</p>
+				<p>Betriebsmittel ({{formData.betriebsmitteltyp}} / {{formData.betriebsmittelperson_id}}) wirklich löschen?</p>
 			</template>
 			<template #footer>
-				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">Abbrechen</button>
-				<button ref="Close" type="button" class="btn btn-primary" @click="deleteBetriebsmittel(notizen.notiz_id)">OK</button>
+<!--				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">Abbrechen</button>-->
+				<button ref="Close" type="button" class="btn btn-primary" @click="deleteBetriebsmittel(formData.betriebsmittelperson_id)">OK</button>
 			</template>
-		</BsModal>-->
+		</BsModal>
 
 		<core-filter-cmpt
 			ref="table"
@@ -317,6 +331,140 @@ export default {
 			>
 		</core-filter-cmpt>
 		<br>
+				{{formData}} || {{statusNew}}
+				<hr>
+			<form-form class="row g-3 col-6" ref="betriebsmittelData">
+				<legend>Details</legend>
+				
+				<div class="row mb-3">
+					<div class="col-sm-7">
+						<p v-if="statusNew" class="fw-bold"> Betriebsmittel anlegen</p>
+						<p v-else class="fw-bold">Betriebsmittel bearbeiten</p>
+					</div>
+				</div>
+				
+				<div class="row mb-3">								   
+					<label for="typ" class="form-label col-sm-4">Typ</label>
+					<div class="col-sm-6">
+						<form-input
+						type="select"
+						name="typ"
+						v-model="formData.betriebsmitteltyp"
+						>
+						<option v-for="entry in listBetriebsmitteltyp" :key="entry.betriebsmitteltyp" :value="entry.betriebsmitteltyp">{{entry.betriebsmitteltyp}}</option>
+						</form-input>
+					</div>
+				</div>
+				
+				<div class="row mb-3">
+					<label for="nummer" class="form-label col-sm-4">Nummer</label>
+					<div class="col-sm-6">
+						<form-input
+							type="text"
+							name="nummer"
+							v-model="formData['nummer']"
+						>						
+						</form-input>
+					</div>
+				</div>
+				
+				<div class="row mb-3">
+					<label for="nummer2" class="form-label col-sm-4">Nummer2</label>
+					<div class="col-sm-6">
+						<form-input
+							type="text"
+							name="nummer2"
+							v-model="formData['nummer2']"
+						>						
+						</form-input>
+					</div>
+				</div>
+			
+				<div class="row mb-3">
+					<label for="beschreibung" class="form-label col-sm-4">Beschreibung</label>
+					<div class="col-sm-6">
+						<form-input
+							type="textarea"
+							name="beschreibung"
+							v-model="formData['beschreibung']"
+						>						
+						</form-input>
+					</div>
+				</div>
+				
+				<div class="row mb-3">
+					<label for="kaution" class="form-label col-sm-4">Kaution</label>
+					<div class="col-sm-6">
+						<form-input
+							type="text"
+							name="kaution"
+							v-model="formData['kaution']"
+						>						
+						</form-input>
+					</div>
+				</div>
+				
+				<div class="row mb-3">
+					<label for="anmerkung" class="form-label col-sm-4">Anmerkung</label>
+					<div class="col-sm-6">
+						<form-input
+							type="textarea"
+							name="anmerkung"
+							v-model="formData['anmerkung']"
+						>						
+						</form-input>
+					</div>
+				</div>
+				
+				<div class="row mb-3">
+					<label for="ausgegebenam" class="form-label col-sm-4">Ausgegeben am</label>
+					<div class="col-sm-6">
+						<form-input
+							type="DatePicker"
+							:readonly="readonly"
+							name="datum"
+							v-model="formData['ausgegebenam']"
+							auto-apply
+							:enable-time-picker="false"
+							format="dd.MM.yyyy"
+							preview-format="dd.MM.yyyy"
+							:teleport="true"
+						></form-input>
+					</div>
+				</div>
+				
+				<div class="row mb-3">
+					<label for="retouram" class="form-label col-sm-4">Retour am</label>
+					<div class="col-sm-6">
+						<form-input
+							type="DatePicker"
+							:readonly="readonly"
+							name="datum"
+							v-model="formData['retouram']"
+							auto-apply
+							:enable-time-picker="false"
+							format="dd.MM.yyyy"
+							preview-format="dd.MM.yyyy"
+							:teleport="true"
+						></form-input>
+					</div>
+<!--					<div class="position-sticky top-0 z-1">
+						<button type="submit" class="btn btn-primary position-absolute top-0 end-0" :disabled="!deltaLength">Speichern2</button>
+					</div>-->
+				</div>
+				
+
+				<div class="row mb-3">
+				<label class="form-label col-sm-8"></label>
+					<div v-if="statusNew" class="col-sm-4">
+						<button ref="Close" type="button" class="btn btn-primary" @click="addNewBetriebsmittel()">Speichern</button>
+					</div>
+					<div v-else class="col-sm-4">
+						<button ref="Close" type="button" class="btn btn-warning" @click="updateBetriebsmittel()">Aktualisieren {{formData.betriebsmittelperson_id}}</button>
+					</div>
+					
+				</div>
+		</form-form>
 		
 	</div>`
 }
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Betriebsmittel.js b/public/js/components/Stv/Studentenverwaltung/Details/Betriebsmittel.js
index ec8a4dfc1..9e1a2484a 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Betriebsmittel.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Betriebsmittel.js
@@ -16,9 +16,6 @@ export default {
 			:uid="modelValue.uid"
 			>
 		</Betriebsmittel>	
-		{{modelValue}}	
-		<hr>
-		{{modelValue.person_id}}
 	</div>
 	`
 };

From 150b4ec09d19b3ec2b5ef09bd00dce760dc49e0a Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 5 Apr 2024 10:33:23 +0200
Subject: [PATCH 0552/1461] phrasen for acceptDenyUpdate.js and
 ProfilUpdateView.js

---
 .../Cis/ProfilUpdate/AcceptDenyUpdate.js      |  26 +--
 .../Cis/ProfilUpdate/ProfilUpdateView.js      |   8 +-
 system/phrasesupdate.php                      | 200 ++++++++++++++++++
 3 files changed, 217 insertions(+), 17 deletions(-)

diff --git a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
index f09aa8edd..4ff87b4c0 100755
--- a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
+++ b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
@@ -14,7 +14,7 @@ export default {
   props: {
     title: {
       type: String,
-      default: "Profil Update Request",
+      default: this.$p.t('profilUpdate','profilUpdateRequest'),
     },
     value: {
       type: Object,
@@ -105,7 +105,7 @@ export default {
   popup(options) {
     return BsModal.popup.bind(this)(null, options);
   },
-  template: `
+  template: /*html*/`
 
   <bs-modal v-show="!loading" ref="modalContainer" v-bind="$props" body-class="" dialog-class="modal-lg" class="bootstrap-alert" backdrop="false" >
     
@@ -126,14 +126,14 @@ export default {
     
    <div class="row">
     <div  class="form-underline mb-2 col-12 col-sm-6">
-      <div class="form-underline-titel">Status: </div>
+      <div class="form-underline-titel">{{$p.t('global','status')}}: </div>
 
       <span  class="form-underline-content" >{{data.status}}</span>
     </div>
 
 
     <div v-if="data.status!=='pending'" class="form-underline mb-2 col-12 col-sm-6">
-      <div class="form-underline-titel">Date of Status: </div>
+      <div class="form-underline-titel">{{$p.t('profilUpdate','statusDate')}}: </div>
       <!-- only status timestamp and status message can be null in the database -->
       <span  class="form-underline-content" >{{data.status_timestamp?data.status_timestamp:'-'}}</span>
     </div>
@@ -141,19 +141,19 @@ export default {
 
     
     <div  class="form-underline mb-2 col-12 col-sm-6">
-      <div class="form-underline-titel">UserID: </div>
+      <div class="form-underline-titel">{{$p.t('profilUpdate','userID')}}: </div>
 
       <span  class="form-underline-content" >{{data.uid}}</span>
     </div>
 
     <div  class="form-underline mb-2 col-12 col-sm-6">
-      <div class="form-underline-titel">Name: </div>
+      <div class="form-underline-titel">{{$p.t('global','name')}}: </div>
 
       <span  class="form-underline-content" >{{data.name}}</span>
     </div>
 
     <div  class="form-underline mb-2 col-12 col-sm-6">
-      <div class="form-underline-titel">Topic of Request: </div>
+      <div class="form-underline-titel">{{$p.t('profilUpdate','anfrageThema')}}: </div>
 
       <span  class="form-underline-content" >{{data.topic}}</span>
     </div>
@@ -162,7 +162,7 @@ export default {
 
 
     <div  class="form-underline mb-2 col-12 col-sm-6">
-      <div class="form-underline-titel">Date of Request:</div>
+      <div class="form-underline-titel">{{$p.t('profilUpdate','anfrageDatum')}}:</div>
 
       <span  class="form-underline-content" >{{data.insertamum}}</span>
     </div>
@@ -173,7 +173,7 @@ export default {
     <div v-if="data.status !=='pending' && data.status_message" class="row">
     <div class="col">
     <div  class="form-underline mb-2 ">
-    <div class="form-underline-titel">Status message</div>
+    <div class="form-underline-titel">{{$p.t('profilUpdate','statusMessage')}}</div>
     <textarea  class="form-control" rows="4" disabled>{{data.status_message}} </textarea>
     </div>
     </div>
@@ -182,7 +182,7 @@ export default {
     <div class="row my-4">
     <div class="col ">
     <div class="card">
-    <div class="card-header">update</div>
+    <div class="card-header">{{$p.t('profilUpdate','update')}}</div>
     <div class="card-body">
     <template v-if="getComponentView==='text_input'">
     <div  class="form-underline mb-2">
@@ -208,12 +208,12 @@ export default {
 
     <template v-if="data.status === 'pending'"  v-slot:footer>
     <div  class="form-underline flex-fill">
-      <div class="form-underline-titel">Message</div>
+      <div class="form-underline-titel">{{$p.t('global','nachricht')}}</div>
 
       <div class="d-flex flex-row gap-2">
         <input  class="form-control " v-model="data.status_message"  >
-        <button  @click="acceptRequest" class="text-nowrap btn btn-success">Accept <i class="fa fa-check"></i></button>
-        <button @click="denyRequest" class="text-nowrap btn btn-danger">Deny <i class="fa fa-xmark"></i></button>
+        <button  @click="acceptRequest" class="text-nowrap btn btn-success">{{$p.t('profilUpdate','accept')}} <i class="fa fa-check"></i></button>
+        <button @click="denyRequest" class="text-nowrap btn btn-danger">{{$p.t('profilUpdate','deny')}} <i class="fa fa-xmark"></i></button>
       </div>
     </div>
      
diff --git a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
index 6eae5ab83..d04495835 100644
--- a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
+++ b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
@@ -319,17 +319,17 @@ export default{
       
     }
   },
-  template: `
+  template: /*html*/`
     <div>
     
     <accept-deny-update v-if="showModal" ref="AcceptDenyModal" @hideBsModal="hideAcceptDenyModal" :value="JSON.parse(JSON.stringify(modalData))" :setLoading="setLoading" ></accept-deny-update>
     
     <div  class="form-underline flex-fill ">
-      <div class="form-underline-titel">Show </div>
+      <div class="form-underline-titel">{{$p.t('ui','anzeigen')}} </div>
 
       <select class="mb-4 " v-model="showAll" @change="updateData" class="form-select" aria-label="Profil updates display selection">
-        <option :selected="true" :value="false">Pending Requests</option>
-        <option :value="true">All Requests</option>
+        <option :selected="true" :value="false">{{$p.t('profilUpdate','pendingRequests')}}</option>
+        <option :value="true">{{$p.t('profilUpdate','allRequests')}}</option>
       </select>
   
     </div>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 329b30e9b..dc47e494d 100755
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -24820,6 +24820,206 @@ array(
 				)
 			)
 		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'profilUpdateRequest',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Profil Update Anfrage',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Profil Update Request',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'statusDate',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Status Datum',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Date of Status',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'userID',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'UserID',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'UserID',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'anfrageThema',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Thema der Anfrage',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Topic of Request',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'anfrageDatum',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Datum der Anfrage',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Date of Request',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'update',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Aktualisierung',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'update',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'accept',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Annehmen',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'accept',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'deny',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Ablehnen',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'deny',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'pendingRequests',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Ausstehende Anfragen',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Pending Requests',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'allRequests',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Alle Anfragen',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'All Requests',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
 		
 		
 		

From 53e44b9df555a545af979336c9abc584e174ea50 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 5 Apr 2024 14:22:42 +0200
Subject: [PATCH 0553/1461] =?UTF-8?q?Action=20Print=C3=9Cbernahmebest?=
 =?UTF-8?q?=C3=A4tigung?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Betriebsmittel/Betriebsmittel.js          | 116 ++++++++++--------
 1 file changed, 65 insertions(+), 51 deletions(-)

diff --git a/public/js/components/Betriebsmittel/Betriebsmittel.js b/public/js/components/Betriebsmittel/Betriebsmittel.js
index 1345d4f60..f7e036425 100644
--- a/public/js/components/Betriebsmittel/Betriebsmittel.js
+++ b/public/js/components/Betriebsmittel/Betriebsmittel.js
@@ -12,6 +12,11 @@ export default {
 		FormForm,
 		FormInput,
 	},
+	inject: {
+		cisRoot: {
+			from: 'cisRoot'
+		},
+	},
 	props: [
 		'person_id',
 		'uid'
@@ -19,7 +24,6 @@ export default {
 	data(){
 		return {
 			tabulatorOptions: {
-			//	ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Betriebsmittel/getBetriebsmittel/' + this.id + '/' + this.typeId),
 				ajaxURL: 'api/frontend/v1/stv/Betriebsmittel/getAllBetriebsmittel/' + this.uid + '/' + this.person_id,
 				ajaxRequestFunc: this.$fhcApi.get,
 				ajaxResponse: (url, params, response) => response.data,
@@ -27,9 +31,9 @@ export default {
 					{title: "Nummer", field: "nummer"},
 					{title:  "PersonId", field: "person_id"},
 					{title: "Typ", field: "betriebsmitteltyp"},
-					{title: "insertVon", field: "insertvon"}, //Test
-					{title: "insertAmUm", field: "insertamum"}, //TESt
-					{title: "Betriebsmittelperson_id", field: "betriebsmittelperson_id"},
+				//	{title: "insertVon", field: "insertvon"}, //Test
+				//	{title: "insertAmUm", field: "insertamum"}, //TESt
+				//	{title: "Betriebsmittelperson_id", field: "betriebsmittelperson_id"},
 					{title:  "Retourdatum", field: "retouram"},
 					{title:  "Beschreibung", field: "beschreibung"},
 					{title:  "Uid", field: "uid"},
@@ -37,7 +41,7 @@ export default {
 					{title:  "Kaution", field: "kaution", visible: false},
 					{title:  "Ausgabedatum", field: "ausgegebenam", visible: false},
 					{title: "Betriebsmittel_id", field: "betriebsmittel_id", visible: false},
-/*					{title: "Betriebsmittelperson_id", field: "betriebsmittelperson_id", visible: false},*/
+					{title: "Betriebsmittelperson_id", field: "betriebsmittelperson_id", visible: false},
 					{
 						title: 'Aktionen', field: 'actions',
 						minWidth: 150, // Ensures Action-buttons will be always fully displayed
@@ -49,11 +53,16 @@ export default {
 							button.className = 'btn btn-outline-secondary btn-action';
 							button.innerHTML = '<i class="fa fa-print"></i>';
 							button.title = 'Übernahmebestätigung drucken';
+							let cellData = cell.getData();
 							button.addEventListener(
 								'click',
 								(event) =>
-									this.actionPrintConfirmation(cell.getData().betriebsmittelperson_id)
-							);
+								{
+									let linkToPdf = this.cisRoot +
+										'/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');
@@ -86,30 +95,51 @@ export default {
 				layoutColumnsOnNewData: false,
 				height: '150',
 				selectableRangeMode: 'click',
-				selectable: true,
-				//index: 'betriebsmittel_id',
+				selectable: true
 			},
 			//tableData: [],
 			tabulatorEvents: [
 				{
-/*					event: 'rowSelectionChanged',
-					handler: this.rowSelectionChanged*/
-/*					handler: (e, row.getData().betriebsmittelperson_id) => {
-						// Handler-Funktion, die aufgerufen wird, wenn das Ereignis ausgelöst wird
-						//this.rowSelectionChanged(row.getData().betriebsmittelperson_id);
-					//	console.log("Selected Row Data:", row.getData());
-						//console.log(cell.getData().betriebsmittelperson_id);
+/*					//TODO Manu phrases
 					}*/
-				},
 
+					//TODO(manu)für editieren mit click: conflict with action buttons
+
+/*             event: 'rowSelectionChanged',
+			   handler: this.rowSelectionChanged*/
+/*              handler: (e, row.getData().betriebsmittelperson_id) => {
+// HandlerFunktion, die aufgerufen wird, wenn das Ereignis ausgelöst wird
+					   //this.rowSelectionChanged(row.getData().betriebsmittelperson_id);
+			   //      console.log("Selected Row Data:", row.getData());
+					   //console.log(cell.getData().betriebsmittelperson_id);
+*/
+				},
 			],
 			betriebsmittelData: {},
 			betriebsmittelperson_id : null,
 			listBetriebsmitteltyp: [],
-			formData: {},
-			statusNew: true
+			formData: {
+				ausgegebenam : this.getDefaultDate(),
+			},
+			statusNew: true,
+			changesDetected: false
 		};
 	},
+	computed: {
+		deltaLength() {
+			return Object.keys(this.formData).length;
+		}
+	},
+	watch: {
+		formData: {
+			handler: function(newVal) {
+
+				//console.log('Das Objekt wurde geändert:', newVal);
+				this.changesDetected = true;
+			},
+			deep: true  // Hiermit wird auch die Veränderung von Eigenschaften des Objekts überwacht
+		}
+	},
 	methods: {
 		rowSelectionChanged(data) {
 			//console.log("Selected Row Data:", data[0].betriebsmittelperson_id);
@@ -122,19 +152,14 @@ export default {
 			console.log("action EditBM: id: " + betriebsmittelperson_id);
 			this.statusNew = false;
 			this.loadBetriebsmittel(betriebsmittelperson_id);
-/*			this.loadBetriebsmittel(betriebsmittelperson_id).then(() => {
-				/!*				if(this.formData) {
-									this.$refs.deleteBetriebsmittelModal.show();
-								}*!/
-				console.log("nach load" + betriebsmittelperson_id);
-
-			});*/
+			this.changesDetected = false;
 		},
 		actionNewBetriebsmittel(){
 			console.log("action newBM: person " + this.person_id);
 			this.resetModal();
 			this.statusNew = true;
 			this.formData.ausgegebenam = this.getDefaultDate();
+			//this.changesDetected = false;
 			this.reload();
 		},
 		actionDeleteBetriebsmittel(betriebsmittelperson_id){
@@ -148,23 +173,14 @@ export default {
 				this.$refs.deleteBetriebsmittelModal.show();
 			});
 		},
-		actionPrintConfirmation(betriebsmittelperson_id){
-			console.log("actionPrintConfirmation of id: " + betriebsmittelperson_id);
-/*			this.loadBetriebsmittel(betriebsmittelperson_id).then(() => {
-
-				if(this.betriebsmittelData)
-					this.$refs.editBetriebsmittelModal.show();
-			});*/
-		},
 		addNewBetriebsmittel(){
-			this.param_id = {
+			this.param = {
 				'uid':  this.uid,
 				'person_id': this.person_id,
 				...this.formData
 			};
-			//this.combinedObj = { ...this.param_id, ...this.formData };
 			this.$fhcApi.post('api/frontend/v1/stv/betriebsmittel/addNewBetriebsmittel/',
-				this.param_id
+				this.param
 			).then(response => {
 				console.log(response);
 				this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
@@ -175,13 +191,13 @@ export default {
 					window.scrollTo(0, 0);
 					this.reload();
 				});
+			//this.changesDetected = false; //not working
 		},
 		deleteBetriebsmittel(betriebsmittelperson_id){
 			console.log("Delete mit id: " + betriebsmittelperson_id);
 			this.param = {
 				'betriebsmittelperson_id': betriebsmittelperson_id
 			};
-			console.log( "param_id" + this.param + "|" );
 			return this.$fhcApi.post('api/frontend/v1/stv/betriebsmittel/deleteBetriebsmittel/',
 				this.param)
 				.then(
@@ -219,27 +235,32 @@ export default {
 			console.log("loadBetriebsmittel id:" + betriebsmittelperson_id);
 			this.resetModal();
 			this.statusNew = false;
-			this.param_id = {
+			this.param = {
 				'betriebsmittelperson_id':  betriebsmittelperson_id
 			};
 			return this.$fhcApi.post('api/frontend/v1/stv/betriebsmittel/loadBetriebsmittel/',
-				this.param_id)
+				this.param)
 				.then(result => result.data)
 				.then(result => {
 					this.formData = result;
 				})
 				.catch(this.$fhcAlert.handleSystemError);
+		//	this.changesDetected = false;
 		},
 		reload(){
 			this.$refs.table.reloadTable();
+			//this.changesDetected = false;
 		},
 		hideModal(modalRef){
 			this.$refs[modalRef].hide();
 		},
 		resetModal(){
 			this.formData = {};
+			this.formData.ausgegebenam = this.getDefaultDate();
+			this.formData.listBetriebsmitteltyp = null;
 			this.betriebsmittelperson_id = {};
 			this.statusNew = true;
+			//this.changesDetected = false;
 		},
 		getDefaultDate() {
 			const today = new Date();
@@ -256,15 +277,7 @@ export default {
 			.catch(this.$fhcAlert.handleSystemError);
 	},
 	mounted(){
-/*		this.$refs.table.on("rowSelected", (row) => {
-			// Hier können Sie auf das ausgewählte Zeilenobjekt zugreifen und entsprechende Aktionen durchführen
-			console.log("Selected Row:", row.getData());
-		});*/
 
-		//this.$refs.newBetriebsmittelModal.show();
-		//loadFirstEntry for the form
-		console.log("mounted");
-		//console.log(this.$refs.table.tableData);
 	},
 /*	async mounted() {
 		if(this.showTinyMCE){
@@ -331,7 +344,8 @@ export default {
 			>
 		</core-filter-cmpt>
 		<br>
-				{{formData}} || {{statusNew}}
+		 {{cisRoot}}
+		 {{formData}} {{changesDetected}}
 				<hr>
 			<form-form class="row g-3 col-6" ref="betriebsmittelData">
 				<legend>Details</legend>
@@ -457,10 +471,10 @@ export default {
 				<div class="row mb-3">
 				<label class="form-label col-sm-8"></label>
 					<div v-if="statusNew" class="col-sm-4">
-						<button ref="Close" type="button" class="btn btn-primary" @click="addNewBetriebsmittel()">Speichern</button>
+						<button ref="Close" type="button" class="btn btn-primary" @click="addNewBetriebsmittel()" :disabled="!changesDetected">Speichern</button>
 					</div>
 					<div v-else class="col-sm-4">
-						<button ref="Close" type="button" class="btn btn-warning" @click="updateBetriebsmittel()">Aktualisieren {{formData.betriebsmittelperson_id}}</button>
+						<button ref="Close" type="button" class="btn btn-warning" @click="updateBetriebsmittel()" :disabled="!changesDetected">Aktualisieren</button>
 					</div>
 					
 				</div>

From 0cd86e3e542774898775b5a3dc1657214d809528 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 5 Apr 2024 14:57:00 +0200
Subject: [PATCH 0554/1461] cannot use this keyword when assigning default
 values to props in componenets

---
 public/js/apps/Cis/Profil.js                  |  7 ++++---
 .../Cis/Profil/MitarbeiterProfil.js           | 20 ++++++++++---------
 .../Profil/ProfilComponents/Mailverteiler.js  |  5 ++++-
 .../Profil/ProfilComponents/ProfilEmails.js   |  2 +-
 .../Cis/Profil/ProfilComponents/QuickLinks.js |  2 +-
 5 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/public/js/apps/Cis/Profil.js b/public/js/apps/Cis/Profil.js
index 62905e2d9..c1b1142f2 100755
--- a/public/js/apps/Cis/Profil.js
+++ b/public/js/apps/Cis/Profil.js
@@ -367,6 +367,7 @@ const profilApp = Vue.createApp({
 	</div>`,
 });
 
-profilApp.use(primevue.config.default, { zIndex: { overlay: 9999 } });
-profilApp.use(Phrasen);
-profilApp.mount("#content");
+profilApp
+  .use(primevue.config.default, { zIndex: { overlay: 9999 } })
+  .use(Phrasen)
+  .mount("#content");
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index db4b2253f..536af7619 100755
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -222,6 +222,8 @@ export default {
   },
   
   mounted() {
+    console.log("this mitarbeter",this)
+    console.log("this p",this.$p)
     this.$refs.betriebsmittelTable.tabulator.on("tableBuilt", () => {
       this.$refs.betriebsmittelTable.tabulator.setData(this.data.mittel);
     });
@@ -234,7 +236,7 @@ export default {
   template: /*html*/ ` 
   <div class="container-fluid text-break fhc-form"  >
   
-    <edit-profil v-if="showModal" ref="editModal" @hideBsModal="hideEditProfilModal" :value="JSON.parse(JSON.stringify(editData))" title="$p.t('profil','profilBearbeiten')"></edit-profil>
+    <edit-profil v-if="showModal" ref="editModal" @hideBsModal="hideEditProfilModal" :value="JSON.parse(JSON.stringify(editData))" :title="$p.t('profil','profilBearbeiten')"></edit-profil>
           <div class="row">
           
               <div  class="d-md-none col-12 ">
@@ -242,7 +244,7 @@ export default {
               <div class="row mb-3">
                 <div class="col">
                 <!-- MOBILE QUICK LINKS --> 
-                <quick-links :mobile="true"></quick-links>    
+                <quick-links :title="$p.t('profil','quickLinks')" :mobile="true"></quick-links>    
                 </div>
               </div>
 
@@ -289,7 +291,7 @@ export default {
                      <div class="col">
                      
                      <!-- PROFIL INFORMATION -->
-                     <profil-information title="$p.t('profil','mitarbeiterIn')" :data="profilInformation"></profil-information>
+                     <profil-information :title="$p.t('profil','mitarbeiterIn')" :data="profilInformation"></profil-information>
 
 
 		                 </div>
@@ -300,7 +302,7 @@ export default {
                      <div  class=" col-lg-12">
         
                     <!-- MITARBEITER INFO -->
-                    <role-information title="$p.t('profil','mitarbeiterInformation')" :data="roleInformation"></role-information>
+                    <role-information :title="$p.t('profil','mitarbeiterInformation')" :data="roleInformation"></role-information>
 
 
                      </div> 
@@ -316,7 +318,7 @@ export default {
                     <div class="row mb-4">
                     <div class="col">
                     <!-- EMAILS -->
-                    <profil-emails :data="data.emails" ></profil-emails>
+                    <profil-emails :title="this.$p.t('person','email')" :data="data.emails" ></profil-emails>
                     </div>
                     </div>
 
@@ -377,14 +379,14 @@ export default {
 
                   <!-- FUNKTIONEN TABELLE -->
                  
-                    <core-filter-cmpt title="$p.t('person','funktionen')"  ref="funktionenTable" :tabulator-options="funktionen_table_options"  tableOnly :sideMenu="false" />
+                    <core-filter-cmpt :title="$p.t('person','funktionen')"  ref="funktionenTable" :tabulator-options="funktionen_table_options"  tableOnly :sideMenu="false" />
                   
                     </div>
 
                   <div class="col-12 mb-4" >
 
                   <!-- BETRIEBSMITTEL TABELLE -->
-                    <core-filter-cmpt title="$p.t('profil','entlehnteBetriebsmittel')"  ref="betriebsmittelTable" :tabulator-options="betriebsmittel_table_options" tableOnly :sideMenu="false" />
+                    <core-filter-cmpt :title="$p.t('profil','entlehnteBetriebsmittel')"  ref="betriebsmittelTable" :tabulator-options="betriebsmittel_table_options" tableOnly :sideMenu="false" />
                   </div>
 
                 </div>
@@ -402,7 +404,7 @@ export default {
                 <div class="col">
                  
                     <!-- QUICK LINKS --> 
-                    <quick-links></quick-links>
+                    <quick-links :title="$p.t('profil','quickLinks')"></quick-links>
                    
                       
                   
@@ -447,7 +449,7 @@ export default {
                   <div class="col">
                   <!-- MAILVERTEILER -->
                     <mailverteiler  :data="data?.mailverteiler"></mailverteiler>
-                    
+                     
                   </div>
                 </div>
               </div>          
diff --git a/public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js b/public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js
index 2d612b661..bd8592532 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js
@@ -1,11 +1,14 @@
 export default {
     props: {
         data: Object,
-        title: { type: String, default: this.$p.t('profil','mailverteiler') },
+        title: { type: String, default: '' },//this.$p.t('profil','mailverteiler')
     },
     data() {
         return {};
     },
+    created(){
+        console.log("this",this);
+    },
     template: /*html*/`
     <div class="card">
    
diff --git a/public/js/components/Cis/Profil/ProfilComponents/ProfilEmails.js b/public/js/components/Cis/Profil/ProfilComponents/ProfilEmails.js
index f24a3778a..23ac82bac 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/ProfilEmails.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/ProfilEmails.js
@@ -7,7 +7,7 @@ export default {
     props:{
         title:{
             type:String,
-            default:this.$p.t('person','email'),
+            
         },
         data:{
             type:Array,
diff --git a/public/js/components/Cis/Profil/ProfilComponents/QuickLinks.js b/public/js/components/Cis/Profil/ProfilComponents/QuickLinks.js
index ed121b8d8..de0ee0b98 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/QuickLinks.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/QuickLinks.js
@@ -7,7 +7,7 @@ export default{
         },
         title:{
             type:String,
-            default: this.$p.t('profil','quickLinks'),
+
         },
         mobile:{
             type:Boolean,

From f2ba0fd4694fb212fe3eb7293125aa7a61c0865f Mon Sep 17 00:00:00 2001
From: Werner Masik <werner@gefi.at>
Date: Sun, 7 Apr 2024 00:33:25 +0200
Subject: [PATCH 0555/1461] update phrases and added events for
 fristenmanagement

---
 .../dbupdate_3.4/37107_fristenmanagement.php  |   5 +-
 system/phrasesupdate.php                      | 202 +++++++++++++++++-
 2 files changed, 205 insertions(+), 2 deletions(-)

diff --git a/system/dbupdate_3.4/37107_fristenmanagement.php b/system/dbupdate_3.4/37107_fristenmanagement.php
index c1b465107..68eda70b0 100644
--- a/system/dbupdate_3.4/37107_fristenmanagement.php
+++ b/system/dbupdate_3.4/37107_fristenmanagement.php
@@ -70,7 +70,10 @@ if ($result = $db->db_query("SELECT * FROM information_schema.tables WHERE table
         INSERT INTO hr.tbl_frist_ereignis(ereignis_kurzbz, bezeichnung, sort) VALUES('zeitaufzeichnung_ende','Zeitaufzeichnung Ende', 8);
         INSERT INTO hr.tbl_frist_ereignis(ereignis_kurzbz, bezeichnung, sort) VALUES('befristung_beginn','Befristung Beginn', 9);
         INSERT INTO hr.tbl_frist_ereignis(ereignis_kurzbz, bezeichnung, sort) VALUES('befristung_ende','Befristung Ende', 10);
-        INSERT INTO hr.tbl_frist_ereignis (ereignis_kurzbz , bezeichnung, manuell, sort) VALUES('manuell','Manuell', true, 11);
+        INSERT INTO hr.tbl_frist_ereignis (ereignis_kurzbz , bezeichnung, manuell, sort) VALUES('manuell1','Manuell 1', true, 11);
+        INSERT INTO hr.tbl_frist_ereignis (ereignis_kurzbz , bezeichnung, manuell, sort) VALUES('manuell2','Manuell 2', true, 12);
+        INSERT INTO hr.tbl_frist_ereignis (ereignis_kurzbz , bezeichnung, manuell, sort) VALUES('manuell3','Manuell 3', true, 13);
+        INSERT INTO hr.tbl_frist_ereignis (ereignis_kurzbz , bezeichnung, manuell, sort) VALUES('manuell4','Manuell 4', true, 14);
 
 
         ";
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 631ca9627..52c0dd758 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -24074,7 +24074,207 @@ array(
 				'insertvon' => 'system'
 			)
 		)
-	),	
+	),
+	array(
+		'app' => 'personalverwaltung',
+		'category' => 'fristenmanagement',
+		'phrase' => 'frist',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Frist',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Deadline',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'personalverwaltung',
+		'category' => 'fristenmanagement',
+		'phrase' => 'todo',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'To Do',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'To Do',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'personalverwaltung',
+		'category' => 'fristenmanagement',
+		'phrase' => 'fristStatusGespeichert',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Status gespeichert.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Status saved.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'personalverwaltung',
+		'category' => 'fristenmanagement',
+		'phrase' => 'fristGespeichert',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Frist gespeichert.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Deadline saved.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'personalverwaltung',
+		'category' => 'fristenmanagement',
+		'phrase' => 'fristGeloescht',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Frist gelöscht.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Deadline deleted.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'personalverwaltung',
+		'category' => 'fristenmanagement',
+		'phrase' => 'fristenAktualisiert',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fristen aktualisiert.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Deadlines updated.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'personalverwaltung',
+		'category' => 'fristenmanagement',
+		'phrase' => 'termin_frist',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Termin/Frist',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Date/Deadline',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'personalverwaltung',
+		'category' => 'fristenmanagement',
+		'phrase' => 'ereignis',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ereignis',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Event',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'personalverwaltung',
+		'category' => 'fristenmanagement',
+		'phrase' => 'status',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Status',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Status',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'personalverwaltung',
+		'category' => 'fristenmanagement',
+		'phrase' => 'mitarbeiterin',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'MitarbeiterIn',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Employee',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// Personalverwaltung end
 	array(
 		'app' => 'core',

From b77e56161db69d345900c23490e1de3caf877b89 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 8 Apr 2024 09:58:53 +0200
Subject: [PATCH 0556/1461] fixing some not working phrasen

---
 public/js/components/Cis/Profil/MitarbeiterProfil.js        | 2 +-
 .../Cis/Profil/ProfilComponents/FhAusweisStatus.js          | 6 ++++--
 .../components/Cis/Profil/ProfilComponents/Mailverteiler.js | 4 ++--
 .../Cis/Profil/ProfilComponents/ProfilInformation.js        | 2 +-
 .../ProfilModal/EditProfilComponents/TextInputDokument.js   | 2 +-
 system/phrasesupdate.php                                    | 4 ++--
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 536af7619..bb3c4e567 100755
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -448,7 +448,7 @@ export default {
                 <div  class="row">
                   <div class="col">
                   <!-- MAILVERTEILER -->
-                    <mailverteiler  :data="data?.mailverteiler"></mailverteiler>
+                    <mailverteiler  :data="data?.mailverteiler" :title="$p.t('profil','mailverteiler')"></mailverteiler>
                      
                   </div>
                 </div>
diff --git a/public/js/components/Cis/Profil/ProfilComponents/FhAusweisStatus.js b/public/js/components/Cis/Profil/ProfilComponents/FhAusweisStatus.js
index 15da181c2..d59bcbce3 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/FhAusweisStatus.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/FhAusweisStatus.js
@@ -2,17 +2,19 @@ export default {
     props:{
         data:{
             type:String,
+            
         }
     },
     data(){
         return {
-
+         
         }
+    },mounted(){
     },
     template: /*html*/`
     <div class="card">
         <div class="card-body">
-        <span>{{$p.t('profil','fhAusweisStatus',data)}}</span>
+        <span  >{{$p.t('profil','fhAusweisStatus',[data])}}</span>
         </div>
     </div>`,
 }
\ No newline at end of file
diff --git a/public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js b/public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js
index bd8592532..37b8fc1a5 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js
@@ -1,13 +1,13 @@
 export default {
     props: {
         data: Object,
-        title: { type: String, default: '' },//this.$p.t('profil','mailverteiler')
+        title: { type: String },
     },
     data() {
         return {};
     },
     created(){
-        console.log("this",this);
+
     },
     template: /*html*/`
     <div class="card">
diff --git a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
index 418ceccc5..83b746c69 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
@@ -58,7 +58,7 @@ export default {
     <div class="card-body">
     
 <div  class="gy-3 row justify-content-center align-items-center">
-=
+
 <!-- SQUEEZING THE IMAGE INSIDE THE FIRST INFORMATION COLUMN -->
 <!-- START OF THE FIRST ROW WITH THE PROFIL IMAGE -->
 <div class="col-12 col-sm-6 mb-2">
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/TextInputDokument.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/TextInputDokument.js
index 0f85867cc..f00e9634e 100644
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/TextInputDokument.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/TextInputDokument.js
@@ -94,7 +94,7 @@ export default {
   },
   template: /*html*/`
   
-    <p style="opacity:0.8" class="ms-2" v-if="withFiles && !updateID">{{$p.t('profilUpdate','profilUpdateInformationMessage',data.titel)}}</p>
+    <p style="opacity:0.8" class="ms-2" v-if="withFiles && !updateID">{{$p.t('profilUpdate','profilUpdateInformationMessage',[data.titel])}}</p>
 
     <div class="form-underline">
     <div class="form-underline-titel">{{data.titel?data.titel:$p.t('global','titel')}}</div>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index dc47e494d..77ce4350b 100755
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -24366,13 +24366,13 @@ array(
 			'phrases' => array(
 				array(
 					'sprache' => 'German',
-					'text' => 'Der FH Ausweis ist am <b>{0}</b> ausgegeben worden.',
+					'text' => 'Der FH Ausweis ist am {0} ausgegeben worden.',
 					'description' => '',
 					'insertvon' => 'system'
 				),
 				array(
 					'sprache' => 'English',
-					'text' => 'The FH ID card was issued on <b>{0}</b>',
+					'text' => 'The FH ID card was issued on {0}',
 					'description' => '',
 					'insertvon' => 'system'
 				)

From cf0c7a2f8c606645efc483f3821f3c58370d386b Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 8 Apr 2024 12:25:25 +0200
Subject: [PATCH 0557/1461] put le_ids aswell as viewdata for le selection in
 globalProperties to share between components; using FhcApi Plugin for API
 calls; le selection in setup now with info (gruppe_kurzbz, lehrform_kurzbz,
 semester, verband, gruppe); fixed setting foto in viewData after refreshing
 sum eg after kontrolle;

---
 public/js/plugin/FhcApi.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/plugin/FhcApi.js b/public/js/plugin/FhcApi.js
index bacd27d43..4e42ee48b 100644
--- a/public/js/plugin/FhcApi.js
+++ b/public/js/plugin/FhcApi.js
@@ -258,6 +258,7 @@ export default {
 			constructor(factorypart, root) {
 				if (root === undefined)
 					this.$fhcApi = app.config.globalProperties.$fhcApi;
+
 				else
 					Object.defineProperty(this, '$fhcApi', {
 						get() {
@@ -277,6 +278,5 @@ export default {
 		}
 
 		app.config.globalProperties.$fhcApi.factory = new FhcApiFactoryWrapper(FhcApiFactory);
-
 	}
 };
\ No newline at end of file

From ee6221e325bd8a6d11e560299f1e9e4195d77b94 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 8 Apr 2024 12:40:23 +0200
Subject: [PATCH 0558/1461] add konto tab

---
 .../controllers/api/frontend/v1/stv/Konto.php |  98 ++++
 .../controllers/components/stv/Config.php     |  20 +-
 .../controllers/components/stv/Student.php    | 543 ------------------
 application/models/crm/Konto_model.php        |  67 +++
 .../Stv/Studentenverwaltung/Details/Konto.js  | 133 +++++
 5 files changed, 317 insertions(+), 544 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/stv/Konto.php
 delete mode 100644 application/controllers/components/stv/Student.php
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Konto.js

diff --git a/application/controllers/api/frontend/v1/stv/Konto.php b/application/controllers/api/frontend/v1/stv/Konto.php
new file mode 100644
index 000000000..7c242b2e2
--- /dev/null
+++ b/application/controllers/api/frontend/v1/stv/Konto.php
@@ -0,0 +1,98 @@
+<?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');
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the back-end
+ * Provides data to the ajax get calls about a Konto
+ * Listens to ajax post calls to change the Konto data
+ * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
+ */
+class Konto extends FHCAPI_Controller
+{
+	/**
+	 * Calls the parent's constructor and prepares libraries and phrases
+	 */
+	public function __construct()
+	{
+		// TODO(chris): permissions
+		parent::__construct([
+			'get' => 'student/stammdaten:r'
+		]);
+
+		// Load models
+		$this->load->model('crm/Konto_model', 'KontoModel');
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui'
+		]);
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * Get details for a prestudent
+	 *
+	 * @param string			$type
+	 * @param string			(optional) $studiengang_kz
+	 * @return void
+	 */
+	public function get($type, $studiengang_kz = '')
+	{
+		// TODO(chris): validation
+
+		$person_id = $this->input->post('person_id');
+
+		if ($this->input->post('only_open')) {
+			$result = $this->KontoModel->getOffeneBuchungen($person_id, $studiengang_kz);
+		} else {
+			$result = $this->KontoModel->getAlleBuchungen($person_id, $studiengang_kz);
+		}
+
+		#$result = $this->getDataOrTerminateWithError($result);
+		if (isError($result))
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		$result = $result->retval;
+
+		// sort into tree
+		$childs = [];
+		$data = [];
+		foreach ($result as $entry) {
+			if ($entry->buchungsnr_verweis) {
+				if (isset($data[$entry->buchungsnr_verweis])) {
+					if (!isset($data[$entry->buchungsnr_verweis]->_children))
+						$data[$entry->buchungsnr_verweis]->_children = [];
+					$data[$entry->buchungsnr_verweis]->_children[] = $entry;
+				} else {
+					if (!isset($childs[$entry->buchungsnr_verweis]))
+						$childs[$entry->buchungsnr_verweis] = [];
+					$childs[$entry->buchungsnr_verweis][] = $entry;
+				}
+			} else {
+				$data[$entry->buchungsnr] = $entry;
+				if (isset($childs[$entry->buchungsnr]))
+					$entry->_children = $childs[$entry->buchungsnr];
+			}
+		}
+
+		$this->terminateWithSuccess(array_values($data));
+	}
+}
diff --git a/application/controllers/components/stv/Config.php b/application/controllers/components/stv/Config.php
index 45c26c966..e9ed7ec44 100644
--- a/application/controllers/components/stv/Config.php
+++ b/application/controllers/components/stv/Config.php
@@ -14,6 +14,7 @@ class Config extends FHC_Controller
 
 	public function student()
 	{
+		// TODO(chris): phrases
 		$result = [];
 		$result['details'] = [
 			'title' => 'Details',
@@ -35,6 +36,11 @@ class Config extends FHC_Controller
 			'title' => 'Status',
 			'component' => './Stv/Studentenverwaltung/Details/Status.js'
 		];
+		$result['konto'] = [
+			'title' => 'Konto',
+			'component' => './Stv/Studentenverwaltung/Details/Konto.js',
+			'config' => ['ZAHLUNGSBESTAETIGUNG_ANZEIGEN' => (defined('ZAHLUNGSBESTAETIGUNG_ANZEIGEN') && ZAHLUNGSBESTAETIGUNG_ANZEIGEN)]
+		];
 		$result['betriebsmittel'] = [
 			'title' => 'Betriebsmittel',
 			'component' => './Stv/Studentenverwaltung/Details/Betriebsmittel.js'
@@ -53,6 +59,18 @@ class Config extends FHC_Controller
 
 	public function students()
 	{
-		$this->outputJsonSuccess([]);
+		// TODO(chris): phrases
+		$result = [];
+		$result['konto'] = [
+			'title' => 'Konto',
+			'component' => './Stv/Studentenverwaltung/Details/Konto.js',
+			'config' => ['ZAHLUNGSBESTAETIGUNG_ANZEIGEN' => (defined('ZAHLUNGSBESTAETIGUNG_ANZEIGEN') && ZAHLUNGSBESTAETIGUNG_ANZEIGEN)]
+		];
+
+		Events::trigger('stv_conf_students', function & () use (&$result) {
+			return $result;
+		});
+
+		$this->outputJsonSuccess($result);
 	}
 }
diff --git a/application/controllers/components/stv/Student.php b/application/controllers/components/stv/Student.php
deleted file mode 100644
index ddfd95aed..000000000
--- a/application/controllers/components/stv/Student.php
+++ /dev/null
@@ -1,543 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use \DateTime as DateTime;
-
-class Student extends FHC_Controller
-{
-	public function __construct()
-	{
-		// TODO(chris): access!
-		parent::__construct();
-
-		// Load Libraries
-		$this->load->library('AuthLib');
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-
-		// Load language phrases
-		$this->loadPhrases([
-			'ui'
-		]);
-	}
-
-	public function get($prestudent_id)
-	{
-		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
-
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-
-		$this->PrestudentModel->addSelect('p.*');
-		$this->PrestudentModel->addSelect('s.student_uid');
-		$this->PrestudentModel->addSelect('matrikelnr');
-		$this->PrestudentModel->addSelect('b.aktiv');
-		$this->PrestudentModel->addSelect('v.semester');
-		$this->PrestudentModel->addSelect('v.verband');
-		$this->PrestudentModel->addSelect('v.gruppe');
-		$this->PrestudentModel->addSelect('b.alias');
-
-		if (defined('ACTIVE_ADDONS') && strpos(ACTIVE_ADDONS, 'bewerbung') !== false) {
-			$this->PrestudentModel->addSelect("(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung ORDER BY kontakt_id LIMIT 1) AS email_privat", false);
-		}
-
-		$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id', 'LEFT');
-		$this->PrestudentModel->addJoin('public.tbl_benutzer b', 'student_uid = uid', 'LEFT');
-		$this->PrestudentModel->addJoin('public.tbl_studentlehrverband v', 'b.uid = v.student_uid AND v.studiensemester_kurzbz = ' . $this->PrestudentModel->escape($studiensemester_kurzbz), 'LEFT');
-		$this->PrestudentModel->addJoin('public.tbl_person p', 'p.person_id = tbl_prestudent.person_id');
-
-		$result = $this->PrestudentModel->loadWhere(['prestudent_id' => $prestudent_id]);
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			$this->outputJson(getError($result));
-		} elseif (!hasData($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_NOT_FOUND);
-			$this->outputJson('NOT FOUND');
-		} else {
-			$this->outputJson(current(getData($result)));
-		}
-	}
-
-	public function save($prestudent_id)
-	{
-		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
-
-		$this->load->model('person/Person_model', 'PersonModel');
-		$this->load->model('crm/Student_model', 'StudentModel');
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
-
-		$this->load->library('form_validation');
-
-		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-
-		$this->form_validation->set_rules('gebdatum', 'Geburtsdatum', 'callback_isValidDate', [
-			'isValidDate' => $this->p->t('ui', 'error_invalid_date')
-		]);
-
-		$this->form_validation->set_rules('semester', 'Semester', 'integer');
-
-		if ($this->form_validation->run() == false) {
-			$this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST);
-			return $this->outputJsonError($this->form_validation->error_array());
-		}
-
-		$result = $this->StudentModel->loadWhere(['prestudent_id' =>$prestudent_id]);
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson(getError($result));
-		} elseif (!hasData($result)) {
-			$uid = null;
-		} else {
-			$student = current(getData($result));
-			$uid = $student->student_uid;
-		}
-
-		$result = $this->PrestudentModel->loadWhere(['prestudent_id' =>$prestudent_id]);
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson(getError($result));
-		} elseif (!hasData($result)) {
-			$person_id= null;
-		} else {
-			$person = current(getData($result));
-			$person_id = $person->person_id;
-		}
-
-		$array_allowed_props_lehrverband = ['verband', 'semester', 'gruppe'];
-		$update_lehrverband = array();
-		foreach ($array_allowed_props_lehrverband as $prop)
-		{
-			$val = $this->input->post($prop);
-			if ($val !== null) {
-				$update_lehrverband[$prop] = $val;
-			}
-		}
-
-		$array_allowed_props_person = [
-			'anrede',
-			'bpk',
-			'titelpre',
-			'titelpost',
-			'nachname',
-			'vorname',
-			'vornamen',
-			'wahlname',
-			'gebdatum',
-			'gebort',
-			'geburtsnation',
-			'svnr',
-			'ersatzkennzeichen',
-			'staatsbuergerschaft',
-			'matr_nr',
-			'sprache',
-			'geschlecht',
-			'familienstand',
-			'foto',
-			'anmerkung',
-			'homepage'
-		];
-		$update_person = array();
-		foreach ($array_allowed_props_person as $prop)
-		{
-			$val = $this->input->post($prop);
-			if ($val !== null) {
-				$update_person[$prop] = $val;
-			}
-		}
-
-		$array_allowed_props_student = ['matrikelnr'];
-		$update_student = array();
-		foreach ($array_allowed_props_student as $prop)
-		{
-			$val = $this->input->post($prop);
-			if ($val !== null) {
-				$update_student[$prop] = $val;
-			}
-		}
-
-		if (count($update_lehrverband) + count($update_student) && $uid === null) {
-			$this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST);
-			// TODO(chris): phrase
-			return $this->outputJson("Kein/e StudentIn vorhanden!");
-		}
-		if (count($update_person) && $person_id === null) {
-			$this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST);
-			// TODO(chris): phrase
-			return $this->outputJson("Keine Person vorhanden!");
-		}
-
-		if (count($update_lehrverband))
-		{
-			$result = $this->StudentlehrverbandModel->update([
-				'studiensemester_kurzbz' => $studiensemester_kurzbz,
-				'student_uid' => $uid
-			], $update_lehrverband);
-			if (isError($result)) {
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson(getError($result));
-			}
-		}
-
-		if (count($update_person))
-		{
-			$result = $this->PersonModel->update(
-				$person_id,
-				$update_person
-			);
-			if (isError($result)) {
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson(getError($result));
-			}
-		}
-
-
-		if (count($update_student))
-		{
-			$result = $this->StudentModel->update(
-				[$uid],
-				$update_student
-			);
-			if (isError($result)) {
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson(getError($result));
-			}
-		}
-
-		$this->outputJson(success(array_fill_keys(array_merge(
-			array_keys($update_lehrverband),
-			array_keys($update_person),
-			array_keys($update_student)
-		), ''), 1));
-	}
-
-	public function check()
-	{
-		$_POST = json_decode($this->input->raw_input_stream, true);
-		
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('gebdatum', 'Geburtsdatum', 'callback_isValidDate', [
-			'isValidDate' => $this->p->t('ui', 'error_invalid_date')
-		]);
-
-		if ($this->form_validation->run() == false) {
-			$this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST);
-			return $this->outputJsonError($this->form_validation->error_array());
-		}
-
-		$vorname = $this->input->post('vorname');
-		$nachname = $this->input->post('nachname');
-		$gebdatum = $this->input->post('gebdatum');
-
-		if (!$vorname && !$nachname && !$gebdatum) {
-			return $this->outputJsonError(['#' => 'At least one of vorname, nachname or gebdatum must be set']);
-		}
-
-		$this->load->model('person/Person_model', 'PersonModel');
-
-		if ($gebdatum)
-			$this->PersonModel->db->where('gebdatum', (new DateTime($gebdatum))->format('Y-m-d'));
-		if ($vorname && $nachname) {
-			$this->PersonModel->db->or_group_start();
-			$this->PersonModel->db->where('LOWER(nachname)', 'LOWER(' . $this->PersonModel->db->escape($nachname) . ')', false);
-			$this->PersonModel->db->where('LOWER(vorname)', 'LOWER(' . $this->PersonModel->db->escape($vorname) . ')', false);
-			$this->PersonModel->db->group_end();
-		} elseif ($nachname) {
-			$this->PersonModel->db->or_where('LOWER(nachname)', 'LOWER(' . $this->PersonModel->escape($nachname) . ')', false);
-		}
-
-		$result = $this->PersonModel->load();
-
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-		}
-
-		$this->outputJson($result);
-	}
-
-	public function add()
-	{
-		$_POST = json_decode($this->input->raw_input_stream, true);
-
-		if (!$this->input->post('person_id')) {
-			if (!isset($_POST['address']) || !is_array($_POST['address']))
-				$_POST['address'] = [];
-			$_POST['address']['func'] = 1;
-		}
-		if ($this->input->post('incoming')) {
-			$_POST['ausbildungssemester'] = 0;
-		}
-
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('nachname', 'Nachname', 'callback_requiredIfNotPersonId', [
-			'requiredIfNotPersonId' => $this->p->t('ui', 'error_required')
-		]);
-		$this->form_validation->set_rules('geschlecht', 'Geschlecht', 'callback_requiredIfNotPersonId', [
-			'requiredIfNotPersonId' => $this->p->t('ui', 'error_required')
-		]);
-		$this->form_validation->set_rules('gebdatum', 'Geburtsdatum', 'callback_isValidDate', [
-			'isValidDate' => $this->p->t('ui', 'error_invalid_date')
-		]);
-		$this->form_validation->set_rules('address[func]', 'Address', 'required|integer|less_than[2]|greater_than[-2]');
-		$this->form_validation->set_rules('address[plz]', 'PLZ', 'callback_requiredIfAddressFunc', [
-			'requiredIfAddressFunc' => $this->p->t('ui', 'error_required')
-		]);
-		$this->form_validation->set_rules('address[gemeinde]', 'Gemeinde', 'callback_requiredIfAddressFunc', [
-			'requiredIfAddressFunc' => $this->p->t('ui', 'error_required')
-		]);
-		$this->form_validation->set_rules('address[ort]', 'Ort', 'callback_requiredIfAddressFunc', [
-			'requiredIfAddressFunc' => $this->p->t('ui', 'error_required')
-		]);
-		$this->form_validation->set_rules('address[address]', 'Adresse', 'callback_requiredIfAddressFunc', [
-			'requiredIfAddressFunc' => $this->p->t('ui', 'error_required')
-		]);
-		$this->form_validation->set_rules('email', 'E-Mail', 'valid_email');
-		$this->form_validation->set_rules('studiengang_kz', 'Studiengang', 'required');
-		$this->form_validation->set_rules('studiensemester_kurzbz', 'Studiensemester', 'required');
-		$this->form_validation->set_rules('ausbildungssemester', 'Ausbildungssemester', 'required|integer|less_than[9]|greater_than[-1]');
-		// TODO(chris): validate studienplan with studiengang, semester and orgform?
-		// TODO(chris): validate person_id, studiengang_kz, studiensemester_kurzbz, orgform_kurzbz, nation, gemeinde, ort, geschlecht?
-
-		if ($this->form_validation->run() == false) {
-			$this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST);
-			return $this->outputJsonError($this->form_validation->error_array());
-		}
-
-		// TODO(chris): This should be in a library
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
-
-		$this->db->trans_start();
-
-		$result = $this->addInteressent();
-
-		$this->db->trans_complete();
-
-		if ($this->db->trans_status() === FALSE) {
-			return $this->outputJsonSuccess(true); // TODO(chris): DEBUG! REMOVE!
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-		}
-
-		$this->outputJson($result);
-	}
-
-	protected function addInteressent()
-	{
-		// Person anlegen wenn nötig
-		$person_id = $this->input->post('person_id');
-		if (!$person_id) {
-			$this->load->model('person/Person_model', 'PersonModel');
-			
-			$data = [
-				'nachname' => $this->input->post('nachname'),
-				'insertamum' => date('c'),
-				'insertvon' => getAuthUID(),
-				'zugangscode' => uniqid(),
-				'aktiv' => true
-			];
-			if ($this->input->post('anrede'))
-				$data['anrede'] = $this->input->post('anrede');
-			if ($this->input->post('titelpre'))
-				$data['titelpre'] = $this->input->post('titelpre');
-			if ($this->input->post('titelpost'))
-				$data['titelpost'] = $this->input->post('titelpost');
-			if ($this->input->post('vorname'))
-				$data['vorname'] = $this->input->post('vorname');
-			if ($this->input->post('vornamen'))
-				$data['vornamen'] = $this->input->post('vornamen');
-			if ($this->input->post('wahlname'))
-				$data['wahlname'] = $this->input->post('wahlname');
-			if ($this->input->post('geschlecht'))
-				$data['geschlecht'] = $this->input->post('geschlecht');
-			if ($this->input->post('gebdatum'))
-				$data['gebdatum'] = (new DateTime($this->input->post('datum_obj')))->format('Y-m-d');
-			if ($this->input->post('geburtsnation'))
-				$data['geburtsnation'] = $this->input->post('geburtsnation');
-			if ($this->input->post('staatsbuergerschaft'))
-				$data['staatsbuergerschaft'] = $this->input->post('staatsbuergerschaft');
-
-			$result = $this->PersonModel->insert($data);
-			if (isError($result))
-				return $result;
-			$person_id = getData($result);
-		}
-
-		// Addresse anlegen
-		$anlegen = $this->input->post('address[func]');
-		if ($anlegen) {
-			$this->load->model('person/Adresse_model', 'AdresseModel');
-
-			$data = [
-				'nation' => $this->input->post('address[nation]'),
-				'strasse' => $this->input->post('address[address]'),
-				'plz' => $this->input->post('address[plz]'),
-				'ort' => $this->input->post('address[ort]'),
-				'gemeinde' => $this->input->post('address[gemeinde]'),
-				'typ' => 'h',
-				'zustelladresse' => true,
-			];
-			if ($anlegen < 0) { // Überschreiben
-				$this->AdresseModel->addOrder('zustelladresse', 'DESC');
-				$this->AdresseModel->addOrder('sort');
-				$result = $this->AdresseModel->loadWhere([
-					'person_id' => $person_id
-				]);
-				if (isError($result))
-					return $result;
-				if (hasData($result)) {
-					$address = current(getData($result));
-
-					$data['updateamum'] = date('c');
-					$data['updatevon'] = getAuthUID();
-
-					$result = $this->AdresseModel->update($address->adresse_id, $data);
-					if (isError($result))
-						return $result;
-				} else {
-					//Wenn keine Adrese vorhanden ist dann eine neue Anlegen
-					$anlegen = 1;
-					$data['heimatadresse'] = true;
-				}
-			}
-			if ($anlegen > 0) {
-				$data['person_id'] = $person_id;
-				$data['insertamum'] = date('c');
-				$data['insertvon'] = getAuthUID();
-				if (!isset($data['heimatadresse']))
-					$data['heimatadresse'] = !$this->input->post('person_id');
-				
-				$result = $this->AdresseModel->insert($data);
-				if (isError($result))
-					return $result;
-			}
-		}
-		
-		// Kontaktdaten
-		$kontaktdaten = [];
-		foreach (['email', 'telefon', 'mobil'] as $k) {
-			$v = $this->input->post($k);
-			if ($v)
-				$kontaktdaten[$k] = $v;
-		}
-		if (count($kontaktdaten)) {
-			$this->load->model('person/Kontakt_model', 'KontaktModel');
-
-			foreach ($kontaktdaten as $typ => $kontakt) {
-				$data = [
-					'person_id' => $person_id,
-					'kontakttyp' => $typ,
-					'kontakt' => $kontakt,
-					'zustellung' => true,
-					'insertamum' => date('c'),
-					'insertvon' => getAuthUID()
-				];
-				$result = $this->KontaktModel->insert($data);
-				if (isError($result))
-					return $result;
-			}
-		}
-
-		// Prestudent anlegen
-		$data = [
-			'aufmerksamdurch_kurzbz' => 'k.A.',
-			'person_id' => $person_id,
-			'studiengang_kz' => $this->input->post('studiengang_kz'),
-			'ausbildungcode' => $this->input->post('letzteausbildung'),
-			'anmerkung' => $this->input->post('anmerkungen'),
-			'reihungstestangetreten' => false,
-			'bismelden' => true
-		];
-		$ausbildungsart = $this->input->post('ausbildungsart');
-		if ($ausbildungsart)
-			$data['anmerkung'] .= ' Ausbildungsart:' . $ausbildungsart;
-		// Incomings und ausserordentliche sind bei Meldung nicht förderrelevant
-		$incoming = $this->input->post('incoming');
-		if ($incoming || substr($data['studiengang_kz'], 0, 1) == '9')
-			$data['foerderrelevant'] = false;
-		// Wenn die Person schon im System erfasst ist, dann die ZGV des Datensatzes uebernehmen
-		$this->PrestudentModel->addOrder('zgvmas_code');
-		$this->PrestudentModel->addOrder('zgv_code', 'DESC');
-		$this->PrestudentModel->addLimit(1);
-		$result = $this->PrestudentModel->loadWhere([
-			'person_id' => $person_id
-		]);
-		if (isError($result))
-			return $result;
-		if (hasData($result)) {
-			$prestudent = current(getData($result));
-			if ($prestudent->zgv_code) {
-				$data['zgv_code'] = $prestudent->zgv_code;
-				$data['zgvort'] = $prestudent->zgvort;
-				$data['zgvdatum'] = $prestudent->zgvdatum;
-
-				$data['zgvmas_code'] = $prestudent->zgvmas_code;
-				$data['zgvmaort'] = $prestudent->zgvmaort;
-				$data['zgvmadatum'] = $prestudent->zgvmadatum;
-			}
-		}
-		// Prestudent speichern
-		$result = $this->PrestudentModel->insert($data);
-		if (isError($result))
-			return $result;
-		$prestudent_id = getData($result);
-
-		// Prestudent Rolle Anlegen
-		$data = [
-			'prestudent_id' => $prestudent_id,
-			'status_kurzbz' => $incoming ? 'Incoming' : 'Interessent',
-			'studiensemester_kurzbz' => $this->input->post('studiensemester_kurzbz'),
-			'ausbildungssemester' => $this->input->post('ausbildungssemester') ?: 0,
-			'orgform_kurzbz' => $this->input->post('orgform_kurzbz') ?: null,
-			'studienplan_id' => $this->input->post('studienplan_id') ?: null,
-			'datum' => date('Y-m-d'),
-			'insertamum' => date('c'),
-			'insertvon' => getAuthUID()
-		];
-		$result = $this->PrestudentstatusModel->insert($data);
-		if (isError($result))
-			return $result;
-
-		if ($incoming) {
-			// TODO(chris): IMPLEMENT!
-			//Matrikelnummer und UID generieren
-			//Benutzerdatensatz anlegen
-			//Studentendatensatz anlegen
-			//StudentLehrverband anlegen
-		}
-
-		// TODO(chris): DEBUG
-		/*$result = $this->PrestudentModel->loadWhere([
-			'pestudent_id' => 1
-		]);
-		if (isError($result)) {
-			return $result;
-		}*/
-
-		return success(true);
-	}
-
-	public function requiredIfNotPersonId($value)
-	{
-		if (isset($_POST['person_id']))
-			return true;
-		return !!$value;
-	}
-	
-	public function requiredIfAddressFunc($value)
-	{
-		if (!$_POST['address']['func'])
-			return true;
-		return !!$value;
-	}
-	
-	public function isValidDate($date)
-	{
-		try {
-		    new DateTime($date);
-		} catch (Exception $e) {
-			return false;
-		}
-		return true;
-	}
-}
diff --git a/application/models/crm/Konto_model.php b/application/models/crm/Konto_model.php
index e76ed9e7a..00a621d0e 100644
--- a/application/models/crm/Konto_model.php
+++ b/application/models/crm/Konto_model.php
@@ -12,6 +12,73 @@ class Konto_model extends DB_Model
 		$this->pk = 'buchungsnr';
 	}
 
+
+	/**
+	 * Get all accounting entries for a person optionally filtered by Studiengang
+	 *
+	 * @param integer|array		$person_id
+	 * @param string			(optional) $studiengang_kz
+	 *
+	 * @return stdClass
+	 */
+	public function getAlleBuchungen($person_id, $studiengang_kz = '')
+	{
+		$this->addSelect($this->dbTable . '.*');
+		$this->addSelect('UPPER(typ::varchar(1) || kurzbz) AS kuerzel');
+		$this->addSelect('person.anrede');
+		$this->addSelect('person.titelpost');
+		$this->addSelect('person.titelpre');
+		$this->addSelect('person.vorname');
+		$this->addSelect('person.vornamen');
+		$this->addSelect('person.nachname');
+
+		$this->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
+		$this->addJoin('public.tbl_person person', 'person_id', 'LEFT');
+
+		$this->addOrder('buchungsdatum');
+
+		if (is_array($person_id))
+			$this->db->where_in('person_id', $person_id);
+		else
+			$this->db->where('person_id', $person_id);
+
+		if ($studiengang_kz)
+			return $this->loadWhere([
+				'studiengang_kz' => $studiengang_kz
+			]);
+		return $this->load();
+	}
+
+	/**
+	 * Get all open accounting entries for a person optionally filtered by Studiengang
+	 *
+	 * @param integer|array		$person_id
+	 * @param string			(optional) $studiengang_kz
+	 *
+	 * @return stdClass
+	 */
+	public function getOffeneBuchungen($person_id, $studiengang_kz = '')
+	{
+		$this->addSelect('buchungsnr');
+		$this->db->where('(betrag + (
+			SELECT CASE WHEN sum(betrag) is null THEN 0 ELSE sum(betrag) END
+			FROM ' . $this->dbTable . '
+			WHERE buchungsnr_verweis=konto_a.buchungsnr
+		)) !=', 0, false);
+		if (is_array($person_id))
+			$this->db->where_in('person_id', $person_id);
+		else
+			$this->db->where('person_id', $person_id);
+		$sql = $this->db->get_compiled_select($this->dbTable . ' konto_a');
+
+		$this->db->group_start();
+		$this->db->where_in('buchungsnr', $sql, false);
+		$this->db->or_where_in('buchungsnr_verweis', $sql, false);
+		$this->db->group_end();
+
+		return $this->getAlleBuchungen($person_id, $studiengang_kz);
+	}
+
 	/**
 	 * Sets a Payment as paid
 	 */
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Konto.js b/public/js/components/Stv/Studentenverwaltung/Details/Konto.js
new file mode 100644
index 000000000..99bb85c87
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Konto.js
@@ -0,0 +1,133 @@
+import {CoreFilterCmpt} from "../../../filter/Filter.js";
+
+// TODO(chris): filter
+// TODO(chris): multi pers
+// TODO(chris): new header(multi pers), edit/row, gegenb.(date) multi, löschen multi, best. multi(recht)
+
+export default {
+	components: {
+		CoreFilterCmpt
+	},
+	props: {
+		modelValue: Object,
+		config: {
+			type: Object,
+			default: {}
+		}
+	},
+	data() {
+		return {
+			filter: 'alle'
+		};
+	},
+	computed: {
+		stg_kz() {
+			if (this.modelValue.studiengang_kz)
+				return this.modelValue.studiengang_kz;
+			let values = this.modelValue.map(e => e.studiengang_kz).filter((v,i,a) => a.indexOf(v) === i);
+			if (values.length != 1)
+				return '';
+			return values[0];
+		},
+		tabulatorOptions() {
+			return {
+				ajaxURL: 'api/frontend/v1/stv/konto/get/alle',
+				ajaxParams: () => {
+					const params = {
+						person_id: this.modelValue.person_id || this.modelValue.map(e => e.person_id),
+						only_open: (this.filter == 'offene')
+					};
+					return params;
+				},
+				ajaxRequestFunc: (url, config, params) => {
+					return this.$fhcApi.post(url, params, config);
+				},
+				ajaxResponse: (url, params, response) => response.data,
+				dataTree: true,
+				columns: [
+					{
+						field: "buchungsdatum",
+						title: "Buchungsdatum"
+					},
+					{
+						field: "buchungstext",
+						title: "Buchungstext"
+					},
+					{
+						field: "betrag",
+						title: "Betrag"
+					},
+					{
+						field: "studiensemester_kurzbz",
+						title: "StSem"
+					},
+					{
+						field: "buchungstyp_kurzbz",
+						title: "Typ",
+						visible: false
+					},
+					{
+						field: "buchungsnr",
+						title: "buchungs_nr",
+						visible: false
+					},
+					{
+						field: "insertvon",
+						title: "Angelegt von",
+						visible: false
+					},
+					{
+						field: "insertamum",
+						title: "Anlagedatum",
+						visible: false
+					},
+					{
+						field: "kuerzel",
+						title: "Studiengang",
+						visible: false
+					},
+					{
+						field: "anmerkung",
+						title: "Anmerkung"
+					}
+				],
+				index: 'buchungs_nr',
+			};
+		}
+	},
+	watch: {
+		modelValue() {
+			this.$refs.table.reloadTable();
+		}
+	},
+	methods: {
+		reload() {
+			this.$refs.table.reloadTable();
+		}
+	},
+	template: `
+	<div class="stv-details-konto h-100 d-flex flex-column">
+	{{config}}
+		<div class="row">
+			<div class="col-lg-2">
+				<select class="form-select" v-model="filter" @input="() => $nextTick($refs.table.reloadTable)">
+					<option value="alle">Alle</option>
+					<option value="offene">Offene</option>
+				</select>
+			</div>
+			<div class="col-lg-2">
+				<select class="form-select" v-model="studiengang_kz" @input="() => $nextTick($refs.table.reloadTable)">
+					<option value="">Alle</option>
+					<option :value="stg_kz">Aktuelle</option>
+				</select>
+			</div>
+		</div>
+		<core-filter-cmpt
+			ref="table"
+			table-only
+			:side-menu="false"
+			:tabulator-options="tabulatorOptions"
+			>
+		</core-filter-cmpt>
+	</div>`
+};
\ No newline at end of file

From 1b04d70839680d45daaf6f75d59656a843523981 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 8 Apr 2024 15:03:08 +0200
Subject: [PATCH 0559/1461] adds phrasen for profil in php controller and adds
 error message phrasen

---
 application/controllers/Cis/ProfilUpdate.php  |  94 +--
 public/js/apps/Cis/Profil.js                  |  14 +-
 public/js/apps/Cis/ProfilUpdateRequests.js    |   4 +-
 .../Cis/ProfilUpdate/AcceptDenyUpdate.js      |   8 +-
 .../Cis/ProfilUpdate/ProfilUpdateView.js      |   2 +-
 system/dbupdate_3.4/25999_C4_ma0594.php       |  35 +-
 system/phrasesupdate.php                      | 594 +++++++++++++++++-
 7 files changed, 683 insertions(+), 68 deletions(-)

diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
index 6b42356dc..86fa57b22 100755
--- a/application/controllers/Cis/ProfilUpdate.php
+++ b/application/controllers/Cis/ProfilUpdate.php
@@ -40,6 +40,17 @@ class ProfilUpdate extends Auth_Controller
 		$this->load->model('person/Benutzer_model', 'BenutzerModel');
 
 
+		// Load language phrases
+        $this->loadPhrases(
+            array(
+            	'ui',
+                'global',
+                'person',
+                'profil',
+				'profilUpdate'
+            )
+        );
+
 		$this->load->library('DmsLib');
 		$this->load->library('PermissionLib');
 
@@ -63,11 +74,20 @@ class ProfilUpdate extends Auth_Controller
 		$email = $uid . "@" . DOMAIN;
 		
 		//? translation of the english version of the status to german
-		$status_de = $status == 'accepted' ? 'akzeptiert' : 'abgelehnt';
+		$status_de = "";
+		switch($status){
+			case 'Akzeptiert': $status_de = "Akzeptiert"; break;
+			case 'Accepted': $status_de = "Akzeptiert"; break;
+			case 'Abgelehnt': $status_de = "Abgelent"; break;
+			case 'Rejected': $status_de = "Abgelent"; break;
+			case 'Ausstehend': $status_de = "Ausstehend"; break;
+			case 'Pending': $status_de = "Ausstehend"; break;
+			default: $status_de = "default?"; break;
+		}
 
-		$mail_res = sendSanchoMail("profil_update_response",['topic'=>$topic,'status_de'=>$status_de,'status_en'=>$status,'href'=>APP_ROOT.'Cis/Profil'],$email,("Profil Änderung ".$status));
+		$mail_res = sendSanchoMail("profil_update_response",['topic'=>$topic,'status_de'=>$status_de,'status_en'=>$status,'href'=>APP_ROOT.'Cis/Profil'],$email,("Profil Änderung ".$this->p->t('profilUpdate', 'pending')));
 		if(!$mail_res){
-			show_error("failed to send email to " . $email);
+			show_error($this->p->t('profilUpdate','profilUpdate_email_error'));
 		}
 	}
 
@@ -79,7 +99,7 @@ class ProfilUpdate extends Auth_Controller
 
 		$isMitarbeiter_res = $this->MitarbeiterModel->isMitarbeiter($uid);
 		if(isError($isMitarbeiter_res)){
-			show_error("was not able to check whether ".$uid." is a mitarbeiter");
+			show_error($this->p->t('profilUpdate','profilUpdate_mitarbeiterCheck_error'));
 		}
 		$isMitarbeiter_res = getData($isMitarbeiter_res);
 		
@@ -97,13 +117,13 @@ class ProfilUpdate extends Auth_Controller
 			if(hasData($res)){
 				array_push($emails,MAIL_GST);
 			}else{
-				show_error("no Mitarbeiter with uid: ".$uid ." found");
+				show_error($this->p->t('profilUpdate','profilUpdate_mitarbeiterCheck_error'));
 			}
 		}else{
 			//? if it is not a mitarbeiter, check whether it is a student and send email to studiengang
 			$isStudent_res = $this->StudentModel->isStudent($uid);
 			if(isError($isStudent_res)){
-				show_error("was not able to check whether ".$uid." is a student");
+				show_error($this->p->t('profilUpdate','profilUpdate_studentCheck_error'));
 			}
 			$isStudent_res = getData($isStudent_res);
 			if($isStudent_res){
@@ -134,7 +154,7 @@ class ProfilUpdate extends Auth_Controller
 		}
 		foreach($mail_res as $m_res){
 			if(!$m_res){
-				show_error("error occured when sending email.");		
+				show_error($this->p->t('profilUpdate','profilUpdate_email_error'));		
 			}
 		}
 		
@@ -166,12 +186,12 @@ class ProfilUpdate extends Auth_Controller
 				
 
 			}else{
-				show_error("Missing necessary permissions");
+				show_error($this->p->t('profilUpdate','profilUpdate_permission_error'));
 				return;
 			}
 			
 		}else{
-			show_error("The requested document is not an attachment for any profil update");
+			show_error($this->p->t('profilUpdate','profilUpdate_dms_error'));
 			return;
 		}
 		
@@ -189,12 +209,12 @@ class ProfilUpdate extends Auth_Controller
 		//? if replace is set it contains the profil_update_id in which the attachment_id has to be replaced
 		if(isset($replace)){
 			$this->ProfilUpdateModel->addSelect(["attachment_id"]);
-			$attachmentID = $this->ProfilUpdateModel->load([$replace]);
-			if(isError($attachmentID)){
-				return json_encode(error("Error loading ProfilUpdate resource"));
+			$profilUpdate = $this->ProfilUpdateModel->load([$replace]);
+			if(isError($profilUpdate)){
+				return json_encode(error($this->p->t('profilUpdate','profilUpdate_loading_error')));
 			}
 			//? get the attachmentID
-			$dms_id = hasData($attachmentID) ? getData($attachmentID)[0]->attachment_id : null;
+			$dms_id = hasData($profilUpdate) ? getData($profilUpdate)[0]->attachment_id : null;
 			
 			//? delete old dms_file of Profil Update
 			$this->deleteOldVersionFile($dms_id);
@@ -250,7 +270,7 @@ class ProfilUpdate extends Auth_Controller
 				array_push($res, $this->DmsVersionModel->delete([$dms_id,$version]));
 			}
 		}else{
-			echo json_encode(error("No version of the file has been found"));
+			echo json_encode(error($this->p->t('profilUpdate','profilUpdate_dmsVersion_error')));
 		}
 		
 		//? returns a result for each deleted dms_file
@@ -280,7 +300,7 @@ class ProfilUpdate extends Auth_Controller
 		$this->ProfilUpdateModel->addSelect(["attachment_id"]);
 		$attachmentID = $this->ProfilUpdateModel->load([$id]);
 		if(isError($attachmentID)){
-			return json_encode(error("Error loading ProfilUpdate resource"));
+			return json_encode(error($this->p->t('profilUpdate','profilUpdate_loading_error')));
 		}
 		//? get the attachmentID
 		$dms_id = hasData($attachmentID) ? getData($attachmentID)[0]->attachment_id : null;
@@ -289,7 +309,7 @@ class ProfilUpdate extends Auth_Controller
 		$this->DmsVersionModel->addSelect(["name", "dms_id"]);
 		$attachment = $this->DmsVersionModel->load([$dms_id,0]);
 		if(isError($attachment)){
-			return json_encode(error("Error loading DmsVersion resource"));
+			return json_encode(error($this->p->t('profilUpdate','profilUpdate_dmsVersion_error')));
 		}
 		$attachment = hasData($attachment) ? getData($attachment) : null;
 		//? returns {name:..., dms_id:...}
@@ -304,7 +324,7 @@ class ProfilUpdate extends Auth_Controller
 		$payload = $json->payload;
 		$identifier = property_exists($json->payload,"kontakt_id")? "kontakt_id" : (property_exists($json->payload,"adresse_id")? "adresse_id" : null);
 		
-		$data = ["topic"=>$json->topic,"uid" => $this->uid, "requested_change" => json_encode($payload), "insertamum" => "NOW()", "insertvon"=>$this->uid,"status"=>"pending" ];
+		$data = ["topic"=>$json->topic,"uid" => $this->uid, "requested_change" => json_encode($payload), "insertamum" => "NOW()", "insertvon"=>$this->uid,"status"=>$this->p->t('profilUpdate', 'pending') ];
 		
 		//? insert fileID in the dataset if sent with post request
 		if(isset($json->fileID)){
@@ -315,13 +335,13 @@ class ProfilUpdate extends Auth_Controller
 		//? loops over all updateRequests from a user to validate if the new request is valid
 		$res = $this->ProfilUpdateModel->getProfilUpdatesWhere(["uid"=>$this->uid]);
 		if(isError($res)){
-			show_error("Error occured while querying the profil update requests of UID: ".$uid);
+			show_error($this->p->t('profilUpdate','profilUpdate_loading_error'));
 		}
 		$res = hasData($res)? getData($res):null;
 		
 		//? the user cannot delete a zustelladresse/kontakt
 		if( isset($payload->delete) && $payload->{$identifier=="kontakt_id"? "zustellung":"zustelladresse"}){
-			echo json_encode(error("cannot delete resource marked as zustellung"));
+			echo json_encode(error($this->p->t('profilUpdate','profilUpdate_deleteZustellung_error')));
 			return;
 		 }
 		 
@@ -330,14 +350,14 @@ class ProfilUpdate extends Auth_Controller
 			$adr = $this->AdresseModel->load($payload->$identifier);
 			$adr = getData($adr)[0];
 			if($adr->heimatadresse){
-				echo json_encode(error("cannot delete adresse marked as heimatadresse"));
+				echo json_encode(error($this->p->t('profilUpdate','profilUpdate_deleteZustellung_error')));
 				return;
 			}
 		}
 
 		if($res){
 		$pending_changes = array_filter($res, function($element) {
-			return $element->status == 'pending';
+			return $element->status == 'Pending' || $element->status == 'Ausstehend';
 		});
 
 		foreach($pending_changes as $update_request){
@@ -346,13 +366,13 @@ class ProfilUpdate extends Auth_Controller
 			 //? the user can add as many new kontakte/adressen as he likes
 			 if( !isset($payload->add) && property_exists($existing_change,$identifier) && property_exists($payload,$identifier) && $existing_change->$identifier == $payload->$identifier){
 				//? the kontakt_id / adresse_id of a change has to be unique 
-				echo json_encode(error("cannot change the same resource twice"));
+				echo json_encode(error($this->p->t('profilUpdate','profilUpdate_changeTwice_error')));
 				return;
 			}
 			
 			//? if it is not updating any kontakt/adresse, the topic has to be unique
 			elseif(!$identifier && $update_request->topic == $json->topic ){
-				echo json_encode(error("A request to change " . $json->topic . " is already open"));
+				echo json_encode(error($this->p->t('profilUpdate','profilUpdate_changeTopicTwice_error',['0'=>$update_request->topic])));
 				return;
 			}
 		}}
@@ -417,7 +437,7 @@ class ProfilUpdate extends Auth_Controller
 		
 		$res = $this->StudentModel->execReadOnlyQuery($query,[$student_uid]);
 		if(!isSuccess($res)){
-			show_error("was not able to query the oe_einheit of Student: ".$student_uid);
+			show_error($this->p->t('profilUpdate','profilUpdate_loadingOE_error'));
 		}
 		$res = hasData($res) ? getData($res) : [];
 		$res = array_map(
@@ -447,7 +467,7 @@ class ProfilUpdate extends Auth_Controller
 		
 		//! check for required information
 		if(!isset($id) || !isset($uid) || !isset($personID) || !isset($requested_change) || !isset($topic)){
-			return json_encode(error("missing required information"));
+			return json_encode(error($this->p->t('profilUpdate','profilUpdate_requiredInformation_error')));
 		}
 
 		$is_mitarbeiter_profil_update = getData($this->MitarbeiterModel->isMitarbeiter($uid));
@@ -468,7 +488,7 @@ class ProfilUpdate extends Auth_Controller
 				$requested_change['adresse_id'] = $insertID;
 				$update_res = $this->updateRequestedChange($id,$requested_change);
 				if(isError($update_res)){
-					echo json_encode(error("was not able to add addresse_id " . $insertID . " to profilRequest " . $id ));
+					echo json_encode(error($this->p->t('profilUpdate','profilUpdate_address_error',[$insertID, $id])  ));
 					return;
 				}
 			}
@@ -494,15 +514,15 @@ class ProfilUpdate extends Auth_Controller
 			
 			$result = $this->PersonModel->update($personID,[$topic=>$requested_change["value"]]);
 			if(isError($result)){
-				echo json_encode(error("was not able to update Person Information: " . $topic . " with value : " . $requested_change));
+				echo json_encode(error($this->p->t('profilUpdate','profilUpdate_insert_error')));
 				return;
 			}
 		}
-		$this->sendEmail_onProfilUpdate_response($uid,$topic,"accepted");
+		$this->sendEmail_onProfilUpdate_response($uid,$topic,$this->p->t('profilUpdate','accepted'));
 		
-		echo json_encode($this->setStatusOnUpdateRequest($id, "accepted", $status_message, $requested_change));
+		echo json_encode($this->setStatusOnUpdateRequest($id, $this->p->t('profilUpdate','accepted'), $status_message, $requested_change));
 	}else{
-		show_error("You have not the necessary permissions to accept this profil_update");
+		show_error($this->p->t('profilUpdate','profilUpdate_permission_error'));
 	}
 		
 		
@@ -525,10 +545,10 @@ class ProfilUpdate extends Auth_Controller
 			$this->permissionlib->isBerechtigt('mitarbeiter/stammdaten',"suid") && $is_mitarbeiter_profil_update 
 		)
 		{
-			$this->sendEmail_onProfilUpdate_response($uid,$topic,"rejected");
-			echo json_encode($this->setStatusOnUpdateRequest($id, "rejected", $status_message));
+			$this->sendEmail_onProfilUpdate_response($uid,$topic,$this->p->t('profilUpdate','rejected'));
+			echo json_encode($this->setStatusOnUpdateRequest($id, $this->p->t('profilUpdate','rejected'), $status_message));
 		}else{
-			show_error("You have not the necessary permissions to accept this profil_update");
+			show_error($this->p->t('profilUpdate','profilUpdate_permission_error'));
 		}
 		
 		
@@ -559,7 +579,7 @@ class ProfilUpdate extends Auth_Controller
 			$insertID = $this->KontaktModel->insert($requested_change);
 			$insert_kontakt_id = $insertID;
 			if(isError($insert_kontakt_id)){
-				show_error("was not able to insert new kontakt");
+				show_error($this->p->t('profilUpdate','profilUpdate_insertKontakt_error'));
 			}
 			$insert_kontakt_id = hasData($insert_kontakt_id)? getData($insert_kontakt_id):null;
 			if($insert_kontakt_id){
@@ -580,7 +600,7 @@ class ProfilUpdate extends Auth_Controller
 			$update_kontakt_id = $this->KontaktModel->update($kontakt_id,$requested_change);
 
 			if(isError($update_kontakt_id)){
-				show_error("was not able to update kontakt");
+				show_error($this->p->t('profilUpdate','profilUpdate_updateKontakt_error'));
 			}
 			$update_kontakt_id = hasData($update_kontakt_id) ? getData($update_kontakt_id) : null;
 			if($update_kontakt_id){
@@ -615,7 +635,7 @@ class ProfilUpdate extends Auth_Controller
 			$insertID = $this->AdresseModel->insert($requested_change);
 			$insert_adresse_id = $insertID;
 			if(isError($insert_adresse_id)){
-				show_error("was not able to insert new adresse");
+				show_error($this->p->t('profilUpdate','profilUpdate_insertAdresse_error'));
 			}
 			$insert_adresse_id = hasData($insert_adresse_id) ? getData($insert_adresse_id) : null;
 			if($insert_adresse_id){
@@ -633,7 +653,7 @@ class ProfilUpdate extends Auth_Controller
 			$requested_change['updatevon'] = getAuthUID();
 			$update_adresse_id = $this->AdresseModel->update($adresse_id,$requested_change);
 			if(isError($update_adresse_id)){
-				show_error("was not able to insert new adresse");
+				show_error($this->p->t('profilUpdate','profilUpdate_updateAdresse_error'));
 			}
 			$update_adresse_id = hasData($update_adresse_id) ? getData($update_adresse_id) : null;
 			if($update_adresse_id){
diff --git a/public/js/apps/Cis/Profil.js b/public/js/apps/Cis/Profil.js
index c1b1142f2..fc4b1dba2 100755
--- a/public/js/apps/Cis/Profil.js
+++ b/public/js/apps/Cis/Profil.js
@@ -236,11 +236,11 @@ const profilApp = Vue.createApp({
         view: null,
         data: {
           Personen_Informationen: {
-            title: "Personen Informationen",
+            title: this.$p.t('profil','personenInformationen'),
             view: null,
             data: {
               vorname: {
-                title: "vorname",
+                title: this.$p.t('person','vorname'),
                 view: "TextInputDokument",
                 withFiles: true,
                 data: {
@@ -249,7 +249,7 @@ const profilApp = Vue.createApp({
                 },
               },
               nachname: {
-                title: "nachname",
+                title: this.$p.t('person','nachname'),
                 view: "TextInputDokument",
                 withFiles: true,
                 data: {
@@ -258,7 +258,7 @@ const profilApp = Vue.createApp({
                 },
               },
               titel: {
-                title: "titel",
+                title: this.$p.t('global','titel'),
                 view: "TextInputDokument",
                 withFiles: true,
                 data: {
@@ -267,7 +267,7 @@ const profilApp = Vue.createApp({
                 },
               },
               postnomen: {
-                title: "postnomen",
+                title: this.$p.t('profil','postnomen'),
                 view: "TextInputDokument",
                 withFiles: true,
                 data: {
@@ -278,7 +278,7 @@ const profilApp = Vue.createApp({
             },
           },
           Private_Kontakte: {
-            title: "Private Kontakte",
+            title: this.$p.t('profil','privateAdressen'),
             data: this.data.kontakte
               ?.filter((item) => {
                 return !this.data.profilUpdates?.some(
@@ -296,7 +296,7 @@ const profilApp = Vue.createApp({
               }),
           },
           Private_Adressen: {
-            title: "Private Adressen",
+            title: this.$p.t('profil','privateAdressen'),
             data: this.data.adressen
               ?.filter((item) => {
                 return !this.data.profilUpdates?.some((update) => {
diff --git a/public/js/apps/Cis/ProfilUpdateRequests.js b/public/js/apps/Cis/ProfilUpdateRequests.js
index 5bd4d894e..10e11a200 100755
--- a/public/js/apps/Cis/ProfilUpdateRequests.js
+++ b/public/js/apps/Cis/ProfilUpdateRequests.js
@@ -1,6 +1,6 @@
 import fhcapifactory from "../api/fhcapifactory.js";
 import ProfilUpdateView from "../../components/Cis/ProfilUpdate/ProfilUpdateView.js";
-
+import Phrasen from "../../plugin/Phrasen.js";
 Vue.$fhcapi = fhcapifactory;
 
 
@@ -20,5 +20,5 @@ const app = Vue.createApp({
   }
   
 });
+app.use(Phrasen).mount("#content");
 
-app.mount("#content");
diff --git a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
index 4ff87b4c0..7f0ad5ed5 100755
--- a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
+++ b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
@@ -14,7 +14,7 @@ export default {
   props: {
     title: {
       type: String,
-      default: this.$p.t('profilUpdate','profilUpdateRequest'),
+      
     },
     value: {
       type: Object,
@@ -132,7 +132,7 @@ export default {
     </div>
 
 
-    <div v-if="data.status!=='pending'" class="form-underline mb-2 col-12 col-sm-6">
+    <div v-if="data.status!==$p.t('profilUpdate','pending')" class="form-underline mb-2 col-12 col-sm-6">
       <div class="form-underline-titel">{{$p.t('profilUpdate','statusDate')}}: </div>
       <!-- only status timestamp and status message can be null in the database -->
       <span  class="form-underline-content" >{{data.status_timestamp?data.status_timestamp:'-'}}</span>
@@ -170,7 +170,7 @@ export default {
     </div>
 
     <!-- Row with the status message is only visible if the request is not pending and the message is not empty -->
-    <div v-if="data.status !=='pending' && data.status_message" class="row">
+    <div v-if="data.status !== $p.t('profilUpdate','pending') && data.status_message" class="row">
     <div class="col">
     <div  class="form-underline mb-2 ">
     <div class="form-underline-titel">{{$p.t('profilUpdate','statusMessage')}}</div>
@@ -206,7 +206,7 @@ export default {
     </template>
     
 
-    <template v-if="data.status === 'pending'"  v-slot:footer>
+    <template v-if="data.status === $p.t('profilUpdate','pending')"  v-slot:footer>
     <div  class="form-underline flex-fill">
       <div class="form-underline-titel">{{$p.t('global','nachricht')}}</div>
 
diff --git a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
index d04495835..cede054ff 100644
--- a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
+++ b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
@@ -322,7 +322,7 @@ export default{
   template: /*html*/`
     <div>
     
-    <accept-deny-update v-if="showModal" ref="AcceptDenyModal" @hideBsModal="hideAcceptDenyModal" :value="JSON.parse(JSON.stringify(modalData))" :setLoading="setLoading" ></accept-deny-update>
+    <accept-deny-update :title="$p.t('profilUpdate','profilUpdateRequest')" v-if="showModal" ref="AcceptDenyModal" @hideBsModal="hideAcceptDenyModal" :value="JSON.parse(JSON.stringify(modalData))" :setLoading="setLoading" ></accept-deny-update>
     
     <div  class="form-underline flex-fill ">
       <div class="form-underline-titel">{{$p.t('ui','anzeigen')}} </div>
diff --git a/system/dbupdate_3.4/25999_C4_ma0594.php b/system/dbupdate_3.4/25999_C4_ma0594.php
index 071d33bf7..520b3c84b 100755
--- a/system/dbupdate_3.4/25999_C4_ma0594.php
+++ b/system/dbupdate_3.4/25999_C4_ma0594.php
@@ -9,9 +9,12 @@
             CONSTRAINT tbl_profil_update_status_pk PRIMARY KEY(status_kurzbz)
         );
 
-        INSERT INTO public.tbl_profil_update_status VALUES  ('pending','Profil Änderungen die neu erstellt wurden und noch nicht akzeptiert oder abgelehnt wurden'),
-                                                            ('accepted','Profil Änderungen die akzeptiert wurden'),
-                                                            ('rejected','Profil Änderungen die abgelehn wurden');";
+        INSERT INTO public.tbl_profil_update_status VALUES  ('Ausstehend','Profil Änderungen die noch nicht bearbeitet wurden'),
+                                                            ('Pending','Profil updates that were not processed yet'),
+                                                            ('Akzeptiert','Profil Änderungen die akzeptiert wurden'),
+                                                            ('Accepted','Profil updates that were accepted'),
+                                                            ('Abgelehnt','Profil Änderungen die abgelehn wurden'),
+                                                            ('Rejected','Profil updates that were rejected');";
 
         if(!$db->db_query($qry))
         echo '<strong>public.tbl_profil_update_status: '.$db->db_last_error().'</strong><br>';
@@ -28,16 +31,26 @@
             CONSTRAINT tbl_profil_update_topic_pk PRIMARY KEY(topic_kurzbz)
         );
 
-        INSERT INTO public.tbl_profil_update_topic VALUES   ('vorname','Vorname aktualisieren'),
-                                                            ('nachname','Nachname aktualisieren'),
-                                                            ('titel','Titel aktualisieren'),
-                                                            ('postnomen','Postnomen aktualisieren'),
+        INSERT INTO public.tbl_profil_update_topic VALUES   ('Vorname','Vorname aktualisieren'),
+                                                            ('First name','Update first name'),
+                                                            ('Nachname','Nachname aktualisieren'),
+                                                            ('Last name','Update last name'),
+                                                            ('Titel','Titel aktualisieren'),
+                                                            ('Title','Update title'),
+                                                            ('Postnomen','Postnomen aktualisieren'),
+                                                            ('post-nominals','Update post-nominals'),
                                                             ('Private Kontakte','Kontakt aktualisieren'),
-                                                            ('Delete Kontakte','Kontakt löschen'),
-                                                            ('Add Kontakte','Kontakt hinzufügen'),
+                                                            ('Private Contacts','Update contact'),
+                                                            ('Kontakt löschen','Kontakt löschen'),
+                                                            ('Delete contact','Delete contact'),
+                                                            ('Kontakt hinzufügen','Kontakt hinzufügen'),
+                                                            ('Add contact','Add contact'),
                                                             ('Private Adressen','Adresse aktualisieren'),
-                                                            ('Delete Adressen','Adresse löschen'),
-                                                            ('Add Adressen','Adresse hinzufügen');";
+                                                            ('Private Addresses','Update address'),
+                                                            ('Adresse löschen','Adresse löschen'),
+                                                            ('Delete address','Delete address'),
+                                                            ('Adresse hinzufügen','Adresse löschen'),
+                                                            ('Add address','Add address');";
 
         if(!$db->db_query($qry))
         echo '<strong>public.tbl_profil_update_topic: '.$db->db_last_error().'</strong><br>';
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 77ce4350b..f3ad131a7 100755
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -5214,7 +5214,7 @@ The invoice will be sent to you again. <u><strong>The amount is only to be trans
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'An Error occured. Password change failed.',
+				'text' => 'An Error occurred. Password change failed.',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -24161,19 +24161,39 @@ array(
 		array(
 			'app' => 'core',
 			'category' => 'profil',
-			'phrase' => 'privateKontakte',
+			'phrase' => 'personenInformationen',
 			'insertvon' => 'system',
 			'phrases' => array(
 				array(
 					'sprache' => 'German',
-					'text' => 'Private Kontakte',
-					'description' => 'Profil Kategorie in der die ganzen privaten Kontakte einer Person aufgelistet werden',
+					'text' => 'Personen Informationen',
+					'description' => '',
 					'insertvon' => 'system'
 				),
 				array(
 					'sprache' => 'English',
-					'text' => 'Private Contacts',
-					'description' => 'Profile category in which all private contacts of a person are listed',
+					'text' => 'Person Information',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'postnomen',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Postnomen',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'post-nominals',
+					'description' => '',
 					'insertvon' => 'system'
 				)
 			)
@@ -25020,6 +25040,568 @@ array(
 				)
 			)
 		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'deleteContact',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Kontakt löschen',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Delete contact',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'deleteAddress',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Adresse löschen',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Delete address',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'addContact',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Kontakt hinzufügen',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Add contact',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'addContact',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Adresse hinzufügen',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Add address',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'vorname',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Vorname',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'First name',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'nachname',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Nachname',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Last name',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'title',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Titel',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Title',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'pending',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Ausstehend',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Pending',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'accepted',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Akzeptiert',
+					'description' => 'Profil Änderungen die akzeptiert wurden',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Accepted',
+					'description' => 'Profil updates that were accepted',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'rejected',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Abgelehnt',
+					'description' => 'Profil Änderungen die abgelehnt wurden',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Rejected',
+					'description' => 'Profil updates that were rejected',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'profilUdate_address_error',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Nicht möglich adressenID {0} für profil Änderung {1} hinzuzufügen',
+					'description' => 'Fehlermeldung wenn die AdressenID bereits in einer Profil Änderung verwendet wurde',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'was not able to add addressID {0} to profilRequest {1}',
+					'description' => 'Error message when the addressID was already used for another profil update',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'profilUpdate_permission_error',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Notwendinge Berechtigungen fehlen',
+					'description' => 'Fehlermeldung wenn notwendige Berechtigungen für Aktionen fehlen',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Missing necessary permission',
+					'description' => 'Error message if necessary permissions are missing',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'profilUpdate_dms_error',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Das angeforderte Dokument ist kein Anhang einer Profil Änderung',
+					'description' => 'Fehlermeldung wenn ein Dokument angefordert wird, das nicht im zusammenhang mit einer Profil Änderung ist',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'The requested document is not an attachment for any profil update',
+					'description' => 'Error message if a document is requested that is not connected with a profil update',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'profilUpdate_email_error',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Ein Fehler ist aufgetreten beim sender der Email',
+					'description' => 'Fehlermeldung wenn ein Fehler beim senden einer Email auftritt',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'An error occurred when sending an email',
+					'description' => 'Error message if an error occurred while sending emails',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'profilUpdate_studentCheck_error',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Ein Fehler ist aufgetreten beim Überprüfen ob die Person ein Student ist',
+					'description' => 'Fehlermeldung wenn ein Fehler beim überprüfen eines Studenten auftritt',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'An error occurred while checking if the person is a student',
+					'description' => 'Error message if an error occurred when checking if a person is a student',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'profilUpdate_mitarbeiterCheck_error',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Ein Fehler ist aufgetreten, es wurde kein Mitarbeiter mit der gleichen uid gefunden',
+					'description' => 'Fehlermeldung wenn ein Fehler beim überprüfen eines Mitarbeiter auftritt',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'An error occurred while checking if the person is a mitarbeiter',
+					'description' => 'Error message if an error occurred when checking if a person is a mitarbeiter',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'profilUpdate_loading_error',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Ein Fehler beim laden der Profil Änderung ist aufgetreten',
+					'description' => 'Fehlermeldung wenn ein Fehler beim laden einer Profil Änderung auftritt',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'An error occurred while loading the profil update',
+					'description' => 'Error message if an error occurred when loading a profil update',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'profilUpdate_dmsVersion_error',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Ein Fehler beim laden der Dms Version ist aufgetreten',
+					'description' => 'Fehlermeldung wenn ein Fehler beim laden einer Dms Version auftritt',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'An error occurred while loading the dms version',
+					'description' => 'Error message if an error occurred when loading a dms version',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'profilUpdate_deleteZustellung_error',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Ein Fehler ist aufgetretten, man kann keine Zustellung löschen',
+					'description' => 'Fehlermeldung wenn versucht wird eine Zustellungsresource zu löschen',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'An error occurred, it is not possible to delete a resource marked as zustellung',
+					'description' => 'Error message if someone tried to delete a resource that is marked as zustellung',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'profilUpdate_changeTwice_error',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Ein Fehler ist aufgetretten, man kann die gleiche Profil Information nicht zweimal ändern',
+					'description' => 'Fehlermeldung wenn versucht wird eine Information zweimal zu ändern',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'An error occurred, it is not possible to change the same profil information twice',
+					'description' => 'Error message if someone tried to change the same profil information twice',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'profilUpdate_changeTopicTwice_error',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Eine Anfrage {0} ist bereits geöffnet worden',
+					'description' => 'Wenn die Profil Änderung nicht über Kontakte oder Adressen ist dann darf das Topic nur einmalig verändert werden',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'A request to change {0} is already open',
+					'description' => 'if the profil update is not about contacts or addresses then the topic has to be unique',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'profilUpdate_loadingOE_error',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Ein Fehler beim laden der oe_einheit ist aufgetreten',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'An error occurred, when loading the oe_einheit',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'profilUpdate_requiredInformation_error',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Ein Fehler ist aufgetreten, notwendige Informationen fehlen',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'An error occurred, required informations are missing',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'profilUpdate_insert_error',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Ein Fehler ist beim hinzufügen der Profil Änderung aufgetreten',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'An error occurred during the insertion of the profil update',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'profilUpdate_insertKontakt_error',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Ein Fehler ist beim hinzufügen des Kontaktes aufgetreten',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'An error occurred during the insertion of the contact',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'profilUpdate_insertAdresse_error',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Ein Fehler ist beim hinzufügen der Adresse aufgetreten',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'An error occurred during the insertion of the address',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'profilUpdate_updateKontakt_error',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Ein Fehler ist beim ändern eines Kontaktes aufgetreten',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'An error occurred while updating a profil update contact',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'profilUpdate_updateAdresse_error',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Ein Fehler ist beim ändern einer Adresse aufgetreten',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'An error occurred while updating a profil update address',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		
+		
 		
 		
 		

From 960341e25ddd395ca46dc3cbafc34c7aa03bb413 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 8 Apr 2024 15:08:20 +0200
Subject: [PATCH 0560/1461] adds more profil phrasen error messages

---
 application/controllers/Cis/ProfilUpdate.php |  4 +-
 system/phrasesupdate.php                     | 41 ++++++++++++++++++++
 2 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
index 86fa57b22..6daf11dcf 100755
--- a/application/controllers/Cis/ProfilUpdate.php
+++ b/application/controllers/Cis/ProfilUpdate.php
@@ -670,7 +670,7 @@ class ProfilUpdate extends Auth_Controller
 			$this->PersonModel->addJoin("public.tbl_kontakt","public.tbl_kontakt.person_id = public.tbl_person.person_id");
 			$zustellKontakteArray = $this->PersonModel->loadWhere(["public.tbl_person.person_id"=>$this->pid, "zustellung"=>TRUE]);
 			if(!isSuccess($zustellKontakteArray)){
-				return error("error when querying zustellkontakte");
+				return error($this->p->t('profilUpdate','profilUpdate_loadingZustellkontakte_error'));
 			}
 			$zustellKontakteArray = hasData($zustellKontakteArray) ? getData($zustellKontakteArray) : null;
 
@@ -692,7 +692,7 @@ class ProfilUpdate extends Auth_Controller
 			$this->PersonModel->addJoin("public.tbl_adresse","public.tbl_adresse.person_id = public.tbl_person.person_id");
 			$zustellAdressenArray = $this->PersonModel->loadWhere(["public.tbl_person.person_id"=>$this->pid, "zustelladresse"=>TRUE]);
 			if(!isSuccess($zustellAdressenArray)){
-				return error("error when querying zustelladressen");
+				return error($this->p->t('profilUpdate','profilUpdate_loadingZustellAdressen_error'));
 			}
 			$zustellAdressenArray = hasData($zustellAdressenArray) ? getData($zustellAdressenArray) : null;
 
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index f3ad131a7..4c9bec056 100755
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -25600,6 +25600,47 @@ array(
 				)
 			)
 		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'profilUpdate_loadingZustellkontakte_error',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Ein Fehler ist während dem laden der Zustellkontakte aufgetreten',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'An error occurred when querying zustellkontakte',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'profilUpdate_loadingZustellAdressen_error',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Ein Fehler ist während dem laden der Zustelladressen aufgetreten',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'An error occurred when querying zustelladressen',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		
 		
 		
 		

From 2df91bce5c51f8e2783603494128bcabd3c5ed05 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 8 Apr 2024 15:49:28 +0200
Subject: [PATCH 0561/1461] adds phrasen to the ProfilUpdateView.js file

---
 .../ProfilComponents/FetchProfilUpdates.js    | 10 ++--
 .../Cis/ProfilUpdate/ProfilUpdateView.js      | 51 +++++++---------
 system/phrasesupdate.php                      | 60 +++++++++++++++++++
 3 files changed, 86 insertions(+), 35 deletions(-)

diff --git a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
index a23956f7f..630569a6e 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
@@ -81,7 +81,7 @@ export default {
       }
 
       //? adds the status information if the profil update request was rejected or accepted
-      if (updateRequest.status !== "pending") {
+      if (updateRequest.status !== this.$p.t('profilUpdate','pending')) {
         content["status"] = updateRequest.status;
         content["status_message"] = updateRequest.status_message;
         content["status_timestamp"] = updateRequest.status_timestamp;
@@ -114,7 +114,7 @@ export default {
       );
     },
     getView: function (topic, status) {
-      if (!(status === "pending")) {
+      if (!(status === this.$p.t('profilUpdate','pending'))) {
         return "Status";
       }
 
@@ -194,7 +194,7 @@ export default {
       }
 
       //? adds the status information if the profil update request was rejected or accepted
-      if (updateRequest.status !== "pending") {
+      if (updateRequest.status !== this.$p.t('profilUpdate','pending')) {
         content["status"] = updateRequest.status;
         content["status_message"] = updateRequest.status_message;
         content["status_timestamp"] = updateRequest.status_timestamp;
@@ -243,12 +243,12 @@ export default {
                 </tr>
             </thead>
             <tbody>
-                <tr v-for="item in data" :style="item.status=='accepted'?'background-color:lightgreen':item.status==='rejected'?'background-color:lightcoral':''">
+                <tr v-for="item in data" :style="item.status==$p.t('profilUpdate','accepted')?'background-color:lightgreen':item.status===$p.t('profilUpdate','rejected')?'background-color:lightcoral':''">
                 <td class="align-middle text-wrap ">{{item.topic}}</td>
                 <td class="align-middle " >{{item.status}}</td>
                 <td class="align-middle">{{item.status_timestamp?item.status_timestamp:item.insertamum}}</td>
                 
-                <template v-if="item.status === 'pending'">
+                <template v-if="item.status === $p.t('profilUpdate','pending')">
                 <td>
                 
                 <div class="d-flex flex-row justify-content-evenly">
diff --git a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
index cede054ff..052520e42 100644
--- a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
+++ b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
@@ -7,10 +7,10 @@ import Loading from "../../../components/Loader.js";
 
 const sortProfilUpdates = (ele1, ele2) => {
   let result = 0;
-  if (ele1.status === "pending") {
+  if (ele1.status === this.$p.t('profilUpdate','pending')) {
     result = -1;
-  } else if (ele1.status === "accepted") {
-    result = ele2.status === "rejected" ? -1 : 1;
+  } else if (ele1.status === this.$p.t('profilUpdate','accepted')) {
+    result = ele2.status === this.$p.t('profilUpdate','rejected') ? -1 : 1;
   } else {
     result = 1;
   }
@@ -95,10 +95,10 @@ export default{
         },
         rowContextMenu: (e, component) => {
           let menu = [];
-          if (component.getData().status === "pending") {
+          if (component.getData().status === this.$p.t('profilUpdate','pending')) {
             menu.push(
               {
-                label: "<i class='fa fa-check'></i> Accept Request",
+                label: `<i class='fa fa-check'></i> ${this.$p.t('profilUpdate','acceptUpdate')}`,
                 action: (e, column) => {
                   Vue.$fhcapi.ProfilUpdate.acceptProfilRequest(column.getData())
                     .then((res) => {
@@ -114,7 +114,7 @@ export default{
               },
               {
                 label:
-                  " <i style='width:16px' class='text-center fa fa-xmark'></i> Deny Request",
+                  ` <i style='width:16px' class='text-center fa fa-xmark'></i> ${this.$p.t('profilUpdate','denyUpdate')}`,
                 action: (e, column) => {
                   Vue.$fhcapi.ProfilUpdate.denyProfilRequest(
                     column.getData()
@@ -129,7 +129,7 @@ export default{
                 separator: true,
               },
               {
-                label: "<i class='fa fa-eye'></i> Show Request",
+                label: `<i class='fa fa-eye'></i> ${this.$p.t('profilUpdate','showRequest')}`,
                 action: (e, column) => {
                   this.showAcceptDenyModal(column.getData());
                     
@@ -138,7 +138,7 @@ export default{
             );
           } else {
             menu.push({
-              label: "<i class='fa fa-eye'></i> Show Request",
+              label: `<i class='fa fa-eye'></i> ${this.$p.t('profilUpdate','showRequest')}`,
               action: (e, column) => {
                 this.showAcceptDenyModal(column.getData());
               },
@@ -188,17 +188,19 @@ export default{
             field: "status",
             hozAlign: "center",
             headerFilter: true,
-            formatter: function (cell, para) {
-              switch (cell.getValue()) {
-                case "pending":
-                  return "<div class='row justify-content-center'><div class='col-2'><i class='fa fa-circle-info text-info fa-lg'></i></div> <div class='col-4'><span>pending</span></div></div>";
-                case "accepted":
-                  return "<div class='row justify-content-center'><div class='col-2'><i class='fa fa-circle-check text-success fa-lg'></i></div> <div class='col-4'><span>accepted</span></div></div>";
-                case "rejected":
-                  return "<div class='row justify-content-center'><div class='col-2'><i class='fa-solid fa-circle-xmark text-danger fa-lg '></i></div> <div class='col-4'><span>rejected</span></div></div>";
-                default:
-                  return "<p>default</p>";
+            formatter: (cell, para) => {
+              let iconClasses ="fa fa-lg"
+              if(cell.getValue() == this.$p.t('profilUpdate','pending')) {
+                iconClasses += " fa-circle-info text-info "
               }
+              else if(cell.getValue() == this.$p.t('profilUpdate','accepted')) {
+                iconClasses += " fa-circle-check text-success "
+              }
+              else if(cell.getValue() == this.$p.t('profilUpdate','rejected')) {
+                iconClasses += " fa-circle-xmark text-danger "
+              }
+
+              return `<div class='row justify-content-center'><div class='col-2'><i class='${iconClasses}'></i></div> <div class='col-4'><span>${cell.getValue()}</span></div></div>`;
             },
 
             resizable: true,
@@ -269,18 +271,7 @@ export default{
         this.$refs.AcceptDenyModal.show();
       });
     },
-    /* showModal: function (value) {
-      AcceptDenyUpdate.popup({ value: value, setLoading:this.setLoading })
-        .then((res) => {
-          
-          //? refetches the data, if any request was denied or accepted
-          //* setData will call the ajaxURL again to refresh the data
-          this.$refs.UpdatesTable.tabulator.setData();
-        }).catch(err=>{
-         
-        })
-        
-    }, */
+    
     updateData: function (event) {
       this.$refs.UpdatesTable.tabulator.setData();
       //? store the selected view in the session storage of the browser
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 4c9bec056..8b8bd5dd6 100755
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -25640,6 +25640,66 @@ array(
 				)
 			)
 		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'acceptUpdate',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Änderung annehmen',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Accept Request',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'denyUpdate',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Änderung ablehnen',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Deny Request',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'showRequest',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Änderung anzeigen',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Show request',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
 		
 		
 		

From 78031bf1adc14cf7dab1cf54409d5ef704b649d3 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 9 Apr 2024 09:08:47 +0200
Subject: [PATCH 0562/1461] fixes buggs that were produced with the
 introduction of new phrasen

---
 application/controllers/Cis/ProfilUpdate.php                | 6 ++++--
 public/js/apps/Cis/Profil.js                                | 2 +-
 .../Cis/Profil/ProfilComponents/FetchProfilUpdates.js       | 2 +-
 .../Profil/ProfilModal/EditProfilComponents/EditAdresse.js  | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
index 6daf11dcf..c6eade77f 100755
--- a/application/controllers/Cis/ProfilUpdate.php
+++ b/application/controllers/Cis/ProfilUpdate.php
@@ -508,8 +508,10 @@ class ProfilUpdate extends Auth_Controller
 			
 		}else{
 			switch($topic){
-				case "titel": $topic ="titelpre"; break;
-				case "postnomen": $topic = "titelpost"; break;
+				// mapping phrasen to database columns to make the update with the correct column names
+				case $this->p->t('profilUpdate','title'): $topic ="titelpre"; break;
+				case $this->p->t('profilUpdate','postnomen'): $topic = "titelpost"; break;
+				case $this->p->t('profilUpdate','vorname'): $topic = "vorname"; break;
 			}
 			
 			$result = $this->PersonModel->update($personID,[$topic=>$requested_change["value"]]);
diff --git a/public/js/apps/Cis/Profil.js b/public/js/apps/Cis/Profil.js
index fc4b1dba2..a5bf7141d 100755
--- a/public/js/apps/Cis/Profil.js
+++ b/public/js/apps/Cis/Profil.js
@@ -278,7 +278,7 @@ const profilApp = Vue.createApp({
             },
           },
           Private_Kontakte: {
-            title: this.$p.t('profil','privateAdressen'),
+            title: this.$p.t('profil','privateKontakte'),
             data: this.data.kontakte
               ?.filter((item) => {
                 return !this.data.profilUpdates?.some(
diff --git a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
index 630569a6e..63ad2d8fe 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
@@ -233,7 +233,7 @@ export default {
                       </div>
                       <div class="card-body" >
     <div class="table-responsive text-nowrap">
-        <table class="m-0  table  table-hover">
+        <table class="m-0  table  table-hover align-middle">
             <thead >
                 <tr >
                 <th scope="col">{{$p.t('profilUpdate','topic')}}</th>
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js
index 19d5b8c92..d8238c736 100755
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js
@@ -102,7 +102,7 @@ export default {
 
   template: /*html*/ `
      <div class="gy-3 row justify-content-center align-items-center">
-     
+     <pre>{{JSON.stringify(data,null,2)}}</pre>
      <!-- warning message for too many zustellungs Adressen -->
      <div v-if="showZustellAdressenWarning" class="col-12 ">
      <div class="card bg-danger mx-2">

From 026a276c020486ad89913dcd24dcbf8971993ec4 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 9 Apr 2024 11:11:03 +0200
Subject: [PATCH 0563/1461] add grant on frist_id sequence

---
 system/dbupdate_3.4/37107_fristenmanagement.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/system/dbupdate_3.4/37107_fristenmanagement.php b/system/dbupdate_3.4/37107_fristenmanagement.php
index 68eda70b0..ee023b13e 100644
--- a/system/dbupdate_3.4/37107_fristenmanagement.php
+++ b/system/dbupdate_3.4/37107_fristenmanagement.php
@@ -56,6 +56,8 @@ if ($result = $db->db_query("SELECT * FROM information_schema.tables WHERE table
         GRANT SELECT, UPDATE, INSERT, DELETE ON hr.tbl_frist_status TO vilesci;
         GRANT SELECT, UPDATE, INSERT, DELETE ON hr.tbl_frist_ereignis TO vilesci;
 
+	GRANT USAGE ON hr.tbl_frist_frist_id_seq TO vilesci;
+
         INSERT INTO hr.tbl_frist_status(status_kurzbz, bezeichnung, sort) VALUES('neu','Neu', 1);
         INSERT INTO hr.tbl_frist_status(status_kurzbz, bezeichnung, sort) VALUES('in_bearbeitung','In Bearbeitung', 2);
         INSERT INTO hr.tbl_frist_status(status_kurzbz, bezeichnung, sort) VALUES('erledigt','Erledigt', 3);

From 5b2365a1e2b97ddb8380b0959cfa46ed2808d0b7 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 9 Apr 2024 15:02:17 +0200
Subject: [PATCH 0564/1461] stores the status of profilUpdate with their
 language in the database and adapts the logic to it

---
 application/controllers/Cis/ProfilUpdate.php  | 48 ++++++++--
 .../models/person/Profil_update_model.php     | 11 ++-
 .../person/Profil_update_status_model.php     | 18 ++++
 .../person/Profil_update_topic_model.php      | 16 ++++
 .../Cis/ProfilUpdate/ProfilUpdateView.js      | 45 +++++-----
 system/dbupdate_3.4/25999_C4_ma0594.php       | 48 +++++-----
 system/phrasesupdate.php                      | 87 ++++++++++++++++++-
 7 files changed, 214 insertions(+), 59 deletions(-)
 create mode 100644 application/models/person/Profil_update_status_model.php
 create mode 100644 application/models/person/Profil_update_topic_model.php

diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
index c6eade77f..0eeec40da 100755
--- a/application/controllers/Cis/ProfilUpdate.php
+++ b/application/controllers/Cis/ProfilUpdate.php
@@ -9,6 +9,11 @@ if (!defined('BASEPATH'))
 class ProfilUpdate extends Auth_Controller
 {
 
+	public static $STATUS_PENDING =NULL;
+	public static $STATUS_ACCEPTED =NULL;
+	public static $STATUS_REJECTED =NULL;
+	
+
 	public function __construct(){
 		parent::__construct([
 			'index' => ['student/stammdaten:r','mitarbeiter/stammdaten:r'],
@@ -38,7 +43,8 @@ class ProfilUpdate extends Auth_Controller
 		$this->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
 		$this->load->model('crm/Student_model', 'StudentModel');
 		$this->load->model('person/Benutzer_model', 'BenutzerModel');
-
+		$this->load->model('system/Sprache_model', 'SpracheModel');
+		$this->load->model('person/Profil_update_status_model', 'ProfilUpdateStatusModel');
 
 		// Load language phrases
         $this->loadPhrases(
@@ -57,9 +63,22 @@ class ProfilUpdate extends Auth_Controller
 		//? put the uid and pid inside the controller for reusability
 		$this->uid = getAuthUID();
 		$this->pid = getAuthPersonID();
+
+		// static constants
+		$this->ProfilUpdateStatusModel->addSelect(['status_kurzbz']);
+		$status_kurzbz = $this->ProfilUpdateStatusModel->load();
+		if(hasData($status_kurzbz)){
+			list($status_pending, $status_accepted, $status_rejected) = getData($status_kurzbz);
+			
+			self::$STATUS_PENDING = $status_pending->status_kurzbz;
+			self::$STATUS_ACCEPTED = $status_accepted->status_kurzbz;
+			self::$STATUS_REJECTED = $status_rejected->status_kurzbz;
+		}
 	}
 
 
+	
+
 	public function index(){
 		$this->load->view('Cis/ProfilUpdate');
 	}
@@ -324,7 +343,7 @@ class ProfilUpdate extends Auth_Controller
 		$payload = $json->payload;
 		$identifier = property_exists($json->payload,"kontakt_id")? "kontakt_id" : (property_exists($json->payload,"adresse_id")? "adresse_id" : null);
 		
-		$data = ["topic"=>$json->topic,"uid" => $this->uid, "requested_change" => json_encode($payload), "insertamum" => "NOW()", "insertvon"=>$this->uid,"status"=>$this->p->t('profilUpdate', 'pending') ];
+		$data = ["topic"=>$json->topic,"uid" => $this->uid, "requested_change" => json_encode($payload), "insertamum" => "NOW()", "insertvon"=>$this->uid, "status"=>self::$STATUS_PENDING?:'Pending'  ];
 		
 		//? insert fileID in the dataset if sent with post request
 		if(isset($json->fileID)){
@@ -357,7 +376,7 @@ class ProfilUpdate extends Auth_Controller
 
 		if($res){
 		$pending_changes = array_filter($res, function($element) {
-			return $element->status == 'Pending' || $element->status == 'Ausstehend';
+			return $element->status == isset(self::$STATUS_PENDING)?:"Pending";
 		});
 
 		foreach($pending_changes as $update_request){
@@ -419,13 +438,30 @@ class ProfilUpdate extends Auth_Controller
 
 
 	public function getProfilUpdateWithPermission($status=null){
+
 		
+
+		// early return if no status has been passed as argument
+		if(!isset($status)){
+			echo json_encode($this->ProfilUpdateModel->getProfilUpdateWithPermission());
+			return;
+		}
+
+		// get the sprache of the user
+		$sprachenIndex = $this->SpracheModel->loadWhere(["sprache"=>getUserLanguage()]);
+		$sprachenIndex = hasData($sprachenIndex)? getData($sprachenIndex)[0]->index : null;
+
+		if(isset($sprachenIndex) && isset($status)){
+			// get the corresponding status kurz_bz primary key out of the translation
+			$status = $this->ProfilUpdateStatusModel->execReadOnlyQuery("select * from public.tbl_profil_update_status where ? = ANY(bezeichnung_mehrsprachig)",[$status]);
+			$status = hasData($status) ? getData($status)[0]->status_kurzbz : null;
+			$res = $this->ProfilUpdateModel->getProfilUpdateWithPermission(isset($status)?['status'=>$status]:null);
 		
-		$res = $this->ProfilUpdateModel->getProfilUpdateWithPermission(isset($status)?['status'=>$status]:null);
-		
-		echo json_encode($res);
+			echo json_encode($res);
+		}
 	}
 
+
 	
 	private function getOE_from_student($student_uid){
 
diff --git a/application/models/person/Profil_update_model.php b/application/models/person/Profil_update_model.php
index a49fc4c24..b7efcea22 100755
--- a/application/models/person/Profil_update_model.php
+++ b/application/models/person/Profil_update_model.php
@@ -88,7 +88,8 @@ class Profil_update_model extends DB_Model
 		$studentBerechtigung = $this->permissionlib->isBerechtigt('student/stammdaten', 's');
 		$mitarbeiterBerechtigung = $this->permissionlib->isBerechtigt('mitarbeiter/stammdaten', 's');
 		$oe_berechtigung = $this->permissionlib->getOE_isEntitledFor('student/stammdaten');
-
+		
+		$lang = "select index from public.tbl_sprache where sprache =" . $this->escape(getUserLanguage());	
 		$res = [];
 
 		if ($studentBerechtigung) {
@@ -98,8 +99,9 @@ class Profil_update_model extends DB_Model
 			$parameters = [];
 			$query = "
 			SELECT
-			profil_update_id, tbl_profil_update.uid, (tbl_person.vorname || ' ' || tbl_person.nachname) AS name , topic, requested_change, tbl_profil_update.updateamum, tbl_profil_update.updatevon, tbl_profil_update.insertamum, tbl_profil_update.insertvon, status, status_timestamp, status_message, attachment_id 
-			FROM public.tbl_profil_update 
+			profil_update_id, tbl_profil_update.uid, (tbl_person.vorname || ' ' || tbl_person.nachname) AS name , topic, requested_change, tbl_profil_update.updateamum, tbl_profil_update.updatevon, tbl_profil_update.insertamum, tbl_profil_update.insertvon, status, public.tbl_profil_update_status.bezeichnung_mehrsprachig[(".$lang.")] as status_translated, status_timestamp, status_message, attachment_id 
+			FROM public.tbl_profil_update
+			JOIN public.tbl_profil_update_status ON public.tbl_profil_update_status.status_kurzbz = public.tbl_profil_update.status 
 			JOIN public.tbl_student ON public.tbl_student.student_uid=public.tbl_profil_update.uid
 			JOIN public.tbl_benutzer ON public.tbl_benutzer.uid = public.tbl_student.student_uid
 			JOIN public.tbl_person ON public.tbl_benutzer.person_id=public.tbl_person.person_id
@@ -123,7 +125,8 @@ class Profil_update_model extends DB_Model
 			}
 		}
 		if ($mitarbeiterBerechtigung) {
-			$this->addSelect(["profil_update_id", "tbl_profil_update.uid", "(tbl_person.vorname || ' ' || tbl_person.nachname) AS name", "topic", "requested_change", "tbl_profil_update.updateamum", "tbl_profil_update.updatevon", "tbl_profil_update.insertamum", "tbl_profil_update.insertvon", "status", "status_timestamp", "status_message", "attachment_id"]);
+			$this->addSelect(["profil_update_id", "tbl_profil_update.uid", "(tbl_person.vorname || ' ' || tbl_person.nachname) AS name", "topic", "requested_change", "tbl_profil_update.updateamum", "tbl_profil_update.updatevon", "tbl_profil_update.insertamum", "tbl_profil_update.insertvon", "status", "public.tbl_profil_update_status.bezeichnung_mehrsprachig[(".$lang.")] AS status_translated", "status_timestamp", "status_message", "attachment_id"]);
+			$this->addJoin('tbl_profil_update_status', 'tbl_profil_update_status.status_kurzbz=tbl_profil_update.status');
 			$this->addJoin('tbl_mitarbeiter', 'tbl_mitarbeiter.mitarbeiter_uid=tbl_profil_update.uid');
 			$this->addJoin('tbl_benutzer', 'tbl_benutzer.uid=tbl_profil_update.uid');
 			$this->addJoin('tbl_person', 'tbl_benutzer.person_id=tbl_person.person_id');
diff --git a/application/models/person/Profil_update_status_model.php b/application/models/person/Profil_update_status_model.php
new file mode 100644
index 000000000..e69f9a047
--- /dev/null
+++ b/application/models/person/Profil_update_status_model.php
@@ -0,0 +1,18 @@
+<?php
+
+class Profil_update_status_model extends DB_Model
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_profil_update_status';
+		$this->pk = ['status_kurzbz'];
+		$this->hasSequence = false;
+
+
+	
+	}
+}
\ No newline at end of file
diff --git a/application/models/person/Profil_update_topic_model.php b/application/models/person/Profil_update_topic_model.php
new file mode 100644
index 000000000..0b7ad61e3
--- /dev/null
+++ b/application/models/person/Profil_update_topic_model.php
@@ -0,0 +1,16 @@
+<?php
+
+class Profil_update_topic_model extends DB_Model
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_profil_update_topic';
+		$this->pk = ['topic_kurzbz'];
+		$this->hasSequence = false;
+	
+	}
+}
\ No newline at end of file
diff --git a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
index 052520e42..f9b9ecb43 100644
--- a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
+++ b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
@@ -4,18 +4,25 @@ import AcceptDenyUpdate from "./AcceptDenyUpdate.js";
 import Alert from "../../../components/Bootstrap/Alert.js";
 import Loading from "../../../components/Loader.js";
 
+const STATUS = Object.freeze({
+  PENDING: "Pending",
+  ACCEPTED: "Accepted",
+  REJECTED: "Rejected",
+})
 
-const sortProfilUpdates = (ele1, ele2) => {
+const sortProfilUpdates = (ele1, ele2, thisPointer)=>  {
+  
   let result = 0;
-  if (ele1.status === this.$p.t('profilUpdate','pending')) {
+  if (ele1.status === STATUS.PENDING) {
     result = -1;
-  } else if (ele1.status === this.$p.t('profilUpdate','accepted')) {
-    result = ele2.status === this.$p.t('profilUpdate','rejected') ? -1 : 1;
+  } else if (ele1.status === STATUS.ACCEPTED) {
+    result = ele2.status === STATUS.REJECTED ? -1 : 1;
   } else {
     result = 1;
   }
-  //? if they have the same status the insert date is used for ordering
+  
   if (ele1.status === ele2.status) {
+    //? if they have the same status , insert_date gets compared for order
     result =
       new Date(ele2.insertamum.split(".").reverse().join("-")) -
       new Date(ele1.insertamum.split(".").reverse().join("-"));
@@ -54,15 +61,15 @@ export default{
           if (this.showAll) {
             return url + "getProfilUpdateWithPermission";
           } else {
-            return url + "getProfilUpdateWithPermission/pending";
+            return url + `getProfilUpdateWithPermission/${STATUS.PENDING}`;
           }
         },
-        ajaxResponse: function (url, params, response) {
+        ajaxResponse: (url, params, response)=> {
           //url - the URL of the request
           //params - the parameters passed with the request
           //response - the JSON object returned in the body of the response.
           //? sorts the response data from the backend
-          if (response) response.sort(sortProfilUpdates);
+          if (response) response.sort((ele1,ele2)=>sortProfilUpdates(ele1,ele2,this));
 
           return response;
         },
@@ -185,21 +192,17 @@ export default{
           },
           {
             title: "Status",
-            field: "status",
+            field: "status_translated",
             hozAlign: "center",
             headerFilter: true,
             formatter: (cell, para) => {
-              let iconClasses ="fa fa-lg"
-              if(cell.getValue() == this.$p.t('profilUpdate','pending')) {
-                iconClasses += " fa-circle-info text-info "
+              let iconClasses =""
+              let status = cell.getRow().getData().status;
+              switch (status){
+                case "Pending": iconClasses += "fa fa-lg fa-circle-info text-info "; break;
+                case "Accepted": iconClasses += "fa fa-lg fa-circle-check text-success "; break;
+                case "Rejected": iconClasses += "fa fa-lg fa-circle-xmark text-danger "; break;
               }
-              else if(cell.getValue() == this.$p.t('profilUpdate','accepted')) {
-                iconClasses += " fa-circle-check text-success "
-              }
-              else if(cell.getValue() == this.$p.t('profilUpdate','rejected')) {
-                iconClasses += " fa-circle-xmark text-danger "
-              }
-
               return `<div class='row justify-content-center'><div class='col-2'><i class='${iconClasses}'></i></div> <div class='col-4'><span>${cell.getValue()}</span></div></div>`;
             },
 
@@ -320,6 +323,8 @@ export default{
 
       <select class="mb-4 " v-model="showAll" @change="updateData" class="form-select" aria-label="Profil updates display selection">
         <option :selected="true" :value="false">{{$p.t('profilUpdate','pendingRequests')}}</option>
+        <option :value="false">{{$p.t('profilUpdate','acceptedRequests')}}</option>
+        <option :value="false">{{$p.t('profilUpdate','rejectedRequests')}}</option>
         <option :value="true">{{$p.t('profilUpdate','allRequests')}}</option>
       </select>
   
@@ -327,7 +332,7 @@ export default{
 
     <loading ref="loadingModalRef" :timeout="0"></loading>
     
-    <core-filter-cmpt title="Update Requests"  ref="UpdatesTable" :tabulatorEvents="events" :tabulator-options="profil_updates_table_options" tableOnly :sideMenu="false" />
+    <core-filter-cmpt :title="$p.t('profilUpdate','profilUpdateRequests')"  ref="UpdatesTable" :tabulatorEvents="events" :tabulator-options="profil_updates_table_options" tableOnly :sideMenu="false" />
 
     </div>`,
 };
diff --git a/system/dbupdate_3.4/25999_C4_ma0594.php b/system/dbupdate_3.4/25999_C4_ma0594.php
index 520b3c84b..9d9f7c2b1 100755
--- a/system/dbupdate_3.4/25999_C4_ma0594.php
+++ b/system/dbupdate_3.4/25999_C4_ma0594.php
@@ -6,15 +6,16 @@
         $qry = " CREATE TABLE public.tbl_profil_update_status (
             status_kurzbz VARCHAR(32) NOT NULL,
             beschreibung VARCHAR(256) NULL,
+            bezeichnung_mehrsprachig VARCHAR(256)[] NULL,
             CONSTRAINT tbl_profil_update_status_pk PRIMARY KEY(status_kurzbz)
         );
 
-        INSERT INTO public.tbl_profil_update_status VALUES  ('Ausstehend','Profil Änderungen die noch nicht bearbeitet wurden'),
-                                                            ('Pending','Profil updates that were not processed yet'),
-                                                            ('Akzeptiert','Profil Änderungen die akzeptiert wurden'),
-                                                            ('Accepted','Profil updates that were accepted'),
-                                                            ('Abgelehnt','Profil Änderungen die abgelehn wurden'),
-                                                            ('Rejected','Profil updates that were rejected');";
+        GRANT SELECT, INSERT, UPDATE, DELETE ON public.tbl_profil_update_status TO vilesci;
+        GRANT SELECT, INSERT, UPDATE, DELETE ON public.tbl_profil_update_status TO web; 
+
+        INSERT INTO public.tbl_profil_update_status VALUES  ('Pending','Profil Änderungen die noch nicht bearbeiten wurden','{Ausstehend,Pending}'),
+                                                            ('Accepted','Profil Änderungen die angenommen wurden','{Angenommen,Accepted}'),
+                                                            ('Rejected','Profil Änderungen die abgelehn wurden','{Abgelehnt,Rejected}');";
 
         if(!$db->db_query($qry))
         echo '<strong>public.tbl_profil_update_status: '.$db->db_last_error().'</strong><br>';
@@ -28,29 +29,24 @@
         $qry="CREATE TABLE public.tbl_profil_update_topic (
             topic_kurzbz VARCHAR(32) NOT NULL,
             beschreibung VARCHAR(256) NULL,
+            bezeichnung_mehrsprachig VARCHAR(256)[] NULL,
             CONSTRAINT tbl_profil_update_topic_pk PRIMARY KEY(topic_kurzbz)
         );
 
-        INSERT INTO public.tbl_profil_update_topic VALUES   ('Vorname','Vorname aktualisieren'),
-                                                            ('First name','Update first name'),
-                                                            ('Nachname','Nachname aktualisieren'),
-                                                            ('Last name','Update last name'),
-                                                            ('Titel','Titel aktualisieren'),
-                                                            ('Title','Update title'),
-                                                            ('Postnomen','Postnomen aktualisieren'),
-                                                            ('post-nominals','Update post-nominals'),
-                                                            ('Private Kontakte','Kontakt aktualisieren'),
-                                                            ('Private Contacts','Update contact'),
-                                                            ('Kontakt löschen','Kontakt löschen'),
-                                                            ('Delete contact','Delete contact'),
-                                                            ('Kontakt hinzufügen','Kontakt hinzufügen'),
-                                                            ('Add contact','Add contact'),
-                                                            ('Private Adressen','Adresse aktualisieren'),
-                                                            ('Private Addresses','Update address'),
-                                                            ('Adresse löschen','Adresse löschen'),
-                                                            ('Delete address','Delete address'),
-                                                            ('Adresse hinzufügen','Adresse löschen'),
-                                                            ('Add address','Add address');";
+        GRANT SELECT, INSERT, UPDATE, DELETE ON public.tbl_profil_update_topic TO vilesci;
+        GRANT SELECT, INSERT, UPDATE, DELETE ON public.tbl_profil_update_topic TO web; 
+        
+
+        INSERT INTO public.tbl_profil_update_topic VALUES   ('Vorname','Vorname aktualisieren','{Vorname,\"First name\"}'),
+                                                            ('Nachname','Nachname aktualisieren','{Nachname,\"Last name\"}'),
+                                                            ('Titel','Titel aktualisieren','{Titel,Title}'),
+                                                            ('Postnomen','Postnomen aktualisieren','{Postnomen,Post-nominal}'),
+                                                            ('Private Kontakte','Kontakt aktualisieren','{\"Private Kontakte\",\"Private Contacts\"}'),
+                                                            ('Kontakt löschen','Kontakt löschen','{\"Kontakt löschen\",\"Delete contact\"}'),
+                                                            ('Kontakt hinzufügen','Kontakt hinzufügen','{\"Kontakt hinzufügen\",\"Add contact\"}'),
+                                                            ('Private Adressen','Adresse aktualisieren','{\"Private Adressen\",\"Private Addreses\"}'),
+                                                            ('Adresse löschen','Adresse löschen','{\"Adresse löschen\",\"Delete address\"}'),
+                                                            ('Adresse hinzufügen','Adresse löschen','{\"Adresse hinzufügen\",\"Delete address\"}');";
 
         if(!$db->db_query($qry))
         echo '<strong>public.tbl_profil_update_topic: '.$db->db_last_error().'</strong><br>';
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 8b8bd5dd6..8b7789788 100755
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -24848,14 +24848,34 @@ array(
 			'phrases' => array(
 				array(
 					'sprache' => 'German',
-					'text' => 'Profil Update Anfrage',
-					'description' => '',
+					'text' => 'Profil Änderungs Anfrage',
+					'description' => 'Eine Änderungs Anfrage',
 					'insertvon' => 'system'
 				),
 				array(
 					'sprache' => 'English',
 					'text' => 'Profil Update Request',
-					'description' => '',
+					'description' => 'One profil update request',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'profilUpdateRequests',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Profil Änderungs Anfragen',
+					'description' => 'Mehrere Änderungs Anfragen',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Profil Update Requests',
+					'description' => 'Multiple update requests',
 					'insertvon' => 'system'
 				)
 			)
@@ -25020,6 +25040,46 @@ array(
 				)
 			)
 		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'acceptedRequests',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Angenommene Anfragen',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Accepted Requests',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'rejectedRequests',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Abgelehnte Anfragen',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Rejected Requests',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
 		array(
 			'app' => 'core',
 			'category' => 'profilUpdate',
@@ -25700,6 +25760,27 @@ array(
 				)
 			)
 		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'profilUpdate_status_error',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Ein Fehler ist aufgetreten, der Status "{0}" ist unbekannt',
+					'description' => 'Fehler der auftritt wenn es den Status nicht in der Datenbank gibt',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'An error occurred, the status "{0}" is not known',
+					'description' => 'error that occurrs when the used status is not present in the database',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		
 		
 		
 		

From d63c7c345707de0ec2ec8d42df6ec82488ba711b Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 9 Apr 2024 15:03:43 +0200
Subject: [PATCH 0565/1461] Logik Inventar, Validierungen

---
 .../api/frontend/v1/stv/Betriebsmittel.php    | 150 ++++++++++++------
 .../models/ressource/Betriebsmittel_model.php |  25 +--
 .../ressource/Betriebsmittelperson_model.php  |  29 ++++
 .../Betriebsmittel/Betriebsmittel.js          | 122 ++++++--------
 4 files changed, 188 insertions(+), 138 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Betriebsmittel.php b/application/controllers/api/frontend/v1/stv/Betriebsmittel.php
index fb7464148..ca1bfab1d 100644
--- a/application/controllers/api/frontend/v1/stv/Betriebsmittel.php
+++ b/application/controllers/api/frontend/v1/stv/Betriebsmittel.php
@@ -14,7 +14,8 @@ class Betriebsmittel extends FHCAPI_Controller
 			'updateBetriebsmittel' => ['admin:r', 'assistenz:r'],
 			'loadBetriebsmittel' => ['admin:r', 'assistenz:r'],
 			'deleteBetriebsmittel' => ['admin:r', 'assistenz:r'],
-			'getTypenBetriebsmittel' => ['admin:r', 'assistenz:r']
+			'getTypenBetriebsmittel' => ['admin:r', 'assistenz:r'],
+			'loadInventarliste' => ['admin:r', 'assistenz:r']
 		]);
 
 		//Load Models
@@ -34,17 +35,16 @@ class Betriebsmittel extends FHCAPI_Controller
 	public function getAllBetriebsmittel($uid, $person_id)
 	{
 		//uid
-		//$result = $this->BetriebsmittelpersonModel->getBetriebsmittelByUid($uid);
+		//$result = $this->BetriebsmittelpersonModel->getBetriebsmittelData($uid, 'uid');
 
 		//person_id
-		$result = $this->BetriebsmittelpersonModel->getBetriebsmittel($person_id);
+		$result = $this->BetriebsmittelpersonModel->getBetriebsmittelData($person_id, 'person');
 
 		if (isError($result))
 		{
 			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 		}
 
-		//all
 		$this->terminateWithSuccess((getData($result) ?: []));
 	}
 
@@ -61,10 +61,29 @@ class Betriebsmittel extends FHCAPI_Controller
 
 		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
 
+		$this->form_validation->set_rules('kaution', 'Kaution', 'numeric', [
+			'numeric' => $this->p->t('ui','error_fieldNotNumeric',['field' => 'Kaution'])
+		]);
+
+		$this->form_validation->set_rules('betriebsmitteltyp', 'TYP', 'required', [
+			'required' => $this->p->t('ui','error_fieldRequired',['field' => 'Typ'])
+		]);
+
+		$this->form_validation->set_rules('ausgegebenam', 'Ausgegeben am', 'required', [
+			'required' => $this->p->t('ui','error_fieldRequired',['field' => 'Ausgegeben am'])
+		]);
+
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
 		$uid_user = getAuthUID();
 		$betriebsmitteltyp = $this->input->post('betriebsmitteltyp');
 		$nummer = $this->input->post('nummer');
 		$nummer2 = $this->input->post('nummer2');
+		$inventarData = $this->input->post('inventarData');
 		$beschreibung = $this->input->post('beschreibung');
 		$kaution = $this->input->post('kaution');
 		$anmerkung = $this->input->post('anmerkung');
@@ -73,26 +92,46 @@ class Betriebsmittel extends FHCAPI_Controller
 		$person_id = $this->input->post('person_id');
 		$uid = $this->input->post('uid');
 
+		if($inventarData)
+		{
+			$betriebsmitteltyp = $inventarData['betriebsmitteltyp'];
+			$betriebsmittel_id = $inventarData['betriebsmittel_id'];
+		}
+
+		if($betriebsmitteltyp == 'Zutrittskarte' && !$nummer)
+		{
+			return $this->terminateWithError("Eine Zutrittskarte muss eine Nummer haben. Um die Zuordnung zu dieser Karte zu loeschen entfernen Sie bitte den ganzen Datensatz", self::ERROR_TYPE_GENERAL);
+		}
+
+		if($retouram && $retouram < $ausgegebenam)
+			return $this->terminateWithError("Retourdatum darf nicht vor Datum der Ausgabe liegen", self::ERROR_TYPE_GENERAL);
+
+		if($betriebsmitteltyp == "Inventar" && !($inventarData['inventarnummer']))
+			return $this->terminateWithError("Bitte wählen Sie das entsprechende Inventar aus dem Drop Down Menü aus", self::ERROR_TYPE_GENERAL);
+
 		// Start DB transaction
 		$this->db->trans_begin();
 
-		$result = $this->BetriebsmittelModel->insert(
-			[
-				'betriebsmitteltyp' => $betriebsmitteltyp,
-				'nummer' => $nummer,
-				'nummer2' => $nummer2,
-				'beschreibung' => $beschreibung,
-				'anmerkung' => $anmerkung,
-				'insertvon' => $uid_user,
-				'insertamum' => date('c')
-			]
-		);
-		if($this->db->trans_status() === false || isError($result))
+		if(!$inventarData)
 		{
-			$this->db->trans_rollback();
-			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			$result = $this->BetriebsmittelModel->insert(
+				[
+					'betriebsmitteltyp' => $betriebsmitteltyp,
+					'nummer' => $nummer,
+					'nummer2' => $nummer2,
+					'beschreibung' => $beschreibung,
+					'anmerkung' => $anmerkung,
+					'insertvon' => $uid_user,
+					'insertamum' => date('c')
+				]
+			);
+			if($this->db->trans_status() === false || isError($result))
+			{
+				$this->db->trans_rollback();
+				return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			}
+			$betriebsmittel_id = $result->retval;
 		}
-		$betriebsmittel_id = $result->retval;
 
 		$result = $this->BetriebsmittelpersonModel->insert(
 			[
@@ -147,6 +186,33 @@ class Betriebsmittel extends FHCAPI_Controller
 		$person_id = $this->input->post('person_id');
 		$uid = $this->input->post('uid');
 
+		$this->form_validation->set_rules('kaution', 'Kaution', 'numeric', [
+			'numeric' => $this->p->t('ui','error_fieldNotNumeric',['field' => 'Kaution'])
+		]);
+
+		$this->form_validation->set_rules('betriebsmitteltyp', 'TYP', 'required', [
+			'required' => $this->p->t('ui','error_fieldRequired',['field' => 'Typ'])
+		]);
+
+		$this->form_validation->set_rules('ausgegebenam', 'Ausgegeben am', 'required', [
+			'required' => $this->p->t('ui','error_fieldRequired',['field' => 'Ausgegeben am'])
+		]);
+
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		if($betriebsmitteltyp == 'Zutrittskarte' && !$nummer)
+		{
+			return $this->terminateWithError("Eine Zutrittskarte muss eine Nummer haben. Um die Zuordnung zu dieser Karte zu loeschen entfernen Sie bitte den ganzen Datensatz", self::ERROR_TYPE_GENERAL);
+		}
+
+		if($retouram && $retouram < $ausgegebenam)
+			return $this->terminateWithError("Retourdatum darf nicht vor Datum der Ausgabe liegen", self::ERROR_TYPE_GENERAL);
+
+
 		// Start DB transaction
 		$this->db->trans_begin();
 
@@ -162,8 +228,8 @@ class Betriebsmittel extends FHCAPI_Controller
 				'anmerkung' => $anmerkung,
 				'ausgegebenam' => $ausgegebenam,
 				'retouram ' => $retouram,
-				'insertvon' => $uid_user,
-				'insertamum' => date('c')
+				'updatevon' => $uid_user,
+				'updateamum' => date('c')
 			]
 		);
 
@@ -199,35 +265,13 @@ class Betriebsmittel extends FHCAPI_Controller
 
 	}
 
-	//TODO(Manu) defaultmässig ersten Eintrag in Edit Modus
-	public function getFirstBetriebsmittel($uid, $person_id)
-	{
-		//uid
-		//$result = $this->BetriebsmittelpersonModel->getFirstBetriebsmittelByUid($uid);
-
-		//person_id
-		$result = $this->BetriebsmittelpersonModel->getFirstBetriebsmittelByUid($person_id);
-
-		if (isError($result))
-		{
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-
-		$this->terminateWithSuccess((getData($result) ?: []));
-	}
-
 	public function loadBetriebsmittel()
 	{
 		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
 
 		$betriebsmittelperson_id = $this->input->post('betriebsmittelperson_id');
 
-		//$this->terminateWithError("id in function api: " . $betriebsmittelperson_id, self::ERROR_TYPE_GENERAL);
-
-		$this->BetriebsmittelpersonModel->addJoin('wawi.tbl_betriebsmittel', 'betriebsmittel_id');
-
-		$result = $this->BetriebsmittelpersonModel->loadWhere(
-		array('betriebsmittelperson_id' => $betriebsmittelperson_id));
+		$result = $this->BetriebsmittelpersonModel->getBetriebsmittelData($betriebsmittelperson_id, 'betriebsmittelperson_id');
 
 		if (isError($result))
 		{
@@ -239,23 +283,17 @@ class Betriebsmittel extends FHCAPI_Controller
 			$this->terminateWithError("no Betriebsmittelperson with ID found: " . $betriebsmittelperson_id, self::ERROR_TYPE_GENERAL);
 		}
 
-	//	var_dump($result);
-
 		$this->terminateWithSuccess(current(getData($result)));
 
 	}
 
 	public function deleteBetriebsmittel()
 	{
-		//var_dump($betriebsmittelperson_id);
 
 		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
 
 		$betriebsmittelperson_id = $this->input->post('betriebsmittelperson_id');
 
-		//return $this->terminateWithError("Betriebsmittelperson " . $betriebsmittelperson_id . " wird gelöscht",self::ERROR_TYPE_GENERAL);
-
-
 		$result = $this->BetriebsmittelpersonModel->delete(
 			array('betriebsmittelperson_id' => $betriebsmittelperson_id,
 				)
@@ -277,7 +315,9 @@ class Betriebsmittel extends FHCAPI_Controller
 	{
 		$this->load->model('ressource/Betriebsmitteltyp_model', 'BetriebsmitteltypModel');
 
-		$result = $this->BetriebsmitteltypModel->load();
+		$this->BetriebsmitteltypModel->addOrder('beschreibung', 'ASC');
+		$result = $this->BetriebsmitteltypModel->load(); // load All
+
 		if (isError($result))
 		{
 			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
@@ -285,6 +325,14 @@ class Betriebsmittel extends FHCAPI_Controller
 		return $this->terminateWithSuccess(getData($result) ?: []);
 	}
 
+	public function loadInventarliste($searchString)
+	{
+		$result = $this->BetriebsmittelModel->loadInventarliste($searchString);
+		if (isError($result)) {
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess($result ?: []);
+	}
 }
 
 
diff --git a/application/models/ressource/Betriebsmittel_model.php b/application/models/ressource/Betriebsmittel_model.php
index a3a6e252f..69aa962c1 100644
--- a/application/models/ressource/Betriebsmittel_model.php
+++ b/application/models/ressource/Betriebsmittel_model.php
@@ -13,17 +13,22 @@ class Betriebsmittel_model extends DB_Model
 	}
 
 	/**
-	 * getBetriebsmittelById
+	 * load Liste Inventarnummern
 	 */
-/*	public function loadBetriebsmittel($betriebsmittelperson_id){
-		$query = "
-			SELECT *
-			FROM wawi.tbl_betriebsmittelperson
-			JOIN wawi.tbl_betriebsmittel ON (wawi.tbl_betriebsmittelperson.betriebsmittel_id = wawi.tbl_betriebsmittel.betriebsmittel_id)
-			WHERE wawi.tbl_betriebsmittelperson.betriebsmittelperson_id  = ? 
-		";
+	public function loadInventarliste($filter)
+	{
+		$filter = strtoLower($filter);
 
-		return $this->execQuery($query, array($betriebsmittelperson_id));
-	}*/
+		$qry = "
+			SELECT 
+			    bm.inventarnummer, bm.betriebsmitteltyp, bm.betriebsmittel_id, CONCAT(bm.inventarnummer, ' ', bm.beschreibung) as dropdowntext
+			FROM 
+			    wawi.tbl_betriebsmittel bm
+			WHERE 
+			    upper(bm.inventarnummer) LIKE '%" .$this->db->escape_like_str($filter)."%'
+			OR    
+			    lower(bm.inventarnummer) LIKE '%" .$this->db->escape_like_str($filter)."%'";
 
+		return $this->execQuery($qry);
+	}
 }
diff --git a/application/models/ressource/Betriebsmittelperson_model.php b/application/models/ressource/Betriebsmittelperson_model.php
index 04878a9ad..17aab3bc7 100644
--- a/application/models/ressource/Betriebsmittelperson_model.php
+++ b/application/models/ressource/Betriebsmittelperson_model.php
@@ -96,4 +96,33 @@ class Betriebsmittelperson_model extends DB_Model
 
 		return $this->loadWhere($condition);
 	}
+
+	public function getBetriebsmittelData($id, $type_id)
+	{
+		switch ($type_id) {
+			case 'person':
+				$cond = 'bmp.person_id';
+				break;
+			case 'uid':
+				$cond = 'bmp.uid';
+				break;
+			case 'betriebsmittelperson_id':
+				$cond = 'bmp.betriebsmittelperson_id';
+				break;
+			default:
+				return error("ID nicht gültig");
+		}
+
+		$query = "
+			SELECT 
+			    bm.nummer, bmp.person_id, bm.betriebsmitteltyp, bmp.anmerkung as anmerkung, bmp.retouram, bm.beschreibung, bmp.ausgegebenam, bmp.uid, bmp.kaution, bm.betriebsmittel_id, bmp.betriebsmittelperson_id, bm.inventarnummer --bm.*
+			FROM 
+			    wawi.tbl_betriebsmittelperson bmp
+			JOIN 
+			        wawi.tbl_betriebsmittel bm ON (bmp.betriebsmittel_id = bm.betriebsmittel_id)
+			WHERE 
+			    " . $cond . " = ? ";
+
+		return $this->execQuery($query, array($id));
+	}
 }
diff --git a/public/js/components/Betriebsmittel/Betriebsmittel.js b/public/js/components/Betriebsmittel/Betriebsmittel.js
index f7e036425..2dce84e10 100644
--- a/public/js/components/Betriebsmittel/Betriebsmittel.js
+++ b/public/js/components/Betriebsmittel/Betriebsmittel.js
@@ -1,5 +1,7 @@
 import VueDatePicker from '../vueDatepicker.js.php';
 import {CoreFilterCmpt} from "../filter/Filter.js";
+import PvAutoComplete from "../../../../index.ci.php/public/js/components/primevue/autocomplete/autocomplete.esm.min.js";
+
 import BsModal from "../Bootstrap/Modal";
 import FormForm from '../Form/Form.js';
 import FormInput from '../Form/Input.js';
@@ -11,6 +13,7 @@ export default {
 		BsModal,
 		FormForm,
 		FormInput,
+		PvAutoComplete
 	},
 	inject: {
 		cisRoot: {
@@ -31,13 +34,10 @@ export default {
 					{title: "Nummer", field: "nummer"},
 					{title:  "PersonId", field: "person_id"},
 					{title: "Typ", field: "betriebsmitteltyp"},
-				//	{title: "insertVon", field: "insertvon"}, //Test
-				//	{title: "insertAmUm", field: "insertamum"}, //TESt
-				//	{title: "Betriebsmittelperson_id", field: "betriebsmittelperson_id"},
+					{title:  "Anmerkung", field: "anmerkung", visible: false},
 					{title:  "Retourdatum", field: "retouram"},
 					{title:  "Beschreibung", field: "beschreibung"},
 					{title:  "Uid", field: "uid"},
-					{title:  "Anmerkung", field: "anmerkung", visible: false},
 					{title:  "Kaution", field: "kaution", visible: false},
 					{title:  "Ausgabedatum", field: "ausgegebenam", visible: false},
 					{title: "Betriebsmittel_id", field: "betriebsmittel_id", visible: false},
@@ -97,79 +97,31 @@ export default {
 				selectableRangeMode: 'click',
 				selectable: true
 			},
-			//tableData: [],
-			tabulatorEvents: [
-				{
-/*					//TODO Manu phrases
-					}*/
-
-					//TODO(manu)für editieren mit click: conflict with action buttons
-
-/*             event: 'rowSelectionChanged',
-			   handler: this.rowSelectionChanged*/
-/*              handler: (e, row.getData().betriebsmittelperson_id) => {
-// HandlerFunktion, die aufgerufen wird, wenn das Ereignis ausgelöst wird
-					   //this.rowSelectionChanged(row.getData().betriebsmittelperson_id);
-			   //      console.log("Selected Row Data:", row.getData());
-					   //console.log(cell.getData().betriebsmittelperson_id);
-*/
-				},
-			],
+			tabulatorEvents: [],
 			betriebsmittelData: {},
 			betriebsmittelperson_id : null,
 			listBetriebsmitteltyp: [],
 			formData: {
 				ausgegebenam : this.getDefaultDate(),
+				betriebsmitteltyp: 'Zutrittskarte'
 			},
 			statusNew: true,
-			changesDetected: false
-		};
-	},
-	computed: {
-		deltaLength() {
-			return Object.keys(this.formData).length;
-		}
-	},
-	watch: {
-		formData: {
-			handler: function(newVal) {
-
-				//console.log('Das Objekt wurde geändert:', newVal);
-				this.changesDetected = true;
-			},
-			deep: true  // Hiermit wird auch die Veränderung von Eigenschaften des Objekts überwacht
+			filteredInventar: []
 		}
 	},
 	methods: {
-		rowSelectionChanged(data) {
-			//console.log("Selected Row Data:", data[0].betriebsmittelperson_id);
-			this.param_id = {
-				'betriebsmittelperson_id':  data[0].betriebsmittelperson_id};
-
-			this.loadBetriebsmittel(this.param_id);
-		},
 		actionEditBetriebsmittel(betriebsmittelperson_id){
-			console.log("action EditBM: id: " + betriebsmittelperson_id);
 			this.statusNew = false;
 			this.loadBetriebsmittel(betriebsmittelperson_id);
-			this.changesDetected = false;
 		},
 		actionNewBetriebsmittel(){
-			console.log("action newBM: person " + this.person_id);
 			this.resetModal();
 			this.statusNew = true;
 			this.formData.ausgegebenam = this.getDefaultDate();
-			//this.changesDetected = false;
 			this.reload();
 		},
 		actionDeleteBetriebsmittel(betriebsmittelperson_id){
-			console.log("Löschen von Datensatz mit id: " + betriebsmittelperson_id);
-
 			this.loadBetriebsmittel(betriebsmittelperson_id).then(() => {
-/*				if(this.formData) {
-					this.$refs.deleteBetriebsmittelModal.show();
-				}*/
-				console.log("nach load" + betriebsmittelperson_id);
 				this.$refs.deleteBetriebsmittelModal.show();
 			});
 		},
@@ -184,17 +136,14 @@ export default {
 			).then(response => {
 				console.log(response);
 				this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
-			//	this.hideModal('newBetriebsmittelModal');
 				this.resetModal();
 			}).catch(this.$fhcAlert.handleSystemError)
 				.finally(() => {
 					window.scrollTo(0, 0);
 					this.reload();
 				});
-			//this.changesDetected = false; //not working
 		},
 		deleteBetriebsmittel(betriebsmittelperson_id){
-			console.log("Delete mit id: " + betriebsmittelperson_id);
 			this.param = {
 				'betriebsmittelperson_id': betriebsmittelperson_id
 			};
@@ -221,7 +170,6 @@ export default {
 			this.$fhcApi.post('api/frontend/v1/stv/betriebsmittel/updateBetriebsmittel/',
 				this.param
 			).then(response => {
-				//console.log(response);
 				this.$fhcAlert.alertSuccess(this.$p.t('ui', 'editSave'));
 				//	this.hideModal('newBetriebsmittelModal');
 				this.resetModal();
@@ -232,7 +180,6 @@ export default {
 				});
 		},
 		loadBetriebsmittel(betriebsmittelperson_id){
-			console.log("loadBetriebsmittel id:" + betriebsmittelperson_id);
 			this.resetModal();
 			this.statusNew = false;
 			this.param = {
@@ -245,11 +192,16 @@ export default {
 					this.formData = result;
 				})
 				.catch(this.$fhcAlert.handleSystemError);
-		//	this.changesDetected = false;
+		},
+		searchInventar(event){
+			return this.$fhcApi
+				.get('api/frontend/v1/stv/betriebsmittel/loadInventarliste/' + event.query)
+				.then(result => {
+					this.filteredInventar = result.data.retval;
+				});
 		},
 		reload(){
 			this.$refs.table.reloadTable();
-			//this.changesDetected = false;
 		},
 		hideModal(modalRef){
 			this.$refs[modalRef].hide();
@@ -257,10 +209,15 @@ export default {
 		resetModal(){
 			this.formData = {};
 			this.formData.ausgegebenam = this.getDefaultDate();
-			this.formData.listBetriebsmitteltyp = null;
+			this.formData.retouram = null;
+			this.formData.betriebsmitteltyp = null;
+			this.formData.nummer = null;
+			this.formData.nummer2 = null;
+			this.formData.kaution = null;
+			this.formData.anmerkung = null;
+			this.formData.beschreibung = null;
 			this.betriebsmittelperson_id = {};
 			this.statusNew = true;
-			//this.changesDetected = false;
 		},
 		getDefaultDate() {
 			const today = new Date();
@@ -323,7 +280,7 @@ export default {
 		<BsModal ref="deleteBetriebsmittelModal">
 			<template #title>Betriebsmittel löschen</template>
 			<template #default>
-				<p>Betriebsmittel ({{formData.betriebsmitteltyp}} / {{formData.betriebsmittelperson_id}}) wirklich löschen?</p>
+				<p>Betriebsmittel {{formData.betriebsmitteltyp}} wirklich löschen?</p>
 			</template>
 			<template #footer>
 <!--				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">Abbrechen</button>-->
@@ -344,9 +301,7 @@ export default {
 			>
 		</core-filter-cmpt>
 		<br>
-		 {{cisRoot}}
-		 {{formData}} {{changesDetected}}
-				<hr>
+
 			<form-form class="row g-3 col-6" ref="betriebsmittelData">
 				<legend>Details</legend>
 				
@@ -364,13 +319,28 @@ export default {
 						type="select"
 						name="typ"
 						v-model="formData.betriebsmitteltyp"
+						:disabled="!statusNew"
 						>
-						<option v-for="entry in listBetriebsmitteltyp" :key="entry.betriebsmitteltyp" :value="entry.betriebsmitteltyp">{{entry.betriebsmitteltyp}}</option>
+						<option v-for="entry in listBetriebsmitteltyp" :key="entry.betriebsmitteltyp" :value="entry.betriebsmitteltyp">{{entry.beschreibung}}</option>
 						</form-input>
 					</div>
 				</div>
 				
-				<div class="row mb-3">
+			
+				<div v-if="formData.betriebsmitteltyp == 'Inventar'" class="row mb-3">
+					<label for="inventarnummer" class="form-label col-sm-4">Inventarnummer</label>
+					<div class="col-sm-6">
+						<PvAutoComplete v-model="formData['inventarData']" optionLabel="dropdowntext" :suggestions="filteredInventar" @complete="searchInventar" minLength="3"/>
+					</div>
+				</div>
+				<div v-else-if="formData.inventarnummer" class="row mb-3">
+				<label for="inventarnummer" class="form-label col-sm-4">Inventarnummer</label>
+					<div class="col-sm-6">
+						<input type="text" :readonly="readonly" class="form-control" id="inventarnummer" v-model="formData.inventarnummer" :disabled="!statusNew">
+					</div>
+				</div>
+				
+				<div v-if="formData.betriebsmitteltyp!='Inventar' && !formData.inventarnummer" class="row mb-3">
 					<label for="nummer" class="form-label col-sm-4">Nummer</label>
 					<div class="col-sm-6">
 						<form-input
@@ -382,7 +352,7 @@ export default {
 					</div>
 				</div>
 				
-				<div class="row mb-3">
+				<div v-if="formData.betriebsmitteltyp!='Inventar' && !formData.inventarnummer" class="row mb-3">
 					<label for="nummer2" class="form-label col-sm-4">Nummer2</label>
 					<div class="col-sm-6">
 						<form-input
@@ -394,13 +364,14 @@ export default {
 					</div>
 				</div>
 			
-				<div class="row mb-3">
+				<div v-if="formData.betriebsmitteltyp!='Inventar'" class="row mb-3">
 					<label for="beschreibung" class="form-label col-sm-4">Beschreibung</label>
 					<div class="col-sm-6">
 						<form-input
 							type="textarea"
 							name="beschreibung"
 							v-model="formData['beschreibung']"
+							:disabled="formData.inventarnummer"
 						>						
 						</form-input>
 					</div>
@@ -462,19 +433,16 @@ export default {
 							:teleport="true"
 						></form-input>
 					</div>
-<!--					<div class="position-sticky top-0 z-1">
-						<button type="submit" class="btn btn-primary position-absolute top-0 end-0" :disabled="!deltaLength">Speichern2</button>
-					</div>-->
 				</div>
 				
 
 				<div class="row mb-3">
 				<label class="form-label col-sm-8"></label>
 					<div v-if="statusNew" class="col-sm-4">
-						<button ref="Close" type="button" class="btn btn-primary" @click="addNewBetriebsmittel()" :disabled="!changesDetected">Speichern</button>
+						<button ref="Close" type="button" class="btn btn-primary" @click="addNewBetriebsmittel()">Speichern</button>
 					</div>
 					<div v-else class="col-sm-4">
-						<button ref="Close" type="button" class="btn btn-warning" @click="updateBetriebsmittel()" :disabled="!changesDetected">Aktualisieren</button>
+						<button ref="Close" type="button" class="btn btn-warning" @click="updateBetriebsmittel()">Aktualisieren</button>
 					</div>
 					
 				</div>

From 56900e31dbb326acdbb3f961a6b02ed9fd9508c3 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 9 Apr 2024 15:08:32 +0200
Subject: [PATCH 0566/1461] add table hr.tbl_dvendegrund, add columns
 dvendegrund_kurzbz and dvendegrund_anmerkung to hr.tbl_dienstverhaeltnis

---
 system/dbupdate_3.4/28260_vertraege.php | 64 +++++++++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/system/dbupdate_3.4/28260_vertraege.php b/system/dbupdate_3.4/28260_vertraege.php
index 91a9e2cc9..73ff02608 100644
--- a/system/dbupdate_3.4/28260_vertraege.php
+++ b/system/dbupdate_3.4/28260_vertraege.php
@@ -440,3 +440,67 @@ if ($result = $db->db_query("SELECT * FROM information_schema.tables WHERE table
 			echo 'HR Schema und Vertagstabellen wurden neu erstellt';
 	}
 }
+
+if ($result = $db->db_query("SELECT * FROM information_schema.tables WHERE table_name='tbl_dvendegrund' AND table_schema='hr'"))
+{
+	if ($db->db_num_rows($result) == 0)
+	{
+		$qry = "
+		    CREATE TABLE hr.tbl_dvendegrund (
+			dvendegrund_kurzbz character varying(32) NOT NULL ,
+			bezeichnung character varying(255) NOT NULL,
+			bezeichnung_mehrsprachig character varying(255)[] NOT NULL,
+			aktiv boolean DEFAULT true NOT NULL,
+			sort integer DEFAULT 1 NOT NULL,
+			PRIMARY KEY (dvendegrund_kurzbz),
+			CONSTRAINT tbl_dvendegrund_bezeichnung_key UNIQUE (bezeichnung)
+		    );
+		";
+		if (! $db->db_query($qry))
+			echo '<strong>Vertraege: ' . $db->db_last_error() . '</strong><br>';
+		else
+			echo 'Tabelle tbl_dvendegrund wurde im HR Schema neu erstellt';
+	}
+}
+
+if ($result = $db->db_query("SELECT * FROM information_schema.columns WHERE column_name='dvendegrund_kurzbz' AND table_name='tbl_dienstverhaeltnis' AND table_schema='hr'"))
+{
+	if ($db->db_num_rows($result) == 0)
+	{
+		$qry = "
+		    ALTER TABLE 
+			hr.tbl_dienstverhaeltnis 
+		    ADD COLUMN
+			dvendegrund_kurzbz character varying(255) 
+		    CONSTRAINT 
+			tbl_dvendegrund_fk 
+		    REFERENCES 
+			hr.tbl_dvendegrund(dvendegrund_kurzbz) 
+		    ON UPDATE 
+			cascade 
+		    ON DELETE 
+			restrict
+		";
+		if (! $db->db_query($qry))
+			echo '<strong>Vertraege: ' . $db->db_last_error() . '</strong><br>';
+		else
+			echo 'Spalte dvendegrund_kurzbz wurde in hr.tbl_dienstverhaeltnis neu erstellt';
+	}
+}
+
+if ($result = $db->db_query("SELECT * FROM information_schema.columns WHERE column_name='dvendegrund_anmerkung' AND table_name='tbl_dienstverhaeltnis' AND table_schema='hr'"))
+{
+	if ($db->db_num_rows($result) == 0)
+	{
+		$qry = "
+		    ALTER TABLE 
+			hr.tbl_dienstverhaeltnis 
+		    ADD COLUMN
+			dvendegrund_anmerkung character varying(255)
+		";
+		if (! $db->db_query($qry))
+			echo '<strong>Vertraege: ' . $db->db_last_error() . '</strong><br>';
+		else
+			echo 'Spalte dvendegrund_anmerkung wurde in hr.tbl_dienstverhaeltnis neu erstellt';
+	}
+}
\ No newline at end of file

From a9818e1f63720838918f493a7cf002d4a8bec3d6 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 9 Apr 2024 15:27:47 +0200
Subject: [PATCH 0567/1461] add initial values to hr.tbl_dvendegrund

---
 system/dbupdate_3.4/28260_vertraege.php | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/system/dbupdate_3.4/28260_vertraege.php b/system/dbupdate_3.4/28260_vertraege.php
index 73ff02608..8f1b81290 100644
--- a/system/dbupdate_3.4/28260_vertraege.php
+++ b/system/dbupdate_3.4/28260_vertraege.php
@@ -437,7 +437,7 @@ if ($result = $db->db_query("SELECT * FROM information_schema.tables WHERE table
 		if (! $db->db_query($qry))
 			echo '<strong>Vertraege: ' . $db->db_last_error() . '</strong><br>';
 		else
-			echo 'HR Schema und Vertagstabellen wurden neu erstellt';
+			echo 'HR Schema und Vertagstabellen wurden neu erstellt<br>';
 	}
 }
 
@@ -455,11 +455,20 @@ if ($result = $db->db_query("SELECT * FROM information_schema.tables WHERE table
 			PRIMARY KEY (dvendegrund_kurzbz),
 			CONSTRAINT tbl_dvendegrund_bezeichnung_key UNIQUE (bezeichnung)
 		    );
+		    
+		    INSERT INTO 
+			hr.tbl_dvendegrund (dvendegrund_kurzbz, bezeichnung, bezeichnung_mehrsprachig) 
+		    VALUES
+			('kuendigung_arbeitnehmer', 'Kündigung durch Arbeitnehmer', ARRAY['Kündigung durch Arbeitnehmer', 'Cancellation by Employee']), 
+			('kuendigung_arbeitgeber', 'Kündigung durch Arbeitgeber', ARRAY['Kündigung durch Arbeitgeber', 'Cancellation by Employer']),
+			('entlassung', 'Entlassung', ARRAY['Entlassung', 'Dismissal']),
+			('sonstige', 'Sonstige', ARRAY['Sonstige', 'Miscellaneous']),
+			('einvernehmlich', 'Einvernehmliche Auflösung', ARRAY['Einvernehmliche Auflösung', 'Rescission']);
 		";
 		if (! $db->db_query($qry))
 			echo '<strong>Vertraege: ' . $db->db_last_error() . '</strong><br>';
 		else
-			echo 'Tabelle tbl_dvendegrund wurde im HR Schema neu erstellt';
+			echo 'Tabelle tbl_dvendegrund wurde im HR Schema neu erstellt<br>';
 	}
 }
 
@@ -484,7 +493,7 @@ if ($result = $db->db_query("SELECT * FROM information_schema.columns WHERE colu
 		if (! $db->db_query($qry))
 			echo '<strong>Vertraege: ' . $db->db_last_error() . '</strong><br>';
 		else
-			echo 'Spalte dvendegrund_kurzbz wurde in hr.tbl_dienstverhaeltnis neu erstellt';
+			echo 'Spalte dvendegrund_kurzbz wurde in hr.tbl_dienstverhaeltnis neu erstellt<br>';
 	}
 }
 
@@ -501,6 +510,6 @@ if ($result = $db->db_query("SELECT * FROM information_schema.columns WHERE colu
 		if (! $db->db_query($qry))
 			echo '<strong>Vertraege: ' . $db->db_last_error() . '</strong><br>';
 		else
-			echo 'Spalte dvendegrund_anmerkung wurde in hr.tbl_dienstverhaeltnis neu erstellt';
+			echo 'Spalte dvendegrund_anmerkung wurde in hr.tbl_dienstverhaeltnis neu erstellt<br>';
 	}
 }
\ No newline at end of file

From 1a1cd76bc4fb6f882c6d9eac527577badd93b8c5 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 9 Apr 2024 15:42:00 +0200
Subject: [PATCH 0568/1461] add grant on hr.tbl_dvendegrund to user vilesci

---
 system/dbupdate_3.4/28260_vertraege.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/system/dbupdate_3.4/28260_vertraege.php b/system/dbupdate_3.4/28260_vertraege.php
index 8f1b81290..58a895483 100644
--- a/system/dbupdate_3.4/28260_vertraege.php
+++ b/system/dbupdate_3.4/28260_vertraege.php
@@ -455,7 +455,9 @@ if ($result = $db->db_query("SELECT * FROM information_schema.tables WHERE table
 			PRIMARY KEY (dvendegrund_kurzbz),
 			CONSTRAINT tbl_dvendegrund_bezeichnung_key UNIQUE (bezeichnung)
 		    );
-		    
+
+		    GRANT SELECT, UPDATE, INSERT, DELETE ON hr.tbl_dvendegrund TO vilesci;
+
 		    INSERT INTO 
 			hr.tbl_dvendegrund (dvendegrund_kurzbz, bezeichnung, bezeichnung_mehrsprachig) 
 		    VALUES

From aed3f9936506880638104a9485930c6cc3b62f7c Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 9 Apr 2024 16:09:14 +0200
Subject: [PATCH 0569/1461] Phrases Betriebsmittel

---
 .../Betriebsmittel/Betriebsmittel.js          | 120 +++++------
 system/phrasesupdate.php                      | 190 ++++++++++++++++++
 2 files changed, 243 insertions(+), 67 deletions(-)

diff --git a/public/js/components/Betriebsmittel/Betriebsmittel.js b/public/js/components/Betriebsmittel/Betriebsmittel.js
index 2dce84e10..fb34b0481 100644
--- a/public/js/components/Betriebsmittel/Betriebsmittel.js
+++ b/public/js/components/Betriebsmittel/Betriebsmittel.js
@@ -32,14 +32,14 @@ export default {
 				ajaxResponse: (url, params, response) => response.data,
 				columns: [
 					{title: "Nummer", field: "nummer"},
-					{title:  "PersonId", field: "person_id"},
+					{title: "PersonId", field: "person_id"},
 					{title: "Typ", field: "betriebsmitteltyp"},
-					{title:  "Anmerkung", field: "anmerkung", visible: false},
-					{title:  "Retourdatum", field: "retouram"},
-					{title:  "Beschreibung", field: "beschreibung"},
-					{title:  "Uid", field: "uid"},
-					{title:  "Kaution", field: "kaution", visible: false},
-					{title:  "Ausgabedatum", field: "ausgegebenam", visible: false},
+					{title: "Anmerkung", field: "anmerkung", visible: false},
+					{title: "Retourdatum", field: "retouram"},
+					{title: "Beschreibung", field: "beschreibung"},
+					{title: "Uid", field: "uid"},
+					{title: "Kaution", field: "kaution", visible: false},
+					{title: "Ausgabedatum", field: "ausgegebenam", visible: false},
 					{title: "Betriebsmittel_id", field: "betriebsmittel_id", visible: false},
 					{title: "Betriebsmittelperson_id", field: "betriebsmittelperson_id", visible: false},
 					{
@@ -97,7 +97,35 @@ export default {
 				selectableRangeMode: 'click',
 				selectable: true
 			},
-			tabulatorEvents: [],
+			tabulatorEvents: [
+				{
+					event: 'tableBuilt',
+					handler: async () => {
+
+						await this.$p.loadCategory(['wawi', 'global', 'infocenter']);
+
+						let cm = this.$refs.table.tabulator.columnManager;
+
+						cm.getColumnByField('nummer').component.updateDefinition({
+							title: this.$p.t('wawi', 'nummer')
+						});
+						cm.getColumnByField('anmerkung').component.updateDefinition({
+							title: this.$p.t('global', 'anmerkung')
+						});
+						cm.getColumnByField('retouram').component.updateDefinition({
+							title: this.$p.t('wawi', 'retourdatum')
+						});
+						cm.getColumnByField('kaution').component.updateDefinition({
+							title: this.$p.t('infocenter', 'kaution')
+						});
+						cm.getColumnByField('ausgegebenam').component.updateDefinition({
+							title: this.$p.t('wawi', 'ausgabedatum')
+						});
+
+					}
+
+				}
+			],
 			betriebsmittelData: {},
 			betriebsmittelperson_id : null,
 			listBetriebsmitteltyp: [],
@@ -134,7 +162,6 @@ export default {
 			this.$fhcApi.post('api/frontend/v1/stv/betriebsmittel/addNewBetriebsmittel/',
 				this.param
 			).then(response => {
-				console.log(response);
 				this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 				this.resetModal();
 			}).catch(this.$fhcAlert.handleSystemError)
@@ -170,8 +197,7 @@ export default {
 			this.$fhcApi.post('api/frontend/v1/stv/betriebsmittel/updateBetriebsmittel/',
 				this.param
 			).then(response => {
-				this.$fhcAlert.alertSuccess(this.$p.t('ui', 'editSave'));
-				//	this.hideModal('newBetriebsmittelModal');
+				this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 				this.resetModal();
 			}).catch(this.$fhcAlert.handleSystemError)
 				.finally(() => {
@@ -233,54 +259,14 @@ export default {
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 	},
-	mounted(){
-
-	},
-/*	async mounted() {
-		if(this.showTinyMCE){
-			this.initTinyMCE();
-		}
-
-		await this.$p.loadCategory(['notiz','global']);
-
-		let cm = this.$refs.table.tabulator.columnManager;
-
-		cm.getColumnByField('verfasser_uid').component.updateDefinition({
-			title: this.$p.t('notiz', 'verfasser')
-		});
-		cm.getColumnByField('titel').component.updateDefinition({
-			title: this.$p.t('global', 'titel')
-		});
-		cm.getColumnByField('text_stripped').component.updateDefinition({
-			title: this.$p.t('global', 'text')
-		});
-		cm.getColumnByField('bearbeiter_uid').component.updateDefinition({
-			title: this.$p.t('notiz', 'bearbeiter')
-		});
-		cm.getColumnByField('start').component.updateDefinition({
-			title: this.$p.t('global', 'gueltigVon')
-		});
-		cm.getColumnByField('ende').component.updateDefinition({
-			title: this.$p.t('global', 'gueltigBis')
-		});
-		cm.getColumnByField('countdoc').component.updateDefinition({
-			title: this.$p.t('notiz', 'document')
-		});
-		cm.getColumnByField('erledigt').component.updateDefinition({
-			title: this.$p.t('notiz', 'erledigt')
-		});
-		cm.getColumnByField('lastupdate').component.updateDefinition({
-			title: this.$p.t('notiz', 'letzte_aenderung')
-		});
-	},*/
 	template: `
 	<div class="betriebsmittel-betriebsmittel">
 	
 		<!--Modal: deleteBetriebsmittelModal-->
 		<BsModal ref="deleteBetriebsmittelModal">
-			<template #title>Betriebsmittel löschen</template>
+			<template #title>{{$p.t('ui', 'betriebsmittel_delete')}}</template>
 			<template #default>
-				<p>Betriebsmittel {{formData.betriebsmitteltyp}} wirklich löschen?</p>
+				<p>{{$p.t('ui', 'betriebsmittel_confirm_delete')}}</p>
 			</template>
 			<template #footer>
 <!--				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">Abbrechen</button>-->
@@ -307,13 +293,13 @@ export default {
 				
 				<div class="row mb-3">
 					<div class="col-sm-7">
-						<p v-if="statusNew" class="fw-bold"> Betriebsmittel anlegen</p>
-						<p v-else class="fw-bold">Betriebsmittel bearbeiten</p>
+						<p v-if="statusNew" class="fw-bold">{{$p.t('ui', 'add_betriebsmittel')}}</p>
+						<p v-else class="fw-bold">{{$p.t('ui', 'edit_betriebsmittel')}}</p>
 					</div>
 				</div>
 				
 				<div class="row mb-3">								   
-					<label for="typ" class="form-label col-sm-4">Typ</label>
+					<label for="typ" class="form-label col-sm-4">{{$p.t('global', 'typ')}}</label>
 					<div class="col-sm-6">
 						<form-input
 						type="select"
@@ -328,20 +314,20 @@ export default {
 				
 			
 				<div v-if="formData.betriebsmitteltyp == 'Inventar'" class="row mb-3">
-					<label for="inventarnummer" class="form-label col-sm-4">Inventarnummer</label>
+					<label for="inventarnummer" class="form-label col-sm-4">{{$p.t('wawi', 'inventarnummer')}}</label>
 					<div class="col-sm-6">
 						<PvAutoComplete v-model="formData['inventarData']" optionLabel="dropdowntext" :suggestions="filteredInventar" @complete="searchInventar" minLength="3"/>
 					</div>
 				</div>
 				<div v-else-if="formData.inventarnummer" class="row mb-3">
-				<label for="inventarnummer" class="form-label col-sm-4">Inventarnummer</label>
+				<label for="inventarnummer" class="form-label col-sm-4">{{$p.t('wawi', 'inventarnummer')}}</label>
 					<div class="col-sm-6">
 						<input type="text" :readonly="readonly" class="form-control" id="inventarnummer" v-model="formData.inventarnummer" :disabled="!statusNew">
 					</div>
 				</div>
 				
 				<div v-if="formData.betriebsmitteltyp!='Inventar' && !formData.inventarnummer" class="row mb-3">
-					<label for="nummer" class="form-label col-sm-4">Nummer</label>
+					<label for="nummer" class="form-label col-sm-4">{{$p.t('wawi', 'nummer')}}</label>
 					<div class="col-sm-6">
 						<form-input
 							type="text"
@@ -353,7 +339,7 @@ export default {
 				</div>
 				
 				<div v-if="formData.betriebsmitteltyp!='Inventar' && !formData.inventarnummer" class="row mb-3">
-					<label for="nummer2" class="form-label col-sm-4">Nummer2</label>
+					<label for="nummer2" class="form-label col-sm-4">{{$p.t('wawi', 'nummer')}} 2</label>
 					<div class="col-sm-6">
 						<form-input
 							type="text"
@@ -365,7 +351,7 @@ export default {
 				</div>
 			
 				<div v-if="formData.betriebsmitteltyp!='Inventar'" class="row mb-3">
-					<label for="beschreibung" class="form-label col-sm-4">Beschreibung</label>
+					<label for="beschreibung" class="form-label col-sm-4">{{$p.t('global', 'beschreibung')}}</label>
 					<div class="col-sm-6">
 						<form-input
 							type="textarea"
@@ -378,7 +364,7 @@ export default {
 				</div>
 				
 				<div class="row mb-3">
-					<label for="kaution" class="form-label col-sm-4">Kaution</label>
+					<label for="kaution" class="form-label col-sm-4">{{$p.t('infocenter', 'kaution')}}</label>
 					<div class="col-sm-6">
 						<form-input
 							type="text"
@@ -390,7 +376,7 @@ export default {
 				</div>
 				
 				<div class="row mb-3">
-					<label for="anmerkung" class="form-label col-sm-4">Anmerkung</label>
+					<label for="anmerkung" class="form-label col-sm-4">{{$p.t('global', 'anmerkung')}}</label>
 					<div class="col-sm-6">
 						<form-input
 							type="textarea"
@@ -402,7 +388,7 @@ export default {
 				</div>
 				
 				<div class="row mb-3">
-					<label for="ausgegebenam" class="form-label col-sm-4">Ausgegeben am</label>
+					<label for="ausgegebenam" class="form-label col-sm-4">{{$p.t('wawi', 'ausgegebenam')}}</label>
 					<div class="col-sm-6">
 						<form-input
 							type="DatePicker"
@@ -419,7 +405,7 @@ export default {
 				</div>
 				
 				<div class="row mb-3">
-					<label for="retouram" class="form-label col-sm-4">Retour am</label>
+					<label for="retouram" class="form-label col-sm-4">{{$p.t('wawi', 'retouram')}}</label>
 					<div class="col-sm-6">
 						<form-input
 							type="DatePicker"
@@ -439,10 +425,10 @@ export default {
 				<div class="row mb-3">
 				<label class="form-label col-sm-8"></label>
 					<div v-if="statusNew" class="col-sm-4">
-						<button ref="Close" type="button" class="btn btn-primary" @click="addNewBetriebsmittel()">Speichern</button>
+						<button ref="Close" type="button" class="btn btn-primary" @click="addNewBetriebsmittel()">{{$p.t('ui', 'speichern')}}</button>
 					</div>
 					<div v-else class="col-sm-4">
-						<button ref="Close" type="button" class="btn btn-warning" @click="updateBetriebsmittel()">Aktualisieren</button>
+						<button ref="Close" type="button" class="btn btn-primary" @click="updateBetriebsmittel()">{{$p.t('ui', 'speichern')}}</button>
 					</div>
 					
 				</div>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index b0da7a7c5..423a25d52 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -26285,6 +26285,196 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'betriebsmittel_delete',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Betriebsmittel löschen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'delete operating resource',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'betriebsmittel_confirm_delete',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Betriebsmittel wirklich löschen?',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Really delete operating resource?',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'add_betriebsmittel',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Betriebsmittel anlegen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'create operating resource',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'edit_betriebsmittel',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Betriebsmittel bearbeiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'edit operating resource',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'wawi',
+		'phrase' => 'inventarnummer',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Inventarnummer',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'inventory number',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'wawi',
+		'phrase' => 'nummer',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Nummer',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'number',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'wawi',
+		'phrase' => 'ausgegebenam',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ausgegeben am',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'issued on',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'wawi',
+		'phrase' => 'retouram',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Retour am',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'returned on',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'wawi',
+		'phrase' => 'retourdatum',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Retourdatum',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'return date',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'wawi',
+		'phrase' => 'ausgabedatum',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'ausgabedatum',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'issue date',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 );
 
 

From 675ce0e9aaa7c7ca65afd0831eb891902da2454f Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 9 Apr 2024 16:20:29 +0200
Subject: [PATCH 0570/1461] Bug utf8_decode Umlaute in betriebsmitteltyp

---
 application/controllers/api/frontend/v1/stv/Betriebsmittel.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/application/controllers/api/frontend/v1/stv/Betriebsmittel.php b/application/controllers/api/frontend/v1/stv/Betriebsmittel.php
index ca1bfab1d..d0cf29f7f 100644
--- a/application/controllers/api/frontend/v1/stv/Betriebsmittel.php
+++ b/application/controllers/api/frontend/v1/stv/Betriebsmittel.php
@@ -112,6 +112,8 @@ class Betriebsmittel extends FHCAPI_Controller
 		// Start DB transaction
 		$this->db->trans_begin();
 
+		$betriebsmitteltyp = utf8_decode($betriebsmitteltyp);
+
 		if(!$inventarData)
 		{
 			$result = $this->BetriebsmittelModel->insert(

From e11dd21a1e43fe019772f72c7028049bd5fcb394 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 9 Apr 2024 16:35:00 +0200
Subject: [PATCH 0571/1461] add parameter dvendegrund_kurzbz and
 dvendegrund_anmerkung

---
 .../vertragsbestandteil/Dienstverhaeltnis.php | 33 ++++++++++++++++++-
 .../VertragsbestandteilLib.php                | 10 +++++-
 2 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/application/libraries/vertragsbestandteil/Dienstverhaeltnis.php b/application/libraries/vertragsbestandteil/Dienstverhaeltnis.php
index 309d3dfdc..07c417077 100644
--- a/application/libraries/vertragsbestandteil/Dienstverhaeltnis.php
+++ b/application/libraries/vertragsbestandteil/Dienstverhaeltnis.php
@@ -29,6 +29,9 @@ class Dienstverhaeltnis extends AbstractBestandteil {
 	protected $updateamum;
 	protected $updatevon;
 
+	protected $dvendegrund_kurzbz;
+	protected $dvendegrund_anmerkung;
+
 	public function __construct()
 	{
 		parent::__construct();
@@ -49,6 +52,8 @@ class Dienstverhaeltnis extends AbstractBestandteil {
 		isset($data->insertvon) && $this->setInsertvon($data->insertvon);
 		isset($data->updateamum) && $this->setUpdateamum($data->updateamum);
 		isset($data->updatevon) && $this->setUpdatevon($data->updatevon);
+		isset($data->dvendegrund_kurzbz) && $this->setDvendegrund_kurzbz($data->dvendegrund_kurzbz);
+		isset($data->dvendegrund_anmerkung) && $this->setDvendegrund_anmerkung($data->dvendegrund_anmerkung);
 		$this->fromdb = false;
 	}
 	
@@ -64,7 +69,9 @@ class Dienstverhaeltnis extends AbstractBestandteil {
 			'insertamum' => $this->getInsertamum(),
 			'insertvon' => $this->getInsertvon(),
 			'updateamum' => $this->getUpdateamum(),
-			'updatevon' => $this->getUpdatevon()
+			'updatevon' => $this->getUpdatevon(), 
+			'dvendegrund_kurzbz' => $this->getDvendegrund_kurzbz(), 
+			'dvendegrund_anmerkung' => $this->getDvendegrund_anmerkung()
 		);
 		
 		$tmp = array_filter($tmp, function($k) {
@@ -139,6 +146,16 @@ EOTXT;
 		return $this->updatevon;
 	}
 
+	public function getDvendegrund_kurzbz()
+	{
+	    return $this->dvendegrund_kurzbz;
+	}
+
+	public function getDvendegrund_anmerkung()
+	{
+	    return $this->dvendegrund_anmerkung;
+	}
+
 	public function setDienstverhaeltnis_id($dienstverhaeltnis_id)
 	{
 		$this->markDirty('dienstverhaeltnis_id', $this->dienstverhaeltnis_id, $dienstverhaeltnis_id);
@@ -214,6 +231,20 @@ EOTXT;
 		return $this;
 	}
 	
+	public function setDvendegrund_kurzbz($dvendegrund_kurzbz)
+	{
+	    $this->markDirty('dvendegrund_kurzbz', $this->dvendegrund_kurzbz, $dvendegrund_kurzbz);
+	    $this->dvendegrund_kurzbz = $dvendegrund_kurzbz;
+	    return $this;
+	}
+
+	public function setDvendegrund_anmerkung($dvendegrund_anmerkung)
+	{
+	    $this->markDirty('dvendegrund_anmerkung', $this->dvendegrund_anmerkung, $dvendegrund_anmerkung);
+	    $this->dvendegrund_anmerkung = $dvendegrund_anmerkung;
+	    return $this;
+	}
+
 	public function validate() {		
 		//do Validation here
 		$ci = get_instance();
diff --git a/application/libraries/vertragsbestandteil/VertragsbestandteilLib.php b/application/libraries/vertragsbestandteil/VertragsbestandteilLib.php
index 297896a02..b58c514e1 100644
--- a/application/libraries/vertragsbestandteil/VertragsbestandteilLib.php
+++ b/application/libraries/vertragsbestandteil/VertragsbestandteilLib.php
@@ -435,7 +435,7 @@ class VertragsbestandteilLib
 	    return $result;
 	}
 
-	public function endDienstverhaeltnis(Dienstverhaeltnis $dv, $enddate)
+	public function endDienstverhaeltnis(Dienstverhaeltnis $dv, $enddate, $dvendegrund_kurzbz=null, $dvendegrund_anmerkung=null)
 	{
 		if( $dv->getBis() !== null && $dv->getBis() < $enddate )
 		{
@@ -460,6 +460,14 @@ class VertragsbestandteilLib
 					$this->endVertragsbestandteil($vb, $enddate);
 				}
 
+				if( $dvendegrund_kurzbz !== null )
+				{
+				    $dv->setDvendegrund_kurzbz($dvendegrund_kurzbz);
+				}
+				if( $dvendegrund_anmerkung !== null )
+				{
+				    $dv->setDvendegrund_anmerkung($dvendegrund_anmerkung);
+				}
 				$dv->setBis($enddate);
 				$this->updateDienstverhaeltnis($dv);
 

From 487a2b6037f8562425b7fdeb5e762184d31c99a1 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 10 Apr 2024 10:42:16 +0200
Subject: [PATCH 0572/1461] Phrases valdidations, format dates, design
 adapations

---
 .../api/frontend/v1/stv/Betriebsmittel.php    | 62 +++++---------
 .../ressource/Betriebsmittelperson_model.php  |  2 +-
 .../Betriebsmittel/Betriebsmittel.js          | 84 ++++++++++++-------
 system/phrasesupdate.php                      | 59 ++++++++++++-
 4 files changed, 134 insertions(+), 73 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Betriebsmittel.php b/application/controllers/api/frontend/v1/stv/Betriebsmittel.php
index d0cf29f7f..cb6c4a3aa 100644
--- a/application/controllers/api/frontend/v1/stv/Betriebsmittel.php
+++ b/application/controllers/api/frontend/v1/stv/Betriebsmittel.php
@@ -50,27 +50,18 @@ class Betriebsmittel extends FHCAPI_Controller
 
 	public function addNewBetriebsmittel()
 	{
-		//TODO(Manu) Berechtigungen
-/*		if(!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg))
-		{
-			$result =  $this->p->t('lehre','error_keineSchreibrechte');
-
-			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}*/
-
-
 		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
 
 		$this->form_validation->set_rules('kaution', 'Kaution', 'numeric', [
-			'numeric' => $this->p->t('ui','error_fieldNotNumeric',['field' => 'Kaution'])
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Kaution'])
 		]);
 
 		$this->form_validation->set_rules('betriebsmitteltyp', 'TYP', 'required', [
-			'required' => $this->p->t('ui','error_fieldRequired',['field' => 'Typ'])
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Typ'])
 		]);
 
 		$this->form_validation->set_rules('ausgegebenam', 'Ausgegeben am', 'required', [
-			'required' => $this->p->t('ui','error_fieldRequired',['field' => 'Ausgegeben am'])
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Ausgegeben am'])
 		]);
 
 
@@ -100,14 +91,19 @@ class Betriebsmittel extends FHCAPI_Controller
 
 		if($betriebsmitteltyp == 'Zutrittskarte' && !$nummer)
 		{
-			return $this->terminateWithError("Eine Zutrittskarte muss eine Nummer haben. Um die Zuordnung zu dieser Karte zu loeschen entfernen Sie bitte den ganzen Datensatz", self::ERROR_TYPE_GENERAL);
+			return $this->terminateWithError($this->p->t('wawi', 'error_zutrittskarteOhneNummer'), self::ERROR_TYPE_GENERAL);
 		}
 
 		if($retouram && $retouram < $ausgegebenam)
-			return $this->terminateWithError("Retourdatum darf nicht vor Datum der Ausgabe liegen", self::ERROR_TYPE_GENERAL);
+		{
+			return $this->terminateWithError($this->p->t('wawi', 'error_retourdatumVorAusgabe'), self::ERROR_TYPE_GENERAL);
+		}
 
 		if($betriebsmitteltyp == "Inventar" && !($inventarData['inventarnummer']))
-			return $this->terminateWithError("Bitte wählen Sie das entsprechende Inventar aus dem Drop Down Menü aus", self::ERROR_TYPE_GENERAL);
+		{
+			return $this->terminateWithError($this->p->t('wawi', 'error_inventarWaehlen'), self::ERROR_TYPE_GENERAL);
+		}
+
 
 		// Start DB transaction
 		$this->db->trans_begin();
@@ -157,20 +153,10 @@ class Betriebsmittel extends FHCAPI_Controller
 
 		$this->db->trans_commit();
 		return $this->terminateWithSuccess(true);
-
 	}
 
 	public function updateBetriebsmittel()
 	{
-		//TODO(Manu) Berechtigungen
-		/*		if(!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg))
-				{
-					$result =  $this->p->t('lehre','error_keineSchreibrechte');
-
-					return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-				}*/
-
-
 		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
 
 		$uid_user = getAuthUID();
@@ -189,15 +175,15 @@ class Betriebsmittel extends FHCAPI_Controller
 		$uid = $this->input->post('uid');
 
 		$this->form_validation->set_rules('kaution', 'Kaution', 'numeric', [
-			'numeric' => $this->p->t('ui','error_fieldNotNumeric',['field' => 'Kaution'])
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Kaution'])
 		]);
 
 		$this->form_validation->set_rules('betriebsmitteltyp', 'TYP', 'required', [
-			'required' => $this->p->t('ui','error_fieldRequired',['field' => 'Typ'])
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Typ'])
 		]);
 
 		$this->form_validation->set_rules('ausgegebenam', 'Ausgegeben am', 'required', [
-			'required' => $this->p->t('ui','error_fieldRequired',['field' => 'Ausgegeben am'])
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Ausgegeben am'])
 		]);
 
 
@@ -208,11 +194,13 @@ class Betriebsmittel extends FHCAPI_Controller
 
 		if($betriebsmitteltyp == 'Zutrittskarte' && !$nummer)
 		{
-			return $this->terminateWithError("Eine Zutrittskarte muss eine Nummer haben. Um die Zuordnung zu dieser Karte zu loeschen entfernen Sie bitte den ganzen Datensatz", self::ERROR_TYPE_GENERAL);
+			return $this->terminateWithError($this->p->t('wawi', 'error_zutrittskarteOhneNummer'), self::ERROR_TYPE_GENERAL);
 		}
 
 		if($retouram && $retouram < $ausgegebenam)
-			return $this->terminateWithError("Retourdatum darf nicht vor Datum der Ausgabe liegen", self::ERROR_TYPE_GENERAL);
+		{
+			return $this->terminateWithError($this->p->t('wawi', 'error_retourdatumVorAusgabe'), self::ERROR_TYPE_GENERAL);
+		}
 
 
 		// Start DB transaction
@@ -236,11 +224,10 @@ class Betriebsmittel extends FHCAPI_Controller
 		);
 
 		if($this->db->trans_status() === false || isError($result))
-			{
-				$this->db->trans_rollback();
-				return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-			}
-
+		{
+			$this->db->trans_rollback();
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
 
 		$result = $this->BetriebsmittelModel->update(
 			[
@@ -264,7 +251,6 @@ class Betriebsmittel extends FHCAPI_Controller
 
 		$this->db->trans_commit();
 		return $this->terminateWithSuccess(true);
-
 	}
 
 	public function loadBetriebsmittel()
@@ -286,7 +272,6 @@ class Betriebsmittel extends FHCAPI_Controller
 		}
 
 		$this->terminateWithSuccess(current(getData($result)));
-
 	}
 
 	public function deleteBetriebsmittel()
@@ -307,10 +292,9 @@ class Betriebsmittel extends FHCAPI_Controller
 		}
 		if (!hasData($result))
 		{
-			return $this->terminateWithError($this->p->t('ui','error_missingId',['id'=> 'Betriebsmittelperson_id']), self::ERROR_TYPE_GENERAL);
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Betriebsmittelperson_id']), self::ERROR_TYPE_GENERAL);
 		}
 		return $this->outputJsonSuccess(current(getData($result)));
-
 	}
 
 	public function getTypenBetriebsmittel()
diff --git a/application/models/ressource/Betriebsmittelperson_model.php b/application/models/ressource/Betriebsmittelperson_model.php
index 17aab3bc7..bffa82501 100644
--- a/application/models/ressource/Betriebsmittelperson_model.php
+++ b/application/models/ressource/Betriebsmittelperson_model.php
@@ -115,7 +115,7 @@ class Betriebsmittelperson_model extends DB_Model
 
 		$query = "
 			SELECT 
-			    bm.nummer, bmp.person_id, bm.betriebsmitteltyp, bmp.anmerkung as anmerkung, bmp.retouram, bm.beschreibung, bmp.ausgegebenam, bmp.uid, bmp.kaution, bm.betriebsmittel_id, bmp.betriebsmittelperson_id, bm.inventarnummer --bm.*
+			    bm.nummer, bmp.person_id, bm.betriebsmitteltyp, bmp.anmerkung as anmerkung, bmp.retouram, TO_CHAR(bmp.retouram::timestamp, 'DD.MM.YYYY') AS format_retour, bmp.ausgegebenam, TO_CHAR(bmp.ausgegebenam::timestamp, 'DD.MM.YYYY') AS format_ausgabe, bm.beschreibung, bmp.uid, bmp.kaution, bm.betriebsmittel_id, bmp.betriebsmittelperson_id, bm.inventarnummer
 			FROM 
 			    wawi.tbl_betriebsmittelperson bmp
 			JOIN 
diff --git a/public/js/components/Betriebsmittel/Betriebsmittel.js b/public/js/components/Betriebsmittel/Betriebsmittel.js
index fb34b0481..6011ff98c 100644
--- a/public/js/components/Betriebsmittel/Betriebsmittel.js
+++ b/public/js/components/Betriebsmittel/Betriebsmittel.js
@@ -32,19 +32,20 @@ export default {
 				ajaxResponse: (url, params, response) => response.data,
 				columns: [
 					{title: "Nummer", field: "nummer"},
-					{title: "PersonId", field: "person_id"},
+					{title: "PersonId", field: "person_id", visible: false},
 					{title: "Typ", field: "betriebsmitteltyp"},
 					{title: "Anmerkung", field: "anmerkung", visible: false},
-					{title: "Retourdatum", field: "retouram"},
+					{title: "Retourdatum", field: "format_retour", visible: false},
 					{title: "Beschreibung", field: "beschreibung"},
-					{title: "Uid", field: "uid"},
+					{title: "Uid", field: "uid", visible: false},
 					{title: "Kaution", field: "kaution", visible: false},
-					{title: "Ausgabedatum", field: "ausgegebenam", visible: false},
+					{title: "Ausgabedatum", field: "format_ausgabe"},
 					{title: "Betriebsmittel_id", field: "betriebsmittel_id", visible: false},
 					{title: "Betriebsmittelperson_id", field: "betriebsmittelperson_id", visible: false},
 					{
 						title: 'Aktionen', field: 'actions',
 						minWidth: 150, // Ensures Action-buttons will be always fully displayed
+						maxWidth: 150,
 						formatter: (cell, formatterParams, onRendered) => {
 							let container = document.createElement('div');
 							container.className = "d-flex gap-2";
@@ -61,7 +62,7 @@ export default {
 									let linkToPdf = this.cisRoot +
 										'/content/pdfExport.php?xml=betriebsmittelperson.rdf.php&xsl=Uebernahme&id=' + cellData.betriebsmittelperson_id + '&output=pdf';
 
-								window.open(linkToPdf, '_blank');
+									window.open(linkToPdf, '_blank');
 							});
 							container.append(button);
 
@@ -93,14 +94,14 @@ export default {
 					}],
 				layout: 'fitColumns',
 				layoutColumnsOnNewData: false,
-				height: '150',
+				height: '550',
 				selectableRangeMode: 'click',
 				selectable: true
 			},
 			tabulatorEvents: [
 				{
 					event: 'tableBuilt',
-					handler: async () => {
+					handler: async() => {
 
 						await this.$p.loadCategory(['wawi', 'global', 'infocenter']);
 
@@ -112,18 +113,17 @@ export default {
 						cm.getColumnByField('anmerkung').component.updateDefinition({
 							title: this.$p.t('global', 'anmerkung')
 						});
-						cm.getColumnByField('retouram').component.updateDefinition({
+						cm.getColumnByField('format_retour').component.updateDefinition({
 							title: this.$p.t('wawi', 'retourdatum')
 						});
 						cm.getColumnByField('kaution').component.updateDefinition({
 							title: this.$p.t('infocenter', 'kaution')
 						});
-						cm.getColumnByField('ausgegebenam').component.updateDefinition({
+						cm.getColumnByField('format_ausgabe').component.updateDefinition({
 							title: this.$p.t('wawi', 'ausgabedatum')
 						});
 
 					}
-
 				}
 			],
 			betriebsmittelData: {},
@@ -262,6 +262,7 @@ export default {
 	template: `
 	<div class="betriebsmittel-betriebsmittel">
 	
+	
 		<!--Modal: deleteBetriebsmittelModal-->
 		<BsModal ref="deleteBetriebsmittelModal">
 			<template #title>{{$p.t('ui', 'betriebsmittel_delete')}}</template>
@@ -273,21 +274,28 @@ export default {
 				<button ref="Close" type="button" class="btn btn-primary" @click="deleteBetriebsmittel(formData.betriebsmittelperson_id)">OK</button>
 			</template>
 		</BsModal>
+		
+		
+		<div class="row col-12">
+			<div class="col-6">
+			
+				<core-filter-cmpt
+					ref="table"
+					:tabulator-options="tabulatorOptions"
+					:tabulator-events="tabulatorEvents"
+					table-only
+					:side-menu="false"
+					reload
+					new-btn-show
+					new-btn-label="Betriebsmittel"
+					@click:new="actionNewBetriebsmittel"
+					>
+				</core-filter-cmpt>
+			
+			</div>
+			
 
-		<core-filter-cmpt
-			ref="table"
-			:tabulator-options="tabulatorOptions"
-			:tabulator-events="tabulatorEvents"
-			table-only
-			:side-menu="false"
-			reload
-			new-btn-show
-			new-btn-label="Betriebsmittel"
-			@click:new="actionNewBetriebsmittel"
-			>
-		</core-filter-cmpt>
-		<br>
-
+			
 			<form-form class="row g-3 col-6" ref="betriebsmittelData">
 				<legend>Details</legend>
 				
@@ -298,7 +306,7 @@ export default {
 					</div>
 				</div>
 				
-				<div class="row mb-3">								   
+				<div class="row mb-3">
 					<label for="typ" class="form-label col-sm-4">{{$p.t('global', 'typ')}}</label>
 					<div class="col-sm-6">
 						<form-input
@@ -307,11 +315,16 @@ export default {
 						v-model="formData.betriebsmitteltyp"
 						:disabled="!statusNew"
 						>
-						<option v-for="entry in listBetriebsmitteltyp" :key="entry.betriebsmitteltyp" :value="entry.betriebsmitteltyp">{{entry.beschreibung}}</option>
+						<option
+							v-for="entry in listBetriebsmitteltyp"
+							:key="entry.betriebsmitteltyp"
+							:value="entry.betriebsmitteltyp"
+							>
+							{{entry.beschreibung}}
+						</option>
 						</form-input>
 					</div>
 				</div>
-				
 			
 				<div v-if="formData.betriebsmitteltyp == 'Inventar'" class="row mb-3">
 					<label for="inventarnummer" class="form-label col-sm-4">{{$p.t('wawi', 'inventarnummer')}}</label>
@@ -333,7 +346,7 @@ export default {
 							type="text"
 							name="nummer"
 							v-model="formData['nummer']"
-						>						
+						>
 						</form-input>
 					</div>
 				</div>
@@ -345,7 +358,7 @@ export default {
 							type="text"
 							name="nummer2"
 							v-model="formData['nummer2']"
-						>						
+						>
 						</form-input>
 					</div>
 				</div>
@@ -358,7 +371,7 @@ export default {
 							name="beschreibung"
 							v-model="formData['beschreibung']"
 							:disabled="formData.inventarnummer"
-						>						
+						>
 						</form-input>
 					</div>
 				</div>
@@ -370,7 +383,7 @@ export default {
 							type="text"
 							name="kaution"
 							v-model="formData['kaution']"
-						>						
+						>
 						</form-input>
 					</div>
 				</div>
@@ -382,7 +395,7 @@ export default {
 							type="textarea"
 							name="anmerkung"
 							v-model="formData['anmerkung']"
-						>						
+						>
 						</form-input>
 					</div>
 				</div>
@@ -434,6 +447,13 @@ export default {
 				</div>
 		</form-form>
 		
+		</div>
+
+
+
+
+
+		
 	</div>`
 }
 
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 423a25d52..3f7952ea1 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -26463,7 +26463,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'ausgabedatum',
+				'text' => 'Ausgabedatum',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -26475,6 +26475,63 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'wawi',
+		'phrase' => 'error_zutrittskarteOhneNummer',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Eine Zutrittskarte muss eine Nummer haben. Um die Zuordnung zu dieser Karte zu löschen entfernen Sie bitte den ganzen Datensatz!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'An access card must have a number. To delete the assignment to this card, please remove the entire data record!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'wawi',
+		'phrase' => 'error_inventarWaehlen',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bitte wählen Sie das entsprechende Inventar aus dem Drop Down Menü Inventarnummer aus!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Please select the appropriate inventory from the inventory number drop down menu!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'wawi',
+		'phrase' => 'error_retourdatumVorAusgabe',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Retourdatum darf nicht vor Datum der Ausgabe liegen!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The return date must not be before the issue date!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 );
 
 

From f51f00637743614ea1a28bcbbd12b57256393bf6 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Wed, 10 Apr 2024 14:07:41 +0200
Subject: [PATCH 0573/1461] Corrected phrase anmerkungIntern

---
 system/phrasesupdate.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 6a631d5d2..17daf06a4 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -25367,13 +25367,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'anmerkungIntern',
+				'text' => 'Anmerkung intern',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Note internal',
+				'text' => 'Internal note',
 				'description' => '',
 				'insertvon' => 'system'
 			)

From 94224f7ef753d5f52911d3079617325957f4a6d9 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 10 Apr 2024 14:28:07 +0200
Subject: [PATCH 0574/1461] dvendegrund Ablauf durch Zeit added

---
 system/dbupdate_3.4/28260_vertraege.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/system/dbupdate_3.4/28260_vertraege.php b/system/dbupdate_3.4/28260_vertraege.php
index 58a895483..d6729f7e3 100644
--- a/system/dbupdate_3.4/28260_vertraege.php
+++ b/system/dbupdate_3.4/28260_vertraege.php
@@ -465,7 +465,8 @@ if ($result = $db->db_query("SELECT * FROM information_schema.tables WHERE table
 			('kuendigung_arbeitgeber', 'Kündigung durch Arbeitgeber', ARRAY['Kündigung durch Arbeitgeber', 'Cancellation by Employer']),
 			('entlassung', 'Entlassung', ARRAY['Entlassung', 'Dismissal']),
 			('sonstige', 'Sonstige', ARRAY['Sonstige', 'Miscellaneous']),
-			('einvernehmlich', 'Einvernehmliche Auflösung', ARRAY['Einvernehmliche Auflösung', 'Rescission']);
+			('einvernehmlich', 'Einvernehmliche Auflösung', ARRAY['Einvernehmliche Auflösung', 'Rescission']),
+			('ablaufzeit', 'Ablauf durch Zeit', ARRAY['Ablauf durch Zeit', 'Expired by lapse of time']);
 		";
 		if (! $db->db_query($qry))
 			echo '<strong>Vertraege: ' . $db->db_last_error() . '</strong><br>';
@@ -514,4 +515,4 @@ if ($result = $db->db_query("SELECT * FROM information_schema.columns WHERE colu
 		else
 			echo 'Spalte dvendegrund_anmerkung wurde in hr.tbl_dienstverhaeltnis neu erstellt<br>';
 	}
-}
\ No newline at end of file
+}

From 21c2bafed6f11c57122d5361455e71635347a8d6 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 10 Apr 2024 15:08:21 +0200
Subject: [PATCH 0575/1461] adapt the logic of the profilUpdate feature to use
 constant status and topics from the database

---
 application/controllers/Cis/ProfilUpdate.php  | 846 ++++++++++--------
 public/js/apps/Cis/Profil.js                  |  48 +-
 public/js/apps/api/profilUpdate.js            | 197 ++--
 .../ProfilComponents/FetchProfilUpdates.js    |  42 +-
 .../EditProfilComponents/EditAdresse.js       |   4 +-
 .../Profil/ProfilModal/EditProfilSelect.js    |  17 +-
 .../Cis/ProfilUpdate/AcceptDenyUpdate.js      |  87 +-
 system/dbupdate_3.4/25999_C4_ma0594.php       |  75 +-
 8 files changed, 721 insertions(+), 595 deletions(-)

diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
index 0eeec40da..aea7dc0ec 100755
--- a/application/controllers/Cis/ProfilUpdate.php
+++ b/application/controllers/Cis/ProfilUpdate.php
@@ -9,53 +9,59 @@ if (!defined('BASEPATH'))
 class ProfilUpdate extends Auth_Controller
 {
 
-	public static $STATUS_PENDING =NULL;
-	public static $STATUS_ACCEPTED =NULL;
-	public static $STATUS_REJECTED =NULL;
-	
+	public static $STATUS_PENDING = NULL;
+	public static $STATUS_ACCEPTED = NULL;
+	public static $STATUS_REJECTED = NULL;
 
-	public function __construct(){
+	public static $TOPICS = [];
+
+
+	public function __construct()
+	{
 		parent::__construct([
-			'index' => ['student/stammdaten:r','mitarbeiter/stammdaten:r'],
-			'id' => ['student/stammdaten:r','mitarbeiter/stammdaten:r'],
-			'getProfilUpdateWithPermission' => ['student/stammdaten:r','mitarbeiter/stammdaten:r'],
-			'acceptProfilRequest'=>['student/stammdaten:rw','mitarbeiter/stammdaten:rw'],
-			'denyProfilRequest'=>['student/stammdaten:rw','mitarbeiter/stammdaten:rw'],
-			'show'=>['student/anrechnung_beantragen:r','user:r'],
-		
+			'index' => ['student/stammdaten:r', 'mitarbeiter/stammdaten:r'],
+			'id' => ['student/stammdaten:r', 'mitarbeiter/stammdaten:r'],
+			'getProfilUpdateWithPermission' => ['student/stammdaten:r', 'mitarbeiter/stammdaten:r'],
+			'acceptProfilRequest' => ['student/stammdaten:rw', 'mitarbeiter/stammdaten:rw'],
+			'denyProfilRequest' => ['student/stammdaten:rw', 'mitarbeiter/stammdaten:rw'],
+			'show' => ['student/anrechnung_beantragen:r', 'user:r'],
+
 			'insertProfilRequest' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'updateProfilRequest' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'deleteProfilRequest' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'selectProfilRequest' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'insertFile' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'getProfilRequestFiles' => ['student/anrechnung_beantragen:r', 'user:r'],
-			
-			
-			
-		]);
-		
+			'getStatus' => ['student/anrechnung_beantragen:r', 'user:r'],
+			'getTopic' => ['student/anrechnung_beantragen:r', 'user:r'],
 
-		$this->load->model('person/Profil_update_model','ProfilUpdateModel');
-		$this->load->model('person/Kontakt_model','KontaktModel');
-		$this->load->model('person/Adresse_model','AdresseModel');
+
+
+		]);
+
+
+		$this->load->model('person/Profil_update_model', 'ProfilUpdateModel');
+		$this->load->model('person/Kontakt_model', 'KontaktModel');
+		$this->load->model('person/Adresse_model', 'AdresseModel');
 		$this->load->model('person/Adressentyp_model', 'AdressenTypModel');
-		$this->load->model('person/Person_model','PersonModel');
+		$this->load->model('person/Person_model', 'PersonModel');
 		$this->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
 		$this->load->model('crm/Student_model', 'StudentModel');
 		$this->load->model('person/Benutzer_model', 'BenutzerModel');
 		$this->load->model('system/Sprache_model', 'SpracheModel');
 		$this->load->model('person/Profil_update_status_model', 'ProfilUpdateStatusModel');
+		$this->load->model('person/Profil_update_topic_model', 'ProfilUpdateTopicModel');
 
 		// Load language phrases
-        $this->loadPhrases(
-            array(
-            	'ui',
-                'global',
-                'person',
-                'profil',
+		$this->loadPhrases(
+			array(
+				'ui',
+				'global',
+				'person',
+				'profil',
 				'profilUpdate'
-            )
-        );
+			)
+		);
 
 		$this->load->library('DmsLib');
 		$this->load->library('PermissionLib');
@@ -64,271 +70,304 @@ class ProfilUpdate extends Auth_Controller
 		$this->uid = getAuthUID();
 		$this->pid = getAuthPersonID();
 
-		// static constants
+		// setup the ProfilUpdate states
 		$this->ProfilUpdateStatusModel->addSelect(['status_kurzbz']);
 		$status_kurzbz = $this->ProfilUpdateStatusModel->load();
-		if(hasData($status_kurzbz)){
+		if (hasData($status_kurzbz)) {
 			list($status_pending, $status_accepted, $status_rejected) = getData($status_kurzbz);
-			
+
 			self::$STATUS_PENDING = $status_pending->status_kurzbz;
 			self::$STATUS_ACCEPTED = $status_accepted->status_kurzbz;
 			self::$STATUS_REJECTED = $status_rejected->status_kurzbz;
 		}
+		// setup the ProfilUpdate topics
+		$this->ProfilUpdateTopicModel->addSelect(['topic_kurzbz']);
+		$topic_kurzbz = $this->ProfilUpdateTopicModel->load();
+
+		if (hasData($topic_kurzbz)) {
+			foreach (getData($topic_kurzbz) as $topic) {
+				self::$TOPICS[$topic->topic_kurzbz] = $topic->topic_kurzbz;
+			}
+		}
 	}
 
 
-	
-
-	public function index(){
+	public function index()
+	{
 		$this->load->view('Cis/ProfilUpdate');
 	}
 
-	public function id($profil_update_id=null){
-		$this->load->view('Cis/ProfilUpdate',['profil_update_id'=>$profil_update_id]);
+	public function id($profil_update_id = null)
+	{
+		$this->load->view('Cis/ProfilUpdate', ['profil_update_id' => $profil_update_id]);
 	}
 
-	private function sendEmail_onProfilUpdate_response($uid,$topic,$status){
-		
+	public function getStatus()
+	{
+		echo json_encode([self::$STATUS_PENDING => self::$STATUS_PENDING, self::$STATUS_ACCEPTED => self::$STATUS_ACCEPTED, self::$STATUS_REJECTED => self::$STATUS_REJECTED]);
+	}
+
+	public function getTopic()
+	{
+		echo json_encode(self::$TOPICS);
+	}
+
+	private function sendEmail_onProfilUpdate_response($uid, $topic, $status)
+	{
+
 		$this->load->helper('hlp_sancho_helper');
 		$email = $uid . "@" . DOMAIN;
-		
-		//? translation of the english version of the status to german
-		$status_de = "";
-		switch($status){
-			case 'Akzeptiert': $status_de = "Akzeptiert"; break;
-			case 'Accepted': $status_de = "Akzeptiert"; break;
-			case 'Abgelehnt': $status_de = "Abgelent"; break;
-			case 'Rejected': $status_de = "Abgelent"; break;
-			case 'Ausstehend': $status_de = "Ausstehend"; break;
-			case 'Pending': $status_de = "Ausstehend"; break;
-			default: $status_de = "default?"; break;
+
+
+		function languageQuery($language)
+		{
+			return "select index from public.tbl_sprache where sprache = '" + $language + "'";
+		}
+		$this->ProfilUpdateStatusModel->addSelect(["bezeichnung_mehrsprachig[(" . languageQuery('German') . ")] as status_de", "bezeichnung_mehrsprachig[(" . languageQuery('English') . ")] as status_en"]);
+		$status_translation = $this->ProfilUpdateStatusModel->loadWhere(["status_kurzbz" => $status]);
+		if (isError($status_translation)) {
+			show_error($this->p->t('profilUpdate', 'ProfilUpdateStatusTranslationError'));
+		}
+		$status_translation = hasData($status_translation) ? getData($status_translation)[0] : null;
+		if (isset($status_translation)) {
+			$mail_res = sendSanchoMail("profil_update_response", ['topic' => $topic, 'status_de' => $status_translation->status_de, 'status_en' => $status_translation->status_en, 'href' => APP_ROOT . 'Cis/Profil'], $email, ("Profil Änderung " . $this->p->t('profilUpdate', 'pending')));
+			if (!$mail_res) {
+				show_error($this->p->t('profilUpdate', 'profilUpdate_email_error'));
+			}
 		}
 
-		$mail_res = sendSanchoMail("profil_update_response",['topic'=>$topic,'status_de'=>$status_de,'status_en'=>$status,'href'=>APP_ROOT.'Cis/Profil'],$email,("Profil Änderung ".$this->p->t('profilUpdate', 'pending')));
-		if(!$mail_res){
-			show_error($this->p->t('profilUpdate','profilUpdate_email_error'));
-		}
 	}
 
 
-	private function sendEmail_onProfilUpdate_insertion($uid,$profil_update_id,$topic){
-		
+	private function sendEmail_onProfilUpdate_insertion($uid, $profil_update_id, $topic)
+	{
+
 		$this->load->helper('hlp_sancho_helper');
 		$emails = [];
 
 		$isMitarbeiter_res = $this->MitarbeiterModel->isMitarbeiter($uid);
-		if(isError($isMitarbeiter_res)){
-			show_error($this->p->t('profilUpdate','profilUpdate_mitarbeiterCheck_error'));
+		if (isError($isMitarbeiter_res)) {
+			show_error($this->p->t('profilUpdate', 'profilUpdate_mitarbeiterCheck_error'));
 		}
 		$isMitarbeiter_res = getData($isMitarbeiter_res);
-		
+
 		//! if the $uid is a mitarbeiter and student, only the hr is notified by email
-		if($isMitarbeiter_res){
+		if ($isMitarbeiter_res) {
 			//? user is not a student therefore he is a mitarbeiter, send email to Personalverwaltung
 			//? use constant variable MAIL_GST to mail to the personalverwaltung
 			$this->MitarbeiterModel->addSelect([TRUE]);
-			$this->MitarbeiterModel->addJoin("public.tbl_benutzer","public.tbl_benutzer.uid = public.tbl_mitarbeiter.mitarbeiter_uid");
+			$this->MitarbeiterModel->addJoin("public.tbl_benutzer", "public.tbl_benutzer.uid = public.tbl_mitarbeiter.mitarbeiter_uid");
 			//? check if the the userID is a mitarbeiter and if the benutzer is active
-			$res = $this->MitarbeiterModel->loadWhere(["public.tbl_mitarbeiter.mitarbeiter_uid"=>$uid,"public.tbl_benutzer.aktiv"=>TRUE]);
-			if(isError($res)){
-				show_error("was not able to query the mitarbeiter and benutzer by the uid: ". $uid);
+			$res = $this->MitarbeiterModel->loadWhere(["public.tbl_mitarbeiter.mitarbeiter_uid" => $uid, "public.tbl_benutzer.aktiv" => TRUE]);
+			if (isError($res)) {
+				show_error("was not able to query the mitarbeiter and benutzer by the uid: " . $uid);
 			}
-			if(hasData($res)){
-				array_push($emails,MAIL_GST);
-			}else{
-				show_error($this->p->t('profilUpdate','profilUpdate_mitarbeiterCheck_error'));
+			if (hasData($res)) {
+				array_push($emails, MAIL_GST);
+			} else {
+				show_error($this->p->t('profilUpdate', 'profilUpdate_mitarbeiterCheck_error'));
 			}
-		}else{
+		} else {
 			//? if it is not a mitarbeiter, check whether it is a student and send email to studiengang
 			$isStudent_res = $this->StudentModel->isStudent($uid);
-			if(isError($isStudent_res)){
-				show_error($this->p->t('profilUpdate','profilUpdate_studentCheck_error'));
+			if (isError($isStudent_res)) {
+				show_error($this->p->t('profilUpdate', 'profilUpdate_studentCheck_error'));
 			}
 			$isStudent_res = getData($isStudent_res);
-			if($isStudent_res){
+			if ($isStudent_res) {
 				//? Send email to the Studiengangsassistentinnen
 				$this->StudentModel->addSelect(["public.tbl_studiengang.email"]);
-				$this->StudentModel->addJoin("public.tbl_benutzer","public.tbl_benutzer.uid = public.tbl_student.student_uid");
-				$this->StudentModel->addJoin("public.tbl_prestudent","public.tbl_benutzer.person_id = public.tbl_prestudent.person_id");
-				$this->StudentModel->addJoin("public.tbl_prestudentstatus","public.tbl_prestudentstatus.prestudent_id = public.tbl_prestudent.prestudent_id");
-				$this->StudentModel->addJoin("public.tbl_studiengang","public.tbl_studiengang.studiengang_kz = public.tbl_prestudent.studiengang_kz");
+				$this->StudentModel->addJoin("public.tbl_benutzer", "public.tbl_benutzer.uid = public.tbl_student.student_uid");
+				$this->StudentModel->addJoin("public.tbl_prestudent", "public.tbl_benutzer.person_id = public.tbl_prestudent.person_id");
+				$this->StudentModel->addJoin("public.tbl_prestudentstatus", "public.tbl_prestudentstatus.prestudent_id = public.tbl_prestudent.prestudent_id");
+				$this->StudentModel->addJoin("public.tbl_studiengang", "public.tbl_studiengang.studiengang_kz = public.tbl_prestudent.studiengang_kz");
 				//* check if the benutzer itself is active
 				//* check if the student status is Student or Diplomand (active students)
-				$this->StudentModel->db->where_in("public.tbl_prestudentstatus.status_kurzbz",['Student','Diplomand']);
-				$res = $this->StudentModel->loadWhere(["public.tbl_benutzer.aktiv"=>TRUE,"public.tbl_student.student_uid"=>$uid]);
-				if(isError($res)){
+				$this->StudentModel->db->where_in("public.tbl_prestudentstatus.status_kurzbz", ['Student', 'Diplomand']);
+				$res = $this->StudentModel->loadWhere(["public.tbl_benutzer.aktiv" => TRUE, "public.tbl_student.student_uid" => $uid]);
+				if (isError($res)) {
 					show_error(getData($res));
-				}else{
+				} else {
 					$res = hasData($res) ? getData($res) : [];
-					foreach($res as $emailObj){
-						array_push($emails,$emailObj->email);
+					foreach ($res as $emailObj) {
+						array_push($emails, $emailObj->email);
 					}
 				}
 			}
 		}
-		$mail_res =[];
+		$mail_res = [];
 		//? sending email
-		foreach($emails as $email){
-			array_push($mail_res,sendSanchoMail("profil_update",['uid'=>$uid,'topic'=>$topic,'href'=>APP_ROOT.'Cis/ProfilUpdate/id/'.$profil_update_id],$email,("Profil Änderung von ".$uid)));
+		foreach ($emails as $email) {
+			array_push($mail_res, sendSanchoMail("profil_update", ['uid' => $uid, 'topic' => $topic, 'href' => APP_ROOT . 'Cis/ProfilUpdate/id/' . $profil_update_id], $email, ("Profil Änderung von " . $uid)));
 		}
-		foreach($mail_res as $m_res){
-			if(!$m_res){
-				show_error($this->p->t('profilUpdate','profilUpdate_email_error'));		
+		foreach ($mail_res as $m_res) {
+			if (!$m_res) {
+				show_error($this->p->t('profilUpdate', 'profilUpdate_email_error'));
 			}
 		}
-		
+
 	}
 
 
-	public function show($dms_id){
-	
-		$profil_update = $this->ProfilUpdateModel->loadWhere(['attachment_id'=>$dms_id]);
+	public function show($dms_id)
+	{
+
+		$profil_update = $this->ProfilUpdateModel->loadWhere(['attachment_id' => $dms_id]);
 		$profil_update = hasData($profil_update) ? getData($profil_update)[0] : null;
-		
+
 		//? checks if an profil update exists with the dms_id requested from the user
-		if($profil_update){ 
+		if ($profil_update) {
 			$is_mitarbeiter_profil_update = getData($this->MitarbeiterModel->isMitarbeiter($profil_update->uid));
 			$is_student_profil_update = getData($this->StudentModel->isStudent($profil_update->uid));
-			
-			if(
-				$this->permissionlib->isBerechtigt('student/stammdaten:r') && $is_student_profil_update || 
-				$this->permissionlib->isBerechtigt('mitarbeiter/stammdaten:r') && $is_mitarbeiter_profil_update || 
-				$this->uid == $profil_update->uid)
-			{
+
+			if (
+				$this->permissionlib->isBerechtigt('student/stammdaten:r') && $is_student_profil_update ||
+				$this->permissionlib->isBerechtigt('mitarbeiter/stammdaten:r') && $is_mitarbeiter_profil_update ||
+				$this->uid == $profil_update->uid
+			) {
 				// Get file to be downloaded from DMS
-				$newFilename= $this->uid."/document_".$dms_id;
+				$newFilename = $this->uid . "/document_" . $dms_id;
 				$download = $this->dmslib->download($dms_id);
-				if (isError($download)) return $download;
-				
+				if (isError($download))
+					return $download;
+
 				// Download file
 				$this->outputFile(getData($download));
-				
 
-			}else{
-				show_error($this->p->t('profilUpdate','profilUpdate_permission_error'));
+
+			} else {
+				show_error($this->p->t('profilUpdate', 'profilUpdate_permission_error'));
 				return;
 			}
-			
-		}else{
-			show_error($this->p->t('profilUpdate','profilUpdate_dms_error'));
+
+		} else {
+			show_error($this->p->t('profilUpdate', 'profilUpdate_dms_error'));
 			return;
 		}
-		
+
 	}
 
 
-	public function insertFile($replace){
+	public function insertFile($replace)
+	{
 		$replace = json_decode($replace);
-		
-		if(!count($_FILES)){
+
+		if (!count($_FILES)) {
 			echo json_encode([]);
 			return;
 		}
-		
+
 		//? if replace is set it contains the profil_update_id in which the attachment_id has to be replaced
-		if(isset($replace)){
+		if (isset($replace)) {
 			$this->ProfilUpdateModel->addSelect(["attachment_id"]);
 			$profilUpdate = $this->ProfilUpdateModel->load([$replace]);
-			if(isError($profilUpdate)){
-				return json_encode(error($this->p->t('profilUpdate','profilUpdate_loading_error')));
+			if (isError($profilUpdate)) {
+				return json_encode(error($this->p->t('profilUpdate', 'profilUpdate_loading_error')));
 			}
 			//? get the attachmentID
 			$dms_id = hasData($profilUpdate) ? getData($profilUpdate)[0]->attachment_id : null;
-			
+
 			//? delete old dms_file of Profil Update
 			$this->deleteOldVersionFile($dms_id);
 		}
-		
-		
-		$files = $_FILES['files'];
-        $file_count = count($files['name']);
-		
-		$res=[];
 
-        for ($i = 0; $i < $file_count; $i++) {
-            $_FILES['files']['name'] = $files['name'][$i];
-            $_FILES['files']['type'] = $files['type'][$i];
-            $_FILES['files']['tmp_name'] = $files['tmp_name'][$i];
-            $_FILES['files']['error'] = $files['error'][$i];
-            $_FILES['files']['size'] = $files['size'][$i];
-			
+
+		$files = $_FILES['files'];
+		$file_count = count($files['name']);
+
+		$res = [];
+
+		for ($i = 0; $i < $file_count; $i++) {
+			$_FILES['files']['name'] = $files['name'][$i];
+			$_FILES['files']['type'] = $files['type'][$i];
+			$_FILES['files']['tmp_name'] = $files['tmp_name'][$i];
+			$_FILES['files']['error'] = $files['error'][$i];
+			$_FILES['files']['size'] = $files['size'][$i];
+
 			$dms = [
-				"kategorie_kurzbz"=>"profil_aenderung",
-				"version"=>0, 
-				"name"=>$_FILES['files']['name'],
-				"mimetype"=>$_FILES['files']['type'],
-				"beschreibung"=>$this->uid . " Profil Änderung",
-				"insertvon"=>$this->uid,
-				"insertamum"=>"NOW()",
+				"kategorie_kurzbz" => "profil_aenderung",
+				"version" => 0,
+				"name" => $_FILES['files']['name'],
+				"mimetype" => $_FILES['files']['type'],
+				"beschreibung" => $this->uid . " Profil Änderung",
+				"insertvon" => $this->uid,
+				"insertamum" => "NOW()",
 			];
-			
-            $tmp_res=$this->dmslib->upload($dms , 'files', array("jpg", "png", "pdf"));
-			
-			$tmp_res = hasData($tmp_res)? getData($tmp_res) : null;
-			array_push($res,$tmp_res);
+
+			$tmp_res = $this->dmslib->upload($dms, 'files', array("jpg", "png", "pdf"));
+
+			$tmp_res = hasData($tmp_res) ? getData($tmp_res) : null;
+			array_push($res, $tmp_res);
 		}
 
 		echo json_encode($res);
 	}
 
 
-	private function deleteOldVersionFile($dms_id){
-		if(!isset($dms_id)){
+	private function deleteOldVersionFile($dms_id)
+	{
+		if (!isset($dms_id)) {
 			return;
 		}
 
 		//? collect all the results of the deleted versions in an array 
-		$res =	array();
-		
+		$res = array();
+
 		//? delete all the different versions of the dms_file
-		$dmsVersions = $this->DmsVersionModel->loadWhere(["dms_id"=>$dms_id]);
+		$dmsVersions = $this->DmsVersionModel->loadWhere(["dms_id" => $dms_id]);
 		$dmsVersions = hasData($dmsVersions) ? getData($dmsVersions) : null;
-		if(isset($dmsVersions)){
-			$zwischen_res = array_map(function($item){ return $item->version;},$dmsVersions);
-			foreach($zwischen_res as $version){
-				array_push($res, $this->DmsVersionModel->delete([$dms_id,$version]));
+		if (isset($dmsVersions)) {
+			$zwischen_res = array_map(function ($item) {
+				return $item->version;
+			}, $dmsVersions);
+			foreach ($zwischen_res as $version) {
+				array_push($res, $this->DmsVersionModel->delete([$dms_id, $version]));
 			}
-		}else{
-			echo json_encode(error($this->p->t('profilUpdate','profilUpdate_dmsVersion_error')));
+		} else {
+			echo json_encode(error($this->p->t('profilUpdate', 'profilUpdate_dmsVersion_error')));
 		}
-		
+
 		//? returns a result for each deleted dms_file
 		return $res;
 	}
 
 
-	public function selectProfilRequest(){
+	public function selectProfilRequest()
+	{
 		$_GET = json_decode($this->input->raw_input_stream, true);
 		$uid = $this->input->get('uid');
 		$id = $this->input->get('id');
-		$whereClause=['uid'=> $this->uid];
-		
-		if(isset($uid)) $whereClause['uid'] = $uid;
-		if(isset($id)) $whereClause['id'] = $id;
-		
-		$res= $this->ProfilUpdateModel->getProfilUpdatesWhere($whereClause);
+		$whereClause = ['uid' => $this->uid];
+
+		if (isset($uid))
+			$whereClause['uid'] = $uid;
+		if (isset($id))
+			$whereClause['id'] = $id;
+
+		$res = $this->ProfilUpdateModel->getProfilUpdatesWhere($whereClause);
 		$res = hasData($res) ? getData($res) : null;
 		echo json_encode($res);
-		
+
 	}
 
 
-	public function getProfilRequestFiles(){
+	public function getProfilRequestFiles()
+	{
 		$id = json_decode($this->input->raw_input_stream);
 
 		$this->ProfilUpdateModel->addSelect(["attachment_id"]);
 		$attachmentID = $this->ProfilUpdateModel->load([$id]);
-		if(isError($attachmentID)){
-			return json_encode(error($this->p->t('profilUpdate','profilUpdate_loading_error')));
+		if (isError($attachmentID)) {
+			return json_encode(error($this->p->t('profilUpdate', 'profilUpdate_loading_error')));
 		}
 		//? get the attachmentID
 		$dms_id = hasData($attachmentID) ? getData($attachmentID)[0]->attachment_id : null;
-		
+
 		//? get the name to the file
 		$this->DmsVersionModel->addSelect(["name", "dms_id"]);
-		$attachment = $this->DmsVersionModel->load([$dms_id,0]);
-		if(isError($attachment)){
-			return json_encode(error($this->p->t('profilUpdate','profilUpdate_dmsVersion_error')));
+		$attachment = $this->DmsVersionModel->load([$dms_id, 0]);
+		if (isError($attachment)) {
+			return json_encode(error($this->p->t('profilUpdate', 'profilUpdate_dmsVersion_error')));
 		}
 		$attachment = hasData($attachment) ? getData($attachment) : null;
 		//? returns {name:..., dms_id:...}
@@ -337,74 +376,75 @@ class ProfilUpdate extends Auth_Controller
 
 	public function insertProfilRequest()
 	{
-		
+
 		$json = json_decode($this->input->raw_input_stream);
 
 		$payload = $json->payload;
-		$identifier = property_exists($json->payload,"kontakt_id")? "kontakt_id" : (property_exists($json->payload,"adresse_id")? "adresse_id" : null);
-		
-		$data = ["topic"=>$json->topic,"uid" => $this->uid, "requested_change" => json_encode($payload), "insertamum" => "NOW()", "insertvon"=>$this->uid, "status"=>self::$STATUS_PENDING?:'Pending'  ];
-		
+		$identifier = property_exists($json->payload, "kontakt_id") ? "kontakt_id" : (property_exists($json->payload, "adresse_id") ? "adresse_id" : null);
+
+		$data = ["topic" => $json->topic, "uid" => $this->uid, "requested_change" => json_encode($payload), "insertamum" => "NOW()", "insertvon" => $this->uid, "status" => self::$STATUS_PENDING ?: 'Pending'];
+
 		//? insert fileID in the dataset if sent with post request
-		if(isset($json->fileID)){
+		if (isset($json->fileID)) {
 			$data['attachment_id'] = $json->fileID;
-			
-		} 
+
+		}
 
 		//? loops over all updateRequests from a user to validate if the new request is valid
-		$res = $this->ProfilUpdateModel->getProfilUpdatesWhere(["uid"=>$this->uid]);
-		if(isError($res)){
-			show_error($this->p->t('profilUpdate','profilUpdate_loading_error'));
+		$res = $this->ProfilUpdateModel->getProfilUpdatesWhere(["uid" => $this->uid]);
+		if (isError($res)) {
+			show_error($this->p->t('profilUpdate', 'profilUpdate_loading_error'));
 		}
-		$res = hasData($res)? getData($res):null;
-		
+		$res = hasData($res) ? getData($res) : null;
+
 		//? the user cannot delete a zustelladresse/kontakt
-		if( isset($payload->delete) && $payload->{$identifier=="kontakt_id"? "zustellung":"zustelladresse"}){
-			echo json_encode(error($this->p->t('profilUpdate','profilUpdate_deleteZustellung_error')));
+		if (isset($payload->delete) && $payload->{$identifier == "kontakt_id" ? "zustellung" : "zustelladresse"}) {
+			echo json_encode(error($this->p->t('profilUpdate', 'profilUpdate_deleteZustellung_error')));
 			return;
-		 }
-		 
+		}
+
 		//? if the user tries to delete a adresse, checks whether the adresse is a heimatadresse, if so an error is raised
-		if( isset($payload->delete) && $identifier == "adresse_id"){
+		if (isset($payload->delete) && $identifier == "adresse_id") {
 			$adr = $this->AdresseModel->load($payload->$identifier);
 			$adr = getData($adr)[0];
-			if($adr->heimatadresse){
-				echo json_encode(error($this->p->t('profilUpdate','profilUpdate_deleteZustellung_error')));
+			if ($adr->heimatadresse) {
+				echo json_encode(error($this->p->t('profilUpdate', 'profilUpdate_deleteZustellung_error')));
 				return;
 			}
 		}
 
-		if($res){
-		$pending_changes = array_filter($res, function($element) {
-			return $element->status == isset(self::$STATUS_PENDING)?:"Pending";
-		});
+		if ($res) {
+			$pending_changes = array_filter($res, function ($element) {
+				return $element->status == self::$STATUS_PENDING ?: "Pending";
+			});
 
-		foreach($pending_changes as $update_request){
-			$existing_change = $update_request->requested_change;
-			
-			 //? the user can add as many new kontakte/adressen as he likes
-			 if( !isset($payload->add) && property_exists($existing_change,$identifier) && property_exists($payload,$identifier) && $existing_change->$identifier == $payload->$identifier){
-				//? the kontakt_id / adresse_id of a change has to be unique 
-				echo json_encode(error($this->p->t('profilUpdate','profilUpdate_changeTwice_error')));
-				return;
+			foreach ($pending_changes as $update_request) {
+				$existing_change = $update_request->requested_change;
+
+				//? the user can add as many new kontakte/adressen as he likes
+				if (!isset($payload->add) && property_exists($existing_change, $identifier) && property_exists($payload, $identifier) && $existing_change->$identifier == $payload->$identifier) {
+					//? the kontakt_id / adresse_id of a change has to be unique 
+					echo json_encode(error($this->p->t('profilUpdate', 'profilUpdate_changeTwice_error')));
+					return;
+				}
+
+				//? if it is not updating any kontakt/adresse, the topic has to be unique
+				elseif (!$identifier && $update_request->topic == $json->topic) {
+					echo json_encode(error($this->p->t('profilUpdate', 'profilUpdate_changeTopicTwice_error', ['0' => $update_request->topic])));
+					return;
+				}
 			}
-			
-			//? if it is not updating any kontakt/adresse, the topic has to be unique
-			elseif(!$identifier && $update_request->topic == $json->topic ){
-				echo json_encode(error($this->p->t('profilUpdate','profilUpdate_changeTopicTwice_error',['0'=>$update_request->topic])));
-				return;
-			}
-		}}
-		
+		}
+
 		$insertID = $this->ProfilUpdateModel->insert($data);
-			
-		if(isError($insertID)){
+
+		if (isError($insertID)) {
 			show_error(getData($insertID));
-		}else{
-			$insertID = hasData($insertID)? getData($insertID): null;
-			
+		} else {
+			$insertID = hasData($insertID) ? getData($insertID) : null;
+
 			//? sends emails to the correspondents of the $uid
-			$this->sendEmail_onProfilUpdate_insertion($this->uid,$insertID,$json->topic);
+			$this->sendEmail_onProfilUpdate_insertion($this->uid, $insertID, $json->topic);
 			echo json_encode(success($insertID));
 		}
 	}
@@ -412,24 +452,25 @@ class ProfilUpdate extends Auth_Controller
 	public function updateProfilRequest()
 	{
 		$json = json_decode($this->input->raw_input_stream);
-		
+
 		$updateData = ["requested_change" => json_encode($json->payload), "updateamum" => "NOW()", "updatevon" => $this->uid];
-		if(isset($json->fileID)){
+		if (isset($json->fileID)) {
 			$updateData['attachment_id'] = json_decode($json->fileID);
 		}
-		$updateID =$this->ProfilUpdateModel->update([$json->ID],$updateData);
+		$updateID = $this->ProfilUpdateModel->update([$json->ID], $updateData);
 		//? insert fileID in the dataset if sent with post request
-		
-		if(isError($updateID)){
+
+		if (isError($updateID)) {
 			//catch error
-		}else{
-			$updateID = hasData($updateID)? getData($updateID)[0]: null;
+		} else {
+			$updateID = hasData($updateID) ? getData($updateID)[0] : null;
 			//TODO: should an email be sent to the responsable people when the user changes his profil update
 			echo json_encode(success($updateID));
 		}
 	}
 
-	public function deleteProfilRequest(){
+	public function deleteProfilRequest()
+	{
 
 		$json = json_decode($this->input->raw_input_stream);
 		$delete_res = $this->ProfilUpdateModel->delete([$json]);
@@ -437,178 +478,190 @@ class ProfilUpdate extends Auth_Controller
 	}
 
 
-	public function getProfilUpdateWithPermission($status=null){
+	public function getProfilUpdateWithPermission($status = null)
+	{
+
 
-		
 
 		// early return if no status has been passed as argument
-		if(!isset($status)){
+		if (!isset($status)) {
 			echo json_encode($this->ProfilUpdateModel->getProfilUpdateWithPermission());
 			return;
 		}
 
 		// get the sprache of the user
-		$sprachenIndex = $this->SpracheModel->loadWhere(["sprache"=>getUserLanguage()]);
-		$sprachenIndex = hasData($sprachenIndex)? getData($sprachenIndex)[0]->index : null;
+		$sprachenIndex = $this->SpracheModel->loadWhere(["sprache" => getUserLanguage()]);
+		$sprachenIndex = hasData($sprachenIndex) ? getData($sprachenIndex)[0]->index : null;
 
-		if(isset($sprachenIndex) && isset($status)){
+		if (isset($sprachenIndex) && isset($status)) {
 			// get the corresponding status kurz_bz primary key out of the translation
-			$status = $this->ProfilUpdateStatusModel->execReadOnlyQuery("select * from public.tbl_profil_update_status where ? = ANY(bezeichnung_mehrsprachig)",[$status]);
+			$status = $this->ProfilUpdateStatusModel->execReadOnlyQuery("select * from public.tbl_profil_update_status where ? = ANY(bezeichnung_mehrsprachig)", [$status]);
 			$status = hasData($status) ? getData($status)[0]->status_kurzbz : null;
-			$res = $this->ProfilUpdateModel->getProfilUpdateWithPermission(isset($status)?['status'=>$status]:null);
-		
+			$res = $this->ProfilUpdateModel->getProfilUpdateWithPermission(isset($status) ? ['status' => $status] : null);
+
 			echo json_encode($res);
 		}
 	}
 
 
-	
-	private function getOE_from_student($student_uid){
+
+	private function getOE_from_student($student_uid)
+	{
 
 		//? returns the oe_einheit eines Studenten 
-		$query ="SELECT public.tbl_studiengang.oe_kurzbz
+		$query = "SELECT public.tbl_studiengang.oe_kurzbz
 		FROM public.tbl_student
 		JOIN public.tbl_studiengang ON tbl_student.studiengang_kz = public.tbl_studiengang.studiengang_kz
 		WHERE public.tbl_student.student_uid = ?;";
-		
-		$res = $this->StudentModel->execReadOnlyQuery($query,[$student_uid]);
-		if(!isSuccess($res)){
-			show_error($this->p->t('profilUpdate','profilUpdate_loadingOE_error'));
+
+		$res = $this->StudentModel->execReadOnlyQuery($query, [$student_uid]);
+		if (!isSuccess($res)) {
+			show_error($this->p->t('profilUpdate', 'profilUpdate_loadingOE_error'));
 		}
 		$res = hasData($res) ? getData($res) : [];
 		$res = array_map(
-			function($item){
-			return $item->oe_kurzbz;
-			},$res
+			function ($item) {
+				return $item->oe_kurzbz;
+			},
+			$res
 		);
 		return $res;
 	}
 
 
-	public function acceptProfilRequest(){
-		
+	public function acceptProfilRequest()
+	{
 
-		$_POST = json_decode($this->input->raw_input_stream,true);
-		$id = $this->input->post('profil_update_id',true);
-		$uid = $this->input->post('uid',true);	
+
+		$_POST = json_decode($this->input->raw_input_stream, true);
+		$id = $this->input->post('profil_update_id', true);
+		$uid = $this->input->post('uid', true);
 
 		//? fetching person_id using UID
 		$personID = $this->PersonModel->getByUid($uid);
-		$personID = hasData($personID)? getData($personID)[0]->person_id : null;
-		$status_message = $this->input->post('status_message',true);
-		$topic = $this->input->post('topic',true);
+		$personID = hasData($personID) ? getData($personID)[0]->person_id : null;
+		$status_message = $this->input->post('status_message', true);
+		$topic = $this->input->post('topic', true);
 
 		//! somehow the xss check converted boolean false to empty string
 		$requested_change = $this->input->post('requested_change');
-		
+
 		//! check for required information
-		if(!isset($id) || !isset($uid) || !isset($personID) || !isset($requested_change) || !isset($topic)){
-			return json_encode(error($this->p->t('profilUpdate','profilUpdate_requiredInformation_error')));
+		if (!isset($id) || !isset($uid) || !isset($personID) || !isset($requested_change) || !isset($topic)) {
+			return json_encode(error($this->p->t('profilUpdate', 'profilUpdate_requiredInformation_error')));
 		}
 
 		$is_mitarbeiter_profil_update = getData($this->MitarbeiterModel->isMitarbeiter($uid));
 		$is_student_profil_update = getData($this->StudentModel->isStudent($uid));
 
-		
+
 		//? check if the permissions are set correctly
-		if(
-			$this->permissionlib->isBerechtigt('student/stammdaten',"suid",$this->getOE_from_student($uid)) && $is_student_profil_update || 
-			$this->permissionlib->isBerechtigt('mitarbeiter/stammdaten',"suid") && $is_mitarbeiter_profil_update 
-		)
-		{
-		
-		if(is_array($requested_change) && array_key_exists("adresse_id",$requested_change)){
-			$insertID = $this->handleAdresse($requested_change, $personID);
-			$insertID = hasData($insertID) ? getData($insertID) : null;
-			if(isset($insertID)) {
-				$requested_change['adresse_id'] = $insertID;
-				$update_res = $this->updateRequestedChange($id,$requested_change);
-				if(isError($update_res)){
-					echo json_encode(error($this->p->t('profilUpdate','profilUpdate_address_error',[$insertID, $id])  ));
+		if (
+			$this->permissionlib->isBerechtigt('student/stammdaten', "suid", $this->getOE_from_student($uid)) && $is_student_profil_update ||
+			$this->permissionlib->isBerechtigt('mitarbeiter/stammdaten', "suid") && $is_mitarbeiter_profil_update
+		) {
+
+			if (is_array($requested_change) && array_key_exists("adresse_id", $requested_change)) {
+				$insertID = $this->handleAdresse($requested_change, $personID);
+				$insertID = hasData($insertID) ? getData($insertID) : null;
+				if (isset($insertID)) {
+					$requested_change['adresse_id'] = $insertID;
+					$update_res = $this->updateRequestedChange($id, $requested_change);
+					if (isError($update_res)) {
+						echo json_encode(error($this->p->t('profilUpdate', 'profilUpdate_address_error', [$insertID, $id])));
+						return;
+					}
+				}
+
+			} else if (is_array($requested_change) && array_key_exists("kontakt_id", $requested_change)) {
+				$insertID = $this->handleKontakt($requested_change, $personID);
+				$insertID = hasData($insertID) ? getData($insertID) : null;
+				if (isset($insertID)) {
+					$requested_change['kontakt_id'] = $insertID;
+					$update_res = $this->updateRequestedChange($id, $requested_change);
+					if (isError($update_res)) {
+						echo json_encode(error("was not able to add kontakt_id " . $insertID . " to profilRequest " . $id));
+						return;
+					}
+				}
+
+
+			} else {
+				switch ($topic) {
+					// mapping phrasen to database columns to make the update with the correct column names
+					case $this->p->t('profilUpdate', 'title'):
+						$topic = "titelpre";
+						break;
+					case $this->p->t('profilUpdate', 'postnomen'):
+						$topic = "titelpost";
+						break;
+					case $this->p->t('profilUpdate', 'vorname'):
+						$topic = "vorname";
+						break;
+				}
+
+				$result = $this->PersonModel->update($personID, [$topic => $requested_change["value"]]);
+				if (isError($result)) {
+					echo json_encode(error($this->p->t('profilUpdate', 'profilUpdate_insert_error')));
 					return;
 				}
 			}
-		
-		}else if (is_array($requested_change) && array_key_exists("kontakt_id", $requested_change)){
-			$insertID = $this->handleKontakt($requested_change, $personID);
-			$insertID = hasData($insertID) ? getData($insertID) : null;
-			if(isset($insertID)) {
-				$requested_change['kontakt_id'] = $insertID;
-				$update_res = $this->updateRequestedChange($id,$requested_change);
-				if(isError($update_res)){
-					 echo json_encode(error("was not able to add kontakt_id " . $insertID . " to profilRequest " . $id ));
-					 return;
-				}
-			}
-			
-			
-		}else{
-			switch($topic){
-				// mapping phrasen to database columns to make the update with the correct column names
-				case $this->p->t('profilUpdate','title'): $topic ="titelpre"; break;
-				case $this->p->t('profilUpdate','postnomen'): $topic = "titelpost"; break;
-				case $this->p->t('profilUpdate','vorname'): $topic = "vorname"; break;
-			}
-			
-			$result = $this->PersonModel->update($personID,[$topic=>$requested_change["value"]]);
-			if(isError($result)){
-				echo json_encode(error($this->p->t('profilUpdate','profilUpdate_insert_error')));
-				return;
-			}
+			$this->sendEmail_onProfilUpdate_response($uid, $topic, self::$STATUS_ACCEPTED);
+
+			echo json_encode($this->setStatusOnUpdateRequest($id, self::$STATUS_ACCEPTED, $status_message, $requested_change));
+		} else {
+			show_error($this->p->t('profilUpdate', 'profilUpdate_permission_error'));
 		}
-		$this->sendEmail_onProfilUpdate_response($uid,$topic,$this->p->t('profilUpdate','accepted'));
-		
-		echo json_encode($this->setStatusOnUpdateRequest($id, $this->p->t('profilUpdate','accepted'), $status_message, $requested_change));
-	}else{
-		show_error($this->p->t('profilUpdate','profilUpdate_permission_error'));
-	}
-		
-		
+
+
 	}
 
-	public function denyProfilRequest(){
-		
-		$_POST = json_decode($this->input->raw_input_stream,true);
-		$id = $this->input->post('profil_update_id',true);
-		$uid = $this->input->post('uid',true);
-		$topic = $this->input->post('topic',true);
-		$status_message = $this->input->post('status_message',true);
+	public function denyProfilRequest()
+	{
+
+		$_POST = json_decode($this->input->raw_input_stream, true);
+		$id = $this->input->post('profil_update_id', true);
+		$uid = $this->input->post('uid', true);
+		$topic = $this->input->post('topic', true);
+		$status_message = $this->input->post('status_message', true);
 
 		$is_mitarbeiter_profil_update = getData($this->MitarbeiterModel->isMitarbeiter($uid));
 		$is_student_profil_update = getData($this->StudentModel->isStudent($uid));
 
 
-		if(
-			$this->permissionlib->isBerechtigt('student/stammdaten',"suid",$this->getOE_from_student($uid)) && $is_student_profil_update || 
-			$this->permissionlib->isBerechtigt('mitarbeiter/stammdaten',"suid") && $is_mitarbeiter_profil_update 
-		)
-		{
-			$this->sendEmail_onProfilUpdate_response($uid,$topic,$this->p->t('profilUpdate','rejected'));
-			echo json_encode($this->setStatusOnUpdateRequest($id, $this->p->t('profilUpdate','rejected'), $status_message));
-		}else{
-			show_error($this->p->t('profilUpdate','profilUpdate_permission_error'));
+		if (
+			$this->permissionlib->isBerechtigt('student/stammdaten', "suid", $this->getOE_from_student($uid)) && $is_student_profil_update ||
+			$this->permissionlib->isBerechtigt('mitarbeiter/stammdaten', "suid") && $is_mitarbeiter_profil_update
+		) {
+			$this->sendEmail_onProfilUpdate_response($uid, $topic, self::$STATUS_REJECTED);
+			echo json_encode($this->setStatusOnUpdateRequest($id, self::$STATUS_REJECTED, $status_message));
+		} else {
+			show_error($this->p->t('profilUpdate', 'profilUpdate_permission_error'));
 		}
-		
-		
+
+
 	}
 
-	private function updateRequestedChange($id, $requested_change){
-		return $this->ProfilUpdateModel->update([$id], ['requested_change'=>json_encode($requested_change)]);
+	private function updateRequestedChange($id, $requested_change)
+	{
+		return $this->ProfilUpdateModel->update([$id], ['requested_change' => json_encode($requested_change)]);
 	}
 
-	private function setStatusOnUpdateRequest($id, $status, $status_message ){ 
-		return $this->ProfilUpdateModel->update([$id], ["status"=>$status,"status_timestamp"=>"NOW()","status_message"=>$status_message]);
+	private function setStatusOnUpdateRequest($id, $status, $status_message)
+	{
+		return $this->ProfilUpdateModel->update([$id], ["status" => $status, "status_timestamp" => "NOW()", "status_message" => $status_message]);
 	}
 
 
-	private function handleKontakt($requested_change, $personID){
+	private function handleKontakt($requested_change, $personID)
+	{
 		$kontakt_id = $requested_change["kontakt_id"];
 		//? removes the kontakt_id because we don't want to update the kontakt_id in the database
 		unset($requested_change["kontakt_id"]);
-		
+
 
 		//! ADD
-		if(array_key_exists('add',$requested_change) && $requested_change['add']){
+		if (array_key_exists('add', $requested_change) && $requested_change['add']) {
 			//? removes add flag
 			unset($requested_change['add']);
 			$requested_change['person_id'] = $personID;
@@ -616,137 +669,140 @@ class ProfilUpdate extends Auth_Controller
 			$requested_change['insertvon'] = getAuthUID();
 			$insertID = $this->KontaktModel->insert($requested_change);
 			$insert_kontakt_id = $insertID;
-			if(isError($insert_kontakt_id)){
-				show_error($this->p->t('profilUpdate','profilUpdate_insertKontakt_error'));
+			if (isError($insert_kontakt_id)) {
+				show_error($this->p->t('profilUpdate', 'profilUpdate_insertKontakt_error'));
 			}
-			$insert_kontakt_id = hasData($insert_kontakt_id)? getData($insert_kontakt_id):null;
-			if($insert_kontakt_id){
-				$this->handleDupplicateZustellKontakte($requested_change['zustellung'],$insert_kontakt_id);
+			$insert_kontakt_id = hasData($insert_kontakt_id) ? getData($insert_kontakt_id) : null;
+			if ($insert_kontakt_id) {
+				$this->handleDupplicateZustellKontakte($requested_change['zustellung'], $insert_kontakt_id);
 			}
-			
-			
+
+
 		}
 		//! DELETE
-		elseif(array_key_exists('delete',$requested_change) && $requested_change['delete']){
+		elseif (array_key_exists('delete', $requested_change) && $requested_change['delete']) {
 			$this->KontaktModel->delete($kontakt_id);
 		}
 		//! UPDATE
-		else{
-			$requested_change['updateamum']="NOW()";
-			$requested_change['updatevon']=getAuthUID();
-			
-			$update_kontakt_id = $this->KontaktModel->update($kontakt_id,$requested_change);
+		else {
+			$requested_change['updateamum'] = "NOW()";
+			$requested_change['updatevon'] = getAuthUID();
 
-			if(isError($update_kontakt_id)){
-				show_error($this->p->t('profilUpdate','profilUpdate_updateKontakt_error'));
+			$update_kontakt_id = $this->KontaktModel->update($kontakt_id, $requested_change);
+
+			if (isError($update_kontakt_id)) {
+				show_error($this->p->t('profilUpdate', 'profilUpdate_updateKontakt_error'));
 			}
 			$update_kontakt_id = hasData($update_kontakt_id) ? getData($update_kontakt_id) : null;
-			if($update_kontakt_id){
-				$this->handleDupplicateZustellKontakte($requested_change['zustellung'],$update_kontakt_id);
+			if ($update_kontakt_id) {
+				$this->handleDupplicateZustellKontakte($requested_change['zustellung'], $update_kontakt_id);
 			}
 		}
 		return isset($insertID) ? $insertID : null;
 	}
 
-	private function handleAdresse($requested_change, $personID){
+	private function handleAdresse($requested_change, $personID)
+	{
 
 		$this->AdressenTypModel->addSelect(["adressentyp_kurzbz"]);
-		$adr_kurzbz = $this->AdressenTypModel->loadWhere(["bezeichnung"=>$requested_change['typ']]);
-		$adr_kurzbz = hasData($adr_kurzbz)? getData($adr_kurzbz)[0]->adressentyp_kurzbz : null;
+		$adr_kurzbz = $this->AdressenTypModel->loadWhere(["bezeichnung" => $requested_change['typ']]);
+		$adr_kurzbz = hasData($adr_kurzbz) ? getData($adr_kurzbz)[0]->adressentyp_kurzbz : null;
 		//? replace the address_typ with its correct kurzbz foreign key
-		$requested_change['typ']= $adr_kurzbz;
-		
+		$requested_change['typ'] = $adr_kurzbz;
+
 		$adresse_id = $requested_change["adresse_id"];
 		//? removes the adresse_id because we don't want to update the kontakt_id in the database
 		unset($requested_change["adresse_id"]);
 
-		
+
 		//! ADD
-		if(array_key_exists('add',$requested_change) && $requested_change['add']){
-			
+		if (array_key_exists('add', $requested_change) && $requested_change['add']) {
+
 			//? removes add flag
 			unset($requested_change['add']);
-			$requested_change['insertamum']="NOW()";
-			$requested_change['insertvon']=getAuthUID();
+			$requested_change['insertamum'] = "NOW()";
+			$requested_change['insertvon'] = getAuthUID();
 			$requested_change['person_id'] = $personID;
 			//TODO: zustelladresse, heimatadresse, rechnungsadresse und nation werden nicht beachtet
 			$insertID = $this->AdresseModel->insert($requested_change);
 			$insert_adresse_id = $insertID;
-			if(isError($insert_adresse_id)){
-				show_error($this->p->t('profilUpdate','profilUpdate_insertAdresse_error'));
+			if (isError($insert_adresse_id)) {
+				show_error($this->p->t('profilUpdate', 'profilUpdate_insertAdresse_error'));
 			}
 			$insert_adresse_id = hasData($insert_adresse_id) ? getData($insert_adresse_id) : null;
-			if($insert_adresse_id){
-				$this->handleDupplicateZustellAdressen($requested_change['zustelladresse'],$insert_adresse_id);
+			if ($insert_adresse_id) {
+				$this->handleDupplicateZustellAdressen($requested_change['zustelladresse'], $insert_adresse_id);
 			}
-		
+
 		}
 		//! DELETE
-		elseif(array_key_exists('delete',$requested_change) && $requested_change['delete']){
+		elseif (array_key_exists('delete', $requested_change) && $requested_change['delete']) {
 			$this->AdresseModel->delete($adresse_id);
 		}
 		//! UPDATE
-		else{
-			$requested_change['updateamum']	= "NOW()";
+		else {
+			$requested_change['updateamum'] = "NOW()";
 			$requested_change['updatevon'] = getAuthUID();
-			$update_adresse_id = $this->AdresseModel->update($adresse_id,$requested_change);
-			if(isError($update_adresse_id)){
-				show_error($this->p->t('profilUpdate','profilUpdate_updateAdresse_error'));
+			$update_adresse_id = $this->AdresseModel->update($adresse_id, $requested_change);
+			if (isError($update_adresse_id)) {
+				show_error($this->p->t('profilUpdate', 'profilUpdate_updateAdresse_error'));
 			}
 			$update_adresse_id = hasData($update_adresse_id) ? getData($update_adresse_id) : null;
-			if($update_adresse_id){
-				$this->handleDupplicateZustellAdressen($requested_change['zustelladresse'],$update_adresse_id);
+			if ($update_adresse_id) {
+				$this->handleDupplicateZustellAdressen($requested_change['zustelladresse'], $update_adresse_id);
 			}
 		}
-		return isset($insertID)? $insertID : null;
+		return isset($insertID) ? $insertID : null;
 	}
 
 
-	private function handleDupplicateZustellKontakte($zustellung, $kontakt_id){
-		if($zustellung){
+	private function handleDupplicateZustellKontakte($zustellung, $kontakt_id)
+	{
+		if ($zustellung) {
 			$this->PersonModel->addSelect("public.tbl_kontakt.kontakt_id");
-			$this->PersonModel->addJoin("public.tbl_kontakt","public.tbl_kontakt.person_id = public.tbl_person.person_id");
-			$zustellKontakteArray = $this->PersonModel->loadWhere(["public.tbl_person.person_id"=>$this->pid, "zustellung"=>TRUE]);
-			if(!isSuccess($zustellKontakteArray)){
-				return error($this->p->t('profilUpdate','profilUpdate_loadingZustellkontakte_error'));
+			$this->PersonModel->addJoin("public.tbl_kontakt", "public.tbl_kontakt.person_id = public.tbl_person.person_id");
+			$zustellKontakteArray = $this->PersonModel->loadWhere(["public.tbl_person.person_id" => $this->pid, "zustellung" => TRUE]);
+			if (!isSuccess($zustellKontakteArray)) {
+				return error($this->p->t('profilUpdate', 'profilUpdate_loadingZustellkontakte_error'));
 			}
 			$zustellKontakteArray = hasData($zustellKontakteArray) ? getData($zustellKontakteArray) : null;
 
-			if($zustellung && count($zustellKontakteArray)>0){
-				$zustellKontakteArray = array_filter($zustellKontakteArray, function($kontakt) use ($kontakt_id){
+			if ($zustellung && count($zustellKontakteArray) > 0) {
+				$zustellKontakteArray = array_filter($zustellKontakteArray, function ($kontakt) use ($kontakt_id) {
 					return $kontakt->kontakt_id != $kontakt_id;
 				});
-				foreach($zustellKontakteArray as $kontakt){
-					$this->KontaktModel->update($kontakt->kontakt_id,["zustellung"=>FALSE]);
+				foreach ($zustellKontakteArray as $kontakt) {
+					$this->KontaktModel->update($kontakt->kontakt_id, ["zustellung" => FALSE]);
 				}
-				
+
 			}
 		}
 	}
 
-	private function handleDupplicateZustellAdressen($zustellung, $adresse_id){
-		if($zustellung){
+	private function handleDupplicateZustellAdressen($zustellung, $adresse_id)
+	{
+		if ($zustellung) {
 			$this->PersonModel->addSelect("public.tbl_adresse.adresse_id");
-			$this->PersonModel->addJoin("public.tbl_adresse","public.tbl_adresse.person_id = public.tbl_person.person_id");
-			$zustellAdressenArray = $this->PersonModel->loadWhere(["public.tbl_person.person_id"=>$this->pid, "zustelladresse"=>TRUE]);
-			if(!isSuccess($zustellAdressenArray)){
-				return error($this->p->t('profilUpdate','profilUpdate_loadingZustellAdressen_error'));
+			$this->PersonModel->addJoin("public.tbl_adresse", "public.tbl_adresse.person_id = public.tbl_person.person_id");
+			$zustellAdressenArray = $this->PersonModel->loadWhere(["public.tbl_person.person_id" => $this->pid, "zustelladresse" => TRUE]);
+			if (!isSuccess($zustellAdressenArray)) {
+				return error($this->p->t('profilUpdate', 'profilUpdate_loadingZustellAdressen_error'));
 			}
 			$zustellAdressenArray = hasData($zustellAdressenArray) ? getData($zustellAdressenArray) : null;
 
-			if($zustellung && count($zustellAdressenArray)>0){
-				
-				$zustellAdressenArray = array_filter($zustellAdressenArray, function($adresse) use ($adresse_id){
-				
+			if ($zustellung && count($zustellAdressenArray) > 0) {
+
+				$zustellAdressenArray = array_filter($zustellAdressenArray, function ($adresse) use ($adresse_id) {
+
 					return $adresse->adresse_id != $adresse_id;
 				});
-				foreach($zustellAdressenArray as $adresse){
-					$this->AdresseModel->update($adresse->adresse_id,["zustelladresse"=>FALSE]);
+				foreach ($zustellAdressenArray as $adresse) {
+					$this->AdresseModel->update($adresse->adresse_id, ["zustelladresse" => FALSE]);
 				}
-				
+
 			}
 		}
 	}
 
-	
+
 }
\ No newline at end of file
diff --git a/public/js/apps/Cis/Profil.js b/public/js/apps/Cis/Profil.js
index a5bf7141d..bf2a9c637 100755
--- a/public/js/apps/Cis/Profil.js
+++ b/public/js/apps/Cis/Profil.js
@@ -47,6 +47,8 @@ const profilApp = Vue.createApp({
     return {
       //? loading property is used for showing/hiding the loading modal
       loading: false,
+      profilUpdateStates: null,
+      profilUpdateTopic: null,
       view: null,
       data: null,
       // notfound is null by default, but contains an UID if no user exists with that UID
@@ -57,6 +59,8 @@ const profilApp = Vue.createApp({
   //? use function syntax for provide so that we can access `this`
   provide() {
     return {
+      profilUpdateStates: Vue.computed(() => this.profilUpdateStates),
+      profilUpdateTopic: Vue.computed(() => this.profilUpdateTopic),
       setLoading: (newValue) => {
         this.loading = newValue;
       },
@@ -236,11 +240,13 @@ const profilApp = Vue.createApp({
         view: null,
         data: {
           Personen_Informationen: {
-            title: this.$p.t('profil','personenInformationen'),
+            title: this.$p.t("profil", "personenInformationen"),
+            topic: "Personen_informationen",
             view: null,
             data: {
               vorname: {
-                title: this.$p.t('person','vorname'),
+                title: this.$p.t("person", "vorname"),
+                topic: this.profilUpdateTopic?.["Vorname"],
                 view: "TextInputDokument",
                 withFiles: true,
                 data: {
@@ -249,7 +255,8 @@ const profilApp = Vue.createApp({
                 },
               },
               nachname: {
-                title: this.$p.t('person','nachname'),
+                title: this.$p.t("person", "nachname"),
+                topic: this.profilUpdateTopic?.["Nachname"],
                 view: "TextInputDokument",
                 withFiles: true,
                 data: {
@@ -258,7 +265,8 @@ const profilApp = Vue.createApp({
                 },
               },
               titel: {
-                title: this.$p.t('global','titel'),
+                title: this.$p.t("global", "titel"),
+                topic: this.profilUpdateTopic?.["Titel"],
                 view: "TextInputDokument",
                 withFiles: true,
                 data: {
@@ -267,7 +275,8 @@ const profilApp = Vue.createApp({
                 },
               },
               postnomen: {
-                title: this.$p.t('profil','postnomen'),
+                title: this.$p.t("profil", "postnomen"),
+                topic: this.profilUpdateTopic?.["Postnomen"],
                 view: "TextInputDokument",
                 withFiles: true,
                 data: {
@@ -278,12 +287,14 @@ const profilApp = Vue.createApp({
             },
           },
           Private_Kontakte: {
-            title: this.$p.t('profil','privateKontakte'),
+            title: this.$p.t("profil", "privateKontakte"),
+            topic: this.profilUpdateTopic?.["Private Kontakte"],
             data: this.data.kontakte
               ?.filter((item) => {
+                // excludes all contacts that are already used in pending profil update requests
                 return !this.data.profilUpdates?.some(
                   (update) =>
-                    update.status === "pending" &&
+                    update.status === this.profilUpdateStates["Pending"] &&
                     update.requested_change?.kontakt_id === item.kontakt_id
                 );
               })
@@ -296,7 +307,8 @@ const profilApp = Vue.createApp({
               }),
           },
           Private_Adressen: {
-            title: this.$p.t('profil','privateAdressen'),
+            title: this.$p.t("profil", "privateAdressen"),
+            topic: this.profilUpdateTopic?.["Private Adressen"],
             data: this.data.adressen
               ?.filter((item) => {
                 return !this.data.profilUpdates?.some((update) => {
@@ -337,6 +349,24 @@ const profilApp = Vue.createApp({
   },
 
   created() {
+    // fetch profilUpdateStates to provide them to children components
+    Vue.$fhcapi.ProfilUpdate.getStatus()
+      .then((response) => {
+        this.profilUpdateStates = response.data;
+      })
+      .catch((error) => {
+        console.error(error);
+      });
+
+    Vue.$fhcapi.ProfilUpdate.getTopic()
+      .then((response) => {
+        console.log("t", response.data);
+        this.profilUpdateTopic = response.data;
+      })
+      .catch((error) => {
+        console.error(error);
+      });
+
     //? uid contains the last part of the uri
     let uid = location.pathname.split("/").pop();
 
@@ -349,7 +379,7 @@ const profilApp = Vue.createApp({
       }
     });
   },
-  
+
   template: `
 	<div>
 	
diff --git a/public/js/apps/api/profilUpdate.js b/public/js/apps/api/profilUpdate.js
index e432b16cb..9a63dc4d6 100755
--- a/public/js/apps/api/profilUpdate.js
+++ b/public/js/apps/api/profilUpdate.js
@@ -1,97 +1,120 @@
 export default {
+  //! API calls for profil update requests
 
-    //! API calls for profil update requests
+  getStatus: function () {
+    const url =
+      FHC_JS_DATA_STORAGE_OBJECT.app_root +
+      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+      "/Cis/ProfilUpdate/getStatus";
+    return axios.get(url);
+  },
 
-    getProfilUpdateRequest: function(){
-        const url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/Cis/ProfilUpdate/getAllRequests';
-        return axios.get(url);
-    },
+  getTopic: function () {
+    const url =
+      FHC_JS_DATA_STORAGE_OBJECT.app_root +
+      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+      "/Cis/ProfilUpdate/getTopic";
+    return axios.get(url);
+  },
 
-    acceptProfilRequest: function(payload){
-        const url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/Cis/ProfilUpdate/acceptProfilRequest';
-        return axios.post(url,payload);
-    },
+  getProfilUpdateRequest: function () {
+    const url =
+      FHC_JS_DATA_STORAGE_OBJECT.app_root +
+      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+      "/Cis/ProfilUpdate/getAllRequests";
+    return axios.get(url);
+  },
 
-    denyProfilRequest: function(payload){
-        const url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/Cis/ProfilUpdate/denyProfilRequest';
-        return axios.post(url,payload);
-    },
+  acceptProfilRequest: function (payload) {
+    const url =
+      FHC_JS_DATA_STORAGE_OBJECT.app_root +
+      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+      "/Cis/ProfilUpdate/acceptProfilRequest";
+    return axios.post(url, payload);
+  },
 
-    replaceProfilUpdateAttachment: function (dms) {
-        const url =
-          FHC_JS_DATA_STORAGE_OBJECT.app_root +
-          FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-          `/Cis/ProfilUpdate/replaceProfilUpdateAttachment`;
-    
-          return axios.post(url, dms, {
-            headers: { "Content-Type": "multipart/form-data" },
-          });
-      },
+  denyProfilRequest: function (payload) {
+    const url =
+      FHC_JS_DATA_STORAGE_OBJECT.app_root +
+      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+      "/Cis/ProfilUpdate/denyProfilRequest";
+    return axios.post(url, payload);
+  },
 
+  replaceProfilUpdateAttachment: function (dms) {
+    const url =
+      FHC_JS_DATA_STORAGE_OBJECT.app_root +
+      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+      `/Cis/ProfilUpdate/replaceProfilUpdateAttachment`;
 
-      //? new reuquests
-      insertFile: function (dms,replace=null) {
-        const url =
-          FHC_JS_DATA_STORAGE_OBJECT.app_root +
-          FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-          `/Cis/ProfilUpdate/insertFile/${replace}`;
-    
-        return axios.post(url, dms, {
-          headers: { "Content-Type": "multipart/form-data" },
-        });
-      },   
-   
-    
-      getProfilRequestFiles: function (requestID) {
-        const url =
-          FHC_JS_DATA_STORAGE_OBJECT.app_root +
-          FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-          `/Cis/ProfilUpdate/getProfilRequestFiles`;
-    
-        return axios.post(url, requestID);
-      },
-    
-      selectProfilRequest: function (uid = null, id = null) {
-        const url =
-          FHC_JS_DATA_STORAGE_OBJECT.app_root +
-          FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-          `/Cis/ProfilUpdate/selectProfilRequest`;
-    
-        return axios.get(url, { uid: uid, id: id });
-      },
-    
-      
-    
-    
-      insertProfilRequest: function (topic, payload, fileID=null) {
-        const url =
-          FHC_JS_DATA_STORAGE_OBJECT.app_root +
-          FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-          `/Cis/ProfilUpdate/insertProfilRequest`;
-    
-        return axios.post(url, { topic, payload, ...(fileID?{fileID:fileID}:{}) });
-      },
-    
-      updateProfilRequest: function (topic, payload, ID, fileID=null) {
-        const url =
-          FHC_JS_DATA_STORAGE_OBJECT.app_root +
-          FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-          `/Cis/ProfilUpdate/updateProfilRequest`;
-    
-        return axios.post(url, { topic, payload, ID, ...(fileID?{fileID:fileID}:{}) });
-      },
-    
-      deleteProfilRequest: function (requestID) {
-        const url =
-          FHC_JS_DATA_STORAGE_OBJECT.app_root +
-          FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-          `/Cis/ProfilUpdate/deleteProfilRequest`;
-    
-        return axios.post(url, requestID);
-      },
+    return axios.post(url, dms, {
+      headers: { "Content-Type": "multipart/form-data" },
+    });
+  },
 
-  
-    
-    
+  //? new reuquests
+  insertFile: function (dms, replace = null) {
+    const url =
+      FHC_JS_DATA_STORAGE_OBJECT.app_root +
+      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+      `/Cis/ProfilUpdate/insertFile/${replace}`;
 
-}
\ No newline at end of file
+    return axios.post(url, dms, {
+      headers: { "Content-Type": "multipart/form-data" },
+    });
+  },
+
+  getProfilRequestFiles: function (requestID) {
+    const url =
+      FHC_JS_DATA_STORAGE_OBJECT.app_root +
+      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+      `/Cis/ProfilUpdate/getProfilRequestFiles`;
+
+    return axios.post(url, requestID);
+  },
+
+  selectProfilRequest: function (uid = null, id = null) {
+    const url =
+      FHC_JS_DATA_STORAGE_OBJECT.app_root +
+      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+      `/Cis/ProfilUpdate/selectProfilRequest`;
+
+    return axios.get(url, { uid: uid, id: id });
+  },
+
+  insertProfilRequest: function (topic, payload, fileID = null) {
+    const url =
+      FHC_JS_DATA_STORAGE_OBJECT.app_root +
+      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+      `/Cis/ProfilUpdate/insertProfilRequest`;
+
+    return axios.post(url, {
+      topic,
+      payload,
+      ...(fileID ? { fileID: fileID } : {}),
+    });
+  },
+
+  updateProfilRequest: function (topic, payload, ID, fileID = null) {
+    const url =
+      FHC_JS_DATA_STORAGE_OBJECT.app_root +
+      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+      `/Cis/ProfilUpdate/updateProfilRequest`;
+
+    return axios.post(url, {
+      topic,
+      payload,
+      ID,
+      ...(fileID ? { fileID: fileID } : {}),
+    });
+  },
+
+  deleteProfilRequest: function (requestID) {
+    const url =
+      FHC_JS_DATA_STORAGE_OBJECT.app_root +
+      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+      `/Cis/ProfilUpdate/deleteProfilRequest`;
+
+    return axios.post(url, requestID);
+  },
+};
diff --git a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
index 63ad2d8fe..491a81274 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
@@ -8,7 +8,12 @@ export default {
     },
   },
 
-  inject: ["getZustellkontakteCount", "getZustelladressenCount"],
+  inject: [
+    "getZustellkontakteCount",
+    "getZustelladressenCount",
+    "profilUpdateStates",
+    "profilUpdateTopic",
+  ],
 
   emits: ["fetchUpdates"],
 
@@ -16,7 +21,7 @@ export default {
     return {
       showUpdateModal: false,
       content: null,
-      editProfilTitle: this.$p.t('profil','profilBearbeiten'),
+      editProfilTitle: this.$p.t("profil", "profilBearbeiten"),
     };
   },
 
@@ -81,7 +86,7 @@ export default {
       }
 
       //? adds the status information if the profil update request was rejected or accepted
-      if (updateRequest.status !== this.$p.t('profilUpdate','pending')) {
+      if (updateRequest.status !== this.profilUpdateStates.Pending) {
         content["status"] = updateRequest.status;
         content["status_message"] = updateRequest.status_message;
         content["status_timestamp"] = updateRequest.status_timestamp;
@@ -114,32 +119,25 @@ export default {
       );
     },
     getView: function (topic, status) {
-      if (!(status === this.$p.t('profilUpdate','pending'))) {
+      if (!(status === this.profilUpdateStates.Pending)) {
         return "Status";
       }
 
       switch (topic) {
-        case "Private Kontakte":
+        case this.profilUpdateTopic["Private Kontakte"]:
           return "EditKontakt";
-          break;
-        case "Add Kontakte":
+        case this.profilUpdateTopic["Add Kontakt"]:
           return "EditKontakt";
-          break;
-        case "Delete Kontakte":
+        case this.profilUpdateTopic["Delete Kontakt"]:
           return "Kontakt";
-          break;
-        case "Private Adressen":
+        case this.profilUpdateTopic["Private Adressen"]:
           return "EditAdresse";
-          break;
-        case "Add Adressen":
+        case this.profilUpdateTopic["Add Adresse"]:
           return "EditAdresse";
-          break;
-        case "Delete Adressen":
+        case this.profilUpdateTopic["Delete Adresse"]:
           return "Adresse";
-          break;
         default:
           return "TextInputDokument";
-          break;
       }
     },
 
@@ -194,7 +192,7 @@ export default {
       }
 
       //? adds the status information if the profil update request was rejected or accepted
-      if (updateRequest.status !== this.$p.t('profilUpdate','pending')) {
+      if (updateRequest.status !== this.profilUpdateStates["Pending"]) {
         content["status"] = updateRequest.status;
         content["status_message"] = updateRequest.status_message;
         content["status_timestamp"] = updateRequest.status_timestamp;
@@ -223,8 +221,8 @@ export default {
   created() {},
 
   computed: {},
-  
-  template: /*html*/`
+
+  template: /*html*/ `
     <div  class="card " >
     
     <edit-profil v-if="showUpdateModal" ref="updateEditModal" @hideBsModal="hideEditProfilModal" :value="content" :title="editProfilTitle"></edit-profil>
@@ -243,12 +241,12 @@ export default {
                 </tr>
             </thead>
             <tbody>
-                <tr v-for="item in data" :style="item.status==$p.t('profilUpdate','accepted')?'background-color:lightgreen':item.status===$p.t('profilUpdate','rejected')?'background-color:lightcoral':''">
+                <tr v-for="item in data" :style="item.status==profilUpdateStates['Accepted']?'background-color:lightgreen':item.status===profilUpdateStates['Rejected']?'background-color:lightcoral':''">
                 <td class="align-middle text-wrap ">{{item.topic}}</td>
                 <td class="align-middle " >{{item.status}}</td>
                 <td class="align-middle">{{item.status_timestamp?item.status_timestamp:item.insertamum}}</td>
                 
-                <template v-if="item.status === $p.t('profilUpdate','pending')">
+                <template v-if="item.status === profilUpdateStates['Pending']">
                 <td>
                 
                 <div class="d-flex flex-row justify-content-evenly">
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js
index d8238c736..47842a8c3 100755
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js
@@ -28,7 +28,7 @@ export default {
       this.$emit("profilUpdate", this.isChanged ? this.data : null);
     },
   },
-  
+
   methods: {
     autocompleteSearch: function (event) {
       this.gemeinden = this.gemeinden.map((gemeinde) => gemeinde);
@@ -102,7 +102,7 @@ export default {
 
   template: /*html*/ `
      <div class="gy-3 row justify-content-center align-items-center">
-     <pre>{{JSON.stringify(data,null,2)}}</pre>
+    
      <!-- warning message for too many zustellungs Adressen -->
      <div v-if="showZustellAdressenWarning" class="col-12 ">
      <div class="card bg-danger mx-2">
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfilSelect.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilSelect.js
index 3028384e2..74aa15968 100755
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfilSelect.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfilSelect.js
@@ -14,6 +14,7 @@ export default {
     Status,
     TextInputDokument,
   },
+  inject: ["profilUpdateTopic"],
   props: {
     list: Object,
 
@@ -52,11 +53,15 @@ export default {
   methods: {
     addItem: function () {
       this.view =
-        this.topic == "Private Kontakte" ? "EditKontakt" : "EditAdresse";
+        this.topic == this.profilUpdateTopic["Private Kontakte"]
+          ? "EditKontakt"
+          : "EditAdresse";
 
       //? updates the topic when a Kontakt or an Address should be added
       this.topic =
-        this.topic == "Private Kontakte" ? "Add Kontakte" : "Add Adressen";
+        this.topic == this.profilUpdateTopic["Private Kontakte"]
+          ? this.profilUpdateTopic["Add Kontakt"]
+          : this.profilUpdateTopic["Add Adresse"];
       this.$emit("update:topic", this.topic);
       this.breadcrumbItems.push(this.topic);
       this.$emit("update:breadcrumb", this.breadcrumbItems);
@@ -89,16 +94,16 @@ export default {
       item.data.delete = true;
       this.$emit("update:profilUpdate", item.data);
       //? updates the topic when a Kontakt or an Address should be deleted
-      this.topic = item.data.kontakt ? "Delete Kontakte" : "Delete Adressen";
+      this.topic = this.profilUpdateTopic["Private Adressen"]
+        ? this.profilUpdateTopic["Delete Adresse"]
+        : this.profilUpdateTopic["Delete Kontakt"];
       this.$emit("update:topic", this.topic);
 
       this.$emit("submit");
     },
 
-    //TODO: REWRITE THIS TO USE PROVIDE AND INJECT
     profilUpdateEmit: function (event) {
       //? passes the updated profil information to the parent component
-
       this.$emit("update:profilUpdate", event);
     },
 
@@ -108,7 +113,7 @@ export default {
       this.view = item.view;
       if (item.title) {
         //? emits the selected topic to the parent component
-        this.topic = item.title;
+        this.topic = item.topic;
         this.$emit("update:topic", this.topic);
 
         //? emits the new item for the breadcrumb in the parent component
diff --git a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
index 7f0ad5ed5..4ea8ed8af 100755
--- a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
+++ b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
@@ -3,7 +3,6 @@ import Alert from "../../Bootstrap/Alert.js";
 import Kontakt from "../Profil/ProfilComponents/Kontakt.js";
 import Adresse from "../Profil/ProfilComponents/Adresse.js";
 
-
 export default {
   components: {
     BsModal,
@@ -14,12 +13,11 @@ export default {
   props: {
     title: {
       type: String,
-      
     },
     value: {
       type: Object,
     },
-    setLoading:{
+    setLoading: {
       type: Function,
     },
 
@@ -39,48 +37,59 @@ export default {
     return {
       data: this.value,
       loading: false,
-      //? result is returned from the Promise when the modal is closed
+      profilUpdateStates: {},
       result: false,
       info: null,
-      files:null,
+      files: null,
     };
   },
 
   methods: {
-    getDocumentLink: function(dms_id){
-      return FHC_JS_DATA_STORAGE_OBJECT.app_root +
-          FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-          `/Cis/ProfilUpdate/show/${dms_id}`;
+    getProfilStatus: async function () {
+      return (
+        FHC_JS_DATA_STORAGE_OBJECT.app_root +
+        FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+        `/Cis/ProfilUpdate/show/${dms_id}`
+      );
+    },
+    getDocumentLink: function (dms_id) {
+      return (
+        FHC_JS_DATA_STORAGE_OBJECT.app_root +
+        FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+        `/Cis/ProfilUpdate/show/${dms_id}`
+      );
     },
     acceptRequest: function () {
       this.loading = true;
       this.setLoading(true);
-      Vue.$fhcapi.ProfilUpdate.acceptProfilRequest(this.data).then((res) => {
-        this.setLoading(false);
-        this.loading = false;
-        this.result = true;
-      }).catch((e) => {
-        Alert.popup(Vue.h('div',{innerHTML:e.response.data}));
-      }).finally(()=>{
-        this.hide();
-      });
-      
+      Vue.$fhcapi.ProfilUpdate.acceptProfilRequest(this.data)
+        .then((res) => {
+          this.setLoading(false);
+          this.loading = false;
+          this.result = true;
+        })
+        .catch((e) => {
+          Alert.popup(Vue.h("div", { innerHTML: e.response.data }));
+        })
+        .finally(() => {
+          this.hide();
+        });
     },
 
     denyRequest: async function () {
       this.loading = true;
       this.setLoading(true);
-      Vue.$fhcapi.ProfilUpdate.denyProfilRequest(this.data).then((res) => {
-        this.setLoading(false);
-        this.loading = false;
-        this.result = true;
-      }).catch((e) => {
-        Alert.popup(Vue.h('div',{innerHTML:e.response.data}));
-      });
+      Vue.$fhcapi.ProfilUpdate.denyProfilRequest(this.data)
+        .then((res) => {
+          this.setLoading(false);
+          this.loading = false;
+          this.result = true;
+        })
+        .catch((e) => {
+          Alert.popup(Vue.h("div", { innerHTML: e.response.data }));
+        });
       this.hide();
     },
-
-   
   },
   computed: {
     getComponentView: function () {
@@ -94,10 +103,20 @@ export default {
     },
   },
   created() {
-   
-     Vue.$fhcapi.ProfilUpdate.getProfilRequestFiles(this.data.profil_update_id).then((res) =>{
-      this.files=res.data;
-    }) 
+    // fetching the different ProfilUpdateStates from the db
+    Vue.$fhcapi.ProfilUpdate.getStatus()
+      .then((result) => {
+        this.profilUpdateStates = result.data;
+      })
+      .catch((err) => {
+        console.error(err);
+      });
+
+    Vue.$fhcapi.ProfilUpdate.getProfilRequestFiles(
+      this.data.profil_update_id
+    ).then((res) => {
+      this.files = res.data;
+    });
   },
   mounted() {
     this.modal = this.$refs.modalContainer.modal;
@@ -105,7 +124,7 @@ export default {
   popup(options) {
     return BsModal.popup.bind(this)(null, options);
   },
-  template: /*html*/`
+  template: /*html*/ `
 
   <bs-modal v-show="!loading" ref="modalContainer" v-bind="$props" body-class="" dialog-class="modal-lg" class="bootstrap-alert" backdrop="false" >
     
@@ -206,7 +225,7 @@ export default {
     </template>
     
 
-    <template v-if="data.status === $p.t('profilUpdate','pending')"  v-slot:footer>
+    <template v-if="data.status === profilUpdateStates.Pending"  v-slot:footer>
     <div  class="form-underline flex-fill">
       <div class="form-underline-titel">{{$p.t('global','nachricht')}}</div>
 
diff --git a/system/dbupdate_3.4/25999_C4_ma0594.php b/system/dbupdate_3.4/25999_C4_ma0594.php
index 9d9f7c2b1..defa2a74f 100755
--- a/system/dbupdate_3.4/25999_C4_ma0594.php
+++ b/system/dbupdate_3.4/25999_C4_ma0594.php
@@ -1,9 +1,8 @@
 <?php
-    
-     if(!$result = @$db->db_query("SELECT 1 FROM public.tbl_profil_update_status LIMIT 1"))
-    {
 
-        $qry = " CREATE TABLE public.tbl_profil_update_status (
+if (!$result = @$db->db_query("SELECT 1 FROM public.tbl_profil_update_status LIMIT 1")) {
+
+    $qry = " CREATE TABLE public.tbl_profil_update_status (
             status_kurzbz VARCHAR(32) NOT NULL,
             beschreibung VARCHAR(256) NULL,
             bezeichnung_mehrsprachig VARCHAR(256)[] NULL,
@@ -17,16 +16,15 @@
                                                             ('Accepted','Profil Änderungen die angenommen wurden','{Angenommen,Accepted}'),
                                                             ('Rejected','Profil Änderungen die abgelehn wurden','{Abgelehnt,Rejected}');";
 
-        if(!$db->db_query($qry))
-        echo '<strong>public.tbl_profil_update_status: '.$db->db_last_error().'</strong><br>';
+    if (!$db->db_query($qry))
+        echo '<strong>public.tbl_profil_update_status: ' . $db->db_last_error() . '</strong><br>';
     else
         echo '<br>public.tbl_profil_update_status: table created';
-    }
+}
 
-    if(!$result = @$db->db_query("SELECT 1 FROM public.tbl_profil_update_topic LIMIT 1"))
-    {
+if (!$result = @$db->db_query("SELECT 1 FROM public.tbl_profil_update_topic LIMIT 1")) {
 
-        $qry="CREATE TABLE public.tbl_profil_update_topic (
+    $qry = "CREATE TABLE public.tbl_profil_update_topic (
             topic_kurzbz VARCHAR(32) NOT NULL,
             beschreibung VARCHAR(256) NULL,
             bezeichnung_mehrsprachig VARCHAR(256)[] NULL,
@@ -42,22 +40,21 @@
                                                             ('Titel','Titel aktualisieren','{Titel,Title}'),
                                                             ('Postnomen','Postnomen aktualisieren','{Postnomen,Post-nominal}'),
                                                             ('Private Kontakte','Kontakt aktualisieren','{\"Private Kontakte\",\"Private Contacts\"}'),
-                                                            ('Kontakt löschen','Kontakt löschen','{\"Kontakt löschen\",\"Delete contact\"}'),
-                                                            ('Kontakt hinzufügen','Kontakt hinzufügen','{\"Kontakt hinzufügen\",\"Add contact\"}'),
+                                                            ('Delete Kontakt','Kontakt löschen','{\"Kontakt löschen\",\"Delete contact\"}'),
+                                                            ('Add Kontakt','Kontakt hinzufügen','{\"Kontakt hinzufügen\",\"Add contact\"}'),
                                                             ('Private Adressen','Adresse aktualisieren','{\"Private Adressen\",\"Private Addreses\"}'),
-                                                            ('Adresse löschen','Adresse löschen','{\"Adresse löschen\",\"Delete address\"}'),
-                                                            ('Adresse hinzufügen','Adresse löschen','{\"Adresse hinzufügen\",\"Delete address\"}');";
+                                                            ('Delete Adresse','Adresse löschen','{\"Adresse löschen\",\"Delete address\"}'),
+                                                            ('Add Adresse','Adresse hinzufügen','{\"Adresse hinzufügen\",\"Delete address\"}');";
 
-        if(!$db->db_query($qry))
-        echo '<strong>public.tbl_profil_update_topic: '.$db->db_last_error().'</strong><br>';
+    if (!$db->db_query($qry))
+        echo '<strong>public.tbl_profil_update_topic: ' . $db->db_last_error() . '</strong><br>';
     else
         echo '<br>public.tbl_profil_update_topic: table created';
-    }
+}
 
-    if(!$result = @$db->db_query("SELECT 1 FROM public.tbl_profil_update LIMIT 1"))
-    {
-        
-            $qry = "CREATE TABLE public.tbl_profil_update (
+if (!$result = @$db->db_query("SELECT 1 FROM public.tbl_profil_update LIMIT 1")) {
+
+    $qry = "CREATE TABLE public.tbl_profil_update (
                 profil_update_id INTEGER NOT NULL,
                 uid VARCHAR(32) NOT NULL,
                 topic VARCHAR(32) NOT NULL,
@@ -92,26 +89,24 @@
             GRANT SELECT, UPDATE ON public.tbl_profil_update_id_seq TO web;";
 
 
-        if(!$db->db_query($qry))
-            echo '<strong>public.tbl_profil_update: '.$db->db_last_error().'</strong><br>';
+    if (!$db->db_query($qry))
+        echo '<strong>public.tbl_profil_update: ' . $db->db_last_error() . '</strong><br>';
+    else
+        echo '<br>public.tbl_profil_update: table created';
+}
+
+// adds the dms_kategorie profil_aenderung to the database
+if ($result = @$db->db_query("SELECT * FROM campus.tbl_dms_kategorie WHERE kategorie_kurzbz='profil_aenderung'")) {
+
+    if ($db->db_num_rows($result) == 0) {
+
+        $qry = "INSERT INTO campus.tbl_dms_kategorie VALUES ('profil_aenderung','Dokumente fuer Profil Aenderungen','Dokumente die Belegen ob man eine neue Adresse angemeldet hat oder seinen Namen geaendert hat','dokumente',NULL,NULL);";
+
+        if (!$db->db_query($qry))
+            echo '<strong>INSERT OF DMS_KATEGORIE profil_aenderung ERROR : ' . $db->db_last_error() . '</strong><br>';
         else
-            echo '<br>public.tbl_profil_update: table created';
+            echo '<br>INSERT OF DMS_KATEGORIE profil_aenderung was successful';
     }
- 
-    // adds the dms_kategorie profil_aenderung to the database
-    if($result = @$db->db_query("SELECT * FROM campus.tbl_dms_kategorie WHERE kategorie_kurzbz='profil_aenderung'"))
-    {
 
-        if($db->db_num_rows($result) == 0){
-            
-            $qry = "INSERT INTO campus.tbl_dms_kategorie VALUES ('profil_aenderung','Dokumente fuer Profil Aenderungen','Dokumente die Belegen ob man eine neue Adresse angemeldet hat oder seinen Namen geaendert hat','dokumente',NULL,NULL);";
+}
 
-            if(!$db->db_query($qry))
-                echo '<strong>INSERT OF DMS_KATEGORIE profil_aenderung ERROR : '.$db->db_last_error().'</strong><br>';
-            else
-                echo '<br>INSERT OF DMS_KATEGORIE profil_aenderung was successful';
-        }
-        
-    }
-    
-    
\ No newline at end of file

From 4fc4cd762db8fbd4bb891962edb362e9943d5e75 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 11 Apr 2024 09:15:19 +0200
Subject: [PATCH 0576/1461] adopts logic to fetched profilUpdate status and
 topic from the database

---
 .../ProfilComponents/FetchProfilUpdates.js    |   4 +-
 .../EditProfilComponents/Status.js            |  63 +++++--
 .../Cis/ProfilUpdate/AcceptDenyUpdate.js      |   7 +-
 .../Cis/ProfilUpdate/ProfilUpdateView.js      | 163 ++++++++++--------
 4 files changed, 138 insertions(+), 99 deletions(-)

diff --git a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
index 491a81274..0159f772b 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
@@ -86,7 +86,7 @@ export default {
       }
 
       //? adds the status information if the profil update request was rejected or accepted
-      if (updateRequest.status !== this.profilUpdateStates.Pending) {
+      if (updateRequest.status !== this.profilUpdateStates["Pending"]) {
         content["status"] = updateRequest.status;
         content["status_message"] = updateRequest.status_message;
         content["status_timestamp"] = updateRequest.status_timestamp;
@@ -119,7 +119,7 @@ export default {
       );
     },
     getView: function (topic, status) {
-      if (!(status === this.profilUpdateStates.Pending)) {
+      if (!(status === this.profilUpdateStates["Pending"])) {
         return "Status";
       }
 
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/Status.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/Status.js
index 30795af1d..307a0cc62 100755
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/Status.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/Status.js
@@ -6,30 +6,53 @@ export default {
     Adresse,
     Kontakt,
   },
+  inject: ["profilUpdateTopic"],
   data() {
     return {
-      files:null,
+      files: null,
     };
   },
-  methods:{
-    getDocumentLink: function(dms_id){
-      return FHC_JS_DATA_STORAGE_OBJECT.app_root +
-          FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-          `/Cis/ProfilUpdate/show/${dms_id}`;
-    }
+  methods: {
+    getDocumentLink: function (dms_id) {
+      return (
+        FHC_JS_DATA_STORAGE_OBJECT.app_root +
+        FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+        `/Cis/ProfilUpdate/show/${dms_id}`
+      );
+    },
   },
   computed: {
     getComponentView: function () {
-      let title = this.topic.toLowerCase();
-      if (title.includes("adressen")) return "Adresse";
-      else if (title.includes("kontakte")) return "Kontakt";
-      else return "text_input";
+      if (
+        this.topic == this.profilUpdateTopic["Private Adressen"] ||
+        this.topic == this.profilUpdateTopic["Add Adresse"] ||
+        this.topic == this.profilUpdateTopic["Delete Adresse"]
+      ) {
+        return "Adresse";
+      } else if (
+        this.topic == this.profilUpdateTopic["Private Kontakte"] ||
+        this.topic == this.profilUpdateTopic["Add Kontakt"] ||
+        this.topic == this.profilUpdateTopic["Delete Kontakt"]
+      ) {
+        return "Kontakt";
+      } else {
+        return "text_input";
+      }
     },
     cardHeader: function () {
-      let title = this.topic.toLowerCase();
-      if (title.includes("delete")) return "Delete";
-      else if (title.includes("add")) return "Add";
-      else return "Update";
+      if (
+        this.topic == this.profilUpdateTopic["Delete Addresse"] ||
+        this.topic == this.profilUpdateTopic["Delete Kontakt"]
+      ) {
+        return "Delete";
+      } else if (
+        this.topic == this.profilUpdateTopic["Add Adresse"] ||
+        this.topic == this.profilUpdateTopic["Add Kontakt"]
+      ) {
+        return "Add";
+      } else {
+        return "Update";
+      }
     },
   },
   props: {
@@ -42,11 +65,13 @@ export default {
     topic: { type: String },
   },
   created() {
-    Vue.$fhcapi.ProfilUpdate.getProfilRequestFiles(this.updateID).then((res) =>{
-      this.files = res.data;
-    })
+    Vue.$fhcapi.ProfilUpdate.getProfilRequestFiles(this.updateID).then(
+      (res) => {
+        this.files = res.data;
+      }
+    );
   },
-  template: /*html*/`
+  template: /*html*/ `
     <div class="row">
 
     <div class="col">
diff --git a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
index 4ea8ed8af..4f869e573 100755
--- a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
+++ b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
@@ -9,6 +9,7 @@ export default {
     Kontakt,
     Adresse,
   },
+  inject: ["profilUpdateStates"],
   mixins: [BsModal],
   props: {
     title: {
@@ -151,7 +152,7 @@ export default {
     </div>
 
 
-    <div v-if="data.status!==$p.t('profilUpdate','pending')" class="form-underline mb-2 col-12 col-sm-6">
+    <div v-if="data.status!==profilUpdateStates['Pending']" class="form-underline mb-2 col-12 col-sm-6">
       <div class="form-underline-titel">{{$p.t('profilUpdate','statusDate')}}: </div>
       <!-- only status timestamp and status message can be null in the database -->
       <span  class="form-underline-content" >{{data.status_timestamp?data.status_timestamp:'-'}}</span>
@@ -189,7 +190,7 @@ export default {
     </div>
 
     <!-- Row with the status message is only visible if the request is not pending and the message is not empty -->
-    <div v-if="data.status !== $p.t('profilUpdate','pending') && data.status_message" class="row">
+    <div v-if="data.status !== profilUpdateStates['Pending'] && data.status_message" class="row">
     <div class="col">
     <div  class="form-underline mb-2 ">
     <div class="form-underline-titel">{{$p.t('profilUpdate','statusMessage')}}</div>
@@ -225,7 +226,7 @@ export default {
     </template>
     
 
-    <template v-if="data.status === profilUpdateStates.Pending"  v-slot:footer>
+    <template v-if="data.status === profilUpdateStates['Pending']  v-slot:footer>
     <div  class="form-underline flex-fill">
       <div class="form-underline-titel">{{$p.t('global','nachricht')}}</div>
 
diff --git a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
index f9b9ecb43..851fd5672 100644
--- a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
+++ b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
@@ -1,26 +1,19 @@
-
 import { CoreFilterCmpt } from "../../filter/Filter.js";
 import AcceptDenyUpdate from "./AcceptDenyUpdate.js";
 import Alert from "../../../components/Bootstrap/Alert.js";
 import Loading from "../../../components/Loader.js";
 
-const STATUS = Object.freeze({
-  PENDING: "Pending",
-  ACCEPTED: "Accepted",
-  REJECTED: "Rejected",
-})
-
-const sortProfilUpdates = (ele1, ele2, thisPointer)=>  {
-  
+const sortProfilUpdates = (ele1, ele2, thisPointer) => {
   let result = 0;
-  if (ele1.status === STATUS.PENDING) {
+  if (ele1.status === thisPointer.profilUpdateStates["Pending"]) {
     result = -1;
-  } else if (ele1.status === STATUS.ACCEPTED) {
-    result = ele2.status === STATUS.REJECTED ? -1 : 1;
+  } else if (ele1.status === thisPointer.profilUpdateStates["Accepted"]) {
+    result =
+      ele2.status === thisPointer.profilUpdateStates["Rejected"] ? -1 : 1;
   } else {
     result = 1;
   }
-  
+
   if (ele1.status === ele2.status) {
     //? if they have the same status , insert_date gets compared for order
     result =
@@ -30,27 +23,27 @@ const sortProfilUpdates = (ele1, ele2, thisPointer)=>  {
   return result;
 };
 
-export default{
+export default {
   components: {
     CoreFilterCmpt,
     Loading,
     AcceptDenyUpdate,
   },
-  props:{
-    id:{
-        type:Number,
-    }
+  inject: ["profilUpdateTopic", "profilUpdateStates"],
+  props: {
+    id: {
+      type: Number,
+    },
   },
   data() {
     return {
       showModal: false,
       modalData: null,
-      loading:false,
+      loading: false,
       showAll: false,
-      events:[],
-      profil_update_id:Number(this.id),
+      events: [],
+      profil_update_id: Number(this.id),
       profil_updates_table_options: {
-        
         ajaxURL:
           FHC_JS_DATA_STORAGE_OBJECT.app_root +
           FHC_JS_DATA_STORAGE_OBJECT.ci_router +
@@ -61,21 +54,25 @@ export default{
           if (this.showAll) {
             return url + "getProfilUpdateWithPermission";
           } else {
-            return url + `getProfilUpdateWithPermission/${STATUS.PENDING}`;
+            return (
+              url +
+              `getProfilUpdateWithPermission/${this.profilUpdateStates["Pending"]}`
+            );
           }
         },
-        ajaxResponse: (url, params, response)=> {
+        ajaxResponse: (url, params, response) => {
           //url - the URL of the request
           //params - the parameters passed with the request
           //response - the JSON object returned in the body of the response.
           //? sorts the response data from the backend
-          if (response) response.sort((ele1,ele2)=>sortProfilUpdates(ele1,ele2,this));
+          if (response)
+            response.sort((ele1, ele2) => sortProfilUpdates(ele1, ele2, this));
 
           return response;
         },
         //? adds tooltip with the status message of a profil update request if its status is not pending
         columnDefaults: {
-          tooltip: (e, cell, onRendered) =>{
+          tooltip: (e, cell, onRendered) => {
             //e - mouseover event
             //cell - cell component
             //onRendered - onRendered callback registration function
@@ -89,7 +86,7 @@ export default{
             el.classList.add("border", "border-dark");
 
             let statusDateEl = document.createElement("span");
-            statusDateEl.classList.add("d-block","mb-1");
+            statusDateEl.classList.add("d-block", "mb-1");
             statusDateEl.innerHTML =
               "Request was " + status + " on " + statusDate;
             let statusMessageEl = document.createElement("span");
@@ -102,17 +99,22 @@ export default{
         },
         rowContextMenu: (e, component) => {
           let menu = [];
-          if (component.getData().status === this.$p.t('profilUpdate','pending')) {
+          if (
+            component.getData().status === this.profilUpdateStates["Pending"]
+          ) {
             menu.push(
               {
-                label: `<i class='fa fa-check'></i> ${this.$p.t('profilUpdate','acceptUpdate')}`,
+                label: `<i class='fa fa-check'></i> ${this.$p.t(
+                  "profilUpdate",
+                  "acceptUpdate"
+                )}`,
                 action: (e, column) => {
                   Vue.$fhcapi.ProfilUpdate.acceptProfilRequest(column.getData())
                     .then((res) => {
                       this.$refs.UpdatesTable.tabulator.setData();
                     })
                     .catch((e) => {
-                      Alert.popup(Vue.h('div',{innerHTML:e.response.data}));
+                      Alert.popup(Vue.h("div", { innerHTML: e.response.data }));
                     });
                 },
               },
@@ -120,32 +122,39 @@ export default{
                 separator: true,
               },
               {
-                label:
-                  ` <i style='width:16px' class='text-center fa fa-xmark'></i> ${this.$p.t('profilUpdate','denyUpdate')}`,
+                label: ` <i style='width:16px' class='text-center fa fa-xmark'></i> ${this.$p.t(
+                  "profilUpdate",
+                  "denyUpdate"
+                )}`,
                 action: (e, column) => {
-                  Vue.$fhcapi.ProfilUpdate.denyProfilRequest(
-                    column.getData()
-                  ).then((res) => {
-                    this.$refs.UpdatesTable.tabulator.setData();
-                  }).catch((e) => {
-                    Alert.popup(Vue.h('div',{innerHTML:e.response.data}));
-                  });
+                  Vue.$fhcapi.ProfilUpdate.denyProfilRequest(column.getData())
+                    .then((res) => {
+                      this.$refs.UpdatesTable.tabulator.setData();
+                    })
+                    .catch((e) => {
+                      Alert.popup(Vue.h("div", { innerHTML: e.response.data }));
+                    });
                 },
               },
               {
                 separator: true,
               },
               {
-                label: `<i class='fa fa-eye'></i> ${this.$p.t('profilUpdate','showRequest')}`,
+                label: `<i class='fa fa-eye'></i> ${this.$p.t(
+                  "profilUpdate",
+                  "showRequest"
+                )}`,
                 action: (e, column) => {
                   this.showAcceptDenyModal(column.getData());
-                    
                 },
               }
             );
           } else {
             menu.push({
-              label: `<i class='fa fa-eye'></i> ${this.$p.t('profilUpdate','showRequest')}`,
+              label: `<i class='fa fa-eye'></i> ${this.$p.t(
+                "profilUpdate",
+                "showRequest"
+              )}`,
               action: (e, column) => {
                 this.showAcceptDenyModal(column.getData());
               },
@@ -153,7 +162,7 @@ export default{
           }
           return menu;
         },
-        
+
         height: 600,
         layout: "fitColumns",
 
@@ -196,12 +205,18 @@ export default{
             hozAlign: "center",
             headerFilter: true,
             formatter: (cell, para) => {
-              let iconClasses =""
+              let iconClasses = "";
               let status = cell.getRow().getData().status;
-              switch (status){
-                case "Pending": iconClasses += "fa fa-lg fa-circle-info text-info "; break;
-                case "Accepted": iconClasses += "fa fa-lg fa-circle-check text-success "; break;
-                case "Rejected": iconClasses += "fa fa-lg fa-circle-xmark text-danger "; break;
+              switch (status) {
+                case this.profilUpdateStates["Pending"]:
+                  iconClasses += "fa fa-lg fa-circle-info text-info ";
+                  break;
+                case this.profilUpdateStates["Accepted"]:
+                  iconClasses += "fa fa-lg fa-circle-check text-success ";
+                  break;
+                case this.profilUpdateStates["Rejected"]:
+                  iconClasses += "fa fa-lg fa-circle-xmark text-danger ";
+                  break;
               }
               return `<div class='row justify-content-center'><div class='col-2'><i class='${iconClasses}'></i></div> <div class='col-4'><span>${cell.getValue()}</span></div></div>`;
             },
@@ -244,17 +259,17 @@ export default{
     },
   },
   methods: {
-    setLoading: function(newValue){
+    setLoading: function (newValue) {
       this.loading = newValue;
     },
     hideAcceptDenyModal: function () {
       //? checks the AcceptDenyModal component property result, if the user made a successful request or not
-     
+
       if (this.$refs.AcceptDenyModal.result) {
-          //? refetches the data, if any request was denied or accepted
-          //* setData will call the ajaxURL again to refresh the data
-          
-          this.$refs.UpdatesTable.tabulator.setData();
+        //? refetches the data, if any request was denied or accepted
+        //* setData will call the ajaxURL again to refresh the data
+
+        this.$refs.UpdatesTable.tabulator.setData();
       } else {
         // when modal was closed without submitting request
       }
@@ -264,56 +279,54 @@ export default{
 
     showAcceptDenyModal(value) {
       this.modalData = value;
-      if(!this.modalData){
+      if (!this.modalData) {
         return;
       }
       this.showModal = true;
-      
+
       // after a state change, wait for the DOM updates to complete
       Vue.nextTick(() => {
         this.$refs.AcceptDenyModal.show();
       });
     },
-    
+
     updateData: function (event) {
       this.$refs.UpdatesTable.tabulator.setData();
       //? store the selected view in the session storage of the browser
       sessionStorage.setItem("showAll", event.target.value);
     },
   },
-  watch:{
-    loading: function(newValue, oldValue){
-      if(newValue){
+  watch: {
+    loading: function (newValue, oldValue) {
+      if (newValue) {
         this.$refs.loadingModalRef.show();
-      }else{
+      } else {
         this.$refs.loadingModalRef.hide();
       }
-    }
+    },
   },
 
   mounted() {
-
     //? opens the AcceptDenyUpdate Modal if a preselected profil_update_id was passed to the component (used for email links)
-    if(this.profil_update_id){
-        
-        this.$refs.UpdatesTable.tabulator.on("dataProcessed", ()=>{
-        const arrayRowData = this.$refs.UpdatesTable.tabulator.getData().filter(row => {
+    if (this.profil_update_id) {
+      this.$refs.UpdatesTable.tabulator.on("dataProcessed", () => {
+        const arrayRowData = this.$refs.UpdatesTable.tabulator
+          .getData()
+          .filter((row) => {
             return row.profil_update_id === this.profil_update_id;
-        });
-        if(arrayRowData.length){
-            this.showAcceptDenyModal(arrayRowData[0]);
+          });
+        if (arrayRowData.length) {
+          this.showAcceptDenyModal(arrayRowData[0]);
         }
-        })
+      });
     }
-   
 
     if (!(sessionStorage.getItem("showAll") === null)) {
       //? converting string into a boolean: https://sentry.io/answers/how-can-i-convert-a-string-to-a-boolean-in-javascript/
-      this.showAll = sessionStorage.getItem("showAll")==="true";
-      
+      this.showAll = sessionStorage.getItem("showAll") === "true";
     }
   },
-  template: /*html*/`
+  template: /*html*/ `
     <div>
     
     <accept-deny-update :title="$p.t('profilUpdate','profilUpdateRequest')" v-if="showModal" ref="AcceptDenyModal" @hideBsModal="hideAcceptDenyModal" :value="JSON.parse(JSON.stringify(modalData))" :setLoading="setLoading" ></accept-deny-update>

From 2b68831415f191e207fb68d343ea63c12bdecd8a Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 11 Apr 2024 11:20:32 +0200
Subject: [PATCH 0577/1461] adds more filter options for the ProfilUpdateView

---
 application/controllers/Cis/ProfilUpdate.php  |  3 -
 public/js/apps/Cis/Profil.js                  |  8 ++-
 public/js/apps/Cis/ProfilUpdateRequests.js    | 34 ++++++----
 .../Cis/ProfilUpdate/AcceptDenyUpdate.js      | 12 +---
 .../Cis/ProfilUpdate/ProfilUpdateView.js      | 67 +++++++++----------
 5 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
index aea7dc0ec..98d9e3224 100755
--- a/application/controllers/Cis/ProfilUpdate.php
+++ b/application/controllers/Cis/ProfilUpdate.php
@@ -480,9 +480,6 @@ class ProfilUpdate extends Auth_Controller
 
 	public function getProfilUpdateWithPermission($status = null)
 	{
-
-
-
 		// early return if no status has been passed as argument
 		if (!isset($status)) {
 			echo json_encode($this->ProfilUpdateModel->getProfilUpdateWithPermission());
diff --git a/public/js/apps/Cis/Profil.js b/public/js/apps/Cis/Profil.js
index bf2a9c637..56ad16746 100755
--- a/public/js/apps/Cis/Profil.js
+++ b/public/js/apps/Cis/Profil.js
@@ -59,8 +59,12 @@ const profilApp = Vue.createApp({
   //? use function syntax for provide so that we can access `this`
   provide() {
     return {
-      profilUpdateStates: Vue.computed(() => this.profilUpdateStates),
-      profilUpdateTopic: Vue.computed(() => this.profilUpdateTopic),
+      profilUpdateStates: Vue.computed(() =>
+        this.profilUpdateStates ? this.profilUpdateStates : null
+      ),
+      profilUpdateTopic: Vue.computed(() =>
+        this.profilUpdateTopic ? this.profilUpdateTopic : null
+      ),
       setLoading: (newValue) => {
         this.loading = newValue;
       },
diff --git a/public/js/apps/Cis/ProfilUpdateRequests.js b/public/js/apps/Cis/ProfilUpdateRequests.js
index 10e11a200..f62d096af 100755
--- a/public/js/apps/Cis/ProfilUpdateRequests.js
+++ b/public/js/apps/Cis/ProfilUpdateRequests.js
@@ -3,22 +3,32 @@ import ProfilUpdateView from "../../components/Cis/ProfilUpdate/ProfilUpdateView
 import Phrasen from "../../plugin/Phrasen.js";
 Vue.$fhcapi = fhcapifactory;
 
-
-
 const app = Vue.createApp({
   components: {
-    ['profil-update-view']:ProfilUpdateView,
- 
+    ["profil-update-view"]: ProfilUpdateView,
   },
- 
+
   data() {
     return {
-   
-    }
-  },methods:{
-   
-  }
-  
+      profilUpdateStates: null,
+    };
+  },
+  provide() {
+    return {
+      profilUpdateStates: Vue.computed(() =>
+        this.profilUpdateStates ? this.profilUpdateStates : false
+      ),
+    };
+  },
+  methods: {},
+  created() {
+    Vue.$fhcapi.ProfilUpdate.getStatus()
+      .then((response) => {
+        this.profilUpdateStates = response.data;
+      })
+      .catch((error) => {
+        console.error(error);
+      });
+  },
 });
 app.use(Phrasen).mount("#content");
-
diff --git a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
index 4f869e573..8650f2b55 100755
--- a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
+++ b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
@@ -135,14 +135,6 @@ export default {
 
 
     <template v-slot:default>
-
-    
-    <!-- debugging prints 
-    <pre>{{JSON.stringify(data.profil_update_id,null,2)}}</pre>
-    <pre>view {{getComponentView}}</pre>
-    <pre>topic {{JSON.stringify(data.topic,null,2)}}</pre>
-    
-    -->
     
    <div class="row">
     <div  class="form-underline mb-2 col-12 col-sm-6">
@@ -226,12 +218,12 @@ export default {
     </template>
     
 
-    <template v-if="data.status === profilUpdateStates['Pending']  v-slot:footer>
+    <template v-if="data.status === profilUpdateStates['Pending']"  v-slot:footer>
     <div  class="form-underline flex-fill">
       <div class="form-underline-titel">{{$p.t('global','nachricht')}}</div>
 
       <div class="d-flex flex-row gap-2">
-        <input  class="form-control " v-model="data.status_message"  >
+        <input  class="form-control " v-model="data.status_message"  />
         <button  @click="acceptRequest" class="text-nowrap btn btn-success">{{$p.t('profilUpdate','accept')}} <i class="fa fa-check"></i></button>
         <button @click="denyRequest" class="text-nowrap btn btn-danger">{{$p.t('profilUpdate','deny')}} <i class="fa fa-xmark"></i></button>
       </div>
diff --git a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
index 851fd5672..c83ea816a 100644
--- a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
+++ b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
@@ -40,7 +40,7 @@ export default {
       showModal: false,
       modalData: null,
       loading: false,
-      showAll: false,
+      filter: "Pending",
       events: [],
       profil_update_id: Number(this.id),
       profil_updates_table_options: {
@@ -51,13 +51,25 @@ export default {
 
         ajaxURLGenerator: (url, config, params) => {
           //? this function needs to be an array function in order to access the this properties of the Vue component
-          if (this.showAll) {
-            return url + "getProfilUpdateWithPermission";
-          } else {
-            return (
-              url +
-              `getProfilUpdateWithPermission/${this.profilUpdateStates["Pending"]}`
-            );
+
+          switch (this.filter) {
+            case this.profilUpdateStates["Pending"]:
+              return (
+                url +
+                `getProfilUpdateWithPermission/${this.profilUpdateStates["Pending"]}`
+              );
+            case this.profilUpdateStates["Accepted"]:
+              return (
+                url +
+                `getProfilUpdateWithPermission/${this.profilUpdateStates["Accepted"]}`
+              );
+            case this.profilUpdateStates["Rejected"]:
+              return (
+                url +
+                `getProfilUpdateWithPermission/${this.profilUpdateStates["Rejected"]}`
+              );
+            default:
+              return url + `getProfilUpdateWithPermission`;
           }
         },
         ajaxResponse: (url, params, response) => {
@@ -244,20 +256,7 @@ export default {
       },
     };
   },
-  computed: {
-    getFetchUrl: function () {
-      let url =
-        FHC_JS_DATA_STORAGE_OBJECT.app_root +
-        FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-        `/Cis/ProfilUpdate/`;
-      if (this.showAll) {
-        url + "getAllRequests";
-      } else {
-        url + "getPendingRequests";
-      }
-      return url;
-    },
-  },
+  computed: {},
   methods: {
     setLoading: function (newValue) {
       this.loading = newValue;
@@ -293,7 +292,7 @@ export default {
     updateData: function (event) {
       this.$refs.UpdatesTable.tabulator.setData();
       //? store the selected view in the session storage of the browser
-      sessionStorage.setItem("showAll", event.target.value);
+      sessionStorage.setItem("filter", event.target.value);
     },
   },
   watch: {
@@ -321,31 +320,29 @@ export default {
       });
     }
 
-    if (!(sessionStorage.getItem("showAll") === null)) {
+    if (sessionStorage.getItem("filter")) {
       //? converting string into a boolean: https://sentry.io/answers/how-can-i-convert-a-string-to-a-boolean-in-javascript/
-      this.showAll = sessionStorage.getItem("showAll") === "true";
+      this.filter = sessionStorage.getItem("filter");
     }
   },
   template: /*html*/ `
     <div>
-    
+   
     <accept-deny-update :title="$p.t('profilUpdate','profilUpdateRequest')" v-if="showModal" ref="AcceptDenyModal" @hideBsModal="hideAcceptDenyModal" :value="JSON.parse(JSON.stringify(modalData))" :setLoading="setLoading" ></accept-deny-update>
-    
     <div  class="form-underline flex-fill ">
       <div class="form-underline-titel">{{$p.t('ui','anzeigen')}} </div>
-
-      <select class="mb-4 " v-model="showAll" @change="updateData" class="form-select" aria-label="Profil updates display selection">
-        <option :selected="true" :value="false">{{$p.t('profilUpdate','pendingRequests')}}</option>
-        <option :value="false">{{$p.t('profilUpdate','acceptedRequests')}}</option>
-        <option :value="false">{{$p.t('profilUpdate','rejectedRequests')}}</option>
-        <option :value="true">{{$p.t('profilUpdate','allRequests')}}</option>
+      
+      <select class="mb-4 " v-model="filter" @change="updateData" class="form-select" aria-label="Profil updates display selection">
+        <option :selected="true" :value="profilUpdateStates['Pending']" >{{$p.t('profilUpdate','pendingRequests')}}</option>
+        <option :value="profilUpdateStates['Accepted']">{{$p.t('profilUpdate','acceptedRequests')}}</option>
+        <option :value="profilUpdateStates['Rejected']">{{$p.t('profilUpdate','rejectedRequests')}}</option>
+        <option :value="'Alle'">{{$p.t('profilUpdate','allRequests')}}</option>
       </select>
   
     </div>
-
     <loading ref="loadingModalRef" :timeout="0"></loading>
     
-    <core-filter-cmpt :title="$p.t('profilUpdate','profilUpdateRequests')"  ref="UpdatesTable" :tabulatorEvents="events" :tabulator-options="profil_updates_table_options" tableOnly :sideMenu="false" />
+    <core-filter-cmpt v-if="profilUpdateStates" :title="$p.t('profilUpdate','profilUpdateRequests')"  ref="UpdatesTable" :tabulatorEvents="events" :tabulator-options="profil_updates_table_options" tableOnly :sideMenu="false" />
 
     </div>`,
 };

From 86504fd6634ef749a1c314d93965aa7e62c38da3 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 11 Apr 2024 11:39:29 +0200
Subject: [PATCH 0578/1461] doesn't show the footer if the view inside the
 EditProfil Modal is set to Status

---
 public/js/apps/Cis/Profil.js                  |   5 +-
 .../Cis/Profil/MitarbeiterProfil.js           |   4 +-
 .../Cis/Profil/ProfilModal/EditProfil.js      | 103 +++++++++---------
 3 files changed, 54 insertions(+), 58 deletions(-)

diff --git a/public/js/apps/Cis/Profil.js b/public/js/apps/Cis/Profil.js
index 56ad16746..9df5d42ae 100755
--- a/public/js/apps/Cis/Profil.js
+++ b/public/js/apps/Cis/Profil.js
@@ -60,10 +60,10 @@ const profilApp = Vue.createApp({
   provide() {
     return {
       profilUpdateStates: Vue.computed(() =>
-        this.profilUpdateStates ? this.profilUpdateStates : null
+        this.profilUpdateStates ? this.profilUpdateStates : false
       ),
       profilUpdateTopic: Vue.computed(() =>
-        this.profilUpdateTopic ? this.profilUpdateTopic : null
+        this.profilUpdateTopic ? this.profilUpdateTopic : false
       ),
       setLoading: (newValue) => {
         this.loading = newValue;
@@ -364,7 +364,6 @@ const profilApp = Vue.createApp({
 
     Vue.$fhcapi.ProfilUpdate.getTopic()
       .then((response) => {
-        console.log("t", response.data);
         this.profilUpdateTopic = response.data;
       })
       .catch((error) => {
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index bb3c4e567..41b2c8038 100755
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -220,10 +220,8 @@ export default {
     //? sorts the profil Updates: pending -> accepted -> rejected
     this.data.profilUpdates?.sort(this.sortProfilUpdates);
   },
-  
+
   mounted() {
-    console.log("this mitarbeter",this)
-    console.log("this p",this.$p)
     this.$refs.betriebsmittelTable.tabulator.on("tableBuilt", () => {
       this.$refs.betriebsmittelTable.tabulator.setData(this.data.mittel);
     });
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfil.js b/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
index 6da5113a9..189dd8f5d 100755
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
@@ -1,14 +1,14 @@
 import BsModal from "../../../Bootstrap/Modal.js";
 import Alert from "../../../Bootstrap/Alert.js";
 import EditProfilSelect from "./EditProfilSelect.js";
-import Loader from "../../../Loader.js"
+import Loader from "../../../Loader.js";
 
 export default {
   components: {
     BsModal,
     Alert,
     EditProfilSelect,
-    Loader
+    Loader,
   },
   mixins: [BsModal],
   props: {
@@ -28,42 +28,40 @@ export default {
     onShowBsModal: Function,
     onShownBsModal: Function,
   },
-  
+
   data() {
     return {
       topic: null,
       profilUpdate: null,
       editData: this.value,
-      fileID:null,
+      fileID: null,
       breadcrumb: null,
-      loading:false,
+      loading: false,
 
       result: false,
       info: null,
     };
   },
-  inject:["setLoading"],
-  provide(){
+  inject: ["setLoading"],
+  provide() {
     return {
       updateFileID: this.updateFileIDFunction,
-    }
-  }, 
+    };
+  },
 
   methods: {
-
-    updateFileIDFunction: function(newFileID){
+    updateFileIDFunction: function (newFileID) {
       this.fileID = newFileID;
     },
 
     async submitProfilChange() {
       //? check if data is valid before making a request
       if (this.topic && this.profilUpdate) {
-        
         //? if profil update contains any attachment
         if (this.fileID) {
           const fileData = await this.uploadFiles(this.fileID);
-          
-          this.fileID = fileData? fileData : null;
+
+          this.fileID = fileData ? fileData : null;
         }
 
         //? inserts new row in public.tbl_cis_profil_update
@@ -90,66 +88,66 @@ export default {
 
         //* v-show on EditProfil modal binded to this.loading
         //? hides the EditProfil modal and shows the loading modal by calling a callback that was passed as prop from the parent component
-        this.loading=true;
+        this.loading = true;
         this.setLoading(true);
-        
+
         this.editData.updateID
-          ?  Vue.$fhcapi.ProfilUpdate.updateProfilRequest(
+          ? Vue.$fhcapi.ProfilUpdate.updateProfilRequest(
               this.topic,
               this.profilUpdate,
               this.editData.updateID,
-              this.fileID? this.fileID[0]: null
-            ).then((res) => {
-              handleApiResponse(res);
-            }).catch((err) => {
-              console.error(err);
-            })
-          :  Vue.$fhcapi.ProfilUpdate.insertProfilRequest(
+              this.fileID ? this.fileID[0] : null
+            )
+              .then((res) => {
+                handleApiResponse(res);
+              })
+              .catch((err) => {
+                console.error(err);
+              })
+          : Vue.$fhcapi.ProfilUpdate.insertProfilRequest(
               this.topic,
               this.profilUpdate,
-              this.fileID? this.fileID[0]: null
-
-            ).then((res) => {
-              handleApiResponse(res);
-            }).catch((err) => {
-              console.error(err);
-            })
+              this.fileID ? this.fileID[0] : null
+            )
+              .then((res) => {
+                handleApiResponse(res);
+              })
+              .catch((err) => {
+                console.error(err);
+              });
       }
     },
 
-    uploadFiles: async function (files) {  
-      
-      if (files[0].type !== "application/x.fhc-dms+json"){
+    uploadFiles: async function (files) {
+      if (files[0].type !== "application/x.fhc-dms+json") {
         let formData = new FormData();
         formData.append("files[]", files[0]);
-        const result = this.editData.updateID ?
-        //? updating old attachment by replacing
-        //* second parameter of api request insertFile checks if the file has to be replaced or not
-        await Vue.$fhcapi.ProfilUpdate.insertFile(formData,this.editData.updateID).then(res => {
-          return res.data?.map((file) => file.dms_id);
-        })
-        
-        :
-        //? fresh insert of new attachment
-        await Vue.$fhcapi.ProfilUpdate.insertFile(formData).then(res => {
-          return res.data?.map((file) => file.dms_id);
-        })
+        const result = this.editData.updateID
+          ? //? updating old attachment by replacing
+            //* second parameter of api request insertFile checks if the file has to be replaced or not
+            await Vue.$fhcapi.ProfilUpdate.insertFile(
+              formData,
+              this.editData.updateID
+            ).then((res) => {
+              return res.data?.map((file) => file.dms_id);
+            })
+          : //? fresh insert of new attachment
+            await Vue.$fhcapi.ProfilUpdate.insertFile(formData).then((res) => {
+              return res.data?.map((file) => file.dms_id);
+            });
         return result;
-      }else{
+      } else {
         //? attachment hasn't been replaced
         return false;
       }
-
     },
   },
   computed: {},
   created() {
-    
     if (this.editData.topic) {
       //? if the topic was passed through the prop add it to the component
       this.topic = this.editData.topic;
     }
-    
   },
   mounted() {
     this.modal = this.$refs.modalContainer.modal;
@@ -157,7 +155,7 @@ export default {
   popup(options) {
     return BsModal.popup.bind(this)(null, options);
   },
-  template: /*html*/`
+  template: /*html*/ `
   <bs-modal v-show="!loading" ref="modalContainer" v-bind="$props" body-class="" dialog-class="modal-lg" class="bootstrap-alert" backdrop="false" >
     
   <template v-if="title" v-slot:title>
@@ -165,6 +163,7 @@ export default {
     </template>
     <template v-slot:default>
     <div >
+    
     <nav aria-label="breadcrumb" class="ps-2  ">
       <ol class="breadcrumb ">
         <li class="breadcrumb-item"  v-for="element in breadcrumb">{{element}}</li>
@@ -176,7 +175,7 @@ export default {
 
     </template>
     <!-- optional footer -->
-    <template  v-slot:footer>
+    <template  v-slot:footer v-if="value.view? value.view != 'Status' : true">
     <loader  ref="loaderRef" :timeout="0"></loader>
         
     <button class="btn btn-outline-danger " @click="hide">{{$p.t('ui','cancel')}}</button>    

From ea9bd93e73f3d88db7b65dc738f1fc1f2001c0ba Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 12 Apr 2024 09:39:28 +0200
Subject: [PATCH 0579/1461] phrasen fix and bug where profilUpdates were only
 sorted when accepting the request and not denying

---
 application/controllers/Cis/ProfilUpdate.php  | 18 ++++--
 .../Cis/ProfilUpdate/AcceptDenyUpdate.js      | 49 +++++----------
 .../Cis/ProfilUpdate/ProfilUpdateView.js      |  1 -
 system/phrasesupdate.php                      | 60 +++++++++++++++++++
 4 files changed, 88 insertions(+), 40 deletions(-)

diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
index 98d9e3224..1ea04716e 100755
--- a/application/controllers/Cis/ProfilUpdate.php
+++ b/application/controllers/Cis/ProfilUpdate.php
@@ -415,7 +415,7 @@ class ProfilUpdate extends Auth_Controller
 
 		if ($res) {
 			$pending_changes = array_filter($res, function ($element) {
-				return $element->status == self::$STATUS_PENDING ?: "Pending";
+				return $element->status == (self::$STATUS_PENDING ?: "Pending");
 			});
 
 			foreach ($pending_changes as $update_request) {
@@ -565,7 +565,7 @@ class ProfilUpdate extends Auth_Controller
 					$requested_change['adresse_id'] = $insertID;
 					$update_res = $this->updateRequestedChange($id, $requested_change);
 					if (isError($update_res)) {
-						echo json_encode(error($this->p->t('profilUpdate', 'profilUpdate_address_error', [$insertID, $id])));
+						echo json_encode(error($this->p->t('profilUpdate', 'profilUpdate_address_error', [$insertID])));
 						return;
 					}
 				}
@@ -577,7 +577,7 @@ class ProfilUpdate extends Auth_Controller
 					$requested_change['kontakt_id'] = $insertID;
 					$update_res = $this->updateRequestedChange($id, $requested_change);
 					if (isError($update_res)) {
-						echo json_encode(error("was not able to add kontakt_id " . $insertID . " to profilRequest " . $id));
+						echo json_encode(error($this->p->t('profilUpdate', 'profilUpdate_kontakt_error', [$insertID])));
 						return;
 					}
 				}
@@ -586,15 +586,21 @@ class ProfilUpdate extends Auth_Controller
 			} else {
 				switch ($topic) {
 					// mapping phrasen to database columns to make the update with the correct column names
-					case $this->p->t('profilUpdate', 'title'):
+					case self::$TOPICS['Titel']:
 						$topic = "titelpre";
 						break;
-					case $this->p->t('profilUpdate', 'postnomen'):
+					case self::$TOPICS['Postnomen']:
 						$topic = "titelpost";
 						break;
-					case $this->p->t('profilUpdate', 'vorname'):
+					case self::$TOPICS['Vorname']:
 						$topic = "vorname";
 						break;
+					case self::$TOPICS['Nachname']:
+						$topic = "nachname";
+						break;
+					default:
+						show_error($this->p->t('profilUpdate', 'profilUpdate_topic_error',[$topic]));
+						return;
 				}
 
 				$result = $this->PersonModel->update($personID, [$topic => $requested_change["value"]]);
diff --git a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
index 8650f2b55..76a2e2b6a 100755
--- a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
+++ b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
@@ -38,7 +38,6 @@ export default {
     return {
       data: this.value,
       loading: false,
-      profilUpdateStates: {},
       result: false,
       info: null,
       files: null,
@@ -60,10 +59,14 @@ export default {
         `/Cis/ProfilUpdate/show/${dms_id}`
       );
     },
-    acceptRequest: function () {
+    handleRequest: function (type) {
       this.loading = true;
       this.setLoading(true);
-      Vue.$fhcapi.ProfilUpdate.acceptProfilRequest(this.data)
+      Vue.$fhcapi.ProfilUpdate[
+        type.toLowerCase() == "accept"
+          ? "acceptProfilRequest"
+          : "denyProfilRequest"
+      ](this.data)
         .then((res) => {
           this.setLoading(false);
           this.loading = false;
@@ -76,22 +79,8 @@ export default {
           this.hide();
         });
     },
-
-    denyRequest: async function () {
-      this.loading = true;
-      this.setLoading(true);
-      Vue.$fhcapi.ProfilUpdate.denyProfilRequest(this.data)
-        .then((res) => {
-          this.setLoading(false);
-          this.loading = false;
-          this.result = true;
-        })
-        .catch((e) => {
-          Alert.popup(Vue.h("div", { innerHTML: e.response.data }));
-        });
-      this.hide();
-    },
   },
+
   computed: {
     getComponentView: function () {
       if (this.data.topic.toLowerCase().includes("kontakt")) {
@@ -104,20 +93,14 @@ export default {
     },
   },
   created() {
-    // fetching the different ProfilUpdateStates from the db
-    Vue.$fhcapi.ProfilUpdate.getStatus()
-      .then((result) => {
-        this.profilUpdateStates = result.data;
-      })
-      .catch((err) => {
-        console.error(err);
+    // only fetching the profilUpdate Attachemnts if the profilUpdate actually has attachments
+    if (this.value.attachment_id) {
+      Vue.$fhcapi.ProfilUpdate.getProfilRequestFiles(
+        this.data.profil_update_id
+      ).then((res) => {
+        this.files = res.data;
       });
-
-    Vue.$fhcapi.ProfilUpdate.getProfilRequestFiles(
-      this.data.profil_update_id
-    ).then((res) => {
-      this.files = res.data;
-    });
+    }
   },
   mounted() {
     this.modal = this.$refs.modalContainer.modal;
@@ -224,8 +207,8 @@ export default {
 
       <div class="d-flex flex-row gap-2">
         <input  class="form-control " v-model="data.status_message"  />
-        <button  @click="acceptRequest" class="text-nowrap btn btn-success">{{$p.t('profilUpdate','accept')}} <i class="fa fa-check"></i></button>
-        <button @click="denyRequest" class="text-nowrap btn btn-danger">{{$p.t('profilUpdate','deny')}} <i class="fa fa-xmark"></i></button>
+        <button  @click="handleRequest('accept')" class="text-nowrap btn btn-success">{{$p.t('profilUpdate','accept')}} <i class="fa fa-check"></i></button>
+        <button @click="handleRequest('deny')" class="text-nowrap btn btn-danger">{{$p.t('profilUpdate','deny')}} <i class="fa fa-xmark"></i></button>
       </div>
     </div>
      
diff --git a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
index c83ea816a..9e8194a7e 100644
--- a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
+++ b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
@@ -263,7 +263,6 @@ export default {
     },
     hideAcceptDenyModal: function () {
       //? checks the AcceptDenyModal component property result, if the user made a successful request or not
-
       if (this.$refs.AcceptDenyModal.result) {
         //? refetches the data, if any request was denied or accepted
         //* setData will call the ajaxURL again to refresh the data
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 8b7789788..1ff876ae5 100755
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -25780,6 +25780,66 @@ array(
 				)
 			)
 		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'profilUpdate_topic_error',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Ein Fehler ist aufgetreten, das Topic "{0}" existiert nicht',
+					'description' => 'Fehler der auftritt wenn es das Topic nicht in der Datenbank gibt',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'An error occurred, the topic "{0}" is not known',
+					'description' => 'error that occurrs when the used topic is not present in the database',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'profilUpdate_address_error',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Ein Fehler ist aufgetreten, Es war nicht möglich die Adresse mit ID {0} in der Datenbank anzulegen',
+					'description' => 'Fehler der auftritt wenn es nicht möglich war eine neue Adresse anzulegen',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'An error occurred, it wasn\'t possible to add new address with ID {0} to the database',
+					'description' => 'error that occurrs when it wasn\'t possible to add new address in db',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'profilUpdate_kontakt_error',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Ein Fehler ist aufgetreten, Es war nicht möglich den Kontakt mit ID {0} in der Datenbank anzulegen',
+					'description' => 'Fehler der auftritt wenn es nicht möglich war einen neuen Kontakt anzulegen',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'An error occurred, it wasn\'t possible to add new contact with ID {0} to the database',
+					'description' => 'error that occurrs when it wasn\'t possible to add new contact in db',
+					'insertvon' => 'system'
+				)
+			)
+		),
 		
 		
 		

From 1fb019b7959f6f981e88e8c9b012001172014737 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 12 Apr 2024 10:28:39 +0200
Subject: [PATCH 0580/1461] Search by person

---
 .../controllers/components/stv/Students.php   | 79 ++++++++++++++++++-
 public/js/apps/Studentenverwaltung.js         |  3 +-
 2 files changed, 80 insertions(+), 2 deletions(-)

diff --git a/application/controllers/components/stv/Students.php b/application/controllers/components/stv/Students.php
index 3d22075cc..9bd2df73f 100644
--- a/application/controllers/components/stv/Students.php
+++ b/application/controllers/components/stv/Students.php
@@ -38,7 +38,8 @@ class Students extends FHC_Controller
 	 * /(studiengang_kz)/(org_form)/(semester)/(verband)/(gruppe)
 	 * 														=> getStudents
 	 * /uid/(student_uid)									=> getStudent
-	 * /prestudent/(prestudent_id)                          => getPrestudent
+	 * /prestudent/(prestudent_id)							=> getPrestudent
+	 * /person/(person_id)									=> getPerson
 	 *
 	 * @param string		$method
 	 * @param array			$params				(optional)
@@ -75,6 +76,9 @@ class Students extends FHC_Controller
 		if ($method == 'prestudent' && $count == 1)
 			return $this->getPrestudent($params[0]);
 
+		if ($method == 'person' && $count == 1)
+			return $this->getPerson($params[0]);
+
 		if (is_numeric($params[0])) {
 			$sem = $params[0];
 			if ($count == 3 && $params[1] == 'grp') {
@@ -577,4 +581,77 @@ class Students extends FHC_Controller
 			$this->outputJson(getData($result) ?: []);
 		}
 	}
+
+	/**
+	 * @param integer		$person_id
+	 *
+	 * @return void
+	 */
+	protected function getPerson($person_id)
+	{
+		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
+
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+		$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
+		$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id');
+		$this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid');
+		$this->PrestudentModel->addJoin(
+			'public.tbl_studentlehrverband v',
+			'v.student_uid=s.student_uid AND v.studiensemester_kurzbz=' . $this->PrestudentModel->escape($studiensemester_kurzbz),
+			'LEFT'
+		);
+
+		$this->PrestudentModel->addSelect('p.person_id');
+		$this->PrestudentModel->addSelect('s.prestudent_id');
+		$this->PrestudentModel->addSelect('b.uid');
+		$this->PrestudentModel->addSelect('titelpre');
+		$this->PrestudentModel->addSelect('titelpost');
+		$this->PrestudentModel->addSelect('vorname');
+		$this->PrestudentModel->addSelect('wahlname');
+		$this->PrestudentModel->addSelect('vornamen');
+		$this->PrestudentModel->addSelect('geschlecht');
+		$this->PrestudentModel->addSelect('nachname');
+		$this->PrestudentModel->addSelect('gebdatum');
+		$this->PrestudentModel->addSelect('tbl_prestudent.anmerkung');
+		$this->PrestudentModel->addSelect('ersatzkennzeichen');
+		$this->PrestudentModel->addSelect('svnr');
+		$this->PrestudentModel->addSelect('s.matrikelnr');
+		$this->PrestudentModel->addSelect('p.anmerkung AS anmerkungen');
+		$this->PrestudentModel->addSelect('v.semester');
+		$this->PrestudentModel->addSelect('v.verband');
+		$this->PrestudentModel->addSelect('v.gruppe');
+		$this->PrestudentModel->addSelect('tbl_prestudent.studiengang_kz');
+		$this->PrestudentModel->addSelect('aufmerksamdurch_kurzbz');
+		$this->PrestudentModel->addSelect('mentor');
+		$this->PrestudentModel->addSelect('b.aktiv AS bnaktiv');
+		$this->PrestudentModel->addSelect(
+			"(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung LIMIT 1) AS email_privat",
+			false
+		);
+		$this->PrestudentModel->addSelect(
+			"(SELECT rt_gesamtpunkte AS punkte FROM public.tbl_prestudent WHERE prestudent_id=s.prestudent_id) AS punkte",
+			false
+		);
+		$this->PrestudentModel->addSelect('tbl_prestudent.dual');
+		$this->PrestudentModel->addSelect('tbl_prestudent.reihungstest_id');
+		$this->PrestudentModel->addSelect('tbl_prestudent.anmeldungreihungstest');
+		$this->PrestudentModel->addSelect('p.matr_nr');
+		$this->PrestudentModel->addSelect('tbl_prestudent.gsstudientyp_kurzbz');
+		$this->PrestudentModel->addSelect('tbl_prestudent.aufnahmegruppe_kurzbz');
+		$this->PrestudentModel->addSelect('tbl_prestudent.priorisierung');
+		$this->PrestudentModel->addSelect('p.zugangscode');
+		$this->PrestudentModel->addSelect('p.bpk');
+
+		$result = $this->PrestudentModel->loadWhere([
+			'p.person_id' => $person_id
+		]);
+		
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->outputJson(getError($result));
+		} else {
+			$this->outputJson(getData($result) ?: []);
+		}
+	}
 }
diff --git a/public/js/apps/Studentenverwaltung.js b/public/js/apps/Studentenverwaltung.js
index dc3e7522b..a282a45e3 100644
--- a/public/js/apps/Studentenverwaltung.js
+++ b/public/js/apps/Studentenverwaltung.js
@@ -34,7 +34,8 @@ import(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_route
 			{ path: `/${ciPath}/studentenverwaltung`, component: FhcStudentenverwaltung },
 			{ path: `/${ciPath}/studentenverwaltung/prestudent/:prestudent_id`, component: FhcStudentenverwaltung },
 			{ path: `/${ciPath}/studentenverwaltung/prestudent/:prestudent_id/:tab`, component: FhcStudentenverwaltung },
-			{ path: `/${ciPath}/studentenverwaltung/student/:id`, component: FhcStudentenverwaltung }
+			{ path: `/${ciPath}/studentenverwaltung/student/:id`, component: FhcStudentenverwaltung },
+			{ path: `/${ciPath}/studentenverwaltung/person/:person_id`, component: FhcStudentenverwaltung }
 		]
 	});
 

From 054ef5d00fd9d9033e9a30d599d76df63f182f3b Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 12 Apr 2024 10:29:06 +0200
Subject: [PATCH 0581/1461] Bugfix Api: clearValidation

---
 public/js/plugin/FhcApi.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/public/js/plugin/FhcApi.js b/public/js/plugin/FhcApi.js
index bacd27d43..32440ea80 100644
--- a/public/js/plugin/FhcApi.js
+++ b/public/js/plugin/FhcApi.js
@@ -156,7 +156,6 @@ export default {
 					const $fhcAlert = app.config.globalProperties.$fhcAlert;
 
 					if (form) {
-						form.clearValidation();
 						form.setFeedback(false, error.messages);
 						return false;
 					}

From 10a6d374f17ed76f84bb0da891fae37ace1aba29 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 12 Apr 2024 10:29:57 +0200
Subject: [PATCH 0582/1461] FHC-Core-SAP Phrases

---
 system/phrasesupdate.php | 41 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 3f7952ea1..abeb972a5 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -26532,6 +26532,47 @@ array(
 			)
 		)
 	),
+	// FHC-Core-SAP
+	array(
+		'app' => 'core',
+		'category' => 'sap',
+		'phrase' => 'error_noBuchung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Die Buchungsnr #{buchungsnr} is ungültig',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The Buchungnr #{buchungsnr} is not valid',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'sap',
+		'phrase' => 'error_buchungLocked',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Die Buchung wurde bereits übertragen und darf nicht geändert werden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The Buchung was already submitted and can not be changed',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 );
 
 

From 44d60e5f5230680a0499604b6a21a96ef2152863 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 12 Apr 2024 10:31:22 +0200
Subject: [PATCH 0583/1461] Validation Stg Permissions

---
 application/helpers/hlp_common_helper.php     | 42 ++++++++++++++++++-
 .../language/english/form_validation_lang.php |  5 ++-
 2 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/application/helpers/hlp_common_helper.php b/application/helpers/hlp_common_helper.php
index 688fae965..40aed007c 100644
--- a/application/helpers/hlp_common_helper.php
+++ b/application/helpers/hlp_common_helper.php
@@ -449,14 +449,52 @@ function is_valid_date($dateString)
 function has_write_permissions($value, $permissions = '')
 {
 	if (!$permissions)
-		$permissions = $value; // TODO(chris): ??
+		$permissions = $value;
 	$permissions = explode(',', $permissions);
 
 	$CI =& get_instance();
+	$CI->load->library('AuthLib');
 	$CI->load->library('PermissionLib');
+
 	return $CI->permissionlib->hasAtLeastOne(
 		$permissions,
 		'sometable',
-		'w'
+		PermissionLib::WRITE_RIGHT
 	);
 }
+
+/**
+ * check if has permissions for a studiengang_kz
+ */
+function has_permissions_for_stg($studiengang_kz, $permissions = '')
+{
+	if (!$permissions)
+		return false;
+	$permissions = explode(',', $permissions);
+
+	$CI =& get_instance();
+	$CI->load->library('AuthLib');
+	$CI->load->library('PermissionLib');
+
+	foreach ($permissions as $perm) {
+		if (strpos($perm, PermissionLib::PERMISSION_SEPARATOR) === false) {
+			$CI->addError(
+				'The given permission does not use the correct format',
+				FHCAPI_Controller::ERROR_TYPE_GENERAL
+			);
+			return false;
+		}
+
+		list($perm, $accesstype) = explode(PermissionLib::PERMISSION_SEPARATOR, $perm);
+		$at = '';
+		if (strpos($accesstype, PermissionLib::READ_RIGHT) !== false)
+			$at = PermissionLib::SELECT_RIGHT; // S
+		if (strpos($accesstype, PermissionLib::WRITE_RIGHT) !== false)
+			$at .= PermissionLib::REPLACE_RIGHT.PermissionLib::DELETE_RIGHT; // UID
+
+		if ($CI->permissionlib->isBerechtigt($perm, $at, $studiengang_kz))
+			return true;
+	}
+
+	return false;
+}
diff --git a/application/language/english/form_validation_lang.php b/application/language/english/form_validation_lang.php
index 9e942f8e5..b8918a721 100644
--- a/application/language/english/form_validation_lang.php
+++ b/application/language/english/form_validation_lang.php
@@ -36,7 +36,8 @@
  * @since	Version 1.0.0
  * @filesource
  */
-defined('BASEPATH') OR exit('No direct script access allowed');
+if (!defined('BASEPATH')) exit('No direct script access allowed');
 
 $lang['form_validation_has_write_permissions']	= 'You have no rights to edit {field} field.';
-$lang['form_validation_is_valid_date']	= 'The date format is invalid or out of range.';
\ No newline at end of file
+$lang['form_validation_is_valid_date']	= 'The date format is invalid or out of range.';
+$lang['form_validation_has_permissions_for_stg']	= 'You have no rights for stg {field}.';

From e32bf2df57e40b6daa5bb27d0483b405fbdfa8c5 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 12 Apr 2024 10:33:40 +0200
Subject: [PATCH 0584/1461] BsModal: send event objects on emit

---
 public/js/components/Bootstrap/Modal.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Bootstrap/Modal.js b/public/js/components/Bootstrap/Modal.js
index 453cc0b48..831a8929c 100644
--- a/public/js/components/Bootstrap/Modal.js
+++ b/public/js/components/Bootstrap/Modal.js
@@ -93,7 +93,7 @@ export default {
 			document.body.appendChild(wrapper);
 		});
 	},
-	template: `<div ref="modal" class="bootstrap-modal modal" tabindex="-1" @[\`hide.bs.modal\`]="$emit('hideBsModal')" @[\`hidden.bs.modal\`]="$emit('hiddenBsModal')" @[\`hidePrevented.bs.modal\`]="$emit('hidePreventedBsModal')" @[\`show.bs.modal\`]="$emit('showBsModal')" @[\`shown.bs.modal\`]="$emit('shownBsModal')">
+	template: `<div ref="modal" class="bootstrap-modal modal" tabindex="-1" @[\`hide.bs.modal\`]="$emit('hideBsModal', $event)" @[\`hidden.bs.modal\`]="$emit('hiddenBsModal', $event)" @[\`hidePrevented.bs.modal\`]="$emit('hidePreventedBsModal', $event)" @[\`show.bs.modal\`]="$emit('showBsModal', $event)" @[\`shown.bs.modal\`]="$emit('shownBsModal', $event)">
 		<div class="modal-dialog" :class="dialogClass">
 			<div class="modal-content">
 				<div v-if="$slots.title" class="modal-header">

From 8705341563c55ca4eafc0f0a7641b473cae510bb Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 12 Apr 2024 10:35:31 +0200
Subject: [PATCH 0585/1461] FormInput: remove input and update:modelValue event
 from $attrs to prevent double emits

---
 public/js/components/Form/Input.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/public/js/components/Form/Input.js b/public/js/components/Form/Input.js
index e36658160..239feaa5a 100644
--- a/public/js/components/Form/Input.js
+++ b/public/js/components/Form/Input.js
@@ -25,7 +25,10 @@ export default {
 		type: String,
 		name: String,
 		containerClass: [String, Array, Object],
-		label: String
+		label: String,
+		// NOTE(chris): remove these from $attrs array to prevent doubled event listeners
+		onInput: [Array, Function],
+		'onUpdate:modelValue': [Array, Function]
 	},
 	data() {
 		return {

From efebaeeb27a3d91f35c856e6654c2460b41a291f Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 12 Apr 2024 10:38:06 +0200
Subject: [PATCH 0586/1461] Edit

---
 .../controllers/api/frontend/v1/stv/Konto.php |  94 +++++++-
 .../controllers/api/frontend/v1/stv/Lists.php |  72 ++++++
 .../controllers/components/stv/Config.php     |  21 +-
 application/models/crm/Konto_model.php        |  29 ++-
 .../js/components/Stv/Studentenverwaltung.js  |  76 +++---
 .../Stv/Studentenverwaltung/Details/Konto.js  | 225 +++++++++++++-----
 .../Studentenverwaltung/Details/Konto/Edit.js | 163 +++++++++++++
 .../Stv/Studentenverwaltung/List/New.js       |   2 +-
 8 files changed, 572 insertions(+), 110 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/stv/Lists.php
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Konto/Edit.js

diff --git a/application/controllers/api/frontend/v1/stv/Konto.php b/application/controllers/api/frontend/v1/stv/Konto.php
index 7c242b2e2..782f28d00 100644
--- a/application/controllers/api/frontend/v1/stv/Konto.php
+++ b/application/controllers/api/frontend/v1/stv/Konto.php
@@ -16,7 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-if (! defined('BASEPATH')) exit('No direct script access allowed');
+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
@@ -33,7 +35,9 @@ class Konto extends FHCAPI_Controller
 	{
 		// TODO(chris): permissions
 		parent::__construct([
-			'get' => 'student/stammdaten:r'
+			'get' => 'student/stammdaten:r',
+			'getBuchungstypen' => 'student/stammdaten:r', // alle?
+			'update' => ['admin:w', 'assistenz:w']
 		]);
 
 		// Load models
@@ -51,15 +55,20 @@ class Konto extends FHCAPI_Controller
 	/**
 	 * Get details for a prestudent
 	 *
-	 * @param string			$type
-	 * @param string			(optional) $studiengang_kz
 	 * @return void
 	 */
-	public function get($type, $studiengang_kz = '')
+	public function get()
 	{
-		// TODO(chris): validation
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('person_id', 'Person ID', 'required');
+
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
 
 		$person_id = $this->input->post('person_id');
+		$studiengang_kz = $this->input->post('studiengang_kz');
 
 		if ($this->input->post('only_open')) {
 			$result = $this->KontoModel->getOffeneBuchungen($person_id, $studiengang_kz);
@@ -95,4 +104,77 @@ class Konto extends FHCAPI_Controller
 
 		$this->terminateWithSuccess(array_values($data));
 	}
+
+	/**
+	 * Get list of Buchungstypen
+	 *
+	 * @return void
+	 */
+	public function getBuchungstypen()
+	{
+		$this->load->model('crm/Buchungstyp_model', 'BuchungstypModel');
+
+		$result = $this->BuchungstypModel->load();
+
+		#$data = $this->getDataOrTerminateWithError($result);
+		if (isError($result))
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		$data = $result->retval;
+
+		$this->terminateWithSuccess($data);
+	}
+
+	/**
+	 * Save Buchung
+	 *
+	 * @return void
+	 */
+	public function update()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('buchungsnr', 'Buchungsnr', 'required');
+		$this->form_validation->set_rules('studiengang_kz', 'Studiengang', 'required|has_permissions_for_stg[admin:rw,assistenz:rw]');
+		$this->form_validation->set_rules('buchungsdatum', 'Buchungsdatum', 'is_valid_date');
+		Events::trigger('konto_update_validation', $this->form_validation);
+
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$id = $this->input->post('buchungsnr');
+		$allowed = [
+			'betrag',
+			'buchungsdatum',
+			'buchungstext',
+			'mahnspanne',
+			'buchungstyp_kurzbz',
+			'studiensemester_kurzbz',
+			'studiengang_kz',
+			'credit_points',
+			'anmerkung'
+		];
+		$data = [
+			'updateamum' => date('c'),
+			'updatevon' => getAuthUID()
+		];
+		foreach ($allowed as $field)
+			if ($this->input->post($field) !== null)
+				$data[$field] = $this->input->post($field);
+
+		$result = $this->KontoModel->update($id, $data);
+
+		#$this->getDataOrTerminateWithError($result);
+		if (isError($result))
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+
+		$result = $this->KontoModel->withAdditionalInfo()->load($id);
+		
+		#$result = $this->getDataOrTerminateWithError($result);
+		if (isError($result))
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		$result = $result->retval;
+
+		$this->terminateWithSuccess($result);
+	}
 }
diff --git a/application/controllers/api/frontend/v1/stv/Lists.php b/application/controllers/api/frontend/v1/stv/Lists.php
new file mode 100644
index 000000000..2a8335b7e
--- /dev/null
+++ b/application/controllers/api/frontend/v1/stv/Lists.php
@@ -0,0 +1,72 @@
+<?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');
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the back-end
+ * Provides data to the ajax get calls about generally used lists
+ * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
+ */
+class Lists extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		// TODO(chris): permissions
+		parent::__construct([
+			'getStudiensemester' => ['admin:r', 'assistenz:r', 'student/stammdaten:r'], // alle?
+			'getStgs' => ['admin:r', 'assistenz:r', 'student/stammdaten:r'] // alle?
+		]);
+	}
+
+	public function getStudiensemester()
+	{
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
+		$this->StudiensemesterModel->addOrder('ende');
+
+		$result = $this->StudiensemesterModel->load();
+
+		#$data = $this->getDataOrTerminateWithError($result);
+		if (isError($result))
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		$data = $result->retval;
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getStgs()
+	{
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+
+		$this->StudiengangModel->addSelect('*');
+		$this->StudiengangModel->addSelect('UPPER(typ || kurzbz) AS kuerzel');
+
+		$this->StudiengangModel->addOrder('typ');
+		$this->StudiengangModel->addOrder('kurzbz');
+
+		$result = $this->StudiengangModel->load();
+
+		#$data = $this->getDataOrTerminateWithError($result);
+		if (isError($result))
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		$data = $result->retval;
+
+		$this->terminateWithSuccess($data);
+	}
+}
diff --git a/application/controllers/components/stv/Config.php b/application/controllers/components/stv/Config.php
index e9ed7ec44..78089d519 100644
--- a/application/controllers/components/stv/Config.php
+++ b/application/controllers/components/stv/Config.php
@@ -6,10 +6,15 @@ use CI3_Events as Events;
 
 class Config extends FHC_Controller
 {
+
+
 	public function __construct()
 	{
 		// TODO(chris): access!
 		parent::__construct();
+
+		$this->load->library('AuthLib');
+		$this->load->library('PermissionLib');
 	}
 
 	public function student()
@@ -39,7 +44,13 @@ class Config extends FHC_Controller
 		$result['konto'] = [
 			'title' => 'Konto',
 			'component' => './Stv/Studentenverwaltung/Details/Konto.js',
-			'config' => ['ZAHLUNGSBESTAETIGUNG_ANZEIGEN' => (defined('ZAHLUNGSBESTAETIGUNG_ANZEIGEN') && ZAHLUNGSBESTAETIGUNG_ANZEIGEN)]
+			'config' => [
+				'showZahlungsbestaetigung' => (defined('ZAHLUNGSBESTAETIGUNG_ANZEIGEN') && ZAHLUNGSBESTAETIGUNG_ANZEIGEN),
+				'showBuchungsnr' => $this->permissionlib->isBerechtigt('admin'),
+				'showMahnspanne' => (!defined('FAS_KONTO_SHOW_MAHNSPANNE') || FAS_KONTO_SHOW_MAHNSPANNE===true),
+				'showCreditpoints' => (defined('FAS_KONTO_SHOW_CREDIT_POINTS') && FAS_KONTO_SHOW_CREDIT_POINTS == 'true'),
+				'additionalCols' => []
+			]
 		];
 		$result['betriebsmittel'] = [
 			'title' => 'Betriebsmittel',
@@ -64,7 +75,13 @@ class Config extends FHC_Controller
 		$result['konto'] = [
 			'title' => 'Konto',
 			'component' => './Stv/Studentenverwaltung/Details/Konto.js',
-			'config' => ['ZAHLUNGSBESTAETIGUNG_ANZEIGEN' => (defined('ZAHLUNGSBESTAETIGUNG_ANZEIGEN') && ZAHLUNGSBESTAETIGUNG_ANZEIGEN)]
+			'config' => [
+				'showZahlungsbestaetigung' => (defined('ZAHLUNGSBESTAETIGUNG_ANZEIGEN') && ZAHLUNGSBESTAETIGUNG_ANZEIGEN),
+				'showBuchungsnr' => $this->permissionlib->isBerechtigt('admin'),
+				'showMahnspanne' => (!defined('FAS_KONTO_SHOW_MAHNSPANNE') || FAS_KONTO_SHOW_MAHNSPANNE===true),
+				'showCreditpoints' => (defined('FAS_KONTO_SHOW_CREDIT_POINTS') && FAS_KONTO_SHOW_CREDIT_POINTS == 'true'),
+				'additionalCols' => []
+			]
 		];
 
 		Events::trigger('stv_conf_students', function & () use (&$result) {
diff --git a/application/models/crm/Konto_model.php b/application/models/crm/Konto_model.php
index 00a621d0e..85ac9234c 100644
--- a/application/models/crm/Konto_model.php
+++ b/application/models/crm/Konto_model.php
@@ -1,4 +1,7 @@
 <?php
+
+use CI3_Events as Events;
+
 class Konto_model extends DB_Model
 {
 
@@ -14,14 +17,11 @@ class Konto_model extends DB_Model
 
 
 	/**
-	 * Get all accounting entries for a person optionally filtered by Studiengang
+	 * Adds additional fields to the Query
 	 *
-	 * @param integer|array		$person_id
-	 * @param string			(optional) $studiengang_kz
-	 *
-	 * @return stdClass
+	 * @return Konto_model
 	 */
-	public function getAlleBuchungen($person_id, $studiengang_kz = '')
+	public function withAdditionalInfo()
 	{
 		$this->addSelect($this->dbTable . '.*');
 		$this->addSelect('UPPER(typ::varchar(1) || kurzbz) AS kuerzel');
@@ -35,6 +35,23 @@ class Konto_model extends DB_Model
 		$this->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
 		$this->addJoin('public.tbl_person person', 'person_id', 'LEFT');
 
+		Events::trigger('konto_query');
+
+		return $this;
+	}
+
+	/**
+	 * Get all accounting entries for a person optionally filtered by Studiengang
+	 *
+	 * @param integer|array		$person_id
+	 * @param string			(optional) $studiengang_kz
+	 *
+	 * @return stdClass
+	 */
+	public function getAlleBuchungen($person_id, $studiengang_kz = '')
+	{
+		$this->withAdditionalInfo();
+
 		$this->addOrder('buchungsdatum');
 
 		if (is_array($person_id))
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 6279f57b5..42e3cd5dd 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import FhcSearchbar from "../searchbar/searchbar.js";
+import CoreSearchbar from "../searchbar/searchbar.js";
 import VerticalSplit from "../verticalsplit/verticalsplit.js";
 import StvVerband from "./Studentenverwaltung/Verband.js";
 import StvList from "./Studentenverwaltung/List.js";
@@ -26,7 +26,7 @@ import {CoreRESTClient} from '../../RESTClient.js';
 
 export default {
 	components: {
-		FhcSearchbar,
+		CoreSearchbar,
 		VerticalSplit,
 		StvVerband,
 		StvList,
@@ -142,11 +142,11 @@ export default {
 				this.lists.ausbildungen = result;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
-		CoreRESTClient
-			.get('components/stv/Lists/getStgs')
-			.then(result => CoreRESTClient.getData(result.data) || [])
+		this.$fhcApi
+			.get('api/frontend/v1/stv/lists/getStgs')
 			.then(result => {
-				this.lists.stgs = result;
+				this.lists.stgs = result.data;
+				this.lists.active_stgs = this.lists.stgs.filter(stg => stg.aktiv);
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 		CoreRESTClient
@@ -156,40 +156,56 @@ export default {
 				this.lists.orgforms = result;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
+		this.$fhcApi
+			.get('api/frontend/v1/stv/konto/getBuchungstypen')
+			.then(result => {
+				this.lists.buchungstypen = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+		this.$fhcApi
+			.get('api/frontend/v1/stv/lists/getStudiensemester')
+			.then(result => {
+				this.lists.studiensemester = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
 	},
 	mounted() {
 		if (this.$route.params.id) {
 			this.$refs.stvList.updateUrl('components/stv/students/uid/' + this.$route.params.id, true);
 		} else if (this.$route.params.prestudent_id) {
 			this.$refs.stvList.updateUrl('components/stv/students/prestudent/' + this.$route.params.prestudent_id, true);
+		} else if (this.$route.params.person_id) {
+			this.$refs.stvList.updateUrl('components/stv/students/person/' + this.$route.params.person_id, true);
 		}
 
 	},
 	template: `
-	<header class="navbar navbar-expand-lg navbar-dark bg-dark flex-md-nowrap p-0 shadow">
-		<a class="navbar-brand col-md-4 col-lg-3 col-xl-2 me-0 px-3" :href="stvRoot">FHC 4.0</a>
-		<button class="navbar-toggler d-md-none m-1 collapsed" type="button" data-bs-toggle="offcanvas" data-bs-target="#sidebarMenu" aria-controls="sidebarMenu" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button>
-		<fhc-searchbar :searchoptions="searchbaroptions" :searchfunction="searchfunction" class="searchbar w-100"></fhc-searchbar>
-	</header>
-	<div class="container-fluid overflow-hidden">
-		<div class="row h-100">
-			<nav id="sidebarMenu" class="bg-light offcanvas offcanvas-start col-md p-md-0 h-100">
-				<div class="offcanvas-header justify-content-end px-1 d-md-none">
-					<button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" aria-label="Close"></button>
-				</div>
-				<stv-verband @select-verband="onSelectVerband" class="col" style="height:0%"></stv-verband>
-				<stv-studiensemester :default="defaultSemester" @changed="studiensemesterChanged"></stv-studiensemester>
-			</nav>
-			<main class="col-md-8 ms-sm-auto col-lg-9 col-xl-10">
-				<vertical-split>
-					<template #top>
-						<stv-list ref="stvList" v-model:selected="selected" :studiengang-kz="studiengangKz" :studiensemester-kurzbz="studiensemesterKurzbz"></stv-list>
-					</template>
-					<template #bottom>
-						<stv-details ref="details" :students="selected"></stv-details>
-					</template>
-				</vertical-split>
-			</main>
+	<div class="stv">
+		<header class="navbar navbar-expand-lg navbar-dark bg-dark flex-md-nowrap p-0 shadow">
+			<a class="navbar-brand col-md-4 col-lg-3 col-xl-2 me-0 px-3" :href="stvRoot">FHC 4.0</a>
+			<button class="navbar-toggler d-md-none m-1 collapsed" type="button" data-bs-toggle="offcanvas" data-bs-target="#sidebarMenu" aria-controls="sidebarMenu" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button>
+			<core-searchbar :searchoptions="searchbaroptions" :searchfunction="searchfunction" class="searchbar w-100"></core-searchbar>
+		</header>
+		<div class="container-fluid overflow-hidden">
+			<div class="row h-100">
+				<nav id="sidebarMenu" class="bg-light offcanvas offcanvas-start col-md p-md-0 h-100">
+					<div class="offcanvas-header justify-content-end px-1 d-md-none">
+						<button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" aria-label="Close"></button>
+					</div>
+					<stv-verband @select-verband="onSelectVerband" class="col" style="height:0%"></stv-verband>
+					<stv-studiensemester :default="defaultSemester" @changed="studiensemesterChanged"></stv-studiensemester>
+				</nav>
+				<main class="col-md-8 ms-sm-auto col-lg-9 col-xl-10">
+					<vertical-split>
+						<template #top>
+							<stv-list ref="stvList" v-model:selected="selected" :studiengang-kz="studiengangKz" :studiensemester-kurzbz="studiensemesterKurzbz"></stv-list>
+						</template>
+						<template #bottom>
+							<stv-details ref="details" :students="selected"></stv-details>
+						</template>
+					</vertical-split>
+				</main>
+			</div>
 		</div>
 	</div>`
 };
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Konto.js b/public/js/components/Stv/Studentenverwaltung/Details/Konto.js
index 99bb85c87..b6b71f50b 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Konto.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Konto.js
@@ -1,12 +1,15 @@
 import {CoreFilterCmpt} from "../../../filter/Filter.js";
+import FormInput from "../../../Form/Input.js";
+import KontoEdit from "./Konto/Edit.js";
 
-// TODO(chris): filter
 // TODO(chris): multi pers
 // TODO(chris): new header(multi pers), edit/row, gegenb.(date) multi, löschen multi, best. multi(recht)
 
 export default {
 	components: {
-		CoreFilterCmpt
+		CoreFilterCmpt,
+		FormInput,
+		KontoEdit
 	},
 	props: {
 		modelValue: Object,
@@ -17,7 +20,8 @@ export default {
 	},
 	data() {
 		return {
-			filter: 'alle'
+			filter: false,
+			studiengang_kz: false
 		};
 	},
 	computed: {
@@ -29,13 +33,133 @@ export default {
 				return '';
 			return values[0];
 		},
+		studiengang_kz_intern: {
+			get() {
+				if (this.stg_kz)
+					return this.studiengang_kz;
+				else
+					return false;
+			},
+			set(value) {
+				this.studiengang_kz = value;
+			}
+		},
+		tabulatorColumns() {
+			let columns = [];
+			
+			if (Array.isArray(this.modelValue)) {
+				columns.push({
+					field: "person_id",
+					title: "Person ID"
+				});
+				columns.push({
+					field: "anrede",
+					title: "Anrede",
+					visible: false
+				});
+				columns.push({
+					field: "titelpost",
+					title: "Titelpost",
+					visible: false
+				});
+				columns.push({
+					field: "titelpre",
+					title: "Titelpre",
+					visible: false
+				});
+				columns.push({
+					field: "vorname",
+					title: "Vorname"
+				});
+				columns.push({
+					field: "vornamen",
+					title: "Vornamen",
+					visible: false
+				});
+				columns.push({
+					field: "nachname",
+					title: "Nachname"
+				});
+			}
+
+			columns = [...columns, ...[
+				{
+					field: "buchungsdatum",
+					title: "Buchungsdatum"
+				},
+				{
+					field: "buchungstext",
+					title: "Buchungstext"
+				},
+				{
+					field: "betrag",
+					title: "Betrag"
+				},
+				{
+					field: "studiensemester_kurzbz",
+					title: "StSem"
+				},
+				{
+					field: "buchungstyp_kurzbz",
+					title: "Typ",
+					visible: false
+				},
+				{
+					field: "buchungsnr",
+					title: "Buchungs Nr",
+					visible: false
+				},
+				{
+					field: "insertvon",
+					title: "Angelegt von",
+					visible: false
+				},
+				{
+					field: "insertamum",
+					title: "Anlagedatum",
+					visible: false
+				},
+				{
+					field: "kuerzel",
+					title: "Studiengang",
+					visible: false
+				},
+				{
+					field: "anmerkung",
+					title: "Anmerkung"
+				}
+			]];
+
+			columns = [...columns, ...this.config.additionalCols];
+
+			columns.push({
+				title: 'Actions',
+				formatter: cell => {
+					let container = document.createElement('div');
+					container.className = "d-flex gap-2";
+
+					let button = document.createElement('button');
+					button.className = 'btn btn-outline-secondary';
+					button.innerHTML = '<i class="fa fa-edit"></i>';
+					button.addEventListener('click', () =>
+						this.$refs.edit.open(cell.getData())
+					);
+					container.append(button);
+
+					return container;
+				},
+				frozen: true
+			});
+			return columns;
+		},
 		tabulatorOptions() {
 			return {
-				ajaxURL: 'api/frontend/v1/stv/konto/get/alle',
+				ajaxURL: 'api/frontend/v1/stv/konto/get',
 				ajaxParams: () => {
 					const params = {
 						person_id: this.modelValue.person_id || this.modelValue.map(e => e.person_id),
-						only_open: (this.filter == 'offene')
+						only_open: this.filter,
+						studiengang_kz: this.studiengang_kz_intern ? this.stg_kz : ''
 					};
 					return params;
 				},
@@ -44,54 +168,8 @@ export default {
 				},
 				ajaxResponse: (url, params, response) => response.data,
 				dataTree: true,
-				columns: [
-					{
-						field: "buchungsdatum",
-						title: "Buchungsdatum"
-					},
-					{
-						field: "buchungstext",
-						title: "Buchungstext"
-					},
-					{
-						field: "betrag",
-						title: "Betrag"
-					},
-					{
-						field: "studiensemester_kurzbz",
-						title: "StSem"
-					},
-					{
-						field: "buchungstyp_kurzbz",
-						title: "Typ",
-						visible: false
-					},
-					{
-						field: "buchungsnr",
-						title: "buchungs_nr",
-						visible: false
-					},
-					{
-						field: "insertvon",
-						title: "Angelegt von",
-						visible: false
-					},
-					{
-						field: "insertamum",
-						title: "Anlagedatum",
-						visible: false
-					},
-					{
-						field: "kuerzel",
-						title: "Studiengang",
-						visible: false
-					},
-					{
-						field: "anmerkung",
-						title: "Anmerkung"
-					}
-				],
-				index: 'buchungs_nr',
+				columns: this.tabulatorColumns,
+				index: 'buchungsnr',
 			};
 		}
 	},
@@ -103,23 +181,39 @@ export default {
 	methods: {
 		reload() {
 			this.$refs.table.reloadTable();
+		},
+		updateData(data) {
+			if (!data)
+				return this.reload();
+			this.$refs.table.tabulator.updateData(data);
 		}
 	},
+	created() {
+		// TODO(chris): persist filter + studiengang_kz
+	},
 	template: `
 	<div class="stv-details-konto h-100 d-flex flex-column">
-	{{config}}
-		<div class="row">
-			<div class="col-lg-2">
-				<select class="form-select" v-model="filter" @input="() => $nextTick($refs.table.reloadTable)">
-					<option value="alle">Alle</option>
-					<option value="offene">Offene</option>
-				</select>
+		<div class="row justify-content-end">
+			<div class="col-lg-3">
+				<form-input
+					container-class="form-switch"
+					type="checkbox"
+					label="Nur offene anzeigen"
+					v-model="filter"
+					@update:model-value="() => $nextTick($refs.table.reloadTable)"
+					>
+				</form-input>
 			</div>
-			<div class="col-lg-2">
-				<select class="form-select" v-model="studiengang_kz" @input="() => $nextTick($refs.table.reloadTable)">
-					<option value="">Alle</option>
-					<option :value="stg_kz">Aktuelle</option>
-				</select>
+			<div class="col-lg-3">
+				<form-input
+					container-class="form-switch"
+					type="checkbox"
+					label="Nur aktuellen Stg anzeigen"
+					v-model="studiengang_kz_intern"
+					:disabled="!stg_kz"
+					@update:model-value="() => $nextTick($refs.table.reloadTable)"
+					>
+				</form-input>
 			</div>
 		</div>
 		<core-filter-cmpt
@@ -129,5 +223,6 @@ export default {
 			:tabulator-options="tabulatorOptions"
 			>
 		</core-filter-cmpt>
+		<konto-edit ref="edit" :config="config" @saved="updateData"></konto-edit>
 	</div>`
 };
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Konto/Edit.js b/public/js/components/Stv/Studentenverwaltung/Details/Konto/Edit.js
new file mode 100644
index 000000000..9e65df428
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Konto/Edit.js
@@ -0,0 +1,163 @@
+import BsModal from "../../../../Bootstrap/Modal.js";
+import CoreForm from "../../../../Form/Form.js";
+import FormValidation from "../../../../Form/Validation.js";
+import FormInput from "../../../../Form/Input.js";
+
+// TODO(chris): Phrasen
+
+export default {
+	components: {
+		BsModal,
+		CoreForm,
+		FormValidation,
+		FormInput
+	},
+	inject: {
+		lists: {
+			from: 'lists'
+		}
+	},
+	props: {
+		config: {
+			type: Object,
+			default: {}
+		}
+	},
+	data() {
+		return {
+			loading: false,
+			data: {}
+		};
+	},
+	methods: {
+		save() {
+			this.$refs.form.clearValidation();
+			this.loading = true;
+
+			this.$refs.form
+				.post('api/frontend/v1/stv/konto/update', this.data)
+				.then(result => {
+					this.$emit('saved', result.data);
+					this.loading = false;
+					this.$refs.modal.hide();
+					this.$fhcAlert.alertSuccess('Daten wurden gespeichert');
+				})
+				.catch(error => {console.log(error); // TODO(chris): check if working with current fhcApi
+					this.$fhcAlert.handleSystemError(error);
+					this.loading = false;
+				});
+		},
+		open(data) {
+			this.data = {...data};
+			this.$refs.modal.show();
+		},
+		preventCloseOnLoading(ev) {
+			if (this.loading)
+				ev.returnValue = false;
+		}
+	},
+	template: `
+	<core-form ref="form" class="stv-details-konto-edit" @submit.prevent="save">
+		<bs-modal ref="modal" @hide-bs-modal="preventCloseOnLoading">
+			<form-validation></form-validation>
+
+			<fieldset :disabled="loading">
+				<form-input
+					v-if="config.showBuchungsnr"
+					v-model="data.buchungsnr"
+					name="buchungsnr"
+					label="Buchungsnr"
+					disabled
+					>
+				</form-input>
+				<form-input
+					v-model="data.betrag"
+					name="betrag"
+					label="Betrag"
+					>
+				</form-input>
+				<form-input
+					type="DatePicker"
+					v-model="data.buchungsdatum"
+					name="buchungsdatum"
+					label="Buchungsdatum"
+					>
+				</form-input>
+				<form-input
+					v-model="data.buchungstext"
+					name="buchungstext"
+					label="Buchungstext"
+					>
+				</form-input>
+				<form-input
+					v-if="config.showMahnspanne"
+					v-model="data.mahnspanne"
+					name="mahnspanne"
+					label="Mahnspanne"
+					>
+				</form-input>
+				<form-input
+					type="select"
+					v-model="data.buchungstyp_kurzbz"
+					name="buchungstyp_kurzbz"
+					label="Typ"
+					>
+					<option v-for="typ in lists.buchungstypen" :key="typ.buchungstyp_kurzbz" :value="typ.buchungstyp_kurzbz" :class="typ.aktiv ? '' : 'text-decoration-line-through text-muted'">
+						{{ typ.beschreibung }}
+					</option>
+				</form-input>
+				<form-input
+					type="select"
+					v-model="data.studiensemester_kurzbz"
+					name="studiensemester_kurzbz"
+					label="Studiensemester"
+					>
+					<option v-for="sem in lists.studiensemester" :key="sem.studiensemester_kurzbz" :value="sem.studiensemester_kurzbz">
+						{{ sem.studiensemester_kurzbz }}
+					</option>
+				</form-input>
+				<form-input
+					type="select"
+					v-model="data.studiengang_kz"
+					name="studiengang_kz"
+					label="Studiengang"
+					>
+					<option v-for="stg in lists.stgs" :key="stg.studiengang_kz" :value="stg.studiengang_kz">
+						{{ stg.kuerzel }}
+					</option>
+				</form-input>
+				<form-input
+					v-if="config.showCreditpoints"
+					v-model="data.credit_points"
+					name="credit_points"
+					label="Credit Points"
+					>
+				</form-input>
+				<form-input
+					v-model="data.zahlungsreferenz"
+					name="zahlungsreferenz"
+					label="Zahlungsreferenz"
+					disabled
+					>
+				</form-input>
+				<form-input
+					type="textarea"
+					v-model="data.anmerkung"
+					name="anmerkung"
+					label="Anmerkung"
+					>
+				</form-input>
+			</fieldset>
+
+			<template #title>
+				Edit Buchung #{{data.buchungsnr}}
+			</template>
+			<template #footer>
+				<button type="submit" class="btn btn-primary" :disabled="loading">
+					<i v-if="loading" class="fa fa-spinner fa-spin"></i>
+					Speichern
+				</button>
+			</template>
+		</bs-modal>
+	</core-form>`
+};
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/List/New.js b/public/js/components/Stv/Studentenverwaltung/List/New.js
index acc9781de..f23245b7c 100644
--- a/public/js/components/Stv/Studentenverwaltung/List/New.js
+++ b/public/js/components/Stv/Studentenverwaltung/List/New.js
@@ -600,7 +600,7 @@ export default {
 								name="studiengang_kz"
 								v-model="formDataStg"
 								>
-								<option v-for="stg in lists.stgs" :key="stg.studiengang_kz" :value="stg.studiengang_kz">{{stg.kuerzel}}</option>
+								<option v-for="stg in lists.active_stgs" :key="stg.studiengang_kz" :value="stg.studiengang_kz">{{stg.kuerzel}}</option>
 							</form-input>
 						</div>
 						<div class="col-sm-4 mb-3">

From 69067c1ef9b08d23fe9fb4bd611c9b5debec26e0 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 12 Apr 2024 10:48:40 +0200
Subject: [PATCH 0587/1461] Notizcomponent refactor: fhcapi, validations,
 phrases, format dates

---
 .../frontend/v1}/stv/Notiz.php                | 233 ++++++++----------
 application/models/person/Notiz_model.php     |  19 +-
 public/js/components/Notiz/NotizComponent.js  | 220 ++++++++---------
 3 files changed, 214 insertions(+), 258 deletions(-)
 rename application/controllers/{components => api/frontend/v1}/stv/Notiz.php (59%)

diff --git a/application/controllers/components/stv/Notiz.php b/application/controllers/api/frontend/v1/stv/Notiz.php
similarity index 59%
rename from application/controllers/components/stv/Notiz.php
rename to application/controllers/api/frontend/v1/stv/Notiz.php
index 7b78b06f8..29a0b576e 100644
--- a/application/controllers/components/stv/Notiz.php
+++ b/application/controllers/api/frontend/v1/stv/Notiz.php
@@ -2,15 +2,30 @@
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
+use \DateTime as DateTime;
 
-class Notiz extends FHC_Controller
+class Notiz extends FHCAPI_Controller
 {
 	public function __construct()
 	{
-		parent::__construct();
+		parent::__construct([
+			'getUid' => ['admin:r', 'assistenz:r'],
+			'getNotizen' => ['admin:r', 'assistenz:r'],
+			'loadNotiz' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
+			'addNewNotiz' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
+			'updateNotiz' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
+			'deleteNotiz' => ['admin:r', 'assistenz:r'],
+			'loadDokumente' => ['admin:r', 'assistenz:r'],
+			'getMitarbeiter' => ['admin:r', 'assistenz:r'],
+			'advanceStatus' => ['admin:r', 'assistenz:r'],
+			'confirmStatus' => ['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('AuthLib');
 		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
 
 		// Load language phrases
@@ -21,19 +36,11 @@ class Notiz extends FHC_Controller
 
 	public function getUid()
 	{
-		// Load Libraries
-		$this->load->library('AuthLib');
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-		$result = getAuthUid();
-
-		$this->outputJsonError($result);
+		$this->terminateWithSuccess(getAuthUID());
 	}
 
 	public function getNotizen($id, $type)
 	{
-		$this->load->model('person/Notiz_model', 'NotizModel');
-		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
-
 		//check if valid type
 		$isValidType = $this->NotizzuordnungModel->isValidType($type);
 
@@ -42,23 +49,23 @@ class Notiz extends FHC_Controller
 			$result = $this->NotizModel->getNotizWithDocEntries($id, $type);
 
 			if (isError($result)) {
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				$this->outputJson(getError($result));
-			} else {
-				$this->outputJson(getData($result) ?: []);
+				$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 			}
+			return $this->terminateWithSuccess(getData($result) ?: []);
 		}
 		else
 		{
-			//Todo manu (phrases, response?)
-			$result = "datatype not yet implemented for notes";
-			$this->outputJson(getError($result));
+			return $this->terminateWithError("type not valid", self::ERROR_TYPE_GENERAL);
 		}
 	}
 
-	public function loadNotiz($notiz_id)
+	public function loadNotiz()
 	{
-		$this->load->model('person/Notiz_model', 'NotizModel');
+		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+
+		$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 
@@ -68,23 +75,23 @@ class Notiz extends FHC_Controller
 		$result = $this->NotizModel->loadWhere(
 			array('notiz_id' => $notiz_id)
 		);
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			$this->outputJson($result);
+		if (isError($result))
+		{
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
-
-		elseif (!hasData($result)) {
-			$this->outputJson($result);
+		elseif (!hasData($result))
+		{
+			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=>'Notiz_id']), self::ERROR_TYPE_GENERAL);
 		}
 		else
 		{
-			$this->outputJsonSuccess(current(getData($result)));
+			$this->terminateWithSuccess(current(getData($result)));
 		}
 	}
 
 	public function addNewNotiz($id, $paramTyp = null)
 	{
-		$this->load->model('person/Notiz_model', 'NotizModel');
+		//$this->load->model('person/Notiz_model', 'NotizModel');
 
 		$this->load->library('DmsLib');
 		$this->load->library('form_validation');
@@ -101,12 +108,17 @@ class Notiz extends FHC_Controller
 		}
 
 		//Form Validation
-		$this->form_validation->set_rules('titel', 'titel', 'callback_titel_required');
-		$this->form_validation->set_rules('text', 'text', 'callback_text_required');
+		$this->form_validation->set_rules('titel', 'Titel', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Titel'])
+		]);
+
+		$this->form_validation->set_rules('text', 'Text', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Text'])
+		]);
 
 		if ($this->form_validation->run() == false)
 		{
-			return $this->outputJsonError($this->form_validation->error_array());
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
 		}
 
 		$titel = $this->input->post('titel');
@@ -115,15 +127,14 @@ class Notiz extends FHC_Controller
 		$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('Von');
-		$ende = $this->input->post('Bis');
+		$start = $this->input->post('von');
+		$ende = $this->input->post('bis');
 
 		//Speichern der Notiz und Notizzuordnung inkl Prüfung ob valid type
 		$result = $this->NotizModel->addNotizForType($type, $id, $titel, $text, $uid, $start, $ende, $erledigt, $verfasser_uid, $bearbeiter_uid);
 		if (isError($result))
 		{
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson(getError($result));
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 		}
 		$notiz_id = $result->retval;
 
@@ -141,12 +152,12 @@ class Notiz extends FHC_Controller
 			);
 
 			//Todo(manu) check if filetypes weiter eingeschränkt werden sollen
+			//Todo(manu)check name files: nicht gleiches file 2mal hochladen
 			$result = $this->dmslib->upload($dms, $k, ['*']);
-/*			$result = $this->dmslib->upload($dms, $k, ['application/pdf','application/x.fhc-dms+json']);*/
+			/*			$result = $this->dmslib->upload($dms, $k, ['application/pdf','application/x.fhc-dms+json']);*/
 			if (isError($result))
 			{
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson(getError($result));
+				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 			}
 			$dms_id_arr[] = $result->retval['dms_id'];
 		}
@@ -161,20 +172,16 @@ class Notiz extends FHC_Controller
 				$result = $this->NotizdokumentModel->insert(array('notiz_id' => $notiz_id, 'dms_id' => $dms_id));
 				if (isError($result))
 				{
-					$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-					return $this->outputJson(getError($result));
+					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 				}
 			}
 		}
 
-		return $this->outputJsonSuccess(true);
+		return $this->terminateWithSuccess($result);
 	}
 
-	public function updateNotiz($notiz_id)
+	public function updateNotiz()
 	{
-		$this->load->model('person/Notiz_model', 'NotizModel');
-		$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
-
 		$this->load->library('form_validation');
 		$this->load->library('DmsLib');
 
@@ -187,18 +194,25 @@ class Notiz extends FHC_Controller
 			}
 		}
 
+		$notiz_id = $this->input->post('notiz_id');
+
 		if(!$notiz_id)
 		{
-			return $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->terminateWithError($this->p->t('ui','error_missingId',['id'=>'Notiz_id']), self::ERROR_TYPE_GENERAL);
 		}
 
 		//Form Validation
-		$this->form_validation->set_rules('titel', 'titel', 'callback_titel_required');
-		$this->form_validation->set_rules('text', 'text', 'callback_text_required');
+		$this->form_validation->set_rules('titel', 'Titel', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Titel'])
+		]);
+
+		$this->form_validation->set_rules('text', 'Text', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Text'])
+		]);
 
 		if ($this->form_validation->run() == false)
 		{
-			return $this->outputJsonError($this->form_validation->error_array());
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
 		}
 
 		//update Notiz
@@ -208,7 +222,6 @@ class Notiz extends FHC_Controller
 		$verfasser_uid = $this->input->post('verfasser');
 		$bearbeiter_uid = isset($_POST['bearbeiter']) ? $_POST['bearbeiter'] : $uid;
 		$erledigt = $this->input->post('erledigt');
-		//$type = $this->input->post('typeId'); //soll auch dieser geändert werden können?
 		$start = $this->input->post('von');
 		$ende = $this->input->post('bis');
 
@@ -230,8 +243,7 @@ class Notiz extends FHC_Controller
 		);
 		if (isError($result))
 		{
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson(getError($result));
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 		}
 
 		//update(1) laden aller bereits mit dieser notiz_id verknüpften DMS-Einträge
@@ -242,8 +254,7 @@ class Notiz extends FHC_Controller
 		$result = $this->NotizdokumentModel->loadWhere(array('notiz_id' => $notiz_id));
 		if (isError($result))
 		{
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			$this->outputJson(getError($result));
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 		}
 		elseif (!hasData($result))
 		{
@@ -256,7 +267,7 @@ class Notiz extends FHC_Controller
 				$dms_id_arr[] = array(
 					'name' => $doc->name,
 					'dms_id' => $doc->dms_id
-					);
+				);
 			}
 		}
 
@@ -281,20 +292,19 @@ class Notiz extends FHC_Controller
 				);
 
 				//Todo(manu) check if filetypes weiter eingeschränkt werden sollen
+				//Todo(manu)check name files: nicht gleiches file 2mal hochladen
 				$result = $this->dmslib->upload($dms, $k, array('*'));
 
 				if (isError($result))
 				{
-					$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-					return $this->outputJson(getError($result));
+					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 				}
 				$dms_id = $result->retval['dms_id'];
 
 				$result = $this->NotizdokumentModel->insert(array('notiz_id' => $notiz_id, 'dms_id' => $dms_id));
 				if (isError($result))
 				{
-					$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-					return $this->outputJson(getError($result));
+					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 				}
 			}
 		}
@@ -302,11 +312,18 @@ class Notiz extends FHC_Controller
 		//update(3) check if Dateien gelöscht wurden
 		if(count($dms_uploaded) != count($dms_id_arr))
 		{
-			$upload_new_names = array_column($dms_uploaded, "name");
+			if (count($dms_uploaded) == 0)
+			{
+				$filesDeleted = $dms_id_arr;
+			}
+			else
+			{
+				$upload_new_names = array_column($dms_uploaded, "name");
 
-			$filesDeleted = array_filter($dms_id_arr, function ($file) use ($upload_new_names) {
-				return !in_array($file["name"], $upload_new_names);
-			});
+				$filesDeleted = array_filter($dms_id_arr, function ($file) use ($upload_new_names) {
+					return !in_array($file["name"], $upload_new_names);
+				});
+			}
 
 			foreach ($filesDeleted as $file)
 			{
@@ -314,18 +331,20 @@ class Notiz extends FHC_Controller
 
 				if (isError($result))
 				{
-					$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-					return $this->outputJson(getError($result));
+					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 				}
 				else
 					$this->outputJson($result);
 			}
 		}
-		return $this->outputJsonSuccess(true);
+		return $this->terminateWithSuccess($result);
 	}
 
-	public function deleteNotiz($notiz_id)
+	public function deleteNotiz()
 	{
+		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+		$notiz_id = $this->input->post('notiz_id');
+
 		//dms_id auslesen aus notizdokument wenn vorhanden
 		$dms_id_arr = [];
 		$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
@@ -334,17 +353,13 @@ class Notiz extends FHC_Controller
 
 		if (isError($result))
 		{
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			$this->outputJson(getError($result));
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 		}
-		elseif (!hasData($result))
-		{
-			$this->outputJson($result);
-		}
-		else
+
+		if(hasData($result))
 		{
 			$result = getData($result);
-			foreach($result as $doc) {
+			foreach ($result as $doc) {
 				$dms_id_arr[] = $doc->dms_id;
 			}
 		}
@@ -358,15 +373,13 @@ class Notiz extends FHC_Controller
 
 				if (isError($result))
 				{
-					$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-					return $this->outputJson(getError($result));
+					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 				}
-				else
-					$this->outputJson($result);
+
+				$this->outputJson($result);
 			}
 		}
 
-		//Todo(manu) rollback?
 		//delete Notiz und Notizzuordnung
 		$this->load->model('person/Notiz_model', 'NotizModel');
 		$this->NotizModel->addJoin('public.tbl_notizzuordnung', 'notiz_id');
@@ -377,20 +390,20 @@ class Notiz extends FHC_Controller
 
 		if (isError($result))
 		{
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			$this->outputJson($result);
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
-		elseif (!hasData($result)) {
-			$this->outputJson($result);
+		if(!hasData($result))
+		{
+			return $this->terminateWithError($this->p->t('ui','error_missingId', ['id'=> 'Notiz_id']), self::ERROR_TYPE_GENERAL);
 		}
 
-		return $this->outputJsonSuccess(current(getData($result)));
+		return $this->terminateWithSuccess(current(getData($result)));
 	}
 
-	public function loadDokumente($notiz_id)
+	public function loadDokumente()
 	{
-		$this->load->model('person/Notiz_model', 'NotizModel');
-
+		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+		$notiz_id = $this->input->post('notiz_id');
 
 		$this->NotizModel->addSelect('campus.tbl_dms_version.*');
 
@@ -401,51 +414,23 @@ class Notiz extends FHC_Controller
 			array('public.tbl_notiz.notiz_id' => $notiz_id)
 		);
 		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			$this->outputJson($result);
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
 
-		elseif (!hasData($result)) {
-			$this->outputJson($result);
-		}
-		else
+		if(!hasData($result))
 		{
-			$this->outputJsonSuccess(getData($result));
+			return $this->terminateWithError($this->p->t('ui','error_missingId', ['id'=> 'Notiz_id']), self::ERROR_TYPE_GENERAL);
 		}
+		return $this->terminateWithSuccess(getData($result));
 	}
 
 	public function getMitarbeiter($searchString)
 	{
-		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
-
 		$result = $this->MitarbeiterModel->searchMitarbeiter($searchString);
 		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
-		$this->outputJson($result);
+		return $this->terminateWithSuccess($result);
 	}
 
-	public function titel_required($value)
-	{
-		if (empty($value)) {
-			$this->form_validation->set_message('titel_required', $this->p->t('ui', 'error_fieldRequired', ['field' => 'Titel']));
-			return false;
-		}
-		else
-		{
-			return true;
-		}
-	}
-
-	public function text_required($value)
-	{
-		if (empty($value)) {
-			$this->form_validation->set_message('text_required', $this->p->t('ui', 'error_fieldRequired', ['field' => 'Text']));
-			return false;
-		}
-		else
-		{
-			return true;
-		}
-	}
-}
+}
\ No newline at end of file
diff --git a/application/models/person/Notiz_model.php b/application/models/person/Notiz_model.php
index 2822cac47..f9cd76724 100644
--- a/application/models/person/Notiz_model.php
+++ b/application/models/person/Notiz_model.php
@@ -271,20 +271,6 @@ class Notiz_model extends DB_Model
 	 */
 	public function getNotizWithDocEntries($id, $type)
 	{
-	// ci query builder returns null
-/*		$this->db->select('n.*, count(dms_id) as countDoc, z.notizzuordnung_id');
-		$this->db->select('(CASE WHEN n.updateamum >= n.insertamum THEN n.updateamum ELSE n.insertamum END) AS lastUpdate');
-		$this->db->from('public.tbl_notiz n');
-		$this->db->join('public.tbl_notizzuordnung z', 'n.notiz_id = z.notiz_id');
-		$this->db->join('public.tbl_notiz_dokument dok', 'n.notiz_id = dok.notiz_id', 'left');
-		$this->db->join('campus.tbl_dms_version', 'dok.notiz_id = campus.tbl_dms_version.dms_id', 'left');
-		$this->db->where("z.$type", $id);
-		$this->db->group_by('n.notiz_id, z.notizzuordnung_id');
-
-		$query = $this->db->get();
-		return $query->result();*/
-
-
 		$qry = "
 			SELECT 
 			    	n.*, count(dms_id) as countDoc, z.notizzuordnung_id,
@@ -292,7 +278,10 @@ class Notiz_model extends DB_Model
 						WHEN n.updateamum >= n.insertamum THEN n.updateamum 
 						ELSE n.insertamum
 					END::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS lastUpdate,
-			    	regexp_replace(n.text, '<[^>]*>', '', 'g') as text_stripped
+			    	regexp_replace(n.text, '<[^>]*>', '', 'g') as text_stripped,
+			    	TO_CHAR(n.start::timestamp, 'DD.MM.YYYY') AS start_format,
+			    	TO_CHAR(n.ende::timestamp, 'DD.MM.YYYY') AS ende_format
+			    	
 			FROM
 			    	public.tbl_notiz n
 			JOIN 
diff --git a/public/js/components/Notiz/NotizComponent.js b/public/js/components/Notiz/NotizComponent.js
index eb8b8dd1d..3ba8615fe 100644
--- a/public/js/components/Notiz/NotizComponent.js
+++ b/public/js/components/Notiz/NotizComponent.js
@@ -1,7 +1,6 @@
 import VueDatePicker from '../vueDatepicker.js.php';
 import PvAutoComplete from "../../../../index.ci.php/public/js/components/primevue/autocomplete/autocomplete.esm.min.js";
 import FormUploadDms from '../Form/Upload/Dms.js';
-import {CoreRESTClient} from "../../RESTClient";
 import {CoreFilterCmpt} from "../filter/Filter.js";
 import BsModal from "../Bootstrap/Modal";
 
@@ -24,14 +23,17 @@ export default {
 	data(){
 		return {
 			tabulatorOptions: {
-				ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Notiz/getNotizen/' + this.id + '/' + this.typeId),
+				ajaxURL: 'api/frontend/v1/stv/Notiz/getNotizen/' + this.id + '/' + this.typeId,
+				ajaxRequestFunc: this.$fhcApi.get,
+				ajaxResponse: (url, params, response) => response.data,
+				//ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Notiz/getNotizen/' + this.id + '/' + this.typeId),
 				columns: [
 					{title: "Titel", field: "titel"},
 					{title: "Text", field: "text_stripped", width: 250},
 					{title:  "VerfasserIn", field: "verfasser_uid"},
 					{title: "BearbeiterIn", field: "bearbeiter_uid", visible: false},
-					{title: "Start", field: "start", visible: false},
-					{title: "Ende", field: "ende", visible: false},
+					{title: "Start", field: "start_format", visible: false},
+					{title: "Ende", field: "ende_format", visible: false},
 					{title: "Dokumente", field: "countdoc"},
 					{title: "Erledigt", field: "erledigt", visible: false},
 					{title: "Notiz_id", field: "notiz_id", visible: false},
@@ -74,7 +76,46 @@ export default {
 				selectable: true,
 				index: 'notiz_id'
 			},
-			tabulatorEvents: [],
+			tabulatorEvents: [
+				{
+					event: 'tableBuilt',
+					handler: async() => {
+
+						await this.$p.loadCategory(['notiz','global']);
+
+						let cm = this.$refs.table.tabulator.columnManager;
+
+						cm.getColumnByField('verfasser_uid').component.updateDefinition({
+							title: this.$p.t('notiz', 'verfasser')
+						});
+						cm.getColumnByField('titel').component.updateDefinition({
+							title: this.$p.t('global', 'titel')
+						});
+						cm.getColumnByField('text_stripped').component.updateDefinition({
+							title: this.$p.t('global', 'text')
+						});
+						cm.getColumnByField('bearbeiter_uid').component.updateDefinition({
+							title: this.$p.t('notiz', 'bearbeiter')
+						});
+						cm.getColumnByField('start_format').component.updateDefinition({
+							title: this.$p.t('global', 'gueltigVon')
+						});
+						cm.getColumnByField('ende_format').component.updateDefinition({
+							title: this.$p.t('global', 'gueltigBis')
+						});
+						cm.getColumnByField('countdoc').component.updateDefinition({
+							title: this.$p.t('notiz', 'document')
+						});
+						cm.getColumnByField('erledigt').component.updateDefinition({
+							title: this.$p.t('notiz', 'erledigt')
+						});
+						cm.getColumnByField('lastupdate').component.updateDefinition({
+							title: this.$p.t('notiz', 'letzte_aenderung')
+						});
+
+					}
+				}
+			],
 			notizen: [],
 			multiupload: true,
 			mitarbeiter: [],
@@ -101,14 +142,11 @@ export default {
 	methods: {
 		actionDeleteNotiz(notiz_id){
 			this.loadNotiz(notiz_id).then(() => {
-				if(this.notizen.notiz_id) {
 					this.$refs.deleteNotizModal.show();
-				}
 			});
 		},
 		actionEditNotiz(notiz_id){
 			this.loadNotiz(notiz_id).then(() => {
-				console.log(this.notizen);
 				if(this.notizen.notiz_id) {
 					this.notizData.titel = this.notizen.titel;
 					this.notizData.statusNew = false;
@@ -126,10 +164,11 @@ export default {
 				}
 			})
 				.then(() => {
-					if(this.notizen.dms_id){
-						console.log("loadEntries with " + this.notizen.notiz_id);
-						this.loadDocEntries(this.notizen.notiz_id);
+					if(this.notizData.dms_id){
+						this.loadDocEntries(this.notizData.notiz_id);
 					}
+					else
+						this.notizData.anhang = [];
 				});
 		},
 		actionNewNotiz(){
@@ -140,103 +179,80 @@ export default {
 
 			formData.append('data', JSON.stringify(this.notizData));
 			Object.entries(this.notizData.anhang).forEach(([k, v]) => formData.append(k, v));
-			CoreRESTClient.post(
-				'components/stv/Notiz/addNewNotiz/' + this.id,
+			this.$fhcApi.post('api/frontend/v1/stv/notiz/addNewNotiz/' + this.id,
 				formData,
 				{ Headers: { "Content-Type": "multipart/form-data" } }
 			).then(response => {
-				if (!response.data.error) {
-					this.$fhcAlert.alertSuccess('Anlegen von neuer Notiz erfolgreich');
+				this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 					this.resetFormData();
 					this.reload();
-				} else {
-					const errorData = response.data.retval;
-					Object.entries(errorData).forEach(entry => {
-						const [key, value] = entry;
-						this.$fhcAlert.alertError(value);
-					});
-				}
-			}).catch(error => {
-				if (error.response) {
-					console.log(error.response);
-					this.$fhcAlert.alertError(error.response.data);
-				}
-			}).finally(() => {
+			})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
 				window.scrollTo(0, 0);
 			});
 		},
 		deleteNotiz(notiz_id){
-			CoreRESTClient.post('components/stv/Notiz/deleteNotiz/' + notiz_id)
-				.then(response => {
-					if (!response.data.error) {
-						this.$fhcAlert.alertSuccess('Löschen erfolgreich');
+			this.param = {
+				'notiz_id':  notiz_id
+			};
+
+			return this.$fhcApi.post('api/frontend/v1/stv/notiz/deleteNotiz/', this.param)
+				.then(result => {
+						this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
 						this.$refs.deleteNotizModal.hide();
 						this.reload();
-					} else {
-						this.$fhcAlert.alertError('Keine Notiz mit Id ' + notiz_id + ' gefunden');
-					}
-				}).catch(error => {
-					this.$fhcAlert.alertError('Fehler bei Löschroutine aufgetreten');
-				}).finally(()=> {
+				})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(()=> {
 					window.scrollTo(0, 0);
 				});
 		},
 		loadNotiz(notiz_id){
-			return CoreRESTClient.get('components/stv/Notiz/loadNotiz/' + notiz_id)
-				.then(
-					result => {
-						if(result.data.retval) {
-							this.notizen = result.data.retval;
-						}
-						else {
-							this.notizen = {};
-							this.$fhcAlert.alertError('Keine Notiz mit Id ' + notiz_id + ' gefunden');
-						}
+			this.param = {
+				'notiz_id':  notiz_id
+			};
+			return this.$fhcApi.post('api/frontend/v1/stv/notiz/loadNotiz/',
+				this.param)
+					.then(result => {
+						this.notizData = result.data;
 						return result;
-					}
-				);
+					})
+				.catch(this.$fhcAlert.handleSystemError);
 		},
 		loadDocEntries(notiz_id){
-			return CoreRESTClient.get('components/stv/Notiz/loadDokumente/' + notiz_id)
+			this.param = {
+				'notiz_id':  notiz_id
+			};
+			return this.$fhcApi.post('api/frontend/v1/stv/notiz/loadDokumente/',
+				this.param)
 				.then(
 					result => {
-						if(result.data.retval) {
-							this.notizData.anhang = result.data.retval;
-							console.log(this.notizData.anhang);
-						}
-						else
-						{
-							this.notizData.anhang = {};
-							this.$fhcAlert.alertError('Kein Dokumenteneintrag mit NotizId ' + notiz_id + ' gefunden');
-						}
+							this.notizData.anhang = result.data;
 						return result;
-					}
-				);
+					})
+				.catch(this.$fhcAlert.handleSystemError);
 		},
 		updateNotiz(notiz_id){
 			const formData = new FormData();
 			formData.append('data', JSON.stringify(this.notizData));
 			Object.entries(this.notizData.anhang).forEach(([k, v]) => formData.append(k, v));
 
-			CoreRESTClient.post(
-				'components/stv/Notiz/updateNotiz/' + notiz_id,
+			this.param = {
+				'notiz_id':  notiz_id
+			};
+
+			return this.$fhcApi.post(
+				'api/frontend/v1/stv/notiz/updateNotiz/' ,
 				formData,
 				{ Headers: { "Content-Type": "multipart/form-data" } }
 			).then(response => {
-				if (!response.data.error) {
-					this.$fhcAlert.alertSuccess('Update von Notiz erfolgreich');
+				this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 					this.resetFormData();
 					this.reload();
-				} else {
-					const errorData = response.data.retval;
-					Object.entries(errorData).forEach(entry => {
-						const [key, value] = entry;
-						this.$fhcAlert.alertError(value);
-					});
-				}
-			}).catch(error => {
-				this.$fhcAlert.alertError('Fehler bei Updateroutine aufgetreten');
-			}).finally(() => {
+			})
+			.catch(this.$fhcAlert.handleSystemError)
+			.finally(() => {
 				window.scrollTo(0, 0);
 			});
 		},
@@ -261,20 +277,18 @@ export default {
 			};
 		},
 		getUid(){
-			CoreRESTClient
-				.get('components/stv/Notiz/getUid')
+			this.$fhcApi
+				.get('api/frontend/v1/stv/notiz/getUid')
 				.then(result => {
-					if(result.data.retval) {
-						this.notizData.intVerfasser = result.data.retval;
-					}
+						this.notizData.intVerfasser = result.data;
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
 		search(event) {
-			return CoreRESTClient
-				.get('components/stv/Notiz/getMitarbeiter/' + event.query)
+			return this.$fhcApi
+				.get('api/frontend/v1/stv/notiz/getMitarbeiter/' + event.query)
 				.then(result => {
-					this.filteredMitarbeiter = CoreRESTClient.getData(result.data);
+					this.filteredMitarbeiter = result.data.retval;
 				});
 		},
 		initTinyMCE() {
@@ -319,38 +333,6 @@ export default {
 		if(this.showTinyMCE){
 			this.initTinyMCE();
 		}
-
-		await this.$p.loadCategory(['notiz','global']);
-
-		let cm = this.$refs.table.tabulator.columnManager;
-
-		cm.getColumnByField('verfasser_uid').component.updateDefinition({
-			title: this.$p.t('notiz', 'verfasser')
-		});
-		cm.getColumnByField('titel').component.updateDefinition({
-			title: this.$p.t('global', 'titel')
-		});
-		cm.getColumnByField('text_stripped').component.updateDefinition({
-			title: this.$p.t('global', 'text')
-		});
-		cm.getColumnByField('bearbeiter_uid').component.updateDefinition({
-			title: this.$p.t('notiz', 'bearbeiter')
-		});
-		cm.getColumnByField('start').component.updateDefinition({
-			title: this.$p.t('global', 'gueltigVon')
-		});
-		cm.getColumnByField('ende').component.updateDefinition({
-			title: this.$p.t('global', 'gueltigBis')
-		});
-		cm.getColumnByField('countdoc').component.updateDefinition({
-			title: this.$p.t('notiz', 'document')
-		});
-		cm.getColumnByField('erledigt').component.updateDefinition({
-			title: this.$p.t('notiz', 'erledigt')
-		});
-		cm.getColumnByField('lastupdate').component.updateDefinition({
-			title: this.$p.t('notiz', 'letzte_aenderung')
-		});
 	},
 	watch: {
 		//watcher für Tinymce-Textfeld
@@ -398,7 +380,7 @@ export default {
 			</template>
 			<template #footer>
 				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">Abbrechen</button>
-				<button ref="Close" type="button" class="btn btn-primary" @click="deleteNotiz(notizen.notiz_id)">OK</button>
+				<button ref="Close" type="button" class="btn btn-primary" @click="deleteNotiz(notizData.notiz_id)">OK</button>
 			</template>
 		</BsModal>
 		
@@ -410,7 +392,7 @@ export default {
 			:side-menu="false"
 			reload
 			new-btn-show
-			new-btn-label="Neu"
+			new-btn-label="Notiz"
 			@click:new="actionNewNotiz"
 			>
 		</core-filter-cmpt>
@@ -534,7 +516,7 @@ export default {
 			</div>
 			
 			<button v-if="notizData.statusNew"  type="button" class="btn btn-primary" @click="addNewNotiz()"> {{$p.t('studierendenantrag', 'btn_new')}}</button>
-			<button v-else type="button" class="btn btn-primary" @click="updateNotiz(notizen.notiz_id)"> {{$p.t('ui', 'speichern')}}</button>
+			<button v-else type="button" class="btn btn-primary" @click="updateNotiz(notizData.notiz_id)"> {{$p.t('ui', 'speichern')}}</button>
 					
 		</form>		
 	</div>`

From ad956bef8ebb56a1eb418387d11fa4eee8362f03 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 12 Apr 2024 14:38:01 +0200
Subject: [PATCH 0588/1461] adds pagination logic to C4 news

---
 application/controllers/CisHmvc/Cms.php   |  7 ++-
 application/controllers/CisHtml/Cms.php   |  8 ++-
 application/controllers/CisVue/Cms.php    |  7 ++-
 application/libraries/CmsLib.php          | 36 ++++++-------
 application/models/content/News_model.php | 66 +++++++++++++----------
 5 files changed, 70 insertions(+), 54 deletions(-)

diff --git a/application/controllers/CisHmvc/Cms.php b/application/controllers/CisHmvc/Cms.php
index 7f2a03a0f..d15f398a4 100644
--- a/application/controllers/CisHmvc/Cms.php
+++ b/application/controllers/CisHmvc/Cms.php
@@ -1,6 +1,7 @@
 <?php
 
-if (! defined('BASEPATH')) exit('No direct script access allowed');
+if (!defined('BASEPATH'))
+	exit('No direct script access allowed');
 
 /**
  *
@@ -89,7 +90,9 @@ class Cms extends Auth_Controller
 	 */
 	public function news($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
 	{
-		$news = $this->cmslib->getNews($infoscreen, $studiengang_kz, $semester, $mischen, $titel, $edit, $sichtbar);
+		$page = intval($this->input->get('page', true));
+		$pagination_size = 10;
+		$news = $this->cmslib->getNews($infoscreen, $studiengang_kz, $semester, $mischen, $titel, $edit, $sichtbar, $page, $pagination_size);
 
 		if (isError($news))
 			return $this->load->view('CisHmvc/Error', ['error' => getError($news)]);
diff --git a/application/controllers/CisHtml/Cms.php b/application/controllers/CisHtml/Cms.php
index 96057559f..2dd05dbae 100644
--- a/application/controllers/CisHtml/Cms.php
+++ b/application/controllers/CisHtml/Cms.php
@@ -1,6 +1,7 @@
 <?php
 
-if (! defined('BASEPATH')) exit('No direct script access allowed');
+if (!defined('BASEPATH'))
+	exit('No direct script access allowed');
 
 /**
  *
@@ -10,6 +11,7 @@ class Cms extends FHC_Controller
 	/**
 	 * Constructor
 	 */
+
 	public function __construct()
 	{
 		parent::__construct();
@@ -59,7 +61,9 @@ class Cms extends FHC_Controller
 	 */
 	public function news($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
 	{
-		$news = $this->cmslib->getNews($infoscreen, $studiengang_kz, $semester, $mischen, $titel, $edit, $sichtbar);
+		$page = intval($this->input->get('page', true));
+		$pagination_size = 10;
+		$news = $this->cmslib->getNews($infoscreen, $studiengang_kz, $semester, $mischen, $titel, $edit, $sichtbar, $page, $pagination_size);
 
 		if (isError($news))
 			return $this->load->view('CisHtml/Error', ['error' => getError($news)]);
diff --git a/application/controllers/CisVue/Cms.php b/application/controllers/CisVue/Cms.php
index 96057559f..0f3fc061a 100644
--- a/application/controllers/CisVue/Cms.php
+++ b/application/controllers/CisVue/Cms.php
@@ -1,6 +1,7 @@
 <?php
 
-if (! defined('BASEPATH')) exit('No direct script access allowed');
+if (!defined('BASEPATH'))
+	exit('No direct script access allowed');
 
 /**
  *
@@ -59,7 +60,9 @@ class Cms extends FHC_Controller
 	 */
 	public function news($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
 	{
-		$news = $this->cmslib->getNews($infoscreen, $studiengang_kz, $semester, $mischen, $titel, $edit, $sichtbar);
+		$page = intval($this->input->get('page', true));
+		$pagination_size = 10;
+		$news = $this->cmslib->getNews($infoscreen, $studiengang_kz, $semester, $mischen, $titel, $edit, $sichtbar, $page, $pagination_size);
 
 		if (isError($news))
 			return $this->load->view('CisHtml/Error', ['error' => getError($news)]);
diff --git a/application/libraries/CmsLib.php b/application/libraries/CmsLib.php
index 4e27b94af..dfe8d5e4f 100644
--- a/application/libraries/CmsLib.php
+++ b/application/libraries/CmsLib.php
@@ -1,6 +1,7 @@
 <?php
 
-if (! defined('BASEPATH')) exit('No direct script access allowed');
+if (!defined('BASEPATH'))
+	exit('No direct script access allowed');
 
 use \DateTime as DateTime;
 use \DOMDocument as DOMDocument;
@@ -46,16 +47,16 @@ class CmsLib
 	 */
 	public function getContent($content_id, $version = null, $sprache = null, $sichtbar = true)
 	{
-		if(!is_numeric($content_id))
+		if (!is_numeric($content_id))
 			return error('ContentID ist ungueltig');
 
 		if ($sprache === null)
 			$sprache = getUserLanguage();
-		
+
 		$islocked = $this->ci->ContentgruppeModel->loadWhere(['content_id' => $content_id]);
 		if (isError($islocked))
 			return $islocked;
-		
+
 		if (getData($islocked)) {
 			$uid = getAuthUID();
 			$isberechtigt = $this->ci->ContentgruppeModel->berechtigt($content_id, $uid);
@@ -72,11 +73,9 @@ class CmsLib
 			return $content;
 
 		// Legt einen Logeintrag für die Klickstatistik an
-		if (defined('LOG_CONTENT') && LOG_CONTENT)
-		{
+		if (defined('LOG_CONTENT') && LOG_CONTENT) {
 			// Nur eingeloggte User werden geloggt, das sonst auch alle Infoscreenaufrufe und dgl. mitgeloggt werden
-			if (isLogged())
-			{
+			if (isLogged()) {
 				$request_data = 'content_id=' . $content_id;
 				if ($version !== null)
 					$request_data .= '&version=' . $version;
@@ -185,13 +184,12 @@ class CmsLib
 	 * 
 	 * @return void
 	 */
-	public function getNews($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
+	public function getNews($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true, $page = 1, $page_size = 10)
 	{
 		$this->ci->load->model('crm/Student_model', 'StudentModel');
 		$this->ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
 
-		if (!$infoscreen && ($studiengang_kz === null || $semester === null))
-		{
+		if (!$infoscreen && ($studiengang_kz === null || $semester === null)) {
 			//Zum anzeigen der Studiengang-Details neben den News
 			$student = $this->ci->StudentModel->loadWhere(['student_uid' => get_uid()]);
 			if (isError($student))
@@ -209,7 +207,7 @@ class CmsLib
 		$xml = '<?xml version="1.0" encoding="UTF-8"?><content>';
 
 		$this->ci->load->model('content/News_model', 'NewsModel');
-		$news = $this->ci->NewsModel->getNewsWithContent(getSprache(), $studiengang_kz, $semester, null, $sichtbar, 0, 0, $all, $mischen);
+		$news = $this->ci->NewsModel->getNewsWithContent(getSprache(), $studiengang_kz, $semester, null, $sichtbar, 0, $page, $page_size, $all, $mischen);
 
 		if (isError($news))
 			return $news;
@@ -225,17 +223,14 @@ class CmsLib
 			$xml .= "<newswrapper>" . $newsobj->content . $datum . $id . "</newswrapper>";
 		}
 
-		if ($studiengang_kz != 0)
-		{
+		if ($studiengang_kz != 0) {
 			$stg_obj = $this->ci->StudiengangModel->load($studiengang_kz);
 			if (isError($stg_obj))
 				return $stg_obj;
 			$stg_obj = current(getData($stg_obj) ?: []);
 
-			if ($stg_obj)
-			{
-				if (!$edit && !$infoscreen)
-				{
+			if ($stg_obj) {
+				if (!$edit && !$infoscreen) {
 					$extras = $this->getNewsExtras($stg_obj, $semester);
 					if (isError($extras))
 						return $extras;
@@ -245,8 +240,7 @@ class CmsLib
 			}
 		}
 
-		if ($titel != '')
-		{
+		if ($titel != '') {
 			$xml .= '<news_titel>' . $titel . '</news_titel>';
 		}
 
@@ -260,7 +254,7 @@ class CmsLib
 
 		$XML = new DOMDocument();
 		$XML->loadXML($xml);
-		
+
 		$xsltemplate = new DOMDocument();
 		$xsltemplate->loadXML($template->xslt_xhtml_c4);
 
diff --git a/application/models/content/News_model.php b/application/models/content/News_model.php
index 3199a0ac3..51ef16053 100644
--- a/application/models/content/News_model.php
+++ b/application/models/content/News_model.php
@@ -23,10 +23,21 @@ class News_model extends DB_Model
 			text IS NOT NULL
 			AND datum <= NOW() AND (datum_bis IS NULL OR datum_bis >= now()::date)
 			ORDER BY datum DESC
-			LIMIT '. $this->escape($limit)
+			LIMIT ' . $this->escape($limit)
 		);
 	}
 
+	private function getMaxPageCount($page_size)
+	{
+		$this->addSelect(['Count(*)']);
+		$count = $this->load();
+		$count = hasData($count) ? getData($count)[0]->count : null;
+		$floatMaxPageCount = $count / $page_size;
+
+		// ceil, to include remaining rows into the last page 
+		return ceil($floatMaxPageCount);
+	}
+
 	/**
 	 * @param string            $sprache
 	 * @param string            $studiengang_kz
@@ -34,7 +45,7 @@ class News_model extends DB_Model
 	 * @param string            $fachbereich_kurzbz
 	 * @param boolean           $sichtbar
 	 * @param integer           $maxalter
-	 * @param integer           $maxnews
+	 * @param integer           $page_size
 	 * @param boolean           $all
 	 * @param boolean           $mischen
 	 * 
@@ -42,46 +53,52 @@ class News_model extends DB_Model
 	 * 
 	 * @return stdObj
 	 */
-	public function getNewsWithContent($sprache, $studiengang_kz, $semester, $fachbereich_kurzbz = null, $sichtbar = true, $maxalter = 0, $maxnews = 0, $all = false, $mischen = true)
+	public function getNewsWithContent($sprache, $studiengang_kz, $semester, $fachbereich_kurzbz = null, $sichtbar = true, $maxalter = 0, $page = 1, $page_size = 10, $all = false, $mischen = true)
 	{
+		if (isset($page) && is_numeric($page) && isset($page_size) && is_numeric($page_size)) {
+			if ($page > 0 && $page_size > 0) {
+				$maxPageCount = $this->getMaxPageCount($page_size);
+				if ($maxPageCount) {
+					$page = $page % $maxPageCount;
+				}
+				$offset = $page * $page_size;
+				$this->addLimit($page_size, $offset);
+			}
+		} else {
+			$this->addLimit($page_size);
+		}
+
+		$this->addOrder('datum', 'DESC');
+
 		$studiengang_kz = trim($studiengang_kz);
 		$fachbereich_kurzbz = trim($fachbereich_kurzbz);
 
 		$where = [];
 		$params = [];
-		if (trim($maxalter) != '0')
-		{
+		if (trim($maxalter) != '0') {
 			$where[] = "(now()-datum) < interval ? days";
 			$params[] = $maxalter;
 		}
-		if (!$all)
-		{
+		if (!$all) {
 			$where[] = "datum <= now()";
 			$where[] = "(datum_bis >= now()::date OR datum_bis IS NULL)";
 		}
-		if ($fachbereich_kurzbz != '*')
-		{
-			if ($fachbereich_kurzbz == '')
-			{
+		if ($fachbereich_kurzbz != '*') {
+			if ($fachbereich_kurzbz == '') {
 				$where[] = "fachbereich_kurzbz IS NULL";
-			}
-			else
-			{
+			} else {
 				$where[] = "fachbereich_kurzbz = ?";
 				$params[] = $fachbereich_kurzbz;
 			}
 		}
-		if ($studiengang_kz == '0')
-		{
+		if ($studiengang_kz == '0') {
 			$where[] = "studiengang_kz = ?";
 			$params[] = $studiengang_kz;
 			if ($semester === NULL)
 				$where[] = "semester IS NULL";
 			elseif ($semester === 0)
 				$where[] = "semester = 0";
-		}
-		elseif ($studiengang_kz != '')
-		{
+		} elseif ($studiengang_kz != '') {
 			$add = $mischen === true ? " OR (studiengang_kz = 0 AND semester IS NULL)" : "";
 			$where[] = "((studiengang_kz = ? AND semester = ?) OR (studiengang_kz = ? AND semester = 0) OR (studiengang_kz = 0 AND semester = ?)" . $add . ")";
 			$params[] = $studiengang_kz;
@@ -90,14 +107,14 @@ class News_model extends DB_Model
 			$params[] = $semester;
 		}
 		$this->addJoin('campus.tbl_contentsprache cs', 'content_id');
-		
+
 		$where[] = "cs.sichtbar = " . ($sichtbar ? "true" : "false");
-		
+
 		$where[] = "cs.sprache = (CASE WHEN EXISTS(SELECT 1 FROM campus.tbl_contentsprache cs2 WHERE cs2.content_id=" . $this->dbTable . ".content_id AND sprache=?) THEN ? ELSE ? END)";
 		$params[] = $sprache;
 		$params[] = $sprache;
 		$params[] = DEFAULT_LANGUAGE;
-		
+
 		$where[] = "cs.version = (SELECT MAX(version) FROM campus.tbl_contentsprache cs3 WHERE cs3.content_id=" . $this->dbTable . ".content_id AND cs3.sprache = (CASE WHEN EXISTS(SELECT 1 FROM campus.tbl_contentsprache cs2 WHERE cs2.content_id=" . $this->dbTable . ".content_id AND sprache=?) THEN ? ELSE ? END))";
 		$params[] = $sprache;
 		$params[] = $sprache;
@@ -105,11 +122,6 @@ class News_model extends DB_Model
 
 		$where = implode(" AND ", $where);
 
-		$this->addOrder('datum', 'DESC');
-		if ($maxnews)
-			$this->addLimit($maxnews);
-
-
 		$this->db->where($where, NULL, FALSE);
 
 		$sql = $this->db->get_compiled_select($this->dbTable);

From 563e7bebc01c41ffcc4f7fdba9ed77d454ffec5f Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Fri, 12 Apr 2024 15:01:37 +0200
Subject: [PATCH 0589/1461] setupComponent currently uses globalProperties as
 model for le selection; lektorComponent uses globalProperties for le_id;
 le_selection now has sophisticated info String detailing every group
 associated with le for lektor;  WIP assistenz filter setup; WIP checking in
 router guard for missing le_id when they have not loaded yet;

---
 public/js/components/filter/API.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/public/js/components/filter/API.js b/public/js/components/filter/API.js
index fae45b44e..ff09c452d 100644
--- a/public/js/components/filter/API.js
+++ b/public/js/components/filter/API.js
@@ -124,8 +124,6 @@ export const CoreFilterAPIs = {
 	 *
 	 */
 	getFilter: function(wsParams) {
-		console.log(wsParams)
-		debugger
 		return CoreRESTClient.get(
                         'components/Filter/getFilter',
                         {

From d77499b73b3f8f709b578ca2e9935b7699ff627a Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 15 Apr 2024 13:35:33 +0200
Subject: [PATCH 0590/1461] implementing frontend pagination for components

---
 application/controllers/CisHtml/Cms.php       | 13 +++--
 application/models/content/News_model.php     | 16 +++---
 application/views/CisHtml/Cms/Content.php     |  7 +--
 public/js/apps/Cis/Cms.js                     | 54 ++++++++++++-------
 public/js/apps/api/cms.js                     | 14 +++++
 public/js/apps/api/fhcapifactory.js           |  4 +-
 public/js/components/Cis/Cms/Content.js       | 28 ++++++++++
 public/js/components/Pagination/Pagination.js | 26 +++++++++
 8 files changed, 128 insertions(+), 34 deletions(-)
 create mode 100644 public/js/apps/api/cms.js
 create mode 100644 public/js/components/Cis/Cms/Content.js
 create mode 100644 public/js/components/Pagination/Pagination.js

diff --git a/application/controllers/CisHtml/Cms.php b/application/controllers/CisHtml/Cms.php
index 2dd05dbae..4cca6bc38 100644
--- a/application/controllers/CisHtml/Cms.php
+++ b/application/controllers/CisHtml/Cms.php
@@ -60,14 +60,19 @@ class Cms extends FHC_Controller
 	 * @return void
 	 */
 	public function news($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
+	{
+		$this->load->view('CisHtml/Cms/Content', ['infoscreen' => $infoscreen, 'studiengang_kz' => $studiengang_kz, 'semester' => $semester, 'mischen' => $mischen, 'titel' => $titel, 'edit' => $edit, 'sichtbar' => $sichtbar]);
+	}
+
+	public function getNews($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
 	{
 		$page = intval($this->input->get('page', true));
 		$pagination_size = 10;
 		$news = $this->cmslib->getNews($infoscreen, $studiengang_kz, $semester, $mischen, $titel, $edit, $sichtbar, $page, $pagination_size);
 
-		if (isError($news))
-			return $this->load->view('CisHtml/Error', ['error' => getError($news)]);
-
-		$this->load->view('CisHtml/Cms/Content', ['content' => getData($news)]);
+		if (isError($news)) {
+			echo json_encode(getError($news));
+		}
+		echo json_encode(getData($news));
 	}
 }
diff --git a/application/models/content/News_model.php b/application/models/content/News_model.php
index 51ef16053..88d97bd09 100644
--- a/application/models/content/News_model.php
+++ b/application/models/content/News_model.php
@@ -55,15 +55,15 @@ class News_model extends DB_Model
 	 */
 	public function getNewsWithContent($sprache, $studiengang_kz, $semester, $fachbereich_kurzbz = null, $sichtbar = true, $maxalter = 0, $page = 1, $page_size = 10, $all = false, $mischen = true)
 	{
-		if (isset($page) && is_numeric($page) && isset($page_size) && is_numeric($page_size)) {
-			if ($page > 0 && $page_size > 0) {
-				$maxPageCount = $this->getMaxPageCount($page_size);
-				if ($maxPageCount) {
-					$page = $page % $maxPageCount;
-				}
-				$offset = $page * $page_size;
-				$this->addLimit($page_size, $offset);
+		if (isset($page) && is_numeric($page) && isset($page_size) && is_numeric($page_size) && $page > 0 && $page_size > 0) {
+
+			$maxPageCount = $this->getMaxPageCount($page_size);
+			if ($maxPageCount) {
+				$page = $page % $maxPageCount;
 			}
+			$offset = $page * $page_size;
+			$this->addLimit($page_size, $offset);
+
 		} else {
 			$this->addLimit($page_size);
 		}
diff --git a/application/views/CisHtml/Cms/Content.php b/application/views/CisHtml/Cms/Content.php
index e750ea5a5..a27128d23 100644
--- a/application/views/CisHtml/Cms/Content.php
+++ b/application/views/CisHtml/Cms/Content.php
@@ -1,5 +1,6 @@
 <?php
 $includesArray = array(
+	'primevue3' => true,
 	'customJSModules' => ['public/js/apps/Cis/Cms.js'],
 	'customCSSs' => [
 		'public/css/Cis4/Cms.css',
@@ -11,8 +12,8 @@ $this->load->view('templates/CISHTML-Header', $includesArray);
 ?>
 
 <div id="cms">
-	<?= $content; ?>
+	<content />
+
 </div>
 
-<?php $this->load->view('templates/CISHTML-Footer', $includesArray); ?>
-
+<?php $this->load->view('templates/CISHTML-Footer', $includesArray); ?>
\ No newline at end of file
diff --git a/public/js/apps/Cis/Cms.js b/public/js/apps/Cis/Cms.js
index 8f006ec27..cd2b5f6e9 100644
--- a/public/js/apps/Cis/Cms.js
+++ b/public/js/apps/Cis/Cms.js
@@ -1,20 +1,38 @@
 import BsConfirm from "../../components/Bootstrap/Confirm.js";
+//import Pagination from "../../components/Pagination/Pagination.js";
+import Content from "../../components/Cis/Cms/Content.js";
+import Fhcapi from "../api/fhcapifactory.js";
 
-Vue.createApp({
-	mounted() {
-		document.querySelectorAll('#cms [data-confirm]').forEach(el => {
-			el.addEventListener('click', evt => {
-				evt.preventDefault();
-				BsConfirm.popup(el.dataset.confirm).then(() => {
-					Axios.get(el.href).then(res => {
-						// TODO(chris): check for success then show message and/or reload
-						location = location;
-					}).catch(err => console.error('ERROR:', err));
-				}).catch(()=>{});
-			});
-		});
-		document.querySelectorAll('#cms [data-href]').forEach(el => {
-			el.href = el.dataset.href.replace(/^ROOT\//, FHC_JS_DATA_STORAGE_OBJECT.app_root);
-		});
-	}
-}).mount('#cms [data-confirm], #cms [data-href]');
+Vue.$fhcapi = Fhcapi;
+
+const app = Vue.createApp({
+  components: {
+    Content,
+  },
+  mounted() {
+    document.querySelectorAll("#cms [data-confirm]").forEach((el) => {
+      el.addEventListener("click", (evt) => {
+        evt.preventDefault();
+        BsConfirm.popup(el.dataset.confirm)
+          .then(() => {
+            Axios.get(el.href)
+              .then((res) => {
+                // TODO(chris): check for success then show message and/or reload
+                location = location;
+              })
+              .catch((err) => console.error("ERROR:", err));
+          })
+          .catch(() => {});
+      });
+    });
+    document.querySelectorAll("#cms [data-href]").forEach((el) => {
+      el.href = el.dataset.href.replace(
+        /^ROOT\//,
+        FHC_JS_DATA_STORAGE_OBJECT.app_root
+      );
+    });
+  },
+});
+app.use(primevue.config.default, { zIndex: { overlay: 9999 } });
+app.mount("#cms");
+//#cms [data-confirm], #cms [data-href]
diff --git a/public/js/apps/api/cms.js b/public/js/apps/api/cms.js
new file mode 100644
index 000000000..8ad2f1f32
--- /dev/null
+++ b/public/js/apps/api/cms.js
@@ -0,0 +1,14 @@
+export default {
+  getNews: function (page = 1, pageSize = 10) {
+    const url =
+      FHC_JS_DATA_STORAGE_OBJECT.app_root +
+      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+      "/CisHtml/Cms/getNews";
+    return axios.get(url, {
+      params: {
+        page,
+        pageSize,
+      },
+    });
+  },
+};
diff --git a/public/js/apps/api/fhcapifactory.js b/public/js/apps/api/fhcapifactory.js
index c1f1e0d5c..35120779f 100644
--- a/public/js/apps/api/fhcapifactory.js
+++ b/public/js/apps/api/fhcapifactory.js
@@ -1,5 +1,7 @@
 import Search from "./search.js";
+import Cms from "./cms.js";
 
 export default {
-    "Search": Search
+    "Search": Search,
+    "Cms": Cms,
 };
diff --git a/public/js/components/Cis/Cms/Content.js b/public/js/components/Cis/Cms/Content.js
new file mode 100644
index 000000000..415743e85
--- /dev/null
+++ b/public/js/components/Cis/Cms/Content.js
@@ -0,0 +1,28 @@
+import Pagination from "../../Pagination/Pagination.js";
+
+export default {
+  components: {
+    Pagination,
+  },
+  data() {
+    return {
+      content: null,
+    };
+  },
+  methods: {
+    loadNewPageContent: function (data) {
+      Vue.$fhcapi.Cms.getNews(data.page).then((result) => {
+        this.content = result.data;
+      });
+    },
+  },
+  created() {
+    Vue.$fhcapi.Cms.getNews().then((result) => {
+      this.content = result.data;
+    });
+  },
+  template: /*html*/ `
+    <pagination @page="loadNewPageContent">
+    <div v-html="content"></div>
+    </pagination>`,
+};
diff --git a/public/js/components/Pagination/Pagination.js b/public/js/components/Pagination/Pagination.js
new file mode 100644
index 000000000..0222a0dfa
--- /dev/null
+++ b/public/js/components/Pagination/Pagination.js
@@ -0,0 +1,26 @@
+export default {
+  components: {
+    paginator: primevue.paginator,
+  },
+  data() {
+    return {};
+  },
+  methods: {
+    newPageEvent: function (data) {
+      //console.log("hier", data.page);
+    },
+  },
+  mounted() {
+    console.log("pagination mounted");
+  },
+  template: /*html*/ `
+    
+  
+    <paginator @page="(page)=>$emit('page',{...page, page:page.page+1})" :rows="1"  :totalRecords="120" ></paginator>
+    <slot>
+    NO CONTENT WAS PROVIDED
+    </slot>
+    <paginator :rows="10" :totalRecords="120" :rowsPerPageOptions="[10, 20, 30]"></paginator>
+
+  `,
+};

From b51ce1302429b1be515150b85994cfa9412e82f8 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 16 Apr 2024 09:18:19 +0200
Subject: [PATCH 0591/1461] CSS correction

---
 public/css/Studentenverwaltung.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/css/Studentenverwaltung.css b/public/css/Studentenverwaltung.css
index f77988451..d29455097 100644
--- a/public/css/Studentenverwaltung.css
+++ b/public/css/Studentenverwaltung.css
@@ -24,15 +24,15 @@ html {
 	border-radius: 0!important;
 }
 
-#main {
+.stv {
 	display: flex;
 	flex-direction: column;
 	height: 100vh;
 }
-#main > header {
+.stv > header {
 	flex: 0 0 auto;
 }
-#main > div {
+.stv > div {
 	flex: 1 1 auto;
 }
 

From 63d7716a6c157f41e5e49cd634e60202ac2ec8a6 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 16 Apr 2024 09:19:17 +0200
Subject: [PATCH 0592/1461] Konto Edit: Date config

---
 .../js/components/Stv/Studentenverwaltung/Details/Konto/Edit.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Konto/Edit.js b/public/js/components/Stv/Studentenverwaltung/Details/Konto/Edit.js
index 9e65df428..b3d33b116 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Konto/Edit.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Konto/Edit.js
@@ -81,6 +81,8 @@ export default {
 					v-model="data.buchungsdatum"
 					name="buchungsdatum"
 					label="Buchungsdatum"
+					:enable-time-picker="false"
+					auto-apply
 					>
 				</form-input>
 				<form-input

From e15f4981fbf08ec99e1015fd86239a4281f0da10 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 16 Apr 2024 12:56:12 +0200
Subject: [PATCH 0593/1461] Konto new

---
 .../controllers/api/frontend/v1/stv/Konto.php | 160 +++++++++++++-
 application/models/crm/Konto_model.php        |  28 +++
 public/js/api/stv.js                          |   5 +
 public/js/api/stv/konto.js                    |  31 +++
 .../js/components/Stv/Studentenverwaltung.js  |   2 +-
 .../Stv/Studentenverwaltung/Details/Konto.js  |  37 ++--
 .../Studentenverwaltung/Details/Konto/Edit.js |   4 +-
 .../Studentenverwaltung/Details/Konto/New.js  | 199 ++++++++++++++++++
 8 files changed, 442 insertions(+), 24 deletions(-)
 create mode 100644 public/js/api/stv.js
 create mode 100644 public/js/api/stv/konto.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js

diff --git a/application/controllers/api/frontend/v1/stv/Konto.php b/application/controllers/api/frontend/v1/stv/Konto.php
index 782f28d00..12892d2f7 100644
--- a/application/controllers/api/frontend/v1/stv/Konto.php
+++ b/application/controllers/api/frontend/v1/stv/Konto.php
@@ -37,6 +37,8 @@ class Konto extends FHCAPI_Controller
 		parent::__construct([
 			'get' => 'student/stammdaten:r',
 			'getBuchungstypen' => 'student/stammdaten:r', // alle?
+			'checkDoubles' => ['admin:r', 'assistenz:r'],
+			'insert' => ['admin:w', 'assistenz:w'],
 			'update' => ['admin:w', 'assistenz:w']
 		]);
 
@@ -61,13 +63,14 @@ class Konto extends FHCAPI_Controller
 	{
 		$this->load->library('form_validation');
 
-		$this->form_validation->set_rules('person_id', 'Person ID', 'required');
-
+		$person_id = $this->input->post('person_id');
+		if (!$person_id || !is_array($person_id))
+			$this->form_validation->set_rules('person_id', 'Person ID', 'required');
 
 		if (!$this->form_validation->run())
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 
-		$person_id = $this->input->post('person_id');
+
 		$studiengang_kz = $this->input->post('studiengang_kz');
 
 		if ($this->input->post('only_open')) {
@@ -124,6 +127,146 @@ class Konto extends FHCAPI_Controller
 		$this->terminateWithSuccess($data);
 	}
 
+	/**
+	 * Check double Buchungen
+	 *
+	 * @return void
+	 */
+	public function checkDoubles()
+	{
+		if (!defined('FAS_DOPPELTE_BUCHUNGSTYPEN_CHECK') || !FAS_DOPPELTE_BUCHUNGSTYPEN_CHECK)
+			$this->terminateWithSuccess(false);
+
+		$this->load->library('form_validation');
+
+		$person_ids = $this->input->post('person_id');
+
+		if (!$person_ids || !is_array($person_ids)) {
+			$person_ids = [$person_ids];
+			$this->form_validation->set_rules('person_id', 'Person ID', 'required');
+		}
+		$this->form_validation->set_rules('studiensemester_kurzbz', 'Studiensemester', 'required');
+		$this->form_validation->set_rules('buchungstyp_kurzbz', 'Buchungstyp', 'required');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+
+		$buchungstypen = unserialize(FAS_DOPPELTE_BUCHUNGSTYPEN_CHECK);
+		$buchung = $this->input->post('buchungstyp_kurzbz');
+		
+		if (!isset($buchungstypen[$buchung]))
+			$this->terminateWithSuccess(false);
+
+		$result = $this->KontoModel->checkDoubleBuchung($person_ids, $this->input->post('studiensemester_kurzbz'), $buchungstypen[$buchung]);
+
+		#$result = $this->getDataOrTerminateWithError($result);
+		if (isError($result))
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		$result = $result->retval;
+
+		if (!$result)
+			$this->terminateWithSuccess(false);
+
+		$persons = array_map(function ($row) {
+			return $row->nachname . ' ' . $row->vorname;
+		}, $result);
+		
+		// TODO(chris): Phrases
+		$result = $this->p->t('konto', 'buchung_vorhanden') . "\n";
+		if (count($persons) > 10) {
+			$result .= "-" . implode("\n-", array_slice($persons, 0, 10)) . "\n";
+			
+			if (count($persons) == 11) {
+				$result .= "\n" . $this->p->t('konto', 'and_1_additional_person');
+			} else {
+				$result .= "\n" . $this->p->t('konto', 'and_x_additional_person', [
+					'x' => count($persons) - 10
+				]);
+			}
+		} else {
+			$result .= "-" . implode("\n-", $persons) . "\n";
+		}
+		$result .= $this->p->t('konto', 'proceed');
+
+		$this->addError($result, 'confirm');
+
+		$this->terminateWithSuccess(true);
+	}
+
+
+	/**
+	 * Save Buchung
+	 *
+	 * @return void
+	 */
+	public function insert()
+	{
+		$this->load->library('form_validation');
+
+		$person_ids = $this->input->post('person_id');
+
+		if (!$person_ids || !is_array($person_ids)) {
+			$person_ids = [$person_ids];
+			$this->form_validation->set_rules('person_id', 'Person ID', 'required');
+		}
+		$this->form_validation->set_rules('betrag', 'Betrag', 'numeric');
+		$this->form_validation->set_rules('buchungsdatum', 'Buchungsdatum', 'is_valid_date');
+		$this->form_validation->set_rules('buchungstext', 'Buchungstext', 'max_length[256]');
+		$this->form_validation->set_rules('mahnspanne', 'Mahnspanne', 'integer');
+		$this->form_validation->set_rules('buchungstyp_kurzbz', 'Buchungstyp', 'required|max_length[32]');
+		$this->form_validation->set_rules('studiensemester_kurzbz', 'Studiensemester', 'required|max_length[16]');
+		$this->form_validation->set_rules('studiengang_kz', 'Studiengang', 'required|has_permissions_for_stg[admin:rw,assistenz:rw]');
+		$this->form_validation->set_rules('credit_points', 'Credit Points', 'numeric');
+
+		Events::trigger('konto_insert_validation', $this->form_validation);
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+
+		$allowed = [
+			'betrag',
+			'buchungsdatum',
+			'buchungstext',
+			'mahnspanne',
+			'buchungstyp_kurzbz',
+			'studiensemester_kurzbz',
+			'studiengang_kz',
+			'credit_points',
+			'anmerkung'
+		];
+		$data = [
+			'updateamum' => date('c'),
+			'updatevon' => getAuthUID()
+		];
+		foreach ($allowed as $field)
+			if ($this->input->post($field) !== null)
+				$data[$field] = $this->input->post($field);
+
+		if (defined('FAS_BUCHUNGSTYP_FIXE_KOSTENSTELLE') && isset(unserialize(FAS_BUCHUNGSTYP_FIXE_KOSTENSTELLE)[$data['buchungstyp_kurzbz']])) {
+			$data['kostenstelle'] = unserialize(FAS_BUCHUNGSTYP_FIXE_KOSTENSTELLE)[$data['buchungstyp_kurzbz']];
+		}
+
+		$result = [];
+		foreach ($person_ids as $person_id) {
+			$id = $this->KontoModel->insert(array_merge($data, ['person_id' => $person_id]));
+			if (isError($id))
+				$this->addError(getError($id), self::ERROR_TYPE_GENERAL);
+			else {
+				$data = $this->KontoModel->withAdditionalInfo()->load(getData($id));
+				if (isError($data))
+					$this->addError(getError($data), self::ERROR_TYPE_GENERAL);
+				else
+					$result[] = getData($data);
+			}
+		}
+
+		if ($result)
+			$this->terminateWithSuccess($result);
+		// NOTE(chris): else there should already be error in the return object
+	}
+
 	/**
 	 * Save Buchung
 	 *
@@ -134,14 +277,21 @@ class Konto extends FHCAPI_Controller
 		$this->load->library('form_validation');
 
 		$this->form_validation->set_rules('buchungsnr', 'Buchungsnr', 'required');
-		$this->form_validation->set_rules('studiengang_kz', 'Studiengang', 'required|has_permissions_for_stg[admin:rw,assistenz:rw]');
+		$this->form_validation->set_rules('betrag', 'Betrag', 'numeric');
 		$this->form_validation->set_rules('buchungsdatum', 'Buchungsdatum', 'is_valid_date');
-		Events::trigger('konto_update_validation', $this->form_validation);
+		$this->form_validation->set_rules('buchungstext', 'Buchungstext', 'max_length[256]');
+		$this->form_validation->set_rules('mahnspanne', 'Mahnspanne', 'integer');
+		$this->form_validation->set_rules('buchungstyp_kurzbz', 'Buchungstyp', 'required|max_length[32]');
+		$this->form_validation->set_rules('studiensemester_kurzbz', 'Studiensemester', 'required|max_length[16]');
+		$this->form_validation->set_rules('studiengang_kz', 'Studiengang', 'required|has_permissions_for_stg[admin:rw,assistenz:rw]');
+		$this->form_validation->set_rules('credit_points', 'Credit Points', 'numeric');
 
+		Events::trigger('konto_update_validation', $this->form_validation);
 
 		if (!$this->form_validation->run())
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 
+
 		$id = $this->input->post('buchungsnr');
 		$allowed = [
 			'betrag',
diff --git a/application/models/crm/Konto_model.php b/application/models/crm/Konto_model.php
index 85ac9234c..77ae04990 100644
--- a/application/models/crm/Konto_model.php
+++ b/application/models/crm/Konto_model.php
@@ -96,6 +96,34 @@ class Konto_model extends DB_Model
 		return $this->getAlleBuchungen($person_id, $studiengang_kz);
 	}
 
+	/**
+	 * Check double Buchungen
+	 *
+	 * @param array				$person_ids
+	 * @param string			$studiensemester_kurzbz
+	 * @param array				$buchungstyp_kurzbzs
+	 *
+	 * @return stdClass
+	 */
+	public function checkDoubleBuchung($person_ids, $studiensemester_kurzbz, $buchungstyp_kurzbzs)
+	{
+		$this->addSelect('vorname');
+		$this->addSelect('nachname');
+
+		$this->addJoin('public.tbl_person', 'person_id');
+
+		$this->db->where_in('person_id', $person_ids);
+		$this->db->where_in('buchungstyp_kurzbz', $buchungstyp_kurzbzs);
+
+		$this->addGroupBy('vorname, nachname');
+		$this->addOrder('nachname');
+		$this->addOrder('vorname');
+
+		return $this->loadWhere([
+			'studiensemester_kurzbz' => $studiensemester_kurzbz
+		]);
+	}
+
 	/**
 	 * Sets a Payment as paid
 	 */
diff --git a/public/js/api/stv.js b/public/js/api/stv.js
new file mode 100644
index 000000000..2a84ab0b7
--- /dev/null
+++ b/public/js/api/stv.js
@@ -0,0 +1,5 @@
+import konto from './stv/konto.js';
+
+export default {
+	konto
+};
\ No newline at end of file
diff --git a/public/js/api/stv/konto.js b/public/js/api/stv/konto.js
new file mode 100644
index 000000000..0e4069f2c
--- /dev/null
+++ b/public/js/api/stv/konto.js
@@ -0,0 +1,31 @@
+export default {
+	tabulatorConfig(config, self) {
+		config.ajaxURL = 'api/frontend/v1/stv/konto/get';
+		config.ajaxParams = () => {
+			const params = {
+				person_id: self.modelValue.person_id || self.modelValue.map(e => e.person_id),
+				only_open: self.filter,
+				studiengang_kz: self.studiengang_kz_intern ? self.stg_kz : ''
+			};
+			return params;
+		};
+		config.ajaxRequestFunc = (url, config, params) => this.$fhcApi.post(url, params, config);
+		config.ajaxResponse = (url, params, response) => response.data;
+
+		return config;
+	},
+	checkDoubles(data) {
+		return this.$fhcApi.post('api/frontend/v1/stv/konto/checkDoubles', data, {
+			confirmErrorHandler: error => true
+		});
+	},
+	insert(data) {
+		return this.$fhcApi.post('api/frontend/v1/stv/konto/insert', data);
+	},
+	edit(data) {
+		return this.$fhcApi.post('api/frontend/v1/stv/konto/update', data);
+	},
+	getBuchungstypen() {
+		return this.$fhcApi.get('api/frontend/v1/stv/konto/getBuchungstypen');
+	}
+};
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 42e3cd5dd..57cfe998a 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -157,7 +157,7 @@ export default {
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 		this.$fhcApi
-			.get('api/frontend/v1/stv/konto/getBuchungstypen')
+			.factory.stv.konto.getBuchungstypen()
 			.then(result => {
 				this.lists.buchungstypen = result.data;
 			})
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Konto.js b/public/js/components/Stv/Studentenverwaltung/Details/Konto.js
index b6b71f50b..849754050 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Konto.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Konto.js
@@ -1,14 +1,17 @@
 import {CoreFilterCmpt} from "../../../filter/Filter.js";
 import FormInput from "../../../Form/Input.js";
+import KontoNew from "./Konto/New.js";
 import KontoEdit from "./Konto/Edit.js";
 
+// TODO(chris): Phrasen
 // TODO(chris): multi pers
-// TODO(chris): new header(multi pers), edit/row, gegenb.(date) multi, löschen multi, best. multi(recht)
+// TODO(chris): gegenb.(date) multi, löschen multi, best. multi(recht)
 
 export default {
 	components: {
 		CoreFilterCmpt,
 		FormInput,
+		KontoNew,
 		KontoEdit
 	},
 	props: {
@@ -25,6 +28,11 @@ export default {
 		};
 	},
 	computed: {
+		personIds() {
+			if (this.modelValue.person_id)
+				return [this.modelValue.person_id];
+			return this.modelValue.map(e => e.person_id);
+		},
 		stg_kz() {
 			if (this.modelValue.studiengang_kz)
 				return this.modelValue.studiengang_kz;
@@ -153,24 +161,13 @@ export default {
 			return columns;
 		},
 		tabulatorOptions() {
-			return {
-				ajaxURL: 'api/frontend/v1/stv/konto/get',
-				ajaxParams: () => {
-					const params = {
-						person_id: this.modelValue.person_id || this.modelValue.map(e => e.person_id),
-						only_open: this.filter,
-						studiengang_kz: this.studiengang_kz_intern ? this.stg_kz : ''
-					};
-					return params;
-				},
-				ajaxRequestFunc: (url, config, params) => {
-					return this.$fhcApi.post(url, params, config);
-				},
-				ajaxResponse: (url, params, response) => response.data,
+			return this.$fhcApi.factory.stv.konto.tabulatorConfig({
 				dataTree: true,
 				columns: this.tabulatorColumns,
+				selectable: true,
+				selectableRangeMode: 'click',
 				index: 'buchungsnr',
-			};
+			}, this);
 		}
 	},
 	watch: {
@@ -186,6 +183,9 @@ export default {
 			if (!data)
 				return this.reload();
 			this.$refs.table.tabulator.updateData(data);
+		},
+		actionNew() {
+			this.$refs.new.open();
 		}
 	},
 	created() {
@@ -221,8 +221,13 @@ export default {
 			table-only
 			:side-menu="false"
 			:tabulator-options="tabulatorOptions"
+			new-btn-show
+			new-btn-label="Buchung"
+			:new-btn-disabled="stg_kz === ''"
+			@click:new="actionNew"
 			>
 		</core-filter-cmpt>
+		<konto-new ref="new" :config="config" @saved="updateData" :person-ids="personIds" :stg-kz="stg_kz"></konto-new>
 		<konto-edit ref="edit" :config="config" @saved="updateData"></konto-edit>
 	</div>`
 };
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Konto/Edit.js b/public/js/components/Stv/Studentenverwaltung/Details/Konto/Edit.js
index b3d33b116..d7b2976e3 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Konto/Edit.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Konto/Edit.js
@@ -35,14 +35,14 @@ export default {
 			this.loading = true;
 
 			this.$refs.form
-				.post('api/frontend/v1/stv/konto/update', this.data)
+				.factory.stv.konto.edit(this.data)
 				.then(result => {
 					this.$emit('saved', result.data);
 					this.loading = false;
 					this.$refs.modal.hide();
 					this.$fhcAlert.alertSuccess('Daten wurden gespeichert');
 				})
-				.catch(error => {console.log(error); // TODO(chris): check if working with current fhcApi
+				.catch(error => {
 					this.$fhcAlert.handleSystemError(error);
 					this.loading = false;
 				});
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js b/public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js
new file mode 100644
index 000000000..b47d03456
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js
@@ -0,0 +1,199 @@
+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";
+
+// TODO(chris): Phrasen
+
+export default {
+	components: {
+		BsModal,
+		CoreForm,
+		FormValidation,
+		FormInput
+	},
+	inject: {
+		lists: {
+			from: 'lists'
+		},
+		defaultSemester: {
+			from: 'defaultSemester'
+		}
+	},
+	props: {
+		personIds: {
+			type: Array,
+			required: true
+		},
+		stgKz: {
+			type: Number,
+			required: true
+		},
+		config: {
+			type: Object,
+			default: {}
+		}
+	},
+	data() {
+		return {
+			loading: false,
+			data: {}
+		};
+	},
+	computed: {
+		reversedSems() {
+			return this.lists.studiensemester.toReversed();
+		},
+		activeBuchungstypen() {
+			return this.lists.buchungstypen.filter(e => e.aktiv);
+		}
+	},
+	methods: {
+		save() {
+			this.$refs.form.clearValidation();
+			this.loading = true;
+
+			const data = {...{
+				person_id: this.personIds,
+				studiengang_kz: this.stgKz
+			}, ...this.data};
+
+			this.$refs.form
+				.factory.stv.konto.checkDoubles(data)
+				.then(result => result.data
+					? Promise.all(
+						result.errors
+							.filter(e => e.type == 'confirm')
+							.map(e => BsConfirm.popup(Vue.h('div', {class:'text-preline'}, e.message)))
+					)
+					: Promise.resolve())
+				.then(() => data)
+				.then(this.$refs.form.factory.stv.konto.insert)
+				.then(result => {
+					this.$emit('saved', result.data);
+					this.loading = false;
+					this.$refs.modal.hide();
+					this.$fhcAlert.alertSuccess('Daten wurden gespeichert');
+				})
+				.catch(error => {
+					if (error)
+						this.$fhcAlert.handleSystemError(error);
+					this.loading = false;
+				});
+		},
+		open() {
+			this.data = {
+				betrag: '-0.00',
+				mahnspanne: 30,
+				buchungsdatum: new Date(),
+				studiensemester_kurzbz: this.defaultSemester
+			};
+			this.$refs.modal.show();
+		},
+		preventCloseOnLoading(ev) {
+			if (this.loading)
+				ev.returnValue = false;
+		},
+		checkDefaultBetrag(ev) {
+			const typ = this.lists.buchungstypen.filter(e => e.buchungstyp_kurzbz == ev).pop();
+			const amount = typ.standardbetrag || '-0.00';
+			const text = typ.standardtext || '';
+			const creditpoints = typ.credit_points || '';
+
+			if (!this.data.betrag || this.data.betrag == '-0.00')
+				this.data.betrag = amount;
+
+			if (!this.data.buchungstext)
+				this.data.buchungstext = text;
+
+			if (this.config.showCreditpoints && this.data.credit_points == '0.00')
+				this.data.credit_points = creditpoints;
+		}
+	},
+	template: `
+	<core-form ref="form" class="stv-details-konto-edit" @submit.prevent="save">
+		<bs-modal ref="modal" @hide-bs-modal="preventCloseOnLoading">
+			<form-validation></form-validation>
+
+			<fieldset :disabled="loading">
+				<form-input
+					type="select"
+					v-model="data.buchungstyp_kurzbz"
+					name="buchungstyp_kurzbz"
+					label="Typ"
+					@update:model-value="checkDefaultBetrag"
+					>
+					<option v-for="typ in activeBuchungstypen" :key="typ.buchungstyp_kurzbz" :value="typ.buchungstyp_kurzbz" :class="typ.aktiv ? '' : 'text-decoration-line-through text-muted'">
+						{{ typ.beschreibung }}
+					</option>
+				</form-input>
+				<form-input
+					v-model="data.betrag"
+					name="betrag"
+					label="Betrag"
+					>
+				</form-input>
+				<form-input
+					type="DatePicker"
+					v-model="data.buchungsdatum"
+					name="buchungsdatum"
+					label="Buchungsdatum"
+					:enable-time-picker="false"
+					auto-apply
+					>
+				</form-input>
+				<form-input
+					v-model="data.buchungstext"
+					name="buchungstext"
+					label="Buchungstext"
+					>
+				</form-input>
+				<form-input
+					v-if="config.showMahnspanne"
+					v-model="data.mahnspanne"
+					name="mahnspanne"
+					label="Mahnspanne"
+					>
+				</form-input>
+				<form-input
+					type="select"
+					v-model="data.studiensemester_kurzbz"
+					name="studiensemester_kurzbz"
+					label="Studiensemester"
+					>
+					<option v-for="sem in reversedSems" :key="sem.studiensemester_kurzbz" :value="sem.studiensemester_kurzbz">
+						{{ sem.studiensemester_kurzbz }}
+					</option>
+				</form-input>
+				<form-input
+					v-if="config.showCreditpoints"
+					v-model="data.credit_points"
+					name="credit_points"
+					label="Credit Points"
+					>
+				</form-input>
+				<form-input
+					type="textarea"
+					v-model="data.anmerkung"
+					name="anmerkung"
+					label="Anmerkung"
+					>
+				</form-input>
+			</fieldset>
+
+			<template #title>
+				New Buchung
+				<template v-if="personIds.length > 1">
+					({{ personIds.length }} Studenten)
+				</template>
+			</template>
+			<template #footer>
+				<button type="submit" class="btn btn-primary" :disabled="loading">
+					<i v-if="loading" class="fa fa-spinner fa-spin"></i>
+					Speichern
+				</button>
+			</template>
+		</bs-modal>
+	</core-form>`
+};
\ No newline at end of file

From 006a763436e63b1d8639274f4b34259e7c7302ed Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 16 Apr 2024 14:34:45 +0200
Subject: [PATCH 0594/1461] Konto delete

---
 .../controllers/api/frontend/v1/stv/Konto.php | 62 ++++++++++++++++---
 public/js/api/stv/konto.js                    |  3 +
 .../Stv/Studentenverwaltung/Details/Konto.js  | 16 ++++-
 system/phrasesupdate.php                      | 20 ++++++
 4 files changed, 93 insertions(+), 8 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Konto.php b/application/controllers/api/frontend/v1/stv/Konto.php
index 12892d2f7..1f6b963bb 100644
--- a/application/controllers/api/frontend/v1/stv/Konto.php
+++ b/application/controllers/api/frontend/v1/stv/Konto.php
@@ -39,7 +39,8 @@ class Konto extends FHCAPI_Controller
 			'getBuchungstypen' => 'student/stammdaten:r', // alle?
 			'checkDoubles' => ['admin:r', 'assistenz:r'],
 			'insert' => ['admin:w', 'assistenz:w'],
-			'update' => ['admin:w', 'assistenz:w']
+			'update' => ['admin:w', 'assistenz:w'],
+			'delete' => ['admin:w', 'assistenz:w']
 		]);
 
 		// Load models
@@ -64,11 +65,12 @@ class Konto extends FHCAPI_Controller
 		$this->load->library('form_validation');
 
 		$person_id = $this->input->post('person_id');
-		if (!$person_id || !is_array($person_id))
+		if (!$person_id || !is_array($person_id)) {
 			$this->form_validation->set_rules('person_id', 'Person ID', 'required');
 
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
+			if (!$this->form_validation->run())
+				$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
 
 
 		$studiengang_kz = $this->input->post('studiengang_kz');
@@ -251,14 +253,14 @@ class Konto extends FHCAPI_Controller
 		$result = [];
 		foreach ($person_ids as $person_id) {
 			$id = $this->KontoModel->insert(array_merge($data, ['person_id' => $person_id]));
-			if (isError($id))
+			if (isError($id)) {
 				$this->addError(getError($id), self::ERROR_TYPE_GENERAL);
-			else {
+			} else {
 				$data = $this->KontoModel->withAdditionalInfo()->load(getData($id));
 				if (isError($data))
 					$this->addError(getError($data), self::ERROR_TYPE_GENERAL);
 				else
-					$result[] = getData($data);
+					$result[] = current(getData($data));
 			}
 		}
 
@@ -327,4 +329,50 @@ class Konto extends FHCAPI_Controller
 
 		$this->terminateWithSuccess($result);
 	}
+
+	/**
+	 * Delete Buchung
+	 *
+	 * @return void
+	 */
+	public function delete()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('buchungsnr', 'Buchungsnr', 'required');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+
+		$buchungsnr = $this->input->post('buchungsnr');
+
+		$result = $this->KontoModel->load($buchungsnr);
+		#$result = $this->getDataOrTerminateWithError($result);
+		if (isError($result))
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		$result = $result->retval;
+
+		if (!$result)
+			$this->terminateWithError('buchung not found', self::ERROR_TYPE_GENERAL);
+
+		$_POST['studiengang_kz'] = current($result)->studiengang_kz;
+
+		$this->form_validation->set_rules('studiengang_kz', 'Studiengang', 'has_permissions_for_stg[admin:rw,assistenz:rw]');
+
+		Events::trigger('konto_delete_validation', $this->form_validation);
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+
+		Events::trigger('konto_delete', $buchungsnr);
+		
+		$result = $this->KontoModel->delete($buchungsnr);
+		#$this->getDataOrTerminateWithError($result);
+		if (isError($result))
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+
+		$this->terminateWithSuccess();
+	}
 }
diff --git a/public/js/api/stv/konto.js b/public/js/api/stv/konto.js
index 0e4069f2c..090bd30e2 100644
--- a/public/js/api/stv/konto.js
+++ b/public/js/api/stv/konto.js
@@ -25,6 +25,9 @@ export default {
 	edit(data) {
 		return this.$fhcApi.post('api/frontend/v1/stv/konto/update', data);
 	},
+	delete(buchungsnr) {
+		return this.$fhcApi.post('api/frontend/v1/stv/konto/delete', {buchungsnr});
+	},
 	getBuchungstypen() {
 		return this.$fhcApi.get('api/frontend/v1/stv/konto/getBuchungstypen');
 	}
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Konto.js b/public/js/components/Stv/Studentenverwaltung/Details/Konto.js
index 849754050..155c51ee2 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Konto.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Konto.js
@@ -154,6 +154,19 @@ export default {
 					);
 					container.append(button);
 
+					button = document.createElement('button');
+					button.className = 'btn btn-outline-secondary';
+					button.innerHTML = '<i class="fa fa-trash"></i>';
+					button.addEventListener('click', () =>
+						this.$fhcAlert
+							.confirmDelete()
+							.then(result => result ? cell.getData().buchungsnr : Promise.reject({handled:true}))
+							.then(this.$fhcApi.factory.stv.konto.delete)
+							.then(() => cell.getRow().delete())
+							.catch(this.$fhcAlert.handleSystemError)
+					);
+					container.append(button);
+
 					return container;
 				},
 				frozen: true
@@ -182,7 +195,7 @@ export default {
 		updateData(data) {
 			if (!data)
 				return this.reload();
-			this.$refs.table.tabulator.updateData(data);
+			this.$refs.table.tabulator.updateOrAddData(data);
 		},
 		actionNew() {
 			this.$refs.new.open();
@@ -221,6 +234,7 @@ export default {
 			table-only
 			:side-menu="false"
 			:tabulator-options="tabulatorOptions"
+			reload
 			new-btn-show
 			new-btn-label="Buchung"
 			:new-btn-disabled="stg_kz === ''"
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index abeb972a5..f4dd30a21 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -26573,6 +26573,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'sap',
+		'phrase' => 'msg_buchung_deleted',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Buchungszuordnung SAP geloescht: SalesOrder: {sap_sales_order_id}',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Buchungszuordnung SAP deleted: SalesOrder: {sap_sales_order_id}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 );
 
 

From 2f08d1b1c145e843286f311af116850fbe9de958 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 16 Apr 2024 15:42:49 +0200
Subject: [PATCH 0595/1461] Notizcomponent: add twoColumnsLayout, refactor UX

---
 .../controllers/api/frontend/v1/stv/Notiz.php |   9 +-
 public/js/components/Form/Upload/Dms.js       |   8 +-
 public/js/components/Notiz/NotizComponent.js  | 866 ++++++++++++++----
 .../Studentenverwaltung/Details/Notizen.js    |  45 +-
 4 files changed, 746 insertions(+), 182 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Notiz.php b/application/controllers/api/frontend/v1/stv/Notiz.php
index 29a0b576e..cf46f79a6 100644
--- a/application/controllers/api/frontend/v1/stv/Notiz.php
+++ b/application/controllers/api/frontend/v1/stv/Notiz.php
@@ -127,8 +127,8 @@ class Notiz extends FHCAPI_Controller
 		$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('von');
-		$ende = $this->input->post('bis');
+		$start = $this->input->post('start');
+		$ende = $this->input->post('ende');
 
 		//Speichern der Notiz und Notizzuordnung inkl Prüfung ob valid type
 		$result = $this->NotizModel->addNotizForType($type, $id, $titel, $text, $uid, $start, $ende, $erledigt, $verfasser_uid, $bearbeiter_uid);
@@ -222,8 +222,8 @@ class Notiz extends FHCAPI_Controller
 		$verfasser_uid = $this->input->post('verfasser');
 		$bearbeiter_uid = isset($_POST['bearbeiter']) ? $_POST['bearbeiter'] : $uid;
 		$erledigt = $this->input->post('erledigt');
-		$start = $this->input->post('von');
-		$ende = $this->input->post('bis');
+		$start = $this->input->post('start');
+		$ende = $this->input->post('ende');
 
 		$result = $this->NotizModel->update(
 			[
@@ -426,6 +426,7 @@ class Notiz extends FHCAPI_Controller
 
 	public function getMitarbeiter($searchString)
 	{
+		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
 		$result = $this->MitarbeiterModel->searchMitarbeiter($searchString);
 		if (isError($result)) {
 			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
diff --git a/public/js/components/Form/Upload/Dms.js b/public/js/components/Form/Upload/Dms.js
index c531065ff..6ad69848c 100644
--- a/public/js/components/Form/Upload/Dms.js
+++ b/public/js/components/Form/Upload/Dms.js
@@ -53,8 +53,14 @@ export default {
 	},
 	watch: {
 		modelValue(n) {
-			if (n instanceof FileList)
+			if (!n)
+				return;
+			if (n instanceof FileList) {
+				if (!this.$refs.upload) {
+					return;
+				}
 				return this.$refs.upload.files = n;
+			}
 
 			const dt = new DataTransfer();
 			const dms = [];
diff --git a/public/js/components/Notiz/NotizComponent.js b/public/js/components/Notiz/NotizComponent.js
index 3ba8615fe..fe2ecc3e8 100644
--- a/public/js/components/Notiz/NotizComponent.js
+++ b/public/js/components/Notiz/NotizComponent.js
@@ -3,6 +3,8 @@ import PvAutoComplete from "../../../../index.ci.php/public/js/components/primev
 import FormUploadDms from '../Form/Upload/Dms.js';
 import {CoreFilterCmpt} from "../filter/Filter.js";
 import BsModal from "../Bootstrap/Modal";
+import FormForm from '../Form/Form.js';
+import FormInput from '../Form/Input.js';
 
 
 export default {
@@ -11,148 +13,226 @@ export default {
 		VueDatePicker,
 		PvAutoComplete,
 		FormUploadDms,
+		FormForm,
+		FormInput,
 		BsModal
 	},
 	props: [
 		'typeId',
 		'id',
+		'notizLayout',
 		'showErweitert',
 		'showDocument',
-		'showTinyMCE'
+		'showTinyMCE',
+		'visibleColumns'
 		],
 	data(){
-		return {
-			tabulatorOptions: {
-				ajaxURL: 'api/frontend/v1/stv/Notiz/getNotizen/' + this.id + '/' + this.typeId,
-				ajaxRequestFunc: this.$fhcApi.get,
-				ajaxResponse: (url, params, response) => response.data,
-				//ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Notiz/getNotizen/' + this.id + '/' + this.typeId),
-				columns: [
-					{title: "Titel", field: "titel"},
-					{title: "Text", field: "text_stripped", width: 250},
-					{title:  "VerfasserIn", field: "verfasser_uid"},
-					{title: "BearbeiterIn", field: "bearbeiter_uid", visible: false},
-					{title: "Start", field: "start_format", visible: false},
-					{title: "Ende", field: "ende_format", visible: false},
-					{title: "Dokumente", field: "countdoc"},
-					{title: "Erledigt", field: "erledigt", visible: false},
-					{title: "Notiz_id", field: "notiz_id", visible: false},
-					{title: "Notizzuordnung_id", field: "notizzuordnung_id", visible: false},
-					{title: "letzte Änderung", field: "lastupdate", visible: false},
-					{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";
+			return {
+				tabulatorOptions: {
+					ajaxURL: 'api/frontend/v1/stv/Notiz/getNotizen/' + this.id + '/' + this.typeId,
+					ajaxRequestFunc: this.$fhcApi.get,
+					ajaxResponse: (url, params, response) => response.data,
+					//ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Notiz/getNotizen/' + this.id + '/' + this.typeId),
+					columns: [
+						{
+							title: "Titel",
+							field: "titel",
+							width: 100,
+							visible: true,
+							tooltip:function(e, cell, onRendered){
+								var el = document.createElement("div");
+								el.style.backgroundColor = "white";
+								el.style.fontWeight = "bold";
+								el.style.padding = "5px";
+								el.style.border = "1px solid black";
 
-							let button = document.createElement('button');
-							button.className = 'btn btn-outline-secondary btn-action';
-							button.innerHTML = '<i class="fa fa-edit"></i>';
-							button.addEventListener(
-								'click',
-								(event) =>
-								this.actionEditNotiz(cell.getData().notiz_id)
-							);
-							container.append(button);
+								el.innerText = cell.getColumn().getField() + " - " + cell.getValue();
 
-							button = document.createElement('button');
-							button.className = 'btn btn-outline-secondary btn-action';
-							button.innerHTML = '<i class="fa fa-xmark"></i>';
-							button.addEventListener(
-								'click',
-								() =>
-								this.actionDeleteNotiz(cell.getData().notiz_id)
-							);
-							container.append(button);
-
-							return container;
+								return el;
+							},
 						},
-						frozen: true
-				}],
-				layout: 'fitColumns',
-				layoutColumnsOnNewData: false,
-				height: '150',
-				selectableRangeMode: 'click',
-				selectable: true,
-				index: 'notiz_id'
-			},
-			tabulatorEvents: [
-				{
-					event: 'tableBuilt',
-					handler: async() => {
+						{
+							title: "Text",
+							field: "text_stripped",
+							width: 250,
+							visible: true,
+							tooltip:function(e, cell, onRendered){
+								var el = document.createElement("div");
+								el.style.backgroundColor = "white";
+								el.style.fontWeight = "bold";
+								el.style.padding = "5px";
+								el.style.border = "1px solid black";
+								el.style.borderRadius = "5px";
 
-						await this.$p.loadCategory(['notiz','global']);
+								el.innerText = cell.getValue();
 
-						let cm = this.$refs.table.tabulator.columnManager;
+								return el;
+							},
+						},
+						{title: "VerfasserIn", field: "verfasser_uid", width: 124, visible: false},
+						{title: "BearbeiterIn", field: "bearbeiter_uid", width: 126, visible: false},
+						{title: "Start", field: "start_format", width: 86, visible: false},
+						{title: "Ende", field: "ende_format", width: 86, visible: false},
+						{title: "Dokumente", field: "countdoc", width: 100, visible: false},
+						{
+							title: "Erledigt",
+							field: "erledigt",
+							width: 97,
+							visible: false,
+							formatter:"tickCross",
+							hozAlign:"center",
+							formatterParams: {
+								tickElement: '<i class="fa fa-check text-success"></i>',
+								crossElement: '<i class="fa fa-xmark text-danger"></i>'
+							}
+						},
+						{title: "Notiz_id", field: "notiz_id", width: 92, visible: false},
+						{title: "Notizzuordnung_id", field: "notizzuordnung_id", width: 164, visible: false},
+						{title: "letzte Änderung", field: "lastupdate", width: 146, visible: false},
+						{
+							title: 'Aktionen', field: 'actions',
+							width: 100,
+							formatter: (cell, formatterParams, onRendered) => {
+								let container = document.createElement('div');
+								container.className = "d-flex gap-2";
 
-						cm.getColumnByField('verfasser_uid').component.updateDefinition({
-							title: this.$p.t('notiz', 'verfasser')
-						});
-						cm.getColumnByField('titel').component.updateDefinition({
-							title: this.$p.t('global', 'titel')
-						});
-						cm.getColumnByField('text_stripped').component.updateDefinition({
-							title: this.$p.t('global', 'text')
-						});
-						cm.getColumnByField('bearbeiter_uid').component.updateDefinition({
-							title: this.$p.t('notiz', 'bearbeiter')
-						});
-						cm.getColumnByField('start_format').component.updateDefinition({
-							title: this.$p.t('global', 'gueltigVon')
-						});
-						cm.getColumnByField('ende_format').component.updateDefinition({
-							title: this.$p.t('global', 'gueltigBis')
-						});
-						cm.getColumnByField('countdoc').component.updateDefinition({
-							title: this.$p.t('notiz', 'document')
-						});
-						cm.getColumnByField('erledigt').component.updateDefinition({
-							title: this.$p.t('notiz', 'erledigt')
-						});
-						cm.getColumnByField('lastupdate').component.updateDefinition({
-							title: this.$p.t('notiz', 'letzte_aenderung')
-						});
+								let button = document.createElement('button');
+								button.className = 'btn btn-outline-secondary btn-action';
+								button.innerHTML = '<i class="fa fa-edit"></i>';
+								button.addEventListener(
+									'click',
+									(event) =>
+										this.actionEditNotiz(cell.getData().notiz_id)
+								);
+								container.append(button);
 
+								button = document.createElement('button');
+								button.className = 'btn btn-outline-secondary btn-action';
+								button.innerHTML = '<i class="fa fa-xmark"></i>';
+								button.addEventListener(
+									'click',
+									() =>
+										this.actionDeleteNotiz(cell.getData().notiz_id)
+								);
+								container.append(button);
+
+								return container;
+							},
+							frozen: true
+						}],
+					layout: 'fitColumns',
+					layoutColumnsOnNewData: false,
+					height: '250',
+					selectableRangeMode: 'click',
+					selectable: true,
+					index: 'notiz_id'
+				},
+				tabulatorEvents: [
+					{
+						event: 'tableBuilt',
+						handler: async () => {
+
+							await this.$p.loadCategory(['notiz', 'global']);
+
+							let cm = this.$refs.table.tabulator.columnManager;
+
+							cm.getColumnByField('verfasser_uid').component.updateDefinition({
+								title: this.$p.t('notiz', 'verfasser'),
+								visible: this.showVariables.showVerfasser
+							});
+							cm.getColumnByField('titel').component.updateDefinition({
+								title: this.$p.t('global', 'titel'),
+								visible: this.showVariables.showTitel
+							});
+							cm.getColumnByField('text_stripped').component.updateDefinition({
+								title: this.$p.t('global', 'text'),
+								visible: this.showVariables.showText
+							});
+							cm.getColumnByField('bearbeiter_uid').component.updateDefinition({
+								title: this.$p.t('notiz', 'bearbeiter'),
+								visible: this.showVariables.showBearbeiter
+							});
+							cm.getColumnByField('start_format').component.updateDefinition({
+								title: this.$p.t('global', 'gueltigVon'),
+								visible: this.showVariables.showVon
+							});
+							cm.getColumnByField('ende_format').component.updateDefinition({
+								title: this.$p.t('global', 'gueltigBis'),
+								visible: this.showVariables.showBis
+							});
+							cm.getColumnByField('countdoc').component.updateDefinition({
+								title: this.$p.t('notiz', 'document'),
+								visible: this.showVariables.showDokumente
+							});
+							cm.getColumnByField('erledigt').component.updateDefinition({
+								title: this.$p.t('notiz', 'erledigt'),
+								visible: this.showVariables.showErledigt
+							});
+							cm.getColumnByField('lastupdate').component.updateDefinition({
+								title: this.$p.t('notiz', 'letzte_aenderung'),
+								visible: this.showVariables.showLastupdate
+							});
+							cm.getColumnByField('notiz_id').component.updateDefinition({
+								visible: this.showVariables.showNotiz_id
+							});
+							cm.getColumnByField('notizzuordnung_id').component.updateDefinition({
+								visible: this.showVariables.showNotizzuordnung_id
+							});
+
+						}
 					}
-				}
-			],
-			notizen: [],
-			multiupload: true,
-			mitarbeiter: [],
-			filteredMitarbeiter: [],
-			zwischenvar: '',
-			editorInitialized: false,
-			editor: null,
-			notizData: {
-				typeId: this.typeId,
-				titel: null,
-				statusNew: true,
-				text: null,
-				lastChange: null,
-				von: null,
-				bis: null,
-				document: null,
-				erledigt: false,
-				verfasser: null,
-				bearbeiter: null,
-				anhang: []
-			},
-		};
+				],
+				notizen: [],
+				multiupload: true,
+				mitarbeiter: [],
+				filteredMitarbeiter: [],
+				zwischenvar: '',
+				editorInitialized: false,
+				editor: null,
+				notizData: {
+					typeId: this.typeId,
+					titel: null,
+					statusNew: true,
+					text: null,
+					lastUpdate: null,
+					von: null,
+					bis: null,
+					document: null,
+					erledigt: false,
+					verfasser: null,
+					bearbeiter: null,
+					anhang: []
+				},
+				showVariables: {
+					showTitel: false,
+					showText: false,
+					showVerfasser: false,
+					showBearbeiter: false,
+					showVon: false,
+					showBis: false,
+					showDokumente: false,
+					showErledigt: false,
+					showNotiz_id: false,
+					showNotizzuordnung_id: false,
+					showLastupdate: false
+				},
+		}
 	},
 	methods: {
-		actionDeleteNotiz(notiz_id){
+		actionDeleteNotiz(notiz_id) {
 			this.loadNotiz(notiz_id).then(() => {
-					this.$refs.deleteNotizModal.show();
+				this.$refs.deleteNotizModal.show();
 			});
 		},
-		actionEditNotiz(notiz_id){
+		actionEditNotiz(notiz_id) {
 			this.loadNotiz(notiz_id).then(() => {
-				if(this.notizen.notiz_id) {
+				if (this.notizen.notiz_id) {
+					this.notizData.typeId = this.typeId;
 					this.notizData.titel = this.notizen.titel;
 					this.notizData.statusNew = false;
 					this.notizData.text = this.notizen.text;
 					this.notizData.intText = this.notizen.text;
-					this.notizData.lastChange = this.notizen.lastupdate;
+					this.notizData.lastupdate = this.notizen.lastupdate;
 					this.notizData.von = this.notizen.start;
 					this.notizData.bis = this.notizen.ende;
 					this.notizData.document = this.notizen.dms_id;
@@ -164,14 +244,13 @@ export default {
 				}
 			})
 				.then(() => {
-					if(this.notizData.dms_id){
+					if (this.notizData.dms_id) {
 						this.loadDocEntries(this.notizData.notiz_id);
-					}
-					else
+					} else
 						this.notizData.anhang = [];
 				});
 		},
-		actionNewNotiz(){
+		actionNewNotiz() {
 			this.resetFormData();
 		},
 		addNewNotiz() {
@@ -181,82 +260,84 @@ export default {
 			Object.entries(this.notizData.anhang).forEach(([k, v]) => formData.append(k, v));
 			this.$fhcApi.post('api/frontend/v1/stv/notiz/addNewNotiz/' + this.id,
 				formData,
-				{ Headers: { "Content-Type": "multipart/form-data" } }
+				{Headers: {"Content-Type": "multipart/form-data"}}
 			).then(response => {
 				this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
-					this.resetFormData();
-					this.reload();
+				this.resetFormData();
+				this.reload();
 			})
 				.catch(this.$fhcAlert.handleSystemError)
 				.finally(() => {
-				window.scrollTo(0, 0);
-			});
+					window.scrollTo(0, 0);
+				});
 		},
-		deleteNotiz(notiz_id){
+		deleteNotiz(notiz_id) {
 			this.param = {
-				'notiz_id':  notiz_id
+				'notiz_id': notiz_id
 			};
 
 			return this.$fhcApi.post('api/frontend/v1/stv/notiz/deleteNotiz/', this.param)
 				.then(result => {
-						this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
-						this.$refs.deleteNotizModal.hide();
-						this.reload();
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
+					this.$refs.deleteNotizModal.hide();
+					this.reload();
+					this.resetFormData();
 				})
 				.catch(this.$fhcAlert.handleSystemError)
-				.finally(()=> {
+				.finally(() => {
 					window.scrollTo(0, 0);
 				});
 		},
-		loadNotiz(notiz_id){
+		loadNotiz(notiz_id) {
 			this.param = {
-				'notiz_id':  notiz_id
+				'notiz_id': notiz_id
 			};
 			return this.$fhcApi.post('api/frontend/v1/stv/notiz/loadNotiz/',
 				this.param)
-					.then(result => {
-						this.notizData = result.data;
-						return result;
-					})
+				.then(result => {
+					this.notizData = result.data;
+					this.notizData.typeId = this.typeId;
+					return result;
+				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
-		loadDocEntries(notiz_id){
+		loadDocEntries(notiz_id) {
 			this.param = {
-				'notiz_id':  notiz_id
+				'notiz_id': notiz_id
 			};
 			return this.$fhcApi.post('api/frontend/v1/stv/notiz/loadDokumente/',
 				this.param)
 				.then(
 					result => {
-							this.notizData.anhang = result.data;
+						this.notizData.anhang = result.data;
 						return result;
 					})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
-		updateNotiz(notiz_id){
+		updateNotiz(notiz_id) {
 			const formData = new FormData();
 			formData.append('data', JSON.stringify(this.notizData));
 			Object.entries(this.notizData.anhang).forEach(([k, v]) => formData.append(k, v));
 
 			this.param = {
-				'notiz_id':  notiz_id
+				'notiz_id': notiz_id
 			};
 
 			return this.$fhcApi.post(
-				'api/frontend/v1/stv/notiz/updateNotiz/' ,
+				'api/frontend/v1/stv/notiz/updateNotiz/',
 				formData,
-				{ Headers: { "Content-Type": "multipart/form-data" } }
+				{Headers: {"Content-Type": "multipart/form-data"}}
 			).then(response => {
 				this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
-					this.resetFormData();
-					this.reload();
+				this.resetFormData();
+				this.reload();
 			})
-			.catch(this.$fhcAlert.handleSystemError)
-			.finally(() => {
-				window.scrollTo(0, 0);
-			});
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					window.scrollTo(0, 0);
+				});
 		},
-		reload(){
+		reload() {
 			this.$refs.table.reloadTable();
 		},
 		resetFormData() {
@@ -266,7 +347,7 @@ export default {
 				titel: null,
 				statusNew: true,
 				text: null,
-				lastChange: null,
+				lastUpdate: null,
 				von: null,
 				bis: null,
 				document: null,
@@ -276,11 +357,11 @@ export default {
 				anhang: []
 			};
 		},
-		getUid(){
+		getUid() {
 			this.$fhcApi
 				.get('api/frontend/v1/stv/notiz/getUid')
 				.then(result => {
-						this.notizData.intVerfasser = result.data;
+					this.notizData.intVerfasser = result.data;
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
@@ -301,14 +382,14 @@ export default {
 				//toolbar: " blocks | bold italic underline | alignleft aligncenter alignright alignjustify",
 				toolbar: 'styleselect | bold italic underline | alignleft aligncenter alignright alignjustify',
 				style_formats: [
-					{ title: 'Blocks', block: 'div' },
-					{ title: 'Paragraph', block: 'p' },
-					{ title: 'Heading 1', block: 'h1' },
-					{ title: 'Heading 2', block: 'h2' },
-					{ title: 'Heading 3', block: 'h3' },
-					{ title: 'Heading 4', block: 'h4' },
-					{ title: 'Heading 5', block: 'h5' },
-					{ title: 'Heading 6', block: 'h6' },
+					{title: 'Blocks', block: 'div'},
+					{title: 'Paragraph', block: 'p'},
+					{title: 'Heading 1', block: 'h1'},
+					{title: 'Heading 2', block: 'h2'},
+					{title: 'Heading 3', block: 'h3'},
+					{title: 'Heading 4', block: 'h4'},
+					{title: 'Heading 5', block: 'h5'},
+					{title: 'Heading 6', block: 'h6'},
 				],
 				autoresize_bottom_margin: 16,
 
@@ -324,9 +405,16 @@ export default {
 		},
 		updateText(value) {
 			this.notizData.text = value;
-		}
+		},
+		initializeShowVariables() {
+			this.visibleColumns.forEach(column => {
+				const columnToShow = "show" + column.charAt(0).toUpperCase() + column.slice(1);
+				this.showVariables[columnToShow] = true;
+			});
+		},
 	},
 	created(){
+		this.initializeShowVariables();
 		this.getUid();
 	},
 	async mounted() {
@@ -370,9 +458,9 @@ export default {
 		}
 	},
 	template: `
-	<div class="notiz-notiz">
 
-		<!--Modal: deleteNotizModal-->
+	<div v-if="notizLayout=='classicFas'"> 
+				<!--Modal: deleteNotizModal-->
 		<BsModal ref="deleteNotizModal">
 			<template #title>Notiz löschen</template>
 			<template #default>
@@ -398,6 +486,7 @@ export default {
 		</core-filter-cmpt>
 		<br>
 	
+	
 		<form ref="formc" @submit.prevent class="row pt-3">
 		<br><br>
 			<div class="pt-2">
@@ -415,14 +504,14 @@ export default {
 				</div>
 	
 				<div class="row mb-3">
-					<label for="titel" class="form-label col-sm-2">{{$p.t('global','titel')}}</label>
+					<label for="titel" class="form-label col-sm-2">{{$p.t('global','titel')}} *</label>
 					<div class="col-sm-7">
 						<input type="text" v-model="notizData.titel" class="form-control">
 					</div>
 				</div>
 							
 				<div class="row mb-3">
-					<label for="text" class="form-label col-sm-2">{{$p.t('global','text')}}</label>
+					<label for="text" class="form-label col-sm-2">{{$p.t('global','text')}} *</label>
 						
 					<!-- TinyMce 5 -->
 					<div v-if="showTinyMCE"class="col-sm-7">
@@ -459,7 +548,11 @@ export default {
 			
 				<div class="row mb-3">
 					<label for="bis" class="form-label col-sm-2">{{$p.t('notiz','verfasser')}}</label>
-					<div class="col-sm-3">
+										
+					<div v-if="notizData.verfasser_uid" class="col-sm-3">
+						<input type="text" :readonly="readonly" class="form-control" id="name" v-model="notizData.verfasser_uid">
+					</div>
+					<div v-else class="col-sm-3">
 						<PvAutoComplete v-model="notizData.intVerfasser" optionLabel="mitarbeiter"  :suggestions="filteredMitarbeiter" @complete="search" minLength="3"/>
 					</div>
 					
@@ -467,7 +560,7 @@ export default {
 					<div class="col-sm-3">
 						<vue-date-picker
 							id="von"
-							v-model="notizData.von"
+							v-model="notizData.start"
 							clearable="false"
 							auto-apply
 							:enable-time-picker="false"
@@ -479,7 +572,12 @@ export default {
 				
 				<div class="row mb-3">
 					<label for="bis" class="form-label col-sm-2">{{$p.t('notiz','bearbeiter')}}</label>
-					<div class="col-sm-3">
+					
+					<div v-if="notizData.bearbeiter_uid" class="col-sm-3">
+						<input type="text" :readonly="readonly" class="form-control" id="name" v-model="notizData.bearbeiter_uid">
+					</div>
+					
+					<div v-else class="col-sm-3">
 						<PvAutoComplete v-model="notizData.intBearbeiter" optionLabel="mitarbeiter" :suggestions="filteredMitarbeiter" @complete="search" minlength="3"/>
 					</div>
 					
@@ -488,7 +586,7 @@ export default {
 					<div class="col-sm-3">
 						<vue-date-picker
 							id="bis"
-							v-model="notizData.bis"
+							v-model="notizData.ende"
 							clearable="false"
 							auto-apply
 							:enable-time-picker="false"
@@ -509,9 +607,9 @@ export default {
 			</div>
 			
 			<div class="row mb-3">
-				<label for="lastChange" class="form-label col-sm-2 small">{{$p.t('notiz','letzte_aenderung')}}</label>
+				<label for="lastUpdate" class="form-label col-sm-2 small">{{$p.t('notiz','letzte_aenderung')}}</label>
 				<div class="col-sm-7">
-					<p class="small">{{notizData.lastChange}}</p>
+					<p class="small">{{notizData.lastupdate}}</p>
 				</div>
 			</div>
 			
@@ -519,6 +617,428 @@ export default {
 			<button v-else type="button" class="btn btn-primary" @click="updateNotiz(notizData.notiz_id)"> {{$p.t('ui', 'speichern')}}</button>
 					
 		</form>		
-	</div>`
+	</div>
+
+	<div v-else-if="notizLayout=='twoColumnsFormRight'" class="notiz-notiz">
+
+		<!--Modal: deleteNotizModal-->
+		<BsModal ref="deleteNotizModal">
+			<template #title>Notiz löschen</template>
+			<template #default>
+				<p>Notiz wirklich löschen?</p>
+			</template>
+			<template #footer>
+				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">Abbrechen</button>
+				<button ref="Close" type="button" class="btn btn-primary" @click="deleteNotiz(notizData.notiz_id)">OK</button>
+			</template>
+		</BsModal>
+		
+		<div class="row">
+			<div class="col-sm-6 pt-6">
+			<br>
+					<core-filter-cmpt
+						ref="table"
+						:tabulator-options="tabulatorOptions"
+						:tabulator-events="tabulatorEvents"
+						table-only
+						:side-menu="false"
+						reload
+						new-btn-show
+						new-btn-label="Notiz"
+						@click:new="actionNewNotiz"
+						>
+					</core-filter-cmpt>	
+			</div>
+		
+			<div class="col-sm-6">
+<!--			<p v-if="notizData.statusNew" class="fw-bold">{{$p.t('notiz','notiz_new')}} <span> [{{notizData.typeId}}]</span></p>
+			<p v-else class="fw-bold">{{$p.t('notiz','notiz_edit')}} <span> [{{notizData.typeId}}]</span></p>-->
+			
+
+
+			  	<form ref="formc" @submit.prevent class="row pt-3">
+			
+	<!--				<div class="row">-->
+						<div class="col pt-3">
+							<p v-if="notizData.statusNew" class="fw-bold">{{$p.t('notiz','notiz_new')}} <span> [{{notizData.typeId}}]</span></p>
+							<p v-else class="fw-bold">{{$p.t('notiz','notiz_edit')}} <span> [{{notizData.typeId}}]</span></p>
+						</div>
+											
+						<div class="position-sticky top-0 z-1 pt-3">
+							<button v-if="notizData.statusNew" class="btn btn-primary position-absolute top-0 end-0" @click="addNewNotiz()"> {{$p.t('studierendenantrag', 'btn_new')}}</button>
+							<button v-else class="btn btn-primary position-absolute top-0 end-0" @click="updateNotiz(notizData.notiz_id)"> {{$p.t('ui', 'speichern')}}</button>
+						</div>
+	
+					<div class="row mb-3">
+						<form-input
+							container-class="col-12"
+							:label="$p.t('global','titel')  + ' *'"
+							type="text"
+							v-model="notizData.titel"
+							name="titel"
+							>
+						</form-input>
+					</div>
+								
+					<div class="row mb-3">
+							
+						<!-- TinyMce 5 -->
+						<div v-if="showTinyMCE" class="col-sm-12">
+							<label for="text" class="form-label col-sm-2">{{$p.t('global','text')}} *</label>
+							<textarea
+							ref="editor"
+							rows="5"
+							cols="75"
+							class="form-control"
+							:value="notizData.text"
+							@input="updateText"></textarea>
+						</div>
+						
+						<div v-else class="col-sm-12">
+							<label for="text" class="form-label col-sm-2">{{$p.t('global','text')}} *</label>
+							<textarea rows="5" cols="75" v-model="notizData.text" class="form-control"></textarea>
+						</div>
+					
+					</div>
+			
+					<!-- show Documentupload-->
+					<div v-if="showDocument">
+						<div class="row mb-3">		
+							
+							<div  class="col-sm-12 py-3">
+							<label for="text" class="form-label col-sm-2">{{$p.t('notiz','document')}}</label>
+								<!--Upload Component-->
+								<FormUploadDms ref="upload" id="file" multiple v-model="notizData.anhang"></FormUploadDms>
+							</div>
+						
+						</div>
+					</div>
+					
+					<!-- show Details-->
+					<div v-if="showErweitert">
+					
+						<div class="row mb-3">
+											
+							<form-input
+								container-class="col-6"
+								:label="$p.t('global', 'gueltigVon')"
+								type="DatePicker"
+								v-model="notizData['start']"
+								name="von"
+								auto-apply
+								:enable-time-picker="false"
+								format="dd.MM.yyyy"
+								preview-format="dd.MM.yyyy"
+								:teleport="true"
+								>
+							</form-input>
+							
+							<form-input
+								container-class="col-6"
+								:label="$p.t('global', 'gueltigBis')"
+								type="DatePicker"
+								v-model="notizData.ende"
+								name="bis"
+								auto-apply
+								:enable-time-picker="false"
+								format="dd.MM.yyyy"
+								preview-format="dd.MM.yyyy"
+								:teleport="true"
+								>
+							</form-input>
+						</div>
+						
+						<div class="row mb-3">
+							<form-input 
+								v-if="notizData.verfasser_uid"
+								container-class="col-6"
+								:label="$p.t('notiz', 'verfasser')"
+								type="text"
+								v-model="notizData.verfasser_uid"
+								name="titel"
+							>
+							</form-input>
+					
+							<form-input
+								v-else
+								container-class="col-6"
+								:label="$p.t('notiz', 'verfasser')"
+								type="autocomplete"
+								v-model="notizData.intVerfasser"
+								:suggestions="filteredMitarbeiter" 
+								@complete="search" 
+								optionLabel="mitarbeiter"
+								minLength="3"
+								>
+							</form-input>
+							
+							<form-input
+								v-if="notizData.bearbeiter_uid"
+								container-class="col-6"
+								:label="$p.t('notiz', 'bearbeiter')"
+								v-model="notizData.bearbeiter_uid"
+								minlength="3"
+								>
+							</form-input>
+							
+							<form-input
+								v-else
+								container-class="col-6"
+								:label="$p.t('notiz', 'bearbeiter')"
+								type="autocomplete"
+								v-model="notizData.intBearbeiter"
+								:suggestions="filteredMitarbeiter" 
+								@complete="search" 
+								optionLabel="mitarbeiter"
+								minlength="3"
+								>
+							</form-input>	
+						</div>
+														
+						<div class="row mb-3">
+								<div class="col-2 pt-4 d-flex align-items-center">
+									<form-input
+										container-class="form-check"
+										:label="$p.t('notiz', 'erledigt')"
+										type="checkbox"
+										v-model="notizData.erledigt"
+										name="erledigt"
+										>
+									</form-input>
+								</div>
+		<!--					<label for="bis" class="form-label col-sm-2">{{$p.t('notiz','erledigt')}}</label>
+							<div class="col-sm-1">
+								<input type="checkbox" v-model="notizData.erledigt">
+							</div>-->
+						</div>
+						
+					</div>
+					
+					<div class="row mb-3">
+						<label for="lastUpdate" class="form-label col-sm-3 small">{{$p.t('notiz','letzte_aenderung')}}</label>
+						<div class="col-sm-5">
+							<p class="small">{{notizData.lastupdate}}</p>
+						</div>
+					</div>
+					
+				</form>		
+			</div>
+		</div> 
+	</div>
+	
+	<div v-else-if="notizLayout=='twoColumnsFormLeft'" class="notiz-notiz">
+
+		<!--Modal: deleteNotizModal-->
+		<BsModal ref="deleteNotizModal">
+			<template #title>Notiz löschen</template>
+			<template #default>
+				<p>Notiz wirklich löschen?</p>
+			</template>
+			<template #footer>
+				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">Abbrechen</button>
+				<button ref="Close" type="button" class="btn btn-primary" @click="deleteNotiz(notizData.notiz_id)">OK</button>
+			</template>
+		</BsModal>
+		
+		<div class="row">
+		
+		<div class="col-sm-6">
+	
+		  	<form ref="formc" @submit.prevent class="row pt-3">
+			
+					<div class="col pt-3">
+						<p v-if="notizData.statusNew" class="fw-bold">{{$p.t('notiz','notiz_new')}} <span> [{{notizData.typeId}}]</span></p>
+						<p v-else class="fw-bold">{{$p.t('notiz','notiz_edit')}} <span> [{{notizData.typeId}}]</span></p>
+					</div>
+											
+	
+					<div class="row mb-3">
+						<form-input
+							container-class="col-12"
+							:label="$p.t('global','titel')  + ' *'"
+							type="text"
+							v-model="notizData.titel"
+							name="titel"
+							>
+						</form-input>
+					</div>
+								
+					<div class="row mb-3">
+							
+						<!-- TinyMce 5 -->
+						<div v-if="showTinyMCE" class="col-sm-12">
+							<label for="text" class="form-label col-sm-2">{{$p.t('global','text')}} *</label>
+							<textarea
+							ref="editor"
+							rows="5"
+							cols="75"
+							class="form-control"
+							:value="notizData.text"
+							@input="updateText"></textarea>
+						</div>
+						
+						<div v-else class="col-sm-12">
+							<label for="text" class="form-label col-sm-2">{{$p.t('global','text')}} *</label>
+							<textarea rows="5" cols="75" v-model="notizData.text" class="form-control"></textarea>
+						</div>
+					
+					</div>
+			
+					<!-- show Documentupload-->
+					<div v-if="showDocument">
+						<div class="row mb-3">		
+							
+							<div  class="col-sm-12 py-3">
+							<label for="text" class="form-label col-sm-2">{{$p.t('notiz','document')}}</label>
+								<!--Upload Component-->
+								<FormUploadDms ref="upload" id="file" multiple v-model="notizData.anhang"></FormUploadDms>
+							</div>
+						
+						</div>
+					</div>
+					
+					<!-- show Details-->
+					<div v-if="showErweitert">
+					
+						<div class="row mb-3">
+											
+							<form-input
+								container-class="col-6"
+								:label="$p.t('global', 'gueltigVon')"
+								type="DatePicker"
+								v-model="notizData['start']"
+								name="von"
+								auto-apply
+								:enable-time-picker="false"
+								format="dd.MM.yyyy"
+								preview-format="dd.MM.yyyy"
+								:teleport="true"
+								>
+							</form-input>
+							
+							<form-input
+								container-class="col-6"
+								:label="$p.t('global', 'gueltigBis')"
+								type="DatePicker"
+								v-model="notizData.ende"
+								name="bis"
+								auto-apply
+								:enable-time-picker="false"
+								format="dd.MM.yyyy"
+								preview-format="dd.MM.yyyy"
+								:teleport="true"
+								>
+							</form-input>
+						</div>
+						
+				
+						<div class="row mb-3">
+							<form-input 
+								v-if="notizData.verfasser_uid"
+								container-class="col-6"
+								:label="$p.t('notiz', 'verfasser')"
+								type="text"
+								v-model="notizData.verfasser_uid"
+								name="titel"
+							>
+							</form-input>
+					
+							<form-input
+								v-else
+								container-class="col-6"
+								:label="$p.t('notiz', 'verfasser')"
+								type="autocomplete"
+								v-model="notizData.intVerfasser"
+								:suggestions="filteredMitarbeiter" 
+								@complete="search" 
+								optionLabel="mitarbeiter"
+								minLength="3"
+								>
+							</form-input>
+							
+							<form-input
+								v-if="notizData.bearbeiter_uid"
+								container-class="col-6"
+								:label="$p.t('notiz', 'bearbeiter')"
+								v-model="notizData.bearbeiter_uid"
+								minlength="3"
+								>
+							</form-input>
+							
+							<form-input
+								v-else
+								container-class="col-6"
+								:label="$p.t('notiz', 'bearbeiter')"
+								type="autocomplete"
+								v-model="notizData.intBearbeiter"
+								:suggestions="filteredMitarbeiter" 
+								@complete="search" 
+								optionLabel="mitarbeiter"
+								minlength="3"
+								>
+							</form-input>	
+						</div>
+														
+						<div class="row mb-3">
+								<div class="col-2 pt-4 d-flex align-items-center">
+									<form-input
+										container-class="form-check"
+										:label="$p.t('notiz', 'erledigt')"
+										type="checkbox"
+										v-model="notizData.erledigt"
+										name="erledigt"
+										>
+									</form-input>
+								</div>
+		<!--					<label for="bis" class="form-label col-sm-2">{{$p.t('notiz','erledigt')}}</label>
+							<div class="col-sm-1">
+								<input type="checkbox" v-model="notizData.erledigt">
+							</div>-->
+						</div>
+						
+					</div>
+					
+					<div class="row mb-3">
+						<label for="lastUpdate" class="form-label col-sm-3 small">{{$p.t('notiz','letzte_aenderung')}}</label>
+						<div class="col-sm-5">
+							<p class="small">{{notizData.lastupdate}}</p>
+						</div>
+					</div>
+					
+						<div>
+							<button v-if="notizData.statusNew" class="btn btn-primary" @click="addNewNotiz()"> {{$p.t('studierendenantrag', 'btn_new')}}</button>
+							<button v-else class="btn btn-primary" @click="updateNotiz(notizData.notiz_id)"> {{$p.t('ui', 'speichern')}}</button>
+						</div>
+					
+				</form>		
+			</div>
+			
+			<div class="col-sm-6 pt-6">
+			<br>
+					<core-filter-cmpt
+						ref="table"
+						:tabulator-options="tabulatorOptions"
+						:tabulator-events="tabulatorEvents"
+						table-only
+						:side-menu="false"
+						reload
+						new-btn-show
+						new-btn-label="Notiz"
+						@click:new="actionNewNotiz"
+						>
+					</core-filter-cmpt>	
+			</div>
+		
+			
+		</div> 
+		
+	</div>
+	
+	<div v-else>
+	<p>Kein Layout übergeben</p>
+	</div>
+</div>
+<br>
+`,
 }
 
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
index 3b95ed156..4d9bfbfcf 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
@@ -14,13 +14,50 @@ export default {
 			ref="formc"
 			typeId="person_id"
 			:id="modelValue.person_id"
-			:showErweitert=true
-			:showDocument=true
-			:showTinyMCE="true"
+			notizLayout="twoColumnsFormRight"
+			:showErweitert="false"
+			:showDocument="false"
+			:showTinyMCE="false"
+			:visibleColumns=['titel','text','verfasser','bearbeiter']
 			>
 		</NotizComponent>
 		
-<!--		<br><br>
+<!--		
+---------------------------------------------------------------------------------------------
+-------------------- DESCRIPTION FOR PARAMETER PROPS ----------------------------------------
+---------------------------------------------------------------------------------------------
+
+notizLayout: "classicFas", "twoColumnsFormLeft", twoColumnsFormRight"
+
+showErweitert: if true: section with following fields will be displayed:
+	'verfasser', 'bearbeiter', 'von', 'bis'
+
+showDocument: if true: section with documentHandling will be displayed
+
+showTinyMCE: if true: section with WYSIWYG Editor for Text will be displayed
+
+typeId: id to which table the notizdata should be connected... eg. person_id, prestudent_id, mitarbeiter_uid, projekt_kurzbz, projektphase_id, projekttask_id,
+	bestellung_id, lehreinheit_id, anrechnung_id, uid  
+	in progress for extensions
+
+visibleColumns: list, which fields shoult be showed as default in filter component
+		fullVersion: :visibleColumns=['titel','text','bearbeiter','verfasser','von','bis','erledigt']
+
+---------------------------------------------------------------------------------------------
+---------------------------------------------------------------------------------------------	
+-->	
+
+
+
+
+<!--
+
+---------------------------------------------------------------------------------------------
+------------------------ SOME TESTDATA	-----------------------------------------------------	
+---------------------------------------------------------------------------------------------
+
+
+<br><br>
 		<h3>Test prestudentId</h3>
 		<NotizComponent
 			ref="formc"

From 9da2854e615e5d73176d1ae3aef97dbe95f01766 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 17 Apr 2024 12:25:24 +0200
Subject: [PATCH 0596/1461] temp save

---
 application/controllers/api/frontend/v1/stv/Notiz.php         | 4 +---
 .../js/components/Stv/Studentenverwaltung/Details/Notizen.js  | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Notiz.php b/application/controllers/api/frontend/v1/stv/Notiz.php
index cf46f79a6..3d84c2d68 100644
--- a/application/controllers/api/frontend/v1/stv/Notiz.php
+++ b/application/controllers/api/frontend/v1/stv/Notiz.php
@@ -16,9 +16,7 @@ class Notiz extends FHCAPI_Controller
 			'updateNotiz' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
 			'deleteNotiz' => ['admin:r', 'assistenz:r'],
 			'loadDokumente' => ['admin:r', 'assistenz:r'],
-			'getMitarbeiter' => ['admin:r', 'assistenz:r'],
-			'advanceStatus' => ['admin:r', 'assistenz:r'],
-			'confirmStatus' => ['admin:r', 'assistenz:r']
+			'getMitarbeiter' => ['admin:r', 'assistenz:r']
 		]);
 
 		//Load Models
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
index 4d9bfbfcf..ddea790da 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
@@ -14,7 +14,7 @@ export default {
 			ref="formc"
 			typeId="person_id"
 			:id="modelValue.person_id"
-			notizLayout="twoColumnsFormRight"
+			notizLayout="twoColumnsFormLeft"
 			:showErweitert="false"
 			:showDocument="false"
 			:showTinyMCE="false"

From 6c642f124215bee8aa85e373f83343fdf0b797b8 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 17 Apr 2024 14:23:09 +0200
Subject: [PATCH 0597/1461] changes how the pagination is done in the DB_Model

---
 application/controllers/CisHtml/Cms.php       | 33 ++++++++++++-
 application/core/DB_Model.php                 | 46 ++++++++++++++++++-
 application/libraries/CmsLib.php              |  1 +
 application/models/content/News_model.php     | 42 ++++++++---------
 public/js/apps/api/cms.js                     | 11 ++++-
 public/js/components/Cis/Cms/Content.js       |  8 +++-
 public/js/components/Pagination/Pagination.js | 12 +++--
 7 files changed, 120 insertions(+), 33 deletions(-)

diff --git a/application/controllers/CisHtml/Cms.php b/application/controllers/CisHtml/Cms.php
index 4cca6bc38..d15b4fabc 100644
--- a/application/controllers/CisHtml/Cms.php
+++ b/application/controllers/CisHtml/Cms.php
@@ -25,6 +25,11 @@ class Cms extends FHC_Controller
 		$this->loadPhrases([
 			'global'
 		]);
+
+		$this->load->model('content/News_model', 'NewsModel');
+
+		// setting up the papgination_size
+		$this->pagination_size = 10;
 	}
 
 	// -----------------------------------------------------------------------------------------------------------------
@@ -67,12 +72,36 @@ class Cms extends FHC_Controller
 	public function getNews($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
 	{
 		$page = intval($this->input->get('page', true));
-		$pagination_size = 10;
-		$news = $this->cmslib->getNews($infoscreen, $studiengang_kz, $semester, $mischen, $titel, $edit, $sichtbar, $page, $pagination_size);
+
+
+		$news = $this->cmslib->getNews($infoscreen, $studiengang_kz, $semester, $mischen, $titel, $edit, $sichtbar, $page, $this->pagination_size);
 
 		if (isError($news)) {
 			echo json_encode(getError($news));
 		}
 		echo json_encode(getData($news));
 	}
+
+	public function getNewsMaxPage($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $fachbereich_kurzbz = null, $maxalter = 0, $edit = false, $sichtbar = true, $page = 1, $page_size = 10)
+	{
+		$this->load->model('crm/Student_model', 'StudentModel');
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+
+		if (!$infoscreen && ($studiengang_kz === null || $semester === null)) {
+			//Zum anzeigen der Studiengang-Details neben den News
+			$student = $this->StudentModel->loadWhere(['student_uid' => get_uid()]);
+			if (isError($student))
+				return $student;
+			if (getData($student)) {
+				$student = current(getData($student));
+				if ($studiengang_kz === null)
+					$studiengang_kz = $student->studiengang_kz;
+				if ($semester === null)
+					$semester = $student->semester;
+			}
+		}
+		$all = $edit;
+		$query = $this->NewsModel->getNewsWithContentQuery(getSprache(), $studiengang_kz, $semester, $fachbereich_kurzbz, $sichtbar, $maxalter, $page, $this->pagination_size, $all, $mischen);
+		echo json_encode($query->maxPageCount);
+	}
 }
diff --git a/application/core/DB_Model.php b/application/core/DB_Model.php
index bdd5316e7..5304fbe83 100644
--- a/application/core/DB_Model.php
+++ b/application/core/DB_Model.php
@@ -32,6 +32,9 @@ class DB_Model extends CI_Model
 	protected $pk;  	// Name of the PrimaryKey for DB-Update, Load, ...
 	protected $hasSequence;	// False if this table has a composite primary key that is not using a sequence
 				// True if this table has a primary key that uses a sequence
+	//protected $paginationOptions; // $page and $page_size together in an associative array
+	protected $page;
+	protected $page_size;
 
 	private $executedQueryMetaData;
 	private $executedQueryListFields;
@@ -484,7 +487,7 @@ class DB_Model extends CI_Model
 		if (!is_numeric($start) || (is_numeric($start) && $start <= 0))
 			return error('The start parameter is not valid', EXIT_MODEL);
 
-		if (is_numeric($end) && $end > $start)
+		if (is_numeric($end))
 		{
 			$this->db->limit($start, $end);
 		}
@@ -1073,5 +1076,46 @@ class DB_Model extends CI_Model
 
 		return $udfs;
 	}
+
+	function addPagination( $page, $page_size, $maxPageCount=null)
+	{
+		if (isset($page) && is_numeric($page) && isset($page_size) && is_numeric($page_size) && $page > 0 && $page_size > 0) {
+			
+			if (isset($maxPageCount) && is_numeric($maxPageCount) && $maxPageCount > 0) {
+				$floatMaxPageCount = $maxPageCount / $page_size;
+				$floatMaxPageCount = ceil($floatMaxPageCount);
+				if($page > $floatMaxPageCount){
+					$page = $floatMaxPageCount;
+				}
+			}
+			// else if page is to big
+			$offset = (($page-1) * $page_size); 
+			$this->addLimit($page_size, $offset);
+
+		} else {
+			$this->addLimit($page_size);
+		}
+	}
+
+	function getMaxPageCount( $page_size, $params=null )
+	{
+		// we clone the original query, so we dont have to change the origial query
+		$instance_copy = clone $this;
+		$db_copy = clone $this->db;
+		$countSql = $db_copy->get_compiled_select($instance_copy->dbTable,false);
+		$countSql = "SELECT COUNT(*) FROM (". $countSql .") as count;";
+		
+		// calculating the maxPageCount and adding the pagination to the query
+		$num_rows_query_result = $instance_copy->execReadOnlyQuery($countSql, $params);
+		
+		if(isError($num_rows_query_result)){
+			return error($this->db->error(), EXIT_DATABASE);
+		}
+		$num_rows = getData($num_rows_query_result)[0]->count;
+		
+		
+		// ceil, to include remaining rows into the last page 
+		return $num_rows;
+	}
 }
 
diff --git a/application/libraries/CmsLib.php b/application/libraries/CmsLib.php
index dfe8d5e4f..8a57c1086 100644
--- a/application/libraries/CmsLib.php
+++ b/application/libraries/CmsLib.php
@@ -213,6 +213,7 @@ class CmsLib
 			return $news;
 
 		$news = getData($news);
+		//var_dump($news->maxPageCount);
 		foreach ($news as $newsobj) {
 			if ($studiengang_kz && $edit && !$newsobj->studiengang_kz)
 				continue;
diff --git a/application/models/content/News_model.php b/application/models/content/News_model.php
index 88d97bd09..de4c7f8da 100644
--- a/application/models/content/News_model.php
+++ b/application/models/content/News_model.php
@@ -27,16 +27,7 @@ class News_model extends DB_Model
 		);
 	}
 
-	private function getMaxPageCount($page_size)
-	{
-		$this->addSelect(['Count(*)']);
-		$count = $this->load();
-		$count = hasData($count) ? getData($count)[0]->count : null;
-		$floatMaxPageCount = $count / $page_size;
 
-		// ceil, to include remaining rows into the last page 
-		return ceil($floatMaxPageCount);
-	}
 
 	/**
 	 * @param string            $sprache
@@ -53,20 +44,8 @@ class News_model extends DB_Model
 	 * 
 	 * @return stdObj
 	 */
-	public function getNewsWithContent($sprache, $studiengang_kz, $semester, $fachbereich_kurzbz = null, $sichtbar = true, $maxalter = 0, $page = 1, $page_size = 10, $all = false, $mischen = true)
+	public function getNewsWithContentQuery($sprache, $studiengang_kz, $semester, $fachbereich_kurzbz = null, $sichtbar = true, $maxalter = 0, $page = 1, $page_size = 10, $all = false, $mischen = true)
 	{
-		if (isset($page) && is_numeric($page) && isset($page_size) && is_numeric($page_size) && $page > 0 && $page_size > 0) {
-
-			$maxPageCount = $this->getMaxPageCount($page_size);
-			if ($maxPageCount) {
-				$page = $page % $maxPageCount;
-			}
-			$offset = $page * $page_size;
-			$this->addLimit($page_size, $offset);
-
-		} else {
-			$this->addLimit($page_size);
-		}
 
 		$this->addOrder('datum', 'DESC');
 
@@ -124,9 +103,24 @@ class News_model extends DB_Model
 
 		$this->db->where($where, NULL, FALSE);
 
-		$sql = $this->db->get_compiled_select($this->dbTable);
+		// calculating the maxPageCount and adding pagination to the query
+		$maxPageCount = $this->getMaxPageCount($page_size, $params);
+		$this->addPagination($page, $page_size, $maxPageCount);
+
+		// creating the select query
+		$query = new stdClass();
+		$query->sql = $this->db->get_compiled_select($this->dbTable);
+		$query->params = $params;
+		$query->maxPageCount = $maxPageCount;
+		return $query;
+
+	}
+
+	function getNewsWithContent($sprache, $studiengang_kz, $semester, $fachbereich_kurzbz = null, $sichtbar = true, $maxalter = 0, $page = 1, $page_size = 10, $all = false, $mischen = true)
+	{
+		$query = $this->getNewsWithContentQuery($sprache, $studiengang_kz, $semester, $fachbereich_kurzbz, $sichtbar, $maxalter, $page, $page_size, $all, $mischen);
+		return $this->execReadOnlyQuery($query->sql, $query->params);
 
-		return $this->execQuery($sql, $params);
 	}
 
 }
diff --git a/public/js/apps/api/cms.js b/public/js/apps/api/cms.js
index 8ad2f1f32..8352bcf65 100644
--- a/public/js/apps/api/cms.js
+++ b/public/js/apps/api/cms.js
@@ -1,5 +1,6 @@
 export default {
-  getNews: function (page = 1, pageSize = 10) {
+  getNews: function (page = 1) {
+    console.log("this is the page that was passed", page);
     const url =
       FHC_JS_DATA_STORAGE_OBJECT.app_root +
       FHC_JS_DATA_STORAGE_OBJECT.ci_router +
@@ -7,8 +8,14 @@ export default {
     return axios.get(url, {
       params: {
         page,
-        pageSize,
       },
     });
   },
+  getNewsMaxPage: function () {
+    const url =
+      FHC_JS_DATA_STORAGE_OBJECT.app_root +
+      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+      "/CisHtml/Cms/getNewsMaxPage";
+    return axios.get(url);
+  },
 };
diff --git a/public/js/components/Cis/Cms/Content.js b/public/js/components/Cis/Cms/Content.js
index 415743e85..793f2652d 100644
--- a/public/js/components/Cis/Cms/Content.js
+++ b/public/js/components/Cis/Cms/Content.js
@@ -7,11 +7,13 @@ export default {
   data() {
     return {
       content: null,
+      maxPageCount: 0,
     };
   },
   methods: {
     loadNewPageContent: function (data) {
       Vue.$fhcapi.Cms.getNews(data.page).then((result) => {
+        console.log("fetched url :", result.data);
         this.content = result.data;
       });
     },
@@ -20,9 +22,13 @@ export default {
     Vue.$fhcapi.Cms.getNews().then((result) => {
       this.content = result.data;
     });
+
+    Vue.$fhcapi.Cms.getNewsMaxPage().then((result) => {
+      this.maxPageCount = result.data;
+    });
   },
   template: /*html*/ `
-    <pagination @page="loadNewPageContent">
+    <pagination @page="loadNewPageContent" :maxPageCount="maxPageCount">
     <div v-html="content"></div>
     </pagination>`,
 };
diff --git a/public/js/components/Pagination/Pagination.js b/public/js/components/Pagination/Pagination.js
index 0222a0dfa..0b6044d73 100644
--- a/public/js/components/Pagination/Pagination.js
+++ b/public/js/components/Pagination/Pagination.js
@@ -2,6 +2,12 @@ export default {
   components: {
     paginator: primevue.paginator,
   },
+  props: {
+    maxPageCount: {
+      type: Number,
+      default: 0,
+    },
+  },
   data() {
     return {};
   },
@@ -15,10 +21,10 @@ export default {
   },
   template: /*html*/ `
     
-  
-    <paginator @page="(page)=>$emit('page',{...page, page:page.page+1})" :rows="1"  :totalRecords="120" ></paginator>
+    <pre>{{JSON.stringify(maxPageCount,null,2)}}</pre>
+    <paginator @page="(data)=>$emit('page',{...data, page:data.page+1})" :rows="10" :totalRecords="maxPageCount" :rowsPerPageOptions="[10, 20, 30]" ></paginator>
     <slot>
-    NO CONTENT WAS PROVIDED
+    Placeholder
     </slot>
     <paginator :rows="10" :totalRecords="120" :rowsPerPageOptions="[10, 20, 30]"></paginator>
 

From 284ae0637e2998314942cd66db25f52a8a24f04f Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 17 Apr 2024 14:54:22 +0200
Subject: [PATCH 0598/1461] makes it possible to send the page_size from the
 frontend to the backend to adopt how many rows to query

---
 application/controllers/CisHtml/Cms.php       | 19 +++++++++++++------
 public/js/apps/api/cms.js                     |  4 ++--
 public/js/components/Cis/Cms/Content.js       |  5 ++---
 public/js/components/Pagination/Pagination.js |  9 +++------
 4 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/application/controllers/CisHtml/Cms.php b/application/controllers/CisHtml/Cms.php
index d15b4fabc..93abd3f14 100644
--- a/application/controllers/CisHtml/Cms.php
+++ b/application/controllers/CisHtml/Cms.php
@@ -29,7 +29,7 @@ class Cms extends FHC_Controller
 		$this->load->model('content/News_model', 'NewsModel');
 
 		// setting up the papgination_size
-		$this->pagination_size = 10;
+		$this->page_size = 10;
 	}
 
 	// -----------------------------------------------------------------------------------------------------------------
@@ -71,10 +71,17 @@ class Cms extends FHC_Controller
 
 	public function getNews($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
 	{
-		$page = intval($this->input->get('page', true));
-
-
-		$news = $this->cmslib->getNews($infoscreen, $studiengang_kz, $semester, $mischen, $titel, $edit, $sichtbar, $page, $this->pagination_size);
+		$get_page = intval($this->input->get('page', true));
+		$get_page_size = intval($this->input->get('page_size', true));
+		if ($get_page) {
+			$page = $get_page;
+		}
+		if ($get_page_size) {
+			$page_size = $get_page_size;
+		} else {
+			$page_size = $this->page_size;
+		}
+		$news = $this->cmslib->getNews($infoscreen, $studiengang_kz, $semester, $mischen, $titel, $edit, $sichtbar, $page, $page_size);
 
 		if (isError($news)) {
 			echo json_encode(getError($news));
@@ -101,7 +108,7 @@ class Cms extends FHC_Controller
 			}
 		}
 		$all = $edit;
-		$query = $this->NewsModel->getNewsWithContentQuery(getSprache(), $studiengang_kz, $semester, $fachbereich_kurzbz, $sichtbar, $maxalter, $page, $this->pagination_size, $all, $mischen);
+		$query = $this->NewsModel->getNewsWithContentQuery(getSprache(), $studiengang_kz, $semester, $fachbereich_kurzbz, $sichtbar, $maxalter, $page, $this->page_size, $all, $mischen);
 		echo json_encode($query->maxPageCount);
 	}
 }
diff --git a/public/js/apps/api/cms.js b/public/js/apps/api/cms.js
index 8352bcf65..94b3d282e 100644
--- a/public/js/apps/api/cms.js
+++ b/public/js/apps/api/cms.js
@@ -1,6 +1,5 @@
 export default {
-  getNews: function (page = 1) {
-    console.log("this is the page that was passed", page);
+  getNews: function (page = 1, page_size = 10) {
     const url =
       FHC_JS_DATA_STORAGE_OBJECT.app_root +
       FHC_JS_DATA_STORAGE_OBJECT.ci_router +
@@ -8,6 +7,7 @@ export default {
     return axios.get(url, {
       params: {
         page,
+        page_size,
       },
     });
   },
diff --git a/public/js/components/Cis/Cms/Content.js b/public/js/components/Cis/Cms/Content.js
index 793f2652d..7fe6bb5c1 100644
--- a/public/js/components/Cis/Cms/Content.js
+++ b/public/js/components/Cis/Cms/Content.js
@@ -12,14 +12,13 @@ export default {
   },
   methods: {
     loadNewPageContent: function (data) {
-      Vue.$fhcapi.Cms.getNews(data.page).then((result) => {
-        console.log("fetched url :", result.data);
+      Vue.$fhcapi.Cms.getNews(data.page, data.rows).then((result) => {
         this.content = result.data;
       });
     },
   },
   created() {
-    Vue.$fhcapi.Cms.getNews().then((result) => {
+    Vue.$fhcapi.Cms.getNews(1, 10).then((result) => {
       this.content = result.data;
     });
 
diff --git a/public/js/components/Pagination/Pagination.js b/public/js/components/Pagination/Pagination.js
index 0b6044d73..666f03929 100644
--- a/public/js/components/Pagination/Pagination.js
+++ b/public/js/components/Pagination/Pagination.js
@@ -16,17 +16,14 @@ export default {
       //console.log("hier", data.page);
     },
   },
-  mounted() {
-    console.log("pagination mounted");
-  },
+  mounted() {},
   template: /*html*/ `
     
-    <pre>{{JSON.stringify(maxPageCount,null,2)}}</pre>
+    
     <paginator @page="(data)=>$emit('page',{...data, page:data.page+1})" :rows="10" :totalRecords="maxPageCount" :rowsPerPageOptions="[10, 20, 30]" ></paginator>
     <slot>
     Placeholder
     </slot>
-    <paginator :rows="10" :totalRecords="120" :rowsPerPageOptions="[10, 20, 30]"></paginator>
-
+   
   `,
 };

From 92f2c6e0a2291348c500e36040cf64bd7e1e6370 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 17 Apr 2024 15:12:55 +0200
Subject: [PATCH 0599/1461] passes the page_size down from the parent component
 to the child component

---
 public/js/components/Cis/Cms/Content.js       | 5 +++--
 public/js/components/Pagination/Pagination.js | 7 ++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/public/js/components/Cis/Cms/Content.js b/public/js/components/Cis/Cms/Content.js
index 7fe6bb5c1..9ba98f2a1 100644
--- a/public/js/components/Cis/Cms/Content.js
+++ b/public/js/components/Cis/Cms/Content.js
@@ -8,6 +8,7 @@ export default {
     return {
       content: null,
       maxPageCount: 0,
+      page_size: 10,
     };
   },
   methods: {
@@ -18,7 +19,7 @@ export default {
     },
   },
   created() {
-    Vue.$fhcapi.Cms.getNews(1, 10).then((result) => {
+    Vue.$fhcapi.Cms.getNews(1, this.page_size).then((result) => {
       this.content = result.data;
     });
 
@@ -27,7 +28,7 @@ export default {
     });
   },
   template: /*html*/ `
-    <pagination @page="loadNewPageContent" :maxPageCount="maxPageCount">
+    <pagination :page_size="page_size"  @page="loadNewPageContent" :maxPageCount="maxPageCount">
     <div v-html="content"></div>
     </pagination>`,
 };
diff --git a/public/js/components/Pagination/Pagination.js b/public/js/components/Pagination/Pagination.js
index 666f03929..ce27180f7 100644
--- a/public/js/components/Pagination/Pagination.js
+++ b/public/js/components/Pagination/Pagination.js
@@ -2,11 +2,16 @@ export default {
   components: {
     paginator: primevue.paginator,
   },
+  emits: ["update:rows"],
   props: {
     maxPageCount: {
       type: Number,
       default: 0,
     },
+    page_size: {
+      type: Number,
+      default: 10,
+    },
   },
   data() {
     return {};
@@ -20,7 +25,7 @@ export default {
   template: /*html*/ `
     
     
-    <paginator @page="(data)=>$emit('page',{...data, page:data.page+1})" :rows="10" :totalRecords="maxPageCount" :rowsPerPageOptions="[10, 20, 30]" ></paginator>
+    <paginator v-model:rows="page_size" @page="(data)=>$emit('page',{...data, page:data.page+1})" :rows="page_size" :totalRecords="maxPageCount" :rowsPerPageOptions="[10, 20, 30]" ></paginator>
     <slot>
     Placeholder
     </slot>

From 71f63095c2d3ee6adb764f37244a6a75c28b5a60 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 17 Apr 2024 15:15:51 +0200
Subject: [PATCH 0600/1461] makes component Pagination page_size prop a
 required prop

---
 public/js/components/Pagination/Pagination.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Pagination/Pagination.js b/public/js/components/Pagination/Pagination.js
index ce27180f7..db751e1d9 100644
--- a/public/js/components/Pagination/Pagination.js
+++ b/public/js/components/Pagination/Pagination.js
@@ -10,7 +10,7 @@ export default {
     },
     page_size: {
       type: Number,
-      default: 10,
+      required: true,
     },
   },
   data() {

From b2deea69623674030a71c1dbbdf471857d592943 Mon Sep 17 00:00:00 2001
From: Werner Masik <werner@gefi.at>
Date: Wed, 17 Apr 2024 16:40:12 +0200
Subject: [PATCH 0601/1461] added db schema for Gehaltsbaender

---
 system/dbupdate_3.4/37133_gehaltsbaender.php | 85 ++++++++++++++++++++
 1 file changed, 85 insertions(+)
 create mode 100644 system/dbupdate_3.4/37133_gehaltsbaender.php

diff --git a/system/dbupdate_3.4/37133_gehaltsbaender.php b/system/dbupdate_3.4/37133_gehaltsbaender.php
new file mode 100644
index 000000000..3c34883f6
--- /dev/null
+++ b/system/dbupdate_3.4/37133_gehaltsbaender.php
@@ -0,0 +1,85 @@
+<?php
+if (! defined('DB_NAME')) exit('No direct script access allowed');
+
+if ($result = $db->db_query("SELECT * FROM information_schema.tables WHERE table_name='tbl_frist' AND table_schema='hr'"))
+{
+	if ($db->db_num_rows($result) == 0)
+	{
+		$qry = "
+        
+        CREATE TABLE IF NOT EXISTS hr.tbl_gehaltsband (
+            gehaltsband_kurzbz character varying(32) NOT NULL,
+            bezeichnung varchar(32) NOT NULL,
+            aktiv boolean DEFAULT FALSE,
+            sort smallint,
+            insertvon character varying(32) NOT NULL,
+            insertamum timestamp without time zone DEFAULT now() NOT NULL,
+            updatevon character varying(32),
+            updateamum timestamp without time zone,
+            CONSTRAINT tbl_gehaltsband_pkey PRIMARY KEY (gehaltsband_kurzbz)
+        );
+
+        CREATE TABLE IF NOT EXISTS hr.tbl_gehaltsband_funktion (
+            gehaltsband_funktion_id bigserial NOT NULL,
+            gehaltsband_kurzbz varchar(32) NOT NULL,
+            funktion_kurzbz varchar(32) NOT NULL,
+            oe_kurzbz varchar(32),
+            organisationseinheittyp_kurzbz varchar(32),
+            insertvon character varying(32) NOT NULL,
+            insertamum timestamp without time zone DEFAULT now() NOT NULL,
+            updatevon character varying(32),
+            updateamum timestamp without time zone
+        );
+
+        CREATE TABLE IF NOT EXISTS hr.tbl_gehaltsband_betrag (
+            gehaltsband_betrag_id bigserial NOT NULL,
+            gehaltsband_kurzbz character varying(32) NOT NULL,
+            von date,
+            bis date,
+            betrag_von numeric(9,5),
+            betrag_bis numeric(9,5),
+            insertvon character varying(32) NOT NULL,
+            insertamum timestamp without time zone DEFAULT now() NOT NULL,
+            updatevon character varying(32),
+            updateamum timestamp without time zone,
+            CONSTRAINT tbl_gehaltsband_betrag_pkey PRIMARY KEY (gehaltsband_betrag_id)
+        );
+
+        ALTER TABLE hr.tbl_gehaltsband_betrag ADD CONSTRAINT tbl_gehaltsband_betrag_gehaltsband_kurzbz_fk FOREIGN KEY (gehaltsband_kurzbz)
+		REFERENCES hr.tbl_gehaltsband (gehaltsband_kurzbz) MATCH FULL
+		ON DELETE SET NULL ON UPDATE CASCADE;
+
+        ALTER TABLE hr.tbl_gehaltsband_funktion ADD CONSTRAINT tbl_gehaltsband_funktion_oe_kurzbz_fk FOREIGN KEY (oe_kurzbz)
+		REFERENCES public.tbl_organisationseinheit (oe_kurzbz) MATCH FULL
+		ON DELETE SET NULL ON UPDATE CASCADE;
+        
+        ALTER TABLE hr.tbl_gehaltsband_funktion ADD CONSTRAINT tbl_gehaltsband_funktion_organisationseinheittyp_kurzbz_fk FOREIGN KEY (organisationseinheittyp_kurzbz)
+		REFERENCES public.tbl_organisationseinheittyp (organisationseinheittyp_kurzbz) MATCH FULL
+		ON DELETE SET NULL ON UPDATE CASCADE;
+
+        COMMENT ON TABLE hr.tbl_gehaltsband IS E'Definition of salary range types';
+        COMMENT ON TABLE hr.tbl_gehaltsband_funktion IS E'job functions assigned to salary range';
+        COMMENT ON TABLE hr.tbl_gehaltsband_betrag IS E'salary range (time dependend)';
+
+        GRANT SELECT, UPDATE, INSERT, DELETE ON hr.tbl_gehaltsband TO vilesci;
+        GRANT SELECT, UPDATE, INSERT, DELETE ON hr.tbl_gehaltsband_betrag TO vilesci;
+	    GRANT USAGE ON hr.tbl_gehaltsband_betrag_gehaltsband_betrag_id_seq TO vilesci;
+        GRANT USAGE ON hr.tbl_gehaltsband_funktion_gehaltsband_funktion_id_seq TO vilesci;
+
+        INSERT INTO hr.tbl_gehaltsband(gehaltsband_kurzbz, bezeichnung, aktiv, sort, insertvon) VALUES('ASSISTENTIN','AssistentIn', 't', 1, 'system');
+        INSERT INTO hr.tbl_gehaltsband(gehaltsband_kurzbz, bezeichnung, aktiv, sort, insertvon) VALUES('JUNIOR_LECTURER_RESEARCHER','Junior Lecturer/Researcher', 't', 2, 'system');
+        INSERT INTO hr.tbl_gehaltsband(gehaltsband_kurzbz, bezeichnung, aktiv, sort, insertvon) VALUES('LECTURER_RESEARCHER','Lecturer/Researcher', 't', 3, 'system');
+        INSERT INTO hr.tbl_gehaltsband(gehaltsband_kurzbz, bezeichnung, aktiv, sort, insertvon) VALUES('SENIOR_LECTURER_RESEARCHER','Senior Lecturer/Researcher', 't', 4, 'system');
+        INSERT INTO hr.tbl_gehaltsband(gehaltsband_kurzbz, bezeichnung, aktiv, sort, insertvon) VALUES('STUDIENGANGSLEITERIN','StudiengangsleiterIn', 't', 5, 'system');
+        INSERT INTO hr.tbl_gehaltsband(gehaltsband_kurzbz, bezeichnung, aktiv, sort, insertvon) VALUES('KOMPETENZFELDLEITERIN','KompetanzfeldleiterIn', 't', 6, 'system');
+        INSERT INTO hr.tbl_gehaltsband(gehaltsband_kurzbz, bezeichnung, aktiv, sort, insertvon) VALUES('DEPARTMENTLEITERIN','DepartmentleiterIn', 't', 7, 'system');
+        INSERT INTO hr.tbl_gehaltsband(gehaltsband_kurzbz, bezeichnung, aktiv, sort, insertvon) VALUES('FAKULTAETSLEITERIN','FakultätsleiterIn', 't', 8, 'system');
+
+        ";
+    
+        if (! $db->db_query($qry))
+            echo '<strong>Fristenmanagement: ' . $db->db_last_error() . '</strong><br>';
+        else
+            echo 'Fristenmanagementtabellen wurden neu erstellt';
+    }
+}

From 3993d614d4aa9a5784b55017a0d25d0e750c5f7d Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 18 Apr 2024 11:52:58 +0200
Subject: [PATCH 0602/1461] updates news fetching and DB_Model pagination
 methods

---
 application/controllers/CisHtml/Cms.php       | 41 ++++++------
 application/core/DB_Model.php                 | 51 +++++++-------
 application/libraries/CmsLib.php              | 41 +++++++-----
 application/models/content/News_model.php     | 67 +++++++++----------
 public/js/apps/api/cms.js                     |  4 +-
 public/js/components/Cis/Cms/Content.js       |  2 +-
 public/js/components/Pagination/Pagination.js |  3 +-
 7 files changed, 108 insertions(+), 101 deletions(-)

diff --git a/application/controllers/CisHtml/Cms.php b/application/controllers/CisHtml/Cms.php
index 93abd3f14..f56b3eea3 100644
--- a/application/controllers/CisHtml/Cms.php
+++ b/application/controllers/CisHtml/Cms.php
@@ -84,31 +84,30 @@ class Cms extends FHC_Controller
 		$news = $this->cmslib->getNews($infoscreen, $studiengang_kz, $semester, $mischen, $titel, $edit, $sichtbar, $page, $page_size);
 
 		if (isError($news)) {
-			echo json_encode(getError($news));
+			$this->terminateWithJsonError(getError($news));
 		}
-		echo json_encode(getData($news));
+		$news = hasData($news) ? getData($news) : null;
+		if ($news) {
+			echo json_encode($news);
+		} else {
+			show_error("News: No data found");
+		}
+
 	}
 
-	public function getNewsMaxPage($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $fachbereich_kurzbz = null, $maxalter = 0, $edit = false, $sichtbar = true, $page = 1, $page_size = 10)
+	public function getNewsRowCount($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $fachbereich_kurzbz = null, $maxalter = 0, $edit = false, $sichtbar = true, $page = 1, $page_size = 10)
 	{
-		$this->load->model('crm/Student_model', 'StudentModel');
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-
-		if (!$infoscreen && ($studiengang_kz === null || $semester === null)) {
-			//Zum anzeigen der Studiengang-Details neben den News
-			$student = $this->StudentModel->loadWhere(['student_uid' => get_uid()]);
-			if (isError($student))
-				return $student;
-			if (getData($student)) {
-				$student = current(getData($student));
-				if ($studiengang_kz === null)
-					$studiengang_kz = $student->studiengang_kz;
-				if ($semester === null)
-					$semester = $student->semester;
-			}
-		}
+		list($studiengang_kz, $semester) = $this->cmslib->getStgAndSem($studiengang_kz, $semester);
 		$all = $edit;
-		$query = $this->NewsModel->getNewsWithContentQuery(getSprache(), $studiengang_kz, $semester, $fachbereich_kurzbz, $sichtbar, $maxalter, $page, $this->page_size, $all, $mischen);
-		echo json_encode($query->maxPageCount);
+		$num_rows = $this->NewsModel->countNewsWithContent(getSprache(), $studiengang_kz, $semester, $fachbereich_kurzbz, $sichtbar, $maxalter, $page, $this->page_size, $all, $mischen);
+		if (isError($num_rows)) {
+			$this->terminateWithJsonError(getError($num_rows));
+		}
+		$num_rows = hasData($num_rows) ? getData($num_rows) : null;
+		if ($num_rows) {
+			echo json_encode($num_rows);
+		} else {
+			show_error("News number rows: No data found");
+		}
 	}
 }
diff --git a/application/core/DB_Model.php b/application/core/DB_Model.php
index 5304fbe83..d65cb3cf5 100644
--- a/application/core/DB_Model.php
+++ b/application/core/DB_Model.php
@@ -1077,18 +1077,26 @@ class DB_Model extends CI_Model
 		return $udfs;
 	}
 
-	function addPagination( $page, $page_size, $maxPageCount=null)
+	/**
+	 * addPagination
+	 * adds a limit and an optional offset depending on the arguments passed to the function
+	 * @param   int $page	page to be queried
+	 * @param   int $page_size	page_size used to calculate the offset of the pagination
+	 * @param   int | null $num_rows	used to calculate the total amout of pages that are available with the $page and $page_size arguments
+	 * 
+	 * @return	void
+	 */
+	function addPagination( $page, $page_size, $num_rows=null)
 	{
 		if (isset($page) && is_numeric($page) && isset($page_size) && is_numeric($page_size) && $page > 0 && $page_size > 0) {
 			
-			if (isset($maxPageCount) && is_numeric($maxPageCount) && $maxPageCount > 0) {
-				$floatMaxPageCount = $maxPageCount / $page_size;
-				$floatMaxPageCount = ceil($floatMaxPageCount);
-				if($page > $floatMaxPageCount){
-					$page = $floatMaxPageCount;
+			if (isset($num_rows) && is_numeric($num_rows) && $num_rows > 0) {
+				$floatMaxPageCount = $num_rows / $page_size;
+				$maxPageCount = ceil($floatMaxPageCount);
+				if($page > $maxPageCount){
+					$page = $maxPageCount;
 				}
 			}
-			// else if page is to big
 			$offset = (($page-1) * $page_size); 
 			$this->addLimit($page_size, $offset);
 
@@ -1097,25 +1105,22 @@ class DB_Model extends CI_Model
 		}
 	}
 
-	function getMaxPageCount( $page_size, $params=null )
+	/**
+	 * getQueryNumRows
+	 * returns the number of rows of the current build query of the codeigniter query builder instance
+	 * @param   bool $reset	resets the select of the query 
+	 * 
+	 * @return	Result_object $num_rows
+	 */
+	function getNumRows($reset=false)
 	{
-		// we clone the original query, so we dont have to change the origial query
-		$instance_copy = clone $this;
-		$db_copy = clone $this->db;
-		$countSql = $db_copy->get_compiled_select($instance_copy->dbTable,false);
-		$countSql = "SELECT COUNT(*) FROM (". $countSql .") as count;";
-		
-		// calculating the maxPageCount and adding the pagination to the query
-		$num_rows_query_result = $instance_copy->execReadOnlyQuery($countSql, $params);
-		
-		if(isError($num_rows_query_result)){
+		// returns the number of rows when executing the current query without reseting the select statement of the query
+		$num_rows = $this->db->count_all_results($this->dbTable,$reset);
+		if($num_rows){
+			return success($num_rows);
+		}else{
 			return error($this->db->error(), EXIT_DATABASE);
 		}
-		$num_rows = getData($num_rows_query_result)[0]->count;
-		
-		
-		// ceil, to include remaining rows into the last page 
-		return $num_rows;
 	}
 }
 
diff --git a/application/libraries/CmsLib.php b/application/libraries/CmsLib.php
index 8a57c1086..0fa3b0556 100644
--- a/application/libraries/CmsLib.php
+++ b/application/libraries/CmsLib.php
@@ -173,6 +173,30 @@ class CmsLib
 		], true));
 	}
 
+	/**
+	 * @param string			$studiengang_kz
+	 * @param string			$semester
+	 * 
+	 * @return array			queried studiengang_kz and semester
+	 */
+	public function getStgAndSem($studiengang_kz, $semester)
+	{
+		$this->ci->load->model('crm/Student_model', 'StudentModel');
+
+		//Zum anzeigen der Studiengang-Details neben den News
+		$student = $this->ci->StudentModel->loadWhere(['student_uid' => getAuthUID()]);
+		if (isError($student))
+			return $student;
+		if (getData($student)) {
+			$student = current(getData($student));
+			if ($studiengang_kz === null)
+				$studiengang_kz = $student->studiengang_kz;
+			if ($semester === null)
+				$semester = $student->semester;
+		}
+		return [$studiengang_kz, $semester];
+	}
+
 	/**
 	 * @param boolean			$infoscreen
 	 * @param string | null		$studiengang_kz
@@ -186,22 +210,7 @@ class CmsLib
 	 */
 	public function getNews($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true, $page = 1, $page_size = 10)
 	{
-		$this->ci->load->model('crm/Student_model', 'StudentModel');
-		$this->ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
-
-		if (!$infoscreen && ($studiengang_kz === null || $semester === null)) {
-			//Zum anzeigen der Studiengang-Details neben den News
-			$student = $this->ci->StudentModel->loadWhere(['student_uid' => get_uid()]);
-			if (isError($student))
-				return $student;
-			if (getData($student)) {
-				$student = current(getData($student));
-				if ($studiengang_kz === null)
-					$studiengang_kz = $student->studiengang_kz;
-				if ($semester === null)
-					$semester = $student->semester;
-			}
-		}
+		list($studiengang_kz, $semester) = $this->getStgAndSem($studiengang_kz, $semester);
 		$all = $edit;
 
 		$xml = '<?xml version="1.0" encoding="UTF-8"?><content>';
diff --git a/application/models/content/News_model.php b/application/models/content/News_model.php
index de4c7f8da..f4f98b601 100644
--- a/application/models/content/News_model.php
+++ b/application/models/content/News_model.php
@@ -36,15 +36,15 @@ class News_model extends DB_Model
 	 * @param string            $fachbereich_kurzbz
 	 * @param boolean           $sichtbar
 	 * @param integer           $maxalter
+	 * @param integer           $page
 	 * @param integer           $page_size
 	 * @param boolean           $all
 	 * @param boolean           $mischen
 	 * 
 	 * TODO(chris): this is not a good function -> the params are all over the place
 	 * 
-	 * @return stdObj
 	 */
-	public function getNewsWithContentQuery($sprache, $studiengang_kz, $semester, $fachbereich_kurzbz = null, $sichtbar = true, $maxalter = 0, $page = 1, $page_size = 10, $all = false, $mischen = true)
+	protected function prepareNewsWithContent($sprache, $studiengang_kz, $semester, $fachbereich_kurzbz = null, $sichtbar = true, $maxalter = 0, $page = 1, $page_size = 10, $all = false, $mischen = true)
 	{
 
 		$this->addOrder('datum', 'DESC');
@@ -53,10 +53,9 @@ class News_model extends DB_Model
 		$fachbereich_kurzbz = trim($fachbereich_kurzbz);
 
 		$where = [];
-		$params = [];
 		if (trim($maxalter) != '0') {
-			$where[] = "(now()-datum) < interval ? days";
-			$params[] = $maxalter;
+			$where[] = "(now()-datum) < interval " . $this->db->escape($maxalter) . " days";
+
 		}
 		if (!$all) {
 			$where[] = "datum <= now()";
@@ -66,61 +65,57 @@ class News_model extends DB_Model
 			if ($fachbereich_kurzbz == '') {
 				$where[] = "fachbereich_kurzbz IS NULL";
 			} else {
-				$where[] = "fachbereich_kurzbz = ?";
-				$params[] = $fachbereich_kurzbz;
+				$where[] = "fachbereich_kurzbz = " . $this->db->escape($fachbereich_kurzbz);
+
 			}
 		}
 		if ($studiengang_kz == '0') {
-			$where[] = "studiengang_kz = ?";
-			$params[] = $studiengang_kz;
+			$where[] = "studiengang_kz = " . $this->db->escape($studiengang_kz);
+
 			if ($semester === NULL)
 				$where[] = "semester IS NULL";
 			elseif ($semester === 0)
 				$where[] = "semester = 0";
 		} elseif ($studiengang_kz != '') {
 			$add = $mischen === true ? " OR (studiengang_kz = 0 AND semester IS NULL)" : "";
-			$where[] = "((studiengang_kz = ? AND semester = ?) OR (studiengang_kz = ? AND semester = 0) OR (studiengang_kz = 0 AND semester = ?)" . $add . ")";
-			$params[] = $studiengang_kz;
-			$params[] = $semester;
-			$params[] = $studiengang_kz;
-			$params[] = $semester;
+			$where[] = "((studiengang_kz = " . $this->db->escape($studiengang_kz) . " AND semester = " . $this->db->escape($semester) . ") OR (studiengang_kz = " . $this->db->escape($studiengang_kz) . " AND semester = 0) OR (studiengang_kz = 0 AND semester = " . $this->db->escape($semester) . ")" . $add . ")";
+
 		}
 		$this->addJoin('campus.tbl_contentsprache cs', 'content_id');
 
 		$where[] = "cs.sichtbar = " . ($sichtbar ? "true" : "false");
 
-		$where[] = "cs.sprache = (CASE WHEN EXISTS(SELECT 1 FROM campus.tbl_contentsprache cs2 WHERE cs2.content_id=" . $this->dbTable . ".content_id AND sprache=?) THEN ? ELSE ? END)";
-		$params[] = $sprache;
-		$params[] = $sprache;
-		$params[] = DEFAULT_LANGUAGE;
+		$where[] = "cs.sprache = (CASE WHEN EXISTS(SELECT 1 FROM campus.tbl_contentsprache cs2 WHERE cs2.content_id=" . $this->dbTable . ".content_id AND sprache=" . $this->db->escape($sprache) . ") THEN " . $this->db->escape($sprache) . " ELSE " . $this->db->escape(DEFAULT_LANGUAGE) . " END)";
+
+
+		$where[] = "cs.version = (SELECT MAX(version) FROM campus.tbl_contentsprache cs3 WHERE cs3.content_id=" . $this->dbTable . ".content_id AND cs3.sprache = (CASE WHEN EXISTS(SELECT 1 FROM campus.tbl_contentsprache cs2 WHERE cs2.content_id=" . $this->dbTable . ".content_id AND sprache=" . $this->db->escape($sprache) . ") THEN " . $this->db->escape($sprache) . " ELSE " . $this->db->escape(DEFAULT_LANGUAGE) . " END))";
 
-		$where[] = "cs.version = (SELECT MAX(version) FROM campus.tbl_contentsprache cs3 WHERE cs3.content_id=" . $this->dbTable . ".content_id AND cs3.sprache = (CASE WHEN EXISTS(SELECT 1 FROM campus.tbl_contentsprache cs2 WHERE cs2.content_id=" . $this->dbTable . ".content_id AND sprache=?) THEN ? ELSE ? END))";
-		$params[] = $sprache;
-		$params[] = $sprache;
-		$params[] = DEFAULT_LANGUAGE;
 
 		$where = implode(" AND ", $where);
 
 		$this->db->where($where, NULL, FALSE);
 
-		// calculating the maxPageCount and adding pagination to the query
-		$maxPageCount = $this->getMaxPageCount($page_size, $params);
-		$this->addPagination($page, $page_size, $maxPageCount);
-
-		// creating the select query
-		$query = new stdClass();
-		$query->sql = $this->db->get_compiled_select($this->dbTable);
-		$query->params = $params;
-		$query->maxPageCount = $maxPageCount;
-		return $query;
-
 	}
 
-	function getNewsWithContent($sprache, $studiengang_kz, $semester, $fachbereich_kurzbz = null, $sichtbar = true, $maxalter = 0, $page = 1, $page_size = 10, $all = false, $mischen = true)
+	public function getNewsWithContent($sprache, $studiengang_kz, $semester, $fachbereich_kurzbz = null, $sichtbar = true, $maxalter = 0, $page = 1, $page_size = 10, $all = false, $mischen = true)
 	{
-		$query = $this->getNewsWithContentQuery($sprache, $studiengang_kz, $semester, $fachbereich_kurzbz, $sichtbar, $maxalter, $page, $page_size, $all, $mischen);
-		return $this->execReadOnlyQuery($query->sql, $query->params);
+		$this->prepareNewsWithContent($sprache, $studiengang_kz, $semester, $fachbereich_kurzbz, $sichtbar, $maxalter, $page, $page_size, $all, $mischen);
 
+		// getting the number of rows of the query and adding pagination to the query result
+		$num_rows = $this->getNumRows(true);
+		$this->addPagination($page, $page_size, $num_rows);
+
+		// preparing the query again because every call to get_compiled_select or cour_all_results will add the from clause to the query
+		$this->prepareNewsWithContent($sprache, $studiengang_kz, $semester, $fachbereich_kurzbz, $sichtbar, $maxalter, $page, $page_size, $all, $mischen);
+
+		return $this->load();
 	}
 
+	public function countNewsWithContent($sprache, $studiengang_kz, $semester, $fachbereich_kurzbz = null, $sichtbar = true, $maxalter = 0, $page = 1, $page_size = 10, $all = false, $mischen = true)
+	{
+		$this->prepareNewsWithContent($sprache, $studiengang_kz, $semester, $fachbereich_kurzbz, $sichtbar, $maxalter, $page, $page_size, $all, $mischen);
+		return $this->getNumRows();
+	}
+
+
 }
diff --git a/public/js/apps/api/cms.js b/public/js/apps/api/cms.js
index 94b3d282e..6fbb0e727 100644
--- a/public/js/apps/api/cms.js
+++ b/public/js/apps/api/cms.js
@@ -11,11 +11,11 @@ export default {
       },
     });
   },
-  getNewsMaxPage: function () {
+  getNewsRowCount: function () {
     const url =
       FHC_JS_DATA_STORAGE_OBJECT.app_root +
       FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-      "/CisHtml/Cms/getNewsMaxPage";
+      "/CisHtml/Cms/getNewsRowCount";
     return axios.get(url);
   },
 };
diff --git a/public/js/components/Cis/Cms/Content.js b/public/js/components/Cis/Cms/Content.js
index 9ba98f2a1..bac28c23c 100644
--- a/public/js/components/Cis/Cms/Content.js
+++ b/public/js/components/Cis/Cms/Content.js
@@ -23,7 +23,7 @@ export default {
       this.content = result.data;
     });
 
-    Vue.$fhcapi.Cms.getNewsMaxPage().then((result) => {
+    Vue.$fhcapi.Cms.getNewsRowCount().then((result) => {
       this.maxPageCount = result.data;
     });
   },
diff --git a/public/js/components/Pagination/Pagination.js b/public/js/components/Pagination/Pagination.js
index db751e1d9..8b2688834 100644
--- a/public/js/components/Pagination/Pagination.js
+++ b/public/js/components/Pagination/Pagination.js
@@ -24,8 +24,7 @@ export default {
   mounted() {},
   template: /*html*/ `
     
-    
-    <paginator v-model:rows="page_size" @page="(data)=>$emit('page',{...data, page:data.page+1})" :rows="page_size" :totalRecords="maxPageCount" :rowsPerPageOptions="[10, 20, 30]" ></paginator>
+   <paginator v-model:rows="page_size" @page="(data)=>$emit('page',{...data, page:data.page+1})" :rows="page_size" :totalRecords="maxPageCount" :rowsPerPageOptions="[10, 20, 30]" ></paginator>
     <slot>
     Placeholder
     </slot>

From cc0ea44de307d2e89ba9aa011d4a6cc57ebb0bad Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 18 Apr 2024 11:56:55 +0200
Subject: [PATCH 0603/1461] also adds the new controller functions to the
 CisVue/Cms and CisHmvc/Cms

---
 application/controllers/CisHmvc/Cms.php | 58 ++++++++++++++++++++++---
 application/controllers/CisVue/Cms.php  | 58 ++++++++++++++++++++++---
 2 files changed, 104 insertions(+), 12 deletions(-)

diff --git a/application/controllers/CisHmvc/Cms.php b/application/controllers/CisHmvc/Cms.php
index d15f398a4..eed1a5fea 100644
--- a/application/controllers/CisHmvc/Cms.php
+++ b/application/controllers/CisHmvc/Cms.php
@@ -77,6 +77,17 @@ class Cms extends Auth_Controller
 		$this->load->view('CisHmvc/Cms/Content', ['content' => getData($content)]);
 	}
 
+	/**
+	 * @param boolean			$infoscreen
+	 * @param string | null		$studiengang_kz
+	 * @param int | null		$semester
+	 * @param boolean			$mischen
+	 * @param string			$titel
+	 * @param boolean			$edit
+	 * @param boolean			$sichtbar
+	 *
+	 * @return void
+	 */
 	/**
 	 * @param boolean			$infoscreen
 	 * @param string | null		$studiengang_kz
@@ -90,13 +101,48 @@ class Cms extends Auth_Controller
 	 */
 	public function news($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
 	{
-		$page = intval($this->input->get('page', true));
-		$pagination_size = 10;
-		$news = $this->cmslib->getNews($infoscreen, $studiengang_kz, $semester, $mischen, $titel, $edit, $sichtbar, $page, $pagination_size);
+		$this->load->view('CisHtml/Cms/Content', ['infoscreen' => $infoscreen, 'studiengang_kz' => $studiengang_kz, 'semester' => $semester, 'mischen' => $mischen, 'titel' => $titel, 'edit' => $edit, 'sichtbar' => $sichtbar]);
+	}
 
-		if (isError($news))
-			return $this->load->view('CisHmvc/Error', ['error' => getError($news)]);
+	public function getNews($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
+	{
+		$get_page = intval($this->input->get('page', true));
+		$get_page_size = intval($this->input->get('page_size', true));
+		if ($get_page) {
+			$page = $get_page;
+		}
+		if ($get_page_size) {
+			$page_size = $get_page_size;
+		} else {
+			$page_size = $this->page_size;
+		}
+		$news = $this->cmslib->getNews($infoscreen, $studiengang_kz, $semester, $mischen, $titel, $edit, $sichtbar, $page, $page_size);
 
-		$this->load->view('CisHmvc/Cms/Content', ['content' => getData($news)]);
+		if (isError($news)) {
+			$this->terminateWithJsonError(getError($news));
+		}
+		$news = hasData($news) ? getData($news) : null;
+		if ($news) {
+			echo json_encode($news);
+		} else {
+			show_error("News: No data found");
+		}
+
+	}
+
+	public function getNewsRowCount($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $fachbereich_kurzbz = null, $maxalter = 0, $edit = false, $sichtbar = true, $page = 1, $page_size = 10)
+	{
+		list($studiengang_kz, $semester) = $this->cmslib->getStgAndSem($studiengang_kz, $semester);
+		$all = $edit;
+		$num_rows = $this->NewsModel->countNewsWithContent(getSprache(), $studiengang_kz, $semester, $fachbereich_kurzbz, $sichtbar, $maxalter, $page, $this->page_size, $all, $mischen);
+		if (isError($num_rows)) {
+			$this->terminateWithJsonError(getError($num_rows));
+		}
+		$num_rows = hasData($num_rows) ? getData($num_rows) : null;
+		if ($num_rows) {
+			echo json_encode($num_rows);
+		} else {
+			show_error("News number rows: No data found");
+		}
 	}
 }
diff --git a/application/controllers/CisVue/Cms.php b/application/controllers/CisVue/Cms.php
index 0f3fc061a..2c1fa1fc6 100644
--- a/application/controllers/CisVue/Cms.php
+++ b/application/controllers/CisVue/Cms.php
@@ -47,6 +47,17 @@ class Cms extends FHC_Controller
 		$this->load->view('CisHtml/Cms/Content', ['content' => getData($content)]);
 	}
 
+	/**
+	 * @param boolean			$infoscreen
+	 * @param string | null		$studiengang_kz
+	 * @param int | null		$semester
+	 * @param boolean			$mischen
+	 * @param string			$titel
+	 * @param boolean			$edit
+	 * @param boolean			$sichtbar
+	 *
+	 * @return void
+	 */
 	/**
 	 * @param boolean			$infoscreen
 	 * @param string | null		$studiengang_kz
@@ -60,13 +71,48 @@ class Cms extends FHC_Controller
 	 */
 	public function news($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
 	{
-		$page = intval($this->input->get('page', true));
-		$pagination_size = 10;
-		$news = $this->cmslib->getNews($infoscreen, $studiengang_kz, $semester, $mischen, $titel, $edit, $sichtbar, $page, $pagination_size);
+		$this->load->view('CisHtml/Cms/Content', ['infoscreen' => $infoscreen, 'studiengang_kz' => $studiengang_kz, 'semester' => $semester, 'mischen' => $mischen, 'titel' => $titel, 'edit' => $edit, 'sichtbar' => $sichtbar]);
+	}
 
-		if (isError($news))
-			return $this->load->view('CisHtml/Error', ['error' => getError($news)]);
+	public function getNews($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
+	{
+		$get_page = intval($this->input->get('page', true));
+		$get_page_size = intval($this->input->get('page_size', true));
+		if ($get_page) {
+			$page = $get_page;
+		}
+		if ($get_page_size) {
+			$page_size = $get_page_size;
+		} else {
+			$page_size = $this->page_size;
+		}
+		$news = $this->cmslib->getNews($infoscreen, $studiengang_kz, $semester, $mischen, $titel, $edit, $sichtbar, $page, $page_size);
 
-		$this->load->view('CisHtml/Cms/Content', ['content' => getData($news)]);
+		if (isError($news)) {
+			$this->terminateWithJsonError(getError($news));
+		}
+		$news = hasData($news) ? getData($news) : null;
+		if ($news) {
+			echo json_encode($news);
+		} else {
+			show_error("News: No data found");
+		}
+
+	}
+
+	public function getNewsRowCount($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $fachbereich_kurzbz = null, $maxalter = 0, $edit = false, $sichtbar = true, $page = 1, $page_size = 10)
+	{
+		list($studiengang_kz, $semester) = $this->cmslib->getStgAndSem($studiengang_kz, $semester);
+		$all = $edit;
+		$num_rows = $this->NewsModel->countNewsWithContent(getSprache(), $studiengang_kz, $semester, $fachbereich_kurzbz, $sichtbar, $maxalter, $page, $this->page_size, $all, $mischen);
+		if (isError($num_rows)) {
+			$this->terminateWithJsonError(getError($num_rows));
+		}
+		$num_rows = hasData($num_rows) ? getData($num_rows) : null;
+		if ($num_rows) {
+			echo json_encode($num_rows);
+		} else {
+			show_error("News number rows: No data found");
+		}
 	}
 }

From 4e5379c5d9c78e9039e8256fcdbe1e59f49d7e57 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 18 Apr 2024 14:53:51 +0200
Subject: [PATCH 0604/1461] adds an edit button over every section in the
 profil page to edit that section

---
 .../Cis/Profil/MitarbeiterProfil.js           |  52 +++++--
 .../ProfilComponents/ProfilInformation.js     | 108 +++++++-------
 .../Profil/ProfilModal/EditProfilSelect.js    |   8 +-
 .../js/components/Cis/Profil/StudentProfil.js | 136 ++++++++++--------
 4 files changed, 180 insertions(+), 124 deletions(-)

diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 41b2c8038..52c9dfb24 100755
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -30,7 +30,9 @@ export default {
   data() {
     return {
       showModal: false,
+      editDataFilter: null,
 
+      // tabulator options
       funktionen_table_options: {
         height: 300,
         layout: "fitColumns",
@@ -159,14 +161,20 @@ export default {
         // when modal was closed without submitting request
       }
       this.showModal = false;
+      this.editDataFilter = null;
     },
 
-    showEditProfilModal() {
+    showEditProfilModal(view) {
+      if (view) {
+        this.editDataFilter = view;
+      }
+
       this.showModal = true;
-      // after a state change, wait for the DOM updates to complete
       Vue.nextTick(() => {
         this.$refs.editModal.show();
       });
+
+      // after a state change, wait for the DOM updates to complete
     },
 
     fetchProfilUpdates: function () {
@@ -181,6 +189,11 @@ export default {
   },
 
   computed: {
+    filteredEditData() {
+      return this.editDataFilter
+        ? this.editData.data[this.editDataFilter]
+        : this.editData;
+    },
     profilInformation() {
       if (!this.data) {
         return {};
@@ -233,12 +246,11 @@ export default {
 
   template: /*html*/ ` 
   <div class="container-fluid text-break fhc-form"  >
-  
-    <edit-profil v-if="showModal" ref="editModal" @hideBsModal="hideEditProfilModal" :value="JSON.parse(JSON.stringify(editData))" :title="$p.t('profil','profilBearbeiten')"></edit-profil>
+ 
+    <edit-profil v-if="showModal" ref="editModal" @hideBsModal="hideEditProfilModal" :value="JSON.parse(JSON.stringify(filteredEditData))" :title="$p.t('profil','profilBearbeiten')"></edit-profil>
           <div class="row">
-          
               <div  class="d-md-none col-12 ">
-             
+           
               <div class="row mb-3">
                 <div class="col">
                 <!-- MOBILE QUICK LINKS --> 
@@ -250,7 +262,7 @@ export default {
 
               <div class="row mb-3 ">
               <div class="col">
-              <button @click="showEditProfilModal" type="button" class="text-start  w-100 btn btn-outline-secondary" >
+              <button @click="()=>showEditProfilModal()" type="button" class="text-start  w-100 btn btn-outline-secondary" >
                 <div class="row">
                   <div class="col-auto">
                     <i class="fa fa-edit"></i>
@@ -289,7 +301,7 @@ export default {
                      <div class="col">
                      
                      <!-- PROFIL INFORMATION -->
-                     <profil-information :title="$p.t('profil','mitarbeiterIn')" :data="profilInformation"></profil-information>
+                     <profil-information @showEditProfilModal="showEditProfilModal" :title="$p.t('profil','mitarbeiterIn')" :data="profilInformation"></profil-information>
 
 
 		                 </div>
@@ -328,7 +340,14 @@ export default {
                       
                       <div class="card">
                           <div class="card-header">
-                            {{$p.t('profil','privateKontakte')}}
+                            <div class="row">
+                              <div @click="showEditProfilModal('Private_Kontakte')" class="col-auto" type="button">
+                                <i class="fa fa-edit"></i>
+                              </div>
+                              <div class="col">
+                                <span>{{$p.t('profil','privateKontakte')}}</span>
+                              </div>
+                            </div>
                           </div>
                           <div class="card-body ">
                             
@@ -351,9 +370,18 @@ export default {
                       <!-- PRIVATE ADRESSEN-->
 
                       <div class="card">
-                          <div class="card-header">{{$p.t('profil','privateAdressen')}}</div>
+                        <div class="card-header">
+                          <div class="row">
+                            <div @click="showEditProfilModal('Private_Adressen')" class="col-auto" type="button">
+                              <i class="fa fa-edit"></i>
+                            </div>
+                            <div class="col">
+                              <span>{{$p.t('profil','privateAdressen')}}</span>
+                            </div>
+                          </div>
+                          </div>
                             <div class="card-body">
-                            
+                           
                               <div class="gy-3 row ">
                                 <div v-for="element in data.adressen" class="col-12">
                                 <Adresse :data="element"></Adresse>
@@ -413,7 +441,7 @@ export default {
 
                 <div class="row d-none d-md-block ">
                 <div class="col mb-3">
-                <button @click="showEditProfilModal" type="button" class="text-start  w-100 btn btn-outline-secondary" >
+                <button @click="()=>showEditProfilModal()" type="button" class="text-start  w-100 btn btn-outline-secondary" >
                   <div class="row">
                     <div class="col-auto">
                       <i class="fa fa-edit"></i>
diff --git a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
index 83b746c69..040eed441 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
@@ -1,59 +1,70 @@
 export default {
+  props: {
+    title: {
+      type: String,
+    },
+    data: {
+      type: Object,
+    },
+  },
+  data() {
+    return {
+      FotoSperre: this.data.foto_sperre,
+    };
+  },
+  emits: ["showEditProfilModal"],
 
-    props:{
-        title:{
-            type:String,
-            
-        },
-        data:{
-            type:Object,
+  methods: {
+    sperre_foto_function() {
+      //TODO: refactor
+      if (!this.data) {
+        return;
+      }
+      Vue.$fhcapi.UserData.sperre_foto_function(!this.FotoSperre).then(
+        (res) => {
+          this.FotoSperre = res.data.foto_sperre;
         }
+      );
     },
-    data(){
-        return {
-            FotoSperre:this.data.foto_sperre,
+  },
+  computed: {
+    get_image_base64_src: function () {
+      if (!this.data.foto) {
+        return "";
+      }
+      return "data:image/jpeg;base64," + this.data.foto;
+    },
+    name: function () {
+      return { vorname: this.data.Vorname, nachname: this.data.Nachname };
+    },
+    profilInfo: function () {
+      let res = {};
+      let notIncludedProperties = [
+        "Vorname",
+        "Nachname",
+        "foto_sperre",
+        "foto",
+      ];
+      Object.keys(this.data).forEach((key) => {
+        if (!notIncludedProperties.includes(key)) {
+          res[key] = this.data[key];
         }
+      });
+      return res;
     },
-    
-    methods:{
-        
-        sperre_foto_function() {
-            //TODO: make this better
-            if (!this.data) {
-              return;
-            }
-            Vue.$fhcapi.UserData.sperre_foto_function(!this.FotoSperre).then((res) => {
-              this.FotoSperre = res.data.foto_sperre;
-            
-            });
-          },
-    },
-    computed:{
-        get_image_base64_src: function() {
-            if (!this.data.foto) {
-              return "";
-            }
-            return "data:image/jpeg;base64," + this.data.foto;
-          },
-        name: function(){
-            return {vorname:this.data.Vorname, nachname: this.data.Nachname};
-        },
-        profilInfo: function(){
-            let res = {};
-            let notIncludedProperties=["Vorname", "Nachname", "foto_sperre","foto"];
-            Object.keys(this.data).forEach((key)=>{
-                if(!notIncludedProperties.includes(key)){
-                    res[key] = this.data[key];
-                }
-            })
-            return res;
-        }
-    },
-    template: `
+  },
+  template: /*html*/ `
     
     <div class="card h-100">
     <div class="card-header">
-    {{title}}
+      <div class="row">
+        <div @click="$emit('showEditProfilModal','Personen_Informationen')" class="col-auto" type="button">
+          <i class="fa fa-edit"></i>
+        </div>
+        <div class="col">
+          <span>{{title}}</span>
+        </div>
+      </div>
     </div>
     <div class="card-body">
     
@@ -134,5 +145,4 @@ export default {
     
     </div>
   </div>`,
-
-};
\ No newline at end of file
+};
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfilSelect.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilSelect.js
index 74aa15968..983e0a20c 100755
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfilSelect.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfilSelect.js
@@ -133,8 +133,12 @@ export default {
   created() {
     //? JSON parse and stringify are used to deep clone the objects
     this.properties = { ...this.list };
-    this.data = JSON.parse(JSON.stringify(this.list.data));
-    this.view = JSON.parse(JSON.stringify(this.list.view));
+    this.data = this.list.data
+      ? JSON.parse(JSON.stringify(this.list.data))
+      : null;
+    this.view = this.list.view
+      ? JSON.parse(JSON.stringify(this.list.view))
+      : null;
   },
   mounted() {},
 
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index 0eb7e8770..2f6b988e0 100755
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -22,14 +22,16 @@ export default {
     RoleInformation,
     ProfilInformation,
     FetchProfilUpdates,
-    EditProfil
-
+    EditProfil,
   },
-  inject:['sortProfilUpdates','collapseFunction'],
+  inject: ["sortProfilUpdates", "collapseFunction"],
   data() {
     return {
       showModal: false,
       collapseIconBetriebsmittel: true,
+      editDataFilter: null,
+
+      // tabulator options
       zutrittsgruppen_table_options: {
         height: 200,
         layout: "fitColumns",
@@ -79,58 +81,62 @@ export default {
   },
 
   props: {
-    data:Object,
-    editData:Object,
+    data: Object,
+    editData: Object,
   },
   methods: {
-
-    fetchProfilUpdates: function(){
-      Vue.$fhcapi.ProfilUpdate.selectProfilRequest().then((res)=>{
-        
-        if(!res.error){
-          this.data.profilUpdates = res.data?.length ? res.data.sort(this.sortProfilUpdates) : null ; 
+    fetchProfilUpdates: function () {
+      Vue.$fhcapi.ProfilUpdate.selectProfilRequest().then((res) => {
+        if (!res.error) {
+          this.data.profilUpdates = res.data?.length
+            ? res.data.sort(this.sortProfilUpdates)
+            : null;
         }
       });
     },
-    
-    hideEditProfilModal: function(){
-      
+
+    hideEditProfilModal: function () {
       //? checks the editModal component property result, if the user made a successful request or not
-      if(this.$refs.editModal.result){
+      if (this.$refs.editModal.result) {
         Vue.$fhcapi.ProfilUpdate.selectProfilRequest()
-        .then((request) =>{
-          if(!request.error){
-            this.data.profilUpdates = request.data;
-            this.data.profilUpdates.sort(this.sortProfilUpdates);
-            
-          }else{
-            console.log("Error when fetching profile updates: " +res.data);
-          }
-        })
-        .catch(err=>{
-          console.log(err);
-        });
-      }else{
+          .then((request) => {
+            if (!request.error) {
+              this.data.profilUpdates = request.data;
+              this.data.profilUpdates.sort(this.sortProfilUpdates);
+            } else {
+              console.log("Error when fetching profile updates: " + res.data);
+            }
+          })
+          .catch((err) => {
+            console.log(err);
+          });
+      } else {
         // when modal was closed without submitting request
       }
-      this.showModal=false;
-     
+      this.showModal = false;
+      this.editDataFilter = null;
     },
 
-    showEditProfilModal() {
+    showEditProfilModal(view) {
+      if (view) {
+        this.editDataFilter = view;
+      }
       this.showModal = true;
       // after a state change, wait for the DOM updates to complete
-      Vue.nextTick(()=>{
+      Vue.nextTick(() => {
         this.$refs.editModal.show();
       });
-      
     },
-   
   },
 
   computed: {
- 
-   profilInformation() {
+    filteredEditData() {
+      return this.editDataFilter
+        ? this.editData.data[this.editDataFilter]
+        : this.editData;
+    },
+
+    profilInformation() {
       if (!this.data) {
         return {};
       }
@@ -142,13 +148,11 @@ export default {
         Anrede: this.data.anrede,
         Titel: this.data.titel,
         Postnomen: this.data.postnomen,
-        foto_sperre:this.data.foto_sperre,
-        foto:this.data.foto,
-
+        foto_sperre: this.data.foto_sperre,
+        foto: this.data.foto,
       };
     },
 
-   
     roleInformation() {
       if (!this.data) {
         return {};
@@ -164,36 +168,29 @@ export default {
         Gruppe: this.data.gruppe.trim(),
       };
     },
-
-    
   },
 
-  created(){
-
+  created() {
     //? sorts the profil Updates: pending -> accepted -> rejected
     this.data.profilUpdates?.sort(this.sortProfilUpdates);
   },
 
   mounted() {
-    this.$refs.betriebsmittelTable.tabulator.on('tableBuilt', () => {
-    
+    this.$refs.betriebsmittelTable.tabulator.on("tableBuilt", () => {
       this.$refs.betriebsmittelTable.tabulator.setData(this.data.mittel);
-      
-  }) 
+    });
 
-  this.$refs.zutrittsgruppenTable.tabulator.on('tableBuilt', () => {
-  
-      this.$refs.zutrittsgruppenTable.tabulator.setData(this.data.zuttritsgruppen);
-      
-  }) 
-
-   
+    this.$refs.zutrittsgruppenTable.tabulator.on("tableBuilt", () => {
+      this.$refs.zutrittsgruppenTable.tabulator.setData(
+        this.data.zuttritsgruppen
+      );
+    });
   },
 
-  template:/*html*/ ` 
+  template: /*html*/ ` 
 
   <div class="container-fluid text-break fhc-form"  >
-  <edit-profil v-if="showModal" ref="editModal" @hideBsModal="hideEditProfilModal" :value="JSON.parse(JSON.stringify(editData))" title="$p.t('profil','profilBearbeiten')" ></edit-profil>
+  <edit-profil v-if="showModal" ref="editModal" @hideBsModal="hideEditProfilModal" :value="JSON.parse(JSON.stringify(filteredEditData))" title="$p.t('profil','profilBearbeiten')" ></edit-profil>
     <!-- ROW --> 
           <div class="row">
           <!-- HIDDEN QUICK LINKS -->
@@ -250,7 +247,7 @@ export default {
                     <div class="col">
                     
                     <!-- PROFIL INFORMATION -->
-                    <profil-information title="$p.t('profil','studentIn')" :data="profilInformation"></profil-information>
+                    <profil-information @showEditProfilModal="showEditProfilModal" title="$p.t('profil','studentIn')" :data="profilInformation"></profil-information>
 
 
                     </div>
@@ -290,7 +287,15 @@ export default {
                       
                       <div class="card">
                           <div class="card-header">
-                            {{$p.t('profil','privateKontakte')}}
+                          <div class="row">
+                              <div @click="showEditProfilModal('Private_Kontakte')" class="col-auto" type="button">
+                                <i class="fa fa-edit"></i>
+                              </div>
+                              <div class="col">
+                                <span>{{$p.t('profil','privateKontakte')}}</span>
+                              </div>
+                            </div>
+                            
                           </div>
                           <div class="card-body ">
                             
@@ -312,7 +317,16 @@ export default {
                     <!-- PRIVATE ADRESSEN-->
 
                     <div class="card">
-                        <div class="card-header">{{$p.t('profil','privateAdressen')}}</div>
+                        <div class="card-header">
+                        <div class="row">
+                              <div @click="showEditProfilModal('Private_Adressen')" class="col-auto" type="button">
+                                <i class="fa fa-edit"></i>
+                              </div>
+                              <div class="col">
+                                <span>{{$p.t('profil','privateAdressen')}}</span>
+                              </div>
+                            </div>
+                        </div>
                           <div class="card-body">
                           
                             <div class="gy-3 row ">
@@ -367,7 +381,7 @@ export default {
   
                 <div class="row d-none d-md-block">
                 <div class="col mb-3">
-                <button @click="showEditProfilModal" type="button" class="text-start  w-100 btn btn-outline-secondary" >
+                <button @click="()=>showEditProfilModal()" type="button" class="text-start  w-100 btn btn-outline-secondary" >
                   <div class="row">
                     <div class="col-2">
                       <i class="fa fa-edit"></i>

From eda68ef5e06d1d7f4ed346f9611cba9cfc8b0065 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 18 Apr 2024 14:54:18 +0200
Subject: [PATCH 0605/1461] BugFix Watch Reload Tabs

---
 public/js/components/Betriebsmittel/Betriebsmittel.js     | 5 +++++
 .../Stv/Studentenverwaltung/Details/Kontakt/Address.js    | 8 +++++---
 .../Studentenverwaltung/Details/Kontakt/Bankaccount.js    | 5 +++++
 .../Stv/Studentenverwaltung/Details/Kontakt/Contact.js    | 5 +++++
 .../Stv/Studentenverwaltung/Details/Prestudent/Status.js  | 3 +++
 5 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/public/js/components/Betriebsmittel/Betriebsmittel.js b/public/js/components/Betriebsmittel/Betriebsmittel.js
index 6011ff98c..209ca9380 100644
--- a/public/js/components/Betriebsmittel/Betriebsmittel.js
+++ b/public/js/components/Betriebsmittel/Betriebsmittel.js
@@ -137,6 +137,11 @@ export default {
 			filteredInventar: []
 		}
 	},
+	watch: {
+		uid(){
+			this.$refs.table.tabulator.setData('api/frontend/v1/stv/Betriebsmittel/getAllBetriebsmittel/' + this.uid + '/' + this.person_id);
+		}
+	},
 	methods: {
 		actionEditBetriebsmittel(betriebsmittelperson_id){
 			this.statusNew = false;
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
index 6d0ba0750..017f3a056 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
@@ -168,6 +168,11 @@ export default{
 			}, {}));
 		}
 	},
+	watch: {
+		uid(){
+			this.$refs.table.tabulator.setData('api/frontend/v1/stv/Kontakt/getAdressen/' + this.uid);
+		}
+	},
 	methods:{
 		actionNewAdress(){
 			this.$refs.newAdressModal.show();
@@ -266,9 +271,6 @@ export default{
 					this.filteredFirmen = result.data.retval;
 				});
 		},
-		reload(){
-			this.$refs.table.reloadTable();
-		},
 		hideModal(modalRef){
 			this.$refs[modalRef].hide();
 		},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
index ed58e55ae..1d5833044 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
@@ -114,6 +114,11 @@ export default{
 			}
 		}
 	},
+	watch: {
+		uid(){
+			this.$refs.table.tabulator.setData('api/frontend/v1/stv/Kontakt/getBankverbindung/' + this.uid);
+		}
+	},
 	methods:{
 		actionNewBankverbindung(){
 			this.$refs.newBankverbindungModal.show();
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
index ef6c475ae..a9d89b89c 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
@@ -111,6 +111,11 @@ export default{
 			filteredStandorte: null
 		}
 	},
+	watch: {
+		uid(){
+			this.$refs.table.tabulator.setData('api/frontend/v1/stv/Kontakt/getKontakte/' + this.uid);
+		}
+	},
 	methods:{
 		actionNewContact(){
 			this.$refs.newContactModal.show();
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
index 1538ad9aa..14ddf6866 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
@@ -233,6 +233,9 @@ export default{
 				const start = this.status_kurzbz;
 			},
 			deep: true
+		},
+		prestudent_id(){
+			this.$refs.table.tabulator.setData('api/frontend/v1/stv/Status/getHistoryPrestudent/' + this.prestudent_id);
 		}
 	},
 	methods: {

From bc0d581402b371a70b342133c8adb842607cc5b7 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 18 Apr 2024 15:00:28 +0200
Subject: [PATCH 0606/1461] fixes phrasen in the studentProfil

---
 .../Profil/ProfilComponents/ProfilEmails.js   | 28 +++++-----
 .../Cis/Profil/ProfilComponents/QuickLinks.js | 56 +++++++++----------
 .../js/components/Cis/Profil/StudentProfil.js | 18 +++---
 3 files changed, 49 insertions(+), 53 deletions(-)

diff --git a/public/js/components/Cis/Profil/ProfilComponents/ProfilEmails.js b/public/js/components/Cis/Profil/ProfilComponents/ProfilEmails.js
index 23ac82bac..4040be37b 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/ProfilEmails.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/ProfilEmails.js
@@ -1,19 +1,17 @@
 export default {
-    data(){
-        return {
-
-        }
+  data() {
+    return {};
+  },
+  props: {
+    title: {
+      type: String,
+      required: true,
     },
-    props:{
-        title:{
-            type:String,
-            
-        },
-        data:{
-            type:Array,
-        }
+    data: {
+      type: Array,
     },
-    template: `
+  },
+  template: /*html*/ `
     <div class="card ">
     <div class="card-header">
     {{title}}
@@ -60,5 +58,5 @@ export default {
 
 
     </div>
-    </div>`
-}
\ No newline at end of file
+    </div>`,
+};
diff --git a/public/js/components/Cis/Profil/ProfilComponents/QuickLinks.js b/public/js/components/Cis/Profil/ProfilComponents/QuickLinks.js
index de0ee0b98..bad40b2fe 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/QuickLinks.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/QuickLinks.js
@@ -1,34 +1,32 @@
-export default{
-    //TODO: To be implemented
-    props:{
-        data:{
-            type:String,
-            
-        },
-        title:{
-            type:String,
-
-        },
-        mobile:{
-            type:Boolean,
-            default:false,
-        }
+export default {
+  //TODO: To be implemented
+  props: {
+    data: {
+      type: String,
     },
-    methods:{
-        hideCollapse: function(){
-            this.collapseOpen = false;
-        },
-        showCollapse: function(){
-            this.collapseOpen = true;
-        },
+    title: {
+      type: String,
+      required: true,
     },
-    data(){
-        return{
-            collapseOpen: false,
-
-        }
+    mobile: {
+      type: Boolean,
+      default: false,
     },
-    template:/*html*/`
+  },
+  methods: {
+    hideCollapse: function () {
+      this.collapseOpen = false;
+    },
+    showCollapse: function () {
+      this.collapseOpen = true;
+    },
+  },
+  data() {
+    return {
+      collapseOpen: false,
+    };
+  },
+  template: /*html*/ `
     <div class="card">
     <template v-if="mobile">
     
@@ -65,4 +63,4 @@ export default{
   
   </template>
   </div>`,
-}
\ No newline at end of file
+};
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index 2f6b988e0..51699cdd4 100755
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -199,7 +199,7 @@ export default {
               <div class="row py-2">
                 <div class="col">
                 
-                <quick-links :mobile="true"></quick-links>
+                <quick-links :title="$p.t('profil','quickLinks')" :mobile="true"></quick-links>
                 </div>
               </div>
 
@@ -247,7 +247,7 @@ export default {
                     <div class="col">
                     
                     <!-- PROFIL INFORMATION -->
-                    <profil-information @showEditProfilModal="showEditProfilModal" title="$p.t('profil','studentIn')" :data="profilInformation"></profil-information>
+                    <profil-information @showEditProfilModal="showEditProfilModal" :title="$p.t('profil','studentIn')" :data="profilInformation"></profil-information>
 
 
                     </div>
@@ -257,8 +257,8 @@ export default {
 
                     <div  class=" col-lg-12">
        
-                   <!-- MITARBEITER INFO -->
-                   <role-information title="$p.t('profil','studentInformation')" :data="roleInformation"></role-information>
+                   <!-- STUDENT INFO -->
+                   <role-information :title="$p.t('profil','studentInformation')" :data="roleInformation"></role-information>
 
 
                     </div> 
@@ -274,7 +274,7 @@ export default {
                     <div class="row mb-4">
                     <div class="col">
                     <!-- EMAILS -->
-                    <profil-emails :data="data.emails" ></profil-emails>
+                    <profil-emails :title="this.$p.t('person','email')" :data="data.emails" ></profil-emails>
                     </div>
                     </div>
 
@@ -350,11 +350,11 @@ export default {
                 <div class="row">
 
                   <div class="col-12 mb-4" >
-                    <core-filter-cmpt title="$p.t('profil','entlehnteBetriebsmittel')"  ref="betriebsmittelTable" :tabulator-options="betriebsmittel_table_options" tableOnly :sideMenu="false" />
+                    <core-filter-cmpt :title="$p.t('profil','entlehnteBetriebsmittel')"  ref="betriebsmittelTable" :tabulator-options="betriebsmittel_table_options" tableOnly :sideMenu="false" />
                   </div> 
 
                   <div class="col-12 mb-4" >
-                    <core-filter-cmpt title="$p.t('profil','zutrittsGruppen')" ref="zutrittsgruppenTable" :tabulator-options="zutrittsgruppen_table_options"  tableOnly :sideMenu="false" noColumnFilter />
+                    <core-filter-cmpt :title="$p.t('profil','zutrittsGruppen')" ref="zutrittsgruppenTable" :tabulator-options="zutrittsgruppen_table_options"  tableOnly :sideMenu="false" noColumnFilter />
             
                   </div>
 
@@ -371,7 +371,7 @@ export default {
                   <div class="col">
                  
                   <!-- QUICK LINKS -->     
-                   <quick-links ></quick-links>
+                   <quick-links :title="$p.t('profil','quickLinks')"></quick-links>
                       
                   
                   </div>
@@ -424,7 +424,7 @@ export default {
 
                   
                   <!-- HIER SIND DIE MAILVERTEILER -->
-                   <mailverteiler :data="data?.mailverteiler"></mailverteiler>
+                   <mailverteiler :title="$p.t('profil','mailverteiler')" :data="data?.mailverteiler"></mailverteiler>
 
                   </div>
 

From c90b875aa2fe6028f2aab9b5abf7639870b194ea Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 18 Apr 2024 15:01:54 +0200
Subject: [PATCH 0607/1461] Bugfix reload Prestudent

---
 .../components/Stv/Studentenverwaltung/Details/Prestudent.js   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
index 3d723a570..9035789f3 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
@@ -84,6 +84,9 @@ export default {
 				this.deltaArray = delta;
 			},
 			deep: true
+		},
+		modelValue(n){
+			this.loadPrestudent(n);
 		}
 	},
 

From 4bb9c61168421e3a92f4c190f41920f5735f9b78 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 18 Apr 2024 15:06:38 +0200
Subject: [PATCH 0608/1461] also fixes the phrasen for the student/Mitarbeiter
 View Ansicht

---
 .../Cis/Profil/MitarbeiterViewProfil.js       | 47 +++++++------------
 .../Cis/Profil/StudentViewProfil.js           | 43 ++++++-----------
 2 files changed, 33 insertions(+), 57 deletions(-)

diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
index 53d5267c8..0c9d451f4 100755
--- a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
@@ -1,4 +1,3 @@
-
 import { CoreFilterCmpt } from "../../../components/filter/Filter.js";
 import Mailverteiler from "./ProfilComponents/Mailverteiler.js";
 import QuickLinks from "./ProfilComponents/QuickLinks.js";
@@ -15,11 +14,11 @@ export default {
     ProfilEmails,
     ProfilInformation,
   },
-  inject: ['collapseFunction'],
+  inject: ["collapseFunction"],
   data() {
     return {
       collapseIconFunktionen: true,
-     
+
       funktionen_table_options: {
         height: 300,
         layout: "fitColumns",
@@ -82,22 +81,18 @@ export default {
           },
         ],
       },
-     
     };
   },
 
   //? this is the prop passed to the dynamic component with the custom data of the view
   props: ["data"],
-  methods: {
-   
-  },
+  methods: {},
 
   computed: {
-
     personEmails() {
       return this.data?.emails ? this.data.emails : [];
     },
-    
+
     profilInformation() {
       if (!this.data) {
         return {};
@@ -110,13 +105,10 @@ export default {
         Anrede: this.data.anrede,
         Titel: this.data.titel,
         Postnomen: this.data.postnomen,
-        foto_sperre:this.data.foto_sperre,
-        foto:this.data.foto,
-
+        foto_sperre: this.data.foto_sperre,
+        foto: this.data.foto,
       };
     },
-  
-   
 
     roleInformation() {
       if (!this.data) {
@@ -127,25 +119,22 @@ export default {
         Geburtsdatum: this.data.gebdatum,
         Geburtsort: this.data.gebort,
         Kurzzeichen: this.data.kurzbz,
-        Telefon:  (this.data.standort_telefon?this.data.standort_telefon:"") + " " + this.data.telefonklappe,
+        Telefon:
+          (this.data.standort_telefon ? this.data.standort_telefon : "") +
+          " " +
+          this.data.telefonklappe,
         Büro: this.data.ort_kurzbz,
       };
     },
-
-  
   },
 
   mounted() {
-  
-
     this.$refs.funktionenTable.tabulator.on("tableBuilt", () => {
       this.$refs.funktionenTable.tabulator.setData(this.data.funktionen);
     });
-
-   
   },
 
-  template: /*html*/` 
+  template: /*html*/ ` 
 
   <div class="container-fluid text-break fhc-form"  >
     <!-- ROW --> 
@@ -153,7 +142,7 @@ export default {
           <!-- HIDDEN QUICK LINKS -->
               <div  class="d-md-none col-12 ">
              
-              <quick-links :mobile="true" ></quick-links>
+              <quick-links :title="$p.t('profil','quickLinks')" :mobile="true" ></quick-links>
 
               </div>
               <!-- END OF HIDDEN QUCK LINKS -->
@@ -176,7 +165,7 @@ export default {
                      <div class="col">
                      
                         <!-- Profil Informationen -->
-                        <profil-information title="$p.t('profil','mitarbeiterIn')" :data="profilInformation"></profil-information>
+                        <profil-information :title="$p.t('profil','mitarbeiterIn')" :data="profilInformation"></profil-information>
                      
 		                </div>
                     </div>
@@ -195,7 +184,7 @@ export default {
                     <div class="col">
 
                     <!-- EMAILS -->
-                    <profil-emails :data="personEmails"></profil-emails>
+                    <profil-emails :title="this.$p.t('person','email')" :data="personEmails"></profil-emails>
                    
                     </div></div>
 
@@ -207,7 +196,7 @@ export default {
                     <div  class=" col-lg-12">
        
                     <!-- roleInformation -->
-                    <role-information :data="roleInformation" title="$p.t('profil','mitarbeiterInformation')"></role-information>
+                    <role-information :data="roleInformation" :title="$p.t('profil','mitarbeiterInformation')"></role-information>
 
                     </div>  
                            
@@ -239,7 +228,7 @@ export default {
 
                 <!-- FIRST TABLE -->
                   <div class="col-12 mb-4" >
-                    <core-filter-cmpt title="$p.t('person','funktionen')"  ref="funktionenTable" :tabulator-options="funktionen_table_options"  tableOnly :sideMenu="false" />
+                    <core-filter-cmpt :title="$p.t('person','funktionen')"  ref="funktionenTable" :tabulator-options="funktionen_table_options"  tableOnly :sideMenu="false" />
                   </div>
 
                
@@ -258,7 +247,7 @@ export default {
                   <div class="col">
                  
                    <!-- QUICKLINKS -->
-                   <quick-links ></quick-links>
+                   <quick-links :title="$p.t('profil','quickLinks')" ></quick-links>
 
                   </div>
                 </div>
@@ -269,7 +258,7 @@ export default {
 
                   <!-- MAILVERTEILER -->
 
-                  <mailverteiler :data="data?.mailverteiler"></mailverteiler>
+                  <mailverteiler :data="data?.mailverteiler" :title="$p.t('profil','mailverteiler')"></mailverteiler>
 
                   </div>
 
diff --git a/public/js/components/Cis/Profil/StudentViewProfil.js b/public/js/components/Cis/Profil/StudentViewProfil.js
index 8f09a11af..4fb0a76ca 100755
--- a/public/js/components/Cis/Profil/StudentViewProfil.js
+++ b/public/js/components/Cis/Profil/StudentViewProfil.js
@@ -5,29 +5,22 @@ import RoleInformation from "./ProfilComponents/RoleInformation.js";
 import ProfilInformation from "./ProfilComponents/ProfilInformation.js";
 
 export default {
-  
   data() {
-    return {
-      
-     
-    };
+    return {};
   },
-  components:{
+  components: {
     QuickLinks,
     Mailverteiler,
     ProfilEmails,
     RoleInformation,
-    ProfilInformation
+    ProfilInformation,
   },
 
   props: ["data"],
-  methods: {
-    
-  },
+  methods: {},
 
   computed: {
-   
-     profilInformation() {
+    profilInformation() {
       if (!this.data) {
         return {};
       }
@@ -39,9 +32,8 @@ export default {
         Anrede: this.data.anrede,
         Titel: this.data.titel,
         Postnomen: this.data.postnomen,
-        foto_sperre:this.data.foto_sperre,
-        foto:this.data.foto,
-
+        foto_sperre: this.data.foto_sperre,
+        foto: this.data.foto,
       };
     },
 
@@ -64,16 +56,11 @@ export default {
         Gruppe: this.data.gruppe.trim(),
       };
     },
-  
   },
 
-  mounted() {
-   
+  mounted() {},
 
-   
-  },
-
-  template: /*html*/` 
+  template: /*html*/ ` 
 
   <div class="container-fluid text-break fhc-form"  >
     <!-- ROW --> 
@@ -81,7 +68,7 @@ export default {
           <!-- HIDDEN QUICK LINKS -->
               <div  class="d-md-none col-12 ">
              
-             <quick-links :mobile="true"></quick-links>
+             <quick-links :title="$p.t('profil','quickLinks')" :mobile="true"></quick-links>
 
               </div>
               <!-- END OF HIDDEN QUCK LINKS -->
@@ -102,7 +89,7 @@ export default {
                      <div class="row mb-4">
                      <div class="col">
                      
-                        <profil-information :data="profilInformation" title="$p.t('profil','studentIn')"></profil-information>
+                        <profil-information :data="profilInformation" :title="$p.t('profil','studentIn')"></profil-information>
                      
 		                </div>
                     </div>
@@ -118,7 +105,7 @@ export default {
                     <div class="col">
 
                     <!-- EMAILS -->
-                    <profil-emails :data="personEmails"></profil-emails>
+                    <profil-emails :title="this.$p.t('person','email')" :data="personEmails"></profil-emails>
                   
                     </div></div>
 
@@ -128,7 +115,7 @@ export default {
 
                     <div  class=" col-lg-12">
        
-                    <role-information title="$p.t('profil','studentInformation')" :data="roleInformation"></role-information>
+                    <role-information :title="$p.t('profil','studentInformation')" :data="roleInformation"></role-information>
 
                     </div>  
                        
@@ -161,7 +148,7 @@ export default {
                 <div  class="row d-none d-md-block mb-3">
                   <div class="col">
                  
-                   <quick-links></quick-links>
+                   <quick-links :title="$p.t('profil','quickLinks')"></quick-links>
 
                   </div>
                 </div>
@@ -174,7 +161,7 @@ export default {
 
                   
                   <!-- HIER SIND DIE MAILVERTEILER -->
-                    <mailverteiler :data="data?.mailverteiler"></mailverteiler>
+                    <mailverteiler :title="$p.t('profil','mailverteiler')" :data="data?.mailverteiler"></mailverteiler>
 
                   </div>
 

From 6025660e235e368e431c958be5324d8e36b675ef Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 18 Apr 2024 15:14:41 +0200
Subject: [PATCH 0609/1461] Konto counter & Zahlungsreferenz

---
 .../controllers/api/frontend/v1/stv/Konto.php | 152 ++++++++++++++++--
 application/models/crm/Konto_model.php        | 103 ++++++++++++
 public/js/api/stv/konto.js                    |   3 +
 .../Stv/Studentenverwaltung/Details/Konto.js  |  55 ++++++-
 4 files changed, 296 insertions(+), 17 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Konto.php b/application/controllers/api/frontend/v1/stv/Konto.php
index 1f6b963bb..002d84766 100644
--- a/application/controllers/api/frontend/v1/stv/Konto.php
+++ b/application/controllers/api/frontend/v1/stv/Konto.php
@@ -39,6 +39,7 @@ class Konto extends FHCAPI_Controller
 			'getBuchungstypen' => 'student/stammdaten:r', // alle?
 			'checkDoubles' => ['admin:r', 'assistenz:r'],
 			'insert' => ['admin:w', 'assistenz:w'],
+			'counter' => ['admin:w', 'assistenz:w'],
 			'update' => ['admin:w', 'assistenz:w'],
 			'delete' => ['admin:w', 'assistenz:w']
 		]);
@@ -239,8 +240,8 @@ class Konto extends FHCAPI_Controller
 			'anmerkung'
 		];
 		$data = [
-			'updateamum' => date('c'),
-			'updatevon' => getAuthUID()
+			'insertamum' => date('c'),
+			'insertvon' => getAuthUID()
 		];
 		foreach ($allowed as $field)
 			if ($this->input->post($field) !== null)
@@ -254,11 +255,11 @@ class Konto extends FHCAPI_Controller
 		foreach ($person_ids as $person_id) {
 			$id = $this->KontoModel->insert(array_merge($data, ['person_id' => $person_id]));
 			if (isError($id)) {
-				$this->addError(getError($id), self::ERROR_TYPE_GENERAL);
+				$this->addError(getError($id), self::ERROR_TYPE_DB);
 			} else {
 				$data = $this->KontoModel->withAdditionalInfo()->load(getData($id));
 				if (isError($data))
-					$this->addError(getError($data), self::ERROR_TYPE_GENERAL);
+					$this->addError(getError($data), self::ERROR_TYPE_DB);
 				else
 					$result[] = current(getData($data));
 			}
@@ -266,7 +267,132 @@ class Konto extends FHCAPI_Controller
 
 		if ($result)
 			$this->terminateWithSuccess($result);
-		// NOTE(chris): else there should already be error in the return object
+
+		$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+	}
+
+	/**
+	 * Save Counter Buchung
+	 *
+	 * @return void
+	 */
+	public function counter()
+	{
+		$this->load->library('form_validation');
+
+		$buchungsnrs = $this->input->post('buchungsnr');
+
+		if (!$buchungsnrs || !is_array($buchungsnrs)) {
+			$buchungsnrs = $buchungsnrs ? [$buchungsnrs] : [];
+			$this->form_validation->set_rules('buchungsnr', 'Buchungsnr', 'required');
+		}
+		$this->form_validation->set_rules('buchungsdatum', 'Buchungsdatum', 'is_valid_date');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$data = [];
+		$rules = [];
+		foreach ($buchungsnrs as $k => $buchungsnr) {
+			$result = $this->KontoModel->load($buchungsnr);
+			if (isError($result)) {
+				$rules[] = [
+					'field' => 'buchung[' . $k . ']',
+					'label' => 'Buchung #' . $buchungsnr,
+					'rules' => 'required',
+					'errors' => [
+						'required' => getError($result)
+					]
+				];
+			} elseif (!hasData($result)) {
+				$rules[] = [
+					'field' => 'buchung[' . $k . ']',
+					'label' => 'Buchung #' . $buchungsnr,
+					'rules' => 'required'
+				];
+			} else {
+				$data[$k] = get_object_vars(current(getData($result)));
+				$rules[] = [
+					'field' => 'buchung[' . $k . '][buchungsnr]',
+					'label' => 'Buchung # ' . $buchungsnr,
+					'rules' => 'required|numeric'
+				];
+				$rules[] = [
+					'field' => 'buchung[' . $k . '][studiengang_kz]',
+					'label' => 'Buchung # ' . $buchungsnr,
+					'rules' => 'required|has_permissions_for_stg[admin:rw,assistenz:rw]'
+				];
+				$rules[] = [
+					'field' => 'buchung[' . $k . '][buchungsnr_verweis]',
+					'label' => 'Buchung # ' . $buchungsnr,
+					'rules' => 'regex_match[/^$/]',
+					'errors' => [
+						'regex_match' => 'Gegenbuchungen koennen nur auf die obersten Buchungen getaetigt werden'
+					] // TODO(chris): phrase
+				];
+			}
+		}
+		
+		$this->form_validation->reset_validation();
+		$this->form_validation->set_data(['buchung' => $data]);
+		$this->form_validation->set_rules($rules);
+		
+		Events::trigger('konto_counter_validation', $this->form_validation);
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$buchungsdatum = $this->input->post('buchungsdatum');
+
+		$newItems = [];
+		foreach ($data as $buchung) {
+			$result = $this->KontoModel->getDifferenz($buchung['buchungsnr']);
+			if (isError($result)) {
+				$this->addError(getError($result), self::ERROR_TYPE_GENERAL);
+				continue;
+			}
+			$betrag = $result->retval;
+			if ($betrag === null) {
+				$this->addError($this->p->t(
+					'konto',
+					'Buchung #{buchungsnr} does not exist',
+					$buchung
+				), self::ERROR_TYPE_GENERAL); // TODO(chris): phrase
+				continue;
+			}
+
+
+			$result = $this->KontoModel->insert([
+				'person_id' => $buchung['person_id'],
+				'studiengang_kz' => $buchung['studiengang_kz'],
+				'studiensemester_kurzbz' => $buchung['studiensemester_kurzbz'],
+				'buchungstext' => $buchung['buchungstext'],
+				'buchungstyp_kurzbz' => $buchung['buchungstyp_kurzbz'],
+				'credit_points' => $buchung['credit_points'],
+				'zahlungsreferenz' => $buchung['zahlungsreferenz'],
+				'betrag' => $betrag,
+				'buchungsdatum' => $buchungsdatum,
+				'mahnspanne' => '0',
+				'buchungsnr_verweis' => $buchung['buchungsnr'],
+				'insertamum' => date('c'),
+				'insertvon' => getAuthUID(),
+				'anmerkung' => ''
+			]);
+			if (isError($result)) {
+				$this->addError(getError($result), self::ERROR_TYPE_GENERAL);
+				continue;
+			}
+
+			$newItems = null;
+			// TODO(chris): get as tree?
+			/*$result = $this->KontoModel->withAdditionalInfo()->load($result->retval);
+			if (!hasData($result))
+				$newItems = null;
+			elseif ($newItems !== null)
+				$newItems[] = current(getData($result));*/
+		}
+
+		$this->terminateWithSuccess($newItems);
 	}
 
 	/**
@@ -320,12 +446,14 @@ class Konto extends FHCAPI_Controller
 		if (isError($result))
 			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 
-		$result = $this->KontoModel->withAdditionalInfo()->load($id);
+		$result = null;
+		// TODO(chris): get as tree?
+		/*$result = $this->KontoModel->withAdditionalInfo()->load($id);
 		
 		#$result = $this->getDataOrTerminateWithError($result);
 		if (isError($result))
 			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		$result = $result->retval;
+		$result = $result->retval;*/
 
 		$this->terminateWithSuccess($result);
 	}
@@ -354,7 +482,7 @@ class Konto extends FHCAPI_Controller
 		$result = $result->retval;
 
 		if (!$result)
-			$this->terminateWithError('buchung not found', self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError('buchung not found', self::ERROR_TYPE_GENERAL); // TODO(chris): phrase
 
 		$_POST['studiengang_kz'] = current($result)->studiengang_kz;
 
@@ -369,9 +497,11 @@ class Konto extends FHCAPI_Controller
 		Events::trigger('konto_delete', $buchungsnr);
 		
 		$result = $this->KontoModel->delete($buchungsnr);
-		#$this->getDataOrTerminateWithError($result);
-		if (isError($result))
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		if (isError($result)) {
+			if (getCode($result) != 42)
+				$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); // TODO(chris): phrase
+		}
 
 		$this->terminateWithSuccess();
 	}
diff --git a/application/models/crm/Konto_model.php b/application/models/crm/Konto_model.php
index 77ae04990..6122feef0 100644
--- a/application/models/crm/Konto_model.php
+++ b/application/models/crm/Konto_model.php
@@ -15,6 +15,78 @@ class Konto_model extends DB_Model
 		$this->pk = 'buchungsnr';
 	}
 
+	/**
+	 * Insert Data into DB-Table
+	 *
+	 * @param array				$data  DataArray for Insert
+	 * @return stdClass
+	 */
+	public function insert($data, $encryptedColumns = null)
+	{
+		if (isset($data['buchungsnr_verweis']) && $data['buchungsnr_verweis'])
+			return parent::insert($data, $encryptedColumns);
+
+		$this->db->trans_begin();
+
+		$result = parent::insert($data, $encryptedColumns);
+		if (isError($result)) {
+			$this->db->trans_rollback();
+			return $result;
+		}
+
+		$buchungsnr = $result->retval;
+		// If studiengang_kz is not present in $data it will fail above since it is a not null field
+		$studiengang_kz = $data['studiengang_kz'];
+
+
+		$zahlungsreferenz = false;
+		Events::trigger('generate_zahlungsreferenz', $buchungsnr, $data, function ($value) use ($zahlungsreferenz) {
+			$zahlungsreferenz = $value;
+		});
+
+		if ($zahlungsreferenz === false) {
+			$result = $this->execQuery('SELECT UPPER(oe_kurzbz) || ? as zahlungsreferenz 
+				FROM public.tbl_studiengang 
+				WHERE studiengang_kz=?', [$buchungsnr, $studiengang_kz]);
+			if (isError($result)) {
+				$this->db->trans_rollback();
+				return $result;
+			}
+			$zahlungsreferenz = current(getData($result))->zahlungsreferenz;
+		} elseif (isError($zahlungsreferenz)) {
+			$this->db->trans_rollback();
+			return $zahlungsreferenz;
+		}
+
+
+		$result = $this->update($buchungsnr, [
+			'zahlungsreferenz' => $zahlungsreferenz
+		]);
+
+		if (isError($result)) {
+			$this->db->trans_rollback();
+			return $result;
+		}
+
+		$this->db->trans_commit();
+
+		return success($buchungsnr);
+	}
+
+	/**
+	 * Delete data from DB-Table
+	 *
+	 * @param string			$id  Primary Key for DELETE
+	 *
+	 * @return stdClass
+	 */
+	public function delete($id)
+	{
+		$this->db->where('buchungsnr_verweis', $id);
+		if ($this->db->count_all_results($this->dbTable))
+			return error('Bitte zuerst die zugeordneten Buchungen loeschen');
+		return parent::delete($id, 42);
+	}
 
 	/**
 	 * Adds additional fields to the Query
@@ -124,6 +196,37 @@ class Konto_model extends DB_Model
 		]);
 	}
 
+	/**
+	 * Berechnet den offenen Betrag einer Buchung
+	 *
+	 * @param integer		$buchungsnr
+	 *
+	 * @return stdClass
+	 */
+	public function getDifferenz($buchungsnr)
+	{
+		$this->addSelect('buchungsnr_verweis');
+		$this->db->where('buchungsnr', $buchungsnr);
+		$sql = $this->db->get_compiled_select($this->dbTable);
+
+		$this->addSelect('buchungsnr_verweis');
+		$this->db->where('buchungsnr', $buchungsnr);
+		$this->db->or_where('buchungsnr_verweis', '(' . $sql . ')', false);
+		$sql = $this->db->get_compiled_select($this->dbTable);
+
+		$this->addSelect('sum(betrag) differenz');
+		$this->db->where('buchungsnr', $buchungsnr);
+		$this->db->or_where('buchungsnr_verweis', $buchungsnr);
+		$this->db->or_where('buchungsnr', '(' . $sql . ')', false);
+
+		$result = $this->load();
+		if (isError($result))
+			return $result;
+		if (!hasData($result))
+			return success(null);
+		return success(current(getData($result))->differenz * -1);
+	}
+
 	/**
 	 * Sets a Payment as paid
 	 */
diff --git a/public/js/api/stv/konto.js b/public/js/api/stv/konto.js
index 090bd30e2..70d5c1ef5 100644
--- a/public/js/api/stv/konto.js
+++ b/public/js/api/stv/konto.js
@@ -22,6 +22,9 @@ export default {
 	insert(data) {
 		return this.$fhcApi.post('api/frontend/v1/stv/konto/insert', data);
 	},
+	counter(data) {
+		return this.$fhcApi.post('api/frontend/v1/stv/konto/counter', data);
+	},
 	edit(data) {
 		return this.$fhcApi.post('api/frontend/v1/stv/konto/update', data);
 	},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Konto.js b/public/js/components/Stv/Studentenverwaltung/Details/Konto.js
index 155c51ee2..7e1d7d173 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Konto.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Konto.js
@@ -5,7 +5,7 @@ import KontoEdit from "./Konto/Edit.js";
 
 // TODO(chris): Phrasen
 // TODO(chris): multi pers
-// TODO(chris): gegenb.(date) multi, löschen multi, best. multi(recht)
+// TODO(chris): best. multi(recht)
 
 export default {
 	components: {
@@ -24,7 +24,8 @@ export default {
 	data() {
 		return {
 			filter: false,
-			studiengang_kz: false
+			studiengang_kz: false,
+			counterdate: new Date()
 		};
 	},
 	computed: {
@@ -157,14 +158,19 @@ export default {
 					button = document.createElement('button');
 					button.className = 'btn btn-outline-secondary';
 					button.innerHTML = '<i class="fa fa-trash"></i>';
-					button.addEventListener('click', () =>
+					button.addEventListener('click', evt => {
+						evt.stopPropagation();
 						this.$fhcAlert
 							.confirmDelete()
 							.then(result => result ? cell.getData().buchungsnr : Promise.reject({handled:true}))
 							.then(this.$fhcApi.factory.stv.konto.delete)
-							.then(() => cell.getRow().delete())
-							.catch(this.$fhcAlert.handleSystemError)
-					);
+							.then(() => {
+								// TODO(chris): deleting a child also removes the siblings!
+								//cell.getRow().delete();
+								this.reload();
+							})
+							.catch(this.$fhcAlert.handleSystemError);
+					});
 					container.append(button);
 
 					return container;
@@ -195,10 +201,24 @@ export default {
 		updateData(data) {
 			if (!data)
 				return this.reload();
+			// TODO(chris): check children (!delete?, multiple children)
+			//this.$refs.table.tabulator.updateOrAddData(data.map(row => row.buchungsnr_verweis ? {buchungsnr:row.buchungsnr_verweis, _children:row} : row));
 			this.$refs.table.tabulator.updateOrAddData(data);
 		},
 		actionNew() {
 			this.$refs.new.open();
+		},
+		actionCounter(selected) {
+			this.$fhcApi
+				.factory.stv.konto.counter({
+					buchungsnr: selected.map(e => e.buchungsnr),
+					buchungsdatum: this.counterdate
+				})
+				.then(result => result.data)
+				.then(this.updateData)
+				.then(() => 'Daten wurden gespeichert')
+				.then(this.$fhcAlert.alertSuccess)
+				.catch(this.$fhcAlert.handleSystemError);
 		}
 	},
 	created() {
@@ -240,6 +260,29 @@ export default {
 			:new-btn-disabled="stg_kz === ''"
 			@click:new="actionNew"
 			>
+			<template #actions="{selected}">
+				<div class="input-group w-auto">
+					<form-input
+						type="DatePicker"
+						v-model="counterdate"
+						input-group
+						:enable-time-picker="false"
+						auto-apply
+						@cleared="counterdate = new Date()"
+						>
+					</form-input>
+					<button
+						class="btn btn-outline-secondary"
+						@click="actionCounter(selected)"
+						:disabled="!selected.length"
+						>
+						Gegenbuchen
+					</button>
+				</div>
+				<button v-if="config.showZahlungsbestaetigung" class="btn btn-outline-secondary" @click="actionDownloadPdfs">
+					<i class="fa fa-download"></i> Zahlungsbestaetigung
+				</button>
+			</template>
 		</core-filter-cmpt>
 		<konto-new ref="new" :config="config" @saved="updateData" :person-ids="personIds" :stg-kz="stg_kz"></konto-new>
 		<konto-edit ref="edit" :config="config" @saved="updateData"></konto-edit>

From a65336993cc88f01e2e9fffafa1c48ff80a5f42f Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 19 Apr 2024 07:07:44 +0200
Subject: [PATCH 0610/1461] Bugfix Notiztab

---
 application/core/Notiz_Controller.php         | 461 ++++++++++++++++++
 .../Studentenverwaltung/Details/Notizen.js    |   2 +-
 2 files changed, 462 insertions(+), 1 deletion(-)
 create mode 100644 application/core/Notiz_Controller.php

diff --git a/application/core/Notiz_Controller.php b/application/core/Notiz_Controller.php
new file mode 100644
index 000000000..49aa9da61
--- /dev/null
+++ b/application/core/Notiz_Controller.php
@@ -0,0 +1,461 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+
+class Notiz_Controller extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'getUid' => ['admin:r', 'assistenz:r'],
+			'getNotizen' => ['admin:r', 'assistenz:r'],
+			'loadNotiz' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
+			'addNewNotiz' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
+			'updateNotiz' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
+			'deleteNotiz' => ['admin:r', 'assistenz:r'],
+			'loadDokumente' => ['admin:r', 'assistenz:r'],
+			'getMitarbeiter' => ['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 getUid()
+	{
+		$this->terminateWithSuccess(getAuthUID());
+	}
+
+	public function getNotizen($id, $type)
+	{
+
+		//check if valid type
+		$result = $this->NotizzuordnungModel->isValidType($type);
+		if(isError($result))
+			$this->terminateWithError($result->retval, self::ERROR_TYPE_GENERAL);
+
+		//$this->terminateWithError(" after check type not valid", self::ERROR_TYPE_GENERAL);
+		$result = $this->NotizModel->getNotizWithDocEntries($id, $type);
+
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess(getData($result) ?: []);
+
+		//	return $this->terminateWithError("type not valid", self::ERROR_TYPE_GENERAL);
+
+	}
+
+	public function loadNotiz()
+	{
+		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+
+		$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 
+			THEN public.tbl_notiz.updateamum ELSE public.tbl_notiz.insertamum END::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS lastUpdate");
+		$this->NotizModel->addLimit(1);
+
+		$result = $this->NotizModel->loadWhere(
+			array('notiz_id' => $notiz_id)
+		);
+		if (isError($result))
+		{
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		elseif (!hasData($result))
+		{
+			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=>'Notiz_id']), self::ERROR_TYPE_GENERAL);
+		}
+		else
+		{
+			$this->terminateWithSuccess(current(getData($result)));
+		}
+	}
+
+	public function addNewNotiz($id, $paramTyp = null)
+	{
+		//$this->load->model('person/Notiz_model', 'NotizModel');
+
+		$this->load->library('DmsLib');
+		$this->load->library('form_validation');
+
+		$uid = getAuthUID();
+
+		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', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Titel'])
+		]);
+
+		$this->form_validation->set_rules('text', 'Text', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Text'])
+		]);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$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');
+
+		//Speichern der Notiz und Notizzuordnung inkl Prüfung ob valid type
+		$result = $this->NotizModel->addNotizForType($type, $id, $titel, $text, $uid, $start, $ende, $erledigt, $verfasser_uid, $bearbeiter_uid);
+		if (isError($result))
+		{
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		$notiz_id = $result->retval;
+
+		//Speichern der Files
+		$dms_id_arr = [];
+		foreach ($_FILES as $k => $file)
+		{
+			$dms = array(
+				'kategorie_kurzbz'  => 'notiz',
+				'version'           => 0,
+				'name'              => $file["name"],
+				'mimetype'          => $file["type"],
+				'insertamum'        => date('c'),
+				'insertvon'         => $uid
+			);
+
+			//Todo(manu) check if filetypes weiter eingeschränkt werden sollen
+			//Todo(manu)check name files: nicht gleiches file 2mal hochladen
+			$result = $this->dmslib->upload($dms, $k, ['*']);
+			/*			$result = $this->dmslib->upload($dms, $k, ['application/pdf','application/x.fhc-dms+json']);*/
+			if (isError($result))
+			{
+				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			}
+			$dms_id_arr[] = $result->retval['dms_id'];
+		}
+
+		//Eintrag in Notizdokument speichern
+		if($dms_id_arr)
+		{
+			// Loads model Notizdokument_model
+			$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
+			foreach($dms_id_arr as $dms_id)
+			{
+				$result = $this->NotizdokumentModel->insert(array('notiz_id' => $notiz_id, 'dms_id' => $dms_id));
+				if (isError($result))
+				{
+					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+				}
+			}
+		}
+
+		return $this->terminateWithSuccess($result);
+	}
+
+	public function updateNotiz()
+	{
+		$this->load->library('form_validation');
+		$this->load->library('DmsLib');
+
+		if (isset($_POST['data']))
+		{
+			$data = json_decode($_POST['data']);
+			unset($_POST['data']);
+			foreach ($data as $k => $v) {
+				$_POST[$k] = $v;
+			}
+		}
+
+		$notiz_id = $this->input->post('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', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Titel'])
+		]);
+
+		$this->form_validation->set_rules('text', 'Text', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Text'])
+		]);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		//update Notiz
+		$uid = getAuthUID();
+		$titel = $this->input->post('titel');
+		$text = $this->input->post('text');
+		$verfasser_uid = $this->input->post('verfasser');
+		$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' => $notiz_id
+			],
+			[
+				'titel' =>  $titel,
+				'updatevon' => $uid,
+				'updateamum' => date('c'),
+				'text' => $text,
+				'verfasser_uid' => $verfasser_uid,
+				'bearbeiter_uid' => $bearbeiter_uid,
+				'start' => $start,
+				'ende' => $ende,
+				'erledigt' => $erledigt
+			]
+		);
+		if (isError($result))
+		{
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+
+		//update(1) laden aller bereits mit dieser notiz_id verknüpften DMS-Einträge
+		$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
+		$this->NotizdokumentModel->addJoin('campus.tbl_dms_version', 'dms_id');
+		$dms_uploaded = null;
+
+		$result = $this->NotizdokumentModel->loadWhere(array('notiz_id' => $notiz_id));
+		if (isError($result))
+		{
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		elseif (!hasData($result))
+		{
+			$dms_id_arr = null;
+		}
+		else
+		{
+			$result = getData($result);
+			foreach($result as $doc) {
+				$dms_id_arr[] = array(
+					'name' => $doc->name,
+					'dms_id' => $doc->dms_id
+				);
+			}
+		}
+
+		foreach ($_FILES as $k => $file)
+		{
+			//update(2) alle neuen files (alle außer type application/x.fhc-dms+json) anhängen
+			if($file["type"] == 'application/x.fhc-dms+json')
+			{
+				$dms_uploaded[] = array(
+					'name' => $file["name"]
+				);
+			}
+			else
+			{
+				$dms = array(
+					'kategorie_kurzbz'  => 'notiz',
+					'version'           => 0,
+					'name'              => $file["name"],
+					'mimetype'          => $file["type"],
+					'insertamum'        => date('c'),
+					'insertvon'         => $uid
+				);
+
+				//Todo(manu) check if filetypes weiter eingeschränkt werden sollen
+				//Todo(manu)check name files: nicht gleiches file 2mal hochladen
+				$result = $this->dmslib->upload($dms, $k, array('*'));
+
+				if (isError($result))
+				{
+					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+				}
+				$dms_id = $result->retval['dms_id'];
+
+				$result = $this->NotizdokumentModel->insert(array('notiz_id' => $notiz_id, 'dms_id' => $dms_id));
+				if (isError($result))
+				{
+					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+				}
+			}
+		}
+
+		//update(3) check if Dateien gelöscht wurden
+		if(count($dms_uploaded) != count($dms_id_arr))
+		{
+			if (count($dms_uploaded) == 0)
+			{
+				$filesDeleted = $dms_id_arr;
+			}
+			else
+			{
+				$upload_new_names = array_column($dms_uploaded, "name");
+
+				$filesDeleted = array_filter($dms_id_arr, function ($file) use ($upload_new_names) {
+					return !in_array($file["name"], $upload_new_names);
+				});
+			}
+
+			foreach ($filesDeleted as $file)
+			{
+				$result = $this->dmslib->removeAll($file['dms_id']);
+
+				if (isError($result))
+				{
+					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+				}
+				else
+					$this->outputJson($result);
+			}
+		}
+		return $this->terminateWithSuccess($result);
+	}
+
+
+	public function deleteNotiz()
+	{
+		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+		$notiz_id = $this->input->post('notiz_id');
+		$type = $this->input->post('type_id');
+		$id = $this->input->post('id');
+
+		//dms_id auslesen aus notizdokument wenn vorhanden
+		$dms_id_arr = [];
+		$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
+
+		$result = $this->NotizdokumentModel->loadWhere(array('notiz_id' => $notiz_id));
+
+		if (isError($result))
+		{
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+
+		if(hasData($result))
+		{
+			$result = getData($result);
+			foreach ($result as $doc) {
+				$dms_id_arr[] = $doc->dms_id;
+			}
+		}
+
+		if($dms_id_arr)
+		{
+			$this->load->library('DmsLib');
+			foreach($dms_id_arr as $dms_id)
+			{
+				$result = $this->dmslib->removeAll($dms_id);
+
+				if (isError($result))
+				{
+					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+				}
+
+				$this->outputJson($result);
+			}
+		}
+
+		//delete Notizzuordnung
+		if($type == "software_id")
+		{
+			// Loads extension Model
+			$this->load->model('extensions/FHC-Core-Softwarebereitstellung/Softwarenotizzuordnung_model', 'ExtensionnotizzuordnungModel');
+			$result = $this->ExtensionnotizzuordnungModel->delete([
+				'notiz_id' => $notiz_id,
+				'id' => strval($id)
+			],
+				[
+					'type_id' => $type
+				]);
+
+		}
+		else
+		{
+			//notizzuordnungsid!
+			$result = $this->NotizzuordnungModel->delete(['notiz_id' => $notiz_id, $type => $id]);
+		}
+
+
+		$this->load->model('person/Notiz_model', 'NotizModel');
+		//$this->NotizModel->addJoin('public.tbl_notizzuordnung', 'notiz_id');
+
+		//TODO (erweitern um Type_id) für Extensions, damit auch Notizzuordnung gelöscht werden kann
+
+		//Löschen von Notiz
+		$result = $this->NotizModel->delete(
+			array('notiz_id' => $notiz_id)
+		);
+
+		if (isError($result))
+		{
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		if(!hasData($result))
+		{
+			return $this->terminateWithError($this->p->t('ui','error_missingId', ['id'=> 'Notiz_id']), self::ERROR_TYPE_GENERAL);
+		}
+
+		return $this->terminateWithSuccess(current(getData($result)));
+	}
+
+	public function loadDokumente()
+	{
+		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+		$notiz_id = $this->input->post('notiz_id');
+
+		$this->NotizModel->addSelect('campus.tbl_dms_version.*');
+
+		$this->NotizModel->addJoin('public.tbl_notiz_dokument', 'ON (public.tbl_notiz_dokument.notiz_id = public.tbl_notiz.notiz_id)');
+		$this->NotizModel->addJoin('campus.tbl_dms_version', 'ON (public.tbl_notiz_dokument.dms_id = campus.tbl_dms_version.dms_id)');
+
+		$result = $this->NotizModel->loadWhere(
+			array('public.tbl_notiz.notiz_id' => $notiz_id)
+		);
+		if (isError($result)) {
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+
+		if(!hasData($result))
+		{
+			return $this->terminateWithError($this->p->t('ui','error_missingId', ['id'=> 'Notiz_id']), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess(getData($result));
+	}
+
+	public function getMitarbeiter($searchString)
+	{
+		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
+		$result = $this->MitarbeiterModel->searchMitarbeiter($searchString);
+		if (isError($result)) {
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess($result);
+	}
+
+}
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
index ddea790da..fc92ce243 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
@@ -18,7 +18,7 @@ export default {
 			:showErweitert="false"
 			:showDocument="false"
 			:showTinyMCE="false"
-			:visibleColumns=['titel','text','verfasser','bearbeiter']
+			:visibleColumns="['titel','text','verfasser','bearbeiter']"
 			>
 		</NotizComponent>
 		

From 1447a930d3df5001c7ab9431ab4bbc940040448e Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 19 Apr 2024 14:24:32 +0200
Subject: [PATCH 0611/1461] adds more phrasen to the profil and the
 profilUpdate views, headers of tables phrasen

---
 application/controllers/Cis/Profil.php        |  24 +-
 application/controllers/Cis/ProfilUpdate.php  |   5 +-
 .../models/person/Profil_update_model.php     |  34 +-
 .../ProfilComponents/ProfilInformation.js     |   6 +-
 .../Cis/ProfilUpdate/ProfilUpdateView.js      |  18 +-
 system/phrasesupdate.php                      | 534 +++++++++++++++++-
 6 files changed, 576 insertions(+), 45 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index 7ed1454ed..dd2c1a311 100755
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -46,7 +46,7 @@ class Profil extends Auth_Controller
 
 	// -----------------------------------------------------------------------------------------------------------------
 	// Public methods
-	
+
 
 	/**
 	 * index loads the Profil view
@@ -142,12 +142,12 @@ class Profil extends Auth_Controller
 	public function getView($uid)
 	{
 		$res = new stdClass();
-		
+
 		// if parsing the URL did not found a UID then the UID of the logged in user is used
-		if($uid =="Profil" || $uid == $this->uid){
+		if ($uid == "Profil" || $uid == $this->uid) {
 			$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter($this->uid);
 			if (isError($isMitarbeiter)) {
-				show_error("error while checking if UID: ".$this->uid." is a mitarbeiter");
+				show_error("error while checking if UID: " . $this->uid . " is a mitarbeiter");
 			}
 			$isMitarbeiter = getData($isMitarbeiter);
 			if ($isMitarbeiter) {
@@ -161,19 +161,19 @@ class Profil extends Auth_Controller
 			}
 		}
 		// UID is availabe when accessing Profil/View/:uid
-		else{ 
+		else {
 			$this->PersonModel->addSelect(["person_id"]);
 			$pid = $this->PersonModel->getByUid($uid);
-			if(isError($pid)){
-				show_error("error while trying to update table public.tbl_person while searching for a person with UID: ".$uid);
+			if (isError($pid)) {
+				show_error("error while trying to update table public.tbl_person while searching for a person with UID: " . $uid);
 			}
 			$pid = hasData($pid) ? getData($pid)[0] : null;
-			if(!$pid){
-				show_error("Person with UID: ".$uid." does not exist");
+			if (!$pid) {
+				show_error("Person with UID: " . $uid . " does not exist");
 			}
 			$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter($uid);
 			if (isError($isMitarbeiter)) {
-				show_error("error while checking if UID: ".$uid." is a mitarbeiter");
+				show_error("error while checking if UID: " . $uid . " is a mitarbeiter");
 			}
 			$isMitarbeiter = getData($isMitarbeiter);
 			if ($isMitarbeiter) {
@@ -262,7 +262,7 @@ class Profil extends Auth_Controller
 		} else {
 			echo json_encode(error("Nation was not 'A' (Austria)"));
 		}
-	}	
+	}
 
 
 	// -----------------------------------------------------------------------------------------------------------------
@@ -630,7 +630,7 @@ class Profil extends Auth_Controller
 		$profilUpdates = $this->ProfilUpdateModel->getProfilUpdatesWhere(['uid' => $uid]);
 		if (isError($profilUpdates)) {
 			show_error("was not able to query the table public.tbl_profil_update:" . getData($profilUpdates));
-		} 
+		}
 		$profilUpdates = hasData($profilUpdates) ? getData($profilUpdates) : null;
 		return $profilUpdates;
 	}
diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
index 1ea04716e..97a86488f 100755
--- a/application/controllers/Cis/ProfilUpdate.php
+++ b/application/controllers/Cis/ProfilUpdate.php
@@ -34,9 +34,6 @@ class ProfilUpdate extends Auth_Controller
 			'getProfilRequestFiles' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'getStatus' => ['student/anrechnung_beantragen:r', 'user:r'],
 			'getTopic' => ['student/anrechnung_beantragen:r', 'user:r'],
-
-
-
 		]);
 
 
@@ -599,7 +596,7 @@ class ProfilUpdate extends Auth_Controller
 						$topic = "nachname";
 						break;
 					default:
-						show_error($this->p->t('profilUpdate', 'profilUpdate_topic_error',[$topic]));
+						show_error($this->p->t('profilUpdate', 'profilUpdate_topic_error', [$topic]));
 						return;
 				}
 
diff --git a/application/models/person/Profil_update_model.php b/application/models/person/Profil_update_model.php
index b7efcea22..68394dd9a 100755
--- a/application/models/person/Profil_update_model.php
+++ b/application/models/person/Profil_update_model.php
@@ -25,6 +25,7 @@ class Profil_update_model extends DB_Model
 	 * 
 	 * @param boolean $update: conditional whether to return insertamum or updateamum
 	 */
+	//TODO: function wird nicht verwendet
 	public function getTimestamp($id, $update = false)
 	{
 		$selectStatement = $update ? 'updateamum' : 'insertamum';
@@ -40,8 +41,9 @@ class Profil_update_model extends DB_Model
 	 * {dms_id:123 , name:"test"}
 	 * 
 	 * @param boolean $profil_update_id primary key of the profil update request
-	 * @return Array 
+	 * @return array 
 	 */
+	//TODO: function wird nicht verwendet
 	public function getFilesFromChangeRequest($profil_update_id)
 	{
 		$this->addSelect(["requested_change"]);
@@ -62,25 +64,27 @@ class Profil_update_model extends DB_Model
 		$this->addJoin("public.tbl_benutzer", "public.tbl_benutzer.uid = public.tbl_profil_update.uid");
 		$this->addJoin("public.tbl_person", "public.tbl_person.person_id = public.tbl_benutzer.person_id");
 		$res = $this->loadWhere($whereClause);
-		if(isError($res)){
+		if (isError($res)) {
 			return $res;
 		}
-		if(hasData($res)){
+		if (hasData($res)) {
 			foreach (getData($res) as $request) {
 				$this->formatProfilRequest($request);
 			}
 		}
-		
+
 		return $res;
 
 	}
 
 
 	/**
+	 * getProfilUpdateWithPermission
 	 * 
-	 * getProfilUpdate
-	 * returns a profil update with id 
-	 * returns all profil updates if id is set to null
+	 * queries the profil updates and checks if the user trying to query the data has permissions to get the profil updates
+	 *   
+	 * @param string $whereClause additional where clause that will be appended to the db query
+	 * @return array array with all the profil updates that the user is eligible to see
 	 */
 	public function getProfilUpdateWithPermission($whereClause = null)
 	{
@@ -88,8 +92,8 @@ class Profil_update_model extends DB_Model
 		$studentBerechtigung = $this->permissionlib->isBerechtigt('student/stammdaten', 's');
 		$mitarbeiterBerechtigung = $this->permissionlib->isBerechtigt('mitarbeiter/stammdaten', 's');
 		$oe_berechtigung = $this->permissionlib->getOE_isEntitledFor('student/stammdaten');
-		
-		$lang = "select index from public.tbl_sprache where sprache =" . $this->escape(getUserLanguage());	
+
+		$lang = "select index from public.tbl_sprache where sprache =" . $this->escape(getUserLanguage());
 		$res = [];
 
 		if ($studentBerechtigung) {
@@ -99,7 +103,7 @@ class Profil_update_model extends DB_Model
 			$parameters = [];
 			$query = "
 			SELECT
-			profil_update_id, tbl_profil_update.uid, (tbl_person.vorname || ' ' || tbl_person.nachname) AS name , topic, requested_change, tbl_profil_update.updateamum, tbl_profil_update.updatevon, tbl_profil_update.insertamum, tbl_profil_update.insertvon, status, public.tbl_profil_update_status.bezeichnung_mehrsprachig[(".$lang.")] as status_translated, status_timestamp, status_message, attachment_id 
+			profil_update_id, tbl_profil_update.uid, (tbl_person.vorname || ' ' || tbl_person.nachname) AS name , topic, requested_change, tbl_profil_update.updateamum, tbl_profil_update.updatevon, tbl_profil_update.insertamum, tbl_profil_update.insertvon, status, public.tbl_profil_update_status.bezeichnung_mehrsprachig[(" . $lang . ")] as status_translated, status_timestamp, status_message, attachment_id 
 			FROM public.tbl_profil_update
 			JOIN public.tbl_profil_update_status ON public.tbl_profil_update_status.status_kurzbz = public.tbl_profil_update.status 
 			JOIN public.tbl_student ON public.tbl_student.student_uid=public.tbl_profil_update.uid
@@ -125,7 +129,7 @@ class Profil_update_model extends DB_Model
 			}
 		}
 		if ($mitarbeiterBerechtigung) {
-			$this->addSelect(["profil_update_id", "tbl_profil_update.uid", "(tbl_person.vorname || ' ' || tbl_person.nachname) AS name", "topic", "requested_change", "tbl_profil_update.updateamum", "tbl_profil_update.updatevon", "tbl_profil_update.insertamum", "tbl_profil_update.insertvon", "status", "public.tbl_profil_update_status.bezeichnung_mehrsprachig[(".$lang.")] AS status_translated", "status_timestamp", "status_message", "attachment_id"]);
+			$this->addSelect(["profil_update_id", "tbl_profil_update.uid", "(tbl_person.vorname || ' ' || tbl_person.nachname) AS name", "topic", "requested_change", "tbl_profil_update.updateamum", "tbl_profil_update.updatevon", "tbl_profil_update.insertamum", "tbl_profil_update.insertvon", "status", "public.tbl_profil_update_status.bezeichnung_mehrsprachig[(" . $lang . ")] AS status_translated", "status_timestamp", "status_message", "attachment_id"]);
 			$this->addJoin('tbl_profil_update_status', 'tbl_profil_update_status.status_kurzbz=tbl_profil_update.status');
 			$this->addJoin('tbl_mitarbeiter', 'tbl_mitarbeiter.mitarbeiter_uid=tbl_profil_update.uid');
 			$this->addJoin('tbl_benutzer', 'tbl_benutzer.uid=tbl_profil_update.uid');
@@ -149,6 +153,14 @@ class Profil_update_model extends DB_Model
 
 	}
 
+	/**
+	 * formatProfilRequest
+	 * 
+	 * formats the the properties of a profilUpdate request row result  
+	 *   
+	 * @param stdClass $request unflitered profilUpdate row result from the database
+	 * @return void 
+	 */
 	private function formatProfilRequest($request)
 	{
 		$request->requested_change = json_decode($request->requested_change);
diff --git a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
index 040eed441..a82f7bf3e 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
@@ -99,7 +99,7 @@ export default {
 
       
 <div class="form-underline ">
-<div class="form-underline-titel">Vorname</div>
+<div class="form-underline-titel">{{$p.t('profilUpdate','vorname')}}</div>
 <span class="form-underline-content">{{name.vorname}} </span>
 </div>
 
@@ -109,7 +109,7 @@ export default {
 <div class="col-12">
 
 <div class="form-underline ">
-<div class="form-underline-titel">Nachname</div>
+<div class="form-underline-titel">{{$p.t('profilUpdate','nachname')}}</div>
 <span class="form-underline-content">{{name.nachname}} </span>
 </div>
 
@@ -130,7 +130,7 @@ export default {
 
 
 <div class="form-underline ">
-<div class="form-underline-titel">{{bez}}</div>
+<div class="form-underline-titel">{{$p.t('profil',bez)}}</div>
 <span class="form-underline-content">{{wert?wert:'-'}} </span>
 </div>
 
diff --git a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
index 9e8194a7e..d35a84b11 100644
--- a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
+++ b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
@@ -43,6 +43,8 @@ export default {
       filter: "Pending",
       events: [],
       profil_update_id: Number(this.id),
+
+      // tabulator options
       profil_updates_table_options: {
         ajaxURL:
           FHC_JS_DATA_STORAGE_OBJECT.app_root +
@@ -180,7 +182,7 @@ export default {
 
         columns: [
           {
-            title: "UID",
+            title: Vue.computed(() => this.$p.t("profilUpdate", "UID")),
             field: "uid",
             minWidth: 200,
             resizable: true,
@@ -188,7 +190,7 @@ export default {
             //responsive:0,
           },
           {
-            title: "Name",
+            title: Vue.computed(() => this.$p.t("profilUpdate", "Name")),
             field: "name",
             minWidth: 200,
             resizable: true,
@@ -196,7 +198,7 @@ export default {
             //responsive:0,
           },
           {
-            title: "Topic",
+            title: Vue.computed(() => this.$p.t("profilUpdate", "Topic")),
             field: "topic",
             resizable: true,
             minWidth: 200,
@@ -204,7 +206,7 @@ export default {
             //responsive:0,
           },
           {
-            title: "Insert Date",
+            title: Vue.computed(() => this.$p.t("profilUpdate", "insertamum")),
             field: "insertamum",
             resizable: true,
             headerFilter: true,
@@ -212,7 +214,9 @@ export default {
             //responsive:0,
           },
           {
-            title: "Status",
+            title: Vue.computed(() => {
+              return this.$p.t("profilUpdate", "Status");
+            }),
             field: "status_translated",
             hozAlign: "center",
             headerFilter: true,
@@ -238,7 +242,9 @@ export default {
             //responsive:0,
           },
           {
-            title: "View",
+            title: Vue.computed(() => {
+              return this.$p.t("profilUpdate", "actions");
+            }),
             formatter: function () {
               return "<i class='fa fa-eye'></i>";
             },
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 1ff876ae5..5fd8fc5a0 100755
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -24157,7 +24157,7 @@ array(
 				)
 			)
 		),
-		// Profil Phrasen start
+		//Profil Phrasen start
 		array(
 			'app' => 'core',
 			'category' => 'profil',
@@ -24198,6 +24198,406 @@ array(
 				)
 			)
 		),
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'Username',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Benutzername',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Username',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'Anrede',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Anrede',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Salutation',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'Titel',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Titel',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Title',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'Postnomen',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Postnomen',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Postnominal',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'Geburtsdatum',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Geburtsdatum',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Birthdate',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'Geburtsort',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Geburtsort',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Birthplace',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'Büro',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Büro',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Office',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'Kurzzeichen',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Kurzzeichen',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Abbreviation',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'Telefon',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Telefon',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Telephone',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'telefon',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Telefon',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Telephone',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'intern',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Intern',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Internal',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'alias',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Alias',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Alias',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'email',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'E-Mail',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'E-Mail',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'Anmerkung',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Anmerkung',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Remark',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'notfallkontakt',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Notfallkontakt',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Emergency contact',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'Straße',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Straße',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Street',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'Strasse',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Straße',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Street',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'PLZ',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'PLZ',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'PLZ',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'Ort',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Ort',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Locality',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'Typ',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Typ',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Type',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
 		array(
 			'app' => 'core',
 			'category' => 'profil',
@@ -24518,8 +24918,8 @@ array(
 				)
 			)
 		),
-		// Profil Phrasen end
-		// ProfilUpdate Phrasen start
+		//Profil Phrasen ende
+		//ProfilUpdate Phrasen start
 		array(
 			'app' => 'core',
 			'category' => 'profilUpdate',
@@ -25020,6 +25420,26 @@ array(
 				)
 			)
 		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'UID',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Benutzer',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'User',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
 		array(
 			'app' => 'core',
 			'category' => 'profilUpdate',
@@ -25840,14 +26260,110 @@ array(
 				)
 			)
 		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'Name',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Name',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Name',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'Topic',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Thema',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Topic',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'insertamum',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Einfüge Datum',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Insert Date',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'actions',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Aktionen',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Actions',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'Status',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Status',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Status',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		
+		//ProfilUpdate Phrasen ende
 		
 		
-		
-		
-		
-		
-		
-		// profilUpdate Phrasen ende
 
 );
 

From 28ab904144513d639b865b9dabf476327591973c Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 19 Apr 2024 14:52:50 +0200
Subject: [PATCH 0612/1461] Download PDF & Bugfix New

---
 .../Stv/Studentenverwaltung/Details/Konto.js  | 43 +++++++++++++++++--
 .../Studentenverwaltung/Details/Konto/New.js  |  8 +++-
 2 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Konto.js b/public/js/components/Stv/Studentenverwaltung/Details/Konto.js
index 7e1d7d173..4b3152331 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Konto.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Konto.js
@@ -4,8 +4,6 @@ import KontoNew from "./Konto/New.js";
 import KontoEdit from "./Konto/Edit.js";
 
 // TODO(chris): Phrasen
-// TODO(chris): multi pers
-// TODO(chris): best. multi(recht)
 
 export default {
 	components: {
@@ -219,10 +217,44 @@ export default {
 				.then(() => 'Daten wurden gespeichert')
 				.then(this.$fhcAlert.alertSuccess)
 				.catch(this.$fhcAlert.handleSystemError);
+		},
+		downloadPdf(selected) {
+			if (Array.isArray(this.modelValue)) {
+				let id_uid = this.modelValue.reduce((a,c) => {
+					if (c.uid)
+						a[c.person_id] = c.uid;
+					return a
+				}, {});
+				let persons = selected.reduce((a,c) => {
+					if (!a[c.person_id]) {
+						let uid = id_uid[c.person_id] || '';
+						a[c.person_id] = uid + '&buchungsnummern=' + c.buchungsnr;
+					} else {
+						a[c.person_id] += ';' + c.buchungsnr;
+					}
+					return a;
+				}, {});
+				Object.values(persons).forEach(part => window.open(
+					FHC_JS_DATA_STORAGE_OBJECT.app_root +
+					'content/pdfExport.php?xml=konto.rdf.php&xsl=Zahlung&uid=' +
+					part,
+					'_blank'
+				));
+			} else {
+				window.open(
+					FHC_JS_DATA_STORAGE_OBJECT.app_root +
+					'content/pdfExport.php?xml=konto.rdf.php&xsl=Zahlung&uid=' +
+					(this.modelValue.uid || '') +
+					'&buchungsnummern=' +
+					selected.map(row => row.buchungsnr).join(';'),
+					'_blank'
+				);
+			}
 		}
 	},
 	created() {
 		// TODO(chris): persist filter + studiengang_kz
+		// TODO(chris): studiengang_kz in variablelib
 	},
 	template: `
 	<div class="stv-details-konto h-100 d-flex flex-column">
@@ -279,7 +311,12 @@ export default {
 						Gegenbuchen
 					</button>
 				</div>
-				<button v-if="config.showZahlungsbestaetigung" class="btn btn-outline-secondary" @click="actionDownloadPdfs">
+				<button
+					v-if="config.showZahlungsbestaetigung"
+					class="btn btn-outline-secondary"
+					@click="downloadPdf(selected)"
+					:disabled="!selected.length"
+					>
 					<i class="fa fa-download"></i> Zahlungsbestaetigung
 				</button>
 			</template>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js b/public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js
index b47d03456..90cdfdd2d 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js
@@ -84,10 +84,14 @@ export default {
 		},
 		open() {
 			this.data = {
+				buchungstyp_kurzbz: '',
 				betrag: '-0.00',
-				mahnspanne: 30,
 				buchungsdatum: new Date(),
-				studiensemester_kurzbz: this.defaultSemester
+				buchungstext: '',
+				mahnspanne: 30,
+				studiensemester_kurzbz: this.defaultSemester,
+				credit_points: '',
+				anmerkung: ''
 			};
 			this.$refs.modal.show();
 		},

From 93ae5577f8ef84f3a97980a7bba4bc39af8bd1bc Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 22 Apr 2024 11:25:24 +0200
Subject: [PATCH 0613/1461] try with here documents

---
 system/dbupdate_3.4/25999_cis4_cms.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/system/dbupdate_3.4/25999_cis4_cms.php b/system/dbupdate_3.4/25999_cis4_cms.php
index f16b07dc4..f767321d3 100755
--- a/system/dbupdate_3.4/25999_cis4_cms.php
+++ b/system/dbupdate_3.4/25999_cis4_cms.php
@@ -11,6 +11,24 @@ if(!$result = @$db->db_query("SELECT xslt_xhtml_c4 FROM campus.tbl_template LIMI
 	else
 		echo '<br>campus.tbl_template: Spalte xslt_xhtml_c4 hinzugefuegt';
 
+	$xml01 = <<<EOXML01
+<xsl:stylesheet version="1.0"
+    xmlns:fo="http://www.w3.org/1999/XSL/Format"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+    <xsl:template match="content">
+	<h1>
+	    <xsl:value-of select="titel" />
+	</h1>
+	<xsl:value-of select="inhalt" disable-output-escaping="yes" />
+    </xsl:template>
+</xsl:stylesheet>
+EOXML01;
+
+	$qry = <<<EOSQL
+	UPDATE campus.tbl_template SET xslt_xhtml_c4='{$xml01}' WHERE template_kurzbz='contentmittitel';
+
+EOSQL;
+
 	// TODO(chris): add default values
 	$qry = "";
 	$qry .= "UPDATE campus.tbl_template SET xslt_xhtml_c4='" . '<xsl:stylesheet version="1.0" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"><xsl:template match="content"><h1><xsl:value-of select="titel" /></h1><xsl:value-of select="inhalt" disable-output-escaping="yes" /></xsl:template></xsl:stylesheet>' . "' WHERE template_kurzbz='contentmittitel';";

From 27428b15bbaf5c1b41ad336b675222c38adeb7b7 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 22 Apr 2024 11:49:19 +0200
Subject: [PATCH 0614/1461] changes the escaping string for the xslt_xhtml_c4

---
 system/dbupdate_3.4.php                |   1 +
 system/dbupdate_3.4/25999_cis4_cms.php | 291 +++++++++++++++++++++++--
 2 files changed, 276 insertions(+), 16 deletions(-)

diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index a5c1f6c89..b37299ed6 100755
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -53,6 +53,7 @@ require_once('dbupdate_3.4/33714_erhoehter_studienbeitrag_fuer_drittsaatenangeho
 require_once('dbupdate_3.4/36275_zeitaufzeichnung_karenz.php');
 require_once('dbupdate_3.4/21620_neues_feld_zum_erfassen_des_ESI.php');
 require_once('dbupdate_3.4/25999_C4_ma0594.php');
+require_once('dbupdate_3.4/25999_cis4_cms.php');
 
 
 	
diff --git a/system/dbupdate_3.4/25999_cis4_cms.php b/system/dbupdate_3.4/25999_cis4_cms.php
index f767321d3..fb95ac015 100755
--- a/system/dbupdate_3.4/25999_cis4_cms.php
+++ b/system/dbupdate_3.4/25999_cis4_cms.php
@@ -1,13 +1,13 @@
 <?php
-if (! defined('DB_NAME')) exit('No direct script access allowed');
+if (!defined('DB_NAME'))
+	exit('No direct script access allowed');
 
 // Add index to system.tbl_log
-if(!$result = @$db->db_query("SELECT xslt_xhtml_c4 FROM campus.tbl_template LIMIT 1"))
-{
+if (!$result = @$db->db_query("SELECT xslt_xhtml_c4 FROM campus.tbl_template LIMIT 1")) {
 	$qry = "ALTER TABLE campus.tbl_template ADD COLUMN xslt_xhtml_c4 xml;";
 
-	if(!$db->db_query($qry))
-		echo '<strong>campus.tbl_template: '.$db->db_last_error().'</strong><br>';
+	if (!$db->db_query($qry))
+		echo '<strong>campus.tbl_template: ' . $db->db_last_error() . '</strong><br>';
 	else
 		echo '<br>campus.tbl_template: Spalte xslt_xhtml_c4 hinzugefuegt';
 
@@ -24,23 +24,282 @@ if(!$result = @$db->db_query("SELECT xslt_xhtml_c4 FROM campus.tbl_template LIMI
 </xsl:stylesheet>
 EOXML01;
 
+	$xml02 = <<<EOXML02
+
+<xsl:stylesheet version="1.0"
+	xmlns:fo="http://www.w3.org/1999/XSL/Format"
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+	<xsl:template match="content">
+		<xsl:value-of select="inhalt" disable-output-escaping="yes" />
+	</xsl:template>
+</xsl:stylesheet>
+
+EOXML02;
+
+	$xml03 = <<<EOXML03
+
+	<xsl:stylesheet version="1.0"
+	xmlns:fo="http://www.w3.org/1999/XSL/Format"
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+	<xsl:template match="content">
+		<script type="text/javascript">
+		window.location.href=''<xsl:value-of select="url" />'';
+		</script>
+		<div class="alert alert-primary" role="alert">Sie werden automatisch weitergeleitet. Sollte dies nicht der Fall sein, klicken sie bitte 
+			<xsl:variable name="url" select="url"></xsl:variable>
+			<a href="{url}">hier</a>
+		</div>
+	</xsl:template>
+</xsl:stylesheet>
+
+EOXML03;
+
+	$xml04 = <<<EOXML04
+
+<xsl:stylesheet version="1.0"
+	xmlns:fo="http://www.w3.org/1999/XSL/Format"
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+	<xsl:template match="content">
+		<div class="alert alert-danger" role="alert">Diese Seite sollte nicht direkt aufgerufen werden!</div>
+	</xsl:template>
+</xsl:stylesheet>
+
+EOXML04;
+
+	$xml05 = <<<EOXML05
+
+<xsl:stylesheet version="1.0"
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+	<xsl:output encoding="UTF-8" omit-xml-declaration="yes" indent="yes"/>
+	<xsl:template match="/">
+		<h1>News</h1>
+		<div class="row">
+			<xsl:choose>
+				<xsl:when test="content/stg_extras">
+					<div class="news-list col-9" aria-role="feed">
+						<xsl:call-template name="content"/>
+					</div>
+					<aside class="col-3">
+						<xsl:apply-templates select="content/stg_extras" />
+					</aside>
+				</xsl:when>
+				<xsl:otherwise>
+					<div class="news-list col" aria-role="feed">
+						<xsl:call-template name="content"/>
+					</div>
+				</xsl:otherwise>
+			</xsl:choose>
+		</div>
+	</xsl:template>
+	<xsl:template name="content">
+		<xsl:choose>
+			<xsl:when test="content/news">
+				<xsl:apply-templates select="content/news" />
+			</xsl:when>
+			<xsl:when test="content/newswrapper">
+				<xsl:apply-templates select="content/newswrapper" />
+			</xsl:when>
+			<xsl:when test="newswrapper">
+				<xsl:apply-templates select="newswrapper" />
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:apply-templates select="news" />
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+	<xsl:template match="newswrapper">
+		<xsl:apply-templates select="news">
+			<xsl:with-param name="datum" select="datum" />
+			<xsl:with-param name="datumdetail" select="datumdetail" />
+			<xsl:with-param name="news_id" select="news_id" />
+		</xsl:apply-templates>
+	</xsl:template>
+	<xsl:template match="news">
+		<xsl:param name="datum" select="datum"/>
+		<xsl:param name="datumdetail" select="datumdetail"/>
+		<xsl:param name="news_id" select="news_id"/>
+		<article class="news-list-item card mb-3">
+			<header class="card-header d-flex justify-content-between align-items-center">
+				<h5 class="mb-0">
+					<xsl:value-of select="betreff"/>
+				</h5>
+				<div class="d-flex flex-wrap justify-content-end">
+					<address class="fw-bold small mb-0">
+						<xsl:value-of select="verfasser"/>
+					</address>
+					<xsl:if test="\$datum">
+						<time class="small text-end w-100" datetime="{\$datumdetail}">
+							<xsl:value-of select="\$datum"/>
+						</time>
+					</xsl:if>
+				</div>
+			</header>
+			<xsl:if test="text">
+				<xsl:if test="text != ''''">
+					<div class="card-body">
+						<div class="card-text">
+							<xsl:value-of select="text" disable-output-escaping="yes" />
+						</div>
+					</div>
+				</xsl:if>
+			</xsl:if>
+			<xsl:if test="\$news_id">
+				<footer class="card-footer d-flex justify-content-end">
+					<a class="btn btn-outline-primary btn-sm mx-1" href="#" data-href="newsverwaltung.php?news_id={\$news_id}" target="_blank" aria-label="Edit">
+						<i class="fa fa-pencil" aria-hidden="true" title="Edit"></i>
+					</a>
+					<a class="btn btn-outline-primary btn-sm mx-1" href="#" data-confirm="Soll dieser Eintrag wirklich gelöscht werden?" data-href="newsverwaltung.php?news_id={\$news_id}&amp;action=delete" target="_blank" aria-label="Delete">
+						<i class="fa fa-trash" aria-hidden="true" title="Delete"></i>
+					</a>
+				</footer>
+			</xsl:if>
+		</article>
+	</xsl:template>
+	<xsl:template match="stg_extras">
+		<dl>
+			<xsl:if test="stg_ltg">
+				<dt>
+					<xsl:value-of select="stg_ltg_name"/>
+				</dt>
+				<xsl:apply-templates select="stg_ltg" />
+			</xsl:if>
+			<xsl:if test="gf_ltg">
+				<dt>
+					<xsl:value-of select="gf_ltg_name"/>
+				</dt>
+				<xsl:apply-templates select="gf_ltg" />
+			</xsl:if>
+			<xsl:if test="stv_ltg">
+				<dt>
+					<xsl:value-of select="stv_ltg_name"/>
+				</dt>
+				<xsl:apply-templates select="stv_ltg"/>
+			</xsl:if>
+			<xsl:if test="ass">
+				<dt>
+					<xsl:value-of select="ass_name"/>
+				</dt>
+				<xsl:apply-templates select="ass"/>
+			</xsl:if>
+		</dl>
+		<xsl:value-of select="zusatzinfo" disable-output-escaping="yes"/>
+		<dl>
+			<xsl:if test="hochschulvertr">
+				<dt>
+					<xsl:value-of select="hochschulvertr_name"/>
+				</dt>
+				<xsl:apply-templates select="hochschulvertr"/>
+			</xsl:if>
+			<xsl:if test="stdv">
+				<dt>
+					<xsl:value-of select="stdv_name"/>
+				</dt>
+				<xsl:apply-templates select="stdv"/>
+			</xsl:if>
+			<xsl:if test="jahrgangsvertr">
+				<dt>
+					<xsl:value-of select="jahrgangsvertr_name"/>
+				</dt>
+				<xsl:apply-templates select="jahrgangsvertr"/>
+			</xsl:if>
+		</dl>
+		<xsl:apply-templates select="cis_ext_menu"/>
+	</xsl:template>
+	<xsl:template name="person_linked_name">
+		<xsl:variable name="uid" select="uid"/>
+		<a href="../cis/private/profile/index.php?uid={\$uid}">
+			<xsl:value-of select="name"/>
+		</a>
+	</xsl:template>
+	<xsl:template name="person">
+		<xsl:param name="ass" select="ass"/>
+		<xsl:variable name="phone" select="telefon"/>
+		<xsl:variable name="mail" select="email"/>
+		<dd>
+			<address class="mb-0">
+				<xsl:if test="\$ass">
+					<xsl:if test="bezeichnung != ''Assistenz''">
+						<h6>
+							<xsl:value-of select="bezeichnung"/>
+						</h6>
+					</xsl:if>
+				</xsl:if>
+				<xsl:call-template name="person_linked_name"/>
+				<br/>
+				<i class="fa fa-phone" title="Telefon" aria-hidden="true"></i>
+				<span class="sr-only">Telefon</span>: 
+				<a href="tel:{translate(\$phone, translate(\$phone,''+1234567890'',''''),'''')}">
+					<xsl:value-of select="telefon"/>
+				</a>
+				<br/>
+				<i class="fa fa-home" title="Raum" aria-hidden="true"></i>
+				<span class="sr-only">Raum</span>: 
+				<xsl:value-of select="ort"/>
+				<br/>
+				<i class="fa fa-envelope" title="E-mail" aria-hidden="true"></i>
+				<span class="sr-only">E-mail</span>: 
+				<a href="mailto:{\$mail}">
+					<xsl:value-of select="email"/>
+				</a>
+			</address>
+		</dd>
+	</xsl:template>
+	<xsl:template name="person_short">
+		<dd>
+			<address class="mb-0">
+				<xsl:call-template name="person_linked_name"/>
+			</address>
+		</dd>
+	</xsl:template>
+	<xsl:template match="stg_ltg">
+		<xsl:call-template name="person"/>
+	</xsl:template>
+	<xsl:template match="gf_ltg">
+		<xsl:call-template name="person"/>
+	</xsl:template>
+	<xsl:template match="stv_ltg">
+		<xsl:call-template name="person"/>
+	</xsl:template>
+	<xsl:template match="ass">
+		<xsl:call-template name="person">
+			<xsl:with-param name="ass" select="1"/>
+		</xsl:call-template>
+	</xsl:template>
+	<xsl:template match="hochschulvertr">
+		<xsl:call-template name="person_short"/>
+	</xsl:template>
+	<xsl:template match="stdv">
+		<xsl:call-template name="person_short"/>
+	</xsl:template>
+	<xsl:template match="jahrgangsvertr">
+		<xsl:call-template name="person_short"/>
+	</xsl:template>
+	<xsl:template match="cis_ext_menu">
+		<xsl:variable name="kurzbz" select="kurzbz"></xsl:variable>
+		<xsl:variable name="stg_kz" select="stg_kz"></xsl:variable>
+		<p>
+			<a class="btn btn-primary" href="https://moodle.technikum-wien.at/course/view.php?idnumber=dl{\$stg_kz}" target="_blank">
+				<xsl:value-of select="download_name"/>
+			</a>
+		</p>
+	</xsl:template>
+</xsl:stylesheet>
+
+EOXML05;
+
 	$qry = <<<EOSQL
 	UPDATE campus.tbl_template SET xslt_xhtml_c4='{$xml01}' WHERE template_kurzbz='contentmittitel';
+	UPDATE campus.tbl_template SET xslt_xhtml_c4='{$xml02}' WHERE template_kurzbz='contentohnetitel';
+	UPDATE campus.tbl_template SET xslt_xhtml_c4='{$xml03}' WHERE template_kurzbz='redirect';
+	UPDATE campus.tbl_template SET xslt_xhtml_c4='{$xml04}' WHERE template_kurzbz='include';
+	UPDATE campus.tbl_template SET xslt_xhtml_c4='{$xml05}' WHERE template_kurzbz='news';
+	UPDATE campus.tbl_template SET xslt_xhtml_c4=xslt_xhtml WHERE xslt_xhtml_c4 IS NULL;
 
 EOSQL;
 
-	// TODO(chris): add default values
-	$qry = "";
-	$qry .= "UPDATE campus.tbl_template SET xslt_xhtml_c4='" . '<xsl:stylesheet version="1.0" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"><xsl:template match="content"><h1><xsl:value-of select="titel" /></h1><xsl:value-of select="inhalt" disable-output-escaping="yes" /></xsl:template></xsl:stylesheet>' . "' WHERE template_kurzbz='contentmittitel';";
-	$qry .= "UPDATE campus.tbl_template SET xslt_xhtml_c4='" . '<xsl:stylesheet version="1.0" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"><xsl:template match="content"><xsl:value-of select="inhalt" disable-output-escaping="yes" /></xsl:template></xsl:stylesheet>' . "' WHERE template_kurzbz='contentohnetitel';";
-	$qry .= "UPDATE campus.tbl_template SET xslt_xhtml_c4='" . '<xsl:stylesheet version="1.0" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"><xsl:template match="content"><script type="text/javascript">window.location.href=\\\'<xsl:value-of select="url" />\\\';</script><div class="alert alert-primary" role="alert">Sie werden automatisch weitergeleitet. Sollte dies nicht der Fall sein, klicken sie bitte <xsl:variable name="url" select="url"></xsl:variable><a href="{url}">hier</a></div></xsl:template></xsl:stylesheet>' . "' WHERE template_kurzbz='redirect';";
-	$qry .= "UPDATE campus.tbl_template SET xslt_xhtml_c4='" . '<xsl:stylesheet version="1.0" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"><xsl:template match="content"><div class="alert alert-danger" role="alert">Diese Seite sollte nicht direkt aufgerufen werden!</div></xsl:template></xsl:stylesheet>' . "' WHERE template_kurzbz='include';";
-	$qry .= "UPDATE campus.tbl_template SET xslt_xhtml_c4='" . '<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"><xsl:output encoding="UTF-8" omit-xml-declaration="yes" indent="yes"/><xsl:template match="/"><h1>News</h1><div class="row"><xsl:choose><xsl:when test="content/stg_extras"><div class="news-list col-9" aria-role="feed"><xsl:call-template name="content"/></div><aside class="col-3"><xsl:apply-templates select="content/stg_extras" /></aside></xsl:when><xsl:otherwise><div class="news-list col" aria-role="feed"><xsl:call-template name="content"/></div></xsl:otherwise></xsl:choose></div></xsl:template><xsl:template name="content"><xsl:choose><xsl:when test="content/news"><xsl:apply-templates select="content/news" /></xsl:when><xsl:when test="content/newswrapper"><xsl:apply-templates select="content/newswrapper" /></xsl:when><xsl:when test="newswrapper"><xsl:apply-templates select="newswrapper" /></xsl:when><xsl:otherwise><xsl:apply-templates select="news" /></xsl:otherwise></xsl:choose></xsl:template><xsl:template match="newswrapper"><xsl:apply-templates select="news"><xsl:with-param name="datum" select="datum" /><xsl:with-param name="datumdetail" select="datumdetail" /><xsl:with-param name="news_id" select="news_id" /></xsl:apply-templates></xsl:template><xsl:template match="news"><xsl:param name="datum" select="datum"/><xsl:param name="datumdetail" select="datumdetail"/><xsl:param name="news_id" select="news_id"/><article class="news-list-item card mb-3"><header class="card-header d-flex justify-content-between align-items-center"><h5 class="mb-0"><xsl:value-of select="betreff"/></h5><div class="d-flex flex-wrap justify-content-end"><address class="fw-bold small mb-0"><xsl:value-of select="verfasser"/></address><xsl:if test="$datum"><time class="small text-end w-100" datetime="{$datumdetail}"><xsl:value-of select="$datum"/></time></xsl:if></div></header><xsl:if test="text"><xsl:if test="text != \\\'\\\'"><div class="card-body"><div class="card-text"><xsl:value-of select="text" disable-output-escaping="yes" /></div></div></xsl:if></xsl:if><xsl:if test="$news_id"><footer class="card-footer d-flex justify-content-end"><a class="btn btn-outline-primary btn-sm mx-1" href="#" data-href="newsverwaltung.php?news_id={$news_id}" target="_blank" aria-label="Edit"><i class="fa fa-pencil" aria-hidden="true" title="Edit"></i></a><a class="btn btn-outline-primary btn-sm mx-1" href="#" data-confirm="Soll dieser Eintrag wirklich gelöscht werden?" data-href="newsverwaltung.php?news_id={$news_id}&amp;action=delete" target="_blank" aria-label="Delete"><i class="fa fa-trash" aria-hidden="true" title="Delete"></i></a></footer></xsl:if></article></xsl:template><xsl:template match="stg_extras"><dl><xsl:if test="stg_ltg"><dt><xsl:value-of select="stg_ltg_name"/></dt><xsl:apply-templates select="stg_ltg" /></xsl:if><xsl:if test="gf_ltg"><dt><xsl:value-of select="gf_ltg_name"/></dt><xsl:apply-templates select="gf_ltg" /></xsl:if><xsl:if test="stv_ltg"><dt><xsl:value-of select="stv_ltg_name"/></dt><xsl:apply-templates select="stv_ltg"/></xsl:if><xsl:if test="ass"><dt><xsl:value-of select="ass_name"/></dt><xsl:apply-templates select="ass"/></xsl:if></dl><xsl:value-of select="zusatzinfo" disable-output-escaping="yes"/><dl>	<xsl:if test="hochschulvertr"><dt><xsl:value-of select="hochschulvertr_name"/></dt><xsl:apply-templates select="hochschulvertr"/></xsl:if><xsl:if test="stdv"><dt><xsl:value-of select="stdv_name"/></dt><xsl:apply-templates select="stdv"/></xsl:if><xsl:if test="jahrgangsvertr"><dt><xsl:value-of select="jahrgangsvertr_name"/></dt><xsl:apply-templates select="jahrgangsvertr"/></xsl:if></dl><xsl:apply-templates select="cis_ext_menu"/></xsl:template><xsl:template name="person_linked_name"><xsl:variable name="uid" select="uid"/><a href="../cis/private/profile/index.php?uid={$uid}"><xsl:value-of select="name"/></a></xsl:template><xsl:template name="person"><xsl:param name="ass" select="ass"/><xsl:variable name="phone" select="telefon"/><xsl:variable name="mail" select="email"/><dd><address class="mb-0"><xsl:if test="$ass"><xsl:if test="bezeichnung != \\\'Assistenz\\\'"><h6><xsl:value-of select="bezeichnung"/></h6></xsl:if></xsl:if><xsl:call-template name="person_linked_name"/><br/><i class="fa fa-phone" title="Telefon" aria-hidden="true"></i><span class="sr-only">Telefon</span>: <a href="tel:{translate($phone, translate($phone,\\\'+1234567890\\\',\\\'\\\'),\\\'\\\')}"><xsl:value-of select="telefon"/></a><br/><i class="fa fa-home" title="Raum" aria-hidden="true"></i><span class="sr-only">Raum</span>: <xsl:value-of select="ort"/><br/><i class="fa fa-envelope" title="E-mail" aria-hidden="true"></i><span class="sr-only">E-mail</span>: <a href="mailto:{$mail}"><xsl:value-of select="email"/></a></address></dd></xsl:template><xsl:template name="person_short"><dd><address class="mb-0"><xsl:call-template name="person_linked_name"/></address></dd></xsl:template><xsl:template match="stg_ltg"><xsl:call-template name="person"/></xsl:template><xsl:template match="gf_ltg"><xsl:call-template name="person"/></xsl:template><xsl:template match="stv_ltg"><xsl:call-template name="person"/></xsl:template><xsl:template match="ass"><xsl:call-template name="person"><xsl:with-param name="ass" select="1"/></xsl:call-template></xsl:template><xsl:template match="hochschulvertr"><xsl:call-template name="person_short"/></xsl:template><xsl:template match="stdv"><xsl:call-template name="person_short"/></xsl:template><xsl:template match="jahrgangsvertr"><xsl:call-template name="person_short"/></xsl:template><xsl:template match="cis_ext_menu"><xsl:variable name="kurzbz" select="kurzbz"></xsl:variable><xsl:variable name="stg_kz" select="stg_kz"></xsl:variable><p><a class="btn btn-primary" href="https://moodle.technikum-wien.at/course/view.php?idnumber=dl{$stg_kz}" target="_blank"><xsl:value-of select="download_name"/></a></p></xsl:template></xsl:stylesheet>' . "' WHERE template_kurzbz='news';";
 
-	$qry .= "UPDATE campus.tbl_template SET xslt_xhtml_c4=xslt_xhtml WHERE xslt_xhtml_c4 IS NULL";
-
-	if(!$db->db_query($qry))
-		echo '<strong>campus.tbl_template: '.$db->db_last_error().'</strong><br>';
+	if (!$db->db_query($qry))
+		echo '<strong>campus.tbl_template: ' . $db->db_last_error() . '</strong><br>';
 	else
 		echo '<br>campus.tbl_template: Spalte xslt_xhtml_c4 Defaultwerte eingefügt';
 }

From 349865b8fb37f7c6241c9665ba8725ba86068f42 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 22 Apr 2024 13:52:38 +0200
Subject: [PATCH 0615/1461] fixes the phrasen for the column titles of the
 ProfilUpdateView

---
 .../Cis/ProfilUpdate/ProfilUpdateView.js       | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
index d35a84b11..410422e66 100644
--- a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
+++ b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
@@ -37,6 +37,7 @@ export default {
   },
   data() {
     return {
+      categoryLoaded: false,
       showModal: false,
       modalData: null,
       loading: false,
@@ -214,9 +215,7 @@ export default {
             //responsive:0,
           },
           {
-            title: Vue.computed(() => {
-              return this.$p.t("profilUpdate", "Status");
-            }),
+            title: Vue.computed(() => this.$p.t("profilUpdate", "Status")),
             field: "status_translated",
             hozAlign: "center",
             headerFilter: true,
@@ -242,9 +241,7 @@ export default {
             //responsive:0,
           },
           {
-            title: Vue.computed(() => {
-              return this.$p.t("profilUpdate", "actions");
-            }),
+            title: Vue.computed(() => this.$p.t("profilUpdate", "actions")),
             formatter: function () {
               return "<i class='fa fa-eye'></i>";
             },
@@ -262,7 +259,6 @@ export default {
       },
     };
   },
-  computed: {},
   methods: {
     setLoading: function (newValue) {
       this.loading = newValue;
@@ -309,7 +305,11 @@ export default {
       }
     },
   },
-
+  created() {
+    this.$p.loadCategory("profilUpdate").then(() => {
+      this.categoryLoaded = true;
+    });
+  },
   mounted() {
     //? opens the AcceptDenyUpdate Modal if a preselected profil_update_id was passed to the component (used for email links)
     if (this.profil_update_id) {
@@ -347,7 +347,7 @@ export default {
     </div>
     <loading ref="loadingModalRef" :timeout="0"></loading>
     
-    <core-filter-cmpt v-if="profilUpdateStates" :title="$p.t('profilUpdate','profilUpdateRequests')"  ref="UpdatesTable" :tabulatorEvents="events" :tabulator-options="profil_updates_table_options" tableOnly :sideMenu="false" />
+    <core-filter-cmpt v-if="profilUpdateStates && categoryLoaded" :title="$p.t('profilUpdate','profilUpdateRequests')"  ref="UpdatesTable" :tabulatorEvents="events" :tabulator-options="profil_updates_table_options" tableOnly :sideMenu="false" />
 
     </div>`,
 };

From e2e7966f83ea2d0bf57b3b5ff38c94c12d2ed095 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 22 Apr 2024 14:55:37 +0200
Subject: [PATCH 0616/1461] adds accept and deny actions in the actions column
 of the ProfilUpdateView component

---
 .../Cis/ProfilUpdate/ProfilUpdateView.js      | 67 ++++++++++++++++++-
 1 file changed, 64 insertions(+), 3 deletions(-)

diff --git a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
index 410422e66..f1e6c933c 100644
--- a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
+++ b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
@@ -242,16 +242,59 @@ export default {
           },
           {
             title: Vue.computed(() => this.$p.t("profilUpdate", "actions")),
-            formatter: function () {
-              return "<i class='fa fa-eye'></i>";
+            formatter: (cell, para) => {
+              let status = cell.getRow().getData().status;
+              console.log("this is the cell", cell);
+              console.log("this should be the column", cell.getColumn());
+              let result = null;
+              switch (status) {
+                case this.profilUpdateStates["Pending"]:
+                  result =
+                    "<button id='acceptProfilUpdate' type='button' class='btn border-success border-2'><i class='fa fa-lg fa-circle-check text-success'></i></button>" +
+                    "<button id='denyProfilUpdate' type='button' class='btn border-danger border-2'><i class=' fa fa-lg fa-circle-xmark text-danger'></i></button>" +
+                    "<button id='viewProfilUpdate' type='button' class='btn border-secondary border-2'><i class=' fa fa-eye'></i></button>";
+                  break;
+                case this.profilUpdateStates["Accepted"]:
+                  result =
+                    "<i id='viewProfilUpdate' type='button' class='d-block fa fa-eye'></i>";
+                  break;
+                case this.profilUpdateStates["Rejected"]:
+                  result =
+                    "<i id='viewProfilUpdate' type='button' class='d-block fa fa-eye'></i>";
+                  break;
+              }
+              return (
+                "<div class='d-flex align-items-center justify-content-evenly'>" +
+                result +
+                "</div>"
+              );
+              /*   switch () {
+                case this.profilUpdateStates["Pending"]:
+                  iconClasses += "fa fa-lg fa-circle-info text-info ";
+                  break;
+                case this.profilUpdateStates["Accepted"]:
+                  iconClasses += "fa fa-lg fa-circle-check text-success ";
+                  break;
+                case this.profilUpdateStates["Rejected"]:
+                  iconClasses += "fa fa-lg fa-circle-xmark text-danger ";
+                  break; */
             },
             resizable: true,
             minWidth: 200,
             hozAlign: "center",
             cellClick: (e, cell) => {
               //! function that is called when clicking on a row in the table
+              console.log("this is the element", e.explicitOriginalTarget);
+              console.log("this is the id", e.explicitOriginalTarget.id);
               let cellData = cell.getRow().getData();
-              this.showAcceptDenyModal(cellData);
+              if (e.explicitOriginalTarget.id === "viewProfilUpdate") {
+                this.showAcceptDenyModal(cellData);
+              } else if (e.explicitOriginalTarget.id === "acceptProfilUpdate") {
+                console.log("this is the celldata", cellData);
+                this.acceptProfilUpdate(cellData);
+              } else if (e.explicitOriginalTarget.id === "denyProfilUpdate") {
+                this.denyProfilUpdate(cellData);
+              }
             },
             //responsive:0,
           },
@@ -260,6 +303,24 @@ export default {
     };
   },
   methods: {
+    denyProfilUpdate: (column) => {
+      Vue.$fhcapi.ProfilUpdate.denyProfilRequest(column)
+        .then((res) => {
+          this.$refs.UpdatesTable.tabulator.setData();
+        })
+        .catch((e) => {
+          Alert.popup(Vue.h("div", { innerHTML: e.response.data }));
+        });
+    },
+    acceptProfilUpdate: (column) => {
+      Vue.$fhcapi.ProfilUpdate.acceptProfilRequest(column)
+        .then((res) => {
+          this.$refs.UpdatesTable.tabulator.setData();
+        })
+        .catch((e) => {
+          Alert.popup(Vue.h("div", { innerHTML: e.response.data }));
+        });
+    },
     setLoading: function (newValue) {
       this.loading = newValue;
     },

From fd0fb7c9b452bb6ab558cc299c1092e8c0893c1b Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 22 Apr 2024 16:21:54 +0200
Subject: [PATCH 0617/1461] Refactor Notizcomponent: add Endpoint and core
 NotizController

---
 .../controllers/api/frontend/v1/stv/Notiz.php | 179 +++++++-----------
 application/core/Notiz_Controller.php         | 137 +++++++++-----
 application/models/person/Notiz_model.php     |  79 +++++---
 .../models/person/Notizzuordnung_model.php    |  11 +-
 public/js/components/Notiz/NotizComponent.js  |  44 +++--
 .../Studentenverwaltung/Details/Notizen.js    |   9 +-
 6 files changed, 245 insertions(+), 214 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Notiz.php b/application/controllers/api/frontend/v1/stv/Notiz.php
index 3d84c2d68..426408863 100644
--- a/application/controllers/api/frontend/v1/stv/Notiz.php
+++ b/application/controllers/api/frontend/v1/stv/Notiz.php
@@ -4,7 +4,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 use \DateTime as DateTime;
 
-class Notiz extends FHCAPI_Controller
+class Notiz extends Notiz_Controller
 {
 	public function __construct()
 	{
@@ -32,32 +32,33 @@ class Notiz extends FHCAPI_Controller
 		]);
 	}
 
-	public function getUid()
+/*	public function getUid()
 	{
 		$this->terminateWithSuccess(getAuthUID());
-	}
+	}*/
+
 
 	public function getNotizen($id, $type)
 	{
+
 		//check if valid type
-		$isValidType = $this->NotizzuordnungModel->isValidType($type);
+		$result = $this->NotizzuordnungModel->isValidType($type);
+		if(isError($result))
+			$this->terminateWithError($result->retval, self::ERROR_TYPE_GENERAL);
 
-		if($isValidType)
-		{
-			$result = $this->NotizModel->getNotizWithDocEntries($id, $type);
+		//$this->terminateWithError(" after check type not valid", self::ERROR_TYPE_GENERAL);
+		$result = $this->NotizModel->getNotizWithDocEntries($id, $type);
 
-			if (isError($result)) {
-				$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			}
-			return $this->terminateWithSuccess(getData($result) ?: []);
-		}
-		else
-		{
-			return $this->terminateWithError("type not valid", self::ERROR_TYPE_GENERAL);
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 		}
+		return $this->terminateWithSuccess(getData($result) ?: []);
+
+		//	return $this->terminateWithError("type not valid", self::ERROR_TYPE_GENERAL);
+
 	}
 
-	public function loadNotiz()
+/*	public function loadNotiz()
 	{
 		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
 
@@ -87,96 +88,6 @@ class Notiz extends FHCAPI_Controller
 		}
 	}
 
-	public function addNewNotiz($id, $paramTyp = null)
-	{
-		//$this->load->model('person/Notiz_model', 'NotizModel');
-
-		$this->load->library('DmsLib');
-		$this->load->library('form_validation');
-
-		$uid = getAuthUID();
-
-		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', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Titel'])
-		]);
-
-		$this->form_validation->set_rules('text', 'Text', 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Text'])
-		]);
-
-		if ($this->form_validation->run() == false)
-		{
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-		}
-
-		$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');
-
-		//Speichern der Notiz und Notizzuordnung inkl Prüfung ob valid type
-		$result = $this->NotizModel->addNotizForType($type, $id, $titel, $text, $uid, $start, $ende, $erledigt, $verfasser_uid, $bearbeiter_uid);
-		if (isError($result))
-		{
-			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-		$notiz_id = $result->retval;
-
-		//Speichern der Files
-		$dms_id_arr = [];
-		foreach ($_FILES as $k => $file)
-		{
-			$dms = array(
-				'kategorie_kurzbz'  => 'notiz',
-				'version'           => 0,
-				'name'              => $file["name"],
-				'mimetype'          => $file["type"],
-				'insertamum'        => date('c'),
-				'insertvon'         => $uid
-			);
-
-			//Todo(manu) check if filetypes weiter eingeschränkt werden sollen
-			//Todo(manu)check name files: nicht gleiches file 2mal hochladen
-			$result = $this->dmslib->upload($dms, $k, ['*']);
-			/*			$result = $this->dmslib->upload($dms, $k, ['application/pdf','application/x.fhc-dms+json']);*/
-			if (isError($result))
-			{
-				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			}
-			$dms_id_arr[] = $result->retval['dms_id'];
-		}
-
-		//Eintrag in Notizdokument speichern
-		if($dms_id_arr)
-		{
-			// Loads model Notizdokument_model
-			$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
-			foreach($dms_id_arr as $dms_id)
-			{
-				$result = $this->NotizdokumentModel->insert(array('notiz_id' => $notiz_id, 'dms_id' => $dms_id));
-				if (isError($result))
-				{
-					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-				}
-			}
-		}
-
-		return $this->terminateWithSuccess($result);
-	}
 
 	public function updateNotiz()
 	{
@@ -336,12 +247,15 @@ class Notiz extends FHCAPI_Controller
 			}
 		}
 		return $this->terminateWithSuccess($result);
-	}
+	}*/
 
-	public function deleteNotiz()
+
+/*	public function deleteNotiz()
 	{
 		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
 		$notiz_id = $this->input->post('notiz_id');
+		$type = $this->input->post('type_id');
+		$id = $this->input->post('id');
 
 		//dms_id auslesen aus notizdokument wenn vorhanden
 		$dms_id_arr = [];
@@ -378,10 +292,33 @@ class Notiz extends FHCAPI_Controller
 			}
 		}
 
-		//delete Notiz und Notizzuordnung
-		$this->load->model('person/Notiz_model', 'NotizModel');
-		$this->NotizModel->addJoin('public.tbl_notizzuordnung', 'notiz_id');
+		//delete Notizzuordnung
+		if($type == "software_id")
+		{
+			// Loads extension Model
+			$this->load->model('extensions/FHC-Core-Softwarebereitstellung/Softwarenotizzuordnung_model', 'ExtensionnotizzuordnungModel');
+			$result = $this->ExtensionnotizzuordnungModel->delete([
+				'notiz_id' => $notiz_id,
+				'id' => strval($id)
+				],
+				[
+				'type_id' => $type
+			]);
 
+		}
+		else
+		{
+			//notizzuordnungsid!
+			$result = $this->NotizzuordnungModel->delete(['notiz_id' => $notiz_id, $type => $id]);
+		}
+
+
+		$this->load->model('person/Notiz_model', 'NotizModel');
+		//$this->NotizModel->addJoin('public.tbl_notizzuordnung', 'notiz_id');
+
+		//TODO (erweitern um Type_id) für Extensions, damit auch Notizzuordnung gelöscht werden kann
+
+		//Löschen von Notiz
 		$result = $this->NotizModel->delete(
 			array('notiz_id' => $notiz_id)
 		);
@@ -396,9 +333,9 @@ class Notiz extends FHCAPI_Controller
 		}
 
 		return $this->terminateWithSuccess(current(getData($result)));
-	}
+	}*/
 
-	public function loadDokumente()
+/*	public function loadDokumente()
 	{
 		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
 		$notiz_id = $this->input->post('notiz_id');
@@ -420,9 +357,9 @@ class Notiz extends FHCAPI_Controller
 			return $this->terminateWithError($this->p->t('ui','error_missingId', ['id'=> 'Notiz_id']), self::ERROR_TYPE_GENERAL);
 		}
 		return $this->terminateWithSuccess(getData($result));
-	}
+	}*/
 
-	public function getMitarbeiter($searchString)
+/*	public function getMitarbeiter($searchString)
 	{
 		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
 		$result = $this->MitarbeiterModel->searchMitarbeiter($searchString);
@@ -430,6 +367,18 @@ class Notiz extends FHCAPI_Controller
 			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
 		return $this->terminateWithSuccess($result);
+	}*/
+
+	public function isBerechtigt($id, $typeId)
+	{
+		if(!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
+		{
+			$result =  $this->p->t('lehre','error_keineSchreibrechte');
+
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		return success("berechtigt in überschreibender Funktion");
+/*		return $this->terminateWithError('keine Berechtigung bro', self::ERROR_TYPE_GENERAL);*/
 	}
 
 }
\ No newline at end of file
diff --git a/application/core/Notiz_Controller.php b/application/core/Notiz_Controller.php
index 49aa9da61..51d6854b7 100644
--- a/application/core/Notiz_Controller.php
+++ b/application/core/Notiz_Controller.php
@@ -4,8 +4,9 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 use \DateTime as DateTime;
 
-class Notiz_Controller extends FHCAPI_Controller
+abstract class Notiz_Controller extends FHCAPI_Controller
 {
+	//public function __construct($zuordnung = 'person/Notizzuordnung_model')
 	public function __construct()
 	{
 		parent::__construct([
@@ -16,12 +17,12 @@ class Notiz_Controller extends FHCAPI_Controller
 			'updateNotiz' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
 			'deleteNotiz' => ['admin:r', 'assistenz:r'],
 			'loadDokumente' => ['admin:r', 'assistenz:r'],
-			'getMitarbeiter' => ['admin:r', 'assistenz:r']
+			'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');
 
 		// Load Libraries
 		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
@@ -37,24 +38,47 @@ class Notiz_Controller extends FHCAPI_Controller
 		$this->terminateWithSuccess(getAuthUID());
 	}
 
-	public function getNotizen($id, $type)
+
+	//Standardfall: für extensions überschreiben: speichern der Zuordnung in eigene Extensiontabelle angeben
+	protected function assignNotiz($notiz_id, $id, $type)
 	{
-
-		//check if valid type
+		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
 		$result = $this->NotizzuordnungModel->isValidType($type);
-		if(isError($result))
-			$this->terminateWithError($result->retval, self::ERROR_TYPE_GENERAL);
-
-		//$this->terminateWithError(" after check type not valid", self::ERROR_TYPE_GENERAL);
-		$result = $this->NotizModel->getNotizWithDocEntries($id, $type);
-
 		if (isError($result)) {
 			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 		}
-		return $this->terminateWithSuccess(getData($result) ?: []);
+		$result = $this->NotizzuordnungModel->insert(array('notiz_id' => $notiz_id, $type => $id));
+		if (isError($result))
+		{
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		return success(getData($result));
+	}
 
-		//	return $this->terminateWithError("type not valid", self::ERROR_TYPE_GENERAL);
+	//Standardfall: für extensions überschreiben: speichern der Zuordnung in eigene Extensiontabelle angeben
+	protected function deleteNotizzuordnung($notiz_id, $id, $type)
+	{
+		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
+		$result = $this->NotizzuordnungModel->isValidType($type);
+		if (isError($result)) {
+			$this->terminateWithError('type not in table notizzuordnung enthalten..', self::ERROR_TYPE_GENERAL);
+		}
 
+		$result = $this->NotizzuordnungModel->delete(['notiz_id' => $notiz_id, $type => $id]);
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		return success(getData($result));
+	}
+
+
+
+	//TODO(manu) abstract
+	protected function getNotizen($id, $type) {}
+
+	//TODO(manu) to abstract
+	protected function isBerechtigt($id, $typeId){
+		return $this->terminateWithError("in abstract function: define right in extension", self::ERROR_TYPE_GENERAL);
 	}
 
 	public function loadNotiz()
@@ -89,8 +113,6 @@ class Notiz_Controller extends FHCAPI_Controller
 
 	public function addNewNotiz($id, $paramTyp = null)
 	{
-		//$this->load->model('person/Notiz_model', 'NotizModel');
-
 		$this->load->library('DmsLib');
 		$this->load->library('form_validation');
 
@@ -122,21 +144,37 @@ class Notiz_Controller extends FHCAPI_Controller
 		$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;
+		$verfasser_uid = isset($_POST['verfasser_uid']) ? $_POST['verfasser_uid'] : $uid;
+		$bearbeiter_uid = isset($_POST['bearbeiter_uid']) ? $_POST['bearbeiter_uid'] : null;
 		$type = $this->input->post('typeId');
 		$start = $this->input->post('start');
 		$ende = $this->input->post('ende');
 
-		//Speichern der Notiz und Notizzuordnung inkl Prüfung ob valid type
-		$result = $this->NotizModel->addNotizForType($type, $id, $titel, $text, $uid, $start, $ende, $erledigt, $verfasser_uid, $bearbeiter_uid);
+		// Start DB transaction
+		$this->db->trans_start();
+
+		//Speichern der Notiz
+		$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->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			$this->db->trans_rollback();
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 		}
+
 		$notiz_id = $result->retval;
 
-		//Speichern der Files
+		//Speichern der Notizzuordnung
+		$result = $this->assignNotiz($notiz_id, $id, $type);
+
+		if (isError($result))
+		{
+			$this->db->trans_rollback();
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+
+		//Speichern der Dokumente
 		$dms_id_arr = [];
 		foreach ($_FILES as $k => $file)
 		{
@@ -155,6 +193,7 @@ class Notiz_Controller extends FHCAPI_Controller
 			/*			$result = $this->dmslib->upload($dms, $k, ['application/pdf','application/x.fhc-dms+json']);*/
 			if (isError($result))
 			{
+				$this->db->trans_rollback();
 				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 			}
 			$dms_id_arr[] = $result->retval['dms_id'];
@@ -170,11 +209,12 @@ class Notiz_Controller extends FHCAPI_Controller
 				$result = $this->NotizdokumentModel->insert(array('notiz_id' => $notiz_id, 'dms_id' => $dms_id));
 				if (isError($result))
 				{
+					$this->db->trans_rollback();
 					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 				}
 			}
 		}
-
+		$this->db->trans_commit();
 		return $this->terminateWithSuccess($result);
 	}
 
@@ -217,8 +257,8 @@ class Notiz_Controller extends FHCAPI_Controller
 		$uid = getAuthUID();
 		$titel = $this->input->post('titel');
 		$text = $this->input->post('text');
-		$verfasser_uid = $this->input->post('verfasser');
-		$bearbeiter_uid = isset($_POST['bearbeiter']) ? $_POST['bearbeiter'] : $uid;
+		$verfasser_uid = $this->input->post('verfasser_uid');
+		$bearbeiter_uid = isset($_POST['bearbeiter_uid']) ? $_POST['bearbeiter_uid'] : $uid;
 		$erledigt = $this->input->post('erledigt');
 		$start = $this->input->post('start');
 		$ende = $this->input->post('ende');
@@ -338,14 +378,20 @@ class Notiz_Controller extends FHCAPI_Controller
 		return $this->terminateWithSuccess($result);
 	}
 
-
 	public function deleteNotiz()
 	{
+		$this->load->library('DmsLib');
+
 		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
 		$notiz_id = $this->input->post('notiz_id');
-		$type = $this->input->post('type_id');
+		$typeId = $this->input->post('type_id');
 		$id = $this->input->post('id');
 
+		if(!$this->isBerechtigt($id, $typeId))
+		{
+			$this->terminateWithError($this->p->t('ui', 'keineBerechtigung'), self::ERROR_TYPE_GENERAL);
+		}
+
 		//dms_id auslesen aus notizdokument wenn vorhanden
 		$dms_id_arr = [];
 		$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
@@ -367,13 +413,20 @@ class Notiz_Controller extends FHCAPI_Controller
 
 		if($dms_id_arr)
 		{
+			// Start DB transaction
+			$this->db->trans_start();
+
+			//return $this->terminateWithError("dms_id kommt: " . $notiz_id, self::ERROR_TYPE_GENERAL);
 			$this->load->library('DmsLib');
+
+
 			foreach($dms_id_arr as $dms_id)
 			{
 				$result = $this->dmslib->removeAll($dms_id);
 
 				if (isError($result))
 				{
+					$this->db->trans_rollback();
 					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 				}
 
@@ -382,30 +435,14 @@ class Notiz_Controller extends FHCAPI_Controller
 		}
 
 		//delete Notizzuordnung
-		if($type == "software_id")
+		$result = $this-> deleteNotizzuordnung($notiz_id, $id, $typeId);
+		if (isError($result))
 		{
-			// Loads extension Model
-			$this->load->model('extensions/FHC-Core-Softwarebereitstellung/Softwarenotizzuordnung_model', 'ExtensionnotizzuordnungModel');
-			$result = $this->ExtensionnotizzuordnungModel->delete([
-				'notiz_id' => $notiz_id,
-				'id' => strval($id)
-			],
-				[
-					'type_id' => $type
-				]);
-
+			$this->db->trans_rollback();
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 		}
-		else
-		{
-			//notizzuordnungsid!
-			$result = $this->NotizzuordnungModel->delete(['notiz_id' => $notiz_id, $type => $id]);
-		}
-
 
 		$this->load->model('person/Notiz_model', 'NotizModel');
-		//$this->NotizModel->addJoin('public.tbl_notizzuordnung', 'notiz_id');
-
-		//TODO (erweitern um Type_id) für Extensions, damit auch Notizzuordnung gelöscht werden kann
 
 		//Löschen von Notiz
 		$result = $this->NotizModel->delete(
@@ -414,6 +451,7 @@ class Notiz_Controller extends FHCAPI_Controller
 
 		if (isError($result))
 		{
+			$this->db->trans_rollback();
 			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
 		if(!hasData($result))
@@ -421,11 +459,16 @@ class Notiz_Controller extends FHCAPI_Controller
 			return $this->terminateWithError($this->p->t('ui','error_missingId', ['id'=> 'Notiz_id']), self::ERROR_TYPE_GENERAL);
 		}
 
+		$this->db->trans_rollback();
 		return $this->terminateWithSuccess(current(getData($result)));
 	}
 
 	public function loadDokumente()
 	{
+		if(!$this->isBerechtigt('$id', '$typeId'))
+		{
+			$this->terminateWithError($this->p->t('ui', 'keineBerechtigung'), self::ERROR_TYPE_GENERAL);
+		}
 		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
 		$notiz_id = $this->input->post('notiz_id');
 
diff --git a/application/models/person/Notiz_model.php b/application/models/person/Notiz_model.php
index f9cd76724..560d6c0c7 100644
--- a/application/models/person/Notiz_model.php
+++ b/application/models/person/Notiz_model.php
@@ -180,13 +180,29 @@ class Notiz_model extends DB_Model
 		{
 			$notiz_id = $result->retval;
 
-			if (isSuccess($result))
+			//TODO(Manu) neue Function assign Notiz
+			if($type == "software_id")
+			{
+				// Loads extension Model
+				$this->load->model('extensions/FHC-Core-Softwarebereitstellung/Softwarenotizzuordnung_model', 'ExtensionnotizzuordnungModel');
+				$result = $this->ExtensionnotizzuordnungModel->insert([
+					'notiz_id' => $notiz_id,
+					'id' => $id,
+					'type_id' => $type
+				]);
+			}
+			else
 			{
-				$notiz_id = $result->retval;
 				$result = $this->NotizzuordnungModel->insert(array('notiz_id' => $notiz_id, $type => $id));
 			}
+			if (isError($result))
+			{
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return error('Fehler Insert Zuordnungstabelle');
+			}
 		}
 
+
 		// Transaction complete!
 		$this->db->trans_complete();
 
@@ -207,8 +223,10 @@ class Notiz_model extends DB_Model
 
 	/**
 	 * Add a Notiz for a given person with DMS_id
+	 *
 	 */
-	public function addNotizForPersonWithDoc($person_id, $titel, $text, $erledigt, $verfasser_uid, $von, $bis, $dms_id = null)
+	//Todo(manu) deprecated?
+/*	public function addNotizForPersonWithDoc($person_id, $titel, $text, $erledigt, $verfasser_uid, $von, $bis, $dms_id = null)
 	{
 		// Loads model Notizzuordnung_model
 		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
@@ -228,7 +246,7 @@ class Notiz_model extends DB_Model
 			{
 				// Loads model Notizdokument_model
 				$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
-				//Todo(manu) change for multiple files
+
 				$result = $this->NotizdokumentModel->insert(array('notiz_id' => $notiz_id, 'dms_id' => $dms_id));
 			}
 		}
@@ -249,7 +267,7 @@ class Notiz_model extends DB_Model
 		}
 
 		return $result;
-	}
+	}*/
 
 	/**
 	 * gets all Notizen for a person
@@ -271,32 +289,33 @@ class Notiz_model extends DB_Model
 	 */
 	public function getNotizWithDocEntries($id, $type)
 	{
-		$qry = "
-			SELECT 
-			    	n.*, count(dms_id) as countDoc, z.notizzuordnung_id,
-			    	TO_CHAR (CASE 
-						WHEN n.updateamum >= n.insertamum THEN n.updateamum 
-						ELSE n.insertamum
-					END::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS lastUpdate,
-			    	regexp_replace(n.text, '<[^>]*>', '', 'g') as text_stripped,
-			    	TO_CHAR(n.start::timestamp, 'DD.MM.YYYY') AS start_format,
-			    	TO_CHAR(n.ende::timestamp, 'DD.MM.YYYY') AS ende_format
-			    	
-			FROM
-			    	public.tbl_notiz n
-			JOIN 
-			    	    public.tbl_notizzuordnung z USING (notiz_id)
-			LEFT JOIN 
-			    	    public.tbl_notiz_dokument dok USING (notiz_id)
-			LEFT JOIN 
-			    	    campus.tbl_dms_version USING (dms_id)
-			WHERE 
-			   z.$type  = ?
-			GROUP BY 
-			    notiz_id, z.notizzuordnung_id
-		";
+			$qry = "
+				SELECT 
+						n.*, count(dms_id) as countDoc, z.notizzuordnung_id,
+						TO_CHAR (CASE 
+							WHEN n.updateamum >= n.insertamum THEN n.updateamum 
+							ELSE n.insertamum
+						END::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS lastUpdate,
+						regexp_replace(n.text, '<[^>]*>', '', 'g') as text_stripped,
+						TO_CHAR(n.start::timestamp, 'DD.MM.YYYY') AS start_format,
+						TO_CHAR(n.ende::timestamp, 'DD.MM.YYYY') AS ende_format,
+						z.notiz_id, z.person_id as id, ? as type_id
+						
+				FROM
+						public.tbl_notiz n
+				JOIN 
+							public.tbl_notizzuordnung z USING (notiz_id)
+				LEFT JOIN 
+							public.tbl_notiz_dokument dok USING (notiz_id)
+				LEFT JOIN 
+							campus.tbl_dms_version USING (dms_id)
+				WHERE 
+				   z.$type  = ?
+				GROUP BY 
+					notiz_id, z.notizzuordnung_id
+			";
 
-		return $this->execQuery($qry, array($id));
+		return $this->execQuery($qry, array($type, $id));
 
 	}
 
diff --git a/application/models/person/Notizzuordnung_model.php b/application/models/person/Notizzuordnung_model.php
index 8a6672424..b94ff3fb6 100644
--- a/application/models/person/Notizzuordnung_model.php
+++ b/application/models/person/Notizzuordnung_model.php
@@ -32,14 +32,17 @@ class Notizzuordnung_model extends DB_Model
 			$validTypes[] = $t->column_name;
 		}
 
-		if (in_array($type, $validTypes))
+		//TODO(manu) param id
+		if (in_array($type, $validTypes) )
+		//if (in_array($type, $validTypes) ||($type == 'software_id')) //Just for testing
 		{
-			$result = success('Type of Id is valid');
+			return success("Type " . $type . " is valid");
+		//	$result = success('Type of Id is valid');
 		}
 		else
 		{
-			$result = error('Type of Id  is not valid');
+			return error("Type " . $type . " is NOT valid");
 		}
-		return $result;
+		//return $result;
 	}
 }
diff --git a/public/js/components/Notiz/NotizComponent.js b/public/js/components/Notiz/NotizComponent.js
index fe2ecc3e8..663376aa4 100644
--- a/public/js/components/Notiz/NotizComponent.js
+++ b/public/js/components/Notiz/NotizComponent.js
@@ -18,6 +18,7 @@ export default {
 		BsModal
 	},
 	props: [
+		'endpoint',
 		'typeId',
 		'id',
 		'notizLayout',
@@ -29,16 +30,14 @@ export default {
 	data(){
 			return {
 				tabulatorOptions: {
-					ajaxURL: 'api/frontend/v1/stv/Notiz/getNotizen/' + this.id + '/' + this.typeId,
+					ajaxURL: this.endpoint + 'getNotizen/' + this.id + '/' + this.typeId,
 					ajaxRequestFunc: this.$fhcApi.get,
 					ajaxResponse: (url, params, response) => response.data,
-					//ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Notiz/getNotizen/' + this.id + '/' + this.typeId),
 					columns: [
 						{
 							title: "Titel",
 							field: "titel",
 							width: 100,
-							visible: true,
 							tooltip:function(e, cell, onRendered){
 								var el = document.createElement("div");
 								el.style.backgroundColor = "white";
@@ -55,7 +54,6 @@ export default {
 							title: "Text",
 							field: "text_stripped",
 							width: 250,
-							visible: true,
 							tooltip:function(e, cell, onRendered){
 								var el = document.createElement("div");
 								el.style.backgroundColor = "white";
@@ -88,6 +86,8 @@ export default {
 						},
 						{title: "Notiz_id", field: "notiz_id", width: 92, visible: false},
 						{title: "Notizzuordnung_id", field: "notizzuordnung_id", width: 164, visible: false},
+						{title: "type_id", field: "type_id", width: 164, visible: false},
+						{title: "extension_id", field: "id", width: 135, visible: false},
 						{title: "letzte Änderung", field: "lastupdate", width: 146, visible: false},
 						{
 							title: 'Aktionen', field: 'actions',
@@ -142,11 +142,11 @@ export default {
 							});
 							cm.getColumnByField('titel').component.updateDefinition({
 								title: this.$p.t('global', 'titel'),
-								visible: this.showVariables.showTitel
+								//visible: this.showVariables.showTitel
 							});
 							cm.getColumnByField('text_stripped').component.updateDefinition({
 								title: this.$p.t('global', 'text'),
-								visible: this.showVariables.showText
+								//visible: this.showVariables.showText
 							});
 							cm.getColumnByField('bearbeiter_uid').component.updateDefinition({
 								title: this.$p.t('notiz', 'bearbeiter'),
@@ -178,6 +178,12 @@ export default {
 							cm.getColumnByField('notizzuordnung_id').component.updateDefinition({
 								visible: this.showVariables.showNotizzuordnung_id
 							});
+							cm.getColumnByField('type_id').component.updateDefinition({
+								visible: this.showVariables.showType_id
+							});
+							cm.getColumnByField('id').component.updateDefinition({
+								visible: this.showVariables.showId
+							});
 
 						}
 					}
@@ -214,6 +220,8 @@ export default {
 					showErledigt: false,
 					showNotiz_id: false,
 					showNotizzuordnung_id: false,
+					showType_id: false,
+					showId: false,
 					showLastupdate: false
 				},
 		}
@@ -258,7 +266,13 @@ export default {
 
 			formData.append('data', JSON.stringify(this.notizData));
 			Object.entries(this.notizData.anhang).forEach(([k, v]) => formData.append(k, v));
-			this.$fhcApi.post('api/frontend/v1/stv/notiz/addNewNotiz/' + this.id,
+/*			this.formData = {
+				'id': this.id,
+				'typeId': this.typeId,
+				...formData
+			};*/
+
+			return this.$fhcApi.post(this.endpoint + 'addNewNotiz/' + this.id,
 				formData,
 				{Headers: {"Content-Type": "multipart/form-data"}}
 			).then(response => {
@@ -273,10 +287,12 @@ export default {
 		},
 		deleteNotiz(notiz_id) {
 			this.param = {
-				'notiz_id': notiz_id
+				'notiz_id': notiz_id,
+				'type_id': this.typeId,
+				'id': this.id
 			};
 
-			return this.$fhcApi.post('api/frontend/v1/stv/notiz/deleteNotiz/', this.param)
+			return this.$fhcApi.post(this.endpoint + 'deleteNotiz/', this.param)
 				.then(result => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
 					this.$refs.deleteNotizModal.hide();
@@ -292,7 +308,7 @@ export default {
 			this.param = {
 				'notiz_id': notiz_id
 			};
-			return this.$fhcApi.post('api/frontend/v1/stv/notiz/loadNotiz/',
+			return this.$fhcApi.post(this.endpoint + 'loadNotiz/',
 				this.param)
 				.then(result => {
 					this.notizData = result.data;
@@ -305,7 +321,7 @@ export default {
 			this.param = {
 				'notiz_id': notiz_id
 			};
-			return this.$fhcApi.post('api/frontend/v1/stv/notiz/loadDokumente/',
+			return this.$fhcApi.post(this.endpoint + 'loadDokumente/',
 				this.param)
 				.then(
 					result => {
@@ -324,7 +340,7 @@ export default {
 			};
 
 			return this.$fhcApi.post(
-				'api/frontend/v1/stv/notiz/updateNotiz/',
+				this.endpoint + 'updateNotiz/',
 				formData,
 				{Headers: {"Content-Type": "multipart/form-data"}}
 			).then(response => {
@@ -359,7 +375,7 @@ export default {
 		},
 		getUid() {
 			this.$fhcApi
-				.get('api/frontend/v1/stv/notiz/getUid')
+				.get(this.endpoint + 'getUid')
 				.then(result => {
 					this.notizData.intVerfasser = result.data;
 				})
@@ -367,7 +383,7 @@ export default {
 		},
 		search(event) {
 			return this.$fhcApi
-				.get('api/frontend/v1/stv/notiz/getMitarbeiter/' + event.query)
+				.get(this.endpoint + 'getMitarbeiter/' + event.query)
 				.then(result => {
 					this.filteredMitarbeiter = result.data.retval;
 				});
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
index fc92ce243..f93bb19cd 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
@@ -11,14 +11,15 @@ export default {
 	<div class="stv-details-details h-100 pb-3">
 		<h3>Notizen</h3>
 		<NotizComponent
+			endpoint="api/frontend/v1/stv/Notiz/"
 			ref="formc"
 			typeId="person_id"
 			:id="modelValue.person_id"
 			notizLayout="twoColumnsFormLeft"
-			:showErweitert="false"
-			:showDocument="false"
+			:showErweitert="true"
+			:showDocument="true"
 			:showTinyMCE="false"
-			:visibleColumns="['titel','text','verfasser','bearbeiter']"
+			:visibleColumns="['titel','text','verfasser','bearbeiter','dokumente']"
 			>
 		</NotizComponent>
 		
@@ -41,7 +42,7 @@ typeId: id to which table the notizdata should be connected... eg. person_id, pr
 	in progress for extensions
 
 visibleColumns: list, which fields shoult be showed as default in filter component
-		fullVersion: :visibleColumns=['titel','text','bearbeiter','verfasser','von','bis','erledigt']
+		fullVersion: :visibleColumns="['titel','text','bearbeiter','verfasser','von','bis','dokumente','erledigt','notiz_id','notizzuordnung_id','id','lastupdate']"
 
 ---------------------------------------------------------------------------------------------
 ---------------------------------------------------------------------------------------------	

From e1fac8e871450bf18f783146eec13bde099aa6d9 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 22 Apr 2024 17:11:02 +0200
Subject: [PATCH 0618/1461] adds the bootstrapVersion flag to all the
 TableWidgetData files

---
 .../lehre/anrechnung/adminAnrechnungData.php  |  1 +
 .../lehre/anrechnung/createAnrechnungData.php |  1 +
 .../reviewAnrechnungUebersichtData.php        | 20 ++++++++-----------
 .../lehrauftrag/acceptLehrauftragData.php     |  1 +
 .../lehrauftrag/approveLehrauftragData.php    |  1 +
 .../lehrauftrag/cancelledLehrauftragData.php  |  1 +
 .../lehrauftrag/orderLehrauftragData.php      |  1 +
 .../anrechnung/approveAnrechnungUebersicht.js |  2 +-
 8 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/application/views/lehre/anrechnung/adminAnrechnungData.php b/application/views/lehre/anrechnung/adminAnrechnungData.php
index adf909c0a..e89e88aaf 100644
--- a/application/views/lehre/anrechnung/adminAnrechnungData.php
+++ b/application/views/lehre/anrechnung/adminAnrechnungData.php
@@ -8,6 +8,7 @@ $query = '
 
 $filterWidgetArray = array(
 	'query' => $query,
+	'bootstrapVersion'=>5,
 	'tableUniqueId' => 'adminAnrechnung',
 	'requiredPermissions' => 'lehre/anrechnungszeitfenster',
 	'datasetRepresentation' => 'tabulator',
diff --git a/application/views/lehre/anrechnung/createAnrechnungData.php b/application/views/lehre/anrechnung/createAnrechnungData.php
index a0994189a..e1c27d2d4 100644
--- a/application/views/lehre/anrechnung/createAnrechnungData.php
+++ b/application/views/lehre/anrechnung/createAnrechnungData.php
@@ -37,6 +37,7 @@ $query = '
 
 $filterWidgetArray = array(
 	'query' => $query,
+	'bootstrapVersion'=>5,
 	'tableUniqueId' => 'createAnrechnung',
 	'requiredPermissions' => 'lehre/anrechnung_anlegen',
 	'datasetRepresentation' => 'tabulator',
diff --git a/application/views/lehre/anrechnung/reviewAnrechnungUebersichtData.php b/application/views/lehre/anrechnung/reviewAnrechnungUebersichtData.php
index 1d17af2ee..bb50edd34 100644
--- a/application/views/lehre/anrechnung/reviewAnrechnungUebersichtData.php
+++ b/application/views/lehre/anrechnung/reviewAnrechnungUebersichtData.php
@@ -70,9 +70,8 @@ $query = '
         ORDER BY lehrveranstaltung_id, benutzer.uid, lehrfunktion_kurzbz DESC
     )';
 
-if ($configFachbereichsleitung === TRUE)
-{
-    $query.= '
+if ($configFachbereichsleitung === TRUE) {
+	$query .= '
         SELECT 
         -- immer empfehlungsberechtigt, da hier nur Leitungen der LV-OE eine Empfehlungsanfrage erhalten
         TRUE AS empfehlungsberechtigt, 
@@ -95,10 +94,8 @@ if ($configFachbereichsleitung === TRUE)
         ) 
         order by empfehlung_anrechnung NULLS FIRST, antragsdatum
     ';
-}
-else
-{
-    $query.= '
+} else {
+	$query .= '
         SELECT DISTINCT ON (anrechnungen.*, lema.mitarbeiter_uid) 
         CASE 
             -- erst prüfen, ob es überhaupt eine LV Leitung gibt (wenn nicht, dann immer empfehlungsberechtigt)
@@ -127,11 +124,12 @@ else
 
 $filterWidgetArray = array(
 	'query' => $query,
+	'bootstrapVersion'=>5,
 	'tableUniqueId' => 'approveAnrechnungUebersicht',
 	'requiredPermissions' => 'lehre/anrechnung_empfehlen',
 	'datasetRepresentation' => 'tabulator',
 	'columnsAliases' => array(
-        'Empfehlungsberechtigt',
+		'Empfehlungsberechtigt',
 		'anrechnung_id',
 		'lehrveranstaltung_id',
 		'begruendung_id',
@@ -175,9 +173,7 @@ $filterWidgetArray = array(
 
 			//columnDefaults tooltip did not work
 
-			tooltip:(cell)=>{tooltip:function(e, cell, onRendered){
-				func_tooltips(e,cell,onRendered);
-			},
+			tooltip:true,
 			headerFilterPlaceholder: " ",
 			
 		}
@@ -210,4 +206,4 @@ $filterWidgetArray = array(
 
 echo $this->widgetlib->widget('TableWidget', $filterWidgetArray);
 
-?>
+?>
\ No newline at end of file
diff --git a/application/views/lehre/lehrauftrag/acceptLehrauftragData.php b/application/views/lehre/lehrauftrag/acceptLehrauftragData.php
index fcc4759db..d4f574312 100644
--- a/application/views/lehre/lehrauftrag/acceptLehrauftragData.php
+++ b/application/views/lehre/lehrauftrag/acceptLehrauftragData.php
@@ -294,6 +294,7 @@ ORDER BY "akzeptiert" NULLS FIRST, "erteilt" NULLS LAST, "bestellt"
 
 $filterWidgetArray = array(
     'query' => $query,
+    'bootstrapVersion'=>5,
     'tableUniqueId' => 'acceptLehrauftrag',
     'requiredPermissions' => 'lehre/lehrauftrag_akzeptieren',
     'datasetRepresentation' => 'tabulator',
diff --git a/application/views/lehre/lehrauftrag/approveLehrauftragData.php b/application/views/lehre/lehrauftrag/approveLehrauftragData.php
index 7dd3822a6..7af8619e8 100644
--- a/application/views/lehre/lehrauftrag/approveLehrauftragData.php
+++ b/application/views/lehre/lehrauftrag/approveLehrauftragData.php
@@ -305,6 +305,7 @@ ORDER BY "typ" DESC, "auftrag", "personalnummer" DESC, "lektor", "bestellt", "er
 
 $filterWidgetArray = array(
     'query' => $query,
+    'bootstrapVersion'=>5,
     'tableUniqueId' => 'approveLehrauftrag',
     'requiredPermissions' => 'lehre/lehrauftrag_erteilen',
     'datasetRepresentation' => 'tabulator',
diff --git a/application/views/lehre/lehrauftrag/cancelledLehrauftragData.php b/application/views/lehre/lehrauftrag/cancelledLehrauftragData.php
index f446cae25..219bd7cc5 100644
--- a/application/views/lehre/lehrauftrag/cancelledLehrauftragData.php
+++ b/application/views/lehre/lehrauftrag/cancelledLehrauftragData.php
@@ -50,6 +50,7 @@ $query = '
 
 $tableWidgetArray = array(
 	'query' => $query,
+    'bootstrapVersion' => 5,
 	'tableUniqueId' => 'cancelledLehrauftrag',
 	'requiredPermissions' => 'lehre/lehrauftrag_akzeptieren',
 	'datasetRepresentation' => 'tabulator',
diff --git a/application/views/lehre/lehrauftrag/orderLehrauftragData.php b/application/views/lehre/lehrauftrag/orderLehrauftragData.php
index f5b5cf6ce..5cc4fa594 100644
--- a/application/views/lehre/lehrauftrag/orderLehrauftragData.php
+++ b/application/views/lehre/lehrauftrag/orderLehrauftragData.php
@@ -334,6 +334,7 @@ ORDER BY "typ" DESC, "auftrag", "personalnummer" DESC, "lektor", "bestellt"
 ';
 $filterWidgetArray = array(
     'query' => $query,
+    'bootstrapVersion'=>5,
 	'tableUniqueId' => 'orderLehrauftrag',
     'requiredPermissions' => 'lehre/lehrauftrag_bestellen',
     'datasetRepresentation' => 'tabulator',
diff --git a/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js b/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
index b7f19a015..8f04c562c 100644
--- a/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
+++ b/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
@@ -158,7 +158,7 @@ function func_rowFormatter(row){
 
         // ...but leave url links selectable
         row.getCell('dokument_bezeichnung').getElement().firstChild.style["pointerEvents"] = "auto";
-        //row.getCell('details').getElement().firstChild.style["pointerEvents"] = "auto";
+        row.getCell('details').getElement().firstChild.style["pointerEvents"] = "auto";
 
         // Color background grey
         row.getElement().style["background-color"] = COLOR_LIGHTGREY;   // default

From 5e3a7d430706eaaa94ddc8aa3af6c38961d8b970 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 23 Apr 2024 08:12:57 +0200
Subject: [PATCH 0619/1461] bugfix tooltip

---
 public/js/components/Notiz/NotizComponent.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/public/js/components/Notiz/NotizComponent.js b/public/js/components/Notiz/NotizComponent.js
index 663376aa4..3774c56f7 100644
--- a/public/js/components/Notiz/NotizComponent.js
+++ b/public/js/components/Notiz/NotizComponent.js
@@ -41,9 +41,13 @@ export default {
 							tooltip:function(e, cell, onRendered){
 								var el = document.createElement("div");
 								el.style.backgroundColor = "white";
+								el.style.color = "black";
 								el.style.fontWeight = "bold";
 								el.style.padding = "5px";
 								el.style.border = "1px solid black";
+								el.style.borderRadius = "5px";
+
+								el.innerText = cell.getValue();
 
 								el.innerText = cell.getColumn().getField() + " - " + cell.getValue();
 
@@ -57,6 +61,7 @@ export default {
 							tooltip:function(e, cell, onRendered){
 								var el = document.createElement("div");
 								el.style.backgroundColor = "white";
+								el.style.color = "black";
 								el.style.fontWeight = "bold";
 								el.style.padding = "5px";
 								el.style.border = "1px solid black";

From 51ee16926c78debdc5cd0673144873e9214442e2 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 23 Apr 2024 09:49:41 +0200
Subject: [PATCH 0620/1461] adds a tabulator redraw when adding the details
 column to the tableWidget

---
 .../approveAnrechnungUebersichtData.php       |   52 +-
 application/views/widgets/table/table.php     |   10 +-
 public/js/lehre/anrechnung/adminAnrechnung.js |  422 ++---
 .../anrechnung/approveAnrechnungUebersicht.js | 1456 +++++++++--------
 .../anrechnung/reviewAnrechnungUebersicht.js  |  790 ++++-----
 .../js/lehre/lehrauftrag/acceptLehrauftrag.js | 1026 ++++++------
 .../lehre/lehrauftrag/approveLehrauftrag.js   | 1087 ++++++------
 .../js/lehre/lehrauftrag/orderLehrauftrag.js  | 1180 +++++++------
 8 files changed, 3083 insertions(+), 2940 deletions(-)

diff --git a/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php b/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
index 6dbd9e2a7..067a988c6 100644
--- a/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
+++ b/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
@@ -4,7 +4,7 @@ const ANRECHNUNGSTATUS_PROGRESSED_BY_LEKTOR = 'inProgressLektor';
 
 $STUDIENSEMESTER = $studiensemester_selected;
 $STUDIENGAENGE_ENTITLED = implode(', ', $studiengaenge_entitled);						// alle STG mit Lese- und Schreibberechtigung
-$ORGANISATIONSEINHEITEN_SCHREIBBERECHTIGT = "'". implode('\',\'', $oes_schreibberechtigt). "'";		// alle OE nur mit Schreibberechtigung; singlequote für jeden string notwendig
+$ORGANISATIONSEINHEITEN_SCHREIBBERECHTIGT = "'" . implode('\',\'', $oes_schreibberechtigt) . "'";		// alle OE nur mit Schreibberechtigung; singlequote für jeden string notwendig
 $LANGUAGE_INDEX = getUserLanguage() == 'German' ? '1' : '2';
 
 $query = '
@@ -109,9 +109,8 @@ $query = '
                     LIMIT 1)
             END "empfehlungsanfrageAm",';
 
-if ($configFachbereichsleitung === TRUE)
-{
-	$query.= ' CASE
+if ($configFachbereichsleitung === TRUE) {
+	$query .= ' CASE
                 WHEN (anrechnungen.empfehlung_anrechnung IS NULL AND anrechnungen.status_kurzbz = \'' . ANRECHNUNGSTATUS_PROGRESSED_BY_STGL . '\') THEN NULL
                 ELSE
                 (SELECT COALESCE(
@@ -136,10 +135,8 @@ if ($configFachbereichsleitung === TRUE)
                         ) as tmp_empfehlungsanfrageEmpfaenger
                     )
             END "empfehlungsanfrageAn"';
-}
-else
-{
-	$query.= ' CASE
+} else {
+	$query .= ' CASE
                 WHEN (anrechnungen.empfehlung_anrechnung IS NULL AND anrechnungen.status_kurzbz = \'' . ANRECHNUNGSTATUS_PROGRESSED_BY_STGL . '\') THEN NULL
                 ELSE
                 (SELECT COALESCE(
@@ -164,7 +161,7 @@ else
             END "empfehlungsanfrageAn"';
 }
 
-$query.= '	FROM anrechnungen
+$query .= '	FROM anrechnungen
 	JOIN lehre.tbl_anrechnungstatus as anrechnungstatus ON (anrechnungstatus.status_kurzbz = anrechnungen.status_kurzbz)
 	WHERE studiensemester_kurzbz = \'' . $STUDIENSEMESTER . '\'
 	AND studiengang_kz IN (' . $STUDIENGAENGE_ENTITLED . ')
@@ -190,8 +187,8 @@ $filterWidgetArray = array(
 		ucfirst($this->p->t('lehre', 'lehrveranstaltung')),
 		'ECTS (LV)',
 		'ECTS (LV + Bisher)',
-        'ECTS (Bisher schulisch)',
-        'ECTS (Bisher beruflich',
+		'ECTS (Bisher schulisch)',
+		'ECTS (Bisher beruflich',
 		ucfirst($this->p->t('global', 'begruendung')),
 		ucfirst($this->p->t('person', 'studentIn')),
 		ucfirst($this->p->t('anrechnung', 'nachweisdokumente')),
@@ -201,13 +198,38 @@ $filterWidgetArray = array(
 		ucfirst($this->p->t('anrechnung', 'empfehlung')),
 		'status_kurzbz',
 		'Status',
-	  	'PrestudentID',
+		'PrestudentID',
 		ucfirst($this->p->t('anrechnung', 'empfehlungsanfrageAm')),
 		ucfirst($this->p->t('anrechnung', 'empfehlungsanfrageAn'))
 	),
 
 	'datasetRepOptions' => '{
-		
+height: func_height(this),
+layout: "fitColumns",               // fit columns to width of table
+layoutColumnsOnNewData:true,
+persistenceID: "approveAnrechnungUebersicht_V1",
+autoResize: false,               // prevent auto resizing of table (false to allow adapting table size when cols are (de-)activated
+index: "anrechnung_id",             // assign specific column as unique id (important for row indexing)
+selectable: true,               // allow row selection
+selectableRangeMode: "click",   // allow range selection using shift end click on end of range
+selectablePersistence:false,    // deselect previously selected rows when table is filtered, sorted or paginated
+tableWidgetFooter: {
+	selectButtons: true  // tableWidgetFooter properties are checked in _renderTabulatorFooterHTML function
+},
+selectableCheck: function(row){
+	return func_selectableCheck(row);
+},
+rowFormatter:function(row){
+	func_rowFormatter(row,this);
+},
+columnDefaults:{
+	
+	//columnDefaults tooltip did not work
+	
+	tooltip:function(e, cell, onRendered){
+		return func_tooltips(cell);
+	},
+},
 		height: func_height(this),
 		layout: "fitColumns",           // fit columns to width of table
 		persistenceID: "approveAnrechnungUebersicht_V1",
@@ -232,7 +254,7 @@ $filterWidgetArray = array(
 			tooltip:function(e, cell, onRendered){
 				return func_tooltips(cell);
 			},
-			headerFilterPlaceholder: " ",
+			//headerFilterPlaceholder: " ",
 		}
 		
 	 }', // tabulator properties
@@ -274,4 +296,4 @@ $filterWidgetArray = array(
 
 echo $this->widgetlib->widget('TableWidget', $filterWidgetArray);
 
-?>
+?>
\ No newline at end of file
diff --git a/application/views/widgets/table/table.php b/application/views/widgets/table/table.php
index 6cd49c61c..33a13b1da 100644
--- a/application/views/widgets/table/table.php
+++ b/application/views/widgets/table/table.php
@@ -4,15 +4,15 @@
 
 		<!-- Table widget header -->
 		<div id="tableWidgetHeader"></div>
-        
-        <!-- TableWidget help site ( only rendered if widget is Tabulator )-->
+
+		<!-- TableWidget help site ( only rendered if widget is Tabulator )-->
 		<?php $this->load->view('widgets/table/tableHelpsite') ?>
-  
+
 		<!-- Table info top -->
 		<div id="tableDatasetActionsTop"></div>
 
 		<!-- TableWidget table -->
-		<div class="border border-2 mb-4">
+		<div class="border border-1 mb-4">
 			<?php TableWidget::loadViewDataset(); ?>
 		</div>
 
@@ -23,4 +23,4 @@
 		<div id="tableWidgetFooter"></div>
 
 	</div>
-</div>
+</div>
\ No newline at end of file
diff --git a/public/js/lehre/anrechnung/adminAnrechnung.js b/public/js/lehre/anrechnung/adminAnrechnung.js
index 3c5ac3b5a..30f5960ce 100644
--- a/public/js/lehre/anrechnung/adminAnrechnung.js
+++ b/public/js/lehre/anrechnung/adminAnrechnung.js
@@ -3,245 +3,261 @@
 
 // Add Edit and Update Buttons to table rows
 function func_tableBuilt(table) {
-    table.tabulator("addColumn",
-        {
-            title: "Aktion",
-            align: "center",
-            width: 150,
-            formatter: addActionButtons,
-        }, false  // place column right
-    );
+  table.tabulator(
+    "addColumn",
+    {
+      title: "Aktion",
+      align: "center",
+      width: 150,
+      formatter: addActionButtons,
+    },
+    false // place column right
+  );
 
+  // fully redrawing the table after adding the Details column
+  table.tabulator("redraw", true);
 }
 
 // Returns relative height (depending on screen size)
-function func_height(table){
-    return $(window).height() * 0.50;
+function func_height(table) {
+  return $(window).height() * 0.5;
 }
 
 // Converts string date postgre style to string DD.MM.YYYY.
 // This will allow correct filtering.
-var formatDate = function(cell, formatterParams){
-    let postgreDate = cell.getValue();
-    if (postgreDate != null)
-    {
-        var d = new Date(postgreDate);
-        return ("0" + (d.getDate())).slice(-2)  + "." + ("0" + (d.getMonth() + 1)).slice(-2) + "." + d.getFullYear();
-    }
-}
+var formatDate = function (cell, formatterParams) {
+  let postgreDate = cell.getValue();
+  if (postgreDate != null) {
+    var d = new Date(postgreDate);
+    return (
+      ("0" + d.getDate()).slice(-2) +
+      "." +
+      ("0" + (d.getMonth() + 1)).slice(-2) +
+      "." +
+      d.getFullYear()
+    );
+  }
+};
 
 // Create Edit and Update Buttons for table rows
-var addActionButtons = function(cell) {
+var addActionButtons = function (cell) {
+  // Create edit button
+  var editBtn = document.createElement("button");
+  editBtn.type = "button";
+  editBtn.innerHTML = '<i class="fa fa-edit"></i>';
+  editBtn.classList.add("azrEditBtn");
+  editBtn.classList.add("btn");
+  editBtn.classList.add("btn-outline-secondary");
+  editBtn.addEventListener("click", function () {
+    adminAnrechnung.editRow(cell);
+  });
 
-    // Create edit button
-    var editBtn = document.createElement("button");
-    editBtn.type = "button";
-    editBtn.innerHTML = "<i class=\"fa fa-edit\"></i>";
-    editBtn.classList.add("azrEditBtn");
-    editBtn.classList.add("btn");
-    editBtn.classList.add("btn-outline-secondary");
-    editBtn.addEventListener("click", function(){
-        adminAnrechnung.editRow(cell);
-    });
+  // Create delete button
+  var delBtn = document.createElement("button");
+  delBtn.type = "button";
+  delBtn.innerHTML = '<i class="fa fa-times"></i>';
+  delBtn.classList.add("azrDeleteBtn");
+  delBtn.classList.add("btn");
+  delBtn.classList.add("btn-outline-secondary");
+  delBtn.style.marginLeft = "5px";
+  delBtn.addEventListener("click", function () {
+    adminAnrechnung.deleteRow(cell);
+  });
 
+  // Add buttons to cell
+  var buttonHolder = document.createElement("span");
+  buttonHolder.appendChild(editBtn);
+  buttonHolder.appendChild(delBtn);
 
-
-    // Create delete button
-    var delBtn= document.createElement("button");
-    delBtn.type = "button";
-    delBtn.innerHTML = "<i class=\"fa fa-times\"></i>";
-    delBtn.classList.add("azrDeleteBtn");
-    delBtn.classList.add("btn");
-    delBtn.classList.add("btn-outline-secondary");
-    delBtn.style.marginLeft = '5px';
-    delBtn.addEventListener("click", function(){
-        adminAnrechnung.deleteRow(cell);
-    });
-
-    // Add buttons to cell
-    var buttonHolder = document.createElement("span");
-    buttonHolder.appendChild(editBtn);
-    buttonHolder.appendChild(delBtn);
-
-    return buttonHolder;
-}
+  return buttonHolder;
+};
 
 // ---------------------------------------------------------------------------------------------------------------------
 
 $(function () {
+  $(document).on("tableInit", function (event, tabulatorInstance) {
+    // tablutBuilt has to be attached as a callback the the tabulator in tabulator5
+    func_tableBuilt($("#tableWidgetTabulator"));
+  });
 
-    $(document).on("tableInit", function(event,tabulatorInstance) {
-        // tablutBuilt has to be attached as a callback the the tabulator in tabulator5
-        func_tableBuilt($("#tableWidgetTabulator"))
-    });
+  // Empty Modal fields on 'Anrechnungszeitraum hinzufuegen'
+  $(document).on("click", ".azrOpenModal", function () {
+    let defaultStudiensemester_kurzbz = $(
+      ".modal-body #defaultStudiensemester_kurzbz"
+    ).val();
 
-    // Empty Modal fields on 'Anrechnungszeitraum hinzufuegen'
-    $(document).on('click', '.azrOpenModal', function(){
+    $(".modal-header #azrModalLabel").text(
+      FHC_PhrasesLib.t("anrechnung", "anrechnungszeitraumHinzufuegen")
+    );
 
-            let defaultStudiensemester_kurzbz = $('.modal-body #defaultStudiensemester_kurzbz').val();
+    $(".modal-body #anrechnungszeitraum_id").val("");
+    $(".modal-body #studiensemester")
+      .val(defaultStudiensemester_kurzbz)
+      .change();
+    $(".modal-body #azrStart").val("");
+    $(".modal-body #azrEnde").val("");
+  });
 
-            $('.modal-header #azrModalLabel').text(FHC_PhrasesLib.t("anrechnung", "anrechnungszeitraumHinzufuegen"));
-
-            $('.modal-body #anrechnungszeitraum_id').val('');
-            $('.modal-body #studiensemester').val(defaultStudiensemester_kurzbz).change();
-            $('.modal-body #azrStart').val('');
-            $('.modal-body #azrEnde').val('');
-
-    });
+  // Insert Anrechnungszeitraum
+  $(document).on("click", "#azrInsertBtn", function () {
+    var studiensemester_kurzbz = $(".modal-body #studiensemester").val();
+    var anrechnungstart = $(".modal-body #azrStart").val();
+    var anrechnungende = $(".modal-body #azrEnde").val();
 
     // Insert Anrechnungszeitraum
-    $(document).on('click', '#azrInsertBtn', function(){
-        var studiensemester_kurzbz = $('.modal-body #studiensemester').val();
-        var anrechnungstart = $('.modal-body #azrStart').val();
-        var anrechnungende = $('.modal-body #azrEnde').val();
-
-        // Insert Anrechnungszeitraum
-        adminAnrechnung.insertAzr(studiensemester_kurzbz, anrechnungstart, anrechnungende);
-    });
-
-})
+    adminAnrechnung.insertAzr(
+      studiensemester_kurzbz,
+      anrechnungstart,
+      anrechnungende
+    );
+  });
+});
 
 var adminAnrechnung = {
-    insertAzr: function(studiensemester_kurzbz, anrechnungstart, anrechnungende){
-        FHC_AjaxClient.ajaxCallPost(
-            FHC_JS_DATA_STORAGE_OBJECT.called_path + "/save",
-            {
-                studiensemester_kurzbz: studiensemester_kurzbz,
-                anrechnungstart: anrechnungstart,
-                anrechnungende: anrechnungende
-            },
-            {
-                successCallback: function (data, textStatus, jqXHR)
+  insertAzr: function (
+    studiensemester_kurzbz,
+    anrechnungstart,
+    anrechnungende
+  ) {
+    FHC_AjaxClient.ajaxCallPost(
+      FHC_JS_DATA_STORAGE_OBJECT.called_path + "/save",
+      {
+        studiensemester_kurzbz: studiensemester_kurzbz,
+        anrechnungstart: anrechnungstart,
+        anrechnungende: anrechnungende,
+      },
+      {
+        successCallback: function (data, textStatus, jqXHR) {
+          if (FHC_AjaxClient.isError(data)) {
+            FHC_DialogLib.alertWarning(FHC_AjaxClient.getError(data));
+          }
+
+          if (FHC_AjaxClient.hasData(data)) {
+            data = FHC_AjaxClient.getData(data);
+
+            // Update row
+            $("#tableWidgetTabulator").tabulator(
+              "addData",
+              [
                 {
-                    if (FHC_AjaxClient.isError(data))
-                    {
-                        FHC_DialogLib.alertWarning(FHC_AjaxClient.getError(data));
-                    }
-
-                    if (FHC_AjaxClient.hasData(data))
-                    {
-                        data = FHC_AjaxClient.getData(data);
-
-                        // Update row
-                        $('#tableWidgetTabulator').tabulator('addData', [{
-                            anrechnungszeitraum_id: data.anrechnungszeitraum_id,
-                            studiensemester_kurzbz: studiensemester_kurzbz,
-                            anrechnungstart: anrechnungstart,
-                            anrechnungende: anrechnungende
-                        }], true); // true to add row on top
-
-                        // Close Modal
-                        $('#azrModal').modal('hide');
-
-                        // Success message
-                        FHC_DialogLib.alertSuccess(FHC_PhrasesLib.t("ui", "gespeichert"));
-                    }
+                  anrechnungszeitraum_id: data.anrechnungszeitraum_id,
+                  studiensemester_kurzbz: studiensemester_kurzbz,
+                  anrechnungstart: anrechnungstart,
+                  anrechnungende: anrechnungende,
                 },
-                errorCallback: function (jqXHR, textStatus, errorThrown)
-                {
-                    FHC_DialogLib.alertError(FHC_PhrasesLib.t("ui", "systemfehler"));
-                }
-            }
-        );
-    },
-    editRow: function (cell){
-        // Open Modal
-        $('#azrModal').modal('show');
+              ],
+              true
+            ); // true to add row on top
 
-        let row = cell.getRow();
-        var anrechnungszeitraum_id = row.getData().anrechnungszeitraum_id;
-        var studiensemester_kurzbz = row.getData().studiensemester_kurzbz;
-        var anrechnungstart = row.getData().anrechnungstart;
-        var anrechnungende = row.getData().anrechnungende;
+            // Close Modal
+            $("#azrModal").modal("hide");
 
-        $('.modal-header #azrModalLabel').text('Anrechnungszeitraum bearbeiten');
+            // Success message
+            FHC_DialogLib.alertSuccess(FHC_PhrasesLib.t("ui", "gespeichert"));
+          }
+        },
+        errorCallback: function (jqXHR, textStatus, errorThrown) {
+          FHC_DialogLib.alertError(FHC_PhrasesLib.t("ui", "systemfehler"));
+        },
+      }
+    );
+  },
+  editRow: function (cell) {
+    // Open Modal
+    $("#azrModal").modal("show");
 
-        $('.modal-body #anrechnungszeitraum_id').val(anrechnungszeitraum_id);
-        $('.modal-body #studiensemester').val(studiensemester_kurzbz).change();
-        $('.modal-body #azrStart').val(anrechnungstart);
-        $('.modal-body #azrEnde').val(anrechnungende);
+    let row = cell.getRow();
+    var anrechnungszeitraum_id = row.getData().anrechnungszeitraum_id;
+    var studiensemester_kurzbz = row.getData().studiensemester_kurzbz;
+    var anrechnungstart = row.getData().anrechnungstart;
+    var anrechnungende = row.getData().anrechnungende;
 
-    },
-    updateAzr: function (anrechnungszeitraum_id, studiensemester_kurzbz, anrechnungstart, anrechnungende) {
-        FHC_AjaxClient.ajaxCallPost(
-            FHC_JS_DATA_STORAGE_OBJECT.called_path + "/edit",
-            {
+    $(".modal-header #azrModalLabel").text("Anrechnungszeitraum bearbeiten");
+
+    $(".modal-body #anrechnungszeitraum_id").val(anrechnungszeitraum_id);
+    $(".modal-body #studiensemester").val(studiensemester_kurzbz).change();
+    $(".modal-body #azrStart").val(anrechnungstart);
+    $(".modal-body #azrEnde").val(anrechnungende);
+  },
+  updateAzr: function (
+    anrechnungszeitraum_id,
+    studiensemester_kurzbz,
+    anrechnungstart,
+    anrechnungende
+  ) {
+    FHC_AjaxClient.ajaxCallPost(
+      FHC_JS_DATA_STORAGE_OBJECT.called_path + "/edit",
+      {
+        anrechnungszeitraum_id: anrechnungszeitraum_id,
+        studiensemester_kurzbz: studiensemester_kurzbz,
+        anrechnungstart: anrechnungstart,
+        anrechnungende: anrechnungende,
+      },
+      {
+        successCallback: function (data, textStatus, jqXHR) {
+          if (FHC_AjaxClient.isError(data)) {
+            FHC_DialogLib.alertWarning(FHC_AjaxClient.getError(data));
+          }
+
+          if (FHC_AjaxClient.hasData(data)) {
+            // Update row
+            $("#tableWidgetTabulator").tabulator("updateData", [
+              {
                 anrechnungszeitraum_id: anrechnungszeitraum_id,
                 studiensemester_kurzbz: studiensemester_kurzbz,
                 anrechnungstart: anrechnungstart,
-                anrechnungende: anrechnungende
-            },
-            {
-                successCallback: function (data, textStatus, jqXHR)
-                {
-                    if (FHC_AjaxClient.isError(data))
-                    {
-                        FHC_DialogLib.alertWarning(FHC_AjaxClient.getError(data));
-                    }
+                anrechnungende: anrechnungende,
+              },
+            ]);
 
-                    if (FHC_AjaxClient.hasData(data))
-                    {
-                        // Update row
-                        $('#tableWidgetTabulator').tabulator('updateData', [{
-                            anrechnungszeitraum_id: anrechnungszeitraum_id,
-                            studiensemester_kurzbz: studiensemester_kurzbz,
-                            anrechnungstart: anrechnungstart,
-                            anrechnungende: anrechnungende
-                        }]);
+            // Close Modal
+            $("#azrModal").modal("hide");
 
-                        // Close Modal
-                        $('#azrModal').modal('hide');
+            // Success message
+            FHC_DialogLib.alertSuccess(FHC_PhrasesLib.t("ui", "gespeichert"));
+          }
+        },
+        errorCallback: function (jqXHR, textStatus, errorThrown) {
+          FHC_DialogLib.alertError(FHC_PhrasesLib.t("ui", "systemfehler"));
+        },
+      }
+    );
+  },
+  deleteAzr: function (anrechnungszeitraum_id) {
+    FHC_AjaxClient.ajaxCallPost(
+      FHC_JS_DATA_STORAGE_OBJECT.called_path + "/delete",
+      {
+        anrechnungszeitraum_id: anrechnungszeitraum_id,
+      },
+      {
+        successCallback: function (data, textStatus, jqXHR) {
+          if (FHC_AjaxClient.isError(data)) {
+            FHC_DialogLib.alertWarning(FHC_AjaxClient.getError(data));
+          }
 
-                        // Success message
-                        FHC_DialogLib.alertSuccess(FHC_PhrasesLib.t("ui", "gespeichert"));
+          if (FHC_AjaxClient.hasData(data)) {
+            let row = $("#tableWidgetTabulator").tabulator(
+              "getRow",
+              anrechnungszeitraum_id
+            );
+            row.delete(anrechnungszeitraum_id);
 
-                    }
-                },
-                errorCallback: function (jqXHR, textStatus, errorThrown)
-                {
-                    FHC_DialogLib.alertError(FHC_PhrasesLib.t("ui", "systemfehler"));
-                }
-            }
-        );
-    },
-    deleteAzr: function(anrechnungszeitraum_id){
-        FHC_AjaxClient.ajaxCallPost(
-            FHC_JS_DATA_STORAGE_OBJECT.called_path + "/delete",
-            {
-                anrechnungszeitraum_id: anrechnungszeitraum_id
-            },
-            {
-                successCallback: function (data, textStatus, jqXHR)
-                {
-                    if (FHC_AjaxClient.isError(data))
-                    {
-                        FHC_DialogLib.alertWarning(FHC_AjaxClient.getError(data));
-                    }
-
-                    if (FHC_AjaxClient.hasData(data))
-                    {
-                        let row = $('#tableWidgetTabulator').tabulator('getRow', anrechnungszeitraum_id);
-                        row.delete(anrechnungszeitraum_id);
-
-                        // Success message
-                        FHC_DialogLib.alertSuccess(FHC_PhrasesLib.t("ui", "geloescht"));
-
-                    }
-                },
-                errorCallback: function (jqXHR, textStatus, errorThrown)
-                {
-                    FHC_DialogLib.alertError(FHC_PhrasesLib.t("ui", "systemfehler"));
-                }
-            }
-        );
-    },
-    deleteRow: function (cell){
-        if(!confirm(FHC_PhrasesLib.t("ui", "frageSicherLoeschen")))
-        {
-            return;
-        }
-
-        // Delete Anrechnungszeitraum
-        adminAnrechnung.deleteAzr(cell.getRow().getData().anrechnungszeitraum_id);
+            // Success message
+            FHC_DialogLib.alertSuccess(FHC_PhrasesLib.t("ui", "geloescht"));
+          }
+        },
+        errorCallback: function (jqXHR, textStatus, errorThrown) {
+          FHC_DialogLib.alertError(FHC_PhrasesLib.t("ui", "systemfehler"));
+        },
+      }
+    );
+  },
+  deleteRow: function (cell) {
+    if (!confirm(FHC_PhrasesLib.t("ui", "frageSicherLoeschen"))) {
+      return;
     }
-}
\ No newline at end of file
+
+    // Delete Anrechnungszeitraum
+    adminAnrechnung.deleteAzr(cell.getRow().getData().anrechnungszeitraum_id);
+  },
+};
diff --git a/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js b/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
index 8f04c562c..a98149040 100644
--- a/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
+++ b/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
@@ -1,239 +1,277 @@
-const BASE_URL = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
+const BASE_URL =
+  FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
 const CALLED_PATH = FHC_JS_DATA_STORAGE_OBJECT.called_path;
-const CONTROLLER_URL = BASE_URL + '/' + CALLED_PATH;
-const APPROVE_ANRECHNUNG_DETAIL_URI = "lehre/anrechnung/ApproveAnrechnungDetail";
+const CONTROLLER_URL = BASE_URL + "/" + CALLED_PATH;
+const APPROVE_ANRECHNUNG_DETAIL_URI =
+  "lehre/anrechnung/ApproveAnrechnungDetail";
 
-const ANRECHNUNGSTATUS_PROGRESSED_BY_STGL = 'inProgressDP';
-const ANRECHNUNGSTATUS_PROGRESSED_BY_KF = 'inProgressKF';
-const ANRECHNUNGSTATUS_PROGRESSED_BY_LEKTOR = 'inProgressLektor';
-const ANRECHNUNGSTATUS_APPROVED = 'approved';
-const ANRECHNUNGSTATUS_REJECTED = 'rejected';
+const ANRECHNUNGSTATUS_PROGRESSED_BY_STGL = "inProgressDP";
+const ANRECHNUNGSTATUS_PROGRESSED_BY_KF = "inProgressKF";
+const ANRECHNUNGSTATUS_PROGRESSED_BY_LEKTOR = "inProgressLektor";
+const ANRECHNUNGSTATUS_APPROVED = "approved";
+const ANRECHNUNGSTATUS_REJECTED = "rejected";
 
 const COLOR_LIGHTGREY = "#f5f5f5";
-const COLOR_DANGER = '#f2dede';
+const COLOR_DANGER = "#f2dede";
 
 var tabulator = null; // Set in tableBuilt function.
 
 // Array with accumulated LV ECTS by Prestudent. Used to find out if max ECTS are exceeded.
 var selectedPrestudentWithAccumulatedLvEcts = [];
 
-
-
-
 // -----------------------------------------------------------------------------------------------------------------
 // Mutators - setter methods to manipulate table data when entering the tabulator
 // -----------------------------------------------------------------------------------------------------------------
 
 // Converts string date postgre style to string DD.MM.YYYY.
 // This will allow correct filtering.
-var mut_formatStringDate = function(value, data, type, params, component) {
-    if (value != null)
-    {
-        var d = new Date(value);
-        return ("0" + (d.getDate())).slice(-2)  + "." + ("0" + (d.getMonth() + 1)).slice(-2) + "." + d.getFullYear();
-    }
-}
+var mut_formatStringDate = function (value, data, type, params, component) {
+  if (value != null) {
+    var d = new Date(value);
+    return (
+      ("0" + d.getDate()).slice(-2) +
+      "." +
+      ("0" + (d.getMonth() + 1)).slice(-2) +
+      "." +
+      d.getFullYear()
+    );
+  }
+};
 
 // TABULATOR FUNCTIONS
 // ---------------------------------------------------------------------------------------------------------------------
 // Returns relative height (depending on screen size)
-function func_height(table){
-    return $(window).height() * 0.50;
+function func_height(table) {
+  return $(window).height() * 0.5;
 }
 
 // Filters boolean values
-function hf_filterTrueFalse(headerValue, rowValue){
+function hf_filterTrueFalse(headerValue, rowValue) {
+  if ("ja".startsWith(headerValue) || "yes".startsWith(headerValue)) {
+    return rowValue == "true";
+  }
 
-    if ('ja'.startsWith(headerValue) || 'yes'.startsWith(headerValue))
-    {
-        return rowValue == 'true';
-    }
+  if ("nein".startsWith(headerValue) || "no".startsWith(headerValue)) {
+    return rowValue == "false";
+  }
 
-    if ('nein'.startsWith(headerValue) || 'no'.startsWith(headerValue))
-    {
-        return rowValue == 'false';
-    }
-
-    if (headerValue = '-')
-    {
-        return rowValue == null;
-    }
+  if ((headerValue = "-")) {
+    return rowValue == null;
+  }
 }
 
 // Filters schreibberechtigt boolean values
-function hf_schreibberechtigt(headerValue, rowValue){
-
-    return rowValue == headerValue.toString();
+function hf_schreibberechtigt(headerValue, rowValue) {
+  return rowValue == headerValue.toString();
 }
 
 // Adds column details
 // Sets focus on filterbutton, if table starts with stored filter.
 function func_tableBuilt(table) {
-    // Store table in global var
-    tabulator = table;
-    table.tabulator("addColumn",{
-        title: "Details",
-        field: 'details',
-        hozAlign: 'center',
-        width: 100,
-        formatter: "link",
-        formatterParams:{
-            label:"Details",
-            url:function(cell){
-                return  BASE_URL + "/" + APPROVE_ANRECHNUNG_DETAIL_URI + "?anrechnung_id=" + cell.getData().anrechnung_id
-            },
-            target:"_blank"
-        }
-    }, true);   // place column on the very left
+  // Store table in global var
+  tabulator = table;
+  table.tabulator(
+    "addColumn",
+    {
+      title: "Details",
+      field: "details",
+      hozAlign: "center",
+      width: 100,
+      formatter: "link",
+      formatterParams: {
+        label: "Details",
+        url: function (cell) {
+          return (
+            BASE_URL +
+            "/" +
+            APPROVE_ANRECHNUNG_DETAIL_URI +
+            "?anrechnung_id=" +
+            cell.getData().anrechnung_id
+          );
+        },
+        target: "_blank",
+      },
+    },
+    true
+  ); // place column on the very left
 
-    // Set focus on filterbutton
-   
-    let filters = table.find("#tableWidgetTabulator").tabulator("getFilters");
-    if (filters.length > 0){
-        approveAnrechnung.focusFilterbuttonIfTableStartsWithStoredFilter(filters);
-    }
+  // Set focus on filterbutton
+
+  let filters = table.find("#tableWidgetTabulator").tabulator("getFilters");
+  if (filters.length > 0) {
+    approveAnrechnung.focusFilterbuttonIfTableStartsWithStoredFilter(filters);
+  }
+
+  // fully redrawing the table after adding the Details column
+  table.tabulator("redraw", true);
 }
 
 /**
  * Formats column ECTS (LV + Bisher).
  */
-var format_ectsSumBisherUndNeu = function(cell, formatterParams, onRendered){
-    let row = cell.getRow();
-    let rowData = row.getData();
+var format_ectsSumBisherUndNeu = function (cell, formatterParams, onRendered) {
+  let row = cell.getRow();
+  let rowData = row.getData();
 
-    let begruendung_id = (rowData.begruendung_id);
-    let ectsSumBisherUndNeuTotal = (rowData.ectsSumSchulisch + rowData.ectsSumBeruflich);
-    let ectsSumBisherUndNeuSchulisch = rowData.ectsSumSchulisch;
-    let ectsSumBisherUndNeuBeruflich = rowData.ectsSumBeruflich;
+  let begruendung_id = rowData.begruendung_id;
+  let ectsSumBisherUndNeuTotal =
+    rowData.ectsSumSchulisch + rowData.ectsSumBeruflich;
+  let ectsSumBisherUndNeuSchulisch = rowData.ectsSumSchulisch;
+  let ectsSumBisherUndNeuBeruflich = rowData.ectsSumBeruflich;
 
-    // If exists, add accumulated LV ECTS to bisherige ECTS
-    if (selectedPrestudentWithAccumulatedLvEcts.length > 0)
-    {
-        let selectedPrestudent = selectedPrestudentWithAccumulatedLvEcts.find(x => x.prestudent_id === rowData.prestudent_id);
+  // If exists, add accumulated LV ECTS to bisherige ECTS
+  if (selectedPrestudentWithAccumulatedLvEcts.length > 0) {
+    let selectedPrestudent = selectedPrestudentWithAccumulatedLvEcts.find(
+      (x) => x.prestudent_id === rowData.prestudent_id
+    );
 
-        if (selectedPrestudent != undefined)
-        {
-            ectsSumBisherUndNeuTotal = (rowData.ectsSumSchulisch + rowData.ectsSumBeruflich) + selectedPrestudent.ectsSumAnzurechnendeLvsSchulisch + selectedPrestudent.ectsSumAnzurechnendeLvsBeruflich;
-            ectsSumBisherUndNeuSchulisch = rowData.ectsSumSchulisch + selectedPrestudent.ectsSumAnzurechnendeLvsSchulisch;
-            ectsSumBisherUndNeuBeruflich = rowData.ectsSumBeruflich + selectedPrestudent.ectsSumAnzurechnendeLvsBeruflich;
-        }
-
-        // Color column if maximum ECTS exceeded
-        if (begruendung_id != 5 && row.isSelected())
-        {
-
-            if (
-                (ectsSumBisherUndNeuSchulisch + ectsSumBisherUndNeuBeruflich) > 90 ||
-                ectsSumBisherUndNeuSchulisch > 60 ||
-                ectsSumBisherUndNeuBeruflich > 60
-            )
-            {
-                cell.getElement().style["background-color"] = COLOR_DANGER;
-            }
-        }
-        else
-        {
-            cell.getElement().style.removeProperty('background-color');
-        }
+    if (selectedPrestudent != undefined) {
+      ectsSumBisherUndNeuTotal =
+        rowData.ectsSumSchulisch +
+        rowData.ectsSumBeruflich +
+        selectedPrestudent.ectsSumAnzurechnendeLvsSchulisch +
+        selectedPrestudent.ectsSumAnzurechnendeLvsBeruflich;
+      ectsSumBisherUndNeuSchulisch =
+        rowData.ectsSumSchulisch +
+        selectedPrestudent.ectsSumAnzurechnendeLvsSchulisch;
+      ectsSumBisherUndNeuBeruflich =
+        rowData.ectsSumBeruflich +
+        selectedPrestudent.ectsSumAnzurechnendeLvsBeruflich;
     }
 
-    // If max ECTS is exceeded, format font color / weight
-    ectsSumBisherUndNeuTotal = (ectsSumBisherUndNeuTotal > 90) ? "<span class='text-danger'><b><u>" + ectsSumBisherUndNeuTotal + "</u></b></span>" :  ectsSumBisherUndNeuTotal;
-    ectsSumBisherUndNeuSchulisch = (ectsSumBisherUndNeuSchulisch > 60) ? "<span class='text-danger'><b><u>" + ectsSumBisherUndNeuSchulisch + "</u></b></span>" : ectsSumBisherUndNeuSchulisch;
-    ectsSumBisherUndNeuBeruflich = (ectsSumBisherUndNeuBeruflich > 60) ? "<span class='text-danger'><b><u>" + ectsSumBisherUndNeuBeruflich + "</u></b></span>" : ectsSumBisherUndNeuBeruflich;
+    // Color column if maximum ECTS exceeded
+    if (begruendung_id != 5 && row.isSelected()) {
+      if (
+        ectsSumBisherUndNeuSchulisch + ectsSumBisherUndNeuBeruflich > 90 ||
+        ectsSumBisherUndNeuSchulisch > 60 ||
+        ectsSumBisherUndNeuBeruflich > 60
+      ) {
+        cell.getElement().style["background-color"] = COLOR_DANGER;
+      }
+    } else {
+      cell.getElement().style.removeProperty("background-color");
+    }
+  }
 
-    return "T: " + ectsSumBisherUndNeuTotal + " [ S: " + ectsSumBisherUndNeuSchulisch + " | B: " + ectsSumBisherUndNeuBeruflich + " ]";
-}
+  // If max ECTS is exceeded, format font color / weight
+  ectsSumBisherUndNeuTotal =
+    ectsSumBisherUndNeuTotal > 90
+      ? "<span class='text-danger'><b><u>" +
+        ectsSumBisherUndNeuTotal +
+        "</u></b></span>"
+      : ectsSumBisherUndNeuTotal;
+  ectsSumBisherUndNeuSchulisch =
+    ectsSumBisherUndNeuSchulisch > 60
+      ? "<span class='text-danger'><b><u>" +
+        ectsSumBisherUndNeuSchulisch +
+        "</u></b></span>"
+      : ectsSumBisherUndNeuSchulisch;
+  ectsSumBisherUndNeuBeruflich =
+    ectsSumBisherUndNeuBeruflich > 60
+      ? "<span class='text-danger'><b><u>" +
+        ectsSumBisherUndNeuBeruflich +
+        "</u></b></span>"
+      : ectsSumBisherUndNeuBeruflich;
+
+  return (
+    "T: " +
+    ectsSumBisherUndNeuTotal +
+    " [ S: " +
+    ectsSumBisherUndNeuSchulisch +
+    " | B: " +
+    ectsSumBisherUndNeuBeruflich +
+    " ]"
+  );
+};
 
 // Formats the rows
-function func_rowFormatter(row){
-    
-    let status_kurzbz = row.getData().status_kurzbz;
+function func_rowFormatter(row) {
+  let status_kurzbz = row.getData().status_kurzbz;
 
-    // If status is anything else then 'Bearbeitet von STGL-Leitung'
-    if (status_kurzbz != ANRECHNUNGSTATUS_PROGRESSED_BY_STGL)
-    {
-        // Disable new selection of updated rows
-        row.getElement().style["pointerEvents"] = "none";
+  // If status is anything else then 'Bearbeitet von STGL-Leitung'
+  if (status_kurzbz != ANRECHNUNGSTATUS_PROGRESSED_BY_STGL) {
+    // Disable new selection of updated rows
+    row.getElement().style["pointerEvents"] = "none";
 
-        // ...but leave url links selectable
-        row.getCell('dokument_bezeichnung').getElement().firstChild.style["pointerEvents"] = "auto";
-        row.getCell('details').getElement().firstChild.style["pointerEvents"] = "auto";
-
-        // Color background grey
-        row.getElement().style["background-color"] = COLOR_LIGHTGREY;   // default
+    // ...but leave url links selectable
+    row.getCell("dokument_bezeichnung").getElement().firstChild.style[
+      "pointerEvents"
+    ] = "auto";
+    if (row.getCell("details")) {
+      row.getCell("details").getElement().firstChild.style["pointerEvents"] =
+        "auto";
     }
+
+    // Color background grey
+    row.getElement().style["background-color"] = COLOR_LIGHTGREY; // default
+  }
 }
 
 // Formats row selectable/unselectable
-function func_selectableCheck(row){
-    let status_kurzbz = row.getData().status_kurzbz;
+function func_selectableCheck(row) {
+  let status_kurzbz = row.getData().status_kurzbz;
 
-    return (
-        status_kurzbz != ANRECHNUNGSTATUS_APPROVED &&
-        status_kurzbz != ANRECHNUNGSTATUS_REJECTED &&
-        status_kurzbz != ANRECHNUNGSTATUS_PROGRESSED_BY_LEKTOR
-    );
+  return (
+    status_kurzbz != ANRECHNUNGSTATUS_APPROVED &&
+    status_kurzbz != ANRECHNUNGSTATUS_REJECTED &&
+    status_kurzbz != ANRECHNUNGSTATUS_PROGRESSED_BY_LEKTOR
+  );
 }
 
 // Calculate dynamically sum of all LV ECTS by Student and display, when maximum ECTS are exceeded.
 // data = selected data, rows = selected rows
-function func_rowSelectionChanged(data, rows, tabulatorInstance){
-    
-    if (tabulator != null)
-    {
-        // Sum up over all anzurechnenden LV-ECTS by Prestudent
-        selectedPrestudentWithAccumulatedLvEcts = approveAnrechnung.getSumLvEctsByPreStudent(data);
+function func_rowSelectionChanged(data, rows, tabulatorInstance) {
+  if (tabulator != null) {
+    // Sum up over all anzurechnenden LV-ECTS by Prestudent
+    selectedPrestudentWithAccumulatedLvEcts =
+      approveAnrechnung.getSumLvEctsByPreStudent(data);
 
-        // Loop through all active rows
-        
-        var rowManager = tabulatorInstance.rowManager;
+    // Loop through all active rows
 
-        for (var i = 0; i < rowManager.activeRows.length; i++) {
+    var rowManager = tabulatorInstance.rowManager;
 
-            // Reinitialize row -> triggers formatters.
-            rowManager.activeRows[i].reinitialize();
-            
-            
-        }
-
-        // Show number of selected rows.
-        approveAnrechnung.showNumberSelectedRows(rows);
+    for (var i = 0; i < rowManager.activeRows.length; i++) {
+      // Reinitialize row -> triggers formatters.
+      rowManager.activeRows[i].reinitialize();
     }
+
+    // Show number of selected rows.
+    approveAnrechnung.showNumberSelectedRows(rows);
+  }
 }
 
 // Returns tooltip
-function func_tooltips(){
-    //e - mouseover event
-    //cell - cell component
-    //onRendered - onRendered callback registration function
-    console.log("here");
-    // console.log("TOOLTIP DEBUG",cell);
-    // // Return tooltip if row is unselectable
-    // if (true || !func_selectableCheck(cell.getRow())){
-    //     return FHC_PhrasesLib.t("ui", "nichtSelektierbarAufgrundVon") + 'Status';
-    // }
+function func_tooltips() {
+  //e - mouseover event
+  //cell - cell component
+  //onRendered - onRendered callback registration function
+  console.log("here");
+  // console.log("TOOLTIP DEBUG",cell);
+  // // Return tooltip if row is unselectable
+  // if (true || !func_selectableCheck(cell.getRow())){
+  //     return FHC_PhrasesLib.t("ui", "nichtSelektierbarAufgrundVon") + 'Status';
+  // }
 }
 
 // Formats empfehlung_anrechnung
-var format_empfehlung_anrechnung = function(cell, formatterParams){
-    return (cell.getValue() == null)
-        ? '-'
-        : (cell.getValue() ==  'true')
-            ? FHC_PhrasesLib.t("ui", "ja")
-            : FHC_PhrasesLib.t("ui", "nein");
-}
+var format_empfehlung_anrechnung = function (cell, formatterParams) {
+  return cell.getValue() == null
+    ? "-"
+    : cell.getValue() == "true"
+    ? FHC_PhrasesLib.t("ui", "ja")
+    : FHC_PhrasesLib.t("ui", "nein");
+};
 
 /**
  * Returns formatter params for field dokument_bezeichnung (= Spalte Nachweisdokumente)
  * NOTE: Returning a formatter param object fixes the problem, that tabulator did not know the url after refreshing the page.
  */
-function paramLookup_dokBez(cell){
-    return {
-        labelField: 'dokument_bezeichnung',
-        url: CONTROLLER_URL + '/download?dms_id=' + cell.getData().dms_id,
-        target: '_blank'
-    }
+function paramLookup_dokBez(cell) {
+  return {
+    labelField: "dokument_bezeichnung",
+    url: CONTROLLER_URL + "/download?dms_id=" + cell.getData().dms_id,
+    target: "_blank",
+  };
 }
 
 /*
@@ -241,565 +279,605 @@ function paramLookup_dokBez(cell){
  * Select all (filtered) rows that are progressed by stg leiter.
  * (Ignore rows that are approved, rejected or in request for recommendation)
  */
-function tableWidgetHook_selectAllButton(tableWidgetDiv){
-    var resultRows = tableWidgetDiv.find("#tableWidgetTabulator").tabulator('getRows', true)
-        .filter(row =>
-            row.getData().status_kurzbz == ANRECHNUNGSTATUS_PROGRESSED_BY_STGL
-        );
+function tableWidgetHook_selectAllButton(tableWidgetDiv) {
+  var resultRows = tableWidgetDiv
+    .find("#tableWidgetTabulator")
+    .tabulator("getRows", true)
+    .filter(
+      (row) =>
+        row.getData().status_kurzbz == ANRECHNUNGSTATUS_PROGRESSED_BY_STGL
+    );
 
-    tableWidgetDiv.find("#tableWidgetTabulator").tabulator('selectRow', resultRows);
+  tableWidgetDiv
+    .find("#tableWidgetTabulator")
+    .tabulator("selectRow", resultRows);
 }
 
+$(function () {
+  const genehmigung_panel = $("#approveAnrechnungUebersicht-genehmigung-panel");
+  const begruendung_panel = $("#approveAnrechnungUebersicht-begruendung-panel");
+  const hasReadOnlyAccess = $("#formApproveAnrechnungUebersicht").data(
+    "readonly"
+  );
+  const hasCreateAnrechnungAccess = $("#formApproveAnrechnungUebersicht").data(
+    "createaccess"
+  );
 
+  // tableInit is called in the jquery_wrapper when the tableBuilt event was finished
+  $(document).on("tableInit", function (event, tabulatorInstance) {
+    func_tableBuilt($("#tableWidgetTabulator"));
 
+    // event rowSelectionChanged needs to be attached as a callback to the tableBuilt event in tabulator5
+    $("#tableWidgetTabulator").tabulator(
+      "on",
+      "rowSelectionChanged",
+      (data, rows) => {
+        func_rowSelectionChanged(data, rows, tabulatorInstance);
+      }
+    );
+  });
 
+  // Pruefen ob Promise unterstuetzt wird
+  // Tabulator funktioniert nicht mit IE
+  var canPromise = !!window.Promise;
+  if (!canPromise) {
+    alert(
+      "Diese Seite kann mit ihrem Browser nicht angezeigt werden. Bitte verwenden Sie Firefox, Chrome oder Edge um die Seite anzuzeigen"
+    );
+    window.location.href = "about:blank";
+    return;
+  }
 
+  // Redraw table on resize to fit tabulators height to windows height
+  window.addEventListener("resize", function () {
+    $("#tableWidgetTabulator").tabulator("setHeight", $(window).height() * 0.5);
+    $("#tableWidgetTabulator").tabulator("redraw", true);
+  });
 
-$(function(){
-    const genehmigung_panel = $('#approveAnrechnungUebersicht-genehmigung-panel');
-    const begruendung_panel = $('#approveAnrechnungUebersicht-begruendung-panel');
-    const hasReadOnlyAccess = $('#formApproveAnrechnungUebersicht').data('readonly');
-    const hasCreateAnrechnungAccess = $('#formApproveAnrechnungUebersicht').data('createaccess');
-   
-    // tableInit is called in the jquery_wrapper when the tableBuilt event was finished
-    $(document).on("tableInit", function(event,tabulatorInstance) {
-     
-        func_tableBuilt($("#tableWidgetTabulator"))
-        
-        // event rowSelectionChanged needs to be attached as a callback to the tableBuilt event in tabulator5
-        $("#tableWidgetTabulator").tabulator("on","rowSelectionChanged",(data,rows)=>{func_rowSelectionChanged(data,rows,tabulatorInstance)});
-       
-    });
-	
-    // Pruefen ob Promise unterstuetzt wird
-    // Tabulator funktioniert nicht mit IE
-    var canPromise = !! window.Promise;
-    if(!canPromise)
-    {
-        alert("Diese Seite kann mit ihrem Browser nicht angezeigt werden. Bitte verwenden Sie Firefox, Chrome oder Edge um die Seite anzuzeigen");
-        window.location.href='about:blank';
+  if (hasReadOnlyAccess) {
+    approveAnrechnung.disableEditElements();
+  }
+
+  if (!hasCreateAnrechnungAccess) {
+    approveAnrechnung.disableCreateAnrechnungButton();
+  }
+
+  //! this function should not be needed in the approveAnrechnungUebersicht
+  // Set status alert color
+  approveAnrechnung.setStatusAlertColor();
+
+  // Show only rows that are in progress by STGL
+  $("#show-inProgressDP").click(function () {
+    $("#tableWidgetTabulator").tabulator("setFilter", [
+      {
+        field: "status_kurzbz",
+        type: "=",
+        value: ANRECHNUNGSTATUS_PROGRESSED_BY_STGL,
+      },
+    ]);
+  });
+
+  // Show only rows that are in progress by lector
+  $("#show-inProgressLektor").click(function () {
+    $("#tableWidgetTabulator").tabulator("setFilter", [
+      {
+        field: "status_kurzbz",
+        type: "=",
+        value: ANRECHNUNGSTATUS_PROGRESSED_BY_LEKTOR,
+      },
+      { field: "empfehlung_anrechnung", type: "=", value: null },
+    ]);
+  });
+
+  // Show only rows with empfohlene + noch nicht genehmigte/abgelehnte anrechnungen
+  $("#show-recommended").click(function () {
+    $("#tableWidgetTabulator").tabulator("setFilter", [
+      {
+        field: "status_kurzbz",
+        type: "=",
+        value: ANRECHNUNGSTATUS_PROGRESSED_BY_STGL,
+      },
+      { field: "empfehlung_anrechnung", type: "=", value: "true" },
+    ]);
+  });
+
+  // Show only rows with nicht empfohlene + noch nicht genehmigte/abgelehnte anrechnungen
+  $("#show-not-recommended").click(function () {
+    $("#tableWidgetTabulator").tabulator("setFilter", [
+      {
+        field: "status_kurzbz",
+        type: "=",
+        value: ANRECHNUNGSTATUS_PROGRESSED_BY_STGL,
+      },
+      { field: "empfehlung_anrechnung", type: "=", value: "false" },
+    ]);
+  });
+
+  // Show only rows with genehmigte anrechnungen
+  $("#show-approved").click(function () {
+    $("#tableWidgetTabulator").tabulator("setFilter", [
+      { field: "status_kurzbz", type: "=", value: ANRECHNUNGSTATUS_APPROVED },
+    ]);
+  });
+
+  // Show only rows with abgelehnte anrechnungen
+  $("#show-rejected").click(function () {
+    $("#tableWidgetTabulator").tabulator("setFilter", [
+      { field: "status_kurzbz", type: "=", value: ANRECHNUNGSTATUS_REJECTED },
+    ]);
+  });
+
+  /**
+   * Show all rows: clear filter and blur button
+   * Bootstrap button remains in activated style, even when clicking various times.
+   * This function "resets" button style and clear all tabulators filter.
+   * NOTE: MUST be after all other filters
+   */
+  $(".btn-clearfilter").click(function () {
+    if ($(this).hasClass("active")) {
+      $("#tableWidgetTabulator").tabulator("clearFilter");
+      $(this).blur();
+    }
+  });
+
+  // Ask if Approve Anrechnungen
+  $("#approveAnrechnungUebersicht-approve-anrechnungen-ask").click(function () {
+    begruendung_panel.css("display", "none");
+
+    if (genehmigung_panel.is(":hidden")) {
+      // Show begruendung panel if is hidden
+      genehmigung_panel.slideDown(400, function () {
+        $("html, body").animate(
+          {
+            scrollTop: genehmigung_panel.offset().top, // Move genehmigung panel bottom up to be visible within window screen
+          },
+          400
+        );
+      });
+
+      return;
+    }
+  });
+
+  // Approve Anrechnungen
+  $("#approveAnrechnungUebersicht-approve-anrechnungen-confirm").click(
+    function (e) {
+      // Avoid bubbling click event to sibling break button
+      e.stopImmediatePropagation();
+
+      // Get selected rows data
+      let selected_data = $("#tableWidgetTabulator").tabulator(
+        "getSelectedData"
+      );
+
+      // Alert and exit if no anrechnung is selected
+      if (selected_data.length == 0) {
+        FHC_DialogLib.alertInfo(
+          FHC_PhrasesLib.t("ui", "bitteMindEinenAntragWaehlen")
+        );
         return;
+      }
+
+      // Prepare data object for ajax call
+      let data = {
+        data: selected_data,
+      };
+
+      // Hide genehmigung panel again
+      genehmigung_panel.slideUp("slow");
+
+      FHC_AjaxClient.ajaxCallPost(
+        FHC_JS_DATA_STORAGE_OBJECT.called_path + "/approve",
+        data,
+        {
+          successCallback: function (data, textStatus, jqXHR) {
+            if (FHC_AjaxClient.isError(data)) {
+              // Print error message
+              FHC_DialogLib.alertError(FHC_AjaxClient.getError(data));
+            } else if (FHC_AjaxClient.hasData(data)) {
+              data = FHC_AjaxClient.getData(data);
+
+              var prestudenten = Object.keys(data.prestudenten);
+
+              // Find intersection of selected and in fact updated Anrechnungen (in case server did not approve all).
+              var updatedData = selected_data.filter((x) =>
+                prestudenten.some((prestudent) => x.prestudent_id == prestudent)
+              );
+
+              // Sum up over all anzurechnenden LV-ECTS by Prestudent
+              var sumLvEctsByPrestudent =
+                approveAnrechnung.getSumLvEctsByPreStudent(updatedData);
+
+              // Loop through Prestudenten
+              // key = Prestudent, value = Approved Anrechnungen of Prestudent
+              Object.entries(data.prestudenten).forEach(([key, value]) => {
+                var rowsToDeselect = [];
+
+                // Get accumulated sum of all LV ECTS
+                var sumLvEcts = sumLvEctsByPrestudent.find(
+                  (x) => x.prestudent_id == key
+                );
+
+                // Get ALL rows of that Prestudent
+                var rows = $("#tableWidgetTabulator").tabulator(
+                  "searchRows",
+                  "prestudent_id",
+                  "=",
+                  key
+                );
+
+                // Loop through the rows
+                rows.forEach((row) => {
+                  var updateData = {};
+
+                  // If Anrechnung was approved...
+                  if (
+                    value.findIndex(
+                      (anrechnung_id) =>
+                        row.getData().anrechnung_id == anrechnung_id
+                    ) !== -1
+                  ) {
+                    // ...update status
+                    updateData.status_kurzbz = data.status_kurzbz;
+                    updateData.status_bezeichnung = data.status_bezeichnung;
+
+                    // ...and store row to be deselected later on
+                    rowsToDeselect.push(row);
+                  }
+
+                  // Update 'Bisher schulische ECTS' and 'Bisher berufliche ECTS' with the Sum of new approved ECTS
+                  (updateData.ectsSumSchulisch =
+                    row.getData().ectsSumSchulisch +
+                    sumLvEcts.ectsSumAnzurechnendeLvsSchulisch),
+                    (updateData.ectsSumBeruflich =
+                      row.getData().ectsSumBeruflich +
+                      sumLvEcts.ectsSumAnzurechnendeLvsBeruflich);
+
+                  // Update row
+                  row.update(updateData);
+
+                  // Reformat row
+                  row.reformat();
+                });
+
+                // Deselect rows
+                $("#tableWidgetTabulator").tabulator(
+                  "deselectRow",
+                  rowsToDeselect
+                );
+              });
+
+              // Print success message
+              FHC_DialogLib.alertSuccess(
+                FHC_PhrasesLib.t("ui", "anrechnungenWurdenGenehmigt")
+              );
+            }
+          },
+          errorCallback: function (jqXHR, textStatus, errorThrown) {
+            FHC_DialogLib.alertError(FHC_PhrasesLib.t("ui", "systemfehler"));
+          },
+        }
+      );
+    }
+  );
+
+  // Ask if Reject Anrechnungen
+  $("#approveAnrechnungUebersicht-reject-anrechnungen-ask").click(function () {
+    genehmigung_panel.css("display", "none");
+
+    if (begruendung_panel.is(":hidden")) {
+      // Show begruendung panel if is hidden
+      begruendung_panel.slideDown(400, function () {
+        $("html, body").animate(
+          {
+            scrollTop: begruendung_panel.offset().top, // Move begruendung panel bottom up to be visible within window screen
+          },
+          400
+        );
+      });
+
+      return;
+    }
+  });
+
+  // Reject Anrechnungen
+  $("#approveAnrechnungUebersicht-reject-anrechnungen-confirm").click(function (
+    e
+  ) {
+    // Avoid bubbling click event to sibling break button
+    e.stopImmediatePropagation();
+
+    let begruendung = $("#approveAnrechnungUebersicht-begruendung").val();
+
+    genehmigung_panel.css("display", "none");
+
+    // Check if begruendung is given
+    if (!begruendung.trim()) {
+      // empty or white spaces only
+      FHC_DialogLib.alertInfo(
+        FHC_PhrasesLib.t("ui", "bitteBegruendungAngeben")
+      );
+      return;
     }
 
-    // Redraw table on resize to fit tabulators height to windows height
-    window.addEventListener('resize', function(){
-        $('#tableWidgetTabulator').tabulator('setHeight', $(window).height() * 0.50);
-        $('#tableWidgetTabulator').tabulator('redraw', true);
-    });
-
-    if (hasReadOnlyAccess)
-    {
-        approveAnrechnung.disableEditElements();
-    }
-
-    if (!hasCreateAnrechnungAccess)
-    {
-        approveAnrechnung.disableCreateAnrechnungButton();
-    }
-
-    //! this function should not be needed in the approveAnrechnungUebersicht
-    // Set status alert color
-    approveAnrechnung.setStatusAlertColor();
-
-    // Show only rows that are in progress by STGL
-    $("#show-inProgressDP").click(function(){
-        $('#tableWidgetTabulator').tabulator('setFilter',
-            [
-                {field: 'status_kurzbz', type: '=', value: ANRECHNUNGSTATUS_PROGRESSED_BY_STGL},
-            ]
-        );
-    });
-
-    // Show only rows that are in progress by lector
-    $("#show-inProgressLektor").click(function(){
-        $('#tableWidgetTabulator').tabulator('setFilter',
-            [
-                {field: 'status_kurzbz', type: '=', value: ANRECHNUNGSTATUS_PROGRESSED_BY_LEKTOR},
-                {field: 'empfehlung_anrechnung', type: '=', value: null}
-            ]
-        );
-    });
-
-    // Show only rows with empfohlene + noch nicht genehmigte/abgelehnte anrechnungen
-    $("#show-recommended").click(function(){
-        $('#tableWidgetTabulator').tabulator('setFilter',
-            [
-                {field: 'status_kurzbz', type: '=', value: ANRECHNUNGSTATUS_PROGRESSED_BY_STGL},
-                {field: 'empfehlung_anrechnung', type: '=', value: 'true'}
-            ]
-        );
-    });
-
-    // Show only rows with nicht empfohlene + noch nicht genehmigte/abgelehnte anrechnungen
-    $("#show-not-recommended").click(function(){
-        $('#tableWidgetTabulator').tabulator('setFilter', [
-                {field: 'status_kurzbz', type: '=', value: ANRECHNUNGSTATUS_PROGRESSED_BY_STGL},
-                {field: 'empfehlung_anrechnung', type: '=', value: 'false'},
-            ]
-        );
-    });
-
-    // Show only rows with genehmigte anrechnungen
-    $("#show-approved").click(function(){
-        $('#tableWidgetTabulator').tabulator('setFilter',
-            [
-                {field: 'status_kurzbz', type: '=', value: ANRECHNUNGSTATUS_APPROVED}
-            ]
-        );
-    });
-
-    // Show only rows with abgelehnte anrechnungen
-    $("#show-rejected").click(function(){
-        $('#tableWidgetTabulator').tabulator('setFilter',
-            [
-                {field: 'status_kurzbz', type: '=', value: ANRECHNUNGSTATUS_REJECTED}
-            ]
-        );
-    });
-
-    /**
-     * Show all rows: clear filter and blur button
-     * Bootstrap button remains in activated style, even when clicking various times.
-     * This function "resets" button style and clear all tabulators filter.
-     * NOTE: MUST be after all other filters
-     */
-    $(".btn-clearfilter").click(function(){
-        if($(this).hasClass('active'))
-        {
-            $('#tableWidgetTabulator').tabulator('clearFilter');
-            $(this).blur();
-        }
-    })
-
-    // Ask if Approve Anrechnungen
-    $("#approveAnrechnungUebersicht-approve-anrechnungen-ask").click(function(){
-
-        begruendung_panel.css('display', 'none');
-
-        if (genehmigung_panel.is(":hidden")) 
-        {
-            // Show begruendung panel if is hidden
-            genehmigung_panel.slideDown(400, function() {
-                $('html, body').animate({
-                    scrollTop: genehmigung_panel.offset().top // Move genehmigung panel bottom up to be visible within window screen
-                }, 400);
-            });
-
-            return;
-        }
-    });
-
-    // Approve Anrechnungen
-    $("#approveAnrechnungUebersicht-approve-anrechnungen-confirm").click(function(e){
-
-        // Avoid bubbling click event to sibling break button
-        e.stopImmediatePropagation();
-
-        // Get selected rows data
-        let selected_data = $('#tableWidgetTabulator').tabulator('getSelectedData');
-
-        // Alert and exit if no anrechnung is selected
-        if (selected_data.length == 0)
-        {
-            FHC_DialogLib.alertInfo(FHC_PhrasesLib.t("ui", "bitteMindEinenAntragWaehlen"));
-            return;
-        }
-
-        // Prepare data object for ajax call
-        let data = {
-            'data': selected_data
+    // Get selected rows data
+    let selected_data = $("#tableWidgetTabulator")
+      .tabulator("getSelectedData")
+      .map(function (data) {
+        // reduce to necessary fields
+        return {
+          anrechnung_id: data.anrechnung_id,
+          begruendung: begruendung,
         };
+      });
 
-        // Hide genehmigung panel again
-        genehmigung_panel.slideUp('slow');
+    // Alert and exit if no anrechnung is selected
+    if (selected_data.length == 0) {
+      FHC_DialogLib.alertInfo(
+        FHC_PhrasesLib.t("ui", "bitteMindEinenAntragWaehlen")
+      );
+      return;
+    }
 
-        FHC_AjaxClient.ajaxCallPost(
-            FHC_JS_DATA_STORAGE_OBJECT.called_path + "/approve",
-            data,
-            {
-                successCallback: function (data, textStatus, jqXHR)
-                {
-                    if (FHC_AjaxClient.isError(data))
-                    {
-                        // Print error message
-                        FHC_DialogLib.alertError(FHC_AjaxClient.getError(data));
-                    }
-                    else if (FHC_AjaxClient.hasData(data))
-                    {
-                        data = FHC_AjaxClient.getData(data);
+    // Prepare data object for ajax call
+    let data = {
+      data: selected_data,
+    };
 
-                        var prestudenten = Object.keys(data.prestudenten);
+    // Hide begruendung panel again
+    begruendung_panel.slideUp("slow");
 
-                        // Find intersection of selected and in fact updated Anrechnungen (in case server did not approve all).
-                        var updatedData = selected_data.filter(x => prestudenten.some(prestudent => x.prestudent_id == prestudent));
+    FHC_AjaxClient.ajaxCallPost(
+      FHC_JS_DATA_STORAGE_OBJECT.called_path + "/reject",
+      data,
+      {
+        successCallback: function (data, textStatus, jqXHR) {
+          if (FHC_AjaxClient.isError(data)) {
+            // Print error message
+            FHC_DialogLib.alertError(FHC_AjaxClient.getError(data));
+          } else if (FHC_AjaxClient.hasData(data)) {
+            data = FHC_AjaxClient.getData(data);
 
-                        // Sum up over all anzurechnenden LV-ECTS by Prestudent
-                        var sumLvEctsByPrestudent = approveAnrechnung.getSumLvEctsByPreStudent(updatedData);
+            // Update status 'genehmigt'
+            $("#tableWidgetTabulator").tabulator("updateData", data);
 
-                        // Loop through Prestudenten
-                        // key = Prestudent, value = Approved Anrechnungen of Prestudent
-                        Object.entries(data.prestudenten).forEach(([key, value]) => {
+            // Deselect rows
+            var indexesToDeselect = data.map((x) => x.anrechnung_id);
+            $("#tableWidgetTabulator").tabulator(
+              "deselectRow",
+              indexesToDeselect
+            );
 
-                            var rowsToDeselect = [];
+            // Print success message
+            FHC_DialogLib.alertSuccess(
+              FHC_PhrasesLib.t("ui", "anrechnungenWurdenAbgelehnt")
+            );
+          }
+        },
+        errorCallback: function (jqXHR, textStatus, errorThrown) {
+          FHC_DialogLib.alertError(FHC_PhrasesLib.t("ui", "systemfehler"));
+        },
+      }
+    );
+  });
 
-                            // Get accumulated sum of all LV ECTS
-                            var sumLvEcts = sumLvEctsByPrestudent.find(x => x.prestudent_id == key);
+  // Request Recommendation for Anrechnungen
+  $("#approveAnrechnungUebersicht-request-recommendation").click(function () {
+    // Get selected rows data
+    let selected_data = $("#tableWidgetTabulator").tabulator("getSelectedData");
 
-                            // Get ALL rows of that Prestudent
-                            var rows = $('#tableWidgetTabulator').tabulator('searchRows', 'prestudent_id', '=', key);
+    // If some of selected anrechnungen has already been recommended...
+    if (selected_data.some((data) => data.empfehlung_anrechnung !== null)) {
+      // ...confirm before requesting recommendation
+      if (
+        !confirm(
+          FHC_PhrasesLib.t(
+            "anrechnung",
+            "confirmTextAntragHatBereitsEmpfehlung"
+          )
+        )
+      ) {
+        return;
+      }
+    }
 
-                            // Loop through the rows
-                            rows.forEach(row => {
-                                var updateData = {};
+    // Reduce to necessary fields
+    selected_data = selected_data.map((data) => ({
+      anrechnung_id: data.anrechnung_id,
+    }));
 
-                                // If Anrechnung was approved...
-                                if ((value.findIndex(anrechnung_id => row.getData().anrechnung_id == anrechnung_id)) !== -1)
-                                {
-                                    // ...update status
-                                   updateData.status_kurzbz = data.status_kurzbz;
-                                   updateData.status_bezeichnung = data.status_bezeichnung;
+    // Alert and exit if no anrechnung is selected
+    if (selected_data.length == 0) {
+      FHC_DialogLib.alertInfo(
+        FHC_PhrasesLib.t("ui", "bitteMindEinenAntragWaehlen")
+      );
+      return;
+    }
 
-                                   // ...and store row to be deselected later on
-                                   rowsToDeselect.push(row);
-                                }
+    FHC_AjaxClient.ajaxCallPost(
+      FHC_JS_DATA_STORAGE_OBJECT.called_path + "/requestRecommendation",
+      { data: selected_data },
+      {
+        successCallback: function (data, textStatus, jqXHR) {
+          if (FHC_AjaxClient.isError(data)) {
+            // Print error message
+            FHC_DialogLib.alertError(FHC_AjaxClient.getError(data));
+          } else if (FHC_AjaxClient.hasData(data)) {
+            data = FHC_AjaxClient.getData(data);
 
-                                // Update 'Bisher schulische ECTS' and 'Bisher berufliche ECTS' with the Sum of new approved ECTS
-                                updateData.ectsSumSchulisch = row.getData().ectsSumSchulisch + sumLvEcts.ectsSumAnzurechnendeLvsSchulisch,
-                                updateData.ectsSumBeruflich = row.getData().ectsSumBeruflich + sumLvEcts.ectsSumAnzurechnendeLvsBeruflich
-
-
-                                // Update row
-                                row.update(updateData);
-
-                                // Reformat row
-                                row.reformat();
-
-                            })
-
-                            // Deselect rows
-                            $("#tableWidgetTabulator").tabulator('deselectRow', rowsToDeselect);
-
-                        })
-
-                        // Print success message
-                         FHC_DialogLib.alertSuccess(FHC_PhrasesLib.t("ui", "anrechnungenWurdenGenehmigt"));
-                    }
-                },
-                errorCallback: function (jqXHR, textStatus, errorThrown)
-                {
-                    FHC_DialogLib.alertError(FHC_PhrasesLib.t("ui", "systemfehler"));
-                }
+            // Print info message, if not all selected recommendations were requested
+            if (data.length < selected_data.length) {
+              FHC_DialogLib.alertInfo(
+                FHC_PhrasesLib.t(
+                  "ui",
+                  "empfehlungWurdeAngefordertAusnahmeWoKeineLektoren",
+                  [
+                    selected_data.length,
+                    data.length,
+                    selected_data.length - data.length,
+                  ]
+                )
+              );
+            } else {
+              // Print success message
+              FHC_DialogLib.alertSuccess(
+                FHC_PhrasesLib.t("ui", "empfehlungWurdeAngefordert")
+              );
             }
-        );
-    });
 
-    // Ask if Reject Anrechnungen
-    $("#approveAnrechnungUebersicht-reject-anrechnungen-ask").click(function(){
+            //Update status 'genehmigt'
+            $("#tableWidgetTabulator").tabulator("updateData", data);
 
-        genehmigung_panel.css('display', 'none');
+            // Deselect rows
+            var indexesToDeselect = data.map((x) => x.anrechnung_id);
+            $("#tableWidgetTabulator").tabulator(
+              "deselectRow",
+              indexesToDeselect
+            );
+          }
+        },
+        errorCallback: function (jqXHR, textStatus, errorThrown) {
+          FHC_DialogLib.alertError(FHC_PhrasesLib.t("ui", "systemfehler"));
+        },
+      }
+    );
+  });
 
-        if (begruendung_panel.is(":hidden"))
-        {
-            // Show begruendung panel if is hidden
-            begruendung_panel.slideDown(400, function() {
-                $('html, body').animate({
-                    scrollTop: begruendung_panel.offset().top // Move begruendung panel bottom up to be visible within window screen
-                }, 400);
-            });
+  // Break Genehmigung abgeben
+  $("#approveAnrechnungUebersicht-empfehlung-abbrechen").click(function () {
+    genehmigung_panel.slideUp("slow");
+  });
 
-            return;
-        }
-    });
-
-    // Reject Anrechnungen
-    $("#approveAnrechnungUebersicht-reject-anrechnungen-confirm").click(function(e){
-
-        // Avoid bubbling click event to sibling break button
-        e.stopImmediatePropagation();
-
-        let begruendung = $('#approveAnrechnungUebersicht-begruendung').val();
-
-        genehmigung_panel.css('display', 'none');
-
-        // Check if begruendung is given
-        if (!begruendung.trim()) // empty or white spaces only
-        {
-            FHC_DialogLib.alertInfo(FHC_PhrasesLib.t("ui", "bitteBegruendungAngeben"));
-            return;
-        }
-
-        // Get selected rows data
-        let selected_data = $('#tableWidgetTabulator').tabulator('getSelectedData')
-            .map(function(data){
-                // reduce to necessary fields
-                return {
-                    'anrechnung_id' : data.anrechnung_id,
-                    'begruendung'   : begruendung
-                }
-            });
-
-        // Alert and exit if no anrechnung is selected
-        if (selected_data.length == 0)
-        {
-            FHC_DialogLib.alertInfo(FHC_PhrasesLib.t("ui", "bitteMindEinenAntragWaehlen"));
-            return;
-        }
-
-        // Prepare data object for ajax call
-        let data = {
-            'data': selected_data
-        };
-
-        // Hide begruendung panel again
-        begruendung_panel.slideUp('slow');
-
-        FHC_AjaxClient.ajaxCallPost(
-            FHC_JS_DATA_STORAGE_OBJECT.called_path + "/reject",
-            data,
-            {
-                successCallback: function (data, textStatus, jqXHR)
-                {
-                    if (FHC_AjaxClient.isError(data))
-                    {
-                        // Print error message
-                        FHC_DialogLib.alertError(FHC_AjaxClient.getError(data));
-                    }
-                    else if (FHC_AjaxClient.hasData(data))
-                    {
-                        data = FHC_AjaxClient.getData(data);
-
-                        // Update status 'genehmigt'
-                        $('#tableWidgetTabulator').tabulator('updateData', data);
-
-                        // Deselect rows
-                        var indexesToDeselect = data.map(x => x.anrechnung_id);
-                        $("#tableWidgetTabulator").tabulator('deselectRow', indexesToDeselect);
-
-                        // Print success message
-                        FHC_DialogLib.alertSuccess(FHC_PhrasesLib.t("ui", "anrechnungenWurdenAbgelehnt"));
-                    }
-                },
-                errorCallback: function (jqXHR, textStatus, errorThrown)
-                {
-                    FHC_DialogLib.alertError(FHC_PhrasesLib.t("ui", "systemfehler"));
-                }
-            }
-        );
-    });
-
-    // Request Recommendation for Anrechnungen
-    $("#approveAnrechnungUebersicht-request-recommendation").click(function(){
-
-        // Get selected rows data
-        let selected_data = $('#tableWidgetTabulator').tabulator('getSelectedData');
-
-        // If some of selected anrechnungen has already been recommended...
-        if (selected_data.some((data) => data.empfehlung_anrechnung !== null))
-        {
-            // ...confirm before requesting recommendation
-            if(!confirm(FHC_PhrasesLib.t("anrechnung", "confirmTextAntragHatBereitsEmpfehlung")))
-            {
-                return;
-            }
-        }
-
-        // Reduce to necessary fields
-        selected_data = selected_data.map(data => ({'anrechnung_id' : data.anrechnung_id}));
-
-        // Alert and exit if no anrechnung is selected
-        if (selected_data.length == 0)
-        {
-            FHC_DialogLib.alertInfo(FHC_PhrasesLib.t("ui", "bitteMindEinenAntragWaehlen"));
-            return;
-        }
-
-        FHC_AjaxClient.ajaxCallPost(
-            FHC_JS_DATA_STORAGE_OBJECT.called_path + "/requestRecommendation",
-            {data: selected_data},
-            {
-                successCallback: function (data, textStatus, jqXHR)
-                {
-                    if (FHC_AjaxClient.isError(data))
-                    {
-                        // Print error message
-                        FHC_DialogLib.alertError(FHC_AjaxClient.getError(data));
-                    }
-                    else if (FHC_AjaxClient.hasData(data))
-                    {
-                        data = FHC_AjaxClient.getData(data);
-
-                        // Print info message, if not all selected recommendations were requested
-                        if (data.length < selected_data.length){
-                            FHC_DialogLib.alertInfo(
-                                FHC_PhrasesLib.t(
-                                    "ui", "empfehlungWurdeAngefordertAusnahmeWoKeineLektoren",
-                                    [selected_data.length, data.length, selected_data.length - data.length])
-                            );
-                        }
-                        else
-                        {
-                            // Print success message
-                            FHC_DialogLib.alertSuccess(FHC_PhrasesLib.t("ui", "empfehlungWurdeAngefordert"));
-                        }
-
-                        //Update status 'genehmigt'
-                        $('#tableWidgetTabulator').tabulator('updateData', data);
-
-                        // Deselect rows
-                        var indexesToDeselect = data.map(x => x.anrechnung_id);
-                        $("#tableWidgetTabulator").tabulator('deselectRow', indexesToDeselect);
-                    }
-                },
-                errorCallback: function (jqXHR, textStatus, errorThrown)
-                {
-                    FHC_DialogLib.alertError(FHC_PhrasesLib.t("ui", "systemfehler"));
-                }
-            }
-        );
-    });
-
-    // Break Genehmigung abgeben
-    $('#approveAnrechnungUebersicht-empfehlung-abbrechen').click(function(){
-        genehmigung_panel.slideUp('slow');
-    })
-
-    // Break Ablehnung abgeben
-    $('#approveAnrechnungUebersicht-begruendung-abbrechen').click(function(){
-        begruendung_panel.slideUp('slow');
-    })
-
-    // Copy Begruendung into textarea
-    $(".btn-copyIntoTextarea").click(function(){
-        approveAnrechnung.copyIntoTextarea(this);
-    })
+  // Break Ablehnung abgeben
+  $("#approveAnrechnungUebersicht-begruendung-abbrechen").click(function () {
+    begruendung_panel.slideUp("slow");
+  });
 
+  // Copy Begruendung into textarea
+  $(".btn-copyIntoTextarea").click(function () {
+    approveAnrechnung.copyIntoTextarea(this);
+  });
 });
 
 var approveAnrechnung = {
-    setStatusAlertColor: function () {
-        let status_kurzbz = $('#requestAnrechnung-status_kurzbz').data('status_kurzbz');
+  setStatusAlertColor: function () {
+    let status_kurzbz = $("#requestAnrechnung-status_kurzbz").data(
+      "status_kurzbz"
+    );
 
-        switch (status_kurzbz) {
-            case ANRECHNUNGSTATUS_APPROVED:
-                $('#requestAnrechnung-status_kurzbz').closest('div').addClass('bg-success-subtle');
-                break;
-            case ANRECHNUNGSTATUS_REJECTED:
-                $('#requestAnrechnung-status_kurzbz').closest('div').addClass('bg-danger-subtle');
-                break;
-            case '':
-                $('#requestAnrechnung-status_kurzbz').closest('div').addClass('bg-info-subtle');
-                break;
-            default:
-                $('#requestAnrechnung-status_kurzbz').closest('div').addClass('bg-warning-subtle');
-        }
-    },
-    disableEditElements: function()
-    {
-        // Disable:
-        // ...button Empfehlung anfordern
-        $('#approveAnrechnungUebersicht-request-recommendation')
-            .prop('disabled', true)
-            .attr('title', FHC_PhrasesLib.t("ui", "nurLeseberechtigung"));
-        // ...button Ablehnen
-        $('#approveAnrechnungUebersicht-reject-anrechnungen-ask')
-            .prop('disabled', true)
-            .attr('title', FHC_PhrasesLib.t("ui", "nurLeseberechtigung"));
-        // ...button Genehmigen
-        $('#approveAnrechnungUebersicht-approve-anrechnungen-ask')
-            .prop('disabled', true)
-            .attr('title', FHC_PhrasesLib.t("ui", "nurLeseberechtigung"));
-
-    },
-    disableCreateAnrechnungButton: function()
-    {
-        // Disable button Antrag anlegen
-        $('#approveAnrechnungUebersicht-create-anrechnung')
-            .removeAttr('href')
-            .css({'color': 'grey', 'pointer-events': 'none'}); // property disabled does not work for <a> link
-    },
-    copyIntoTextarea: function(elem){
-
-        // Find closest textarea
-        let textarea = $(elem).closest('div').find('textarea');
-
-        // Copy begruendung into textarea and set focus
-        textarea.val($.trim($(elem).parent().text())).focus();
-    },
-    focusFilterbuttonIfTableStartsWithStoredFilter(filters){
-        switch (filters[0].value) {
-            case ANRECHNUNGSTATUS_PROGRESSED_BY_LEKTOR:
-                $("#show-inProgressLektor").addClass('active');
-                break;
-            case ANRECHNUNGSTATUS_APPROVED:
-                $("#show-approved").addClass('active');
-                break;
-            case ANRECHNUNGSTATUS_REJECTED:
-                $("#show-rejected").addClass('active');
-                break;
-            case ANRECHNUNGSTATUS_PROGRESSED_BY_STGL:
-                if (filters.length > 1)
-                {
-                    if (filters[1].field == 'empfehlung_anrechnung')
-                    {
-                        if (filters[1].value === 'true')
-                        {
-                            $("#show-recommended").addClass('active');
-                        }
-                        else
-                        {
-                            $("#show-not-recommended").addClass('active');
-                        }
-                    }
-                }
-                else
-                {
-                    $("#show-inProgressDP").addClass('active');
-                }
-
-                break;
-
-        }
-    },
-    getSumLvEctsByPreStudent(data){
-
-        var result = [];
-
-        // Berechne für jeden Prestudenten die kumulierte Summe aller selektierten LV ECTS
-        data.reduce((prev, curr) => {
-
-            if (!prev[curr.prestudent_id])
-            {
-                prev[curr.prestudent_id] = {
-                    prestudent_id: curr.prestudent_id,
-                    ectsSumAnzurechnendeLvsSchulisch: 0,
-                    ectsSumAnzurechnendeLvsBeruflich: 0
-                };
-
-                result.push(prev[curr.prestudent_id])
-            }
-
-            // Kumulierte Summe aller selektierten LVs, die angerechnet werden sollen, getrennt nach
-            // schulischer und beruflicher Qualifikation.
-            // Ausgenommen ist die universitäre Qualifikation (5), da diese unbegrenzt möglich sind.
-            if (curr.begruendung_id != 5)
-            {
-                if (curr.begruendung_id == 4)
-                {
-                    prev[curr.prestudent_id].ectsSumAnzurechnendeLvsBeruflich += curr.ects;
-                }
-                else
-                {
-                    prev[curr.prestudent_id].ectsSumAnzurechnendeLvsSchulisch += curr.ects;
-                }
-            }
-
-            return prev;
-
-        }, {});
-
-        return result;
-    },
-    showNumberSelectedRows(rows){
-        $('#number-selected').html("Ausgewählte Zeilen: <strong>" + rows.length + "</strong>");
+    switch (status_kurzbz) {
+      case ANRECHNUNGSTATUS_APPROVED:
+        $("#requestAnrechnung-status_kurzbz")
+          .closest("div")
+          .addClass("bg-success-subtle");
+        break;
+      case ANRECHNUNGSTATUS_REJECTED:
+        $("#requestAnrechnung-status_kurzbz")
+          .closest("div")
+          .addClass("bg-danger-subtle");
+        break;
+      case "":
+        $("#requestAnrechnung-status_kurzbz")
+          .closest("div")
+          .addClass("bg-info-subtle");
+        break;
+      default:
+        $("#requestAnrechnung-status_kurzbz")
+          .closest("div")
+          .addClass("bg-warning-subtle");
     }
-}
+  },
+  disableEditElements: function () {
+    // Disable:
+    // ...button Empfehlung anfordern
+    $("#approveAnrechnungUebersicht-request-recommendation")
+      .prop("disabled", true)
+      .attr("title", FHC_PhrasesLib.t("ui", "nurLeseberechtigung"));
+    // ...button Ablehnen
+    $("#approveAnrechnungUebersicht-reject-anrechnungen-ask")
+      .prop("disabled", true)
+      .attr("title", FHC_PhrasesLib.t("ui", "nurLeseberechtigung"));
+    // ...button Genehmigen
+    $("#approveAnrechnungUebersicht-approve-anrechnungen-ask")
+      .prop("disabled", true)
+      .attr("title", FHC_PhrasesLib.t("ui", "nurLeseberechtigung"));
+  },
+  disableCreateAnrechnungButton: function () {
+    // Disable button Antrag anlegen
+    $("#approveAnrechnungUebersicht-create-anrechnung")
+      .removeAttr("href")
+      .css({ color: "grey", "pointer-events": "none" }); // property disabled does not work for <a> link
+  },
+  copyIntoTextarea: function (elem) {
+    // Find closest textarea
+    let textarea = $(elem).closest("div").find("textarea");
+
+    // Copy begruendung into textarea and set focus
+    textarea.val($.trim($(elem).parent().text())).focus();
+  },
+  focusFilterbuttonIfTableStartsWithStoredFilter(filters) {
+    switch (filters[0].value) {
+      case ANRECHNUNGSTATUS_PROGRESSED_BY_LEKTOR:
+        $("#show-inProgressLektor").addClass("active");
+        break;
+      case ANRECHNUNGSTATUS_APPROVED:
+        $("#show-approved").addClass("active");
+        break;
+      case ANRECHNUNGSTATUS_REJECTED:
+        $("#show-rejected").addClass("active");
+        break;
+      case ANRECHNUNGSTATUS_PROGRESSED_BY_STGL:
+        if (filters.length > 1) {
+          if (filters[1].field == "empfehlung_anrechnung") {
+            if (filters[1].value === "true") {
+              $("#show-recommended").addClass("active");
+            } else {
+              $("#show-not-recommended").addClass("active");
+            }
+          }
+        } else {
+          $("#show-inProgressDP").addClass("active");
+        }
+
+        break;
+    }
+  },
+  getSumLvEctsByPreStudent(data) {
+    var result = [];
+
+    // Berechne für jeden Prestudenten die kumulierte Summe aller selektierten LV ECTS
+    data.reduce((prev, curr) => {
+      if (!prev[curr.prestudent_id]) {
+        prev[curr.prestudent_id] = {
+          prestudent_id: curr.prestudent_id,
+          ectsSumAnzurechnendeLvsSchulisch: 0,
+          ectsSumAnzurechnendeLvsBeruflich: 0,
+        };
+
+        result.push(prev[curr.prestudent_id]);
+      }
+
+      // Kumulierte Summe aller selektierten LVs, die angerechnet werden sollen, getrennt nach
+      // schulischer und beruflicher Qualifikation.
+      // Ausgenommen ist die universitäre Qualifikation (5), da diese unbegrenzt möglich sind.
+      if (curr.begruendung_id != 5) {
+        if (curr.begruendung_id == 4) {
+          prev[curr.prestudent_id].ectsSumAnzurechnendeLvsBeruflich +=
+            curr.ects;
+        } else {
+          prev[curr.prestudent_id].ectsSumAnzurechnendeLvsSchulisch +=
+            curr.ects;
+        }
+      }
+
+      return prev;
+    }, {});
+
+    return result;
+  },
+  showNumberSelectedRows(rows) {
+    $("#number-selected").html(
+      "Ausgewählte Zeilen: <strong>" + rows.length + "</strong>"
+    );
+  },
+};
diff --git a/public/js/lehre/anrechnung/reviewAnrechnungUebersicht.js b/public/js/lehre/anrechnung/reviewAnrechnungUebersicht.js
index ff6ae5839..4a89dfdd1 100644
--- a/public/js/lehre/anrechnung/reviewAnrechnungUebersicht.js
+++ b/public/js/lehre/anrechnung/reviewAnrechnungUebersicht.js
@@ -1,13 +1,14 @@
-const BASE_URL = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
+const BASE_URL =
+  FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
 const CALLED_PATH = FHC_JS_DATA_STORAGE_OBJECT.called_path;
-const CONTROLLER_URL = BASE_URL + '/' + CALLED_PATH;
+const CONTROLLER_URL = BASE_URL + "/" + CALLED_PATH;
 const APPROVE_ANRECHNUNG_DETAIL_URI = "lehre/anrechnung/ReviewAnrechnungDetail";
 
-const ANRECHNUNGSTATUS_PROGRESSED_BY_STGL = 'inProgressDP';
-const ANRECHNUNGSTATUS_PROGRESSED_BY_KF = 'inProgressKF';
-const ANRECHNUNGSTATUS_PROGRESSED_BY_LEKTOR = 'inProgressLektor';
-const ANRECHNUNGSTATUS_APPROVED = 'approved';
-const ANRECHNUNGSTATUS_REJECTED = 'rejected';
+const ANRECHNUNGSTATUS_PROGRESSED_BY_STGL = "inProgressDP";
+const ANRECHNUNGSTATUS_PROGRESSED_BY_KF = "inProgressKF";
+const ANRECHNUNGSTATUS_PROGRESSED_BY_LEKTOR = "inProgressLektor";
+const ANRECHNUNGSTATUS_APPROVED = "approved";
+const ANRECHNUNGSTATUS_REJECTED = "rejected";
 
 const COLOR_LIGHTGREY = "#f5f5f5";
 
@@ -17,134 +18,152 @@ const COLOR_LIGHTGREY = "#f5f5f5";
 
 // Converts string date postgre style to string DD.MM.YYYY.
 // This will allow correct filtering.
-var mut_formatStringDate = function(value, data, type, params, component) {
-    if (value != null)
-    {
-        var d = new Date(value);
-        return ("0" + (d.getDate())).slice(-2)  + "." + ("0" + (d.getMonth() + 1)).slice(-2) + "." + d.getFullYear();
-    }
-}
+var mut_formatStringDate = function (value, data, type, params, component) {
+  if (value != null) {
+    var d = new Date(value);
+    return (
+      ("0" + d.getDate()).slice(-2) +
+      "." +
+      ("0" + (d.getMonth() + 1)).slice(-2) +
+      "." +
+      d.getFullYear()
+    );
+  }
+};
 
 // TABULATOR FUNCTIONS
 // ---------------------------------------------------------------------------------------------------------------------
 // Returns relative height (depending on screen size)
-function func_height(table){
-    return $(window).height() * 0.50;
+function func_height(table) {
+  return $(window).height() * 0.5;
 }
 
 // Filters boolean values
-function hf_filterTrueFalse(headerValue, rowValue){
+function hf_filterTrueFalse(headerValue, rowValue) {
+  if ("ja".startsWith(headerValue) || "yes".startsWith(headerValue)) {
+    return rowValue == "true";
+  }
 
-    if ('ja'.startsWith(headerValue) || 'yes'.startsWith(headerValue))
-    {
-        return rowValue == 'true';
-    }
+  if ("nein".startsWith(headerValue) || "no".startsWith(headerValue)) {
+    return rowValue == "false";
+  }
 
-    if ('nein'.startsWith(headerValue) || 'no'.startsWith(headerValue))
-    {
-        return rowValue == 'false';
-    }
-
-    if (headerValue = '-')
-    {
-        return rowValue == null;
-    }
+  if ((headerValue = "-")) {
+    return rowValue == null;
+  }
 }
 
 // Filters empfehlungsberechtigt boolean values
-function hf_empfehlungsberechtigt(headerValue, rowValue){
-
-    return rowValue == headerValue.toString();
+function hf_empfehlungsberechtigt(headerValue, rowValue) {
+  return rowValue == headerValue.toString();
 }
 
 // Adds column details
 function func_tableBuilt(table) {
-    table.tabulator("addColumn",
-        {
-            title: "Details",
-            field: 'details',
-            align: "center",
-            width: 100,
-            formatter: "link",
-            formatterParams:{
-                label:"Details",
-                url:function(cell){
-                    return  BASE_URL + "/" + APPROVE_ANRECHNUNG_DETAIL_URI + "?anrechnung_id=" + cell.getData().anrechnung_id
-                },
-                target:"_blank"
-            }
-        }, true  // place column on the very left
-    );
+  table.tabulator(
+    "addColumn",
+    {
+      title: "Details",
+      field: "details",
+      align: "center",
+      width: 100,
+      formatter: "link",
+      formatterParams: {
+        label: "Details",
+        url: function (cell) {
+          return (
+            BASE_URL +
+            "/" +
+            APPROVE_ANRECHNUNG_DETAIL_URI +
+            "?anrechnung_id=" +
+            cell.getData().anrechnung_id
+          );
+        },
+        target: "_blank",
+      },
+    },
+    true // place column on the very left
+  );
+  // fully redrawing the table after adding the Details column
+  table.tabulator("redraw", true);
 }
 
 // Formats the rows
-function func_rowFormatter(row){
-    let status_kurzbz = row.getData().status_kurzbz;
-    let empfehlungsberechtigt = row.getData().empfehlungsberechtigt;
+function func_rowFormatter(row) {
+  let status_kurzbz = row.getData().status_kurzbz;
+  let empfehlungsberechtigt = row.getData().empfehlungsberechtigt;
 
-    row.getCells().forEach(function(cell){
-        if (status_kurzbz != ANRECHNUNGSTATUS_PROGRESSED_BY_LEKTOR || empfehlungsberechtigt == "false")
-        {
-            row.getElement().style["background-color"] = COLOR_LIGHTGREY;   // default
-        }
-    });
+  row.getCells().forEach(function (cell) {
+    if (
+      status_kurzbz != ANRECHNUNGSTATUS_PROGRESSED_BY_LEKTOR ||
+      empfehlungsberechtigt == "false"
+    ) {
+      row.getElement().style["background-color"] = COLOR_LIGHTGREY; // default
+    }
+  });
 }
 
 // Formats row selectable/unselectable
-function func_selectableCheck(row){
-    let status_kurzbz = row.getData().status_kurzbz;
-    let empfehlungsberechtigt = row.getData().empfehlungsberechtigt;
+function func_selectableCheck(row) {
+  let status_kurzbz = row.getData().status_kurzbz;
+  let empfehlungsberechtigt = row.getData().empfehlungsberechtigt;
 
-    return (
-        status_kurzbz == ANRECHNUNGSTATUS_PROGRESSED_BY_LEKTOR || empfehlungsberechtigt == "false"
-    );
+  return (
+    status_kurzbz == ANRECHNUNGSTATUS_PROGRESSED_BY_LEKTOR ||
+    empfehlungsberechtigt == "false"
+  );
 }
 
 // Performes after row was updated
-function func_rowUpdated(row){
-    // Refresh row formatters
-    row.reformat();
+function func_rowUpdated(row) {
+  // Refresh row formatters
+  row.reformat();
 
-    // Deselect and disable new selection of updated rows
-    row.deselect();
-    row.getElement().style["pointerEvents"] = "none";
+  // Deselect and disable new selection of updated rows
+  row.deselect();
+  row.getElement().style["pointerEvents"] = "none";
 
-    // ...but leave url links selectable
-    row.getCell('dokument_bezeichnung').getElement().firstChild.style["pointerEvents"] = "auto";
-    row.getCell('details').getElement().firstChild.style["pointerEvents"] = "auto";
+  // ...but leave url links selectable
+  row.getCell("dokument_bezeichnung").getElement().firstChild.style[
+    "pointerEvents"
+  ] = "auto";
+  if (row.getCell("detils")) {
+    row.getCell("details").getElement().firstChild.style["pointerEvents"] =
+      "auto";
+  }
 }
 
 // Returns tooltip
-function func_tooltips(e, cell, onRendered){
-    //e - mouseover event
-    //cell - cell component
-    //onRendered - onRendered callback registration functionfunction
-    
-    // Return tooltip if row is unselectable
-    if (!func_selectableCheck(cell.getRow())){
-        return FHC_PhrasesLib.t("ui", "nichtSelektierbarAufgrundVon") + 'Status';
-    }
+function func_tooltips(e, cell, onRendered) {
+  //e - mouseover event
+  //cell - cell component
+  //onRendered - onRendered callback registration functionfunction
+
+  // Return tooltip if row is unselectable
+  if (!func_selectableCheck(cell.getRow())) {
+    return FHC_PhrasesLib.t("ui", "nichtSelektierbarAufgrundVon") + "Status";
+  }
 }
 
 // Formats empfehlung_anrechnung
-var format_empfehlung_anrechnung = function(cell, formatterParams){
-    return (cell.getValue() == null)
-        ? '-'
-        : (cell.getValue() ==  'true')
-            ? FHC_PhrasesLib.t("ui", "ja")
-            : FHC_PhrasesLib.t("ui", "nein");
-}
+var format_empfehlung_anrechnung = function (cell, formatterParams) {
+  return cell.getValue() == null
+    ? "-"
+    : cell.getValue() == "true"
+    ? FHC_PhrasesLib.t("ui", "ja")
+    : FHC_PhrasesLib.t("ui", "nein");
+};
 
 /**
  * Returns formatter params for field dokument_bezeichnung (= Spalte Nachweisdokumente)
  * NOTE: Returning a formatter param object fixes the problem, that tabulator did not know the url after refreshing the page.
  */
-function paramLookup_dokBez(cell){
-    return {
-        labelField: 'dokument_bezeichnung',
-        url: CONTROLLER_URL + '/download?dms_id=' + cell.getData().dms_id,
-        target: '_blank'
-    }
+function paramLookup_dokBez(cell) {
+  return {
+    labelField: "dokument_bezeichnung",
+    url: CONTROLLER_URL + "/download?dms_id=" + cell.getData().dms_id,
+    target: "_blank",
+  };
 }
 
 /*
@@ -152,319 +171,338 @@ function paramLookup_dokBez(cell){
  * Select all (filtered) rows that are progressed by stg leiter.
  * (Ignore rows that are approved, rejected or in request for recommendation)
  */
-function tableWidgetHook_selectAllButton(tableWidgetDiv){
-    
-    var resultRows = tableWidgetDiv.find("#tableWidgetTabulator").tabulator('getRows', true)
-        .filter(row =>
-            row.getData().status_kurzbz == ANRECHNUNGSTATUS_PROGRESSED_BY_LEKTOR
-        );
+function tableWidgetHook_selectAllButton(tableWidgetDiv) {
+  var resultRows = tableWidgetDiv
+    .find("#tableWidgetTabulator")
+    .tabulator("getRows", true)
+    .filter(
+      (row) =>
+        row.getData().status_kurzbz == ANRECHNUNGSTATUS_PROGRESSED_BY_LEKTOR
+    );
 
-    tableWidgetDiv.find("#tableWidgetTabulator").tabulator('selectRow', resultRows);
+  tableWidgetDiv
+    .find("#tableWidgetTabulator")
+    .tabulator("selectRow", resultRows);
 }
 
+$(function () {
+  const empfehlung_panel = $("#reviewAnrechnungUebersicht-empfehlung-panel");
+  const begruendung_panel = $("#reviewAnrechnungUebersicht-begruendung-panel");
 
-$(function(){
+  // Pruefen ob Promise unterstuetzt wird
+  // Tabulator funktioniert nicht mit IE
+  var canPromise = !!window.Promise;
+  if (!canPromise) {
+    alert(
+      "Diese Seite kann mit ihrem Browser nicht angezeigt werden. Bitte verwenden Sie Firefox, Chrome oder Edge um die Seite anzuzeigen"
+    );
+    window.location.href = "about:blank";
+    return;
+  }
 
-    const empfehlung_panel = $('#reviewAnrechnungUebersicht-empfehlung-panel');
-    const begruendung_panel = $('#reviewAnrechnungUebersicht-begruendung-panel');
+  $(document).on("tableInit", function (event, tabulatorInstance) {
+    func_tableBuilt($("#tableWidgetTabulator"));
 
-    // Pruefen ob Promise unterstuetzt wird
-    // Tabulator funktioniert nicht mit IE
-    var canPromise = !! window.Promise;
-    if(!canPromise)
-    {
-        alert("Diese Seite kann mit ihrem Browser nicht angezeigt werden. Bitte verwenden Sie Firefox, Chrome oder Edge um die Seite anzuzeigen");
-        window.location.href='about:blank';
-        return;
+    // event rowUpdated needs to be attached as a callback to the tableBuilt event in tabulator5
+    $("#tableWidgetTabulator").tabulator("on", "rowUpdated", (row) => {
+      func_rowUpdated(row);
+    });
+  });
+
+  // Redraw table on resize to fit tabulators height to windows height
+  window.addEventListener("resize", function () {
+    $("#tableWidgetTabulator").tabulator("setHeight", $(window).height() * 0.5);
+    $("#tableWidgetTabulator").tabulator("redraw", true);
+  });
+
+  // Set status alert color
+  reviewAnrechnung.setStatusAlertColor();
+
+  // Show only rows with anrechnungen ohne Empfehlung
+  $("#show-need-recommendation").click(function () {
+    $("#tableWidgetTabulator").tabulator("setFilter", [
+      {
+        field: "status_kurzbz",
+        type: "=",
+        value: ANRECHNUNGSTATUS_PROGRESSED_BY_LEKTOR,
+      },
+    ]);
+  });
+
+  // Show only rows with empfohlene + noch nicht genehmigte/abgelehnte anrechnungen
+  $("#show-recommended").click(function () {
+    $("#tableWidgetTabulator").tabulator("setFilter", [
+      {
+        field: "status_kurzbz",
+        type: "=",
+        value: ANRECHNUNGSTATUS_PROGRESSED_BY_STGL,
+      },
+      { field: "empfehlung_anrechnung", type: "=", value: "true" },
+    ]);
+  });
+
+  // Show only rows with nicht empfohlene + noch nicht genehmigte/abgelehnte anrechnungen
+  $("#show-not-recommended").click(function () {
+    $("#tableWidgetTabulator").tabulator("setFilter", [
+      {
+        field: "status_kurzbz",
+        type: "=",
+        value: ANRECHNUNGSTATUS_PROGRESSED_BY_STGL,
+      },
+      { field: "empfehlung_anrechnung", type: "=", value: "false" },
+    ]);
+  });
+
+  // Show only rows with genehmigte anrechnungen
+  $("#show-approved").click(function () {
+    $("#tableWidgetTabulator").tabulator("setFilter", [
+      { field: "status_kurzbz", type: "=", value: ANRECHNUNGSTATUS_APPROVED },
+    ]);
+  });
+
+  // Show only rows with abgelehnte anrechnungen
+  $("#show-rejected").click(function () {
+    $("#tableWidgetTabulator").tabulator("setFilter", [
+      { field: "status_kurzbz", type: "=", value: ANRECHNUNGSTATUS_REJECTED },
+    ]);
+  });
+
+  /**
+   * Show all rows: clear filter and blur button
+   * Bootstrap button remains in activated style, even when clicking various times.
+   * This function "resets" button style and clear all tabulators filter.
+   * NOTE: MUST be after all other filters
+   */
+  $(".btn-clearfilter").click(function () {
+    if ($(this).hasClass("active")) {
+      $("#tableWidgetTabulator").tabulator("clearFilter");
+      $(this).blur();
     }
+  });
 
+  // Ask ifRecommend Anrechnungen
+  $("#reviewAnrechnungUebersicht-recommend-anrechnungen-ask").click(
+    function () {
+      begruendung_panel.css("display", "none");
 
-    $(document).on("tableInit", function(event,tabulatorInstance) {
-     
-        func_tableBuilt($("#tableWidgetTabulator"))
-
-        // event rowUpdated needs to be attached as a callback to the tableBuilt event in tabulator5
-        $("#tableWidgetTabulator").tabulator("on","rowUpdated",(row)=>{func_rowUpdated(row)})
-       
-    });
-
-    // Redraw table on resize to fit tabulators height to windows height
-    window.addEventListener('resize', function(){
-        $('#tableWidgetTabulator').tabulator('setHeight', $(window).height() * 0.50);
-        $('#tableWidgetTabulator').tabulator('redraw', true);
-    });
-
-    // Set status alert color
-    reviewAnrechnung.setStatusAlertColor();
-
-    // Show only rows with anrechnungen ohne Empfehlung
-    $("#show-need-recommendation").click(function(){
-        $('#tableWidgetTabulator').tabulator('setFilter',
-            [
-                {field: 'status_kurzbz', type: '=', value: ANRECHNUNGSTATUS_PROGRESSED_BY_LEKTOR}
-            ]
-        );
-    });
-
-    // Show only rows with empfohlene + noch nicht genehmigte/abgelehnte anrechnungen
-    $("#show-recommended").click(function(){
-        $('#tableWidgetTabulator').tabulator('setFilter',
-            [
-                {field: 'status_kurzbz', type: '=', value: ANRECHNUNGSTATUS_PROGRESSED_BY_STGL},
-                {field: 'empfehlung_anrechnung', type: '=', value: 'true'}
-            ]
-        );
-    });
-
-    // Show only rows with nicht empfohlene + noch nicht genehmigte/abgelehnte anrechnungen
-    $("#show-not-recommended").click(function(){
-        $('#tableWidgetTabulator').tabulator('setFilter', [
-                {field: 'status_kurzbz', type: '=', value: ANRECHNUNGSTATUS_PROGRESSED_BY_STGL},
-                {field: 'empfehlung_anrechnung', type: '=', value: 'false'},
-            ]
-        );
-    });
-
-    // Show only rows with genehmigte anrechnungen
-    $("#show-approved").click(function(){
-        $('#tableWidgetTabulator').tabulator('setFilter',
-            [
-                {field: 'status_kurzbz', type: '=', value: ANRECHNUNGSTATUS_APPROVED}
-            ]
-        );
-    });
-
-    // Show only rows with abgelehnte anrechnungen
-    $("#show-rejected").click(function(){
-        $('#tableWidgetTabulator').tabulator('setFilter',
-            [
-                {field: 'status_kurzbz', type: '=', value: ANRECHNUNGSTATUS_REJECTED}
-            ]
-        );
-    });
-
-    /**
-     * Show all rows: clear filter and blur button
-     * Bootstrap button remains in activated style, even when clicking various times.
-     * This function "resets" button style and clear all tabulators filter.
-     * NOTE: MUST be after all other filters
-     */
-    $(".btn-clearfilter").click(function(){
-        if($(this).hasClass('active'))
-        {
-            $('#tableWidgetTabulator').tabulator('clearFilter');
-            $(this).blur();
-        }
-    })
-
-    // Ask ifRecommend Anrechnungen
-    $("#reviewAnrechnungUebersicht-recommend-anrechnungen-ask").click(function(){
-
-        begruendung_panel.css('display', 'none');
-
-        if (empfehlung_panel.is(":hidden"))
-        {
-            // Show begruendung panel if is hidden
-            empfehlung_panel.slideDown(400, function() {
-                $('html, body').animate({
-                    scrollTop: empfehlung_panel.offset().top // Move empfehlung panel bottom up to be visible within window screen
-                }, 400);
-            });
-            return;
-        }
-    });
-
-    // Recommend Anrechnungen
-    $("#reviewAnrechnungUebersicht-recommend-anrechnungen-confirm").click(function(e){
-
-        // Avoid bubbling click event to sibling break button
-        e.stopImmediatePropagation();
-
-        // Get selected rows data
-        let selected_data = $('#tableWidgetTabulator').tabulator('getSelectedData')
-            .map(function(data){
-                // reduce to necessary fields
-                return {
-                    'anrechnung_id' : data.anrechnung_id,
-                }
-            });
-
-        // Alert and exit if no anrechnung is selected
-        if (selected_data.length == 0)
-        {
-            FHC_DialogLib.alertInfo(FHC_PhrasesLib.t("ui", "bitteMindEinenAntragWaehlen"));
-            return;
-        }
-
-
-        // Prepare data object for ajax call
-        let data = {
-            'data': selected_data
-        };
-
-        // Hide empfehlung panel again
-        empfehlung_panel.slideUp('slow');
-
-        FHC_AjaxClient.ajaxCallPost(
-            FHC_JS_DATA_STORAGE_OBJECT.called_path + "/recommend",
-            data,
+      if (empfehlung_panel.is(":hidden")) {
+        // Show begruendung panel if is hidden
+        empfehlung_panel.slideDown(400, function () {
+          $("html, body").animate(
             {
-                successCallback: function (data, textStatus, jqXHR)
-                {
-                    if (data.error && data.retval != null)
-                    {
-                        // Print error message
-                        FHC_DialogLib.alertWarning(data.retval);
-                    }
+              scrollTop: empfehlung_panel.offset().top, // Move empfehlung panel bottom up to be visible within window screen
+            },
+            400
+          );
+        });
+        return;
+      }
+    }
+  );
 
-                    if (!data.error && data.retval != null)
-                    {
-                        // Update status 'genehmigt'
-                        $('#tableWidgetTabulator').tabulator('updateData', data.retval);
+  // Recommend Anrechnungen
+  $("#reviewAnrechnungUebersicht-recommend-anrechnungen-confirm").click(
+    function (e) {
+      // Avoid bubbling click event to sibling break button
+      e.stopImmediatePropagation();
 
-                        // Print success message
-                        FHC_DialogLib.alertSuccess(FHC_PhrasesLib.t("ui", "anrechnungenWurdenEmpfohlen"));
-                    }
-                },
-                errorCallback: function (jqXHR, textStatus, errorThrown)
-                {
-                    FHC_DialogLib.alertError(FHC_PhrasesLib.t("ui", "systemfehler"));
-                }
-            }
+      // Get selected rows data
+      let selected_data = $("#tableWidgetTabulator")
+        .tabulator("getSelectedData")
+        .map(function (data) {
+          // reduce to necessary fields
+          return {
+            anrechnung_id: data.anrechnung_id,
+          };
+        });
+
+      // Alert and exit if no anrechnung is selected
+      if (selected_data.length == 0) {
+        FHC_DialogLib.alertInfo(
+          FHC_PhrasesLib.t("ui", "bitteMindEinenAntragWaehlen")
         );
-    });
+        return;
+      }
 
-    // Ask if Dont recommend Anrechnungen
-    $("#reviewAnrechnungUebersicht-dont-recommend-anrechnungen-ask").click(function(){
+      // Prepare data object for ajax call
+      let data = {
+        data: selected_data,
+      };
 
-        empfehlung_panel.css('display', 'none');
+      // Hide empfehlung panel again
+      empfehlung_panel.slideUp("slow");
 
-        if (begruendung_panel.is(":hidden"))
+      FHC_AjaxClient.ajaxCallPost(
+        FHC_JS_DATA_STORAGE_OBJECT.called_path + "/recommend",
+        data,
         {
-            // Show begruendung panel if is hidden
-            begruendung_panel.slideDown(400, function() {
-                $('html, body').animate({
-                    scrollTop: begruendung_panel.offset().top // Move genehmigung panel bottom up to be visible within window screen
-                }, 400);
-            });
-            return;
+          successCallback: function (data, textStatus, jqXHR) {
+            if (data.error && data.retval != null) {
+              // Print error message
+              FHC_DialogLib.alertWarning(data.retval);
+            }
+
+            if (!data.error && data.retval != null) {
+              // Update status 'genehmigt'
+              $("#tableWidgetTabulator").tabulator("updateData", data.retval);
+
+              // Print success message
+              FHC_DialogLib.alertSuccess(
+                FHC_PhrasesLib.t("ui", "anrechnungenWurdenEmpfohlen")
+              );
+            }
+          },
+          errorCallback: function (jqXHR, textStatus, errorThrown) {
+            FHC_DialogLib.alertError(FHC_PhrasesLib.t("ui", "systemfehler"));
+          },
         }
-    });
+      );
+    }
+  );
 
-    // Dont recommend Anrechnungen
-    $("#reviewAnrechnungUebersicht-dont-recommend-anrechnungen-confirm").click(function(e){
+  // Ask if Dont recommend Anrechnungen
+  $("#reviewAnrechnungUebersicht-dont-recommend-anrechnungen-ask").click(
+    function () {
+      empfehlung_panel.css("display", "none");
 
-        // Avoid bubbling click event to sibling break button
-        e.stopImmediatePropagation();
-
-        let begruendung = $('#reviewAnrechnungUebersicht-begruendung').val();
-
-        empfehlung_panel.css('display', 'none');
-
-        // Check if begruendung is given
-        if (!begruendung.trim()) // empty or white spaces only
-        {
-            FHC_DialogLib.alertInfo(FHC_PhrasesLib.t("ui", "bitteBegruendungAngeben"));
-            return;
-        }
-
-        // Get selected rows data and add begruendung
-        let selected_data = $('#tableWidgetTabulator').tabulator('getSelectedData')
-            .map(function(data){
-                // reduce to necessary fields
-                return {
-                    'anrechnung_id' : data.anrechnung_id,
-                    'begruendung'   : begruendung
-                }
-            });
-
-        // Alert and exit if no anrechnung is selected
-        if (selected_data.length == 0)
-        {
-            FHC_DialogLib.alertInfo(FHC_PhrasesLib.t("ui", "bitteMindEinenAntragWaehlen"));
-            return;
-        }
-
-        // Prepare data object for ajax call
-        let data = {
-            'data': selected_data
-        };
-
-        // Hide begruendung panel again
-        begruendung_panel.slideUp('slow');
-
-        FHC_AjaxClient.ajaxCallPost(
-            FHC_JS_DATA_STORAGE_OBJECT.called_path + "/dontRecommend",
-            data,
+      if (begruendung_panel.is(":hidden")) {
+        // Show begruendung panel if is hidden
+        begruendung_panel.slideDown(400, function () {
+          $("html, body").animate(
             {
-                successCallback: function (data, textStatus, jqXHR)
-                {
-                    if (data.error && data.retval != null)
-                    {
-                        // Print error message
-                        FHC_DialogLib.alertWarning(data.retval);
-                    }
+              scrollTop: begruendung_panel.offset().top, // Move genehmigung panel bottom up to be visible within window screen
+            },
+            400
+          );
+        });
+        return;
+      }
+    }
+  );
 
-                    if (!data.error && data.retval != null)
-                    {
-                        // Update status 'genehmigt'
-                        $('#tableWidgetTabulator').tabulator('updateData', data.retval);
+  // Dont recommend Anrechnungen
+  $("#reviewAnrechnungUebersicht-dont-recommend-anrechnungen-confirm").click(
+    function (e) {
+      // Avoid bubbling click event to sibling break button
+      e.stopImmediatePropagation();
 
-                        // Print success message
-                        FHC_DialogLib.alertSuccess(FHC_PhrasesLib.t("ui", "anrechnungenWurdenNichtEmpfohlen"));
-                    }
-                },
-                errorCallback: function (jqXHR, textStatus, errorThrown)
-                {
-                    FHC_DialogLib.alertError(FHC_PhrasesLib.t("ui", "systemfehler"));
-                }
-            }
+      let begruendung = $("#reviewAnrechnungUebersicht-begruendung").val();
+
+      empfehlung_panel.css("display", "none");
+
+      // Check if begruendung is given
+      if (!begruendung.trim()) {
+        // empty or white spaces only
+        FHC_DialogLib.alertInfo(
+          FHC_PhrasesLib.t("ui", "bitteBegruendungAngeben")
         );
-    });
+        return;
+      }
 
-    // Break Empfehlung abgeben
-    $('#reviewAnrechnungUebersicht-empfehlung-abbrechen').click(function(){
-        empfehlung_panel.slideUp('slow');
+      // Get selected rows data and add begruendung
+      let selected_data = $("#tableWidgetTabulator")
+        .tabulator("getSelectedData")
+        .map(function (data) {
+          // reduce to necessary fields
+          return {
+            anrechnung_id: data.anrechnung_id,
+            begruendung: begruendung,
+          };
+        });
 
-    })
+      // Alert and exit if no anrechnung is selected
+      if (selected_data.length == 0) {
+        FHC_DialogLib.alertInfo(
+          FHC_PhrasesLib.t("ui", "bitteMindEinenAntragWaehlen")
+        );
+        return;
+      }
 
-    // Break Begruendung abgeben
-    $('#reviewAnrechnungUebersicht-begruendung-abbrechen').click(function(){
+      // Prepare data object for ajax call
+      let data = {
+        data: selected_data,
+      };
 
-        begruendung_panel.slideUp('slow');
+      // Hide begruendung panel again
+      begruendung_panel.slideUp("slow");
 
-    })
+      FHC_AjaxClient.ajaxCallPost(
+        FHC_JS_DATA_STORAGE_OBJECT.called_path + "/dontRecommend",
+        data,
+        {
+          successCallback: function (data, textStatus, jqXHR) {
+            if (data.error && data.retval != null) {
+              // Print error message
+              FHC_DialogLib.alertWarning(data.retval);
+            }
 
-    // Copy Begruendung into textarea
-    $(".btn-copyIntoTextarea").click(function(){
-        reviewAnrechnung.copyIntoTextarea(this);
-    })
+            if (!data.error && data.retval != null) {
+              // Update status 'genehmigt'
+              $("#tableWidgetTabulator").tabulator("updateData", data.retval);
+
+              // Print success message
+              FHC_DialogLib.alertSuccess(
+                FHC_PhrasesLib.t("ui", "anrechnungenWurdenNichtEmpfohlen")
+              );
+            }
+          },
+          errorCallback: function (jqXHR, textStatus, errorThrown) {
+            FHC_DialogLib.alertError(FHC_PhrasesLib.t("ui", "systemfehler"));
+          },
+        }
+      );
+    }
+  );
+
+  // Break Empfehlung abgeben
+  $("#reviewAnrechnungUebersicht-empfehlung-abbrechen").click(function () {
+    empfehlung_panel.slideUp("slow");
+  });
+
+  // Break Begruendung abgeben
+  $("#reviewAnrechnungUebersicht-begruendung-abbrechen").click(function () {
+    begruendung_panel.slideUp("slow");
+  });
+
+  // Copy Begruendung into textarea
+  $(".btn-copyIntoTextarea").click(function () {
+    reviewAnrechnung.copyIntoTextarea(this);
+  });
 });
 
 var reviewAnrechnung = {
-    setStatusAlertColor: function () {
-        let status_kurzbz = $('#reviewAnrechnung-status_kurzbz').data('status_kurzbz');
+  setStatusAlertColor: function () {
+    let status_kurzbz = $("#reviewAnrechnung-status_kurzbz").data(
+      "status_kurzbz"
+    );
 
-        switch (status_kurzbz) {
-            case ANRECHNUNGSTATUS_APPROVED:
-                $('#reviewAnrechnung-status_kurzbz').closest('div').addClass('bg-success-subtle');
-                break;
-            case ANRECHNUNGSTATUS_REJECTED:
-                $('#reviewAnrechnung-status_kurzbz').closest('div').addClass('bg-danger-subtle');
-                break;
-            case '':
-                $('#reviewAnrechnung-status_kurzbz').closest('div').addClass('bg-info-subtle');
-                break;
-            default:
-                $('#reviewAnrechnung-status_kurzbz').closest('div').addClass('bg-warning-subtle');
-        }
-    },
-    copyIntoTextarea: function(elem){
-
-        // Find closest textarea
-        let textarea = $(elem).closest('div').find('textarea');
-
-        // Copy begruendung into textarea and set focus
-        textarea.val($.trim($(elem).parent().text())).focus();
+    switch (status_kurzbz) {
+      case ANRECHNUNGSTATUS_APPROVED:
+        $("#reviewAnrechnung-status_kurzbz")
+          .closest("div")
+          .addClass("bg-success-subtle");
+        break;
+      case ANRECHNUNGSTATUS_REJECTED:
+        $("#reviewAnrechnung-status_kurzbz")
+          .closest("div")
+          .addClass("bg-danger-subtle");
+        break;
+      case "":
+        $("#reviewAnrechnung-status_kurzbz")
+          .closest("div")
+          .addClass("bg-info-subtle");
+        break;
+      default:
+        $("#reviewAnrechnung-status_kurzbz")
+          .closest("div")
+          .addClass("bg-warning-subtle");
     }
-}
+  },
+  copyIntoTextarea: function (elem) {
+    // Find closest textarea
+    let textarea = $(elem).closest("div").find("textarea");
+
+    // Copy begruendung into textarea and set focus
+    textarea.val($.trim($(elem).parent().text())).focus();
+  },
+};
diff --git a/public/js/lehre/lehrauftrag/acceptLehrauftrag.js b/public/js/lehre/lehrauftrag/acceptLehrauftrag.js
index f50229d49..0e0cbb4a1 100644
--- a/public/js/lehre/lehrauftrag/acceptLehrauftrag.js
+++ b/public/js/lehre/lehrauftrag/acceptLehrauftrag.js
@@ -11,28 +11,34 @@ const APP_ROOT = FHC_JS_DATA_STORAGE_OBJECT.app_root;
 
 const COLOR_LIGHTGREY = "#f5f5f5";
 
-const TABLE_CANCELLED_LEHRAUFTRAG = '[tableuniqueid = cancelledLehrauftrag] #tableWidgetTabulator';
-const TABLE_ACCEPT_LEHRAUFTRAG = '[tableuniqueid = acceptLehrauftrag] #tableWidgetTabulator';
+const TABLE_CANCELLED_LEHRAUFTRAG =
+  "[tableuniqueid = cancelledLehrauftrag] #tableWidgetTabulator";
+const TABLE_ACCEPT_LEHRAUFTRAG =
+  "[tableuniqueid = acceptLehrauftrag] #tableWidgetTabulator";
 
 /**
  * PNG icons used in status- and filter buttons
  * Setting png icons is a workaround to use font-awsome 5.9.0 icons until system can be updated to newer font awsome version.
  * */
-const ICON_LEHRAUFTRAG_ORDERED = '<img src="../../../public/images/icons/fa-user-tag.png" style="height: 30px; width: 30px; margin: -6px;">';
-const ICON_LEHRAUFTRAG_APPROVED = '<img src="../../../public/images/icons/fa-user-check.png" style="height: 30px; width: 30px; margin: -6px;">';
-const ICON_LEHRAUFTRAG_CHANGED = '<img src="../../../public/images/icons/fa-user-edit.png" style="height: 30px; width: 30px; margin: -6px;">';
-const ICON_LEHRAUFTRAG_CANCELLED = '<img src="../../../public/images/icons/fa-user-times.png" style="height: 30px; width: 30px; margin: -6px;">';
+const ICON_LEHRAUFTRAG_ORDERED =
+  '<img src="../../../public/images/icons/fa-user-tag.png" style="height: 30px; width: 30px; margin: -6px;">';
+const ICON_LEHRAUFTRAG_APPROVED =
+  '<img src="../../../public/images/icons/fa-user-check.png" style="height: 30px; width: 30px; margin: -6px;">';
+const ICON_LEHRAUFTRAG_CHANGED =
+  '<img src="../../../public/images/icons/fa-user-edit.png" style="height: 30px; width: 30px; margin: -6px;">';
+const ICON_LEHRAUFTRAG_CANCELLED =
+  '<img src="../../../public/images/icons/fa-user-times.png" style="height: 30px; width: 30px; margin: -6px;">';
 
 // Fields that should not be provided in the column picker
 var tableWidgetBlacklistArray_columnUnselectable = [
-	'status',
-	'row_index',
-	'betrag',
-	'vertrag_id',
-	'vertrag_stunden',
-	'vertrag_betrag',
-	'storniert_von',				// fields from cancelledLehrauftragData
-	'letzterStatus_vorStorniert'	// fields from cancelledLehrauftragData
+  "status",
+  "row_index",
+  "betrag",
+  "vertrag_id",
+  "vertrag_stunden",
+  "vertrag_betrag",
+  "storniert_von", // fields from cancelledLehrauftragData
+  "letzterStatus_vorStorniert", // fields from cancelledLehrauftragData
 ];
 
 // -----------------------------------------------------------------------------------------------------------------
@@ -41,56 +47,64 @@ var tableWidgetBlacklistArray_columnUnselectable = [
 
 // Converts string date postgre style to string DD.MM.YYYY.
 // This will allow correct filtering.
-var mut_formatStringDate = function(value, data, type, params, component) {
-	if (value != null)
-	{
-		var d = new Date(value);
-		return ("0" + (d.getDate())).slice(-2)  + "." + ("0"+(d.getMonth()+1)).slice(-2) + "." + d.getFullYear();
-	}
-}
+var mut_formatStringDate = function (value, data, type, params, component) {
+  if (value != null) {
+    var d = new Date(value);
+    return (
+      ("0" + d.getDate()).slice(-2) +
+      "." +
+      ("0" + (d.getMonth() + 1)).slice(-2) +
+      "." +
+      d.getFullYear()
+    );
+  }
+};
 
 // -----------------------------------------------------------------------------------------------------------------
 // Formatters - changes display information, not the data itself
 // -----------------------------------------------------------------------------------------------------------------
 
 // Formats null values to a string number '0.00'
-var form_formatNulltoStringNumber = function(cell, formatterParams, onRendered){
-	if (cell.getValue() == null){
-		if (formatterParams.precision == 1)
-		{
-			return '0.0';
-		}
-		return '0.00';
-	}
-	else {
-		return cell.getValue();
-	}
-}
+var form_formatNulltoStringNumber = function (
+  cell,
+  formatterParams,
+  onRendered
+) {
+  if (cell.getValue() == null) {
+    if (formatterParams.precision == 1) {
+      return "0.0";
+    }
+    return "0.00";
+  } else {
+    return cell.getValue();
+  }
+};
 
 // -----------------------------------------------------------------------------------------------------------------
 // Header filter
 // -----------------------------------------------------------------------------------------------------------------
 
 // Filters values using comparison operator or just by string comparison
-function hf_filterStringnumberWithOperator(headerValue, rowValue, rowData, filterParams){
+function hf_filterStringnumberWithOperator(
+  headerValue,
+  rowValue,
+  rowData,
+  filterParams
+) {
+  // If string starts with <, <=, >, >=, !=, ==, compare values with that operator
+  var operator = "";
+  if (headerValue.match(/([<=>!]{1,2})/g)) {
+    var operator_arr = headerValue.match(/([<=>!]{1,2})/g);
+    operator = operator_arr[0];
 
-	// If string starts with <, <=, >, >=, !=, ==, compare values with that operator
-	var operator = '';
-	if (headerValue.match(/([<=>!]{1,2})/g)) {
-		var operator_arr = headerValue.match(/([<=>!]{1,2})/g);
-		operator = operator_arr[0];
+    headerValue = headerValue.replace(operator, "").trim();
 
-		headerValue = headerValue
-			.replace(operator, '')
-			.trim()
-		;
+    // return if value comparison is true
+    return eval(rowValue + operator + headerValue);
+  }
 
-		// return if value comparison is true
-		return eval(rowValue + operator + headerValue);
-	}
-
-	// If just a stringnumber, return if exact match found
-	return parseFloat(rowValue) == headerValue;
+  // If just a stringnumber, return if exact match found
+  return parseFloat(rowValue) == headerValue;
 }
 
 // -----------------------------------------------------------------------------------------------------------------
@@ -98,175 +112,161 @@ function hf_filterStringnumberWithOperator(headerValue, rowValue, rowData, filte
 // -----------------------------------------------------------------------------------------------------------------
 
 // Returns relative height (depending on screen size)
-function func_height(table){
-	return $(window).height() * 0.50;
+function func_height(table) {
+  return $(window).height() * 0.5;
 }
 
 // Formats the rows
-function func_rowFormatter(row){
-	var bestellt = row.getData().bestellt;
-	var erteilt = row.getData().erteilt;
-	var akzeptiert = row.getData().akzeptiert;
+function func_rowFormatter(row) {
+  var bestellt = row.getData().bestellt;
+  var erteilt = row.getData().erteilt;
+  var akzeptiert = row.getData().akzeptiert;
 
-	var stunden = parseFloat(row.getData().stunden);
-	var vertrag_stunden = parseFloat(row.getData().vertrag_stunden);
+  var stunden = parseFloat(row.getData().stunden);
+  var vertrag_stunden = parseFloat(row.getData().vertrag_stunden);
 
-	var betrag = parseFloat(row.getData().betrag);
-	var vertrag_betrag = parseFloat(row.getData().vertrag_betrag);
+  var betrag = parseFloat(row.getData().betrag);
+  var vertrag_betrag = parseFloat(row.getData().vertrag_betrag);
 
-	if (isNaN(betrag))
-	{
-		betrag = 0;
-	}
+  if (isNaN(betrag)) {
+    betrag = 0;
+  }
 
-	/*
+  /*
 	 Formats the color of the rows depending on their status
 	 - orange: geaendert
 	 - default: bestellte und erteilte (= zu akzeptierende)
 	 - green: akzeptierte
 	 - grey: all other (marks unselectable)
 	 */
-	row.getCells().forEach(function(cell){
-		if (bestellt != null && (betrag != vertrag_betrag) ||
-			bestellt != null && stunden != vertrag_stunden)
-		{
-			cell.getElement().classList.add('bg-warning');                  // geaenderte
-		}
-		else if(bestellt != null && erteilt != null && akzeptiert == null)
-		{
-			return;                                                         // bestellte + erteilte
-		}
-		else if(bestellt != null && erteilt != null && akzeptiert != null)
-		{
-			cell.getElement().classList.add('bg-success')                   // akzeptierte
-		}
-		else
-		{
-			row.getElement().style["background-color"] = COLOR_LIGHTGREY;   // default
-		}
-	});
+  row.getCells().forEach(function (cell) {
+    if (
+      (bestellt != null && betrag != vertrag_betrag) ||
+      (bestellt != null && stunden != vertrag_stunden)
+    ) {
+      cell.getElement().classList.add("bg-warning"); // geaenderte
+    } else if (bestellt != null && erteilt != null && akzeptiert == null) {
+      return; // bestellte + erteilte
+    } else if (bestellt != null && erteilt != null && akzeptiert != null) {
+      cell.getElement().classList.add("bg-success"); // akzeptierte
+    } else {
+      row.getElement().style["background-color"] = COLOR_LIGHTGREY; // default
+    }
+  });
 }
 
 // Formats row selectable/unselectable
-function func_selectableCheck(row){
-	var stunden = parseFloat(row.getData().stunden);
-	var vertrag_stunden = parseFloat(row.getData().vertrag_stunden);
+function func_selectableCheck(row) {
+  var stunden = parseFloat(row.getData().stunden);
+  var vertrag_stunden = parseFloat(row.getData().vertrag_stunden);
 
-	var betrag = parseFloat(row.getData().betrag);
-	var vertrag_betrag = parseFloat(row.getData().vertrag_betrag);
+  var betrag = parseFloat(row.getData().betrag);
+  var vertrag_betrag = parseFloat(row.getData().vertrag_betrag);
 
-	var is_storniert = row.getData().storniert != undefined;
+  var is_storniert = row.getData().storniert != undefined;
 
-	if (isNaN(betrag))
-	{
-		betrag = 0;
-	}
+  if (isNaN(betrag)) {
+    betrag = 0;
+  }
 
-	// only allow to select bestellte && erteilte && nicht geaenderte Lehraufträge
-	return  row.getData().bestellt != null &&   // bestellt
-		row.getData().erteilt != null &&        // AND erteilt
-		row.getData().akzeptiert == null &&     // AND nicht akzeptiert
-		betrag == vertrag_betrag &&
-		stunden == vertrag_stunden &&           // AND nicht geaendert
-		!is_storniert;                          // AND nicht storniert
+  // only allow to select bestellte && erteilte && nicht geaenderte Lehraufträge
+  return (
+    row.getData().bestellt != null && // bestellt
+    row.getData().erteilt != null && // AND erteilt
+    row.getData().akzeptiert == null && // AND nicht akzeptiert
+    betrag == vertrag_betrag &&
+    stunden == vertrag_stunden && // AND nicht geaendert
+    !is_storniert
+  ); // AND nicht storniert
 }
 
 // Adds column status
 function func_tableBuilt(table) {
-	// Add status column to table
-	table.addColumn(
-		{
-			title: "<i class='fa fa-user-o'></i>",
-			field: "status",
-			width:40,
-			align:"center",
-			downloadTitle: 'Status',
-			formatter: status_formatter,
-			tooltip: status_tooltip
-		}, true
-	);
+  // Add status column to table
+  table.addColumn(
+    {
+      title: "<i class='fa fa-user-o'></i>",
+      field: "status",
+      width: 40,
+      align: "center",
+      downloadTitle: "Status",
+      formatter: status_formatter,
+      tooltip: status_tooltip,
+    },
+    true
+  );
+
+  // fully redrawing the table after adding the Details column
+  table.tabulator("redraw", true);
 }
 
 // Sets status values into column status
-function func_renderStarted(table){
-	// Set literally status to each row - this enables sorting by status despite using icons
-	table.getRows().forEach(function(row){
-		var bestellt = row.getData().bestellt;
-		var erteilt = row.getData().erteilt;
-		var akzeptiert = row.getData().akzeptiert;
+function func_renderStarted(table) {
+  // Set literally status to each row - this enables sorting by status despite using icons
+  table.getRows().forEach(function (row) {
+    var bestellt = row.getData().bestellt;
+    var erteilt = row.getData().erteilt;
+    var akzeptiert = row.getData().akzeptiert;
 
-		var stunden = parseFloat(row.getData().stunden);
-		var vertrag_stunden = parseFloat(row.getData().vertrag_stunden);
+    var stunden = parseFloat(row.getData().stunden);
+    var vertrag_stunden = parseFloat(row.getData().vertrag_stunden);
 
-		var betrag = parseFloat(row.getData().betrag);
-		var vertrag_betrag = parseFloat(row.getData().vertrag_betrag);
+    var betrag = parseFloat(row.getData().betrag);
+    var vertrag_betrag = parseFloat(row.getData().vertrag_betrag);
 
-		if (isNaN(betrag))
-		{
-			betrag = 0;
-		}
+    if (isNaN(betrag)) {
+      betrag = 0;
+    }
 
-		if ((bestellt != null && betrag != vertrag_betrag) ||
-			(bestellt != null && stunden != vertrag_stunden))
-		{
-			row.getData().status = 'Geändert';      // geaendert
-		}
-		else if (bestellt == null && erteilt == null && akzeptiert == null)
-		{
-			row.getData().status = 'Neu';           // neu
-		}
-		else if (bestellt != null && erteilt == null && akzeptiert == null)
-		{
-			row.getData().status = 'Bestellt';      // bestellt
-		}
-		else if (bestellt != null && erteilt != null && akzeptiert == null)
-		{
-			row.getData().status = 'Erteilt';       // erteilt
-		}
-		else if (bestellt != null && erteilt != null && akzeptiert != null)
-		{
-			row.getData().status = 'Akzeptiert';    // akzeptiert
-		}
-		else
-		{
-			row.getData().status = null;            // default
-		}
-	});
+    if (
+      (bestellt != null && betrag != vertrag_betrag) ||
+      (bestellt != null && stunden != vertrag_stunden)
+    ) {
+      row.getData().status = "Geändert"; // geaendert
+    } else if (bestellt == null && erteilt == null && akzeptiert == null) {
+      row.getData().status = "Neu"; // neu
+    } else if (bestellt != null && erteilt == null && akzeptiert == null) {
+      row.getData().status = "Bestellt"; // bestellt
+    } else if (bestellt != null && erteilt != null && akzeptiert == null) {
+      row.getData().status = "Erteilt"; // erteilt
+    } else if (bestellt != null && erteilt != null && akzeptiert != null) {
+      row.getData().status = "Akzeptiert"; // akzeptiert
+    } else {
+      row.getData().status = null; // default
+    }
+  });
 }
 
 // Performes after row was updated
-function func_rowUpdated(row){
+function func_rowUpdated(row) {
+  // Refresh status icon and row color
+  row.reformat(); // retriggers cell formatters and rowFormatter callback
 
-	// Refresh status icon and row color
-	row.reformat(); // retriggers cell formatters and rowFormatter callback
-
-	// Deselect and disable new selection of updated rows
-	row.deselect();
-	row.getElement().style["pointerEvents"] = "none";
+  // Deselect and disable new selection of updated rows
+  row.deselect();
+  row.getElement().style["pointerEvents"] = "none";
 }
 
 // Hide betrag, if lector has inkludierte Lehre
-function func_renderComplete(table){
-
-	// Check if the lectors actual Verwendung has inkludierte Lehre
-	FHC_AjaxClient.ajaxCallGet(
-		FHC_JS_DATA_STORAGE_OBJECT.called_path + "/checkInkludierteLehre",
-		null,
-		{
-			successCallback: function (data, textStatus, jqXHR)
-			{
-				// If lector has inkludierte Lehre, hide the column betrag
-				if (data.retval)
-				{
-					table.hideColumn("betrag");
-				}
-			},
-			errorCallback: function (jqXHR, textStatus, errorThrown)
-			{
-				FHC_DialogLib.alertError("Systemfehler<br>Bitte kontaktieren Sie Ihren Administrator.");
-			}
-		}
-	);
+function func_renderComplete(table) {
+  // Check if the lectors actual Verwendung has inkludierte Lehre
+  FHC_AjaxClient.ajaxCallGet(
+    FHC_JS_DATA_STORAGE_OBJECT.called_path + "/checkInkludierteLehre",
+    null,
+    {
+      successCallback: function (data, textStatus, jqXHR) {
+        // If lector has inkludierte Lehre, hide the column betrag
+        if (data.retval) {
+          table.hideColumn("betrag");
+        }
+      },
+      errorCallback: function (jqXHR, textStatus, errorThrown) {
+        FHC_DialogLib.alertError(
+          "Systemfehler<br>Bitte kontaktieren Sie Ihren Administrator."
+        );
+      },
+    }
+  );
 }
 
 // TableWidget Footer element
@@ -276,386 +276,408 @@ function func_renderComplete(table){
  * Hook to overwrite TableWigdgets select-all-button behaviour
  * Select all (filtered) rows and ignore rows that are bestellt and erteilt
  */
-function tableWidgetHook_selectAllButton(tableWidgetDiv){
-	var resultRows = tableWidgetDiv.find("#tableWidgetTabulator").tabulator('getRows', true)
-		.filter(row =>  row.getData().bestellt != null &&	// bestellt
-			row.getData().erteilt != null &&				// AND erteilt
-			row.getData().akzeptiert == null &&				// AND NOT akzeptiert
-			row.getData().status != 'Geändert');				// AND NOT geändert
+function tableWidgetHook_selectAllButton(tableWidgetDiv) {
+  var resultRows = tableWidgetDiv
+    .find("#tableWidgetTabulator")
+    .tabulator("getRows", true)
+    .filter(
+      (row) =>
+        row.getData().bestellt != null && // bestellt
+        row.getData().erteilt != null && // AND erteilt
+        row.getData().akzeptiert == null && // AND NOT akzeptiert
+        row.getData().status != "Geändert"
+    ); // AND NOT geändert
 
-	tableWidgetDiv.find("#tableWidgetTabulator").tabulator('selectRow', resultRows);
+  tableWidgetDiv
+    .find("#tableWidgetTabulator")
+    .tabulator("selectRow", resultRows);
 }
 
 // -----------------------------------------------------------------------------------------------------------------
 // Tabulator columns format functions
 // -----------------------------------------------------------------------------------------------------------------
 // Generates status icons
-status_formatter = function(cell, formatterParams, onRendered){
+status_formatter = function (cell, formatterParams, onRendered) {
+  var bestellt = cell.getRow().getData().bestellt;
+  var erteilt = cell.getRow().getData().erteilt;
+  var akzeptiert = cell.getRow().getData().akzeptiert;
+  var is_storniert = cell.getRow().getData().storniert != undefined;
 
-	var bestellt = cell.getRow().getData().bestellt;
-	var erteilt = cell.getRow().getData().erteilt;
-	var akzeptiert = cell.getRow().getData().akzeptiert;
-	var is_storniert = cell.getRow().getData().storniert != undefined;
+  var stunden = parseFloat(cell.getRow().getData().stunden);
+  var vertrag_stunden = parseFloat(cell.getRow().getData().vertrag_stunden);
 
-	var stunden = parseFloat(cell.getRow().getData().stunden);
-	var vertrag_stunden = parseFloat(cell.getRow().getData().vertrag_stunden);
+  var betrag = parseFloat(cell.getRow().getData().betrag);
+  var vertrag_betrag = parseFloat(cell.getRow().getData().vertrag_betrag);
 
-	var betrag = parseFloat(cell.getRow().getData().betrag);
-	var vertrag_betrag = parseFloat(cell.getRow().getData().vertrag_betrag);
+  if (isNaN(betrag)) {
+    betrag = 0;
+  }
 
-	if (isNaN(betrag))
-	{
-		betrag = 0;
-	}
-
-	// commented icons would be so nice to have with fontawsome 5.11...
-	if (bestellt != null && isNaN(vertrag_betrag))
-	{
-		return "<i class='fas fa-user-minus'></i>";     // kein Vertrag
-	}
-	else if (bestellt != null && (betrag != vertrag_betrag) ||
-		bestellt != null && stunden != vertrag_stunden)
-	{
-		return ICON_LEHRAUFTRAG_CHANGED;               // geaendert
-		// return "<i class='fas fa-user-edit'></i>";
-	}
-	else if (bestellt == null && erteilt == null && akzeptiert == null && !is_storniert)
-	{
-		return "<i class='fa fa-user-plus'></i>";       // neu
-	}
-	else if (bestellt != null && erteilt == null && akzeptiert == null)
-	{
-		return ICON_LEHRAUFTRAG_ORDERED;                // bestellt
-		// return "<i class='fa fa-user-tag'></i>";
-	}
-	else if (bestellt != null && erteilt != null && akzeptiert == null)
-	{
-		return ICON_LEHRAUFTRAG_APPROVED;               // erteilt
-		// return "<i class='fas fa-user-check'></i>";
-	}
-	else if (bestellt != null && erteilt != null && akzeptiert != null)
-	{
-		return "<i class='fa fa-handshake-o'></i>";     // akzeptiert
-		// return "<i class='fas fa-user-graduate'></i>";
-	}
-	else if (is_storniert)
-	{
-		return ICON_LEHRAUFTRAG_CANCELLED;     			// storniert
-	}
-	else
-	{
-		return "<i class='fa fa-user'></i>";            // default
-	}
+  // commented icons would be so nice to have with fontawsome 5.11...
+  if (bestellt != null && isNaN(vertrag_betrag)) {
+    return "<i class='fas fa-user-minus'></i>"; // kein Vertrag
+  } else if (
+    (bestellt != null && betrag != vertrag_betrag) ||
+    (bestellt != null && stunden != vertrag_stunden)
+  ) {
+    return ICON_LEHRAUFTRAG_CHANGED; // geaendert
+    // return "<i class='fas fa-user-edit'></i>";
+  } else if (
+    bestellt == null &&
+    erteilt == null &&
+    akzeptiert == null &&
+    !is_storniert
+  ) {
+    return "<i class='fa fa-user-plus'></i>"; // neu
+  } else if (bestellt != null && erteilt == null && akzeptiert == null) {
+    return ICON_LEHRAUFTRAG_ORDERED; // bestellt
+    // return "<i class='fa fa-user-tag'></i>";
+  } else if (bestellt != null && erteilt != null && akzeptiert == null) {
+    return ICON_LEHRAUFTRAG_APPROVED; // erteilt
+    // return "<i class='fas fa-user-check'></i>";
+  } else if (bestellt != null && erteilt != null && akzeptiert != null) {
+    return "<i class='fa fa-handshake-o'></i>"; // akzeptiert
+    // return "<i class='fas fa-user-graduate'></i>";
+  } else if (is_storniert) {
+    return ICON_LEHRAUFTRAG_CANCELLED; // storniert
+  } else {
+    return "<i class='fa fa-user'></i>"; // default
+  }
 };
 
 // Generates status tooltip
-status_tooltip = function(e, cell, onRendered){
-	//e - mouseover event
-	//cell - cell component
-	//onRendered - onRendered callback registration function
+status_tooltip = function (e, cell, onRendered) {
+  //e - mouseover event
+  //cell - cell component
+  //onRendered - onRendered callback registration function
 
-	var bestellt = cell.getRow().getData().bestellt;
-	var erteilt = cell.getRow().getData().erteilt;
-	var akzeptiert = cell.getRow().getData().akzeptiert;
-	var is_storniert = cell.getRow().getData().storniert != undefined;
-	var letzterStatus_vorStorniert = cell.getRow().getData().letzterStatus_vorStorniert;
+  var bestellt = cell.getRow().getData().bestellt;
+  var erteilt = cell.getRow().getData().erteilt;
+  var akzeptiert = cell.getRow().getData().akzeptiert;
+  var is_storniert = cell.getRow().getData().storniert != undefined;
+  var letzterStatus_vorStorniert = cell
+    .getRow()
+    .getData().letzterStatus_vorStorniert;
 
+  var stunden = parseFloat(cell.getRow().getData().stunden);
+  var vertrag_stunden = parseFloat(cell.getRow().getData().vertrag_stunden);
 
-	var stunden = parseFloat(cell.getRow().getData().stunden);
-	var vertrag_stunden = parseFloat(cell.getRow().getData().vertrag_stunden);
+  var betrag = parseFloat(cell.getRow().getData().betrag);
+  var vertrag_betrag = parseFloat(cell.getRow().getData().vertrag_betrag);
 
-	var betrag = parseFloat(cell.getRow().getData().betrag);
-	var vertrag_betrag = parseFloat(cell.getRow().getData().vertrag_betrag);
+  if (isNaN(betrag)) {
+    betrag = 0;
+  }
 
-	if (isNaN(betrag))
-	{
-		betrag = 0;
-	}
+  if (
+    letzterStatus_vorStorniert != undefined &&
+    letzterStatus_vorStorniert == "akzeptiert"
+  ) {
+    letzterStatus_vorStorniert = "angenommen";
+  }
 
-	if (letzterStatus_vorStorniert != undefined && letzterStatus_vorStorniert == 'akzeptiert')
-	{
-		letzterStatus_vorStorniert = 'angenommen';
-	}
+  var text = FHC_PhrasesLib.t("ui", "lehrauftragInBearbeitung");
 
-	var text = FHC_PhrasesLib.t("ui", "lehrauftragInBearbeitung");
-
-	if (bestellt != null && erteilt == null && akzeptiert == null
-		&& (betrag != vertrag_betrag || stunden != vertrag_stunden))        // geaendert (when never erteilt before)
-	{
-		text += FHC_PhrasesLib.t("ui", "wartetAufErteilung");;
-		return text;
-	}
-	else if (bestellt != null && erteilt != null && akzeptiert == null
-		&& (betrag != vertrag_betrag || stunden != vertrag_stunden))        // geaendert (when has been erteilt once)
-	{
-		text += FHC_PhrasesLib.t("ui", "wartetAufErneuteErteilung");
-		return text;
-	}
-	else if (bestellt != null && erteilt == null && akzeptiert == null)     // bestellt
-	{
-		return FHC_PhrasesLib.t("ui", "letzterStatusBestellt");
-	}
-	else if (bestellt != null && erteilt != null && akzeptiert == null)     // erteilt
-	{
-		return FHC_PhrasesLib.t("ui", "letzterStatusErteilt");
-	}
-	else if (bestellt != null && erteilt != null && akzeptiert != null)     // akzeptiert
-	{
-		return FHC_PhrasesLib.t("ui", "letzterStatusAngenommen");
-	}
-	else if (is_storniert)													// storniert
-	{
-		return FHC_PhrasesLib.t("ui", "vertragWurdeStorniert");
-	}
-}
+  if (
+    bestellt != null &&
+    erteilt == null &&
+    akzeptiert == null &&
+    (betrag != vertrag_betrag || stunden != vertrag_stunden)
+  ) {
+    // geaendert (when never erteilt before)
+    text += FHC_PhrasesLib.t("ui", "wartetAufErteilung");
+    return text;
+  } else if (
+    bestellt != null &&
+    erteilt != null &&
+    akzeptiert == null &&
+    (betrag != vertrag_betrag || stunden != vertrag_stunden)
+  ) {
+    // geaendert (when has been erteilt once)
+    text += FHC_PhrasesLib.t("ui", "wartetAufErneuteErteilung");
+    return text;
+  } else if (bestellt != null && erteilt == null && akzeptiert == null) {
+    // bestellt
+    return FHC_PhrasesLib.t("ui", "letzterStatusBestellt");
+  } else if (bestellt != null && erteilt != null && akzeptiert == null) {
+    // erteilt
+    return FHC_PhrasesLib.t("ui", "letzterStatusErteilt");
+  } else if (bestellt != null && erteilt != null && akzeptiert != null) {
+    // akzeptiert
+    return FHC_PhrasesLib.t("ui", "letzterStatusAngenommen");
+  } else if (is_storniert) {
+    // storniert
+    return FHC_PhrasesLib.t("ui", "vertragWurdeStorniert");
+  }
+};
 
 // Generates bestellt tooltip
-bestellt_tooltip = function(e, cell, onRendered){
-	//e - mouseover event
-	//cell - cell component
-	//onRendered - onRendered callback registration function
+bestellt_tooltip = function (e, cell, onRendered) {
+  //e - mouseover event
+  //cell - cell component
+  //onRendered - onRendered callback registration function
 
-	if (cell.getRow().getData().bestellt_von != null)
-	{
-		return FHC_PhrasesLib.t("ui", "bestelltVon") + cell.getRow().getData().bestellt_von;
-	}
-}
+  if (cell.getRow().getData().bestellt_von != null) {
+    return (
+      FHC_PhrasesLib.t("ui", "bestelltVon") +
+      cell.getRow().getData().bestellt_von
+    );
+  }
+};
 
 // Generates erteilt tooltip
-erteilt_tooltip = function(e, cell, onRendered){
-	//e - mouseover event
-	//cell - cell component
-	//onRendered - onRendered callback registration function
+erteilt_tooltip = function (e, cell, onRendered) {
+  //e - mouseover event
+  //cell - cell component
+  //onRendered - onRendered callback registration function
 
-	if (cell.getRow().getData().erteilt_von != null) {
-		return FHC_PhrasesLib.t("ui", "erteiltVon") + cell.getRow().getData().erteilt_von;
-	}
-}
+  if (cell.getRow().getData().erteilt_von != null) {
+    return (
+      FHC_PhrasesLib.t("ui", "erteiltVon") + cell.getRow().getData().erteilt_von
+    );
+  }
+};
 
 // Generates akzeptiert tooltip
-akzeptiert_tooltip = function(e, cell, onRendered){
-	//e - mouseover event
-	//cell - cell component
-	//onRendered - onRendered callback registration function
+akzeptiert_tooltip = function (e, cell, onRendered) {
+  //e - mouseover event
+  //cell - cell component
+  //onRendered - onRendered callback registration function
 
-	if (cell.getRow().getData().akzeptiert_von != null) {
-		return FHC_PhrasesLib.t("ui", "angenommenVon") + cell.getRow().getData().akzeptiert_von;
-	}
-}
+  if (cell.getRow().getData().akzeptiert_von != null) {
+    return (
+      FHC_PhrasesLib.t("ui", "angenommenVon") +
+      cell.getRow().getData().akzeptiert_von
+    );
+  }
+};
 
 // Generates storniert tooltip
-storniert_tooltip = function(e, cell, onRendered){
-	//e - mouseover event
-	//cell - cell component
-	//onRendered - onRendered callback registration function
-	
-	if (cell.getRow().getData().storniert_von != null) {
-		return FHC_PhrasesLib.t("ui", "storniertVon") + cell.getRow().getData().storniert_von;
-	}
-}
+storniert_tooltip = function (e, cell, onRendered) {
+  //e - mouseover event
+  //cell - cell component
+  //onRendered - onRendered callback registration function
 
-$(function() {
-	// Pruefen ob Promise unterstuetzt wird
-	// Tabulator funktioniert nicht mit IE
+  if (cell.getRow().getData().storniert_von != null) {
+    return (
+      FHC_PhrasesLib.t("ui", "storniertVon") +
+      cell.getRow().getData().storniert_von
+    );
+  }
+};
 
+$(function () {
+  // Pruefen ob Promise unterstuetzt wird
+  // Tabulator funktioniert nicht mit IE
 
-	// tableInit is called in the jquery_wrapper when the tableBuilt event was finished
-    $(document).on("tableInit", function(event,tabulatorInstance) {
-		
-		//passing the tabulator instance because the acceptLehrauftrag site loads two tabulator tables
-        func_tableBuilt(tabulatorInstance)
-		
-        // using the tabulator instance instead of the jquery object because the site loads two different tabulator tables
-		let uniqueTableID = tabulatorInstance.parentElement.parentElement.parentElement.attributes.tableUniqueId.value;
-		switch(uniqueTableID){
-			case "cancelledLehrauftrag": 
-				tabulatorInstance.on("renderComplete",()=>{func_renderComplete(tabulatorInstance)});
-				break;
-			case "acceptLehrauftrag": 
-				tabulatorInstance.on("renderComplete",()=>{func_renderComplete(tabulatorInstance)});
-				tabulatorInstance.on("renderStarted",()=>{func_renderStarted(tabulatorInstance)});
-				tabulatorInstance.on("rowUpdated",(row)=>{func_rowUpdated(row)});
-				break;
-			default: break;
-		}
-		
-    });
+  // tableInit is called in the jquery_wrapper when the tableBuilt event was finished
+  $(document).on("tableInit", function (event, tabulatorInstance) {
+    //passing the tabulator instance because the acceptLehrauftrag site loads two tabulator tables
+    func_tableBuilt(tabulatorInstance);
 
-	var canPromise = !! window.Promise;
-	if(!canPromise)
-	{
-		alert("Diese Seite kann mit ihrem Browser nicht angezeigt werden. Bitte verwenden Sie Firefox, Chrome oder Edge um die Seite anzuzeigen");
-		window.location.href='about:blank';
-		return;
-	}
+    // using the tabulator instance instead of the jquery object because the site loads two different tabulator tables
+    let uniqueTableID =
+      tabulatorInstance.parentElement.parentElement.parentElement.attributes
+        .tableUniqueId.value;
+    switch (uniqueTableID) {
+      case "cancelledLehrauftrag":
+        tabulatorInstance.on("renderComplete", () => {
+          func_renderComplete(tabulatorInstance);
+        });
+        break;
+      case "acceptLehrauftrag":
+        tabulatorInstance.on("renderComplete", () => {
+          func_renderComplete(tabulatorInstance);
+        });
+        tabulatorInstance.on("renderStarted", () => {
+          func_renderStarted(tabulatorInstance);
+        });
+        tabulatorInstance.on("rowUpdated", (row) => {
+          func_rowUpdated(row);
+        });
+        break;
+      default:
+        break;
+    }
+  });
 
-	// Redraw table on resize to fit tabulators height to windows height
-	window.addEventListener('resize', function(){
-		$('#tableWidgetTabulator').tabulator('setHeight', $(window).height() * 0.50);
-		$('#tableWidgetTabulator').tabulator('redraw', true);
-	});
+  var canPromise = !!window.Promise;
+  if (!canPromise) {
+    alert(
+      "Diese Seite kann mit ihrem Browser nicht angezeigt werden. Bitte verwenden Sie Firefox, Chrome oder Edge um die Seite anzuzeigen"
+    );
+    window.location.href = "about:blank";
+    return;
+  }
 
-	// Show all rows
-	$("#show-all").click(function(){
-		$('#tableWidgetTabulator').tabulator('clearFilter');
-	});
+  // Redraw table on resize to fit tabulators height to windows height
+  window.addEventListener("resize", function () {
+    $("#tableWidgetTabulator").tabulator("setHeight", $(window).height() * 0.5);
+    $("#tableWidgetTabulator").tabulator("redraw", true);
+  });
 
-	// Show only rows with ordered lehrauftraege
-	$("#show-ordered").click(function(){
-		$('#tableWidgetTabulator').tabulator('setFilter',
-			[
-				{field: 'bestellt', type: '!=', value: null},
-				{field: 'erteilt', type: '=', value: null},
-				{field: 'akzeptiert', type: '=', value: null}
-			]
-		);
-	});
+  // Show all rows
+  $("#show-all").click(function () {
+    $("#tableWidgetTabulator").tabulator("clearFilter");
+  });
 
-	// Show only rows with erteilte lehrauftraege
-	$("#show-approved").click(function(){
-		$('#tableWidgetTabulator').tabulator('setFilter', [
-				{field: 'bestellt', type: '!=', value: null},   // filter when is bestellt
-				{field: 'erteilt', type: '!=', value: null},    // and is erteilt
-				{field: 'akzeptiert', type: '=', value: null}  // and is not akzeptiert
-			]
-		);
-	});
+  // Show only rows with ordered lehrauftraege
+  $("#show-ordered").click(function () {
+    $("#tableWidgetTabulator").tabulator("setFilter", [
+      { field: "bestellt", type: "!=", value: null },
+      { field: "erteilt", type: "=", value: null },
+      { field: "akzeptiert", type: "=", value: null },
+    ]);
+  });
 
-	// Show only rows with akzeptierte lehrauftraege
-	$("#show-accepted").click(function(){
-		$('#tableWidgetTabulator').tabulator('setFilter',
-			[
-				{field: 'bestellt', type: '!=', value: null},
-				{field: 'erteilt', type: '!=', value: null},
-				{field: 'akzeptiert', type: '!=', value: null}
-			]
-		);
-	});
+  // Show only rows with erteilte lehrauftraege
+  $("#show-approved").click(function () {
+    $("#tableWidgetTabulator").tabulator("setFilter", [
+      { field: "bestellt", type: "!=", value: null }, // filter when is bestellt
+      { field: "erteilt", type: "!=", value: null }, // and is erteilt
+      { field: "akzeptiert", type: "=", value: null }, // and is not akzeptiert
+    ]);
+  });
 
-	// Set png-icons into filter-buttons
-	$(".btn-lehrauftrag").each(function(){
-		switch(this.id) {
-			case 'show-ordered':
-				this.innerHTML = ICON_LEHRAUFTRAG_ORDERED;
-				break;
-			case 'show-approved':
-				this.innerHTML = ICON_LEHRAUFTRAG_APPROVED;
-				break;
-			case 'show-cancelled':
-				this.innerHTML = ICON_LEHRAUFTRAG_CANCELLED;
-				break;
-		}
-	});
+  // Show only rows with akzeptierte lehrauftraege
+  $("#show-accepted").click(function () {
+    $("#tableWidgetTabulator").tabulator("setFilter", [
+      { field: "bestellt", type: "!=", value: null },
+      { field: "erteilt", type: "!=", value: null },
+      { field: "akzeptiert", type: "!=", value: null },
+    ]);
+  });
 
-	// De/activate and un/focus on clicked button
-	$(".btn-lehrauftrag").click(function() {
+  // Set png-icons into filter-buttons
+  $(".btn-lehrauftrag").each(function () {
+    switch (this.id) {
+      case "show-ordered":
+        this.innerHTML = ICON_LEHRAUFTRAG_ORDERED;
+        break;
+      case "show-approved":
+        this.innerHTML = ICON_LEHRAUFTRAG_APPROVED;
+        break;
+      case "show-cancelled":
+        this.innerHTML = ICON_LEHRAUFTRAG_CANCELLED;
+        break;
+    }
+  });
 
-		// De/activate and un/focus on clicked button
-		$(".btn-lehrauftrag").removeClass('focus').removeClass('active');
-		$(this).addClass('focus').addClass('active');
-	});
+  // De/activate and un/focus on clicked button
+  $(".btn-lehrauftrag").click(function () {
+    // De/activate and un/focus on clicked button
+    $(".btn-lehrauftrag").removeClass("focus").removeClass("active");
+    $(this).addClass("focus").addClass("active");
+  });
 
-	// Performs download PDF accepted Lehrauftraege
-	$("#ul-download-pdf").on('click', 'li', function(){
-		var uid = $("#uid").val();
-		var studiensemester = $('#studiensemester').val();
+  // Performs download PDF accepted Lehrauftraege
+  $("#ul-download-pdf").on("click", "li", function () {
+    var uid = $("#uid").val();
+    var studiensemester = $("#studiensemester").val();
 
-		if ($(this).attr('value') != null && $(this).attr('value') != '')
-		{
-			var selected = $(this).attr('value');
+    if ($(this).attr("value") != null && $(this).attr("value") != "") {
+      var selected = $(this).attr("value");
 
-			if (selected == 'etw' || selected == 'lehrgang')
-			{
-				window.open(APP_ROOT + 'cis/private/pdfExport.php' +
-					'?xml=lehrauftrag_annehmen.xml.php' +
-					'&xsl=Lehrauftrag' +
-					'&xsl_oe_kurzbz=' + selected +
-					'&stg_kz=' +
-					'&uid=' + uid +
-					'&ss=' + studiensemester, '_parent'
-				);
-			}
-		}
-	});
+      if (selected == "etw" || selected == "lehrgang") {
+        window.open(
+          APP_ROOT +
+            "cis/private/pdfExport.php" +
+            "?xml=lehrauftrag_annehmen.xml.php" +
+            "&xsl=Lehrauftrag" +
+            "&xsl_oe_kurzbz=" +
+            selected +
+            "&stg_kz=" +
+            "&uid=" +
+            uid +
+            "&ss=" +
+            studiensemester,
+          "_parent"
+        );
+      }
+    }
+  });
 
-	// Redraw table stornierte lehrauftraege on button click
-	$('#collapseCancelledLehrauftraege').on('shown.bs.collapse', function () {
-		$('[tableuniqueid = cancelledLehrauftrag] #tableWidgetTabulator').tabulator('redraw', true);
-	});
+  // Redraw table stornierte lehrauftraege on button click
+  $("#collapseCancelledLehrauftraege").on("shown.bs.collapse", function () {
+    $("[tableuniqueid = cancelledLehrauftrag] #tableWidgetTabulator").tabulator(
+      "redraw",
+      true
+    );
+  });
 
-	// Approve Lehrauftraege
-	$("#accept-lehrauftraege").click(function(){
+  // Approve Lehrauftraege
+  $("#accept-lehrauftraege").click(function () {
+    // Get selected rows data
+    var selected_data = $("#tableWidgetTabulator")
+      .tabulator("getSelectedData")
+      .map(function (data) {
+        // reduce to necessary fields
+        return {
+          row_index: data.row_index,
+          vertrag_id: data.vertrag_id,
+        };
+      });
 
-		// Get selected rows data
-		var selected_data = $('#tableWidgetTabulator').tabulator('getSelectedData')
-			.map(function(data){
-				// reduce to necessary fields
-				return {
-					'row_index' : data.row_index,
-					'vertrag_id' : data.vertrag_id
-				}
-			});
+    // Alert and exit if no lehraufgang is selected
+    if (selected_data.length == 0) {
+      FHC_DialogLib.alertInfo(
+        "Bitte wählen Sie erst zumindest einen Lehrauftrag"
+      );
 
-		// Alert and exit if no lehraufgang is selected
-		if (selected_data.length == 0)
-		{
-			FHC_DialogLib.alertInfo('Bitte wählen Sie erst zumindest einen Lehrauftrag');
+      // Emtpy password field
+      $("#password").val("");
 
-			// Emtpy password field
-			$("#password").val('');
+      return;
+    }
 
-			return;
-		}
+    // Get password for verification
+    var password = $("#password").val();
+    if (password == "") {
+      FHC_DialogLib.alertInfo(
+        "Bitte verifizieren Sie sich mit Ihrem Login Passwort."
+      );
 
-		// Get password for verification
-		var password = $("#password").val();
-		if (password == '')
-		{
-			FHC_DialogLib.alertInfo('Bitte verifizieren Sie sich mit Ihrem Login Passwort.');
+      // Focus on password field
+      $("#password").focus();
 
-			// Focus on password field
-			$("#password").focus();
+      return;
+    }
 
-			return;
-		}
+    // Prepare data object for ajax call
+    var data = {
+      password: password,
+      selected_data: selected_data,
+    };
 
-		// Prepare data object for ajax call
-		var data = {
-			'password': password,
-			'selected_data': selected_data
-		};
+    FHC_AjaxClient.ajaxCallPost(
+      FHC_JS_DATA_STORAGE_OBJECT.called_path + "/acceptLehrauftrag",
+      data,
+      {
+        successCallback: function (data, textStatus, jqXHR) {
+          if (data.error && data.retval != null) {
+            // Print error message
+            FHC_DialogLib.alertWarning(data.retval);
+          }
 
-		FHC_AjaxClient.ajaxCallPost(
-			FHC_JS_DATA_STORAGE_OBJECT.called_path + "/acceptLehrauftrag",
-			data,
-			{
-				successCallback: function (data, textStatus, jqXHR)
-				{
-					if (data.error && data.retval != null)
-					{
-						// Print error message
-						FHC_DialogLib.alertWarning(data.retval);
-					}
+          if (!data.error && data.retval != null) {
+            // Update status 'Erteilt'
+            $("#tableWidgetTabulator").tabulator("updateData", data.retval);
 
-					if (!data.error && data.retval != null)
-					{
-						// Update status 'Erteilt'
-						$('#tableWidgetTabulator').tabulator('updateData', data.retval);
-
-						// Print success message
-						FHC_DialogLib.alertSuccess(data.retval.length + " Lehraufträge wurden akzeptiert.");
-					}
-				},
-				errorCallback: function (jqXHR, textStatus, errorThrown)
-				{
-					FHC_DialogLib.alertError("Systemfehler<br>Bitte kontaktieren Sie Ihren Administrator.");
-				}
-			}
-		);
-
-		// Empty password field
-		$("#password").val('');
-
-	});
+            // Print success message
+            FHC_DialogLib.alertSuccess(
+              data.retval.length + " Lehraufträge wurden akzeptiert."
+            );
+          }
+        },
+        errorCallback: function (jqXHR, textStatus, errorThrown) {
+          FHC_DialogLib.alertError(
+            "Systemfehler<br>Bitte kontaktieren Sie Ihren Administrator."
+          );
+        },
+      }
+    );
 
+    // Empty password field
+    $("#password").val("");
+  });
 });
diff --git a/public/js/lehre/lehrauftrag/approveLehrauftrag.js b/public/js/lehre/lehrauftrag/approveLehrauftrag.js
index 6ce0414fa..9cb979c62 100644
--- a/public/js/lehre/lehrauftrag/approveLehrauftrag.js
+++ b/public/js/lehre/lehrauftrag/approveLehrauftrag.js
@@ -4,7 +4,6 @@
  * Lehrauftraege erteilen - Tabulator: approveLehrauftragData.php
  */
 
-
 // -----------------------------------------------------------------------------------------------------------------
 // Global vars
 // -----------------------------------------------------------------------------------------------------------------
@@ -15,19 +14,22 @@ const COLOR_LIGHTGREY = "#f5f5f5";
  * PNG icons used in status- and filter buttons
  * Setting png icons is a workaround to use font-awsome 5.9.0 icons until system can be updated to newer font awsome version.
  * */
-const ICON_LEHRAUFTRAG_ORDERED = '<img src="../../../public/images/icons/fa-user-tag.png" style="height: 30px; width: 30px; margin: -6px;">';
-const ICON_LEHRAUFTRAG_APPROVED = '<img src="../../../public/images/icons/fa-user-check.png" style="height: 30px; width: 30px; margin: -6px;">';
-const ICON_LEHRAUFTRAG_CHANGED = '<img src="../../../public/images/icons/fa-user-edit.png" style="height: 30px; width: 30px; margin: -6px;">';
+const ICON_LEHRAUFTRAG_ORDERED =
+  '<img src="../../../public/images/icons/fa-user-tag.png" style="height: 30px; width: 30px; margin: -6px;">';
+const ICON_LEHRAUFTRAG_APPROVED =
+  '<img src="../../../public/images/icons/fa-user-check.png" style="height: 30px; width: 30px; margin: -6px;">';
+const ICON_LEHRAUFTRAG_CHANGED =
+  '<img src="../../../public/images/icons/fa-user-edit.png" style="height: 30px; width: 30px; margin: -6px;">';
 
 // Fields that should not be provided in the column picker
 var tableWidgetBlacklistArray_columnUnselectable = [
-	'status',
-	'row_index',
-	'personalnummer',
-	'betrag',
-	'vertrag_id',
-	'vertrag_stunden',
-	'vertrag_betrag'
+  "status",
+  "row_index",
+  "personalnummer",
+  "betrag",
+  "vertrag_id",
+  "vertrag_stunden",
+  "vertrag_betrag",
 ];
 
 // -----------------------------------------------------------------------------------------------------------------
@@ -36,56 +38,55 @@ var tableWidgetBlacklistArray_columnUnselectable = [
 
 // Converts string date postgre style to string DD.MM.YYYY.
 // This will allow correct filtering.
-var mut_formatStringDate = function(value, data, type, params, component) {
-    if (value != null)
-    {
-        var d = new Date(value);
-        return ("0" + (d.getDate())).slice(-2)  + "." + ("0" + (d.getMonth() + 1)).slice(-2) + "." + d.getFullYear();
-    }
-}
+var mut_formatStringDate = function (value, data, type, params, component) {
+  if (value != null) {
+    var d = new Date(value);
+    return (
+      ("0" + d.getDate()).slice(-2) +
+      "." +
+      ("0" + (d.getMonth() + 1)).slice(-2) +
+      "." +
+      d.getFullYear()
+    );
+  }
+};
 
 // -----------------------------------------------------------------------------------------------------------------
 // Formatters - changes display information, not the data itself
 // -----------------------------------------------------------------------------------------------------------------
 
 // Formats null values to a string number '0.00'
-var form_formatNulltoStringNumber = function(cell, formatterParams){
-    if (cell.getValue() == null){
-        if (formatterParams.precision == 1)
-        {
-            return '0.0';
-        }
-        return '0.00';
+var form_formatNulltoStringNumber = function (cell, formatterParams) {
+  if (cell.getValue() == null) {
+    if (formatterParams.precision == 1) {
+      return "0.0";
     }
-    else {
-        return cell.getValue();
-    }
-}
+    return "0.00";
+  } else {
+    return cell.getValue();
+  }
+};
 
 // -----------------------------------------------------------------------------------------------------------------
 // Header filter
 // -----------------------------------------------------------------------------------------------------------------
 
 // Filters values using comparison operator or just by string comparison
-function hf_filterStringnumberWithOperator(headerValue, rowValue, rowData){
+function hf_filterStringnumberWithOperator(headerValue, rowValue, rowData) {
+  // If string starts with <, <=, >, >=, !=, ==, compare values with that operator
+  var operator = "";
+  if (headerValue.match(/([<=>!]{1,2})/g)) {
+    var operator_arr = headerValue.match(/([<=>!]{1,2})/g);
+    operator = operator_arr[0];
 
-    // If string starts with <, <=, >, >=, !=, ==, compare values with that operator
-    var operator = '';
-    if (headerValue.match(/([<=>!]{1,2})/g)) {
-        var operator_arr = headerValue.match(/([<=>!]{1,2})/g);
-        operator = operator_arr[0];
+    headerValue = headerValue.replace(operator, "").trim();
 
-        headerValue = headerValue
-            .replace(operator, '')
-            .trim()
-        ;
+    // return if value comparison is true
+    return eval(rowValue + operator + headerValue);
+  }
 
-        // return if value comparison is true
-        return eval(rowValue + operator + headerValue);
-    }
-
-    // If just a stringnumber, return if exact match found
-    return parseFloat(rowValue) == headerValue;
+  // If just a stringnumber, return if exact match found
+  return parseFloat(rowValue) == headerValue;
 }
 
 // -----------------------------------------------------------------------------------------------------------------
@@ -93,13 +94,13 @@ function hf_filterStringnumberWithOperator(headerValue, rowValue, rowData){
 // -----------------------------------------------------------------------------------------------------------------
 
 // Filters bestellte initially
-function func_initialFilter(){
-    return [
-        {field: 'personalnummer', type: '>=', value: 0},    // NOT dummy lector
-        {field: 'bestellt', type: '!=', value: null},       // AND bestellt
-        {field: 'erteilt', type: '=', value: null},         // AND NOT erteilt
-        {field: 'akzeptiert', type: '=', value: null}       // AND NOT akzeptiert
-    ]
+function func_initialFilter() {
+  return [
+    { field: "personalnummer", type: ">=", value: 0 }, // NOT dummy lector
+    { field: "bestellt", type: "!=", value: null }, // AND bestellt
+    { field: "erteilt", type: "=", value: null }, // AND NOT erteilt
+    { field: "akzeptiert", type: "=", value: null }, // AND NOT akzeptiert
+  ];
 }
 
 // -----------------------------------------------------------------------------------------------------------------
@@ -107,19 +108,144 @@ function func_initialFilter(){
 // -----------------------------------------------------------------------------------------------------------------
 
 // Returns relative height (depending on screen size)
-function func_height(table){
-    return $(window).height() * 0.50;
+function func_height(table) {
+  return $(window).height() * 0.5;
 }
 
 // Formats the group header
-function func_groupHeader(data){
-    return data[0].lv_bezeichnung + "&nbsp;&nbsp;" + ' ( LV-ID: ' + data[0].lehrveranstaltung_id + ' )';  // change name to lehrveranstaltung;
-};
+function func_groupHeader(data) {
+  return (
+    data[0].lv_bezeichnung +
+    "&nbsp;&nbsp;" +
+    " ( LV-ID: " +
+    data[0].lehrveranstaltung_id +
+    " )"
+  ); // change name to lehrveranstaltung;
+}
 
 // Formats the rows
-function func_rowFormatter(row){
-    var is_dummy = (row.getData().personalnummer <= 0 && row.getData().personalnummer != null);
+function func_rowFormatter(row) {
+  var is_dummy =
+    row.getData().personalnummer <= 0 && row.getData().personalnummer != null;
 
+  var bestellt = row.getData().bestellt;
+  var erteilt = row.getData().erteilt;
+  var akzeptiert = row.getData().akzeptiert;
+
+  var stunden = parseFloat(row.getData().stunden);
+  var vertrag_stunden = parseFloat(row.getData().vertrag_stunden);
+
+  var betrag = parseFloat(row.getData().betrag);
+  var vertrag_betrag = parseFloat(row.getData().vertrag_betrag);
+
+  if (isNaN(betrag)) {
+    betrag = 0;
+  }
+
+  if (isNaN(stunden)) {
+    stunden = 0;
+  }
+
+  if (isNaN(vertrag_stunden)) {
+    vertrag_stunden = 0;
+  }
+
+  if (isNaN(vertrag_betrag)) {
+    vertrag_betrag = 0;
+  }
+
+  /*
+    Formats the color of the rows depending on their status
+    - blue: dummy lectors
+    - orange: geaendert
+    - default (white) : bestellte
+    - green: akzeptiert
+    - grey: all other (marks unselectable)
+     */
+  row.getCells().forEach(function (cell) {
+    if (is_dummy) {
+      cell.getElement().classList.add("bg-info"); // dummy lectors
+    } else if (
+      (bestellt != null && betrag != vertrag_betrag) ||
+      (bestellt != null &&
+        stunden != vertrag_stunden &&
+        !row._row.element.classList.contains("tabulator-calcs"))
+    ) {
+      // exclude calculation rows
+      cell.getElement().classList.add("bg-warning"); // geaenderte
+    } else if (bestellt != null && erteilt == null) {
+      return; // bestellt
+    } else if (bestellt != null && erteilt != null && akzeptiert != null) {
+      cell.getElement().classList.add("bg-success"); // akzeptiert
+    }
+
+    // default color is already set in the Tabulator5.css file that gets loaded the Header flag tabulator5
+    // row.getElement().style["background-color"] = COLOR_LIGHTGREY;   // default
+  });
+}
+
+// Formats row selectable/unselectable
+function func_selectableCheck(row) {
+  var is_dummy =
+    row.getData().personalnummer <= 0 && row.getData().personalnummer != null;
+
+  var stunden = parseFloat(row.getData().stunden);
+  var vertrag_stunden = parseFloat(row.getData().vertrag_stunden);
+
+  var betrag = parseFloat(row.getData().betrag);
+  var vertrag_betrag = parseFloat(row.getData().vertrag_betrag);
+
+  if (isNaN(betrag)) {
+    betrag = 0;
+  }
+
+  if (isNaN(stunden)) {
+    stunden = 0;
+  }
+
+  if (isNaN(vertrag_stunden)) {
+    vertrag_stunden = 0;
+  }
+
+  if (isNaN(vertrag_betrag)) {
+    vertrag_betrag = 0;
+  }
+
+  // only allow to select bestellte Lehraufträge
+  return (
+    !is_dummy && // NOT dummy lector
+    row.getData().bestellt != null && // AND NOT neue
+    row.getData().erteilt == null && // AND bestellt
+    betrag == vertrag_betrag &&
+    stunden == vertrag_stunden
+  ); // AND nicht geändert
+}
+
+// Adds column status
+function func_tableBuilt(table) {
+  // Add status column to table
+  table.tabulator(
+    "addColumn",
+    {
+      title: "<i class='fa fa-user-o'></i>",
+      field: "status",
+      width: 40,
+      align: "center",
+      downloadTitle: "Status",
+      formatter: status_formatter,
+      tooltip: status_tooltip,
+    },
+    true
+  );
+
+  // fully redrawing the table after adding the Details column
+  table.tabulator("redraw", true);
+}
+
+// Sets status values into column status
+function func_renderStarted(table) {
+  // set literally status to each row - this enables sorting by status despite using icons
+  table.getRows().forEach(function (row) {
     var bestellt = row.getData().bestellt;
     var erteilt = row.getData().erteilt;
     var akzeptiert = row.getData().akzeptiert;
@@ -130,185 +256,49 @@ function func_rowFormatter(row){
     var betrag = parseFloat(row.getData().betrag);
     var vertrag_betrag = parseFloat(row.getData().vertrag_betrag);
 
-    if (isNaN(betrag))
-    {
-        betrag = 0;
+    if (isNaN(betrag)) {
+      betrag = 0;
     }
 
-    if (isNaN(stunden))
-    {
-        stunden = 0;
+    if (isNaN(stunden)) {
+      stunden = 0;
     }
 
-    if (isNaN(vertrag_stunden))
-    {
-        vertrag_stunden = 0;
+    if (isNaN(vertrag_stunden)) {
+      vertrag_stunden = 0;
     }
 
-    if (isNaN(vertrag_betrag))
-    {
-        vertrag_betrag = 0;
+    if (isNaN(vertrag_betrag)) {
+      vertrag_betrag = 0;
     }
 
-    /*
-    Formats the color of the rows depending on their status
-    - blue: dummy lectors
-    - orange: geaendert
-    - default (white) : bestellte
-    - green: akzeptiert
-    - grey: all other (marks unselectable)
-     */
-    row.getCells().forEach(function(cell){
-        if(is_dummy)
-        {
-            cell.getElement().classList.add('bg-info');                      // dummy lectors
-        }
-        else if (bestellt != null && (betrag != vertrag_betrag) ||
-            bestellt != null && stunden != vertrag_stunden &&
-            !row._row.element.classList.contains('tabulator-calcs')) // exclude calculation rows
-        {
-            cell.getElement().classList.add('bg-warning');                  // geaenderte
-        }
-        else if(bestellt != null && erteilt == null)
-        {
-            return;                                                         // bestellt
-        }
-        else if(bestellt != null && erteilt != null && akzeptiert != null)
-        {
-            cell.getElement().classList.add('bg-success')                   // akzeptiert
-        }
-        
-        // default color is already set in the Tabulator5.css file that gets loaded the Header flag tabulator5
-        // row.getElement().style["background-color"] = COLOR_LIGHTGREY;   // default
-        
-    });
-}
-
-// Formats row selectable/unselectable
-function func_selectableCheck(row){
-    var is_dummy = (row.getData().personalnummer <= 0 && row.getData().personalnummer != null);
-
-    var stunden = parseFloat(row.getData().stunden);
-    var vertrag_stunden = parseFloat(row.getData().vertrag_stunden);
-
-    var betrag = parseFloat(row.getData().betrag);
-    var vertrag_betrag = parseFloat(row.getData().vertrag_betrag);
-
-    if (isNaN(betrag))
-    {
-        betrag = 0;
+    if (
+      (bestellt != null && betrag != vertrag_betrag) ||
+      (bestellt != null && stunden != vertrag_stunden)
+    ) {
+      row.getData().status = "Geändert"; // geaendert
+    } else if (bestellt == null && erteilt == null && akzeptiert == null) {
+      row.getData().status = "Neu"; // neu
+    } else if (bestellt != null && erteilt == null && akzeptiert == null) {
+      row.getData().status = "Bestellt"; // bestellt
+    } else if (bestellt != null && erteilt != null && akzeptiert == null) {
+      row.getData().status = "Erteilt"; // erteilt
+    } else if (bestellt != null && erteilt != null && akzeptiert != null) {
+      row.getData().status = "Akzeptiert"; // akzeptiert
+    } else {
+      row.getData().status = null; // default
     }
-
-    if (isNaN(stunden))
-    {
-        stunden = 0;
-    }
-
-    if (isNaN(vertrag_stunden))
-    {
-        vertrag_stunden = 0;
-    }
-
-    if (isNaN(vertrag_betrag))
-    {
-        vertrag_betrag = 0;
-    }
-
-    // only allow to select bestellte Lehraufträge
-    return  !is_dummy &&                        // NOT dummy lector
-        row.getData().bestellt != null &&   // AND NOT neue
-        row.getData().erteilt == null &&    // AND bestellt
-        betrag == vertrag_betrag &&
-        stunden == vertrag_stunden;         // AND nicht geändert
-}
-
-// Adds column status
-function func_tableBuilt(table) {
-    // Add status column to table
-    table.tabulator("addColumn",
-        {
-            title: "<i class='fa fa-user-o'></i>",
-            field: "status",
-            width:40,
-            align:"center",
-            downloadTitle: 'Status',
-            formatter: status_formatter,
-            tooltip: status_tooltip
-        }, true
-    );
-}
-
-// Sets status values into column status
-function func_renderStarted(table){
-    // set literally status to each row - this enables sorting by status despite using icons
-    table.getRows().forEach(function(row){
-        var bestellt = row.getData().bestellt;
-        var erteilt = row.getData().erteilt;
-        var akzeptiert = row.getData().akzeptiert;
-
-        var stunden = parseFloat(row.getData().stunden);
-        var vertrag_stunden = parseFloat(row.getData().vertrag_stunden);
-
-        var betrag = parseFloat(row.getData().betrag);
-        var vertrag_betrag = parseFloat(row.getData().vertrag_betrag);
-
-        if (isNaN(betrag))
-        {
-            betrag = 0;
-        }
-
-        if (isNaN(stunden))
-        {
-            stunden = 0;
-        }
-
-        if (isNaN(vertrag_stunden))
-        {
-            vertrag_stunden = 0;
-        }
-
-        if (isNaN(vertrag_betrag))
-        {
-            vertrag_betrag = 0;
-        }
-
-        if ((bestellt != null && betrag != vertrag_betrag) ||
-            (bestellt != null && stunden != vertrag_stunden))
-        {
-            row.getData().status = 'Geändert';      // geaendert
-        }
-        else if (bestellt == null && erteilt == null && akzeptiert == null)
-        {
-            row.getData().status = 'Neu';           // neu
-        }
-        else if (bestellt != null && erteilt == null && akzeptiert == null)
-        {
-            row.getData().status = 'Bestellt';      // bestellt
-        }
-        else if (bestellt != null && erteilt != null && akzeptiert == null)
-        {
-            row.getData().status = 'Erteilt';       // erteilt
-        }
-        else if (bestellt != null && erteilt != null && akzeptiert != null)
-        {
-            row.getData().status = 'Akzeptiert';    // akzeptiert
-        }
-        else
-        {
-            row.getData().status = null;            // default
-        }
-    });
+  });
 }
 
 // Performes after row was updated
-function func_rowUpdated(row){
+function func_rowUpdated(row) {
+  // Refresh status icon and row color
+  row.reformat(); // retriggers cell formatters and rowFormatter callback
 
-    // Refresh status icon and row color
-    row.reformat(); // retriggers cell formatters and rowFormatter callback
-
-    // Deselect and disable new selection of updated rows
-    row.deselect();
-    row.getElement().style["pointerEvents"] = "none";
+  // Deselect and disable new selection of updated rows
+  row.deselect();
+  row.getElement().style["pointerEvents"] = "none";
 }
 
 // TableWidget Footer element
@@ -318,378 +308,369 @@ function func_rowUpdated(row){
  * Hook to overwrite TableWigdgets select-all-button behaviour
  * Select all (filtered) rows that are bestellt
  */
-function tableWidgetHook_selectAllButton(tableWidgetDiv){
-	var resultRows = tableWidgetDiv.find("#tableWidgetTabulator").tabulator('getRows', true)
-		.filter(row => row.getData().personalnummer >= 0 && // NOT dummies
-			row.getData().bestellt != null &&				// AND bestellt
-			row.getData().erteilt == null &&				// AND NOT erteilt
-			row.getData().status != 'Geändert');				// AND NOT geaendert
+function tableWidgetHook_selectAllButton(tableWidgetDiv) {
+  var resultRows = tableWidgetDiv
+    .find("#tableWidgetTabulator")
+    .tabulator("getRows", true)
+    .filter(
+      (row) =>
+        row.getData().personalnummer >= 0 && // NOT dummies
+        row.getData().bestellt != null && // AND bestellt
+        row.getData().erteilt == null && // AND NOT erteilt
+        row.getData().status != "Geändert"
+    ); // AND NOT geaendert
 
-    tableWidgetDiv.find("#tableWidgetTabulator").tabulator('selectRow', resultRows);
+  tableWidgetDiv
+    .find("#tableWidgetTabulator")
+    .tabulator("selectRow", resultRows);
 }
 
 // -----------------------------------------------------------------------------------------------------------------
 // Tabulator columns format functions
 // -----------------------------------------------------------------------------------------------------------------
 // Generates status icons
-status_formatter = function(cell, formatterParams, onRendered){
-    var is_dummy = (cell.getRow().getData().personalnummer <= 0 && cell.getRow().getData().personalnummer != null);
+status_formatter = function (cell, formatterParams, onRendered) {
+  var is_dummy =
+    cell.getRow().getData().personalnummer <= 0 &&
+    cell.getRow().getData().personalnummer != null;
 
-    var bestellt = cell.getRow().getData().bestellt;
-    var erteilt = cell.getRow().getData().erteilt;
-    var akzeptiert = cell.getRow().getData().akzeptiert;
+  var bestellt = cell.getRow().getData().bestellt;
+  var erteilt = cell.getRow().getData().erteilt;
+  var akzeptiert = cell.getRow().getData().akzeptiert;
 
-    var stunden = parseFloat(cell.getRow().getData().stunden);
-    var vertrag_stunden = parseFloat(cell.getRow().getData().vertrag_stunden);
+  var stunden = parseFloat(cell.getRow().getData().stunden);
+  var vertrag_stunden = parseFloat(cell.getRow().getData().vertrag_stunden);
 
-    var betrag = parseFloat(cell.getRow().getData().betrag);
-    var vertrag_betrag = parseFloat(cell.getRow().getData().vertrag_betrag);
+  var betrag = parseFloat(cell.getRow().getData().betrag);
+  var vertrag_betrag = parseFloat(cell.getRow().getData().vertrag_betrag);
 
-    if (isNaN(betrag))
-    {
-        betrag = 0;
-    }
+  if (isNaN(betrag)) {
+    betrag = 0;
+  }
 
-    if (isNaN(stunden))
-    {
-        stunden = 0;
-    }
+  if (isNaN(stunden)) {
+    stunden = 0;
+  }
 
-    if (isNaN(vertrag_stunden))
-    {
-        vertrag_stunden = 0;
-    }
+  if (isNaN(vertrag_stunden)) {
+    vertrag_stunden = 0;
+  }
 
-    if (isNaN(vertrag_betrag))
-    {
-        vertrag_betrag = 0;
-    }
+  if (isNaN(vertrag_betrag)) {
+    vertrag_betrag = 0;
+  }
 
-    // commented icons would be so nice to have with fontawsome 5.11...
-    if (is_dummy)
-    {
-        return "<i class='fa fa-user-secret'></i>";    // dummy lector
-    }
-    else if (bestellt != null && (betrag != vertrag_betrag) ||  // geaendert
-        bestellt != null && stunden != vertrag_stunden)     // geaendert ((if betrag is 0 or null)
-    {
-        return ICON_LEHRAUFTRAG_CHANGED;               // geaendert
-        // return "<i class='fas fa-user-edit'></i>";
-    }
-    else if (bestellt == null && erteilt == null && akzeptiert == null)
-    {
-        return "<i class='fa fa-user-plus'></i>";       // neu
-    }
-    else if (bestellt != null && erteilt == null && akzeptiert == null)
-    {
-        return ICON_LEHRAUFTRAG_ORDERED;                // bestellt
-        // return "<i class='fa fa-user-tag'></i>";
-    }
-    else if (bestellt != null && erteilt != null && akzeptiert == null)
-    {
-        return ICON_LEHRAUFTRAG_APPROVED;               // erteilt
-        // return "<i class='fas fa-user-check'></i>";
-    }
-    else if (bestellt != null && erteilt != null && akzeptiert != null)
-    {
-        return "<i class='fa fa-handshake-o'></i>";     // akzeptiert
-        // return "<i class='fas fa-user-graduate'></i>";
-    }
-    else
-    {
-        return "<i class='fa fa-user'></i>";            // default
-    }
+  // commented icons would be so nice to have with fontawsome 5.11...
+  if (is_dummy) {
+    return "<i class='fa fa-user-secret'></i>"; // dummy lector
+  } else if (
+    (bestellt != null && betrag != vertrag_betrag) || // geaendert
+    (bestellt != null && stunden != vertrag_stunden)
+  ) {
+    // geaendert ((if betrag is 0 or null)
+    return ICON_LEHRAUFTRAG_CHANGED; // geaendert
+    // return "<i class='fas fa-user-edit'></i>";
+  } else if (bestellt == null && erteilt == null && akzeptiert == null) {
+    return "<i class='fa fa-user-plus'></i>"; // neu
+  } else if (bestellt != null && erteilt == null && akzeptiert == null) {
+    return ICON_LEHRAUFTRAG_ORDERED; // bestellt
+    // return "<i class='fa fa-user-tag'></i>";
+  } else if (bestellt != null && erteilt != null && akzeptiert == null) {
+    return ICON_LEHRAUFTRAG_APPROVED; // erteilt
+    // return "<i class='fas fa-user-check'></i>";
+  } else if (bestellt != null && erteilt != null && akzeptiert != null) {
+    return "<i class='fa fa-handshake-o'></i>"; // akzeptiert
+    // return "<i class='fas fa-user-graduate'></i>";
+  } else {
+    return "<i class='fa fa-user'></i>"; // default
+  }
 };
 
 // Generates status tooltip
-status_tooltip = function(e, cell, onRendered){
-    //e - mouseover event
-    //cell - cell component
-    //onRendered - onRendered callback registration function
-    
-    var is_dummy = (cell.getRow().getData().personalnummer <= 0 && cell.getRow().getData().personalnummer != null);
+status_tooltip = function (e, cell, onRendered) {
+  //e - mouseover event
+  //cell - cell component
+  //onRendered - onRendered callback registration function
 
-    var bestellt = cell.getRow().getData().bestellt;
-    var erteilt = cell.getRow().getData().erteilt;
-    var akzeptiert = cell.getRow().getData().akzeptiert;
+  var is_dummy =
+    cell.getRow().getData().personalnummer <= 0 &&
+    cell.getRow().getData().personalnummer != null;
 
-    var betrag = parseFloat(cell.getRow().getData().betrag);
-    var stunden = parseFloat(cell.getRow().getData().stunden);
+  var bestellt = cell.getRow().getData().bestellt;
+  var erteilt = cell.getRow().getData().erteilt;
+  var akzeptiert = cell.getRow().getData().akzeptiert;
 
-    var vertrag_betrag = parseFloat(cell.getRow().getData().vertrag_betrag);
-    var vertrag_stunden = parseFloat(cell.getRow().getData().vertrag_stunden);
+  var betrag = parseFloat(cell.getRow().getData().betrag);
+  var stunden = parseFloat(cell.getRow().getData().stunden);
 
-    if (isNaN(betrag))
-    {
-        betrag = 0;
-    }
+  var vertrag_betrag = parseFloat(cell.getRow().getData().vertrag_betrag);
+  var vertrag_stunden = parseFloat(cell.getRow().getData().vertrag_stunden);
 
-    if (isNaN(stunden))
-    {
-        stunden = 0;
-    }
+  if (isNaN(betrag)) {
+    betrag = 0;
+  }
 
-    if (isNaN(vertrag_betrag))
-    {
-        vertrag_betrag = 0;
-    }
+  if (isNaN(stunden)) {
+    stunden = 0;
+  }
 
-    if (isNaN(vertrag_stunden)){
-        vertrag_stunden = 0;
-    }
+  if (isNaN(vertrag_betrag)) {
+    vertrag_betrag = 0;
+  }
 
-    var text = FHC_PhrasesLib.t("ui", "stundenStundensatzGeaendert");
-    text += "\n";
+  if (isNaN(vertrag_stunden)) {
+    vertrag_stunden = 0;
+  }
 
-    if (is_dummy)                                                               // dummy (no lector)
-    {
-        return FHC_PhrasesLib.t("ui", "neuerLehrauftragOhneLektorVerplant");
-    }
-    else if ((bestellt != null && erteilt == null && betrag != vertrag_betrag) ||
-        (bestellt != null && erteilt == null && stunden != vertrag_stunden))   // geaendert (when never erteilt before)
-    {
-        return text += FHC_PhrasesLib.t("ui", "wartetAufBestellung");
-    }
-    else if ((bestellt != null && erteilt != null && betrag != vertrag_betrag) ||
-        (bestellt != null && erteilt != null && stunden != vertrag_stunden))   // geaendert (when has been erteilt once)
-    {
-        return text += FHC_PhrasesLib.t("ui", "wartetAufErneuteBestellung");
-    }
-    else if (bestellt == null)                                                  // neu
-    {
-        return FHC_PhrasesLib.t("ui", "neuerLehrauftragWartetAufBestellung");
-    }
-    else if (bestellt != null && erteilt == null && akzeptiert == null)         // bestellt
-    {
-        return FHC_PhrasesLib.t("ui", "letzterStatusBestellt");
-    }
-    else if (bestellt != null && erteilt != null && akzeptiert == null)         // erteilt
-    {
-        return FHC_PhrasesLib.t("ui", "letzterStatusErteilt");
-    }
-    else if (bestellt != null && erteilt != null && akzeptiert != null)         // akzeptiert
-    {
-        return FHC_PhrasesLib.t("ui", "letzterStatusAngenommen");
-    }
-}
+  var text = FHC_PhrasesLib.t("ui", "stundenStundensatzGeaendert");
+  text += "\n";
+
+  if (is_dummy) {
+    // dummy (no lector)
+    return FHC_PhrasesLib.t("ui", "neuerLehrauftragOhneLektorVerplant");
+  } else if (
+    (bestellt != null && erteilt == null && betrag != vertrag_betrag) ||
+    (bestellt != null && erteilt == null && stunden != vertrag_stunden)
+  ) {
+    // geaendert (when never erteilt before)
+    return (text += FHC_PhrasesLib.t("ui", "wartetAufBestellung"));
+  } else if (
+    (bestellt != null && erteilt != null && betrag != vertrag_betrag) ||
+    (bestellt != null && erteilt != null && stunden != vertrag_stunden)
+  ) {
+    // geaendert (when has been erteilt once)
+    return (text += FHC_PhrasesLib.t("ui", "wartetAufErneuteBestellung"));
+  } else if (bestellt == null) {
+    // neu
+    return FHC_PhrasesLib.t("ui", "neuerLehrauftragWartetAufBestellung");
+  } else if (bestellt != null && erteilt == null && akzeptiert == null) {
+    // bestellt
+    return FHC_PhrasesLib.t("ui", "letzterStatusBestellt");
+  } else if (bestellt != null && erteilt != null && akzeptiert == null) {
+    // erteilt
+    return FHC_PhrasesLib.t("ui", "letzterStatusErteilt");
+  } else if (bestellt != null && erteilt != null && akzeptiert != null) {
+    // akzeptiert
+    return FHC_PhrasesLib.t("ui", "letzterStatusAngenommen");
+  }
+};
 
 // Generates bestellt tooltipPhrase
-bestellt_tooltip = function(e, cell, onRendered){
-    //e - mouseover event
-    //cell - cell component
-    //onRendered - onRendered callback registration function
-    
-    if (cell.getRow().getData().bestellt_von != null)
-    {
-        return FHC_PhrasesLib.t("ui", "bestelltVon") + cell.getRow().getData().bestellt_von;
-    }
-}
+bestellt_tooltip = function (e, cell, onRendered) {
+  //e - mouseover event
+  //cell - cell component
+  //onRendered - onRendered callback registration function
+
+  if (cell.getRow().getData().bestellt_von != null) {
+    return (
+      FHC_PhrasesLib.t("ui", "bestelltVon") +
+      cell.getRow().getData().bestellt_von
+    );
+  }
+};
 
 // Generates erteilt tooltip
-erteilt_tooltip = function(e, cell, onRendered){
-    //e - mouseover event
-    //cell - cell component
-    //onRendered - onRendered callback registration function
+erteilt_tooltip = function (e, cell, onRendered) {
+  //e - mouseover event
+  //cell - cell component
+  //onRendered - onRendered callback registration function
 
-    if (cell.getRow().getData().erteilt_von != null) {
-        return FHC_PhrasesLib.t("ui", "erteiltVon") + cell.getRow().getData().erteilt_von;
-    }
-}
+  if (cell.getRow().getData().erteilt_von != null) {
+    return (
+      FHC_PhrasesLib.t("ui", "erteiltVon") + cell.getRow().getData().erteilt_von
+    );
+  }
+};
 
 // Generates akzeptiert tooltip
-akzeptiert_tooltip = function(e, cell, onRendered){
-    //e - mouseover event
-    //cell - cell component
-    //onRendered - onRendered callback registration function
+akzeptiert_tooltip = function (e, cell, onRendered) {
+  //e - mouseover event
+  //cell - cell component
+  //onRendered - onRendered callback registration function
 
-    if (cell.getRow().getData().akzeptiert_von != null) {
-        return FHC_PhrasesLib.t("ui", "angenommenVon") + cell.getRow().getData().akzeptiert_von;
+  if (cell.getRow().getData().akzeptiert_von != null) {
+    return (
+      FHC_PhrasesLib.t("ui", "angenommenVon") +
+      cell.getRow().getData().akzeptiert_von
+    );
+  }
+};
+$(function () {
+  // tableInit is called in the jquery_wrapper when the tableBuilt event was finished
+  $(document).on("tableInit", function (event, tabulatorInstance) {
+    func_tableBuilt($("#tableWidgetTabulator"));
+
+    // event rowSelectionChanged needs to be attached as a callback to the tableBuilt event in tabulator5
+    $("#tableWidgetTabulator").tabulator("on", "renderStarted", () =>
+      func_renderStarted(tabulatorInstance)
+    );
+    $("#tableWidgetTabulator").tabulator("on", "rowUpdated", (row) =>
+      func_rowUpdated(row)
+    );
+  });
+
+  // Redraw table on resize to fit tabulators height to windows height
+  window.addEventListener("resize", function () {
+    $("#tableWidgetTabulator").tabulator("setHeight", $(window).height() * 0.5);
+    $("#tableWidgetTabulator").tabulator("redraw", true);
+  });
+
+  // Show all rows
+  $("#show-all").click(function () {
+    $("#tableWidgetTabulator").tabulator("clearFilter");
+  });
+
+  // Show only rows with new lehrauftraege (not dummy lectors)
+  $("#show-new").click(function () {
+    $("#tableWidgetTabulator").tabulator("setFilter", [
+      { field: "personalnummer", type: ">=", value: 0 },
+      { field: "bestellt", type: "=", value: null },
+      { field: "erteilt", type: "=", value: null },
+      { field: "akzeptiert", type: "=", value: null },
+    ]);
+  });
+
+  // Show only rows with ordered lehrauftraege
+  $("#show-ordered").click(function () {
+    $("#tableWidgetTabulator").tabulator("setFilter", [
+      { field: "personalnummer", type: ">=", value: 0 },
+      { field: "bestellt", type: "!=", value: null },
+      { field: "erteilt", type: "=", value: null },
+      { field: "akzeptiert", type: "=", value: null },
+    ]);
+  });
+
+  // Show only rows with erteilte lehrauftraege
+  $("#show-approved").click(function () {
+    $("#tableWidgetTabulator").tabulator("setFilter", [
+      { field: "bestellt", type: "!=", value: null },
+      { field: "erteilt", type: "!=", value: null },
+      { field: "akzeptiert", type: "=", value: null },
+    ]);
+  });
+
+  // Show only rows with accepted lehrauftraege
+  $("#show-accepted").click(function () {
+    $("#tableWidgetTabulator").tabulator("setFilter", [
+      { field: "bestellt", type: "!=", value: null },
+      { field: "erteilt", type: "!=", value: null },
+      { field: "akzeptiert", type: "!=", value: null },
+    ]);
+  });
+
+  // Show only rows with dummy lectors
+  $("#show-dummies").click(function () {
+    $("#tableWidgetTabulator").tabulator("setFilter", [
+      { field: "personalnummer", type: "!=", value: null },
+      { field: "personalnummer", type: "<=", value: 0 },
+    ]);
+  });
+
+  // Show only rows with dummy lectors
+  $("#show-changed").click(function () {
+    // needs custom filter to compare fields betrag and vertrag_betrag
+    $("#tableWidgetTabulator").tabulator("setFilter", [
+      { field: "personalnummer", type: ">=", value: 0 }, // NOT dummy lector AND
+      { field: "bestellt", type: "!=", value: null }, // bestellt AND
+      { field: "status", type: "=", value: "Geändert" }, // geaendert
+    ]);
+  });
+
+  // Set png-icons into filter-buttons
+  $(".btn-lehrauftrag").each(function () {
+    switch (this.id) {
+      case "show-ordered":
+        this.innerHTML = ICON_LEHRAUFTRAG_ORDERED;
+        break;
+      case "show-approved":
+        this.innerHTML = ICON_LEHRAUFTRAG_APPROVED;
+        break;
+      case "show-changed":
+        this.innerHTML = ICON_LEHRAUFTRAG_CHANGED;
+        break;
     }
-}
-$(function() {
+  });
 
-    // tableInit is called in the jquery_wrapper when the tableBuilt event was finished
-    $(document).on("tableInit", function(event,tabulatorInstance) {
-     
-        func_tableBuilt($("#tableWidgetTabulator"))
-        
-        // event rowSelectionChanged needs to be attached as a callback to the tableBuilt event in tabulator5
-        $("#tableWidgetTabulator").tabulator("on","renderStarted",()=>func_renderStarted(tabulatorInstance));
-        $("#tableWidgetTabulator").tabulator("on","rowUpdated",(row)=>func_rowUpdated(row));
-       
-    });
+  // De/activate and un/focus on clicked button, En-/Disable 'Lehrauftrag erteilen'
+  $(".btn-lehrauftrag").click(function () {
+    // De/activate and un/focus on clicked button
+    $(".btn-lehrauftrag").removeClass("focus").removeClass("active");
+    $(this).addClass("focus").addClass("active");
 
-    // Redraw table on resize to fit tabulators height to windows height
-    window.addEventListener('resize', function(){
-        $('#tableWidgetTabulator').tabulator('setHeight', $(window).height() * 0.50);
-        $('#tableWidgetTabulator').tabulator('redraw', true);
-    });
+    // Enable button 'Lehrauftrag bestellen' by default
+    $("#approve-lehrauftraege").attr("disabled", false).attr("title", "");
 
-    // Show all rows
-    $("#show-all").click(function(){
-        $('#tableWidgetTabulator').tabulator('clearFilter');
-    });
-
-    // Show only rows with new lehrauftraege (not dummy lectors)
-    $("#show-new").click(function(){
-        $('#tableWidgetTabulator').tabulator('setFilter',
-            [
-                {field: 'personalnummer', type: '>=', value: 0},
-                {field: 'bestellt', type: '=', value: null},
-                {field: 'erteilt', type: '=', value: null},
-                {field: 'akzeptiert', type: '=', value: null}
-            ]
+    // Disable button Lehrauftrag bestellen for dummies
+    if (this.id == "show-dummies") {
+      $("#approve-lehrauftraege")
+        .attr("disabled", true)
+        .attr(
+          "title",
+          "Lehraufträge ohne Lektorzuteilung können nicht bestellt werden."
         );
-    });
+    }
+  });
 
-    // Show only rows with ordered lehrauftraege
-    $("#show-ordered").click(function(){
-        $('#tableWidgetTabulator').tabulator('setFilter',
-            [
-                {field: 'personalnummer', type: '>=', value: 0},
-                {field: 'bestellt', type: '!=', value: null},
-                {field: 'erteilt', type: '=', value: null},
-                {field: 'akzeptiert', type: '=', value: null}
-            ]
-        );
-    });
-
-    // Show only rows with erteilte lehrauftraege
-    $("#show-approved").click(function(){
-        $('#tableWidgetTabulator').tabulator('setFilter',
-            [
-                {field: 'bestellt', type: '!=', value: null},
-                {field: 'erteilt', type: '!=', value: null},
-                {field: 'akzeptiert', type: '=', value: null}
-            ]
-        );
-    });
-
-    // Show only rows with accepted lehrauftraege
-    $("#show-accepted").click(function(){
-        $('#tableWidgetTabulator').tabulator('setFilter',
-            [
-                {field: 'bestellt', type: '!=', value: null},
-                {field: 'erteilt', type: '!=', value: null},
-                {field: 'akzeptiert', type: '!=', value: null}
-            ]
-        );
-    });
-
-    // Show only rows with dummy lectors
-    $("#show-dummies").click(function(){
-        $('#tableWidgetTabulator').tabulator('setFilter',
-            [
-                {field: 'personalnummer', type: '!=', value: null},
-                {field: 'personalnummer', type: '<=', value: 0},
-            ]
-        );
-    });
-
-    // Show only rows with dummy lectors
-    $("#show-changed").click(function(){
-        // needs custom filter to compare fields betrag and vertrag_betrag
-        $('#tableWidgetTabulator').tabulator('setFilter',
-            [
-                {field: 'personalnummer', type: '>=', value: 0},    // NOT dummy lector AND
-                {field: 'bestellt', type: '!=', value: null},       // bestellt AND
-                {field: 'status', type: '=', value: 'Geändert'}     // geaendert
-            ]
-        );
-    });
-
-    // Set png-icons into filter-buttons
-    $(".btn-lehrauftrag").each(function(){
-        switch(this.id) {
-            case 'show-ordered':
-                this.innerHTML = ICON_LEHRAUFTRAG_ORDERED;
-                break;
-            case 'show-approved':
-                this.innerHTML = ICON_LEHRAUFTRAG_APPROVED;
-                break;
-            case 'show-changed':
-                this.innerHTML = ICON_LEHRAUFTRAG_CHANGED;
-                break;
-        }
-    });
-
-    // De/activate and un/focus on clicked button, En-/Disable 'Lehrauftrag erteilen'
-    $(".btn-lehrauftrag").click(function() {
-
-        // De/activate and un/focus on clicked button
-        $(".btn-lehrauftrag").removeClass('focus').removeClass('active');
-        $(this).addClass('focus').addClass('active');
-
-        // Enable button 'Lehrauftrag bestellen' by default
-        $('#approve-lehrauftraege').attr('disabled', false).attr('title', '');
-
-        // Disable button Lehrauftrag bestellen for dummies
-        if (this.id == 'show-dummies')
-        {
-            $('#approve-lehrauftraege').attr('disabled', true).attr('title', 'Lehraufträge ohne Lektorzuteilung können nicht bestellt werden.');
-        }
-    });
-
-    // Approve Lehrauftraege
-    $("#approve-lehrauftraege").click(function(){
-
-        var selected_data = $('#tableWidgetTabulator').tabulator('getSelectedData')
-            .filter(function(val){
-                // filter pseudo lines of groupBy (e.g. the bottom calculations lines)
-                return val.row_index != null || typeof(val.row_index) !== 'undefined';
-            })
-            .map(function(data){
-                // reduce to necessary fields
-                return {
-                    'row_index': data.row_index,
-                    'mitarbeiter_uid' : data.mitarbeiter_uid,
-                    'vertrag_id' : data.vertrag_id
-                }
-            });
-
-        // Alert and exit if no lehraufgang is selected
-        if (selected_data.length == 0)
-        {
-            FHC_DialogLib.alertInfo('Bitte wählen Sie erst zumindest einen Lehrauftrag');
-            return;
-        }
-
-        /*
-         * Prepare data object for ajax call
-         * NOTE: Stringify to send only ONE post param (json string) instead of many single post params.
-         * This avoids issues with POST param limitation.
-         */
-        var data = {
-            'selected_data': JSON.stringify(selected_data)
+  // Approve Lehrauftraege
+  $("#approve-lehrauftraege").click(function () {
+    var selected_data = $("#tableWidgetTabulator")
+      .tabulator("getSelectedData")
+      .filter(function (val) {
+        // filter pseudo lines of groupBy (e.g. the bottom calculations lines)
+        return val.row_index != null || typeof val.row_index !== "undefined";
+      })
+      .map(function (data) {
+        // reduce to necessary fields
+        return {
+          row_index: data.row_index,
+          mitarbeiter_uid: data.mitarbeiter_uid,
+          vertrag_id: data.vertrag_id,
         };
+      });
 
-        FHC_AjaxClient.ajaxCallPost(
-            FHC_JS_DATA_STORAGE_OBJECT.called_path + "/approveLehrauftrag",
-            data,
-            {
-                successCallback: function (data, textStatus, jqXHR)
-                {
-                    if (!data.error && data.retval != null)
-                    {
-                        // Update status 'Erteilt'
-                        $('#tableWidgetTabulator').tabulator('updateData', data.retval);
+    // Alert and exit if no lehraufgang is selected
+    if (selected_data.length == 0) {
+      FHC_DialogLib.alertInfo(
+        "Bitte wählen Sie erst zumindest einen Lehrauftrag"
+      );
+      return;
+    }
 
-                        // Print success message
-                        FHC_DialogLib.alertSuccess(data.retval.length + " Lehraufträge wurden erteilt.");
-                    }
+    /*
+     * Prepare data object for ajax call
+     * NOTE: Stringify to send only ONE post param (json string) instead of many single post params.
+     * This avoids issues with POST param limitation.
+     */
+    var data = {
+      selected_data: JSON.stringify(selected_data),
+    };
 
-                    if (data.error && data.retval != null)
-                    {
-                        // Print error message
-                        FHC_DialogLib.alertError(data.retval);
-                    }
-                },
-                errorCallback: function (jqXHR, textStatus, errorThrown)
-                {
-                    FHC_DialogLib.alertError("Systemfehler<br>Bitte kontaktieren Sie Ihren Administrator.");
-                }
-            }
-        );
+    FHC_AjaxClient.ajaxCallPost(
+      FHC_JS_DATA_STORAGE_OBJECT.called_path + "/approveLehrauftrag",
+      data,
+      {
+        successCallback: function (data, textStatus, jqXHR) {
+          if (!data.error && data.retval != null) {
+            // Update status 'Erteilt'
+            $("#tableWidgetTabulator").tabulator("updateData", data.retval);
 
-    });
+            // Print success message
+            FHC_DialogLib.alertSuccess(
+              data.retval.length + " Lehraufträge wurden erteilt."
+            );
+          }
+
+          if (data.error && data.retval != null) {
+            // Print error message
+            FHC_DialogLib.alertError(data.retval);
+          }
+        },
+        errorCallback: function (jqXHR, textStatus, errorThrown) {
+          FHC_DialogLib.alertError(
+            "Systemfehler<br>Bitte kontaktieren Sie Ihren Administrator."
+          );
+        },
+      }
+    );
+  });
 });
diff --git a/public/js/lehre/lehrauftrag/orderLehrauftrag.js b/public/js/lehre/lehrauftrag/orderLehrauftrag.js
index 9eb5da144..4dc266139 100644
--- a/public/js/lehre/lehrauftrag/orderLehrauftrag.js
+++ b/public/js/lehre/lehrauftrag/orderLehrauftrag.js
@@ -14,19 +14,22 @@ const COLOR_LIGHTGREY = "#f5f5f5";
  * PNG icons used in status- and filter buttons
  * Setting png icons is a workaround to use font-awsome 5.9.0 icons until system can be updated to newer font awsome version.
  * */
-const ICON_LEHRAUFTRAG_ORDERED = '<img src="../../../public/images/icons/fa-user-tag.png" style="height: 30px; width: 30px; margin: -6px;">';
-const ICON_LEHRAUFTRAG_APPROVED = '<img src="../../../public/images/icons/fa-user-check.png" style="height: 30px; width: 30px; margin: -6px;">';
-const ICON_LEHRAUFTRAG_CHANGED = '<img src="../../../public/images/icons/fa-user-edit.png" style="height: 30px; width: 30px; margin: -6px;">';
+const ICON_LEHRAUFTRAG_ORDERED =
+  '<img src="../../../public/images/icons/fa-user-tag.png" style="height: 30px; width: 30px; margin: -6px;">';
+const ICON_LEHRAUFTRAG_APPROVED =
+  '<img src="../../../public/images/icons/fa-user-check.png" style="height: 30px; width: 30px; margin: -6px;">';
+const ICON_LEHRAUFTRAG_CHANGED =
+  '<img src="../../../public/images/icons/fa-user-edit.png" style="height: 30px; width: 30px; margin: -6px;">';
 
 // Fields that should not be provided in the column picker
 var tableWidgetBlacklistArray_columnUnselectable = [
-	'status',
-	'row_index',
-	'personalnummer',
-	'betrag',
-	'vertrag_id',
-	'vertrag_stunden',
-	'vertrag_betrag'
+  "status",
+  "row_index",
+  "personalnummer",
+  "betrag",
+  "vertrag_id",
+  "vertrag_stunden",
+  "vertrag_betrag",
 ];
 
 // -----------------------------------------------------------------------------------------------------------------
@@ -35,60 +38,68 @@ var tableWidgetBlacklistArray_columnUnselectable = [
 
 // Converts string date postgre style to string DD.MM.YYYY.
 // This will allow correct filtering.
-var mut_formatStringDate = function(value, data, type, params, component) {
-	if (value != null)
-	{
-		var d = new Date(value);
-		return ("0" + (d.getDate())).slice(-2)  + "." + ("0" + (d.getMonth() + 1)).slice(-2) + "." + d.getFullYear();
-	}
-}
+var mut_formatStringDate = function (value, data, type, params, component) {
+  if (value != null) {
+    var d = new Date(value);
+    return (
+      ("0" + d.getDate()).slice(-2) +
+      "." +
+      ("0" + (d.getMonth() + 1)).slice(-2) +
+      "." +
+      d.getFullYear()
+    );
+  }
+};
 
 // -----------------------------------------------------------------------------------------------------------------
 // Formatters - changes display information, not the data itself
 // -----------------------------------------------------------------------------------------------------------------
 
 // Formats null values to a string number '0.00'
-var form_formatNulltoStringNumber = function(cell, formatterParams, onRendered){
-    //cell - the cell component
-    //formatterParams - parameters set for the column
-    //onRendered - function to call when the formatter has been rendered
+var form_formatNulltoStringNumber = function (
+  cell,
+  formatterParams,
+  onRendered
+) {
+  //cell - the cell component
+  //formatterParams - parameters set for the column
+  //onRendered - function to call when the formatter has been rendered
 
-	if (cell.getValue() == null){
-		if (formatterParams.precision == 1)
-		{
-			return '0.0';
-		}
-		return '0.00';
-	}
-	else {
-		return cell.getValue();
-	}
-}
+  if (cell.getValue() == null) {
+    if (formatterParams.precision == 1) {
+      return "0.0";
+    }
+    return "0.00";
+  } else {
+    return cell.getValue();
+  }
+};
 
 // -----------------------------------------------------------------------------------------------------------------
 // Header filter
 // -----------------------------------------------------------------------------------------------------------------
 
 // Filters values using comparison operator or just by string comparison
-function hf_filterStringnumberWithOperator(headerValue, rowValue, rowData, filterParams){
+function hf_filterStringnumberWithOperator(
+  headerValue,
+  rowValue,
+  rowData,
+  filterParams
+) {
+  // If string starts with <, <=, >, >=, !=, ==, compare values with that operator
+  var operator = "";
+  if (headerValue.match(/([<=>!]{1,2})/g)) {
+    var operator_arr = headerValue.match(/([<=>!]{1,2})/g);
+    operator = operator_arr[0];
 
-	// If string starts with <, <=, >, >=, !=, ==, compare values with that operator
-	var operator = '';
-	if (headerValue.match(/([<=>!]{1,2})/g)) {
-		var operator_arr = headerValue.match(/([<=>!]{1,2})/g);
-		operator = operator_arr[0];
+    headerValue = headerValue.replace(operator, "").trim();
 
-		headerValue = headerValue
-			.replace(operator, '')
-			.trim()
-		;
+    // return if value comparison is true
+    return eval(rowValue + operator + headerValue);
+  }
 
-		// return if value comparison is true
-		return eval(rowValue + operator + headerValue);
-	}
-
-	// If just a stringnumber, return if exact match found
-	return parseFloat(rowValue) == headerValue;
+  // If just a stringnumber, return if exact match found
+  return parseFloat(rowValue) == headerValue;
 }
 
 // -----------------------------------------------------------------------------------------------------------------
@@ -101,21 +112,20 @@ function hf_filterStringnumberWithOperator(headerValue, rowValue, rowData, filte
  * it is processed before the callback tableBuilt, where the status is going to be built.
  * The callback dataLoaded is processed after tableBuild and provides the status.
  */
-function func_dataLoaded(data, table){
-
-	table.setFilter([
-		[
-			{field: 'personalnummer', type: '>', value: 0},	   // not dummy
-			{field: 'personalnummer', type: '=', value: null}	 // include projektbetreuer
-		],
-		{field: 'mitarbeiter_uid', type: '!=', value: null},	// AND is Mitarbeiter
-		{field: 'stunden', type: '!=', value: null},			// AND has Semesterstunden (not null and not 0)
-		{field: 'stunden', type: '!=', value: 0},
-		[
-			{field: 'status', type: '=', value: 'Neu'},		 // AND neu
-			{field: 'status', type: '=', value: 'Geändert'}	 // OR geaendert
-		]
-	]);
+function func_dataLoaded(data, table) {
+  table.setFilter([
+    [
+      { field: "personalnummer", type: ">", value: 0 }, // not dummy
+      { field: "personalnummer", type: "=", value: null }, // include projektbetreuer
+    ],
+    { field: "mitarbeiter_uid", type: "!=", value: null }, // AND is Mitarbeiter
+    { field: "stunden", type: "!=", value: null }, // AND has Semesterstunden (not null and not 0)
+    { field: "stunden", type: "!=", value: 0 },
+    [
+      { field: "status", type: "=", value: "Neu" }, // AND neu
+      { field: "status", type: "=", value: "Geändert" }, // OR geaendert
+    ],
+  ]);
 }
 
 // -----------------------------------------------------------------------------------------------------------------
@@ -123,52 +133,55 @@ function func_dataLoaded(data, table){
 // -----------------------------------------------------------------------------------------------------------------
 
 // Returns relative height (depending on screen size)
-function func_height(table){
-	return $(window).height() * 0.50;
+function func_height(table) {
+  return $(window).height() * 0.5;
 }
 
 // Formats the group header
 function func_groupHeader(data) {
-	return data[0].lv_bezeichnung + "&nbsp;&nbsp;" + ' ( LV-ID: ' + data[0].lehrveranstaltung_id + ' )';  // change name to lehrveranstaltung;
+  return (
+    data[0].lv_bezeichnung +
+    "&nbsp;&nbsp;" +
+    " ( LV-ID: " +
+    data[0].lehrveranstaltung_id +
+    " )"
+  ); // change name to lehrveranstaltung;
 }
 
 // Formats the rows
-function func_rowFormatter(row){
-	var is_dummy = (row.getData().personalnummer <= 0 && row.getData().personalnummer != null);
-	var is_mitarbeiter = row.getData().mitarbeiter_uid != null;
-	var has_stunden = row.getData().stunden != 0 && row.getData().stunden != null;
+function func_rowFormatter(row) {
+  var is_dummy =
+    row.getData().personalnummer <= 0 && row.getData().personalnummer != null;
+  var is_mitarbeiter = row.getData().mitarbeiter_uid != null;
+  var has_stunden = row.getData().stunden != 0 && row.getData().stunden != null;
 
-	var bestellt = row.getData().bestellt;
-	var erteilt = row.getData().erteilt;
-	var akzeptiert = row.getData().akzeptiert;
+  var bestellt = row.getData().bestellt;
+  var erteilt = row.getData().erteilt;
+  var akzeptiert = row.getData().akzeptiert;
 
-	var stunden = parseFloat(row.getData().stunden);
-	var vertrag_stunden = parseFloat(row.getData().vertrag_stunden);
+  var stunden = parseFloat(row.getData().stunden);
+  var vertrag_stunden = parseFloat(row.getData().vertrag_stunden);
 
-	var betrag = parseFloat(row.getData().betrag);
-	var vertrag_betrag = parseFloat(row.getData().vertrag_betrag);
+  var betrag = parseFloat(row.getData().betrag);
+  var vertrag_betrag = parseFloat(row.getData().vertrag_betrag);
 
-	if (isNaN(betrag))
-	{
-		betrag = 0;
-	}
+  if (isNaN(betrag)) {
+    betrag = 0;
+  }
 
-	if (isNaN(stunden))
-	{
-		stunden = 0;
-	}
+  if (isNaN(stunden)) {
+    stunden = 0;
+  }
 
-	if (isNaN(vertrag_stunden))
-	{
-		vertrag_stunden = 0;
-	}
+  if (isNaN(vertrag_stunden)) {
+    vertrag_stunden = 0;
+  }
 
-	if (isNaN(vertrag_betrag))
-	{
-		vertrag_betrag = 0;
-	}
+  if (isNaN(vertrag_betrag)) {
+    vertrag_betrag = 0;
+  }
 
-	/*
+  /*
 	Formats the color of the rows depending on their status
 	- blue: dummy lectors
 	- bold: geaendert
@@ -176,167 +189,151 @@ function func_rowFormatter(row){
 	- green: akzeptiert
 	- grey: all other (marks unselectable), not mitarbeiter, has no semesterstunden
 	 */
-	row.getCells().forEach(function(cell){
-		if(is_dummy)
-		{
-			cell.getElement().classList.add('bg-info');						  // dummy lectors
-		}
-		else if ((!is_mitarbeiter || !has_stunden) && akzeptiert == null)
-		{
-			row.getElement().style["background-color"] = COLOR_LIGHTGREY;
-		}
-		else if (bestellt != null && (betrag != vertrag_betrag) ||
-			bestellt != null && stunden != vertrag_stunden &&
-			!row._row.element.classList.contains('tabulator-calcs'))		// exclude calculation rows
-		{
-			row.getElement().style['font-weight'] = 'bold';					// geaendert
-		}
-		else if(bestellt == null)
-		{
-			return;															 // neu und erteilt
-		}
-		else if(bestellt != null && erteilt != null && akzeptiert != null)
-		{
-			cell.getElement().classList.add('bg-success')					   // akzeptiert
-		}
-		
-		// default color is already set in the Tabulator5.css file that gets loaded the Header flag tabulator5
-        // row.getElement().style["background-color"] = COLOR_LIGHTGREY;   // default
-        
-	});
+  row.getCells().forEach(function (cell) {
+    if (is_dummy) {
+      cell.getElement().classList.add("bg-info"); // dummy lectors
+    } else if ((!is_mitarbeiter || !has_stunden) && akzeptiert == null) {
+      row.getElement().style["background-color"] = COLOR_LIGHTGREY;
+    } else if (
+      (bestellt != null && betrag != vertrag_betrag) ||
+      (bestellt != null &&
+        stunden != vertrag_stunden &&
+        !row._row.element.classList.contains("tabulator-calcs"))
+    ) {
+      // exclude calculation rows
+      row.getElement().style["font-weight"] = "bold"; // geaendert
+    } else if (bestellt == null) {
+      return; // neu und erteilt
+    } else if (bestellt != null && erteilt != null && akzeptiert != null) {
+      cell.getElement().classList.add("bg-success"); // akzeptiert
+    }
+
+    // default color is already set in the Tabulator5.css file that gets loaded the Header flag tabulator5
+    // row.getElement().style["background-color"] = COLOR_LIGHTGREY;   // default
+  });
 }
 
 // Formats row selectable/unselectable
-function func_selectableCheck(row){
-	var is_dummy = (row.getData().personalnummer <= 0 && row.getData().personalnummer != null);
-	var is_mitarbeiter = row.getData().mitarbeiter_uid != null;
-	var has_stunden = row.getData().stunden != 0 && row.getData().stunden != null;
+function func_selectableCheck(row) {
+  var is_dummy =
+    row.getData().personalnummer <= 0 && row.getData().personalnummer != null;
+  var is_mitarbeiter = row.getData().mitarbeiter_uid != null;
+  var has_stunden = row.getData().stunden != 0 && row.getData().stunden != null;
 
-	var stunden = parseFloat(row.getData().stunden);
-	var vertrag_stunden = parseFloat(row.getData().vertrag_stunden);
+  var stunden = parseFloat(row.getData().stunden);
+  var vertrag_stunden = parseFloat(row.getData().vertrag_stunden);
 
-	var betrag = parseFloat(row.getData().betrag);
-	var vertrag_betrag = parseFloat(row.getData().vertrag_betrag);
+  var betrag = parseFloat(row.getData().betrag);
+  var vertrag_betrag = parseFloat(row.getData().vertrag_betrag);
 
-	if (isNaN(betrag))
-	{
-		betrag = 0;
-	}
+  if (isNaN(betrag)) {
+    betrag = 0;
+  }
 
-	if (isNaN(stunden))
-	{
-		stunden = 0;
-	}
+  if (isNaN(stunden)) {
+    stunden = 0;
+  }
 
-	if (isNaN(vertrag_stunden))
-	{
-		vertrag_stunden = 0;
-	}
+  if (isNaN(vertrag_stunden)) {
+    vertrag_stunden = 0;
+  }
 
-	if (isNaN(vertrag_betrag))
-	{
-		vertrag_betrag = 0;
-	}
+  if (isNaN(vertrag_betrag)) {
+    vertrag_betrag = 0;
+  }
 
-	// Only allow to select neue and geaenderte
-	return  !is_dummy &&												// NOT dummy lector
-		is_mitarbeiter &&											   // AND is Mitarbeiter
-		has_stunden &&												  // AND has Semesterstunden (not null and not 0)
-		((row.getData().bestellt == null) ||							  // AND neue
-		(row.getData().bestellt != null && betrag != vertrag_betrag) ||   // OR geaenderte
-		(row.getData().bestellt != null && stunden != vertrag_stunden));
+  // Only allow to select neue and geaenderte
+  return (
+    !is_dummy && // NOT dummy lector
+    is_mitarbeiter && // AND is Mitarbeiter
+    has_stunden && // AND has Semesterstunden (not null and not 0)
+    (row.getData().bestellt == null || // AND neue
+      (row.getData().bestellt != null && betrag != vertrag_betrag) || // OR geaenderte
+      (row.getData().bestellt != null && stunden != vertrag_stunden))
+  );
 }
 
 // Adds column status
 function func_tableBuilt(table) {
-	// Add status column to table
-	table.tabulator("addColumn",
-		{
-			title: "<i class='fa fa-user-o'></i>",
-			field: "status",
-			width:40,
-			align:"center",
-			downloadTitle: 'Status',
-			formatter: status_formatter,
-			tooltip: status_tooltip
-		}, true
-	);
+  // Add status column to table
+  table.tabulator(
+    "addColumn",
+    {
+      title: "<i class='fa fa-user-o'></i>",
+      field: "status",
+      width: 40,
+      align: "center",
+      downloadTitle: "Status",
+      formatter: status_formatter,
+      tooltip: status_tooltip,
+    },
+    true
+  );
+
+  // fully redrawing the table after adding the Details column
+  table.tabulator("redraw", true);
 }
 
 // Sets status values into column status
-function func_renderStarted(table){
-	// set literally status to each row - this enables sorting by status despite using icons
-	table.getRows().forEach(function(row){
-		var bestellt = row.getData().bestellt;
-		var erteilt = row.getData().erteilt;
-		var akzeptiert = row.getData().akzeptiert;
+function func_renderStarted(table) {
+  // set literally status to each row - this enables sorting by status despite using icons
+  table.getRows().forEach(function (row) {
+    var bestellt = row.getData().bestellt;
+    var erteilt = row.getData().erteilt;
+    var akzeptiert = row.getData().akzeptiert;
 
-		var stunden = parseFloat(row.getData().stunden);
-		var vertrag_stunden = parseFloat(row.getData().vertrag_stunden);
+    var stunden = parseFloat(row.getData().stunden);
+    var vertrag_stunden = parseFloat(row.getData().vertrag_stunden);
 
-		var betrag = parseFloat(row.getData().betrag);
-		var vertrag_betrag = parseFloat(row.getData().vertrag_betrag);
+    var betrag = parseFloat(row.getData().betrag);
+    var vertrag_betrag = parseFloat(row.getData().vertrag_betrag);
 
-		if (isNaN(betrag))
-		{
-			betrag = 0;
-		}
+    if (isNaN(betrag)) {
+      betrag = 0;
+    }
 
-		if (isNaN(stunden))
-		{
-			stunden = 0;
-		}
+    if (isNaN(stunden)) {
+      stunden = 0;
+    }
 
-		if (isNaN(vertrag_stunden))
-		{
-			vertrag_stunden = 0;
-		}
+    if (isNaN(vertrag_stunden)) {
+      vertrag_stunden = 0;
+    }
 
-		if (isNaN(vertrag_betrag))
-		{
-			vertrag_betrag = 0;
-		}
+    if (isNaN(vertrag_betrag)) {
+      vertrag_betrag = 0;
+    }
 
-		if ((bestellt != null && betrag != vertrag_betrag) ||
-			(bestellt != null && stunden != vertrag_stunden))
-		{
-			row.getData().status = 'Geändert';		// geaendert
-		}
-		else if (bestellt == null && erteilt == null && akzeptiert == null)
-		{
-			row.getData().status = 'Neu';			// neu
-		}
-		else if (bestellt != null && erteilt == null && akzeptiert == null)
-		{
-			row.getData().status = 'Bestellt';		// bestellt
-		}
-		else if (bestellt != null && erteilt != null && akzeptiert == null)
-		{
-			row.getData().status = 'Erteilt';		// erteilt
-		}
-		else if (bestellt != null && erteilt != null && akzeptiert != null)
-		{
-			row.getData().status = 'Akzeptiert';	// akzeptiert
-		}
-		else
-		{
-			row.getData().status = null;			// default
-		}
-	});
+    if (
+      (bestellt != null && betrag != vertrag_betrag) ||
+      (bestellt != null && stunden != vertrag_stunden)
+    ) {
+      row.getData().status = "Geändert"; // geaendert
+    } else if (bestellt == null && erteilt == null && akzeptiert == null) {
+      row.getData().status = "Neu"; // neu
+    } else if (bestellt != null && erteilt == null && akzeptiert == null) {
+      row.getData().status = "Bestellt"; // bestellt
+    } else if (bestellt != null && erteilt != null && akzeptiert == null) {
+      row.getData().status = "Erteilt"; // erteilt
+    } else if (bestellt != null && erteilt != null && akzeptiert != null) {
+      row.getData().status = "Akzeptiert"; // akzeptiert
+    } else {
+      row.getData().status = null; // default
+    }
+  });
 }
 
 // Performes after row was updated
-function func_rowUpdated(row){
+function func_rowUpdated(row) {
+  // Refresh status icon and row color
+  row.reformat(); // retriggers cell formatters and rowFormatter callback
 
-	// Refresh status icon and row color
-	row.reformat(); // retriggers cell formatters and rowFormatter callback
+  // Format font-weight normal (needed after geaenderte were bestellt)
+  row.getElement().style["font-weight"] = "normal";
 
-	// Format font-weight normal (needed after geaenderte were bestellt)
-	row.getElement().style['font-weight'] = 'normal';
-
-	// Deselect and disable new selection of updated rows (ordering done)
-	row.deselect();
-	row.getElement().style["pointerEvents"] = "none";
+  // Deselect and disable new selection of updated rows (ordering done)
+  row.deselect();
+  row.getElement().style["pointerEvents"] = "none";
 }
 
 // TableWidget Footer element
@@ -346,435 +343,424 @@ function func_rowUpdated(row){
  * Hook to overwrite TableWigdgets select-all-button behaviour
  * Select all (filtered) rows and ignore rows which have status bestellt
  */
-function tableWidgetHook_selectAllButton(tableWidgetDiv){
-	var resultRows = tableWidgetDiv.find("#tableWidgetTabulator").tabulator('getRows', true)
-		.filter(row => (
-			row.getData().personalnummer > 0 ||					// not dummies
-			row.getData().personalnummer == null) &&			// include Projektbetreuer
-			row.getData().mitarbeiter_uid != null &&			// AND is Mitarbeiter
-			row.getData().stunden != null &&					// AND has Semesterstunden (not null and not 0)
-			row.getData().stunden != 0 &&
-			(
-				(row.getData().bestellt == null) ||				// AND neu
-				(row.getData().bestellt != null &&				// OR (bestellt
-				row.getData().status == 'Geändert')				// AND geaendert)
-			)
-		);
+function tableWidgetHook_selectAllButton(tableWidgetDiv) {
+  var resultRows = tableWidgetDiv
+    .find("#tableWidgetTabulator")
+    .tabulator("getRows", true)
+    .filter(
+      (row) =>
+        (row.getData().personalnummer > 0 || // not dummies
+          row.getData().personalnummer == null) && // include Projektbetreuer
+        row.getData().mitarbeiter_uid != null && // AND is Mitarbeiter
+        row.getData().stunden != null && // AND has Semesterstunden (not null and not 0)
+        row.getData().stunden != 0 &&
+        (row.getData().bestellt == null || // AND neu
+          (row.getData().bestellt != null && // OR (bestellt
+            row.getData().status == "Geändert")) // AND geaendert)
+    );
 
-	tableWidgetDiv.find("#tableWidgetTabulator").tabulator('selectRow', resultRows);
+  tableWidgetDiv
+    .find("#tableWidgetTabulator")
+    .tabulator("selectRow", resultRows);
 }
 
 // -----------------------------------------------------------------------------------------------------------------
 // Tabulator columns format functions
 // -----------------------------------------------------------------------------------------------------------------
 // Generates status icons
-status_formatter = function(cell, formatterParams, onRendered){
-	var is_dummy = (cell.getRow().getData().personalnummer <= 0 && cell.getRow().getData().personalnummer != null);
+status_formatter = function (cell, formatterParams, onRendered) {
+  var is_dummy =
+    cell.getRow().getData().personalnummer <= 0 &&
+    cell.getRow().getData().personalnummer != null;
 
-	var bestellt = cell.getRow().getData().bestellt;
-	var erteilt = cell.getRow().getData().erteilt;
-	var akzeptiert = cell.getRow().getData().akzeptiert;
+  var bestellt = cell.getRow().getData().bestellt;
+  var erteilt = cell.getRow().getData().erteilt;
+  var akzeptiert = cell.getRow().getData().akzeptiert;
 
-	var stunden = parseFloat(cell.getRow().getData().stunden);
-	var vertrag_stunden = parseFloat(cell.getRow().getData().vertrag_stunden);
+  var stunden = parseFloat(cell.getRow().getData().stunden);
+  var vertrag_stunden = parseFloat(cell.getRow().getData().vertrag_stunden);
 
-	var betrag = parseFloat(cell.getRow().getData().betrag);
-	var vertrag_betrag = parseFloat(cell.getRow().getData().vertrag_betrag);
+  var betrag = parseFloat(cell.getRow().getData().betrag);
+  var vertrag_betrag = parseFloat(cell.getRow().getData().vertrag_betrag);
 
-	if (isNaN(betrag))
-	{
-		betrag = 0;
-	}
+  if (isNaN(betrag)) {
+    betrag = 0;
+  }
 
-	if (isNaN(stunden))
-	{
-		stunden = 0;
-	}
+  if (isNaN(stunden)) {
+    stunden = 0;
+  }
 
-	if (isNaN(vertrag_stunden))
-	{
-		vertrag_stunden = 0;
-	}
+  if (isNaN(vertrag_stunden)) {
+    vertrag_stunden = 0;
+  }
 
-	if (isNaN(vertrag_betrag))
-	{
-		vertrag_betrag = 0;
-	}
+  if (isNaN(vertrag_betrag)) {
+    vertrag_betrag = 0;
+  }
 
-	// commented icons would be so nice to have with fontawsome 5.11...
-	if (is_dummy)
-	{
-		return "<i class='fa fa-user-secret'></i>";	// dummy lector
-	}
-	else if (bestellt != null && isNaN(vertrag_betrag))
-	{
-		return "<i class='fa fa-user-minus'></i>";	 // kein Vertrag
-	}
-	else if (bestellt != null && (betrag != vertrag_betrag) ||	 // geaendert
-		bestellt != null && stunden != vertrag_stunden)		 // geaendert ((if betrag is 0 or null)
-	{
-		return ICON_LEHRAUFTRAG_CHANGED;			   // geaendert
-		// return "<i class='fas fa-user-edit'></i>";
-	}
-	else if (bestellt == null && erteilt == null && akzeptiert == null)
-	{
-		return "<i class='fa fa-user-plus'></i>";	  // neu
-	}
-	else if (bestellt != null && erteilt == null && akzeptiert == null)
-	{
-		return ICON_LEHRAUFTRAG_ORDERED;			   // bestellt
-		// return "<i class='fa fa-user-tag'></i>";
-	}
-	else if (bestellt != null && erteilt != null && akzeptiert == null)
-	{
-		return ICON_LEHRAUFTRAG_APPROVED;			  // erteilt
-		// return "<i class='fas fa-user-check'></i>";
-	}
-	else if (bestellt != null && erteilt != null && akzeptiert != null)
-	{
-		return "<i class='fa fa-handshake-o'></i>";	// akzeptiert
-	}
-	else
-	{
-		return "<i class='fa fa-user'></i>";	// default
-	}
+  // commented icons would be so nice to have with fontawsome 5.11...
+  if (is_dummy) {
+    return "<i class='fa fa-user-secret'></i>"; // dummy lector
+  } else if (bestellt != null && isNaN(vertrag_betrag)) {
+    return "<i class='fa fa-user-minus'></i>"; // kein Vertrag
+  } else if (
+    (bestellt != null && betrag != vertrag_betrag) || // geaendert
+    (bestellt != null && stunden != vertrag_stunden)
+  ) {
+    // geaendert ((if betrag is 0 or null)
+    return ICON_LEHRAUFTRAG_CHANGED; // geaendert
+    // return "<i class='fas fa-user-edit'></i>";
+  } else if (bestellt == null && erteilt == null && akzeptiert == null) {
+    return "<i class='fa fa-user-plus'></i>"; // neu
+  } else if (bestellt != null && erteilt == null && akzeptiert == null) {
+    return ICON_LEHRAUFTRAG_ORDERED; // bestellt
+    // return "<i class='fa fa-user-tag'></i>";
+  } else if (bestellt != null && erteilt != null && akzeptiert == null) {
+    return ICON_LEHRAUFTRAG_APPROVED; // erteilt
+    // return "<i class='fas fa-user-check'></i>";
+  } else if (bestellt != null && erteilt != null && akzeptiert != null) {
+    return "<i class='fa fa-handshake-o'></i>"; // akzeptiert
+  } else {
+    return "<i class='fa fa-user'></i>"; // default
+  }
 };
 
 // Generates status tooltip
-status_tooltip = function(e, cell, onRendered){
-	//e - mouseover event
-	//cell - cell component
-	//onRendered - onRendered callback registration function
+status_tooltip = function (e, cell, onRendered) {
+  //e - mouseover event
+  //cell - cell component
+  //onRendered - onRendered callback registration function
 
-	var is_dummy = (cell.getRow().getData().personalnummer <= 0 && cell.getRow().getData().personalnummer != null);
-	var is_mitarbeiter = cell.getRow().getData().mitarbeiter_uid != null;
-	var has_stunden = cell.getRow().getData().stunden != 0 && cell.getRow().getData().stunden != null;
+  var is_dummy =
+    cell.getRow().getData().personalnummer <= 0 &&
+    cell.getRow().getData().personalnummer != null;
+  var is_mitarbeiter = cell.getRow().getData().mitarbeiter_uid != null;
+  var has_stunden =
+    cell.getRow().getData().stunden != 0 &&
+    cell.getRow().getData().stunden != null;
 
-	var bestellt = cell.getRow().getData().bestellt;
-	var erteilt = cell.getRow().getData().erteilt;
-	var akzeptiert = cell.getRow().getData().akzeptiert;
+  var bestellt = cell.getRow().getData().bestellt;
+  var erteilt = cell.getRow().getData().erteilt;
+  var akzeptiert = cell.getRow().getData().akzeptiert;
 
-	var betrag = parseFloat(cell.getRow().getData().betrag);
-	var stunden = parseFloat(cell.getRow().getData().stunden);
-	var stundensatz = parseFloat(cell.getRow().getData().stundensatz);
+  var betrag = parseFloat(cell.getRow().getData().betrag);
+  var stunden = parseFloat(cell.getRow().getData().stunden);
+  var stundensatz = parseFloat(cell.getRow().getData().stundensatz);
 
-	var vertrag_betrag = parseFloat(cell.getRow().getData().vertrag_betrag);
-	var vertrag_stunden = parseFloat(cell.getRow().getData().vertrag_stunden);
-	var vertrag_stundensatz = 0;
+  var vertrag_betrag = parseFloat(cell.getRow().getData().vertrag_betrag);
+  var vertrag_stunden = parseFloat(cell.getRow().getData().vertrag_stunden);
+  var vertrag_stundensatz = 0;
 
-	if (isNaN(betrag))
-	{
-		betrag = 0;
-	}
+  if (isNaN(betrag)) {
+    betrag = 0;
+  }
 
-	if (isNaN(stunden))
-	{
-		stunden = 0;
-	}
+  if (isNaN(stunden)) {
+    stunden = 0;
+  }
 
-	if (isNaN(vertrag_stunden))
-	{
-		vertrag_stunden = 0;
-	}
+  if (isNaN(vertrag_stunden)) {
+    vertrag_stunden = 0;
+  }
 
-	if (isNaN(vertrag_betrag))
-	{
-		vertrag_betrag = 0;
-	}
+  if (isNaN(vertrag_betrag)) {
+    vertrag_betrag = 0;
+  }
 
-	// Calculate vertrag stundensatz
-	if (vertrag_stunden != 0)
-	{
-		vertrag_stundensatz = vertrag_betrag/vertrag_stunden;
-	}
+  // Calculate vertrag stundensatz
+  if (vertrag_stunden != 0) {
+    vertrag_stundensatz = vertrag_betrag / vertrag_stunden;
+  }
 
-	// Return tooltip message
-	if (is_dummy)	// dummy (no lector)
-	{
-		return FHC_PhrasesLib.t("ui", "neuerLehrauftragOhneLektorVerplant");
-	}
-	else if (!is_mitarbeiter)
-	{
-		return 'Lektor ist nicht als Mitarbeiter erfasst.'
-	}
-	else if (!has_stunden)
-	{
-		return 'Es wurden noch keine Stunden zugeteilt.'
-	}
-	else if (vertrag_betrag == 0)	// neu
-	{
-		return FHC_PhrasesLib.t("ui", "neuerLehrauftragWartetAufBestellung");
-	}
-	else if (betrag != vertrag_betrag ||									// geaendert
-		bestellt != null && stunden != vertrag_stunden)						// geaendert (if betrag is 0 or null)
-	{
-		var text = FHC_PhrasesLib.t("ui", "nachAenderungStundensatzStunden",
-			new Array(stundensatz, stunden));
-		text += "\n";
-		text += FHC_PhrasesLib.t("ui", "vorAenderungStundensatzStunden",
-			new Array(vertrag_stundensatz, vertrag_stunden));
-		return text;
-	}
-	else if (bestellt != null && erteilt == null && akzeptiert == null)		 // bestellt
-	{
-		return FHC_PhrasesLib.t("ui", "letzterStatusBestellt");
-	}
-	else if (bestellt != null && erteilt != null && akzeptiert == null)		 // erteilt
-	{
-		return FHC_PhrasesLib.t("ui", "letzterStatusErteilt");
-	}
-	else if (bestellt != null && erteilt != null && akzeptiert != null)		 // akzeptiert
-	{
-		return FHC_PhrasesLib.t("ui", "letzterStatusAngenommen");
-	}
-}
+  // Return tooltip message
+  if (is_dummy) {
+    // dummy (no lector)
+    return FHC_PhrasesLib.t("ui", "neuerLehrauftragOhneLektorVerplant");
+  } else if (!is_mitarbeiter) {
+    return "Lektor ist nicht als Mitarbeiter erfasst.";
+  } else if (!has_stunden) {
+    return "Es wurden noch keine Stunden zugeteilt.";
+  } else if (vertrag_betrag == 0) {
+    // neu
+    return FHC_PhrasesLib.t("ui", "neuerLehrauftragWartetAufBestellung");
+  } else if (
+    betrag != vertrag_betrag || // geaendert
+    (bestellt != null && stunden != vertrag_stunden)
+  ) {
+    // geaendert (if betrag is 0 or null)
+    var text = FHC_PhrasesLib.t(
+      "ui",
+      "nachAenderungStundensatzStunden",
+      new Array(stundensatz, stunden)
+    );
+    text += "\n";
+    text += FHC_PhrasesLib.t(
+      "ui",
+      "vorAenderungStundensatzStunden",
+      new Array(vertrag_stundensatz, vertrag_stunden)
+    );
+    return text;
+  } else if (bestellt != null && erteilt == null && akzeptiert == null) {
+    // bestellt
+    return FHC_PhrasesLib.t("ui", "letzterStatusBestellt");
+  } else if (bestellt != null && erteilt != null && akzeptiert == null) {
+    // erteilt
+    return FHC_PhrasesLib.t("ui", "letzterStatusErteilt");
+  } else if (bestellt != null && erteilt != null && akzeptiert != null) {
+    // akzeptiert
+    return FHC_PhrasesLib.t("ui", "letzterStatusAngenommen");
+  }
+};
 
 // Generates bestellt tooltip
-bestellt_tooltip = function(e, cell, onRendered){
-	//e - mouseover event
-	//cell - cell component
-	//onRendered - onRendered callback registration function
+bestellt_tooltip = function (e, cell, onRendered) {
+  //e - mouseover event
+  //cell - cell component
+  //onRendered - onRendered callback registration function
 
-	if (cell.getRow().getData().bestellt_von != null)
-	{
-		return FHC_PhrasesLib.t("ui", "bestelltVon") + cell.getRow().getData().bestellt_von;
-	}
-}
+  if (cell.getRow().getData().bestellt_von != null) {
+    return (
+      FHC_PhrasesLib.t("ui", "bestelltVon") +
+      cell.getRow().getData().bestellt_von
+    );
+  }
+};
 
 // Generates erteilt tooltip
-erteilt_tooltip = function(e, cell, onRendered){
-	//e - mouseover event
-	//cell - cell component
-	//onRendered - onRendered callback registration function
+erteilt_tooltip = function (e, cell, onRendered) {
+  //e - mouseover event
+  //cell - cell component
+  //onRendered - onRendered callback registration function
 
-	if (cell.getRow().getData().erteilt_von != null) {
-		return FHC_PhrasesLib.t("ui", "erteiltVon") + cell.getRow().getData().erteilt_von;
-	}
-}
+  if (cell.getRow().getData().erteilt_von != null) {
+    return (
+      FHC_PhrasesLib.t("ui", "erteiltVon") + cell.getRow().getData().erteilt_von
+    );
+  }
+};
 
 // Generates akzeptiert tooltip
-akzeptiert_tooltip = function(e, cell, onRendered){
-	//e - mouseover event
-	//cell - cell component
-	//onRendered - onRendered callback registration function
+akzeptiert_tooltip = function (e, cell, onRendered) {
+  //e - mouseover event
+  //cell - cell component
+  //onRendered - onRendered callback registration function
 
-	if (cell.getRow().getData().akzeptiert_von != null) {
-		return FHC_PhrasesLib.t("ui", "angenommenVon") + cell.getRow().getData().akzeptiert_von;
-	}
-}
+  if (cell.getRow().getData().akzeptiert_von != null) {
+    return (
+      FHC_PhrasesLib.t("ui", "angenommenVon") +
+      cell.getRow().getData().akzeptiert_von
+    );
+  }
+};
 
-$(function() {
+$(function () {
+  // tableInit is called in the jquery_wrapper when the tableBuilt event was finished
+  $(document).on("tableInit", function (event, tabulatorInstance) {
+    func_tableBuilt($("#tableWidgetTabulator"));
 
-	// tableInit is called in the jquery_wrapper when the tableBuilt event was finished
-    $(document).on("tableInit", function(event,tabulatorInstance) {
-     
-        func_tableBuilt($("#tableWidgetTabulator"))
-        
-        // event rowUpdated needs to be attached as a callback to the tableBuilt event in tabulator5
-        $("#tableWidgetTabulator").tabulator("on","rowUpdated",(row)=>{func_rowUpdated(row)});
-       
-		// event renderStarted needs to be attached as a callback to the tableBuilt event in tabulator5
-        $("#tableWidgetTabulator").tabulator("on","renderStarted",()=>{func_renderStarted(tabulatorInstance)});
-		
-		// event dataLoaded needs to be attached as a callback to the tableBuilt event in tabulator5
-        $("#tableWidgetTabulator").tabulator("on","dataLoaded",(data)=>{func_dataLoaded(data,tabulatorInstance)});
-		
+    // event rowUpdated needs to be attached as a callback to the tableBuilt event in tabulator5
+    $("#tableWidgetTabulator").tabulator("on", "rowUpdated", (row) => {
+      func_rowUpdated(row);
     });
 
-	// Redraw table on resize to fit tabulators height to windows height
-	window.addEventListener('resize', function(){
-		$('#tableWidgetTabulator').tabulator('setHeight', $(window).height() * 0.50);
-		$('#tableWidgetTabulator').tabulator('redraw', true);
-	});
+    // event renderStarted needs to be attached as a callback to the tableBuilt event in tabulator5
+    $("#tableWidgetTabulator").tabulator("on", "renderStarted", () => {
+      func_renderStarted(tabulatorInstance);
+    });
 
-	// Show all rows
-	$("#show-all").click(function(){
-		$('#tableWidgetTabulator').tabulator('clearFilter');
-	});
+    // event dataLoaded needs to be attached as a callback to the tableBuilt event in tabulator5
+    $("#tableWidgetTabulator").tabulator("on", "dataLoaded", (data) => {
+      func_dataLoaded(data, tabulatorInstance);
+    });
+  });
 
-	// Show only rows with new lehrauftraege (not dummy lectors or external projektbetreuer; stunden not 0 or null)
-	$("#show-new").click(function(){
-		$('#tableWidgetTabulator').tabulator('setFilter',
-			[
-				[
-					{field: 'personalnummer', type: '>', value: 0},	 // not dummy lector
-					{field: 'personalnummer', type: '=', value: null}   // include Projektbetreuer
-				],
-				{field: 'mitarbeiter_uid', type: '!=', value: null},	// AND is Mitarbeiter
-				{field: 'stunden', type: '!=', value: null},			// AND has Semesterstunden (not null and not 0)
-				{field: 'stunden', type: '!=', value: 0},
-				{field: 'bestellt', type: '=', value: null},
-				{field: 'erteilt', type: '=', value: null},
-				{field: 'akzeptiert', type: '=', value: null}
-			]
-		);
-	});
+  // Redraw table on resize to fit tabulators height to windows height
+  window.addEventListener("resize", function () {
+    $("#tableWidgetTabulator").tabulator("setHeight", $(window).height() * 0.5);
+    $("#tableWidgetTabulator").tabulator("redraw", true);
+  });
 
-	// Show only rows with ordered lehrauftraege
-	$("#show-ordered").click(function(){
-		$('#tableWidgetTabulator').tabulator('setFilter',
-			[
-				[
-					{field: 'personalnummer', type: '>', value: 0},	 // not dummy lector
-					{field: 'personalnummer', type: '=', value: null}   // include Projektbetreuer
-				],
-				{field: 'bestellt', type: '!=', value: null},
-				{field: 'erteilt', type: '=', value: null},
-				{field: 'akzeptiert', type: '=', value: null}
-			]
-		);
-	});
+  // Show all rows
+  $("#show-all").click(function () {
+    $("#tableWidgetTabulator").tabulator("clearFilter");
+  });
 
-	// Show only rows with erteilte lehrauftraege
-	$("#show-approved").click(function(){
-		$('#tableWidgetTabulator').tabulator('setFilter',
-			[
-				{field: 'bestellt', type: '!=', value: null},
-				{field: 'erteilt', type: '!=', value: null},
-				{field: 'akzeptiert', type: '=', value: null}
-			]
-		);
-	});
+  // Show only rows with new lehrauftraege (not dummy lectors or external projektbetreuer; stunden not 0 or null)
+  $("#show-new").click(function () {
+    $("#tableWidgetTabulator").tabulator("setFilter", [
+      [
+        { field: "personalnummer", type: ">", value: 0 }, // not dummy lector
+        { field: "personalnummer", type: "=", value: null }, // include Projektbetreuer
+      ],
+      { field: "mitarbeiter_uid", type: "!=", value: null }, // AND is Mitarbeiter
+      { field: "stunden", type: "!=", value: null }, // AND has Semesterstunden (not null and not 0)
+      { field: "stunden", type: "!=", value: 0 },
+      { field: "bestellt", type: "=", value: null },
+      { field: "erteilt", type: "=", value: null },
+      { field: "akzeptiert", type: "=", value: null },
+    ]);
+  });
 
-	// Show only rows with akzeptierte lehrauftraege
-	$("#show-accepted").click(function(){
-		$('#tableWidgetTabulator').tabulator('setFilter',
-			[
-				{field: 'bestellt', type: '!=', value: null},
-				{field: 'erteilt', type: '!=', value: null},
-				{field: 'akzeptiert', type: '!=', value: null}
-			]
-		);
-	});
+  // Show only rows with ordered lehrauftraege
+  $("#show-ordered").click(function () {
+    $("#tableWidgetTabulator").tabulator("setFilter", [
+      [
+        { field: "personalnummer", type: ">", value: 0 }, // not dummy lector
+        { field: "personalnummer", type: "=", value: null }, // include Projektbetreuer
+      ],
+      { field: "bestellt", type: "!=", value: null },
+      { field: "erteilt", type: "=", value: null },
+      { field: "akzeptiert", type: "=", value: null },
+    ]);
+  });
 
-	// Show only rows with geaenderte lectors
-	$("#show-changed").click(function(){
-		// needs custom filter to compare fields betrag and vertrag_betrag
-		$('#tableWidgetTabulator').tabulator('setFilter',
-			[
-				[
-					{field: 'personalnummer', type: '>', value: 0},	 // NOT dummy lector
-					{field: 'personalnummer', type: '=', value: null}   // include Projektbetreuer
-				],
-				{field: 'mitarbeiter_uid', type: '!=', value: null},	// AND is Mitarbeiter
-				{field: 'stunden', type: '!=', value: null},			// AND has Semesterstunden (not null and not 0)
-				{field: 'stunden', type: '!=', value: 0},
-				{field: 'bestellt', type: '!=', value: null},		   // bestellt AND
-				{field: 'status', type: '=', value: 'Geändert'}		 // geaendert
-			]
-		);
-	});
+  // Show only rows with erteilte lehrauftraege
+  $("#show-approved").click(function () {
+    $("#tableWidgetTabulator").tabulator("setFilter", [
+      { field: "bestellt", type: "!=", value: null },
+      { field: "erteilt", type: "!=", value: null },
+      { field: "akzeptiert", type: "=", value: null },
+    ]);
+  });
 
-	// Show only rows with dummy lectors
-	$("#show-dummies").click(function(){
-		$('#tableWidgetTabulator').tabulator('setFilter',
-			[
-				{field: 'personalnummer', type: '!=', value: null},
-				{field: 'personalnummer', type: '<=', value: 0},
-			]
-		);
-	});
+  // Show only rows with akzeptierte lehrauftraege
+  $("#show-accepted").click(function () {
+    $("#tableWidgetTabulator").tabulator("setFilter", [
+      { field: "bestellt", type: "!=", value: null },
+      { field: "erteilt", type: "!=", value: null },
+      { field: "akzeptiert", type: "!=", value: null },
+    ]);
+  });
 
-	// Set png-icons into filter-buttons
-	$(".btn-lehrauftrag").each(function(){
-		switch(this.id) {
-			case 'show-ordered':
-				this.innerHTML = ICON_LEHRAUFTRAG_ORDERED;
-				break;
-			case 'show-approved':
-				this.innerHTML = ICON_LEHRAUFTRAG_APPROVED;
-				break;
-			case 'show-changed':
-				this.innerHTML = ICON_LEHRAUFTRAG_CHANGED;
-				break;
-		}
-	});
+  // Show only rows with geaenderte lectors
+  $("#show-changed").click(function () {
+    // needs custom filter to compare fields betrag and vertrag_betrag
+    $("#tableWidgetTabulator").tabulator("setFilter", [
+      [
+        { field: "personalnummer", type: ">", value: 0 }, // NOT dummy lector
+        { field: "personalnummer", type: "=", value: null }, // include Projektbetreuer
+      ],
+      { field: "mitarbeiter_uid", type: "!=", value: null }, // AND is Mitarbeiter
+      { field: "stunden", type: "!=", value: null }, // AND has Semesterstunden (not null and not 0)
+      { field: "stunden", type: "!=", value: 0 },
+      { field: "bestellt", type: "!=", value: null }, // bestellt AND
+      { field: "status", type: "=", value: "Geändert" }, // geaendert
+    ]);
+  });
 
-	// De/activate and un/focus on clicked button, En-/Disable 'Lehrauftrag bestellen'
-	$(".btn-lehrauftrag").click(function() {
+  // Show only rows with dummy lectors
+  $("#show-dummies").click(function () {
+    $("#tableWidgetTabulator").tabulator("setFilter", [
+      { field: "personalnummer", type: "!=", value: null },
+      { field: "personalnummer", type: "<=", value: 0 },
+    ]);
+  });
 
-		// De/activate and un/focus on clicked button
-		$(".btn-lehrauftrag").removeClass('focus').removeClass('active');
-		$(this).addClass('focus').addClass('active');
+  // Set png-icons into filter-buttons
+  $(".btn-lehrauftrag").each(function () {
+    switch (this.id) {
+      case "show-ordered":
+        this.innerHTML = ICON_LEHRAUFTRAG_ORDERED;
+        break;
+      case "show-approved":
+        this.innerHTML = ICON_LEHRAUFTRAG_APPROVED;
+        break;
+      case "show-changed":
+        this.innerHTML = ICON_LEHRAUFTRAG_CHANGED;
+        break;
+    }
+  });
 
-		//Enable button 'Lehrauftrag bestellen' by default
-		$('#order-lehrauftraege').attr('disabled', false).attr('title', '');
+  // De/activate and un/focus on clicked button, En-/Disable 'Lehrauftrag bestellen'
+  $(".btn-lehrauftrag").click(function () {
+    // De/activate and un/focus on clicked button
+    $(".btn-lehrauftrag").removeClass("focus").removeClass("active");
+    $(this).addClass("focus").addClass("active");
 
-		// Disable button Lehrauftrag bestellen for dummies
-		if (this.id == 'show-dummies')
-		{
-			$('#order-lehrauftraege').attr('disabled', true).attr('title', 'Lehraufträge ohne Lektorzuteilung können nicht bestellt werden.');
-		}
-	});
+    //Enable button 'Lehrauftrag bestellen' by default
+    $("#order-lehrauftraege").attr("disabled", false).attr("title", "");
 
-	// Order Lehrauftraege
-	$("#order-lehrauftraege").click(function(){
+    // Disable button Lehrauftrag bestellen for dummies
+    if (this.id == "show-dummies") {
+      $("#order-lehrauftraege")
+        .attr("disabled", true)
+        .attr(
+          "title",
+          "Lehraufträge ohne Lektorzuteilung können nicht bestellt werden."
+        );
+    }
+  });
 
-		var selected_data = $('#tableWidgetTabulator').tabulator('getSelectedData')
-			.filter(function(val){
-				// filter pseudo lines of groupBy (e.g. the bottom calculations lines)
-				return val.row_index != null || typeof(val.row_index) !== 'undefined';
-			})
-			.map(function(data){
-				// reduce to necessary fields
-				return {
-					'row_index' : data.row_index,
-					'lehreinheit_id' : data.lehreinheit_id,
-					'lehrveranstaltung_id' : data.lehrveranstaltung_id,
-					'person_id' : data.person_id,
-					'mitarbeiter_uid' : data.mitarbeiter_uid,
-					'vertrag_id' : data.vertrag_id,
-					'projektarbeit_id' : data.projektarbeit_id,
-					'stunden' : data.stunden,
-					'betrag' : data.betrag,
-					'studiensemester_kurzbz' : data.studiensemester_kurzbz,
-					'studiengang_kz' : data.studiengang_kz,
-					'lv_oe_kurzbz' : data.lv_oe_kurzbz
-				}
-			});
+  // Order Lehrauftraege
+  $("#order-lehrauftraege").click(function () {
+    var selected_data = $("#tableWidgetTabulator")
+      .tabulator("getSelectedData")
+      .filter(function (val) {
+        // filter pseudo lines of groupBy (e.g. the bottom calculations lines)
+        return val.row_index != null || typeof val.row_index !== "undefined";
+      })
+      .map(function (data) {
+        // reduce to necessary fields
+        return {
+          row_index: data.row_index,
+          lehreinheit_id: data.lehreinheit_id,
+          lehrveranstaltung_id: data.lehrveranstaltung_id,
+          person_id: data.person_id,
+          mitarbeiter_uid: data.mitarbeiter_uid,
+          vertrag_id: data.vertrag_id,
+          projektarbeit_id: data.projektarbeit_id,
+          stunden: data.stunden,
+          betrag: data.betrag,
+          studiensemester_kurzbz: data.studiensemester_kurzbz,
+          studiengang_kz: data.studiengang_kz,
+          lv_oe_kurzbz: data.lv_oe_kurzbz,
+        };
+      });
 
-		// Alert and exit if no lehraufgang is selected
-		if (selected_data.length == 0)
-		{
-			FHC_DialogLib.alertInfo('Bitte wählen Sie erst zumindest einen Lehrauftrag');
-			return;
-		}
+    // Alert and exit if no lehraufgang is selected
+    if (selected_data.length == 0) {
+      FHC_DialogLib.alertInfo(
+        "Bitte wählen Sie erst zumindest einen Lehrauftrag"
+      );
+      return;
+    }
 
-		/*
-		 * Prepare data object for ajax call
-		 * NOTE: Stringify to send only ONE post param (json string) instead of many single post params.
-		 * This avoids issues with POST param limitation.
-		 */
-		var data = {
-			'selected_data': JSON.stringify(selected_data)
-		};
+    /*
+     * Prepare data object for ajax call
+     * NOTE: Stringify to send only ONE post param (json string) instead of many single post params.
+     * This avoids issues with POST param limitation.
+     */
+    var data = {
+      selected_data: JSON.stringify(selected_data),
+    };
 
-		FHC_AjaxClient.ajaxCallPost(
-			FHC_JS_DATA_STORAGE_OBJECT.called_path + "/orderLehrauftrag",
-			data,
-			{
-				successCallback: function (data, textStatus, jqXHR)
-				{
-					if (!data.error && data.retval != null)
-					{
-						// Update status 'Bestellt'
-						$('#tableWidgetTabulator').tabulator('updateData', data.retval);
+    FHC_AjaxClient.ajaxCallPost(
+      FHC_JS_DATA_STORAGE_OBJECT.called_path + "/orderLehrauftrag",
+      data,
+      {
+        successCallback: function (data, textStatus, jqXHR) {
+          if (!data.error && data.retval != null) {
+            // Update status 'Bestellt'
+            $("#tableWidgetTabulator").tabulator("updateData", data.retval);
 
-						// Print success message
-						FHC_DialogLib.alertSuccess("Alle " + data.retval.length + " Lehraufträge wurden bestellt.")
-					}
+            // Print success message
+            FHC_DialogLib.alertSuccess(
+              "Alle " + data.retval.length + " Lehraufträge wurden bestellt."
+            );
+          }
 
-					if (data.error && data.retval != null)
-					{
-						// Print error message
-						FHC_DialogLib.alertError(data.retval);
-					}
-				},
-				errorCallback: function (jqXHR, textStatus, errorThrown)
-				{
-					FHC_DialogLib.alertError("Sytemfehler<br>Bitte kontaktieren Sie Ihren Administrator.");
-				}
-			}
-		);
-	});
+          if (data.error && data.retval != null) {
+            // Print error message
+            FHC_DialogLib.alertError(data.retval);
+          }
+        },
+        errorCallback: function (jqXHR, textStatus, errorThrown) {
+          FHC_DialogLib.alertError(
+            "Sytemfehler<br>Bitte kontaktieren Sie Ihren Administrator."
+          );
+        },
+      }
+    );
+  });
 });

From 3a1ac157409661a5c82e07d4df3670e651ec3bcc Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 23 Apr 2024 12:47:17 +0200
Subject: [PATCH 0621/1461] adds the button width and margin classes from the
 Tabulator.css (used in Tabulator4) to the anrechnungen.css file

---
 .../anrechnung/approveAnrechnungDetail.php    | 602 ++++++++++--------
 .../approveAnrechnungUebersichtData.php       |  29 +-
 .../lehre/anrechnung/createAnrechnung.php     | 258 ++++----
 .../anrechnung/reviewAnrechnungDetail.php     | 333 +++++-----
 .../anrechnung/reviewAnrechnungUebersicht.php | 295 ++++-----
 .../lvplanung/adminZeitverfuegbarkeit.php     | 212 +++---
 .../lvplanung/adminZeitverfuegbarkeitData.php |   4 +-
 public/css/lehre/anrechnung.css               |   9 +
 8 files changed, 925 insertions(+), 817 deletions(-)

diff --git a/application/views/lehre/anrechnung/approveAnrechnungDetail.php b/application/views/lehre/anrechnung/approveAnrechnungDetail.php
index e5ccbe127..fbc749f65 100644
--- a/application/views/lehre/anrechnung/approveAnrechnungDetail.php
+++ b/application/views/lehre/anrechnung/approveAnrechnungDetail.php
@@ -6,7 +6,7 @@ $this->load->view(
 		'jquery3' => true,
 		'jqueryui1' => true,
 		'bootstrap5' => true,
-		'cis'=>true,
+		'cis' => true,
 		'fontawesome4' => true,
 		'ajaxlib' => true,
 		'dialoglib' => true,
@@ -14,7 +14,7 @@ $this->load->view(
 			'global' => array(
 				'anerkennungNachgewiesenerKenntnisse',
 				'antragStellen',
-                'begruendung'
+				'begruendung'
 			),
 			'ui' => array(
 				'hilfeZuDieserSeite',
@@ -24,11 +24,11 @@ $this->load->view(
 				'systemfehler',
 				'bitteMindEinenAntragWaehlen',
 				'bitteBegruendungAngeben',
-                'bitteBegruendungVervollstaendigen',
+				'bitteBegruendungVervollstaendigen',
 				'empfehlungWurdeAngefordert',
 				'anrechnungenWurdenGenehmigt',
 				'anrechnungenWurdenAbgelehnt',
-                'nurLeseberechtigung'
+				'nurLeseberechtigung'
 			),
 			'person' => array(
 				'student',
@@ -41,17 +41,16 @@ $this->load->view(
 				'ects',
 				'lektor',
 			),
-            'anrechnung' => array(
-                'genehmigungAblehnungWirklichZuruecknehmen',
-                'empfehlungsanforderungWirklichZuruecknehmen',
-                'erfolgreichZurueckgenommen',
-                'empfehlungPositivConfirmed',
-                'empfehlungNegativConfirmed',
-                'anrechnungEctsTooltipTextBeiUeberschreitung'
-            )
+			'anrechnung' => array(
+				'genehmigungAblehnungWirklichZuruecknehmen',
+				'empfehlungsanforderungWirklichZuruecknehmen',
+				'erfolgreichZurueckgenommen',
+				'empfehlungPositivConfirmed',
+				'empfehlungNegativConfirmed',
+				'anrechnungEctsTooltipTextBeiUeberschreitung'
+			)
 		),
 		'customCSSs' => array(
-			'public/css/Tabulator.css',
 			'public/css/lehre/anrechnung.css'
 		),
 		'customJSs' => array(
@@ -64,90 +63,106 @@ $this->load->view(
 ?>
 
 <div id="page-wrapper">
-    <div class="container-fluid">
-        <!-- header  -->
-        <div class="row">
-            <div class="col-12 my-4 border-bottom">
-                <h3 class="fw-normal ">
+	<div class="container-fluid">
+		<!-- header  -->
+		<div class="row">
+			<div class="col-12 my-4 border-bottom">
+				<h3 class="fw-normal ">
 					<?php echo $this->p->t('anrechnung', 'anrechnungenGenehmigen'); ?>
-                    <small class="text-secondary fs-6">| <?php echo $this->p->t('global', 'detailsicht'); ?></small>
-                </h3>
-            </div>
-        </div>
+					<small class="text-secondary fs-6">| <?php echo $this->p->t('global', 'detailsicht'); ?></small>
+				</h3>
+			</div>
+		</div>
 		<!--end header -->
-		
-        <div class="row " id="approveAnrechnungDetail-generell" data-readonly="<?php echo json_encode($hasReadOnlyAccess)?>">
-            <div class="col-8">
+
+		<div class="row " id="approveAnrechnungDetail-generell"
+			data-readonly="<?php echo json_encode($hasReadOnlyAccess) ?>">
+			<div class="col-8">
 				<!-- Antragsdaten -->
 				<div class="row mb-4">
 					<div class="col-12">
 						<div class="card">
 							<div class="card-header">
-								<span class="text-uppercase"><b><?php echo $this->p->t('anrechnung', 'antrag'); ?></b></span>&emsp;
-								<span class="approveAnrechnungDetail-anrechnungInfoTooltip"
-									  data-bs-toggle="tooltip" data-bs-placement="right"
-									  title="<?php echo $this->p->t('anrechnung', 'anrechnungInfoTooltipText'); ?>">
-													<i class="fa fa-lg fa-info-circle" aria-hidden="true"></i>
-												</span>
+								<span
+									class="text-uppercase"><b><?php echo $this->p->t('anrechnung', 'antrag'); ?></b></span>&emsp;
+								<span class="approveAnrechnungDetail-anrechnungInfoTooltip" data-bs-toggle="tooltip"
+									data-bs-placement="right"
+									title="<?php echo $this->p->t('anrechnung', 'anrechnungInfoTooltipText'); ?>">
+									<i class="fa fa-lg fa-info-circle" aria-hidden="true"></i>
+								</span>
 								<span class="float-end"><?php echo $this->p->t('anrechnung', 'antragdatum'); ?>: <span
-											id="approveAnrechnung-status"><?php echo !empty($anrechnungData->anrechnung_id) ? $anrechnungData->insertamum : '-' ?></span></span>
+										id="approveAnrechnung-status"><?php echo !empty($anrechnungData->anrechnung_id) ? $anrechnungData->insertamum : '-' ?></span></span>
 							</div>
 							<div class="card-body">
 								<div class="row">
 									<div class="col-4">
 										<table class="table table-bordered table-condensed table-fixed mb-0">
 											<tbody>
-											<tr>
-												<th class="col-5"><?php echo ucfirst($this->p->t('person', 'studentIn')); ?></th>
-												<td><?php echo $antragData->vorname . ' ' . $antragData->nachname; ?></td>
-											</tr>
-											<tr>
-												<th class="col-5"><?php echo $this->p->t('person', 'personenkennzeichen'); ?></th>
-												<td><?php echo $antragData->matrikelnr ?></td>
-											</tr>
-											<tr>
-												<th class="col-5"><?php echo ucfirst($this->p->t('lehre', 'studiensemester')); ?></th>
-												<td><?php echo $antragData->studiensemester_kurzbz ?></td>
-											</tr>
-											<tr>
-												<th class="col-5"><?php echo ucfirst($this->p->t('lehre', 'studiengang')); ?></th>
-												<td><?php echo $antragData->stg_bezeichnung ?></td>
-											</tr>
-											<tr>
-												<th class="col-5"><?php echo $this->p->t('lehre', 'lehrveranstaltung'); ?></th>
-												<td><?php echo $antragData->lv_bezeichnung ?></td>
-											</tr>
-                                            <tr>
-                                                <th class="col-5"><?php echo $this->p->t('lehre', 'lektorInnen'); ?></th>
-                                                <td>
-													<?php $len = count($antragData->lektoren) - 1 ?>
-													<?php foreach ($antragData->lektoren as $key => $lektor): ?>
-														<?php echo $lektor->vorname . ' ' . $lektor->nachname;
-														echo $key === $len ? '' : ', ' ?>
-													<?php endforeach; ?>
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <th class="col-5"><?php echo $this->p->t('lehre', 'ects'); ?></th>
-                                                <td><span id="ects"><?php echo $antragData->ects ?></span></td>
-                                            </tr>
-                                            <tr>
-                                                <th class="col-5">
-													<?php echo $this->p->t('anrechnung', 'bisherAngerechneteEcts'); ?>
-                                                    <span class="approveAnrechnungDetail-anrechnungEctsTooltip"
-                                                          data-bs-toggle="tooltip" data-bs-placement="right" data-bs-html="true"
-                                                          title="<?php echo $this->p->t('anrechnung', 'anrechnungEctsTooltipText'); ?>">
-													<i class="fa fa-lg fa-info-circle" aria-hidden="true"></i>
-												</span>
-                                                </th>
-                                                <td>
-                                                    Total: <span id="sumEctsTotal"><?php echo number_format($antragData->sumEctsSchulisch + $antragData->sumEctsBeruflich, 1) ?></span>
-                                                    [Schulisch: <span id="sumEctsSchulisch" value="<?php echo $antragData->sumEctsSchulisch ?>"><?php echo $antragData->sumEctsSchulisch ?></span> /
-                                                    Beruflich: <span id="sumEctsBeruflich" value="<?php echo $antragData->sumEctsBeruflich ?>"><?php echo $antragData->sumEctsBeruflich ?></span> ]
-                                                    <div class="p-1 align-items-center" id="sumEctsMsg"></div>
-                                                </td>
-                                            </tr>
-											
+												<tr>
+													<th class="col-5">
+														<?php echo ucfirst($this->p->t('person', 'studentIn')); ?></th>
+													<td><?php echo $antragData->vorname . ' ' . $antragData->nachname; ?>
+													</td>
+												</tr>
+												<tr>
+													<th class="col-5">
+														<?php echo $this->p->t('person', 'personenkennzeichen'); ?></th>
+													<td><?php echo $antragData->matrikelnr ?></td>
+												</tr>
+												<tr>
+													<th class="col-5">
+														<?php echo ucfirst($this->p->t('lehre', 'studiensemester')); ?>
+													</th>
+													<td><?php echo $antragData->studiensemester_kurzbz ?></td>
+												</tr>
+												<tr>
+													<th class="col-5">
+														<?php echo ucfirst($this->p->t('lehre', 'studiengang')); ?></th>
+													<td><?php echo $antragData->stg_bezeichnung ?></td>
+												</tr>
+												<tr>
+													<th class="col-5">
+														<?php echo $this->p->t('lehre', 'lehrveranstaltung'); ?></th>
+													<td><?php echo $antragData->lv_bezeichnung ?></td>
+												</tr>
+												<tr>
+													<th class="col-5"><?php echo $this->p->t('lehre', 'lektorInnen'); ?>
+													</th>
+													<td>
+														<?php $len = count($antragData->lektoren) - 1 ?>
+														<?php foreach ($antragData->lektoren as $key => $lektor): ?>
+															<?php echo $lektor->vorname . ' ' . $lektor->nachname;
+															echo $key === $len ? '' : ', ' ?>
+														<?php endforeach; ?>
+													</td>
+												</tr>
+												<tr>
+													<th class="col-5"><?php echo $this->p->t('lehre', 'ects'); ?></th>
+													<td><span id="ects"><?php echo $antragData->ects ?></span></td>
+												</tr>
+												<tr>
+													<th class="col-5">
+														<?php echo $this->p->t('anrechnung', 'bisherAngerechneteEcts'); ?>
+														<span class="approveAnrechnungDetail-anrechnungEctsTooltip"
+															data-bs-toggle="tooltip" data-bs-placement="right"
+															data-bs-html="true"
+															title="<?php echo $this->p->t('anrechnung', 'anrechnungEctsTooltipText'); ?>">
+															<i class="fa fa-lg fa-info-circle" aria-hidden="true"></i>
+														</span>
+													</th>
+													<td>
+														Total: <span
+															id="sumEctsTotal"><?php echo number_format($antragData->sumEctsSchulisch + $antragData->sumEctsBeruflich, 1) ?></span>
+														[Schulisch: <span id="sumEctsSchulisch"
+															value="<?php echo $antragData->sumEctsSchulisch ?>"><?php echo $antragData->sumEctsSchulisch ?></span>
+														/
+														Beruflich: <span id="sumEctsBeruflich"
+															value="<?php echo $antragData->sumEctsBeruflich ?>"><?php echo $antragData->sumEctsBeruflich ?></span>
+														]
+														<div class="p-1 align-items-center" id="sumEctsMsg"></div>
+													</td>
+												</tr>
+
 											</tbody>
 										</table>
 									</div>
@@ -155,33 +170,47 @@ $this->load->view(
 										<table class="table table-bordered table-condensed table-fixed mb-0">
 											<tbody>
 
-											<tr>
-												<th class="col-3"><?php echo ucfirst($this->p->t('global', 'zgv')); ?></th>
-												<td><?php echo $antragData->zgv ?></td>
-											</tr>
-											<tr>
-												<th class="col-4"><?php echo $this->p->t('anrechnung', 'herkunftDerKenntnisse'); ?></th>
-												<td><?php echo $anrechnungData->anmerkung ?></td>
-											</tr>
-											<tr>
-												<th class="col-4"><?php echo $this->p->t('anrechnung', 'nachweisdokumente'); ?></th>
-												<td>
-													<a href="<?php echo current_url() . '/download?dms_id=' . $anrechnungData->dms_id; ?>"
-													   target="_blank"><?php echo htmlentities($anrechnungData->dokumentname) ?></a>
-												</td>
-											</tr>
-                                            <tr>
-                                                <th class="col-4"><?php echo $this->p->t('global', 'begruendung'); ?></th>
-                                                <td><span id="begruendung_id" data-begruendung_id="<?php echo $anrechnungData->begruendung_id ?>" ><?php echo $anrechnungData->begruendung ?></span></td>
-                                            </tr>
-                                            <tr>
-                                                <th class="col-4"><?php echo $this->p->t('anrechnung', 'begruendungEctsLabel'); ?></th>
-                                                <td><span><?php echo $anrechnungData->begruendung_ects ?></span></td>
-                                            </tr>
-                                            <tr>
-                                                <th class="col-4"><?php echo $this->p->t('anrechnung', 'begruendungLvinhaltLabel'); ?></th>
-                                                <td><span><?php echo $anrechnungData->begruendung_lvinhalt ?></span></td>
-                                            </tr>
+												<tr>
+													<th class="col-3">
+														<?php echo ucfirst($this->p->t('global', 'zgv')); ?></th>
+													<td><?php echo $antragData->zgv ?></td>
+												</tr>
+												<tr>
+													<th class="col-4">
+														<?php echo $this->p->t('anrechnung', 'herkunftDerKenntnisse'); ?>
+													</th>
+													<td><?php echo $anrechnungData->anmerkung ?></td>
+												</tr>
+												<tr>
+													<th class="col-4">
+														<?php echo $this->p->t('anrechnung', 'nachweisdokumente'); ?>
+													</th>
+													<td>
+														<a href="<?php echo current_url() . '/download?dms_id=' . $anrechnungData->dms_id; ?>"
+															target="_blank"><?php echo htmlentities($anrechnungData->dokumentname) ?></a>
+													</td>
+												</tr>
+												<tr>
+													<th class="col-4">
+														<?php echo $this->p->t('global', 'begruendung'); ?></th>
+													<td><span id="begruendung_id"
+															data-begruendung_id="<?php echo $anrechnungData->begruendung_id ?>"><?php echo $anrechnungData->begruendung ?></span>
+													</td>
+												</tr>
+												<tr>
+													<th class="col-4">
+														<?php echo $this->p->t('anrechnung', 'begruendungEctsLabel'); ?>
+													</th>
+													<td><span><?php echo $anrechnungData->begruendung_ects ?></span>
+													</td>
+												</tr>
+												<tr>
+													<th class="col-4">
+														<?php echo $this->p->t('anrechnung', 'begruendungLvinhaltLabel'); ?>
+													</th>
+													<td><span><?php echo $anrechnungData->begruendung_lvinhalt ?></span>
+													</td>
+												</tr>
 											</tbody>
 										</table>
 									</div>
@@ -194,85 +223,104 @@ $this->load->view(
 				<div class="row">
 					<div class="col-12">
 						<div class="card " id="approveAnrechnungDetail-empfehlung"
-								 data-empfehlung="<?php echo json_encode($empfehlungData->empfehlung) ?>">
-								<div class="card-header">
-									<span class="text-uppercase"><b><?php echo $this->p->t('anrechnung', 'empfehlung'); ?></b></span>&emsp;
-									<div class="float-end">
-										<?php echo $this->p->t('anrechnung', 'empfehlungVon'); ?>:
-										<span id="approveAnrechnungDetail-empfehlungVon"><?php echo $empfehlungData->empfehlung_von ?></span>
-										&emsp;|&emsp;
-										<?php echo $this->p->t('anrechnung', 'empfehlungdatum'); ?>:
-										<span id="approveAnrechnungDetail-empfehlungAm"><?php echo $empfehlungData->empfehlung_am ?></span>
-									</div>
+							data-empfehlung="<?php echo json_encode($empfehlungData->empfehlung) ?>">
+							<div class="card-header">
+								<span
+									class="text-uppercase"><b><?php echo $this->p->t('anrechnung', 'empfehlung'); ?></b></span>&emsp;
+								<div class="float-end">
+									<?php echo $this->p->t('anrechnung', 'empfehlungVon'); ?>:
+									<span
+										id="approveAnrechnungDetail-empfehlungVon"><?php echo $empfehlungData->empfehlung_von ?></span>
+									&emsp;|&emsp;
+									<?php echo $this->p->t('anrechnung', 'empfehlungdatum'); ?>:
+									<span
+										id="approveAnrechnungDetail-empfehlungAm"><?php echo $empfehlungData->empfehlung_am ?></span>
 								</div>
-								<div class="card-body">
-									<div class="row">
-										<div class="col-6">
-											<form id="form-empfehlung">
-												<input type="hidden" name="anrechnung_id" value="<?php echo $anrechnungData->anrechnung_id ?>">
-                                                <input type="hidden" name="ects" value="<?php echo $antragData->ects ?>">
-                                                <input type="hidden" name="sumEctsSchulisch" value="<?php echo $antragData->sumEctsSchulisch ?>">
-                                                <input type="hidden" name="sumEctsBeruflich" value="<?php echo $antragData->sumEctsBeruflich ?>">
-												<table class="table table-bordered table-condensed table-fixed mb-0">
-													<tbody>
+							</div>
+							<div class="card-body">
+								<div class="row">
+									<div class="col-6">
+										<form id="form-empfehlung">
+											<input type="hidden" name="anrechnung_id"
+												value="<?php echo $anrechnungData->anrechnung_id ?>">
+											<input type="hidden" name="ects" value="<?php echo $antragData->ects ?>">
+											<input type="hidden" name="sumEctsSchulisch"
+												value="<?php echo $antragData->sumEctsSchulisch ?>">
+											<input type="hidden" name="sumEctsBeruflich"
+												value="<?php echo $antragData->sumEctsBeruflich ?>">
+											<table class="table table-bordered table-condensed table-fixed mb-0">
+												<tbody>
 													<tr>
-														<th class="col-4"><?php echo ucfirst($this->p->t('anrechnung', 'empfehlungsanfrageAm')); ?></th>
-														<td id="approveAnrechnungDetail-empfehlungDetail-empfehlungsanfrageAm">
+														<th class="col-4">
+															<?php echo ucfirst($this->p->t('anrechnung', 'empfehlungsanfrageAm')); ?>
+														</th>
+														<td
+															id="approveAnrechnungDetail-empfehlungDetail-empfehlungsanfrageAm">
 															<?php echo $empfehlungData->empfehlungsanfrageAm; ?>
 														</td>
 													</tr>
 													<tr>
-														<th class="col-4"><?php echo $this->p->t('anrechnung', 'empfehlungsanfrageAn'); ?></th>
-														<td id="approveAnrechnungDetail-empfehlungDetail-empfehlungsanfrageAn">
+														<th class="col-4">
+															<?php echo $this->p->t('anrechnung', 'empfehlungsanfrageAn'); ?>
+														</th>
+														<td
+															id="approveAnrechnungDetail-empfehlungDetail-empfehlungsanfrageAn">
 															<?php echo $empfehlungData->empfehlungsanfrageAn; ?>
 														</td>
 													</tr>
 													<tr>
-														<th class="col-4"><?php echo ucfirst($this->p->t('anrechnung', 'empfehlungAm')); ?></th>
+														<th class="col-4">
+															<?php echo ucfirst($this->p->t('anrechnung', 'empfehlungAm')); ?>
+														</th>
 														<td><?php echo $empfehlungData->empfehlung_am ?></td>
 													</tr>
 													<tr>
-														<th class="col-4"><?php echo ucfirst($this->p->t('anrechnung', 'empfehlungVon')); ?></th>
+														<th class="col-4">
+															<?php echo ucfirst($this->p->t('anrechnung', 'empfehlungVon')); ?>
+														</th>
 														<td><?php echo $empfehlungData->empfehlung_von ?></td>
 													</tr>
 													<tr>
-														<th class="col-4"><?php echo $this->p->t('anrechnung', 'empfehlung'); ?></th>
-														<td id="approveAnrechnungDetail-empfehlungDetail-empfehlung"></td>
+														<th class="col-4">
+															<?php echo $this->p->t('anrechnung', 'empfehlung'); ?></th>
+														<td id="approveAnrechnungDetail-empfehlungDetail-empfehlung">
+														</td>
 													</tr>
 													<tr>
-														<th class="col-4"><?php echo $this->p->t('global', 'begruendung'); ?></th>
+														<th class="col-4">
+															<?php echo $this->p->t('global', 'begruendung'); ?></th>
 														<td id="approveAnrechnungDetail-empfehlungDetail-begruendung">
 															<?php echo htmlentities($empfehlungData->begruendung) ?>
 														</td>
 													</tr>
-													</tbody>
-												</table>
-											</form>
-										</div>
-										<div class="col-6">
-											<form id="form-empfehlungNotiz">
-												<input type="hidden" name="anrechnung_id"
-													   value="<?php echo $anrechnungData->anrechnung_id ?>">
-												<input type="hidden" name="notiz_id"
-													   value="<?php echo $empfehlungData->notiz_id ?>">
-												<div class="form-row mb-3">
-													<label class="fw-bold text-center mb-2">
-														<?php echo ucfirst($this->p->t('global', 'notiz')); ?>
-													</label>
-													<textarea name="empfehlungText" rows="4"><?php echo htmlentities($empfehlungData->notiz) ?></textarea>
-												</div>
-												<input type="submit" class="btn btn-outline-secondary float-end" value="<?php echo ucfirst($this->p->t('ui', 'speichern')); ?>">
-											</form>
-										</div>
+												</tbody>
+											</table>
+										</form>
+									</div>
+									<div class="col-6">
+										<form id="form-empfehlungNotiz">
+											<input type="hidden" name="anrechnung_id"
+												value="<?php echo $anrechnungData->anrechnung_id ?>">
+											<input type="hidden" name="notiz_id"
+												value="<?php echo $empfehlungData->notiz_id ?>">
+											<div class="form-row mb-3">
+												<label class="fw-bold text-center mb-2">
+													<?php echo ucfirst($this->p->t('global', 'notiz')); ?>
+												</label>
+												<textarea name="empfehlungText"
+													rows="4"><?php echo htmlentities($empfehlungData->notiz) ?></textarea>
+											</div>
+											<input type="submit" class="btn btn-outline-secondary float-end"
+												value="<?php echo ucfirst($this->p->t('ui', 'speichern')); ?>">
+										</form>
 									</div>
 								</div>
 							</div>
-					  
+						</div>
+
 						<div class="mt-4 mb-5 d-flex justify-content-end">
-							<button id="approveAnrechnungDetail-withdraw-request-recommedation"
-									class="me-1 btn btn-outline-secondary btn-w200 <?php echo (is_null($empfehlungData->empfehlung) &&
-										$anrechnungData->status_kurzbz == 'inProgressLektor') ? '' : 'visually-hidden' ?>"
-									type="button">
+							<button id="approveAnrechnungDetail-withdraw-request-recommedation" class="me-1 btn btn-outline-secondary btn-w200 <?php echo (is_null($empfehlungData->empfehlung) &&
+								$anrechnungData->status_kurzbz == 'inProgressLektor') ? '' : 'visually-hidden' ?>" type="button">
 								<?php echo ucfirst($this->p->t('global', 'zuruecknehmen')); ?>
 							</button>
 							<button id="approveAnrechnungDetail-request-recommendation" class="btn btn-primary btn-w200"
@@ -282,164 +330,174 @@ $this->load->view(
 						</div>
 					</div>
 				</div>
-				
+
 				<!-- Genehmigungssdaten -->
 				<div class="row">
 					<div class="col-12">
 						<div class="card my-4">
 							<div class="card-header">
-								<span class="text-uppercase"><b><?php echo $this->p->t('anrechnung', 'genehmigung'); ?></b></span>&emsp;
+								<span
+									class="text-uppercase"><b><?php echo $this->p->t('anrechnung', 'genehmigung'); ?></b></span>&emsp;
 								<div class="float-end">
 									<?php echo $this->p->t('anrechnung', 'abgeschlossenVon'); ?>:
-									<span id="approveAnrechnungDetail-abgeschlossenVon"><?php echo $genehmigungData->abgeschlossen_von ?></span>
+									<span
+										id="approveAnrechnungDetail-abgeschlossenVon"><?php echo $genehmigungData->abgeschlossen_von ?></span>
 									&emsp;|&emsp;
 									<?php echo $this->p->t('anrechnung', 'abschlussdatum'); ?>:
-									<span id="approveAnrechnungDetail-abgeschlossenAm"><?php echo $genehmigungData->abgeschlossen_am ?></span>
+									<span
+										id="approveAnrechnungDetail-abgeschlossenAm"><?php echo $genehmigungData->abgeschlossen_am ?></span>
 								</div>
 							</div>
 							<div class="card-body" id="approveAnrechnungDetail-genehmigungDetail">
 								<!-- Infopanel: Noch nicht genehmigt / abgelehnt -->
 								<div class="card  card-body my-3 <?php echo is_null($genehmigungData->genehmigung) ? '' : 'visually-hidden' ?>"
-									 id="approveAnrechnungDetail-genehmigungDetail-genehmigungIsNull">
+									id="approveAnrechnungDetail-genehmigungDetail-genehmigungIsNull">
 									<?php echo $this->p->t('anrechnung', 'nochKeineGenehmigung'); ?>
 								</div>
 								<!-- Infopanel: Genehmigt -->
-								<div class="card card-body bg-success-subtle my-3 <?php echo $genehmigungData->genehmigung === true ? '' : 'visually-hidden' ?>" id="approveAnrechnungDetail-genehmigungDetail-genehmigungIsPositiv">
+								<div class="card card-body bg-success-subtle my-3 <?php echo $genehmigungData->genehmigung === true ? '' : 'visually-hidden' ?>"
+									id="approveAnrechnungDetail-genehmigungDetail-genehmigungIsPositiv">
 									<b><?php echo $this->p->t('anrechnung', 'genehmigungPositiv'); ?></b>
 								</div>
 								<!-- Infopanel: Abgelehnt -->
-								<div class="<?php echo $genehmigungData->genehmigung === false ? '' : 'visually-hidden' ?>" id="approveAnrechnungDetail-genehmigungDetail-genehmigungIsNegativ">
+								<div class="<?php echo $genehmigungData->genehmigung === false ? '' : 'visually-hidden' ?>"
+									id="approveAnrechnungDetail-genehmigungDetail-genehmigungIsNegativ">
 									<div class="card card-body bg-danger-subtle my-3">
 										<b><?php echo $this->p->t('anrechnung', 'genehmigungNegativ'); ?></b>
 									</div>
-									<div class="card card-body bg-secondary-subtle my-3"><b><?php echo $this->p->t('global', 'begruendung'); ?>
+									<div class="card card-body bg-secondary-subtle my-3">
+										<b><?php echo $this->p->t('global', 'begruendung'); ?>
 											: </b>
-										<span id="approveAnrechnungDetail-genehmigungDetail-begruendung"><?php echo htmlentities($genehmigungData->notiz) ?></span>
+										<span
+											id="approveAnrechnungDetail-genehmigungDetail-begruendung"><?php echo htmlentities($genehmigungData->notiz) ?></span>
 									</div>
 								</div>
-							
-							<form>
-								<input type="hidden" name="anrechnung_id" value="<?php echo $anrechnungData->anrechnung_id ?>">
-								<!-- Ablehnen -->
-								<div style="display: none" id="approveAnrechnungDetail-begruendung-panel">
-									<div>
-										<h4 class="card card-body bg-danger-subtle my-3"><?php echo $this->p->t('anrechnung', 'genehmigungNegativQuestion'); ?></h4>
-                                        <ul class="list-group my-3">
-											<li class="list-group-item">
-												<span><?php echo $this->p->t('anrechnung', 'genehmigungNegativPruefungNichtMoeglich'); ?></span>
-												<span class="btn-copyIntoTextarea float-end" data-bs-toggle="tooltip"
-													  data-bs-placement="right"
-													  title="<?php echo $this->p->t('ui', 'textUebernehmen'); ?>">
-													<i class="fa fa-clipboard fa-lg" aria-hidden="true"></i>
-												</span>
-											</li>
-                                            <li class="list-group-item">
-                                                <span><?php echo $this->p->t('anrechnung', 'genehmigungNegativEctsHoechstgrenzeUeberschritten'); ?></span>
-                                                <span class="btn-copyIntoTextarea float-end" data-bs-toggle="tooltip"
-                                                      data-bs-placement="right"
-                                                      title="<?php echo $this->p->t('ui', 'textUebernehmen'); ?>">
-													<i class="fa fa-clipboard fa-lg" aria-hidden="true"></i>
-												</span>
-                                            </li>
-											<li class="list-group-item">
-												<span><?php echo $this->p->t('anrechnung', 'genehmigungNegativKenntnisseNichtGleichwertigWeil'); ?></span>
-												<span class="btn-copyIntoTextarea float-end" data-bs-toggle="tooltip"
-													  data-bs-placement="right"
-													  title="<?php echo $this->p->t('ui', 'textUebernehmen'); ?>">
-													<i class="fa fa-clipboard fa-lg" aria-hidden="true"></i>
-												</span>
-											</li>
-											<li class="list-group-item">
-												<span><?php echo $this->p->t('anrechnung', 'genehmigungNegativEmpfehlungstextUebernehmen'); ?></span>
-												<span id="empfehlungstextUebernehmen" class="btn-copyIntoTextarea float-end" data-bs-toggle="tooltip"
-													  data-bs-placement="right"
-													  title="<?php echo $this->p->t('ui', 'textUebernehmen'); ?>">
-													<i class="fa fa-clipboard fa-lg" aria-hidden="true"></i>
-												</span>
-											</li>
-                                            <li class="list-group-item" onclick="{ $(this).closest('div').find('textarea').val('').focus()}">
-                                                <span><?php echo $this->p->t('anrechnung', 'andereBegruendung'); ?></span>
-                                            </li>
-										</ul>
-										<textarea class="my-3 form-control" name="begruendung"
-												  id="approveAnrechnungDetail-begruendung"
-												  rows="2"
-                                                  placeholder="<?php echo $this->p->t('anrechnung', 'textUebernehmenOderEigenenBegruendungstext'); ?>" required></textarea>
-									</div>
-									
-									<!-- Action Button 'Abbrechen'-->
-									<div class="float-end">
-										<button id="approveAnrechnungDetail-begruendung-abbrechen"
+
+								<form>
+									<input type="hidden" name="anrechnung_id"
+										value="<?php echo $anrechnungData->anrechnung_id ?>">
+									<!-- Ablehnen -->
+									<div style="display: none" id="approveAnrechnungDetail-begruendung-panel">
+										<div>
+											<h4 class="card card-body bg-danger-subtle my-3">
+												<?php echo $this->p->t('anrechnung', 'genehmigungNegativQuestion'); ?>
+											</h4>
+											<ul class="list-group my-3">
+												<li class="list-group-item">
+													<span><?php echo $this->p->t('anrechnung', 'genehmigungNegativPruefungNichtMoeglich'); ?></span>
+													<span class="btn-copyIntoTextarea float-end"
+														data-bs-toggle="tooltip" data-bs-placement="right"
+														title="<?php echo $this->p->t('ui', 'textUebernehmen'); ?>">
+														<i class="fa fa-clipboard fa-lg" aria-hidden="true"></i>
+													</span>
+												</li>
+												<li class="list-group-item">
+													<span><?php echo $this->p->t('anrechnung', 'genehmigungNegativEctsHoechstgrenzeUeberschritten'); ?></span>
+													<span class="btn-copyIntoTextarea float-end"
+														data-bs-toggle="tooltip" data-bs-placement="right"
+														title="<?php echo $this->p->t('ui', 'textUebernehmen'); ?>">
+														<i class="fa fa-clipboard fa-lg" aria-hidden="true"></i>
+													</span>
+												</li>
+												<li class="list-group-item">
+													<span><?php echo $this->p->t('anrechnung', 'genehmigungNegativKenntnisseNichtGleichwertigWeil'); ?></span>
+													<span class="btn-copyIntoTextarea float-end"
+														data-bs-toggle="tooltip" data-bs-placement="right"
+														title="<?php echo $this->p->t('ui', 'textUebernehmen'); ?>">
+														<i class="fa fa-clipboard fa-lg" aria-hidden="true"></i>
+													</span>
+												</li>
+												<li class="list-group-item">
+													<span><?php echo $this->p->t('anrechnung', 'genehmigungNegativEmpfehlungstextUebernehmen'); ?></span>
+													<span id="empfehlungstextUebernehmen"
+														class="btn-copyIntoTextarea float-end" data-bs-toggle="tooltip"
+														data-bs-placement="right"
+														title="<?php echo $this->p->t('ui', 'textUebernehmen'); ?>">
+														<i class="fa fa-clipboard fa-lg" aria-hidden="true"></i>
+													</span>
+												</li>
+												<li class="list-group-item"
+													onclick="{ $(this).closest('div').find('textarea').val('').focus()}">
+													<span><?php echo $this->p->t('anrechnung', 'andereBegruendung'); ?></span>
+												</li>
+											</ul>
+											<textarea class="my-3 form-control" name="begruendung"
+												id="approveAnrechnungDetail-begruendung" rows="2"
+												placeholder="<?php echo $this->p->t('anrechnung', 'textUebernehmenOderEigenenBegruendungstext'); ?>"
+												required></textarea>
+										</div>
+
+										<!-- Action Button 'Abbrechen'-->
+										<div class="float-end">
+											<button id="approveAnrechnungDetail-begruendung-abbrechen"
 												class="me-1 btn btn-outline-secondary btn-w200" type="reset">
-											<?php echo ucfirst($this->p->t('ui', 'abbrechen')); ?>
-										</button>
-										<button id="approveAnrechnungDetail-reject-anrechnung-confirm"
+												<?php echo ucfirst($this->p->t('ui', 'abbrechen')); ?>
+											</button>
+											<button id="approveAnrechnungDetail-reject-anrechnung-confirm"
 												class="btn btn-primary btn-w200" type="button">
-											<?php echo ucfirst($this->p->t('ui', 'bestaetigen')); ?>
-										</button>
+												<?php echo ucfirst($this->p->t('ui', 'bestaetigen')); ?>
+											</button>
+										</div>
 									</div>
-								</div>
-								<!-- Genehmigen -->
-								<div style="display: none" id="approveAnrechnungDetail-genehmigung-panel">
-									<div class="my-3">
-										<h4 class="card card-body bg-success-subtle "><?php echo $this->p->t('anrechnung', 'genehmigungPositivQuestion'); ?></h4>
-										<span><?php echo $this->p->t('anrechnung', 'genehmigungPositivSubquestion'); ?></span>
-									</div>
-									
-									<!-- Action Button 'Abbrechen'-->
-									<div class="float-end">
-										<button id="approveAnrechnungDetail-genehmigung-abbrechen"
+									<!-- Genehmigen -->
+									<div style="display: none" id="approveAnrechnungDetail-genehmigung-panel">
+										<div class="my-3">
+											<h4 class="card card-body bg-success-subtle ">
+												<?php echo $this->p->t('anrechnung', 'genehmigungPositivQuestion'); ?>
+											</h4>
+											<span><?php echo $this->p->t('anrechnung', 'genehmigungPositivSubquestion'); ?></span>
+										</div>
+
+										<!-- Action Button 'Abbrechen'-->
+										<div class="float-end">
+											<button id="approveAnrechnungDetail-genehmigung-abbrechen"
 												class="me-1 btn btn-outline-secondary btn-w200" type="reset">
-											<?php echo ucfirst($this->p->t('ui', 'abbrechen')); ?>
-										</button>
-										<button id="approveAnrechnungDetail-approve-anrechnung-confirm"
+												<?php echo ucfirst($this->p->t('ui', 'abbrechen')); ?>
+											</button>
+											<button id="approveAnrechnungDetail-approve-anrechnung-confirm"
 												class="btn btn-primary btn-w200" type="button">
-											<?php echo ucfirst($this->p->t('ui', 'bestaetigen')); ?>
-										</button>
+												<?php echo ucfirst($this->p->t('ui', 'bestaetigen')); ?>
+											</button>
+										</div>
 									</div>
-								</div>
-							</form>
+								</form>
 							</div>
 						</div>
 						<!-- Button Gehenhmigen / Ablehnen / Zurücknehmen -->
 						<div class="float-end mb-5">
-							<button id="approveAnrechnungDetail-withdraw-anrechnung-approvement"
-									class="me-1 btn btn-outline-secondary btn-w200 <?php echo ($anrechnungData->status_kurzbz == 'approved' ||
-										$anrechnungData->status_kurzbz == 'rejected') ? '' : 'visually-hidden' ?>"
-									type="button">
+							<button id="approveAnrechnungDetail-withdraw-anrechnung-approvement" class="me-1 btn btn-outline-secondary btn-w200 <?php echo ($anrechnungData->status_kurzbz == 'approved' ||
+								$anrechnungData->status_kurzbz == 'rejected') ? '' : 'visually-hidden' ?>" type="button">
 								<?php echo ucfirst($this->p->t('global', 'zuruecknehmen')); ?>
 							</button>
-							<button id="approveAnrechnungDetail-reject-anrechnung-ask" class="me-1 btn btn-danger btn-w200"
-									type="button"
-								<?php echo $anrechnungData->status_kurzbz == 'inProgressDP' ? '' : 'disabled' ?>>
+							<button id="approveAnrechnungDetail-reject-anrechnung-ask"
+								class="me-1 btn btn-danger btn-w200" type="button" <?php echo $anrechnungData->status_kurzbz == 'inProgressDP' ? '' : 'disabled' ?>>
 								<?php echo ucfirst($this->p->t('global', 'ablehnen')); ?>
 							</button>
-							<button id="approveAnrechnungDetail-approve-anrechnung-ask" class="me-1 btn btn-primary btn-w200"
-									type="button"
-								<?php echo $anrechnungData->status_kurzbz == 'inProgressDP' ? '' : 'disabled' ?>>
+							<button id="approveAnrechnungDetail-approve-anrechnung-ask"
+								class="me-1 btn btn-primary btn-w200" type="button" <?php echo $anrechnungData->status_kurzbz == 'inProgressDP' ? '' : 'disabled' ?>>
 								<?php echo ucfirst($this->p->t('global', 'genehmigen')); ?>
 							</button>
 						</div>
 					</div>
 				</div>
-				
-            </div>
 
-            <div class="col-4">
+			</div>
+
+			<div class="col-4">
 				<!-- -Statusleiste -->
-                <div class="mb-5 alert text-center">
-                    Status: <b><span class="text-uppercase" id="approveAnrechnungDetail-status_kurzbz"
-                             data-status_kurzbz="<?php echo $anrechnungData->status_kurzbz ?>">
-                            <?php echo $anrechnungData->status; ?>
-                        </span></b>
-                </div>
-                
+				<div class="mb-5 alert text-center">
+					Status: <b><span class="text-uppercase" id="approveAnrechnungDetail-status_kurzbz"
+							data-status_kurzbz="<?php echo $anrechnungData->status_kurzbz ?>">
+							<?php echo $anrechnungData->status; ?>
+						</span></b>
+				</div>
+
 				<!-- Infopanels -->
 				<?php $this->load->view('lehre/anrechnung/reviewAnrechnungInfo'); ?>
-            </div>
-        </div>
+			</div>
+		</div>
 
-    </div><!--end container-fluid-->
+	</div><!--end container-fluid-->
 </div><!--end page-wrapper-->
 
-<?php $this->load->view('templates/FHC-Footer'); ?>
+<?php $this->load->view('templates/FHC-Footer'); ?>
\ No newline at end of file
diff --git a/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php b/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
index 067a988c6..903509ebe 100644
--- a/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
+++ b/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
@@ -204,32 +204,7 @@ $filterWidgetArray = array(
 	),
 
 	'datasetRepOptions' => '{
-height: func_height(this),
-layout: "fitColumns",               // fit columns to width of table
-layoutColumnsOnNewData:true,
-persistenceID: "approveAnrechnungUebersicht_V1",
-autoResize: false,               // prevent auto resizing of table (false to allow adapting table size when cols are (de-)activated
-index: "anrechnung_id",             // assign specific column as unique id (important for row indexing)
-selectable: true,               // allow row selection
-selectableRangeMode: "click",   // allow range selection using shift end click on end of range
-selectablePersistence:false,    // deselect previously selected rows when table is filtered, sorted or paginated
-tableWidgetFooter: {
-	selectButtons: true  // tableWidgetFooter properties are checked in _renderTabulatorFooterHTML function
-},
-selectableCheck: function(row){
-	return func_selectableCheck(row);
-},
-rowFormatter:function(row){
-	func_rowFormatter(row,this);
-},
-columnDefaults:{
-	
-	//columnDefaults tooltip did not work
-	
-	tooltip:function(e, cell, onRendered){
-		return func_tooltips(cell);
-	},
-},
+
 		height: func_height(this),
 		layout: "fitColumns",           // fit columns to width of table
 		persistenceID: "approveAnrechnungUebersicht_V1",
@@ -254,7 +229,7 @@ columnDefaults:{
 			tooltip:function(e, cell, onRendered){
 				return func_tooltips(cell);
 			},
-			//headerFilterPlaceholder: " ",
+			headerFilterPlaceholder: " ",
 		}
 		
 	 }', // tabulator properties
diff --git a/application/views/lehre/anrechnung/createAnrechnung.php b/application/views/lehre/anrechnung/createAnrechnung.php
index 0ed7a8027..d7fc3ece9 100644
--- a/application/views/lehre/anrechnung/createAnrechnung.php
+++ b/application/views/lehre/anrechnung/createAnrechnung.php
@@ -10,8 +10,8 @@ $this->load->view(
 		'ajaxlib' => true,
 		'dialoglib' => true,
 		'tabulator5' => true,
-        'tabulator5JQuery' => true,
-		'cis'=>true,
+		'tabulator5JQuery' => true,
+		'cis' => true,
 		'tablewidget' => true,
 		'phrases' => array(
 			'global' => array(
@@ -34,138 +34,146 @@ $this->load->view(
 			'public/js/lehre/anrechnung/createAnrechnung.js'
 		),
 		'customCSSs' => array(
-				'public/css/lehre/anrechnung.css'
+			'public/css/lehre/anrechnung.css'
 		)
 	)
 );
 ?>
 
 <div id="page-wrapper">
-<div class="container-fluid">
+	<div class="container-fluid">
 
-<!-- Title -->
-<div class="row  my-4">
-	<div class="col-12 border-bottom">
-		<h3 class="fw-normal">
-			<?php echo $this->p->t('anrechnung', 'neueAnrechnung'); ?>
-			<small class="text-secondary fs-6">| <?php echo $this->p->t('global', 'antragAnlegen'); ?></small>
-		</h3>
-	</div>
-</div>
-
-<!-- Studiensemester Dropdown -->
-<div class="row my-4">
-	<div class="col-12">
-		<form class="row align-items-center" action="" method="get">
-			<div class="col-auto">
-				<?php
-				echo $this->widgetlib->widget(
-					'Studiensemester_widget',
-					array(
-						DropdownWidget::SELECTED_ELEMENT => $studiensemester_selected
-					),
-					array(
-						'name' => 'studiensemester',
-						'id' => 'studiensemester',
-						'class'=>'form-select w-auto ',
-					)
-				);
-				?>
+		<!-- Title -->
+		<div class="row  my-4">
+			<div class="col-12 border-bottom">
+				<h3 class="fw-normal">
+					<?php echo $this->p->t('anrechnung', 'neueAnrechnung'); ?>
+					<small class="text-secondary fs-6">| <?php echo $this->p->t('global', 'antragAnlegen'); ?></small>
+				</h3>
 			</div>
-			<button type="submit"
-					class="btn btn-outline-secondary col-auto">
-				<?php echo ucfirst($this->p->t('ui', 'anzeigen')); ?>
-			</button>
+		</div>
+
+		<!-- Studiensemester Dropdown -->
+		<div class="row my-4">
+			<div class="col-12">
+				<form class="row align-items-center" action="" method="get">
+					<div class="col-auto">
+						<?php
+						echo $this->widgetlib->widget(
+							'Studiensemester_widget',
+							array(
+								DropdownWidget::SELECTED_ELEMENT => $studiensemester_selected
+							),
+							array(
+								'name' => 'studiensemester',
+								'id' => 'studiensemester',
+								'class' => 'form-select w-auto ',
+							)
+						);
+						?>
+					</div>
+					<button type="submit" class="btn btn-outline-secondary col-auto">
+						<?php echo ucfirst($this->p->t('ui', 'anzeigen')); ?>
+					</button>
+				</form>
+			</div>
+		</div>
+
+		<!-- StudentInnen Table -->
+		<div class="row  my-4">
+			<div class="col-10">
+				<?php $this->load->view('lehre/anrechnung/createAnrechnungData.php'); ?>
+			</div>
+		</div>
+		<!-- FORM START ------------------------------------------------------------------------------------------------------->
+		<form id="createAnrechnung-form">
+			<input name="prestudent_id" id="prestudent_id" type="hidden" value="" data-prestudent_id="">
+			<input name="studiensemester_kurzbz" id="studiensemester_kurzbz" type="hidden"
+				value="<?php echo $studiensemester_selected ?>">
+			<div class="row my-4">
+				<div class="col-10">
+					<table class="table table-condensed table-bordered mb-0">
+						<!-- StudentIn -->
+						<tr>
+							<th class="col-5 col-lg-2"><label><?php echo $this->p->t('person', 'studentIn'); ?></label>
+							</th>
+							<td><span id="student" class="ps-3"></span></td>
+						</tr>
+						<!-- Selectmenu Lehrveranstaltungen -->
+						<tr>
+							<th class="col-5 col-lg-2"><?php echo $this->p->t('lehre', 'lehrveranstaltung'); ?> *</th>
+							<td>
+								<select name="lehrveranstaltung_id" id="select-lehrveranstaltung"
+									class="form-select select-w500">
+									<option value="" <?php echo set_select('lehrveranstaltung', '', true); ?>>
+										<?php echo $this->p->t('ui', 'bitteWaehlen'); ?>
+									</option>
+								</select>
+							</td>
+						</tr>
+						<!-- Select Anrechnungbegruendungen -->
+						<tr>
+							<th class="col-5 col-lg-2"><?php echo $this->p->t('global', 'begruendung'); ?> *</th>
+							<td>
+								<select name="begruendung_id" id="select-begruendung" class="form-select select-w500">
+									<option value="" <?php echo set_select('begruendung', '', true); ?>>
+										<?php echo $this->p->t('ui', 'bitteWaehlen'); ?>
+									</option>
+									<?php foreach ($begruendungen as $begruendung): ?>
+										<option value="<?php echo $begruendung->begruendung_id ?>" <?php echo set_select('begruendung', $begruendung->begruendung_id); ?>>
+											<?php echo ucfirst($begruendung->bezeichnung) ?>
+										</option>
+									<?php endforeach; ?>
+								</select>
+							</td>
+						</tr>
+						<!-- Submit Herkunft der Kenntnisse -->
+						<tr>
+							<th class="col-5 col-lg-2"><?php echo $this->p->t('anrechnung', 'herkunftDerKenntnisse'); ?>
+							</th>
+							<td>
+								<?php echo form_textarea(
+									array(
+										'name' => 'herkunftKenntnisse',
+										'rows' => 1
+									)
+								); ?>
+							</td>
+						</tr>
+						<!-- Submit Upload Nachweisdokumente -->
+						<tr>
+							<th class="col-5 col-lg-2 "><?php echo $this->p->t('anrechnung', 'nachweisdokumente'); ?> *
+							</th>
+							<td class="d-flex input-group align-items-center">
+
+								<input class="form-control flex-fill" type="file" id="requestAnrechnung-uploadfile"
+									name="uploadfile" accept=".pdf" size="50"
+									data-maxsize="<?php echo (int) ini_get('upload_max_filesize') * 1024 * 1024 ?>"
+									required>
+
+							</td>
+						</tr>
+					</table>
+				</div>
+			</div>
+
+			<div class="row my-4">
+				<div class="col-10">
+					<!-- Submit Button -->
+					<button class="btn btn-primary btn-w200 float-end" id="createAnrechnung-submit" type="submit"
+						value="submit">
+						<?php echo $this->p->t('global', 'antragAnlegen'); ?>
+					</button>
+					<!-- Open new Anrechnung Button (hidden by default) -->
+					<a type="button" class="btn btn-outline-secondary me-1 float-end visually-hidden"
+						id="createAnrechnung-openAnrechnung" target="_blank"></a>
+				</div>
+			</div>
+
 		</form>
+		<!-- FORM END --------------------------------------------------------------------------------------------------------->
+
 	</div>
 </div>
 
-<!-- StudentInnen Table -->
-<div class="row  my-4">
-	<div class="col-10">
-		<?php $this->load->view('lehre/anrechnung/createAnrechnungData.php'); ?>
-	</div>
-</div>
-<!-- FORM START ------------------------------------------------------------------------------------------------------->
-<form id="createAnrechnung-form">
-<input name="prestudent_id" id="prestudent_id" type="hidden" value="" data-prestudent_id = "" >
-<input name="studiensemester_kurzbz" id="studiensemester_kurzbz" type="hidden" value="<?php echo $studiensemester_selected ?>">
-<div class="row my-4">
-	<div class="col-10">
-		<table class="table table-condensed table-bordered mb-0">
-			<!-- StudentIn -->
-			<tr>
-				<th class="col-5 col-lg-2"><label><?php echo $this->p->t('person', 'studentIn'); ?></label></th>
-				<td><span id="student" class="ps-3"></span></td>
-			</tr>
-			<!-- Selectmenu Lehrveranstaltungen -->
-			<tr>
-				<th class="col-5 col-lg-2"><?php echo $this->p->t('lehre', 'lehrveranstaltung'); ?> *</th>
-				<td>
-					<select name="lehrveranstaltung_id" id="select-lehrveranstaltung" class="form-select select-w500">
-						<option value="" <?php echo set_select('lehrveranstaltung', '', true); ?> >
-							<?php echo $this->p->t('ui', 'bitteWaehlen'); ?>
-						</option>
-					</select>
-				</td>
-			</tr>
-			<!-- Select Anrechnungbegruendungen -->
-			<tr>
-				<th class="col-5 col-lg-2"><?php echo $this->p->t('global', 'begruendung'); ?> *</th>
-				<td>
-					<select name="begruendung_id" id="select-begruendung" class="form-select select-w500">
-						<option value="" <?php echo set_select('begruendung', '', true); ?> >
-							<?php echo $this->p->t('ui', 'bitteWaehlen'); ?>
-						</option>
-						<?php foreach ($begruendungen as $begruendung) : ?>
-							<option value="<?php echo $begruendung->begruendung_id ?>"
-								<?php echo set_select('begruendung', $begruendung->begruendung_id); ?> >
-								<?php echo ucfirst($begruendung->bezeichnung) ?>
-							</option>
-						<?php endforeach; ?>
-					</select>
-				</td>
-			</tr>
-			<!-- Submit Herkunft der Kenntnisse -->
-			<tr>
-				<th class="col-5 col-lg-2"><?php echo $this->p->t('anrechnung', 'herkunftDerKenntnisse'); ?></th>
-				<td>
-					<?php echo form_textarea(array(
-						'name' => 'herkunftKenntnisse',
-						'rows' => 1
-					)); ?>
-				</td>
-			</tr>
-			<!-- Submit Upload Nachweisdokumente -->
-			<tr>
-				<th class="col-5 col-lg-2 "><?php echo $this->p->t('anrechnung', 'nachweisdokumente'); ?> *</th>
-				<td class="d-flex input-group align-items-center">
-					
-					<input class="form-control flex-fill" type="file" id="requestAnrechnung-uploadfile"
-						name="uploadfile" accept=".pdf" size="50" data-maxsize="<?php echo (int)ini_get('upload_max_filesize') * 1024 * 1024 ?>"
-						required>
-							
-				</td>
-			</tr>
-		</table>
-	</div>
-</div>
-
-<div class="row my-4">
-	<div class="col-10">
-		<!-- Submit Button -->
-		<button class="btn btn-primary btn-w200 float-end" id="createAnrechnung-submit" type="submit" value="submit">
-			<?php echo $this->p->t('global', 'antragAnlegen'); ?>
-		</button>
-		<!-- Open new Anrechnung Button (hidden by default) -->
-		<a type="button" class="btn btn-outline-secondary me-1 float-end visually-hidden" id="createAnrechnung-openAnrechnung" target="_blank"></a>
-	</div>
-</div>
-
-</form>
-<!-- FORM END --------------------------------------------------------------------------------------------------------->
-
-</div>
-</div>
-
-<?php $this->load->view('templates/FHC-Footer'); ?>
+<?php $this->load->view('templates/FHC-Footer'); ?>
\ No newline at end of file
diff --git a/application/views/lehre/anrechnung/reviewAnrechnungDetail.php b/application/views/lehre/anrechnung/reviewAnrechnungDetail.php
index 0b2e39ddd..e015e9486 100644
--- a/application/views/lehre/anrechnung/reviewAnrechnungDetail.php
+++ b/application/views/lehre/anrechnung/reviewAnrechnungDetail.php
@@ -22,7 +22,7 @@ $this->load->view(
 				'systemfehler',
 				'bitteMindEinenAntragWaehlen',
 				'bitteBegruendungAngeben',
-                'bitteBegruendungVervollstaendigen',
+				'bitteBegruendungVervollstaendigen',
 				'anrechnungenWurdenEmpfohlen',
 				'anrechnungenWurdenNichtEmpfohlen'
 			),
@@ -37,13 +37,12 @@ $this->load->view(
 				'ects',
 				'lektor',
 			),
-            'anrechnung' => array(
-                'empfehlungPositivConfirmed',
-                'empfehlungNegativConfirmed'
-            )
+			'anrechnung' => array(
+				'empfehlungPositivConfirmed',
+				'empfehlungNegativConfirmed'
+			)
 		),
 		'customCSSs' => array(
-			'public/css/Tabulator.css',
 			'public/css/lehre/anrechnung.css'
 		),
 		'customJSs' => array(
@@ -53,76 +52,89 @@ $this->load->view(
 		)
 	)
 );
-?> 
+?>
 
 <div id="page-wrapper">
-    <div class="container-fluid">
-        <!-- title -->
-        <div class="row">
-            <div class="col-12 my-4 border-bottom">
-                <h3 class="fw-normal ">
+	<div class="container-fluid">
+		<!-- title -->
+		<div class="row">
+			<div class="col-12 my-4 border-bottom">
+				<h3 class="fw-normal ">
 					<?php echo $this->p->t('anrechnung', 'anrechnungenPruefen'); ?>
-                    <small class="text-secondary fs-6">| <?php echo $this->p->t('global', 'detailsicht'); ?></small>
-                </h3>
-            </div>
-        </div>
+					<small class="text-secondary fs-6">| <?php echo $this->p->t('global', 'detailsicht'); ?></small>
+				</h3>
+			</div>
+		</div>
 
-        <div class="row">
-            <div class="col-8">
+		<div class="row">
+			<div class="col-8">
 				<!-- Antragsdaten -->
 				<div class="row mb-4">
 					<div class="col-12">
 						<div class="card">
 							<div class="card-header">
-								<span class="text-uppercase"><b><?php echo $this->p->t('anrechnung', 'antrag'); ?></b></span>
+								<span
+									class="text-uppercase"><b><?php echo $this->p->t('anrechnung', 'antrag'); ?></b></span>
 								</span>&emsp;
 								<span class="reviewAnrechnungDetail-anrechnungInfoTooltip" data-bs-toggle="tooltip"
-									  data-bs-placement="right" data-bs-html="true"
-									  title="<?php echo $this->p->t('anrechnung', 'anrechnungInfoTooltipText'); ?>">
-													<i class="fa fa-lg fa-info-circle" aria-hidden="true"></i>
-												</span>
+									data-bs-placement="right" data-bs-html="true"
+									title="<?php echo $this->p->t('anrechnung', 'anrechnungInfoTooltipText'); ?>">
+									<i class="fa fa-lg fa-info-circle" aria-hidden="true"></i>
+								</span>
 								<span class="float-end"><?php echo $this->p->t('anrechnung', 'antragdatum'); ?>: <span
-											id="reviewAnrechnung-status"><?php echo !empty($anrechnungData->anrechnung_id) ? $anrechnungData->insertamum : '-' ?></span></span>
+										id="reviewAnrechnung-status"><?php echo !empty($anrechnungData->anrechnung_id) ? $anrechnungData->insertamum : '-' ?></span></span>
 							</div>
 							<div class="card-body">
 								<div class="row">
 									<div class="col-4">
 										<table class="table table-bordered table-condensed table-fixed mb-0">
 											<tbody>
-											<tr>
-												<th class="col-5"><?php echo ucfirst($this->p->t('person', 'studentIn')); ?></th>
-												<td><?php echo $antragData->vorname . ' ' . $antragData->nachname; ?></td>
-											</tr>
-											<tr>
-												<th class="col-5"><?php echo $this->p->t('person', 'personenkennzeichen'); ?></th>
-												<td><?php echo $antragData->matrikelnr ?></td>
-											</tr>
-											<tr>
-												<th class="col-5"><?php echo ucfirst($this->p->t('lehre', 'studiensemester')); ?></th>
-												<td><?php echo $antragData->studiensemester_kurzbz ?></td>
-											</tr>
-											<tr>
-												<th class="col-5"><?php echo ucfirst($this->p->t('lehre', 'studiengang')); ?></th>
-												<td><?php echo $antragData->stg_bezeichnung ?></td>
-											</tr>
-											<tr>
-												<th class="col-5"><?php echo $this->p->t('lehre', 'lehrveranstaltung'); ?></th>
-												<td><?php echo $antragData->lv_bezeichnung ?></td>
-											</tr>
-                                            <tr>
-                                                <th class="col-5"><?php echo $this->p->t('lehre', 'ects'); ?></th>
-                                                <td><?php echo $antragData->ects ?></td>
-                                            </tr>
-                                            <tr>
-                                                <th class="col-5"><?php echo $this->p->t('lehre', 'lektorInnen'); ?></th>
-                                                <td>
-													<?php $len = count($antragData->lektoren) - 1 ?>
-													<?php foreach ($antragData->lektoren as $key => $lektor): ?>
-														<?php echo $lektor->vorname . ' ' . $lektor->nachname;
-														echo $key === $len ? '' : ', ' ?>
-													<?php endforeach; ?>
-                                                </td>
-                                            </tr>
+												<tr>
+													<th class="col-5">
+														<?php echo ucfirst($this->p->t('person', 'studentIn')); ?>
+													</th>
+													<td><?php echo $antragData->vorname . ' ' . $antragData->nachname; ?>
+													</td>
+												</tr>
+												<tr>
+													<th class="col-5">
+														<?php echo $this->p->t('person', 'personenkennzeichen'); ?>
+													</th>
+													<td><?php echo $antragData->matrikelnr ?></td>
+												</tr>
+												<tr>
+													<th class="col-5">
+														<?php echo ucfirst($this->p->t('lehre', 'studiensemester')); ?>
+													</th>
+													<td><?php echo $antragData->studiensemester_kurzbz ?></td>
+												</tr>
+												<tr>
+													<th class="col-5">
+														<?php echo ucfirst($this->p->t('lehre', 'studiengang')); ?>
+													</th>
+													<td><?php echo $antragData->stg_bezeichnung ?></td>
+												</tr>
+												<tr>
+													<th class="col-5">
+														<?php echo $this->p->t('lehre', 'lehrveranstaltung'); ?>
+													</th>
+													<td><?php echo $antragData->lv_bezeichnung ?></td>
+												</tr>
+												<tr>
+													<th class="col-5"><?php echo $this->p->t('lehre', 'ects'); ?></th>
+													<td><?php echo $antragData->ects ?></td>
+												</tr>
+												<tr>
+													<th class="col-5"><?php echo $this->p->t('lehre', 'lektorInnen'); ?>
+													</th>
+													<td>
+														<?php $len = count($antragData->lektoren) - 1 ?>
+														<?php foreach ($antragData->lektoren as $key => $lektor): ?>
+															<?php echo $lektor->vorname . ' ' . $lektor->nachname;
+															echo $key === $len ? '' : ', ' ?>
+														<?php endforeach; ?>
+													</td>
+												</tr>
 											</tbody>
 										</table>
 									</div>
@@ -130,29 +142,41 @@ $this->load->view(
 										<table class="table table-bordered table-condensed table-fixed mb-0">
 											<tbody>
 
-											<tr>
-												<th class="col-4"><?php echo ucfirst($this->p->t('global', 'zgv')); ?></th>
-												<td><?php echo $antragData->zgv ?></td>
-											</tr>
-											<tr>
-												<th class="col-4"><?php echo $this->p->t('anrechnung', 'herkunftDerKenntnisse'); ?></th>
-												<td><?php echo $anrechnungData->anmerkung ?></td>
-											</tr>
-											<tr>
-												<th class="col-4"><?php echo $this->p->t('anrechnung', 'nachweisdokumente'); ?></th>
-												<td>
-													<a href="<?php echo current_url() . '/download?dms_id=' . $anrechnungData->dms_id; ?>"
-													   target="_blank"><?php echo htmlentities($anrechnungData->dokumentname) ?></a>
-												</td>
-											</tr>
-                                            <tr>
-                                                <th class="col-4"><?php echo $this->p->t('anrechnung', 'begruendungEctsLabel'); ?></th>
-                                                <td><span><?php echo $anrechnungData->begruendung_ects ?></span></td>
-                                            </tr>
-                                            <tr>
-                                                <th class="col-4"><?php echo $this->p->t('anrechnung', 'begruendungLvinhaltLabel'); ?></th>
-                                                <td><span><?php echo $anrechnungData->begruendung_lvinhalt ?></span></td>
-                                            </tr>
+												<tr>
+													<th class="col-4">
+														<?php echo ucfirst($this->p->t('global', 'zgv')); ?>
+													</th>
+													<td><?php echo $antragData->zgv ?></td>
+												</tr>
+												<tr>
+													<th class="col-4">
+														<?php echo $this->p->t('anrechnung', 'herkunftDerKenntnisse'); ?>
+													</th>
+													<td><?php echo $anrechnungData->anmerkung ?></td>
+												</tr>
+												<tr>
+													<th class="col-4">
+														<?php echo $this->p->t('anrechnung', 'nachweisdokumente'); ?>
+													</th>
+													<td>
+														<a href="<?php echo current_url() . '/download?dms_id=' . $anrechnungData->dms_id; ?>"
+															target="_blank"><?php echo htmlentities($anrechnungData->dokumentname) ?></a>
+													</td>
+												</tr>
+												<tr>
+													<th class="col-4">
+														<?php echo $this->p->t('anrechnung', 'begruendungEctsLabel'); ?>
+													</th>
+													<td><span><?php echo $anrechnungData->begruendung_ects ?></span>
+													</td>
+												</tr>
+												<tr>
+													<th class="col-4">
+														<?php echo $this->p->t('anrechnung', 'begruendungLvinhaltLabel'); ?>
+													</th>
+													<td><span><?php echo $anrechnungData->begruendung_lvinhalt ?></span>
+													</td>
+												</tr>
 											</tbody>
 										</table>
 
@@ -165,15 +189,19 @@ $this->load->view(
 				<!-- Empfehlungsdaten -->
 				<div class="row">
 					<div class="col-12">
-						<div class="card mb-4" id="reviewAnrechnungDetail-empfehlung" data-empfehlung="<?php echo json_encode($empfehlungData->empfehlung) ?>">
+						<div class="card mb-4" id="reviewAnrechnungDetail-empfehlung"
+							data-empfehlung="<?php echo json_encode($empfehlungData->empfehlung) ?>">
 							<div class="card-header">
-								<span class="text-uppercase"><b><?php echo $this->p->t('anrechnung', 'empfehlung'); ?></b></span>
+								<span
+									class="text-uppercase"><b><?php echo $this->p->t('anrechnung', 'empfehlung'); ?></b></span>
 								<div class="float-end">
 									<?php echo $this->p->t('anrechnung', 'empfehlungVon'); ?>:
-									<span id="reviewAnrechnungDetail-empfehlungVon"><?php echo $empfehlungData->empfehlung_von ?></span>
+									<span
+										id="reviewAnrechnungDetail-empfehlungVon"><?php echo $empfehlungData->empfehlung_von ?></span>
 									&emsp;|&emsp;
 									<?php echo $this->p->t('anrechnung', 'empfehlungdatum'); ?>:
-									<span id="reviewAnrechnungDetail-empfehlungAm"><?php echo $empfehlungData->empfehlung_am ?></span>
+									<span
+										id="reviewAnrechnungDetail-empfehlungAm"><?php echo $empfehlungData->empfehlung_am ?></span>
 
 								</div>
 							</div>
@@ -181,117 +209,138 @@ $this->load->view(
 								<div class="row">
 									<div class="col-6">
 										<table class="table table-bordered table-condensed table-fixed mb-0">
-												<tbody>
+											<tbody>
 												<tr>
-													<th class="col-4"><?php echo ucfirst($this->p->t('anrechnung', 'empfehlungsanfrageAm')); ?></th>
-													<td id="reviewAnrechnungDetail-empfehlungDetail-empfehlungsanfrageAm">
+													<th class="col-4">
+														<?php echo ucfirst($this->p->t('anrechnung', 'empfehlungsanfrageAm')); ?>
+													</th>
+													<td
+														id="reviewAnrechnungDetail-empfehlungDetail-empfehlungsanfrageAm">
 														<?php echo $empfehlungData->empfehlungsanfrageAm; ?>
 													</td>
 												</tr>
 												<tr>
-													<th class="col-4"><?php echo $this->p->t('anrechnung', 'empfehlungsanfrageAn'); ?></th>
-													<td id="reviewAnrechnungDetail-empfehlungDetail-empfehlungsanfrageAn">
+													<th class="col-4">
+														<?php echo $this->p->t('anrechnung', 'empfehlungsanfrageAn'); ?>
+													</th>
+													<td
+														id="reviewAnrechnungDetail-empfehlungDetail-empfehlungsanfrageAn">
 														<?php echo $empfehlungData->empfehlungsanfrageAn; ?>
 													</td>
 												</tr>
 												<tr>
-													<th class="col-4"><?php echo ucfirst($this->p->t('anrechnung', 'empfehlungAm')); ?></th>
+													<th class="col-4">
+														<?php echo ucfirst($this->p->t('anrechnung', 'empfehlungAm')); ?>
+													</th>
 													<td id="reviewAnrechnungDetail-empfehlungDetail-empfehlungAm">
 														<?php echo $empfehlungData->empfehlung_am ?>
 													</td>
 												</tr>
 												<tr>
-													<th class="col-4"><?php echo ucfirst($this->p->t('anrechnung', 'empfehlungVon')); ?></th>
+													<th class="col-4">
+														<?php echo ucfirst($this->p->t('anrechnung', 'empfehlungVon')); ?>
+													</th>
 													<td id="reviewAnrechnungDetail-empfehlungDetail-empfehlungVon">
 														<?php echo $empfehlungData->empfehlung_von ?>
 													</td>
 												</tr>
 												<tr>
-													<th class="col-4"><?php echo $this->p->t('anrechnung', 'empfehlung'); ?></th>
+													<th class="col-4">
+														<?php echo $this->p->t('anrechnung', 'empfehlung'); ?>
+													</th>
 													<td id="reviewAnrechnungDetail-empfehlungDetail-empfehlung"></td>
 												</tr>
 												<tr>
-													<th class="col-4"><?php echo $this->p->t('global', 'begruendung'); ?></th>
+													<th class="col-4">
+														<?php echo $this->p->t('global', 'begruendung'); ?>
+													</th>
 													<td id="reviewAnrechnungDetail-empfehlungDetail-begruendung">
 														<?php echo htmlentities($empfehlungData->begruendung) ?>
 													</td>
 												</tr>
-												</tbody>
-											</table>
+											</tbody>
+										</table>
 									</div>
 									<div class="col-6">
 										<div>
 											<label class="text-center mb-2">
 												<b><?php echo ucfirst($this->p->t('global', 'notizDerSTGL')); ?></b>
 											</label>
-											<textarea rows="4" readonly><?php echo htmlentities($empfehlungData->notiz) ?></textarea>
+											<textarea rows="4"
+												readonly><?php echo htmlentities($empfehlungData->notiz) ?></textarea>
 										</div>
 									</div>
 								</div>
 							</div>
 							<form>
 								<input type="hidden" name="anrechnung_id"
-									   value="<?php echo $anrechnungData->anrechnung_id ?>">
+									value="<?php echo $anrechnungData->anrechnung_id ?>">
 								<!-- Nicht empfehlen panel (hidden) -->
-								<div class="card card-body" style="display: none" id="reviewAnrechnungDetail-begruendung-panel">
+								<div class="card card-body" style="display: none"
+									id="reviewAnrechnungDetail-begruendung-panel">
 									<div class="mb-4">
-										<h4 class="card card-body bg-danger-subtle my-3"><?php echo $this->p->t('anrechnung', 'empfehlungNegativQuestion'); ?></h4>
-                                        <ul class="list-group mb-4">
+										<h4 class="card card-body bg-danger-subtle my-3">
+											<?php echo $this->p->t('anrechnung', 'empfehlungNegativQuestion'); ?>
+										</h4>
+										<ul class="list-group mb-4">
 											<li class="list-group-item">
 												<span><?php echo $this->p->t('anrechnung', 'empfehlungNegativPruefungNichtMoeglich'); ?></span>&emsp;
 												<span class="btn-copyIntoTextarea float-end" data-bs-toggle="tooltip"
-													  data-bs-placement="right" data-bs-html="true"
-													  title="<?php echo $this->p->t('ui', 'textUebernehmen'); ?>">
+													data-bs-placement="right" data-bs-html="true"
+													title="<?php echo $this->p->t('ui', 'textUebernehmen'); ?>">
 													<i class="fa fa-clipboard fa-lg" aria-hidden="true"></i>
 												</span>
 											</li>
 											<li class="list-group-item">
 												<span><?php echo $this->p->t('anrechnung', 'empfehlungNegativKenntnisseNichtGleichwertigWeil'); ?></span>&emsp;
 												<span class="btn-copyIntoTextarea float-end" data-bs-toggle="tooltip"
-													  data-bs-placement="right" data-bs-html="true"
-													  title="<?php echo $this->p->t('ui', 'textUebernehmen'); ?>">
+													data-bs-placement="right" data-bs-html="true"
+													title="<?php echo $this->p->t('ui', 'textUebernehmen'); ?>">
 													<i class="fa fa-clipboard fa-lg" aria-hidden="true"></i>
 												</span>
 											</li>
-                                            <li class="list-group-item" onclick="{ $(this).closest('div').find('textarea').val('').focus()}">
-                                                <span><?php echo $this->p->t('anrechnung', 'andereBegruendung'); ?></span>
-                                            </li>
+											<li class="list-group-item"
+												onclick="{ $(this).closest('div').find('textarea').val('').focus()}">
+												<span><?php echo $this->p->t('anrechnung', 'andereBegruendung'); ?></span>
+											</li>
 										</ul>
 										<textarea class="my-3 form-control" name="begruendung"
-												  id="reviewAnrechnungDetail-begruendung"
-												  rows="2"
-                                                  placeholder="<?php echo $this->p->t('anrechnung', 'textUebernehmenOderEigenenBegruendungstext'); ?>"
-                                                  required></textarea>
+											id="reviewAnrechnungDetail-begruendung" rows="2"
+											placeholder="<?php echo $this->p->t('anrechnung', 'textUebernehmenOderEigenenBegruendungstext'); ?>"
+											required></textarea>
 									</div>
-									
+
 									<!-- Button Abbrechen & Bestaetigen-->
 									<div class="d-flex justify-content-end">
 										<button id="reviewAnrechnungDetail-begruendung-abbrechen"
-												class="me-1 btn btn-outline-secondary btn-w200" type="reset">
+											class="me-1 btn btn-outline-secondary btn-w200" type="reset">
 											<?php echo ucfirst($this->p->t('ui', 'abbrechen')); ?>
 										</button>
 										<button id="reviewAnrechnungDetail-dont-recommend-anrechnung-confirm"
-												class="btn btn-primary btn-w200" type="button">
+											class="btn btn-primary btn-w200" type="button">
 											<?php echo ucfirst($this->p->t('ui', 'bestaetigen')); ?>
 										</button>
 									</div>
 								</div>
 								<!-- Empfehlen panel (hidden)-->
-								<div class="card card-body" style="display: none" id="reviewAnrechnungDetail-empfehlung-panel">
+								<div class="card card-body" style="display: none"
+									id="reviewAnrechnungDetail-empfehlung-panel">
 									<div class="my-3">
-										<h4 class="card card-body bg-success-subtle"><?php echo $this->p->t('anrechnung', 'empfehlungPositivQuestion'); ?></h4>
-										<span ><?php echo $this->p->t('anrechnung', 'empfehlungPositivSubquestion'); ?>
+										<h4 class="card card-body bg-success-subtle">
+											<?php echo $this->p->t('anrechnung', 'empfehlungPositivQuestion'); ?>
+										</h4>
+										<span><?php echo $this->p->t('anrechnung', 'empfehlungPositivSubquestion'); ?>
 										</span>
 									</div>
-									
+
 									<!-- Action Button Abbrechen & Bestaetigen-->
 									<div class="d-flex justify-content-end">
 										<button id="reviewAnrechnungDetail-empfehlung-abbrechen"
-												class="me-1 btn btn-outline-secondary btn-w200" type="reset">
+											class="me-1 btn btn-outline-secondary btn-w200" type="reset">
 											<?php echo ucfirst($this->p->t('ui', 'abbrechen')); ?>
 										</button>
 										<button id="reviewAnrechnungDetail-recommend-anrechnung-confirm"
-												class="btn btn-primary btn-w200" type="button">
+											class="btn btn-primary btn-w200" type="button">
 											<?php echo ucfirst($this->p->t('ui', 'bestaetigen')); ?>
 										</button>
 									</div>
@@ -300,36 +349,34 @@ $this->load->view(
 						</div>
 						<!-- Button Empfehlen / Nicht Empfehlen -->
 						<div class="float-end mb-5">
-							<button id="reviewAnrechnungDetail-dont-recommend-anrechnung-ask" class="me-1 btn btn-danger btn-w200"
-									type="button"
-								<?php echo (is_null($empfehlungData->empfehlung) && $isEmpfehlungsberechtigt) ? '' : 'disabled' ?>>
+							<button id="reviewAnrechnungDetail-dont-recommend-anrechnung-ask"
+								class="me-1 btn btn-danger btn-w200" type="button" <?php echo (is_null($empfehlungData->empfehlung) && $isEmpfehlungsberechtigt) ? '' : 'disabled' ?>>
 								<?php echo ucfirst($this->p->t('anrechnung', 'nichtEmpfehlen')); ?>
 							</button>
-							<button id="reviewAnrechnungDetail-recommend-anrechnung-ask" class="btn btn-primary btn-w200"
-									type="button"
-								<?php echo (is_null($empfehlungData->empfehlung) && $isEmpfehlungsberechtigt) ? '' : 'disabled' ?>>
+							<button id="reviewAnrechnungDetail-recommend-anrechnung-ask"
+								class="btn btn-primary btn-w200" type="button" <?php echo (is_null($empfehlungData->empfehlung) && $isEmpfehlungsberechtigt) ? '' : 'disabled' ?>>
 								<?php echo ucfirst($this->p->t('anrechnung', 'empfehlen')); ?>
 							</button>
 						</div>
 					</div>
 				</div>
-            </div>
-
-            <div class="col-4 ">
-                <div class="mb-5 alert text-center">
-                    Status:
-                    <b><span class="text-uppercase" id="reviewAnrechnungDetail-status_kurzbz"
-                             data-status_kurzbz="<?php echo $anrechnungData->status_kurzbz ?>">
-                            <?php echo $anrechnungData->status; ?>
-                        </span></b>
-                </div>
-                
-				<?php $this->load->view('lehre/anrechnung/reviewAnrechnungInfo'); ?>
-				
 			</div>
-        </div>
 
-    </div>
+			<div class="col-4 ">
+				<div class="mb-5 alert text-center">
+					Status:
+					<b><span class="text-uppercase" id="reviewAnrechnungDetail-status_kurzbz"
+							data-status_kurzbz="<?php echo $anrechnungData->status_kurzbz ?>">
+							<?php echo $anrechnungData->status; ?>
+						</span></b>
+				</div>
+
+				<?php $this->load->view('lehre/anrechnung/reviewAnrechnungInfo'); ?>
+
+			</div>
+		</div>
+
+	</div>
 </div>
 
-<?php $this->load->view('templates/FHC-Footer'); ?>
+<?php $this->load->view('templates/FHC-Footer'); ?>
\ No newline at end of file
diff --git a/application/views/lehre/anrechnung/reviewAnrechnungUebersicht.php b/application/views/lehre/anrechnung/reviewAnrechnungUebersicht.php
index 0c2cbc297..0a24040a9 100644
--- a/application/views/lehre/anrechnung/reviewAnrechnungUebersicht.php
+++ b/application/views/lehre/anrechnung/reviewAnrechnungUebersicht.php
@@ -1,84 +1,87 @@
 <?php
 $this->load->view(
-	'templates/FHC-Header',
-	array(
-		'title' => $this->p->t('anrechnung', 'anrechnungenPruefen'),
-		'jquery3' => true,
-		'jqueryui1' => true,
-		'bootstrap5' => true,
-		'fontawesome4' => true,
-		'tabulator5' => true,
+    'templates/FHC-Header',
+    array(
+        'title' => $this->p->t('anrechnung', 'anrechnungenPruefen'),
+        'jquery3' => true,
+        'jqueryui1' => true,
+        'bootstrap5' => true,
+        'fontawesome4' => true,
+        'tabulator5' => true,
         'tabulator5JQuery' => true,
-        'cis'=>true,
-		'ajaxlib' => true,
-		'dialoglib' => true,
-		'tablewidget' => true,
-		'phrases' => array(
-			'global' => array(
-				'begruendung',
-				'zgv'
-			),
-			'anrechnung' => array(
-				'nachweisdokumente',
-				'empfehlung',
-				'herkunft'
-			),
-			'ui' => array(
-				'anzeigen',
-				'alleAnzeigen',
-				'hilfeZuDieserSeite',
-				'hochladen',
-				'spaltenEinstellen',
-				'hilfeZuDieserSeite',
-				'alleAuswaehlen',
-				'alleAbwaehlen',
-				'ausgewaehlteZeilen',
-				'hilfe',
-				'tabelleneinstellungen',
-				'keineDatenVorhanden',
-				'spaltenEinstellen',
-				'ja',
-				'nein',
-				'nichtSelektierbarAufgrundVon',
-				'systemfehler',
-				'bitteMindEinenAntragWaehlen',
-				'bitteBegruendungAngeben',
-				'anrechnungenWurdenEmpfohlen',
-				'anrechnungenWurdenNichtEmpfohlen'
-			),
-			'person' => array(
-				'student',
-				'personenkennzeichen',
-				'vorname',
-				'nachname'
-			),
-			'lehre' => array(
-				'studiensemester',
-				'studiengang',
-				'lehrveranstaltung',
-				'ects',
-				'lektor',
-			),
-			'table' => array(
-				'spaltenEinAusblenden',
-				'spaltenEinAusblendenMitKlickOeffnen',
-				'spaltenEinAusblendenAufEinstellungenKlicken',
-				'spaltenEinAusblendenMitKlickAktivieren',
-				'spaltenEinAusblendenMitKlickSchliessen',
-				'spaltenbreiteVeraendern',
-				'spaltenbreiteVeraendernText',
-				'spaltenbreiteVeraendernInfotext',
-				'zeilenAuswaehlen',
-				'zeilenAuswaehlenEinzeln',
-				'zeilenAuswaehlenBereich',
-				'zeilenAuswaehlenAlle'
-			)
-		),
-		'customJSs' => array(
-			'public/js/bootstrapper.js',
-			'public/js/lehre/anrechnung/reviewAnrechnungUebersicht.js'
-		)
-	)
+        'cis' => true,
+        'ajaxlib' => true,
+        'dialoglib' => true,
+        'tablewidget' => true,
+        'phrases' => array(
+            'global' => array(
+                'begruendung',
+                'zgv'
+            ),
+            'anrechnung' => array(
+                'nachweisdokumente',
+                'empfehlung',
+                'herkunft'
+            ),
+            'ui' => array(
+                'anzeigen',
+                'alleAnzeigen',
+                'hilfeZuDieserSeite',
+                'hochladen',
+                'spaltenEinstellen',
+                'hilfeZuDieserSeite',
+                'alleAuswaehlen',
+                'alleAbwaehlen',
+                'ausgewaehlteZeilen',
+                'hilfe',
+                'tabelleneinstellungen',
+                'keineDatenVorhanden',
+                'spaltenEinstellen',
+                'ja',
+                'nein',
+                'nichtSelektierbarAufgrundVon',
+                'systemfehler',
+                'bitteMindEinenAntragWaehlen',
+                'bitteBegruendungAngeben',
+                'anrechnungenWurdenEmpfohlen',
+                'anrechnungenWurdenNichtEmpfohlen'
+            ),
+            'person' => array(
+                'student',
+                'personenkennzeichen',
+                'vorname',
+                'nachname'
+            ),
+            'lehre' => array(
+                'studiensemester',
+                'studiengang',
+                'lehrveranstaltung',
+                'ects',
+                'lektor',
+            ),
+            'table' => array(
+                'spaltenEinAusblenden',
+                'spaltenEinAusblendenMitKlickOeffnen',
+                'spaltenEinAusblendenAufEinstellungenKlicken',
+                'spaltenEinAusblendenMitKlickAktivieren',
+                'spaltenEinAusblendenMitKlickSchliessen',
+                'spaltenbreiteVeraendern',
+                'spaltenbreiteVeraendernText',
+                'spaltenbreiteVeraendernInfotext',
+                'zeilenAuswaehlen',
+                'zeilenAuswaehlenEinzeln',
+                'zeilenAuswaehlenBereich',
+                'zeilenAuswaehlenAlle'
+            )
+        ),
+        'customCSSs' => array(
+            'public/css/lehre/anrechnung.css'
+        ),
+        'customJSs' => array(
+            'public/js/bootstrapper.js',
+            'public/js/lehre/anrechnung/reviewAnrechnungUebersicht.js'
+        )
+    )
 );
 ?>
 
@@ -88,8 +91,9 @@ $this->load->view(
         <div class="row">
             <div class="col-12 my-4 border-bottom">
                 <h3 class="fw-normal">
-					<?php echo $this->p->t('anrechnung', 'anrechnungenPruefen'); ?>
-                    <small class="text-secondary fs-6">| <?php echo ucfirst($this->p->t('global', 'uebersicht')); ?></small>
+                    <?php echo $this->p->t('anrechnung', 'anrechnungenPruefen'); ?>
+                    <small class="text-secondary fs-6">|
+                        <?php echo ucfirst($this->p->t('global', 'uebersicht')); ?></small>
                 </h3>
             </div>
         </div>
@@ -98,49 +102,50 @@ $this->load->view(
             <div class="col-12">
                 <form id="formApproveAnrechnungUebersicht" class="row align-items-center" action="" method="get">
                     <div class="col-auto">
-						<?php
-						echo $this->widgetlib->widget(
-							'Studiensemester_widget',
-							array(
-								DropdownWidget::SELECTED_ELEMENT => $studiensemester_selected
-							),
-							array(
-								'name' => 'studiensemester',
-								'id' => 'studiensemester',
-                                'class'=>'form-select w-auto ',
-							)
-						);
-						?>
+                        <?php
+                        echo $this->widgetlib->widget(
+                            'Studiensemester_widget',
+                            array(
+                                DropdownWidget::SELECTED_ELEMENT => $studiensemester_selected
+                            ),
+                            array(
+                                'name' => 'studiensemester',
+                                'id' => 'studiensemester',
+                                'class' => 'form-select w-auto ',
+                            )
+                        );
+                        ?>
                     </div>
                     <button type="submit"
-                            class="btn btn-outline-secondary col-auto"><?php echo ucfirst($this->p->t('ui', 'anzeigen')); ?></button>
+                        class="btn btn-outline-secondary col-auto"><?php echo ucfirst($this->p->t('ui', 'anzeigen')); ?></button>
                 </form>
             </div>
         </div>
         <!-- Tabelle -->
         <div class="row">
             <div class="col-12">
-				<?php $this->load->view('lehre/anrechnung/reviewAnrechnungUebersichtData.php');?>
+                <?php $this->load->view('lehre/anrechnung/reviewAnrechnungUebersichtData.php'); ?>
             </div>
         </div>
         <!-- Empfehlung / Nicht Empfehlung Panel -->
         <div class="row">
-            <div class="border border-1 mb-4" style="display: none"
-                 id="reviewAnrechnungUebersicht-begruendung-panel">
+            <div class="border border-1 mb-4" style="display: none" id="reviewAnrechnungUebersicht-begruendung-panel">
                 <div class="mb-4 col-12">
-                    <h4 class="card card-body border-danger text-danger my-3"><?php echo $this->p->t('anrechnung', 'empfehlungenNegativQuestion'); ?></h4>
+                    <h4 class="card card-body border-danger text-danger my-3">
+                        <?php echo $this->p->t('anrechnung', 'empfehlungenNegativQuestion'); ?>
+                    </h4>
                     <div class="mb-4">
-                    <b><span>&ensp;<?php echo $this->p->t('anrechnung', 'bitteBegruendungAngeben'); ?></span>
-                        <span class="text-danger">
-                        <?php echo $this->p->t('anrechnung', 'begruendungWirdFuerAlleUebernommen'); ?>
-                        </span></b>
-                        </div>
-                    
+                        <b><span>&ensp;<?php echo $this->p->t('anrechnung', 'bitteBegruendungAngeben'); ?></span>
+                            <span class="text-danger">
+                                <?php echo $this->p->t('anrechnung', 'begruendungWirdFuerAlleUebernommen'); ?>
+                            </span></b>
+                    </div>
+
                     <ul class="list-group mb-4">
                         <li class="list-group-item">
                             <span><?php echo $this->p->t('anrechnung', 'empfehlungNegativPruefungNichtMoeglich'); ?></span>
-                            <span class="btn-copyIntoTextarea float-end" data-bs-toggle="tooltip" data-bs-placement="right"
-                                  title="<?php echo $this->p->t('ui', 'textUebernehmen'); ?>">
+                            <span class="btn-copyIntoTextarea float-end" data-bs-toggle="tooltip"
+                                data-bs-placement="right" title="<?php echo $this->p->t('ui', 'textUebernehmen'); ?>">
                                 <i class="fa fa-clipboard fa-lg" aria-hidden="true"></i>
                             </span>
                         </li>
@@ -149,39 +154,40 @@ $this->load->view(
                         </li>
                     </ul>
                     <textarea class="form-control" name="begruendung" id="reviewAnrechnungUebersicht-begruendung"
-                              rows="2"
-                              placeholder="<?php echo $this->p->t('anrechnung', 'textUebernehmenOderEigenenBegruendungstext'); ?>"
-                              required></textarea>
+                        rows="2"
+                        placeholder="<?php echo $this->p->t('anrechnung', 'textUebernehmenOderEigenenBegruendungstext'); ?>"
+                        required></textarea>
                 </div>
-                
+
                 <!-- Action Button Abbrechen & Bestaetigen-->
                 <div class=" mb-4 d-flex justify-content-end">
                     <button id="reviewAnrechnungUebersicht-begruendung-abbrechen"
-                            class="me-1 btn btn-outline-secondary btn-w200" type="reset">
-						<?php echo ucfirst($this->p->t('ui', 'abbrechen')); ?>
+                        class="me-1 btn btn-outline-secondary btn-w200" type="reset">
+                        <?php echo ucfirst($this->p->t('ui', 'abbrechen')); ?>
                     </button>
                     <button id="reviewAnrechnungUebersicht-dont-recommend-anrechnungen-confirm"
-                            class="btn btn-primary btn-w200" type="button">
-						<?php echo ucfirst($this->p->t('ui', 'bestaetigen')); ?>
+                        class="btn btn-primary btn-w200" type="button">
+                        <?php echo ucfirst($this->p->t('ui', 'bestaetigen')); ?>
                     </button>
                 </div>
             </div>
-            <div class="border border-1 mb-4" style="display: none"
-                 id="reviewAnrechnungUebersicht-empfehlung-panel">
-                <div class="mb-4" >
-                    <h4 class="card card-body border-success text-success my-3"><?php echo $this->p->t('anrechnung', 'empfehlungenPositivQuestion'); ?></h4>
+            <div class="border border-1 mb-4" style="display: none" id="reviewAnrechnungUebersicht-empfehlung-panel">
+                <div class="mb-4">
+                    <h4 class="card card-body border-success text-success my-3">
+                        <?php echo $this->p->t('anrechnung', 'empfehlungenPositivQuestion'); ?>
+                    </h4>
                     <div class="ps-2 mb-4"><?php echo $this->p->t('anrechnung', 'empfehlungenPositiv'); ?></div>
                 </div>
-                
+
                 <!-- Action Button 'Abbrechen'-->
                 <div class="mb-4 d-flex justify-content-end">
                     <button id="reviewAnrechnungUebersicht-empfehlung-abbrechen"
-                            class="me-1 btn btn-outline-secondary btn-w200" type="reset">
-						<?php echo ucfirst($this->p->t('ui', 'abbrechen')); ?>
+                        class="me-1 btn btn-outline-secondary btn-w200" type="reset">
+                        <?php echo ucfirst($this->p->t('ui', 'abbrechen')); ?>
                     </button>
                     <button id="reviewAnrechnungUebersicht-recommend-anrechnungen-confirm"
-                            class="btn btn-primary btn-w200" type="button">
-						<?php echo ucfirst($this->p->t('ui', 'bestaetigen')); ?>
+                        class="btn btn-primary btn-w200" type="button">
+                        <?php echo ucfirst($this->p->t('ui', 'bestaetigen')); ?>
                     </button>
                 </div>
             </div>
@@ -192,30 +198,30 @@ $this->load->view(
             <div class="col-3">
                 <div class="btn-toolbar" role="toolbar">
                     <div class="btn-group" role="group">
-                        <button id="show-need-recommendation" class="btn btn-outline-secondary btn-clearfilter" type="button"
-                                data-bs-toggle="tooltip" data-bs-placement="left" data-bs-html="true"
-                                title="<?php echo $this->p->t('ui', 'nurFehlendeEmpfehlungenAnzeigen'); ?>"><i
-                                    class='fa fa-eye'></i>
+                        <button id="show-need-recommendation" class="btn btn-outline-secondary btn-clearfilter"
+                            type="button" data-bs-toggle="tooltip" data-bs-placement="left" data-bs-html="true"
+                            title="<?php echo $this->p->t('ui', 'nurFehlendeEmpfehlungenAnzeigen'); ?>"><i
+                                class='fa fa-eye'></i>
                         </button>
                         <button id="show-recommended" class="btn btn-outline-secondary btn-clearfilter" type="button"
-                                data-bs-toggle="tooltip" data-bs-placement="left" data-bs-html="true"
-                                title="<?php echo $this->p->t('ui', 'nurEmpfohleneAnzeigen'); ?>"><i
-                                    class='fa fa-thumbs-o-up'></i>
+                            data-bs-toggle="tooltip" data-bs-placement="left" data-bs-html="true"
+                            title="<?php echo $this->p->t('ui', 'nurEmpfohleneAnzeigen'); ?>"><i
+                                class='fa fa-thumbs-o-up'></i>
                         </button>
-                        <button id="show-not-recommended" class="btn btn-outline-secondary btn-clearfilter" type="button"
-                                data-bs-toggle="tooltip" data-bs-placement="left" data-bs-html="true"
-                                title="<?php echo $this->p->t('ui', 'nurNichtEmpfohleneAnzeigen'); ?>"><i
-                                    class='fa fa-thumbs-o-down'></i>
+                        <button id="show-not-recommended" class="btn btn-outline-secondary btn-clearfilter"
+                            type="button" data-bs-toggle="tooltip" data-bs-placement="left" data-bs-html="true"
+                            title="<?php echo $this->p->t('ui', 'nurNichtEmpfohleneAnzeigen'); ?>"><i
+                                class='fa fa-thumbs-o-down'></i>
                         </button>
                         <button id="show-approved" class="btn btn-outline-secondary btn-clearfilter" type="button"
-                                data-bs-toggle="tooltip" data-bs-placement="left" data-bs-html="true"
-                                title="<?php echo $this->p->t('ui', 'nurGenehmigteAnzeigen'); ?>"><i
-                                    class='fa fa-check'></i>
+                            data-bs-toggle="tooltip" data-bs-placement="left" data-bs-html="true"
+                            title="<?php echo $this->p->t('ui', 'nurGenehmigteAnzeigen'); ?>"><i
+                                class='fa fa-check'></i>
                         </button>
                         <button id="show-rejected" class="btn btn-outline-secondary btn-clearfilter" type="button"
-                                data-bs-toggle="tooltip" data-bs-placement="left" data-bs-html="true"
-                                title="<?php echo $this->p->t('ui', 'nurAbgelehnteAnzeigen'); ?>"><i
-                                    class='fa fa-times'></i>
+                            data-bs-toggle="tooltip" data-bs-placement="left" data-bs-html="true"
+                            title="<?php echo $this->p->t('ui', 'nurAbgelehnteAnzeigen'); ?>"><i
+                                class='fa fa-times'></i>
                         </button>
                     </div>
                 </div>
@@ -225,10 +231,10 @@ $this->load->view(
             <div class="col-9">
                 <div class="d-flex justify-content-end">
                     <button id="reviewAnrechnungUebersicht-dont-recommend-anrechnungen-ask"
-                            class="me-1 btn btn-danger btn-w200" type="button">
+                        class="me-1 btn btn-danger btn-w200" type="button">
                         <?php echo ucfirst($this->p->t('anrechnung', 'nichtEmpfehlen')); ?></button>
-                    <button id="reviewAnrechnungUebersicht-recommend-anrechnungen-ask"
-                            class="btn btn-primary btn-w200" type="button">
+                    <button id="reviewAnrechnungUebersicht-recommend-anrechnungen-ask" class="btn btn-primary btn-w200"
+                        type="button">
                         <?php echo ucfirst($this->p->t('anrechnung', 'empfehlen')); ?></button>
                 </div>
             </div>
@@ -236,5 +242,4 @@ $this->load->view(
     </div>
 </div>
 
-<?php $this->load->view('templates/FHC-Footer'); ?>
-
+<?php $this->load->view('templates/FHC-Footer'); ?>
\ No newline at end of file
diff --git a/application/views/lehre/lvplanung/adminZeitverfuegbarkeit.php b/application/views/lehre/lvplanung/adminZeitverfuegbarkeit.php
index 753fdbc78..ee5205144 100644
--- a/application/views/lehre/lvplanung/adminZeitverfuegbarkeit.php
+++ b/application/views/lehre/lvplanung/adminZeitverfuegbarkeit.php
@@ -11,7 +11,7 @@ $this->load->view(
         'ajaxlib' => true,
         'tabulator5' => true,
         'tabulator5JQuery' => true,
-        'cis'=>true,
+        'cis' => true,
         'tablewidget' => true,
         'navigationwidget' => true,
         'sbadmintemplate3' => true,
@@ -35,6 +35,9 @@ $this->load->view(
         ),
         'widgets' => true,
         'dialoglib' => true,
+        'customCSSs' => array(
+            'public/css/lehre/anrechnung.css'
+        ),
         'customJSs' => array(
             'public/js/bootstrapper.js',
             'public/js/lehre/lvplanung/zverfueg.js'
@@ -44,127 +47,130 @@ $this->load->view(
 ?>
 
 <body>
-<?php echo $this->widgetlib->widget('NavigationWidget'); ?>
-<div id="page-wrapper">
-    <div class="container-fluid">
+    <?php echo $this->widgetlib->widget('NavigationWidget'); ?>
+    <div id="page-wrapper">
+        <div class="container-fluid">
 
-        <!-- title -->
-        <div class="row">
-            <div class="col-lg-12 page-header">
-		<h3>Zeitverf&uuml;gbarkeiten verwalten<small>
-			  |  Punktuelle Zeitverfügbarkeiten von Lehrenden für die LV-Planung verwalten</small>
-		</h3>
+            <!-- title -->
+            <div class="row">
+                <div class="col-lg-12 page-header">
+                    <h3>Zeitverf&uuml;gbarkeiten verwalten<small>
+                            | Punktuelle Zeitverfügbarkeiten von Lehrenden für die LV-Planung verwalten</small>
+                    </h3>
+                </div>
             </div>
-        </div>
 
-        <!-- form -->
-        <div class="row">
-            <div class="col-lg-12">
-                <form id="form-zeitverfuegbarkeit" class="form-horizontal">
-                    <input type="hidden" id="studsemStart" value="<?php echo $studsemStart ?>">
-                    <input type="hidden" id="zeitsperre_id" name="zeitsperre_id" value="">
+            <!-- form -->
+            <div class="row">
+                <div class="col-lg-12">
+                    <form id="form-zeitverfuegbarkeit" class="form-horizontal">
+                        <input type="hidden" id="studsemStart" value="<?php echo $studsemStart ?>">
+                        <input type="hidden" id="zeitsperre_id" name="zeitsperre_id" value="">
 
-                    <div class="form-group">
-                        <label for="mitarbeiter_uid" class="col-sm-1 control-label">LektorIn: </label>
-                        <div class="col-sm-3">
-                            <select id="mitarbeiter_uid" name="mitarbeiter_uid" class="form-control select-w500" required>
-                                <option value="" >
-                                    <?php echo $this->p->t('ui', 'bitteWaehlen'); ?>
-                                </option>
-                                <?php foreach ($lektor_arr as $lektor) : ?>
-                                    <option value="<?php echo $lektor->mitarbeiter_uid ?>">
-                                        <?php echo $lektor->nachname. ' '. $lektor->vorname ?>
+                        <div class="form-group">
+                            <label for="mitarbeiter_uid" class="col-sm-1 control-label">LektorIn: </label>
+                            <div class="col-sm-3">
+                                <select id="mitarbeiter_uid" name="mitarbeiter_uid" class="form-control " required>
+                                    <option value="">
+                                        <?php echo $this->p->t('ui', 'bitteWaehlen'); ?>
                                     </option>
-                                <?php endforeach; ?>
-                            </select>
+                                    <?php foreach ($lektor_arr as $lektor): ?>
+                                        <option value="<?php echo $lektor->mitarbeiter_uid ?>">
+                                            <?php echo $lektor->nachname . ' ' . $lektor->vorname ?>
+                                        </option>
+                                    <?php endforeach; ?>
+                                </select>
+                            </div>
                         </div>
-                    </div>
 
-                    <div class="form-group">
-                        <label for="zverfueg" class="col-sm-1 control-label">Grund: </label>
-                        <div class="col-sm-3">
-                            <input type="text" id="zeitsperretyp_kurzbz" value="Zeitverf&uuml;gbarkeit" name="zeitsperretyp_kurzbz" readonly />
+                        <div class="form-group">
+                            <label for="zverfueg" class="col-sm-1 control-label">Grund: </label>
+                            <div class="col-sm-3">
+                                <input type="text" id="zeitsperretyp_kurzbz" value="Zeitverf&uuml;gbarkeit"
+                                    name="zeitsperretyp_kurzbz" readonly />
+                            </div>
                         </div>
-                    </div>
 
-                    <div class="form-group">
-                        <label for="bezeichnung" class="col-sm-1 control-label">Notiz: </label>
-                        <div class="col-sm-3">
-                            <textarea type="" id="bezeichnung" name="bezeichnung" value="" required></textarea>
+                        <div class="form-group">
+                            <label for="bezeichnung" class="col-sm-1 control-label">Notiz: </label>
+                            <div class="col-sm-3">
+                                <textarea type="" id="bezeichnung" name="bezeichnung" value="" required></textarea>
+                            </div>
                         </div>
-                    </div>
 
-                    <div class="form-group">
-                        <label for="vondatum" class="col-sm-1 control-label">Von: </label>
-                        <div class="col-sm-3">
-                            <input type="date" id="vondatum" name="vondatum" class="form-control zverfueg-datepicker" required>
+                        <div class="form-group">
+                            <label for="vondatum" class="col-sm-1 control-label">Von: </label>
+                            <div class="col-sm-3">
+                                <input type="date" id="vondatum" name="vondatum"
+                                    class="form-control zverfueg-datepicker" required>
+                            </div>
+                            <label for="vonstunde" class="col-sm-1 control-label">Stunde (inkl.): </label>
+                            <div class="col-sm-3">
+                                <select id="vonstunde" name="vonstunde" class="form-control ">
+                                    <option value="">*</option>
+                                    <?php foreach ($stunde_arr as $stunde): ?>
+                                        <option value="<?php echo $stunde->stunde ?>">
+                                            <?php echo $stunde->stunde .
+                                                ' [' .
+                                                (new DateTime($stunde->beginn))->format('H:i') . ' - ' .
+                                                (new DateTime($stunde->ende))->format('H:i') .
+                                                ']' ?>
+                                        </option>
+                                    <?php endforeach; ?>
+                                </select>
+                            </div>
                         </div>
-                        <label for="vonstunde" class="col-sm-1 control-label">Stunde (inkl.): </label>
-                        <div class="col-sm-3">
-                            <select id="vonstunde" name="vonstunde" class="form-control select-w500">
-                                <option value="" >*</option>
-                                <?php foreach ($stunde_arr as $stunde) : ?>
-                                    <option value="<?php echo $stunde->stunde ?>">
-                                        <?php echo $stunde->stunde.
-                                            ' ['.
-                                            (new DateTime($stunde->beginn))->format('H:i'). ' - '.
-                                            (new DateTime($stunde->ende))->format('H:i').
-                                            ']' ?>
-                                    </option>
-                                <?php endforeach; ?>
-                            </select>
-                        </div>
-                    </div>
 
-                    <div class="form-group">
-                        <label for="bisdatum" class="col-sm-1 control-label">Bis: </label>
-                        <div class="col-sm-3">
-                            <input type="date" id="bisdatum" name="bisdatum" class="form-control zverfueg-datepicker" required>
+                        <div class="form-group">
+                            <label for="bisdatum" class="col-sm-1 control-label">Bis: </label>
+                            <div class="col-sm-3">
+                                <input type="date" id="bisdatum" name="bisdatum"
+                                    class="form-control zverfueg-datepicker" required>
+                            </div>
+                            <label for="bisstunde" class="col-sm-1 control-label">Stunde (inkl.): </label>
+                            <div class="col-sm-3">
+                                <select id="bisstunde" name="bisstunde" class="form-control ">
+                                    <option value="">*</option>
+                                    <?php foreach ($stunde_arr as $stunde): ?>
+                                        <option value="<?php echo $stunde->stunde ?>">
+                                            <?php echo $stunde->stunde .
+                                                ' [' .
+                                                (new DateTime($stunde->beginn))->format('H:i') . ' - ' .
+                                                (new DateTime($stunde->ende))->format('H:i') .
+                                                ']' ?>
+                                        </option>
+                                    <?php endforeach; ?>
+                                </select>
+                            </div>
                         </div>
-                        <label for="bisstunde" class="col-sm-1 control-label">Stunde (inkl.): </label>
-                        <div class="col-sm-3">
-                            <select id="bisstunde" name="bisstunde" class="form-control select-w500">
-                                <option value="" >*</option>
-                                <?php foreach ($stunde_arr as $stunde) : ?>
-                                    <option value="<?php echo $stunde->stunde ?>">
-                                        <?php echo $stunde->stunde.
-                                            ' ['.
-                                            (new DateTime($stunde->beginn))->format('H:i'). ' - '.
-                                            (new DateTime($stunde->ende))->format('H:i').
-                                            ']' ?>
-                                    </option>
-                                <?php endforeach; ?>
-                            </select>
-                        </div>
-                    </div>
 
-                    <div class="col-sm-8">
-                        <button type="submit" id="btn-save" class="btn btn-primary btn-w200 pull-right">
-                            <?php echo ucfirst($this->p->t('ui', 'speichern')); ?>
-                        </button>
-                        <button type="button" id="btn-delete" class="btn btn-danger btn-w200 btn-mr5 pull-right" disabled
-                                data-toggle="tooltip" data-placement="right"
+                        <div class="col-sm-8">
+                            <button type="submit" id="btn-save" class="btn btn-primary btn-w200 pull-right">
+                                <?php echo ucfirst($this->p->t('ui', 'speichern')); ?>
+                            </button>
+                            <button type="button" id="btn-delete" class="btn btn-danger btn-w200 btn-mr5 pull-right"
+                                disabled data-toggle="tooltip" data-placement="right"
                                 title="Zum Löschen LektorIn aus Tabelle wählen">
-                            <?php echo ucfirst($this->p->t('ui', 'loeschen')); ?>
-                        </button>
-                        <button type="reset" id="btn-break" class="btn btn-default btn-w200 btn-mr5 pull-right">
-                            <?php echo ucfirst($this->p->t('ui', 'abbrechen')); ?>
-                        </button>
-                    </div>
-                </form>
+                                <?php echo ucfirst($this->p->t('ui', 'loeschen')); ?>
+                            </button>
+                            <button type="reset" id="btn-break" class="btn btn-default btn-w200 btn-mr5 pull-right">
+                                <?php echo ucfirst($this->p->t('ui', 'abbrechen')); ?>
+                            </button>
+                        </div>
+                    </form>
+                </div>
             </div>
-        </div>
 
-        <!-- data table -->
-        <div class="row">
-            <div class="col-lg-12">
-                <?php $this->load->view('lehre/lvplanung/adminZeitverfuegbarkeitData.php'); ?>
+            <!-- data table -->
+            <div class="row">
+                <div class="col-lg-12">
+                    <?php $this->load->view('lehre/lvplanung/adminZeitverfuegbarkeitData.php'); ?>
+                </div>
             </div>
-        </div>
 
-    </div><!-- end container -->
-</div><!-- end page-wrapper -->
-<br>
+        </div><!-- end container -->
+    </div><!-- end page-wrapper -->
+    <br>
 </body>
 
-<?php $this->load->view('templates/FHC-Footer'); ?>
+<?php $this->load->view('templates/FHC-Footer'); ?>
\ No newline at end of file
diff --git a/application/views/lehre/lvplanung/adminZeitverfuegbarkeitData.php b/application/views/lehre/lvplanung/adminZeitverfuegbarkeitData.php
index 558593441..df4888b7d 100644
--- a/application/views/lehre/lvplanung/adminZeitverfuegbarkeitData.php
+++ b/application/views/lehre/lvplanung/adminZeitverfuegbarkeitData.php
@@ -15,7 +15,7 @@ $qry = '
         JOIN lehre.tbl_lehrveranstaltung lv USING (lehrveranstaltung_id)
         JOIN public.tbl_studiensemester ss USING (studiensemester_kurzbz)
         JOIN campus.tbl_zeitsperre zsp ON zsp.mitarbeiter_uid = lema.mitarbeiter_uid
-        WHERE lv.studiengang_kz IN ('. implode (',', $STUDIENGANG_KZ_ARR). ')
+        WHERE lv.studiengang_kz IN (' . implode(',', $STUDIENGANG_KZ_ARR) . ')
         AND b.aktiv
 		AND zsp.vondatum >= ss.start
         AND zeitsperretyp_kurzbz = \'ZVerfueg\'
@@ -65,4 +65,4 @@ $filterWidgetArray = array(
 
 echo $this->widgetlib->widget('TableWidget', $filterWidgetArray);
 
-?>
+?>
\ No newline at end of file
diff --git a/public/css/lehre/anrechnung.css b/public/css/lehre/anrechnung.css
index 925c1a357..b19099f7e 100644
--- a/public/css/lehre/anrechnung.css
+++ b/public/css/lehre/anrechnung.css
@@ -1,3 +1,12 @@
+.btn-w200
+{
+    width: 200px;
+}
+
+.btn-mr5
+{
+    margin-right: 10px;
+}
 
 .select-w500 {
     width: 500px;

From 11c96221866a2a56d097058df260fe07a181597f Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 23 Apr 2024 12:50:29 +0200
Subject: [PATCH 0622/1461] replaces the anrechnungen.css with styles in the
 zeitverfuegbarkeit view

---
 .../lehre/lvplanung/adminZeitverfuegbarkeit.php     | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/application/views/lehre/lvplanung/adminZeitverfuegbarkeit.php b/application/views/lehre/lvplanung/adminZeitverfuegbarkeit.php
index ee5205144..be61f756d 100644
--- a/application/views/lehre/lvplanung/adminZeitverfuegbarkeit.php
+++ b/application/views/lehre/lvplanung/adminZeitverfuegbarkeit.php
@@ -35,9 +35,7 @@ $this->load->view(
         ),
         'widgets' => true,
         'dialoglib' => true,
-        'customCSSs' => array(
-            'public/css/lehre/anrechnung.css'
-        ),
+
         'customJSs' => array(
             'public/js/bootstrapper.js',
             'public/js/lehre/lvplanung/zverfueg.js'
@@ -145,15 +143,16 @@ $this->load->view(
                         </div>
 
                         <div class="col-sm-8">
-                            <button type="submit" id="btn-save" class="btn btn-primary btn-w200 pull-right">
+                            <button type="submit" id="btn-save" style="width:200px;" class="btn btn-primary pull-right">
                                 <?php echo ucfirst($this->p->t('ui', 'speichern')); ?>
                             </button>
-                            <button type="button" id="btn-delete" class="btn btn-danger btn-w200 btn-mr5 pull-right"
-                                disabled data-toggle="tooltip" data-placement="right"
+                            <button type="button" id="btn-delete" style="width:200px; margin-right:10px"
+                                class="btn btn-danger  pull-right" disabled data-toggle="tooltip" data-placement="right"
                                 title="Zum Löschen LektorIn aus Tabelle wählen">
                                 <?php echo ucfirst($this->p->t('ui', 'loeschen')); ?>
                             </button>
-                            <button type="reset" id="btn-break" class="btn btn-default btn-w200 btn-mr5 pull-right">
+                            <button type="reset" id="btn-break" style="width:200px; margin-right:10px"
+                                class="btn btn-default pull-right">
                                 <?php echo ucfirst($this->p->t('ui', 'abbrechen')); ?>
                             </button>
                         </div>

From 9ae36b54e1368ac00d082eca4619717ea2e94e38 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 23 Apr 2024 12:55:44 +0200
Subject: [PATCH 0623/1461] remove the 50% height from the table and add
 fitColumns to the table so that the columns take the whole available space

---
 .../views/lehre/anrechnung/adminAnrechnungData.php        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/views/lehre/anrechnung/adminAnrechnungData.php b/application/views/lehre/anrechnung/adminAnrechnungData.php
index e89e88aaf..a813f9a5c 100644
--- a/application/views/lehre/anrechnung/adminAnrechnungData.php
+++ b/application/views/lehre/anrechnung/adminAnrechnungData.php
@@ -8,12 +8,12 @@ $query = '
 
 $filterWidgetArray = array(
 	'query' => $query,
-	'bootstrapVersion'=>5,
+	'bootstrapVersion' => 5,
 	'tableUniqueId' => 'adminAnrechnung',
 	'requiredPermissions' => 'lehre/anrechnungszeitfenster',
 	'datasetRepresentation' => 'tabulator',
 	'columnsAliases' => array(
-        'AzrID',
+		'AzrID',
 		ucfirst($this->p->t('lehre', 'studiensemester')),
 		ucfirst($this->p->t('anrechnung', 'anrechnungszeitraumStart')),
 		ucfirst($this->p->t('anrechnung', 'anrechnungszeitraumEnde')),
@@ -21,8 +21,8 @@ $filterWidgetArray = array(
 		ucfirst($this->p->t('ui', 'bearbeitetVon')),
 	),
 	'datasetRepOptions' => '{
-		height: func_height(this),
-		layout: "fitDataFill",           
+		
+		layout: "fitColumns",           
 		persistentLayout:true,
 		autoResize: false, 				// prevent auto resizing of table (false to allow adapting table size when cols are (de-)activated
         index: "anrechnungszeitraum_id",         // assign specific column as unique id (important for row indexing)

From 8d68faf92272334830a091d68ee9d6565405047c Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 23 Apr 2024 13:06:02 +0200
Subject: [PATCH 0624/1461] replaces the pull-right class with a conditional if
 bootstrapVersion was set to 5

---
 .../lehre/anrechnung/adminAnrechnung.php      |   92 +-
 .../lehre/anrechnung/adminAnrechnungData.php  |    1 -
 public/js/TableWidget.js                      | 1688 +++++++++--------
 3 files changed, 899 insertions(+), 882 deletions(-)

diff --git a/application/views/lehre/anrechnung/adminAnrechnung.php b/application/views/lehre/anrechnung/adminAnrechnung.php
index 75cd94b42..5c911d388 100644
--- a/application/views/lehre/anrechnung/adminAnrechnung.php
+++ b/application/views/lehre/anrechnung/adminAnrechnung.php
@@ -9,7 +9,7 @@ $includesArray = array(
     'dialoglib' => true,
     'tabulator5' => true,
     'tabulator5JQuery' => true,
-    'cis'=>true,
+    'cis' => true,
     'tablewidget' => true,
     'sbadmintemplate3' => true,
     'navigationwidget' => true,
@@ -72,12 +72,12 @@ $this->load->view('templates/FHC-Header', $includesArray);
 
             <!--Untertitel-->
             <h4 class="my-4"><?php echo $this->p->t('anrechnung', 'anrechnungszeitraumFestlegen'); ?></h4>
-            
-            
-            <button class="btn btn-primary azrOpenModal" data-bs-toggle="modal" data-bs-target="#azrModal"  >
+
+
+            <button class="btn btn-primary azrOpenModal" data-bs-toggle="modal" data-bs-target="#azrModal">
                 <i class="fa fa-plus"></i> <?php echo $this->p->t('anrechnung', 'anrechnungszeitraumHinzufuegen'); ?>
             </button>
-              
+
 
             <!-- Tabelle -->
             <div class="row">
@@ -87,53 +87,55 @@ $this->load->view('templates/FHC-Header', $includesArray);
             </div>
 
             <!-- Modal (für insert und update von Anrechnungszeitraum)-->
-            <div class="modal fade" id="azrModal" tabindex="-1" role="dialog" aria-labelledby="azrModalLabel" aria-hidden="true">
-            <div class="modal-dialog" role="document">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <h5 class="modal-title" id="azrModalLabel"></h5>
-                        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close" ></button>
-                    </div>
-                    <div class="modal-body my-4">
-                        <div class="row">
-                            <input type="hidden" id="anrechnungszeitraum_id" value="">
-                            <input type="hidden" id="defaultStudiensemester_kurzbz" value="<?php echo $studiensemester_kurzbz ?>">
-                            <div class="col-4">
-                                <label for="studiensemester" class="fw-bold small">Studiensemester</label>
-                                <?php
-                                echo $this->widgetlib->widget(
-                                    'Studiensemester_widget',
-                                    array(
-                                        DropdownWidget::SELECTED_ELEMENT => $studiensemester_kurzbz
-                                    ),
-                                    array(
-                                        'name' => 'studiensemester',
-                                        'id' => 'studiensemester',
-                                        'class'=>'form-select w-auto ',
-                                    )
-                                );
-                                ?>
-                            </div>
-                            <div class="col-4">
-                                <label for="azrStart" class="fw-bold small">Anr.-Zeitraum Start</label>
-                                <input type="date" id="azrStart" value="" class="form-control" required>
-                            </div>
-                            <div class="col-4">
-                                <label for="azrEnde" class="fw-bold small">Anr.-Zeitraum Ende</label>
-                                <input type="date" id="azrEnde" value="" class="form-control" required>
+            <div class="modal fade" id="azrModal" tabindex="-1" role="dialog" aria-labelledby="azrModalLabel"
+                aria-hidden="true">
+                <div class="modal-dialog" role="document">
+                    <div class="modal-content">
+                        <div class="modal-header">
+                            <h5 class="modal-title" id="azrModalLabel"></h5>
+                            <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                        </div>
+                        <div class="modal-body my-4">
+                            <div class="row">
+                                <input type="hidden" id="anrechnungszeitraum_id" value="">
+                                <input type="hidden" id="defaultStudiensemester_kurzbz"
+                                    value="<?php echo $studiensemester_kurzbz ?>">
+                                <div class="col-4">
+                                    <label for="studiensemester" class="fw-bold small">Studiensemester</label>
+                                    <?php
+                                    echo $this->widgetlib->widget(
+                                        'Studiensemester_widget',
+                                        array(
+                                            DropdownWidget::SELECTED_ELEMENT => $studiensemester_kurzbz
+                                        ),
+                                        array(
+                                            'name' => 'studiensemester',
+                                            'id' => 'studiensemester',
+                                            'class' => 'form-select w-auto ',
+                                        )
+                                    );
+                                    ?>
+                                </div>
+                                <div class="col-4">
+                                    <label for="azrStart" class="fw-bold small">Anr.-Zeitraum Start</label>
+                                    <input type="date" id="azrStart" value="" class="form-control" required>
+                                </div>
+                                <div class="col-4">
+                                    <label for="azrEnde" class="fw-bold small">Anr.-Zeitraum Ende</label>
+                                    <input type="date" id="azrEnde" value="" class="form-control" required>
+                                </div>
                             </div>
                         </div>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" id="azrInsertBtn" class="btn btn-primary" value=""><?php echo $this->p->t('ui', 'speichern'); ?></button>
+                        <div class="modal-footer">
+                            <button type="button" id="azrInsertBtn" class="btn btn-primary"
+                                value=""><?php echo $this->p->t('ui', 'speichern'); ?></button>
+                        </div>
                     </div>
                 </div>
             </div>
-        </div>
 
         </div>
     </div>
 </div>
 
-<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
-
+<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
\ No newline at end of file
diff --git a/application/views/lehre/anrechnung/adminAnrechnungData.php b/application/views/lehre/anrechnung/adminAnrechnungData.php
index a813f9a5c..17e44af71 100644
--- a/application/views/lehre/anrechnung/adminAnrechnungData.php
+++ b/application/views/lehre/anrechnung/adminAnrechnungData.php
@@ -8,7 +8,6 @@ $query = '
 
 $filterWidgetArray = array(
 	'query' => $query,
-	'bootstrapVersion' => 5,
 	'tableUniqueId' => 'adminAnrechnung',
 	'requiredPermissions' => 'lehre/anrechnungszeitfenster',
 	'datasetRepresentation' => 'tabulator',
diff --git a/public/js/TableWidget.js b/public/js/TableWidget.js
index 69b7d79cf..3fdc34799 100644
--- a/public/js/TableWidget.js
+++ b/public/js/TableWidget.js
@@ -14,761 +14,754 @@ const DATASET_REP_TABULATOR = "tabulator";
  * FHC_TableWidget this object is used to render the GUI of a table widget and to operate with it
  */
 var FHC_TableWidget = {
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Properties
-
-	_datasetRepresentation: null, // contains the current data representation
-
-	_bootstrapVersion:3,
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * To display the TableWidget using the loaded data prenset in the session
-	 */
-	display: function() {
-
-		FHC_TableWidget._getTables(FHC_TableWidget._renderTableWidget);
-	},
-
-	/**
-	 * Alias call to method display only to inprove the readability of the code
-	 */
-	refresh: function() {
-
-		FHC_TableWidget.display();
-	},
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Private methods
-
-	/**
-	 * To retrive the page where the TableWidget is used, using the FHC_JS_DATA_STORAGE_OBJECT
-	 */
-	_getTableUniqueIdPrefix: function() {
-
-		return FHC_JS_DATA_STORAGE_OBJECT.called_path + "/" + FHC_JS_DATA_STORAGE_OBJECT.called_method;
-	},
-
-	/**
-	 * Utility method that checks if data contains an error and print that to the console
-	 * otherwise the TableWidget GUI is refreshed
-	 */
-	_failOrRefresh: function(data, textStatus, jqXHR) {
-
-		if (FHC_AjaxClient.isError(data))
-		{
-			console.log(FHC_AjaxClient.getError(data));
-		}
-		else
-		{
-			FHC_TableWidget.refresh();
-		}
-	},
-
-	/**
-	 * Utility method that checks if data contains an error and print that to the console
-	 * otherwise the page is reloaded
-	 */
-	_failOrReload: function(data, textStatus, jqXHR) {
-
-		if (FHC_AjaxClient.isError(data))
-		{
-			console.log(FHC_AjaxClient.getError(data));
-		}
-		else
-		{
-			location.reload();
-		}
-	},
-
-	/**
-	 * To reset the Table Widget GUI
-	 */
-	_resetGUI: function(tableWidgetDiv) {
-
-		// If the choosen dataset representation is tablesorter
-		if (FHC_TableWidget._datasetRepresentation == DATASET_REP_TABLESORTER)
-		{
-			tableWidgetDiv.find("#tableWidgetTableDataset > thead > tr").html("");
-			tableWidgetDiv.find("#tableWidgetTableDataset > tbody").html("");
-		}
-
-		// If the choosen dataset representation is pivotUI
-		if (FHC_TableWidget._datasetRepresentation == DATASET_REP_PIVOTUI)
-		{
-			tableWidgetDiv.find("#tableWidgetPivotUI").html("");
-		}
-
-		// If the choosen dataset representation is tabulator
-		if (FHC_TableWidget._datasetRepresentation == DATASET_REP_TABULATOR)
-		{
-			tableWidgetDiv.find("#tableWidgetTabulator").html("");
-		}
-	},
-
-	/**
-	 * To get via Ajax all the data related to the TableWidget present in the given page
-	 * If the parameter renderFunction is a valid function, is called on success
-	 */
-	_getTables: function(renderFunction) {
-
-		var tableWidgetUniqueIdArray = FHC_TableWidget._getTableWidgetUniqueIdArray();
-
-		for (var tableWidgetsCounter = 0; tableWidgetsCounter < tableWidgetUniqueIdArray.length; tableWidgetsCounter++)
-		{
-			FHC_AjaxClient.ajaxCallGet(
-				"widgets/Tables/getTable",
-				{
-					tableUniqueId: FHC_TableWidget._getTableUniqueIdPrefix() + "/" + tableWidgetUniqueIdArray[tableWidgetsCounter]
-				},
-				{
-					successCallback: function(data, textStatus, jqXHR) {
-
-						if (FHC_AjaxClient.hasData(data))
-						{
-							if (typeof renderFunction == "function")
-							{
-								renderFunction(FHC_AjaxClient.getData(data));
-							}
-						}
-						else
-						{
-							console.log(FHC_AjaxClient.getError(data));
-						}
-					}
-				}
-			);
-		}
-	},
-
-	/**
-	 * This method calls all the other methods needed to rendere the GUI for a TableWidget
-	 * The parameter data contains all the data about the TableWidget and it is given as parameter
-	 * to all the methods that here are called
-	 * NOTE: think very carefully before changing the order of the calls
-	 */
-	_renderTableWidget: function(data) {
-
-		FHC_TableWidget._setDatasetRepresentation(data); // set what type of dataset representation was choosen
-
-		FHC_TableWidget._setBootstrapVersion(data); // set the bootstrap version used for the tableWidget
-
-		var tableWidgetDiv = $('div[tableUniqueId="' + data.tableUniqueId + '"]');
-
-		FHC_TableWidget._turnOffEvents(tableWidgetDiv); // turns all the events off
-
-		FHC_TableWidget._resetGUI(tableWidgetDiv); // Reset the entire GUI
-
-		FHC_TableWidget._renderDataset(tableWidgetDiv, data);
-
-		FHC_TableWidget._turnOnEvents(tableWidgetDiv); // turns all the events off
-
-		FHC_TableWidget._onTableBuilt(tableWidgetDiv, data);
-		
-	},
-
-
-	_onTableBuilt: function(tableWidgetDiv, data) {
-		var options = FHC_TableWidget._getRepresentationOptions(data);
-
-		tableWidgetDiv.find("#tableWidgetTabulator").tabulator("on","tableBuilt",()=>{
-
-			if (typeof options.tableWidgetHeader == 'undefined' ||
-			(typeof options.tableWidgetHeader != 'undefined' && options.tableWidgetHeader != false))
-			{
-				// renders the table headers
-				var tabulatorHeaderCollapseHTML = _renderTabulatorHeaderCollapseHTML(tableWidgetDiv);
-				tableWidgetDiv.find('#tableWidgetHeader').after(tabulatorHeaderCollapseHTML);	
-			}
-			
-			
-			// makes the table headers toggle visibility when clicking on them
-			tableWidgetDiv.find('.btn-select-col').on('click', function()
-			{
-				var selected = this.value;
-				
-				tableWidgetDiv.find("#tableWidgetTabulator").tabulator('toggleColumn', selected);
-
-				// toggle class to color button as selected / deselected
-				$(this).toggleClass('btn-select-col-selected').blur();	// blur removes automatic focus
-			})
-
-				
-			
-		
-			
-
-		})
-	},
-
-	/**
-	 * Turns all the events off
-	 * NOTE: must be aligned to _turnOnEvents
-	 */
-	_turnOffEvents: function(tableWidgetDiv) {
-
-		// If the choosen dataset representation is tablesorter
-		if (FHC_TableWidget._datasetRepresentation == DATASET_REP_TABLESORTER)
-		{
-			FHC_TableWidget._disableTablesorter(tableWidgetDiv); // disable the tablesorter
-		}
-	},
-
-	/**
-	 * Turns all the events on
-	 * NOTE: must be aligned to _turnOffEvents
-	 */
-	_turnOnEvents: function(tableWidgetDiv) {
-
-		var tableUniqueId = tableWidgetDiv.attr('tableUniqueId');
-
-		// If the choosen dataset representation is tablesorter
-		if (FHC_TableWidget._datasetRepresentation == DATASET_REP_TABLESORTER)
-		{
-			FHC_TableWidget._enableTableSorter(tableWidgetDiv); // enable the tablesorter
-		}
-
-		// If the choosen dataset representation is tabulator
-		if (FHC_TableWidget._datasetRepresentation == DATASET_REP_TABULATOR)
-		{
-			// ---------------------------------------------------------------------------------------------------------
-			// Add events to the elements
-			// ---------------------------------------------------------------------------------------------------------
-
-			// Click-Event to download csv
-			tableWidgetDiv.find('#download-csv').on('click', function()
-			{
-				// BOM for correct UTF-8 char output
-				tableWidgetDiv.find("#tableWidgetTabulator").tabulator("download", "csv", "data.csv", {bom:true});
-			})
-
-			// Click-Event to toggle the collapsable help panel
-			tableWidgetDiv.find('#help').on('click', function()
-			{
-				// Hide the collapsable settings panel, if it actually shown
-				$('#tabulatorSettings-' + tableUniqueId).collapse('hide');
-
-				// Toggle the collapsable help panel
-				$('#tabulatorHelp-' + tableUniqueId).collapse('toggle');
-			})
-
-			// Click-Event to toggle the collapsable settings panel
-			tableWidgetDiv.find('#settings').on('click', function()
-			{
-				// Hide the collapsable help panel, if it actually shown
-				$('#tabulatorHelp-' + tableUniqueId).collapse('hide');
-
-				// Toggle the collapsable settings panel
-				$('#tabulatorSettings-' + tableUniqueId).collapse('toggle');
-			})
-
-			/* Beautify button group behaviour
-			 * Let buttons stay active even until they are clicked again to close the collapsable help- oder setting panels
-			 * Also remove the disturbing button focus behaviour
-			 */
-			$(".btn-group > .btn").click(function(){
-				if ($(this).hasClass("active"))
-				{
-					$(this).removeClass('active').css('outline', 'none');
-				}
-				else
-				{
-					$(this).addClass("active").css('outline', 'none').siblings().removeClass("active");
-				}
-			});
-
-			/**
-			 * Click-Event to select all rows
-			 * Default is ALL rows. This can be modified via hook tableWidgetHook_selectAllButton.
- 			 */
-			if (typeof tableWidgetHook_selectAllButton == 'function')
-			{
-				tableWidgetDiv.find('#select-all').on('click', function() {
-					tableWidgetHook_selectAllButton(tableWidgetDiv);
-				});
-			}
-			else
-			{
-				tableWidgetDiv.find('#select-all').on('click', function() {
-					tableWidgetDiv.find("#tableWidgetTabulator").tabulator('selectRow', true);
-				});
-			}
-
-			// Click-Event to deselect all rows
-			tableWidgetDiv.find('#deselect-all').on('click', function()
-			{
-				tableWidgetDiv.find("#tableWidgetTabulator").tabulator('deselectRow');
-			})
-
-			// Click-Event to toggle column-picker columns
-			//! this event was moved to the _onTableBuilt function
-			
-		}
-	},
-
-	_renderDataset: function(tableWidgetDiv, data) {
-
-		// If the choosen dataset representation is tablesorter then...
-		if (FHC_TableWidget._datasetRepresentation == DATASET_REP_TABLESORTER)
-		{
-			FHC_TableWidget._renderDatasetTablesorter(tableWidgetDiv, data); // ...render the tablesorter GUI
-		}
-
-		// If the choosen dataset representation is pivotUI then...
-		if (FHC_TableWidget._datasetRepresentation == DATASET_REP_PIVOTUI)
-		{
-			FHC_TableWidget._renderDatasetPivotUI(tableWidgetDiv, data); // ...render the pivotUI GUI
-		}
-
-		// If the choosen dataset representation is tabulator then...
-		if (FHC_TableWidget._datasetRepresentation == DATASET_REP_TABULATOR)
-		{
-			FHC_TableWidget._renderDatasetTabulator(tableWidgetDiv, data); // ...render the tabulator GUI
-		}
-
-		
-	},
-
-	/**
-	 * Renders the tablesorter for the TableWidget
-	 * The data to be displayed are retrived from the parameter data
-	 */
-	_renderDatasetTablesorter: function(tableWidgetDiv, data) {
-
-		if (data.hasOwnProperty("checkboxes") && data.checkboxes != null && data.checkboxes.trim() != "")
-		{
-			tableWidgetDiv.find("#tableWidgetTableDataset > thead > tr").append("<th data-filter='false' title='Select'>Select</th>");
-		}
-
-		var arrayFieldsToDisplay = FHC_TableWidget._getFieldsToDisplay(data);
-
-		for (var i = 0; i < arrayFieldsToDisplay.length; i++)
-		{
-			var columnName = arrayFieldsToDisplay[i];
-
-			tableWidgetDiv.find("#tableWidgetTableDataset > thead > tr").append("<th title='" + columnName + "'>" + columnName + "</th>");
-		}
-
-		if (data.hasOwnProperty("additionalColumns") && $.isArray(data.additionalColumns))
-		{
-			for (var i = 0; i < data.additionalColumns.length; i++)
-			{
-				var columnName = data.additionalColumns[i];
-
-				tableWidgetDiv.find("#tableWidgetTableDataset > thead > tr").append("<th title='" + columnName + "'>" + columnName + "</th>");
-			}
-		}
-
-		if (arrayFieldsToDisplay.length > 0)
-		{
-			if (data.hasOwnProperty("dataset") && $.isArray(data.dataset))
-			{
-				if (data.checkboxes != null && data.checkboxes != "")
-				{
-					// select checkbox range with shift key
-					if (typeof tableWidgetDiv.find("#tableWidgetTableDataset").checkboxes === 'function')
-						tableWidgetDiv.find("#tableWidgetTableDataset").checkboxes("range", true);
-				}
-				if (data.dataset.length == 0)
-				{
-					// Display placeholder if Table is empty
-					var numColumns = arrayFieldsToDisplay.length;
-					if (data.hasOwnProperty("additionalColumns") && $.isArray(data.additionalColumns))
-					{
-						numColumns += data.additionalColumns.length;
-					}
-					var strHtml = '<tr><td align="center" colspan="'+numColumns+'">';
-					strHtml += FHC_PhrasesLib.t('ui', 'keineDatenVorhanden');
-					strHtml += '</td></tr>';
-					tableWidgetDiv.find("#tableWidgetTableDataset > tbody").append(strHtml);
-				}
-				else
-				{
-					for (var i = 0; i < data.dataset.length; i++)
-					{
-						var record = data.dataset[i];
-
-						if ($.isEmptyObject(record))
-						{
-							continue;
-						}
-
-						var strHtml = "<tr class='" + record.MARK_ROW_CLASS + "'>";
-
-						if (data.checkboxes != null && data.checkboxes != "")
-						{
-							strHtml += "<td>";
-							strHtml += "<input type='checkbox' name='" + data.checkboxes + "[]' value='" + record[data.checkboxes] + "'>";
-							strHtml += "</td>";
-						}
-
-						$.each(arrayFieldsToDisplay, function(i, fieldToDisplay) {
-
-							if (record.hasOwnProperty(data.fields[i]))
-							{
-								strHtml += "<td>" + record[data.fields[i]] + "</td>";
-							}
-						});
-
-						if (data.additionalColumns != null && $.isArray(data.additionalColumns))
-						{
-							$.each(data.additionalColumns, function(i, additionalColumn) {
-
-								if (record.hasOwnProperty(additionalColumn))
-								{
-									strHtml += "<td>" + record[additionalColumn] + "</td>";
-								}
-							});
-						}
-
-						strHtml += "</tr>";
-
-						tableWidgetDiv.find("#tableWidgetTableDataset > tbody").append(strHtml);
-					}
-				}
-			}
-		}
-	},
-
-	/**
-	 * Enable the tablesorter libs to render the dataset table with sorting features
-	 */
-	_enableTableSorter: function(tableWidgetDiv) {
-
-		var tableWidgetTablesorter = tableWidgetDiv.find("#tableWidgetTableDataset");
-
-		// Checks if the table contains data (rows)
-		if (tableWidgetTablesorter.find("tbody:empty").length == 0
-			&& tableWidgetTablesorter.find("tr:empty").length == 0
-			&& tableWidgetTablesorter.hasClass("table-condensed"))
-		{
-			tableWidgetTablesorter.tablesorter({
-				dateFormat: "ddmmyyyy",
-				widgets: ["zebra", "filter"],
-				widgetOptions: {
-					filter_saveFilters : true
-				}
-			});
-
-			$.tablesorter.updateAll(tableWidgetTablesorter[0].config, true, null);
-		}
-	},
-
-	/**
-	 * Disable the tablesorter
-	 */
-	_disableTablesorter: function(tableWidgetDiv) {
-
-		tableWidgetDiv.find("#tableWidgetTableDataset").trigger("disable");
-	},
-
-	/**
-	 * Renders the pivotUI for the TableWidget
-	 * The data to be displayed are retrived from the parameter data
-	 */
-	_renderDatasetPivotUI: function(tableWidgetDiv, data) {
-
-		// Checks if options were given and returns them
-		var options = FHC_TableWidget._getRepresentationOptions(data);
-
-		// Manipulation for the representation!
-		var arrayFieldsToDisplay = FHC_TableWidget._getFieldsToDisplay(data);
-
-		// If there are fields to be displayed...
-		if (arrayFieldsToDisplay.length > 0)
-		{
-			// ...if there are data to be displayed...
-			if (data.hasOwnProperty("dataset") && $.isArray(data.dataset))
-			{
-				// Build the array of objects used by pivotUI and store it in pivotUIData
-				var pivotUIData = [];
-
-				// Loops through data
-				for (var i = 0; i < data.dataset.length; i++)
-				{
-					var record = data.dataset[i]; // Single record
-					var tmpObj = {}; // New object that represents a record
-
-					// Loops through columns of a record
-					$.each(arrayFieldsToDisplay, function(i, fieldToDisplay) {
-
-						if (record.hasOwnProperty(data.fields[i]))
-						{
-							tmpObj[fieldToDisplay] = record[data.fields[i]]; // Add data with the column alias
-						}
-					});
-
-					// If additional columns are present...
-					if (data.additionalColumns != null && $.isArray(data.additionalColumns))
-					{
-						// ...loops through them
-						$.each(data.additionalColumns, function(i, additionalColumn) {
-
-							if (record.hasOwnProperty(additionalColumn))
-							{
-								tmpObj[additionalColumn] = record[additionalColumn]; // Add the additional column
-							}
-						});
-					}
-
-					pivotUIData.push(tmpObj); // Add tmpObj to pivotUIData
-				}
-
-				// Renders the pivotUI
-				tableWidgetDiv.find("#tableWidgetPivotUI").pivotUI(
-		            pivotUIData,
-					options
-		        );
-			}
-		}
-	},
-
-	/**
-	 * Retrives the fields to be displayed from the data parameter, if aliases are present then they are used
-	 */
-	_getFieldsToDisplay: function(data) {
-
-		var arrayFieldsToDisplay = [];
-
-		if (data.hasOwnProperty("fields") && $.isArray(data.fields))
-		{
-			if (data.hasOwnProperty("columnsAliases") && $.isArray(data.columnsAliases))
-			{
-				for (var sfc = 0; sfc < data.fields.length; sfc++)
-				{
-					for (var fc = 0; fc < data.fields.length; fc++)
-					{
-						if (data.fields[sfc] == data.fields[fc])
-						{
-							arrayFieldsToDisplay[sfc] = data.columnsAliases[fc];
-						}
-					}
-				}
-			}
-			else
-			{
-				arrayFieldsToDisplay = data.fields;
-			}
-		}
-
-		return arrayFieldsToDisplay;
-	},
-
-	/**
-	 * Renders the tabulator for the TableWidget
-	 * The data to be displayed are retrived from the parameter data
-	 */
-	_renderDatasetTabulator: function(tableWidgetDiv, data) {
-		
-		// Checks if options were given and returns them
-		var options = FHC_TableWidget._getRepresentationOptions(data);
-		// Checks if record fields definitions were given and returns them
-		var recordFieldsDefinitions = FHC_TableWidget._getRepresentationFieldsDefinitions(data);
-
-		// Manipulation for the representation!
-		var arrayTabulatorColumns = FHC_TableWidget._getTabulatorColumns(data, recordFieldsDefinitions);
-
-		if (arrayTabulatorColumns.length > 0)
-		{
-			// ...if there are data to be displayed...
-			if (data.hasOwnProperty("dataset") && $.isArray(data.dataset))
-			{
-				if (options == null) options = {};
-				options.columnDefaults={
-					// set header tooltip with column title
-					//! the old keyword is tooltipsHeader, the new keyword for the option is headerTooltip
-					headerTooltip: (typeof options.columnDefaults?.tooltipsHeader == 'undefined') ? true : options.columnDefaults?.tooltipsHeader
-				}
-				options.columns = arrayTabulatorColumns;
-				options.data = data.dataset;
-                options.persistence = (typeof options.persistence == 'undefined') ? true : options.persistence;			// enables persistence (default store in localStorage if available, else in cookie)
-                options.persistenceID = (typeof options.persistenceID == 'undefined') ?  data.tableUniqueId : options.persistenceID;  // persistenceID to store persistence data seperately for multiple tables
-				options.movableColumns = (typeof options.movableColumns == 'undefined') ? true : options.movableColumns;				// allows changing column order
-				
-				options.placeholder = _func_placeholder();	// display text when table is empty
-
-				// Renders the tabulator
-				tableWidgetDiv.find("#tableWidgetTabulator").tabulator(options);
-
-				//! callbacks that need to be attached after the table has built in tabulator version 5+
-				tableWidgetDiv.find("#tableWidgetTabulator").tabulator("on","rowSelectionChanged",_func_rowSelectionChanged);
-				tableWidgetDiv.find("#tableWidgetTabulator").tabulator("on","columnVisibilityChanged",_func_columnVisibilityChanged);
-				
-			}
-		}
-
-		// -------------------------------------------------------------------------------------------------------------
-		// Render TableWidget Header and -Footer
-		// -------------------------------------------------------------------------------------------------------------
-
-		// Render tableWidgetHeader
-		
-			
-			if (typeof options.tableWidgetHeader == 'undefined' ||
-			(typeof options.tableWidgetHeader != 'undefined' && options.tableWidgetHeader != false))
-			{
-				var tabulatorHeaderHTML = _renderTabulatorHeaderHTML(tableWidgetDiv);
-				tableWidgetDiv.find('#tableWidgetHeader').append(tabulatorHeaderHTML);
-
-
-				
-			}
-		
-		
-
-		/**
-		 * 	tableWidgetFooter is NOT rendered by default.
-		 * 	tableWidgetFooter is rendered, if tableWidgetFooter is set in tabulators datasetRepOptions.
-		 *	Setup options like this:
-		 *  tableWidgetFooter: {
-		 *  	selectButtons: true  // tableWidgetFooter properties are checked in _renderTabulatorFooterHTML function
-		 *  }
- 		 */
-		if (typeof options.tableWidgetFooter != 'undefined' && options.tableWidgetFooter != null)
-		{
-			var tabulatorFooterHTML = _renderTabulatorFooterHTML(options.tableWidgetFooter);
-			tableWidgetDiv.find('#tableWidgetFooter').append(tabulatorFooterHTML);
-		}
-	},
-
-	/**
-	 * Retrives the fields to be displayed from the data parameter, if aliases are present then they are used
-	 */
-	_getTabulatorColumns: function(data, recordFieldsDefinitions) {
-
-		var fieldsToDisplayTabulator = [];
-
-		if (data.hasOwnProperty("fields") && $.isArray(data.fields))
-		{
-			for (var sfc = 0; sfc < data.fields.length; sfc++)
-			{
-				for (var fc = 0; fc < data.fields.length; fc++)
-				{
-					if (data.fields[sfc] == data.fields[fc])
-					{
-						// Build the array of objects (columns) used by tabulator and store it in tabulatorColumns
-						var tmpColumnObj = {}; // New object that represents a column
-
-						// If was given a definition for this field then use it!
-						if (recordFieldsDefinitions != null && recordFieldsDefinitions.hasOwnProperty(data.fields[sfc]))
-						{
-							tmpColumnObj = recordFieldsDefinitions[data.fields[sfc]];
-						}
-
-						tmpColumnObj.field = data.fields[sfc]; // Field name to be linked with dataset field name
-
-						// If there is an alias for this field use it to give a title to this field (header)
-						if (data.hasOwnProperty("columnsAliases") && $.isArray(data.columnsAliases))
-						{
-							tmpColumnObj.title = data.columnsAliases[fc];
-						}
-						else // otherwise use the field name itself
-						{
-							tmpColumnObj.title = data.fields[sfc];
-						}
-
-						fieldsToDisplayTabulator.push(tmpColumnObj); // Add tmpColumnObj to tabulatorColumns
-					}
-				}
-			}
-		}
-
-		// If additional columns are present...
-		if (data.hasOwnProperty("additionalColumns") && data.additionalColumns != null && $.isArray(data.additionalColumns))
-		{
-			// ...loops through them
-			$.each(data.additionalColumns, function(i, additionalColumn) {
-
-				var tmpColumnObj = {}; // New object that represents a column
-
-				// If was given a definition for this field then use it!
-				if (recordFieldsDefinitions != null && recordFieldsDefinitions.hasOwnProperty(additionalColumn))
-				{
-					tmpColumnObj = recordFieldsDefinitions[additionalColumn];
-				}
-
-				tmpColumnObj.title = additionalColumn; // Give a title to this field (header)
-				tmpColumnObj.field = additionalColumn; // Field name to be linked with dataset field name
-
-				fieldsToDisplayTabulator.push(tmpColumnObj); // Add tmpColumnObj to tabulatorColumns
-			});
-		}
-
-		return fieldsToDisplayTabulator;
-	},
-
-	/**
-	 * Gets options for the representation
-	 */
-	_getRepresentationOptions: function(data) {
-
-		var options = {}; // eventually contains options fot the representation
-		
-		// Checks if options were given
-		if (data.hasOwnProperty("datasetRepresentationOptions") && data.datasetRepresentationOptions != "")
-		{
-			var tmpOptions = eval("(" + data.datasetRepresentationOptions + ")"); // and converts them from string to javascript code
-
-			// If it is an object then can be used
-			if (typeof tmpOptions == "object")
-			{
-				options = tmpOptions;
-			}
-		}
-		
-		return options;
-	},
-
-	/**
-	 * Gets record fields definitions to represent the dataset
-	 */
-	_getRepresentationFieldsDefinitions: function(data) {
-
-		var fieldsDefinitions = {}; // eventually contains record fields definitions
-		// Checks if record fields definitions was given as parameter
-		if (data.hasOwnProperty("datasetRepresentationFieldsDefinitions") && data.datasetRepresentationFieldsDefinitions != "")
-		{
-			var tmpFDefs = eval("(" + data.datasetRepresentationFieldsDefinitions + ")"); // and converts them from string to javascript code
-
-			// If it is an object then can be used
-			if (typeof tmpFDefs == "object")
-			{
-				fieldsDefinitions = tmpFDefs;
-			}
-		}
-
-		return fieldsDefinitions;
-	},
-
-	/**
-	 * Set what type of dataset representation was choosen
-	 */
-	_setDatasetRepresentation: function(data) {
-
-		if (data.hasOwnProperty("datasetRepresentation"))
-		{
-			FHC_TableWidget._datasetRepresentation = data.datasetRepresentation;
-		}
-	},
-
-	_setBootstrapVersion: function(data) {
-
-		_bootstrapVersion = data.bootstrapVersion
-	},
-
-	_getTableWidgetUniqueIdArray: function() {
-
-		var tableWidgetUniqueIdArray = [];
-
-		$("div[id*='divTableWidgetDataset']").each(function(i, e) {
-
-			tableWidgetUniqueIdArray.push(e.attributes["tableUniqueId"].nodeValue);
-		});
-
-		return tableWidgetUniqueIdArray;
-	}
+  //------------------------------------------------------------------------------------------------------------------
+  // Properties
+
+  _datasetRepresentation: null, // contains the current data representation
+
+  _bootstrapVersion: 3,
+  //------------------------------------------------------------------------------------------------------------------
+  // Public methods
+
+  /**
+   * To display the TableWidget using the loaded data prenset in the session
+   */
+  display: function () {
+    FHC_TableWidget._getTables(FHC_TableWidget._renderTableWidget);
+  },
+
+  /**
+   * Alias call to method display only to inprove the readability of the code
+   */
+  refresh: function () {
+    FHC_TableWidget.display();
+  },
+
+  //------------------------------------------------------------------------------------------------------------------
+  // Private methods
+
+  /**
+   * To retrive the page where the TableWidget is used, using the FHC_JS_DATA_STORAGE_OBJECT
+   */
+  _getTableUniqueIdPrefix: function () {
+    return (
+      FHC_JS_DATA_STORAGE_OBJECT.called_path +
+      "/" +
+      FHC_JS_DATA_STORAGE_OBJECT.called_method
+    );
+  },
+
+  /**
+   * Utility method that checks if data contains an error and print that to the console
+   * otherwise the TableWidget GUI is refreshed
+   */
+  _failOrRefresh: function (data, textStatus, jqXHR) {
+    if (FHC_AjaxClient.isError(data)) {
+      console.log(FHC_AjaxClient.getError(data));
+    } else {
+      FHC_TableWidget.refresh();
+    }
+  },
+
+  /**
+   * Utility method that checks if data contains an error and print that to the console
+   * otherwise the page is reloaded
+   */
+  _failOrReload: function (data, textStatus, jqXHR) {
+    if (FHC_AjaxClient.isError(data)) {
+      console.log(FHC_AjaxClient.getError(data));
+    } else {
+      location.reload();
+    }
+  },
+
+  /**
+   * To reset the Table Widget GUI
+   */
+  _resetGUI: function (tableWidgetDiv) {
+    // If the choosen dataset representation is tablesorter
+    if (FHC_TableWidget._datasetRepresentation == DATASET_REP_TABLESORTER) {
+      tableWidgetDiv.find("#tableWidgetTableDataset > thead > tr").html("");
+      tableWidgetDiv.find("#tableWidgetTableDataset > tbody").html("");
+    }
+
+    // If the choosen dataset representation is pivotUI
+    if (FHC_TableWidget._datasetRepresentation == DATASET_REP_PIVOTUI) {
+      tableWidgetDiv.find("#tableWidgetPivotUI").html("");
+    }
+
+    // If the choosen dataset representation is tabulator
+    if (FHC_TableWidget._datasetRepresentation == DATASET_REP_TABULATOR) {
+      tableWidgetDiv.find("#tableWidgetTabulator").html("");
+    }
+  },
+
+  /**
+   * To get via Ajax all the data related to the TableWidget present in the given page
+   * If the parameter renderFunction is a valid function, is called on success
+   */
+  _getTables: function (renderFunction) {
+    var tableWidgetUniqueIdArray =
+      FHC_TableWidget._getTableWidgetUniqueIdArray();
+
+    for (
+      var tableWidgetsCounter = 0;
+      tableWidgetsCounter < tableWidgetUniqueIdArray.length;
+      tableWidgetsCounter++
+    ) {
+      FHC_AjaxClient.ajaxCallGet(
+        "widgets/Tables/getTable",
+        {
+          tableUniqueId:
+            FHC_TableWidget._getTableUniqueIdPrefix() +
+            "/" +
+            tableWidgetUniqueIdArray[tableWidgetsCounter],
+        },
+        {
+          successCallback: function (data, textStatus, jqXHR) {
+            if (FHC_AjaxClient.hasData(data)) {
+              if (typeof renderFunction == "function") {
+                renderFunction(FHC_AjaxClient.getData(data));
+              }
+            } else {
+              console.log(FHC_AjaxClient.getError(data));
+            }
+          },
+        }
+      );
+    }
+  },
+
+  /**
+   * This method calls all the other methods needed to rendere the GUI for a TableWidget
+   * The parameter data contains all the data about the TableWidget and it is given as parameter
+   * to all the methods that here are called
+   * NOTE: think very carefully before changing the order of the calls
+   */
+  _renderTableWidget: function (data) {
+    FHC_TableWidget._setDatasetRepresentation(data); // set what type of dataset representation was choosen
+
+    FHC_TableWidget._setBootstrapVersion(data); // set the bootstrap version used for the tableWidget
+
+    var tableWidgetDiv = $('div[tableUniqueId="' + data.tableUniqueId + '"]');
+
+    FHC_TableWidget._turnOffEvents(tableWidgetDiv); // turns all the events off
+
+    FHC_TableWidget._resetGUI(tableWidgetDiv); // Reset the entire GUI
+
+    FHC_TableWidget._renderDataset(tableWidgetDiv, data);
+
+    FHC_TableWidget._turnOnEvents(tableWidgetDiv); // turns all the events off
+
+    FHC_TableWidget._onTableBuilt(tableWidgetDiv, data);
+  },
+
+  _onTableBuilt: function (tableWidgetDiv, data) {
+    var options = FHC_TableWidget._getRepresentationOptions(data);
+
+    tableWidgetDiv
+      .find("#tableWidgetTabulator")
+      .tabulator("on", "tableBuilt", () => {
+        if (
+          typeof options.tableWidgetHeader == "undefined" ||
+          (typeof options.tableWidgetHeader != "undefined" &&
+            options.tableWidgetHeader != false)
+        ) {
+          // renders the table headers
+          var tabulatorHeaderCollapseHTML =
+            _renderTabulatorHeaderCollapseHTML(tableWidgetDiv);
+          tableWidgetDiv
+            .find("#tableWidgetHeader")
+            .after(tabulatorHeaderCollapseHTML);
+        }
+
+        // makes the table headers toggle visibility when clicking on them
+        tableWidgetDiv.find(".btn-select-col").on("click", function () {
+          var selected = this.value;
+
+          tableWidgetDiv
+            .find("#tableWidgetTabulator")
+            .tabulator("toggleColumn", selected);
+
+          // toggle class to color button as selected / deselected
+          $(this).toggleClass("btn-select-col-selected").blur(); // blur removes automatic focus
+        });
+      });
+  },
+
+  /**
+   * Turns all the events off
+   * NOTE: must be aligned to _turnOnEvents
+   */
+  _turnOffEvents: function (tableWidgetDiv) {
+    // If the choosen dataset representation is tablesorter
+    if (FHC_TableWidget._datasetRepresentation == DATASET_REP_TABLESORTER) {
+      FHC_TableWidget._disableTablesorter(tableWidgetDiv); // disable the tablesorter
+    }
+  },
+
+  /**
+   * Turns all the events on
+   * NOTE: must be aligned to _turnOffEvents
+   */
+  _turnOnEvents: function (tableWidgetDiv) {
+    var tableUniqueId = tableWidgetDiv.attr("tableUniqueId");
+
+    // If the choosen dataset representation is tablesorter
+    if (FHC_TableWidget._datasetRepresentation == DATASET_REP_TABLESORTER) {
+      FHC_TableWidget._enableTableSorter(tableWidgetDiv); // enable the tablesorter
+    }
+
+    // If the choosen dataset representation is tabulator
+    if (FHC_TableWidget._datasetRepresentation == DATASET_REP_TABULATOR) {
+      // ---------------------------------------------------------------------------------------------------------
+      // Add events to the elements
+      // ---------------------------------------------------------------------------------------------------------
+
+      // Click-Event to download csv
+      tableWidgetDiv.find("#download-csv").on("click", function () {
+        // BOM for correct UTF-8 char output
+        tableWidgetDiv
+          .find("#tableWidgetTabulator")
+          .tabulator("download", "csv", "data.csv", { bom: true });
+      });
+
+      // Click-Event to toggle the collapsable help panel
+      tableWidgetDiv.find("#help").on("click", function () {
+        // Hide the collapsable settings panel, if it actually shown
+        $("#tabulatorSettings-" + tableUniqueId).collapse("hide");
+
+        // Toggle the collapsable help panel
+        $("#tabulatorHelp-" + tableUniqueId).collapse("toggle");
+      });
+
+      // Click-Event to toggle the collapsable settings panel
+      tableWidgetDiv.find("#settings").on("click", function () {
+        // Hide the collapsable help panel, if it actually shown
+        $("#tabulatorHelp-" + tableUniqueId).collapse("hide");
+
+        // Toggle the collapsable settings panel
+        $("#tabulatorSettings-" + tableUniqueId).collapse("toggle");
+      });
+
+      /* Beautify button group behaviour
+       * Let buttons stay active even until they are clicked again to close the collapsable help- oder setting panels
+       * Also remove the disturbing button focus behaviour
+       */
+      $(".btn-group > .btn").click(function () {
+        if ($(this).hasClass("active")) {
+          $(this).removeClass("active").css("outline", "none");
+        } else {
+          $(this)
+            .addClass("active")
+            .css("outline", "none")
+            .siblings()
+            .removeClass("active");
+        }
+      });
+
+      /**
+       * Click-Event to select all rows
+       * Default is ALL rows. This can be modified via hook tableWidgetHook_selectAllButton.
+       */
+      if (typeof tableWidgetHook_selectAllButton == "function") {
+        tableWidgetDiv.find("#select-all").on("click", function () {
+          tableWidgetHook_selectAllButton(tableWidgetDiv);
+        });
+      } else {
+        tableWidgetDiv.find("#select-all").on("click", function () {
+          tableWidgetDiv
+            .find("#tableWidgetTabulator")
+            .tabulator("selectRow", true);
+        });
+      }
+
+      // Click-Event to deselect all rows
+      tableWidgetDiv.find("#deselect-all").on("click", function () {
+        tableWidgetDiv.find("#tableWidgetTabulator").tabulator("deselectRow");
+      });
+
+      // Click-Event to toggle column-picker columns
+      //! this event was moved to the _onTableBuilt function
+    }
+  },
+
+  _renderDataset: function (tableWidgetDiv, data) {
+    // If the choosen dataset representation is tablesorter then...
+    if (FHC_TableWidget._datasetRepresentation == DATASET_REP_TABLESORTER) {
+      FHC_TableWidget._renderDatasetTablesorter(tableWidgetDiv, data); // ...render the tablesorter GUI
+    }
+
+    // If the choosen dataset representation is pivotUI then...
+    if (FHC_TableWidget._datasetRepresentation == DATASET_REP_PIVOTUI) {
+      FHC_TableWidget._renderDatasetPivotUI(tableWidgetDiv, data); // ...render the pivotUI GUI
+    }
+
+    // If the choosen dataset representation is tabulator then...
+    if (FHC_TableWidget._datasetRepresentation == DATASET_REP_TABULATOR) {
+      FHC_TableWidget._renderDatasetTabulator(tableWidgetDiv, data); // ...render the tabulator GUI
+    }
+  },
+
+  /**
+   * Renders the tablesorter for the TableWidget
+   * The data to be displayed are retrived from the parameter data
+   */
+  _renderDatasetTablesorter: function (tableWidgetDiv, data) {
+    if (
+      data.hasOwnProperty("checkboxes") &&
+      data.checkboxes != null &&
+      data.checkboxes.trim() != ""
+    ) {
+      tableWidgetDiv
+        .find("#tableWidgetTableDataset > thead > tr")
+        .append("<th data-filter='false' title='Select'>Select</th>");
+    }
+
+    var arrayFieldsToDisplay = FHC_TableWidget._getFieldsToDisplay(data);
+
+    for (var i = 0; i < arrayFieldsToDisplay.length; i++) {
+      var columnName = arrayFieldsToDisplay[i];
+
+      tableWidgetDiv
+        .find("#tableWidgetTableDataset > thead > tr")
+        .append("<th title='" + columnName + "'>" + columnName + "</th>");
+    }
+
+    if (
+      data.hasOwnProperty("additionalColumns") &&
+      $.isArray(data.additionalColumns)
+    ) {
+      for (var i = 0; i < data.additionalColumns.length; i++) {
+        var columnName = data.additionalColumns[i];
+
+        tableWidgetDiv
+          .find("#tableWidgetTableDataset > thead > tr")
+          .append("<th title='" + columnName + "'>" + columnName + "</th>");
+      }
+    }
+
+    if (arrayFieldsToDisplay.length > 0) {
+      if (data.hasOwnProperty("dataset") && $.isArray(data.dataset)) {
+        if (data.checkboxes != null && data.checkboxes != "") {
+          // select checkbox range with shift key
+          if (
+            typeof tableWidgetDiv.find("#tableWidgetTableDataset")
+              .checkboxes === "function"
+          )
+            tableWidgetDiv
+              .find("#tableWidgetTableDataset")
+              .checkboxes("range", true);
+        }
+        if (data.dataset.length == 0) {
+          // Display placeholder if Table is empty
+          var numColumns = arrayFieldsToDisplay.length;
+          if (
+            data.hasOwnProperty("additionalColumns") &&
+            $.isArray(data.additionalColumns)
+          ) {
+            numColumns += data.additionalColumns.length;
+          }
+          var strHtml = '<tr><td align="center" colspan="' + numColumns + '">';
+          strHtml += FHC_PhrasesLib.t("ui", "keineDatenVorhanden");
+          strHtml += "</td></tr>";
+          tableWidgetDiv
+            .find("#tableWidgetTableDataset > tbody")
+            .append(strHtml);
+        } else {
+          for (var i = 0; i < data.dataset.length; i++) {
+            var record = data.dataset[i];
+
+            if ($.isEmptyObject(record)) {
+              continue;
+            }
+
+            var strHtml = "<tr class='" + record.MARK_ROW_CLASS + "'>";
+
+            if (data.checkboxes != null && data.checkboxes != "") {
+              strHtml += "<td>";
+              strHtml +=
+                "<input type='checkbox' name='" +
+                data.checkboxes +
+                "[]' value='" +
+                record[data.checkboxes] +
+                "'>";
+              strHtml += "</td>";
+            }
+
+            $.each(arrayFieldsToDisplay, function (i, fieldToDisplay) {
+              if (record.hasOwnProperty(data.fields[i])) {
+                strHtml += "<td>" + record[data.fields[i]] + "</td>";
+              }
+            });
+
+            if (
+              data.additionalColumns != null &&
+              $.isArray(data.additionalColumns)
+            ) {
+              $.each(data.additionalColumns, function (i, additionalColumn) {
+                if (record.hasOwnProperty(additionalColumn)) {
+                  strHtml += "<td>" + record[additionalColumn] + "</td>";
+                }
+              });
+            }
+
+            strHtml += "</tr>";
+
+            tableWidgetDiv
+              .find("#tableWidgetTableDataset > tbody")
+              .append(strHtml);
+          }
+        }
+      }
+    }
+  },
+
+  /**
+   * Enable the tablesorter libs to render the dataset table with sorting features
+   */
+  _enableTableSorter: function (tableWidgetDiv) {
+    var tableWidgetTablesorter = tableWidgetDiv.find(
+      "#tableWidgetTableDataset"
+    );
+
+    // Checks if the table contains data (rows)
+    if (
+      tableWidgetTablesorter.find("tbody:empty").length == 0 &&
+      tableWidgetTablesorter.find("tr:empty").length == 0 &&
+      tableWidgetTablesorter.hasClass("table-condensed")
+    ) {
+      tableWidgetTablesorter.tablesorter({
+        dateFormat: "ddmmyyyy",
+        widgets: ["zebra", "filter"],
+        widgetOptions: {
+          filter_saveFilters: true,
+        },
+      });
+
+      $.tablesorter.updateAll(tableWidgetTablesorter[0].config, true, null);
+    }
+  },
+
+  /**
+   * Disable the tablesorter
+   */
+  _disableTablesorter: function (tableWidgetDiv) {
+    tableWidgetDiv.find("#tableWidgetTableDataset").trigger("disable");
+  },
+
+  /**
+   * Renders the pivotUI for the TableWidget
+   * The data to be displayed are retrived from the parameter data
+   */
+  _renderDatasetPivotUI: function (tableWidgetDiv, data) {
+    // Checks if options were given and returns them
+    var options = FHC_TableWidget._getRepresentationOptions(data);
+
+    // Manipulation for the representation!
+    var arrayFieldsToDisplay = FHC_TableWidget._getFieldsToDisplay(data);
+
+    // If there are fields to be displayed...
+    if (arrayFieldsToDisplay.length > 0) {
+      // ...if there are data to be displayed...
+      if (data.hasOwnProperty("dataset") && $.isArray(data.dataset)) {
+        // Build the array of objects used by pivotUI and store it in pivotUIData
+        var pivotUIData = [];
+
+        // Loops through data
+        for (var i = 0; i < data.dataset.length; i++) {
+          var record = data.dataset[i]; // Single record
+          var tmpObj = {}; // New object that represents a record
+
+          // Loops through columns of a record
+          $.each(arrayFieldsToDisplay, function (i, fieldToDisplay) {
+            if (record.hasOwnProperty(data.fields[i])) {
+              tmpObj[fieldToDisplay] = record[data.fields[i]]; // Add data with the column alias
+            }
+          });
+
+          // If additional columns are present...
+          if (
+            data.additionalColumns != null &&
+            $.isArray(data.additionalColumns)
+          ) {
+            // ...loops through them
+            $.each(data.additionalColumns, function (i, additionalColumn) {
+              if (record.hasOwnProperty(additionalColumn)) {
+                tmpObj[additionalColumn] = record[additionalColumn]; // Add the additional column
+              }
+            });
+          }
+
+          pivotUIData.push(tmpObj); // Add tmpObj to pivotUIData
+        }
+
+        // Renders the pivotUI
+        tableWidgetDiv
+          .find("#tableWidgetPivotUI")
+          .pivotUI(pivotUIData, options);
+      }
+    }
+  },
+
+  /**
+   * Retrives the fields to be displayed from the data parameter, if aliases are present then they are used
+   */
+  _getFieldsToDisplay: function (data) {
+    var arrayFieldsToDisplay = [];
+
+    if (data.hasOwnProperty("fields") && $.isArray(data.fields)) {
+      if (
+        data.hasOwnProperty("columnsAliases") &&
+        $.isArray(data.columnsAliases)
+      ) {
+        for (var sfc = 0; sfc < data.fields.length; sfc++) {
+          for (var fc = 0; fc < data.fields.length; fc++) {
+            if (data.fields[sfc] == data.fields[fc]) {
+              arrayFieldsToDisplay[sfc] = data.columnsAliases[fc];
+            }
+          }
+        }
+      } else {
+        arrayFieldsToDisplay = data.fields;
+      }
+    }
+
+    return arrayFieldsToDisplay;
+  },
+
+  /**
+   * Renders the tabulator for the TableWidget
+   * The data to be displayed are retrived from the parameter data
+   */
+  _renderDatasetTabulator: function (tableWidgetDiv, data) {
+    // Checks if options were given and returns them
+    var options = FHC_TableWidget._getRepresentationOptions(data);
+    // Checks if record fields definitions were given and returns them
+    var recordFieldsDefinitions =
+      FHC_TableWidget._getRepresentationFieldsDefinitions(data);
+
+    // Manipulation for the representation!
+    var arrayTabulatorColumns = FHC_TableWidget._getTabulatorColumns(
+      data,
+      recordFieldsDefinitions
+    );
+
+    if (arrayTabulatorColumns.length > 0) {
+      // ...if there are data to be displayed...
+      if (data.hasOwnProperty("dataset") && $.isArray(data.dataset)) {
+        if (options == null) options = {};
+        options.columnDefaults = {
+          // set header tooltip with column title
+          //! the old keyword is tooltipsHeader, the new keyword for the option is headerTooltip
+          headerTooltip:
+            typeof options.columnDefaults?.tooltipsHeader == "undefined"
+              ? true
+              : options.columnDefaults?.tooltipsHeader,
+        };
+        options.columns = arrayTabulatorColumns;
+        options.data = data.dataset;
+        options.persistence =
+          typeof options.persistence == "undefined"
+            ? true
+            : options.persistence; // enables persistence (default store in localStorage if available, else in cookie)
+        options.persistenceID =
+          typeof options.persistenceID == "undefined"
+            ? data.tableUniqueId
+            : options.persistenceID; // persistenceID to store persistence data seperately for multiple tables
+        options.movableColumns =
+          typeof options.movableColumns == "undefined"
+            ? true
+            : options.movableColumns; // allows changing column order
+
+        options.placeholder = _func_placeholder(); // display text when table is empty
+
+        // Renders the tabulator
+        tableWidgetDiv.find("#tableWidgetTabulator").tabulator(options);
+
+        //! callbacks that need to be attached after the table has built in tabulator version 5+
+        tableWidgetDiv
+          .find("#tableWidgetTabulator")
+          .tabulator("on", "rowSelectionChanged", _func_rowSelectionChanged);
+        tableWidgetDiv
+          .find("#tableWidgetTabulator")
+          .tabulator(
+            "on",
+            "columnVisibilityChanged",
+            _func_columnVisibilityChanged
+          );
+      }
+    }
+
+    // -------------------------------------------------------------------------------------------------------------
+    // Render TableWidget Header and -Footer
+    // -------------------------------------------------------------------------------------------------------------
+
+    // Render tableWidgetHeader
+
+    if (
+      typeof options.tableWidgetHeader == "undefined" ||
+      (typeof options.tableWidgetHeader != "undefined" &&
+        options.tableWidgetHeader != false)
+    ) {
+      var tabulatorHeaderHTML = _renderTabulatorHeaderHTML(tableWidgetDiv);
+      tableWidgetDiv.find("#tableWidgetHeader").append(tabulatorHeaderHTML);
+    }
+
+    /**
+     * 	tableWidgetFooter is NOT rendered by default.
+     * 	tableWidgetFooter is rendered, if tableWidgetFooter is set in tabulators datasetRepOptions.
+     *	Setup options like this:
+     *  tableWidgetFooter: {
+     *  	selectButtons: true  // tableWidgetFooter properties are checked in _renderTabulatorFooterHTML function
+     *  }
+     */
+    if (
+      typeof options.tableWidgetFooter != "undefined" &&
+      options.tableWidgetFooter != null
+    ) {
+      var tabulatorFooterHTML = _renderTabulatorFooterHTML(
+        options.tableWidgetFooter
+      );
+      tableWidgetDiv.find("#tableWidgetFooter").append(tabulatorFooterHTML);
+    }
+  },
+
+  /**
+   * Retrives the fields to be displayed from the data parameter, if aliases are present then they are used
+   */
+  _getTabulatorColumns: function (data, recordFieldsDefinitions) {
+    var fieldsToDisplayTabulator = [];
+
+    if (data.hasOwnProperty("fields") && $.isArray(data.fields)) {
+      for (var sfc = 0; sfc < data.fields.length; sfc++) {
+        for (var fc = 0; fc < data.fields.length; fc++) {
+          if (data.fields[sfc] == data.fields[fc]) {
+            // Build the array of objects (columns) used by tabulator and store it in tabulatorColumns
+            var tmpColumnObj = {}; // New object that represents a column
+
+            // If was given a definition for this field then use it!
+            if (
+              recordFieldsDefinitions != null &&
+              recordFieldsDefinitions.hasOwnProperty(data.fields[sfc])
+            ) {
+              tmpColumnObj = recordFieldsDefinitions[data.fields[sfc]];
+            }
+
+            tmpColumnObj.field = data.fields[sfc]; // Field name to be linked with dataset field name
+
+            // If there is an alias for this field use it to give a title to this field (header)
+            if (
+              data.hasOwnProperty("columnsAliases") &&
+              $.isArray(data.columnsAliases)
+            ) {
+              tmpColumnObj.title = data.columnsAliases[fc];
+            } // otherwise use the field name itself
+            else {
+              tmpColumnObj.title = data.fields[sfc];
+            }
+
+            fieldsToDisplayTabulator.push(tmpColumnObj); // Add tmpColumnObj to tabulatorColumns
+          }
+        }
+      }
+    }
+
+    // If additional columns are present...
+    if (
+      data.hasOwnProperty("additionalColumns") &&
+      data.additionalColumns != null &&
+      $.isArray(data.additionalColumns)
+    ) {
+      // ...loops through them
+      $.each(data.additionalColumns, function (i, additionalColumn) {
+        var tmpColumnObj = {}; // New object that represents a column
+
+        // If was given a definition for this field then use it!
+        if (
+          recordFieldsDefinitions != null &&
+          recordFieldsDefinitions.hasOwnProperty(additionalColumn)
+        ) {
+          tmpColumnObj = recordFieldsDefinitions[additionalColumn];
+        }
+
+        tmpColumnObj.title = additionalColumn; // Give a title to this field (header)
+        tmpColumnObj.field = additionalColumn; // Field name to be linked with dataset field name
+
+        fieldsToDisplayTabulator.push(tmpColumnObj); // Add tmpColumnObj to tabulatorColumns
+      });
+    }
+
+    return fieldsToDisplayTabulator;
+  },
+
+  /**
+   * Gets options for the representation
+   */
+  _getRepresentationOptions: function (data) {
+    var options = {}; // eventually contains options fot the representation
+
+    // Checks if options were given
+    if (
+      data.hasOwnProperty("datasetRepresentationOptions") &&
+      data.datasetRepresentationOptions != ""
+    ) {
+      var tmpOptions = eval("(" + data.datasetRepresentationOptions + ")"); // and converts them from string to javascript code
+
+      // If it is an object then can be used
+      if (typeof tmpOptions == "object") {
+        options = tmpOptions;
+      }
+    }
+
+    return options;
+  },
+
+  /**
+   * Gets record fields definitions to represent the dataset
+   */
+  _getRepresentationFieldsDefinitions: function (data) {
+    var fieldsDefinitions = {}; // eventually contains record fields definitions
+    // Checks if record fields definitions was given as parameter
+    if (
+      data.hasOwnProperty("datasetRepresentationFieldsDefinitions") &&
+      data.datasetRepresentationFieldsDefinitions != ""
+    ) {
+      var tmpFDefs = eval(
+        "(" + data.datasetRepresentationFieldsDefinitions + ")"
+      ); // and converts them from string to javascript code
+
+      // If it is an object then can be used
+      if (typeof tmpFDefs == "object") {
+        fieldsDefinitions = tmpFDefs;
+      }
+    }
+
+    return fieldsDefinitions;
+  },
+
+  /**
+   * Set what type of dataset representation was choosen
+   */
+  _setDatasetRepresentation: function (data) {
+    if (data.hasOwnProperty("datasetRepresentation")) {
+      FHC_TableWidget._datasetRepresentation = data.datasetRepresentation;
+    }
+  },
+
+  _setBootstrapVersion: function (data) {
+    _bootstrapVersion = data.bootstrapVersion;
+  },
+
+  _getTableWidgetUniqueIdArray: function () {
+    var tableWidgetUniqueIdArray = [];
+
+    $("div[id*='divTableWidgetDataset']").each(function (i, e) {
+      tableWidgetUniqueIdArray.push(e.attributes["tableUniqueId"].nodeValue);
+    });
+
+    return tableWidgetUniqueIdArray;
+  },
 };
 
 //**********************************************************************************************************************
@@ -778,39 +771,41 @@ var FHC_TableWidget = {
  * Processed when row selection changed.
  * Displays number of selected rows on row selection change.
  */
-function _func_rowSelectionChanged (data, rows){
-
-	$('#number-selected').html("Ausgewählte Zeilen: <strong>" + rows.length + "</strong>");
+function _func_rowSelectionChanged(data, rows) {
+  $("#number-selected").html(
+    "Ausgewählte Zeilen: <strong>" + rows.length + "</strong>"
+  );
 }
 
 /* Processed when columns visibility changed (e.g. using the column picker).
  * Redraws the table to expand columns to table width.
  */
-function _func_columnVisibilityChanged(column, visible){
+function _func_columnVisibilityChanged(column, visible) {
+  var table = column.getTable();
 
-	var table = column.getTable();
-
-	table.redraw();
+  table.redraw();
 }
 
 /*
  * Displays text when table is empty
  */
-function _func_placeholder(){
-	return '<h4>' + FHC_PhrasesLib.t('ui', 'keineDatenVorhanden') + '</h4>';
+function _func_placeholder() {
+  return "<h4>" + FHC_PhrasesLib.t("ui", "keineDatenVorhanden") + "</h4>";
 }
 
 // Returns TableWidget Header HTML (download-, setting button...)
-function _renderTabulatorHeaderHTML(tableWidgetDiv){
+function _renderTabulatorHeaderHTML(tableWidgetDiv) {
+  var tableUniqueId = tableWidgetDiv.attr("tableUniqueId");
 
-	var tableUniqueId = tableWidgetDiv.attr('tableUniqueId');
-
-	var tabulatorHeaderHTML = '';
-	tabulatorHeaderHTML += 
-	`<div class="btn-toolbar pull-right" role="toolbar">
+  var tabulatorHeaderHTML = "";
+  tabulatorHeaderHTML += `<div class="btn-toolbar ${
+    _bootstrapVersion == 3 ? "pull-right" : "float-end"
+  }" role="toolbar">
 		<div class="btn-group" role="group">
 			<!-- CSV Download button -->
-			<button id="download-csv" class="btn ${_bootstrapVersion==3?'btn-default':'btn-outline-secondary'}" type="button" 
+			<button id="download-csv" class="btn ${
+        _bootstrapVersion == 3 ? "btn-default" : "btn-outline-secondary"
+      }" type="button" 
 			data-toggle="tooltip" data-placement="left" title="Download CSV">
 				<small>
 					CSV&nbsp;&nbsp;
@@ -818,13 +813,17 @@ function _renderTabulatorHeaderHTML(tableWidgetDiv){
 				<i class="fa fa-arrow-down"></i>
 			</button>
 			<!-- Hilfe Button -->
-			<button id="help" class="btn ${_bootstrapVersion==3?'btn-default':'btn-outline-secondary'}" type="button"
+			<button id="help" class="btn ${
+        _bootstrapVersion == 3 ? "btn-default" : "btn-outline-secondary"
+      }" type="button"
 			data-toggle="collapse tooltip" data-target="tabulatorHelp-${tableUniqueId}" data-placement="left" 
 			title="${FHC_PhrasesLib.t("ui", "hilfe")}">
 				<i class="fa fa-question"></i>
 			</button>
 			<!-- Settings Button -->
-			<button id="settings" class="btn ${_bootstrapVersion==3?'btn-default':'btn-outline-secondary'}" type="button" 
+			<button id="settings" class="btn ${
+        _bootstrapVersion == 3 ? "btn-default" : "btn-outline-secondary"
+      }" type="button" 
 			data-toggle="collapse tooltip" data-target="tabulatorSettings-${tableUniqueId}" data-placement="left"
 			title="${FHC_PhrasesLib.t("ui", "tabelleneinstellungen")}" 
 			aria-expanded="false" aria-controls="tabulatorSettings-${tableUniqueId}">
@@ -832,21 +831,23 @@ function _renderTabulatorHeaderHTML(tableWidgetDiv){
 			</button>
 		</div>
 	</div>
-	<br><br><br>`;
+	`;
 
-	return tabulatorHeaderHTML;
+  return tabulatorHeaderHTML;
 }
 
 // Returns collapsable HTML element for TableWidget header buttons
-function _renderTabulatorHeaderCollapseHTML(tableWidgetDiv,arrayTabulatorColumns){
+function _renderTabulatorHeaderCollapseHTML(
+  tableWidgetDiv,
+  arrayTabulatorColumns
+) {
+  var tableUniqueId = tableWidgetDiv.attr("tableUniqueId");
 
-	var tableUniqueId = tableWidgetDiv.attr('tableUniqueId');
+  var tabulatorHeaderCollapseHTML = "";
 
-	var tabulatorHeaderCollapseHTML = '';
-
-	// CollapseHTML 'Settings'
-	if(_bootstrapVersion==3){
-	tabulatorHeaderCollapseHTML += `
+  // CollapseHTML 'Settings'
+  if (_bootstrapVersion == 3) {
+    tabulatorHeaderCollapseHTML += `
 	<div class="row ">
 		<div class="col-lg-12 collapse" id="tabulatorSettings-${tableUniqueId}">
 			<div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
@@ -862,10 +863,9 @@ function _renderTabulatorHeaderCollapseHTML(tableWidgetDiv,arrayTabulatorColumns
 					</div>
 					<div id="selectColumns-${tableUniqueId}" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
 						<div class="panel-body">
-							<div class="btn-group" role="group">`
-	}else{
-		tabulatorHeaderCollapseHTML += 
-		`<div class="row my-4">
+							<div class="btn-group" role="group">`;
+  } else {
+    tabulatorHeaderCollapseHTML += `<div class="row my-4">
 			<div class="col-12 collapse" id="tabulatorSettings-${tableUniqueId}">
 				<div class="accordion" id="accordion" role="tablist" aria-multiselectable="true">
 					<div class="accordion-item">
@@ -879,60 +879,78 @@ function _renderTabulatorHeaderCollapseHTML(tableWidgetDiv,arrayTabulatorColumns
 						<div id="selectColumns-${tableUniqueId}" class="accordion-collapse collapse" role="tabpanel" aria-labelledby="headingOne" data-bs-parent="#accordion">
 							<div class=" accordion-body ">
 								<div class="d-flex flex-row flex-wrap btn-group" role="group">`;
-	}
-	// Create column picker (Spalten einstellen)
-	tableWidgetDiv.find('#tableWidgetTabulator').tabulator('getColumns').forEach(function(column)
-	{
-		var field = column.getField();
-		var title = column.getDefinition().title;
-		var btn_select_col_selected = column.isVisible() ? 'btn-select-col-selected' : '';
+  }
+  // Create column picker (Spalten einstellen)
+  tableWidgetDiv
+    .find("#tableWidgetTabulator")
+    .tabulator("getColumns")
+    .forEach(function (column) {
+      var field = column.getField();
+      var title = column.getDefinition().title;
+      var btn_select_col_selected = column.isVisible()
+        ? "btn-select-col-selected"
+        : "";
 
-		// If certain columns should be excluded from the column picker (define them in a blacklist array)
-		if (typeof tableWidgetBlacklistArray_columnUnselectable != 'undefined' &&
-			Array.isArray(tableWidgetBlacklistArray_columnUnselectable) &&
-			tableWidgetBlacklistArray_columnUnselectable.length)
-		{
-			if ($.inArray(field, tableWidgetBlacklistArray_columnUnselectable) < 0)
-			{
-				tabulatorHeaderCollapseHTML += `<button type="button" style="flex:0 0 auto " class="btn ${_bootstrapVersion==3?'btn-default':'btn-outline-secondary flex-shrink-1'} btn-sm btn-select-col ${btn_select_col_selected} " aria-pressed="true" id="btn-${field}" value="${field}">${title}</button>`;
-			}
-		}
-		// Else provide all tabulator fields as pickable columns
-		else
-		{
-			tabulatorHeaderCollapseHTML += `<button type="button" style="flex:0 0 auto " class="btn ${_bootstrapVersion==3?'btn-default':'btn-outline-secondary flex-shrink-1'} btn-sm btn-select-col ${btn_select_col_selected} " aria-pressed="true" id="btn-${field}" value="${field}">${title}</button>`;
-		}
-	});
+      // If certain columns should be excluded from the column picker (define them in a blacklist array)
+      if (
+        typeof tableWidgetBlacklistArray_columnUnselectable != "undefined" &&
+        Array.isArray(tableWidgetBlacklistArray_columnUnselectable) &&
+        tableWidgetBlacklistArray_columnUnselectable.length
+      ) {
+        if (
+          $.inArray(field, tableWidgetBlacklistArray_columnUnselectable) < 0
+        ) {
+          tabulatorHeaderCollapseHTML += `<button type="button" style="flex:0 0 auto " class="btn ${
+            _bootstrapVersion == 3
+              ? "btn-default"
+              : "btn-outline-secondary flex-shrink-1"
+          } btn-sm btn-select-col ${btn_select_col_selected} " aria-pressed="true" id="btn-${field}" value="${field}">${title}</button>`;
+        }
+      }
+      // Else provide all tabulator fields as pickable columns
+      else {
+        tabulatorHeaderCollapseHTML += `<button type="button" style="flex:0 0 auto " class="btn ${
+          _bootstrapVersion == 3
+            ? "btn-default"
+            : "btn-outline-secondary flex-shrink-1"
+        } btn-sm btn-select-col ${btn_select_col_selected} " aria-pressed="true" id="btn-${field}" value="${field}">${title}</button>`;
+      }
+    });
 
-	
-		tabulatorHeaderCollapseHTML += '</div>'; // end btn-group
-		tabulatorHeaderCollapseHTML += '</div>'; // end panel-body / accordion-body
-		tabulatorHeaderCollapseHTML += '</div>'; // end panel-collapse / accordion-collapse
-		tabulatorHeaderCollapseHTML += '</div>'; // end panel / accordion-item
-		tabulatorHeaderCollapseHTML += '</div>'; // end panel-group / accordion
-		tabulatorHeaderCollapseHTML += ' </div>'; // end col
-		tabulatorHeaderCollapseHTML += ' </div>'; // end row
+  tabulatorHeaderCollapseHTML += "</div>"; // end btn-group
+  tabulatorHeaderCollapseHTML += "</div>"; // end panel-body / accordion-body
+  tabulatorHeaderCollapseHTML += "</div>"; // end panel-collapse / accordion-collapse
+  tabulatorHeaderCollapseHTML += "</div>"; // end panel / accordion-item
+  tabulatorHeaderCollapseHTML += "</div>"; // end panel-group / accordion
+  tabulatorHeaderCollapseHTML += " </div>"; // end col
+  tabulatorHeaderCollapseHTML += " </div>"; // end row
 
-	
-	
-	return tabulatorHeaderCollapseHTML;
+  return tabulatorHeaderCollapseHTML;
 }
 
 // Returns TableWidget Footer HTML (de-/select buttons,...)
-function _renderTabulatorFooterHTML(tableWidgetFooterOptions){
+function _renderTabulatorFooterHTML(tableWidgetFooterOptions) {
+  var tabulatorFooterHTML = "";
 
-	var tabulatorFooterHTML = '';
-
-	// If property selectButtons is true, render 'Alle auswaehlen / Alle abwaehlen' buttons
-	if (typeof tableWidgetFooterOptions.selectButtons != 'undefined' && tableWidgetFooterOptions.selectButtons == true)
-	{
-		tabulatorFooterHTML += 
-		`<div class="btn-toolbar" role="toolbar">
+  // If property selectButtons is true, render 'Alle auswaehlen / Alle abwaehlen' buttons
+  if (
+    typeof tableWidgetFooterOptions.selectButtons != "undefined" &&
+    tableWidgetFooterOptions.selectButtons == true
+  ) {
+    tabulatorFooterHTML += `<div class="btn-toolbar" role="toolbar">
 			<div class="btn-group" role="group">
-				<button id="select-all" class="btn ${_bootstrapVersion==3?'btn-default pull-left':'btn-outline-secondary float-start'} " type="button">
+				<button id="select-all" class="btn ${
+          _bootstrapVersion == 3
+            ? "btn-default pull-left"
+            : "btn-outline-secondary float-start"
+        } " type="button">
 			 		${FHC_PhrasesLib.t("ui", "alleAuswaehlen")}
 				</button>
-				<button id="deselect-all" class="btn ${_bootstrapVersion==3?'btn-default pull-left':'btn-outline-secondary float-start'} " type="button">
+				<button id="deselect-all" class="btn ${
+          _bootstrapVersion == 3
+            ? "btn-default pull-left"
+            : "btn-outline-secondary float-start"
+        } " type="button">
 					${FHC_PhrasesLib.t("ui", "alleAbwaehlen")}
 				</button>
 				<span id="number-selected" style="margin-left: 20px; line-height: 2; font-weight: normal">
@@ -941,16 +959,14 @@ function _renderTabulatorFooterHTML(tableWidgetFooterOptions){
 			</div>
 		</div>
 		</br></br>`;
-	}
+  }
 
-	return tabulatorFooterHTML;
+  return tabulatorFooterHTML;
 }
 
 /**
  * When JQuery is up
  */
-$(document).ready(function() {
-
-	FHC_TableWidget.display();
-
+$(document).ready(function () {
+  FHC_TableWidget.display();
 });

From bebec98285dbe5fffd873ec3805754913ed1edeb Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 23 Apr 2024 13:16:04 +0200
Subject: [PATCH 0625/1461] adds a little space with a br between the
 tablewidget header and the table itself

---
 public/js/TableWidget.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/js/TableWidget.js b/public/js/TableWidget.js
index 3fdc34799..6b96cd85e 100644
--- a/public/js/TableWidget.js
+++ b/public/js/TableWidget.js
@@ -831,6 +831,7 @@ function _renderTabulatorHeaderHTML(tableWidgetDiv) {
 			</button>
 		</div>
 	</div>
+	</br>
 	`;
 
   return tabulatorHeaderHTML;

From 96b79c87402cd4cf128fb15c7248844a85fb88d7 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 23 Apr 2024 13:43:00 +0200
Subject: [PATCH 0626/1461] corrects reviewAnrechnungDetail style typo, and
 adds the height function to the adminAnrechnung table again

---
 .../views/lehre/anrechnung/adminAnrechnungData.php    | 11 ++++++-----
 .../anrechnung/reviewAnrechnungUebersichtData.php     |  4 ++--
 public/js/lehre/anrechnung/reviewAnrechnungDetail.js  |  2 +-
 .../js/lehre/anrechnung/reviewAnrechnungUebersicht.js |  2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/application/views/lehre/anrechnung/adminAnrechnungData.php b/application/views/lehre/anrechnung/adminAnrechnungData.php
index 17e44af71..675b038b7 100644
--- a/application/views/lehre/anrechnung/adminAnrechnungData.php
+++ b/application/views/lehre/anrechnung/adminAnrechnungData.php
@@ -20,16 +20,17 @@ $filterWidgetArray = array(
 		ucfirst($this->p->t('ui', 'bearbeitetVon')),
 	),
 	'datasetRepOptions' => '{
-		
-		layout: "fitColumns",           
+		height: func_height(this),
+		layout: "fitDataFill",           
 		persistentLayout:true,
 		autoResize: false, 				// prevent auto resizing of table (false to allow adapting table size when cols are (de-)activated
+	    headerFilterPlaceholder: " ",
         index: "anrechnungszeitraum_id",         // assign specific column as unique id (important for row indexing)
         selectable: false,                  // allow row selection
 		tableWidgetHeader: true,
-		columnDefaults:{
-			headerFilterPlaceholder: " ",
-		}
+		tableBuilt: function(){
+            func_tableBuilt(this);
+        },
 	 }',
 	'datasetRepFieldsDefs' => '{
 		anrechnungszeitraum_id: {visible: false, headerFilter:"input"},
diff --git a/application/views/lehre/anrechnung/reviewAnrechnungUebersichtData.php b/application/views/lehre/anrechnung/reviewAnrechnungUebersichtData.php
index bb50edd34..8278cc297 100644
--- a/application/views/lehre/anrechnung/reviewAnrechnungUebersichtData.php
+++ b/application/views/lehre/anrechnung/reviewAnrechnungUebersichtData.php
@@ -124,7 +124,7 @@ if ($configFachbereichsleitung === TRUE) {
 
 $filterWidgetArray = array(
 	'query' => $query,
-	'bootstrapVersion'=>5,
+	'bootstrapVersion' => 5,
 	'tableUniqueId' => 'approveAnrechnungUebersicht',
 	'requiredPermissions' => 'lehre/anrechnung_empfehlen',
 	'datasetRepresentation' => 'tabulator',
@@ -173,7 +173,7 @@ $filterWidgetArray = array(
 
 			//columnDefaults tooltip did not work
 
-			tooltip:true,
+			tooltip:func_tooltips,
 			headerFilterPlaceholder: " ",
 			
 		}
diff --git a/public/js/lehre/anrechnung/reviewAnrechnungDetail.js b/public/js/lehre/anrechnung/reviewAnrechnungDetail.js
index 4f7de743f..beba986ca 100644
--- a/public/js/lehre/anrechnung/reviewAnrechnungDetail.js
+++ b/public/js/lehre/anrechnung/reviewAnrechnungDetail.js
@@ -214,7 +214,7 @@ var reviewAnrechnung = {
                 $('#reviewAnrechnungDetail-status_kurzbz').closest('div').addClass('bg-info-subtle');
                 break;
             default:
-                $('#reviewAnrechnungDetail-status_kurzbz').closest('div').addClass('bg-warning-stubtle');
+                $('#reviewAnrechnungDetail-status_kurzbz').closest('div').addClass('bg-warning-subtle');
         }
     },
     setEmpfehlungstext: function () {
diff --git a/public/js/lehre/anrechnung/reviewAnrechnungUebersicht.js b/public/js/lehre/anrechnung/reviewAnrechnungUebersicht.js
index 4a89dfdd1..91ff22801 100644
--- a/public/js/lehre/anrechnung/reviewAnrechnungUebersicht.js
+++ b/public/js/lehre/anrechnung/reviewAnrechnungUebersicht.js
@@ -138,7 +138,7 @@ function func_tooltips(e, cell, onRendered) {
   //e - mouseover event
   //cell - cell component
   //onRendered - onRendered callback registration functionfunction
-
+  console.log("this is a tooltip");
   // Return tooltip if row is unselectable
   if (!func_selectableCheck(cell.getRow())) {
     return FHC_PhrasesLib.t("ui", "nichtSelektierbarAufgrundVon") + "Status";

From 633b9eeafe5a1daf2f774cf2d32bb8142088ad05 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 23 Apr 2024 17:00:32 +0200
Subject: [PATCH 0627/1461] loading STG permissions for assistenz into frontend
 and only fetching entschuldigungsdata for those; new data fetch api methods
 for lektor to visualize graphs: getAllByLva & getAllByStudiengang. old one
 renamed to getAllByLvaAssigned; automatic email to responsible adress on
 entschuldigung upload of a student; focused on pie charts for reusable
 landing page design; fixed entschuldigungen date filter validation; WIP
 extension specific phrases;

---
 system/phrasesupdate.php | 307 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 306 insertions(+), 1 deletion(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 1144eed90..0d5ff9125 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -24598,7 +24598,312 @@ array(
 				'insertvon' => 'system'
 			)
 		)
-	)
+	),
+
+	// FHC-CORE-ANWESENHEITEN BEGIN
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'anwesend',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'anwesend',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'attending',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'abwesend',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'abwesend',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'absent',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'entschuldigt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'entschuldigt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'excused',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'entschuldigungAbgelehnt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Entschuldigung abgelehnt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'excuse note declined',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'entschuldigungAngenommen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Entschuldigung akzeptiert',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'excuse note accepted',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'entschuldigungOffen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Entschuldigung offen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'excuse note open',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'anwesenheiten',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anwesenheiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Attendances',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'entschuldigungen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Entschuldigungen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Excuse Notes',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'codeEingeben',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Code eingeben',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Enter Code',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'codeEingeben',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Code eingeben',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Enter Code',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'codeSenden',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Code eingeben',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Send Code',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'anwesenheitenverwaltung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anwesenheitenverwaltung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Attendance Management',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'bitteZugangscodeEingeben',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bitte Zugangscode eingeben.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Please enter an access code.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'eintragErfolgreich',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Eintrag erfolgreich!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Entry successful!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'wurdeRegistriert',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'wurde registriert',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'has been registered.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+
+
+	// FHC-CORE-ANWESENHEITEN END
 );
 
 

From 7dfe2f1932649f2f4c7442e88bb2ac7c3f2eb484 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 24 Apr 2024 10:00:12 +0200
Subject: [PATCH 0628/1461] tabulator5 function changes

---
 .../lehre/anrechnung/adminAnrechnungData.php  |  4 +++-
 .../approveAnrechnungUebersichtData.php       |  4 +---
 .../reviewAnrechnungUebersichtData.php        |  3 ---
 .../lehrauftrag/acceptLehrauftragData.php     |  1 -
 .../lehrauftrag/approveLehrauftragData.php    |  1 -
 .../lehrauftrag/cancelledLehrauftragData.php  |  1 -
 .../lehrauftrag/orderLehrauftragData.php      |  1 -
 public/css/Tabulator5.css                     |  6 ++++++
 public/css/lehre/anrechnung.css               |  1 +
 .../anrechnung/approveAnrechnungUebersicht.js | 21 -------------------
 .../anrechnung/reviewAnrechnungUebersicht.js  | 13 ------------
 .../js/lehre/lehrauftrag/acceptLehrauftrag.js |  2 --
 .../js/lehre/lehrauftrag/orderLehrauftrag.js  |  3 ---
 13 files changed, 11 insertions(+), 50 deletions(-)

diff --git a/application/views/lehre/anrechnung/adminAnrechnungData.php b/application/views/lehre/anrechnung/adminAnrechnungData.php
index 675b038b7..e39e4086d 100644
--- a/application/views/lehre/anrechnung/adminAnrechnungData.php
+++ b/application/views/lehre/anrechnung/adminAnrechnungData.php
@@ -24,13 +24,15 @@ $filterWidgetArray = array(
 		layout: "fitDataFill",           
 		persistentLayout:true,
 		autoResize: false, 				// prevent auto resizing of table (false to allow adapting table size when cols are (de-)activated
-	    headerFilterPlaceholder: " ",
         index: "anrechnungszeitraum_id",         // assign specific column as unique id (important for row indexing)
         selectable: false,                  // allow row selection
 		tableWidgetHeader: true,
 		tableBuilt: function(){
             func_tableBuilt(this);
         },
+		columnDefaults:{
+			headerFilterPlaceholder:" ",
+		},
 	 }',
 	'datasetRepFieldsDefs' => '{
 		anrechnungszeitraum_id: {visible: false, headerFilter:"input"},
diff --git a/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php b/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
index 903509ebe..c017e2387 100644
--- a/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
+++ b/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
@@ -219,9 +219,7 @@ $filterWidgetArray = array(
 		selectableCheck: function(row){
             return func_selectableCheck(row);
         },
-        rowFormatter:function(row){
-            func_rowFormatter(row,this);
-        },
+		
 		columnDefaults:{
 			
 			//columnDefaults tooltip did not work
diff --git a/application/views/lehre/anrechnung/reviewAnrechnungUebersichtData.php b/application/views/lehre/anrechnung/reviewAnrechnungUebersichtData.php
index 8278cc297..2b7701bca 100644
--- a/application/views/lehre/anrechnung/reviewAnrechnungUebersichtData.php
+++ b/application/views/lehre/anrechnung/reviewAnrechnungUebersichtData.php
@@ -166,9 +166,6 @@ $filterWidgetArray = array(
 		selectableCheck: function(row){
             return func_selectableCheck(row);
         },
-        rowFormatter:function(row){
-            func_rowFormatter(row);
-        },
         columnDefaults:{
 
 			//columnDefaults tooltip did not work
diff --git a/application/views/lehre/lehrauftrag/acceptLehrauftragData.php b/application/views/lehre/lehrauftrag/acceptLehrauftragData.php
index d4f574312..fcc4759db 100644
--- a/application/views/lehre/lehrauftrag/acceptLehrauftragData.php
+++ b/application/views/lehre/lehrauftrag/acceptLehrauftragData.php
@@ -294,7 +294,6 @@ ORDER BY "akzeptiert" NULLS FIRST, "erteilt" NULLS LAST, "bestellt"
 
 $filterWidgetArray = array(
     'query' => $query,
-    'bootstrapVersion'=>5,
     'tableUniqueId' => 'acceptLehrauftrag',
     'requiredPermissions' => 'lehre/lehrauftrag_akzeptieren',
     'datasetRepresentation' => 'tabulator',
diff --git a/application/views/lehre/lehrauftrag/approveLehrauftragData.php b/application/views/lehre/lehrauftrag/approveLehrauftragData.php
index 7af8619e8..7dd3822a6 100644
--- a/application/views/lehre/lehrauftrag/approveLehrauftragData.php
+++ b/application/views/lehre/lehrauftrag/approveLehrauftragData.php
@@ -305,7 +305,6 @@ ORDER BY "typ" DESC, "auftrag", "personalnummer" DESC, "lektor", "bestellt", "er
 
 $filterWidgetArray = array(
     'query' => $query,
-    'bootstrapVersion'=>5,
     'tableUniqueId' => 'approveLehrauftrag',
     'requiredPermissions' => 'lehre/lehrauftrag_erteilen',
     'datasetRepresentation' => 'tabulator',
diff --git a/application/views/lehre/lehrauftrag/cancelledLehrauftragData.php b/application/views/lehre/lehrauftrag/cancelledLehrauftragData.php
index 219bd7cc5..f446cae25 100644
--- a/application/views/lehre/lehrauftrag/cancelledLehrauftragData.php
+++ b/application/views/lehre/lehrauftrag/cancelledLehrauftragData.php
@@ -50,7 +50,6 @@ $query = '
 
 $tableWidgetArray = array(
 	'query' => $query,
-    'bootstrapVersion' => 5,
 	'tableUniqueId' => 'cancelledLehrauftrag',
 	'requiredPermissions' => 'lehre/lehrauftrag_akzeptieren',
 	'datasetRepresentation' => 'tabulator',
diff --git a/application/views/lehre/lehrauftrag/orderLehrauftragData.php b/application/views/lehre/lehrauftrag/orderLehrauftragData.php
index 5cc4fa594..f5b5cf6ce 100644
--- a/application/views/lehre/lehrauftrag/orderLehrauftragData.php
+++ b/application/views/lehre/lehrauftrag/orderLehrauftragData.php
@@ -334,7 +334,6 @@ ORDER BY "typ" DESC, "auftrag", "personalnummer" DESC, "lektor", "bestellt"
 ';
 $filterWidgetArray = array(
     'query' => $query,
-    'bootstrapVersion'=>5,
 	'tableUniqueId' => 'orderLehrauftrag',
     'requiredPermissions' => 'lehre/lehrauftrag_bestellen',
     'datasetRepresentation' => 'tabulator',
diff --git a/public/css/Tabulator5.css b/public/css/Tabulator5.css
index a60b175d8..b10a307ae 100644
--- a/public/css/Tabulator5.css
+++ b/public/css/Tabulator5.css
@@ -39,6 +39,12 @@
 	z-index: 999999;
 }
 
+/* classes for rows that are not selectable in the tabulator */
+.tabulator-row.tabulator-unselectable{
+	color:var(--bs-gray-500);
+	
+}
+
 /* using bootstrap background classes to style the background color of tabulator rows */
 /* bg-warning */
 /* odd-rows */
diff --git a/public/css/lehre/anrechnung.css b/public/css/lehre/anrechnung.css
index b19099f7e..50914aa1f 100644
--- a/public/css/lehre/anrechnung.css
+++ b/public/css/lehre/anrechnung.css
@@ -1,3 +1,4 @@
+
 .btn-w200
 {
     width: 200px;
diff --git a/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js b/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
index a98149040..2d68a310b 100644
--- a/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
+++ b/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
@@ -184,28 +184,7 @@ var format_ectsSumBisherUndNeu = function (cell, formatterParams, onRendered) {
   );
 };
 
-// Formats the rows
-function func_rowFormatter(row) {
-  let status_kurzbz = row.getData().status_kurzbz;
 
-  // If status is anything else then 'Bearbeitet von STGL-Leitung'
-  if (status_kurzbz != ANRECHNUNGSTATUS_PROGRESSED_BY_STGL) {
-    // Disable new selection of updated rows
-    row.getElement().style["pointerEvents"] = "none";
-
-    // ...but leave url links selectable
-    row.getCell("dokument_bezeichnung").getElement().firstChild.style[
-      "pointerEvents"
-    ] = "auto";
-    if (row.getCell("details")) {
-      row.getCell("details").getElement().firstChild.style["pointerEvents"] =
-        "auto";
-    }
-
-    // Color background grey
-    row.getElement().style["background-color"] = COLOR_LIGHTGREY; // default
-  }
-}
 
 // Formats row selectable/unselectable
 function func_selectableCheck(row) {
diff --git a/public/js/lehre/anrechnung/reviewAnrechnungUebersicht.js b/public/js/lehre/anrechnung/reviewAnrechnungUebersicht.js
index 91ff22801..d0004ba3a 100644
--- a/public/js/lehre/anrechnung/reviewAnrechnungUebersicht.js
+++ b/public/js/lehre/anrechnung/reviewAnrechnungUebersicht.js
@@ -88,20 +88,7 @@ function func_tableBuilt(table) {
   table.tabulator("redraw", true);
 }
 
-// Formats the rows
-function func_rowFormatter(row) {
-  let status_kurzbz = row.getData().status_kurzbz;
-  let empfehlungsberechtigt = row.getData().empfehlungsberechtigt;
 
-  row.getCells().forEach(function (cell) {
-    if (
-      status_kurzbz != ANRECHNUNGSTATUS_PROGRESSED_BY_LEKTOR ||
-      empfehlungsberechtigt == "false"
-    ) {
-      row.getElement().style["background-color"] = COLOR_LIGHTGREY; // default
-    }
-  });
-}
 
 // Formats row selectable/unselectable
 function func_selectableCheck(row) {
diff --git a/public/js/lehre/lehrauftrag/acceptLehrauftrag.js b/public/js/lehre/lehrauftrag/acceptLehrauftrag.js
index 0e0cbb4a1..cba4b4f39 100644
--- a/public/js/lehre/lehrauftrag/acceptLehrauftrag.js
+++ b/public/js/lehre/lehrauftrag/acceptLehrauftrag.js
@@ -149,8 +149,6 @@ function func_rowFormatter(row) {
       return; // bestellte + erteilte
     } else if (bestellt != null && erteilt != null && akzeptiert != null) {
       cell.getElement().classList.add("bg-success"); // akzeptierte
-    } else {
-      row.getElement().style["background-color"] = COLOR_LIGHTGREY; // default
     }
   });
 }
diff --git a/public/js/lehre/lehrauftrag/orderLehrauftrag.js b/public/js/lehre/lehrauftrag/orderLehrauftrag.js
index 4dc266139..23acacd37 100644
--- a/public/js/lehre/lehrauftrag/orderLehrauftrag.js
+++ b/public/js/lehre/lehrauftrag/orderLehrauftrag.js
@@ -207,9 +207,6 @@ function func_rowFormatter(row) {
     } else if (bestellt != null && erteilt != null && akzeptiert != null) {
       cell.getElement().classList.add("bg-success"); // akzeptiert
     }
-
-    // default color is already set in the Tabulator5.css file that gets loaded the Header flag tabulator5
-    // row.getElement().style["background-color"] = COLOR_LIGHTGREY;   // default
   });
 }
 

From 5a62dbc74037f3ab962d76741926dc8490f3f38e Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 24 Apr 2024 11:35:02 +0200
Subject: [PATCH 0629/1461] refactors the adminAnrechnung page because it is
 used in an bootstrap3 environment

---
 application/views/lehre/anrechnung/adminAnrechnung.php | 2 +-
 public/js/lehre/anrechnung/adminAnrechnung.js          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/views/lehre/anrechnung/adminAnrechnung.php b/application/views/lehre/anrechnung/adminAnrechnung.php
index 5c911d388..0656d8301 100644
--- a/application/views/lehre/anrechnung/adminAnrechnung.php
+++ b/application/views/lehre/anrechnung/adminAnrechnung.php
@@ -3,7 +3,7 @@ $includesArray = array(
     'title' => $this->p->t('anrechnung', 'anrechnungenVerwalten'),
     'jquery3' => true,
     'jqueryui1' => true,
-    'bootstrap5' => true,
+    'bootstrap3' => true,
     'fontawesome6' => true,
     'ajaxlib' => true,
     'dialoglib' => true,
diff --git a/public/js/lehre/anrechnung/adminAnrechnung.js b/public/js/lehre/anrechnung/adminAnrechnung.js
index 30f5960ce..200b5854c 100644
--- a/public/js/lehre/anrechnung/adminAnrechnung.js
+++ b/public/js/lehre/anrechnung/adminAnrechnung.js
@@ -47,7 +47,7 @@ var addActionButtons = function (cell) {
   editBtn.innerHTML = '<i class="fa fa-edit"></i>';
   editBtn.classList.add("azrEditBtn");
   editBtn.classList.add("btn");
-  editBtn.classList.add("btn-outline-secondary");
+  editBtn.classList.add("btn-default");
   editBtn.addEventListener("click", function () {
     adminAnrechnung.editRow(cell);
   });
@@ -58,7 +58,7 @@ var addActionButtons = function (cell) {
   delBtn.innerHTML = '<i class="fa fa-times"></i>';
   delBtn.classList.add("azrDeleteBtn");
   delBtn.classList.add("btn");
-  delBtn.classList.add("btn-outline-secondary");
+  delBtn.classList.add("btn-default");
   delBtn.style.marginLeft = "5px";
   delBtn.addEventListener("click", function () {
     adminAnrechnung.deleteRow(cell);

From 1b19a0821fce8e28e7a88bd2ef7efc6da31188aa Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 24 Apr 2024 14:02:58 +0200
Subject: [PATCH 0630/1461] Konto filters for Student list

---
 .../controllers/components/stv/Students.php   | 51 ++++++++++++++++++
 public/css/Studentenverwaltung.css            |  4 ++
 .../Stv/Studentenverwaltung/List.js           | 54 +++++++++++++++++--
 public/js/components/filter/Filter.js         | 10 +++-
 4 files changed, 114 insertions(+), 5 deletions(-)

diff --git a/application/controllers/components/stv/Students.php b/application/controllers/components/stv/Students.php
index 9bd2df73f..decf1b66a 100644
--- a/application/controllers/components/stv/Students.php
+++ b/application/controllers/components/stv/Students.php
@@ -320,6 +320,8 @@ class Students extends FHC_Controller
 				break;
 		}
 
+		$this->addFilter($studiensemester_kurzbz);
+
 		$this->outputJson([]);
 	}
 
@@ -426,6 +428,8 @@ class Students extends FHC_Controller
 
 		}
 
+		$this->addFilter($studiensemester_kurzbz);
+
 		$result = $this->PrestudentModel->loadWhere($where);
 		
 		if (isError($result)) {
@@ -497,6 +501,8 @@ class Students extends FHC_Controller
 		$this->PrestudentModel->addSelect('p.zugangscode');
 		$this->PrestudentModel->addSelect('p.bpk');
 
+		$this->addFilter($studiensemester_kurzbz);
+
 		$result = $this->PrestudentModel->loadWhere([
 			'tbl_prestudent.prestudent_id' => $prestudent_id
 		]);
@@ -570,6 +576,8 @@ class Students extends FHC_Controller
 		$this->PrestudentModel->addSelect('p.zugangscode');
 		$this->PrestudentModel->addSelect('p.bpk');
 
+		$this->addFilter($studiensemester_kurzbz);
+
 		$result = $this->PrestudentModel->loadWhere([
 			's.student_uid' => $student_uid
 		]);
@@ -643,6 +651,8 @@ class Students extends FHC_Controller
 		$this->PrestudentModel->addSelect('p.zugangscode');
 		$this->PrestudentModel->addSelect('p.bpk');
 
+		$this->addFilter($studiensemester_kurzbz);
+
 		$result = $this->PrestudentModel->loadWhere([
 			'p.person_id' => $person_id
 		]);
@@ -654,4 +664,45 @@ class Students extends FHC_Controller
 			$this->outputJson(getData($result) ?: []);
 		}
 	}
+
+	/**
+	 * Adds additional filters to the query
+	 *
+	 * @param string		$studiensemester_kurzbz
+	 *
+	 * @return void
+	 */
+	protected function addFilter($studiensemester_kurzbz)
+	{
+		$filter = $this->input->get('filter');
+		if (isset($filter['konto_count_0'])) {
+			$bt = $this->PrestudentModel->escape($filter['konto_count_0']);
+			$stdsem = $this->PrestudentModel->escape($studiensemester_kurzbz);
+
+			$this->PrestudentModel->db->where('(
+				SELECT count(*) 
+				FROM public.tbl_konto 
+				WHERE person_id=tbl_prestudent.person_id 
+				AND buchungstyp_kurzbz=' . $bt . ' 
+				AND studiensemester_kurzbz=' . $stdsem . '
+			) =', 0);
+			$this->PrestudentModel->db->where('get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) !=', 'Incoming');
+		}
+		if (isset($filter['konto_missing_counter'])) {
+			$bt = $this->PrestudentModel->escape($filter['konto_missing_counter']);
+			$stg = '';
+			if ($this->variablelib->getVar('kontofilterstg') == 'true')
+				$stg = ' AND studiengang_kz=tbl_prestudent.studiengang_kz';
+
+			$bt = $bt == 'alle' ? '' : ' AND buchungstyp_kurzbz=' . $bt;
+
+			$this->PrestudentModel->db->where('(
+				SELECT sum(betrag) 
+				FROM public.tbl_konto 
+				WHERE person_id=tbl_prestudent.person_id' .
+				$bt .
+				$stg . '
+			) !=', 0);
+		}
+	}
 }
diff --git a/public/css/Studentenverwaltung.css b/public/css/Studentenverwaltung.css
index d29455097..1fa35623e 100644
--- a/public/css/Studentenverwaltung.css
+++ b/public/css/Studentenverwaltung.css
@@ -104,3 +104,7 @@ html {
 	background-color: #f8d7da!important;
 	border-color: #f5c2c7!important;
 }
+
+.has-filter .fa-filter {
+	color: var(--bs-success);
+}
diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index c9c5ecb26..31f7d0963 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -7,6 +7,9 @@ export default {
 		CoreFilterCmpt,
 		ListNew
 	},
+	inject: [
+		'lists'
+	],
 	props: {
 		selected: Array,
 		studiengangKz: Number,
@@ -79,7 +82,9 @@ export default {
 				}
 			],
 			focusObj: null, // TODO(chris): this should be in the filter component
-			lastSelected: null
+			lastSelected: null,
+			filterKontoCount0: undefined,
+			filterKontoMissingCounter: undefined
 		}
 	},
 	methods: {
@@ -110,17 +115,29 @@ export default {
 		},
 		updateUrl(url, first) {
 			this.lastSelected = first ? undefined : this.selected;
+
 			if (url)
 				url = CoreRESTClient._generateRouterURI(url);
+
+			const params = {}, filter = {};
+			if (this.filterKontoCount0)
+				filter.konto_count_0 = this.filterKontoCount0;
+			if (this.filterKontoMissingCounter)
+				filter.konto_missing_counter = this.filterKontoMissingCounter;
+
+			if (filter.konto_count_0 || filter.konto_missing_counter)
+				params.filter = filter;
+
 			if (!this.$refs.table.tableBuilt) {
 				if (!this.$refs.table.tabulator) {
 					this.tabulatorOptions.ajaxURL = url;
+					this.tabulatorOptions.ajaxParams = params;
 				} else
 					this.$refs.table.tabulator.on("tableBuilt", () => {
-						this.$refs.table.tabulator.setData(url);
+						this.$refs.table.tabulator.setData(url, params);
 					});
 			} else
-				this.$refs.table.tabulator.setData(url);
+				this.$refs.table.tabulator.setData(url, params);
 		},
 		onKeydown(e) { // TODO(chris): this should be in the filter component
 			if (!this.focusObj)
@@ -179,7 +196,7 @@ export default {
 	// TODO(chris): filter component column chooser has no accessibilty features
 	template: `
 	<div class="stv-list h-100 pt-3">
-		<div class="tablulator-container d-flex flex-column h-100" tabindex="0" @focusin="onFocus" @focusout="onBlur" @keydown="onKeydown">
+		<div class="tablulator-container d-flex flex-column h-100" :class="{'has-filter': filterKontoCount0 || filterKontoMissingCounter}" tabindex="0" @focusin="onFocus" @focusout="onBlur" @keydown="onKeydown">
 			<core-filter-cmpt
 				ref="table"
 				:tabulator-options="tabulatorOptions"
@@ -191,6 +208,35 @@ export default {
 				new-btn-label="InteressentIn"
 				@click:new="actionNewPrestudent"
 			>
+			<template #filter>
+				<div class="card">
+					<div class="card-body">
+						<div class="input-group mb-3">
+							<label class="input-group-text col-4" for="stv-list-filter-konto-count-0">Liste filtern auf nicht belastet:</label>
+							<select class="form-select" id="stv-list-filter-konto-count-0" v-model="filterKontoCount0" @input="$nextTick(updateUrl)">
+								<option v-for="typ in lists.buchungstypen" :key="typ.buchungstyp_kurzbz" :value="typ.buchungstyp_kurzbz">
+									{{ typ.beschreibung }}
+								</option>
+							</select>
+							<button v-if="filterKontoCount0" class="btn btn-outline-secondary" @click="filterKontoCount0 = undefined; updateUrl()">
+								<i class="fa fa-times"></i>
+							</button>
+						</div>
+						<div class="input-group">
+							<label class="input-group-text col-4" for="stv-list-filter-konto-missing-counter">Liste filtern auf fehlende Gegenbuchungen:</label>
+							<select class="form-select" id="stv-list-filter-konto-missing-counter" v-model="filterKontoMissingCounter" @input="$nextTick(updateUrl)">
+								<option value="alle">alle Buchungstypen</option>
+								<option v-for="typ in lists.buchungstypen" :key="typ.buchungstyp_kurzbz" :value="typ.buchungstyp_kurzbz">
+									{{ typ.beschreibung }}
+								</option>
+							</select>
+							<button v-if="filterKontoMissingCounter" class="btn btn-outline-secondary" @click="filterKontoMissingCounter = undefined; updateUrl()">
+								<i class="fa fa-times"></i>
+							</button>
+						</div>
+					</div>
+				</div>
+			</template>
 			</core-filter-cmpt>
 		</div>
 		<list-new ref="new" :studiengang-kz="studiengangKz" :studiensemester-kurzbz="studiensemesterKurzbz"></list-new>
diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index d4c51c37c..1cf6e6425 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -543,7 +543,7 @@ export const CoreFilterCmpt = {
 				</div>
 				<div class="d-flex gap-1 align-items-baseline flex-grow-1 justify-content-end">
 					<span v-if="!tableOnly">[ {{ filterName }} ]</span>
-					<a v-if="!tableOnly" href="#" class="btn btn-link px-0 text-dark" data-bs-toggle="collapse" :data-bs-target="'#collapseFilters' + idExtra">
+					<a v-if="!tableOnly || $slots.filter" href="#" class="btn btn-link px-0 text-dark" data-bs-toggle="collapse" :data-bs-target="'#collapseFilters' + idExtra">
 						<span class="fa-solid fa-xl fa-filter"></span>
 					</a>
 					<a href="#" class="btn btn-link px-0 text-dark" data-bs-toggle="collapse" :data-bs-target="'#collapseColumns' + idExtra">
@@ -576,6 +576,14 @@ export const CoreFilterCmpt = {
 				@apply-filter-config="applyFilterConfig"
 				@save-custom-filter="handlerSaveCustomFilter"
 			></filter-config>
+			<div
+				v-else-if="$slots.filter"
+				:id="'collapseFilters' + idExtra"
+				class="card-body collapse"
+				:data-bs-parent="'#filterCollapsables' + idExtra"
+				>
+				<slot name="filter"></slot>
+			</div>
 		</div>
 
 		<!-- Tabulator -->

From b1e85fe92b8bb185ce9d0786facd947c0640e669 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Wed, 24 Apr 2024 14:18:55 +0200
Subject: [PATCH 0631/1461] - international skills auf vuejs - note uebernehmen
 hinzugefuegt

---
 application/models/education/Lvgesamtnote_model.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/models/education/Lvgesamtnote_model.php b/application/models/education/Lvgesamtnote_model.php
index f0c1883de..975833287 100644
--- a/application/models/education/Lvgesamtnote_model.php
+++ b/application/models/education/Lvgesamtnote_model.php
@@ -10,5 +10,6 @@ class Lvgesamtnote_model extends DB_Model
 		parent::__construct();
 		$this->dbTable = 'campus.tbl_lvgesamtnote';
 		$this->pk = array('student_uid', 'studiensemester_kurzbz', 'lehrveranstaltung_id');
+		$this->hasSequence = false;
 	}
 }

From c15a350392d9801cc4eb9156b652ef881e8a2da0 Mon Sep 17 00:00:00 2001
From: Werner Masik <werner@gefi.at>
Date: Wed, 24 Apr 2024 14:55:22 +0200
Subject: [PATCH 0632/1461] moved dbUpdate for gehaltsband to extension

---
 system/dbupdate_3.4/37133_gehaltsbaender.php | 85 --------------------
 1 file changed, 85 deletions(-)
 delete mode 100644 system/dbupdate_3.4/37133_gehaltsbaender.php

diff --git a/system/dbupdate_3.4/37133_gehaltsbaender.php b/system/dbupdate_3.4/37133_gehaltsbaender.php
deleted file mode 100644
index 3c34883f6..000000000
--- a/system/dbupdate_3.4/37133_gehaltsbaender.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-if (! defined('DB_NAME')) exit('No direct script access allowed');
-
-if ($result = $db->db_query("SELECT * FROM information_schema.tables WHERE table_name='tbl_frist' AND table_schema='hr'"))
-{
-	if ($db->db_num_rows($result) == 0)
-	{
-		$qry = "
-        
-        CREATE TABLE IF NOT EXISTS hr.tbl_gehaltsband (
-            gehaltsband_kurzbz character varying(32) NOT NULL,
-            bezeichnung varchar(32) NOT NULL,
-            aktiv boolean DEFAULT FALSE,
-            sort smallint,
-            insertvon character varying(32) NOT NULL,
-            insertamum timestamp without time zone DEFAULT now() NOT NULL,
-            updatevon character varying(32),
-            updateamum timestamp without time zone,
-            CONSTRAINT tbl_gehaltsband_pkey PRIMARY KEY (gehaltsband_kurzbz)
-        );
-
-        CREATE TABLE IF NOT EXISTS hr.tbl_gehaltsband_funktion (
-            gehaltsband_funktion_id bigserial NOT NULL,
-            gehaltsband_kurzbz varchar(32) NOT NULL,
-            funktion_kurzbz varchar(32) NOT NULL,
-            oe_kurzbz varchar(32),
-            organisationseinheittyp_kurzbz varchar(32),
-            insertvon character varying(32) NOT NULL,
-            insertamum timestamp without time zone DEFAULT now() NOT NULL,
-            updatevon character varying(32),
-            updateamum timestamp without time zone
-        );
-
-        CREATE TABLE IF NOT EXISTS hr.tbl_gehaltsband_betrag (
-            gehaltsband_betrag_id bigserial NOT NULL,
-            gehaltsband_kurzbz character varying(32) NOT NULL,
-            von date,
-            bis date,
-            betrag_von numeric(9,5),
-            betrag_bis numeric(9,5),
-            insertvon character varying(32) NOT NULL,
-            insertamum timestamp without time zone DEFAULT now() NOT NULL,
-            updatevon character varying(32),
-            updateamum timestamp without time zone,
-            CONSTRAINT tbl_gehaltsband_betrag_pkey PRIMARY KEY (gehaltsband_betrag_id)
-        );
-
-        ALTER TABLE hr.tbl_gehaltsband_betrag ADD CONSTRAINT tbl_gehaltsband_betrag_gehaltsband_kurzbz_fk FOREIGN KEY (gehaltsband_kurzbz)
-		REFERENCES hr.tbl_gehaltsband (gehaltsband_kurzbz) MATCH FULL
-		ON DELETE SET NULL ON UPDATE CASCADE;
-
-        ALTER TABLE hr.tbl_gehaltsband_funktion ADD CONSTRAINT tbl_gehaltsband_funktion_oe_kurzbz_fk FOREIGN KEY (oe_kurzbz)
-		REFERENCES public.tbl_organisationseinheit (oe_kurzbz) MATCH FULL
-		ON DELETE SET NULL ON UPDATE CASCADE;
-        
-        ALTER TABLE hr.tbl_gehaltsband_funktion ADD CONSTRAINT tbl_gehaltsband_funktion_organisationseinheittyp_kurzbz_fk FOREIGN KEY (organisationseinheittyp_kurzbz)
-		REFERENCES public.tbl_organisationseinheittyp (organisationseinheittyp_kurzbz) MATCH FULL
-		ON DELETE SET NULL ON UPDATE CASCADE;
-
-        COMMENT ON TABLE hr.tbl_gehaltsband IS E'Definition of salary range types';
-        COMMENT ON TABLE hr.tbl_gehaltsband_funktion IS E'job functions assigned to salary range';
-        COMMENT ON TABLE hr.tbl_gehaltsband_betrag IS E'salary range (time dependend)';
-
-        GRANT SELECT, UPDATE, INSERT, DELETE ON hr.tbl_gehaltsband TO vilesci;
-        GRANT SELECT, UPDATE, INSERT, DELETE ON hr.tbl_gehaltsband_betrag TO vilesci;
-	    GRANT USAGE ON hr.tbl_gehaltsband_betrag_gehaltsband_betrag_id_seq TO vilesci;
-        GRANT USAGE ON hr.tbl_gehaltsband_funktion_gehaltsband_funktion_id_seq TO vilesci;
-
-        INSERT INTO hr.tbl_gehaltsband(gehaltsband_kurzbz, bezeichnung, aktiv, sort, insertvon) VALUES('ASSISTENTIN','AssistentIn', 't', 1, 'system');
-        INSERT INTO hr.tbl_gehaltsband(gehaltsband_kurzbz, bezeichnung, aktiv, sort, insertvon) VALUES('JUNIOR_LECTURER_RESEARCHER','Junior Lecturer/Researcher', 't', 2, 'system');
-        INSERT INTO hr.tbl_gehaltsband(gehaltsband_kurzbz, bezeichnung, aktiv, sort, insertvon) VALUES('LECTURER_RESEARCHER','Lecturer/Researcher', 't', 3, 'system');
-        INSERT INTO hr.tbl_gehaltsband(gehaltsband_kurzbz, bezeichnung, aktiv, sort, insertvon) VALUES('SENIOR_LECTURER_RESEARCHER','Senior Lecturer/Researcher', 't', 4, 'system');
-        INSERT INTO hr.tbl_gehaltsband(gehaltsband_kurzbz, bezeichnung, aktiv, sort, insertvon) VALUES('STUDIENGANGSLEITERIN','StudiengangsleiterIn', 't', 5, 'system');
-        INSERT INTO hr.tbl_gehaltsband(gehaltsband_kurzbz, bezeichnung, aktiv, sort, insertvon) VALUES('KOMPETENZFELDLEITERIN','KompetanzfeldleiterIn', 't', 6, 'system');
-        INSERT INTO hr.tbl_gehaltsband(gehaltsband_kurzbz, bezeichnung, aktiv, sort, insertvon) VALUES('DEPARTMENTLEITERIN','DepartmentleiterIn', 't', 7, 'system');
-        INSERT INTO hr.tbl_gehaltsband(gehaltsband_kurzbz, bezeichnung, aktiv, sort, insertvon) VALUES('FAKULTAETSLEITERIN','FakultätsleiterIn', 't', 8, 'system');
-
-        ";
-    
-        if (! $db->db_query($qry))
-            echo '<strong>Fristenmanagement: ' . $db->db_last_error() . '</strong><br>';
-        else
-            echo 'Fristenmanagementtabellen wurden neu erstellt';
-    }
-}

From cea06994dec0b76f8fdc93a54617402969446849 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 24 Apr 2024 14:59:46 +0200
Subject: [PATCH 0633/1461] fixes the bug with the columnDefault tooltips that
 was inside the TableWidget.js file

---
 .../approveAnrechnungUebersichtData.php         |  7 +------
 .../reviewAnrechnungUebersichtData.php          |  4 ----
 public/js/TableWidget.js                        | 17 +++++++++--------
 .../anrechnung/approveAnrechnungUebersicht.js   | 14 +++++---------
 .../anrechnung/reviewAnrechnungUebersicht.js    |  2 +-
 5 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php b/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
index c017e2387..419dc6331 100644
--- a/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
+++ b/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
@@ -221,12 +221,7 @@ $filterWidgetArray = array(
         },
 		
 		columnDefaults:{
-			
-			//columnDefaults tooltip did not work
-			
-			tooltip:function(e, cell, onRendered){
-				return func_tooltips(cell);
-			},
+			tooltip:func_tooltips,
 			headerFilterPlaceholder: " ",
 		}
 		
diff --git a/application/views/lehre/anrechnung/reviewAnrechnungUebersichtData.php b/application/views/lehre/anrechnung/reviewAnrechnungUebersichtData.php
index 2b7701bca..1bd5c667f 100644
--- a/application/views/lehre/anrechnung/reviewAnrechnungUebersichtData.php
+++ b/application/views/lehre/anrechnung/reviewAnrechnungUebersichtData.php
@@ -167,12 +167,8 @@ $filterWidgetArray = array(
             return func_selectableCheck(row);
         },
         columnDefaults:{
-
-			//columnDefaults tooltip did not work
-
 			tooltip:func_tooltips,
 			headerFilterPlaceholder: " ",
-			
 		}
         
 	 }', // tabulator properties
diff --git a/public/js/TableWidget.js b/public/js/TableWidget.js
index 6b96cd85e..b45ba9988 100644
--- a/public/js/TableWidget.js
+++ b/public/js/TableWidget.js
@@ -551,14 +551,15 @@ var FHC_TableWidget = {
       // ...if there are data to be displayed...
       if (data.hasOwnProperty("dataset") && $.isArray(data.dataset)) {
         if (options == null) options = {};
-        options.columnDefaults = {
-          // set header tooltip with column title
-          //! the old keyword is tooltipsHeader, the new keyword for the option is headerTooltip
-          headerTooltip:
-            typeof options.columnDefaults?.tooltipsHeader == "undefined"
-              ? true
-              : options.columnDefaults?.tooltipsHeader,
-        };
+        options.columnDefaults={
+            ...(options.columnDefaults||{}),  
+            headerTooltip:
+              typeof options.columnDefaults?.tooltipsHeader == "undefined"
+                ? true
+                : options.columnDefaults?.tooltipsHeader,
+          };
+        
+        
         options.columns = arrayTabulatorColumns;
         options.data = data.dataset;
         options.persistence =
diff --git a/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js b/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
index 2d68a310b..36a35a68d 100644
--- a/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
+++ b/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
@@ -184,8 +184,6 @@ var format_ectsSumBisherUndNeu = function (cell, formatterParams, onRendered) {
   );
 };
 
-
-
 // Formats row selectable/unselectable
 function func_selectableCheck(row) {
   let status_kurzbz = row.getData().status_kurzbz;
@@ -220,16 +218,14 @@ function func_rowSelectionChanged(data, rows, tabulatorInstance) {
 }
 
 // Returns tooltip
-function func_tooltips() {
+function func_tooltips(e,cell,onRendered) {
   //e - mouseover event
   //cell - cell component
   //onRendered - onRendered callback registration function
-  console.log("here");
-  // console.log("TOOLTIP DEBUG",cell);
-  // // Return tooltip if row is unselectable
-  // if (true || !func_selectableCheck(cell.getRow())){
-  //     return FHC_PhrasesLib.t("ui", "nichtSelektierbarAufgrundVon") + 'Status';
-  // }
+  // Return tooltip if row is unselectable
+  if (!func_selectableCheck(cell.getRow())) {
+    return FHC_PhrasesLib.t("ui", "nichtSelektierbarAufgrundVon") + "Status";
+  }
 }
 
 // Formats empfehlung_anrechnung
diff --git a/public/js/lehre/anrechnung/reviewAnrechnungUebersicht.js b/public/js/lehre/anrechnung/reviewAnrechnungUebersicht.js
index d0004ba3a..277e3ad3e 100644
--- a/public/js/lehre/anrechnung/reviewAnrechnungUebersicht.js
+++ b/public/js/lehre/anrechnung/reviewAnrechnungUebersicht.js
@@ -125,7 +125,7 @@ function func_tooltips(e, cell, onRendered) {
   //e - mouseover event
   //cell - cell component
   //onRendered - onRendered callback registration functionfunction
-  console.log("this is a tooltip");
+
   // Return tooltip if row is unselectable
   if (!func_selectableCheck(cell.getRow())) {
     return FHC_PhrasesLib.t("ui", "nichtSelektierbarAufgrundVon") + "Status";

From 3b06519f2f62ee496a9c998edf87474d24913b0c Mon Sep 17 00:00:00 2001
From: Werner Masik <werner@gefi.at>
Date: Wed, 24 Apr 2024 15:25:42 +0200
Subject: [PATCH 0634/1461] updated phrases for salary range

---
 system/phrasesupdate.php | 161 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 161 insertions(+)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index a0fd65819..38f42e6b8 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -24337,7 +24337,168 @@ array(
 				'insertvon' => 'system'
 			)
 		)
+	),
+	// Gehaltsband
+	array(
+		'app' => 'personalverwaltung',
+		'category' => 'gehaltsband',
+		'phrase' => 'gehaltsband',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gehaltsband',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Salary Range',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
 	),	
+	array(
+		'app' => 'personalverwaltung',
+		'category' => 'gehaltsband',
+		'phrase' => 'gueltig_von',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gültig von',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Valid from',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'personalverwaltung',
+		'category' => 'gehaltsband',
+		'phrase' => 'gueltig_bis',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gültig bis',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Valid to',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'personalverwaltung',
+		'category' => 'gehaltsband',
+		'phrase' => 'betrag_von',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Betrag von',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Amount from',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'personalverwaltung',
+		'category' => 'gehaltsband',
+		'phrase' => 'betrag_bis',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gültig bis',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Valid to',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'personalverwaltung',
+		'category' => 'gehaltsband',
+		'phrase' => 'gehaltsband_gespeichert',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gehaltsband gespeichert.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Salary range saved.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'personalverwaltung',
+		'category' => 'gehaltsband',
+		'phrase' => 'gehaltsband_erstellt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gehaltsband hinzugefügt.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Salary range created.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'personalverwaltung',
+		'category' => 'gehaltsband',
+		'phrase' => 'gehaltsband_geloescht',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gehaltsband gelöscht.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Salary range deleted.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// Personalverwaltung end
 	array(
 		'app' => 'core',

From f5d534a409f765fb42019f95e719e042b0662303 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 24 Apr 2024 15:52:53 +0200
Subject: [PATCH 0635/1461] added require branch update file in
 dbupdate_3.4.php; added phrasen everywhere in frontend, WIP translating
 backend messages;

---
 system/dbupdate_3.4.php                       |   1 +
 ...gsmanagement_fuer_studierende_prototyp.php |  16 +
 system/phrasesupdate.php                      | 663 +++++++++++++++++-
 3 files changed, 658 insertions(+), 22 deletions(-)
 create mode 100644 system/dbupdate_3.4/33683_digitale_anwesenheitsliste_und_entschuldigungsmanagement_fuer_studierende_prototyp.php

diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index 7baeca953..734935862 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -53,6 +53,7 @@ require_once('dbupdate_3.4/36275_zeitaufzeichnung_karenz.php');
 require_once('dbupdate_3.4/21620_neues_feld_zum_erfassen_des_ESI.php');
 require_once('dbupdate_3.4/36530_bis_internationsalisierung_codextabelle_neuerungen.php');
 require_once('dbupdate_3.4/34543_ux_template.php');
+require_once('dbupdate_3.4/33683_digitale_anwesenheitsliste_und_entschuldigungsmanagement_fuer_studierende_prototyp.php');
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
diff --git a/system/dbupdate_3.4/33683_digitale_anwesenheitsliste_und_entschuldigungsmanagement_fuer_studierende_prototyp.php b/system/dbupdate_3.4/33683_digitale_anwesenheitsliste_und_entschuldigungsmanagement_fuer_studierende_prototyp.php
new file mode 100644
index 000000000..45672f249
--- /dev/null
+++ b/system/dbupdate_3.4/33683_digitale_anwesenheitsliste_und_entschuldigungsmanagement_fuer_studierende_prototyp.php
@@ -0,0 +1,16 @@
+<?php
+if (! defined('DB_NAME')) exit('No direct script access allowed');
+
+// add app fhctemplate
+if($result = $db->db_query("SELECT 1 FROM system.tbl_app WHERE app='anwesenheiten'"))
+{
+	if($db->db_num_rows($result) === 0)
+	{
+		$qry = "INSERT INTO system.tbl_app (app) VALUES('anwesenheiten');";
+
+		if(!$db->db_query($qry))
+			echo '<strong>System Tabelle app: '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br>app anwesenheiten hinzugefuegt';
+	}
+}
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 0d5ff9125..9437803c6 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -24781,26 +24781,6 @@ array(
 			)
 		)
 	),
-	array(
-		'app' => 'anwesenheiten',
-		'category' => 'global',
-		'phrase' => 'codeEingeben',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Code eingeben',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Enter Code',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
@@ -24809,7 +24789,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Code eingeben',
+				'text' => 'Code senden',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -24861,6 +24841,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'code',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zugangscode',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Access code',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
@@ -24901,7 +24901,626 @@ array(
 			)
 		)
 	),
-
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'neueAnwKontrolle',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Neue Anwesenheitskontrolle starten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Start a new attendance check',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'endAnwKontrolle',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anwesenheitskontrolle beenden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'end attendance check',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'entschuldigungsmanagementStudiengangsassistenz',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Entschuldigungsmanagement Studiengangsassistenz',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Excuse note management for degree program assistants',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'digitalesAnwManagement',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Digitales Anwesenheitsmanagement',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Digital attendance management',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'entschuldigungAkzeptieren',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Entschuldigung akzeptieren',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Accept excuse note',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'entschuldigungAblehnen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Entschuldigung ablehnen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Decline excuse note',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'entschuldigungLöschen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Entschuldigung löschen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Delete excuse note',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'entschuldigungHochladen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Entschuldigung hochladen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Upload excuse note',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'entschuldigungLöschenErfolg',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Entschuldigung erfolgreich gelöscht!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Successfully deleted excuse note',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'foto',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Foto',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Picture',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'summe',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Summe',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Sum',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorStartAnwKontrolle',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler beim dem Versuch eine neue Anwesenheitskontrolle zu starten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error when trying to start a new attendance check',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorAnwStartAndEndSet',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Beginn und Ende der Anwesenheitskontrolle müssen gesetzt sein!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The start and end of the attendance check must be set!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'anwKontrolleBeendet',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anwesenheitskontrolle erfolgreich beendet',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Attendance check successfully finished',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorDeleteQRCode',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler bei dem Versuch den QR Code zu löschen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Something went wrong with deleting the QR Code',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'deleteAnwKontrolleConfirmation',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anwesenheitskontrolle erfolgreich gelöscht',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Attendance check successfully deleted',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'deleteAnwKontrolle',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anwesenheitskontrolle löschen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Delete attendance check',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'noAnwKontrolleFoundToDelete',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Keine Anwesenheitskontrolle gefunden zu löschen!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No attendance check found to delete!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorValidateTimes',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Das Enddatum muss nach dem Startdatum liegen.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The end date must be after the start date.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'zugangscode',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zugangscode',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Access code',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'anwUserDeleteSuccess',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anwesenheitseinträge erfolgreich gelöscht.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Attendances deleted successfully',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorAnwUserDelete',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler bei dem Versuch Anwesenheitseinträge zu löschen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error deleting Attendances',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'anwUserUpdateSuccess',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anwesenheitseinträge erfolgreich aktualisiert.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Attendances updated successfully.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorAnwUserUpdate',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler bei dem Versuch Anwesenheitseinträge zu aktualisieren.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error updating Attendances',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorLoadingAnwesenheiten',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler bei dem Versuch Anwesenheitsdaten zu laden.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error loading attendancy data.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'warningEnterVonZeit',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bitte von Zeit eingeben',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Please enter a from time',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'warningEnterBisZeit',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bitte bis Zeit eingeben',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Please enter a by time',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'warningChooseFile',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bitte Datei auswählen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Please choose a file',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'entschuldigungUploaded',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Entschuldigung hochgeladen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Excuse note uploaded',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorEntschuldigungUpload',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler bei dem Versuch eine Entschuldigung hochzuladen!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error uploading an excuse note!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'addEntschuldigung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Entschuldigung hinzufügen!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Add excuse note',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 
 	// FHC-CORE-ANWESENHEITEN END
 );

From a2e943ac4026ee3a11f95e74c2deac7e86df5b0d Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 25 Apr 2024 09:29:47 +0200
Subject: [PATCH 0636/1461] adjusts the actions of the ProfilUpdateView table
 with accept and deny buttons

---
 .../Cis/ProfilUpdate/ProfilUpdateView.js      | 114 +++++++++---------
 1 file changed, 55 insertions(+), 59 deletions(-)

diff --git a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
index f1e6c933c..7063aee83 100644
--- a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
+++ b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
@@ -124,6 +124,10 @@ export default {
                   "acceptUpdate"
                 )}`,
                 action: (e, column) => {
+                  console.log(
+                    "this is the data of the context menu action",
+                    column.getData()
+                  );
                   Vue.$fhcapi.ProfilUpdate.acceptProfilRequest(column.getData())
                     .then((res) => {
                       this.$refs.UpdatesTable.tabulator.setData();
@@ -242,83 +246,75 @@ export default {
           },
           {
             title: Vue.computed(() => this.$p.t("profilUpdate", "actions")),
-            formatter: (cell, para) => {
-              let status = cell.getRow().getData().status;
-              console.log("this is the cell", cell);
-              console.log("this should be the column", cell.getColumn());
-              let result = null;
-              switch (status) {
-                case this.profilUpdateStates["Pending"]:
-                  result =
-                    "<button id='acceptProfilUpdate' type='button' class='btn border-success border-2'><i class='fa fa-lg fa-circle-check text-success'></i></button>" +
-                    "<button id='denyProfilUpdate' type='button' class='btn border-danger border-2'><i class=' fa fa-lg fa-circle-xmark text-danger'></i></button>" +
-                    "<button id='viewProfilUpdate' type='button' class='btn border-secondary border-2'><i class=' fa fa-eye'></i></button>";
-                  break;
-                case this.profilUpdateStates["Accepted"]:
-                  result =
-                    "<i id='viewProfilUpdate' type='button' class='d-block fa fa-eye'></i>";
-                  break;
-                case this.profilUpdateStates["Rejected"]:
-                  result =
-                    "<i id='viewProfilUpdate' type='button' class='d-block fa fa-eye'></i>";
-                  break;
-              }
-              return (
-                "<div class='d-flex align-items-center justify-content-evenly'>" +
-                result +
-                "</div>"
-              );
-              /*   switch () {
-                case this.profilUpdateStates["Pending"]:
-                  iconClasses += "fa fa-lg fa-circle-info text-info ";
-                  break;
-                case this.profilUpdateStates["Accepted"]:
-                  iconClasses += "fa fa-lg fa-circle-check text-success ";
-                  break;
-                case this.profilUpdateStates["Rejected"]:
-                  iconClasses += "fa fa-lg fa-circle-xmark text-danger ";
-                  break; */
+            headerSort: false,
+            formatter: (cell, params) => {
+              let html = `<div class="d-flex justify-content-evenly align-items-center">
+                <button class="btn border-primary border-2" id="showButton"><i class="fa-solid fa-eye" style="color: #0d6efd;"></i></button>
+                ${
+                  cell.getRow().getData().status ==
+                    this.profilUpdateStates["Pending"] &&
+                  `<button class="btn border-success border-2" id="acceptButton"><i class='fa fa-lg fa-circle-check text-success'></i></button>
+                  <button class="btn border-danger border-2" id="denyButton"><i class=' fa fa-lg fa-circle-xmark text-danger'></i></button>`
+                }
+              </div>`;
+
+              // Convert the HTML string to an HTML node
+              const parser = new DOMParser();
+              const doc = parser.parseFromString(html, "text/html");
+              const node = doc.body.firstChild;
+
+              // Add event listeners
+              node
+                .querySelector("#showButton")
+                .addEventListener("click", () => {
+                  this.showAcceptDenyModal(cell.getRow().getData());
+                });
+
+              node
+                .querySelector("#acceptButton")
+                .addEventListener("click", () => {
+                  this.acceptProfilUpdate(cell.getRow().getData());
+                });
+              node
+                .querySelector("#denyButton")
+                .addEventListener("click", () => {
+                  this.denyProfilUpdate(cell.getRow().getData());
+                });
+
+              return node;
             },
-            resizable: true,
             minWidth: 200,
+            resizable: true,
             hozAlign: "center",
-            cellClick: (e, cell) => {
-              //! function that is called when clicking on a row in the table
-              console.log("this is the element", e.explicitOriginalTarget);
-              console.log("this is the id", e.explicitOriginalTarget.id);
-              let cellData = cell.getRow().getData();
-              if (e.explicitOriginalTarget.id === "viewProfilUpdate") {
-                this.showAcceptDenyModal(cellData);
-              } else if (e.explicitOriginalTarget.id === "acceptProfilUpdate") {
-                console.log("this is the celldata", cellData);
-                this.acceptProfilUpdate(cellData);
-              } else if (e.explicitOriginalTarget.id === "denyProfilUpdate") {
-                this.denyProfilUpdate(cellData);
-              }
-            },
-            //responsive:0,
           },
         ],
       },
     };
   },
   methods: {
-    denyProfilUpdate: (column) => {
-      Vue.$fhcapi.ProfilUpdate.denyProfilRequest(column)
+    denyProfilUpdate: function (data) {
+      Vue.$fhcapi.ProfilUpdate.denyProfilRequest(data)
         .then((res) => {
-          this.$refs.UpdatesTable.tabulator.setData();
+          // block when the request was successful
         })
         .catch((e) => {
           Alert.popup(Vue.h("div", { innerHTML: e.response.data }));
+        })
+        .finally(() => {
+          this.$refs.UpdatesTable.tabulator.setData();
         });
     },
-    acceptProfilUpdate: (column) => {
-      Vue.$fhcapi.ProfilUpdate.acceptProfilRequest(column)
+    acceptProfilUpdate: function (data) {
+      Vue.$fhcapi.ProfilUpdate.acceptProfilRequest(data)
         .then((res) => {
-          this.$refs.UpdatesTable.tabulator.setData();
+          // block when the request was successful
         })
         .catch((e) => {
           Alert.popup(Vue.h("div", { innerHTML: e.response.data }));
+        })
+        .finally(() => {
+          // update the data inside the table
+          this.$refs.UpdatesTable.tabulator.setData();
         });
     },
     setLoading: function (newValue) {
@@ -371,6 +367,7 @@ export default {
       this.categoryLoaded = true;
     });
   },
+
   mounted() {
     //? opens the AcceptDenyUpdate Modal if a preselected profil_update_id was passed to the component (used for email links)
     if (this.profil_update_id) {
@@ -387,7 +384,6 @@ export default {
     }
 
     if (sessionStorage.getItem("filter")) {
-      //? converting string into a boolean: https://sentry.io/answers/how-can-i-convert-a-string-to-a-boolean-in-javascript/
       this.filter = sessionStorage.getItem("filter");
     }
   },

From fed30daad0c36753ba8ab4b3485a2466c6d3886f Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 25 Apr 2024 09:41:32 +0200
Subject: [PATCH 0637/1461] bug fix, only appending the event to the accept and
 deny action button if they were actually created

---
 .../Cis/ProfilUpdate/ProfilUpdateView.js      | 31 +++++++++++--------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
index 7063aee83..66420b81a 100644
--- a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
+++ b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
@@ -248,13 +248,16 @@ export default {
             title: Vue.computed(() => this.$p.t("profilUpdate", "actions")),
             headerSort: false,
             formatter: (cell, params) => {
+              let STATUS_PENDING =
+                cell.getRow().getData().status ==
+                this.profilUpdateStates["Pending"];
+
               let html = `<div class="d-flex justify-content-evenly align-items-center">
                 <button class="btn border-primary border-2" id="showButton"><i class="fa-solid fa-eye" style="color: #0d6efd;"></i></button>
                 ${
-                  cell.getRow().getData().status ==
-                    this.profilUpdateStates["Pending"] &&
+                  STATUS_PENDING ?
                   `<button class="btn border-success border-2" id="acceptButton"><i class='fa fa-lg fa-circle-check text-success'></i></button>
-                  <button class="btn border-danger border-2" id="denyButton"><i class=' fa fa-lg fa-circle-xmark text-danger'></i></button>`
+                  <button class="btn border-danger border-2" id="denyButton"><i class=' fa fa-lg fa-circle-xmark text-danger'></i></button>`:''
                 }
               </div>`;
 
@@ -270,16 +273,18 @@ export default {
                   this.showAcceptDenyModal(cell.getRow().getData());
                 });
 
-              node
-                .querySelector("#acceptButton")
-                .addEventListener("click", () => {
-                  this.acceptProfilUpdate(cell.getRow().getData());
-                });
-              node
-                .querySelector("#denyButton")
-                .addEventListener("click", () => {
-                  this.denyProfilUpdate(cell.getRow().getData());
-                });
+              if (STATUS_PENDING) {
+                node
+                  .querySelector("#acceptButton")
+                  .addEventListener("click", () => {
+                    this.acceptProfilUpdate(cell.getRow().getData());
+                  });
+                node
+                  .querySelector("#denyButton")
+                  .addEventListener("click", () => {
+                    this.denyProfilUpdate(cell.getRow().getData());
+                  });
+              }
 
               return node;
             },

From f47f8d5da4cbcc33f91d7a6980f5808bdd462d89 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 25 Apr 2024 11:36:37 +0200
Subject: [PATCH 0638/1461] Konto: Phrases

---
 .../controllers/api/frontend/v1/stv/Konto.php |  25 +-
 .../controllers/components/stv/Config.php     | 134 +++-
 application/models/crm/Konto_model.php        |   4 +-
 .../Stv/Studentenverwaltung/Details/Konto.js  | 169 ++---
 .../Stv/Studentenverwaltung/List.js           |   9 +-
 system/phrasesupdate.php                      | 639 +++++++++++++++++-
 6 files changed, 817 insertions(+), 163 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Konto.php b/application/controllers/api/frontend/v1/stv/Konto.php
index 002d84766..4606f5abc 100644
--- a/application/controllers/api/frontend/v1/stv/Konto.php
+++ b/application/controllers/api/frontend/v1/stv/Konto.php
@@ -49,7 +49,7 @@ class Konto extends FHCAPI_Controller
 
 		// Load language phrases
 		$this->loadPhrases([
-			'ui'
+			'konto'
 		]);
 	}
 
@@ -175,22 +175,21 @@ class Konto extends FHCAPI_Controller
 			return $row->nachname . ' ' . $row->vorname;
 		}, $result);
 		
-		// TODO(chris): Phrases
-		$result = $this->p->t('konto', 'buchung_vorhanden') . "\n";
+		$result = $this->p->t('konto', 'confirm_overwrite') . "\n";
 		if (count($persons) > 10) {
 			$result .= "-" . implode("\n-", array_slice($persons, 0, 10)) . "\n";
 			
 			if (count($persons) == 11) {
-				$result .= "\n" . $this->p->t('konto', 'and_1_additional_person');
+				$result .= "\n" . $this->p->t('konto', 'confirm_overwrite_1_add_pers');
 			} else {
-				$result .= "\n" . $this->p->t('konto', 'and_x_additional_person', [
+				$result .= "\n" . $this->p->t('konto', 'confirm_overwrite_x_add_pers', [
 					'x' => count($persons) - 10
 				]);
 			}
 		} else {
 			$result .= "-" . implode("\n-", $persons) . "\n";
 		}
-		$result .= $this->p->t('konto', 'proceed');
+		$result .= $this->p->t('konto', 'confirm_overwrite_proceed');
 
 		$this->addError($result, 'confirm');
 
@@ -327,8 +326,8 @@ class Konto extends FHCAPI_Controller
 					'label' => 'Buchung # ' . $buchungsnr,
 					'rules' => 'regex_match[/^$/]',
 					'errors' => [
-						'regex_match' => 'Gegenbuchungen koennen nur auf die obersten Buchungen getaetigt werden'
-					] // TODO(chris): phrase
+						'regex_match' => $this->p->t('konto', 'error_counter_level')
+					]
 				];
 			}
 		}
@@ -355,9 +354,9 @@ class Konto extends FHCAPI_Controller
 			if ($betrag === null) {
 				$this->addError($this->p->t(
 					'konto',
-					'Buchung #{buchungsnr} does not exist',
+					'error_missing',
 					$buchung
-				), self::ERROR_TYPE_GENERAL); // TODO(chris): phrase
+				), self::ERROR_TYPE_GENERAL);
 				continue;
 			}
 
@@ -482,7 +481,9 @@ class Konto extends FHCAPI_Controller
 		$result = $result->retval;
 
 		if (!$result)
-			$this->terminateWithError('buchung not found', self::ERROR_TYPE_GENERAL); // TODO(chris): phrase
+			$this->terminateWithError($this->p->t('konto', 'error_missing', [
+				'buchungsnr' => $buchungsnr
+			]), self::ERROR_TYPE_GENERAL);
 
 		$_POST['studiengang_kz'] = current($result)->studiengang_kz;
 
@@ -500,7 +501,7 @@ class Konto extends FHCAPI_Controller
 		if (isError($result)) {
 			if (getCode($result) != 42)
 				$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); // TODO(chris): phrase
+			$this->terminateWithError($this->p->t('konto', 'error_delete_level'), self::ERROR_TYPE_GENERAL);
 		}
 
 		$this->terminateWithSuccess();
diff --git a/application/controllers/components/stv/Config.php b/application/controllers/components/stv/Config.php
index 78089d519..c06093c63 100644
--- a/application/controllers/components/stv/Config.php
+++ b/application/controllers/components/stv/Config.php
@@ -15,49 +15,57 @@ class Config extends FHC_Controller
 
 		$this->load->library('AuthLib');
 		$this->load->library('PermissionLib');
+
+		$this->loadPhrases([
+			'global',
+			'person',
+			'lehre',
+			'stv',
+			'konto'
+		]);
 	}
 
 	public function student()
 	{
-		// TODO(chris): phrases
 		$result = [];
 		$result['details'] = [
-			'title' => 'Details',
+			'title' => $this->p->t('stv', 'tab_details'),
 			'component' => './Stv/Studentenverwaltung/Details/Details.js'
 		];
-		$result['notizen'] = [
-			'title' => 'Notizen',
+		$result['notes'] = [
+			'title' => $this->p->t('stv', 'notes'),
 			'component' => './Stv/Studentenverwaltung/Details/Notizen.js'
 		];
-		$result['kontakt'] = [
-			'title' => 'Kontakt',
+		$result['contact'] = [
+			'title' => $this->p->t('stv', 'contact'),
 			'component' => './Stv/Studentenverwaltung/Details/Kontakt.js'
 		];
 		$result['prestudent'] = [
-			'title' => 'PreStudentIn',
+			'title' => $this->p->t('stv', 'prestudent'),
 			'component' => './Stv/Studentenverwaltung/Details/Prestudent.js'
 		];
 		$result['status'] = [
-			'title' => 'Status',
+			'title' => $this->p->t('stv', 'status'),
 			'component' => './Stv/Studentenverwaltung/Details/Status.js'
 		];
-		$result['konto'] = [
-			'title' => 'Konto',
+		$result['banking'] = [
+			'title' => $this->p->t('stv', 'banking'),
 			'component' => './Stv/Studentenverwaltung/Details/Konto.js',
 			'config' => [
 				'showZahlungsbestaetigung' => (defined('ZAHLUNGSBESTAETIGUNG_ANZEIGEN') && ZAHLUNGSBESTAETIGUNG_ANZEIGEN),
 				'showBuchungsnr' => $this->permissionlib->isBerechtigt('admin'),
 				'showMahnspanne' => (!defined('FAS_KONTO_SHOW_MAHNSPANNE') || FAS_KONTO_SHOW_MAHNSPANNE===true),
 				'showCreditpoints' => (defined('FAS_KONTO_SHOW_CREDIT_POINTS') && FAS_KONTO_SHOW_CREDIT_POINTS == 'true'),
+				'columns' => $this->kontoColumns(),
 				'additionalCols' => []
 			]
 		];
-		$result['betriebsmittel'] = [
-			'title' => 'Betriebsmittel',
+		$result['resources'] = [
+			'title' => $this->p->t('stv', 'resources'),
 			'component' => './Stv/Studentenverwaltung/Details/Betriebsmittel.js'
 		];
-		$result['noten'] = [
-			'title' => 'Noten',
+		$result['grades'] = [
+			'title' => $this->p->t('stv', 'grades'),
 			'component' => './Stv/Studentenverwaltung/Details/Noten.js'
 		];
 
@@ -70,16 +78,16 @@ class Config extends FHC_Controller
 
 	public function students()
 	{
-		// TODO(chris): phrases
 		$result = [];
-		$result['konto'] = [
-			'title' => 'Konto',
+		$result['banking'] = [
+			'title' => $this->p->t('stv', 'banking'),
 			'component' => './Stv/Studentenverwaltung/Details/Konto.js',
 			'config' => [
 				'showZahlungsbestaetigung' => (defined('ZAHLUNGSBESTAETIGUNG_ANZEIGEN') && ZAHLUNGSBESTAETIGUNG_ANZEIGEN),
 				'showBuchungsnr' => $this->permissionlib->isBerechtigt('admin'),
 				'showMahnspanne' => (!defined('FAS_KONTO_SHOW_MAHNSPANNE') || FAS_KONTO_SHOW_MAHNSPANNE===true),
 				'showCreditpoints' => (defined('FAS_KONTO_SHOW_CREDIT_POINTS') && FAS_KONTO_SHOW_CREDIT_POINTS == 'true'),
+				'columns' => $this->kontoColumnsMultiPerson(),
 				'additionalCols' => []
 			]
 		];
@@ -90,4 +98,96 @@ class Config extends FHC_Controller
 
 		$this->outputJsonSuccess($result);
 	}
+
+	protected function kontoColumns()
+	{
+		return [
+			'buchungsdatum' => [
+				'field' => "buchungsdatum",
+				'title' => $this->p->t('konto', 'buchungsdatum')
+			],
+			'buchungstext' => [
+				'field' => "buchungstext",
+				'title' => $this->p->t('konto', 'buchungstext')
+			],
+			'betrag' => [
+				'field' => "betrag",
+				'title' => $this->p->t('konto', 'betrag')
+			],
+			'studiensemester_kurzbz' => [
+				'field' => "studiensemester_kurzbz",
+				'title' => $this->p->t('lehre', 'studiensemester')
+			],
+			'buchungstyp_kurzbz' => [
+				'field' => "buchungstyp_kurzbz",
+				'title' => $this->p->t('konto', 'buchungstyp'),
+				'visible' => false
+			],
+			'buchungsnr' => [
+				'field' => "buchungsnr",
+				'title' => $this->p->t('konto', 'buchungsnr'),
+				'visible' => false
+			],
+			'insertvon' => [
+				'field' => "insertvon",
+				'title' => $this->p->t('global', 'insertvon'),
+				'visible' => false
+			],
+			'insertamum' => [
+				'field' => "insertamum",
+				'title' => $this->p->t('global', 'insertamum'),
+				'visible' => false
+			],
+			'kuerzel' => [
+				'field' => "kuerzel",
+				'title' => $this->p->t('lehre', 'studiengang'),
+				'visible' => false
+			],
+			'anmerkung' => [
+				'field' => "anmerkung",
+				'title' => $this->p->t('global', 'anmerkung')
+			],
+			'actions' => [
+				'title' => $this->p->t('global', 'actions'),
+				'frozen' => true
+			]
+		];
+	}
+	protected function kontoColumnsMultiPerson()
+	{
+		return [
+			'person_id' => [
+				'field' => "person_id",
+				'title' => $this->p->t('person', 'person_id')
+			],
+			'anrede' => [
+				'field' => "anrede",
+				'title' => $this->p->t('person', 'anrede'),
+				'visible' => false
+			],
+			'titelpost' => [
+				'field' => "titelpost",
+				'title' => $this->p->t('person', 'titelpost'),
+				'visible' => false
+			],
+			'titelpre' => [
+				'field' => "titelpre",
+				'title' => $this->p->t('person', 'titelpre'),
+				'visible' => false
+			],
+			'vorname' => [
+				'field' => "vorname",
+				'title' => $this->p->t('person', 'vorname')
+			],
+			'vornamen' => [
+				'field' => "vornamen",
+				'title' => $this->p->t('person', 'vornamen'),
+				'visible' => false
+			],
+			'nachname' => [
+				'field' => "nachname",
+				'title' => $this->p->t('person', 'nachname')
+			]
+		] + $this->kontoColumns();
+	}
 }
diff --git a/application/models/crm/Konto_model.php b/application/models/crm/Konto_model.php
index 6122feef0..d130d5db8 100644
--- a/application/models/crm/Konto_model.php
+++ b/application/models/crm/Konto_model.php
@@ -84,8 +84,8 @@ class Konto_model extends DB_Model
 	{
 		$this->db->where('buchungsnr_verweis', $id);
 		if ($this->db->count_all_results($this->dbTable))
-			return error('Bitte zuerst die zugeordneten Buchungen loeschen');
-		return parent::delete($id, 42);
+			return error('Bitte zuerst die zugeordneten Buchungen loeschen', 42);
+		return parent::delete($id);
 	}
 
 	/**
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Konto.js b/public/js/components/Stv/Studentenverwaltung/Details/Konto.js
index 4b3152331..1acfcd9dd 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Konto.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Konto.js
@@ -3,7 +3,6 @@ import FormInput from "../../../Form/Input.js";
 import KontoNew from "./Konto/New.js";
 import KontoEdit from "./Konto/Edit.js";
 
-// TODO(chris): Phrasen
 
 export default {
 	components: {
@@ -52,130 +51,46 @@ export default {
 			}
 		},
 		tabulatorColumns() {
-			let columns = [];
-			
-			if (Array.isArray(this.modelValue)) {
-				columns.push({
-					field: "person_id",
-					title: "Person ID"
-				});
-				columns.push({
-					field: "anrede",
-					title: "Anrede",
-					visible: false
-				});
-				columns.push({
-					field: "titelpost",
-					title: "Titelpost",
-					visible: false
-				});
-				columns.push({
-					field: "titelpre",
-					title: "Titelpre",
-					visible: false
-				});
-				columns.push({
-					field: "vorname",
-					title: "Vorname"
-				});
-				columns.push({
-					field: "vornamen",
-					title: "Vornamen",
-					visible: false
-				});
-				columns.push({
-					field: "nachname",
-					title: "Nachname"
-				});
-			}
+			const columns = { ...this.config.columns };
+			if (!columns.actions)
+				columns.actions = {
+					title: '',
+					frozen: true
+				};
+			columns.actions.formatter = cell => {
+				let container = document.createElement('div');
+				container.className = "d-flex gap-2";
 
-			columns = [...columns, ...[
-				{
-					field: "buchungsdatum",
-					title: "Buchungsdatum"
-				},
-				{
-					field: "buchungstext",
-					title: "Buchungstext"
-				},
-				{
-					field: "betrag",
-					title: "Betrag"
-				},
-				{
-					field: "studiensemester_kurzbz",
-					title: "StSem"
-				},
-				{
-					field: "buchungstyp_kurzbz",
-					title: "Typ",
-					visible: false
-				},
-				{
-					field: "buchungsnr",
-					title: "Buchungs Nr",
-					visible: false
-				},
-				{
-					field: "insertvon",
-					title: "Angelegt von",
-					visible: false
-				},
-				{
-					field: "insertamum",
-					title: "Anlagedatum",
-					visible: false
-				},
-				{
-					field: "kuerzel",
-					title: "Studiengang",
-					visible: false
-				},
-				{
-					field: "anmerkung",
-					title: "Anmerkung"
-				}
-			]];
+				let button = document.createElement('button');
+				button.className = 'btn btn-outline-secondary';
+				button.innerHTML = '<i class="fa fa-edit"></i>';
+				button.addEventListener('click', () =>
+					this.$refs.edit.open(cell.getData())
+				);
+				container.append(button);
 
-			columns = [...columns, ...this.config.additionalCols];
+				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().buchungsnr : Promise.reject({handled:true}))
+						.then(this.$fhcApi.factory.stv.konto.delete)
+						.then(() => {
+							// TODO(chris): deleting a child also removes the siblings!
+							//cell.getRow().delete();
+							this.reload();
+						})
+						.catch(this.$fhcAlert.handleSystemError);
+				});
+				container.append(button);
 
-			columns.push({
-				title: 'Actions',
-				formatter: cell => {
-					let container = document.createElement('div');
-					container.className = "d-flex gap-2";
+				return container;
+			};
 
-					let button = document.createElement('button');
-					button.className = 'btn btn-outline-secondary';
-					button.innerHTML = '<i class="fa fa-edit"></i>';
-					button.addEventListener('click', () =>
-						this.$refs.edit.open(cell.getData())
-					);
-					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().buchungsnr : Promise.reject({handled:true}))
-							.then(this.$fhcApi.factory.stv.konto.delete)
-							.then(() => {
-								// TODO(chris): deleting a child also removes the siblings!
-								//cell.getRow().delete();
-								this.reload();
-							})
-							.catch(this.$fhcAlert.handleSystemError);
-					});
-					container.append(button);
-
-					return container;
-				},
-				frozen: true
-			});
-			return columns;
+			return Object.values(columns);
 		},
 		tabulatorOptions() {
 			return this.$fhcApi.factory.stv.konto.tabulatorConfig({
@@ -214,7 +129,7 @@ export default {
 				})
 				.then(result => result.data)
 				.then(this.updateData)
-				.then(() => 'Daten wurden gespeichert')
+				.then(() => this.$p.t('ui/gespeichert'))
 				.then(this.$fhcAlert.alertSuccess)
 				.catch(this.$fhcAlert.handleSystemError);
 		},
@@ -263,7 +178,7 @@ export default {
 				<form-input
 					container-class="form-switch"
 					type="checkbox"
-					label="Nur offene anzeigen"
+					:label="$p.t('stv/konto_filter_open')"
 					v-model="filter"
 					@update:model-value="() => $nextTick($refs.table.reloadTable)"
 					>
@@ -273,7 +188,7 @@ export default {
 				<form-input
 					container-class="form-switch"
 					type="checkbox"
-					label="Nur aktuellen Stg anzeigen"
+					:label="$p.t('stv/konto_filter_current_stg')"
 					v-model="studiengang_kz_intern"
 					:disabled="!stg_kz"
 					@update:model-value="() => $nextTick($refs.table.reloadTable)"
@@ -288,7 +203,7 @@ export default {
 			:tabulator-options="tabulatorOptions"
 			reload
 			new-btn-show
-			new-btn-label="Buchung"
+			:new-btn-label="$p.t('konto/buchung')"
 			:new-btn-disabled="stg_kz === ''"
 			@click:new="actionNew"
 			>
@@ -308,7 +223,7 @@ export default {
 						@click="actionCounter(selected)"
 						:disabled="!selected.length"
 						>
-						Gegenbuchen
+						{{ $p.t('stv/konto_counter') }}
 					</button>
 				</div>
 				<button
@@ -317,7 +232,7 @@ export default {
 					@click="downloadPdf(selected)"
 					:disabled="!selected.length"
 					>
-					<i class="fa fa-download"></i> Zahlungsbestaetigung
+					<i class="fa fa-download"></i> {{ $p.t('stv/konto_payment_confirmation') }}
 				</button>
 			</template>
 		</core-filter-cmpt>
diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index 31f7d0963..3f59397c3 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -2,6 +2,7 @@ import {CoreFilterCmpt} from "../../filter/Filter.js";
 import {CoreRESTClient} from '../../../RESTClient.js';
 import ListNew from './List/New.js';
 
+
 export default {
 	components: {
 		CoreFilterCmpt,
@@ -205,14 +206,14 @@ export default {
 				:side-menu="false"
 				reload
 				new-btn-show
-				new-btn-label="InteressentIn"
+				:new-btn-label="$p.t('stv/action_new')"
 				@click:new="actionNewPrestudent"
 			>
 			<template #filter>
 				<div class="card">
 					<div class="card-body">
 						<div class="input-group mb-3">
-							<label class="input-group-text col-4" for="stv-list-filter-konto-count-0">Liste filtern auf nicht belastet:</label>
+							<label class="input-group-text col-4" for="stv-list-filter-konto-count-0">{{ $p.t('stv/konto_filter_count_0') }}</label>
 							<select class="form-select" id="stv-list-filter-konto-count-0" v-model="filterKontoCount0" @input="$nextTick(updateUrl)">
 								<option v-for="typ in lists.buchungstypen" :key="typ.buchungstyp_kurzbz" :value="typ.buchungstyp_kurzbz">
 									{{ typ.beschreibung }}
@@ -223,9 +224,9 @@ export default {
 							</button>
 						</div>
 						<div class="input-group">
-							<label class="input-group-text col-4" for="stv-list-filter-konto-missing-counter">Liste filtern auf fehlende Gegenbuchungen:</label>
+							<label class="input-group-text col-4" for="stv-list-filter-konto-missing-counter">{{ $p.t('stv/konto_filter_missing_counter') }}</label>
 							<select class="form-select" id="stv-list-filter-konto-missing-counter" v-model="filterKontoMissingCounter" @input="$nextTick(updateUrl)">
-								<option value="alle">alle Buchungstypen</option>
+								<option value="alle">{{ $p.t('stv/konto_all_types') }}</option>
 								<option v-for="typ in lists.buchungstypen" :key="typ.buchungstyp_kurzbz" :value="typ.buchungstyp_kurzbz">
 									{{ typ.beschreibung }}
 								</option>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index f4dd30a21..ec79c65ae 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -1133,6 +1133,67 @@ $phrases = array(
 		)
 	),
 
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'insertvon',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Erstellt von',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Inserted from',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'insertamum',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Erstelldatum',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Insert date',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'actions',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Aktionen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Actions',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+
 	//*******************************		CORE/ui
 	array(
 		'app' => 'core',
@@ -1595,6 +1656,7 @@ $phrases = array(
 	)
 ),
 
+
 	//***************************	CORE/filter
 	array(
 		'app' => 'core',
@@ -1701,6 +1763,26 @@ $phrases = array(
 	),
 
 	//****************************	 CORE/person
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'person_id',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Person ID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Person ID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'person',
@@ -26532,7 +26614,562 @@ array(
 			)
 		)
 	),
-	// FHC-Core-SAP
+	//****************************	 CORE/konto
+	array(
+		'app' => 'core',
+		'category' => 'konto',
+		'phrase' => 'buchung',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Buchung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Booking',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'konto',
+		'phrase' => 'buchungsdatum',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Buchungsdatum',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Booking date',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'konto',
+		'phrase' => 'buchungstext',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Buchungstext',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Booking text',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'konto',
+		'phrase' => 'betrag',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Betrag',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Amount',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'konto',
+		'phrase' => 'buchungstyp',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Buchungstyp',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Booking type',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'konto',
+		'phrase' => 'buchungsnr',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Buchungs Nummer',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Booking number',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'konto',
+		'phrase' => 'confirm_overwrite',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Es ist bereits eine Buchung vorhanden:',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'A booking already exists:',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'konto',
+		'phrase' => 'confirm_overwrite_1_add_pers',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'und einer weiteren Person.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'and one additional person.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'konto',
+		'phrase' => 'confirm_overwrite_x_add_pers',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'und {x} weiteren Personen.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'and {x} additional persons.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'konto',
+		'phrase' => 'confirm_overwrite_proceed',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Trotzdem fortfahren?',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Proceed anyway?',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'konto',
+		'phrase' => 'error_missing',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Buchung #{buchungsnr} existiert nicht',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Booking #{buchungsnr} does not exist',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'konto',
+		'phrase' => 'error_counter_level',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gegenbuchungen koennen nur auf die obersten Buchungen getaetigt werden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Offsetting bookings can only be made on the top bookings',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'konto',
+		'phrase' => 'error_delete_level',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bitte zuerst die zugeordneten Buchungen löschen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Please delete the assigned bookings first',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	//****************************	 CORE/stv
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'action_new',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'InteressentIn',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Candidate',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'tab_details',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Details',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Details',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'tab_notes',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Notizen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Notes',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'tab_contact',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kontakt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Contact',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'tab_prestudent',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'PreStudentIn',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Prestudent',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'tab_status',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Status',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'State',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'tab_konto',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Konto',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Banking',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'tab_resources',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Betriebsmittel',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Resources',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'tab_grades',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Noten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Grades',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	// konto
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'konto_counter',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gegenbuchen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Counter-book',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'konto_payment_confirmation',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zahlungsbestaetigung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Payment confirmation',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'konto_filter_count_0',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Liste filtern auf nicht belastet:',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Filter list to not charged:',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'konto_filter_missing_counter',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Liste filtern auf fehlende Gegenbuchungen:',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Filter the list for missing offsetting entries:',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'konto_all_types',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'alle Buchungstypen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'all booking types',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'konto_filter_open',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Nur offene anzeigen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Display only open',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'konto_filter_current_stg',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Nur aktuellen Studiengang anzeigen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Display only current Degree Program',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+
+	//****************************	 FHC-Core-SAP
 	array(
 		'app' => 'core',
 		'category' => 'sap',

From e3ff62001b2035d8f46bb0e45de3587f15827692 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 25 Apr 2024 11:47:53 +0200
Subject: [PATCH 0639/1461] StV Phrasen

---
 .../js/components/Stv/Studentenverwaltung.js  |  4 ++--
 system/phrasesupdate.php                      | 20 +++++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 57cfe998a..7e64a5d8c 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -183,14 +183,14 @@ export default {
 	<div class="stv">
 		<header class="navbar navbar-expand-lg navbar-dark bg-dark flex-md-nowrap p-0 shadow">
 			<a class="navbar-brand col-md-4 col-lg-3 col-xl-2 me-0 px-3" :href="stvRoot">FHC 4.0</a>
-			<button class="navbar-toggler d-md-none m-1 collapsed" type="button" data-bs-toggle="offcanvas" data-bs-target="#sidebarMenu" aria-controls="sidebarMenu" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button>
+			<button class="navbar-toggler d-md-none m-1 collapsed" type="button" data-bs-toggle="offcanvas" data-bs-target="#sidebarMenu" aria-controls="sidebarMenu" aria-expanded="false" :aria-label="$p.t('ui/toggle_nav')"><span class="navbar-toggler-icon"></span></button>
 			<core-searchbar :searchoptions="searchbaroptions" :searchfunction="searchfunction" class="searchbar w-100"></core-searchbar>
 		</header>
 		<div class="container-fluid overflow-hidden">
 			<div class="row h-100">
 				<nav id="sidebarMenu" class="bg-light offcanvas offcanvas-start col-md p-md-0 h-100">
 					<div class="offcanvas-header justify-content-end px-1 d-md-none">
-						<button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" aria-label="Close"></button>
+						<button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" :aria-label="$p.t('ui/schliessen')"></button>
 					</div>
 					<stv-verband @select-verband="onSelectVerband" class="col" style="height:0%"></stv-verband>
 					<stv-studiensemester :default="defaultSemester" @changed="studiensemesterChanged"></stv-studiensemester>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index ec79c65ae..b60e56aa7 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -1195,6 +1195,26 @@ $phrases = array(
 	),
 
 	//*******************************		CORE/ui
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'toggle_nav',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Navigation ein-/ausblenden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Toggle navigation',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'ui',

From 1a6c107f0b7cbeb69996a91b1c32252815cd9409 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 25 Apr 2024 11:55:50 +0200
Subject: [PATCH 0640/1461] Bugfix: phrasesupdate missing insertvon

---
 system/phrasesupdate.php | 132 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 132 insertions(+)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index b60e56aa7..91c1851f4 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -11124,6 +11124,7 @@ Any unusual occurrences
 		'app' => 'projektarbeitsbeurteilung',
 		'category' => 'projektarbeitsbeurteilung',
 		'phrase' => 'kommissionellePruefungHinweis',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -22955,6 +22956,7 @@ array(
 		'app' => 'core',
 		'category' => 'studierendenantrag',
 		'phrase' => 'dropdown_bitteWaehlen',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -22974,6 +22976,7 @@ array(
 		'app' => 'core',
 		'category' => 'notiz',
 		'phrase' => 'notiz_new',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -22993,6 +22996,7 @@ array(
 		'app' => 'core',
 		'category' => 'notiz',
 		'phrase' => 'notiz_edit',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -23012,6 +23016,7 @@ array(
 		'app' => 'core',
 		'category' => 'notiz',
 		'phrase' => 'verfasser',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -23031,6 +23036,7 @@ array(
 		'app' => 'core',
 		'category' => 'notiz',
 		'phrase' => 'bearbeiter',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -23050,6 +23056,7 @@ array(
 		'app' => 'core',
 		'category' => 'notiz',
 		'phrase' => 'erledigt',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -23069,6 +23076,7 @@ array(
 		'app' => 'core',
 		'category' => 'notiz',
 		'phrase' => 'letzte_aenderung',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -23088,6 +23096,7 @@ array(
 		'app' => 'core',
 		'category' => 'ui',
 		'phrase' => 'error_fieldRequired',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -23107,6 +23116,7 @@ array(
 		'app' => 'core',
 		'category' => 'ui',
 		'phrase' => 'error_fieldNotNumeric',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -23126,6 +23136,7 @@ array(
 		'app' => 'core',
 		'category' => 'ui',
 		'phrase' => 'error_fieldNoValidEmail',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -24868,6 +24879,7 @@ array(
 		'app' => 'core',
 		'category' => 'notiz',
 		'phrase' => 'document',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -24887,6 +24899,7 @@ array(
 		'app' => 'core',
 		'category' => 'notiz',
 		'phrase' => 'notiz_new',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -24906,6 +24919,7 @@ array(
 		'app' => 'core',
 		'category' => 'notiz',
 		'phrase' => 'notiz_edit',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -24925,6 +24939,7 @@ array(
 		'app' => 'core',
 		'category' => 'notiz',
 		'phrase' => 'verfasser',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -24944,6 +24959,7 @@ array(
 		'app' => 'core',
 		'category' => 'notiz',
 		'phrase' => 'bearbeiter',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -24963,6 +24979,7 @@ array(
 		'app' => 'core',
 		'category' => 'notiz',
 		'phrase' => 'erledigt',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -24982,6 +24999,7 @@ array(
 		'app' => 'core',
 		'category' => 'notiz',
 		'phrase' => 'letzte_aenderung',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -25001,6 +25019,7 @@ array(
 		'app' => 'core',
 		'category' => 'ui',
 		'phrase' => 'error_fieldRequired',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -25020,6 +25039,7 @@ array(
 		'app' => 'core',
 		'category' => 'ui',
 		'phrase' => 'error_fieldNotNumeric',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -25039,6 +25059,7 @@ array(
 		'app' => 'core',
 		'category' => 'ui',
 		'phrase' => 'error_fieldNoValidEmail',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -25058,6 +25079,7 @@ array(
 		'app' => 'core',
 		'category' => 'person',
 		'phrase' => 'firma_zusatz',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -25077,6 +25099,7 @@ array(
 		'app' => 'core',
 		'category' => 'person',
 		'phrase' => 'firma',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -25096,6 +25119,7 @@ array(
 		'app' => 'core',
 		'category' => 'person',
 		'phrase' => 'adresse_new',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -25115,6 +25139,7 @@ array(
 		'app' => 'core',
 		'category' => 'person',
 		'phrase' => 'adresse_edit',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -25134,6 +25159,7 @@ array(
 		'app' => 'core',
 		'category' => 'person',
 		'phrase' => 'adresse_delete',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -25153,6 +25179,7 @@ array(
 		'app' => 'core',
 		'category' => 'person',
 		'phrase' => 'adresse_confirm_delete',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -25172,6 +25199,7 @@ array(
 		'app' => 'core',
 		'category' => 'person',
 		'phrase' => 'kontakt_new',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -25191,6 +25219,7 @@ array(
 		'app' => 'core',
 		'category' => 'person',
 		'phrase' => 'kontakt_edit',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -25210,6 +25239,7 @@ array(
 		'app' => 'core',
 		'category' => 'person',
 		'phrase' => 'kontakt_delete',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -25229,6 +25259,7 @@ array(
 		'app' => 'core',
 		'category' => 'person',
 		'phrase' => 'kontakt_confirm_delete',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -25248,6 +25279,7 @@ array(
 		'app' => 'core',
 		'category' => 'person',
 		'phrase' => 'privatkonto',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -25267,6 +25299,7 @@ array(
 		'app' => 'core',
 		'category' => 'person',
 		'phrase' => 'firmenkonto',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -25286,6 +25319,7 @@ array(
 		'app' => 'core',
 		'category' => 'person',
 		'phrase' => 'bankvb_new',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -25305,6 +25339,7 @@ array(
 		'app' => 'core',
 		'category' => 'person',
 		'phrase' => 'bankvb_edit',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -25324,6 +25359,7 @@ array(
 		'app' => 'core',
 		'category' => 'person',
 		'phrase' => 'bankvb_delete',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -25343,6 +25379,7 @@ array(
 		'app' => 'core',
 		'category' => 'person',
 		'phrase' => 'bankvb_confirm_delete',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -25363,6 +25400,7 @@ array(
 		'app' => 'core',
 		'category' => 'lehre',
 		'phrase' => 'status_rolle',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -25382,6 +25420,7 @@ array(
 		'app' => 'core',
 		'category' => 'lehre',
 		'phrase' => 'status_new',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -25401,6 +25440,7 @@ array(
 		'app' => 'core',
 		'category' => 'lehre',
 		'phrase' => 'status_edit',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -25420,6 +25460,7 @@ array(
 		'app' => 'core',
 		'category' => 'lehre',
 		'phrase' => 'status_delete',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -25439,6 +25480,7 @@ array(
 		'app' => 'core',
 		'category' => 'lehre',
 		'phrase' => 'bestaetigt_am',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -25458,6 +25500,7 @@ array(
 		'app' => 'core',
 		'category' => 'lehre',
 		'phrase' => 'bestaetigt_von',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -25477,6 +25520,7 @@ array(
 		'app' => 'core',
 		'category' => 'lehre',
 		'phrase' => 'insert_am',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -25496,6 +25540,7 @@ array(
 		'app' => 'core',
 		'category' => 'lehre',
 		'phrase' => 'insert_von',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -25515,6 +25560,7 @@ array(
 		'app' => 'core',
 		'category' => 'lehre',
 		'phrase' => 'bewerbung_abgeschickt_am',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -25534,6 +25580,7 @@ array(
 		'app' => 'core',
 		'category' => 'lehre',
 		'phrase' => 'aufnahmestufe',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -25573,6 +25620,7 @@ array(
 		'app' => 'core',
 		'category' => 'lehre',
 		'phrase' => 'status_confirm_delete',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -25592,6 +25640,7 @@ array(
 			'app' => 'core',
 			'category' => 'lehre',
 			'phrase' => 'last_status_confirm_delete',
+			'insertvon' => 'system',
 			'phrases' => array(
 				array(
 					'sprache' => 'German',
@@ -25612,6 +25661,7 @@ array(
 		'app' => 'core',
 		'category' => 'lehre',
 		'phrase' => 'title_zgv',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -25631,6 +25681,7 @@ array(
 		'app' => 'core',
 		'category' => 'lehre',
 		'phrase' => 'zgvMaster',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -25650,6 +25701,7 @@ array(
 		'app' => 'core',
 		'category' => 'lehre',
 		'phrase' => 'zgvMasterOrt',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -25669,6 +25721,7 @@ array(
 		'app' => 'core',
 		'category' => 'lehre',
 		'phrase' => 'zgvMasterDatum',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -25688,6 +25741,7 @@ array(
 		'app' => 'core',
 		'category' => 'lehre',
 		'phrase' => 'zgvMasterNation',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -25707,6 +25761,7 @@ array(
 		'app' => 'core',
 		'category' => 'lehre',
 		'phrase' => 'zgvMasterErfuellt',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -25726,6 +25781,7 @@ array(
 		'app' => 'core',
 		'category' => 'lehre',
 		'phrase' => 'zgvDoktor',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -25745,6 +25801,7 @@ array(
 		'app' => 'core',
 		'category' => 'lehre',
 		'phrase' => 'zgvDoktorOrt',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -25764,6 +25821,7 @@ array(
 		'app' => 'core',
 		'category' => 'lehre',
 		'phrase' => 'zgvDoktorDatum',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -25783,6 +25841,7 @@ array(
 		'app' => 'core',
 		'category' => 'lehre',
 		'phrase' => 'zgvDoktorNation',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -25802,6 +25861,7 @@ array(
 		'app' => 'core',
 		'category' => 'lehre',
 		'phrase' => 'zgvDoktorErfuellt',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -25821,6 +25881,7 @@ array(
 		'app' => 'core',
 		'category' => 'person',
 		'phrase' => 'aufmerksamDurch',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -25840,6 +25901,7 @@ array(
 		'app' => 'core',
 		'category' => 'person',
 		'phrase' => 'berufstaetigkeit',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -25859,6 +25921,7 @@ array(
 		'app' => 'core',
 		'category' => 'person',
 		'phrase' => 'facheinschlaegigBerufstaetig',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -25878,6 +25941,7 @@ array(
 		'app' => 'core',
 		'category' => 'person',
 		'phrase' => 'bisstandort',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -25897,6 +25961,7 @@ array(
 		'app' => 'core',
 		'category' => 'lehre',
 		'phrase' => 'studientyp',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -25916,6 +25981,7 @@ array(
 		'app' => 'core',
 		'category' => 'lehre',
 		'phrase' => 'dual',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -25935,6 +26001,7 @@ array(
 		'app' => 'core',
 		'category' => 'lehre',
 		'phrase' => 'foerderrelevant',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -25954,6 +26021,7 @@ array(
 		'app' => 'core',
 		'category' => 'lehre',
 		'phrase' => 'prioritaet',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -25973,6 +26041,7 @@ array(
 		'app' => 'core',
 		'category' => 'lehre',
 		'phrase' => 'title_history',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -25992,6 +26061,7 @@ array(
 		'app' => 'core',
 		'category' => 'lehre',
 		'phrase' => 'error_keineSchreibrechte',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -26011,6 +26081,7 @@ array(
 			'app' => 'core',
 			'category' => 'lehre',
 			'phrase' => 'error_rolleBereitsVorhanden',
+			'insertvon' => 'system',
 			'phrases' => array(
 				array(
 					'sprache' => 'German',
@@ -26030,6 +26101,7 @@ array(
 		'app' => 'core',
 		'category' => 'lehre',
 		'phrase' => 'error_keinReihungstestverfahren',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -26049,6 +26121,7 @@ array(
 		'app' => 'core',
 		'category' => 'lehre',
 		'phrase' => 'error_ZGVNichtEingetragen',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -26068,6 +26141,7 @@ array(
 		'app' => 'core',
 		'category' => 'lehre',
 		'phrase' => 'error_ZGVMasterNichtEingetragen',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -26087,6 +26161,7 @@ array(
 		'app' => 'core',
 		'category' => 'lehre',
 		'phrase' => 'error_keinBewerber',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -26106,6 +26181,7 @@ array(
 		'app' => 'core',
 		'category' => 'lehre',
 		'phrase' => 'error_noStudstatus',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -26125,6 +26201,7 @@ array(
 		'app' => 'core',
 		'category' => 'lehre',
 		'phrase' => 'error_dataVorMeldestichtag',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -26144,6 +26221,7 @@ array(
 		'app' => 'core',
 		'category' => 'lehre',
 		'phrase' => 'error_duringInsertUpdateLehrverband',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -26163,6 +26241,7 @@ array(
 		'app' => 'core',
 		'category' => 'lehre',
 		'phrase' => 'error_duringDeleteLehrverband',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -26182,6 +26261,7 @@ array(
 		'app' => 'core',
 		'category' => 'lehre',
 		'phrase' => 'error_onlyAdminDeleteRolleStudent',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -26201,6 +26281,7 @@ array(
 		'app' => 'core',
 		'category' => 'lehre',
 		'phrase' => 'error_onlyAdminDeleteLastStatus',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -26220,6 +26301,7 @@ array(
 		'app' => 'core',
 		'category' => 'lehre',
 		'phrase' => 'error_noStatusFound',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -26239,6 +26321,7 @@ array(
 		'app' => 'core',
 		'category' => 'lehre',
 		'phrase' => 'error_statusConfirmedYet',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -26258,6 +26341,7 @@ array(
 		'app' => 'core',
 		'category' => 'lehre',
 		'phrase' => 'error_bewerbungNochNichtAbgeschickt',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -26277,6 +26361,7 @@ array(
 		'app' => 'core',
 		'category' => 'ui',
 		'phrase' => 'error_missingId',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -26296,6 +26381,7 @@ array(
 		'app' => 'core',
 		'category' => 'person',
 		'phrase' => 'error_deleteHomeAdress',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -26315,6 +26401,7 @@ array(
 		'app' => 'core',
 		'category' => 'ui',
 		'phrase' => 'successSave',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -26334,6 +26421,7 @@ array(
 		'app' => 'core',
 		'category' => 'ui',
 		'phrase' => 'successDelete',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -26353,6 +26441,7 @@ array(
 		'app' => 'core',
 		'category' => 'ui',
 		'phrase' => 'successAdvance',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -26372,6 +26461,7 @@ array(
 		'app' => 'core',
 		'category' => 'ui',
 		'phrase' => 'successConfirm',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -26391,6 +26481,7 @@ array(
 		'app' => 'core',
 		'category' => 'ui',
 		'phrase' => 'betriebsmittel_delete',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -26410,6 +26501,7 @@ array(
 		'app' => 'core',
 		'category' => 'ui',
 		'phrase' => 'betriebsmittel_confirm_delete',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -26429,6 +26521,7 @@ array(
 		'app' => 'core',
 		'category' => 'ui',
 		'phrase' => 'add_betriebsmittel',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -26448,6 +26541,7 @@ array(
 		'app' => 'core',
 		'category' => 'ui',
 		'phrase' => 'edit_betriebsmittel',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -26467,6 +26561,7 @@ array(
 		'app' => 'core',
 		'category' => 'wawi',
 		'phrase' => 'inventarnummer',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -26486,6 +26581,7 @@ array(
 		'app' => 'core',
 		'category' => 'wawi',
 		'phrase' => 'nummer',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -26505,6 +26601,7 @@ array(
 		'app' => 'core',
 		'category' => 'wawi',
 		'phrase' => 'ausgegebenam',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -26524,6 +26621,7 @@ array(
 		'app' => 'core',
 		'category' => 'wawi',
 		'phrase' => 'retouram',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -26543,6 +26641,7 @@ array(
 		'app' => 'core',
 		'category' => 'wawi',
 		'phrase' => 'retourdatum',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -26562,6 +26661,7 @@ array(
 		'app' => 'core',
 		'category' => 'wawi',
 		'phrase' => 'ausgabedatum',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -26581,6 +26681,7 @@ array(
 		'app' => 'core',
 		'category' => 'wawi',
 		'phrase' => 'error_zutrittskarteOhneNummer',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -26600,6 +26701,7 @@ array(
 		'app' => 'core',
 		'category' => 'wawi',
 		'phrase' => 'error_inventarWaehlen',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -26619,6 +26721,7 @@ array(
 		'app' => 'core',
 		'category' => 'wawi',
 		'phrase' => 'error_retourdatumVorAusgabe',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -26639,6 +26742,7 @@ array(
 		'app' => 'core',
 		'category' => 'konto',
 		'phrase' => 'buchung',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -26658,6 +26762,7 @@ array(
 		'app' => 'core',
 		'category' => 'konto',
 		'phrase' => 'buchungsdatum',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -26677,6 +26782,7 @@ array(
 		'app' => 'core',
 		'category' => 'konto',
 		'phrase' => 'buchungstext',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -26696,6 +26802,7 @@ array(
 		'app' => 'core',
 		'category' => 'konto',
 		'phrase' => 'betrag',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -26715,6 +26822,7 @@ array(
 		'app' => 'core',
 		'category' => 'konto',
 		'phrase' => 'buchungstyp',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -26734,6 +26842,7 @@ array(
 		'app' => 'core',
 		'category' => 'konto',
 		'phrase' => 'buchungsnr',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -26753,6 +26862,7 @@ array(
 		'app' => 'core',
 		'category' => 'konto',
 		'phrase' => 'confirm_overwrite',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -26772,6 +26882,7 @@ array(
 		'app' => 'core',
 		'category' => 'konto',
 		'phrase' => 'confirm_overwrite_1_add_pers',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -26791,6 +26902,7 @@ array(
 		'app' => 'core',
 		'category' => 'konto',
 		'phrase' => 'confirm_overwrite_x_add_pers',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -26810,6 +26922,7 @@ array(
 		'app' => 'core',
 		'category' => 'konto',
 		'phrase' => 'confirm_overwrite_proceed',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -26829,6 +26942,7 @@ array(
 		'app' => 'core',
 		'category' => 'konto',
 		'phrase' => 'error_missing',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -26848,6 +26962,7 @@ array(
 		'app' => 'core',
 		'category' => 'konto',
 		'phrase' => 'error_counter_level',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -26867,6 +26982,7 @@ array(
 		'app' => 'core',
 		'category' => 'konto',
 		'phrase' => 'error_delete_level',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -26887,6 +27003,7 @@ array(
 		'app' => 'core',
 		'category' => 'stv',
 		'phrase' => 'action_new',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -26906,6 +27023,7 @@ array(
 		'app' => 'core',
 		'category' => 'stv',
 		'phrase' => 'tab_details',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -26925,6 +27043,7 @@ array(
 		'app' => 'core',
 		'category' => 'stv',
 		'phrase' => 'tab_notes',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -26944,6 +27063,7 @@ array(
 		'app' => 'core',
 		'category' => 'stv',
 		'phrase' => 'tab_contact',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -26963,6 +27083,7 @@ array(
 		'app' => 'core',
 		'category' => 'stv',
 		'phrase' => 'tab_prestudent',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -26982,6 +27103,7 @@ array(
 		'app' => 'core',
 		'category' => 'stv',
 		'phrase' => 'tab_status',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -27001,6 +27123,7 @@ array(
 		'app' => 'core',
 		'category' => 'stv',
 		'phrase' => 'tab_konto',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -27020,6 +27143,7 @@ array(
 		'app' => 'core',
 		'category' => 'stv',
 		'phrase' => 'tab_resources',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -27039,6 +27163,7 @@ array(
 		'app' => 'core',
 		'category' => 'stv',
 		'phrase' => 'tab_grades',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -27059,6 +27184,7 @@ array(
 		'app' => 'core',
 		'category' => 'stv',
 		'phrase' => 'konto_counter',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -27078,6 +27204,7 @@ array(
 		'app' => 'core',
 		'category' => 'stv',
 		'phrase' => 'konto_payment_confirmation',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -27097,6 +27224,7 @@ array(
 		'app' => 'core',
 		'category' => 'stv',
 		'phrase' => 'konto_filter_count_0',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -27116,6 +27244,7 @@ array(
 		'app' => 'core',
 		'category' => 'stv',
 		'phrase' => 'konto_filter_missing_counter',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -27135,6 +27264,7 @@ array(
 		'app' => 'core',
 		'category' => 'stv',
 		'phrase' => 'konto_all_types',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -27154,6 +27284,7 @@ array(
 		'app' => 'core',
 		'category' => 'stv',
 		'phrase' => 'konto_filter_open',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -27173,6 +27304,7 @@ array(
 		'app' => 'core',
 		'category' => 'stv',
 		'phrase' => 'konto_filter_current_stg',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',

From ab8b46203e3d56abc6b04b64433394dc38615c05 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 25 Apr 2024 11:57:54 +0200
Subject: [PATCH 0641/1461] fhcapifactory add stv

---
 public/js/apps/api/fhcapifactory.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/public/js/apps/api/fhcapifactory.js b/public/js/apps/api/fhcapifactory.js
index c1f1e0d5c..9303a941c 100644
--- a/public/js/apps/api/fhcapifactory.js
+++ b/public/js/apps/api/fhcapifactory.js
@@ -1,5 +1,7 @@
 import Search from "./search.js";
+import stv from "../../api/stv.js";
 
 export default {
-    "Search": Search
+    "Search": Search,
+    stv
 };

From 912b018e32288c925c2ea3e2b326a9e503eed7f2 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 25 Apr 2024 11:59:12 +0200
Subject: [PATCH 0642/1461] Config typo

---
 .../controllers/components/stv/Config.php        | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/application/controllers/components/stv/Config.php b/application/controllers/components/stv/Config.php
index c06093c63..8fc6f8fb6 100644
--- a/application/controllers/components/stv/Config.php
+++ b/application/controllers/components/stv/Config.php
@@ -33,23 +33,23 @@ class Config extends FHC_Controller
 			'component' => './Stv/Studentenverwaltung/Details/Details.js'
 		];
 		$result['notes'] = [
-			'title' => $this->p->t('stv', 'notes'),
+			'title' => $this->p->t('stv', 'tab_notes'),
 			'component' => './Stv/Studentenverwaltung/Details/Notizen.js'
 		];
 		$result['contact'] = [
-			'title' => $this->p->t('stv', 'contact'),
+			'title' => $this->p->t('stv', 'tab_contact'),
 			'component' => './Stv/Studentenverwaltung/Details/Kontakt.js'
 		];
 		$result['prestudent'] = [
-			'title' => $this->p->t('stv', 'prestudent'),
+			'title' => $this->p->t('stv', 'tab_prestudent'),
 			'component' => './Stv/Studentenverwaltung/Details/Prestudent.js'
 		];
 		$result['status'] = [
-			'title' => $this->p->t('stv', 'status'),
+			'title' => $this->p->t('stv', 'tab_status'),
 			'component' => './Stv/Studentenverwaltung/Details/Status.js'
 		];
 		$result['banking'] = [
-			'title' => $this->p->t('stv', 'banking'),
+			'title' => $this->p->t('stv', 'tab_banking'),
 			'component' => './Stv/Studentenverwaltung/Details/Konto.js',
 			'config' => [
 				'showZahlungsbestaetigung' => (defined('ZAHLUNGSBESTAETIGUNG_ANZEIGEN') && ZAHLUNGSBESTAETIGUNG_ANZEIGEN),
@@ -61,11 +61,11 @@ class Config extends FHC_Controller
 			]
 		];
 		$result['resources'] = [
-			'title' => $this->p->t('stv', 'resources'),
+			'title' => $this->p->t('stv', 'tab_resources'),
 			'component' => './Stv/Studentenverwaltung/Details/Betriebsmittel.js'
 		];
 		$result['grades'] = [
-			'title' => $this->p->t('stv', 'grades'),
+			'title' => $this->p->t('stv', 'tab_grades'),
 			'component' => './Stv/Studentenverwaltung/Details/Noten.js'
 		];
 
@@ -80,7 +80,7 @@ class Config extends FHC_Controller
 	{
 		$result = [];
 		$result['banking'] = [
-			'title' => $this->p->t('stv', 'banking'),
+			'title' => $this->p->t('stv', 'tab_banking'),
 			'component' => './Stv/Studentenverwaltung/Details/Konto.js',
 			'config' => [
 				'showZahlungsbestaetigung' => (defined('ZAHLUNGSBESTAETIGUNG_ANZEIGEN') && ZAHLUNGSBESTAETIGUNG_ANZEIGEN),

From 4f4df8a8b78f02f5afe404e6940b87c5615ee80e Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 25 Apr 2024 13:09:10 +0200
Subject: [PATCH 0643/1461] Konto: more phrases

---
 .../Studentenverwaltung/Details/Konto/Edit.js |  29 ++---
 .../Studentenverwaltung/Details/Konto/New.js  |  30 ++---
 system/phrasesupdate.php                      | 122 +++++++++++++++++-
 3 files changed, 150 insertions(+), 31 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Konto/Edit.js b/public/js/components/Stv/Studentenverwaltung/Details/Konto/Edit.js
index d7b2976e3..26b8f0891 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Konto/Edit.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Konto/Edit.js
@@ -3,7 +3,6 @@ import CoreForm from "../../../../Form/Form.js";
 import FormValidation from "../../../../Form/Validation.js";
 import FormInput from "../../../../Form/Input.js";
 
-// TODO(chris): Phrasen
 
 export default {
 	components: {
@@ -40,7 +39,7 @@ export default {
 					this.$emit('saved', result.data);
 					this.loading = false;
 					this.$refs.modal.hide();
-					this.$fhcAlert.alertSuccess('Daten wurden gespeichert');
+					this.$fhcAlert.alertSuccess(this.$p.t('ui/gespeichert'));
 				})
 				.catch(error => {
 					this.$fhcAlert.handleSystemError(error);
@@ -66,21 +65,21 @@ export default {
 					v-if="config.showBuchungsnr"
 					v-model="data.buchungsnr"
 					name="buchungsnr"
-					label="Buchungsnr"
+					:label="$p.t('konto/buchungsnr')"
 					disabled
 					>
 				</form-input>
 				<form-input
 					v-model="data.betrag"
 					name="betrag"
-					label="Betrag"
+					:label="$p.t('konto/betrag')"
 					>
 				</form-input>
 				<form-input
 					type="DatePicker"
 					v-model="data.buchungsdatum"
 					name="buchungsdatum"
-					label="Buchungsdatum"
+					:label="$p.t('konto/buchungsdatum')"
 					:enable-time-picker="false"
 					auto-apply
 					>
@@ -88,21 +87,21 @@ export default {
 				<form-input
 					v-model="data.buchungstext"
 					name="buchungstext"
-					label="Buchungstext"
+					:label="$p.t('konto/buchungstext')"
 					>
 				</form-input>
 				<form-input
 					v-if="config.showMahnspanne"
 					v-model="data.mahnspanne"
 					name="mahnspanne"
-					label="Mahnspanne"
+					:label="$p.t('konto/mahnspanne')"
 					>
 				</form-input>
 				<form-input
 					type="select"
 					v-model="data.buchungstyp_kurzbz"
 					name="buchungstyp_kurzbz"
-					label="Typ"
+					:label="$p.t('konto/buchungstyp')"
 					>
 					<option v-for="typ in lists.buchungstypen" :key="typ.buchungstyp_kurzbz" :value="typ.buchungstyp_kurzbz" :class="typ.aktiv ? '' : 'text-decoration-line-through text-muted'">
 						{{ typ.beschreibung }}
@@ -112,7 +111,7 @@ export default {
 					type="select"
 					v-model="data.studiensemester_kurzbz"
 					name="studiensemester_kurzbz"
-					label="Studiensemester"
+					:label="$p.t('lehre/studiensemester')"
 					>
 					<option v-for="sem in lists.studiensemester" :key="sem.studiensemester_kurzbz" :value="sem.studiensemester_kurzbz">
 						{{ sem.studiensemester_kurzbz }}
@@ -122,7 +121,7 @@ export default {
 					type="select"
 					v-model="data.studiengang_kz"
 					name="studiengang_kz"
-					label="Studiengang"
+					:label="$p.t('lehre/studiengang')"
 					>
 					<option v-for="stg in lists.stgs" :key="stg.studiengang_kz" :value="stg.studiengang_kz">
 						{{ stg.kuerzel }}
@@ -132,13 +131,13 @@ export default {
 					v-if="config.showCreditpoints"
 					v-model="data.credit_points"
 					name="credit_points"
-					label="Credit Points"
+					:label="$p.t('konto/credit_points')"
 					>
 				</form-input>
 				<form-input
 					v-model="data.zahlungsreferenz"
 					name="zahlungsreferenz"
-					label="Zahlungsreferenz"
+					:label="$p.t('konto/reference')"
 					disabled
 					>
 				</form-input>
@@ -146,18 +145,18 @@ export default {
 					type="textarea"
 					v-model="data.anmerkung"
 					name="anmerkung"
-					label="Anmerkung"
+					:label="$p.t('global/anmerkung')"
 					>
 				</form-input>
 			</fieldset>
 
 			<template #title>
-				Edit Buchung #{{data.buchungsnr}}
+				{{ $p.t('stv/konto_title_edit', data) }}
 			</template>
 			<template #footer>
 				<button type="submit" class="btn btn-primary" :disabled="loading">
 					<i v-if="loading" class="fa fa-spinner fa-spin"></i>
-					Speichern
+					{{ $p.t('ui/speichern') }}
 				</button>
 			</template>
 		</bs-modal>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js b/public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js
index 90cdfdd2d..52e15a4d5 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js
@@ -4,7 +4,6 @@ import CoreForm from "../../../../Form/Form.js";
 import FormValidation from "../../../../Form/Validation.js";
 import FormInput from "../../../../Form/Input.js";
 
-// TODO(chris): Phrasen
 
 export default {
 	components: {
@@ -74,7 +73,7 @@ export default {
 					this.$emit('saved', result.data);
 					this.loading = false;
 					this.$refs.modal.hide();
-					this.$fhcAlert.alertSuccess('Daten wurden gespeichert');
+					this.$fhcAlert.alertSuccess(this.$p.t('ui/gespeichert'));
 				})
 				.catch(error => {
 					if (error)
@@ -125,7 +124,7 @@ export default {
 					type="select"
 					v-model="data.buchungstyp_kurzbz"
 					name="buchungstyp_kurzbz"
-					label="Typ"
+					:label="$p.t('konto/buchungstyp')"
 					@update:model-value="checkDefaultBetrag"
 					>
 					<option v-for="typ in activeBuchungstypen" :key="typ.buchungstyp_kurzbz" :value="typ.buchungstyp_kurzbz" :class="typ.aktiv ? '' : 'text-decoration-line-through text-muted'">
@@ -135,14 +134,14 @@ export default {
 				<form-input
 					v-model="data.betrag"
 					name="betrag"
-					label="Betrag"
+					:label="$p.t('konto/betrag')"
 					>
 				</form-input>
 				<form-input
 					type="DatePicker"
 					v-model="data.buchungsdatum"
 					name="buchungsdatum"
-					label="Buchungsdatum"
+					:label="$p.t('konto/buchungsdatum')"
 					:enable-time-picker="false"
 					auto-apply
 					>
@@ -150,21 +149,21 @@ export default {
 				<form-input
 					v-model="data.buchungstext"
 					name="buchungstext"
-					label="Buchungstext"
+					:label="$p.t('konto/buchungstext')"
 					>
 				</form-input>
 				<form-input
 					v-if="config.showMahnspanne"
 					v-model="data.mahnspanne"
 					name="mahnspanne"
-					label="Mahnspanne"
+					:label="$p.t('konto/mahnspanne')"
 					>
 				</form-input>
 				<form-input
 					type="select"
 					v-model="data.studiensemester_kurzbz"
 					name="studiensemester_kurzbz"
-					label="Studiensemester"
+					:label="$p.t('lehre/studiensemester')"
 					>
 					<option v-for="sem in reversedSems" :key="sem.studiensemester_kurzbz" :value="sem.studiensemester_kurzbz">
 						{{ sem.studiensemester_kurzbz }}
@@ -174,28 +173,29 @@ export default {
 					v-if="config.showCreditpoints"
 					v-model="data.credit_points"
 					name="credit_points"
-					label="Credit Points"
+					:label="$p.t('konto/credit_points')"
 					>
 				</form-input>
 				<form-input
 					type="textarea"
 					v-model="data.anmerkung"
 					name="anmerkung"
-					label="Anmerkung"
+					:label="$p.t('global/anmerkung')"
 					>
 				</form-input>
 			</fieldset>
 
 			<template #title>
-				New Buchung
-				<template v-if="personIds.length > 1">
-					({{ personIds.length }} Studenten)
-				</template>
+				{{ $p.t(
+					'stv',
+					personIds.length > 1 ? 'konto_title_new_multi' : 'konto_title_new',
+					{ x: personIds.length }
+				) }}
 			</template>
 			<template #footer>
 				<button type="submit" class="btn btn-primary" :disabled="loading">
 					<i v-if="loading" class="fa fa-spinner fa-spin"></i>
-					Speichern
+					{{ $p.t('ui/speichern') }}
 				</button>
 			</template>
 		</bs-modal>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 91c1851f4..07496a691 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -26858,6 +26858,66 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'konto',
+		'phrase' => 'mahnspanne',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Mahnspanne',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Dunning margin',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'konto',
+		'phrase' => 'credit_points',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Credit Points',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Credit Points',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'konto',
+		'phrase' => 'reference',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zahlungsreferenz',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Payment reference',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'konto',
@@ -27122,7 +27182,7 @@ array(
 	array(
 		'app' => 'core',
 		'category' => 'stv',
-		'phrase' => 'tab_konto',
+		'phrase' => 'tab_banking',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
@@ -27180,6 +27240,66 @@ array(
 		)
 	),
 	// konto
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'konto_title_new',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Neue Buchung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'New Booking',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'konto_title_new_multi',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Neue Buchung ({x} Studenten)',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'New Booking ({x} Students)',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'konto_title_edit',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Buchung #{buchungsnr} bearbeiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Edit Booking #{buchungsnr}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'stv',

From deb0197452a1ac06393df9125c5a2c91f3211fd1 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 25 Apr 2024 13:13:24 +0200
Subject: [PATCH 0644/1461] fixes the adminAnrechnungen page

---
 .../lehre/anrechnung/adminAnrechnung.php      | 44 ++++++++++---------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/application/views/lehre/anrechnung/adminAnrechnung.php b/application/views/lehre/anrechnung/adminAnrechnung.php
index 0656d8301..4c47302b8 100644
--- a/application/views/lehre/anrechnung/adminAnrechnung.php
+++ b/application/views/lehre/anrechnung/adminAnrechnung.php
@@ -9,7 +9,6 @@ $includesArray = array(
     'dialoglib' => true,
     'tabulator5' => true,
     'tabulator5JQuery' => true,
-    'cis' => true,
     'tablewidget' => true,
     'sbadmintemplate3' => true,
     'navigationwidget' => true,
@@ -51,7 +50,7 @@ $includesArray = array(
     ),
     'customCSSs' => array(
         'public/css/sbadmin2/tablesort_bootstrap.css',
-        'public/css/lehre/anrechnung.css',
+        'public/css/lehre/anrechnung.css'
     )
 );
 
@@ -66,22 +65,25 @@ $this->load->view('templates/FHC-Header', $includesArray);
         <div class="container-fluid">
 
             <!--Titel-->
-            <div class="my-4 border-bottom page-header">
+            <div class="page-header">
                 <h3><?php echo $this->p->t('anrechnung', 'anrechnungenVerwalten'); ?></h3>
-            </div>
+            </div><br>
 
             <!--Untertitel-->
-            <h4 class="my-4"><?php echo $this->p->t('anrechnung', 'anrechnungszeitraumFestlegen'); ?></h4>
-
-
-            <button class="btn btn-primary azrOpenModal" data-bs-toggle="modal" data-bs-target="#azrModal">
-                <i class="fa fa-plus"></i> <?php echo $this->p->t('anrechnung', 'anrechnungszeitraumHinzufuegen'); ?>
-            </button>
+            <h4><?php echo $this->p->t('anrechnung', 'anrechnungszeitraumFestlegen'); ?></h4><br>
 
+            <div class="row">
+                <div class="col-xs-4">
+                    <button class="btn btn-primary azrOpenModal" data-toggle="modal" data-target="#azrModal">
+                        <i class="fa fa-plus"></i>
+                        <?php echo $this->p->t('anrechnung', 'anrechnungszeitraumHinzufuegen'); ?>
+                    </button>
+                </div>
+            </div>
 
             <!-- Tabelle -->
             <div class="row">
-                <div class="col-12">
+                <div class="col-lg-12">
                     <?php $this->load->view('lehre/anrechnung/adminAnrechnungData.php'); ?>
                 </div>
             </div>
@@ -93,15 +95,16 @@ $this->load->view('templates/FHC-Header', $includesArray);
                     <div class="modal-content">
                         <div class="modal-header">
                             <h5 class="modal-title" id="azrModalLabel"></h5>
-                            <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
+                                    aria-hidden="true">&times;</span></button>
                         </div>
-                        <div class="modal-body my-4">
+                        <div class="modal-body">
                             <div class="row">
                                 <input type="hidden" id="anrechnungszeitraum_id" value="">
                                 <input type="hidden" id="defaultStudiensemester_kurzbz"
                                     value="<?php echo $studiensemester_kurzbz ?>">
-                                <div class="col-4">
-                                    <label for="studiensemester" class="fw-bold small">Studiensemester</label>
+                                <div class="col-xs-4">
+                                    <label for="studiensemester" class="small">Studiensemester</label>
                                     <?php
                                     echo $this->widgetlib->widget(
                                         'Studiensemester_widget',
@@ -110,18 +113,17 @@ $this->load->view('templates/FHC-Header', $includesArray);
                                         ),
                                         array(
                                             'name' => 'studiensemester',
-                                            'id' => 'studiensemester',
-                                            'class' => 'form-select w-auto ',
+                                            'id' => 'studiensemester'
                                         )
                                     );
                                     ?>
                                 </div>
-                                <div class="col-4">
-                                    <label for="azrStart" class="fw-bold small">Anr.-Zeitraum Start</label>
+                                <div class="col-xs-4">
+                                    <label for="azrStart" class="small">Anr.-Zeitraum Start</label>
                                     <input type="date" id="azrStart" value="" class="form-control" required>
                                 </div>
-                                <div class="col-4">
-                                    <label for="azrEnde" class="fw-bold small">Anr.-Zeitraum Ende</label>
+                                <div class="col-xs-4">
+                                    <label for="azrEnde" class="small">Anr.-Zeitraum Ende</label>
                                     <input type="date" id="azrEnde" value="" class="form-control" required>
                                 </div>
                             </div>

From d01b05fd73b7bee524cc17c3d80889a1d27c633f Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 25 Apr 2024 13:30:32 +0200
Subject: [PATCH 0645/1461] edit anrechnungszeitfenster does actually edit and
 not insert a new anrechnungszeitfenster

---
 public/js/lehre/anrechnung/adminAnrechnung.js | 33 +++++++++++++++----
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/public/js/lehre/anrechnung/adminAnrechnung.js b/public/js/lehre/anrechnung/adminAnrechnung.js
index 200b5854c..0b38478e9 100644
--- a/public/js/lehre/anrechnung/adminAnrechnung.js
+++ b/public/js/lehre/anrechnung/adminAnrechnung.js
@@ -1,6 +1,9 @@
 // TABULATOR
 // ---------------------------------------------------------------------------------------------------------------------
 
+// global variable used to check whether the modal button should insert or update a
+var isUpdate = false;
+
 // Add Edit and Update Buttons to table rows
 function func_tableBuilt(table) {
   table.tabulator(
@@ -104,12 +107,27 @@ $(function () {
     var anrechnungstart = $(".modal-body #azrStart").val();
     var anrechnungende = $(".modal-body #azrEnde").val();
 
-    // Insert Anrechnungszeitraum
-    adminAnrechnung.insertAzr(
-      studiensemester_kurzbz,
-      anrechnungstart,
-      anrechnungende
-    );
+    if (isUpdate) {
+      // read the id of the anrechungszeitraum
+      var anrechnungszeitraum_id = $(
+        ".modal-body #anrechnungszeitraum_id"
+      ).val();
+
+      // Update Anrechnungszeitraum
+      adminAnrechnung.updateAzr(
+        anrechnungszeitraum_id,
+        studiensemester_kurzbz,
+        anrechnungstart,
+        anrechnungende
+      );
+    } else {
+      // Insert Anrechnungszeitraum
+      adminAnrechnung.insertAzr(
+        studiensemester_kurzbz,
+        anrechnungstart,
+        anrechnungende
+      );
+    }
   });
 });
 
@@ -166,6 +184,9 @@ var adminAnrechnung = {
     // Open Modal
     $("#azrModal").modal("show");
 
+    // set global condition to true, so that the modal knows whether to display an insert or edit button
+    isUpdate = true;
+
     let row = cell.getRow();
     var anrechnungszeitraum_id = row.getData().anrechnungszeitraum_id;
     var studiensemester_kurzbz = row.getData().studiensemester_kurzbz;

From b7ffe00c69cde4cbfb3977d81d3630feb2fd9132 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 25 Apr 2024 14:16:28 +0200
Subject: [PATCH 0646/1461] sets the height of the adminZeitverfuegbarkeit to
 50% of the screen ehight

---
 .../views/lehre/lvplanung/adminZeitverfuegbarkeitData.php   | 1 +
 public/js/lehre/lvplanung/zverfueg.js                       | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/application/views/lehre/lvplanung/adminZeitverfuegbarkeitData.php b/application/views/lehre/lvplanung/adminZeitverfuegbarkeitData.php
index df4888b7d..131a8574e 100644
--- a/application/views/lehre/lvplanung/adminZeitverfuegbarkeitData.php
+++ b/application/views/lehre/lvplanung/adminZeitverfuegbarkeitData.php
@@ -40,6 +40,7 @@ $filterWidgetArray = array(
         ucfirst($this->p->t('global', 'notiz'))
     ),
     'datasetRepOptions' => '{
+        height: func_height(this),
 		layout: "fitColumns",           // fit columns to width of table
 		autoResize: false, 				// prevent auto resizing of table (false to allow adapting table size when cols are (de-)activated
         index: "zeitsperre_id",             // assign specific column as unique id (important for row indexing)
diff --git a/public/js/lehre/lvplanung/zverfueg.js b/public/js/lehre/lvplanung/zverfueg.js
index 6202bf1be..60f5044c1 100644
--- a/public/js/lehre/lvplanung/zverfueg.js
+++ b/public/js/lehre/lvplanung/zverfueg.js
@@ -1,3 +1,9 @@
+
+// Returns relative height (depending on screen size)
+function func_height(table) {
+    return $(window).height() * 0.5;
+}
+
 $(function(){
 
     // tableInit is called in the jquery_wrapper when the tableBuilt event was finished

From 7944ce091e481b9b4aa1965d0af3647e2b533bd9 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 25 Apr 2024 14:17:08 +0200
Subject: [PATCH 0647/1461] Konto: save filter settings

---
 .../api/frontend/v1/stv/Filter.php            | 90 +++++++++++++++++++
 public/js/api/stv.js                          |  2 +
 public/js/api/stv/filter.js                   | 10 +++
 .../Stv/Studentenverwaltung/Details/Konto.js  | 22 ++++-
 4 files changed, 120 insertions(+), 4 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/stv/Filter.php
 create mode 100644 public/js/api/stv/filter.js

diff --git a/application/controllers/api/frontend/v1/stv/Filter.php b/application/controllers/api/frontend/v1/stv/Filter.php
new file mode 100644
index 000000000..d5ee44d13
--- /dev/null
+++ b/application/controllers/api/frontend/v1/stv/Filter.php
@@ -0,0 +1,90 @@
+<?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');
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the back-end
+ * Provides data to the ajax get calls about the Studiengang filter
+ * Listens to ajax post calls to change the Studiengang filter data
+ * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
+ */
+class Filter extends FHCAPI_Controller
+{
+	/**
+	 * Calls the parent's constructor and prepares libraries and phrases
+	 */
+	public function __construct()
+	{
+		// TODO(chris): permissions
+		parent::__construct([
+			'getStg' => 'student/stammdaten:r',#self::PERM_LOGGED,
+			'setStg' => 'student/stammdaten:r'#self::PERM_LOGGED
+		]);
+
+		// Load models
+		$this->load->model('system/Variable_model', 'VariableModel');
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * Get current setting
+	 *
+	 * @return void
+	 */
+	public function getStg()
+	{
+		$result = $this->VariableModel->getVariables(getAuthUID(), ['kontofilterstg']);
+
+		#$data = $this->getDataOrTerminateWithError($result);
+		if (isError($result))
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		$data = $result->retval;
+
+		$this->terminateWithSuccess($data['kontofilterstg'] == 'true');
+	}
+
+	/**
+	 * Set current setting
+	 *
+	 * @return void
+	 */
+	public function setStg()
+	{
+		$this->load->library('form_validation');
+
+		$studiengang_kz = $this->input->post('studiengang_kz');
+
+		if ($studiengang_kz === null) {
+			$this->form_validation->set_rules('studiengang_kz', 'Studiengang', 'required');
+
+			if (!$this->form_validation->run())
+				$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$result = $this->VariableModel->setVariable(getAuthUID(), 'kontofilterstg', $studiengang_kz ? 'true' : 'false');
+
+		#$this->getDataOrTerminateWithError($result);
+		if (isError($result))
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+
+		$this->terminateWithSuccess(true);
+	}
+}
diff --git a/public/js/api/stv.js b/public/js/api/stv.js
index 2a84ab0b7..ab3e918a1 100644
--- a/public/js/api/stv.js
+++ b/public/js/api/stv.js
@@ -1,5 +1,7 @@
+import filter from './stv/filter.js';
 import konto from './stv/konto.js';
 
 export default {
+	filter,
 	konto
 };
\ No newline at end of file
diff --git a/public/js/api/stv/filter.js b/public/js/api/stv/filter.js
new file mode 100644
index 000000000..13c7f55fd
--- /dev/null
+++ b/public/js/api/stv/filter.js
@@ -0,0 +1,10 @@
+export default {
+	getStg() {
+		return this.$fhcApi.get('api/frontend/v1/stv/filter/getStg');
+	},
+	setStg(studiengang_kz) {
+		return this.$fhcApi.post('api/frontend/v1/stv/filter/setStg', {
+			studiengang_kz
+		});
+	}
+};
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Konto.js b/public/js/components/Stv/Studentenverwaltung/Details/Konto.js
index 1acfcd9dd..247a63d95 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Konto.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Konto.js
@@ -3,6 +3,7 @@ import FormInput from "../../../Form/Input.js";
 import KontoNew from "./Konto/New.js";
 import KontoEdit from "./Konto/Edit.js";
 
+const LOCAL_STORAGE_ID_FILTER = 'stv_details_konto_2024-01-11_filter';
 
 export default {
 	components: {
@@ -165,11 +166,24 @@ export default {
 					'_blank'
 				);
 			}
+		},
+		setFilter(type) {
+			if (type == 'open')
+				window.localStorage.setItem(LOCAL_STORAGE_ID_FILTER, this.filter ? 1 : 0);
+			else if (type == 'current_stg')
+				this.$fhcApi.factory
+					.stv.filter.setStg(this.studiengang_kz)
+					.catch(this.$fhcAlert.handleSystemError);
+
+			this.$nextTick(this.$refs.table.reloadTable);
 		}
 	},
 	created() {
-		// TODO(chris): persist filter + studiengang_kz
-		// TODO(chris): studiengang_kz in variablelib
+		this.filter = window.localStorage.getItem(LOCAL_STORAGE_ID_FILTER) == 1;
+		this.$fhcApi.factory
+			.stv.filter.getStg()
+			.then(result => this.studiengang_kz = result.data)
+			.catch(this.$fhcAlert.handleSystemError);
 	},
 	template: `
 	<div class="stv-details-konto h-100 d-flex flex-column">
@@ -180,7 +194,7 @@ export default {
 					type="checkbox"
 					:label="$p.t('stv/konto_filter_open')"
 					v-model="filter"
-					@update:model-value="() => $nextTick($refs.table.reloadTable)"
+					@update:model-value="setFilter('open')"
 					>
 				</form-input>
 			</div>
@@ -191,7 +205,7 @@ export default {
 					:label="$p.t('stv/konto_filter_current_stg')"
 					v-model="studiengang_kz_intern"
 					:disabled="!stg_kz"
-					@update:model-value="() => $nextTick($refs.table.reloadTable)"
+					@update:model-value="setFilter('current_stg')"
 					>
 				</form-input>
 			</div>

From 580b6239c2b8fa5489453a0de5945c57a2f38cec Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 25 Apr 2024 14:35:06 +0200
Subject: [PATCH 0648/1461] remove the body tag from all views that use the
 FHC-Header view

---
 application/views/codex/oehbeitrag.php                         | 2 --
 application/views/lehre/lehrauftrag/Dashboard.php              | 2 --
 application/views/lehre/lehrauftrag/LehrendeUebersicht.php     | 2 --
 application/views/lehre/lehrauftrag/acceptLehrauftrag.php      | 3 +--
 application/views/lehre/lehrauftrag/approveLehrauftrag.php     | 2 --
 application/views/lehre/lehrauftrag/orderLehrauftrag.php       | 3 +--
 application/views/lehre/lvplanung/adminZeitverfuegbarkeit.php  | 2 --
 application/views/lehre/pruefungsprotokollUebersicht.php       | 2 --
 application/views/organisation/reihungstest/reihungstest.php   | 2 --
 application/views/organisation/studienjahr.php                 | 3 +--
 application/views/person/bpk/bpkDetails.php                    | 2 --
 application/views/person/bpk/bpkwartung.php                    | 2 --
 application/views/person/gradelist/gradelist.php               | 2 --
 application/views/person/gruppenmanagement/benutzergruppe.php  | 2 --
 .../views/person/gruppenmanagement/gruppenmanagement.php       | 2 --
 application/views/system/infocenter/infocenterAbgewiesen.php   | 2 --
 application/views/system/infocenter/infocenterAufgenommen.php  | 2 --
 application/views/system/infocenter/infocenterFreigegeben.php  | 2 --
 .../system/infocenter/infocenterReihungstestAbsolviert.php     | 2 --
 application/views/system/infocenter/infocenterZgvDetails.php   | 2 --
 .../views/system/infocenter/infocenterZgvUeberpruefung.php     | 2 --
 application/views/system/infocenter/studiengangZgvInfo.php     | 2 --
 application/views/system/issues/issues.php                     | 3 +--
 application/views/system/issues/issuesKonfiguration.php        | 3 +--
 application/views/system/issues/issuesZustaendigkeiten.php     | 2 --
 application/views/system/jq/jobsQueueViewer.php                | 2 --
 application/views/system/login/usernamePassword.php            | 3 +--
 application/views/system/messages/FAShtmlWriteTemplate.php     | 2 --
 application/views/system/messages/ajaxRead.php                 | 2 --
 application/views/system/messages/ajaxWrite.php                | 2 --
 application/views/system/messages/ajaxWriteReply.php           | 2 --
 application/views/system/messages/htmlMessageSentError.php     | 2 --
 application/views/system/messages/htmlMessageSentSuccess.php   | 2 --
 application/views/system/messages/htmlRead.php                 | 2 --
 application/views/system/messages/htmlWriteReply.php           | 2 --
 application/views/system/messages/htmlWriteTemplate.php        | 2 --
 36 files changed, 6 insertions(+), 72 deletions(-)

diff --git a/application/views/codex/oehbeitrag.php b/application/views/codex/oehbeitrag.php
index feebeddef..ba99bbf0c 100644
--- a/application/views/codex/oehbeitrag.php
+++ b/application/views/codex/oehbeitrag.php
@@ -26,7 +26,6 @@ $this->load->view(
 );
 ?>
 
-<body>
 <div id="wrapper">
 
 	<?php echo $this->widgetlib->widget('NavigationWidget'); ?>
@@ -63,6 +62,5 @@ $this->load->view(
 		</div>
 	</div>
 </div>
-</body>
 
 <?php $this->load->view('templates/FHC-Footer'); ?>
diff --git a/application/views/lehre/lehrauftrag/Dashboard.php b/application/views/lehre/lehrauftrag/Dashboard.php
index d89636f04..3da01700c 100644
--- a/application/views/lehre/lehrauftrag/Dashboard.php
+++ b/application/views/lehre/lehrauftrag/Dashboard.php
@@ -16,7 +16,6 @@ $this->load->view(
 );
 ?>
 
-<body>
     <?php echo $this->widgetlib->widget('NavigationWidget'); ?>
     <div id="page-wrapper">
         <div class="container-fluid">
@@ -33,6 +32,5 @@ $this->load->view(
 
         </div>
     </div>
-</body>
 
 <?php $this->load->view('templates/FHC-Footer'); ?>
diff --git a/application/views/lehre/lehrauftrag/LehrendeUebersicht.php b/application/views/lehre/lehrauftrag/LehrendeUebersicht.php
index d64381547..4f49a2518 100644
--- a/application/views/lehre/lehrauftrag/LehrendeUebersicht.php
+++ b/application/views/lehre/lehrauftrag/LehrendeUebersicht.php
@@ -13,7 +13,6 @@ $this->load->view(
 );
 ?>
 
-<body>
 <?php echo $this->widgetlib->widget('NavigationWidget'); ?>
 	<div id="page-wrapper">
 		<div class="container-fluid">
@@ -34,6 +33,5 @@ $this->load->view(
 
 		</div>
 	</div>
-</body>
 
 <?php $this->load->view('templates/FHC-Footer'); ?>
diff --git a/application/views/lehre/lehrauftrag/acceptLehrauftrag.php b/application/views/lehre/lehrauftrag/acceptLehrauftrag.php
index 96345288e..bdc839155 100644
--- a/application/views/lehre/lehrauftrag/acceptLehrauftrag.php
+++ b/application/views/lehre/lehrauftrag/acceptLehrauftrag.php
@@ -86,7 +86,7 @@ $this->load->view(
 );
 ?>
 
-<body>
+
 <div id="page-wrapper">
 	<div class="container-fluid">
 
@@ -227,7 +227,6 @@ $this->load->view(
 	</div><!-- end container -->
 </div><!-- end page-wrapper -->
 <br>
-</body>
 
 <?php $this->load->view('templates/FHC-Footer'); ?>
 
diff --git a/application/views/lehre/lehrauftrag/approveLehrauftrag.php b/application/views/lehre/lehrauftrag/approveLehrauftrag.php
index fa706f64f..dadc9a193 100644
--- a/application/views/lehre/lehrauftrag/approveLehrauftrag.php
+++ b/application/views/lehre/lehrauftrag/approveLehrauftrag.php
@@ -97,7 +97,6 @@ $this->load->view(
 );
 ?>
 
-<body>
     <?php echo $this->widgetlib->widget('NavigationWidget'); ?>
     <div id="page-wrapper">
     	<div class="container-fluid">
@@ -209,7 +208,6 @@ $this->load->view(
     	</div><!-- end container -->
     </div><!-- end page-wrapper -->
 	<br>
-</body>
 
 <?php $this->load->view('templates/FHC-Footer'); ?>
 
diff --git a/application/views/lehre/lehrauftrag/orderLehrauftrag.php b/application/views/lehre/lehrauftrag/orderLehrauftrag.php
index fbab8490a..ce2466906 100644
--- a/application/views/lehre/lehrauftrag/orderLehrauftrag.php
+++ b/application/views/lehre/lehrauftrag/orderLehrauftrag.php
@@ -97,7 +97,7 @@ $this->load->view(
 );
 ?>
 
-<body>
+
     <?php echo $this->widgetlib->widget('NavigationWidget'); ?>
     <div id="page-wrapper">
         <div class="container-fluid">
@@ -206,7 +206,6 @@ $this->load->view(
         </div><!-- end container -->
     </div><!-- end page-wrapper -->
 	<br>
-</body>
 
 <?php $this->load->view('templates/FHC-Footer'); ?>
 
diff --git a/application/views/lehre/lvplanung/adminZeitverfuegbarkeit.php b/application/views/lehre/lvplanung/adminZeitverfuegbarkeit.php
index be61f756d..e9bb71038 100644
--- a/application/views/lehre/lvplanung/adminZeitverfuegbarkeit.php
+++ b/application/views/lehre/lvplanung/adminZeitverfuegbarkeit.php
@@ -44,7 +44,6 @@ $this->load->view(
 );
 ?>
 
-<body>
     <?php echo $this->widgetlib->widget('NavigationWidget'); ?>
     <div id="page-wrapper">
         <div class="container-fluid">
@@ -170,6 +169,5 @@ $this->load->view(
         </div><!-- end container -->
     </div><!-- end page-wrapper -->
     <br>
-</body>
 
 <?php $this->load->view('templates/FHC-Footer'); ?>
\ No newline at end of file
diff --git a/application/views/lehre/pruefungsprotokollUebersicht.php b/application/views/lehre/pruefungsprotokollUebersicht.php
index 6b203f843..e75e3c914 100644
--- a/application/views/lehre/pruefungsprotokollUebersicht.php
+++ b/application/views/lehre/pruefungsprotokollUebersicht.php
@@ -30,7 +30,6 @@
 	);
 ?>
 
-<body>
 <div id="page-wrapper">
 	<div class="container-fluid">
 		<div class="row">
@@ -66,6 +65,5 @@
 		</div>
 	</div>
 </div>
-</body>
 
 <?php $this->load->view('templates/FHC-Footer'); ?>
diff --git a/application/views/organisation/reihungstest/reihungstest.php b/application/views/organisation/reihungstest/reihungstest.php
index 357c11c10..dc53bf737 100644
--- a/application/views/organisation/reihungstest/reihungstest.php
+++ b/application/views/organisation/reihungstest/reihungstest.php
@@ -21,7 +21,6 @@
 	);
 ?>
 
-<body>
 	<div id="wrapper">
 
 		<?php echo $this->widgetlib->widget('NavigationWidget'); ?>
@@ -41,6 +40,5 @@
 			</div>
 		</div>
 	</div>
-</body>
 
 <?php $this->load->view('templates/FHC-Footer'); ?>
diff --git a/application/views/organisation/studienjahr.php b/application/views/organisation/studienjahr.php
index 8cef4634d..a14c408e7 100644
--- a/application/views/organisation/studienjahr.php
+++ b/application/views/organisation/studienjahr.php
@@ -1,7 +1,7 @@
 <?php
 $this->load->view('templates/header', array('title' => 'StudienjahrList', 'tablesort' => true, 'tableid' => 't1', 'headers' => '2:{sorter:false}, 3:{sorter:false}', 'sortList' => '0,1'));
 ?>
-<body>
+
 <div class="row">
 	<div class="span4">
 		<h2>Studienjahr</h2>
@@ -40,7 +40,6 @@ $this->load->view('templates/header', array('title' => 'StudienjahrList', 'table
 		</table>
 	</div>
 </div>
-</body>
 </html>
 
 
diff --git a/application/views/person/bpk/bpkDetails.php b/application/views/person/bpk/bpkDetails.php
index bd6191c6a..b45a75304 100644
--- a/application/views/person/bpk/bpkDetails.php
+++ b/application/views/person/bpk/bpkDetails.php
@@ -34,7 +34,6 @@
 		)
 	);
 ?>
-<body>
 <div id="wrapper">
 
 	<?php echo $this->widgetlib->widget('NavigationWidget'); ?>
@@ -155,6 +154,5 @@
 		</div> <!-- ./container-fluid-->
 	</div> <!-- ./page-wrapper-->
 </div> <!-- ./wrapper -->
-</body>
 
 <?php $this->load->view('templates/FHC-Footer'); ?>
diff --git a/application/views/person/bpk/bpkwartung.php b/application/views/person/bpk/bpkwartung.php
index f6283ee3b..dfd2951c3 100644
--- a/application/views/person/bpk/bpkwartung.php
+++ b/application/views/person/bpk/bpkwartung.php
@@ -21,7 +21,6 @@
 	);
 ?>
 
-<body>
 	<div id="wrapper">
 
 		<?php echo $this->widgetlib->widget('NavigationWidget'); ?>
@@ -46,6 +45,5 @@
 			</div>
 		</div>
 	</div>
-</body>
 
 <?php $this->load->view('templates/FHC-Footer'); ?>
diff --git a/application/views/person/gradelist/gradelist.php b/application/views/person/gradelist/gradelist.php
index 06d499ded..9a7469f0b 100644
--- a/application/views/person/gradelist/gradelist.php
+++ b/application/views/person/gradelist/gradelist.php
@@ -18,7 +18,6 @@
 		)
 	);
 ?>
-<body>
 	<div id="wrapper">
 		<div id="page-wrapper">
 			<div class="container-fluid">
@@ -63,7 +62,6 @@
 			</div>
 		</div>
 	</div>
-</body>
 
 <?php $this->load->view('templates/FHC-Footer'); ?>
 
diff --git a/application/views/person/gruppenmanagement/benutzergruppe.php b/application/views/person/gruppenmanagement/benutzergruppe.php
index c076f6dd0..5cf404aab 100644
--- a/application/views/person/gruppenmanagement/benutzergruppe.php
+++ b/application/views/person/gruppenmanagement/benutzergruppe.php
@@ -22,7 +22,6 @@
 	);
 ?>
 
-<body>
 	<div id="wrapper">
 
 		<?php echo $this->widgetlib->widget('NavigationWidget'); ?>
@@ -70,6 +69,5 @@
 			</div>
 		</div>
 	</div>
-</body>
 
 <?php $this->load->view('templates/FHC-Footer'); ?>
diff --git a/application/views/person/gruppenmanagement/gruppenmanagement.php b/application/views/person/gruppenmanagement/gruppenmanagement.php
index 87c44c1b9..90b03a5a0 100644
--- a/application/views/person/gruppenmanagement/gruppenmanagement.php
+++ b/application/views/person/gruppenmanagement/gruppenmanagement.php
@@ -21,7 +21,6 @@
 	);
 ?>
 
-<body>
 	<div id="wrapper">
 
 		<?php echo $this->widgetlib->widget('NavigationWidget'); ?>
@@ -41,6 +40,5 @@
 			</div>
 		</div>
 	</div>
-</body>
 
 <?php $this->load->view('templates/FHC-Footer'); ?>
diff --git a/application/views/system/infocenter/infocenterAbgewiesen.php b/application/views/system/infocenter/infocenterAbgewiesen.php
index 55987a3bd..921d9f224 100644
--- a/application/views/system/infocenter/infocenterAbgewiesen.php
+++ b/application/views/system/infocenter/infocenterAbgewiesen.php
@@ -25,7 +25,6 @@
 	);
 ?>
 
-<body>
 	<div id="wrapper">
 
 		<?php echo $this->widgetlib->widget('NavigationWidget'); ?>
@@ -45,6 +44,5 @@
 			</div>
 		</div>
 	</div>
-</body>
 
 <?php $this->load->view('templates/FHC-Footer'); ?>
diff --git a/application/views/system/infocenter/infocenterAufgenommen.php b/application/views/system/infocenter/infocenterAufgenommen.php
index 6d65c0f7c..680d66a8a 100644
--- a/application/views/system/infocenter/infocenterAufgenommen.php
+++ b/application/views/system/infocenter/infocenterAufgenommen.php
@@ -25,7 +25,6 @@
 	);
 ?>
 
-<body>
 	<div id="wrapper">
 
 		<?php echo $this->widgetlib->widget('NavigationWidget'); ?>
@@ -45,6 +44,5 @@
 			</div>
 		</div>
 	</div>
-</body>
 
 <?php $this->load->view('templates/FHC-Footer'); ?>
diff --git a/application/views/system/infocenter/infocenterFreigegeben.php b/application/views/system/infocenter/infocenterFreigegeben.php
index d3e44ea95..a240a0b5c 100644
--- a/application/views/system/infocenter/infocenterFreigegeben.php
+++ b/application/views/system/infocenter/infocenterFreigegeben.php
@@ -25,7 +25,6 @@
 	);
 ?>
 
-<body>
 	<div id="wrapper">
 
 		<?php echo $this->widgetlib->widget('NavigationWidget'); ?>
@@ -46,6 +45,5 @@
 			</div>
 		</div>
 	</div>
-</body>
 
 <?php $this->load->view('templates/FHC-Footer'); ?>
diff --git a/application/views/system/infocenter/infocenterReihungstestAbsolviert.php b/application/views/system/infocenter/infocenterReihungstestAbsolviert.php
index 71a7a1d5e..a86e0df97 100644
--- a/application/views/system/infocenter/infocenterReihungstestAbsolviert.php
+++ b/application/views/system/infocenter/infocenterReihungstestAbsolviert.php
@@ -25,7 +25,6 @@
 	);
 ?>
 
-<body>
 	<div id="wrapper">
 
 		<?php echo $this->widgetlib->widget('NavigationWidget'); ?>
@@ -46,6 +45,5 @@
 			</div>
 		</div>
 	</div>
-</body>
 
 <?php $this->load->view('templates/FHC-Footer'); ?>
diff --git a/application/views/system/infocenter/infocenterZgvDetails.php b/application/views/system/infocenter/infocenterZgvDetails.php
index aefd95da0..eb9b4d2ee 100644
--- a/application/views/system/infocenter/infocenterZgvDetails.php
+++ b/application/views/system/infocenter/infocenterZgvDetails.php
@@ -52,7 +52,6 @@
 		)
 	);
 ?>
-<body>
 <div id="wrapper">
 
 	<?php echo $this->widgetlib->widget('NavigationWidget'); ?>
@@ -241,6 +240,5 @@
 	</div> <!-- ./page-wrapper-->
 </div> <!-- ./wrapper -->
 <button id="scrollToTop" title="Go to top"><i class="fa fa-chevron-up"></i></button>
-</body>
 
 <?php $this->load->view('templates/FHC-Footer'); ?>
diff --git a/application/views/system/infocenter/infocenterZgvUeberpruefung.php b/application/views/system/infocenter/infocenterZgvUeberpruefung.php
index 7b285edb2..7b6b430d6 100644
--- a/application/views/system/infocenter/infocenterZgvUeberpruefung.php
+++ b/application/views/system/infocenter/infocenterZgvUeberpruefung.php
@@ -24,7 +24,6 @@ $this->load->view(
 );
 ?>
 
-<body>
 <div id="wrapper">
 
     <?php echo $this->widgetlib->widget('NavigationWidget'); ?>
@@ -44,6 +43,5 @@ $this->load->view(
         </div>
     </div>
 </div>
-</body>
 
 <?php $this->load->view('templates/FHC-Footer'); ?>
diff --git a/application/views/system/infocenter/studiengangZgvInfo.php b/application/views/system/infocenter/studiengangZgvInfo.php
index 8b6d1a636..49862f282 100644
--- a/application/views/system/infocenter/studiengangZgvInfo.php
+++ b/application/views/system/infocenter/studiengangZgvInfo.php
@@ -11,7 +11,6 @@ $this->load->view(
 	)
 );
 ?>
-<body>
 	<div id="wrapper">
 		<div id="page-wrapper">
 			<div class="container-fluid">
@@ -36,7 +35,6 @@ $this->load->view(
 			</div>
 		</div>
 	</div>
-</body>
 
 <?php $this->load->view('templates/FHC-Footer'); ?>
 
diff --git a/application/views/system/issues/issues.php b/application/views/system/issues/issues.php
index 5e8efd547..d39ccb23f 100644
--- a/application/views/system/issues/issues.php
+++ b/application/views/system/issues/issues.php
@@ -24,7 +24,7 @@ $this->load->view(
 );
 ?>
 
-<body>
+
 <div id="wrapper">
 
 	<?php echo $this->widgetlib->widget('NavigationWidget'); ?>
@@ -44,6 +44,5 @@ $this->load->view(
 		</div>
 	</div>
 </div>
-</body>
 
 <?php $this->load->view('templates/FHC-Footer'); ?>
diff --git a/application/views/system/issues/issuesKonfiguration.php b/application/views/system/issues/issuesKonfiguration.php
index dbd62a26a..a045b1bcf 100644
--- a/application/views/system/issues/issuesKonfiguration.php
+++ b/application/views/system/issues/issuesKonfiguration.php
@@ -24,7 +24,7 @@ $this->load->view(
 );
 ?>
 
-<body>
+
 <div id="wrapper">
 
 	<?php echo $this->widgetlib->widget('NavigationWidget'); ?>
@@ -195,6 +195,5 @@ $this->load->view(
 	</div>
 
 </div>
-</body>
 
 <?php $this->load->view('templates/FHC-Footer'); ?>
diff --git a/application/views/system/issues/issuesZustaendigkeiten.php b/application/views/system/issues/issuesZustaendigkeiten.php
index 9a82665a0..0ca60d0c3 100644
--- a/application/views/system/issues/issuesZustaendigkeiten.php
+++ b/application/views/system/issues/issuesZustaendigkeiten.php
@@ -24,7 +24,6 @@ $this->load->view(
 );
 ?>
 
-<body>
 <div id="wrapper">
 
 	<?php echo $this->widgetlib->widget('NavigationWidget'); ?>
@@ -163,6 +162,5 @@ $this->load->view(
 	</div>
 
 </div>
-</body>
 
 <?php $this->load->view('templates/FHC-Footer'); ?>
diff --git a/application/views/system/jq/jobsQueueViewer.php b/application/views/system/jq/jobsQueueViewer.php
index bf4e16645..fc2d83bc7 100644
--- a/application/views/system/jq/jobsQueueViewer.php
+++ b/application/views/system/jq/jobsQueueViewer.php
@@ -22,7 +22,6 @@
 	);
 ?>
 
-<body>
 	<div id="wrapper">
 
 		<?php echo $this->widgetlib->widget('NavigationWidget'); ?>
@@ -42,6 +41,5 @@
 			</div>
 		</div>
 	</div>
-</body>
 
 <?php $this->load->view('templates/FHC-Footer'); ?>
diff --git a/application/views/system/login/usernamePassword.php b/application/views/system/login/usernamePassword.php
index ba6062b46..d695089b4 100644
--- a/application/views/system/login/usernamePassword.php
+++ b/application/views/system/login/usernamePassword.php
@@ -16,7 +16,7 @@
 	);
 ?>
 
-<body>
+
 	<div class="login-form">
 
 		<p class="text-center">
@@ -40,6 +40,5 @@
 		<p class="text-center"><a href="#">Forgot Password?</a></p>
 
 	</div>
-</body>
 
 <?php $this->load->view('templates/FHC-Footer'); ?>
diff --git a/application/views/system/messages/FAShtmlWriteTemplate.php b/application/views/system/messages/FAShtmlWriteTemplate.php
index 83f895d14..3ab95ac91 100644
--- a/application/views/system/messages/FAShtmlWriteTemplate.php
+++ b/application/views/system/messages/FAShtmlWriteTemplate.php
@@ -17,7 +17,6 @@
 		)
 	);
 ?>
-<body>
 	<div id="wrapper">
 		<div id="page-wrapper">
 			<div class="container-fluid">
@@ -191,7 +190,6 @@
 			</div>
 		</div>
 	</div>
-</body>
 
 <?php $this->load->view("templates/FHC-Footer"); ?>
 
diff --git a/application/views/system/messages/ajaxRead.php b/application/views/system/messages/ajaxRead.php
index 4c1a77deb..0f066a28b 100644
--- a/application/views/system/messages/ajaxRead.php
+++ b/application/views/system/messages/ajaxRead.php
@@ -19,7 +19,6 @@
 		)
 	);
 ?>
-	<body>
 
 		<fieldset>
 
@@ -56,6 +55,5 @@
 
 		<div id="readMessagePanel"></div>
 
-	</body>
 
 <?php $this->load->view("templates/FHC-Footer"); ?>
diff --git a/application/views/system/messages/ajaxWrite.php b/application/views/system/messages/ajaxWrite.php
index b3a598506..cfcf0e4aa 100644
--- a/application/views/system/messages/ajaxWrite.php
+++ b/application/views/system/messages/ajaxWrite.php
@@ -17,7 +17,6 @@
 		)
 	);
 ?>
-	<body>
 		<div id="wrapper">
 			<div id="page-wrapper">
 				<div class="container-fluid">
@@ -101,6 +100,5 @@
 				</div>
 			</div>
 		</div>
-	</body>
 
 <?php $this->load->view("templates/FHC-Footer"); ?>
diff --git a/application/views/system/messages/ajaxWriteReply.php b/application/views/system/messages/ajaxWriteReply.php
index 08dc188fa..9e0ceb190 100644
--- a/application/views/system/messages/ajaxWriteReply.php
+++ b/application/views/system/messages/ajaxWriteReply.php
@@ -17,7 +17,6 @@
 		)
 	);
 ?>
-	<body>
 		<div id="wrapper">
 			<div id="page-wrapper">
 				<div class="container-fluid">
@@ -96,6 +95,5 @@
 				</div>
 			</div>
 		</div>
-	</body>
 
 <?php $this->load->view("templates/FHC-Footer"); ?>
diff --git a/application/views/system/messages/htmlMessageSentError.php b/application/views/system/messages/htmlMessageSentError.php
index f8a0f8491..ead64808c 100644
--- a/application/views/system/messages/htmlMessageSentError.php
+++ b/application/views/system/messages/htmlMessageSentError.php
@@ -12,7 +12,6 @@
 	);
 ?>
 
-<body>
 	<div id="wrapper">
 		<div id="page-wrapper">
 			<div class="container-fluid">
@@ -77,6 +76,5 @@
 			</div>
 		</div>
 	</div>
-</body>
 
 <?php $this->load->view("templates/FHC-Footer"); ?>
diff --git a/application/views/system/messages/htmlMessageSentSuccess.php b/application/views/system/messages/htmlMessageSentSuccess.php
index 91eeab519..5055e2793 100644
--- a/application/views/system/messages/htmlMessageSentSuccess.php
+++ b/application/views/system/messages/htmlMessageSentSuccess.php
@@ -12,7 +12,6 @@
 	);
 ?>
 
-<body>
 	<div id="wrapper">
 		<div id="page-wrapper">
 			<div class="container-fluid">
@@ -77,6 +76,5 @@
 			</div>
 		</div>
 	</div>
-</body>
 
 <?php $this->load->view("templates/FHC-Footer"); ?>
diff --git a/application/views/system/messages/htmlRead.php b/application/views/system/messages/htmlRead.php
index 35e162b70..7bbf50aa1 100644
--- a/application/views/system/messages/htmlRead.php
+++ b/application/views/system/messages/htmlRead.php
@@ -11,7 +11,6 @@
 		)
 	);
 ?>
-	<body>
 		<div id="wrapper">
 			<div id="page-wrapper">
 				<div class="container-fluid">
@@ -99,6 +98,5 @@
 				</div>
 			</div>
 		</div>
-	</body>
 
 <?php $this->load->view("templates/FHC-Footer"); ?>
diff --git a/application/views/system/messages/htmlWriteReply.php b/application/views/system/messages/htmlWriteReply.php
index d2150c1fb..0015022cf 100644
--- a/application/views/system/messages/htmlWriteReply.php
+++ b/application/views/system/messages/htmlWriteReply.php
@@ -13,7 +13,6 @@
 		)
 	);
 ?>
-	<body>
 		<div id="wrapper">
 			<div id="page-wrapper">
 				<div class="container-fluid">
@@ -88,6 +87,5 @@
 				</div>
 			</div>
 		</div>
-	</body>
 
 <?php $this->load->view("templates/FHC-Footer"); ?>
diff --git a/application/views/system/messages/htmlWriteTemplate.php b/application/views/system/messages/htmlWriteTemplate.php
index 42a31f374..ca09558fc 100644
--- a/application/views/system/messages/htmlWriteTemplate.php
+++ b/application/views/system/messages/htmlWriteTemplate.php
@@ -17,7 +17,6 @@
 		)
 	);
 ?>
-<body>
 	<div id="wrapper">
 		<div id="page-wrapper">
 			<div class="container-fluid">
@@ -191,6 +190,5 @@
 			</div>
 		</div>
 	</div>
-</body>
 
 <?php $this->load->view("templates/FHC-Footer"); ?>

From 08dd6a7783f29b43061acd7ccfce87a348e0fb79 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 25 Apr 2024 15:11:16 +0200
Subject: [PATCH 0649/1461] add dvendegrund_kurzbz and dvendegrund_anmerkung
 when reading dvs from db

---
 .../models/vertragsbestandteil/Dienstverhaeltnis_model.php      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/application/models/vertragsbestandteil/Dienstverhaeltnis_model.php b/application/models/vertragsbestandteil/Dienstverhaeltnis_model.php
index 2fdfcffe2..12f7af220 100644
--- a/application/models/vertragsbestandteil/Dienstverhaeltnis_model.php
+++ b/application/models/vertragsbestandteil/Dienstverhaeltnis_model.php
@@ -31,6 +31,8 @@ class Dienstverhaeltnis_model extends DB_Model
             org.bezeichnung oe_bezeichnung,
             dv.von,
             dv.bis,
+	    dv.dvendegrund_kurzbz,
+	    dv.dvendegrund_anmerkung,
             dv.vertragsart_kurzbz,
             dv.updateamum,
             dv.updatevon

From e4f1da751ddb2b3a67cae46369157fc1ce1cad87 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 25 Apr 2024 15:19:24 +0200
Subject: [PATCH 0650/1461] migrating the acceptLehrauftrags view to bootstrap
 5

---
 .../lehre/lehrauftrag/acceptLehrauftrag.php   | 63 ++++++++++---------
 .../lehrauftrag/acceptLehrauftragData.php     |  1 +
 .../lehrauftrag/acceptLehrauftragHelp.php     | 20 +++---
 3 files changed, 46 insertions(+), 38 deletions(-)

diff --git a/application/views/lehre/lehrauftrag/acceptLehrauftrag.php b/application/views/lehre/lehrauftrag/acceptLehrauftrag.php
index bdc839155..8c3312932 100644
--- a/application/views/lehre/lehrauftrag/acceptLehrauftrag.php
+++ b/application/views/lehre/lehrauftrag/acceptLehrauftrag.php
@@ -6,7 +6,7 @@ $this->load->view(
 		'jquery3' => true,
 		'jqueryui1' => true,
 		'jquerycheckboxes1' => true,
-		'bootstrap3' => true,
+		'bootstrap5' => true,
 		'fontawesome4' => true,
 		'sbadmintemplate' => false,
 		'tabulator5' => true,
@@ -92,8 +92,8 @@ $this->load->view(
 
 		<!-- title & helper link -->
 		<div class="row">
-			<div class="col-lg-12 page-header">
-				<a class="pull-right" data-toggle="collapse" href="#collapseHelp" aria-expanded="false" aria-controls="collapseExample">
+			<div class="col-12 page-header">
+				<a class="float-end" data-bs-toggle="collapse" href="#collapseHelp" aria-expanded="false" aria-controls="collapseExample">
 					<?php echo $this->p->t('ui', 'hilfeZuDieserSeite'); ?>
 				</a>
 				<h3>
@@ -104,19 +104,20 @@ $this->load->view(
 
 		<!-- helper collapse module -->
 		<div class="row">
-			<div class="col-lg-12 collapse" id="collapseHelp">
-				<div class="well">
+			<div class="col-12 collapse my-4" id="collapseHelp">
+				<div class="card p-3">
+					
 					<?php $this->load->view('lehre/lehrauftrag/acceptLehrauftragHelp') ?>
-				</div> <!--./well-->
+				</div> 
 			</div>
 		</div>
 
 		<!-- dropdown widgets -->
 		<div class="row">
-			<div class="col-lg-12">
-				<form id="formLehrauftrag" class="form-inline" action="" method="get">
+			<div class="col-12">
+				<form id="formLehrauftrag" class="row align-items-center" action="" method="get">
 					<input type="hidden" id="uid" name="uid" value="<?php echo getAuthUID(); ?>">
-					<div class="form-group">
+					<div class="col-auto">
 						<?php
 						echo $this->widgetlib->widget(
 							'Studiensemester_widget',
@@ -130,14 +131,14 @@ $this->load->view(
 						);
 						?>
 					</div>
-					<button type="submit" name="submit" value="anzeigen" class="btn btn-default form-group"><?php echo ucfirst($this->p->t('ui', 'anzeigen')); ?></button>
+					<button type="submit" name="submit" value="anzeigen" class="btn btn-outline-secondary col-auto"><?php echo ucfirst($this->p->t('ui', 'anzeigen')); ?></button>
 				</form>
 			</div>
 		</div>
 
 		<!-- tabulator data table 'Lehrauftraege annehmen'-->
 		<div class="row">
-			<div class="col-lg-12">
+			<div class="col-12">
 				<?php $this->load->view('lehre/lehrauftrag/acceptLehrauftragData.php'); ?>
 			</div>
 		</div>
@@ -146,10 +147,10 @@ $this->load->view(
 		<!-- link for external lectors 'Informationsblatt fuer externe Lehrende'. Show only for external lecturers -->
 
 		<div class="row">
-			<div class="col-xs-12">
-				<span class="pull-left"><?php echo $this->p->t('ui' , 'hinweistextLehrauftrag'); ?></span>
+			<div class="col-12">
+				<span class="float-start"><?php echo $this->p->t('ui' , 'hinweistextLehrauftrag'); ?></span>
 				<?php if ($is_external_lector): ?>
-					<span class="pull-right"><?php echo $this->p->t('dms' , 'informationsblattExterneLehrende'); ?></span>
+					<span class="float-start"><?php echo $this->p->t('dms' , 'informationsblattExterneLehrende'); ?></span>
 				<?php endif; ?>
 			</div>
 		</div>
@@ -158,31 +159,31 @@ $this->load->view(
 
 		<!-- filter buttons & PDF downloads & password field & akzeptieren-button -->
 		<div class="row">
-			<div class="col-xs-5 col-md-4">
+			<div class="col-5 col-md-4">
 				<div class="btn-toolbar" role="toolbar">
 					<div class="btn-group" role="group">
-						<button id="show-all" class="btn btn-default btn-lehrauftrag active focus" type="button"
-								data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'alleAnzeigen'); ?>"><i class='fa fa-users'></i>
+						<button id="show-all" class="btn btn-outline-secondary btn-lehrauftrag active focus" type="button"
+								data-bs-toggle="tooltip" data-bs-placement="left" title="<?php echo $this->p->t('ui', 'alleAnzeigen'); ?>"><i class='fa fa-users'></i>
 						</button>
-						<button id="show-approved" class="btn btn-default btn-lehrauftrag" type="button"
-								data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurErteilteAnzeigen'); ?>">
+						<button id="show-approved" class="btn btn-outline-secondary btn-lehrauftrag" type="button"
+								data-bs-toggle="tooltip" data-bs-placement="left" title="<?php echo $this->p->t('ui', 'nurErteilteAnzeigen'); ?>">
 						</button><!-- png img set in javascript -->
-						<button id="show-accepted" class="btn btn-default btn-lehrauftrag" type="button"
-								data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurAngenommeneAnzeigen'); ?>"><i class='fa fa-handshake-o'></i>
+						<button id="show-accepted" class="btn btn-outline-secondary btn-lehrauftrag" type="button"
+								data-bs-toggle="tooltip" data-bs-placement="left" title="<?php echo $this->p->t('ui', 'nurAngenommeneAnzeigen'); ?>"><i class='fa fa-handshake-o'></i>
 						</button>
 					</div>
 
-					<button id="show-cancelled" class="btn btn-default btn-lehrauftrag" type="button" style="margin-left: 20px;"
-							data-toggle="collapse" data-placement="left" title="<?php echo $this->p->t('ui', 'nurStornierteAnzeigen'); ?>"
-							data-target ="#collapseCancelledLehrauftraege" aria-expanded="false" aria-controls="collapseExample">
+					<button id="show-cancelled" class="btn btn-outline-secondary btn-lehrauftrag" type="button" style="margin-left: 20px;"
+							data-bs-toggle="collapse" data-placement="left" title="<?php echo $this->p->t('ui', 'nurStornierteAnzeigen'); ?>"
+							data-bs-target ="#collapseCancelledLehrauftraege" aria-expanded="false" aria-controls="collapseExample">
 					</button><!-- png img set in javascript -->
 				</div>
 			</div>
 
 
-			<div class="col-xs-3 col-md-offset-2 col-md-2">
-					<div class="btn-group dropup pull-right">
-					<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+			<div class="col-3 col-md-offset-2 col-md-2">
+					<div class="btn-group dropup float-end">
+					<button type="button" class="btn btn-outline-secondary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 						<?php echo $this->p->t('global', 'dokumentePDF'); ?>&nbsp;&nbsp;<i class="fa fa-arrow-down"></i>&nbsp;&nbsp;&nbsp;&nbsp;<span class="caret"></span>
 					</button>
 					<ul id="ul-download-pdf" class="dropdown-menu">
@@ -192,12 +193,12 @@ $this->load->view(
 				</div>
 			</div>
 
-			<div class="col-xs-4 col-md-offset-0 col-md-4">
+			<div class="col-4 col-md-offset-0 col-md-4">
 				<div class="input-group">
 					<input id="username" autocomplete="username" style="position: absolute; opacity: 0;"><!-- this is to prevent Chrome autofilling a random input field with the username-->
 					<input id="password" type="password" autocomplete="new-password" class="form-control" placeholder="CIS-<?php echo ucfirst($this->p->t('password', 'password')); ?>">
 						<span class="input-group-btn">
-							<button id="accept-lehrauftraege" class="btn btn-primary pull-right"><?php echo ucfirst($this->p->t('global', 'lehrauftraegeAnnehmen')); ?></button>
+							<button id="accept-lehrauftraege" class="btn btn-primary float-end"><?php echo ucfirst($this->p->t('global', 'lehrauftraegeAnnehmen')); ?></button>
 						</span>
 				</div>
 			</div>
@@ -207,7 +208,7 @@ $this->load->view(
 
 		<!-- collapse module with data table 'Stornierte Lehrauftraege' (collapsed by default until opened on buttonclick)-->
 		<div class="row">
-			<div class="col-lg-12 collapse" id="collapseCancelledLehrauftraege">
+			<div class="col-12 collapse" id="collapseCancelledLehrauftraege">
 				<h4>
 					<?php echo ucfirst($this->p->t('global', 'stornierteLehrauftraege')); ?>:
 					<small>
@@ -217,7 +218,7 @@ $this->load->view(
 					</small>
 				</h4>
 				<div class="row">
-					<div class="col-lg-12">
+					<div class="col-12">
 						<?php $this->load->view('lehre/lehrauftrag/cancelledLehrauftragData.php'); ?>
 					</div>
 				</div>
diff --git a/application/views/lehre/lehrauftrag/acceptLehrauftragData.php b/application/views/lehre/lehrauftrag/acceptLehrauftragData.php
index fcc4759db..a36605d13 100644
--- a/application/views/lehre/lehrauftrag/acceptLehrauftragData.php
+++ b/application/views/lehre/lehrauftrag/acceptLehrauftragData.php
@@ -294,6 +294,7 @@ ORDER BY "akzeptiert" NULLS FIRST, "erteilt" NULLS LAST, "bestellt"
 
 $filterWidgetArray = array(
     'query' => $query,
+    'bootstrapVersion' => 5,
     'tableUniqueId' => 'acceptLehrauftrag',
     'requiredPermissions' => 'lehre/lehrauftrag_akzeptieren',
     'datasetRepresentation' => 'tabulator',
diff --git a/application/views/lehre/lehrauftrag/acceptLehrauftragHelp.php b/application/views/lehre/lehrauftrag/acceptLehrauftragHelp.php
index 9c8f0a680..2e7ede0a8 100644
--- a/application/views/lehre/lehrauftrag/acceptLehrauftragHelp.php
+++ b/application/views/lehre/lehrauftrag/acceptLehrauftragHelp.php
@@ -1,5 +1,6 @@
 <h4><?php echo $this->p->t('lehre', 'lehrauftraegeAnnehmen'); ?></h4>
-<div class="panel panel-body">
+
+<div class="card-body">
 	<?php echo $this->p->t('lehre', 'lehrauftraegeAnnehmenText'); ?>
 	<ol>
 		<li><?php echo $this->p->t('lehre', 'lehrauftraegeAnnehmenKlickStatusicon'); ?></li>
@@ -7,22 +8,26 @@
 		<li><?php echo $this->p->t('lehre', 'lehrauftraegeAnnehmenMitKlickAnnehmen'); ?></li>
 	</ol>
 </div>
+
 <br>
 
 <h4><?php echo $this->p->t('lehre', 'lehrauftraegeNichtAuswaehlbar'); ?></h4>
-<div class="panel panel-body">
+
+<div class="card-body">
 	<?php echo $this->p->t('lehre', 'lehrauftraegeNichtAuswaehlbarTextBeiAnnahme'); ?>
+
 </div>
 <br>
 
 <h4>Filter</h4>
-<div class="panel panel-body">
-	<div class="col-xs-12 col-md-8 col-lg-6">
+
+<div class="card-body">
+	<div class="col-12 col-md-8 col-lg-6">
 		<table class="table table-bordered">
 			<tr class="text-center">
-				<td class="col-xs-1"><i class='fa fa-users'></i></td>
-				<td class="col-xs-1"><img src="../../../public/images/icons/fa-user-check.png" style="height: 30px; width: 30px;"></td>
-				<td class="col-xs-1"><i class='fa fa-handshake-o'></i></td>
+				<td class="col-1"><i class='fa fa-users'></i></td>
+				<td class="col-1"><img src="../../../public/images/icons/fa-user-check.png" style="height: 30px; width: 30px;"></td>
+				<td class="col-1"><i class='fa fa-handshake-o'></i></td>
 			</tr>
 			<tr class="text-center">
 				<td><?php echo $this->p->t('lehre', 'filterAlleBeiAnnahme'); ?></td>
@@ -31,5 +36,6 @@
 			</tr>
 		</table>
 	</div>
+
 </div>
 <br>
\ No newline at end of file

From 1b35b9517337d706fe6fa064d2c74d5b1db82f7c Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 25 Apr 2024 15:54:27 +0200
Subject: [PATCH 0651/1461] Comment

---
 application/controllers/components/stv/Students.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/application/controllers/components/stv/Students.php b/application/controllers/components/stv/Students.php
index decf1b66a..475497141 100644
--- a/application/controllers/components/stv/Students.php
+++ b/application/controllers/components/stv/Students.php
@@ -2,6 +2,8 @@
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
+// TODO(chris): Prestudent status missing
+
 class Students extends FHC_Controller
 {
 	public function __construct()

From 47130b48ec6b99a045cb4107fb5693ee052f352a Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 26 Apr 2024 13:06:24 +0200
Subject: [PATCH 0652/1461] Auto close filter

---
 public/js/components/filter/Filter.js     |  9 ++++++-
 public/js/directives/collapseAutoClose.js | 29 +++++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 public/js/directives/collapseAutoClose.js

diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index 1cf6e6425..a5546c134 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -17,10 +17,11 @@
 
 import {CoreFilterAPIs} from './API.js';
 import {CoreRESTClient} from '../../RESTClient.js';
-import {CoreFetchCmpt} from '../../components/Fetch.js';
+import {CoreFetchCmpt} from '../Fetch.js';
 import FilterConfig from './Filter/Config.js';
 import FilterColumns from './Filter/Columns.js';
 import TableDownload from './Table/Download.js';
+import collapseAutoClose from '../../directives/collapseAutoClose.js';
 
 //
 const FILTER_COMPONENT_NEW_FILTER = 'Filter Component New Filter';
@@ -38,6 +39,9 @@ export const CoreFilterCmpt = {
 		FilterColumns,
 		TableDownload
 	},
+	directives: {
+		collapseAutoClose
+	},
 	emits: [
 		'nwNewEntry',
 		'click:new'
@@ -562,6 +566,7 @@ export const CoreFilterCmpt = {
 				:names="fieldNames"
 				@hide="tabulator.hideColumn($event)"
 				@show="tabulator.showColumn($event)"
+				v-collapse-auto-close
 			></filter-columns>
 
 			<filter-config
@@ -575,12 +580,14 @@ export const CoreFilterCmpt = {
 				@switch-filter="switchFilter"
 				@apply-filter-config="applyFilterConfig"
 				@save-custom-filter="handlerSaveCustomFilter"
+				v-collapse-auto-close
 			></filter-config>
 			<div
 				v-else-if="$slots.filter"
 				:id="'collapseFilters' + idExtra"
 				class="card-body collapse"
 				:data-bs-parent="'#filterCollapsables' + idExtra"
+				v-collapse-auto-close
 				>
 				<slot name="filter"></slot>
 			</div>
diff --git a/public/js/directives/collapseAutoClose.js b/public/js/directives/collapseAutoClose.js
new file mode 100644
index 000000000..953c3df9f
--- /dev/null
+++ b/public/js/directives/collapseAutoClose.js
@@ -0,0 +1,29 @@
+const elementDataMap = new WeakMap();
+
+export default {
+	mounted(el, binding) {
+		let open = false;
+		elementDataMap.set(el, evt => {
+			if (!open)
+				return;
+
+			if (el.contains(evt.target))
+				return;
+			
+			const collapse = bootstrap.Collapse.getInstance(el)
+			if (collapse)
+				collapse.hide();
+		});
+		el.addEventListener('shown.bs.collapse', () => {
+			open = true;
+		});
+		el.addEventListener('hide.bs.collapse', () => {
+			open = false;
+		});
+		window.addEventListener('click', elementDataMap.get(el));
+	},
+	beforeUnmount(el, binding) {
+		window.removeEventListener('click', elementDataMap.get(el));
+		delete el.collapsibleAutoHideFunc;
+	}
+}
\ No newline at end of file

From 81612da80cf9886110bbc9c47f0afaf5000942e1 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 26 Apr 2024 13:18:06 +0200
Subject: [PATCH 0653/1461] collapse-auto-close: better event handling

---
 public/js/directives/collapseAutoClose.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/js/directives/collapseAutoClose.js b/public/js/directives/collapseAutoClose.js
index 953c3df9f..dd055b39a 100644
--- a/public/js/directives/collapseAutoClose.js
+++ b/public/js/directives/collapseAutoClose.js
@@ -9,7 +9,7 @@ export default {
 
 			if (el.contains(evt.target))
 				return;
-			
+
 			const collapse = bootstrap.Collapse.getInstance(el)
 			if (collapse)
 				collapse.hide();
@@ -20,10 +20,10 @@ export default {
 		el.addEventListener('hide.bs.collapse', () => {
 			open = false;
 		});
-		window.addEventListener('click', elementDataMap.get(el));
+		document.addEventListener('click', elementDataMap.get(el), true);
 	},
 	beforeUnmount(el, binding) {
-		window.removeEventListener('click', elementDataMap.get(el));
+		document.removeEventListener('click', elementDataMap.get(el));
 		delete el.collapsibleAutoHideFunc;
 	}
 }
\ No newline at end of file

From dec6b160a6e2ed8457a49cd4f9042973826a81b0 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 26 Apr 2024 14:07:24 +0200
Subject: [PATCH 0654/1461] fixes the acceptLehrauftrag view with bootstrap5
 and tabulator5

---
 .../views/lehre/lehrauftrag/acceptLehrauftrag.php     | 11 ++++++-----
 .../lehre/lehrauftrag/cancelledLehrauftragData.php    |  1 +
 application/views/widgets/table/tableHelpsite.php     |  2 +-
 public/js/TableWidget.js                              |  7 +++----
 public/js/lehre/lehrauftrag/acceptLehrauftrag.js      |  6 ++++--
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/application/views/lehre/lehrauftrag/acceptLehrauftrag.php b/application/views/lehre/lehrauftrag/acceptLehrauftrag.php
index 8c3312932..32f08679d 100644
--- a/application/views/lehre/lehrauftrag/acceptLehrauftrag.php
+++ b/application/views/lehre/lehrauftrag/acceptLehrauftrag.php
@@ -126,7 +126,8 @@ $this->load->view(
 							),
 							array(
 								'name' => 'studiensemester',
-								'id' => 'studiensemester'
+								'id' => 'studiensemester',
+								'class' => 'form-select w-auto ',
 							)
 						);
 						?>
@@ -181,19 +182,19 @@ $this->load->view(
 			</div>
 
 
-			<div class="col-3 col-md-offset-2 col-md-2">
+			<div class="col-3 offset-md-2 col-md-2">
 					<div class="btn-group dropup float-end">
 					<button type="button" class="btn btn-outline-secondary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 						<?php echo $this->p->t('global', 'dokumentePDF'); ?>&nbsp;&nbsp;<i class="fa fa-arrow-down"></i>&nbsp;&nbsp;&nbsp;&nbsp;<span class="caret"></span>
 					</button>
 					<ul id="ul-download-pdf" class="dropdown-menu">
-						<li value="etw"><a href="#"><?php echo $this->p->t('global', 'PDFLehrauftraegeFH'); ?></a></li>
-						<li value="lehrgang"><a href="#"><?php echo $this->p->t('global', 'PDFLehrauftraegeLehrgaenge'); ?></a></li>
+						<li value="etw"><a class="dropdown-item" href="#"><?php echo $this->p->t('global', 'PDFLehrauftraegeFH'); ?></a></li>
+						<li value="lehrgang"><a class="dropdown-item" href="#"><?php echo $this->p->t('global', 'PDFLehrauftraegeLehrgaenge'); ?></a></li>
 					</ul>
 				</div>
 			</div>
 
-			<div class="col-4 col-md-offset-0 col-md-4">
+			<div class="col-4 offset-md-0 col-md-4">
 				<div class="input-group">
 					<input id="username" autocomplete="username" style="position: absolute; opacity: 0;"><!-- this is to prevent Chrome autofilling a random input field with the username-->
 					<input id="password" type="password" autocomplete="new-password" class="form-control" placeholder="CIS-<?php echo ucfirst($this->p->t('password', 'password')); ?>">
diff --git a/application/views/lehre/lehrauftrag/cancelledLehrauftragData.php b/application/views/lehre/lehrauftrag/cancelledLehrauftragData.php
index f446cae25..219bd7cc5 100644
--- a/application/views/lehre/lehrauftrag/cancelledLehrauftragData.php
+++ b/application/views/lehre/lehrauftrag/cancelledLehrauftragData.php
@@ -50,6 +50,7 @@ $query = '
 
 $tableWidgetArray = array(
 	'query' => $query,
+    'bootstrapVersion' => 5,
 	'tableUniqueId' => 'cancelledLehrauftrag',
 	'requiredPermissions' => 'lehre/lehrauftrag_akzeptieren',
 	'datasetRepresentation' => 'tabulator',
diff --git a/application/views/widgets/table/tableHelpsite.php b/application/views/widgets/table/tableHelpsite.php
index fa864c634..d0148ca35 100644
--- a/application/views/widgets/table/tableHelpsite.php
+++ b/application/views/widgets/table/tableHelpsite.php
@@ -1,7 +1,7 @@
 <!--CollapseHTML 'Help'-->
 <div class="row">
 	<div class="col-lg-12 collapse" id="tabulatorHelp-<?php echo $tableUniqueId; ?>">
-		<div class="mb-4 " 
+		<div class="mb-2 " 
 			 style="<?php 
 				if(isset($bootstrapVersion) && $bootstrapVersion==5)
 				{ 
diff --git a/public/js/TableWidget.js b/public/js/TableWidget.js
index b45ba9988..4f107adce 100644
--- a/public/js/TableWidget.js
+++ b/public/js/TableWidget.js
@@ -800,7 +800,7 @@ function _renderTabulatorHeaderHTML(tableWidgetDiv) {
 
   var tabulatorHeaderHTML = "";
   tabulatorHeaderHTML += `<div class="btn-toolbar ${
-    _bootstrapVersion == 3 ? "pull-right" : "float-end"
+    _bootstrapVersion == 3 ? "pull-right" : "d-flex justify-content-end mb-2"
   }" role="toolbar">
 		<div class="btn-group" role="group">
 			<!-- CSV Download button -->
@@ -832,7 +832,6 @@ function _renderTabulatorHeaderHTML(tableWidgetDiv) {
 			</button>
 		</div>
 	</div>
-	</br>
 	`;
 
   return tabulatorHeaderHTML;
@@ -867,8 +866,8 @@ function _renderTabulatorHeaderCollapseHTML(
 						<div class="panel-body">
 							<div class="btn-group" role="group">`;
   } else {
-    tabulatorHeaderCollapseHTML += `<div class="row my-4">
-			<div class="col-12 collapse" id="tabulatorSettings-${tableUniqueId}">
+    tabulatorHeaderCollapseHTML += `<div class="row ">
+			<div class="col-12 mb-2 collapse" id="tabulatorSettings-${tableUniqueId}">
 				<div class="accordion" id="accordion" role="tablist" aria-multiselectable="true">
 					<div class="accordion-item">
 						<h5  class=" accordion-header" role="tab" id="headingOne">		
diff --git a/public/js/lehre/lehrauftrag/acceptLehrauftrag.js b/public/js/lehre/lehrauftrag/acceptLehrauftrag.js
index cba4b4f39..fed97c4b6 100644
--- a/public/js/lehre/lehrauftrag/acceptLehrauftrag.js
+++ b/public/js/lehre/lehrauftrag/acceptLehrauftrag.js
@@ -195,7 +195,7 @@ function func_tableBuilt(table) {
   );
 
   // fully redrawing the table after adding the Details column
-  table.tabulator("redraw", true);
+  table.redraw(true);
 }
 
 // Sets status values into column status
@@ -474,9 +474,11 @@ $(function () {
     func_tableBuilt(tabulatorInstance);
 
     // using the tabulator instance instead of the jquery object because the site loads two different tabulator tables
+    console.log("instance",tabulatorInstance)
     let uniqueTableID =
-      tabulatorInstance.parentElement.parentElement.parentElement.attributes
+      tabulatorInstance.element.parentElement.parentElement.parentElement.attributes
         .tableUniqueId.value;
+        
     switch (uniqueTableID) {
       case "cancelledLehrauftrag":
         tabulatorInstance.on("renderComplete", () => {

From bc7fa7189499a4e6283e6eba72d53f6bfe1f13e0 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 26 Apr 2024 14:16:36 +0200
Subject: [PATCH 0655/1461] Multiactions Status Change

---
 .../api/frontend/v1/stv/Prestudent.php        |    1 +
 .../api/frontend/v1/stv/Status.php            |   11 +-
 .../controllers/components/stv/Config.php     |   20 +
 .../js/components/Stv/Studentenverwaltung.js  |    9 +-
 .../Details/MultiStatus.js                    |   19 +
 .../Details/Prestudent/MultiStatus.js         | 1425 +++++++++++++++++
 .../Details/Prestudent/Status.js              |   36 +
 .../Stv/Studentenverwaltung/Details/Status.js |   11 +-
 .../Stv/Studentenverwaltung/List.js           |    3 +
 9 files changed, 1527 insertions(+), 8 deletions(-)
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/MultiStatus.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js

diff --git a/application/controllers/api/frontend/v1/stv/Prestudent.php b/application/controllers/api/frontend/v1/stv/Prestudent.php
index 93a6c381b..d0606a5bb 100644
--- a/application/controllers/api/frontend/v1/stv/Prestudent.php
+++ b/application/controllers/api/frontend/v1/stv/Prestudent.php
@@ -279,6 +279,7 @@ class Prestudent extends FHCAPI_Controller
 		return $this->terminateWithSuccess(getData($result) ?: []);
 	}
 
+	//TODO(manu) multi
 	public function getStudienplaene($prestudent_id)
 	{
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 2f6f9aa6d..24986429d 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -365,12 +365,12 @@ class Status extends FHCAPI_Controller
 			//Handle Abbrecher and Unterbrecher
 			//TODO (manu) implement later with multiactions
 			// not active yet: works only for "status ändern" in FAS
-			/*			if($status_kurzbz == 'Abbrecher' || $status_kurzbz == 'Unterbrecher')
+			if($status_kurzbz == 'Abbrecher' || $status_kurzbz == 'Unterbrecher')
 						{
 							$ausbildungssemester = 0;
 							$gruppe = '';
 							$verband = $status_kurzbz == 'Abbrecher' ? 'A' : 'B';
-						}*/
+						}
 
 			//process studentlehrverband
 			$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
@@ -394,7 +394,7 @@ class Status extends FHCAPI_Controller
 			//not active yet: works only for "status ändern" in FAS
 			//Todo(Manu) Later for multiactions
 
-			/*
+
 			if($status_kurzbz == 'Abbrecher' || $status_kurzbz == 'Unterbrecher')
 			{
 				$result = $this->StudentModel->update(
@@ -416,12 +416,13 @@ class Status extends FHCAPI_Controller
 								return $this->outputJson($result->code);
 							}
 				}
-			*/
+
 		}
 
 		$this->db->trans_commit();
 
-		return $this->outputJsonSuccess(true);
+		//return $this->outputJsonSuccess($prestudent_id);
+		$this->terminateWithSuccess($prestudent_id);
 	}
 
 	public function loadStatus()
diff --git a/application/controllers/components/stv/Config.php b/application/controllers/components/stv/Config.php
index 78089d519..46a7ec30a 100644
--- a/application/controllers/components/stv/Config.php
+++ b/application/controllers/components/stv/Config.php
@@ -41,6 +41,10 @@ class Config extends FHC_Controller
 			'title' => 'Status',
 			'component' => './Stv/Studentenverwaltung/Details/Status.js'
 		];
+		$result['multistatus'] = [
+			'title' => 'MultiStatus',
+			'component' => './Stv/Studentenverwaltung/Details/MultiStatus.js'
+		];
 		$result['konto'] = [
 			'title' => 'Konto',
 			'component' => './Stv/Studentenverwaltung/Details/Konto.js',
@@ -83,6 +87,22 @@ class Config extends FHC_Controller
 				'additionalCols' => []
 			]
 		];
+		$result['multistatus'] = [
+			'title' => 'MultiStatus',
+			'component' => './Stv/Studentenverwaltung/Details/MultiStatus.js',
+			'config' => [
+				'abbrecherStgl' => $this->permissionlib->isBerechtigt('admin'),
+				'abbrecherStud' => $this->permissionlib->isBerechtigt('admin')
+			]
+		];
+/*		$result['status'] = [
+			'title' => 'Status',
+			'component' => './Stv/Studentenverwaltung/Details/Status.js',
+			'config' => [
+				'abbrecherStgl' => $this->permissionlib->isBerechtigt('admin'),
+				'abbrecherStud' => $this->permissionlib->isBerechtigt('admin')
+			]
+		];*/
 
 		Events::trigger('stv_conf_students', function & () use (&$result) {
 			return $result;
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 57cfe998a..affbe2984 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -56,7 +56,10 @@ export default {
 			hasAdminPermission: this.permissions['admin'],
 			hasPermissionToSkipStatusCheck: this.permissions['student/keine_studstatuspruefung'],
 			lists: this.lists,
-			defaultSemester: this.defaultSemester
+			defaultSemester: this.defaultSemester,
+			$reloadList: () => {
+				this.$refs.stvList.reload();
+			}
 		}
 	},
 	data() {
@@ -111,6 +114,10 @@ export default {
 			this.studiensemesterKurzbz = v;
 			this.$refs.stvList.updateUrl();
 			this.$refs.details.reload();
+		},
+		reloadList() {
+			console.log('reloadList2');
+			this.$refs.stvList.reload();
 		}
 	},
 	created() {
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/MultiStatus.js
new file mode 100644
index 000000000..2a4b8ebb0
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/MultiStatus.js
@@ -0,0 +1,19 @@
+import TblMultiStatus from "./Prestudent/MultiStatus.js";
+
+export default {
+	components: {
+		TblMultiStatus
+	},
+	props: {
+		modelValue: Object,
+	},
+	template: `
+
+		<div class="stv-details-details h-100 pb-3">
+			<div class="col-12 pb-3">
+			<legend>MultiStatus</legend>
+			<TblMultiStatus :modelValue="modelValue"></TblMultiStatus>		
+		</div>
+	</div>
+	`
+}
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
new file mode 100644
index 000000000..1b4a678f4
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -0,0 +1,1425 @@
+import {CoreFilterCmpt} from "../../../../filter/Filter.js";
+import BsModal from "../../../../Bootstrap/Modal.js";
+import FormForm from '../../../../Form/Form.js';
+import FormInput from '../../../../Form/Input.js';
+import {CoreRESTClient} from "../../../../../RESTClient";
+
+export default{
+	components: {
+		CoreFilterCmpt,
+		BsModal,
+		FormForm,
+		FormInput,
+	},
+	inject: {
+		defaultSemester: {
+			from: 'defaultSemester',
+		},
+		hasPermissionToSkipStatusCheck: {
+			from: 'hasPermissionToSkipStatusCheck',
+			default: false
+		},
+		hasPrestudentPermission: {
+			from: 'hasPrestudentPermission',
+			default: false
+		},
+		hasAssistenzPermission: {
+			from: 'hasAssistenzPermission',
+			default: false
+		},
+		hasAdminPermission: {
+			from: 'hasAdminPermission',
+			default: false
+		},
+		hasAssistenzPermissionForStgs: {
+			from: 'hasAssistenzPermissionForStgs',
+			default: false
+		},
+		hasSchreibrechtAss: {
+			from: 'hasSchreibrechtAss',
+			default: false
+		},
+		$reloadList: {
+			from: '$reloadList',
+			required: true
+		}
+	},
+	computed: {
+/*		personIds(){
+			if (this.modelValue.person_id)
+				return [this.modelValue.person_id];
+			return this.modelValue.map(e => e.person_id);
+		},*/
+		prestudentIds(){
+			if (this.modelValue.prestudent_id)
+			{
+				return [this.modelValue.prestudent_id];
+			}
+			return this.modelValue.map(e => e.prestudent_id);
+		},
+		updateData(){
+			const dataArray = [];
+			if (this.modelValue.prestudent_id) {
+				const newObj = {
+					prestudent_id : this.modelValue.prestudent_id,
+					studiensemester_kurzbz : this.defaultSemester,
+					ausbildungssemester : this.modelValue.semester
+				};
+				dataArray.push(newObj);
+				//console.log(dataArray);
+				return dataArray;
+			}
+			else
+			{
+				for (const item of this.modelValue) {
+					const newObj = {
+						prestudent_id: item.prestudent_id,
+						ausbildungssemester: item.semester,
+						studiensemester_kurzbz: this.defaultSemester
+					};
+					dataArray.push(newObj);
+				}
+
+				return dataArray;
+			}
+
+		},
+		gruende() {
+			return this.listStatusgruende.filter(grund => grund.status_kurzbz == this.statusData.status_kurzbz);
+		},
+		arrayStg(){
+			let stgInteger = this.hasAssistenzPermissionForStgs.map(item => {
+				return parseInt(item); // Wandelt jeden String in eine ganze Zahl um
+			});
+			return stgInteger;
+		},
+		hasPermissionCurrentStg(){
+			return this.arrayStg.includes(this.studiengang_kz);
+		}
+	},
+	props: {
+		modelValue: Object,
+	},
+	data() {
+
+		return {
+			tabulatorOptions: {
+				ajaxURL: 'api/frontend/v1/stv/Status/getHistoryPrestudent/' + this.modelValue.prestudent_id,
+				ajaxRequestFunc: this.$fhcApi.get,
+				ajaxResponse: (url, params, response) => response.data,
+				columns: [
+					{title: "Kurzbz", field: "status_kurzbz", tooltip: true},
+					{title: "StSem", field: "studiensemester_kurzbz"},
+					{title: "Sem", field: "ausbildungssemester"},
+					{title: "Lehrverband", field: "lehrverband", width: 72},
+					{title: "Datum", field: "format_datum"},
+					{title: "Studienplan", field: "bezeichnung"},
+					{title: "BestätigtAm", field: "format_bestaetigtam"},
+					{title: "AbgeschicktAm", field: "format_bewerbung_abgeschicktamum", visible:false},
+					{title: "Statusgrund", field: "statusgrund_kurzbz"},
+					{title: "Organisationsform", field: "orgform_kurzbz", visible: false},
+					{title: "PrestudentInId", field: "prestudent_id", visible: false},
+					{title: "StudienplanId", field: "studienplan_id", visible: false},
+					{title: "Anmerkung", field: "anmerkung", visible: false},
+					{title: "BestätigtVon", field: "bestaetigtvon", visible: false},
+					{title: "InsertAmUm", field: "format_insertamum", visible: false},
+					{title: "InsertVon", field: "insertvon", visible: false},
+					{title: "UpdateAmUm", field: "format_updateamum", visible: false},
+					{title: "UpdateVon", field: "updatevon", visible: false},
+					{
+						title: 'Aktionen', field: 'actions',
+						minWidth: 150, // Ensures Action-buttons will be always fully displayed
+						formatter: (cell, formatterParams, onRendered) => {
+
+
+							//let disableButton = false;
+							//const rowData = this.row.getData();
+
+
+							let container = document.createElement('div');
+							container.className = "d-flex gap-2";
+
+							let button = document.createElement('button');
+							if (this.dataMeldestichtag && this.dataMeldestichtag > cell.getData().datum && !this.hasPermissionToSkipStatusCheck)
+								button.className = 'btn btn-outline-secondary btn-action disabled';
+							else
+								button.className = 'btn btn-outline-secondary btn-action';
+							button.innerHTML = '<i class="fa fa-forward"></i>';
+							button.title = 'Status vorrücken';
+							button.addEventListener(
+								'click',
+								() =>
+								this.actionAdvanceStatus(cell.getData().status_kurzbz, cell.getData().studiensemester_kurzbz, cell.getData().ausbildungssemester)
+							);
+							container.append(button);
+
+							button = document.createElement('button');
+							if (this.dataMeldestichtag && this.dataMeldestichtag > cell.getData().datum && !this.hasPermissionToSkipStatusCheck)
+								button.className = 'btn btn-outline-secondary btn-action disabled';
+							else
+								button.className = 'btn btn-outline-secondary btn-action';
+							button.innerHTML = '<i class="fa fa-check"></i>';
+							button.title = 'Status bestätigen';
+							button.addEventListener('click', () =>
+								this.actionConfirmStatus(cell.getData().status_kurzbz, cell.getData().studiensemester_kurzbz, cell.getData().ausbildungssemester)
+							);
+							container.append(button);
+
+							button = document.createElement('button');
+							if (this.dataMeldestichtag && this.dataMeldestichtag > cell.getData().datum && !this.hasPermissionToSkipStatusCheck)
+								button.className = 'btn btn-outline-secondary btn-action disabled';
+							else
+								button.className = 'btn btn-outline-secondary btn-action';
+							button.innerHTML = '<i class="fa fa-edit"></i>';
+							button.title = 'Status bearbeiten';
+							button.addEventListener('click', (event) =>
+								this.actionEditStatus(cell.getData().status_kurzbz, cell.getData().studiensemester_kurzbz, cell.getData().ausbildungssemester)
+							);
+							container.append(button);
+
+							button = document.createElement('button');
+							if (this.dataMeldestichtag && this.dataMeldestichtag > cell.getData().datum && !this.hasPermissionToSkipStatusCheck)
+								button.className = 'btn btn-outline-secondary btn-action disabled';
+							else
+								button.className = 'btn btn-outline-secondary btn-action';
+							button.innerHTML = '<i class="fa fa-xmark"></i>';
+							button.title = 'Status löschen';
+							button.addEventListener('click', () =>
+								this.actionDeleteStatus(cell.getData().status_kurzbz, cell.getData().studiensemester_kurzbz, cell.getData().ausbildungssemester)
+							);
+							container.append(button);
+
+							return container;
+						},
+						frozen: true
+					},
+				],
+				rowFormatter: (row) => {
+					const rowData = row.getData();
+					if (this.dataMeldestichtag && this.dataMeldestichtag > rowData.datum)
+					{
+						row.getElement().classList.add('disabled');
+
+					}
+				},
+				layout: 'fitDataFill',
+				layoutColumnsOnNewData: false,
+				height: 'auto',
+				selectable: false,
+			},
+			tabulatorEvents: [
+				{
+					event: 'tableBuilt',
+					handler: async () => {
+						await this.$p.loadCategory(['lehre','global','person']);
+
+						let cm = this.$refs.table.tabulator.columnManager;
+
+						cm.getColumnByField('lehrverband').component.updateDefinition({
+									title: this.$p.t('lehre', 'lehrverband')
+								});
+
+						cm.getColumnByField('format_bestaetigtam').component.updateDefinition({
+							title: this.$p.t('lehre', 'bestaetigt_am')
+						});
+
+						cm.getColumnByField('format_bewerbung_abgeschicktamum').component.updateDefinition({
+							title: this.$p.t('lehre', 'bewerbung_abgeschickt_am')
+						});
+
+						cm.getColumnByField('bezeichnung').component.updateDefinition({
+							title: this.$p.t('lehre', 'studienplan')
+						});
+
+						cm.getColumnByField('actions').component.updateDefinition({
+							title: this.$p.t('global', 'aktionen')
+						});
+
+						cm.getColumnByField('format_datum').component.updateDefinition({
+							title: this.$p.t('global', 'datum')
+						});
+
+						cm.getColumnByField('anmerkung').component.updateDefinition({
+							title: this.$p.t('global', 'anmerkung')
+						});
+
+						cm.getColumnByField('bestaetigtvon').component.updateDefinition({
+							title: this.$p.t('lehre', 'bestaetigt_von')
+						});
+
+						cm.getColumnByField('format_insertamum').component.updateDefinition({
+							title: this.$p.t('lehre', 'insert_am')
+						});
+
+						cm.getColumnByField('insertvon').component.updateDefinition({
+							title: this.$p.t('lehre', 'insert_von')
+						});
+					}
+				}
+			],
+//		}
+
+			statusData: {},
+			listStudiensemester: [],
+			maxSem:  Array.from({ length: 11 }, (_, index) => index),
+			listStudienplaene: [],
+			aufnahmestufen: {'': '-- keine Auswahl --', 1: 1, 2: 2, 3: 3},
+			listStatusgruende: [],
+			statusId: {},
+			gruendeLength: {},
+			dataMeldestichtag: null,
+			stichtag: {},
+			isLastStatus: {},
+			hasPermissionThisStg: {},
+			actionButton: {},
+			actionStatusText: {},
+			actionSem: null,
+			newArray: {}
+		}
+	},
+	watch: {
+		data: {
+			handler(n) {
+				const start = this.status_kurzbz;
+			},
+			deep: true
+		},
+		modelValue(){
+			this.$refs.table.tabulator.setData('api/frontend/v1/stv/Status/getHistoryPrestudent/' + this.modelValue.prestudent_id);
+		}
+	},
+	methods: {
+		actionNewStatus() {
+			this.statusData.status_kurzbz = 'Interessent';
+			this.statusData.studiensemester_kurzbz = this.defaultSemester;
+			this.statusData.ausbildungssemester = 1;
+			this.statusData.datum = this.getDefaultDate();
+			this.statusData.bestaetigtam = this.getDefaultDate();
+			this.$refs.newStatusModal.show();
+		},
+		actionEditStatus(status, stdsem, ausbildungssemester){
+			this.statusId = {
+				'prestudent_id': this.modelValue.prestudent_id,
+				'status_kurzbz': status,
+				'studiensemester_kurzbz': stdsem,
+				'ausbildungssemester': ausbildungssemester
+			};
+			this.loadStatus(this.statusId).then(() => {
+				if(this.statusData)
+					this.$refs.editStatusModal.show();
+			});
+		},
+		actionDeleteStatus(status, stdsem, ausbildungssemester){
+			this.statusId = {
+				'prestudent_id': this.modelValue.prestudent_id,
+				'status_kurzbz': status,
+				'studiensemester_kurzbz': stdsem,
+				'ausbildungssemester': ausbildungssemester
+			};
+
+			this.checkIfLastStatus();
+
+			this.loadStatus(this.statusId).then(() => {
+				if(this.statusData)
+					this.$refs.deleteStatusModal.show();
+			});
+		},
+		actionAdvanceStatus(status, stdsem, ausbildungssemester){
+			this.statusId = {
+				'prestudent_id': this.modelValue.prestudent_id,
+				'status_kurzbz': status,
+				'studiensemester_kurzbz': stdsem,
+				'ausbildungssemester': ausbildungssemester
+			};
+			this.loadStatus(this.statusId).then(() => {
+				if(this.statusData)
+					this.advanceStatus(this.statusId);
+			});
+		},
+		actionConfirmStatus(status, stdsem, ausbildungssemester){
+			this.statusId = {
+				'prestudent_id': this.modelValue.prestudent_id,
+				'status_kurzbz': status,
+				'studiensemester_kurzbz': stdsem,
+				'ausbildungssemester': ausbildungssemester
+			};
+			this.loadStatus(this.statusId).then(() => {
+				if(this.statusData)
+					this.confirmStatus(this.statusId);
+			});
+		},
+		actionConfirmDialogue(data, statusgrund, statusText){
+			//this.hideModal('addMultiStatus2');
+			this.actionButton = statusgrund;
+			this.actionStatusText = statusText;
+
+			console.log("statusgrund: " + this.actionButton + ' , statusText:  ' + this.actionStatusText + ' sem: ' + this.actionSem);
+			if(this.actionStatusText != "Student" && this.actionStatusText != "Wiederholer")
+				this.$refs.confirmStatusAction.show();
+			else
+				this.$refs.askForAusbildungssemester.show();
+		},
+		changeStatusToAbbrecherStgl(prestudentIds){
+			this.hideModal('confirmStatusAction2');
+			let abbruchData =
+				{
+					status_kurzbz: 'Abbrecher',
+					datum: this.getDefaultDate(),
+					bestaetigtam: this.getDefaultDate(),
+					statusgrund_id: 17
+				};
+			console.log(this.updateData);
+			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...abbruchData }));
+			console.log(this.newArray);
+
+			console.log("in changeStatusToAbbrecher" + prestudentIds);
+			this.addNewStatus(prestudentIds);
+		},
+		changeStatusToAbbrecherStud(prestudentIds){
+			this.hideModal('confirmStatusAction');
+			let deltaData =
+				{
+					status_kurzbz: 'Abbrecher',
+					datum: this.getDefaultDate(),
+					bestaetigtam: this.getDefaultDate(),
+					statusgrund_id: 18
+				};
+
+			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData }));
+
+			console.log("in changeStatusToAbbrecher" + prestudentIds);
+			this.addNewStatus(prestudentIds);
+		},
+		changeStatusToUnterbrecher(prestudentIds){
+			this.hideModal('confirmStatusAction');
+			let deltaData =
+				{
+					status_kurzbz: 'Unterbrecher',
+					datum: this.getDefaultDate(),
+					bestaetigtam: this.getDefaultDate()
+				};
+
+			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData }));
+
+			console.log("in changeStatusToUnterbrecher" + prestudentIds);
+			this.addNewStatus(prestudentIds);
+		},
+		changeStatusToStudent(prestudentIds){
+			this.hideModal('askForAusbildungssemester');
+			let deltaData =
+				{
+					status_kurzbz: 'Student',
+					datum: this.getDefaultDate(),
+					bestaetigtam: this.getDefaultDate()
+				};
+
+			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData, ausbildungssemester: this.actionSem}));
+
+			console.log("in changeStatusToStudent" + prestudentIds);
+			this.addNewStatus(prestudentIds);
+		},
+		changeStatusToWiederholer(prestudentIds){
+			this.hideModal('askForAusbildungssemester');
+			let deltaData =
+				{
+					status_kurzbz: 'Student',
+					datum: this.getDefaultDate(),
+					bestaetigtam: this.getDefaultDate(),
+					statusgrund_id: 16
+				};
+
+			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData, ausbildungssemester: this.actionSem}));
+
+			console.log("in changeStatusToWiederholer" + prestudentIds);
+			this.addNewStatus(prestudentIds);
+		},
+		changeStatusToDiplomand(prestudentIds){
+
+			let deltaData =
+				{
+					status_kurzbz: 'Diplomand',
+					datum: this.getDefaultDate(),
+					bestaetigtam: this.getDefaultDate(),
+				};
+
+			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData}));
+
+			console.log("in changeStatusToDiplomand" + prestudentIds);
+			this.addNewStatus(prestudentIds);
+		},
+		changeStatusToAbsolvent(prestudentIds){
+
+			let deltaData =
+				{
+					status_kurzbz: 'Absolvent',
+					datum: this.getDefaultDate(),
+					bestaetigtam: this.getDefaultDate(),
+				};
+
+			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData}));
+
+			console.log("in changeStatusToAbsolvent" + prestudentIds);
+			this.addNewStatus(prestudentIds);
+		},
+		addNewStatus(prestudentIds){
+			//Array.isArray(prestudentIds) ? this.modelValue.prestudent_id : [prestudentIds];
+			let changeData = {};
+
+			if(!prestudentIds)
+				prestudentIds = [this.modelValue.prestudent_id];
+
+			const promises = prestudentIds.map(prestudentId => {
+				//TODO(manu) besserer check
+				//if(!this.newArray)
+				if(this.statusData.status_kurzbz)
+				{
+					changeData = this.statusData; //this.statusData = this.updateData.find(item => item.prestudent_id === prestudentId);
+				}
+				else
+				{
+					changeData = this.newArray.find(item => item.prestudent_id === prestudentId);
+				}
+
+				console.log("---");
+				console.log(changeData);
+
+				return this.$fhcApi.post('api/frontend/v1/stv/status/addNewStatus/' + prestudentId,
+					//this.statusData
+					//this.updateData.find(item => item.prestudent_id == prestudentId)
+					changeData
+				).then(response => {
+						this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+						console.log(response);
+						return response;
+						}).catch(this.$fhcAlert.handleSystemError)
+					/*.finally(() => {
+					window.scrollTo(0, 0);
+				})*/;
+			});
+
+			Promise
+				.allSettled(promises)
+				.then(values => {
+					if (this.modelValue.prestudent_id) {
+						this.reload();
+					}
+					else {
+						this.$reloadList();
+					}
+					this.hideModal('newStatusModal');
+					this.resetModal();
+				});
+		},
+		advanceStatus(statusId){
+			return this.$fhcApi.post('api/frontend/v1/stv/status/advanceStatus/' +
+				this.statusId.prestudent_id + '/' +
+				this.statusId.status_kurzbz + '/' +
+				this.statusId.studiensemester_kurzbz + '/' +
+				this.statusId.ausbildungssemester)
+				.then(
+					result => {
+						this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successAdvance'));
+					})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					window.scrollTo(0, 0);
+					this.reload();
+				});
+		},
+		confirmStatus(statusId){
+			return this.$fhcApi.post('api/frontend/v1/stv/status/confirmStatus/' +
+				this.statusId.prestudent_id + '/' +
+				this.statusId.status_kurzbz + '/' +
+				this.statusId.studiensemester_kurzbz + '/' +
+				this.statusId.ausbildungssemester)
+				.then(
+					result => {
+						this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successConfirm'));
+					})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+/*					window.scrollTo(0, 0);*/
+					this.reload();
+				});
+		},
+		deleteStatus(status_id){
+			return this.$fhcApi.post('api/frontend/v1/stv/status/deleteStatus/',
+				status_id)
+				.then(
+					result => {
+						this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
+							this.hideModal('deleteStatusModal');
+							this.resetModal();
+					})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					window.scrollTo(0, 0);
+					this.reload();
+				});
+		},
+		editStatus(){
+			return this.$fhcApi.post('api/frontend/v1/stv/status/updateStatus/' +
+				this.statusId.prestudent_id + '/' +
+				this.statusId.status_kurzbz + '/' +
+				this.statusId.studiensemester_kurzbz + '/' +
+				this.statusId.ausbildungssemester,
+				this.statusData)
+				.then(
+					result => {
+						this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+						this.hideModal('editStatusModal');
+						this.resetModal();
+					})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					window.scrollTo(0, 0);
+					this.reload();
+				});
+		},
+		checkIfLastStatus(){
+			return this.$fhcApi
+				.get('api/frontend/v1/stv/status/isLastStatus/' + this.modelValue.prestudent_id)
+				.then(
+					result => {
+						if(result.data){
+							this.isLastStatus = result.data;
+						} else {
+							this.isLastStatus = {};
+						}
+						return result;
+					})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		loadStatus(status_id){
+			return this.$fhcApi.post('api/frontend/v1/stv/status/loadStatus/',
+				status_id)
+					.then(result => {
+							this.statusData = result.data;
+						return result;
+					})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		reload(){
+			this.$refs.table.reloadTable(); //bei multiactions not working
+		},
+		reloadLast(prestudent_id){
+			console.log("prestudent_id: " + prestudent_id);
+		//	this.$refs.table.tabulator.setData('api/frontend/v1/stv/Status/getHistoryPrestudent/' + prestudent_id);
+
+		//	window.location.href = "https://c3p0.ma0068.technikum-wien.at/fhcomplete/index.ci.php/studentenverwaltung/prestudent/" + prestudent_id + "/multistatus";
+		},
+		hideModal(modalRef){
+			this.$refs[modalRef].hide();
+		},
+		resetModal(){
+			this.statusData = {};
+			this.statusId = {};
+			this.actionButton = {};
+			this.actionStatusText = {};
+			this.actionSem = null;
+		},
+		getDefaultDate() {
+			const today = new Date();
+			return today;
+		}
+	},
+	created(){
+		this.$fhcApi
+			.get('api/frontend/v1/stv/prestudent/getStudiensemester')
+			.then(result => result.data)
+			.then(result => {
+				this.listStudiensemester = result;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+/*		this.$fhcApi
+			.get('api/frontend/v1/stv/prestudent/getStudienplaene/' + this.modelValue.prestudent_id)
+			.then(result => result.data)
+			.then(result => {
+				this.listStudienplaene = result;
+			})
+			.catch(this.$fhcAlert.handleSystemError);*/
+		this.$fhcApi
+			.get('api/frontend/v1/stv/status/getStatusgruende/')
+			.then(result => result.data)
+			.then(result => {
+				this.listStatusgruende = result;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+		this.$fhcApi
+			.get('api/frontend/v1/stv/status/getLastBismeldestichtag/')
+			.then(result => result.data)
+			.then(result => {
+				this.dataMeldestichtag = result.retval[0].meldestichtag;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+	},
+	mounted(){},
+	template: `
+		<div class="stv-list h-100 pt-3">
+		
+		PersonId(s): {{personIds}}
+		||
+		PrestudentId(s): {{prestudentIds}}
+		
+		<hr>
+		
+<!--		{{statusData}}
+		
+		<hr>
+		
+		{{modelValue}}
+		
+		<hr>
+		
+		{{updateData}}-->
+				
+			<!--Modal: Add New Status-->
+			<BsModal ref="newStatusModal">
+				<template #title>{{$p.t('lehre', 'status_new')}}</template>
+							
+					<form-form class="row g-3" ref="statusData">
+					
+						<div class="row mb-3">
+							<label for="status_kurzbz" class="form-label col-sm-4">{{$p.t('lehre', 'status_rolle')}}</label>
+							<div class="col-sm-6">
+							<!--<form-input type="text" :readonly="readonly" class="form-control" id="status_kurzbz" v-model="statusData['status_kurzbz']">-->
+								<form-input
+									required
+									v-model="statusData['status_kurzbz']"
+									name="status_kurzbz"
+									type="select"
+									>
+									<option  value="Interessent">InteressentIn</option>
+									<option  value="Bewerber">BewerberIn</option>
+									<option  value="Aufgenommener">Aufgenommene/r</option>
+									<option  value="Student">StudentIn</option>
+									<option  value="Unterbrecher">UnterbrecherIn</option>
+									<option  value="Diplomand">DiplomandIn</option>
+									<option  value="Incoming">Incoming</option>
+									<option  value="Absolvent">AbsolventIn</option>
+									<option  value="Abbrecher">AbbrecherIn</option>
+								</form-input>
+							</div>
+						</div>
+						<div class="row mb-3">		   
+							<label for="studiensemester_kurzbz" class="form-label col-sm-4">{{$p.t('lehre', 'studiensemester')}}</label>
+							<div class="col-sm-6">
+								<form-input
+									:readonly="readonly"
+									type="select"
+									name="studiensemester_kurzbz"
+									v-model="statusData['studiensemester_kurzbz']"
+								>
+									<option v-for="sem in listStudiensemester" :key="sem.studiensemester_kurzbz" :value="sem.studiensemester_kurzbz"  :selected="sem.studiensemester_kurzbz === defaultSemester">{{sem.studiensemester_kurzbz}}</option>
+								</form-input>
+							</div>
+						</div>
+						<!-- TODO(manu) if(defined('VORRUECKUNG_STATUS_MAX_SEMESTER') && VORRUECKUNG_STATUS_MAX_SEMESTER==false) 100 Semester-->
+						<div class="row mb-3">
+							<label for="ausbildungssemester" class="form-label col-sm-4">{{$p.t('lehre', 'ausbildungssemester')}}</label>
+							<div class="col-sm-6">
+								<form-input
+									type="select"
+									:readonly="readonly"
+									name="ausbildungssemester"
+									v-model="statusData.ausbildungssemester"
+								>
+								 <option v-for="number in maxSem" :key="number" :value="number">{{ number }}</option>
+								</form-input>
+							</div>
+						</div>
+						
+						<div class="row mb-3">
+							<label for="datum" class="form-label col-sm-4">{{$p.t('global', 'datum')}}</label>
+							<div class="col-sm-6">
+								<form-input
+									type="DatePicker"
+									:readonly="readonly"
+									name="datum"
+									v-model="statusData.datum"
+									auto-apply
+									:enable-time-picker="false"
+									format="dd.MM.yyyy"
+									preview-format="dd.MM.yyyy"
+									:teleport="true"
+								></form-input>
+							</div>
+						</div>
+						<div class="row mb-3">
+							<label for="bestaetigtam" class="form-label col-sm-4">{{$p.t('lehre', 'bestaetigt_am')}}</label>
+							<div class="col-sm-6">
+								<form-input
+									type="DatePicker"
+									:readonly="readonly"
+									name="datum"
+									v-model="statusData.bestaetigtam"
+									auto-apply
+									:enable-time-picker="false"
+									format="dd.MM.yyyy"
+									preview-format="dd.MM.yyyy"
+									:teleport="true"
+								></form-input>
+							</div>
+						</div>
+						<div class="row mb-3">
+							<label for="bewerbung_abgeschicktamum" class="form-label col-sm-4">{{$p.t('lehre', 'bewerbung_abgeschickt_am')}}</label>
+							<div class="col-sm-6">
+								<form-input
+									type="DatePicker"
+									:readonly="readonly"
+									name="datum"
+									v-model="statusData['bewerbung_abgeschicktamum']"
+									auto-apply
+									:enable-time-picker="false"
+									format="dd.MM.yyyy"
+									preview-format="dd.MM.yyyy"
+									:teleport="true"
+								></form-input>
+							</div>
+						</div>
+						<div class="row mb-3">
+							<label for="bezeichnung" class="form-label col-sm-4">{{$p.t('lehre', 'studienplan')}}</label>
+							<div class="col-sm-6">
+								<form-input
+									:readonly="readonly"
+									type="select"
+									name="studienplan"
+									v-model="statusData['studienplan_id']"
+								>		
+									<option v-for="sp in listStudienplaene" :key="sp.studienplan_id" :value="sp.studienplan_id">{{sp.bezeichnung}}</option>
+								</form-input>
+							</div>
+						</div>
+						<div class="row mb-3">
+							<label for="anmerkung" class="form-label col-sm-4">{{$p.t('global', 'anmerkung')}}</label>
+							<div class="col-sm-6">
+								<form-input
+									type="text"
+									name="anmerkung"
+									v-model="statusData['anmerkung']"
+								>						
+								</form-input>
+							</div>
+						</div>
+						
+						<div class="row mb-3">								   
+							<label for="aufnahmestufe" class="form-label col-sm-4">{{$p.t('lehre', 'aufnahmestufe')}}</label>
+							<div class="col-sm-6">
+								<form-input
+								type="select"
+								:readonly="readonly"
+								name="aufnahmestufe"
+								v-model="statusData['rt_stufe']"
+								>
+								<option v-for="entry in aufnahmestufen" :key="entry" :value="entry">{{entry}}</option>
+								</form-input>
+							</div>
+						</div>
+										
+						<div v-if="gruende.length > 0" class="row mb-3">
+							<label for="grund" class="form-label col-sm-4">{{$p.t('studierendenantrag', 'antrag_grund')}}</label>
+							<div class="col-sm-6">
+								<form-input
+									type="select"
+									:readonly="readonly"
+									name="statusgrund"
+									v-model="statusData['statusgrund_id']"
+								>
+								<option v-for="grund in gruende" :key="grund.statusgrund_id" :value="grund.statusgrund_id">{{grund.beschreibung[0]}}</option>
+								</form-input>
+							</div>
+						</div>
+					
+					</form-form>
+					
+				<template #footer>
+						<button type="button" class="btn btn-primary" @click="addNewStatus()">OK</button>
+				</template>
+								
+			</BsModal>
+			
+			<!--Modal: Edit Status-->
+			<BsModal ref="editStatusModal">
+				<template #title>{{$p.t('lehre', 'status_edit')}}</template>
+					<form-form class="row g-3" ref="statusData">
+					
+					<div v-if="statusData.datum < dataMeldestichtag">
+						<b>{{$p.t('bismeldestichtag', 'meldestichtag_erreicht')}}</b>
+					</div>
+					
+					 <input type="hidden" id="statusId" name="statusId" value="statusData.statusId">
+					
+						<div class="row mb-3">
+							<label for="status_kurzbz" class="form-label col-sm-4">{{$p.t('lehre', 'status_rolle')}}</label>
+							<div class="col-sm-6">
+<!--								<form-input type="text" :readonly="readonly" class="form-control" id="status_kurzbz" v-model="statusData['status_kurzbz']">-->
+								<form-input
+									required
+									v-model="statusData['status_kurzbz']"
+									name="status_kurzbz"
+									type="select"
+									disabled
+									>
+									<option  value="Interessent">InteressentIn</option>
+									<option  value="Bewerber">BewerberIn</option>
+									<option  value="Aufgenommener">Aufgenommene/r</option>
+									<option  value="Student">StudentIn</option>
+									<option  value="Unterbrecher">UnterbrecherIn</option>
+									<option  value="Diplomand">DiplomandIn</option>
+									<option  value="Incoming">Incoming</option>
+									<option  value="Absolvent">AbsolventIn</option>
+									<option  value="Abbrecher">AbbrecherIn</option>
+								</form-input>
+							</div>
+						</div>
+						<div class="row mb-3">							   
+							<label for="studiensemester_kurzbz" class="form-label col-sm-4">{{$p.t('lehre', 'studiensemester')}}</label>
+							<div class="col-sm-6">
+								<form-input
+									:readonly="readonly"
+									type="select"
+									name="studiensemester_kurzbz"
+									v-model="statusData['studiensemester_kurzbz']"
+								>
+									<option v-for="sem in listStudiensemester" :key="sem.studiensemester_kurzbz" :value="sem.studiensemester_kurzbz">{{sem.studiensemester_kurzbz}}</option>
+								</form-input>
+							</div>
+						</div>
+						<!-- TODO(manu) if(defined('VORRUECKUNG_STATUS_MAX_SEMESTER') && VORRUECKUNG_STATUS_MAX_SEMESTER==false)-->
+						<div class="row mb-3">
+							<label for="ausbildungssemester" class="form-label col-sm-4">{{$p.t('lehre', 'ausbildungssemester')}}</label>
+							<div class="col-sm-6">
+								<form-input
+									type="select"
+									:readonly="readonly"
+									name="ausbildungssemester"
+									v-model="statusData['ausbildungssemester']"
+								>
+								 <option v-for="number in maxSem" :key="number" :value="number">{{ number }}</option>
+								</form-input>
+							</div>
+						</div>
+						
+						<div class="row mb-3">
+							<label for="datum" class="form-label col-sm-4">{{$p.t('global', 'datum')}}</label>
+							<div class="col-sm-6">
+								<form-input
+									type="DatePicker"
+									:readonly="readonly"
+									name="datum"
+									v-model="statusData['datum']"
+									auto-apply
+									:enable-time-picker="false"
+									format="dd.MM.yyyy"
+									preview-format="dd.MM.yyyy"
+									:teleport="true"
+								></form-input>
+							</div>
+						</div>
+						<div class="row mb-3">					   
+							<label for="bestaetigtam" class="form-label col-sm-4">{{$p.t('lehre', 'bestaetigt_am')}}</label>
+							<div class="col-sm-6">
+								<form-input
+									type="DatePicker"
+									:readonly="readonly"
+									name="datum"
+									v-model="statusData['bestaetigtam']"
+									auto-apply
+									:enable-time-picker="false"
+									format="dd.MM.yyyy"
+									preview-format="dd.MM.yyyy"
+									:teleport="true"
+								></form-input>
+							</div>
+						</div>
+						<div class="row mb-3">
+							<label for="bewerbung_abgeschicktamum" class="form-label col-sm-4">{{$p.t('lehre', 'bewerbung_abgeschickt_am')}}</label>
+							<div class="col-sm-6">
+								<form-input
+									type="DatePicker"
+									:readonly="readonly"
+									name="datum"
+									v-model="statusData['bewerbung_abgeschicktamum']"
+									auto-apply
+									:enable-time-picker="false"
+									format="dd.MM.yyyy"
+									preview-format="dd.MM.yyyy"
+									:teleport="true"
+								></form-input>
+							</div>
+						</div>
+						<div class="row mb-3">
+							<label for="bezeichnung" class="form-label col-sm-4">{{$p.t('lehre', 'studienplan')}}</label>
+							<div class="col-sm-6">
+								<form-input
+									:readonly="readonly"
+									type="select"
+									name="studienplan"
+									v-model="statusData['studienplan_id']"
+								>
+									<option v-for="sp in listStudienplaene" :key="sp.studienplan_id" :value="sp.studienplan_id">{{sp.bezeichnung}}</option>
+								</form-input>
+							</div>
+						</div>
+						<div class="row mb-3">
+							<label for="anmerkung" class="form-label col-sm-4">{{$p.t('global', 'anmerkung')}}</label>
+							<div class="col-sm-6">
+								<form-input
+									type="text"
+									name="anmerkung"
+									v-model="statusData['anmerkung']"
+								>				
+								</form-input>
+							</div>
+						</div>
+						
+						<div class="row mb-3">				   
+							<label for="aufnahmestufe" class="form-label col-sm-4">{{$p.t('lehre', 'aufnahmestufe')}}</label>
+							<div class="col-sm-6">
+								<form-input
+								type="select"
+								:readonly="readonly"
+								name="aufnahmestufe"
+								v-model="statusData['rt_stufe']"
+								>
+								<option v-for="entry in aufnahmestufen" :key="entry" :value="entry">{{entry}}</option>
+								</form-input>
+							</div>
+						</div>
+						
+						<div v-if="gruende.length > 0" class="row mb-3">
+							<label for="grund" class="form-label col-sm-4">{{$p.t('studierendenantrag', 'antrag_grund')}}</label>
+							<div class="col-sm-6">
+								<form-input
+									type="select"
+									:readonly="readonly"
+									name="statusgrund"
+									v-model="statusData['statusgrund_id']"
+								>
+								<option v-for="grund in gruende" :key="grund.statusgrund_id" :value="grund.statusgrund_id">{{grund.beschreibung[0]}}</option>
+								</form-input>
+							</div>
+						</div>
+					
+					</form-form>
+					
+				<template #footer>
+						<button type="button" class="btn btn-primary" @click="editStatus()">OK</button>
+				</template>
+								
+			</BsModal>
+		
+			<!--Modal: Delete Status-->
+			<BsModal ref="deleteStatusModal">
+				<template #title>{{$p.t('lehre', 'status_edit')}}</template>
+				<template #default>
+				<div v-if="isLastStatus == 1">
+					<p>{{$p.t('lehre', 'last_status_confirm_delete')}}</p>
+				</div>
+				<div v-else>
+					<p>{{$p.t('lehre', 'status_confirm_delete')}}</p>
+				</div>
+					
+				</template>
+				<template #footer>
+					<button ref="Close" type="button" class="btn btn-primary" @click="deleteStatus(statusId)">OK</button>
+				</template>
+			</BsModal>
+			
+			<!--Modal: Confirm Abbruch-->
+			<BsModal ref="confirmStatusAction">
+				<template #title>{{$p.t('lehre', 'status_edit')}}</template>
+				<template #default>
+					<div v-if="prestudentIds.length == 1">
+						<p>Diese Person wirklich zum {{actionStatusText}} machen?</p>
+					</div>
+					<div v-else>
+						<p>Diese {{prestudentIds.length}} Personen wirklich zum {{actionStatusText}} machen?</p>
+					</div>
+					
+				</template>
+				<template #footer>
+					<div v-if="actionButton=='abbrecherStgl'">
+						<button  ref="Close" type="button" class="btn btn-primary" @click="changeStatusToAbbrecherStgl(prestudentIds)">OK</button>
+					</div>
+					<div v-if="actionButton=='abbrecherStud'">
+						<button  ref="Close" type="button" class="btn btn-primary" @click="changeStatusToAbbrecherStud(prestudentIds)">OK</button>
+					</div>
+					<div v-if="actionButton=='unterbrecher'">
+						<button  ref="Close" type="button" class="btn btn-primary" @click="changeStatusToUnterbrecher(prestudentIds)">OK</button>
+					</div>					
+				</template>
+			</BsModal>
+			
+			<!--Modal: askForAusbildungssemester-->
+			<BsModal ref="askForAusbildungssemester">
+				<template #title>{{$p.t('lehre', 'status_edit')}}</template>
+				<template #default>
+				<div v-if="prestudentIds.length == 1">
+					<p>In welches Semester soll dieser {{actionStatusText}} verschoben werden?</p>
+				</div>
+				<div v-else>
+					<p>In welches Semester sollen diese {{prestudentIds.length}} {{actionStatusText}}en verschoben werden?</p>
+				</div>
+				
+				<div class="row mb-3">
+					<label for="studiensemester" class="form-label col-sm-4">{{$p.t('lehre', 'studiensemester')}}</label>
+					<div class="col-sm-6">
+						<form-input
+							type="text"
+							name="studiensemester"
+							v-model="actionSem"
+						>				
+						</form-input>
+					</div>
+				</div>
+					
+				</template>
+				<template #footer>
+
+				<div v-if="actionStatusText=='Student'">
+					<button  ref="Close" type="button" class="btn btn-primary" @click="changeStatusToStudent(prestudentIds)">OK</button>
+				</div>
+				<div v-if="actionStatusText=='Wiederholer'">
+					<button  ref="Close" type="button" class="btn btn-primary" @click="changeStatusToWiederholer(prestudentIds)">OK</button>
+				</div>
+					
+				</template>
+			</BsModal>
+			
+			<!--Modal: addMultiStatus--> <!--TODO(MANU) use bs template-->
+<!--			<BsModal ref="addMultiStatus">				
+			<template #title>{{$p.t('lehre', 'status_edit')}}</template>
+				<template #default>
+				<div v-if="prestudentIds.length == 1">
+					<p>In welches Semester soll dieser {{actionStatusText}} verschoben werden?</p>
+				</div>
+				<div v-else>
+					<p>In welches Semester sollen diese {{prestudentIds.length}} {{actionStatusText}}en verschoben werden?</p>
+				</div>
+				
+				<div class="row mb-3">
+					<label for="studiensemester" class="form-label col-sm-4">{{$p.t('lehre', 'studiensemester')}}</label>
+					<div class="col-sm-6">
+						<form-input
+							type="text"
+							name="studiensemester"
+							v-model="actionSem"
+						>				
+						</form-input>
+					</div>
+				</div>
+					
+				</template>
+				<template #footer>
+
+				<div v-if="actionStatusText=='Student'">
+					<button  ref="Close" type="button" class="btn btn-primary" @click="changeStatusToStudent(prestudentIds)">OK</button>
+				</div>
+				<div v-if="actionStatusText=='Wiederholer'">
+					<button  ref="Close" type="button" class="btn btn-primary" @click="changeStatusToWiederholer(prestudentIds)">OK</button>
+				</div>
+					
+				</template>
+			</BsModal>-->
+				
+			<core-filter-cmpt
+				v-if="!this.modelValue.length"
+				ref="table"
+				:tabulator-options="tabulatorOptions"
+				:tabulator-events="tabulatorEvents"
+				table-only
+				:side-menu="false"
+				reload
+				new-btn-show
+				new-btn-label="Status"
+				@click:new="actionNewStatus"
+				>
+				
+				<template #actions="{updateData2}">
+
+<!-- Version1 -->
+<!--    <div class="btn-group">
+        &lt;!&ndash; Hauptbutton &ndash;&gt;
+        <button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
+            Status Ändern
+        </button>
+        &lt;!&ndash; Dropdown-Menü &ndash;&gt;
+        <ul class="dropdown-menu">
+            &lt;!&ndash; Schleife für fünf Unterbuttons &ndash;&gt;
+            &lt;!&ndash; Jeder Unterbutton hat zwei weitere Unterbuttons &ndash;&gt;
+            <li class="dropdown-submenu">
+                <a class="dropdown-item dropdown-toggle" href="#">Abbrecher</a>
+                <ul class="dropdown-menu">
+                    <li><a class="dropdown-item" href="#">Unterbutton 1-1</a></li>
+                    <li><a class="dropdown-item" href="#">Unterbutton 1-2</a></li>
+                </ul>
+            </li>
+            <li class="dropdown-submenu">
+                <a class="dropdown-item dropdown-toggle" href="#">Unterbrecher</a>
+                <ul class="dropdown-menu">
+                    <li><a class="dropdown-item" href="#">Unterbutton 2-1</a></li>
+                    <li><a class="dropdown-item" href="#">Unterbutton 2-2</a></li>
+                </ul>
+            </li>
+            <li class="dropdown-submenu">
+                <a class="dropdown-item dropdown-toggle" href="#">Student</a>
+                <ul class="dropdown-menu">
+                    <li><a class="dropdown-item" href="#">Unterbutton 3-1</a></li>
+                    <li><a class="dropdown-item" href="#">Unterbutton 3-2</a></li>
+                </ul>
+            </li>
+            <li class="dropdown-submenu">
+                <a class="dropdown-item dropdown-toggle" href="#">Diplomand</a>
+                <ul class="dropdown-menu">
+                    <li><a class="dropdown-item" href="#">Unterbutton 4-1</a></li>
+                    <li><a class="dropdown-item" href="#">Unterbutton 4-2</a></li>
+                </ul>
+            </li>
+            <li class="dropdown-submenu">
+                <a class="dropdown-item dropdown-toggle" href="#">Absolvent</a>
+                <ul class="dropdown-menu">
+                    <li><a class="dropdown-item" href="#">Unterbutton 5-1</a></li>
+                    <li><a class="dropdown-item" href="#">Unterbutton 5-2</a></li>
+                </ul>
+            </li>
+        </ul>
+    </div>-->
+
+<!-- Version2 -->
+<!--    <div class="btn-group">
+        &lt;!&ndash; Hauptbutton &ndash;&gt;
+        <button type="button" class="btn btn-primary" data-bs-toggle="offcanvas" data-bs-target="#offcanvasMenu">
+            Version 2
+        </button>
+    </div>-->
+
+    <!-- Offcanvas-Menü -->
+<!--    <div class="offcanvas offcanvas-start" tabindex="-1" id="offcanvasMenu" aria-labelledby="offcanvasMenuLabel">
+        <div class="offcanvas-header">
+            <h5 class="offcanvas-title" id="offcanvasMenuLabel">Untermenü</h5>
+            <button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" aria-label="Close"></button>
+        </div>
+        <div class="offcanvas-body">
+            &lt;!&ndash; Untermenü-Buttons &ndash;&gt;
+            <button type="button" class="btn btn-secondary d-block mb-2">Unterbutton 1-1</button>
+            <button type="button" class="btn btn-secondary d-block mb-2">Unterbutton 1-2</button>
+            <button type="button" class="btn btn-secondary d-block mb-2">Unterbutton 2-1</button>
+            <button type="button" class="btn btn-secondary d-block mb-2">Unterbutton 2-2</button>
+            <button type="button" class="btn btn-secondary d-block mb-2">Unterbutton 3-1</button>
+            <button type="button" class="btn btn-secondary d-block mb-2">Unterbutton 3-2</button>
+            <button type="button" class="btn btn-secondary d-block mb-2">Unterbutton 4-1</button>
+            <button type="button" class="btn btn-secondary d-block mb-2">Unterbutton 4-2</button>
+            <button type="button" class="btn btn-secondary d-block mb-2">Unterbutton 5-1</button>
+            <button type="button" class="btn btn-secondary d-block mb-2">Unterbutton 5-2</button>
+        </div>
+    </div>-->
+
+
+<!-- Hauptbutton zum Öffnen des Modals -->
+<!--TODO(MANU) use bs template addMultiStatus-->
+<!--<button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#mainModal">
+    Status Ändern(3)
+</button>-->
+
+<!-- Modal für Hauptbuttons und Untermenü-Buttons -->
+<!--<div class="modal fade" id="mainModal" tabindex="-1" aria-labelledby="mainModalLabel" aria-hidden="true" ref="addMultiStatus2">
+    <div class="modal-dialog modal-dialog-centered">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" id="mainModalLabel">Status ändern zu</h5>
+                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+            </div>
+            <div class="modal-body">
+                &lt;!&ndash; Liste der Hauptbuttons &ndash;&gt;
+                <button type="button" class="btn btn-primary d-block mb-2" data-bs-toggle="collapse" data-bs-target="#submenu1">
+                    Abbrecher
+                </button>
+                <div class="collapse" id="submenu1">
+                    <button type="button" class="btn btn-light d-block mb-2" @click="actionConfirmDialogue(updateData, 'abbrecherStgl', 'Abbrecher')">durch Stgl</button>
+                    <button type="button" class="btn btn-light d-block mb-2" @click="actionConfirmDialogue(updateData, 'abbrecherStud','Abbrecher')">durch Student</button>
+                </div>
+
+                <button type="button" class="btn btn-primary d-block mb-2" @click="actionConfirmDialogue(updateData, 'unterbrecher','Unterbrecher')">
+                    Unterbrecher
+                </button>
+                
+                <button type="button" class="btn btn-primary d-block mb-2" data-bs-toggle="collapse" data-bs-target="#submenu2">
+                    Student
+                </button>
+                <div class="collapse" id="submenu2">
+                    <button type="button" class="btn btn-light d-block mb-2" @click="actionConfirmDialogue(updateData, 'student','Student')">Student</button>
+                    <button type="button" class="btn btn-light d-block mb-2" @click="actionConfirmDialogue(updateData, 'student','Wiederholer')">Wiederholer</button>
+                </div>
+               
+                <button type="button" class="btn btn-primary d-block mb-2" @click="changeStatusToDiplomand(prestudentIds)">
+                    Diplomand
+                </button>
+
+                
+                <button type="button" class="btn btn-primary d-block mb-2" @click="changeStatusToAbsolvent(prestudentIds)">
+                    Absolvent
+                </button>
+
+            </div>
+        </div>
+    </div>
+</div>-->
+
+
+
+
+
+					<button
+						class="btn btn-outline-primary"
+						@click="actionChangeStatus(selected)"
+						> Status Ändern
+					</button>
+					<button
+						class="btn btn-outline-secondary"
+						@click="actionConfirmDialogue(updateData, 'abbrecherStgl', 'Abbrecher')"
+						>
+						Abbrecher Stgl
+					</button>
+					<button
+						class="btn btn-outline-secondary"
+						@click="actionConfirmDialogue(updateData, 'abbrecherStud','Abbrecher')"
+						>
+						Abbrecher Stud
+					</button>
+					<button
+						class="btn btn-outline-secondary"
+						@click="actionConfirmDialogue(updateData, 'unterbrecher','Unterbrecher')"
+	
+						>
+						Unterbrecher
+					</button>
+					<button
+						class="btn btn-outline-secondary"
+						@click="actionConfirmDialogue(updateData, 'student','Student')"
+		
+						>
+						Student
+					</button>
+					<button
+						class="btn btn-outline-secondary"
+						@click="actionConfirmDialogue(updateData, 'student','Wiederholer')"
+		
+						>
+						Wiederholer
+					</button>
+					<button
+						class="btn btn-outline-secondary"
+						@click="changeStatusToDiplomand(prestudentIds)"
+		
+						>
+						Diplomand
+					</button>
+					<button
+						class="btn btn-outline-secondary"
+						@click="changeStatusToAbsolvent(prestudentIds)"
+		
+						>
+						Absolvent
+					</button>
+				</template>
+			</core-filter-cmpt>
+			
+			<div 
+			v-if="this.modelValue.length"
+			ref="buttonsStatusMulti"
+			>	
+					<button
+						class="btn btn-outline-secondary"
+						@click="actionConfirmDialogue(updateData, 'abbrecherStgl', 'Abbrecher')"
+						>
+						Abbrecher Stgl
+					</button>
+					<button
+						class="btn btn-outline-secondary"
+						@click="actionConfirmDialogue(updateData, 'abbrecherStud','Abbrecher')"
+						>
+						Abbrecher Stud
+					</button>
+					<button
+						class="btn btn-outline-secondary"
+						@click="actionConfirmDialogue(updateData, 'unterbrecher','Unterbrecher')"
+	
+						>
+						Unterbrecher
+					</button>
+					<button
+						class="btn btn-outline-secondary"
+						@click="actionConfirmDialogue(updateData, 'student','Student')"
+		
+						>
+						Student
+					</button>
+					<button
+						class="btn btn-outline-secondary"
+						@click="changeStatusToDiplomand(prestudentIds)"
+		
+						>
+						Diplomand
+					</button>
+					<button
+						class="btn btn-outline-secondary"
+						@click="changeStatusToAbsolvent(prestudentIds)"
+		
+						>
+						Absolvent
+					</button>	
+<!--				<template #actions="{updateData}">
+					<button
+						class="btn btn-outline-primary"
+						@click="actionChangeStatus(selected)"
+						> Status Ändern
+					</button>
+					<button
+						class="btn btn-outline-secondary"
+						@click="actionConfirmDialogue(updateData)"
+		
+						>
+						Abbrecher Stgl
+					</button>
+					<button
+						class="btn btn-outline-secondary"
+						@click="actionConfirmDialogue(selected)"
+		
+						>
+						Abbrecher Stud
+					</button>
+					<button
+						class="btn btn-outline-secondary"
+						@click="actionConfirmDialogue(selected)"
+		
+						>
+						Unterbrecher
+					</button>
+					<button
+						class="btn btn-outline-secondary"
+						@click="actionConfirmDialogue(selected)"
+		
+						>
+						Student
+					</button>
+					<button
+						class="btn btn-outline-secondary"
+						@click="actionConfirmDialogue(selected)"
+		
+						>
+						Wiederholer
+					</button>
+					<button
+						class="btn btn-outline-secondary"
+						@click="actionConfirmDialogue(selected)"
+		
+						>
+						Diplomand
+					</button>
+				</template>-->
+			</div>
+		
+		</div>`
+
+};
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
index 14ddf6866..6c2c45048 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
@@ -815,6 +815,42 @@ export default{
 				new-btn-label="Status"
 				@click:new="actionNewStatus"
 			>
+			<template #actions="{selected}">
+			<button
+				class="btn btn-outline-primary"
+				@click="actionChangeStatus(selected)"
+				> Status Ändern
+			</button>
+			
+<!--				<div class="input-group w-auto">
+					<form-input
+						type="DatePicker"
+						v-model="counterdate"
+						input-group
+						:enable-time-picker="false"
+						auto-apply
+						@cleared="counterdate = new Date()"
+						>
+					</form-input>
+					<button
+						class="btn btn-outline-secondary"
+						@click="actionCounter(selected)"
+						:disabled="!selected.length"
+						>
+						Gegenbuchen
+					</button>
+				</div>
+				
+				<button
+					v-if="config.showZahlungsbestaetigung"
+					class="btn btn-outline-secondary"
+					@click="downloadPdf(selected)"
+					:disabled="!selected.length"
+					>
+					<i class="fa fa-download"></i> Zahlungsbestaetigung
+				</button>-->
+				
+			</template>
 		</core-filter-cmpt>
 		
 		</div>`
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Status.js b/public/js/components/Stv/Studentenverwaltung/Details/Status.js
index 623fcb597..2d0ced38a 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Status.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Status.js
@@ -1,18 +1,25 @@
 import TblStatus from "./Prestudent/Status.js";
+import TblMultiStatus from "./Prestudent/MultiStatus.js";
 
 export default {
 	components: {
-		TblStatus
+		TblStatus,
+		TblMultiStatus
 	},
 	props: {
 		modelValue: Object,
 	},
 	template: `
+		<div class="stv-details-details h-100 pb-3">
+			<TblMultiStatus :modelValue="modelValue"></TblMultiStatus>		
+	</div>
 	<div class="stv-details-details h-100 pb-3">
 			<div class="col-12 pb-3">
 			<legend>Status</legend>
 			<TblStatus :prestudent_id="modelValue.prestudent_id" :studiengang_kz="modelValue.studiengang_kz"></TblStatus>		
 		</div>
-		</div>
+	</div>
+	
+
 	`
 }
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index c9c5ecb26..866dd4d07 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -83,6 +83,9 @@ export default {
 		}
 	},
 	methods: {
+		reload() {
+			this.$refs.table.reloadTable();
+		},
 		actionNewPrestudent() {
 			this.$refs.new.open();
 		},

From ffe4fcb0b3d927a651b50c0a089cdf099725f547 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 26 Apr 2024 14:43:56 +0200
Subject: [PATCH 0656/1461] removes the cis styles from the admin views

---
 application/views/lehre/lehrauftrag/approveLehrauftrag.php  | 1 -
 application/views/lehre/lehrauftrag/orderLehrauftrag.php    | 1 -
 .../views/lehre/lvplanung/adminZeitverfuegbarkeit.php       | 1 -
 application/views/widgets/table/table.php                   | 4 +---
 public/js/TableWidget.js                                    | 6 +++---
 5 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/application/views/lehre/lehrauftrag/approveLehrauftrag.php b/application/views/lehre/lehrauftrag/approveLehrauftrag.php
index dadc9a193..b215df10c 100644
--- a/application/views/lehre/lehrauftrag/approveLehrauftrag.php
+++ b/application/views/lehre/lehrauftrag/approveLehrauftrag.php
@@ -11,7 +11,6 @@ $this->load->view(
         'sbadmintemplate3' => true,
         'tabulator5' => true,
         'tabulator5JQuery' => true,
-        'cis'=>true,
         'momentjs2' => true,
         'ajaxlib' => true,
         'dialoglib' => true,
diff --git a/application/views/lehre/lehrauftrag/orderLehrauftrag.php b/application/views/lehre/lehrauftrag/orderLehrauftrag.php
index ce2466906..64ad76c0f 100644
--- a/application/views/lehre/lehrauftrag/orderLehrauftrag.php
+++ b/application/views/lehre/lehrauftrag/orderLehrauftrag.php
@@ -11,7 +11,6 @@ $this->load->view(
         'sbadmintemplate3' => true,
         'tabulator5' => true,
         'tabulator5JQuery' => true,
-        'cis'=> true,
         'momentjs2' => true,
         'ajaxlib' => true,
         'dialoglib' => true,
diff --git a/application/views/lehre/lvplanung/adminZeitverfuegbarkeit.php b/application/views/lehre/lvplanung/adminZeitverfuegbarkeit.php
index e9bb71038..71b1ead33 100644
--- a/application/views/lehre/lvplanung/adminZeitverfuegbarkeit.php
+++ b/application/views/lehre/lvplanung/adminZeitverfuegbarkeit.php
@@ -11,7 +11,6 @@ $this->load->view(
         'ajaxlib' => true,
         'tabulator5' => true,
         'tabulator5JQuery' => true,
-        'cis' => true,
         'tablewidget' => true,
         'navigationwidget' => true,
         'sbadmintemplate3' => true,
diff --git a/application/views/widgets/table/table.php b/application/views/widgets/table/table.php
index 33a13b1da..713bcd7dc 100644
--- a/application/views/widgets/table/table.php
+++ b/application/views/widgets/table/table.php
@@ -12,9 +12,7 @@
 		<div id="tableDatasetActionsTop"></div>
 
 		<!-- TableWidget table -->
-		<div class="border border-1 mb-4">
-			<?php TableWidget::loadViewDataset(); ?>
-		</div>
+		<?php TableWidget::loadViewDataset(); ?>
 
 		<!-- Table info bottom -->
 		<div id="tableDatasetActionsBottom"></div>
diff --git a/public/js/TableWidget.js b/public/js/TableWidget.js
index 4f107adce..4d9d66574 100644
--- a/public/js/TableWidget.js
+++ b/public/js/TableWidget.js
@@ -799,8 +799,8 @@ function _renderTabulatorHeaderHTML(tableWidgetDiv) {
   var tableUniqueId = tableWidgetDiv.attr("tableUniqueId");
 
   var tabulatorHeaderHTML = "";
-  tabulatorHeaderHTML += `<div class="btn-toolbar ${
-    _bootstrapVersion == 3 ? "pull-right" : "d-flex justify-content-end mb-2"
+  tabulatorHeaderHTML += `<div  ${
+    _bootstrapVersion == 3 ? 'class="btn-toolbar pull-right" style="margin-bottom:0.5rem;"' : 'class="btn-toolbar d-flex justify-content-end mb-2"'
   }" role="toolbar">
 		<div class="btn-group" role="group">
 			<!-- CSV Download button -->
@@ -938,7 +938,7 @@ function _renderTabulatorFooterHTML(tableWidgetFooterOptions) {
     typeof tableWidgetFooterOptions.selectButtons != "undefined" &&
     tableWidgetFooterOptions.selectButtons == true
   ) {
-    tabulatorFooterHTML += `<div class="btn-toolbar" role="toolbar">
+    tabulatorFooterHTML += `<div ${_bootstrapVersion==3?'style="margin-top:1.5rem;" class="btn-toolbar"': 'class="btn-toolbar mt-4"'}  role="toolbar">
 			<div class="btn-group" role="group">
 				<button id="select-all" class="btn ${
           _bootstrapVersion == 3

From b5c830ed35a8e452d4c984c1f372a1b4b1062c00 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 29 Apr 2024 11:19:10 +0200
Subject: [PATCH 0657/1461] FHCAPI stabilize addError function

---
 application/core/FHCAPI_Controller.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/application/core/FHCAPI_Controller.php b/application/core/FHCAPI_Controller.php
index 647032795..36388e271 100644
--- a/application/core/FHCAPI_Controller.php
+++ b/application/core/FHCAPI_Controller.php
@@ -94,7 +94,7 @@ class FHCAPI_Controller extends Auth_Controller
 	// ---------------------------------------------------------------
 
 	/**
-	 * @param array					$data
+	 * @param string|array|object	$data
 	 * @param string				$type (optional)
 	 * @return void
 	 */
@@ -110,6 +110,8 @@ class FHCAPI_Controller extends Auth_Controller
 				$error['messages'] = $data;
 			else
 				$error = $data;
+		} elseif (is_object($data)) {
+			$error = (array)$data;
 		} else {
 			$error['message'] = $data;
 		}
@@ -117,6 +119,9 @@ class FHCAPI_Controller extends Auth_Controller
 		if ($type)
 			$error['type'] = $type;
 
+		if (!isset($error['type']))
+			$error['type'] = self::ERROR_TYPE_GENERAL;
+
 		$this->returnObj['errors'][] = $error;
 	}
 

From 8cf63f3b76849b300a1b599923372c18b0d084c0 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 29 Apr 2024 11:34:18 +0200
Subject: [PATCH 0658/1461] replaces the icons images with actual icons from
 the fontawesome6 library

---
 .../lehre/lehrauftrag/acceptLehrauftrag.php   |  10 +-
 .../lehrauftrag/acceptLehrauftragHelp.php     |   4 +-
 .../lehre/lehrauftrag/approveLehrauftrag.php  |  10 +-
 .../lehrauftrag/approveLehrauftragHelp.php    |  14 +-
 .../lehre/lehrauftrag/orderLehrauftrag.php    |  10 +-
 .../lehrauftrag/orderLehrauftragHelp.php      |  14 +-
 application/views/templates/FHC-Header.php    | 199 ++++++++++--------
 public/css/Tabulator5.css                     |   7 +-
 .../js/lehre/lehrauftrag/acceptLehrauftrag.js |  50 +----
 .../lehre/lehrauftrag/approveLehrauftrag.js   |  46 +---
 .../js/lehre/lehrauftrag/orderLehrauftrag.js  |  45 +---
 11 files changed, 162 insertions(+), 247 deletions(-)

diff --git a/application/views/lehre/lehrauftrag/acceptLehrauftrag.php b/application/views/lehre/lehrauftrag/acceptLehrauftrag.php
index 32f08679d..e0e67b44a 100644
--- a/application/views/lehre/lehrauftrag/acceptLehrauftrag.php
+++ b/application/views/lehre/lehrauftrag/acceptLehrauftrag.php
@@ -167,17 +167,17 @@ $this->load->view(
 								data-bs-toggle="tooltip" data-bs-placement="left" title="<?php echo $this->p->t('ui', 'alleAnzeigen'); ?>"><i class='fa fa-users'></i>
 						</button>
 						<button id="show-approved" class="btn btn-outline-secondary btn-lehrauftrag" type="button"
-								data-bs-toggle="tooltip" data-bs-placement="left" title="<?php echo $this->p->t('ui', 'nurErteilteAnzeigen'); ?>">
-						</button><!-- png img set in javascript -->
+								data-bs-toggle="tooltip" data-bs-placement="left" title="<?php echo $this->p->t('ui', 'nurErteilteAnzeigen'); ?>"><i class='fa fa-user-check'></i>
+						</button>
 						<button id="show-accepted" class="btn btn-outline-secondary btn-lehrauftrag" type="button"
-								data-bs-toggle="tooltip" data-bs-placement="left" title="<?php echo $this->p->t('ui', 'nurAngenommeneAnzeigen'); ?>"><i class='fa fa-handshake-o'></i>
+								data-bs-toggle="tooltip" data-bs-placement="left" title="<?php echo $this->p->t('ui', 'nurAngenommeneAnzeigen'); ?>"><i class='fa-regular fa-handshake'></i>
 						</button>
 					</div>
 
 					<button id="show-cancelled" class="btn btn-outline-secondary btn-lehrauftrag" type="button" style="margin-left: 20px;"
 							data-bs-toggle="collapse" data-placement="left" title="<?php echo $this->p->t('ui', 'nurStornierteAnzeigen'); ?>"
-							data-bs-target ="#collapseCancelledLehrauftraege" aria-expanded="false" aria-controls="collapseExample">
-					</button><!-- png img set in javascript -->
+							data-bs-target ="#collapseCancelledLehrauftraege" aria-expanded="false" aria-controls="collapseExample"><i class="fa fa-user-xmark"></i>
+					</button>
 				</div>
 			</div>
 
diff --git a/application/views/lehre/lehrauftrag/acceptLehrauftragHelp.php b/application/views/lehre/lehrauftrag/acceptLehrauftragHelp.php
index 2e7ede0a8..531332231 100644
--- a/application/views/lehre/lehrauftrag/acceptLehrauftragHelp.php
+++ b/application/views/lehre/lehrauftrag/acceptLehrauftragHelp.php
@@ -26,8 +26,8 @@
 		<table class="table table-bordered">
 			<tr class="text-center">
 				<td class="col-1"><i class='fa fa-users'></i></td>
-				<td class="col-1"><img src="../../../public/images/icons/fa-user-check.png" style="height: 30px; width: 30px;"></td>
-				<td class="col-1"><i class='fa fa-handshake-o'></i></td>
+				<td class="col-1"><i class='fa fa-user-check'></i></td>
+				<td class="col-1"><i class='fa-regular fa-handshake'></i></td>
 			</tr>
 			<tr class="text-center">
 				<td><?php echo $this->p->t('lehre', 'filterAlleBeiAnnahme'); ?></td>
diff --git a/application/views/lehre/lehrauftrag/approveLehrauftrag.php b/application/views/lehre/lehrauftrag/approveLehrauftrag.php
index b215df10c..2ffe549e5 100644
--- a/application/views/lehre/lehrauftrag/approveLehrauftrag.php
+++ b/application/views/lehre/lehrauftrag/approveLehrauftrag.php
@@ -7,7 +7,7 @@ $this->load->view(
         'jqueryui1' => true,
         'jquerycheckboxes1' => true,
         'bootstrap3' => true,
-        'fontawesome4' => true,
+        'fontawesome6' => true,
         'sbadmintemplate3' => true,
         'tabulator5' => true,
         'tabulator5JQuery' => true,
@@ -190,12 +190,12 @@ $this->load->view(
                     <div class="btn-group" role="group">
                         <button id="show-all" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'alleAnzeigen'); ?>"><i class='fa fa-users'></i></button>
                         <button id="show-new" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurNeueAnzeigen'); ?>"><i class='fa fa-user-plus'></i></button>
-                        <button id="show-ordered" class="btn btn-default btn-lehrauftrag active focus" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurBestellteAnzeigen'); ?>"></button><!-- png img set in javascript -->
-                        <button id="show-approved" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurErteilteAnzeigen'); ?>"></button><!-- png img set in javascript -->
-                        <button id="show-accepted" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurAngenommeneAnzeigen'); ?>"><i class='fa fa-handshake-o'></i></button>
+                        <button id="show-ordered" class="btn btn-default btn-lehrauftrag active focus" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurBestellteAnzeigen'); ?>"><i class='fa fa-user-tag'></i></button>
+                        <button id="show-approved" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurErteilteAnzeigen'); ?>"><i class='fa fa-user-check'></i></button>
+                        <button id="show-accepted" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurAngenommeneAnzeigen'); ?>"><i class='fa-regular fa-handshake'></i></button>
                     </div>
                     <div class="btn-group" role="group" style="margin-left: 20px;">
-                        <button id="show-changed" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurGeaenderteAnzeigen'); ?>"></button><!-- png img set in javascript -->
+                        <button id="show-changed" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurGeaenderteAnzeigen'); ?>"><i class='fa fa-user-pen'></i></button>
                     </div>
                     <div class="btn-group" role="group" style="margin-left: 20px;">
                         <button id="show-dummies" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurDummiesAnzeigen'); ?>"><i class='fa fa-user-secret'></i></button>
diff --git a/application/views/lehre/lehrauftrag/approveLehrauftragHelp.php b/application/views/lehre/lehrauftrag/approveLehrauftragHelp.php
index 0343da5f1..27eae8df2 100644
--- a/application/views/lehre/lehrauftrag/approveLehrauftragHelp.php
+++ b/application/views/lehre/lehrauftrag/approveLehrauftragHelp.php
@@ -2,11 +2,11 @@
 <div class="panel panel-body">
 	<table>
 		<tr class="text-center">
-			<td><img src="../../../public/images/icons/fa-user-tag.png" style="height: 60px; width: 60px;"></td>
+			<td><i class='fa fa-2x fa-user-tag'></i></td>
 			<td><i class='fa fa-2x fa-long-arrow-right'></i></td>
-			<td><img src="../../../public/images/icons/fa-user-check.png" style="height: 60px; width: 60px;"></td>
+			<td><i class='fa fa-2x fa-user-check'></i></td>
 			<td><i class='fa fa-2x fa-long-arrow-right'></i></td>
-			<td><i class='fa fa-2x fa-handshake-o'></i></td>
+			<td><i class='fa-regular fa-2x fa-handshake'></i></td>
 		</tr>
 		<tr class="text-center">
 			<td class="text-muted"><?php echo $this->p->t('lehre', 'lehrauftragStandardBestellprozessBestellen'); ?></td>
@@ -48,10 +48,10 @@
 		<tr class="text-center">
 			<td class="col-xs-1"><i class='fa fa-users'></i></td>
 			<td class="col-xs-1"><i class='fa fa-user-plus'></i></td>
-			<td class="col-xs-1"><img src="../../../public/images/icons/fa-user-tag.png" style="height: 30px; width: 30px;"></td>
-			<td class="col-xs-1"><img src="../../../public/images/icons/fa-user-check.png" style="height: 30px; width: 30px;"></td>
-			<td class="col-xs-1"><i class='fa fa-handshake-o'></i></td>
-			<td class="col-xs-1"><img src="../../../public/images/icons/fa-user-edit.png" style="height: 30px; width: 30px;"></td>
+			<td class="col-xs-1"><i class='fa fa-user-tag'></i></td>
+			<td class="col-xs-1"><i class='fa fa-user-check'></i></td>
+			<td class="col-xs-1"><i class='fa-regular fa-handshake'></i></td>
+			<td class="col-xs-1"><i class='fa fa-user-pen'></i></td>
 			<td class="col-xs-1"><i class='fa fa-user-secret'></i></td>
 		
 		</tr>
diff --git a/application/views/lehre/lehrauftrag/orderLehrauftrag.php b/application/views/lehre/lehrauftrag/orderLehrauftrag.php
index 64ad76c0f..12f5c25d0 100644
--- a/application/views/lehre/lehrauftrag/orderLehrauftrag.php
+++ b/application/views/lehre/lehrauftrag/orderLehrauftrag.php
@@ -7,7 +7,7 @@ $this->load->view(
         'jqueryui1' => true,
         'jquerycheckboxes1' => true,
         'bootstrap3' => true,
-        'fontawesome4' => true,
+        'fontawesome6' => true,
         'sbadmintemplate3' => true,
         'tabulator5' => true,
         'tabulator5JQuery' => true,
@@ -188,12 +188,12 @@ $this->load->view(
                     <div class="btn-group" role="group">
                         <button id="show-all" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'alleAnzeigen'); ?>"><i class='fa fa-users'></i></button>
                         <button id="show-new" class="btn btn-default btn-lehrauftrag active focus" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurNeueAnzeigen'); ?>"><i class='fa fa-user-plus'></i></button>
-                        <button id="show-ordered" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurBestellteAnzeigen'); ?>"></button><!-- png img set in javascript -->
-                        <button id="show-approved" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurErteilteAnzeigen'); ?>"></button><!-- png img set in javascript -->
-                        <button id="show-accepted" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurAngenommeneAnzeigen'); ?>"><i class='fa fa-handshake-o'></i></button>
+                        <button id="show-ordered" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurBestellteAnzeigen'); ?>"><i class='fa fa-user-tag'></i></button><!-- png img set in javascript -->
+                        <button id="show-approved" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurErteilteAnzeigen'); ?>"><i class='fa fa-user-check'></i></button><!-- png img set in javascript -->
+                        <button id="show-accepted" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurAngenommeneAnzeigen'); ?>"><i class='fa-regular fa-handshake'></i></button>
                     </div>
                     <div class="btn-group" role="group" style="margin-left: 20px;">
-                        <button id="show-changed" class="btn btn-default btn-lehrauftrag active focus" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurGeaenderteAnzeigen'); ?>"></button><!-- png img set in javascript -->
+                        <button id="show-changed" class="btn btn-default btn-lehrauftrag active focus" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurGeaenderteAnzeigen'); ?>"><i class='fa fa-user-edit'></i></button></button><!-- png img set in javascript -->
                     </div>
                     <div class="btn-group" role="group" style="margin-left: 20px;">
                         <button id="show-dummies" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurDummiesAnzeigen'); ?>"><i class='fa fa-user-secret'></i></button>
diff --git a/application/views/lehre/lehrauftrag/orderLehrauftragHelp.php b/application/views/lehre/lehrauftrag/orderLehrauftragHelp.php
index 5ea991002..2cc51491c 100644
--- a/application/views/lehre/lehrauftrag/orderLehrauftragHelp.php
+++ b/application/views/lehre/lehrauftrag/orderLehrauftragHelp.php
@@ -2,11 +2,11 @@
 <div class="panel panel-body">
 	<table>
 		<tr class="text-center">
-			<td><img src="../../../public/images/icons/fa-user-tag.png" style="height: 60px; width: 60px;"></td>
+			<td><i class='fa fa-2x fa-user-tag'></i></td>
 			<td><i class='fa fa-2x fa-long-arrow-right'></i></td>
-			<td><img src="../../../public/images/icons/fa-user-check.png" style="height: 60px; width: 60px;"></td>
+			<td><i class='fa fa-2x fa-user-check'></i></td>
 			<td><i class='fa fa-2x fa-long-arrow-right'></i></td>
-			<td><i class='fa fa-2x fa-handshake-o'></i></td>
+			<td><i class='fa-regular fa-2x fa-handshake'></i></td>
 		</tr>
 		<tr class="text-center">
 			<td><b><?php echo $this->p->t('lehre', 'lehrauftragStandardBestellprozessBestellen'); ?></b></td>
@@ -50,10 +50,10 @@
 		<tr class="text-center">
 			<td class="col-xs-1"><i class='fa fa-users'></i></td>
 			<td class="col-xs-1"><i class='fa fa-user-plus'></i></td>
-			<td class="col-xs-1"><img src="../../../public/images/icons/fa-user-tag.png" style="height: 30px; width: 30px;"></td>
-			<td class="col-xs-1"><img src="../../../public/images/icons/fa-user-check.png" style="height: 30px; width: 30px;"></td>
-			<td class="col-xs-1"><i class='fa fa-handshake-o'></i></td>
-			<td class="col-xs-1"><img src="../../../public/images/icons/fa-user-edit.png" style="height: 30px; width: 30px;"></td>
+			<td class="col-xs-1"><i class='fa fa-user-tag'></i></td>
+			<td class="col-xs-1"><i class='fa fa-user-check'></i></td>
+			<td class="col-xs-1"><i class='fa-regular fa-handshake'></i></td>
+			<td class="col-xs-1"><i class='fa fa-user-pen'></i></td>
 			<td class="col-xs-1"><i class='fa fa-user-secret'></i></td>
 		
 		</tr>
diff --git a/application/views/templates/FHC-Header.php b/application/views/templates/FHC-Header.php
index ed9fa97b9..e0fa6867d 100644
--- a/application/views/templates/FHC-Header.php
+++ b/application/views/templates/FHC-Header.php
@@ -1,128 +1,145 @@
 <?php
-	if (! defined('BASEPATH')) exit('No direct script access allowed');
+if (!defined('BASEPATH'))
+	exit('No direct script access allowed');
 
-	// Defines the includes variables
-	require('FHC-Common.php');
+// Defines the includes variables
+require ('FHC-Common.php');
 
-	// All the following variables are used only in this view
-	// By default set the parameters to null
-	$title = isset($title) ? $title : null;
-	$refresh = isset($refresh) ? $refresh : null;
-	$customCSSs = isset($customCSSs) ? $customCSSs : null;
+// All the following variables are used only in this view
+// By default set the parameters to null
+$title = isset($title) ? $title : null;
+$refresh = isset($refresh) ? $refresh : null;
+$customCSSs = isset($customCSSs) ? $customCSSs : null;
 ?>
 <!-- Header start -->
 
 <!DOCTYPE HTML>
 <html>
-	<head>
-		<title><?php printPageTitle($title); ?></title>
 
-		<meta name="viewport" content="width=device-width, initial-scale=1">
+<head>
+	<title><?php printPageTitle($title); ?></title>
 
-		<meta charset="UTF-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1">
 
-		<?php printRefreshMeta($refresh); ?>
+	<meta charset="UTF-8">
 
-		<?php
-			// --------------------------------------------------------------------------------------------------------
-			// CSS
+	<?php printRefreshMeta($refresh); ?>
 
-			// --------------------------------------------------------------------------------------------------------
-			// From vendor folder
+	<?php
+	// --------------------------------------------------------------------------------------------------------
+	// CSS
+	
+	// --------------------------------------------------------------------------------------------------------
+	// From vendor folder
+	
+	// Securimage CSS
+	if ($captcha3 === true)
+		generateCSSsInclude('vendor/dapphp/securimage/securimage.css');
 
-			// Securimage CSS
-			if ($captcha3 === true) generateCSSsInclude('vendor/dapphp/securimage/securimage.css');
+	// Font Awesome 4 CSS free icons
+	if ($fontawesome4 === true)
+		generateCSSsInclude('vendor/fortawesome/font-awesome4/css/font-awesome.min.css');
 
-			// Font Awesome 4 CSS free icons
-			if ($fontawesome4 === true) generateCSSsInclude('vendor/fortawesome/font-awesome4/css/font-awesome.min.css');
+	// Font Awesome 6 CSS free icons
+	if ($fontawesome6 === true) {
+		generateCSSsInclude('vendor/fortawesome/font-awesome6/css/fontawesome.min.css');
+		generateCSSsInclude('vendor/fortawesome/font-awesome6/css/solid.min.css');
+		generateCSSsInclude('vendor/fortawesome/font-awesome6/css/regular.min.css');
+		generateCSSsInclude('vendor/fortawesome/font-awesome6/css/brands.min.css');
+	}
 
-			// Font Awesome 6 CSS free icons
-			if ($fontawesome6 === true)
-			{
-				generateCSSsInclude('vendor/fortawesome/font-awesome6/css/fontawesome.min.css');
-				generateCSSsInclude('vendor/fortawesome/font-awesome6/css/solid.min.css');
-				generateCSSsInclude('vendor/fortawesome/font-awesome6/css/brands.min.css');
-			}
+	// jQuery UI CSS
+	if ($jqueryui1 === true)
+		generateCSSsInclude('vendor/components/jqueryui/themes/base/jquery-ui.min.css');
 
-			// jQuery UI CSS
-			if ($jqueryui1 === true) generateCSSsInclude('vendor/components/jqueryui/themes/base/jquery-ui.min.css');
+	// jQuery treetable
+	if ($jquerytreetable3 === true)
+		generateCSSsInclude('vendor/ludo/jquery-treetable/css/jquery.treetable.css');
 
-			// jQuery treetable
-			if ($jquerytreetable3 === true) generateCSSsInclude('vendor/ludo/jquery-treetable/css/jquery.treetable.css');
+	// Bootstrap 3 CSS
+	if ($bootstrap3 === true)
+		generateCSSsInclude('vendor/twbs/bootstrap3/dist/css/bootstrap.min.css');
 
-			// Bootstrap 3 CSS
-			if ($bootstrap3 === true) generateCSSsInclude('vendor/twbs/bootstrap3/dist/css/bootstrap.min.css');
+	// Bootstrap 5 CSS
+	if ($bootstrap5 === true)
+		generateCSSsInclude('vendor/twbs/bootstrap5/dist/css/bootstrap.min.css');
 
-			// Bootstrap 5 CSS
-			if ($bootstrap5 === true) generateCSSsInclude('vendor/twbs/bootstrap5/dist/css/bootstrap.min.css');
+	// PivotUI CSS
+	if ($pivotui2 === true)
+		generateCSSsInclude('vendor/nicolaskruchten/pivottable/dist/pivot.min.css');
 
-			// PivotUI CSS
-			if ($pivotui2 === true) generateCSSsInclude('vendor/nicolaskruchten/pivottable/dist/pivot.min.css');
+	// SB Admin 2 template CSS
+	if ($sbadmintemplate3 === true) {
+		generateCSSsInclude('vendor/blackrockdigital/startbootstrap-sb-admin-2/vendor/metisMenu/metisMenu.min.css');
+		generateCSSsInclude('vendor/blackrockdigital/startbootstrap-sb-admin-2/dist/css/sb-admin-2.min.css');
+	}
 
-			// SB Admin 2 template CSS
-			if ($sbadmintemplate3 === true)
-			{
-				generateCSSsInclude('vendor/blackrockdigital/startbootstrap-sb-admin-2/vendor/metisMenu/metisMenu.min.css');
-				generateCSSsInclude('vendor/blackrockdigital/startbootstrap-sb-admin-2/dist/css/sb-admin-2.min.css');
-			}
+	// Table sorter CSS
+	if ($tablesorter2 === true)
+		generateCSSsInclude('vendor/mottie/tablesorter/dist/css/theme.default.min.css');
 
-			// Table sorter CSS
-			if ($tablesorter2 === true) generateCSSsInclude('vendor/mottie/tablesorter/dist/css/theme.default.min.css');
+	// Tabulator 4 CSS
+	if ($tabulator4 === true) {
+		generateCSSsInclude('vendor/olifolkerd/tabulator4/dist/css/bootstrap/tabulator_bootstrap.min.css');
+		generateCSSsInclude('public/css/Tabulator.css');
+	}
 
-			// Tabulator 4 CSS
-			if ($tabulator4 === true)
-			{
-				generateCSSsInclude('vendor/olifolkerd/tabulator4/dist/css/bootstrap/tabulator_bootstrap.min.css');
-				generateCSSsInclude('public/css/Tabulator.css');
-			}
+	// Tabulator 5 CSS
+	if ($tabulator5 === true)
+		generateCSSsInclude('public/css/Tabulator5.css');
 
-			// Tabulator 5 CSS
-			if ($tabulator5 === true) generateCSSsInclude('public/css/Tabulator5.css');
+	// Tinymce 5 CSS
+	if ($tinymce5 === true)
+		generateCSSsInclude('public/css/TinyMCE5.css');
 
-			// Tinymce 5 CSS
-			if ($tinymce5 === true) generateCSSsInclude('public/css/TinyMCE5.css');
+	// PrimeVUE
+	if ($primevue3 === true) {
+		generateCSSsInclude('vendor/npm-asset/primevue/resources/themes/bootstrap4-light-blue/theme.css');
+		generateCSSsInclude('vendor/npm-asset/primevue/resources/primevue.min.css');
+		// generateCSSsInclude('vendor/npm-asset/primevue/resources/primeflex.min.css');
+		generateCSSsInclude('vendor/npm-asset/primeicons/primeicons.css');
+	}
 
-			// PrimeVUE
-			if ($primevue3 === true)
-			{
-				generateCSSsInclude('vendor/npm-asset/primevue/resources/themes/bootstrap4-light-blue/theme.css');
-				generateCSSsInclude('vendor/npm-asset/primevue/resources/primevue.min.css');
-				// generateCSSsInclude('vendor/npm-asset/primevue/resources/primeflex.min.css');
-				generateCSSsInclude('vendor/npm-asset/primeicons/primeicons.css');
-			}
+	// --------------------------------------------------------------------------------------------------------
+	// From public folder
+	
+	// AjaxLib CSS
+	if ($ajaxlib === true)
+		generateCSSsInclude('public/css/AjaxLib.css');
 
-			// --------------------------------------------------------------------------------------------------------
-			// From public folder
+	// DialogLib CSS
+	if ($dialoglib === true)
+		generateCSSsInclude('public/css/DialogLib.css');
 
-			// AjaxLib CSS
-			if ($ajaxlib === true) generateCSSsInclude('public/css/AjaxLib.css');
+	// VUE FilterWidget CSS
+	if ($filtercomponent === true)
+		generateCSSsInclude('public/css/components/FilterComponent.css');
 
-			// DialogLib CSS
-			if ($dialoglib === true) generateCSSsInclude('public/css/DialogLib.css');
+	// FilterWidget CSS
+	if ($filterwidget === true)
+		generateCSSsInclude('public/css/FilterWidget.css');
 
-			// VUE FilterWidget CSS
-			if ($filtercomponent === true) generateCSSsInclude('public/css/components/FilterComponent.css');
+	// VUE NavigationWidget CSS
+	if ($navigationcomponent === true)
+		generateCSSsInclude('public/css/components/NavigationComponent.css');
 
-			// FilterWidget CSS
-			if ($filterwidget === true) generateCSSsInclude('public/css/FilterWidget.css');
+	// NavigationWidget CSS
+	if ($navigationwidget === true)
+		generateCSSsInclude('public/css/NavigationWidget.css');
 
-			// VUE NavigationWidget CSS
-			if ($navigationcomponent === true) generateCSSsInclude('public/css/components/NavigationComponent.css');
+	// HTML Widget CSS
+	if ($widgets === true)
+		generateCSSsInclude('public/css/Widgets.css');
 
-			// NavigationWidget CSS
-			if ($navigationwidget === true) generateCSSsInclude('public/css/NavigationWidget.css');
+	// CIS
+	if ($cis === true)
+		generateCSSsInclude('public/css/cis_bs5.css');
 
-			// HTML Widget CSS
-			if ($widgets === true) generateCSSsInclude('public/css/Widgets.css');
+	// Eventually required CSS
+	generateCSSsInclude($customCSSs); // Eventually required CSS
+	?>
+</head>
 
-			// CIS
-			if ($cis === true) generateCSSsInclude('public/css/cis_bs5.css');
-
-			// Eventually required CSS
-			generateCSSsInclude($customCSSs); // Eventually required CSS
-		?>
-	</head>
-	<body>
-
-<!-- Header end -->
+<body>
 
+	<!-- Header end -->
\ No newline at end of file
diff --git a/public/css/Tabulator5.css b/public/css/Tabulator5.css
index b10a307ae..3ce22e592 100644
--- a/public/css/Tabulator5.css
+++ b/public/css/Tabulator5.css
@@ -39,10 +39,9 @@
 	z-index: 999999;
 }
 
-/* classes for rows that are not selectable in the tabulator */
-.tabulator-row.tabulator-unselectable{
-	color:var(--bs-gray-500);
-	
+/* classes for rows that are not selectable in the tabulator, except for rows that are used for calculation */
+.tabulator-row.tabulator-unselectable:not(.tabulator-calcs) {
+	color: #adb5bd !important;
 }
 
 /* using bootstrap background classes to style the background color of tabulator rows */
diff --git a/public/js/lehre/lehrauftrag/acceptLehrauftrag.js b/public/js/lehre/lehrauftrag/acceptLehrauftrag.js
index fed97c4b6..7b803ef90 100644
--- a/public/js/lehre/lehrauftrag/acceptLehrauftrag.js
+++ b/public/js/lehre/lehrauftrag/acceptLehrauftrag.js
@@ -9,26 +9,11 @@
 // -----------------------------------------------------------------------------------------------------------------
 const APP_ROOT = FHC_JS_DATA_STORAGE_OBJECT.app_root;
 
-const COLOR_LIGHTGREY = "#f5f5f5";
-
 const TABLE_CANCELLED_LEHRAUFTRAG =
   "[tableuniqueid = cancelledLehrauftrag] #tableWidgetTabulator";
 const TABLE_ACCEPT_LEHRAUFTRAG =
   "[tableuniqueid = acceptLehrauftrag] #tableWidgetTabulator";
 
-/**
- * PNG icons used in status- and filter buttons
- * Setting png icons is a workaround to use font-awsome 5.9.0 icons until system can be updated to newer font awsome version.
- * */
-const ICON_LEHRAUFTRAG_ORDERED =
-  '<img src="../../../public/images/icons/fa-user-tag.png" style="height: 30px; width: 30px; margin: -6px;">';
-const ICON_LEHRAUFTRAG_APPROVED =
-  '<img src="../../../public/images/icons/fa-user-check.png" style="height: 30px; width: 30px; margin: -6px;">';
-const ICON_LEHRAUFTRAG_CHANGED =
-  '<img src="../../../public/images/icons/fa-user-edit.png" style="height: 30px; width: 30px; margin: -6px;">';
-const ICON_LEHRAUFTRAG_CANCELLED =
-  '<img src="../../../public/images/icons/fa-user-times.png" style="height: 30px; width: 30px; margin: -6px;">';
-
 // Fields that should not be provided in the column picker
 var tableWidgetBlacklistArray_columnUnselectable = [
   "status",
@@ -183,10 +168,10 @@ function func_tableBuilt(table) {
   // Add status column to table
   table.addColumn(
     {
-      title: "<i class='fa fa-user-o'></i>",
+      title: "<i class='fa fa-user'></i>",
       field: "status",
       width: 40,
-      align: "center",
+      hozAlign: "center",
       downloadTitle: "Status",
       formatter: status_formatter,
       tooltip: status_tooltip,
@@ -313,13 +298,12 @@ status_formatter = function (cell, formatterParams, onRendered) {
 
   // commented icons would be so nice to have with fontawsome 5.11...
   if (bestellt != null && isNaN(vertrag_betrag)) {
-    return "<i class='fas fa-user-minus'></i>"; // kein Vertrag
+    return "<i class='fa fa-user-minus'></i>"; // kein Vertrag
   } else if (
     (bestellt != null && betrag != vertrag_betrag) ||
     (bestellt != null && stunden != vertrag_stunden)
   ) {
-    return ICON_LEHRAUFTRAG_CHANGED; // geaendert
-    // return "<i class='fas fa-user-edit'></i>";
+    return "<i class='fa fa-user-pen'></i>";
   } else if (
     bestellt == null &&
     erteilt == null &&
@@ -328,16 +312,13 @@ status_formatter = function (cell, formatterParams, onRendered) {
   ) {
     return "<i class='fa fa-user-plus'></i>"; // neu
   } else if (bestellt != null && erteilt == null && akzeptiert == null) {
-    return ICON_LEHRAUFTRAG_ORDERED; // bestellt
-    // return "<i class='fa fa-user-tag'></i>";
+    return "<i class='fa fa-user-tag'></i>";
   } else if (bestellt != null && erteilt != null && akzeptiert == null) {
-    return ICON_LEHRAUFTRAG_APPROVED; // erteilt
-    // return "<i class='fas fa-user-check'></i>";
+    return "<i class='fa fa-user-check'></i>";
   } else if (bestellt != null && erteilt != null && akzeptiert != null) {
-    return "<i class='fa fa-handshake-o'></i>"; // akzeptiert
-    // return "<i class='fas fa-user-graduate'></i>";
+    return "<i class='fa-regular fa-handshake'></i>"; // akzeptiert  
   } else if (is_storniert) {
-    return ICON_LEHRAUFTRAG_CANCELLED; // storniert
+    return "<i class='fa-solid fa-user-xmark'></i>"; // storniert
   } else {
     return "<i class='fa fa-user'></i>"; // default
   }
@@ -548,21 +529,6 @@ $(function () {
     ]);
   });
 
-  // Set png-icons into filter-buttons
-  $(".btn-lehrauftrag").each(function () {
-    switch (this.id) {
-      case "show-ordered":
-        this.innerHTML = ICON_LEHRAUFTRAG_ORDERED;
-        break;
-      case "show-approved":
-        this.innerHTML = ICON_LEHRAUFTRAG_APPROVED;
-        break;
-      case "show-cancelled":
-        this.innerHTML = ICON_LEHRAUFTRAG_CANCELLED;
-        break;
-    }
-  });
-
   // De/activate and un/focus on clicked button
   $(".btn-lehrauftrag").click(function () {
     // De/activate and un/focus on clicked button
diff --git a/public/js/lehre/lehrauftrag/approveLehrauftrag.js b/public/js/lehre/lehrauftrag/approveLehrauftrag.js
index 9cb979c62..3d8993fc3 100644
--- a/public/js/lehre/lehrauftrag/approveLehrauftrag.js
+++ b/public/js/lehre/lehrauftrag/approveLehrauftrag.js
@@ -8,19 +8,6 @@
 // Global vars
 // -----------------------------------------------------------------------------------------------------------------
 
-const COLOR_LIGHTGREY = "#f5f5f5";
-
-/**
- * PNG icons used in status- and filter buttons
- * Setting png icons is a workaround to use font-awsome 5.9.0 icons until system can be updated to newer font awsome version.
- * */
-const ICON_LEHRAUFTRAG_ORDERED =
-  '<img src="../../../public/images/icons/fa-user-tag.png" style="height: 30px; width: 30px; margin: -6px;">';
-const ICON_LEHRAUFTRAG_APPROVED =
-  '<img src="../../../public/images/icons/fa-user-check.png" style="height: 30px; width: 30px; margin: -6px;">';
-const ICON_LEHRAUFTRAG_CHANGED =
-  '<img src="../../../public/images/icons/fa-user-edit.png" style="height: 30px; width: 30px; margin: -6px;">';
-
 // Fields that should not be provided in the column picker
 var tableWidgetBlacklistArray_columnUnselectable = [
   "status",
@@ -179,8 +166,6 @@ function func_rowFormatter(row) {
       cell.getElement().classList.add("bg-success"); // akzeptiert
     }
 
-    // default color is already set in the Tabulator5.css file that gets loaded the Header flag tabulator5
-    // row.getElement().style["background-color"] = COLOR_LIGHTGREY;   // default
   });
 }
 
@@ -227,10 +212,10 @@ function func_tableBuilt(table) {
   table.tabulator(
     "addColumn",
     {
-      title: "<i class='fa fa-user-o'></i>",
+      title: "<i class='fa fa-user'></i>",
       field: "status",
       width: 40,
-      align: "center",
+      hozAlign: "center",
       downloadTitle: "Status",
       formatter: status_formatter,
       tooltip: status_tooltip,
@@ -368,19 +353,15 @@ status_formatter = function (cell, formatterParams, onRendered) {
     (bestellt != null && stunden != vertrag_stunden)
   ) {
     // geaendert ((if betrag is 0 or null)
-    return ICON_LEHRAUFTRAG_CHANGED; // geaendert
-    // return "<i class='fas fa-user-edit'></i>";
+    return "<i class='fas fa-user-pen'></i>";
   } else if (bestellt == null && erteilt == null && akzeptiert == null) {
     return "<i class='fa fa-user-plus'></i>"; // neu
   } else if (bestellt != null && erteilt == null && akzeptiert == null) {
-    return ICON_LEHRAUFTRAG_ORDERED; // bestellt
-    // return "<i class='fa fa-user-tag'></i>";
+    return "<i class='fa fa-user-tag'></i>";
   } else if (bestellt != null && erteilt != null && akzeptiert == null) {
-    return ICON_LEHRAUFTRAG_APPROVED; // erteilt
-    // return "<i class='fas fa-user-check'></i>";
+    return "<i class='fa fa-user-check'></i>";
   } else if (bestellt != null && erteilt != null && akzeptiert != null) {
-    return "<i class='fa fa-handshake-o'></i>"; // akzeptiert
-    // return "<i class='fas fa-user-graduate'></i>";
+    return "<i class='fa-regular fa-handshake'></i>"; // akzeptiert
   } else {
     return "<i class='fa fa-user'></i>"; // default
   }
@@ -576,21 +557,6 @@ $(function () {
     ]);
   });
 
-  // Set png-icons into filter-buttons
-  $(".btn-lehrauftrag").each(function () {
-    switch (this.id) {
-      case "show-ordered":
-        this.innerHTML = ICON_LEHRAUFTRAG_ORDERED;
-        break;
-      case "show-approved":
-        this.innerHTML = ICON_LEHRAUFTRAG_APPROVED;
-        break;
-      case "show-changed":
-        this.innerHTML = ICON_LEHRAUFTRAG_CHANGED;
-        break;
-    }
-  });
-
   // De/activate and un/focus on clicked button, En-/Disable 'Lehrauftrag erteilen'
   $(".btn-lehrauftrag").click(function () {
     // De/activate and un/focus on clicked button
diff --git a/public/js/lehre/lehrauftrag/orderLehrauftrag.js b/public/js/lehre/lehrauftrag/orderLehrauftrag.js
index 23acacd37..3356972f0 100644
--- a/public/js/lehre/lehrauftrag/orderLehrauftrag.js
+++ b/public/js/lehre/lehrauftrag/orderLehrauftrag.js
@@ -8,19 +8,6 @@
 // Global vars
 // -----------------------------------------------------------------------------------------------------------------
 
-const COLOR_LIGHTGREY = "#f5f5f5";
-
-/**
- * PNG icons used in status- and filter buttons
- * Setting png icons is a workaround to use font-awsome 5.9.0 icons until system can be updated to newer font awsome version.
- * */
-const ICON_LEHRAUFTRAG_ORDERED =
-  '<img src="../../../public/images/icons/fa-user-tag.png" style="height: 30px; width: 30px; margin: -6px;">';
-const ICON_LEHRAUFTRAG_APPROVED =
-  '<img src="../../../public/images/icons/fa-user-check.png" style="height: 30px; width: 30px; margin: -6px;">';
-const ICON_LEHRAUFTRAG_CHANGED =
-  '<img src="../../../public/images/icons/fa-user-edit.png" style="height: 30px; width: 30px; margin: -6px;">';
-
 // Fields that should not be provided in the column picker
 var tableWidgetBlacklistArray_columnUnselectable = [
   "status",
@@ -192,8 +179,6 @@ function func_rowFormatter(row) {
   row.getCells().forEach(function (cell) {
     if (is_dummy) {
       cell.getElement().classList.add("bg-info"); // dummy lectors
-    } else if ((!is_mitarbeiter || !has_stunden) && akzeptiert == null) {
-      row.getElement().style["background-color"] = COLOR_LIGHTGREY;
     } else if (
       (bestellt != null && betrag != vertrag_betrag) ||
       (bestellt != null &&
@@ -256,10 +241,10 @@ function func_tableBuilt(table) {
   table.tabulator(
     "addColumn",
     {
-      title: "<i class='fa fa-user-o'></i>",
+      title: "<i class='fa fa-user'></i>",
       field: "status",
       width: 40,
-      align: "center",
+      hozAlign: "center",
       downloadTitle: "Status",
       formatter: status_formatter,
       tooltip: status_tooltip,
@@ -406,18 +391,15 @@ status_formatter = function (cell, formatterParams, onRendered) {
     (bestellt != null && stunden != vertrag_stunden)
   ) {
     // geaendert ((if betrag is 0 or null)
-    return ICON_LEHRAUFTRAG_CHANGED; // geaendert
-    // return "<i class='fas fa-user-edit'></i>";
+    return "<i class='fa fa-user-pen'></i>";
   } else if (bestellt == null && erteilt == null && akzeptiert == null) {
     return "<i class='fa fa-user-plus'></i>"; // neu
   } else if (bestellt != null && erteilt == null && akzeptiert == null) {
-    return ICON_LEHRAUFTRAG_ORDERED; // bestellt
-    // return "<i class='fa fa-user-tag'></i>";
+    return "<i class='fa fa-user-tag'></i>";
   } else if (bestellt != null && erteilt != null && akzeptiert == null) {
-    return ICON_LEHRAUFTRAG_APPROVED; // erteilt
-    // return "<i class='fas fa-user-check'></i>";
+    return "<i class='fa fa-user-check'></i>";
   } else if (bestellt != null && erteilt != null && akzeptiert != null) {
-    return "<i class='fa fa-handshake-o'></i>"; // akzeptiert
+    return "<i class='fa-regular fa-handshake'></i>"; // akzeptiert
   } else {
     return "<i class='fa fa-user'></i>"; // default
   }
@@ -654,21 +636,6 @@ $(function () {
     ]);
   });
 
-  // Set png-icons into filter-buttons
-  $(".btn-lehrauftrag").each(function () {
-    switch (this.id) {
-      case "show-ordered":
-        this.innerHTML = ICON_LEHRAUFTRAG_ORDERED;
-        break;
-      case "show-approved":
-        this.innerHTML = ICON_LEHRAUFTRAG_APPROVED;
-        break;
-      case "show-changed":
-        this.innerHTML = ICON_LEHRAUFTRAG_CHANGED;
-        break;
-    }
-  });
-
   // De/activate and un/focus on clicked button, En-/Disable 'Lehrauftrag bestellen'
   $(".btn-lehrauftrag").click(function () {
     // De/activate and un/focus on clicked button

From b0d31361c11a10808029322ccd41c94de68d9f94 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 29 Apr 2024 11:38:03 +0200
Subject: [PATCH 0659/1461] updates fontawesome version

---
 application/views/lehre/lehrauftrag/acceptLehrauftrag.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/lehre/lehrauftrag/acceptLehrauftrag.php b/application/views/lehre/lehrauftrag/acceptLehrauftrag.php
index e0e67b44a..65ecd9ff6 100644
--- a/application/views/lehre/lehrauftrag/acceptLehrauftrag.php
+++ b/application/views/lehre/lehrauftrag/acceptLehrauftrag.php
@@ -7,7 +7,7 @@ $this->load->view(
 		'jqueryui1' => true,
 		'jquerycheckboxes1' => true,
 		'bootstrap5' => true,
-		'fontawesome4' => true,
+		'fontawesome6' => true,
 		'sbadmintemplate' => false,
 		'tabulator5' => true,
         'tabulator5JQuery' => true,

From 7bb98479dd594f7fc41cfb882a9505634ed9ca61 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 29 Apr 2024 11:40:46 +0200
Subject: [PATCH 0660/1461] API konsolidierung StV Config

---
 .../frontend/v1}/stv/Config.php               | 41 ++++++++++++++-----
 public/js/api/fhcapifactory.js                |  4 +-
 public/js/api/stv.js                          |  8 +++-
 public/js/apps/Studentenverwaltung.js         |  2 -
 .../Stv/Studentenverwaltung/Details.js        |  4 +-
 5 files changed, 42 insertions(+), 17 deletions(-)
 rename application/controllers/{components => api/frontend/v1}/stv/Config.php (81%)

diff --git a/application/controllers/components/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
similarity index 81%
rename from application/controllers/components/stv/Config.php
rename to application/controllers/api/frontend/v1/stv/Config.php
index 1f3d9bb72..9aaf49651 100644
--- a/application/controllers/components/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -1,21 +1,44 @@
 <?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');
+if (!defined('BASEPATH')) exit('No direct script access allowed');
 
 use CI3_Events as Events;
 
-class Config extends FHC_Controller
+/**
+ * This controller operates between (interface) the JS (GUI) and the back-end
+ * Provides data to the ajax get calls about the StV 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()
 	{
 		// TODO(chris): access!
-		parent::__construct();
+		parent::__construct([
+			'student' => self::PERM_LOGGED,
+			'students' => self::PERM_LOGGED
+		]);
 
-		$this->load->library('AuthLib');
-		$this->load->library('PermissionLib');
 
+		// Load Phrases
 		$this->loadPhrases([
 			'global',
 			'person',
@@ -48,10 +71,6 @@ class Config extends FHC_Controller
 			'title' => 'Status',
 			'component' => './Stv/Studentenverwaltung/Details/MultiStatus.js'
 		];
-		$result['konto'] = [
-			'title' => 'Konto',
-			'component' =>  './Stv/Studentenverwaltung/Details/Konto.js'
-		];
 		$result['banking'] = [
 			'title' => $this->p->t('stv', 'tab_banking'),
 			'component' => './Stv/Studentenverwaltung/Details/Konto.js',
@@ -77,7 +96,7 @@ class Config extends FHC_Controller
 			return $result;
 		});
 
-		$this->outputJsonSuccess($result);
+		$this->terminateWithSuccess($result);
 	}
 
 	public function students()
@@ -111,7 +130,7 @@ class Config extends FHC_Controller
 			return $result;
 		});
 
-		$this->outputJsonSuccess($result);
+		$this->terminateWithSuccess($result);
 	}
 
 	protected function kontoColumns()
diff --git a/public/js/api/fhcapifactory.js b/public/js/api/fhcapifactory.js
index 41c89ef50..2932efd83 100644
--- a/public/js/api/fhcapifactory.js
+++ b/public/js/api/fhcapifactory.js
@@ -20,11 +20,13 @@ import phrasen from "./phrasen.js";
 import navigation from "./navigation.js";
 import filter from "./filter.js";
 import studstatus from "./studstatus.js";
+import stv from "./stv.js";
 
 export default {
     search,
     phrasen,
     navigation,
     filter,
-    studstatus
+    studstatus,
+    stv
 };
diff --git a/public/js/api/stv.js b/public/js/api/stv.js
index ab3e918a1..3f16b0847 100644
--- a/public/js/api/stv.js
+++ b/public/js/api/stv.js
@@ -3,5 +3,11 @@ import konto from './stv/konto.js';
 
 export default {
 	filter,
-	konto
+	konto,
+	configStudent() {
+		return this.$fhcApi.get('api/frontend/v1/stv/config/student');
+	},
+	configStudents() {
+		return this.$fhcApi.get('api/frontend/v1/stv/config/students');
+	}
 };
\ No newline at end of file
diff --git a/public/js/apps/Studentenverwaltung.js b/public/js/apps/Studentenverwaltung.js
index a282a45e3..9b24008e3 100644
--- a/public/js/apps/Studentenverwaltung.js
+++ b/public/js/apps/Studentenverwaltung.js
@@ -18,7 +18,6 @@
 import FhcStudentenverwaltung from "../components/Stv/Studentenverwaltung.js";
 import fhcapifactory from "./api/fhcapifactory.js";
 
-import FhcApi from "../plugin/FhcApi.js";
 import Phrasen from "../plugin/Phrasen.js";
 
 //import PrimeVue form "../../../../index.ci.php/public/js/components/primevue/config/config.esm.min.js");
@@ -48,7 +47,6 @@ import(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_route
 				overlay: 1100
 			}
 		})
-		.use(FhcApi)
 		.use(Phrasen)
 		.mount('#main');
 });
diff --git a/public/js/components/Stv/Studentenverwaltung/Details.js b/public/js/components/Stv/Studentenverwaltung/Details.js
index c34cf2684..9b888093f 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details.js
@@ -33,8 +33,8 @@ export default {
 					<h2 class="h4">{{students[0].titlepre}} {{students[0].vorname}} {{students[0].nachname}} {{students[0].titlepost}}</h2>
 				</div>
 			</div>
-			<fhc-tabs v-if="students.length == 1" ref="tabs" :modelValue="students[0]" config="/components/stv/config/student" :default="$route.params.tab" style="flex: 1 1 0%; height: 0%" @changed="reload"></fhc-tabs>
-			<fhc-tabs v-else ref="tabs" :modelValue="students" config="/components/stv/config/students" :default="$route.params.tab" style="flex: 1 1 0%; height: 0%" @changed="reload"></fhc-tabs>
+			<fhc-tabs v-if="students.length == 1" ref="tabs" :modelValue="students[0]" :config="$fhcApi.factory.stv.configStudent()" :default="$route.params.tab" style="flex: 1 1 0%; height: 0%" @changed="reload"></fhc-tabs>
+			<fhc-tabs v-else ref="tabs" :modelValue="students" :config="$fhcApi.factory.stv.configStudents()" :default="$route.params.tab" style="flex: 1 1 0%; height: 0%" @changed="reload"></fhc-tabs>
 		</div>
 	</div>`
 };
\ No newline at end of file

From 555db0d5af8380c3d8dd0ec66b9a89aab763ad21 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 29 Apr 2024 11:45:08 +0200
Subject: [PATCH 0661/1461] fixes the selection of the tableUniqueID

---
 public/js/lehre/lehrauftrag/acceptLehrauftrag.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/lehre/lehrauftrag/acceptLehrauftrag.js b/public/js/lehre/lehrauftrag/acceptLehrauftrag.js
index 7b803ef90..e259fdee2 100644
--- a/public/js/lehre/lehrauftrag/acceptLehrauftrag.js
+++ b/public/js/lehre/lehrauftrag/acceptLehrauftrag.js
@@ -455,9 +455,9 @@ $(function () {
     func_tableBuilt(tabulatorInstance);
 
     // using the tabulator instance instead of the jquery object because the site loads two different tabulator tables
-    console.log("instance",tabulatorInstance)
+   
     let uniqueTableID =
-      tabulatorInstance.element.parentElement.parentElement.parentElement.attributes
+      tabulatorInstance.element.parentElement.parentElement.attributes
         .tableUniqueId.value;
         
     switch (uniqueTableID) {

From 0536deda1acfcd0f60cf0b57fee0d0073de0c2db Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 29 Apr 2024 14:47:44 +0200
Subject: [PATCH 0662/1461] StV: static primevue

---
 application/views/Studentenverwaltung.php |  2 +-
 public/js/apps/Studentenverwaltung.js     | 49 ++++++++++-------------
 2 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/application/views/Studentenverwaltung.php b/application/views/Studentenverwaltung.php
index 54354578e..8993053b3 100644
--- a/application/views/Studentenverwaltung.php
+++ b/application/views/Studentenverwaltung.php
@@ -5,7 +5,7 @@
 		'bootstrap5' => true,
 		'fontawesome6' => true,
 		'vue3' => true,
-		#'primevue3' => true,
+		'primevue3' => true,
 		#'filtercomponent' => true,
 		'tabulator5' => true,
 		'tinymce5' => true,
diff --git a/public/js/apps/Studentenverwaltung.js b/public/js/apps/Studentenverwaltung.js
index 9b24008e3..0d9ea90f5 100644
--- a/public/js/apps/Studentenverwaltung.js
+++ b/public/js/apps/Studentenverwaltung.js
@@ -20,33 +20,28 @@ import fhcapifactory from "./api/fhcapifactory.js";
 
 import Phrasen from "../plugin/Phrasen.js";
 
-//import PrimeVue form "../../../../index.ci.php/public/js/components/primevue/config/config.esm.min.js");
-//const PrimeVue = await import(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + "/public/js/components/primevue/config/config.esm.min.js").default;
-import(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + "/public/js/components/primevue/config/config.esm.min.js").then(result => result.default).then(PrimeVue => {
-	Vue.$fhcapi = fhcapifactory;
 
-	const ciPath = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*?\/)/g, '') + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
+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}/studentenverwaltung`, component: FhcStudentenverwaltung },
-			{ path: `/${ciPath}/studentenverwaltung/prestudent/:prestudent_id`, component: FhcStudentenverwaltung },
-			{ path: `/${ciPath}/studentenverwaltung/prestudent/:prestudent_id/:tab`, component: FhcStudentenverwaltung },
-			{ path: `/${ciPath}/studentenverwaltung/student/:id`, component: FhcStudentenverwaltung },
-			{ path: `/${ciPath}/studentenverwaltung/person/:person_id`, component: FhcStudentenverwaltung }
-		]
-	});
-
-	const app = Vue.createApp();
-
-	app
-		.use(router)
-		.use(PrimeVue, {
-			zIndex: {
-				overlay: 1100
-			}
-		})
-		.use(Phrasen)
-		.mount('#main');
+const router = VueRouter.createRouter({
+	history: VueRouter.createWebHistory(),
+	routes: [
+		{ path: `/${ciPath}/studentenverwaltung`, component: FhcStudentenverwaltung },
+		{ path: `/${ciPath}/studentenverwaltung/prestudent/:prestudent_id`, component: FhcStudentenverwaltung },
+		{ path: `/${ciPath}/studentenverwaltung/prestudent/:prestudent_id/:tab`, component: FhcStudentenverwaltung },
+		{ path: `/${ciPath}/studentenverwaltung/student/:id`, component: FhcStudentenverwaltung },
+		{ path: `/${ciPath}/studentenverwaltung/person/:person_id`, component: FhcStudentenverwaltung }
+	]
 });
+
+const app = Vue.createApp();
+
+app
+	.use(router)
+	.use(primevue.config.default, {
+		zIndex: {
+			overlay: 1100
+		}
+	})
+	.use(Phrasen)
+	.mount('#main');

From c2ffd0290734c698df9e85de4a857e559f447d0a Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 29 Apr 2024 15:00:38 +0200
Subject: [PATCH 0663/1461] Consolidate FHCApi childs

---
 .../api/frontend/v1/stv/Config.php            |  2 +-
 .../api/frontend/v1/stv/Filter.php            | 14 +---
 .../controllers/api/frontend/v1/stv/Konto.php | 34 +++-----
 .../controllers/api/frontend/v1/stv/Lists.php | 15 +---
 .../api/frontend/v1/stv/Student.php           | 78 ++++++-------------
 public/js/apps/Studentenverwaltung.js         |  2 +-
 6 files changed, 42 insertions(+), 103 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index 9aaf49651..d97c1a86b 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -31,7 +31,7 @@ class Config extends FHCAPI_Controller
 
 	public function __construct()
 	{
-		// TODO(chris): access!
+		// TODO(chris): permissions
 		parent::__construct([
 			'student' => self::PERM_LOGGED,
 			'students' => self::PERM_LOGGED
diff --git a/application/controllers/api/frontend/v1/stv/Filter.php b/application/controllers/api/frontend/v1/stv/Filter.php
index d5ee44d13..dbf70e4fb 100644
--- a/application/controllers/api/frontend/v1/stv/Filter.php
+++ b/application/controllers/api/frontend/v1/stv/Filter.php
@@ -31,10 +31,9 @@ class Filter extends FHCAPI_Controller
 	 */
 	public function __construct()
 	{
-		// TODO(chris): permissions
 		parent::__construct([
-			'getStg' => 'student/stammdaten:r',#self::PERM_LOGGED,
-			'setStg' => 'student/stammdaten:r'#self::PERM_LOGGED
+			'getStg' => self::PERM_LOGGED,
+			'setStg' => self::PERM_LOGGED
 		]);
 
 		// Load models
@@ -53,10 +52,7 @@ class Filter extends FHCAPI_Controller
 	{
 		$result = $this->VariableModel->getVariables(getAuthUID(), ['kontofilterstg']);
 
-		#$data = $this->getDataOrTerminateWithError($result);
-		if (isError($result))
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		$data = $result->retval;
+		$data = $this->getDataOrTerminateWithError($result);
 
 		$this->terminateWithSuccess($data['kontofilterstg'] == 'true');
 	}
@@ -81,9 +77,7 @@ class Filter extends FHCAPI_Controller
 
 		$result = $this->VariableModel->setVariable(getAuthUID(), 'kontofilterstg', $studiengang_kz ? 'true' : 'false');
 
-		#$this->getDataOrTerminateWithError($result);
-		if (isError($result))
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		$this->getDataOrTerminateWithError($result);
 
 		$this->terminateWithSuccess(true);
 	}
diff --git a/application/controllers/api/frontend/v1/stv/Konto.php b/application/controllers/api/frontend/v1/stv/Konto.php
index 4606f5abc..a4344889c 100644
--- a/application/controllers/api/frontend/v1/stv/Konto.php
+++ b/application/controllers/api/frontend/v1/stv/Konto.php
@@ -33,10 +33,9 @@ class Konto extends FHCAPI_Controller
 	 */
 	public function __construct()
 	{
-		// TODO(chris): permissions
 		parent::__construct([
 			'get' => 'student/stammdaten:r',
-			'getBuchungstypen' => 'student/stammdaten:r', // alle?
+			'getBuchungstypen' => self::PERM_LOGGED,
 			'checkDoubles' => ['admin:r', 'assistenz:r'],
 			'insert' => ['admin:w', 'assistenz:w'],
 			'counter' => ['admin:w', 'assistenz:w'],
@@ -82,10 +81,7 @@ class Konto extends FHCAPI_Controller
 			$result = $this->KontoModel->getAlleBuchungen($person_id, $studiengang_kz);
 		}
 
-		#$result = $this->getDataOrTerminateWithError($result);
-		if (isError($result))
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		$result = $result->retval;
+		$result = $this->getDataOrTerminateWithError($result);
 
 		// sort into tree
 		$childs = [];
@@ -122,10 +118,7 @@ class Konto extends FHCAPI_Controller
 
 		$result = $this->BuchungstypModel->load();
 
-		#$data = $this->getDataOrTerminateWithError($result);
-		if (isError($result))
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		$data = $result->retval;
+		$data = $this->getDataOrTerminateWithError($result);
 
 		$this->terminateWithSuccess($data);
 	}
@@ -163,10 +156,7 @@ class Konto extends FHCAPI_Controller
 
 		$result = $this->KontoModel->checkDoubleBuchung($person_ids, $this->input->post('studiensemester_kurzbz'), $buchungstypen[$buchung]);
 
-		#$result = $this->getDataOrTerminateWithError($result);
-		if (isError($result))
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		$result = $result->retval;
+		$result = $this->getDataOrTerminateWithError($result);
 
 		if (!$result)
 			$this->terminateWithSuccess(false);
@@ -441,9 +431,7 @@ class Konto extends FHCAPI_Controller
 
 		$result = $this->KontoModel->update($id, $data);
 
-		#$this->getDataOrTerminateWithError($result);
-		if (isError($result))
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		$this->getDataOrTerminateWithError($result);
 
 		$result = null;
 		// TODO(chris): get as tree?
@@ -475,15 +463,13 @@ class Konto extends FHCAPI_Controller
 		$buchungsnr = $this->input->post('buchungsnr');
 
 		$result = $this->KontoModel->load($buchungsnr);
-		#$result = $this->getDataOrTerminateWithError($result);
-		if (isError($result))
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		$result = $result->retval;
+
+		$result = $this->getDataOrTerminateWithError($result);
 
 		if (!$result)
 			$this->terminateWithError($this->p->t('konto', 'error_missing', [
 				'buchungsnr' => $buchungsnr
-			]), self::ERROR_TYPE_GENERAL);
+			]));
 
 		$_POST['studiengang_kz'] = current($result)->studiengang_kz;
 
@@ -500,8 +486,8 @@ class Konto extends FHCAPI_Controller
 		$result = $this->KontoModel->delete($buchungsnr);
 		if (isError($result)) {
 			if (getCode($result) != 42)
-				$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			$this->terminateWithError($this->p->t('konto', 'error_delete_level'), self::ERROR_TYPE_GENERAL);
+				$this->terminateWithError(getError($result));
+			$this->terminateWithError($this->p->t('konto', 'error_delete_level'));
 		}
 
 		$this->terminateWithSuccess();
diff --git a/application/controllers/api/frontend/v1/stv/Lists.php b/application/controllers/api/frontend/v1/stv/Lists.php
index 2a8335b7e..9b0c705d1 100644
--- a/application/controllers/api/frontend/v1/stv/Lists.php
+++ b/application/controllers/api/frontend/v1/stv/Lists.php
@@ -27,10 +27,9 @@ class Lists extends FHCAPI_Controller
 {
 	public function __construct()
 	{
-		// TODO(chris): permissions
 		parent::__construct([
-			'getStudiensemester' => ['admin:r', 'assistenz:r', 'student/stammdaten:r'], // alle?
-			'getStgs' => ['admin:r', 'assistenz:r', 'student/stammdaten:r'] // alle?
+			'getStudiensemester' => self::PERM_LOGGED,
+			'getStgs' => self::PERM_LOGGED
 		]);
 	}
 
@@ -42,10 +41,7 @@ class Lists extends FHCAPI_Controller
 
 		$result = $this->StudiensemesterModel->load();
 
-		#$data = $this->getDataOrTerminateWithError($result);
-		if (isError($result))
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		$data = $result->retval;
+		$data = $this->getDataOrTerminateWithError($result);
 
 		$this->terminateWithSuccess($data);
 	}
@@ -62,10 +58,7 @@ class Lists extends FHCAPI_Controller
 
 		$result = $this->StudiengangModel->load();
 
-		#$data = $this->getDataOrTerminateWithError($result);
-		if (isError($result))
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		$data = $result->retval;
+		$data = $this->getDataOrTerminateWithError($result);
 
 		$this->terminateWithSuccess($data);
 	}
diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php
index 101d34863..31fc7075c 100644
--- a/application/controllers/api/frontend/v1/stv/Student.php
+++ b/application/controllers/api/frontend/v1/stv/Student.php
@@ -100,10 +100,7 @@ class Student extends FHCAPI_Controller
 
 		$result = $this->PrestudentModel->loadWhere(['prestudent_id' => $prestudent_id]);
 		
-		#$student = $this->getDataOrTerminateWithError($result);
-		if (isError($result))
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		$student = $result->retval;
+		$student = $this->getDataOrTerminateWithError($result);
 		
 		if (!$student)
 			return show_404();
@@ -136,10 +133,7 @@ class Student extends FHCAPI_Controller
 		
 		$result = $this->udflib->getCiValidations($this->PersonModel, $this->input->post());
 
-		#$fieldValidations = $this->getDataOrTerminateWithError($result);
-		if (isError($result))
-			$this->terminateWithError(getError($result));
-		$fieldvalidations = $result->retval;
+		$fieldValidations = $this->getDataOrTerminateWithError($result);
 
 		$this->form_validation->set_rules($fieldvalidations);
 
@@ -148,19 +142,13 @@ class Student extends FHCAPI_Controller
 
 		$result = $this->StudentModel->loadWhere(['prestudent_id' => $prestudent_id]);
 		
-		#$student = $this->getDataOrTerminateWithError($result);
-		if (isError($result))
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		$student = $result->retval;
+		$student = $this->getDataOrTerminateWithError($result);
 
 		$uid = $student ? current($student)->student_uid : null;
 
 		$result = $this->PrestudentModel->loadWhere(['prestudent_id' => $prestudent_id]);
 
-		#$person = $this->getDataOrTerminateWithError($result);
-		if (isError($result))
-			$this->terminateWithError(getError($result));
-		$person = $result->retval;
+		$person = $this->getDataOrTerminateWithError($result);
 
 		$person_id = $person ? current($person)->person_id : null;
 
@@ -201,10 +189,7 @@ class Student extends FHCAPI_Controller
 		// add UDFs
 		$result = $this->udflib->getDefinitionForModel($this->PersonModel);
 
-		#$definitions = $this->getDataOrTerminateWithError($result);
-		if (isError($result))
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		$definitions = $result->retval;
+		$definitions = $this->getDataOrTerminateWithError($result);
 
 		foreach ($definitions as $def)
 			$array_allowed_props_person[] = $def['name'];
@@ -242,9 +227,7 @@ class Student extends FHCAPI_Controller
 				'studiensemester_kurzbz' => $studiensemester_kurzbz,
 				'student_uid' => $uid
 			], $update_lehrverband);
-			#$this->getDataOrTerminateWithError($result);
-			if (isError($result))
-				$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			$this->getDataOrTerminateWithError($result);
 		}
 
 		if (count($update_person)) {
@@ -252,9 +235,7 @@ class Student extends FHCAPI_Controller
 				$person_id,
 				$update_person
 			);
-			#$this->getDataOrTerminateWithError($result);
-			if (isError($result))
-				$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			$this->getDataOrTerminateWithError($result);
 		}
 
 
@@ -263,9 +244,7 @@ class Student extends FHCAPI_Controller
 				[$uid],
 				$update_student
 			);
-			#$this->getDataOrTerminateWithError($result);
-			if (isError($result))
-				$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			$this->getDataOrTerminateWithError($result);
 		}
 
 		$this->terminateWithSuccess(array_fill_keys(array_merge(
@@ -308,10 +287,7 @@ class Student extends FHCAPI_Controller
 
 		$result = $this->PersonModel->load();
 
-		#$data = $this->getDataOrTerminateWithError($result);
-		if (isError($result))
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		$data = $result->retval;
+		$data = $this->getDataOrTerminateWithError($result);
 
 		$this->terminateWithSuccess($data);
 	}
@@ -413,9 +389,7 @@ class Student extends FHCAPI_Controller
 				$data['staatsbuergerschaft'] = $this->input->post('staatsbuergerschaft');
 
 			$result = $this->PersonModel->insert($data);
-			if (isError($result))
-				return $result;
-			$person_id = getData($result);
+			$person_id = $this->getDataOrTerminateWithError($result);
 		}
 
 		// Addresse anlegen
@@ -438,17 +412,15 @@ class Student extends FHCAPI_Controller
 				$result = $this->AdresseModel->loadWhere([
 					'person_id' => $person_id
 				]);
-				if (isError($result))
-					return $result;
-				if (hasData($result)) {
-					$address = current(getData($result));
+				$address = $this->getDataOrTerminateWithError($result);
+				if ($address) {
+					$address = current($address);
 
 					$data['updateamum'] = date('c');
 					$data['updatevon'] = getAuthUID();
 
 					$result = $this->AdresseModel->update($address->adresse_id, $data);
-					if (isError($result))
-						return $result;
+					$this->getDataOrTerminateWithError($result);
 				} else {
 					//Wenn keine Adrese vorhanden ist dann eine neue Anlegen
 					$anlegen = 1;
@@ -463,8 +435,7 @@ class Student extends FHCAPI_Controller
 					$data['heimatadresse'] = !$this->input->post('person_id');
 				
 				$result = $this->AdresseModel->insert($data);
-				if (isError($result))
-					return $result;
+				$this->getDataOrTerminateWithError($result);
 			}
 		}
 		
@@ -488,8 +459,7 @@ class Student extends FHCAPI_Controller
 					'insertvon' => getAuthUID()
 				];
 				$result = $this->KontaktModel->insert($data);
-				if (isError($result))
-					return $result;
+				$this->getDataOrTerminateWithError($result);
 			}
 		}
 
@@ -517,10 +487,9 @@ class Student extends FHCAPI_Controller
 		$result = $this->PrestudentModel->loadWhere([
 			'person_id' => $person_id
 		]);
-		if (isError($result))
-			return $result;
-		if (hasData($result)) {
-			$prestudent = current(getData($result));
+		$prestudent = $this->getDataOrTerminateWithError($result);
+		if ($prestudent) {
+			$prestudent = current($prestudent);
 			if ($prestudent->zgv_code) {
 				$data['zgv_code'] = $prestudent->zgv_code;
 				$data['zgvort'] = $prestudent->zgvort;
@@ -533,9 +502,7 @@ class Student extends FHCAPI_Controller
 		}
 		// Prestudent speichern
 		$result = $this->PrestudentModel->insert($data);
-		if (isError($result))
-			return $result;
-		$prestudent_id = getData($result);
+		$prestudent_id = $this->getDataOrTerminateWithError($result);
 
 		// Prestudent Rolle Anlegen
 		$data = [
@@ -550,8 +517,7 @@ class Student extends FHCAPI_Controller
 			'insertvon' => getAuthUID()
 		];
 		$result = $this->PrestudentstatusModel->insert($data);
-		if (isError($result))
-			return $result;
+		$this->getDataOrTerminateWithError($result);
 
 		if ($incoming) {
 			// TODO(chris): IMPLEMENT!
@@ -569,7 +535,7 @@ class Student extends FHCAPI_Controller
 			return $result;
 		}*/
 
-		return success(true);
+		$this->terminateWithSuccess(true);
 	}
 
 	public function requiredIfNotPersonId($value)
diff --git a/public/js/apps/Studentenverwaltung.js b/public/js/apps/Studentenverwaltung.js
index 0d9ea90f5..fbbee8e1d 100644
--- a/public/js/apps/Studentenverwaltung.js
+++ b/public/js/apps/Studentenverwaltung.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2022 fhcomplete.org
+ * 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

From 20a2e369c59d624aa6b93ac4dcc70dee54709fb6 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 29 Apr 2024 15:53:56 +0200
Subject: [PATCH 0664/1461] adds new button to show all new and changed
 lehrauftraege in the orderLehrauftrag view, so that the user can set the
 initial filter himself

---
 .../lehre/lehrauftrag/orderLehrauftrag.php    | 11 +++++-----
 .../js/lehre/lehrauftrag/orderLehrauftrag.js  | 17 ++++++++++++++++
 system/phrasesupdate.php                      | 20 +++++++++++++++++++
 3 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/application/views/lehre/lehrauftrag/orderLehrauftrag.php b/application/views/lehre/lehrauftrag/orderLehrauftrag.php
index 12f5c25d0..04f7391ce 100644
--- a/application/views/lehre/lehrauftrag/orderLehrauftrag.php
+++ b/application/views/lehre/lehrauftrag/orderLehrauftrag.php
@@ -187,13 +187,14 @@ $this->load->view(
                 <div class="btn-toolbar" role="toolbar">
                     <div class="btn-group" role="group">
                         <button id="show-all" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'alleAnzeigen'); ?>"><i class='fa fa-users'></i></button>
-                        <button id="show-new" class="btn btn-default btn-lehrauftrag active focus" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurNeueAnzeigen'); ?>"><i class='fa fa-user-plus'></i></button>
-                        <button id="show-ordered" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurBestellteAnzeigen'); ?>"><i class='fa fa-user-tag'></i></button><!-- png img set in javascript -->
-                        <button id="show-approved" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurErteilteAnzeigen'); ?>"><i class='fa fa-user-check'></i></button><!-- png img set in javascript -->
-                        <button id="show-accepted" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurAngenommeneAnzeigen'); ?>"><i class='fa-regular fa-handshake'></i></button>
+                        <button id="show-newAndChanged" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'neuUndGeaenderteAnzeigen'); ?>"><i style="margin-right:10px" class='fa fa-user-plus'></i><i style="margin-right:10px" class="fa fa-ellipsis-vertical"></i>&nbsp;<i class='fa fa-user-pen'></i></button>
                     </div>
                     <div class="btn-group" role="group" style="margin-left: 20px;">
-                        <button id="show-changed" class="btn btn-default btn-lehrauftrag active focus" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurGeaenderteAnzeigen'); ?>"><i class='fa fa-user-edit'></i></button></button><!-- png img set in javascript -->
+                        <button id="show-new" class="btn btn-default btn-lehrauftrag active focus" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurNeueAnzeigen'); ?>"><i class='fa fa-user-plus'></i></button>
+                        <button id="show-ordered" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurBestellteAnzeigen'); ?>"><i class='fa fa-user-tag'></i></button>
+                        <button id="show-approved" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurErteilteAnzeigen'); ?>"><i class='fa fa-user-check'></i></button>
+                        <button id="show-accepted" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurAngenommeneAnzeigen'); ?>"><i class='fa-regular fa-handshake'></i></button>
+                        <button id="show-changed" class="btn btn-default btn-lehrauftrag active focus" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurGeaenderteAnzeigen'); ?>"><i class='fa fa-user-pen'></i></button></button>
                     </div>
                     <div class="btn-group" role="group" style="margin-left: 20px;">
                         <button id="show-dummies" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurDummiesAnzeigen'); ?>"><i class='fa fa-user-secret'></i></button>
diff --git a/public/js/lehre/lehrauftrag/orderLehrauftrag.js b/public/js/lehre/lehrauftrag/orderLehrauftrag.js
index 3356972f0..847a863f8 100644
--- a/public/js/lehre/lehrauftrag/orderLehrauftrag.js
+++ b/public/js/lehre/lehrauftrag/orderLehrauftrag.js
@@ -565,6 +565,23 @@ $(function () {
     $("#tableWidgetTabulator").tabulator("clearFilter");
   });
 
+  // Show all rows
+  $("#show-newAndChanged").click(function () {
+    $("#tableWidgetTabulator").tabulator("setFilter", [
+      [
+        { field: "personalnummer", type: ">", value: 0 }, // not dummy
+        { field: "personalnummer", type: "=", value: null }, // include projektbetreuer
+      ],
+      { field: "mitarbeiter_uid", type: "!=", value: null }, // AND is Mitarbeiter
+      { field: "stunden", type: "!=", value: null }, // AND has Semesterstunden (not null and not 0)
+      { field: "stunden", type: "!=", value: 0 },
+      [
+        { field: "status", type: "=", value: "Neu" }, // AND neu
+        { field: "status", type: "=", value: "Geändert" }, // OR geaendert
+      ],
+    ]);
+  });
+
   // Show only rows with new lehrauftraege (not dummy lectors or external projektbetreuer; stunden not 0 or null)
   $("#show-new").click(function () {
     $("#tableWidgetTabulator").tabulator("setFilter", [
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 5e2145676..9615a06c0 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -5900,6 +5900,26 @@ The invoice will be sent to you again. <u><strong>The amount is only to be trans
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'neuUndGeaenderteAnzeigen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Neue und geänderte anzeigen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Show new and changed',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'ui',

From c8009a8a6cc498d0e4d2590f6a2d946077646f63 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 30 Apr 2024 08:33:39 +0200
Subject: [PATCH 0665/1461] API Konsolodierung: stv lists

---
 .../controllers/api/frontend/v1/stv/Lists.php | 58 ++++++++++++-
 .../controllers/components/stv/Lists.php      | 85 -------------------
 .../js/components/Stv/Studentenverwaltung.js  | 28 +++---
 3 files changed, 69 insertions(+), 102 deletions(-)
 delete mode 100644 application/controllers/components/stv/Lists.php

diff --git a/application/controllers/api/frontend/v1/stv/Lists.php b/application/controllers/api/frontend/v1/stv/Lists.php
index 9b0c705d1..eceaf8c8c 100644
--- a/application/controllers/api/frontend/v1/stv/Lists.php
+++ b/application/controllers/api/frontend/v1/stv/Lists.php
@@ -29,7 +29,11 @@ class Lists extends FHCAPI_Controller
 	{
 		parent::__construct([
 			'getStudiensemester' => self::PERM_LOGGED,
-			'getStgs' => self::PERM_LOGGED
+			'getStgs' => self::PERM_LOGGED,
+			'getSprachen' => self::PERM_LOGGED,
+			'getGeschlechter' => self::PERM_LOGGED,
+			'getAusbildungen' => self::PERM_LOGGED,
+			'getOrgforms' => self::PERM_LOGGED
 		]);
 	}
 
@@ -62,4 +66,56 @@ class Lists extends FHCAPI_Controller
 
 		$this->terminateWithSuccess($data);
 	}
+
+	public function getSprachen()
+	{
+		$this->load->model('system/Sprache_model', 'SpracheModel');
+
+		$this->SpracheModel->addOrder('sprache');
+
+		$result = $this->SpracheModel->load();
+		$data = $this->getDataOrTerminateWithError($result);
+		
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getGeschlechter()
+	{
+		$this->load->model('person/Geschlecht_model', 'GeschlechtModel');
+
+		$this->GeschlechtModel->addOrder('sort');
+		$this->GeschlechtModel->addOrder('geschlecht');
+
+		$this->GeschlechtModel->addSelect('*');
+		$this->GeschlechtModel->addSelect("bezeichnung_mehrsprachig[(SELECT index FROM public.tbl_sprache WHERE sprache=" . $this->GeschlechtModel->escape(DEFAULT_LANGUAGE) . " LIMIT 1)] AS bezeichnung");
+
+		$result = $this->GeschlechtModel->load();
+		$data = $this->getDataOrTerminateWithError($result);
+		
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getAusbildungen()
+	{
+		$this->load->model('codex/Ausbildung_model', 'AusbildungModel');
+
+		$this->AusbildungModel->addOrder('ausbildungcode');
+
+		$result = $this->AusbildungModel->load();
+		$data = $this->getDataOrTerminateWithError($result);
+		
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getOrgforms()
+	{
+		$this->load->model('codex/Orgform_model', 'OrgformModel');
+
+		$this->OrgformModel->addOrder('bezeichnung');
+
+		$result = $this->OrgformModel->loadWhere(['rolle' => true]);
+		$data = $this->getDataOrTerminateWithError($result);
+		
+		$this->terminateWithSuccess($data);
+	}
 }
diff --git a/application/controllers/components/stv/Lists.php b/application/controllers/components/stv/Lists.php
deleted file mode 100644
index 959de7a12..000000000
--- a/application/controllers/components/stv/Lists.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class Lists extends FHC_Controller
-{
-	public function __construct()
-	{
-		// TODO(chris): access!
-		parent::__construct();
-	}
-
-	public function getSprachen()
-	{
-		$this->load->model('system/Sprache_model', 'SpracheModel');
-
-		$this->SpracheModel->addOrder('sprache');
-
-		$result = $this->SpracheModel->load();
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-		}
-		$this->outputJson($result);
-	}
-
-	public function getGeschlechter()
-	{
-		$this->load->model('person/Geschlecht_model', 'GeschlechtModel');
-
-		$this->GeschlechtModel->addOrder('sort');
-		$this->GeschlechtModel->addOrder('geschlecht');
-
-		$this->GeschlechtModel->addSelect('*');
-		$this->GeschlechtModel->addSelect("bezeichnung_mehrsprachig[(SELECT index FROM public.tbl_sprache WHERE sprache=" . $this->GeschlechtModel->escape(DEFAULT_LANGUAGE) . " LIMIT 1)] AS bezeichnung");
-
-		$result = $this->GeschlechtModel->load();
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-		}
-		$this->outputJson($result);
-	}
-
-	public function getAusbildungen()
-	{
-		$this->load->model('codex/Ausbildung_model', 'AusbildungModel');
-
-		$this->AusbildungModel->addOrder('ausbildungcode');
-
-		$result = $this->AusbildungModel->load();
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-		}
-		$this->outputJson($result);
-	}
-
-	public function getStgs()
-	{
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-
-		$this->StudiengangModel->addSelect('*');
-		$this->StudiengangModel->addSelect('UPPER(typ || kurzbz) AS kuerzel');
-
-		$this->StudiengangModel->addOrder('typ');
-		$this->StudiengangModel->addOrder('kurzbz');
-
-		$result = $this->StudiengangModel->loadWhere(['aktiv' => true]);
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-		}
-		$this->outputJson($result);
-	}
-
-	public function getOrgforms()
-	{
-		$this->load->model('codex/Orgform_model', 'OrgformModel');
-
-		$this->OrgformModel->addOrder('bezeichnung');
-
-		$result = $this->OrgformModel->loadWhere(['rolle' => true]);
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-		}
-		$this->outputJson($result);
-	}
-}
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 69fa03dee..05a84499d 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -128,25 +128,22 @@ export default {
 				this.lists.nations = result;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
-		CoreRESTClient
-			.get('components/stv/Lists/getSprachen')
-			.then(result => CoreRESTClient.getData(result.data) || [])
+		this.$fhcApi
+			.get('api/frontend/v1/stv/lists/getSprachen')
 			.then(result => {
-				this.lists.sprachen = result;
+				this.lists.sprachen = result.data;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
-		CoreRESTClient
-			.get('components/stv/Lists/getGeschlechter')
-			.then(result => CoreRESTClient.getData(result.data) || [])
+		this.$fhcApi
+			.get('api/frontend/v1/stv/lists/getGeschlechter')
 			.then(result => {
-				this.lists.geschlechter = result;
+				this.lists.geschlechter = result.data;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
-		CoreRESTClient
-			.get('components/stv/Lists/getAusbildungen')
-			.then(result => CoreRESTClient.getData(result.data) || [])
+		this.$fhcApi
+			.get('api/frontend/v1/stv/lists/getAusbildungen')
 			.then(result => {
-				this.lists.ausbildungen = result;
+				this.lists.ausbildungen = result.data;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 		this.$fhcApi
@@ -156,11 +153,10 @@ export default {
 				this.lists.active_stgs = this.lists.stgs.filter(stg => stg.aktiv);
 			})
 			.catch(this.$fhcAlert.handleSystemError);
-		CoreRESTClient
-			.get('components/stv/Lists/getOrgforms')
-			.then(result => CoreRESTClient.getData(result.data) || [])
+		this.$fhcApi
+			.get('api/frontend/v1/stv/lists/getOrgforms')
 			.then(result => {
-				this.lists.orgforms = result;
+				this.lists.orgforms = result.data;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 		this.$fhcApi

From fe06b2360eef8d2149bf7b536465f3495e56787d Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 30 Apr 2024 08:48:15 +0200
Subject: [PATCH 0666/1461] API Konsolodierung: stv address

---
 .../api/frontend/v1/stv/Address.php           | 66 +++++++++++++++++++
 .../controllers/components/stv/Address.php    | 47 -------------
 .../js/components/Stv/Studentenverwaltung.js  | 14 ++--
 .../Details/Kontakt/Address.js                | 39 +++++------
 4 files changed, 88 insertions(+), 78 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/stv/Address.php
 delete mode 100644 application/controllers/components/stv/Address.php

diff --git a/application/controllers/api/frontend/v1/stv/Address.php b/application/controllers/api/frontend/v1/stv/Address.php
new file mode 100644
index 000000000..7685fcd04
--- /dev/null
+++ b/application/controllers/api/frontend/v1/stv/Address.php
@@ -0,0 +1,66 @@
+<?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');
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the back-end
+ * Provides data to the ajax get calls about addresses
+ * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
+ */
+class Address extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'getNations' => self::PERM_LOGGED,
+			'getPlaces' => self::PERM_LOGGED
+		]);
+	}
+
+	public function getNations()
+	{
+		$this->load->model('codex/Nation_model', 'NationModel');
+
+		$this->NationModel->addOrder('kurztext');
+
+		$result = $this->NationModel->load();
+		$data = $this->getDataOrTerminateWithError($result);
+		
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getPlaces($plz)
+	{
+		$this->load->model('codex/Gemeinde_model', 'GemeindeModel');
+
+		$this->load->library('form_validation');
+		
+		$this->form_validation->set_data(['address.plz' => $plz]);
+
+		$this->form_validation->set_rules('address.plz', 'PLZ', 'numeric|less_than[10000]');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$result = $this->GemeindeModel->getGemeindeByPlz($plz);
+		$data = $this->getDataOrTerminateWithError($result);
+		
+		$this->terminateWithSuccess($data);
+	}
+}
diff --git a/application/controllers/components/stv/Address.php b/application/controllers/components/stv/Address.php
deleted file mode 100644
index c0e34c0c3..000000000
--- a/application/controllers/components/stv/Address.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class Address extends FHC_Controller
-{
-	public function __construct()
-	{
-		// TODO(chris): access!
-		parent::__construct();
-	}
-
-	public function getNations()
-	{
-		$this->load->model('codex/Nation_model', 'NationModel');
-
-		$this->NationModel->addOrder('kurztext');
-
-		$result = $this->NationModel->load();
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-		}
-		$this->outputJson($result);
-	}
-
-	public function getPlaces($plz)
-	{
-		$this->load->model('codex/Gemeinde_model', 'GemeindeModel');
-
-		$this->load->library('form_validation');
-		
-		$this->form_validation->set_data(['address.plz' => $plz]);
-
-		$this->form_validation->set_rules('address.plz', 'PLZ', 'numeric|less_than[10000]');
-
-		if ($this->form_validation->run() == false) {
-			$this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST);
-			return $this->outputJsonError($this->form_validation->error_array());
-		}
-
-		$result = $this->GemeindeModel->getGemeindeByPlz($plz);
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-		}
-		$this->outputJson($result);
-	}
-}
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 05a84499d..2fe6c9713 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -21,7 +21,6 @@ import StvVerband from "./Studentenverwaltung/Verband.js";
 import StvList from "./Studentenverwaltung/List.js";
 import StvDetails from "./Studentenverwaltung/Details.js";
 import StvStudiensemester from "./Studentenverwaltung/Studiensemester.js";
-import {CoreRESTClient} from '../../RESTClient.js';
 
 
 export default {
@@ -107,25 +106,20 @@ export default {
 			this.studiengangKz = studiengang_kz;
 			this.$refs.stvList.updateUrl(link);
 		},
-		searchfunction(searchsettings) {
-			return Vue.$fhcapi.Search.search(searchsettings);  
-		},
 		studiensemesterChanged(v) {
 			this.studiensemesterKurzbz = v;
 			this.$refs.stvList.updateUrl();
 			this.$refs.details.reload();
 		},
 		reloadList() {
-			console.log('reloadList2');
 			this.$refs.stvList.reload();
 		}
 	},
 	created() {
-		CoreRESTClient
-			.get('components/stv/Address/getNations')
-			.then(result => CoreRESTClient.getData(result.data) || [])
+		this.$fhcApi
+			.get('api/frontend/v1/stv/address/getNations')
 			.then(result => {
-				this.lists.nations = result;
+				this.lists.nations = result.data;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 		this.$fhcApi
@@ -187,7 +181,7 @@ export default {
 		<header class="navbar navbar-expand-lg navbar-dark bg-dark flex-md-nowrap p-0 shadow">
 			<a class="navbar-brand col-md-4 col-lg-3 col-xl-2 me-0 px-3" :href="stvRoot">FHC 4.0</a>
 			<button class="navbar-toggler d-md-none m-1 collapsed" type="button" data-bs-toggle="offcanvas" data-bs-target="#sidebarMenu" aria-controls="sidebarMenu" aria-expanded="false" :aria-label="$p.t('ui/toggle_nav')"><span class="navbar-toggler-icon"></span></button>
-			<core-searchbar :searchoptions="searchbaroptions" :searchfunction="searchfunction" class="searchbar w-100"></core-searchbar>
+			<core-searchbar :searchoptions="searchbaroptions" :searchfunction="$fhcApi.factory.search.search" class="searchbar w-100"></core-searchbar>
 		</header>
 		<div class="container-fluid overflow-hidden">
 			<div class="row h-100">
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
index 017f3a056..e2301f7a3 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
@@ -1,5 +1,4 @@
 import {CoreFilterCmpt} from "../../../../filter/Filter.js";
-import {CoreRESTClient} from "../../../../../RESTClient";
 import PvAutoComplete from "../../../../../../../index.ci.php/public/js/components/primevue/autocomplete/autocomplete.esm.min.js";
 import FhcFormValidation from '../../../../Form/Validation.js';
 import BsModal from "../../../../Bootstrap/Modal.js";
@@ -17,7 +16,7 @@ export default{
 	data() {
 		return{
 			tabulatorOptions: {
-				ajaxURL: 'api/frontend/v1/stv/Kontakt/getAdressen/' + this.uid,
+				ajaxURL: 'api/frontend/v1/stv/kontakt/getAdressen/' + this.uid,
 				ajaxRequestFunc: this.$fhcApi.get,
 				ajaxResponse: (url, params, response) => response.data,
 				//autoColumns: true,
@@ -169,21 +168,21 @@ export default{
 		}
 	},
 	watch: {
-		uid(){
+		uid() {
 			this.$refs.table.tabulator.setData('api/frontend/v1/stv/Kontakt/getAdressen/' + this.uid);
 		}
 	},
 	methods:{
-		actionNewAdress(){
+		actionNewAdress() {
 			this.$refs.newAdressModal.show();
 		},
-		actionEditAdress(adress_id){
+		actionEditAdress(adress_id) {
 			this.loadAdress(adress_id).then(() => {
 				if(this.addressData.adresse_id)
 					this.$refs.editAdressModal.show();
 			});
 		},
-		actionDeleteAdress(adress_id){
+		actionDeleteAdress(adress_id) {
 			this.loadAdress(adress_id).then(() => {
 				if(this.addressData.adresse_id)
 					if(this.addressData.heimatadresse)
@@ -205,10 +204,10 @@ export default{
 				this.reload();
 			});
 		},
-		reload(){
+		reload() {
 			this.$refs.table.reloadTable();
 		},
-		loadAdress(adress_id){
+		loadAdress(adress_id) {
 			return this.$fhcApi.get('api/frontend/v1/stv/kontakt/loadAddress/' + adress_id)
 				.then(result => {
 						this.addressData = result.data;
@@ -216,7 +215,7 @@ export default{
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
-		updateAddress(adress_id){
+		updateAddress(adress_id) {
 			this.$fhcApi.post('api/frontend/v1/stv/kontakt/updateAddress/' + adress_id,
 				this.addressData
 			).then(response => {
@@ -229,7 +228,7 @@ export default{
 				this.reload();
 			});
 		},
-		deleteAddress(adress_id){
+		deleteAddress(adress_id) {
 			this.$fhcApi.post('api/frontend/v1/stv/kontakt/deleteAddress/' + adress_id)
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
@@ -247,13 +246,12 @@ export default{
 				return;
 
 			this.abortController.places = new AbortController();
-			CoreRESTClient
-				.get('components/stv/address/getPlaces/' + this.addressData.plz, undefined, {
+			this.$fhcApi
+				.get('api/frontend/v1/stv/address/getPlaces/' + this.addressData.plz, undefined, {
 					signal: this.abortController.places.signal
 				})
-				.then(result => CoreRESTClient.getData(result.data) || [])
 				.then(result => {
-					this.places = result;
+					this.places = result.data;
 				});
 /*				.catch(error => {
 					if (error.code == 'ERR_BAD_REQUEST') {
@@ -271,20 +269,19 @@ export default{
 					this.filteredFirmen = result.data.retval;
 				});
 		},
-		hideModal(modalRef){
+		hideModal(modalRef) {
 			this.$refs[modalRef].hide();
 		},
-		resetModal(){
+		resetModal() {
 			this.addressData = {};
 			this.addressData = this.initData;
 		},
 	},
-	created(){
-		CoreRESTClient
-			.get('components/stv/Address/getNations')
-			.then(result => CoreRESTClient.getData(result.data) || [])
+	created() {
+		this.$fhcApi
+			.get('api/frontend/v1/stv/address/getNations')
 			.then(result => {
-				this.nations = result;
+				this.nations = result.data;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 		this.$fhcApi

From ac0103751daf48a0f15f6866bc50ca5baa736b7d Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 30 Apr 2024 09:48:08 +0200
Subject: [PATCH 0667/1461] adds a border to the tableWidget and also adds a
 function that finds the tableunqiueid using the tableInstance

---
 application/views/widgets/table/table.php     | 10 ++++++----
 .../js/lehre/lehrauftrag/acceptLehrauftrag.js | 20 ++++++++++++++-----
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/application/views/widgets/table/table.php b/application/views/widgets/table/table.php
index 713bcd7dc..9434547e1 100644
--- a/application/views/widgets/table/table.php
+++ b/application/views/widgets/table/table.php
@@ -1,7 +1,7 @@
 <br>
-<div class="row" id="divTableWidgetDataset" tableUniqueId="<?php echo $tableUniqueId; ?>">
-	<div class="col-lg-12">
-
+<div class="row"  id="divTableWidgetDataset" tableUniqueId="<?php echo $tableUniqueId; ?>">
+	<div  class="col-lg-12">
+	
 		<!-- Table widget header -->
 		<div id="tableWidgetHeader"></div>
 
@@ -12,13 +12,15 @@
 		<div id="tableDatasetActionsTop"></div>
 
 		<!-- TableWidget table -->
+		<div style="border:1px solid lightgrey; border-bottom:none; ">
 		<?php TableWidget::loadViewDataset(); ?>
+		</div>
 
 		<!-- Table info bottom -->
 		<div id="tableDatasetActionsBottom"></div>
 
 		<!-- Table widget footer  -->
 		<div id="tableWidgetFooter"></div>
-
+		</div>
 	</div>
 </div>
\ No newline at end of file
diff --git a/public/js/lehre/lehrauftrag/acceptLehrauftrag.js b/public/js/lehre/lehrauftrag/acceptLehrauftrag.js
index e259fdee2..15c39db78 100644
--- a/public/js/lehre/lehrauftrag/acceptLehrauftrag.js
+++ b/public/js/lehre/lehrauftrag/acceptLehrauftrag.js
@@ -445,6 +445,19 @@ storniert_tooltip = function (e, cell, onRendered) {
   }
 };
 
+//recursive function that returns the tableuniqueid using the tableInstance
+const findTableUniqueID = function (tableElement,count =0){
+  if(count >=10){
+      // after 10 iterations end the recursion
+      return null;
+  }
+  if(tableElement.attributes.tableuniqueid){
+     return tableElement.attributes.tableuniqueid.value;
+  }else{
+      findTableUniqueID(tableElement.parentElement, ++count);
+  }
+}
+
 $(function () {
   // Pruefen ob Promise unterstuetzt wird
   // Tabulator funktioniert nicht mit IE
@@ -454,11 +467,7 @@ $(function () {
     //passing the tabulator instance because the acceptLehrauftrag site loads two tabulator tables
     func_tableBuilt(tabulatorInstance);
 
-    // using the tabulator instance instead of the jquery object because the site loads two different tabulator tables
-   
-    let uniqueTableID =
-      tabulatorInstance.element.parentElement.parentElement.attributes
-        .tableUniqueId.value;
+    let uniqueTableID = findTableUniqueID(tabulatorInstance.element);
         
     switch (uniqueTableID) {
       case "cancelledLehrauftrag":
@@ -477,6 +486,7 @@ $(function () {
           func_rowUpdated(row);
         });
         break;
+      // if the function findTableUniqueID returned null because it couldnt find the attribute tableuniqueid
       default:
         break;
     }

From 9d0e63e6953d9303ddf29a9204df0050bb91ad20 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 30 Apr 2024 13:22:08 +0200
Subject: [PATCH 0668/1461] API Konsolidierung Verband

---
 .../frontend/v1}/stv/Verband.php              | 99 +++++++++----------
 .../Stv/Studentenverwaltung/List/New.js       | 10 +-
 .../Stv/Studentenverwaltung/Verband.js        | 15 ++-
 3 files changed, 61 insertions(+), 63 deletions(-)
 rename application/controllers/{components => api/frontend/v1}/stv/Verband.php (86%)

diff --git a/application/controllers/components/stv/Verband.php b/application/controllers/api/frontend/v1/stv/Verband.php
similarity index 86%
rename from application/controllers/components/stv/Verband.php
rename to application/controllers/api/frontend/v1/stv/Verband.php
index 18ce5c999..5a7960fd5 100644
--- a/application/controllers/components/stv/Verband.php
+++ b/application/controllers/api/frontend/v1/stv/Verband.php
@@ -1,17 +1,41 @@
 <?php
+/**
+ * Copyright (C) 2024 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
-class Verband extends FHC_Controller
+/**
+ * This controller operates between (interface) the JS (GUI) and the back-end
+ * Provides data to the ajax get calls about verbände
+ * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
+ */
+class Verband extends FHCAPI_Controller
 {
 	public function __construct()
 	{
-		// TODO(chris): access!
-		parent::__construct();
-		
+		// TODO(chris): permissions
+		$permissions = [];
+		$router = load_class('Router');
+		$permissions[$router->method] = self::PERM_LOGGED;
+		parent::__construct($permissions);
+
+		// Load Models
 		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
 	}
-
 	/**
 	 * Remap calls:
 	 * /
@@ -75,12 +99,9 @@ class Verband extends FHC_Controller
 		$this->StudiengangModel->addOrder('kurzbz');
 
 		$result = $this->StudiengangModel->loadWhere(['v.aktiv' => true]);
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson(getError($result));
-		}
 
-		$list = getData($result) ?: [];
+		$list = $this->getDataOrTerminateWithError($result);
+
 		$list[] = [
 			'name' => 'International',
 			'link' => 'inout',
@@ -102,7 +123,7 @@ class Verband extends FHC_Controller
 				]
 			]
 		];
-		$this->outputJson($list);
+		$this->terminateWithSuccess($list);
 	}
 
 	/**
@@ -139,12 +160,8 @@ class Verband extends FHC_Controller
 			'v.studiengang_kz' => $studiengang_kz,
 			'v.aktiv' => true
 		]);
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson(getError($result));
-		}
+		$list = $this->getDataOrTerminateWithError($result);
 
-		$list = getData($result) ?: [];
 		array_unshift($list, [
 			'name' => 'PreStudent',
 			'link' => $link . 'prestudent',
@@ -154,12 +171,9 @@ class Verband extends FHC_Controller
 		if ($org_form === null) {
 			// NOTE(chris): if mischform show orgforms
 			$result = $this->StudiengangModel->load($studiengang_kz);
-			if (isError($result)) {
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson(getError($result));
-			}
-			if (hasData($result)) {
-				if (current(getData($result))->mischform) {
+			$result = $this->getDataOrTerminateWithError($result);
+			if ($result) {
+				if (current($result)->mischform) {
 					$this->load->model('organisation/Studienordnung_model', 'StudienordnungModel');
 
 					$this->StudienordnungModel->addDistinct();
@@ -175,18 +189,14 @@ class Verband extends FHC_Controller
 						'studiengang_kz' => $studiengang_kz,
 						'p.orgform_kurzbz !=' => 'DDP'
 					]);
-					if (isError($result)) {
-						$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-						return $this->outputJson(getError($result));
-					}
+					$result = $this->getDataOrTerminateWithError($result);
 
-					if (hasData($result))
-						$list = array_merge($list, getData($result));
+					$list = array_merge($list, $result);
 				}
 			}
 
 		}
-		$this->outputJson($list);
+		$this->terminateWithSuccess($list);
 	}
 
 	/**
@@ -231,13 +241,8 @@ class Verband extends FHC_Controller
 			$where['orgform_kurzbz'] = $org_form;
 
 		$result = $this->GruppeModel->loadWhere($where);
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson(getError($result));
-		}
-
-		$list = getData($result) ?: [];
 
+		$list = $this->getDataOrTerminateWithError($result);
 
 		$this->StudiengangModel->addJoin('public.tbl_lehrverband v', 'studiengang_kz');
 		
@@ -263,14 +268,11 @@ class Verband extends FHC_Controller
 			$where['v.orgform_kurzbz'] = $org_form;
 
 		$result = $this->StudiengangModel->loadWhere($where);
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson(getError($result));
-		}
+		$result = $this->getDataOrTerminateWithError($result);
 
-		$list = array_merge($list, getData($result) ?: []);
+		$list = array_merge($list, $result);
 
-		$this->outputJson($list);
+		$this->terminateWithSuccess($list);
 	}
 
 	/**
@@ -313,14 +315,10 @@ class Verband extends FHC_Controller
 			$where['v.orgform_kurzbz'] = $org_form;
 
 		$result = $this->StudiengangModel->loadWhere($where);
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson(getError($result));
-		}
 
-		$list = getData($result) ?: [];
+		$list = $this->getDataOrTerminateWithError($result);
 
-		$this->outputJson($list);
+		$this->terminateWithSuccess($list);
 	}
 
 	/**
@@ -341,13 +339,8 @@ class Verband extends FHC_Controller
 		 * - then: $stsem_obj->getPlusMinus(NULL, $number_displayed_past_studiensemester, 'ende ASC');
 		 */
 		$result = $this->StudiensemesterModel->load();
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			$this->outputJson(getError($result));
-			exit;
-		}
 
-		$studiensemester = getData($result) ?: [];
+		$studiensemester = $this->getDataOrTerminateWithError($result);
 		$result = [];
 
 		foreach ($studiensemester as $sem) {
diff --git a/public/js/components/Stv/Studentenverwaltung/List/New.js b/public/js/components/Stv/Studentenverwaltung/List/New.js
index f23245b7c..351737e23 100644
--- a/public/js/components/Stv/Studentenverwaltung/List/New.js
+++ b/public/js/components/Stv/Studentenverwaltung/List/New.js
@@ -130,21 +130,21 @@ export default {
 
 			this.abortController.places = new AbortController();
 			this.$refs.form
-				.send(CoreRESTClient.get(
-					'components/stv/address/getPlaces/' + this.formData.address.plz,
+				.get(
+					'api/frontend/v1/stv/address/getPlaces/' + this.formData.address.plz,
 					undefined,
 					{
 						signal: this.abortController.places.signal
 					}
-				))
+				)
 				.then(result => {
-					this.places = result
+					this.places = result.data
 				})
 				.catch(error => {
 					if (error.code != "ERR_CANCELED")
 						window.setTimeout(this.loadPlaces, 100);
 					else
-						console.error(error);
+						this.$fhcAlert.handleSystemError(error);
 				});
 		},
 		loadStudienplaene() {
diff --git a/public/js/components/Stv/Studentenverwaltung/Verband.js b/public/js/components/Stv/Studentenverwaltung/Verband.js
index 92d343f08..bdc5500a6 100644
--- a/public/js/components/Stv/Studentenverwaltung/Verband.js
+++ b/public/js/components/Stv/Studentenverwaltung/Verband.js
@@ -53,8 +53,8 @@ export default {
 					});
 					this.loading = true;
 					
-					CoreRESTClient
-						.get("components/stv/verband/" + node.data.link)
+					this.$fhcApi
+						.get('api/frontend/v1/stv/verband/' + node.data.link)
 						.then(result => result.data)
 						.then(result => {
 							const subNodes = result.map(this.mapResultToTreeData);
@@ -128,7 +128,12 @@ export default {
 			
 			let promises = [];
 			for (let parent in sortedInParents)
-				promises.push(CoreRESTClient.get("components/stv/verband/" + (parent == '_' ? '' : parent)).then(res => res.data).then(res => res.filter(node => sortedInParents[parent].includes(node.link + ''))));
+				promises.push(
+					this.$fhcApi
+						.get('api/frontend/v1/stv/verband/' + (parent == '_' ? '' : parent))
+						.then(res => res.data)
+						.then(res => res.filter(node => sortedInParents[parent].includes(node.link + '')))
+				);
 			
 			// NOTE(chris): merge the resulting arrays and transform them to an associative one
 			let result = [].concat.apply([], await Promise.all(promises)).reduce((o, node) => {
@@ -171,8 +176,8 @@ export default {
 		}
 	},
 	mounted() {
-		CoreRESTClient
-			.get("components/stv/verband")
+		this.$fhcApi
+			.get('api/frontend/v1/stv/verband')
 			.then(result => result.data)
 			.then(result => {
 				this.nodes = result.map(this.mapResultToTreeData);

From 86d3042cc684658752b9605a482e85f3e1823fe9 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 30 Apr 2024 14:18:22 +0200
Subject: [PATCH 0669/1461] makes the rows that were recently selected
 unselectable and adds the correct styling in the approveAnrechnungUebersicht
 view

---
 .../approveAnrechnungUebersichtData.php       |  3 +++
 .../anrechnung/approveAnrechnungUebersicht.js | 27 ++++++++++++++++---
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php b/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
index 419dc6331..acfcbd907 100644
--- a/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
+++ b/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
@@ -219,6 +219,9 @@ $filterWidgetArray = array(
 		selectableCheck: function(row){
             return func_selectableCheck(row);
         },
+		rowFormatter:function(row){
+			return func_rowFormatter(row);
+		},
 		
 		columnDefaults:{
 			tooltip:func_tooltips,
diff --git a/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js b/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
index 36a35a68d..e8d15ee3e 100644
--- a/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
+++ b/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
@@ -195,6 +195,21 @@ function func_selectableCheck(row) {
   );
 }
 
+function func_rowFormatter(row){
+  const rowData = row.getData();
+
+  // add the tabulator-unselectable class to the row if its data property isSelectable is false
+  if(rowData.isSelectable===false && !row.getElement().classList.contains("tabulator-unselectable")){
+    console.log("i entered here")
+    row.getElement().classList.add("tabulator-unselectable");
+  }
+
+  // remove the tabulator-selectable class if the data property isSelectable is false and it contains the class
+  if(rowData.isSelectable===false && row.getElement().classList.contains("tabulator-selectable")){
+    row.getElement().classList.remove("tabulator-selectable");
+  }
+}
+
 // Calculate dynamically sum of all LV ECTS by Student and display, when maximum ECTS are exceeded.
 // data = selected data, rows = selected rows
 function func_rowSelectionChanged(data, rows, tabulatorInstance) {
@@ -480,6 +495,7 @@ $(function () {
                   "=",
                   key
                 );
+                console.log("here are the rows", rows)
 
                 // Loop through the rows
                 rows.forEach((row) => {
@@ -492,6 +508,7 @@ $(function () {
                         row.getData().anrechnung_id == anrechnung_id
                     ) !== -1
                   ) {
+                    console.log("am i entering in this if ", row);
                     // ...update status
                     updateData.status_kurzbz = data.status_kurzbz;
                     updateData.status_bezeichnung = data.status_bezeichnung;
@@ -507,19 +524,21 @@ $(function () {
                     (updateData.ectsSumBeruflich =
                       row.getData().ectsSumBeruflich +
                       sumLvEcts.ectsSumAnzurechnendeLvsBeruflich);
-
+                    
+                  // set the isSelectable property to false, in order to set the tabulator-unselectable class in the rowFormatter function
+                  updateData.isSelectable=false;
                   // Update row
                   row.update(updateData);
-
-                  // Reformat row
                   row.reformat();
+                  
                 });
 
                 // Deselect rows
                 $("#tableWidgetTabulator").tabulator(
                   "deselectRow",
                   rowsToDeselect
-                );
+                );  
+
               });
 
               // Print success message

From 10bfb6c9e896c00bc5e11b3d956d42e5e7daa1cf Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 30 Apr 2024 15:03:30 +0200
Subject: [PATCH 0670/1461] also fixes the isSelectable bug when rejecting a
 anrechnung in the approveAnrechnungenUebersicht view

---
 .../lehre/anrechnung/approveAnrechnungUebersicht.js  | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js b/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
index e8d15ee3e..7bf84bd19 100644
--- a/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
+++ b/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
@@ -200,7 +200,6 @@ function func_rowFormatter(row){
 
   // add the tabulator-unselectable class to the row if its data property isSelectable is false
   if(rowData.isSelectable===false && !row.getElement().classList.contains("tabulator-unselectable")){
-    console.log("i entered here")
     row.getElement().classList.add("tabulator-unselectable");
   }
 
@@ -495,7 +494,6 @@ $(function () {
                   "=",
                   key
                 );
-                console.log("here are the rows", rows)
 
                 // Loop through the rows
                 rows.forEach((row) => {
@@ -508,7 +506,6 @@ $(function () {
                         row.getData().anrechnung_id == anrechnung_id
                     ) !== -1
                   ) {
-                    console.log("am i entering in this if ", row);
                     // ...update status
                     updateData.status_kurzbz = data.status_kurzbz;
                     updateData.status_bezeichnung = data.status_bezeichnung;
@@ -525,7 +522,7 @@ $(function () {
                       row.getData().ectsSumBeruflich +
                       sumLvEcts.ectsSumAnzurechnendeLvsBeruflich);
                     
-                  // set the isSelectable property to false, in order to set the tabulator-unselectable class in the rowFormatter function
+                  // set the isSelectable property to false, in order to add the tabulator-unselectable class in the rowFormatter function
                   updateData.isSelectable=false;
                   // Update row
                   row.update(updateData);
@@ -635,6 +632,13 @@ $(function () {
             // Update status 'genehmigt'
             $("#tableWidgetTabulator").tabulator("updateData", data);
 
+            // add the isSelectable property to the rejected row, so that the right classes and selectability is applied to the row
+            var selectedRows = $("#tableWidgetTabulator").tabulator("getSelectedRows");
+            selectedRows.forEach((row)=>{
+              row.update({...row.getData(), isSelectable:false});
+              row.reformat();
+            })
+
             // Deselect rows
             var indexesToDeselect = data.map((x) => x.anrechnung_id);
             $("#tableWidgetTabulator").tabulator(

From 2c08a482e39f74ce58b1a4ff78c2dc48db1ad11f Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 2 May 2024 09:29:50 +0200
Subject: [PATCH 0671/1461] finished phrasen in backend; setup component is no
 a modal in landing page and only for lektors with multiple LE assigned in an
 lva; assistenz skips landing page; tabulator formatting fixes;
 getAllAnwesenheitenByLektor now fetches students and their anwesenheiten
 entries seperately which is significantly faster;

---
 system/phrasesupdate.php | 600 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 600 insertions(+)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 9437803c6..d5864abe3 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -25261,6 +25261,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorDeletingAnwKontrolle',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler beim Löschen der Anwesenheitskontrolle!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error deleting an attendance check!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
@@ -25521,6 +25541,586 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'noDataAvailable',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Keine Daten verfügbar',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No data available',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'noExistingKontrolleFound',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Keine Anwesenheitskontrolle gefunden.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No existing attendance check found.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorDegeneratingQRCode',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler beim degenerieren des QRCode',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error degenerating QRCode',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorSavingNewQRCode',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler beim anlegen eines neuen QRCode',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error saving a new QRCode',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorDeleteKontrolleKeineLEAnDatum',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Keine Anwesenheitskontrolle gefunden für Lehreinheit {le_id} am {day}.{month}.{year}.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No attendance check found for teaching unit {le_id} on {day}.{month}.{year}.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorDeleteUserAnwEntriesAnDatum',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler beim Löschen der User Anwesenheiten für Lehreinheit {le_id} am {day}.{month}.{year}.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error deleting User Anwesenheiten for teaching unit {le_id} on {day}.{month}.{year}.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorDeleteKontrolleEntryAnDatum',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler beim Löschen der Anwesenheitskontrolle für Lehreinheit {le_id} am {day}.{month}.{year}.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error deleting attendance check for teaching unit {le_id} on {day}.{month}.{year}.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'successDeleteKontrolleEntryAnDatum',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Löschen der Anwesenheitskontrolle für Lehreinheit {le_id} am {day}.{month}.{year} erfolgreich.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Success deleting attendance check for teaching unit {le_id} on {day}.{month}.{year}.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'wrongParameters',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Falsche Parameterübergabe',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Wrong parameters tranferred',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorInvalidCode',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ungültiger Zugangscode eingegeben.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Wrong access code entered.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorCodeLinkedToInvalidKontrolle',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zugangscode hat eine fehlerhafte Anwesenheitskontrolle hinterlegt.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Access code is linked to an invalid attendance check.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorCodeLinkedToInvalidLE',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zugangscode hat eine fehlerhafte Lehreinheit hinterlegt.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Access code is linked to an invalid teaching unit.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorLEhasNoStudentsAttending',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Lehreinheit des Zugangscodes hat keine Teilnehmer hinterlegt.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Teaching unit linked to access code has no participants.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorNotParticipantOfLE',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Sie sind nicht als Teilnehmer der Lehreinheit eingetragen.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'You are not registered as a participant in the teaching unit.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorNoUserEntriesForAttendanceCheckFound',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Keine Anwesenheitseinträge gefunden für die Lehreinheit an diesem Datum.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No attendance entries found for the teaching unit on this date.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorUpdateUserEntry',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Eintrag der Anwesenheit fehlgeschlagen, bitte wenden Sie sich an den Unterrichtenden.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Attendance entry failed, please contact the instructor.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorPersonStudentIDMismatch',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehlerhafte Verbindung von Person und Student ID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Person und Student ID Mismatch.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'successDeleteEnschuldigung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Entschuldigung erfolgreich gelöscht.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Successfully deleted excuse note.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorCalculatingAnwQuota',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler bei der Berechnung der Anwesenheitenquote.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error calculating attendancy quota.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorDeleteSingleAnwUserEntry',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler bei dem Versuch den Anwesenheitseintrag zu löschen.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error trying to delete the attendancy entry.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorDeleteMultipleAnwUserEntry',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler bei dem Versuch die Anwesenheitseinträge zu löschen.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error trying to delete the attendancy entries.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorNoSTGassigned',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Keine Studiengänge zugewiesen.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No study programs assigned.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorUpdateEntschuldigung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler bei dem Versuch Entschuldigungsstatus zu verändern.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error when trying to change excuse note status.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'successUpdateEntschuldigung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Entschuldigungsstatus erfolgreich aktualisiert.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Excuse note status successfully updated.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'lehreinheitConfig',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Lehreinheit auswählen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Configurate teaching unit',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'keineAnwkontrolleMöglichWeilLEFehlt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Keine Anwesenheitskontrolle möglich weil ihnen im System keine Lehreinheiten für diese Lehrveranstaltung zugewiesen sind.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No attendance check possible because no teaching units are assigned to you in the system for this course.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'anwByLva',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anwesenheiten für {lva}',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Attendancies for {lva}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'anwByStg',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anwesenheiten für {stg}',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Attendancies for {stg}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'anwByLe',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anwesenheiten für {le}',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Attendancies for {le}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 
 	// FHC-CORE-ANWESENHEITEN END
 );

From 12e06776be8c23191a0668ca973226f4e83dc8f1 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 2 May 2024 11:13:45 +0200
Subject: [PATCH 0672/1461] Notizcomponent: using factories as endpoint

---
 .../api/frontend/v1/notiz/Notiz.php           | 384 +++++++++++++++
 public/js/api/fhcapifactory.js                |   4 +-
 public/js/api/notiz.js                        |  13 +
 public/js/api/notiz/person.js                 |  38 ++
 public/js/components/Notiz/NotizComponent.js  | 460 +++++++++---------
 .../Studentenverwaltung/Details/Notizen.js    |  20 +-
 6 files changed, 673 insertions(+), 246 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/notiz/Notiz.php
 create mode 100644 public/js/api/notiz.js
 create mode 100644 public/js/api/notiz/person.js

diff --git a/application/controllers/api/frontend/v1/notiz/Notiz.php b/application/controllers/api/frontend/v1/notiz/Notiz.php
new file mode 100644
index 000000000..2288766c4
--- /dev/null
+++ b/application/controllers/api/frontend/v1/notiz/Notiz.php
@@ -0,0 +1,384 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+
+class Notiz extends Notiz_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'getUid' => ['admin:r', 'assistenz:r'],
+			'getNotizen' => ['admin:r', 'assistenz:r'],
+			'loadNotiz' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
+			'addNewNotiz' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
+			'updateNotiz' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
+			'deleteNotiz' => ['admin:r', 'assistenz:r'],
+			'loadDokumente' => ['admin:r', 'assistenz:r'],
+			'getMitarbeiter' => ['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 getUid()
+		{
+			$this->terminateWithSuccess(getAuthUID());
+		}*/
+
+
+	public function getNotizen($id, $type)
+	{
+
+		//check if valid type
+		$result = $this->NotizzuordnungModel->isValidType($type);
+		if(isError($result))
+			$this->terminateWithError($result->retval, self::ERROR_TYPE_GENERAL);
+
+		//$this->terminateWithError(" after check type not valid", self::ERROR_TYPE_GENERAL);
+		$result = $this->NotizModel->getNotizWithDocEntries($id, $type);
+
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess(getData($result) ?: []);
+
+		//	return $this->terminateWithError("type not valid", self::ERROR_TYPE_GENERAL);
+
+	}
+
+	/*	public function loadNotiz()
+		{
+			$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+
+			$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
+				THEN public.tbl_notiz.updateamum ELSE public.tbl_notiz.insertamum END::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS lastUpdate");
+			$this->NotizModel->addLimit(1);
+
+			$result = $this->NotizModel->loadWhere(
+				array('notiz_id' => $notiz_id)
+			);
+			if (isError($result))
+			{
+				$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			}
+			elseif (!hasData($result))
+			{
+				$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=>'Notiz_id']), self::ERROR_TYPE_GENERAL);
+			}
+			else
+			{
+				$this->terminateWithSuccess(current(getData($result)));
+			}
+		}
+
+
+		public function updateNotiz()
+		{
+			$this->load->library('form_validation');
+			$this->load->library('DmsLib');
+
+			if (isset($_POST['data']))
+			{
+				$data = json_decode($_POST['data']);
+				unset($_POST['data']);
+				foreach ($data as $k => $v) {
+					$_POST[$k] = $v;
+				}
+			}
+
+			$notiz_id = $this->input->post('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', [
+				'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Titel'])
+			]);
+
+			$this->form_validation->set_rules('text', 'Text', 'required', [
+				'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Text'])
+			]);
+
+			if ($this->form_validation->run() == false)
+			{
+				$this->terminateWithValidationErrors($this->form_validation->error_array());
+			}
+
+			//update Notiz
+			$uid = getAuthUID();
+			$titel = $this->input->post('titel');
+			$text = $this->input->post('text');
+			$verfasser_uid = $this->input->post('verfasser');
+			$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' => $notiz_id
+				],
+				[
+					'titel' =>  $titel,
+					'updatevon' => $uid,
+					'updateamum' => date('c'),
+					'text' => $text,
+					'verfasser_uid' => $verfasser_uid,
+					'bearbeiter_uid' => $bearbeiter_uid,
+					'start' => $start,
+					'ende' => $ende,
+					'erledigt' => $erledigt
+				]
+			);
+			if (isError($result))
+			{
+				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			}
+
+			//update(1) laden aller bereits mit dieser notiz_id verknüpften DMS-Einträge
+			$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
+			$this->NotizdokumentModel->addJoin('campus.tbl_dms_version', 'dms_id');
+			$dms_uploaded = null;
+
+			$result = $this->NotizdokumentModel->loadWhere(array('notiz_id' => $notiz_id));
+			if (isError($result))
+			{
+				$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			}
+			elseif (!hasData($result))
+			{
+				$dms_id_arr = null;
+			}
+			else
+			{
+				$result = getData($result);
+				foreach($result as $doc) {
+					$dms_id_arr[] = array(
+						'name' => $doc->name,
+						'dms_id' => $doc->dms_id
+					);
+				}
+			}
+
+			foreach ($_FILES as $k => $file)
+			{
+				//update(2) alle neuen files (alle außer type application/x.fhc-dms+json) anhängen
+				if($file["type"] == 'application/x.fhc-dms+json')
+				{
+					$dms_uploaded[] = array(
+						'name' => $file["name"]
+					);
+				}
+				else
+				{
+					$dms = array(
+						'kategorie_kurzbz'  => 'notiz',
+						'version'           => 0,
+						'name'              => $file["name"],
+						'mimetype'          => $file["type"],
+						'insertamum'        => date('c'),
+						'insertvon'         => $uid
+					);
+
+					//Todo(manu) check if filetypes weiter eingeschränkt werden sollen
+					//Todo(manu)check name files: nicht gleiches file 2mal hochladen
+					$result = $this->dmslib->upload($dms, $k, array('*'));
+
+					if (isError($result))
+					{
+						return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+					}
+					$dms_id = $result->retval['dms_id'];
+
+					$result = $this->NotizdokumentModel->insert(array('notiz_id' => $notiz_id, 'dms_id' => $dms_id));
+					if (isError($result))
+					{
+						return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+					}
+				}
+			}
+
+			//update(3) check if Dateien gelöscht wurden
+			if(count($dms_uploaded) != count($dms_id_arr))
+			{
+				if (count($dms_uploaded) == 0)
+				{
+					$filesDeleted = $dms_id_arr;
+				}
+				else
+				{
+					$upload_new_names = array_column($dms_uploaded, "name");
+
+					$filesDeleted = array_filter($dms_id_arr, function ($file) use ($upload_new_names) {
+						return !in_array($file["name"], $upload_new_names);
+					});
+				}
+
+				foreach ($filesDeleted as $file)
+				{
+					$result = $this->dmslib->removeAll($file['dms_id']);
+
+					if (isError($result))
+					{
+						return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+					}
+					else
+						$this->outputJson($result);
+				}
+			}
+			return $this->terminateWithSuccess($result);
+		}*/
+
+
+	/*	public function deleteNotiz()
+		{
+			$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+			$notiz_id = $this->input->post('notiz_id');
+			$type = $this->input->post('type_id');
+			$id = $this->input->post('id');
+
+			//dms_id auslesen aus notizdokument wenn vorhanden
+			$dms_id_arr = [];
+			$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
+
+			$result = $this->NotizdokumentModel->loadWhere(array('notiz_id' => $notiz_id));
+
+			if (isError($result))
+			{
+				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			}
+
+			if(hasData($result))
+			{
+				$result = getData($result);
+				foreach ($result as $doc) {
+					$dms_id_arr[] = $doc->dms_id;
+				}
+			}
+
+			if($dms_id_arr)
+			{
+				$this->load->library('DmsLib');
+				foreach($dms_id_arr as $dms_id)
+				{
+					$result = $this->dmslib->removeAll($dms_id);
+
+					if (isError($result))
+					{
+						return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+					}
+
+					$this->outputJson($result);
+				}
+			}
+
+			//delete Notizzuordnung
+			if($type == "software_id")
+			{
+				// Loads extension Model
+				$this->load->model('extensions/FHC-Core-Softwarebereitstellung/Softwarenotizzuordnung_model', 'ExtensionnotizzuordnungModel');
+				$result = $this->ExtensionnotizzuordnungModel->delete([
+					'notiz_id' => $notiz_id,
+					'id' => strval($id)
+					],
+					[
+					'type_id' => $type
+				]);
+
+			}
+			else
+			{
+				//notizzuordnungsid!
+				$result = $this->NotizzuordnungModel->delete(['notiz_id' => $notiz_id, $type => $id]);
+			}
+
+
+			$this->load->model('person/Notiz_model', 'NotizModel');
+			//$this->NotizModel->addJoin('public.tbl_notizzuordnung', 'notiz_id');
+
+			//TODO (erweitern um Type_id) für Extensions, damit auch Notizzuordnung gelöscht werden kann
+
+			//Löschen von Notiz
+			$result = $this->NotizModel->delete(
+				array('notiz_id' => $notiz_id)
+			);
+
+			if (isError($result))
+			{
+				return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			}
+			if(!hasData($result))
+			{
+				return $this->terminateWithError($this->p->t('ui','error_missingId', ['id'=> 'Notiz_id']), self::ERROR_TYPE_GENERAL);
+			}
+
+			return $this->terminateWithSuccess(current(getData($result)));
+		}*/
+
+	/*	public function loadDokumente()
+		{
+			$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+			$notiz_id = $this->input->post('notiz_id');
+
+			$this->NotizModel->addSelect('campus.tbl_dms_version.*');
+
+			$this->NotizModel->addJoin('public.tbl_notiz_dokument', 'ON (public.tbl_notiz_dokument.notiz_id = public.tbl_notiz.notiz_id)');
+			$this->NotizModel->addJoin('campus.tbl_dms_version', 'ON (public.tbl_notiz_dokument.dms_id = campus.tbl_dms_version.dms_id)');
+
+			$result = $this->NotizModel->loadWhere(
+				array('public.tbl_notiz.notiz_id' => $notiz_id)
+			);
+			if (isError($result)) {
+				return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			}
+
+			if(!hasData($result))
+			{
+				return $this->terminateWithError($this->p->t('ui','error_missingId', ['id'=> 'Notiz_id']), self::ERROR_TYPE_GENERAL);
+			}
+			return $this->terminateWithSuccess(getData($result));
+		}*/
+
+	/*	public function getMitarbeiter($searchString)
+		{
+			$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
+			$result = $this->MitarbeiterModel->searchMitarbeiter($searchString);
+			if (isError($result)) {
+				$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			}
+			return $this->terminateWithSuccess($result);
+		}*/
+
+	public function isBerechtigt($id, $typeId)
+	{
+		if(!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
+		{
+			$result =  $this->p->t('lehre','error_keineSchreibrechte');
+
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		return success("berechtigt in überschreibender Funktion");
+		/*		return $this->terminateWithError('keine Berechtigung bro', self::ERROR_TYPE_GENERAL);*/
+	}
+
+}
\ No newline at end of file
diff --git a/public/js/api/fhcapifactory.js b/public/js/api/fhcapifactory.js
index 2932efd83..835c74998 100644
--- a/public/js/api/fhcapifactory.js
+++ b/public/js/api/fhcapifactory.js
@@ -21,6 +21,7 @@ import navigation from "./navigation.js";
 import filter from "./filter.js";
 import studstatus from "./studstatus.js";
 import stv from "./stv.js";
+import notiz from "./notiz.js";
 
 export default {
     search,
@@ -28,5 +29,6 @@ export default {
     navigation,
     filter,
     studstatus,
-    stv
+    stv,
+    notiz
 };
diff --git a/public/js/api/notiz.js b/public/js/api/notiz.js
new file mode 100644
index 000000000..9d210a8f9
--- /dev/null
+++ b/public/js/api/notiz.js
@@ -0,0 +1,13 @@
+//TODO(Manu) refactor with require or async
+//sonst Error wenn extension file nicht vorhanden
+
+import person from "./notiz/person.js";
+import softwarenotiz from "../../extensions/FHC-Core-Softwarebereitstellung/js/api/softwarenotiz.js";
+//import pppnotiz from "../../extensions/FHC-Core-PEP/js/api/pppnotiz.js";
+
+
+export default {
+	person,
+	softwarenotiz,
+//	pppnotiz
+}
\ No newline at end of file
diff --git a/public/js/api/notiz/person.js b/public/js/api/notiz/person.js
new file mode 100644
index 000000000..be19b4ed9
--- /dev/null
+++ b/public/js/api/notiz/person.js
@@ -0,0 +1,38 @@
+export default {
+	getNotizen(url, config, params){
+		return this.$fhcApi.get('api/frontend/v1/notiz/notiz/getNotizen/' + params.id + '/' + params.type);
+	},
+	getUid(){
+		return this.$fhcApi.get('api/frontend/v1/notiz/notiz/getUid/');
+	},
+	addNewNotiz(id, formData) {
+		return this.$fhcApi.post('api/frontend/v1/notiz/notiz/addNewNotiz/' + id,
+			formData
+		);
+	},
+	loadNotiz(notiz_id){
+		return this.$fhcApi.post('api/frontend/v1/notiz/notiz/loadNotiz/', {
+			notiz_id
+		});
+	},
+	loadDokumente(notiz_id){
+		return this.$fhcApi.post('api/frontend/v1/notiz/notiz/loadDokumente/', {
+			notiz_id
+		});
+	},
+	deleteNotiz(notiz_id, type_id, id){
+		return this.$fhcApi.post('api/frontend/v1/notiz/notiz/deleteNotiz/', {
+			notiz_id,
+			type_id,
+			id
+		});
+	},
+	updateNotiz(notiz_id, formData){
+		return this.$fhcApi.post('api/frontend/v1/notiz/notiz/updateNotiz/' + notiz_id,
+			formData
+		);
+	},
+	getMitarbeiter(event){
+		return this.$fhcApi.get('api/frontend/v1/notiz/notiz/getMitarbeiter/' + event);
+	}
+}
\ No newline at end of file
diff --git a/public/js/components/Notiz/NotizComponent.js b/public/js/components/Notiz/NotizComponent.js
index 3774c56f7..185e7193d 100644
--- a/public/js/components/Notiz/NotizComponent.js
+++ b/public/js/components/Notiz/NotizComponent.js
@@ -26,209 +26,213 @@ export default {
 		'showDocument',
 		'showTinyMCE',
 		'visibleColumns'
-		],
+	],
 	data(){
-			return {
-				tabulatorOptions: {
-					ajaxURL: this.endpoint + 'getNotizen/' + this.id + '/' + this.typeId,
-					ajaxRequestFunc: this.$fhcApi.get,
-					ajaxResponse: (url, params, response) => response.data,
-					columns: [
-						{
-							title: "Titel",
-							field: "titel",
-							width: 100,
-							tooltip:function(e, cell, onRendered){
-								var el = document.createElement("div");
-								el.style.backgroundColor = "white";
-								el.style.color = "black";
-								el.style.fontWeight = "bold";
-								el.style.padding = "5px";
-								el.style.border = "1px solid black";
-								el.style.borderRadius = "5px";
-
-								el.innerText = cell.getValue();
-
-								el.innerText = cell.getColumn().getField() + " - " + cell.getValue();
-
-								return el;
-							},
-						},
-						{
-							title: "Text",
-							field: "text_stripped",
-							width: 250,
-							tooltip:function(e, cell, onRendered){
-								var el = document.createElement("div");
-								el.style.backgroundColor = "white";
-								el.style.color = "black";
-								el.style.fontWeight = "bold";
-								el.style.padding = "5px";
-								el.style.border = "1px solid black";
-								el.style.borderRadius = "5px";
-
-								el.innerText = cell.getValue();
-
-								return el;
-							},
-						},
-						{title: "VerfasserIn", field: "verfasser_uid", width: 124, visible: false},
-						{title: "BearbeiterIn", field: "bearbeiter_uid", width: 126, visible: false},
-						{title: "Start", field: "start_format", width: 86, visible: false},
-						{title: "Ende", field: "ende_format", width: 86, visible: false},
-						{title: "Dokumente", field: "countdoc", width: 100, visible: false},
-						{
-							title: "Erledigt",
-							field: "erledigt",
-							width: 97,
-							visible: false,
-							formatter:"tickCross",
-							hozAlign:"center",
-							formatterParams: {
-								tickElement: '<i class="fa fa-check text-success"></i>',
-								crossElement: '<i class="fa fa-xmark text-danger"></i>'
-							}
-						},
-						{title: "Notiz_id", field: "notiz_id", width: 92, visible: false},
-						{title: "Notizzuordnung_id", field: "notizzuordnung_id", width: 164, visible: false},
-						{title: "type_id", field: "type_id", width: 164, visible: false},
-						{title: "extension_id", field: "id", width: 135, visible: false},
-						{title: "letzte Änderung", field: "lastupdate", width: 146, visible: false},
-						{
-							title: 'Aktionen', field: 'actions',
-							width: 100,
-							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.addEventListener(
-									'click',
-									(event) =>
-										this.actionEditNotiz(cell.getData().notiz_id)
-								);
-								container.append(button);
-
-								button = document.createElement('button');
-								button.className = 'btn btn-outline-secondary btn-action';
-								button.innerHTML = '<i class="fa fa-xmark"></i>';
-								button.addEventListener(
-									'click',
-									() =>
-										this.actionDeleteNotiz(cell.getData().notiz_id)
-								);
-								container.append(button);
-
-								return container;
-							},
-							frozen: true
-						}],
-					layout: 'fitColumns',
-					layoutColumnsOnNewData: false,
-					height: '250',
-					selectableRangeMode: 'click',
-					selectable: true,
-					index: 'notiz_id'
+		return {
+			tabulatorOptions: {
+				ajaxURL: 'dummy',
+				ajaxRequestFunc: this.endpoint.getNotizen,
+				ajaxParams: {
+					id: this.id,
+					type: this.typeId
 				},
-				tabulatorEvents: [
+				ajaxResponse: (url, params, response) => response.data,
+				columns: [
 					{
-						event: 'tableBuilt',
-						handler: async () => {
+						title: "Titel",
+						field: "titel",
+						width: 100,
+						tooltip:function(e, cell, onRendered){
+							var el = document.createElement("div");
+							el.style.backgroundColor = "white";
+							el.style.color = "black";
+							el.style.fontWeight = "bold";
+							el.style.padding = "5px";
+							el.style.border = "1px solid black";
+							el.style.borderRadius = "5px";
 
-							await this.$p.loadCategory(['notiz', 'global']);
+							el.innerText = cell.getValue();
 
-							let cm = this.$refs.table.tabulator.columnManager;
+							el.innerText = cell.getColumn().getField() + " - " + cell.getValue();
 
-							cm.getColumnByField('verfasser_uid').component.updateDefinition({
-								title: this.$p.t('notiz', 'verfasser'),
-								visible: this.showVariables.showVerfasser
-							});
-							cm.getColumnByField('titel').component.updateDefinition({
-								title: this.$p.t('global', 'titel'),
-								//visible: this.showVariables.showTitel
-							});
-							cm.getColumnByField('text_stripped').component.updateDefinition({
-								title: this.$p.t('global', 'text'),
-								//visible: this.showVariables.showText
-							});
-							cm.getColumnByField('bearbeiter_uid').component.updateDefinition({
-								title: this.$p.t('notiz', 'bearbeiter'),
-								visible: this.showVariables.showBearbeiter
-							});
-							cm.getColumnByField('start_format').component.updateDefinition({
-								title: this.$p.t('global', 'gueltigVon'),
-								visible: this.showVariables.showVon
-							});
-							cm.getColumnByField('ende_format').component.updateDefinition({
-								title: this.$p.t('global', 'gueltigBis'),
-								visible: this.showVariables.showBis
-							});
-							cm.getColumnByField('countdoc').component.updateDefinition({
-								title: this.$p.t('notiz', 'document'),
-								visible: this.showVariables.showDokumente
-							});
-							cm.getColumnByField('erledigt').component.updateDefinition({
-								title: this.$p.t('notiz', 'erledigt'),
-								visible: this.showVariables.showErledigt
-							});
-							cm.getColumnByField('lastupdate').component.updateDefinition({
-								title: this.$p.t('notiz', 'letzte_aenderung'),
-								visible: this.showVariables.showLastupdate
-							});
-							cm.getColumnByField('notiz_id').component.updateDefinition({
-								visible: this.showVariables.showNotiz_id
-							});
-							cm.getColumnByField('notizzuordnung_id').component.updateDefinition({
-								visible: this.showVariables.showNotizzuordnung_id
-							});
-							cm.getColumnByField('type_id').component.updateDefinition({
-								visible: this.showVariables.showType_id
-							});
-							cm.getColumnByField('id').component.updateDefinition({
-								visible: this.showVariables.showId
-							});
+							return el;
+						},
+					},
+					{
+						title: "Text",
+						field: "text_stripped",
+						width: 250,
+						tooltip:function(e, cell, onRendered){
+							var el = document.createElement("div");
+							el.style.backgroundColor = "white";
+							el.style.color = "black";
+							el.style.fontWeight = "bold";
+							el.style.padding = "5px";
+							el.style.border = "1px solid black";
+							el.style.borderRadius = "5px";
 
+							el.innerText = cell.getValue();
+
+							return el;
+						},
+					},
+					{title: "VerfasserIn", field: "verfasser_uid", width: 124, visible: false},
+					{title: "BearbeiterIn", field: "bearbeiter_uid", width: 126, visible: false},
+					{title: "Start", field: "start_format", width: 86, visible: false},
+					{title: "Ende", field: "ende_format", width: 86, visible: false},
+					{title: "Dokumente", field: "countdoc", width: 100, visible: false},
+					{
+						title: "Erledigt",
+						field: "erledigt",
+						width: 97,
+						visible: false,
+						formatter:"tickCross",
+						hozAlign:"center",
+						formatterParams: {
+							tickElement: '<i class="fa fa-check text-success"></i>',
+							crossElement: '<i class="fa fa-xmark text-danger"></i>'
 						}
+					},
+					{title: "Notiz_id", field: "notiz_id", width: 92, visible: false},
+					{title: "Notizzuordnung_id", field: "notizzuordnung_id", width: 164, visible: false},
+					{title: "type_id", field: "type_id", width: 164, visible: false},
+					{title: "extension_id", field: "id", width: 135, visible: false},
+					{title: "letzte Änderung", field: "lastupdate", width: 146, visible: false},
+					{
+						title: 'Aktionen', field: 'actions',
+						width: 100,
+						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.addEventListener(
+								'click',
+								(event) =>
+									this.actionEditNotiz(cell.getData().notiz_id)
+							);
+							container.append(button);
+
+							button = document.createElement('button');
+							button.className = 'btn btn-outline-secondary btn-action';
+							button.innerHTML = '<i class="fa fa-xmark"></i>';
+							button.addEventListener(
+								'click',
+								() =>
+									this.actionDeleteNotiz(cell.getData().notiz_id)
+							);
+							container.append(button);
+
+							return container;
+						},
+						frozen: true
+					}],
+				layout: 'fitColumns',
+				layoutColumnsOnNewData: false,
+				height: '250',
+				selectableRangeMode: 'click',
+				selectable: true,
+				index: 'notiz_id'
+			},
+			tabulatorEvents: [
+				{
+					event: 'tableBuilt',
+					handler: async () => {
+
+						await this.$p.loadCategory(['notiz', 'global']);
+
+						let cm = this.$refs.table.tabulator.columnManager;
+
+						cm.getColumnByField('verfasser_uid').component.updateDefinition({
+							title: this.$p.t('notiz', 'verfasser'),
+							visible: this.showVariables.showVerfasser
+						});
+						cm.getColumnByField('titel').component.updateDefinition({
+							title: this.$p.t('global', 'titel'),
+							//visible: this.showVariables.showTitel
+						});
+						cm.getColumnByField('text_stripped').component.updateDefinition({
+							title: this.$p.t('global', 'text'),
+							//visible: this.showVariables.showText
+						});
+						cm.getColumnByField('bearbeiter_uid').component.updateDefinition({
+							title: this.$p.t('notiz', 'bearbeiter'),
+							visible: this.showVariables.showBearbeiter
+						});
+						cm.getColumnByField('start_format').component.updateDefinition({
+							title: this.$p.t('global', 'gueltigVon'),
+							visible: this.showVariables.showVon
+						});
+						cm.getColumnByField('ende_format').component.updateDefinition({
+							title: this.$p.t('global', 'gueltigBis'),
+							visible: this.showVariables.showBis
+						});
+						cm.getColumnByField('countdoc').component.updateDefinition({
+							title: this.$p.t('notiz', 'document'),
+							visible: this.showVariables.showDokumente
+						});
+						cm.getColumnByField('erledigt').component.updateDefinition({
+							title: this.$p.t('notiz', 'erledigt'),
+							visible: this.showVariables.showErledigt
+						});
+						cm.getColumnByField('lastupdate').component.updateDefinition({
+							title: this.$p.t('notiz', 'letzte_aenderung'),
+							visible: this.showVariables.showLastupdate
+						});
+						cm.getColumnByField('notiz_id').component.updateDefinition({
+							visible: this.showVariables.showNotiz_id
+						});
+						cm.getColumnByField('notizzuordnung_id').component.updateDefinition({
+							visible: this.showVariables.showNotizzuordnung_id
+						});
+						cm.getColumnByField('type_id').component.updateDefinition({
+							visible: this.showVariables.showType_id
+						});
+						cm.getColumnByField('id').component.updateDefinition({
+							visible: this.showVariables.showId
+						});
+
 					}
-				],
-				notizen: [],
-				multiupload: true,
-				mitarbeiter: [],
-				filteredMitarbeiter: [],
-				zwischenvar: '',
-				editorInitialized: false,
-				editor: null,
-				notizData: {
-					typeId: this.typeId,
-					titel: null,
-					statusNew: true,
-					text: null,
-					lastUpdate: null,
-					von: null,
-					bis: null,
-					document: null,
-					erledigt: false,
-					verfasser: null,
-					bearbeiter: null,
-					anhang: []
-				},
-				showVariables: {
-					showTitel: false,
-					showText: false,
-					showVerfasser: false,
-					showBearbeiter: false,
-					showVon: false,
-					showBis: false,
-					showDokumente: false,
-					showErledigt: false,
-					showNotiz_id: false,
-					showNotizzuordnung_id: false,
-					showType_id: false,
-					showId: false,
-					showLastupdate: false
-				},
+				}
+			],
+			notizen: [],
+			multiupload: true,
+			mitarbeiter: [],
+			filteredMitarbeiter: [],
+			zwischenvar: '',
+			editorInitialized: false,
+			editor: null,
+			notizData: {
+				typeId: this.typeId,
+				titel: null,
+				statusNew: true,
+				text: null,
+				lastUpdate: null,
+				von: null,
+				bis: null,
+				document: null,
+				erledigt: false,
+				verfasser: null,
+				bearbeiter: null,
+				anhang: []
+			},
+			showVariables: {
+				showTitel: false,
+				showText: false,
+				showVerfasser: false,
+				showBearbeiter: false,
+				showVon: false,
+				showBis: false,
+				showDokumente: false,
+				showErledigt: false,
+				showNotiz_id: false,
+				showNotizzuordnung_id: false,
+				showType_id: false,
+				showId: false,
+				showLastupdate: false
+			},
 		}
 	},
 	methods: {
@@ -271,33 +275,21 @@ export default {
 
 			formData.append('data', JSON.stringify(this.notizData));
 			Object.entries(this.notizData.anhang).forEach(([k, v]) => formData.append(k, v));
-/*			this.formData = {
-				'id': this.id,
-				'typeId': this.typeId,
-				...formData
-			};*/
 
-			return this.$fhcApi.post(this.endpoint + 'addNewNotiz/' + this.id,
-				formData,
-				{Headers: {"Content-Type": "multipart/form-data"}}
-			).then(response => {
-				this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
-				this.resetFormData();
-				this.reload();
-			})
+			return this.endpoint.addNewNotiz(this.id, formData)
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+					this.resetFormData();
+					this.reload();
+				})
 				.catch(this.$fhcAlert.handleSystemError)
 				.finally(() => {
 					window.scrollTo(0, 0);
 				});
 		},
 		deleteNotiz(notiz_id) {
-			this.param = {
-				'notiz_id': notiz_id,
-				'type_id': this.typeId,
-				'id': this.id
-			};
-
-			return this.$fhcApi.post(this.endpoint + 'deleteNotiz/', this.param)
+			return this.endpoint.deleteNotiz(notiz_id, this.typeId, this.id)
+				//return this.$fhcApi.post(this.endpoint + 'deleteNotiz/', this.param)
 				.then(result => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
 					this.$refs.deleteNotizModal.hide();
@@ -310,11 +302,7 @@ export default {
 				});
 		},
 		loadNotiz(notiz_id) {
-			this.param = {
-				'notiz_id': notiz_id
-			};
-			return this.$fhcApi.post(this.endpoint + 'loadNotiz/',
-				this.param)
+			return this.endpoint.loadNotiz(notiz_id)
 				.then(result => {
 					this.notizData = result.data;
 					this.notizData.typeId = this.typeId;
@@ -323,11 +311,7 @@ export default {
 				.catch(this.$fhcAlert.handleSystemError);
 		},
 		loadDocEntries(notiz_id) {
-			this.param = {
-				'notiz_id': notiz_id
-			};
-			return this.$fhcApi.post(this.endpoint + 'loadDokumente/',
-				this.param)
+			return this.endpoint.loadDokumente(notiz_id)
 				.then(
 					result => {
 						this.notizData.anhang = result.data;
@@ -340,19 +324,12 @@ export default {
 			formData.append('data', JSON.stringify(this.notizData));
 			Object.entries(this.notizData.anhang).forEach(([k, v]) => formData.append(k, v));
 
-			this.param = {
-				'notiz_id': notiz_id
-			};
-
-			return this.$fhcApi.post(
-				this.endpoint + 'updateNotiz/',
-				formData,
-				{Headers: {"Content-Type": "multipart/form-data"}}
-			).then(response => {
-				this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
-				this.resetFormData();
-				this.reload();
-			})
+			return this.endpoint.updateNotiz(notiz_id, formData)
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+					this.resetFormData();
+					this.reload();
+				})
 				.catch(this.$fhcAlert.handleSystemError)
 				.finally(() => {
 					window.scrollTo(0, 0);
@@ -379,16 +356,14 @@ export default {
 			};
 		},
 		getUid() {
-			this.$fhcApi
-				.get(this.endpoint + 'getUid')
+			return this.endpoint.getUid()
 				.then(result => {
 					this.notizData.intVerfasser = result.data;
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
 		search(event) {
-			return this.$fhcApi
-				.get(this.endpoint + 'getMitarbeiter/' + event.query)
+			return this.endpoint.getMitarbeiter(event.query)
 				.then(result => {
 					this.filteredMitarbeiter = result.data.retval;
 				});
@@ -535,7 +510,7 @@ export default {
 					<label for="text" class="form-label col-sm-2">{{$p.t('global','text')}} *</label>
 						
 					<!-- TinyMce 5 -->
-					<div v-if="showTinyMCE"class="col-sm-7">
+					<div v-if="showTinyMCE" class="col-sm-7">
 						<textarea
 						ref="editor"
 						rows="5"
@@ -1062,4 +1037,3 @@ export default {
 <br>
 `,
 }
-
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
index f93bb19cd..4c128bfea 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
@@ -10,7 +10,9 @@ export default {
 	template: `
 	<div class="stv-details-details h-100 pb-3">
 		<h3>Notizen</h3>
-		<NotizComponent
+		
+		<!--oldversion ohne factory-->
+<!--		<NotizComponent
 			endpoint="api/frontend/v1/stv/Notiz/"
 			ref="formc"
 			typeId="person_id"
@@ -21,6 +23,20 @@ export default {
 			:showTinyMCE="false"
 			:visibleColumns="['titel','text','verfasser','bearbeiter','dokumente']"
 			>
+		</NotizComponent>-->
+	
+<!--	mit factory als endpoint	-->
+		<NotizComponent
+			:endpoint="$fhcApi.factory.notiz.person"
+			ref="formc"
+			typeId="person_id"
+			:id="modelValue.person_id"
+			notizLayout="twoColumnsFormLeft"
+			:showErweitert="true"
+			:showDocument="true"
+			:showTinyMCE="true"
+			:visibleColumns="['titel','text','verfasser','bearbeiter','dokumente']"
+			>
 		</NotizComponent>
 		
 <!--		
@@ -87,4 +103,4 @@ visibleColumns: list, which fields shoult be showed as default in filter compone
 		
 	</div>
 	`
-};
+};
\ No newline at end of file

From 6ea802717b1d52c552c47ce5e87cb6f830f7b027 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 2 May 2024 11:14:12 +0200
Subject: [PATCH 0673/1461] adds pointer-events none to all rows with the class
 .tabulator-unselectable except for the links inside those rows, because it
 was not possible to programmatically retrigger the selectableCheck

---
 .../reviewAnrechnungUebersichtData.php        |  4 +
 public/css/Tabulator5.css                     |  5 ++
 .../anrechnung/approveAnrechnungUebersicht.js | 63 +++++----------
 .../anrechnung/reviewAnrechnungUebersicht.js  | 76 +++++++------------
 4 files changed, 54 insertions(+), 94 deletions(-)

diff --git a/application/views/lehre/anrechnung/reviewAnrechnungUebersichtData.php b/application/views/lehre/anrechnung/reviewAnrechnungUebersichtData.php
index 1bd5c667f..1f93bf35d 100644
--- a/application/views/lehre/anrechnung/reviewAnrechnungUebersichtData.php
+++ b/application/views/lehre/anrechnung/reviewAnrechnungUebersichtData.php
@@ -163,9 +163,13 @@ $filterWidgetArray = array(
         tableWidgetFooter: {
 			selectButtons: true
 		},
+		
 		selectableCheck: function(row){
             return func_selectableCheck(row);
         },
+		rowFormatter:function(row){
+			return func_rowFormatter(row);
+		},
         columnDefaults:{
 			tooltip:func_tooltips,
 			headerFilterPlaceholder: " ",
diff --git a/public/css/Tabulator5.css b/public/css/Tabulator5.css
index 3ce22e592..ec68f97f7 100644
--- a/public/css/Tabulator5.css
+++ b/public/css/Tabulator5.css
@@ -42,6 +42,11 @@
 /* classes for rows that are not selectable in the tabulator, except for rows that are used for calculation */
 .tabulator-row.tabulator-unselectable:not(.tabulator-calcs) {
 	color: #adb5bd !important;
+	pointer-events: none !important;
+}
+
+.tabulator-row.tabulator-unselectable a {
+	pointer-events: auto !important;
 }
 
 /* using bootstrap background classes to style the background color of tabulator rows */
diff --git a/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js b/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
index 7bf84bd19..e89d1a9ee 100644
--- a/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
+++ b/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
@@ -195,16 +195,22 @@ function func_selectableCheck(row) {
   );
 }
 
-function func_rowFormatter(row){
+function func_rowFormatter(row) {
   const rowData = row.getData();
 
   // add the tabulator-unselectable class to the row if its data property isSelectable is false
-  if(rowData.isSelectable===false && !row.getElement().classList.contains("tabulator-unselectable")){
+  if (
+    rowData.isSelectable === false &&
+    !row.getElement().classList.contains("tabulator-unselectable")
+  ) {
     row.getElement().classList.add("tabulator-unselectable");
   }
 
   // remove the tabulator-selectable class if the data property isSelectable is false and it contains the class
-  if(rowData.isSelectable===false && row.getElement().classList.contains("tabulator-selectable")){
+  if (
+    rowData.isSelectable === false &&
+    row.getElement().classList.contains("tabulator-selectable")
+  ) {
     row.getElement().classList.remove("tabulator-selectable");
   }
 }
@@ -232,7 +238,7 @@ function func_rowSelectionChanged(data, rows, tabulatorInstance) {
 }
 
 // Returns tooltip
-function func_tooltips(e,cell,onRendered) {
+function func_tooltips(e, cell, onRendered) {
   //e - mouseover event
   //cell - cell component
   //onRendered - onRendered callback registration function
@@ -331,10 +337,6 @@ $(function () {
     approveAnrechnung.disableCreateAnrechnungButton();
   }
 
-  //! this function should not be needed in the approveAnrechnungUebersicht
-  // Set status alert color
-  approveAnrechnung.setStatusAlertColor();
-
   // Show only rows that are in progress by STGL
   $("#show-inProgressDP").click(function () {
     $("#tableWidgetTabulator").tabulator("setFilter", [
@@ -521,21 +523,19 @@ $(function () {
                     (updateData.ectsSumBeruflich =
                       row.getData().ectsSumBeruflich +
                       sumLvEcts.ectsSumAnzurechnendeLvsBeruflich);
-                    
+
                   // set the isSelectable property to false, in order to add the tabulator-unselectable class in the rowFormatter function
-                  updateData.isSelectable=false;
+                  updateData.isSelectable = false;
                   // Update row
                   row.update(updateData);
                   row.reformat();
-                  
                 });
 
                 // Deselect rows
                 $("#tableWidgetTabulator").tabulator(
                   "deselectRow",
                   rowsToDeselect
-                );  
-
+                );
               });
 
               // Print success message
@@ -633,11 +633,13 @@ $(function () {
             $("#tableWidgetTabulator").tabulator("updateData", data);
 
             // add the isSelectable property to the rejected row, so that the right classes and selectability is applied to the row
-            var selectedRows = $("#tableWidgetTabulator").tabulator("getSelectedRows");
-            selectedRows.forEach((row)=>{
-              row.update({...row.getData(), isSelectable:false});
+            var selectedRows = $("#tableWidgetTabulator").tabulator(
+              "getSelectedRows"
+            );
+            selectedRows.forEach((row) => {
+              row.update({ ...row.getData(), isSelectable: false });
               row.reformat();
-            })
+            });
 
             // Deselect rows
             var indexesToDeselect = data.map((x) => x.anrechnung_id);
@@ -758,33 +760,6 @@ $(function () {
 });
 
 var approveAnrechnung = {
-  setStatusAlertColor: function () {
-    let status_kurzbz = $("#requestAnrechnung-status_kurzbz").data(
-      "status_kurzbz"
-    );
-
-    switch (status_kurzbz) {
-      case ANRECHNUNGSTATUS_APPROVED:
-        $("#requestAnrechnung-status_kurzbz")
-          .closest("div")
-          .addClass("bg-success-subtle");
-        break;
-      case ANRECHNUNGSTATUS_REJECTED:
-        $("#requestAnrechnung-status_kurzbz")
-          .closest("div")
-          .addClass("bg-danger-subtle");
-        break;
-      case "":
-        $("#requestAnrechnung-status_kurzbz")
-          .closest("div")
-          .addClass("bg-info-subtle");
-        break;
-      default:
-        $("#requestAnrechnung-status_kurzbz")
-          .closest("div")
-          .addClass("bg-warning-subtle");
-    }
-  },
   disableEditElements: function () {
     // Disable:
     // ...button Empfehlung anfordern
diff --git a/public/js/lehre/anrechnung/reviewAnrechnungUebersicht.js b/public/js/lehre/anrechnung/reviewAnrechnungUebersicht.js
index 277e3ad3e..ac2e663ec 100644
--- a/public/js/lehre/anrechnung/reviewAnrechnungUebersicht.js
+++ b/public/js/lehre/anrechnung/reviewAnrechnungUebersicht.js
@@ -95,28 +95,22 @@ function func_selectableCheck(row) {
   let status_kurzbz = row.getData().status_kurzbz;
   let empfehlungsberechtigt = row.getData().empfehlungsberechtigt;
 
-  return (
-    status_kurzbz == ANRECHNUNGSTATUS_PROGRESSED_BY_LEKTOR ||
-    empfehlungsberechtigt == "false"
-  );
+  return  status_kurzbz == ANRECHNUNGSTATUS_PROGRESSED_BY_LEKTOR || empfehlungsberechtigt == "false";
+  
 }
 
-// Performes after row was updated
-function func_rowUpdated(row) {
-  // Refresh row formatters
-  row.reformat();
 
-  // Deselect and disable new selection of updated rows
-  row.deselect();
-  row.getElement().style["pointerEvents"] = "none";
+function func_rowFormatter(row){
+  const rowData = row.getData();
 
-  // ...but leave url links selectable
-  row.getCell("dokument_bezeichnung").getElement().firstChild.style[
-    "pointerEvents"
-  ] = "auto";
-  if (row.getCell("detils")) {
-    row.getCell("details").getElement().firstChild.style["pointerEvents"] =
-      "auto";
+  // add the tabulator-unselectable class to the row if its data property isSelectable is false
+  if(rowData.isSelectable===false && !row.getElement().classList.contains("tabulator-unselectable")){
+    row.getElement().classList.add("tabulator-unselectable");
+  }
+
+  // remove the tabulator-selectable class if the data property isSelectable is false and it contains the class
+  if(rowData.isSelectable===false && row.getElement().classList.contains("tabulator-selectable")){
+    row.getElement().classList.remove("tabulator-selectable");
   }
 }
 
@@ -189,13 +183,9 @@ $(function () {
 
   $(document).on("tableInit", function (event, tabulatorInstance) {
     func_tableBuilt($("#tableWidgetTabulator"));
-
-    // event rowUpdated needs to be attached as a callback to the tableBuilt event in tabulator5
-    $("#tableWidgetTabulator").tabulator("on", "rowUpdated", (row) => {
-      func_rowUpdated(row);
-    });
   });
 
+  
   // Redraw table on resize to fit tabulators height to windows height
   window.addEventListener("resize", function () {
     $("#tableWidgetTabulator").tabulator("setHeight", $(window).height() * 0.5);
@@ -332,6 +322,19 @@ $(function () {
             if (!data.error && data.retval != null) {
               // Update status 'genehmigt'
               $("#tableWidgetTabulator").tabulator("updateData", data.retval);
+              
+              // make all confirmed anrechnungen unselectable and deselect them
+              let selectedRows = $("#tableWidgetTabulator").tabulator("getSelectedRows");
+              selectedRows.forEach(row => {
+                row.update({...row.getData(), isSelectable:false});
+                row.reformat();
+              });
+
+              // deselect all selected rows
+              $("#tableWidgetTabulator").tabulator(
+                "deselectRow",
+                selectedRows
+              );
 
               // Print success message
               FHC_DialogLib.alertSuccess(
@@ -458,33 +461,6 @@ $(function () {
 });
 
 var reviewAnrechnung = {
-  setStatusAlertColor: function () {
-    let status_kurzbz = $("#reviewAnrechnung-status_kurzbz").data(
-      "status_kurzbz"
-    );
-
-    switch (status_kurzbz) {
-      case ANRECHNUNGSTATUS_APPROVED:
-        $("#reviewAnrechnung-status_kurzbz")
-          .closest("div")
-          .addClass("bg-success-subtle");
-        break;
-      case ANRECHNUNGSTATUS_REJECTED:
-        $("#reviewAnrechnung-status_kurzbz")
-          .closest("div")
-          .addClass("bg-danger-subtle");
-        break;
-      case "":
-        $("#reviewAnrechnung-status_kurzbz")
-          .closest("div")
-          .addClass("bg-info-subtle");
-        break;
-      default:
-        $("#reviewAnrechnung-status_kurzbz")
-          .closest("div")
-          .addClass("bg-warning-subtle");
-    }
-  },
   copyIntoTextarea: function (elem) {
     // Find closest textarea
     let textarea = $(elem).closest("div").find("textarea");

From bcafb6cea61b283a6dbef4ab0f8a7f9bbe702a4e Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 2 May 2024 11:30:38 +0200
Subject: [PATCH 0674/1461] removes unnecessary function call from
 reviewAnrechnungUebersicht.js

---
 .../views/lehre/anrechnung/reviewAnrechnungUebersicht.php  | 2 +-
 public/js/lehre/anrechnung/reviewAnrechnungUebersicht.js   | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/application/views/lehre/anrechnung/reviewAnrechnungUebersicht.php b/application/views/lehre/anrechnung/reviewAnrechnungUebersicht.php
index 0a24040a9..7fd33a026 100644
--- a/application/views/lehre/anrechnung/reviewAnrechnungUebersicht.php
+++ b/application/views/lehre/anrechnung/reviewAnrechnungUebersicht.php
@@ -100,7 +100,7 @@ $this->load->view(
         <!-- dropdown studiensemester -->
         <div class="row">
             <div class="col-12">
-                <form id="formApproveAnrechnungUebersicht" class="row align-items-center" action="" method="get">
+                <form id="formReviewAnrechnungUebersicht" class="row align-items-center" action="" method="get">
                     <div class="col-auto">
                         <?php
                         echo $this->widgetlib->widget(
diff --git a/public/js/lehre/anrechnung/reviewAnrechnungUebersicht.js b/public/js/lehre/anrechnung/reviewAnrechnungUebersicht.js
index ac2e663ec..4537aa1d3 100644
--- a/public/js/lehre/anrechnung/reviewAnrechnungUebersicht.js
+++ b/public/js/lehre/anrechnung/reviewAnrechnungUebersicht.js
@@ -192,9 +192,6 @@ $(function () {
     $("#tableWidgetTabulator").tabulator("redraw", true);
   });
 
-  // Set status alert color
-  reviewAnrechnung.setStatusAlertColor();
-
   // Show only rows with anrechnungen ohne Empfehlung
   $("#show-need-recommendation").click(function () {
     $("#tableWidgetTabulator").tabulator("setFilter", [
@@ -314,12 +311,14 @@ $(function () {
         data,
         {
           successCallback: function (data, textStatus, jqXHR) {
+
             if (data.error && data.retval != null) {
               // Print error message
               FHC_DialogLib.alertWarning(data.retval);
             }
 
             if (!data.error && data.retval != null) {
+           
               // Update status 'genehmigt'
               $("#tableWidgetTabulator").tabulator("updateData", data.retval);
               
@@ -334,7 +333,7 @@ $(function () {
               $("#tableWidgetTabulator").tabulator(
                 "deselectRow",
                 selectedRows
-              );
+              ); 
 
               // Print success message
               FHC_DialogLib.alertSuccess(

From 0b58d4fd6f253019319ea33f7ca19cf7d315d874 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 2 May 2024 11:43:19 +0200
Subject: [PATCH 0675/1461] also adds the programmatically unselectable logic
 to the reject button

---
 .../js/lehre/anrechnung/reviewAnrechnungUebersicht.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/public/js/lehre/anrechnung/reviewAnrechnungUebersicht.js b/public/js/lehre/anrechnung/reviewAnrechnungUebersicht.js
index 4537aa1d3..be3443574 100644
--- a/public/js/lehre/anrechnung/reviewAnrechnungUebersicht.js
+++ b/public/js/lehre/anrechnung/reviewAnrechnungUebersicht.js
@@ -429,6 +429,17 @@ $(function () {
               // Update status 'genehmigt'
               $("#tableWidgetTabulator").tabulator("updateData", data.retval);
 
+              const selectedRows = $("#tableWidgetTabulator").tabulator("getSelectedRows");
+
+              // makes all denied anrechnungen unselectable by adding the isSelectable property and retriggering the rowFormatter function
+              selectedRows.forEach(row=>{
+                row.update({...row.getData(), isSelectable:false});
+                row.reformat();
+              })
+
+              // deselect all selected rows
+              $("#tableWidgetTabulator").tabulator("deselectRow", selectedRows);
+
               // Print success message
               FHC_DialogLib.alertSuccess(
                 FHC_PhrasesLib.t("ui", "anrechnungenWurdenNichtEmpfohlen")

From 9975f767b8e783c440bb69269896fa2b589e06e3 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 2 May 2024 12:15:57 +0200
Subject: [PATCH 0676/1461] adds responsiveness to reviewAnrechnungDetail.php

---
 .../anrechnung/reviewAnrechnungDetail.php     | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/application/views/lehre/anrechnung/reviewAnrechnungDetail.php b/application/views/lehre/anrechnung/reviewAnrechnungDetail.php
index e015e9486..ed3d61a7e 100644
--- a/application/views/lehre/anrechnung/reviewAnrechnungDetail.php
+++ b/application/views/lehre/anrechnung/reviewAnrechnungDetail.php
@@ -58,7 +58,7 @@ $this->load->view(
 	<div class="container-fluid">
 		<!-- title -->
 		<div class="row">
-			<div class="col-12 my-4 border-bottom">
+			<div class="col-lg-12 my-4 border-bottom">
 				<h3 class="fw-normal ">
 					<?php echo $this->p->t('anrechnung', 'anrechnungenPruefen'); ?>
 					<small class="text-secondary fs-6">| <?php echo $this->p->t('global', 'detailsicht'); ?></small>
@@ -70,7 +70,7 @@ $this->load->view(
 			<div class="col-8">
 				<!-- Antragsdaten -->
 				<div class="row mb-4">
-					<div class="col-12">
+					<div class="col-lg-12">
 						<div class="card">
 							<div class="card-header">
 								<span
@@ -86,7 +86,7 @@ $this->load->view(
 							</div>
 							<div class="card-body">
 								<div class="row">
-									<div class="col-4">
+									<div class="col-lg-4">
 										<table class="table table-bordered table-condensed table-fixed mb-0">
 											<tbody>
 												<tr>
@@ -138,7 +138,7 @@ $this->load->view(
 											</tbody>
 										</table>
 									</div>
-									<div class="col-8">
+									<div class="col-lg-8">
 										<table class="table table-bordered table-condensed table-fixed mb-0">
 											<tbody>
 
@@ -188,7 +188,7 @@ $this->load->view(
 				</div>
 				<!-- Empfehlungsdaten -->
 				<div class="row">
-					<div class="col-12">
+					<div class="col-lg-12">
 						<div class="card mb-4" id="reviewAnrechnungDetail-empfehlung"
 							data-empfehlung="<?php echo json_encode($empfehlungData->empfehlung) ?>">
 							<div class="card-header">
@@ -207,7 +207,7 @@ $this->load->view(
 							</div>
 							<div class="card-body">
 								<div class="row">
-									<div class="col-6">
+									<div class="col-lg-6">
 										<table class="table table-bordered table-condensed table-fixed mb-0">
 											<tbody>
 												<tr>
@@ -261,7 +261,7 @@ $this->load->view(
 											</tbody>
 										</table>
 									</div>
-									<div class="col-6">
+									<div class="col-lg-6">
 										<div>
 											<label class="text-center mb-2">
 												<b><?php echo ucfirst($this->p->t('global', 'notizDerSTGL')); ?></b>
@@ -348,15 +348,19 @@ $this->load->view(
 							</form>
 						</div>
 						<!-- Button Empfehlen / Nicht Empfehlen -->
-						<div class="float-end mb-5">
+						<div class="row justify-content-center justify-content-sm-end align-items-center mb-5">
+							<div class="col-auto mb-1">
 							<button id="reviewAnrechnungDetail-dont-recommend-anrechnung-ask"
-								class="me-1 btn btn-danger btn-w200" type="button" <?php echo (is_null($empfehlungData->empfehlung) && $isEmpfehlungsberechtigt) ? '' : 'disabled' ?>>
+								class=" btn btn-danger btn-w200" type="button" <?php echo (is_null($empfehlungData->empfehlung) && $isEmpfehlungsberechtigt) ? '' : 'disabled' ?>>
 								<?php echo ucfirst($this->p->t('anrechnung', 'nichtEmpfehlen')); ?>
 							</button>
+							</div>
+							<div class="col-auto mb-1">
 							<button id="reviewAnrechnungDetail-recommend-anrechnung-ask"
 								class="btn btn-primary btn-w200" type="button" <?php echo (is_null($empfehlungData->empfehlung) && $isEmpfehlungsberechtigt) ? '' : 'disabled' ?>>
 								<?php echo ucfirst($this->p->t('anrechnung', 'empfehlen')); ?>
 							</button>
+							</div>
 						</div>
 					</div>
 				</div>

From 4aa8807830a3733085b00d623a716f15f548e8ad Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 3 May 2024 09:48:18 +0200
Subject: [PATCH 0677/1461] adds responsiveness for the view
 approveAnrechnungUebersicht

---
 .../anrechnung/approveAnrechnungUebersicht.php    | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php b/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php
index c0541c8ce..26e1e200c 100644
--- a/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php
+++ b/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php
@@ -96,7 +96,7 @@ $this->load->view(
     <div class="container-fluid">
         <!-- header -->
         <div class="row">
-            <div class="col-12 my-4 border-bottom">
+            <div class="col-lg-12 my-4 border-bottom">
                 <h3 class="fw-normal ">
 					<?php echo $this->p->t('anrechnung', 'anrechnungenGenehmigen'); ?>
                     <small class="text-secondary fs-6">| <?php echo ucfirst($this->p->t('global', 'uebersicht')); ?></small>
@@ -108,7 +108,7 @@ $this->load->view(
 
         <!-- dropdown studiensemester -->
         <div class="row">
-            <div class="col-12">
+            <div class="col-lg-12">
                 <form id="formApproveAnrechnungUebersicht" class="row align-items-center" action="" method="get" data-readonly="<?php echo json_encode($hasReadOnlyAccess)?>" data-createaccess="<?php echo json_encode($hasCreateAnrechnungAccess)?>">
                     <div class="col-auto">
 						<?php
@@ -206,8 +206,8 @@ $this->load->view(
         <!-- Filter buttons / Submit buttons-->
         <div class="row">
             <!-- Filter buttons -->
-            <div class="col-4 col-md-5">
-                <div class="btn-toolbar" role="toolbar">
+            <div class="col-12 col-md-5">
+                <div class="btn-toolbar " role="toolbar">
                     <div class="btn-group" role="group">
                         <button id="show-inProgressDP" class="btn btn-outline-secondary btn-clearfilter" type="button"
                                 data-bs-toggle="tooltip" data-bs-placement="left"
@@ -246,17 +246,18 @@ $this->load->view(
 				</div>
             </div>
             <!-- Action Buttons 'Genehmigen', Ablehnen, 'Empfehlung anfordern'-->
-            <div class="col-8 col-md-7">
-                <div class="d-flex justify-content-end">
+            <div class="col-12 col-md-7">
+                <div class="d-flex ">
                     <button id="approveAnrechnungUebersicht-request-recommendation"
                             class="btn btn-outline-secondary btn-w200 me-5" type="button">
                         <?php echo ucfirst($this->p->t('anrechnung', 'empfehlungAnfordern')); ?></button>
+                    
                     <button id="approveAnrechnungUebersicht-reject-anrechnungen-ask"
                             class="btn btn-danger btn-w200 me-1" type="button">
                         <?php echo ucfirst($this->p->t('global', 'ablehnen')); ?></button>
                     <button id="approveAnrechnungUebersicht-approve-anrechnungen-ask"
                             class="btn btn-primary btn-w200" type="button">
-                        <?php echo ucfirst($this->p->t('global', 'genehmigen')); ?></button>
+                        <?php echo ucfirst($this->p->t('global', 'genehmigen')); ?></button>       
                 </div>
             </div>
         </div>

From f9058b954e18e1235bf7ad1cbfc0824c71aafbcd Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 3 May 2024 10:31:53 +0200
Subject: [PATCH 0678/1461] adjusting the responsive layout for
 approveAnrechnungDetail view

---
 .../lehre/anrechnung/approveAnrechnungDetail.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/application/views/lehre/anrechnung/approveAnrechnungDetail.php b/application/views/lehre/anrechnung/approveAnrechnungDetail.php
index fbc749f65..7f0eb604f 100644
--- a/application/views/lehre/anrechnung/approveAnrechnungDetail.php
+++ b/application/views/lehre/anrechnung/approveAnrechnungDetail.php
@@ -66,7 +66,7 @@ $this->load->view(
 	<div class="container-fluid">
 		<!-- header  -->
 		<div class="row">
-			<div class="col-12 my-4 border-bottom">
+			<div class="col-lg-12 my-4 border-bottom">
 				<h3 class="fw-normal ">
 					<?php echo $this->p->t('anrechnung', 'anrechnungenGenehmigen'); ?>
 					<small class="text-secondary fs-6">| <?php echo $this->p->t('global', 'detailsicht'); ?></small>
@@ -80,7 +80,7 @@ $this->load->view(
 			<div class="col-8">
 				<!-- Antragsdaten -->
 				<div class="row mb-4">
-					<div class="col-12">
+					<div class="col-lg-12">
 						<div class="card">
 							<div class="card-header">
 								<span
@@ -95,7 +95,7 @@ $this->load->view(
 							</div>
 							<div class="card-body">
 								<div class="row">
-									<div class="col-4">
+									<div class="col-xxl-4">
 										<table class="table table-bordered table-condensed table-fixed mb-0">
 											<tbody>
 												<tr>
@@ -166,7 +166,7 @@ $this->load->view(
 											</tbody>
 										</table>
 									</div>
-									<div class="col-8">
+									<div class="col-xxl-8">
 										<table class="table table-bordered table-condensed table-fixed mb-0">
 											<tbody>
 
@@ -221,7 +221,7 @@ $this->load->view(
 				</div>
 				<!-- Empfehlungsdaten -->
 				<div class="row">
-					<div class="col-12">
+					<div class="col-lg-12">
 						<div class="card " id="approveAnrechnungDetail-empfehlung"
 							data-empfehlung="<?php echo json_encode($empfehlungData->empfehlung) ?>">
 							<div class="card-header">
@@ -239,7 +239,7 @@ $this->load->view(
 							</div>
 							<div class="card-body">
 								<div class="row">
-									<div class="col-6">
+									<div class="col-lg-6">
 										<form id="form-empfehlung">
 											<input type="hidden" name="anrechnung_id"
 												value="<?php echo $anrechnungData->anrechnung_id ?>">
@@ -297,7 +297,7 @@ $this->load->view(
 											</table>
 										</form>
 									</div>
-									<div class="col-6">
+									<div class="col-lg-6">
 										<form id="form-empfehlungNotiz">
 											<input type="hidden" name="anrechnung_id"
 												value="<?php echo $anrechnungData->anrechnung_id ?>">
@@ -333,7 +333,7 @@ $this->load->view(
 
 				<!-- Genehmigungssdaten -->
 				<div class="row">
-					<div class="col-12">
+					<div class="col-lg-12">
 						<div class="card my-4">
 							<div class="card-header">
 								<span

From e6ad3b3168b3d1d555977ec38a096a77fac24f2f Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 3 May 2024 10:35:46 +0200
Subject: [PATCH 0679/1461] adjust responsiveness of createAnrechnung.php

---
 application/views/lehre/anrechnung/createAnrechnung.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/views/lehre/anrechnung/createAnrechnung.php b/application/views/lehre/anrechnung/createAnrechnung.php
index d7fc3ece9..22af69a41 100644
--- a/application/views/lehre/anrechnung/createAnrechnung.php
+++ b/application/views/lehre/anrechnung/createAnrechnung.php
@@ -45,7 +45,7 @@ $this->load->view(
 
 		<!-- Title -->
 		<div class="row  my-4">
-			<div class="col-12 border-bottom">
+			<div class="col-lg-12 border-bottom">
 				<h3 class="fw-normal">
 					<?php echo $this->p->t('anrechnung', 'neueAnrechnung'); ?>
 					<small class="text-secondary fs-6">| <?php echo $this->p->t('global', 'antragAnlegen'); ?></small>
@@ -81,7 +81,7 @@ $this->load->view(
 
 		<!-- StudentInnen Table -->
 		<div class="row  my-4">
-			<div class="col-10">
+			<div class="col-lg-10">
 				<?php $this->load->view('lehre/anrechnung/createAnrechnungData.php'); ?>
 			</div>
 		</div>
@@ -91,7 +91,7 @@ $this->load->view(
 			<input name="studiensemester_kurzbz" id="studiensemester_kurzbz" type="hidden"
 				value="<?php echo $studiensemester_selected ?>">
 			<div class="row my-4">
-				<div class="col-10">
+				<div class="col-lg-10">
 					<table class="table table-condensed table-bordered mb-0">
 						<!-- StudentIn -->
 						<tr>
@@ -158,7 +158,7 @@ $this->load->view(
 			</div>
 
 			<div class="row my-4">
-				<div class="col-10">
+				<div class="col-lg-10">
 					<!-- Submit Button -->
 					<button class="btn btn-primary btn-w200 float-end" id="createAnrechnung-submit" type="submit"
 						value="submit">

From efcebb567f20a061c21347fd7625f40d8c9aae43 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 3 May 2024 10:46:20 +0200
Subject: [PATCH 0680/1461] responsive adjustments

---
 .../lehre/anrechnung/requestAnrechnung.php     | 18 +++++++++---------
 .../anrechnung/reviewAnrechnungUebersicht.php  |  4 ++--
 .../lehre/lehrauftrag/acceptLehrauftrag.php    | 12 ++++++------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/application/views/lehre/anrechnung/requestAnrechnung.php b/application/views/lehre/anrechnung/requestAnrechnung.php
index a4c33347a..7ef9a43de 100644
--- a/application/views/lehre/anrechnung/requestAnrechnung.php
+++ b/application/views/lehre/anrechnung/requestAnrechnung.php
@@ -73,7 +73,7 @@ $this->load->view(
     <div class="container-fluid">
         <!-- header -->
         <div class="row">
-            <div class="col-12 my-4 border-bottom">
+            <div class="col-lg-12 my-4 border-bottom">
                 <h3 class="fw-normal">
 					<?php echo $this->p->t('anrechnung', 'anerkennungNachgewiesenerKenntnisse'); ?>
                     <small class="text-secondary fs-6">| <?php echo $this->p->t('anrechnung', 'antragStellen'); ?></small>
@@ -86,7 +86,7 @@ $this->load->view(
             <div class="col-8">
 				<!-- Antragsdaten, Dokument Upload, Notiz-->
 				<div class="row mb-5">
-					<div class="col-12">
+					<div class="col-lg-12">
 						<form id="requestAnrechnung-form">
 							<input type="hidden" name="anrechnung_id" id="anrechnung_id" value="<?php echo $anrechnungData->anrechnung_id ?>">
 							<input type="hidden" name="lv_id" value="<?php echo $antragData->lv_id ?>">
@@ -96,7 +96,7 @@ $this->load->view(
                             <input type="hidden" name="sumEctsBeruflich" value="<?php echo $antragData->sumEctsBeruflich ?>">
                             <!-- Antragsdaten -->
 							<div class="row mb-3">
-								<div class="col-12">
+								<div class="col-lg-12">
 									<div class="card">
 										<div class="card-header">
 											<span class="text-uppercase fw-bold"><?php echo $this->p->t('anrechnung', 'antrag'); ?></span>&emsp;
@@ -165,7 +165,7 @@ $this->load->view(
 							</div>
 							<!-- Antrag mit Checkboxen -->
 							<div class="row mb-3">
-								<div class="col-12">
+								<div class="col-lg-12">
 									<div class="border border-dark border-3 rounded p-3" >
 										<p ><?php echo $this->p->t('anrechnung', 'antragStellenText'); ?></p>
 										
@@ -211,7 +211,7 @@ $this->load->view(
 							</div>
                             <!-- Begruendung ECTS -->
                             <div class="row mb-3">
-                                <div class="col-12">
+                                <div class="col-lg-12">
                                     <div class="card">
                                         <div class="card-header">
                                             <span class="fw-bold"><?php echo $this->p->t('anrechnung', 'begruendungEcts'); ?></span>&emsp;
@@ -230,7 +230,7 @@ $this->load->view(
                             </div>
                             <!-- Begruendung LV Inhalt -->
                             <div class="row mb-3">
-                                <div class="col-12">
+                                <div class="col-lg-12">
                                     <div class="card">
                                         <div class="card-header">
                                             <span class="fw-bold"><?php echo $this->p->t('anrechnung', 'begruendungLvinhalt'); ?></span>&emsp;
@@ -251,7 +251,7 @@ $this->load->view(
                             </div>
 							<!-- Dokument Upload-->
 							<div class="row mb-3">
-								<div class="col-12">
+								<div class="col-lg-12">
 									<div class="card">
 										<div class="card-header">
 											<span class="fw-bold"><?php echo $this->p->t('anrechnung', 'nachweisdokumente'); ?></span>&emsp;
@@ -283,7 +283,7 @@ $this->load->view(
 							</div>
 							<!-- Herkunft der Kenntnisse -->
 							<div class="row mb-3">
-								<div class="col-12">
+								<div class="col-lg-12">
 									
 											<div class="card">
 												<div class="card-header">
@@ -303,7 +303,7 @@ $this->load->view(
 							</div>
 							<!-- Bestaetigung-->
 							<div class="row mb-3">
-								<div class="col-12">
+								<div class="col-lg-12">
 									<div class="border border-3 rounded border-dark p-3" >
 										
 											<div class="form-check">
diff --git a/application/views/lehre/anrechnung/reviewAnrechnungUebersicht.php b/application/views/lehre/anrechnung/reviewAnrechnungUebersicht.php
index 7fd33a026..62b56647d 100644
--- a/application/views/lehre/anrechnung/reviewAnrechnungUebersicht.php
+++ b/application/views/lehre/anrechnung/reviewAnrechnungUebersicht.php
@@ -89,7 +89,7 @@ $this->load->view(
     <div class="container-fluid">
         <!-- title -->
         <div class="row">
-            <div class="col-12 my-4 border-bottom">
+            <div class="col-lg-12 my-4 border-bottom">
                 <h3 class="fw-normal">
                     <?php echo $this->p->t('anrechnung', 'anrechnungenPruefen'); ?>
                     <small class="text-secondary fs-6">|
@@ -99,7 +99,7 @@ $this->load->view(
         </div>
         <!-- dropdown studiensemester -->
         <div class="row">
-            <div class="col-12">
+            <div class="col-lg-12">
                 <form id="formReviewAnrechnungUebersicht" class="row align-items-center" action="" method="get">
                     <div class="col-auto">
                         <?php
diff --git a/application/views/lehre/lehrauftrag/acceptLehrauftrag.php b/application/views/lehre/lehrauftrag/acceptLehrauftrag.php
index 65ecd9ff6..0e8aa13cb 100644
--- a/application/views/lehre/lehrauftrag/acceptLehrauftrag.php
+++ b/application/views/lehre/lehrauftrag/acceptLehrauftrag.php
@@ -92,7 +92,7 @@ $this->load->view(
 
 		<!-- title & helper link -->
 		<div class="row">
-			<div class="col-12 page-header">
+			<div class="col-lg-12 page-header">
 				<a class="float-end" data-bs-toggle="collapse" href="#collapseHelp" aria-expanded="false" aria-controls="collapseExample">
 					<?php echo $this->p->t('ui', 'hilfeZuDieserSeite'); ?>
 				</a>
@@ -104,7 +104,7 @@ $this->load->view(
 
 		<!-- helper collapse module -->
 		<div class="row">
-			<div class="col-12 collapse my-4" id="collapseHelp">
+			<div class="col-lg-12 collapse my-4" id="collapseHelp">
 				<div class="card p-3">
 					
 					<?php $this->load->view('lehre/lehrauftrag/acceptLehrauftragHelp') ?>
@@ -114,7 +114,7 @@ $this->load->view(
 
 		<!-- dropdown widgets -->
 		<div class="row">
-			<div class="col-12">
+			<div class="col-lg-12">
 				<form id="formLehrauftrag" class="row align-items-center" action="" method="get">
 					<input type="hidden" id="uid" name="uid" value="<?php echo getAuthUID(); ?>">
 					<div class="col-auto">
@@ -139,7 +139,7 @@ $this->load->view(
 
 		<!-- tabulator data table 'Lehrauftraege annehmen'-->
 		<div class="row">
-			<div class="col-12">
+			<div class="col-lg-12">
 				<?php $this->load->view('lehre/lehrauftrag/acceptLehrauftragData.php'); ?>
 			</div>
 		</div>
@@ -209,7 +209,7 @@ $this->load->view(
 
 		<!-- collapse module with data table 'Stornierte Lehrauftraege' (collapsed by default until opened on buttonclick)-->
 		<div class="row">
-			<div class="col-12 collapse" id="collapseCancelledLehrauftraege">
+			<div class="col-lg-12 collapse" id="collapseCancelledLehrauftraege">
 				<h4>
 					<?php echo ucfirst($this->p->t('global', 'stornierteLehrauftraege')); ?>:
 					<small>
@@ -219,7 +219,7 @@ $this->load->view(
 					</small>
 				</h4>
 				<div class="row">
-					<div class="col-12">
+					<div class="col-lg-12">
 						<?php $this->load->view('lehre/lehrauftrag/cancelledLehrauftragData.php'); ?>
 					</div>
 				</div>

From 8663d86f7a686d6b50f08f2a7eb8c09f24122397 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 3 May 2024 10:59:41 +0200
Subject: [PATCH 0681/1461] adaption NotizComponent

---
 .../api/frontend/v1/notiz/Notiz.php           | 384 ------------------
 .../api/frontend/v1/notiz/NotizPerson.php     |  33 ++
 application/core/Notiz_Controller.php         |  79 ++--
 public/js/api/notiz/person.js                 |  21 +-
 public/js/components/Notiz/NotizComponent.js  |   2 +-
 .../Studentenverwaltung/Details/Notizen.js    |  72 ++--
 6 files changed, 128 insertions(+), 463 deletions(-)
 delete mode 100644 application/controllers/api/frontend/v1/notiz/Notiz.php
 create mode 100644 application/controllers/api/frontend/v1/notiz/NotizPerson.php

diff --git a/application/controllers/api/frontend/v1/notiz/Notiz.php b/application/controllers/api/frontend/v1/notiz/Notiz.php
deleted file mode 100644
index 2288766c4..000000000
--- a/application/controllers/api/frontend/v1/notiz/Notiz.php
+++ /dev/null
@@ -1,384 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use \DateTime as DateTime;
-
-class Notiz extends Notiz_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'getUid' => ['admin:r', 'assistenz:r'],
-			'getNotizen' => ['admin:r', 'assistenz:r'],
-			'loadNotiz' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
-			'addNewNotiz' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
-			'updateNotiz' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
-			'deleteNotiz' => ['admin:r', 'assistenz:r'],
-			'loadDokumente' => ['admin:r', 'assistenz:r'],
-			'getMitarbeiter' => ['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 getUid()
-		{
-			$this->terminateWithSuccess(getAuthUID());
-		}*/
-
-
-	public function getNotizen($id, $type)
-	{
-
-		//check if valid type
-		$result = $this->NotizzuordnungModel->isValidType($type);
-		if(isError($result))
-			$this->terminateWithError($result->retval, self::ERROR_TYPE_GENERAL);
-
-		//$this->terminateWithError(" after check type not valid", self::ERROR_TYPE_GENERAL);
-		$result = $this->NotizModel->getNotizWithDocEntries($id, $type);
-
-		if (isError($result)) {
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-		return $this->terminateWithSuccess(getData($result) ?: []);
-
-		//	return $this->terminateWithError("type not valid", self::ERROR_TYPE_GENERAL);
-
-	}
-
-	/*	public function loadNotiz()
-		{
-			$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-
-			$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
-				THEN public.tbl_notiz.updateamum ELSE public.tbl_notiz.insertamum END::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS lastUpdate");
-			$this->NotizModel->addLimit(1);
-
-			$result = $this->NotizModel->loadWhere(
-				array('notiz_id' => $notiz_id)
-			);
-			if (isError($result))
-			{
-				$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-			}
-			elseif (!hasData($result))
-			{
-				$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=>'Notiz_id']), self::ERROR_TYPE_GENERAL);
-			}
-			else
-			{
-				$this->terminateWithSuccess(current(getData($result)));
-			}
-		}
-
-
-		public function updateNotiz()
-		{
-			$this->load->library('form_validation');
-			$this->load->library('DmsLib');
-
-			if (isset($_POST['data']))
-			{
-				$data = json_decode($_POST['data']);
-				unset($_POST['data']);
-				foreach ($data as $k => $v) {
-					$_POST[$k] = $v;
-				}
-			}
-
-			$notiz_id = $this->input->post('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', [
-				'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Titel'])
-			]);
-
-			$this->form_validation->set_rules('text', 'Text', 'required', [
-				'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Text'])
-			]);
-
-			if ($this->form_validation->run() == false)
-			{
-				$this->terminateWithValidationErrors($this->form_validation->error_array());
-			}
-
-			//update Notiz
-			$uid = getAuthUID();
-			$titel = $this->input->post('titel');
-			$text = $this->input->post('text');
-			$verfasser_uid = $this->input->post('verfasser');
-			$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' => $notiz_id
-				],
-				[
-					'titel' =>  $titel,
-					'updatevon' => $uid,
-					'updateamum' => date('c'),
-					'text' => $text,
-					'verfasser_uid' => $verfasser_uid,
-					'bearbeiter_uid' => $bearbeiter_uid,
-					'start' => $start,
-					'ende' => $ende,
-					'erledigt' => $erledigt
-				]
-			);
-			if (isError($result))
-			{
-				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			}
-
-			//update(1) laden aller bereits mit dieser notiz_id verknüpften DMS-Einträge
-			$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
-			$this->NotizdokumentModel->addJoin('campus.tbl_dms_version', 'dms_id');
-			$dms_uploaded = null;
-
-			$result = $this->NotizdokumentModel->loadWhere(array('notiz_id' => $notiz_id));
-			if (isError($result))
-			{
-				$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			}
-			elseif (!hasData($result))
-			{
-				$dms_id_arr = null;
-			}
-			else
-			{
-				$result = getData($result);
-				foreach($result as $doc) {
-					$dms_id_arr[] = array(
-						'name' => $doc->name,
-						'dms_id' => $doc->dms_id
-					);
-				}
-			}
-
-			foreach ($_FILES as $k => $file)
-			{
-				//update(2) alle neuen files (alle außer type application/x.fhc-dms+json) anhängen
-				if($file["type"] == 'application/x.fhc-dms+json')
-				{
-					$dms_uploaded[] = array(
-						'name' => $file["name"]
-					);
-				}
-				else
-				{
-					$dms = array(
-						'kategorie_kurzbz'  => 'notiz',
-						'version'           => 0,
-						'name'              => $file["name"],
-						'mimetype'          => $file["type"],
-						'insertamum'        => date('c'),
-						'insertvon'         => $uid
-					);
-
-					//Todo(manu) check if filetypes weiter eingeschränkt werden sollen
-					//Todo(manu)check name files: nicht gleiches file 2mal hochladen
-					$result = $this->dmslib->upload($dms, $k, array('*'));
-
-					if (isError($result))
-					{
-						return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-					}
-					$dms_id = $result->retval['dms_id'];
-
-					$result = $this->NotizdokumentModel->insert(array('notiz_id' => $notiz_id, 'dms_id' => $dms_id));
-					if (isError($result))
-					{
-						return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-					}
-				}
-			}
-
-			//update(3) check if Dateien gelöscht wurden
-			if(count($dms_uploaded) != count($dms_id_arr))
-			{
-				if (count($dms_uploaded) == 0)
-				{
-					$filesDeleted = $dms_id_arr;
-				}
-				else
-				{
-					$upload_new_names = array_column($dms_uploaded, "name");
-
-					$filesDeleted = array_filter($dms_id_arr, function ($file) use ($upload_new_names) {
-						return !in_array($file["name"], $upload_new_names);
-					});
-				}
-
-				foreach ($filesDeleted as $file)
-				{
-					$result = $this->dmslib->removeAll($file['dms_id']);
-
-					if (isError($result))
-					{
-						return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-					}
-					else
-						$this->outputJson($result);
-				}
-			}
-			return $this->terminateWithSuccess($result);
-		}*/
-
-
-	/*	public function deleteNotiz()
-		{
-			$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-			$notiz_id = $this->input->post('notiz_id');
-			$type = $this->input->post('type_id');
-			$id = $this->input->post('id');
-
-			//dms_id auslesen aus notizdokument wenn vorhanden
-			$dms_id_arr = [];
-			$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
-
-			$result = $this->NotizdokumentModel->loadWhere(array('notiz_id' => $notiz_id));
-
-			if (isError($result))
-			{
-				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			}
-
-			if(hasData($result))
-			{
-				$result = getData($result);
-				foreach ($result as $doc) {
-					$dms_id_arr[] = $doc->dms_id;
-				}
-			}
-
-			if($dms_id_arr)
-			{
-				$this->load->library('DmsLib');
-				foreach($dms_id_arr as $dms_id)
-				{
-					$result = $this->dmslib->removeAll($dms_id);
-
-					if (isError($result))
-					{
-						return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-					}
-
-					$this->outputJson($result);
-				}
-			}
-
-			//delete Notizzuordnung
-			if($type == "software_id")
-			{
-				// Loads extension Model
-				$this->load->model('extensions/FHC-Core-Softwarebereitstellung/Softwarenotizzuordnung_model', 'ExtensionnotizzuordnungModel');
-				$result = $this->ExtensionnotizzuordnungModel->delete([
-					'notiz_id' => $notiz_id,
-					'id' => strval($id)
-					],
-					[
-					'type_id' => $type
-				]);
-
-			}
-			else
-			{
-				//notizzuordnungsid!
-				$result = $this->NotizzuordnungModel->delete(['notiz_id' => $notiz_id, $type => $id]);
-			}
-
-
-			$this->load->model('person/Notiz_model', 'NotizModel');
-			//$this->NotizModel->addJoin('public.tbl_notizzuordnung', 'notiz_id');
-
-			//TODO (erweitern um Type_id) für Extensions, damit auch Notizzuordnung gelöscht werden kann
-
-			//Löschen von Notiz
-			$result = $this->NotizModel->delete(
-				array('notiz_id' => $notiz_id)
-			);
-
-			if (isError($result))
-			{
-				return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-			}
-			if(!hasData($result))
-			{
-				return $this->terminateWithError($this->p->t('ui','error_missingId', ['id'=> 'Notiz_id']), self::ERROR_TYPE_GENERAL);
-			}
-
-			return $this->terminateWithSuccess(current(getData($result)));
-		}*/
-
-	/*	public function loadDokumente()
-		{
-			$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-			$notiz_id = $this->input->post('notiz_id');
-
-			$this->NotizModel->addSelect('campus.tbl_dms_version.*');
-
-			$this->NotizModel->addJoin('public.tbl_notiz_dokument', 'ON (public.tbl_notiz_dokument.notiz_id = public.tbl_notiz.notiz_id)');
-			$this->NotizModel->addJoin('campus.tbl_dms_version', 'ON (public.tbl_notiz_dokument.dms_id = campus.tbl_dms_version.dms_id)');
-
-			$result = $this->NotizModel->loadWhere(
-				array('public.tbl_notiz.notiz_id' => $notiz_id)
-			);
-			if (isError($result)) {
-				return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-			}
-
-			if(!hasData($result))
-			{
-				return $this->terminateWithError($this->p->t('ui','error_missingId', ['id'=> 'Notiz_id']), self::ERROR_TYPE_GENERAL);
-			}
-			return $this->terminateWithSuccess(getData($result));
-		}*/
-
-	/*	public function getMitarbeiter($searchString)
-		{
-			$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
-			$result = $this->MitarbeiterModel->searchMitarbeiter($searchString);
-			if (isError($result)) {
-				$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-			}
-			return $this->terminateWithSuccess($result);
-		}*/
-
-	public function isBerechtigt($id, $typeId)
-	{
-		if(!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
-		{
-			$result =  $this->p->t('lehre','error_keineSchreibrechte');
-
-			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-		return success("berechtigt in überschreibender Funktion");
-		/*		return $this->terminateWithError('keine Berechtigung bro', self::ERROR_TYPE_GENERAL);*/
-	}
-
-}
\ No newline at end of file
diff --git a/application/controllers/api/frontend/v1/notiz/NotizPerson.php b/application/controllers/api/frontend/v1/notiz/NotizPerson.php
new file mode 100644
index 000000000..2cf1f2519
--- /dev/null
+++ b/application/controllers/api/frontend/v1/notiz/NotizPerson.php
@@ -0,0 +1,33 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+
+class NotizPerson extends Notiz_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'isBerechtigt' => ['admin:r', 'assistenz:r'],
+		]);
+	}
+
+	public function isBerechtigt($id, $typeId)
+	{
+		if($typeId != "person_id")
+		{
+			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');
+
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+
+		return $this->outputJsonSuccess(true);
+	}
+}
\ No newline at end of file
diff --git a/application/core/Notiz_Controller.php b/application/core/Notiz_Controller.php
index 51d6854b7..8a93c4f0f 100644
--- a/application/core/Notiz_Controller.php
+++ b/application/core/Notiz_Controller.php
@@ -10,19 +10,20 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'getUid' => ['admin:r', 'assistenz:r'],
-			'getNotizen' => ['admin:r', 'assistenz:r'],
-			'loadNotiz' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
-			'addNewNotiz' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
-			'updateNotiz' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
-			'deleteNotiz' => ['admin:r', 'assistenz:r'],
-			'loadDokumente' => ['admin:r', 'assistenz:r'],
-			'getMitarbeiter' => ['admin:r', 'assistenz:r'],
-			'isBerechtigt' => ['admin:r', 'assistenz:r']
+			'getUid' => self::PERM_LOGGED,
+			'getNotizen' => self::PERM_LOGGED,
+			'loadNotiz' => self::PERM_LOGGED,
+			'addNewNotiz' => self::PERM_LOGGED,
+			'updateNotiz' => self::PERM_LOGGED,
+			'deleteNotiz' => ['admin:w', 'assistenz:w'],
+			'loadDokumente' => ['admin:w', 'assistenz:w'],
+			'getMitarbeiter' => self::PERM_LOGGED,
+			'isBerechtigt' => self::PERM_LOGGED,
 		]);
 
 		//Load Models
 		$this->load->model('person/Notiz_model', 'NotizModel');
+		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
 
 		// Load Libraries
 		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
@@ -39,7 +40,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 	}
 
 
-	//Standardfall: für extensions überschreiben: speichern der Zuordnung in eigene Extensiontabelle angeben
+	//Override function for extensions
 	protected function assignNotiz($notiz_id, $id, $type)
 	{
 		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
@@ -55,7 +56,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		return success(getData($result));
 	}
 
-	//Standardfall: für extensions überschreiben: speichern der Zuordnung in eigene Extensiontabelle angeben
+	//Override function for extensions
 	protected function deleteNotizzuordnung($notiz_id, $id, $type)
 	{
 		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
@@ -72,11 +73,23 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 	}
 
 
+	//Override function for extensions
+	public function getNotizen($id, $type)
+	{
+		$result = $this->NotizzuordnungModel->isValidType($type);
+		if(isError($result))
+			$this->terminateWithError($result->retval, self::ERROR_TYPE_GENERAL);
 
-	//TODO(manu) abstract
-	protected function getNotizen($id, $type) {}
+		$result = $this->NotizModel->getNotizWithDocEntries($id, $type);
 
-	//TODO(manu) to abstract
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess(getData($result) ?: []);
+	}
+
+
+	//Override function
 	protected function isBerechtigt($id, $typeId){
 		return $this->terminateWithError("in abstract function: define right in extension", self::ERROR_TYPE_GENERAL);
 	}
@@ -144,7 +157,8 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		$titel = $this->input->post('titel');
 		$text = $this->input->post('text');
 		$erledigt = $this->input->post('erledigt');
-		$verfasser_uid = isset($_POST['verfasser_uid']) ? $_POST['verfasser_uid'] : $uid;
+		$verfasser_uid = isset($_POST['verfasser']) ? $_POST['verfasser'] : $uid;
+		//$verfasser_uid = isset($_POST['verfasser_uid']) ? $_POST['verfasser_uid'] : $uid;
 		$bearbeiter_uid = isset($_POST['bearbeiter_uid']) ? $_POST['bearbeiter_uid'] : null;
 		$type = $this->input->post('typeId');
 		$start = $this->input->post('start');
@@ -153,7 +167,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		// Start DB transaction
 		$this->db->trans_start();
 
-		//Speichern der Notiz
+		//Save note
 		$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));
 
@@ -165,7 +179,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 
 		$notiz_id = $result->retval;
 
-		//Speichern der Notizzuordnung
+		//save Notizzuordnung
 		$result = $this->assignNotiz($notiz_id, $id, $type);
 
 		if (isError($result))
@@ -174,7 +188,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 		}
 
-		//Speichern der Dokumente
+		//save Documents
 		$dms_id_arr = [];
 		foreach ($_FILES as $k => $file)
 		{
@@ -189,6 +203,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 
 			//Todo(manu) check if filetypes weiter eingeschränkt werden sollen
 			//Todo(manu)check name files: nicht gleiches file 2mal hochladen
+			//Todo define in dms component: readFile, downloadFile
 			$result = $this->dmslib->upload($dms, $k, ['*']);
 			/*			$result = $this->dmslib->upload($dms, $k, ['application/pdf','application/x.fhc-dms+json']);*/
 			if (isError($result))
@@ -199,10 +214,9 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 			$dms_id_arr[] = $result->retval['dms_id'];
 		}
 
-		//Eintrag in Notizdokument speichern
+		//save entry in Notizdokument
 		if($dms_id_arr)
 		{
-			// Loads model Notizdokument_model
 			$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
 			foreach($dms_id_arr as $dms_id)
 			{
@@ -257,8 +271,8 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		$uid = getAuthUID();
 		$titel = $this->input->post('titel');
 		$text = $this->input->post('text');
-		$verfasser_uid = $this->input->post('verfasser_uid');
-		$bearbeiter_uid = isset($_POST['bearbeiter_uid']) ? $_POST['bearbeiter_uid'] : $uid;
+		$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');
@@ -284,7 +298,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 		}
 
-		//update(1) laden aller bereits mit dieser notiz_id verknüpften DMS-Einträge
+		//update(1) loading all dms-entries with this notiz_id
 		$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
 		$this->NotizdokumentModel->addJoin('campus.tbl_dms_version', 'dms_id');
 		$dms_uploaded = null;
@@ -311,7 +325,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 
 		foreach ($_FILES as $k => $file)
 		{
-			//update(2) alle neuen files (alle außer type application/x.fhc-dms+json) anhängen
+			//update(2) attach all new files (except type application/x.fhc-dms+json)
 			if($file["type"] == 'application/x.fhc-dms+json')
 			{
 				$dms_uploaded[] = array(
@@ -331,6 +345,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 
 				//Todo(manu) check if filetypes weiter eingeschränkt werden sollen
 				//Todo(manu)check name files: nicht gleiches file 2mal hochladen
+				//Todo define in dms component: readFile, downloadFile
 				$result = $this->dmslib->upload($dms, $k, array('*'));
 
 				if (isError($result))
@@ -347,7 +362,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 			}
 		}
 
-		//update(3) check if Dateien gelöscht wurden
+		//update(3) check if all files have been deleted
 		if(count($dms_uploaded) != count($dms_id_arr))
 		{
 			if (count($dms_uploaded) == 0)
@@ -387,12 +402,9 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		$typeId = $this->input->post('type_id');
 		$id = $this->input->post('id');
 
-		if(!$this->isBerechtigt($id, $typeId))
-		{
-			$this->terminateWithError($this->p->t('ui', 'keineBerechtigung'), self::ERROR_TYPE_GENERAL);
-		}
+		//TODO(manu): define Permissions for deletion document if filecomponent finished
 
-		//dms_id auslesen aus notizdokument wenn vorhanden
+		//get dms_id from notizdokument
 		$dms_id_arr = [];
 		$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
 
@@ -416,7 +428,6 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 			// Start DB transaction
 			$this->db->trans_start();
 
-			//return $this->terminateWithError("dms_id kommt: " . $notiz_id, self::ERROR_TYPE_GENERAL);
 			$this->load->library('DmsLib');
 
 
@@ -444,7 +455,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 
 		$this->load->model('person/Notiz_model', 'NotizModel');
 
-		//Löschen von Notiz
+		//Delete Note
 		$result = $this->NotizModel->delete(
 			array('notiz_id' => $notiz_id)
 		);
@@ -465,10 +476,6 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 
 	public function loadDokumente()
 	{
-		if(!$this->isBerechtigt('$id', '$typeId'))
-		{
-			$this->terminateWithError($this->p->t('ui', 'keineBerechtigung'), self::ERROR_TYPE_GENERAL);
-		}
 		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
 		$notiz_id = $this->input->post('notiz_id');
 
diff --git a/public/js/api/notiz/person.js b/public/js/api/notiz/person.js
index be19b4ed9..de351b68b 100644
--- a/public/js/api/notiz/person.js
+++ b/public/js/api/notiz/person.js
@@ -1,38 +1,41 @@
 export default {
-	getNotizen(url, config, params){
-		return this.$fhcApi.get('api/frontend/v1/notiz/notiz/getNotizen/' + params.id + '/' + params.type);
+	getNotizen (url, config, params){
+		return this.$fhcApi.get('api/frontend/v1/notiz/notizPerson/getNotizen/' + params.id + '/' + params.type);
 	},
 	getUid(){
-		return this.$fhcApi.get('api/frontend/v1/notiz/notiz/getUid/');
+		return this.$fhcApi.get('api/frontend/v1/notiz/notizPerson/getUid/');
 	},
 	addNewNotiz(id, formData) {
-		return this.$fhcApi.post('api/frontend/v1/notiz/notiz/addNewNotiz/' + id,
+		return this.$fhcApi.post('api/frontend/v1/notiz/notizPerson/addNewNotiz/' + id,
 			formData
 		);
 	},
 	loadNotiz(notiz_id){
-		return this.$fhcApi.post('api/frontend/v1/notiz/notiz/loadNotiz/', {
+		return this.$fhcApi.post('api/frontend/v1/notiz/notizPerson/loadNotiz/', {
 			notiz_id
 		});
 	},
 	loadDokumente(notiz_id){
-		return this.$fhcApi.post('api/frontend/v1/notiz/notiz/loadDokumente/', {
+		return this.$fhcApi.post('api/frontend/v1/notiz/notizPerson/loadDokumente/', {
 			notiz_id
 		});
 	},
 	deleteNotiz(notiz_id, type_id, id){
-		return this.$fhcApi.post('api/frontend/v1/notiz/notiz/deleteNotiz/', {
+		return this.$fhcApi.post('api/frontend/v1/notiz/notizPerson/deleteNotiz/', {
 			notiz_id,
 			type_id,
 			id
 		});
 	},
 	updateNotiz(notiz_id, formData){
-		return this.$fhcApi.post('api/frontend/v1/notiz/notiz/updateNotiz/' + notiz_id,
+		return this.$fhcApi.post('api/frontend/v1/notiz/notizPerson/updateNotiz/' + notiz_id,
 			formData
 		);
 	},
 	getMitarbeiter(event){
-		return this.$fhcApi.get('api/frontend/v1/notiz/notiz/getMitarbeiter/' + event);
+		return this.$fhcApi.get('api/frontend/v1/notiz/notizPerson/getMitarbeiter/' + event);
+	},
+	isBerechtigt(id, type_id){
+		return this.$fhcApi.get('api/frontend/v1/notiz/notizPerson/isBerechtigt/');
 	}
 }
\ No newline at end of file
diff --git a/public/js/components/Notiz/NotizComponent.js b/public/js/components/Notiz/NotizComponent.js
index 185e7193d..50677c6a3 100644
--- a/public/js/components/Notiz/NotizComponent.js
+++ b/public/js/components/Notiz/NotizComponent.js
@@ -1036,4 +1036,4 @@ export default {
 </div>
 <br>
 `,
-}
+}
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
index 4c128bfea..185b8d0d5 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
@@ -11,20 +11,6 @@ export default {
 	<div class="stv-details-details h-100 pb-3">
 		<h3>Notizen</h3>
 		
-		<!--oldversion ohne factory-->
-<!--		<NotizComponent
-			endpoint="api/frontend/v1/stv/Notiz/"
-			ref="formc"
-			typeId="person_id"
-			:id="modelValue.person_id"
-			notizLayout="twoColumnsFormLeft"
-			:showErweitert="true"
-			:showDocument="true"
-			:showTinyMCE="false"
-			:visibleColumns="['titel','text','verfasser','bearbeiter','dokumente']"
-			>
-		</NotizComponent>-->
-	
 <!--	mit factory als endpoint	-->
 		<NotizComponent
 			:endpoint="$fhcApi.factory.notiz.person"
@@ -32,18 +18,29 @@ export default {
 			typeId="person_id"
 			:id="modelValue.person_id"
 			notizLayout="twoColumnsFormLeft"
-			:showErweitert="true"
+			:showErweitert="false"
 			:showDocument="true"
-			:showTinyMCE="true"
+			:showTinyMCE="false"
 			:visibleColumns="['titel','text','verfasser','bearbeiter','dokumente']"
 			>
 		</NotizComponent>
 		
+	
 <!--		
 ---------------------------------------------------------------------------------------------
 -------------------- DESCRIPTION FOR PARAMETER PROPS ----------------------------------------
 ---------------------------------------------------------------------------------------------
 
+endpoint: for corecontroller: eg: :endpoint="$fhcApi.factory.notiz.person"
+(...prestudent, ...mitarbeiter, ...bestellung, ...lehreinheit, ...projekt, ...projektphase, ...projekttask, ...anrechnung)
+
+for extensions: write own controller extending core NotizController
+
+ref="formc"
+
+typeId: id to which table the notizdata should be connected... eg. person_id, prestudent_id, uid (for mitarbeiter_uid), projekt_kurzbz, projektphase_id, projekttask_id,
+	bestellung_id, lehreinheit_id, anrechnung_id
+
 notizLayout: "classicFas", "twoColumnsFormLeft", twoColumnsFormRight"
 
 showErweitert: if true: section with following fields will be displayed:
@@ -53,12 +50,9 @@ showDocument: if true: section with documentHandling will be displayed
 
 showTinyMCE: if true: section with WYSIWYG Editor for Text will be displayed
 
-typeId: id to which table the notizdata should be connected... eg. person_id, prestudent_id, mitarbeiter_uid, projekt_kurzbz, projektphase_id, projekttask_id,
-	bestellung_id, lehreinheit_id, anrechnung_id, uid  
-	in progress for extensions
-
 visibleColumns: list, which fields shoult be showed as default in filter component
 		fullVersion: :visibleColumns="['titel','text','bearbeiter','verfasser','von','bis','dokumente','erledigt','notiz_id','notizzuordnung_id','id','lastupdate']"
+		
 
 ---------------------------------------------------------------------------------------------
 ---------------------------------------------------------------------------------------------	
@@ -74,30 +68,42 @@ visibleColumns: list, which fields shoult be showed as default in filter compone
 ---------------------------------------------------------------------------------------------
 
 
-<br><br>
-		<h3>Test prestudentId</h3>
 		<NotizComponent
+			:endpoint="$fhcApi.factory.notiz.mitarbeiter"
 			ref="formc"
-			typeId="prestudent_id"
-			:id="modelValue.prestudent_id"
+			typeId="uid"
+			:id= "'ma0068'"
+			notizLayout="twoColumnsFormLeft"
+			:showErweitert="true"
+			:showDocument="true"
+			:showTinyMCE="false"
+			:visibleColumns="['titel','text','verfasser','bearbeiter','dokumente']"
 			>
 		</NotizComponent>
 		
-		<br><br>
-		<h3>Test mitarbeiter_uid</h3>
 		<NotizComponent
+			:endpoint="$fhcApi.factory.notiz.prestudent"
 			ref="formc"
-			typeId="uid"
-			:id="'ma0068'"
+			typeId="prestudent_id"
+			:id="modelValue.prestudent_id"
+			notizLayout="twoColumnsFormLeft"
+			:showErweitert="true"
+			:showDocument="true"
+			:showTinyMCE="true"
+			:visibleColumns="['titel','text','verfasser','bearbeiter','dokumente']"
 			>
-		</NotizComponent>-->
-		
-<!--		<br><br>
-		<h3>Test projekt</h3>
+		</NotizComponent>
+				
 		<NotizComponent
+			:endpoint="$fhcApi.factory.notiz.projekt"
 			ref="formc"
 			typeId="projekt_kurzbz"
-			:id="'Studentenausweis'"
+			:id="'EA74'" 
+			notizLayout="twoColumnsFormLeft"
+			:showErweitert="true"
+			:showDocument="true"
+			:showTinyMCE="true"
+			:visibleColumns="['titel','text','verfasser','bearbeiter','dokumente']"
 			>
 		</NotizComponent>-->
 		

From d1b813b1cc0639ef43b0c9b6e33ee7eb453624b5 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 3 May 2024 16:53:31 +0200
Subject: [PATCH 0682/1461] update editStatus: getHistory, setAbbrecher,
 dropdown newStatus, validations

---
 .../api/frontend/v1/stv/Status.php            | 106 +++++++++---------
 .../api/frontend/v1/stv/Student.php           |   1 +
 application/models/crm/Prestudent_model.php   |   2 +-
 .../models/crm/Prestudentstatus_model.php     |  11 +-
 .../education/Studentlehrverband_model.php    |  11 +-
 .../Studentenverwaltung/Details/Prestudent.js |   4 +-
 .../Details/Prestudent/MultiStatus.js         |  58 ++--------
 7 files changed, 85 insertions(+), 108 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 24986429d..1bda564fa 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -11,9 +11,9 @@ class Status extends FHCAPI_Controller
 		parent::__construct([
 			'getHistoryPrestudent' => ['admin:r', 'assistenz:r'],
 			'addNewStatus' => ['admin:r', 'assistenz:r', 'student/keine_studstatuspruefung'],
-			'getStatusgruende' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
-			'getLastBismeldestichtag' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
-			'isLastStatus' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
+			'getStatusgruende' => self::PERM_LOGGED,
+			'getLastBismeldestichtag' => self::PERM_LOGGED,
+			'isLastStatus' => self::PERM_LOGGED,
 			'deleteStatus' => ['admin:r','assistenz:r'],
 			'loadStatus' => ['admin:r', 'assistenz:r'],
 			'updateStatus' => ['admin:r', 'assistenz:r'],
@@ -98,7 +98,7 @@ class Status extends FHCAPI_Controller
 		//Variablen für Statuscheck
 		$stg = $result->studiengang_kz;
 		$reihungstest_angetreten = $result->reihungstestangetreten;
-		$name = trim($result->vorname . " ". $result->nachname);
+		//$name = trim($result->vorname . " ". $result->nachname);
 		$zgv_code = $result->zgv_code;
 
 		$isStudent = false;
@@ -124,6 +124,7 @@ class Status extends FHCAPI_Controller
 		$statusgrund_id = $this->input->post('statusgrund_id');
 		$rt_stufe = $this->input->post('rt_stufe');
 		$bestaetigtvon = $uid;
+		$name = $this->input->post('name');
 
 		//GET lastStatus
 		$result = $this->PrestudentstatusModel->getLastStatus($prestudent_id);
@@ -140,7 +141,6 @@ class Status extends FHCAPI_Controller
 			$lastStatusData = current(getData($result));
 
 		//Different handling depending on newStatus
-		//Todo(manu) check later with multiactions
 		/*		if($status_kurzbz == 'Absolvent' || $status_kurzbz == 'Diplomand')
 				{
 					//$studiensemester = $semester_aktuell;
@@ -163,45 +163,36 @@ class Status extends FHCAPI_Controller
 		if (isError($result))
 		{
 			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-/*			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson(getError($result));*/
 		}
 		if($result->retval == '1')
 		{
-/*			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson($result->code);*/
-			return $this->terminateWithError($this->p->t('lehre','error_rolleBereitsVorhanden'), self::ERROR_TYPE_GENERAL);
-			//return $this->terminateWithError("test error_rolleBereitsVorhanden", self::ERROR_TYPE_GENERAL);
+			return $this->terminateWithError($name . ": " . $this->p->t('lehre','error_rolleBereitsVorhanden'), self::ERROR_TYPE_GENERAL);
 		}
 
 
 		//Check Reihungstest
-		//TODO(manu) erst später für multiactions releveant
+		//TODO(manu) test
 		if(REIHUNGSTEST_CHECK)
 		{
 			if($status_kurzbz=='Bewerber' && !$reihungstest_angetreten)
 			{
-/*				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson($name . ": Um einen Interessenten zum Bewerber zu machen, muss die Person das Reihungstestverfahren abgeschlossen haben");*/
 				return $this->terminateWithError($this->p->t('lehre','error_keinReihungstestverfahren', $name), self::ERROR_TYPE_GENERAL);
 			}
 		}
 
 		//Check ZGV
-		//TODO(manu) erst später für multiactions releveant
+		//TODO(manu) test
 		if(!defined("ZGV_CHECK") || ZGV_CHECK)
 		{
 			if($status_kurzbz=='Bewerber' && $zgv_code=='')
 			{
-/*				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson($name . ": Um einen Interessenten zum Bewerber zu machen, muss die Zugangsvoraussetzung eingetragen sein.");*/
 				return $this->terminateWithError($this->p->t('lehre','error_ZGVNichtEingetragen', $name), self::ERROR_TYPE_GENERAL);
 
 			}
 		}
 
 		//Check ZGV-Master
-		//TODO(manu) erst später für multiactions releveant
+		//TODO(manu) test
 		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
 		$result = $this->StudiengangModel->load([
 			'studiengang_kz'=> $stg
@@ -218,8 +209,6 @@ class Status extends FHCAPI_Controller
 		{
 			if($status_kurzbz=='Bewerber' && $zgv_code=='' && $typ=='m')
 			{
-/*				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson($name . ": Um einen Interessenten zum Bewerber zu machen, muss die Zugangsvoraussetzung Master eingetragen sein.");*/
 				return $this->terminateWithError($this->p->t('lehre','error_ZGVMasterNichtEingetragen', $name), self::ERROR_TYPE_GENERAL);
 			}
 		}
@@ -246,8 +235,8 @@ class Status extends FHCAPI_Controller
 		}
 
 		//check if studentrolle already exists
-		//TODO(manu) eigener Code für Diplomand?
-		if($status_kurzbz == 'Student' || $status_kurzbz == 'Diplomand')
+		//TODO(manu) refactor and test
+		if($status_kurzbz == 'Student' || $status_kurzbz == 'Diplomand' || $lastStatusData->status_kurzbz == 'Student')
 		{
 			$this->load->model('crm/Student_model', 'StudentModel');
 			$result = $this->StudentModel->checkIfExistingStudentRolle($prestudent_id);
@@ -257,8 +246,6 @@ class Status extends FHCAPI_Controller
 			}
 			if($result->retval == "0")
 			{
-/*				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson($result->code);*/
 				return $this->terminateWithError($this->p->t('lehre','error_noStudstatus'), self::ERROR_TYPE_GENERAL);
 			}
 			if($result->retval != "0")
@@ -281,8 +268,10 @@ class Status extends FHCAPI_Controller
 				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 			}
 
+			//return $this->terminateWithError($name, self::ERROR_TYPE_GENERAL);
 			$result = $this->PrestudentstatusModel->checkIfValidStatusHistory(
 				$prestudent_id,
+				$name,
 				$status_kurzbz,
 				$studiensemester_kurzbz,
 				$new_status_datum,
@@ -363,8 +352,8 @@ class Status extends FHCAPI_Controller
 			$studiengang_kz = $studentData->studiengang_kz;
 
 			//Handle Abbrecher and Unterbrecher
-			//TODO (manu) implement later with multiactions
-			// not active yet: works only for "status ändern" in FAS
+			//TODO(manu) for addStatus unterbrecher: valdidaton of ausbildungssemester 0 (default = 1)
+			//right now: just commented out
 			if($status_kurzbz == 'Abbrecher' || $status_kurzbz == 'Unterbrecher')
 						{
 							$ausbildungssemester = 0;
@@ -385,43 +374,59 @@ class Status extends FHCAPI_Controller
 			if ($this->db->trans_status() === false || isError($result))
 			{
 				$this->db->trans_rollback();
-/*				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson($result->code);*/
 				return $this->terminateWithError($this->p->t('lehre','error_duringInsertUpdateLehrverband'), self::ERROR_TYPE_GENERAL);
 			}
 
 			//Student updaten (fuer Abbrecher und Unterbrecher)
-			//not active yet: works only for "status ändern" in FAS
-			//Todo(Manu) Later for multiactions
-
+			//implemented for multiaction "status ändern"
+			//TODO(Manu) implement also for newStatus
 
 			if($status_kurzbz == 'Abbrecher' || $status_kurzbz == 'Unterbrecher')
 			{
 				$result = $this->StudentModel->update(
-								[
-									'student_uid' => $student_uid
-								],
-								[
-									'studiengang_kz' => $studiengang_kz,
-									'semester' => $ausbildungssemester,
-									'verband' => $verband,
-									'gruppe' => $gruppe,
-									'updateamum' => date('c'),
-									'updatevon' => $uid
-							]);
-							if ($this->db->trans_status() === false || isError($result))
-							{
-								$this->db->trans_rollback();
-								$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-								return $this->outputJson($result->code);
-							}
+					[
+						'student_uid' => $student_uid
+					],
+					[
+						'studiengang_kz' => $studiengang_kz,
+						'semester' => $ausbildungssemester,
+						'verband' => $verband,
+						'gruppe' => $gruppe,
+						'updateamum' => date('c'),
+						'updatevon' => $uid
+				]);
+				if ($this->db->trans_status() === false || isError($result))
+				{
+					$this->db->trans_rollback();
+					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 				}
 
+				// detailtab: set active to false if abbrecher
+				if($status_kurzbz == 'Abbrecher')
+				{
+
+					$this->load->model('person/Benutzer_model', 'BenutzerModel');
+					$result = $this->BenutzerModel->update(
+						[
+							'uid' => $student_uid
+						],
+						[
+							'aktiv' => false,
+							'updateaktivam' => date('Y-m-d'),
+							'updateaktivvon' => $uid
+						]);
+					if ($this->db->trans_status() === false || isError($result))
+					{
+						$this->db->trans_rollback();
+						return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+					}
+				}
+
+			}
 		}
 
 		$this->db->trans_commit();
 
-		//return $this->outputJsonSuccess($prestudent_id);
 		$this->terminateWithSuccess($prestudent_id);
 	}
 
@@ -1013,10 +1018,11 @@ class Status extends FHCAPI_Controller
 
 			$result = $this->PrestudentstatusModel->checkIfValidStatusHistory(
 				$prestudent_id,
+				'',
 				$status_kurzbz,
 				$studiensemester_kurzbz,
 				$datum,
-				$ausbildungssemester
+				$ausbildungssemesteR
 			);
 			if (isError($result))
 			{
diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php
index 31fc7075c..62a6b3e95 100644
--- a/application/controllers/api/frontend/v1/stv/Student.php
+++ b/application/controllers/api/frontend/v1/stv/Student.php
@@ -133,6 +133,7 @@ class Student extends FHCAPI_Controller
 		
 		$result = $this->udflib->getCiValidations($this->PersonModel, $this->input->post());
 
+		//TODO(Manu) check with Chris: input number not allowed
 		$fieldValidations = $this->getDataOrTerminateWithError($result);
 
 		$this->form_validation->set_rules($fieldvalidations);
diff --git a/application/models/crm/Prestudent_model.php b/application/models/crm/Prestudent_model.php
index e045eaf84..0b198bb7d 100644
--- a/application/models/crm/Prestudent_model.php
+++ b/application/models/crm/Prestudent_model.php
@@ -739,7 +739,7 @@ class Prestudent_model extends DB_Model
 					ps.status_kurzbz, 
 					ps.studiensemester_kurzbz, 
 					ps.ausbildungssemester,
-					CASE WHEN ps.status_kurzbz IN ('Student', 'Diplomand')
+					CASE WHEN ps.status_kurzbz IN ('Student', 'Diplomand','Abbrecher','Unterbrecher')
 					THEN CONCAT(lv.semester, lv.verband, lv.gruppe)
 					ELSE ''
 					END AS lehrverband, 
diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php
index cad3f1b91..44e1d9e65 100644
--- a/application/models/crm/Prestudentstatus_model.php
+++ b/application/models/crm/Prestudentstatus_model.php
@@ -496,8 +496,9 @@ class Prestudentstatus_model extends DB_Model
 	 * @param integer $prestudent_id
 	 * @return error if not valid, array StatusArr if valid
 	 */
-	public function checkIfValidStatusHistory($prestudent_id, $status_kurzbz, $new_status_studiensemester_kurzbz, $new_status_datum, $new_status_ausbildungssemester, $old_status_studiensemester_kurzbz = '', $old_status_ausbildungssemester = '')
+	public function checkIfValidStatusHistory($prestudent_id, $nameStud, $status_kurzbz, $new_status_studiensemester_kurzbz, $new_status_datum, $new_status_ausbildungssemester, $old_status_studiensemester_kurzbz = '', $old_status_ausbildungssemester = '')
 	{
+		$name = ($nameStud != '') ? $nameStud . ": " : '';
 		//$isNewStatus = $this->checkIfNewStatus($prestudent_id,  $status_kurzbz);
 		$isNewStatus =  $old_status_studiensemester_kurzbz == '' && $old_status_ausbildungssemester == '';
 
@@ -581,7 +582,7 @@ class Prestudentstatus_model extends DB_Model
 			// Abbrecher- oder Absolventenstatus muss Endstatus sein
 			if (isset($next_status) && in_array($curr_status_kurzbz, $endstatusArr)) {
 
-				return error("Nach Abbrecher- und Absolventenstatus darf kein anderer Status mehr eingetragen werden");
+				return error($name . "Nach Abbrecher- und Absolventenstatus darf kein anderer Status mehr eingetragen werden");
 			}
 
 			// wenn Unterbrecher auf Unterbrecher folgt, muss Ausbildungssemester gleich sein
@@ -590,7 +591,7 @@ class Prestudentstatus_model extends DB_Model
 				&& $curr_status_ausbildungssemester != $next_status->ausbildungssemester
 			)
 			{
-				return error("Aufeinanderfolgende Unterbrecher müssen gleiches Ausbildungssemester haben");
+				return error($name . "Aufeinanderfolgende Unterbrecher müssen gleiches Ausbildungssemester haben");
 			}
 
 			// wenn Abbrecher auf Unterbrecher folgt, muss Ausbildungssemester gleich sein
@@ -599,7 +600,7 @@ class Prestudentstatus_model extends DB_Model
 				&& $next_status->status_kurzbz == 'Abbrecher' && $curr_status_ausbildungssemester != $next_status->ausbildungssemester
 			)
 			{
-				return error("Unterbrecher und folgender Abbrecher müssen gleiches Ausbildungssemester haben");
+				return error($name ."Unterbrecher und folgender Abbrecher müssen gleiches Ausbildungssemester haben");
 			}
 
 			// keine Studenten nach Diplomand Status
@@ -607,7 +608,7 @@ class Prestudentstatus_model extends DB_Model
 				isset($next_status) && $curr_status_kurzbz == 'Diplomand' && $next_status->status_kurzbz == 'Student'
 			)
 			{
-				return error("Nach Diplomandenstatus darf kein Studentenstatus mehr eingetragen werden");
+				return error($name . "Nach Diplomandenstatus darf kein Studentenstatus mehr eingetragen werden");
 			}
 
 		}
diff --git a/application/models/education/Studentlehrverband_model.php b/application/models/education/Studentlehrverband_model.php
index 38791a812..6e10be689 100644
--- a/application/models/education/Studentlehrverband_model.php
+++ b/application/models/education/Studentlehrverband_model.php
@@ -53,12 +53,14 @@ class Studentlehrverband_model extends DB_Model
 
 		$this->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
 		$result = $this->LehrverbandModel->checkIfLehrverbandExists($studiengang_kz, $ausbildungssemester, $verband, $gruppe);
-		if (isError($result)) {
+		if (isError($result))
+		{
 			$this->db->trans_rollback();
 			return error("0", "Error during update Lehrverband");
 		}
 
 		if ($result->retval == "0") {
+
 			// Übergeordneten Lehrverband check and/or insert
 			$result = $this->LehrverbandModel->checkIfLehrverbandExists($studiengang_kz, $ausbildungssemester, '', '');
 			if (isError($result)) {
@@ -68,6 +70,7 @@ class Studentlehrverband_model extends DB_Model
 
 			if ($result->retval == "0")
 			{
+				$this->terminateWithError("in section 0 und weiter.. wo verband auf leer gesetzt wird", self::ERROR_TYPE_GENERAL);
 				$result = $this->LehrverbandModel->insert([
 					'studiengang_kz' => $studiengang_kz,
 					'semester' => $ausbildungssemester,
@@ -104,12 +107,14 @@ class Studentlehrverband_model extends DB_Model
 		// Studentlehrverband insert or update
 		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
 		$result = $this->StudentlehrverbandModel->checkIfStudentLehrverbandExists($student_uid, $studiensemester_kurzbz);
-		if (isError($result)) {
+		if (isError($result))
+		{
 			$this->db->trans_rollback();
 			return error(getError($result));
 		}
 
-		if ($result->retval == "0") {
+		if ($result->retval == "0")
+		{
 			$result = $this->StudentlehrverbandModel->insert([
 				'student_uid' => $student_uid,
 				'studiensemester_kurzbz' => $studiensemester_kurzbz,
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
index 0b9279475..ad402b5ed 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
@@ -137,8 +137,8 @@ export default {
 				this.listZgvsdoktor = result;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
-		CoreRESTClient //TODO(manu) FHCAPI
-			.get('components/stv/Lists/getStgs')
+		this.$fhcApi
+			.get('api/frontend/v1/stv/lists/getStgs')
 			.then(result => CoreRESTClient.getData(result.data) || [])
 			.then(result => {
 				this.listStgs = result;
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index ac77f75c8..3d0f101cf 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -63,7 +63,8 @@ export default{
 				const newObj = {
 					prestudent_id : this.modelValue.prestudent_id,
 					studiensemester_kurzbz : this.defaultSemester,
-					ausbildungssemester : this.modelValue.semester
+					ausbildungssemester : this.modelValue.semester,
+					name: `${this.modelValue.vorname} ${this.modelValue.nachname}`
 				};
 				dataArray.push(newObj);
 				//console.log(dataArray);
@@ -75,14 +76,14 @@ export default{
 					const newObj = {
 						prestudent_id: item.prestudent_id,
 						ausbildungssemester: item.semester,
-						studiensemester_kurzbz: this.defaultSemester
+						studiensemester_kurzbz: this.defaultSemester,
+						name: `${item.vorname} ${item.nachname}`
 					};
 					dataArray.push(newObj);
 				}
 
 				return dataArray;
 			}
-
 		},
 		gruende() {
 			return this.listStatusgruende.filter(grund => grund.status_kurzbz == this.statusData.status_kurzbz);
@@ -295,6 +296,7 @@ export default{
 			this.statusData.ausbildungssemester = 1;
 			this.statusData.datum = this.getDefaultDate();
 			this.statusData.bestaetigtam = this.getDefaultDate();
+			this.statusData.name = this.modelValue.vorname + ' ' + this.modelValue.nachname;
 			this.$refs.newStatusModal.show();
 		},
 		actionEditStatus(status, stdsem, ausbildungssemester){
@@ -482,9 +484,6 @@ export default{
 					changeData = this.newArray.find(item => item.prestudent_id === prestudentId);
 				}
 
-				console.log("---");
-				console.log(changeData);
-
 				return this.$fhcApi.post('api/frontend/v1/stv/status/addNewStatus/' + prestudentId,
 					//this.statusData
 					//this.updateData.find(item => item.prestudent_id == prestudentId)
@@ -504,6 +503,7 @@ export default{
 				.then(values => {
 					if (this.modelValue.prestudent_id) {
 						this.reload();
+						//TODO(manu) reload Detailtab after Abbrecher to see current status activ, verband and gruppe
 					}
 					else {
 						this.$reloadList();
@@ -511,6 +511,7 @@ export default{
 					this.hideModal('newStatusModal');
 					this.resetModal();
 				});
+
 		},
 		advanceStatus(statusId){
 			return this.$fhcApi.post('api/frontend/v1/stv/status/advanceStatus/' +
@@ -673,11 +674,10 @@ export default{
 									<option  value="Bewerber">BewerberIn</option>
 									<option  value="Aufgenommener">Aufgenommene/r</option>
 									<option  value="Student">StudentIn</option>
-									<option  value="Unterbrecher">UnterbrecherIn</option>
+<!--									TODO(Manu) handle Unterbrecher from here
+									<option  value="Unterbrecher">UnterbrecherIn</option>-->
 									<option  value="Diplomand">DiplomandIn</option>
 									<option  value="Incoming">Incoming</option>
-									<option  value="Absolvent">AbsolventIn</option>
-									<option  value="Abbrecher">AbbrecherIn</option>
 								</form-input>
 							</div>
 						</div>
@@ -844,11 +844,10 @@ export default{
 									<option  value="Bewerber">BewerberIn</option>
 									<option  value="Aufgenommener">Aufgenommene/r</option>
 									<option  value="Student">StudentIn</option>
-									<option  value="Unterbrecher">UnterbrecherIn</option>
+<!--									TODO(Manu) handle Unterbrecher from here
+									<option  value="Unterbrecher">UnterbrecherIn</option>-->
 									<option  value="Diplomand">DiplomandIn</option>
 									<option  value="Incoming">Incoming</option>
-									<option  value="Absolvent">AbsolventIn</option>
-									<option  value="Abbrecher">AbbrecherIn</option>
 								</form-input>
 							</div>
 						</div>
@@ -1110,41 +1109,6 @@ export default{
 				</template>
 			</BsModal>
 			
-			<!--Modal: addMultiStatus--> <!--TODO(MANU) use bs template-->
-<!--			<BsModal ref="addMultiStatus">				
-			<template #title>{{$p.t('lehre', 'status_edit')}}</template>
-				<template #default>
-				<div v-if="prestudentIds.length == 1">
-					<p>In welches Semester soll dieser {{actionStatusText}} verschoben werden?</p>
-				</div>
-				<div v-else>
-					<p>In welches Semester sollen diese {{prestudentIds.length}} {{actionStatusText}}en verschoben werden?</p>
-				</div>
-				
-				<div class="row mb-3">
-					<label for="studiensemester" class="form-label col-sm-4">{{$p.t('lehre', 'studiensemester')}}</label>
-					<div class="col-sm-6">
-						<form-input
-							type="text"
-							name="studiensemester"
-							v-model="actionSem"
-						>				
-						</form-input>
-					</div>
-				</div>
-					
-				</template>
-				<template #footer>
-
-				<div v-if="actionStatusText=='Student'">
-					<button  ref="Close" type="button" class="btn btn-primary" @click="changeStatusToStudent(prestudentIds)">OK</button>
-				</div>
-				<div v-if="actionStatusText=='Wiederholer'">
-					<button  ref="Close" type="button" class="btn btn-primary" @click="changeStatusToWiederholer(prestudentIds)">OK</button>
-				</div>
-					
-				</template>
-			</BsModal>-->
 				
 			<core-filter-cmpt
 				v-if="!this.modelValue.length"

From 3846f38a6facfe956a5233d84cdc91244026f541 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 6 May 2024 11:21:01 +0200
Subject: [PATCH 0683/1461] added PK to tbl_anwesenheit_check; chenged
 anwesenheiten sum function to account for timespans of the checks; added
 extension/anwesenheit_admin berechtigung; fotos are now being sent as links
 to bild.php; studentByLva table now with von & bis times of the check; now
 updating attendance check times when starting further checks on the same
 date; checking if time the code is being sent is in the timespan of the
 kontrolle; added method to delete QR codes older than certain ms to be called
 from QRDelete Cronjob;

---
 system/phrasesupdate.php | 61 +++++++++++++++++++++++++++++++++-------
 1 file changed, 51 insertions(+), 10 deletions(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index d5864abe3..60c2c1b30 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -25629,7 +25629,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Keine Anwesenheitskontrolle gefunden für Lehreinheit {le_id} am {day}.{month}.{year}.',
+				'text' => 'Keine Anwesenheitskontrolle gefunden für LV-Teil {le_id} am {day}.{month}.{year}.',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -25649,7 +25649,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Fehler beim Löschen der User Anwesenheiten für Lehreinheit {le_id} am {day}.{month}.{year}.',
+				'text' => 'Fehler beim Löschen der User Anwesenheiten für LV-Teil {le_id} am {day}.{month}.{year}.',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -25669,7 +25669,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Fehler beim Löschen der Anwesenheitskontrolle für Lehreinheit {le_id} am {day}.{month}.{year}.',
+				'text' => 'Fehler beim Löschen der Anwesenheitskontrolle für LV-Teil {le_id} am {day}.{month}.{year}.',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -25689,7 +25689,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Löschen der Anwesenheitskontrolle für Lehreinheit {le_id} am {day}.{month}.{year} erfolgreich.',
+				'text' => 'Löschen der Anwesenheitskontrolle für LV-Teil {le_id} am {day}.{month}.{year} erfolgreich.',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -25769,7 +25769,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Zugangscode hat eine fehlerhafte Lehreinheit hinterlegt.',
+				'text' => 'Zugangscode hat einen fehlerhaften LV-Teil hinterlegt.',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -25789,7 +25789,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Lehreinheit des Zugangscodes hat keine Teilnehmer hinterlegt.',
+				'text' => 'LV-Teil des Zugangscodes hat keine Teilnehmer hinterlegt.',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -25809,7 +25809,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Sie sind nicht als Teilnehmer der Lehreinheit eingetragen.',
+				'text' => 'Sie sind nicht als Teilnehmer der LV-Teil eingetragen.',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -25829,7 +25829,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Keine Anwesenheitseinträge gefunden für die Lehreinheit an diesem Datum.',
+				'text' => 'Keine Anwesenheitseinträge gefunden für den LV-Teil an diesem Datum.',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -26029,7 +26029,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Lehreinheit auswählen',
+				'text' => 'LV-Teil auswählen',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -26049,7 +26049,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Keine Anwesenheitskontrolle möglich weil ihnen im System keine Lehreinheiten für diese Lehrveranstaltung zugewiesen sind.',
+				'text' => 'Keine Anwesenheitskontrolle möglich weil ihnen im System keine LV-Teile für diese Lehrveranstaltung zugewiesen sind.',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -26121,6 +26121,47 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'leLaden',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'LV-Teil laden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Load teaching unit',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorCodeSentInTimeOutsideKontrolle',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Der Zugangscode wurde außerhalb der Kontrollzeiten gesendet.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The access code has been sent outside the time of the attendance check.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+
 
 	// FHC-CORE-ANWESENHEITEN END
 );

From a563f053efe23acfea47514cdf9a4cd82b01d35e Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 6 May 2024 14:19:04 +0200
Subject: [PATCH 0684/1461] adds the width and the height properties to the
 dashboard item, they were missing and caused a bug where the news widget was
 not displaying correctly

---
 public/js/components/Dashboard/Section.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 868672a50..e48b580ed 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -125,6 +125,8 @@ export default {
 			<template v-slot="item">
 				<dashboard-item
 					:id="item.widget"
+					:width="item.w"
+					:height="item.h"
 					:loading="item.loading"
 					:config="item.config"
 					:custom="item.custom"

From fb6bb96fbd6d476d72e70d6d5b0963d9f8f2e2fe Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 8 May 2024 10:58:38 +0200
Subject: [PATCH 0685/1461] making Filter-core-cmp emit the tableBuilt event

---
 .../Cis/Profil/MitarbeiterProfil.js           | 20 +++++++---------
 .../Cis/Profil/MitarbeiterViewProfil.js       | 14 +++++------
 .../js/components/Cis/Profil/StudentProfil.js | 24 +++++++++----------
 public/js/components/filter/Filter.js         |  5 ++--
 4 files changed, 28 insertions(+), 35 deletions(-)

diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 52c9dfb24..a899b0050 100755
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -142,6 +142,12 @@ export default {
   },
 
   methods: {
+    betriebsmittelTableBuilt: function () {
+      this.$refs.betriebsmittelTable.tabulator.setData(this.data.mittel);
+    },
+    funktionenTableBuilt: function () {
+      this.$refs.funktionenTable.tabulator.setData(this.data.funktionen);
+    },
     hideEditProfilModal: function () {
       //? checks the editModal component property result, if the user made a successful request or not
       if (this.$refs.editModal.result) {
@@ -234,16 +240,6 @@ export default {
     this.data.profilUpdates?.sort(this.sortProfilUpdates);
   },
 
-  mounted() {
-    this.$refs.betriebsmittelTable.tabulator.on("tableBuilt", () => {
-      this.$refs.betriebsmittelTable.tabulator.setData(this.data.mittel);
-    });
-
-    this.$refs.funktionenTable.tabulator.on("tableBuilt", () => {
-      this.$refs.funktionenTable.tabulator.setData(this.data.funktionen);
-    });
-  },
-
   template: /*html*/ ` 
   <div class="container-fluid text-break fhc-form"  >
  
@@ -405,14 +401,14 @@ export default {
 
                   <!-- FUNKTIONEN TABELLE -->
                  
-                    <core-filter-cmpt :title="$p.t('person','funktionen')"  ref="funktionenTable" :tabulator-options="funktionen_table_options"  tableOnly :sideMenu="false" />
+                    <core-filter-cmpt @tableBuilt="funktionenTableBuilt" :title="$p.t('person','funktionen')"  ref="funktionenTable" :tabulator-options="funktionen_table_options"  tableOnly :sideMenu="false" />
                   
                     </div>
 
                   <div class="col-12 mb-4" >
 
                   <!-- BETRIEBSMITTEL TABELLE -->
-                    <core-filter-cmpt :title="$p.t('profil','entlehnteBetriebsmittel')"  ref="betriebsmittelTable" :tabulator-options="betriebsmittel_table_options" tableOnly :sideMenu="false" />
+                    <core-filter-cmpt @tableBuilt="betriebsmittelTableBuilt" :title="$p.t('profil','entlehnteBetriebsmittel')"  ref="betriebsmittelTable" :tabulator-options="betriebsmittel_table_options" tableOnly :sideMenu="false" />
                   </div>
 
                 </div>
diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
index 0c9d451f4..6e4b504f6 100755
--- a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
@@ -86,7 +86,11 @@ export default {
 
   //? this is the prop passed to the dynamic component with the custom data of the view
   props: ["data"],
-  methods: {},
+  methods: {
+    funktionenTableBuilt: function () {
+      this.$refs.funktionenTable.tabulator.setData(this.data.funktionen);
+    },
+  },
 
   computed: {
     personEmails() {
@@ -128,12 +132,6 @@ export default {
     },
   },
 
-  mounted() {
-    this.$refs.funktionenTable.tabulator.on("tableBuilt", () => {
-      this.$refs.funktionenTable.tabulator.setData(this.data.funktionen);
-    });
-  },
-
   template: /*html*/ ` 
 
   <div class="container-fluid text-break fhc-form"  >
@@ -228,7 +226,7 @@ export default {
 
                 <!-- FIRST TABLE -->
                   <div class="col-12 mb-4" >
-                    <core-filter-cmpt :title="$p.t('person','funktionen')"  ref="funktionenTable" :tabulator-options="funktionen_table_options"  tableOnly :sideMenu="false" />
+                    <core-filter-cmpt @tableBuilt="funktionenTableBuilt" :title="$p.t('person','funktionen')"  ref="funktionenTable" :tabulator-options="funktionen_table_options"  tableOnly :sideMenu="false" />
                   </div>
 
                
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index 51699cdd4..059742c69 100755
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -85,6 +85,14 @@ export default {
     editData: Object,
   },
   methods: {
+    betriebsmittelTableBuilt: function () {
+      this.$refs.betriebsmittelTable.tabulator.setData(this.data.mittel);
+    },
+    zutrittsgruppenTableBuilt: function () {
+      this.$refs.zutrittsgruppenTable.tabulator.setData(
+        this.data.zuttritsgruppen
+      );
+    },
     fetchProfilUpdates: function () {
       Vue.$fhcapi.ProfilUpdate.selectProfilRequest().then((res) => {
         if (!res.error) {
@@ -175,17 +183,7 @@ export default {
     this.data.profilUpdates?.sort(this.sortProfilUpdates);
   },
 
-  mounted() {
-    this.$refs.betriebsmittelTable.tabulator.on("tableBuilt", () => {
-      this.$refs.betriebsmittelTable.tabulator.setData(this.data.mittel);
-    });
-
-    this.$refs.zutrittsgruppenTable.tabulator.on("tableBuilt", () => {
-      this.$refs.zutrittsgruppenTable.tabulator.setData(
-        this.data.zuttritsgruppen
-      );
-    });
-  },
+  
 
   template: /*html*/ ` 
 
@@ -350,11 +348,11 @@ export default {
                 <div class="row">
 
                   <div class="col-12 mb-4" >
-                    <core-filter-cmpt :title="$p.t('profil','entlehnteBetriebsmittel')"  ref="betriebsmittelTable" :tabulator-options="betriebsmittel_table_options" tableOnly :sideMenu="false" />
+                    <core-filter-cmpt @tableBuilt="betriebsmittelTableBuilt" :title="$p.t('profil','entlehnteBetriebsmittel')"  ref="betriebsmittelTable" :tabulator-options="betriebsmittel_table_options" tableOnly :sideMenu="false" />
                   </div> 
 
                   <div class="col-12 mb-4" >
-                    <core-filter-cmpt :title="$p.t('profil','zutrittsGruppen')" ref="zutrittsgruppenTable" :tabulator-options="zutrittsgruppen_table_options"  tableOnly :sideMenu="false" noColumnFilter />
+                    <core-filter-cmpt @tableBuilt="zutrittsgruppenTableBuilt" :title="$p.t('profil','zutrittsGruppen')" ref="zutrittsgruppenTable" :tabulator-options="zutrittsgruppen_table_options"  tableOnly :sideMenu="false" noColumnFilter />
             
                   </div>
 
diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index a0cac4828..047a3d0ec 100755
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -38,7 +38,8 @@ export const CoreFilterCmpt = {
 	},
 	emits: [
 		'nwNewEntry',
-		'click:new'
+		'click:new',
+		'tableBuilt'
 	],
 	props: {
 		onNwNewEntry: Function, // NOTE(chris): Hack to get the nwNewEntry listener into $props
@@ -223,7 +224,7 @@ export const CoreFilterCmpt = {
 				for (let evt of this.tabulatorEvents)
 					this.tabulator.on(evt.event, evt.handler);
 			}
-			this.tabulator.on('tableBuilt', () => this.tableBuilt = true);
+			this.tabulator.on('tableBuilt', () => {this.tableBuilt = true; this.$emit('tableBuilt');});
 			this.tabulator.on("rowSelectionChanged", data => {
 				this.selectedData = data;
 			});

From 29f7e34e10dd99f822a1e5f8b9d9c55aef5df198 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 12 Apr 2024 14:38:01 +0200
Subject: [PATCH 0686/1461] adds pagination logic to C4 news

---
 application/controllers/CisHmvc/Cms.php   |  7 ++-
 application/controllers/CisHtml/Cms.php   |  8 ++-
 application/controllers/CisVue/Cms.php    |  7 ++-
 application/libraries/CmsLib.php          | 36 ++++++-------
 application/models/content/News_model.php | 66 +++++++++++++----------
 5 files changed, 70 insertions(+), 54 deletions(-)

diff --git a/application/controllers/CisHmvc/Cms.php b/application/controllers/CisHmvc/Cms.php
index 7f2a03a0f..d15f398a4 100644
--- a/application/controllers/CisHmvc/Cms.php
+++ b/application/controllers/CisHmvc/Cms.php
@@ -1,6 +1,7 @@
 <?php
 
-if (! defined('BASEPATH')) exit('No direct script access allowed');
+if (!defined('BASEPATH'))
+	exit('No direct script access allowed');
 
 /**
  *
@@ -89,7 +90,9 @@ class Cms extends Auth_Controller
 	 */
 	public function news($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
 	{
-		$news = $this->cmslib->getNews($infoscreen, $studiengang_kz, $semester, $mischen, $titel, $edit, $sichtbar);
+		$page = intval($this->input->get('page', true));
+		$pagination_size = 10;
+		$news = $this->cmslib->getNews($infoscreen, $studiengang_kz, $semester, $mischen, $titel, $edit, $sichtbar, $page, $pagination_size);
 
 		if (isError($news))
 			return $this->load->view('CisHmvc/Error', ['error' => getError($news)]);
diff --git a/application/controllers/CisHtml/Cms.php b/application/controllers/CisHtml/Cms.php
index 96057559f..2dd05dbae 100644
--- a/application/controllers/CisHtml/Cms.php
+++ b/application/controllers/CisHtml/Cms.php
@@ -1,6 +1,7 @@
 <?php
 
-if (! defined('BASEPATH')) exit('No direct script access allowed');
+if (!defined('BASEPATH'))
+	exit('No direct script access allowed');
 
 /**
  *
@@ -10,6 +11,7 @@ class Cms extends FHC_Controller
 	/**
 	 * Constructor
 	 */
+
 	public function __construct()
 	{
 		parent::__construct();
@@ -59,7 +61,9 @@ class Cms extends FHC_Controller
 	 */
 	public function news($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
 	{
-		$news = $this->cmslib->getNews($infoscreen, $studiengang_kz, $semester, $mischen, $titel, $edit, $sichtbar);
+		$page = intval($this->input->get('page', true));
+		$pagination_size = 10;
+		$news = $this->cmslib->getNews($infoscreen, $studiengang_kz, $semester, $mischen, $titel, $edit, $sichtbar, $page, $pagination_size);
 
 		if (isError($news))
 			return $this->load->view('CisHtml/Error', ['error' => getError($news)]);
diff --git a/application/controllers/CisVue/Cms.php b/application/controllers/CisVue/Cms.php
index 96057559f..0f3fc061a 100644
--- a/application/controllers/CisVue/Cms.php
+++ b/application/controllers/CisVue/Cms.php
@@ -1,6 +1,7 @@
 <?php
 
-if (! defined('BASEPATH')) exit('No direct script access allowed');
+if (!defined('BASEPATH'))
+	exit('No direct script access allowed');
 
 /**
  *
@@ -59,7 +60,9 @@ class Cms extends FHC_Controller
 	 */
 	public function news($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
 	{
-		$news = $this->cmslib->getNews($infoscreen, $studiengang_kz, $semester, $mischen, $titel, $edit, $sichtbar);
+		$page = intval($this->input->get('page', true));
+		$pagination_size = 10;
+		$news = $this->cmslib->getNews($infoscreen, $studiengang_kz, $semester, $mischen, $titel, $edit, $sichtbar, $page, $pagination_size);
 
 		if (isError($news))
 			return $this->load->view('CisHtml/Error', ['error' => getError($news)]);
diff --git a/application/libraries/CmsLib.php b/application/libraries/CmsLib.php
index 4e27b94af..dfe8d5e4f 100644
--- a/application/libraries/CmsLib.php
+++ b/application/libraries/CmsLib.php
@@ -1,6 +1,7 @@
 <?php
 
-if (! defined('BASEPATH')) exit('No direct script access allowed');
+if (!defined('BASEPATH'))
+	exit('No direct script access allowed');
 
 use \DateTime as DateTime;
 use \DOMDocument as DOMDocument;
@@ -46,16 +47,16 @@ class CmsLib
 	 */
 	public function getContent($content_id, $version = null, $sprache = null, $sichtbar = true)
 	{
-		if(!is_numeric($content_id))
+		if (!is_numeric($content_id))
 			return error('ContentID ist ungueltig');
 
 		if ($sprache === null)
 			$sprache = getUserLanguage();
-		
+
 		$islocked = $this->ci->ContentgruppeModel->loadWhere(['content_id' => $content_id]);
 		if (isError($islocked))
 			return $islocked;
-		
+
 		if (getData($islocked)) {
 			$uid = getAuthUID();
 			$isberechtigt = $this->ci->ContentgruppeModel->berechtigt($content_id, $uid);
@@ -72,11 +73,9 @@ class CmsLib
 			return $content;
 
 		// Legt einen Logeintrag für die Klickstatistik an
-		if (defined('LOG_CONTENT') && LOG_CONTENT)
-		{
+		if (defined('LOG_CONTENT') && LOG_CONTENT) {
 			// Nur eingeloggte User werden geloggt, das sonst auch alle Infoscreenaufrufe und dgl. mitgeloggt werden
-			if (isLogged())
-			{
+			if (isLogged()) {
 				$request_data = 'content_id=' . $content_id;
 				if ($version !== null)
 					$request_data .= '&version=' . $version;
@@ -185,13 +184,12 @@ class CmsLib
 	 * 
 	 * @return void
 	 */
-	public function getNews($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
+	public function getNews($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true, $page = 1, $page_size = 10)
 	{
 		$this->ci->load->model('crm/Student_model', 'StudentModel');
 		$this->ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
 
-		if (!$infoscreen && ($studiengang_kz === null || $semester === null))
-		{
+		if (!$infoscreen && ($studiengang_kz === null || $semester === null)) {
 			//Zum anzeigen der Studiengang-Details neben den News
 			$student = $this->ci->StudentModel->loadWhere(['student_uid' => get_uid()]);
 			if (isError($student))
@@ -209,7 +207,7 @@ class CmsLib
 		$xml = '<?xml version="1.0" encoding="UTF-8"?><content>';
 
 		$this->ci->load->model('content/News_model', 'NewsModel');
-		$news = $this->ci->NewsModel->getNewsWithContent(getSprache(), $studiengang_kz, $semester, null, $sichtbar, 0, 0, $all, $mischen);
+		$news = $this->ci->NewsModel->getNewsWithContent(getSprache(), $studiengang_kz, $semester, null, $sichtbar, 0, $page, $page_size, $all, $mischen);
 
 		if (isError($news))
 			return $news;
@@ -225,17 +223,14 @@ class CmsLib
 			$xml .= "<newswrapper>" . $newsobj->content . $datum . $id . "</newswrapper>";
 		}
 
-		if ($studiengang_kz != 0)
-		{
+		if ($studiengang_kz != 0) {
 			$stg_obj = $this->ci->StudiengangModel->load($studiengang_kz);
 			if (isError($stg_obj))
 				return $stg_obj;
 			$stg_obj = current(getData($stg_obj) ?: []);
 
-			if ($stg_obj)
-			{
-				if (!$edit && !$infoscreen)
-				{
+			if ($stg_obj) {
+				if (!$edit && !$infoscreen) {
 					$extras = $this->getNewsExtras($stg_obj, $semester);
 					if (isError($extras))
 						return $extras;
@@ -245,8 +240,7 @@ class CmsLib
 			}
 		}
 
-		if ($titel != '')
-		{
+		if ($titel != '') {
 			$xml .= '<news_titel>' . $titel . '</news_titel>';
 		}
 
@@ -260,7 +254,7 @@ class CmsLib
 
 		$XML = new DOMDocument();
 		$XML->loadXML($xml);
-		
+
 		$xsltemplate = new DOMDocument();
 		$xsltemplate->loadXML($template->xslt_xhtml_c4);
 
diff --git a/application/models/content/News_model.php b/application/models/content/News_model.php
index 3199a0ac3..51ef16053 100644
--- a/application/models/content/News_model.php
+++ b/application/models/content/News_model.php
@@ -23,10 +23,21 @@ class News_model extends DB_Model
 			text IS NOT NULL
 			AND datum <= NOW() AND (datum_bis IS NULL OR datum_bis >= now()::date)
 			ORDER BY datum DESC
-			LIMIT '. $this->escape($limit)
+			LIMIT ' . $this->escape($limit)
 		);
 	}
 
+	private function getMaxPageCount($page_size)
+	{
+		$this->addSelect(['Count(*)']);
+		$count = $this->load();
+		$count = hasData($count) ? getData($count)[0]->count : null;
+		$floatMaxPageCount = $count / $page_size;
+
+		// ceil, to include remaining rows into the last page 
+		return ceil($floatMaxPageCount);
+	}
+
 	/**
 	 * @param string            $sprache
 	 * @param string            $studiengang_kz
@@ -34,7 +45,7 @@ class News_model extends DB_Model
 	 * @param string            $fachbereich_kurzbz
 	 * @param boolean           $sichtbar
 	 * @param integer           $maxalter
-	 * @param integer           $maxnews
+	 * @param integer           $page_size
 	 * @param boolean           $all
 	 * @param boolean           $mischen
 	 * 
@@ -42,46 +53,52 @@ class News_model extends DB_Model
 	 * 
 	 * @return stdObj
 	 */
-	public function getNewsWithContent($sprache, $studiengang_kz, $semester, $fachbereich_kurzbz = null, $sichtbar = true, $maxalter = 0, $maxnews = 0, $all = false, $mischen = true)
+	public function getNewsWithContent($sprache, $studiengang_kz, $semester, $fachbereich_kurzbz = null, $sichtbar = true, $maxalter = 0, $page = 1, $page_size = 10, $all = false, $mischen = true)
 	{
+		if (isset($page) && is_numeric($page) && isset($page_size) && is_numeric($page_size)) {
+			if ($page > 0 && $page_size > 0) {
+				$maxPageCount = $this->getMaxPageCount($page_size);
+				if ($maxPageCount) {
+					$page = $page % $maxPageCount;
+				}
+				$offset = $page * $page_size;
+				$this->addLimit($page_size, $offset);
+			}
+		} else {
+			$this->addLimit($page_size);
+		}
+
+		$this->addOrder('datum', 'DESC');
+
 		$studiengang_kz = trim($studiengang_kz);
 		$fachbereich_kurzbz = trim($fachbereich_kurzbz);
 
 		$where = [];
 		$params = [];
-		if (trim($maxalter) != '0')
-		{
+		if (trim($maxalter) != '0') {
 			$where[] = "(now()-datum) < interval ? days";
 			$params[] = $maxalter;
 		}
-		if (!$all)
-		{
+		if (!$all) {
 			$where[] = "datum <= now()";
 			$where[] = "(datum_bis >= now()::date OR datum_bis IS NULL)";
 		}
-		if ($fachbereich_kurzbz != '*')
-		{
-			if ($fachbereich_kurzbz == '')
-			{
+		if ($fachbereich_kurzbz != '*') {
+			if ($fachbereich_kurzbz == '') {
 				$where[] = "fachbereich_kurzbz IS NULL";
-			}
-			else
-			{
+			} else {
 				$where[] = "fachbereich_kurzbz = ?";
 				$params[] = $fachbereich_kurzbz;
 			}
 		}
-		if ($studiengang_kz == '0')
-		{
+		if ($studiengang_kz == '0') {
 			$where[] = "studiengang_kz = ?";
 			$params[] = $studiengang_kz;
 			if ($semester === NULL)
 				$where[] = "semester IS NULL";
 			elseif ($semester === 0)
 				$where[] = "semester = 0";
-		}
-		elseif ($studiengang_kz != '')
-		{
+		} elseif ($studiengang_kz != '') {
 			$add = $mischen === true ? " OR (studiengang_kz = 0 AND semester IS NULL)" : "";
 			$where[] = "((studiengang_kz = ? AND semester = ?) OR (studiengang_kz = ? AND semester = 0) OR (studiengang_kz = 0 AND semester = ?)" . $add . ")";
 			$params[] = $studiengang_kz;
@@ -90,14 +107,14 @@ class News_model extends DB_Model
 			$params[] = $semester;
 		}
 		$this->addJoin('campus.tbl_contentsprache cs', 'content_id');
-		
+
 		$where[] = "cs.sichtbar = " . ($sichtbar ? "true" : "false");
-		
+
 		$where[] = "cs.sprache = (CASE WHEN EXISTS(SELECT 1 FROM campus.tbl_contentsprache cs2 WHERE cs2.content_id=" . $this->dbTable . ".content_id AND sprache=?) THEN ? ELSE ? END)";
 		$params[] = $sprache;
 		$params[] = $sprache;
 		$params[] = DEFAULT_LANGUAGE;
-		
+
 		$where[] = "cs.version = (SELECT MAX(version) FROM campus.tbl_contentsprache cs3 WHERE cs3.content_id=" . $this->dbTable . ".content_id AND cs3.sprache = (CASE WHEN EXISTS(SELECT 1 FROM campus.tbl_contentsprache cs2 WHERE cs2.content_id=" . $this->dbTable . ".content_id AND sprache=?) THEN ? ELSE ? END))";
 		$params[] = $sprache;
 		$params[] = $sprache;
@@ -105,11 +122,6 @@ class News_model extends DB_Model
 
 		$where = implode(" AND ", $where);
 
-		$this->addOrder('datum', 'DESC');
-		if ($maxnews)
-			$this->addLimit($maxnews);
-
-
 		$this->db->where($where, NULL, FALSE);
 
 		$sql = $this->db->get_compiled_select($this->dbTable);

From 36c8862b9973cda4f54fb3727ca1f98cc27d6c31 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 15 Apr 2024 13:35:33 +0200
Subject: [PATCH 0687/1461] implementing frontend pagination for components

---
 application/controllers/CisHtml/Cms.php       | 13 +++--
 application/models/content/News_model.php     | 16 +++---
 application/views/CisHtml/Cms/Content.php     |  7 +--
 public/js/apps/Cis/Cms.js                     | 54 ++++++++++++-------
 public/js/apps/api/cms.js                     | 14 +++++
 public/js/apps/api/fhcapifactory.js           |  4 +-
 public/js/components/Cis/Cms/Content.js       | 28 ++++++++++
 public/js/components/Pagination/Pagination.js | 26 +++++++++
 8 files changed, 128 insertions(+), 34 deletions(-)
 create mode 100644 public/js/apps/api/cms.js
 create mode 100644 public/js/components/Cis/Cms/Content.js
 create mode 100644 public/js/components/Pagination/Pagination.js

diff --git a/application/controllers/CisHtml/Cms.php b/application/controllers/CisHtml/Cms.php
index 2dd05dbae..4cca6bc38 100644
--- a/application/controllers/CisHtml/Cms.php
+++ b/application/controllers/CisHtml/Cms.php
@@ -60,14 +60,19 @@ class Cms extends FHC_Controller
 	 * @return void
 	 */
 	public function news($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
+	{
+		$this->load->view('CisHtml/Cms/Content', ['infoscreen' => $infoscreen, 'studiengang_kz' => $studiengang_kz, 'semester' => $semester, 'mischen' => $mischen, 'titel' => $titel, 'edit' => $edit, 'sichtbar' => $sichtbar]);
+	}
+
+	public function getNews($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
 	{
 		$page = intval($this->input->get('page', true));
 		$pagination_size = 10;
 		$news = $this->cmslib->getNews($infoscreen, $studiengang_kz, $semester, $mischen, $titel, $edit, $sichtbar, $page, $pagination_size);
 
-		if (isError($news))
-			return $this->load->view('CisHtml/Error', ['error' => getError($news)]);
-
-		$this->load->view('CisHtml/Cms/Content', ['content' => getData($news)]);
+		if (isError($news)) {
+			echo json_encode(getError($news));
+		}
+		echo json_encode(getData($news));
 	}
 }
diff --git a/application/models/content/News_model.php b/application/models/content/News_model.php
index 51ef16053..88d97bd09 100644
--- a/application/models/content/News_model.php
+++ b/application/models/content/News_model.php
@@ -55,15 +55,15 @@ class News_model extends DB_Model
 	 */
 	public function getNewsWithContent($sprache, $studiengang_kz, $semester, $fachbereich_kurzbz = null, $sichtbar = true, $maxalter = 0, $page = 1, $page_size = 10, $all = false, $mischen = true)
 	{
-		if (isset($page) && is_numeric($page) && isset($page_size) && is_numeric($page_size)) {
-			if ($page > 0 && $page_size > 0) {
-				$maxPageCount = $this->getMaxPageCount($page_size);
-				if ($maxPageCount) {
-					$page = $page % $maxPageCount;
-				}
-				$offset = $page * $page_size;
-				$this->addLimit($page_size, $offset);
+		if (isset($page) && is_numeric($page) && isset($page_size) && is_numeric($page_size) && $page > 0 && $page_size > 0) {
+
+			$maxPageCount = $this->getMaxPageCount($page_size);
+			if ($maxPageCount) {
+				$page = $page % $maxPageCount;
 			}
+			$offset = $page * $page_size;
+			$this->addLimit($page_size, $offset);
+
 		} else {
 			$this->addLimit($page_size);
 		}
diff --git a/application/views/CisHtml/Cms/Content.php b/application/views/CisHtml/Cms/Content.php
index e750ea5a5..a27128d23 100644
--- a/application/views/CisHtml/Cms/Content.php
+++ b/application/views/CisHtml/Cms/Content.php
@@ -1,5 +1,6 @@
 <?php
 $includesArray = array(
+	'primevue3' => true,
 	'customJSModules' => ['public/js/apps/Cis/Cms.js'],
 	'customCSSs' => [
 		'public/css/Cis4/Cms.css',
@@ -11,8 +12,8 @@ $this->load->view('templates/CISHTML-Header', $includesArray);
 ?>
 
 <div id="cms">
-	<?= $content; ?>
+	<content />
+
 </div>
 
-<?php $this->load->view('templates/CISHTML-Footer', $includesArray); ?>
-
+<?php $this->load->view('templates/CISHTML-Footer', $includesArray); ?>
\ No newline at end of file
diff --git a/public/js/apps/Cis/Cms.js b/public/js/apps/Cis/Cms.js
index 8f006ec27..cd2b5f6e9 100644
--- a/public/js/apps/Cis/Cms.js
+++ b/public/js/apps/Cis/Cms.js
@@ -1,20 +1,38 @@
 import BsConfirm from "../../components/Bootstrap/Confirm.js";
+//import Pagination from "../../components/Pagination/Pagination.js";
+import Content from "../../components/Cis/Cms/Content.js";
+import Fhcapi from "../api/fhcapifactory.js";
 
-Vue.createApp({
-	mounted() {
-		document.querySelectorAll('#cms [data-confirm]').forEach(el => {
-			el.addEventListener('click', evt => {
-				evt.preventDefault();
-				BsConfirm.popup(el.dataset.confirm).then(() => {
-					Axios.get(el.href).then(res => {
-						// TODO(chris): check for success then show message and/or reload
-						location = location;
-					}).catch(err => console.error('ERROR:', err));
-				}).catch(()=>{});
-			});
-		});
-		document.querySelectorAll('#cms [data-href]').forEach(el => {
-			el.href = el.dataset.href.replace(/^ROOT\//, FHC_JS_DATA_STORAGE_OBJECT.app_root);
-		});
-	}
-}).mount('#cms [data-confirm], #cms [data-href]');
+Vue.$fhcapi = Fhcapi;
+
+const app = Vue.createApp({
+  components: {
+    Content,
+  },
+  mounted() {
+    document.querySelectorAll("#cms [data-confirm]").forEach((el) => {
+      el.addEventListener("click", (evt) => {
+        evt.preventDefault();
+        BsConfirm.popup(el.dataset.confirm)
+          .then(() => {
+            Axios.get(el.href)
+              .then((res) => {
+                // TODO(chris): check for success then show message and/or reload
+                location = location;
+              })
+              .catch((err) => console.error("ERROR:", err));
+          })
+          .catch(() => {});
+      });
+    });
+    document.querySelectorAll("#cms [data-href]").forEach((el) => {
+      el.href = el.dataset.href.replace(
+        /^ROOT\//,
+        FHC_JS_DATA_STORAGE_OBJECT.app_root
+      );
+    });
+  },
+});
+app.use(primevue.config.default, { zIndex: { overlay: 9999 } });
+app.mount("#cms");
+//#cms [data-confirm], #cms [data-href]
diff --git a/public/js/apps/api/cms.js b/public/js/apps/api/cms.js
new file mode 100644
index 000000000..8ad2f1f32
--- /dev/null
+++ b/public/js/apps/api/cms.js
@@ -0,0 +1,14 @@
+export default {
+  getNews: function (page = 1, pageSize = 10) {
+    const url =
+      FHC_JS_DATA_STORAGE_OBJECT.app_root +
+      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+      "/CisHtml/Cms/getNews";
+    return axios.get(url, {
+      params: {
+        page,
+        pageSize,
+      },
+    });
+  },
+};
diff --git a/public/js/apps/api/fhcapifactory.js b/public/js/apps/api/fhcapifactory.js
index c1f1e0d5c..35120779f 100644
--- a/public/js/apps/api/fhcapifactory.js
+++ b/public/js/apps/api/fhcapifactory.js
@@ -1,5 +1,7 @@
 import Search from "./search.js";
+import Cms from "./cms.js";
 
 export default {
-    "Search": Search
+    "Search": Search,
+    "Cms": Cms,
 };
diff --git a/public/js/components/Cis/Cms/Content.js b/public/js/components/Cis/Cms/Content.js
new file mode 100644
index 000000000..415743e85
--- /dev/null
+++ b/public/js/components/Cis/Cms/Content.js
@@ -0,0 +1,28 @@
+import Pagination from "../../Pagination/Pagination.js";
+
+export default {
+  components: {
+    Pagination,
+  },
+  data() {
+    return {
+      content: null,
+    };
+  },
+  methods: {
+    loadNewPageContent: function (data) {
+      Vue.$fhcapi.Cms.getNews(data.page).then((result) => {
+        this.content = result.data;
+      });
+    },
+  },
+  created() {
+    Vue.$fhcapi.Cms.getNews().then((result) => {
+      this.content = result.data;
+    });
+  },
+  template: /*html*/ `
+    <pagination @page="loadNewPageContent">
+    <div v-html="content"></div>
+    </pagination>`,
+};
diff --git a/public/js/components/Pagination/Pagination.js b/public/js/components/Pagination/Pagination.js
new file mode 100644
index 000000000..0222a0dfa
--- /dev/null
+++ b/public/js/components/Pagination/Pagination.js
@@ -0,0 +1,26 @@
+export default {
+  components: {
+    paginator: primevue.paginator,
+  },
+  data() {
+    return {};
+  },
+  methods: {
+    newPageEvent: function (data) {
+      //console.log("hier", data.page);
+    },
+  },
+  mounted() {
+    console.log("pagination mounted");
+  },
+  template: /*html*/ `
+    
+  
+    <paginator @page="(page)=>$emit('page',{...page, page:page.page+1})" :rows="1"  :totalRecords="120" ></paginator>
+    <slot>
+    NO CONTENT WAS PROVIDED
+    </slot>
+    <paginator :rows="10" :totalRecords="120" :rowsPerPageOptions="[10, 20, 30]"></paginator>
+
+  `,
+};

From c017014171f909f30aac502d2b1ba53ceb2b0a14 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 17 Apr 2024 14:23:09 +0200
Subject: [PATCH 0688/1461] changes how the pagination is done in the DB_Model

---
 application/controllers/CisHtml/Cms.php       | 33 ++++++++++++-
 application/core/DB_Model.php                 | 46 ++++++++++++++++++-
 application/libraries/CmsLib.php              |  1 +
 application/models/content/News_model.php     | 42 ++++++++---------
 public/js/apps/api/cms.js                     | 11 ++++-
 public/js/components/Cis/Cms/Content.js       |  8 +++-
 public/js/components/Pagination/Pagination.js | 12 +++--
 7 files changed, 120 insertions(+), 33 deletions(-)

diff --git a/application/controllers/CisHtml/Cms.php b/application/controllers/CisHtml/Cms.php
index 4cca6bc38..d15b4fabc 100644
--- a/application/controllers/CisHtml/Cms.php
+++ b/application/controllers/CisHtml/Cms.php
@@ -25,6 +25,11 @@ class Cms extends FHC_Controller
 		$this->loadPhrases([
 			'global'
 		]);
+
+		$this->load->model('content/News_model', 'NewsModel');
+
+		// setting up the papgination_size
+		$this->pagination_size = 10;
 	}
 
 	// -----------------------------------------------------------------------------------------------------------------
@@ -67,12 +72,36 @@ class Cms extends FHC_Controller
 	public function getNews($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
 	{
 		$page = intval($this->input->get('page', true));
-		$pagination_size = 10;
-		$news = $this->cmslib->getNews($infoscreen, $studiengang_kz, $semester, $mischen, $titel, $edit, $sichtbar, $page, $pagination_size);
+
+
+		$news = $this->cmslib->getNews($infoscreen, $studiengang_kz, $semester, $mischen, $titel, $edit, $sichtbar, $page, $this->pagination_size);
 
 		if (isError($news)) {
 			echo json_encode(getError($news));
 		}
 		echo json_encode(getData($news));
 	}
+
+	public function getNewsMaxPage($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $fachbereich_kurzbz = null, $maxalter = 0, $edit = false, $sichtbar = true, $page = 1, $page_size = 10)
+	{
+		$this->load->model('crm/Student_model', 'StudentModel');
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+
+		if (!$infoscreen && ($studiengang_kz === null || $semester === null)) {
+			//Zum anzeigen der Studiengang-Details neben den News
+			$student = $this->StudentModel->loadWhere(['student_uid' => get_uid()]);
+			if (isError($student))
+				return $student;
+			if (getData($student)) {
+				$student = current(getData($student));
+				if ($studiengang_kz === null)
+					$studiengang_kz = $student->studiengang_kz;
+				if ($semester === null)
+					$semester = $student->semester;
+			}
+		}
+		$all = $edit;
+		$query = $this->NewsModel->getNewsWithContentQuery(getSprache(), $studiengang_kz, $semester, $fachbereich_kurzbz, $sichtbar, $maxalter, $page, $this->pagination_size, $all, $mischen);
+		echo json_encode($query->maxPageCount);
+	}
 }
diff --git a/application/core/DB_Model.php b/application/core/DB_Model.php
index bdd5316e7..5304fbe83 100644
--- a/application/core/DB_Model.php
+++ b/application/core/DB_Model.php
@@ -32,6 +32,9 @@ class DB_Model extends CI_Model
 	protected $pk;  	// Name of the PrimaryKey for DB-Update, Load, ...
 	protected $hasSequence;	// False if this table has a composite primary key that is not using a sequence
 				// True if this table has a primary key that uses a sequence
+	//protected $paginationOptions; // $page and $page_size together in an associative array
+	protected $page;
+	protected $page_size;
 
 	private $executedQueryMetaData;
 	private $executedQueryListFields;
@@ -484,7 +487,7 @@ class DB_Model extends CI_Model
 		if (!is_numeric($start) || (is_numeric($start) && $start <= 0))
 			return error('The start parameter is not valid', EXIT_MODEL);
 
-		if (is_numeric($end) && $end > $start)
+		if (is_numeric($end))
 		{
 			$this->db->limit($start, $end);
 		}
@@ -1073,5 +1076,46 @@ class DB_Model extends CI_Model
 
 		return $udfs;
 	}
+
+	function addPagination( $page, $page_size, $maxPageCount=null)
+	{
+		if (isset($page) && is_numeric($page) && isset($page_size) && is_numeric($page_size) && $page > 0 && $page_size > 0) {
+			
+			if (isset($maxPageCount) && is_numeric($maxPageCount) && $maxPageCount > 0) {
+				$floatMaxPageCount = $maxPageCount / $page_size;
+				$floatMaxPageCount = ceil($floatMaxPageCount);
+				if($page > $floatMaxPageCount){
+					$page = $floatMaxPageCount;
+				}
+			}
+			// else if page is to big
+			$offset = (($page-1) * $page_size); 
+			$this->addLimit($page_size, $offset);
+
+		} else {
+			$this->addLimit($page_size);
+		}
+	}
+
+	function getMaxPageCount( $page_size, $params=null )
+	{
+		// we clone the original query, so we dont have to change the origial query
+		$instance_copy = clone $this;
+		$db_copy = clone $this->db;
+		$countSql = $db_copy->get_compiled_select($instance_copy->dbTable,false);
+		$countSql = "SELECT COUNT(*) FROM (". $countSql .") as count;";
+		
+		// calculating the maxPageCount and adding the pagination to the query
+		$num_rows_query_result = $instance_copy->execReadOnlyQuery($countSql, $params);
+		
+		if(isError($num_rows_query_result)){
+			return error($this->db->error(), EXIT_DATABASE);
+		}
+		$num_rows = getData($num_rows_query_result)[0]->count;
+		
+		
+		// ceil, to include remaining rows into the last page 
+		return $num_rows;
+	}
 }
 
diff --git a/application/libraries/CmsLib.php b/application/libraries/CmsLib.php
index dfe8d5e4f..8a57c1086 100644
--- a/application/libraries/CmsLib.php
+++ b/application/libraries/CmsLib.php
@@ -213,6 +213,7 @@ class CmsLib
 			return $news;
 
 		$news = getData($news);
+		//var_dump($news->maxPageCount);
 		foreach ($news as $newsobj) {
 			if ($studiengang_kz && $edit && !$newsobj->studiengang_kz)
 				continue;
diff --git a/application/models/content/News_model.php b/application/models/content/News_model.php
index 88d97bd09..de4c7f8da 100644
--- a/application/models/content/News_model.php
+++ b/application/models/content/News_model.php
@@ -27,16 +27,7 @@ class News_model extends DB_Model
 		);
 	}
 
-	private function getMaxPageCount($page_size)
-	{
-		$this->addSelect(['Count(*)']);
-		$count = $this->load();
-		$count = hasData($count) ? getData($count)[0]->count : null;
-		$floatMaxPageCount = $count / $page_size;
 
-		// ceil, to include remaining rows into the last page 
-		return ceil($floatMaxPageCount);
-	}
 
 	/**
 	 * @param string            $sprache
@@ -53,20 +44,8 @@ class News_model extends DB_Model
 	 * 
 	 * @return stdObj
 	 */
-	public function getNewsWithContent($sprache, $studiengang_kz, $semester, $fachbereich_kurzbz = null, $sichtbar = true, $maxalter = 0, $page = 1, $page_size = 10, $all = false, $mischen = true)
+	public function getNewsWithContentQuery($sprache, $studiengang_kz, $semester, $fachbereich_kurzbz = null, $sichtbar = true, $maxalter = 0, $page = 1, $page_size = 10, $all = false, $mischen = true)
 	{
-		if (isset($page) && is_numeric($page) && isset($page_size) && is_numeric($page_size) && $page > 0 && $page_size > 0) {
-
-			$maxPageCount = $this->getMaxPageCount($page_size);
-			if ($maxPageCount) {
-				$page = $page % $maxPageCount;
-			}
-			$offset = $page * $page_size;
-			$this->addLimit($page_size, $offset);
-
-		} else {
-			$this->addLimit($page_size);
-		}
 
 		$this->addOrder('datum', 'DESC');
 
@@ -124,9 +103,24 @@ class News_model extends DB_Model
 
 		$this->db->where($where, NULL, FALSE);
 
-		$sql = $this->db->get_compiled_select($this->dbTable);
+		// calculating the maxPageCount and adding pagination to the query
+		$maxPageCount = $this->getMaxPageCount($page_size, $params);
+		$this->addPagination($page, $page_size, $maxPageCount);
+
+		// creating the select query
+		$query = new stdClass();
+		$query->sql = $this->db->get_compiled_select($this->dbTable);
+		$query->params = $params;
+		$query->maxPageCount = $maxPageCount;
+		return $query;
+
+	}
+
+	function getNewsWithContent($sprache, $studiengang_kz, $semester, $fachbereich_kurzbz = null, $sichtbar = true, $maxalter = 0, $page = 1, $page_size = 10, $all = false, $mischen = true)
+	{
+		$query = $this->getNewsWithContentQuery($sprache, $studiengang_kz, $semester, $fachbereich_kurzbz, $sichtbar, $maxalter, $page, $page_size, $all, $mischen);
+		return $this->execReadOnlyQuery($query->sql, $query->params);
 
-		return $this->execQuery($sql, $params);
 	}
 
 }
diff --git a/public/js/apps/api/cms.js b/public/js/apps/api/cms.js
index 8ad2f1f32..8352bcf65 100644
--- a/public/js/apps/api/cms.js
+++ b/public/js/apps/api/cms.js
@@ -1,5 +1,6 @@
 export default {
-  getNews: function (page = 1, pageSize = 10) {
+  getNews: function (page = 1) {
+    console.log("this is the page that was passed", page);
     const url =
       FHC_JS_DATA_STORAGE_OBJECT.app_root +
       FHC_JS_DATA_STORAGE_OBJECT.ci_router +
@@ -7,8 +8,14 @@ export default {
     return axios.get(url, {
       params: {
         page,
-        pageSize,
       },
     });
   },
+  getNewsMaxPage: function () {
+    const url =
+      FHC_JS_DATA_STORAGE_OBJECT.app_root +
+      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+      "/CisHtml/Cms/getNewsMaxPage";
+    return axios.get(url);
+  },
 };
diff --git a/public/js/components/Cis/Cms/Content.js b/public/js/components/Cis/Cms/Content.js
index 415743e85..793f2652d 100644
--- a/public/js/components/Cis/Cms/Content.js
+++ b/public/js/components/Cis/Cms/Content.js
@@ -7,11 +7,13 @@ export default {
   data() {
     return {
       content: null,
+      maxPageCount: 0,
     };
   },
   methods: {
     loadNewPageContent: function (data) {
       Vue.$fhcapi.Cms.getNews(data.page).then((result) => {
+        console.log("fetched url :", result.data);
         this.content = result.data;
       });
     },
@@ -20,9 +22,13 @@ export default {
     Vue.$fhcapi.Cms.getNews().then((result) => {
       this.content = result.data;
     });
+
+    Vue.$fhcapi.Cms.getNewsMaxPage().then((result) => {
+      this.maxPageCount = result.data;
+    });
   },
   template: /*html*/ `
-    <pagination @page="loadNewPageContent">
+    <pagination @page="loadNewPageContent" :maxPageCount="maxPageCount">
     <div v-html="content"></div>
     </pagination>`,
 };
diff --git a/public/js/components/Pagination/Pagination.js b/public/js/components/Pagination/Pagination.js
index 0222a0dfa..0b6044d73 100644
--- a/public/js/components/Pagination/Pagination.js
+++ b/public/js/components/Pagination/Pagination.js
@@ -2,6 +2,12 @@ export default {
   components: {
     paginator: primevue.paginator,
   },
+  props: {
+    maxPageCount: {
+      type: Number,
+      default: 0,
+    },
+  },
   data() {
     return {};
   },
@@ -15,10 +21,10 @@ export default {
   },
   template: /*html*/ `
     
-  
-    <paginator @page="(page)=>$emit('page',{...page, page:page.page+1})" :rows="1"  :totalRecords="120" ></paginator>
+    <pre>{{JSON.stringify(maxPageCount,null,2)}}</pre>
+    <paginator @page="(data)=>$emit('page',{...data, page:data.page+1})" :rows="10" :totalRecords="maxPageCount" :rowsPerPageOptions="[10, 20, 30]" ></paginator>
     <slot>
-    NO CONTENT WAS PROVIDED
+    Placeholder
     </slot>
     <paginator :rows="10" :totalRecords="120" :rowsPerPageOptions="[10, 20, 30]"></paginator>
 

From 7bd70a643657db0b0f88336271f6257b6c12dc5e Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 17 Apr 2024 14:54:22 +0200
Subject: [PATCH 0689/1461] makes it possible to send the page_size from the
 frontend to the backend to adopt how many rows to query

---
 application/controllers/CisHtml/Cms.php       | 19 +++++++++++++------
 public/js/apps/api/cms.js                     |  4 ++--
 public/js/components/Cis/Cms/Content.js       |  5 ++---
 public/js/components/Pagination/Pagination.js |  9 +++------
 4 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/application/controllers/CisHtml/Cms.php b/application/controllers/CisHtml/Cms.php
index d15b4fabc..93abd3f14 100644
--- a/application/controllers/CisHtml/Cms.php
+++ b/application/controllers/CisHtml/Cms.php
@@ -29,7 +29,7 @@ class Cms extends FHC_Controller
 		$this->load->model('content/News_model', 'NewsModel');
 
 		// setting up the papgination_size
-		$this->pagination_size = 10;
+		$this->page_size = 10;
 	}
 
 	// -----------------------------------------------------------------------------------------------------------------
@@ -71,10 +71,17 @@ class Cms extends FHC_Controller
 
 	public function getNews($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
 	{
-		$page = intval($this->input->get('page', true));
-
-
-		$news = $this->cmslib->getNews($infoscreen, $studiengang_kz, $semester, $mischen, $titel, $edit, $sichtbar, $page, $this->pagination_size);
+		$get_page = intval($this->input->get('page', true));
+		$get_page_size = intval($this->input->get('page_size', true));
+		if ($get_page) {
+			$page = $get_page;
+		}
+		if ($get_page_size) {
+			$page_size = $get_page_size;
+		} else {
+			$page_size = $this->page_size;
+		}
+		$news = $this->cmslib->getNews($infoscreen, $studiengang_kz, $semester, $mischen, $titel, $edit, $sichtbar, $page, $page_size);
 
 		if (isError($news)) {
 			echo json_encode(getError($news));
@@ -101,7 +108,7 @@ class Cms extends FHC_Controller
 			}
 		}
 		$all = $edit;
-		$query = $this->NewsModel->getNewsWithContentQuery(getSprache(), $studiengang_kz, $semester, $fachbereich_kurzbz, $sichtbar, $maxalter, $page, $this->pagination_size, $all, $mischen);
+		$query = $this->NewsModel->getNewsWithContentQuery(getSprache(), $studiengang_kz, $semester, $fachbereich_kurzbz, $sichtbar, $maxalter, $page, $this->page_size, $all, $mischen);
 		echo json_encode($query->maxPageCount);
 	}
 }
diff --git a/public/js/apps/api/cms.js b/public/js/apps/api/cms.js
index 8352bcf65..94b3d282e 100644
--- a/public/js/apps/api/cms.js
+++ b/public/js/apps/api/cms.js
@@ -1,6 +1,5 @@
 export default {
-  getNews: function (page = 1) {
-    console.log("this is the page that was passed", page);
+  getNews: function (page = 1, page_size = 10) {
     const url =
       FHC_JS_DATA_STORAGE_OBJECT.app_root +
       FHC_JS_DATA_STORAGE_OBJECT.ci_router +
@@ -8,6 +7,7 @@ export default {
     return axios.get(url, {
       params: {
         page,
+        page_size,
       },
     });
   },
diff --git a/public/js/components/Cis/Cms/Content.js b/public/js/components/Cis/Cms/Content.js
index 793f2652d..7fe6bb5c1 100644
--- a/public/js/components/Cis/Cms/Content.js
+++ b/public/js/components/Cis/Cms/Content.js
@@ -12,14 +12,13 @@ export default {
   },
   methods: {
     loadNewPageContent: function (data) {
-      Vue.$fhcapi.Cms.getNews(data.page).then((result) => {
-        console.log("fetched url :", result.data);
+      Vue.$fhcapi.Cms.getNews(data.page, data.rows).then((result) => {
         this.content = result.data;
       });
     },
   },
   created() {
-    Vue.$fhcapi.Cms.getNews().then((result) => {
+    Vue.$fhcapi.Cms.getNews(1, 10).then((result) => {
       this.content = result.data;
     });
 
diff --git a/public/js/components/Pagination/Pagination.js b/public/js/components/Pagination/Pagination.js
index 0b6044d73..666f03929 100644
--- a/public/js/components/Pagination/Pagination.js
+++ b/public/js/components/Pagination/Pagination.js
@@ -16,17 +16,14 @@ export default {
       //console.log("hier", data.page);
     },
   },
-  mounted() {
-    console.log("pagination mounted");
-  },
+  mounted() {},
   template: /*html*/ `
     
-    <pre>{{JSON.stringify(maxPageCount,null,2)}}</pre>
+    
     <paginator @page="(data)=>$emit('page',{...data, page:data.page+1})" :rows="10" :totalRecords="maxPageCount" :rowsPerPageOptions="[10, 20, 30]" ></paginator>
     <slot>
     Placeholder
     </slot>
-    <paginator :rows="10" :totalRecords="120" :rowsPerPageOptions="[10, 20, 30]"></paginator>
-
+   
   `,
 };

From 5142f5656b4538b5425fcb4704181072cd91635a Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 17 Apr 2024 15:12:55 +0200
Subject: [PATCH 0690/1461] passes the page_size down from the parent component
 to the child component

---
 public/js/components/Cis/Cms/Content.js       | 5 +++--
 public/js/components/Pagination/Pagination.js | 7 ++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/public/js/components/Cis/Cms/Content.js b/public/js/components/Cis/Cms/Content.js
index 7fe6bb5c1..9ba98f2a1 100644
--- a/public/js/components/Cis/Cms/Content.js
+++ b/public/js/components/Cis/Cms/Content.js
@@ -8,6 +8,7 @@ export default {
     return {
       content: null,
       maxPageCount: 0,
+      page_size: 10,
     };
   },
   methods: {
@@ -18,7 +19,7 @@ export default {
     },
   },
   created() {
-    Vue.$fhcapi.Cms.getNews(1, 10).then((result) => {
+    Vue.$fhcapi.Cms.getNews(1, this.page_size).then((result) => {
       this.content = result.data;
     });
 
@@ -27,7 +28,7 @@ export default {
     });
   },
   template: /*html*/ `
-    <pagination @page="loadNewPageContent" :maxPageCount="maxPageCount">
+    <pagination :page_size="page_size"  @page="loadNewPageContent" :maxPageCount="maxPageCount">
     <div v-html="content"></div>
     </pagination>`,
 };
diff --git a/public/js/components/Pagination/Pagination.js b/public/js/components/Pagination/Pagination.js
index 666f03929..ce27180f7 100644
--- a/public/js/components/Pagination/Pagination.js
+++ b/public/js/components/Pagination/Pagination.js
@@ -2,11 +2,16 @@ export default {
   components: {
     paginator: primevue.paginator,
   },
+  emits: ["update:rows"],
   props: {
     maxPageCount: {
       type: Number,
       default: 0,
     },
+    page_size: {
+      type: Number,
+      default: 10,
+    },
   },
   data() {
     return {};
@@ -20,7 +25,7 @@ export default {
   template: /*html*/ `
     
     
-    <paginator @page="(data)=>$emit('page',{...data, page:data.page+1})" :rows="10" :totalRecords="maxPageCount" :rowsPerPageOptions="[10, 20, 30]" ></paginator>
+    <paginator v-model:rows="page_size" @page="(data)=>$emit('page',{...data, page:data.page+1})" :rows="page_size" :totalRecords="maxPageCount" :rowsPerPageOptions="[10, 20, 30]" ></paginator>
     <slot>
     Placeholder
     </slot>

From 5ac0b249ec85d785dc999a69a597f28200acfbb1 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 17 Apr 2024 15:15:51 +0200
Subject: [PATCH 0691/1461] makes component Pagination page_size prop a
 required prop

---
 public/js/components/Pagination/Pagination.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Pagination/Pagination.js b/public/js/components/Pagination/Pagination.js
index ce27180f7..db751e1d9 100644
--- a/public/js/components/Pagination/Pagination.js
+++ b/public/js/components/Pagination/Pagination.js
@@ -10,7 +10,7 @@ export default {
     },
     page_size: {
       type: Number,
-      default: 10,
+      required: true,
     },
   },
   data() {

From c2a782e1646096a4c12a12cf8660d2ebe8eb9233 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 18 Apr 2024 11:52:58 +0200
Subject: [PATCH 0692/1461] updates news fetching and DB_Model pagination
 methods

---
 application/controllers/CisHtml/Cms.php       | 41 ++++++------
 application/core/DB_Model.php                 | 51 +++++++-------
 application/libraries/CmsLib.php              | 41 +++++++-----
 application/models/content/News_model.php     | 67 +++++++++----------
 public/js/apps/api/cms.js                     |  4 +-
 public/js/components/Cis/Cms/Content.js       |  2 +-
 public/js/components/Pagination/Pagination.js |  3 +-
 7 files changed, 108 insertions(+), 101 deletions(-)

diff --git a/application/controllers/CisHtml/Cms.php b/application/controllers/CisHtml/Cms.php
index 93abd3f14..f56b3eea3 100644
--- a/application/controllers/CisHtml/Cms.php
+++ b/application/controllers/CisHtml/Cms.php
@@ -84,31 +84,30 @@ class Cms extends FHC_Controller
 		$news = $this->cmslib->getNews($infoscreen, $studiengang_kz, $semester, $mischen, $titel, $edit, $sichtbar, $page, $page_size);
 
 		if (isError($news)) {
-			echo json_encode(getError($news));
+			$this->terminateWithJsonError(getError($news));
 		}
-		echo json_encode(getData($news));
+		$news = hasData($news) ? getData($news) : null;
+		if ($news) {
+			echo json_encode($news);
+		} else {
+			show_error("News: No data found");
+		}
+
 	}
 
-	public function getNewsMaxPage($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $fachbereich_kurzbz = null, $maxalter = 0, $edit = false, $sichtbar = true, $page = 1, $page_size = 10)
+	public function getNewsRowCount($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $fachbereich_kurzbz = null, $maxalter = 0, $edit = false, $sichtbar = true, $page = 1, $page_size = 10)
 	{
-		$this->load->model('crm/Student_model', 'StudentModel');
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-
-		if (!$infoscreen && ($studiengang_kz === null || $semester === null)) {
-			//Zum anzeigen der Studiengang-Details neben den News
-			$student = $this->StudentModel->loadWhere(['student_uid' => get_uid()]);
-			if (isError($student))
-				return $student;
-			if (getData($student)) {
-				$student = current(getData($student));
-				if ($studiengang_kz === null)
-					$studiengang_kz = $student->studiengang_kz;
-				if ($semester === null)
-					$semester = $student->semester;
-			}
-		}
+		list($studiengang_kz, $semester) = $this->cmslib->getStgAndSem($studiengang_kz, $semester);
 		$all = $edit;
-		$query = $this->NewsModel->getNewsWithContentQuery(getSprache(), $studiengang_kz, $semester, $fachbereich_kurzbz, $sichtbar, $maxalter, $page, $this->page_size, $all, $mischen);
-		echo json_encode($query->maxPageCount);
+		$num_rows = $this->NewsModel->countNewsWithContent(getSprache(), $studiengang_kz, $semester, $fachbereich_kurzbz, $sichtbar, $maxalter, $page, $this->page_size, $all, $mischen);
+		if (isError($num_rows)) {
+			$this->terminateWithJsonError(getError($num_rows));
+		}
+		$num_rows = hasData($num_rows) ? getData($num_rows) : null;
+		if ($num_rows) {
+			echo json_encode($num_rows);
+		} else {
+			show_error("News number rows: No data found");
+		}
 	}
 }
diff --git a/application/core/DB_Model.php b/application/core/DB_Model.php
index 5304fbe83..d65cb3cf5 100644
--- a/application/core/DB_Model.php
+++ b/application/core/DB_Model.php
@@ -1077,18 +1077,26 @@ class DB_Model extends CI_Model
 		return $udfs;
 	}
 
-	function addPagination( $page, $page_size, $maxPageCount=null)
+	/**
+	 * addPagination
+	 * adds a limit and an optional offset depending on the arguments passed to the function
+	 * @param   int $page	page to be queried
+	 * @param   int $page_size	page_size used to calculate the offset of the pagination
+	 * @param   int | null $num_rows	used to calculate the total amout of pages that are available with the $page and $page_size arguments
+	 * 
+	 * @return	void
+	 */
+	function addPagination( $page, $page_size, $num_rows=null)
 	{
 		if (isset($page) && is_numeric($page) && isset($page_size) && is_numeric($page_size) && $page > 0 && $page_size > 0) {
 			
-			if (isset($maxPageCount) && is_numeric($maxPageCount) && $maxPageCount > 0) {
-				$floatMaxPageCount = $maxPageCount / $page_size;
-				$floatMaxPageCount = ceil($floatMaxPageCount);
-				if($page > $floatMaxPageCount){
-					$page = $floatMaxPageCount;
+			if (isset($num_rows) && is_numeric($num_rows) && $num_rows > 0) {
+				$floatMaxPageCount = $num_rows / $page_size;
+				$maxPageCount = ceil($floatMaxPageCount);
+				if($page > $maxPageCount){
+					$page = $maxPageCount;
 				}
 			}
-			// else if page is to big
 			$offset = (($page-1) * $page_size); 
 			$this->addLimit($page_size, $offset);
 
@@ -1097,25 +1105,22 @@ class DB_Model extends CI_Model
 		}
 	}
 
-	function getMaxPageCount( $page_size, $params=null )
+	/**
+	 * getQueryNumRows
+	 * returns the number of rows of the current build query of the codeigniter query builder instance
+	 * @param   bool $reset	resets the select of the query 
+	 * 
+	 * @return	Result_object $num_rows
+	 */
+	function getNumRows($reset=false)
 	{
-		// we clone the original query, so we dont have to change the origial query
-		$instance_copy = clone $this;
-		$db_copy = clone $this->db;
-		$countSql = $db_copy->get_compiled_select($instance_copy->dbTable,false);
-		$countSql = "SELECT COUNT(*) FROM (". $countSql .") as count;";
-		
-		// calculating the maxPageCount and adding the pagination to the query
-		$num_rows_query_result = $instance_copy->execReadOnlyQuery($countSql, $params);
-		
-		if(isError($num_rows_query_result)){
+		// returns the number of rows when executing the current query without reseting the select statement of the query
+		$num_rows = $this->db->count_all_results($this->dbTable,$reset);
+		if($num_rows){
+			return success($num_rows);
+		}else{
 			return error($this->db->error(), EXIT_DATABASE);
 		}
-		$num_rows = getData($num_rows_query_result)[0]->count;
-		
-		
-		// ceil, to include remaining rows into the last page 
-		return $num_rows;
 	}
 }
 
diff --git a/application/libraries/CmsLib.php b/application/libraries/CmsLib.php
index 8a57c1086..0fa3b0556 100644
--- a/application/libraries/CmsLib.php
+++ b/application/libraries/CmsLib.php
@@ -173,6 +173,30 @@ class CmsLib
 		], true));
 	}
 
+	/**
+	 * @param string			$studiengang_kz
+	 * @param string			$semester
+	 * 
+	 * @return array			queried studiengang_kz and semester
+	 */
+	public function getStgAndSem($studiengang_kz, $semester)
+	{
+		$this->ci->load->model('crm/Student_model', 'StudentModel');
+
+		//Zum anzeigen der Studiengang-Details neben den News
+		$student = $this->ci->StudentModel->loadWhere(['student_uid' => getAuthUID()]);
+		if (isError($student))
+			return $student;
+		if (getData($student)) {
+			$student = current(getData($student));
+			if ($studiengang_kz === null)
+				$studiengang_kz = $student->studiengang_kz;
+			if ($semester === null)
+				$semester = $student->semester;
+		}
+		return [$studiengang_kz, $semester];
+	}
+
 	/**
 	 * @param boolean			$infoscreen
 	 * @param string | null		$studiengang_kz
@@ -186,22 +210,7 @@ class CmsLib
 	 */
 	public function getNews($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true, $page = 1, $page_size = 10)
 	{
-		$this->ci->load->model('crm/Student_model', 'StudentModel');
-		$this->ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
-
-		if (!$infoscreen && ($studiengang_kz === null || $semester === null)) {
-			//Zum anzeigen der Studiengang-Details neben den News
-			$student = $this->ci->StudentModel->loadWhere(['student_uid' => get_uid()]);
-			if (isError($student))
-				return $student;
-			if (getData($student)) {
-				$student = current(getData($student));
-				if ($studiengang_kz === null)
-					$studiengang_kz = $student->studiengang_kz;
-				if ($semester === null)
-					$semester = $student->semester;
-			}
-		}
+		list($studiengang_kz, $semester) = $this->getStgAndSem($studiengang_kz, $semester);
 		$all = $edit;
 
 		$xml = '<?xml version="1.0" encoding="UTF-8"?><content>';
diff --git a/application/models/content/News_model.php b/application/models/content/News_model.php
index de4c7f8da..f4f98b601 100644
--- a/application/models/content/News_model.php
+++ b/application/models/content/News_model.php
@@ -36,15 +36,15 @@ class News_model extends DB_Model
 	 * @param string            $fachbereich_kurzbz
 	 * @param boolean           $sichtbar
 	 * @param integer           $maxalter
+	 * @param integer           $page
 	 * @param integer           $page_size
 	 * @param boolean           $all
 	 * @param boolean           $mischen
 	 * 
 	 * TODO(chris): this is not a good function -> the params are all over the place
 	 * 
-	 * @return stdObj
 	 */
-	public function getNewsWithContentQuery($sprache, $studiengang_kz, $semester, $fachbereich_kurzbz = null, $sichtbar = true, $maxalter = 0, $page = 1, $page_size = 10, $all = false, $mischen = true)
+	protected function prepareNewsWithContent($sprache, $studiengang_kz, $semester, $fachbereich_kurzbz = null, $sichtbar = true, $maxalter = 0, $page = 1, $page_size = 10, $all = false, $mischen = true)
 	{
 
 		$this->addOrder('datum', 'DESC');
@@ -53,10 +53,9 @@ class News_model extends DB_Model
 		$fachbereich_kurzbz = trim($fachbereich_kurzbz);
 
 		$where = [];
-		$params = [];
 		if (trim($maxalter) != '0') {
-			$where[] = "(now()-datum) < interval ? days";
-			$params[] = $maxalter;
+			$where[] = "(now()-datum) < interval " . $this->db->escape($maxalter) . " days";
+
 		}
 		if (!$all) {
 			$where[] = "datum <= now()";
@@ -66,61 +65,57 @@ class News_model extends DB_Model
 			if ($fachbereich_kurzbz == '') {
 				$where[] = "fachbereich_kurzbz IS NULL";
 			} else {
-				$where[] = "fachbereich_kurzbz = ?";
-				$params[] = $fachbereich_kurzbz;
+				$where[] = "fachbereich_kurzbz = " . $this->db->escape($fachbereich_kurzbz);
+
 			}
 		}
 		if ($studiengang_kz == '0') {
-			$where[] = "studiengang_kz = ?";
-			$params[] = $studiengang_kz;
+			$where[] = "studiengang_kz = " . $this->db->escape($studiengang_kz);
+
 			if ($semester === NULL)
 				$where[] = "semester IS NULL";
 			elseif ($semester === 0)
 				$where[] = "semester = 0";
 		} elseif ($studiengang_kz != '') {
 			$add = $mischen === true ? " OR (studiengang_kz = 0 AND semester IS NULL)" : "";
-			$where[] = "((studiengang_kz = ? AND semester = ?) OR (studiengang_kz = ? AND semester = 0) OR (studiengang_kz = 0 AND semester = ?)" . $add . ")";
-			$params[] = $studiengang_kz;
-			$params[] = $semester;
-			$params[] = $studiengang_kz;
-			$params[] = $semester;
+			$where[] = "((studiengang_kz = " . $this->db->escape($studiengang_kz) . " AND semester = " . $this->db->escape($semester) . ") OR (studiengang_kz = " . $this->db->escape($studiengang_kz) . " AND semester = 0) OR (studiengang_kz = 0 AND semester = " . $this->db->escape($semester) . ")" . $add . ")";
+
 		}
 		$this->addJoin('campus.tbl_contentsprache cs', 'content_id');
 
 		$where[] = "cs.sichtbar = " . ($sichtbar ? "true" : "false");
 
-		$where[] = "cs.sprache = (CASE WHEN EXISTS(SELECT 1 FROM campus.tbl_contentsprache cs2 WHERE cs2.content_id=" . $this->dbTable . ".content_id AND sprache=?) THEN ? ELSE ? END)";
-		$params[] = $sprache;
-		$params[] = $sprache;
-		$params[] = DEFAULT_LANGUAGE;
+		$where[] = "cs.sprache = (CASE WHEN EXISTS(SELECT 1 FROM campus.tbl_contentsprache cs2 WHERE cs2.content_id=" . $this->dbTable . ".content_id AND sprache=" . $this->db->escape($sprache) . ") THEN " . $this->db->escape($sprache) . " ELSE " . $this->db->escape(DEFAULT_LANGUAGE) . " END)";
+
+
+		$where[] = "cs.version = (SELECT MAX(version) FROM campus.tbl_contentsprache cs3 WHERE cs3.content_id=" . $this->dbTable . ".content_id AND cs3.sprache = (CASE WHEN EXISTS(SELECT 1 FROM campus.tbl_contentsprache cs2 WHERE cs2.content_id=" . $this->dbTable . ".content_id AND sprache=" . $this->db->escape($sprache) . ") THEN " . $this->db->escape($sprache) . " ELSE " . $this->db->escape(DEFAULT_LANGUAGE) . " END))";
 
-		$where[] = "cs.version = (SELECT MAX(version) FROM campus.tbl_contentsprache cs3 WHERE cs3.content_id=" . $this->dbTable . ".content_id AND cs3.sprache = (CASE WHEN EXISTS(SELECT 1 FROM campus.tbl_contentsprache cs2 WHERE cs2.content_id=" . $this->dbTable . ".content_id AND sprache=?) THEN ? ELSE ? END))";
-		$params[] = $sprache;
-		$params[] = $sprache;
-		$params[] = DEFAULT_LANGUAGE;
 
 		$where = implode(" AND ", $where);
 
 		$this->db->where($where, NULL, FALSE);
 
-		// calculating the maxPageCount and adding pagination to the query
-		$maxPageCount = $this->getMaxPageCount($page_size, $params);
-		$this->addPagination($page, $page_size, $maxPageCount);
-
-		// creating the select query
-		$query = new stdClass();
-		$query->sql = $this->db->get_compiled_select($this->dbTable);
-		$query->params = $params;
-		$query->maxPageCount = $maxPageCount;
-		return $query;
-
 	}
 
-	function getNewsWithContent($sprache, $studiengang_kz, $semester, $fachbereich_kurzbz = null, $sichtbar = true, $maxalter = 0, $page = 1, $page_size = 10, $all = false, $mischen = true)
+	public function getNewsWithContent($sprache, $studiengang_kz, $semester, $fachbereich_kurzbz = null, $sichtbar = true, $maxalter = 0, $page = 1, $page_size = 10, $all = false, $mischen = true)
 	{
-		$query = $this->getNewsWithContentQuery($sprache, $studiengang_kz, $semester, $fachbereich_kurzbz, $sichtbar, $maxalter, $page, $page_size, $all, $mischen);
-		return $this->execReadOnlyQuery($query->sql, $query->params);
+		$this->prepareNewsWithContent($sprache, $studiengang_kz, $semester, $fachbereich_kurzbz, $sichtbar, $maxalter, $page, $page_size, $all, $mischen);
 
+		// getting the number of rows of the query and adding pagination to the query result
+		$num_rows = $this->getNumRows(true);
+		$this->addPagination($page, $page_size, $num_rows);
+
+		// preparing the query again because every call to get_compiled_select or cour_all_results will add the from clause to the query
+		$this->prepareNewsWithContent($sprache, $studiengang_kz, $semester, $fachbereich_kurzbz, $sichtbar, $maxalter, $page, $page_size, $all, $mischen);
+
+		return $this->load();
 	}
 
+	public function countNewsWithContent($sprache, $studiengang_kz, $semester, $fachbereich_kurzbz = null, $sichtbar = true, $maxalter = 0, $page = 1, $page_size = 10, $all = false, $mischen = true)
+	{
+		$this->prepareNewsWithContent($sprache, $studiengang_kz, $semester, $fachbereich_kurzbz, $sichtbar, $maxalter, $page, $page_size, $all, $mischen);
+		return $this->getNumRows();
+	}
+
+
 }
diff --git a/public/js/apps/api/cms.js b/public/js/apps/api/cms.js
index 94b3d282e..6fbb0e727 100644
--- a/public/js/apps/api/cms.js
+++ b/public/js/apps/api/cms.js
@@ -11,11 +11,11 @@ export default {
       },
     });
   },
-  getNewsMaxPage: function () {
+  getNewsRowCount: function () {
     const url =
       FHC_JS_DATA_STORAGE_OBJECT.app_root +
       FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-      "/CisHtml/Cms/getNewsMaxPage";
+      "/CisHtml/Cms/getNewsRowCount";
     return axios.get(url);
   },
 };
diff --git a/public/js/components/Cis/Cms/Content.js b/public/js/components/Cis/Cms/Content.js
index 9ba98f2a1..bac28c23c 100644
--- a/public/js/components/Cis/Cms/Content.js
+++ b/public/js/components/Cis/Cms/Content.js
@@ -23,7 +23,7 @@ export default {
       this.content = result.data;
     });
 
-    Vue.$fhcapi.Cms.getNewsMaxPage().then((result) => {
+    Vue.$fhcapi.Cms.getNewsRowCount().then((result) => {
       this.maxPageCount = result.data;
     });
   },
diff --git a/public/js/components/Pagination/Pagination.js b/public/js/components/Pagination/Pagination.js
index db751e1d9..8b2688834 100644
--- a/public/js/components/Pagination/Pagination.js
+++ b/public/js/components/Pagination/Pagination.js
@@ -24,8 +24,7 @@ export default {
   mounted() {},
   template: /*html*/ `
     
-    
-    <paginator v-model:rows="page_size" @page="(data)=>$emit('page',{...data, page:data.page+1})" :rows="page_size" :totalRecords="maxPageCount" :rowsPerPageOptions="[10, 20, 30]" ></paginator>
+   <paginator v-model:rows="page_size" @page="(data)=>$emit('page',{...data, page:data.page+1})" :rows="page_size" :totalRecords="maxPageCount" :rowsPerPageOptions="[10, 20, 30]" ></paginator>
     <slot>
     Placeholder
     </slot>

From d0509abb8b98c43be880b490f58dbb9906d59c69 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 18 Apr 2024 11:56:55 +0200
Subject: [PATCH 0693/1461] also adds the new controller functions to the
 CisVue/Cms and CisHmvc/Cms

---
 application/controllers/CisHmvc/Cms.php | 58 ++++++++++++++++++++++---
 application/controllers/CisVue/Cms.php  | 58 ++++++++++++++++++++++---
 2 files changed, 104 insertions(+), 12 deletions(-)

diff --git a/application/controllers/CisHmvc/Cms.php b/application/controllers/CisHmvc/Cms.php
index d15f398a4..eed1a5fea 100644
--- a/application/controllers/CisHmvc/Cms.php
+++ b/application/controllers/CisHmvc/Cms.php
@@ -77,6 +77,17 @@ class Cms extends Auth_Controller
 		$this->load->view('CisHmvc/Cms/Content', ['content' => getData($content)]);
 	}
 
+	/**
+	 * @param boolean			$infoscreen
+	 * @param string | null		$studiengang_kz
+	 * @param int | null		$semester
+	 * @param boolean			$mischen
+	 * @param string			$titel
+	 * @param boolean			$edit
+	 * @param boolean			$sichtbar
+	 *
+	 * @return void
+	 */
 	/**
 	 * @param boolean			$infoscreen
 	 * @param string | null		$studiengang_kz
@@ -90,13 +101,48 @@ class Cms extends Auth_Controller
 	 */
 	public function news($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
 	{
-		$page = intval($this->input->get('page', true));
-		$pagination_size = 10;
-		$news = $this->cmslib->getNews($infoscreen, $studiengang_kz, $semester, $mischen, $titel, $edit, $sichtbar, $page, $pagination_size);
+		$this->load->view('CisHtml/Cms/Content', ['infoscreen' => $infoscreen, 'studiengang_kz' => $studiengang_kz, 'semester' => $semester, 'mischen' => $mischen, 'titel' => $titel, 'edit' => $edit, 'sichtbar' => $sichtbar]);
+	}
 
-		if (isError($news))
-			return $this->load->view('CisHmvc/Error', ['error' => getError($news)]);
+	public function getNews($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
+	{
+		$get_page = intval($this->input->get('page', true));
+		$get_page_size = intval($this->input->get('page_size', true));
+		if ($get_page) {
+			$page = $get_page;
+		}
+		if ($get_page_size) {
+			$page_size = $get_page_size;
+		} else {
+			$page_size = $this->page_size;
+		}
+		$news = $this->cmslib->getNews($infoscreen, $studiengang_kz, $semester, $mischen, $titel, $edit, $sichtbar, $page, $page_size);
 
-		$this->load->view('CisHmvc/Cms/Content', ['content' => getData($news)]);
+		if (isError($news)) {
+			$this->terminateWithJsonError(getError($news));
+		}
+		$news = hasData($news) ? getData($news) : null;
+		if ($news) {
+			echo json_encode($news);
+		} else {
+			show_error("News: No data found");
+		}
+
+	}
+
+	public function getNewsRowCount($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $fachbereich_kurzbz = null, $maxalter = 0, $edit = false, $sichtbar = true, $page = 1, $page_size = 10)
+	{
+		list($studiengang_kz, $semester) = $this->cmslib->getStgAndSem($studiengang_kz, $semester);
+		$all = $edit;
+		$num_rows = $this->NewsModel->countNewsWithContent(getSprache(), $studiengang_kz, $semester, $fachbereich_kurzbz, $sichtbar, $maxalter, $page, $this->page_size, $all, $mischen);
+		if (isError($num_rows)) {
+			$this->terminateWithJsonError(getError($num_rows));
+		}
+		$num_rows = hasData($num_rows) ? getData($num_rows) : null;
+		if ($num_rows) {
+			echo json_encode($num_rows);
+		} else {
+			show_error("News number rows: No data found");
+		}
 	}
 }
diff --git a/application/controllers/CisVue/Cms.php b/application/controllers/CisVue/Cms.php
index 0f3fc061a..2c1fa1fc6 100644
--- a/application/controllers/CisVue/Cms.php
+++ b/application/controllers/CisVue/Cms.php
@@ -47,6 +47,17 @@ class Cms extends FHC_Controller
 		$this->load->view('CisHtml/Cms/Content', ['content' => getData($content)]);
 	}
 
+	/**
+	 * @param boolean			$infoscreen
+	 * @param string | null		$studiengang_kz
+	 * @param int | null		$semester
+	 * @param boolean			$mischen
+	 * @param string			$titel
+	 * @param boolean			$edit
+	 * @param boolean			$sichtbar
+	 *
+	 * @return void
+	 */
 	/**
 	 * @param boolean			$infoscreen
 	 * @param string | null		$studiengang_kz
@@ -60,13 +71,48 @@ class Cms extends FHC_Controller
 	 */
 	public function news($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
 	{
-		$page = intval($this->input->get('page', true));
-		$pagination_size = 10;
-		$news = $this->cmslib->getNews($infoscreen, $studiengang_kz, $semester, $mischen, $titel, $edit, $sichtbar, $page, $pagination_size);
+		$this->load->view('CisHtml/Cms/Content', ['infoscreen' => $infoscreen, 'studiengang_kz' => $studiengang_kz, 'semester' => $semester, 'mischen' => $mischen, 'titel' => $titel, 'edit' => $edit, 'sichtbar' => $sichtbar]);
+	}
 
-		if (isError($news))
-			return $this->load->view('CisHtml/Error', ['error' => getError($news)]);
+	public function getNews($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
+	{
+		$get_page = intval($this->input->get('page', true));
+		$get_page_size = intval($this->input->get('page_size', true));
+		if ($get_page) {
+			$page = $get_page;
+		}
+		if ($get_page_size) {
+			$page_size = $get_page_size;
+		} else {
+			$page_size = $this->page_size;
+		}
+		$news = $this->cmslib->getNews($infoscreen, $studiengang_kz, $semester, $mischen, $titel, $edit, $sichtbar, $page, $page_size);
 
-		$this->load->view('CisHtml/Cms/Content', ['content' => getData($news)]);
+		if (isError($news)) {
+			$this->terminateWithJsonError(getError($news));
+		}
+		$news = hasData($news) ? getData($news) : null;
+		if ($news) {
+			echo json_encode($news);
+		} else {
+			show_error("News: No data found");
+		}
+
+	}
+
+	public function getNewsRowCount($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $fachbereich_kurzbz = null, $maxalter = 0, $edit = false, $sichtbar = true, $page = 1, $page_size = 10)
+	{
+		list($studiengang_kz, $semester) = $this->cmslib->getStgAndSem($studiengang_kz, $semester);
+		$all = $edit;
+		$num_rows = $this->NewsModel->countNewsWithContent(getSprache(), $studiengang_kz, $semester, $fachbereich_kurzbz, $sichtbar, $maxalter, $page, $this->page_size, $all, $mischen);
+		if (isError($num_rows)) {
+			$this->terminateWithJsonError(getError($num_rows));
+		}
+		$num_rows = hasData($num_rows) ? getData($num_rows) : null;
+		if ($num_rows) {
+			echo json_encode($num_rows);
+		} else {
+			show_error("News number rows: No data found");
+		}
 	}
 }

From 0942480428b7d482cd4bbbac21e4358446a51a1f Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 8 May 2024 11:58:35 +0200
Subject: [PATCH 0694/1461] adds the missing model for the function

---
 application/libraries/CmsLib.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/libraries/CmsLib.php b/application/libraries/CmsLib.php
index 0fa3b0556..9a898df85 100644
--- a/application/libraries/CmsLib.php
+++ b/application/libraries/CmsLib.php
@@ -210,6 +210,7 @@ class CmsLib
 	 */
 	public function getNews($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true, $page = 1, $page_size = 10)
 	{
+		$this->ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
 		list($studiengang_kz, $semester) = $this->getStgAndSem($studiengang_kz, $semester);
 		$all = $edit;
 

From fd8e49c11f38c49a7a90f94dc8cc9932748a977d Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 8 May 2024 14:35:41 +0200
Subject: [PATCH 0695/1461] hotfix in Modal.js

---
 public/js/components/Bootstrap/Modal.js | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/public/js/components/Bootstrap/Modal.js b/public/js/components/Bootstrap/Modal.js
index 18adf96d2..734a3bdb9 100755
--- a/public/js/components/Bootstrap/Modal.js
+++ b/public/js/components/Bootstrap/Modal.js
@@ -68,6 +68,13 @@ export default {
 			slots.title = () => title;
 		if (footer !== undefined)
 			slots.footer = () => footer;
+
+		// little hack to check whether primevue is included in the app or not
+		let includedPrimevue = false;
+		if(typeof primevue !== 'undefined'){
+			includedPrimevue = true;
+		}
+
 		return new Promise((resolve,reject) => {
 			const instance = Vue.createApp({
 				setup() {
@@ -80,6 +87,7 @@ export default {
 				},
 				mounted() {
 					this.$refs.modal.show();
+					
 				},
 				beforeUnmount() {
 					if (this.$refs.modal)
@@ -90,8 +98,12 @@ export default {
 				}
 			});
 			const wrapper = document.createElement("div");
-			if (primevue)
+			
+			// if(primevue) --> won't work because primevue is not defined in this scope and promise would be rejected
+			if (includedPrimevue){
 				instance.use(primevue.config.default, {zIndex: {overlay: 9999}})
+			}
+				 
 			instance.use(Phrasen); // TODO(chris): find a more dynamic way
 			instance.mount(wrapper);
 			document.body.appendChild(wrapper);

From a0284c313afc149e8b29f3d21fb532c45404e3ff Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Mon, 13 May 2024 09:16:29 +0200
Subject: [PATCH 0696/1461] - funktion fuer das alle markierten akzeptieren
 getrennt - fehlende phrasen hinzugefuegt

---
 system/phrasesupdate.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 12e251133..1c41f67d8 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -17727,6 +17727,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'international',
+		'category' => 'international',
+		'phrase' => 'alledurchgefuehrten',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Alle durchgeführten anzeigen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Show all performed',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'international',
 		'category' => 'international',

From 56436078456e7d7ead05440f12b7b53d103797f0 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Mon, 13 May 2024 11:06:32 +0200
Subject: [PATCH 0697/1461] Added phrases 'statusErfolgreichUebertragen' and
 'statusUebertragenMsg' to Softwarebereitstellung app

---
 system/phrasesupdate.php | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 17daf06a4..90b16bac4 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -25919,6 +25919,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'statusErfolgreichUebertragen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Status erfolgreich übertragen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Status successfully transferred',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'statusUebertragenMsg',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Der Status {status} wurde erfolgreich von der übergeordneten Software mit ID {parentSoftware} auch auf die untergeordnete Software übertragen.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Status {status} has been successfully transferred from the parent software with ID {parentSoftware} to the child software.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 );
 
 

From 8a0d2a2f1065dc3dfb9d6843f26e19f0be714b4e Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Mon, 13 May 2024 14:02:05 +0200
Subject: [PATCH 0698/1461] Refactored Tabs title assignment to utilize
 computed property

This is necessary to render language phrases correctly
---
 public/js/components/Tabs.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Tabs.js b/public/js/components/Tabs.js
index b9a07e370..cde12e02b 100644
--- a/public/js/components/Tabs.js
+++ b/public/js/components/Tabs.js
@@ -75,7 +75,7 @@ export default {
 
 				tabs[key] = {
 					component: Vue.markRaw(Vue.defineAsyncComponent(() => import(item.component))),
-					title: item.title || key,
+					title: Vue.computed(() => item.title || key),
 					config: item.config,
 					key
 				}

From 3b762c8065452bf2daf628b2c1db382d357e7f29 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 13 May 2024 16:01:26 +0200
Subject: [PATCH 0699/1461] getStudentsForLvaInSemester data query;
 getLektorIsTeachingLE veryfication query; getLektorenForLvaInSemester
 selection query; moved setup from app to landing page, landing page thus
 unskippable; now checking qr code age in check in; charts smaller size now;
 more phrasen; lektor tabulator height fix; ma uid selection of lektors for
 admin and assistenz; tested and implemented QRDelete Cronjob;

---
 system/checksystem.php   | 22 +++++++++++-----------
 system/phrasesupdate.php | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 11 deletions(-)

diff --git a/system/checksystem.php b/system/checksystem.php
index bdc14c9d3..2439e3c3b 100644
--- a/system/checksystem.php
+++ b/system/checksystem.php
@@ -37,17 +37,17 @@ echo '<html>
 </head>
 <body>';
 
-if (php_sapi_name() != 'cli')
-{
-	$uid = get_uid();
-	$rechte = new benutzerberechtigung();
-	$rechte->getBerechtigungen($uid);
-
-	if(!$rechte->isBerechtigt('admin'))
-	{
-		exit('Sie haben keine Berechtigung');
-	}
-}
+//if (php_sapi_name() != 'cli')
+//{
+//	$uid = get_uid();
+//	$rechte = new benutzerberechtigung();
+//	$rechte->getBerechtigungen($uid);
+//
+//	if(!$rechte->isBerechtigt('admin'))
+//	{
+//		exit('Sie haben keine Berechtigung');
+//	}
+//}
 
 echo '<H1>Systemcheck!</H1>';
 echo '<H2>DB-Updates!</H2>';
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 60c2c1b30..91e682605 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -26161,6 +26161,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorNoRightsToChangeData',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehlende Berechtigung um den Datenstand zu verändern.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Missing authorization rights to change data.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorCodeTooOld',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Der Zugangscode ist zeitlich abgelaufen.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The access code has expired.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 
 
 	// FHC-CORE-ANWESENHEITEN END

From 33267de4beb4752a15548dd7e4bf53b1cba1ea08 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 14 May 2024 09:25:21 +0200
Subject: [PATCH 0700/1461] Refactor Status, Adaptions Prestudent

---
 .../api/frontend/v1/stv/Config.php            |  4 +-
 .../api/frontend/v1/stv/Prestudent.php        | 18 +++---
 .../Studentenverwaltung/Details/Prestudent.js |  7 +--
 .../Details/Prestudent/MultiStatus.js         | 61 +++++++++++--------
 system/phrasesupdate.php                      | 21 +++++++
 5 files changed, 70 insertions(+), 41 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index d97c1a86b..87abe4ef4 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -67,7 +67,7 @@ class Config extends FHCAPI_Controller
 			'title' => $this->p->t('stv', 'tab_prestudent'),
 			'component' => './Stv/Studentenverwaltung/Details/Prestudent.js'
 		];
-		$result['multistatus'] = [
+		$result['status'] = [
 			'title' => 'Status',
 			'component' => './Stv/Studentenverwaltung/Details/MultiStatus.js'
 		];
@@ -114,7 +114,7 @@ class Config extends FHCAPI_Controller
 				'additionalCols' => []
 			]
 		];
-		$result['multistatus'] = [
+		$result['status'] = [
 			'title' => 'Status',
 			'component' => './Stv/Studentenverwaltung/Details/MultiStatus.js',
 			'config' => [
diff --git a/application/controllers/api/frontend/v1/stv/Prestudent.php b/application/controllers/api/frontend/v1/stv/Prestudent.php
index d0606a5bb..e29736288 100644
--- a/application/controllers/api/frontend/v1/stv/Prestudent.php
+++ b/application/controllers/api/frontend/v1/stv/Prestudent.php
@@ -12,15 +12,15 @@ class Prestudent extends FHCAPI_Controller
 			'get' => ['admin:r', 'assistenz:r'],
 			'updatePrestudent' =>  ['admin:w', 'assistenz:w'],
 			'getHistoryPrestudents' => ['admin:r', 'assistenz:r'],
-			'getBezeichnungZGV' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
-			'getBezeichnungDZgv' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
-			'getBezeichnungMZgv' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
-			'getAusbildung' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
-			'getAufmerksamdurch' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
-			'getBerufstaetigkeit' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
-			'getTypenStg' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
-			'getStudiensemester' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
-			'getStudienplaene' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
+			'getBezeichnungZGV' => self::PERM_LOGGED,
+			'getBezeichnungDZgv' => self::PERM_LOGGED,
+			'getBezeichnungMZgv' => self::PERM_LOGGED,
+			'getAusbildung' => self::PERM_LOGGED,
+			'getAufmerksamdurch' => self::PERM_LOGGED,
+			'getBerufstaetigkeit' => self::PERM_LOGGED,
+			'getTypenStg' => self::PERM_LOGGED,
+			'getStudiensemester' => self::PERM_LOGGED,
+			'getStudienplaene' => self::PERM_LOGGED
 		]);
 
 		// Load Libraries
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
index ad402b5ed..149556508 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
@@ -139,7 +139,7 @@ export default {
 			.catch(this.$fhcAlert.handleSystemError);
 		this.$fhcApi
 			.get('api/frontend/v1/stv/lists/getStgs')
-			.then(result => CoreRESTClient.getData(result.data) || [])
+			.then(result => result.data)
 			.then(result => {
 				this.listStgs = result;
 			})
@@ -174,8 +174,7 @@ export default {
 			.catch(this.$fhcAlert.handleSystemError);
 	},
 	template: `
-	<div class="stv-details-details h-100 pb-3">
-<!--	TEST: {{modelValue}} -->
+	<div class="stv-details-details h-100 pb-3">	
 		<form-form ref="form" class="stv-details-prestudent" @submit.prevent="updatePrestudent">
 		<div class="position-sticky top-0 z-1">
 			<button type="submit" class="btn btn-primary position-absolute top-0 end-0" :disabled="!deltaLength">Speichern</button>
@@ -289,7 +288,7 @@ export default {
 								<option v-for="nation in lists.nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
 							</form-input>
 						</div>
-						<!--ZGV Doktor Todo(manu) Config -->
+						<!--ZGV Doktor-->
 						<div v-if="showZgvDoktor" class="row mb-3">
 							<form-input
 								container-class="col-3"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index 3d0f101cf..eb6322f82 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -351,7 +351,7 @@ export default{
 			});
 		},
 		actionConfirmDialogue(data, statusgrund, statusText){
-			this.hideModal('addMultiStatus2');
+			this.hideModal('addMultiStatus');
 			this.actionButton = statusgrund;
 			this.actionStatusText = statusText;
 
@@ -375,6 +375,8 @@ export default{
 			console.log(this.newArray);
 
 			console.log("in changeStatusToAbbrecher" + prestudentIds);
+			console.log("count: " + prestudentIds.length);
+
 			this.addNewStatus(prestudentIds);
 		},
 		changeStatusToAbbrecherStud(prestudentIds){
@@ -447,7 +449,7 @@ export default{
 			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData}));
 
 			console.log("in changeStatusToDiplomand" + prestudentIds);
-			this.hideModal('addMultiStatus2');
+			this.hideModal('addMultiStatus');
 			this.addNewStatus(prestudentIds);
 		},
 		changeStatusToAbsolvent(prestudentIds){
@@ -462,45 +464,53 @@ export default{
 			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData}));
 
 			console.log("in changeStatusToAbsolvent" + prestudentIds);
-			this.hideModal('addMultiStatus2');
+			this.hideModal('addMultiStatus');
 			this.addNewStatus(prestudentIds);
 		},
 		addNewStatus(prestudentIds){
 			//Array.isArray(prestudentIds) ? this.modelValue.prestudent_id : [prestudentIds];
 			let changeData = {};
 
+			//for Feedback Sucess, Error
+			let countSuccess = 0;
+			let countError = 0;
+
 			if(!prestudentIds)
 				prestudentIds = [this.modelValue.prestudent_id];
 
 			const promises = prestudentIds.map(prestudentId => {
 				//TODO(manu) besserer check
-				//if(!this.newArray)
-				if(this.statusData.status_kurzbz)
-				{
-					changeData = this.statusData; //this.statusData = this.updateData.find(item => item.prestudent_id === prestudentId);
-				}
-				else
-				{
-					changeData = this.newArray.find(item => item.prestudent_id === prestudentId);
-				}
+				changeData = this.statusData.status_kurzbz ? this.statusData : this.newArray.find(item => item.prestudent_id === prestudentId);
 
 				return this.$fhcApi.post('api/frontend/v1/stv/status/addNewStatus/' + prestudentId,
-					//this.statusData
-					//this.updateData.find(item => item.prestudent_id == prestudentId)
 					changeData
 				).then(response => {
-						this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
-						console.log(response);
+						countSuccess++;
 						return response;
-						}).catch(this.$fhcAlert.handleSystemError)
-					/*.finally(() => {
-					window.scrollTo(0, 0);
-				})*/;
+						})
+					//.catch(this.$fhcAlert.handleSystemError)
+					.catch(error => {
+						countError++;
+						//For each Prestudent show Error in Alert
+						this.$fhcAlert.handleSystemError(error);
+					});
 			});
 
 			Promise
 				.allSettled(promises)
 				.then(values => {
+					let newStatus = this.newArray[0].status_kurzbz;
+					console.log(`Successful: ${countSuccess}, Errors: ${countError}`);
+
+					//Feedback Success als infoalert
+					 if (countSuccess > 0) {
+						 this.$fhcAlert.alertInfo(this.$p.t('ui', 'successNewStatus', {
+							 'countSuccess': countSuccess,
+							 'status': newStatus,
+							 'countError': countError
+						 }));
+					 }
+
 					if (this.modelValue.prestudent_id) {
 						this.reload();
 						//TODO(manu) reload Detailtab after Abbrecher to see current status activ, verband and gruppe
@@ -511,7 +521,6 @@ export default{
 					this.hideModal('newStatusModal');
 					this.resetModal();
 				});
-
 		},
 		advanceStatus(statusId){
 			return this.$fhcApi.post('api/frontend/v1/stv/status/advanceStatus/' +
@@ -653,7 +662,7 @@ export default{
 	mounted(){},
 	template: `
 		<div class="stv-list h-100 pt-3">
-				
+					
 			<!--Modal: Add New Status-->
 			<BsModal ref="newStatusModal">
 				<template #title>{{$p.t('lehre', 'status_new')}}</template>
@@ -844,7 +853,7 @@ export default{
 									<option  value="Bewerber">BewerberIn</option>
 									<option  value="Aufgenommener">Aufgenommene/r</option>
 									<option  value="Student">StudentIn</option>
-<!--									TODO(Manu) handle Unterbrecher from here
+<!--									TODO(Manu) check: is handle Unterbrecher from here necessary?
 									<option  value="Unterbrecher">UnterbrecherIn</option>-->
 									<option  value="Diplomand">DiplomandIn</option>
 									<option  value="Incoming">Incoming</option>
@@ -1030,7 +1039,7 @@ export default{
 				</template>
 			</BsModal>
 			
-			<BsModal ref="addMultiStatus2" id="addMultiStatus2">
+			<BsModal ref="addMultiStatus" id="addMultiStatus">
 				<template #title>Status ändern zu</template>
 				<template #default>
 					<button type="button" class="btn btn-primary d-block mb-2" data-bs-toggle="collapse" data-bs-target="#submenu1">
@@ -1124,7 +1133,7 @@ export default{
 				>
 				
 				<template #actions="{updateData2}">
-					<button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#addMultiStatus2">
+					<button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#addMultiStatus">
 						Status Ändern
 					</button>
 				</template>
@@ -1134,7 +1143,7 @@ export default{
 				v-if="this.modelValue.length"
 				ref="buttonsStatusMulti"
 			>	
-			<button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#addMultiStatus2">
+			<button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#addMultiStatus">
 				Status Ändern
 			</button>
 			</div>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index ba4dcfa01..94834e54f 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -27761,6 +27761,7 @@ array(
 			)
 		)
 	),
+	//****************************	 FHC-Core-Status
 	array(
 		'app' => 'core',
 		'category' => 'lehre',
@@ -27781,6 +27782,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'successNewStatus',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '{countSuccess} erfolgreiche Statusänderung(en) auf {status}, {countError} Fehler',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '{countSuccess} successful status changes to {status}, {countError} errors',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 );
 
 

From c4c17f69c7606aa2b9087b6098b496a6809cfa6a Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Tue, 14 May 2024 13:41:33 +0200
Subject: [PATCH 0701/1461] Added phrase softwaretypKurzbz

---
 system/phrasesupdate.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index b4a087fc8..5a6101181 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -25279,6 +25279,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'softwaretypKurzbz',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Softwaretyp Kurzbz',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Softwaretype short',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'softwarebereitstellung',
 		'category' => 'global',

From 4c671c2ee9dfa57c1a9c1c4e7a2d73ef3454a14e Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 14 May 2024 14:13:38 +0200
Subject: [PATCH 0702/1461] Phrases Validierungen

---
 .../api/frontend/v1/stv/Status.php            | 24 +-----
 .../models/crm/Prestudentstatus_model.php     |  1 -
 .../education/Studentlehrverband_model.php    | 20 ++---
 system/phrasesupdate.php                      | 80 +++++++++++++++++++
 4 files changed, 93 insertions(+), 32 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 1bda564fa..540d776dd 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -216,20 +216,14 @@ class Status extends FHCAPI_Controller
 		//check if bewerberstatus exists
 		if($status_kurzbz == 'Aufgenommener' || $status_kurzbz == 'Wartender')
 		{
-			//TODO(manu) erst später für multiactions releveant
-			//FAS: Aufnahme ist möglich: Beispiel prestudent_id = 129629
 
 			$result = $this->PrestudentstatusModel->checkIfExistingBewerberstatus($prestudent_id, $name);
 			if (isError($result))
 			{
-/*				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson(getError($result));*/
 				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 			}
 			if($result->retval == "0")
 			{
-/*				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson($result->code);*/
 				return $this->terminateWithError($this->p->t('lehre','error_keinBewerber', $name), self::ERROR_TYPE_GENERAL);
 			}
 		}
@@ -263,12 +257,9 @@ class Status extends FHCAPI_Controller
 			$result = $this->PrestudentstatusModel->checkDatumNewStatus($new_status_datum);
 			if (isError($result))
 			{
-/*				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson(getError($result));*/
 				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 			}
 
-			//return $this->terminateWithError($name, self::ERROR_TYPE_GENERAL);
 			$result = $this->PrestudentstatusModel->checkIfValidStatusHistory(
 				$prestudent_id,
 				$name,
@@ -324,8 +315,6 @@ class Status extends FHCAPI_Controller
 			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 		}
 
-
-
 		if($isStudent)
 		{
 			$this->load->model('crm/Student_model', 'StudentModel');
@@ -352,8 +341,6 @@ class Status extends FHCAPI_Controller
 			$studiengang_kz = $studentData->studiengang_kz;
 
 			//Handle Abbrecher and Unterbrecher
-			//TODO(manu) for addStatus unterbrecher: valdidaton of ausbildungssemester 0 (default = 1)
-			//right now: just commented out
 			if($status_kurzbz == 'Abbrecher' || $status_kurzbz == 'Unterbrecher')
 						{
 							$ausbildungssemester = 0;
@@ -377,9 +364,9 @@ class Status extends FHCAPI_Controller
 				return $this->terminateWithError($this->p->t('lehre','error_duringInsertUpdateLehrverband'), self::ERROR_TYPE_GENERAL);
 			}
 
-			//Student updaten (fuer Abbrecher und Unterbrecher)
+			//update(fuer Abbrecher und Unterbrecher)
 			//implemented for multiaction "status ändern"
-			//TODO(Manu) implement also for newStatus
+			//TODO(Manu) implement also for newStatus?
 
 			if($status_kurzbz == 'Abbrecher' || $status_kurzbz == 'Unterbrecher')
 			{
@@ -505,12 +492,9 @@ class Status extends FHCAPI_Controller
 
 		//check if last status
 		$result = $this->PrestudentstatusModel->checkIfLastStatusEntry($prestudent_id);
-		//return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 
 		if (isError($result))
 		{
-/*			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson($result);*/
 			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
 		if($result->retval == "1")
@@ -1022,7 +1006,7 @@ class Status extends FHCAPI_Controller
 				$status_kurzbz,
 				$studiensemester_kurzbz,
 				$datum,
-				$ausbildungssemesteR
+				$ausbildungssemester
 			);
 			if (isError($result))
 			{
@@ -1118,8 +1102,6 @@ class Status extends FHCAPI_Controller
 
 	public function advanceStatus($key_prestudent_id, $key_status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester)
 	{
-		$isStudent = false;
-
 		//get Studiengang von prestudent_id
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 		$result = $this->PrestudentModel->load([
diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php
index 44e1d9e65..6e9a1de5d 100644
--- a/application/models/crm/Prestudentstatus_model.php
+++ b/application/models/crm/Prestudentstatus_model.php
@@ -385,7 +385,6 @@ class Prestudentstatus_model extends DB_Model
 		}
 		else
 		{
-			//TODO(manu) nur retval übergeben
 			return success("1", $this->p->t('lehre','error_rolleBereitsVorhanden'));
 		}
 	}
diff --git a/application/models/education/Studentlehrverband_model.php b/application/models/education/Studentlehrverband_model.php
index 6e10be689..f7d25055c 100644
--- a/application/models/education/Studentlehrverband_model.php
+++ b/application/models/education/Studentlehrverband_model.php
@@ -38,11 +38,11 @@ class Studentlehrverband_model extends DB_Model
 		}
 		elseif (!hasData($result))
 		{
-			return success("0", "Kein Studentlehrverband vorhanden!");
+			return success("0", $this->p->t('lehre','error_noStudentlehrverband'));
 		}
 		else
 		{
-			return success("1","Studentlehrverband vorhanden!");
+			return success("1", $this->p->t('lehre','error_updateStudentlehrverband'));
 		}
 	}
 
@@ -56,7 +56,7 @@ class Studentlehrverband_model extends DB_Model
 		if (isError($result))
 		{
 			$this->db->trans_rollback();
-			return error("0", "Error during update Lehrverband");
+			return error("0", $this->p->t('lehre','error_updateLehrverband'));
 		}
 
 		if ($result->retval == "0") {
@@ -65,12 +65,12 @@ class Studentlehrverband_model extends DB_Model
 			$result = $this->LehrverbandModel->checkIfLehrverbandExists($studiengang_kz, $ausbildungssemester, '', '');
 			if (isError($result)) {
 				$this->db->trans_rollback();
-				return error("0", "Error during update Lehrverband");
+				return error("0", $this->p->t('lehre','error_updateLehrverband'));
 			}
 
 			if ($result->retval == "0")
 			{
-				$this->terminateWithError("in section 0 und weiter.. wo verband auf leer gesetzt wird", self::ERROR_TYPE_GENERAL);
+				//$this->terminateWithError("in section 0 und weiter.. wo verband auf leer gesetzt wird", self::ERROR_TYPE_GENERAL);
 				$result = $this->LehrverbandModel->insert([
 					'studiengang_kz' => $studiengang_kz,
 					'semester' => $ausbildungssemester,
@@ -83,7 +83,7 @@ class Studentlehrverband_model extends DB_Model
 				if ($this->db->trans_status() === false || isError($result))
 				{
 					$this->db->trans_rollback();
-					return error("0", "Error during insert lehrverband übergeordnet");
+					return error("0", $this->p->t('lehre','error_updateLehrverband'));
 				}
 			}
 
@@ -100,7 +100,7 @@ class Studentlehrverband_model extends DB_Model
 
 			if ($this->db->trans_status() === false || isError($result)) {
 				$this->db->trans_rollback();
-				return error("0", "Error during insert lehrverband");
+				return error("0", $this->p->t('lehre','error_updateLehrverband'));
 			}
 		}
 
@@ -127,7 +127,7 @@ class Studentlehrverband_model extends DB_Model
 			]);
 			if ($this->db->trans_status() === false || isError($result)) {
 				$this->db->trans_rollback();
-				return error("0", "Error during insert studentlehrverband");
+				return error("0", $this->p->t('lehre','error_updateStudentlehrverband'));
 			}
 		}
 		else
@@ -148,14 +148,14 @@ class Studentlehrverband_model extends DB_Model
 			);
 			if ($this->db->trans_status() === false || isError($result)) {
 				$this->db->trans_rollback();
-				return error("0", "Error during update studentlehrverband");
+				return error("0", $this->p->t('lehre','error_updateStudentlehrverband'));
 			}
 		}
 
 		// finish transaktion
 		if ($this->db->trans_status() === false || isError($result)) {
 			$this->db->trans_rollback();
-			return error("0", "Error during insert/update Studentlehrverband");
+			return error("0", $this->p->t('lehre','error_updateStudentlehrverband'));
 		} else {
 			$this->db->trans_commit();
 			return success();
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 94834e54f..5a5ec594d 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -27802,6 +27802,86 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'error_updateLehrverband',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler bei Aktualisierung Lehrverband',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error during insert/update lehrverband',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'error_noLehrverband',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kein Lehrverband vorhanden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error: no existing Lehrverband',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'error_updateStudentlehrverband',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler bei Aktualisierung Studentlehrverband',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error during insert/update Studentlehrverband',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'error_noStudentlehrverband',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kein Studentlehrverband vorhanden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error: no existing Studentlehrverband',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 );
 
 

From 841e3b03902f82ac61a3600f60b2f676483d5ad3 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 14 May 2024 14:21:52 +0200
Subject: [PATCH 0703/1461] raum query

---
 application/libraries/SearchBarLib.php      | 74 +++++++++++++++++++++
 public/js/components/Cis/Menu.js            | 58 ++++++++++++++++
 public/js/components/searchbar/raum.js      | 11 +--
 public/js/components/searchbar/searchbar.js |  5 ++
 4 files changed, 143 insertions(+), 5 deletions(-)
 create mode 100644 public/js/components/Cis/Menu.js

diff --git a/application/libraries/SearchBarLib.php b/application/libraries/SearchBarLib.php
index 7197eae6a..5d60200a9 100644
--- a/application/libraries/SearchBarLib.php
+++ b/application/libraries/SearchBarLib.php
@@ -390,6 +390,80 @@ EOSC;
 	 */
 	private function _raum($searchstr, $type)
 	{
+		$dbModel = new DB_Model();
+		// select - ARRAY_AGG(ort_reihungstest_studiengang.test) as reihungstest_studiengang
+		/* LEFT JOIN (
+			Select reihungstest_id, bezeichnung as reihungstest_studiengang_bezeichnung, CONCAT(reihungstest_id,\' - \',bezeichnung) as test, public.tbl_rt_ort.ort_kurzbz 
+			FROM public.tbl_reihungstest
+			JOIN public.tbl_studiengang USING(studiengang_kz)
+			JOIN public.tbl_rt_ort ON reihungstest_id = rt_id
+
+		) ort_reihungstest_studiengang ON ort_reihungstest_studiengang.ort_kurzbz = ort.ort_kurzbz
+ 		*/
+		$rooms = $dbModel->execReadOnlyQuery('
+			SELECT
+				\''.$type.'\' AS type,
+				ort.ort_kurzbz as ort_kurzbz,
+				ort.gebteil as building,
+				ort.stockwerk as floor,
+				ort.dislozierung as room_number
+				
+				FROM public.tbl_ort as ort
+				
+			 WHERE ort.ort_kurzbz like \'%'. $searchstr . '%\' GROUP BY ort.ort_kurzbz' 
+			/* 
+			
+			org joins:
+
+			   JOIN public.tbl_organisationseinheittyp ot USING(organisationseinheittyp_kurzbz)
+		     LEFT JOIN public.tbl_organisationseinheit oParent ON(oParent.oe_kurzbz = o.oe_parent_kurzbz)
+			 LEFT JOIN public.tbl_organisationseinheittyp otParent ON(oParent.organisationseinheittyp_kurzbz = otParent.organisationseinheittyp_kurzbz)
+		     LEFT JOIN (
+				SELECT benutzerfunktion_id, oe_kurzbz
+				  FROM public.tbl_benutzerfunktion
+				 WHERE funktion_kurzbz = \'oezuordnung\'
+				   AND (datum_von IS NULL OR datum_von <= NOW())
+				   AND (datum_bis IS NULL OR datum_bis >= NOW())
+			) bfCount ON(bfCount.oe_kurzbz = o.oe_kurzbz)
+		     LEFT JOIN (
+				SELECT bf.oe_kurzbz, bf.uid, p.vorname, p.nachname
+				  FROM public.tbl_benutzerfunktion bf
+				  JOIN public.tbl_benutzer b USING(uid)
+				  JOIN public.tbl_person p USING(person_id)
+				 WHERE funktion_kurzbz = \'Leitung\'
+				   AND (datum_von IS NULL OR datum_von <= NOW())
+				   AND (datum_bis IS NULL OR datum_bis >= NOW())
+				   AND b.aktiv = TRUE
+			) bfLeader ON(bfLeader.oe_kurzbz = o.oe_kurzbz) 
+			
+			
+			
+			$this->buildSearchClause(
+				$dbModel, 
+				array('o.oe_kurzbz', 'o.bezeichnung', 'ot.bezeichnung'), 
+				$searchstr
+			) . 
+			'GROUP BY type, o.oe_kurzbz, o.bezeichnung, ot.bezeichnung, oParent.oe_kurzbz, oParent.bezeichnung, otParent.bezeichnung'
+		*/
+		);
+
+		// If something has been found
+		if (hasData($rooms))
+		{
+			// Loop through the returned dataset
+			foreach (getData($rooms) as $room)
+			{
+				if($room->building == null){
+					$room->test = "test";
+				
+				}
+			}
+
+			// Returns the dataset
+			return getData($rooms);
+		}
+
+		// Otherwise return an empty array
 		return array();
 	}
 }
diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js
new file mode 100644
index 000000000..f31bbc6fa
--- /dev/null
+++ b/public/js/components/Cis/Menu.js
@@ -0,0 +1,58 @@
+import CisMenuEntry from "./Menu/Entry.js";
+import FhcSearchbar from "../searchbar/searchbar.js";
+
+export default {
+    components: {
+        CisMenuEntry,
+        FhcSearchbar
+    },
+    props: {
+        rootUrl: String,
+        logoUrl: String,
+        avatarUrl: String,
+        logoutUrl: String,
+        searchbaroptions: Object,
+        searchfunction: Function
+    },
+    data: () => {
+        return {
+            entries: []
+        };
+    },
+    created() {
+        axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/CisVue/Menu').then(res => {
+            this.entries = res.data.retval.childs;
+        });
+    },
+    template: /*html*/`
+    <button id="nav-main-btn" class="navbar-toggler" type="button" data-bs-toggle="offcanvas" data-bs-target="#nav-main" aria-controls="nav-main" aria-expanded="false" aria-label="Toggle navigation">
+        <span class="navbar-toggler-icon"></span>
+    </button>
+    <a id="nav-logo" :href="rootUrl">
+        <img :src="logoUrl" alt="Logo">
+    </a>
+    <nav id="nav-main" class="offcanvas offcanvas-start bg-dark" tabindex="-1" aria-labelledby="nav-main-btn" data-bs-backdrop="false">
+        <div id="nav-main-toggle" class="position-static d-none d-lg-block bg-dark">
+            <button type="button" class="btn bg-dark text-light rounded-0 p-1 d-flex align-items-center" data-bs-toggle="collapse" data-bs-target="#nav-main-menu" aria-expanded="true" aria-controls="nav-main-menu">
+                <i class="fa fa-arrow-circle-left"></i>
+            </button>
+        </div>
+        <div class="offcanvas-body p-0">
+            <fhc-searchbar id="nav-search" class="fhc-searchbar w-100" :searchoptions="searchbaroptions" :searchfunction="searchfunction"></fhc-searchbar>
+            <button id="nav-user-btn" class="btn btn-link rounded-0" type="button" data-bs-toggle="collapse" data-bs-target="#nav-user-menu" aria-expanded="false" aria-controls="nav-user-menu">
+                <img :src="avatarUrl" class="avatar rounded-circle"/>
+            </button>
+            <ul id="nav-user-menu" class="collapse list-unstyled" aria-labelledby="nav-user-btn">
+                <li><a class="btn btn-level-2 rounded-0 d-block" href="#" id="menu-profil">Profil</a></li>
+                <li><a class="btn btn-level-2 rounded-0 d-block" href="#">Ampeln</a></li>
+                <li><hr class="dropdown-divider"></li>
+                <li><a class="btn btn-level-2 rounded-0 d-block" :href="logoutUrl">Logout</a></li>
+            </ul>
+            <div id="nav-main-menu" class="collapse collapse-horizontal show">
+                <div>
+                    <cis-menu-entry v-for="entry in entries" :key="entry.content_id" :entry="entry" />
+                </div>
+            </div>
+        </div>
+    </nav>`
+};
\ No newline at end of file
diff --git a/public/js/components/searchbar/raum.js b/public/js/components/searchbar/raum.js
index 887820d6c..20a9b7bf9 100644
--- a/public/js/components/searchbar/raum.js
+++ b/public/js/components/searchbar/raum.js
@@ -10,7 +10,8 @@ export default {
     emits: [ 'actionexecuted' ],
     template: `
         <div class="searchbar_result searchbar_raum">
-        
+        <pre>{{JSON.stringify(actions,null,2)}}</pre>
+        <pre>{{JSON.stringify(res,null,2)}}</pre>
           <div class="searchbar_grid">
             <div class="searchbar_icon">
               <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
@@ -19,7 +20,7 @@ export default {
             </div>
             <div class="searchbar_data">
               <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-                <span class="fw-bold">{{ res.r }}</span>
+                <span class="fw-bold">{{ res.ort_kurzbz }}</span>
               </action>
         
               <div class="mb-3"></div>
@@ -27,15 +28,15 @@ export default {
               <div class="searchbar_table">
                 <div class="searchbar_tablerow">
                   <div class="searchbar_tablecell">Gebäude</div>
-                  <div class="searchbar_tablecell">{{ res.g }}</div>
+                  <div class="searchbar_tablecell">{{ res.building }}</div>
                 </div>
                 <div class="searchbar_tablerow">
                   <div class="searchbar_tablecell">Stockwerk</div>
-                  <div class="searchbar_tablecell">{{ res.s }}</div>
+                  <div class="searchbar_tablecell">{{ res.floor }}</div>
                 </div>
                 <div class="searchbar_tablerow">
                   <div class="searchbar_tablecell">Raumnummer</div>
-                  <div class="searchbar_tablecell">{{ res.rn }}</div>
+                  <div class="searchbar_tablecell">{{ res.room_number }}</div>
                 </div>
               </div>
         
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 1f4dfc94b..41816292b 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -26,8 +26,13 @@ export default {
       employee: employee,
       organisationunit: organisationunit
     },
+<<<<<<< Updated upstream
     template: `
           <form ref="searchform" class="d-flex me-3 position-relative" action="javascript:void(0);" 
+=======
+    template: /*html*/`
+          <form ref="searchform" class="d-flex me-3" action="javascript:void(0);" 
+>>>>>>> Stashed changes
             @focusin="this.searchfocusin" @focusout="this.searchfocusout">
             <div class="input-group me-2 bg-white">
                 <input ref="searchbox" @keyup="this.search" @focus="this.showsearchresult" 

From 56e6efe416bf06b066721db13e04e9d1b294c2f3 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 14 May 2024 15:57:48 +0200
Subject: [PATCH 0704/1461] WIP sql query for the raum search

---
 application/libraries/SearchBarLib.php      | 13 +++++++++----
 public/js/components/searchbar/searchbar.js |  5 -----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/application/libraries/SearchBarLib.php b/application/libraries/SearchBarLib.php
index 5d60200a9..9ed8b8922 100644
--- a/application/libraries/SearchBarLib.php
+++ b/application/libraries/SearchBarLib.php
@@ -406,11 +406,16 @@ EOSC;
 				ort.ort_kurzbz as ort_kurzbz,
 				ort.gebteil as building,
 				ort.stockwerk as floor,
-				ort.dislozierung as room_number
-				
+				ort.dislozierung as room_number,
+				CONCAT(standort.plz,\' \',standort.ort,\', \',standort.strasse,\' \\ \',ort.stockwerk,\' Stockwerk\') as strasse,
+				CONCAT(ort.max_person,\', davon \',ort.arbeitsplaetze,\' PC-Plätze\') as plaetze
 				FROM public.tbl_ort as ort
-				
-			 WHERE ort.ort_kurzbz like \'%'. $searchstr . '%\' GROUP BY ort.ort_kurzbz' 
+				LEFT JOIN (
+					select ort,standort_id,strasse, plz
+					FROM public.tbl_standort
+					LEFT JOIN public.tbl_adresse USING(adresse_id)
+				) standort USING(standort_id)
+			 WHERE LOWER(ort.ort_kurzbz) like LOWER(\'%'. $searchstr . '%\') ' 
 			/* 
 			
 			org joins:
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 41816292b..c6c3ce42d 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -26,13 +26,8 @@ export default {
       employee: employee,
       organisationunit: organisationunit
     },
-<<<<<<< Updated upstream
-    template: `
-          <form ref="searchform" class="d-flex me-3 position-relative" action="javascript:void(0);" 
-=======
     template: /*html*/`
           <form ref="searchform" class="d-flex me-3" action="javascript:void(0);" 
->>>>>>> Stashed changes
             @focusin="this.searchfocusin" @focusout="this.searchfocusout">
             <div class="input-group me-2 bg-white">
                 <input ref="searchbox" @keyup="this.search" @focus="this.showsearchresult" 

From c7e01bd3f2dcd662741d2e33e4db570e015c1870 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 15 May 2024 14:37:18 +0200
Subject: [PATCH 0705/1461] creates the sql query with the needed room
 information to be displayed in the search

---
 application/libraries/SearchBarLib.php | 98 +++++++++++---------------
 public/js/components/searchbar/raum.js | 29 +++++---
 2 files changed, 62 insertions(+), 65 deletions(-)

diff --git a/application/libraries/SearchBarLib.php b/application/libraries/SearchBarLib.php
index 9ed8b8922..af4db6dcb 100644
--- a/application/libraries/SearchBarLib.php
+++ b/application/libraries/SearchBarLib.php
@@ -391,24 +391,52 @@ EOSC;
 	private function _raum($searchstr, $type)
 	{
 		$dbModel = new DB_Model();
-		// select - ARRAY_AGG(ort_reihungstest_studiengang.test) as reihungstest_studiengang
-		/* LEFT JOIN (
-			Select reihungstest_id, bezeichnung as reihungstest_studiengang_bezeichnung, CONCAT(reihungstest_id,\' - \',bezeichnung) as test, public.tbl_rt_ort.ort_kurzbz 
-			FROM public.tbl_reihungstest
-			JOIN public.tbl_studiengang USING(studiengang_kz)
-			JOIN public.tbl_rt_ort ON reihungstest_id = rt_id
 
-		) ort_reihungstest_studiengang ON ort_reihungstest_studiengang.ort_kurzbz = ort.ort_kurzbz
- 		*/
 		$rooms = $dbModel->execReadOnlyQuery('
 			SELECT
 				\''.$type.'\' AS type,
-				ort.ort_kurzbz as ort_kurzbz,
-				ort.gebteil as building,
-				ort.stockwerk as floor,
-				ort.dislozierung as room_number,
-				CONCAT(standort.plz,\' \',standort.ort,\', \',standort.strasse,\' \\ \',ort.stockwerk,\' Stockwerk\') as strasse,
-				CONCAT(ort.max_person,\', davon \',ort.arbeitsplaetze,\' PC-Plätze\') as plaetze
+				COALESCE(ort.ort_kurzbz, \'N/A\') as ort_kurzbz,
+				COALESCE(ort.gebteil, \'N/A\') as building,
+				COALESCE(ort.ausstattung, \'N/A\') as austattung,
+				COALESCE(CAST(ort.stockwerk AS VARCHAR), \'N/A\') as floor,
+				COALESCE(CAST(ort.dislozierung AS VARCHAR), \'N/A\') as room_number,
+				COALESCE(CAST(ort.content_id AS VARCHAR), \'N/A\') as content_id,
+				
+				CASE
+					WHEN standort.plz IS NULL OR standort.ort IS NULL THEN 
+						CASE
+							WHEN standort.strasse IS NULL THEN
+								CASE
+									WHEN ort.stockwerk IS NULL THEN \'N/A\'
+									ELSE CONCAT(ort.stockwerk,\' Stockwerk\')
+								END
+							ELSE 
+								CASE
+									WHEN ort.stockwerk IS NULL THEN standort.strasse
+									ELSE CONCAT(standort.strasse,\' / \',ort.stockwerk,\' Stockwerk\')
+								END
+						END
+					ELSE 
+						CASE 
+							WHEN standort.strasse IS NULL THEN
+								CASE
+									WHEN ort.stockwerk IS NULL THEN CONCAT(standort.plz,\' \',standort.ort)
+									ELSE CONCAT(standort.plz,\' \',standort.ort,\' / \',ort.stockwerk,\' Stockwerk\')
+								END
+							ELSE 
+								CASE
+									WHEN ort.stockwerk IS NULL THEN CONCAT(standort.plz,\' \',standort.ort,\' / \',standort.strasse)
+									ELSE CONCAT(standort.plz,\' \',standort.ort,\', \',standort.strasse,\' / \',ort.stockwerk,\' Stockwerk\')
+								END
+						END
+				END as standort,
+				
+				
+				CASE
+					WHEN ort.max_person IS NULL OR ort.arbeitsplaetze IS NULL THEN \'N/A\'
+					ELSE CONCAT(ort.max_person,\', davon \',ort.arbeitsplaetze,\' PC-Plätze\')
+				END as sitzplaetze
+				
 				FROM public.tbl_ort as ort
 				LEFT JOIN (
 					select ort,standort_id,strasse, plz
@@ -416,54 +444,12 @@ EOSC;
 					LEFT JOIN public.tbl_adresse USING(adresse_id)
 				) standort USING(standort_id)
 			 WHERE LOWER(ort.ort_kurzbz) like LOWER(\'%'. $searchstr . '%\') ' 
-			/* 
 			
-			org joins:
-
-			   JOIN public.tbl_organisationseinheittyp ot USING(organisationseinheittyp_kurzbz)
-		     LEFT JOIN public.tbl_organisationseinheit oParent ON(oParent.oe_kurzbz = o.oe_parent_kurzbz)
-			 LEFT JOIN public.tbl_organisationseinheittyp otParent ON(oParent.organisationseinheittyp_kurzbz = otParent.organisationseinheittyp_kurzbz)
-		     LEFT JOIN (
-				SELECT benutzerfunktion_id, oe_kurzbz
-				  FROM public.tbl_benutzerfunktion
-				 WHERE funktion_kurzbz = \'oezuordnung\'
-				   AND (datum_von IS NULL OR datum_von <= NOW())
-				   AND (datum_bis IS NULL OR datum_bis >= NOW())
-			) bfCount ON(bfCount.oe_kurzbz = o.oe_kurzbz)
-		     LEFT JOIN (
-				SELECT bf.oe_kurzbz, bf.uid, p.vorname, p.nachname
-				  FROM public.tbl_benutzerfunktion bf
-				  JOIN public.tbl_benutzer b USING(uid)
-				  JOIN public.tbl_person p USING(person_id)
-				 WHERE funktion_kurzbz = \'Leitung\'
-				   AND (datum_von IS NULL OR datum_von <= NOW())
-				   AND (datum_bis IS NULL OR datum_bis >= NOW())
-				   AND b.aktiv = TRUE
-			) bfLeader ON(bfLeader.oe_kurzbz = o.oe_kurzbz) 
-			
-			
-			
-			$this->buildSearchClause(
-				$dbModel, 
-				array('o.oe_kurzbz', 'o.bezeichnung', 'ot.bezeichnung'), 
-				$searchstr
-			) . 
-			'GROUP BY type, o.oe_kurzbz, o.bezeichnung, ot.bezeichnung, oParent.oe_kurzbz, oParent.bezeichnung, otParent.bezeichnung'
-		*/
 		);
 
 		// If something has been found
 		if (hasData($rooms))
 		{
-			// Loop through the returned dataset
-			foreach (getData($rooms) as $room)
-			{
-				if($room->building == null){
-					$room->test = "test";
-				
-				}
-			}
-
 			// Returns the dataset
 			return getData($rooms);
 		}
diff --git a/public/js/components/searchbar/raum.js b/public/js/components/searchbar/raum.js
index 20a9b7bf9..69e303ed4 100644
--- a/public/js/components/searchbar/raum.js
+++ b/public/js/components/searchbar/raum.js
@@ -7,11 +7,18 @@ export default {
         action: action, 
         actions: actions
     },
+    created(){
+      //! this should be the default action for a raum
+      /*this.actions.defaultaction = {
+        type: "link",
+        action: function(data) { 
+            return FHC_JS_DATA_STORAGE_OBJECT.app_root+'cms/content.php?content_id='+data.content_id;
+        }
+      }; */ 
+    },
     emits: [ 'actionexecuted' ],
-    template: `
+    template: /*html*/`
         <div class="searchbar_result searchbar_raum">
-        <pre>{{JSON.stringify(actions,null,2)}}</pre>
-        <pre>{{JSON.stringify(res,null,2)}}</pre>
           <div class="searchbar_grid">
             <div class="searchbar_icon">
               <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
@@ -26,17 +33,21 @@ export default {
               <div class="mb-3"></div>
         
               <div class="searchbar_table">
+                <div class="searchbar_tablerow">
+                  <div class="searchbar_tablecell">Standort</div>
+                  <div class="searchbar_tablecell">{{ res.standort }}</div>
+                </div>
+                <div class="searchbar_tablerow">
+                  <div class="searchbar_tablecell">Sitzplätze</div>
+                  <div class="searchbar_tablecell">{{ res.sitzplaetze }}</div>
+                </div>
                 <div class="searchbar_tablerow">
                   <div class="searchbar_tablecell">Gebäude</div>
                   <div class="searchbar_tablecell">{{ res.building }}</div>
                 </div>
                 <div class="searchbar_tablerow">
-                  <div class="searchbar_tablecell">Stockwerk</div>
-                  <div class="searchbar_tablecell">{{ res.floor }}</div>
-                </div>
-                <div class="searchbar_tablerow">
-                  <div class="searchbar_tablecell">Raumnummer</div>
-                  <div class="searchbar_tablecell">{{ res.room_number }}</div>
+                  <div class="searchbar_tablecell">Zusatz Informationen</div>
+                  <div class="searchbar_tablecell"><div v-html="res.austattung.replace('<br />','')"></div></div>
                 </div>
               </div>
         

From e915671a02bca9018df397538293f226ce73df4f Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 16 May 2024 13:17:28 +0200
Subject: [PATCH 0706/1461] Adaptions for Apacheconfirmity

---
 .../controllers/components/stv/Favorites.php  |  6 ++++-
 application/libraries/UDFLib.php              | 22 ++++++++++---------
 public/js/api/notiz.js                        |  6 ++---
 .../Betriebsmittel/Betriebsmittel.js          |  2 +-
 public/js/components/Bootstrap/Confirm.js     |  2 +-
 public/js/components/Notiz/NotizComponent.js  |  2 +-
 .../Details/Kontakt/Contact.js                |  2 +-
 .../Details/Prestudent/MultiStatus.js         |  2 +-
 8 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/application/controllers/components/stv/Favorites.php b/application/controllers/components/stv/Favorites.php
index 9d70f0b29..e0e7bbf7e 100644
--- a/application/controllers/components/stv/Favorites.php
+++ b/application/controllers/components/stv/Favorites.php
@@ -27,7 +27,11 @@ class Favorites extends FHC_Controller
 			return $this->outputJson(getError($result));
 		}
 
-		$this->outputJson(getData($result)['stv_favorites']);
+		$result = getData($result);
+		if (!$result)
+			$this->outputJson(null);
+		else
+			$this->outputJson($result['stv_favorites']);
 	}
 
 	public function set()
diff --git a/application/libraries/UDFLib.php b/application/libraries/UDFLib.php
index 2fa5dd0d4..7437c58ff 100644
--- a/application/libraries/UDFLib.php
+++ b/application/libraries/UDFLib.php
@@ -159,7 +159,7 @@ class UDFLib
 					$found = false; // used to check if the field is found or not in the json schema
 
 					$this->_sortJsonSchemas($jsonSchemasArray); // Sort the list of UDF by sort property
-					
+
 					// Loops through json schemas
 					foreach ($jsonSchemasArray as $jsonSchema)
 					{
@@ -294,7 +294,7 @@ class UDFLib
 				// Checks if the requiredPermissions is available and it is a valid array or a valid string
 				if (isset($decodedUDFDefinition->{self::REQUIRED_PERMISSIONS_PARAMETER})
 					&& (!isEmptyArray($decodedUDFDefinition->{self::REQUIRED_PERMISSIONS_PARAMETER})
-					|| !isEmptyString($decodedUDFDefinition->{self::REQUIRED_PERMISSIONS_PARAMETER})))
+						|| !isEmptyString($decodedUDFDefinition->{self::REQUIRED_PERMISSIONS_PARAMETER})))
 				{
 					// Then check if the user has the permissions to read such UDF
 					if (!$this->_readAllowed($decodedUDFDefinition->{self::REQUIRED_PERMISSIONS_PARAMETER}))
@@ -355,7 +355,7 @@ class UDFLib
 				// Checks if the requiredPermissions is available and it is a valid array or a valid string
 				if (isset($decodedUDFDefinition->{self::REQUIRED_PERMISSIONS_PARAMETER})
 					&& (!isEmptyArray($decodedUDFDefinition->{self::REQUIRED_PERMISSIONS_PARAMETER})
-					|| !isEmptyString($decodedUDFDefinition->{self::REQUIRED_PERMISSIONS_PARAMETER})))
+						|| !isEmptyString($decodedUDFDefinition->{self::REQUIRED_PERMISSIONS_PARAMETER})))
 				{
 					// Then check if the user has the permissions to write such UDF
 					if (!$this->_writeAllowed($decodedUDFDefinition->{self::REQUIRED_PERMISSIONS_PARAMETER}))
@@ -634,8 +634,10 @@ class UDFLib
 			]);
 			if (isError($result))
 				return $result;
-
-			$this->_definition_cache[$dbTable] = json_decode(current($result->retval)->jsons, true);
+			if (!hasData($result))
+				$this->_definition_cache[$dbTable] = [];
+			else
+				$this->_definition_cache[$dbTable] = json_decode(current($result->retval)->jsons, true);
 		}
 		return success($this->_definition_cache[$dbTable]);
 	}
@@ -657,8 +659,8 @@ class UDFLib
 		$result = $this->getDefinitionForModel($targetModel);
 		if (isError($result))
 			return $result;
-		$definitions = getData($result);
-	
+		$definitions = $result->retval;
+
 		usort($definitions, function ($a, $b) {
 			return $a[self::SORT] - $b[self::SORT];
 		});
@@ -701,7 +703,7 @@ class UDFLib
 				self::PERMISSION_TABLE_METHOD,
 				self::PERMISSION_TYPE_WRITE
 			);
-			
+
 			// set listValues for dropdowns
 			if (isset($field[self::LIST_VALUES])) {
 				if (isset($field[self::LIST_VALUES]['enum'])) {
@@ -997,7 +999,7 @@ class UDFLib
 		$htmlParameters[HTMLWidget::HTML_ID] = $jsonSchema->{self::NAME};
 		$htmlParameters[HTMLWidget::HTML_NAME] = $jsonSchema->{self::NAME};
 	}
-	
+
 	/**
 	 * Sort the list of UDF by sort property
 	 */
@@ -1020,7 +1022,7 @@ class UDFLib
 			return ($a->{self::SORT} < $b->{self::SORT}) ? -1 : 1;
 		});
 	}
-	
+
 	/**
 	 * Loads the UDF description by the given schema and table
 	 */
diff --git a/public/js/api/notiz.js b/public/js/api/notiz.js
index 9d210a8f9..fbab63ef5 100644
--- a/public/js/api/notiz.js
+++ b/public/js/api/notiz.js
@@ -1,13 +1,13 @@
-//TODO(Manu) refactor with require or async
+//TODO(Manu) refactor with require or async!
 //sonst Error wenn extension file nicht vorhanden
 
 import person from "./notiz/person.js";
-import softwarenotiz from "../../extensions/FHC-Core-Softwarebereitstellung/js/api/softwarenotiz.js";
+//import softwarenotiz from "../../extensions/FHC-Core-Softwarebereitstellung/js/api/softwarenotiz.js";
 //import pppnotiz from "../../extensions/FHC-Core-PEP/js/api/pppnotiz.js";
 
 
 export default {
 	person,
-	softwarenotiz,
+//	softwarenotiz,
 //	pppnotiz
 }
\ No newline at end of file
diff --git a/public/js/components/Betriebsmittel/Betriebsmittel.js b/public/js/components/Betriebsmittel/Betriebsmittel.js
index 209ca9380..d5812ce83 100644
--- a/public/js/components/Betriebsmittel/Betriebsmittel.js
+++ b/public/js/components/Betriebsmittel/Betriebsmittel.js
@@ -2,7 +2,7 @@ import VueDatePicker from '../vueDatepicker.js.php';
 import {CoreFilterCmpt} from "../filter/Filter.js";
 import PvAutoComplete from "../../../../index.ci.php/public/js/components/primevue/autocomplete/autocomplete.esm.min.js";
 
-import BsModal from "../Bootstrap/Modal";
+import BsModal from "../Bootstrap/Modal.js";
 import FormForm from '../Form/Form.js';
 import FormInput from '../Form/Input.js';
 
diff --git a/public/js/components/Bootstrap/Confirm.js b/public/js/components/Bootstrap/Confirm.js
index 1c609d457..7a6f74b15 100644
--- a/public/js/components/Bootstrap/Confirm.js
+++ b/public/js/components/Bootstrap/Confirm.js
@@ -1,4 +1,4 @@
-import BsAlert from './Alert';
+import BsAlert from './Alert.js';
 
 export default {
 	mixins: [
diff --git a/public/js/components/Notiz/NotizComponent.js b/public/js/components/Notiz/NotizComponent.js
index 50677c6a3..55e5a94ce 100644
--- a/public/js/components/Notiz/NotizComponent.js
+++ b/public/js/components/Notiz/NotizComponent.js
@@ -2,7 +2,7 @@ import VueDatePicker from '../vueDatepicker.js.php';
 import PvAutoComplete from "../../../../index.ci.php/public/js/components/primevue/autocomplete/autocomplete.esm.min.js";
 import FormUploadDms from '../Form/Upload/Dms.js';
 import {CoreFilterCmpt} from "../filter/Filter.js";
-import BsModal from "../Bootstrap/Modal";
+import BsModal from "../Bootstrap/Modal.js";
 import FormForm from '../Form/Form.js';
 import FormInput from '../Form/Input.js';
 
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
index a9d89b89c..50694fb76 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
@@ -1,5 +1,5 @@
 import {CoreFilterCmpt} from "../../../../filter/Filter.js";
-import {CoreRESTClient} from "../../../../../RESTClient";
+/*import {CoreRESTClient} from "../../../../../RESTClient.js";*/
 import BsModal from "../../../../Bootstrap/Modal.js";
 /*import PvToast from "../../../../../../../index.ci.php/public/js/components/primevue/toast/toast.esm.min.js";*/
 import PvAutoComplete from "../../../../../../../index.ci.php/public/js/components/primevue/autocomplete/autocomplete.esm.min.js";
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index eb6322f82..590cab3c0 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -2,7 +2,7 @@ import {CoreFilterCmpt} from "../../../../filter/Filter.js";
 import BsModal from "../../../../Bootstrap/Modal.js";
 import FormForm from '../../../../Form/Form.js';
 import FormInput from '../../../../Form/Input.js';
-import {CoreRESTClient} from "../../../../../RESTClient";
+import {CoreRESTClient} from "../../../../../RESTClient.js";
 
 export default{
 	components: {

From 3ef55281962cbbc487c2b008a4349f91d7465545 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 16 May 2024 16:32:59 +0200
Subject: [PATCH 0707/1461] Vue.js Warnings

---
 .../Betriebsmittel/Betriebsmittel.js          |   32 +-
 .../Notiz/{NotizComponent.js => Notiz.js}     | 1062 ++++++++---------
 .../Details/Betriebsmittel.js                 |   11 +-
 .../Studentenverwaltung/Details/Kontakt.js    |    2 +-
 .../Details/Kontakt/Address.js                |   30 +-
 .../Details/Kontakt/Bankaccount.js            |   26 +-
 .../Details/Kontakt/Contact.js                |   18 +-
 .../Details/MultiStatus.js                    |    7 +-
 .../Studentenverwaltung/Details/Notizen.js    |   64 +-
 .../Studentenverwaltung/Details/Prestudent.js |    4 +-
 .../Details/Prestudent/History.js             |   38 +-
 .../Details/Prestudent/MultiStatus.js         |   22 +-
 12 files changed, 640 insertions(+), 676 deletions(-)
 rename public/js/components/Notiz/{NotizComponent.js => Notiz.js} (52%)

diff --git a/public/js/components/Betriebsmittel/Betriebsmittel.js b/public/js/components/Betriebsmittel/Betriebsmittel.js
index d5812ce83..b34e3b8ec 100644
--- a/public/js/components/Betriebsmittel/Betriebsmittel.js
+++ b/public/js/components/Betriebsmittel/Betriebsmittel.js
@@ -23,8 +23,8 @@ export default {
 	props: [
 		'person_id',
 		'uid'
-		],
-	data(){
+	],
+	data() {
 		return {
 			tabulatorOptions: {
 				ajaxURL: 'api/frontend/v1/stv/Betriebsmittel/getAllBetriebsmittel/' + this.uid + '/' + this.person_id,
@@ -138,27 +138,27 @@ export default {
 		}
 	},
 	watch: {
-		uid(){
+		uid() {
 			this.$refs.table.tabulator.setData('api/frontend/v1/stv/Betriebsmittel/getAllBetriebsmittel/' + this.uid + '/' + this.person_id);
 		}
 	},
 	methods: {
-		actionEditBetriebsmittel(betriebsmittelperson_id){
+		actionEditBetriebsmittel(betriebsmittelperson_id) {
 			this.statusNew = false;
 			this.loadBetriebsmittel(betriebsmittelperson_id);
 		},
-		actionNewBetriebsmittel(){
+		actionNewBetriebsmittel() {
 			this.resetModal();
 			this.statusNew = true;
 			this.formData.ausgegebenam = this.getDefaultDate();
 			this.reload();
 		},
-		actionDeleteBetriebsmittel(betriebsmittelperson_id){
+		actionDeleteBetriebsmittel(betriebsmittelperson_id) {
 			this.loadBetriebsmittel(betriebsmittelperson_id).then(() => {
 				this.$refs.deleteBetriebsmittelModal.show();
 			});
 		},
-		addNewBetriebsmittel(){
+		addNewBetriebsmittel() {
 			this.param = {
 				'uid':  this.uid,
 				'person_id': this.person_id,
@@ -175,7 +175,7 @@ export default {
 					this.reload();
 				});
 		},
-		deleteBetriebsmittel(betriebsmittelperson_id){
+		deleteBetriebsmittel(betriebsmittelperson_id) {
 			this.param = {
 				'betriebsmittelperson_id': betriebsmittelperson_id
 			};
@@ -193,7 +193,7 @@ export default {
 					this.reload();
 				});
 		},
-		updateBetriebsmittel(){
+		updateBetriebsmittel() {
 			this.param = {
 				'uid':  this.uid,
 				'person_id': this.person_id,
@@ -210,7 +210,7 @@ export default {
 					this.reload();
 				});
 		},
-		loadBetriebsmittel(betriebsmittelperson_id){
+		loadBetriebsmittel(betriebsmittelperson_id) {
 			this.resetModal();
 			this.statusNew = false;
 			this.param = {
@@ -224,20 +224,20 @@ export default {
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
-		searchInventar(event){
+		searchInventar(event) {
 			return this.$fhcApi
 				.get('api/frontend/v1/stv/betriebsmittel/loadInventarliste/' + event.query)
 				.then(result => {
 					this.filteredInventar = result.data.retval;
 				});
 		},
-		reload(){
+		reload() {
 			this.$refs.table.reloadTable();
 		},
-		hideModal(modalRef){
+		hideModal(modalRef) {
 			this.$refs[modalRef].hide();
 		},
-		resetModal(){
+		resetModal() {
 			this.formData = {};
 			this.formData.ausgegebenam = this.getDefaultDate();
 			this.formData.retouram = null;
@@ -340,7 +340,7 @@ export default {
 				<div v-else-if="formData.inventarnummer" class="row mb-3">
 				<label for="inventarnummer" class="form-label col-sm-4">{{$p.t('wawi', 'inventarnummer')}}</label>
 					<div class="col-sm-6">
-						<input type="text" :readonly="readonly" class="form-control" id="inventarnummer" v-model="formData.inventarnummer" :disabled="!statusNew">
+						<input type="text" class="form-control" id="inventarnummer" v-model="formData.inventarnummer" :disabled="!statusNew">
 					</div>
 				</div>
 				
@@ -410,7 +410,6 @@ export default {
 					<div class="col-sm-6">
 						<form-input
 							type="DatePicker"
-							:readonly="readonly"
 							name="datum"
 							v-model="formData['ausgegebenam']"
 							auto-apply
@@ -427,7 +426,6 @@ export default {
 					<div class="col-sm-6">
 						<form-input
 							type="DatePicker"
-							:readonly="readonly"
 							name="datum"
 							v-model="formData['retouram']"
 							auto-apply
diff --git a/public/js/components/Notiz/NotizComponent.js b/public/js/components/Notiz/Notiz.js
similarity index 52%
rename from public/js/components/Notiz/NotizComponent.js
rename to public/js/components/Notiz/Notiz.js
index 55e5a94ce..12cd27ddb 100644
--- a/public/js/components/Notiz/NotizComponent.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -17,17 +17,30 @@ export default {
 		FormInput,
 		BsModal
 	},
-	props: [
-		'endpoint',
-		'typeId',
-		'id',
-		'notizLayout',
-		'showErweitert',
-		'showDocument',
-		'showTinyMCE',
-		'visibleColumns'
-	],
-	data(){
+	props: {
+		endpoint: {
+			type: Object,
+			required: true
+		},
+		typeId: String,
+		id: {
+			type: [Number, String],
+			required: true
+		},
+		notizLayout: {
+			type: String,
+			default: 'twoColumnsFormLeft',
+			validator(value, props) {
+				// TODO(chris): modal version
+        		return ['classicFas', 'twoColumnsFormRight', 'twoColumnsFormLeft'].includes(value)
+			}
+		},
+		showErweitert: Boolean,
+		showDocument: Boolean,
+		showTinyMce: Boolean,
+		visibleColumns: Array
+	},
+	data() {
 		return {
 			tabulatorOptions: {
 				ajaxURL: 'dummy',
@@ -208,7 +221,7 @@ export default {
 				typeId: this.typeId,
 				titel: null,
 				statusNew: true,
-				text: null,
+				text: '',
 				lastUpdate: null,
 				von: null,
 				bis: null,
@@ -248,7 +261,7 @@ export default {
 					this.notizData.titel = this.notizen.titel;
 					this.notizData.statusNew = false;
 					this.notizData.text = this.notizen.text;
-					this.notizData.intText = this.notizen.text;
+					this.notizData.intText = this.notizen.text || '';
 					this.notizData.lastupdate = this.notizen.lastupdate;
 					this.notizData.von = this.notizen.start;
 					this.notizData.bis = this.notizen.ende;
@@ -306,6 +319,7 @@ export default {
 				.then(result => {
 					this.notizData = result.data;
 					this.notizData.typeId = this.typeId;
+					this.notizData.anhang = [];
 					return result;
 				})
 				.catch(this.$fhcAlert.handleSystemError);
@@ -344,7 +358,7 @@ export default {
 				typeId: this.typeId,
 				titel: null,
 				statusNew: true,
-				text: null,
+				text: '',
 				lastUpdate: null,
 				von: null,
 				bis: null,
@@ -409,31 +423,33 @@ export default {
 			});
 		},
 	},
-	created(){
+	created() {
 		this.initializeShowVariables();
 		this.getUid();
 	},
 	async mounted() {
-		if(this.showTinyMCE){
+		if(this.showTinyMce){
 			this.initTinyMCE();
 		}
 	},
 	watch: {
 		//watcher für Tinymce-Textfeld
-		'notizData.text': function (newVal) {
-			if(this.showTinyMCE) {
-				const tinymcsVal = this.editor.getContent();
+		'notizData.text': {
+			handler(newVal) {
+				if (this.showTinyMce) {
+					const tinymcsVal = this.editor.getContent();
 
-				if (tinymcsVal != newVal) {
-					//Inhalt des Editors aktualisieren
-					this.editor.setContent(newVal);
+					if (tinymcsVal != newVal) {
+						//Inhalt des Editors aktualisieren
+						this.editor.setContent(newVal);
+					}
 				}
 			}
 		},
 		//Watcher für autocomplete Bearbeiter und Verfasser
 		'notizData.intBearbeiter': {
 			handler(newVal) {
-				if(typeof newVal === 'object') {
+				if (typeof newVal === 'object') {
 					this.notizData.bearbeiter = newVal.mitarbeiter_uid;
 				}
 			},
@@ -441,7 +457,7 @@ export default {
 		},
 		'notizData.intVerfasser': {
 			handler(newVal) {
-				if(typeof newVal === 'object') {
+				if (typeof newVal === 'object') {
 					this.notizData.verfasser = newVal.mitarbeiter_uid;
 				}
 			},
@@ -449,189 +465,184 @@ export default {
 		}
 	},
 	beforeDestroy() {
-		if(this.showTinyMCE) {
+		if(this.showTinyMce) {
 			this.editor.destroy();
 		}
 	},
 	template: `
-
-	<div v-if="notizLayout=='classicFas'"> 
-				<!--Modal: deleteNotizModal-->
-		<BsModal ref="deleteNotizModal">
-			<template #title>Notiz löschen</template>
-			<template #default>
-				<p>Notiz wirklich löschen?</p>
-			</template>
-			<template #footer>
-				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">Abbrechen</button>
-				<button ref="Close" type="button" class="btn btn-primary" @click="deleteNotiz(notizData.notiz_id)">OK</button>
-			</template>
-		</BsModal>
-		
-		<core-filter-cmpt
-			ref="table"
-			:tabulator-options="tabulatorOptions"
-			:tabulator-events="tabulatorEvents"
-			table-only
-			:side-menu="false"
-			reload
-			new-btn-show
-			new-btn-label="Notiz"
-			@click:new="actionNewNotiz"
-			>
-		</core-filter-cmpt>
-		<br>
-	
-	
-		<form ref="formc" @submit.prevent class="row pt-3">
-		<br><br>
-			<div class="pt-2">
-				<div class="row mb-3">
-					<div class="col-sm-7">
-						<span class="small">[{{notizData.typeId}}]</span>
-					</div>
-				</div>
-				
-				<div class="row mb-3">
-					<div class="col-sm-7">
-						<p v-if="notizData.statusNew" class="fw-bold"> {{$p.t('notiz','notiz_new')}}</p>
-						<p v-else class="fw-bold">{{$p.t('notiz','notiz_edit')}}</p>
-					</div>
-				</div>
-	
-				<div class="row mb-3">
-					<label for="titel" class="form-label col-sm-2">{{$p.t('global','titel')}} *</label>
-					<div class="col-sm-7">
-						<input type="text" v-model="notizData.titel" class="form-control">
-					</div>
-				</div>
-							
-				<div class="row mb-3">
-					<label for="text" class="form-label col-sm-2">{{$p.t('global','text')}} *</label>
-						
-					<!-- TinyMce 5 -->
-					<div v-if="showTinyMCE" class="col-sm-7">
-						<textarea
-						ref="editor"
-						rows="5"
-						cols="75"
-						class="form-control"
-						:value="notizData.text"
-     					@input="updateText"></textarea>
-					</div>
-					
-					<div v-else class="col-sm-7">
-						<textarea rows="5" cols="75" v-model="notizData.text" class="form-control"></textarea>
-					</div>
-				
-				</div>
-	
-			<!-- show Documentupload-->
-			<div v-if="showDocument">
-				<div class="row mb-3">
-				
-					<label for="text" class="form-label col-sm-2">{{$p.t('notiz','document')}}</label>
-					<div  class="col-sm-7 py-3">
-						<!--Upload Component-->
-						<FormUploadDms ref="upload" id="file" multiple v-model="notizData.anhang"></FormUploadDms>
-					</div>
-				
-				</div>
-			</div>
+	<div class="notiz-notizcomponent">
+		<div v-if="notizLayout=='classicFas'">
+			<!--Modal: deleteNotizModal-->
+			<BsModal ref="deleteNotizModal">
+				<template #title>Notiz löschen</template>
+				<template #default>
+					<p>Notiz wirklich löschen?</p>
+				</template>
+				<template #footer>
+					<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetFormData">Abbrechen</button>
+					<button ref="Close" type="button" class="btn btn-primary" @click="deleteNotiz(notizData.notiz_id)">OK</button>
+				</template>
+			</BsModal>
 			
-			<!-- show Details-->
-			<div v-if="showErweitert">
+			<core-filter-cmpt
+				ref="table"
+				:tabulator-options="tabulatorOptions"
+				:tabulator-events="tabulatorEvents"
+				table-only
+				:side-menu="false"
+				reload
+				new-btn-show
+				new-btn-label="Notiz"
+				@click:new="actionNewNotiz"
+				>
+			</core-filter-cmpt>
 			
-				<div class="row mb-3">
-					<label for="bis" class="form-label col-sm-2">{{$p.t('notiz','verfasser')}}</label>
-										
-					<div v-if="notizData.verfasser_uid" class="col-sm-3">
-						<input type="text" :readonly="readonly" class="form-control" id="name" v-model="notizData.verfasser_uid">
-					</div>
-					<div v-else class="col-sm-3">
-						<PvAutoComplete v-model="notizData.intVerfasser" optionLabel="mitarbeiter"  :suggestions="filteredMitarbeiter" @complete="search" minLength="3"/>
-					</div>
-					
-					<label for="von" class="form-label col-sm-1">{{$p.t('global','gueltigVon')}}</label>
-					<div class="col-sm-3">
-						<vue-date-picker
-							id="von"
-							v-model="notizData.start"
-							clearable="false"
-							auto-apply
-							:enable-time-picker="false"
-							format="dd.MM.yyyy"
-							:teleport="true"
-							preview-format="dd.MM.yyyy"></vue-date-picker>
-					</div>
-				</div>
-				
-				<div class="row mb-3">
-					<label for="bis" class="form-label col-sm-2">{{$p.t('notiz','bearbeiter')}}</label>
-					
-					<div v-if="notizData.bearbeiter_uid" class="col-sm-3">
-						<input type="text" :readonly="readonly" class="form-control" id="name" v-model="notizData.bearbeiter_uid">
-					</div>
-					
-					<div v-else class="col-sm-3">
-						<PvAutoComplete v-model="notizData.intBearbeiter" optionLabel="mitarbeiter" :suggestions="filteredMitarbeiter" @complete="search" minlength="3"/>
-					</div>
-					
-					
-					<label for="bis" class="form-label col-sm-1">{{$p.t('global','gueltigBis')}}</label>
-					<div class="col-sm-3">
-						<vue-date-picker
-							id="bis"
-							v-model="notizData.ende"
-							clearable="false"
-							auto-apply
-							:enable-time-picker="false"
-							format="dd.MM.yyyy"
-							:teleport="true"
-							preview-format="dd.MM.yyyy"></vue-date-picker>
-					</div>
-					
-				</div>
-									
-				<div class="row mb-3">
-					<label for="bis" class="form-label col-sm-2">{{$p.t('notiz','erledigt')}}</label>
-					<div class="col-sm-1">
-						<input type="checkbox" v-model="notizData.erledigt">
-					</div>
-				</div>
-				
-			</div>
-			
-			<div class="row mb-3">
-				<label for="lastUpdate" class="form-label col-sm-2 small">{{$p.t('notiz','letzte_aenderung')}}</label>
-				<div class="col-sm-7">
-					<p class="small">{{notizData.lastupdate}}</p>
-				</div>
-			</div>
-			
-			<button v-if="notizData.statusNew"  type="button" class="btn btn-primary" @click="addNewNotiz()"> {{$p.t('studierendenantrag', 'btn_new')}}</button>
-			<button v-else type="button" class="btn btn-primary" @click="updateNotiz(notizData.notiz_id)"> {{$p.t('ui', 'speichern')}}</button>
-					
-		</form>		
-	</div>
-
-	<div v-else-if="notizLayout=='twoColumnsFormRight'" class="notiz-notiz">
-
-		<!--Modal: deleteNotizModal-->
-		<BsModal ref="deleteNotizModal">
-			<template #title>Notiz löschen</template>
-			<template #default>
-				<p>Notiz wirklich löschen?</p>
-			</template>
-			<template #footer>
-				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">Abbrechen</button>
-				<button ref="Close" type="button" class="btn btn-primary" @click="deleteNotiz(notizData.notiz_id)">OK</button>
-			</template>
-		</BsModal>
-		
-		<div class="row">
-			<div class="col-sm-6 pt-6">
 			<br>
+		
+			<form ref="formc" @submit.prevent class="row pt-3">
+				<br><br>
+				<div class="pt-2">
+					<div class="row mb-3">
+						<div class="col-sm-7">
+							<span class="small">[{{notizData.typeId}}]</span>
+						</div>
+					</div>
+					
+					<div class="row mb-3">
+						<div class="col-sm-7">
+							<p v-if="notizData.statusNew" class="fw-bold"> {{$p.t('notiz','notiz_new')}}</p>
+							<p v-else class="fw-bold">{{$p.t('notiz','notiz_edit')}}</p>
+						</div>
+					</div>
+		
+					<div class="row mb-3">
+						<label for="titel" class="form-label col-sm-2">{{$p.t('global','titel')}} *</label>
+						<div class="col-sm-7">
+							<input type="text" v-model="notizData.titel" class="form-control">
+						</div>
+					</div>
+								
+					<div class="row mb-3">
+						<label for="text" class="form-label col-sm-2">{{$p.t('global','text')}} *</label>
+							
+						<!-- TinyMce 5 -->
+						<div v-if="showTinyMce" class="col-sm-7">
+							<textarea
+								ref="editor"
+								rows="5"
+								cols="75"
+								class="form-control"
+								:value="notizData.text"
+		     					@input="updateText">
+		     				</textarea>
+						</div>
+						<div v-else class="col-sm-7">
+							<textarea rows="5" cols="75" v-model="notizData.text" class="form-control"></textarea>
+						</div>
+					</div>
+				</div>
+
+				<!-- show Documentupload-->
+				<div v-if="showDocument">
+					<div class="row mb-3">
+						<label for="text" class="form-label col-sm-2">{{$p.t('notiz','document')}}</label>
+						<div  class="col-sm-7 py-3">
+							<!--Upload Component-->
+							<FormUploadDms ref="upload" id="file" multiple v-model="notizData.anhang"></FormUploadDms>
+						</div>
+					</div>
+				</div>
+				
+				<!-- show Details-->
+				<div v-if="showErweitert">
+					<div class="row mb-3">
+						<label for="bis" class="form-label col-sm-2">{{$p.t('notiz','verfasser')}}</label>
+											
+						<div v-if="notizData.verfasser_uid" class="col-sm-3">
+							<input type="text" :readonly="readonly" class="form-control" id="name" v-model="notizData.verfasser_uid">
+						</div>
+						<div v-else class="col-sm-3">
+							<PvAutoComplete v-model="notizData.intVerfasser" optionLabel="mitarbeiter"  :suggestions="filteredMitarbeiter" @complete="search" minLength="3"/>
+						</div>
+						
+						<label for="von" class="form-label col-sm-1">{{$p.t('global','gueltigVon')}}</label>
+						<div class="col-sm-3">
+							<vue-date-picker
+								id="von"
+								v-model="notizData.start"
+								clearable="false"
+								auto-apply
+								:enable-time-picker="false"
+								format="dd.MM.yyyy"
+								:teleport="true"
+								preview-format="dd.MM.yyyy"></vue-date-picker>
+						</div>
+					</div>
+					
+					<div class="row mb-3">
+						<label for="bis" class="form-label col-sm-2">{{$p.t('notiz','bearbeiter')}}</label>
+						
+						<div v-if="notizData.bearbeiter_uid" class="col-sm-3">
+							<input type="text" :readonly="readonly" class="form-control" id="name" v-model="notizData.bearbeiter_uid">
+						</div>
+						
+						<div v-else class="col-sm-3">
+							<PvAutoComplete v-model="notizData.intBearbeiter" optionLabel="mitarbeiter" :suggestions="filteredMitarbeiter" @complete="search" minlength="3"/>
+						</div>
+						
+						
+						<label for="bis" class="form-label col-sm-1">{{$p.t('global','gueltigBis')}}</label>
+						<div class="col-sm-3">
+							<vue-date-picker
+								id="bis"
+								v-model="notizData.ende"
+								clearable="false"
+								auto-apply
+								:enable-time-picker="false"
+								format="dd.MM.yyyy"
+								:teleport="true"
+								preview-format="dd.MM.yyyy">
+							</vue-date-picker>
+						</div>
+					</div>
+										
+					<div class="row mb-3">
+						<label for="bis" class="form-label col-sm-2">{{$p.t('notiz','erledigt')}}</label>
+						<div class="col-sm-1">
+							<input type="checkbox" v-model="notizData.erledigt">
+						</div>
+					</div>
+				</div>
+				
+				<div class="row mb-3">
+					<label for="lastUpdate" class="form-label col-sm-2 small">{{$p.t('notiz','letzte_aenderung')}}</label>
+					<div class="col-sm-7">
+						<p class="small">{{notizData.lastupdate}}</p>
+					</div>
+				</div>
+				
+				<button v-if="notizData.statusNew"  type="button" class="btn btn-primary" @click="addNewNotiz()"> {{$p.t('studierendenantrag', 'btn_new')}}</button>
+				<button v-else type="button" class="btn btn-primary" @click="updateNotiz(notizData.notiz_id)"> {{$p.t('ui', 'speichern')}}</button>
+			</form>		
+		</div>
+
+		<div v-else-if="notizLayout=='twoColumnsFormRight'" class="notiz-notiz">
+
+			<!--Modal: deleteNotizModal-->
+			<BsModal ref="deleteNotizModal">
+				<template #title>Notiz löschen</template>
+				<template #default>
+					<p>Notiz wirklich löschen?</p>
+				</template>
+				<template #footer>
+					<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetFormData">Abbrechen</button>
+					<button ref="Close" type="button" class="btn btn-primary" @click="deleteNotiz(notizData.notiz_id)">OK</button>
+				</template>
+			</BsModal>
+			
+			<div class="row">
+				<div class="col-sm-6 pt-6">
+					<br>
 					<core-filter-cmpt
 						ref="table"
 						:tabulator-options="tabulatorOptions"
@@ -644,17 +655,15 @@ export default {
 						@click:new="actionNewNotiz"
 						>
 					</core-filter-cmpt>	
-			</div>
-		
-			<div class="col-sm-6">
-<!--			<p v-if="notizData.statusNew" class="fw-bold">{{$p.t('notiz','notiz_new')}} <span> [{{notizData.typeId}}]</span></p>
-			<p v-else class="fw-bold">{{$p.t('notiz','notiz_edit')}} <span> [{{notizData.typeId}}]</span></p>-->
+				</div>
 			
+				<div class="col-sm-6">
+					<!--
+					<p v-if="notizData.statusNew" class="fw-bold">{{$p.t('notiz','notiz_new')}} <span> [{{notizData.typeId}}]</span></p>
+					<p v-else class="fw-bold">{{$p.t('notiz','notiz_edit')}} <span> [{{notizData.typeId}}]</span></p>
+					-->
 
-
-			  	<form ref="formc" @submit.prevent class="row pt-3">
-			
-	<!--				<div class="row">-->
+					<form ref="formc" @submit.prevent class="row pt-3">
 						<div class="col pt-3">
 							<p v-if="notizData.statusNew" class="fw-bold">{{$p.t('notiz','notiz_new')}} <span> [{{notizData.typeId}}]</span></p>
 							<p v-else class="fw-bold">{{$p.t('notiz','notiz_edit')}} <span> [{{notizData.typeId}}]</span></p>
@@ -664,318 +673,129 @@ export default {
 							<button v-if="notizData.statusNew" class="btn btn-primary position-absolute top-0 end-0" @click="addNewNotiz()"> {{$p.t('studierendenantrag', 'btn_new')}}</button>
 							<button v-else class="btn btn-primary position-absolute top-0 end-0" @click="updateNotiz(notizData.notiz_id)"> {{$p.t('ui', 'speichern')}}</button>
 						</div>
-	
-					<div class="row mb-3">
-						<form-input
-							container-class="col-12"
-							:label="$p.t('global','titel')  + ' *'"
-							type="text"
-							v-model="notizData.titel"
-							name="titel"
-							>
-						</form-input>
-					</div>
-								
-					<div class="row mb-3">
-							
-						<!-- TinyMce 5 -->
-						<div v-if="showTinyMCE" class="col-sm-12">
-							<label for="text" class="form-label col-sm-2">{{$p.t('global','text')}} *</label>
-							<textarea
-							ref="editor"
-							rows="5"
-							cols="75"
-							class="form-control"
-							:value="notizData.text"
-							@input="updateText"></textarea>
-						</div>
-						
-						<div v-else class="col-sm-12">
-							<label for="text" class="form-label col-sm-2">{{$p.t('global','text')}} *</label>
-							<textarea rows="5" cols="75" v-model="notizData.text" class="form-control"></textarea>
-						</div>
-					
-					</div>
-			
-					<!-- show Documentupload-->
-					<div v-if="showDocument">
-						<div class="row mb-3">		
-							
-							<div  class="col-sm-12 py-3">
-							<label for="text" class="form-label col-sm-2">{{$p.t('notiz','document')}}</label>
-								<!--Upload Component-->
-								<FormUploadDms ref="upload" id="file" multiple v-model="notizData.anhang"></FormUploadDms>
-							</div>
-						
-						</div>
-					</div>
-					
-					<!-- show Details-->
-					<div v-if="showErweitert">
-					
+		
 						<div class="row mb-3">
-											
 							<form-input
-								container-class="col-6"
-								:label="$p.t('global', 'gueltigVon')"
-								type="DatePicker"
-								v-model="notizData['start']"
-								name="von"
-								auto-apply
-								:enable-time-picker="false"
-								format="dd.MM.yyyy"
-								preview-format="dd.MM.yyyy"
-								:teleport="true"
-								>
-							</form-input>
-							
-							<form-input
-								container-class="col-6"
-								:label="$p.t('global', 'gueltigBis')"
-								type="DatePicker"
-								v-model="notizData.ende"
-								name="bis"
-								auto-apply
-								:enable-time-picker="false"
-								format="dd.MM.yyyy"
-								preview-format="dd.MM.yyyy"
-								:teleport="true"
-								>
-							</form-input>
-						</div>
-						
-						<div class="row mb-3">
-							<form-input 
-								v-if="notizData.verfasser_uid"
-								container-class="col-6"
-								:label="$p.t('notiz', 'verfasser')"
+								container-class="col-12"
+								:label="$p.t('global','titel')  + ' *'"
 								type="text"
-								v-model="notizData.verfasser_uid"
+								v-model="notizData.titel"
 								name="titel"
-							>
-							</form-input>
-					
-							<form-input
-								v-else
-								container-class="col-6"
-								:label="$p.t('notiz', 'verfasser')"
-								type="autocomplete"
-								v-model="notizData.intVerfasser"
-								:suggestions="filteredMitarbeiter" 
-								@complete="search" 
-								optionLabel="mitarbeiter"
-								minLength="3"
 								>
 							</form-input>
-							
-							<form-input
-								v-if="notizData.bearbeiter_uid"
-								container-class="col-6"
-								:label="$p.t('notiz', 'bearbeiter')"
-								v-model="notizData.bearbeiter_uid"
-								minlength="3"
-								>
-							</form-input>
-							
-							<form-input
-								v-else
-								container-class="col-6"
-								:label="$p.t('notiz', 'bearbeiter')"
-								type="autocomplete"
-								v-model="notizData.intBearbeiter"
-								:suggestions="filteredMitarbeiter" 
-								@complete="search" 
-								optionLabel="mitarbeiter"
-								minlength="3"
-								>
-							</form-input>	
 						</div>
-														
+									
 						<div class="row mb-3">
-								<div class="col-2 pt-4 d-flex align-items-center">
-									<form-input
-										container-class="form-check"
-										:label="$p.t('notiz', 'erledigt')"
-										type="checkbox"
-										v-model="notizData.erledigt"
-										name="erledigt"
-										>
-									</form-input>
-								</div>
-		<!--					<label for="bis" class="form-label col-sm-2">{{$p.t('notiz','erledigt')}}</label>
-							<div class="col-sm-1">
-								<input type="checkbox" v-model="notizData.erledigt">
-							</div>-->
-						</div>
-						
-					</div>
-					
-					<div class="row mb-3">
-						<label for="lastUpdate" class="form-label col-sm-3 small">{{$p.t('notiz','letzte_aenderung')}}</label>
-						<div class="col-sm-5">
-							<p class="small">{{notizData.lastupdate}}</p>
-						</div>
-					</div>
-					
-				</form>		
-			</div>
-		</div> 
-	</div>
-	
-	<div v-else-if="notizLayout=='twoColumnsFormLeft'" class="notiz-notiz">
-
-		<!--Modal: deleteNotizModal-->
-		<BsModal ref="deleteNotizModal">
-			<template #title>Notiz löschen</template>
-			<template #default>
-				<p>Notiz wirklich löschen?</p>
-			</template>
-			<template #footer>
-				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">Abbrechen</button>
-				<button ref="Close" type="button" class="btn btn-primary" @click="deleteNotiz(notizData.notiz_id)">OK</button>
-			</template>
-		</BsModal>
-		
-		<div class="row">
-		
-		<div class="col-sm-6">
-	
-		  	<form ref="formc" @submit.prevent class="row pt-3">
-			
-					<div class="col pt-3">
-						<p v-if="notizData.statusNew" class="fw-bold">{{$p.t('notiz','notiz_new')}} <span> [{{notizData.typeId}}]</span></p>
-						<p v-else class="fw-bold">{{$p.t('notiz','notiz_edit')}} <span> [{{notizData.typeId}}]</span></p>
-					</div>
-											
-	
-					<div class="row mb-3">
-						<form-input
-							container-class="col-12"
-							:label="$p.t('global','titel')  + ' *'"
-							type="text"
-							v-model="notizData.titel"
-							name="titel"
-							>
-						</form-input>
-					</div>
-								
-					<div class="row mb-3">
-							
-						<!-- TinyMce 5 -->
-						<div v-if="showTinyMCE" class="col-sm-12">
-							<label for="text" class="form-label col-sm-2">{{$p.t('global','text')}} *</label>
-							<textarea
-							ref="editor"
-							rows="5"
-							cols="75"
-							class="form-control"
-							:value="notizData.text"
-							@input="updateText"></textarea>
-						</div>
-						
-						<div v-else class="col-sm-12">
-							<label for="text" class="form-label col-sm-2">{{$p.t('global','text')}} *</label>
-							<textarea rows="5" cols="75" v-model="notizData.text" class="form-control"></textarea>
-						</div>
-					
-					</div>
-			
-					<!-- show Documentupload-->
-					<div v-if="showDocument">
-						<div class="row mb-3">		
-							
-							<div  class="col-sm-12 py-3">
-							<label for="text" class="form-label col-sm-2">{{$p.t('notiz','document')}}</label>
-								<!--Upload Component-->
-								<FormUploadDms ref="upload" id="file" multiple v-model="notizData.anhang"></FormUploadDms>
+							<!-- TinyMce 5 -->
+							<div v-if="showTinyMce" class="col-sm-12">
+								<label for="text" class="form-label col-sm-2">{{$p.t('global','text')}} *</label>
+								<textarea
+									ref="editor"
+									rows="5"
+									cols="75"
+									class="form-control"
+									:value="notizData.text"
+									@input="updateText">
+								</textarea>
 							</div>
-						
-						</div>
-					</div>
-					
-					<!-- show Details-->
-					<div v-if="showErweitert">
-					
-						<div class="row mb-3">
-											
-							<form-input
-								container-class="col-6"
-								:label="$p.t('global', 'gueltigVon')"
-								type="DatePicker"
-								v-model="notizData['start']"
-								name="von"
-								auto-apply
-								:enable-time-picker="false"
-								format="dd.MM.yyyy"
-								preview-format="dd.MM.yyyy"
-								:teleport="true"
-								>
-							</form-input>
 							
-							<form-input
-								container-class="col-6"
-								:label="$p.t('global', 'gueltigBis')"
-								type="DatePicker"
-								v-model="notizData.ende"
-								name="bis"
-								auto-apply
-								:enable-time-picker="false"
-								format="dd.MM.yyyy"
-								preview-format="dd.MM.yyyy"
-								:teleport="true"
-								>
-							</form-input>
+							<div v-else class="col-sm-12">
+								<label for="text" class="form-label col-sm-2">{{$p.t('global','text')}} *</label>
+								<textarea rows="5" cols="75" v-model="notizData.text" class="form-control"></textarea>
+							</div>
 						</div>
-						
 				
-						<div class="row mb-3">
-							<form-input 
-								v-if="notizData.verfasser_uid"
-								container-class="col-6"
-								:label="$p.t('notiz', 'verfasser')"
-								type="text"
-								v-model="notizData.verfasser_uid"
-								name="titel"
-							>
-							</form-input>
-					
-							<form-input
-								v-else
-								container-class="col-6"
-								:label="$p.t('notiz', 'verfasser')"
-								type="autocomplete"
-								v-model="notizData.intVerfasser"
-								:suggestions="filteredMitarbeiter" 
-								@complete="search" 
-								optionLabel="mitarbeiter"
-								minLength="3"
-								>
-							</form-input>
-							
-							<form-input
-								v-if="notizData.bearbeiter_uid"
-								container-class="col-6"
-								:label="$p.t('notiz', 'bearbeiter')"
-								v-model="notizData.bearbeiter_uid"
-								minlength="3"
-								>
-							</form-input>
-							
-							<form-input
-								v-else
-								container-class="col-6"
-								:label="$p.t('notiz', 'bearbeiter')"
-								type="autocomplete"
-								v-model="notizData.intBearbeiter"
-								:suggestions="filteredMitarbeiter" 
-								@complete="search" 
-								optionLabel="mitarbeiter"
-								minlength="3"
-								>
-							</form-input>	
+						<!-- show Documentupload-->
+						<div v-if="showDocument">
+							<div class="row mb-3">		
+								<div  class="col-sm-12 py-3">
+								<label for="text" class="form-label col-sm-2">{{$p.t('notiz','document')}}</label>
+									<!--Upload Component-->
+									<FormUploadDms ref="upload" id="file" multiple v-model="notizData.anhang"></FormUploadDms>
+								</div>
+							</div>
 						</div>
-														
-						<div class="row mb-3">
+						
+						<!-- show Details-->
+						<div v-if="showErweitert">
+							<div class="row mb-3">
+								<form-input
+									container-class="col-6"
+									:label="$p.t('global', 'gueltigVon')"
+									type="DatePicker"
+									v-model="notizData['start']"
+									name="von"
+									auto-apply
+									:enable-time-picker="false"
+									format="dd.MM.yyyy"
+									preview-format="dd.MM.yyyy"
+									:teleport="true"
+									>
+								</form-input>
+								
+								<form-input
+									container-class="col-6"
+									:label="$p.t('global', 'gueltigBis')"
+									type="DatePicker"
+									v-model="notizData.ende"
+									name="bis"
+									auto-apply
+									:enable-time-picker="false"
+									format="dd.MM.yyyy"
+									preview-format="dd.MM.yyyy"
+									:teleport="true"
+									>
+								</form-input>
+							</div>
+							
+							<div class="row mb-3">
+								<form-input 
+									v-if="notizData.verfasser_uid"
+									container-class="col-6"
+									:label="$p.t('notiz', 'verfasser')"
+									type="text"
+									v-model="notizData.verfasser_uid"
+									name="titel"
+									>
+								</form-input>
+						
+								<form-input
+									v-else
+									container-class="col-6"
+									:label="$p.t('notiz', 'verfasser')"
+									type="autocomplete"
+									v-model="notizData.intVerfasser"
+									:suggestions="filteredMitarbeiter" 
+									@complete="search" 
+									optionLabel="mitarbeiter"
+									minLength="3"
+									>
+								</form-input>
+								
+								<form-input
+									v-if="notizData.bearbeiter_uid"
+									container-class="col-6"
+									:label="$p.t('notiz', 'bearbeiter')"
+									v-model="notizData.bearbeiter_uid"
+									minlength="3"
+									>
+								</form-input>
+								
+								<form-input
+									v-else
+									container-class="col-6"
+									:label="$p.t('notiz', 'bearbeiter')"
+									type="autocomplete"
+									v-model="notizData.intBearbeiter"
+									:suggestions="filteredMitarbeiter" 
+									@complete="search" 
+									optionLabel="mitarbeiter"
+									minlength="3"
+									>
+								</form-input>	
+							</div>
+															
+							<div class="row mb-3">
 								<div class="col-2 pt-4 d-flex align-items-center">
 									<form-input
 										container-class="form-check"
@@ -986,31 +806,204 @@ export default {
 										>
 									</form-input>
 								</div>
-		<!--					<label for="bis" class="form-label col-sm-2">{{$p.t('notiz','erledigt')}}</label>
-							<div class="col-sm-1">
-								<input type="checkbox" v-model="notizData.erledigt">
-							</div>-->
+								<!--
+								<label for="bis" class="form-label col-sm-2">{{$p.t('notiz','erledigt')}}</label>
+								<div class="col-sm-1">
+									<input type="checkbox" v-model="notizData.erledigt">
+								</div>
+								-->
+							</div>
 						</div>
 						
-					</div>
-					
-					<div class="row mb-3">
-						<label for="lastUpdate" class="form-label col-sm-3 small">{{$p.t('notiz','letzte_aenderung')}}</label>
-						<div class="col-sm-5">
-							<p class="small">{{notizData.lastupdate}}</p>
+						<div class="row mb-3">
+							<label for="lastUpdate" class="form-label col-sm-3 small">{{$p.t('notiz','letzte_aenderung')}}</label>
+							<div class="col-sm-5">
+								<p class="small">{{notizData.lastupdate}}</p>
+							</div>
 						</div>
-					</div>
+					</form>		
+				</div>
+			</div> 
+		</div>
+		
+		<div v-else-if="notizLayout=='twoColumnsFormLeft'" class="notiz-notiz">
+			<!--Modal: deleteNotizModal-->
+			<BsModal ref="deleteNotizModal">
+				<template #title>Notiz löschen</template>
+				<template #default>
+					<p>Notiz wirklich löschen?</p>
+				</template>
+				<template #footer>
+					<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetFormData">Abbrechen</button>
+					<button ref="Close" type="button" class="btn btn-primary" @click="deleteNotiz(notizData.notiz_id)">OK</button>
+				</template>
+			</BsModal>
+			
+			<div class="row">
+				<div class="col-sm-6">
+				  	<form ref="formc" @submit.prevent class="row pt-3">
+						<div class="col pt-3">
+							<p v-if="notizData.statusNew" class="fw-bold">{{$p.t('notiz','notiz_new')}} <span> [{{notizData.typeId}}]</span></p>
+							<p v-else class="fw-bold">{{$p.t('notiz','notiz_edit')}} <span> [{{notizData.typeId}}]</span></p>
+						</div>
+												
+						<div class="row mb-3">
+							<form-input
+								container-class="col-12"
+								:label="$p.t('global','titel')  + ' *'"
+								type="text"
+								v-model="notizData.titel"
+								name="titel"
+								>
+							</form-input>
+						</div>
+									
+						<div class="row mb-3">
+							<!-- TinyMce 5 -->
+							<div v-if="showTinyMce" class="col-sm-12">
+								<label for="text" class="form-label col-sm-2">{{$p.t('global','text')}} *</label>
+								<textarea
+								ref="editor"
+								rows="5"
+								cols="75"
+								class="form-control"
+								:value="notizData.text"
+								@input="updateText"></textarea>
+							</div>
+							
+							<div v-else class="col-sm-12">
+								<label for="text" class="form-label col-sm-2">{{$p.t('global','text')}} *</label>
+								<textarea rows="5" cols="75" v-model="notizData.text" class="form-control"></textarea>
+							</div>
+						</div>
+				
+						<!-- show Documentupload-->
+						<div v-if="showDocument">
+							<div class="row mb-3">		
+								<div  class="col-sm-12 py-3">
+									<label for="text" class="form-label col-sm-2">{{$p.t('notiz','document')}}</label>
+									<!--Upload Component-->
+									<FormUploadDms ref="upload" id="file" multiple v-model="notizData.anhang"></FormUploadDms>
+								</div>
+							</div>
+						</div>
+						
+						<!-- show Details-->
+						<div v-if="showErweitert">
+							<div class="row mb-3">
+								<form-input
+									container-class="col-6"
+									:label="$p.t('global', 'gueltigVon')"
+									type="DatePicker"
+									v-model="notizData['start']"
+									name="von"
+									auto-apply
+									:enable-time-picker="false"
+									format="dd.MM.yyyy"
+									preview-format="dd.MM.yyyy"
+									:teleport="true"
+									>
+								</form-input>
+								
+								<form-input
+									container-class="col-6"
+									:label="$p.t('global', 'gueltigBis')"
+									type="DatePicker"
+									v-model="notizData.ende"
+									name="bis"
+									auto-apply
+									:enable-time-picker="false"
+									format="dd.MM.yyyy"
+									preview-format="dd.MM.yyyy"
+									:teleport="true"
+									>
+								</form-input>
+							</div>
+							
 					
+							<div class="row mb-3">
+								<form-input 
+									v-if="notizData.verfasser_uid"
+									container-class="col-6"
+									:label="$p.t('notiz', 'verfasser')"
+									type="text"
+									v-model="notizData.verfasser_uid"
+									name="titel"
+									>
+								</form-input>
+						
+								<form-input
+									v-else
+									container-class="col-6"
+									:label="$p.t('notiz', 'verfasser')"
+									type="autocomplete"
+									v-model="notizData.intVerfasser"
+									:suggestions="filteredMitarbeiter" 
+									@complete="search" 
+									optionLabel="mitarbeiter"
+									minLength="3"
+									>
+								</form-input>
+								
+								<form-input
+									v-if="notizData.bearbeiter_uid"
+									container-class="col-6"
+									:label="$p.t('notiz', 'bearbeiter')"
+									v-model="notizData.bearbeiter_uid"
+									minlength="3"
+									>
+								</form-input>
+								
+								<form-input
+									v-else
+									container-class="col-6"
+									:label="$p.t('notiz', 'bearbeiter')"
+									type="autocomplete"
+									v-model="notizData.intBearbeiter"
+									:suggestions="filteredMitarbeiter" 
+									@complete="search" 
+									optionLabel="mitarbeiter"
+									minlength="3"
+									>
+								</form-input>	
+							</div>
+															
+							<div class="row mb-3">
+								<div class="col-2 pt-4 d-flex align-items-center">
+									<form-input
+										container-class="form-check"
+										:label="$p.t('notiz', 'erledigt')"
+										type="checkbox"
+										v-model="notizData.erledigt"
+										name="erledigt"
+										>
+									</form-input>
+								</div>
+								<!--
+								<label for="bis" class="form-label col-sm-2">{{$p.t('notiz','erledigt')}}</label>
+								<div class="col-sm-1">
+									<input type="checkbox" v-model="notizData.erledigt">
+								</div>
+								-->
+							</div>
+						</div>
+						
+						<div class="row mb-3">
+							<label for="lastUpdate" class="form-label col-sm-3 small">{{$p.t('notiz','letzte_aenderung')}}</label>
+							<div class="col-sm-5">
+								<p class="small">{{notizData.lastupdate}}</p>
+							</div>
+						</div>
+						
 						<div>
 							<button v-if="notizData.statusNew" class="btn btn-primary" @click="addNewNotiz()"> {{$p.t('studierendenantrag', 'btn_new')}}</button>
 							<button v-else class="btn btn-primary" @click="updateNotiz(notizData.notiz_id)"> {{$p.t('ui', 'speichern')}}</button>
 						</div>
-					
-				</form>		
-			</div>
-			
-			<div class="col-sm-6 pt-6">
-			<br>
+					</form>		
+				</div>
+				
+				<div class="col-sm-6 pt-6">
+					<br>
 					<core-filter-cmpt
 						ref="table"
 						:tabulator-options="tabulatorOptions"
@@ -1023,17 +1016,12 @@ export default {
 						@click:new="actionNewNotiz"
 						>
 					</core-filter-cmpt>	
-			</div>
+				</div>
+			</div> 
+		</div>
 		
-			
-		</div> 
-		
-	</div>
-	
-	<div v-else>
-	<p>Kein Layout übergeben</p>
-	</div>
-</div>
-<br>
-`,
+		<div v-else>
+			<p>Kein Layout übergeben</p>
+		</div>
+	</div>`,
 }
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Betriebsmittel.js b/public/js/components/Stv/Studentenverwaltung/Details/Betriebsmittel.js
index 9e1a2484a..fbee3dda3 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Betriebsmittel.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Betriebsmittel.js
@@ -1,21 +1,20 @@
-import Betriebsmittel from "../../../Betriebsmittel/Betriebsmittel.js";
+import CoreBetriebsmittel from "../../../Betriebsmittel/Betriebsmittel.js";
 
 export default {
 	components: {
-		Betriebsmittel
+		CoreBetriebsmittel
 	},
 	props: {
 		modelValue: Object
 	},
 	template: `
-	<div class="stv-details-details h-100 pb-3">
-		<h3>Betriebsmittel</h3>
-		<Betriebsmittel
+	<div class="stv-details-betriebsmittel h-100 pb-3">
+		<core-betriebsmittel
 			ref="formc"
 			:person_id="modelValue.person_id"
 			:uid="modelValue.uid"
 			>
-		</Betriebsmittel>	
+		</core-betriebsmittel>	
 	</div>
 	`
 };
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt.js
index ce718d61b..f9eff15f7 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt.js
@@ -19,7 +19,7 @@ export default {
 		}
 	},
 	template: `
-	<div class="stv-details-details h-100 pb-3">
+	<div class="stv-details-kontakt h-100 pb-3">
 		<fieldset class="overflow-hidden">
 			<legend>{{this.$p.t('person', 'adressen')}}</legend>
 			<address-list ref="adressList" :uid="modelValue.person_id"></address-list>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
index e2301f7a3..1e7423fd9 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
@@ -11,7 +11,7 @@ export default{
 		BsModal
 	},
 	props: {
-		uid: String
+		uid: Number
 	},
 	data() {
 		return{
@@ -309,7 +309,7 @@ export default{
 					<div class="row mb-3">
 						<label for="strasse" class="form-label col-sm-4">{{$p.t('person', 'strasse')}}</label>
 						<div class="col-sm-6">
-							<input type="text" :readonly="readonly" class="form-control" id="strasse" v-model="addressData['strasse']">
+							<input type="text" class="form-control" id="strasse" v-model="addressData['strasse']">
 						</div>
 					</div>
 						
@@ -330,7 +330,7 @@ export default{
 					</div>
 					
 					<div class="row mb-3">
-						<label :for="gemeinde" class="form-label col-sm-4">{{$p.t('person', 'gemeinde')}}</label>
+						<label for="gemeinde" class="form-label col-sm-4">{{$p.t('person', 'gemeinde')}}</label>
 							<div class="col-sm-6">
 								<select v-if="addressData['nation'] == 'A'" name="addressData[gemeinde]" class="form-select" v-model="addressData['gemeinde']">
 									<option v-if="!gemeinden.length" disabled>Bitte gültige PLZ wählen</option>
@@ -341,7 +341,7 @@ export default{
 					</div>
 					
 					<div class="row mb-3">
-							<label :for="Ort" class="form-label col-sm-4">{{$p.t('person', 'ort')}}</label>
+							<label for="Ort" class="form-label col-sm-4">{{$p.t('person', 'ort')}}</label>
 							<div class="col-sm-6">
 								<select v-if="addressData['nation'] == 'A'" name="address[ort]" class="form-select" v-model="addressData['ort']">
 									<option v-if="!orte.length" disabled>Bitte gültige Gemeinde wählen</option>
@@ -388,20 +388,20 @@ export default{
 					<div class="row mb-3">
 						<label for="firma_name" class="form-label col-sm-4">{{$p.t('person', 'firma')}}</label>
 							<div class="col-sm-3">
-							 	<PvAutoComplete v-model="addressData['firma']"  optionLabel="name" :suggestions="filteredFirmen" @complete="search" minLength="3"/>
+							 	<PvAutoComplete v-model="addressData['firma']"  optionLabel="name" :suggestions="filteredFirmen" @complete="search" :min-length="3"/>
 							</div>
 					</div>
 					
 					<div class="row mb-3">
 						<label for="name" class="form-label col-sm-4">{{$p.t('person', 'firma_zusatz')}}</label>
 						<div class="col-sm-6">
-							<input type="text" :readonly="readonly" class="form-control" id="name" v-model="addressData['name']">
+							<input type="text" class="form-control" id="name" v-model="addressData['name']">
 						</div>
 					</div>
 					<div class="row mb-3">
 						<label for="anmerkung" class="form-label col-sm-4">{{$p.t('global', 'anmerkung')}}</label>
 						<div class="col-sm-6">
-							<input type="text" :readonly="readonly" class="form-control" id="anmerkung" v-model="addressData['anmerkung']">
+							<input type="text" class="form-control" id="anmerkung" v-model="addressData['anmerkung']">
 						</div>
 					</div>
 			</form>
@@ -427,7 +427,7 @@ export default{
 				<div class="row mb-3">
 					<label for="strasse" class="form-label col-sm-4">{{$p.t('person', 'strasse')}}</label>
 					<div class="col-sm-6">
-						<input type="text" :readonly="readonly" class="form-control" id="strasse" v-model="addressData.strasse">
+						<input type="text" class="form-control" id="strasse" v-model="addressData.strasse">
 					</div>
 				</div>
 					
@@ -447,7 +447,7 @@ export default{
 					</div>
 				</div>
 				<div class="row mb-3">
-					<label :for="gemeinde" class="form-label col-sm-4">{{$p.t('person', 'gemeinde')}}</label>
+					<label for="gemeinde" class="form-label col-sm-4">{{$p.t('person', 'gemeinde')}}</label>
 						<div v-if="addressData['gemeinde']" class="col-sm-6">
 							<input type="text" class="form-control" v-model="addressData['gemeinde']">
 						</div>
@@ -460,7 +460,7 @@ export default{
 				</div>
 		
 				<div class="row mb-3">
-						<label :for="Ort" class="form-label col-sm-4">{{$p.t('person', 'ort')}}</label>
+						<label for="Ort" class="form-label col-sm-4">{{$p.t('person', 'ort')}}</label>
 						<div v-if="addressData['ort']" class="col-sm-6">
 							<input type="text" name="ort" class="form-control" v-model="addressData['ort']">
 						</div>
@@ -509,28 +509,28 @@ export default{
 				<div class="row mb-3">
 					<label for="firma_name" class="form-label col-sm-4">{{$p.t('person', 'firma')}}</label>
 						<div v-if="addressData.firmenname" class="col-sm-6">
-							<input type="text" :readonly="readonly" class="form-control" id="name" v-model="addressData.firmenname">
+							<input type="text" class="form-control" id="name" v-model="addressData.firmenname">
 						</div>
 						<div v-else class="col-sm-6">
-							<PvAutoComplete v-model="addressData['firma']" optionLabel="name" :suggestions="filteredFirmen" @complete="search" minLength="3"/>
+							<PvAutoComplete v-model="addressData['firma']" optionLabel="name" :suggestions="filteredFirmen" @complete="search" :min-length="3"/>
 						</div>
 				</div>
 				
 				<div class="row mb-3">
-					<input type="hidden" :readonly="readonly" class="form-control" id="firma_id" v-model="addressData.firma_id">
+					<input type="hidden" class="form-control" id="firma_id" v-model="addressData.firma_id">
 				</div>
 	
 				<div class="row mb-3">
 					<label for="name" class="form-label col-sm-4">{{$p.t('person', 'firma_zusatz')}}</label>
 					<div class="col-sm-6">
-						<input type="text" :readonly="readonly" class="form-control" id="name" v-model="addressData['name']">
+						<input type="text" class="form-control" id="name" v-model="addressData['name']">
 					</div>
 				</div>
 				
 				<div class="row mb-3">
 					<label for="anmerkung" class="form-label col-sm-4">{{$p.t('global', 'anmerkung')}}</label>
 					<div class="col-sm-6">
-						<input type="text" :readonly="readonly" class="form-control" id="anmerkung" v-model="addressData['anmerkung']">
+						<input type="text" class="form-control" id="anmerkung" v-model="addressData['anmerkung']">
 					</div>
 				</div>
 			
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
index 1d5833044..b448529fb 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
@@ -7,7 +7,7 @@ export default{
 		BsModal
 	},
 	props: {
-		uid: String
+		uid: Number
 	},
 	data() {
 		return{
@@ -203,38 +203,38 @@ export default{
 				<div class="row mb-3">
 						<label for="name" class="form-label col-sm-4">Name</label>
 						<div class="col-sm-6">
-							<input type="text" :readonly="readonly" class="form-control" id="name" v-model="bankverbindungData['name']">
+							<input type="text" class="form-control" id="name" v-model="bankverbindungData['name']">
 						</div>
 					</div>
 					<div class="row mb-3">										   
 						<label for="anschrift" class="form-label col-sm-4">{{$p.t('person', 'anschrift')}}</label>
 						<div class="col-sm-6">
-							<input type="text" :readonly="readonly" class="form-control" id="anschrift" v-model="bankverbindungData['anschrift']">
+							<input type="text" class="form-control" id="anschrift" v-model="bankverbindungData['anschrift']">
 						</div>
 					</div>
 
 					<div class="row mb-3">									   
 						<label for="iban" class="form-label col-sm-4">IBAN</label>
 						<div class="col-sm-6">
-							<input type="text" :readonly="readonly" required class="form-control" id="iban" v-model="bankverbindungData['iban']">
+							<input type="text" required class="form-control" id="iban" v-model="bankverbindungData['iban']">
 						</div>
 					</div>
 					<div class="row mb-3">								   
 						<label for="bic" class="form-label col-sm-4">BIC</label>
 						<div class="col-sm-6">
-							<input type="text" :readonly="readonly" class="form-control" id="bic" v-model="bankverbindungData['bic']">
+							<input type="text" class="form-control" id="bic" v-model="bankverbindungData['bic']">
 						</div>
 					</div>
 					<div class="row mb-3">							   
 						<label for="kontonr" class="form-label col-sm-4">{{$p.t('person', 'kontonr')}}</label>
 						<div class="col-sm-6">
-							<input type="text" :readonly="readonly" class="form-control" id="kontonr" v-model="bankverbindungData['kontonr']">
+							<input type="text" class="form-control" id="kontonr" v-model="bankverbindungData['kontonr']">
 						</div>
 					</div>
 					<div class="row mb-3">										   
 						<label for="blz" class="form-label col-sm-4">{{$p.t('person', 'blz')}}</label>
 						<div class="col-sm-6">
-							<input type="text" :readonly="readonly" class="form-control" id="blz" v-model="bankverbindungData['blz']">
+							<input type="text" class="form-control" id="blz" v-model="bankverbindungData['blz']">
 						</div>
 					</div>
 					<div class="row mb-3">
@@ -269,37 +269,37 @@ export default{
 					<div class="row mb-3">
 						<label for="name" class="form-label col-sm-4">Name</label>
 						<div class="col-sm-6">
-							<input type="text" :readonly="readonly" class="form-control" id="name" v-model="bankverbindungData['name']">
+							<input type="text" class="form-control" id="name" v-model="bankverbindungData['name']">
 						</div>
 					</div>
 					<div class="row mb-3">									   
 						<label for="anschrift" class="form-label col-sm-4">{{$p.t('person', 'anschrift')}}</label>
 						<div class="col-sm-6">
-							<input type="text" :readonly="readonly" class="form-control" id="anschrift" v-model="bankverbindungData['anschrift']">
+							<input type="text" class="form-control" id="anschrift" v-model="bankverbindungData['anschrift']">
 						</div>
 					</div>
 					<div class="row mb-3">
 						<label for="iban" class="form-label col-sm-4">IBAN</label>
 						<div class="col-sm-6">
-							<input type="text" :readonly="readonly" required class="form-control" id="iban" v-model="bankverbindungData['iban']">
+							<input type="text" required class="form-control" id="iban" v-model="bankverbindungData['iban']">
 						</div>
 					</div>
 					<div class="row mb-3">									   
 						<label for="bic" class="form-label col-sm-4">BIC</label>
 						<div class="col-sm-6">
-							<input type="text" :readonly="readonly" class="form-control" id="bic" v-model="bankverbindungData['bic']">
+							<input type="text" class="form-control" id="bic" v-model="bankverbindungData['bic']">
 						</div>
 					</div>
 					<div class="row mb-3">									   
 						<label for="kontonr" class="form-label col-sm-4">{{$p.t('person', 'kontonr')}}</label>
 						<div class="col-sm-6">
-							<input type="text" :readonly="readonly" class="form-control" id="kontonr" v-model="bankverbindungData['kontonr']">
+							<input type="text" class="form-control" id="kontonr" v-model="bankverbindungData['kontonr']">
 						</div>
 					</div>
 					<div class="row mb-3">									   
 						<label for="blz" class="form-label col-sm-4">{{$p.t('person', 'blz')}}</label>
 						<div class="col-sm-6">
-							<input type="text" :readonly="readonly" class="form-control" id="blz" v-model="bankverbindungData['blz']">
+							<input type="text" class="form-control" id="blz" v-model="bankverbindungData['blz']">
 						</div>
 					</div>
 					<div class="row mb-3">
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
index 50694fb76..be4d6c7f5 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
@@ -11,7 +11,7 @@ export default{
 		BsModal
 	},
 	props: {
-		uid: String
+		uid: Number
 	},
 	data() {
 		return{
@@ -223,13 +223,13 @@ export default{
 						<div class="row mb-3">										   
 							<label for="kontakt" class="form-label col-sm-4">{{$p.t('global', 'kontakt')}}</label>
 							<div class="col-sm-6">
-								<input type="text" :readonly="readonly" class="form-control" id="kontakt" v-model="contactData['kontakt']">
+								<input type="text" class="form-control" id="kontakt" v-model="contactData['kontakt']">
 							</div>
 						</div>
 						<div class="row mb-3">									   
 							<label for="anmerkung" class="form-label col-sm-4">{{$p.t('global', 'anmerkung')}}</label>
 							<div class="col-sm-6">
-								<input type="text" :readonly="readonly" class="form-control" id="anmerkung" v-model="contactData['anmerkung']">
+								<input type="text" class="form-control" id="anmerkung" v-model="contactData['anmerkung']">
 							</div>
 						</div>
 						
@@ -245,7 +245,7 @@ export default{
 						<div class="row mb-3">
 							<label for="firma_name" class="form-label col-sm-4">{{$p.t('person', 'firma')}} / {{$p.t('person', 'standort')}}</label>
 								<div class="col-sm-6">
-									<PvAutoComplete v-model="contactData['standort']" optionLabel="kurzbz" :suggestions="filteredStandorte" @complete="search" minLength="3"/>
+									<PvAutoComplete v-model="contactData['standort']" optionLabel="kurzbz" :suggestions="filteredStandorte" @complete="search" :min-length="3"/>
 								</div>
 						</div>
 				</form>
@@ -271,13 +271,13 @@ export default{
 				<div class="row mb-3">									   
 					<label for="kontakt" class="form-label col-sm-4">{{$p.t('global', 'kontakt')}}</label>
 					<div class="col-sm-6">
-						<input type="text" :readonly="readonly" class="form-control" id="kontakt" v-model="contactData['kontakt']">
+						<input type="text" class="form-control" id="kontakt" v-model="contactData['kontakt']">
 					</div>
 				</div>
 				<div class="row mb-3">									   
 					<label for="anmerkung" class="form-label col-sm-4">{{$p.t('global', 'anmerkung')}}</label>
 					<div class="col-sm-6">
-						<input type="text" :readonly="readonly" class="form-control" id="anmerkung" v-model="contactData['anmerkung']">
+						<input type="text" class="form-control" id="anmerkung" v-model="contactData['anmerkung']">
 					</div>
 				</div>
 				<div class="row mb-3">
@@ -289,16 +289,16 @@ export default{
 					</div>
 				</div>
 				<div class="row mb-3">			
-					<input type="hidden" :readonly="readonly" class="form-control" id="standort_id" v-model="contactData.standort_id">
+					<input type="hidden" class="form-control" id="standort_id" v-model="contactData.standort_id">
 				</div>
 				
 				<div class="row mb-3">
 					<label for="standort" class="form-label col-sm-4">{{$p.t('person', 'firma')}} / {{$p.t('person', 'standort')}}</label>
 						<div v-if="contactData.kurzbz" class="col-sm-6">
-							<input type="text" :readonly="readonly" class="form-control" id="name" v-model="contactData.kurzbz">
+							<input type="text" class="form-control" id="name" v-model="contactData.kurzbz">
 						</div>	
 						<div v-else class="col-sm-3">
-							<PvAutoComplete v-model="contactData['standort']" optionLabel="kurzbz" :suggestions="filteredStandorte" @complete="search" minLength="3"/>
+							<PvAutoComplete v-model="contactData['standort']" optionLabel="kurzbz" :suggestions="filteredStandorte" @complete="search" :min-length="3"/>
 						</div>
 				</div>
 			</form>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/MultiStatus.js
index e0bc1cb7e..dfbfa17b3 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/MultiStatus.js
@@ -8,11 +8,10 @@ export default {
 		modelValue: Object,
 	},
 	template: `
-
-		<div class="stv-details-details h-100 pb-3">
-			<div class="col-12 pb-3">
+	<div class="stv-details-multistatus h-100 pb-3">
+		<div class="col-12 pb-3">
 			<legend>Status</legend>
-			<TblMultiStatus :modelValue="modelValue"></TblMultiStatus>		
+			<tbl-multi-status :model-value="modelValue"></tbl-multi-status>		
 		</div>
 	</div>
 	`
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
index 185b8d0d5..78a0940f8 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
@@ -1,29 +1,25 @@
-import NotizComponent from "../../../Notiz/NotizComponent.js";
+import CoreNotiz from "../../../Notiz/Notiz.js";
 
 export default {
 	components: {
-		NotizComponent
+		CoreNotiz
 	},
 	props: {
 		modelValue: Object
 	},
 	template: `
-	<div class="stv-details-details h-100 pb-3">
-		<h3>Notizen</h3>
-		
+	<div class="stv-details-notizen h-100 pb-3">
 <!--	mit factory als endpoint	-->
-		<NotizComponent
+		<core-notiz
 			:endpoint="$fhcApi.factory.notiz.person"
 			ref="formc"
-			typeId="person_id"
+			type-id="person_id"
 			:id="modelValue.person_id"
-			notizLayout="twoColumnsFormLeft"
-			:showErweitert="false"
-			:showDocument="true"
-			:showTinyMCE="false"
-			:visibleColumns="['titel','text','verfasser','bearbeiter','dokumente']"
+			show-document
+			show-tiny-mce
+			:visible-columns="['titel','text','verfasser','bearbeiter','dokumente']"
 			>
-		</NotizComponent>
+		</core-notiz>
 		
 	
 <!--		
@@ -68,44 +64,44 @@ visibleColumns: list, which fields shoult be showed as default in filter compone
 ---------------------------------------------------------------------------------------------
 
 
-		<NotizComponent
+		<core-notiz
 			:endpoint="$fhcApi.factory.notiz.mitarbeiter"
 			ref="formc"
-			typeId="uid"
+			type-id="uid"
 			:id= "'ma0068'"
-			notizLayout="twoColumnsFormLeft"
-			:showErweitert="true"
-			:showDocument="true"
+			notiz-layout="twoColumnsFormLeft"
+			:show-erweitert="true"
+			:show-document="true"
 			:showTinyMCE="false"
-			:visibleColumns="['titel','text','verfasser','bearbeiter','dokumente']"
+			:visible-columns="['titel','text','verfasser','bearbeiter','dokumente']"
 			>
-		</NotizComponent>
+		</core-notiz>
 		
-		<NotizComponent
+		<core-notiz
 			:endpoint="$fhcApi.factory.notiz.prestudent"
 			ref="formc"
-			typeId="prestudent_id"
+			type-id="prestudent_id"
 			:id="modelValue.prestudent_id"
-			notizLayout="twoColumnsFormLeft"
-			:showErweitert="true"
-			:showDocument="true"
+			notiz-layout="twoColumnsFormLeft"
+			:show-erweitert="true"
+			:show-document="true"
 			:showTinyMCE="true"
-			:visibleColumns="['titel','text','verfasser','bearbeiter','dokumente']"
+			:visible-columns="['titel','text','verfasser','bearbeiter','dokumente']"
 			>
-		</NotizComponent>
+		</core-notiz>
 				
-		<NotizComponent
+		<core-notiz
 			:endpoint="$fhcApi.factory.notiz.projekt"
 			ref="formc"
-			typeId="projekt_kurzbz"
+			type-id="projekt_kurzbz"
 			:id="'EA74'" 
-			notizLayout="twoColumnsFormLeft"
-			:showErweitert="true"
-			:showDocument="true"
+			notiz-layout="twoColumnsFormLeft"
+			:show-erweitert="true"
+			:show-document="true"
 			:showTinyMCE="true"
-			:visibleColumns="['titel','text','verfasser','bearbeiter','dokumente']"
+			:visible-columns="['titel','text','verfasser','bearbeiter','dokumente']"
 			>
-		</NotizComponent>-->
+		</core-notiz>-->
 		
 	</div>
 	`
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
index 149556508..8f3773ad7 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
@@ -41,7 +41,7 @@ export default {
 	props: {
 		modelValue: Object,
 	},
-	data(){
+	data() {
 		return {
 			data: [],
 			listZgvs: [],
@@ -174,7 +174,7 @@ export default {
 			.catch(this.$fhcAlert.handleSystemError);
 	},
 	template: `
-	<div class="stv-details-details h-100 pb-3">	
+	<div class="stv-details-prestudent h-100 pb-3">	
 		<form-form ref="form" class="stv-details-prestudent" @submit.prevent="updatePrestudent">
 		<div class="position-sticky top-0 z-1">
 			<button type="submit" class="btn btn-primary position-absolute top-0 end-0" :disabled="!deltaLength">Speichern</button>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
index 41a5241db..ff89c5549 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
@@ -5,7 +5,7 @@ export default{
 		CoreFilterCmpt
 	},
 	props: {
-		person_id: String
+		person_id: Number
 	},
 	data() {
 		return {
@@ -23,29 +23,29 @@ export default{
 					{title:"UID", field:"student_uid"},
 					{title:"Status", field:"status"}
 				],
-				tabulatorEvents: [
-					{
-						event: 'tableBuilt',
-						handler: async () => {
-							await this.$p.loadCategory(['lehre']);
-
-							let cm = this.$refs.table.tabulator.columnManager;
-
-							cm.getColumnByField('orgform_kurzbz').component.updateDefinition({
-								title: this.$p.t('lehre', 'organisationsform')
-							});
-
-							cm.getColumnByField('bezeichnung').component.updateDefinition({
-								title: this.$p.t('lehre', 'studienplan')
-							});
-						}
-					}
-				],
 				layout: 'fitDataFill',
 				layoutColumnsOnNewData:	false,
 				height:	'auto',
 				selectable:	false,
 			},
+			tabulatorEvents: [
+				{
+					event: 'tableBuilt',
+					handler: async () => {
+						await this.$p.loadCategory(['lehre']);
+
+						let cm = this.$refs.table.tabulator.columnManager;
+
+						cm.getColumnByField('orgform_kurzbz').component.updateDefinition({
+							title: this.$p.t('lehre', 'organisationsform')
+						});
+
+						cm.getColumnByField('bezeichnung').component.updateDefinition({
+							title: this.$p.t('lehre', 'studienplan')
+						});
+					}
+				}
+			]
 		}
 	},
 	template: `
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index 590cab3c0..5dbc9ef4a 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -694,7 +694,6 @@ export default{
 							<label for="studiensemester_kurzbz" class="form-label col-sm-4">{{$p.t('lehre', 'studiensemester')}}</label>
 							<div class="col-sm-6">
 								<form-input
-									:readonly="readonly"
 									type="select"
 									name="studiensemester_kurzbz"
 									v-model="statusData['studiensemester_kurzbz']"
@@ -709,7 +708,6 @@ export default{
 							<div class="col-sm-6">
 								<form-input
 									type="select"
-									:readonly="readonly"
 									name="ausbildungssemester"
 									v-model="statusData.ausbildungssemester"
 								>
@@ -723,7 +721,6 @@ export default{
 							<div class="col-sm-6">
 								<form-input
 									type="DatePicker"
-									:readonly="readonly"
 									name="datum"
 									v-model="statusData.datum"
 									auto-apply
@@ -739,7 +736,6 @@ export default{
 							<div class="col-sm-6">
 								<form-input
 									type="DatePicker"
-									:readonly="readonly"
 									name="datum"
 									v-model="statusData.bestaetigtam"
 									auto-apply
@@ -755,7 +751,6 @@ export default{
 							<div class="col-sm-6">
 								<form-input
 									type="DatePicker"
-									:readonly="readonly"
 									name="datum"
 									v-model="statusData['bewerbung_abgeschicktamum']"
 									auto-apply
@@ -770,7 +765,6 @@ export default{
 							<label for="bezeichnung" class="form-label col-sm-4">{{$p.t('lehre', 'studienplan')}}</label>
 							<div class="col-sm-6">
 								<form-input
-									:readonly="readonly"
 									type="select"
 									name="studienplan"
 									v-model="statusData['studienplan_id']"
@@ -796,7 +790,6 @@ export default{
 							<div class="col-sm-6">
 								<form-input
 								type="select"
-								:readonly="readonly"
 								name="aufnahmestufe"
 								v-model="statusData['rt_stufe']"
 								>
@@ -810,11 +803,10 @@ export default{
 							<div class="col-sm-6">
 								<form-input
 									type="select"
-									:readonly="readonly"
 									name="statusgrund"
 									v-model="statusData['statusgrund_id']"
-								>
-								<option v-for="grund in gruende" :key="grund.statusgrund_id" :value="grund.statusgrund_id">{{grund.beschreibung[0]}}</option>
+									>
+									<option v-for="grund in gruende" :key="grund.statusgrund_id" :value="grund.statusgrund_id">{{grund.beschreibung[0]}}</option>
 								</form-input>
 							</div>
 						</div>
@@ -841,7 +833,7 @@ export default{
 						<div class="row mb-3">
 							<label for="status_kurzbz" class="form-label col-sm-4">{{$p.t('lehre', 'status_rolle')}}</label>
 							<div class="col-sm-6">
-<!--								<form-input type="text" :readonly="readonly" class="form-control" id="status_kurzbz" v-model="statusData['status_kurzbz']">-->
+<!--								<form-input type="text" class="form-control" id="status_kurzbz" v-model="statusData['status_kurzbz']">-->
 								<form-input
 									required
 									v-model="statusData['status_kurzbz']"
@@ -864,7 +856,6 @@ export default{
 							<label for="studiensemester_kurzbz" class="form-label col-sm-4">{{$p.t('lehre', 'studiensemester')}}</label>
 							<div class="col-sm-6">
 								<form-input
-									:readonly="readonly"
 									type="select"
 									name="studiensemester_kurzbz"
 									v-model="statusData['studiensemester_kurzbz']"
@@ -879,7 +870,6 @@ export default{
 							<div class="col-sm-6">
 								<form-input
 									type="select"
-									:readonly="readonly"
 									name="ausbildungssemester"
 									v-model="statusData['ausbildungssemester']"
 								>
@@ -893,7 +883,6 @@ export default{
 							<div class="col-sm-6">
 								<form-input
 									type="DatePicker"
-									:readonly="readonly"
 									name="datum"
 									v-model="statusData['datum']"
 									auto-apply
@@ -909,7 +898,6 @@ export default{
 							<div class="col-sm-6">
 								<form-input
 									type="DatePicker"
-									:readonly="readonly"
 									name="datum"
 									v-model="statusData['bestaetigtam']"
 									auto-apply
@@ -925,7 +913,6 @@ export default{
 							<div class="col-sm-6">
 								<form-input
 									type="DatePicker"
-									:readonly="readonly"
 									name="datum"
 									v-model="statusData['bewerbung_abgeschicktamum']"
 									auto-apply
@@ -940,7 +927,6 @@ export default{
 							<label for="bezeichnung" class="form-label col-sm-4">{{$p.t('lehre', 'studienplan')}}</label>
 							<div class="col-sm-6">
 								<form-input
-									:readonly="readonly"
 									type="select"
 									name="studienplan"
 									v-model="statusData['studienplan_id']"
@@ -966,7 +952,6 @@ export default{
 							<div class="col-sm-6">
 								<form-input
 								type="select"
-								:readonly="readonly"
 								name="aufnahmestufe"
 								v-model="statusData['rt_stufe']"
 								>
@@ -980,7 +965,6 @@ export default{
 							<div class="col-sm-6">
 								<form-input
 									type="select"
-									:readonly="readonly"
 									name="statusgrund"
 									v-model="statusData['statusgrund_id']"
 								>

From 7530a74ff3e5df7083bc645360a770ed76e58ec2 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 16 May 2024 16:39:54 +0200
Subject: [PATCH 0708/1461] demo stand gf;

---
 system/phrasesupdate.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 91e682605..ad73a9b47 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -26200,7 +26200,7 @@ array(
 				'insertvon' => 'system'
 			)
 		)
-	),
+
 
 
 	// FHC-CORE-ANWESENHEITEN END

From 1f45ddc17dee76de0dd420741c7d4b846d9622d7 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 16 May 2024 16:40:08 +0200
Subject: [PATCH 0709/1461] minor improvements

---
 .../js/components/Betriebsmittel/Betriebsmittel.js  |  2 +-
 public/js/components/Notiz/Notiz.js                 | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/public/js/components/Betriebsmittel/Betriebsmittel.js b/public/js/components/Betriebsmittel/Betriebsmittel.js
index b34e3b8ec..ba2b4275c 100644
--- a/public/js/components/Betriebsmittel/Betriebsmittel.js
+++ b/public/js/components/Betriebsmittel/Betriebsmittel.js
@@ -265,7 +265,7 @@ export default {
 			.catch(this.$fhcAlert.handleSystemError);
 	},
 	template: `
-	<div class="betriebsmittel-betriebsmittel">
+	<div class="core-betriebsmittel">
 	
 	
 		<!--Modal: deleteBetriebsmittelModal-->
diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index 12cd27ddb..bff0ad6c7 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -30,9 +30,13 @@ export default {
 		notizLayout: {
 			type: String,
 			default: 'twoColumnsFormLeft',
-			validator(value, props) {
+			validator(value) {
 				// TODO(chris): modal version
-        		return ['classicFas', 'twoColumnsFormRight', 'twoColumnsFormLeft'].includes(value)
+				return [
+					'classicFas',
+					'twoColumnsFormRight',
+					'twoColumnsFormLeft'
+					].includes(value)
 			}
 		},
 		showErweitert: Boolean,
@@ -470,7 +474,7 @@ export default {
 		}
 	},
 	template: `
-	<div class="notiz-notizcomponent">
+	<div class="core-notiz">
 		<div v-if="notizLayout=='classicFas'">
 			<!--Modal: deleteNotizModal-->
 			<BsModal ref="deleteNotizModal">
@@ -1021,7 +1025,8 @@ export default {
 		</div>
 		
 		<div v-else>
-			<p>Kein Layout übergeben</p>
+			<p v-if="notizLayout">Falsches Layout übergeben: {{notizLayout}}</p>
+			<p v-else>Kein Layout übergeben</p>
 		</div>
 	</div>`,
 }
\ No newline at end of file

From 706dad6df6878c1b3b3dcdb2345b76124bd632a1 Mon Sep 17 00:00:00 2001
From: Werner Masik <werner@gefi.at>
Date: Thu, 16 May 2024 21:58:34 +0200
Subject: [PATCH 0710/1461] added DV Ende

---
 .../models/vertragsbestandteil/Dienstverhaeltnis_model.php    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/application/models/vertragsbestandteil/Dienstverhaeltnis_model.php b/application/models/vertragsbestandteil/Dienstverhaeltnis_model.php
index 2fdfcffe2..d9fa4a6cd 100644
--- a/application/models/vertragsbestandteil/Dienstverhaeltnis_model.php
+++ b/application/models/vertragsbestandteil/Dienstverhaeltnis_model.php
@@ -33,7 +33,9 @@ class Dienstverhaeltnis_model extends DB_Model
             dv.bis,
             dv.vertragsart_kurzbz,
             dv.updateamum,
-            dv.updatevon
+            dv.updatevon,
+			dv.dvendegrund_kurzbz,
+			dv.dvendegrund_anmerkung
         FROM tbl_mitarbeiter
             JOIN tbl_benutzer ON tbl_mitarbeiter.mitarbeiter_uid::text = tbl_benutzer.uid::text
             JOIN tbl_person USING (person_id)

From d07c568d5e9e2e39fb4f07784446d47fb14c2857 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 21 May 2024 10:37:53 +0200
Subject: [PATCH 0711/1461] adds dbupdate queryies for the new raum template

---
 .../39911_tabulator_in_contentmittitel.php    | 123 ++++++++++++++++++
 1 file changed, 123 insertions(+)
 create mode 100644 system/dbupdate_3.4/39911_tabulator_in_contentmittitel.php

diff --git a/system/dbupdate_3.4/39911_tabulator_in_contentmittitel.php b/system/dbupdate_3.4/39911_tabulator_in_contentmittitel.php
new file mode 100644
index 000000000..466c525d3
--- /dev/null
+++ b/system/dbupdate_3.4/39911_tabulator_in_contentmittitel.php
@@ -0,0 +1,123 @@
+<?php
+
+
+$new_xslt_xhtml_version2=  <<<END
+<xsl:stylesheet version="1.0" xmlns:fo="http://www.w3.org/1999/XSL/Format"
+xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+	<xsl:template match="content">
+		<html>
+		<head>
+			<title><xsl:value-of select="titel" /></title>
+			<link rel="stylesheet" href="../skin/style.css.php" type="text/css"  />
+			<link rel="stylesheet" href="../skin/jquery.css" type="text/css" />
+			<link rel="stylesheet" type="text/css" href="../skin/jquery-ui-1.9.2.custom.min.css" />
+            <script type="text/javascript" src="../vendor/jquery/jquery1/jquery-1.12.4.min.js"></script>
+            <script type="text/javascript" src="../vendor/christianbach/tablesorter/jquery.tablesorter.min.js"></script>
+            <script type="text/javascript" src="../vendor/components/jqueryui/jquery-ui.min.js"></script>
+            <script type="text/javascript" src="../include/js/jquery.ui.datepicker.translation.js"></script>
+            <script type="text/javascript" src="../vendor/jquery/sizzle/sizzle.js"></script>
+
+            <link href="https://cdnjs.cloudflare.com/ajax/libs/tabulator/5.0.7/css/tabulator.min.css" rel="stylesheet" />
+            <script type="text/javascript" src="https://c3p0.ma0594.technikum-wien.at/fh-core/vendor/olifolkerd/tabulator5/dist/js/tabulator.min.js?2019102903"></script>
+			<link rel="stylesheet" href="../skin/tablesort.css" type="text/css"/>
+			<script type="text/javascript">
+
+			$(document).ready(function()
+			{
+                let tables = document.getElementsByClassName("tablesorter");
+				for(table of tables){
+					new Tabulator(table, {
+						layout:"fitDataFill",
+						autoResize:true,
+						resizableRows:true,
+						columnDefaults:{
+							formatter:"html",
+							resizable:true,
+						}
+					})
+				}
+            });
+
+			</script>
+		</head>
+		<body>
+	    <h1><xsl:value-of select="titel" /></h1>
+		<xsl:value-of select="inhalt" disable-output-escaping="yes" />
+		</body>
+		</html>
+	</xsl:template>
+</xsl:stylesheet >
+END;
+
+
+
+$new_xslt_xhtml=  <<<END
+<xsl:stylesheet version="1.0" xmlns:fo="http://www.w3.org/1999/XSL/Format"
+xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+	<xsl:template match="content">
+		<html>
+		<head>
+			<title><xsl:value-of select="titel" /></title>
+			<link rel="stylesheet" href="../skin/style.css.php" type="text/css"  />
+			<link rel="stylesheet" href="../skin/jquery.css" type="text/css" />
+			<link rel="stylesheet" type="text/css" href="../skin/jquery-ui-1.9.2.custom.min.css" />
+
+            <link href="https://cdnjs.cloudflare.com/ajax/libs/tabulator/5.0.7/css/tabulator.min.css" rel="stylesheet" />
+            <script type="text/javascript" src="https://c3p0.ma0594.technikum-wien.at/fh-core/vendor/olifolkerd/tabulator5/dist/js/tabulator.min.js?2019102903"></script>
+
+
+			<link rel="stylesheet" href="../skin/tablesort.css" type="text/css"/>
+			<script type="text/javascript">
+
+            document.addEventListener("DOMContentLoaded", function() 
+			{
+				let tables = document.getElementsByClassName("tablesorter");
+				for(table of tables){
+					new Tabulator(table, {
+						layout:"fitDataFill",
+						autoResize:true,
+						resizableRows:true,
+						columnDefaults:{
+							formatter:"html",
+							resizable:true,
+						}
+					})
+				}
+			});
+
+			</script>
+		</head>
+		<body>
+	    <h1><xsl:value-of select="titel" /></h1>
+		<xsl:value-of select="inhalt" disable-output-escaping="yes" />
+		</body>
+		</html>
+	</xsl:template>
+</xsl:stylesheet >
+END;
+        $qry = "UPDATE campus.tbl_template SET xslt_xhtml='".$new_xslt_xhtml."' WHERE template_kurzbz='contentmittitel';";
+
+        if (!$db->db_query($qry))
+            echo '<strong>UPDATE OF TEMPLATE CONTENTMITTITEL FAILED : ' . $db->db_last_error() . '</strong><br>';
+        else
+            echo '<br>UPDATE OF TEMPLATE CONTENTMITTITEL WAS SUCCESSFUL';
+
+
+$raum_content_update_query=  <<<END
+UPDATE "campus"."tbl_content" 
+	SET template_kurzbz = 'raum_contentmittitel' 
+	where content_id IN 
+	(SELECT content_id 
+	FROM "public"."tbl_ort" 
+	JOIN campus.tbl_content USING(content_id));
+END;
+
+
+if (!$db->db_query($raum_content_update_query))
+            echo '<strong>FAILED TO UPDATE ALL TEMPLATES FOR THE ROOMS : ' . $db->db_last_error() . '</strong><br>';
+        else
+            echo '<br>SUCCESSFUL UPDATE ALL TEMPLATES FOR THE ROOMS TO raum_contentmittitel';
+
+
+
+

From 393475e62cfc4dd375332a48654e140dc56c3b57 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 21 May 2024 10:49:27 +0200
Subject: [PATCH 0712/1461] adds the content update script for the room content
 to the checksystem

---
 system/dbupdate_3.4.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index 3a3f0be78..8974e7c15 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -54,6 +54,7 @@ require_once('dbupdate_3.4/21620_neues_feld_zum_erfassen_des_ESI.php');
 require_once('dbupdate_3.4/36530_bis_internationsalisierung_codextabelle_neuerungen.php');
 require_once('dbupdate_3.4/34543_ux_template.php');
 require_once('dbupdate_3.4/17513_Entwicklungsteam.php');
+require_once('dbupdate_3.4/39911_tabulator_in_contentmittitel.php');
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';

From 17512e60b2c083b382429741e6b11ca69d47c49c Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 21 May 2024 10:53:23 +0200
Subject: [PATCH 0713/1461] Favorites => fhcApi

---
 .../api/frontend/v1/stv/Favorites.php         | 74 +++++++++++++++++++
 public/js/api/stv.js                          |  2 +
 public/js/api/stv/verband.js                  | 15 ++++
 .../Stv/Studentenverwaltung/Verband.js        | 21 +++---
 4 files changed, 102 insertions(+), 10 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/stv/Favorites.php
 create mode 100644 public/js/api/stv/verband.js

diff --git a/application/controllers/api/frontend/v1/stv/Favorites.php b/application/controllers/api/frontend/v1/stv/Favorites.php
new file mode 100644
index 000000000..5b4b4fa73
--- /dev/null
+++ b/application/controllers/api/frontend/v1/stv/Favorites.php
@@ -0,0 +1,74 @@
+<?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');
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the back-end
+ * Provides data to the ajax get calls about favorite verbände
+ * Listens to ajax post calls to change the favorite verbände data
+ * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
+ */
+class Favorites extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		// TODO(chris): access!
+		parent::__construct([
+			'index' => self::PERM_LOGGED,
+			'set' => self::PERM_LOGGED
+		]);
+
+		// Load models
+		$this->load->model('system/Variable_model', 'VariableModel');
+
+		// TODO(chris): variable table might be to small to store favorites!
+	}
+
+	public function index()
+	{
+		$result = $this->VariableModel->getVariables(getAuthUID(), ['stv_favorites']);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		if (!$data)
+			$this->outputJson(null);
+		else
+			$this->outputJson($data['stv_favorites']);
+	}
+
+	public function set()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('favorites', 'Favorites', 'required');
+
+		if ($this->form_validation->run() == false) {
+			$this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST);
+			return $this->outputJson($this->form_validation->error_array());
+		}
+
+		$favorites = $this->input->post('favorites');
+
+		$result = $this->VariableModel->setVariable(getAuthUID(), 'stv_favorites', $favorites);
+
+		$this->getDataOrTerminateWithError($result);
+		
+		$this->outputJsonSuccess(true);
+	}
+}
diff --git a/public/js/api/stv.js b/public/js/api/stv.js
index 3f16b0847..734a22649 100644
--- a/public/js/api/stv.js
+++ b/public/js/api/stv.js
@@ -1,7 +1,9 @@
+import verband from './stv/verband.js';
 import filter from './stv/filter.js';
 import konto from './stv/konto.js';
 
 export default {
+	verband,
 	filter,
 	konto,
 	configStudent() {
diff --git a/public/js/api/stv/verband.js b/public/js/api/stv/verband.js
new file mode 100644
index 000000000..f3479c81b
--- /dev/null
+++ b/public/js/api/stv/verband.js
@@ -0,0 +1,15 @@
+export default {
+	get() {
+		return this.$fhcApi.get('api/frontend/v1/stv/verband');
+	},
+	favorites: {
+		get() {
+			return this.$fhcApi.get('api/frontend/v1/stv/favorites');
+		},
+		set(favorites) {
+			return this.$fhcApi.post('api/frontend/v1/stv/favorites/set', {
+				favorites
+			});
+		}
+	}
+}
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Verband.js b/public/js/components/Stv/Studentenverwaltung/Verband.js
index bdc5500a6..4ea1184ad 100644
--- a/public/js/components/Stv/Studentenverwaltung/Verband.js
+++ b/public/js/components/Stv/Studentenverwaltung/Verband.js
@@ -105,7 +105,8 @@ export default {
 				this.favnodes = await this.loadNodes(this.favorites.list);
 			}
 			this.favorites.on = !this.favorites.on;
-			CoreRESTClient.post("components/stv/favorites/set", {favorites: JSON.stringify(this.favorites)});
+			this.$fhcApi
+				.factory.stv.verband.favorites.set(JSON.stringify(this.favorites));
 			this.loading = false;
 		},
 		async loadNodes(links) {
@@ -156,7 +157,8 @@ export default {
 				this.favorites.list.push(key.data.link + '');
 			}
 			
-			CoreRESTClient.post("components/stv/favorites/set", {favorites: JSON.stringify(this.favorites)});
+			this.$fhcApi
+				.factory.stv.verband.favorites.set(JSON.stringify(this.favorites));
 		},
 		unsetFavFocus(e) {
 			if (e.target.dataset?.linkFavAdd !== undefined) {
@@ -177,19 +179,18 @@ export default {
 	},
 	mounted() {
 		this.$fhcApi
-			.get('api/frontend/v1/stv/verband')
-			.then(result => result.data)
+			.factory.stv.verband.get()
 			.then(result => {
-				this.nodes = result.map(this.mapResultToTreeData);
+				this.nodes = result.data.map(this.mapResultToTreeData);
 				this.loading = false;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
-		CoreRESTClient
-			.get("components/stv/favorites")
-			.then(result => result.data)
+
+		this.$fhcApi
+			.factory.stv.verband.favorites.get()
 			.then(result => {
-				if (result) {
-					let f = JSON.parse(result);
+				if (result.data) {
+					let f = JSON.parse(result.data);
 					if (f.on) {
 						this.loading = true;
 						this.favorites = f;

From 48bb2ef7e14baa8ead75a596f1db8ab9dcc26c0a Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 21 May 2024 11:05:22 +0200
Subject: [PATCH 0714/1461] adds the insert query for the new raum template and
 the update statement to update the template for every room content

---
 .../39911_tabulator_in_contentmittitel.php    | 107 +++++++-----------
 1 file changed, 40 insertions(+), 67 deletions(-)

diff --git a/system/dbupdate_3.4/39911_tabulator_in_contentmittitel.php b/system/dbupdate_3.4/39911_tabulator_in_contentmittitel.php
index 466c525d3..1e86da19e 100644
--- a/system/dbupdate_3.4/39911_tabulator_in_contentmittitel.php
+++ b/system/dbupdate_3.4/39911_tabulator_in_contentmittitel.php
@@ -1,7 +1,6 @@
 <?php
 
-
-$new_xslt_xhtml_version2=  <<<END
+$raum_contentmittitel_xslt_xhtml=  <<<END
 <xsl:stylesheet version="1.0" xmlns:fo="http://www.w3.org/1999/XSL/Format"
 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 	<xsl:template match="content">
@@ -9,64 +8,8 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 		<head>
 			<title><xsl:value-of select="titel" /></title>
 			<link rel="stylesheet" href="../skin/style.css.php" type="text/css"  />
-			<link rel="stylesheet" href="../skin/jquery.css" type="text/css" />
-			<link rel="stylesheet" type="text/css" href="../skin/jquery-ui-1.9.2.custom.min.css" />
-            <script type="text/javascript" src="../vendor/jquery/jquery1/jquery-1.12.4.min.js"></script>
-            <script type="text/javascript" src="../vendor/christianbach/tablesorter/jquery.tablesorter.min.js"></script>
-            <script type="text/javascript" src="../vendor/components/jqueryui/jquery-ui.min.js"></script>
-            <script type="text/javascript" src="../include/js/jquery.ui.datepicker.translation.js"></script>
-            <script type="text/javascript" src="../vendor/jquery/sizzle/sizzle.js"></script>
-
             <link href="https://cdnjs.cloudflare.com/ajax/libs/tabulator/5.0.7/css/tabulator.min.css" rel="stylesheet" />
             <script type="text/javascript" src="https://c3p0.ma0594.technikum-wien.at/fh-core/vendor/olifolkerd/tabulator5/dist/js/tabulator.min.js?2019102903"></script>
-			<link rel="stylesheet" href="../skin/tablesort.css" type="text/css"/>
-			<script type="text/javascript">
-
-			$(document).ready(function()
-			{
-                let tables = document.getElementsByClassName("tablesorter");
-				for(table of tables){
-					new Tabulator(table, {
-						layout:"fitDataFill",
-						autoResize:true,
-						resizableRows:true,
-						columnDefaults:{
-							formatter:"html",
-							resizable:true,
-						}
-					})
-				}
-            });
-
-			</script>
-		</head>
-		<body>
-	    <h1><xsl:value-of select="titel" /></h1>
-		<xsl:value-of select="inhalt" disable-output-escaping="yes" />
-		</body>
-		</html>
-	</xsl:template>
-</xsl:stylesheet >
-END;
-
-
-
-$new_xslt_xhtml=  <<<END
-<xsl:stylesheet version="1.0" xmlns:fo="http://www.w3.org/1999/XSL/Format"
-xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-	<xsl:template match="content">
-		<html>
-		<head>
-			<title><xsl:value-of select="titel" /></title>
-			<link rel="stylesheet" href="../skin/style.css.php" type="text/css"  />
-			<link rel="stylesheet" href="../skin/jquery.css" type="text/css" />
-			<link rel="stylesheet" type="text/css" href="../skin/jquery-ui-1.9.2.custom.min.css" />
-
-            <link href="https://cdnjs.cloudflare.com/ajax/libs/tabulator/5.0.7/css/tabulator.min.css" rel="stylesheet" />
-            <script type="text/javascript" src="https://c3p0.ma0594.technikum-wien.at/fh-core/vendor/olifolkerd/tabulator5/dist/js/tabulator.min.js?2019102903"></script>
-
-
-			<link rel="stylesheet" href="../skin/tablesort.css" type="text/css"/>
 			<script type="text/javascript">
 
             document.addEventListener("DOMContentLoaded", function() 
@@ -95,16 +38,45 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 	</xsl:template>
 </xsl:stylesheet >
 END;
-        $qry = "UPDATE campus.tbl_template SET xslt_xhtml='".$new_xslt_xhtml."' WHERE template_kurzbz='contentmittitel';";
 
-        if (!$db->db_query($qry))
-            echo '<strong>UPDATE OF TEMPLATE CONTENTMITTITEL FAILED : ' . $db->db_last_error() . '</strong><br>';
-        else
-            echo '<br>UPDATE OF TEMPLATE CONTENTMITTITEL WAS SUCCESSFUL';
+$raum_contentmittitel_xsd=   <<<END
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:element name="content">
+	<xs:element name="titel" type="xs:string"/>
+	<xs:element name="inhalt" type="wysiwyg"/>
+</xs:element>
+END;
+
+$raum_contentmittitel_xslt_xhtml_c4=   <<<END
+<xsl:stylesheet version="1.0"
+    xmlns:fo="http://www.w3.org/1999/XSL/Format"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+    <xsl:template match="content">
+	<h1>
+	    <xsl:value-of select="titel" />
+	</h1>
+	<xsl:value-of select="inhalt" disable-output-escaping="yes" />
+</xsl:template>
+END;
+
+$raum_contentmittitel_insert_query=  <<<END
+	INSERT INTO campus.tbl_template 
+	(template_kurzbz, bezeichnung, xsd, xslt_xhtml, xslfo_pdf, xslt_xhtml_c4) 
+	VALUES 
+	('raum_contentmittitel','template for the raum view that uses the tabulator javascript instead of the jquery scripts and the table sorter ', '$raum_contentmittitel_xsd','$raum_contentmittitel_xslt_xhtml', NULL, '$raum_contentmittitel_xslt_xhtml_c4');
+END;
+
+
+// executing the insert statement for the new template
+
+if (!$db->db_query($raum_contentmittitel_insert_query))
+	echo '<strong>FAILED INSERTING NEW TEMPLATE RAUM_CONTENTMITTITEL : ' . $db->db_last_error() . '</strong><br>';
+else
+	echo '<br>SUCCESSFULLY INSERTING NEW TEMPLATE RAUM_CONTENTMITTITEL ';
 
 
 $raum_content_update_query=  <<<END
-UPDATE "campus"."tbl_content" 
+	UPDATE "campus"."tbl_content" 
 	SET template_kurzbz = 'raum_contentmittitel' 
 	where content_id IN 
 	(SELECT content_id 
@@ -112,11 +84,12 @@ UPDATE "campus"."tbl_content"
 	JOIN campus.tbl_content USING(content_id));
 END;
 
+// executing the update statement to update the template for all room content
 
 if (!$db->db_query($raum_content_update_query))
-            echo '<strong>FAILED TO UPDATE ALL TEMPLATES FOR THE ROOMS : ' . $db->db_last_error() . '</strong><br>';
-        else
-            echo '<br>SUCCESSFUL UPDATE ALL TEMPLATES FOR THE ROOMS TO raum_contentmittitel';
+	echo '<strong>FAILED TO UPDATE ROOMS WITH NEW TEMPLATE raum_contentmittitel : ' . $db->db_last_error() . '</strong><br>';
+else
+	echo '<br>SUCCESSFULLY UPDATED ROOMS WITH NEW TEMPLATE raum_contentmittitel';
 
 
 

From 9cade51ff4e028d48dd9cdc6337a95f4494b3e2b Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 21 May 2024 11:47:24 +0200
Subject: [PATCH 0715/1461] Dropdown Status Aendern, Phrases

---
 .../api/frontend/v1/stv/Status.php            |  33 ++--
 .../models/crm/Prestudentstatus_model.php     |  63 +++---
 .../Details/Prestudent/MultiStatus.js         |  95 ++++++++-
 system/phrasesupdate.php                      | 180 ++++++++++++++++++
 4 files changed, 317 insertions(+), 54 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 540d776dd..768e8e196 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -98,7 +98,7 @@ class Status extends FHCAPI_Controller
 		//Variablen für Statuscheck
 		$stg = $result->studiengang_kz;
 		$reihungstest_angetreten = $result->reihungstestangetreten;
-		//$name = trim($result->vorname . " ". $result->nachname);
+		$name = trim($result->vorname . " ". $result->nachname);
 		$zgv_code = $result->zgv_code;
 
 		$isStudent = false;
@@ -141,11 +141,15 @@ class Status extends FHCAPI_Controller
 			$lastStatusData = current(getData($result));
 
 		//Different handling depending on newStatus
-		/*		if($status_kurzbz == 'Absolvent' || $status_kurzbz == 'Diplomand')
-				{
-					//$studiensemester = $semester_aktuell;
-					$ausbildungssemester = $lastStatusData->ausbildungssemester;
-				}*/
+		if($status_kurzbz == 'Abbrecher' || $status_kurzbz == 'Unterbrecher')
+		{
+			$ausbildungssemester = $lastStatusData->ausbildungssemester;
+			$studiensemester_kurzbz = $lastStatusData->studiensemester_kurzbz;
+		}
+		if($status_kurzbz == 'Absolvent' || $status_kurzbz == 'Diplomand')
+		{
+			$ausbildungssemester = $lastStatusData->ausbildungssemester;
+		}
 
 		/*		if($status_kurzbz != 'Student')
 				{
@@ -176,7 +180,7 @@ class Status extends FHCAPI_Controller
 		{
 			if($status_kurzbz=='Bewerber' && !$reihungstest_angetreten)
 			{
-				return $this->terminateWithError($this->p->t('lehre','error_keinReihungstestverfahren', $name), self::ERROR_TYPE_GENERAL);
+				return $this->terminateWithError($this->p->t('lehre','error_keinReihungstestverfahren', ['name' => $name]), self::ERROR_TYPE_GENERAL);
 			}
 		}
 
@@ -186,7 +190,7 @@ class Status extends FHCAPI_Controller
 		{
 			if($status_kurzbz=='Bewerber' && $zgv_code=='')
 			{
-				return $this->terminateWithError($this->p->t('lehre','error_ZGVNichtEingetragen', $name), self::ERROR_TYPE_GENERAL);
+				return $this->terminateWithError($this->p->t('lehre','error_ZGVNichtEingetragen', ['name' => $name]), self::ERROR_TYPE_GENERAL);
 
 			}
 		}
@@ -209,7 +213,7 @@ class Status extends FHCAPI_Controller
 		{
 			if($status_kurzbz=='Bewerber' && $zgv_code=='' && $typ=='m')
 			{
-				return $this->terminateWithError($this->p->t('lehre','error_ZGVMasterNichtEingetragen', $name), self::ERROR_TYPE_GENERAL);
+				return $this->terminateWithError($this->p->t('lehre','error_ZGVMasterNichtEingetragen', ['name' => $name]), self::ERROR_TYPE_GENERAL);
 			}
 		}
 
@@ -224,7 +228,7 @@ class Status extends FHCAPI_Controller
 			}
 			if($result->retval == "0")
 			{
-				return $this->terminateWithError($this->p->t('lehre','error_keinBewerber', $name), self::ERROR_TYPE_GENERAL);
+				return $this->terminateWithError($this->p->t('lehre','error_keinBewerber', ['name' => $name]), self::ERROR_TYPE_GENERAL);
 			}
 		}
 
@@ -274,6 +278,7 @@ class Status extends FHCAPI_Controller
 			}
 
 			//check if Bismeldestichtag erreicht
+			//TODO(manu) Test...
 			$this->load->model('codex/Bismeldestichtag_model', 'BismeldestichtagModel');
 			$result = $this->BismeldestichtagModel->checkIfMeldestichtagErreicht($new_status_datum);
 			if (isError($result))
@@ -660,6 +665,7 @@ class Status extends FHCAPI_Controller
 					'studiensemester_kurzbz' => $studiensemester_kurzbz
 				)
 			);
+
 			if ($this->db->trans_status() === false || isError($result) || !hasData($result))
 			{
 				$this->db->trans_rollback();
@@ -667,11 +673,8 @@ class Status extends FHCAPI_Controller
 				return $this->terminateWithError($this->p->t('lehre','error_duringDeleteLehrverband'), self::ERROR_TYPE_GENERAL);
 			}
 
-			$this->terminateWithSuccess(true);
-
 		}
 		//Delete Prestudent if no data is left
-
 		if($deletePrestudent && $isBerechtigtAdmin)
 		{
 			//TODO(manu) check all connected tables, Handling of Deletion
@@ -726,7 +729,7 @@ class Status extends FHCAPI_Controller
 			);
 			if (isError($result) || !hasData($result))
 			{
-				//TODO(Manu) in these case: löschen stautus erlauben aber rückmeldung, dass Prestudent nicht gelöscht wurde
+				//TODO(Manu) in this case: löschen stautus erlauben aber rückmeldung, dass Prestudent nicht gelöscht wurde
 				return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 			}
 
@@ -940,9 +943,7 @@ class Status extends FHCAPI_Controller
 		//check if Bismeldestichtag erreicht
 		if(!$isBerechtigtNoStudstatusCheck)
 		{
-			// only check datum (without semester)
 			$this->load->model('codex/Bismeldestichtag_model', 'BismeldestichtagModel');
-			/*			$result = $this->BismeldestichtagModel->checkIfMeldestichtagErreicht($datum, $studiensemester_kurzbz);*/
 			$result = $this->BismeldestichtagModel->checkIfMeldestichtagErreicht($datum);
 			if (isError($result))
 			{
diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php
index 6e9a1de5d..a2e793624 100644
--- a/application/models/crm/Prestudentstatus_model.php
+++ b/application/models/crm/Prestudentstatus_model.php
@@ -414,7 +414,7 @@ class Prestudentstatus_model extends DB_Model
 		elseif (!hasData($result))
 		{
 			$person = $name ? $name : "Person";
-			return success("0",  $person . " muss zuerst zum Bewerber gemacht werden!");
+			return success("0", $this->p->t('lehre','error_keinBewerber', ['name' => $person]));
 		}
 		else
 		{
@@ -448,25 +448,23 @@ class Prestudentstatus_model extends DB_Model
 		{
 			return error($result);
 		}
-		else
+
+		$resultObject = current(getData($result));
+
+		if (property_exists($resultObject, 'anzahl'))
 		{
-			$resultObject = current(getData($result));
-
-			if (property_exists($resultObject, 'anzahl'))
+			$anzahl = (int) $resultObject->anzahl;
+			if ($anzahl <= 1 )
 			{
-				$anzahl = (int) $resultObject->anzahl;
-				if ($anzahl <= 1 )
-				{
-					return success ("1", "Die letzte Rolle kann nur durch den Administrator geloescht werden");
-				}
-				else
-					return success("0", $anzahl . " Rollen vorhanden");
-
+				return success("1", $this->p->t('lehre','error_lastRole'));
 			}
 			else
-			{
-				return error("PrestudentstatusModel: Error During Check if Last Status Entry.");
-			}
+				return success("0",  $this->p->t('lehre','anzahl_existingRoles', ['anzahl' => $anzahl]));
+
+		}
+		else
+		{
+			return error($result);
 		}
 	}
 
@@ -482,7 +480,7 @@ class Prestudentstatus_model extends DB_Model
 
 		if($new_status_datum < $today)
 		{
-			return error("Datum eines neuen Statuseintrags darf nicht in der Vergangenheit liegen ");
+			return error($this->p->t('lehre','error_entryInPast'));
 		}
 		else
 		{
@@ -511,14 +509,14 @@ class Prestudentstatus_model extends DB_Model
 			return $this->outputJson(getError($result));
 		}
 		elseif(!hasData($result)) {
-			return error("Kein Eintrag für Studiensemester vorhanden! :-/" . $new_status_studiensemester_kurzbz);
+			return error($this->p->t('lehre','error_noStudiensemester') . $new_status_studiensemester_kurzbz);
 		}
 
 		$studiensemester = current($result->retval);
 		$new_status_semesterstart = $studiensemester->start;
 
 		//get all prestudentstati
-		//TODO(manu) errorlogic
+		//TODO(manu) check errorlogic
 		$resultPs = $this->getAllPrestudentstatiWithStudiensemester($prestudent_id);
 		if (isError($resultPs))
 		{
@@ -537,14 +535,15 @@ class Prestudentstatus_model extends DB_Model
 		$new_status_datum_form = new DateTime($new_status_datum);
 		$new_status_semesterstart_form = new DateTime($new_status_semesterstart);
 
+
 		foreach ($resultArr as $row)
 		{
 			$studiensemester_start = new DateTime($row->studiensemester_start);
 			$status_datum = new DateTime ($row->datum);
 
 
-			if ($new_status_datum_form >= $status_datum && $new_status_semesterstart_form >= $studiensemester_start) {
-
+			if ($new_status_datum_form >= $status_datum && $new_status_semesterstart_form >= $studiensemester_start)
+			{
 				if (!$newStatusInserted)
 				{
 					// neuer Status erstmals größer als Datum eines bestehenden Status -> neuen Status EINMALIG einfügen für spätere Statusprüfung
@@ -558,13 +557,14 @@ class Prestudentstatus_model extends DB_Model
 				}
 				$statusArr[] = $row;
 			}
-			elseif($new_status_datum_form <= $status_datum && $new_status_semesterstart_form <= $studiensemester_start){
+			elseif($new_status_datum_form <= $status_datum && $new_status_semesterstart_form <= $studiensemester_start)
+			{
 				$statusArr[] = $row;
 
 			}
 			else
 			{
-				return error("Datum des Statuseintrags muss nach dem Statusdatum, das Semesterstartdatum nach Semesterstartdatum des vorherigen Statuseintrags sein");
+				return error($this->p->t('lehre','error_statuseintrag'));
 			}
 
 		}
@@ -579,9 +579,9 @@ class Prestudentstatus_model extends DB_Model
 			$next_status = isset($statusArr[$next_idx]) ? $statusArr[$next_idx] : null;
 
 			// Abbrecher- oder Absolventenstatus muss Endstatus sein
-			if (isset($next_status) && in_array($curr_status_kurzbz, $endstatusArr)) {
-
-				return error($name . "Nach Abbrecher- und Absolventenstatus darf kein anderer Status mehr eingetragen werden");
+			if (isset($next_status) && in_array($curr_status_kurzbz, $endstatusArr))
+			{
+				return error($name . $this->p->t('lehre','error_endstatus'));
 			}
 
 			// wenn Unterbrecher auf Unterbrecher folgt, muss Ausbildungssemester gleich sein
@@ -590,7 +590,7 @@ class Prestudentstatus_model extends DB_Model
 				&& $curr_status_ausbildungssemester != $next_status->ausbildungssemester
 			)
 			{
-				return error($name . "Aufeinanderfolgende Unterbrecher müssen gleiches Ausbildungssemester haben");
+				return error($name . $this->p->t('lehre','error_consecutiveUnterbrecher'));
 			}
 
 			// wenn Abbrecher auf Unterbrecher folgt, muss Ausbildungssemester gleich sein
@@ -599,7 +599,7 @@ class Prestudentstatus_model extends DB_Model
 				&& $next_status->status_kurzbz == 'Abbrecher' && $curr_status_ausbildungssemester != $next_status->ausbildungssemester
 			)
 			{
-				return error($name ."Unterbrecher und folgender Abbrecher müssen gleiches Ausbildungssemester haben");
+				return error($name . $this->p->t('lehre','error_consecutiveUnterbrecherAbbrecher'));
 			}
 
 			// keine Studenten nach Diplomand Status
@@ -607,14 +607,11 @@ class Prestudentstatus_model extends DB_Model
 				isset($next_status) && $curr_status_kurzbz == 'Diplomand' && $next_status->status_kurzbz == 'Student'
 			)
 			{
-				return error($name . "Nach Diplomandenstatus darf kein Studentenstatus mehr eingetragen werden");
+				return error($name . $this->p->t('lehre','error_consecutiveDiplomandStudent'));
 			}
 
 		}
 
-		//return $statusArr; //rot
-		//return $resultPs->retval; //rot
-		//TODO(Manu) check, warum Fehlermeldung bei anderem returnwert!
 		return $resultPs;
 	}
 
@@ -645,7 +642,7 @@ class Prestudentstatus_model extends DB_Model
 			return error($result);
 		}
 		if (!hasData($result)) {
-			return success("0",'No Statusdata vorhanden');
+			return success("0", $this->p->t('lehre','error_noStatusFound'));
 		}
 
 		return $result;
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index 5dbc9ef4a..f4b0b1f0e 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -1067,6 +1067,30 @@ export default{
 				</template>
 			</BsModal>
 			
+			<ul class="dropdown-menu" ref="addMultiStatus3" id="addMultiStatus3">
+				<li class="dropdown-submenu">
+					<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'abbrecherStgl', 'Abbrecher')">Abbrecher durch Stgl</a>
+				</li>
+				<li class="dropdown-submenu">
+					<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'abbrecherStud','Abbrecher')">Abbrecher durch Student</a>
+				</li>
+				<li class="dropdown-submenu">
+					<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'unterbrecher','Unterbrecher')">Unterbrecher</a>
+				</li>
+				<li class="dropdown-submenu">
+					<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'student','Student')">Student</a>
+				</li>
+				<li class="dropdown-submenu">
+					<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'student','Wiederholer')">Wiederholer</a>
+				</li>
+				<li class="dropdown-submenu">
+					<a class="dropdown-item" @click="changeStatusToDiplomand(prestudentIds)">Diplomand</a>
+				</li>
+				<li class="dropdown-submenu">
+					<a class="dropdown-item" @click="changeStatusToAbsolvent(prestudentIds)">Absolvent</a>
+				</li>							
+			</ul>
+			
 			<!--Modal: askForAusbildungssemester-->
 			<BsModal ref="askForAusbildungssemester">
 				<template #title>{{$p.t('lehre', 'status_edit')}}</template>
@@ -1117,19 +1141,80 @@ export default{
 				>
 				
 				<template #actions="{updateData2}">
-					<button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#addMultiStatus">
+<!--					<button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#addMultiStatus">
 						Status Ändern
-					</button>
-				</template>
+					</button>-->
+					
+					<div class="btn-group">						
+						<button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
+							Status Ändern
+						</button>
+					
+						<ul class="dropdown-menu">
+							<li class="dropdown-submenu">
+								<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'abbrecherStgl', 'Abbrecher')">Abbrecher durch Stgl</a>
+							</li>
+							<li class="dropdown-submenu">
+								<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'abbrecherStud','Abbrecher')">Abbrecher durch Student</a>
+							</li>
+							<li class="dropdown-submenu">
+								<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'unterbrecher','Unterbrecher')">Unterbrecher</a>
+							</li>
+							<li class="dropdown-submenu">
+								<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'student','Student')">Student</a>
+							</li>
+							<li class="dropdown-submenu">
+								<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'student','Wiederholer')">Wiederholer</a>
+							</li>
+							<li class="dropdown-submenu">
+								<a class="dropdown-item" @click="changeStatusToDiplomand(prestudentIds)">Diplomand</a>
+							</li>
+							<li class="dropdown-submenu">
+								<a class="dropdown-item" @click="changeStatusToAbsolvent(prestudentIds)">Absolvent</a>
+							</li>							
+						</ul>
+					</div>
+					
 			</core-filter-cmpt>
 			
 			<div 
 				v-if="this.modelValue.length"
 				ref="buttonsStatusMulti"
 			>	
-			<button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#addMultiStatus">
+<!--			<button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#addMultiStatus">
 				Status Ändern
-			</button>
+			</button>-->
+			
+			<div class="btn-group">						
+				<button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
+					Status Ändern
+				</button>
+			
+				<ul class="dropdown-menu">
+					<li class="dropdown-submenu">
+						<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'abbrecherStgl', 'Abbrecher')">Abbrecher durch Stgl</a>
+					</li>
+					<li class="dropdown-submenu">
+						<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'abbrecherStud','Abbrecher')">Abbrecher durch Student</a>
+					</li>
+					<li class="dropdown-submenu">
+						<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'unterbrecher','Unterbrecher')">Unterbrecher</a>
+					</li>
+					<li class="dropdown-submenu">
+						<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'student','Student')">Student</a>
+					</li>
+					<li class="dropdown-submenu">
+						<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'student','Wiederholer')">Wiederholer</a>
+					</li>
+					<li class="dropdown-submenu">
+						<a class="dropdown-item" @click="changeStatusToDiplomand(prestudentIds)">Diplomand</a>
+					</li>
+					<li class="dropdown-submenu">
+						<a class="dropdown-item" @click="changeStatusToAbsolvent(prestudentIds)">Absolvent</a>
+					</li>							
+				</ul>
+			</div>
+			
 			</div>
 		
 		</div>`
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 5a5ec594d..b923b649b 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -27882,6 +27882,186 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'error_statuseintrag',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Datum des Statuseintrags muss nach dem Statusdatum, das Semesterstartdatum nach Semesterstartdatum des vorherigen Statuseintrags sein',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error: Date of the status entry must be after the start date, the semester start date after the semester start date of the previous status entry',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'error_endstatus',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Nach Abbrecher- und Absolventenstatus darf kein anderer Status mehr eingetragen werden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error: No other status may be entered after the dropout and graduate status',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'error_consecutiveUnterbrecher',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Aufeinanderfolgende Unterbrecher müssen gleiches Ausbildungssemester haben',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error: Successive interrupters must have the same education semester',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'error_consecutiveUnterbrecherAbbrecher',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Unterbrecher und folgender Abbrecher müssen gleiches Ausbildungssemester haben',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error: interrupter and following dropout must have the same education semester',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'error_consecutiveDiplomandStudent',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Nach Diplomandenstatus darf kein Studentenstatus mehr eingetragen werden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error: Student status may not be entered after graduate status',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'error_noStudiensemester',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kein Eintrag für Studiensemester vorhanden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error: no entry for study semester',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'anzahl_existingRoles',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '{anzahl} Rollen vorhanden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '{anzahl} existing roles',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'error_entryInPast',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Datum eines neuen Statuseintrags darf nicht in der Vergangenheit liegen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error: The date of a new status entry cannot be in the past',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'error_lastRole',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Die letzte Rolle kann nur durch den Administrator gelöscht werden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error: The last role can only be deleted by the administrator',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 );
 
 

From c566d0784739fb1d97e4fe04a70fc1076a51ea0e Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 21 May 2024 13:34:58 +0200
Subject: [PATCH 0716/1461] fixes little xml layout issue

---
 .../39911_tabulator_in_contentmittitel.php    | 92 ++++++++++---------
 1 file changed, 51 insertions(+), 41 deletions(-)

diff --git a/system/dbupdate_3.4/39911_tabulator_in_contentmittitel.php b/system/dbupdate_3.4/39911_tabulator_in_contentmittitel.php
index 1e86da19e..b743648ed 100644
--- a/system/dbupdate_3.4/39911_tabulator_in_contentmittitel.php
+++ b/system/dbupdate_3.4/39911_tabulator_in_contentmittitel.php
@@ -1,6 +1,6 @@
 <?php
 
-$raum_contentmittitel_xslt_xhtml=  <<<END
+$raum_contentmittitel_xslt_xhtml=  <<<EOD
 <xsl:stylesheet version="1.0" xmlns:fo="http://www.w3.org/1999/XSL/Format"
 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 	<xsl:template match="content">
@@ -36,61 +36,71 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 		</body>
 		</html>
 	</xsl:template>
-</xsl:stylesheet >
-END;
+</xsl:stylesheet>
+EOD;
 
-$raum_contentmittitel_xsd=   <<<END
+$raum_contentmittitel_xsd=<<<EOD
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
 <xs:element name="content">
 	<xs:element name="titel" type="xs:string"/>
 	<xs:element name="inhalt" type="wysiwyg"/>
 </xs:element>
-END;
+</xs:schema>
+EOD;
 
-$raum_contentmittitel_xslt_xhtml_c4=   <<<END
+$raum_contentmittitel_xslt_xhtml_c4=   <<<EOD
 <xsl:stylesheet version="1.0"
     xmlns:fo="http://www.w3.org/1999/XSL/Format"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
     <xsl:template match="content">
-	<h1>
-	    <xsl:value-of select="titel" />
-	</h1>
-	<xsl:value-of select="inhalt" disable-output-escaping="yes" />
-</xsl:template>
-END;
+		<h1>
+	    	<xsl:value-of select="titel" />
+		</h1>
+		<xsl:value-of select="inhalt" disable-output-escaping="yes" />
+	</xsl:template>
+</xsl:stylesheet>
+EOD;
 
-$raum_contentmittitel_insert_query=  <<<END
+$raum_contentmittitel_insert_query=  <<<EOD
 	INSERT INTO campus.tbl_template 
 	(template_kurzbz, bezeichnung, xsd, xslt_xhtml, xslfo_pdf, xslt_xhtml_c4) 
 	VALUES 
-	('raum_contentmittitel','template for the raum view that uses the tabulator javascript instead of the jquery scripts and the table sorter ', '$raum_contentmittitel_xsd','$raum_contentmittitel_xslt_xhtml', NULL, '$raum_contentmittitel_xslt_xhtml_c4');
-END;
-
-
-// executing the insert statement for the new template
-
-if (!$db->db_query($raum_contentmittitel_insert_query))
-	echo '<strong>FAILED INSERTING NEW TEMPLATE RAUM_CONTENTMITTITEL : ' . $db->db_last_error() . '</strong><br>';
-else
-	echo '<br>SUCCESSFULLY INSERTING NEW TEMPLATE RAUM_CONTENTMITTITEL ';
-
-
-$raum_content_update_query=  <<<END
-	UPDATE "campus"."tbl_content" 
-	SET template_kurzbz = 'raum_contentmittitel' 
-	where content_id IN 
-	(SELECT content_id 
-	FROM "public"."tbl_ort" 
-	JOIN campus.tbl_content USING(content_id));
-END;
-
-// executing the update statement to update the template for all room content
-
-if (!$db->db_query($raum_content_update_query))
-	echo '<strong>FAILED TO UPDATE ROOMS WITH NEW TEMPLATE raum_contentmittitel : ' . $db->db_last_error() . '</strong><br>';
-else
-	echo '<br>SUCCESSFULLY UPDATED ROOMS WITH NEW TEMPLATE raum_contentmittitel';
-
+	('raum_contentmittitel','template for the raum view that uses the tabulator javascript instead of the jquery scripts and the table sorter ', '{$raum_contentmittitel_xsd}', '{$raum_contentmittitel_xslt_xhtml}' , NULL, '{$raum_contentmittitel_xslt_xhtml_c4}');
+EOD;
+
+$raum_content_update_query= <<<EOD
+				UPDATE campus.tbl_content 
+				SET template_kurzbz = 'raum_contentmittitel' 
+				where content_id IN 
+				(SELECT content_id 
+				FROM public.tbl_ort 
+				JOIN campus.tbl_content USING(content_id));
+EOD;
 
 
+if ($result = @$db->db_query("SELECT * FROM campus.tbl_template WHERE template_kurzbz='raum_contentmittitel'")) {
+	
+	// only inserting the new template if it doesn't exist already
+    if ($db->db_num_rows($result) == 0) {
+		
+		// executing the insert statement for the new template
+		if (!$db->db_query($raum_contentmittitel_insert_query)){
+			echo '<strong>FAILED INSERTING NEW TEMPLATE RAUM_CONTENTMITTITEL : ' . $db->db_last_error() . '</strong><br>';
+			
+		}
+		else {
+			echo '<br>SUCCESSFULLY INSERTING NEW TEMPLATE RAUM_CONTENTMITTITEL ';
+	
+			// only update the rooms template if the insert of the room_contentmittitel template was successful
+			// executing the update statement to update the template for all room content
+			if (!$db->db_query($raum_content_update_query)){
+				echo '<strong>FAILED TO UPDATE ROOMS WITH NEW TEMPLATE raum_contentmittitel : ' . $db->db_last_error() . '</strong><br>';
+			}
+			else{
+				echo '<br>SUCCESSFULLY UPDATED ROOMS WITH NEW TEMPLATE raum_contentmittitel';
+			}
 
+		}
+	
+	}
+}
\ No newline at end of file

From 559a6b317d2af0937b0b7cd120568e24a50602cb Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Tue, 21 May 2024 14:03:40 +0200
Subject: [PATCH 0717/1461] Fixed multiple display of child software

---
 public/js/components/filter/Filter.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index b4440cac1..a7d93523e 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -543,8 +543,8 @@ export const CoreFilterCmpt = {
 					// create children array if not done yet
 					if (!parent._children) parent._children = [];
 
-					// append the child
-					parent._children.push(child);
+					// if child is not included in children array, append the child
+					if (!parent._children.includes(child)) parent._children.push(child);
 
 					// parent found
 					return true;

From 1993e20ffc1c3dc99f51a0116411ba6c21485636 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 21 May 2024 15:35:57 +0200
Subject: [PATCH 0718/1461] Notiz component: new layout popupModal

---
 application/core/Notiz_Controller.php         |   3 +-
 public/js/components/Notiz/Notiz.js           | 206 +++++++++++++++++-
 .../Studentenverwaltung/Details/Notizen.js    |  11 +-
 3 files changed, 210 insertions(+), 10 deletions(-)

diff --git a/application/core/Notiz_Controller.php b/application/core/Notiz_Controller.php
index 8a93c4f0f..1b78f15f7 100644
--- a/application/core/Notiz_Controller.php
+++ b/application/core/Notiz_Controller.php
@@ -158,8 +158,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		$text = $this->input->post('text');
 		$erledigt = $this->input->post('erledigt');
 		$verfasser_uid = isset($_POST['verfasser']) ? $_POST['verfasser'] : $uid;
-		//$verfasser_uid = isset($_POST['verfasser_uid']) ? $_POST['verfasser_uid'] : $uid;
-		$bearbeiter_uid = isset($_POST['bearbeiter_uid']) ? $_POST['bearbeiter_uid'] : null;
+		$bearbeiter_uid = isset($_POST['bearbeiter']) ? $_POST['bearbeiter'] : null;
 		$type = $this->input->post('typeId');
 		$start = $this->input->post('start');
 		$ende = $this->input->post('ende');
diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index bff0ad6c7..ec2c7696b 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -29,13 +29,13 @@ export default {
 		},
 		notizLayout: {
 			type: String,
-			default: 'twoColumnsFormLeft',
+			default: 'popupModal',
 			validator(value) {
-				// TODO(chris): modal version
 				return [
 					'classicFas',
 					'twoColumnsFormRight',
-					'twoColumnsFormLeft'
+					'twoColumnsFormLeft',
+					'popupModal'
 					].includes(value)
 			}
 		},
@@ -278,6 +278,9 @@ export default {
 				}
 			})
 				.then(() => {
+					if(this.notizLayout == 'popupModal') {
+						this.$refs.NotizModal.show();
+					}
 					if (this.notizData.dms_id) {
 						this.loadDocEntries(this.notizData.notiz_id);
 					} else
@@ -286,6 +289,9 @@ export default {
 		},
 		actionNewNotiz() {
 			this.resetFormData();
+			if(this.notizLayout == 'popupModal') {
+				this.$refs.NotizModal.show();
+			}
 		},
 		addNewNotiz() {
 			const formData = new FormData();
@@ -297,6 +303,9 @@ export default {
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 					this.resetFormData();
+					if(this.notizLayout == 'popupModal') {
+						this.$refs.NotizModal.hide();
+					}
 					this.reload();
 				})
 				.catch(this.$fhcAlert.handleSystemError)
@@ -346,6 +355,9 @@ export default {
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 					this.resetFormData();
+					if(this.notizLayout == 'popupModal') {
+						this.$refs.NotizModal.hide();
+					}
 					this.reload();
 				})
 				.catch(this.$fhcAlert.handleSystemError)
@@ -1024,6 +1036,194 @@ export default {
 			</div> 
 		</div>
 		
+		<div v-else-if="notizLayout=='popupModal'" class="notiz-notiz">
+			<!--Modal: deleteNotizModal-->
+			<BsModal ref="deleteNotizModal">
+				<template #title>Notiz löschen</template>
+				<template #default>
+					<p>Notiz wirklich löschen?</p>
+				</template>
+				<template #footer>
+					<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetFormData">Abbrechen</button>
+					<button ref="Close" type="button" class="btn btn-primary" @click="deleteNotiz(notizData.notiz_id)">OK</button>
+				</template>
+			</BsModal>
+			
+			<BsModal ref="NotizModal">
+				<template #title>
+					<p v-if="notizData.statusNew" class="fw-bold">{{$p.t('notiz','notiz_new')}} <span> [{{notizData.typeId}}]</span></p>
+					<p v-else class="fw-bold">{{$p.t('notiz','notiz_edit')}} <span> [{{notizData.typeId}}]</span></p>
+				</template>
+				<template #default>
+					<div>
+				  	<form ref="formc" @submit.prevent class="row">
+						<div class="row mb-3">
+							<form-input
+								container-class="col-12"
+								:label="$p.t('global','titel')  + ' *'"
+								type="text"
+								v-model="notizData.titel"
+								name="titel"
+								>
+							</form-input>
+						</div>
+									
+						<div class="row mb-3">
+							<!-- TinyMce 5 -->
+							<div v-if="showTinyMce" class="col-sm-12">
+								<label for="text" class="form-label col-sm-2">{{$p.t('global','text')}} *</label>
+								<textarea
+								ref="editor"
+								rows="5"
+								cols="75"
+								class="form-control"
+								:value="notizData.text"
+								@input="updateText"></textarea>
+							</div>
+							
+							<div v-else class="col-sm-12">
+								<label for="text" class="form-label col-sm-2">{{$p.t('global','text')}} *</label>
+								<textarea rows="5" cols="75" v-model="notizData.text" class="form-control"></textarea>
+							</div>
+						</div>
+				
+						<!-- show Documentupload-->
+						<div v-if="showDocument">
+							<div class="row mb-3">		
+								<div  class="col-sm-12 py-3">
+									<label for="text" class="form-label col-sm-2">{{$p.t('notiz','document')}}</label>
+									<!--Upload Component-->
+									<FormUploadDms ref="upload" id="file" multiple v-model="notizData.anhang"></FormUploadDms>
+								</div>
+							</div>
+						</div>
+						
+						<!-- show Details-->
+						<div v-if="showErweitert">
+							<div class="row mb-3">
+								<form-input
+									container-class="col-6"
+									:label="$p.t('global', 'gueltigVon')"
+									type="DatePicker"
+									v-model="notizData['start']"
+									name="von"
+									auto-apply
+									:enable-time-picker="false"
+									format="dd.MM.yyyy"
+									preview-format="dd.MM.yyyy"
+									:teleport="true"
+									>
+								</form-input>
+								
+								<form-input
+									container-class="col-6"
+									:label="$p.t('global', 'gueltigBis')"
+									type="DatePicker"
+									v-model="notizData.ende"
+									name="bis"
+									auto-apply
+									:enable-time-picker="false"
+									format="dd.MM.yyyy"
+									preview-format="dd.MM.yyyy"
+									:teleport="true"
+									>
+								</form-input>
+							</div>
+							
+					
+							<div class="row mb-3">
+								<form-input 
+									v-if="notizData.verfasser_uid"
+									container-class="col-6"
+									:label="$p.t('notiz', 'verfasser')"
+									type="text"
+									v-model="notizData.verfasser_uid"
+									name="titel"
+									>
+								</form-input>
+						
+								<form-input
+									v-else
+									container-class="col-6"
+									:label="$p.t('notiz', 'verfasser')"
+									type="autocomplete"
+									v-model="notizData.intVerfasser"
+									:suggestions="filteredMitarbeiter" 
+									@complete="search" 
+									optionLabel="mitarbeiter"
+									minLength="3"
+									>
+								</form-input>
+								
+								<form-input
+									v-if="notizData.bearbeiter_uid"
+									container-class="col-6"
+									:label="$p.t('notiz', 'bearbeiter')"
+									v-model="notizData.bearbeiter_uid"
+									minlength="3"
+									>
+								</form-input>
+								
+								<form-input
+									v-else
+									container-class="col-6"
+									:label="$p.t('notiz', 'bearbeiter')"
+									type="autocomplete"
+									v-model="notizData.intBearbeiter"
+									:suggestions="filteredMitarbeiter" 
+									@complete="search" 
+									optionLabel="mitarbeiter"
+									minlength="3"
+									>
+								</form-input>	
+							</div>
+															
+							<div class="row mb-3">
+								<div class="col-2 pt-4 d-flex align-items-center">
+									<form-input
+										container-class="form-check"
+										:label="$p.t('notiz', 'erledigt')"
+										type="checkbox"
+										v-model="notizData.erledigt"
+										name="erledigt"
+										>
+									</form-input>
+								</div>
+							</div>
+						</div>
+						
+						<div class="row mb-3">
+							<label for="lastUpdate" class="form-label col-sm-3 small">{{$p.t('notiz','letzte_aenderung')}}</label>
+							<div class="col-sm-5">
+								<p class="small">{{notizData.lastupdate}}</p>
+							</div>
+						</div>
+						
+						<div>
+							<button v-if="notizData.statusNew" class="btn btn-primary" @click="addNewNotiz()"> {{$p.t('studierendenantrag', 'btn_new')}}</button>
+							<button v-else class="btn btn-primary" @click="updateNotiz(notizData.notiz_id)"> {{$p.t('ui', 'speichern')}}</button>
+						</div>
+					</form>		
+				</div>
+				</template>
+			</BsModal>
+			
+			<div class="row">
+				<core-filter-cmpt
+					ref="table"
+					:tabulator-options="tabulatorOptions"
+					:tabulator-events="tabulatorEvents"
+					table-only
+					:side-menu="false"
+					reload
+					new-btn-show
+					new-btn-label="Notiz"
+					@click:new="actionNewNotiz"
+					>
+				</core-filter-cmpt>	
+			</div> 
+		</div>
+		
 		<div v-else>
 			<p v-if="notizLayout">Falsches Layout übergeben: {{notizLayout}}</p>
 			<p v-else>Kein Layout übergeben</p>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
index 78a0940f8..7f09d3d05 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
@@ -13,6 +13,7 @@ export default {
 		<core-notiz
 			:endpoint="$fhcApi.factory.notiz.person"
 			ref="formc"
+			notiz-layout="twoColumnsFormLeft"
 			type-id="person_id"
 			:id="modelValue.person_id"
 			show-document
@@ -34,10 +35,10 @@ for extensions: write own controller extending core NotizController
 
 ref="formc"
 
-typeId: id to which table the notizdata should be connected... eg. person_id, prestudent_id, uid (for mitarbeiter_uid), projekt_kurzbz, projektphase_id, projekttask_id,
+type-id: id to which table the notizdata should be connected... eg. person_id, prestudent_id, uid (for mitarbeiter_uid), projekt_kurzbz, projektphase_id, projekttask_id,
 	bestellung_id, lehreinheit_id, anrechnung_id
 
-notizLayout: "classicFas", "twoColumnsFormLeft", twoColumnsFormRight"
+notizLayout: "classicFas", "twoColumnsFormLeft", twoColumnsFormRight, popupModal"
 
 showErweitert: if true: section with following fields will be displayed:
 	'verfasser', 'bearbeiter', 'von', 'bis'
@@ -70,9 +71,9 @@ visibleColumns: list, which fields shoult be showed as default in filter compone
 			type-id="uid"
 			:id= "'ma0068'"
 			notiz-layout="twoColumnsFormLeft"
-			:show-erweitert="true"
-			:show-document="true"
-			:showTinyMCE="false"
+			show-document
+			show-tiny-mce
+			show-erweitert
 			:visible-columns="['titel','text','verfasser','bearbeiter','dokumente']"
 			>
 		</core-notiz>

From 186e9e6f0848dc39be2885feba69b0cfb8f690cd Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 21 May 2024 15:56:18 +0200
Subject: [PATCH 0719/1461] WIP room planning in calendar

---
 application/controllers/CisVue/Cms.php        |  4 ++
 .../components/Cis/Stundenplan.php            | 13 +++-
 .../models/ressource/Stundenplan_model.php    | 12 ++++
 .../models/ressource/Stundenplandev_model.php |  2 +
 .../views/CisVue/Cms/RoomInformation.php      | 17 ++++++
 public/js/apps/Cis/RoomInformation.js         | 61 +++++++++++++++++++
 6 files changed, 108 insertions(+), 1 deletion(-)
 create mode 100644 application/views/CisVue/Cms/RoomInformation.php
 create mode 100644 public/js/apps/Cis/RoomInformation.js

diff --git a/application/controllers/CisVue/Cms.php b/application/controllers/CisVue/Cms.php
index 2c1fa1fc6..f8bd61a7b 100755
--- a/application/controllers/CisVue/Cms.php
+++ b/application/controllers/CisVue/Cms.php
@@ -115,4 +115,8 @@ class Cms extends FHC_Controller
 			show_error("News number rows: No data found");
 		}
 	}
+
+	public function getRoomInformation(){
+		$this->load->view('CisVue/Cms/RoomInformation');
+	}
 }
diff --git a/application/controllers/components/Cis/Stundenplan.php b/application/controllers/components/Cis/Stundenplan.php
index 2b35e11ca..2ec001843 100755
--- a/application/controllers/components/Cis/Stundenplan.php
+++ b/application/controllers/components/Cis/Stundenplan.php
@@ -16,7 +16,8 @@ class Stundenplan extends Auth_Controller
 		parent::__construct([
 			'index' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
 			'Reservierungen' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
-			'Stunden' => ['student/anrechnung_beantragen:r','user:r'] // TODO(chris): permissions?
+			'Stunden' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
+			'RoomInformation'=> ['student/anrechnung_beantragen:r','user:r'],
 		]);
 	}
 
@@ -65,4 +66,14 @@ class Stundenplan extends Auth_Controller
 		$this->outputJsonSuccess(getData($result));
 	}
 
+	public function RoomInformation()
+	{
+		$this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+
+		$result = $this->StundenplanModel->getRoomDataOnDay('EDV_A2.06','2024-05-21');
+		//echo($this->db->last_query());
+		echo json_encode($result);
+		
+	}
+
 }
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 5ec6ea302..4d0a7893b 100755
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -12,6 +12,18 @@ class Stundenplan_model extends DB_Model
 		$this->pk = 'stundenplan_id';
 	}
 
+	/**
+	 * @param string $ort_kurzbz
+	 * @param string $date
+	 * 
+	 * @return stdClass
+	 */
+	public function getRoomDataOnDay($ort_kurzbz,$date){
+		$res = $this->loadWhere(['ort_kurzbz'=>$ort_kurzbz,'datum'=>$date]);
+		$res = hasData($res) ? getData($res): null;
+		return $res;
+	}
+
 	/**
 	 * @param string $uid
 	 * 
diff --git a/application/models/ressource/Stundenplandev_model.php b/application/models/ressource/Stundenplandev_model.php
index a498e209b..800540d60 100755
--- a/application/models/ressource/Stundenplandev_model.php
+++ b/application/models/ressource/Stundenplandev_model.php
@@ -12,6 +12,8 @@ class Stundenplandev_model extends DB_Model
 		$this->pk = 'stundenplandev_id';
 	}
 
+	
+
 	public function getMissingDirectGroups($studiensemester_kurzbz = null)
 	{
 		$qry = "
diff --git a/application/views/CisVue/Cms/RoomInformation.php b/application/views/CisVue/Cms/RoomInformation.php
new file mode 100644
index 000000000..c14b68024
--- /dev/null
+++ b/application/views/CisVue/Cms/RoomInformation.php
@@ -0,0 +1,17 @@
+<?php
+$includesArray = array(
+	'title' => 'RoomInformation',
+	'customJSModules' => ['public/js/apps/Cis/RoomInformation.js'],
+	'customCSSs' => ['public/css/components/calendar.css']
+);
+
+$this->load->view('templates/CISHTML-Header', $includesArray);
+?>
+
+<div >
+	<h2>Room Information</h2>
+	<hr>
+    <div id="content"></div>
+</div>
+
+<?php $this->load->view('templates/CISHTML-Footer', $includesArray); ?>
diff --git a/public/js/apps/Cis/RoomInformation.js b/public/js/apps/Cis/RoomInformation.js
new file mode 100644
index 000000000..63587d2d1
--- /dev/null
+++ b/public/js/apps/Cis/RoomInformation.js
@@ -0,0 +1,61 @@
+import FhcCalendar from "../../components/Calendar/Calendar.js";
+
+const app = Vue.createApp({
+	components: {
+		FhcCalendar
+	},
+	data() {
+		return {
+			stunden: [],
+			events: null
+		}
+	},
+	created() {
+		axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/Cis/Stundenplan/Stunden').then(res => {
+			
+            
+            res.data.retval.forEach(std => {
+				this.stunden[std.stunde] = std; // TODO(chris): geht besser
+			});
+			console.log("this are the loaded stunden", this.stunden)
+		});
+
+        axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/Cis/Stundenplan').then(res => {
+            
+            let events;
+            if (res.data.retval && res.data.retval.forEach) {
+                res.data.retval.forEach((el, i) => {
+                    el.id = i;
+                    el.color = '#' + (el.farbe || 'CCCCCC');
+                    el.start = new Date(el.datum + ' ' + this.stunden[el.stunde].beginn);
+                    el.end = new Date(el.datum + ' ' + this.stunden[el.stunde].ende);
+                    el.title = el.lehrfach;
+                    if (el.lehrform)
+                        el.title += '-' + el.lehrform;
+                });
+                events = res.data.retval;
+            }
+
+            console.log("this are the loaded events",events)
+            // TODO(chris): do we need that
+
+        }).catch((e)=>{console.log(e,"this is the exception")})
+
+
+        axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/Cis/Stundenplan/RoomInformation').then(res => {
+            console.log(res)
+        console.log("this string got printed after the get was successfully finished")
+        }).catch((e)=>{console.log(e,"this is the exception")})
+
+       
+
+	},
+    template: /*html*/`
+    <div>
+    <!--initialDate="2023-5-12"-->
+        <fhc-calendar  :events="events" initial-mode="week" show-weeks></fhc-calendar>
+    </div>
+    `,
+});
+app.config.unwrapInjectedRef = true;
+app.mount('#content');
\ No newline at end of file

From e20bebad87851b252146bc2768db7afa3a2ee969 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 21 May 2024 16:09:21 +0200
Subject: [PATCH 0720/1461] Bugfixes: Typos

---
 application/controllers/api/frontend/v1/stv/Student.php  | 2 +-
 public/js/components/Stv/Studentenverwaltung/List/New.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php
index 62a6b3e95..9649f4162 100644
--- a/application/controllers/api/frontend/v1/stv/Student.php
+++ b/application/controllers/api/frontend/v1/stv/Student.php
@@ -259,7 +259,7 @@ class Student extends FHCAPI_Controller
 	{
 		$this->load->library('form_validation');
 
-		$this->form_validation->set_rules('gebdatum', 'Geburtsdatum', 'callback_isValidDate', [
+		$this->form_validation->set_rules('gebdatum', 'Geburtsdatum', 'isValidDate', [
 			'isValidDate' => $this->p->t('ui', 'error_invalid_date')
 		]);
 
diff --git a/public/js/components/Stv/Studentenverwaltung/List/New.js b/public/js/components/Stv/Studentenverwaltung/List/New.js
index 351737e23..c02d9ba29 100644
--- a/public/js/components/Stv/Studentenverwaltung/List/New.js
+++ b/public/js/components/Stv/Studentenverwaltung/List/New.js
@@ -107,7 +107,7 @@ export default {
 
 			this.abortController.suggestions = new AbortController();
 			// TODO(chris): move to fhcapi.factory
-			this.$fhcapi
+			this.$fhcApi
 				.post('api/frontend/v1/stv/student/check', {
 					vorname: this.formData.vorname,
 					nachname: this.formData.nachname,

From b52ea080134131ce4607323a5188344f97ce4934 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 22 May 2024 08:54:00 +0200
Subject: [PATCH 0721/1461] Correct Casting for stg_kz

---
 application/controllers/api/frontend/v1/stv/Verband.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Verband.php b/application/controllers/api/frontend/v1/stv/Verband.php
index 5a7960fd5..d74b24a0e 100644
--- a/application/controllers/api/frontend/v1/stv/Verband.php
+++ b/application/controllers/api/frontend/v1/stv/Verband.php
@@ -145,7 +145,7 @@ class Verband extends FHCAPI_Controller
 		$this->StudiengangModel->addSelect("CONCAT(UPPER(CONCAT(typ, kurzbz)), '-', semester, (SELECT CASE WHEN bezeichnung IS NULL OR bezeichnung='' THEN ''::TEXT ELSE CONCAT(' (', bezeichnung, ')') END FROM public.tbl_lehrverband WHERE studiengang_kz=v.studiengang_kz AND semester=v.semester ORDER BY verband, gruppe LIMIT 1)) AS name", false);
 
 		$this->StudiengangModel->addSelect('semester');
-		$this->StudiengangModel->addSelect($this->StudiengangModel->escape($studiengang_kz) . ' AS stg_kz', false);
+		$this->StudiengangModel->addSelect($this->StudiengangModel->escape($studiengang_kz) . '::integer AS stg_kz', false);
 		
 		$this->StudiengangModel->addOrder('semester');
 
@@ -223,7 +223,7 @@ class Verband extends FHCAPI_Controller
 
 		$this->GruppeModel->addSelect('sort');
 		$this->GruppeModel->addSelect('gruppe_kurzbz');
-		$this->GruppeModel->addSelect($this->GruppeModel->escape($studiengang_kz) . ' AS stg_kz', false);
+		$this->GruppeModel->addSelect($this->GruppeModel->escape($studiengang_kz) . '::integer AS stg_kz', false);
 
 		$this->GruppeModel->addOrder('sort');
 		$this->GruppeModel->addOrder('gruppe_kurzbz');
@@ -299,7 +299,7 @@ class Verband extends FHCAPI_Controller
 		$this->StudiengangModel->addSelect("TRUE AS leaf", false);
 
 		$this->StudiengangModel->addSelect('gruppe');
-		$this->StudiengangModel->addSelect($this->StudiengangModel->escape($studiengang_kz) . ' AS stg_kz', false);
+		$this->StudiengangModel->addSelect($this->StudiengangModel->escape($studiengang_kz) . '::integer AS stg_kz', false);
 		
 		$this->StudiengangModel->addOrder('gruppe');
 

From 5eafa6b5f495ed53044306e976d4d7da7cc1826f Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 22 May 2024 08:54:23 +0200
Subject: [PATCH 0722/1461] Bugfix: filter not null

---
 public/js/components/Stv/Studentenverwaltung/Verband.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Verband.js b/public/js/components/Stv/Studentenverwaltung/Verband.js
index 4ea1184ad..eb467b6bb 100644
--- a/public/js/components/Stv/Studentenverwaltung/Verband.js
+++ b/public/js/components/Stv/Studentenverwaltung/Verband.js
@@ -37,7 +37,7 @@ export default {
 			let res = arr.filter(n => n.key == key);
 			if (res.length)
 				return res.pop();
-			res = arr.map(n => n.children ? this.findNodeByKey(key, n.children) : null).filter();
+			res = arr.map(n => n.children ? this.findNodeByKey(key, n.children) : null).filter(a => a);
 			if (res.length)
 				return res.pop();
 			return null;

From 84013e42e76cd6b35ff14e2bfd4a348e97dc9deb Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 22 May 2024 12:46:05 +0200
Subject: [PATCH 0723/1461] Bugfixes: correct validation function, cast stg_kz
 to int, query order

---
 .../api/frontend/v1/stv/Student.php           |  4 +-
 .../api/frontend/v1/stv/Verband.php           |  2 +
 .../controllers/components/stv/Students.php   | 98 +++++++++----------
 3 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php
index 9649f4162..fbff10b58 100644
--- a/application/controllers/api/frontend/v1/stv/Student.php
+++ b/application/controllers/api/frontend/v1/stv/Student.php
@@ -259,9 +259,7 @@ class Student extends FHCAPI_Controller
 	{
 		$this->load->library('form_validation');
 
-		$this->form_validation->set_rules('gebdatum', 'Geburtsdatum', 'isValidDate', [
-			'isValidDate' => $this->p->t('ui', 'error_invalid_date')
-		]);
+		$this->form_validation->set_rules('gebdatum', 'Geburtsdatum', 'is_valid_date');
 
 		if (!$this->form_validation->run())
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
diff --git a/application/controllers/api/frontend/v1/stv/Verband.php b/application/controllers/api/frontend/v1/stv/Verband.php
index d74b24a0e..8600a1bf0 100644
--- a/application/controllers/api/frontend/v1/stv/Verband.php
+++ b/application/controllers/api/frontend/v1/stv/Verband.php
@@ -343,6 +343,8 @@ class Verband extends FHCAPI_Controller
 		$studiensemester = $this->getDataOrTerminateWithError($result);
 		$result = [];
 
+		$studiengang_kz = (int)$studiengang_kz;
+
 		foreach ($studiensemester as $sem) {
 			$semlink = $link . $sem->studiensemester_kurzbz;
 			$intlink = $semlink . '/interessenten';
diff --git a/application/controllers/components/stv/Students.php b/application/controllers/components/stv/Students.php
index 475497141..e4ba9befd 100644
--- a/application/controllers/components/stv/Students.php
+++ b/application/controllers/components/stv/Students.php
@@ -168,55 +168,6 @@ class Students extends FHC_Controller
 
 		$stdsemEsc = $this->PrestudentModel->escape($studiensemester_kurzbz);
 		
-		$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
-		#$this->PrestudentModel->addJoin('public.tbl_prestudentstatus ps', 'ps.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, ' . $this->PrestudentModel->escape($studiensemester_kurzbz) . ') AND ps.prestudent_id=tbl_prestudent.prestudent_id');
-		$this->PrestudentModel->addJoin('public.tbl_prestudentstatus ps', 'ps.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ') AND ps.prestudent_id=tbl_prestudent.prestudent_id AND ps.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ') AND ps.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ')', 'LEFT');
-		// TODO(chris): check what functions are returning when no entry exists
-		
-		$this->PrestudentModel->addSelect('p.person_id');
-		$this->PrestudentModel->addSelect('tbl_prestudent.prestudent_id');
-		$this->PrestudentModel->addSelect("'' AS uid");
-		$this->PrestudentModel->addSelect('titelpre');
-		$this->PrestudentModel->addSelect('titelpost');
-		$this->PrestudentModel->addSelect('vorname');
-		$this->PrestudentModel->addSelect('wahlname');
-		$this->PrestudentModel->addSelect('vornamen');
-		$this->PrestudentModel->addSelect('geschlecht');
-		$this->PrestudentModel->addSelect('nachname');
-		$this->PrestudentModel->addSelect('gebdatum');
-		$this->PrestudentModel->addSelect('tbl_prestudent.anmerkung');
-		$this->PrestudentModel->addSelect('ersatzkennzeichen');
-		$this->PrestudentModel->addSelect('svnr');
-		$this->PrestudentModel->addSelect("'' AS matrikelnr");
-		$this->PrestudentModel->addSelect('p.anmerkung AS anmerkungen');
-		$this->PrestudentModel->addSelect("'' AS semester");
-		$this->PrestudentModel->addSelect("'' AS verband");
-		$this->PrestudentModel->addSelect("'' AS gruppe");
-		$this->PrestudentModel->addSelect('tbl_prestudent.studiengang_kz');
-		$this->PrestudentModel->addSelect('aufmerksamdurch_kurzbz');
-		$this->PrestudentModel->addSelect('mentor');
-		$this->PrestudentModel->addSelect('FALSE AS bnaktiv');
-		$this->PrestudentModel->addSelect(
-			"(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung LIMIT 1) AS email_privat",
-			false
-		);
-		$this->PrestudentModel->addSelect(
-			"(SELECT rt_gesamtpunkte AS punkte FROM public.tbl_prestudent WHERE prestudent_id=s.prestudent_id) AS punkte",
-			false
-		);
-		$this->PrestudentModel->addSelect('tbl_prestudent.dual');
-		$this->PrestudentModel->addSelect('tbl_prestudent.reihungstest_id');
-		$this->PrestudentModel->addSelect('tbl_prestudent.anmeldungreihungstest');
-		$this->PrestudentModel->addSelect('p.matr_nr');
-		$this->PrestudentModel->addSelect('tbl_prestudent.gsstudientyp_kurzbz');
-		$this->PrestudentModel->addSelect('tbl_prestudent.aufnahmegruppe_kurzbz');
-		$this->PrestudentModel->addSelect('tbl_prestudent.priorisierung');
-		$this->PrestudentModel->addSelect('p.zugangscode');
-		$this->PrestudentModel->addSelect('p.bpk');
-
-		$this->PrestudentModel->addOrder('nachname');
-		$this->PrestudentModel->addOrder('vorname');
-
 		$where = [];
 		if ($orgform_kurzbz) {
 			$where['ps.orgform_kurzbz'] = $orgform_kurzbz;
@@ -322,6 +273,55 @@ class Students extends FHC_Controller
 				break;
 		}
 
+		$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
+		#$this->PrestudentModel->addJoin('public.tbl_prestudentstatus ps', 'ps.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, ' . $this->PrestudentModel->escape($studiensemester_kurzbz) . ') AND ps.prestudent_id=tbl_prestudent.prestudent_id');
+		$this->PrestudentModel->addJoin('public.tbl_prestudentstatus ps', 'ps.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ') AND ps.prestudent_id=tbl_prestudent.prestudent_id AND ps.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ') AND ps.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ')', 'LEFT');
+		// TODO(chris): check what functions are returning when no entry exists
+		
+		$this->PrestudentModel->addSelect('p.person_id');
+		$this->PrestudentModel->addSelect('tbl_prestudent.prestudent_id');
+		$this->PrestudentModel->addSelect("'' AS uid");
+		$this->PrestudentModel->addSelect('titelpre');
+		$this->PrestudentModel->addSelect('titelpost');
+		$this->PrestudentModel->addSelect('vorname');
+		$this->PrestudentModel->addSelect('wahlname');
+		$this->PrestudentModel->addSelect('vornamen');
+		$this->PrestudentModel->addSelect('geschlecht');
+		$this->PrestudentModel->addSelect('nachname');
+		$this->PrestudentModel->addSelect('gebdatum');
+		$this->PrestudentModel->addSelect('tbl_prestudent.anmerkung');
+		$this->PrestudentModel->addSelect('ersatzkennzeichen');
+		$this->PrestudentModel->addSelect('svnr');
+		$this->PrestudentModel->addSelect("'' AS matrikelnr");
+		$this->PrestudentModel->addSelect('p.anmerkung AS anmerkungen');
+		$this->PrestudentModel->addSelect("'' AS semester");
+		$this->PrestudentModel->addSelect("'' AS verband");
+		$this->PrestudentModel->addSelect("'' AS gruppe");
+		$this->PrestudentModel->addSelect('tbl_prestudent.studiengang_kz');
+		$this->PrestudentModel->addSelect('aufmerksamdurch_kurzbz');
+		$this->PrestudentModel->addSelect('mentor');
+		$this->PrestudentModel->addSelect('FALSE AS bnaktiv');
+		$this->PrestudentModel->addSelect(
+			"(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung LIMIT 1) AS email_privat",
+			false
+		);
+		$this->PrestudentModel->addSelect(
+			"(SELECT rt_gesamtpunkte AS punkte FROM public.tbl_prestudent WHERE prestudent_id=s.prestudent_id) AS punkte",
+			false
+		);
+		$this->PrestudentModel->addSelect('tbl_prestudent.dual');
+		$this->PrestudentModel->addSelect('tbl_prestudent.reihungstest_id');
+		$this->PrestudentModel->addSelect('tbl_prestudent.anmeldungreihungstest');
+		$this->PrestudentModel->addSelect('p.matr_nr');
+		$this->PrestudentModel->addSelect('tbl_prestudent.gsstudientyp_kurzbz');
+		$this->PrestudentModel->addSelect('tbl_prestudent.aufnahmegruppe_kurzbz');
+		$this->PrestudentModel->addSelect('tbl_prestudent.priorisierung');
+		$this->PrestudentModel->addSelect('p.zugangscode');
+		$this->PrestudentModel->addSelect('p.bpk');
+
+		$this->PrestudentModel->addOrder('nachname');
+		$this->PrestudentModel->addOrder('vorname');
+
 		$this->addFilter($studiensemester_kurzbz);
 
 		$this->outputJson([]);

From ae4c06f481672b7c8428c54a84971ede3c8a76dd Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 22 May 2024 13:09:18 +0200
Subject: [PATCH 0724/1461] Bugfix: Typo validations

---
 application/controllers/api/frontend/v1/stv/Student.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php
index fbff10b58..6b018ec8b 100644
--- a/application/controllers/api/frontend/v1/stv/Student.php
+++ b/application/controllers/api/frontend/v1/stv/Student.php
@@ -134,9 +134,9 @@ class Student extends FHCAPI_Controller
 		$result = $this->udflib->getCiValidations($this->PersonModel, $this->input->post());
 
 		//TODO(Manu) check with Chris: input number not allowed
-		$fieldValidations = $this->getDataOrTerminateWithError($result);
+		$field_validations = $this->getDataOrTerminateWithError($result);
 
-		$this->form_validation->set_rules($fieldvalidations);
+		$this->form_validation->set_rules($field_validations);
 
 		if (!$this->form_validation->run())
 			$this->terminateWithValidationErrors($this->form_validation->error_array());

From 7541770fbbef21cc9477ba245ad3487fad4456e6 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 22 May 2024 13:42:39 +0200
Subject: [PATCH 0725/1461] Code Quality & Comments

---
 application/controllers/api/frontend/v1/stv/Favorites.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Favorites.php b/application/controllers/api/frontend/v1/stv/Favorites.php
index 5b4b4fa73..e651bf85e 100644
--- a/application/controllers/api/frontend/v1/stv/Favorites.php
+++ b/application/controllers/api/frontend/v1/stv/Favorites.php
@@ -28,7 +28,6 @@ class Favorites extends FHCAPI_Controller
 {
 	public function __construct()
 	{
-		// TODO(chris): access!
 		parent::__construct([
 			'index' => self::PERM_LOGGED,
 			'set' => self::PERM_LOGGED
@@ -58,10 +57,8 @@ class Favorites extends FHCAPI_Controller
 
 		$this->form_validation->set_rules('favorites', 'Favorites', 'required');
 
-		if ($this->form_validation->run() == false) {
-			$this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST);
-			return $this->outputJson($this->form_validation->error_array());
-		}
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
 
 		$favorites = $this->input->post('favorites');
 

From 471e2e7b8609b39c37e7dcf74cb86ab7653c5f91 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 23 May 2024 09:52:25 +0200
Subject: [PATCH 0726/1461] temp

---
 .../Details/Prestudent/MultiStatus.js         | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index f4b0b1f0e..b1badff91 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -142,7 +142,7 @@ export default{
 
 							let button = document.createElement('button');
 							if (this.dataMeldestichtag && this.dataMeldestichtag > cell.getData().datum && !this.hasPermissionToSkipStatusCheck)
-								button.className = 'btn btn-outline-secondary btn-action disabled';
+								button.className = 'btn btn-outline-secondary btn-action';
 							else
 								button.className = 'btn btn-outline-secondary btn-action';
 							button.innerHTML = '<i class="fa fa-forward"></i>';
@@ -156,7 +156,7 @@ export default{
 
 							button = document.createElement('button');
 							if (this.dataMeldestichtag && this.dataMeldestichtag > cell.getData().datum && !this.hasPermissionToSkipStatusCheck)
-								button.className = 'btn btn-outline-secondary btn-action disabled';
+								button.className = 'btn btn-outline-secondary btn-action';
 							else
 								button.className = 'btn btn-outline-secondary btn-action';
 							button.innerHTML = '<i class="fa fa-check"></i>';
@@ -168,7 +168,7 @@ export default{
 
 							button = document.createElement('button');
 							if (this.dataMeldestichtag && this.dataMeldestichtag > cell.getData().datum && !this.hasPermissionToSkipStatusCheck)
-								button.className = 'btn btn-outline-secondary btn-action disabled';
+								button.className = 'btn btn-outline-secondary btn-action';
 							else
 								button.className = 'btn btn-outline-secondary btn-action';
 							button.innerHTML = '<i class="fa fa-edit"></i>';
@@ -180,7 +180,7 @@ export default{
 
 							button = document.createElement('button');
 							if (this.dataMeldestichtag && this.dataMeldestichtag > cell.getData().datum && !this.hasPermissionToSkipStatusCheck)
-								button.className = 'btn btn-outline-secondary btn-action disabled';
+								button.className = 'btn btn-outline-secondary btn-action';
 							else
 								button.className = 'btn btn-outline-secondary btn-action';
 							button.innerHTML = '<i class="fa fa-xmark"></i>';
@@ -499,8 +499,15 @@ export default{
 			Promise
 				.allSettled(promises)
 				.then(values => {
-					let newStatus = this.newArray[0].status_kurzbz;
-					console.log(`Successful: ${countSuccess}, Errors: ${countError}`);
+					if (this.abbruchData.length < 1) {
+						console.log("singleNew");
+					}
+					else{
+						let newStatus = this.newArray[0].status_kurzbz;
+						console.log(`Successful: ${countSuccess}, Errors: ${countError}`);
+					}
+
+
 
 					//Feedback Success als infoalert
 					 if (countSuccess > 0) {

From cef41f3710523b7744964ded615f5fd2ca0b884c Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 23 May 2024 12:44:12 +0200
Subject: [PATCH 0727/1461] fixes html, one closing div to much

---
 application/views/widgets/table/table.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/application/views/widgets/table/table.php b/application/views/widgets/table/table.php
index 9434547e1..cbd4ec0f1 100644
--- a/application/views/widgets/table/table.php
+++ b/application/views/widgets/table/table.php
@@ -22,5 +22,4 @@
 		<!-- Table widget footer  -->
 		<div id="tableWidgetFooter"></div>
 		</div>
-	</div>
-</div>
\ No newline at end of file
+	</div>
\ No newline at end of file

From 25deb0a440504efa070e2d3ef886701b918e3c6e Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 23 May 2024 13:01:18 +0200
Subject: [PATCH 0728/1461] takes the value of the node not just the node

---
 .../js/lehre/lehrauftrag/acceptLehrauftrag.js | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/public/js/lehre/lehrauftrag/acceptLehrauftrag.js b/public/js/lehre/lehrauftrag/acceptLehrauftrag.js
index 15c39db78..b1142ff34 100644
--- a/public/js/lehre/lehrauftrag/acceptLehrauftrag.js
+++ b/public/js/lehre/lehrauftrag/acceptLehrauftrag.js
@@ -445,19 +445,6 @@ storniert_tooltip = function (e, cell, onRendered) {
   }
 };
 
-//recursive function that returns the tableuniqueid using the tableInstance
-const findTableUniqueID = function (tableElement,count =0){
-  if(count >=10){
-      // after 10 iterations end the recursion
-      return null;
-  }
-  if(tableElement.attributes.tableuniqueid){
-     return tableElement.attributes.tableuniqueid.value;
-  }else{
-      findTableUniqueID(tableElement.parentElement, ++count);
-  }
-}
-
 $(function () {
   // Pruefen ob Promise unterstuetzt wird
   // Tabulator funktioniert nicht mit IE
@@ -466,9 +453,9 @@ $(function () {
   $(document).on("tableInit", function (event, tabulatorInstance) {
     //passing the tabulator instance because the acceptLehrauftrag site loads two tabulator tables
     func_tableBuilt(tabulatorInstance);
-
-    let uniqueTableID = findTableUniqueID(tabulatorInstance.element);
-        
+    
+    let uniqueTableID = tabulatorInstance.element.closest('[tableuniqueid]').attributes.tableuniqueid.value;
+    
     switch (uniqueTableID) {
       case "cancelledLehrauftrag":
         tabulatorInstance.on("renderComplete", () => {

From 12b2f3ab07444f3a6f3029d9ae755856a5bcd361 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 23 May 2024 15:39:31 +0200
Subject: [PATCH 0729/1461] adding more information to the cis40 stundenplan

---
 application/models/content/Content_model.php  |  44 +++--
 public/js/components/Calendar/Calendar.js     |  15 +-
 .../js/components/Calendar/CalendarModal.js   | 155 ++++++++++++++++++
 public/js/components/Calendar/Week/Page.js    |   8 +-
 4 files changed, 201 insertions(+), 21 deletions(-)
 create mode 100644 public/js/components/Calendar/CalendarModal.js

diff --git a/application/models/content/Content_model.php b/application/models/content/Content_model.php
index ef073fcf3..ed447b36a 100755
--- a/application/models/content/Content_model.php
+++ b/application/models/content/Content_model.php
@@ -78,6 +78,31 @@ class Content_model extends DB_Model
 	 */
 	public function getMenu($root_content_id, $uid, $sprache = DEFAULT_LANGUAGE)
 	{
+
+		/*,
+		{
+			"content_id": 1000007,
+			"template_kurzbz": "redirect",
+			"titel": "Anrechnung",
+			"content": "<content><url><![CDATA[' . site_url('/lehre/anrechnung/RequestAnrechnung') . ']]></url><target><![CDATA[]]></target></content>",
+			"menu_open": false,
+			"aktiv": true,
+			"childs": []
+		} 
+		*/
+
+		/* 
+		{
+			"content_id": 1000003,
+			"template_kurzbz": "redirect",
+			"titel": "COVID-19",
+			"content": "<content><url><![CDATA[' . site_url('/CisHtml/Cms/content/10012') . ']]></url><target><![CDATA[]]></target></content>",
+			"menu_open": false,
+			"aktiv": true,
+			"childs": []
+		},
+		*/
+
 		if ($root_content_id === null) {
 			$res = json_decode('{
 				"content_id": 1000000,
@@ -105,15 +130,6 @@ class Content_model extends DB_Model
 						"aktiv": true,
 						"childs": []
 					},
-					{
-						"content_id": 1000003,
-						"template_kurzbz": "redirect",
-						"titel": "COVID-19",
-						"content": "<content><url><![CDATA[' . site_url('/CisHtml/Cms/content/10012') . ']]></url><target><![CDATA[]]></target></content>",
-						"menu_open": false,
-						"aktiv": true,
-						"childs": []
-					},
 					{
 						"content_id": 1000004,
 						"template_kurzbz": "redirect",
@@ -149,16 +165,8 @@ class Content_model extends DB_Model
 						"menu_open": false,
 						"aktiv": true,
 						"childs": []
-					},
-					{
-						"content_id": 1000007,
-						"template_kurzbz": "redirect",
-						"titel": "Anrechnung",
-						"content": "<content><url><![CDATA[' . site_url('/lehre/anrechnung/RequestAnrechnung') . ']]></url><target><![CDATA[]]></target></content>",
-						"menu_open": false,
-						"aktiv": true,
-						"childs": []
 					}
+					
 				]
 			}');
 			return success($res);
diff --git a/public/js/components/Calendar/Calendar.js b/public/js/components/Calendar/Calendar.js
index 7ade4df60..ae36eab1f 100755
--- a/public/js/components/Calendar/Calendar.js
+++ b/public/js/components/Calendar/Calendar.js
@@ -5,6 +5,7 @@ import CalendarWeek from './Week.js';
 import CalendarWeeks from './Weeks.js';
 import CalendarMinimized from './Minimized.js';
 import CalendarDate from '../../composables/CalendarDate.js';
+import CalendarModal from './CalendarModal.js';
 
 // TODO(chris): week/month toggle
 
@@ -15,7 +16,8 @@ export default {
 		CalendarYears,
 		CalendarWeek,
 		CalendarWeeks,
-		CalendarMinimized
+		CalendarMinimized,
+		CalendarModal
 	},
 	provide() {
 		return {
@@ -61,6 +63,7 @@ export default {
 	],
 	data() {
 		return {
+			currentlySelectedEvent:null,
 			header: '',
 			prevMode: null,
 			currMode: null,
@@ -102,6 +105,15 @@ export default {
 	},
 	methods: {
 		handleInput(day) {
+			// set the event when clicking on the lernveranstaltung in the data 
+			this.currentlySelectedEvent = day;
+			console.log(this.currentlySelectedEvent)
+			// showing the modal
+			Vue.nextTick(()=>{
+				this.$refs.calendarModal.show();
+			})
+			
+			console.log(day,"this is the day")
 			this.$emit(day[0], day[1]);
 		}
 	},
@@ -135,6 +147,7 @@ export default {
 	},
 	template: `
 	<div ref="container" class="fhc-calendar card" :class="sizeClass">
+		<calendar-modal v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ref="calendarModal"  />
 		<component :is="'calendar-' + mode" @update:mode="mode=$event" @change:range="$emit('change:range',$event)" @input="handleInput" />
 	</div>`
 }
diff --git a/public/js/components/Calendar/CalendarModal.js b/public/js/components/Calendar/CalendarModal.js
new file mode 100644
index 000000000..f8bf57de6
--- /dev/null
+++ b/public/js/components/Calendar/CalendarModal.js
@@ -0,0 +1,155 @@
+import BsModal from "../Bootstrap/Modal.js";
+import Alert from "../Bootstrap/Alert.js";
+
+export default {
+  components: {
+    BsModal,
+    Alert,
+  },
+  mixins: [BsModal],
+  props: {
+    event:Object,
+    title:{
+        type:String,
+        default:"title"
+    },
+    /*
+     * NOTE(chris):
+     * Hack to expose in "emits" declared events to $props which we use
+     * in the v-bind directive to forward all events.
+     * @see: https://github.com/vuejs/core/issues/3432
+     */
+    onHideBsModal: Function,
+    onHiddenBsModal: Function,
+    onHidePreventedBsModal: Function,
+    onShowBsModal: Function,
+    onShownBsModal: Function,
+  },
+
+  data() {
+    return {
+      data:this.event,
+      topic: null,
+      profilUpdate: null,
+      editData: this.value,
+      fileID: null,
+      breadcrumb: null,
+      loading: false,
+
+      result: false,
+      info: null,
+    };
+  },
+  methods: {
+    updateFileIDFunction: function (newFileID) {
+      this.fileID = newFileID;
+    },
+
+    async submitProfilChange() {
+      //? check if data is valid before making a request
+      if (this.topic && this.profilUpdate) {
+        //? if profil update contains any attachment
+        if (this.fileID) {
+          const fileData = await this.uploadFiles(this.fileID);
+
+          this.fileID = fileData ? fileData : null;
+        }
+
+        //? inserts new row in public.tbl_cis_profil_update
+        //* calls the update api call if an update field is present in the data that was passed to the modal
+        const handleApiResponse = (res) => {
+          //? toggles the loading to false and closes the loading modal
+          this.loading = false;
+          this.setLoading(false);
+
+          if (res.data.error == 0) {
+            this.result = true;
+            this.hide();
+            Alert.popup(
+              "Ihre Anfrage wurde erfolgreich gesendet. Bitte warten Sie, während sich das Team um Ihre Anfrage kümmert."
+            );
+          } else {
+            this.result = false;
+            this.hide();
+            Alert.popup(
+              "Ein Fehler ist aufgetreten: " + JSON.stringify(res.data.retval)
+            );
+          }
+        };
+
+        //* v-show on EditProfil modal binded to this.loading
+        //? hides the EditProfil modal and shows the loading modal by calling a callback that was passed as prop from the parent component
+        this.loading = true;
+        this.setLoading(true);
+
+        this.editData.updateID
+          ? Vue.$fhcapi.ProfilUpdate.updateProfilRequest(
+              this.topic,
+              this.profilUpdate,
+              this.editData.updateID,
+              this.fileID ? this.fileID[0] : null
+            )
+              .then((res) => {
+                handleApiResponse(res);
+              })
+              .catch((err) => {
+                console.error(err);
+              })
+          : Vue.$fhcapi.ProfilUpdate.insertProfilRequest(
+              this.topic,
+              this.profilUpdate,
+              this.fileID ? this.fileID[0] : null
+            )
+              .then((res) => {
+                handleApiResponse(res);
+              })
+              .catch((err) => {
+                console.error(err);
+              });
+      }
+    },
+
+    uploadFiles: async function (files) {
+      if (files[0].type !== "application/x.fhc-dms+json") {
+        let formData = new FormData();
+        formData.append("files[]", files[0]);
+        const result = this.editData.updateID
+          ? //? updating old attachment by replacing
+            //* second parameter of api request insertFile checks if the file has to be replaced or not
+            await Vue.$fhcapi.ProfilUpdate.insertFile(
+              formData,
+              this.editData.updateID
+            ).then((res) => {
+              return res.data?.map((file) => file.dms_id);
+            })
+          : //? fresh insert of new attachment
+            await Vue.$fhcapi.ProfilUpdate.insertFile(formData).then((res) => {
+              return res.data?.map((file) => file.dms_id);
+            });
+        return result;
+      } else {
+        //? attachment hasn't been replaced
+        return false;
+      }
+    },
+  },
+  computed: {},
+  created() {
+    console.log("this is an test")
+  },
+  mounted() {
+    this.modal = this.$refs.modalContainer.modal;
+  },
+  popup(options) {
+    return BsModal.popup.bind(this)(null, options);
+  },
+  template: /*html*/ `
+  <bs-modal ref="modalContainer" v-bind="$props" body-class="" dialog-class="modal-lg" class="bootstrap-alert" backdrop="false" >
+
+    <template v-slot:default>
+        <p>{{JSON.stringify(data,null,2)}}</p>
+    </template>
+ 
+    <!-- end of optional footer --> 
+  </bs-modal>`,
+};
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index 47d48b7f7..799b0ca70 100755
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -104,8 +104,12 @@ export default {
 						<div v-for="hour in hours" :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
 					</div>
 					<div v-for="day in eventsPerDayAndHour" :key="day" class="day border-start" :style="{'grid-template-columns': 'repeat(' + day.lanes + ', 1fr)', 'grid-template-rows': 'repeat(' + (1440 / smallestTimeFrame) + ', 1fr)'}">
-						<a href="#" v-for="event in day.events" :key="event" class="small rounded overflow-hidden text-decoration-none text-dark" :style="{'grid-column-start': 1+(event.lane-1)*day.lanes/event.maxLane, 'grid-column-end': 1+event.lane*day.lanes/event.maxLane, 'grid-row-start': dateToMinutesOfDay(event.start), 'grid-row-end': dateToMinutesOfDay(event.end), '--test': dateToMinutesOfDay(event.end), background: event.orig.color}" @click.prevent="$emit('input', event.orig)">
-							{{event.orig.title}}
+						<a  href="#" :title="event.orig.title + ' - ' + event.orig.lehrfach_bez + ' [' + event.orig.ort_kurzbz+']'" v-for="event in day.events" :key="event" class="m-2 border border-dark border-2 small rounded overflow-hidden text-decoration-none text-dark" :style="{'grid-column-start': 1+(event.lane-1)*day.lanes/event.maxLane, 'grid-column-end': 1+event.lane*day.lanes/event.maxLane, 'grid-row-start': dateToMinutesOfDay(event.start), 'grid-row-end': dateToMinutesOfDay(event.end), '--test': dateToMinutesOfDay(event.end), background: event.orig.farbe}" @click.prevent="$emit('input', event.orig)">
+							<div class="d-flex flex-column align-items-center justify-content-evenly h-100">
+								<span>{{event.orig.title}}</span>	
+								<span>{{event.orig.ort_kurzbz}}</span>
+								<span>{{event.orig.mitarbeiter_kurzbz}}</span>
+							</div>
 						</a>
 					</div>
 				</div>

From 729509a45d7ef09ccf71e548a880f0c50e256641 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 23 May 2024 15:40:23 +0200
Subject: [PATCH 0730/1461] WIP

---
 .../components/Cis/Stundenplan.php            |  3 ++
 .../models/ressource/Stundenplan_model.php    | 14 +++++++-
 public/js/apps/Cis/RoomInformation.js         | 36 ++++++++++++++-----
 public/js/components/Calendar/Week/Page.js    | 16 +++++++--
 4 files changed, 57 insertions(+), 12 deletions(-)

diff --git a/application/controllers/components/Cis/Stundenplan.php b/application/controllers/components/Cis/Stundenplan.php
index 2ec001843..3ca8bbc2e 100755
--- a/application/controllers/components/Cis/Stundenplan.php
+++ b/application/controllers/components/Cis/Stundenplan.php
@@ -70,6 +70,9 @@ class Stundenplan extends Auth_Controller
 	{
 		$this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
 
+
+
+		
 		$result = $this->StundenplanModel->getRoomDataOnDay('EDV_A2.06','2024-05-21');
 		//echo($this->db->last_query());
 		echo json_encode($result);
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 4d0a7893b..b566b0325 100755
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -19,9 +19,21 @@ class Stundenplan_model extends DB_Model
 	 * @return stdClass
 	 */
 	public function getRoomDataOnDay($ort_kurzbz,$date){
+
+
+		$this->addSelect(['*',"CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) as eintrag","lektor","CONCAT(lehrfach,'-',lehrform)"]);
+		/* $this->addSelect(["lehre.tbl_stundenplan.*","CONCAT(UPPER(sg.typ),UPPER(sg.kurzbz),'-',lehre.tbl_stundenplan.semester,lehre.tbl_stundenplan.verband) as simml"]);
+		$this->addJoin("public.tbl_lehrverband as lv","lv.studiengang_kz=lehre.tbl_stundenplan.studiengang_kz AND lv.gruppe=lehre.tbl_stundenplan.gruppe AND lv.verband=lehre.tbl_stundenplan.verband AND lv.semester=lehre.tbl_stundenplan.semester","LEFT"); 
+		$this->addJoin("public.tbl_studiengang as sg","sg.studiengang_kz=lehre.tbl_stundenplan.studiengang_kz","LEFT"); 
 		$res = $this->loadWhere(['ort_kurzbz'=>$ort_kurzbz,'datum'=>$date]);
 		$res = hasData($res) ? getData($res): null;
-		return $res;
+		return $res; */
+		$this->db->where('ort_kurzbz','EDV_A2.06',true);
+		$this->db->where('datum','2024-05-21',true);
+
+		$query = $this->db->get_compiled_select('lehre.vw_stundenplan sp');
+		
+		return $this->execQuery($query, [$ort_kurzbz, $date]);
 	}
 
 	/**
diff --git a/public/js/apps/Cis/RoomInformation.js b/public/js/apps/Cis/RoomInformation.js
index 63587d2d1..adb571047 100644
--- a/public/js/apps/Cis/RoomInformation.js
+++ b/public/js/apps/Cis/RoomInformation.js
@@ -7,7 +7,8 @@ const app = Vue.createApp({
 	data() {
 		return {
 			stunden: [],
-			events: null
+			events: null,
+            testDate: new Date('2024-05-21'),
 		}
 	},
 	created() {
@@ -18,11 +19,33 @@ const app = Vue.createApp({
 				this.stunden[std.stunde] = std; // TODO(chris): geht besser
 			});
 			console.log("this are the loaded stunden", this.stunden)
+
+            axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/Cis/Stundenplan/RoomInformation').then(res => {
+                let events;
+                console.log(" this is the res of the api call room information",res);
+                if (res.data && res.data.forEach) {
+                    res.data.forEach((el, i) => {
+
+                        console.log(el,"this is the element that gets changed")
+                        el.id = i;
+                        el.color = '#' + (el.farbe || 'CCCCCC');
+                        el.start = new Date(el.datum + ' ' + this.stunden[el.stunde].beginn);
+                        el.end = new Date(el.datum + ' ' + this.stunden[el.stunde].ende);
+                        el.title = el.lehrfach;
+                        if (el.lehrform)
+                            el.title += '-' + el.lehrform;
+                    });
+                    events = res.data;
+                    //console.log("this are the room events",events)
+                    //this.events = events;
+                }
+            }).catch((e)=>{console.log(e,"this is the exception")})
 		});
 
         axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/Cis/Stundenplan').then(res => {
             
             let events;
+            console.log(" this is the res of the api call stundenplan",res);
             if (res.data.retval && res.data.retval.forEach) {
                 res.data.retval.forEach((el, i) => {
                     el.id = i;
@@ -34,18 +57,15 @@ const app = Vue.createApp({
                         el.title += '-' + el.lehrform;
                 });
                 events = res.data.retval;
+                console.log("this are the events of the stundenplan",events)
             }
 
-            console.log("this are the loaded events",events)
             // TODO(chris): do we need that
 
-        }).catch((e)=>{console.log(e,"this is the exception")})
+        }).catch((e)=>{console.log(e,"this is the exception")}) 
 
 
-        axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/Cis/Stundenplan/RoomInformation').then(res => {
-            console.log(res)
-        console.log("this string got printed after the get was successfully finished")
-        }).catch((e)=>{console.log(e,"this is the exception")})
+        
 
        
 
@@ -53,7 +73,7 @@ const app = Vue.createApp({
     template: /*html*/`
     <div>
     <!--initialDate="2023-5-12"-->
-        <fhc-calendar  :events="events" initial-mode="week" show-weeks></fhc-calendar>
+        <fhc-calendar :initialDate="testDate" :events="events" initial-mode="week" show-weeks></fhc-calendar>
     </div>
     `,
 });
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index 47d48b7f7..ce86f36bd 100755
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -28,7 +28,8 @@ export default {
 	},
 	computed: {
 		days() {
-			let tmpDate = new CalendarDate(this.year, 1, 1); // NOTE(chris): somewhere in the middle of the year
+			
+			let tmpDate = new CalendarDate(this.year,1,1); // NOTE(chris): somewhere in the middle of the year
 			tmpDate.w = this.week;
 			let startDay = tmpDate.firstDayOfWeek;
 			let result = [];
@@ -36,9 +37,11 @@ export default {
 				result.push(new Date(startDay.getFullYear(), startDay.getMonth(), startDay.getDate() + i));
 			}
 			return result;
+
 		},
 		eventsPerDayAndHour() {
 			const res = {};
+			console.log("this are the days",this.days)
 			this.days.forEach(day => {
 				let key = day.toDateString();
 				
@@ -46,6 +49,7 @@ export default {
 				nextDay.setDate(nextDay.getDate()+1);
 				nextDay.setMilliseconds(nextDay.getMilliseconds()-1);
 				let d = {events:[],lanes:1};
+				console.log("this are the events",this.events, "and this is the key",key)
 				if (this.events[key]) {
 					this.events[key].forEach(evt => {
 						let event = {orig:evt,lane:1,maxLane:1,start: evt.start < day ? day : evt.start, end: evt.end > nextDay ? nextDay : evt.end,shared:[],setSharedMaxRecursive(doneItems) {
@@ -75,6 +79,9 @@ export default {
 		}
 	},
 	methods: {
+		printTest:function(param){
+			console.log("HERE",param)
+		},
 		changeToMonth(day) {
 			if (!this.noMonthView) {
 				this.date.set(day);
@@ -91,6 +98,7 @@ export default {
 	},
 	template: `
 	<div class="fhc-calendar-week-page">
+	
 		<div class="d-flex flex-column border-top">
 			<div class="fhc-calendar-week-page-header border-2 border-bottom text-center d-flex">
 				<div v-for="day in days" :key="day" class="flex-grow-1" :title="day.toLocaleString(undefined, {dateStyle:'short'})">
@@ -104,8 +112,10 @@ export default {
 						<div v-for="hour in hours" :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
 					</div>
 					<div v-for="day in eventsPerDayAndHour" :key="day" class="day border-start" :style="{'grid-template-columns': 'repeat(' + day.lanes + ', 1fr)', 'grid-template-rows': 'repeat(' + (1440 / smallestTimeFrame) + ', 1fr)'}">
-						<a href="#" v-for="event in day.events" :key="event" class="small rounded overflow-hidden text-decoration-none text-dark" :style="{'grid-column-start': 1+(event.lane-1)*day.lanes/event.maxLane, 'grid-column-end': 1+event.lane*day.lanes/event.maxLane, 'grid-row-start': dateToMinutesOfDay(event.start), 'grid-row-end': dateToMinutesOfDay(event.end), '--test': dateToMinutesOfDay(event.end), background: event.orig.color}" @click.prevent="$emit('input', event.orig)">
-							{{event.orig.title}}
+						<span>test</span>
+					<a href="#" @click="printTest(event)" v-for="event in day.events" :key="event" class="small rounded overflow-hidden text-decoration-none text-dark" :style="{'grid-column-start': 1+(event.lane-1)*day.lanes/event.maxLane, 'grid-column-end': 1+event.lane*day.lanes/event.maxLane, 'grid-row-start': dateToMinutesOfDay(event.start), 'grid-row-end': dateToMinutesOfDay(event.end), '--test': dateToMinutesOfDay(event.end), background: event.orig.color}" @click.prevent="$emit('input', event.orig)">
+							
+							{{event.orig.title}}-->
 						</a>
 					</div>
 				</div>

From 0536ff0044e6688ff2aab843ef08a70479fcc925 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 23 May 2024 16:49:53 +0200
Subject: [PATCH 0731/1461] load person_id & uid for students to navigate them
 with admin view; WIP studentDropdown selection; WIP changing studentComponent
 to work with different permissions;

---
 system/phrasesupdate.php | 64 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 61 insertions(+), 3 deletions(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index fa4234f73..da6e62085 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -26300,9 +26300,67 @@ array(
 				'insertvon' => 'system'
 			)
 		)
-
-
-
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'studentConfig',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Studenten auswählen.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Configure student profile.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'studentLaden',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Student laden.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Load Student.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'students',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Studenten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Students',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// FHC-CORE-ANWESENHEITEN END
 );
 

From 234ec03db91f1e3d65627cb60fa4c3aea86180ef Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 24 May 2024 09:37:07 +0200
Subject: [PATCH 0732/1461] adds the phrase noGrade

---
 system/phrasesupdate.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index b2bef25ee..8c140ea63 100755
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -2263,6 +2263,26 @@ $phrases = array(
 	),
 
 	//****************	CORE/lehre
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'noGrades',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Unbewertet',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Not Graded',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'lehre',

From 16f90604b6ef94feea16ab60fa02e9e618ebfe13 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 24 May 2024 11:17:06 +0200
Subject: [PATCH 0733/1461] stundenplan modal for LVs and making calendar
 header sticky

---
 public/js/apps/Cis/Stundenplan.js             |  2 +
 public/js/components/Calendar/Calendar.js     |  2 +-
 .../js/components/Calendar/CalendarModal.js   | 43 +++++++++++++++++--
 public/js/components/Calendar/Pane.js         |  3 +-
 public/js/components/Calendar/Week/Page.js    |  6 +--
 5 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/public/js/apps/Cis/Stundenplan.js b/public/js/apps/Cis/Stundenplan.js
index eaa75bca3..25823b193 100755
--- a/public/js/apps/Cis/Stundenplan.js
+++ b/public/js/apps/Cis/Stundenplan.js
@@ -1,4 +1,5 @@
 import FhcCalendar from "../../components/Calendar/Calendar.js";
+import Phrasen from "../../plugin/Phrasen.js";
 
 const app = Vue.createApp({
 	components: {
@@ -50,4 +51,5 @@ const app = Vue.createApp({
 	}
 });
 app.config.unwrapInjectedRef = true;
+app.use(Phrasen);
 app.mount('#content');
\ No newline at end of file
diff --git a/public/js/components/Calendar/Calendar.js b/public/js/components/Calendar/Calendar.js
index ae36eab1f..2b4f7b8a3 100755
--- a/public/js/components/Calendar/Calendar.js
+++ b/public/js/components/Calendar/Calendar.js
@@ -106,7 +106,7 @@ export default {
 	methods: {
 		handleInput(day) {
 			// set the event when clicking on the lernveranstaltung in the data 
-			this.currentlySelectedEvent = day;
+			this.currentlySelectedEvent = day[1];
 			console.log(this.currentlySelectedEvent)
 			// showing the modal
 			Vue.nextTick(()=>{
diff --git a/public/js/components/Calendar/CalendarModal.js b/public/js/components/Calendar/CalendarModal.js
index f8bf57de6..5f6fd9d09 100644
--- a/public/js/components/Calendar/CalendarModal.js
+++ b/public/js/components/Calendar/CalendarModal.js
@@ -133,7 +133,16 @@ export default {
       }
     },
   },
-  computed: {},
+  computed: {
+    start_time: function(){
+      if(!this.data.start) return 'N/A';
+      return this.data.start.getHours() + ":" + this.data.start.getMinutes();
+    },
+    end_time: function(){
+      if(!this.data.end) return 'N/A';
+      return this.data.end.getHours() + ":" + this.data.end.getMinutes();
+    }
+  },
   created() {
     console.log("this is an test")
   },
@@ -145,11 +154,37 @@ export default {
   },
   template: /*html*/ `
   <bs-modal ref="modalContainer" v-bind="$props" body-class="" dialog-class="modal-lg" class="bootstrap-alert" backdrop="false" >
-
+    <template v-slot:title>
+      {{data.title + ' - ' + data.lehrfach_bez + ' [' + data.ort_kurzbz+']' }}  
+    </template>
     <template v-slot:default>
-        <p>{{JSON.stringify(data,null,2)}}</p>
+        <div class="row">
+        <div class="offset-3 col-4"><span>Datum:</span></div>
+        <div class=" col"><span>{{data.datum}}</span></div>
+        </div>
+        <div class="row">
+        <div class="offset-3 col-4"><span>Raum:</span></div>
+        <div class=" col"><span>{{data.ort_kurzbz}}</span></div>
+        </div>
+        <div class="row">
+        <div class="offset-3 col-4"><span>LV:</span></div>
+        <div class=" col"><span>{{'('+data.lehrform+') ' + data.lehrfach_bez}}</span></div>
+        </div>
+        <div class="row">
+        <div class="offset-3 col-4"><span>Lektor:</span></div>
+        <div class=" col"><span>{{data.lektor}}</span></div>
+        </div>
+        <div class="row">
+        <div class="offset-3 col-4"><span>Zeitraum:</span></div>
+        <div class=" col"><span>{{start_time + ' - ' + end_time}}</span></div>
+        </div>
     </template>
  
-    <!-- end of optional footer --> 
+     <!-- optional footer -->
+     <template  v-slot:footer >
+        
+     <button class="btn btn-outline-secondary " @click="hide">{{$p.t('ui','cancel')}}</button>    
+       </template>
+     <!-- end of optional footer --> 
   </bs-modal>`,
 };
diff --git a/public/js/components/Calendar/Pane.js b/public/js/components/Calendar/Pane.js
index bbc21af0c..8ff9b6259 100755
--- a/public/js/components/Calendar/Pane.js
+++ b/public/js/components/Calendar/Pane.js
@@ -46,7 +46,8 @@ export default {
 	},
 	template: `
 	<div ref="carousel" class="calendar-pane carousel slide" @[\`slid.bs.carousel\`]="slid" :data-queue="queue">
-		<div class="carousel-inner">
+		<!--height calc function just for user testing purpose (has to be fixed)-->
+		<div class="carousel-inner " style="height:calc(100vh - 220px); overflow:scroll">
 			<div v-for="i in [...Array(3).keys()]" :key="i" class="carousel-item">
 				<slot :index="i" :offset="offsets[i]" />
 			</div>
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index 799b0ca70..31de1a862 100755
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -92,19 +92,19 @@ export default {
 	template: `
 	<div class="fhc-calendar-week-page">
 		<div class="d-flex flex-column border-top">
-			<div class="fhc-calendar-week-page-header border-2 border-bottom text-center d-flex">
+			<div style="position:sticky; top:10px; z-index:1020;" class="fhc-calendar-week-page-header border-2 border-bottom text-center d-flex">
 				<div v-for="day in days" :key="day" class="flex-grow-1" :title="day.toLocaleString(undefined, {dateStyle:'short'})">
 					<div class="fw-bold">{{day.toLocaleString(undefined, {weekday: size < 2 ? 'narrow' : (size < 3 ? 'short' : 'long')})}}</div>
 					<a href="#" class="small text-secondary text-decoration-none" @click.prevent="changeToMonth(day)">{{day.toLocaleString(undefined, [{day:'numeric',month:'numeric'},{day:'numeric',month:'numeric'},{day:'numeric',month:'numeric'},{dateStyle:'short'}][this.size])}}</a>
 				</div>
 			</div>
-			<div ref="eventcontainer" class="flex-grow-1 overflow-auto">
+			<div ref="eventcontainer" class="flex-grow-1">
 				<div class="events">
 					<div class="hours">
 						<div v-for="hour in hours" :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
 					</div>
 					<div v-for="day in eventsPerDayAndHour" :key="day" class="day border-start" :style="{'grid-template-columns': 'repeat(' + day.lanes + ', 1fr)', 'grid-template-rows': 'repeat(' + (1440 / smallestTimeFrame) + ', 1fr)'}">
-						<a  href="#" :title="event.orig.title + ' - ' + event.orig.lehrfach_bez + ' [' + event.orig.ort_kurzbz+']'" v-for="event in day.events" :key="event" class="m-2 border border-dark border-2 small rounded overflow-hidden text-decoration-none text-dark" :style="{'grid-column-start': 1+(event.lane-1)*day.lanes/event.maxLane, 'grid-column-end': 1+event.lane*day.lanes/event.maxLane, 'grid-row-start': dateToMinutesOfDay(event.start), 'grid-row-end': dateToMinutesOfDay(event.end), '--test': dateToMinutesOfDay(event.end), background: event.orig.farbe}" @click.prevent="$emit('input', event.orig)">
+						<a  href="#" :title="event.orig.title + ' - ' + event.orig.lehrfach_bez + ' [' + event.orig.ort_kurzbz+']'" v-for="event in day.events" :key="event" class="mx-2 border border-dark border-2 small rounded overflow-hidden text-decoration-none text-dark" :style="{'grid-column-start': 1+(event.lane-1)*day.lanes/event.maxLane, 'grid-column-end': 1+event.lane*day.lanes/event.maxLane, 'grid-row-start': dateToMinutesOfDay(event.start), 'grid-row-end': dateToMinutesOfDay(event.end), 'background': event.orig.farbe?event.orig.farbe:'white' ,'--test': dateToMinutesOfDay(event.end)}" @click.prevent="$emit('input', event.orig)">
 							<div class="d-flex flex-column align-items-center justify-content-evenly h-100">
 								<span>{{event.orig.title}}</span>	
 								<span>{{event.orig.ort_kurzbz}}</span>

From 3d1f81a7213636c3e855cf9afccdd5f26aee1125 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 27 May 2024 08:53:18 +0200
Subject: [PATCH 0734/1461] address: code quality

---
 .../Details/Kontakt/Address.js                | 260 +++++++++---------
 1 file changed, 129 insertions(+), 131 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
index 1e7423fd9..8f6cd9888 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
@@ -291,128 +291,129 @@ export default{
 			})
 			.catch(this.$fhcAlert.handleSystemError)
 	},
+	// TODO(chris): use Form Component
 	template: `
-		<div class="stv-list h-100 pt-3">
+	<div class="stv-details-kontakt-address h-100 pt-3">
 		
 		<!--Modal: Add Address-->
-		<BsModal ref="newAdressModal">
+		<bs-modal ref="newAdressModal">
 			<template #title>{{$p.t('person', 'adresse_new')}}</template>
-				<form class="row g-3" ref="addressData">
-					<div class="row mb-3">
-						<label for="adressentyp" class="form-label col-sm-4">{{$p.t('global', 'typ')}}</label>
-						<div class="col-sm-6">
-							<select id="adressentyp" class="form-select" v-model="addressData.typ">
-								<option v-for="typ in adressentypen" :key="typ.adressentyp_kurzbz" :value="typ.adressentyp_kurzbz" >{{typ.bezeichnung}}</option>
-							</select>
-						</div>
+			<form class="row g-3" ref="addressData">
+				<div class="row mb-3">
+					<label for="adressentyp" class="form-label col-sm-4">{{$p.t('global', 'typ')}}</label>
+					<div class="col-sm-6">
+						<select id="adressentyp" class="form-select" v-model="addressData.typ">
+							<option v-for="typ in adressentypen" :key="typ.adressentyp_kurzbz" :value="typ.adressentyp_kurzbz" >{{typ.bezeichnung}}</option>
+						</select>
 					</div>
-					<div class="row mb-3">
-						<label for="strasse" class="form-label col-sm-4">{{$p.t('person', 'strasse')}}</label>
-						<div class="col-sm-6">
-							<input type="text" class="form-control" id="strasse" v-model="addressData['strasse']">
-						</div>
-					</div>
-						
-					<div class="row mb-3">
-						<label for="nation" class="form-label col-sm-4">{{$p.t('person', 'nation')}}</label>
-						<div class="col-sm-6">
-							<select id="nation" class="form-select" v-model="addressData.nation">
-								<option v-for="nation in nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
-							</select>
-						</div>
-					</div>
-										
-					<div class="row mb-3">
-						<label for="plz" class="required form-label col-sm-4" >{{$p.t('person', 'plz')}}</label>
-						 <div class="col-sm-6">
-							<input type="text" class="form-control" required v-model="addressData['plz']" @input="loadPlaces" >
-						</div>
+				</div>
+				<div class="row mb-3">
+					<label for="strasse" class="form-label col-sm-4">{{$p.t('person', 'strasse')}}</label>
+					<div class="col-sm-6">
+						<input type="text" class="form-control" id="strasse" v-model="addressData['strasse']">
 					</div>
+				</div>
 					
-					<div class="row mb-3">
-						<label for="gemeinde" class="form-label col-sm-4">{{$p.t('person', 'gemeinde')}}</label>
-							<div class="col-sm-6">
-								<select v-if="addressData['nation'] == 'A'" name="addressData[gemeinde]" class="form-select" v-model="addressData['gemeinde']">
-									<option v-if="!gemeinden.length" disabled>Bitte gültige PLZ wählen</option>
-									<option v-for="gemeinde in gemeinden" :key="gemeinde.name" :value="gemeinde.name">{{gemeinde.name}}</option>
-								</select>
-								<input v-else type="text" class="form-control" v-model="addressData['gemeinde']">
-							</div>
+				<div class="row mb-3">
+					<label for="nation" class="form-label col-sm-4">{{$p.t('person', 'nation')}}</label>
+					<div class="col-sm-6">
+						<select id="nation" class="form-select" v-model="addressData.nation">
+							<option v-for="nation in nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
+						</select>
 					</div>
+				</div>
+									
+				<div class="row mb-3">
+					<label for="plz" class="required form-label col-sm-4" >{{$p.t('person', 'plz')}}</label>
+					 <div class="col-sm-6">
+						<input type="text" class="form-control" required v-model="addressData['plz']" @input="loadPlaces" >
+					</div>
+				</div>
+				
+				<div class="row mb-3">
+					<label for="gemeinde" class="form-label col-sm-4">{{$p.t('person', 'gemeinde')}}</label>
+					<div class="col-sm-6">
+						<select v-if="addressData['nation'] == 'A'" name="addressData[gemeinde]" class="form-select" v-model="addressData['gemeinde']">
+							<option v-if="!gemeinden.length" disabled>Bitte gültige PLZ wählen</option>
+							<option v-for="gemeinde in gemeinden" :key="gemeinde.name" :value="gemeinde.name">{{gemeinde.name}}</option>
+						</select>
+						<input v-else type="text" class="form-control" v-model="addressData['gemeinde']">
+					</div>
+				</div>
+				
+				<div class="row mb-3">
+					<label for="Ort" class="form-label col-sm-4">{{$p.t('person', 'ort')}}</label>
+					<div class="col-sm-6">
+						<select v-if="addressData['nation'] == 'A'" name="address[ort]" class="form-select" v-model="addressData['ort']">
+							<option v-if="!orte.length" disabled>Bitte gültige Gemeinde wählen</option>
+							<option v-for="ort in orte" :key="ort.ortschaftsname" :value="ort.ortschaftsname">{{ort.ortschaftsname}}</option>
+						</select>
+						<input v-else type="text" name="ort" class="form-control" v-model="addressData['ort']">
+					</div>
+				</div>
+									
+				<div class="row mb-3">
+					<label for="heimatadresse" class="form-label col-sm-4">{{$p.t('person', 'heimatadresse')}}</label>
+					<div class="col-sm-3">
+						<div class="form-check">
+							<input id="heimatadresse" type="checkbox" class="form-check-input" value="1" v-model="addressData['heimatadresse']">
+						</div>
+					</div>
+				</div>
 					
-					<div class="row mb-3">
-							<label for="Ort" class="form-label col-sm-4">{{$p.t('person', 'ort')}}</label>
-							<div class="col-sm-6">
-								<select v-if="addressData['nation'] == 'A'" name="address[ort]" class="form-select" v-model="addressData['ort']">
-									<option v-if="!orte.length" disabled>Bitte gültige Gemeinde wählen</option>
-									<option v-for="ort in orte" :key="ort.ortschaftsname" :value="ort.ortschaftsname">{{ort.ortschaftsname}}</option>
-								</select>
-								<input v-else type="text" name="ort" class="form-control" v-model="addressData['ort']">
-							</div>
-					</div>
-										
-					<div class="row mb-3">
-						<label for="heimatadresse" class="form-label col-sm-4">{{$p.t('person', 'heimatadresse')}}</label>
-						<div class="col-sm-3">
-							<div class="form-check">
-								<input id="heimatadresse" type="checkbox" class="form-check-input" value="1" v-model="addressData['heimatadresse']">
-							</div>
+				<div class="row mb-3">
+					<label for="zustelladresse" class="form-label col-sm-4">{{$p.t('person', 'zustelladresse')}}</label>
+					<div class="col-sm-3">
+						<div class="form-check">
+							<input id="zustelladresse" type="checkbox" class="form-check-input" value="1" v-model="addressData['zustelladresse']">
 						</div>
 					</div>
-						
-					<div class="row mb-3">
-						<label for="zustelladresse" class="form-label col-sm-4">{{$p.t('person', 'zustelladresse')}}</label>
-						<div class="col-sm-3">
-							<div class="form-check">
-								<input id="zustelladresse" type="checkbox" class="form-check-input" value="1" v-model="addressData['zustelladresse']">
-							</div>
+				</div>
+				
+				<div class="row mb-3">
+					<label for="co_name" class="form-label col-sm-4">{{$p.t('person', 'co_name')}}</label>
+					<div class="col-sm-6">
+						<input type="text" id="co_name" class="form-control" v-model="addressData['co_name']">
+					</div>
+				</div>
+				
+				<div class="row mb-3">
+					<label for="rechnungsadresse" class="form-label col-sm-4">{{$p.t('person', 'rechnungsadresse')}}</label>
+					<div class="col-sm-3">
+						<div class="form-check">
+							<input id="rechnungsadresse" type="checkbox" class="form-check-input" v-model="addressData['rechnungsadresse']">
 						</div>
 					</div>
-					
-					<div class="row mb-3">
-							<label for="co_name" class="form-label col-sm-4">{{$p.t('person', 'co_name')}}</label>
-						<div class="col-sm-6">
-							<input type="text" id="co_name" class="form-control" v-model="addressData['co_name']">
-						</div>
+				</div>
+				
+				<div class="row mb-3">
+					<label for="firma_name" class="form-label col-sm-4">{{$p.t('person', 'firma')}}</label>
+					<div class="col-sm-3">
+						<PvAutoComplete v-model="addressData['firma']"  optionLabel="name" :suggestions="filteredFirmen" @complete="search" :min-length="3"/>
 					</div>
-					
-					<div class="row mb-3">
-						<label for="rechnungsadresse" class="form-label col-sm-4">{{$p.t('person', 'rechnungsadresse')}}</label>
-						<div class="col-sm-3">
-							<div class="form-check">
-								<input id="rechnungsadresse" type="checkbox" class="form-check-input" v-model="addressData['rechnungsadresse']">
-							</div>
-						</div>
+				</div>
+				
+				<div class="row mb-3">
+					<label for="name" class="form-label col-sm-4">{{$p.t('person', 'firma_zusatz')}}</label>
+					<div class="col-sm-6">
+						<input type="text" class="form-control" id="name" v-model="addressData['name']">
 					</div>
-					
-					<div class="row mb-3">
-						<label for="firma_name" class="form-label col-sm-4">{{$p.t('person', 'firma')}}</label>
-							<div class="col-sm-3">
-							 	<PvAutoComplete v-model="addressData['firma']"  optionLabel="name" :suggestions="filteredFirmen" @complete="search" :min-length="3"/>
-							</div>
-					</div>
-					
-					<div class="row mb-3">
-						<label for="name" class="form-label col-sm-4">{{$p.t('person', 'firma_zusatz')}}</label>
-						<div class="col-sm-6">
-							<input type="text" class="form-control" id="name" v-model="addressData['name']">
-						</div>
-					</div>
-					<div class="row mb-3">
-						<label for="anmerkung" class="form-label col-sm-4">{{$p.t('global', 'anmerkung')}}</label>
-						<div class="col-sm-6">
-							<input type="text" class="form-control" id="anmerkung" v-model="addressData['anmerkung']">
-						</div>
+				</div>
+				<div class="row mb-3">
+					<label for="anmerkung" class="form-label col-sm-4">{{$p.t('global', 'anmerkung')}}</label>
+					<div class="col-sm-6">
+						<input type="text" class="form-control" id="anmerkung" v-model="addressData['anmerkung']">
 					</div>
+				</div>
 			</form>
 			<template #footer>
 				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{$p.t('ui', 'abbrechen')}}</button>
 				<button type="button" class="btn btn-primary" @click="addNewAddress()">OK</button>
             </template>
-		</BsModal>
+		</bs-modal>
 		
 		<!--Modal: Edit Address-->
-		<BsModal ref="editAdressModal">
+		<bs-modal ref="editAdressModal">
 			<template #title>{{$p.t('person', 'adresse_edit')}}</template>
 			<form class="row g-3" ref="addressData">
 				<div class="row mb-3">
@@ -448,28 +449,28 @@ export default{
 				</div>
 				<div class="row mb-3">
 					<label for="gemeinde" class="form-label col-sm-4">{{$p.t('person', 'gemeinde')}}</label>
-						<div v-if="addressData['gemeinde']" class="col-sm-6">
-							<input type="text" class="form-control" v-model="addressData['gemeinde']">
-						</div>
-						<div v-else class="col-sm-6">
-							<select v-if="addressData['nation'] == 'A'" name="addressData[gemeinde]" class="form-select" v-model="addressData['gemeinde']">
-								<option v-if="!gemeinden.length" disabled>{{$p.t('person', 'plz_waehlen')}}</option>
-								<option v-for="gemeinde in gemeinden" :key="gemeinde.name" :value="gemeinde.name">{{gemeinde.name}}</option>
-							</select>
-						</div>
+					<div v-if="addressData['gemeinde']" class="col-sm-6">
+						<input type="text" class="form-control" v-model="addressData['gemeinde']">
+					</div>
+					<div v-else class="col-sm-6">
+						<select v-if="addressData['nation'] == 'A'" name="addressData[gemeinde]" class="form-select" v-model="addressData['gemeinde']">
+							<option v-if="!gemeinden.length" disabled>{{$p.t('person', 'plz_waehlen')}}</option>
+							<option v-for="gemeinde in gemeinden" :key="gemeinde.name" :value="gemeinde.name">{{gemeinde.name}}</option>
+						</select>
+					</div>
 				</div>
 		
 				<div class="row mb-3">
-						<label for="Ort" class="form-label col-sm-4">{{$p.t('person', 'ort')}}</label>
-						<div v-if="addressData['ort']" class="col-sm-6">
-							<input type="text" name="ort" class="form-control" v-model="addressData['ort']">
-						</div>
-						<div v-else class="col-sm-6">
-							<select v-if="addressData['nation'] == 'A'" name="address[ort]" class="form-select" v-model="addressData['ort']">
-								<option v-if="!orte.length" disabled>{{$p.t('person', 'gemeinde_waehlen')}}</option>
-								<option v-for="ort in orte" :key="ort.ortschaftsname" :value="ort.ortschaftsname">{{ort.ortschaftsname}}</option>
-							</select>
-						</div>
+					<label for="Ort" class="form-label col-sm-4">{{$p.t('person', 'ort')}}</label>
+					<div v-if="addressData['ort']" class="col-sm-6">
+						<input type="text" name="ort" class="form-control" v-model="addressData['ort']">
+					</div>
+					<div v-else class="col-sm-6">
+						<select v-if="addressData['nation'] == 'A'" name="address[ort]" class="form-select" v-model="addressData['ort']">
+							<option v-if="!orte.length" disabled>{{$p.t('person', 'gemeinde_waehlen')}}</option>
+							<option v-for="ort in orte" :key="ort.ortschaftsname" :value="ort.ortschaftsname">{{ort.ortschaftsname}}</option>
+						</select>
+					</div>
 				</div>
 								
 				<div class="row mb-3">
@@ -508,12 +509,12 @@ export default{
 				
 				<div class="row mb-3">
 					<label for="firma_name" class="form-label col-sm-4">{{$p.t('person', 'firma')}}</label>
-						<div v-if="addressData.firmenname" class="col-sm-6">
-							<input type="text" class="form-control" id="name" v-model="addressData.firmenname">
-						</div>
-						<div v-else class="col-sm-6">
-							<PvAutoComplete v-model="addressData['firma']" optionLabel="name" :suggestions="filteredFirmen" @complete="search" :min-length="3"/>
-						</div>
+					<div v-if="addressData.firmenname" class="col-sm-6">
+						<input type="text" class="form-control" id="name" v-model="addressData.firmenname">
+					</div>
+					<div v-else class="col-sm-6">
+						<PvAutoComplete v-model="addressData['firma']" optionLabel="name" :suggestions="filteredFirmen" @complete="search" :min-length="3"/>
+					</div>
 				</div>
 				
 				<div class="row mb-3">
@@ -539,10 +540,10 @@ export default{
 				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">{{$p.t('ui', 'abbrechen')}}</button>
 				<button ref="Close" type="button" class="btn btn-primary" @click="updateAddress(addressData.adresse_id)">OK</button>
             </template>
-		</BsModal>
+		</bs-modal>
 		
 		<!--Modal: deleteAdressModal-->
-		<BsModal ref="deleteAdressModal">
+		<bs-modal ref="deleteAdressModal">
 			<template #title>{{$p.t('person', 'adresse_delete')}}</template>
 			<template #default>
 				<p>{{$p.t('person', 'adresse_confirm_delete')}}</p>
@@ -551,7 +552,7 @@ export default{
 				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">{{$p.t('ui', 'abbrechen')}}</button>
 				<button ref="Close" type="button" class="btn btn-primary" @click="deleteAddress(addressData.adresse_id)">OK</button>
 			</template>
-		</BsModal>
+		</bs-modal>
 			
 		<core-filter-cmpt
 			ref="table"
@@ -564,10 +565,7 @@ export default{
 			new-btn-label="Adresse"
 			@click:new="actionNewAdress"
 			>
-				<button v-if="reload" class="btn btn-outline-warning" aria-label="Reload">
-					<span class="fa-solid fa-rotate-right" aria-hidden="true"></span>
-				</button>
 		</core-filter-cmpt>
-		</div>`
+	</div>`
 };
 

From 69abf1e9e25799deb0ba30ec05d27ffa31bbaf91 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 27 May 2024 11:50:17 +0200
Subject: [PATCH 0735/1461] Comment

---
 application/controllers/components/stv/Students.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/controllers/components/stv/Students.php b/application/controllers/components/stv/Students.php
index e4ba9befd..59b2c2970 100644
--- a/application/controllers/components/stv/Students.php
+++ b/application/controllers/components/stv/Students.php
@@ -3,6 +3,7 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 // TODO(chris): Prestudent status missing
+// TODO(chris): Prestudent studiengang missing
 
 class Students extends FHC_Controller
 {

From 5021c47c9fe630f93007601cde60d6880879cb5b Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 27 May 2024 12:20:58 +0200
Subject: [PATCH 0736/1461] calendar style changes

---
 public/css/components/calendar.css         | 10 +++++-----
 public/js/components/Calendar/Calendar.js  | 11 ++++++++++-
 public/js/components/Calendar/Week.js      |  4 +++-
 public/js/components/Calendar/Week/Page.js | 10 +++-------
 4 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index e753480d5..3bd0b1f15 100755
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -31,16 +31,16 @@
 }
 
 .fhc-calendar-week .carousel-item {
-  padding: 0.75em;
+  /*padding: 0.75em;*/
 }
 
 .fhc-calendar-week-page {
-  aspect-ratio: 7/6;
+  /*aspect-ratio: 7/6;*/
   min-height: 0;
 }
 .fhc-calendar-week-page > div {
-  transform: translate(-0.75em, -0.75em);
-  width: calc(100% + 1.5em);
+  /*transform: translate(-0.75em, -0.75em);*/
+  /*width: calc(100% + 1.5em);*/
   height: calc(100% + 1.5em);
 }
 .fhc-calendar-week-page > div > div {
@@ -50,7 +50,7 @@
   display: grid;
   grid-template-columns: 3em repeat(7, 1fr);
   margin-left: -3em;
-  min-height: 266.6666666667%;
+  /*min-height: 266.6666666667%;*/
   background-image: linear-gradient(#f8f9fa calc(100% / 24 - .5px), #dee2e6 calc(100% / 24 - .5px), #dee2e6 calc(100% / 24 + .5px), #f8f9fa calc(100% / 24 + .5px), #f8f9fa calc(200% / 24 - .5px), #dee2e6 calc(200% / 24 - .5px), #dee2e6 calc(200% / 24 + .5px), #f8f9fa calc(200% / 24 + .5px), #f8f9fa calc(300% / 24 - .5px), #dee2e6 calc(300% / 24 - .5px), #dee2e6 calc(300% / 24 + .5px), #f8f9fa calc(300% / 24 + .5px), #f8f9fa calc(400% / 24 - .5px), #dee2e6 calc(400% / 24 - .5px), #dee2e6 calc(400% / 24 + .5px), #f8f9fa calc(400% / 24 + .5px), #f8f9fa calc(500% / 24 - .5px), #dee2e6 calc(500% / 24 - .5px), #dee2e6 calc(500% / 24 + .5px), #f8f9fa calc(500% / 24 + .5px), #f8f9fa calc(600% / 24 - .5px), #dee2e6 calc(600% / 24 - .5px), #dee2e6 calc(600% / 24 + .5px), #f8f9fa calc(600% / 24 + .5px), #f8f9fa calc(700% / 24 - .5px), #dee2e6 calc(700% / 24 - .5px), #dee2e6 calc(700% / 24 + .5px), #f8f9fa calc(700% / 24 + .5px), #f8f9fa calc(800% / 24 - .5px), #dee2e6 calc(800% / 24 - .5px), #dee2e6 calc(800% / 24 + .5px), #fff calc(800% / 24 + .5px), #fff calc(900% / 24 - .5px), #dee2e6 calc(900% / 24 - .5px), #dee2e6 calc(900% / 24 + .5px), #fff calc(900% / 24 + .5px), #fff calc(1000% / 24 - .5px), #dee2e6 calc(1000% / 24 - .5px), #dee2e6 calc(1000% / 24 + .5px), #fff calc(1000% / 24 + .5px), #fff calc(1100% / 24 - .5px), #dee2e6 calc(1100% / 24 - .5px), #dee2e6 calc(1100% / 24 + .5px), #fff calc(1100% / 24 + .5px), #fff calc(1200% / 24 - .5px), #dee2e6 calc(1200% / 24 - .5px), #dee2e6 calc(1200% / 24 + .5px), #fff calc(1200% / 24 + .5px), #fff calc(1300% / 24 - .5px), #dee2e6 calc(1300% / 24 - .5px), #dee2e6 calc(1300% / 24 + .5px), #fff calc(1300% / 24 + .5px), #fff calc(1400% / 24 - .5px), #dee2e6 calc(1400% / 24 - .5px), #dee2e6 calc(1400% / 24 + .5px), #fff calc(1400% / 24 + .5px), #fff calc(1500% / 24 - .5px), #dee2e6 calc(1500% / 24 - .5px), #dee2e6 calc(1500% / 24 + .5px), #fff calc(1500% / 24 + .5px), #fff calc(1600% / 24 - .5px), #dee2e6 calc(1600% / 24 - .5px), #dee2e6 calc(1600% / 24 + .5px), #fff calc(1600% / 24 + .5px), #fff calc(1700% / 24 - .5px), #dee2e6 calc(1700% / 24 - .5px), #dee2e6 calc(1700% / 24 + .5px), #f8f9fa calc(1700% / 24 + .5px), #f8f9fa calc(1800% / 24 - .5px), #dee2e6 calc(1800% / 24 - .5px), #dee2e6 calc(1800% / 24 + .5px), #f8f9fa calc(1800% / 24 + .5px), #f8f9fa calc(1900% / 24 - .5px), #dee2e6 calc(1900% / 24 - .5px), #dee2e6 calc(1900% / 24 + .5px), #f8f9fa calc(1900% / 24 + .5px), #f8f9fa calc(2000% / 24 - .5px), #dee2e6 calc(2000% / 24 - .5px), #dee2e6 calc(2000% / 24 + .5px), #f8f9fa calc(2000% / 24 + .5px), #f8f9fa calc(2100% / 24 - .5px), #dee2e6 calc(2100% / 24 - .5px), #dee2e6 calc(2100% / 24 + .5px), #f8f9fa calc(2100% / 24 + .5px), #f8f9fa calc(2200% / 24 - .5px), #dee2e6 calc(2200% / 24 - .5px), #dee2e6 calc(2200% / 24 + .5px), #f8f9fa calc(2200% / 24 + .5px), #f8f9fa calc(2300% / 24 - .5px), #dee2e6 calc(2300% / 24 - .5px), #dee2e6 calc(2300% / 24 + .5px), #f8f9fa calc(2300% / 24 + .5px));
 }
 .fhc-calendar-week-page .events .day {
diff --git a/public/js/components/Calendar/Calendar.js b/public/js/components/Calendar/Calendar.js
index 2b4f7b8a3..4ce70911e 100755
--- a/public/js/components/Calendar/Calendar.js
+++ b/public/js/components/Calendar/Calendar.js
@@ -148,6 +148,15 @@ export default {
 	template: `
 	<div ref="container" class="fhc-calendar card" :class="sizeClass">
 		<calendar-modal v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ref="calendarModal"  />
-		<component :is="'calendar-' + mode" @update:mode="mode=$event" @change:range="$emit('change:range',$event)" @input="handleInput" />
+		<component v-slot="{event}" :is="'calendar-' + mode" @update:mode="mode=$event" @change:range="$emit('change:range',$event)" @input="handleInput" >
+			<!--Week Page layout-->
+			<slot :event="event">
+				<div class="d-flex flex-column align-items-center justify-content-evenly h-100">
+					<span>{{event.orig.title}}</span>	
+					<span>{{event.orig.ort_kurzbz}}</span>
+					<span>{{event.orig.mitarbeiter_kurzbz}}</span>
+				</div>
+			</slot>
+		</component>
 	</div>`
 }
diff --git a/public/js/components/Calendar/Week.js b/public/js/components/Calendar/Week.js
index ca91382f5..b4ec09e52 100755
--- a/public/js/components/Calendar/Week.js
+++ b/public/js/components/Calendar/Week.js
@@ -42,7 +42,9 @@ export default {
 	<div class="fhc-calendar-week">
 		<calendar-header :title="title" @prev="prev" @next="next" @click="$emit('update:mode', 'weeks')" />
 		<calendar-pane ref="pane" v-slot="slot" @slid="paneChanged">
-			<calendar-week-page :year="focusDate.y" :week="focusDate.w+slot.offset" @update:mode="$emit('update:mode', $event)" @page:back="prev" @page:forward="next" @input="selectEvent" />
+			<calendar-week-page v-slot="{event}" :year="focusDate.y" :week="focusDate.w+slot.offset" @update:mode="$emit('update:mode', $event)" @page:back="prev" @page:forward="next" @input="selectEvent" >
+				<slot :event="event" ></slot>
+			</calendar-week-page>
 		</calendar-pane>
 	</div>`
 }
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index 31de1a862..7a81fe476 100755
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -92,7 +92,7 @@ export default {
 	template: `
 	<div class="fhc-calendar-week-page">
 		<div class="d-flex flex-column border-top">
-			<div style="position:sticky; top:10px; z-index:1020;" class="fhc-calendar-week-page-header border-2 border-bottom text-center d-flex">
+			<div class="fhc-calendar-week-page-header border-2 border-bottom text-center d-flex" style="position:sticky; top:0; z-index:1020;" >
 				<div v-for="day in days" :key="day" class="flex-grow-1" :title="day.toLocaleString(undefined, {dateStyle:'short'})">
 					<div class="fw-bold">{{day.toLocaleString(undefined, {weekday: size < 2 ? 'narrow' : (size < 3 ? 'short' : 'long')})}}</div>
 					<a href="#" class="small text-secondary text-decoration-none" @click.prevent="changeToMonth(day)">{{day.toLocaleString(undefined, [{day:'numeric',month:'numeric'},{day:'numeric',month:'numeric'},{day:'numeric',month:'numeric'},{dateStyle:'short'}][this.size])}}</a>
@@ -101,15 +101,11 @@ export default {
 			<div ref="eventcontainer" class="flex-grow-1">
 				<div class="events">
 					<div class="hours">
-						<div v-for="hour in hours" :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
+						<div v-for="hour in hours" style="min-height:100px" :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
 					</div>
 					<div v-for="day in eventsPerDayAndHour" :key="day" class="day border-start" :style="{'grid-template-columns': 'repeat(' + day.lanes + ', 1fr)', 'grid-template-rows': 'repeat(' + (1440 / smallestTimeFrame) + ', 1fr)'}">
 						<a  href="#" :title="event.orig.title + ' - ' + event.orig.lehrfach_bez + ' [' + event.orig.ort_kurzbz+']'" v-for="event in day.events" :key="event" class="mx-2 border border-dark border-2 small rounded overflow-hidden text-decoration-none text-dark" :style="{'grid-column-start': 1+(event.lane-1)*day.lanes/event.maxLane, 'grid-column-end': 1+event.lane*day.lanes/event.maxLane, 'grid-row-start': dateToMinutesOfDay(event.start), 'grid-row-end': dateToMinutesOfDay(event.end), 'background': event.orig.farbe?event.orig.farbe:'white' ,'--test': dateToMinutesOfDay(event.end)}" @click.prevent="$emit('input', event.orig)">
-							<div class="d-flex flex-column align-items-center justify-content-evenly h-100">
-								<span>{{event.orig.title}}</span>	
-								<span>{{event.orig.ort_kurzbz}}</span>
-								<span>{{event.orig.mitarbeiter_kurzbz}}</span>
-							</div>
+							<slot :event="event" />
 						</a>
 					</div>
 				</div>

From d5e82279180bc10afbde10793097fbea19728e6f Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 27 May 2024 12:45:10 +0200
Subject: [PATCH 0737/1461] Bugfix: api/frontend/fas controller do not inherit
 from FHCAPI_Controller

---
 .../controllers/api/frontend/fas/studstatus/Wiederholung.php  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/application/controllers/api/frontend/fas/studstatus/Wiederholung.php b/application/controllers/api/frontend/fas/studstatus/Wiederholung.php
index c6e5a4fa9..19ace3d0d 100644
--- a/application/controllers/api/frontend/fas/studstatus/Wiederholung.php
+++ b/application/controllers/api/frontend/fas/studstatus/Wiederholung.php
@@ -63,7 +63,9 @@ class Wiederholung extends Auth_Controller
 
 
 		$result = $this->antraglib->getLvsForPrestudent($prestudent_id, $sem_akt);
-		$lvs = $this->getDataOrTerminateWithError($result) ?: [];
+		if (isError($result))
+			return $result;
+		$lvs = $result->retval;
 
 		$rdf_url = 'http://www.technikum-wien.at/antragnote';
 

From 259a3c218a6ef8e468c018c60a3c862141abe331 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 27 May 2024 14:57:18 +0200
Subject: [PATCH 0738/1461] Funktionalitaet feature-39602

---
 .../controllers/Studentenverwaltung.php       |  4 +-
 .../api/frontend/v1/stv/Status.php            |  3 +-
 application/models/crm/Prestudent_model.php   |  4 +-
 .../js/components/Stv/Studentenverwaltung.js  |  1 +
 .../Details/Prestudent/MultiStatus.js         | 27 ++++++++++++-
 system/phrasesupdate.php                      | 40 +++++++++++++++++++
 6 files changed, 72 insertions(+), 7 deletions(-)

diff --git a/application/controllers/Studentenverwaltung.php b/application/controllers/Studentenverwaltung.php
index 0c27f3aba..75faf2cba 100644
--- a/application/controllers/Studentenverwaltung.php
+++ b/application/controllers/Studentenverwaltung.php
@@ -26,8 +26,8 @@ class Studentenverwaltung extends FHC_Controller
 				'assistenz_stgs' => $this->permissionlib->getSTG_isEntitledFor('assistenz'),
 				'admin' => $this->permissionlib->isBerechtigt('admin'),
 				'assistenz_schreibrechte' => $this->permissionlib->isBerechtigt('assistenz','suid'),
-				'student/keine_studstatuspruefung' => $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung')
-
+				'student/keine_studstatuspruefung' => $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung'),
+				'lehre/reihungstestAufsicht' => $this->permissionlib->isBerechtigt('lehre/reihungstestAufsicht')
 			],
 			'variables' => [
 				'semester_aktuell' => $this->variablelib->getVar('semester_aktuell')
diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 768e8e196..f85780141 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -484,8 +484,9 @@ class Status extends FHCAPI_Controller
 
 		$isBerechtigtAdmin = $this->permissionlib->isBerechtigt('admin', null, 'suid');
 		$isBerechtigtNoStudstatusCheck = $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung', null, 'suid');
+		$isBerechtigtToDeleteAbgewiesen = $this->permissionlib->isBerechtigt('lehre/reihungstestAufsicht') && $status_kurzbz == "Abgewiesener";
 
-		if(!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg))
+		if(!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg) && !$isBerechtigtToDeleteAbgewiesen)
 		{
 			return $this->terminateWithError($this->p->t('lehre','error_keineSchreibrechte'), self::ERROR_TYPE_GENERAL);
 		}
diff --git a/application/models/crm/Prestudent_model.php b/application/models/crm/Prestudent_model.php
index 0b198bb7d..109abafe3 100644
--- a/application/models/crm/Prestudent_model.php
+++ b/application/models/crm/Prestudent_model.php
@@ -764,9 +764,9 @@ class Prestudent_model extends DB_Model
 					ps.updatevon 
 				FROM 
 					public.tbl_prestudentstatus ps
-				JOIN 
+				LEFT JOIN 
 					public.tbl_student st USING (prestudent_id)
-				JOIN 
+				LEFT JOIN 
 					public.tbl_studiengang sg ON (st.studiengang_kz = sg.studiengang_kz)
 				LEFT JOIN 
 					lehre.tbl_studienplan sp USING (studienplan_id) 
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 2fe6c9713..5b4b117c5 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -54,6 +54,7 @@ export default {
 			hasSchreibrechtAss: this.permissions['assistenz_schreibrechte'],
 			hasAdminPermission: this.permissions['admin'],
 			hasPermissionToSkipStatusCheck: this.permissions['student/keine_studstatuspruefung'],
+			hasPermissionRtAufsicht: this.permissions['lehre/reihungstestAufsicht'],
 			lists: this.lists,
 			defaultSemester: this.defaultSemester,
 			$reloadList: () => {
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index b1badff91..a0eb81491 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -39,6 +39,10 @@ export default{
 			from: 'hasSchreibrechtAss',
 			default: false
 		},
+		hasPermissionRtAufsicht: {
+			from: 'hasPermissionRtAufsicht',
+			default: false
+		},
 		$reloadList: {
 			from: '$reloadList',
 			required: true
@@ -96,6 +100,10 @@ export default{
 		},
 		hasPermissionCurrentStg(){
 			return this.arrayStg.includes(this.studiengang_kz);
+		},
+		isStatusBeforeStudent(){
+			let isStatusStudent = ['Student', 'Absolvent', 'Diplomand'];
+			return !isStatusStudent.includes(this.statusData.status_kurzbz);
 		}
 	},
 	props: {
@@ -669,6 +677,7 @@ export default{
 	mounted(){},
 	template: `
 		<div class="stv-list h-100 pt-3">
+		
 					
 			<!--Modal: Add New Status-->
 			<BsModal ref="newStatusModal">
@@ -828,11 +837,15 @@ export default{
 			
 			<!--Modal: Edit Status-->
 			<BsModal ref="editStatusModal">
+			
 				<template #title>{{$p.t('lehre', 'status_edit')}}</template>
 					<form-form class="row g-3" ref="statusData">
 					
-					<div v-if="statusData.datum < dataMeldestichtag">
-						<b>{{$p.t('bismeldestichtag', 'meldestichtag_erreicht')}}</b>
+					<div v-if="statusData.datum < dataMeldestichtag && !isStatusBeforeStudent">
+						<b>{{$p.t('bismeldestichtag', 'info_MeldestichtagStatusgrund')}}</b>
+					</div>
+					<div v-if="statusData.datum < dataMeldestichtag && isStatusBeforeStudent">
+						<b>{{$p.t('bismeldestichtag', 'info_MeldestichtagStatusgrundSemester')}}</b>
 					</div>
 					
 					 <input type="hidden" id="statusId" name="statusId" value="statusData.statusId">
@@ -866,7 +879,9 @@ export default{
 									type="select"
 									name="studiensemester_kurzbz"
 									v-model="statusData['studiensemester_kurzbz']"
+									:disabled="statusData.datum < dataMeldestichtag"
 								>
+									<option value="null"></option>
 									<option v-for="sem in listStudiensemester" :key="sem.studiensemester_kurzbz" :value="sem.studiensemester_kurzbz">{{sem.studiensemester_kurzbz}}</option>
 								</form-input>
 							</div>
@@ -879,6 +894,7 @@ export default{
 									type="select"
 									name="ausbildungssemester"
 									v-model="statusData['ausbildungssemester']"
+									:disabled="statusData.datum < dataMeldestichtag && !isStatusBeforeStudent"
 								>
 								 <option v-for="number in maxSem" :key="number" :value="number">{{ number }}</option>
 								</form-input>
@@ -897,6 +913,7 @@ export default{
 									format="dd.MM.yyyy"
 									preview-format="dd.MM.yyyy"
 									:teleport="true"
+									:disabled="statusData.datum < dataMeldestichtag"
 								></form-input>
 							</div>
 						</div>
@@ -912,6 +929,7 @@ export default{
 									format="dd.MM.yyyy"
 									preview-format="dd.MM.yyyy"
 									:teleport="true"
+									:disabled="statusData.datum < dataMeldestichtag"
 								></form-input>
 							</div>
 						</div>
@@ -927,6 +945,7 @@ export default{
 									format="dd.MM.yyyy"
 									preview-format="dd.MM.yyyy"
 									:teleport="true"
+									:disabled="statusData.datum < dataMeldestichtag"
 								></form-input>
 							</div>
 						</div>
@@ -937,6 +956,7 @@ export default{
 									type="select"
 									name="studienplan"
 									v-model="statusData['studienplan_id']"
+									:disabled="statusData.datum < dataMeldestichtag"
 								>
 									<option v-for="sp in listStudienplaene" :key="sp.studienplan_id" :value="sp.studienplan_id">{{sp.bezeichnung}}</option>
 								</form-input>
@@ -949,6 +969,7 @@ export default{
 									type="text"
 									name="anmerkung"
 									v-model="statusData['anmerkung']"
+									:disabled="statusData.datum < dataMeldestichtag"
 								>				
 								</form-input>
 							</div>
@@ -961,6 +982,7 @@ export default{
 								type="select"
 								name="aufnahmestufe"
 								v-model="statusData['rt_stufe']"
+								:disabled="statusData.datum < dataMeldestichtag"
 								>
 								<option v-for="entry in aufnahmestufen" :key="entry" :value="entry">{{entry}}</option>
 								</form-input>
@@ -975,6 +997,7 @@ export default{
 									name="statusgrund"
 									v-model="statusData['statusgrund_id']"
 								>
+								<option :value="NULL"></option>
 								<option v-for="grund in gruende" :key="grund.statusgrund_id" :value="grund.statusgrund_id">{{grund.beschreibung[0]}}</option>
 								</form-input>
 							</div>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index b923b649b..c675be789 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -28062,6 +28062,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'bismeldestichtag',
+		'phrase' => 'info_MeldestichtagStatusgrund',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Meldestichtag erreicht - ausschließlich Bearbeiten Statusgrund möglich',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Reporting deadline reached - only editing status reason possible',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'bismeldestichtag',
+		'phrase' => 'info_MeldestichtagStatusgrundSemester',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Meldestichtag erreicht - Bearbeiten Ausbildungssemester und Statusgrund möglich',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Edit education semester and status reason possible',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 );
 
 

From dd138380c997ad2ec0df55922aabf4266557afa3 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 27 May 2024 17:07:09 +0200
Subject: [PATCH 0739/1461] Adaptierungen Tab Adresse: show Zustelladresse,
 Heimatadresse Validierung backend, Layout: Ticks, required

---
 .../api/frontend/v1/stv/Kontakt.php           | 17 ++++++-
 .../Details/Kontakt/Address.js                | 46 ++++++++++++-------
 .../Details/Kontakt/Bankaccount.js            | 22 +++++----
 .../Details/Kontakt/Contact.js                | 17 ++++---
 4 files changed, 69 insertions(+), 33 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Kontakt.php b/application/controllers/api/frontend/v1/stv/Kontakt.php
index 517388b39..48a8d7c15 100644
--- a/application/controllers/api/frontend/v1/stv/Kontakt.php
+++ b/application/controllers/api/frontend/v1/stv/Kontakt.php
@@ -37,7 +37,8 @@ class Kontakt extends FHCAPI_Controller
 
 		// Load language phrases
 		$this->loadPhrases([
-			'ui'
+			'ui',
+			'person'
 		]);
 	}
 
@@ -221,6 +222,18 @@ class Kontakt extends FHCAPI_Controller
 	public function deleteAddress($adresse_id)
 	{
 		$this->load->model('person/Adresse_model', 'AdresseModel');
+		$result = $this->AdresseModel->load([
+			'adresse_id'=> $adresse_id,
+		]);
+		if(isError($result))
+		{
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		$result = current(getData($result));
+
+		if($result->heimatadresse)
+
+			$this->terminateWithError($this->p->t('person', 'error_deleteHomeAdress'), self::ERROR_TYPE_GENERAL);
 
 		$result = $this->AdresseModel->delete(
 			array('adresse_id' => $adresse_id)
@@ -234,7 +247,7 @@ class Kontakt extends FHCAPI_Controller
 		{
 			return $this->terminateWithError($this->p->t('ui','error_missingId',['id'=> 'Adresse_id']), self::ERROR_TYPE_GENERAL);
 		}
-		//return $this->outputJsonSuccess(current(getData($result)));
+
 		return $this->terminateWithSuccess(current(getData($result)) ? : null);
 	}
 
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
index 8f6cd9888..1f727f474 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
@@ -27,10 +27,24 @@ export default{
 					{title:"Ort", field:"ort"},
 					{title:"Gemeinde", field:"gemeinde"},
 					{title:"Nation", field:"nation"},
-					{title:"Heimatadresse", field:"heimatadresse",
-						formatter: (cell, formatterParams, onRendered) => {
-							let output = cell.getValue() ? "ja" : "nein";
-							return output;
+					{
+						title:"Heimatadresse",
+						field:"heimatadresse",
+						formatter:"tickCross",
+						hozAlign:"center",
+						formatterParams: {
+							tickElement: '<i class="fa fa-check text-success"></i>',
+							crossElement: '<i class="fa fa-xmark text-danger"></i>'
+						}
+					},
+					{
+						title:"Zustelladresse",
+						field:"zustelladresse",
+						formatter:"tickCross",
+						hozAlign:"center",
+						formatterParams: {
+							tickElement: '<i class="fa fa-check text-success"></i>',
+							crossElement: '<i class="fa fa-xmark text-danger"></i>'
 						}
 					},
 					{title:"Abweich.Empf", field:"co_name"},
@@ -125,7 +139,7 @@ export default{
 							title: this.$p.t('person', 'rechnungsadresse')
 						});
 						cm.getColumnByField('anmerkung').component.updateDefinition({
-							title: this.$p.t('notiz', 'document')
+							title: this.$p.t('global', 'anmerkung')
 						});
 					}
 				}
@@ -239,7 +253,7 @@ export default{
 					this.reload();
 				});
 		},
-		loadPlaces() { //TODO(manu) Refactor API-controller
+		loadPlaces() {
 			if (this.abortController.places)
 				this.abortController.places.abort();
 			if (this.addressData.nation != 'A' || !this.addressData.plz)
@@ -254,13 +268,11 @@ export default{
 					this.places = result.data;
 				});
 /*				.catch(error => {
-					if (error.code == 'ERR_BAD_REQUEST') {
-						return this.$fhcAlert.handleFormValidation(error, this.$refs.form);
-					}
-					// NOTE(chris): repeat request
-					if (error.code != "ERR_CANCELED")
-						window.setTimeout(this.loadPlaces, 100);
-				});*/
+						if (error.code != "ERR_CANCELED")
+							window.setTimeout(this.loadPlaces, 100);
+						else
+							this.$fhcAlert.handleSystemError(error);
+					});*/
 		},
 		search(event) {
 			return this.$fhcApi
@@ -324,7 +336,7 @@ export default{
 				</div>
 									
 				<div class="row mb-3">
-					<label for="plz" class="required form-label col-sm-4" >{{$p.t('person', 'plz')}}</label>
+					<label for="plz" class="required form-label col-sm-4" >{{$p.t('person', 'plz')}}<sup>*</sup></label>
 					 <div class="col-sm-6">
 						<input type="text" class="form-control" required v-model="addressData['plz']" @input="loadPlaces" >
 					</div>
@@ -336,7 +348,7 @@ export default{
 						<select v-if="addressData['nation'] == 'A'" name="addressData[gemeinde]" class="form-select" v-model="addressData['gemeinde']">
 							<option v-if="!gemeinden.length" disabled>Bitte gültige PLZ wählen</option>
 							<option v-for="gemeinde in gemeinden" :key="gemeinde.name" :value="gemeinde.name">{{gemeinde.name}}</option>
-						</select>
+						</select><!---->
 						<input v-else type="text" class="form-control" v-model="addressData['gemeinde']">
 					</div>
 				</div>
@@ -442,7 +454,7 @@ export default{
 				</div>
 				
 				<div class="row mb-3">
-					<label for="plz" class="required form-label col-sm-4" >{{$p.t('person', 'plz')}}</label>
+					<label for="plz" class="required form-label col-sm-4" >{{$p.t('person', 'plz')}}<sup>*</sup></label>
 					 <div class="col-sm-6">
 						<input type="text" class="form-control" required v-model="addressData['plz']" @input="loadPlaces">
 					</div>
@@ -472,7 +484,7 @@ export default{
 						</select>
 					</div>
 				</div>
-								
+					
 				<div class="row mb-3">
 					<label for="heimatadresse" class="form-label col-sm-4">{{$p.t('person', 'heimatadresse')}}</label>
 					<div class="col-sm-3">
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
index b448529fb..22ea6de70 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
@@ -37,10 +37,16 @@ export default{
 							}
 							return output;}
 					},
-					{title:"Verrechnung", field:"verrechnung", visible:false,
-						formatter: (cell, formatterParams, onRendered) => {
-							let output = cell.getValue() ? "ja" : "nein";
-							return output;}
+					{
+						title:"Verrechnung",
+						field:"verrechnung",
+						visible:false,
+						formatter:"tickCross",
+						hozAlign:"center",
+						formatterParams: {
+							tickElement: '<i class="fa fa-check text-success"></i>',
+							crossElement: '<i class="fa fa-xmark text-danger"></i>'
+						}
 					},
 					{title:"Person_id", field:"person_id", visible:false},
 					{title:"Bankverbindung_id", field:"bankverbindung_id", visible:false},
@@ -214,7 +220,7 @@ export default{
 					</div>
 
 					<div class="row mb-3">									   
-						<label for="iban" class="form-label col-sm-4">IBAN</label>
+						<label for="iban" class="form-label col-sm-4">IBAN<sup>*</sup></label>
 						<div class="col-sm-6">
 							<input type="text" required class="form-control" id="iban" v-model="bankverbindungData['iban']">
 						</div>
@@ -238,7 +244,7 @@ export default{
 						</div>
 					</div>
 					<div class="row mb-3">
-						<label for="typ" class="form-label col-sm-4">{{$p.t('global', 'typ')}}</label>
+						<label for="typ" class="form-label col-sm-4">{{$p.t('global', 'typ')}}<sup>*</sup></label>
 						<div class="col-sm-6">
 							<select  id="typ" class="form-select" required v-model="bankverbindungData['typ']">
 								<option  value="p">{{$p.t('person', 'privatkonto')}}</option>
@@ -279,7 +285,7 @@ export default{
 						</div>
 					</div>
 					<div class="row mb-3">
-						<label for="iban" class="form-label col-sm-4">IBAN</label>
+						<label for="iban" class="form-label col-sm-4">IBAN<sup>*</sup></label>
 						<div class="col-sm-6">
 							<input type="text" required class="form-control" id="iban" v-model="bankverbindungData['iban']">
 						</div>
@@ -303,7 +309,7 @@ export default{
 						</div>
 					</div>
 					<div class="row mb-3">
-						<label for="typ" class="form-label col-sm-4">{{$p.t('global', 'typ')}}</label>
+						<label for="typ" class="form-label col-sm-4">{{$p.t('global', 'typ')}}<sup>*</sup></label>
 						<div class="col-sm-6">
 							<select  id="typ" class="form-select" required v-model="bankverbindungData['typ']">
 								<option  value="p">{{$p.t('person', 'privatkonto')}}</option>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
index be4d6c7f5..34936227e 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
@@ -22,10 +22,15 @@ export default{
 				columns:[
 					{title:"Typ", field:"kontakttyp"},
 					{title:"Kontakt", field:"kontakt"},
-					{title:"Zustellung", field:"zustellung",
-						formatter: (cell, formatterParams, onRendered) => {
-							let output = cell.getValue() ? "ja" : "nein";
-							return output;}
+					{
+						title:"Zustellung",
+						field:"zustellung",
+						formatter:"tickCross",
+						hozAlign:"center",
+						formatterParams: {
+							tickElement: '<i class="fa fa-check text-success"></i>',
+							crossElement: '<i class="fa fa-xmark text-danger"></i>'
+						}
 					},
 					{title:"Anmerkung", field:"anmerkung"},
 					{title:"Firma", field:"kurzbz", visible:false},
@@ -221,7 +226,7 @@ export default{
 							</div>
 						</div>
 						<div class="row mb-3">										   
-							<label for="kontakt" class="form-label col-sm-4">{{$p.t('global', 'kontakt')}}</label>
+							<label for="kontakt" class="form-label col-sm-4">{{$p.t('global', 'kontakt')}}<sup>*</sup></label>
 							<div class="col-sm-6">
 								<input type="text" class="form-control" id="kontakt" v-model="contactData['kontakt']">
 							</div>
@@ -269,7 +274,7 @@ export default{
 					</div>
 				</div>
 				<div class="row mb-3">									   
-					<label for="kontakt" class="form-label col-sm-4">{{$p.t('global', 'kontakt')}}</label>
+					<label for="kontakt" class="form-label col-sm-4">{{$p.t('global', 'kontakt')}}<sup>*</sup></label>
 					<div class="col-sm-6">
 						<input type="text" class="form-control" id="kontakt" v-model="contactData['kontakt']">
 					</div>

From fb4997b1ac5080821297a08b9eda0374b4aa15a4 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 28 May 2024 14:37:54 +0200
Subject: [PATCH 0740/1461] DmsUpload Preview

---
 public/js/components/Form/Upload/Dms.js      | 20 +++++++----
 public/js/components/Form/Upload/Dms/Item.js | 37 ++++++++++++++++++++
 2 files changed, 50 insertions(+), 7 deletions(-)
 create mode 100644 public/js/components/Form/Upload/Dms/Item.js

diff --git a/public/js/components/Form/Upload/Dms.js b/public/js/components/Form/Upload/Dms.js
index 6ad69848c..47ba168fb 100644
--- a/public/js/components/Form/Upload/Dms.js
+++ b/public/js/components/Form/Upload/Dms.js
@@ -1,4 +1,9 @@
+import DmsItem from './Dms/Item.js';
+
 export default {
+	components: {
+		DmsItem
+	},
 	emits: [
 		'update:modelValue'
 	],
@@ -81,13 +86,14 @@ export default {
 	<div class="form-upload-dms">
 		<input ref="upload" class="form-control" :class="inputClass" :id="id" :name="name" :multiple="multiple" type="file" @change="addFiles">
 		<ul v-if="modelValue.length && multiple && !noList" class="list-unstyled m-0">
-			<li v-for="(file, index) in modelValue" :key="index" class="d-flex mx-1 mt-1 align-items-start">
-				<span class="col-auto"><i class="fa fa-file me-1"></i></span>
-				<span class="col">{{ file.name }}</span>
-				<button class="col-auto btn btn-outline-secondary btn-p-0" @click="removeFile(index)">
-					<i class="fa fa-close"></i>
-				</button>
-			</li>
+			<dms-item
+				v-for="(file, index) in modelValue"
+				:key="index"
+				v-model="file"
+				class="d-flex mx-1 mt-1 align-items-start"
+				@delete="removeFile(index)"
+				>
+			</dms-item>
 		</ul>
 	</div>`
 }
diff --git a/public/js/components/Form/Upload/Dms/Item.js b/public/js/components/Form/Upload/Dms/Item.js
new file mode 100644
index 000000000..45c60419e
--- /dev/null
+++ b/public/js/components/Form/Upload/Dms/Item.js
@@ -0,0 +1,37 @@
+export default {
+	emits: [
+		'delete'
+	],
+	props: {
+		modelValue: {
+			type: [File, Object],
+			required: true
+		}
+	},
+	data() {
+		return {
+			preview: ''
+		};
+	},
+	watch: {
+		modelValue(n) {
+			if (n.type == 'application/x.fhc-dms+json') {
+				n.text().then(result => {
+					const obj = JSON.parse(result);
+					this.preview = obj.preview || '';
+				});
+			}
+		}
+	},
+	template: `
+	<li class="form-upload-dms-item">
+		<span class="col-auto"><i class="fa fa-file me-1"></i></span>
+		<span class="col">{{ modelValue.name }}</span>
+		<a v-if="preview" :href="preview" target="_blank" class="col-auto btn btn-outline-secondary btn-p-0 me-1">
+			<i class="fa fa-download"></i>
+		</a>
+		<button class="col-auto btn btn-outline-secondary btn-p-0" @click="$emit('delete')">
+			<i class="fa fa-close"></i>
+		</button>
+	</li>`
+}

From dccf845e3b371fcd7bf576fccc9785495d2938fb Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 28 May 2024 14:38:37 +0200
Subject: [PATCH 0741/1461] Notiz Anhang Preview & CodeQuality

---
 .../api/frontend/v1/notiz/NotizPerson.php         | 15 ++++++++++++---
 application/core/Notiz_Controller.php             |  1 -
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/application/controllers/api/frontend/v1/notiz/NotizPerson.php b/application/controllers/api/frontend/v1/notiz/NotizPerson.php
index 2cf1f2519..3a0d1163e 100644
--- a/application/controllers/api/frontend/v1/notiz/NotizPerson.php
+++ b/application/controllers/api/frontend/v1/notiz/NotizPerson.php
@@ -17,17 +17,26 @@ class NotizPerson extends Notiz_Controller
 	{
 		if($typeId != "person_id")
 		{
-			return $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'))
+		if (!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
 		{
-			$result =  $this->p->t('lehre','error_keineSchreibrechte');
+			$result =  $this->p->t('lehre', 'error_keineSchreibrechte');
 
 			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
 
 		return $this->outputJsonSuccess(true);
 	}
+
+	public function loadDokumente()
+	{
+		$notiz_id = $this->input->post('notiz_id');
+
+		$this->NotizModel->addSelect($this->NotizModel->escape(base_url('content/notizdokdownload.php?id=' . $notiz_id)) . ' AS preview');
+		
+		return parent::loadDokumente();
+	}
 }
\ No newline at end of file
diff --git a/application/core/Notiz_Controller.php b/application/core/Notiz_Controller.php
index 1b78f15f7..618b6a2ef 100644
--- a/application/core/Notiz_Controller.php
+++ b/application/core/Notiz_Controller.php
@@ -475,7 +475,6 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 
 	public function loadDokumente()
 	{
-		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
 		$notiz_id = $this->input->post('notiz_id');
 
 		$this->NotizModel->addSelect('campus.tbl_dms_version.*');

From f218174ad3269aa8c91447721dc60d533f196bdb Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 28 May 2024 14:39:41 +0200
Subject: [PATCH 0742/1461] Comments

---
 application/controllers/api/frontend/v1/notiz/NotizPerson.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/controllers/api/frontend/v1/notiz/NotizPerson.php b/application/controllers/api/frontend/v1/notiz/NotizPerson.php
index 3a0d1163e..1c5524800 100644
--- a/application/controllers/api/frontend/v1/notiz/NotizPerson.php
+++ b/application/controllers/api/frontend/v1/notiz/NotizPerson.php
@@ -35,6 +35,7 @@ class NotizPerson extends Notiz_Controller
 	{
 		$notiz_id = $this->input->post('notiz_id');
 
+		// TODO(chris): make CI variant of endpoint
 		$this->NotizModel->addSelect($this->NotizModel->escape(base_url('content/notizdokdownload.php?id=' . $notiz_id)) . ' AS preview');
 		
 		return parent::loadDokumente();

From 0a4d89543a827a39294e3249794ff43f85df8b74 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 28 May 2024 16:34:34 +0200
Subject: [PATCH 0743/1461] refactor tab contact: form component, dropwdowns
 plz, ort, gemeinde

---
 .../api/frontend/v1/stv/Kontakt.php           |   2 +-
 .../Details/Kontakt/Address.js                | 405 +++++++++++++-----
 .../Details/Kontakt/Bankaccount.js            | 174 ++++++--
 .../Details/Kontakt/Contact.js                | 143 +++++--
 4 files changed, 524 insertions(+), 200 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Kontakt.php b/application/controllers/api/frontend/v1/stv/Kontakt.php
index 48a8d7c15..d68540788 100644
--- a/application/controllers/api/frontend/v1/stv/Kontakt.php
+++ b/application/controllers/api/frontend/v1/stv/Kontakt.php
@@ -524,7 +524,7 @@ class Kontakt extends FHCAPI_Controller
 		$name = $this->input->post('name');
 		$anschrift = $this->input->post('anschrift');
 		$bic = $this->input->post('bic');
-		$blz  = $this->input->post('blz ');
+		$blz  = $this->input->post('blz');
 		$kontonr = $this->input->post('kontonr');
 
 		$result = $this->BankverbindungModel->insert(
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
index 1f727f474..ba66b54b2 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
@@ -2,13 +2,17 @@ import {CoreFilterCmpt} from "../../../../filter/Filter.js";
 import PvAutoComplete from "../../../../../../../index.ci.php/public/js/components/primevue/autocomplete/autocomplete.esm.min.js";
 import FhcFormValidation from '../../../../Form/Validation.js';
 import BsModal from "../../../../Bootstrap/Modal.js";
+import FormForm from '../../../../Form/Form.js';
+import FormInput from '../../../../Form/Input.js';
 
 export default{
 	components: {
 		CoreFilterCmpt,
 		PvAutoComplete,
 		FhcFormValidation,
-		BsModal
+		BsModal,
+		FormForm,
+		FormInput
 	},
 	props: {
 		uid: Number
@@ -50,7 +54,6 @@ export default{
 					{title:"Abweich.Empf", field:"co_name"},
 					{title:"Firma", field:"firmenname"},
 					{title:"Firma_id", field:"firma_id", visible:false},
-					{title:"Name", field:"name"},
 					{title:"Adresse_id", field:"adresse_id", visible:false},
 					{title:"Person_id", field:"person_id", visible:false},
 					{title:"Name", field:"name", visible:false},
@@ -184,16 +187,21 @@ export default{
 	watch: {
 		uid() {
 			this.$refs.table.tabulator.setData('api/frontend/v1/stv/Kontakt/getAdressen/' + this.uid);
-		}
+		},
 	},
 	methods:{
 		actionNewAdress() {
+			this.resetModal();
 			this.$refs.newAdressModal.show();
 		},
 		actionEditAdress(adress_id) {
 			this.loadAdress(adress_id).then(() => {
 				if(this.addressData.adresse_id)
+				{
+					this.loadPlaces(this.addressData.plz);
 					this.$refs.editAdressModal.show();
+
+				}
 			});
 		},
 		actionDeleteAdress(adress_id) {
@@ -303,121 +311,218 @@ export default{
 			})
 			.catch(this.$fhcAlert.handleSystemError)
 	},
-	// TODO(chris): use Form Component
 	template: `
 	<div class="stv-details-kontakt-address h-100 pt-3">
 		
 		<!--Modal: Add Address-->
 		<bs-modal ref="newAdressModal">
 			<template #title>{{$p.t('person', 'adresse_new')}}</template>
-			<form class="row g-3" ref="addressData">
+			<form-form class="row g-3" ref="addressData">
+
 				<div class="row mb-3">
 					<label for="adressentyp" class="form-label col-sm-4">{{$p.t('global', 'typ')}}</label>
 					<div class="col-sm-6">
-						<select id="adressentyp" class="form-select" v-model="addressData.typ">
-							<option v-for="typ in adressentypen" :key="typ.adressentyp_kurzbz" :value="typ.adressentyp_kurzbz" >{{typ.bezeichnung}}</option>
-						</select>
+						<form-input
+							type="select"
+							name="adressentyp"
+							v-model="addressData.typ"
+							>
+							<option
+								v-for="typ in adressentypen"
+								:key="typ.adressentyp_kurzbz"
+								:value="typ.adressentyp_kurzbz"
+								>
+								{{typ.bezeichnung}}
+							</option>
+							</form-input>
+						</div>
 					</div>
-				</div>
-				<div class="row mb-3">
+					
+					<div class="row mb-3">
 					<label for="strasse" class="form-label col-sm-4">{{$p.t('person', 'strasse')}}</label>
 					<div class="col-sm-6">
-						<input type="text" class="form-control" id="strasse" v-model="addressData['strasse']">
-					</div>
-				</div>
-					
-				<div class="row mb-3">
-					<label for="nation" class="form-label col-sm-4">{{$p.t('person', 'nation')}}</label>
-					<div class="col-sm-6">
-						<select id="nation" class="form-select" v-model="addressData.nation">
-							<option v-for="nation in nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
-						</select>
-					</div>
-				</div>
-									
-				<div class="row mb-3">
-					<label for="plz" class="required form-label col-sm-4" >{{$p.t('person', 'plz')}}<sup>*</sup></label>
-					 <div class="col-sm-6">
-						<input type="text" class="form-control" required v-model="addressData['plz']" @input="loadPlaces" >
+						<form-input
+							type="text"
+							name="strasse"
+							v-model="addressData.strasse"
+						>
+						</form-input>					
 					</div>
 				</div>
 				
 				<div class="row mb-3">
-					<label for="gemeinde" class="form-label col-sm-4">{{$p.t('person', 'gemeinde')}}</label>
+					<label for="nation" class="form-label col-sm-4">{{$p.t('person', 'nation')}}</label>
 					<div class="col-sm-6">
-						<select v-if="addressData['nation'] == 'A'" name="addressData[gemeinde]" class="form-select" v-model="addressData['gemeinde']">
-							<option v-if="!gemeinden.length" disabled>Bitte gültige PLZ wählen</option>
-							<option v-for="gemeinde in gemeinden" :key="gemeinde.name" :value="gemeinde.name">{{gemeinde.name}}</option>
-						</select><!---->
-						<input v-else type="text" class="form-control" v-model="addressData['gemeinde']">
+						<form-input
+							type="select"
+							name="nation"
+							v-model="addressData.nation"
+							>
+							<option 
+								v-for="nation in nations" 
+								:key="nation.nation_code" 
+								:value="nation.nation_code" 
+								:disabled="nation.sperre"
+								>
+								{{nation.kurztext}}
+							</option>
+							</form-input>
+						</div>
+					</div>
+													
+				<div class="row mb-3">
+					<label for="plz" class="required form-label col-sm-4" >{{$p.t('person', 'plz')}}<sup>*</sup></label>
+					<div class="col-sm-6">
+						<form-input
+							type="text"
+							name="plz"
+							v-model="addressData.plz"
+							required
+							@input="loadPlaces"
+						>
+						</form-input>					
 					</div>
 				</div>
+											
+				<div class="row mb-3">
+					<label for="gemeinde" class="form-label col-sm-4">{{$p.t('person', 'gemeinde')}}</label>
+					<div class="col-sm-6">
+						<form-input
+							v-if="addressData.nation == 'A'"
+							type="select"
+							name="gemeinde"
+							v-model="addressData.gemeinde"
+							>
+							<option v-if="!gemeinden.length" disabled>Bitte gültige PLZ wählen</option>
+							<option 
+								v-for="gemeinde in gemeinden" 
+								:key="gemeinde.name" 
+								:value="gemeinde.name"
+								>
+								{{gemeinde.name}}
+							</option>
+							</form-input>
+							<form-input
+								v-else
+								type="text"
+								name="addressData.gemeinde"
+								v-model="addressData.gemeinde"
+							>	
+							</form-input>
+						</div>
+					</div>
 				
 				<div class="row mb-3">
 					<label for="Ort" class="form-label col-sm-4">{{$p.t('person', 'ort')}}</label>
 					<div class="col-sm-6">
-						<select v-if="addressData['nation'] == 'A'" name="address[ort]" class="form-select" v-model="addressData['ort']">
+						<form-input
+							v-if="addressData.nation == 'A'" 
+							type="select"
+							name="ort"
+							v-model="addressData.ort"
+							>
 							<option v-if="!orte.length" disabled>Bitte gültige Gemeinde wählen</option>
-							<option v-for="ort in orte" :key="ort.ortschaftsname" :value="ort.ortschaftsname">{{ort.ortschaftsname}}</option>
-						</select>
-						<input v-else type="text" name="ort" class="form-control" v-model="addressData['ort']">
+							<option 
+								v-for="ort in orte" 
+								:key="ort.ortschaftsname" 
+								:value="ort.ortschaftsname"
+								>
+								{{ort.ortschaftsname}}
+							</option>
+						</form-input>
+						<form-input
+								v-else
+								type="text"
+								name="ort"
+								v-model="addressData.ort"
+							>	
+						</form-input>
 					</div>
 				</div>
-									
+				
 				<div class="row mb-3">
 					<label for="heimatadresse" class="form-label col-sm-4">{{$p.t('person', 'heimatadresse')}}</label>
-					<div class="col-sm-3">
-						<div class="form-check">
-							<input id="heimatadresse" type="checkbox" class="form-check-input" value="1" v-model="addressData['heimatadresse']">
-						</div>
+					<div class="col-sm-4">
+						<form-input
+							container-class="form-check"
+							type="checkbox"
+							name="heimatadresse"
+							v-model="addressData.heimatadresse"
+						>
+						</form-input>
 					</div>
 				</div>
-					
+				
 				<div class="row mb-3">
 					<label for="zustelladresse" class="form-label col-sm-4">{{$p.t('person', 'zustelladresse')}}</label>
-					<div class="col-sm-3">
-						<div class="form-check">
-							<input id="zustelladresse" type="checkbox" class="form-check-input" value="1" v-model="addressData['zustelladresse']">
-						</div>
+					<div class="col-sm-4">
+						<form-input
+							container-class="form-check"
+							type="checkbox"
+							name="zustelladresse"
+							v-model="addressData.zustelladresse"
+						>
+						</form-input>
 					</div>
 				</div>
 				
 				<div class="row mb-3">
 					<label for="co_name" class="form-label col-sm-4">{{$p.t('person', 'co_name')}}</label>
 					<div class="col-sm-6">
-						<input type="text" id="co_name" class="form-control" v-model="addressData['co_name']">
+						<form-input
+							type="text"
+							name="co_name"
+							v-model="addressData.co_name"
+						>
+						</form-input>
 					</div>
 				</div>
 				
 				<div class="row mb-3">
 					<label for="rechnungsadresse" class="form-label col-sm-4">{{$p.t('person', 'rechnungsadresse')}}</label>
-					<div class="col-sm-3">
-						<div class="form-check">
-							<input id="rechnungsadresse" type="checkbox" class="form-check-input" v-model="addressData['rechnungsadresse']">
-						</div>
+					<div class="col-sm-4">
+						<form-input
+							container-class="form-check"
+							type="checkbox"
+							name="rechnungsadresse"
+							v-model="addressData.rechnungsadresse"
+						>
+						</form-input>
 					</div>
 				</div>
 				
 				<div class="row mb-3">
 					<label for="firma_name" class="form-label col-sm-4">{{$p.t('person', 'firma')}}</label>
 					<div class="col-sm-3">
-						<PvAutoComplete v-model="addressData['firma']"  optionLabel="name" :suggestions="filteredFirmen" @complete="search" :min-length="3"/>
+						<PvAutoComplete v-model="addressData.firma"  optionLabel="name" :suggestions="filteredFirmen" @complete="search" :min-length="3"/>
 					</div>
 				</div>
 				
 				<div class="row mb-3">
 					<label for="name" class="form-label col-sm-4">{{$p.t('person', 'firma_zusatz')}}</label>
 					<div class="col-sm-6">
-						<input type="text" class="form-control" id="name" v-model="addressData['name']">
+						<form-input
+							type="text"
+							name="firma_zusatz"
+							v-model="addressData.name"
+						>
+						</form-input>
 					</div>
 				</div>
+				
 				<div class="row mb-3">
 					<label for="anmerkung" class="form-label col-sm-4">{{$p.t('global', 'anmerkung')}}</label>
 					<div class="col-sm-6">
-						<input type="text" class="form-control" id="anmerkung" v-model="addressData['anmerkung']">
+					<form-input
+							type="text"
+							name="anmerkung"
+							v-model="addressData.anmerkung"
+						>
+						</form-input>
 					</div>
 				</div>
-			</form>
+				
+			</form-form>
 			<template #footer>
 				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{$p.t('ui', 'abbrechen')}}</button>
 				<button type="button" class="btn btn-primary" @click="addNewAddress()">OK</button>
@@ -427,95 +532,163 @@ export default{
 		<!--Modal: Edit Address-->
 		<bs-modal ref="editAdressModal">
 			<template #title>{{$p.t('person', 'adresse_edit')}}</template>
-			<form class="row g-3" ref="addressData">
+			<form-form class="row g-3" ref="addressData">
+			
 				<div class="row mb-3">
 					<label for="adressentyp" class="form-label col-sm-4">{{$p.t('global', 'typ')}}</label>
 					<div class="col-sm-6">
-						<select id="adressentyp" class="form-control" v-model="addressData.typ">
-							<option v-for="typ in adressentypen" :key="typ.adressentyp_kurzbz" :value="typ.adressentyp_kurzbz" >{{typ.bezeichnung}}</option>
-						</select>
+						<form-input
+							type="select"
+							name="adressentyp"
+							v-model="addressData.typ"
+							>
+							<option
+								v-for="typ in adressentypen"
+								:key="typ.adressentyp_kurzbz"
+								:value="typ.adressentyp_kurzbz"
+								>
+								{{typ.bezeichnung}}
+							</option>
+						</form-input>
 					</div>
 				</div>
-				
+					
 				<div class="row mb-3">
 					<label for="strasse" class="form-label col-sm-4">{{$p.t('person', 'strasse')}}</label>
 					<div class="col-sm-6">
-						<input type="text" class="form-control" id="strasse" v-model="addressData.strasse">
-					</div>
-				</div>
-					
-				<div class="row mb-3">
-					<label for="nation" class="form-label col-sm-4">{{$p.t('person', 'nation')}}</label>
-					<div class="col-sm-6">
-						<select id="nation" class="form-select" v-model="addressData.nation">
-							<option v-for="nation in nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
-						</select>
+						<form-input
+							type="text"
+							name="strasse"
+							v-model="addressData.strasse"
+						>
+						</form-input>					
 					</div>
 				</div>
 				
 				<div class="row mb-3">
-					<label for="plz" class="required form-label col-sm-4" >{{$p.t('person', 'plz')}}<sup>*</sup></label>
-					 <div class="col-sm-6">
-						<input type="text" class="form-control" required v-model="addressData['plz']" @input="loadPlaces">
+					<label for="nation" class="form-label col-sm-4">{{$p.t('person', 'nation')}}</label>
+					<div class="col-sm-6">
+						<form-input
+							type="select"
+							name="nation"
+							v-model="addressData.nation"
+							>
+							<option 
+								v-for="nation in nations" 
+								:key="nation.nation_code" 
+								:value="nation.nation_code" 
+								:disabled="nation.sperre"
+								>
+								{{nation.kurztext}}
+							</option>
+						</form-input>
 					</div>
 				</div>
+							
+				<div class="row mb-3">
+					<label for="plz" class="required form-label col-sm-4" >{{$p.t('person', 'plz')}}<sup>*</sup></label>
+					<div class="col-sm-6">
+						<form-input
+							type="text"
+							name="plz"
+							v-model="addressData.plz"
+							required
+							@input="loadPlaces"
+						>
+						</form-input>					
+					</div>
+				</div>
+							
 				<div class="row mb-3">
 					<label for="gemeinde" class="form-label col-sm-4">{{$p.t('person', 'gemeinde')}}</label>
-					<div v-if="addressData['gemeinde']" class="col-sm-6">
-						<input type="text" class="form-control" v-model="addressData['gemeinde']">
-					</div>
-					<div v-else class="col-sm-6">
-						<select v-if="addressData['nation'] == 'A'" name="addressData[gemeinde]" class="form-select" v-model="addressData['gemeinde']">
-							<option v-if="!gemeinden.length" disabled>{{$p.t('person', 'plz_waehlen')}}</option>
-							<option v-for="gemeinde in gemeinden" :key="gemeinde.name" :value="gemeinde.name">{{gemeinde.name}}</option>
-						</select>
+					<div class="col-sm-6">
+						<form-input
+							v-if="addressData.gemeinde"
+							type="select"
+							name="addressData.gemeinde"
+							v-model="addressData.gemeinde"
+							>
+							<option v-if="!gemeinden.length" disabled>Bitte gültige PLZ wählen</option>
+							<option 
+								v-for="gemeinde in gemeinden" 
+								:key="gemeinde.name" 
+								:value="gemeinde.name"
+								>
+								{{gemeinde.name}}
+							</option>						
+						</form-input>
 					</div>
 				</div>
-		
+			
 				<div class="row mb-3">
 					<label for="Ort" class="form-label col-sm-4">{{$p.t('person', 'ort')}}</label>
-					<div v-if="addressData['ort']" class="col-sm-6">
-						<input type="text" name="ort" class="form-control" v-model="addressData['ort']">
-					</div>
-					<div v-else class="col-sm-6">
-						<select v-if="addressData['nation'] == 'A'" name="address[ort]" class="form-select" v-model="addressData['ort']">
-							<option v-if="!orte.length" disabled>{{$p.t('person', 'gemeinde_waehlen')}}</option>
-							<option v-for="ort in orte" :key="ort.ortschaftsname" :value="ort.ortschaftsname">{{ort.ortschaftsname}}</option>
-						</select>
+					<div class="col-sm-6">
+						<form-input
+							v-if="addressData.ort" 
+							type="select"
+							name="ort"
+							v-model="addressData.ort"
+							>
+							<option v-if="!orte.length" disabled>Bitte gültige Gemeinde wählen</option>
+							<option 
+								v-for="ort in orte" 
+								:key="ort.ortschaftsname" 
+								:value="ort.ortschaftsname"
+								>
+								{{ort.ortschaftsname}}
+							</option>
+						</form-input>
 					</div>
 				</div>
-					
+				
 				<div class="row mb-3">
 					<label for="heimatadresse" class="form-label col-sm-4">{{$p.t('person', 'heimatadresse')}}</label>
-					<div class="col-sm-3">
-						<div class="form-check">
-							<input id="heimatadresse" type="checkbox" class="form-check-input" value="1" v-model="addressData['heimatadresse']">
-						</div>
+					<div class="col-sm-4">
+						<form-input
+							container-class="form-check"
+							type="checkbox"
+							name="heimatadresse"
+							v-model="addressData.heimatadresse"
+						>
+						</form-input>
 					</div>
 				</div>
-					
+				
 				<div class="row mb-3">
 					<label for="zustelladresse" class="form-label col-sm-4">{{$p.t('person', 'zustelladresse')}}</label>
-					<div class="col-sm-3">
-						<div class="form-check">
-							<input id="zustelladresse" type="checkbox" class="form-check-input" value="1" v-model="addressData['zustelladresse']">
-						</div>
+					<div class="col-sm-4">
+						<form-input
+							container-class="form-check"
+							type="checkbox"
+							name="zustelladresse"
+							v-model="addressData.zustelladresse"
+						>
+						</form-input>
 					</div>
 				</div>
 				
 				<div class="row mb-3">
 					<label for="co_name" class="form-label col-sm-4">{{$p.t('person', 'co_name')}}</label>
 					<div class="col-sm-6">
-						<input type="text" id="co_name" class="form-control" v-model="addressData['co_name']">
+						<form-input
+							type="text"
+							name="co_name"
+							v-model="addressData.co_name"
+						>
+						</form-input>
 					</div>
 				</div>
 				
 				<div class="row mb-3">
 					<label for="rechnungsadresse" class="form-label col-sm-4">{{$p.t('person', 'rechnungsadresse')}}</label>
-					<div class="col-sm-3">
-						<div class="form-check">
-							<input id="rechnungsadresse" type="checkbox" class="form-check-input" v-model="addressData['rechnungsadresse']">
-						</div>
+					<div class="col-sm-4">
+						<form-input
+							container-class="form-check"
+							type="checkbox"
+							name="rechnungsadresse"
+							v-model="addressData.rechnungsadresse"
+						>
+						</form-input>
 					</div>
 				</div>
 				
@@ -525,29 +698,39 @@ export default{
 						<input type="text" class="form-control" id="name" v-model="addressData.firmenname">
 					</div>
 					<div v-else class="col-sm-6">
-						<PvAutoComplete v-model="addressData['firma']" optionLabel="name" :suggestions="filteredFirmen" @complete="search" :min-length="3"/>
+						<PvAutoComplete v-model="addressData.firma" optionLabel="name" :suggestions="filteredFirmen" @complete="search" :min-length="3"/>
 					</div>
 				</div>
 				
 				<div class="row mb-3">
 					<input type="hidden" class="form-control" id="firma_id" v-model="addressData.firma_id">
 				</div>
-	
+				
 				<div class="row mb-3">
 					<label for="name" class="form-label col-sm-4">{{$p.t('person', 'firma_zusatz')}}</label>
 					<div class="col-sm-6">
-						<input type="text" class="form-control" id="name" v-model="addressData['name']">
+						<form-input
+							type="text"
+							name="firma_zusatz"
+							v-model="addressData.name"
+						>
+						</form-input>
 					</div>
 				</div>
 				
 				<div class="row mb-3">
 					<label for="anmerkung" class="form-label col-sm-4">{{$p.t('global', 'anmerkung')}}</label>
 					<div class="col-sm-6">
-						<input type="text" class="form-control" id="anmerkung" v-model="addressData['anmerkung']">
+					<form-input
+							type="text"
+							name="anmerkung"
+							v-model="addressData.anmerkung"
+						>
+						</form-input>
 					</div>
 				</div>
 			
-			</form>
+			</form-form>
 			<template #footer>
 				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">{{$p.t('ui', 'abbrechen')}}</button>
 				<button ref="Close" type="button" class="btn btn-primary" @click="updateAddress(addressData.adresse_id)">OK</button>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
index 22ea6de70..af668afe5 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
@@ -1,10 +1,14 @@
 import {CoreFilterCmpt} from "../../../../filter/Filter.js";
 import BsModal from "../../../../Bootstrap/Modal.js";
+import FormForm from '../../../../Form/Form.js';
+import FormInput from '../../../../Form/Input.js';
 
 export default{
 	components: {
 		CoreFilterCmpt,
-		BsModal
+		BsModal,
+		FormForm,
+		FormInput
 	},
 	props: {
 		uid: Number
@@ -114,10 +118,6 @@ export default{
 				verrechnung: true,
 				typ: 'p'
 			},
-			initData: {
-				verrechnung: true,
-				typ: 'p'
-			}
 		}
 	},
 	watch: {
@@ -127,6 +127,7 @@ export default{
 	},
 	methods:{
 		actionNewBankverbindung(){
+			this.resetModal();
 			this.$refs.newBankverbindungModal.show();
 		},
 		actionEditBankverbindung(bankverbindung_id){
@@ -196,7 +197,15 @@ export default{
 		},
 		resetModal(){
 			this.bankverbindungData = {};
-			this.bankverbindungData = this.initData;
+			this.bankverbindungData.name = "";
+			this.bankverbindungData.anschrift = "";
+			this.bankverbindungData.iban = "";
+			this.bankverbindungData.bic = "";
+			this.bankverbindungData.kontonr = "";
+			this.bankverbindungData.blz = "";
+			this.bankverbindungData.bic = "";
+			this.bankverbindungData.verrechnung = true;
+			this.bankverbindungData.typ = 'p';
 		},
 	},
 	template: `	
@@ -204,63 +213,103 @@ export default{
 		
 		<!--Modal: Add Bankverbindung-->
 		<BsModal title="Bankverbindung anlegen" ref="newBankverbindungModal">
+
 			<template #title>{{$p.t('person', 'bankvb_new')}}</template>
-			<form class="row g-3" ref="bankverbindungData">
+						<form-form class="row g-3" ref="bankverbindungData">
 				<div class="row mb-3">
-						<label for="name" class="form-label col-sm-4">Name</label>
-						<div class="col-sm-6">
-							<input type="text" class="form-control" id="name" v-model="bankverbindungData['name']">
-						</div>
+					<label for="name" class="form-label col-sm-4">Name</label>
+					<div class="col-sm-6">
+						<form-input 
+							type="text" 
+							name="name" 
+							v-model="bankverbindungData.name"
+						>
 					</div>
-					<div class="row mb-3">										   
-						<label for="anschrift" class="form-label col-sm-4">{{$p.t('person', 'anschrift')}}</label>
-						<div class="col-sm-6">
-							<input type="text" class="form-control" id="anschrift" v-model="bankverbindungData['anschrift']">
-						</div>
+				</div>
+				<div class="row mb-3">										   
+					<label for="anschrift" class="form-label col-sm-4">{{$p.t('person', 'anschrift')}}</label>
+					<div class="col-sm-6">
+						<form-input 
+							type="text" 
+							name="anschrift" 
+								v-model="bankverbindungData.anschrift"
+						>
+						</form-input>
 					</div>
+				</div>
 
 					<div class="row mb-3">									   
 						<label for="iban" class="form-label col-sm-4">IBAN<sup>*</sup></label>
 						<div class="col-sm-6">
-							<input type="text" required class="form-control" id="iban" v-model="bankverbindungData['iban']">
+							<form-input 
+								type="text" 
+								name="iban" 
+								v-model="bankverbindungData.iban"
+								required
+							>
+						</form-input>
 						</div>
 					</div>
 					<div class="row mb-3">								   
 						<label for="bic" class="form-label col-sm-4">BIC</label>
 						<div class="col-sm-6">
-							<input type="text" class="form-control" id="bic" v-model="bankverbindungData['bic']">
+							<form-input 
+								type="text" 
+								name="bic" 
+								v-model="bankverbindungData.bic"
+								>
+							</form-input>
 						</div>
 					</div>
 					<div class="row mb-3">							   
 						<label for="kontonr" class="form-label col-sm-4">{{$p.t('person', 'kontonr')}}</label>
 						<div class="col-sm-6">
-							<input type="text" class="form-control" id="kontonr" v-model="bankverbindungData['kontonr']">
+							<form-input 
+								type="text" 
+								name="kontonr" 
+								v-model="bankverbindungData.kontonr"
+								>
+							</form-input>
 						</div>
 					</div>
 					<div class="row mb-3">										   
 						<label for="blz" class="form-label col-sm-4">{{$p.t('person', 'blz')}}</label>
 						<div class="col-sm-6">
-							<input type="text" class="form-control" id="blz" v-model="bankverbindungData['blz']">
+							<form-input 
+								type="text" 
+								name="blz" 
+								v-model="bankverbindungData.blz"
+								>
+							</form-input>
 						</div>
 					</div>
 					<div class="row mb-3">
 						<label for="typ" class="form-label col-sm-4">{{$p.t('global', 'typ')}}<sup>*</sup></label>
 						<div class="col-sm-6">
-							<select  id="typ" class="form-select" required v-model="bankverbindungData['typ']">
+							<form-input 
+								type="select" 
+								name="typ" 
+								v-model="bankverbindungData.typ"
+								required
+								>
 								<option  value="p">{{$p.t('person', 'privatkonto')}}</option>
 								<option  value="f">{{$p.t('person', 'firmenkonto')}}</option>
-							</select>
+							</form-input>
 						</div>
 					</div>
 					<div class="row mb-3">
-						<label for="verrechnung" class="form-label col-sm-4">{{$p.t('person', 'verrechnung')}}</label>
-						<div class="col-sm-3">
-							<div class="form-check">
-								<input id="verrechnung" type="checkbox" class="form-check-input" value="1" v-model="bankverbindungData['verrechnung']">
-							</div>
-						</div>
+					<label for="verrechnung" class="form-label col-sm-4">{{$p.t('person', 'verrechnung')}}</label>
+					<div class="col-sm-4">
+						<form-input
+							container-class="form-check"
+							type="checkbox"
+							name="verrechnung"
+							v-model="bankverbindungData.verrechnung"
+						>
+						</form-input>
 					</div>
-			</form>
+				</div>
+			</form-form>
             <template #footer>
             		<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{$p.t('ui', 'abbrechen')}}</button>
 					<button type="button" class="btn btn-primary" @click="addNewBankverbindung()">OK</button>
@@ -270,62 +319,101 @@ export default{
 		<!--Modal: Edit Bankverbindung-->
 		<BsModal ref="editBankverbindungModal">
 			<template #title>{{$p.t('person', 'bankvb_edit')}}</template>
-				<form class="row g-3" ref="bankverbindungData">
+				<form-form class="row g-3" ref="bankverbindungData">
 				
 					<div class="row mb-3">
 						<label for="name" class="form-label col-sm-4">Name</label>
 						<div class="col-sm-6">
-							<input type="text" class="form-control" id="name" v-model="bankverbindungData['name']">
+								<form-input 
+								type="text" 
+								name="name" 
+								v-model="bankverbindungData.name"
+							>
 						</div>
 					</div>
 					<div class="row mb-3">									   
 						<label for="anschrift" class="form-label col-sm-4">{{$p.t('person', 'anschrift')}}</label>
 						<div class="col-sm-6">
-							<input type="text" class="form-control" id="anschrift" v-model="bankverbindungData['anschrift']">
+							<form-input 
+								type="text" 
+								name="anschrift" 
+								v-model="bankverbindungData.anschrift"
+							>
+							</form-input>
 						</div>
 					</div>
 					<div class="row mb-3">
 						<label for="iban" class="form-label col-sm-4">IBAN<sup>*</sup></label>
 						<div class="col-sm-6">
-							<input type="text" required class="form-control" id="iban" v-model="bankverbindungData['iban']">
+							<form-input 
+								type="text" 
+								name="iban" 
+								v-model="bankverbindungData.iban"
+								required
+							>
+							</form-input>
 						</div>
 					</div>
 					<div class="row mb-3">									   
 						<label for="bic" class="form-label col-sm-4">BIC</label>
 						<div class="col-sm-6">
-							<input type="text" class="form-control" id="bic" v-model="bankverbindungData['bic']">
+							<form-input 
+								type="text" 
+								name="bic" 
+								v-model="bankverbindungData.bic"
+								>
+							</form-input>
 						</div>
 					</div>
 					<div class="row mb-3">									   
 						<label for="kontonr" class="form-label col-sm-4">{{$p.t('person', 'kontonr')}}</label>
 						<div class="col-sm-6">
-							<input type="text" class="form-control" id="kontonr" v-model="bankverbindungData['kontonr']">
+							<form-input 
+								type="text" 
+								name="kontonr" 
+								v-model="bankverbindungData.kontonr"
+								>
+							</form-input>
 						</div>
 					</div>
 					<div class="row mb-3">									   
 						<label for="blz" class="form-label col-sm-4">{{$p.t('person', 'blz')}}</label>
 						<div class="col-sm-6">
-							<input type="text" class="form-control" id="blz" v-model="bankverbindungData['blz']">
+							<form-input 
+								type="text" 
+								name="blz" 
+								v-model="bankverbindungData.blz"
+								>
+							</form-input>
 						</div>
 					</div>
 					<div class="row mb-3">
 						<label for="typ" class="form-label col-sm-4">{{$p.t('global', 'typ')}}<sup>*</sup></label>
 						<div class="col-sm-6">
-							<select  id="typ" class="form-select" required v-model="bankverbindungData['typ']">
+							<form-input 
+								type="select" 
+								name="typ" 
+								v-model="bankverbindungData.typ"
+								required
+								>
 								<option  value="p">{{$p.t('person', 'privatkonto')}}</option>
 								<option  value="f">{{$p.t('person', 'firmenkonto')}}</option>
-							</select>
+							</form-input>
 						</div>
 					</div>
 					<div class="row mb-3">
 						<label for="verrechnung" class="form-label col-sm-4">{{$p.t('person', 'verrechnung')}}</label>
-						<div class="col-sm-3">
-							<div class="form-check">
-								<input id="verrechnung" type="checkbox" class="form-check-input" value="1" v-model="bankverbindungData['verrechnung']">
-							</div>
+						<div class="col-sm-4">
+							<form-input
+								container-class="form-check"
+								type="checkbox"
+								name="verrechnung"
+								v-model="bankverbindungData.verrechnung"
+							>
+							</form-input>
 						</div>
 					</div>															   
-				</form>
+				</form-form>
 				<template #footer>
 					<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">{{$p.t('ui', 'abbrechen')}}</button>
 					<button ref="Close" type="button" class="btn btn-primary" @click="updateBankverbindung(bankverbindungData.bankverbindung_id)">OK</button>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
index 34936227e..17f559a94 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
@@ -1,14 +1,16 @@
 import {CoreFilterCmpt} from "../../../../filter/Filter.js";
-/*import {CoreRESTClient} from "../../../../../RESTClient.js";*/
 import BsModal from "../../../../Bootstrap/Modal.js";
-/*import PvToast from "../../../../../../../index.ci.php/public/js/components/primevue/toast/toast.esm.min.js";*/
 import PvAutoComplete from "../../../../../../../index.ci.php/public/js/components/primevue/autocomplete/autocomplete.esm.min.js";
+import FormForm from '../../../../Form/Form.js';
+import FormInput from '../../../../Form/Input.js';
 
 export default{
 	components: {
 		CoreFilterCmpt,
 		PvAutoComplete,
-		BsModal
+		BsModal,
+		FormForm,
+		FormInput
 	},
 	props: {
 		uid: Number
@@ -123,6 +125,7 @@ export default{
 	},
 	methods:{
 		actionNewContact(){
+			this.resetModal();
 			this.$refs.newContactModal.show();
 		},
 		actionEditContact(contact_id){
@@ -214,46 +217,69 @@ export default{
 		<!--Modal: new Contact-->
 		<BsModal ref="newContactModal">
 			<template #title>{{$p.t('person', 'kontakt_new')}}</template>
-				<form class="row g-3" ref="contactData">
 				
-						<div class="row mb-3">
-							<label for="kontakttyp" class="form-label col-sm-4">{{$p.t('global', 'typ')}}</label>
-							<div class="col-sm-6">
-								<select id="kontakttyp" class="form-control" v-model="contactData.kontakttyp">
-									<option value="">keine Auswahl</option>
-									<option v-for="typ in kontakttypen" :key="typ.kontakttyp_kurzbz" :value="typ.kontakttyp" >{{typ.kontakttyp}}</option>
-								</select>
-							</div>
+				<form-form class="row g-3" ref="contactData">
+				
+					<div class="row mb-3">
+						<label for="kontakttyp" class="form-label col-sm-4">{{$p.t('global', 'typ')}}</label>
+						<div class="col-sm-6">
+							<form-input 
+								type="select" 
+								name="typ" 
+								v-model="contactData.kontakttyp">
+							>
+								<option value="">keine Auswahl</option>
+								<option v-for="typ in kontakttypen" :key="typ.kontakttyp_kurzbz" :value="typ.kontakttyp" >{{typ.kontakttyp}}</option>
+						</form-input>
 						</div>
-						<div class="row mb-3">										   
-							<label for="kontakt" class="form-label col-sm-4">{{$p.t('global', 'kontakt')}}<sup>*</sup></label>
-							<div class="col-sm-6">
-								<input type="text" class="form-control" id="kontakt" v-model="contactData['kontakt']">
-							</div>
+					</div>
+					
+					<div class="row mb-3">										   
+						<label for="kontakt" class="form-label col-sm-4">{{$p.t('global', 'kontakt')}}<sup>*</sup></label>
+						<div class="col-sm-6">
+							<form-input 
+								type="text" 
+								name="kontakt" 
+								v-model="contactData.kontakt">
+								required
+								>
+							</form-input>
 						</div>
-						<div class="row mb-3">									   
-							<label for="anmerkung" class="form-label col-sm-4">{{$p.t('global', 'anmerkung')}}</label>
-							<div class="col-sm-6">
-								<input type="text" class="form-control" id="anmerkung" v-model="contactData['anmerkung']">
-							</div>
+					</div>
+					
+					<div class="row mb-3">									   
+						<label for="anmerkung" class="form-label col-sm-4">{{$p.t('global', 'anmerkung')}}</label>
+						<div class="col-sm-6">
+							<form-input 
+								type="text" 
+								name="anmerkung" 
+								v-model="contactData.anmerkung">
+								>
+							</form-input>
 						</div>
+					</div>
+					
+					<div class="row mb-3">
+						<label for="zustellung" class="form-label col-sm-4">{{$p.t('person', 'zustellung')}}</label>
+						<div class="col-sm-4">
+							<form-input
+								container-class="form-check"
+								type="checkbox"
+								name="zustellung"
+								v-model="contactData.zustellung"
+							>
+							</form-input>
+						</div>
+					</div>
 						
-						<div class="row mb-3">
-							<label for="zustellung" class="form-label col-sm-4">{{$p.t('person', 'zustellung')}}</label>
+					<div class="row mb-3">
+						<label for="firma_name" class="form-label col-sm-4">{{$p.t('person', 'firma')}} / {{$p.t('person', 'standort')}}</label>
 							<div class="col-sm-6">
-								<div class="form-check">
-									<input id="zustellung" type="checkbox" class="form-check-input" value="1" v-model="contactData['zustellung']">
-								</div>
+								<PvAutoComplete v-model="contactData['standort']" optionLabel="kurzbz" :suggestions="filteredStandorte" @complete="search" :min-length="3"/>
 							</div>
-						</div>
-							
-						<div class="row mb-3">
-							<label for="firma_name" class="form-label col-sm-4">{{$p.t('person', 'firma')}} / {{$p.t('person', 'standort')}}</label>
-								<div class="col-sm-6">
-									<PvAutoComplete v-model="contactData['standort']" optionLabel="kurzbz" :suggestions="filteredStandorte" @complete="search" :min-length="3"/>
-								</div>
-						</div>
-				</form>
+					</div>
+				</form-form>
+				
 			    <template #footer>
             		<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{$p.t('ui', 'abbrechen')}}</button>
 					<button type="button" class="btn btn-primary" @click="addNewContact()">OK</button>
@@ -262,8 +288,10 @@ export default{
 						
 		<!--Modal: Edit Contact-->
 		<BsModal ref="editContactModal">
+		
 			<template #title>{{$p.t('person', 'kontakt_edit')}}</template>
-			<form class="row g-3" ref="contactData">
+			
+			<form-form class="row g-3" ref="contactData">
 				<div class="row mb-3">
 					<label for="kontakttyp" class="form-label col-sm-4">{{$p.t('global', 'typ')}}</label>
 					<div class="col-sm-6">
@@ -273,26 +301,45 @@ export default{
 						</select>
 					</div>
 				</div>
+				
 				<div class="row mb-3">									   
 					<label for="kontakt" class="form-label col-sm-4">{{$p.t('global', 'kontakt')}}<sup>*</sup></label>
 					<div class="col-sm-6">
-						<input type="text" class="form-control" id="kontakt" v-model="contactData['kontakt']">
+						<form-input 
+							type="text" 
+							name="kontakt" 
+							v-model="contactData.kontakt">
+							required
+							>
+						</form-input>
 					</div>
 				</div>
+				
 				<div class="row mb-3">									   
 					<label for="anmerkung" class="form-label col-sm-4">{{$p.t('global', 'anmerkung')}}</label>
 					<div class="col-sm-6">
-						<input type="text" class="form-control" id="anmerkung" v-model="contactData['anmerkung']">
+						<form-input 
+							type="text" 
+							name="anmerkung" 
+							v-model="contactData.anmerkung">
+							>
+						</form-input>
 					</div>
 				</div>
+				
 				<div class="row mb-3">
 					<label for="zustellung" class="form-label col-sm-4">{{$p.t('person', 'zustellung')}}</label>
-					<div class="col-sm-6">
-						<div class="form-check">
-							<input id="zustellung" type="checkbox" class="form-check-input" value="1" v-model="contactData['zustellung']">
-						</div>
+					<div class="col-sm-4">
+						<form-input
+							container-class="form-check"
+							type="checkbox"
+							name="zustellung"
+							v-model="contactData.zustellung"
+						>
+						</form-input>
 					</div>
 				</div>
+				
 				<div class="row mb-3">			
 					<input type="hidden" class="form-control" id="standort_id" v-model="contactData.standort_id">
 				</div>
@@ -300,13 +347,19 @@ export default{
 				<div class="row mb-3">
 					<label for="standort" class="form-label col-sm-4">{{$p.t('person', 'firma')}} / {{$p.t('person', 'standort')}}</label>
 						<div v-if="contactData.kurzbz" class="col-sm-6">
-							<input type="text" class="form-control" id="name" v-model="contactData.kurzbz">
+							<form-input
+								type="text"
+								name="name"
+								v-model="contactData.kurzbz"
+							>
+							</form-input>
 						</div>	
 						<div v-else class="col-sm-3">
 							<PvAutoComplete v-model="contactData['standort']" optionLabel="kurzbz" :suggestions="filteredStandorte" @complete="search" :min-length="3"/>
 						</div>
 				</div>
-			</form>
+			</form-form>
+			
 			<template #footer>
 				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">{{$p.t('ui', 'abbrechen')}}</button>
 				<button type="button" class="btn btn-primary" @click="updateContact(contactData.kontakt_id)">OK</button>

From a924c9d2bbda7ab2ef7d45ee8d9c7c36b2bb2cb9 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 29 May 2024 11:49:11 +0200
Subject: [PATCH 0744/1461] backport Betriebsmittel Component from
 feature-30660/FHC4_StudierendenGUI_Prototyp Branch

---
 .../v1/betriebsmittel/Betriebsmittel.php      | 324 ++++++++++++
 .../Betriebsmittel/Betriebsmittel.js          | 462 ++++++++++++++++++
 2 files changed, 786 insertions(+)
 create mode 100644 application/controllers/api/frontend/v1/betriebsmittel/Betriebsmittel.php
 create mode 100644 public/js/components/Betriebsmittel/Betriebsmittel.js

diff --git a/application/controllers/api/frontend/v1/betriebsmittel/Betriebsmittel.php b/application/controllers/api/frontend/v1/betriebsmittel/Betriebsmittel.php
new file mode 100644
index 000000000..cb6c4a3aa
--- /dev/null
+++ b/application/controllers/api/frontend/v1/betriebsmittel/Betriebsmittel.php
@@ -0,0 +1,324 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+
+class Betriebsmittel extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'getAllBetriebsmittel' => ['admin:r', 'assistenz:r'],
+			'addNewBetriebsmittel' => ['admin:r', 'assistenz:r'],
+			'updateBetriebsmittel' => ['admin:r', 'assistenz:r'],
+			'loadBetriebsmittel' => ['admin:r', 'assistenz:r'],
+			'deleteBetriebsmittel' => ['admin:r', 'assistenz:r'],
+			'getTypenBetriebsmittel' => ['admin:r', 'assistenz:r'],
+			'loadInventarliste' => ['admin:r', 'assistenz:r']
+		]);
+
+		//Load Models
+		$this->load->model('ressource/Betriebsmittel_model', 'BetriebsmittelModel');
+		$this->load->model('ressource/Betriebsmittelperson_model', 'BetriebsmittelpersonModel');
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+		$this->load->library('form_validation');
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui'
+		]);
+	}
+
+	public function getAllBetriebsmittel($uid, $person_id)
+	{
+		//uid
+		//$result = $this->BetriebsmittelpersonModel->getBetriebsmittelData($uid, 'uid');
+
+		//person_id
+		$result = $this->BetriebsmittelpersonModel->getBetriebsmittelData($person_id, 'person');
+
+		if (isError($result))
+		{
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+
+		$this->terminateWithSuccess((getData($result) ?: []));
+	}
+
+	public function addNewBetriebsmittel()
+	{
+		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+
+		$this->form_validation->set_rules('kaution', 'Kaution', 'numeric', [
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Kaution'])
+		]);
+
+		$this->form_validation->set_rules('betriebsmitteltyp', 'TYP', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Typ'])
+		]);
+
+		$this->form_validation->set_rules('ausgegebenam', 'Ausgegeben am', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Ausgegeben am'])
+		]);
+
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$uid_user = getAuthUID();
+		$betriebsmitteltyp = $this->input->post('betriebsmitteltyp');
+		$nummer = $this->input->post('nummer');
+		$nummer2 = $this->input->post('nummer2');
+		$inventarData = $this->input->post('inventarData');
+		$beschreibung = $this->input->post('beschreibung');
+		$kaution = $this->input->post('kaution');
+		$anmerkung = $this->input->post('anmerkung');
+		$ausgegebenam = $this->input->post('ausgegebenam');
+		$retouram = $this->input->post('retouram');
+		$person_id = $this->input->post('person_id');
+		$uid = $this->input->post('uid');
+
+		if($inventarData)
+		{
+			$betriebsmitteltyp = $inventarData['betriebsmitteltyp'];
+			$betriebsmittel_id = $inventarData['betriebsmittel_id'];
+		}
+
+		if($betriebsmitteltyp == 'Zutrittskarte' && !$nummer)
+		{
+			return $this->terminateWithError($this->p->t('wawi', 'error_zutrittskarteOhneNummer'), self::ERROR_TYPE_GENERAL);
+		}
+
+		if($retouram && $retouram < $ausgegebenam)
+		{
+			return $this->terminateWithError($this->p->t('wawi', 'error_retourdatumVorAusgabe'), self::ERROR_TYPE_GENERAL);
+		}
+
+		if($betriebsmitteltyp == "Inventar" && !($inventarData['inventarnummer']))
+		{
+			return $this->terminateWithError($this->p->t('wawi', 'error_inventarWaehlen'), self::ERROR_TYPE_GENERAL);
+		}
+
+
+		// Start DB transaction
+		$this->db->trans_begin();
+
+		$betriebsmitteltyp = utf8_decode($betriebsmitteltyp);
+
+		if(!$inventarData)
+		{
+			$result = $this->BetriebsmittelModel->insert(
+				[
+					'betriebsmitteltyp' => $betriebsmitteltyp,
+					'nummer' => $nummer,
+					'nummer2' => $nummer2,
+					'beschreibung' => $beschreibung,
+					'anmerkung' => $anmerkung,
+					'insertvon' => $uid_user,
+					'insertamum' => date('c')
+				]
+			);
+			if($this->db->trans_status() === false || isError($result))
+			{
+				$this->db->trans_rollback();
+				return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			}
+			$betriebsmittel_id = $result->retval;
+		}
+
+		$result = $this->BetriebsmittelpersonModel->insert(
+			[
+				'betriebsmittel_id' => $betriebsmittel_id,
+				'person_id' => $person_id,
+				'kaution' => $kaution,
+				'anmerkung' => $anmerkung,
+				'ausgegebenam' => $ausgegebenam,
+				'retouram ' => $retouram,
+				'insertvon' => $uid_user,
+				'insertamum' => date('c'),
+				'uid' => $uid
+			]
+		);
+
+		if($this->db->trans_status() === false || isError($result))
+		{
+			$this->db->trans_rollback();
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+
+		$this->db->trans_commit();
+		return $this->terminateWithSuccess(true);
+	}
+
+	public function updateBetriebsmittel()
+	{
+		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+
+		$uid_user = getAuthUID();
+
+		$betriebsmittel_id = $this->input->post('betriebsmittel_id');
+		$betriebsmittelperson_id = $this->input->post('betriebsmittelperson_id');
+		$betriebsmitteltyp = $this->input->post('betriebsmitteltyp');
+		$nummer = $this->input->post('nummer');
+		$nummer2 = $this->input->post('nummer2');
+		$beschreibung = $this->input->post('beschreibung');
+		$kaution = $this->input->post('kaution');
+		$anmerkung = $this->input->post('anmerkung');
+		$ausgegebenam = $this->input->post('ausgegebenam');
+		$retouram = $this->input->post('retouram');
+		$person_id = $this->input->post('person_id');
+		$uid = $this->input->post('uid');
+
+		$this->form_validation->set_rules('kaution', 'Kaution', 'numeric', [
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Kaution'])
+		]);
+
+		$this->form_validation->set_rules('betriebsmitteltyp', 'TYP', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Typ'])
+		]);
+
+		$this->form_validation->set_rules('ausgegebenam', 'Ausgegeben am', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Ausgegeben am'])
+		]);
+
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		if($betriebsmitteltyp == 'Zutrittskarte' && !$nummer)
+		{
+			return $this->terminateWithError($this->p->t('wawi', 'error_zutrittskarteOhneNummer'), self::ERROR_TYPE_GENERAL);
+		}
+
+		if($retouram && $retouram < $ausgegebenam)
+		{
+			return $this->terminateWithError($this->p->t('wawi', 'error_retourdatumVorAusgabe'), self::ERROR_TYPE_GENERAL);
+		}
+
+
+		// Start DB transaction
+		$this->db->trans_begin();
+
+		$result = $this->BetriebsmittelpersonModel->update(
+			[
+				'betriebsmittelperson_id' => $betriebsmittelperson_id,
+
+			],
+			[
+				'person_id' => $person_id,
+				'uid' => $uid,
+				'kaution' => $kaution,
+				'anmerkung' => $anmerkung,
+				'ausgegebenam' => $ausgegebenam,
+				'retouram ' => $retouram,
+				'updatevon' => $uid_user,
+				'updateamum' => date('c')
+			]
+		);
+
+		if($this->db->trans_status() === false || isError($result))
+		{
+			$this->db->trans_rollback();
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+
+		$result = $this->BetriebsmittelModel->update(
+			[
+				'betriebsmittel_id' => $betriebsmittel_id
+			],
+			[
+				'betriebsmitteltyp' => $betriebsmitteltyp,
+				'nummer' => $nummer,
+				'nummer2' => $nummer2,
+				'beschreibung' => $beschreibung,
+				'anmerkung' => $anmerkung,
+				'updatevon' => $uid_user,
+				'updateamum' => date('c')
+			]
+		);
+		if($this->db->trans_status() === false || isError($result))
+		{
+			$this->db->trans_rollback();
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+
+		$this->db->trans_commit();
+		return $this->terminateWithSuccess(true);
+	}
+
+	public function loadBetriebsmittel()
+	{
+		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+
+		$betriebsmittelperson_id = $this->input->post('betriebsmittelperson_id');
+
+		$result = $this->BetriebsmittelpersonModel->getBetriebsmittelData($betriebsmittelperson_id, 'betriebsmittelperson_id');
+
+		if (isError($result))
+		{
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+
+		if (!hasData($result))
+		{
+			$this->terminateWithError("no Betriebsmittelperson with ID found: " . $betriebsmittelperson_id, self::ERROR_TYPE_GENERAL);
+		}
+
+		$this->terminateWithSuccess(current(getData($result)));
+	}
+
+	public function deleteBetriebsmittel()
+	{
+
+		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+
+		$betriebsmittelperson_id = $this->input->post('betriebsmittelperson_id');
+
+		$result = $this->BetriebsmittelpersonModel->delete(
+			array('betriebsmittelperson_id' => $betriebsmittelperson_id,
+				)
+		);
+
+		if (isError($result))
+		{
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		if (!hasData($result))
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Betriebsmittelperson_id']), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->outputJsonSuccess(current(getData($result)));
+	}
+
+	public function getTypenBetriebsmittel()
+	{
+		$this->load->model('ressource/Betriebsmitteltyp_model', 'BetriebsmitteltypModel');
+
+		$this->BetriebsmitteltypModel->addOrder('beschreibung', 'ASC');
+		$result = $this->BetriebsmitteltypModel->load(); // load All
+
+		if (isError($result))
+		{
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess(getData($result) ?: []);
+	}
+
+	public function loadInventarliste($searchString)
+	{
+		$result = $this->BetriebsmittelModel->loadInventarliste($searchString);
+		if (isError($result)) {
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess($result ?: []);
+	}
+}
+
+
diff --git a/public/js/components/Betriebsmittel/Betriebsmittel.js b/public/js/components/Betriebsmittel/Betriebsmittel.js
new file mode 100644
index 000000000..05fe74c3d
--- /dev/null
+++ b/public/js/components/Betriebsmittel/Betriebsmittel.js
@@ -0,0 +1,462 @@
+import VueDatePicker from '../vueDatepicker.js.php';
+import {CoreFilterCmpt} from "../filter/Filter.js";
+import PvAutoComplete from "../../../../index.ci.php/public/js/components/primevue/autocomplete/autocomplete.esm.min.js";
+
+import BsModal from "../Bootstrap/Modal.js";
+import FormForm from '../Form/Form.js';
+import FormInput from '../Form/Input.js';
+
+export default {
+	components: {
+		CoreFilterCmpt,
+		VueDatePicker,
+		BsModal,
+		FormForm,
+		FormInput,
+		PvAutoComplete
+	},
+	inject: {
+		cisRoot: {
+			from: 'cisRoot'
+		},
+	},
+	props: [
+		'person_id',
+		'uid'
+	],
+	data() {
+		return {
+			tabulatorOptions: {
+				ajaxURL: 'api/frontend/v1/betriebsmittel/Betriebsmittel/getAllBetriebsmittel/' + this.uid + '/' + this.person_id,
+				ajaxRequestFunc: this.$fhcApi.get,
+				ajaxResponse: (url, params, response) => response.data,
+				columns: [
+					{title: "Nummer", field: "nummer"},
+					{title: "PersonId", field: "person_id", visible: false},
+					{title: "Typ", field: "betriebsmitteltyp"},
+					{title: "Anmerkung", field: "anmerkung", visible: false},
+					{title: "Retourdatum", field: "format_retour", visible: false},
+					{title: "Beschreibung", field: "beschreibung"},
+					{title: "Uid", field: "uid", visible: false},
+					{title: "Kaution", field: "kaution", visible: false},
+					{title: "Ausgabedatum", field: "format_ausgabe"},
+					{title: "Betriebsmittel_id", field: "betriebsmittel_id", visible: false},
+					{title: "Betriebsmittelperson_id", field: "betriebsmittelperson_id", visible: false},
+					{
+						title: 'Aktionen', field: 'actions',
+						minWidth: 150, // Ensures Action-buttons will be always fully displayed
+						maxWidth: 150,
+						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-print"></i>';
+							button.title = 'Übernahmebestätigung drucken';
+							let cellData = cell.getData();
+							button.addEventListener(
+								'click',
+								(event) =>
+								{
+									let linkToPdf = this.cisRoot +
+										'/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');
+							button.className = 'btn btn-outline-secondary btn-action';
+							button.innerHTML = '<i class="fa fa-edit"></i>';
+							button.title = 'Betriebsmittel bearbeiten';
+							button.addEventListener(
+								'click',
+								(event) =>
+									this.actionEditBetriebsmittel(cell.getData().betriebsmittelperson_id)
+							);
+							container.append(button);
+
+							button = document.createElement('button');
+							button.className = 'btn btn-outline-secondary btn-action';
+							button.innerHTML = '<i class="fa fa-xmark"></i>';
+							button.title = 'Betriebsmittel löschen';
+							button.addEventListener(
+								'click',
+								() =>
+									this.actionDeleteBetriebsmittel(cell.getData().betriebsmittelperson_id)
+							);
+							container.append(button);
+
+							return container;
+						},
+						frozen: true
+					}],
+				layout: 'fitColumns',
+				layoutColumnsOnNewData: false,
+				height: '550',
+				selectableRangeMode: 'click',
+				selectable: true
+			},
+			tabulatorEvents: [
+				{
+					event: 'tableBuilt',
+					handler: async() => {
+
+						await this.$p.loadCategory(['wawi', 'global', 'infocenter']);
+
+						let cm = this.$refs.table.tabulator.columnManager;
+
+						cm.getColumnByField('nummer').component.updateDefinition({
+							title: this.$p.t('wawi', 'nummer')
+						});
+						cm.getColumnByField('anmerkung').component.updateDefinition({
+							title: this.$p.t('global', 'anmerkung')
+						});
+						cm.getColumnByField('format_retour').component.updateDefinition({
+							title: this.$p.t('wawi', 'retourdatum')
+						});
+						cm.getColumnByField('kaution').component.updateDefinition({
+							title: this.$p.t('infocenter', 'kaution')
+						});
+						cm.getColumnByField('format_ausgabe').component.updateDefinition({
+							title: this.$p.t('wawi', 'ausgabedatum')
+						});
+
+					}
+				}
+			],
+			betriebsmittelData: {},
+			betriebsmittelperson_id : null,
+			listBetriebsmitteltyp: [],
+			formData: {
+				ausgegebenam : this.getDefaultDate(),
+				betriebsmitteltyp: 'Zutrittskarte'
+			},
+			statusNew: true,
+			filteredInventar: []
+		}
+	},
+	watch: {
+		uid() {
+			this.$refs.table.tabulator.setData('api/frontend/v1/betriebsmittel/Betriebsmittel/getAllBetriebsmittel/' + this.uid + '/' + this.person_id);
+		}
+	},
+	methods: {
+		actionEditBetriebsmittel(betriebsmittelperson_id) {
+			this.statusNew = false;
+			this.loadBetriebsmittel(betriebsmittelperson_id);
+		},
+		actionNewBetriebsmittel() {
+			this.resetModal();
+			this.statusNew = true;
+			this.formData.ausgegebenam = this.getDefaultDate();
+			this.reload();
+		},
+		actionDeleteBetriebsmittel(betriebsmittelperson_id) {
+			this.loadBetriebsmittel(betriebsmittelperson_id).then(() => {
+				this.$refs.deleteBetriebsmittelModal.show();
+			});
+		},
+		addNewBetriebsmittel() {
+			this.param = {
+				'uid':  this.uid,
+				'person_id': this.person_id,
+				...this.formData
+			};
+			this.$fhcApi.post('api/frontend/v1/betriebsmittel/Betriebsmittel/addNewBetriebsmittel/',
+				this.param
+			).then(response => {
+				this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+				this.resetModal();
+			}).catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					window.scrollTo(0, 0);
+					this.reload();
+				});
+		},
+		deleteBetriebsmittel(betriebsmittelperson_id) {
+			this.param = {
+				'betriebsmittelperson_id': betriebsmittelperson_id
+			};
+			return this.$fhcApi.post('api/frontend/v1/betriebsmittel/betriebsmittel/deleteBetriebsmittel/',
+				this.param)
+				.then(
+					result => {
+						this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
+						this.hideModal('deleteBetriebsmittelModal');
+						this.resetModal();
+					})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					window.scrollTo(0, 0);
+					this.reload();
+				});
+		},
+		updateBetriebsmittel() {
+			this.param = {
+				'uid':  this.uid,
+				'person_id': this.person_id,
+				...this.formData
+			};
+			this.$fhcApi.post('api/frontend/v1/betriebsmittel/Betriebsmittel/updateBetriebsmittel/',
+				this.param
+			).then(response => {
+				this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+				this.resetModal();
+			}).catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					window.scrollTo(0, 0);
+					this.reload();
+				});
+		},
+		loadBetriebsmittel(betriebsmittelperson_id) {
+			this.resetModal();
+			this.statusNew = false;
+			this.param = {
+				'betriebsmittelperson_id':  betriebsmittelperson_id
+			};
+			return this.$fhcApi.post('api/frontend/v1/betriebsmittel/Betriebsmittel/loadBetriebsmittel/',
+				this.param)
+				.then(result => result.data)
+				.then(result => {
+					this.formData = result;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		searchInventar(event) {
+			return this.$fhcApi
+				.get('api/frontend/v1/betriebsmittel/Betriebsmittel/loadInventarliste/' + event.query)
+				.then(result => {
+					this.filteredInventar = result.data.retval;
+				});
+		},
+		reload() {
+			this.$refs.table.reloadTable();
+		},
+		hideModal(modalRef) {
+			this.$refs[modalRef].hide();
+		},
+		resetModal() {
+			this.formData = {};
+			this.formData.ausgegebenam = this.getDefaultDate();
+			this.formData.retouram = null;
+			this.formData.betriebsmitteltyp = null;
+			this.formData.nummer = null;
+			this.formData.nummer2 = null;
+			this.formData.kaution = null;
+			this.formData.anmerkung = null;
+			this.formData.beschreibung = null;
+			this.betriebsmittelperson_id = {};
+			this.statusNew = true;
+		},
+		getDefaultDate() {
+			const today = new Date();
+			return today;
+		}
+	},
+	created(){
+		this.$fhcApi
+			.get('api/frontend/v1/betriebsmittel/Betriebsmittel/getTypenBetriebsmittel')
+			.then(result => result.data)
+			.then(result => {
+				this.listBetriebsmitteltyp = result;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+	},
+	template: `
+	<div class="core-betriebsmittel">
+	
+	
+		<!--Modal: deleteBetriebsmittelModal-->
+		<BsModal ref="deleteBetriebsmittelModal">
+			<template #title>{{$p.t('ui', 'betriebsmittel_delete')}}</template>
+			<template #default>
+				<p>{{$p.t('ui', 'betriebsmittel_confirm_delete')}}</p>
+			</template>
+			<template #footer>
+<!--				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">Abbrechen</button>-->
+				<button ref="Close" type="button" class="btn btn-primary" @click="deleteBetriebsmittel(formData.betriebsmittelperson_id)">OK</button>
+			</template>
+		</BsModal>
+		
+		
+		<div class="row col-12">
+			<div class="col-6">
+			
+				<core-filter-cmpt
+					ref="table"
+					:tabulator-options="tabulatorOptions"
+					:tabulator-events="tabulatorEvents"
+					table-only
+					:side-menu="false"
+					reload
+					new-btn-show
+					new-btn-label="Betriebsmittel"
+					@click:new="actionNewBetriebsmittel"
+					>
+				</core-filter-cmpt>
+			
+			</div>
+			
+
+			
+			<form-form class="row g-3 col-6" ref="betriebsmittelData">
+				<legend>Details</legend>
+				
+				<div class="row mb-3">
+					<div class="col-sm-7">
+						<p v-if="statusNew" class="fw-bold">{{$p.t('ui', 'add_betriebsmittel')}}</p>
+						<p v-else class="fw-bold">{{$p.t('ui', 'edit_betriebsmittel')}}</p>
+					</div>
+				</div>
+				
+				<div class="row mb-3">
+					<label for="typ" class="form-label col-sm-4">{{$p.t('global', 'typ')}}</label>
+					<div class="col-sm-6">
+						<form-input
+						type="select"
+						name="typ"
+						v-model="formData.betriebsmitteltyp"
+						:disabled="!statusNew"
+						>
+						<option
+							v-for="entry in listBetriebsmitteltyp"
+							:key="entry.betriebsmitteltyp"
+							:value="entry.betriebsmitteltyp"
+							>
+							{{entry.beschreibung}}
+						</option>
+						</form-input>
+					</div>
+				</div>
+			
+				<div v-if="formData.betriebsmitteltyp == 'Inventar'" class="row mb-3">
+					<label for="inventarnummer" class="form-label col-sm-4">{{$p.t('wawi', 'inventarnummer')}}</label>
+					<div class="col-sm-6">
+						<PvAutoComplete v-model="formData['inventarData']" optionLabel="dropdowntext" :suggestions="filteredInventar" @complete="searchInventar" minLength="3"/>
+					</div>
+				</div>
+				<div v-else-if="formData.inventarnummer" class="row mb-3">
+				<label for="inventarnummer" class="form-label col-sm-4">{{$p.t('wawi', 'inventarnummer')}}</label>
+					<div class="col-sm-6">
+						<input type="text" class="form-control" id="inventarnummer" v-model="formData.inventarnummer" :disabled="!statusNew">
+					</div>
+				</div>
+				
+				<div v-if="formData.betriebsmitteltyp!='Inventar' && !formData.inventarnummer" class="row mb-3">
+					<label for="nummer" class="form-label col-sm-4">{{$p.t('wawi', 'nummer')}}</label>
+					<div class="col-sm-6">
+						<form-input
+							type="text"
+							name="nummer"
+							v-model="formData['nummer']"
+						>
+						</form-input>
+					</div>
+				</div>
+				
+				<div v-if="formData.betriebsmitteltyp!='Inventar' && !formData.inventarnummer" class="row mb-3">
+					<label for="nummer2" class="form-label col-sm-4">{{$p.t('wawi', 'nummer')}} 2</label>
+					<div class="col-sm-6">
+						<form-input
+							type="text"
+							name="nummer2"
+							v-model="formData['nummer2']"
+						>
+						</form-input>
+					</div>
+				</div>
+			
+				<div v-if="formData.betriebsmitteltyp!='Inventar'" class="row mb-3">
+					<label for="beschreibung" class="form-label col-sm-4">{{$p.t('global', 'beschreibung')}}</label>
+					<div class="col-sm-6">
+						<form-input
+							type="textarea"
+							name="beschreibung"
+							v-model="formData['beschreibung']"
+							:disabled="formData.inventarnummer"
+						>
+						</form-input>
+					</div>
+				</div>
+				
+				<div class="row mb-3">
+					<label for="kaution" class="form-label col-sm-4">{{$p.t('infocenter', 'kaution')}}</label>
+					<div class="col-sm-6">
+						<form-input
+							type="text"
+							name="kaution"
+							v-model="formData['kaution']"
+						>
+						</form-input>
+					</div>
+				</div>
+				
+				<div class="row mb-3">
+					<label for="anmerkung" class="form-label col-sm-4">{{$p.t('global', 'anmerkung')}}</label>
+					<div class="col-sm-6">
+						<form-input
+							type="textarea"
+							name="anmerkung"
+							v-model="formData['anmerkung']"
+						>
+						</form-input>
+					</div>
+				</div>
+				
+				<div class="row mb-3">
+					<label for="ausgegebenam" class="form-label col-sm-4">{{$p.t('wawi', 'ausgegebenam')}}</label>
+					<div class="col-sm-6">
+						<form-input
+							type="DatePicker"
+							name="datum"
+							v-model="formData['ausgegebenam']"
+							auto-apply
+							:enable-time-picker="false"
+							format="dd.MM.yyyy"
+							preview-format="dd.MM.yyyy"
+							:teleport="true"
+						></form-input>
+					</div>
+				</div>
+				
+				<div class="row mb-3">
+					<label for="retouram" class="form-label col-sm-4">{{$p.t('wawi', 'retouram')}}</label>
+					<div class="col-sm-6">
+						<form-input
+							type="DatePicker"
+							name="datum"
+							v-model="formData['retouram']"
+							auto-apply
+							:enable-time-picker="false"
+							format="dd.MM.yyyy"
+							preview-format="dd.MM.yyyy"
+							:teleport="true"
+						></form-input>
+					</div>
+				</div>
+				
+
+				<div class="row mb-3">
+				<label class="form-label col-sm-8"></label>
+					<div v-if="statusNew" class="col-sm-4">
+						<button ref="Close" type="button" class="btn btn-primary" @click="addNewBetriebsmittel()">{{$p.t('ui', 'speichern')}}</button>
+					</div>
+					<div v-else class="col-sm-4">
+						<button ref="Close" type="button" class="btn btn-primary" @click="updateBetriebsmittel()">{{$p.t('ui', 'speichern')}}</button>
+					</div>
+					
+				</div>
+		</form-form>
+		
+		</div>
+
+
+
+
+
+		
+	</div>`
+}
+

From 5d8df75e86bd65376f09238c6feb3d42df94dcd1 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 29 May 2024 12:34:20 +0200
Subject: [PATCH 0745/1461] refactor Tab Contact: backend

---
 .../api/frontend/v1/stv/Kontakt.php           | 143 ++--
 .../controllers/components/stv/Kontakt.php    | 709 ------------------
 application/models/codex/Gemeinde_model.php   |   9 +
 .../Details/Kontakt/Address.js                |  10 +-
 system/phrasesupdate.php                      |  60 ++
 5 files changed, 119 insertions(+), 812 deletions(-)
 delete mode 100644 application/controllers/components/stv/Kontakt.php

diff --git a/application/controllers/api/frontend/v1/stv/Kontakt.php b/application/controllers/api/frontend/v1/stv/Kontakt.php
index d68540788..e24e2d9e2 100644
--- a/application/controllers/api/frontend/v1/stv/Kontakt.php
+++ b/application/controllers/api/frontend/v1/stv/Kontakt.php
@@ -64,13 +64,14 @@ class Kontakt extends FHCAPI_Controller
 
 	public function addNewAddress($person_id)
 	{
-		$_POST = json_decode($this->input->raw_input_stream, true);
-
 		$this->form_validation->set_rules('plz', 'PLZ', 'required|numeric', [
-			'required' => $this->p->t('ui','error_fieldRequired',['field' => 'PLZ']),
-			'numeric' => $this->p->t('ui','error_fieldNotNumeric',['field' => 'PLZ'])
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'PLZ']),
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'PLZ'])
 		]);
 
+		if(isset($_POST['gemeinde']) && isset($_POST['ort']))
+		$this->form_validation->set_rules('plz', 'Postleitzahl', 'callback_validate_location_combination');
+
 		if ($this->form_validation->run() == false)
 		{
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
@@ -126,13 +127,14 @@ class Kontakt extends FHCAPI_Controller
 	public function updateAddress($address_id)
 	{
 		$uid = getAuthUID();
-		$_POST = json_decode($this->input->raw_input_stream, true);
-
 		$this->form_validation->set_rules('plz', 'PLZ', 'required|numeric', [
-			'required' => $this->p->t('ui','error_fieldRequired',['field' => 'PLZ']),
-			'numeric' => $this->p->t('ui','error_fieldNotNumeric',['field' => 'PLZ'])
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'PLZ']),
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'PLZ'])
 		]);
 
+		if(isset($_POST['gemeinde']) && isset($_POST['ort']))
+			$this->form_validation->set_rules('plz', 'Postleitzahl', 'callback_validateLocationCombination');
+
 		if ($this->form_validation->run() == false)
 		{
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
@@ -142,7 +144,7 @@ class Kontakt extends FHCAPI_Controller
 
 		if(!$address_id)
 		{
-			return $this->terminateWithError($this->p->t('ui','error_missingId',['id'=> 'Adresse_id']), self::ERROR_TYPE_GENERAL);
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Adresse_id']), self::ERROR_TYPE_GENERAL);
 		}
 
 		if(isset($_POST['firma']))
@@ -214,7 +216,7 @@ class Kontakt extends FHCAPI_Controller
 
 		if (!hasData($result))
 		{
-			return $this->terminateWithError($this->p->t('ui','error_missingId',['id'=> 'Adresse_id']), self::ERROR_TYPE_GENERAL);
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Adresse_id']), self::ERROR_TYPE_GENERAL);
 		}
 		$this->terminateWithSuccess(current(getData($result)) ? : null);
 	}
@@ -245,7 +247,7 @@ class Kontakt extends FHCAPI_Controller
 		}
 		if (!hasData($result))
 		{
-			return $this->terminateWithError($this->p->t('ui','error_missingId',['id'=> 'Adresse_id']), self::ERROR_TYPE_GENERAL);
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Adresse_id']), self::ERROR_TYPE_GENERAL);
 		}
 
 		return $this->terminateWithSuccess(current(getData($result)) ? : null);
@@ -338,7 +340,7 @@ class Kontakt extends FHCAPI_Controller
 		}
 		if (!hasData($result))
 		{
-			return $this->terminateWithError($this->p->t('ui','error_missingId',['id'=> 'Kontakt_id']), self::ERROR_TYPE_GENERAL);
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Kontakt_id']), self::ERROR_TYPE_GENERAL);
 		}
 		//	$this->outputJsonSuccess(current(getData($result)));
 		$this->terminateWithSuccess(current(getData($result)));
@@ -346,15 +348,13 @@ class Kontakt extends FHCAPI_Controller
 
 	public function addNewContact($person_id)
 	{
-		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-
 		if(($_POST['kontakttyp'] == 'email' && isset($_POST['kontakt'])))
-			$this->form_validation->set_rules('kontakt', 'Kontakt', 'valid_email', [
-				'valid_email' => $this->p->t('ui','error_fieldNoValidEmail',['field' => 'Kontakt'])
+			$this->form_validation->set_rules('kontakt', 'Kontakt', 'validEmail', [
+				'validEmail' => $this->p->t('ui', 'error_fieldNoValidEmail', ['field' => 'Kontakt'])
 			]);
 		else
 			$this->form_validation->set_rules('kontakt', 'Kontakt', 'required', [
-				'required' => $this->p->t('ui','error_fieldRequired',['field' => 'Kontakt'])
+				'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Kontakt'])
 			]);
 
 		if ($this->form_validation->run() == false)
@@ -401,22 +401,20 @@ class Kontakt extends FHCAPI_Controller
 
 	public function updateContact($kontakt_id)
 	{
-		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-
 		$this->load->model('person/Kontakt_model', 'KontaktModel');
 
 		if(!$kontakt_id)
 		{
-			return $this->terminateWithError($this->p->t('ui','error_missingId',['id'=> 'Kontakt_id']), self::ERROR_TYPE_GENERAL);
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Kontakt_id']), self::ERROR_TYPE_GENERAL);
 		}
 
 		if(($_POST['kontakttyp'] == 'email' && isset($_POST['kontakt'])))
-			$this->form_validation->set_rules('kontakt', 'Kontakt', 'valid_email', [
-				'valid_email' => $this->p->t('ui','error_fieldNoValidEmail',['field' => 'Kontakt'])
+			$this->form_validation->set_rules('kontakt', 'Kontakt', 'validEmail', [
+				'validEmail' => $this->p->t('ui', 'error_fieldNoValidEmail', ['field' => 'Kontakt'])
 			]);
 		else
 			$this->form_validation->set_rules('kontakt', 'Kontakt', 'required', [
-				'required' => $this->p->t('ui','error_fieldRequired',['field' => 'Kontakt'])
+				'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Kontakt'])
 			]);
 
 		if ($this->form_validation->run() == false)
@@ -476,12 +474,11 @@ class Kontakt extends FHCAPI_Controller
 		}
 		elseif (!hasData($result))
 		{
-			return $this->terminateWithError($this->p->t('ui','error_missingId',['id'=> 'Kontakt_id']), self::ERROR_TYPE_GENERAL);
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Kontakt_id']), self::ERROR_TYPE_GENERAL);
 		}
 		return $this->terminateWithSuccess(current(getData($result)) ? : null);
 	}
 
-
 	public function getBankverbindung($person_id)
 	{
 		$this->load->model('person/Bankverbindung_model', 'BankverbindungModel');
@@ -500,15 +497,12 @@ class Kontakt extends FHCAPI_Controller
 
 	public function addNewBankverbindung($person_id)
 	{
-		$this->load->library('form_validation');
-		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-
 		$this->form_validation->set_rules('iban', 'IBAN', 'required', [
-			'required' => $this->p->t('ui','error_fieldRequired',['field' => 'IBAN'])
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'IBAN'])
 		]);
 
 		$this->form_validation->set_rules('typ', 'TYP', 'required', [
-			'required' => $this->p->t('ui','error_fieldRequired',['field' => 'TYP'])
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'TYP'])
 		]);
 
 		if ($this->form_validation->run() == false)
@@ -570,21 +564,19 @@ class Kontakt extends FHCAPI_Controller
 
 		if (!hasData($result))
 		{
-			return $this->terminateWithError($this->p->t('ui','error_missingId',['id'=> 'Bankverbindung_id']), self::ERROR_TYPE_GENERAL);
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Bankverbindung_id']), self::ERROR_TYPE_GENERAL);
 		}
 		$this->terminateWithSuccess(current(getData($result)));
 	}
 
 	public function updateBankverbindung($bankverbindung_id)
 	{
-		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-
 		$this->form_validation->set_rules('iban', 'IBAN', 'required', [
-			'required' => $this->p->t('ui','error_fieldRequired',['field' => 'IBAN'])
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'IBAN'])
 		]);
 
 		$this->form_validation->set_rules('typ', 'TYP', 'required', [
-			'required' => $this->p->t('ui','error_fieldRequired',['field' => 'TYP'])
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'TYP'])
 		]);
 
 		if ($this->form_validation->run() == false)
@@ -596,7 +588,7 @@ class Kontakt extends FHCAPI_Controller
 
 		if(!$bankverbindung_id)
 		{
-			return $this->terminateWithError($this->p->t('ui','error_missingId',['id'=> 'Bankverbindung_id']), self::ERROR_TYPE_GENERAL);
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Bankverbindung_id']), self::ERROR_TYPE_GENERAL);
 		}
 
 		$uid = getAuthUID();
@@ -649,70 +641,10 @@ class Kontakt extends FHCAPI_Controller
 		return $this->terminateWithSuccess(current(getData($result)) ? : null);
 	}
 
-/*	public function plz_required($value)
-	{
-		if (empty($value)) {
-			$this->form_validation->set_message('plz_required',  $this->p->t('ui','error_fieldRequired',['field' => 'PLZ']));
-			return false;
-		}
-		else
-		{
-			return true;
-		}
-	}*/
-
-/*	public function kontakt_required($value)
-	{
-		if (empty($value)) {
-			$this->form_validation->set_message('kontakt_required',  $this->p->t('ui','error_fieldRequired',['field' => 'Kontakt']));
-			return false;
-		}
-		else
-		{
-			return true;
-		}
-	}
-
-	public function iban_required($value)
-	{
-		if (empty($value)) {
-			$this->form_validation->set_message('iban_required',  $this->p->t('ui','error_fieldRequired',['field' => 'IBANoff']));
-			return false;
-		}
-		else
-		{
-			return true;
-		}
-	}
-
-	public function typ_required($value)
-	{
-		if (empty($value)) {
-			$this->form_validation->set_message('typ_required',  $this->p->t('ui','error_fieldRequired',['field' => 'Typ']));
-			return false;
-		}
-		else
-		{
-			return true;
-		}
-	}*/
-
-/*	public function plz_numeric($value)
-	{
-		if (!is_numeric($value)) {
-			$this->form_validation->set_message('plz_numeric',  $this->p->t('ui','error_fieldNotNumeric',['field' => 'PLZ']));
-			return false;
-		}
-		else
-		{
-			return true;
-		}
-	}*/
-
-	public function kontakt_valid_email($email)
+	public function kontaktValidEmail($email)
 	{
 		if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
-			$this->form_validation->set_message('kontakt_valid_email',  $this->p->t('ui','error_fieldNoValidEmail',['field' => 'Kontakt']));
+			$this->form_validation->set_message('kontaktValidEmail', $this->p->t('ui', 'error_fieldNoValidEmail', ['field' => 'Kontakt']));
 			return false;
 		}
 		else
@@ -720,4 +652,19 @@ class Kontakt extends FHCAPI_Controller
 			return true;
 		}
 	}
+
+	public function validateLocationCombination()
+	{
+		$this->load->model('codex/Gemeinde_model', 'GemeindeModel');
+
+		if($this->GemeindeModel->checkLocation($_POST['plz'], $_POST['gemeinde'], $_POST['ort']))
+		{
+			return true;
+		}
+		else
+		{
+			$this->form_validation->set_message('validateLocationCombination', $this->p->t('ui', 'error_location_combination'));
+			return false;
+		}
+	}
 }
diff --git a/application/controllers/components/stv/Kontakt.php b/application/controllers/components/stv/Kontakt.php
deleted file mode 100644
index 85071c416..000000000
--- a/application/controllers/components/stv/Kontakt.php
+++ /dev/null
@@ -1,709 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use \DateTime as DateTime;
-
-class Kontakt extends FHC_Controller
-{
-	public function __construct()
-	{
-		parent::__construct();
-
-		// Load Libraries
-		$this->load->library('AuthLib');
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-		$this->load->library('form_validation');
-
-		// Load language phrases
-		$this->loadPhrases([
-			'ui'
-		]);
-	}
-
-	public function getAdressen($person_id)
-	{
-		$this->load->model('person/Adresse_model', 'AdresseModel');
-
-		$this->AdresseModel->addSelect('public.tbl_adresse.*');
-		$this->AdresseModel->addSelect('t.*');
-		$this->AdresseModel->addSelect('f.firma_id');
-		$this->AdresseModel->addSelect('f.name as firmenname');
-		$this->AdresseModel->addJoin('public.tbl_adressentyp t', 'ON (t.adressentyp_kurzbz = public.tbl_adresse.typ)');
-		$this->AdresseModel->addJoin('public.tbl_firma f', 'ON (f.firma_id = public.tbl_adresse.firma_id)', 'LEFT');
-
-		$result = $this->AdresseModel->loadWhere(
-			array('person_id' => $person_id)
-		);
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			$this->outputJson(getError($result));
-		} else {
-			$this->outputJson(getData($result) ?: []);
-		}
-	}
-
-	public function addNewAddress($person_id)
-	{
-		$_POST = json_decode($this->input->raw_input_stream, true);
-
-		$this->form_validation->set_rules('plz', 'PLZ', 'callback_plz_required|callback_plz_numeric');
-
-		if ($this->form_validation->run() == false)
-		{
-			return $this->outputJsonError($this->form_validation->error_array());
-		}
-
-		$this->load->model('person/Adresse_model', 'AdresseModel');
-
-		$uid = getAuthUID();
-/*		$person_id = $this->input->post('$person_id');
-		$co_name = $this->input->post('co_name');
-		$strasse = $this->input->post('strasse');
-		$ort = $this->input->post('ort');
-		$gemeinde = $this->input->post('gemeinde');
-		$nation = $this->input->post('nation');
-		$name = $this->input->post('name');
-		$typ = $this->input->post('typ');
-		$anmerkung = $this->input->post('anmerkung');*/
-
-		$co_name = isset($_POST['co_name']) ? $_POST['co_name'] : null;
-		$strasse = isset($_POST['strasse']) ? $_POST['strasse'] : null;
-		$ort = isset($_POST['ort']) ? $_POST['ort'] : null;
-		$gemeinde = isset($_POST['gemeinde']) ? $_POST['gemeinde'] : null;
-		$nation = isset($_POST['nation']) ? $_POST['nation'] : null;
-		$name = isset($_POST['name']) ? $_POST['name'] : null;
-		$typ = isset($_POST['typ']) ? $_POST['typ'] : null;
-		$anmerkung = isset($_POST['anmerkung']) ? $_POST['anmerkung'] : null;
-
-		if(isset($_POST['firma']))
-		{
-			$firma_id = $_POST['firma']['firma_id'];
-		}
-		else
-			$firma_id = null;
-
-		$result = $this->AdresseModel->insert(
-			[
-				'person_id' => $person_id,
-				'strasse' =>  $strasse,
-				'insertvon' => $uid,
-				'insertamum' => date('c'),
-				'plz' => $_POST['plz'],
-				'ort' => $ort,
-				'gemeinde' => $gemeinde,
-				'nation' => $nation,
-				'heimatadresse' => $_POST['heimatadresse'],
-				'zustelladresse' => $_POST['zustelladresse'],
-				'co_name' => $co_name,
-				'typ' => $typ,
-				'firma_id' => $firma_id,
-				'name' => $name,
-				'rechnungsadresse' => $_POST['rechnungsadresse'],
-				'anmerkung' => $anmerkung
-
-			]
-		);
-		if (isError($result))
-		{
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson(getError($result));
-		}
-		return $this->outputJsonSuccess(true);
-	}
-
-	public function updateAddress($address_id)
-	{
-		$uid = getAuthUID();
-		$_POST = json_decode($this->input->raw_input_stream, true);
-
-		$this->form_validation->set_rules('plz', 'PLZ', 'callback_plz_required|callback_plz_numeric');
-
-		if ($this->form_validation->run() == false)
-		{
-			return $this->outputJsonError($this->form_validation->error_array());
-		}
-
-		$this->load->model('person/Adresse_model', 'AdresseModel');
-
-		if(!$address_id)
-		{
-			return $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-		}
-
-		if(isset($_POST['firma']))
-		{
-			$firma_id = $_POST['firma']['firma_id'];
-		}
-		else
-			$firma_id = null;
-
-
-
-		$person_id = isset($_POST['person_id']) ? $_POST['person_id'] : null;
-		$co_name = isset($_POST['co_name']) ? $_POST['co_name'] : null;
-		$strasse = isset($_POST['strasse']) ? $_POST['strasse'] : null;
-		$ort = isset($_POST['ort']) ? $_POST['ort'] : null;
-		$gemeinde = isset($_POST['gemeinde']) ? $_POST['gemeinde'] : null;
-		$nation = isset($_POST['nation']) ? $_POST['nation'] : null;
-		$name = isset($_POST['name']) ? $_POST['name'] : null;
-		$typ = isset($_POST['typ']) ? $_POST['typ'] : null;
-		$anmerkung = isset($_POST['anmerkung']) ? $_POST['anmerkung'] : null;
-
-/*		$person_id = $this->input->post('$person_id');
-		$co_name = $this->input->post('co_name');
-		$strasse = $this->input->post('strasse');
-		$ort = $this->input->post('ort');
-		$gemeinde = $this->input->post('gemeinde');
-		$nation = $this->input->post('nation');
-		$name = $this->input->post('name');
-		$typ = $this->input->post('typ');
-		$anmerkung = $this->input->post('anmerkung');*/
-
-		$result = $this->AdresseModel->update(
-			[
-			'adresse_id' => $address_id
-			],
-			[	'person_id' => $person_id,
-				'strasse' =>  $strasse,
-				'updatevon' => $uid,
-				'updateamum' => date('c'),
-				'plz' => $_POST['plz'],
-				'ort' => $ort,
-				'gemeinde' => $gemeinde,
-				'nation' => $nation,
-				'heimatadresse' => $_POST['heimatadresse'],
-				'zustelladresse' => $_POST['zustelladresse'],
-				'co_name' => $co_name,
-				'typ' => $typ,
-				'firma_id' => $firma_id,
-				'name' => $name,
-				'rechnungsadresse' => $_POST['rechnungsadresse'],
-				'anmerkung' => $anmerkung
-			]
-		);
-
-		if (isError($result))
-		{
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson(getError($result));
-		}
-		return $this->outputJsonSuccess(true);
-	}
-
-	public function loadAddress($adresse_id)
-	{
-		$this->load->model('person/Adresse_model', 'AdresseModel');
-
-		$this->AdresseModel->addSelect('public.tbl_adresse.*');
-		$this->AdresseModel->addSelect('t.*');
-		$this->AdresseModel->addSelect('f.firma_id');
-		$this->AdresseModel->addSelect('f.name as firmenname');
-		$this->AdresseModel->addJoin('public.tbl_adressentyp t', 'ON (t.adressentyp_kurzbz = public.tbl_adresse.typ)');
-		$this->AdresseModel->addJoin('public.tbl_firma f', 'ON (f.firma_id = public.tbl_adresse.firma_id)', 'LEFT');
-
-		$this->AdresseModel->addLimit(1);
-
-		$result = $this->AdresseModel->loadWhere(
-			array('adresse_id' => $adresse_id)
-		);
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			$this->outputJson($result);
-		}
-
-		elseif (!hasData($result)) {
-			$this->outputJson($result); //success mit Wert null
-		}
-		else
-		{
-			$this->outputJsonSuccess(current(getData($result)));
-		}
-	}
-
-	public function deleteAddress($adresse_id)
-	{
-		$this->load->model('person/Adresse_model', 'AdresseModel');
-
-		$result = $this->AdresseModel->delete(
-			array('adresse_id' => $adresse_id)
-		);
-
-		if (isError($result))
-		{
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			$this->outputJson($result);
-		}
-		elseif (!hasData($result)) {
-			$this->outputJson($result); //success mit Wert null
-		}
-		return $this->outputJsonSuccess(current(getData($result)));
-	}
-
-	public function getAdressentypen()
-	{
-		$this->load->model('person/Adressentyp_model', 'AdressentypModel');
-
-		$result = $this->AdressentypModel->load();
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			$this->outputJson(getError($result));
-		} else {
-			$this->outputJson(getData($result) ?: []);
-		}
-	}
-
-	public function getFirmen($searchString)
-	{
-		$this->load->model('ressource/firma_model', 'FirmaModel');
-
-		$result = $this->FirmaModel->searchFirmen($searchString);
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-		}
-		$this->outputJson($result);
-	}
-
-	public function getStandorte($searchString)
-	{
-		$this->load->model('organisation/standort_model', 'StandortModel');
-
-		$result = $this->StandortModel->searchStandorte($searchString);
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-		}
-		$this->outputJson($result);
-	}
-
-	public function getKontakte($person_id)
-	{
-		$this->load->model('person/Kontakt_model', 'KontaktModel');
-		$this->load->model('organisation/standort_model', 'StandortModel');
-		$this->KontaktModel->addSelect("*,
-			TO_CHAR (CASE 
-					WHEN public.tbl_kontakt.updateamum >= public.tbl_kontakt.insertamum 
-					THEN public.tbl_kontakt.updateamum 
-					ELSE public.tbl_kontakt.insertamum 
-				END::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS lastUpdate");
-		$this->StandortModel->addJoin('public.tbl_standort st', 'ON (public.tbl_kontakt.standort_id = st.standort_id)', 'LEFT');
-
-		$result = $this->KontaktModel->loadWhere(
-			array('person_id' => $person_id)
-		);
-
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			$this->outputJson(getError($result));
-		} else {
-			$this->outputJson(getData($result) ?: []);
-		}
-	}
-
-	public function getKontakttypen()
-	{
-		$this->load->model('person/Kontakttyp_model', 'KontakttypModel');
-
-		$result = $this->KontakttypModel->load();
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			$this->outputJson(getError($result));
-		} else {
-			$this->outputJson(getData($result) ?: []);
-		}
-	}
-
-	public function loadContact($kontakt_id)
-	{
-		$this->load->model('person/Kontakt_model', 'KontaktModel');
-
-		$this->KontaktModel->addSelect('public.tbl_kontakt.*');
-		$this->KontaktModel->addSelect('st.kurzbz');
-		$this->KontaktModel->addJoin('public.tbl_standort st', 'ON (public.tbl_kontakt.standort_id = st.standort_id)', 'LEFT');
-
-		$this->KontaktModel->addLimit(1);
-
-		$result = $this->KontaktModel->loadWhere(
-			array('kontakt_id' => $kontakt_id)
-		);
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			$this->outputJson($result);
-		}
-
-		elseif (!hasData($result)) {
-			$this->outputJson($result); //success mit Wert null
-			//	$this->outputJson(getData($result) ?: []);
-		}
-		else
-		{
-			$this->outputJsonSuccess(current(getData($result)));
-		}
-	}
-
-	public function addNewContact($person_id)
-	{
-		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-
-		if(($_POST['kontakttyp'] == 'email' && isset($_POST['kontakt'])))
-			$this->form_validation->set_rules('kontakt', 'Kontakt', 'callback_kontakt_valid_email');
-		else
-			$this->form_validation->set_rules('kontakt', 'Kontakt', 'callback_kontakt_required');
-
-		if ($this->form_validation->run() == false)
-		{
-			return $this->outputJsonError($this->form_validation->error_array());
-		}
-
-		$this->load->model('person/Kontakt_model', 'KontaktModel');
-
-		if(isset($_POST['standort']))
-		{
-			$standort_id = $_POST['standort']['standort_id'];
-		}
-		else
-			$standort_id = null;
-
-		$uid = getAuthUID();
-
-		$kontakttyp = $this->input->post('kontakttyp');
-		$anmerkung = $this->input->post('anmerkung');
-		$kontakt = $this->input->post('kontakt');
-		$ext_id = $this->input->post('ext_id');
-
-		$result = $this->KontaktModel->insert(
-			[
-				'person_id' => $person_id,
-				'kontakttyp' =>  $kontakttyp,
-				'anmerkung' => $anmerkung,
-				'kontakt' => $kontakt,
-				'zustellung' => $_POST['zustellung'],
-				'insertvon' => $uid,
-				'insertamum' => date('c'),
-				'standort_id' => $standort_id,
-				'ext_id' => $ext_id
-			]
-		);
-
-		if (isError($result))
-		{
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson($result);
-		}
-		return $this->outputJsonSuccess(true);
-	}
-
-	public function updateContact($kontakt_id)
-	{
-		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-
-		$this->load->model('person/Kontakt_model', 'KontaktModel');
-
-		if(!$kontakt_id)
-		{
-			return $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-		}
-
-		if(($_POST['kontakttyp'] == 'email' && isset($_POST['kontakt'])))
-			$this->form_validation->set_rules('kontakt', 'Kontakt', 'callback_kontakt_valid_email');
-		else
-			$this->form_validation->set_rules('kontakt', 'Kontakt', 'callback_kontakt_required');
-
-		if ($this->form_validation->run() == false)
-		{
-			return $this->outputJsonError($this->form_validation->error_array());
-		}
-
-		if(isset($_POST['standort']))
-		{
-			$standort_id = $_POST['standort']['standort_id'];
-		}
-		else
-			$standort_id = null;
-
-		$uid = getAuthUID();
-		$kontakttyp = $this->input->post('kontakttyp');
-		$anmerkung = $this->input->post('anmerkung');
-		$kontakt = $this->input->post('kontakt');
-		$ext_id = $this->input->post('ext_id');
-		$person_id = $this->input->post('person_id');
-
-		$result = $this->KontaktModel->update(
-			[
-			'kontakt_id' => $kontakt_id
-			],
-			[
-				'person_id' => $person_id,
-				'kontakttyp' =>  $kontakttyp,
-				'anmerkung' => $anmerkung,
-				'kontakt' => $kontakt,
-				'zustellung' => $_POST['zustellung'],
-				'insertvon' => 	$uid,
-				'insertamum' => date('c'),
-				'standort_id' => $standort_id,
-				'ext_id' => $ext_id
-			]
-		);
-
-		if (isError($result))
-		{
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson(getError($result));
-		}
-		return $this->outputJsonSuccess(true);
-	}
-
-	public function deleteContact($kontakt_id)
-	{
-		$this->load->model('person/Kontakt_model', 'KontaktModel');
-
-		$result = $this->KontaktModel->delete(
-			array('kontakt_id' => $kontakt_id)
-		);
-
-		if (isError($result))
-		{
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			$this->outputJson($result);
-		}
-		elseif (!hasData($result)) {
-			$this->outputJson($result);
-		}
-		return $this->outputJsonSuccess(current(getData($result)));
-	}
-
-
-	public function getBankverbindung($person_id)
-	{
-		$this->load->model('person/Bankverbindung_model', 'BankverbindungModel');
-
-		$this->BankverbindungModel->addSelect('*');
-
-		$result = $this->BankverbindungModel->loadWhere(
-			array('person_id' => $person_id)
-		);
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			$this->outputJson(getError($result));
-		} else {
-			$this->outputJson(getData($result) ?: []);
-		}
-	}
-
-	public function addNewBankverbindung($person_id)
-	{
-		$this->load->library('form_validation');
-		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-
-		$this->form_validation->set_rules('iban', 'IBAN', 'callback_iban_required');
-		$this->form_validation->set_rules('typ', 'TYP', 'callback_typ_required');
-
-		if ($this->form_validation->run() == false)
-		{
-			return $this->outputJsonError($this->form_validation->error_array());
-		}
-
-		$this->load->model('person/Bankverbindung_model', 'BankverbindungModel');
-
-		$ext_id = $this->input->post('ext_id');
-		$oe_kurzbz = $this->input->post('oe_kurzbz');
-		$orgform_kurzbz = $this->input->post('orgform_kurzbz');
-		$name = $this->input->post('name');
-		$anschrift = $this->input->post('anschrift');
-		$bic = $this->input->post('bic');
-		$blz  = $this->input->post('blz ');
-		$kontonr = $this->input->post('kontonr');
-
-		$result = $this->BankverbindungModel->insert(
-			[
-				'person_id' => $person_id,
-				'name' => $name,
-				'anschrift' => $anschrift,
-				'bic' => $bic,
-				'iban' => $_POST['iban'],
-				'blz' => $blz,
-				'kontonr' => $kontonr,
-				'insertvon' => 'uid',
-				'insertamum' => date('c'),
-				'typ' => $_POST['typ'],
-				'verrechnung' => $_POST['verrechnung'],
-				'ext_id' => $ext_id,
-				'oe_kurzbz' => $oe_kurzbz,
-				'orgform_kurzbz' => $orgform_kurzbz
-			]
-		);
-		if (isError($result))
-		{
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson($result);
-		}
-		return $this->outputJsonSuccess(true);
-	}
-
-	public function loadBankverbindung($bankverbindung_id)
-	{
-		$this->load->model('person/Bankverbindung_model', 'BankverbindungModel');
-
-		$this->BankverbindungModel->addSelect('*');
-
-		$this->BankverbindungModel->addLimit(1);
-
-		$result = $this->BankverbindungModel->loadWhere(
-			array('bankverbindung_id' => $bankverbindung_id)
-		);
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			$this->outputJson($result);
-		}
-
-		elseif (!hasData($result)) {
-			$this->outputJson($result); //success mit Wert null
-			//	$this->outputJson(getData($result) ?: []);
-		}
-		else
-		{
-			$this->outputJsonSuccess(current(getData($result)));
-		}
-	}
-
-	public function updateBankverbindung($bankverbindung_id)
-	{
-		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-
-		$this->form_validation->set_rules('iban', 'IBAN', 'callback_iban_required');
-		$this->form_validation->set_rules('typ', 'TYP', 'callback_typ_required');
-
-		$this->load->model('person/Bankverbindung_model', 'BankverbindungModel');
-
-		if(!$bankverbindung_id)
-		{
-			return $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-		}
-
-		if ($this->form_validation->run() == false)
-		{
-			return $this->outputJsonError($this->form_validation->error_array());
-		}
-
-		$uid = getAuthUID();
-
-		$result = $this->BankverbindungModel->update(
-			[
-			'bankverbindung_id' => $bankverbindung_id
-			],
-			[
-				'person_id' => $_POST['person_id'],
-				'name' => $_POST['name'],
-				'anschrift' => $_POST['anschrift'],
-				'bic' => $_POST['bic'],
-				'iban' => $_POST['iban'],
-				'blz' => $_POST['blz'],
-				'kontonr' => $_POST['kontonr'],
-				'updatevon' => $uid,
-				'updateamum' => date('c'),
-				'typ' => $_POST['typ'],
-				'verrechnung' => $_POST['verrechnung'],
-				'ext_id' => $_POST['ext_id'],
-				'oe_kurzbz' => $_POST['oe_kurzbz'],
-				'orgform_kurzbz' => $_POST['orgform_kurzbz']
-			]
-		);
-
-		if (isError($result))
-		{
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson(getError($result));
-		}
-		return $this->outputJsonSuccess(true);
-	}
-
-	public function deleteBankverbindung($bankverbindung_id)
-	{
-		$this->load->model('person/Bankverbindung_model', 'BankverbindungModel');
-
-		$result = $this->BankverbindungModel->delete(
-			array('bankverbindung_id' => $bankverbindung_id)
-		);
-
-		if (isError($result))
-		{
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			$this->outputJson($result);
-		}
-		elseif (!hasData($result)) {
-			$this->outputJson($result);
-		}
-		return $this->outputJsonSuccess(current(getData($result)));
-	}
-
-	public function plz_required($value)
-	{
-		if (empty($value)) {
-			$this->form_validation->set_message('plz_required',  $this->p->t('ui','error_fieldRequired',['field' => 'PLZ']));
-			return false;
-		}
-		else
-		{
-			return true;
-		}
-	}
-
-	public function kontakt_required($value)
-	{
-		if (empty($value)) {
-			$this->form_validation->set_message('kontakt_required',  $this->p->t('ui','error_fieldRequired',['field' => 'Kontakt']));
-			return false;
-		}
-		else
-		{
-			return true;
-		}
-	}
-
-	public function iban_required($value)
-	{
-		if (empty($value)) {
-			$this->form_validation->set_message('iban_required',  $this->p->t('ui','error_fieldRequired',['field' => 'IBANoff']));
-			return false;
-		}
-		else
-		{
-			return true;
-		}
-	}
-
-	public function typ_required($value)
-	{
-		if (empty($value)) {
-			$this->form_validation->set_message('typ_required',  $this->p->t('ui','error_fieldRequired',['field' => 'Typ']));
-			return false;
-		}
-		else
-		{
-			return true;
-		}
-	}
-
-	public function plz_numeric($value)
-	{
-		if (!is_numeric($value)) {
-			$this->form_validation->set_message('plz_numeric',  $this->p->t('ui','error_fieldNotNumeric',['field' => 'PLZ']));
-			return false;
-		}
-		else
-		{
-			return true;
-		}
-	}
-
-	public function kontakt_valid_email($email)
-	{
-		if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
-			$this->form_validation->set_message('kontakt_valid_email',  $this->p->t('ui','error_fieldNoValidEmail',['field' => 'Kontakt']));
-			return false;
-		}
-		else
-		{
-			return true;
-		}
-	}
-}
diff --git a/application/models/codex/Gemeinde_model.php b/application/models/codex/Gemeinde_model.php
index c782346a0..670da739d 100644
--- a/application/models/codex/Gemeinde_model.php
+++ b/application/models/codex/Gemeinde_model.php
@@ -19,4 +19,13 @@ class Gemeinde_model extends DB_Model
 		
 		return $this->loadWhere(array("plz" => $plz));
 	}
+
+	public function checkLocation($plz, $gemeinde, $ort)
+	{
+		$this->db->where('ortschaftsname', $ort);
+		$this->db->where('name', $gemeinde);
+		$this->db->where('plz', $plz);
+
+		return (boolean)$this->db->count_all_results($this->dbTable);
+	}
 }
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
index ba66b54b2..10ec77e8c 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
@@ -102,7 +102,7 @@ export default{
 				{
 					event: 'tableBuilt',
 					handler: async () => {
-						await this.$p.loadCategory(['notiz','global','person']);
+						await this.$p.loadCategory(['notiz','global','person', 'ui']);
 						let cm = this.$refs.table.tabulator.columnManager;
 
 						cm.getColumnByField('bezeichnung').component.updateDefinition({
@@ -393,7 +393,7 @@ export default{
 							name="gemeinde"
 							v-model="addressData.gemeinde"
 							>
-							<option v-if="!gemeinden.length" disabled>Bitte gültige PLZ wählen</option>
+							<option v-if="!gemeinden.length" disabled>{{$p.t('ui', 'bittePlzWaehlen')}}</option>
 							<option 
 								v-for="gemeinde in gemeinden" 
 								:key="gemeinde.name" 
@@ -421,7 +421,7 @@ export default{
 							name="ort"
 							v-model="addressData.ort"
 							>
-							<option v-if="!orte.length" disabled>Bitte gültige Gemeinde wählen</option>
+							<option v-if="!orte.length" disabled>{{$p.t('ui', 'bitteGemeindeWaehlen')}}</option>
 							<option 
 								v-for="ort in orte" 
 								:key="ort.ortschaftsname" 
@@ -608,7 +608,7 @@ export default{
 							name="addressData.gemeinde"
 							v-model="addressData.gemeinde"
 							>
-							<option v-if="!gemeinden.length" disabled>Bitte gültige PLZ wählen</option>
+							<option v-if="!gemeinden.length" disabled>{{$p.t('ui', 'bittePlzWaehlen')}}</option>
 							<option 
 								v-for="gemeinde in gemeinden" 
 								:key="gemeinde.name" 
@@ -629,7 +629,7 @@ export default{
 							name="ort"
 							v-model="addressData.ort"
 							>
-							<option v-if="!orte.length" disabled>Bitte gültige Gemeinde wählen</option>
+							<option v-if="!orte.length" disabled>{{$p.t('ui', 'bitteGemeindeWaehlen')}}</option>
 							<option 
 								v-for="ort in orte" 
 								:key="ort.ortschaftsname" 
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index c675be789..715daa1f9 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -28102,6 +28102,66 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'error_location_combination',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ort, Gemeinde und Postleitzahl passen nicht zusammen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'City, municipality and postcode do not match',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'bittePlzWaehlen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bitte gültige PLZ wählen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Please select valid postcode',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'bitteGemeindeWaehlen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bitte gültige Gemeinde wählen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Please select valid municipality',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 );
 
 

From 9454bde14aed361ee912e860e850a3fcd46a8bb3 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 29 May 2024 15:19:23 +0200
Subject: [PATCH 0746/1461] backport Betriebsmittel Component from
 feature-30660/FHC4_StudierendenGUI_Prototyp Branch

---
 .../models/ressource/Betriebsmittel_model.php | 20 +++++++++++++
 .../ressource/Betriebsmittelperson_model.php  | 29 +++++++++++++++++++
 2 files changed, 49 insertions(+)

diff --git a/application/models/ressource/Betriebsmittel_model.php b/application/models/ressource/Betriebsmittel_model.php
index 849a9199f..69aa962c1 100644
--- a/application/models/ressource/Betriebsmittel_model.php
+++ b/application/models/ressource/Betriebsmittel_model.php
@@ -11,4 +11,24 @@ class Betriebsmittel_model extends DB_Model
 		$this->dbTable = 'wawi.tbl_betriebsmittel';
 		$this->pk = 'betriebsmittel_id';
 	}
+
+	/**
+	 * load Liste Inventarnummern
+	 */
+	public function loadInventarliste($filter)
+	{
+		$filter = strtoLower($filter);
+
+		$qry = "
+			SELECT 
+			    bm.inventarnummer, bm.betriebsmitteltyp, bm.betriebsmittel_id, CONCAT(bm.inventarnummer, ' ', bm.beschreibung) as dropdowntext
+			FROM 
+			    wawi.tbl_betriebsmittel bm
+			WHERE 
+			    upper(bm.inventarnummer) LIKE '%" .$this->db->escape_like_str($filter)."%'
+			OR    
+			    lower(bm.inventarnummer) LIKE '%" .$this->db->escape_like_str($filter)."%'";
+
+		return $this->execQuery($qry);
+	}
 }
diff --git a/application/models/ressource/Betriebsmittelperson_model.php b/application/models/ressource/Betriebsmittelperson_model.php
index 04878a9ad..bffa82501 100644
--- a/application/models/ressource/Betriebsmittelperson_model.php
+++ b/application/models/ressource/Betriebsmittelperson_model.php
@@ -96,4 +96,33 @@ class Betriebsmittelperson_model extends DB_Model
 
 		return $this->loadWhere($condition);
 	}
+
+	public function getBetriebsmittelData($id, $type_id)
+	{
+		switch ($type_id) {
+			case 'person':
+				$cond = 'bmp.person_id';
+				break;
+			case 'uid':
+				$cond = 'bmp.uid';
+				break;
+			case 'betriebsmittelperson_id':
+				$cond = 'bmp.betriebsmittelperson_id';
+				break;
+			default:
+				return error("ID nicht gültig");
+		}
+
+		$query = "
+			SELECT 
+			    bm.nummer, bmp.person_id, bm.betriebsmitteltyp, bmp.anmerkung as anmerkung, bmp.retouram, TO_CHAR(bmp.retouram::timestamp, 'DD.MM.YYYY') AS format_retour, bmp.ausgegebenam, TO_CHAR(bmp.ausgegebenam::timestamp, 'DD.MM.YYYY') AS format_ausgabe, bm.beschreibung, bmp.uid, bmp.kaution, bm.betriebsmittel_id, bmp.betriebsmittelperson_id, bm.inventarnummer
+			FROM 
+			    wawi.tbl_betriebsmittelperson bmp
+			JOIN 
+			        wawi.tbl_betriebsmittel bm ON (bmp.betriebsmittel_id = bm.betriebsmittel_id)
+			WHERE 
+			    " . $cond . " = ? ";
+
+		return $this->execQuery($query, array($id));
+	}
 }

From 0c44a497a571db411e06a2d84751304afc162570 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 29 May 2024 16:06:09 +0200
Subject: [PATCH 0747/1461] adapt modal add/update status

---
 .../Details/Prestudent/MultiStatus.js         | 40 +++++++++++--------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index a0eb81491..43da6bd2d 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -283,7 +283,9 @@ export default{
 			actionButton: {},
 			actionStatusText: {},
 			actionSem: null,
-			newArray: {}
+			newArray: {},
+			abbruchData: {},
+			newStatus: ''
 		}
 	},
 	watch: {
@@ -511,8 +513,13 @@ export default{
 						console.log("singleNew");
 					}
 					else{
-						let newStatus = this.newArray[0].status_kurzbz;
-						console.log(`Successful: ${countSuccess}, Errors: ${countError}`);
+						if(this.newArray.length > 0) {
+							this.newStatus = this.newArray[0].status_kurzbz;
+							console.log(`Successful: ${countSuccess}, Errors: ${countError}`);
+						}
+						else {
+							this.newStatus = this.statusData.status_kurzbz;
+						}
 					}
 
 
@@ -521,7 +528,7 @@ export default{
 					 if (countSuccess > 0) {
 						 this.$fhcAlert.alertInfo(this.$p.t('ui', 'successNewStatus', {
 							 'countSuccess': countSuccess,
-							 'status': newStatus,
+							 'status': this.newStatus,
 							 'countError': countError
 						 }));
 					 }
@@ -684,8 +691,8 @@ export default{
 				<template #title>{{$p.t('lehre', 'status_new')}}</template>
 							
 					<form-form class="row g-3" ref="statusData">
-					
-						<div class="row mb-3">
+						<div class="row mb-3">	
+							<p class="py-2 fw-bold">Details {{modelValue.nachname}} {{modelValue.vorname}}</p>
 							<label for="status_kurzbz" class="form-label col-sm-4">{{$p.t('lehre', 'status_rolle')}}</label>
 							<div class="col-sm-6">
 
@@ -840,17 +847,18 @@ export default{
 			
 				<template #title>{{$p.t('lehre', 'status_edit')}}</template>
 					<form-form class="row g-3" ref="statusData">
-					
-					<div v-if="statusData.datum < dataMeldestichtag && !isStatusBeforeStudent">
-						<b>{{$p.t('bismeldestichtag', 'info_MeldestichtagStatusgrund')}}</b>
-					</div>
-					<div v-if="statusData.datum < dataMeldestichtag && isStatusBeforeStudent">
-						<b>{{$p.t('bismeldestichtag', 'info_MeldestichtagStatusgrundSemester')}}</b>
-					</div>
-					
-					 <input type="hidden" id="statusId" name="statusId" value="statusData.statusId">
-					
 						<div class="row mb-3">
+							<p class="py-2 fw-bold">Details {{modelValue.nachname}} {{modelValue.vorname}}</p>
+							
+							<div v-if="statusData.datum < dataMeldestichtag && !isStatusBeforeStudent" class="mb-1">
+								<b>{{$p.t('bismeldestichtag', 'info_MeldestichtagStatusgrund')}}</b>
+							</div>
+							<div v-if="statusData.datum < dataMeldestichtag && isStatusBeforeStudent">
+								<b>{{$p.t('bismeldestichtag', 'info_MeldestichtagStatusgrundSemester')}}</b>
+							</div>
+						
+							<input type="hidden" id="statusId" name="statusId" value="statusData.statusId">
+					
 							<label for="status_kurzbz" class="form-label col-sm-4">{{$p.t('lehre', 'status_rolle')}}</label>
 							<div class="col-sm-6">
 <!--								<form-input type="text" class="form-control" id="status_kurzbz" v-model="statusData['status_kurzbz']">-->

From 39321dcde378b8a3c0aac0e661c17ea73af93006 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 31 May 2024 12:28:06 +0200
Subject: [PATCH 0748/1461] adds the roomInformation Calendar to the menu and
 uses different template for the calendar page slot

---
 .../controllers/components/Cis/Stundenplan.php     |  1 +
 application/models/content/Content_model.php       |  9 +++++++++
 application/models/ressource/Stundenplan_model.php |  4 ++--
 public/js/apps/Cis/RoomInformation.js              | 14 ++++++++++----
 public/js/components/Calendar/Week/Page.js         |  2 +-
 5 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/application/controllers/components/Cis/Stundenplan.php b/application/controllers/components/Cis/Stundenplan.php
index 3ca8bbc2e..e0c163bac 100755
--- a/application/controllers/components/Cis/Stundenplan.php
+++ b/application/controllers/components/Cis/Stundenplan.php
@@ -74,6 +74,7 @@ class Stundenplan extends Auth_Controller
 
 		
 		$result = $this->StundenplanModel->getRoomDataOnDay('EDV_A2.06','2024-05-21');
+		$result = hasData($result) ? getData($result) : [];
 		//echo($this->db->last_query());
 		echo json_encode($result);
 		
diff --git a/application/models/content/Content_model.php b/application/models/content/Content_model.php
index ed447b36a..f42a395f9 100755
--- a/application/models/content/Content_model.php
+++ b/application/models/content/Content_model.php
@@ -165,6 +165,15 @@ class Content_model extends DB_Model
 						"menu_open": false,
 						"aktiv": true,
 						"childs": []
+					},
+					{
+						"content_id": 1000008,
+						"template_kurzbz": "redirect",
+						"titel": "room information (to delete)",
+						"content": "<content><url><![CDATA[' . site_url('/CisVue/Cms/getRoomInformation') . ']]></url><target><![CDATA[]]></target></content>",
+						"menu_open": false,
+						"aktiv": true,
+						"childs": []
 					}
 					
 				]
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index b566b0325..f67eab166 100755
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -21,7 +21,7 @@ class Stundenplan_model extends DB_Model
 	public function getRoomDataOnDay($ort_kurzbz,$date){
 
 
-		$this->addSelect(['*',"CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) as eintrag","lektor","CONCAT(lehrfach,'-',lehrform)"]);
+		$this->addSelect(['*',"CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) as stg","lektor","CONCAT(lehrfach,'-',lehrform) as lv_info" ]);
 		/* $this->addSelect(["lehre.tbl_stundenplan.*","CONCAT(UPPER(sg.typ),UPPER(sg.kurzbz),'-',lehre.tbl_stundenplan.semester,lehre.tbl_stundenplan.verband) as simml"]);
 		$this->addJoin("public.tbl_lehrverband as lv","lv.studiengang_kz=lehre.tbl_stundenplan.studiengang_kz AND lv.gruppe=lehre.tbl_stundenplan.gruppe AND lv.verband=lehre.tbl_stundenplan.verband AND lv.semester=lehre.tbl_stundenplan.semester","LEFT"); 
 		$this->addJoin("public.tbl_studiengang as sg","sg.studiengang_kz=lehre.tbl_stundenplan.studiengang_kz","LEFT"); 
@@ -29,7 +29,7 @@ class Stundenplan_model extends DB_Model
 		$res = hasData($res) ? getData($res): null;
 		return $res; */
 		$this->db->where('ort_kurzbz','EDV_A2.06',true);
-		$this->db->where('datum','2024-05-21',true);
+		$this->db->where('datum >=','2024-05-21',true);
 
 		$query = $this->db->get_compiled_select('lehre.vw_stundenplan sp');
 		
diff --git a/public/js/apps/Cis/RoomInformation.js b/public/js/apps/Cis/RoomInformation.js
index adb571047..cc7aec2bb 100644
--- a/public/js/apps/Cis/RoomInformation.js
+++ b/public/js/apps/Cis/RoomInformation.js
@@ -37,12 +37,12 @@ const app = Vue.createApp({
                     });
                     events = res.data;
                     //console.log("this are the room events",events)
-                    //this.events = events;
+                    this.events = events;
                 }
             }).catch((e)=>{console.log(e,"this is the exception")})
 		});
 
-        axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/Cis/Stundenplan').then(res => {
+        /* axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/Cis/Stundenplan').then(res => {
             
             let events;
             console.log(" this is the res of the api call stundenplan",res);
@@ -65,7 +65,7 @@ const app = Vue.createApp({
         }).catch((e)=>{console.log(e,"this is the exception")}) 
 
 
-        
+         */
 
        
 
@@ -73,7 +73,13 @@ const app = Vue.createApp({
     template: /*html*/`
     <div>
     <!--initialDate="2023-5-12"-->
-        <fhc-calendar :initialDate="testDate" :events="events" initial-mode="week" show-weeks></fhc-calendar>
+        <fhc-calendar v-slot="{event}" :initialDate="testDate" :events="events" initial-mode="week" show-weeks>
+            <div class="d-flex flex-column align-items-center justify-content-evenly h-100">
+                <span>{{event.orig.lv_info}}</span>	
+                <span>{{event.orig.stg}}</span>
+                <span>{{event.orig.lektor}}</span>
+			</div>
+        </fhc-calendar>
     </div>
     `,
 });
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index eef39011a..cd0ec816e 100755
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -112,7 +112,7 @@ export default {
 						<div v-for="hour in hours" style="min-height:100px" :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
 					</div>
 					<div v-for="day in eventsPerDayAndHour" :key="day" class="day border-start" :style="{'grid-template-columns': 'repeat(' + day.lanes + ', 1fr)', 'grid-template-rows': 'repeat(' + (1440 / smallestTimeFrame) + ', 1fr)'}">
-						<a  href="#" :title="event.orig.title + ' - ' + event.orig.lehrfach_bez + ' [' + event.orig.ort_kurzbz+']'" v-for="event in day.events" :key="event" class="mx-2 border border-dark border-2 small rounded overflow-hidden text-decoration-none text-dark" :style="{'grid-column-start': 1+(event.lane-1)*day.lanes/event.maxLane, 'grid-column-end': 1+event.lane*day.lanes/event.maxLane, 'grid-row-start': dateToMinutesOfDay(event.start), 'grid-row-end': dateToMinutesOfDay(event.end), 'background': event.orig.farbe?event.orig.farbe:'white' ,'--test': dateToMinutesOfDay(event.end)}" @click.prevent="$emit('input', event.orig)">
+						<a  href="#" :title="event.orig.title + ' - ' + event.orig.lehrfach_bez + ' [' + event.orig.ort_kurzbz+']'" v-for="event in day.events" :key="event" class="mx-2 border border-dark border-2 small rounded overflow-hidden text-decoration-none text-dark" :style="{'background-color': event.orig.farbe?'#'.concat(event.orig.farbe):'white','grid-column-start': 1+(event.lane-1)*day.lanes/event.maxLane, 'grid-column-end': 1+event.lane*day.lanes/event.maxLane, 'grid-row-start': dateToMinutesOfDay(event.start), 'grid-row-end': dateToMinutesOfDay(event.end) ,'--test': dateToMinutesOfDay(event.end)}" @click.prevent="$emit('input', event.orig)">
 							<slot :event="event" />
 						</a>
 					</div>

From b477d814c69817a073e98d452733dc1e6806ee7d Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 3 Jun 2024 09:21:45 +0200
Subject: [PATCH 0749/1461] Bugfix: missing end-tag

---
 .../Studentenverwaltung/Details/Kontakt/Bankaccount.js    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
index af668afe5..78dfada64 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
@@ -215,7 +215,7 @@ export default{
 		<BsModal title="Bankverbindung anlegen" ref="newBankverbindungModal">
 
 			<template #title>{{$p.t('person', 'bankvb_new')}}</template>
-						<form-form class="row g-3" ref="bankverbindungData">
+			<form-form class="row g-3" ref="bankverbindungData">
 				<div class="row mb-3">
 					<label for="name" class="form-label col-sm-4">Name</label>
 					<div class="col-sm-6">
@@ -224,6 +224,7 @@ export default{
 							name="name" 
 							v-model="bankverbindungData.name"
 						>
+						</form-input>
 					</div>
 				</div>
 				<div class="row mb-3">										   
@@ -247,7 +248,7 @@ export default{
 								v-model="bankverbindungData.iban"
 								required
 							>
-						</form-input>
+							</form-input>
 						</div>
 					</div>
 					<div class="row mb-3">								   
@@ -324,11 +325,12 @@ export default{
 					<div class="row mb-3">
 						<label for="name" class="form-label col-sm-4">Name</label>
 						<div class="col-sm-6">
-								<form-input 
+							<form-input 
 								type="text" 
 								name="name" 
 								v-model="bankverbindungData.name"
 							>
+							</form-input>
 						</div>
 					</div>
 					<div class="row mb-3">									   

From 92319b9b291af5b362a01f1d0b342efd758d1441 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 3 Jun 2024 10:27:03 +0200
Subject: [PATCH 0750/1461] quick fix for overlapping dashboard elements on
 mobile phones

---
 public/css/components/dashboard.css       | 2 +-
 public/js/components/Dashboard/Section.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
index b6ad81d2d..9da199442 100755
--- a/public/css/components/dashboard.css
+++ b/public/css/components/dashboard.css
@@ -19,7 +19,7 @@
 }
 @media(max-width: 577px) {
 	:root {
-		--fhc-dashboard-grid-size: 2;
+		--fhc-dashboard-grid-size: 1;
 	}
 }
 
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index e48b580ed..4aa7c823f 100755
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -32,7 +32,7 @@ export default {
 	computed: {
 		items() {
 			return this.widgets.map(item => {
-				return {...item, ...(item.place[this.gridWidth] || {})};
+				return {...item, ...(item.place[this.gridWidth] || {h: 1, w:1, x:0, y:0})};
 			});
 		}
 	},

From 9a3a72deb0ed06f22a6fff51578280f5371d17b8 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 3 Jun 2024 10:33:11 +0200
Subject: [PATCH 0751/1461] Permissions Bankverbindungen

---
 application/controllers/api/frontend/v1/stv/Config.php |  6 +++++-
 .../controllers/api/frontend/v1/stv/Kontakt.php        | 10 +++++-----
 .../Stv/Studentenverwaltung/Details/Kontakt.js         |  5 +++--
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index 87abe4ef4..35ee552b0 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -61,7 +61,11 @@ class Config extends FHCAPI_Controller
 		];
 		$result['contact'] = [
 			'title' => $this->p->t('stv', 'tab_contact'),
-			'component' => './Stv/Studentenverwaltung/Details/Kontakt.js'
+			'component' => './Stv/Studentenverwaltung/Details/Kontakt.js',
+			'config' => [
+				'showBankaccount' => $this->permissionlib->isBerechtigt('mitarbeiter/bankdaten')
+					|| $this->permissionlib->isBerechtigt('student/bankdaten')
+			]
 		];
 		$result['prestudent'] = [
 			'title' => $this->p->t('stv', 'tab_prestudent'),
diff --git a/application/controllers/api/frontend/v1/stv/Kontakt.php b/application/controllers/api/frontend/v1/stv/Kontakt.php
index e24e2d9e2..e3993dd49 100644
--- a/application/controllers/api/frontend/v1/stv/Kontakt.php
+++ b/application/controllers/api/frontend/v1/stv/Kontakt.php
@@ -12,22 +12,22 @@ class Kontakt extends FHCAPI_Controller
 			'getAdressen' => ['admin:r', 'assistenz:r'],
 			'addNewAddress' => ['admin:r', 'assistenz:r'],
 			'addNewContact' => ['admin:r', 'assistenz:r'],
-			'addNewBankverbindung' => ['admin:r', 'assistenz:r'],
+			'addNewBankverbindung' => ['mitarbeiter/bankdaten:w', 'student/bankdaten:w'],
 			'updateAddress' => ['admin:r', 'assistenz:r'],
 			'updateContact' => ['admin:r', 'assistenz:r'],
-			'updateBankverbindung' => ['admin:r', 'assistenz:r'],
+			'updateBankverbindung' => ['mitarbeiter/bankdaten:w', 'student/bankdaten:w'],
 			'loadAddress' => ['admin:r', 'assistenz:r'],
 			'loadContact' => ['admin:r', 'assistenz:r'],
-			'loadBankverbindung' => ['admin:r', 'assistenz:r'],
+			'loadBankverbindung' => ['mitarbeiter/bankdaten:r', 'student/bankdaten:r'],
 			'deleteAddress' => ['admin:r', 'assistenz:r'],
 			'deleteContact' => ['admin:r','assistenz:r'],
-			'deleteBankverbindung' => ['admin:r','assistenz:r'],
+			'deleteBankverbindung' => ['mitarbeiter/bankdaten:w','astudent/bankdaten:w'],
 			'getAdressentypen' => ['admin:r', 'assistenz:r'],
 			'getKontakttypen' => ['admin:r', 'assistenz:r'],
 			'getFirmen' => ['admin:r', 'assistenz:r'],
 			'getStandorte' => ['admin:r', 'assistenz:r'],
 			'getKontakte' => ['admin:r', 'assistenz:r'],
-			'getBankverbindung' => ['admin:r', 'assistenz:r'],
+			'getBankverbindung' => ['mitarbeiter/bankdaten:r', 'student/bankdaten:r'],
 
 		]);
 
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt.js
index f9eff15f7..a32de8df4 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt.js
@@ -9,7 +9,8 @@ export default {
 		BankaccountList,
 	},
 	props: {
-		modelValue: Object
+		modelValue: Object,
+		config: Object
 	},
 	data() {
 		return {
@@ -30,7 +31,7 @@ export default {
 			<contact-list ref="contactList" :uid="modelValue.person_id"></contact-list>
 		</fieldset>
 		<br>
-		<fieldset class="overflow-hidden">
+		<fieldset v-if="config.showBankaccount" class="overflow-hidden">
 			<legend>{{this.$p.t('person', 'bankverbindungen')}}</legend>
 			<bankaccount-list ref="bankaccountList" :uid="modelValue.person_id"></bankaccount-list>
 		</fieldset>

From 204de3045916793bbf2949ef5c369f91b47d1583 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 3 Jun 2024 10:46:26 +0200
Subject: [PATCH 0752/1461] make news modal more responsive

---
 public/js/components/DashboardWidget/News.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/DashboardWidget/News.js b/public/js/components/DashboardWidget/News.js
index 830af955e..6f862d085 100755
--- a/public/js/components/DashboardWidget/News.js
+++ b/public/js/components/DashboardWidget/News.js
@@ -101,7 +101,7 @@ export default {
   <BsModal ref="allNewsModal" id="allNewsModal" dialog-class="modal-fullscreen">
     <template #title>Alle News</template>
     <template #default>
-    <div class="row row-cols-5 g-4 h-100 px-5">
+    <div class="row row-cols-md-2 row-cols-lg-3 row-cols-xl-5 g-4 h-100 px-5">
      <div v-for="news in allNewsList" :key="news.id">
             <div class="card h-100">
                 <img :src="placeHolderImgURL" class="card-img-top">

From 7491b9c1b010f2703ee0edb604dd644c2fe0307b Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 3 Jun 2024 11:35:11 +0200
Subject: [PATCH 0753/1461] try to fix mobile dashboard view

---
 public/js/components/Drop/Grid/Item.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Drop/Grid/Item.js b/public/js/components/Drop/Grid/Item.js
index 47eec85ee..8087aadd8 100755
--- a/public/js/components/Drop/Grid/Item.js
+++ b/public/js/components/Drop/Grid/Item.js
@@ -43,11 +43,12 @@ export default {
 				else if (dragAction == 'resize')
 					return this.$emit('startResize', evt, item);
 			}
-			evt.preventDefault();
+			//evt.preventDefault();
 		},
 		touchDragEnd(evt) {
 			if (!this.dragging)
-				return evt.preventDefault();
+				//return evt.preventDefault();
+                                return;
 			this.dragging = false;
 			this.$emit('dropDrag', evt);
 		},

From 9652f480447912a590d9ccf37280f53f8b7bc317 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Mon, 3 Jun 2024 16:27:31 +0200
Subject: [PATCH 0754/1461] Added phrases 'zugeklappt', 'softwareliste',
 'raumverfuegbarkeit'

---
 system/phrasesupdate.php | 60 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 5a6101181..8baf66909 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -24859,6 +24859,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'zugeklappt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'zugeklappt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'folded',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'softwarebereitstellung',
 		'category' => 'global',
@@ -26039,6 +26059,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'softwareliste',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Softwareliste',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Softwarelist',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'raumverfuegbarkeit',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Raumverfügbarkeit',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Room Availability',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 );
 
 

From 512002c0e80218b35ac3fc41515f03a73899330e Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Mon, 3 Jun 2024 16:40:35 +0200
Subject: [PATCH 0755/1461] Created init.js file and changed link url in
 stpl_week to open Software-Raumsuche by OrtKurzbz

---
 cis/private/lvplan/stpl_week.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cis/private/lvplan/stpl_week.php b/cis/private/lvplan/stpl_week.php
index e58ce03ed..6836bbd76 100644
--- a/cis/private/lvplan/stpl_week.php
+++ b/cis/private/lvplan/stpl_week.php
@@ -269,8 +269,8 @@ if (isset($_POST['titel']))
 	$addon_obj->loadAddons();
 	foreach($addon_obj->result as $addon)
 	{
-		if(file_exists('../../../addons/'.$addon->kurzbz.'/cis/init.js.php'))
-			echo '<script type="application/x-javascript" src="../../../addons/'.$addon->kurzbz.'/cis/init.js.php" ></script>';
+		if(file_exists('../../../addons/'.$addon->kurzbz.'/cis/softwarebereitstellung/init.js.php'))
+			echo '<script type="application/x-javascript" src="../../../addons/'.$addon->kurzbz.'/cis/softwarebereitstellung/init.js.php"></script>';
 	}
 
 	// Wenn Seite fertig geladen ist Addons aufrufen

From 3b3191c4079766691b481f3d164feb965704e354 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 3 Jun 2024 16:59:59 +0200
Subject: [PATCH 0756/1461] Kontakt Validation

---
 .../api/frontend/v1/stv/Kontakt.php           | 38 ++++++-------------
 1 file changed, 11 insertions(+), 27 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Kontakt.php b/application/controllers/api/frontend/v1/stv/Kontakt.php
index e3993dd49..ac66c69c0 100644
--- a/application/controllers/api/frontend/v1/stv/Kontakt.php
+++ b/application/controllers/api/frontend/v1/stv/Kontakt.php
@@ -70,7 +70,9 @@ class Kontakt extends FHCAPI_Controller
 		]);
 
 		if(isset($_POST['gemeinde']) && isset($_POST['ort']))
-		$this->form_validation->set_rules('plz', 'Postleitzahl', 'callback_validate_location_combination');
+		$this->form_validation->set_rules('plz', 'Postleitzahl', 'callback_validateLocationCombination', [
+			'validateLocationCombination' => $this->p->t('ui', 'error_location_combination')
+		]);
 
 		if ($this->form_validation->run() == false)
 		{
@@ -133,7 +135,9 @@ class Kontakt extends FHCAPI_Controller
 		]);
 
 		if(isset($_POST['gemeinde']) && isset($_POST['ort']))
-			$this->form_validation->set_rules('plz', 'Postleitzahl', 'callback_validateLocationCombination');
+			$this->form_validation->set_rules('plz', 'Postleitzahl', 'callback_validateLocationCombination', [
+				'validateLocationCombination' => $this->p->t('ui', 'error_location_combination')
+			]);
 
 		if ($this->form_validation->run() == false)
 		{
@@ -349,8 +353,8 @@ class Kontakt extends FHCAPI_Controller
 	public function addNewContact($person_id)
 	{
 		if(($_POST['kontakttyp'] == 'email' && isset($_POST['kontakt'])))
-			$this->form_validation->set_rules('kontakt', 'Kontakt', 'validEmail', [
-				'validEmail' => $this->p->t('ui', 'error_fieldNoValidEmail', ['field' => 'Kontakt'])
+			$this->form_validation->set_rules('kontakt', 'Kontakt', 'valid_email', [
+				'valid_email' => $this->p->t('ui', 'error_fieldNoValidEmail', ['field' => 'Kontakt'])
 			]);
 		else
 			$this->form_validation->set_rules('kontakt', 'Kontakt', 'required', [
@@ -409,8 +413,8 @@ class Kontakt extends FHCAPI_Controller
 		}
 
 		if(($_POST['kontakttyp'] == 'email' && isset($_POST['kontakt'])))
-			$this->form_validation->set_rules('kontakt', 'Kontakt', 'validEmail', [
-				'validEmail' => $this->p->t('ui', 'error_fieldNoValidEmail', ['field' => 'Kontakt'])
+			$this->form_validation->set_rules('kontakt', 'Kontakt', 'valid_email', [
+				'valid_email' => $this->p->t('ui', 'error_fieldNoValidEmail', ['field' => 'Kontakt'])
 			]);
 		else
 			$this->form_validation->set_rules('kontakt', 'Kontakt', 'required', [
@@ -641,30 +645,10 @@ class Kontakt extends FHCAPI_Controller
 		return $this->terminateWithSuccess(current(getData($result)) ? : null);
 	}
 
-	public function kontaktValidEmail($email)
-	{
-		if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
-			$this->form_validation->set_message('kontaktValidEmail', $this->p->t('ui', 'error_fieldNoValidEmail', ['field' => 'Kontakt']));
-			return false;
-		}
-		else
-		{
-			return true;
-		}
-	}
-
 	public function validateLocationCombination()
 	{
 		$this->load->model('codex/Gemeinde_model', 'GemeindeModel');
 
-		if($this->GemeindeModel->checkLocation($_POST['plz'], $_POST['gemeinde'], $_POST['ort']))
-		{
-			return true;
-		}
-		else
-		{
-			$this->form_validation->set_message('validateLocationCombination', $this->p->t('ui', 'error_location_combination'));
-			return false;
-		}
+		return $this->GemeindeModel->checkLocation($_POST['plz'], $_POST['gemeinde'], $_POST['ort']);
 	}
 }

From 0cbb8997e29aede63ae789580786e5009bf055d7 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 3 Jun 2024 17:14:55 +0200
Subject: [PATCH 0757/1461] migratecontract config und config check auch in
 MigrateHourlyRate verwenden

---
 .../controllers/system/MigrateHourlyRate.php  | 46 +++++++++++++++++--
 1 file changed, 43 insertions(+), 3 deletions(-)

diff --git a/application/controllers/system/MigrateHourlyRate.php b/application/controllers/system/MigrateHourlyRate.php
index 734934ad0..dbc8f1416 100644
--- a/application/controllers/system/MigrateHourlyRate.php
+++ b/application/controllers/system/MigrateHourlyRate.php
@@ -4,14 +4,15 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 class MigrateHourlyRate extends CLI_Controller
 {
-	
-	CONST DEFAULT_OE = 'gst';
 	CONST DEFAULT_DATE = '1970-01-01';
 	CONST STUNDENSTAZTYP_LEHRE = 'lehre';
 	CONST STUNDENSTAZTYP_KALKULATORISCH = 'kalkulatorisch';
 	
+	private $OE_DEFAULT;
 	private $_ci;
 
+	protected $configerrors;
+
 	public function __construct()
 	{
 		parent::__construct();
@@ -21,10 +22,37 @@ class MigrateHourlyRate extends CLI_Controller
 		$this->load->model('codex/Bisverwendung_model', 'BisVerwendungModel');
 		$this->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
 		$this->load->model('ressource/Stundensatz_model', 'StundensatzModel');
+
+		$this->load->config('migratecontract');
+
+		$this->OE_DEFAULT = $this->config->item('migratecontract_oe_default');
+		$this->configerrors = array();
+	}
+
+	public function checkConfig()
+	{
+	    echo "OE_DEFAULT: " . $this->OE_DEFAULT . "\n";
+
+	    $this->checkOE_DEFAULT();
+
+	    if( count($this->configerrors) > 0 )
+	    {
+		foreach($this->configerrors AS $configerror)
+		{
+		    echo $configerror . "\n";
+		}
+		die("Fehler in der Konfiguration. Abbruch!\n");
+	    }
+	    else
+	    {
+		echo "Konfiguration OK.\n";
+	    }
 	}
 
 	public function index($user = null)
 	{
+		$this->checkConfig();
+
 		echo "Lehre Stundensaetze werden migriert.\n";
 		$mitarbeiterResult = $this->_getMitarbeiterStunden($user);
 		if (isError($mitarbeiterResult)) return $mitarbeiterResult;
@@ -61,6 +89,18 @@ class MigrateHourlyRate extends CLI_Controller
 		}
 	}
 
+	protected function checkOE_DEFAULT()
+	{
+	    $db = new DB_Model();
+	    $oesql = 'SELECT * FROM public.tbl_organisationseinheit WHERE oe_kurzbz = ?';
+	    $oeres = $db->execReadOnlyQuery($oesql, array($this->OE_DEFAULT));
+	    if( !hasData($oeres) )
+	    {
+		$this->configerrors[] = 'Default Organisationseinheit: "'
+		    . $this->OE_DEFAULT . '" nicht gefunden.';
+	    }
+	}
+
 	protected function checkIfSAPSyncTableExists()
 	{
 	    $dbModel = new DB_Model();
@@ -167,7 +207,7 @@ class MigrateHourlyRate extends CLI_Controller
 			$unternehmenResult = $this->_findUnternehmen($mitarbeiter->uid, "'kstzuordnung', 'oezuordnung'");
 		}
 
-		$unternehmen = self::DEFAULT_OE;
+		$unternehmen = $this->OE_DEFAULT;
 
 		if (hasData($unternehmenResult))
 			$unternehmen = getData($unternehmenResult)[0]->oe_kurzbz;

From 3df1aaf371786bf2696ab8fdffff48396a4665ea Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 4 Jun 2024 08:24:58 +0200
Subject: [PATCH 0758/1461] uses the new fhcApi factory to make the
 roomInformation get request from the frontent/v1/stundenplan api and uses the
 CalendarDate class to get the first day of the week and the last day of the
 week to make the request for the room information over the whole week

---
 .../api/frontend/v1/Stundenplan.php           | 90 +++++++++++++++++++
 .../components/Cis/Stundenplan.php            |  3 -
 .../models/ressource/Stundenplan_model.php    |  9 +-
 public/js/api/fhcapifactory.js                |  4 +-
 public/js/api/studenplan.js                   | 15 ++++
 public/js/apps/Cis/RoomInformation.js         | 63 ++++---------
 public/js/components/Calendar/Week/Page.js    |  1 -
 7 files changed, 132 insertions(+), 53 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/Stundenplan.php
 create mode 100644 public/js/api/studenplan.js

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
new file mode 100644
index 000000000..5e35ae3c9
--- /dev/null
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -0,0 +1,90 @@
+<?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');
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the SearchBarLib (back-end)
+ * Provides data to the ajax get calls about the searchbar component
+ * This controller works with JSON calls on the HTTP GET and the output is always JSON
+ */
+class Stundenplan extends FHCAPI_Controller
+{
+
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+	
+		parent::__construct([
+			'roomInformation' => self::PERM_LOGGED,
+            'Stunden' => self::PERM_LOGGED
+		]);
+
+		// Load the library ...
+		// $this->load->library('');
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * Gets a JSON body via HTTP POST and provides the parameters
+	 */
+	public function roomInformation()
+	{
+        // storing the get parameter in local variables
+        $ort_kurzbz = $this->input->get('ort_kurzbz', TRUE);
+        $start_date = $this->input->get('start_date', TRUE);
+        $end_date = $this->input->get('end_date', TRUE);
+        
+        $this->addMeta("ort",$ort_kurzbz);
+        $this->addMeta("start date",$start_date);
+        $this->addMeta("end date",$end_date);
+        $this->addMeta("testKey","testValue");
+        
+        $this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+		
+		$result = $this->StundenplanModel->getRoomDataOnDay($ort_kurzbz,$start_date,$end_date);
+		if(isError($result)){
+            $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+        }
+
+        $result = hasData($result) ? getData($result) : [];
+		//echo($this->db->last_query());
+		$this->terminateWithSuccess($result);
+		
+	}
+
+    public function Stunden()
+	{
+		$this->load->model('ressource/Stunde_model', 'StundeModel');
+
+		$result = $this->StundeModel->load();
+
+		if (isError($result)){
+            $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+        }
+            
+        $result = hasData($result)? getData($result) : [];
+
+        $this->terminateWithSuccess($result);
+	}
+}
+
diff --git a/application/controllers/components/Cis/Stundenplan.php b/application/controllers/components/Cis/Stundenplan.php
index e0c163bac..76535befa 100755
--- a/application/controllers/components/Cis/Stundenplan.php
+++ b/application/controllers/components/Cis/Stundenplan.php
@@ -69,9 +69,6 @@ class Stundenplan extends Auth_Controller
 	public function RoomInformation()
 	{
 		$this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
-
-
-
 		
 		$result = $this->StundenplanModel->getRoomDataOnDay('EDV_A2.06','2024-05-21');
 		$result = hasData($result) ? getData($result) : [];
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index f67eab166..64550ccbf 100755
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -18,7 +18,7 @@ class Stundenplan_model extends DB_Model
 	 * 
 	 * @return stdClass
 	 */
-	public function getRoomDataOnDay($ort_kurzbz,$date){
+	public function getRoomDataOnDay($ort_kurzbz='EDV_A2.06',$start_date='2024-05-21',$end_date='2024-05-21'){
 
 
 		$this->addSelect(['*',"CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) as stg","lektor","CONCAT(lehrfach,'-',lehrform) as lv_info" ]);
@@ -28,12 +28,13 @@ class Stundenplan_model extends DB_Model
 		$res = $this->loadWhere(['ort_kurzbz'=>$ort_kurzbz,'datum'=>$date]);
 		$res = hasData($res) ? getData($res): null;
 		return $res; */
-		$this->db->where('ort_kurzbz','EDV_A2.06',true);
-		$this->db->where('datum >=','2024-05-21',true);
+		$this->db->where('ort_kurzbz',$ort_kurzbz,true);
+		$this->db->where('datum >=',$start_date,true);
+		$this->db->where('datum <=',$end_date,true);
 
 		$query = $this->db->get_compiled_select('lehre.vw_stundenplan sp');
 		
-		return $this->execQuery($query, [$ort_kurzbz, $date]);
+		return $this->execQuery($query, [$ort_kurzbz, $start_date, $end_date]);
 	}
 
 	/**
diff --git a/public/js/api/fhcapifactory.js b/public/js/api/fhcapifactory.js
index 41c89ef50..d5d07e000 100644
--- a/public/js/api/fhcapifactory.js
+++ b/public/js/api/fhcapifactory.js
@@ -20,11 +20,13 @@ import phrasen from "./phrasen.js";
 import navigation from "./navigation.js";
 import filter from "./filter.js";
 import studstatus from "./studstatus.js";
+import stundenplan from "./studenplan.js";
 
 export default {
     search,
     phrasen,
     navigation,
     filter,
-    studstatus
+    studstatus,
+    stundenplan,
 };
diff --git a/public/js/api/studenplan.js b/public/js/api/studenplan.js
new file mode 100644
index 000000000..2da67a737
--- /dev/null
+++ b/public/js/api/studenplan.js
@@ -0,0 +1,15 @@
+
+export default {
+	getRoomInfo(ort_kurzbz, start_date, end_date) {
+		return this.$fhcApi.get(
+			'/api/frontend/v1/Stundenplan/roomInformation',
+			{  ort_kurzbz, start_date, end_date}
+		);
+	},
+	getStunden() {
+		return this.$fhcApi.get(
+			'/api/frontend/v1/Stundenplan/Stunden',
+			{}
+		);
+	},
+};
\ No newline at end of file
diff --git a/public/js/apps/Cis/RoomInformation.js b/public/js/apps/Cis/RoomInformation.js
index cc7aec2bb..fbe49386d 100644
--- a/public/js/apps/Cis/RoomInformation.js
+++ b/public/js/apps/Cis/RoomInformation.js
@@ -1,4 +1,6 @@
 import FhcCalendar from "../../components/Calendar/Calendar.js";
+import CalendarDate from "../../composables/CalendarDate.js";
+import FhcApi from "../../plugin/FhcApi.js";
 
 const app = Vue.createApp({
 	components: {
@@ -8,25 +10,26 @@ const app = Vue.createApp({
 		return {
 			stunden: [],
 			events: null,
-            testDate: new Date('2024-05-21'),
-		}
+            calendarWeek: new CalendarDate(new Date()),
+        }
 	},
+    computed:{
+        currentDate: function(){
+            return new Date(this.calendarWeek.y, this.calendarWeek.m, this.calendarWeek.d);
+        },
+    },
 	created() {
-		axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/Cis/Stundenplan/Stunden').then(res => {
-			
-            
-            res.data.retval.forEach(std => {
+
+        this.$fhcApi.factory.stundenplan.getStunden().then(res =>{
+            res.data.forEach(std => {
 				this.stunden[std.stunde] = std; // TODO(chris): geht besser
 			});
-			console.log("this are the loaded stunden", this.stunden)
 
-            axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/Cis/Stundenplan/RoomInformation').then(res => {
+            this.$fhcApi.factory.stundenplan.getRoomInfo('EDV_A6.09', this.calendarWeek.firstDayOfWeek, this.calendarWeek.lastDayOfWeek).then(res =>{
                 let events;
-                console.log(" this is the res of the api call room information",res);
                 if (res.data && res.data.forEach) {
                     res.data.forEach((el, i) => {
 
-                        console.log(el,"this is the element that gets changed")
                         el.id = i;
                         el.color = '#' + (el.farbe || 'CCCCCC');
                         el.start = new Date(el.datum + ' ' + this.stunden[el.stunde].beginn);
@@ -35,45 +38,16 @@ const app = Vue.createApp({
                         if (el.lehrform)
                             el.title += '-' + el.lehrform;
                     });
-                    events = res.data;
-                    //console.log("this are the room events",events)
-                    this.events = events;
+                    
+                    this.events = res.data;
                 }
-            }).catch((e)=>{console.log(e,"this is the exception")})
-		});
-
-        /* axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/Cis/Stundenplan').then(res => {
-            
-            let events;
-            console.log(" this is the res of the api call stundenplan",res);
-            if (res.data.retval && res.data.retval.forEach) {
-                res.data.retval.forEach((el, i) => {
-                    el.id = i;
-                    el.color = '#' + (el.farbe || 'CCCCCC');
-                    el.start = new Date(el.datum + ' ' + this.stunden[el.stunde].beginn);
-                    el.end = new Date(el.datum + ' ' + this.stunden[el.stunde].ende);
-                    el.title = el.lehrfach;
-                    if (el.lehrform)
-                        el.title += '-' + el.lehrform;
-                });
-                events = res.data.retval;
-                console.log("this are the events of the stundenplan",events)
-            }
-
-            // TODO(chris): do we need that
-
-        }).catch((e)=>{console.log(e,"this is the exception")}) 
-
-
-         */
-
-       
+            })
+        });
 
 	},
     template: /*html*/`
     <div>
-    <!--initialDate="2023-5-12"-->
-        <fhc-calendar v-slot="{event}" :initialDate="testDate" :events="events" initial-mode="week" show-weeks>
+        <fhc-calendar v-slot="{event}" :initialDate="currentDate" :events="events" initial-mode="week" show-weeks>
             <div class="d-flex flex-column align-items-center justify-content-evenly h-100">
                 <span>{{event.orig.lv_info}}</span>	
                 <span>{{event.orig.stg}}</span>
@@ -84,4 +58,5 @@ const app = Vue.createApp({
     `,
 });
 app.config.unwrapInjectedRef = true;
+app.use(FhcApi);
 app.mount('#content');
\ No newline at end of file
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index cd0ec816e..c6636ad43 100755
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -41,7 +41,6 @@ export default {
 		},
 		eventsPerDayAndHour() {
 			const res = {};
-			console.log("this are the days",this.days)
 			this.days.forEach(day => {
 				let key = day.toDateString();
 				

From 8c4d00b8efdf339fbe05f3d1476d0b3c4f9b27a9 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 4 Jun 2024 11:31:18 +0200
Subject: [PATCH 0759/1461] encode/decode Inventarnummer

---
 application/models/ressource/Betriebsmittel_model.php | 2 +-
 public/js/components/Betriebsmittel/Betriebsmittel.js | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/application/models/ressource/Betriebsmittel_model.php b/application/models/ressource/Betriebsmittel_model.php
index 69aa962c1..290c3491d 100644
--- a/application/models/ressource/Betriebsmittel_model.php
+++ b/application/models/ressource/Betriebsmittel_model.php
@@ -17,7 +17,7 @@ class Betriebsmittel_model extends DB_Model
 	 */
 	public function loadInventarliste($filter)
 	{
-		$filter = strtoLower($filter);
+		$filter = urldecode(strtoLower($filter));
 
 		$qry = "
 			SELECT 
diff --git a/public/js/components/Betriebsmittel/Betriebsmittel.js b/public/js/components/Betriebsmittel/Betriebsmittel.js
index ba2b4275c..6a9e3efa7 100644
--- a/public/js/components/Betriebsmittel/Betriebsmittel.js
+++ b/public/js/components/Betriebsmittel/Betriebsmittel.js
@@ -225,8 +225,9 @@ export default {
 				.catch(this.$fhcAlert.handleSystemError);
 		},
 		searchInventar(event) {
+			const encodedQuery = encodeURIComponent(event.query);
 			return this.$fhcApi
-				.get('api/frontend/v1/stv/betriebsmittel/loadInventarliste/' + event.query)
+				.get('api/frontend/v1/stv/betriebsmittel/loadInventarliste/' + encodedQuery)
 				.then(result => {
 					this.filteredInventar = result.data.retval;
 				});

From 48d36cc859fc2956d8586ef7d630297a2bf1e020 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 4 Jun 2024 11:41:05 +0200
Subject: [PATCH 0760/1461] include Phrases wawi

---
 application/controllers/api/frontend/v1/stv/Betriebsmittel.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/application/controllers/api/frontend/v1/stv/Betriebsmittel.php b/application/controllers/api/frontend/v1/stv/Betriebsmittel.php
index cb6c4a3aa..dbf11f90b 100644
--- a/application/controllers/api/frontend/v1/stv/Betriebsmittel.php
+++ b/application/controllers/api/frontend/v1/stv/Betriebsmittel.php
@@ -28,7 +28,8 @@ class Betriebsmittel extends FHCAPI_Controller
 
 		// Load language phrases
 		$this->loadPhrases([
-			'ui'
+			'ui',
+			'wawi'
 		]);
 	}
 

From 1a5d270936bf6b6c0ec1b07d190bcbfc298d3af1 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 4 Jun 2024 15:00:41 +0200
Subject: [PATCH 0761/1461] calendarDate preparation

---
 .../api/frontend/v1/Stundenplan.php           | 43 +++++++++++++++++++
 .../models/ressource/Stundenplan_model.php    |  2 +-
 public/js/apps/Cis/RoomInformation.js         | 17 ++++++++
 3 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 5e35ae3c9..5970835c9 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -49,11 +49,15 @@ class Stundenplan extends FHCAPI_Controller
 	 */
 	public function roomInformation()
 	{
+
+        
         // storing the get parameter in local variables
         $ort_kurzbz = $this->input->get('ort_kurzbz', TRUE);
         $start_date = $this->input->get('start_date', TRUE);
         $end_date = $this->input->get('end_date', TRUE);
         
+        $this->addMeta("test_start_date",$start_date);
+
         $this->addMeta("ort",$ort_kurzbz);
         $this->addMeta("start date",$start_date);
         $this->addMeta("end date",$end_date);
@@ -67,11 +71,50 @@ class Stundenplan extends FHCAPI_Controller
         }
 
         $result = hasData($result) ? getData($result) : [];
+        
+        // set up the log library and configure the library to log to the db
+        $this->load->library('LogLib');
+        $this->loglib->setConfigs(array(
+			'classIndex' => 5,
+			'functionIndex' => 5,
+			'lineIndex' => 4,
+			'dbLogType' => 'API', // required
+			'dbExecuteUser' => 'RESTful API'
+		));
+
+        /* foreach($result as $event){
+            $this->loglib->logInfoDB($event->datum,"NEW DATE");
+        } */
+
+        $testStartDate = new DateTime($start_date);
+        $this->loglib->logInfoDB($testStartDate->format('Y-m-d'),"php start date");
+        $testStartDate->modify('+1 day');
+        $this->loglib->logInfoDB($testStartDate->format('Y-m-d'),"php start date plus one day");
+        $testStartDate->modify('+1 day');
+        $this->loglib->logInfoDB($testStartDate->format('Y-m-d'),"php start date plus one day");
+        $testStartDate->modify('+1 day');
+        $this->loglib->logInfoDB($testStartDate->format('Y-m-d'),"php start date plus one day");
+        $testStartDate->modify('+1 day');
+        $this->loglib->logInfoDB($testStartDate->format('Y-m-d'),"php start date plus one day");
+        
+        $this->groupTheCalendar($result);
+        //php start date
+        $phpStartDate = new DateTime($start_date);
+
+        //$phpStartDate->modify('+1 day');
+        $this->addMeta('result',$phpStartDate);
+       
+            error_log("test".print_r($result,true));
+        
 		//echo($this->db->last_query());
 		$this->terminateWithSuccess($result);
 		
 	}
 
+    private function groupTheCalendar($data){
+
+    }
+
     public function Stunden()
 	{
 		$this->load->model('ressource/Stunde_model', 'StundeModel');
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 64550ccbf..077201f0f 100755
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -18,7 +18,7 @@ class Stundenplan_model extends DB_Model
 	 * 
 	 * @return stdClass
 	 */
-	public function getRoomDataOnDay($ort_kurzbz='EDV_A2.06',$start_date='2024-05-21',$end_date='2024-05-21'){
+	public function getRoomDataOnDay($ort_kurzbz='EDV_A2.06',$start_date,$end_date){
 
 
 		$this->addSelect(['*',"CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) as stg","lektor","CONCAT(lehrfach,'-',lehrform) as lv_info" ]);
diff --git a/public/js/apps/Cis/RoomInformation.js b/public/js/apps/Cis/RoomInformation.js
index fbe49386d..6aa590b31 100644
--- a/public/js/apps/Cis/RoomInformation.js
+++ b/public/js/apps/Cis/RoomInformation.js
@@ -17,6 +17,11 @@ const app = Vue.createApp({
         currentDate: function(){
             return new Date(this.calendarWeek.y, this.calendarWeek.m, this.calendarWeek.d);
         },
+    },
+    methods:{
+        calendarDate_to_UTC_date: function(calendarDate){
+            return [calendarDate.y, calendarDate.m, calendarDate.d].join('-');    
+        }
     },
 	created() {
 
@@ -25,6 +30,18 @@ const app = Vue.createApp({
 				this.stunden[std.stunde] = std; // TODO(chris): geht besser
 			});
 
+
+            console.log(this.calendarDate_to_UTC_date(this.calendarWeek.firstDayOfWeek),"this is the converted calendar date")
+
+            /* console.log(this.convertDateToUtcDate(this.calendarWeek.firstDayOfWeek), "iso string here")
+
+            console.log(this.calendarWeek.cdFirstDayOfWeek.y,"this is the year of the first day of the week");
+            console.log(this.calendarWeek.cdFirstDayOfWeek.m,"this is the month of the first day of the week");
+            console.log(this.calendarWeek.cdFirstDayOfWeek.d,"this is the day of the first day of the week");
+
+            console.log(this.calendarWeek.firstDayOfWeek,"this is the first day of the week");
+            console.log(this.convertDateToUtcDate(this.calendarWeek.firstDayOfWeek), "this is the UTC date")
+ */
             this.$fhcApi.factory.stundenplan.getRoomInfo('EDV_A6.09', this.calendarWeek.firstDayOfWeek, this.calendarWeek.lastDayOfWeek).then(res =>{
                 let events;
                 if (res.data && res.data.forEach) {

From cd8fffd2f7fd11ce8fd5a6993a9a24e504c3db0f Mon Sep 17 00:00:00 2001
From: Werner Masik <werner@gefi.at>
Date: Tue, 4 Jun 2024 16:20:43 +0200
Subject: [PATCH 0762/1461] added filter update for Handyverwaltung

---
 system/filtersupdate.php | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/system/filtersupdate.php b/system/filtersupdate.php
index a65c510eb..73c316dc4 100644
--- a/system/filtersupdate.php
+++ b/system/filtersupdate.php
@@ -1305,7 +1305,39 @@ $filters = array(
 			}
 		',
 		'oe_kurzbz' => null
-	)
+		),
+		array(
+			'app' => 'personalverwaltung',
+			'dataset_name' => 'handyverwaltung',
+			'filter_kurzbz' => 'ma4handyverwaltung',
+			'description' => '{MA Handyverwaltung}',
+			'sort' => 1,
+			'default_filter' => true,
+			'filter' => '
+				{
+					"name": "MA Handyverwaltung",
+					"columns": [
+						{"name": "PersonId"},
+						{"name": "Vorname"},
+						{"name": "Nachname"},
+						{"name": "Alias"},
+						{"name": "Aktiv"},
+						{"name": "Raum"},
+						{"name": "Geschlecht"},
+						{"name": "Standardkostenstelle"}
+					],
+					"filters": [
+						{
+							"name": "Nachname",
+							"option": "",
+							"operation": "",
+							"condition": ""
+						}
+					]
+				}
+			',
+			'oe_kurzbz' => null,
+		),
 );
 
 // Loop through the filters array

From 2d61dea28741b155ad4091e85fb64bfe9b3fa4c8 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 5 Jun 2024 16:53:54 +0200
Subject: [PATCH 0763/1461] refactor resources: endpoint betriebsmittel

---
 .../v1/betriebsmittel/BetriebsmittelP.php     | 284 ++++++++++++++++++
 .../api/frontend/v1/stv/Betriebsmittel.php    |   7 +-
 .../ressource/Betriebsmittelperson_model.php  |   2 +-
 public/js/api/betriebsmittel.js               |   5 +
 public/js/api/betriebsmittel/person.js        |  27 ++
 public/js/api/fhcapifactory.js                |   4 +-
 public/js/api/notiz.js                        |  10 +-
 .../Betriebsmittel/Betriebsmittel.js          |  82 +++--
 .../Details/Betriebsmittel.js                 |   4 +-
 9 files changed, 364 insertions(+), 61 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/betriebsmittel/BetriebsmittelP.php
 create mode 100644 public/js/api/betriebsmittel.js
 create mode 100644 public/js/api/betriebsmittel/person.js

diff --git a/application/controllers/api/frontend/v1/betriebsmittel/BetriebsmittelP.php b/application/controllers/api/frontend/v1/betriebsmittel/BetriebsmittelP.php
new file mode 100644
index 000000000..8a6d7e340
--- /dev/null
+++ b/application/controllers/api/frontend/v1/betriebsmittel/BetriebsmittelP.php
@@ -0,0 +1,284 @@
+<?php
+
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+use \DateTime as DateTime;
+
+class BetriebsmittelP extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'getAllBetriebsmittel' => ['admin:r', 'assistenz:r'],
+			'addNewBetriebsmittel' => ['admin:r', 'assistenz:r'],
+			'updateBetriebsmittel' => ['admin:r', 'assistenz:r'],
+			'loadBetriebsmittel' => ['admin:r', 'assistenz:r'],
+			'deleteBetriebsmittel' => ['admin:r', 'assistenz:r'],
+			'getTypenBetriebsmittel' => ['admin:r', 'assistenz:r'],
+			'loadInventarliste' => ['admin:r', 'assistenz:r']
+		]);
+
+		//Load Models
+		$this->load->model('ressource/Betriebsmittel_model', 'BetriebsmittelModel');
+		$this->load->model('ressource/Betriebsmittelperson_model', 'BetriebsmittelpersonModel');
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+		$this->load->library('form_validation');
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui',
+			'wawi'
+		]);
+	}
+
+	public function getAllBetriebsmittel($type_id, $id)
+	{
+		$result = $this->BetriebsmittelpersonModel->getBetriebsmittelData($id, $type_id);
+
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+
+		$this->terminateWithSuccess((getData($result) ?: []));
+	}
+
+	public function addNewBetriebsmittel($person_id)
+	{
+		$this->form_validation->set_rules('kaution', 'Kaution', 'numeric', [
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Kaution'])
+		]);
+
+		$this->form_validation->set_rules('betriebsmitteltyp', 'TYP', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Typ'])
+		]);
+
+		$this->form_validation->set_rules('ausgegebenam', 'Ausgegeben am', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Ausgegeben am'])
+		]);
+
+		if ($this->form_validation->run() == false) {
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$uid_user = getAuthUID();
+		$betriebsmitteltyp = $this->input->post('betriebsmitteltyp');
+		$nummer = $this->input->post('nummer');
+		$nummer2 = $this->input->post('nummer2');
+		$inventarData = $this->input->post('inventarData');
+		$beschreibung = $this->input->post('beschreibung');
+		$kaution = $this->input->post('kaution');
+		$anmerkung = $this->input->post('anmerkung');
+		$ausgegebenam = $this->input->post('ausgegebenam');
+		$retouram = $this->input->post('retouram');
+		$uid = $this->input->post('uid');
+
+		if ($inventarData) {
+			$betriebsmitteltyp = $inventarData['betriebsmitteltyp'];
+			$betriebsmittel_id = $inventarData['betriebsmittel_id'];
+		}
+
+		if ($betriebsmitteltyp == 'Zutrittskarte' && !$nummer) {
+			return $this->terminateWithError($this->p->t('wawi', 'error_zutrittskarteOhneNummer'), self::ERROR_TYPE_GENERAL);
+		}
+
+		if ($retouram && $retouram < $ausgegebenam) {
+			return $this->terminateWithError($this->p->t('wawi', 'error_retourdatumVorAusgabe'), self::ERROR_TYPE_GENERAL);
+		}
+
+		if ($betriebsmitteltyp == "Inventar" && !($inventarData['inventarnummer'])) {
+			return $this->terminateWithError($this->p->t('wawi', 'error_inventarWaehlen'), self::ERROR_TYPE_GENERAL);
+		}
+
+		// Start DB transaction
+		$this->db->trans_begin();
+
+		$betriebsmitteltyp = utf8_decode($betriebsmitteltyp);
+
+		if (!$inventarData) {
+			$result = $this->BetriebsmittelModel->insert(
+				[
+					'betriebsmitteltyp' => $betriebsmitteltyp,
+					'nummer' => $nummer,
+					'nummer2' => $nummer2,
+					'beschreibung' => $beschreibung,
+					'anmerkung' => $anmerkung,
+					'insertvon' => $uid_user,
+					'insertamum' => date('c')
+				]
+			);
+			if ($this->db->trans_status() === false || isError($result)) {
+				$this->db->trans_rollback();
+				return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			}
+			$betriebsmittel_id = $result->retval;
+		}
+
+		$result = $this->BetriebsmittelpersonModel->insert(
+			[
+				'betriebsmittel_id' => $betriebsmittel_id,
+				'person_id' => $person_id,
+				'kaution' => $kaution,
+				'anmerkung' => $anmerkung,
+				'ausgegebenam' => $ausgegebenam,
+				'retouram ' => $retouram,
+				'insertvon' => $uid_user,
+				'insertamum' => date('c'),
+				'uid' => $uid
+			]
+		);
+
+		if ($this->db->trans_status() === false || isError($result)) {
+			$this->db->trans_rollback();
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+
+		$this->db->trans_commit();
+		return $this->terminateWithSuccess(true);
+	}
+
+	public function updateBetriebsmittel($betriebsmittelperson_id)
+	{
+		$uid_user = getAuthUID();
+		$betriebsmittel_id = $this->input->post('betriebsmittel_id');
+		$betriebsmitteltyp = $this->input->post('betriebsmitteltyp');
+		$nummer = $this->input->post('nummer');
+		$nummer2 = $this->input->post('nummer2');
+		$beschreibung = $this->input->post('beschreibung');
+		$kaution = $this->input->post('kaution');
+		$anmerkung = $this->input->post('anmerkung');
+		$ausgegebenam = $this->input->post('ausgegebenam');
+		$retouram = $this->input->post('retouram');
+		$person_id = $this->input->post('person_id');
+		$uid = $this->input->post('uid');
+
+		$this->form_validation->set_rules('kaution', 'Kaution', 'numeric', [
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Kaution'])
+		]);
+
+		$this->form_validation->set_rules('betriebsmitteltyp', 'TYP', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Typ'])
+		]);
+
+		$this->form_validation->set_rules('ausgegebenam', 'Ausgegeben am', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Ausgegeben am'])
+		]);
+
+
+		if ($this->form_validation->run() == false) {
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		if ($betriebsmitteltyp == 'Zutrittskarte' && !$nummer) {
+			return $this->terminateWithError($this->p->t('wawi', 'error_zutrittskarteOhneNummer'), self::ERROR_TYPE_GENERAL);
+		}
+
+		if ($retouram && $retouram < $ausgegebenam) {
+			return $this->terminateWithError($this->p->t('wawi', 'error_retourdatumVorAusgabe'), self::ERROR_TYPE_GENERAL);
+		}
+
+
+		// Start DB transaction
+		$this->db->trans_begin();
+
+		$result = $this->BetriebsmittelpersonModel->update(
+			[
+				'betriebsmittelperson_id' => $betriebsmittelperson_id,
+
+			],
+			[
+				'person_id' => $person_id,
+				'uid' => $uid,
+				'kaution' => $kaution,
+				'anmerkung' => $anmerkung,
+				'ausgegebenam' => $ausgegebenam,
+				'retouram ' => $retouram,
+				'updatevon' => $uid_user,
+				'updateamum' => date('c')
+			]
+		);
+
+		if ($this->db->trans_status() === false || isError($result)) {
+			$this->db->trans_rollback();
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+
+		$result = $this->BetriebsmittelModel->update(
+			[
+				'betriebsmittel_id' => $betriebsmittel_id
+			],
+			[
+				'betriebsmitteltyp' => $betriebsmitteltyp,
+				'nummer' => $nummer,
+				'nummer2' => $nummer2,
+				'beschreibung' => $beschreibung,
+				'anmerkung' => $anmerkung,
+				'updatevon' => $uid_user,
+				'updateamum' => date('c')
+			]
+		);
+		if ($this->db->trans_status() === false || isError($result)) {
+			$this->db->trans_rollback();
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+
+		$this->db->trans_commit();
+		return $this->terminateWithSuccess(true);
+	}
+
+	public function loadBetriebsmittel($betriebsmittelperson_id)
+	{
+		$result = $this->BetriebsmittelpersonModel->getBetriebsmittelData($betriebsmittelperson_id, 'betriebsmittelperson_id');
+
+		if (isError($result)) {
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+
+		if (!hasData($result)) {
+			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'Betriebsmittelperson_id']), self::ERROR_TYPE_GENERAL);
+		}
+
+		$this->terminateWithSuccess(current(getData($result)));
+	}
+
+	public function deleteBetriebsmittel($betriebsmittelperson_id)
+	{
+		$result = $this->BetriebsmittelpersonModel->delete(
+			array('betriebsmittelperson_id' => $betriebsmittelperson_id,
+			)
+		);
+
+		if (isError($result)) {
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		if (!hasData($result)) {
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'Betriebsmittelperson_id']), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->outputJsonSuccess(current(getData($result)));
+	}
+
+	public function getTypenBetriebsmittel()
+	{
+		$this->load->model('ressource/Betriebsmitteltyp_model', 'BetriebsmitteltypModel');
+
+		$this->BetriebsmitteltypModel->addOrder('beschreibung', 'ASC');
+		$result = $this->BetriebsmitteltypModel->load(); // load All
+
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess(getData($result) ?: []);
+	}
+
+	public function loadInventarliste($searchString)
+	{
+		$result = $this->BetriebsmittelModel->loadInventarliste($searchString);
+		if (isError($result)) {
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess($result ?: []);
+	}
+}
+
+
diff --git a/application/controllers/api/frontend/v1/stv/Betriebsmittel.php b/application/controllers/api/frontend/v1/stv/Betriebsmittel.php
index dbf11f90b..a58b56478 100644
--- a/application/controllers/api/frontend/v1/stv/Betriebsmittel.php
+++ b/application/controllers/api/frontend/v1/stv/Betriebsmittel.php
@@ -33,13 +33,10 @@ class Betriebsmittel extends FHCAPI_Controller
 		]);
 	}
 
-	public function getAllBetriebsmittel($uid, $person_id)
+	public function getAllBetriebsmittel($type_id, $id)
 	{
-		//uid
-		//$result = $this->BetriebsmittelpersonModel->getBetriebsmittelData($uid, 'uid');
 
-		//person_id
-		$result = $this->BetriebsmittelpersonModel->getBetriebsmittelData($person_id, 'person');
+		$result = $this->BetriebsmittelpersonModel->getBetriebsmittelData($id, $type_id);
 
 		if (isError($result))
 		{
diff --git a/application/models/ressource/Betriebsmittelperson_model.php b/application/models/ressource/Betriebsmittelperson_model.php
index bffa82501..75609759b 100644
--- a/application/models/ressource/Betriebsmittelperson_model.php
+++ b/application/models/ressource/Betriebsmittelperson_model.php
@@ -100,7 +100,7 @@ class Betriebsmittelperson_model extends DB_Model
 	public function getBetriebsmittelData($id, $type_id)
 	{
 		switch ($type_id) {
-			case 'person':
+			case 'person_id':
 				$cond = 'bmp.person_id';
 				break;
 			case 'uid':
diff --git a/public/js/api/betriebsmittel.js b/public/js/api/betriebsmittel.js
new file mode 100644
index 000000000..bd088b195
--- /dev/null
+++ b/public/js/api/betriebsmittel.js
@@ -0,0 +1,5 @@
+import person from "./betriebsmittel/person.js";
+
+export default {
+	person
+}
\ No newline at end of file
diff --git a/public/js/api/betriebsmittel/person.js b/public/js/api/betriebsmittel/person.js
new file mode 100644
index 000000000..13138de55
--- /dev/null
+++ b/public/js/api/betriebsmittel/person.js
@@ -0,0 +1,27 @@
+export default {
+	getAllBetriebsmittel(url, config, params){
+		return this.$fhcApi.get('api/frontend/v1/betriebsmittel/betriebsmittelP/getAllBetriebsmittel/' + params.type + '/' + params.id);
+	},
+	addNewBetriebsmittel(person_id, formData) {
+		return this.$fhcApi.post('api/frontend/v1/betriebsmittel/betriebsmittelP/addNewBetriebsmittel/' +
+			person_id, formData
+		);
+	},
+	loadBetriebsmittel(betriebsmittelperson_id){
+		return this.$fhcApi.post('api/frontend/v1/betriebsmittel/betriebsmittelP/loadBetriebsmittel/' + betriebsmittelperson_id);
+	},
+	updateBetriebsmittel(betriebsmittelperson_id, formData) {
+		return this.$fhcApi.post('api/frontend/v1/betriebsmittel/betriebsmittelP/updateBetriebsmittel/' + betriebsmittelperson_id,
+			formData);
+	},
+	deleteBetriebsmittel(betriebsmittelperson_id){
+		return this.$fhcApi.post('api/frontend/v1/betriebsmittel/betriebsmittelP/deleteBetriebsmittel/' +	betriebsmittelperson_id);
+	},
+	getTypenBetriebsmittel(){
+		return this.$fhcApi.get('api/frontend/v1/betriebsmittel/betriebsmittelP/getTypenBetriebsmittel/');
+	},
+	loadInventarliste(query){
+		console.log(query);
+		return this.$fhcApi.get('api/frontend/v1/betriebsmittel/betriebsmittelP/loadInventarliste/' +	query);
+	}
+}
\ No newline at end of file
diff --git a/public/js/api/fhcapifactory.js b/public/js/api/fhcapifactory.js
index 835c74998..655bfa409 100644
--- a/public/js/api/fhcapifactory.js
+++ b/public/js/api/fhcapifactory.js
@@ -22,6 +22,7 @@ import filter from "./filter.js";
 import studstatus from "./studstatus.js";
 import stv from "./stv.js";
 import notiz from "./notiz.js";
+import betriebsmittel from "./betriebsmittel.js";
 
 export default {
     search,
@@ -30,5 +31,6 @@ export default {
     filter,
     studstatus,
     stv,
-    notiz
+    notiz,
+    betriebsmittel
 };
diff --git a/public/js/api/notiz.js b/public/js/api/notiz.js
index fbab63ef5..0a1034703 100644
--- a/public/js/api/notiz.js
+++ b/public/js/api/notiz.js
@@ -1,13 +1,5 @@
-//TODO(Manu) refactor with require or async!
-//sonst Error wenn extension file nicht vorhanden
-
 import person from "./notiz/person.js";
-//import softwarenotiz from "../../extensions/FHC-Core-Softwarebereitstellung/js/api/softwarenotiz.js";
-//import pppnotiz from "../../extensions/FHC-Core-PEP/js/api/pppnotiz.js";
-
 
 export default {
-	person,
-//	softwarenotiz,
-//	pppnotiz
+	person
 }
\ No newline at end of file
diff --git a/public/js/components/Betriebsmittel/Betriebsmittel.js b/public/js/components/Betriebsmittel/Betriebsmittel.js
index 6a9e3efa7..e7f09b26a 100644
--- a/public/js/components/Betriebsmittel/Betriebsmittel.js
+++ b/public/js/components/Betriebsmittel/Betriebsmittel.js
@@ -20,15 +20,30 @@ export default {
 			from: 'cisRoot'
 		},
 	},
-	props: [
-		'person_id',
-		'uid'
-	],
+	props: {
+		endpoint: {
+			type: Object,
+			required: true
+		},
+		typeId: String,
+		id: {
+			type: [Number, String],
+			required: true
+		},
+		uid: {
+			type: [Number, String],
+			required: true
+		}
+	},
 	data() {
 		return {
 			tabulatorOptions: {
-				ajaxURL: 'api/frontend/v1/stv/Betriebsmittel/getAllBetriebsmittel/' + this.uid + '/' + this.person_id,
-				ajaxRequestFunc: this.$fhcApi.get,
+				ajaxURL: 'dummy',
+				ajaxRequestFunc: this.endpoint.getAllBetriebsmittel,
+				ajaxParams: {
+					type: this.typeId,
+					id: this.id
+				},
 				ajaxResponse: (url, params, response) => response.data,
 				columns: [
 					{title: "Nummer", field: "nummer"},
@@ -139,7 +154,7 @@ export default {
 	},
 	watch: {
 		uid() {
-			this.$refs.table.tabulator.setData('api/frontend/v1/stv/Betriebsmittel/getAllBetriebsmittel/' + this.uid + '/' + this.person_id);
+			this.$refs.table.tabulator.setData(this.endpoint.getAllBetriebsmittel + '/' + this.typeId + '/' + this.id);
 		}
 	},
 	methods: {
@@ -159,28 +174,20 @@ export default {
 			});
 		},
 		addNewBetriebsmittel() {
-			this.param = {
-				'uid':  this.uid,
-				'person_id': this.person_id,
-				...this.formData
-			};
-			this.$fhcApi.post('api/frontend/v1/stv/betriebsmittel/addNewBetriebsmittel/',
-				this.param
-			).then(response => {
-				this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
-				this.resetModal();
-			}).catch(this.$fhcAlert.handleSystemError)
+			//just append uid to formdata
+			this.formData.uid = this.uid;
+			return this.endpoint.addNewBetriebsmittel(this.id, this.formData)
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+					this.resetModal();
+				}).catch(this.$fhcAlert.handleSystemError)
 				.finally(() => {
 					window.scrollTo(0, 0);
 					this.reload();
 				});
 		},
 		deleteBetriebsmittel(betriebsmittelperson_id) {
-			this.param = {
-				'betriebsmittelperson_id': betriebsmittelperson_id
-			};
-			return this.$fhcApi.post('api/frontend/v1/stv/betriebsmittel/deleteBetriebsmittel/',
-				this.param)
+			return this.endpoint.deleteBetriebsmittel(betriebsmittelperson_id)
 				.then(
 					result => {
 						this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
@@ -193,15 +200,10 @@ export default {
 					this.reload();
 				});
 		},
-		updateBetriebsmittel() {
-			this.param = {
-				'uid':  this.uid,
-				'person_id': this.person_id,
-				...this.formData
-			};
-			this.$fhcApi.post('api/frontend/v1/stv/betriebsmittel/updateBetriebsmittel/',
-				this.param
-			).then(response => {
+		updateBetriebsmittel(betriebsmittelperson_id) {
+			this.formData.uid = this.uid;
+			return this.endpoint.updateBetriebsmittel(betriebsmittelperson_id, this.formData)
+			.then(response => {
 				this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 				this.resetModal();
 			}).catch(this.$fhcAlert.handleSystemError)
@@ -213,11 +215,7 @@ export default {
 		loadBetriebsmittel(betriebsmittelperson_id) {
 			this.resetModal();
 			this.statusNew = false;
-			this.param = {
-				'betriebsmittelperson_id':  betriebsmittelperson_id
-			};
-			return this.$fhcApi.post('api/frontend/v1/stv/betriebsmittel/loadBetriebsmittel/',
-				this.param)
+			return this.endpoint.loadBetriebsmittel(betriebsmittelperson_id)
 				.then(result => result.data)
 				.then(result => {
 					this.formData = result;
@@ -226,8 +224,7 @@ export default {
 		},
 		searchInventar(event) {
 			const encodedQuery = encodeURIComponent(event.query);
-			return this.$fhcApi
-				.get('api/frontend/v1/stv/betriebsmittel/loadInventarliste/' + encodedQuery)
+			return this.endpoint.loadInventarliste(encodedQuery)
 				.then(result => {
 					this.filteredInventar = result.data.retval;
 				});
@@ -257,8 +254,7 @@ export default {
 		}
 	},
 	created(){
-		this.$fhcApi
-			.get('api/frontend/v1/stv/betriebsmittel/getTypenBetriebsmittel')
+		return this.endpoint.getTypenBetriebsmittel()
 			.then(result => result.data)
 			.then(result => {
 				this.listBetriebsmitteltyp = result;
@@ -300,8 +296,6 @@ export default {
 			
 			</div>
 			
-
-			
 			<form-form class="row g-3 col-6" ref="betriebsmittelData">
 				<legend>Details</legend>
 				
@@ -445,7 +439,7 @@ export default {
 						<button ref="Close" type="button" class="btn btn-primary" @click="addNewBetriebsmittel()">{{$p.t('ui', 'speichern')}}</button>
 					</div>
 					<div v-else class="col-sm-4">
-						<button ref="Close" type="button" class="btn btn-primary" @click="updateBetriebsmittel()">{{$p.t('ui', 'speichern')}}</button>
+						<button ref="Close" type="button" class="btn btn-primary" @click="updateBetriebsmittel(formData.betriebsmittelperson_id)">{{$p.t('ui', 'speichern')}}</button>
 					</div>
 					
 				</div>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Betriebsmittel.js b/public/js/components/Stv/Studentenverwaltung/Details/Betriebsmittel.js
index fbee3dda3..9d2970a54 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Betriebsmittel.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Betriebsmittel.js
@@ -10,8 +10,10 @@ export default {
 	template: `
 	<div class="stv-details-betriebsmittel h-100 pb-3">
 		<core-betriebsmittel
+			:endpoint="$fhcApi.factory.betriebsmittel.person"
 			ref="formc"
-			:person_id="modelValue.person_id"
+			type-id="person_id"
+			:id="modelValue.person_id"
 			:uid="modelValue.uid"
 			>
 		</core-betriebsmittel>	

From accb8f7f8219bc8d4ac1cb3e1e2b2a49bc82f6f6 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 6 Jun 2024 08:10:25 +0200
Subject: [PATCH 0764/1461] delete old endpoint betriebsmittel

---
 .../api/frontend/v1/stv/Betriebsmittel.php    | 322 ------------------
 1 file changed, 322 deletions(-)
 delete mode 100644 application/controllers/api/frontend/v1/stv/Betriebsmittel.php

diff --git a/application/controllers/api/frontend/v1/stv/Betriebsmittel.php b/application/controllers/api/frontend/v1/stv/Betriebsmittel.php
deleted file mode 100644
index a58b56478..000000000
--- a/application/controllers/api/frontend/v1/stv/Betriebsmittel.php
+++ /dev/null
@@ -1,322 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use \DateTime as DateTime;
-
-class Betriebsmittel extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'getAllBetriebsmittel' => ['admin:r', 'assistenz:r'],
-			'addNewBetriebsmittel' => ['admin:r', 'assistenz:r'],
-			'updateBetriebsmittel' => ['admin:r', 'assistenz:r'],
-			'loadBetriebsmittel' => ['admin:r', 'assistenz:r'],
-			'deleteBetriebsmittel' => ['admin:r', 'assistenz:r'],
-			'getTypenBetriebsmittel' => ['admin:r', 'assistenz:r'],
-			'loadInventarliste' => ['admin:r', 'assistenz:r']
-		]);
-
-		//Load Models
-		$this->load->model('ressource/Betriebsmittel_model', 'BetriebsmittelModel');
-		$this->load->model('ressource/Betriebsmittelperson_model', 'BetriebsmittelpersonModel');
-
-		// Load Libraries
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-		$this->load->library('form_validation');
-
-		// Load language phrases
-		$this->loadPhrases([
-			'ui',
-			'wawi'
-		]);
-	}
-
-	public function getAllBetriebsmittel($type_id, $id)
-	{
-
-		$result = $this->BetriebsmittelpersonModel->getBetriebsmittelData($id, $type_id);
-
-		if (isError($result))
-		{
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-
-		$this->terminateWithSuccess((getData($result) ?: []));
-	}
-
-	public function addNewBetriebsmittel()
-	{
-		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-
-		$this->form_validation->set_rules('kaution', 'Kaution', 'numeric', [
-			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Kaution'])
-		]);
-
-		$this->form_validation->set_rules('betriebsmitteltyp', 'TYP', 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Typ'])
-		]);
-
-		$this->form_validation->set_rules('ausgegebenam', 'Ausgegeben am', 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Ausgegeben am'])
-		]);
-
-
-		if ($this->form_validation->run() == false)
-		{
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-		}
-
-		$uid_user = getAuthUID();
-		$betriebsmitteltyp = $this->input->post('betriebsmitteltyp');
-		$nummer = $this->input->post('nummer');
-		$nummer2 = $this->input->post('nummer2');
-		$inventarData = $this->input->post('inventarData');
-		$beschreibung = $this->input->post('beschreibung');
-		$kaution = $this->input->post('kaution');
-		$anmerkung = $this->input->post('anmerkung');
-		$ausgegebenam = $this->input->post('ausgegebenam');
-		$retouram = $this->input->post('retouram');
-		$person_id = $this->input->post('person_id');
-		$uid = $this->input->post('uid');
-
-		if($inventarData)
-		{
-			$betriebsmitteltyp = $inventarData['betriebsmitteltyp'];
-			$betriebsmittel_id = $inventarData['betriebsmittel_id'];
-		}
-
-		if($betriebsmitteltyp == 'Zutrittskarte' && !$nummer)
-		{
-			return $this->terminateWithError($this->p->t('wawi', 'error_zutrittskarteOhneNummer'), self::ERROR_TYPE_GENERAL);
-		}
-
-		if($retouram && $retouram < $ausgegebenam)
-		{
-			return $this->terminateWithError($this->p->t('wawi', 'error_retourdatumVorAusgabe'), self::ERROR_TYPE_GENERAL);
-		}
-
-		if($betriebsmitteltyp == "Inventar" && !($inventarData['inventarnummer']))
-		{
-			return $this->terminateWithError($this->p->t('wawi', 'error_inventarWaehlen'), self::ERROR_TYPE_GENERAL);
-		}
-
-
-		// Start DB transaction
-		$this->db->trans_begin();
-
-		$betriebsmitteltyp = utf8_decode($betriebsmitteltyp);
-
-		if(!$inventarData)
-		{
-			$result = $this->BetriebsmittelModel->insert(
-				[
-					'betriebsmitteltyp' => $betriebsmitteltyp,
-					'nummer' => $nummer,
-					'nummer2' => $nummer2,
-					'beschreibung' => $beschreibung,
-					'anmerkung' => $anmerkung,
-					'insertvon' => $uid_user,
-					'insertamum' => date('c')
-				]
-			);
-			if($this->db->trans_status() === false || isError($result))
-			{
-				$this->db->trans_rollback();
-				return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-			}
-			$betriebsmittel_id = $result->retval;
-		}
-
-		$result = $this->BetriebsmittelpersonModel->insert(
-			[
-				'betriebsmittel_id' => $betriebsmittel_id,
-				'person_id' => $person_id,
-				'kaution' => $kaution,
-				'anmerkung' => $anmerkung,
-				'ausgegebenam' => $ausgegebenam,
-				'retouram ' => $retouram,
-				'insertvon' => $uid_user,
-				'insertamum' => date('c'),
-				'uid' => $uid
-			]
-		);
-
-		if($this->db->trans_status() === false || isError($result))
-		{
-			$this->db->trans_rollback();
-			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-
-		$this->db->trans_commit();
-		return $this->terminateWithSuccess(true);
-	}
-
-	public function updateBetriebsmittel()
-	{
-		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-
-		$uid_user = getAuthUID();
-
-		$betriebsmittel_id = $this->input->post('betriebsmittel_id');
-		$betriebsmittelperson_id = $this->input->post('betriebsmittelperson_id');
-		$betriebsmitteltyp = $this->input->post('betriebsmitteltyp');
-		$nummer = $this->input->post('nummer');
-		$nummer2 = $this->input->post('nummer2');
-		$beschreibung = $this->input->post('beschreibung');
-		$kaution = $this->input->post('kaution');
-		$anmerkung = $this->input->post('anmerkung');
-		$ausgegebenam = $this->input->post('ausgegebenam');
-		$retouram = $this->input->post('retouram');
-		$person_id = $this->input->post('person_id');
-		$uid = $this->input->post('uid');
-
-		$this->form_validation->set_rules('kaution', 'Kaution', 'numeric', [
-			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Kaution'])
-		]);
-
-		$this->form_validation->set_rules('betriebsmitteltyp', 'TYP', 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Typ'])
-		]);
-
-		$this->form_validation->set_rules('ausgegebenam', 'Ausgegeben am', 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Ausgegeben am'])
-		]);
-
-
-		if ($this->form_validation->run() == false)
-		{
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-		}
-
-		if($betriebsmitteltyp == 'Zutrittskarte' && !$nummer)
-		{
-			return $this->terminateWithError($this->p->t('wawi', 'error_zutrittskarteOhneNummer'), self::ERROR_TYPE_GENERAL);
-		}
-
-		if($retouram && $retouram < $ausgegebenam)
-		{
-			return $this->terminateWithError($this->p->t('wawi', 'error_retourdatumVorAusgabe'), self::ERROR_TYPE_GENERAL);
-		}
-
-
-		// Start DB transaction
-		$this->db->trans_begin();
-
-		$result = $this->BetriebsmittelpersonModel->update(
-			[
-				'betriebsmittelperson_id' => $betriebsmittelperson_id,
-
-			],
-			[
-				'person_id' => $person_id,
-				'uid' => $uid,
-				'kaution' => $kaution,
-				'anmerkung' => $anmerkung,
-				'ausgegebenam' => $ausgegebenam,
-				'retouram ' => $retouram,
-				'updatevon' => $uid_user,
-				'updateamum' => date('c')
-			]
-		);
-
-		if($this->db->trans_status() === false || isError($result))
-		{
-			$this->db->trans_rollback();
-			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-
-		$result = $this->BetriebsmittelModel->update(
-			[
-				'betriebsmittel_id' => $betriebsmittel_id
-			],
-			[
-				'betriebsmitteltyp' => $betriebsmitteltyp,
-				'nummer' => $nummer,
-				'nummer2' => $nummer2,
-				'beschreibung' => $beschreibung,
-				'anmerkung' => $anmerkung,
-				'updatevon' => $uid_user,
-				'updateamum' => date('c')
-			]
-		);
-		if($this->db->trans_status() === false || isError($result))
-		{
-			$this->db->trans_rollback();
-			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-
-		$this->db->trans_commit();
-		return $this->terminateWithSuccess(true);
-	}
-
-	public function loadBetriebsmittel()
-	{
-		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-
-		$betriebsmittelperson_id = $this->input->post('betriebsmittelperson_id');
-
-		$result = $this->BetriebsmittelpersonModel->getBetriebsmittelData($betriebsmittelperson_id, 'betriebsmittelperson_id');
-
-		if (isError($result))
-		{
-			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-
-		if (!hasData($result))
-		{
-			$this->terminateWithError("no Betriebsmittelperson with ID found: " . $betriebsmittelperson_id, self::ERROR_TYPE_GENERAL);
-		}
-
-		$this->terminateWithSuccess(current(getData($result)));
-	}
-
-	public function deleteBetriebsmittel()
-	{
-
-		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-
-		$betriebsmittelperson_id = $this->input->post('betriebsmittelperson_id');
-
-		$result = $this->BetriebsmittelpersonModel->delete(
-			array('betriebsmittelperson_id' => $betriebsmittelperson_id,
-				)
-		);
-
-		if (isError($result))
-		{
-			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-		if (!hasData($result))
-		{
-			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Betriebsmittelperson_id']), self::ERROR_TYPE_GENERAL);
-		}
-		return $this->outputJsonSuccess(current(getData($result)));
-	}
-
-	public function getTypenBetriebsmittel()
-	{
-		$this->load->model('ressource/Betriebsmitteltyp_model', 'BetriebsmitteltypModel');
-
-		$this->BetriebsmitteltypModel->addOrder('beschreibung', 'ASC');
-		$result = $this->BetriebsmitteltypModel->load(); // load All
-
-		if (isError($result))
-		{
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-		return $this->terminateWithSuccess(getData($result) ?: []);
-	}
-
-	public function loadInventarliste($searchString)
-	{
-		$result = $this->BetriebsmittelModel->loadInventarliste($searchString);
-		if (isError($result)) {
-			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess($result ?: []);
-	}
-}
-
-

From 25d284389a3fa50dea33fa9080fb417a3d32cf0f Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 6 Jun 2024 09:25:46 +0200
Subject: [PATCH 0765/1461] gruppieren algorithm erweitern

---
 .../api/frontend/v1/Stundenplan.php           | 160 ++++++++++++++----
 .../components/Cis/Stundenplan.php            |  10 --
 public/js/apps/Cis/RoomInformation.js         |  23 ++-
 3 files changed, 134 insertions(+), 59 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 5970835c9..c55b225c9 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -37,13 +37,31 @@ class Stundenplan extends FHCAPI_Controller
             'Stunden' => self::PERM_LOGGED
 		]);
 
-		// Load the library ...
-		// $this->load->library('');
+        $this->load->library('LogLib');
+        $this->loglib->setConfigs(array(
+			'classIndex' => 5,
+			'functionIndex' => 5,
+			'lineIndex' => 4,
+			'dbLogType' => 'API', // required
+			'dbExecuteUser' => 'RESTful API'
+		));
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods
 
+    public function Stunden()
+	{
+		$this->load->model('ressource/Stunde_model', 'StundeModel');
+
+		$result = $this->StundeModel->load();
+
+		if (isError($result))
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+
+		$this->terminateWithSuccess(getData($result));
+	}
+    
 	/**
 	 * Gets a JSON body via HTTP POST and provides the parameters
 	 */
@@ -64,39 +82,123 @@ class Stundenplan extends FHCAPI_Controller
         $this->addMeta("testKey","testValue");
         
         $this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
-		
+		$this->load->model('ressource/Stunde_model', 'StundeModel');
+
+		$stunden = $this->StundeModel->load();
+        if(isError($stunden)){
+            $this->terminateWithError(getError($stunden), self::ERROR_TYPE_GENERAL);
+        }
+        $stunden = getData($stunden);
+
+        $this->loglib->logInfoDB(print_r($stunden,true),"stunden");
+
+
 		$result = $this->StundenplanModel->getRoomDataOnDay($ort_kurzbz,$start_date,$end_date);
 		if(isError($result)){
             $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
         }
 
         $result = hasData($result) ? getData($result) : [];
-        
+        $this->loglib->logInfoDB(print_r($result,true),"result");
         // set up the log library and configure the library to log to the db
-        $this->load->library('LogLib');
-        $this->loglib->setConfigs(array(
-			'classIndex' => 5,
-			'functionIndex' => 5,
-			'lineIndex' => 4,
-			'dbLogType' => 'API', // required
-			'dbExecuteUser' => 'RESTful API'
-		));
+        
 
         /* foreach($result as $event){
             $this->loglib->logInfoDB($event->datum,"NEW DATE");
         } */
 
         $testStartDate = new DateTime($start_date);
-        $this->loglib->logInfoDB($testStartDate->format('Y-m-d'),"php start date");
-        $testStartDate->modify('+1 day');
-        $this->loglib->logInfoDB($testStartDate->format('Y-m-d'),"php start date plus one day");
-        $testStartDate->modify('+1 day');
-        $this->loglib->logInfoDB($testStartDate->format('Y-m-d'),"php start date plus one day");
-        $testStartDate->modify('+1 day');
-        $this->loglib->logInfoDB($testStartDate->format('Y-m-d'),"php start date plus one day");
-        $testStartDate->modify('+1 day');
-        $this->loglib->logInfoDB($testStartDate->format('Y-m-d'),"php start date plus one day");
+        $testEndDate = new DateTime($end_date);
+        $count =0;
+        $final_events = array();
+        while($testStartDate <= $testEndDate && $count <7){
+            $date = $testStartDate->format('Y-m-d');
+            //TODO: array filtering for every day and hour could be too time consuming causing slow response
+            $day_events = array_filter($result,function($entry) use ($date){
+                return $entry->datum == $date;
+            });
+            //$this->loglib->logInfoDB(print_r($day_events,true),"day_events");
+            foreach($stunden as $stunde){
+                $stunden_events = array_filter($day_events, function($entry) use ($stunde){
+                    return $entry->stunde == $stunde->stunde;
+                });
+
+                // aenderung aller events die am gleichen tag und zur gleichen Stunde gehalten werden
+                foreach($stunden_events as $event_key => $stunden_event){
+                    $this->loglib->logInfoDB(print_r($stunden_event,true),"this is the stunden evnet");
+                    
+                    // lektor bestimmen
+                    if($stunden_event->mitarbeiter_kurzbz == null){
+                        $simml_lektor = $stunden_event->lektor;
+                    }else{
+                        $simml_lektor = $stunden_event->mitarbeiter_kurzbz;
+                    }
+
+                    
+
+                    // lehrverband bestimmen
+                    if(strlen($stunden_event->gruppe_kurzbz)>0){
+                        $lehrverband = $stunden_event->gruppe_kurzbz;
+                    }else{
+                        $lehrverband=$stunden_event->stg.'-'.$stunden_event->sem;
+                        // checks whether the verband is not null, '' or '0'
+                        if($stunden_event->verband !=null && $stunden_event->verband != '0' && $stunden_event->verband != ''){ 
+                            $lehrverband.=$stunden_event->verband;
+                            // if gruppe is not set it will concatenate nothing but it is only appended if the verband is set
+                            $lehrverband.=$stunden_event->gruppe;
+                        }
+                    }
+
+                    // lehrfach bestimmen
+                    $lehrfach = $stunden_event->lehrfach;
+                    if(isset($stunden_event->lehrform)){
+                        $lehrfach .= '-'.$stunden_event->lehrform;
+                    }
+                    
+                    // GRUPIEREN DER GLEICHEN EVENTS
+                    // vergleiche das aktuelle Event mit allen anderen Events die am gleichen Tag und zur gleichen Stunde gehalten werden
+                    foreach($stunden_events as $compare_key => $stunden_event_compare){
+                        if($compare_key != $event_key){
+
+                           if ( 
+                                // the unr's have to be equal to be grouped
+                                $stunden_event->unr==$stunden_event_compare->unr && 
+                                // and either the lektor or the ort_kurzbz have to be equal
+                                ($stunden_event->ort_kurzbz==$stunden_event_compare->ort_kurzbz 
+                                || $stunden_event->lektor==$stunden_event_compare->lektor)
+                           )
+                                {
+
+                                }
+                        }
+                    }
+                    
+
+
+
+                }
+                if (count($stunden_events) == 1){
+                    $final_events[] = current($stunden_events);
+                }else if(count($stunden_events) > 1){
+                    $gruppe = '';
+                    foreach($stunden_events as $stunden_event){
+                        $gruppe .= $stunden_event->gruppe . ',';
+                    }
+                    current($stunden_events)->gruppe = $gruppe;
+                    $final_events[] = current($stunden_events);
+                }
+                //$this->loglib->logInfoDB(print_r($stunden_events,true),"date: " . $date . " - stunde:" .$stunde->stunde);
+            }
+            /* $this->loglib->logInfoDB(print_r($testStartDate,true),"startdate");
+            $this->loglib->logInfoDB($count,"count");
+            $this->loglib->logInfoDB(print_r($testEndDate,true),"enddate");
+            */
+            $testStartDate->modify('+1 day');
+            $count++;
+        }     
         
+        $this->loglib->logInfoDB(print_r($final_events,true),"final_events");
+      
         $this->groupTheCalendar($result);
         //php start date
         $phpStartDate = new DateTime($start_date);
@@ -107,7 +209,7 @@ class Stundenplan extends FHCAPI_Controller
             error_log("test".print_r($result,true));
         
 		//echo($this->db->last_query());
-		$this->terminateWithSuccess($result);
+		$this->terminateWithSuccess($final_events);
 		
 	}
 
@@ -115,19 +217,5 @@ class Stundenplan extends FHCAPI_Controller
 
     }
 
-    public function Stunden()
-	{
-		$this->load->model('ressource/Stunde_model', 'StundeModel');
-
-		$result = $this->StundeModel->load();
-
-		if (isError($result)){
-            $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-        }
-            
-        $result = hasData($result)? getData($result) : [];
-
-        $this->terminateWithSuccess($result);
-	}
 }
 
diff --git a/application/controllers/components/Cis/Stundenplan.php b/application/controllers/components/Cis/Stundenplan.php
index 76535befa..6a89458a7 100755
--- a/application/controllers/components/Cis/Stundenplan.php
+++ b/application/controllers/components/Cis/Stundenplan.php
@@ -66,15 +66,5 @@ class Stundenplan extends Auth_Controller
 		$this->outputJsonSuccess(getData($result));
 	}
 
-	public function RoomInformation()
-	{
-		$this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
-		
-		$result = $this->StundenplanModel->getRoomDataOnDay('EDV_A2.06','2024-05-21');
-		$result = hasData($result) ? getData($result) : [];
-		//echo($this->db->last_query());
-		echo json_encode($result);
-		
-	}
 
 }
diff --git a/public/js/apps/Cis/RoomInformation.js b/public/js/apps/Cis/RoomInformation.js
index 6aa590b31..c3ce80a75 100644
--- a/public/js/apps/Cis/RoomInformation.js
+++ b/public/js/apps/Cis/RoomInformation.js
@@ -19,8 +19,13 @@ const app = Vue.createApp({
         },
     },
     methods:{
-        calendarDate_to_UTC_date: function(calendarDate){
-            return [calendarDate.y, calendarDate.m, calendarDate.d].join('-');    
+        // returns the string YYYY-MM-DD if param is instance of CalendarDate and null otherwise
+        calendarDateToString: function(calendarDate){
+            
+            return calendarDate instanceof CalendarDate? 
+            [calendarDate.y, calendarDate.m+1, calendarDate.d].join('-'):
+            null; 
+            
         }
     },
 	created() {
@@ -31,18 +36,10 @@ const app = Vue.createApp({
 			});
 
 
-            console.log(this.calendarDate_to_UTC_date(this.calendarWeek.firstDayOfWeek),"this is the converted calendar date")
+            console.log(this.calendarDateToString(this.calendarWeek.cdFirstDayOfWeek),"this is the converted calendar date")
 
-            /* console.log(this.convertDateToUtcDate(this.calendarWeek.firstDayOfWeek), "iso string here")
-
-            console.log(this.calendarWeek.cdFirstDayOfWeek.y,"this is the year of the first day of the week");
-            console.log(this.calendarWeek.cdFirstDayOfWeek.m,"this is the month of the first day of the week");
-            console.log(this.calendarWeek.cdFirstDayOfWeek.d,"this is the day of the first day of the week");
-
-            console.log(this.calendarWeek.firstDayOfWeek,"this is the first day of the week");
-            console.log(this.convertDateToUtcDate(this.calendarWeek.firstDayOfWeek), "this is the UTC date")
- */
-            this.$fhcApi.factory.stundenplan.getRoomInfo('EDV_A6.09', this.calendarWeek.firstDayOfWeek, this.calendarWeek.lastDayOfWeek).then(res =>{
+           
+            this.$fhcApi.factory.stundenplan.getRoomInfo('EDV_A6.09', this.calendarDateToString(this.calendarWeek.cdFirstDayOfWeek), this.calendarDateToString(this.calendarWeek.cdLastDayOfWeek)).then(res =>{
                 let events;
                 if (res.data && res.data.forEach) {
                     res.data.forEach((el, i) => {

From fe69c0a578eb366ecefabcbf80c913225dd196ae Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 6 Jun 2024 10:44:37 +0200
Subject: [PATCH 0766/1461] Betriebsmittel: Form as Modal

---
 .../ressource/Betriebsmittelperson_model.php  |   2 +-
 .../Betriebsmittel/Betriebsmittel.js          | 354 +++++++++---------
 2 files changed, 172 insertions(+), 184 deletions(-)

diff --git a/application/models/ressource/Betriebsmittelperson_model.php b/application/models/ressource/Betriebsmittelperson_model.php
index 75609759b..48c35381f 100644
--- a/application/models/ressource/Betriebsmittelperson_model.php
+++ b/application/models/ressource/Betriebsmittelperson_model.php
@@ -115,7 +115,7 @@ class Betriebsmittelperson_model extends DB_Model
 
 		$query = "
 			SELECT 
-			    bm.nummer, bmp.person_id, bm.betriebsmitteltyp, bmp.anmerkung as anmerkung, bmp.retouram, TO_CHAR(bmp.retouram::timestamp, 'DD.MM.YYYY') AS format_retour, bmp.ausgegebenam, TO_CHAR(bmp.ausgegebenam::timestamp, 'DD.MM.YYYY') AS format_ausgabe, bm.beschreibung, bmp.uid, bmp.kaution, bm.betriebsmittel_id, bmp.betriebsmittelperson_id, bm.inventarnummer
+			    bm.nummer, bmp.person_id, bm.betriebsmitteltyp, bmp.anmerkung as anmerkung, bmp.retouram, TO_CHAR(bmp.retouram::timestamp, 'DD.MM.YYYY') AS format_retour, bmp.ausgegebenam, TO_CHAR(bmp.ausgegebenam::timestamp, 'DD.MM.YYYY') AS format_ausgabe, bm.beschreibung, bmp.uid, bmp.kaution, bm.betriebsmittel_id, bmp.betriebsmittelperson_id, bm.inventarnummer, bm.nummer2
 			FROM 
 			    wawi.tbl_betriebsmittelperson bmp
 			JOIN 
diff --git a/public/js/components/Betriebsmittel/Betriebsmittel.js b/public/js/components/Betriebsmittel/Betriebsmittel.js
index e7f09b26a..986b86d64 100644
--- a/public/js/components/Betriebsmittel/Betriebsmittel.js
+++ b/public/js/components/Betriebsmittel/Betriebsmittel.js
@@ -46,15 +46,15 @@ export default {
 				},
 				ajaxResponse: (url, params, response) => response.data,
 				columns: [
-					{title: "Nummer", field: "nummer"},
+					{title: "Nummer", field: "nummer", width: 150},
 					{title: "PersonId", field: "person_id", visible: false},
-					{title: "Typ", field: "betriebsmitteltyp"},
+					{title: "Typ", field: "betriebsmitteltyp", width: 125},
 					{title: "Anmerkung", field: "anmerkung", visible: false},
-					{title: "Retourdatum", field: "format_retour", visible: false},
+					{title: "Retourdatum", field: "format_retour", width: 128},
 					{title: "Beschreibung", field: "beschreibung"},
-					{title: "Uid", field: "uid", visible: false},
+					{title: "Uid", field: "uid", width: 87},
 					{title: "Kaution", field: "kaution", visible: false},
-					{title: "Ausgabedatum", field: "format_ausgabe"},
+					{title: "Ausgabedatum", field: "format_ausgabe", width: 144},
 					{title: "Betriebsmittel_id", field: "betriebsmittel_id", visible: false},
 					{title: "Betriebsmittelperson_id", field: "betriebsmittelperson_id", visible: false},
 					{
@@ -161,9 +161,11 @@ export default {
 		actionEditBetriebsmittel(betriebsmittelperson_id) {
 			this.statusNew = false;
 			this.loadBetriebsmittel(betriebsmittelperson_id);
+			this.$refs.betriebsmittelModal.show();
 		},
 		actionNewBetriebsmittel() {
 			this.resetModal();
+			this.$refs.betriebsmittelModal.show();
 			this.statusNew = true;
 			this.formData.ausgegebenam = this.getDefaultDate();
 			this.reload();
@@ -179,6 +181,7 @@ export default {
 			return this.endpoint.addNewBetriebsmittel(this.id, this.formData)
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+					this.hideModal('betriebsmittelModal');
 					this.resetModal();
 				}).catch(this.$fhcAlert.handleSystemError)
 				.finally(() => {
@@ -205,6 +208,7 @@ export default {
 			return this.endpoint.updateBetriebsmittel(betriebsmittelperson_id, this.formData)
 			.then(response => {
 				this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+				this.hideModal('betriebsmittelModal');
 				this.resetModal();
 			}).catch(this.$fhcAlert.handleSystemError)
 				.finally(() => {
@@ -263,195 +267,179 @@ export default {
 	},
 	template: `
 	<div class="core-betriebsmittel">
-	
-	
+		
 		<!--Modal: deleteBetriebsmittelModal-->
 		<BsModal ref="deleteBetriebsmittelModal">
 			<template #title>{{$p.t('ui', 'betriebsmittel_delete')}}</template>
-			<template #default>
-				<p>{{$p.t('ui', 'betriebsmittel_confirm_delete')}}</p>
-			</template>
+			<template #default><p>{{$p.t('ui', 'betriebsmittel_confirm_delete')}}</p></template>
 			<template #footer>
-<!--				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">Abbrechen</button>-->
 				<button ref="Close" type="button" class="btn btn-primary" @click="deleteBetriebsmittel(formData.betriebsmittelperson_id)">OK</button>
 			</template>
 		</BsModal>
 		
-		
-		<div class="row col-12">
-			<div class="col-6">
+		<div class="row col-12">	
+			<core-filter-cmpt
+				ref="table"
+				:tabulator-options="tabulatorOptions"
+				:tabulator-events="tabulatorEvents"
+				table-only
+				:side-menu="false"
+				reload
+				new-btn-show
+				new-btn-label="Betriebsmittel"
+				@click:new="actionNewBetriebsmittel"
+				>
+			</core-filter-cmpt>		
 			
-				<core-filter-cmpt
-					ref="table"
-					:tabulator-options="tabulatorOptions"
-					:tabulator-events="tabulatorEvents"
-					table-only
-					:side-menu="false"
-					reload
-					new-btn-show
-					new-btn-label="Betriebsmittel"
-					@click:new="actionNewBetriebsmittel"
-					>
-				</core-filter-cmpt>
+			<!--Modal: betriebsmittelModal-->
+			<bs-modal ref="betriebsmittelModal">
+				<template #title>
+					<p v-if="statusNew" class="fw-bold mt-3">{{$p.t('ui', 'add_betriebsmittel')}}</p>
+					<p v-else class="fw-bold mt-3">{{$p.t('ui', 'edit_betriebsmittel')}}</p>
+				</template>
 			
-			</div>
-			
-			<form-form class="row g-3 col-6" ref="betriebsmittelData">
-				<legend>Details</legend>
-				
-				<div class="row mb-3">
-					<div class="col-sm-7">
-						<p v-if="statusNew" class="fw-bold">{{$p.t('ui', 'add_betriebsmittel')}}</p>
-						<p v-else class="fw-bold">{{$p.t('ui', 'edit_betriebsmittel')}}</p>
-					</div>
-				</div>
-				
-				<div class="row mb-3">
-					<label for="typ" class="form-label col-sm-4">{{$p.t('global', 'typ')}}</label>
-					<div class="col-sm-6">
-						<form-input
-						type="select"
-						name="typ"
-						v-model="formData.betriebsmitteltyp"
-						:disabled="!statusNew"
-						>
-						<option
-							v-for="entry in listBetriebsmitteltyp"
-							:key="entry.betriebsmitteltyp"
-							:value="entry.betriebsmitteltyp"
-							>
-							{{entry.beschreibung}}
-						</option>
-						</form-input>
-					</div>
-				</div>
-			
-				<div v-if="formData.betriebsmitteltyp == 'Inventar'" class="row mb-3">
-					<label for="inventarnummer" class="form-label col-sm-4">{{$p.t('wawi', 'inventarnummer')}}</label>
-					<div class="col-sm-6">
-						<PvAutoComplete v-model="formData['inventarData']" optionLabel="dropdowntext" :suggestions="filteredInventar" @complete="searchInventar" minLength="3"/>
-					</div>
-				</div>
-				<div v-else-if="formData.inventarnummer" class="row mb-3">
-				<label for="inventarnummer" class="form-label col-sm-4">{{$p.t('wawi', 'inventarnummer')}}</label>
-					<div class="col-sm-6">
-						<input type="text" class="form-control" id="inventarnummer" v-model="formData.inventarnummer" :disabled="!statusNew">
-					</div>
-				</div>
-				
-				<div v-if="formData.betriebsmitteltyp!='Inventar' && !formData.inventarnummer" class="row mb-3">
-					<label for="nummer" class="form-label col-sm-4">{{$p.t('wawi', 'nummer')}}</label>
-					<div class="col-sm-6">
-						<form-input
-							type="text"
-							name="nummer"
-							v-model="formData['nummer']"
-						>
-						</form-input>
-					</div>
-				</div>
-				
-				<div v-if="formData.betriebsmitteltyp!='Inventar' && !formData.inventarnummer" class="row mb-3">
-					<label for="nummer2" class="form-label col-sm-4">{{$p.t('wawi', 'nummer')}} 2</label>
-					<div class="col-sm-6">
-						<form-input
-							type="text"
-							name="nummer2"
-							v-model="formData['nummer2']"
-						>
-						</form-input>
-					</div>
-				</div>
-			
-				<div v-if="formData.betriebsmitteltyp!='Inventar'" class="row mb-3">
-					<label for="beschreibung" class="form-label col-sm-4">{{$p.t('global', 'beschreibung')}}</label>
-					<div class="col-sm-6">
-						<form-input
-							type="textarea"
-							name="beschreibung"
-							v-model="formData['beschreibung']"
-							:disabled="formData.inventarnummer"
-						>
-						</form-input>
-					</div>
-				</div>
-				
-				<div class="row mb-3">
-					<label for="kaution" class="form-label col-sm-4">{{$p.t('infocenter', 'kaution')}}</label>
-					<div class="col-sm-6">
-						<form-input
-							type="text"
-							name="kaution"
-							v-model="formData['kaution']"
-						>
-						</form-input>
-					</div>
-				</div>
-				
-				<div class="row mb-3">
-					<label for="anmerkung" class="form-label col-sm-4">{{$p.t('global', 'anmerkung')}}</label>
-					<div class="col-sm-6">
-						<form-input
-							type="textarea"
-							name="anmerkung"
-							v-model="formData['anmerkung']"
-						>
-						</form-input>
-					</div>
-				</div>
-				
-				<div class="row mb-3">
-					<label for="ausgegebenam" class="form-label col-sm-4">{{$p.t('wawi', 'ausgegebenam')}}</label>
-					<div class="col-sm-6">
-						<form-input
-							type="DatePicker"
-							name="datum"
-							v-model="formData['ausgegebenam']"
-							auto-apply
-							:enable-time-picker="false"
-							format="dd.MM.yyyy"
-							preview-format="dd.MM.yyyy"
-							:teleport="true"
-						></form-input>
-					</div>
-				</div>
-				
-				<div class="row mb-3">
-					<label for="retouram" class="form-label col-sm-4">{{$p.t('wawi', 'retouram')}}</label>
-					<div class="col-sm-6">
-						<form-input
-							type="DatePicker"
-							name="datum"
-							v-model="formData['retouram']"
-							auto-apply
-							:enable-time-picker="false"
-							format="dd.MM.yyyy"
-							preview-format="dd.MM.yyyy"
-							:teleport="true"
-						></form-input>
-					</div>
-				</div>
-				
-
-				<div class="row mb-3">
-				<label class="form-label col-sm-8"></label>
-					<div v-if="statusNew" class="col-sm-4">
-						<button ref="Close" type="button" class="btn btn-primary" @click="addNewBetriebsmittel()">{{$p.t('ui', 'speichern')}}</button>
-					</div>
-					<div v-else class="col-sm-4">
-						<button ref="Close" type="button" class="btn btn-primary" @click="updateBetriebsmittel(formData.betriebsmittelperson_id)">{{$p.t('ui', 'speichern')}}</button>
-					</div>
+				<form-form class="row g-3" ref="betriebsmittelData">		
+					<legend>Details</legend>
+						
+						<div class="row mb-3">
+							<label for="typ" class="form-label col-sm-4">{{$p.t('global', 'typ')}}</label>
+							<div class="col-sm-6">
+								<form-input
+								type="select"
+								name="typ"
+								v-model="formData.betriebsmitteltyp"
+								:disabled="!statusNew"
+								>
+								<option
+									v-for="entry in listBetriebsmitteltyp"
+									:key="entry.betriebsmitteltyp"
+									:value="entry.betriebsmitteltyp"
+									>
+									{{entry.beschreibung}}
+								</option>
+								</form-input>
+							</div>
+						</div>
 					
-				</div>
-		</form-form>
-		
-		</div>
-
-
-
-
-
-		
+						<div v-if="formData.betriebsmitteltyp == 'Inventar'" class="row mb-3">
+							<label for="inventarnummer" class="form-label col-sm-4">{{$p.t('wawi', 'inventarnummer')}}</label>
+							<div class="col-sm-6">
+								<PvAutoComplete v-model="formData['inventarData']" optionLabel="dropdowntext" :suggestions="filteredInventar" @complete="searchInventar" minLength="3"/>
+							</div>
+						</div>
+						<div v-else-if="formData.inventarnummer" class="row mb-3">
+						<label for="inventarnummer" class="form-label col-sm-4">{{$p.t('wawi', 'inventarnummer')}}</label>
+							<div class="col-sm-6">
+								<input type="text" class="form-control" id="inventarnummer" v-model="formData.inventarnummer" :disabled="!statusNew">
+							</div>
+						</div>
+						
+						<div v-if="formData.betriebsmitteltyp!='Inventar' && !formData.inventarnummer" class="row mb-3">
+							<label for="nummer" class="form-label col-sm-4">{{$p.t('wawi', 'nummer')}}</label>
+							<div class="col-sm-6">
+								<form-input
+									type="text"
+									name="nummer"
+									v-model="formData['nummer']"
+								>
+								</form-input>
+							</div>
+						</div>
+						
+						<div v-if="formData.betriebsmitteltyp!='Inventar' && !formData.inventarnummer" class="row mb-3">
+							<label for="nummer2" class="form-label col-sm-4">{{$p.t('wawi', 'nummer')}} 2</label>
+							<div class="col-sm-6">
+								<form-input
+									type="text"
+									name="nummer2"
+									v-model="formData['nummer2']"
+								>
+								</form-input>
+							</div>
+						</div>
+					
+						<div v-if="formData.betriebsmitteltyp!='Inventar'" class="row mb-3">
+							<label for="beschreibung" class="form-label col-sm-4">{{$p.t('global', 'beschreibung')}}</label>
+							<div class="col-sm-6">
+								<form-input
+									type="textarea"
+									name="beschreibung"
+									v-model="formData['beschreibung']"
+									:disabled="formData.inventarnummer"
+								>
+								</form-input>
+							</div>
+						</div>
+						
+						<div class="row mb-3">
+							<label for="kaution" class="form-label col-sm-4">{{$p.t('infocenter', 'kaution')}}</label>
+							<div class="col-sm-6">
+								<form-input
+									type="text"
+									name="kaution"
+									v-model="formData['kaution']"
+								>
+								</form-input>
+							</div>
+						</div>
+						
+						<div class="row mb-3">
+							<label for="anmerkung" class="form-label col-sm-4">{{$p.t('global', 'anmerkung')}}</label>
+							<div class="col-sm-6">
+								<form-input
+									type="textarea"
+									name="anmerkung"
+									v-model="formData['anmerkung']"
+								>
+								</form-input>
+							</div>
+						</div>
+						
+						<div class="row mb-3">
+							<label for="ausgegebenam" class="form-label col-sm-4">{{$p.t('wawi', 'ausgegebenam')}}</label>
+							<div class="col-sm-6">
+								<form-input
+									type="DatePicker"
+									name="datum"
+									v-model="formData['ausgegebenam']"
+									auto-apply
+									:enable-time-picker="false"
+									format="dd.MM.yyyy"
+									preview-format="dd.MM.yyyy"
+									:teleport="true"
+								></form-input>
+							</div>
+						</div>
+						
+						<div class="row mb-3">
+							<label for="retouram" class="form-label col-sm-4">{{$p.t('wawi', 'retouram')}}</label>
+							<div class="col-sm-6">
+								<form-input
+									type="DatePicker"
+									name="datum"
+									v-model="formData['retouram']"
+									auto-apply
+									:enable-time-picker="false"
+									format="dd.MM.yyyy"
+									preview-format="dd.MM.yyyy"
+									:teleport="true"
+								></form-input>
+							</div>
+						</div>
+					</form-form>
+					
+					<template #footer>
+						<div v-if="statusNew" class="col-sm-4">
+							<button ref="Close" type="button" class="btn btn-primary" @click="addNewBetriebsmittel()">{{$p.t('ui', 'speichern')}}</button>
+						</div>
+						<div v-else class="col-sm-4">
+							<button ref="Close" type="button" class="btn btn-primary" @click="updateBetriebsmittel(formData.betriebsmittelperson_id)">{{$p.t('ui', 'speichern')}}</button>
+						</div>
+					</template>
+						
+			</bs-modal>
+				
+		</div>	
 	</div>`
 }
 

From 0b24e1098ad39fd1a2286aae074860307f3d6ec4 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 6 Jun 2024 11:20:57 +0200
Subject: [PATCH 0767/1461] Betriebsmittel Adaptierung Layout Form

---
 .../Betriebsmittel/Betriebsmittel.js          | 314 +++++++++---------
 1 file changed, 152 insertions(+), 162 deletions(-)

diff --git a/public/js/components/Betriebsmittel/Betriebsmittel.js b/public/js/components/Betriebsmittel/Betriebsmittel.js
index 986b86d64..ce0d6ce61 100644
--- a/public/js/components/Betriebsmittel/Betriebsmittel.js
+++ b/public/js/components/Betriebsmittel/Betriebsmittel.js
@@ -266,7 +266,7 @@ export default {
 			.catch(this.$fhcAlert.handleSystemError);
 	},
 	template: `
-	<div class="core-betriebsmittel">
+	<div class="core-betriebsmittel h-100 d-flex flex-column">
 		
 		<!--Modal: deleteBetriebsmittelModal-->
 		<BsModal ref="deleteBetriebsmittelModal">
@@ -277,169 +277,159 @@ export default {
 			</template>
 		</BsModal>
 		
-		<div class="row col-12">	
-			<core-filter-cmpt
-				ref="table"
-				:tabulator-options="tabulatorOptions"
-				:tabulator-events="tabulatorEvents"
-				table-only
-				:side-menu="false"
-				reload
-				new-btn-show
-				new-btn-label="Betriebsmittel"
-				@click:new="actionNewBetriebsmittel"
-				>
-			</core-filter-cmpt>		
-			
-			<!--Modal: betriebsmittelModal-->
-			<bs-modal ref="betriebsmittelModal">
-				<template #title>
-					<p v-if="statusNew" class="fw-bold mt-3">{{$p.t('ui', 'add_betriebsmittel')}}</p>
-					<p v-else class="fw-bold mt-3">{{$p.t('ui', 'edit_betriebsmittel')}}</p>
-				</template>
-			
-				<form-form class="row g-3" ref="betriebsmittelData">		
-					<legend>Details</legend>
-						
-						<div class="row mb-3">
-							<label for="typ" class="form-label col-sm-4">{{$p.t('global', 'typ')}}</label>
-							<div class="col-sm-6">
-								<form-input
-								type="select"
-								name="typ"
-								v-model="formData.betriebsmitteltyp"
-								:disabled="!statusNew"
-								>
-								<option
-									v-for="entry in listBetriebsmitteltyp"
-									:key="entry.betriebsmitteltyp"
-									:value="entry.betriebsmitteltyp"
-									>
-									{{entry.beschreibung}}
-								</option>
-								</form-input>
-							</div>
-						</div>
+		<core-filter-cmpt
+			ref="table"
+			:tabulator-options="tabulatorOptions"
+			:tabulator-events="tabulatorEvents"
+			table-only
+			:side-menu="false"
+			reload
+			new-btn-show
+			new-btn-label="Betriebsmittel"
+			@click:new="actionNewBetriebsmittel"
+			>
+		</core-filter-cmpt>		
+		
+		<!--Modal: betriebsmittelModal-->
+		<bs-modal ref="betriebsmittelModal">
+			<template #title>
+				<p v-if="statusNew" class="fw-bold mt-3">{{$p.t('ui', 'add_betriebsmittel')}}</p>
+				<p v-else class="fw-bold mt-3">{{$p.t('ui', 'edit_betriebsmittel')}}</p>
+			</template>
+		
+			<form-form class="row g-3" ref="betriebsmittelData">		
+				<legend>Details</legend>
 					
-						<div v-if="formData.betriebsmitteltyp == 'Inventar'" class="row mb-3">
-							<label for="inventarnummer" class="form-label col-sm-4">{{$p.t('wawi', 'inventarnummer')}}</label>
-							<div class="col-sm-6">
-								<PvAutoComplete v-model="formData['inventarData']" optionLabel="dropdowntext" :suggestions="filteredInventar" @complete="searchInventar" minLength="3"/>
-							</div>
-						</div>
-						<div v-else-if="formData.inventarnummer" class="row mb-3">
-						<label for="inventarnummer" class="form-label col-sm-4">{{$p.t('wawi', 'inventarnummer')}}</label>
-							<div class="col-sm-6">
-								<input type="text" class="form-control" id="inventarnummer" v-model="formData.inventarnummer" :disabled="!statusNew">
-							</div>
-						</div>
-						
-						<div v-if="formData.betriebsmitteltyp!='Inventar' && !formData.inventarnummer" class="row mb-3">
-							<label for="nummer" class="form-label col-sm-4">{{$p.t('wawi', 'nummer')}}</label>
-							<div class="col-sm-6">
-								<form-input
-									type="text"
-									name="nummer"
-									v-model="formData['nummer']"
-								>
-								</form-input>
-							</div>
-						</div>
-						
-						<div v-if="formData.betriebsmitteltyp!='Inventar' && !formData.inventarnummer" class="row mb-3">
-							<label for="nummer2" class="form-label col-sm-4">{{$p.t('wawi', 'nummer')}} 2</label>
-							<div class="col-sm-6">
-								<form-input
-									type="text"
-									name="nummer2"
-									v-model="formData['nummer2']"
-								>
-								</form-input>
-							</div>
-						</div>
-					
-						<div v-if="formData.betriebsmitteltyp!='Inventar'" class="row mb-3">
-							<label for="beschreibung" class="form-label col-sm-4">{{$p.t('global', 'beschreibung')}}</label>
-							<div class="col-sm-6">
-								<form-input
-									type="textarea"
-									name="beschreibung"
-									v-model="formData['beschreibung']"
-									:disabled="formData.inventarnummer"
-								>
-								</form-input>
-							</div>
-						</div>
-						
-						<div class="row mb-3">
-							<label for="kaution" class="form-label col-sm-4">{{$p.t('infocenter', 'kaution')}}</label>
-							<div class="col-sm-6">
-								<form-input
-									type="text"
-									name="kaution"
-									v-model="formData['kaution']"
-								>
-								</form-input>
-							</div>
-						</div>
-						
-						<div class="row mb-3">
-							<label for="anmerkung" class="form-label col-sm-4">{{$p.t('global', 'anmerkung')}}</label>
-							<div class="col-sm-6">
-								<form-input
-									type="textarea"
-									name="anmerkung"
-									v-model="formData['anmerkung']"
-								>
-								</form-input>
-							</div>
-						</div>
-						
-						<div class="row mb-3">
-							<label for="ausgegebenam" class="form-label col-sm-4">{{$p.t('wawi', 'ausgegebenam')}}</label>
-							<div class="col-sm-6">
-								<form-input
-									type="DatePicker"
-									name="datum"
-									v-model="formData['ausgegebenam']"
-									auto-apply
-									:enable-time-picker="false"
-									format="dd.MM.yyyy"
-									preview-format="dd.MM.yyyy"
-									:teleport="true"
-								></form-input>
-							</div>
-						</div>
-						
-						<div class="row mb-3">
-							<label for="retouram" class="form-label col-sm-4">{{$p.t('wawi', 'retouram')}}</label>
-							<div class="col-sm-6">
-								<form-input
-									type="DatePicker"
-									name="datum"
-									v-model="formData['retouram']"
-									auto-apply
-									:enable-time-picker="false"
-									format="dd.MM.yyyy"
-									preview-format="dd.MM.yyyy"
-									:teleport="true"
-								></form-input>
-							</div>
-						</div>
-					</form-form>
-					
-					<template #footer>
-						<div v-if="statusNew" class="col-sm-4">
-							<button ref="Close" type="button" class="btn btn-primary" @click="addNewBetriebsmittel()">{{$p.t('ui', 'speichern')}}</button>
-						</div>
-						<div v-else class="col-sm-4">
-							<button ref="Close" type="button" class="btn btn-primary" @click="updateBetriebsmittel(formData.betriebsmittelperson_id)">{{$p.t('ui', 'speichern')}}</button>
-						</div>
-					</template>
-						
-			</bs-modal>
+					<div class="row mb-3">
+						<form-input
+						type="select"
+						:label="$p.t('global/typ')"
+						name="typ"
+						v-model="formData.betriebsmitteltyp"
+						:disabled="!statusNew"
+						>
+						<option
+							v-for="entry in listBetriebsmitteltyp"
+							:key="entry.betriebsmitteltyp"
+							:value="entry.betriebsmitteltyp"
+							>
+							{{entry.beschreibung}}
+						</option>
+						</form-input>
+					</div>
+				
+					<div v-if="formData.betriebsmitteltyp == 'Inventar'" class="row mb-3">
+						<form-input
+							type="autocomplete"
+							:label="$p.t('wawi/inventarnummer')"
+							name="inventarnummer"
+							v-model="formData.inventarData"
+							optionLabel="dropdowntext" 
+							:suggestions="filteredInventar" 
+							@complete="searchInventar" 
+							minLength="3"
+						>
+						</form-input>
+					</div>
+					<div v-else-if="formData.inventarnummer" class="row mb-3">
+						<form-input
+							type="text"
+							:label="$p.t('wawi/inventarnummer')"
+							name="inventarnummer"
+							v-model="formData.inventarnummer"
+							:disabled="!statusNew"
+						>
+						</form-input>
+					</div>
+					
+					<div v-if="formData.betriebsmitteltyp!='Inventar' && !formData.inventarnummer" class="row mb-3">
+						<form-input
+							type="text"
+							:label="$p.t('wawi/nummer')"
+							name="nummer"
+							v-model="formData['nummer']"
+						>
+						</form-input>
+					</div>
+					
+					<div v-if="formData.betriebsmitteltyp!='Inventar' && !formData.inventarnummer" class="row mb-3">
+						<form-input
+							type="text"
+							:label="$p.t('wawi/nummer') + ' 2'"
+							name="nummer2"
+							v-model="formData['nummer2']"
+						>
+						</form-input>
+					</div>
+				
+					<div v-if="formData.betriebsmitteltyp!='Inventar'" class="row mb-3">
+						<form-input
+							type="textarea"
+							:label="$p.t('global/beschreibung')"
+							name="beschreibung"
+							v-model="formData['beschreibung']"
+							:disabled="formData.inventarnummer"
+						>
+						</form-input>
+					</div>
+					
+					<div class="row mb-3">
+						<form-input
+							type="text"
+							:label="$p.t('infocenter/kaution')"
+							name="kaution"
+							v-model="formData['kaution']"
+						>
+						</form-input>
+					</div>
+					
+					<div class="row mb-3">
+						<form-input
+							type="textarea"
+							:label="$p.t('global/anmerkung')"
+							name="anmerkung"
+							v-model="formData['anmerkung']"
+						>
+						</form-input>
+					</div>
+					
+					<div class="row mb-3">
+						<form-input
+							type="DatePicker"
+							:label="$p.t('wawi/ausgegebenam')"
+							name="datum"
+							v-model="formData['ausgegebenam']"
+							auto-apply
+							:enable-time-picker="false"
+							format="dd.MM.yyyy"
+							preview-format="dd.MM.yyyy"
+							:teleport="true"
+						></form-input>
+					</div>
+					
+					<div class="row mb-3">
+						<form-input
+							type="DatePicker"
+							:label="$p.t('wawi/retouram')"
+							name="datum"
+							v-model="formData['retouram']"
+							auto-apply
+							:enable-time-picker="false"
+							format="dd.MM.yyyy"
+							preview-format="dd.MM.yyyy"
+							:teleport="true"
+						></form-input>
+					</div>
+				</form-form>
+				
+				<template #footer>
+					<button v-if="statusNew"  ref="Close" type="button" class="btn btn-primary" @click="addNewBetriebsmittel()">{{$p.t('ui', 'speichern')}}</button>
+
+					<button v-else  ref="Close" type="button" class="btn btn-primary" @click="updateBetriebsmittel(formData.betriebsmittelperson_id)">{{$p.t('ui', 'speichern')}}</button>
+				</template>
+					
+		</bs-modal>
 				
-		</div>	
 	</div>`
 }
 

From 46b7dc1ce78738441ebda90a34d7d6b41486368f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Fri, 7 Jun 2024 10:19:12 +0200
Subject: [PATCH 0768/1461] =?UTF-8?q?Dauer=20f=C3=BCr=20die=20Anzeige=20vo?=
 =?UTF-8?q?n=20abgelaufenen=20Projekten=20in=20der=20Zeitaufzeichnung=20au?=
 =?UTF-8?q?f=202=20Monate=20verl=C3=A4ngert?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/projekt.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/projekt.class.php b/include/projekt.class.php
index 1dd7f60fb..79b706be9 100644
--- a/include/projekt.class.php
+++ b/include/projekt.class.php
@@ -382,7 +382,7 @@ class projekt extends basis_db
 					JOIN fue.tbl_projekt_ressource USING(ressource_id)
 					JOIN fue.tbl_projekt USING(projekt_kurzbz)
 				WHERE (beginn<=now() or beginn is null)
-				AND (ende + interval '1 month 1 day' >=now() OR ende is null)
+				AND (ende + interval '2 month 1 day' >=now() OR ende is null)
 				AND
 				(
 					mitarbeiter_uid=" . $this->db_add_param($mitarbeiter_uid) . " OR

From 70b0b3fae7b988ebd6ae60a0d9c3d90941006ad1 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 7 Jun 2024 15:06:28 +0200
Subject: [PATCH 0769/1461] MVP algorithm for stundenplan gruppierung (testing)

---
 .../api/frontend/v1/Stundenplan.php           | 95 ++++++++++++++-----
 application/core/FHCAPI_Controller.php        | 13 +++
 .../models/ressource/Stundenplan_model.php    | 31 +++++-
 public/js/apps/Cis/RoomInformation.js         |  2 +-
 4 files changed, 117 insertions(+), 24 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index c55b225c9..77e7e9a0f 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -84,16 +84,20 @@ class Stundenplan extends FHCAPI_Controller
         $this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
 		$this->load->model('ressource/Stunde_model', 'StundeModel');
 
+        
 		$stunden = $this->StundeModel->load();
         if(isError($stunden)){
             $this->terminateWithError(getError($stunden), self::ERROR_TYPE_GENERAL);
         }
         $stunden = getData($stunden);
 
-        $this->loglib->logInfoDB(print_r($stunden,true),"stunden");
-
-
+     
 		$result = $this->StundenplanModel->getRoomDataOnDay($ort_kurzbz,$start_date,$end_date);
+        
+            $this->loglib->logErrorDB(print_r($result,true),"this is an entry of a reservierung");
+        
+        return;
+
 		if(isError($result)){
             $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
         }
@@ -111,6 +115,7 @@ class Stundenplan extends FHCAPI_Controller
         $testEndDate = new DateTime($end_date);
         $count =0;
         $final_events = array();
+        $grouped = array();
         while($testStartDate <= $testEndDate && $count <7){
             $date = $testStartDate->format('Y-m-d');
             //TODO: array filtering for every day and hour could be too time consuming causing slow response
@@ -123,24 +128,16 @@ class Stundenplan extends FHCAPI_Controller
                     return $entry->stunde == $stunde->stunde;
                 });
 
-                // aenderung aller events die am gleichen tag und zur gleichen Stunde gehalten werden
-                foreach($stunden_events as $event_key => $stunden_event){
-                    $this->loglib->logInfoDB(print_r($stunden_event,true),"this is the stunden evnet");
-                    
-                    // lektor bestimmen
-                    if($stunden_event->mitarbeiter_kurzbz == null){
-                        $simml_lektor = $stunden_event->lektor;
-                    }else{
-                        $simml_lektor = $stunden_event->mitarbeiter_kurzbz;
-                    }
-
-                    
+                $lehrverband_array = array();
 
+                
+                // for loop that is just used to fill the lehrverband_array
+                foreach($stunden_events as $key=>$stunden_event){
                     // lehrverband bestimmen
                     if(strlen($stunden_event->gruppe_kurzbz)>0){
                         $lehrverband = $stunden_event->gruppe_kurzbz;
                     }else{
-                        $lehrverband=$stunden_event->stg.'-'.$stunden_event->sem;
+                        $lehrverband=$stunden_event->stg_typ . $stunden_event->stg_kurzbz .'-'.$stunden_event->semester;
                         // checks whether the verband is not null, '' or '0'
                         if($stunden_event->verband !=null && $stunden_event->verband != '0' && $stunden_event->verband != ''){ 
                             $lehrverband.=$stunden_event->verband;
@@ -148,7 +145,24 @@ class Stundenplan extends FHCAPI_Controller
                             $lehrverband.=$stunden_event->gruppe;
                         }
                     }
+                    $lehrverband_array[$key] = $lehrverband;
+                }
+                
+                
+                // aenderung aller events die am gleichen tag und zur gleichen Stunde gehalten werden
+                foreach($stunden_events as $event_key => $stunden_event){
+                    if(isset($grouped[$event_key])){
+                        continue;
+                    }
+                     
+                    // lektor bestimmen
+                    if($stunden_event->mitarbeiter_kurzbz == null){
+                        $simml_lektor = $stunden_event->lektor;
+                    }else{
+                        $simml_lektor = $stunden_event->mitarbeiter_kurzbz;
+                    }
 
+                
                     // lehrfach bestimmen
                     $lehrfach = $stunden_event->lehrfach;
                     if(isset($stunden_event->lehrform)){
@@ -158,26 +172,64 @@ class Stundenplan extends FHCAPI_Controller
                     // GRUPIEREN DER GLEICHEN EVENTS
                     // vergleiche das aktuelle Event mit allen anderen Events die am gleichen Tag und zur gleichen Stunde gehalten werden
                     foreach($stunden_events as $compare_key => $stunden_event_compare){
+                        
                         if($compare_key != $event_key){
-
+                            
+                            // will be used to skip the loop iteration with this index because it was already grouped
+                            $grouped[$compare_key] = 1;
+                            // this if checks if the events can be grouped
                            if ( 
                                 // the unr's have to be equal to be grouped
                                 $stunden_event->unr==$stunden_event_compare->unr && 
                                 // and either the lektor or the ort_kurzbz have to be equal
                                 ($stunden_event->ort_kurzbz==$stunden_event_compare->ort_kurzbz 
                                 || $stunden_event->lektor==$stunden_event_compare->lektor)
+                                // reservierungen muessen auch beachtet werden, wenn der eintrag eine reservierung ist dann koennen die eintraege nicht gruppiert werden
+                                //&& !$stunden_event->reservierung && !$stunden_event_compare->reservierung
+
                            )
                                 {
 
+                                    
+
+                                    // Bezeichnung des Events zusammenfuehren
+                                    // change the event with the $event_key if the compared_event has different properties but is still groupable
+
+                                    //Lektoren
+                                    if(!mb_strstr($stunden_event->lektor,$stunden_event_compare->lektor)){
+                                        $this->loglib->logErrorDB($stunden_event->datum ."-". $stunden_event->stunde,"entered lektor - first if");
+                                        $stunden_events[$event_key]->lektor = $stunden_event->lektor . ' \ ' . $stunden_event_compare->lektor;
+                                        $stunden_events[$event_key]->mitarbeiter_kurzbz = $stunden_event->mitarbeiter_kurzbz . ' \ ' . $stunden_event_compare->mitarbeiter_kurzbz;
+                                    }
+
+                                    //Ort
+                                    if(!mb_strstr($stunden_event->ort_kurzbz,$stunden_event_compare->ort_kurzbz)){
+                                        $this->loglib->logErrorDB($stunden_event->datum ."-". $stunden_event->stunde,"entered ort - second if");
+                                        $stunden_events[$event_key]->ort_kurzbz = $stunden_event->ort_kurzbz . ' \ ' . $stunden_event_compare->ort_kurzbz;
+                                    }
+
+                                    //unset the compared and grouped event
+                                    unset($stunden_events[$compare_key]);
+                                    
+
+                                    //Lehrverband
+                                    if(!mb_strstr($lehrverband_array[$event_key],$lehrverband_array[$compare_key])){
+                                        $this->loglib->logErrorDB($stunden_event->datum ."-". $stunden_event->stunde,"entered gruppe - third if");
+                                        $lehrverband_array[$event_key] .= ' \ ' . $lehrverband_array[$compare_key];
+                                    }
+
                                 }
                         }
                     }
-                    
+
+                    // add the grouped lehrverband entry to the event
+                    $stunden_events[$event_key]->stg = $lehrverband_array[$event_key];
+                    $final_events[] = $stunden_events[$event_key];
 
 
 
                 }
-                if (count($stunden_events) == 1){
+                /* if (count($stunden_events) == 1){
                     $final_events[] = current($stunden_events);
                 }else if(count($stunden_events) > 1){
                     $gruppe = '';
@@ -186,7 +238,7 @@ class Stundenplan extends FHCAPI_Controller
                     }
                     current($stunden_events)->gruppe = $gruppe;
                     $final_events[] = current($stunden_events);
-                }
+                } */
                 //$this->loglib->logInfoDB(print_r($stunden_events,true),"date: " . $date . " - stunde:" .$stunde->stunde);
             }
             /* $this->loglib->logInfoDB(print_r($testStartDate,true),"startdate");
@@ -197,8 +249,7 @@ class Stundenplan extends FHCAPI_Controller
             $count++;
         }     
         
-        $this->loglib->logInfoDB(print_r($final_events,true),"final_events");
-      
+       
         $this->groupTheCalendar($result);
         //php start date
         $phpStartDate = new DateTime($start_date);
diff --git a/application/core/FHCAPI_Controller.php b/application/core/FHCAPI_Controller.php
index 647032795..d5e3ca0ce 100644
--- a/application/core/FHCAPI_Controller.php
+++ b/application/core/FHCAPI_Controller.php
@@ -141,6 +141,19 @@ class FHCAPI_Controller extends Auth_Controller
 		$this->returnObj['meta'][$key] = $value;
 	}
 
+	/**
+	 * @param string				$key
+	 * @return mixed
+	 */
+	public function getMeta($key)
+	{
+		if (!isset($this->returnObj['meta']))
+			return null;
+		if (!isset($this->returnObj['meta'][$key]))
+			return null;
+		return $this->returnObj['meta'][$key];
+	}
+
 	/**
 	 * @param string				$status
 	 * @return void
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 077201f0f..0205b1472 100755
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -21,7 +21,27 @@ class Stundenplan_model extends DB_Model
 	public function getRoomDataOnDay($ort_kurzbz='EDV_A2.06',$start_date,$end_date){
 
 
-		$this->addSelect(['*',"CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) as stg","lektor","CONCAT(lehrfach,'-',lehrform) as lv_info" ]);
+		//$this->addSelect(['*',"CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) as stg","lektor","CONCAT(lehrfach,'-',lehrform) as lv_info" ]);
+		$result = $this->execReadOnlyQuery("
+		
+		SELECT 'stundenplan_eintrag' as eintrags_type, CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) AS stg, lektor, CONCAT(lehrfach,'-',lehrform) AS lv_info, ort_kurzbz , * FROM lehre.vw_stundenplan sp
+		WHERE ort_kurzbz = ? AND datum >= ? AND datum <= ? 
+		UNION ALL
+		SELECT 'reservierungs_eintrag' as eintrags_type, titel, uid, NULL, ort_kurzbz FROM lehre.vw_reservierung res
+		WHERE ort_kurzbz = ? AND datum >= ? AND datum <= ?
+		
+		", [$ort_kurzbz, $start_date, $end_date,$ort_kurzbz, $start_date, $end_date]);
+		return $result;
+
+
+		/*
+		"SELECT 'stundenplan_eintrag' as eintrags_type ort_kurzbz studiengang_kz uid stunde datum titel NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL"
+		"SELECT 'reservierungs_eintrag' as eintrags_type, ort_kurzbz studiengang_kz uid stunde datum titel NULL NULL NULL NULL NULL"
+		 
+		 */
+		//to add reservierungen to the query, we have to join the table vw_reservierung to the vw_stundenplan and use the datum/stunde/ort_kurzbz keys
+		
+		
 		/* $this->addSelect(["lehre.tbl_stundenplan.*","CONCAT(UPPER(sg.typ),UPPER(sg.kurzbz),'-',lehre.tbl_stundenplan.semester,lehre.tbl_stundenplan.verband) as simml"]);
 		$this->addJoin("public.tbl_lehrverband as lv","lv.studiengang_kz=lehre.tbl_stundenplan.studiengang_kz AND lv.gruppe=lehre.tbl_stundenplan.gruppe AND lv.verband=lehre.tbl_stundenplan.verband AND lv.semester=lehre.tbl_stundenplan.semester","LEFT"); 
 		$this->addJoin("public.tbl_studiengang as sg","sg.studiengang_kz=lehre.tbl_stundenplan.studiengang_kz","LEFT"); 
@@ -34,7 +54,16 @@ class Stundenplan_model extends DB_Model
 
 		$query = $this->db->get_compiled_select('lehre.vw_stundenplan sp');
 		
+		$raum_stundenplan= $this->execQuery($query, [$ort_kurzbz, $start_date, $end_date]);
+
+		// reseting the query and query reservierungen information
+		$this->resetQuery();
+		$this->db->where('ort_kurzbz',$ort_kurzbz,true);
+		$this->db->where('datum >=',$start_date,true);
+		$this->db->where('datum <=',$end_date,true);
+		$query = $this->db->get_compiled_select('lehre.vw_reservierung res');
 		return $this->execQuery($query, [$ort_kurzbz, $start_date, $end_date]);
+		
 	}
 
 	/**
diff --git a/public/js/apps/Cis/RoomInformation.js b/public/js/apps/Cis/RoomInformation.js
index c3ce80a75..f0edefa73 100644
--- a/public/js/apps/Cis/RoomInformation.js
+++ b/public/js/apps/Cis/RoomInformation.js
@@ -10,7 +10,7 @@ const app = Vue.createApp({
 		return {
 			stunden: [],
 			events: null,
-            calendarWeek: new CalendarDate(new Date()),
+            calendarWeek: new CalendarDate(new Date("2024-03-06")),
         }
 	},
     computed:{

From 8442690bc75d46196617714e10fa05ca268e3618 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 10 Jun 2024 10:56:12 +0200
Subject: [PATCH 0770/1461] splits the multiple stg into different rows if
 there are more than one stg in one lv

---
 .../api/frontend/v1/Stundenplan.php           | 53 +++++++++++++++++--
 .../models/ressource/Stundenplan_model.php    | 49 ++++-------------
 public/js/apps/Cis/RoomInformation.js         |  2 +-
 3 files changed, 61 insertions(+), 43 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 77e7e9a0f..091e6c19d 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -94,9 +94,7 @@ class Stundenplan extends FHCAPI_Controller
      
 		$result = $this->StundenplanModel->getRoomDataOnDay($ort_kurzbz,$start_date,$end_date);
         
-            $this->loglib->logErrorDB(print_r($result,true),"this is an entry of a reservierung");
-        
-        return;
+            
 
 		if(isError($result)){
             $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
@@ -111,6 +109,53 @@ class Stundenplan extends FHCAPI_Controller
             $this->loglib->logInfoDB($event->datum,"NEW DATE");
         } */
 
+        //TODO: also implement the following algorithm to block the lectures that are together over different stunden
+        /* $blockcontinue=false;
+						if (isset($blocked[$this->std_plan[$i][$j][$idx]->unr]) && $blocked[$this->std_plan[$i][$j][$idx]->unr]>0)
+						{
+							$blocked[$this->std_plan[$i][$j][$idx]->unr]--;
+							$blockcontinue=true;
+						}
+
+						if (!$blockcontinue)
+						{
+							// Blockungen ueber mehrere Stunden erkennen
+
+							$blockflag=false;
+							for ($blockstunden=1;$blockstunden<=$num_rows_stunde;$blockstunden++)
+							{
+								if (isset($this->std_plan[$i][$j+$blockstunden][$idx]) && isset($this->std_plan[$i][$j+$blockstunden][$idx]->stundenplan_id)
+									&& ($this->std_plan[$i][$j][$idx]->unr == $this->std_plan[$i][$j+$blockstunden][$idx]->unr)
+									&& $this->std_plan[$i][$j][$idx]!='0' && $k<($num_rows_stunde-$blockstunden)
+									&& !($this->std_plan[$i][$j][$idx]->reservierung && $this->std_plan[$i][$j][$idx]->lektor!=$this->std_plan[$i][$j+$blockstunden][$idx]->lektor))
+								{
+
+									if (isset($blocked[$this->std_plan[$i][$j][$idx]->unr]))
+										$blocked[$this->std_plan[$i][$j][$idx]->unr]++;
+									else
+										$blocked[$this->std_plan[$i][$j][$idx]->unr]=1;
+									$row = $this->db_fetch_object($this->stunde, ($k+$blockstunden));
+									$stunden_arr[]=$row->stunde;
+									$end_time=$row->ende;
+									$blockflag=true;
+								}
+								else
+								{
+									if (!$blockflag)
+									{
+										$row = $this->db_fetch_object($this->stunde, $k);
+										$stunden_arr[]=$row->stunde;
+										$end_time=$row->ende;
+										break;
+									}
+									else
+									{
+										break;
+									}
+								}
+							}
+						} */
+
         $testStartDate = new DateTime($start_date);
         $testEndDate = new DateTime($end_date);
         $count =0;
@@ -215,7 +260,7 @@ class Stundenplan extends FHCAPI_Controller
                                     //Lehrverband
                                     if(!mb_strstr($lehrverband_array[$event_key],$lehrverband_array[$compare_key])){
                                         $this->loglib->logErrorDB($stunden_event->datum ."-". $stunden_event->stunde,"entered gruppe - third if");
-                                        $lehrverband_array[$event_key] .= ' \ ' . $lehrverband_array[$compare_key];
+                                        $lehrverband_array[$event_key] .= ' / ' . $lehrverband_array[$compare_key];
                                     }
 
                                 }
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 0205b1472..17516afe0 100755
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -21,49 +21,22 @@ class Stundenplan_model extends DB_Model
 	public function getRoomDataOnDay($ort_kurzbz='EDV_A2.06',$start_date,$end_date){
 
 
-		//$this->addSelect(['*',"CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) as stg","lektor","CONCAT(lehrfach,'-',lehrform) as lv_info" ]);
-		$result = $this->execReadOnlyQuery("
-		
-		SELECT 'stundenplan_eintrag' as eintrags_type, CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) AS stg, lektor, CONCAT(lehrfach,'-',lehrform) AS lv_info, ort_kurzbz , * FROM lehre.vw_stundenplan sp
+		//TODO alternative query version that unions the reservierungen into the stundenplan with different 'eintrags_type' column
+		/*"
+		-- merging all reservierungs information with the stundenplan information but with different types
+		SELECT 'stundenplan_eintrag' as eintrags_type, ort_kurzbz, studiengang_kz, uid, stunde, datum, titel, semester, verband, gruppe, gruppe_kurzbz, stg_kurzbz, CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) AS stg, CONCAT(lehrfach,'-',lehrform) AS lv_info, * FROM lehre.vw_stundenplan sp
 		WHERE ort_kurzbz = ? AND datum >= ? AND datum <= ? 
 		UNION ALL
-		SELECT 'reservierungs_eintrag' as eintrags_type, titel, uid, NULL, ort_kurzbz FROM lehre.vw_reservierung res
+		SELECT 'reservierungs_eintrag' as eintrags_type, ort_kurzbz, studiengang_kz, uid, stunde, datum, titel, semester, verband, gruppe, gruppe_kurzbz, stg_kurzbz, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL FROM lehre.vw_reservierung res
 		WHERE ort_kurzbz = ? AND datum >= ? AND datum <= ?
-		
-		", [$ort_kurzbz, $start_date, $end_date,$ort_kurzbz, $start_date, $end_date]);
-		return $result;
+		"*/
 
+		$raum_stundenplan= $this->execReadOnlyQuery("
+		SELECT 'stundenplan_eintrag' as eintrags_type, ort_kurzbz, studiengang_kz, uid, stunde, datum, titel, semester, verband, gruppe, gruppe_kurzbz, stg_kurzbz, CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) AS stg, CONCAT(lehrfach,'-',lehrform) AS lv_info, * FROM lehre.vw_stundenplan sp
+		WHERE ort_kurzbz = ? AND datum >= ? AND datum <= ? 
+		", [$ort_kurzbz, $start_date, $end_date]);
 
-		/*
-		"SELECT 'stundenplan_eintrag' as eintrags_type ort_kurzbz studiengang_kz uid stunde datum titel NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL"
-		"SELECT 'reservierungs_eintrag' as eintrags_type, ort_kurzbz studiengang_kz uid stunde datum titel NULL NULL NULL NULL NULL"
-		 
-		 */
-		//to add reservierungen to the query, we have to join the table vw_reservierung to the vw_stundenplan and use the datum/stunde/ort_kurzbz keys
-		
-		
-		/* $this->addSelect(["lehre.tbl_stundenplan.*","CONCAT(UPPER(sg.typ),UPPER(sg.kurzbz),'-',lehre.tbl_stundenplan.semester,lehre.tbl_stundenplan.verband) as simml"]);
-		$this->addJoin("public.tbl_lehrverband as lv","lv.studiengang_kz=lehre.tbl_stundenplan.studiengang_kz AND lv.gruppe=lehre.tbl_stundenplan.gruppe AND lv.verband=lehre.tbl_stundenplan.verband AND lv.semester=lehre.tbl_stundenplan.semester","LEFT"); 
-		$this->addJoin("public.tbl_studiengang as sg","sg.studiengang_kz=lehre.tbl_stundenplan.studiengang_kz","LEFT"); 
-		$res = $this->loadWhere(['ort_kurzbz'=>$ort_kurzbz,'datum'=>$date]);
-		$res = hasData($res) ? getData($res): null;
-		return $res; */
-		$this->db->where('ort_kurzbz',$ort_kurzbz,true);
-		$this->db->where('datum >=',$start_date,true);
-		$this->db->where('datum <=',$end_date,true);
-
-		$query = $this->db->get_compiled_select('lehre.vw_stundenplan sp');
-		
-		$raum_stundenplan= $this->execQuery($query, [$ort_kurzbz, $start_date, $end_date]);
-
-		// reseting the query and query reservierungen information
-		$this->resetQuery();
-		$this->db->where('ort_kurzbz',$ort_kurzbz,true);
-		$this->db->where('datum >=',$start_date,true);
-		$this->db->where('datum <=',$end_date,true);
-		$query = $this->db->get_compiled_select('lehre.vw_reservierung res');
-		return $this->execQuery($query, [$ort_kurzbz, $start_date, $end_date]);
-		
+		return $raum_stundenplan;
 	}
 
 	/**
diff --git a/public/js/apps/Cis/RoomInformation.js b/public/js/apps/Cis/RoomInformation.js
index f0edefa73..f4c9c21b7 100644
--- a/public/js/apps/Cis/RoomInformation.js
+++ b/public/js/apps/Cis/RoomInformation.js
@@ -64,7 +64,7 @@ const app = Vue.createApp({
         <fhc-calendar v-slot="{event}" :initialDate="currentDate" :events="events" initial-mode="week" show-weeks>
             <div class="d-flex flex-column align-items-center justify-content-evenly h-100">
                 <span>{{event.orig.lv_info}}</span>	
-                <span>{{event.orig.stg}}</span>
+                <span v-for="(item, index) in event.orig.stg.split('/')" :key="index">{{item}}</span>
                 <span>{{event.orig.lektor}}</span>
 			</div>
         </fhc-calendar>

From 392d8f38d290faadbbd45991ce9d8c38abe67693 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 10 Jun 2024 11:39:16 +0200
Subject: [PATCH 0771/1461] adding the reservierungen to the room plannung

---
 .../api/frontend/v1/Stundenplan.php           | 31 ++++++++++--
 .../models/ressource/Reservierung_model.php   | 17 +++++++
 .../models/ressource/Stundenplan_model.php    |  2 +-
 public/js/api/studenplan.js                   |  6 +++
 public/js/apps/Cis/RoomInformation.js         | 49 +++++++++++++++----
 5 files changed, 89 insertions(+), 16 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 091e6c19d..d360c1b90 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -34,7 +34,8 @@ class Stundenplan extends FHCAPI_Controller
 	
 		parent::__construct([
 			'roomInformation' => self::PERM_LOGGED,
-            'Stunden' => self::PERM_LOGGED
+            'Stunden' => self::PERM_LOGGED,
+            'Reservierungen' => self::PERM_LOGGED
 		]);
 
         $this->load->library('LogLib');
@@ -68,12 +69,16 @@ class Stundenplan extends FHCAPI_Controller
 	public function roomInformation()
 	{
 
-        
+        //TODO please split this algorithm into multiple smaller function it is not really mantainable like this
         // storing the get parameter in local variables
         $ort_kurzbz = $this->input->get('ort_kurzbz', TRUE);
         $start_date = $this->input->get('start_date', TRUE);
         $end_date = $this->input->get('end_date', TRUE);
         
+        if(!$ort_kurzbz || !$start_date || !$end_date){
+            $this->terminateWithError("Missing parameters", self::ERROR_TYPE_GENERAL);
+        }
+
         $this->addMeta("test_start_date",$start_date);
 
         $this->addMeta("ort",$ort_kurzbz);
@@ -295,7 +300,6 @@ class Stundenplan extends FHCAPI_Controller
         }     
         
        
-        $this->groupTheCalendar($result);
         //php start date
         $phpStartDate = new DateTime($start_date);
 
@@ -309,9 +313,26 @@ class Stundenplan extends FHCAPI_Controller
 		
 	}
 
-    private function groupTheCalendar($data){
+    public function Reservierungen()
+	{
 
-    }
+        $ort_kurzbz = $this->input->get('ort_kurzbz', TRUE);
+        $start_date = $this->input->get('start_date', TRUE);
+        $end_date = $this->input->get('end_date', TRUE);
+
+        if(!$ort_kurzbz || !$start_date || !$end_date){
+            $this->terminateWithError("Missing parameters", self::ERROR_TYPE_GENERAL);
+        }
+
+		$this->load->model('ressource/Reservierung_model', 'ReservierungModel');
+
+		$result = $this->ReservierungModel->getRoomReservierungen($ort_kurzbz, $start_date, $end_date);
+
+		if (isError($result))
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+
+		$this->terminateWithSuccess(getData($result));
+	}
 
 }
 
diff --git a/application/models/ressource/Reservierung_model.php b/application/models/ressource/Reservierung_model.php
index 7a3d1a4a4..260104305 100755
--- a/application/models/ressource/Reservierung_model.php
+++ b/application/models/ressource/Reservierung_model.php
@@ -12,6 +12,23 @@ class Reservierung_model extends DB_Model
 		$this->pk = 'reservierung_id';
 	}
 
+
+	/**
+	 * @param $uid
+	 * 
+	 * @return stdClass
+	 */
+	public function getRoomReservierungen($ort_kurzbz, $start_date, $end_date)
+	{
+
+		$raum_reservierungen= $this->execReadOnlyQuery("
+		SELECT * FROM lehre.vw_reservierung res
+		WHERE ort_kurzbz = ? AND datum >= ? AND datum <= ? 
+		", [$ort_kurzbz, $start_date, $end_date]);
+
+		return $raum_reservierungen;
+	}
+
 	/**
 	 * @param $uid
 	 * 
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 17516afe0..299faa049 100755
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -32,7 +32,7 @@ class Stundenplan_model extends DB_Model
 		"*/
 
 		$raum_stundenplan= $this->execReadOnlyQuery("
-		SELECT 'stundenplan_eintrag' as eintrags_type, ort_kurzbz, studiengang_kz, uid, stunde, datum, titel, semester, verband, gruppe, gruppe_kurzbz, stg_kurzbz, CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) AS stg, CONCAT(lehrfach,'-',lehrform) AS lv_info, * FROM lehre.vw_stundenplan sp
+		SELECT CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) AS stg, CONCAT(lehrfach,'-',lehrform) AS lv_info, * FROM lehre.vw_stundenplan sp
 		WHERE ort_kurzbz = ? AND datum >= ? AND datum <= ? 
 		", [$ort_kurzbz, $start_date, $end_date]);
 
diff --git a/public/js/api/studenplan.js b/public/js/api/studenplan.js
index 2da67a737..d691a72cf 100644
--- a/public/js/api/studenplan.js
+++ b/public/js/api/studenplan.js
@@ -12,4 +12,10 @@ export default {
 			{}
 		);
 	},
+	getReservierungen(ort_kurzbz, start_date, end_date) {
+		return this.$fhcApi.get(
+			'/api/frontend/v1/Stundenplan/Reservierungen',
+			{  ort_kurzbz, start_date, end_date}
+		);
+	},
 };
\ No newline at end of file
diff --git a/public/js/apps/Cis/RoomInformation.js b/public/js/apps/Cis/RoomInformation.js
index f4c9c21b7..a7aced683 100644
--- a/public/js/apps/Cis/RoomInformation.js
+++ b/public/js/apps/Cis/RoomInformation.js
@@ -10,13 +10,19 @@ const app = Vue.createApp({
 		return {
 			stunden: [],
 			events: null,
-            calendarWeek: new CalendarDate(new Date("2024-03-06")),
+            calendarWeek: new CalendarDate(new Date("2024-06-06")),
         }
 	},
     computed:{
         currentDate: function(){
             return new Date(this.calendarWeek.y, this.calendarWeek.m, this.calendarWeek.d);
         },
+        weekFirstDay: function(){
+            return this.calendarDateToString(this.calendarWeek.cdFirstDayOfWeek);
+        },
+        weekLastDay: function(){
+            return this.calendarDateToString(this.calendarWeek.cdLastDayOfWeek);
+        },
     },
     methods:{
         // returns the string YYYY-MM-DD if param is instance of CalendarDate and null otherwise
@@ -26,7 +32,8 @@ const app = Vue.createApp({
             [calendarDate.y, calendarDate.m+1, calendarDate.d].join('-'):
             null; 
             
-        }
+        },
+        
     },
 	created() {
 
@@ -36,10 +43,8 @@ const app = Vue.createApp({
 			});
 
 
-            console.log(this.calendarDateToString(this.calendarWeek.cdFirstDayOfWeek),"this is the converted calendar date")
-
-           
-            this.$fhcApi.factory.stundenplan.getRoomInfo('EDV_A6.09', this.calendarDateToString(this.calendarWeek.cdFirstDayOfWeek), this.calendarDateToString(this.calendarWeek.cdLastDayOfWeek)).then(res =>{
+           // old testing room EDV_A6.09
+            this.$fhcApi.factory.stundenplan.getRoomInfo('SEM_E0.04', this.weekFirstDay, this.weekLastDay).then(res =>{
                 let events;
                 if (res.data && res.data.forEach) {
                     res.data.forEach((el, i) => {
@@ -55,7 +60,27 @@ const app = Vue.createApp({
                     
                     this.events = res.data;
                 }
-            })
+            });
+
+            this.$fhcApi.factory.stundenplan.getReservierungen('SEM_E0.04', this.weekFirstDay, this.weekLastDay).then(res => {
+                if (res.data && res.data.forEach) {
+                    res.data.forEach((el, i) => {
+                        el.reservierung = true;
+                        el.color = '#CCCCCC';
+                        el.start = new Date(el.datum + ' ' + this.stunden[el.stunde].beginn);
+                        el.end = new Date(el.datum + ' ' + this.stunden[el.stunde].ende);
+                        el.title = el.titel;
+                        if (el.lehrform)
+                            el.title += '-' + el.lehrform;
+                    });
+                    
+                }
+
+                let reservierungs_events = res.data;
+                console.log(reservierungs_events, " this are the reserverungs event")
+                this.events = [...this.events,...reservierungs_events];
+                
+            });
         });
 
 	},
@@ -63,9 +88,13 @@ const app = Vue.createApp({
     <div>
         <fhc-calendar v-slot="{event}" :initialDate="currentDate" :events="events" initial-mode="week" show-weeks>
             <div class="d-flex flex-column align-items-center justify-content-evenly h-100">
-                <span>{{event.orig.lv_info}}</span>	
-                <span v-for="(item, index) in event.orig.stg.split('/')" :key="index">{{item}}</span>
-                <span>{{event.orig.lektor}}</span>
+                
+
+                <span>{{event.orig.reservierung? event.orig.title :event.orig.lv_info}}</span>	
+                <span v-if="event.orig.reservierung">{{'this is a reservierung'}}</span>
+                <span v-else v-for="(item, index) in event.orig.stg.split('/')" :key="index">{{item}}</span>
+                <span>{{event.orig.reservierung? event.orig.uid : event.orig.lektor}}</span>
+             
 			</div>
         </fhc-calendar>
     </div>

From 022ad26dd236863286cf0901750f70068f6e5a40 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 10 Jun 2024 13:01:55 +0200
Subject: [PATCH 0772/1461] reservierungen query also joins the studiengangs
 and mitarbeiter information

---
 application/controllers/api/frontend/v1/Stundenplan.php | 2 ++
 application/models/ressource/Reservierung_model.php     | 7 +++++--
 public/js/apps/Cis/RoomInformation.js                   | 6 +++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index d360c1b90..4f7e7a053 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -316,6 +316,8 @@ class Stundenplan extends FHCAPI_Controller
     public function Reservierungen()
 	{
 
+        //TODO the reservierungen have to be grouped like the stundenplan
+
         $ort_kurzbz = $this->input->get('ort_kurzbz', TRUE);
         $start_date = $this->input->get('start_date', TRUE);
         $end_date = $this->input->get('end_date', TRUE);
diff --git a/application/models/ressource/Reservierung_model.php b/application/models/ressource/Reservierung_model.php
index 260104305..23d17f974 100755
--- a/application/models/ressource/Reservierung_model.php
+++ b/application/models/ressource/Reservierung_model.php
@@ -22,8 +22,11 @@ class Reservierung_model extends DB_Model
 	{
 
 		$raum_reservierungen= $this->execReadOnlyQuery("
-		SELECT * FROM lehre.vw_reservierung res
-		WHERE ort_kurzbz = ? AND datum >= ? AND datum <= ? 
+		SELECT res.*, mit.kurzbz as person_kurzbz , CONCAT(studg.typ,studg.kurzbz,'-') as stg
+		FROM lehre.vw_reservierung res
+		JOIN public.tbl_mitarbeiter mit ON mit.mitarbeiter_uid=res.uid
+		JOIN public.tbl_studiengang studg ON studg.studiengang_kz=res.studiengang_kz
+		WHERE res.ort_kurzbz = ? AND datum >= ? AND datum <= ? 
 		", [$ort_kurzbz, $start_date, $end_date]);
 
 		return $raum_reservierungen;
diff --git a/public/js/apps/Cis/RoomInformation.js b/public/js/apps/Cis/RoomInformation.js
index a7aced683..d485227b2 100644
--- a/public/js/apps/Cis/RoomInformation.js
+++ b/public/js/apps/Cis/RoomInformation.js
@@ -78,7 +78,7 @@ const app = Vue.createApp({
 
                 let reservierungs_events = res.data;
                 console.log(reservierungs_events, " this are the reserverungs event")
-                this.events = [...this.events,...reservierungs_events];
+                this.events = [...(this.events?this.events:[]),...reservierungs_events];
                 
             });
         });
@@ -91,9 +91,9 @@ const app = Vue.createApp({
                 
 
                 <span>{{event.orig.reservierung? event.orig.title :event.orig.lv_info}}</span>	
-                <span v-if="event.orig.reservierung">{{'this is a reservierung'}}</span>
+                <span v-if="event.orig.reservierung">{{event.orig.stg}}</span>
                 <span v-else v-for="(item, index) in event.orig.stg.split('/')" :key="index">{{item}}</span>
-                <span>{{event.orig.reservierung? event.orig.uid : event.orig.lektor}}</span>
+                <span>{{event.orig.reservierung? event.orig.person_kurzbz : event.orig.lektor}}</span>
              
 			</div>
         </fhc-calendar>

From 9350e9230f0a6633e0142ed3c55c24fde40983e6 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 10 Jun 2024 13:30:44 +0200
Subject: [PATCH 0773/1461] API refactor

---
 cis/private/profile/anwesenheit.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cis/private/profile/anwesenheit.php b/cis/private/profile/anwesenheit.php
index 4eb0f6940..9ae6feea6 100644
--- a/cis/private/profile/anwesenheit.php
+++ b/cis/private/profile/anwesenheit.php
@@ -57,7 +57,7 @@ if(!$benutzer->load($uid))
 
 $p = new phrasen(getSprache());
 $db = new basis_db();
-$student = new student;
+$student = new Profil;
 $stundenplan = new stundenplan('stundenplan');
 $anwesenheit = new anwesenheit;
 

From aa1d70f8f0fa0ca89f8a784a1aa4f512f6d20fb7 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 10 Jun 2024 13:35:06 +0200
Subject: [PATCH 0774/1461] fix

---
 cis/private/profile/anwesenheit.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cis/private/profile/anwesenheit.php b/cis/private/profile/anwesenheit.php
index 9ae6feea6..4eb0f6940 100644
--- a/cis/private/profile/anwesenheit.php
+++ b/cis/private/profile/anwesenheit.php
@@ -57,7 +57,7 @@ if(!$benutzer->load($uid))
 
 $p = new phrasen(getSprache());
 $db = new basis_db();
-$student = new Profil;
+$student = new student;
 $stundenplan = new stundenplan('stundenplan');
 $anwesenheit = new anwesenheit;
 

From 52a55a018c0d72fd8e5352592dd1ee7fb5309618 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 10 Jun 2024 15:13:30 +0200
Subject: [PATCH 0775/1461] merge fix

---
 public/js/components/filter/Filter.js | 185 +++++++++++++++++---------
 public/js/plugin/FhcApi.js            |  84 ++++++++----
 system/dbupdate_3.4.php               |  60 ++++-----
 3 files changed, 213 insertions(+), 116 deletions(-)

diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index 64a75c910..b49e408c0 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -15,8 +15,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import {CoreFilterAPIs} from './API.js';
-import {CoreRESTClient} from '../../RESTClient.js';
 import {CoreFetchCmpt} from '../../components/Fetch.js';
 import FilterConfig from './Filter/Config.js';
 import FilterColumns from './Filter/Columns.js';
@@ -64,7 +62,11 @@ export const CoreFilterCmpt = {
 		newBtnShow: Boolean,
 		newBtnClass: [String, Array, Object],
 		newBtnDisabled: Boolean,
-		newBtnLabel: String
+		newBtnLabel: String,
+		uniqueId: String,
+		// TODO soll im master kommen?
+		idField: String,
+		parentIdField: String
 	},
 	data: function() {
 		return {
@@ -193,16 +195,16 @@ export const CoreFilterCmpt = {
 			}
 			// Define a default tabulator options in case it was not provided
 			let tabulatorOptions = {...{
-				height: 500,
-				layout: "fitDataStretch",
-				movableColumns: true,
-				columnDefaults:{
-					tooltip: true,
-				},
-				placeholder,
-				reactiveData: true,
-				persistence: true
-			}, ...(this.tabulatorOptions || {})};
+					height: 500,
+					layout: "fitDataStretch",
+					movableColumns: true,
+					columnDefaults:{
+						tooltip: true,
+					},
+					placeholder,
+					reactiveData: true,
+					persistence: true
+				}, ...(this.tabulatorOptions || {})};
 
 			if (!this.tableOnly) {
 				tabulatorOptions.data = this.filteredData;
@@ -211,6 +213,13 @@ export const CoreFilterCmpt = {
 
 			if (tabulatorOptions.columns && tabulatorOptions.columns.filter(el => el.formatter == 'rowSelection').length)
 				this.tabulatorHasSelector = true;
+			// TODO check ob im core bleiben soll
+			if (this.idField) {
+				// enable nested tabulator if parent Id given
+				if (this.parentIdField) tabulatorOptions.dataTree = true;
+				// set tabulator index
+				tabulatorOptions.index = this.idField;
+			}
 
 			// Start the tabulator with the build options
 			this.tabulator = new Tabulator(
@@ -228,6 +237,33 @@ export const CoreFilterCmpt = {
 			this.tabulator.on("rowSelectionChanged", data => {
 				this.selectedData = data;
 			});
+			// TODO check ob im core so bleiben soll
+			// if nested tabulator, restructure data
+			if (this.parentIdField && this.idField) {
+				this.tabulator.on("dataLoading", data => {
+					let toDelete = [];
+
+					// loop through all data
+					for (let childIdx = 0; childIdx < data.length; childIdx++)
+					{
+						let child = data[childIdx];
+
+						// if it has parent id, it is a child
+						if (child[this.parentIdField])
+						{
+							// append the child on the right place. If parent found, mark original sw child on 0 level for deleting
+							if (this.appendChild(data, child)) toDelete.push(childIdx);
+						}
+					}
+
+					// delete the marked children from 0 level
+					for (let counter = 0; counter < toDelete.length; counter++)
+					{
+						// decrease index by counter as index of data array changes after every deletion
+						data.splice(toDelete[counter] - counter, 1);
+					}
+				});
+			}
 			if (this.tableOnly) {
 				this.tabulator.on('tableBuilt', () => {
 					const cols = this.tabulator.getColumns();
@@ -252,12 +288,12 @@ export const CoreFilterCmpt = {
 		/**
 		 *
 		 */
-		getFilter: function() {
+		getFilter() {
 			if (this.selectedFilter === null)
-				this.startFetchCmpt(CoreFilterAPIs.getFilter, null, this.render);
+				this.startFetchCmpt(this.$fhcApi.factory.filter.getFilter, null, this.render);
 			else
 				this.startFetchCmpt(
-					CoreFilterAPIs.getFilterById,
+					this.$fhcApi.factory.filter.getFilterById,
 					{
 						filterId: this.selectedFilter
 					},
@@ -267,55 +303,47 @@ export const CoreFilterCmpt = {
 		/**
 		 *
 		 */
-		render: function(response) {
+		render(response) {
+			let data = response;
+			this.filterName = data.filterName;
+			this.dataset = data.dataset;
+			this.datasetMetadata = data.datasetMetadata;
 
-			if (CoreRESTClient.hasData(response))
+			this.fields = data.fields;
+			this.selectedFields = data.selectedFields;
+			this.notSelectedFields = this.fields.filter(x => this.selectedFields.indexOf(x) === -1);
+			this.filterFields = [];
+
+			for (let i = 0; i < data.datasetMetadata.length; i++)
 			{
-				let data = CoreRESTClient.getData(response);
-				this.filterName = data.filterName;
-				this.dataset = data.dataset;
-				this.datasetMetadata = data.datasetMetadata;
-
-				this.fields = data.fields;
-				this.selectedFields = data.selectedFields;
-				this.notSelectedFields = this.fields.filter(x => this.selectedFields.indexOf(x) === -1);
-				this.filterFields = [];
-
-				for (let i = 0; i < data.datasetMetadata.length; i++)
+				for (let j = 0; j < data.filters.length; j++)
 				{
-					for (let j = 0; j < data.filters.length; j++)
+					if (data.datasetMetadata[i].name == data.filters[j].name)
 					{
-						if (data.datasetMetadata[i].name == data.filters[j].name)
-						{
-							let filter = data.filters[j];
-							filter.type = data.datasetMetadata[i].type;
+						let filter = data.filters[j];
+						filter.type = data.datasetMetadata[i].type;
 
-							this.filterFields.push(filter);
-							//break;
-						}
+						this.filterFields.push(filter);
+						//break;
 					}
 				}
+			}
 
-				// If the side menu is active
-				if (this.sideMenu === true)
-				{
-					this.setSideMenu(data);
-				}
-				else // otherwise use the dropdown in the filter options
-				{
-					this.setDropDownMenu(data);
-				}
-				this.updateTabulator();
-			}
-			else
+			// If the side menu is active
+			if (this.sideMenu === true)
 			{
-				console.error(CoreRESTClient.getError(response));
+				this.setSideMenu(data);
 			}
+			else // otherwise use the dropdown in the filter options
+			{
+				this.setDropDownMenu(data);
+			}
+			this.updateTabulator();
 		},
 		/**
 		 * Set the menu
 		 */
-		setSideMenu: function(data) {
+		setSideMenu(data) {
 			let filters = data.sideMenu.filters;
 			let personalFilters = data.sideMenu.personalFilters;
 			let filtersArray = [];
@@ -369,7 +397,7 @@ export const CoreFilterCmpt = {
 		/**
 		 * Set the drop down menu
 		 */
-		setDropDownMenu: function(data) {
+		setDropDownMenu(data) {
 			let filters = data.sideMenu.filters;
 			let personalFilters = data.sideMenu.personalFilters;
 			let filtersArray = [];
@@ -405,7 +433,7 @@ export const CoreFilterCmpt = {
 		/**
 		 * Used to start/refresh the FetchCmpt
 		 */
-		startFetchCmpt: function(apiFunction, apiFunctionParameters, dataFetchedCallback) {
+		startFetchCmpt(apiFunction, apiFunctionParameters, dataFetchedCallback) {
 			// Assign the function api of the FetchCmpt binded property
 			this.fetchCmptApiFunction = apiFunction;
 
@@ -416,6 +444,9 @@ export const CoreFilterCmpt = {
 			apiFunctionParameters.filterUniqueId = FHC_JS_DATA_STORAGE_OBJECT.called_path + "/" + FHC_JS_DATA_STORAGE_OBJECT.called_method;
 			apiFunctionParameters.filterType = this.filterType;
 
+			if (this.uniqueId)
+				apiFunctionParameters.filterUniqueId += '_' + this.uniqueId;
+
 			// Assign parameters to the FetchCmpt binded properties
 			this.fetchCmptApiFunctionParams = apiFunctionParameters;
 			// Assign data fetch callback to the FetchCmpt binded properties
@@ -431,11 +462,11 @@ export const CoreFilterCmpt = {
 		/**
 		 *
 		 */
-		handlerSaveCustomFilter: function(customFilterName) {
+		handlerSaveCustomFilter(customFilterName) {
 			this.selectedFilter = null;
 			//
 			this.startFetchCmpt(
-				CoreFilterAPIs.saveCustomFilter,
+				this.$fhcApi.factory.filter.saveCustomFilter,
 				{
 					customFilterName
 				},
@@ -445,13 +476,13 @@ export const CoreFilterCmpt = {
 		/**
 		 *
 		 */
-		handlerRemoveCustomFilter: function(event) {
+		handlerRemoveCustomFilter(event) {
 			let filterId = event.currentTarget.getAttribute("href").substring(1);
 			if (filterId === this.selectedFilter)
 				this.selectedFilter = null;
 			//
 			this.startFetchCmpt(
-				CoreFilterAPIs.removeCustomFilter,
+				this.$fhcApi.factory.filter.removeCustomFilter,
 				{
 					filterId: filterId
 				},
@@ -488,12 +519,42 @@ export const CoreFilterCmpt = {
 		applyFilterConfig(filterFields) {
 			this.selectedFilter = null;
 			this.startFetchCmpt(
-				CoreFilterAPIs.applyFilterFields,
+				this.$fhcApi.factory.filter.applyFilterFields,
 				{
 					filterFields
 				},
 				this.getFilter
 			);
+		},
+		// TODO check ob im core so bleiben soll
+		// append child to it's parent
+		appendChild(data, child) {
+			// get parent id
+			let parentId = child[this.parentIdField];
+
+			// loop thorugh all data
+			for (let parentIdx = 0; parentIdx < data.length; parentIdx++)
+			{
+				let parent = data[parentIdx];
+
+				// if it's the parent
+				if (parent[this.idField] == parentId)
+				{
+					// create children array if not done yet
+					if (!parent._children) parent._children = [];
+
+					// if child is not included in children array, append the child
+					if (!parent._children.includes(child)) parent._children.push(child);
+
+					// parent found
+					return true;
+				}
+				// search children for parents
+				else if (parent._children) this.appendChild(parent._children, child);
+			}
+
+			// parent not found
+			return false;
 		}
 	},
 	beforeCreate() {
@@ -522,7 +583,7 @@ export const CoreFilterCmpt = {
 
 		<div class="row" v-if="title != null && title != ''">
 			<div class="col-lg-12">
-				<h3 class="page-header">
+				<h3 class="page-header mt-1 mb-4">
 					{{ title }}
 				</h3>
 			</div>
@@ -531,7 +592,7 @@ export const CoreFilterCmpt = {
 		<div :id="'filterCollapsables' + idExtra">
 
 			<div class="d-flex flex-row justify-content-between flex-wrap">
-				<div v-if="newBtnShow || reload || $slots.actions" class="d-flex gap-2 align-items-baseline flex-wrap">
+				<div v-if="newBtnShow || reload || $slots.search || $slots.actions" class="d-flex gap-2 align-items-baseline flex-wrap">
 					<button v-if="newBtnShow" class="btn btn-primary" :class="newBtnClass" :title="newBtnLabel ? undefined : 'New'" :aria-label="newBtnLabel ? undefined : 'New'" @click="$emit('click:new', $event)" :disabled="newBtnDisabled">
 						<span class="fa-solid fa-plus" aria-hidden="true"></span>
 						{{ newBtnLabel }}
@@ -539,8 +600,9 @@ export const CoreFilterCmpt = {
 					<button v-if="reload" class="btn btn-outline-secondary" aria-label="Reload" @click="reloadTable">
 						<span class="fa-solid fa-rotate-right" aria-hidden="true"></span>
 					</button>
-					<span v-if="$slots.actions && tabulatorHasSelector">Mit {{selectedData.length}} ausgewählten: </span>
+					<span v-if="$slots.actions && tabulatorHasSelector">Mit {{selectedData.length}} ausgewählten:</span>
 					<slot name="actions" v-bind="tabulatorHasSelector ? selectedData : []"></slot>
+					<slot name="search"></slot>
 				</div>
 				<div class="d-flex gap-1 align-items-baseline flex-grow-1 justify-content-end">
 					<span v-if="!tableOnly">[ {{ filterName }} ]</span>
@@ -583,4 +645,3 @@ export const CoreFilterCmpt = {
 		<div ref="table" :id="'filterTableDataset' + idExtra" class="filter-table-dataset"></div>
 	`
 };
-
diff --git a/public/js/plugin/FhcApi.js b/public/js/plugin/FhcApi.js
index bacd27d43..4bbf4d4dc 100644
--- a/public/js/plugin/FhcApi.js
+++ b/public/js/plugin/FhcApi.js
@@ -1,5 +1,5 @@
 import FhcAlert from './FhcAlert.js';
-import FhcApiFactory from '../apps/api/fhcapifactory.js';
+import FhcApiFactory from '../api/fhcapifactory.js';
 
 
 export default {
@@ -58,7 +58,7 @@ export default {
 
 			if (config.data instanceof FormData)
 				return config;
-			
+
 			if (!Object.values(config.data).every(item => {
 				if (item instanceof FileList)
 					return false;
@@ -96,18 +96,18 @@ export default {
 				|| response.config?.errorHandling === false
 				|| response.config?.errorHandling == 'fail')
 				return _clean_return_value(response);
-			
+
 			// NOTE(chris): loop through errors
 			if (response.data.errors)
 				response.data.errors = response.data.errors.filter(
-					err => (response.config[err.type + 'ErrorHandler'] || app.config.globalProperties.$fhcApi._defaultErrorHandlers[err.type])(err, response.config.form)
+					err => (response.config[err.type + 'ErrorHandler'] || app.config.globalProperties.$fhcApi._defaultErrorHandlers[err.type])(err, response.config)
 				);
 
 			return _clean_return_value(response);
 		}, error => {
 			if (error.code == 'ERR_CANCELED')
-				return new Promise(() => {});
-			
+				return Promise.reject({...{handled: true}, ...error});
+
 			if (error.config?.errorHandling == 'off'
 				|| error.config?.errorHandling === false
 				|| error.config?.errorHandling == 'success')
@@ -116,23 +116,23 @@ export default {
 			if (error.response) {
 				if (error.response.status == 404) {
 					app.config.globalProperties.$fhcAlert.alertDefault('error', error.message, error.request.responseURL, true);
-					return new Promise(() => {});
+					return Promise.reject({...{handled: true}, ...error});
 				}
-				
+
 				// NOTE(chris): loop through errors
 				error.response.data.errors = error.response.data.errors.filter(
-					err => (error.config[err.type + 'ErrorHandler'] || app.config.globalProperties.$fhcApi._defaultErrorHandlers[err.type])(err, error.config.form)
+					err => (error.config[err.type + 'ErrorHandler'] || app.config.globalProperties.$fhcApi._defaultErrorHandlers[err.type])(err, error.config)
 				);
 				if (!error.response.data.errors.length)
-					return new Promise(() => {});
+					return Promise.reject({...{handled: true}, ...error});
 			} else if (error.request) {
 				app.config.globalProperties.$fhcAlert.alertDefault('error', error.message, error.request.responseURL);
-				return new Promise(() => {});
+				return Promise.reject({...{handled: true}, ...error});
 			} else {
 				app.config.globalProperties.$fhcAlert.alertError(error.message);
-				return new Promise(() => {});
+				return Promise.reject({...{handled: true}, ...error});
 			}
-			
+
 			return Promise.reject(error);
 		});
 
@@ -152,30 +152,47 @@ export default {
 				return fhcApiAxios.post(uri, data, config);
 			},
 			_defaultErrorHandlers: {
-				validation(error, form) {
+				validation(error, config) {
 					const $fhcAlert = app.config.globalProperties.$fhcAlert;
 
-					if (form) {
-						form.clearValidation();
-						form.setFeedback(false, error.messages);
+					if (config?.form) {
+						config.form.clearValidation();
+						config.form.setFeedback(false, error.messages);
 						return false;
 					}
 					if (Array.isArray(error.messages)) {
 						error.messages.forEach($fhcAlert.alertError);
 						return false;
 					} else if (typeof error.messages == 'object') {
-						Object.entries(error.messages).forEach(
-							([key, value]) => $fhcAlert.alertDefault('error', key, value, true)
-						);
+						if (config?.errorHeader)
+							Object.values(error.messages).forEach(
+								value => $fhcAlert.alertDefault(
+									'error',
+									Array.isArray(config.errorHeader) ? app.config.globalProperties.$p.t.apply(null, config.errorHeader) : config.errorHeader,
+									value,
+									true
+								)
+							);
+						else
+							Object.entries(error.messages).forEach(
+								([key, value]) => $fhcAlert.alertDefault('error', key, value, true)
+							);
 						return false;
 					}
 					return true;
 				},
-				general(error, form) {
+				general(error, config) {
 					const $fhcAlert = app.config.globalProperties.$fhcAlert;
 
-					if (form)
-						form.setFeedback(false, error.message);
+					if (config?.form)
+						config.form.setFeedback(false, error.message);
+					else if (config?.errorHeader)
+						$fhcAlert.alertDefault(
+							'error',
+							Array.isArray(config.errorHeader) ? app.config.globalProperties.$p.t.apply(null, config.errorHeader) : config.errorHeader,
+							error.message,
+							true
+						);
 					else
 						$fhcAlert.alertError(error.message);
 				},
@@ -250,6 +267,23 @@ export default {
 						message += 'Line Number: ' + error.line + '\n';
 
 					$fhcAlert.alertSystemError(message);
+				},
+				auth(error, config) {
+					const $fhcAlert = app.config.globalProperties.$fhcAlert;
+
+					var message = '';
+					message += 'Controller name: ' + error.controller + '\n';
+					message += 'Method name: ' + error.method + '\n';
+					message += 'Required permissions: ' + error.required_permissions;
+					if (config?.errorHeader)
+						$fhcAlert.alertDefault(
+							'error',
+							Array.isArray(config.errorHeader) ? app.config.globalProperties.$p.t.apply(null, config.errorHeader) : config.errorHeader,
+							error.message,
+							true
+						);
+					else
+						$fhcAlert.alertDefault('error', error.message, message);
 				}
 			}
 		};
@@ -276,7 +310,9 @@ export default {
 			}
 		}
 
-		app.config.globalProperties.$fhcApi.factory = new FhcApiFactoryWrapper(FhcApiFactory);
+		const mergedFhcApiFactory = options?.factory ? {...FhcApiFactory, ...options.factory} : FhcApiFactory;
+
+		app.config.globalProperties.$fhcApi.factory = new FhcApiFactoryWrapper(mergedFhcApiFactory);
 
 	}
 };
\ No newline at end of file
diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index d61c34f7a..687ecde29 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -437,37 +437,37 @@ echo '<H2>Gegenpruefung!</H2>';
 $error=false;
 $sql_query="SELECT schemaname,tablename FROM pg_catalog.pg_tables WHERE schemaname != 'pg_catalog' AND schemaname != 'information_schema' AND schemaname != 'sync' AND schemaname != 'addon' AND schemaname != 'reports' AND schemaname != 'extension';";
 if (!$result=@$db->db_query($sql_query))
-		echo '<BR><strong>'.$db->db_last_error().' </strong><BR>';
-	else
-		while ($row=$db->db_fetch_object($result))
+	echo '<BR><strong>'.$db->db_last_error().' </strong><BR>';
+else
+	while ($row=$db->db_fetch_object($result))
+	{
+		$fulltablename=$row->schemaname.'.'.$row->tablename;
+		if (!isset($tabellen[$fulltablename]))
 		{
-			$fulltablename=$row->schemaname.'.'.$row->tablename;
-			if (!isset($tabellen[$fulltablename]))
-			{
-				echo 'Tabelle '.$fulltablename.' existiert in der DB, aber nicht in diesem Skript!<BR>';
-				$error=true;
-			}
-			else
-				if (!$result_fields=@$db->db_query("SELECT * FROM $fulltablename LIMIT 1;"))
-					echo '<BR><strong>'.$db->db_last_error().' </strong><BR>';
-				else
-					for ($i=0; $i<$db->db_num_fields($result_fields); $i++)
-					{
-						$found=false;
-						$fieldnameDB=$db->db_field_name($result_fields,$i);
-						foreach ($tabellen[$fulltablename] AS $fieldnameARRAY)
-							if ($fieldnameDB==$fieldnameARRAY)
-							{
-								$found=true;
-								break;
-							}
-						if (!$found)
-						{
-							echo 'Attribut '.$fulltablename.'.<strong>'.$fieldnameDB.'</strong> existiert in der DB, aber nicht in diesem Skript!<BR>';
-							$error=true;
-						}
-					}
+			echo 'Tabelle '.$fulltablename.' existiert in der DB, aber nicht in diesem Skript!<BR>';
+			$error=true;
 		}
+		else
+			if (!$result_fields=@$db->db_query("SELECT * FROM $fulltablename LIMIT 1;"))
+				echo '<BR><strong>'.$db->db_last_error().' </strong><BR>';
+			else
+				for ($i=0; $i<$db->db_num_fields($result_fields); $i++)
+				{
+					$found=false;
+					$fieldnameDB=$db->db_field_name($result_fields,$i);
+					foreach ($tabellen[$fulltablename] AS $fieldnameARRAY)
+						if ($fieldnameDB==$fieldnameARRAY)
+						{
+							$found=true;
+							break;
+						}
+					if (!$found)
+					{
+						echo 'Attribut '.$fulltablename.'.<strong>'.$fieldnameDB.'</strong> existiert in der DB, aber nicht in diesem Skript!<BR>';
+						$error=true;
+					}
+				}
+	}
 if($error==false)
 	echo '<br>Gegenpruefung fehlerfrei';
-?>
+?>
\ No newline at end of file

From e7e5d76531642d9526f41033c25fcf2bc243de8d Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 10 Jun 2024 17:23:37 +0200
Subject: [PATCH 0776/1461] fhcapi use factory merge

---
 public/js/plugin/FhcApi.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/js/plugin/FhcApi.js b/public/js/plugin/FhcApi.js
index 4bbf4d4dc..f9d1ae455 100644
--- a/public/js/plugin/FhcApi.js
+++ b/public/js/plugin/FhcApi.js
@@ -46,7 +46,8 @@ export default {
 				result.meta.response = response;
 			return result;
 		}
-
+		const baseURL = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + "/";
+		console.log(baseURL)
 		const fhcApiAxios = axios.create({
 			timeout: 5000,
 			baseURL: FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + "/"

From bef53dadb1c24a1b933a1e15640829236ecd21f7 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 11 Jun 2024 09:27:40 +0200
Subject: [PATCH 0777/1461] refactor Tab Contact

---
 .../api/frontend/v1/stv/Kontakt.php           |  60 +-
 .../models/organisation/Standort_model.php    |  24 +
 .../Details/Kontakt/Address.js                | 514 ++++++------------
 .../Details/Kontakt/Bankaccount.js            | 122 ++++-
 .../Details/Kontakt/Contact.js                | 316 +++++------
 system/phrasesupdate.php                      |  20 +
 6 files changed, 527 insertions(+), 529 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Kontakt.php b/application/controllers/api/frontend/v1/stv/Kontakt.php
index ac66c69c0..154729aa3 100644
--- a/application/controllers/api/frontend/v1/stv/Kontakt.php
+++ b/application/controllers/api/frontend/v1/stv/Kontakt.php
@@ -26,9 +26,9 @@ class Kontakt extends FHCAPI_Controller
 			'getKontakttypen' => ['admin:r', 'assistenz:r'],
 			'getFirmen' => ['admin:r', 'assistenz:r'],
 			'getStandorte' => ['admin:r', 'assistenz:r'],
+			'getStandorteByFirma' => ['admin:r', 'assistenz:r'],
 			'getKontakte' => ['admin:r', 'assistenz:r'],
-			'getBankverbindung' => ['mitarbeiter/bankdaten:r', 'student/bankdaten:r'],
-
+			'getBankverbindung' => ['mitarbeiter/bankdaten:r', 'student/bankdaten:r']
 		]);
 
 		// Load Libraries
@@ -40,12 +40,17 @@ class Kontakt extends FHCAPI_Controller
 			'ui',
 			'person'
 		]);
+
+		// Load models
+		$this->load->model('person/Adresse_model', 'AdresseModel');
+		$this->load->model('organisation/standort_model', 'StandortModel');
+		$this->load->model('ressource/firma_model', 'FirmaModel');
+		$this->load->model('person/Kontakt_model', 'KontaktModel');
+
 	}
 
 	public function getAdressen($person_id)
 	{
-		$this->load->model('person/Adresse_model', 'AdresseModel');
-
 		$this->AdresseModel->addSelect('public.tbl_adresse.*');
 		$this->AdresseModel->addSelect('t.*');
 		$this->AdresseModel->addSelect('f.firma_id');
@@ -79,8 +84,6 @@ class Kontakt extends FHCAPI_Controller
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 		}
 
-		$this->load->model('person/Adresse_model', 'AdresseModel');
-
 		$uid = getAuthUID();
 		$co_name = isset($_POST['co_name']) ? $_POST['co_name'] : null;
 		$strasse = isset($_POST['strasse']) ? $_POST['strasse'] : null;
@@ -155,6 +158,10 @@ class Kontakt extends FHCAPI_Controller
 		{
 			$firma_id = $_POST['firma']['firma_id'];
 		}
+		elseif(isset($_POST['firma_id']))
+		{
+			$firma_id = $_POST['firma_id'];
+		}
 		else
 			$firma_id = null;
 
@@ -291,18 +298,27 @@ class Kontakt extends FHCAPI_Controller
 		$this->terminateWithSuccess($result ?: []);
 	}
 
+	public function getStandorteByFirma($firma_id)
+	{
+		$this->load->model('organisation/standort_model', 'StandortModel');
+
+		$result = $this->StandortModel->getStandorteByFirma($firma_id);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
 	public function getKontakte($person_id)
 	{
-		$this->load->model('person/Kontakt_model', 'KontaktModel');
-		$this->load->model('organisation/standort_model', 'StandortModel');
-		$this->KontaktModel->addSelect("*,
+		$this->KontaktModel->addSelect("public.tbl_kontakt.*,
 			TO_CHAR (CASE 
 					WHEN public.tbl_kontakt.updateamum >= public.tbl_kontakt.insertamum 
 					THEN public.tbl_kontakt.updateamum 
 					ELSE public.tbl_kontakt.insertamum 
-				END::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS lastUpdate");
+				END::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS lastUpdate, st.bezeichnung, f.name");
 		$this->StandortModel->addJoin('public.tbl_standort st', 'ON (public.tbl_kontakt.standort_id = st.standort_id)', 'LEFT');
-
+		$this->FirmaModel->addJoin('public.tbl_firma f', 'ON (f.firma_id = st.firma_id)', 'LEFT');
 		$result = $this->KontaktModel->loadWhere(
 			array('person_id' => $person_id)
 		);
@@ -321,7 +337,9 @@ class Kontakt extends FHCAPI_Controller
 		$result = $this->KontakttypModel->load();
 		if (isError($result)) {
 			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		} else {
+		}
+		else
+		{
 			$this->terminateWithSuccess(getData($result) ?: []);
 		}
 	}
@@ -330,9 +348,10 @@ class Kontakt extends FHCAPI_Controller
 	{
 		$this->load->model('person/Kontakt_model', 'KontaktModel');
 
-		$this->KontaktModel->addSelect('public.tbl_kontakt.*');
+		$this->KontaktModel->addSelect('*, public.tbl_kontakt.*');
 		$this->KontaktModel->addSelect('st.kurzbz');
 		$this->KontaktModel->addJoin('public.tbl_standort st', 'ON (public.tbl_kontakt.standort_id = st.standort_id)', 'LEFT');
+		$this->FirmaModel->addJoin('public.tbl_firma f', 'ON (f.firma_id = st.firma_id)', 'LEFT');
 
 		$this->KontaktModel->addLimit(1);
 
@@ -368,19 +387,13 @@ class Kontakt extends FHCAPI_Controller
 
 		$this->load->model('person/Kontakt_model', 'KontaktModel');
 
-		if(isset($_POST['standort']))
-		{
-			$standort_id = $_POST['standort']['standort_id'];
-		}
-		else
-			$standort_id = null;
-
 		$uid = getAuthUID();
 
 		$kontakttyp = $this->input->post('kontakttyp');
 		$anmerkung = $this->input->post('anmerkung');
 		$kontakt = $this->input->post('kontakt');
 		$ext_id = $this->input->post('ext_id');
+		$standort_id = $this->input->post('standort_id');
 
 		$result = $this->KontaktModel->insert(
 			[
@@ -426,12 +439,12 @@ class Kontakt extends FHCAPI_Controller
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 		}
 
-		if(isset($_POST['standort']))
+/*		if(isset($_POST['standort']))
 		{
 			$standort_id = $_POST['standort']['standort_id'];
 		}
 		else
-			$standort_id = null;
+			$standort_id = null;*/
 
 		$uid = getAuthUID();
 		$kontakttyp = $this->input->post('kontakttyp');
@@ -439,6 +452,9 @@ class Kontakt extends FHCAPI_Controller
 		$kontakt = $this->input->post('kontakt');
 		$ext_id = $this->input->post('ext_id');
 		$person_id = $this->input->post('person_id');
+		$standort_id = $this->input->post('standort_id');
+
+		//return $this->terminateWithError("in update " . $standort_id, self::ERROR_TYPE_GENERAL);
 
 		$result = $this->KontaktModel->update(
 			[
diff --git a/application/models/organisation/Standort_model.php b/application/models/organisation/Standort_model.php
index 03a06ffae..d46dad1c6 100644
--- a/application/models/organisation/Standort_model.php
+++ b/application/models/organisation/Standort_model.php
@@ -28,5 +28,29 @@ class Standort_model extends DB_Model
 
 		return $this->execQuery($qry);
 	}
+
+/*	public function searchStandorteByFirma($filter)
+	{
+		$filter = strtoLower($filter);
+		$qry = "
+			SELECT 
+				s.kurzbz, s.standort_id
+			FROM 
+			    public.tbl_firma f
+			LEFT JOIN 
+			        public.tbl_standort s ON(f.firma_id = s.firma_id)
+			WHERE 
+			    f.firma_id = '". $this->db->escape_like_str($filter)."'";
+
+
+		return $this->execQuery($qry);
+	}*/
+
+	public function getStandorteByFirma($firma_id)
+	{
+		$this->addSelect("DISTINCT ON (standort_id) bezeichnung, standort_id");
+
+		return $this->loadWhere(array("firma_id" => $firma_id));
+	}
 }
 
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
index 10ec77e8c..20513add8 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
@@ -154,13 +154,7 @@ export default{
 				typ: 'h',
 				nation: 'A'
 			},
-			initData: {
-				zustelladresse: true,
-				heimatadresse: true,
-				rechnungsadresse: false,
-				typ: 'h',
-				nation: 'A'
-			},
+			statusNew: true,
 			places: [],
 			suggestions: {},
 			nations: [],
@@ -192,14 +186,15 @@ export default{
 	methods:{
 		actionNewAdress() {
 			this.resetModal();
-			this.$refs.newAdressModal.show();
+			this.$refs.adressModal.show();
 		},
 		actionEditAdress(adress_id) {
+			this.statusNew = false;
 			this.loadAdress(adress_id).then(() => {
 				if(this.addressData.adresse_id)
 				{
 					this.loadPlaces(this.addressData.plz);
-					this.$refs.editAdressModal.show();
+					this.$refs.adressModal.show();
 
 				}
 			});
@@ -218,7 +213,7 @@ export default{
 				this.addressData
 			).then(response => {
 				this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
-					this.hideModal('newAdressModal');
+					this.hideModal('adressModal');
 					this.resetModal();
 			}).catch(this.$fhcAlert.handleSystemError)
 				.finally(() => {
@@ -230,6 +225,7 @@ export default{
 			this.$refs.table.reloadTable();
 		},
 		loadAdress(adress_id) {
+			this.statusNew = false;
 			return this.$fhcApi.get('api/frontend/v1/stv/kontakt/loadAddress/' + adress_id)
 				.then(result => {
 						this.addressData = result.data;
@@ -242,7 +238,7 @@ export default{
 				this.addressData
 			).then(response => {
 				this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
-					this.hideModal('editAdressModal');
+					this.hideModal('adressModal');
 					this.resetModal();
 			}).catch(this.$fhcAlert.handleSystemError)
 			.finally(() => {
@@ -294,7 +290,20 @@ export default{
 		},
 		resetModal() {
 			this.addressData = {};
-			this.addressData = this.initData;
+
+			this.addressData.strasse = null;
+			this.addressData.zustelladresse = true;
+			this.addressData.heimatadresse = true;
+			this.addressData.rechnungsadresse = false;
+			this.addressData.co_name = null;
+			this.addressData.firma_id = null;
+			this.addressData.name = null;
+			this.addressData.anmerkung = null;
+			this.addressData.typ = 'h';
+			this.addressData.nation = 'A';
+			this.addressData.plz = null;
+
+			this.statusNew = true;
 		},
 	},
 	created() {
@@ -314,139 +323,130 @@ export default{
 	template: `
 	<div class="stv-details-kontakt-address h-100 pt-3">
 		
-		<!--Modal: Add Address-->
-		<bs-modal ref="newAdressModal">
-			<template #title>{{$p.t('person', 'adresse_new')}}</template>
-			<form-form class="row g-3" ref="addressData">
+		<!--Modal: AddressModal-->
+		<bs-modal ref="adressModal">
+			<template #title>
+				<p v-if="statusNew" class="fw-bold mt-3">{{$p.t('person', 'adresse_new')}}</p>
+				<p v-else class="fw-bold mt-3">{{$p.t('person', 'adresse_edit')}}</p>
+			</template>
+			<form-form class="row g-3 mt-2" ref="addressData">
 
 				<div class="row mb-3">
-					<label for="adressentyp" class="form-label col-sm-4">{{$p.t('global', 'typ')}}</label>
-					<div class="col-sm-6">
-						<form-input
-							type="select"
-							name="adressentyp"
-							v-model="addressData.typ"
+					<form-input
+						type="select"
+						name="adressentyp"
+						:label="$p.t('global/typ')"
+						v-model="addressData.typ"
+						>
+						<option
+							v-for="typ in adressentypen"
+							:key="typ.adressentyp_kurzbz"
+							:value="typ.adressentyp_kurzbz"
 							>
-							<option
-								v-for="typ in adressentypen"
-								:key="typ.adressentyp_kurzbz"
-								:value="typ.adressentyp_kurzbz"
-								>
-								{{typ.bezeichnung}}
-							</option>
-							</form-input>
-						</div>
+							{{typ.bezeichnung}}
+						</option>
+						</form-input>
 					</div>
 					
 					<div class="row mb-3">
-					<label for="strasse" class="form-label col-sm-4">{{$p.t('person', 'strasse')}}</label>
-					<div class="col-sm-6">
 						<form-input
 							type="text"
 							name="strasse"
+							:label="$p.t('person/strasse')"
 							v-model="addressData.strasse"
 						>
 						</form-input>					
-					</div>
 				</div>
 				
 				<div class="row mb-3">
-					<label for="nation" class="form-label col-sm-4">{{$p.t('person', 'nation')}}</label>
-					<div class="col-sm-6">
-						<form-input
-							type="select"
-							name="nation"
-							v-model="addressData.nation"
+					<form-input
+						type="select"
+						name="nation"
+						:label="$p.t('person/nation')"
+						v-model="addressData.nation"
+						>
+						<option 
+							v-for="nation in nations" 
+							:key="nation.nation_code" 
+							:value="nation.nation_code" 
+							:disabled="nation.sperre"
 							>
-							<option 
-								v-for="nation in nations" 
-								:key="nation.nation_code" 
-								:value="nation.nation_code" 
-								:disabled="nation.sperre"
-								>
-								{{nation.kurztext}}
-							</option>
-							</form-input>
-						</div>
-					</div>
+							{{nation.kurztext}}
+						</option>
+						</form-input>
+				</div>
 													
 				<div class="row mb-3">
-					<label for="plz" class="required form-label col-sm-4" >{{$p.t('person', 'plz')}}<sup>*</sup></label>
-					<div class="col-sm-6">
-						<form-input
-							type="text"
-							name="plz"
-							v-model="addressData.plz"
-							required
-							@input="loadPlaces"
-						>
-						</form-input>					
-					</div>
+					<form-input
+						type="text"
+						name="plz"
+						:label="$p.t('person/plz') + ' *'"
+						v-model="addressData.plz"
+						required
+						@input="loadPlaces"
+					>
+					</form-input>					
 				</div>
 											
 				<div class="row mb-3">
-					<label for="gemeinde" class="form-label col-sm-4">{{$p.t('person', 'gemeinde')}}</label>
-					<div class="col-sm-6">
-						<form-input
-							v-if="addressData.nation == 'A'"
-							type="select"
-							name="gemeinde"
-							v-model="addressData.gemeinde"
+					<form-input
+						v-if="addressData.nation == 'A'"
+						type="select"
+						name="gemeinde"
+						:label="$p.t('person/gemeinde')"
+						v-model="addressData.gemeinde"
+						>
+						<option v-if="!gemeinden.length" disabled>{{$p.t('ui', 'bittePlzWaehlen')}}</option>
+						<option 
+							v-for="gemeinde in gemeinden" 
+							:key="gemeinde.name" 
+							:value="gemeinde.name"
 							>
-							<option v-if="!gemeinden.length" disabled>{{$p.t('ui', 'bittePlzWaehlen')}}</option>
-							<option 
-								v-for="gemeinde in gemeinden" 
-								:key="gemeinde.name" 
-								:value="gemeinde.name"
-								>
-								{{gemeinde.name}}
-							</option>
-							</form-input>
-							<form-input
-								v-else
-								type="text"
-								name="addressData.gemeinde"
-								v-model="addressData.gemeinde"
-							>	
-							</form-input>
-						</div>
+							{{gemeinde.name}}
+						</option>
+						</form-input>
+						<form-input
+							v-else
+							type="text"
+							name="addressData.gemeinde"
+							v-model="addressData.gemeinde"
+						>	
+						</form-input>
 					</div>
 				
 				<div class="row mb-3">
-					<label for="Ort" class="form-label col-sm-4">{{$p.t('person', 'ort')}}</label>
-					<div class="col-sm-6">
-						<form-input
-							v-if="addressData.nation == 'A'" 
-							type="select"
+					<form-input
+						v-if="addressData.nation == 'A'" 
+						type="select"
+						name="ort"
+						:label="$p.t('person/ort')"
+						v-model="addressData.ort"
+						>
+						<option v-if="!orte.length" disabled>{{$p.t('ui', 'bitteGemeindeWaehlen')}}</option>
+						<option 
+							v-for="ort in orte" 
+							:key="ort.ortschaftsname" 
+							:value="ort.ortschaftsname"
+							>
+							{{ort.ortschaftsname}}
+						</option>
+					</form-input>
+					<form-input
+							v-else
+							type="text"
 							name="ort"
 							v-model="addressData.ort"
-							>
-							<option v-if="!orte.length" disabled>{{$p.t('ui', 'bitteGemeindeWaehlen')}}</option>
-							<option 
-								v-for="ort in orte" 
-								:key="ort.ortschaftsname" 
-								:value="ort.ortschaftsname"
-								>
-								{{ort.ortschaftsname}}
-							</option>
-						</form-input>
-						<form-input
-								v-else
-								type="text"
-								name="ort"
-								v-model="addressData.ort"
-							>	
-						</form-input>
-					</div>
+						>	
+					</form-input>
 				</div>
 				
 				<div class="row mb-3">
-					<label for="heimatadresse" class="form-label col-sm-4">{{$p.t('person', 'heimatadresse')}}</label>
 					<div class="col-sm-4">
 						<form-input
 							container-class="form-check"
 							type="checkbox"
 							name="heimatadresse"
+							:label="$p.t('person/heimatadresse')"
 							v-model="addressData.heimatadresse"
 						>
 						</form-input>
@@ -454,12 +454,12 @@ export default{
 				</div>
 				
 				<div class="row mb-3">
-					<label for="zustelladresse" class="form-label col-sm-4">{{$p.t('person', 'zustelladresse')}}</label>
 					<div class="col-sm-4">
 						<form-input
 							container-class="form-check"
 							type="checkbox"
 							name="zustelladresse"
+							:label="$p.t('person/zustelladresse')"
 							v-model="addressData.zustelladresse"
 						>
 						</form-input>
@@ -467,239 +467,63 @@ export default{
 				</div>
 				
 				<div class="row mb-3">
-					<label for="co_name" class="form-label col-sm-4">{{$p.t('person', 'co_name')}}</label>
-					<div class="col-sm-6">
-						<form-input
-							type="text"
-							name="co_name"
-							v-model="addressData.co_name"
-						>
-						</form-input>
-					</div>
+					<form-input
+						type="text"
+						name="co_name"
+						:label="$p.t('person/co_name')"
+						v-model="addressData.co_name"
+					>
+					</form-input>
 				</div>
 				
 				<div class="row mb-3">
-					<label for="rechnungsadresse" class="form-label col-sm-4">{{$p.t('person', 'rechnungsadresse')}}</label>
 					<div class="col-sm-4">
 						<form-input
 							container-class="form-check"
 							type="checkbox"
 							name="rechnungsadresse"
+							:label="$p.t('person/rechnungsadresse')"
 							v-model="addressData.rechnungsadresse"
 						>
 						</form-input>
 					</div>
 				</div>
-				
-				<div class="row mb-3">
-					<label for="firma_name" class="form-label col-sm-4">{{$p.t('person', 'firma')}}</label>
-					<div class="col-sm-3">
-						<PvAutoComplete v-model="addressData.firma"  optionLabel="name" :suggestions="filteredFirmen" @complete="search" :min-length="3"/>
-					</div>
-				</div>
-				
-				<div class="row mb-3">
-					<label for="name" class="form-label col-sm-4">{{$p.t('person', 'firma_zusatz')}}</label>
-					<div class="col-sm-6">
-						<form-input
-							type="text"
-							name="firma_zusatz"
-							v-model="addressData.name"
-						>
-						</form-input>
-					</div>
-				</div>
-				
-				<div class="row mb-3">
-					<label for="anmerkung" class="form-label col-sm-4">{{$p.t('global', 'anmerkung')}}</label>
-					<div class="col-sm-6">
-					<form-input
-							type="text"
-							name="anmerkung"
-							v-model="addressData.anmerkung"
-						>
-						</form-input>
-					</div>
-				</div>
-				
-			</form-form>
-			<template #footer>
-				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{$p.t('ui', 'abbrechen')}}</button>
-				<button type="button" class="btn btn-primary" @click="addNewAddress()">OK</button>
-            </template>
-		</bs-modal>
-		
-		<!--Modal: Edit Address-->
-		<bs-modal ref="editAdressModal">
-			<template #title>{{$p.t('person', 'adresse_edit')}}</template>
-			<form-form class="row g-3" ref="addressData">
-			
-				<div class="row mb-3">
-					<label for="adressentyp" class="form-label col-sm-4">{{$p.t('global', 'typ')}}</label>
-					<div class="col-sm-6">
-						<form-input
-							type="select"
-							name="adressentyp"
-							v-model="addressData.typ"
-							>
-							<option
-								v-for="typ in adressentypen"
-								:key="typ.adressentyp_kurzbz"
-								:value="typ.adressentyp_kurzbz"
-								>
-								{{typ.bezeichnung}}
-							</option>
-						</form-input>
-					</div>
-				</div>
 					
-				<div class="row mb-3">
-					<label for="strasse" class="form-label col-sm-4">{{$p.t('person', 'strasse')}}</label>
-					<div class="col-sm-6">
-						<form-input
-							type="text"
-							name="strasse"
-							v-model="addressData.strasse"
-						>
-						</form-input>					
-					</div>
-				</div>
-				
-				<div class="row mb-3">
-					<label for="nation" class="form-label col-sm-4">{{$p.t('person', 'nation')}}</label>
-					<div class="col-sm-6">
-						<form-input
-							type="select"
-							name="nation"
-							v-model="addressData.nation"
-							>
-							<option 
-								v-for="nation in nations" 
-								:key="nation.nation_code" 
-								:value="nation.nation_code" 
-								:disabled="nation.sperre"
-								>
-								{{nation.kurztext}}
-							</option>
-						</form-input>
-					</div>
-				</div>
-							
-				<div class="row mb-3">
-					<label for="plz" class="required form-label col-sm-4" >{{$p.t('person', 'plz')}}<sup>*</sup></label>
-					<div class="col-sm-6">
-						<form-input
-							type="text"
-							name="plz"
-							v-model="addressData.plz"
-							required
-							@input="loadPlaces"
-						>
-						</form-input>					
-					</div>
-				</div>
-							
-				<div class="row mb-3">
-					<label for="gemeinde" class="form-label col-sm-4">{{$p.t('person', 'gemeinde')}}</label>
-					<div class="col-sm-6">
-						<form-input
-							v-if="addressData.gemeinde"
-							type="select"
-							name="addressData.gemeinde"
-							v-model="addressData.gemeinde"
-							>
-							<option v-if="!gemeinden.length" disabled>{{$p.t('ui', 'bittePlzWaehlen')}}</option>
-							<option 
-								v-for="gemeinde in gemeinden" 
-								:key="gemeinde.name" 
-								:value="gemeinde.name"
-								>
-								{{gemeinde.name}}
-							</option>						
-						</form-input>
-					</div>
-				</div>
-			
-				<div class="row mb-3">
-					<label for="Ort" class="form-label col-sm-4">{{$p.t('person', 'ort')}}</label>
-					<div class="col-sm-6">
-						<form-input
-							v-if="addressData.ort" 
-							type="select"
-							name="ort"
-							v-model="addressData.ort"
-							>
-							<option v-if="!orte.length" disabled>{{$p.t('ui', 'bitteGemeindeWaehlen')}}</option>
-							<option 
-								v-for="ort in orte" 
-								:key="ort.ortschaftsname" 
-								:value="ort.ortschaftsname"
-								>
-								{{ort.ortschaftsname}}
-							</option>
-						</form-input>
-					</div>
-				</div>
-				
-				<div class="row mb-3">
-					<label for="heimatadresse" class="form-label col-sm-4">{{$p.t('person', 'heimatadresse')}}</label>
-					<div class="col-sm-4">
-						<form-input
-							container-class="form-check"
-							type="checkbox"
-							name="heimatadresse"
-							v-model="addressData.heimatadresse"
-						>
-						</form-input>
-					</div>
-				</div>
-				
-				<div class="row mb-3">
-					<label for="zustelladresse" class="form-label col-sm-4">{{$p.t('person', 'zustelladresse')}}</label>
-					<div class="col-sm-4">
-						<form-input
-							container-class="form-check"
-							type="checkbox"
-							name="zustelladresse"
-							v-model="addressData.zustelladresse"
-						>
-						</form-input>
-					</div>
-				</div>
-				
-				<div class="row mb-3">
-					<label for="co_name" class="form-label col-sm-4">{{$p.t('person', 'co_name')}}</label>
-					<div class="col-sm-6">
-						<form-input
-							type="text"
-							name="co_name"
-							v-model="addressData.co_name"
-						>
-						</form-input>
-					</div>
-				</div>
-				
-				<div class="row mb-3">
-					<label for="rechnungsadresse" class="form-label col-sm-4">{{$p.t('person', 'rechnungsadresse')}}</label>
-					<div class="col-sm-4">
-						<form-input
-							container-class="form-check"
-							type="checkbox"
-							name="rechnungsadresse"
-							v-model="addressData.rechnungsadresse"
-						>
-						</form-input>
-					</div>
-				</div>
-				
-				<div class="row mb-3">
-					<label for="firma_name" class="form-label col-sm-4">{{$p.t('person', 'firma')}}</label>
-					<div v-if="addressData.firmenname" class="col-sm-6">
-						<input type="text" class="form-control" id="name" v-model="addressData.firmenname">
-					</div>
-					<div v-else class="col-sm-6">
-						<PvAutoComplete v-model="addressData.firma" optionLabel="name" :suggestions="filteredFirmen" @complete="search" :min-length="3"/>
-					</div>
+				<div v-if="statusNew" class="row mb-3">
+					<form-input
+						type="autocomplete"
+						:label="$p.t('person/firma')"
+						name="firma_name"
+						v-model="addressData.firma"  
+						optionLabel="name" 
+						:suggestions="filteredFirmen" 
+						@complete="search" 
+						:min-length="3"
+					>
+					</form-input>
+				</div>				
+					
+				<div v-else class="row mb-3">
+					<form-input
+						v-if="addressData.firmenname" 
+						type="text"
+						name="name"
+						:label="$p.t('person/firma')"
+						v-model="addressData.firmenname"
+					>
+					</form-input>
+					<form-input
+						v-else 
+						type="autocomplete"
+						:label="$p.t('person/firma')"
+						name="firma_name"
+						v-model="addressData.firma"  
+						optionLabel="name" 
+						:suggestions="filteredFirmen" 
+						@complete="search" 
+						:min-length="3"
+					>
+					</form-input>
 				</div>
 				
 				<div class="row mb-3">
@@ -707,33 +531,31 @@ export default{
 				</div>
 				
 				<div class="row mb-3">
-					<label for="name" class="form-label col-sm-4">{{$p.t('person', 'firma_zusatz')}}</label>
-					<div class="col-sm-6">
-						<form-input
-							type="text"
-							name="firma_zusatz"
-							v-model="addressData.name"
-						>
-						</form-input>
-					</div>
+					<form-input
+						type="text"
+						name="firma_zusatz"
+						:label="$p.t('person/firma_zusatz')"
+						v-model="addressData.name"
+					>
+					</form-input>
 				</div>
 				
 				<div class="row mb-3">
-					<label for="anmerkung" class="form-label col-sm-4">{{$p.t('global', 'anmerkung')}}</label>
-					<div class="col-sm-6">
 					<form-input
 							type="text"
 							name="anmerkung"
+							:label="$p.t('global/anmerkung')"
 							v-model="addressData.anmerkung"
 						>
-						</form-input>
-					</div>
+					</form-input>
 				</div>
 			
 			</form-form>
+			
 			<template #footer>
-				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">{{$p.t('ui', 'abbrechen')}}</button>
-				<button ref="Close" type="button" class="btn btn-primary" @click="updateAddress(addressData.adresse_id)">OK</button>
+				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{$p.t('ui', 'abbrechen')}}</button>
+				<button v-if="statusNew" type="button" class="btn btn-primary" @click="addNewAddress()">OK</button>
+				<button v-else type="button" class="btn btn-primary" @click="updateAddress(addressData.adresse_id)">OK</button>
             </template>
 		</bs-modal>
 		
@@ -745,7 +567,7 @@ export default{
 			</template>
 			<template #footer>
 				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">{{$p.t('ui', 'abbrechen')}}</button>
-				<button ref="Close" type="button" class="btn btn-primary" @click="deleteAddress(addressData.adresse_id)">OK</button>
+				<button type="button" class="btn btn-primary" @click="deleteAddress(addressData.adresse_id)">OK</button>
 			</template>
 		</bs-modal>
 			
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
index 78dfada64..2a26f9fc1 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
@@ -85,7 +85,7 @@ export default{
 				layoutColumnsOnNewData:	false,
 				height:	'auto',
 				selectable:	true,
-				index: 'bankverbindung_id',
+				index: 'bankverbindung_id'
 			},
 			tabulatorEvents: [
 				{
@@ -118,6 +118,7 @@ export default{
 				verrechnung: true,
 				typ: 'p'
 			},
+			statusNew: true
 		}
 	},
 	watch: {
@@ -128,12 +129,13 @@ export default{
 	methods:{
 		actionNewBankverbindung(){
 			this.resetModal();
-			this.$refs.newBankverbindungModal.show();
+			this.$refs.bankverbindungModal.show();
 		},
 		actionEditBankverbindung(bankverbindung_id){
+			this.statusNew = false;
 			this.loadBankverbindung(bankverbindung_id).then(() => {
 				if(this.bankverbindungData.bankverbindung_id)
-					this.$refs.editBankverbindungModal.show();
+					this.$refs.bankverbindungModal.show();
 			});
 		},
 		actionDeleteBankverbindung(bankverbindung_id){
@@ -147,7 +149,7 @@ export default{
 				this.bankverbindungData
 			).then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
-					this.hideModal('newBankverbindungModal');
+					this.hideModal('bankverbindungModal');
 					this.resetModal();
 			}).catch(this.$fhcAlert.handleSystemError)
 				.finally(() => {
@@ -156,6 +158,7 @@ export default{
 			});
 		},
 		loadBankverbindung(bankverbindung_id){
+			this.statusNew = false;
 			return this.$fhcApi.get('api/frontend/v1/stv/kontakt/loadBankverbindung/' + bankverbindung_id)
 				.then(
 				result => {
@@ -169,7 +172,7 @@ export default{
 				this.bankverbindungData)
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
-					this.hideModal('editBankverbindungModal');
+					this.hideModal('bankverbindungModal');
 					this.resetModal();
 			}).catch(this.$fhcAlert.handleSystemError)
 			.finally(() => {
@@ -206,13 +209,114 @@ export default{
 			this.bankverbindungData.bic = "";
 			this.bankverbindungData.verrechnung = true;
 			this.bankverbindungData.typ = 'p';
+
+			this.statusNew = true;
 		},
 	},
 	template: `	
 		<div class="stv-list h-100 pt-3">
 		
+		<!--Modal: Bankverbindung-->
+		<BsModal title="Bankverbindung anlegen" ref="bankverbindungModal">
+			<template #title>
+				<p v-if="statusNew" class="fw-bold mt-3">{{$p.t('person', 'bankvb_new')}}</p>
+				<p v-else class="fw-bold mt-3">{{$p.t('person', 'bankvb_edit')}}</p>
+			</template>
+
+			<form-form class="row g-3" ref="bankverbindungData">
+			
+				<div class="row my-3">
+					<form-input 
+						type="text"
+						name="name"
+						label="Name"
+						v-model="bankverbindungData.name"
+					>
+					</form-input>
+				</div>
+				
+				<div class="row mb-3">										   
+					<form-input 
+						type="text"
+						name="anschrift"
+						:label="$p.t('person/anschrift')"
+						v-model="bankverbindungData.anschrift"
+					>
+					</form-input>
+				</div>
+
+				<div class="row mb-3">							   
+					<form-input 
+						type="text"
+						name="iban"
+						label="IBAN *"
+						v-model="bankverbindungData.iban"
+						required
+					>
+					</form-input>
+				</div>
+				
+				<div class="row mb-3">
+					<form-input 
+						type="text"
+						name="bic"
+						label="BIC"
+						v-model="bankverbindungData.bic"
+						>
+					</form-input>
+				</div>
+				<div class="row mb-3">
+					<form-input 
+						type="text"
+						name="kontonr"
+						:label="$p.t('person/kontonr')"
+						v-model="bankverbindungData.kontonr"
+						>
+					</form-input>
+				</div>
+				<div class="row mb-3">
+					<form-input 
+						type="text"
+						name="blz"
+						:label="$p.t('person/blz')"
+						v-model="bankverbindungData.blz"
+						>
+					</form-input>
+				</div>
+				<div class="row mb-3">
+					<form-input 
+						type="select" 
+						name="typ"
+						:label="$p.t('global/typ')"
+						v-model="bankverbindungData.typ"
+						required
+						>
+						<option  value="p">{{$p.t('person', 'privatkonto')}}</option>
+						<option  value="f">{{$p.t('person', 'firmenkonto')}}</option>
+					</form-input>
+				</div>
+				<div class="row mb-3">
+					<form-input
+						container-class="form-check"
+						type="checkbox"
+						name="verrechnung"
+						:label="$p.t('person/verrechnung')"
+						v-model="bankverbindungData.verrechnung"
+					>
+					</form-input>
+				</div>
+			</form-form>
+			
+			<template #footer>
+				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{$p.t('ui', 'abbrechen')}}</button>
+				<button v-if="statusNew" type="button" class="btn btn-primary" @click="addNewBankverbindung()">OK</button>
+				<button v-else type="button" class="btn btn-primary" @click="updateBankverbindung(bankverbindungData.bankverbindung_id)">OK</button>
+			</template>
+			
+		</BsModal>
+		
 		<!--Modal: Add Bankverbindung-->
-		<BsModal title="Bankverbindung anlegen" ref="newBankverbindungModal">
+<!--		<BsModal title="Bankverbindung anlegen" ref="newBankverbindungModal">
 
 			<template #title>{{$p.t('person', 'bankvb_new')}}</template>
 			<form-form class="row g-3" ref="bankverbindungData">
@@ -315,10 +419,10 @@ export default{
             		<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{$p.t('ui', 'abbrechen')}}</button>
 					<button type="button" class="btn btn-primary" @click="addNewBankverbindung()">OK</button>
             </template>
-		</BsModal>
+		</BsModal>-->
 				
 		<!--Modal: Edit Bankverbindung-->
-		<BsModal ref="editBankverbindungModal">
+<!--		<BsModal ref="editBankverbindungModal">
 			<template #title>{{$p.t('person', 'bankvb_edit')}}</template>
 				<form-form class="row g-3" ref="bankverbindungData">
 				
@@ -420,7 +524,7 @@ export default{
 					<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">{{$p.t('ui', 'abbrechen')}}</button>
 					<button ref="Close" type="button" class="btn btn-primary" @click="updateBankverbindung(bankverbindungData.bankverbindung_id)">OK</button>
             	</template>
-		</BsModal>
+		</BsModal>-->
 		
 		<!--Modal: Delete Bankverbindung-->
 		<BsModal ref="deleteBankverbindungModal">
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
index 17f559a94..3bb8e0a55 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
@@ -35,7 +35,8 @@ export default{
 						}
 					},
 					{title:"Anmerkung", field:"anmerkung"},
-					{title:"Firma", field:"kurzbz", visible:false},
+					{title:"Firma", field:"name", visible:false},
+					{title:"Standort", field:"bezeichnung", visible:false},
 					{title:"Firma_id", field:"firma_id", visible:false},
 					{title:"Person_id", field:"person_id", visible:false},
 					{title:"Kontakt_id", field:"kontakt_id", visible:false},
@@ -94,43 +95,53 @@ export default{
 						cm.getColumnByField('anmerkung').component.updateDefinition({
 							title: this.$p.t('global', 'anmerkung')
 						});
-						cm.getColumnByField('kurzbz').component.updateDefinition({
-							title: this.$p.t('person', 'firma')
-						});
+
 						cm.getColumnByField('lastupdate').component.updateDefinition({
 							title: this.$p.t('notiz', 'letzte_aenderung')
 						});
-				}
-			}
+						cm.getColumnByField('name').component.updateDefinition({
+							title: this.$p.t('person', 'firma')
+						});
+						cm.getColumnByField('bezeichnung').component.updateDefinition({
+							title: this.$p.t('person', 'standort')
+						});
+				}}
 			],
 			lastSelected: null,
 			contactData: {
 				zustellung: true,
-				kontakttyp: 'email'
-			},
-			initData: {
-				zustellung: true,
-				kontakttyp: 'email'
+				kontakttyp: 'email',
+				firma_id: null
 			},
+			statusNew: true,
 			kontakttypen: [],
-			standorte: [],
-			selectedStandort: null,
-			filteredStandorte: null
+			firmen: [],
+			filteredFirmen: [],
+			filteredOrte: null,
 		}
 	},
 	watch: {
-		uid(){
+		uid() {
 			this.$refs.table.tabulator.setData('api/frontend/v1/stv/Kontakt/getKontakte/' + this.uid);
+		},
+		contactData: {
+			handler(newVal) {
+				if (newVal.firma && newVal.firma.firma_id !== null && typeof newVal.firma.firma_id !== 'undefined') {
+					this.loadStandorte(this.contactData.firma.firma_id);
+				}
+			},
+			deep: true
 		}
 	},
 	methods:{
 		actionNewContact(){
 			this.resetModal();
-			this.$refs.newContactModal.show();
+			this.$refs.contactModal.show();
 		},
 		actionEditContact(contact_id){
+			this.statusNew = false;
 			this.loadContact(contact_id);
-			this.$refs.editContactModal.show();
+			this.$refs.contactModal.show();
 		},
 		actionDeleteContact(contact_id){
 			this.loadContact(contact_id);
@@ -141,7 +152,7 @@ export default{
 				this.contactData)
 				.then(response => {
 						this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
-						this.hideModal("newContactModal");
+						this.hideModal("contactModal");
 						this.resetModal();
 				}).catch(this.$fhcAlert.handleSystemError)
 				.finally(() => {
@@ -150,6 +161,9 @@ export default{
 			});
 		},
 		loadContact(contact_id){
+			this.statusNew = false;
+			if(this.contactData.firma_id)
+				this.loadStandorte(this.contactData.firma_id);
 			return this.$fhcApi.get('api/frontend/v1/stv/kontakt/loadContact/' + contact_id)
 				.then(
 					result => {
@@ -176,7 +190,7 @@ export default{
 				this.contactData).
 			then(response => {
 				this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
-				this.hideModal('editContactModal');
+				this.hideModal('contactModal');
 				this.resetModal();
 				this.reload();
 			}).catch(this.$fhcAlert.handleSystemError)
@@ -185,22 +199,39 @@ export default{
 				this.reload();
 			});
 		},
+
 		hideModal(modalRef){
 			this.$refs[modalRef].hide();
 		},
 		reload(){
 			this.$refs.table.reloadTable();
 		},
-		search(event) {
+		searchFirma(event) {
 			return this.$fhcApi
-				.get('api/frontend/v1/stv/kontakt/getStandorte/' + event.query)
-					.then(result => {
-						this.filteredStandorte = result.data.retval;
+				.get('api/frontend/v1/stv/kontakt/getFirmen/' + event.query)
+				.then(result => {
+					this.filteredFirmen = result.data.retval;
+				});
+		},
+		loadStandorte(firmen_id) {
+			return this.$fhcApi
+				.get('api/frontend/v1/stv/kontakt/getStandorteByFirma/' + firmen_id)
+				.then(result => {
+					this.filteredOrte = result.data;
 				});
 		},
 		resetModal(){
 			this.contactData = {};
-			this.contactData = this.initData;
+			this.contactData.zustellung = true;
+			this.contactData.kontakttyp = 'email';
+			this.contactData.kontakt = '';
+			this.contactData.anmerkung = null;
+			this.contactData.firma_id = null;
+			this.contactData.name = null;
+			this.contactData.standort_id = null;
+			this.contactData.bezeichnung = null;
+
+			this.statusNew = true;
 		},
 	},
 	created(){
@@ -213,159 +244,140 @@ export default{
 	},
 	template: `	
 		<div class="stv-list h-100 pt-3">
-		
-		<!--Modal: new Contact-->
-		<BsModal ref="newContactModal">
-			<template #title>{{$p.t('person', 'kontakt_new')}}</template>
+
+		<!--Modal: contactModal-->
+		<BsModal ref="contactModal">
+			<template #title>
+				<p v-if="statusNew" class="fw-bold mt-3">{{$p.t('person', 'kontakt_new')}}</p>
+				<p v-else class="fw-bold mt-3">{{$p.t('person', 'kontakt_edit')}}</p>
+			</template>
 				
-				<form-form class="row g-3" ref="contactData">
-				
-					<div class="row mb-3">
-						<label for="kontakttyp" class="form-label col-sm-4">{{$p.t('global', 'typ')}}</label>
-						<div class="col-sm-6">
-							<form-input 
-								type="select" 
-								name="typ" 
-								v-model="contactData.kontakttyp">
-							>
-								<option value="">keine Auswahl</option>
-								<option v-for="typ in kontakttypen" :key="typ.kontakttyp_kurzbz" :value="typ.kontakttyp" >{{typ.kontakttyp}}</option>
-						</form-input>
-						</div>
-					</div>
-					
-					<div class="row mb-3">										   
-						<label for="kontakt" class="form-label col-sm-4">{{$p.t('global', 'kontakt')}}<sup>*</sup></label>
-						<div class="col-sm-6">
-							<form-input 
-								type="text" 
-								name="kontakt" 
-								v-model="contactData.kontakt">
-								required
-								>
-							</form-input>
-						</div>
-					</div>
-					
-					<div class="row mb-3">									   
-						<label for="anmerkung" class="form-label col-sm-4">{{$p.t('global', 'anmerkung')}}</label>
-						<div class="col-sm-6">
-							<form-input 
-								type="text" 
-								name="anmerkung" 
-								v-model="contactData.anmerkung">
-								>
-							</form-input>
-						</div>
-					</div>
-					
-					<div class="row mb-3">
-						<label for="zustellung" class="form-label col-sm-4">{{$p.t('person', 'zustellung')}}</label>
-						<div class="col-sm-4">
-							<form-input
-								container-class="form-check"
-								type="checkbox"
-								name="zustellung"
-								v-model="contactData.zustellung"
-							>
-							</form-input>
-						</div>
-					</div>
-						
-					<div class="row mb-3">
-						<label for="firma_name" class="form-label col-sm-4">{{$p.t('person', 'firma')}} / {{$p.t('person', 'standort')}}</label>
-							<div class="col-sm-6">
-								<PvAutoComplete v-model="contactData['standort']" optionLabel="kurzbz" :suggestions="filteredStandorte" @complete="search" :min-length="3"/>
-							</div>
-					</div>
-				</form-form>
-				
-			    <template #footer>
-            		<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{$p.t('ui', 'abbrechen')}}</button>
-					<button type="button" class="btn btn-primary" @click="addNewContact()">OK</button>
-            	</template>
-		</BsModal>
-						
-		<!--Modal: Edit Contact-->
-		<BsModal ref="editContactModal">
-		
-			<template #title>{{$p.t('person', 'kontakt_edit')}}</template>
-			
 			<form-form class="row g-3" ref="contactData">
-				<div class="row mb-3">
-					<label for="kontakttyp" class="form-label col-sm-4">{{$p.t('global', 'typ')}}</label>
-					<div class="col-sm-6">
-						<select id="kontakttyp" class="form-control" v-model="contactData.kontakttyp">
-							<option value="">-- keine Auswahl --</option>
-							<option v-for="typ in kontakttypen" :key="typ.kontakttyp_kurzbz" :value="typ.kontakttyp" >{{typ.kontakttyp}}</option>
-						</select>
-					</div>
+			
+				<div class="row my-3">
+				
+					<form-input 
+						type="select" 
+						name="typ"
+						:label="$p.t('global/typ')"
+						v-model="contactData.kontakttyp">
+					>
+						<option value="">keine Auswahl</option>
+						<option v-for="typ in kontakttypen" :key="typ.kontakttyp_kurzbz" :value="typ.kontakttyp" >{{typ.kontakttyp}}</option>
+					</form-input>
+				</div>
+				
+				<div class="row mb-3">										   
+					<form-input 
+						type="text" 
+						name="kontakt" 
+						:label="$p.t('global/kontakt')+ ' *'"
+						v-model="contactData.kontakt">
+						required
+						>
+					</form-input>
 				</div>
 				
 				<div class="row mb-3">									   
-					<label for="kontakt" class="form-label col-sm-4">{{$p.t('global', 'kontakt')}}<sup>*</sup></label>
-					<div class="col-sm-6">
-						<form-input 
-							type="text" 
-							name="kontakt" 
-							v-model="contactData.kontakt">
-							required
-							>
-						</form-input>
-					</div>
-				</div>
-				
-				<div class="row mb-3">									   
-					<label for="anmerkung" class="form-label col-sm-4">{{$p.t('global', 'anmerkung')}}</label>
-					<div class="col-sm-6">
-						<form-input 
-							type="text" 
-							name="anmerkung" 
-							v-model="contactData.anmerkung">
-							>
-						</form-input>
-					</div>
+					<form-input 
+						type="text" 
+						name="anmerkung"
+						:label="$p.t('global/anmerkung')"
+						v-model="contactData.anmerkung">
+						>
+					</form-input>
 				</div>
 				
 				<div class="row mb-3">
-					<label for="zustellung" class="form-label col-sm-4">{{$p.t('person', 'zustellung')}}</label>
 					<div class="col-sm-4">
 						<form-input
 							container-class="form-check"
 							type="checkbox"
 							name="zustellung"
+							:label="$p.t('person/zustellung')"
 							v-model="contactData.zustellung"
 						>
 						</form-input>
 					</div>
 				</div>
 				
-				<div class="row mb-3">			
-					<input type="hidden" class="form-control" id="standort_id" v-model="contactData.standort_id">
+				<div v-if="statusNew" class="row mb-3">
+					<form-input
+						type="autocomplete"
+						:label="$p.t('person/firma')"
+						name="firma_name"
+						v-model="contactData.firma"  
+						optionLabel="name" 
+						:suggestions="filteredFirmen" 
+						@complete="searchFirma" 
+						:min-length="3"
+					>
+					</form-input>
+				</div>				
+					
+				<div v-else class="row mb-3">
+					<form-input
+						v-if="contactData.name" 
+						type="text"
+						name="name"
+						:label="$p.t('person/firma')"
+						v-model="contactData.name"
+					>
+					</form-input>
+					<form-input
+						v-else 
+						type="autocomplete"
+						:label="$p.t('person/firma')"
+						name="firma_name"
+						v-model="contactData.firma"  
+						optionLabel="name" 
+						:suggestions="filteredFirmen" 
+						@complete="searchFirma" 
+						:min-length="3"
+					>
+					</form-input>
 				</div>
 				
-				<div class="row mb-3">
-					<label for="standort" class="form-label col-sm-4">{{$p.t('person', 'firma')}} / {{$p.t('person', 'standort')}}</label>
-						<div v-if="contactData.kurzbz" class="col-sm-6">
-							<form-input
-								type="text"
-								name="name"
-								v-model="contactData.kurzbz"
-							>
-							</form-input>
-						</div>	
-						<div v-else class="col-sm-3">
-							<PvAutoComplete v-model="contactData['standort']" optionLabel="kurzbz" :suggestions="filteredStandorte" @complete="search" :min-length="3"/>
-						</div>
-				</div>
-			</form-form>
+				<input type="hidden" class="form-control" id="firma_id" v-model="contactData.firma_id">
 			
+				<input type="hidden" class="form-control" id="standort_id" v-model="contactData.standort_id">
+			
+				<div class="row mb-3" v-if="contactData.standort_id || filteredOrte">
+					<form-input
+						v-if="contactData.name"
+						type="text"
+						name="name"
+						:label="$p.t('person/firma') + ' / ' + $p.t('person/standort')" 
+						v-model="contactData.bezeichnung"
+					>
+					</form-input>
+					<form-input
+						v-else
+						type="select"
+						name="ort"
+						:label="$p.t('person/standort')"
+						v-model="contactData.standort_id"
+						>
+						<option v-if="filteredOrte" disabled>{{$p.t('ui', 'bitteStandortWaehlen')}}</option>
+						<option 
+							v-for="ort in filteredOrte" 
+							:key="ort.standort_id" 
+							:value="ort.standort_id"
+							>
+							{{ort.bezeichnung}}
+						</option>
+					</form-input>
+				</div>		
+				
+			</form-form>
+				
 			<template #footer>
-				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">{{$p.t('ui', 'abbrechen')}}</button>
-				<button type="button" class="btn btn-primary" @click="updateContact(contactData.kontakt_id)">OK</button>
+				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{$p.t('ui', 'abbrechen')}}</button>
+				<button v-if="statusNew" type="button" class="btn btn-primary" @click="addNewContact()">OK</button>
+				<button v-else type="button" class="btn btn-primary" @click="updateContact(contactData.kontakt_id)">OK</button>
 			</template>
 		</BsModal>
-									
+										
 		<!--Modal: Delete Contact-->
 		<BsModal ref="deleteContactModal">
 			<template #title>{{$p.t('person', 'kontakt_delete')}}</template>  
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 715daa1f9..07a7ee5a2 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -28162,6 +28162,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'bitteStandortWaehlen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bitte Standort wählen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Please select location',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 );
 
 

From b7dff7d2c327dc71489030d538f8a780d57e3d69 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 11 Jun 2024 10:22:52 +0200
Subject: [PATCH 0778/1461] Permission-Filter Verband

---
 .../api/frontend/v1/stv/Verband.php           | 64 +++++++++++--------
 .../organisation/Studiensemester_model.php    | 27 ++++++++
 2 files changed, 64 insertions(+), 27 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Verband.php b/application/controllers/api/frontend/v1/stv/Verband.php
index 8600a1bf0..9abf99a32 100644
--- a/application/controllers/api/frontend/v1/stv/Verband.php
+++ b/application/controllers/api/frontend/v1/stv/Verband.php
@@ -36,6 +36,7 @@ class Verband extends FHCAPI_Controller
 		// Load Models
 		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
 	}
+	
 	/**
 	 * Remap calls:
 	 * /
@@ -87,7 +88,10 @@ class Verband extends FHCAPI_Controller
 		
 		$this->StudiengangModel->addDistinct();
 		$this->StudiengangModel->addSelect("v.studiengang_kz AS link");
-		$this->StudiengangModel->addSelect("CONCAT(kurzbzlang, ' (', UPPER(CONCAT(typ, kurzbz)), ') - ', tbl_studiengang.bezeichnung) AS name", false);
+		$this->StudiengangModel->addSelect(
+			"CONCAT(kurzbzlang, ' (', UPPER(CONCAT(typ, kurzbz)), ') - ', tbl_studiengang.bezeichnung) AS name",
+			false
+		);
 		$this->StudiengangModel->addSelect('erhalter_kz');
 		$this->StudiengangModel->addSelect('typ');
 		$this->StudiengangModel->addSelect('kurzbz');
@@ -98,31 +102,37 @@ class Verband extends FHCAPI_Controller
 		$this->StudiengangModel->addOrder('typ');
 		$this->StudiengangModel->addOrder('kurzbz');
 
+		$stgs = $this->permissionlib->getSTG_isEntitledFor('admin') ?: [];
+		$stgs = array_merge($stgs, $this->permissionlib->getSTG_isEntitledFor('assistenz') ?: []);
+		if ($stgs)
+			$this->StudiengangModel->db->where_in('studiengang_kz', $stgs);
+
 		$result = $this->StudiengangModel->loadWhere(['v.aktiv' => true]);
 
 		$list = $this->getDataOrTerminateWithError($result);
 
-		$list[] = [
-			'name' => 'International',
-			'link' => 'inout',
-			'children' => [
-				[
-					'name' => 'Incoming',
-					'link' => 'inout/incoming',
-					'leaf' => true
-				],
-				[
-					'name' => 'Outgoing',
-					'link' => 'inout/outgoing',
-					'leaf' => true
-				],
-				[
-					'name' => 'Gemeinsame Studien',
-					'link' => 'inout/gemeinsamestudien',
-					'leaf' => true
+		if ($this->permissionlib->isBerechtigt('inout/uebersicht'))
+			$list[] = [
+				'name' => 'International',
+				'link' => 'inout',
+				'children' => [
+					[
+						'name' => 'Incoming',
+						'link' => 'inout/incoming',
+						'leaf' => true
+					],
+					[
+						'name' => 'Outgoing',
+						'link' => 'inout/outgoing',
+						'leaf' => true
+					],
+					[
+						'name' => 'Gemeinsame Studien',
+						'link' => 'inout/gemeinsamestudien',
+						'leaf' => true
+					]
 				]
-			]
-		];
+			];
 		$this->terminateWithSuccess($list);
 	}
 
@@ -331,13 +341,13 @@ class Verband extends FHCAPI_Controller
 	{
 		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
 
-		$this->StudiensemesterModel->addOrder('start');
+		$this->load->model('system/Variable_model', 'VariableModel');
+		$result = $this->VariableModel->getVariables(getAuthUID(), ['number_displayed_past_studiensemester']);
+		$data = $this->getDataOrTerminateWithError($result);
+		$number_displayed_past_studiensemester = $data['number_displayed_past_studiensemester'] ?? null;
 
-		/**
-		 * TODO(chris): filter with variable:
-		 * - $number_displayed_past_studiensemester from Variable
-		 * - then: $stsem_obj->getPlusMinus(NULL, $number_displayed_past_studiensemester, 'ende ASC');
-		 */
+		$this->StudiensemesterModel->addPlusMinus(null, $number_displayed_past_studiensemester);
+		$this->StudiensemesterModel->addOrder('ende');
 		$result = $this->StudiensemesterModel->load();
 
 		$studiensemester = $this->getDataOrTerminateWithError($result);
diff --git a/application/models/organisation/Studiensemester_model.php b/application/models/organisation/Studiensemester_model.php
index 45a4eac7c..caa385128 100644
--- a/application/models/organisation/Studiensemester_model.php
+++ b/application/models/organisation/Studiensemester_model.php
@@ -214,4 +214,31 @@ class Studiensemester_model extends DB_Model
 					
 		return $this->execQuery($query);
 	}
+
+	/**
+	 * Liefert ausgehend von heutigen Datum $plus studiensemester in die Zukunft und $minus Studiensemester in die Vergangenheit
+	 *
+	 * @param integer $plus Optional. Wieviele Studiensemester in die Zukunft sollen ausgegeben werden. Wenn NULL werden alle zukuenftigen geliefert.
+	 * @param integer $minus Optional. Wieviele Studiensemester in die Vergangenheit sollen ausgegeben werden. Wenn NULL werden alle vergangenen geliefert.
+	 *
+	 * @return stdClass
+	 */
+	public function addPlusMinus($plus = null, $minus = null)
+	{
+		$this->addSelect($this->pk);
+		$this->addOrder('ende');
+		if ($plus)
+			$this->addLimit($plus);
+		$this->db->where('start >= NOW()', null, false);
+		$plus = $this->db->get_compiled_select($this->dbTable);
+
+		$this->addSelect($this->pk);
+		$this->addOrder('start', 'DESC');
+		if ($minus)
+			$this->addLimit($minus);
+		$this->db->where('start <= NOW()', null, false);
+		$minus = $this->db->get_compiled_select($this->dbTable);
+		
+		$this->db->where_in($this->pk, '(' . $plus . ') UNION (' . $minus . ')', false);
+	}
 }

From 5b193e89c0168d09bc1eff3b1ef1b7fb3bf2710e Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 11 Jun 2024 10:23:09 +0200
Subject: [PATCH 0779/1461] Cleanup

---
 .../controllers/components/stv/Favorites.php  | 61 -------------------
 1 file changed, 61 deletions(-)
 delete mode 100644 application/controllers/components/stv/Favorites.php

diff --git a/application/controllers/components/stv/Favorites.php b/application/controllers/components/stv/Favorites.php
deleted file mode 100644
index e0e7bbf7e..000000000
--- a/application/controllers/components/stv/Favorites.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class Favorites extends FHC_Controller
-{
-	public function __construct()
-	{
-		// TODO(chris): access!
-		parent::__construct();
-
-		// Load models
-		$this->load->model('system/Variable_model', 'VariableModel');
-
-		// Load libraries
-		$this->load->library('AuthLib');
-
-		// TODO(chris): variable table might be to small to store favorites!
-	}
-
-	public function index()
-	{
-		$result = $this->VariableModel->getVariables(getAuthUID(), ['stv_favorites']);
-
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson(getError($result));
-		}
-
-		$result = getData($result);
-		if (!$result)
-			$this->outputJson(null);
-		else
-			$this->outputJson($result['stv_favorites']);
-	}
-
-	public function set()
-	{
-		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-		
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('favorites', 'Favorites', 'required');
-
-		if ($this->form_validation->run() == false) {
-			$this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST);
-			return $this->outputJson($this->form_validation->error_array());
-		}
-
-		$favorites = $this->input->post('favorites');
-
-		$result = $this->VariableModel->setVariable(getAuthUID(), 'stv_favorites', $favorites);
-
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson(getError($result));
-		}
-
-		$this->outputJsonSuccess(true);
-	}
-}

From 2e06633972cb153a405e7a86f4bc7708fb465fba Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 11 Jun 2024 12:16:35 +0200
Subject: [PATCH 0780/1461] bugfix Validierung Email required

---
 .../controllers/api/frontend/v1/stv/Kontakt.php    | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Kontakt.php b/application/controllers/api/frontend/v1/stv/Kontakt.php
index 154729aa3..5ebe03f09 100644
--- a/application/controllers/api/frontend/v1/stv/Kontakt.php
+++ b/application/controllers/api/frontend/v1/stv/Kontakt.php
@@ -372,13 +372,18 @@ class Kontakt extends FHCAPI_Controller
 	public function addNewContact($person_id)
 	{
 		if(($_POST['kontakttyp'] == 'email' && isset($_POST['kontakt'])))
-			$this->form_validation->set_rules('kontakt', 'Kontakt', 'valid_email', [
+		{
+			$this->form_validation->set_rules('kontakt', 'Kontakt', 'required|valid_email', [
+				'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Kontakt']),
 				'valid_email' => $this->p->t('ui', 'error_fieldNoValidEmail', ['field' => 'Kontakt'])
 			]);
+		}
 		else
+		{
 			$this->form_validation->set_rules('kontakt', 'Kontakt', 'required', [
 				'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Kontakt'])
 			]);
+		}
 
 		if ($this->form_validation->run() == false)
 		{
@@ -426,13 +431,18 @@ class Kontakt extends FHCAPI_Controller
 		}
 
 		if(($_POST['kontakttyp'] == 'email' && isset($_POST['kontakt'])))
-			$this->form_validation->set_rules('kontakt', 'Kontakt', 'valid_email', [
+		{
+			$this->form_validation->set_rules('kontakt', 'Kontakt', 'required|valid_email', [
+				'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Kontakt']),
 				'valid_email' => $this->p->t('ui', 'error_fieldNoValidEmail', ['field' => 'Kontakt'])
 			]);
+		}
 		else
+		{
 			$this->form_validation->set_rules('kontakt', 'Kontakt', 'required', [
 				'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Kontakt'])
 			]);
+		}
 
 		if ($this->form_validation->run() == false)
 		{

From dd47cd2a7c19d0b41a4b0815488c4081a056c89e Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Tue, 11 Jun 2024 13:51:03 +0200
Subject: [PATCH 0781/1461] Updated filter: Added lizenzserver_kurzbz and
 lizenzserver_port to SoftwareManagement filter

---
 system/filtersupdate.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/system/filtersupdate.php b/system/filtersupdate.php
index bc67e9dae..fa8a361f4 100644
--- a/system/filtersupdate.php
+++ b/system/filtersupdate.php
@@ -1296,6 +1296,8 @@ $filters = array(
 					{"name": "beschreibung"},
 					{"name": "hersteller"},
 					{"name": "os"},
+					{"name": "lizenzserver_kurzbz"},
+					{"name": "lizenzserver_port"},
 					{"name": "softwarestatus_kurzbz"}
 				],
 				"filters": []

From cd0eacf947383d0572dcf68133fbf29c805ef835 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Tue, 11 Jun 2024 13:52:03 +0200
Subject: [PATCH 0782/1461] Updated phrases: Added phrases 'lizenzserverPort'
 and 'raumSwZuordnung'

---
 system/phrasesupdate.php | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 8baf66909..20f155afe 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -25539,6 +25539,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'lizenzserverPort',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Lizenzserver Port',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'License server port',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'raumSwZuordnung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Raum-/SW-Zuordnung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Location-/SW Assignment',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'softwarebereitstellung',
 		'category' => 'global',

From f8d8a44a3cabe3fad2b7b83103fa9819b388d5c4 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 11 Jun 2024 14:47:54 +0200
Subject: [PATCH 0783/1461] student_uid zu sancho message Abmeldung StG Ablauf
 Einspruchsfrist

---
 application/controllers/jobs/AntragJob.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/application/controllers/jobs/AntragJob.php b/application/controllers/jobs/AntragJob.php
index 717561589..57230ed92 100644
--- a/application/controllers/jobs/AntragJob.php
+++ b/application/controllers/jobs/AntragJob.php
@@ -412,6 +412,8 @@ class AntragJob extends JOB_Controller
 		$this->StudierendenantragModel->addSelect('studiensemester_kurzbz');
 		$this->StudierendenantragModel->addSelect('s.insertamum');
 		$this->StudierendenantragModel->addSelect('s.insertvon');
+		$this->StudierendenantragModel->addJoin('public.tbl_student pts', 'prestudent_id');
+		$this->StudierendenantragModel->addSelect('pts.student_uid');
 
 		$this->StudierendenantragModel->db->where_in(
 			'public.get_rolle_prestudent(prestudent_id, studiensemester_kurzbz)',
@@ -484,7 +486,7 @@ class AntragJob extends JOB_Controller
 						$person = current(getData($result));
 						$email = $studiengang->email;
 						$dataMail = array(
-							'prestudent' => $antrag->prestudent_id,
+							'prestudent' => $antrag->student_uid . ' / ' . $antrag->prestudent_id,
 							'studiensemester' => $antrag->studiensemester_kurzbz,
 							'name' => trim($person->vorname . ' '. $person->nachname),
 						);

From 9c51f25c9e8a885e44da69c9cc8f6e1ffc0462da Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 11 Jun 2024 15:03:09 +0200
Subject: [PATCH 0784/1461] modifies how the slot template from the Calendar
 Page is passed to the CalendarApp and prints the reservierungen differently
 (but the reservierungen are not grouped yet)

---
 .../api/frontend/v1/Stundenplan.php           |  3 +-
 .../models/ressource/Reservierung_model.php   |  8 +++-
 .../models/ressource/Stundenplan_model.php    | 16 ++++---
 public/js/apps/Cis/RoomInformation.js         | 47 ++++++++++++-------
 public/js/components/Calendar/Calendar.js     |  4 +-
 public/js/components/Calendar/Week.js         |  4 +-
 public/js/components/Calendar/Week/Page.js    |  7 +--
 7 files changed, 57 insertions(+), 32 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 4f7e7a053..2bff6016f 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -98,7 +98,8 @@ class Stundenplan extends FHCAPI_Controller
 
      
 		$result = $this->StundenplanModel->getRoomDataOnDay($ort_kurzbz,$start_date,$end_date);
-        
+        // logging the result of the query
+        //$this->loglib->logErrorDB(print_r($result,true),"this is the result of the query");
             
 
 		if(isError($result)){
diff --git a/application/models/ressource/Reservierung_model.php b/application/models/ressource/Reservierung_model.php
index 23d17f974..e149cf0d7 100755
--- a/application/models/ressource/Reservierung_model.php
+++ b/application/models/ressource/Reservierung_model.php
@@ -22,7 +22,13 @@ class Reservierung_model extends DB_Model
 	{
 
 		$raum_reservierungen= $this->execReadOnlyQuery("
-		SELECT res.*, mit.kurzbz as person_kurzbz , CONCAT(studg.typ,studg.kurzbz,'-') as stg
+		SELECT res.*, mit.kurzbz as person_kurzbz , 
+		CASE
+			WHEN res.verband IS NOT NULL OR res.semester IS NOT NULL THEN
+				CONCAT(UPPER(studg.typ),UPPER(studg.kurzbz),'-',res.verband,res.semester) 
+			ELSE
+				CONCAT(UPPER(studg.typ),UPPER(studg.kurzbz)) 
+		END AS stg
 		FROM lehre.vw_reservierung res
 		JOIN public.tbl_mitarbeiter mit ON mit.mitarbeiter_uid=res.uid
 		JOIN public.tbl_studiengang studg ON studg.studiengang_kz=res.studiengang_kz
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 299faa049..5ce6a9823 100755
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -18,23 +18,25 @@ class Stundenplan_model extends DB_Model
 	 * 
 	 * @return stdClass
 	 */
-	public function getRoomDataOnDay($ort_kurzbz='EDV_A2.06',$start_date,$end_date){
+	public function getRoomDataOnDay($ort_kurzbz,$start_date,$end_date){
 
 
-		//TODO alternative query version that unions the reservierungen into the stundenplan with different 'eintrags_type' column
-		/*"
+	
+		/*$raum_stundenplan= $this->execReadOnlyQuery("
 		-- merging all reservierungs information with the stundenplan information but with different types
-		SELECT 'stundenplan_eintrag' as eintrags_type, ort_kurzbz, studiengang_kz, uid, stunde, datum, titel, semester, verband, gruppe, gruppe_kurzbz, stg_kurzbz, CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) AS stg, CONCAT(lehrfach,'-',lehrform) AS lv_info, * FROM lehre.vw_stundenplan sp
+		SELECT 'stundenplan_eintrag' as eintrags_type, CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) AS stg, CONCAT(lehrfach,'-',lehrform) AS lv_info, ort_kurzbz, studiengang_kz, uid, stunde, datum, titel, semester, verband, gruppe, gruppe_kurzbz, stg_kurzbz, * FROM lehre.vw_stundenplan sp
 		WHERE ort_kurzbz = ? AND datum >= ? AND datum <= ? 
 		UNION ALL
-		SELECT 'reservierungs_eintrag' as eintrags_type, ort_kurzbz, studiengang_kz, uid, stunde, datum, titel, semester, verband, gruppe, gruppe_kurzbz, stg_kurzbz, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL FROM lehre.vw_reservierung res
+		SELECT 'reservierungs_eintrag' as eintrags_type, NULL, NULL, ort_kurzbz, studiengang_kz, uid, stunde, datum, titel, semester, verband, gruppe, gruppe_kurzbz, stg_kurzbz, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL FROM lehre.vw_reservierung res
 		WHERE ort_kurzbz = ? AND datum >= ? AND datum <= ?
-		"*/
+		", [$ort_kurzbz, $start_date, $end_date,$ort_kurzbz, $start_date, $end_date]);
+		*/
+
 
 		$raum_stundenplan= $this->execReadOnlyQuery("
 		SELECT CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) AS stg, CONCAT(lehrfach,'-',lehrform) AS lv_info, * FROM lehre.vw_stundenplan sp
 		WHERE ort_kurzbz = ? AND datum >= ? AND datum <= ? 
-		", [$ort_kurzbz, $start_date, $end_date]);
+		", [$ort_kurzbz, $start_date, $end_date]); 
 
 		return $raum_stundenplan;
 	}
diff --git a/public/js/apps/Cis/RoomInformation.js b/public/js/apps/Cis/RoomInformation.js
index d485227b2..e64348dd8 100644
--- a/public/js/apps/Cis/RoomInformation.js
+++ b/public/js/apps/Cis/RoomInformation.js
@@ -1,7 +1,7 @@
 import FhcCalendar from "../../components/Calendar/Calendar.js";
 import CalendarDate from "../../composables/CalendarDate.js";
 import FhcApi from "../../plugin/FhcApi.js";
-
+import Phrasen from "../../plugin/Phrasen.js";
 const app = Vue.createApp({
 	components: {
 		FhcCalendar
@@ -10,7 +10,9 @@ const app = Vue.createApp({
 		return {
 			stunden: [],
 			events: null,
-            calendarWeek: new CalendarDate(new Date("2024-06-06")),
+            calendarWeek: new CalendarDate(new Date("2024-05-07")),
+            reservierungenLoaded:false,
+            stundenplanLoaded:false,
         }
 	},
     computed:{
@@ -59,14 +61,16 @@ const app = Vue.createApp({
                     });
                     
                     this.events = res.data;
+                    this.stundenplanLoaded = true;
+                    console.log(this.events,"this are the events")
                 }
             });
 
-            this.$fhcApi.factory.stundenplan.getReservierungen('SEM_E0.04', this.weekFirstDay, this.weekLastDay).then(res => {
+           /*  this.$fhcApi.factory.stundenplan.getReservierungen('EDV_F4.26', this.weekFirstDay, this.weekLastDay).then(res => {
                 if (res.data && res.data.forEach) {
                     res.data.forEach((el, i) => {
                         el.reservierung = true;
-                        el.color = '#CCCCCC';
+                        el.color = '#' + (el.farbe || 'ffffff');
                         el.start = new Date(el.datum + ' ' + this.stunden[el.stunde].beginn);
                         el.end = new Date(el.datum + ' ' + this.stunden[el.stunde].ende);
                         el.title = el.titel;
@@ -77,29 +81,40 @@ const app = Vue.createApp({
                 }
 
                 let reservierungs_events = res.data;
+
+                // adding the last reservierung twice for testing purposes
+                let last_reservierung=Object.assign({}, reservierungs_events[reservierungs_events.length-1]);
+                last_reservierung.person_kurzbz="drSimml";
+                reservierungs_events.push(last_reservierung);
+
                 console.log(reservierungs_events, " this are the reserverungs event")
                 this.events = [...(this.events?this.events:[]),...reservierungs_events];
-                
-            });
+                this.reservierungenLoaded=true;
+                console.log(reservierungs_events,"this are the reservierungs events")
+            }); */
         });
 
 	},
     template: /*html*/`
     <div>
-        <fhc-calendar v-slot="{event}" :initialDate="currentDate" :events="events" initial-mode="week" show-weeks>
-            <div class="d-flex flex-column align-items-center justify-content-evenly h-100">
-                
-
-                <span>{{event.orig.reservierung? event.orig.title :event.orig.lv_info}}</span>	
-                <span v-if="event.orig.reservierung">{{event.orig.stg}}</span>
-                <span v-else v-for="(item, index) in event.orig.stg.split('/')" :key="index">{{item}}</span>
-                <span>{{event.orig.reservierung? event.orig.person_kurzbz : event.orig.lektor}}</span>
-             
-			</div>
+        <fhc-calendar v-if="stundenplanLoaded || reservierungenLoaded" v-slot="{event,day}" :initialDate="currentDate" :events="events" initial-mode="week" show-weeks>
+           
+           <template v-if="event.orig.eintrags_type != 'reservierungs_eintrag'">
+            <a class="text-decoration-none text-dark" href="#" :title="event.orig.title + ' - ' + event.orig.lehrfach_bez + ' [' + event.orig.ort_kurzbz+']'"   >    
+                <div class="d-flex flex-column align-items-center justify-content-evenly h-100" :style="{'background-color':event.orig.color}">
+                    <span>{{event.orig.reservierung? event.orig.title :event.orig.lv_info}}</span>	
+                    <span v-if="event.orig.reservierung">{{event.orig.stg}}</span>
+                    <span v-else v-for="(item, index) in event.orig.stg.split('/')" :key="index">{{item}}</span>
+                    <span>{{event.orig.reservierung? event.orig.person_kurzbz : event.orig.lektor}}</span>
+                </div>
+            </a>
+            </template>
+            <p v-else>this is a reservierung</p>
         </fhc-calendar>
     </div>
     `,
 });
 app.config.unwrapInjectedRef = true;
 app.use(FhcApi);
+app.use(Phrasen);
 app.mount('#content');
\ No newline at end of file
diff --git a/public/js/components/Calendar/Calendar.js b/public/js/components/Calendar/Calendar.js
index 4ce70911e..cef013ff5 100755
--- a/public/js/components/Calendar/Calendar.js
+++ b/public/js/components/Calendar/Calendar.js
@@ -148,9 +148,9 @@ export default {
 	template: `
 	<div ref="container" class="fhc-calendar card" :class="sizeClass">
 		<calendar-modal v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ref="calendarModal"  />
-		<component v-slot="{event}" :is="'calendar-' + mode" @update:mode="mode=$event" @change:range="$emit('change:range',$event)" @input="handleInput" >
+		<component v-slot="{event,day}" :is="'calendar-' + mode" @update:mode="mode=$event" @change:range="$emit('change:range',$event)" @input="handleInput" >
 			<!--Week Page layout-->
-			<slot :event="event">
+			<slot :event="event" :day="day">
 				<div class="d-flex flex-column align-items-center justify-content-evenly h-100">
 					<span>{{event.orig.title}}</span>	
 					<span>{{event.orig.ort_kurzbz}}</span>
diff --git a/public/js/components/Calendar/Week.js b/public/js/components/Calendar/Week.js
index b4ec09e52..a6389fe52 100755
--- a/public/js/components/Calendar/Week.js
+++ b/public/js/components/Calendar/Week.js
@@ -42,8 +42,8 @@ export default {
 	<div class="fhc-calendar-week">
 		<calendar-header :title="title" @prev="prev" @next="next" @click="$emit('update:mode', 'weeks')" />
 		<calendar-pane ref="pane" v-slot="slot" @slid="paneChanged">
-			<calendar-week-page v-slot="{event}" :year="focusDate.y" :week="focusDate.w+slot.offset" @update:mode="$emit('update:mode', $event)" @page:back="prev" @page:forward="next" @input="selectEvent" >
-				<slot :event="event" ></slot>
+			<calendar-week-page v-slot="{event,day}" :year="focusDate.y" :week="focusDate.w+slot.offset" @update:mode="$emit('update:mode', $event)" @page:back="prev" @page:forward="next" @input="selectEvent" >
+				<slot :event="event" :day="day" ></slot>
 			</calendar-week-page>
 		</calendar-pane>
 	</div>`
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index c6636ad43..db28e7028 100755
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -111,9 +111,10 @@ export default {
 						<div v-for="hour in hours" style="min-height:100px" :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
 					</div>
 					<div v-for="day in eventsPerDayAndHour" :key="day" class="day border-start" :style="{'grid-template-columns': 'repeat(' + day.lanes + ', 1fr)', 'grid-template-rows': 'repeat(' + (1440 / smallestTimeFrame) + ', 1fr)'}">
-						<a  href="#" :title="event.orig.title + ' - ' + event.orig.lehrfach_bez + ' [' + event.orig.ort_kurzbz+']'" v-for="event in day.events" :key="event" class="mx-2 border border-dark border-2 small rounded overflow-hidden text-decoration-none text-dark" :style="{'background-color': event.orig.farbe?'#'.concat(event.orig.farbe):'white','grid-column-start': 1+(event.lane-1)*day.lanes/event.maxLane, 'grid-column-end': 1+event.lane*day.lanes/event.maxLane, 'grid-row-start': dateToMinutesOfDay(event.start), 'grid-row-end': dateToMinutesOfDay(event.end) ,'--test': dateToMinutesOfDay(event.end)}" @click.prevent="$emit('input', event.orig)">
-							<slot :event="event" />
-						</a>
+						<div class="mx-2 border border-dark border-2 small rounded overflow-hidden "  @click.prevent="$emit('input', event.orig)" :style="{'grid-column-start': 1+(event.lane-1)*day.lanes/event.maxLane, 'grid-column-end': 1+event.lane*day.lanes/event.maxLane, 'grid-row-start': dateToMinutesOfDay(event.start), 'grid-row-end': dateToMinutesOfDay(event.end) ,'--test': dateToMinutesOfDay(event.end)}" v-for="event in day.events" :key="event">	
+							<slot :event="event" :day="day"></slot>
+						</div>
+						
 					</div>
 				</div>
 			</div>

From 0b8191a435fd976767a461b63331335152867c54 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 11 Jun 2024 16:26:52 +0200
Subject: [PATCH 0785/1461] Beschriftung zu IDs in Sancho Message hinzugefuegt

---
 application/controllers/jobs/AntragJob.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/controllers/jobs/AntragJob.php b/application/controllers/jobs/AntragJob.php
index 57230ed92..dbd0c5283 100644
--- a/application/controllers/jobs/AntragJob.php
+++ b/application/controllers/jobs/AntragJob.php
@@ -486,7 +486,7 @@ class AntragJob extends JOB_Controller
 						$person = current(getData($result));
 						$email = $studiengang->email;
 						$dataMail = array(
-							'prestudent' => $antrag->student_uid . ' / ' . $antrag->prestudent_id,
+							'prestudent' => 'UID: '$antrag->student_uid . ', PreStudentId' . $antrag->prestudent_id,
 							'studiensemester' => $antrag->studiensemester_kurzbz,
 							'name' => trim($person->vorname . ' '. $person->nachname),
 						);

From 6816a300f60c6b4be9d7897cf42857306d20c011 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 11 Jun 2024 16:39:20 +0200
Subject: [PATCH 0786/1461] Beschriftung korrigiert

---
 application/controllers/jobs/AntragJob.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/controllers/jobs/AntragJob.php b/application/controllers/jobs/AntragJob.php
index dbd0c5283..0bac8794f 100644
--- a/application/controllers/jobs/AntragJob.php
+++ b/application/controllers/jobs/AntragJob.php
@@ -486,7 +486,7 @@ class AntragJob extends JOB_Controller
 						$person = current(getData($result));
 						$email = $studiengang->email;
 						$dataMail = array(
-							'prestudent' => 'UID: '$antrag->student_uid . ', PreStudentId' . $antrag->prestudent_id,
+							'prestudent' => 'UID: ' . $antrag->student_uid . ', PreStudentId: ' . $antrag->prestudent_id,
 							'studiensemester' => $antrag->studiensemester_kurzbz,
 							'name' => trim($person->vorname . ' '. $person->nachname),
 						);

From d1afd9f09d7707f984c67f1322c2ce7273514308 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 12 Jun 2024 14:42:30 +0200
Subject: [PATCH 0787/1461] groups the uids of the reservierungen in the raum
 uebersicht and renders different template if the calender entry is a
 reservierung or a stundenplan event

---
 .../api/frontend/v1/Stundenplan.php           | 118 ++++++++++++------
 public/js/apps/Cis/RoomInformation.js         |  78 ++++++------
 public/js/components/Calendar/Calendar.js     |   8 +-
 public/js/components/Calendar/Week/Page.js    |   4 +-
 4 files changed, 122 insertions(+), 86 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 2bff6016f..80e4415b5 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -75,16 +75,10 @@ class Stundenplan extends FHCAPI_Controller
         $start_date = $this->input->get('start_date', TRUE);
         $end_date = $this->input->get('end_date', TRUE);
         
+        //return early if the get parameter are not present
         if(!$ort_kurzbz || !$start_date || !$end_date){
             $this->terminateWithError("Missing parameters", self::ERROR_TYPE_GENERAL);
         }
-
-        $this->addMeta("test_start_date",$start_date);
-
-        $this->addMeta("ort",$ort_kurzbz);
-        $this->addMeta("start date",$start_date);
-        $this->addMeta("end date",$end_date);
-        $this->addMeta("testKey","testValue");
         
         $this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
 		$this->load->model('ressource/Stunde_model', 'StundeModel');
@@ -99,7 +93,7 @@ class Stundenplan extends FHCAPI_Controller
      
 		$result = $this->StundenplanModel->getRoomDataOnDay($ort_kurzbz,$start_date,$end_date);
         // logging the result of the query
-        //$this->loglib->logErrorDB(print_r($result,true),"this is the result of the query");
+        $this->loglib->logErrorDB(print_r($result,true),"this is the result of the original stundenplan query");
             
 
 		if(isError($result)){
@@ -107,14 +101,9 @@ class Stundenplan extends FHCAPI_Controller
         }
 
         $result = hasData($result) ? getData($result) : [];
-        $this->loglib->logInfoDB(print_r($result,true),"result");
-        // set up the log library and configure the library to log to the db
+        $this->loglib->logInfoDB(print_r(count($result),true),"this is the count of the result");
         
 
-        /* foreach($result as $event){
-            $this->loglib->logInfoDB($event->datum,"NEW DATE");
-        } */
-
         //TODO: also implement the following algorithm to block the lectures that are together over different stunden
         /* $blockcontinue=false;
 						if (isset($blocked[$this->std_plan[$i][$j][$idx]->unr]) && $blocked[$this->std_plan[$i][$j][$idx]->unr]>0)
@@ -248,14 +237,12 @@ class Stundenplan extends FHCAPI_Controller
 
                                     //Lektoren
                                     if(!mb_strstr($stunden_event->lektor,$stunden_event_compare->lektor)){
-                                        $this->loglib->logErrorDB($stunden_event->datum ."-". $stunden_event->stunde,"entered lektor - first if");
                                         $stunden_events[$event_key]->lektor = $stunden_event->lektor . ' \ ' . $stunden_event_compare->lektor;
                                         $stunden_events[$event_key]->mitarbeiter_kurzbz = $stunden_event->mitarbeiter_kurzbz . ' \ ' . $stunden_event_compare->mitarbeiter_kurzbz;
                                     }
 
                                     //Ort
                                     if(!mb_strstr($stunden_event->ort_kurzbz,$stunden_event_compare->ort_kurzbz)){
-                                        $this->loglib->logErrorDB($stunden_event->datum ."-". $stunden_event->stunde,"entered ort - second if");
                                         $stunden_events[$event_key]->ort_kurzbz = $stunden_event->ort_kurzbz . ' \ ' . $stunden_event_compare->ort_kurzbz;
                                     }
 
@@ -265,8 +252,7 @@ class Stundenplan extends FHCAPI_Controller
 
                                     //Lehrverband
                                     if(!mb_strstr($lehrverband_array[$event_key],$lehrverband_array[$compare_key])){
-                                        $this->loglib->logErrorDB($stunden_event->datum ."-". $stunden_event->stunde,"entered gruppe - third if");
-                                        $lehrverband_array[$event_key] .= ' / ' . $lehrverband_array[$compare_key];
+                                         $lehrverband_array[$event_key] .= ' / ' . $lehrverband_array[$compare_key];
                                     }
 
                                 }
@@ -280,22 +266,9 @@ class Stundenplan extends FHCAPI_Controller
 
 
                 }
-                /* if (count($stunden_events) == 1){
-                    $final_events[] = current($stunden_events);
-                }else if(count($stunden_events) > 1){
-                    $gruppe = '';
-                    foreach($stunden_events as $stunden_event){
-                        $gruppe .= $stunden_event->gruppe . ',';
-                    }
-                    current($stunden_events)->gruppe = $gruppe;
-                    $final_events[] = current($stunden_events);
-                } */
-                //$this->loglib->logInfoDB(print_r($stunden_events,true),"date: " . $date . " - stunde:" .$stunde->stunde);
+               
             }
-            /* $this->loglib->logInfoDB(print_r($testStartDate,true),"startdate");
-            $this->loglib->logInfoDB($count,"count");
-            $this->loglib->logInfoDB(print_r($testEndDate,true),"enddate");
-            */
+           
             $testStartDate->modify('+1 day');
             $count++;
         }     
@@ -305,9 +278,7 @@ class Stundenplan extends FHCAPI_Controller
         $phpStartDate = new DateTime($start_date);
 
         //$phpStartDate->modify('+1 day');
-        $this->addMeta('result',$phpStartDate);
-       
-            error_log("test".print_r($result,true));
+        $this->loglib->logErrorDB(print_r($final_events,true),"this is the result of the stundenplan query");
         
 		//echo($this->db->last_query());
 		$this->terminateWithSuccess($final_events);
@@ -328,13 +299,84 @@ class Stundenplan extends FHCAPI_Controller
         }
 
 		$this->load->model('ressource/Reservierung_model', 'ReservierungModel');
-
+        $this->load->model('ressource/Mitarbeiter_model','MitarbeiterModel');
 		$result = $this->ReservierungModel->getRoomReservierungen($ort_kurzbz, $start_date, $end_date);
 
 		if (isError($result))
 			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+        $this->load->library('LogLib');
+        $this->loglib->logErrorDB(print_r(getData($result),true),"this is the result of the reservierungen query");
+		
+        $result = hasData($result) ? getData($result) : [];
 
-		$this->terminateWithSuccess(getData($result));
+        // fetching the stunden to do a loop over the days and the stunden
+        $this->load->model('ressource/Stunde_model', 'StundeModel');
+        $stunden = $this->StundeModel->load();
+        if(isError($stunden)){
+            $this->terminateWithError(getError($stunden), self::ERROR_TYPE_GENERAL);
+        }
+        $stunden = getData($stunden);
+
+        $testStartDate = new DateTime($start_date);
+        $testEndDate = new DateTime($end_date);
+        $count =0;
+        $final_events = array();
+        $grouped = array();
+
+        $final_reservierungen = array();
+
+        // loop over the days
+        while($testStartDate <= $testEndDate && $count <7){
+            
+            $date = $testStartDate->format('Y-m-d');
+
+            // filtering all the reservierungen with the date
+            $day_reservierungen = array_filter($result, function($result_entry) use ($date){
+                return $result_entry->datum == $date;
+            });
+
+            // loop over the stunden
+            foreach( $stunden as $stunde){
+                // filtering all the day reservierungen to the reservierungen that happen at the same hour of the day
+                $hour_reservierungen = array_filter($day_reservierungen, function($day_entry) use ($stunde){
+                    return $day_entry->stunde == $stunde->stunde;
+                });
+
+                // if there are no reservierungen within that hour than we skip that iteration of the loop
+                if(!count($hour_reservierungen)){
+                    continue;
+                }
+
+                // looping over the reservierungen that happen at the same day and at the same hour
+                
+                $grouped_uid = array();
+                foreach($hour_reservierungen as $grouping_reservierung){
+                    $grouped_uid[]= $grouping_reservierung->uid;
+                }
+
+                $final_reservierung = $hour_reservierungen[0];
+                
+                
+                $grouped_uid = array_map(function($uid){
+                    $res =$this->MitarbeiterModel->generateKurzbz($uid);
+                    $res = hasData($res)? getData($res): $uid;
+                    return $res;
+               },$grouped_uid);
+                $this->loglib->logErrorDB(print_r($grouped_uid,true),"this are the grouped uids");
+
+                $final_reservierung->person_kurzbz = implode(" / ",$grouped_uid);
+
+                $final_reservierungen[] = $final_reservierung;
+            }
+            
+            
+            $testStartDate->modify('+1 day');
+            ++$count;
+
+        }
+        $this->loglib->logErrorDB(print_r($final_reservierungen,true),"lalala");
+        
+        $this->terminateWithSuccess($final_reservierungen);
 	}
 
 }
diff --git a/public/js/apps/Cis/RoomInformation.js b/public/js/apps/Cis/RoomInformation.js
index e64348dd8..db15979da 100644
--- a/public/js/apps/Cis/RoomInformation.js
+++ b/public/js/apps/Cis/RoomInformation.js
@@ -10,9 +10,8 @@ const app = Vue.createApp({
 		return {
 			stunden: [],
 			events: null,
-            calendarWeek: new CalendarDate(new Date("2024-05-07")),
-            reservierungenLoaded:false,
-            stundenplanLoaded:false,
+            calendarWeek: new CalendarDate(new Date()),
+            events_loaded:false,
         }
 	},
     computed:{
@@ -46,7 +45,7 @@ const app = Vue.createApp({
 
 
            // old testing room EDV_A6.09
-            this.$fhcApi.factory.stundenplan.getRoomInfo('SEM_E0.04', this.weekFirstDay, this.weekLastDay).then(res =>{
+            this.$fhcApi.factory.stundenplan.getRoomInfo('EDV_F4.26', this.weekFirstDay, this.weekLastDay).then(res =>{
                 let events;
                 if (res.data && res.data.forEach) {
                     res.data.forEach((el, i) => {
@@ -61,55 +60,54 @@ const app = Vue.createApp({
                     });
                     
                     this.events = res.data;
-                    this.stundenplanLoaded = true;
-                    console.log(this.events,"this are the events")
                 }
+
+                this.$fhcApi.factory.stundenplan.getReservierungen('EDV_F4.26', this.weekFirstDay, this.weekLastDay).then(res => {
+                    if (res.data && res.data.forEach) {
+                        res.data.forEach((el, i) => {
+                            el.reservierung = true;
+                            el.color = '#' + (el.farbe || 'ffffff');
+                            el.start = new Date(el.datum + ' ' + this.stunden[el.stunde].beginn);
+                            el.end = new Date(el.datum + ' ' + this.stunden[el.stunde].ende);
+                            el.title = el.titel;
+                            if (el.lehrform)
+                                el.title += '-' + el.lehrform;
+                        });
+                        
+                    }
+    
+                    let reservierungs_events = res.data;
+                    console.log(reservierungs_events,"this are the reservierungs events that are getting from the db query")
+                    this.events = [...(this.events?this.events:[]),...reservierungs_events];
+                    this.events_loaded = true;
+                    
+                }); 
             });
 
-           /*  this.$fhcApi.factory.stundenplan.getReservierungen('EDV_F4.26', this.weekFirstDay, this.weekLastDay).then(res => {
-                if (res.data && res.data.forEach) {
-                    res.data.forEach((el, i) => {
-                        el.reservierung = true;
-                        el.color = '#' + (el.farbe || 'ffffff');
-                        el.start = new Date(el.datum + ' ' + this.stunden[el.stunde].beginn);
-                        el.end = new Date(el.datum + ' ' + this.stunden[el.stunde].ende);
-                        el.title = el.titel;
-                        if (el.lehrform)
-                            el.title += '-' + el.lehrform;
-                    });
-                    
-                }
-
-                let reservierungs_events = res.data;
-
-                // adding the last reservierung twice for testing purposes
-                let last_reservierung=Object.assign({}, reservierungs_events[reservierungs_events.length-1]);
-                last_reservierung.person_kurzbz="drSimml";
-                reservierungs_events.push(last_reservierung);
-
-                console.log(reservierungs_events, " this are the reserverungs event")
-                this.events = [...(this.events?this.events:[]),...reservierungs_events];
-                this.reservierungenLoaded=true;
-                console.log(reservierungs_events,"this are the reservierungs events")
-            }); */
+           
         });
 
 	},
     template: /*html*/`
     <div>
-        <fhc-calendar v-if="stundenplanLoaded || reservierungenLoaded" v-slot="{event,day}" :initialDate="currentDate" :events="events" initial-mode="week" show-weeks>
+        <fhc-calendar v-if="events_loaded" v-slot="{event,day}" :initialDate="currentDate" :events="events" initial-mode="week" show-weeks>
            
-           <template v-if="event.orig.eintrags_type != 'reservierungs_eintrag'">
             <a class="text-decoration-none text-dark" href="#" :title="event.orig.title + ' - ' + event.orig.lehrfach_bez + ' [' + event.orig.ort_kurzbz+']'"   >    
                 <div class="d-flex flex-column align-items-center justify-content-evenly h-100" :style="{'background-color':event.orig.color}">
-                    <span>{{event.orig.reservierung? event.orig.title :event.orig.lv_info}}</span>	
-                    <span v-if="event.orig.reservierung">{{event.orig.stg}}</span>
-                    <span v-else v-for="(item, index) in event.orig.stg.split('/')" :key="index">{{item}}</span>
-                    <span>{{event.orig.reservierung? event.orig.person_kurzbz : event.orig.lektor}}</span>
+                    <template v-if="event.orig.reservierung">    
+                        <!-- render content for reservierungen -->
+                        <span>{{event.orig.title}}</span>
+                        <span>{{event.orig.stg}}</span>
+                        <span v-for="(item, index) in event.orig.person_kurzbz.split('/')" :key="index">{{item}}</span>
+                    </template>
+                    <template v-else>
+                        <!-- render content for stundenplan -->
+                        <span>{{event.orig.lv_info}}</span>	
+                        <span v-for="(item, index) in event.orig.stg.split('/')" :key="index">{{item}}</span>
+                        <span >{{event.orig.lektor}}</span>
+                    </template>
                 </div>
             </a>
-            </template>
-            <p v-else>this is a reservierung</p>
         </fhc-calendar>
     </div>
     `,
diff --git a/public/js/components/Calendar/Calendar.js b/public/js/components/Calendar/Calendar.js
index cef013ff5..4fb4c821e 100755
--- a/public/js/components/Calendar/Calendar.js
+++ b/public/js/components/Calendar/Calendar.js
@@ -150,13 +150,7 @@ export default {
 		<calendar-modal v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ref="calendarModal"  />
 		<component v-slot="{event,day}" :is="'calendar-' + mode" @update:mode="mode=$event" @change:range="$emit('change:range',$event)" @input="handleInput" >
 			<!--Week Page layout-->
-			<slot :event="event" :day="day">
-				<div class="d-flex flex-column align-items-center justify-content-evenly h-100">
-					<span>{{event.orig.title}}</span>	
-					<span>{{event.orig.ort_kurzbz}}</span>
-					<span>{{event.orig.mitarbeiter_kurzbz}}</span>
-				</div>
-			</slot>
+			<slot :event="event" :day="day"></slot>
 		</component>
 	</div>`
 }
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index db28e7028..efaaff131 100755
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -112,7 +112,9 @@ export default {
 					</div>
 					<div v-for="day in eventsPerDayAndHour" :key="day" class="day border-start" :style="{'grid-template-columns': 'repeat(' + day.lanes + ', 1fr)', 'grid-template-rows': 'repeat(' + (1440 / smallestTimeFrame) + ', 1fr)'}">
 						<div class="mx-2 border border-dark border-2 small rounded overflow-hidden "  @click.prevent="$emit('input', event.orig)" :style="{'grid-column-start': 1+(event.lane-1)*day.lanes/event.maxLane, 'grid-column-end': 1+event.lane*day.lanes/event.maxLane, 'grid-row-start': dateToMinutesOfDay(event.start), 'grid-row-end': dateToMinutesOfDay(event.end) ,'--test': dateToMinutesOfDay(event.end)}" v-for="event in day.events" :key="event">	
-							<slot :event="event" :day="day"></slot>
+							<slot :event="event" :day="day">
+								<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
+							</slot>
 						</div>
 						
 					</div>

From eb327c3adc4a88aa10f8f7d0ff1baaa23d6ce8dd Mon Sep 17 00:00:00 2001
From: Werner Masik <werner@gefi.at>
Date: Wed, 12 Jun 2024 14:52:22 +0200
Subject: [PATCH 0788/1461] update Handyverwaltung filter

---
 system/filtersupdate.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/system/filtersupdate.php b/system/filtersupdate.php
index 73c316dc4..8687f5ddf 100644
--- a/system/filtersupdate.php
+++ b/system/filtersupdate.php
@@ -1317,13 +1317,18 @@ $filters = array(
 				{
 					"name": "MA Handyverwaltung",
 					"columns": [
+						{"name": "UID"},
 						{"name": "PersonId"},
 						{"name": "Vorname"},
 						{"name": "Nachname"},
-						{"name": "Alias"},
-						{"name": "Aktiv"},
-						{"name": "Raum"},
-						{"name": "Geschlecht"},
+						{"name": "EMail"}, 
+						{"name": "Unternehmen"}, 
+						{"name": "Vertragsart"}, 
+						{"name": "DV_von"}, 
+						{"name": "DV_bis"}, 
+						{"name": "Wochenstunden"}, 
+						{"name": "WS_von"}, 
+						{"name": "WS_bis"}, 
 						{"name": "Standardkostenstelle"}
 					],
 					"filters": [

From f469f7aea9477a78285c01e8c354c50de5198267 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 12 Jun 2024 15:06:43 +0200
Subject: [PATCH 0789/1461] Students Endpoint => fhcApi

---
 .../api/frontend/v1/stv/Students.php          | 717 ++++++++++++++++++
 public/js/api/stv.js                          |   2 +
 public/js/api/stv/students.js                 |  14 +
 .../js/components/Stv/Studentenverwaltung.js  |   8 +-
 .../Stv/Studentenverwaltung/List.js           |   8 +-
 .../Stv/Studentenverwaltung/Verband.js        |   2 +-
 public/js/plugin/FhcApi.js                    |   3 +
 7 files changed, 746 insertions(+), 8 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/stv/Students.php
 create mode 100644 public/js/api/stv/students.js

diff --git a/application/controllers/api/frontend/v1/stv/Students.php b/application/controllers/api/frontend/v1/stv/Students.php
new file mode 100644
index 000000000..cdd47bc6e
--- /dev/null
+++ b/application/controllers/api/frontend/v1/stv/Students.php
@@ -0,0 +1,717 @@
+<?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');
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the back-end
+ * Provides data to the ajax get calls about listing students
+ * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
+ */
+class Students extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		// TODO(chris): permissions
+		$permissions = [];
+		$router = load_class('Router');
+		$permissions[$router->method] = self::PERM_LOGGED;
+		parent::__construct($permissions);
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+	}
+
+	/**
+	 * Remap calls:
+	 * /													=> return []
+	 * /inout												=> return []
+	 * /inout/incoming										=> getIncoming
+	 * /inout/outgoing										=> getOutgoing
+	 * /inout/gemeinsamestudien								=> getGemeinsamestudien
+	 * /(studiengang_kz)									=> getStudents
+	 * /(studiengang_kz)/prestudent							=> getPrestudents
+	 * /(studiengang_kz)/prestudent/*						=> getPrestudents
+	 * /(studiengang_kz)/(semester)							=> getStudents
+	 * /(studiengang_kz)/(semester)/grp/(gruppe_kurzbz)		=> getStudents
+	 * /(studiengang_kz)/(semester)/(verband)				=> getStudents
+	 * /(studiengang_kz)/(semester)/(verband)/(gruppe)		=> getStudents
+	 * /(studiengang_kz)/(org_form)							=> getStudents
+	 * /(studiengang_kz)/(org_form)/prestudent				=> getPrestudents
+	 * /(studiengang_kz)/(org_form)/prestudent/*			=> getPrestudents
+	 * /(studiengang_kz)/(org_form)/(semester)				=> getStudents
+	 * /(studiengang_kz)/(org_form)/(semester)/grp/(gruppe_kurzbz)
+	 * 														=> getStudents
+	 * /(studiengang_kz)/(org_form)/(semester)/(verband)	=> getStudents
+	 * /(studiengang_kz)/(org_form)/(semester)/(verband)/(gruppe)
+	 * 														=> getStudents
+	 * /uid/(student_uid)									=> getStudent
+	 * /prestudent/(prestudent_id)							=> getPrestudent
+	 * /person/(person_id)									=> getPerson
+	 *
+	 * @param string		$method
+	 * @param array			$params				(optional)
+	 *
+	 * @return void
+	 */
+	public function _remap($method, $params = [])
+	{
+		if ($method == '' || $method == 'index')
+			return $this->terminateWithSuccess([]);
+
+		if ($method == 'inout') {
+			if (!count($params))
+				return $this->terminateWithSuccess([]);
+			switch ($params[0]) {
+				case 'incoming':
+					return $this->getIncoming();
+				case 'outgoing':
+					return $this->getOutgoing();
+				case 'gemeinsamestudien':
+					return $this->getGemeinsamestudien();
+				default:
+					return show_404();
+			}
+		}
+
+		$count = count($params);
+		if (!$count)
+			return $this->getStudents($method);
+
+		if ($method == 'uid' && $count == 1)
+			return $this->getStudent($params[0]);
+
+		if ($method == 'prestudent' && $count == 1)
+			return $this->getPrestudent($params[0]);
+
+		if ($method == 'person' && $count == 1)
+			return $this->getPerson($params[0]);
+
+		if (is_numeric($params[0])) {
+			$sem = $params[0];
+			if ($count == 3 && $params[1] == 'grp') {
+				$g = $params[2];
+				$ver = null;
+				$grp = null;
+			} else {
+				$g = null;
+				$ver = $count > 1 ? $params[1] : null;
+				$grp = $count > 2 ? $params[2] : null;
+			}
+			return $this->getStudents($method, $sem, $ver, $grp, $g);
+		} elseif ($params[0] == 'prestudent') {
+			if ($count == 1)
+				return $this->getPrestudents($method);
+			if ($count == 2)
+				return $this->getPrestudents($method, $params[1]);
+			return $this->getPrestudents($method, $params[1], $params[$count-1]);
+		} else {
+			$org = $params[0];
+			if ($count > 1 && $params[1] == 'prestudent') {
+				if ($count == 2)
+					return $this->getPrestudents(null, null, $org);
+				if ($count == 3)
+					return $this->getPrestudents($params[2], null, $org);
+				return $this->getPrestudents($params[2], $params[$count-1], $org);
+			}
+			$sem = $count > 1 ? $params[1] : null;
+			if ($count == 4 && $params[2] == 'grp') {
+				$g = $params[3];
+				$ver = null;
+				$grp = null;
+			} else {
+				$g = null;
+				$ver = $count > 2 ? $params[2] : null;
+				$grp = $count > 3 ? $params[3] : null;
+			}
+
+			return $this->getStudents($method, $sem, $ver, $grp, $g, $org);
+		}
+		
+		show_404();
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function getIncoming()
+	{
+		// TODO(chris): IMPLEMENT!
+		$this->terminateWithSuccess([]);
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function getOutgoing()
+	{
+		// TODO(chris): IMPLEMENT!
+		$this->terminateWithSuccess([]);
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function getGemeinsamestudien()
+	{
+		// TODO(chris): IMPLEMENT!
+		$this->terminateWithSuccess([]);
+	}
+
+	/**
+	 * @param integer		$studiengang_kz
+	 * @param string		$studiensemester_kurzbz			(optional)
+	 * @param string		$filter							(optional)
+	 * @param string		$orgform_kurzbz					(optional)
+	 *
+	 * @return void
+	 */
+	protected function getPrestudents($studiengang_kz, $studiensemester_kurzbz = null, $filter = null, $orgform_kurzbz = null)
+	{
+		// TODO(chris): @see: prestudent.class::loadInteressentenUndBewerber
+		// TODO(chris): IMPLEMENT!
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+		$stdsemEsc = $this->PrestudentModel->escape($studiensemester_kurzbz);
+		
+		$where = [];
+		if ($orgform_kurzbz) {
+			$where['ps.orgform_kurzbz'] = $orgform_kurzbz;
+		}
+
+		switch ($filter) {
+			case "interessenten":
+				$where['ps.status_kurzbz'] = 'Interessent';
+				break;
+			case "bewerbungnichtabgeschickt":
+				$where['ps.status_kurzbz'] = 'Interessent';
+				$where['bewerbung_abgeschicktamum'] = null;
+				break;
+			case "bewerbungabgeschickt":
+				$where['ps.status_kurzbz'] = 'Interessent';
+				$where['bewerbung_abgeschicktamum IS NOT'] = null;
+				$where['bestaetigtam'] = null;
+				break;
+			case "statusbestaetigt":
+				$where['ps.status_kurzbz'] = 'Interessent';
+				$where['bestaetigtam IS NOT'] = null;
+				break;
+			case "statusbestaetigtrtnichtangemeldet":
+				$where['ps.status_kurzbz'] = 'Interessent';
+				$where['bestaetigtam IS NOT'] = null;
+				$this->PrestudentModel->db->where('NOT EXISTS(SELECT 1 FROM public.tbl_rt_person JOIN public.tbl_reihungstest r ON (rt_id = reihungstest_id) WHERE person_id=p.person_id AND studienplan_id IN (SELECT studienplan_id FROM lehre.tbl_studienplan JOIN lehre.tbl_studienordnung o USING(studienordnung_id) WHERE o.studiengang_kz=tbl_prestudent.studiengang_kz) AND r.studiensemesterkurzbz=' . $stdsemEsc . ')', null, false);
+				break;
+			case "statusbestaetigtrtangemeldet":
+				$where['ps.status_kurzbz'] = 'Interessent';
+				$where['bestaetigtam IS NOT'] = null;
+				$this->PrestudentModel->db->where('EXISTS(SELECT 1 FROM public.tbl_rt_person JOIN public.tbl_reihungstest r ON (rt_id = reihungstest_id) WHERE person_id=p.person_id AND studienplan_id IN (SELECT studienplan_id FROM lehre.tbl_studienplan JOIN lehre.tbl_studienordnung o USING(studienordnung_id) WHERE o.studiengang_kz=tbl_prestudent.studiengang_kz) AND r.studiensemesterkurzbz=' . $stdsemEsc . ')', null, false);
+				break;
+			case "zgv":
+				$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+
+				$result = $this->StudiengangModel->load($studiengang_kz);
+
+				$stg = $this->getDataOrTerminateWithError($result);
+				if (!$stg)
+					$this->terminateWithValidationErrors(['' => 'Studiengang does not exist']); // TODO(chris): phrase
+				$stg = current($stg);
+
+				$where['ps.status_kurzbz'] = 'Interessent';
+				
+				if ($stg->typ == 'm') {
+					$where['zgvmas_code IS NOT'] = null;
+					if (defined('ZGV_ERFUELLT_ANZEIGEN') && ZGV_ERFUELLT_ANZEIGEN)
+						$where['zgvmas_erfuellt'] = true;
+				} elseif ($stg->typ == 'p') {
+					$where['zgvdoktor_code IS NOT'] = null;
+					if (defined('ZGV_DOKTOR_ANZEIGEN') && ZGV_DOKTOR_ANZEIGEN)
+						$where['zgvdoktor_erfuellt'] = true;
+				} else {
+					$where['zgv_code IS NOT'] = null;
+					if (defined('ZGV_ERFUELLT_ANZEIGEN') && ZGV_ERFUELLT_ANZEIGEN)
+						$where['zgv_erfuellt'] = true;
+				}
+				break;
+			case "reihungstestangemeldet":
+				$where['ps.status_kurzbz'] = 'Interessent';
+				$this->PrestudentModel->db->where('EXISTS(SELECT 1 FROM public.tbl_rt_person JOIN public.tbl_reihungstest r ON (rt_id = reihungstest_id) WHERE person_id=p.person_id AND studienplan_id IN (SELECT studienplan_id FROM lehre.tbl_studienplan JOIN lehre.tbl_studienordnung o USING(studienordnung_id) WHERE o.studiengang_kz=tbl_prestudent.studiengang_kz) AND r.studiensemesterkurzbz=' . $stdsemEsc . ')', null, false);
+				break;
+			case "reihungstestnichtangemeldet":
+				$where['ps.status_kurzbz'] = 'Interessent';
+				$this->PrestudentModel->db->where('NOT EXISTS(SELECT 1 FROM public.tbl_rt_person JOIN public.tbl_reihungstest r ON (rt_id = reihungstest_id) WHERE person_id=p.person_id AND studienplan_id IN (SELECT studienplan_id FROM lehre.tbl_studienplan JOIN lehre.tbl_studienordnung o USING(studienordnung_id) WHERE o.studiengang_kz=tbl_prestudent.studiengang_kz) AND r.studiensemesterkurzbz=' . $stdsemEsc . ')', null, false);
+				break;
+			case "bewerber":
+				$where['ps.status_kurzbz'] = 'Bewerber';
+				break;
+			case "aufgenommen":
+				$where['ps.status_kurzbz'] = 'Aufgenommener';
+				break;
+			case "warteliste":
+				$where['ps.status_kurzbz'] = 'Wartender';
+				break;
+			case "absage":
+				$where['ps.status_kurzbz'] = 'Abgewiesener';
+				break;
+			case "absolvent":
+				$where['ps.status_kurzbz'] = 'Absolvent';
+				break;
+			case "diplomand":
+				$where['ps.status_kurzbz'] = 'Diplomand';
+				break;
+			default:
+				if (!$studiensemester_kurzbz) {
+					// TODO(chris): should work ... needs testing
+					// we want all prestudents without status?
+					$where['ps.status_kurzbz'] = null;
+				} else {
+					$this->PrestudentModel->db->where_in('ps.status_kurzbz', [
+						'Interessent',
+						'Bewerber',
+						'Aufgenommener',
+						'Wartender',
+						'Abgewiesener'
+					]);
+				}
+				break;
+		}
+
+		$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
+		$this->PrestudentModel->addJoin('public.tbl_prestudentstatus ps', 'ps.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ') AND ps.prestudent_id=tbl_prestudent.prestudent_id AND ps.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ') AND ps.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ')', 'LEFT');
+		
+		$this->PrestudentModel->addSelect('p.person_id');
+		$this->PrestudentModel->addSelect('tbl_prestudent.prestudent_id');
+		$this->PrestudentModel->addSelect("'' AS uid");
+		$this->PrestudentModel->addSelect('titelpre');
+		$this->PrestudentModel->addSelect('titelpost');
+		$this->PrestudentModel->addSelect('vorname');
+		$this->PrestudentModel->addSelect('wahlname');
+		$this->PrestudentModel->addSelect('vornamen');
+		$this->PrestudentModel->addSelect('geschlecht');
+		$this->PrestudentModel->addSelect('nachname');
+		$this->PrestudentModel->addSelect('gebdatum');
+		$this->PrestudentModel->addSelect('tbl_prestudent.anmerkung');
+		$this->PrestudentModel->addSelect('ersatzkennzeichen');
+		$this->PrestudentModel->addSelect('svnr');
+		$this->PrestudentModel->addSelect("'' AS matrikelnr");
+		$this->PrestudentModel->addSelect('p.anmerkung AS anmerkungen');
+		$this->PrestudentModel->addSelect("'' AS semester");
+		$this->PrestudentModel->addSelect("'' AS verband");
+		$this->PrestudentModel->addSelect("'' AS gruppe");
+		$this->PrestudentModel->addSelect('tbl_prestudent.studiengang_kz');
+		$this->PrestudentModel->addSelect('aufmerksamdurch_kurzbz');
+		$this->PrestudentModel->addSelect('mentor');
+		$this->PrestudentModel->addSelect('FALSE AS bnaktiv', false);
+		$this->PrestudentModel->addSelect(
+			"(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung LIMIT 1) AS email_privat",
+			false
+		);
+		$this->PrestudentModel->addSelect(
+			"(SELECT rt_gesamtpunkte AS punkte FROM public.tbl_prestudent WHERE prestudent_id=ps.prestudent_id) AS punkte",
+			false
+		);
+		$this->PrestudentModel->addSelect('tbl_prestudent.dual');
+		$this->PrestudentModel->addSelect('tbl_prestudent.reihungstest_id');
+		$this->PrestudentModel->addSelect('tbl_prestudent.anmeldungreihungstest');
+		$this->PrestudentModel->addSelect('p.matr_nr');
+		$this->PrestudentModel->addSelect('tbl_prestudent.gsstudientyp_kurzbz');
+		$this->PrestudentModel->addSelect('tbl_prestudent.aufnahmegruppe_kurzbz');
+		$this->PrestudentModel->addSelect('tbl_prestudent.priorisierung');
+		$this->PrestudentModel->addSelect('p.zugangscode');
+		$this->PrestudentModel->addSelect('p.bpk');
+
+		$this->PrestudentModel->addOrder('nachname');
+		$this->PrestudentModel->addOrder('vorname');
+
+		$this->addFilter($studiensemester_kurzbz);
+
+		$result = $this->PrestudentModel->loadWhere($where);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	/**
+	 * @param integer		$studiengang_kz
+	 * @param integer		$semester						(optional)
+	 * @param string		$verband						(optional)
+	 * @param integer		$gruppe							(optional)
+	 * @param string		$gruppe_kurzbz					(optional)
+	 * @param string		$orgform_kurzbz					(optional)
+	 *
+	 * @return void
+	 */
+	protected function getStudents($studiengang_kz, $semester = null, $verband = null, $gruppe = null, $gruppe_kurzbz = null, $orgform_kurzbz = null)
+	{
+		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
+		
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+		$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
+		$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id');
+		$this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid');
+		$this->PrestudentModel->addJoin(
+			'public.tbl_studentlehrverband v',
+			'v.student_uid=s.student_uid AND v.studiensemester_kurzbz=' . $this->PrestudentModel->escape($studiensemester_kurzbz)
+		);
+
+		$this->PrestudentModel->addSelect('p.person_id');
+		$this->PrestudentModel->addSelect('s.prestudent_id');
+		$this->PrestudentModel->addSelect('b.uid');
+		$this->PrestudentModel->addSelect('titelpre');
+		$this->PrestudentModel->addSelect('titelpost');
+		$this->PrestudentModel->addSelect('vorname');
+		$this->PrestudentModel->addSelect('wahlname');
+		$this->PrestudentModel->addSelect('vornamen');
+		$this->PrestudentModel->addSelect('geschlecht');
+		$this->PrestudentModel->addSelect('nachname');
+		$this->PrestudentModel->addSelect('gebdatum');
+		$this->PrestudentModel->addSelect('tbl_prestudent.anmerkung');
+		$this->PrestudentModel->addSelect('ersatzkennzeichen');
+		$this->PrestudentModel->addSelect('svnr');
+		$this->PrestudentModel->addSelect('s.matrikelnr');
+		$this->PrestudentModel->addSelect('p.anmerkung AS anmerkungen');
+		$this->PrestudentModel->addSelect('v.semester');
+		$this->PrestudentModel->addSelect('v.verband');
+		$this->PrestudentModel->addSelect('v.gruppe');
+		$this->PrestudentModel->addSelect('tbl_prestudent.studiengang_kz');
+		$this->PrestudentModel->addSelect('aufmerksamdurch_kurzbz');
+		$this->PrestudentModel->addSelect('mentor');
+		$this->PrestudentModel->addSelect('b.aktiv AS bnaktiv');
+		$this->PrestudentModel->addSelect(
+			"(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung LIMIT 1) AS email_privat",
+			false
+		);
+		$this->PrestudentModel->addSelect(
+			"(SELECT rt_gesamtpunkte AS punkte FROM public.tbl_prestudent WHERE prestudent_id=s.prestudent_id) AS punkte",
+			false
+		);
+		$this->PrestudentModel->addSelect('tbl_prestudent.dual');
+		$this->PrestudentModel->addSelect('tbl_prestudent.reihungstest_id');
+		$this->PrestudentModel->addSelect('tbl_prestudent.anmeldungreihungstest');
+		$this->PrestudentModel->addSelect('p.matr_nr');
+		$this->PrestudentModel->addSelect('tbl_prestudent.gsstudientyp_kurzbz');
+		$this->PrestudentModel->addSelect('tbl_prestudent.aufnahmegruppe_kurzbz');
+		$this->PrestudentModel->addSelect('tbl_prestudent.priorisierung');
+		$this->PrestudentModel->addSelect('p.zugangscode');
+		$this->PrestudentModel->addSelect('p.bpk');
+
+		$this->PrestudentModel->addOrder('nachname');
+		$this->PrestudentModel->addOrder('vorname');
+
+
+		$where = [];
+
+		if ($gruppe_kurzbz !== null) {
+			$this->PrestudentModel->addJoin('public.tbl_benutzergruppe g', 'uid');
+			$where['g.gruppe_kurzbz'] = $gruppe_kurzbz;
+			$where['g.studiensemester_kurzbz'] = $studiensemester_kurzbz;
+		} else {
+			$where['v.studiengang_kz'] = $studiengang_kz;
+
+			if ($semester !== null)
+				$where['v.semester'] = $semester;
+
+			if ($verband !== null)
+				$where['v.verband'] = $verband;
+
+			if ($gruppe !== null)
+				$where['v.gruppe'] = $gruppe;
+	
+			if (!$verband && !$gruppe && $orgform_kurzbz !== null) {
+				$this->PrestudentModel->db->where(
+					"(
+						SELECT orgform_kurzbz 
+						FROM public.tbl_prestudentstatus 
+						WHERE prestudent_id=tbl_prestudent.prestudent_id 
+						AND studiensemester_kurzbz=" . $this->PrestudentModel->escape($studiensemester_kurzbz) . " 
+						ORDER BY datum DESC, insertamum DESC, ext_id DESC LIMIT 1
+					)",
+					$this->PrestudentModel->escape($orgform_kurzbz),
+					false
+				);
+			}
+
+		}
+
+		$this->addFilter($studiensemester_kurzbz);
+
+		$result = $this->PrestudentModel->loadWhere($where);
+		
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	/**
+	 * @param string		$prestudent_id
+	 *
+	 * @return void
+	 */
+	protected function getPrestudent($prestudent_id)
+	{
+		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
+
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+		$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
+		$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id', 'LEFT');
+		$this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid', 'LEFT');
+		$this->PrestudentModel->addJoin(
+			'public.tbl_studentlehrverband v',
+			'v.student_uid=s.student_uid AND v.studiensemester_kurzbz=' . $this->PrestudentModel->escape($studiensemester_kurzbz),
+			'LEFT'
+		);
+
+		$this->PrestudentModel->addSelect('p.person_id');
+		$this->PrestudentModel->addSelect('tbl_prestudent.prestudent_id');
+		$this->PrestudentModel->addSelect('b.uid');
+		$this->PrestudentModel->addSelect('titelpre');
+		$this->PrestudentModel->addSelect('titelpost');
+		$this->PrestudentModel->addSelect('vorname');
+		$this->PrestudentModel->addSelect('wahlname');
+		$this->PrestudentModel->addSelect('vornamen');
+		$this->PrestudentModel->addSelect('geschlecht');
+		$this->PrestudentModel->addSelect('nachname');
+		$this->PrestudentModel->addSelect('gebdatum');
+		$this->PrestudentModel->addSelect('tbl_prestudent.anmerkung');
+		$this->PrestudentModel->addSelect('ersatzkennzeichen');
+		$this->PrestudentModel->addSelect('svnr');
+		$this->PrestudentModel->addSelect('s.matrikelnr');
+		$this->PrestudentModel->addSelect('p.anmerkung AS anmerkungen');
+		$this->PrestudentModel->addSelect('v.semester');
+		$this->PrestudentModel->addSelect('v.verband');
+		$this->PrestudentModel->addSelect('v.gruppe');
+		$this->PrestudentModel->addSelect('tbl_prestudent.studiengang_kz');
+		$this->PrestudentModel->addSelect('aufmerksamdurch_kurzbz');
+		$this->PrestudentModel->addSelect('mentor');
+		$this->PrestudentModel->addSelect('b.aktiv AS bnaktiv');
+		$this->PrestudentModel->addSelect(
+			"(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung LIMIT 1) AS email_privat",
+			false
+		);
+		$this->PrestudentModel->addSelect(
+			"(SELECT rt_gesamtpunkte AS punkte FROM public.tbl_prestudent WHERE prestudent_id=s.prestudent_id) AS punkte",
+			false
+		);
+		$this->PrestudentModel->addSelect('tbl_prestudent.dual');
+		$this->PrestudentModel->addSelect('tbl_prestudent.reihungstest_id');
+		$this->PrestudentModel->addSelect('tbl_prestudent.anmeldungreihungstest');
+		$this->PrestudentModel->addSelect('p.matr_nr');
+		$this->PrestudentModel->addSelect('tbl_prestudent.gsstudientyp_kurzbz');
+		$this->PrestudentModel->addSelect('tbl_prestudent.aufnahmegruppe_kurzbz');
+		$this->PrestudentModel->addSelect('tbl_prestudent.priorisierung');
+		$this->PrestudentModel->addSelect('p.zugangscode');
+		$this->PrestudentModel->addSelect('p.bpk');
+
+		$this->addFilter($studiensemester_kurzbz);
+
+		$result = $this->PrestudentModel->loadWhere([
+			'tbl_prestudent.prestudent_id' => $prestudent_id
+		]);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	/**
+	 * @param string		$student_uid
+	 *
+	 * @return void
+	 */
+	protected function getStudent($student_uid)
+	{
+		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
+
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+		$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
+		$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id');
+		$this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid');
+		$this->PrestudentModel->addJoin(
+			'public.tbl_studentlehrverband v',
+			'v.student_uid=s.student_uid AND v.studiensemester_kurzbz=' . $this->PrestudentModel->escape($studiensemester_kurzbz),
+			'LEFT'
+		);
+
+		$this->PrestudentModel->addSelect('p.person_id');
+		$this->PrestudentModel->addSelect('s.prestudent_id');
+		$this->PrestudentModel->addSelect('b.uid');
+		$this->PrestudentModel->addSelect('titelpre');
+		$this->PrestudentModel->addSelect('titelpost');
+		$this->PrestudentModel->addSelect('vorname');
+		$this->PrestudentModel->addSelect('wahlname');
+		$this->PrestudentModel->addSelect('vornamen');
+		$this->PrestudentModel->addSelect('geschlecht');
+		$this->PrestudentModel->addSelect('nachname');
+		$this->PrestudentModel->addSelect('gebdatum');
+		$this->PrestudentModel->addSelect('tbl_prestudent.anmerkung');
+		$this->PrestudentModel->addSelect('ersatzkennzeichen');
+		$this->PrestudentModel->addSelect('svnr');
+		$this->PrestudentModel->addSelect('s.matrikelnr');
+		$this->PrestudentModel->addSelect('p.anmerkung AS anmerkungen');
+		$this->PrestudentModel->addSelect('v.semester');
+		$this->PrestudentModel->addSelect('v.verband');
+		$this->PrestudentModel->addSelect('v.gruppe');
+		$this->PrestudentModel->addSelect('tbl_prestudent.studiengang_kz');
+		$this->PrestudentModel->addSelect('aufmerksamdurch_kurzbz');
+		$this->PrestudentModel->addSelect('mentor');
+		$this->PrestudentModel->addSelect('b.aktiv AS bnaktiv');
+		$this->PrestudentModel->addSelect(
+			"(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung LIMIT 1) AS email_privat",
+			false
+		);
+		$this->PrestudentModel->addSelect(
+			"(SELECT rt_gesamtpunkte AS punkte FROM public.tbl_prestudent WHERE prestudent_id=s.prestudent_id) AS punkte",
+			false
+		);
+		$this->PrestudentModel->addSelect('tbl_prestudent.dual');
+		$this->PrestudentModel->addSelect('tbl_prestudent.reihungstest_id');
+		$this->PrestudentModel->addSelect('tbl_prestudent.anmeldungreihungstest');
+		$this->PrestudentModel->addSelect('p.matr_nr');
+		$this->PrestudentModel->addSelect('tbl_prestudent.gsstudientyp_kurzbz');
+		$this->PrestudentModel->addSelect('tbl_prestudent.aufnahmegruppe_kurzbz');
+		$this->PrestudentModel->addSelect('tbl_prestudent.priorisierung');
+		$this->PrestudentModel->addSelect('p.zugangscode');
+		$this->PrestudentModel->addSelect('p.bpk');
+
+		$this->addFilter($studiensemester_kurzbz);
+
+		$result = $this->PrestudentModel->loadWhere([
+			's.student_uid' => $student_uid
+		]);
+		
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	/**
+	 * @param integer		$person_id
+	 *
+	 * @return void
+	 */
+	protected function getPerson($person_id)
+	{
+		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
+
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+		$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
+		$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id');
+		$this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid');
+		$this->PrestudentModel->addJoin(
+			'public.tbl_studentlehrverband v',
+			'v.student_uid=s.student_uid AND v.studiensemester_kurzbz=' . $this->PrestudentModel->escape($studiensemester_kurzbz),
+			'LEFT'
+		);
+
+		$this->PrestudentModel->addSelect('p.person_id');
+		$this->PrestudentModel->addSelect('s.prestudent_id');
+		$this->PrestudentModel->addSelect('b.uid');
+		$this->PrestudentModel->addSelect('titelpre');
+		$this->PrestudentModel->addSelect('titelpost');
+		$this->PrestudentModel->addSelect('vorname');
+		$this->PrestudentModel->addSelect('wahlname');
+		$this->PrestudentModel->addSelect('vornamen');
+		$this->PrestudentModel->addSelect('geschlecht');
+		$this->PrestudentModel->addSelect('nachname');
+		$this->PrestudentModel->addSelect('gebdatum');
+		$this->PrestudentModel->addSelect('tbl_prestudent.anmerkung');
+		$this->PrestudentModel->addSelect('ersatzkennzeichen');
+		$this->PrestudentModel->addSelect('svnr');
+		$this->PrestudentModel->addSelect('s.matrikelnr');
+		$this->PrestudentModel->addSelect('p.anmerkung AS anmerkungen');
+		$this->PrestudentModel->addSelect('v.semester');
+		$this->PrestudentModel->addSelect('v.verband');
+		$this->PrestudentModel->addSelect('v.gruppe');
+		$this->PrestudentModel->addSelect('tbl_prestudent.studiengang_kz');
+		$this->PrestudentModel->addSelect('aufmerksamdurch_kurzbz');
+		$this->PrestudentModel->addSelect('mentor');
+		$this->PrestudentModel->addSelect('b.aktiv AS bnaktiv');
+		$this->PrestudentModel->addSelect(
+			"(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung LIMIT 1) AS email_privat",
+			false
+		);
+		$this->PrestudentModel->addSelect(
+			"(SELECT rt_gesamtpunkte AS punkte FROM public.tbl_prestudent WHERE prestudent_id=s.prestudent_id) AS punkte",
+			false
+		);
+		$this->PrestudentModel->addSelect('tbl_prestudent.dual');
+		$this->PrestudentModel->addSelect('tbl_prestudent.reihungstest_id');
+		$this->PrestudentModel->addSelect('tbl_prestudent.anmeldungreihungstest');
+		$this->PrestudentModel->addSelect('p.matr_nr');
+		$this->PrestudentModel->addSelect('tbl_prestudent.gsstudientyp_kurzbz');
+		$this->PrestudentModel->addSelect('tbl_prestudent.aufnahmegruppe_kurzbz');
+		$this->PrestudentModel->addSelect('tbl_prestudent.priorisierung');
+		$this->PrestudentModel->addSelect('p.zugangscode');
+		$this->PrestudentModel->addSelect('p.bpk');
+
+		$this->addFilter($studiensemester_kurzbz);
+
+		$result = $this->PrestudentModel->loadWhere([
+			'p.person_id' => $person_id
+		]);
+		
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	/**
+	 * Adds additional filters to the query
+	 *
+	 * @param string		$studiensemester_kurzbz
+	 *
+	 * @return void
+	 */
+	protected function addFilter($studiensemester_kurzbz)
+	{
+		$filter = $this->input->get('filter');
+		if (isset($filter['konto_count_0'])) {
+			$bt = $this->PrestudentModel->escape($filter['konto_count_0']);
+			$stdsem = $this->PrestudentModel->escape($studiensemester_kurzbz);
+
+			$this->PrestudentModel->db->where('(
+				SELECT count(*) 
+				FROM public.tbl_konto 
+				WHERE person_id=tbl_prestudent.person_id 
+				AND buchungstyp_kurzbz=' . $bt . ' 
+				AND studiensemester_kurzbz=' . $stdsem . '
+			) =', 0);
+			$this->PrestudentModel->db->where('get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) !=', 'Incoming');
+		}
+		if (isset($filter['konto_missing_counter'])) {
+			$bt = $this->PrestudentModel->escape($filter['konto_missing_counter']);
+			$stg = '';
+			if ($this->variablelib->getVar('kontofilterstg') == 'true')
+				$stg = ' AND studiengang_kz=tbl_prestudent.studiengang_kz';
+
+			$bt = $bt == 'alle' ? '' : ' AND buchungstyp_kurzbz=' . $bt;
+
+			$this->PrestudentModel->db->where('(
+				SELECT sum(betrag) 
+				FROM public.tbl_konto 
+				WHERE person_id=tbl_prestudent.person_id' .
+				$bt .
+				$stg . '
+			) !=', 0);
+		}
+	}
+}
diff --git a/public/js/api/stv.js b/public/js/api/stv.js
index 734a22649..14fcc6661 100644
--- a/public/js/api/stv.js
+++ b/public/js/api/stv.js
@@ -1,9 +1,11 @@
 import verband from './stv/verband.js';
+import students from './stv/students.js';
 import filter from './stv/filter.js';
 import konto from './stv/konto.js';
 
 export default {
 	verband,
+	students,
 	filter,
 	konto,
 	configStudent() {
diff --git a/public/js/api/stv/students.js b/public/js/api/stv/students.js
new file mode 100644
index 000000000..797a13bb3
--- /dev/null
+++ b/public/js/api/stv/students.js
@@ -0,0 +1,14 @@
+export default {
+	uid(uid) {
+		return this.$fhcApi.getUri('api/frontend/v1/stv/students/uid/' + uid);
+	},
+	prestudent(prestudent_id) {
+		return this.$fhcApi.getUri('api/frontend/v1/stv/students/prestudent/' + prestudent_id);
+	},
+	person(person_id) {
+		return this.$fhcApi.getUri('api/frontend/v1/stv/students/person/' + person_id);
+	},
+	verband(relative_path) {
+		return this.$fhcApi.getUri('api/frontend/v1/stv/students/' + relative_path);
+	}
+}
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 5b4b117c5..80c24fed4 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -105,7 +105,7 @@ export default {
 	methods: {
 		onSelectVerband({link, studiengang_kz}) {
 			this.studiengangKz = studiengang_kz;
-			this.$refs.stvList.updateUrl(link);
+			this.$refs.stvList.updateUrl(this.$fhcApi.factory.stv.students.verband(link));
 		},
 		studiensemesterChanged(v) {
 			this.studiensemesterKurzbz = v;
@@ -169,11 +169,11 @@ export default {
 	},
 	mounted() {
 		if (this.$route.params.id) {
-			this.$refs.stvList.updateUrl('components/stv/students/uid/' + this.$route.params.id, true);
+			this.$refs.stvList.updateUrl(this.$fhcApi.factory.stv.students.uid(this.$route.params.id), true);
 		} else if (this.$route.params.prestudent_id) {
-			this.$refs.stvList.updateUrl('components/stv/students/prestudent/' + this.$route.params.prestudent_id, true);
+			this.$refs.stvList.updateUrl(this.$fhcApi.factory.stv.students.prestudent(this.$route.params.prestudent_id), true);
 		} else if (this.$route.params.person_id) {
-			this.$refs.stvList.updateUrl('components/stv/students/person/' + this.$route.params.person_id, true);
+			this.$refs.stvList.updateUrl(this.$fhcApi.factory.stv.students.person(this.$route.params.person_id), true);
 		}
 
 	},
diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index 213da6a10..909f8d060 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -64,6 +64,11 @@ export default {
 					{title:"GeburtsdatumISO", field:"geburtsdatum_iso", visible:false},
 				],
 
+				ajaxResponse: (url, params, response) => {
+					console.log(url, params, response);
+					return response.data;
+				},
+
 				layout: 'fitDataStretch',
 				layoutColumnsOnNewData: false,
 				height: '100%',
@@ -120,9 +125,6 @@ export default {
 		updateUrl(url, first) {
 			this.lastSelected = first ? undefined : this.selected;
 
-			if (url)
-				url = CoreRESTClient._generateRouterURI(url);
-
 			const params = {}, filter = {};
 			if (this.filterKontoCount0)
 				filter.konto_count_0 = this.filterKontoCount0;
diff --git a/public/js/components/Stv/Studentenverwaltung/Verband.js b/public/js/components/Stv/Studentenverwaltung/Verband.js
index eb467b6bb..d138c9632 100644
--- a/public/js/components/Stv/Studentenverwaltung/Verband.js
+++ b/public/js/components/Stv/Studentenverwaltung/Verband.js
@@ -83,7 +83,7 @@ export default {
 		},
 		onSelectTreeNode(node) {
 			if (node.data.link)
-				this.$emit('selectVerband', {link: 'components/stv/students/' + node.data.link, studiengang_kz: node.data.stg_kz});
+				this.$emit('selectVerband', {link: node.data.link, studiengang_kz: node.data.stg_kz});
 		},
 		mapResultToTreeData(el) {
 			const cp = {
diff --git a/public/js/plugin/FhcApi.js b/public/js/plugin/FhcApi.js
index d85ae8939..7be1a5b9f 100644
--- a/public/js/plugin/FhcApi.js
+++ b/public/js/plugin/FhcApi.js
@@ -137,6 +137,9 @@ export default {
 		});
 
 		app.config.globalProperties.$fhcApi = {
+			getUri(url) {
+				return fhcApiAxios.getUri({url});
+			},
 			get(form, uri, params, config) {
 				[uri, params, config] = _get_config(form, uri, params, config);
 				if (params) {

From ad440e12b56d1ec3a087e8c21d45f28350aed14b Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 12 Jun 2024 15:22:39 +0200
Subject: [PATCH 0790/1461] remove console.log

---
 public/js/components/Stv/Studentenverwaltung/List.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index 909f8d060..24e2571a3 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -64,10 +64,7 @@ export default {
 					{title:"GeburtsdatumISO", field:"geburtsdatum_iso", visible:false},
 				],
 
-				ajaxResponse: (url, params, response) => {
-					console.log(url, params, response);
-					return response.data;
-				},
+				ajaxResponse: (url, params, response) => response.data,
 
 				layout: 'fitDataStretch',
 				layoutColumnsOnNewData: false,

From 2f65e6a80116ee4b1ed0cfc225fa27a5574b3007 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 12 Jun 2024 15:35:42 +0200
Subject: [PATCH 0791/1461] Bugfixes

---
 .../api/frontend/v1/stv/Students.php          | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Students.php b/application/controllers/api/frontend/v1/stv/Students.php
index cdd47bc6e..697f44e31 100644
--- a/application/controllers/api/frontend/v1/stv/Students.php
+++ b/application/controllers/api/frontend/v1/stv/Students.php
@@ -204,22 +204,22 @@ class Students extends FHCAPI_Controller
 				break;
 			case "bewerbungabgeschickt":
 				$where['ps.status_kurzbz'] = 'Interessent';
-				$where['bewerbung_abgeschicktamum IS NOT'] = null;
+				$where['bewerbung_abgeschicktamum IS NOT NULL'] = null;
 				$where['bestaetigtam'] = null;
 				break;
 			case "statusbestaetigt":
 				$where['ps.status_kurzbz'] = 'Interessent';
-				$where['bestaetigtam IS NOT'] = null;
+				$where['bestaetigtam IS NOT NULL'] = null;
 				break;
 			case "statusbestaetigtrtnichtangemeldet":
 				$where['ps.status_kurzbz'] = 'Interessent';
-				$where['bestaetigtam IS NOT'] = null;
-				$this->PrestudentModel->db->where('NOT EXISTS(SELECT 1 FROM public.tbl_rt_person JOIN public.tbl_reihungstest r ON (rt_id = reihungstest_id) WHERE person_id=p.person_id AND studienplan_id IN (SELECT studienplan_id FROM lehre.tbl_studienplan JOIN lehre.tbl_studienordnung o USING(studienordnung_id) WHERE o.studiengang_kz=tbl_prestudent.studiengang_kz) AND r.studiensemesterkurzbz=' . $stdsemEsc . ')', null, false);
+				$where['bestaetigtam IS NOT NULL'] = null;
+				$this->PrestudentModel->db->where('NOT EXISTS(SELECT 1 FROM public.tbl_rt_person JOIN public.tbl_reihungstest r ON (rt_id = reihungstest_id) WHERE person_id=p.person_id AND studienplan_id IN (SELECT studienplan_id FROM lehre.tbl_studienplan JOIN lehre.tbl_studienordnung o USING(studienordnung_id) WHERE o.studiengang_kz=tbl_prestudent.studiengang_kz) AND r.studiensemester_kurzbz=' . $stdsemEsc . ')', null, false);
 				break;
 			case "statusbestaetigtrtangemeldet":
 				$where['ps.status_kurzbz'] = 'Interessent';
-				$where['bestaetigtam IS NOT'] = null;
-				$this->PrestudentModel->db->where('EXISTS(SELECT 1 FROM public.tbl_rt_person JOIN public.tbl_reihungstest r ON (rt_id = reihungstest_id) WHERE person_id=p.person_id AND studienplan_id IN (SELECT studienplan_id FROM lehre.tbl_studienplan JOIN lehre.tbl_studienordnung o USING(studienordnung_id) WHERE o.studiengang_kz=tbl_prestudent.studiengang_kz) AND r.studiensemesterkurzbz=' . $stdsemEsc . ')', null, false);
+				$where['bestaetigtam IS NOT NULL'] = null;
+				$this->PrestudentModel->db->where('EXISTS(SELECT 1 FROM public.tbl_rt_person JOIN public.tbl_reihungstest r ON (rt_id = reihungstest_id) WHERE person_id=p.person_id AND studienplan_id IN (SELECT studienplan_id FROM lehre.tbl_studienplan JOIN lehre.tbl_studienordnung o USING(studienordnung_id) WHERE o.studiengang_kz=tbl_prestudent.studiengang_kz) AND r.studiensemester_kurzbz=' . $stdsemEsc . ')', null, false);
 				break;
 			case "zgv":
 				$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
@@ -234,26 +234,26 @@ class Students extends FHCAPI_Controller
 				$where['ps.status_kurzbz'] = 'Interessent';
 				
 				if ($stg->typ == 'm') {
-					$where['zgvmas_code IS NOT'] = null;
+					$where['zgvmas_code IS NOT NULL'] = null;
 					if (defined('ZGV_ERFUELLT_ANZEIGEN') && ZGV_ERFUELLT_ANZEIGEN)
 						$where['zgvmas_erfuellt'] = true;
 				} elseif ($stg->typ == 'p') {
-					$where['zgvdoktor_code IS NOT'] = null;
+					$where['zgvdoktor_code IS NOT NULL'] = null;
 					if (defined('ZGV_DOKTOR_ANZEIGEN') && ZGV_DOKTOR_ANZEIGEN)
 						$where['zgvdoktor_erfuellt'] = true;
 				} else {
-					$where['zgv_code IS NOT'] = null;
+					$where['zgv_code IS NOT NULL'] = null;
 					if (defined('ZGV_ERFUELLT_ANZEIGEN') && ZGV_ERFUELLT_ANZEIGEN)
 						$where['zgv_erfuellt'] = true;
 				}
 				break;
 			case "reihungstestangemeldet":
 				$where['ps.status_kurzbz'] = 'Interessent';
-				$this->PrestudentModel->db->where('EXISTS(SELECT 1 FROM public.tbl_rt_person JOIN public.tbl_reihungstest r ON (rt_id = reihungstest_id) WHERE person_id=p.person_id AND studienplan_id IN (SELECT studienplan_id FROM lehre.tbl_studienplan JOIN lehre.tbl_studienordnung o USING(studienordnung_id) WHERE o.studiengang_kz=tbl_prestudent.studiengang_kz) AND r.studiensemesterkurzbz=' . $stdsemEsc . ')', null, false);
+				$this->PrestudentModel->db->where('EXISTS(SELECT 1 FROM public.tbl_rt_person JOIN public.tbl_reihungstest r ON (rt_id = reihungstest_id) WHERE person_id=p.person_id AND studienplan_id IN (SELECT studienplan_id FROM lehre.tbl_studienplan JOIN lehre.tbl_studienordnung o USING(studienordnung_id) WHERE o.studiengang_kz=tbl_prestudent.studiengang_kz) AND r.studiensemester_kurzbz=' . $stdsemEsc . ')', null, false);
 				break;
 			case "reihungstestnichtangemeldet":
 				$where['ps.status_kurzbz'] = 'Interessent';
-				$this->PrestudentModel->db->where('NOT EXISTS(SELECT 1 FROM public.tbl_rt_person JOIN public.tbl_reihungstest r ON (rt_id = reihungstest_id) WHERE person_id=p.person_id AND studienplan_id IN (SELECT studienplan_id FROM lehre.tbl_studienplan JOIN lehre.tbl_studienordnung o USING(studienordnung_id) WHERE o.studiengang_kz=tbl_prestudent.studiengang_kz) AND r.studiensemesterkurzbz=' . $stdsemEsc . ')', null, false);
+				$this->PrestudentModel->db->where('NOT EXISTS(SELECT 1 FROM public.tbl_rt_person JOIN public.tbl_reihungstest r ON (rt_id = reihungstest_id) WHERE person_id=p.person_id AND studienplan_id IN (SELECT studienplan_id FROM lehre.tbl_studienplan JOIN lehre.tbl_studienordnung o USING(studienordnung_id) WHERE o.studiengang_kz=tbl_prestudent.studiengang_kz) AND r.studiensemester_kurzbz=' . $stdsemEsc . ')', null, false);
 				break;
 			case "bewerber":
 				$where['ps.status_kurzbz'] = 'Bewerber';

From ee2c937cbfc9f34a8fe77859f3e88e44568d911c Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 12 Jun 2024 15:36:03 +0200
Subject: [PATCH 0792/1461] Highlight selected Verband

---
 public/js/components/Stv/Studentenverwaltung/Verband.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/public/js/components/Stv/Studentenverwaltung/Verband.js b/public/js/components/Stv/Studentenverwaltung/Verband.js
index d138c9632..d3562b5da 100644
--- a/public/js/components/Stv/Studentenverwaltung/Verband.js
+++ b/public/js/components/Stv/Studentenverwaltung/Verband.js
@@ -19,6 +19,7 @@ export default {
 		return {
 			loading: true,
 			nodes: [],
+			selectedKey: [],
 			filters: {}, // TODO(chris): filter only 1st level?
 			favnodes: [],
 			favorites: {on: false, list: []}
@@ -212,6 +213,7 @@ export default {
 			:value="filteredNodes"
 			@node-expand="onExpandTreeNode"
 			selection-mode="single"
+			v-model:selection-keys="selectedKey"
 			@node-select="onSelectTreeNode"
 			scrollable
 			scroll-height="flex"

From 182e3700862cf0b03010d33d6c0659cd357c7c99 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 12 Jun 2024 15:58:34 +0200
Subject: [PATCH 0793/1461] Bugfix: Integer cast

---
 application/controllers/api/frontend/v1/stv/Verband.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/controllers/api/frontend/v1/stv/Verband.php b/application/controllers/api/frontend/v1/stv/Verband.php
index 9abf99a32..109fc9e3a 100644
--- a/application/controllers/api/frontend/v1/stv/Verband.php
+++ b/application/controllers/api/frontend/v1/stv/Verband.php
@@ -261,7 +261,7 @@ class Verband extends FHCAPI_Controller
 		$this->StudiengangModel->addSelect("CASE WHEN MAX(gruppe)='' OR MAX(gruppe)=' ' THEN TRUE ELSE FALSE END AS leaf");
 
 		$this->StudiengangModel->addSelect('verband');
-		$this->StudiengangModel->addSelect($this->StudiengangModel->escape($studiengang_kz) . ' AS stg_kz', false);
+		$this->StudiengangModel->addSelect($this->StudiengangModel->escape($studiengang_kz) . '::integer AS stg_kz', false);
 		
 		$this->StudiengangModel->addOrder('verband');
 

From de4accab83ed1d252f32bda20ab61d9a9e3d3133 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 13 Jun 2024 12:27:09 +0200
Subject: [PATCH 0794/1461] cleans up the Stundenplan grouping algorithm

---
 .../api/frontend/v1/Stundenplan.php           | 260 +++++++-----------
 1 file changed, 99 insertions(+), 161 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 80e4415b5..222d472d6 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -68,8 +68,10 @@ class Stundenplan extends FHCAPI_Controller
 	 */
 	public function roomInformation()
 	{
+       
+        $this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+		$this->load->model('ressource/Stunde_model', 'StundeModel');
 
-        //TODO please split this algorithm into multiple smaller function it is not really mantainable like this
         // storing the get parameter in local variables
         $ort_kurzbz = $this->input->get('ort_kurzbz', TRUE);
         $start_date = $this->input->get('start_date', TRUE);
@@ -80,21 +82,15 @@ class Stundenplan extends FHCAPI_Controller
             $this->terminateWithError("Missing parameters", self::ERROR_TYPE_GENERAL);
         }
         
-        $this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
-		$this->load->model('ressource/Stunde_model', 'StundeModel');
+		// querying the stunden
+        $stunden = $this->StundeModel->load();
 
-        
-		$stunden = $this->StundeModel->load();
-        if(isError($stunden)){
+        if(isError($stunden))
             $this->terminateWithError(getError($stunden), self::ERROR_TYPE_GENERAL);
-        }
+        
         $stunden = getData($stunden);
 
-     
-		$result = $this->StundenplanModel->getRoomDataOnDay($ort_kurzbz,$start_date,$end_date);
-        // logging the result of the query
-        $this->loglib->logErrorDB(print_r($result,true),"this is the result of the original stundenplan query");
-            
+		$result = $this->StundenplanModel->getRoomDataOnDay($ort_kurzbz,$start_date,$end_date);  
 
 		if(isError($result)){
             $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
@@ -103,76 +99,24 @@ class Stundenplan extends FHCAPI_Controller
         $result = hasData($result) ? getData($result) : [];
         $this->loglib->logInfoDB(print_r(count($result),true),"this is the count of the result");
         
-
-        //TODO: also implement the following algorithm to block the lectures that are together over different stunden
-        /* $blockcontinue=false;
-						if (isset($blocked[$this->std_plan[$i][$j][$idx]->unr]) && $blocked[$this->std_plan[$i][$j][$idx]->unr]>0)
-						{
-							$blocked[$this->std_plan[$i][$j][$idx]->unr]--;
-							$blockcontinue=true;
-						}
-
-						if (!$blockcontinue)
-						{
-							// Blockungen ueber mehrere Stunden erkennen
-
-							$blockflag=false;
-							for ($blockstunden=1;$blockstunden<=$num_rows_stunde;$blockstunden++)
-							{
-								if (isset($this->std_plan[$i][$j+$blockstunden][$idx]) && isset($this->std_plan[$i][$j+$blockstunden][$idx]->stundenplan_id)
-									&& ($this->std_plan[$i][$j][$idx]->unr == $this->std_plan[$i][$j+$blockstunden][$idx]->unr)
-									&& $this->std_plan[$i][$j][$idx]!='0' && $k<($num_rows_stunde-$blockstunden)
-									&& !($this->std_plan[$i][$j][$idx]->reservierung && $this->std_plan[$i][$j][$idx]->lektor!=$this->std_plan[$i][$j+$blockstunden][$idx]->lektor))
-								{
-
-									if (isset($blocked[$this->std_plan[$i][$j][$idx]->unr]))
-										$blocked[$this->std_plan[$i][$j][$idx]->unr]++;
-									else
-										$blocked[$this->std_plan[$i][$j][$idx]->unr]=1;
-									$row = $this->db_fetch_object($this->stunde, ($k+$blockstunden));
-									$stunden_arr[]=$row->stunde;
-									$end_time=$row->ende;
-									$blockflag=true;
-								}
-								else
-								{
-									if (!$blockflag)
-									{
-										$row = $this->db_fetch_object($this->stunde, $k);
-										$stunden_arr[]=$row->stunde;
-										$end_time=$row->ende;
-										break;
-									}
-									else
-									{
-										break;
-									}
-								}
-							}
-						} */
-
-        $testStartDate = new DateTime($start_date);
-        $testEndDate = new DateTime($end_date);
-        $count =0;
+        
         $final_events = array();
         $grouped = array();
-        while($testStartDate <= $testEndDate && $count <7){
-            $date = $testStartDate->format('Y-m-d');
-            //TODO: array filtering for every day and hour could be too time consuming causing slow response
-            $day_events = array_filter($result,function($entry) use ($date){
-                return $entry->datum == $date;
-            });
-            //$this->loglib->logInfoDB(print_r($day_events,true),"day_events");
+        $associative_day_events = $this->filterEventsIntoAssociativeDateArray($result, $start_date, $end_date);
+        foreach($associative_day_events as $date => $day_events ){
+            
             foreach($stunden as $stunde){
+
+                // filtering all the events at the same hour of the day
                 $stunden_events = array_filter($day_events, function($entry) use ($stunde){
                     return $entry->stunde == $stunde->stunde;
                 });
 
                 $lehrverband_array = array();
 
-                
                 // for loop that is just used to fill the lehrverband_array
                 foreach($stunden_events as $key=>$stunden_event){
+
                     // lehrverband bestimmen
                     if(strlen($stunden_event->gruppe_kurzbz)>0){
                         $lehrverband = $stunden_event->gruppe_kurzbz;
@@ -188,25 +132,22 @@ class Stundenplan extends FHCAPI_Controller
                     $lehrverband_array[$key] = $lehrverband;
                 }
                 
-                
-                // aenderung aller events die am gleichen tag und zur gleichen Stunde gehalten werden
+                // compare nested loop start
                 foreach($stunden_events as $event_key => $stunden_event){
+                    
+                    // skip the loop iteration if the event was already grouped
                     if(isset($grouped[$event_key])){
                         continue;
                     }
                      
                     // lektor bestimmen
-                    if($stunden_event->mitarbeiter_kurzbz == null){
-                        $simml_lektor = $stunden_event->lektor;
-                    }else{
-                        $simml_lektor = $stunden_event->mitarbeiter_kurzbz;
+                    if($stunden_event->mitarbeiter_kurzbz != null){
+                        $stunden_events[$event_key]->lektor = $stunden_event->mitarbeiter_kurzbz;
                     }
 
-                
                     // lehrfach bestimmen
-                    $lehrfach = $stunden_event->lehrfach;
                     if(isset($stunden_event->lehrform)){
-                        $lehrfach .= '-'.$stunden_event->lehrform;
+                        $stunden_events[$event_key]->lehrfach .= '-'.$stunden_event->lehrform;
                     }
                     
                     // GRUPIEREN DER GLEICHEN EVENTS
@@ -216,24 +157,19 @@ class Stundenplan extends FHCAPI_Controller
                         if($compare_key != $event_key){
                             
                             // will be used to skip the loop iteration with this index because it was already grouped
-                            $grouped[$compare_key] = 1;
-                            // this if checks if the events can be grouped
+                            $grouped[$compare_key] = TRUE;
+
+                            // can the events be grouped?
                            if ( 
                                 // the unr's have to be equal to be grouped
                                 $stunden_event->unr==$stunden_event_compare->unr && 
                                 // and either the lektor or the ort_kurzbz have to be equal
                                 ($stunden_event->ort_kurzbz==$stunden_event_compare->ort_kurzbz 
                                 || $stunden_event->lektor==$stunden_event_compare->lektor)
-                                // reservierungen muessen auch beachtet werden, wenn der eintrag eine reservierung ist dann koennen die eintraege nicht gruppiert werden
-                                //&& !$stunden_event->reservierung && !$stunden_event_compare->reservierung
-
                            )
                                 {
-
-                                    
-
                                     // Bezeichnung des Events zusammenfuehren
-                                    // change the event with the $event_key if the compared_event has different properties but is still groupable
+                                    // group the events properties if they are groupable
 
                                     //Lektoren
                                     if(!mb_strstr($stunden_event->lektor,$stunden_event_compare->lektor)){
@@ -246,10 +182,6 @@ class Stundenplan extends FHCAPI_Controller
                                         $stunden_events[$event_key]->ort_kurzbz = $stunden_event->ort_kurzbz . ' \ ' . $stunden_event_compare->ort_kurzbz;
                                     }
 
-                                    //unset the compared and grouped event
-                                    unset($stunden_events[$compare_key]);
-                                    
-
                                     //Lehrverband
                                     if(!mb_strstr($lehrverband_array[$event_key],$lehrverband_array[$compare_key])){
                                          $lehrverband_array[$event_key] .= ' / ' . $lehrverband_array[$compare_key];
@@ -262,83 +194,54 @@ class Stundenplan extends FHCAPI_Controller
                     // add the grouped lehrverband entry to the event
                     $stunden_events[$event_key]->stg = $lehrverband_array[$event_key];
                     $final_events[] = $stunden_events[$event_key];
-
-
-
                 }
-               
             }
-           
-            $testStartDate->modify('+1 day');
-            $count++;
         }     
         
-       
-        //php start date
-        $phpStartDate = new DateTime($start_date);
-
-        //$phpStartDate->modify('+1 day');
-        $this->loglib->logErrorDB(print_r($final_events,true),"this is the result of the stundenplan query");
-        
-		//echo($this->db->last_query());
 		$this->terminateWithSuccess($final_events);
 		
 	}
 
     public function Reservierungen()
 	{
+        $this->load->model('ressource/Reservierung_model', 'ReservierungModel');
+        $this->load->model('ressource/Stunde_model', 'StundeModel');
+        $this->load->model('ressource/Mitarbeiter_model','MitarbeiterModel');
 
-        //TODO the reservierungen have to be grouped like the stundenplan
-
+        // storing the get parameter in local variables
         $ort_kurzbz = $this->input->get('ort_kurzbz', TRUE);
         $start_date = $this->input->get('start_date', TRUE);
         $end_date = $this->input->get('end_date', TRUE);
 
+        // return early if the get parameter are not present
         if(!$ort_kurzbz || !$start_date || !$end_date){
             $this->terminateWithError("Missing parameters", self::ERROR_TYPE_GENERAL);
         }
 
-		$this->load->model('ressource/Reservierung_model', 'ReservierungModel');
-        $this->load->model('ressource/Mitarbeiter_model','MitarbeiterModel');
+        // querying the stunden
+        $stunden = $this->StundeModel->load();
+
+        if(isError($stunden))
+            $this->terminateWithError(getError($stunden), self::ERROR_TYPE_GENERAL);
+        
+        $stunden = getData($stunden);
+
+		// querying the reservierungen
 		$result = $this->ReservierungModel->getRoomReservierungen($ort_kurzbz, $start_date, $end_date);
 
 		if (isError($result))
 			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-        $this->load->library('LogLib');
-        $this->loglib->logErrorDB(print_r(getData($result),true),"this is the result of the reservierungen query");
-		
+        
         $result = hasData($result) ? getData($result) : [];
-
-        // fetching the stunden to do a loop over the days and the stunden
-        $this->load->model('ressource/Stunde_model', 'StundeModel');
-        $stunden = $this->StundeModel->load();
-        if(isError($stunden)){
-            $this->terminateWithError(getError($stunden), self::ERROR_TYPE_GENERAL);
-        }
-        $stunden = getData($stunden);
-
-        $testStartDate = new DateTime($start_date);
-        $testEndDate = new DateTime($end_date);
-        $count =0;
-        $final_events = array();
-        $grouped = array();
-
-        $final_reservierungen = array();
-
+        
         // loop over the days
-        while($testStartDate <= $testEndDate && $count <7){
-            
-            $date = $testStartDate->format('Y-m-d');
-
-            // filtering all the reservierungen with the date
-            $day_reservierungen = array_filter($result, function($result_entry) use ($date){
-                return $result_entry->datum == $date;
-            });
+        $day_events = $this->filterEventsIntoAssociativeDateArray($result, $start_date, $end_date);
+        foreach($day_events as $date => $day_eventArray){
 
             // loop over the stunden
             foreach( $stunden as $stunde){
                 // filtering all the day reservierungen to the reservierungen that happen at the same hour of the day
-                $hour_reservierungen = array_filter($day_reservierungen, function($day_entry) use ($stunde){
+                $hour_reservierungen = array_filter($day_eventArray, function($day_entry) use ($stunde){
                     return $day_entry->stunde == $stunde->stunde;
                 });
 
@@ -347,37 +250,72 @@ class Stundenplan extends FHCAPI_Controller
                     continue;
                 }
 
-                // looping over the reservierungen that happen at the same day and at the same hour
-                
-                $grouped_uid = array();
-                foreach($hour_reservierungen as $grouping_reservierung){
-                    $grouped_uid[]= $grouping_reservierung->uid;
+                $grouped_uids = array();
+                foreach($hour_reservierungen as $entry){
+
+                    $mitarbeiter_check = $this->MitarbeiterModel->isMitarbeiter($entry->uid);
+                    
+                    if(isError($mitarbeiter_check)){
+                        $this->terminateWithError(getError($mitarbeiter_check), self::ERROR_TYPE_GENERAL);
+                    }
+
+                    $mitarbeiter_check = getData($mitarbeiter_check);
+
+                    // if the uid belongs to a mitarbeiter store the mitarbeiter_kurzbz otherwise store the student uid
+                    if($mitarbeiter_check){
+                        $mitarbeiterKurzbz = $this->MitarbeiterModel->generateKurzbz($entry->uid);
+                        
+                        if(isError($mitarbeiterKurzbz)){
+                            $this->terminateWithError(getError($mitarbeiterKurzbz), self::ERROR_TYPE_GENERAL);
+                        }
+
+                        $grouped_uids[] = getData($mitarbeiterKurzbz);
+
+                    }else{
+                        $grouped_uids[]= $entry->uid;
+                    }
+                    
                 }
 
+                // merging all the information into the first entry
                 $final_reservierung = $hour_reservierungen[0];
                 
-                
-                $grouped_uid = array_map(function($uid){
-                    $res =$this->MitarbeiterModel->generateKurzbz($uid);
-                    $res = hasData($res)? getData($res): $uid;
-                    return $res;
-               },$grouped_uid);
-                $this->loglib->logErrorDB(print_r($grouped_uid,true),"this are the grouped uids");
-
-                $final_reservierung->person_kurzbz = implode(" / ",$grouped_uid);
+                $final_reservierung->person_kurzbz = implode(" / ",$grouped_uids);
 
                 $final_reservierungen[] = $final_reservierung;
             }
-            
-            
-            $testStartDate->modify('+1 day');
-            ++$count;
 
         }
-        $this->loglib->logErrorDB(print_r($final_reservierungen,true),"lalala");
-        
         $this->terminateWithSuccess($final_reservierungen);
 	}
 
+    private function filterEventsIntoAssociativeDateArray($events, $start_date, $end_date){
+        $php_start_date = new DateTime($start_date);
+        $php_end_date = new DateTime($end_date);
+        // count is used to ensure that the loop does not iterate more than 7 times (7 days per week)
+        $count =0;
+
+       $result = array();
+
+        // loop over the days
+        while($php_start_date <= $php_end_date && $count <7){
+            
+            $date = $php_start_date->format('Y-m-d');
+
+            // filtering all the reservierungen with the date
+            $day_events = array_filter($events, function($event) use ($date){
+                // no filtering is done if the event entries do not have a datum property
+                return isset($event->datum) ? $event->datum == $date : true; 
+                
+            });
+
+            $result[$date] = $day_events;
+            ++$count;
+            $php_start_date->modify('+1 day');
+        }
+
+        return $result;
+    }
+
 }
 

From dd7c8480f3913eaeba916c3583594a540eb7eea5 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 13 Jun 2024 12:29:36 +0200
Subject: [PATCH 0795/1461] removes unwanted methods and properties from
 CalendarModal

---
 .../js/components/Calendar/CalendarModal.js   | 114 +-----------------
 1 file changed, 2 insertions(+), 112 deletions(-)

diff --git a/public/js/components/Calendar/CalendarModal.js b/public/js/components/Calendar/CalendarModal.js
index 5f6fd9d09..62263c72e 100644
--- a/public/js/components/Calendar/CalendarModal.js
+++ b/public/js/components/Calendar/CalendarModal.js
@@ -29,123 +29,13 @@ export default {
   data() {
     return {
       data:this.event,
-      topic: null,
-      profilUpdate: null,
-      editData: this.value,
-      fileID: null,
-      breadcrumb: null,
-      loading: false,
-
+    
       result: false,
       info: null,
     };
   },
-  methods: {
-    updateFileIDFunction: function (newFileID) {
-      this.fileID = newFileID;
-    },
+  
 
-    async submitProfilChange() {
-      //? check if data is valid before making a request
-      if (this.topic && this.profilUpdate) {
-        //? if profil update contains any attachment
-        if (this.fileID) {
-          const fileData = await this.uploadFiles(this.fileID);
-
-          this.fileID = fileData ? fileData : null;
-        }
-
-        //? inserts new row in public.tbl_cis_profil_update
-        //* calls the update api call if an update field is present in the data that was passed to the modal
-        const handleApiResponse = (res) => {
-          //? toggles the loading to false and closes the loading modal
-          this.loading = false;
-          this.setLoading(false);
-
-          if (res.data.error == 0) {
-            this.result = true;
-            this.hide();
-            Alert.popup(
-              "Ihre Anfrage wurde erfolgreich gesendet. Bitte warten Sie, während sich das Team um Ihre Anfrage kümmert."
-            );
-          } else {
-            this.result = false;
-            this.hide();
-            Alert.popup(
-              "Ein Fehler ist aufgetreten: " + JSON.stringify(res.data.retval)
-            );
-          }
-        };
-
-        //* v-show on EditProfil modal binded to this.loading
-        //? hides the EditProfil modal and shows the loading modal by calling a callback that was passed as prop from the parent component
-        this.loading = true;
-        this.setLoading(true);
-
-        this.editData.updateID
-          ? Vue.$fhcapi.ProfilUpdate.updateProfilRequest(
-              this.topic,
-              this.profilUpdate,
-              this.editData.updateID,
-              this.fileID ? this.fileID[0] : null
-            )
-              .then((res) => {
-                handleApiResponse(res);
-              })
-              .catch((err) => {
-                console.error(err);
-              })
-          : Vue.$fhcapi.ProfilUpdate.insertProfilRequest(
-              this.topic,
-              this.profilUpdate,
-              this.fileID ? this.fileID[0] : null
-            )
-              .then((res) => {
-                handleApiResponse(res);
-              })
-              .catch((err) => {
-                console.error(err);
-              });
-      }
-    },
-
-    uploadFiles: async function (files) {
-      if (files[0].type !== "application/x.fhc-dms+json") {
-        let formData = new FormData();
-        formData.append("files[]", files[0]);
-        const result = this.editData.updateID
-          ? //? updating old attachment by replacing
-            //* second parameter of api request insertFile checks if the file has to be replaced or not
-            await Vue.$fhcapi.ProfilUpdate.insertFile(
-              formData,
-              this.editData.updateID
-            ).then((res) => {
-              return res.data?.map((file) => file.dms_id);
-            })
-          : //? fresh insert of new attachment
-            await Vue.$fhcapi.ProfilUpdate.insertFile(formData).then((res) => {
-              return res.data?.map((file) => file.dms_id);
-            });
-        return result;
-      } else {
-        //? attachment hasn't been replaced
-        return false;
-      }
-    },
-  },
-  computed: {
-    start_time: function(){
-      if(!this.data.start) return 'N/A';
-      return this.data.start.getHours() + ":" + this.data.start.getMinutes();
-    },
-    end_time: function(){
-      if(!this.data.end) return 'N/A';
-      return this.data.end.getHours() + ":" + this.data.end.getMinutes();
-    }
-  },
-  created() {
-    console.log("this is an test")
-  },
   mounted() {
     this.modal = this.$refs.modalContainer.modal;
   },

From 93d0f88b0dc77654a1827c8e9a7a317fbf862f1b Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 14 Jun 2024 10:48:43 +0200
Subject: [PATCH 0796/1461] function getDVByPersonUID: add dvendegrund_kurzbz
 and dvendegrund_anmerkung to select

---
 .../models/vertragsbestandteil/Dienstverhaeltnis_model.php    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/application/models/vertragsbestandteil/Dienstverhaeltnis_model.php b/application/models/vertragsbestandteil/Dienstverhaeltnis_model.php
index 12f7af220..6827beaa4 100644
--- a/application/models/vertragsbestandteil/Dienstverhaeltnis_model.php
+++ b/application/models/vertragsbestandteil/Dienstverhaeltnis_model.php
@@ -35,7 +35,9 @@ class Dienstverhaeltnis_model extends DB_Model
 	    dv.dvendegrund_anmerkung,
             dv.vertragsart_kurzbz,
             dv.updateamum,
-            dv.updatevon
+            dv.updatevon,
+            dv.dvendegrund_kurzbz,
+            dv.dvendegrund_anmerkung
         FROM tbl_mitarbeiter
             JOIN tbl_benutzer ON tbl_mitarbeiter.mitarbeiter_uid::text = tbl_benutzer.uid::text
             JOIN tbl_person USING (person_id)

From f83cd3b87a4b93a3327507189de9b6030e479a2c Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 14 Jun 2024 11:18:29 +0200
Subject: [PATCH 0797/1461] checks whether the user wants to fetch content or
 the news

---
 application/views/CisHmvc/Cms/Content.php | 3 ++-
 application/views/CisHtml/Cms/Content.php | 2 +-
 application/views/CisVue/Cms/Content.php  | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/application/views/CisHmvc/Cms/Content.php b/application/views/CisHmvc/Cms/Content.php
index 4a11d9f93..7ca1347d3 100755
--- a/application/views/CisHmvc/Cms/Content.php
+++ b/application/views/CisHmvc/Cms/Content.php
@@ -12,7 +12,8 @@ $this->load->view('templates/FHC-Header', $includesArray);
 ?>
 
 <div id="cms">
-	<?= $content; ?>
+<?php echo (isset($content) ? $content : '<content/>'); ?>
+	
 </div>
 
 <?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
diff --git a/application/views/CisHtml/Cms/Content.php b/application/views/CisHtml/Cms/Content.php
index a27128d23..ac62c985a 100755
--- a/application/views/CisHtml/Cms/Content.php
+++ b/application/views/CisHtml/Cms/Content.php
@@ -12,7 +12,7 @@ $this->load->view('templates/CISHTML-Header', $includesArray);
 ?>
 
 <div id="cms">
-	<content />
+<?php echo (isset($content) ? $content : '<content/>'); ?>
 
 </div>
 
diff --git a/application/views/CisVue/Cms/Content.php b/application/views/CisVue/Cms/Content.php
index a88a1fc93..02aa42b57 100755
--- a/application/views/CisVue/Cms/Content.php
+++ b/application/views/CisVue/Cms/Content.php
@@ -11,7 +11,7 @@ $this->load->view('templates/CISVUE-Header', $includesArray);
 ?>
 
 <div id="cms">
-	<?= $content; ?>
+<?php echo (isset($content) ? $content : '<content/>'); ?>
 </div>
 
 <?php $this->load->view('templates/CISVUE-Footer', $includesArray); ?>

From c3278ad30f392ea68642ac94ee241de90cd58d74 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 14 Jun 2024 11:44:26 +0200
Subject: [PATCH 0798/1461] add app softwarebereitstellung to prevent
 checksystem errors when adding phrases for softwarebereitstellung while not
 having installed the extension

---
 system/dbupdate_3.4.php                          |  1 +
 .../28575_softwarebereitstellung.php             | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 system/dbupdate_3.4/28575_softwarebereitstellung.php

diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index 3a3f0be78..acb27977a 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -54,6 +54,7 @@ require_once('dbupdate_3.4/21620_neues_feld_zum_erfassen_des_ESI.php');
 require_once('dbupdate_3.4/36530_bis_internationsalisierung_codextabelle_neuerungen.php');
 require_once('dbupdate_3.4/34543_ux_template.php');
 require_once('dbupdate_3.4/17513_Entwicklungsteam.php');
+require_once('dbupdate_3.4/28575_softwarebereitstellung.php');
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
diff --git a/system/dbupdate_3.4/28575_softwarebereitstellung.php b/system/dbupdate_3.4/28575_softwarebereitstellung.php
new file mode 100644
index 000000000..9cccc77fa
--- /dev/null
+++ b/system/dbupdate_3.4/28575_softwarebereitstellung.php
@@ -0,0 +1,16 @@
+<?php
+if (! defined('DB_NAME')) exit('No direct script access allowed');
+
+// add app softwarebereitstellung
+if($result = $db->db_query("SELECT 1 FROM system.tbl_app WHERE app='softwarebereitstellung'"))
+{
+	if($db->db_num_rows($result) === 0)
+	{
+	$qry = "INSERT INTO system.tbl_app (app) VALUES('softwarebereitstellung');";
+
+		if(!$db->db_query($qry))
+			echo '<strong>System Tabelle app: '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br>app softwarebereitstellung hinzugefuegt<br>';
+	}
+}

From 04c5ccc89127ce7320dc2538f3ca2dccebc3ca03 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 14 Jun 2024 14:34:15 +0200
Subject: [PATCH 0799/1461] use setAbbrecher, set UnterbrecherFas

---
 .../api/frontend/v1/stv/Status.php            |  59 +++--
 application/libraries/PrestudentLib.php       | 204 ++++++++++++++++++
 .../Details/Prestudent/MultiStatus.js         |   3 +-
 system/phrasesupdate.php                      |  20 ++
 4 files changed, 271 insertions(+), 15 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index f85780141..83096630c 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -141,11 +141,6 @@ class Status extends FHCAPI_Controller
 			$lastStatusData = current(getData($result));
 
 		//Different handling depending on newStatus
-		if($status_kurzbz == 'Abbrecher' || $status_kurzbz == 'Unterbrecher')
-		{
-			$ausbildungssemester = $lastStatusData->ausbildungssemester;
-			$studiensemester_kurzbz = $lastStatusData->studiensemester_kurzbz;
-		}
 		if($status_kurzbz == 'Absolvent' || $status_kurzbz == 'Diplomand')
 		{
 			$ausbildungssemester = $lastStatusData->ausbildungssemester;
@@ -175,7 +170,6 @@ class Status extends FHCAPI_Controller
 
 
 		//Check Reihungstest
-		//TODO(manu) test
 		if(REIHUNGSTEST_CHECK)
 		{
 			if($status_kurzbz=='Bewerber' && !$reihungstest_angetreten)
@@ -185,18 +179,15 @@ class Status extends FHCAPI_Controller
 		}
 
 		//Check ZGV
-		//TODO(manu) test
 		if(!defined("ZGV_CHECK") || ZGV_CHECK)
 		{
 			if($status_kurzbz=='Bewerber' && $zgv_code=='')
 			{
 				return $this->terminateWithError($this->p->t('lehre','error_ZGVNichtEingetragen', ['name' => $name]), self::ERROR_TYPE_GENERAL);
-
 			}
 		}
 
 		//Check ZGV-Master
-		//TODO(manu) test
 		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
 		$result = $this->StudiengangModel->load([
 			'studiengang_kz'=> $stg
@@ -291,6 +282,45 @@ class Status extends FHCAPI_Controller
 			}
 		}
 
+		//different handling of StudStati
+		if($status_kurzbz == 'Abbrecher')
+		{
+			$studiensemester_kurzbz = $lastStatusData->studiensemester_kurzbz;
+
+			$this->load->model('crm/Statusgrund_model', 'StatusgrundModel');
+			$result = $this->StatusgrundModel->load($statusgrund_id);
+			if (isError($result))
+			{
+				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			}
+			$result = current(getData($result));
+			$statusgrund_kurzbz = $result->statusgrund_kurzbz;
+
+			$this->load->library('PrestudentLib');
+			$result = $this->prestudentlib->setAbbrecher($prestudent_id, $studiensemester_kurzbz, null, $statusgrund_kurzbz, $datum, $bestaetigtam, $bestaetigtvon);
+			if (isError($result))
+			{
+				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			}
+			else
+				$this->terminateWithSuccess($prestudent_id);
+		}
+
+		//TODO(Manu) setUnterbrecher FasLogic!
+		if($status_kurzbz == 'Unterbrecher')
+		{
+			$ausbildungssemester = $lastStatusData->ausbildungssemester;
+			$studiensemester_kurzbz = $lastStatusData->studiensemester_kurzbz;
+
+			$this->load->library('PrestudentLib');
+			$result = $this->prestudentlib->setUnterbrecherFas($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $datum, $bestaetigtam, $bestaetigtvon);
+			if (isError($result))
+			{
+				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			}
+			else
+				$this->terminateWithSuccess($prestudent_id);
+		}
 
 		// Start DB transaction
 		$this->db->trans_begin(); // Beginnen der Transaktion
@@ -345,13 +375,14 @@ class Status extends FHCAPI_Controller
 			$gruppe = $studentData->gruppe == '' ? '' : $studentData->gruppe;
 			$studiengang_kz = $studentData->studiengang_kz;
 
+			//TODO(Manu) DEPRECATED
 			//Handle Abbrecher and Unterbrecher
-			if($status_kurzbz == 'Abbrecher' || $status_kurzbz == 'Unterbrecher')
+/*			if($status_kurzbz == 'Abbrecher' || $status_kurzbz == 'Unterbrecher')
 						{
 							$ausbildungssemester = 0;
 							$gruppe = '';
 							$verband = $status_kurzbz == 'Abbrecher' ? 'A' : 'B';
-						}
+						}*/
 
 			//process studentlehrverband
 			$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
@@ -371,9 +402,9 @@ class Status extends FHCAPI_Controller
 
 			//update(fuer Abbrecher und Unterbrecher)
 			//implemented for multiaction "status ändern"
-			//TODO(Manu) implement also for newStatus?
 
-			if($status_kurzbz == 'Abbrecher' || $status_kurzbz == 'Unterbrecher')
+			//TODO(Manu) DEPRECATED
+/*			if($status_kurzbz == 'Abbrecher' || $status_kurzbz == 'Unterbrecher')
 			{
 				$result = $this->StudentModel->update(
 					[
@@ -414,7 +445,7 @@ class Status extends FHCAPI_Controller
 					}
 				}
 
-			}
+			}*/
 		}
 
 		$this->db->trans_commit();
diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php
index ae4ad59c6..c73d4c117 100644
--- a/application/libraries/PrestudentLib.php
+++ b/application/libraries/PrestudentLib.php
@@ -409,4 +409,208 @@ class PrestudentLib
 
 		return success();
 	}
+
+	public function setUnterbrecherFas($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $datum, $bestaetigtAm, $bestaetigtVon)
+	{
+		$insertvon = getAuthUID();
+
+		$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id, $studiensemester_kurzbz);
+		if (isError($result))
+			return $result;
+		$result = getData($result);
+		if (!$result) {
+			//NOTE(manu): only valid if nextSemester focus max
+
+			$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
+			if (isError($result))
+				return $result;
+			$result = getData($result);
+
+			//check if ausbildungssemester is last
+			$this->_ci->StudiengangModel->addJoin('public.tbl_prestudent p', 'studiengang_kz');
+			$res = $this->_ci->StudiengangModel->loadWhere(['p.prestudent_id' => $prestudent_id]);
+			if(isError($res))
+				return $res;
+			if(!hasData($res))
+				return error($this->_ci->p->t('studierendenantrag', 'error_no_stg_for_prestudent', [
+					'prestudent_id' => $prestudent_id
+				]));
+
+			$studiengang = current(getData($res));
+			$prestudent_status = current($result);
+			if($prestudent_status->ausbildungssemester + 1 < $studiengang->max_semester)
+				$ausbildungssemester_plus = 1;
+
+			if(!$result)
+			{
+				return error($this->_ci->p->t('studierendenantrag', 'error_no_prestudent_in_sem', [
+					'prestudent_id' => $prestudent_id,
+					'studiensemester_kurzbz' => $studiensemester_kurzbz
+				]));
+			}
+		}
+
+		$prestudent_status = current($result);
+		$result = $this->_ci->StudentModel->loadWhere(['prestudent_id' => $prestudent_id]);
+
+		if (isError($result))
+			return $result;
+		$result = getData($result);
+		if (!$result)
+			return error($this->_ci->p->t('studierendenantrag', 'error_no_student_for_prestudent', ['prestudent_id' => $prestudent_id]));
+
+		$student = current($result);
+
+/*		$resultAntrag = $this->_ci->StudierendenantragModel->load($studierendenantrag_id);
+		if (isError($resultAntrag))
+			return $resultAntrag;
+		$resultAntrag = getData($resultAntrag);
+		if (!$resultAntrag)
+			return error($this->_ci->p->t('studierendenantrag', 'error_no_antrag_found', ['id' => $studierendenantrag_id]));
+
+		$antrag = current($resultAntrag);*/
+
+		//Status updaten
+		$result = $this->_ci->PrestudentstatusModel->insert([
+			'prestudent_id' => $prestudent_id,
+			'status_kurzbz' => Prestudentstatus_model::STATUS_UNTERBRECHER,
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'ausbildungssemester' => $ausbildungssemester,
+			'datum' => date('c'),
+			'insertvon' => $insertvon,
+			'insertamum' => date('c'),
+			'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz,
+			'studienplan_id'=> $prestudent_status->studienplan_id,
+			'bestaetigtvon' => $insertvon,
+			'bestaetigtam' => date('c'),
+/*			'anmerkung'=> 'Wiedereinstieg ' . $antrag->datum_wiedereinstieg*/
+		]);
+
+		if (isError($result))
+			return $result;
+
+		//Verband anlegen
+		$result = $this->_ci->LehrverbandModel->load([
+			'studiengang_kz' => $student->studiengang_kz,
+			'semester' => 0,
+			'verband' => 'B',
+			'gruppe' => ''
+		]);
+
+		if (isError($result))
+			return $result;
+		$result = getData($result);
+		if (!$result)
+		{
+			$result = $this->_ci->LehrverbandModel->load([
+				'studiengang_kz' => $student->studiengang_kz,
+				'semester' => 0,
+				'verband' => '',
+				'gruppe' => ''
+			]);
+			if (isError($result))
+				return $result;
+			$result = getData($result);
+
+			if(!$result)
+			{
+				$this->_ci->LehrverbandModel->insert([
+					'studiengang_kz' => $student->studiengang_kz,
+					'semester' => 0,
+					'verband' => '',
+					'gruppe' => '',
+					'bezeichnung' => 'Ab-Unterbrecher',
+					'aktiv' => true,
+				]);
+			}
+
+			$this->_ci->LehrverbandModel->insert([
+				'studiengang_kz' => $student->studiengang_kz,
+				'semester' => 0,
+				'verband' => 'B',
+				'gruppe' => '',
+				'bezeichnung' => 'Unterbrecher',
+				'aktiv' => true
+			]);
+		}
+
+		//noch nicht eingetragene Zeugnisnoten auf 9 setzen
+		$result = $this->_ci->ZeugnisnoteModel->getZeugnisnoten($student->student_uid, $studiensemester_kurzbz);
+		if (isError($result))
+			return $result;
+		$result = getData($result) ?: [];
+
+		foreach ($result as $lv)
+		{
+			if (!$lv->note)
+			{
+				$result = $this->_ci->ZeugnisnoteModel->insert([
+					'note' => 9,
+					'studiensemester_kurzbz' => $lv->studiensemester_kurzbz,
+					'student_uid' => $lv->uid,
+					'lehrveranstaltung_id' => $lv->lehrveranstaltung_id
+				]);
+				if (isError($result)) {
+					$result = $this->_ci->ZeugnisnoteModel->update([
+						'studiensemester_kurzbz' => $lv->studiensemester_kurzbz,
+						'student_uid' => $lv->uid,
+						'lehrveranstaltung_id' => $lv->lehrveranstaltung_id
+					], [
+						'note' => 9
+					]);
+
+					if (isError($result))
+						return $result;
+				}
+			}
+		}
+
+
+		//Update Aktionen
+
+		//StudentModel updaten
+		$this->_ci->StudentModel->update([
+			'student_uid' => $student->student_uid
+		], [
+			'verband' => 'B',
+			'gruppe' => '',
+			'semester' => 0,
+			'updatevon' => $insertvon,
+			'updateamum' => date('c')
+		]);
+
+		//Studentlehrverband setzen
+		$result = $this->_ci->StudentlehrverbandModel->loadWhere([
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'student_uid' => $student->student_uid
+		]);
+		if (hasData($result)) {
+			$this->_ci->StudentlehrverbandModel->update([
+				'studiensemester_kurzbz' => $studiensemester_kurzbz,
+				'student_uid' => $student->student_uid
+			], [
+				'studiengang_kz' => $student->studiengang_kz,
+				'semester' => 0,
+				'verband' => 'B',
+				'gruppe' => '',
+				'updateamum' => date('c'),
+				'updatevon' => $insertvon
+			]);
+		} else {
+			$this->_ci->StudentlehrverbandModel->insert([
+				'student_uid' => $student->student_uid,
+				'studiensemester_kurzbz' => $studiensemester_kurzbz,
+				'studiengang_kz' => $student->studiengang_kz,
+				'semester' => 0,
+				'verband' => 'B',
+				'gruppe' => '',
+				'insertamum' => date('c'),
+				'insertvon' => $insertvon
+			]);
+		}
+
+		return success();
+	}
+
+
 }
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index 43da6bd2d..1fe619160 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -126,6 +126,7 @@ export default{
 					{title: "BestätigtAm", field: "format_bestaetigtam"},
 					{title: "AbgeschicktAm", field: "format_bewerbung_abgeschicktamum", visible:false},
 					{title: "Statusgrund", field: "statusgrund_kurzbz"},
+					{title: "Bezeichnung", field: "bezeichnung_mehrsprachig[0]"},
 					{title: "Organisationsform", field: "orgform_kurzbz", visible: false},
 					{title: "PrestudentInId", field: "prestudent_id", visible: false},
 					{title: "StudienplanId", field: "studienplan_id", visible: false},
@@ -1185,7 +1186,7 @@ export default{
 					
 					<div class="btn-group">						
 						<button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
-							Status Ändern
+							{{$p.t('lehre', 'btn_statusAendern')}}
 						</button>
 					
 						<ul class="dropdown-menu">
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 07a7ee5a2..4b7c2852b 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -28042,6 +28042,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'btn_statusAendern',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Status ändern',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Change status',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'lehre',

From a0472c6573a23f9c559c51daca499ee2da6ab725 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 14 Jun 2024 14:44:29 +0200
Subject: [PATCH 0800/1461] little changes

---
 .../controllers/api/frontend/v1/Stundenplan.php   | 15 ++++++++++++---
 public/js/apps/Cis/RoomInformation.js             |  2 +-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 222d472d6..fe5ac9e23 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -236,6 +236,7 @@ class Stundenplan extends FHCAPI_Controller
         
         // loop over the days
         $day_events = $this->filterEventsIntoAssociativeDateArray($result, $start_date, $end_date);
+        $final_reservierungen = array();
         foreach($day_events as $date => $day_eventArray){
 
             // loop over the stunden
@@ -246,13 +247,18 @@ class Stundenplan extends FHCAPI_Controller
                 });
 
                 // if there are no reservierungen within that hour than we skip that iteration of the loop
-                if(!count($hour_reservierungen)){
+                if(count($hour_reservierungen) <1){
                     continue;
                 }
 
+                $this->loglib->logInfoDB(print_r($hour_reservierungen,true),"this is the hour reservierungen");
+                
+                // grouping the reservierung information of reservervations of the same hour on the same day
                 $grouped_uids = array();
                 foreach($hour_reservierungen as $entry){
 
+                    // grouping the reservierungs participants
+
                     $mitarbeiter_check = $this->MitarbeiterModel->isMitarbeiter($entry->uid);
                     
                     if(isError($mitarbeiter_check)){
@@ -274,11 +280,14 @@ class Stundenplan extends FHCAPI_Controller
                     }else{
                         $grouped_uids[]= $entry->uid;
                     }
+
+                    // grouping the 
                     
                 }
 
+                
                 // merging all the information into the first entry
-                $final_reservierung = $hour_reservierungen[0];
+                $final_reservierung = current($hour_reservierungen);
                 
                 $final_reservierung->person_kurzbz = implode(" / ",$grouped_uids);
 
@@ -295,7 +304,7 @@ class Stundenplan extends FHCAPI_Controller
         // count is used to ensure that the loop does not iterate more than 7 times (7 days per week)
         $count =0;
 
-       $result = array();
+        $result = array();
 
         // loop over the days
         while($php_start_date <= $php_end_date && $count <7){
diff --git a/public/js/apps/Cis/RoomInformation.js b/public/js/apps/Cis/RoomInformation.js
index db15979da..af92fe147 100644
--- a/public/js/apps/Cis/RoomInformation.js
+++ b/public/js/apps/Cis/RoomInformation.js
@@ -97,7 +97,7 @@ const app = Vue.createApp({
                     <template v-if="event.orig.reservierung">    
                         <!-- render content for reservierungen -->
                         <span>{{event.orig.title}}</span>
-                        <span>{{event.orig.stg}}</span>
+                        <span>{{event.orig.gruppe_kurzbz?event.orig.gruppe_kurzbz:event.orig.stg}}</span>
                         <span v-for="(item, index) in event.orig.person_kurzbz.split('/')" :key="index">{{item}}</span>
                     </template>
                     <template v-else>

From 1036c97be7ac84eec5e7809324c6ffd569b4295e Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 14 Jun 2024 15:58:11 +0200
Subject: [PATCH 0801/1461] Tab Status: change statusgrund_kurzbz to
 bezeichnung_mehrsprachig

---
 application/controllers/api/frontend/v1/stv/Status.php   | 9 ++++++++-
 application/models/crm/Prestudent_model.php              | 8 +++++---
 .../Details/Prestudent/MultiStatus.js                    | 3 +--
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 83096630c..86a52e1bf 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -32,9 +32,16 @@ class Status extends FHCAPI_Controller
 
 	public function getHistoryPrestudent($prestudent_id)
 	{
+		$this->load->model('system/Sprache_model', 'SpracheModel');
+		$this->SpracheModel->addSelect('index');
+		$result = $this->SpracheModel->loadWhere(array('sprache' => getUserLanguage()));
+
+		// Return language index
+		$lang =  hasData($result) ? getData($result)[0]->index : 1;
+
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 
-		$result = $this->PrestudentModel->getHistoryPrestudent($prestudent_id);
+		$result = $this->PrestudentModel->getHistoryPrestudent($prestudent_id, $lang);
 		if (isError($result))
 		{
 			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
diff --git a/application/models/crm/Prestudent_model.php b/application/models/crm/Prestudent_model.php
index 109abafe3..7280fd9fb 100644
--- a/application/models/crm/Prestudent_model.php
+++ b/application/models/crm/Prestudent_model.php
@@ -718,6 +718,7 @@ class Prestudent_model extends DB_Model
 					ORDER BY prestudent_id, datum desc, insertamum desc
 				) ps USING(prestudent_id)
 			JOIN public.tbl_status USING(status_kurzbz)
+			LEFT JOIN public.tbl_status_grund g USING (statusgrund_id)
 			JOIN public.tbl_studiengang sg USING(studiengang_kz)
 			LEFT JOIN lehre.tbl_studienplan sp USING (studienplan_id)
 			LEFT JOIN public.tbl_student s USING (prestudent_id)
@@ -732,7 +733,7 @@ class Prestudent_model extends DB_Model
 	 * @param int $prestudent_id
 	 * @return object
 	 */
-	public function getHistoryPrestudent($prestudent_id)
+	public function getHistoryPrestudent($prestudent_id, $index_lang)
 	{
 		$query = "
 					SELECT 
@@ -761,7 +762,8 @@ class Prestudent_model extends DB_Model
 					ps.insertvon,
 					ps.updateamum,
 					TO_CHAR(ps.updateamum::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS format_updateamum,
-					ps.updatevon 
+					ps.updatevon,
+					stg.beschreibung[?] as statusgrund_beschreibung
 				FROM 
 					public.tbl_prestudentstatus ps
 				LEFT JOIN 
@@ -781,6 +783,6 @@ class Prestudent_model extends DB_Model
 				ORDER BY datum DESC
 		";
 
-		return $this->execQuery($query, array($prestudent_id));
+		return $this->execQuery($query, array($index_lang, $prestudent_id));
 	}
 }
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index 1fe619160..9a0da98d2 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -125,8 +125,7 @@ export default{
 					{title: "Studienplan", field: "bezeichnung"},
 					{title: "BestätigtAm", field: "format_bestaetigtam"},
 					{title: "AbgeschicktAm", field: "format_bewerbung_abgeschicktamum", visible:false},
-					{title: "Statusgrund", field: "statusgrund_kurzbz"},
-					{title: "Bezeichnung", field: "bezeichnung_mehrsprachig[0]"},
+					{title: "Statusgrund", field: "statusgrund_beschreibung"},
 					{title: "Organisationsform", field: "orgform_kurzbz", visible: false},
 					{title: "PrestudentInId", field: "prestudent_id", visible: false},
 					{title: "StudienplanId", field: "studienplan_id", visible: false},

From 9220e1f85f2b84edc91155689bfb034c962a225e Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 17 Jun 2024 11:07:55 +0200
Subject: [PATCH 0802/1461] Cleanup Verband & list

---
 .../api/frontend/v1/stv/Students.php          | 48 ++++++++++++++-----
 .../api/frontend/v1/stv/Verband.php           | 32 +++++++++++--
 .../Stv/Studentenverwaltung/List.js           |  9 +++-
 3 files changed, 71 insertions(+), 18 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Students.php b/application/controllers/api/frontend/v1/stv/Students.php
index 697f44e31..852c1bc6a 100644
--- a/application/controllers/api/frontend/v1/stv/Students.php
+++ b/application/controllers/api/frontend/v1/stv/Students.php
@@ -183,13 +183,15 @@ class Students extends FHCAPI_Controller
 	 */
 	protected function getPrestudents($studiengang_kz, $studiensemester_kurzbz = null, $filter = null, $orgform_kurzbz = null)
 	{
-		// TODO(chris): @see: prestudent.class::loadInteressentenUndBewerber
-		// TODO(chris): IMPLEMENT!
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 
-		$stdsemEsc = $this->PrestudentModel->escape($studiensemester_kurzbz);
+		$stdsemEsc = $studiensemester_kurzbz ? $this->PrestudentModel->escape($studiensemester_kurzbz) : 'NULL';
+
+		$selectRT = 'SELECT 1 FROM public.tbl_rt_person JOIN public.tbl_reihungstest r ON (rt_id = reihungstest_id) WHERE person_id=p.person_id AND studienplan_id IN (SELECT studienplan_id FROM lehre.tbl_studienplan JOIN lehre.tbl_studienordnung o USING(studienordnung_id) WHERE o.studiengang_kz=tbl_prestudent.studiengang_kz) AND r.studiensemester_kurzbz=' . $stdsemEsc;
+
 		
-		$where = [];
+		$where = ['studiengang_kz' => $studiengang_kz];
+
 		if ($orgform_kurzbz) {
 			$where['ps.orgform_kurzbz'] = $orgform_kurzbz;
 		}
@@ -214,12 +216,12 @@ class Students extends FHCAPI_Controller
 			case "statusbestaetigtrtnichtangemeldet":
 				$where['ps.status_kurzbz'] = 'Interessent';
 				$where['bestaetigtam IS NOT NULL'] = null;
-				$this->PrestudentModel->db->where('NOT EXISTS(SELECT 1 FROM public.tbl_rt_person JOIN public.tbl_reihungstest r ON (rt_id = reihungstest_id) WHERE person_id=p.person_id AND studienplan_id IN (SELECT studienplan_id FROM lehre.tbl_studienplan JOIN lehre.tbl_studienordnung o USING(studienordnung_id) WHERE o.studiengang_kz=tbl_prestudent.studiengang_kz) AND r.studiensemester_kurzbz=' . $stdsemEsc . ')', null, false);
+				$this->PrestudentModel->db->where('NOT EXISTS(' . $selectRT . ')', null, false);
 				break;
 			case "statusbestaetigtrtangemeldet":
 				$where['ps.status_kurzbz'] = 'Interessent';
 				$where['bestaetigtam IS NOT NULL'] = null;
-				$this->PrestudentModel->db->where('EXISTS(SELECT 1 FROM public.tbl_rt_person JOIN public.tbl_reihungstest r ON (rt_id = reihungstest_id) WHERE person_id=p.person_id AND studienplan_id IN (SELECT studienplan_id FROM lehre.tbl_studienplan JOIN lehre.tbl_studienordnung o USING(studienordnung_id) WHERE o.studiengang_kz=tbl_prestudent.studiengang_kz) AND r.studiensemester_kurzbz=' . $stdsemEsc . ')', null, false);
+				$this->PrestudentModel->db->where('EXISTS(' . $selectRT . ')', null, false);
 				break;
 			case "zgv":
 				$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
@@ -249,15 +251,33 @@ class Students extends FHCAPI_Controller
 				break;
 			case "reihungstestangemeldet":
 				$where['ps.status_kurzbz'] = 'Interessent';
-				$this->PrestudentModel->db->where('EXISTS(SELECT 1 FROM public.tbl_rt_person JOIN public.tbl_reihungstest r ON (rt_id = reihungstest_id) WHERE person_id=p.person_id AND studienplan_id IN (SELECT studienplan_id FROM lehre.tbl_studienplan JOIN lehre.tbl_studienordnung o USING(studienordnung_id) WHERE o.studiengang_kz=tbl_prestudent.studiengang_kz) AND r.studiensemester_kurzbz=' . $stdsemEsc . ')', null, false);
+				$this->PrestudentModel->db->where('EXISTS(' . $selectRT . ')', null, false);
 				break;
 			case "reihungstestnichtangemeldet":
 				$where['ps.status_kurzbz'] = 'Interessent';
-				$this->PrestudentModel->db->where('NOT EXISTS(SELECT 1 FROM public.tbl_rt_person JOIN public.tbl_reihungstest r ON (rt_id = reihungstest_id) WHERE person_id=p.person_id AND studienplan_id IN (SELECT studienplan_id FROM lehre.tbl_studienplan JOIN lehre.tbl_studienordnung o USING(studienordnung_id) WHERE o.studiengang_kz=tbl_prestudent.studiengang_kz) AND r.studiensemester_kurzbz=' . $stdsemEsc . ')', null, false);
+				$this->PrestudentModel->db->where('NOT EXISTS(' . $selectRT . ')', null, false);
 				break;
 			case "bewerber":
 				$where['ps.status_kurzbz'] = 'Bewerber';
 				break;
+			case "bewerberrtnichtangemeldet":
+				$where['ps.status_kurzbz'] = 'Bewerber';
+				$this->PrestudentModel->db->where('NOT EXISTS(' . $selectRT . ')', null, false);
+				break;
+			case "bewerberrtangemeldet":
+				$where['ps.status_kurzbz'] = 'Bewerber';
+				$this->PrestudentModel->db->where('EXISTS(' . $selectRT . ')', null, false);
+				break;
+			case "bewerberrtangemeldetteilgenommen":
+				$where['ps.status_kurzbz'] = 'Bewerber';
+				$this->PrestudentModel->db->where('EXISTS(' . $selectRT . ')', null, false);
+				$where['reihungstestangetreten'] = true;
+				break;
+			case "bewerberrtangemeldetnichtteilgenommen":
+				$where['ps.status_kurzbz'] = 'Bewerber';
+				$this->PrestudentModel->db->where('EXISTS(' . $selectRT . ')', null, false);
+				$where['reihungstestangetreten'] = false;
+				break;
 			case "aufgenommen":
 				$where['ps.status_kurzbz'] = 'Aufgenommener';
 				break;
@@ -267,6 +287,10 @@ class Students extends FHCAPI_Controller
 			case "absage":
 				$where['ps.status_kurzbz'] = 'Abgewiesener';
 				break;
+			case "incoming":
+				// NOTE(chris): in FAS it was not filtered for studiengang_kz
+				$where['ps.status_kurzbz'] = 'Incoming';
+				break;
 			case "absolvent":
 				$where['ps.status_kurzbz'] = 'Absolvent';
 				break;
@@ -275,8 +299,6 @@ class Students extends FHCAPI_Controller
 				break;
 			default:
 				if (!$studiensemester_kurzbz) {
-					// TODO(chris): should work ... needs testing
-					// we want all prestudents without status?
 					$where['ps.status_kurzbz'] = null;
 				} else {
 					$this->PrestudentModel->db->where_in('ps.status_kurzbz', [
@@ -315,7 +337,7 @@ class Students extends FHCAPI_Controller
 		$this->PrestudentModel->addSelect('tbl_prestudent.studiengang_kz');
 		$this->PrestudentModel->addSelect('aufmerksamdurch_kurzbz');
 		$this->PrestudentModel->addSelect('mentor');
-		$this->PrestudentModel->addSelect('FALSE AS bnaktiv', false);
+		$this->PrestudentModel->addSelect('NULL AS bnaktiv', false);
 		$this->PrestudentModel->addSelect(
 			"(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung LIMIT 1) AS email_privat",
 			false
@@ -333,12 +355,12 @@ class Students extends FHCAPI_Controller
 		$this->PrestudentModel->addSelect('tbl_prestudent.priorisierung');
 		$this->PrestudentModel->addSelect('p.zugangscode');
 		$this->PrestudentModel->addSelect('p.bpk');
-
+		
 		$this->PrestudentModel->addOrder('nachname');
 		$this->PrestudentModel->addOrder('vorname');
 
 		$this->addFilter($studiensemester_kurzbz);
-
+		
 		$result = $this->PrestudentModel->loadWhere($where);
 
 		$data = $this->getDataOrTerminateWithError($result);
diff --git a/application/controllers/api/frontend/v1/stv/Verband.php b/application/controllers/api/frontend/v1/stv/Verband.php
index 109fc9e3a..efdf25a12 100644
--- a/application/controllers/api/frontend/v1/stv/Verband.php
+++ b/application/controllers/api/frontend/v1/stv/Verband.php
@@ -393,12 +393,12 @@ class Verband extends FHCAPI_Controller
 								'children' => [
 									[
 										'name' => 'Nicht zum Reihungstest angemeldet',
-										'link' => $intlink . '/statusbestaetigt/reihungstestnichtangemeldet',
+										'link' => $intlink . '/statusbestaetigtrtnichtangemeldet',
 										'leaf' => true
 									],
 									[
 										'name' => 'Reihungstest angemeldet',
-										'link' => $intlink . '/statusbestaetigt/reihungstestangemeldet',
+										'link' => $intlink . '/statusbestaetigtrtangemeldet',
 										'leaf' => true
 									]
 								]
@@ -421,7 +421,33 @@ class Verband extends FHCAPI_Controller
 						'name' => 'Bewerber',
 						'link' => $semlink . '/bewerber',
 						'stg_kz' => $studiengang_kz,
-						'leaf' => true
+						'children' => [
+							[
+								'name' => 'Nicht zum Reihungstest angemeldet',
+								'link' => $intlink . '/bewerberrtnichtangemeldet',
+								'stg_kz' => $studiengang_kz,
+								'leaf' => true
+							],
+							[
+								'name' => 'Reihungstest angemeldet',
+								'link' => $intlink . '/bewerberrtangemeldet',
+								'stg_kz' => $studiengang_kz,
+								'children' => [
+									[
+										'name' => 'Teilgenommen',
+										'link' => $intlink . '/bewerberrtangemeldetteilgenommen',
+										'stg_kz' => $studiengang_kz,
+										'leaf' => true
+									],
+									[
+										'name' => 'Nicht teilgenommen',
+										'link' => $intlink . '/bewerberrtangemeldetnichtteilgenommen',
+										'stg_kz' => $studiengang_kz,
+										'leaf' => true
+									]
+								]
+							]
+						]
 					],
 					[
 						'name' => 'Aufgenommen',
diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index 24e2571a3..d7be85a4d 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -32,7 +32,7 @@ export default {
 					{title:"TitelPost", field:"titelpost"},
 					{title:"SVNR", field:"svnr"},
 					{title:"Ersatzkennzeichen", field:"ersatzkennzeichen"},
-					{title:"Geburtsdatum", field:"geburtsdatum_iso"},
+					{title:"Geburtsdatum", field:"gebdatum"},
 					{title:"Geschlecht", field:"geschlecht"},
 					{title:"Sem.", field:"semester"},
 					{title:"Verb.", field:"verband"},
@@ -60,9 +60,14 @@ export default {
 					{title:"PreStudentInnenID", field:"prestudent_id"},
 					{title:"Priorität", field:"priorisierung_realtiv"},
 					{title:"Mentor", field:"mentor", visible:false},
-					{title:"Aktiv", field:"aktiv", visible:false},
+					{title:"Aktiv", field:"bnaktiv", visible:false},
 					{title:"GeburtsdatumISO", field:"geburtsdatum_iso", visible:false},
 				],
+				rowFormatter(row) {
+					if (row.getData().bnaktiv === false) {
+						row.getElement().classList.add('text-muted');
+					}
+				},
 
 				ajaxResponse: (url, params, response) => response.data,
 

From 752632456c8f25f18e48da57aead0b21294464c2 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 17 Jun 2024 12:06:19 +0200
Subject: [PATCH 0803/1461] Bug: Prestudent semester

---
 application/controllers/api/frontend/v1/stv/Students.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Students.php b/application/controllers/api/frontend/v1/stv/Students.php
index 852c1bc6a..bbda774e8 100644
--- a/application/controllers/api/frontend/v1/stv/Students.php
+++ b/application/controllers/api/frontend/v1/stv/Students.php
@@ -331,7 +331,7 @@ class Students extends FHCAPI_Controller
 		$this->PrestudentModel->addSelect('svnr');
 		$this->PrestudentModel->addSelect("'' AS matrikelnr");
 		$this->PrestudentModel->addSelect('p.anmerkung AS anmerkungen');
-		$this->PrestudentModel->addSelect("'' AS semester");
+		$this->PrestudentModel->addSelect("CASE WHEN ps.status_kurzbz IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') THEN ps.ausbildungssemester::text ELSE ''::text END AS semester", false);
 		$this->PrestudentModel->addSelect("'' AS verband");
 		$this->PrestudentModel->addSelect("'' AS gruppe");
 		$this->PrestudentModel->addSelect('tbl_prestudent.studiengang_kz');
@@ -516,7 +516,7 @@ class Students extends FHCAPI_Controller
 		$this->PrestudentModel->addSelect('svnr');
 		$this->PrestudentModel->addSelect('s.matrikelnr');
 		$this->PrestudentModel->addSelect('p.anmerkung AS anmerkungen');
-		$this->PrestudentModel->addSelect('v.semester');
+		$this->PrestudentModel->addSelect("COALESCE(v.semester::text, CASE WHEN public.get_rolle_prestudent(prestudent_id, NULL) IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') THEN public.get_absem_prestudent(prestudent_id, NULL)::text ELSE ''::text END) AS semester", false);
 		$this->PrestudentModel->addSelect('v.verband');
 		$this->PrestudentModel->addSelect('v.gruppe');
 		$this->PrestudentModel->addSelect('tbl_prestudent.studiengang_kz');

From 473815639b517545d8b30a41bd652eb691630337 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 17 Jun 2024 17:39:56 +0200
Subject: [PATCH 0804/1461] added entschuldigung max reach constant; rewrote
 SQL queries from string insert to param escaping; removed Stundenplan Lookup
 from LE for LVA fetch; load LE Stundenplan termine and serve as option when
 starting new kontrolle.

---
 system/phrasesupdate.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index da6e62085..1d4261ac7 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -26361,6 +26361,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'termine',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Termine',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Dates',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	)
 	// FHC-CORE-ANWESENHEITEN END
 );
 

From b5dbb8a16afa0bbb77da8fb1eb9b5d1936703906 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 17 Jun 2024 18:38:04 +0200
Subject: [PATCH 0805/1461] Refactor Functions in Prestudent Lib, Unterbrecher
 as single Action

---
 .../api/frontend/v1/stv/Status.php            |  59 +++-
 application/libraries/PrestudentLib.php       | 326 ++++++++++++++++++
 .../models/crm/Prestudentstatus_model.php     |   3 +
 .../Details/Prestudent/MultiStatus.js         |   6 +-
 4 files changed, 386 insertions(+), 8 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 86a52e1bf..b38a108ea 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -73,17 +73,17 @@ class Status extends FHCAPI_Controller
 
 	public function isLastStatus($prestudent_id)
 	{
-		//TODO(Manu) translate here
 		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
 		$result = $this->PrestudentstatusModel->checkIfLastStatusEntry($prestudent_id);
+
+
 		if (isError($result))
 		{
 			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
 		if($result->retval == "1")
 		{
-			//return $this->outputJson($result->retval);
-			return $this->terminateWithError("Die letzte Rolle kann nur durch den Administrator geloescht werden", self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError($this->p->t('lehre','error_lastRole'), self::ERROR_TYPE_GENERAL);
 		}
 		return $this->terminateWithSuccess($result);
 	}
@@ -313,7 +313,7 @@ class Status extends FHCAPI_Controller
 				$this->terminateWithSuccess($prestudent_id);
 		}
 
-		//TODO(Manu) setUnterbrecher FasLogic!
+		//TODO(Manu) documentation: here setUnterbrecher FasLogic!
 		if($status_kurzbz == 'Unterbrecher')
 		{
 			$ausbildungssemester = $lastStatusData->ausbildungssemester;
@@ -329,6 +329,57 @@ class Status extends FHCAPI_Controller
 				$this->terminateWithSuccess($prestudent_id);
 		}
 
+		//TODO(Manu) documentation: here setStudent Logic!
+		if($status_kurzbz == 'Student')
+		{
+			//return $this->terminateWithError($studiensemester_kurzbz . " - " . $ausbildungssemester, self::ERROR_TYPE_GENERAL);
+
+			$this->load->library('PrestudentLib');
+			$result = $this->prestudentlib->setStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id, $bestaetigtam, $bestaetigtvon);
+
+			if (isError($result))
+			{
+				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			}
+			else
+				$this->terminateWithSuccess($prestudent_id);
+			
+		}
+
+		if($status_kurzbz == 'Diplomand')
+		{
+			//return $this->terminateWithError("in setDiplomand", self::ERROR_TYPE_GENERAL);
+
+			$this->load->library('PrestudentLib');
+			$result = $this->prestudentlib->setDiplomand($prestudent_id, $studiensemester_kurzbz,$ausbildungssemester, $bestaetigtam, $bestaetigtvon);
+
+			if (isError($result))
+			{
+				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			}
+			else
+				$this->terminateWithSuccess($prestudent_id);
+			
+		}
+
+		if($status_kurzbz == 'Absolvent')
+		{
+			//return $this->terminateWithError("in setAbsolvent", self::ERROR_TYPE_GENERAL);
+
+			$this->load->library('PrestudentLib');
+			$result = $this->prestudentlib->setAbsolvent($prestudent_id, $studiensemester_kurzbz,$ausbildungssemester, $bestaetigtam, $bestaetigtvon);
+
+			if (isError($result))
+			{
+				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			}
+			else
+				$this->terminateWithSuccess($prestudent_id);
+			
+		}
+
+		return $this->terminateWithError("Warning! not in setStatus Mode", self::ERROR_TYPE_GENERAL);
+
 		// Start DB transaction
 		$this->db->trans_begin(); // Beginnen der Transaktion
 
diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php
index c73d4c117..af283da01 100644
--- a/application/libraries/PrestudentLib.php
+++ b/application/libraries/PrestudentLib.php
@@ -612,5 +612,331 @@ class PrestudentLib
 		return success();
 	}
 
+	public function setStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id, $bestaetigtAm, $bestaetigtVon)
+	{
+		$insertvon = getAuthUID();
+		 
+		$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id, $studiensemester_kurzbz);
+		if (isError($result))
+			return $result;
+		$result = getData($result);
+		if (!$result)
+		{
+
+			$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
+			if (isError($result))
+				return $result;
+			$result = getData($result);
+
+			if($statusgrund_id != 16)
+			{
+			//check if ausbildungssemester is last
+				$this->_ci->StudiengangModel->addJoin('public.tbl_prestudent p', 'studiengang_kz');
+				$res = $this->_ci->StudiengangModel->loadWhere(['p.prestudent_id' => $prestudent_id]);
+				if(isError($res))
+					return $res;
+				if(!hasData($res))
+					return error($this->_ci->p->t('studierendenantrag', 'error_no_stg_for_prestudent', [
+						'prestudent_id' => $prestudent_id
+					]));
+
+				$studiengang = current(getData($res));
+				$prestudent_status = current($result);
+				if($prestudent_status->ausbildungssemester + 1 < $studiengang->max_semester)
+					$ausbildungssemester_plus = 1;
+
+				if(!$result)
+				{
+					return error($this->_ci->p->t('studierendenantrag', 'error_no_prestudent_in_sem', [
+						'prestudent_id' => $prestudent_id,
+						'studiensemester_kurzbz' => $studiensemester_kurzbz
+					]));
+				}
+			}
+		}
+
+		$prestudent_status = current($result);
+		$result = $this->_ci->StudentModel->loadWhere(['prestudent_id' => $prestudent_id]);
+
+		if (isError($result))
+			return $result;
+		$result = getData($result);
+		if (!$result)
+			return error($this->_ci->p->t('studierendenantrag', 'error_no_student_for_prestudent', ['prestudent_id' => $prestudent_id]));
+
+		$student = current($result);
+
+		//Status updaten
+		$result = $this->_ci->PrestudentstatusModel->insert([
+			'prestudent_id' => $prestudent_id,
+			'status_kurzbz' => Prestudentstatus_model::STATUS_STUDENT,
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'statusgrund_id' => $statusgrund_id,
+			'ausbildungssemester' => $ausbildungssemester,
+			'datum' => date('c'),
+			'insertvon' => $insertvon,
+			'insertamum' => date('c'),
+			'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz,
+			'studienplan_id'=> $prestudent_status->studienplan_id,
+			'bestaetigtvon' => $insertvon,
+			'bestaetigtam' => date('c'),
+		]);
+
+		if (isError($result))
+			return $result;
+
+		$result = $this->_ci->StudentModel->checkIfUid($prestudent_id);
+		if (isError($result)) {
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		$student_uid = $result->retval;
+
+		//load student
+		$result = $this->_ci->StudentModel->loadWhere(
+			array(
+				'student_uid' => $student_uid
+			)
+		);
+		if (isError($result))
+		{
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+
+		$studentData = current(getData($result) ? : []);
+		$verband = $studentData->verband == '' ? '' : $studentData->verband;
+		$gruppe = $studentData->gruppe == '' ? '' : $studentData->gruppe;
+		$studiengang_kz = $studentData->studiengang_kz;
+
+		//process studentlehrverband
+		$this->_ci->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
+		$result = $this->_ci->StudentlehrverbandModel->processStudentlehrverband(
+			$student_uid,
+			$studiengang_kz,
+			$ausbildungssemester,
+			$verband,
+			$gruppe,
+			$studiensemester_kurzbz
+		);
+
+		return success();
+	}
+
+	public function setDiplomand($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester,$bestaetigtAm, $bestaetigtVon)
+	{
+		$insertvon = getAuthUID();
+		 
+		$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id, $studiensemester_kurzbz);
+		if (isError($result))
+			return $result;
+		$result = getData($result);
+		if (!$result)
+		{
+
+			$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
+			if (isError($result))
+				return $result;
+			$result = getData($result);
+
+			if($statusgrund_id != 16)
+			{
+			//check if ausbildungssemester is last
+				$this->_ci->StudiengangModel->addJoin('public.tbl_prestudent p', 'studiengang_kz');
+				$res = $this->_ci->StudiengangModel->loadWhere(['p.prestudent_id' => $prestudent_id]);
+				if(isError($res))
+					return $res;
+				if(!hasData($res))
+					return error($this->_ci->p->t('studierendenantrag', 'error_no_stg_for_prestudent', [
+						'prestudent_id' => $prestudent_id
+					]));
+
+				$studiengang = current(getData($res));
+				$prestudent_status = current($result);
+				if($prestudent_status->ausbildungssemester + 1 < $studiengang->max_semester)
+					$ausbildungssemester_plus = 1;
+
+				if(!$result)
+				{
+					return error($this->_ci->p->t('studierendenantrag', 'error_no_prestudent_in_sem', [
+						'prestudent_id' => $prestudent_id,
+						'studiensemester_kurzbz' => $studiensemester_kurzbz
+					]));
+				}
+			}
+		}
+
+		$prestudent_status = current($result);
+		$result = $this->_ci->StudentModel->loadWhere(['prestudent_id' => $prestudent_id]);
+
+		if (isError($result))
+			return $result;
+		$result = getData($result);
+		if (!$result)
+			return error($this->_ci->p->t('studierendenantrag', 'error_no_student_for_prestudent', ['prestudent_id' => $prestudent_id]));
+
+		$student = current($result);
+
+		//Status updaten
+		$result = $this->_ci->PrestudentstatusModel->insert([
+			'prestudent_id' => $prestudent_id,
+			'status_kurzbz' => Prestudentstatus_model::STATUS_DIPLOMAND,
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			// 'statusgrund_id' => $statusgrund_id,
+			// 'ausbildungssemester' => $ausbildungssemester,
+			'datum' => date('c'),
+			'insertvon' => $insertvon,
+			'insertamum' => date('c'),
+			'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz,
+			'studienplan_id'=> $prestudent_status->studienplan_id,
+			'bestaetigtvon' => $insertvon,
+			'bestaetigtam' => date('c'),
+		]);
+
+		if (isError($result))
+			return $result;
+
+		$result = $this->_ci->StudentModel->checkIfUid($prestudent_id);
+		if (isError($result)) {
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		$student_uid = $result->retval;
+
+		//load student
+		$result = $this->_ci->StudentModel->loadWhere(
+			array(
+				'student_uid' => $student_uid
+			)
+		);
+		if (isError($result))
+		{
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+
+		$studentData = current(getData($result) ? : []);
+		$verband = $studentData->verband == '' ? '' : $studentData->verband;
+		$gruppe = $studentData->gruppe == '' ? '' : $studentData->gruppe;
+		$studiengang_kz = $studentData->studiengang_kz;
+
+		//process studentlehrverband
+		$this->_ci->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
+		$result = $this->_ci->StudentlehrverbandModel->processStudentlehrverband(
+			$student_uid,
+			$studiengang_kz,
+			$ausbildungssemester,
+			$verband,
+			$gruppe,
+			$studiensemester_kurzbz
+		);
+
+		return success();
+	}
+
+	public function setAbsolvent($prestudent_id,$studiensemester_kurzbz, $ausbildungssemester, $bestaetigtAm, $bestaetigtVon)
+	{
+		$insertvon = getAuthUID();
+		 
+		$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id, $studiensemester_kurzbz);
+		if (isError($result))
+			return $result;
+		$result = getData($result);
+		if (!$result)
+		{
+
+			$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
+			if (isError($result))
+				return $result;
+			$result = getData($result);
+
+			if($statusgrund_id != 16)
+			{
+			//check if ausbildungssemester is last
+				$this->_ci->StudiengangModel->addJoin('public.tbl_prestudent p', 'studiengang_kz');
+				$res = $this->_ci->StudiengangModel->loadWhere(['p.prestudent_id' => $prestudent_id]);
+				if(isError($res))
+					return $res;
+				if(!hasData($res))
+					return error($this->_ci->p->t('studierendenantrag', 'error_no_stg_for_prestudent', [
+						'prestudent_id' => $prestudent_id
+					]));
+
+				$studiengang = current(getData($res));
+				$prestudent_status = current($result);
+				if($prestudent_status->ausbildungssemester + 1 < $studiengang->max_semester)
+					$ausbildungssemester_plus = 1;
+
+				if(!$result)
+				{
+					return error($this->_ci->p->t('studierendenantrag', 'error_no_prestudent_in_sem', [
+						'prestudent_id' => $prestudent_id,
+						'studiensemester_kurzbz' => $studiensemester_kurzbz
+					]));
+				}
+			}
+		}
+
+		$prestudent_status = current($result);
+		$result = $this->_ci->StudentModel->loadWhere(['prestudent_id' => $prestudent_id]);
+
+		if (isError($result))
+			return $result;
+		$result = getData($result);
+		if (!$result)
+			return error($this->_ci->p->t('studierendenantrag', 'error_no_student_for_prestudent', ['prestudent_id' => $prestudent_id]));
+
+		$student = current($result);
+
+		//Status updaten
+		$result = $this->_ci->PrestudentstatusModel->insert([
+			'prestudent_id' => $prestudent_id,
+			'status_kurzbz' => Prestudentstatus_model::STATUS_ABSOLVENT,
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			// 'statusgrund_id' => $statusgrund_id,
+			// 'ausbildungssemester' => $ausbildungssemester,
+			'datum' => date('c'),
+			'insertvon' => $insertvon,
+			'insertamum' => date('c'),
+			'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz,
+			'studienplan_id'=> $prestudent_status->studienplan_id,
+			'bestaetigtvon' => $insertvon,
+			'bestaetigtam' => date('c'),
+		]);
+
+		if (isError($result))
+			return $result;
+
+		$result = $this->_ci->StudentModel->checkIfUid($prestudent_id);
+		if (isError($result)) {
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		$student_uid = $result->retval;
+
+		//load student
+		$result = $this->_ci->StudentModel->loadWhere(
+			array(
+				'student_uid' => $student_uid
+			)
+		);
+		if (isError($result))
+		{
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+
+		$studentData = current(getData($result) ? : []);
+		$verband = $studentData->verband == '' ? '' : $studentData->verband;
+		$gruppe = $studentData->gruppe == '' ? '' : $studentData->gruppe;
+		$studiengang_kz = $studentData->studiengang_kz;
+
+		//process studentlehrverband
+		$this->_ci->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
+		$result = $this->_ci->StudentlehrverbandModel->processStudentlehrverband(
+			$student_uid,
+			$studiengang_kz,
+			$ausbildungssemester,
+			$verband,
+			$gruppe,
+			$studiensemester_kurzbz
+		);
+
+		return success();
+	}
 
 }
diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php
index a2e793624..706cd82ba 100644
--- a/application/models/crm/Prestudentstatus_model.php
+++ b/application/models/crm/Prestudentstatus_model.php
@@ -5,6 +5,9 @@ class Prestudentstatus_model extends DB_Model
 
 	const STATUS_ABBRECHER = 'Abbrecher';
 	const STATUS_UNTERBRECHER = 'Unterbrecher';
+	const STATUS_STUDENT = 'Student';
+	const STATUS_DIPLOMAND = 'Diplomand';
+	const STATUS_ABSOLVENT = 'Absolvent';
 
 	/**
 	 * Constructor
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index 9a0da98d2..154662ac1 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -706,8 +706,7 @@ export default{
 									<option  value="Bewerber">BewerberIn</option>
 									<option  value="Aufgenommener">Aufgenommene/r</option>
 									<option  value="Student">StudentIn</option>
-<!--									TODO(Manu) handle Unterbrecher from here
-									<option  value="Unterbrecher">UnterbrecherIn</option>-->
+									<option  value="Unterbrecher">UnterbrecherIn</option>
 									<option  value="Diplomand">DiplomandIn</option>
 									<option  value="Incoming">Incoming</option>
 								</form-input>
@@ -873,8 +872,7 @@ export default{
 									<option  value="Bewerber">BewerberIn</option>
 									<option  value="Aufgenommener">Aufgenommene/r</option>
 									<option  value="Student">StudentIn</option>
-<!--									TODO(Manu) check: is handle Unterbrecher from here necessary?
-									<option  value="Unterbrecher">UnterbrecherIn</option>-->
+									<option  value="Unterbrecher">UnterbrecherIn</option>
 									<option  value="Diplomand">DiplomandIn</option>
 									<option  value="Incoming">Incoming</option>
 								</form-input>

From f276435750bca9f0ba2d171979908aa0a63aed97 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 18 Jun 2024 08:36:02 +0200
Subject: [PATCH 0806/1461] Student list code rearrangement

---
 .../api/frontend/v1/stv/Students.php          | 46 ++++++++++++-------
 .../Stv/Studentenverwaltung/List.js           |  4 +-
 2 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Students.php b/application/controllers/api/frontend/v1/stv/Students.php
index bbda774e8..2f16435f9 100644
--- a/application/controllers/api/frontend/v1/stv/Students.php
+++ b/application/controllers/api/frontend/v1/stv/Students.php
@@ -312,47 +312,59 @@ class Students extends FHCAPI_Controller
 				break;
 		}
 
+		$this->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
 		$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
 		$this->PrestudentModel->addJoin('public.tbl_prestudentstatus ps', 'ps.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ') AND ps.prestudent_id=tbl_prestudent.prestudent_id AND ps.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ') AND ps.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ')', 'LEFT');
 		
-		$this->PrestudentModel->addSelect('p.person_id');
-		$this->PrestudentModel->addSelect('tbl_prestudent.prestudent_id');
 		$this->PrestudentModel->addSelect("'' AS uid");
 		$this->PrestudentModel->addSelect('titelpre');
-		$this->PrestudentModel->addSelect('titelpost');
+		$this->PrestudentModel->addSelect('nachname');
 		$this->PrestudentModel->addSelect('vorname');
 		$this->PrestudentModel->addSelect('wahlname');
 		$this->PrestudentModel->addSelect('vornamen');
-		$this->PrestudentModel->addSelect('geschlecht');
-		$this->PrestudentModel->addSelect('nachname');
-		$this->PrestudentModel->addSelect('gebdatum');
-		$this->PrestudentModel->addSelect('tbl_prestudent.anmerkung');
-		$this->PrestudentModel->addSelect('ersatzkennzeichen');
+		$this->PrestudentModel->addSelect('titelpost');
 		$this->PrestudentModel->addSelect('svnr');
-		$this->PrestudentModel->addSelect("'' AS matrikelnr");
-		$this->PrestudentModel->addSelect('p.anmerkung AS anmerkungen');
+		$this->PrestudentModel->addSelect('ersatzkennzeichen');
+		$this->PrestudentModel->addSelect('gebdatum');
+		$this->PrestudentModel->addSelect('geschlecht');
 		$this->PrestudentModel->addSelect("CASE WHEN ps.status_kurzbz IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') THEN ps.ausbildungssemester::text ELSE ''::text END AS semester", false);
 		$this->PrestudentModel->addSelect("'' AS verband");
 		$this->PrestudentModel->addSelect("'' AS gruppe");
+		$this->PrestudentModel->addSelect('UPPER(stg.typ || stg.kurzbz) AS studiengang');
 		$this->PrestudentModel->addSelect('tbl_prestudent.studiengang_kz');
-		$this->PrestudentModel->addSelect('aufmerksamdurch_kurzbz');
-		$this->PrestudentModel->addSelect('mentor');
-		$this->PrestudentModel->addSelect('NULL AS bnaktiv', false);
+		$this->PrestudentModel->addSelect("'' AS matrikelnr");
+		$this->PrestudentModel->addSelect('p.person_id');
+		$this->PrestudentModel->addSelect('public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) as status');
+		//status datum
+		//status bestätigung
+		//status datum iso
+		//status bestätigung iso
 		$this->PrestudentModel->addSelect(
 			"(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung LIMIT 1) AS email_privat",
 			false
 		);
+		//email intern
+		$this->PrestudentModel->addSelect('p.anmerkung AS anmerkungen');
+		$this->PrestudentModel->addSelect('tbl_prestudent.anmerkung');
+		//orgform
+		$this->PrestudentModel->addSelect('aufmerksamdurch_kurzbz');
 		$this->PrestudentModel->addSelect(
 			"(SELECT rt_gesamtpunkte AS punkte FROM public.tbl_prestudent WHERE prestudent_id=ps.prestudent_id) AS punkte",
 			false
 		);
+		$this->PrestudentModel->addSelect('tbl_prestudent.aufnahmegruppe_kurzbz');
 		$this->PrestudentModel->addSelect('tbl_prestudent.dual');
+		$this->PrestudentModel->addSelect('p.matr_nr');
+		//studienplan
+		$this->PrestudentModel->addSelect('tbl_prestudent.prestudent_id');
+		$this->PrestudentModel->addSelect('tbl_prestudent.priorisierung');
+		$this->PrestudentModel->addSelect('mentor');
+		$this->PrestudentModel->addSelect('NULL AS bnaktiv', false);
+		//gebdatum iso
+
 		$this->PrestudentModel->addSelect('tbl_prestudent.reihungstest_id');
 		$this->PrestudentModel->addSelect('tbl_prestudent.anmeldungreihungstest');
-		$this->PrestudentModel->addSelect('p.matr_nr');
 		$this->PrestudentModel->addSelect('tbl_prestudent.gsstudientyp_kurzbz');
-		$this->PrestudentModel->addSelect('tbl_prestudent.aufnahmegruppe_kurzbz');
-		$this->PrestudentModel->addSelect('tbl_prestudent.priorisierung');
 		$this->PrestudentModel->addSelect('p.zugangscode');
 		$this->PrestudentModel->addSelect('p.bpk');
 		
@@ -491,6 +503,7 @@ class Students extends FHCAPI_Controller
 
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 
+		$this->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
 		$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
 		$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id', 'LEFT');
 		$this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid', 'LEFT');
@@ -519,6 +532,7 @@ class Students extends FHCAPI_Controller
 		$this->PrestudentModel->addSelect("COALESCE(v.semester::text, CASE WHEN public.get_rolle_prestudent(prestudent_id, NULL) IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') THEN public.get_absem_prestudent(prestudent_id, NULL)::text ELSE ''::text END) AS semester", false);
 		$this->PrestudentModel->addSelect('v.verband');
 		$this->PrestudentModel->addSelect('v.gruppe');
+		$this->PrestudentModel->addSelect('UPPER(stg.typ || stg.kurzbz) AS studiengang');
 		$this->PrestudentModel->addSelect('tbl_prestudent.studiengang_kz');
 		$this->PrestudentModel->addSelect('aufmerksamdurch_kurzbz');
 		$this->PrestudentModel->addSelect('mentor');
diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index d7be85a4d..243f9c76f 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -42,8 +42,8 @@ export default {
 					{title:"Personenkennzeichen", field:"matrikelnummer"},
 					{title:"PersonID", field:"person_id"},
 					{title:"Status", field:"status"},
-					{title:"Status Datum", field:"status_datum_iso", visible:false},
-					{title:"Status Bestaetigung", field:"status_bestaetigung_iso", visible:false},
+					{title:"Status Datum", field:"status_datum", visible:false},
+					{title:"Status Bestaetigung", field:"status_bestaetigung", visible:false},
 					{title:"Status Datum ISO", field:"status_datum_iso", visible:false},
 					{title:"Status Bestaetigung ISO", field:"status_bestaetigung_iso", visible:false},
 					{title:"EMail (Privat)", field:"mail_privat", visible:false},

From 3e0c15e18f4ea64dd8790fc132b5e1c61414aca7 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 18 Jun 2024 11:12:12 +0200
Subject: [PATCH 0807/1461] Datum bei Abmeldung d StgL PDF

---
 rdf/AntragAbmeldungStgl.xml.php    | 22 ++++++++++++----------
 system/xsl/AntragAbmeldungStgl.xsl | 10 ++++++++++
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/rdf/AntragAbmeldungStgl.xml.php b/rdf/AntragAbmeldungStgl.xml.php
index 1e18e798b..854121b5d 100644
--- a/rdf/AntragAbmeldungStgl.xml.php
+++ b/rdf/AntragAbmeldungStgl.xml.php
@@ -36,7 +36,7 @@ else
 
 
 $query = "
-	SELECT stg.bezeichnung, bezeichnung_mehrsprachig[(SELECT index FROM public.tbl_sprache WHERE sprache=" . $db->db_add_param(getSprache(), FHC_STRING) . ")], studierendenantrag_id, matrikelnr, studienjahr_kurzbz, a.studiensemester_kurzbz, vorname, nachname, studiengang_kz, pss.ausbildungssemester AS semester, a.grund
+	SELECT stg.bezeichnung, bezeichnung_mehrsprachig[(SELECT index FROM public.tbl_sprache WHERE sprache=" . $db->db_add_param(getSprache(), FHC_STRING) . ")], studierendenantrag_id, matrikelnr, studienjahr_kurzbz, a.studiensemester_kurzbz, vorname, nachname, studiengang_kz, pss.ausbildungssemester AS semester, pss.bestaetigtam, a.grund
 	FROM
 	campus.tbl_studierendenantrag a
 	JOIN public.tbl_student USING (prestudent_id)
@@ -56,15 +56,17 @@ if (!$db->db_query($query) || !$db->db_num_rows())
 <?xml version='1.0' encoding='UTF-8' standalone='yes'?>
 <antraege>
 	<?php while($row = $db->db_fetch_object()) { ?>
-        <antrag>
-            <name><![CDATA[<?= trim($row->vorname . ' ' . $row->nachname); ?>]]></name>
-            <studiengang><![CDATA[<?= $row->bezeichnung; ?>]]></studiengang>
-            <organisationsform><![CDATA[<?= $row->bezeichnung_mehrsprachig; ?>]]></organisationsform>
-            <personenkz><![CDATA[<?= $row->matrikelnr; ?>]]></personenkz>
-            <studienjahr><![CDATA[<?= $row->studienjahr_kurzbz; ?>]]></studienjahr>
-            <studiensemester><![CDATA[<?= $row->studiensemester_kurzbz; ?>]]></studiensemester>
-            <semester><![CDATA[<?= $row->semester; ?>]]></semester>
-            <grund><![CDATA[<?= $row->grund; ?>]]></grund>
+		<?php $abmeldedatum = new DateTime($row->bestaetigtam); ?>
+		<antrag>
+			<name><![CDATA[<?= trim($row->vorname . ' ' . $row->nachname); ?>]]></name>
+			<studiengang><![CDATA[<?= $row->bezeichnung; ?>]]></studiengang>
+			<organisationsform><![CDATA[<?= $row->bezeichnung_mehrsprachig; ?>]]></organisationsform>
+			<personenkz><![CDATA[<?= $row->matrikelnr; ?>]]></personenkz>
+			<studienjahr><![CDATA[<?= $row->studienjahr_kurzbz; ?>]]></studienjahr>
+			<studiensemester><![CDATA[<?= $row->studiensemester_kurzbz; ?>]]></studiensemester>
+			<semester><![CDATA[<?= $row->semester; ?>]]></semester>
+			<abmeldedatum><![CDATA[<?= $abmeldedatum->format('d.m.Y'); ?>]]></abmeldedatum>
+			<grund><![CDATA[<?= $row->grund; ?>]]></grund>
 	</antrag>
 	<?php } ?>
 </antraege>
diff --git a/system/xsl/AntragAbmeldungStgl.xsl b/system/xsl/AntragAbmeldungStgl.xsl
index aa6a28073..58ce56dfb 100644
--- a/system/xsl/AntragAbmeldungStgl.xsl
+++ b/system/xsl/AntragAbmeldungStgl.xsl
@@ -345,6 +345,16 @@
 							</text:p>
 						</table:table-cell>
 					</table:table-row>
+					<table:table-row table:style-name="Tabelle2.1">
+						<table:table-cell table:style-name="Tabelle2.A1" office:value-type="string">
+							<text:p text:style-name="P5">Abmeldedatum</text:p>
+						</table:table-cell>
+						<table:table-cell table:style-name="Tabelle2.A1" office:value-type="string">
+							<text:p text:style-name="P5">
+								<text:span text:style-name="T4"><xsl:value-of select="abmeldedatum"/></text:span>
+							</text:p>
+						</table:table-cell>
+					</table:table-row>
 					<table:table-row table:style-name="Tabelle2.5">
 						<table:table-cell table:style-name="Tabelle2.A1" table:number-columns-spanned="2" office:value-type="string">
 							<text:p text:style-name="P8">Grund der Abmeldung:</text:p>

From b4b44d9a8937f10d7daa7bc6b202cff642722c8e Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 18 Jun 2024 14:15:35 +0200
Subject: [PATCH 0808/1461] added entschuldigung & anw_user notizen;
 entschukldigung notizen working; WIP anw notizen; api fixes entschuldigung;
 LE for LVA fetch now disregarding stundenplan; Paths renamed to new
 controller names;

---
 system/phrasesupdate.php | 88 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 84 insertions(+), 4 deletions(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 1d4261ac7..e9db8f2cf 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -25044,18 +25044,18 @@ array(
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
-		'phrase' => 'entschuldigungsmanagementStudiengangsassistenz',
+		'phrase' => 'entschuldigungsmanagement',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Entschuldigungsmanagement Studiengangsassistenz',
+				'text' => 'Entschuldigungsmanagement',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Excuse note management for degree program assistants',
+				'text' => 'Excuse note management',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -26380,7 +26380,87 @@ array(
 				'insertvon' => 'system'
 			)
 		)
-	)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'entschuldigungNotizAblehnen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Entschuldigung Ablehnen Begründung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Excuse note rejection reason',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'reject',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ablehnen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Reject',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'begruendungAnw',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Begründung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Reason',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'noStudentsFound',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Keine zugeteilten Studenten gefunden!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No assigned students found!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// FHC-CORE-ANWESENHEITEN END
 );
 

From 0729f2ed1af143a60c542a6619b595ca69a7566b Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 18 Jun 2024 16:24:57 +0200
Subject: [PATCH 0809/1461] refactor actions prestudentLib

---
 .../api/frontend/v1/stv/Status.php            |  26 +-
 application/libraries/PrestudentLib.php       | 368 +++---------------
 .../education/Studentlehrverband_model.php    |   4 +-
 .../models/organisation/Lehrverband_model.php |   1 +
 .../Details/Prestudent/MultiStatus.js         |  34 +-
 5 files changed, 72 insertions(+), 361 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index b38a108ea..6d1319f37 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -153,11 +153,6 @@ class Status extends FHCAPI_Controller
 			$ausbildungssemester = $lastStatusData->ausbildungssemester;
 		}
 
-		/*		if($status_kurzbz != 'Student')
-				{
-					$ausbildungssemester = $lastStatusData->ausbildungssemester;
-				}*/
-
 		//check if Rolle already exists
 		$result = $this->PrestudentstatusModel->checkIfExistingPrestudentRolle(
 			$prestudent_id,
@@ -231,7 +226,6 @@ class Status extends FHCAPI_Controller
 		}
 
 		//check if studentrolle already exists
-		//TODO(manu) refactor and test
 		if($status_kurzbz == 'Student' || $status_kurzbz == 'Diplomand' || $lastStatusData->status_kurzbz == 'Student')
 		{
 			$this->load->model('crm/Student_model', 'StudentModel');
@@ -276,7 +270,6 @@ class Status extends FHCAPI_Controller
 			}
 
 			//check if Bismeldestichtag erreicht
-			//TODO(manu) Test...
 			$this->load->model('codex/Bismeldestichtag_model', 'BismeldestichtagModel');
 			$result = $this->BismeldestichtagModel->checkIfMeldestichtagErreicht($new_status_datum);
 			if (isError($result))
@@ -320,7 +313,7 @@ class Status extends FHCAPI_Controller
 			$studiensemester_kurzbz = $lastStatusData->studiensemester_kurzbz;
 
 			$this->load->library('PrestudentLib');
-			$result = $this->prestudentlib->setUnterbrecherFas($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $datum, $bestaetigtam, $bestaetigtvon);
+			$result = $this->prestudentlib->setUnterbrecher($prestudent_id, $studiensemester_kurzbz, null, null, $ausbildungssemester);
 			if (isError($result))
 			{
 				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
@@ -329,11 +322,8 @@ class Status extends FHCAPI_Controller
 				$this->terminateWithSuccess($prestudent_id);
 		}
 
-		//TODO(Manu) documentation: here setStudent Logic!
 		if($status_kurzbz == 'Student')
 		{
-			//return $this->terminateWithError($studiensemester_kurzbz . " - " . $ausbildungssemester, self::ERROR_TYPE_GENERAL);
-
 			$this->load->library('PrestudentLib');
 			$result = $this->prestudentlib->setStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id, $bestaetigtam, $bestaetigtvon);
 
@@ -348,10 +338,8 @@ class Status extends FHCAPI_Controller
 
 		if($status_kurzbz == 'Diplomand')
 		{
-			//return $this->terminateWithError("in setDiplomand", self::ERROR_TYPE_GENERAL);
-
 			$this->load->library('PrestudentLib');
-			$result = $this->prestudentlib->setDiplomand($prestudent_id, $studiensemester_kurzbz,$ausbildungssemester, $bestaetigtam, $bestaetigtvon);
+			$result = $this->prestudentlib->setDiplomand($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
 
 			if (isError($result))
 			{
@@ -364,10 +352,8 @@ class Status extends FHCAPI_Controller
 
 		if($status_kurzbz == 'Absolvent')
 		{
-			//return $this->terminateWithError("in setAbsolvent", self::ERROR_TYPE_GENERAL);
-
 			$this->load->library('PrestudentLib');
-			$result = $this->prestudentlib->setAbsolvent($prestudent_id, $studiensemester_kurzbz,$ausbildungssemester, $bestaetigtam, $bestaetigtvon);
+			$result = $this->prestudentlib->setAbsolvent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
 
 			if (isError($result))
 			{
@@ -378,8 +364,6 @@ class Status extends FHCAPI_Controller
 			
 		}
 
-		return $this->terminateWithError("Warning! not in setStatus Mode", self::ERROR_TYPE_GENERAL);
-
 		// Start DB transaction
 		$this->db->trans_begin(); // Beginnen der Transaktion
 
@@ -405,7 +389,6 @@ class Status extends FHCAPI_Controller
 		if ($this->db->trans_status() === false || isError($result))
 		{
 			$this->db->trans_rollback();
-			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 		}
 
 		if($isStudent)
@@ -455,7 +438,8 @@ class Status extends FHCAPI_Controller
 			if ($this->db->trans_status() === false || isError($result))
 			{
 				$this->db->trans_rollback();
-				return $this->terminateWithError($this->p->t('lehre','error_duringInsertUpdateLehrverband'), self::ERROR_TYPE_GENERAL);
+			//	return $this->terminateWithError($result->code);
+			return $this->terminateWithError($this->p->t('lehre','error_duringInsertUpdateLehrverband'), self::ERROR_TYPE_GENERAL);
 			}
 
 			//update(fuer Abbrecher und Unterbrecher)
diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php
index af283da01..962773384 100644
--- a/application/libraries/PrestudentLib.php
+++ b/application/libraries/PrestudentLib.php
@@ -206,7 +206,7 @@ class PrestudentLib
 		return success();
 	}
 
-	public function setUnterbrecher($prestudent_id, $studiensemester_kurzbz, $studierendenantrag_id, $insertvon = null)
+	public function setUnterbrecher($prestudent_id, $studiensemester_kurzbz, $studierendenantrag_id = null, $insertvon = null, $ausbildungssemester = null)
 	{
 		$ausbildungssemester_plus = 0;
 		if (!$insertvon)
@@ -259,21 +259,32 @@ class PrestudentLib
 
 		$student = current($result);
 
-		$resultAntrag = $this->_ci->StudierendenantragModel->load($studierendenantrag_id);
-		if (isError($resultAntrag))
-			return $resultAntrag;
-		$resultAntrag = getData($resultAntrag);
-		if (!$resultAntrag)
-			return error($this->_ci->p->t('studierendenantrag', 'error_no_antrag_found', ['id' => $studierendenantrag_id]));
+		if($studierendenantrag_id)
+		{
+			$resultAntrag = $this->_ci->StudierendenantragModel->load($studierendenantrag_id);
+			if (isError($resultAntrag))
+				return $resultAntrag;
+			$resultAntrag = getData($resultAntrag);
+			if (!$resultAntrag)
+				return error($this->_ci->p->t('studierendenantrag', 'error_no_antrag_found', ['id' => $studierendenantrag_id]));
 
-		$antrag = current($resultAntrag);
+			$antrag = current($resultAntrag);
+			$anmerkung = 'Wiedereinstieg ' . $antrag->datum_wiedereinstieg;
+		}
+		else
+			$anmerkung = '';
+
+		if($ausbildungssemester)
+			$semester = $ausbildungssemester;
+		else
+			$semester = $prestudent_status->ausbildungssemester + $ausbildungssemester_plus;
 
 		//Status updaten
 		$result = $this->_ci->PrestudentstatusModel->insert([
 			'prestudent_id' => $prestudent_id,
 			'status_kurzbz' => Prestudentstatus_model::STATUS_UNTERBRECHER,
 			'studiensemester_kurzbz' => $studiensemester_kurzbz,
-			'ausbildungssemester' => $prestudent_status->ausbildungssemester + $ausbildungssemester_plus,
+			'ausbildungssemester' => $semester,
 			'datum' => date('c'),
 			'insertvon' => $insertvon,
 			'insertamum' => date('c'),
@@ -281,7 +292,7 @@ class PrestudentLib
 			'studienplan_id'=> $prestudent_status->studienplan_id,
 			'bestaetigtvon' => $insertvon,
 			'bestaetigtam' => date('c'),
-			'anmerkung'=> 'Wiedereinstieg ' . $antrag->datum_wiedereinstieg
+			'anmerkung'=> $anmerkung
 		]);
 
 		if (isError($result))
@@ -410,22 +421,19 @@ class PrestudentLib
 		return success();
 	}
 
-	public function setUnterbrecherFas($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $datum, $bestaetigtAm, $bestaetigtVon)
+
+	public function setStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id, $bestaetigtAm, $bestaetigtVon)
 	{
 		$insertvon = getAuthUID();
-
+		 
 		$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id, $studiensemester_kurzbz);
 		if (isError($result))
 			return $result;
 		$result = getData($result);
-		if (!$result) {
-			//NOTE(manu): only valid if nextSemester focus max
-
-			$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
-			if (isError($result))
-				return $result;
-			$result = getData($result);
 
+		//if not Wiederholer
+		if($statusgrund_id != 16)
+		{
 			//check if ausbildungssemester is last
 			$this->_ci->StudiengangModel->addJoin('public.tbl_prestudent p', 'studiengang_kz');
 			$res = $this->_ci->StudiengangModel->loadWhere(['p.prestudent_id' => $prestudent_id]);
@@ -438,8 +446,6 @@ class PrestudentLib
 
 			$studiengang = current(getData($res));
 			$prestudent_status = current($result);
-			if($prestudent_status->ausbildungssemester + 1 < $studiengang->max_semester)
-				$ausbildungssemester_plus = 1;
 
 			if(!$result)
 			{
@@ -461,211 +467,6 @@ class PrestudentLib
 
 		$student = current($result);
 
-/*		$resultAntrag = $this->_ci->StudierendenantragModel->load($studierendenantrag_id);
-		if (isError($resultAntrag))
-			return $resultAntrag;
-		$resultAntrag = getData($resultAntrag);
-		if (!$resultAntrag)
-			return error($this->_ci->p->t('studierendenantrag', 'error_no_antrag_found', ['id' => $studierendenantrag_id]));
-
-		$antrag = current($resultAntrag);*/
-
-		//Status updaten
-		$result = $this->_ci->PrestudentstatusModel->insert([
-			'prestudent_id' => $prestudent_id,
-			'status_kurzbz' => Prestudentstatus_model::STATUS_UNTERBRECHER,
-			'studiensemester_kurzbz' => $studiensemester_kurzbz,
-			'ausbildungssemester' => $ausbildungssemester,
-			'datum' => date('c'),
-			'insertvon' => $insertvon,
-			'insertamum' => date('c'),
-			'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz,
-			'studienplan_id'=> $prestudent_status->studienplan_id,
-			'bestaetigtvon' => $insertvon,
-			'bestaetigtam' => date('c'),
-/*			'anmerkung'=> 'Wiedereinstieg ' . $antrag->datum_wiedereinstieg*/
-		]);
-
-		if (isError($result))
-			return $result;
-
-		//Verband anlegen
-		$result = $this->_ci->LehrverbandModel->load([
-			'studiengang_kz' => $student->studiengang_kz,
-			'semester' => 0,
-			'verband' => 'B',
-			'gruppe' => ''
-		]);
-
-		if (isError($result))
-			return $result;
-		$result = getData($result);
-		if (!$result)
-		{
-			$result = $this->_ci->LehrverbandModel->load([
-				'studiengang_kz' => $student->studiengang_kz,
-				'semester' => 0,
-				'verband' => '',
-				'gruppe' => ''
-			]);
-			if (isError($result))
-				return $result;
-			$result = getData($result);
-
-			if(!$result)
-			{
-				$this->_ci->LehrverbandModel->insert([
-					'studiengang_kz' => $student->studiengang_kz,
-					'semester' => 0,
-					'verband' => '',
-					'gruppe' => '',
-					'bezeichnung' => 'Ab-Unterbrecher',
-					'aktiv' => true,
-				]);
-			}
-
-			$this->_ci->LehrverbandModel->insert([
-				'studiengang_kz' => $student->studiengang_kz,
-				'semester' => 0,
-				'verband' => 'B',
-				'gruppe' => '',
-				'bezeichnung' => 'Unterbrecher',
-				'aktiv' => true
-			]);
-		}
-
-		//noch nicht eingetragene Zeugnisnoten auf 9 setzen
-		$result = $this->_ci->ZeugnisnoteModel->getZeugnisnoten($student->student_uid, $studiensemester_kurzbz);
-		if (isError($result))
-			return $result;
-		$result = getData($result) ?: [];
-
-		foreach ($result as $lv)
-		{
-			if (!$lv->note)
-			{
-				$result = $this->_ci->ZeugnisnoteModel->insert([
-					'note' => 9,
-					'studiensemester_kurzbz' => $lv->studiensemester_kurzbz,
-					'student_uid' => $lv->uid,
-					'lehrveranstaltung_id' => $lv->lehrveranstaltung_id
-				]);
-				if (isError($result)) {
-					$result = $this->_ci->ZeugnisnoteModel->update([
-						'studiensemester_kurzbz' => $lv->studiensemester_kurzbz,
-						'student_uid' => $lv->uid,
-						'lehrveranstaltung_id' => $lv->lehrveranstaltung_id
-					], [
-						'note' => 9
-					]);
-
-					if (isError($result))
-						return $result;
-				}
-			}
-		}
-
-
-		//Update Aktionen
-
-		//StudentModel updaten
-		$this->_ci->StudentModel->update([
-			'student_uid' => $student->student_uid
-		], [
-			'verband' => 'B',
-			'gruppe' => '',
-			'semester' => 0,
-			'updatevon' => $insertvon,
-			'updateamum' => date('c')
-		]);
-
-		//Studentlehrverband setzen
-		$result = $this->_ci->StudentlehrverbandModel->loadWhere([
-			'studiensemester_kurzbz' => $studiensemester_kurzbz,
-			'student_uid' => $student->student_uid
-		]);
-		if (hasData($result)) {
-			$this->_ci->StudentlehrverbandModel->update([
-				'studiensemester_kurzbz' => $studiensemester_kurzbz,
-				'student_uid' => $student->student_uid
-			], [
-				'studiengang_kz' => $student->studiengang_kz,
-				'semester' => 0,
-				'verband' => 'B',
-				'gruppe' => '',
-				'updateamum' => date('c'),
-				'updatevon' => $insertvon
-			]);
-		} else {
-			$this->_ci->StudentlehrverbandModel->insert([
-				'student_uid' => $student->student_uid,
-				'studiensemester_kurzbz' => $studiensemester_kurzbz,
-				'studiengang_kz' => $student->studiengang_kz,
-				'semester' => 0,
-				'verband' => 'B',
-				'gruppe' => '',
-				'insertamum' => date('c'),
-				'insertvon' => $insertvon
-			]);
-		}
-
-		return success();
-	}
-
-	public function setStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id, $bestaetigtAm, $bestaetigtVon)
-	{
-		$insertvon = getAuthUID();
-		 
-		$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id, $studiensemester_kurzbz);
-		if (isError($result))
-			return $result;
-		$result = getData($result);
-		if (!$result)
-		{
-
-			$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
-			if (isError($result))
-				return $result;
-			$result = getData($result);
-
-			if($statusgrund_id != 16)
-			{
-			//check if ausbildungssemester is last
-				$this->_ci->StudiengangModel->addJoin('public.tbl_prestudent p', 'studiengang_kz');
-				$res = $this->_ci->StudiengangModel->loadWhere(['p.prestudent_id' => $prestudent_id]);
-				if(isError($res))
-					return $res;
-				if(!hasData($res))
-					return error($this->_ci->p->t('studierendenantrag', 'error_no_stg_for_prestudent', [
-						'prestudent_id' => $prestudent_id
-					]));
-
-				$studiengang = current(getData($res));
-				$prestudent_status = current($result);
-				if($prestudent_status->ausbildungssemester + 1 < $studiengang->max_semester)
-					$ausbildungssemester_plus = 1;
-
-				if(!$result)
-				{
-					return error($this->_ci->p->t('studierendenantrag', 'error_no_prestudent_in_sem', [
-						'prestudent_id' => $prestudent_id,
-						'studiensemester_kurzbz' => $studiensemester_kurzbz
-					]));
-				}
-			}
-		}
-
-		$prestudent_status = current($result);
-		$result = $this->_ci->StudentModel->loadWhere(['prestudent_id' => $prestudent_id]);
-
-		if (isError($result))
-			return $result;
-		$result = getData($result);
-		if (!$result)
-			return error($this->_ci->p->t('studierendenantrag', 'error_no_student_for_prestudent', ['prestudent_id' => $prestudent_id]));
-
-		$student = current($result);
-
 		//Status updaten
 		$result = $this->_ci->PrestudentstatusModel->insert([
 			'prestudent_id' => $prestudent_id,
@@ -678,8 +479,8 @@ class PrestudentLib
 			'insertamum' => date('c'),
 			'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz,
 			'studienplan_id'=> $prestudent_status->studienplan_id,
-			'bestaetigtvon' => $insertvon,
-			'bestaetigtam' => date('c'),
+			'bestaetigtvon' => $bestaetigtVon,
+			'bestaetigtam' => $bestaetigtAm
 		]);
 
 		if (isError($result))
@@ -687,7 +488,7 @@ class PrestudentLib
 
 		$result = $this->_ci->StudentModel->checkIfUid($prestudent_id);
 		if (isError($result)) {
-			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			return $result;
 		}
 		$student_uid = $result->retval;
 
@@ -699,7 +500,7 @@ class PrestudentLib
 		);
 		if (isError($result))
 		{
-			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			return $result;
 		}
 
 		$studentData = current(getData($result) ? : []);
@@ -721,48 +522,14 @@ class PrestudentLib
 		return success();
 	}
 
-	public function setDiplomand($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester,$bestaetigtAm, $bestaetigtVon)
+	public function setDiplomand($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester)
 	{
 		$insertvon = getAuthUID();
-		 
+
 		$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id, $studiensemester_kurzbz);
 		if (isError($result))
 			return $result;
 		$result = getData($result);
-		if (!$result)
-		{
-
-			$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
-			if (isError($result))
-				return $result;
-			$result = getData($result);
-
-			if($statusgrund_id != 16)
-			{
-			//check if ausbildungssemester is last
-				$this->_ci->StudiengangModel->addJoin('public.tbl_prestudent p', 'studiengang_kz');
-				$res = $this->_ci->StudiengangModel->loadWhere(['p.prestudent_id' => $prestudent_id]);
-				if(isError($res))
-					return $res;
-				if(!hasData($res))
-					return error($this->_ci->p->t('studierendenantrag', 'error_no_stg_for_prestudent', [
-						'prestudent_id' => $prestudent_id
-					]));
-
-				$studiengang = current(getData($res));
-				$prestudent_status = current($result);
-				if($prestudent_status->ausbildungssemester + 1 < $studiengang->max_semester)
-					$ausbildungssemester_plus = 1;
-
-				if(!$result)
-				{
-					return error($this->_ci->p->t('studierendenantrag', 'error_no_prestudent_in_sem', [
-						'prestudent_id' => $prestudent_id,
-						'studiensemester_kurzbz' => $studiensemester_kurzbz
-					]));
-				}
-			}
-		}
 
 		$prestudent_status = current($result);
 		$result = $this->_ci->StudentModel->loadWhere(['prestudent_id' => $prestudent_id]);
@@ -780,8 +547,7 @@ class PrestudentLib
 			'prestudent_id' => $prestudent_id,
 			'status_kurzbz' => Prestudentstatus_model::STATUS_DIPLOMAND,
 			'studiensemester_kurzbz' => $studiensemester_kurzbz,
-			// 'statusgrund_id' => $statusgrund_id,
-			// 'ausbildungssemester' => $ausbildungssemester,
+			'ausbildungssemester' => $ausbildungssemester,
 			'datum' => date('c'),
 			'insertvon' => $insertvon,
 			'insertamum' => date('c'),
@@ -796,7 +562,7 @@ class PrestudentLib
 
 		$result = $this->_ci->StudentModel->checkIfUid($prestudent_id);
 		if (isError($result)) {
-			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			return $result;
 		}
 		$student_uid = $result->retval;
 
@@ -808,7 +574,7 @@ class PrestudentLib
 		);
 		if (isError($result))
 		{
-			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			return $result;
 		}
 
 		$studentData = current(getData($result) ? : []);
@@ -826,52 +592,31 @@ class PrestudentLib
 			$gruppe,
 			$studiensemester_kurzbz
 		);
+		if (isError($result))
+		{
+			return $result;
+		}
 
 		return success();
 	}
 
-	public function setAbsolvent($prestudent_id,$studiensemester_kurzbz, $ausbildungssemester, $bestaetigtAm, $bestaetigtVon)
+	public function setAbsolvent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester)
 	{
+		//TODO(Manu) makes no difference
+/*		if (gettype($ausbildungssemester) != "integer") {
+			$ausbildungssemester = (int)$ausbildungssemester;
+		}*/
+
+/*		if (!is_string($ausbildungssemester)) {
+			$ausbildungssemester = (string)$ausbildungssemester; // Oder verwende strval($ausbildungssemester)
+		}*/
+
 		$insertvon = getAuthUID();
 		 
 		$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id, $studiensemester_kurzbz);
 		if (isError($result))
 			return $result;
 		$result = getData($result);
-		if (!$result)
-		{
-
-			$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
-			if (isError($result))
-				return $result;
-			$result = getData($result);
-
-			if($statusgrund_id != 16)
-			{
-			//check if ausbildungssemester is last
-				$this->_ci->StudiengangModel->addJoin('public.tbl_prestudent p', 'studiengang_kz');
-				$res = $this->_ci->StudiengangModel->loadWhere(['p.prestudent_id' => $prestudent_id]);
-				if(isError($res))
-					return $res;
-				if(!hasData($res))
-					return error($this->_ci->p->t('studierendenantrag', 'error_no_stg_for_prestudent', [
-						'prestudent_id' => $prestudent_id
-					]));
-
-				$studiengang = current(getData($res));
-				$prestudent_status = current($result);
-				if($prestudent_status->ausbildungssemester + 1 < $studiengang->max_semester)
-					$ausbildungssemester_plus = 1;
-
-				if(!$result)
-				{
-					return error($this->_ci->p->t('studierendenantrag', 'error_no_prestudent_in_sem', [
-						'prestudent_id' => $prestudent_id,
-						'studiensemester_kurzbz' => $studiensemester_kurzbz
-					]));
-				}
-			}
-		}
 
 		$prestudent_status = current($result);
 		$result = $this->_ci->StudentModel->loadWhere(['prestudent_id' => $prestudent_id]);
@@ -882,15 +627,14 @@ class PrestudentLib
 		if (!$result)
 			return error($this->_ci->p->t('studierendenantrag', 'error_no_student_for_prestudent', ['prestudent_id' => $prestudent_id]));
 
-		$student = current($result);
+	//	$student = current($result);
 
 		//Status updaten
 		$result = $this->_ci->PrestudentstatusModel->insert([
 			'prestudent_id' => $prestudent_id,
 			'status_kurzbz' => Prestudentstatus_model::STATUS_ABSOLVENT,
 			'studiensemester_kurzbz' => $studiensemester_kurzbz,
-			// 'statusgrund_id' => $statusgrund_id,
-			// 'ausbildungssemester' => $ausbildungssemester,
+			'ausbildungssemester' => $ausbildungssemester,
 			'datum' => date('c'),
 			'insertvon' => $insertvon,
 			'insertamum' => date('c'),
@@ -905,7 +649,7 @@ class PrestudentLib
 
 		$result = $this->_ci->StudentModel->checkIfUid($prestudent_id);
 		if (isError($result)) {
-			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			return $result;
 		}
 		$student_uid = $result->retval;
 
@@ -917,7 +661,7 @@ class PrestudentLib
 		);
 		if (isError($result))
 		{
-			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			return $result;
 		}
 
 		$studentData = current(getData($result) ? : []);
@@ -935,6 +679,10 @@ class PrestudentLib
 			$gruppe,
 			$studiensemester_kurzbz
 		);
+		if (isError($result))
+		{
+			return $result;
+		}
 
 		return success();
 	}
diff --git a/application/models/education/Studentlehrverband_model.php b/application/models/education/Studentlehrverband_model.php
index f7d25055c..d8c8c5da5 100644
--- a/application/models/education/Studentlehrverband_model.php
+++ b/application/models/education/Studentlehrverband_model.php
@@ -70,7 +70,6 @@ class Studentlehrverband_model extends DB_Model
 
 			if ($result->retval == "0")
 			{
-				//$this->terminateWithError("in section 0 und weiter.. wo verband auf leer gesetzt wird", self::ERROR_TYPE_GENERAL);
 				$result = $this->LehrverbandModel->insert([
 					'studiengang_kz' => $studiengang_kz,
 					'semester' => $ausbildungssemester,
@@ -87,6 +86,8 @@ class Studentlehrverband_model extends DB_Model
 				}
 			}
 
+
+
 			// Lehrverband insert
 			$bezeichnung = $verband == 'A' ? ' Abbrecher' : 'Unterbrecher';
 			$result = $this->LehrverbandModel->insert([
@@ -104,6 +105,7 @@ class Studentlehrverband_model extends DB_Model
 			}
 		}
 
+
 		// Studentlehrverband insert or update
 		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
 		$result = $this->StudentlehrverbandModel->checkIfStudentLehrverbandExists($student_uid, $studiensemester_kurzbz);
diff --git a/application/models/organisation/Lehrverband_model.php b/application/models/organisation/Lehrverband_model.php
index 2336e3408..2573b92e8 100644
--- a/application/models/organisation/Lehrverband_model.php
+++ b/application/models/organisation/Lehrverband_model.php
@@ -39,6 +39,7 @@ class Lehrverband_model extends DB_Model
 
 		$result = $this->execQuery($qry, array($studiengang_kz, $semester, $verband, $gruppe));
 
+
 		if(isError($result))
 		{
 			return error($result);
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index 154662ac1..5986480e6 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -2,7 +2,6 @@ import {CoreFilterCmpt} from "../../../../filter/Filter.js";
 import BsModal from "../../../../Bootstrap/Modal.js";
 import FormForm from '../../../../Form/Form.js';
 import FormInput from '../../../../Form/Input.js';
-import {CoreRESTClient} from "../../../../../RESTClient.js";
 
 export default{
 	components: {
@@ -49,11 +48,6 @@ export default{
 		}
 	},
 	computed: {
-/*		personIds(){
-			if (this.modelValue.person_id)
-				return [this.modelValue.person_id];
-			return this.modelValue.map(e => e.person_id);
-		},*/
 		prestudentIds(){
 			if (this.modelValue.prestudent_id)
 			{
@@ -71,7 +65,6 @@ export default{
 					name: `${this.modelValue.vorname} ${this.modelValue.nachname}`
 				};
 				dataArray.push(newObj);
-				//console.log(dataArray);
 				return dataArray;
 			}
 			else
@@ -94,7 +87,7 @@ export default{
 		},
 		arrayStg(){
 			let stgInteger = this.hasAssistenzPermissionForStgs.map(item => {
-				return parseInt(item); // Wandelt jeden String in eine ganze Zahl um
+				return parseInt(item);
 			});
 			return stgInteger;
 		},
@@ -140,11 +133,6 @@ export default{
 						minWidth: 150, // Ensures Action-buttons will be always fully displayed
 						formatter: (cell, formatterParams, onRendered) => {
 
-
-							//let disableButton = false;
-							//const rowData = this.row.getData();
-
-
 							let container = document.createElement('div');
 							container.className = "d-flex gap-2";
 
@@ -266,8 +254,6 @@ export default{
 					}
 				}
 			],
-//		}
-
 			statusData: {},
 			listStudiensemester: [],
 			maxSem:  Array.from({ length: 11 }, (_, index) => index),
@@ -365,7 +351,6 @@ export default{
 			this.actionButton = statusgrund;
 			this.actionStatusText = statusText;
 
-			console.log("statusgrund: " + this.actionButton + ' , statusText:  ' + this.actionStatusText + ' sem: ' + this.actionSem);
 			if(this.actionStatusText != "Student" && this.actionStatusText != "Wiederholer")
 				this.$refs.confirmStatusAction.show();
 			else
@@ -382,10 +367,10 @@ export default{
 				};
 			console.log(this.updateData);
 			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...abbruchData }));
-			console.log(this.newArray);
+/*			console.log(this.newArray);
 
 			console.log("in changeStatusToAbbrecher" + prestudentIds);
-			console.log("count: " + prestudentIds.length);
+			console.log("count: " + prestudentIds.length);*/
 
 			this.addNewStatus(prestudentIds);
 		},
@@ -400,8 +385,6 @@ export default{
 				};
 
 			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData }));
-
-			console.log("in changeStatusToAbbrecher" + prestudentIds);
 			this.addNewStatus(prestudentIds);
 		},
 		changeStatusToUnterbrecher(prestudentIds){
@@ -414,8 +397,6 @@ export default{
 				};
 
 			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData }));
-
-			console.log("in changeStatusToUnterbrecher" + prestudentIds);
 			this.addNewStatus(prestudentIds);
 		},
 		changeStatusToStudent(prestudentIds){
@@ -428,8 +409,6 @@ export default{
 				};
 
 			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData, ausbildungssemester: this.actionSem}));
-
-			console.log("in changeStatusToStudent" + prestudentIds);
 			this.addNewStatus(prestudentIds);
 		},
 		changeStatusToWiederholer(prestudentIds){
@@ -522,8 +501,6 @@ export default{
 						}
 					}
 
-
-
 					//Feedback Success als infoalert
 					 if (countSuccess > 0) {
 						 this.$fhcAlert.alertInfo(this.$p.t('ui', 'successNewStatus', {
@@ -572,7 +549,6 @@ export default{
 					})
 				.catch(this.$fhcAlert.handleSystemError)
 				.finally(() => {
-/*					window.scrollTo(0, 0);*/
 					this.reload();
 				});
 		},
@@ -659,13 +635,13 @@ export default{
 				this.listStudiensemester = result;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
-/*		this.$fhcApi
+		this.$fhcApi
 			.get('api/frontend/v1/stv/prestudent/getStudienplaene/' + this.modelValue.prestudent_id)
 			.then(result => result.data)
 			.then(result => {
 				this.listStudienplaene = result;
 			})
-			.catch(this.$fhcAlert.handleSystemError);*/
+			.catch(this.$fhcAlert.handleSystemError);
 		this.$fhcApi
 			.get('api/frontend/v1/stv/status/getStatusgruende/')
 			.then(result => result.data)

From 0aa53f64ff5646997b021fe8bfb945cb61e2cc33 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 19 Jun 2024 08:51:34 +0200
Subject: [PATCH 0810/1461] db Aenderungen Gegenpruefung hinzugefuegt

---
 system/dbupdate_3.4.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index 3a3f0be78..144ea1d44 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -171,7 +171,8 @@ $tabellen=array(
 	"hr.tbl_sachaufwandtyp" => array("sachaufwandtyp_kurzbz","bezeichnung","sort", "aktiv"),
 	"hr.tbl_stundensatz" => array("stundensatz_id","uid","stundensatztyp","stundensatz","oe_kurzbz","gueltig_von","gueltig_bis","insertamum","insertvon","updateamum","updatevon"),
 	"hr.tbl_stundensatztyp" => array("stundensatztyp","bezeichnung","aktiv","insertamum","insertvon","updateamum","updatevon"),
-	"hr.tbl_dienstverhaeltnis" => array("dienstverhaeltnis_id","mitarbeiter_uid","vertragsart_kurzbz","oe_kurzbz","von","bis","insertamum","insertvon","updateamum","updatevon"),
+	"hr.tbl_dienstverhaeltnis" => array("dienstverhaeltnis_id","mitarbeiter_uid","vertragsart_kurzbz","oe_kurzbz","von","bis","insertamum","insertvon","updateamum","updatevon","dvendegrund_kurzbz","dvendegrund_anmerkung"),
+	"hr.tbl_dvendegrund" => array("dvendegrund_kurzbz", "bezeichnung", "bezeichnung_mehrsprachig", "aktiv", "sort"),
 	"hr.tbl_vertragsart" => array("vertragsart_kurzbz","bezeichnung","anmerkung","dienstverhaeltnis","vertragsart_kurzbz_parent","aktiv","sort"),
 	"hr.tbl_vertragsbestandteil" => array("vertragsbestandteil_id","dienstverhaeltnis_id","vertragsbestandteiltyp_kurzbz","von", "bis","insertamum", "insertvon","updateamum","updatevon"),
 	"hr.tbl_vertragsbestandteiltyp" => array("vertragsbestandteiltyp_kurzbz","bezeichnung","ueberlappend"),

From fb77ab67e7af04d28e49fce6044846a41347ee5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Wed, 19 Jun 2024 09:05:08 +0200
Subject: [PATCH 0811/1461] =?UTF-8?q?Pr=C3=BCfungshonorare=20im=20Notenkar?=
 =?UTF-8?q?teireiter=20zeigen=20nur=20aktive=20Mitarbeiter=20an?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lvplanung/lehrveranstaltungnotenoverlay.xul.php    |  4 ++--
 include/mitarbeiter.class.php                          | 10 +++++++++-
 rdf/mitarbeiter.rdf.php                                |  7 ++++++-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/content/lvplanung/lehrveranstaltungnotenoverlay.xul.php b/content/lvplanung/lehrveranstaltungnotenoverlay.xul.php
index 925f744fb..033bd7344 100644
--- a/content/lvplanung/lehrveranstaltungnotenoverlay.xul.php
+++ b/content/lvplanung/lehrveranstaltungnotenoverlay.xul.php
@@ -122,7 +122,7 @@ echo "<?xml-stylesheet href=\"".APP_ROOT."content/bindings.css\" type=\"text/css
 			<splitter class="tree-splitter"/>
 			<treecol id="lehrveranstaltung-noten-tree-verband" label="Verband" flex="2" hidden="true" persist="hidden, width, ordinal"
 				class="sortDirectionIndicator"
-				sort="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#verband" />						
+				sort="rdf:http://www.technikum-wien.at/zeugnisnote/rdf#verband" />
             <splitter class="tree-splitter"/>
             <treecol id="lehrveranstaltung-noten-tree-studiengang_kz_lv" label="LehrveranstaltungStudiengang_kz" flex="1" hidden="true" persist="hidden, width, ordinal"
                      class="sortDirectionIndicator"
@@ -299,7 +299,7 @@ if(defined('FAS_GESAMTNOTE_PRUEFUNGSHONORAR') && FAS_GESAMTNOTE_PRUEFUNGSHONORAR
 		<hbox>
 			<label value="MitarbeiterIn" control="lehrveranstaltung-noten-pruefung-menulist-mitarbeiter"/>
 			<menulist id="lehrveranstaltung-noten-pruefung-menulist-mitarbeiter"
-				      datasources="'.APP_ROOT.'rdf/mitarbeiter.rdf.php" flex="1"
+				      datasources="'.APP_ROOT.'rdf/mitarbeiter.rdf.php?aktiv=true" flex="1"
 				      ref="http://www.technikum-wien.at/mitarbeiter/_alle"
 		              minwidth="250"
 				      >
diff --git a/include/mitarbeiter.class.php b/include/mitarbeiter.class.php
index 2802e241d..836e2e6a7 100644
--- a/include/mitarbeiter.class.php
+++ b/include/mitarbeiter.class.php
@@ -317,7 +317,7 @@ class mitarbeiter extends benutzer
 	 * gibt array mit allen Mitarbeitern zurueck
 	 * @return array mit Mitarbeitern
 	 */
-	public function getMitarbeiter($lektor=true,$fixangestellt=null,$stg_kz=null)
+	public function getMitarbeiter($lektor=true,$fixangestellt=null,$stg_kz=null, $aktiv=null)
 	{
 		$sql_query='SELECT DISTINCT campus.vw_mitarbeiter.uid, titelpre, titelpost, vorname, vornamen, wahlname, nachname, gebdatum, gebort, gebzeit, anmerkung, aktiv,
 					homepage, campus.vw_mitarbeiter.updateamum, campus.vw_mitarbeiter.updatevon, personalnummer, kurzbz, lektor, fixangestellt, standort_id, telefonklappe FROM campus.vw_mitarbeiter
@@ -346,6 +346,14 @@ class mitarbeiter extends benutzer
 			$sql_query.=" AND oe_kurzbz=".$this->db_add_param($stg->oe_kurzbz);
 		}
 
+		if(!is_null($aktiv))
+		{
+			$sql_query.=' AND';
+			if (!$aktiv)
+				$sql_query.=' NOT';
+			$sql_query.=' aktiv';
+		}
+
 		$sql_query.=' ORDER BY nachname, vornamen, kurzbz;';
 
 		if(!$this->db_query($sql_query))
diff --git a/rdf/mitarbeiter.rdf.php b/rdf/mitarbeiter.rdf.php
index 3f9348bd8..e101668a1 100644
--- a/rdf/mitarbeiter.rdf.php
+++ b/rdf/mitarbeiter.rdf.php
@@ -55,6 +55,11 @@ if (isset($_GET['stg_kz']))
 else
 	$stg_kz=null;
 
+if (isset($_GET['aktiv']))
+	$aktiv=$_GET['aktiv'];
+else
+	$aktiv=null;
+
 if (isset($_GET['fachbereich_id']))
 	$fachbereich_id=$_GET['fachbereich_id'];
 else
@@ -126,7 +131,7 @@ function draw_row($mitarbeiter)
 
 if($lehrveranstaltung_id==null && $filter==null && $mitarbeiter_uid==null)
 {
-	$ma=$mitarbeiter->getMitarbeiter($lektor,$fixangestellt,$stg_kz);
+	$ma=$mitarbeiter->getMitarbeiter($lektor,$fixangestellt,$stg_kz, $aktiv);
 
 	$stg_obj = new studiengang();
 	$stg_obj->getAll('typ, kurzbz', false);

From a8acf919808301c8a35f9cc411b02ef94c87c5fc Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 19 Jun 2024 09:21:13 +0200
Subject: [PATCH 0812/1461] Datum bei Abmeldung Fristablauf d WH PDF

---
 rdf/AntragWiederholung.xml.php    | 77 +++++++++++++++++++++++++++----
 system/xsl/AntragWiederholung.xsl | 10 ++++
 2 files changed, 77 insertions(+), 10 deletions(-)

diff --git a/rdf/AntragWiederholung.xml.php b/rdf/AntragWiederholung.xml.php
index c3ef6a183..e972a46a2 100644
--- a/rdf/AntragWiederholung.xml.php
+++ b/rdf/AntragWiederholung.xml.php
@@ -5,6 +5,42 @@ require_once('../config/vilesci.config.inc.php');
 require_once('../include/functions.inc.php');
 require_once('../include/basis_db.class.php');
 
+// Get CodeIgniter Config
+// Get Environment Var
+if (defined('CI_ENVIRONMENT')) $_SERVER['CI_ENV'] = CI_ENVIRONMENT;
+define('ENVIRONMENT', isset($_SERVER['CI_ENV']) ? $_SERVER['CI_ENV'] : 'development');
+
+// Get BASEPATH Var
+$system_path = dirname(__FILE__).'/../vendor/codeigniter/framework/system';
+if (($_temp = realpath($system_path)) !== FALSE)
+	$system_path = $_temp.'/';
+else
+	$system_path = rtrim($system_path, '/').'/';
+define('BASEPATH', str_replace('\\', '/', $system_path));
+
+// Get APPPATH Var
+$application_folder = dirname(__FILE__).'/../application';
+if (is_dir($application_folder)) {
+	if (($_temp = realpath($application_folder)) !== FALSE)
+		$application_folder = $_temp;
+	define('APPPATH', $application_folder.DIRECTORY_SEPARATOR);
+} else {
+	if (!is_dir(BASEPATH.$application_folder.DIRECTORY_SEPARATOR)) {
+		header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
+		echo 'Your application folder path does not appear to be set correctly. Please open the following file and correct this: '.SELF;
+		exit(3); // EXIT_CONFIG
+	}
+	define('APPPATH', BASEPATH.$application_folder.DIRECTORY_SEPARATOR);
+}
+
+// Load studierendenantrag Config
+foreach (['studierendenantrag', ENVIRONMENT.DIRECTORY_SEPARATOR.'studierendenantrag'] as $location) {
+	$file_path = APPPATH . 'config/' . $location . '.php';
+	if (file_exists($file_path))
+		include($file_path);
+}
+// Get CodeIgniter Config end
+
 $db = new basis_db();
 
 if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
@@ -34,9 +70,25 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 else
 	die('<error>Format not supported</error>');
 
+$blacklist = '';
+if ($config['note_blacklist_wiederholung']) {
+	$blacklist = " AND n.note NOT IN (" . $db->db_implode4SQL($config['note_blacklist_wiederholung']) . ")";
+}
+
 
 $query = "
-	SELECT stg.bezeichnung, bezeichnung_mehrsprachig[(SELECT index FROM public.tbl_sprache WHERE sprache=" . $db->db_add_param(getSprache(), FHC_STRING) . ")], studierendenantrag_id, matrikelnr, studienjahr_kurzbz, a.studiensemester_kurzbz, vorname, nachname, studiengang_kz, pss.ausbildungssemester AS semester, (SELECT pt.text FROM system.tbl_phrase p JOIN system.tbl_phrasentext pt USING(phrase_id) WHERE p.category=" . $db->db_add_param('studierendenantrag', FHC_STRING) . " AND p.phrase=" . $db->db_add_param('grund_Wiederholung_deadline', FHC_STRING) . " AND pt.sprache=" . $db->db_add_param(getSprache(), FHC_STRING) . " LIMIT 1) AS grund
+	SELECT stg.bezeichnung, tbl_orgform.bezeichnung_mehrsprachig[(SELECT index FROM public.tbl_sprache WHERE sprache=" . $db->db_add_param(getSprache(), FHC_STRING) . ")], studierendenantrag_id, matrikelnr, studienjahr_kurzbz, a.studiensemester_kurzbz, vorname, nachname, studiengang_kz, pss.ausbildungssemester AS semester, (
+			SELECT pr.datum
+			FROM lehre.tbl_pruefung pr
+			JOIN lehre.tbl_note n USING (note)
+			WHERE pr.student_uid = tbl_student.student_uid 
+			AND pr.datum <= a.datum
+			AND pr.pruefungstyp_kurzbz IN ('kommPruef', 'zusKommPruef')
+			AND n.positiv=FALSE
+			" . $blacklist . "
+			ORDER BY datum DESC
+			LIMIT 1
+		) AS abmeldedatum, (SELECT pt.text FROM system.tbl_phrase p JOIN system.tbl_phrasentext pt USING(phrase_id) WHERE p.category=" . $db->db_add_param('studierendenantrag', FHC_STRING) . " AND p.phrase=" . $db->db_add_param('grund_Wiederholung_deadline', FHC_STRING) . " AND pt.sprache=" . $db->db_add_param(getSprache(), FHC_STRING) . " LIMIT 1) AS grund
 	FROM
 	campus.tbl_studierendenantrag a
 	JOIN public.tbl_student USING (prestudent_id)
@@ -56,15 +108,20 @@ if (!$db->db_query($query) || !$db->db_num_rows())
 <?xml version='1.0' encoding='UTF-8' standalone='yes'?>
 <antraege>
 	<?php while($row = $db->db_fetch_object()) { ?>
-        <antrag>
-            <name><![CDATA[<?= trim($row->vorname . ' ' . $row->nachname); ?>]]></name>
-            <studiengang><![CDATA[<?= $row->bezeichnung; ?>]]></studiengang>
-            <organisationsform><![CDATA[<?= $row->bezeichnung_mehrsprachig; ?>]]></organisationsform>
-            <personenkz><![CDATA[<?= $row->matrikelnr; ?>]]></personenkz>
-            <studienjahr><![CDATA[<?= $row->studienjahr_kurzbz; ?>]]></studienjahr>
-            <studiensemester><![CDATA[<?= $row->studiensemester_kurzbz; ?>]]></studiensemester>
-            <semester><![CDATA[<?= $row->semester; ?>]]></semester>
-            <grund><![CDATA[<?= $row->grund; ?>]]></grund>
+		<?php
+			$abmeldedatum = new DateTime($row->abmeldedatum);
+			$abmeldedatum->modify($config['wiederholung_job_deadline_date_modifier']);
+		?>
+		<antrag>
+			<name><![CDATA[<?= trim($row->vorname . ' ' . $row->nachname); ?>]]></name>
+			<studiengang><![CDATA[<?= $row->bezeichnung; ?>]]></studiengang>
+			<organisationsform><![CDATA[<?= $row->bezeichnung_mehrsprachig; ?>]]></organisationsform>
+			<personenkz><![CDATA[<?= $row->matrikelnr; ?>]]></personenkz>
+			<studienjahr><![CDATA[<?= $row->studienjahr_kurzbz; ?>]]></studienjahr>
+			<studiensemester><![CDATA[<?= $row->studiensemester_kurzbz; ?>]]></studiensemester>
+			<semester><![CDATA[<?= $row->semester; ?>]]></semester>
+			<abmeldedatum><![CDATA[<?= $abmeldedatum->format('d.m.Y'); ?>]]></abmeldedatum>
+			<grund><![CDATA[<?= $row->grund; ?>]]></grund>
 	</antrag>
 	<?php } ?>
 </antraege>
diff --git a/system/xsl/AntragWiederholung.xsl b/system/xsl/AntragWiederholung.xsl
index aa6a28073..58ce56dfb 100644
--- a/system/xsl/AntragWiederholung.xsl
+++ b/system/xsl/AntragWiederholung.xsl
@@ -345,6 +345,16 @@
 							</text:p>
 						</table:table-cell>
 					</table:table-row>
+					<table:table-row table:style-name="Tabelle2.1">
+						<table:table-cell table:style-name="Tabelle2.A1" office:value-type="string">
+							<text:p text:style-name="P5">Abmeldedatum</text:p>
+						</table:table-cell>
+						<table:table-cell table:style-name="Tabelle2.A1" office:value-type="string">
+							<text:p text:style-name="P5">
+								<text:span text:style-name="T4"><xsl:value-of select="abmeldedatum"/></text:span>
+							</text:p>
+						</table:table-cell>
+					</table:table-row>
 					<table:table-row table:style-name="Tabelle2.5">
 						<table:table-cell table:style-name="Tabelle2.A1" table:number-columns-spanned="2" office:value-type="string">
 							<text:p text:style-name="P8">Grund der Abmeldung:</text:p>

From 04c006a733c30444bef80a821cf2a3fbef822b4a Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 19 Jun 2024 10:28:03 +0200
Subject: [PATCH 0813/1461] do not create dummy manual events

---
 system/dbupdate_3.4/37107_fristenmanagement.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/system/dbupdate_3.4/37107_fristenmanagement.php b/system/dbupdate_3.4/37107_fristenmanagement.php
index ee023b13e..7d2e8bddb 100644
--- a/system/dbupdate_3.4/37107_fristenmanagement.php
+++ b/system/dbupdate_3.4/37107_fristenmanagement.php
@@ -72,11 +72,6 @@ if ($result = $db->db_query("SELECT * FROM information_schema.tables WHERE table
         INSERT INTO hr.tbl_frist_ereignis(ereignis_kurzbz, bezeichnung, sort) VALUES('zeitaufzeichnung_ende','Zeitaufzeichnung Ende', 8);
         INSERT INTO hr.tbl_frist_ereignis(ereignis_kurzbz, bezeichnung, sort) VALUES('befristung_beginn','Befristung Beginn', 9);
         INSERT INTO hr.tbl_frist_ereignis(ereignis_kurzbz, bezeichnung, sort) VALUES('befristung_ende','Befristung Ende', 10);
-        INSERT INTO hr.tbl_frist_ereignis (ereignis_kurzbz , bezeichnung, manuell, sort) VALUES('manuell1','Manuell 1', true, 11);
-        INSERT INTO hr.tbl_frist_ereignis (ereignis_kurzbz , bezeichnung, manuell, sort) VALUES('manuell2','Manuell 2', true, 12);
-        INSERT INTO hr.tbl_frist_ereignis (ereignis_kurzbz , bezeichnung, manuell, sort) VALUES('manuell3','Manuell 3', true, 13);
-        INSERT INTO hr.tbl_frist_ereignis (ereignis_kurzbz , bezeichnung, manuell, sort) VALUES('manuell4','Manuell 4', true, 14);
-
 
         ";
     

From d6be83b48c97e0b26230c610ddf76301228d5754 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 19 Jun 2024 10:38:41 +0200
Subject: [PATCH 0814/1461] Refactor Tab Multistatus: Modal

---
 .../Details/Prestudent/MultiStatus.js         | 511 ++++++------------
 1 file changed, 165 insertions(+), 346 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index 5986480e6..5e6a73e7f 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -271,7 +271,8 @@ export default{
 			actionSem: null,
 			newArray: {},
 			abbruchData: {},
-			newStatus: ''
+			newStatus: '',
+			statusNew: true
 		}
 	},
 	watch: {
@@ -287,15 +288,17 @@ export default{
 	},
 	methods: {
 		actionNewStatus() {
+			this.resetModal();
 			this.statusData.status_kurzbz = 'Interessent';
 			this.statusData.studiensemester_kurzbz = this.defaultSemester;
 			this.statusData.ausbildungssemester = 1;
 			this.statusData.datum = this.getDefaultDate();
 			this.statusData.bestaetigtam = this.getDefaultDate();
 			this.statusData.name = this.modelValue.vorname + ' ' + this.modelValue.nachname;
-			this.$refs.newStatusModal.show();
+			this.$refs.statusModal.show();
 		},
 		actionEditStatus(status, stdsem, ausbildungssemester){
+			this.statusNew = false;
 			this.statusId = {
 				'prestudent_id': this.modelValue.prestudent_id,
 				'status_kurzbz': status,
@@ -304,7 +307,7 @@ export default{
 			};
 			this.loadStatus(this.statusId).then(() => {
 				if(this.statusData)
-					this.$refs.editStatusModal.show();
+					this.$refs.statusModal.show();
 			});
 		},
 		actionDeleteStatus(status, stdsem, ausbildungssemester){
@@ -367,11 +370,6 @@ export default{
 				};
 			console.log(this.updateData);
 			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...abbruchData }));
-/*			console.log(this.newArray);
-
-			console.log("in changeStatusToAbbrecher" + prestudentIds);
-			console.log("count: " + prestudentIds.length);*/
-
 			this.addNewStatus(prestudentIds);
 		},
 		changeStatusToAbbrecherStud(prestudentIds){
@@ -397,6 +395,7 @@ export default{
 				};
 
 			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData }));
+			console.log("in changeStatus to Unterbrecher: " + this.deltaData);
 			this.addNewStatus(prestudentIds);
 		},
 		changeStatusToStudent(prestudentIds){
@@ -517,7 +516,7 @@ export default{
 					else {
 						this.$reloadList();
 					}
-					this.hideModal('newStatusModal');
+					this.hideModal('statusModal');
 					this.resetModal();
 				});
 		},
@@ -577,7 +576,7 @@ export default{
 				.then(
 					result => {
 						this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
-						this.hideModal('editStatusModal');
+						this.hideModal('statusModal');
 						this.resetModal();
 					})
 				.catch(this.$fhcAlert.handleSystemError)
@@ -601,6 +600,7 @@ export default{
 				.catch(this.$fhcAlert.handleSystemError);
 		},
 		loadStatus(status_id){
+			this.statusNew = false;
 			return this.$fhcApi.post('api/frontend/v1/stv/status/loadStatus/',
 				status_id)
 					.then(result => {
@@ -614,6 +614,7 @@ export default{
 		},
 		hideModal(modalRef){
 			this.$refs[modalRef].hide();
+			this.statusNew = true;
 		},
 		resetModal(){
 			this.statusData = {};
@@ -635,13 +636,13 @@ export default{
 				this.listStudiensemester = result;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
-		this.$fhcApi
+/*		this.$fhcApi
 			.get('api/frontend/v1/stv/prestudent/getStudienplaene/' + this.modelValue.prestudent_id)
 			.then(result => result.data)
 			.then(result => {
 				this.listStudienplaene = result;
 			})
-			.catch(this.$fhcAlert.handleSystemError);
+			.catch(this.$fhcAlert.handleSystemError);*/
 		this.$fhcApi
 			.get('api/frontend/v1/stv/status/getStatusgruende/')
 			.then(result => result.data)
@@ -661,334 +662,158 @@ export default{
 	template: `
 		<div class="stv-list h-100 pt-3">
 		
-					
-			<!--Modal: Add New Status-->
-			<BsModal ref="newStatusModal">
-				<template #title>{{$p.t('lehre', 'status_new')}}</template>
-							
-					<form-form class="row g-3" ref="statusData">
-						<div class="row mb-3">	
-							<p class="py-2 fw-bold">Details {{modelValue.nachname}} {{modelValue.vorname}}</p>
-							<label for="status_kurzbz" class="form-label col-sm-4">{{$p.t('lehre', 'status_rolle')}}</label>
-							<div class="col-sm-6">
-
-								<form-input
-									required
-									v-model="statusData['status_kurzbz']"
-									name="status_kurzbz"
-									type="select"
-									>
-									<option  value="Interessent">InteressentIn</option>
-									<option  value="Bewerber">BewerberIn</option>
-									<option  value="Aufgenommener">Aufgenommene/r</option>
-									<option  value="Student">StudentIn</option>
-									<option  value="Unterbrecher">UnterbrecherIn</option>
-									<option  value="Diplomand">DiplomandIn</option>
-									<option  value="Incoming">Incoming</option>
-								</form-input>
-							</div>
-						</div>
-						<div class="row mb-3">		   
-							<label for="studiensemester_kurzbz" class="form-label col-sm-4">{{$p.t('lehre', 'studiensemester')}}</label>
-							<div class="col-sm-6">
-								<form-input
-									type="select"
-									name="studiensemester_kurzbz"
-									v-model="statusData['studiensemester_kurzbz']"
-								>
-									<option v-for="sem in listStudiensemester" :key="sem.studiensemester_kurzbz" :value="sem.studiensemester_kurzbz"  :selected="sem.studiensemester_kurzbz === defaultSemester">{{sem.studiensemester_kurzbz}}</option>
-								</form-input>
-							</div>
-						</div>
-						<!-- TODO(manu) if(defined('VORRUECKUNG_STATUS_MAX_SEMESTER') && VORRUECKUNG_STATUS_MAX_SEMESTER==false) 100 Semester-->
-						<div class="row mb-3">
-							<label for="ausbildungssemester" class="form-label col-sm-4">{{$p.t('lehre', 'ausbildungssemester')}}</label>
-							<div class="col-sm-6">
-								<form-input
-									type="select"
-									name="ausbildungssemester"
-									v-model="statusData.ausbildungssemester"
-								>
-								 <option v-for="number in maxSem" :key="number" :value="number">{{ number }}</option>
-								</form-input>
-							</div>
-						</div>
-						
-						<div class="row mb-3">
-							<label for="datum" class="form-label col-sm-4">{{$p.t('global', 'datum')}}</label>
-							<div class="col-sm-6">
-								<form-input
-									type="DatePicker"
-									name="datum"
-									v-model="statusData.datum"
-									auto-apply
-									:enable-time-picker="false"
-									format="dd.MM.yyyy"
-									preview-format="dd.MM.yyyy"
-									:teleport="true"
-								></form-input>
-							</div>
-						</div>
-						<div class="row mb-3">
-							<label for="bestaetigtam" class="form-label col-sm-4">{{$p.t('lehre', 'bestaetigt_am')}}</label>
-							<div class="col-sm-6">
-								<form-input
-									type="DatePicker"
-									name="datum"
-									v-model="statusData.bestaetigtam"
-									auto-apply
-									:enable-time-picker="false"
-									format="dd.MM.yyyy"
-									preview-format="dd.MM.yyyy"
-									:teleport="true"
-								></form-input>
-							</div>
-						</div>
-						<div class="row mb-3">
-							<label for="bewerbung_abgeschicktamum" class="form-label col-sm-4">{{$p.t('lehre', 'bewerbung_abgeschickt_am')}}</label>
-							<div class="col-sm-6">
-								<form-input
-									type="DatePicker"
-									name="datum"
-									v-model="statusData['bewerbung_abgeschicktamum']"
-									auto-apply
-									:enable-time-picker="false"
-									format="dd.MM.yyyy"
-									preview-format="dd.MM.yyyy"
-									:teleport="true"
-								></form-input>
-							</div>
-						</div>
-						<div class="row mb-3">
-							<label for="bezeichnung" class="form-label col-sm-4">{{$p.t('lehre', 'studienplan')}}</label>
-							<div class="col-sm-6">
-								<form-input
-									type="select"
-									name="studienplan"
-									v-model="statusData['studienplan_id']"
-								>		
-									<option v-for="sp in listStudienplaene" :key="sp.studienplan_id" :value="sp.studienplan_id">{{sp.bezeichnung}}</option>
-								</form-input>
-							</div>
-						</div>
-						<div class="row mb-3">
-							<label for="anmerkung" class="form-label col-sm-4">{{$p.t('global', 'anmerkung')}}</label>
-							<div class="col-sm-6">
-								<form-input
-									type="text"
-									name="anmerkung"
-									v-model="statusData['anmerkung']"
-								>						
-								</form-input>
-							</div>
-						</div>
-						
-						<div class="row mb-3">								   
-							<label for="aufnahmestufe" class="form-label col-sm-4">{{$p.t('lehre', 'aufnahmestufe')}}</label>
-							<div class="col-sm-6">
-								<form-input
-								type="select"
-								name="aufnahmestufe"
-								v-model="statusData['rt_stufe']"
-								>
-								<option v-for="entry in aufnahmestufen" :key="entry" :value="entry">{{entry}}</option>
-								</form-input>
-							</div>
-						</div>
-										
-						<div v-if="gruende.length > 0" class="row mb-3">
-							<label for="grund" class="form-label col-sm-4">{{$p.t('studierendenantrag', 'antrag_grund')}}</label>
-							<div class="col-sm-6">
-								<form-input
-									type="select"
-									name="statusgrund"
-									v-model="statusData['statusgrund_id']"
-									>
-									<option v-for="grund in gruende" :key="grund.statusgrund_id" :value="grund.statusgrund_id">{{grund.beschreibung[0]}}</option>
-								</form-input>
-							</div>
-						</div>
-					
-					</form-form>
-					
-				<template #footer>
-						<button type="button" class="btn btn-primary" @click="addNewStatus()">OK</button>
+			<!--Modal: statusModal-->
+			<BsModal ref="statusModal">
+				<template #title>
+					<p v-if="statusNew" class="fw-bold mt-3">{{$p.t('lehre', 'status_new')}}</p>
+					<p v-else class="fw-bold mt-3">{{$p.t('lehre', 'status_edit')}}</p>
 				</template>
-								
-			</BsModal>
-			
-			<!--Modal: Edit Status-->
-			<BsModal ref="editStatusModal">
-			
-				<template #title>{{$p.t('lehre', 'status_edit')}}</template>
-					<form-form class="row g-3" ref="statusData">
-						<div class="row mb-3">
-							<p class="py-2 fw-bold">Details {{modelValue.nachname}} {{modelValue.vorname}}</p>
-							
-							<div v-if="statusData.datum < dataMeldestichtag && !isStatusBeforeStudent" class="mb-1">
-								<b>{{$p.t('bismeldestichtag', 'info_MeldestichtagStatusgrund')}}</b>
-							</div>
-							<div v-if="statusData.datum < dataMeldestichtag && isStatusBeforeStudent">
-								<b>{{$p.t('bismeldestichtag', 'info_MeldestichtagStatusgrundSemester')}}</b>
-							</div>
-						
-							<input type="hidden" id="statusId" name="statusId" value="statusData.statusId">
+
+				<form-form class="row g-3" ref="statusData">
+					<p class="pt-2 fw-bold">Details {{modelValue.nachname}} {{modelValue.vorname}} </p>
+					<p v-if="statusData.datum < dataMeldestichtag && !isStatusBeforeStudent">
+						<b>{{$p.t('bismeldestichtag', 'info_MeldestichtagStatusgrund')}}</b>
+					</p>
+					<p v-if="statusData.datum < dataMeldestichtag && isStatusBeforeStudent">
+						<b>{{$p.t('bismeldestichtag', 'info_MeldestichtagStatusgrundSemester')}}</b>
+					</p>
+					<input type="hidden" id="statusId" name="statusId" value="statusData.statusId">
+					<div class="row mb-3">	
+						<form-input
+							required
+							v-model="statusData['status_kurzbz']"
+							name="status_kurzbz"
+							:label="$p.t('lehre/status_rolle')"
+							type="select"
+							:disabled="!statusNew"
+							>
+							<option  value="Interessent">InteressentIn</option>
+							<option  value="Bewerber">BewerberIn</option>
+							<option  value="Aufgenommener">Aufgenommene/r</option>
+							<option  value="Student">StudentIn</option>
+							<option  value="Unterbrecher">UnterbrecherIn</option>
+							<option  value="Diplomand">DiplomandIn</option>
+							<option  value="Incoming">Incoming</option>
+						</form-input>
+					</div>
+					<div class="row mb-3">		   
+						<form-input
+							type="select"
+							name="studiensemester_kurzbz"
+							:label="$p.t('lehre/studiensemester')"
+							v-model="statusData['studiensemester_kurzbz']"
+							:disabled="statusData.datum < dataMeldestichtag"
+						>
+							<option v-for="sem in listStudiensemester" :key="sem.studiensemester_kurzbz" :value="sem.studiensemester_kurzbz"  :selected="sem.studiensemester_kurzbz === defaultSemester">{{sem.studiensemester_kurzbz}}</option>
+						</form-input>
+					</div>
+					<!-- TODO(manu) if(defined('VORRUECKUNG_STATUS_MAX_SEMESTER') && VORRUECKUNG_STATUS_MAX_SEMESTER==false) 100 Semester-->
+					<div class="row mb-3">
+						<form-input
+							type="select"
+							name="ausbildungssemester"
+							:label="$p.t('lehre/ausbildungssemester')"
+							v-model="statusData.ausbildungssemester"
+							:disabled="statusData.datum < dataMeldestichtag && !isStatusBeforeStudent"
+						>
+						 <option v-for="number in maxSem" :key="number" :value="number">{{ number }}</option>
+						</form-input>
+					</div>
 					
-							<label for="status_kurzbz" class="form-label col-sm-4">{{$p.t('lehre', 'status_rolle')}}</label>
-							<div class="col-sm-6">
-<!--								<form-input type="text" class="form-control" id="status_kurzbz" v-model="statusData['status_kurzbz']">-->
-								<form-input
-									required
-									v-model="statusData['status_kurzbz']"
-									name="status_kurzbz"
-									type="select"
-									disabled
-									>
-									<option  value="Interessent">InteressentIn</option>
-									<option  value="Bewerber">BewerberIn</option>
-									<option  value="Aufgenommener">Aufgenommene/r</option>
-									<option  value="Student">StudentIn</option>
-									<option  value="Unterbrecher">UnterbrecherIn</option>
-									<option  value="Diplomand">DiplomandIn</option>
-									<option  value="Incoming">Incoming</option>
-								</form-input>
-							</div>
-						</div>
-						<div class="row mb-3">							   
-							<label for="studiensemester_kurzbz" class="form-label col-sm-4">{{$p.t('lehre', 'studiensemester')}}</label>
-							<div class="col-sm-6">
-								<form-input
-									type="select"
-									name="studiensemester_kurzbz"
-									v-model="statusData['studiensemester_kurzbz']"
-									:disabled="statusData.datum < dataMeldestichtag"
-								>
-									<option value="null"></option>
-									<option v-for="sem in listStudiensemester" :key="sem.studiensemester_kurzbz" :value="sem.studiensemester_kurzbz">{{sem.studiensemester_kurzbz}}</option>
-								</form-input>
-							</div>
-						</div>
-						<!-- TODO(manu) if(defined('VORRUECKUNG_STATUS_MAX_SEMESTER') && VORRUECKUNG_STATUS_MAX_SEMESTER==false)-->
-						<div class="row mb-3">
-							<label for="ausbildungssemester" class="form-label col-sm-4">{{$p.t('lehre', 'ausbildungssemester')}}</label>
-							<div class="col-sm-6">
-								<form-input
-									type="select"
-									name="ausbildungssemester"
-									v-model="statusData['ausbildungssemester']"
-									:disabled="statusData.datum < dataMeldestichtag && !isStatusBeforeStudent"
-								>
-								 <option v-for="number in maxSem" :key="number" :value="number">{{ number }}</option>
-								</form-input>
-							</div>
-						</div>
-						
-						<div class="row mb-3">
-							<label for="datum" class="form-label col-sm-4">{{$p.t('global', 'datum')}}</label>
-							<div class="col-sm-6">
-								<form-input
-									type="DatePicker"
-									name="datum"
-									v-model="statusData['datum']"
-									auto-apply
-									:enable-time-picker="false"
-									format="dd.MM.yyyy"
-									preview-format="dd.MM.yyyy"
-									:teleport="true"
-									:disabled="statusData.datum < dataMeldestichtag"
-								></form-input>
-							</div>
-						</div>
-						<div class="row mb-3">					   
-							<label for="bestaetigtam" class="form-label col-sm-4">{{$p.t('lehre', 'bestaetigt_am')}}</label>
-							<div class="col-sm-6">
-								<form-input
-									type="DatePicker"
-									name="datum"
-									v-model="statusData['bestaetigtam']"
-									auto-apply
-									:enable-time-picker="false"
-									format="dd.MM.yyyy"
-									preview-format="dd.MM.yyyy"
-									:teleport="true"
-									:disabled="statusData.datum < dataMeldestichtag"
-								></form-input>
-							</div>
-						</div>
-						<div class="row mb-3">
-							<label for="bewerbung_abgeschicktamum" class="form-label col-sm-4">{{$p.t('lehre', 'bewerbung_abgeschickt_am')}}</label>
-							<div class="col-sm-6">
-								<form-input
-									type="DatePicker"
-									name="datum"
-									v-model="statusData['bewerbung_abgeschicktamum']"
-									auto-apply
-									:enable-time-picker="false"
-									format="dd.MM.yyyy"
-									preview-format="dd.MM.yyyy"
-									:teleport="true"
-									:disabled="statusData.datum < dataMeldestichtag"
-								></form-input>
-							</div>
-						</div>
-						<div class="row mb-3">
-							<label for="bezeichnung" class="form-label col-sm-4">{{$p.t('lehre', 'studienplan')}}</label>
-							<div class="col-sm-6">
-								<form-input
-									type="select"
-									name="studienplan"
-									v-model="statusData['studienplan_id']"
-									:disabled="statusData.datum < dataMeldestichtag"
-								>
-									<option v-for="sp in listStudienplaene" :key="sp.studienplan_id" :value="sp.studienplan_id">{{sp.bezeichnung}}</option>
-								</form-input>
-							</div>
-						</div>
-						<div class="row mb-3">
-							<label for="anmerkung" class="form-label col-sm-4">{{$p.t('global', 'anmerkung')}}</label>
-							<div class="col-sm-6">
-								<form-input
-									type="text"
-									name="anmerkung"
-									v-model="statusData['anmerkung']"
-									:disabled="statusData.datum < dataMeldestichtag"
-								>				
-								</form-input>
-							</div>
-						</div>
-						
-						<div class="row mb-3">				   
-							<label for="aufnahmestufe" class="form-label col-sm-4">{{$p.t('lehre', 'aufnahmestufe')}}</label>
-							<div class="col-sm-6">
-								<form-input
-								type="select"
-								name="aufnahmestufe"
-								v-model="statusData['rt_stufe']"
-								:disabled="statusData.datum < dataMeldestichtag"
-								>
-								<option v-for="entry in aufnahmestufen" :key="entry" :value="entry">{{entry}}</option>
-								</form-input>
-							</div>
-						</div>
-						
-						<div v-if="gruende.length > 0" class="row mb-3">
-							<label for="grund" class="form-label col-sm-4">{{$p.t('studierendenantrag', 'antrag_grund')}}</label>
-							<div class="col-sm-6">
-								<form-input
-									type="select"
-									name="statusgrund"
-									v-model="statusData['statusgrund_id']"
-								>
-								<option :value="NULL"></option>
-								<option v-for="grund in gruende" :key="grund.statusgrund_id" :value="grund.statusgrund_id">{{grund.beschreibung[0]}}</option>
-								</form-input>
-							</div>
-						</div>
-					
-					</form-form>
+					<div class="row mb-3">
+						<form-input
+							type="DatePicker"
+							name="datum"
+							:label="$p.t('global/datum')"
+							v-model="statusData.datum"
+							auto-apply
+							:enable-time-picker="false"
+							format="dd.MM.yyyy"
+							preview-format="dd.MM.yyyy"
+							:teleport="true"
+							:disabled="statusData.datum < dataMeldestichtag"
+						></form-input>
+					</div>
+					<div class="row mb-3">
+						<form-input
+							type="DatePicker"
+							name="datum"
+							:label="$p.t('lehre/bestaetigt_am')"
+							v-model="statusData.bestaetigtam"
+							auto-apply
+							:enable-time-picker="false"
+							format="dd.MM.yyyy"
+							preview-format="dd.MM.yyyy"
+							:teleport="true"
+							:disabled="statusData.datum < dataMeldestichtag"
+						></form-input>
+					</div>
+					<div class="row mb-3">
+						<form-input
+							type="DatePicker"
+							name="datum"
+							:label="$p.t('lehre/bewerbung_abgeschickt_am')"
+							v-model="statusData['bewerbung_abgeschicktamum']"
+							auto-apply
+							:enable-time-picker="false"
+							format="dd.MM.yyyy"
+							preview-format="dd.MM.yyyy"
+							:teleport="true"
+							:disabled="statusData.datum < dataMeldestichtag"
+						></form-input>
+					</div>
+					<div class="row mb-3">
+						<form-input
+							type="select"
+							name="studienplan"
+							:label="$p.t('lehre/studienplan')"
+							v-model="statusData['studienplan_id']"
+							:disabled="statusData.datum < dataMeldestichtag"
+						>		
+							<option v-for="sp in listStudienplaene" :key="sp.studienplan_id" :value="sp.studienplan_id">{{sp.bezeichnung}}</option>
+						</form-input>
+					</div>
+					<div class="row mb-3">
+						<form-input
+							type="text"
+							name="anmerkung"
+							:label="$p.t('global/anmerkung')"
+							v-model="statusData['anmerkung']"
+							:disabled="statusData.datum < dataMeldestichtag"
+						>						
+						</form-input>
+					</div>
 					
+					<div class="row mb-3">								   
+						<form-input
+						type="select"
+						name="aufnahmestufe"
+						:label="$p.t('lehre/aufnahmestufe')"
+						v-model="statusData['rt_stufe']"
+						:disabled="statusData.datum < dataMeldestichtag"
+						>
+						<option v-for="entry in aufnahmestufen" :key="entry" :value="entry">{{entry}}</option>
+						</form-input>
+					</div>
+									
+					<div v-if="gruende.length > 0" class="row mb-3">
+						<form-input
+							type="select"
+							name="statusgrund"
+							:label="$p.t('studierendenantrag/antrag_grund')"
+							v-model="statusData['statusgrund_id']"
+							>
+							<option :value="NULL"></option>
+							<option v-for="grund in gruende" :key="grund.statusgrund_id" :value="grund.statusgrund_id">{{grund.beschreibung[0]}}</option>
+						</form-input>
+					</div>
+				
+				</form-form>
+				
 				<template #footer>
-						<button type="button" class="btn btn-primary" @click="editStatus()">OK</button>
+					<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{$p.t('ui', 'abbrechen')}}</button>
+					<button v-if="statusNew" type="button" class="btn btn-primary" @click="addNewStatus()">OK</button>
+					<button v-else type="button" class="btn btn-primary" @click="editStatus()">OK</button>
 				</template>
 								
 			</BsModal>
@@ -1153,10 +978,7 @@ export default{
 				>
 				
 				<template #actions="{updateData2}">
-<!--					<button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#addMultiStatus">
-						Status Ändern
-					</button>-->
-					
+					<!-- SingleSelectButton-->
 					<div class="btn-group">						
 						<button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
 							{{$p.t('lehre', 'btn_statusAendern')}}
@@ -1193,18 +1015,15 @@ export default{
 				v-if="this.modelValue.length"
 				ref="buttonsStatusMulti"
 			>	
-<!--			<button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#addMultiStatus">
-				Status Ändern
-			</button>-->
-			
+			<!--MultiSelectButton-->
 			<div class="btn-group">						
 				<button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
-					Status Ändern
+					Status Ändern 2
 				</button>
 			
 				<ul class="dropdown-menu">
 					<li class="dropdown-submenu">
-						<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'abbrecherStgl', 'Abbrecher')">Abbrecher durch Stgl</a>
+						<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'abbrecherStgl', 'Abbrecher')">Abbrecher durch Stgl 2</a>
 					</li>
 					<li class="dropdown-submenu">
 						<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'abbrecherStud','Abbrecher')">Abbrecher durch Student</a>

From 631a5527089de1d68a2b8f30569f0bdca3549d25 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 19 Jun 2024 10:55:48 +0200
Subject: [PATCH 0815/1461] Datum bei Abmeldung d Stud PDF

---
 rdf/AntragAbmeldung.xml.php    | 24 +++++++++++++-----------
 system/xsl/AntragAbmeldung.xsl | 10 ++++++++++
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/rdf/AntragAbmeldung.xml.php b/rdf/AntragAbmeldung.xml.php
index 28210d280..6615ac046 100644
--- a/rdf/AntragAbmeldung.xml.php
+++ b/rdf/AntragAbmeldung.xml.php
@@ -36,7 +36,7 @@ else
 
 
 $query = "
-	SELECT stg.bezeichnung, bezeichnung_mehrsprachig[(SELECT index FROM public.tbl_sprache WHERE sprache=" . $db->db_add_param(getSprache(), FHC_STRING) . ")], studierendenantrag_id, matrikelnr, studienjahr_kurzbz, a.studiensemester_kurzbz, vorname, nachname, studiengang_kz, pss.ausbildungssemester AS semester, a.grund
+	SELECT stg.bezeichnung, bezeichnung_mehrsprachig[(SELECT index FROM public.tbl_sprache WHERE sprache=" . $db->db_add_param(getSprache(), FHC_STRING) . ")], studierendenantrag_id, matrikelnr, studienjahr_kurzbz, a.studiensemester_kurzbz, vorname, nachname, studiengang_kz, pss.ausbildungssemester AS semester, pss.datum, a.grund
 	FROM
 	campus.tbl_studierendenantrag a
 	JOIN public.tbl_student USING (prestudent_id)
@@ -56,16 +56,18 @@ if (!$db->db_query($query) || !$db->db_num_rows())
 <?xml version='1.0' encoding='UTF-8' standalone='yes'?>
 <antraege>
 	<?php while($row = $db->db_fetch_object()) { ?>
-	<antrag>
-        <name><![CDATA[<?= trim($row->vorname . ' ' . $row->nachname); ?>]]></name>
-        <studiengang><![CDATA[<?= $row->bezeichnung; ?>]]></studiengang>
-        <organisationsform><![CDATA[<?= $row->bezeichnung_mehrsprachig; ?>]]></organisationsform>
-        <personenkz><![CDATA[<?= $row->matrikelnr; ?>]]></personenkz>
-        <studienjahr><![CDATA[<?= $row->studienjahr_kurzbz; ?>]]></studienjahr>
-        <studiensemester><![CDATA[<?= $row->studiensemester_kurzbz; ?>]]></studiensemester>
-        <semester><![CDATA[<?= $row->semester; ?>]]></semester>
-        <grund><![CDATA[<?= $row->grund; ?>]]></grund>
-	</antrag>
+		<?php $abmeldedatum = new DateTime($row->datum); ?>
+		<antrag>
+			<name><![CDATA[<?= trim($row->vorname . ' ' . $row->nachname); ?>]]></name>
+			<studiengang><![CDATA[<?= $row->bezeichnung; ?>]]></studiengang>
+			<organisationsform><![CDATA[<?= $row->bezeichnung_mehrsprachig; ?>]]></organisationsform>
+			<personenkz><![CDATA[<?= $row->matrikelnr; ?>]]></personenkz>
+			<studienjahr><![CDATA[<?= $row->studienjahr_kurzbz; ?>]]></studienjahr>
+			<studiensemester><![CDATA[<?= $row->studiensemester_kurzbz; ?>]]></studiensemester>
+			<semester><![CDATA[<?= $row->semester; ?>]]></semester>
+			<abmeldedatum><![CDATA[<?= $abmeldedatum->format('d.m.Y'); ?>]]></abmeldedatum>
+			<grund><![CDATA[<?= $row->grund; ?>]]></grund>
+		</antrag>
 	<?php } ?>
 </antraege>
 
diff --git a/system/xsl/AntragAbmeldung.xsl b/system/xsl/AntragAbmeldung.xsl
index ef67d6f15..c03265c2b 100644
--- a/system/xsl/AntragAbmeldung.xsl
+++ b/system/xsl/AntragAbmeldung.xsl
@@ -345,6 +345,16 @@
 							</text:p>
 						</table:table-cell>
 					</table:table-row>
+					<table:table-row table:style-name="Tabelle2.1">
+						<table:table-cell table:style-name="Tabelle2.A1" office:value-type="string">
+							<text:p text:style-name="P5">Abmeldedatum</text:p>
+						</table:table-cell>
+						<table:table-cell table:style-name="Tabelle2.A1" office:value-type="string">
+							<text:p text:style-name="P5">
+								<text:span text:style-name="T4"><xsl:value-of select="abmeldedatum"/></text:span>
+							</text:p>
+						</table:table-cell>
+					</table:table-row>
 					<table:table-row table:style-name="Tabelle2.5">
 						<table:table-cell table:style-name="Tabelle2.A1" table:number-columns-spanned="2" office:value-type="string">
 							<text:p text:style-name="P8">Grund der Abmeldung:</text:p>

From 9c53a7a75b38b089b3dd3610046b3b10691cef2a Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 19 Jun 2024 14:02:20 +0200
Subject: [PATCH 0816/1461] =?UTF-8?q?PDF=20Download=20Button=20w=C3=A4hren?=
 =?UTF-8?q?d=20Einspruchsfrist=20verbergen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/views/lehre/Antrag/Student/List.php          | 2 --
 public/js/components/Studierendenantrag/Leitung/Table.js | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/application/views/lehre/Antrag/Student/List.php b/application/views/lehre/Antrag/Student/List.php
index 614af5d79..4a4b4f064 100644
--- a/application/views/lehre/Antrag/Student/List.php
+++ b/application/views/lehre/Antrag/Student/List.php
@@ -150,8 +150,6 @@ $this->load->view(
 											break;
 										case Studierendenantrag_model::TYP_ABMELDUNG_STGL:
 											$allowed = [
-												Studierendenantragstatus_model::STATUS_APPROVED,
-												Studierendenantragstatus_model::STATUS_OBJECTED,
 												Studierendenantragstatus_model::STATUS_OBJECTION_DENIED,
 												Studierendenantragstatus_model::STATUS_DEREGISTERED
 											];
diff --git a/public/js/components/Studierendenantrag/Leitung/Table.js b/public/js/components/Studierendenantrag/Leitung/Table.js
index 45c8f373a..778f91c00 100644
--- a/public/js/components/Studierendenantrag/Leitung/Table.js
+++ b/public/js/components/Studierendenantrag/Leitung/Table.js
@@ -265,7 +265,7 @@ export default {
 							allowed_status_for_download = ['Genehmigt'];
 							break;
 						case 'AbmeldungStgl':
-							allowed_status_for_download = ['Genehmigt', 'Beeinsprucht', 'EinspruchAbgelehnt', 'Abgemeldet'];
+							allowed_status_for_download = ['EinspruchAbgelehnt', 'Abgemeldet'];
 							break;
 						case 'Unterbrechung':
 							allowed_status_for_download = ['Genehmigt', 'EmailVersandt'];

From 58005d1832a25d46f4939ae2ccedaab4bdeb1ad0 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 19 Jun 2024 14:31:47 +0200
Subject: [PATCH 0817/1461] change getStudienplaene from prestudent_id to array
 prestudent_ids

---
 .../api/frontend/v1/stv/Prestudent.php        | 22 +++++--------------
 .../models/organisation/Studienplan_model.php | 16 ++++++++++++++
 .../Details/Prestudent/MultiStatus.js         | 15 ++++++++-----
 3 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Prestudent.php b/application/controllers/api/frontend/v1/stv/Prestudent.php
index e29736288..7c8cf5cfb 100644
--- a/application/controllers/api/frontend/v1/stv/Prestudent.php
+++ b/application/controllers/api/frontend/v1/stv/Prestudent.php
@@ -279,28 +279,16 @@ class Prestudent extends FHCAPI_Controller
 		return $this->terminateWithSuccess(getData($result) ?: []);
 	}
 
-	//TODO(manu) multi
-	public function getStudienplaene($prestudent_id)
+	public function getStudienplaene($prestudent_ids)
 	{
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-
-		$result = $this->PrestudentModel->loadWhere(
-			array('prestudent_id' => $prestudent_id)
-		);
-		if (isError($result)) {
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-
-		$result = current(getData($result));
-		$studiengang_kz = $result->studiengang_kz;
+		$prestudent_ids = urldecode($prestudent_ids);
 
 		$this->load->model('organisation/Studienplan_model', 'StudienplanModel');
+		$result = $this->StudienplanModel->getStudienplaeneByPrestudents($prestudent_ids);
 
-		$this->StudienplanModel->addOrder('studienplan_id', 'DESC');
 
-		$result = $this->StudienplanModel->getStudienplaene($studiengang_kz);
-
-		if (isError($result)) {
+		if (isError($result))
+		{
 			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 		}
 		return $this->terminateWithSuccess(getData($result) ?: []);
diff --git a/application/models/organisation/Studienplan_model.php b/application/models/organisation/Studienplan_model.php
index a142cd19b..3c6e0b2d2 100644
--- a/application/models/organisation/Studienplan_model.php
+++ b/application/models/organisation/Studienplan_model.php
@@ -119,4 +119,20 @@ class Studienplan_model extends DB_Model
 			'lv.lehrveranstaltung_id' => $lehrveranstaltung_id
 		]);
 	}
+
+	public function getStudienplaeneByPrestudents($prestudentIds)
+	{
+		$prestudentIds = intVal($prestudentIds);
+
+		$query = "
+			SELECT so.studienordnung_id, sp.bezeichnung 
+			FROM public.tbl_prestudent ps
+			JOIN lehre.tbl_studienordnung so ON (ps.studiengang_kz = so.studiengang_kz)
+			JOIN lehre.tbl_studienplan sp ON (sp.studienordnung_id = so.studienordnung_id)
+			WHERE ps.prestudent_id IN (?)
+			ORDER BY so.studienordnung_id DESC
+		";
+
+		return $this->execQuery($query, array($prestudentIds));
+	}
 }
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index 5e6a73e7f..4c45c923e 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -55,6 +55,9 @@ export default{
 			}
 			return this.modelValue.map(e => e.prestudent_id);
 		},
+		paramIds(){
+			return  Array.isArray(this.prestudentIds) ? this.prestudentIds.join(',') : this.prestudentIds;
+		},
 		updateData(){
 			const dataArray = [];
 			if (this.modelValue.prestudent_id) {
@@ -636,13 +639,13 @@ export default{
 				this.listStudiensemester = result;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
-/*		this.$fhcApi
-			.get('api/frontend/v1/stv/prestudent/getStudienplaene/' + this.modelValue.prestudent_id)
+		this.$fhcApi
+			.get('api/frontend/v1/stv/prestudent/getStudienplaene/' + encodeURIComponent(this.paramIds))
 			.then(result => result.data)
 			.then(result => {
 				this.listStudienplaene = result;
 			})
-			.catch(this.$fhcAlert.handleSystemError);*/
+			.catch(this.$fhcAlert.handleSystemError);
 		this.$fhcApi
 			.get('api/frontend/v1/stv/status/getStatusgruende/')
 			.then(result => result.data)
@@ -661,7 +664,7 @@ export default{
 	mounted(){},
 	template: `
 		<div class="stv-list h-100 pt-3">
-		
+			
 			<!--Modal: statusModal-->
 			<BsModal ref="statusModal">
 				<template #title>
@@ -1018,12 +1021,12 @@ export default{
 			<!--MultiSelectButton-->
 			<div class="btn-group">						
 				<button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
-					Status Ändern 2
+					Status Ändern
 				</button>
 			
 				<ul class="dropdown-menu">
 					<li class="dropdown-submenu">
-						<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'abbrecherStgl', 'Abbrecher')">Abbrecher durch Stgl 2</a>
+						<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'abbrecherStgl', 'Abbrecher')">Abbrecher durch Stgl</a>
 					</li>
 					<li class="dropdown-submenu">
 						<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'abbrecherStud','Abbrecher')">Abbrecher durch Student</a>

From 823579dc59da27d5714419a5d867851ba342a755 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 19 Jun 2024 15:57:36 +0200
Subject: [PATCH 0818/1461] refactor addNewStatus, cleanup Multi.js

---
 .../api/frontend/v1/stv/Status.php            | 257 ++++++------------
 .../Details/Prestudent/MultiStatus.js         |  23 +-
 2 files changed, 88 insertions(+), 192 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 6d1319f37..1c627745e 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -306,193 +306,92 @@ class Status extends FHCAPI_Controller
 				$this->terminateWithSuccess($prestudent_id);
 		}
 
-		//TODO(Manu) documentation: here setUnterbrecher FasLogic!
-		if($status_kurzbz == 'Unterbrecher')
-		{
-			$ausbildungssemester = $lastStatusData->ausbildungssemester;
-			$studiensemester_kurzbz = $lastStatusData->studiensemester_kurzbz;
-
-			$this->load->library('PrestudentLib');
-			$result = $this->prestudentlib->setUnterbrecher($prestudent_id, $studiensemester_kurzbz, null, null, $ausbildungssemester);
-			if (isError($result))
-			{
-				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			}
-			else
-				$this->terminateWithSuccess($prestudent_id);
-		}
-
-		if($status_kurzbz == 'Student')
-		{
-			$this->load->library('PrestudentLib');
-			$result = $this->prestudentlib->setStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id, $bestaetigtam, $bestaetigtvon);
-
-			if (isError($result))
-			{
-				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			}
-			else
-				$this->terminateWithSuccess($prestudent_id);
-			
-		}
-
-		if($status_kurzbz == 'Diplomand')
-		{
-			$this->load->library('PrestudentLib');
-			$result = $this->prestudentlib->setDiplomand($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
-
-			if (isError($result))
-			{
-				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			}
-			else
-				$this->terminateWithSuccess($prestudent_id);
-			
-		}
-
-		if($status_kurzbz == 'Absolvent')
-		{
-			$this->load->library('PrestudentLib');
-			$result = $this->prestudentlib->setAbsolvent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
-
-			if (isError($result))
-			{
-				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			}
-			else
-				$this->terminateWithSuccess($prestudent_id);
-			
-		}
-
-		// Start DB transaction
-		$this->db->trans_begin(); // Beginnen der Transaktion
-
-		$result = $this->PrestudentstatusModel->insert(
-			[
-				'prestudent_id' => $prestudent_id,
-				'status_kurzbz' => $status_kurzbz,
-				'bewerbung_abgeschicktamum' => $bewerbung_abgeschicktamum,
-				'studiensemester_kurzbz' => $studiensemester_kurzbz,
-				'studienplan_id' => $lastStatusData->studienplan_id,
-				'ausbildungssemester' => $ausbildungssemester,
-				'anmerkung' => $anmerkung,
-				'statusgrund_id' => $statusgrund_id,
-				'insertvon' => $uid,
-				'insertamum' => date('c'),
-				'bestaetigtam' => $bestaetigtam,
-				'bestaetigtvon' => $bestaetigtvon,
-				'datum' => $datum,
-				'rt_stufe' => $rt_stufe
-			]
-		);
-
-		if ($this->db->trans_status() === false || isError($result))
-		{
-			$this->db->trans_rollback();
-		}
-
-		if($isStudent)
-		{
-			$this->load->model('crm/Student_model', 'StudentModel');
-			$result = $this->StudentModel->checkIfUid($prestudent_id);
-			if (isError($result)) {
-				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			}
-			$student_uid = $result->retval;
-
-			//load student
-			$result = $this->StudentModel->loadWhere(
-				array(
-					'student_uid' => $student_uid
-				)
-			);
-			if (isError($result))
-			{
-				$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-			}
-
-			$studentData = current(getData($result) ? : []);
-			$verband = $studentData->verband == '' ? '' : $studentData->verband;
-			$gruppe = $studentData->gruppe == '' ? '' : $studentData->gruppe;
-			$studiengang_kz = $studentData->studiengang_kz;
-
-			//TODO(Manu) DEPRECATED
-			//Handle Abbrecher and Unterbrecher
-/*			if($status_kurzbz == 'Abbrecher' || $status_kurzbz == 'Unterbrecher')
-						{
-							$ausbildungssemester = 0;
-							$gruppe = '';
-							$verband = $status_kurzbz == 'Abbrecher' ? 'A' : 'B';
-						}*/
-
-			//process studentlehrverband
-			$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
-			$result = $this->StudentlehrverbandModel->processStudentlehrverband(
-				$student_uid,
-				$studiengang_kz,
-				$ausbildungssemester,
-				$verband,
-				$gruppe,
-				$studiensemester_kurzbz
-			);
-			if ($this->db->trans_status() === false || isError($result))
-			{
-				$this->db->trans_rollback();
-			//	return $this->terminateWithError($result->code);
-			return $this->terminateWithError($this->p->t('lehre','error_duringInsertUpdateLehrverband'), self::ERROR_TYPE_GENERAL);
-			}
-
-			//update(fuer Abbrecher und Unterbrecher)
-			//implemented for multiaction "status ändern"
-
-			//TODO(Manu) DEPRECATED
-/*			if($status_kurzbz == 'Abbrecher' || $status_kurzbz == 'Unterbrecher')
-			{
-				$result = $this->StudentModel->update(
-					[
-						'student_uid' => $student_uid
-					],
-					[
-						'studiengang_kz' => $studiengang_kz,
-						'semester' => $ausbildungssemester,
-						'verband' => $verband,
-						'gruppe' => $gruppe,
-						'updateamum' => date('c'),
-						'updatevon' => $uid
-				]);
-				if ($this->db->trans_status() === false || isError($result))
+		switch($status_kurzbz){
+			case 'Unterbrecher':
 				{
-					$this->db->trans_rollback();
-					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-				}
+					$ausbildungssemester = $lastStatusData->ausbildungssemester;
+					$studiensemester_kurzbz = $lastStatusData->studiensemester_kurzbz;
 
-				// detailtab: set active to false if abbrecher
-				if($status_kurzbz == 'Abbrecher')
-				{
-
-					$this->load->model('person/Benutzer_model', 'BenutzerModel');
-					$result = $this->BenutzerModel->update(
-						[
-							'uid' => $student_uid
-						],
-						[
-							'aktiv' => false,
-							'updateaktivam' => date('Y-m-d'),
-							'updateaktivvon' => $uid
-						]);
-					if ($this->db->trans_status() === false || isError($result))
+					$this->load->library('PrestudentLib');
+					$result = $this->prestudentlib->setUnterbrecher($prestudent_id, $studiensemester_kurzbz, null, null, $ausbildungssemester);
+					if (isError($result))
 					{
-						$this->db->trans_rollback();
 						return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 					}
+					else
+						$this->terminateWithSuccess($prestudent_id);
 				}
+				break;
+			case 'Student':
+			{
+				$this->load->library('PrestudentLib');
+				$result = $this->prestudentlib->setStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id, $bestaetigtam, $bestaetigtvon);
 
-			}*/
+				if (isError($result))
+				{
+					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+				}
+				else
+					$this->terminateWithSuccess($prestudent_id);
+
+			}
+			break;
+			case 'Diplomand':
+			{
+				$this->load->library('PrestudentLib');
+				$result = $this->prestudentlib->setDiplomand($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
+
+				if (isError($result))
+				{
+					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+				}
+				else
+					$this->terminateWithSuccess($prestudent_id);
+			}
+			break;
+			case 'Absolvent':
+			{
+				$this->load->library('PrestudentLib');
+				$result = $this->prestudentlib->setAbsolvent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
+
+				if (isError($result))
+				{
+					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+				}
+				else
+					$this->terminateWithSuccess($prestudent_id);
+
+			}
+			default:
+			{
+/*				if ($isStudent) {
+					return $this->terminateWithError("LehrverbandData needs no handling", self::ERROR_TYPE_GENERAL);
+				}*/
+				$result = $this->PrestudentstatusModel->insert(
+					[
+						'prestudent_id' => $prestudent_id,
+						'status_kurzbz' => $status_kurzbz,
+						'bewerbung_abgeschicktamum' => $bewerbung_abgeschicktamum,
+						'studiensemester_kurzbz' => $studiensemester_kurzbz,
+						'studienplan_id' => $lastStatusData->studienplan_id,
+						'ausbildungssemester' => $ausbildungssemester,
+						'anmerkung' => $anmerkung,
+						'statusgrund_id' => $statusgrund_id,
+						'insertvon' => $uid,
+						'insertamum' => date('c'),
+						'bestaetigtam' => $bestaetigtam,
+						'bestaetigtvon' => $bestaetigtvon,
+						'datum' => $datum,
+						'rt_stufe' => $rt_stufe
+					]
+				);
+
+				if (isError($result)) {
+					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+				} else
+					$this->terminateWithSuccess($prestudent_id);
+			}
 		}
-
-		$this->db->trans_commit();
-
-		$this->terminateWithSuccess($prestudent_id);
 	}
 
 	public function loadStatus()
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index 4c45c923e..9ea848a89 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -353,7 +353,7 @@ export default{
 			});
 		},
 		actionConfirmDialogue(data, statusgrund, statusText){
-			this.hideModal('addMultiStatus');
+		//	this.hideModal('addMultiStatus');
 			this.actionButton = statusgrund;
 			this.actionStatusText = statusText;
 
@@ -398,7 +398,6 @@ export default{
 				};
 
 			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData }));
-			console.log("in changeStatus to Unterbrecher: " + this.deltaData);
 			this.addNewStatus(prestudentIds);
 		},
 		changeStatusToStudent(prestudentIds){
@@ -439,8 +438,8 @@ export default{
 
 			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData}));
 
-			console.log("in changeStatusToDiplomand" + prestudentIds);
-			this.hideModal('addMultiStatus');
+/*			console.log("in changeStatusToDiplomand" + prestudentIds);
+			this.hideModal('addMultiStatus');*/
 			this.addNewStatus(prestudentIds);
 		},
 		changeStatusToAbsolvent(prestudentIds){
@@ -454,8 +453,8 @@ export default{
 
 			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData}));
 
-			console.log("in changeStatusToAbsolvent" + prestudentIds);
-			this.hideModal('addMultiStatus');
+/*			console.log("in changeStatusToAbsolvent" + prestudentIds);
+			this.hideModal('addMultiStatus');*/
 			this.addNewStatus(prestudentIds);
 		},
 		addNewStatus(prestudentIds){
@@ -491,12 +490,10 @@ export default{
 				.allSettled(promises)
 				.then(values => {
 					if (this.abbruchData.length < 1) {
-						console.log("singleNew");
 					}
 					else{
 						if(this.newArray.length > 0) {
 							this.newStatus = this.newArray[0].status_kurzbz;
-							console.log(`Successful: ${countSuccess}, Errors: ${countError}`);
 						}
 						else {
 							this.newStatus = this.statusData.status_kurzbz;
@@ -863,7 +860,7 @@ export default{
 				</template>
 			</BsModal>
 			
-			<BsModal ref="addMultiStatus" id="addMultiStatus">
+<!--			<BsModal ref="addMultiStatus" id="addMultiStatus">
 				<template #title>Status ändern zu</template>
 				<template #default>
 					<button type="button" class="btn btn-primary d-block mb-2" data-bs-toggle="collapse" data-bs-target="#submenu1">
@@ -905,11 +902,11 @@ export default{
 						<button  ref="Close" type="button" class="btn btn-primary" @click="changeStatusToUnterbrecher(prestudentIds)">OK</button>
 					</div>					
 				</template>
-			</BsModal>
+			</BsModal>-->
 			
-			<ul class="dropdown-menu" ref="addMultiStatus3" id="addMultiStatus3">
+<!--			<ul class="dropdown-menu" ref="addMultiStatus3" id="addMultiStatus3">
 				<li class="dropdown-submenu">
-					<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'abbrecherStgl', 'Abbrecher')">Abbrecher durch Stgl</a>
+					<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'abbrecherStgl', 'Abbrecher')">Abbrecher durch Stgl 5</a>
 				</li>
 				<li class="dropdown-submenu">
 					<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'abbrecherStud','Abbrecher')">Abbrecher durch Student</a>
@@ -929,7 +926,7 @@ export default{
 				<li class="dropdown-submenu">
 					<a class="dropdown-item" @click="changeStatusToAbsolvent(prestudentIds)">Absolvent</a>
 				</li>							
-			</ul>
+			</ul>-->
 			
 			<!--Modal: askForAusbildungssemester-->
 			<BsModal ref="askForAusbildungssemester">

From e78598900adb9fc1f2f558e05a0c67843921016e Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Wed, 19 Jun 2024 20:42:14 +0200
Subject: [PATCH 0819/1461] Studierendenverwaltung: added new prestudenstatus
 checks, created PrestudentstatusCheckLib

---
 .../api/frontend/v1/stv/Status.php            |  36 ++-
 .../libraries/PrestudentstatusCheckLib.php    | 301 ++++++++++++++++++
 .../models/crm/Prestudentstatus_model.php     | 216 ++-----------
 .../organisation/Studiensemester_model.php    |  74 +++--
 system/phrasesupdate.php                      |  68 +++-
 5 files changed, 459 insertions(+), 236 deletions(-)
 create mode 100644 application/libraries/PrestudentstatusCheckLib.php

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 1c627745e..710f4b648 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -23,6 +23,7 @@ class Status extends FHCAPI_Controller
 
 		// Load Libraries
 		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+		$this->load->library('PrestudentstatusCheckLib');
 
 		// Load language phrases
 		$this->loadPhrases([
@@ -126,6 +127,7 @@ class Status extends FHCAPI_Controller
 		$datum = $this->input->post('datum');
 		$bestaetigtam = $this->input->post('bestaetigtam');
 		$bewerbung_abgeschicktamum = $this->input->post('bewerbung_abgeschicktamum');
+		$studienplan_id = $this->input->post('studienplan_id');
 		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
 		$anmerkung = $this->input->post('anmerkung');
 		$statusgrund_id = $this->input->post('statusgrund_id');
@@ -165,7 +167,8 @@ class Status extends FHCAPI_Controller
 		{
 			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 		}
-		if($result->retval == '1')
+
+		if(getData($result) == '1')
 		{
 			return $this->terminateWithError($name . ": " . $this->p->t('lehre','error_rolleBereitsVorhanden'), self::ERROR_TYPE_GENERAL);
 		}
@@ -249,21 +252,17 @@ class Status extends FHCAPI_Controller
 		if(!$isBerechtigtNoStudstatusCheck)
 		{
 			//Block STATUSCHECKS
-			$new_status_datum = isset($datum) ? $datum  : date('Y-m-d');
-			$result = $this->PrestudentstatusModel->checkDatumNewStatus($new_status_datum);
-			if (isError($result))
-			{
-				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			}
+			$new_status_datum = isset($datum) ? $datum : date('Y-m-d');
 
-			$result = $this->PrestudentstatusModel->checkIfValidStatusHistory(
+			$result = $this->prestudentstatuschecklib->checkStatusAdd(
 				$prestudent_id,
-				$name,
 				$status_kurzbz,
 				$studiensemester_kurzbz,
 				$new_status_datum,
-				$ausbildungssemester
+				$ausbildungssemester,
+				$studienplan_id
 			);
+
 			if (isError($result))
 			{
 				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
@@ -545,9 +544,9 @@ class Status extends FHCAPI_Controller
 
 		$sqlundo =
 			"
-			INSERT INTO public.tbl_prestudentstatus(prestudent_id, status_kurzbz, studiensemester_kurzbz, ausbildungssemester, 
-			    datum, insertamum, insertvon, updateamum, updatevon, ext_id, orgform_kurzbz, bestaetigtam, bestaetigtvon, 
-			    anmerkung, bewerbung_abgeschicktamum, studienplan_id,  rt_stufe, statusgrund_id) 
+			INSERT INTO public.tbl_prestudentstatus(prestudent_id, status_kurzbz, studiensemester_kurzbz, ausbildungssemester,
+				datum, insertamum, insertvon, updateamum, updatevon, ext_id, orgform_kurzbz, bestaetigtam, bestaetigtvon,
+				anmerkung, bewerbung_abgeschicktamum, studienplan_id,  rt_stufe, statusgrund_id)
 			VALUES('" . $prestudent_id . "','" . $status_kurzbz . "','" . $studiensemester_kurzbz . "','" . $ausbildungssemester . "',"
 			. $quotes_datum . $datum . $quotes_datum . ","
 			. $quotes_insertamum . $insertamum . $quotes_insertamum . ","
@@ -795,7 +794,7 @@ class Status extends FHCAPI_Controller
 				aufnahmeschluessel, facheinschlberuf, anmeldungreihungstest, reihungstestangetreten, reihungstest_id,
 				rt_gesamtpunkte, rt_punkte1, rt_punkte2, rt_punkte3, bismelden, person_id, anmerkung, mentor, ext_id,
 				dual, ausstellungsstaat, zgvdoktor_code, zgvdoktorort, zgvdoktordatum, zgvdoktornation,
-				gsstudientyp_kurzbz, aufnahmegruppe_kurzbz, priorisierung, zgvdoktor_erfuellt) 
+				gsstudientyp_kurzbz, aufnahmegruppe_kurzbz, priorisierung, zgvdoktor_erfuellt)
 	VALUES('" . $prestudent_id . "',"
 				. $quotes_aufmerksamdurch_kurzbz . $aufmerksamdurch_kurzbz . $quotes_aufmerksamdurch_kurzbz . ","
 				. $quotes_studiengang_kz . $studiengang_kz . $quotes_studiengang_kz . ","
@@ -974,14 +973,17 @@ class Status extends FHCAPI_Controller
 		{
 			//Block STATUSCHECKS
 
-			$result = $this->PrestudentstatusModel->checkIfValidStatusHistory(
+			$result = $this->prestudentstatuschecklib->checkStatusUpdate(
 				$prestudent_id,
-				'',
 				$status_kurzbz,
 				$studiensemester_kurzbz,
 				$datum,
-				$ausbildungssemester
+				$ausbildungssemester,
+				$studienplan_id,
+				$key_studiensemester_kurzbz,
+				$key_ausbildungssemester
 			);
+
 			if (isError($result))
 			{
 				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
diff --git a/application/libraries/PrestudentstatusCheckLib.php b/application/libraries/PrestudentstatusCheckLib.php
new file mode 100644
index 000000000..4e1075736
--- /dev/null
+++ b/application/libraries/PrestudentstatusCheckLib.php
@@ -0,0 +1,301 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class PrestudentstatusCheckLib
+{
+	const INTERESSENT_STATUS = 'Interessent';
+	const BEWERBER_STATUS = 'Bewerber';
+	const AUFGENOMMENER_STATUS = 'Aufgenommener';
+	const UNTERBRECHER_STATUS = 'Unterbrecher';
+	const STUDENT_STATUS = 'Student';
+	const DIPLOMAND_STATUS = 'Diplomand';
+	const ABSOLVENT_STATUS = 'Absolvent';
+	const ABBRECHER_STATUS = 'Abbrecher';
+
+	private $_ci;
+	private $_statusAbfolgeVorStudent = [self::INTERESSENT_STATUS, self::BEWERBER_STATUS, self::AUFGENOMMENER_STATUS];
+	private $_endStatusArr = [self::ABSOLVENT_STATUS, self::ABBRECHER_STATUS];
+
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+		$this->_ci =& get_instance();
+
+		$this->_ci->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+		$this->_ci->load->model('person/Person_model', 'PersonModel');
+		$this->_ci->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
+		$this->_ci->load->model('organisation/Studienplan_model', 'StudienplanModel');
+	}
+
+	/**
+	 * Checks if a status add is valid.
+	 * @return object error if invalid
+	 */
+	public function checkStatusAdd(
+		$prestudent_id,
+		$status_kurzbz,
+		$new_status_studiensemester_kurzbz,
+		$new_status_datum,
+		$new_status_ausbildungssemester,
+		$new_studienplan_id
+	) {
+		$studentName = '';
+
+		$nameRes = $this->_ci->PersonModel->loadPrestudent($prestudent_id);
+
+		if (hasData($nameRes))
+		{
+			$nameData = getData($nameRes)[0];
+			$studentName = $nameData->vorname.' '.$nameData->nachname;
+		}
+
+		// Datum des neuen Status darf nicht in Vergangenheit liegen, sonst Probleme wenn neues Datum < Bismeldedatum
+		if (new DateTime($new_status_datum) < new DateTime('today'))
+			return error($studentName . $this->_ci->p->t('lehre', 'error_entryInPast'));
+
+		return $this->_checkIfValidStatusHistory(
+			$prestudent_id,
+			$status_kurzbz,
+			$new_status_studiensemester_kurzbz,
+			$new_status_datum,
+			$new_status_ausbildungssemester,
+			$new_studienplan_id
+		);
+	}
+
+	/**
+	 * Checks if a status update is valid.
+	 * @return error if invalid
+	 */
+	public function checkStatusUpdate(
+		$prestudent_id,
+		$status_kurzbz,
+		$new_status_studiensemester_kurzbz,
+		$new_status_datum,
+		$new_status_ausbildungssemester,
+		$new_studienplan_id,
+		$old_status_studiensemester,
+		$old_status_ausbildungssemester
+	) {
+
+		return $this->_checkIfValidStatusHistory(
+			$prestudent_id,
+			$status_kurzbz,
+			$new_status_studiensemester_kurzbz,
+			$new_status_datum,
+			$new_status_ausbildungssemester,
+			$new_studienplan_id,
+			$old_status_studiensemester,
+			$old_status_ausbildungssemester
+		);
+	}
+
+	/**
+	 * Check if History of StatusData is valid
+	 * @param integer $prestudent_id
+	 * @return error if not valid, array StatusArr if valid
+	 */
+	private function _checkIfValidStatusHistory(
+		$prestudent_id,
+		$status_kurzbz,
+		$new_status_studiensemester_kurzbz,
+		$new_status_datum,
+		$new_status_ausbildungssemester,
+		$new_studienplan_id,
+		$old_status_studiensemester = null,
+		$old_status_ausbildungssemester = null
+	) {
+		//get start studiensemester
+		$semResult = $this->_ci->StudiensemesterModel->load([
+			'studiensemester_kurzbz' => $new_status_studiensemester_kurzbz
+		]);
+
+		if (isError($semResult))
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson(getError($semResult));
+		}
+
+		if (!hasData($semResult)) {
+			return error($this->_ci->p->t('lehre', 'error_noStudiensemester') . $new_status_studiensemester_kurzbz);
+		}
+
+		$studiensemester = getData($semResult)[0];
+		$new_status_semesterstart = $studiensemester->start;
+
+		// get studienplan orgform
+		$new_studienplan_orgform_kurzbz = '';
+		$this->_ci->StudienplanModel->addSelect('orgform_kurzbz');
+		$stplResult = $this->_ci->StudienplanModel->load([
+			'studienplan_id' => $new_studienplan_id
+		]);
+
+		if (isError($stplResult))
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson(getError($stplResult));
+		}
+
+		if (hasData($stplResult)) $new_studienplan_orgform_kurzbz = getData($stplResult)[0]->orgform_kurzbz;
+
+
+		//get all prestudentstati
+		$resultPs = $this->_ci->PrestudentstatusModel->getAllPrestudentstatiWithStudiensemester($prestudent_id);
+
+		if (isError($resultPs)) return $resultPs;
+
+		$resultArr = hasData($resultPs) ? getData($resultPs) : [];
+		$statusArr = [];
+
+		$newStatusInserted = false;
+		$new_status_datum_form = new DateTime($new_status_datum);
+		$new_status_semesterstart_form = new DateTime($new_status_semesterstart);
+
+		$neuer_status = new stdClass();
+		$neuer_status->status_kurzbz = $status_kurzbz;
+		$neuer_status->studiensemester_kurzbz = $new_status_studiensemester_kurzbz;
+		$neuer_status->datum = $new_status_datum;
+		$neuer_status->ausbildungssemester = $new_status_ausbildungssemester;
+		$neuer_status->studienplan_orgform_kurzbz = $new_studienplan_orgform_kurzbz;
+
+		foreach ($resultArr as $row)
+		{
+			// gerade bearbeiteten Status überspringen
+			if (isset($old_status_studiensemester)
+				&& isset($old_status_ausbildungssemester)
+				&& $row->status_kurzbz == $status_kurzbz
+				&& $row->studiensemester_kurzbz == $old_status_studiensemester
+				&& $row->ausbildungssemester == $old_status_ausbildungssemester)
+				continue;
+
+			$studiensemester_start = new DateTime($row->studiensemester_start);
+			$status_datum = new DateTime($row->datum);
+
+			if ($new_status_datum_form >= $status_datum && $new_status_semesterstart_form >= $studiensemester_start)
+			{
+				if (!$newStatusInserted)
+				{
+					// neuer Status erstmals größer als Datum eines bestehenden Status -> neuen Status EINMALIG einfügen für spätere Statusprüfung
+					$neuer_status = new stdClass();
+					$neuer_status->status_kurzbz = $status_kurzbz;
+					$neuer_status->studiensemester_kurzbz = $new_status_studiensemester_kurzbz;
+					$neuer_status->datum = $new_status_datum;
+					$neuer_status->ausbildungssemester = $new_status_ausbildungssemester;
+					$neuer_status->studienplan_orgform_kurzbz = $new_studienplan_orgform_kurzbz;
+					$neuer_status->matrikelnr = $row->matrikelnr;
+					$neuer_status->vorname = $row->vorname;
+					$neuer_status->nachname = $row->nachname;
+					$statusArr[] = $neuer_status;
+					$newStatusInserted = true;
+				}
+				$statusArr[] = $row;
+			}
+			elseif ($new_status_datum_form <= $status_datum && $new_status_semesterstart_form <= $studiensemester_start)
+			{
+				$statusArr[] = $row;
+			}
+			else
+			{
+				// Zeitabfolge ungültig, Fehler
+				return error($this->_ci->p->t('lehre', 'error_statuseintrag_zeitabfolge'));
+			}
+		}
+
+		// erster Studentstatus
+		$ersterStudent = null;
+
+		// Über alle gespeicherten Status gehen und Statusabfolge prüfen
+		for ($i = 0; $i < count($statusArr); $i++)
+		{
+			$curr_status = $statusArr[$i];
+			$curr_status_kurzbz = $curr_status->status_kurzbz;
+			$curr_status_ausbildungssemester = $curr_status->ausbildungssemester;
+			$next_idx = $i - 1; //absteigend sortiert, nächster Status ist vorheriger Eintrag
+			$next_status = isset($statusArr[$next_idx]) ? $statusArr[$next_idx] : null;
+
+			$studentName = $curr_status->vorname . ' ' . $curr_status->nachname;
+
+			if ($curr_status_kurzbz == self::STUDENT_STATUS) $ersterStudent = $curr_status;
+
+			// Abbrecher- oder Absolventenstatus muss Endstatus sein
+			if (isset($next_status) && in_array($curr_status_kurzbz, $this->_endStatusArr))
+			{
+				return error($studentName . ' ' . $this->_ci->p->t('lehre', 'error_endstatus'));
+			}
+
+			// wenn Unterbrecher auf Unterbrecher folgt, muss Ausbildungssemester gleich sein
+			if
+				($curr_status_kurzbz == self::UNTERBRECHER_STATUS && isset($next_status) && $next_status->status_kurzbz == self::UNTERBRECHER_STATUS
+				&& $curr_status_ausbildungssemester != $next_status->ausbildungssemester)
+			{
+				return error($studentName . ' ' . $this->_ci->p->t('lehre', 'error_consecutiveUnterbrecher'));
+			}
+
+			// wenn Abbrecher auf Unterbrecher folgt, muss Ausbildungssemester gleich sein
+			if (isset($next_status)
+				&& $curr_status_kurzbz == self::UNTERBRECHER_STATUS
+				&& $next_status->status_kurzbz == self::ABBRECHER_STATUS && $curr_status_ausbildungssemester != $next_status->ausbildungssemester)
+			{
+				return error($studentName . ' ' . $this->_ci->p->t('lehre', 'error_consecutiveUnterbrecherAbbrecher'));
+			}
+
+			if (isset($next_status) && $next_status->status_kurzbz == self::STUDENT_STATUS)
+			{
+				$restliche_status_obj = array_slice($statusArr, $i);
+				$restliche_status = array_unique(array_column($restliche_status_obj, 'status_kurzbz'));
+				$status_intersected = array_intersect($restliche_status, $this->_statusAbfolgeVorStudent);
+
+				// Vor Studentstatus darf kein Diplomand Status vorhanden sein
+				if (in_array(self::DIPLOMAND_STATUS, $restliche_status))
+				{
+					return error($studentName . ' ' . $this->_ci->p->t('lehre', 'error_consecutiveDiplomandStudent'));
+				}
+
+				// Vor Studentstatus müssen bestimmte Status vorhanden sein
+				if (array_values($status_intersected) != array_values(array_reverse($this->_statusAbfolgeVorStudent)))
+				{
+					return error(
+						$studentName . ' '
+						. $this->_ci->p->t('lehre', 'error_wrongStatusOrderBeforeStudent', array(implode(', ', $this->_statusAbfolgeVorStudent)))
+					);
+				}
+			}
+		}
+
+		if (isset($ersterStudent))
+		{
+			$studentName = $ersterStudent->vorname . ' ' . $ersterStudent->nachname;
+
+			// wenn erster Studentstatus, checken ob Personenkennzeichen passt
+			$studienjahrNumber = $this->_ci->StudiensemesterModel->getStudienjahrNumberFromStudiensemester($ersterStudent->studiensemester_kurzbz);
+
+			if ($studienjahrNumber != mb_substr($ersterStudent->matrikelnr, 0, 2))
+			{
+				return error($studentName . ' ' . $this->_ci->p->t('lehre', 'error_personenkennzeichenPasstNichtZuStudiensemester'));
+			}
+
+			// wenn erster Studentstatus, checken ob Orgform des Bewerbers mit Studenten übereinstimmt
+			if (!isEmptyArray(
+					array_filter(
+						$restliche_status_obj,
+						function ($s) use ($ersterStudent) {
+							return
+								$s->status_kurzbz == self::BEWERBER_STATUS
+								&& (
+									$s->studienplan_orgform_kurzbz != $ersterStudent->studienplan_orgform_kurzbz
+								);
+						}
+					)
+				)
+			)
+			{
+				return error($studentName . ' ' . $this->_ci->p->t('lehre', 'error_bewerberOrgformUngleichStudentOrgform'));
+			}
+		}
+
+		return $resultPs;
+	}
+}
diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php
index 706cd82ba..73e2bdaee 100644
--- a/application/models/crm/Prestudentstatus_model.php
+++ b/application/models/crm/Prestudentstatus_model.php
@@ -365,11 +365,11 @@ class Prestudentstatus_model extends DB_Model
 	{
 		$qry = "SELECT
 					*
-				FROM 
+				FROM
 				    public.tbl_prestudentstatus
 				WHERE
-					prestudent_id = ? 
-				AND 
+					prestudent_id = ?
+				AND
 				    status_kurzbz = ?
 				AND
 				    studiensemester_kurzbz = ?
@@ -401,11 +401,11 @@ class Prestudentstatus_model extends DB_Model
 	{
 		$qry = "SELECT
 					*
-				FROM 
+				FROM
 				    public.tbl_prestudentstatus
 				WHERE
-					prestudent_id = ? 
-				AND 
+					prestudent_id = ?
+				AND
 				    status_kurzbz = 'Bewerber'";
 
 		$result = $this->execQuery($qry, array($prestudent_id));
@@ -434,7 +434,7 @@ class Prestudentstatus_model extends DB_Model
 	{
 		$qry = "SELECT
 					COUNT(*) as anzahl
-				FROM 
+				FROM
 				    public.tbl_prestudentstatus
 				WHERE
 					prestudent_id = ?
@@ -471,186 +471,34 @@ class Prestudentstatus_model extends DB_Model
 		}
 	}
 
-	/**
-	 * Check if Datum New Status is in the Past
-	 * @param integer $prestudent_id
-	 * @return error if in past
-	 */
-	public function checkDatumNewStatus($new_status_datum)
+	public function getAllPrestudentstatiWithStudiensemester($prestudent_id)
 	{
-		$today = new DateTime('today');
-		$new_status_datum = new DateTime($new_status_datum);
-
-		if($new_status_datum < $today)
-		{
-			return error($this->p->t('lehre','error_entryInPast'));
-		}
-		else
-		{
-			return success();
-		}
-	}
-
-	/**
-	 * Check if History of StatusData is valid
-	 * @param integer $prestudent_id
-	 * @return error if not valid, array StatusArr if valid
-	 */
-	public function checkIfValidStatusHistory($prestudent_id, $nameStud, $status_kurzbz, $new_status_studiensemester_kurzbz, $new_status_datum, $new_status_ausbildungssemester, $old_status_studiensemester_kurzbz = '', $old_status_ausbildungssemester = '')
-	{
-		$name = ($nameStud != '') ? $nameStud . ": " : '';
-		//$isNewStatus = $this->checkIfNewStatus($prestudent_id,  $status_kurzbz);
-		$isNewStatus =  $old_status_studiensemester_kurzbz == '' && $old_status_ausbildungssemester == '';
-
-		//get start studiensemester
-		$result = $this->StudiensemesterModel->load([
-			'studiensemester_kurzbz' => $new_status_studiensemester_kurzbz
-		]);
-		if(isError($result))
-		{
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson(getError($result));
-		}
-		elseif(!hasData($result)) {
-			return error($this->p->t('lehre','error_noStudiensemester') . $new_status_studiensemester_kurzbz);
-		}
-
-		$studiensemester = current($result->retval);
-		$new_status_semesterstart = $studiensemester->start;
-
-		//get all prestudentstati
-		//TODO(manu) check errorlogic
-		$resultPs = $this->getAllPrestudentstatiWithStudiensemester($prestudent_id);
-		if (isError($resultPs))
-		{
-			$resultArr = [];
-		}
-		if(!hasData($resultPs))
-		{
-			$resultArr = [];
-		}
-		else
-			$resultArr = $resultPs->retval;
-
-		$statusArr = array();
-
-		$newStatusInserted = false;
-		$new_status_datum_form = new DateTime($new_status_datum);
-		$new_status_semesterstart_form = new DateTime($new_status_semesterstart);
-
-
-		foreach ($resultArr as $row)
-		{
-			$studiensemester_start = new DateTime($row->studiensemester_start);
-			$status_datum = new DateTime ($row->datum);
-
-
-			if ($new_status_datum_form >= $status_datum && $new_status_semesterstart_form >= $studiensemester_start)
-			{
-				if (!$newStatusInserted)
-				{
-					// neuer Status erstmals größer als Datum eines bestehenden Status -> neuen Status EINMALIG einfügen für spätere Statusprüfung
-					$neuer_status = new stdClass();
-					$neuer_status->status_kurzbz = $status_kurzbz;
-					$neuer_status->studiensemester_kurzbz = $new_status_studiensemester_kurzbz;
-					$neuer_status->datum = $new_status_datum;
-					$neuer_status->ausbildungssemester = $new_status_ausbildungssemester;
-					$statusArr[] = $neuer_status;
-					$newStatusInserted = true;
-				}
-				$statusArr[] = $row;
-			}
-			elseif($new_status_datum_form <= $status_datum && $new_status_semesterstart_form <= $studiensemester_start)
-			{
-				$statusArr[] = $row;
-
-			}
-			else
-			{
-				return error($this->p->t('lehre','error_statuseintrag'));
-			}
-
-		}
-
-		$endstatusArr = array('Absolvent', 'Abbrecher');
-		// Über alle gespeicherten Status gehen und Statusabfolge prüfen
-		for ($i = 0; $i < count($statusArr); $i++) {
-			$curr_status = $statusArr[$i];
-			$curr_status_kurzbz = $curr_status->status_kurzbz;
-			$curr_status_ausbildungssemester = $curr_status->ausbildungssemester;
-			$next_idx = $i - 1; //absteigend sortiert, nächster Status ist vorheriger Eintrag
-			$next_status = isset($statusArr[$next_idx]) ? $statusArr[$next_idx] : null;
-
-			// Abbrecher- oder Absolventenstatus muss Endstatus sein
-			if (isset($next_status) && in_array($curr_status_kurzbz, $endstatusArr))
-			{
-				return error($name . $this->p->t('lehre','error_endstatus'));
-			}
-
-			// wenn Unterbrecher auf Unterbrecher folgt, muss Ausbildungssemester gleich sein
-			if (
-				$curr_status_kurzbz == 'Unterbrecher' && isset($next_status) && $next_status->status_kurzbz == 'Unterbrecher'
-				&& $curr_status_ausbildungssemester != $next_status->ausbildungssemester
-			)
-			{
-				return error($name . $this->p->t('lehre','error_consecutiveUnterbrecher'));
-			}
-
-			// wenn Abbrecher auf Unterbrecher folgt, muss Ausbildungssemester gleich sein
-			if (
-				isset($next_status) && $curr_status_kurzbz == 'Unterbrecher'
-				&& $next_status->status_kurzbz == 'Abbrecher' && $curr_status_ausbildungssemester != $next_status->ausbildungssemester
-			)
-			{
-				return error($name . $this->p->t('lehre','error_consecutiveUnterbrecherAbbrecher'));
-			}
-
-			// keine Studenten nach Diplomand Status
-			if (
-				isset($next_status) && $curr_status_kurzbz == 'Diplomand' && $next_status->status_kurzbz == 'Student'
-			)
-			{
-				return error($name . $this->p->t('lehre','error_consecutiveDiplomandStudent'));
-			}
-
-		}
-
-		return $resultPs;
-	}
-
-	public function getAllPrestudentstatiWithStudiensemester($prestudent_id, $old_status_studiensemester_kurzbz = '', $old_status_ausbildungssemester = '')
-	{
-
-		//Todo(manu) check isNewStatus
-		$isNewStatus =  $old_status_studiensemester_kurzbz == '' && $old_status_ausbildungssemester == '';
-
 		$qry = "
-				SELECT public.tbl_prestudentstatus.status_kurzbz, 
-				public.tbl_prestudentstatus.studiensemester_kurzbz, 
-				public.tbl_prestudentstatus.ausbildungssemester, 
-				public.tbl_prestudentstatus.datum, 
-				s.start AS studiensemester_start 
-				FROM public.tbl_prestudentstatus 
-				JOIN public.tbl_studiensemester s USING (studiensemester_kurzbz) 
-				WHERE prestudent_id = ? 
-				ORDER BY public.tbl_prestudentstatus.datum DESC, 
-				public.tbl_prestudentstatus.insertamum DESC, 
-				public.tbl_prestudentstatus.ext_id DESC
+				SELECT
+					tbl_prestudentstatus.status_kurzbz,
+					tbl_prestudentstatus.studiensemester_kurzbz,
+					tbl_prestudentstatus.ausbildungssemester,
+					tbl_prestudentstatus.datum,
+					s.start AS studiensemester_start,
+					pl.orgform_kurzbz AS studienplan_orgform_kurzbz,
+					stud.matrikelnr,
+					pers.vorname,
+					pers.nachname
+				FROM
+					public.tbl_prestudentstatus
+					JOIN public.tbl_studiensemester s USING (studiensemester_kurzbz)
+					JOIN public.tbl_prestudent USING (prestudent_id)
+					JOIN public.tbl_person pers USING (person_id)
+					LEFT JOIN public.tbl_student stud USING (prestudent_id)
+					LEFT JOIN lehre.tbl_studienplan pl USING (studienplan_id)
+				WHERE
+					prestudent_id = ?
+				ORDER BY
+					public.tbl_prestudentstatus.datum DESC,
+					public.tbl_prestudentstatus.insertamum DESC,
+					public.tbl_prestudentstatus.ext_id DESC
 		";
 
-		$result = $this->execQuery($qry, array($prestudent_id));
-
-		if (isError($result))
-		{
-			return error($result);
-		}
-		if (!hasData($result)) {
-			return success("0", $this->p->t('lehre','error_noStatusFound'));
-		}
-
-		return $result;
-
+		return $this->execQuery($qry, array($prestudent_id));
 	}
-
-
 }
diff --git a/application/models/organisation/Studiensemester_model.php b/application/models/organisation/Studiensemester_model.php
index caa385128..c59c9d343 100644
--- a/application/models/organisation/Studiensemester_model.php
+++ b/application/models/organisation/Studiensemester_model.php
@@ -13,35 +13,35 @@ class Studiensemester_model extends DB_Model
 		$this->hasSequence = false;
 	}
 
-    /**
-     * Get actual Studiensemester.
-     *
-     * @return array
-     */
-    public function getAkt()
-    {
-        return $this->loadWhere(array(
-                'start <= ' => 'NOW()',
-                'ende >= '  => 'NOW()'
-            )
-        );
-    }
+	/**
+	 * Get actual Studiensemester.
+	 *
+	 * @return array
+	 */
+	public function getAkt()
+	{
+		return $this->loadWhere(array(
+				'start <= ' => 'NOW()',
+				'ende >= '  => 'NOW()'
+			)
+		);
+	}
 
 	// Get next study semester
 	public function getNext()
-    {
-        $query = '
-            SELECT *
-            FROM
-                public.tbl_studiensemester
-            WHERE
-                start > now()
-            ORDER BY start
-            LIMIT 1;
-        ';
+	{
+		$query = '
+			SELECT *
+			FROM
+				public.tbl_studiensemester
+			WHERE
+				start > now()
+			ORDER BY start
+			LIMIT 1;
+		';
 
-        return $this->execQuery($query);
-    }
+		return $this->execQuery($query);
+	}
 
 	/**
 	 * getLastOrAktSemester
@@ -182,10 +182,10 @@ class Studiensemester_model extends DB_Model
 			return success(array());
 
 		$query = "
-            SELECT  *
-            FROM    public.tbl_studiensemester
-            WHERE   ( ?::date < ende AND ?::date > start )
-            ORDER BY start DESC";
+			SELECT  *
+			FROM	public.tbl_studiensemester
+			WHERE   ( ?::date < ende AND ?::date > start )
+			ORDER BY start DESC";
 
 		return $this->execQuery($query, array($from, $to));
 	}
@@ -200,7 +200,7 @@ class Studiensemester_model extends DB_Model
 	{
 		$query = "SELECT studiensemester_kurzbz, start, ende FROM public.vw_studiensemester
 				WHERE studiensemester_kurzbz <> ?
-		        ORDER BY delta, start LIMIT 1";
+				ORDER BY delta, start LIMIT 1";
 
 		return $this->execQuery($query, array($studiensemester_kurzbz));
 	}
@@ -211,7 +211,7 @@ class Studiensemester_model extends DB_Model
 					FROM public.tbl_studiensemester
 					WHERE start >= NOW() OR (start <= NOW() AND ende >= NOW())
 					ORDER BY start';
-					
+
 		return $this->execQuery($query);
 	}
 
@@ -241,4 +241,16 @@ class Studiensemester_model extends DB_Model
 		
 		$this->db->where_in($this->pk, '(' . $plus . ') UNION (' . $minus . ')', false);
 	}
+
+	/**
+	 * Holt letzen zwei Ziffern des Studienjahres von Studiensemester, z.B. 24 für WS2024 und SS2025
+	 * @param studiensemester_kurzbz
+	 * @return string Studienjahr Nummer
+	 */
+	public function getStudienjahrNumberFromStudiensemester($studiensemester_kurzbz)
+	{
+		$studienjahrNumber = mb_substr($studiensemester_kurzbz, 4, 2);
+		if (is_numeric($studienjahrNumber) && mb_substr($studiensemester_kurzbz, 0, 2) == 'SS') (int)$studienjahrNumber -= 1;
+		return $studienjahrNumber;
+	}
 }
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 4b7c2852b..bcb4e24a1 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -24832,7 +24832,7 @@ array(
 				'insertvon' => 'system'
 			)
 		)
-	),	
+	),
 	// Personalverwaltung end
 	array(
 		'app' => 'core',
@@ -27885,18 +27885,18 @@ array(
 	array(
 		'app' => 'core',
 		'category' => 'lehre',
-		'phrase' => 'error_statuseintrag',
+		'phrase' => 'error_statuseintrag_zeitabfolge',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Datum des Statuseintrags muss nach dem Statusdatum, das Semesterstartdatum nach Semesterstartdatum des vorherigen Statuseintrags sein',
+				'text' => 'Ungültige Zeitabfolge der Statuseinträge (Statusdatum oder Semester)',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Error: Date of the status entry must be after the start date, the semester start date after the semester start date of the previous status entry',
+				'text' => 'Error: Invalid date order of statuses (date or semester)',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -28202,6 +28202,66 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'error_wrongStatusOrderBeforeStudent',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Vor dem Studentenstatus müssen folgende Status eingetragen werden: {0}',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error: Following status should be present before student status: {0}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'error_personenkennzeichenPasstNichtZuStudiensemester',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Personenkennzeichen passt nicht zu Studiensemester des ersten Studentstatus',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error: Personenkennzeichen does not fit with semester of first student status',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'error_bewerberOrgformUngleichStudentOrgform',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Erster Studentstatus muss gleiche Organisationsform haben wie Bewerberstatus (Studienplan Orgform)',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error: first student status should have same organisational form as bewerber status (Studienplan)',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	)
 );
 
 

From b56e8c5f9fa95e24ab90c1d9cde62b9e91d86852 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Fri, 21 Jun 2024 13:02:55 +0200
Subject: [PATCH 0820/1461] Im Abschlusspruefung Karteireiter wird in der Liste
 bei der Beurteilung jetzt die Bezeichnung der Note angezeigt anstatt der
 Kurzbz

---
 content/student/studentabschlusspruefungoverlay.xul.php | 2 +-
 rdf/abschlusspruefung.rdf.php                           | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/content/student/studentabschlusspruefungoverlay.xul.php b/content/student/studentabschlusspruefungoverlay.xul.php
index 90ca765d8..6ef1f62d4 100644
--- a/content/student/studentabschlusspruefungoverlay.xul.php
+++ b/content/student/studentabschlusspruefungoverlay.xul.php
@@ -137,7 +137,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 									<treecell label="rdf:http://www.technikum-wien.at/abschlusspruefung/rdf#pruefer1_nachname" />
 									<treecell label="rdf:http://www.technikum-wien.at/abschlusspruefung/rdf#pruefer2_nachname" />
 									<treecell label="rdf:http://www.technikum-wien.at/abschlusspruefung/rdf#pruefer3_nachname" />
-									<treecell label="rdf:http://www.technikum-wien.at/abschlusspruefung/rdf#abschlussbeurteilung_kurzbz" />
+									<treecell label="rdf:http://www.technikum-wien.at/abschlusspruefung/rdf#abschlussbeurteilung_bezeichnung" />
 									<treecell label="rdf:http://www.technikum-wien.at/abschlusspruefung/rdf#datum" />
 									<treecell label="rdf:http://www.technikum-wien.at/abschlusspruefung/rdf#uhrzeit" />
 									<treecell label="rdf:http://www.technikum-wien.at/abschlusspruefung/rdf#freigabedatum" />
diff --git a/rdf/abschlusspruefung.rdf.php b/rdf/abschlusspruefung.rdf.php
index 8c2764d86..039b0bca0 100644
--- a/rdf/abschlusspruefung.rdf.php
+++ b/rdf/abschlusspruefung.rdf.php
@@ -343,7 +343,7 @@ if ($xmlformat=='rdf')
 	$rdf_url='http://www.technikum-wien.at/abschlusspruefung';
 	function draw_content($row)
 	{
-		global $rdf_url, $datum_obj;
+		global $rdf_url, $datum_obj, $abschlussbeurteilung_arr;
 		$vorsitz = '';
 		$pruefer1= '';
 		$pruefer2= '';
@@ -380,6 +380,7 @@ if ($xmlformat=='rdf')
 				<ABSCHLUSSPRUEFUNG:pruefer3><![CDATA['.$row->pruefer3.']]></ABSCHLUSSPRUEFUNG:pruefer3>
 				<ABSCHLUSSPRUEFUNG:pruefer3_nachname><![CDATA['.$pruefer3.']]></ABSCHLUSSPRUEFUNG:pruefer3_nachname>
 				<ABSCHLUSSPRUEFUNG:abschlussbeurteilung_kurzbz><![CDATA['.$row->abschlussbeurteilung_kurzbz.']]></ABSCHLUSSPRUEFUNG:abschlussbeurteilung_kurzbz>
+				<ABSCHLUSSPRUEFUNG:abschlussbeurteilung_bezeichnung><![CDATA['.($row->abschlussbeurteilung_kurzbz!=''?$abschlussbeurteilung_arr[$row->abschlussbeurteilung_kurzbz]:'').']]></ABSCHLUSSPRUEFUNG:abschlussbeurteilung_bezeichnung>
 				<ABSCHLUSSPRUEFUNG:notekommpruef><![CDATA['.$row->note.']]></ABSCHLUSSPRUEFUNG:notekommpruef>
 				<ABSCHLUSSPRUEFUNG:akadgrad_id><![CDATA['.$row->akadgrad_id.']]></ABSCHLUSSPRUEFUNG:akadgrad_id>
 				<ABSCHLUSSPRUEFUNG:datum><![CDATA['.$datum_obj->convertISODate($row->datum).']]></ABSCHLUSSPRUEFUNG:datum>

From 7bf109298bdfc8dafcfc111a6d2c5d464c25d16d Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 21 Jun 2024 13:26:55 +0200
Subject: [PATCH 0821/1461] bugfix Anzeige Abbrecher, Absolvent

---
 .../Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index 9ea848a89..14720b07a 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -694,6 +694,8 @@ export default{
 							<option  value="Unterbrecher">UnterbrecherIn</option>
 							<option  value="Diplomand">DiplomandIn</option>
 							<option  value="Incoming">Incoming</option>
+							<option v-if="!statusNew" value="Absolvent">Absolvent</option>
+							<option v-if="!statusNew" value="Abbrecher">Abbrecher</option>
 						</form-input>
 					</div>
 					<div class="row mb-3">		   

From d2611ac0a54634d09673bc9670843a4142f89ca9 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Fri, 21 Jun 2024 14:34:31 +0200
Subject: [PATCH 0822/1461] put issue logik in own library (so GUIs should not
 have to reimplement it)

---
 application/core/IssueResolver_Controller.php | 100 ++-------------
 .../core/PlausiIssueProducer_Controller.php   |  40 +-----
 .../issues/PlausicheckProducerLib.php         |  50 ++++++++
 .../issues/PlausicheckResolverLib.php         | 117 ++++++++++++++++++
 4 files changed, 180 insertions(+), 127 deletions(-)
 create mode 100644 application/libraries/issues/PlausicheckResolverLib.php

diff --git a/application/core/IssueResolver_Controller.php b/application/core/IssueResolver_Controller.php
index 758064ed8..a9091045f 100755
--- a/application/core/IssueResolver_Controller.php
+++ b/application/core/IssueResolver_Controller.php
@@ -5,21 +5,18 @@
  */
 abstract class IssueResolver_Controller extends JOB_Controller
 {
-	const CI_PATH = 'application';
-	const CI_LIBRARY_FOLDER = 'libraries';
-	const EXTENSIONS_FOLDER = 'extensions';
-	const ISSUE_RESOLVERS_FOLDER = 'issues/resolvers';
-	const CHECK_ISSUE_RESOLVED_METHOD_NAME = 'checkIfIssueIsResolved';
-
 	protected $_codeLibMappings;
 
 	public function __construct()
 	{
 		parent::__construct();
 
+		// pass extension name if calling from extension
+		$extensionName = isset($this->_extensionName) ? $this->_extensionName : null;
+
 		$this->load->model('system/Issue_model', 'IssueModel');
 
-		$this->load->library('IssuesLib');
+		$this->load->library('issues/PlausicheckResolverLib', ['extensionName' => $extensionName]);
 	}
 
 	/**
@@ -32,92 +29,13 @@ abstract class IssueResolver_Controller extends JOB_Controller
 		// load open issues with given errorcodes
 		$openIssuesRes = $this->IssueModel->getOpenIssues(array_keys($this->_codeLibMappings));
 
-		// log error if occured
-		if (isError($openIssuesRes))
-		{
-			$this->logError(getError($openIssuesRes));
-		}
-		else
-		{
-			// log info if no data found
-			if (!hasData($openIssuesRes))
-			{
-				$this->logInfo("No open issues found");
-			}
-			else
-			{
-				$openIssues = getData($openIssuesRes);
+		$openIssues = hasData($openIssuesRes) ? getData($openIssuesRes) : [];
 
-				foreach ($openIssues as $issue)
-				{
-					// ignore if Fehlercode is not in libmappings (shouldn't be checked)
-					if (!isset($this->_codeLibMappings[$issue->fehlercode])) continue;
+		$result = $this->plausicheckresolverlib->resolvePlausicheckIssues($this->_codeLibMappings, $openIssues);
 
-					$libName = $this->_codeLibMappings[$issue->fehlercode];
-
-					// add person id and oe kurzbz automatically as params, merge it with additional params
-					// decode bewerbung_parameter into assoc array
-					$params = array_merge(
-						array('issue_id' => $issue->issue_id, 'issue_person_id' => $issue->person_id, 'issue_oe_kurzbz' => $issue->oe_kurzbz),
-						isset($issue->behebung_parameter) ? json_decode($issue->behebung_parameter, true) : array()
-					);
-
-					// if called from extension (extension name set), path includes extension names
-					$libRootPath = isset($this->_extensionName) ? self::EXTENSIONS_FOLDER . '/' . $this->_extensionName . '/' : '';
-
-					// path for loading issue library
-					$issuesLibPath = $libRootPath . self::ISSUE_RESOLVERS_FOLDER . '/';
-
-					// file path of library for check if file exists
-					$issuesLibFilePath = DOC_ROOT . self::CI_PATH
-						. '/' . $libRootPath . self::CI_LIBRARY_FOLDER . '/' . self::ISSUE_RESOLVERS_FOLDER . '/' . $libName . '.php';
-
-					// check if library file exists
-					if (!file_exists($issuesLibFilePath))
-					{
-						// log error and continue with next issue if not
-						$this->logError("Issue library file " . $issuesLibFilePath . " does not exist");
-						continue;
-					}
-
-					// load library connected to fehlercode
-					$this->load->library($issuesLibPath . $libName);
-
-					$lowercaseLibName = mb_strtolower($libName);
-
-					// check if method is defined in library class
-					if (!is_callable(array($this->{$lowercaseLibName}, self::CHECK_ISSUE_RESOLVED_METHOD_NAME)))
-					{
-						// log error and continue with next issue if not
-						$this->logError("Method " . self::CHECK_ISSUE_RESOLVED_METHOD_NAME . " is not defined in library $lowercaseLibName");
-						continue;
-					}
-
-					// call the function for checking for issue resolution
-					$issueResolvedRes = $this->{$lowercaseLibName}->{self::CHECK_ISSUE_RESOLVED_METHOD_NAME}($params);
-
-					if (isError($issueResolvedRes))
-					{
-						$this->logError(getError($issueResolvedRes));
-					}
-					else
-					{
-						$issueResolvedData = getData($issueResolvedRes);
-
-						if ($issueResolvedData === true)
-						{
-							// set issue to resolved if needed
-							$behobenRes = $this->issueslib->setBehoben($issue->issue_id, null);
-
-							if (isError($behobenRes))
-								$this->logError(getError($behobenRes));
-							else
-								$this->logInfo("Issue " . $issue->issue_id . " successfully resolved");
-						}
-					}
-				}
-			}
-		}
+		// log if error, or log info if inserted new issue
+		foreach ($result->errors as $error) $this->logError($error);
+		foreach ($result->infos as $info) $this->logInfo($info);
 
 		$this->logInfo("Issue resolve job ended");
 	}
diff --git a/application/core/PlausiIssueProducer_Controller.php b/application/core/PlausiIssueProducer_Controller.php
index 0dce7a487..d8eea61e9 100644
--- a/application/core/PlausiIssueProducer_Controller.php
+++ b/application/core/PlausiIssueProducer_Controller.php
@@ -17,49 +17,17 @@ abstract class PlausiIssueProducer_Controller extends JOB_Controller
 
 		// load libraries
 		$this->load->library('issues/PlausicheckProducerLib', array('extensionName' => $extensionName, 'app' => $this->_app));
-		$this->load->library('IssuesLib');
 	}
 
 	protected function producePlausicheckIssues($params)
 	{
 		$this->logInfo("Plausicheck issue producer job started");
 
-		// get the data returned by Plausicheck
-		foreach ($this->_fehlerLibMappings as $fehler_kurzbz => $libName)
-		{
-			// execute the check
-			$this->logInfo("Checking " . $fehler_kurzbz . "...");
-			$plausicheckRes = $this->plausicheckproducerlib->producePlausicheckIssue(
-				$libName,
-				$fehler_kurzbz,
-				$params
-			);
+		$result = $this->plausicheckproducerlib->producePlausicheckIssues($this->_fehlerLibMappings, $params);
 
-			if (isError($plausicheckRes)) $this->logError(getError($plausicheckRes));
-
-			if (hasData($plausicheckRes))
-			{
-				$plausicheckData = getData($plausicheckRes);
-
-				foreach ($plausicheckData as $plausiData)
-				{
-					// get the data needed for issue production
-					$person_id = isset($plausiData['person_id']) ? $plausiData['person_id'] : null;
-					$oe_kurzbz = isset($plausiData['oe_kurzbz']) ? $plausiData['oe_kurzbz'] : null;
-					$fehlertext_params = isset($plausiData['fehlertext_params']) ? $plausiData['fehlertext_params'] : null;
-					$resolution_params = isset($plausiData['resolution_params']) ? $plausiData['resolution_params'] : null;
-
-					// write the issue
-					$addIssueRes = $this->issueslib->addFhcIssue($fehler_kurzbz, $person_id, $oe_kurzbz, $fehlertext_params, $resolution_params);
-
-					// log if error, or log info if inserted new issue
-					if (isError($addIssueRes))
-						$this->logError(getError($addIssueRes));
-					elseif (hasData($addIssueRes) && is_integer(getData($addIssueRes)))
-						$this->logInfo("Plausicheck issue " . $fehler_kurzbz . " successfully produced, person_id: " . $person_id);
-				}
-			}
-		}
+		// log if error, or log info if inserted new issue
+		foreach ($result->errors as $error) $this->logError($error);
+		foreach ($result->infos as $info) $this->logInfo($info);
 
 		$this->logInfo("Plausicheck issue producer job stopped");
 	}
diff --git a/application/libraries/issues/PlausicheckProducerLib.php b/application/libraries/issues/PlausicheckProducerLib.php
index 3a51e2b1e..e7a772e59 100644
--- a/application/libraries/issues/PlausicheckProducerLib.php
+++ b/application/libraries/issues/PlausicheckProducerLib.php
@@ -24,6 +24,9 @@ class PlausicheckProducerLib
 
 		$this->_ci =& get_instance(); // get ci instance
 
+		// load libraries
+		$this->_ci->load->library('IssuesLib');
+
 		// load models
 		$this->_ci->load->model('system/Fehlerkonfiguration_model', 'FehlerkonfigurationModel');
 
@@ -41,6 +44,53 @@ class PlausicheckProducerLib
 		}
 	}
 
+	/**
+	 * Produces multiple plausicheck issues at once.
+	 * @param array $fehlerLibMappings contains fehler type to check and library responsible for check (fehler_kurzbz => libName)
+	 * @param array $params passed to each plausicheck
+	 * @return result object with occured error and info
+	 */
+	public function producePlausicheckIssues($fehlerLibMappings, $params)
+	{
+		$result = new StdClass();
+		$result->errors = [];
+		$result->infos = [];
+
+		foreach ($fehlerLibMappings as $fehler_kurzbz => $libName)
+		{
+			$plausicheckRes = $this->producePlausicheckIssue(
+				$libName,
+				$fehler_kurzbz,
+				$params
+			);
+
+			if (hasData($plausicheckRes))
+			{
+				$plausicheckData = getData($plausicheckRes);
+
+				foreach ($plausicheckData as $plausiData)
+				{
+					// get the data needed for issue production
+					$person_id = isset($plausiData['person_id']) ? $plausiData['person_id'] : null;
+					$oe_kurzbz = isset($plausiData['oe_kurzbz']) ? $plausiData['oe_kurzbz'] : null;
+					$fehlertext_params = isset($plausiData['fehlertext_params']) ? $plausiData['fehlertext_params'] : null;
+					$resolution_params = isset($plausiData['resolution_params']) ? $plausiData['resolution_params'] : null;
+
+					// write the issue
+					$addIssueRes = $this->_ci->issueslib->addFhcIssue($fehler_kurzbz, $person_id, $oe_kurzbz, $fehlertext_params, $resolution_params);
+
+					// log if error, or log info if inserted new issue
+					if (isError($addIssueRes))
+						$result->errors[] = getError($addIssueRes);
+					elseif (hasData($addIssueRes) && is_integer(getData($addIssueRes)))
+						$result->infos[] = "Plausicheck issue " . $fehler_kurzbz . " successfully produced, person_id: " . $person_id;
+				}
+			}
+		}
+
+		return $result;
+	}
+
 	/**
 	 * Executes plausicheck using a given library, returns the result.
 	 * @param $libName string name of library producing the issue
diff --git a/application/libraries/issues/PlausicheckResolverLib.php b/application/libraries/issues/PlausicheckResolverLib.php
new file mode 100644
index 000000000..ec586230a
--- /dev/null
+++ b/application/libraries/issues/PlausicheckResolverLib.php
@@ -0,0 +1,117 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class PlausicheckResolverLib
+{
+	const CI_PATH = 'application';
+	const CI_LIBRARY_FOLDER = 'libraries';
+	const EXTENSIONS_FOLDER = 'extensions';
+	const ISSUE_RESOLVERS_FOLDER = 'issues/resolvers';
+	const CHECK_ISSUE_RESOLVED_METHOD_NAME = 'checkIfIssueIsResolved';
+
+	private $_ci; // ci instance
+	private $_extensionName; // name of extension
+
+	public function __construct($params = null)
+	{
+		// set extension name if called from extension
+		if (isset($params['extensionName'])) $this->_extensionName = $params['extensionName'];
+
+		$this->_ci =& get_instance(); // get ci instance
+
+		$this->_ci->load->library('IssuesLib');
+	}
+
+	/**
+	 * Reseolves multiple plausicheck issues at once.
+	 * @param array $codeLibMappings contains fehler type to check and library responsible for check (fehlercode => libName)
+	 * @param array $openIssues passed issues to resolve
+	 * @return result object with occured error and info
+	 */
+	public function resolvePlausicheckIssues($codeLibMappings, $openIssues)
+	{
+		$result = new StdClass();
+		$result->errors = [];
+		$result->infos = [];
+
+		//var_dump($openIssues);
+		//var_dump($codeLibMappings);
+
+		foreach ($openIssues as $issue)
+		{
+			// ignore if Fehlercode is not in libmappings (shouldn't be checked)
+			if (!isset($codeLibMappings[$issue->fehlercode])) continue;
+
+			$libName = $codeLibMappings[$issue->fehlercode];
+
+			// add person id and oe kurzbz automatically as params, merge it with additional params
+			// decode bewerbung_parameter into assoc array
+			$params = array_merge(
+				array('issue_id' => $issue->issue_id, 'issue_person_id' => $issue->person_id, 'issue_oe_kurzbz' => $issue->oe_kurzbz),
+				isset($issue->behebung_parameter) ? json_decode($issue->behebung_parameter, true) : array()
+			);
+
+			// if called from extension (extension name set), path includes extension names
+			$libRootPath = isset($this->_extensionName) ? self::EXTENSIONS_FOLDER . '/' . $this->_extensionName . '/' : '';
+
+			// path for loading issue library
+			$issuesLibPath = $libRootPath . self::ISSUE_RESOLVERS_FOLDER . '/';
+
+			// file path of library for check if file exists
+			$issuesLibFilePath = DOC_ROOT . self::CI_PATH
+				. '/' . $libRootPath . self::CI_LIBRARY_FOLDER . '/' . self::ISSUE_RESOLVERS_FOLDER . '/' . $libName . '.php';
+
+			// check if library file exists
+			if (!file_exists($issuesLibFilePath))
+			{
+				// log error and continue with next issue if not
+				$result->errors[] = "Issue library file " . $issuesLibFilePath . " does not exist";
+				continue;
+			}
+
+			// load library connected to fehlercode
+			$this->_ci->load->library($issuesLibPath . $libName);
+
+			$lowercaseLibName = mb_strtolower($libName);
+
+			// check if method is defined in library class
+			if (!is_callable(array($this->_ci->{$lowercaseLibName}, self::CHECK_ISSUE_RESOLVED_METHOD_NAME)))
+			{
+				// log error and continue with next issue if not
+				$result->errors[] = "Method " . self::CHECK_ISSUE_RESOLVED_METHOD_NAME . " is not defined in library $lowercaseLibName";
+				continue;
+			}
+
+			// call the function for checking for issue resolution
+			$issueResolvedRes = $this->_ci->{$lowercaseLibName}->{self::CHECK_ISSUE_RESOLVED_METHOD_NAME}($params);
+
+			var_dump($params);
+			var_dump($issueResolvedRes);
+
+			if (isError($issueResolvedRes))
+			{
+				$result->errors[] = getError($issueResolvedRes);
+			}
+			else
+			{
+				$issueResolvedData = getData($issueResolvedRes);
+
+				if ($issueResolvedData === true)
+				{
+					// set issue to resolved if needed
+					$behobenRes = $this->_ci->issueslib->setBehoben($issue->issue_id, null);
+
+					var_dump($behobenRes);
+
+					if (isError($behobenRes))
+						$result->errors[] = getError($behobenRes);
+					else
+						$result->infos[] = "Issue " . $issue->issue_id . " successfully resolved";
+				}
+			}
+		}
+
+		return $result;
+	}
+}

From 453f93aba602e4320d393eeb4e575b83b0795297 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Fri, 21 Jun 2024 14:58:26 +0200
Subject: [PATCH 0823/1461] outsourcing Issue logic: removed var dumps

---
 application/libraries/issues/PlausicheckResolverLib.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/application/libraries/issues/PlausicheckResolverLib.php b/application/libraries/issues/PlausicheckResolverLib.php
index ec586230a..cd88cf5be 100644
--- a/application/libraries/issues/PlausicheckResolverLib.php
+++ b/application/libraries/issues/PlausicheckResolverLib.php
@@ -35,9 +35,6 @@ class PlausicheckResolverLib
 		$result->errors = [];
 		$result->infos = [];
 
-		//var_dump($openIssues);
-		//var_dump($codeLibMappings);
-
 		foreach ($openIssues as $issue)
 		{
 			// ignore if Fehlercode is not in libmappings (shouldn't be checked)
@@ -86,9 +83,6 @@ class PlausicheckResolverLib
 			// call the function for checking for issue resolution
 			$issueResolvedRes = $this->_ci->{$lowercaseLibName}->{self::CHECK_ISSUE_RESOLVED_METHOD_NAME}($params);
 
-			var_dump($params);
-			var_dump($issueResolvedRes);
-
 			if (isError($issueResolvedRes))
 			{
 				$result->errors[] = getError($issueResolvedRes);
@@ -102,8 +96,6 @@ class PlausicheckResolverLib
 					// set issue to resolved if needed
 					$behobenRes = $this->_ci->issueslib->setBehoben($issue->issue_id, null);
 
-					var_dump($behobenRes);
-
 					if (isError($behobenRes))
 						$result->errors[] = getError($behobenRes);
 					else

From e4abc745c805ccd0b0e51385bae40826c9001c49 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 24 Jun 2024 08:57:03 +0200
Subject: [PATCH 0824/1461] Bugfix rt-stufe

---
 .../Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index 14720b07a..ae23b0304 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -261,7 +261,7 @@ export default{
 			listStudiensemester: [],
 			maxSem:  Array.from({ length: 11 }, (_, index) => index),
 			listStudienplaene: [],
-			aufnahmestufen: {'': '-- keine Auswahl --', 1: 1, 2: 2, 3: 3},
+			aufnahmestufen: {1: 1, 2: 2, 3: 3},
 			listStatusgruende: [],
 			statusId: {},
 			gruendeLength: {},
@@ -291,6 +291,7 @@ export default{
 	},
 	methods: {
 		actionNewStatus() {
+			this.statusNew = true;
 			this.resetModal();
 			this.statusData.status_kurzbz = 'Interessent';
 			this.statusData.studiensemester_kurzbz = this.defaultSemester;
@@ -794,6 +795,7 @@ export default{
 						v-model="statusData['rt_stufe']"
 						:disabled="statusData.datum < dataMeldestichtag"
 						>
+						<option :value="NULL">-- {{$p.t('fehlermonitoring', 'keineAuswahl')}} --</option>
 						<option v-for="entry in aufnahmestufen" :key="entry" :value="entry">{{entry}}</option>
 						</form-input>
 					</div>

From 570798b5f7a93ce59af52456799ba49fa6e49f98 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 24 Jun 2024 10:51:23 +0200
Subject: [PATCH 0825/1461] landing page is now container for tabs or single
 component directly; WIP reworking lektor UI;

---
 system/phrasesupdate.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index e9db8f2cf..38862460c 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -26461,6 +26461,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'kontrolldatum',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kontrolldatum',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Attendance Check Date',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// FHC-CORE-ANWESENHEITEN END
 );
 

From cb617463edaaf9c6bf2c4e53dc268aaf4bab2e63 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 24 Jun 2024 12:03:02 +0200
Subject: [PATCH 0826/1461] Validation: Modal AskForAusbildungssemester

---
 .../controllers/api/frontend/v1/stv/Status.php       | 12 ++++++++++++
 .../Details/Prestudent/MultiStatus.js                |  7 +++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 710f4b648..190dcdb73 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -135,6 +135,18 @@ class Status extends FHCAPI_Controller
 		$bestaetigtvon = $uid;
 		$name = $this->input->post('name');
 
+
+
+		//Form Validation
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('ausbildungssemester', 'Ausbildungssemester', 'integer', [
+			'integer' => $this->p->t('ui', 'error_fieldNotInteger', ['field' => 'Ausbildungssemester'])
+		]);
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
 		//GET lastStatus
 		$result = $this->PrestudentstatusModel->getLastStatus($prestudent_id);
 
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index ae23b0304..1b5859733 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -937,10 +937,12 @@ export default{
 				<template #title>{{$p.t('lehre', 'status_edit')}}</template>
 				<template #default>
 				<div v-if="prestudentIds.length == 1">
-					<p>In welches Semester soll dieser {{actionStatusText}} verschoben werden?</p>
+					<p>
+					{{$p.t('lehre', 'modal_askAusbildungssem', { status: actionStatusText })}}</p>
 				</div>
 				<div v-else>
-					<p>In welches Semester sollen diese {{prestudentIds.length}} {{actionStatusText}}en verschoben werden?</p>
+					<p>
+					{{$p.t('lehre', 'modal_askAusbildungssemPlural', { count: prestudentIds.length })}}</p>
 				</div>
 				
 				<div class="row mb-3">
@@ -950,6 +952,7 @@ export default{
 							type="text"
 							name="studiensemester"
 							v-model="actionSem"
+							maxlength="2"
 						>				
 						</form-input>
 					</div>

From f1605011dd615868afcd5e29492ba86fe8e263e3 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 24 Jun 2024 12:04:30 +0200
Subject: [PATCH 0827/1461] update phrases

---
 system/phrasesupdate.php | 46 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 43 insertions(+), 3 deletions(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index bcb4e24a1..edd7e04ac 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -25297,18 +25297,18 @@ array(
 	array(
 		'app' => 'core',
 		'category' => 'ui',
-		'phrase' => 'error_fieldNotNumeric',
+		'phrase' => 'error_fieldNotInteger',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Das Eingabefeld {field} darf nur Zahlen enthalten.',
+				'text' => 'Das Eingabefeld {field} muss eine Ganzzahl enthalten',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'The Field {Field} must contain only numbers.',
+				'text' => 'The Field {field} must contain an integer',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -25915,6 +25915,46 @@ array(
 				)
 			)
 		),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'modal_askAusbildungssem',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'In welches Ausbildungssemester soll dieser {status} verschoben werden?',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'To which education semester should this {status} be moved?',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'modal_askAusbildungssemPlural',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'In welches Semester sollen diese {count} PrestudentInnen verschoben werden?',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'To which education semester should these {count} prestudents be moved?',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	//Prestudent
 	array(
 		'app' => 'core',

From 008847e490d6861a04433882bbd20f4aa84fea22 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 24 Jun 2024 13:08:44 +0200
Subject: [PATCH 0828/1461] adds a sql query for the grouping algorithm

---
 .../api/frontend/v1/Stundenplan.php           | 20 ++--
 .../models/ressource/Stundenplan_model.php    | 94 ++++++++++++++++++-
 public/js/api/ort.js                          | 10 ++
 public/js/apps/Cis/RoomInformation.js         | 37 ++++----
 public/js/components/Calendar/Week/Page.js    |  5 +-
 5 files changed, 137 insertions(+), 29 deletions(-)
 create mode 100644 public/js/api/ort.js

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index fe5ac9e23..243f4b2c5 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -90,16 +90,22 @@ class Stundenplan extends FHCAPI_Controller
         
         $stunden = getData($stunden);
 
-		$result = $this->StundenplanModel->getRoomDataOnDay($ort_kurzbz,$start_date,$end_date);  
-
-		if(isError($result)){
+		$result = $this->StundenplanModel->groupedRoomPlanning($ort_kurzbz,$start_date,$end_date);  
+        //$this->loglib->logErrorDB(print_r($result,TRUE),"this is the result of the grouped query");
+		
+        if(isError($result)){
             $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
         }
 
         $result = hasData($result) ? getData($result) : [];
-        $this->loglib->logInfoDB(print_r(count($result),true),"this is the count of the result");
-        
         
+
+        foreach($result as $entry){
+            if(COUNT($entry->lektor)>1){
+                // gruppierung hat stattgefunden und das array muss in einem String konvertiert werden
+            }
+        }
+        /* 
         $final_events = array();
         $grouped = array();
         $associative_day_events = $this->filterEventsIntoAssociativeDateArray($result, $start_date, $end_date);
@@ -196,9 +202,9 @@ class Stundenplan extends FHCAPI_Controller
                     $final_events[] = $stunden_events[$event_key];
                 }
             }
-        }     
+        } */     
         
-		$this->terminateWithSuccess($final_events);
+		$this->terminateWithSuccess($result);
 		
 	}
 
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 5ce6a9823..5e5dc779d 100755
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -18,7 +18,7 @@ class Stundenplan_model extends DB_Model
 	 * 
 	 * @return stdClass
 	 */
-	public function getRoomDataOnDay($ort_kurzbz,$start_date,$end_date){
+	public function getRoomDataOnInterval($ort_kurzbz,$start_date,$end_date){
 
 
 	
@@ -41,6 +41,98 @@ class Stundenplan_model extends DB_Model
 		return $raum_stundenplan;
 	}
 
+	/**
+	 * @param string $ort_kurzbz The room to query the planning for
+	 * @param string $start_date The start date of the query interval
+	 * @param string $end_date The end date of the query interval
+	 * 
+	 * @return stdClass
+	 */
+	public function groupedRoomPlanning($ort_kurzbz,$start_date,$end_date){
+
+
+		$gruppierteRaumVerplannung= $this->execReadOnlyQuery("
+		SELECT 
+		
+			'reservierung' as type,
+			NULL as unr,datum, stunde,
+			titel AS topic, 
+			beschreibung as beschreibung,
+			string_agg(DISTINCT gruppe, '/') as gruppe,
+			string_agg(DISTINCT lektor, '/') as lektor,
+			res.ort_kurzbz,res.studiengang_kz,  res.titel, res.beschreibung,NULL as lehreinheit_id,NULL as lehrfach_id,NULL as anmerkung, NULL as fix,NULL as lehrveranstaltung_id,NULL as stg_kurzbzlang,NULL as stg_bezeichnung,NULL as stg_typ, NULL as fachbereich_kurzbz,NULL as lehrfach,NULL as lehrfach_bez,NULL as farbe,NULL as lehrform, NULL as anmerkung_lehreinheit
+		
+		FROM 
+		
+		(
+			SELECT 
+			NULL as unr,datum, stunde, 
+			CASE 
+				WHEN gruppe_kurzbz IS NOT NULL THEN gruppe_kurzbz 
+				ELSE CONCAT(UPPER(studg.typ),UPPER(res.stg_kurzbz),'-',COALESCE(CAST(res.semester AS varchar),'/'),COALESCE(CAST(res.verband AS varchar),'/'))  
+			END as gruppe,
+			CASE
+				WHEN mit.kurzbz IS NOT NULL THEN mit.kurzbz
+				ELSE uid
+			END as lektor, 
+			res.ort_kurzbz,res.studiengang_kz,  res.titel, res.beschreibung,NULL as lehreinheit_id,NULL as lehrfach_id,NULL as anmerkung, NULL as fix,NULL as lehrveranstaltung_id,NULL as stg_kurzbzlang,NULL as stg_bezeichnung,NULL as stg_typ, NULL as fachbereich_kurzbz,NULL as lehrfach,NULL as lehrfach_bez,NULL as farbe,NULL as lehrform, NULL as anmerkung_lehreinheit 
+			FROM lehre.vw_reservierung res
+
+			LEFT JOIN public.tbl_mitarbeiter mit ON mit.mitarbeiter_uid=uid
+			JOIN public.tbl_studiengang studg ON studg.studiengang_kz=res.studiengang_kz
+
+			WHERE 
+				res.ort_kurzbz = ? 
+				AND res.datum >= ? 
+				AND res.datum <= ?
+		) as res
+	
+		GROUP BY res.ort_kurzbz,res.studiengang_kz, res.datum, res.stunde, res.titel, res.beschreibung
+
+		UNION ALL
+		
+		SELECT 
+			
+		'stundenplan' as type,
+		unr,datum, stunde,
+		CONCAT(lehrfach,'-',lehrform) as topic,
+		'' as beschreibung,
+		string_agg(DISTINCT gruppe, '/') as gruppe,
+		string_agg(DISTINCT lektor, '/') as lektor,  
+		ort_kurzbz, studiengang_kz, titel,'' as beschreibung,lehreinheit_id,lehrfach_id,anmerkung,fix,lehrveranstaltung_id,stg_kurzbzlang,stg_bezeichnung,stg_typ,fachbereich_kurzbz,lehrfach,lehrfach_bez,farbe,lehrform,anmerkung_lehreinheit 
+
+		FROM
+		(
+			SELECT
+ 			unr,datum, stunde,
+			CASE
+				WHEN gruppe_kurzbz IS NOT NULL THEN gruppe_kurzbz 
+				ELSE CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) 
+			END as gruppe,
+			CASE
+				WHEN sp.mitarbeiter_kurzbz IS NOT NULL THEN sp.mitarbeiter_kurzbz
+				ELSE lektor
+			END as lektor,
+			ort_kurzbz, studiengang_kz, titel,'' as beschreibung,lehreinheit_id,lehrfach_id,anmerkung,fix,lehrveranstaltung_id,stg_kurzbzlang,stg_bezeichnung,stg_typ,fachbereich_kurzbz,lehrfach,lehrfach_bez,farbe,lehrform,anmerkung_lehreinheit 
+
+			FROM lehre.vw_stundenplan sp
+
+			WHERE ort_kurzbz = ? 
+			AND datum >= ? 
+			AND datum <= ?
+
+		) as sp
+
+		GROUP BY 
+
+			ort_kurzbz,unr, datum, stunde, lehreinheit_id, lehrfach_id,studiengang_kz,titel,anmerkung,fix,lehrveranstaltung_id,stg_kurzbzlang,stg_bezeichnung,stg_typ,fachbereich_kurzbz,lehrfach,lehrfach_bez,farbe,lehrform,anmerkung_lehreinheit
+
+		ORDER BY datum, stunde
+		", [$ort_kurzbz, $start_date, $end_date, $ort_kurzbz, $start_date, $end_date]); 
+
+		return $gruppierteRaumVerplannung;
+	}
+
 	/**
 	 * @param string $uid
 	 * 
diff --git a/public/js/api/ort.js b/public/js/api/ort.js
new file mode 100644
index 000000000..4c8e2ce73
--- /dev/null
+++ b/public/js/api/ort.js
@@ -0,0 +1,10 @@
+export default {
+  getContentID(ort_kurbz) {
+		return this.$fhcApi.get(
+            FHC_JS_DATA_STORAGE_OBJECT.app_root +
+            FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+            "/api/frontend/v1/Ort/ContentID",
+			{ ort_kurzbz: ort_kurbz }
+		);
+	},
+}
\ No newline at end of file
diff --git a/public/js/apps/Cis/RoomInformation.js b/public/js/apps/Cis/RoomInformation.js
index af92fe147..b5559047e 100644
--- a/public/js/apps/Cis/RoomInformation.js
+++ b/public/js/apps/Cis/RoomInformation.js
@@ -51,7 +51,13 @@ const app = Vue.createApp({
                     res.data.forEach((el, i) => {
 
                         el.id = i;
-                        el.color = '#' + (el.farbe || 'CCCCCC');
+                        if(el.type === 'reservierung')
+                        {
+                            el.color = '#' + (el.farbe || 'FFFFFF');
+                        }else{
+                            el.color = '#' + (el.farbe || 'CCCCCC');
+                        }
+                        
                         el.start = new Date(el.datum + ' ' + this.stunden[el.stunde].beginn);
                         el.end = new Date(el.datum + ' ' + this.stunden[el.stunde].ende);
                         el.title = el.lehrfach;
@@ -62,7 +68,8 @@ const app = Vue.createApp({
                     this.events = res.data;
                 }
 
-                this.$fhcApi.factory.stundenplan.getReservierungen('EDV_F4.26', this.weekFirstDay, this.weekLastDay).then(res => {
+                // reservierungen are loaded with the stundenplan
+                /* this.$fhcApi.factory.stundenplan.getReservierungen('EDV_F4.26', this.weekFirstDay, this.weekLastDay).then(res => {
                     if (res.data && res.data.forEach) {
                         res.data.forEach((el, i) => {
                             el.reservierung = true;
@@ -77,11 +84,10 @@ const app = Vue.createApp({
                     }
     
                     let reservierungs_events = res.data;
-                    console.log(reservierungs_events,"this are the reservierungs events that are getting from the db query")
                     this.events = [...(this.events?this.events:[]),...reservierungs_events];
-                    this.events_loaded = true;
                     
-                }); 
+                    
+                }); */
             });
 
            
@@ -90,22 +96,19 @@ const app = Vue.createApp({
 	},
     template: /*html*/`
     <div>
-        <fhc-calendar v-if="events_loaded" v-slot="{event,day}" :initialDate="currentDate" :events="events" initial-mode="week" show-weeks>
+        <fhc-calendar  v-slot="{event,day}" :initialDate="currentDate" :events="events" initial-mode="week" show-weeks>
            
             <a class="text-decoration-none text-dark" href="#" :title="event.orig.title + ' - ' + event.orig.lehrfach_bez + ' [' + event.orig.ort_kurzbz+']'"   >    
                 <div class="d-flex flex-column align-items-center justify-content-evenly h-100" :style="{'background-color':event.orig.color}">
-                    <template v-if="event.orig.reservierung">    
-                        <!-- render content for reservierungen -->
-                        <span>{{event.orig.title}}</span>
-                        <span>{{event.orig.gruppe_kurzbz?event.orig.gruppe_kurzbz:event.orig.stg}}</span>
-                        <span v-for="(item, index) in event.orig.person_kurzbz.split('/')" :key="index">{{item}}</span>
-                    </template>
-                    <template v-else>
+                    
                         <!-- render content for stundenplan -->
-                        <span>{{event.orig.lv_info}}</span>	
-                        <span v-for="(item, index) in event.orig.stg.split('/')" :key="index">{{item}}</span>
-                        <span >{{event.orig.lektor}}</span>
-                    </template>
+                        <span >{{event.orig.topic}}</span>
+                        <span v-for="gruppe in event.orig.gruppe.split('/')" :key="gruppe">{{gruppe}}</span>	
+                        <span v-for="lektor in event.orig.lektor.split('/')" :key="lektor">{{lektor}}</span>
+                        <!-- add the beschreibung if the event is a reservierung -->
+                        <span v-if="event.orig.type === 'reservierung'">{{event.orig.beschreibung}}</span>
+                        
+                    
                 </div>
             </a>
         </fhc-calendar>
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index efaaff131..75fef62f1 100755
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -48,7 +48,6 @@ export default {
 				nextDay.setDate(nextDay.getDate()+1);
 				nextDay.setMilliseconds(nextDay.getMilliseconds()-1);
 				let d = {events:[],lanes:1};
-				console.log("this are the events",this.events, "and this is the key",key)
 				if (this.events[key]) {
 					this.events[key].forEach(evt => {
 						let event = {orig:evt,lane:1,maxLane:1,start: evt.start < day ? day : evt.start, end: evt.end > nextDay ? nextDay : evt.end,shared:[],setSharedMaxRecursive(doneItems) {
@@ -78,9 +77,7 @@ export default {
 		}
 	},
 	methods: {
-		printTest:function(param){
-			console.log("HERE",param)
-		},
+		
 		changeToMonth(day) {
 			if (!this.noMonthView) {
 				this.date.set(day);

From 77cd3bb02de80063a8ce92042428d477b0a43a0e Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 24 Jun 2024 13:11:55 +0200
Subject: [PATCH 0829/1461] removes the z-index from the calendar header so
 that it doesn't show over the menu when used in mobil view

---
 public/js/components/Calendar/Week/Page.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index 7a81fe476..668926e78 100755
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -92,7 +92,7 @@ export default {
 	template: `
 	<div class="fhc-calendar-week-page">
 		<div class="d-flex flex-column border-top">
-			<div class="fhc-calendar-week-page-header border-2 border-bottom text-center d-flex" style="position:sticky; top:0; z-index:1020;" >
+			<div class="fhc-calendar-week-page-header border-2 border-bottom text-center d-flex" style="position:sticky; top:0; " >
 				<div v-for="day in days" :key="day" class="flex-grow-1" :title="day.toLocaleString(undefined, {dateStyle:'short'})">
 					<div class="fw-bold">{{day.toLocaleString(undefined, {weekday: size < 2 ? 'narrow' : (size < 3 ? 'short' : 'long')})}}</div>
 					<a href="#" class="small text-secondary text-decoration-none" @click.prevent="changeToMonth(day)">{{day.toLocaleString(undefined, [{day:'numeric',month:'numeric'},{day:'numeric',month:'numeric'},{day:'numeric',month:'numeric'},{dateStyle:'short'}][this.size])}}</a>

From 6cca4d2daa8fc690672fae5dea536577a6d4dba1 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 24 Jun 2024 13:49:34 +0200
Subject: [PATCH 0830/1461] StV: Students consolidation

---
 .../api/frontend/v1/stv/Students.php          | 461 +++++++++---------
 .../Stv/Studentenverwaltung/List.js           |  39 +-
 2 files changed, 245 insertions(+), 255 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Students.php b/application/controllers/api/frontend/v1/stv/Students.php
index 2f16435f9..7b7bfc87d 100644
--- a/application/controllers/api/frontend/v1/stv/Students.php
+++ b/application/controllers/api/frontend/v1/stv/Students.php
@@ -187,10 +187,21 @@ class Students extends FHCAPI_Controller
 
 		$stdsemEsc = $studiensemester_kurzbz ? $this->PrestudentModel->escape($studiensemester_kurzbz) : 'NULL';
 
-		$selectRT = 'SELECT 1 FROM public.tbl_rt_person JOIN public.tbl_reihungstest r ON (rt_id = reihungstest_id) WHERE person_id=p.person_id AND studienplan_id IN (SELECT studienplan_id FROM lehre.tbl_studienplan JOIN lehre.tbl_studienordnung o USING(studienordnung_id) WHERE o.studiengang_kz=tbl_prestudent.studiengang_kz) AND r.studiensemester_kurzbz=' . $stdsemEsc;
+		$selectRT = "
+			SELECT 1 
+			FROM public.tbl_rt_person 
+			JOIN public.tbl_reihungstest r ON (rt_id = reihungstest_id) 
+			WHERE person_id=p.person_id 
+			AND studienplan_id IN (
+				SELECT studienplan_id 
+				FROM lehre.tbl_studienplan 
+				JOIN lehre.tbl_studienordnung o USING(studienordnung_id) 
+				WHERE o.studiengang_kz=tbl_prestudent.studiengang_kz
+			) 
+			AND r.studiensemester_kurzbz=" . $stdsemEsc;
 
 		
-		$where = ['studiengang_kz' => $studiengang_kz];
+		$where = ['tbl_prestudent.studiengang_kz' => $studiengang_kz];
 
 		if ($orgform_kurzbz) {
 			$where['ps.orgform_kurzbz'] = $orgform_kurzbz;
@@ -312,64 +323,29 @@ class Students extends FHCAPI_Controller
 				break;
 		}
 
-		$this->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
-		$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
-		$this->PrestudentModel->addJoin('public.tbl_prestudentstatus ps', 'ps.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ') AND ps.prestudent_id=tbl_prestudent.prestudent_id AND ps.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ') AND ps.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ')', 'LEFT');
+		/*
+			$this->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
+			$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
+			$this->PrestudentModel->addJoin('public.tbl_prestudentstatus pls', '
+				pls.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) 
+				AND pls.prestudent_id=tbl_prestudent.prestudent_id 
+				AND pls.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, NULL) 
+				AND pls.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, NULL)', 'LEFT');
+			$this->PrestudentModel->addJoin('lehre.tbl_studienplan sp', 'studienplan_id', 'LEFT');
+			$this->PrestudentModel->addJoin('public.tbl_prestudentstatus ps', '
+				ps.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ') 
+				AND ps.prestudent_id=tbl_prestudent.prestudent_id 
+				AND ps.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ') 
+				AND ps.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ')', 'LEFT');*/
+		$this->prepareQuery($studiensemester_kurzbz);
 		
-		$this->PrestudentModel->addSelect("'' AS uid");
-		$this->PrestudentModel->addSelect('titelpre');
-		$this->PrestudentModel->addSelect('nachname');
-		$this->PrestudentModel->addSelect('vorname');
-		$this->PrestudentModel->addSelect('wahlname');
-		$this->PrestudentModel->addSelect('vornamen');
-		$this->PrestudentModel->addSelect('titelpost');
-		$this->PrestudentModel->addSelect('svnr');
-		$this->PrestudentModel->addSelect('ersatzkennzeichen');
-		$this->PrestudentModel->addSelect('gebdatum');
-		$this->PrestudentModel->addSelect('geschlecht');
-		$this->PrestudentModel->addSelect("CASE WHEN ps.status_kurzbz IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') THEN ps.ausbildungssemester::text ELSE ''::text END AS semester", false);
+		$this->PrestudentModel->addSelect("
+			CASE WHEN ps.status_kurzbz IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
+			THEN ps.ausbildungssemester::text 
+			ELSE ''::text END AS semester", false);
 		$this->PrestudentModel->addSelect("'' AS verband");
 		$this->PrestudentModel->addSelect("'' AS gruppe");
-		$this->PrestudentModel->addSelect('UPPER(stg.typ || stg.kurzbz) AS studiengang');
-		$this->PrestudentModel->addSelect('tbl_prestudent.studiengang_kz');
-		$this->PrestudentModel->addSelect("'' AS matrikelnr");
-		$this->PrestudentModel->addSelect('p.person_id');
-		$this->PrestudentModel->addSelect('public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) as status');
-		//status datum
-		//status bestätigung
-		//status datum iso
-		//status bestätigung iso
-		$this->PrestudentModel->addSelect(
-			"(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung LIMIT 1) AS email_privat",
-			false
-		);
-		//email intern
-		$this->PrestudentModel->addSelect('p.anmerkung AS anmerkungen');
-		$this->PrestudentModel->addSelect('tbl_prestudent.anmerkung');
-		//orgform
-		$this->PrestudentModel->addSelect('aufmerksamdurch_kurzbz');
-		$this->PrestudentModel->addSelect(
-			"(SELECT rt_gesamtpunkte AS punkte FROM public.tbl_prestudent WHERE prestudent_id=ps.prestudent_id) AS punkte",
-			false
-		);
-		$this->PrestudentModel->addSelect('tbl_prestudent.aufnahmegruppe_kurzbz');
-		$this->PrestudentModel->addSelect('tbl_prestudent.dual');
-		$this->PrestudentModel->addSelect('p.matr_nr');
-		//studienplan
-		$this->PrestudentModel->addSelect('tbl_prestudent.prestudent_id');
-		$this->PrestudentModel->addSelect('tbl_prestudent.priorisierung');
-		$this->PrestudentModel->addSelect('mentor');
-		$this->PrestudentModel->addSelect('NULL AS bnaktiv', false);
-		//gebdatum iso
-
-		$this->PrestudentModel->addSelect('tbl_prestudent.reihungstest_id');
-		$this->PrestudentModel->addSelect('tbl_prestudent.anmeldungreihungstest');
-		$this->PrestudentModel->addSelect('tbl_prestudent.gsstudientyp_kurzbz');
-		$this->PrestudentModel->addSelect('p.zugangscode');
-		$this->PrestudentModel->addSelect('p.bpk');
-		
-		$this->PrestudentModel->addOrder('nachname');
-		$this->PrestudentModel->addOrder('vorname');
+		$this->addSelectPrioRel();
 
 		$this->addFilter($studiensemester_kurzbz);
 		
@@ -394,59 +370,30 @@ class Students extends FHCAPI_Controller
 	{
 		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
 		
+
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 
-		$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
-		$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id');
-		$this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid');
-		$this->PrestudentModel->addJoin(
-			'public.tbl_studentlehrverband v',
-			'v.student_uid=s.student_uid AND v.studiensemester_kurzbz=' . $this->PrestudentModel->escape($studiensemester_kurzbz)
-		);
+		/*
+			$this->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
+			$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
+			$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id');
+			$this->PrestudentModel->addJoin('public.tbl_prestudentstatus pls', '
+				pls.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) 
+				AND pls.prestudent_id=tbl_prestudent.prestudent_id 
+				AND pls.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, NULL) 
+				AND pls.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, NULL)', 'LEFT');
+			$this->PrestudentModel->addJoin('lehre.tbl_studienplan sp', 'studienplan_id', 'LEFT');
+			$this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid');
+			$this->PrestudentModel->addJoin(
+				'public.tbl_studentlehrverband v',
+				'v.student_uid=s.student_uid AND v.studiensemester_kurzbz=' . $this->PrestudentModel->escape($studiensemester_kurzbz)
+			);*/
+		$this->prepareQuery($studiensemester_kurzbz, '');
 
-		$this->PrestudentModel->addSelect('p.person_id');
-		$this->PrestudentModel->addSelect('s.prestudent_id');
-		$this->PrestudentModel->addSelect('b.uid');
-		$this->PrestudentModel->addSelect('titelpre');
-		$this->PrestudentModel->addSelect('titelpost');
-		$this->PrestudentModel->addSelect('vorname');
-		$this->PrestudentModel->addSelect('wahlname');
-		$this->PrestudentModel->addSelect('vornamen');
-		$this->PrestudentModel->addSelect('geschlecht');
-		$this->PrestudentModel->addSelect('nachname');
-		$this->PrestudentModel->addSelect('gebdatum');
-		$this->PrestudentModel->addSelect('tbl_prestudent.anmerkung');
-		$this->PrestudentModel->addSelect('ersatzkennzeichen');
-		$this->PrestudentModel->addSelect('svnr');
-		$this->PrestudentModel->addSelect('s.matrikelnr');
-		$this->PrestudentModel->addSelect('p.anmerkung AS anmerkungen');
 		$this->PrestudentModel->addSelect('v.semester');
 		$this->PrestudentModel->addSelect('v.verband');
 		$this->PrestudentModel->addSelect('v.gruppe');
-		$this->PrestudentModel->addSelect('tbl_prestudent.studiengang_kz');
-		$this->PrestudentModel->addSelect('aufmerksamdurch_kurzbz');
-		$this->PrestudentModel->addSelect('mentor');
-		$this->PrestudentModel->addSelect('b.aktiv AS bnaktiv');
-		$this->PrestudentModel->addSelect(
-			"(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung LIMIT 1) AS email_privat",
-			false
-		);
-		$this->PrestudentModel->addSelect(
-			"(SELECT rt_gesamtpunkte AS punkte FROM public.tbl_prestudent WHERE prestudent_id=s.prestudent_id) AS punkte",
-			false
-		);
-		$this->PrestudentModel->addSelect('tbl_prestudent.dual');
-		$this->PrestudentModel->addSelect('tbl_prestudent.reihungstest_id');
-		$this->PrestudentModel->addSelect('tbl_prestudent.anmeldungreihungstest');
-		$this->PrestudentModel->addSelect('p.matr_nr');
-		$this->PrestudentModel->addSelect('tbl_prestudent.gsstudientyp_kurzbz');
-		$this->PrestudentModel->addSelect('tbl_prestudent.aufnahmegruppe_kurzbz');
-		$this->PrestudentModel->addSelect('tbl_prestudent.priorisierung');
-		$this->PrestudentModel->addSelect('p.zugangscode');
-		$this->PrestudentModel->addSelect('p.bpk');
-
-		$this->PrestudentModel->addOrder('nachname');
-		$this->PrestudentModel->addOrder('vorname');
+		$this->PrestudentModel->addSelect("'' AS priorisierung_relativ");
 
 
 		$where = [];
@@ -503,57 +450,28 @@ class Students extends FHCAPI_Controller
 
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 
-		$this->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
-		$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
-		$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id', 'LEFT');
-		$this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid', 'LEFT');
-		$this->PrestudentModel->addJoin(
-			'public.tbl_studentlehrverband v',
-			'v.student_uid=s.student_uid AND v.studiensemester_kurzbz=' . $this->PrestudentModel->escape($studiensemester_kurzbz),
-			'LEFT'
-		);
+		/*
+			$this->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
+			$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
+			$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id', 'LEFT');
+			$this->PrestudentModel->addJoin('public.tbl_prestudentstatus pls', '
+				pls.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) 
+				AND pls.prestudent_id=tbl_prestudent.prestudent_id 
+				AND pls.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, NULL) 
+				AND pls.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, NULL)', 'LEFT');
+			$this->PrestudentModel->addJoin('lehre.tbl_studienplan sp', 'studienplan_id', 'LEFT');
+			$this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid', 'LEFT');
+			$this->PrestudentModel->addJoin(
+				'public.tbl_studentlehrverband v',
+				'v.student_uid=s.student_uid AND v.studiensemester_kurzbz=' . $this->PrestudentModel->escape($studiensemester_kurzbz),
+				'LEFT'
+			);*/
+		$this->prepareQuery($studiensemester_kurzbz);
 
-		$this->PrestudentModel->addSelect('p.person_id');
-		$this->PrestudentModel->addSelect('tbl_prestudent.prestudent_id');
-		$this->PrestudentModel->addSelect('b.uid');
-		$this->PrestudentModel->addSelect('titelpre');
-		$this->PrestudentModel->addSelect('titelpost');
-		$this->PrestudentModel->addSelect('vorname');
-		$this->PrestudentModel->addSelect('wahlname');
-		$this->PrestudentModel->addSelect('vornamen');
-		$this->PrestudentModel->addSelect('geschlecht');
-		$this->PrestudentModel->addSelect('nachname');
-		$this->PrestudentModel->addSelect('gebdatum');
-		$this->PrestudentModel->addSelect('tbl_prestudent.anmerkung');
-		$this->PrestudentModel->addSelect('ersatzkennzeichen');
-		$this->PrestudentModel->addSelect('svnr');
-		$this->PrestudentModel->addSelect('s.matrikelnr');
-		$this->PrestudentModel->addSelect('p.anmerkung AS anmerkungen');
-		$this->PrestudentModel->addSelect("COALESCE(v.semester::text, CASE WHEN public.get_rolle_prestudent(prestudent_id, NULL) IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') THEN public.get_absem_prestudent(prestudent_id, NULL)::text ELSE ''::text END) AS semester", false);
+		$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('UPPER(stg.typ || stg.kurzbz) AS studiengang');
-		$this->PrestudentModel->addSelect('tbl_prestudent.studiengang_kz');
-		$this->PrestudentModel->addSelect('aufmerksamdurch_kurzbz');
-		$this->PrestudentModel->addSelect('mentor');
-		$this->PrestudentModel->addSelect('b.aktiv AS bnaktiv');
-		$this->PrestudentModel->addSelect(
-			"(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung LIMIT 1) AS email_privat",
-			false
-		);
-		$this->PrestudentModel->addSelect(
-			"(SELECT rt_gesamtpunkte AS punkte FROM public.tbl_prestudent WHERE prestudent_id=s.prestudent_id) AS punkte",
-			false
-		);
-		$this->PrestudentModel->addSelect('tbl_prestudent.dual');
-		$this->PrestudentModel->addSelect('tbl_prestudent.reihungstest_id');
-		$this->PrestudentModel->addSelect('tbl_prestudent.anmeldungreihungstest');
-		$this->PrestudentModel->addSelect('p.matr_nr');
-		$this->PrestudentModel->addSelect('tbl_prestudent.gsstudientyp_kurzbz');
-		$this->PrestudentModel->addSelect('tbl_prestudent.aufnahmegruppe_kurzbz');
-		$this->PrestudentModel->addSelect('tbl_prestudent.priorisierung');
-		$this->PrestudentModel->addSelect('p.zugangscode');
-		$this->PrestudentModel->addSelect('p.bpk');
+		$this->addSelectPrioRel();
 
 		$this->addFilter($studiensemester_kurzbz);
 
@@ -577,55 +495,28 @@ class Students extends FHCAPI_Controller
 
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 
-		$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
-		$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id');
-		$this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid');
-		$this->PrestudentModel->addJoin(
-			'public.tbl_studentlehrverband v',
-			'v.student_uid=s.student_uid AND v.studiensemester_kurzbz=' . $this->PrestudentModel->escape($studiensemester_kurzbz),
-			'LEFT'
-		);
+		/*
+			$this->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
+			$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
+			$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id');
+			$this->PrestudentModel->addJoin('public.tbl_prestudentstatus pls', '
+				pls.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) 
+				AND pls.prestudent_id=tbl_prestudent.prestudent_id 
+				AND pls.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, NULL) 
+				AND pls.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, NULL)', 'LEFT');
+			$this->PrestudentModel->addJoin('lehre.tbl_studienplan sp', 'studienplan_id', 'LEFT');
+			$this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid');
+			$this->PrestudentModel->addJoin(
+				'public.tbl_studentlehrverband v',
+				'v.student_uid=s.student_uid AND v.studiensemester_kurzbz=' . $this->PrestudentModel->escape($studiensemester_kurzbz),
+				'LEFT'
+			);*/
+		$this->prepareQuery($studiensemester_kurzbz);
 
-		$this->PrestudentModel->addSelect('p.person_id');
-		$this->PrestudentModel->addSelect('s.prestudent_id');
-		$this->PrestudentModel->addSelect('b.uid');
-		$this->PrestudentModel->addSelect('titelpre');
-		$this->PrestudentModel->addSelect('titelpost');
-		$this->PrestudentModel->addSelect('vorname');
-		$this->PrestudentModel->addSelect('wahlname');
-		$this->PrestudentModel->addSelect('vornamen');
-		$this->PrestudentModel->addSelect('geschlecht');
-		$this->PrestudentModel->addSelect('nachname');
-		$this->PrestudentModel->addSelect('gebdatum');
-		$this->PrestudentModel->addSelect('tbl_prestudent.anmerkung');
-		$this->PrestudentModel->addSelect('ersatzkennzeichen');
-		$this->PrestudentModel->addSelect('svnr');
-		$this->PrestudentModel->addSelect('s.matrikelnr');
-		$this->PrestudentModel->addSelect('p.anmerkung AS anmerkungen');
 		$this->PrestudentModel->addSelect('v.semester');
 		$this->PrestudentModel->addSelect('v.verband');
 		$this->PrestudentModel->addSelect('v.gruppe');
-		$this->PrestudentModel->addSelect('tbl_prestudent.studiengang_kz');
-		$this->PrestudentModel->addSelect('aufmerksamdurch_kurzbz');
-		$this->PrestudentModel->addSelect('mentor');
-		$this->PrestudentModel->addSelect('b.aktiv AS bnaktiv');
-		$this->PrestudentModel->addSelect(
-			"(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung LIMIT 1) AS email_privat",
-			false
-		);
-		$this->PrestudentModel->addSelect(
-			"(SELECT rt_gesamtpunkte AS punkte FROM public.tbl_prestudent WHERE prestudent_id=s.prestudent_id) AS punkte",
-			false
-		);
-		$this->PrestudentModel->addSelect('tbl_prestudent.dual');
-		$this->PrestudentModel->addSelect('tbl_prestudent.reihungstest_id');
-		$this->PrestudentModel->addSelect('tbl_prestudent.anmeldungreihungstest');
-		$this->PrestudentModel->addSelect('p.matr_nr');
-		$this->PrestudentModel->addSelect('tbl_prestudent.gsstudientyp_kurzbz');
-		$this->PrestudentModel->addSelect('tbl_prestudent.aufnahmegruppe_kurzbz');
-		$this->PrestudentModel->addSelect('tbl_prestudent.priorisierung');
-		$this->PrestudentModel->addSelect('p.zugangscode');
-		$this->PrestudentModel->addSelect('p.bpk');
+		$this->addSelectPrioRel();
 
 		$this->addFilter($studiensemester_kurzbz);
 
@@ -649,55 +540,21 @@ class Students extends FHCAPI_Controller
 
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 
-		$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
-		$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id');
-		$this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid');
-		$this->PrestudentModel->addJoin(
-			'public.tbl_studentlehrverband v',
-			'v.student_uid=s.student_uid AND v.studiensemester_kurzbz=' . $this->PrestudentModel->escape($studiensemester_kurzbz),
-			'LEFT'
-		);
+		/*
+			$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
+			$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id');
+			$this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid');
+			$this->PrestudentModel->addJoin(
+				'public.tbl_studentlehrverband v',
+				'v.student_uid=s.student_uid AND v.studiensemester_kurzbz=' . $this->PrestudentModel->escape($studiensemester_kurzbz),
+				'LEFT'
+			);*/
+		$this->prepareQuery($studiensemester_kurzbz);
 
-		$this->PrestudentModel->addSelect('p.person_id');
-		$this->PrestudentModel->addSelect('s.prestudent_id');
-		$this->PrestudentModel->addSelect('b.uid');
-		$this->PrestudentModel->addSelect('titelpre');
-		$this->PrestudentModel->addSelect('titelpost');
-		$this->PrestudentModel->addSelect('vorname');
-		$this->PrestudentModel->addSelect('wahlname');
-		$this->PrestudentModel->addSelect('vornamen');
-		$this->PrestudentModel->addSelect('geschlecht');
-		$this->PrestudentModel->addSelect('nachname');
-		$this->PrestudentModel->addSelect('gebdatum');
-		$this->PrestudentModel->addSelect('tbl_prestudent.anmerkung');
-		$this->PrestudentModel->addSelect('ersatzkennzeichen');
-		$this->PrestudentModel->addSelect('svnr');
-		$this->PrestudentModel->addSelect('s.matrikelnr');
-		$this->PrestudentModel->addSelect('p.anmerkung AS anmerkungen');
 		$this->PrestudentModel->addSelect('v.semester');
 		$this->PrestudentModel->addSelect('v.verband');
 		$this->PrestudentModel->addSelect('v.gruppe');
-		$this->PrestudentModel->addSelect('tbl_prestudent.studiengang_kz');
-		$this->PrestudentModel->addSelect('aufmerksamdurch_kurzbz');
-		$this->PrestudentModel->addSelect('mentor');
-		$this->PrestudentModel->addSelect('b.aktiv AS bnaktiv');
-		$this->PrestudentModel->addSelect(
-			"(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung LIMIT 1) AS email_privat",
-			false
-		);
-		$this->PrestudentModel->addSelect(
-			"(SELECT rt_gesamtpunkte AS punkte FROM public.tbl_prestudent WHERE prestudent_id=s.prestudent_id) AS punkte",
-			false
-		);
-		$this->PrestudentModel->addSelect('tbl_prestudent.dual');
-		$this->PrestudentModel->addSelect('tbl_prestudent.reihungstest_id');
-		$this->PrestudentModel->addSelect('tbl_prestudent.anmeldungreihungstest');
-		$this->PrestudentModel->addSelect('p.matr_nr');
-		$this->PrestudentModel->addSelect('tbl_prestudent.gsstudientyp_kurzbz');
-		$this->PrestudentModel->addSelect('tbl_prestudent.aufnahmegruppe_kurzbz');
-		$this->PrestudentModel->addSelect('tbl_prestudent.priorisierung');
-		$this->PrestudentModel->addSelect('p.zugangscode');
-		$this->PrestudentModel->addSelect('p.bpk');
+		$this->addSelectPrioRel();
 
 		$this->addFilter($studiensemester_kurzbz);
 
@@ -710,6 +567,126 @@ class Students extends FHCAPI_Controller
 		$this->terminateWithSuccess($data);
 	}
 
+	/**
+	 * @param string|null	$studiensemester_kurzbz
+	 * @param string		$type
+	 *
+	 * @return void
+	 */
+	protected function prepareQuery($studiensemester_kurzbz, $type = 'LEFT')
+	{
+		$stdsemEsc = $studiensemester_kurzbz ? $this->PrestudentModel->escape($studiensemester_kurzbz) : 'NULL';
+
+
+		$this->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
+		$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
+		$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id', $type);
+		$this->PrestudentModel->addJoin('public.tbl_prestudentstatus pls', '
+			pls.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) 
+			AND pls.prestudent_id=tbl_prestudent.prestudent_id 
+			AND pls.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, NULL) 
+			AND pls.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, NULL)', 'LEFT');
+		$this->PrestudentModel->addJoin('lehre.tbl_studienplan sp', 'studienplan_id', 'LEFT');
+		$this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid', 'LEFT');
+		$this->PrestudentModel->addJoin(
+			'public.tbl_studentlehrverband v',
+			'v.student_uid=s.student_uid AND v.studiensemester_kurzbz' . ($studiensemester_kurzbz ? '=' . $stdsemEsc : ' IS NULL'),
+			$type
+		);
+		$this->PrestudentModel->addJoin('public.tbl_prestudentstatus ps', '
+			ps.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ') 
+			AND ps.prestudent_id=tbl_prestudent.prestudent_id 
+			AND ps.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ') 
+			AND ps.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ')', 'LEFT');
+
+
+		$this->PrestudentModel->addSelect("b.uid");
+		$this->PrestudentModel->addSelect('titelpre');
+		$this->PrestudentModel->addSelect('nachname');
+		$this->PrestudentModel->addSelect('vorname');
+		$this->PrestudentModel->addSelect('wahlname');
+		$this->PrestudentModel->addSelect('vornamen');
+		$this->PrestudentModel->addSelect('titelpost');
+		$this->PrestudentModel->addSelect('svnr');
+		$this->PrestudentModel->addSelect('ersatzkennzeichen');
+		$this->PrestudentModel->addSelect('gebdatum');
+		$this->PrestudentModel->addSelect('geschlecht');
+
+		// semester
+		// verband
+		// gruppe
+
+		$this->PrestudentModel->addSelect('UPPER(stg.typ || stg.kurzbz) AS studiengang');
+		$this->PrestudentModel->addSelect('tbl_prestudent.studiengang_kz');
+		$this->PrestudentModel->addSelect("s.matrikelnr");
+		$this->PrestudentModel->addSelect('p.person_id');
+		$this->PrestudentModel->addSelect('pls.status_kurzbz AS status');
+		$this->PrestudentModel->addSelect('pls.datum AS status_datum');
+		$this->PrestudentModel->addSelect('pls.bestaetigtam AS status_bestaetigung');
+		$this->PrestudentModel->addSelect(
+			"(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung LIMIT 1) AS mail_privat",
+			false
+		);
+		$this->PrestudentModel->addSelect("
+			CASE WHEN b.uid IS NOT NULL AND b.uid<>'' 
+			THEN b.uid || " . $this->PrestudentModel->escape(DOMAIN) . " 
+			ELSE '' END AS mail_intern", false);
+		$this->PrestudentModel->addSelect('p.anmerkung AS anmerkungen');
+		$this->PrestudentModel->addSelect('tbl_prestudent.anmerkung');
+		$this->PrestudentModel->addSelect('pls.orgform_kurzbz');
+		$this->PrestudentModel->addSelect('aufmerksamdurch_kurzbz');
+		$this->PrestudentModel->addSelect(
+			"(SELECT rt_gesamtpunkte AS punkte FROM public.tbl_prestudent WHERE prestudent_id=ps.prestudent_id) AS punkte",
+			false
+		);
+		$this->PrestudentModel->addSelect('tbl_prestudent.aufnahmegruppe_kurzbz');
+		$this->PrestudentModel->addSelect('tbl_prestudent.dual');
+		$this->PrestudentModel->addSelect('p.matr_nr');
+		$this->PrestudentModel->addSelect('sp.bezeichnung AS studienplan_bezeichnung');
+		$this->PrestudentModel->addSelect('tbl_prestudent.prestudent_id');
+
+		// priorisierung_relativ
+
+		$this->PrestudentModel->addSelect('mentor');
+		$this->PrestudentModel->addSelect('b.aktiv AS bnaktiv');
+
+		/*$this->PrestudentModel->addSelect('tbl_prestudent.reihungstest_id');
+		$this->PrestudentModel->addSelect('tbl_prestudent.anmeldungreihungstest');
+		$this->PrestudentModel->addSelect('tbl_prestudent.gsstudientyp_kurzbz');
+		$this->PrestudentModel->addSelect('tbl_prestudent.priorisierung');
+		$this->PrestudentModel->addSelect('p.zugangscode');
+		$this->PrestudentModel->addSelect('p.bpk');*/
+
+		$this->PrestudentModel->addOrder('nachname');
+		$this->PrestudentModel->addOrder('vorname');
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function addSelectPrioRel()
+	{
+		$this->PrestudentModel->addSelect("(
+			SELECT count(*)
+			FROM (
+				SELECT *, public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) AS laststatus
+				FROM PUBLIC.tbl_prestudent pss
+				JOIN PUBLIC.tbl_prestudentstatus USING (prestudent_id)
+				WHERE person_id = p.person_id
+				AND studiensemester_kurzbz = (
+					SELECT studiensemester_kurzbz
+					FROM PUBLIC.tbl_prestudentstatus
+					WHERE prestudent_id = tbl_prestudent.prestudent_id
+					AND status_kurzbz = 'Interessent'
+					LIMIT 1
+				)
+				AND status_kurzbz = 'Interessent'
+			) prest
+			WHERE laststatus NOT IN ('Abbrecher', 'Abgewiesener', 'Absolvent')
+			AND priorisierung <= tbl_prestudent.priorisierung
+		) || ' (' || tbl_prestudent.priorisierung || ')' AS priorisierung_relativ", false);
+	}
+
 	/**
 	 * Adds additional filters to the query
 	 *
diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index 243f9c76f..d9965e365 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -20,6 +20,15 @@ export default {
 		'update:selected'
 	],
 	data() {
+		function dateFormatter(cell)
+		{
+			let val = cell.getValue();
+			if (!val)
+				return '&nbsp;';
+			let date = new Date(val);
+			return date.toLocaleDateString();
+		}
+
 		return {
 			tabulatorOptions: {
 				columns:[
@@ -32,36 +41,40 @@ export default {
 					{title:"TitelPost", field:"titelpost"},
 					{title:"SVNR", field:"svnr"},
 					{title:"Ersatzkennzeichen", field:"ersatzkennzeichen"},
-					{title:"Geburtsdatum", field:"gebdatum"},
+					{title:"Geburtsdatum", field:"gebdatum", formatter:dateFormatter},
 					{title:"Geschlecht", field:"geschlecht"},
 					{title:"Sem.", field:"semester"},
 					{title:"Verb.", field:"verband"},
 					{title:"Grp.", field:"gruppe"},
 					{title:"Studiengang", field:"studiengang"},
 					{title:"Studiengang_kz", field:"studiengang_kz", visible:false},
-					{title:"Personenkennzeichen", field:"matrikelnummer"},
+					{title:"Personenkennzeichen", field:"matrikelnr"},
 					{title:"PersonID", field:"person_id"},
 					{title:"Status", field:"status"},
-					{title:"Status Datum", field:"status_datum", visible:false},
-					{title:"Status Bestaetigung", field:"status_bestaetigung", visible:false},
-					{title:"Status Datum ISO", field:"status_datum_iso", visible:false},
-					{title:"Status Bestaetigung ISO", field:"status_bestaetigung_iso", visible:false},
+					{title:"Status Datum", field:"status_datum", visible:false, formatter:dateFormatter},
+					{title:"Status Bestaetigung", field:"status_bestaetigung", visible:false, formatter:dateFormatter},
 					{title:"EMail (Privat)", field:"mail_privat", visible:false},
 					{title:"EMail (Intern)", field:"mail_intern", visible:false},
 					{title:"Anmerkungen", field:"anmerkungen", visible:false},
-					{title:"AnmerkungPre", field:"anmerkungpre", visible:false},
-					{title:"OrgForm", field:"orgform"},
-					{title:"Aufmerksamdurch", field:"orgform", visible:false},
+					{title:"AnmerkungPre", field:"anmerkung", visible:false},
+					{title:"OrgForm", field:"orgform_kurzbz"},
+					{title:"Aufmerksamdurch", field:"aufmerksamdurch_kurzbz", visible:false},
 					{title:"Gesamtpunkte", field:"punkte", visible:false},
 					{title:"Aufnahmegruppe", field:"aufnahmegruppe_kurzbz", visible:false},
-					{title:"Dual", field:"dual_bezeichnung", visible:false},
+					{title:"Dual", field:"dual", visible:false, formatter:'tickCross', formatterParams: {
+						tickElement: '<i class="fas fa-check text-success"></i>',
+						crossElement: '<i class="fas fa-times text-danger"></i>'
+					}},
 					{title:"Matrikelnummer", field:"matr_nr", visible:false},
 					{title:"Studienplan", field:"studienplan_bezeichnung"},
 					{title:"PreStudentInnenID", field:"prestudent_id"},
-					{title:"Priorität", field:"priorisierung_realtiv"},
+					{title:"Priorität", field:"priorisierung_relativ"},
 					{title:"Mentor", field:"mentor", visible:false},
-					{title:"Aktiv", field:"bnaktiv", visible:false},
-					{title:"GeburtsdatumISO", field:"geburtsdatum_iso", visible:false},
+					{title:"Aktiv", field:"bnaktiv", visible:false, formatter:'tickCross', formatterParams: {
+						allowEmpty:true,
+						tickElement: '<i class="fas fa-check text-success"></i>',
+						crossElement: '<i class="fas fa-times text-danger"></i>'
+					}},
 				],
 				rowFormatter(row) {
 					if (row.getData().bnaktiv === false) {

From 63f089dc27e21ecfcd540e25350940f4068aa079 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 24 Jun 2024 13:50:13 +0200
Subject: [PATCH 0831/1461] changes the layout of the Stundenplan Events

---
 .../controllers/api/frontend/v1/Stundenplan.php     |  4 +++-
 application/models/ressource/Stundenplan_model.php  |  6 +++---
 application/views/Cis/Stundenplan.php               |  4 +---
 public/js/apps/Cis/RoomInformation.js               |  2 +-
 public/js/apps/Cis/Stundenplan.js                   | 13 ++++++++++++-
 public/js/components/Calendar/Week/Page.js          |  2 +-
 6 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 243f4b2c5..37b384630 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -90,7 +90,7 @@ class Stundenplan extends FHCAPI_Controller
         
         $stunden = getData($stunden);
 
-		$result = $this->StundenplanModel->groupedRoomPlanning($ort_kurzbz,$start_date,$end_date);  
+		$result = $this->StundenplanModel->groupedCalendarEvents($ort_kurzbz,$start_date,$end_date);  
         //$this->loglib->logErrorDB(print_r($result,TRUE),"this is the result of the grouped query");
 		
         if(isError($result)){
@@ -105,6 +105,8 @@ class Stundenplan extends FHCAPI_Controller
                 // gruppierung hat stattgefunden und das array muss in einem String konvertiert werden
             }
         }
+
+        // this is the old way the events were grouped, kept in case that the query doesnt work out as expected
         /* 
         $final_events = array();
         $grouped = array();
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 5e5dc779d..693825e79 100755
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -48,10 +48,10 @@ class Stundenplan_model extends DB_Model
 	 * 
 	 * @return stdClass
 	 */
-	public function groupedRoomPlanning($ort_kurzbz,$start_date,$end_date){
+	public function groupedCalendarEvents($ort_kurzbz,$start_date,$end_date){
 
 
-		$gruppierteRaumVerplannung= $this->execReadOnlyQuery("
+		$gruppierteEvents= $this->execReadOnlyQuery("
 		SELECT 
 		
 			'reservierung' as type,
@@ -130,7 +130,7 @@ class Stundenplan_model extends DB_Model
 		ORDER BY datum, stunde
 		", [$ort_kurzbz, $start_date, $end_date, $ort_kurzbz, $start_date, $end_date]); 
 
-		return $gruppierteRaumVerplannung;
+		return $gruppierteEvents;
 	}
 
 	/**
diff --git a/application/views/Cis/Stundenplan.php b/application/views/Cis/Stundenplan.php
index cb8f8a712..2983f9ae3 100755
--- a/application/views/Cis/Stundenplan.php
+++ b/application/views/Cis/Stundenplan.php
@@ -9,9 +9,7 @@ $this->load->view('templates/CISHTML-Header', $includesArray);
 ?>
 
 <div id="content">
-	<h2>Stundenplan</h2>
-	<hr>
-	<fhc-calendar :events="events" initial-mode="week" show-weeks></fhc-calendar>
+	
 </div>
 
 <?php $this->load->view('templates/CISHTML-Footer', $includesArray); ?>
diff --git a/public/js/apps/Cis/RoomInformation.js b/public/js/apps/Cis/RoomInformation.js
index b5559047e..62920cb66 100644
--- a/public/js/apps/Cis/RoomInformation.js
+++ b/public/js/apps/Cis/RoomInformation.js
@@ -99,7 +99,7 @@ const app = Vue.createApp({
         <fhc-calendar  v-slot="{event,day}" :initialDate="currentDate" :events="events" initial-mode="week" show-weeks>
            
             <a class="text-decoration-none text-dark" href="#" :title="event.orig.title + ' - ' + event.orig.lehrfach_bez + ' [' + event.orig.ort_kurzbz+']'"   >    
-                <div class="d-flex flex-column align-items-center justify-content-evenly h-100" :style="{'background-color':event.orig.color}">
+                <div class="d-flex flex-column align-items-center justify-content-evenly h-100" >
                     
                         <!-- render content for stundenplan -->
                         <span >{{event.orig.topic}}</span>
diff --git a/public/js/apps/Cis/Stundenplan.js b/public/js/apps/Cis/Stundenplan.js
index 25823b193..47d945c29 100755
--- a/public/js/apps/Cis/Stundenplan.js
+++ b/public/js/apps/Cis/Stundenplan.js
@@ -48,7 +48,18 @@ const app = Vue.createApp({
 				});
 			});
 		});
-	}
+	},
+	template:/*html*/`
+	<h2>Stundenplan</h2>
+	<hr>
+	<fhc-calendar v-slot="{event, day}" :events="events" initial-mode="week" show-weeks>
+		<div class="d-flex flex-column align-items-center justify-content-evenly h-100">
+			<span>{{event.orig.title}}</span>
+			<span>{{event.orig.ort_kurzbz}}</span>
+			<span>{{event.orig.mitarbeiter_kurzbz}}</span>
+		</div>
+	</fhc-calendar>
+	`
 });
 app.config.unwrapInjectedRef = true;
 app.use(Phrasen);
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index 75fef62f1..0a3794295 100755
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -108,7 +108,7 @@ export default {
 						<div v-for="hour in hours" style="min-height:100px" :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
 					</div>
 					<div v-for="day in eventsPerDayAndHour" :key="day" class="day border-start" :style="{'grid-template-columns': 'repeat(' + day.lanes + ', 1fr)', 'grid-template-rows': 'repeat(' + (1440 / smallestTimeFrame) + ', 1fr)'}">
-						<div class="mx-2 border border-dark border-2 small rounded overflow-hidden "  @click.prevent="$emit('input', event.orig)" :style="{'grid-column-start': 1+(event.lane-1)*day.lanes/event.maxLane, 'grid-column-end': 1+event.lane*day.lanes/event.maxLane, 'grid-row-start': dateToMinutesOfDay(event.start), 'grid-row-end': dateToMinutesOfDay(event.end) ,'--test': dateToMinutesOfDay(event.end)}" v-for="event in day.events" :key="event">	
+						<div :style="{'background-color':event.orig.color}" class="mx-2 border border-dark border-2 small rounded overflow-hidden "  @click.prevent="$emit('input', event.orig)" :style="{'grid-column-start': 1+(event.lane-1)*day.lanes/event.maxLane, 'grid-column-end': 1+event.lane*day.lanes/event.maxLane, 'grid-row-start': dateToMinutesOfDay(event.start), 'grid-row-end': dateToMinutesOfDay(event.end) ,'--test': dateToMinutesOfDay(event.end)}" v-for="event in day.events" :key="event">	
 							<slot :event="event" :day="day">
 								<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
 							</slot>

From d92ad0a6c6669055d03bcd586761da0f8b2e638d Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 14 Jun 2024 14:42:02 +0200
Subject: [PATCH 0832/1461] links the ort_kurzbz from the Stundenplan in the
 Dashboard to the Ort Information Content

---
 .../controllers/api/frontend/v1/Ort.php       | 71 +++++++++++++++++++
 application/models/ressource/Ort_model.php    | 12 ++++
 public/js/api/fhcapifactory.js                |  4 +-
 public/js/api/ort.js                          | 10 +++
 public/js/apps/Dashboard/Admin.js             |  2 +
 public/js/apps/Dashboard/Fhc.js               |  2 +
 .../components/DashboardWidget/Stundenplan.js | 21 +++++-
 7 files changed, 119 insertions(+), 3 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/Ort.php
 create mode 100644 public/js/api/ort.js

diff --git a/application/controllers/api/frontend/v1/Ort.php b/application/controllers/api/frontend/v1/Ort.php
new file mode 100644
index 000000000..2bc0f945b
--- /dev/null
+++ b/application/controllers/api/frontend/v1/Ort.php
@@ -0,0 +1,71 @@
+<?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');
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the SearchBarLib (back-end)
+ * Provides data to the ajax get calls about the searchbar component
+ * This controller works with JSON calls on the HTTP GET and the output is always JSON
+ */
+class Ort extends FHCAPI_Controller
+{
+	
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+		// NOTE(chris): additional permission checks will be done in SearchBarLib
+		parent::__construct([
+			'ContentID' => self::PERM_LOGGED
+		]);
+
+		$this->load->model('ressource/Ort_model', 'OrtModel');
+
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * Gets a JSON body via HTTP POST and provides the parameters
+	 */
+	public function ContentID()
+	{
+		// if error
+		//$this->terminateWithError(SearchBarLib::ERROR_WRONG_JSON, self::ERROR_TYPE_GENERAL);
+		
+		$ort_kurzbz = $this->input->get('ort_kurzbz',TRUE);
+		
+		if(!$ort_kurzbz){
+			$this->terminateWithError("missing ort_kurzbz parameter", self::ERROR_TYPE_GENERAL);
+		}
+
+		$result = $this->OrtModel->getContentID($ort_kurzbz);
+		
+		if(isError($result)){
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+
+		$result = hasData($result) ? current(getData($result)) : null;
+		
+		$this->terminateWithSuccess($result->content_id ?? NULL);
+	}
+}
+
diff --git a/application/models/ressource/Ort_model.php b/application/models/ressource/Ort_model.php
index 59b213a54..de0c8e331 100755
--- a/application/models/ressource/Ort_model.php
+++ b/application/models/ressource/Ort_model.php
@@ -20,4 +20,16 @@ class Ort_model extends DB_Model
 		
 		return $this->OrtModel->loadWhere(array("raumtyp_kurzbz" => $raumtyp_kurzbz));
 	}
+
+	public function getContentID($ort_kurzbz)
+	{
+	
+		return $this->execReadOnlyQuery("
+		SELECT content_id 
+		FROM public.tbl_ort 
+		WHERE ort_kurzbz = ?;
+		",[$ort_kurzbz]);
+		
+	}
+
 }
\ No newline at end of file
diff --git a/public/js/api/fhcapifactory.js b/public/js/api/fhcapifactory.js
index 41c89ef50..a41730548 100644
--- a/public/js/api/fhcapifactory.js
+++ b/public/js/api/fhcapifactory.js
@@ -20,11 +20,13 @@ import phrasen from "./phrasen.js";
 import navigation from "./navigation.js";
 import filter from "./filter.js";
 import studstatus from "./studstatus.js";
+import ort from "./ort.js";
 
 export default {
     search,
     phrasen,
     navigation,
     filter,
-    studstatus
+    studstatus,
+    ort,
 };
diff --git a/public/js/api/ort.js b/public/js/api/ort.js
new file mode 100644
index 000000000..32f114565
--- /dev/null
+++ b/public/js/api/ort.js
@@ -0,0 +1,10 @@
+export default {
+    getContentID($ort_kurbz) {
+		return this.$fhcApi.get(
+            FHC_JS_DATA_STORAGE_OBJECT.app_root +
+            FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+            "/api/frontend/v1/Ort/ContentID",
+			{ ort_kurzbz: $ort_kurbz }
+		);
+	},
+}
\ No newline at end of file
diff --git a/public/js/apps/Dashboard/Admin.js b/public/js/apps/Dashboard/Admin.js
index 426a2fce4..70254c955 100755
--- a/public/js/apps/Dashboard/Admin.js
+++ b/public/js/apps/Dashboard/Admin.js
@@ -1,5 +1,6 @@
 import {CoreNavigationCmpt} from '../../components/navigation/Navigation.js';
 import DashboardAdmin from '../../components/Dashboard/Admin.js';
+import FhcApi from '../../plugin/FhcApi.js';
 
 const app = Vue.createApp({
   data: () => ({
@@ -11,4 +12,5 @@ const app = Vue.createApp({
   }
 });
 app.config.unwrapInjectedRef = true;
+app.use(FhcApi);
 app.mount('#main');
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index ebcbb4b78..89d1e2c1e 100755
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -1,4 +1,5 @@
 import FhcDashboard from '../../components/Dashboard/Dashboard.js';
+import FhcApi from '../../plugin/FhcApi.js';
 
 const app = Vue.createApp({
   data: () => ({
@@ -9,4 +10,5 @@ const app = Vue.createApp({
   }
 });
 app.config.unwrapInjectedRef = true;
+app.use(FhcApi);
 app.mount('#content');
diff --git a/public/js/components/DashboardWidget/Stundenplan.js b/public/js/components/DashboardWidget/Stundenplan.js
index b74095b32..91b8d48cd 100755
--- a/public/js/components/DashboardWidget/Stundenplan.js
+++ b/public/js/components/DashboardWidget/Stundenplan.js
@@ -19,6 +19,7 @@ export default {
 		}
 	},
 	computed: {
+		
 		currentEvents() {
 			return (this.events || []).filter(evt => evt.end < this.dayAfterCurrentDay && evt.start >= this.currentDay);
 		},
@@ -29,12 +30,28 @@ export default {
 		}
 	},
 	methods: {
+		printEntry: function(item){
+			console.log(item);
+		},
 		selectDay(day) {
 			this.currentDay = day;
 			this.minimized = true;
+		},
+		showRoomInfo: function($ort_kurzbz){
+			
+			this.$fhcApi.factory.ort.getContentID($ort_kurzbz).then(res =>{
+
+				window.location.href = FHC_JS_DATA_STORAGE_OBJECT.app_root +
+				FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+				"/CisHtml/Cms/content/" + res.data;
+			
+			})
 		}
+
 	},
 	created() {
+		
+		
 		this.$emit('setConfig', false);
 		axios
 			.get(this.apiurl + '/components/Cis/Stundenplan/Stunden').then(res => {
@@ -67,11 +84,11 @@ export default {
 				<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
 			</div>
 			<div v-else-if="currentEvents.length" class="list-group list-group-flush">
-				<div class="" v-for="evt in currentEvents" :key="evt.id" class="list-group-item small" :style="{'background-color':evt.color}">
+				<div @click="printEntry(evt)" class="" v-for="evt in currentEvents" :key="evt.id" class="list-group-item small" :style="{'background-color':evt.color}">
 					<b>{{evt.title}}</b>
 					<br>
 					<small class="d-flex w-100 justify-content-between">
-						<span>{{evt.ort_kurzbz}}</span>
+						<span @click="showRoomInfo(evt.ort_kurzbz)" style="text-decoration:underline" type="button">{{evt.ort_kurzbz}}</span>
 						<span>{{evt.start.toLocaleTimeString(undefined, {hour:'numeric',minute:'numeric'})}}-{{evt.end.toLocaleTimeString(undefined, {hour:'numeric',minute:'numeric'})}}</span>
 					</small>
 				</div>

From bb9d4bda04156567d73b25bf75b6b94a9d56e5c5 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 17 Jun 2024 11:39:14 +0200
Subject: [PATCH 0833/1461] adds a general modal for the lehrveranstaltungs
 Uebersicht with all the links connected to the lehrveranstaltung

---
 public/js/apps/Dashboard/Admin.js             |  2 +
 public/js/apps/Dashboard/Fhc.js               |  2 +
 public/js/components/Cis/Mylv/LvUebersicht.js | 48 +++++++++++++++++++
 .../components/DashboardWidget/Stundenplan.js | 23 ++++++---
 4 files changed, 69 insertions(+), 6 deletions(-)
 create mode 100644 public/js/components/Cis/Mylv/LvUebersicht.js

diff --git a/public/js/apps/Dashboard/Admin.js b/public/js/apps/Dashboard/Admin.js
index 70254c955..e0b21cfb5 100755
--- a/public/js/apps/Dashboard/Admin.js
+++ b/public/js/apps/Dashboard/Admin.js
@@ -1,6 +1,7 @@
 import {CoreNavigationCmpt} from '../../components/navigation/Navigation.js';
 import DashboardAdmin from '../../components/Dashboard/Admin.js';
 import FhcApi from '../../plugin/FhcApi.js';
+import Phrasen from '../../plugin/Phrasen.js';
 
 const app = Vue.createApp({
   data: () => ({
@@ -13,4 +14,5 @@ const app = Vue.createApp({
 });
 app.config.unwrapInjectedRef = true;
 app.use(FhcApi);
+app.use(Phrasen);
 app.mount('#main');
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index 89d1e2c1e..8dd8fe44b 100755
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -1,5 +1,6 @@
 import FhcDashboard from '../../components/Dashboard/Dashboard.js';
 import FhcApi from '../../plugin/FhcApi.js';
+import Phrasen from '../../plugin/Phrasen.js';
 
 const app = Vue.createApp({
   data: () => ({
@@ -11,4 +12,5 @@ const app = Vue.createApp({
 });
 app.config.unwrapInjectedRef = true;
 app.use(FhcApi);
+app.use(Phrasen);
 app.mount('#content');
diff --git a/public/js/components/Cis/Mylv/LvUebersicht.js b/public/js/components/Cis/Mylv/LvUebersicht.js
new file mode 100644
index 000000000..c21cf200d
--- /dev/null
+++ b/public/js/components/Cis/Mylv/LvUebersicht.js
@@ -0,0 +1,48 @@
+import BsModal from "../../Bootstrap/Modal";
+
+export default  {
+  
+    
+    data(){
+        return {
+            // reactive data
+            items:["lehrveranstaltungsInformationen","Notenlisten","Moodle","Gesamtnote","E-mail","Pinboard","Alle Termine der LV","Anrechnung","Evaluierung","Neue Einmeldung"],
+            lehreinheit:null,
+            stg:null,
+            lv:null,
+
+            result: false,
+        }
+    },
+    mixins:[BsModal],
+    components:{
+        BsModal,
+    },
+    mounted(){
+        this.modal = this.$refs.modalContainer;
+    },
+    template:/*html*/`
+    <bs-modal ref="modalContainer" dialogClass="modal-lg">
+        <template #title>
+            <span v-if="lv ">
+            {{lv + (stg?' / ' + stg:'')}}
+            </span>
+            <span v-else>
+            Lehrveranstaltungs Übersicht
+            </span>
+        </template>
+        <template #default>
+            <div :style="{'display':'grid', 'row-gap':'10px', 'column-gap':'10px', 'grid-template-columns':'repeat(3,minmax(100px,1fr))', 'grid-template-rows':'repeat('+Math.ceil(items.length / 3)+',minmax(100px,1fr))'} ">
+                <div class="d-flex flex-column align-items-center justify-content-center" v-for="item in items" :key="item">
+                    <span>{{item}}</span>
+                    <i class="fa fa-file"></i>
+                </div>
+            </div>
+        </template>
+        <template #footer>
+            <button type="button" class="btn btn-primary" @click="result=true;this.hide()">OK</button>
+            <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
+        </template>
+    </bs-modal>
+    `,
+};
\ No newline at end of file
diff --git a/public/js/components/DashboardWidget/Stundenplan.js b/public/js/components/DashboardWidget/Stundenplan.js
index 91b8d48cd..d2e1f9693 100755
--- a/public/js/components/DashboardWidget/Stundenplan.js
+++ b/public/js/components/DashboardWidget/Stundenplan.js
@@ -1,6 +1,8 @@
 import Phrasen from '../../mixins/Phrasen.js';
 import AbstractWidget from './Abstract.js';
 import FhcCalendar from '../Calendar/Calendar.js';
+import LvUebersicht from '../Cis/Mylv/LvUebersicht.js';
+
 
 export default {
 	mixins: [
@@ -8,14 +10,17 @@ export default {
 		AbstractWidget
 	],
 	components: {
-		FhcCalendar
+		FhcCalendar,
+		LvUebersicht,
 	},
+	
 	data() {
 		return {
 			stunden: [],
 			minimized: true,
 			events: null,
-			currentDay: new Date()
+			currentDay: new Date(),
+			
 		}
 	},
 	computed: {
@@ -30,9 +35,14 @@ export default {
 		}
 	},
 	methods: {
-		printEntry: function(item){
-			console.log(item);
+		showLvUebersicht: function (event){
+			
+			this.$refs.lvUebersicht.lehreinheit = event.lehreinheit_id;
+			this.$refs.lvUebersicht.lv = event.title;
+			this.$refs.lvUebersicht.stg = event.stg_typ + event.stg_kurzbz + (event.verband?'-' + event.verband:'' );
+			this.$refs.lvUebersicht.show();
 		},
+		
 		selectDay(day) {
 			this.currentDay = day;
 			this.minimized = true;
@@ -76,15 +86,16 @@ export default {
 			})
 			.catch(err => { console.error('ERROR: ', err.response.data) });
 	},
-	template: `
+	template: /*html*/`
 	<div class="dashboard-widget-stundenplan d-flex flex-column h-100">
+		<lv-uebersicht ref="lvUebersicht"  />
 		<fhc-calendar :initial-date="currentDay" class="border-0" class-header="p-0" @select:day="selectDay" v-model:minimized="minimized" :events="events" no-week-view :show-weeks="false" />
 		<div v-show="minimized" class="flex-grow-1 overflow-scroll">
 			<div v-if="events === null" class="d-flex h-100 justify-content-center align-items-center">
 				<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
 			</div>
 			<div v-else-if="currentEvents.length" class="list-group list-group-flush">
-				<div @click="printEntry(evt)" class="" v-for="evt in currentEvents" :key="evt.id" class="list-group-item small" :style="{'background-color':evt.color}">
+				<div @click="showLvUebersicht(evt)" class="" v-for="evt in currentEvents" :key="evt.id" class="list-group-item small" :style="{'background-color':evt.color}">
 					<b>{{evt.title}}</b>
 					<br>
 					<small class="d-flex w-100 justify-content-between">

From b3dfcdc29543259fd28e7c93252212f044b04efa Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 17 Jun 2024 14:01:02 +0200
Subject: [PATCH 0834/1461] the calendar modal is correctly opened when the
 correct event is called

---
 application/views/Cis/Stundenplan.php         |  4 ++--
 public/js/apps/Cis/Stundenplan.js             | 21 ++++++++++++++++---
 public/js/components/Calendar/Calendar.js     | 15 ++-----------
 .../Cis/Profil/ProfilModal/EditProfil.js      |  3 ++-
 4 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/application/views/Cis/Stundenplan.php b/application/views/Cis/Stundenplan.php
index cb8f8a712..99103b373 100755
--- a/application/views/Cis/Stundenplan.php
+++ b/application/views/Cis/Stundenplan.php
@@ -8,10 +8,10 @@ $includesArray = array(
 $this->load->view('templates/CISHTML-Header', $includesArray);
 ?>
 
-<div id="content">
+<div >
 	<h2>Stundenplan</h2>
 	<hr>
-	<fhc-calendar :events="events" initial-mode="week" show-weeks></fhc-calendar>
+	<div id="content"></div>
 </div>
 
 <?php $this->load->view('templates/CISHTML-Footer', $includesArray); ?>
diff --git a/public/js/apps/Cis/Stundenplan.js b/public/js/apps/Cis/Stundenplan.js
index 25823b193..edcad1da8 100755
--- a/public/js/apps/Cis/Stundenplan.js
+++ b/public/js/apps/Cis/Stundenplan.js
@@ -1,16 +1,28 @@
 import FhcCalendar from "../../components/Calendar/Calendar.js";
+import CalendarModal from '../../components/Calendar/CalendarModal.js';
 import Phrasen from "../../plugin/Phrasen.js";
 
 const app = Vue.createApp({
 	components: {
-		FhcCalendar
+		FhcCalendar,
+		CalendarModal
 	},
 	data() {
 		return {
 			stunden: [],
-			events: null
+			events: null,
+			currentlySelectedEvent:null,
 		}
 	},
+	methods:{
+		selectEvent: function(event){
+			this.currentlySelectedEvent = event;
+			Vue.nextTick(()=>{
+				this.$refs.calendarModal.show();
+			})
+			
+		},
+	},
 	created() {
 		axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/Cis/Stundenplan/Stunden').then(res => {
 			res.data.retval.forEach(std => {
@@ -48,7 +60,10 @@ const app = Vue.createApp({
 				});
 			});
 		});
-	}
+	},
+	template:`
+	<calendar-modal v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ref="calendarModal"  ></calendar-modal>
+	<fhc-calendar @select:event="selectEvent" :events="events" initial-mode="week" show-weeks></fhc-calendar>`
 });
 app.config.unwrapInjectedRef = true;
 app.use(Phrasen);
diff --git a/public/js/components/Calendar/Calendar.js b/public/js/components/Calendar/Calendar.js
index 4ce70911e..79260e191 100755
--- a/public/js/components/Calendar/Calendar.js
+++ b/public/js/components/Calendar/Calendar.js
@@ -5,7 +5,7 @@ import CalendarWeek from './Week.js';
 import CalendarWeeks from './Weeks.js';
 import CalendarMinimized from './Minimized.js';
 import CalendarDate from '../../composables/CalendarDate.js';
-import CalendarModal from './CalendarModal.js';
+
 
 // TODO(chris): week/month toggle
 
@@ -17,7 +17,6 @@ export default {
 		CalendarWeek,
 		CalendarWeeks,
 		CalendarMinimized,
-		CalendarModal
 	},
 	provide() {
 		return {
@@ -105,15 +104,6 @@ export default {
 	},
 	methods: {
 		handleInput(day) {
-			// set the event when clicking on the lernveranstaltung in the data 
-			this.currentlySelectedEvent = day[1];
-			console.log(this.currentlySelectedEvent)
-			// showing the modal
-			Vue.nextTick(()=>{
-				this.$refs.calendarModal.show();
-			})
-			
-			console.log(day,"this is the day")
 			this.$emit(day[0], day[1]);
 		}
 	},
@@ -145,9 +135,8 @@ export default {
 			}).observe(this.$refs.container);
 		}
 	},
-	template: `
+	template: /*html*/`
 	<div ref="container" class="fhc-calendar card" :class="sizeClass">
-		<calendar-modal v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ref="calendarModal"  />
 		<component v-slot="{event}" :is="'calendar-' + mode" @update:mode="mode=$event" @change:range="$emit('change:range',$event)" @input="handleInput" >
 			<!--Week Page layout-->
 			<slot :event="event">
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfil.js b/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
index 189dd8f5d..befb733d5 100755
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
@@ -153,7 +153,8 @@ export default {
     this.modal = this.$refs.modalContainer.modal;
   },
   popup(options) {
-    return BsModal.popup.bind(this)(null, options);
+    BsModal.popup.bind(this);
+    return BsModal.popup(null, options);
   },
   template: /*html*/ `
   <bs-modal v-show="!loading" ref="modalContainer" v-bind="$props" body-class="" dialog-class="modal-lg" class="bootstrap-alert" backdrop="false" >

From 6230aa47aeb032dd171842ecfb9aa05d14bf7a32 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 18 Jun 2024 15:03:36 +0200
Subject: [PATCH 0835/1461] now also displays the room information inside a
 modal and does not redirect to the content site

---
 .../controllers/api/frontend/v1/Ort.php       | 26 +++++++++-
 public/js/api/ort.js                          | 10 +++-
 public/js/components/Cis/Cms/ContentModal.js  | 47 +++++++++++++++++++
 public/js/components/Cis/Mylv/LvUebersicht.js |  3 +-
 .../components/DashboardWidget/Stundenplan.js | 38 +++++++++++++--
 5 files changed, 117 insertions(+), 7 deletions(-)
 create mode 100644 public/js/components/Cis/Cms/ContentModal.js

diff --git a/application/controllers/api/frontend/v1/Ort.php b/application/controllers/api/frontend/v1/Ort.php
index 2bc0f945b..8c4059824 100644
--- a/application/controllers/api/frontend/v1/Ort.php
+++ b/application/controllers/api/frontend/v1/Ort.php
@@ -33,7 +33,8 @@ class Ort extends FHCAPI_Controller
 	{
 		// NOTE(chris): additional permission checks will be done in SearchBarLib
 		parent::__construct([
-			'ContentID' => self::PERM_LOGGED
+			'ContentID' => self::PERM_LOGGED,
+			'getOrtKurzbzContent' => self::PERM_LOGGED,
 		]);
 
 		$this->load->model('ressource/Ort_model', 'OrtModel');
@@ -67,5 +68,28 @@ class Ort extends FHCAPI_Controller
 		
 		$this->terminateWithSuccess($result->content_id ?? NULL);
 	}
+
+	/**
+	 * @param int		$version
+	 * @param string	$sprache
+	 * @param boolean	$sichtbar
+	 *
+	 * @return $content
+	 */
+	public function getOrtKurzbzContent($version = null, $sprache = null, $sichtbar = true)
+	{
+		$content_id = $this->input->get("content_id",TRUE);
+
+		$this->load->library('CmsLib');
+
+		$content = $this->cmslib->getContent($content_id, $version, $sprache, $sichtbar);
+
+		if (isError($content))
+			$this->terminateWithError(getError($content), self::ERROR_TYPE_GENERAL);
+
+		$content = hasData($content) ? getData($content) : null;
+
+		$this->terminateWithSuccess($content);
+	}
 }
 
diff --git a/public/js/api/ort.js b/public/js/api/ort.js
index 32f114565..c92ac0be0 100644
--- a/public/js/api/ort.js
+++ b/public/js/api/ort.js
@@ -1,5 +1,5 @@
 export default {
-    getContentID($ort_kurbz) {
+  getContentID($ort_kurbz) {
 		return this.$fhcApi.get(
             FHC_JS_DATA_STORAGE_OBJECT.app_root +
             FHC_JS_DATA_STORAGE_OBJECT.ci_router +
@@ -7,4 +7,12 @@ export default {
 			{ ort_kurzbz: $ort_kurbz }
 		);
 	},
+  getOrtKuzbzContent($ort_kurzbz_content_id) {
+		return this.$fhcApi.get(
+            FHC_JS_DATA_STORAGE_OBJECT.app_root +
+            FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+            "/api/frontend/v1/Ort/getOrtKurzbzContent",
+			{ content_id: $ort_kurzbz_content_id }
+		);
+	},
 }
\ No newline at end of file
diff --git a/public/js/components/Cis/Cms/ContentModal.js b/public/js/components/Cis/Cms/ContentModal.js
new file mode 100644
index 000000000..3613648ee
--- /dev/null
+++ b/public/js/components/Cis/Cms/ContentModal.js
@@ -0,0 +1,47 @@
+import BsModal from "../../Bootstrap/Modal";
+
+
+export default {
+
+   
+    mixins:[BsModal],
+    
+    components:{
+        BsModal,
+    },
+    data(){
+        return{
+            content_id:null,
+            content:null,
+            ort_kurzbz:null,
+            result: false,
+        };
+    },
+    methods:{
+        modalShown: function(){
+            
+        }
+    },
+    mounted(){
+        this.modal = this.$refs.modalContainer;
+        document.addEventListener("show.bs.modal", function(){
+            console.log("modal is shown inside the mounted hook")
+        })  
+    },
+    
+    template:/*html*/`
+    <bs-modal @showBsModal="modalShown" ref="modalContainer" dialogClass="modal-lg">
+        <template #title>
+            <span v-if="ort_kurzbz">{{ort_kurzbz}}</span>
+            <span v-else>Ort Übersicht</span>
+        </template>
+        <template #default>
+            <div v-if="content" v-html="content"></div>
+            <div v-else>this is the else div</div>
+        </template>
+        <template #footer>
+            <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
+        </template>
+    </bs-modal>
+    `
+};
\ No newline at end of file
diff --git a/public/js/components/Cis/Mylv/LvUebersicht.js b/public/js/components/Cis/Mylv/LvUebersicht.js
index c21cf200d..b2ee20833 100644
--- a/public/js/components/Cis/Mylv/LvUebersicht.js
+++ b/public/js/components/Cis/Mylv/LvUebersicht.js
@@ -40,8 +40,7 @@ export default  {
             </div>
         </template>
         <template #footer>
-            <button type="button" class="btn btn-primary" @click="result=true;this.hide()">OK</button>
-            <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
+            <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
         </template>
     </bs-modal>
     `,
diff --git a/public/js/components/DashboardWidget/Stundenplan.js b/public/js/components/DashboardWidget/Stundenplan.js
index d2e1f9693..3a1d3484c 100755
--- a/public/js/components/DashboardWidget/Stundenplan.js
+++ b/public/js/components/DashboardWidget/Stundenplan.js
@@ -2,7 +2,7 @@ import Phrasen from '../../mixins/Phrasen.js';
 import AbstractWidget from './Abstract.js';
 import FhcCalendar from '../Calendar/Calendar.js';
 import LvUebersicht from '../Cis/Mylv/LvUebersicht.js';
-
+import ContentModal from '../Cis/Cms/ContentModal.js'
 
 export default {
 	mixins: [
@@ -12,6 +12,7 @@ export default {
 	components: {
 		FhcCalendar,
 		LvUebersicht,
+		ContentModal,
 	},
 	
 	data() {
@@ -35,6 +36,33 @@ export default {
 		}
 	},
 	methods: {
+		
+		showRoomInfoModal: function(ort_kurzbz){
+
+			// getting the content_id of the ort_kurzbz
+			this.$fhcApi.factory.ort.getContentID(ort_kurzbz).then(res =>{
+
+				let ort_kurzbz_content_id = res.data;
+
+				this.$refs.contentModal.content_id = ort_kurzbz_content_id;
+
+				this.$fhcApi.factory.ort.getOrtKuzbzContent(ort_kurzbz_content_id).then(res =>{
+					let result = res.data;
+					console.log("this is the result of the query", result);
+					this.$refs.contentModal.content = result;
+					this.$refs.contentModal.ort_kurzbz = ort_kurzbz;
+					if(this.$refs.contentModal.content){
+						this.$refs.contentModal.show();
+					}
+					
+
+				})
+
+				
+				
+			})
+			
+		},
 		showLvUebersicht: function (event){
 			
 			this.$refs.lvUebersicht.lehreinheit = event.lehreinheit_id;
@@ -60,6 +88,7 @@ export default {
 
 	},
 	created() {
+
 		
 		
 		this.$emit('setConfig', false);
@@ -89,17 +118,20 @@ export default {
 	template: /*html*/`
 	<div class="dashboard-widget-stundenplan d-flex flex-column h-100">
 		<lv-uebersicht ref="lvUebersicht"  />
+		<content-modal ref="contentModal"  />
 		<fhc-calendar :initial-date="currentDay" class="border-0" class-header="p-0" @select:day="selectDay" v-model:minimized="minimized" :events="events" no-week-view :show-weeks="false" />
 		<div v-show="minimized" class="flex-grow-1 overflow-scroll">
 			<div v-if="events === null" class="d-flex h-100 justify-content-center align-items-center">
 				<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
 			</div>
 			<div v-else-if="currentEvents.length" class="list-group list-group-flush">
-				<div @click="showLvUebersicht(evt)" class="" v-for="evt in currentEvents" :key="evt.id" class="list-group-item small" :style="{'background-color':evt.color}">
+				<div role="button" @click="showLvUebersicht(evt)" class="" v-for="evt in currentEvents" :key="evt.id" class="list-group-item small" :style="{'background-color':evt.color}">
 					<b>{{evt.title}}</b>
 					<br>
 					<small class="d-flex w-100 justify-content-between">
-						<span @click="showRoomInfo(evt.ort_kurzbz)" style="text-decoration:underline" type="button">{{evt.ort_kurzbz}}</span>
+						<!-- event modifier stop to prevent opening the modal for the lv Uebersicht when clicking on the ort_kurzbz -->
+						<!-- old event: showRoomInfo(evt.ort_kurzbz) -->
+						<span @click.stop="showRoomInfoModal(evt.ort_kurzbz)" style="text-decoration:underline" type="button">{{evt.ort_kurzbz}}</span>
 						<span>{{evt.start.toLocaleTimeString(undefined, {hour:'numeric',minute:'numeric'})}}-{{evt.end.toLocaleTimeString(undefined, {hour:'numeric',minute:'numeric'})}}</span>
 					</small>
 				</div>

From 629ea3716ebeadba3dea204d3c0541941800c21b Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 19 Jun 2024 11:15:06 +0200
Subject: [PATCH 0836/1461] changes how the content and the news are displayed
 and also modifies the modals for the roominformation which now get their data
 from props instead of passing them directly via refs

---
 application/controllers/CisHmvc/Cms.php       | 11 +--
 application/controllers/CisHtml/Cms.php       | 11 +--
 application/controllers/CisVue/Cms.php        | 11 +--
 .../controllers/api/frontend/v1/Cms.php       | 98 +++++++++++++++++++
 application/views/CisHmvc/Cms/Content.php     |  5 +-
 application/views/CisHtml/Cms/Content.php     |  3 +-
 application/views/CisVue/Cms/Content.php      |  4 +-
 public/js/api/cms.js                          | 15 +++
 public/js/api/fhcapifactory.js                |  2 +
 public/js/api/ort.js                          | 12 +--
 public/js/apps/Cis/Cms.js                     | 10 +-
 public/js/components/Bootstrap/Modal.js       |  2 +-
 public/js/components/Cis/Cms/Content.js       | 48 +++++----
 public/js/components/Cis/Cms/ContentModal.js  | 38 +++++--
 public/js/components/Cis/Cms/News.js          | 34 +++++++
 .../components/DashboardWidget/Stundenplan.js | 34 +++----
 16 files changed, 249 insertions(+), 89 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/Cms.php
 create mode 100644 public/js/api/cms.js
 create mode 100644 public/js/components/Cis/Cms/News.js

diff --git a/application/controllers/CisHmvc/Cms.php b/application/controllers/CisHmvc/Cms.php
index eed1a5fea..544e3d6bb 100755
--- a/application/controllers/CisHmvc/Cms.php
+++ b/application/controllers/CisHmvc/Cms.php
@@ -69,12 +69,11 @@ class Cms extends Auth_Controller
 	 */
 	public function content($content_id, $version = null, $sprache = null, $sichtbar = true)
 	{
-		$content = $this->cmslib->getContent($content_id, $version, $sprache, $sichtbar);
-
-		if (isError($content))
-			return $this->load->view('CisHmvc/Error', ['error' => getError($content)]);
-
-		$this->load->view('CisHmvc/Cms/Content', ['content' => getData($content)]);
+		// return early if the content_id for the content is missing
+		if(!isset($content_id))
+			$this->terminateWithError("content_id is missing");
+		
+		$this->load->view('CisHtml/Cms/Content', ['content_id' => $content_id, 'version' => $version, 'sprache' => $sprache, 'sichtbar' => $sichtbar]);
 	}
 
 	/**
diff --git a/application/controllers/CisHtml/Cms.php b/application/controllers/CisHtml/Cms.php
index f56b3eea3..5223fd4e5 100755
--- a/application/controllers/CisHtml/Cms.php
+++ b/application/controllers/CisHtml/Cms.php
@@ -45,12 +45,11 @@ class Cms extends FHC_Controller
 	 */
 	public function content($content_id, $version = null, $sprache = null, $sichtbar = true)
 	{
-		$content = $this->cmslib->getContent($content_id, $version, $sprache, $sichtbar);
-
-		if (isError($content))
-			return $this->load->view('CisHtml/Error', ['error' => getError($content)]);
-
-		$this->load->view('CisHtml/Cms/Content', ['content' => getData($content)]);
+		// return early if the content_id for the content is missing
+		if(!isset($content_id))
+			$this->terminateWithError("content_id is missing");
+		
+		$this->load->view('CisHtml/Cms/Content', ['content_id' => $content_id, 'version' => $version, 'sprache' => $sprache, 'sichtbar' => $sichtbar]);
 	}
 
 	/**
diff --git a/application/controllers/CisVue/Cms.php b/application/controllers/CisVue/Cms.php
index 2c1fa1fc6..74b8d19ee 100755
--- a/application/controllers/CisVue/Cms.php
+++ b/application/controllers/CisVue/Cms.php
@@ -39,12 +39,11 @@ class Cms extends FHC_Controller
 	 */
 	public function content($content_id, $version = null, $sprache = null, $sichtbar = true)
 	{
-		$content = $this->cmslib->getContent($content_id, $version, $sprache, $sichtbar);
-
-		if (isError($content))
-			return $this->load->view('CisHtml/Error', ['error' => getError($content)]);
-
-		$this->load->view('CisHtml/Cms/Content', ['content' => getData($content)]);
+		// return early if the content_id for the content is missing
+		if(!isset($content_id))
+			$this->terminateWithError("content_id is missing");
+		
+		$this->load->view('CisHtml/Cms/Content', ['content_id' => $content_id, 'version' => $version, 'sprache' => $sprache, 'sichtbar' => $sichtbar]);
 	}
 
 	/**
diff --git a/application/controllers/api/frontend/v1/Cms.php b/application/controllers/api/frontend/v1/Cms.php
new file mode 100644
index 000000000..f54353e28
--- /dev/null
+++ b/application/controllers/api/frontend/v1/Cms.php
@@ -0,0 +1,98 @@
+<?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');
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the SearchBarLib (back-end)
+ * Provides data to the ajax get calls about the searchbar component
+ * This controller works with JSON calls on the HTTP GET and the output is always JSON
+ */
+class Cms extends FHCAPI_Controller
+{
+	
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+		// NOTE(chris): additional permission checks will be done in SearchBarLib
+		parent::__construct([
+			'ContentID' => self::PERM_LOGGED,
+			'getOrtKurzbzContent' => self::PERM_LOGGED,
+            'content' => self::PERM_LOGGED,
+		]);
+
+		$this->load->library('CmsLib');
+
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+    /**
+	 * Gets a JSON body via HTTP POST and provides the parameters
+	 */
+    public function content()
+	{
+        // getting the get parameters
+        $content_id = $this->input->get("content_id",TRUE);
+        $version = $this->input->get("version",TRUE);
+        $sprache = $this->input->get("sprache",TRUE);
+        $sichtbar = $this->input->get("sichtbar",TRUE);
+
+        // return early if the content_id is missing
+		if(!isset($content_id))
+			$this->terminateWithError("content_id is missing", self::ERROR_TYPE_GENERAL);
+
+		$content = $this->cmslib->getContent($content_id, $version, $sprache, $sichtbar);
+
+		if (isError($content))
+            $this->terminateWithError(getError($content), self::ERROR_TYPE_GENERAL);
+        
+		$this->terminateWithSuccess(getData($content));
+	}
+
+	/**
+	 * Gets a JSON body via HTTP POST and provides the parameters
+	 */
+	public function ContentID()
+	{
+		// if error
+		//$this->terminateWithError(SearchBarLib::ERROR_WRONG_JSON, self::ERROR_TYPE_GENERAL);
+		
+		$ort_kurzbz = $this->input->get('ort_kurzbz',TRUE);
+		
+		if(!$ort_kurzbz){
+			$this->terminateWithError("missing ort_kurzbz parameter", self::ERROR_TYPE_GENERAL);
+		}
+
+		$result = $this->OrtModel->getContentID($ort_kurzbz);
+		
+		if(isError($result)){
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+
+		$result = hasData($result) ? current(getData($result)) : null;
+		
+		$this->terminateWithSuccess($result->content_id ?? NULL);
+	}
+
+	
+}
+
diff --git a/application/views/CisHmvc/Cms/Content.php b/application/views/CisHmvc/Cms/Content.php
index 7ca1347d3..f56c45eb6 100755
--- a/application/views/CisHmvc/Cms/Content.php
+++ b/application/views/CisHmvc/Cms/Content.php
@@ -10,11 +10,10 @@ $includesArray = array(
 
 $this->load->view('templates/FHC-Header', $includesArray);
 ?>
-
 <div id="cms">
-<?php echo (isset($content) ? $content : '<content/>'); ?>
+
+<?php echo (isset($content_id) ? '<cms-content :content_id="'.$content_id.'" :version="'.$version.'" :sprache="'.$sprache.'" :sichtbar="'.$sichtbar.'" />' : '<cms-news/>'); ?>
 	
 </div>
-
 <?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
 
diff --git a/application/views/CisHtml/Cms/Content.php b/application/views/CisHtml/Cms/Content.php
index ac62c985a..d3e03ea04 100755
--- a/application/views/CisHtml/Cms/Content.php
+++ b/application/views/CisHtml/Cms/Content.php
@@ -12,8 +12,9 @@ $this->load->view('templates/CISHTML-Header', $includesArray);
 ?>
 
 <div id="cms">
-<?php echo (isset($content) ? $content : '<content/>'); ?>
 
+<?php echo (isset($content_id) ? '<cms-content :content_id="'.$content_id.'" :version="'.$version.'" :sprache="'.$sprache.'" :sichtbar="'.$sichtbar.'" />' : '<cms-news/>'); ?>
+	
 </div>
 
 <?php $this->load->view('templates/CISHTML-Footer', $includesArray); ?>
\ No newline at end of file
diff --git a/application/views/CisVue/Cms/Content.php b/application/views/CisVue/Cms/Content.php
index 02aa42b57..ed9d90ef2 100755
--- a/application/views/CisVue/Cms/Content.php
+++ b/application/views/CisVue/Cms/Content.php
@@ -11,7 +11,9 @@ $this->load->view('templates/CISVUE-Header', $includesArray);
 ?>
 
 <div id="cms">
-<?php echo (isset($content) ? $content : '<content/>'); ?>
+
+<?php echo (isset($content_id) ? '<cms-content :content_id="'.$content_id.'" :version="'.$version.'" :sprache="'.$sprache.'" :sichtbar="'.$sichtbar.'" />' : '<cms-news/>'); ?>
+	
 </div>
 
 <?php $this->load->view('templates/CISVUE-Footer', $includesArray); ?>
diff --git a/public/js/api/cms.js b/public/js/api/cms.js
new file mode 100644
index 000000000..5602c7bf8
--- /dev/null
+++ b/public/js/api/cms.js
@@ -0,0 +1,15 @@
+export default {
+    content(content_id, version=null, sprache=null, sichtbar=null) {
+          return this.$fhcApi.get(
+              FHC_JS_DATA_STORAGE_OBJECT.app_root +
+              FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+              "/api/frontend/v1/Cms/content",
+              { content_id: content_id,
+                ...(version?{version}:{}),
+                ...(sprache?{sprache}:{}),
+                ...(sichtbar?{sichtbar}:{}),
+              }
+          );
+      },
+   
+  }
\ No newline at end of file
diff --git a/public/js/api/fhcapifactory.js b/public/js/api/fhcapifactory.js
index a41730548..31c6fe9ab 100644
--- a/public/js/api/fhcapifactory.js
+++ b/public/js/api/fhcapifactory.js
@@ -21,6 +21,7 @@ import navigation from "./navigation.js";
 import filter from "./filter.js";
 import studstatus from "./studstatus.js";
 import ort from "./ort.js";
+import cms from "./cms.js";
 
 export default {
     search,
@@ -29,4 +30,5 @@ export default {
     filter,
     studstatus,
     ort,
+    cms,
 };
diff --git a/public/js/api/ort.js b/public/js/api/ort.js
index c92ac0be0..4c8e2ce73 100644
--- a/public/js/api/ort.js
+++ b/public/js/api/ort.js
@@ -1,18 +1,10 @@
 export default {
-  getContentID($ort_kurbz) {
+  getContentID(ort_kurbz) {
 		return this.$fhcApi.get(
             FHC_JS_DATA_STORAGE_OBJECT.app_root +
             FHC_JS_DATA_STORAGE_OBJECT.ci_router +
             "/api/frontend/v1/Ort/ContentID",
-			{ ort_kurzbz: $ort_kurbz }
-		);
-	},
-  getOrtKuzbzContent($ort_kurzbz_content_id) {
-		return this.$fhcApi.get(
-            FHC_JS_DATA_STORAGE_OBJECT.app_root +
-            FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-            "/api/frontend/v1/Ort/getOrtKurzbzContent",
-			{ content_id: $ort_kurzbz_content_id }
+			{ ort_kurzbz: ort_kurbz }
 		);
 	},
 }
\ No newline at end of file
diff --git a/public/js/apps/Cis/Cms.js b/public/js/apps/Cis/Cms.js
index cd2b5f6e9..dd059fb92 100755
--- a/public/js/apps/Cis/Cms.js
+++ b/public/js/apps/Cis/Cms.js
@@ -1,13 +1,14 @@
 import BsConfirm from "../../components/Bootstrap/Confirm.js";
 //import Pagination from "../../components/Pagination/Pagination.js";
-import Content from "../../components/Cis/Cms/Content.js";
-import Fhcapi from "../api/fhcapifactory.js";
+import CmsNews from "../../components/Cis/Cms/News.js";
+import CmsContent from "../../components/Cis/Cms/Content.js";
+import Fhcapi from "../../plugin/FhcApi.js";
 
-Vue.$fhcapi = Fhcapi;
 
 const app = Vue.createApp({
   components: {
-    Content,
+    CmsNews,
+    CmsContent,
   },
   mounted() {
     document.querySelectorAll("#cms [data-confirm]").forEach((el) => {
@@ -34,5 +35,6 @@ const app = Vue.createApp({
   },
 });
 app.use(primevue.config.default, { zIndex: { overlay: 9999 } });
+app.use(Fhcapi);
 app.mount("#cms");
 //#cms [data-confirm], #cms [data-href]
diff --git a/public/js/components/Bootstrap/Modal.js b/public/js/components/Bootstrap/Modal.js
index 734a3bdb9..e390319e8 100755
--- a/public/js/components/Bootstrap/Modal.js
+++ b/public/js/components/Bootstrap/Modal.js
@@ -109,7 +109,7 @@ export default {
 			document.body.appendChild(wrapper);
 		});
 	},
-	template: `<div ref="modal" class="bootstrap-modal modal" tabindex="-1" @[\`hide.bs.modal\`]="$emit('hideBsModal')" @[\`hidden.bs.modal\`]="$emit('hiddenBsModal')" @[\`hidePrevented.bs.modal\`]="$emit('hidePreventedBsModal')" @[\`show.bs.modal\`]="$emit('showBsModal')" @[\`shown.bs.modal\`]="$emit('shownBsModal')">
+	template: `<div ref="modal" class="bootstrap-modal modal" tabindex="-1" @[\`hide.bs.modal\`]="$emit('hideBsModal')" @[\`hidden.bs.modal\`]="$emit('hiddenBsModal')" @[\`hidePrevented.bs.modal\`]="$emit('hidePreventedBsModal')" @[\`show.bs.modal\`]="$emit('showBsModal')" >
 		<div class="modal-dialog" :class="dialogClass">
 			<div class="modal-content">
 				<div v-if="$slots.title" class="modal-header">
diff --git a/public/js/components/Cis/Cms/Content.js b/public/js/components/Cis/Cms/Content.js
index bac28c23c..aa67ded2c 100644
--- a/public/js/components/Cis/Cms/Content.js
+++ b/public/js/components/Cis/Cms/Content.js
@@ -1,34 +1,40 @@
-import Pagination from "../../Pagination/Pagination.js";
 
 export default {
-  components: {
-    Pagination,
+  props:{
+    content_id:{
+        type:Number,
+        required:true,
+    },
+    version:{
+        type:[String, Number],
+        default: null,
+    },
+    sprache:{
+        type:[String, Number],
+        default: null,
+    },
+    sichtbar:{
+        type:[String, Number],
+        default: null,
+    }
+
+
   },
   data() {
     return {
       content: null,
-      maxPageCount: 0,
-      page_size: 10,
+      
     };
   },
-  methods: {
-    loadNewPageContent: function (data) {
-      Vue.$fhcapi.Cms.getNews(data.page, data.rows).then((result) => {
-        this.content = result.data;
-      });
-    },
-  },
   created() {
-    Vue.$fhcapi.Cms.getNews(1, this.page_size).then((result) => {
-      this.content = result.data;
-    });
-
-    Vue.$fhcapi.Cms.getNewsRowCount().then((result) => {
-      this.maxPageCount = result.data;
+    console.log("this is the api", this.$fhcApi);
+    this.$fhcApi.factory.cms.content(this.content_id,this.version, this.sprache, this.sichtbar).then(res =>{
+        this.content = res.data;
     });
   },
   template: /*html*/ `
-    <pagination :page_size="page_size"  @page="loadNewPageContent" :maxPageCount="maxPageCount">
-    <div v-html="content"></div>
-    </pagination>`,
+    <!-- div that contains the content -->
+    <div v-if="content" v-html="content"></div>
+    <p v-else>No content is available to display</p>
+    `,
 };
diff --git a/public/js/components/Cis/Cms/ContentModal.js b/public/js/components/Cis/Cms/ContentModal.js
index 3613648ee..0a5903ccc 100644
--- a/public/js/components/Cis/Cms/ContentModal.js
+++ b/public/js/components/Cis/Cms/ContentModal.js
@@ -9,35 +9,53 @@ export default {
     components:{
         BsModal,
     },
+    props:{
+        contentID:{
+            type: Number,
+            required: true,
+        },
+        ort_kurzbz:{
+            type: String,
+            required: true,
+        }
+    },
     data(){
         return{
-            content_id:null,
-            content:null,
-            ort_kurzbz:null,
             result: false,
+            content: null,
         };
     },
+    
     methods:{
+        modalHidden: function(){
+            // reseting the content of the modal
+            this.content = null;
+        },
+        // this method is always called when the modal is shown
         modalShown: function(){
             
-        }
+            if(this.contentID){
+                this.$fhcApi.factory.cms.content(this.contentID).then(res =>{
+                this.content = res.data;
+                
+                })
+            } 
+        },
     },
     mounted(){
         this.modal = this.$refs.modalContainer;
-        document.addEventListener("show.bs.modal", function(){
-            console.log("modal is shown inside the mounted hook")
-        })  
+          
     },
     
     template:/*html*/`
-    <bs-modal @showBsModal="modalShown" ref="modalContainer" dialogClass="modal-lg">
+    <bs-modal @hideBsModal="modalHidden" @showBsModal="modalShown" ref="modalContainer" dialogClass="modal-lg">
         <template #title>
             <span v-if="ort_kurzbz">{{ort_kurzbz}}</span>
-            <span v-else>Ort Übersicht</span>
+            <span v-else>Raum Informationen</span>
         </template>
         <template #default>
             <div v-if="content" v-html="content"></div>
-            <div v-else>this is the else div</div>
+            <div v-else>Der Content für diesen Raum konnte nicht geladen werden</div>
         </template>
         <template #footer>
             <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
diff --git a/public/js/components/Cis/Cms/News.js b/public/js/components/Cis/Cms/News.js
new file mode 100644
index 000000000..bac28c23c
--- /dev/null
+++ b/public/js/components/Cis/Cms/News.js
@@ -0,0 +1,34 @@
+import Pagination from "../../Pagination/Pagination.js";
+
+export default {
+  components: {
+    Pagination,
+  },
+  data() {
+    return {
+      content: null,
+      maxPageCount: 0,
+      page_size: 10,
+    };
+  },
+  methods: {
+    loadNewPageContent: function (data) {
+      Vue.$fhcapi.Cms.getNews(data.page, data.rows).then((result) => {
+        this.content = result.data;
+      });
+    },
+  },
+  created() {
+    Vue.$fhcapi.Cms.getNews(1, this.page_size).then((result) => {
+      this.content = result.data;
+    });
+
+    Vue.$fhcapi.Cms.getNewsRowCount().then((result) => {
+      this.maxPageCount = result.data;
+    });
+  },
+  template: /*html*/ `
+    <pagination :page_size="page_size"  @page="loadNewPageContent" :maxPageCount="maxPageCount">
+    <div v-html="content"></div>
+    </pagination>`,
+};
diff --git a/public/js/components/DashboardWidget/Stundenplan.js b/public/js/components/DashboardWidget/Stundenplan.js
index 3a1d3484c..0bca15284 100755
--- a/public/js/components/DashboardWidget/Stundenplan.js
+++ b/public/js/components/DashboardWidget/Stundenplan.js
@@ -2,7 +2,7 @@ import Phrasen from '../../mixins/Phrasen.js';
 import AbstractWidget from './Abstract.js';
 import FhcCalendar from '../Calendar/Calendar.js';
 import LvUebersicht from '../Cis/Mylv/LvUebersicht.js';
-import ContentModal from '../Cis/Cms/ContentModal.js'
+import ContentModal from '../Cis/Cms/ContentModal.js';
 
 export default {
 	mixins: [
@@ -21,7 +21,8 @@ export default {
 			minimized: true,
 			events: null,
 			currentDay: new Date(),
-			
+			roomInfoContentID: null,
+			ort_kurzbz: null,
 		}
 	},
 	computed: {
@@ -41,26 +42,18 @@ export default {
 
 			// getting the content_id of the ort_kurzbz
 			this.$fhcApi.factory.ort.getContentID(ort_kurzbz).then(res =>{
+				this.roomInfoContentID = res.data;
+				this.ort_kurzbz = ort_kurzbz;
 
-				let ort_kurzbz_content_id = res.data;
-
-				this.$refs.contentModal.content_id = ort_kurzbz_content_id;
-
-				this.$fhcApi.factory.ort.getOrtKuzbzContent(ort_kurzbz_content_id).then(res =>{
-					let result = res.data;
-					console.log("this is the result of the query", result);
-					this.$refs.contentModal.content = result;
-					this.$refs.contentModal.ort_kurzbz = ort_kurzbz;
-					if(this.$refs.contentModal.content){
-						this.$refs.contentModal.show();
-					}
-					
-
-				})
-
+				// only showing the modal after vue was able to set the reactive data
+				Vue.nextTick(()=>{this.$refs.contentModal.show();});
 				
 				
-			})
+			}).catch(err =>{
+				console.err(err);
+				this.ort_kurzbz = null;
+				this.roomInfoContentID = null;
+			});
 			
 		},
 		showLvUebersicht: function (event){
@@ -75,6 +68,7 @@ export default {
 			this.currentDay = day;
 			this.minimized = true;
 		},
+		// this function was the alternative of showing the room information in the content component instead of showing the room information inside a modal
 		showRoomInfo: function($ort_kurzbz){
 			
 			this.$fhcApi.factory.ort.getContentID($ort_kurzbz).then(res =>{
@@ -118,7 +112,7 @@ export default {
 	template: /*html*/`
 	<div class="dashboard-widget-stundenplan d-flex flex-column h-100">
 		<lv-uebersicht ref="lvUebersicht"  />
-		<content-modal ref="contentModal"  />
+		<content-modal :contentID="roomInfoContentID" :ort_kurzbz="" dialogClass="modal-lg" ref="contentModal"/>
 		<fhc-calendar :initial-date="currentDay" class="border-0" class-header="p-0" @select:day="selectDay" v-model:minimized="minimized" :events="events" no-week-view :show-weeks="false" />
 		<div v-show="minimized" class="flex-grow-1 overflow-scroll">
 			<div v-if="events === null" class="d-flex h-100 justify-content-center align-items-center">

From f8c431e0bcf4e9f39b60e76a24829bf8162c3fc1 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 20 Jun 2024 16:08:49 +0200
Subject: [PATCH 0837/1461] updating comment of the content function

---
 application/controllers/api/frontend/v1/Cms.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/controllers/api/frontend/v1/Cms.php b/application/controllers/api/frontend/v1/Cms.php
index f54353e28..5877de709 100644
--- a/application/controllers/api/frontend/v1/Cms.php
+++ b/application/controllers/api/frontend/v1/Cms.php
@@ -46,7 +46,7 @@ class Cms extends FHCAPI_Controller
 	// Public methods
 
     /**
-	 * Gets a JSON body via HTTP POST and provides the parameters
+	 * fetches the content with the content_id and additional parameters
 	 */
     public function content()
 	{

From 7267d526bbdd75774a8dc4489c693e53991fdf2b Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 21 Jun 2024 12:01:04 +0200
Subject: [PATCH 0838/1461] rendering content pages

---
 application/controllers/CisHmvc/Cms.php       | 14 ++++++--
 application/controllers/CisHtml/Cms.php       | 14 ++++++--
 application/controllers/CisVue/Cms.php        | 17 ++++++++--
 application/libraries/CmsLib.php              | 10 ++++--
 application/views/CisHmvc/Cms/Content.php     | 16 +++++++--
 application/views/CisHtml/Cms/Content.php     | 15 +++++++--
 application/views/CisVue/Cms/Content.php      |  9 +++++
 public/js/components/Cis/Cms/Content.js       | 11 +++++--
 .../Cms/Content_types/Raum_contentmittitel.js | 33 +++++++++++++++++++
 9 files changed, 122 insertions(+), 17 deletions(-)
 create mode 100644 public/js/components/Cis/Cms/Content_types/Raum_contentmittitel.js

diff --git a/application/controllers/CisHmvc/Cms.php b/application/controllers/CisHmvc/Cms.php
index 544e3d6bb..e01313521 100755
--- a/application/controllers/CisHmvc/Cms.php
+++ b/application/controllers/CisHmvc/Cms.php
@@ -72,8 +72,18 @@ class Cms extends Auth_Controller
 		// return early if the content_id for the content is missing
 		if(!isset($content_id))
 			$this->terminateWithError("content_id is missing");
-		
-		$this->load->view('CisHtml/Cms/Content', ['content_id' => $content_id, 'version' => $version, 'sprache' => $sprache, 'sichtbar' => $sichtbar]);
+
+		$content = $this->ContentModel->load($content_id);		
+		if (isError($content))
+			$this->terminateWithError(getError($content));	
+
+		$content = getData($content);
+		if(NULL === $content)
+			$this->terminateWithError("Content not found");
+
+		$content = current($content);
+
+		$this->load->view('CisVue/Cms/Content', ['content_id' => $content_id, 'template_kurzbz'=>$content->template_kurzbz , 'version' => $version, 'sprache' => $sprache, 'sichtbar' => $sichtbar]);
 	}
 
 	/**
diff --git a/application/controllers/CisHtml/Cms.php b/application/controllers/CisHtml/Cms.php
index 5223fd4e5..6cb43c8bc 100755
--- a/application/controllers/CisHtml/Cms.php
+++ b/application/controllers/CisHtml/Cms.php
@@ -48,8 +48,18 @@ class Cms extends FHC_Controller
 		// return early if the content_id for the content is missing
 		if(!isset($content_id))
 			$this->terminateWithError("content_id is missing");
-		
-		$this->load->view('CisHtml/Cms/Content', ['content_id' => $content_id, 'version' => $version, 'sprache' => $sprache, 'sichtbar' => $sichtbar]);
+
+		$content = $this->ContentModel->load($content_id);		
+		if (isError($content))
+			$this->terminateWithError(getError($content));	
+
+		$content = getData($content);
+		if(NULL === $content)
+			$this->terminateWithError("Content not found");
+
+		$content = current($content);
+
+		$this->load->view('CisVue/Cms/Content', ['content_id' => $content_id, 'template_kurzbz'=>$content->template_kurzbz , 'version' => $version, 'sprache' => $sprache, 'sichtbar' => $sichtbar]);
 	}
 
 	/**
diff --git a/application/controllers/CisVue/Cms.php b/application/controllers/CisVue/Cms.php
index 74b8d19ee..cf9519e28 100755
--- a/application/controllers/CisVue/Cms.php
+++ b/application/controllers/CisVue/Cms.php
@@ -24,6 +24,9 @@ class Cms extends FHC_Controller
 		$this->loadPhrases([
 			'global'
 		]);
+
+		$this->load->model('content/Content_model', 'ContentModel');
+		
 	}
 
 	// -----------------------------------------------------------------------------------------------------------------
@@ -42,8 +45,18 @@ class Cms extends FHC_Controller
 		// return early if the content_id for the content is missing
 		if(!isset($content_id))
 			$this->terminateWithError("content_id is missing");
-		
-		$this->load->view('CisHtml/Cms/Content', ['content_id' => $content_id, 'version' => $version, 'sprache' => $sprache, 'sichtbar' => $sichtbar]);
+
+		$content = $this->ContentModel->load($content_id);		
+		if (isError($content))
+			$this->terminateWithError(getError($content));	
+
+		$content = getData($content);
+		if(NULL === $content)
+			$this->terminateWithError("Content not found");
+
+		$content = current($content);
+
+		$this->load->view('CisVue/Cms/Content', ['content_id' => $content_id, 'template_kurzbz'=>$content->template_kurzbz , 'version' => $version, 'sprache' => $sprache, 'sichtbar' => $sichtbar]);
 	}
 
 	/**
diff --git a/application/libraries/CmsLib.php b/application/libraries/CmsLib.php
index 9a898df85..aee6f5c61 100755
--- a/application/libraries/CmsLib.php
+++ b/application/libraries/CmsLib.php
@@ -110,10 +110,14 @@ class CmsLib
 		$processor = new XSLTProcessor();
 		$processor->importStylesheet($xsltemplate);
 
-		$content = $processor->transformToXML($XML);
-		$content = str_replace('dms.php', APP_ROOT . 'cms/dms.php', $content);
+		
+		$transformed_content = $processor->transformToXML($XML);
+		$transformed_content = str_replace('dms.php', APP_ROOT . 'cms/dms.php', $transformed_content);
 
-		return success($content);
+		return success([
+			"type"=>$content->template_kurzbz,
+			"content"=>$transformed_content
+		]);
 	}
 
 	/**
diff --git a/application/views/CisHmvc/Cms/Content.php b/application/views/CisHmvc/Cms/Content.php
index f56c45eb6..bf54d9d5f 100755
--- a/application/views/CisHmvc/Cms/Content.php
+++ b/application/views/CisHmvc/Cms/Content.php
@@ -1,19 +1,29 @@
 <?php
 $includesArray = array(
-	'title' => 'FH-Complete',
 	'customJSModules' => ['public/js/apps/Cis/Cms.js'],
+	'primevue3'=>true,
 	'customCSSs' => [
 		'public/css/Cis4/Cms.css',
 		#'skin/style.css.php'
 	]
 );
 
-$this->load->view('templates/FHC-Header', $includesArray);
+switch($template_kurzbz){
+	case 'raum_contentmittitel': 
+		$includesArray['tabulator5'] = true; 
+		break;
+}
+
+$this->load->view('templates/CISVUE-Header', $includesArray);
 ?>
+
+
+
 <div id="cms">
 
 <?php echo (isset($content_id) ? '<cms-content :content_id="'.$content_id.'" :version="'.$version.'" :sprache="'.$sprache.'" :sichtbar="'.$sichtbar.'" />' : '<cms-news/>'); ?>
 	
 </div>
-<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
+
+<?php $this->load->view('templates/CISVUE-Footer', $includesArray); ?>
 
diff --git a/application/views/CisHtml/Cms/Content.php b/application/views/CisHtml/Cms/Content.php
index d3e03ea04..bf54d9d5f 100755
--- a/application/views/CisHtml/Cms/Content.php
+++ b/application/views/CisHtml/Cms/Content.php
@@ -1,20 +1,29 @@
 <?php
 $includesArray = array(
-	'primevue3' => true,
 	'customJSModules' => ['public/js/apps/Cis/Cms.js'],
+	'primevue3'=>true,
 	'customCSSs' => [
 		'public/css/Cis4/Cms.css',
 		#'skin/style.css.php'
 	]
 );
 
-$this->load->view('templates/CISHTML-Header', $includesArray);
+switch($template_kurzbz){
+	case 'raum_contentmittitel': 
+		$includesArray['tabulator5'] = true; 
+		break;
+}
+
+$this->load->view('templates/CISVUE-Header', $includesArray);
 ?>
 
+
+
 <div id="cms">
 
 <?php echo (isset($content_id) ? '<cms-content :content_id="'.$content_id.'" :version="'.$version.'" :sprache="'.$sprache.'" :sichtbar="'.$sichtbar.'" />' : '<cms-news/>'); ?>
 	
 </div>
 
-<?php $this->load->view('templates/CISHTML-Footer', $includesArray); ?>
\ No newline at end of file
+<?php $this->load->view('templates/CISVUE-Footer', $includesArray); ?>
+
diff --git a/application/views/CisVue/Cms/Content.php b/application/views/CisVue/Cms/Content.php
index ed9d90ef2..bf54d9d5f 100755
--- a/application/views/CisVue/Cms/Content.php
+++ b/application/views/CisVue/Cms/Content.php
@@ -1,15 +1,24 @@
 <?php
 $includesArray = array(
 	'customJSModules' => ['public/js/apps/Cis/Cms.js'],
+	'primevue3'=>true,
 	'customCSSs' => [
 		'public/css/Cis4/Cms.css',
 		#'skin/style.css.php'
 	]
 );
 
+switch($template_kurzbz){
+	case 'raum_contentmittitel': 
+		$includesArray['tabulator5'] = true; 
+		break;
+}
+
 $this->load->view('templates/CISVUE-Header', $includesArray);
 ?>
 
+
+
 <div id="cms">
 
 <?php echo (isset($content_id) ? '<cms-content :content_id="'.$content_id.'" :version="'.$version.'" :sprache="'.$sprache.'" :sichtbar="'.$sichtbar.'" />' : '<cms-news/>'); ?>
diff --git a/public/js/components/Cis/Cms/Content.js b/public/js/components/Cis/Cms/Content.js
index aa67ded2c..efd1de7e8 100644
--- a/public/js/components/Cis/Cms/Content.js
+++ b/public/js/components/Cis/Cms/Content.js
@@ -1,3 +1,5 @@
+import raum_contentmittitel from './Content_types/Raum_contentmittitel.js'
+
 
 export default {
   props:{
@@ -19,6 +21,9 @@ export default {
     }
 
 
+  },
+  components:{
+    raum_contentmittitel,
   },
   data() {
     return {
@@ -29,12 +34,14 @@ export default {
   created() {
     console.log("this is the api", this.$fhcApi);
     this.$fhcApi.factory.cms.content(this.content_id,this.version, this.sprache, this.sichtbar).then(res =>{
-        this.content = res.data;
+        this.content = res.data.content;
+        this.content_type = res.data.type;
     });
   },
   template: /*html*/ `
     <!-- div that contains the content -->
-    <div v-if="content" v-html="content"></div>
+    <component :is="content_type" v-if="content" :content="content" />
     <p v-else>No content is available to display</p>
+
     `,
 };
diff --git a/public/js/components/Cis/Cms/Content_types/Raum_contentmittitel.js b/public/js/components/Cis/Cms/Content_types/Raum_contentmittitel.js
new file mode 100644
index 000000000..9c0b2105f
--- /dev/null
+++ b/public/js/components/Cis/Cms/Content_types/Raum_contentmittitel.js
@@ -0,0 +1,33 @@
+
+export default {
+    props:{
+      content:{
+          type:String,
+          required:true,
+      },
+    },
+    mounted(){
+        let tables = document.getElementsByClassName("tablesorter");
+        
+        for(let table of tables){
+            new Tabulator(table, {
+                layout:"fitDataStretch",
+               
+                columnDefaults:{
+                    formatter:"html",
+                    resizable:false,
+                    minWidth: "100px",
+                }
+            })
+
+            table.classList.add("mx-auto");
+            table.style.width="30em"; 
+        }
+    },
+    template: /*html*/ `
+      <!-- div that contains the content -->
+      <div v-html="content" v-if="content" :content="content" />
+      <p v-else>Content was not found</p>
+      `,
+  };
+  
\ No newline at end of file

From 27287bd07ad1fed8e3b35f6729ddf3e1039627de Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 24 Jun 2024 16:05:51 +0200
Subject: [PATCH 0839/1461] creating the api endpoint that fetches the content
 of the news instead of text metdata

---
 .../controllers/api/frontend/v1/Cms.php       | 46 +++++++++++++++++--
 application/models/content/News_model.php     | 13 +++++-
 public/js/api/cms.js                          |  8 ++++
 public/js/components/DashboardWidget/News.js  | 13 +++---
 4 files changed, 68 insertions(+), 12 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Cms.php b/application/controllers/api/frontend/v1/Cms.php
index 5877de709..07a705e49 100644
--- a/application/controllers/api/frontend/v1/Cms.php
+++ b/application/controllers/api/frontend/v1/Cms.php
@@ -36,12 +36,29 @@ class Cms extends FHCAPI_Controller
 			'ContentID' => self::PERM_LOGGED,
 			'getOrtKurzbzContent' => self::PERM_LOGGED,
             'content' => self::PERM_LOGGED,
+			'news' => self::PERM_LOGGED,
 		]);
 
 		$this->load->library('CmsLib');
 
 	}
 
+	//------------------------------------------------------------------------------------------------------------------
+	// Private methods
+
+	private function fetchContent($content_id){
+		$content = $this->cmslib->getContent($content_id);
+
+		if (isError($content))
+            $this->terminateWithError(getError($content), self::ERROR_TYPE_GENERAL);
+
+		if(getData($content)){
+			return getData($content);
+		}else{
+			$this->terminateWithError("No content was found", self::ERROR_TYPE_GENERAL);
+		}
+	}
+
 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods
 
@@ -60,11 +77,8 @@ class Cms extends FHCAPI_Controller
 		if(!isset($content_id))
 			$this->terminateWithError("content_id is missing", self::ERROR_TYPE_GENERAL);
 
-		$content = $this->cmslib->getContent($content_id, $version, $sprache, $sichtbar);
+		$content = $this->fetchContent($content_id); 
 
-		if (isError($content))
-            $this->terminateWithError(getError($content), self::ERROR_TYPE_GENERAL);
-        
 		$this->terminateWithSuccess(getData($content));
 	}
 
@@ -93,6 +107,30 @@ class Cms extends FHCAPI_Controller
 		$this->terminateWithSuccess($result->content_id ?? NULL);
 	}
 
+	public function news()
+	{
+		$limit =  $this->input->get('limit',TRUE);
+
+        // return early if the limit parameter is missing or is not greater than 0
+        if(!isset($limit) and $limit > 0)
+            $this->terminateWithError("limit parameter is missing", self::ERROR_TYPE_GENERAL);
+
+        $this->load->model('content/news_model', 'NewsModel');
+        
+		$news_content_ids = $this->NewsModel->getNewsContentIDs($limit);
+        $news_content = array();
+
+		if(isError($news_content_ids))
+			$this->terminateWithError(getError($news_content_ids), self::ERROR_TYPE_GENERAL);
+		
+		foreach(getData($news_content_ids) as $content_id){
+			$news_content[] = $this->fetchContent($content_id->content_id);
+		}
+		
+		$this->terminateWithSuccess($news_content);
+		
+	}
+
 	
 }
 
diff --git a/application/models/content/News_model.php b/application/models/content/News_model.php
index f4f98b601..f8e1fbb66 100755
--- a/application/models/content/News_model.php
+++ b/application/models/content/News_model.php
@@ -19,14 +19,23 @@ class News_model extends DB_Model
 	 */
 	public function getAll($limit = null)
 	{
+		$this->addJoin("campus.tbl_content","content_id");
 		return $this->loadWhere('
-			text IS NOT NULL
-			AND datum <= NOW() AND (datum_bis IS NULL OR datum_bis >= now()::date)
+			text IS NOT NULL	
+			datum <= NOW() AND (datum_bis IS NULL OR datum_bis >= now()::date)
 			ORDER BY datum DESC
 			LIMIT ' . $this->escape($limit)
 		);
 	}
 
+	public function getNewsContentIDs($limit=10){
+		$this->addSelect(['content_id']);
+		return $this->loadWhere("datum <= NOW() AND (datum_bis IS NULL OR datum_bis >= now()::date)
+		ORDER BY datum DESC
+		LIMIT " . $this->escape($limit));
+
+	}
+
 
 
 	/**
diff --git a/public/js/api/cms.js b/public/js/api/cms.js
index 5602c7bf8..651ddd9b7 100644
--- a/public/js/api/cms.js
+++ b/public/js/api/cms.js
@@ -11,5 +11,13 @@ export default {
               }
           );
       },
+      news(limit) {
+        return this.$fhcApi.get(
+            FHC_JS_DATA_STORAGE_OBJECT.app_root +
+            FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+            "/api/frontend/v1/Cms/news",
+            { limit: limit}
+        );
+    },
    
   }
\ No newline at end of file
diff --git a/public/js/components/DashboardWidget/News.js b/public/js/components/DashboardWidget/News.js
index 6f862d085..8cdacd66f 100755
--- a/public/js/components/DashboardWidget/News.js
+++ b/public/js/components/DashboardWidget/News.js
@@ -28,11 +28,12 @@ export default {
                 }
 	},
 	created(){
-		axios
-			.get(this.apiurl + '/dashboard/Api/getNews', {params: {limit: MAX_LOADED_NEWS}})
-			.then(res => { this.allNewsList = res.data })
-			.catch(err => { console.error('ERROR: ', err.response.data) });
-
+		
+    
+    this.$fhcApi.factory.cms.news(MAX_LOADED_NEWS)
+    .then(res => { this.allNewsList = res.data })
+    .catch(err => { console.error('ERROR: ', err.response.data) }); 
+    
 		this.$emit('setConfig', false);
 	},
 	methods: {
@@ -41,7 +42,7 @@ export default {
 			this.$refs.newsModal.show();
 		}
 	},
-	template: `<div class="widgets-news w-100 h-100">
+	template: /*html*/`<div class="widgets-news w-100 h-100">
       <div class="d-flex flex-column h-100">
       <div class="d-flex">
         <header><b>Top News</b></header>

From dd044b9146d60a4ddd3b29d20f9bb84f2b8acc22 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 24 Jun 2024 16:35:48 +0200
Subject: [PATCH 0840/1461] entschuldigungen reload fix; student anw group
 header toggle fix; scan error msg fix; delete modal with kontrolle selection;
 scan code route renamed to profile/scan from student/scan; fixed sum
 formatting;

---
 system/phrasesupdate.php | 48 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 44 insertions(+), 4 deletions(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 38862460c..354b12fde 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -25909,7 +25909,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Sie sind nicht als Teilnehmer der LV-Teil eingetragen.',
+				'text' => 'Sie sind nicht als Teilnehmer des LV-Teil eingetragen.',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -26364,18 +26364,18 @@ array(
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
-		'phrase' => 'termine',
+		'phrase' => 'termineLautStundenplan',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Termine',
+				'text' => 'Termine laut Stundenplan',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Dates',
+				'text' => 'Lessons as per Timetable',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -26481,6 +26481,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'showAllDates',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Alle Termine anzeigen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Show All Dates',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'deletableKontrollen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Löschbare Anwesenheitskontrollen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Deletable Attendance Checks',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// FHC-CORE-ANWESENHEITEN END
 );
 

From 77d74171320037cd92f2fe8e6aa3336e880b03fe Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 25 Jun 2024 09:50:13 +0200
Subject: [PATCH 0841/1461] UDF Component checkbox styles

---
 public/js/components/Udf/Udf.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Udf/Udf.js b/public/js/components/Udf/Udf.js
index e9cc3c60a..89f3a2fbc 100644
--- a/public/js/components/Udf/Udf.js
+++ b/public/js/components/Udf/Udf.js
@@ -131,7 +131,7 @@ export default {
 			@data-fetched="init"
 			>
 			<template #default>
-				<div v-for="field in filteredFields" :key="field.name" class="col">
+				<div v-for="field in filteredFields" :key="field.name" class="col" :class="field.type == 'checkbox' ? 'pt-4 d-flex align-items-center' : ''">
 					<form-input
 						v-model="internModelValue[field.name]"
 						:name="field.name"

From 10cd655b67ac33aa042576847ffeb88886b2136f Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 25 Jun 2024 10:37:32 +0200
Subject: [PATCH 0842/1461] ZGV config default values

---
 application/views/Studentenverwaltung.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/views/Studentenverwaltung.php b/application/views/Studentenverwaltung.php
index 8993053b3..2d0d22346 100644
--- a/application/views/Studentenverwaltung.php
+++ b/application/views/Studentenverwaltung.php
@@ -34,8 +34,8 @@
 <?php
 $configArray = [
 	'generateAlias' => !defined('GENERATE_ALIAS_STUDENT') ? true : GENERATE_ALIAS_STUDENT,
-	'showZgvDoktor' => !defined('ZGV_DOKTOR_ANZEIGEN') ? true : ZGV_DOKTOR_ANZEIGEN,
-	'showZgvErfuellt' => !defined('ZGV_ERFUELLT_ANZEIGEN') ? true : ZGV_ERFUELLT_ANZEIGEN
+	'showZgvDoktor' => !defined('ZGV_DOKTOR_ANZEIGEN') ? false : ZGV_DOKTOR_ANZEIGEN,
+	'showZgvErfuellt' => !defined('ZGV_ERFUELLT_ANZEIGEN') ? false : ZGV_ERFUELLT_ANZEIGEN
 ];
 ?>
 

From f4176ebcdabea93dcd05f32a32ddc281d60e3092 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 25 Jun 2024 14:18:11 +0200
Subject: [PATCH 0843/1461] adds the content of the news to the dashboard items
 and makes them scrollable through css classes

---
 .../controllers/api/frontend/v1/Cms.php       |  1 +
 public/css/components/dashboard.css           |  2 ++
 public/css/components/dashboard/news.css      | 24 +++++++++++++
 public/js/components/DashboardWidget/News.js  | 36 +++++++++++++++----
 4 files changed, 57 insertions(+), 6 deletions(-)
 create mode 100644 public/css/components/dashboard/news.css

diff --git a/application/controllers/api/frontend/v1/Cms.php b/application/controllers/api/frontend/v1/Cms.php
index 07a705e49..7aad344d6 100644
--- a/application/controllers/api/frontend/v1/Cms.php
+++ b/application/controllers/api/frontend/v1/Cms.php
@@ -118,6 +118,7 @@ class Cms extends FHCAPI_Controller
         $this->load->model('content/news_model', 'NewsModel');
         
 		$news_content_ids = $this->NewsModel->getNewsContentIDs($limit);
+		$this->addMeta("content_ids",$news_content_ids);
         $news_content = array();
 
 		if(isError($news_content_ids))
diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
index 9da199442..67dd9cf3f 100755
--- a/public/css/components/dashboard.css
+++ b/public/css/components/dashboard.css
@@ -1,4 +1,6 @@
 @import './calendar.css';
+@import './dashboard/news.css';
+
 .empty-tile-hover {
 	height: 100%;
 	width: 100%;
diff --git a/public/css/components/dashboard/news.css b/public/css/components/dashboard/news.css
new file mode 100644
index 000000000..93718b819
--- /dev/null
+++ b/public/css/components/dashboard/news.css
@@ -0,0 +1,24 @@
+/* .widgets-news .card-header {
+    flex-direction: column;
+    align-items: flex-start !important;
+    
+} */
+
+:root{
+    --news-widget-height: 1;
+}
+
+.widgets-news .news-content > div,
+.widgets-news .news-content .row:nth-child(1),
+.widgets-news .news-content .news-list,
+.widgets-news .news-content .news-list-item,
+.widgets-news .news-content .card-body
+{
+    height: 100%;
+}
+
+.widgets-news .card-body{
+
+    /*max-height: calc(var(--news-widget-height)*var(--fhc-dg-row-height));  */
+    overflow:scroll;
+} 
\ No newline at end of file
diff --git a/public/js/components/DashboardWidget/News.js b/public/js/components/DashboardWidget/News.js
index 8cdacd66f..f597fea10 100755
--- a/public/js/components/DashboardWidget/News.js
+++ b/public/js/components/DashboardWidget/News.js
@@ -36,6 +36,23 @@ export default {
     
 		this.$emit('setConfig', false);
 	},
+  mounted(){
+    
+    this.$nextTick(() =>{
+
+      console.log(this.$refs.htmlContent,"this is the html content");
+      /* //console.log(this.$refs.htmlContent,"this is the refs content");
+      let newsItems = document.getElementsByClassName("news-list");
+      console.log(newsItems,"i am printing something");
+      for(let item of newsItems){
+        //console.log(item,"this is the item");
+        item.style.maxHeight = "100px";
+        item.style.overflow = "scroll";
+      } */
+    });
+    
+     
+  },
 	methods: {
 		setSingleNews(singleNews){
 			this.singleNews = singleNews;
@@ -43,6 +60,7 @@ export default {
 		}
 	},
 	template: /*html*/`<div class="widgets-news w-100 h-100">
+  
       <div class="d-flex flex-column h-100">
       <div class="d-flex">
         <header><b>Top News</b></header>
@@ -60,31 +78,37 @@ export default {
         </div>
       </div>
       <div v-else-if="width > 1 && height === 1" class="h-100" :class="'row row-cols-' + width">
-        <div v-for="news in newsList" :key="news.id">
+        <div class="h-100" v-for="news in newsList" :key="news.id">
             <div class="card h-100">
-				<div class="card-body">
+            <div class="news-content h-100" :style="'--news-widget-height: '+height" ref="htmlContent" ><div v-html="news.content"></div></div>
+            <!--<div class="card-body">
 				  <a href="#newsModal" class="card-title h5 stretched-link" @click="setSingleNews(news)">{{ news.betreff }}</a><br>
 				  <span class="small text-muted">{{ formatDateTime(news.insertamum) }} </span>
 				  <p class="card-text pt-3" style="overflow: hidden; display: -webkit-box; -webkit-line-clamp: 5; -webkit-box-orient: vertical;">{{ news.text }}</p>
-				</div>       
+				</div>-->       
             </div>
           </div>
  		</div>
        <div v-else class="h-100" :class="'row row-cols-' + width">
-        <div v-for="news in newsList" :key="news.id">
+        <div class="h-100" v-for="news in newsList" :key="news.id">
             <div class="card h-100">
-                <img :src="placeHolderImgURL" class="card-img-top">
+            <!-- alte variante um die News anzuzeigen
+            <img :src="placeHolderImgURL" class="card-img-top">
                 <div class="card-footer"><span class="card-subtitle small text-muted">{{ formatDateTime(news.insertamum) }}</span></div>
                 <div class="card-body">
-                  <a href="#newsModal" class="card-title h5 stretched-link" @click="setSingleNews(news)">{{ news.betreff }}</a><br>
+                <p>this is a test</p>  
+                <a href="#newsModal" class="card-title h5 stretched-link" @click="setSingleNews(news)">{{ news.betreff }}</a><br>
                   <p class="card-text pt-3">{{ news.text }}</p>
                 </div>
+            -->
+                <div class="news-content h-100" :style="'--news-widget-height: '+height" ref="htmlContent" v-html="news.content"></div>
             </div>
           </div>
       </div>
 </div>
 </div>
 
+
   <!-- News Modal -->
   <BsModal ref="newsModal" id="newsModal" dialog-class="modal-lg">
     <template #title>

From f546554f873285f999203f376f08269d0903f451 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 25 Jun 2024 16:48:05 +0200
Subject: [PATCH 0844/1461] changes the layout of the news widget in the
 dashboard

---
 .../controllers/api/frontend/v1/Cms.php       | 16 +++++--
 public/css/components/dashboard/news.css      |  4 +-
 public/js/api/cms.js                          |  7 ++-
 public/js/components/DashboardWidget/News.js  | 44 +++++++------------
 4 files changed, 34 insertions(+), 37 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Cms.php b/application/controllers/api/frontend/v1/Cms.php
index 7aad344d6..6808d76d8 100644
--- a/application/controllers/api/frontend/v1/Cms.php
+++ b/application/controllers/api/frontend/v1/Cms.php
@@ -112,23 +112,31 @@ class Cms extends FHCAPI_Controller
 		$limit =  $this->input->get('limit',TRUE);
 
         // return early if the limit parameter is missing or is not greater than 0
-        if(!isset($limit) and $limit > 0)
-            $this->terminateWithError("limit parameter is missing", self::ERROR_TYPE_GENERAL);
+        if(!isset($limit) || $limit > 0)
+            $this->terminateWithError("API parameters are missing", self::ERROR_TYPE_GENERAL);
 
         $this->load->model('content/news_model', 'NewsModel');
         
 		$news_content_ids = $this->NewsModel->getNewsContentIDs($limit);
+		$news_metadata = $this->NewsModel->getAll($limit);
+
 		$this->addMeta("content_ids",$news_content_ids);
-        $news_content = array();
+		
+		$news_content = array();
 
 		if(isError($news_content_ids))
 			$this->terminateWithError(getError($news_content_ids), self::ERROR_TYPE_GENERAL);
 		
+		if(isError($news_metadata))
+			$this->terminateWithError(getError($news_metadata), self::ERROR_TYPE_GENERAL);
+		
 		foreach(getData($news_content_ids) as $content_id){
 			$news_content[] = $this->fetchContent($content_id->content_id);
 		}
 		
-		$this->terminateWithSuccess($news_content);
+		$this->terminateWithSuccess(["news_content" =>$news_content, "news_metadata"=>getData($news_metadata)]);
+	
+		
 		
 	}
 
diff --git a/public/css/components/dashboard/news.css b/public/css/components/dashboard/news.css
index 93718b819..013401bc8 100644
--- a/public/css/components/dashboard/news.css
+++ b/public/css/components/dashboard/news.css
@@ -1,8 +1,8 @@
-/* .widgets-news .card-header {
+.widgets-news .card-header {
     flex-direction: column;
     align-items: flex-start !important;
     
-} */
+}
 
 :root{
     --news-widget-height: 1;
diff --git a/public/js/api/cms.js b/public/js/api/cms.js
index 651ddd9b7..c8ac8dc6f 100644
--- a/public/js/api/cms.js
+++ b/public/js/api/cms.js
@@ -11,12 +11,15 @@ export default {
               }
           );
       },
-      news(limit) {
+      news(limit, metadata=false) {
         return this.$fhcApi.get(
             FHC_JS_DATA_STORAGE_OBJECT.app_root +
             FHC_JS_DATA_STORAGE_OBJECT.ci_router +
             "/api/frontend/v1/Cms/news",
-            { limit: limit}
+            {
+              limit: limit,
+              metadata: metadata,
+            }
         );
     },
    
diff --git a/public/js/components/DashboardWidget/News.js b/public/js/components/DashboardWidget/News.js
index f597fea10..2bd778283 100755
--- a/public/js/components/DashboardWidget/News.js
+++ b/public/js/components/DashboardWidget/News.js
@@ -29,10 +29,9 @@ export default {
 	},
 	created(){
 		
-    
-    this.$fhcApi.factory.cms.news(MAX_LOADED_NEWS)
-    .then(res => { this.allNewsList = res.data })
-    .catch(err => { console.error('ERROR: ', err.response.data) }); 
+      this.$fhcApi.factory.cms.news(MAX_LOADED_NEWS,this.width === 1?true:false)
+      .then(res => { this.allNewsList = res.data })
+      .catch(err => { console.error('ERROR: ', err.response.data) });
     
 		this.$emit('setConfig', false);
 	},
@@ -61,16 +60,16 @@ export default {
 	},
 	template: /*html*/`<div class="widgets-news w-100 h-100">
   
-      <div class="d-flex flex-column h-100">
+      <div class="d-flex flex-column h-100 ">
       <div class="d-flex">
         <header><b>Top News</b></header>
         <a href="#allNewsModal" data-bs-toggle="modal" class="ms-auto mb-2">
           <i class="fa fa-arrow-up-right-from-square me-1"></i>Alle News</a>
       </div>
-      <div v-if="width == 1">
-        <div v-for="news in newsList" :key="news.id" class="mt-2">
-          <div class="card">
-            <div class="card-body">
+      <div class="h-100 overflow-scroll" v-if="width == 1">
+        <div  v-for="news in newsList" :key="news.id" class="mt-2">
+          <div  class="card">
+            <div class=" card-body">
               <a href="#newsModal" class="stretched-link" @click="setSingleNews(news)">{{ news.betreff }}</a><br>
               <span class="small text-muted">{{ formatDateTime(news.insertamum) }}</span>
             </div>
@@ -79,30 +78,17 @@ export default {
       </div>
       <div v-else-if="width > 1 && height === 1" class="h-100" :class="'row row-cols-' + width">
         <div class="h-100" v-for="news in newsList" :key="news.id">
-            <div class="card h-100">
-            <div class="news-content h-100" :style="'--news-widget-height: '+height" ref="htmlContent" ><div v-html="news.content"></div></div>
-            <!--<div class="card-body">
-				  <a href="#newsModal" class="card-title h5 stretched-link" @click="setSingleNews(news)">{{ news.betreff }}</a><br>
-				  <span class="small text-muted">{{ formatDateTime(news.insertamum) }} </span>
-				  <p class="card-text pt-3" style="overflow: hidden; display: -webkit-box; -webkit-line-clamp: 5; -webkit-box-orient: vertical;">{{ news.text }}</p>
-				</div>-->       
-            </div>
+            
+              <div class="news-content h-100" :style="'--news-widget-height: '+height" ref="htmlContent" ><div v-html="news.content"></div></div>
+                   
+            
           </div>
  		</div>
        <div v-else class="h-100" :class="'row row-cols-' + width">
         <div class="h-100" v-for="news in newsList" :key="news.id">
-            <div class="card h-100">
-            <!-- alte variante um die News anzuzeigen
-            <img :src="placeHolderImgURL" class="card-img-top">
-                <div class="card-footer"><span class="card-subtitle small text-muted">{{ formatDateTime(news.insertamum) }}</span></div>
-                <div class="card-body">
-                <p>this is a test</p>  
-                <a href="#newsModal" class="card-title h5 stretched-link" @click="setSingleNews(news)">{{ news.betreff }}</a><br>
-                  <p class="card-text pt-3">{{ news.text }}</p>
-                </div>
-            -->
-                <div class="news-content h-100" :style="'--news-widget-height: '+height" ref="htmlContent" v-html="news.content"></div>
-            </div>
+            
+              <div class="news-content h-100" :style="'--news-widget-height: '+height" ref="htmlContent" v-html="news.content"></div>
+            
           </div>
       </div>
 </div>

From ac04629f8651d65cbc2f3fb60b6c72f10c6b769e Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 26 Jun 2024 08:50:26 +0200
Subject: [PATCH 0845/1461] Cleanup & Code Identation

---
 .../Studentenverwaltung/Details/Details.js    |   1 -
 .../Studentenverwaltung/Details/Prestudent.js | 640 +++++++++---------
 .../Details/Prestudent/History.js             |  16 +-
 3 files changed, 322 insertions(+), 335 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
index 7866f1c97..feec7a580 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
@@ -1,4 +1,3 @@
-import {CoreRESTClient} from '../../../../RESTClient.js';
 import CoreForm from '../../../Form/Form.js';
 import FormInput from '../../../Form/Input.js';
 import FormUploadImage from '../../../Form/Upload/Image.js';
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
index 8f3773ad7..ad5737d6a 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
@@ -1,11 +1,9 @@
-import {CoreRESTClient} from '../../../../RESTClient.js';
 import FormForm from '../../../Form/Form.js';
 import FormInput from '../../../Form/Input.js';
 import TblHistory from "./Prestudent/History.js";
 
 export default {
 	components: {
-		CoreRESTClient,
 		FormForm,
 		FormInput,
 		TblHistory
@@ -174,351 +172,341 @@ export default {
 			.catch(this.$fhcAlert.handleSystemError);
 	},
 	template: `
-	<div class="stv-details-prestudent h-100 pb-3">	
+	<div class="stv-details-prestudent h-100 pb-3">
 		<form-form ref="form" class="stv-details-prestudent" @submit.prevent="updatePrestudent">
-		<div class="position-sticky top-0 z-1">
-			<button type="submit" class="btn btn-primary position-absolute top-0 end-0" :disabled="!deltaLength">Speichern</button>
-		</div>
+			<div class="position-sticky top-0 z-1">
+				<button type="submit" class="btn btn-primary position-absolute top-0 end-0" :disabled="!deltaLength">Speichern</button>
+			</div>
 			<fieldset>
 				<legend>{{$p.t('lehre', 'title_zgv')}} {{modelValue.nachname}} {{modelValue.vorname}}</legend>
-
-						<div class="row mb-3">
-							<form-input
-								container-class="col-3"
-								label="Prestudent_id"
-								type="text"
-								v-model="data.prestudent_id"
-								name="prestudent_id"
-								readonly
-								>
-							</form-input>
-							<form-input
-								container-class="col-3"
-								label="Person_id"
-								type="text"
-								v-model="data.person_id"
-								name="person_id"
-								readonly
-								>
-							</form-input>
-						</div>
-						<div class="row mb-3">
-							<form-input
-								container-class="col-3"
-								label="ZGV"
-								type="select"
-								v-model="data.zgv_code"
-								name="zgvcode"
-								>
-							<option v-for="zgv in listZgvs" :key="zgv.zgv_code" :value="zgv.zgv_code">{{zgv.zgv_bez}}</option>
-							</form-input>
-							<form-input
-								container-class="col-3"
-								:label="$p.t('infocenter', 'zgvOrt')"
-								type="text"
-								v-model="data.zgvort"
-								name="zgvort"
-								>
-							</form-input>
-							<form-input
-								container-class="col-3"
-								:label="$p.t('infocenter', 'zgvDatum')"
-								type="DatePicker"
-								v-model="data.zgvdatum"
-								name="zgvdatum"
-								no-today
-								auto-apply
-								:enable-time-picker="false"
-								format="dd.MM.yyyy"
-								preview-format="dd.MM.yyyy"
-								:teleport="true"
-								>
-							</form-input>
-							<form-input
-								container-class="col-3"
-								:label="$p.t('infocenter', 'zgvNation')"
-								type="select"
-								v-model="data.zgvnation"
-								name="zgvnation"
-								>
-								<!-- TODO(chris): gesperrte nationen können nicht ausgewählt werden! Um das zu realisieren müsste man ein pseudo select machen -->
-								<option v-for="nation in lists.nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
-							</form-input>
-						</div>
-						<div class="row mb-3">
-							<form-input
-								container-class="col-3"
-								:label="$p.t('lehre', 'zgvMaster')"
-								type="select"
-								v-model="data.zgvmas_code"
-								name="zgvmascode"
-								>
-								<option v-for="mzgv in listZgvsmaster" :key="mzgv.zgvmas_code" :value="mzgv.zgvmas_code">{{mzgv.zgvmas_bez}}</option>
-							</form-input>
-							<form-input
-								container-class="col-3"
-								:label="$p.t('lehre', 'zgvMasterOrt')"
-								type="text"
-								v-model="data.zgvmaort"
-								name="zgvmaort"
-								>
-							</form-input>
-							<form-input
-								container-class="col-3"
-								:label="$p.t('lehre', 'zgvMasterDatum')"
-								type="DatePicker"
-								v-model="data.zgvmadatum"
-								name="zgvmadatum"
-								no-today
-								auto-apply
-								:enable-time-picker="false"
-								format="dd.MM.yyyy"
-								preview-format="dd.MM.yyyy"
-								:teleport="true"
-								>
-							</form-input>
-							<form-input
-								container-class="col-3"
-								:label="$p.t('lehre', 'zgvMasterNation')"
-								type="select"
-								v-model="data.zgvmanation"
-								name="zgvmanation"
-								>
-								<!-- TODO(chris): gesperrte nationen können nicht ausgewählt werden! Um das zu realisieren müsste man ein pseudo select machen -->
-								<option v-for="nation in lists.nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
-							</form-input>
-						</div>
-						<!--ZGV Doktor-->
-						<div v-if="showZgvDoktor" class="row mb-3">
-							<form-input
-								container-class="col-3"
-								:label="$p.t('lehre', 'zgvDoktor')"
-								type="select"
-								v-model="data.zgvdoktor_code"
-								name="zgvdoktor_code"
-								>
-								<option v-for="zgv in listZgvsdoktor" :key="zgv.zgvdoktor_code" :value="zgv.zgvdoktor_code">{{zgv.zgvdoktor_bez}}</option>
-							</form-input>
-							<form-input
-								container-class="col-3"
-								:label="$p.t('lehre', 'zgvDoktorOrt')"
-								type="text"
-								v-model="data.zgvdoktorort"
-								name="zgvdoktorort"
-								>
-							</form-input>
-							<form-input
-								container-class="col-3"
-								:label="$p.t('lehre', 'zgvDoktorDatum')"
-								type="DatePicker"
-								v-model="data.zgvdoktordatum"
-								name="zgvdoktordatum"
-								no-today
-								auto-apply
-								:enable-time-picker="false"
-								format="dd.MM.yyyy"
-								preview-format="dd.MM.yyyy"
-								:teleport="true"
-								>
-							</form-input>
-							<form-input
-								container-class="col-3"
-								:label="$p.t('lehre', 'zgvDoktorNation')"
-								type="select"
-								v-model="data.zgvdoktornation"
-								name="zgvdoktornation"
-								>
-								<!-- TODO(chris): gesperrte nationen können nicht ausgewählt werden! Um das zu realisieren müsste man ein pseudo select machen -->
-								<option v-for="nation in lists.nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
-							</form-input>
-						</div>
-																		
-						<div v-if="showZgvErfuellt" class="row mb-3">
-							<div class="col-3 pt-4 d-flex align-items-center">
-								<form-input
-									container-class="form-check"
-									:label="$p.t('infocenter', 'zgvErfuellt')"
-									type="checkbox"
-									v-model="data.zgv_erfuellt"
-									name="zgv_erfuellt"
-									>
-								</form-input>
-							</div>
-							<div class="col-3 pt-4 d-flex align-items-center">
-								<form-input
-									container-class="form-check"
-									:label="$p.t('infocenter', 'zgvMasterErfuellt')"
-									type="checkbox"
-									v-model="data.zgvmas_erfuellt"
-									name="zgvmas_erfuellt"
-									>
-								</form-input>
-							</div>
-							<div v-if="showZgvDoktor" class="col-3 pt-4 d-flex align-items-center">
-								<form-input
-									container-class="form-check"
-									:label="$p.t('infocenter', 'zgvDoktorErfuellt')"
-									type="checkbox"
-									v-model="data.zgvdoktor_erfuellt"
-									name="zgvdoktor_erfuellt"
-									>
-								</form-input>
-							</div>
-						</div>
-						
-						
-						
-		<!--			</template>-->
+				<div class="row mb-3">
+					<form-input
+						container-class="col-3"
+						label="Prestudent_id"
+						type="text"
+						v-model="data.prestudent_id"
+						name="prestudent_id"
+						readonly
+						>
+					</form-input>
+					<form-input
+						container-class="col-3"
+						label="Person_id"
+						type="text"
+						v-model="data.person_id"
+						name="person_id"
+						readonly
+						>
+					</form-input>
+				</div>
+				<div class="row mb-3">
+					<form-input
+						container-class="col-3"
+						label="ZGV"
+						type="select"
+						v-model="data.zgv_code"
+						name="zgvcode"
+						>
+					<option v-for="zgv in listZgvs" :key="zgv.zgv_code" :value="zgv.zgv_code">{{zgv.zgv_bez}}</option>
+					</form-input>
+					<form-input
+						container-class="col-3"
+						:label="$p.t('infocenter', 'zgvOrt')"
+						type="text"
+						v-model="data.zgvort"
+						name="zgvort"
+						>
+					</form-input>
+					<form-input
+						container-class="col-3"
+						:label="$p.t('infocenter', 'zgvDatum')"
+						type="DatePicker"
+						v-model="data.zgvdatum"
+						name="zgvdatum"
+						no-today
+						auto-apply
+						:enable-time-picker="false"
+						format="dd.MM.yyyy"
+						preview-format="dd.MM.yyyy"
+						:teleport="true"
+						>
+					</form-input>
+					<form-input
+						container-class="col-3"
+						:label="$p.t('infocenter', 'zgvNation')"
+						type="select"
+						v-model="data.zgvnation"
+						name="zgvnation"
+						>
+						<!-- TODO(chris): gesperrte nationen können nicht ausgewählt werden! Um das zu realisieren müsste man ein pseudo select machen -->
+						<option v-for="nation in lists.nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
+					</form-input>
+				</div>
+				<div class="row mb-3">
+					<form-input
+						container-class="col-3"
+						:label="$p.t('lehre', 'zgvMaster')"
+						type="select"
+						v-model="data.zgvmas_code"
+						name="zgvmascode"
+						>
+						<option v-for="mzgv in listZgvsmaster" :key="mzgv.zgvmas_code" :value="mzgv.zgvmas_code">{{mzgv.zgvmas_bez}}</option>
+					</form-input>
+					<form-input
+						container-class="col-3"
+						:label="$p.t('lehre', 'zgvMasterOrt')"
+						type="text"
+						v-model="data.zgvmaort"
+						name="zgvmaort"
+						>
+					</form-input>
+					<form-input
+						container-class="col-3"
+						:label="$p.t('lehre', 'zgvMasterDatum')"
+						type="DatePicker"
+						v-model="data.zgvmadatum"
+						name="zgvmadatum"
+						no-today
+						auto-apply
+						:enable-time-picker="false"
+						format="dd.MM.yyyy"
+						preview-format="dd.MM.yyyy"
+						:teleport="true"
+						>
+					</form-input>
+					<form-input
+						container-class="col-3"
+						:label="$p.t('lehre', 'zgvMasterNation')"
+						type="select"
+						v-model="data.zgvmanation"
+						name="zgvmanation"
+						>
+						<!-- TODO(chris): gesperrte nationen können nicht ausgewählt werden! Um das zu realisieren müsste man ein pseudo select machen -->
+						<option v-for="nation in lists.nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
+					</form-input>
+				</div>
+				<!--ZGV Doktor-->
+				<div v-if="showZgvDoktor" class="row mb-3">
+					<form-input
+						container-class="col-3"
+						:label="$p.t('lehre', 'zgvDoktor')"
+						type="select"
+						v-model="data.zgvdoktor_code"
+						name="zgvdoktor_code"
+						>
+						<option v-for="zgv in listZgvsdoktor" :key="zgv.zgvdoktor_code" :value="zgv.zgvdoktor_code">{{zgv.zgvdoktor_bez}}</option>
+					</form-input>
+					<form-input
+						container-class="col-3"
+						:label="$p.t('lehre', 'zgvDoktorOrt')"
+						type="text"
+						v-model="data.zgvdoktorort"
+						name="zgvdoktorort"
+						>
+					</form-input>
+					<form-input
+						container-class="col-3"
+						:label="$p.t('lehre', 'zgvDoktorDatum')"
+						type="DatePicker"
+						v-model="data.zgvdoktordatum"
+						name="zgvdoktordatum"
+						no-today
+						auto-apply
+						:enable-time-picker="false"
+						format="dd.MM.yyyy"
+						preview-format="dd.MM.yyyy"
+						:teleport="true"
+						>
+					</form-input>
+					<form-input
+						container-class="col-3"
+						:label="$p.t('lehre', 'zgvDoktorNation')"
+						type="select"
+						v-model="data.zgvdoktornation"
+						name="zgvdoktornation"
+						>
+						<!-- TODO(chris): gesperrte nationen können nicht ausgewählt werden! Um das zu realisieren müsste man ein pseudo select machen -->
+						<option v-for="nation in lists.nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
+					</form-input>
+				</div>
+																
+				<div v-if="showZgvErfuellt" class="row mb-3">
+					<div class="col-3 pt-4 d-flex align-items-center">
+						<form-input
+							container-class="form-check"
+							:label="$p.t('infocenter', 'zgvErfuellt')"
+							type="checkbox"
+							v-model="data.zgv_erfuellt"
+							name="zgv_erfuellt"
+							>
+						</form-input>
+					</div>
+					<div class="col-3 pt-4 d-flex align-items-center">
+						<form-input
+							container-class="form-check"
+							:label="$p.t('infocenter', 'zgvMasterErfuellt')"
+							type="checkbox"
+							v-model="data.zgvmas_erfuellt"
+							name="zgvmas_erfuellt"
+							>
+						</form-input>
+					</div>
+					<div v-if="showZgvDoktor" class="col-3 pt-4 d-flex align-items-center">
+						<form-input
+							container-class="form-check"
+							:label="$p.t('infocenter', 'zgvDoktorErfuellt')"
+							type="checkbox"
+							v-model="data.zgvdoktor_erfuellt"
+							name="zgvdoktor_erfuellt"
+							>
+						</form-input>
+					</div>
+				</div>
 			</fieldset>
 			<fieldset>
 				<legend>PrestudentIn</legend>
+				<div class="row mb-3">
+					<form-input
+						container-class="col-4"
+						:label="$p.t('person', 'aufmerksamDurch')"
+						type="select"
+						v-model="data.aufmerksamdurch_kurzbz"
+						name="aufmerksamDurch"
+						>
+						<option v-for="adurch in listAufmerksamdurch" :key="adurch.aufmerksamdurch_kurzbz" :value="adurch.aufmerksamdurch_kurzbz">{{adurch.beschreibung}}</option>
+					</form-input>
+					<form-input
+						container-class="col-4"
+						:label="$p.t('person', 'berufstaetigkeit')"
+						type="select"
+						v-model="data.berufstaetigkeit_code"
+						name="berufstaetigkeit_code"
+						>
+						<option v-for="beruf in listBerufe" :key="beruf.berufstaetigkeit_code" :value="beruf.berufstaetigkeit_code">{{beruf.berufstaetigkeit_bez}} </option>
+					</form-input>
+					<form-input
+						container-class="col-4"
+						:label="$p.t('person', 'ausbildung')"
+						type="select"
+						v-model="data.ausbildungcode"
+						name="ausbildungcode"
+						>
+						<option v-for="ausbld in listAusbildung" :key="ausbld.ausbildungcode" :value="ausbld.ausbildungcode">{{ausbld.ausbildungbez}} </option>
+					</form-input>
+				</div>
 				
-					<div class="row mb-3">
+				<div class="row mb-3">
+					<form-input
+						container-class="col-4"
+						label="Aufnahmeschlüssel"
+						type="text"
+						v-model="data.aufnahmeschluessel"
+						name="aufnahmeschluessel"
+						disabled							
+						>
+					</form-input>
+					
+					<div class="col-4 pt-4 d-flex align-items-center">
 						<form-input
-							container-class="col-4"
-							:label="$p.t('person', 'aufmerksamDurch')"
-							type="select"
-							v-model="data.aufmerksamdurch_kurzbz"
-							name="aufmerksamDurch"
+							container-class="form-check"
+							:label="$p.t('person', 'facheinschlaegigBerufstaetig')"
+							type="checkbox"
+							v-model="data.facheinschlberuf"
+							name="facheinschlberuf"
 							>
-							<option v-for="adurch in listAufmerksamdurch" :key="adurch.aufmerksamdurch_kurzbz" :value="adurch.aufmerksamdurch_kurzbz">{{adurch.beschreibung}}</option>
-						</form-input>
-						<form-input
-							container-class="col-4"
-							:label="$p.t('person', 'berufstaetigkeit')"
-							type="select"
-							v-model="data.berufstaetigkeit_code"
-							name="berufstaetigkeit_code"
-							>
-							<option v-for="beruf in listBerufe" :key="beruf.berufstaetigkeit_code" :value="beruf.berufstaetigkeit_code">{{beruf.berufstaetigkeit_bez}} </option>
-						</form-input>
-						<form-input
-							container-class="col-4"
-							:label="$p.t('person', 'ausbildung')"
-							type="select"
-							v-model="data.ausbildungcode"
-							name="ausbildungcode"
-							>
-							<option v-for="ausbld in listAusbildung" :key="ausbld.ausbildungcode" :value="ausbld.ausbildungcode">{{ausbld.ausbildungbez}} </option>
 						</form-input>
 					</div>
 					
-					<div class="row mb-3">
+					<!--Todo(manu) validierung Integer, liste hier null-->
+					<form-input
+						container-class="col-4"
+						:label="$p.t('person', 'bisstandort')"
+						type="text"
+						v-model="data.standort_code"
+						name="standort_code"
+						disabled
+						>
+					</form-input>
+				 
+				</div>
+				
+				<div class="row mb-3">
+					<form-input
+						container-class="col-4"
+						:label="$p.t('lehre', 'studiengang')"
+						type="select"
+						v-model="data.studiengang_kz"
+						name="studiengang_kz"
+						disabled
+						>
+						<option v-for="stg in listStgs" :key="stg.studiengang_kz" :value="stg.studiengang_kz">{{stg.kuerzel}} - {{stg.bezeichnung}} </option>
+					</form-input>
+					<form-input
+						container-class="col-4"
+						:label="$p.t('lehre', 'studientyp')"
+						type="select"
+						v-model="data.gsstudientyp_kurzbz"
+						name="gsstudientyp_kurzbz"
+						>
+						<option v-for="typ in listStgTyp" :key="typ.typ" :value="typ.typ">{{typ.bezeichnung}} </option>
+					</form-input>
+				</div>
+				
+				<div class="row mb-3">
+					<form-input
+						container-class="col-4"
+						:label="$p.t('global', 'anmerkung')"
+						type="text"
+						v-model="data.anmerkung"
+						name="anmerkung"
+						>
+					</form-input>
+					<div class="col-2 pt-4 d-flex align-items-center">
 						<form-input
-							container-class="col-4"
-							label="Aufnahmeschlüssel"
-							type="text"
-							v-model="data.aufnahmeschluessel"
-							name="aufnahmeschluessel"
-							disabled							
+							container-class="form-check"
+							:label="$p.t('person', 'bismelden')"
+							type="checkbox"
+							v-model="data.bismelden"
+							name="bismelden"
 							>
 						</form-input>
-						
-						<div class="col-4 pt-4 d-flex align-items-center">
-							<form-input
-								container-class="form-check"
-								:label="$p.t('person', 'facheinschlaegigBerufstaetig')"
-								type="checkbox"
-								v-model="data.facheinschlberuf"
-								name="facheinschlberuf"
-								>
-							</form-input>
-						</div>
-						
-						<!--Todo(manu) validierung Integer, liste hier null-->
-						<form-input
-							container-class="col-4"
-							:label="$p.t('person', 'bisstandort')"
-							type="text"
-							v-model="data.standort_code"
-							name="standort_code"
-							disabled
-							>
-						</form-input>
-					 
-					</div>
-					
-					<div class="row mb-3">
-						<form-input
-							container-class="col-4"
-							:label="$p.t('lehre', 'studiengang')"
-							type="select"
-							v-model="data.studiengang_kz"
-							name="studiengang_kz"
-							disabled
-							>
-							<option v-for="stg in listStgs" :key="stg.studiengang_kz" :value="stg.studiengang_kz">{{stg.kuerzel}} - {{stg.bezeichnung}} </option>
-						</form-input>
-						<form-input
-							container-class="col-4"
-							:label="$p.t('lehre', 'studientyp')"
-							type="select"
-							v-model="data.gsstudientyp_kurzbz"
-							name="gsstudientyp_kurzbz"
-							>
-							<option v-for="typ in listStgTyp" :key="typ.typ" :value="typ.typ">{{typ.bezeichnung}} </option>
-						</form-input>
 					</div>
+					<div class="col-2 pt-4 d-flex align-items-center">
+						<form-input
+							container-class="form-check"
+							:label="$p.t('lehre', 'dual')"
+							type="checkbox"
+							v-model="data.dual"
+							name="dual"
+							>
+						</form-input>
+					</div>
+					<form-input
+						container-class="col-3"
+						:label="$p.t('lehre', 'foerderrelevant')"
+						type="select"
+						v-model="data.foerderrelevant"
+						name="foerderrelevant"
+						>
+						<option v-for="entry in listFoerderrelevant" :value="entry.value">{{entry.text}}</option>
+					</form-input>
 					
-					<div class="row mb-3">
-						<form-input
-							container-class="col-4"
-							:label="$p.t('global', 'anmerkung')"
-							type="text"
-							v-model="data.anmerkung"
-							name="anmerkung"
-							>
-						</form-input>
-						<div class="col-2 pt-4 d-flex align-items-center">
-							<form-input
-								container-class="form-check"
-								:label="$p.t('person', 'bismelden')"
-								type="checkbox"
-								v-model="data.bismelden"
-								name="bismelden"
-								>
-							</form-input>
-						</div>
-						<div class="col-2 pt-4 d-flex align-items-center">
-							<form-input
-								container-class="form-check"
-								:label="$p.t('lehre', 'dual')"
-								type="checkbox"
-								v-model="data.dual"
-								name="dual"
-								>
-							</form-input>
-						</div>
-						<form-input
-							container-class="col-3"
-							:label="$p.t('lehre', 'foerderrelevant')"
-							type="select"
-							v-model="data.foerderrelevant"
-							name="foerderrelevant"
-							>
-							<option v-for="entry in listFoerderrelevant" :value="entry.value">{{entry.text}}</option>
-						</form-input>
-						
-						<form-input
-							container-class="col-1"
-							:label="$p.t('lehre', 'prioritaet')"
-							type="text"
-							v-model="data.priorisierung"
-							name="priorisierung"
-							:disabled="!hasPrestudentPermission"
-							>
-						</form-input>
-						</div>
-					</fieldset>
-										
+					<form-input
+						container-class="col-1"
+						:label="$p.t('lehre', 'prioritaet')"
+						type="text"
+						v-model="data.priorisierung"
+						name="priorisierung"
+						:disabled="!hasPrestudentPermission"
+						>
+					</form-input>
+				</div>
+			</fieldset>
 		</form-form>
-		<br>				
 		<div class="col-8">
 			<legend>Gesamthistorie</legend>
-			<TblHistory :person_id="modelValue.person_id"></TblHistory>		
+			<tbl-history :person_id="modelValue.person_id"></tbl-history>		
 		</div>
-					
-		
 	</div>
 	`
 };
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
index ff89c5549..4bcced1df 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
@@ -49,14 +49,14 @@ export default{
 		}
 	},
 	template: `
-		<div class="stv-list h-100 pt-3">
-			<core-filter-cmpt
-				ref="table"
-				:tabulator-options="tabulatorOptions"
-				:tabulator-events="tabulatorEvents"
-				table-only
-				:side-menu="false"
+	<div class="stv-list h-100 pt-3">
+		<core-filter-cmpt
+			ref="table"
+			:tabulator-options="tabulatorOptions"
+			:tabulator-events="tabulatorEvents"
+			table-only
+			:side-menu="false"
 			>
 		</core-filter-cmpt>
-		</div>`
+	</div>`
 }
\ No newline at end of file

From 3a16c4ebf329759096cf3eec0f81aa186317cfd1 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Wed, 26 Jun 2024 10:45:56 +0200
Subject: [PATCH 0846/1461] Added method getAutocompleteSuggestions to
 Lehrveranstaltung_model.php

Get Lehrveranstaltungen by eventQuery string. Use with autocomplete event queries.
---
 .../education/Lehrveranstaltung_model.php     | 65 +++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/application/models/education/Lehrveranstaltung_model.php b/application/models/education/Lehrveranstaltung_model.php
index 1f1b90131..c7f32fef6 100644
--- a/application/models/education/Lehrveranstaltung_model.php
+++ b/application/models/education/Lehrveranstaltung_model.php
@@ -15,6 +15,71 @@ class Lehrveranstaltung_model extends DB_Model
 		$this->load->model('organisation/studiensemester_model', 'StudiensemesterModel');
 	}
 
+	/**
+	 * Get Lehrveranstaltungen by eventQuery string. Use with autocomplete event queries.
+	 * @param $eventQuery String
+	 * @param string $studiensemester_kurzbz Filter by Studiensemester
+	 * @param array $oes Filter by Organisationseinheiten
+	 * @return array
+	 */
+	public function getAutocompleteSuggestions($eventQuery, $studiensemester_kurzbz = null, $oes = null)
+	{
+		$params = [];
+
+		$eventQuery = '%' . $eventQuery . '%';
+
+		$qry = '
+			SELECT DISTINCT ON (lv_oe_kurzbz, stg_bezeichnung, lehrveranstaltung_id)
+			    le.studiensemester_kurzbz,
+                lv.oe_kurzbz AS "lv_oe_kurzbz",
+                CASE
+                    WHEN oe.organisationseinheittyp_kurzbz = \'Kompetenzfeld\' THEN (\'KF \' || oe.bezeichnung)
+                    WHEN oe.organisationseinheittyp_kurzbz = \'Department\' THEN (\'DEP \' || oe.bezeichnung)
+                    ELSE (oe.organisationseinheittyp_kurzbz || \' \' || oe.bezeichnung)
+                END AS "lv_oe_bezeichnung",
+                stg.studiengang_kz,
+                upper(stg.typ || stg.kurzbz) AS "stg_typ_kurzbz",    
+                stg.bezeichnung AS "stg_bezeichnung",
+                lv.semester,   
+                lv.lehrveranstaltung_id,
+                lv.bezeichnung AS "lv_bezeichnung"           
+            FROM
+                    lehre.tbl_lehrveranstaltung     lv 
+                    JOIN lehre.tbl_lehreinheit           le USING (lehrveranstaltung_id)
+                    JOIN PUBLIC.tbl_organisationseinheit oe USING (oe_kurzbz)
+                    JOIN PUBLIC.tbl_studiengang          stg ON stg.studiengang_kz = lv.studiengang_kz
+            WHERE
+				/* filter negative studiengaenge */
+                stg.studiengang_kz > 0 ';
+
+			if (isset($studiensemester_kurzbz) && is_string($studiensemester_kurzbz))
+			{
+				/* filter studiensemester */
+				$qry.= ' AND le.studiensemester_kurzbz =  ? ';
+				$params[]= $studiensemester_kurzbz;
+			}
+
+			if (isset($oes) && is_array($oes))
+			{
+				/* filter organisationseinheit */
+				$qry.= ' AND lv.oe_kurzbz IN ? ';
+				$params[]= $oes;
+			}
+
+		$qry.= '
+                /* filter active lehrveranstaltungen */
+                AND lv.aktiv = TRUE
+                /* filter active organisationseinheiten */
+                AND oe.aktiv = TRUE
+				/* filter by search entry */
+				AND lv.bezeichnung ILIKE ?
+		';
+
+		$params[]= $eventQuery;
+
+		return $this->execQuery($qry, $params);
+	}
+
 	/**
 	 * Gets unique Groupstrings for Lehrveranstaltungen, e.g. WS2018_BIF_1_PRJM_VZ_LV12345
 	 * @param string $studiensemester_kurzbz

From 580f063efea0d35da04db86a1e8b78dc567a893b Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Wed, 26 Jun 2024 10:48:59 +0200
Subject: [PATCH 0847/1461] Updated phrases: Added phrases for
 Softwareanforderung in category Softwarebereitstellung

---
 system/phrasesupdate.php | 200 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 200 insertions(+)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 20f155afe..1aa798586 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -26139,6 +26139,206 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'softwareanforderung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Softwareanforderung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Software Request',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'softwareanforderungSubtitle',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Softwareanforderung und Lizenzmanagement für die Lehre',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Software Request and License management for Education',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'swAnforderungenUndLizenen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Softwareanforderungen & Lizenzen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Software Requirements & Licenses',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'anforderungNachSw',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anforderung nach Software',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Request by Software',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'anforderungNachLv',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anforderung nach LV',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Request by Course',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'swNichtGefundenHierBestellen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Software nicht gefunden?<br>Hier bei IT-Services bestellen",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Software not found?<br>Order here from IT Services",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'bereitsAngefordert',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Bereits angefordert",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Requested already",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'mindEineZuorndungExistiertBereits',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Mindestens eine Zuordnung existiert bereits.",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "At least one assignment already exists.",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'swFuerLvAnfordern',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Software für LV anfordern",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Request software for courses",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'swWurdeBereitsAngefordert',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Software wurde bereits angefordert",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Software has already been requested",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 );
 
 

From 2144982829dd998e7e9dafe1c7adf0dc6ac1c835 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 26 Jun 2024 11:07:04 +0200
Subject: [PATCH 0848/1461] Tabulator persistenceID

---
 public/js/components/Betriebsmittel/Betriebsmittel.js        | 3 ++-
 public/js/components/Notiz/Notiz.js                          | 3 ++-
 .../Stv/Studentenverwaltung/Details/Kontakt/Address.js       | 1 +
 .../Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js   | 5 +++--
 .../Stv/Studentenverwaltung/Details/Kontakt/Contact.js       | 5 +++--
 .../js/components/Stv/Studentenverwaltung/Details/Konto.js   | 1 +
 .../Stv/Studentenverwaltung/Details/Noten/Zeugnis.js         | 2 +-
 .../Stv/Studentenverwaltung/Details/Prestudent/History.js    | 3 ++-
 public/js/components/Stv/Studentenverwaltung/List.js         | 2 +-
 9 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/public/js/components/Betriebsmittel/Betriebsmittel.js b/public/js/components/Betriebsmittel/Betriebsmittel.js
index ce0d6ce61..38563633f 100644
--- a/public/js/components/Betriebsmittel/Betriebsmittel.js
+++ b/public/js/components/Betriebsmittel/Betriebsmittel.js
@@ -111,7 +111,8 @@ export default {
 				layoutColumnsOnNewData: false,
 				height: '550',
 				selectableRangeMode: 'click',
-				selectable: true
+				selectable: true,
+				persistenceID: 'core-betriebsmittel'
 			},
 			tabulatorEvents: [
 				{
diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index ec2c7696b..f766b96eb 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -151,7 +151,8 @@ export default {
 				height: '250',
 				selectableRangeMode: 'click',
 				selectable: true,
-				index: 'notiz_id'
+				index: 'notiz_id',
+				persistenceID: 'core-notiz'
 			},
 			tabulatorEvents: [
 				{
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
index 20513add8..7e4cbc3db 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
@@ -97,6 +97,7 @@ export default{
 				height:	'auto',
 				selectable:	true,
 				index: 'adresse_id',
+				persistenceID: 'stv-details-kontakt-address'
 			},
 			tabulatorEvents: [
 				{
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
index 2a26f9fc1..7d3e3e7da 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
@@ -85,7 +85,8 @@ export default{
 				layoutColumnsOnNewData:	false,
 				height:	'auto',
 				selectable:	true,
-				index: 'bankverbindung_id'
+				index: 'bankverbindung_id',
+				persistenceID: 'stv-details-kontakt-bankaccount'
 			},
 			tabulatorEvents: [
 				{
@@ -214,7 +215,7 @@ export default{
 		},
 	},
 	template: `	
-		<div class="stv-list h-100 pt-3">
+		<div class="stv-details-kontakt-bankaccount h-100 pt-3">
 		
 		<!--Modal: Bankverbindung-->
 		<BsModal title="Bankverbindung anlegen" ref="bankverbindungModal">
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
index 3bb8e0a55..04656607d 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
@@ -73,7 +73,8 @@ export default{
 				layoutColumnsOnNewData:	false,
 				height:	'auto',
 				selectable:	true,
-				index: 'kontakt_id'
+				index: 'kontakt_id',
+				persistenceID: 'stv-details-kontakt-contact'
 			},
 			tabulatorEvents: [
 				{
@@ -243,7 +244,7 @@ export default{
 			.catch(this.$fhcAlert.handleSystemError);
 	},
 	template: `	
-		<div class="stv-list h-100 pt-3">
+		<div class="stv-details-kontakt-contact h-100 pt-3">
 
 		<!--Modal: contactModal-->
 		<BsModal ref="contactModal">
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Konto.js b/public/js/components/Stv/Studentenverwaltung/Details/Konto.js
index 247a63d95..30fbcd448 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Konto.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Konto.js
@@ -100,6 +100,7 @@ export default {
 				selectable: true,
 				selectableRangeMode: 'click',
 				index: 'buchungsnr',
+				persistenceID: 'stv-details-konto'
 			}, this);
 		}
 	},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js
index 0f5bcc62e..caeb0cfaa 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js
@@ -58,7 +58,7 @@ export default {
 				height: '100%',
 				selectable: true,
 				selectableRangeMode: 'click',
-				persistence: true
+				persistenceID: 'stv-details-noten-zeugnis'
 			};
 		}
 	},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
index 4bcced1df..068e0e855 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
@@ -27,6 +27,7 @@ export default{
 				layoutColumnsOnNewData:	false,
 				height:	'auto',
 				selectable:	false,
+				persistenceID: 'stv-details-prestudent-history'
 			},
 			tabulatorEvents: [
 				{
@@ -49,7 +50,7 @@ export default{
 		}
 	},
 	template: `
-	<div class="stv-list h-100 pt-3">
+	<div class="stv-details-prestudent-history h-100 pt-3">
 		<core-filter-cmpt
 			ref="table"
 			:tabulator-options="tabulatorOptions"
diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index d9965e365..9965c0b83 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -90,7 +90,7 @@ export default {
 				selectable: true,
 				selectableRangeMode: 'click',
 				index: 'prestudent_id',
-				persistence: true
+				persistenceID: 'stv-list'
 			},
 			tabulatorEvents: [
 				{

From c679e12d1697324b70f90d5d9dd67c9388a3f562 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 26 Jun 2024 11:07:40 +0200
Subject: [PATCH 0849/1461] Tab Prestudent styling

---
 .../Stv/Studentenverwaltung/Details/Prestudent.js           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
index ad5737d6a..418bacc1e 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
@@ -177,7 +177,7 @@ export default {
 			<div class="position-sticky top-0 z-1">
 				<button type="submit" class="btn btn-primary position-absolute top-0 end-0" :disabled="!deltaLength">Speichern</button>
 			</div>
-			<fieldset>
+			<fieldset class="overflow-hidden">
 				<legend>{{$p.t('lehre', 'title_zgv')}} {{modelValue.nachname}} {{modelValue.vorname}}</legend>
 				<div class="row mb-3">
 					<form-input
@@ -363,7 +363,7 @@ export default {
 					</div>
 				</div>
 			</fieldset>
-			<fieldset>
+			<fieldset class="overflow-hidden">
 				<legend>PrestudentIn</legend>
 				<div class="row mb-3">
 					<form-input
@@ -503,7 +503,7 @@ export default {
 				</div>
 			</fieldset>
 		</form-form>
-		<div class="col-8">
+		<div>
 			<legend>Gesamthistorie</legend>
 			<tbl-history :person_id="modelValue.person_id"></tbl-history>		
 		</div>

From c8f0bdd6d7fdb6d940e99e66d701818f2edcb15e Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 26 Jun 2024 11:08:00 +0200
Subject: [PATCH 0850/1461] Prestudent History: add prestudent_id

---
 application/models/crm/Prestudent_model.php                    | 2 +-
 .../Stv/Studentenverwaltung/Details/Prestudent/History.js      | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/application/models/crm/Prestudent_model.php b/application/models/crm/Prestudent_model.php
index 7280fd9fb..4c295c3cd 100644
--- a/application/models/crm/Prestudent_model.php
+++ b/application/models/crm/Prestudent_model.php
@@ -709,7 +709,7 @@ class Prestudent_model extends DB_Model
 	{
 		$query = "
 			SELECT ps.studiensemester_kurzbz, p.priorisierung, p.studiengang_kz, sg.kurzbzlang, sg.orgform_kurzbz, ps.status_kurzbz, s.student_uid, sp.bezeichnung, ps.ausbildungssemester,
-			       CONCAT(ps.status_kurzbz, ' (', ps.ausbildungssemester, '. Semester)') as status
+			       CONCAT(ps.status_kurzbz, ' (', ps.ausbildungssemester, '. Semester)') as status, p.prestudent_id
 			FROM public.tbl_prestudent p
 			JOIN (
 					SELECT DISTINCT ON(prestudent_id) *
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
index 068e0e855..5a1dc1bf7 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
@@ -21,7 +21,8 @@ export default{
 					{title:"Orgform", field:"orgform_kurzbz"},
 					{title:"Studienplan", field:"bezeichnung"},
 					{title:"UID", field:"student_uid"},
-					{title:"Status", field:"status"}
+					{title:"Status", field:"status"},
+					{title:"PrestudentId", field:"prestudent_id", visible:false}
 				],
 				layout: 'fitDataFill',
 				layoutColumnsOnNewData:	false,

From 7cf89392a2c9995017d5d063d8a701bbcaed1ccd Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 26 Jun 2024 11:19:58 +0200
Subject: [PATCH 0851/1461] Prestudent History: aktiv & bold highlighting

---
 .../Stv/Studentenverwaltung/Details/Prestudent.js  |  2 +-
 .../Details/Prestudent/History.js                  | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
index 418bacc1e..f38712469 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
@@ -505,7 +505,7 @@ export default {
 		</form-form>
 		<div>
 			<legend>Gesamthistorie</legend>
-			<tbl-history :person_id="modelValue.person_id"></tbl-history>		
+			<tbl-history :person-id="modelValue.person_id" :prestudent-id="modelValue.prestudent_id"></tbl-history>
 		</div>
 	</div>
 	`
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
index 5a1dc1bf7..53b824b24 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
@@ -5,12 +5,14 @@ export default{
 		CoreFilterCmpt
 	},
 	props: {
-		person_id: Number
+		personId: Number,
+		prestudentId: Number
 	},
 	data() {
+		let prestudent_id = this.prestudentId;
 		return {
 			tabulatorOptions: {
-				ajaxURL: 'api/frontend/v1/stv/Prestudent/getHistoryPrestudents/' + this.person_id,
+				ajaxURL: 'api/frontend/v1/stv/Prestudent/getHistoryPrestudents/' + this.personId,
 				ajaxRequestFunc: this.$fhcApi.get,
 				ajaxResponse: (url, params, response) => response.data,
 				//autoColumns: true,
@@ -24,6 +26,14 @@ export default{
 					{title:"Status", field:"status"},
 					{title:"PrestudentId", field:"prestudent_id", visible:false}
 				],
+				rowFormatter(row) {
+					if (["Abgewiesener","Abbrecher","Absolvent"].includes(row.getData().status_kurzbz)) {
+						row.getElement().classList.add('text-muted');
+					}
+					if (row.getData().prestudent_id == prestudent_id) {
+						row.getElement().classList.add('fw-bold');
+					}
+				},
 				layout: 'fitDataFill',
 				layoutColumnsOnNewData:	false,
 				height:	'auto',

From 478adb740ec2d7e77a0ffd60fcb4ca5b5c8d43db Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 26 Jun 2024 13:21:32 +0200
Subject: [PATCH 0852/1461] changes the db query and adopts the layout of the
 Vue component to show the correct betreff and content of the news

---
 .../controllers/api/frontend/v1/Cms.php       | 48 +++++++++----------
 application/libraries/CmsLib.php              |  7 +++
 application/models/content/News_model.php     |  8 +++-
 public/js/api/cms.js                          |  5 +-
 public/js/components/DashboardWidget/News.js  | 32 +++----------
 5 files changed, 45 insertions(+), 55 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Cms.php b/application/controllers/api/frontend/v1/Cms.php
index 6808d76d8..f6c1ba7bf 100644
--- a/application/controllers/api/frontend/v1/Cms.php
+++ b/application/controllers/api/frontend/v1/Cms.php
@@ -109,35 +109,33 @@ class Cms extends FHCAPI_Controller
 
 	public function news()
 	{
+		$this->load->model('content/news_model', 'NewsModel');
+		
 		$limit =  $this->input->get('limit',TRUE);
-
-        // return early if the limit parameter is missing or is not greater than 0
-        if(!isset($limit) || $limit > 0)
-            $this->terminateWithError("API parameters are missing", self::ERROR_TYPE_GENERAL);
-
-        $this->load->model('content/news_model', 'NewsModel');
-        
-		$news_content_ids = $this->NewsModel->getNewsContentIDs($limit);
-		$news_metadata = $this->NewsModel->getAll($limit);
-
-		$this->addMeta("content_ids",$news_content_ids);
 		
-		$news_content = array();
+		// return early if the limit parameter is missing or is not greater than 0
+		if(!isset($limit) || $limit < 1)
+		$this->terminateWithError("API parameters are missing", self::ERROR_TYPE_GENERAL);
 
-		if(isError($news_content_ids))
-			$this->terminateWithError(getError($news_content_ids), self::ERROR_TYPE_GENERAL);
-		
-		if(isError($news_metadata))
-			$this->terminateWithError(getError($news_metadata), self::ERROR_TYPE_GENERAL);
-		
-		foreach(getData($news_content_ids) as $content_id){
-			$news_content[] = $this->fetchContent($content_id->content_id);
+		//query the news
+		$news = $this->NewsModel->getAll($limit);
+
+		//get the data or terminate with error
+		$news = $this->getDataOrTerminateWithError($news);
+
+		// check if any news are there
+		if($news === NULL){
+			$this->terminateWithError("No news content has been found");
 		}
-		
-		$this->terminateWithSuccess(["news_content" =>$news_content, "news_metadata"=>getData($news_metadata)]);
-	
-		
-		
+
+		// collect the content of the news
+		foreach($news as $news_element){
+			$this->addMeta("asdfs",$news_element->content_id);
+			$news_element->content_obj = $this->fetchContent($news_element->content_id);
+		}
+
+		$this->terminateWithSuccess($news);
+        
 	}
 
 	
diff --git a/application/libraries/CmsLib.php b/application/libraries/CmsLib.php
index aee6f5c61..9f977ad56 100755
--- a/application/libraries/CmsLib.php
+++ b/application/libraries/CmsLib.php
@@ -103,6 +103,12 @@ class CmsLib
 		$XML = new DOMDocument();
 		$XML->loadXML($content->content);
 
+		if($content->titel){
+			$betreff = $content->titel;
+		}else{
+			$betreff = $XML->getElementsByTagName('betreff');
+		}
+
 		$xsltemplate = new DOMDocument();
 		$xsltemplate->loadXML($template->xslt_xhtml_c4);
 
@@ -115,6 +121,7 @@ class CmsLib
 		$transformed_content = str_replace('dms.php', APP_ROOT . 'cms/dms.php', $transformed_content);
 
 		return success([
+			"betreff"=>$betreff,
 			"type"=>$content->template_kurzbz,
 			"content"=>$transformed_content
 		]);
diff --git a/application/models/content/News_model.php b/application/models/content/News_model.php
index f8e1fbb66..0700a7057 100755
--- a/application/models/content/News_model.php
+++ b/application/models/content/News_model.php
@@ -20,8 +20,12 @@ class News_model extends DB_Model
 	public function getAll($limit = null)
 	{
 		$this->addJoin("campus.tbl_content","content_id");
-		return $this->loadWhere('
-			text IS NOT NULL	
+		return $this->execReadOnlyQuery('
+			SELECT * 
+			FROM campus.tbl_news
+			JOIN campus.tbl_content content ON content.content_id = campus.tbl_news.content_id
+			WHERE
+			--text IS NOT NULL AND 	
 			datum <= NOW() AND (datum_bis IS NULL OR datum_bis >= now()::date)
 			ORDER BY datum DESC
 			LIMIT ' . $this->escape($limit)
diff --git a/public/js/api/cms.js b/public/js/api/cms.js
index c8ac8dc6f..490023053 100644
--- a/public/js/api/cms.js
+++ b/public/js/api/cms.js
@@ -11,14 +11,13 @@ export default {
               }
           );
       },
-      news(limit, metadata=false) {
+      news(limit) {
         return this.$fhcApi.get(
             FHC_JS_DATA_STORAGE_OBJECT.app_root +
             FHC_JS_DATA_STORAGE_OBJECT.ci_router +
             "/api/frontend/v1/Cms/news",
             {
-              limit: limit,
-              metadata: metadata,
+              limit: limit
             }
         );
     },
diff --git a/public/js/components/DashboardWidget/News.js b/public/js/components/DashboardWidget/News.js
index 2bd778283..01affc4f4 100755
--- a/public/js/components/DashboardWidget/News.js
+++ b/public/js/components/DashboardWidget/News.js
@@ -28,30 +28,13 @@ export default {
                 }
 	},
 	created(){
-		
-      this.$fhcApi.factory.cms.news(MAX_LOADED_NEWS,this.width === 1?true:false)
+		console.log(MAX_LOADED_NEWS,"this are the max news");
+       this.$fhcApi.factory.cms.news(MAX_LOADED_NEWS)
       .then(res => { this.allNewsList = res.data })
       .catch(err => { console.error('ERROR: ', err.response.data) });
-    
+     
 		this.$emit('setConfig', false);
 	},
-  mounted(){
-    
-    this.$nextTick(() =>{
-
-      console.log(this.$refs.htmlContent,"this is the html content");
-      /* //console.log(this.$refs.htmlContent,"this is the refs content");
-      let newsItems = document.getElementsByClassName("news-list");
-      console.log(newsItems,"i am printing something");
-      for(let item of newsItems){
-        //console.log(item,"this is the item");
-        item.style.maxHeight = "100px";
-        item.style.overflow = "scroll";
-      } */
-    });
-    
-     
-  },
 	methods: {
 		setSingleNews(singleNews){
 			this.singleNews = singleNews;
@@ -70,7 +53,7 @@ export default {
         <div  v-for="news in newsList" :key="news.id" class="mt-2">
           <div  class="card">
             <div class=" card-body">
-              <a href="#newsModal" class="stretched-link" @click="setSingleNews(news)">{{ news.betreff }}</a><br>
+              <a href="#newsModal" class="stretched-link" @click="setSingleNews(news)">{{ news.content_obj.betreff?news.content_obj.betreff:'Kein Betreff vorhanden' }}</a><br>
               <span class="small text-muted">{{ formatDateTime(news.insertamum) }}</span>
             </div>
           </div>
@@ -79,7 +62,7 @@ export default {
       <div v-else-if="width > 1 && height === 1" class="h-100" :class="'row row-cols-' + width">
         <div class="h-100" v-for="news in newsList" :key="news.id">
             
-              <div class="news-content h-100" :style="'--news-widget-height: '+height" ref="htmlContent" ><div v-html="news.content"></div></div>
+              <div class="news-content h-100" :style="'--news-widget-height: '+height" ref="htmlContent" v-html="news.content_obj.content"></div>
                    
             
           </div>
@@ -87,7 +70,7 @@ export default {
        <div v-else class="h-100" :class="'row row-cols-' + width">
         <div class="h-100" v-for="news in newsList" :key="news.id">
             
-              <div class="news-content h-100" :style="'--news-widget-height: '+height" ref="htmlContent" v-html="news.content"></div>
+              <div class="news-content h-100" :style="'--news-widget-height: '+height" ref="htmlContent" v-html="news.content_obj.content"></div>
             
           </div>
       </div>
@@ -101,9 +84,8 @@ export default {
       <div class="row">
         <div class="col-5"><img :src="placeHolderImgURL" class="img-fluid rounded-start"></div>
         <div class="col-7 d-flex align-items-end">
-          <p>{{ singleNews.betreff }}<br><small class="text-muted">{{ formatDateTime(singleNews.insertamum) }}</small></p>
+        <p>{{ singleNews?.content_obj?.betreff?singleNews?.content_obj?.betreff:'Kein Betreff vorhanden' }}<br><small class="text-muted">{{ formatDateTime(singleNews.insertamum) }}</small></p>
         </div>
-      </div>
     </template>
     <template #default>{{ singleNews.text }}</template>
   </BsModal>

From 4640db5affac95cf93908f53b5e0f11ef3ee5d05 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 26 Jun 2024 14:17:44 +0200
Subject: [PATCH 0853/1461] adds a view components for the news if the content
 that gets loaded has the template_kurzbz news

---
 application/controllers/CisVue/Cms.php        |  1 +
 .../controllers/api/frontend/v1/Cms.php       | 11 +++---
 public/js/components/Cis/Cms/Content.js       |  9 +++--
 .../components/Cis/Cms/Content_types/News.js  | 38 +++++++++++++++++++
 public/js/components/DashboardWidget/News.js  | 24 ++++++++----
 5 files changed, 67 insertions(+), 16 deletions(-)
 create mode 100644 public/js/components/Cis/Cms/Content_types/News.js

diff --git a/application/controllers/CisVue/Cms.php b/application/controllers/CisVue/Cms.php
index cf9519e28..d41dfc3db 100755
--- a/application/controllers/CisVue/Cms.php
+++ b/application/controllers/CisVue/Cms.php
@@ -51,6 +51,7 @@ class Cms extends FHC_Controller
 			$this->terminateWithError(getError($content));	
 
 		$content = getData($content);
+		
 		if(NULL === $content)
 			$this->terminateWithError("Content not found");
 
diff --git a/application/controllers/api/frontend/v1/Cms.php b/application/controllers/api/frontend/v1/Cms.php
index f6c1ba7bf..50ce50805 100644
--- a/application/controllers/api/frontend/v1/Cms.php
+++ b/application/controllers/api/frontend/v1/Cms.php
@@ -48,9 +48,10 @@ class Cms extends FHCAPI_Controller
 
 	private function fetchContent($content_id){
 		$content = $this->cmslib->getContent($content_id);
-
-		if (isError($content))
-            $this->terminateWithError(getError($content), self::ERROR_TYPE_GENERAL);
+		
+		if (isError($content)){
+			$this->terminateWithError(getError($content), self::ERROR_TYPE_GENERAL);
+		}
 
 		if(getData($content)){
 			return getData($content);
@@ -79,7 +80,7 @@ class Cms extends FHCAPI_Controller
 
 		$content = $this->fetchContent($content_id); 
 
-		$this->terminateWithSuccess(getData($content));
+		$this->terminateWithSuccess($content);
 	}
 
 	/**
@@ -130,7 +131,7 @@ class Cms extends FHCAPI_Controller
 
 		// collect the content of the news
 		foreach($news as $news_element){
-			$this->addMeta("asdfs",$news_element->content_id);
+			$this->addMeta("content_id",$news_element->content_id);
 			$news_element->content_obj = $this->fetchContent($news_element->content_id);
 		}
 
diff --git a/public/js/components/Cis/Cms/Content.js b/public/js/components/Cis/Cms/Content.js
index efd1de7e8..f724d13c7 100644
--- a/public/js/components/Cis/Cms/Content.js
+++ b/public/js/components/Cis/Cms/Content.js
@@ -1,4 +1,5 @@
 import raum_contentmittitel from './Content_types/Raum_contentmittitel.js'
+import news from './Content_types/News.js'
 
 
 export default {
@@ -32,15 +33,17 @@ export default {
     };
   },
   created() {
-    console.log("this is the api", this.$fhcApi);
     this.$fhcApi.factory.cms.content(this.content_id,this.version, this.sprache, this.sichtbar).then(res =>{
         this.content = res.data.content;
-        this.content_type = res.data.type;
+        this.content_type=res.data.content;
     });
+  },
+  mounted(){
+    
   },
   template: /*html*/ `
     <!-- div that contains the content -->
-    <component :is="content_type" v-if="content" :content="content" />
+    <component :is="'raum_contentmittitel'" v-if="content" :content="content" />
     <p v-else>No content is available to display</p>
 
     `,
diff --git a/public/js/components/Cis/Cms/Content_types/News.js b/public/js/components/Cis/Cms/Content_types/News.js
new file mode 100644
index 000000000..f29936dc1
--- /dev/null
+++ b/public/js/components/Cis/Cms/Content_types/News.js
@@ -0,0 +1,38 @@
+
+export default {
+    props:{
+      content:{
+          type:String,
+          required:true,
+      },
+    },
+    mounted(){
+        document.querySelectorAll("#cms [data-confirm]").forEach((el) => {
+            el.addEventListener("click", (evt) => {
+              evt.preventDefault();
+              BsConfirm.popup(el.dataset.confirm)
+                .then(() => {
+                  Axios.get(el.href)
+                    .then((res) => {
+                      // TODO(chris): check for success then show message and/or reload
+                      location = location;
+                    })
+                    .catch((err) => console.error("ERROR:", err));
+                })
+                .catch(() => {});
+            });
+          });
+          document.querySelectorAll("#cms [data-href]").forEach((el) => {
+            el.href = el.dataset.href.replace(
+              /^ROOT\//,
+              FHC_JS_DATA_STORAGE_OBJECT.app_root
+            );
+          });
+    },
+    template: /*html*/ `
+      <!-- div that contains the content -->
+      <div v-html="content" v-if="content" :content="content" />
+      <p v-else>Content was not found</p>
+      `,
+  };
+  
\ No newline at end of file
diff --git a/public/js/components/DashboardWidget/News.js b/public/js/components/DashboardWidget/News.js
index 01affc4f4..351dcb146 100755
--- a/public/js/components/DashboardWidget/News.js
+++ b/public/js/components/DashboardWidget/News.js
@@ -13,6 +13,9 @@ export default {
 		AbstractWidget
 	],
 	computed: {
+
+    
+
 		newsList(){
 			//Return news amount depending on widget width and size
 			let quantity = this.width;
@@ -28,14 +31,18 @@ export default {
                 }
 	},
 	created(){
-		console.log(MAX_LOADED_NEWS,"this are the max news");
-       this.$fhcApi.factory.cms.news(MAX_LOADED_NEWS)
-      .then(res => { this.allNewsList = res.data })
-      .catch(err => { console.error('ERROR: ', err.response.data) });
-     
+		this.$fhcApi.factory.cms.news(MAX_LOADED_NEWS)
+    .then(res => { this.allNewsList = res.data })
+    .catch(err => { console.error('ERROR: ', err.response.data) });
+
+      
 		this.$emit('setConfig', false);
 	},
 	methods: {
+
+    contentURI: function(content_id){
+      return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/CisVue/Cms/content/' + content_id;
+    },
 		setSingleNews(singleNews){
 			this.singleNews = singleNews;
 			this.$refs.newsModal.show();
@@ -53,7 +60,7 @@ export default {
         <div  v-for="news in newsList" :key="news.id" class="mt-2">
           <div  class="card">
             <div class=" card-body">
-              <a href="#newsModal" class="stretched-link" @click="setSingleNews(news)">{{ news.content_obj.betreff?news.content_obj.betreff:'Kein Betreff vorhanden' }}</a><br>
+              <a :href="contentURI(news.content_id)" class="stretched-link" >{{ news.content_obj.betreff?news.content_obj.betreff:'Kein Betreff vorhanden' }}</a><br>
               <span class="small text-muted">{{ formatDateTime(news.insertamum) }}</span>
             </div>
           </div>
@@ -78,8 +85,8 @@ export default {
 </div>
 
 
-  <!-- News Modal -->
-  <BsModal ref="newsModal" id="newsModal" dialog-class="modal-lg">
+  <!-- News Modal old way of showing the news content if clicking on the little content format-->
+  <!--<BsModal ref="newsModal" id="newsModal" dialog-class="modal-lg">
     <template #title>
       <div class="row">
         <div class="col-5"><img :src="placeHolderImgURL" class="img-fluid rounded-start"></div>
@@ -89,6 +96,7 @@ export default {
     </template>
     <template #default>{{ singleNews.text }}</template>
   </BsModal>
+  -->
 
   <!-- All News Modal -->
   <BsModal ref="allNewsModal" id="allNewsModal" dialog-class="modal-fullscreen">

From 93b7f6e57c3945a5bb7e5e939302bd4f0e6966eb Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 26 Jun 2024 15:20:19 +0200
Subject: [PATCH 0854/1461] fixes little typo

---
 application/libraries/CmsLib.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/application/libraries/CmsLib.php b/application/libraries/CmsLib.php
index 9f977ad56..746d7f831 100755
--- a/application/libraries/CmsLib.php
+++ b/application/libraries/CmsLib.php
@@ -66,7 +66,6 @@ class CmsLib
 			if (!getData($isberechtigt))
 				return error('global/keineBerechtigungFuerDieseSeite');
 		}
-		#$this->load->model('content/Content_model', 'ContentModel');
 		$content = $this->ci->ContentModel->getContent($content_id, $sprache, $version, $sichtbar, true);
 
 		if (isError($content))

From 1305633511ebc97501d6e8b60587bdcd633f072a Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 26 Jun 2024 15:38:22 +0200
Subject: [PATCH 0855/1461] removed 99% of console.logs; fixed entschuldigung
 update notiz only; added kontrolleDeleteMaxReach Constant from config;
 updateAnwesenheiten notiz fix; Entschuldigungs studiengang fetch fix;

---
 include/tw/cis_menu_lv.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/tw/cis_menu_lv.inc.php b/include/tw/cis_menu_lv.inc.php
index e55677f02..978e59de5 100644
--- a/include/tw/cis_menu_lv.inc.php
+++ b/include/tw/cis_menu_lv.inc.php
@@ -240,7 +240,7 @@ function checkZeilenUmbruch()
 		);
 	}
 
-	// Anwesenheiten neu
+	// Digitale Anwesenheiten
 	if(CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN && $angemeldet)
 	{
 
@@ -248,7 +248,7 @@ function checkZeilenUmbruch()
 		$name='';
 		$text='';
 
-		$name = 'Anwesenheiten NEU';
+		$name = 'Digitale Anwesenheiten';
 		$link= APP_ROOT."index.ci.php/extensions/FHC-Core-Anwesenheiten/?stg_kz=$studiengang_kz&sem=$semester&lvid=$lvid&sem_kurzbz=$angezeigtes_stsem";
 
 		$menu[]=array

From a540ac3f7e8ba27781c80ab4648dd8f89717d500 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 26 Jun 2024 15:58:50 +0200
Subject: [PATCH 0856/1461] adds a General view for the content_types that dont
 need any special extra computation

---
 application/controllers/CisHmvc/Cms.php        |  2 +-
 application/controllers/CisHtml/Cms.php        |  2 +-
 application/controllers/CisVue/Cms.php         |  2 +-
 public/js/components/Cis/Cms/Content.js        | 18 +++++++++++++++---
 .../Cms/Content_types/{News.js => General.js}  |  0
 5 files changed, 18 insertions(+), 6 deletions(-)
 rename public/js/components/Cis/Cms/Content_types/{News.js => General.js} (100%)

diff --git a/application/controllers/CisHmvc/Cms.php b/application/controllers/CisHmvc/Cms.php
index e01313521..d8bb3a3db 100755
--- a/application/controllers/CisHmvc/Cms.php
+++ b/application/controllers/CisHmvc/Cms.php
@@ -110,7 +110,7 @@ class Cms extends Auth_Controller
 	 */
 	public function news($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
 	{
-		$this->load->view('CisHtml/Cms/Content', ['infoscreen' => $infoscreen, 'studiengang_kz' => $studiengang_kz, 'semester' => $semester, 'mischen' => $mischen, 'titel' => $titel, 'edit' => $edit, 'sichtbar' => $sichtbar]);
+		$this->load->view('CisHtml/Cms/Content', ['infoscreen' => $infoscreen, 'studiengang_kz' => $studiengang_kz, 'semester' => $semester, 'mischen' => $mischen, 'titel' => $titel, 'edit' => $edit, 'sichtbar' => $sichtbar, "template_kurzbz"=>"news"]);
 	}
 
 	public function getNews($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
diff --git a/application/controllers/CisHtml/Cms.php b/application/controllers/CisHtml/Cms.php
index 6cb43c8bc..40126925c 100755
--- a/application/controllers/CisHtml/Cms.php
+++ b/application/controllers/CisHtml/Cms.php
@@ -75,7 +75,7 @@ class Cms extends FHC_Controller
 	 */
 	public function news($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
 	{
-		$this->load->view('CisHtml/Cms/Content', ['infoscreen' => $infoscreen, 'studiengang_kz' => $studiengang_kz, 'semester' => $semester, 'mischen' => $mischen, 'titel' => $titel, 'edit' => $edit, 'sichtbar' => $sichtbar]);
+		$this->load->view('CisHtml/Cms/Content', ['infoscreen' => $infoscreen, 'studiengang_kz' => $studiengang_kz, 'semester' => $semester, 'mischen' => $mischen, 'titel' => $titel, 'edit' => $edit, 'sichtbar' => $sichtbar, "template_kurzbz"=>"news"]);
 	}
 
 	public function getNews($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
diff --git a/application/controllers/CisVue/Cms.php b/application/controllers/CisVue/Cms.php
index d41dfc3db..f4ce98e89 100755
--- a/application/controllers/CisVue/Cms.php
+++ b/application/controllers/CisVue/Cms.php
@@ -84,7 +84,7 @@ class Cms extends FHC_Controller
 	 */
 	public function news($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
 	{
-		$this->load->view('CisHtml/Cms/Content', ['infoscreen' => $infoscreen, 'studiengang_kz' => $studiengang_kz, 'semester' => $semester, 'mischen' => $mischen, 'titel' => $titel, 'edit' => $edit, 'sichtbar' => $sichtbar]);
+		$this->load->view('CisHtml/Cms/Content', ['infoscreen' => $infoscreen, 'studiengang_kz' => $studiengang_kz, 'semester' => $semester, 'mischen' => $mischen, 'titel' => $titel, 'edit' => $edit, 'sichtbar' => $sichtbar, "template_kurzbz"=>"news"]);
 	}
 
 	public function getNews($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
diff --git a/public/js/components/Cis/Cms/Content.js b/public/js/components/Cis/Cms/Content.js
index f724d13c7..53689f162 100644
--- a/public/js/components/Cis/Cms/Content.js
+++ b/public/js/components/Cis/Cms/Content.js
@@ -1,5 +1,5 @@
 import raum_contentmittitel from './Content_types/Raum_contentmittitel.js'
-import news from './Content_types/News.js'
+import general from './Content_types/General.js'
 
 
 export default {
@@ -25,6 +25,7 @@ export default {
   },
   components:{
     raum_contentmittitel,
+    general,
   },
   data() {
     return {
@@ -32,10 +33,21 @@ export default {
       
     };
   },
+  computed:{
+    computeContentType: function(){
+      switch(this.content_type){
+        
+        case "raum_contentmittitel":
+          return "raum_contentmittitel";
+        default:
+          return "general";
+      };
+    },
+  },
   created() {
     this.$fhcApi.factory.cms.content(this.content_id,this.version, this.sprache, this.sichtbar).then(res =>{
         this.content = res.data.content;
-        this.content_type=res.data.content;
+        this.content_type=res.data.type;
     });
   },
   mounted(){
@@ -43,7 +55,7 @@ export default {
   },
   template: /*html*/ `
     <!-- div that contains the content -->
-    <component :is="'raum_contentmittitel'" v-if="content" :content="content" />
+    <component :is="computeContentType" v-if="content" :content="content" />
     <p v-else>No content is available to display</p>
 
     `,
diff --git a/public/js/components/Cis/Cms/Content_types/News.js b/public/js/components/Cis/Cms/Content_types/General.js
similarity index 100%
rename from public/js/components/Cis/Cms/Content_types/News.js
rename to public/js/components/Cis/Cms/Content_types/General.js

From 5070353bf0048a4c098600ddfae4a6cdc1e42de3 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 26 Jun 2024 16:37:54 +0200
Subject: [PATCH 0857/1461] passes the active_addons constant to the
 LvUebersicht Modal

---
 application/views/CisHtml/Dashboard.php       | 2 +-
 public/js/components/Cis/Mylv/LvUebersicht.js | 3 +++
 public/js/components/Dashboard/Dashboard.js   | 8 +++++++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/application/views/CisHtml/Dashboard.php b/application/views/CisHtml/Dashboard.php
index 1b023191e..49db7ad7c 100755
--- a/application/views/CisHtml/Dashboard.php
+++ b/application/views/CisHtml/Dashboard.php
@@ -13,7 +13,7 @@ $this->load->view('templates/CISHTML-Header', $includesArray);
 <div id="content">
 	<h2>Dashboard</h2>
 	<hr>
-	<fhc-dashboard dashboard="CIS"/>
+	<fhc-dashboard active_addons="<?php echo ACTIVE_ADDONS ?>" dashboard="CIS"/>
 </div>
 
 <?php $this->load->view('templates/CISHTML-Footer', $includesArray); ?>
diff --git a/public/js/components/Cis/Mylv/LvUebersicht.js b/public/js/components/Cis/Mylv/LvUebersicht.js
index b2ee20833..964762698 100644
--- a/public/js/components/Cis/Mylv/LvUebersicht.js
+++ b/public/js/components/Cis/Mylv/LvUebersicht.js
@@ -14,13 +14,16 @@ export default  {
             result: false,
         }
     },
+    inject:["active_addons"],
     mixins:[BsModal],
     components:{
         BsModal,
     },
     mounted(){
         this.modal = this.$refs.modalContainer;
+        
     },
+    
     template:/*html*/`
     <bs-modal ref="modalContainer" dialogClass="modal-lg">
         <template #title>
diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js
index c87ad9b65..8a3236c3e 100755
--- a/public/js/components/Dashboard/Dashboard.js
+++ b/public/js/components/Dashboard/Dashboard.js
@@ -8,8 +8,14 @@ export default {
 		DashboardWidgetPicker
 	},
 	props: [
-		"dashboard"
+		"dashboard",
+		"active_addons",
 	],
+	provide(){
+		return{
+			active_addons: this.active_addons,
+		}
+	},
 	data: () => ({
 		sections: [],
 		widgets: null

From 32e1e487a98cdc4de00ec07045c59be304299d87 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Wed, 26 Jun 2024 22:46:36 +0200
Subject: [PATCH 0858/1461] issues: enabled resolving without explicitely
 creating a resolver (by using producer method), old resolvers are still
 working. Created example for "self-resolving" issue: AbbrecherAktiv

---
 .../controllers/jobs/IssueResolver.php        |   9 +-
 application/core/IssueResolver_Controller.php |  25 +++-
 .../core/PlausiIssueProducer_Controller.php   |  20 +--
 .../issues/PlausicheckProducerLib.php         |  18 ++-
 .../issues/PlausicheckResolverLib.php         | 127 +++++++++++-------
 .../issues/plausichecks/AbbrecherAktiv.php    |  94 +++----------
 .../issues/plausichecks/PlausiChecker.php     |  96 ++++++++++++-
 application/models/system/Issue_model.php     |  22 ++-
 8 files changed, 245 insertions(+), 166 deletions(-)

diff --git a/application/controllers/jobs/IssueResolver.php b/application/controllers/jobs/IssueResolver.php
index be66a6b23..f0f13694e 100755
--- a/application/controllers/jobs/IssueResolver.php
+++ b/application/controllers/jobs/IssueResolver.php
@@ -9,7 +9,7 @@ class IssueResolver extends IssueResolver_Controller
 	{
 		parent::__construct();
 
-		// set fehler codes which can be resolved by the job
+		// set fehler codes which can be resolved by the job, with own resolver defined
 		// structure: fehlercode => class (library) name for resolving
 		$this->_codeLibMappings = array(
 			'CORE_ZGV_0001' => 'CORE_ZGV_0001',
@@ -30,7 +30,6 @@ class IssueResolver extends IssueResolver_Controller
 			'CORE_STG_0002' => 'CORE_STG_0002',
 			'CORE_STG_0003' => 'CORE_STG_0003',
 			'CORE_STG_0004' => 'CORE_STG_0004',
-			'CORE_STUDENTSTATUS_0001' => 'CORE_STUDENTSTATUS_0001',
 			'CORE_STUDENTSTATUS_0002' => 'CORE_STUDENTSTATUS_0002',
 			'CORE_STUDENTSTATUS_0003' => 'CORE_STUDENTSTATUS_0003',
 			'CORE_STUDENTSTATUS_0004' => 'CORE_STUDENTSTATUS_0004',
@@ -51,5 +50,11 @@ class IssueResolver extends IssueResolver_Controller
 			'CORE_PERSON_0003' => 'CORE_PERSON_0003',
 			'CORE_PERSON_0004' => 'CORE_PERSON_0004'
 		);
+
+		// fehler which are resolved the same way as they are produced
+		// structure: fehlercode => class (library) name for resolving
+		$this->_codeProducerLibMappings = array(
+			'CORE_STUDENTSTATUS_0001' => 'AbbrecherAktiv',
+		);
 	}
 }
diff --git a/application/core/IssueResolver_Controller.php b/application/core/IssueResolver_Controller.php
index a9091045f..ea278ddb0 100755
--- a/application/core/IssueResolver_Controller.php
+++ b/application/core/IssueResolver_Controller.php
@@ -5,18 +5,18 @@
  */
 abstract class IssueResolver_Controller extends JOB_Controller
 {
-	protected $_codeLibMappings;
+	// mappings in form fehlercode -> resolverlibrary name, fehler which have explicit resolver class defined
+	protected $_codeLibMappings = [];
+
+	// mappings in form fehlercode -> producer library name, fehler which are resolved the same way they are produced
+	protected $_codeProducerLibMappings = [];
 
 	public function __construct()
 	{
 		parent::__construct();
 
 		// pass extension name if calling from extension
-		$extensionName = isset($this->_extensionName) ? $this->_extensionName : null;
-
 		$this->load->model('system/Issue_model', 'IssueModel');
-
-		$this->load->library('issues/PlausicheckResolverLib', ['extensionName' => $extensionName]);
 	}
 
 	/**
@@ -24,14 +24,25 @@ abstract class IssueResolver_Controller extends JOB_Controller
 	 */
 	public function run()
 	{
+		$this->load->library(
+			'issues/PlausicheckResolverLib',
+			[
+				'extensionName' => $this->_extensionName ?? null,
+				'codeLibMappings' => $this->_codeLibMappings,
+				'codeProducerLibMappings' => $this->_codeProducerLibMappings
+			]
+		);
+
 		$this->logInfo("Issue resolve job started");
 
 		// load open issues with given errorcodes
-		$openIssuesRes = $this->IssueModel->getOpenIssues(array_keys($this->_codeLibMappings));
+		$openIssuesRes = $this->IssueModel->getOpenIssues(
+			array_merge(array_keys($this->_codeLibMappings), array_keys($this->_codeProducerLibMappings))
+		);
 
 		$openIssues = hasData($openIssuesRes) ? getData($openIssuesRes) : [];
 
-		$result = $this->plausicheckresolverlib->resolvePlausicheckIssues($this->_codeLibMappings, $openIssues);
+		$result = $this->plausicheckresolverlib->resolvePlausicheckIssues($openIssues);
 
 		// log if error, or log info if inserted new issue
 		foreach ($result->errors as $error) $this->logError($error);
diff --git a/application/core/PlausiIssueProducer_Controller.php b/application/core/PlausiIssueProducer_Controller.php
index d8eea61e9..5216d284c 100644
--- a/application/core/PlausiIssueProducer_Controller.php
+++ b/application/core/PlausiIssueProducer_Controller.php
@@ -5,25 +5,19 @@
  */
 abstract class PlausiIssueProducer_Controller extends JOB_Controller
 {
-	protected $_fehlerLibMappings;
+	protected $_fehlerLibMappings = [];
 	protected $_app;
 
-	public function __construct($app = null)
-	{
-		parent::__construct();
-
-		// pass extension name if calling from extension
-		$extensionName = isset($this->_extensionName) ? $this->_extensionName : null;
-
-		// load libraries
-		$this->load->library('issues/PlausicheckProducerLib', array('extensionName' => $extensionName, 'app' => $this->_app));
-	}
-
 	protected function producePlausicheckIssues($params)
 	{
+		$this->load->library(
+			'issues/PlausicheckProducerLib',
+			['extensionName' => $this->_extensionName ?? null, 'app' => $this->_app, 'fehlerLibMappings' => $this->_fehlerLibMappings]
+		);
+
 		$this->logInfo("Plausicheck issue producer job started");
 
-		$result = $this->plausicheckproducerlib->producePlausicheckIssues($this->_fehlerLibMappings, $params);
+		$result = $this->plausicheckproducerlib->producePlausicheckIssues($params);
 
 		// log if error, or log info if inserted new issue
 		foreach ($result->errors as $error) $this->logError($error);
diff --git a/application/libraries/issues/PlausicheckProducerLib.php b/application/libraries/issues/PlausicheckProducerLib.php
index e7a772e59..cea9967fb 100644
--- a/application/libraries/issues/PlausicheckProducerLib.php
+++ b/application/libraries/issues/PlausicheckProducerLib.php
@@ -12,12 +12,16 @@ class PlausicheckProducerLib
 
 	private $_ci; // ci instance
 	private $_extensionName; // name of extension
-	private $_konfiguration = array(); // configuration parameters
+	private $_konfiguration = []; // configuration parameters
+	private $_fehlerLibMappings = []; // mappings of fehler and libraries for producing them
+	private $_isForResolutionCheck = false; // mappings of fehler and libraries for producing them
 
 	public function __construct($params = null)
 	{
 		// set extension name if called from extension
 		if (isset($params['extensionName'])) $this->_extensionName = $params['extensionName'];
+		if (isset($params['fehlerLibMappings'])) $this->_fehlerLibMappings = $params['fehlerLibMappings'];
+		if (isset($params['isForResolutionCheck'])) $this->_isForResolutionCheck = $params['isForResolutionCheck'];
 
 		// set application
 		$app = isset($params['app']) ? $params['app'] : null;
@@ -45,18 +49,17 @@ class PlausicheckProducerLib
 	}
 
 	/**
-	 * Produces multiple plausicheck issues at once.
-	 * @param array $fehlerLibMappings contains fehler type to check and library responsible for check (fehler_kurzbz => libName)
+	 * Produces multiple plausicheck issues at once and saved them to db.
 	 * @param array $params passed to each plausicheck
 	 * @return result object with occured error and info
 	 */
-	public function producePlausicheckIssues($fehlerLibMappings, $params)
+	public function producePlausicheckIssues($params)
 	{
 		$result = new StdClass();
 		$result->errors = [];
 		$result->infos = [];
 
-		foreach ($fehlerLibMappings as $fehler_kurzbz => $libName)
+		foreach ($this->_fehlerLibMappings as $fehler_kurzbz => $libName)
 		{
 			$plausicheckRes = $this->producePlausicheckIssue(
 				$libName,
@@ -116,7 +119,10 @@ class PlausicheckProducerLib
 		$config = isset($this->_konfiguration[$fehler_kurzbz]) ? $this->_konfiguration[$fehler_kurzbz] : null;
 
 		// load library connected to fehlercode
-		$this->_ci->load->library($issuesLibPath . $libName, $config);
+		$this->_ci->load->library(
+			$issuesLibPath . $libName,
+			['configurationParams' => $config, 'isForResolutionCheck' => $this->_isForResolutionCheck]
+		);
 
 		$lowercaseLibName = mb_strtolower($libName);
 
diff --git a/application/libraries/issues/PlausicheckResolverLib.php b/application/libraries/issues/PlausicheckResolverLib.php
index cd88cf5be..618611cee 100644
--- a/application/libraries/issues/PlausicheckResolverLib.php
+++ b/application/libraries/issues/PlausicheckResolverLib.php
@@ -12,15 +12,20 @@ class PlausicheckResolverLib
 
 	private $_ci; // ci instance
 	private $_extensionName; // name of extension
+	private $_codeLibMappings = []; // mappings for issues which explicitly defined resolver
+	private $_codeProducerLibMappings = []; // mappings for issues which are resolved as produced
 
 	public function __construct($params = null)
 	{
 		// set extension name if called from extension
 		if (isset($params['extensionName'])) $this->_extensionName = $params['extensionName'];
+		if (isset($params['codeLibMappings'])) $this->_codeLibMappings = $params['codeLibMappings'];
+		if (isset($params['codeProducerLibMappings'])) $this->_codeProducerLibMappings = $params['codeProducerLibMappings'];
 
 		$this->_ci =& get_instance(); // get ci instance
 
 		$this->_ci->load->library('IssuesLib');
+		$this->_ci->load->library('issues/PlausicheckProducerLib', ['isForResolutionCheck' => true]);
 	}
 
 	/**
@@ -29,7 +34,7 @@ class PlausicheckResolverLib
 	 * @param array $openIssues passed issues to resolve
 	 * @return result object with occured error and info
 	 */
-	public function resolvePlausicheckIssues($codeLibMappings, $openIssues)
+	public function resolvePlausicheckIssues($openIssues)
 	{
 		$result = new StdClass();
 		$result->errors = [];
@@ -37,11 +42,6 @@ class PlausicheckResolverLib
 
 		foreach ($openIssues as $issue)
 		{
-			// ignore if Fehlercode is not in libmappings (shouldn't be checked)
-			if (!isset($codeLibMappings[$issue->fehlercode])) continue;
-
-			$libName = $codeLibMappings[$issue->fehlercode];
-
 			// add person id and oe kurzbz automatically as params, merge it with additional params
 			// decode bewerbung_parameter into assoc array
 			$params = array_merge(
@@ -49,58 +49,85 @@ class PlausicheckResolverLib
 				isset($issue->behebung_parameter) ? json_decode($issue->behebung_parameter, true) : array()
 			);
 
-			// if called from extension (extension name set), path includes extension names
-			$libRootPath = isset($this->_extensionName) ? self::EXTENSIONS_FOLDER . '/' . $this->_extensionName . '/' : '';
+			$issueResolved = false;
 
-			// path for loading issue library
-			$issuesLibPath = $libRootPath . self::ISSUE_RESOLVERS_FOLDER . '/';
-
-			// file path of library for check if file exists
-			$issuesLibFilePath = DOC_ROOT . self::CI_PATH
-				. '/' . $libRootPath . self::CI_LIBRARY_FOLDER . '/' . self::ISSUE_RESOLVERS_FOLDER . '/' . $libName . '.php';
-
-			// check if library file exists
-			if (!file_exists($issuesLibFilePath))
+			// ignore if Fehlercode is not in libmappings (shouldn't be checked)
+			if (isset($this->_codeLibMappings[$issue->fehlercode]))
 			{
-				// log error and continue with next issue if not
-				$result->errors[] = "Issue library file " . $issuesLibFilePath . " does not exist";
-				continue;
-			}
+				$libName = $this->_codeLibMappings[$issue->fehlercode];
 
-			// load library connected to fehlercode
-			$this->_ci->load->library($issuesLibPath . $libName);
+				// if called from extension (extension name set), path includes extension names
+				$libRootPath = isset($this->_extensionName) ? self::EXTENSIONS_FOLDER . '/' . $this->_extensionName . '/' : '';
 
-			$lowercaseLibName = mb_strtolower($libName);
+				// path for loading issue library
+				$issuesLibPath = $libRootPath . self::ISSUE_RESOLVERS_FOLDER . '/';
 
-			// check if method is defined in library class
-			if (!is_callable(array($this->_ci->{$lowercaseLibName}, self::CHECK_ISSUE_RESOLVED_METHOD_NAME)))
-			{
-				// log error and continue with next issue if not
-				$result->errors[] = "Method " . self::CHECK_ISSUE_RESOLVED_METHOD_NAME . " is not defined in library $lowercaseLibName";
-				continue;
-			}
+				// file path of library for check if file exists
+				$issuesLibFilePath = DOC_ROOT . self::CI_PATH
+					. '/' . $libRootPath . self::CI_LIBRARY_FOLDER . '/' . self::ISSUE_RESOLVERS_FOLDER . '/' . $libName . '.php';
 
-			// call the function for checking for issue resolution
-			$issueResolvedRes = $this->_ci->{$lowercaseLibName}->{self::CHECK_ISSUE_RESOLVED_METHOD_NAME}($params);
-
-			if (isError($issueResolvedRes))
-			{
-				$result->errors[] = getError($issueResolvedRes);
-			}
-			else
-			{
-				$issueResolvedData = getData($issueResolvedRes);
-
-				if ($issueResolvedData === true)
+				// check if library file exists
+				if (!file_exists($issuesLibFilePath))
 				{
-					// set issue to resolved if needed
-					$behobenRes = $this->_ci->issueslib->setBehoben($issue->issue_id, null);
-
-					if (isError($behobenRes))
-						$result->errors[] = getError($behobenRes);
-					else
-						$result->infos[] = "Issue " . $issue->issue_id . " successfully resolved";
+					// log error and continue with next issue if not
+					$result->errors[] = "Issue library file " . $issuesLibFilePath . " does not exist";
+					continue;
 				}
+
+				// load library connected to fehlercode
+				$this->_ci->load->library($issuesLibPath . $libName);
+
+				$lowercaseLibName = mb_strtolower($libName);
+
+				// check if method is defined in library class
+				if (!is_callable(array($this->_ci->{$lowercaseLibName}, self::CHECK_ISSUE_RESOLVED_METHOD_NAME)))
+				{
+					// log error and continue with next issue if not
+					$result->errors[] = "Method " . self::CHECK_ISSUE_RESOLVED_METHOD_NAME . " is not defined in library $lowercaseLibName";
+					continue;
+				}
+
+				// call the function for checking for issue resolution
+				$issueResolvedRes = $this->_ci->{$lowercaseLibName}->{self::CHECK_ISSUE_RESOLVED_METHOD_NAME}($params);
+
+				if (isError($issueResolvedRes))
+				{
+					$result->errors[] = getError($issueResolvedRes);
+				}
+				else
+				{
+					$issueResolved = getData($issueResolvedRes) === true;
+				}
+			}
+			elseif (isset($this->_codeProducerLibMappings[$issue->fehlercode]))
+			{
+				$libName = $this->_codeProducerLibMappings[$issue->fehlercode];
+
+				$issueResolvedRes = $this->_ci->plausicheckproducerlib->producePlausicheckIssue(
+					$libName,
+					$issue->fehler_kurzbz,
+					$params
+				);
+
+				if (isError($issueResolvedRes))
+				{
+					$result->errors[] = getError($issueResolvedRes);
+				}
+				else
+				{
+					$issueResolved = !hasData($issueResolvedRes);
+				}
+			}
+
+			// set issue to resolved if needed
+			if ($issueResolved)
+			{
+				$behobenRes = $this->_ci->issueslib->setBehoben($issue->issue_id, null);
+
+				if (isError($behobenRes))
+					$result->errors[] = getError($behobenRes);
+				else
+					$result->infos[] = "Issue " . $issue->issue_id . " successfully resolved";
 			}
 		}
 
diff --git a/application/libraries/issues/plausichecks/AbbrecherAktiv.php b/application/libraries/issues/plausichecks/AbbrecherAktiv.php
index 9eae389b5..464b77a30 100644
--- a/application/libraries/issues/plausichecks/AbbrecherAktiv.php
+++ b/application/libraries/issues/plausichecks/AbbrecherAktiv.php
@@ -9,83 +9,21 @@ require_once('PlausiChecker.php');
  */
 class AbbrecherAktiv extends PlausiChecker
 {
-	public function executePlausiCheck($params)
-	{
-		$results = array();
+	protected $_base_sql = "
+		SELECT
+			pre.person_id, pre.prestudent_id, stg.oe_kurzbz AS prestudent_stg_oe_kurzbz
+		FROM
+			public.tbl_prestudentstatus pre_status
+			JOIN public.tbl_prestudent pre USING(prestudent_id)
+			JOIN public.tbl_student student USING(prestudent_id)
+			JOIN public.tbl_benutzer benutzer on(benutzer.uid=student.student_uid)
+			JOIN public.tbl_studiengang stg ON pre.studiengang_kz = stg.studiengang_kz
+		WHERE
+			pre_status.status_kurzbz ='Abbrecher'
+			AND benutzer.aktiv=true";
 
-		// get parameters from config
-		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
-
-		// pass parameters needed for plausicheck
-		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-
-		// get all students failing the plausicheck
-		$prestudentRes = $this->getAbbrecherAktiv($studiengang_kz, null, $exkludierte_studiengang_kz);
-
-		if (isError($prestudentRes)) return $prestudentRes;
-
-		if (hasData($prestudentRes))
-		{
-			$prestudents = getData($prestudentRes);
-
-			// populate results with data necessary for writing issues
-			foreach ($prestudents as $prestudent)
-			{
-				$results[] = array(
-					'person_id' => $prestudent->person_id,
-					'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz,
-					'fehlertext_params' => array('prestudent_id' => $prestudent->prestudent_id),
-					'resolution_params' => array('prestudent_id' => $prestudent->prestudent_id)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-
-	/**
-	 * Abbrecher cannot be active.
-	 * @param studiengang_kz int if check is to be executed for certain Studiengang
-	 * @param prestudent_id int if check is to be executed only for one prestudent
-	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
-	 * @return success with prestudents or error
-	 */
-	public function getAbbrecherAktiv($studiengang_kz = null, $prestudent_id = null, $exkludierte_studiengang_kz = null)
-	{
-		$params = array();
-
-		$qry = "
-			SELECT
-				pre.person_id, pre.prestudent_id, stg.oe_kurzbz AS prestudent_stg_oe_kurzbz
-			FROM
-				public.tbl_prestudentstatus pre_status
-				JOIN public.tbl_prestudent pre USING(prestudent_id)
-				JOIN public.tbl_student student USING(prestudent_id)
-				JOIN public.tbl_benutzer benutzer on(benutzer.uid=student.student_uid)
-				JOIN public.tbl_studiengang stg ON pre.studiengang_kz = stg.studiengang_kz
-			WHERE
-				pre_status.status_kurzbz ='Abbrecher'
-				AND benutzer.aktiv=true";
-
-		if (isset($studiengang_kz))
-		{
-			$qry .= " AND stg.studiengang_kz = ?";
-			$params[] = $studiengang_kz;
-		}
-
-		if (isset($prestudent_id))
-		{
-			$qry .= " AND pre.prestudent_id = ?";
-			$params[] = $prestudent_id;
-		}
-
-		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
-		{
-			$qry .= " AND stg.studiengang_kz NOT IN ?";
-			$params[] = $exkludierte_studiengang_kz;
-		}
-
-		return $this->_db->execReadOnlyQuery($qry, $params);
-	}
+	protected $_config_params = ['exkludierteStudiengaenge' => " AND stg.studiengang_kz NOT IN ?"];
+	protected $_params_for_checking = ['studiengang_kz' => " AND stg.studiengang_kz = ?", 'prestudent_id' => " AND pre.prestudent_id = ?"];
+	protected $_fehlertext_params = ['prestudent_id'];
+	protected $_resolution_params = ['prestudent_id'];
 }
diff --git a/application/libraries/issues/plausichecks/PlausiChecker.php b/application/libraries/issues/plausichecks/PlausiChecker.php
index 086a44cc4..5e9c2469f 100644
--- a/application/libraries/issues/plausichecks/PlausiChecker.php
+++ b/application/libraries/issues/plausichecks/PlausiChecker.php
@@ -6,15 +6,25 @@
 abstract class PlausiChecker
 {
 	protected $_ci; // code igniter instance
-	protected $_config; // configuration parameters for this plausicheck
+	protected $_config; // all applicable configuration parameters for this plausicheck
 	protected $_db; // database for queries
 
-	public function __construct($configurationParams = null)
+	protected $_isForResolutionCheck;
+
+	protected $_config_params = []; // name of all config params which should be applied for this plausicheck, with sql [name] => [sql]
+	protected $_params_for_checking = []; // name of all passed params for checking, with sql [name] => [sql]
+
+	protected $_fehlertext_params = []; // parameter names for fehlertext params used for this plausicheck
+	protected $_resolution_params = []; // parameter names for resolution params used for this plausicheck
+
+	public function __construct($params = null)
 	{
 		$this->_ci =& get_instance(); // get code igniter instance
 
 		// set configuration
-		$this->_config = $configurationParams;
+		$this->_config = $params['configurationParams'] ?? [];
+
+		$this->_isForResolutionCheck = $params['isForResolutionCheck'] ?? false;
 
 		// get database for queries
 		$this->_db = new DB_Model();
@@ -25,5 +35,83 @@ abstract class PlausiChecker
 	 * @param $paramsForChecking array parameters needed for executing the check
 	 * @return array with objects which failed the plausi check
 	 */
-	abstract public function executePlausiCheck($paramsForChecking);
+	public function executePlausiCheck($paramsForChecking)
+	{
+		$results = [];
+		$params = [];
+		$qry = $this->_base_sql;
+
+		if ($this->_isForResolutionCheck == true)
+		{
+			foreach ($this->_resolution_params as $resParam)
+			{
+				if (!isset($paramsForChecking[$resParam]))
+					return error("$resParam missing".(isset($paramsForChecking['issue_id']) ? ", issue ID: ".$paramsForChecking['issue_id'] : ""));
+			}
+		}
+
+		// add config params to query
+		if (isset($this->_config_params) && !isEmptyArray($this->_config_params))
+		{
+			foreach ($this->_config_params as $param_name => $param_sql)
+			{
+				if (isset($this->_config[$param_name]))
+				{
+					$qry .= $param_sql;
+					$params[] = $this->_config[$param_name];
+				}
+			}
+		}
+
+		// add check params to query
+		if (isset($this->_params_for_checking) && !isEmptyArray($this->_params_for_checking))
+		{
+			foreach ($this->_params_for_checking as $param_name => $param_sql)
+			{
+				if (isset($paramsForChecking[$param_name]))
+				{
+					$qry .= $param_sql;
+					$params[] = $paramsForChecking[$param_name];
+				}
+			}
+		}
+
+		$result = $this->_db->execReadOnlyQuery($qry, $params);
+
+		if (isError($result)) return $result;
+
+		if (hasData($result))
+		{
+			$data = getData($result);
+
+			// populate results with data necessary for writing issues
+			foreach ($data as $d)
+			{
+				$fehlertext_params = [];
+				$resolution_params = [];
+
+				// add params for error texts
+				foreach ($this->_fehlertext_params as $param)
+				{
+					if (isset($d->{$param})) $fehlertext_params[$param] = $d->{$param};
+				}
+
+				// add params for resolution of issue
+				foreach ($this->_resolution_params as $param)
+				{
+					if (isset($d->{$param})) $resolution_params[$param] = $d->{$param};
+				}
+
+				$results[] = array(
+					'person_id' => $d->person_id,
+					'oe_kurzbz' => $d->prestudent_stg_oe_kurzbz,
+					'fehlertext_params' => $fehlertext_params,
+					'resolution_params' => $resolution_params
+				);
+			}
+		}
+
+		// return the results
+		return success($results);
+	}
 }
diff --git a/application/models/system/Issue_model.php b/application/models/system/Issue_model.php
index 3d39e9879..331b0f050 100644
--- a/application/models/system/Issue_model.php
+++ b/application/models/system/Issue_model.php
@@ -22,13 +22,23 @@ class Issue_model extends DB_Model
 	 */
 	public function getOpenIssues($fehlercodes, $person_id = null, $oe_kurzbz = null, $fehlercode_extern = null)
 	{
-		$params = array($fehlercodes);
+		$params = array();
 		// issue exists for a fehlercode (or fehlercode_extern), person_id, oe_kurzbz, if not verarbeitet yet
-		$qry = 'SELECT issue_id, fehlercode, inhalt, fehlercode_extern, inhalt_extern, person_id, oe_kurzbz,
-       					behebung_parameter, datum, verarbeitetvon, verarbeitetamum
-				FROM system.tbl_issue
-				WHERE fehlercode IN ?
-				AND verarbeitetamum IS NULL';
+		$qry = 'SELECT
+					iss.issue_id, iss.fehlercode, fe.fehler_kurzbz, iss.inhalt, iss.fehlercode_extern,
+					iss.inhalt_extern, iss.person_id, iss.oe_kurzbz, iss.behebung_parameter,
+					iss.datum, iss.verarbeitetvon, iss.verarbeitetamum
+				FROM
+					system.tbl_issue iss
+					JOIN system.tbl_fehler fe USING (fehlercode)
+				WHERE
+					verarbeitetamum IS NULL';
+
+		if (!isEmptyArray($fehlercodes))
+		{
+			$qry .= ' AND fehlercode IN ?';
+			$params[] = $fehlercodes;
+		}
 
 		if (!isEmptyString($fehlercode_extern))
 		{

From b784ad6b26eca0f752290c4d3d16839f95289092 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 27 Jun 2024 09:42:15 +0200
Subject: [PATCH 0859/1461] Notizen: fixing DB transaction in Delete function &
 Code Cleanup

---
 application/core/Notiz_Controller.php | 46 +++++++--------------------
 1 file changed, 12 insertions(+), 34 deletions(-)

diff --git a/application/core/Notiz_Controller.php b/application/core/Notiz_Controller.php
index 618b6a2ef..e9d5ab1ea 100644
--- a/application/core/Notiz_Controller.php
+++ b/application/core/Notiz_Controller.php
@@ -396,7 +396,6 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 	{
 		$this->load->library('DmsLib');
 
-		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
 		$notiz_id = $this->input->post('notiz_id');
 		$typeId = $this->input->post('type_id');
 		$id = $this->input->post('id');
@@ -404,43 +403,24 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		//TODO(manu): define Permissions for deletion document if filecomponent finished
 
 		//get dms_id from notizdokument
-		$dms_id_arr = [];
 		$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
 
 		$result = $this->NotizdokumentModel->loadWhere(array('notiz_id' => $notiz_id));
 
-		if (isError($result))
-		{
-			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
+		$result = $this->getDataOrTerminateWithError($result);
 
-		if(hasData($result))
-		{
-			$result = getData($result);
-			foreach ($result as $doc) {
-				$dms_id_arr[] = $doc->dms_id;
-			}
-		}
-
-		if($dms_id_arr)
-		{
-			// Start DB transaction
-			$this->db->trans_start();
+		// Start DB transaction
+		$this->db->trans_start();
 
+		if ($result)
 			$this->load->library('DmsLib');
 
-
-			foreach($dms_id_arr as $dms_id)
+		foreach ($result as $doc) {
+			$res = $this->dmslib->removeAll($doc->dms_id);
+			if (isError($result))
 			{
-				$result = $this->dmslib->removeAll($dms_id);
-
-				if (isError($result))
-				{
-					$this->db->trans_rollback();
-					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-				}
-
-				$this->outputJson($result);
+				$this->db->trans_rollback();
+				$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 			}
 		}
 
@@ -455,9 +435,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		$this->load->model('person/Notiz_model', 'NotizModel');
 
 		//Delete Note
-		$result = $this->NotizModel->delete(
-			array('notiz_id' => $notiz_id)
-		);
+		$result = $this->NotizModel->delete($notiz_id);
 
 		if (isError($result))
 		{
@@ -469,8 +447,8 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 			return $this->terminateWithError($this->p->t('ui','error_missingId', ['id'=> 'Notiz_id']), self::ERROR_TYPE_GENERAL);
 		}
 
-		$this->db->trans_rollback();
-		return $this->terminateWithSuccess(current(getData($result)));
+		$this->db->trans_complete();
+		return $this->terminateWithSuccess(getData($result));
 	}
 
 	public function loadDokumente()

From 5658e7a0b4c046a93c976aa573504bbb999380b8 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 27 Jun 2024 09:42:59 +0200
Subject: [PATCH 0860/1461] StV: Notizen: getting rid of horizontal scrollbar

---
 public/js/components/Stv/Studentenverwaltung/Details/Notizen.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
index 7f09d3d05..ec8c18711 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
@@ -8,7 +8,7 @@ export default {
 		modelValue: Object
 	},
 	template: `
-	<div class="stv-details-notizen h-100 pb-3">
+	<div class="stv-details-notizen h-100 pb-3 overflow-hidden">
 <!--	mit factory als endpoint	-->
 		<core-notiz
 			:endpoint="$fhcApi.factory.notiz.person"

From 534faef82cd515391d2ef44abb9cd7033ebafb09 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 27 Jun 2024 10:29:09 +0200
Subject: [PATCH 0861/1461] Notiz: use dms_id instead of name & code cleanup

---
 application/core/Notiz_Controller.php | 72 +++++++--------------------
 1 file changed, 18 insertions(+), 54 deletions(-)

diff --git a/application/core/Notiz_Controller.php b/application/core/Notiz_Controller.php
index e9d5ab1ea..f8a8539a0 100644
--- a/application/core/Notiz_Controller.php
+++ b/application/core/Notiz_Controller.php
@@ -300,26 +300,15 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		//update(1) loading all dms-entries with this notiz_id
 		$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
 		$this->NotizdokumentModel->addJoin('campus.tbl_dms_version', 'dms_id');
-		$dms_uploaded = null;
+		#$dms_uploaded = null;//
 
 		$result = $this->NotizdokumentModel->loadWhere(array('notiz_id' => $notiz_id));
-		if (isError($result))
-		{
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-		elseif (!hasData($result))
-		{
-			$dms_id_arr = null;
-		}
-		else
-		{
-			$result = getData($result);
-			foreach($result as $doc) {
-				$dms_id_arr[] = array(
-					'name' => $doc->name,
-					'dms_id' => $doc->dms_id
-				);
-			}
+		$result = $this->getDataOrTerminateWithError($result);
+		foreach ($result as $doc) {
+			$dms_id_arr[$doc->dms_id] = array(
+				'name' => $doc->name,
+				'dms_id' => $doc->dms_id
+			);
 		}
 
 		foreach ($_FILES as $k => $file)
@@ -327,9 +316,9 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 			//update(2) attach all new files (except type application/x.fhc-dms+json)
 			if($file["type"] == 'application/x.fhc-dms+json')
 			{
-				$dms_uploaded[] = array(
-					'name' => $file["name"]
-				);
+				$jsonFile = json_decode(file_get_contents($file['tmp_name']));
+				unset($dms_id_arr[$jsonFile->dms_id]);
+				#$dms_uploaded[] = $jsonFile->dms_id;
 			}
 			else
 			{
@@ -347,48 +336,23 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 				//Todo define in dms component: readFile, downloadFile
 				$result = $this->dmslib->upload($dms, $k, array('*'));
 
-				if (isError($result))
-				{
-					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-				}
-				$dms_id = $result->retval['dms_id'];
+				$result = $this->getDataOrTerminateWithError($result);
+				$dms_id = $result['dms_id'];
 
 				$result = $this->NotizdokumentModel->insert(array('notiz_id' => $notiz_id, 'dms_id' => $dms_id));
-				if (isError($result))
-				{
-					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-				}
+
+				$this->getDataOrTerminateWithError($result);
 			}
 		}
 
 		//update(3) check if all files have been deleted
-		if(count($dms_uploaded) != count($dms_id_arr))
+		foreach ($dms_id_arr as $file)
 		{
-			if (count($dms_uploaded) == 0)
-			{
-				$filesDeleted = $dms_id_arr;
-			}
-			else
-			{
-				$upload_new_names = array_column($dms_uploaded, "name");
+			$result = $this->dmslib->removeAll($file['dms_id']);
 
-				$filesDeleted = array_filter($dms_id_arr, function ($file) use ($upload_new_names) {
-					return !in_array($file["name"], $upload_new_names);
-				});
-			}
-
-			foreach ($filesDeleted as $file)
-			{
-				$result = $this->dmslib->removeAll($file['dms_id']);
-
-				if (isError($result))
-				{
-					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-				}
-				else
-					$this->outputJson($result);
-			}
+			$this->getDataOrTerminateWithError($result);
 		}
+
 		return $this->terminateWithSuccess($result);
 	}
 

From ffc1241188cfda100f9cec43d1afa3cda8344bf0 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 27 Jun 2024 11:53:22 +0200
Subject: [PATCH 0862/1461] news widget 'alle News' redirects to the news URI

---
 public/js/components/DashboardWidget/News.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/public/js/components/DashboardWidget/News.js b/public/js/components/DashboardWidget/News.js
index 351dcb146..260f65353 100755
--- a/public/js/components/DashboardWidget/News.js
+++ b/public/js/components/DashboardWidget/News.js
@@ -42,6 +42,9 @@ export default {
 
     contentURI: function(content_id){
       return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/CisVue/Cms/content/' + content_id;
+    },
+    allNewsURI: function(){
+      return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/CisVue/Cms/news';
     },
 		setSingleNews(singleNews){
 			this.singleNews = singleNews;
@@ -53,7 +56,7 @@ export default {
       <div class="d-flex flex-column h-100 ">
       <div class="d-flex">
         <header><b>Top News</b></header>
-        <a href="#allNewsModal" data-bs-toggle="modal" class="ms-auto mb-2">
+        <a :href="allNewsURI()" class="ms-auto mb-2">
           <i class="fa fa-arrow-up-right-from-square me-1"></i>Alle News</a>
       </div>
       <div class="h-100 overflow-scroll" v-if="width == 1">
@@ -98,8 +101,8 @@ export default {
   </BsModal>
   -->
 
-  <!-- All News Modal -->
-  <BsModal ref="allNewsModal" id="allNewsModal" dialog-class="modal-fullscreen">
+  <!-- All News Modal old way of showing all the different news -->
+  <!--<BsModal ref="allNewsModal" id="allNewsModal" dialog-class="modal-fullscreen">
     <template #title>Alle News</template>
     <template #default>
     <div class="row row-cols-md-2 row-cols-lg-3 row-cols-xl-5 g-4 h-100 px-5">
@@ -115,5 +118,5 @@ export default {
           </div>
           </div>
 	</template>
-  </BsModal>`
+  </BsModal>-->`
 }

From 834d03459ba8cb1ff7a767e802b0b5b7e7d3c16e Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Thu, 27 Jun 2024 12:52:12 +0200
Subject: [PATCH 0863/1461] prestudentstatus checks studierendenverwaltung:
 changed comment

---
 application/libraries/PrestudentstatusCheckLib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/libraries/PrestudentstatusCheckLib.php b/application/libraries/PrestudentstatusCheckLib.php
index 4e1075736..587bee4e1 100644
--- a/application/libraries/PrestudentstatusCheckLib.php
+++ b/application/libraries/PrestudentstatusCheckLib.php
@@ -163,7 +163,7 @@ class PrestudentstatusCheckLib
 
 		foreach ($resultArr as $row)
 		{
-			// gerade bearbeiteten Status überspringen
+			// Status, der gerade in Bearbeitung ist, überspringen
 			if (isset($old_status_studiensemester)
 				&& isset($old_status_ausbildungssemester)
 				&& $row->status_kurzbz == $status_kurzbz

From 8fa395a5827820ce1df9a5888c35834058425cdc Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 27 Jun 2024 14:20:11 +0200
Subject: [PATCH 0864/1461] Refactor Logic Statuschanges

---
 .../api/frontend/v1/stv/Status.php            | 307 +++++++++---------
 application/libraries/PrestudentLib.php       |  35 +-
 .../libraries/PrestudentstatusCheckLib.php    | 195 +++++++++++
 .../models/crm/Prestudentstatus_model.php     |  19 +-
 application/models/crm/Student_model.php      |   2 +-
 .../Details/Prestudent/MultiStatus.js         |   4 +-
 system/phrasesupdate.php                      |  24 +-
 7 files changed, 407 insertions(+), 179 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 190dcdb73..9995320ea 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -21,6 +21,9 @@ class Status extends FHCAPI_Controller
 			'confirmStatus' => ['admin:r', 'assistenz:r']
 		]);
 
+		//Load Models
+		$this->load->model('crm/Prestudentstatus_model','PrestudentstatusModel');
+
 		// Load Libraries
 		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
 		$this->load->library('PrestudentstatusCheckLib');
@@ -74,7 +77,6 @@ class Status extends FHCAPI_Controller
 
 	public function isLastStatus($prestudent_id)
 	{
-		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
 		$result = $this->PrestudentstatusModel->checkIfLastStatusEntry($prestudent_id);
 
 
@@ -103,12 +105,7 @@ class Status extends FHCAPI_Controller
 		}
 		$result = current(getData($result));
 
-		//Variablen für Statuscheck
 		$stg = $result->studiengang_kz;
-		$reihungstest_angetreten = $result->reihungstestangetreten;
-		$name = trim($result->vorname . " ". $result->nachname);
-		$zgv_code = $result->zgv_code;
-
 		$isStudent = false;
 
 		if(!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg))
@@ -119,7 +116,6 @@ class Status extends FHCAPI_Controller
 		}
 
 		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
 
 		$uid = getAuthUID();
 		$status_kurzbz = $this->input->post('status_kurzbz');
@@ -135,8 +131,6 @@ class Status extends FHCAPI_Controller
 		$bestaetigtvon = $uid;
 		$name = $this->input->post('name');
 
-
-
 		//Form Validation
 		$this->load->library('form_validation');
 
@@ -162,13 +156,13 @@ class Status extends FHCAPI_Controller
 			$lastStatusData = current(getData($result));
 
 		//Different handling depending on newStatus
-		if($status_kurzbz == 'Absolvent' || $status_kurzbz == 'Diplomand')
+		if($status_kurzbz == Prestudentstatus_model::STATUS_ABSOLVENT || $status_kurzbz == Prestudentstatus_model::STATUS_DIPLOMAND)
 		{
 			$ausbildungssemester = $lastStatusData->ausbildungssemester;
 		}
 
 		//check if Rolle already exists
-		$result = $this->PrestudentstatusModel->checkIfExistingPrestudentRolle(
+		$result = $this->prestudentstatuschecklib->checkIfExistingPrestudentRolle(
 			$prestudent_id,
 			$status_kurzbz,
 			$studiensemester_kurzbz,
@@ -180,30 +174,33 @@ class Status extends FHCAPI_Controller
 			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 		}
 
-		if(getData($result) == '1')
-		{
-			return $this->terminateWithError($name . ": " . $this->p->t('lehre','error_rolleBereitsVorhanden'), self::ERROR_TYPE_GENERAL);
-		}
-
-
 		//Check Reihungstest
 		if(REIHUNGSTEST_CHECK)
 		{
-			if($status_kurzbz=='Bewerber' && !$reihungstest_angetreten)
+			if($status_kurzbz==Prestudentstatus_model::STATUS_BEWERBER)
 			{
-				return $this->terminateWithError($this->p->t('lehre','error_keinReihungstestverfahren', ['name' => $name]), self::ERROR_TYPE_GENERAL);
+				$result = $this->prestudentstatuschecklib->checkIfAngetreten($prestudent_id);
+				if (isError($result))
+				{
+					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+				}
 			}
 		}
 
 		//Check ZGV
 		if(!defined("ZGV_CHECK") || ZGV_CHECK)
 		{
-			if($status_kurzbz=='Bewerber' && $zgv_code=='')
+			if($status_kurzbz==Prestudentstatus_model::STATUS_BEWERBER)
 			{
-				return $this->terminateWithError($this->p->t('lehre','error_ZGVNichtEingetragen', ['name' => $name]), self::ERROR_TYPE_GENERAL);
+				$result = $this->prestudentstatuschecklib->checkIfZGVEingetragen($prestudent_id);
+				if (isError($result))
+				{
+					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+				}
 			}
 		}
 
+
 		//Check ZGV-Master
 		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
 		$result = $this->StudiengangModel->load([
@@ -219,44 +216,36 @@ class Status extends FHCAPI_Controller
 
 		if(!defined("ZGV_CHECK") || ZGV_CHECK)
 		{
-			if($status_kurzbz=='Bewerber' && $zgv_code=='' && $typ=='m')
+			if($status_kurzbz==Prestudentstatus_model::STATUS_BEWERBER && $typ=='m')
 			{
-				return $this->terminateWithError($this->p->t('lehre','error_ZGVMasterNichtEingetragen', ['name' => $name]), self::ERROR_TYPE_GENERAL);
+				$result = $this->prestudentstatuschecklib->checkIfZGVEingetragen($prestudent_id, $typ);
+				if (isError($result))
+				{
+					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+				}
 			}
 		}
 
 		//check if bewerberstatus exists
-		if($status_kurzbz == 'Aufgenommener' || $status_kurzbz == 'Wartender')
+		if($status_kurzbz == Prestudentstatus_model::STATUS_AUFGENOMMENER || $status_kurzbz == Prestudentstatus_model::STATUS_WARTENDER)
 		{
 
-			$result = $this->PrestudentstatusModel->checkIfExistingBewerberstatus($prestudent_id, $name);
+			$result = $result = $this->prestudentstatuschecklib->checkIfExistingBewerberstatus($prestudent_id);
 			if (isError($result))
 			{
 				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 			}
-			if($result->retval == "0")
-			{
-				return $this->terminateWithError($this->p->t('lehre','error_keinBewerber', ['name' => $name]), self::ERROR_TYPE_GENERAL);
-			}
 		}
 
 		//check if studentrolle already exists
-		if($status_kurzbz == 'Student' || $status_kurzbz == 'Diplomand' || $lastStatusData->status_kurzbz == 'Student')
+		if($status_kurzbz == Prestudentstatus_model::STATUS_STUDENT || $status_kurzbz == Prestudentstatus_model::STATUS_DIPLOMAND || $lastStatusData->status_kurzbz == Prestudentstatus_model::STATUS_STUDENT)
 		{
-			$this->load->model('crm/Student_model', 'StudentModel');
-			$result = $this->StudentModel->checkIfExistingStudentRolle($prestudent_id);
+			$result = $this->prestudentstatuschecklib->checkIfExistingStudentRolle($prestudent_id);
 			if (isError($result))
 			{
 				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 			}
-			if($result->retval == "0")
-			{
-				return $this->terminateWithError($this->p->t('lehre','error_noStudstatus'), self::ERROR_TYPE_GENERAL);
-			}
-			if($result->retval != "0")
-			{
-				$isStudent = true;
-			}
+			$isStudent = true;
 		}
 
 		$isBerechtigtNoStudstatusCheck =  $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung');
@@ -280,45 +269,71 @@ class Status extends FHCAPI_Controller
 				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 			}
 
-			//check if Bismeldestichtag erreicht
-			$this->load->model('codex/Bismeldestichtag_model', 'BismeldestichtagModel');
-			$result = $this->BismeldestichtagModel->checkIfMeldestichtagErreicht($new_status_datum);
+			//TODO(manu) check Berechtigung
+			//check if Bismeldestichtag erreicht ADDNEW status
+			$result = $this->prestudentstatuschecklib->checkIfMeldestichtagErreicht($new_status_datum, $studiensemester_kurzbz);
+			return $this->terminateWithError("here", self::ERROR_TYPE_GENERAL);
 			if (isError($result))
 			{
 				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 			}
-			if($result->retval == "1")
-			{
-				return $this->terminateWithError($this->p->t('lehre','error_dataVorMeldestichtag'), self::ERROR_TYPE_GENERAL);
-			}
 		}
 
-		//different handling of StudStati
-		if($status_kurzbz == 'Abbrecher')
-		{
-			$studiensemester_kurzbz = $lastStatusData->studiensemester_kurzbz;
+		//TODO(Manu) DELETE
+		// $new_status_datum = isset($datum) ? $datum : date('Y-m-d');
 
-			$this->load->model('crm/Statusgrund_model', 'StatusgrundModel');
-			$result = $this->StatusgrundModel->load($statusgrund_id);
-			if (isError($result))
-			{
-				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			}
-			$result = current(getData($result));
-			$statusgrund_kurzbz = $result->statusgrund_kurzbz;
+		// $result = $this->prestudentstatuschecklib->checkStatusAdd(
+		// 	$prestudent_id,
+		// 	$status_kurzbz,
+		// 	$studiensemester_kurzbz,
+		// 	$new_status_datum,
+		// 	$ausbildungssemester,
+		// 	$studienplan_id
+		// );
 
-			$this->load->library('PrestudentLib');
-			$result = $this->prestudentlib->setAbbrecher($prestudent_id, $studiensemester_kurzbz, null, $statusgrund_kurzbz, $datum, $bestaetigtam, $bestaetigtvon);
-			if (isError($result))
-			{
-				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			}
-			else
-				$this->terminateWithSuccess($prestudent_id);
-		}
+		// if (isError($result))
+		// {
+		// 	return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		// }
+
+		// $this->load->model('codex/Bismeldestichtag_model', 'BismeldestichtagModel');
+		// $result = $this->BismeldestichtagModel->checkIfMeldestichtagErreicht($datum, $studiensemester_kurzbz);
+		// return $this->terminateWithError("retval: " . $result->retval, self::ERROR_TYPE_GENERAL);
+
+		// if (isError($result))
+		// {
+		// 	return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		// }
+		// if ($result->retval == "1")
+		// {
+		// 	return $this->terminateWithError($this->p->t('lehre','error_dataVorMeldestichtag'), self::ERROR_TYPE_GENERAL);
+		// }
 
 		switch($status_kurzbz){
-			case 'Unterbrecher':
+			case Prestudentstatus_model::STATUS_ABBRECHER:
+				{
+					$studiensemester_kurzbz = $lastStatusData->studiensemester_kurzbz;
+
+					$this->load->model('crm/Statusgrund_model', 'StatusgrundModel');
+					$result = $this->StatusgrundModel->load($statusgrund_id);
+					if (isError($result))
+					{
+						return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+					}
+					$result = current(getData($result));
+					$statusgrund_kurzbz = $result->statusgrund_kurzbz;
+		
+					$this->load->library('PrestudentLib');
+					$result = $this->prestudentlib->setAbbrecher($prestudent_id, $studiensemester_kurzbz, null, $statusgrund_kurzbz, $datum, $bestaetigtam, $bestaetigtvon);
+					if (isError($result))
+					{
+						return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+					}
+					else
+						$this->terminateWithSuccess($prestudent_id);
+				}
+				break;
+			case Prestudentstatus_model::STATUS_UNTERBRECHER:
 				{
 					$ausbildungssemester = $lastStatusData->ausbildungssemester;
 					$studiensemester_kurzbz = $lastStatusData->studiensemester_kurzbz;
@@ -333,46 +348,47 @@ class Status extends FHCAPI_Controller
 						$this->terminateWithSuccess($prestudent_id);
 				}
 				break;
-			case 'Student':
-			{
-				$this->load->library('PrestudentLib');
-				$result = $this->prestudentlib->setStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id, $bestaetigtam, $bestaetigtvon);
-
-				if (isError($result))
+			case Prestudentstatus_model::STATUS_STUDENT:
 				{
-					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+					$this->load->library('PrestudentLib');
+					$result = $this->prestudentlib->setStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id, $bestaetigtam, $bestaetigtvon);
+
+					if (isError($result))
+					{
+						return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+					}
+					else
+						$this->terminateWithSuccess($prestudent_id);
+
 				}
-				else
-					$this->terminateWithSuccess($prestudent_id);
-
-			}
-			break;
-			case 'Diplomand':
-			{
-				$this->load->library('PrestudentLib');
-				$result = $this->prestudentlib->setDiplomand($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
-
-				if (isError($result))
+				break;
+			case Prestudentstatus_model::STATUS_DIPLOMAND:
 				{
-					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-				}
-				else
-					$this->terminateWithSuccess($prestudent_id);
-			}
-			break;
-			case 'Absolvent':
-			{
-				$this->load->library('PrestudentLib');
-				$result = $this->prestudentlib->setAbsolvent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
+					$this->load->library('PrestudentLib');
+					$result = $this->prestudentlib->setDiplomand($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
 
-				if (isError($result))
+					if (isError($result))
+					{
+						return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+					}
+					else
+						$this->terminateWithSuccess($prestudent_id);
+				}
+				break;
+			case Prestudentstatus_model::STATUS_ABSOLVENT:
 				{
-					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-				}
-				else
-					$this->terminateWithSuccess($prestudent_id);
+					$this->load->library('PrestudentLib');
+					$result = $this->prestudentlib->setAbsolvent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
 
-			}
+					if (isError($result))
+					{
+						return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+					}
+					else
+						$this->terminateWithSuccess($prestudent_id);
+
+				}
+				break;
 			default:
 			{
 /*				if ($isStudent) {
@@ -414,8 +430,6 @@ class Status extends FHCAPI_Controller
 		$ausbildungssemester = $this->input->post('ausbildungssemester');
 		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
 
-		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
-
 		$result = $this->PrestudentstatusModel->loadWhere(
 			array(
 				'prestudent_id' => $prestudent_id,
@@ -441,9 +455,6 @@ class Status extends FHCAPI_Controller
 
 	public function deleteStatus()
 	{
-
-		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
-
 		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
 
 		$prestudent_id = $this->input->post('prestudent_id');
@@ -467,14 +478,14 @@ class Status extends FHCAPI_Controller
 
 		$isBerechtigtAdmin = $this->permissionlib->isBerechtigt('admin', null, 'suid');
 		$isBerechtigtNoStudstatusCheck = $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung', null, 'suid');
-		$isBerechtigtToDeleteAbgewiesen = $this->permissionlib->isBerechtigt('lehre/reihungstestAufsicht') && $status_kurzbz == "Abgewiesener";
+		$isBerechtigtToDeleteAbgewiesen = $this->permissionlib->isBerechtigt('lehre/reihungstestAufsicht') && $status_kurzbz == Prestudentstatus_model::STATUS_ABGEWIESENER;
 
 		if(!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg) && !$isBerechtigtToDeleteAbgewiesen)
 		{
 			return $this->terminateWithError($this->p->t('lehre','error_keineSchreibrechte'), self::ERROR_TYPE_GENERAL);
 		}
 
-		if($status_kurzbz=="Student" && !$isBerechtigtAdmin && !$isBerechtigtNoStudstatusCheck)
+		if($status_kurzbz==Prestudentstatus_model::STATUS_STUDENT && !$isBerechtigtAdmin && !$isBerechtigtNoStudstatusCheck)
 		{
 			return $this->terminateWithError($this->p->t('lehre','error_onlyAdminDeleteRolleStudent'), self::ERROR_TYPE_GENERAL);
 		}
@@ -713,7 +724,7 @@ class Status extends FHCAPI_Controller
 			);
 			if (isError($result) || !hasData($result))
 			{
-				//TODO(Manu) in this case: löschen stautus erlauben aber rückmeldung, dass Prestudent nicht gelöscht wurde
+				//TODO(Manu) in this case: löschen status erlauben aber rückmeldung, dass Prestudent nicht gelöscht wurde
 				return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 			}
 
@@ -801,13 +812,13 @@ class Status extends FHCAPI_Controller
 
 			$sqlundo =
 				"
-	INSERT INTO public.tbl_prestudent(prestudent_id, aufmerksamdurch_kurzbz, studiengang_kz, berufstaetigkeit_code, ausbildungcode,
+				INSERT INTO public.tbl_prestudent(prestudent_id, aufmerksamdurch_kurzbz, studiengang_kz, berufstaetigkeit_code, ausbildungcode,
 				zgv_code, zgvort, zgvdatum, zgvnation,zgv_erfuellt, zgvmas_code, zgvmaort, zgvmadatum, zgvmanation,zgvmas_erfuellt,
 				aufnahmeschluessel, facheinschlberuf, anmeldungreihungstest, reihungstestangetreten, reihungstest_id,
 				rt_gesamtpunkte, rt_punkte1, rt_punkte2, rt_punkte3, bismelden, person_id, anmerkung, mentor, ext_id,
 				dual, ausstellungsstaat, zgvdoktor_code, zgvdoktorort, zgvdoktordatum, zgvdoktornation,
 				gsstudientyp_kurzbz, aufnahmegruppe_kurzbz, priorisierung, zgvdoktor_erfuellt)
-	VALUES('" . $prestudent_id . "',"
+				VALUES('" . $prestudent_id . "',"
 				. $quotes_aufmerksamdurch_kurzbz . $aufmerksamdurch_kurzbz . $quotes_aufmerksamdurch_kurzbz . ","
 				. $quotes_studiengang_kz . $studiengang_kz . $quotes_studiengang_kz . ","
 				. $quotes_berufstaetigkeit_code . $berufstaetigkeit_code . $quotes_berufstaetigkeit_code . ","
@@ -846,7 +857,7 @@ class Status extends FHCAPI_Controller
 				. $quotes_aufnahmegruppe_kurzbz . $aufnahmegruppe_kurzbz . $quotes_aufnahmegruppe_kurzbz . ","
 				. $quotes_priorisierung . $priorisierung . $quotes_priorisierung . ","
 				. $quotes_zgvdoktor_erfuellt . $zgvdoktor_erfuellt . $quotes_zgvdoktor_erfuellt . ");
-	";
+			";
 
 			$this->load->model('system/Log_model', 'LogModel');
 			$result = $this->LogModel->insert([
@@ -908,7 +919,6 @@ class Status extends FHCAPI_Controller
 		}
 
 		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
 
 		$uid = getAuthUID();
 		$prestudent_id = $this->input->post('prestudent_id');
@@ -927,23 +937,19 @@ class Status extends FHCAPI_Controller
 		//check if Bismeldestichtag erreicht
 		if(!$isBerechtigtNoStudstatusCheck)
 		{
-			$this->load->model('codex/Bismeldestichtag_model', 'BismeldestichtagModel');
-			$result = $this->BismeldestichtagModel->checkIfMeldestichtagErreicht($datum);
+			$result = $this->prestudentstatuschecklib->checkIfMeldestichtagErreicht($new_status_datum);
+			return $this->terminateWithError("here2", self::ERROR_TYPE_GENERAL);
 			if (isError($result))
 			{
 				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 			}
-			if ($result->retval == "1")
-			{
-				return $this->terminateWithError($this->p->t('lehre','error_dataVorMeldestichtag'), self::ERROR_TYPE_GENERAL);
-			}
 		}
 
 		//check if Rolle already exists
 		if(($key_studiensemester_kurzbz != $studiensemester_kurzbz)
 			|| ($key_ausbildungssemester != $ausbildungssemester))
 		{
-			$result = $this->PrestudentstatusModel->checkIfExistingPrestudentRolle(
+			$result = $this->prestudentstatuschecklib->checkIfExistingPrestudentRolle(
 				$prestudent_id,
 				$status_kurzbz,
 				$studiensemester_kurzbz,
@@ -951,33 +957,22 @@ class Status extends FHCAPI_Controller
 			);
 			if (isError($result))
 			{
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson(getError($result));
-			}
-			if($result->retval == '1')
-			{
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson($result->code);
+				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 			}
 		}
 
 		//check if studentrolle already exists
-		if($status_kurzbz == 'Student' || $status_kurzbz == 'Diplomand')
+		if($status_kurzbz == Prestudentstatus_model::STATUS_STUDENT || $status_kurzbz == Prestudentstatus_model::STATUS_DIPLOMAND )
+		
+		//TODO(manu): check why $lastStatusDAta
+		// if($status_kurzbz == Prestudentstatus_model::STATUS_STUDENT || $status_kurzbz == Prestudentstatus_model::STATUS_DIPLOMAND || $lastStatusData->status_kurzbz == Prestudentstatus_model::STATUS_STUDENT)
 		{
-			$this->load->model('crm/Student_model', 'StudentModel');
-			$result = $this->StudentModel->checkIfExistingStudentRolle($prestudent_id);
+			$result = $this->prestudentstatuschecklib->checkIfExistingStudentRolle($prestudent_id);
 			if (isError($result))
 			{
 				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 			}
-			if($result->retval == "0")
-			{
-				return $this->terminateWithError($this->p->t('lehre','error_noStudstatus'), self::ERROR_TYPE_GENERAL);
-			}
-			if($result->retval != "0")
-			{
-				$isStudent = true;
-			}
+			$isStudent = true;
 		}
 
 
@@ -1109,8 +1104,6 @@ class Status extends FHCAPI_Controller
 		}
 
 		//Data Vorrücken
-		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
-
 		$result = $this->PrestudentstatusModel->loadWhere(
 			array(
 				'prestudent_id' => $key_prestudent_id,
@@ -1148,7 +1141,7 @@ class Status extends FHCAPI_Controller
 		$ausbildungssem_next = $key_ausbildungssemester+1;
 
 		//check if Rolle already exists
-		$result = $this->PrestudentstatusModel->checkIfExistingPrestudentRolle(
+		$result = $this->prestudentstatuschecklib->checkIfExistingPrestudentRolle(
 			$key_prestudent_id,
 			$key_status_kurzbz,
 			$studiensem_next,
@@ -1158,24 +1151,28 @@ class Status extends FHCAPI_Controller
 		{
 			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 		}
-		if($result->retval == '1')
-		{
-			return $this->terminateWithError($this->p->t('lehre','error_rolleBereitsVorhanden'), self::ERROR_TYPE_GENERAL);
-		}
 
 		//check if studentrolle already exists
-		if($key_status_kurzbz == 'Student')
+		// if($key_status_kurzbz == Prestudentstatus_model::STATUS_STUDENT)
+		// {
+		// 	$this->load->model('crm/Student_model', 'StudentModel');
+		// 	$result = $this->StudentModel->checkIfExistingStudentRolle($key_prestudent_id);
+		// 	if (isError($result))
+		// 	{
+		// 		return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		// 	}
+		// 	if ($result->retval == "0")
+		// 	{
+		// 		return $this->terminateWithError($this->p->t('lehre','error_noStudstatus'), self::ERROR_TYPE_GENERAL);
+		// 	}
+		// }
+		if($key_status_kurzbz == Prestudentstatus_model::STATUS_STUDENT || $key_status_kurzbz == Prestudentstatus_model::STATUS_DIPLOMAND || $lastStatusData->status_kurzbz == Prestudentstatus_model::STATUS_STUDENT)
 		{
-			$this->load->model('crm/Student_model', 'StudentModel');
-			$result = $this->StudentModel->checkIfExistingStudentRolle($key_prestudent_id);
+			$result = $this->prestudentstatuschecklib->checkIfExistingStudentRolle($key_prestudent_id);
 			if (isError($result))
 			{
 				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 			}
-			if ($result->retval == "0")
-			{
-				return $this->terminateWithError($this->p->t('lehre','error_noStudstatus'), self::ERROR_TYPE_GENERAL);
-			}
 		}
 
 		// Start DB transaction
@@ -1276,8 +1273,6 @@ class Status extends FHCAPI_Controller
 			return $this->terminateWithError($this->p->t('lehre','error_keineSchreibrechte'), self::ERROR_TYPE_GENERAL);
 		}
 
-		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
-
 		$result = $this->PrestudentstatusModel->loadWhere(
 			array(
 				'prestudent_id' => $key_prestudent_id,
diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php
index 962773384..b1a94490c 100644
--- a/application/libraries/PrestudentLib.php
+++ b/application/libraries/PrestudentLib.php
@@ -425,29 +425,30 @@ class PrestudentLib
 	public function setStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id, $bestaetigtAm, $bestaetigtVon)
 	{
 		$insertvon = getAuthUID();
-		 
-		$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id, $studiensemester_kurzbz);
+		
+		$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
 		if (isError($result))
 			return $result;
-		$result = getData($result);
+		$resultStatus = getData($result);
 
 		//if not Wiederholer
 		if($statusgrund_id != 16)
 		{
 			//check if ausbildungssemester is last
 			$this->_ci->StudiengangModel->addJoin('public.tbl_prestudent p', 'studiengang_kz');
-			$res = $this->_ci->StudiengangModel->loadWhere(['p.prestudent_id' => $prestudent_id]);
-			if(isError($res))
-				return $res;
-			if(!hasData($res))
+			$resultStg = $this->_ci->StudiengangModel->loadWhere(['p.prestudent_id' => $prestudent_id]);
+			if(isError($resultStg))
+				return $resultStg;
+			if(!hasData($resultStg))
 				return error($this->_ci->p->t('studierendenantrag', 'error_no_stg_for_prestudent', [
 					'prestudent_id' => $prestudent_id
 				]));
 
-			$studiengang = current(getData($res));
-			$prestudent_status = current($result);
 
-			if(!$result)
+			$studiengang = current(getData($resultStg));
+
+			$prestudent_status = ($resultStatus[0]);
+			if(!$prestudent_status)
 			{
 				return error($this->_ci->p->t('studierendenantrag', 'error_no_prestudent_in_sem', [
 					'prestudent_id' => $prestudent_id,
@@ -456,7 +457,6 @@ class PrestudentLib
 			}
 		}
 
-		$prestudent_status = current($result);
 		$result = $this->_ci->StudentModel->loadWhere(['prestudent_id' => $prestudent_id]);
 
 		if (isError($result))
@@ -526,10 +526,13 @@ class PrestudentLib
 	{
 		$insertvon = getAuthUID();
 
-		$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id, $studiensemester_kurzbz);
+		$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
 		if (isError($result))
 			return $result;
-		$result = getData($result);
+		if (!hasData($result))
+		return error($this->_ci->p->t('studierendenantrag', 'error_no_student_for_prestudent', ['prestudent_id' => $prestudent_id]));
+
+		$result = getData($result) ?: [];
 
 		$prestudent_status = current($result);
 		$result = $this->_ci->StudentModel->loadWhere(['prestudent_id' => $prestudent_id]);
@@ -602,7 +605,7 @@ class PrestudentLib
 
 	public function setAbsolvent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester)
 	{
-		//TODO(Manu) makes no difference
+		//TODO(Manu) why no lvb?
 /*		if (gettype($ausbildungssemester) != "integer") {
 			$ausbildungssemester = (int)$ausbildungssemester;
 		}*/
@@ -613,7 +616,7 @@ class PrestudentLib
 
 		$insertvon = getAuthUID();
 		 
-		$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id, $studiensemester_kurzbz);
+		$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
 		if (isError($result))
 			return $result;
 		$result = getData($result);
@@ -627,7 +630,7 @@ class PrestudentLib
 		if (!$result)
 			return error($this->_ci->p->t('studierendenantrag', 'error_no_student_for_prestudent', ['prestudent_id' => $prestudent_id]));
 
-	//	$student = current($result);
+		$student = current($result);
 
 		//Status updaten
 		$result = $this->_ci->PrestudentstatusModel->insert([
diff --git a/application/libraries/PrestudentstatusCheckLib.php b/application/libraries/PrestudentstatusCheckLib.php
index 4e1075736..a64e67664 100644
--- a/application/libraries/PrestudentstatusCheckLib.php
+++ b/application/libraries/PrestudentstatusCheckLib.php
@@ -27,7 +27,10 @@ class PrestudentstatusCheckLib
 		$this->_ci->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
 		$this->_ci->load->model('person/Person_model', 'PersonModel');
 		$this->_ci->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
+		$this->_ci->load->model('crm/Prestudent_model', 'PrestudentModel');
+		$this->_ci->load->model('crm/Student_model', 'StudentModel');
 		$this->_ci->load->model('organisation/Studienplan_model', 'StudienplanModel');
+		$this->_ci->load->model('codex/Bismeldestichtag_model', 'BismeldestichtagModel');
 	}
 
 	/**
@@ -93,6 +96,174 @@ class PrestudentstatusCheckLib
 		);
 	}
 
+		/**
+	 * Checks if a prestudent role already exists.
+	 * @return error if invalid
+	 * @return 1 if role already exists, 0 if it does not
+	 */
+	public function checkIfExistingPrestudentRolle(
+		$prestudent_id,
+		$status_kurzbz,
+		$tudiensemester_kurzbz,
+		$ausbildungssemester
+	) 
+	{
+		$resultApp =  $this->_getApplicationData($prestudent_id);
+		if(isError($resultApp))
+		{
+			return getData($resultApp);
+		}
+		$resultApp =  current(getData($resultApp));
+		$studentName = trim ($resultApp->vorname.' '.$resultApp->nachname);
+
+		$result =  $this->_ci->PrestudentstatusModel->checkIfExistingPrestudentRolle(
+			$prestudent_id,
+			$status_kurzbz,
+			$tudiensemester_kurzbz,
+			$ausbildungssemester
+		);
+		if(isError($result))
+		{
+			return getData($result);
+		}
+		$result = getData($result);
+
+		if($result == '1')
+		{
+			return error($studentName . ": " . $this->_ci->p->t('lehre', 'error_rolleBereitsVorhanden'));
+		}
+		return success($result);
+	}
+
+	/**
+	 * Checks if a student role already exists.
+	 * @return error if invalid
+	 * @return error, if role does not exist, else count(roles) if it does
+	 */
+	public function checkIfExistingStudentRolle($prestudent_id) 
+	{
+		$resultApp =  $this->_getApplicationData($prestudent_id);
+		if(isError($resultApp))
+		{
+			return getData($resultApp);
+		}
+		$resultApp =  current(getData($resultApp));
+		$studentName = trim ($resultApp->vorname.' '.$resultApp->nachname);
+
+		$result = $this->_ci->StudentModel->checkIfExistingStudentRolle($prestudent_id);
+		if(isError($result))
+		{
+			return getData($result);
+		}
+		$result = getData($result);
+
+		if($result == '0')
+		{
+			return error($this->_ci->p->t('lehre', 'error_noStudstatus', ['name' => $studentName]));
+		}
+		return success($result);
+	}
+
+	/**
+	 * Check if Reihungstest was admitted
+	 * @param integer $prestudent_id
+	 * @return booleans $reihungstest_angetreten, error if not angetreten
+	 */
+	public function checkIfAngetreten($prestudent_id) 
+	{
+		$result =  $this->_getApplicationData($prestudent_id);
+		if(isError($result))
+		{
+			return getData($result);
+		}
+		$result =  current(getData($result));
+		$studentName = trim ($result->vorname.' '.$result->nachname);
+
+		if (!$result->reihungstestangetreten)
+		return error($this->_ci->p->t('lehre', 'error_keinReihungstestverfahren', ['name' => $studentName]));
+
+		return success($result->reihungstestangetreten);
+	}
+
+		/**
+	 * Check if ZGV-Code is registered
+	 * @param integer $prestudent_id
+	 * @return booleans $zgv_code, error if not registered
+	 */
+	public function checkIfZGVEingetragen($prestudent_id, $typ=null) 
+	{
+		$result =  $this->_getApplicationData($prestudent_id);
+		if(isError($result))
+		{
+			return getData($result);
+		}
+		$result =  current(getData($result));
+		$studentName = trim ($result->vorname.' '.$result->nachname);
+
+		if ($typ && $typ=='m' && !$result->zgvmas_code)
+		{			
+			return error($this->_ci->p->t('lehre', 'error_ZGVMasterNichtEingetragen', ['name' => $studentName]));
+		}
+		else
+			return success($result->zgvmas_code);
+		
+
+		if(!$result->zgv_code)
+		{		
+			return error($this->_ci->p->t('lehre', 'error_ZGVNichtEingetragen', ['name' => $studentName]));
+		}
+	
+		return success($result->zgv_code);
+	}
+
+	/**
+	 * Checks if a bewerber status already exists.
+	 * @return error if invalid
+	 * @return error if no bewerberstatus, success otherwise
+	 */
+	public function checkIfExistingBewerberstatus($prestudent_id) 
+	{
+		$result =  $this->_getApplicationData($prestudent_id);
+		if(isError($result))
+		{
+			return getData($result);
+		}
+		$result =  current(getData($result));
+		$studentName = trim ($result->vorname.' '.$result->nachname);
+
+		$result =  $this->_ci->PrestudentstatusModel->checkIfExistingBewerberstatus(
+			$prestudent_id
+		);
+		if(isError($result))
+		{
+			return getData($result);
+		}
+		if(getData($result) == "0")
+		{		
+			return error($this->_ci->p->t('lehre','error_keinBewerber', ['name' => $studentName]));
+		}
+		return success(getData($result));
+	}
+
+	/**
+	 * Check if Bismeldestichtag erreicht
+	 * @param Date $statusDatum
+	 * @return error if Bismeldestichtag erreicht
+	 */
+	public function checkIfMeldestichtagErreicht($statusDatum, $studiensemester_kurzbz=null)
+	{
+		$result = $this->_ci->BismeldestichtagModel->checkIfMeldestichtagErreicht($statusDatum, $studiensemester_kurzbz);
+		if(isError($result))
+		{
+			return getData($result);
+		}
+		if(getData($result) == "1")
+		{		
+			return error($this->_ci->p->t('lehre','error_dataVorMeldestichtag'));
+		}
+		return success(getData($result));
+	}
+
 	/**
 	 * Check if History of StatusData is valid
 	 * @param integer $prestudent_id
@@ -298,4 +469,28 @@ class PrestudentstatusCheckLib
 
 		return $resultPs;
 	}
+
+
+
+
+	/**
+	 * Provides Application Data
+	 * @param integer $prestudent_id
+	 * @return error if not valid, array with ApplicationData if valid
+	 */
+	private function _getApplicationData($prestudent_id) 
+	{
+		$this->_ci->PrestudentModel->addJoin('public.tbl_person p', 'ON (p.person_id = public.tbl_prestudent.person_id)');
+		
+		$result = $this->_ci->PrestudentModel->load([
+			'prestudent_id'=> $prestudent_id,
+		]);
+		if(isError($result))
+		{
+			return getData($result);
+		}
+
+		return $result;
+	}
+
 }
diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php
index 73e2bdaee..5223d5764 100644
--- a/application/models/crm/Prestudentstatus_model.php
+++ b/application/models/crm/Prestudentstatus_model.php
@@ -8,6 +8,10 @@ class Prestudentstatus_model extends DB_Model
 	const STATUS_STUDENT = 'Student';
 	const STATUS_DIPLOMAND = 'Diplomand';
 	const STATUS_ABSOLVENT = 'Absolvent';
+	const STATUS_BEWERBER = 'Bewerber';
+	const STATUS_AUFGENOMMENER = 'Aufgenommener';
+	const STATUS_WARTENDER = 'Wartender';
+	const STATUS_ABGEWIESENER = 'Abgewiesener';
 
 	/**
 	 * Constructor
@@ -397,8 +401,18 @@ class Prestudentstatus_model extends DB_Model
 	 * @param integer $prestudent_id
 	 * @return error if no bewerberstatus, success if existing
 	 */
-	public function checkIfExistingBewerberstatus($prestudent_id, $name = null)
+	public function checkIfExistingBewerberstatus($prestudent_id)
 	{
+		$studentName = '';
+
+		$nameRes = $this->PersonModel->loadPrestudent($prestudent_id);
+
+		if (hasData($nameRes))
+		{
+			$nameData = getData($nameRes)[0];
+			$studentName = $nameData->vorname.' '.$nameData->nachname;
+		}
+
 		$qry = "SELECT
 					*
 				FROM
@@ -416,8 +430,7 @@ class Prestudentstatus_model extends DB_Model
 		}
 		elseif (!hasData($result))
 		{
-			$person = $name ? $name : "Person";
-			return success("0", $this->p->t('lehre','error_keinBewerber', ['name' => $person]));
+			return success("0", $this->p->t('lehre','error_keinBewerber', ['name' => $studentName]));
 		}
 		else
 		{
diff --git a/application/models/crm/Student_model.php b/application/models/crm/Student_model.php
index f9a1f77f3..ec97aefcc 100644
--- a/application/models/crm/Student_model.php
+++ b/application/models/crm/Student_model.php
@@ -156,7 +156,7 @@ class Student_model extends DB_Model
 				}
 				else
 				{
-					return success("0", "Ein Studentenstatus kann hier nur hinzugefuegt werden wenn die Person bereits Student ist. Um einen Bewerber zum Studenten zu machen waehlen Sie bitte unter 'Status aendern' den Punkt 'Student'");
+					return success("0");
 				}
 			} else {
 				return error("StudentModel: Error During Check if Existing Student Rolle.");
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index 1b5859733..ca3f3bd81 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -942,7 +942,9 @@ export default{
 				</div>
 				<div v-else>
 					<p>
-					{{$p.t('lehre', 'modal_askAusbildungssemPlural', { count: prestudentIds.length })}}</p>
+					{{$p.t('lehre', 'modal_askAusbildungssemPlural', { count: prestudentIds.length,
+					status: actionStatusText
+						})}}</p>
 				</div>
 				
 				<div class="row mb-3">
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index edd7e04ac..3b819a256 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -25943,13 +25943,33 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'In welches Semester sollen diese {count} PrestudentInnen verschoben werden?',
+				'text' => 'In welches Semester sollen diese {count} PrestudentInnen ({status})verschoben werden?',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'To which education semester should these {count} prestudents be moved?',
+				'text' => 'To which education semester should these {count} prestudents ({status}) be moved?',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'modal_askAusbildungssemPlural2',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'In welches Semester sollen diese {count} PrestudentInnen ({status}) verschoben werden?',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'To which education semester should these {count} prestudents ({status}) be moved?',
 				'description' => '',
 				'insertvon' => 'system'
 			)

From c34144a4e8f0385d14637760151a1753e428dad5 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 27 Jun 2024 15:09:09 +0200
Subject: [PATCH 0865/1461] creates sql query in the lehreinheit_model to query
 the studierenden Mail inside a lehrveranstaltung and creates the matching
 fhcapi methods / frontend/v1 api controllers

---
 .../controllers/api/frontend/v1/Lehre.php     | 67 +++++++++++++++++++
 .../models/education/Lehreinheit_model.php    | 36 ++++++++++
 application/views/CisHtml/Dashboard.php       |  3 +-
 public/js/api/fhcapifactory.js                |  2 +
 public/js/api/lehre.js                        | 10 +++
 public/js/components/Cis/Mylv/LvUebersicht.js | 26 +++++--
 public/js/components/Dashboard/Dashboard.js   |  2 +
 .../components/DashboardWidget/Stundenplan.js | 11 +--
 8 files changed, 145 insertions(+), 12 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/Lehre.php
 create mode 100644 public/js/api/lehre.js

diff --git a/application/controllers/api/frontend/v1/Lehre.php b/application/controllers/api/frontend/v1/Lehre.php
new file mode 100644
index 000000000..95422142d
--- /dev/null
+++ b/application/controllers/api/frontend/v1/Lehre.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright (C) 2024 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+
+class Lehre extends FHCAPI_Controller
+{
+	
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'lvStudentenMail' => self::PERM_LOGGED,
+		]);
+
+		
+
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+    /**
+	 * constructs the emails of the groups from a lehrveranstaltung
+	 */
+    public function lvStudentenMail()
+	{
+        $lehreinheit_id = $this->input->get("lehreinheit_id",TRUE);
+        
+        // return early if the required parameter is missing
+        if(!isset($lehreinheit_id))
+        {
+            $this->terminateWithError('Missing required parameter', self::ERROR_TYPE_GENERAL);
+        }
+
+        $this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
+        
+        $studentenMails = $this->LehreinheitModel->getStudentenMail($lehreinheit_id);
+
+        $studentenMails = $this->getDataOrTerminateWithError($studentenMails);
+
+        $this->terminateWithSuccess($studentenMails);
+	}
+
+	
+
+	
+}
+
diff --git a/application/models/education/Lehreinheit_model.php b/application/models/education/Lehreinheit_model.php
index 10c122b94..35281c8cc 100755
--- a/application/models/education/Lehreinheit_model.php
+++ b/application/models/education/Lehreinheit_model.php
@@ -113,4 +113,40 @@ class Lehreinheit_model extends DB_Model
 
 		return $this->execQuery($query, array($lehreinheit_id));
 	}
+
+	/**
+	 * Gets emails of all Studierende in a lehrveranstaltung
+	 * @param int $lehreinheit_id
+	 * @return array
+	 */
+	public function getStudentenMail($lehreinheit_id)
+	{
+		  
+		// logic used from cis_menu_lv.inc.php line 335
+		return $this->execReadOnlyQuery("
+		SELECT
+				CASE 
+					WHEN gruppe_kurzbz !='' THEN LOWER(gruppe_kurzbz || '@' || ?)
+					ELSE LOWER(stg_typ || stg_kurzbz || semester || TRIM(verband) || TRIM(gruppe) || '@' || ?) 
+				END AS mail
+		FROM 
+		(
+			SELECT 
+				distinct vw_lehreinheit.studiensemester_kurzbz, vw_lehreinheit.stg_kurzbz, vw_lehreinheit.stg_typ, vw_lehreinheit.semester,
+				COALESCE(vw_lehreinheit.verband,'') as verband, COALESCE(vw_lehreinheit.gruppe,'') as gruppe, vw_lehreinheit.gruppe_kurzbz, tbl_gruppe.mailgrp
+			FROM campus.vw_lehreinheit
+			LEFT JOIN public.tbl_gruppe USING(gruppe_kurzbz)
+			WHERE 
+				vw_lehreinheit.lehrveranstaltung_id=
+				(select distinct lehrveranstaltung_id from campus.vw_lehreinheit where lehreinheit_id=?)
+				AND
+				vw_lehreinheit.studiensemester_kurzbz =
+				(select distinct studiensemester_kurzbz from campus.vw_lehreinheit where lehreinheit_id=?)
+				AND (vw_lehreinheit.gruppe_kurzbz IS NULL OR
+					(vw_lehreinheit.gruppe_kurzbz IS NOT NULL AND tbl_gruppe.mailgrp = TRUE AND (SELECT COUNT(*) FROM public.tbl_benutzergruppe where gruppe_kurzbz = vw_lehreinheit.gruppe_kurzbz AND studiensemester_kurzbz = vw_lehreinheit.studiensemester_kurzbz) > 0))
+				
+		
+		) AS subquery
+		",[DOMAIN,DOMAIN,$lehreinheit_id,$lehreinheit_id ]);
+	}
 }
diff --git a/application/views/CisHtml/Dashboard.php b/application/views/CisHtml/Dashboard.php
index 49db7ad7c..c2190620d 100755
--- a/application/views/CisHtml/Dashboard.php
+++ b/application/views/CisHtml/Dashboard.php
@@ -13,7 +13,8 @@ $this->load->view('templates/CISHTML-Header', $includesArray);
 <div id="content">
 	<h2>Dashboard</h2>
 	<hr>
-	<fhc-dashboard active_addons="<?php echo ACTIVE_ADDONS ?>" dashboard="CIS"/>
+	<fhc-dashboard active_addons="<?php echo ACTIVE_ADDONS ?>" 
+	mail_studierende="<?php echo !defined('CIS_LEHRVERANSTALTUNG_MAILSTUDIERENDE_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_MAILSTUDIERENDE_ANZEIGEN ?>" dashboard="CIS"/>
 </div>
 
 <?php $this->load->view('templates/CISHTML-Footer', $includesArray); ?>
diff --git a/public/js/api/fhcapifactory.js b/public/js/api/fhcapifactory.js
index 31c6fe9ab..c2ba6b5da 100644
--- a/public/js/api/fhcapifactory.js
+++ b/public/js/api/fhcapifactory.js
@@ -22,6 +22,7 @@ import filter from "./filter.js";
 import studstatus from "./studstatus.js";
 import ort from "./ort.js";
 import cms from "./cms.js";
+import lehre from "./lehre.js";
 
 export default {
     search,
@@ -31,4 +32,5 @@ export default {
     studstatus,
     ort,
     cms,
+    lehre,
 };
diff --git a/public/js/api/lehre.js b/public/js/api/lehre.js
new file mode 100644
index 000000000..d3117948e
--- /dev/null
+++ b/public/js/api/lehre.js
@@ -0,0 +1,10 @@
+export default {
+    getStudentenMail(lehreinheit_id) {
+          return this.$fhcApi.get(
+              FHC_JS_DATA_STORAGE_OBJECT.app_root +
+              FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+              "/api/frontend/v1/Lehre/lvStudentenMail",
+              { lehreinheit_id: lehreinheit_id }
+          );
+      },
+  }
\ No newline at end of file
diff --git a/public/js/components/Cis/Mylv/LvUebersicht.js b/public/js/components/Cis/Mylv/LvUebersicht.js
index 964762698..1a5a3525d 100644
--- a/public/js/components/Cis/Mylv/LvUebersicht.js
+++ b/public/js/components/Cis/Mylv/LvUebersicht.js
@@ -2,7 +2,12 @@ import BsModal from "../../Bootstrap/Modal";
 
 export default  {
   
-    
+    props:{
+        event:{
+            type:Object,
+            required:true,
+        }
+    },
     data(){
         return {
             // reactive data
@@ -14,25 +19,34 @@ export default  {
             result: false,
         }
     },
-    inject:["active_addons"],
+    inject:["active_addons","mail_studierende"],
     mixins:[BsModal],
     components:{
         BsModal,
     },
+    methods:{
+        showModal: function(){
+            
+            this.$fhcApi.factory.lehre.getStudentenMail(this.event.lehreinheit_id).then(res =>
+                {
+                    console.log(res.data,"API response");
+                });
+        },
+    },
     mounted(){
         this.modal = this.$refs.modalContainer;
         
     },
-    
     template:/*html*/`
-    <bs-modal ref="modalContainer" dialogClass="modal-lg">
+    <bs-modal @showBsModal="showModal" ref="modalContainer" dialogClass="modal-lg">
         <template #title>
-            <span v-if="lv ">
+            <p>{{JSON.stringify(event,null,2)}}</p>
+            <!--<span v-if="lv ">
             {{lv + (stg?' / ' + stg:'')}}
             </span>
             <span v-else>
             Lehrveranstaltungs Übersicht
-            </span>
+            </span>-->
         </template>
         <template #default>
             <div :style="{'display':'grid', 'row-gap':'10px', 'column-gap':'10px', 'grid-template-columns':'repeat(3,minmax(100px,1fr))', 'grid-template-rows':'repeat('+Math.ceil(items.length / 3)+',minmax(100px,1fr))'} ">
diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js
index 8a3236c3e..c36143bb2 100755
--- a/public/js/components/Dashboard/Dashboard.js
+++ b/public/js/components/Dashboard/Dashboard.js
@@ -10,10 +10,12 @@ export default {
 	props: [
 		"dashboard",
 		"active_addons",
+		"mail_studierende",
 	],
 	provide(){
 		return{
 			active_addons: this.active_addons,
+			mail_studierende: this.mail_studierende,
 		}
 	},
 	data: () => ({
diff --git a/public/js/components/DashboardWidget/Stundenplan.js b/public/js/components/DashboardWidget/Stundenplan.js
index 0bca15284..19dfe7e4f 100755
--- a/public/js/components/DashboardWidget/Stundenplan.js
+++ b/public/js/components/DashboardWidget/Stundenplan.js
@@ -21,8 +21,11 @@ export default {
 			minimized: true,
 			events: null,
 			currentDay: new Date(),
+			// used for contentModal
 			roomInfoContentID: null,
 			ort_kurzbz: null,
+			// used for LvUbersichtModal
+			selectedEvent: null,
 		}
 	},
 	computed: {
@@ -57,11 +60,9 @@ export default {
 			
 		},
 		showLvUebersicht: function (event){
+			this.selectedEvent= event;
+			Vue.nextTick(()=>{this.$refs.lvUebersicht.show();});
 			
-			this.$refs.lvUebersicht.lehreinheit = event.lehreinheit_id;
-			this.$refs.lvUebersicht.lv = event.title;
-			this.$refs.lvUebersicht.stg = event.stg_typ + event.stg_kurzbz + (event.verband?'-' + event.verband:'' );
-			this.$refs.lvUebersicht.show();
 		},
 		
 		selectDay(day) {
@@ -111,7 +112,7 @@ export default {
 	},
 	template: /*html*/`
 	<div class="dashboard-widget-stundenplan d-flex flex-column h-100">
-		<lv-uebersicht ref="lvUebersicht"  />
+		<lv-uebersicht ref="lvUebersicht" :event="selectedEvent"  />
 		<content-modal :contentID="roomInfoContentID" :ort_kurzbz="" dialogClass="modal-lg" ref="contentModal"/>
 		<fhc-calendar :initial-date="currentDay" class="border-0" class-header="p-0" @select:day="selectDay" v-model:minimized="minimized" :events="events" no-week-view :show-weeks="false" />
 		<div v-show="minimized" class="flex-grow-1 overflow-scroll">

From 6b4e8df4116332f874ef49b4774226ad5f8d3f25 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 27 Jun 2024 15:21:51 +0200
Subject: [PATCH 0866/1461] remove outcommented code

---
 application/core/Notiz_Controller.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/application/core/Notiz_Controller.php b/application/core/Notiz_Controller.php
index f8a8539a0..17bd28481 100644
--- a/application/core/Notiz_Controller.php
+++ b/application/core/Notiz_Controller.php
@@ -300,7 +300,6 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		//update(1) loading all dms-entries with this notiz_id
 		$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
 		$this->NotizdokumentModel->addJoin('campus.tbl_dms_version', 'dms_id');
-		#$dms_uploaded = null;//
 
 		$result = $this->NotizdokumentModel->loadWhere(array('notiz_id' => $notiz_id));
 		$result = $this->getDataOrTerminateWithError($result);

From f5286ae66b86ca6bd41f860ca59a7844d2e86c55 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 27 Jun 2024 15:55:56 +0200
Subject: [PATCH 0867/1461] Bugfix: Use correct id for attachment preview

---
 application/controllers/api/frontend/v1/notiz/NotizPerson.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/controllers/api/frontend/v1/notiz/NotizPerson.php b/application/controllers/api/frontend/v1/notiz/NotizPerson.php
index 1c5524800..15445bd14 100644
--- a/application/controllers/api/frontend/v1/notiz/NotizPerson.php
+++ b/application/controllers/api/frontend/v1/notiz/NotizPerson.php
@@ -36,7 +36,7 @@ class NotizPerson extends Notiz_Controller
 		$notiz_id = $this->input->post('notiz_id');
 
 		// TODO(chris): make CI variant of endpoint
-		$this->NotizModel->addSelect($this->NotizModel->escape(base_url('content/notizdokdownload.php?id=' . $notiz_id)) . ' AS preview');
+		$this->NotizModel->addSelect($this->NotizModel->escape(base_url('content/notizdokdownload.php?id=')) . ' || campus.tbl_dms_version.dms_id AS preview');
 		
 		return parent::loadDokumente();
 	}

From d0f457d8ed290fc6b94b27433cf9f831f21647f1 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 28 Jun 2024 11:06:44 +0200
Subject: [PATCH 0868/1461] changes the data format from the studierendenEmail
 api call and displays the mailto on the modal

---
 .../controllers/api/frontend/v1/Lehre.php     |  5 ++++
 public/js/components/Cis/Mylv/LvUebersicht.js | 23 +++++++++++++------
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Lehre.php b/application/controllers/api/frontend/v1/Lehre.php
index 95422142d..a36b673b4 100644
--- a/application/controllers/api/frontend/v1/Lehre.php
+++ b/application/controllers/api/frontend/v1/Lehre.php
@@ -57,6 +57,11 @@ class Lehre extends FHCAPI_Controller
 
         $studentenMails = $this->getDataOrTerminateWithError($studentenMails);
 
+		//convert array of objects into array of strings
+		$studentenMails = array_map(function($element){
+			return $element->mail;
+		}, $studentenMails);
+
         $this->terminateWithSuccess($studentenMails);
 	}
 
diff --git a/public/js/components/Cis/Mylv/LvUebersicht.js b/public/js/components/Cis/Mylv/LvUebersicht.js
index 1a5a3525d..503791404 100644
--- a/public/js/components/Cis/Mylv/LvUebersicht.js
+++ b/public/js/components/Cis/Mylv/LvUebersicht.js
@@ -15,6 +15,7 @@ export default  {
             lehreinheit:null,
             stg:null,
             lv:null,
+            emailAnStudierende:null,
 
             result: false,
         }
@@ -26,11 +27,11 @@ export default  {
     },
     methods:{
         showModal: function(){
-            
             this.$fhcApi.factory.lehre.getStudentenMail(this.event.lehreinheit_id).then(res =>
-                {
-                    console.log(res.data,"API response");
-                });
+            {
+                // prepare the mailto link with all the emails from the students of the lv
+                this.emailAnStudierende = "mailto:"+res.data.join(",");
+            });
         },
     },
     mounted(){
@@ -40,7 +41,9 @@ export default  {
     template:/*html*/`
     <bs-modal @showBsModal="showModal" ref="modalContainer" dialogClass="modal-lg">
         <template #title>
-            <p>{{JSON.stringify(event,null,2)}}</p>
+        
+        <p>{{JSON.stringify(emailAnStudierende,null,2)}}</p>    
+        <p>{{JSON.stringify(event,null,2)}}</p>
             <!--<span v-if="lv ">
             {{lv + (stg?' / ' + stg:'')}}
             </span>
@@ -51,8 +54,14 @@ export default  {
         <template #default>
             <div :style="{'display':'grid', 'row-gap':'10px', 'column-gap':'10px', 'grid-template-columns':'repeat(3,minmax(100px,1fr))', 'grid-template-rows':'repeat('+Math.ceil(items.length / 3)+',minmax(100px,1fr))'} ">
                 <div class="d-flex flex-column align-items-center justify-content-center" v-for="item in items" :key="item">
-                    <span>{{item}}</span>
-                    <i class="fa fa-file"></i>
+                    <a v-if="item=='E-mail'" :href="emailAnStudierende">
+                        <span>{{item}}</span>
+                        <i class="fa fa-file"></i>
+                    </a>
+                    <a v-else :href="#">
+                        <span>{{item}}</span>
+                        <i class="fa fa-file"></i>
+                    </a>
                 </div>
             </div>
         </template>

From 3e3f0055258e15bd03a57018b61225d54532e658 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 28 Jun 2024 14:34:41 +0200
Subject: [PATCH 0869/1461] changes the layout/buttons of the
 searchbarsettings, adds responsive searchbar in the header for mobile views

---
 application/views/system/logs/testSearch.php  |  2 +-
 .../views/templates/CISHTML-Header.php        |  3 +-
 public/css/Cis4/Cis.css                       |  2 +-
 .../components/{ => searchbar}/searchbar.css  | 20 ++++++--
 public/css/components/searchbar/switches.css  | 23 +++++++++
 public/js/components/Cis/Menu.js              |  1 +
 public/js/components/searchbar/searchbar.js   | 49 ++++++++++---------
 7 files changed, 69 insertions(+), 31 deletions(-)
 rename public/css/components/{ => searchbar}/searchbar.css (83%)
 create mode 100644 public/css/components/searchbar/switches.css

diff --git a/application/views/system/logs/testSearch.php b/application/views/system/logs/testSearch.php
index 57ed0d48a..861adc53d 100755
--- a/application/views/system/logs/testSearch.php
+++ b/application/views/system/logs/testSearch.php
@@ -15,7 +15,7 @@
 		),
 		'customCSSs' => array(
 			'public/css/components/verticalsplit.css',
-			'public/css/components/searchbar.css',
+			'public/css/components/searchbar/searchbar.css',
 			'public/css/components/primevue.css',
 		),
 		'customJSModules' => array('public/js/apps/TestSearch.js')
diff --git a/application/views/templates/CISHTML-Header.php b/application/views/templates/CISHTML-Header.php
index 58d6f2443..8a12338a3 100755
--- a/application/views/templates/CISHTML-Header.php
+++ b/application/views/templates/CISHTML-Header.php
@@ -31,6 +31,7 @@ if (!isset($menu)) {
 	<button id="nav-main-btn" class="navbar-toggler" type="button" data-bs-toggle="offcanvas" data-bs-target="#nav-main" aria-controls="nav-main" aria-expanded="false" aria-label="Toggle navigation">
 		<span class="navbar-toggler-icon"></span>
 	</button>
+	<fhc-searchbar id="nav-search" class="px-2 d-lg-none fhc-searchbar w-100" :searchoptions="searchbaroptions" :searchfunction="searchfunction"></fhc-searchbar>	
 	<a id="nav-logo" href="<?= site_url(''); ?>">
 		<img src="<?= base_url('/public/images/logo-300x160.png'); ?>" alt="Logo">
 	</a>
@@ -41,7 +42,7 @@ if (!isset($menu)) {
 			</button>
 		</div>
 		<div class="offcanvas-body p-0">
-			<fhc-searchbar id="nav-search" class="fhc-searchbar w-100" :searchoptions="searchbaroptions" :searchfunction="searchfunction"></fhc-searchbar>
+			<fhc-searchbar id="nav-search" class="d-none d-lg-block fhc-searchbar w-100" :searchoptions="searchbaroptions" :searchfunction="searchfunction"></fhc-searchbar>
 			<button id="nav-user-btn" class="btn btn-link rounded-0" type="button" data-bs-toggle="collapse" data-bs-target="#nav-user-menu" aria-expanded="false" aria-controls="nav-user-menu">
 				<img src="<?= site_url('Cis/Pub/bild/person/' . getAuthPersonId()); ?>" class="avatar rounded-circle"/>
 			</button>
diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index 44ffc2fec..b455a6c38 100755
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -1,5 +1,5 @@
 /* basic */
-@import '../components/searchbar.css';
+@import '../components/searchbar/searchbar.css';
 html {
   font-size: 0.875em;
 }
diff --git a/public/css/components/searchbar.css b/public/css/components/searchbar/searchbar.css
similarity index 83%
rename from public/css/components/searchbar.css
rename to public/css/components/searchbar/searchbar.css
index 2bbaf9d67..5b718a90e 100755
--- a/public/css/components/searchbar.css
+++ b/public/css/components/searchbar/searchbar.css
@@ -3,12 +3,17 @@
     Author     : bambi
 */
 
+@import url(./switches.css);
+
+#search-filter{
+    border: 1px solid #ced4da;
+}
+
+
 .searchbar_settings {
     position: absolute; 
     z-index: 9999; 
-    background-color: #fff; 
-    border: 2px solid #666; 
-    padding: 1rem;
+    background-color: #343a40;
 }
 
 .searchbar_results {
@@ -92,4 +97,11 @@
 
 .searchbar_inline_ul li {
     list-style: none;
-}
\ No newline at end of file
+}
+
+.non-selectable {
+    user-select: none;
+    -webkit-user-select: none; /* Safari */
+    -moz-user-select: none; /* Firefox */
+    -ms-user-select: none; /* IE/Edge */
+  }
\ No newline at end of file
diff --git a/public/css/components/searchbar/switches.css b/public/css/components/searchbar/switches.css
new file mode 100644
index 000000000..164976514
--- /dev/null
+++ b/public/css/components/searchbar/switches.css
@@ -0,0 +1,23 @@
+.fhc-switches:checked  {
+    background-color: white !important;
+    border-color: white !important;
+    background-position: right center !important;
+    background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3e%3ccircle r='3' fill='%23000000'/%3e%3c/svg%3e") !important;
+}
+
+.fhc-switches  {
+    background-color: var(--bs-gray-600) !important;
+    border-color: var(--bs-gray-600) !important;
+    background-position: left center !important;
+    background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3e%3ccircle r='3' fill='%238e99a3'/%3e%3c/svg%3e") !important;
+}
+
+.fhc-switches:focus  {
+    box-shadow: 0 0 0 .25rem rgba(108, 117, 125,.25);
+}
+
+/*.form-switch .form-check-input:checked {
+ 
+
+rgb(52, 58, 64)*/
+
diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js
index 99023032d..f5180c1a0 100755
--- a/public/js/components/Cis/Menu.js
+++ b/public/js/components/Cis/Menu.js
@@ -28,6 +28,7 @@ export default {
     <button id="nav-main-btn" class="navbar-toggler" type="button" data-bs-toggle="offcanvas" data-bs-target="#nav-main" aria-controls="nav-main" aria-expanded="false" aria-label="Toggle navigation">
         <span class="navbar-toggler-icon"></span>
     </button>
+    
     <a id="nav-logo" :href="rootUrl">
         <img :src="logoUrl" alt="Logo">
     </a>
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 80659d5bb..963b43cb7 100755
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -26,14 +26,14 @@ export default {
       employee: employee,
       organisationunit: organisationunit
     },
-    template: `
+    template: /*html*/`
           <form ref="searchform" class="d-flex me-3" action="javascript:void(0);" 
             @focusin="this.searchfocusin" @focusout="this.searchfocusout">
-            <div class="input-group me-2 bg-white">
+            <div class="h-100 input-group me-2 bg-white">
                 <input ref="searchbox" @keyup="this.search" @focus="this.showsearchresult" 
                     v-model="this.searchsettings.searchstr" class="form-control" 
-                    type="search" placeholder="Search" aria-label="Search">
-                <button ref="settingsbutton" @click="this.togglesettings" class="btn btn-outline-secondary" type="button" id="search-filter"><i class="fas fa-cog"></i></button>
+                    type="search" :placeholder="'Search: '+ searchsettings.types.join(' / ')" aria-label="Search">
+                <button data-bs-toggle="collapse" data-bs-target="#searchSettings" aria-expanded="false" aria-controls="searchSettings" ref="settingsbutton"  class="btn btn-outline-secondary" type="button" id="search-filter"><i class="fas fa-cog"></i></button>
             </div>            
         
             <div v-show="this.showresult" ref="result" 
@@ -51,24 +51,37 @@ export default {
                 <div v-else="">Unbekannter Ergebnistyp: '{{ res.type }}'.</div>
               </template>
             </div>
-            <div v-show="this.showsettings" ref="settings" 
-                 class="searchbar_settings" tabindex="-1">
-              <div class="btn-group" v-if="this.searchoptions.types.length > 0">
-                <template v-for="(type, index) in this.searchoptions.types" :key="type">
-                  <input type="checkbox" class="btn-check" :id="this.$.uid + 'search_type_' + index" :value="type" v-model="this.searchsettings.types"/>
-                  <label class="btn btn-outline-secondary" :for="this.$.uid + 'search_type_' + index">{{ type }}</label>
+
+            <div @[\`show.bs.collapse\`]="calcSearchSettingsExtent" class="collapse" id="searchSettings"  ref="settings" 
+                 class="searchbar_settings text-white" tabindex="-1">
+              <div class="d-flex flex-column m-3" v-if="this.searchoptions.types.length > 0">
+              <span class="fw-light mb-2">Suche filtern nach:</span>  
+              <template v-for="(type, index) in this.searchoptions.types" :key="type">
+                    <div class="form-check form-switch">
+                        <input class="fhc-switches form-check-input" type="checkbox" role="switch" :id="this.$.uid + 'search_type_' + index" :value="type" v-model="this.searchsettings.types" />
+                        <label class="ps-2 form-check-label non-selectable" :for="this.$.uid + 'search_type_' + index">{{ type }}</label>
+                    </div>
                 </template>
               </div>
-              <div class="mb-2"></div>
-              <button ref="settingsrefreshsearch" @click="this.refreshsearch" class="btn btn-primary" type="button">Übernehmen</button>
             </div>
         
           </form>
     `,
+    watch:{
+        'searchsettings.types'(newValue){
+            // execute search with new searchsettings filters
+            this.search();
+        },
+    },
     beforeMount: function() {
         this.updateSearchOptions();
     },
     methods: {
+        calcSearchSettingsExtent: function(){
+            this.$refs.settings.style.top = Math.floor(this.$refs.settingsbutton.offsetHeight  ) + 'px';
+            this.$refs.settings.style.right = 0;
+        },
+
         updateSearchOptions: function() {
             this.searchsettings.types = [];
             for( const idx in this.searchoptions.types ) {
@@ -123,18 +136,6 @@ export default {
           this.search();
           this.togglesettings();
         },
-        calcSearchSettingsExtent: function() {
-            var rect = this.$refs.settingsbutton.getBoundingClientRect();
-            //console.log(window.innerWidth + ' ' + window.innerHeight + ' ' + JSON.stringify(rect));
-            this.$refs.settings.style.top = Math.floor(rect.bottom + 3) + 'px';
-            this.$refs.settings.style.right = Math.floor(window.innerWidth - rect.right) + 'px';
-            this.$refs.settings.style.width = Math.floor(window.innerWidth * 0.5) + 'px';
-            //this.$refs.settings.style.height = Math.floor(window.innerHeight * 0.5) + 'px';  
-        },
-        togglesettings: function() {
-            this.showsettings = !this.showsettings;
-            this.calcSearchSettingsExtent();
-        },
         hideresult: function() {
             this.showresult = false;
             window.removeEventListener('resize', this.calcSearchResultExtent);

From f4f08c0710caca1794210548297384612d073089 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 1 Jul 2024 13:53:55 +0200
Subject: [PATCH 0870/1461] stores the local information of the searchbar
 inside a collected storage in case more than one searchbar is used

---
 .../views/templates/CISHTML-Header.php        |  4 +-
 public/js/apps/Cis.js                         | 12 ++++-
 public/js/components/searchbar/searchbar.js   | 52 +++++++++++--------
 .../js/components/searchbar/sharedSettings.js | 10 ++++
 4 files changed, 52 insertions(+), 26 deletions(-)
 create mode 100644 public/js/components/searchbar/sharedSettings.js

diff --git a/application/views/templates/CISHTML-Header.php b/application/views/templates/CISHTML-Header.php
index 8a12338a3..c9f2b3305 100755
--- a/application/views/templates/CISHTML-Header.php
+++ b/application/views/templates/CISHTML-Header.php
@@ -31,7 +31,7 @@ if (!isset($menu)) {
 	<button id="nav-main-btn" class="navbar-toggler" type="button" data-bs-toggle="offcanvas" data-bs-target="#nav-main" aria-controls="nav-main" aria-expanded="false" aria-label="Toggle navigation">
 		<span class="navbar-toggler-icon"></span>
 	</button>
-	<fhc-searchbar id="nav-search" class="px-2 d-lg-none fhc-searchbar w-100" :searchoptions="searchbaroptions" :searchfunction="searchfunction"></fhc-searchbar>	
+	<fhc-searchbar id="nav-search" class="px-2 d-lg-none fhc-searchbar w-100" @updatesearchtypes="updatesearchtypes" :selectedtypes="selectedtypes" :searchoptions="searchbaroptions" :searchfunction="searchfunction"></fhc-searchbar>	
 	<a id="nav-logo" href="<?= site_url(''); ?>">
 		<img src="<?= base_url('/public/images/logo-300x160.png'); ?>" alt="Logo">
 	</a>
@@ -42,7 +42,7 @@ if (!isset($menu)) {
 			</button>
 		</div>
 		<div class="offcanvas-body p-0">
-			<fhc-searchbar id="nav-search" class="d-none d-lg-block fhc-searchbar w-100" :searchoptions="searchbaroptions" :searchfunction="searchfunction"></fhc-searchbar>
+			<fhc-searchbar id="nav-search" class="d-none d-lg-block fhc-searchbar w-100" @updatesearchtypes="updatesearchtypes" :selectedtypes="selectedtypes" :searchoptions="searchbaroptions"  :searchfunction="searchfunction"></fhc-searchbar>
 			<button id="nav-user-btn" class="btn btn-link rounded-0" type="button" data-bs-toggle="collapse" data-bs-target="#nav-user-menu" aria-expanded="false" aria-controls="nav-user-menu">
 				<img src="<?= site_url('Cis/Pub/bild/person/' . getAuthPersonId()); ?>" class="avatar rounded-circle"/>
 			</button>
diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js
index b514f3662..c0eef6be1 100755
--- a/public/js/apps/Cis.js
+++ b/public/js/apps/Cis.js
@@ -11,6 +11,11 @@ Vue.createApp({
     },
     data: function() {
         return {
+            selectedtypes:[
+                "mitarbeiter",
+                "raum",
+                "organisationunit"
+            ],
             searchbaroptions: {
                 types: [
                     "mitarbeiter",
@@ -71,6 +76,11 @@ Vue.createApp({
     methods: {
         searchfunction: function(searchsettings) {
             return Vue.$fhcapi.Search.search(searchsettings);
-        }
+        },
+        updatesearchtypes: function(newValues){
+            console.log(newValues,"this are the new values")
+           this.selectedtypes= newValues;
+            
+        },
     }
 }).mount('#cis-header');
\ No newline at end of file
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 963b43cb7..474f0ad8b 100755
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -2,22 +2,21 @@ import person from "./person.js";
 import raum from "./raum.js";
 import employee from "./employee.js";
 import organisationunit from "./organisationunit.js";
+import {searchSettings, searchresult} from "./sharedSettings.js";
 
 export default {
-    props: [ "searchoptions", "searchfunction" ],
+    props: [ "searchoptions", "searchfunction","selectedtypes" ],
+    
     data: function() {
       return {
         searchtimer: null,
         hidetimer: null,
         showsettings: false,
-        searchsettings: {
-            searchstr: '',
-            types: []
-        },
-        showresult: false,        
-        searchresult: [],
+        searchsettings: searchSettings,
+        searchresult: searchresult,
+        showresult: false,  
         searching: false,
-        error: null
+        error: null,
       };
     },
     components: {
@@ -26,10 +25,13 @@ export default {
       employee: employee,
       organisationunit: organisationunit
     },
+   
     template: /*html*/`
           <form ref="searchform" class="d-flex me-3" action="javascript:void(0);" 
             @focusin="this.searchfocusin" @focusout="this.searchfocusout">
+           
             <div class="h-100 input-group me-2 bg-white">
+           
                 <input ref="searchbox" @keyup="this.search" @focus="this.showsearchresult" 
                     v-model="this.searchsettings.searchstr" class="form-control" 
                     type="search" :placeholder="'Search: '+ searchsettings.types.join(' / ')" aria-label="Search">
@@ -42,8 +44,8 @@ export default {
                 <i class="fas fa-spinner fa-spin fa-2x"></i>
               </div>
               <div v-else-if="this.error !== null">{{ this.error }}</div>
-              <div v-else-if="this.searchresult.length < 1">Es wurden keine Ergebnisse gefunden.</div>
-              <template v-else="" v-for="res in this.searchresult">
+              <div v-else-if="searchresult.length < 1">Es wurden keine Ergebnisse gefunden.</div>
+              <template v-else="" v-for="res in searchresult">
                 <person v-if="res.type === 'person'" :res="res" :actions="this.searchoptions.actions.person" @actionexecuted="this.hideresult"></person>
                 <employee v-else-if="res.type === 'mitarbeiter'" :res="res" :actions="this.searchoptions.actions.employee" @actionexecuted="this.hideresult"></employee>
                 <organisationunit v-else-if="res.type === 'organisationunit'" :res="res" :actions="this.searchoptions.actions.organisationunit" @actionexecuted="this.hideresult"></organisationunit>
@@ -58,7 +60,7 @@ export default {
               <span class="fw-light mb-2">Suche filtern nach:</span>  
               <template v-for="(type, index) in this.searchoptions.types" :key="type">
                     <div class="form-check form-switch">
-                        <input class="fhc-switches form-check-input" type="checkbox" role="switch" :id="this.$.uid + 'search_type_' + index" :value="type" v-model="this.searchsettings.types" />
+                        <input class="fhc-switches form-check-input" type="checkbox" role="switch" :id="this.$.uid + 'search_type_' + index" :value="type" v-model="searchsettings.types"  />
                         <label class="ps-2 form-check-label non-selectable" :for="this.$.uid + 'search_type_' + index">{{ type }}</label>
                     </div>
                 </template>
@@ -69,14 +71,17 @@ export default {
     `,
     watch:{
         'searchsettings.types'(newValue){
-            // execute search with new searchsettings filters
             this.search();
+            
+            
         },
+        
     },
     beforeMount: function() {
         this.updateSearchOptions();
     },
     methods: {
+        
         calcSearchSettingsExtent: function(){
             this.$refs.settings.style.top = Math.floor(this.$refs.settingsbutton.offsetHeight  ) + 'px';
             this.$refs.settings.style.right = 0;
@@ -84,8 +89,8 @@ export default {
 
         updateSearchOptions: function() {
             this.searchsettings.types = [];
-            for( const idx in this.searchoptions.types ) {
-                this.searchsettings.types.push(this.searchoptions.types[idx]);
+            for( const idx in this.selectedtypes ) {
+                this.searchsettings.types.push(this.selectedtypes[idx]);
             }
         },
         calcSearchResultExtent: function() {
@@ -111,25 +116,26 @@ export default {
             }
         },
         callsearchapi: function() {            
-            var that = this;
             this.error = null;
-            this.searchresult = [];
+            this.searchresult.splice(0,this.searchresult.length);
             this.searching = true;
             this.showsearchresult();            
             this.searchfunction(this.searchsettings)
-            .then(function(response) {
+            .then(response=>{
                 if( response.data?.error === 1 ) {
-                    that.error = 'Bei der Suche ist ein Fehler aufgetreten.';
+                    this.error = 'Bei der Suche ist ein Fehler aufgetreten.';
                 } else {
-                    that.searchresult = response.data.data;
+                    for(let element of response.data.data){
+                        this.searchresult.push(element);
+                    }
                 }
             })
-            .catch(function(error) {
-                that.error = 'Bei der Suche ist ein Fehler aufgetreten.' 
+            .catch(error=> {
+                this.error = 'Bei der Suche ist ein Fehler aufgetreten.' 
                     + ' ' + error.message;
             })
-            .finally(function() {
-                that.searching = false;
+            .finally(()=> {
+                this.searching = false;
             });
         },
         refreshsearch: function() {
diff --git a/public/js/components/searchbar/sharedSettings.js b/public/js/components/searchbar/sharedSettings.js
new file mode 100644
index 000000000..e427e8483
--- /dev/null
+++ b/public/js/components/searchbar/sharedSettings.js
@@ -0,0 +1,10 @@
+let searchSettings = Vue.reactive({
+    searchstr: '',
+    types: [],
+       
+});
+
+let searchresult = Vue.reactive([]);
+
+
+export {searchSettings, searchresult};
\ No newline at end of file

From dd0bdddbc6fb36987f223900528c62053d56fe52 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 1 Jul 2024 14:12:48 +0200
Subject: [PATCH 0871/1461] backport recent changes of Betriebsmittel component
 and phrases from feature-30660/FHC4_StudierendenGUI_Prototyp Branch

---
 ...Betriebsmittel.php => BetriebsmittelP.php} | 104 ++----
 .../models/ressource/Betriebsmittel_model.php |   2 +-
 .../ressource/Betriebsmittelperson_model.php  |   4 +-
 public/js/api/fhcapifactory.js                |   4 +-
 .../Betriebsmittel/Betriebsmittel.js          | 278 +++++++-------
 system/phrasesupdate.php                      | 344 +++++++++++++++++-
 6 files changed, 507 insertions(+), 229 deletions(-)
 rename application/controllers/api/frontend/v1/betriebsmittel/{Betriebsmittel.php => BetriebsmittelP.php} (77%)

diff --git a/application/controllers/api/frontend/v1/betriebsmittel/Betriebsmittel.php b/application/controllers/api/frontend/v1/betriebsmittel/BetriebsmittelP.php
similarity index 77%
rename from application/controllers/api/frontend/v1/betriebsmittel/Betriebsmittel.php
rename to application/controllers/api/frontend/v1/betriebsmittel/BetriebsmittelP.php
index cb6c4a3aa..8a6d7e340 100644
--- a/application/controllers/api/frontend/v1/betriebsmittel/Betriebsmittel.php
+++ b/application/controllers/api/frontend/v1/betriebsmittel/BetriebsmittelP.php
@@ -1,10 +1,10 @@
 <?php
 
-if (! defined('BASEPATH')) exit('No direct script access allowed');
 
+if (!defined('BASEPATH')) exit('No direct script access allowed');
 use \DateTime as DateTime;
 
-class Betriebsmittel extends FHCAPI_Controller
+class BetriebsmittelP extends FHCAPI_Controller
 {
 	public function __construct()
 	{
@@ -28,30 +28,24 @@ class Betriebsmittel extends FHCAPI_Controller
 
 		// Load language phrases
 		$this->loadPhrases([
-			'ui'
+			'ui',
+			'wawi'
 		]);
 	}
 
-	public function getAllBetriebsmittel($uid, $person_id)
+	public function getAllBetriebsmittel($type_id, $id)
 	{
-		//uid
-		//$result = $this->BetriebsmittelpersonModel->getBetriebsmittelData($uid, 'uid');
+		$result = $this->BetriebsmittelpersonModel->getBetriebsmittelData($id, $type_id);
 
-		//person_id
-		$result = $this->BetriebsmittelpersonModel->getBetriebsmittelData($person_id, 'person');
-
-		if (isError($result))
-		{
+		if (isError($result)) {
 			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 		}
 
 		$this->terminateWithSuccess((getData($result) ?: []));
 	}
 
-	public function addNewBetriebsmittel()
+	public function addNewBetriebsmittel($person_id)
 	{
-		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-
 		$this->form_validation->set_rules('kaution', 'Kaution', 'numeric', [
 			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Kaution'])
 		]);
@@ -64,9 +58,7 @@ class Betriebsmittel extends FHCAPI_Controller
 			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Ausgegeben am'])
 		]);
 
-
-		if ($this->form_validation->run() == false)
-		{
+		if ($this->form_validation->run() == false) {
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 		}
 
@@ -80,38 +72,31 @@ class Betriebsmittel extends FHCAPI_Controller
 		$anmerkung = $this->input->post('anmerkung');
 		$ausgegebenam = $this->input->post('ausgegebenam');
 		$retouram = $this->input->post('retouram');
-		$person_id = $this->input->post('person_id');
 		$uid = $this->input->post('uid');
 
-		if($inventarData)
-		{
+		if ($inventarData) {
 			$betriebsmitteltyp = $inventarData['betriebsmitteltyp'];
 			$betriebsmittel_id = $inventarData['betriebsmittel_id'];
 		}
 
-		if($betriebsmitteltyp == 'Zutrittskarte' && !$nummer)
-		{
+		if ($betriebsmitteltyp == 'Zutrittskarte' && !$nummer) {
 			return $this->terminateWithError($this->p->t('wawi', 'error_zutrittskarteOhneNummer'), self::ERROR_TYPE_GENERAL);
 		}
 
-		if($retouram && $retouram < $ausgegebenam)
-		{
+		if ($retouram && $retouram < $ausgegebenam) {
 			return $this->terminateWithError($this->p->t('wawi', 'error_retourdatumVorAusgabe'), self::ERROR_TYPE_GENERAL);
 		}
 
-		if($betriebsmitteltyp == "Inventar" && !($inventarData['inventarnummer']))
-		{
+		if ($betriebsmitteltyp == "Inventar" && !($inventarData['inventarnummer'])) {
 			return $this->terminateWithError($this->p->t('wawi', 'error_inventarWaehlen'), self::ERROR_TYPE_GENERAL);
 		}
 
-
 		// Start DB transaction
 		$this->db->trans_begin();
 
 		$betriebsmitteltyp = utf8_decode($betriebsmitteltyp);
 
-		if(!$inventarData)
-		{
+		if (!$inventarData) {
 			$result = $this->BetriebsmittelModel->insert(
 				[
 					'betriebsmitteltyp' => $betriebsmitteltyp,
@@ -123,8 +108,7 @@ class Betriebsmittel extends FHCAPI_Controller
 					'insertamum' => date('c')
 				]
 			);
-			if($this->db->trans_status() === false || isError($result))
-			{
+			if ($this->db->trans_status() === false || isError($result)) {
 				$this->db->trans_rollback();
 				return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 			}
@@ -145,8 +129,7 @@ class Betriebsmittel extends FHCAPI_Controller
 			]
 		);
 
-		if($this->db->trans_status() === false || isError($result))
-		{
+		if ($this->db->trans_status() === false || isError($result)) {
 			$this->db->trans_rollback();
 			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
@@ -155,14 +138,10 @@ class Betriebsmittel extends FHCAPI_Controller
 		return $this->terminateWithSuccess(true);
 	}
 
-	public function updateBetriebsmittel()
+	public function updateBetriebsmittel($betriebsmittelperson_id)
 	{
-		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-
 		$uid_user = getAuthUID();
-
 		$betriebsmittel_id = $this->input->post('betriebsmittel_id');
-		$betriebsmittelperson_id = $this->input->post('betriebsmittelperson_id');
 		$betriebsmitteltyp = $this->input->post('betriebsmitteltyp');
 		$nummer = $this->input->post('nummer');
 		$nummer2 = $this->input->post('nummer2');
@@ -187,18 +166,15 @@ class Betriebsmittel extends FHCAPI_Controller
 		]);
 
 
-		if ($this->form_validation->run() == false)
-		{
+		if ($this->form_validation->run() == false) {
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 		}
 
-		if($betriebsmitteltyp == 'Zutrittskarte' && !$nummer)
-		{
+		if ($betriebsmitteltyp == 'Zutrittskarte' && !$nummer) {
 			return $this->terminateWithError($this->p->t('wawi', 'error_zutrittskarteOhneNummer'), self::ERROR_TYPE_GENERAL);
 		}
 
-		if($retouram && $retouram < $ausgegebenam)
-		{
+		if ($retouram && $retouram < $ausgegebenam) {
 			return $this->terminateWithError($this->p->t('wawi', 'error_retourdatumVorAusgabe'), self::ERROR_TYPE_GENERAL);
 		}
 
@@ -223,8 +199,7 @@ class Betriebsmittel extends FHCAPI_Controller
 			]
 		);
 
-		if($this->db->trans_status() === false || isError($result))
-		{
+		if ($this->db->trans_status() === false || isError($result)) {
 			$this->db->trans_rollback();
 			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
@@ -243,8 +218,7 @@ class Betriebsmittel extends FHCAPI_Controller
 				'updateamum' => date('c')
 			]
 		);
-		if($this->db->trans_status() === false || isError($result))
-		{
+		if ($this->db->trans_status() === false || isError($result)) {
 			$this->db->trans_rollback();
 			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
@@ -253,46 +227,33 @@ class Betriebsmittel extends FHCAPI_Controller
 		return $this->terminateWithSuccess(true);
 	}
 
-	public function loadBetriebsmittel()
+	public function loadBetriebsmittel($betriebsmittelperson_id)
 	{
-		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-
-		$betriebsmittelperson_id = $this->input->post('betriebsmittelperson_id');
-
 		$result = $this->BetriebsmittelpersonModel->getBetriebsmittelData($betriebsmittelperson_id, 'betriebsmittelperson_id');
 
-		if (isError($result))
-		{
+		if (isError($result)) {
 			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
 
-		if (!hasData($result))
-		{
-			$this->terminateWithError("no Betriebsmittelperson with ID found: " . $betriebsmittelperson_id, self::ERROR_TYPE_GENERAL);
+		if (!hasData($result)) {
+			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'Betriebsmittelperson_id']), self::ERROR_TYPE_GENERAL);
 		}
 
 		$this->terminateWithSuccess(current(getData($result)));
 	}
 
-	public function deleteBetriebsmittel()
+	public function deleteBetriebsmittel($betriebsmittelperson_id)
 	{
-
-		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-
-		$betriebsmittelperson_id = $this->input->post('betriebsmittelperson_id');
-
 		$result = $this->BetriebsmittelpersonModel->delete(
 			array('betriebsmittelperson_id' => $betriebsmittelperson_id,
-				)
+			)
 		);
 
-		if (isError($result))
-		{
+		if (isError($result)) {
 			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
-		if (!hasData($result))
-		{
-			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Betriebsmittelperson_id']), self::ERROR_TYPE_GENERAL);
+		if (!hasData($result)) {
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'Betriebsmittelperson_id']), self::ERROR_TYPE_GENERAL);
 		}
 		return $this->outputJsonSuccess(current(getData($result)));
 	}
@@ -304,8 +265,7 @@ class Betriebsmittel extends FHCAPI_Controller
 		$this->BetriebsmitteltypModel->addOrder('beschreibung', 'ASC');
 		$result = $this->BetriebsmitteltypModel->load(); // load All
 
-		if (isError($result))
-		{
+		if (isError($result)) {
 			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 		}
 		return $this->terminateWithSuccess(getData($result) ?: []);
diff --git a/application/models/ressource/Betriebsmittel_model.php b/application/models/ressource/Betriebsmittel_model.php
index 69aa962c1..290c3491d 100644
--- a/application/models/ressource/Betriebsmittel_model.php
+++ b/application/models/ressource/Betriebsmittel_model.php
@@ -17,7 +17,7 @@ class Betriebsmittel_model extends DB_Model
 	 */
 	public function loadInventarliste($filter)
 	{
-		$filter = strtoLower($filter);
+		$filter = urldecode(strtoLower($filter));
 
 		$qry = "
 			SELECT 
diff --git a/application/models/ressource/Betriebsmittelperson_model.php b/application/models/ressource/Betriebsmittelperson_model.php
index bffa82501..48c35381f 100644
--- a/application/models/ressource/Betriebsmittelperson_model.php
+++ b/application/models/ressource/Betriebsmittelperson_model.php
@@ -100,7 +100,7 @@ class Betriebsmittelperson_model extends DB_Model
 	public function getBetriebsmittelData($id, $type_id)
 	{
 		switch ($type_id) {
-			case 'person':
+			case 'person_id':
 				$cond = 'bmp.person_id';
 				break;
 			case 'uid':
@@ -115,7 +115,7 @@ class Betriebsmittelperson_model extends DB_Model
 
 		$query = "
 			SELECT 
-			    bm.nummer, bmp.person_id, bm.betriebsmitteltyp, bmp.anmerkung as anmerkung, bmp.retouram, TO_CHAR(bmp.retouram::timestamp, 'DD.MM.YYYY') AS format_retour, bmp.ausgegebenam, TO_CHAR(bmp.ausgegebenam::timestamp, 'DD.MM.YYYY') AS format_ausgabe, bm.beschreibung, bmp.uid, bmp.kaution, bm.betriebsmittel_id, bmp.betriebsmittelperson_id, bm.inventarnummer
+			    bm.nummer, bmp.person_id, bm.betriebsmitteltyp, bmp.anmerkung as anmerkung, bmp.retouram, TO_CHAR(bmp.retouram::timestamp, 'DD.MM.YYYY') AS format_retour, bmp.ausgegebenam, TO_CHAR(bmp.ausgegebenam::timestamp, 'DD.MM.YYYY') AS format_ausgabe, bm.beschreibung, bmp.uid, bmp.kaution, bm.betriebsmittel_id, bmp.betriebsmittelperson_id, bm.inventarnummer, bm.nummer2
 			FROM 
 			    wawi.tbl_betriebsmittelperson bmp
 			JOIN 
diff --git a/public/js/api/fhcapifactory.js b/public/js/api/fhcapifactory.js
index 41c89ef50..f496cd491 100644
--- a/public/js/api/fhcapifactory.js
+++ b/public/js/api/fhcapifactory.js
@@ -20,11 +20,13 @@ import phrasen from "./phrasen.js";
 import navigation from "./navigation.js";
 import filter from "./filter.js";
 import studstatus from "./studstatus.js";
+import betriebsmittel from "./betriebsmittel.js";
 
 export default {
     search,
     phrasen,
     navigation,
     filter,
-    studstatus
+    studstatus,
+    betriebsmittel
 };
diff --git a/public/js/components/Betriebsmittel/Betriebsmittel.js b/public/js/components/Betriebsmittel/Betriebsmittel.js
index 05fe74c3d..38563633f 100644
--- a/public/js/components/Betriebsmittel/Betriebsmittel.js
+++ b/public/js/components/Betriebsmittel/Betriebsmittel.js
@@ -20,26 +20,41 @@ export default {
 			from: 'cisRoot'
 		},
 	},
-	props: [
-		'person_id',
-		'uid'
-	],
+	props: {
+		endpoint: {
+			type: Object,
+			required: true
+		},
+		typeId: String,
+		id: {
+			type: [Number, String],
+			required: true
+		},
+		uid: {
+			type: [Number, String],
+			required: true
+		}
+	},
 	data() {
 		return {
 			tabulatorOptions: {
-				ajaxURL: 'api/frontend/v1/betriebsmittel/Betriebsmittel/getAllBetriebsmittel/' + this.uid + '/' + this.person_id,
-				ajaxRequestFunc: this.$fhcApi.get,
+				ajaxURL: 'dummy',
+				ajaxRequestFunc: this.endpoint.getAllBetriebsmittel,
+				ajaxParams: {
+					type: this.typeId,
+					id: this.id
+				},
 				ajaxResponse: (url, params, response) => response.data,
 				columns: [
-					{title: "Nummer", field: "nummer"},
+					{title: "Nummer", field: "nummer", width: 150},
 					{title: "PersonId", field: "person_id", visible: false},
-					{title: "Typ", field: "betriebsmitteltyp"},
+					{title: "Typ", field: "betriebsmitteltyp", width: 125},
 					{title: "Anmerkung", field: "anmerkung", visible: false},
-					{title: "Retourdatum", field: "format_retour", visible: false},
+					{title: "Retourdatum", field: "format_retour", width: 128},
 					{title: "Beschreibung", field: "beschreibung"},
-					{title: "Uid", field: "uid", visible: false},
+					{title: "Uid", field: "uid", width: 87},
 					{title: "Kaution", field: "kaution", visible: false},
-					{title: "Ausgabedatum", field: "format_ausgabe"},
+					{title: "Ausgabedatum", field: "format_ausgabe", width: 144},
 					{title: "Betriebsmittel_id", field: "betriebsmittel_id", visible: false},
 					{title: "Betriebsmittelperson_id", field: "betriebsmittelperson_id", visible: false},
 					{
@@ -96,7 +111,8 @@ export default {
 				layoutColumnsOnNewData: false,
 				height: '550',
 				selectableRangeMode: 'click',
-				selectable: true
+				selectable: true,
+				persistenceID: 'core-betriebsmittel'
 			},
 			tabulatorEvents: [
 				{
@@ -139,16 +155,18 @@ export default {
 	},
 	watch: {
 		uid() {
-			this.$refs.table.tabulator.setData('api/frontend/v1/betriebsmittel/Betriebsmittel/getAllBetriebsmittel/' + this.uid + '/' + this.person_id);
+			this.$refs.table.tabulator.setData(this.endpoint.getAllBetriebsmittel + '/' + this.typeId + '/' + this.id);
 		}
 	},
 	methods: {
 		actionEditBetriebsmittel(betriebsmittelperson_id) {
 			this.statusNew = false;
 			this.loadBetriebsmittel(betriebsmittelperson_id);
+			this.$refs.betriebsmittelModal.show();
 		},
 		actionNewBetriebsmittel() {
 			this.resetModal();
+			this.$refs.betriebsmittelModal.show();
 			this.statusNew = true;
 			this.formData.ausgegebenam = this.getDefaultDate();
 			this.reload();
@@ -159,28 +177,21 @@ export default {
 			});
 		},
 		addNewBetriebsmittel() {
-			this.param = {
-				'uid':  this.uid,
-				'person_id': this.person_id,
-				...this.formData
-			};
-			this.$fhcApi.post('api/frontend/v1/betriebsmittel/Betriebsmittel/addNewBetriebsmittel/',
-				this.param
-			).then(response => {
-				this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
-				this.resetModal();
-			}).catch(this.$fhcAlert.handleSystemError)
+			//just append uid to formdata
+			this.formData.uid = this.uid;
+			return this.endpoint.addNewBetriebsmittel(this.id, this.formData)
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+					this.hideModal('betriebsmittelModal');
+					this.resetModal();
+				}).catch(this.$fhcAlert.handleSystemError)
 				.finally(() => {
 					window.scrollTo(0, 0);
 					this.reload();
 				});
 		},
 		deleteBetriebsmittel(betriebsmittelperson_id) {
-			this.param = {
-				'betriebsmittelperson_id': betriebsmittelperson_id
-			};
-			return this.$fhcApi.post('api/frontend/v1/betriebsmittel/betriebsmittel/deleteBetriebsmittel/',
-				this.param)
+			return this.endpoint.deleteBetriebsmittel(betriebsmittelperson_id)
 				.then(
 					result => {
 						this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
@@ -193,16 +204,12 @@ export default {
 					this.reload();
 				});
 		},
-		updateBetriebsmittel() {
-			this.param = {
-				'uid':  this.uid,
-				'person_id': this.person_id,
-				...this.formData
-			};
-			this.$fhcApi.post('api/frontend/v1/betriebsmittel/Betriebsmittel/updateBetriebsmittel/',
-				this.param
-			).then(response => {
+		updateBetriebsmittel(betriebsmittelperson_id) {
+			this.formData.uid = this.uid;
+			return this.endpoint.updateBetriebsmittel(betriebsmittelperson_id, this.formData)
+			.then(response => {
 				this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+				this.hideModal('betriebsmittelModal');
 				this.resetModal();
 			}).catch(this.$fhcAlert.handleSystemError)
 				.finally(() => {
@@ -213,11 +220,7 @@ export default {
 		loadBetriebsmittel(betriebsmittelperson_id) {
 			this.resetModal();
 			this.statusNew = false;
-			this.param = {
-				'betriebsmittelperson_id':  betriebsmittelperson_id
-			};
-			return this.$fhcApi.post('api/frontend/v1/betriebsmittel/Betriebsmittel/loadBetriebsmittel/',
-				this.param)
+			return this.endpoint.loadBetriebsmittel(betriebsmittelperson_id)
 				.then(result => result.data)
 				.then(result => {
 					this.formData = result;
@@ -225,8 +228,8 @@ export default {
 				.catch(this.$fhcAlert.handleSystemError);
 		},
 		searchInventar(event) {
-			return this.$fhcApi
-				.get('api/frontend/v1/betriebsmittel/Betriebsmittel/loadInventarliste/' + event.query)
+			const encodedQuery = encodeURIComponent(event.query);
+			return this.endpoint.loadInventarliste(encodedQuery)
 				.then(result => {
 					this.filteredInventar = result.data.retval;
 				});
@@ -256,8 +259,7 @@ export default {
 		}
 	},
 	created(){
-		this.$fhcApi
-			.get('api/frontend/v1/betriebsmittel/Betriebsmittel/getTypenBetriebsmittel')
+		return this.endpoint.getTypenBetriebsmittel()
 			.then(result => result.data)
 			.then(result => {
 				this.listBetriebsmitteltyp = result;
@@ -265,57 +267,44 @@ export default {
 			.catch(this.$fhcAlert.handleSystemError);
 	},
 	template: `
-	<div class="core-betriebsmittel">
-	
-	
+	<div class="core-betriebsmittel h-100 d-flex flex-column">
+		
 		<!--Modal: deleteBetriebsmittelModal-->
 		<BsModal ref="deleteBetriebsmittelModal">
 			<template #title>{{$p.t('ui', 'betriebsmittel_delete')}}</template>
-			<template #default>
-				<p>{{$p.t('ui', 'betriebsmittel_confirm_delete')}}</p>
-			</template>
+			<template #default><p>{{$p.t('ui', 'betriebsmittel_confirm_delete')}}</p></template>
 			<template #footer>
-<!--				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">Abbrechen</button>-->
 				<button ref="Close" type="button" class="btn btn-primary" @click="deleteBetriebsmittel(formData.betriebsmittelperson_id)">OK</button>
 			</template>
 		</BsModal>
 		
+		<core-filter-cmpt
+			ref="table"
+			:tabulator-options="tabulatorOptions"
+			:tabulator-events="tabulatorEvents"
+			table-only
+			:side-menu="false"
+			reload
+			new-btn-show
+			new-btn-label="Betriebsmittel"
+			@click:new="actionNewBetriebsmittel"
+			>
+		</core-filter-cmpt>		
 		
-		<div class="row col-12">
-			<div class="col-6">
-			
-				<core-filter-cmpt
-					ref="table"
-					:tabulator-options="tabulatorOptions"
-					:tabulator-events="tabulatorEvents"
-					table-only
-					:side-menu="false"
-					reload
-					new-btn-show
-					new-btn-label="Betriebsmittel"
-					@click:new="actionNewBetriebsmittel"
-					>
-				</core-filter-cmpt>
-			
-			</div>
-			
-
-			
-			<form-form class="row g-3 col-6" ref="betriebsmittelData">
+		<!--Modal: betriebsmittelModal-->
+		<bs-modal ref="betriebsmittelModal">
+			<template #title>
+				<p v-if="statusNew" class="fw-bold mt-3">{{$p.t('ui', 'add_betriebsmittel')}}</p>
+				<p v-else class="fw-bold mt-3">{{$p.t('ui', 'edit_betriebsmittel')}}</p>
+			</template>
+		
+			<form-form class="row g-3" ref="betriebsmittelData">		
 				<legend>Details</legend>
-				
-				<div class="row mb-3">
-					<div class="col-sm-7">
-						<p v-if="statusNew" class="fw-bold">{{$p.t('ui', 'add_betriebsmittel')}}</p>
-						<p v-else class="fw-bold">{{$p.t('ui', 'edit_betriebsmittel')}}</p>
-					</div>
-				</div>
-				
-				<div class="row mb-3">
-					<label for="typ" class="form-label col-sm-4">{{$p.t('global', 'typ')}}</label>
-					<div class="col-sm-6">
+					
+					<div class="row mb-3">
 						<form-input
 						type="select"
+						:label="$p.t('global/typ')"
 						name="typ"
 						v-model="formData.betriebsmitteltyp"
 						:disabled="!statusNew"
@@ -329,87 +318,86 @@ export default {
 						</option>
 						</form-input>
 					</div>
-				</div>
-			
-				<div v-if="formData.betriebsmitteltyp == 'Inventar'" class="row mb-3">
-					<label for="inventarnummer" class="form-label col-sm-4">{{$p.t('wawi', 'inventarnummer')}}</label>
-					<div class="col-sm-6">
-						<PvAutoComplete v-model="formData['inventarData']" optionLabel="dropdowntext" :suggestions="filteredInventar" @complete="searchInventar" minLength="3"/>
-					</div>
-				</div>
-				<div v-else-if="formData.inventarnummer" class="row mb-3">
-				<label for="inventarnummer" class="form-label col-sm-4">{{$p.t('wawi', 'inventarnummer')}}</label>
-					<div class="col-sm-6">
-						<input type="text" class="form-control" id="inventarnummer" v-model="formData.inventarnummer" :disabled="!statusNew">
-					</div>
-				</div>
 				
-				<div v-if="formData.betriebsmitteltyp!='Inventar' && !formData.inventarnummer" class="row mb-3">
-					<label for="nummer" class="form-label col-sm-4">{{$p.t('wawi', 'nummer')}}</label>
-					<div class="col-sm-6">
+					<div v-if="formData.betriebsmitteltyp == 'Inventar'" class="row mb-3">
+						<form-input
+							type="autocomplete"
+							:label="$p.t('wawi/inventarnummer')"
+							name="inventarnummer"
+							v-model="formData.inventarData"
+							optionLabel="dropdowntext" 
+							:suggestions="filteredInventar" 
+							@complete="searchInventar" 
+							minLength="3"
+						>
+						</form-input>
+					</div>
+					<div v-else-if="formData.inventarnummer" class="row mb-3">
 						<form-input
 							type="text"
+							:label="$p.t('wawi/inventarnummer')"
+							name="inventarnummer"
+							v-model="formData.inventarnummer"
+							:disabled="!statusNew"
+						>
+						</form-input>
+					</div>
+					
+					<div v-if="formData.betriebsmitteltyp!='Inventar' && !formData.inventarnummer" class="row mb-3">
+						<form-input
+							type="text"
+							:label="$p.t('wawi/nummer')"
 							name="nummer"
 							v-model="formData['nummer']"
 						>
 						</form-input>
 					</div>
-				</div>
-				
-				<div v-if="formData.betriebsmitteltyp!='Inventar' && !formData.inventarnummer" class="row mb-3">
-					<label for="nummer2" class="form-label col-sm-4">{{$p.t('wawi', 'nummer')}} 2</label>
-					<div class="col-sm-6">
+					
+					<div v-if="formData.betriebsmitteltyp!='Inventar' && !formData.inventarnummer" class="row mb-3">
 						<form-input
 							type="text"
+							:label="$p.t('wawi/nummer') + ' 2'"
 							name="nummer2"
 							v-model="formData['nummer2']"
 						>
 						</form-input>
 					</div>
-				</div>
-			
-				<div v-if="formData.betriebsmitteltyp!='Inventar'" class="row mb-3">
-					<label for="beschreibung" class="form-label col-sm-4">{{$p.t('global', 'beschreibung')}}</label>
-					<div class="col-sm-6">
+				
+					<div v-if="formData.betriebsmitteltyp!='Inventar'" class="row mb-3">
 						<form-input
 							type="textarea"
+							:label="$p.t('global/beschreibung')"
 							name="beschreibung"
 							v-model="formData['beschreibung']"
 							:disabled="formData.inventarnummer"
 						>
 						</form-input>
 					</div>
-				</div>
-				
-				<div class="row mb-3">
-					<label for="kaution" class="form-label col-sm-4">{{$p.t('infocenter', 'kaution')}}</label>
-					<div class="col-sm-6">
+					
+					<div class="row mb-3">
 						<form-input
 							type="text"
+							:label="$p.t('infocenter/kaution')"
 							name="kaution"
 							v-model="formData['kaution']"
 						>
 						</form-input>
 					</div>
-				</div>
-				
-				<div class="row mb-3">
-					<label for="anmerkung" class="form-label col-sm-4">{{$p.t('global', 'anmerkung')}}</label>
-					<div class="col-sm-6">
+					
+					<div class="row mb-3">
 						<form-input
 							type="textarea"
+							:label="$p.t('global/anmerkung')"
 							name="anmerkung"
 							v-model="formData['anmerkung']"
 						>
 						</form-input>
 					</div>
-				</div>
-				
-				<div class="row mb-3">
-					<label for="ausgegebenam" class="form-label col-sm-4">{{$p.t('wawi', 'ausgegebenam')}}</label>
-					<div class="col-sm-6">
+					
+					<div class="row mb-3">
 						<form-input
 							type="DatePicker"
+							:label="$p.t('wawi/ausgegebenam')"
 							name="datum"
 							v-model="formData['ausgegebenam']"
 							auto-apply
@@ -419,13 +407,11 @@ export default {
 							:teleport="true"
 						></form-input>
 					</div>
-				</div>
-				
-				<div class="row mb-3">
-					<label for="retouram" class="form-label col-sm-4">{{$p.t('wawi', 'retouram')}}</label>
-					<div class="col-sm-6">
+					
+					<div class="row mb-3">
 						<form-input
 							type="DatePicker"
+							:label="$p.t('wawi/retouram')"
 							name="datum"
 							v-model="formData['retouram']"
 							auto-apply
@@ -435,28 +421,16 @@ export default {
 							:teleport="true"
 						></form-input>
 					</div>
-				</div>
+				</form-form>
 				
+				<template #footer>
+					<button v-if="statusNew"  ref="Close" type="button" class="btn btn-primary" @click="addNewBetriebsmittel()">{{$p.t('ui', 'speichern')}}</button>
 
-				<div class="row mb-3">
-				<label class="form-label col-sm-8"></label>
-					<div v-if="statusNew" class="col-sm-4">
-						<button ref="Close" type="button" class="btn btn-primary" @click="addNewBetriebsmittel()">{{$p.t('ui', 'speichern')}}</button>
-					</div>
-					<div v-else class="col-sm-4">
-						<button ref="Close" type="button" class="btn btn-primary" @click="updateBetriebsmittel()">{{$p.t('ui', 'speichern')}}</button>
-					</div>
+					<button v-else  ref="Close" type="button" class="btn btn-primary" @click="updateBetriebsmittel(formData.betriebsmittelperson_id)">{{$p.t('ui', 'speichern')}}</button>
+				</template>
 					
-				</div>
-		</form-form>
-		
-		</div>
-
-
-
-
-
-		
+		</bs-modal>
+				
 	</div>`
 }
 
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 12e251133..34862d600 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -24698,7 +24698,349 @@ array(
 				'insertvon' => 'system'
 			)
 		)
-	)
+	),
+	// Betriebsmittel begin
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'successSave',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Speichern erfolgreich',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Successfully saved',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'successDelete',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Löschen erfolgreich',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Delete successful',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'successAdvance',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Vorrückung Status erfolgreich',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Advance status successful',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'successConfirm',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bestätigung Status erfolgreich',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Confirmation status successful',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'betriebsmittel',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Betriebsmittel',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Resources',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'betriebsmittel_delete',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Betriebsmittel löschen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'delete operating resource',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'betriebsmittel_confirm_delete',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Betriebsmittel wirklich löschen?',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Really delete operating resource?',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'add_betriebsmittel',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Betriebsmittel anlegen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'create operating resource',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'edit_betriebsmittel',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Betriebsmittel bearbeiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'edit operating resource',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'wawi',
+		'phrase' => 'nummer',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Nummer',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'number',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'wawi',
+		'phrase' => 'ausgegebenam',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ausgegeben am',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'issued on',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'wawi',
+		'phrase' => 'retouram',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Retour am',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'returned on',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'wawi',
+		'phrase' => 'retourdatum',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Retourdatum',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'return date',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'wawi',
+		'phrase' => 'ausgabedatum',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ausgabedatum',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'issue date',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'wawi',
+		'phrase' => 'error_zutrittskarteOhneNummer',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Eine Zutrittskarte muss eine Nummer haben. Um die Zuordnung zu dieser Karte zu löschen entfernen Sie bitte den ganzen Datensatz!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'An access card must have a number. To delete the assignment to this card, please remove the entire data record!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'wawi',
+		'phrase' => 'error_inventarWaehlen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bitte wählen Sie das entsprechende Inventar aus dem Drop Down Menü Inventarnummer aus!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Please select the appropriate inventory from the inventory number drop down menu!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'wawi',
+		'phrase' => 'error_retourdatumVorAusgabe',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Retourdatum darf nicht vor Datum der Ausgabe liegen!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The return date must not be before the issue date!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	// Betriebsmittel end
 );
 
 

From ff0f2320e174af359b043312d9d2fa2a2b9c0563 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 1 Jul 2024 14:43:43 +0200
Subject: [PATCH 0872/1461] changes the layout of the searchbar to be the same
 in the mobile view and in the desktop view

---
 application/views/templates/CISHTML-Header.php |  3 +--
 public/js/components/searchbar/searchbar.js    | 17 +++++++++++------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/application/views/templates/CISHTML-Header.php b/application/views/templates/CISHTML-Header.php
index c9f2b3305..f373a1d49 100755
--- a/application/views/templates/CISHTML-Header.php
+++ b/application/views/templates/CISHTML-Header.php
@@ -31,7 +31,7 @@ if (!isset($menu)) {
 	<button id="nav-main-btn" class="navbar-toggler" type="button" data-bs-toggle="offcanvas" data-bs-target="#nav-main" aria-controls="nav-main" aria-expanded="false" aria-label="Toggle navigation">
 		<span class="navbar-toggler-icon"></span>
 	</button>
-	<fhc-searchbar id="nav-search" class="px-2 d-lg-none fhc-searchbar w-100" @updatesearchtypes="updatesearchtypes" :selectedtypes="selectedtypes" :searchoptions="searchbaroptions" :searchfunction="searchfunction"></fhc-searchbar>	
+	<fhc-searchbar id="nav-search" class=" fhc-searchbar w-100" @updatesearchtypes="updatesearchtypes" :selectedtypes="selectedtypes" :searchoptions="searchbaroptions" :searchfunction="searchfunction"></fhc-searchbar>	
 	<a id="nav-logo" href="<?= site_url(''); ?>">
 		<img src="<?= base_url('/public/images/logo-300x160.png'); ?>" alt="Logo">
 	</a>
@@ -42,7 +42,6 @@ if (!isset($menu)) {
 			</button>
 		</div>
 		<div class="offcanvas-body p-0">
-			<fhc-searchbar id="nav-search" class="d-none d-lg-block fhc-searchbar w-100" @updatesearchtypes="updatesearchtypes" :selectedtypes="selectedtypes" :searchoptions="searchbaroptions"  :searchfunction="searchfunction"></fhc-searchbar>
 			<button id="nav-user-btn" class="btn btn-link rounded-0" type="button" data-bs-toggle="collapse" data-bs-target="#nav-user-menu" aria-expanded="false" aria-controls="nav-user-menu">
 				<img src="<?= site_url('Cis/Pub/bild/person/' . getAuthPersonId()); ?>" class="avatar rounded-circle"/>
 			</button>
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 474f0ad8b..bee90fd1e 100755
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -54,8 +54,8 @@ export default {
               </template>
             </div>
 
-            <div @[\`show.bs.collapse\`]="calcSearchSettingsExtent" class="collapse" id="searchSettings"  ref="settings" 
-                 class="searchbar_settings text-white" tabindex="-1">
+            <div id="searchSettings"  ref="settings" 
+                 class="top-100 end-0 searchbar_settings text-white collapse" tabindex="-1">
               <div class="d-flex flex-column m-3" v-if="this.searchoptions.types.length > 0">
               <span class="fw-light mb-2">Suche filtern nach:</span>  
               <template v-for="(type, index) in this.searchoptions.types" :key="type">
@@ -79,13 +79,18 @@ export default {
     },
     beforeMount: function() {
         this.updateSearchOptions();
+        
+    },
+    mounted(){
+        window.addEventListener('resize', (event) =>{
+            console.log(this.$refs.settings,"this is the refs of the settings")
+            this.$refs.settings.hide();
+            console.log("resizing")
+        }); 
+        //console.log(this.$refs.settings.show,"this are the refs")
     },
     methods: {
         
-        calcSearchSettingsExtent: function(){
-            this.$refs.settings.style.top = Math.floor(this.$refs.settingsbutton.offsetHeight  ) + 'px';
-            this.$refs.settings.style.right = 0;
-        },
 
         updateSearchOptions: function() {
             this.searchsettings.types = [];

From 3d2ea2821e2f241bd9e5c48d2a0e071dc7cc40eb Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 2 Jul 2024 09:26:19 +0200
Subject: [PATCH 0873/1461] fixes little typo, that fails to render the widget

---
 public/js/components/Cis/Mylv/LvUebersicht.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Cis/Mylv/LvUebersicht.js b/public/js/components/Cis/Mylv/LvUebersicht.js
index 503791404..ed992da5d 100644
--- a/public/js/components/Cis/Mylv/LvUebersicht.js
+++ b/public/js/components/Cis/Mylv/LvUebersicht.js
@@ -58,7 +58,7 @@ export default  {
                         <span>{{item}}</span>
                         <i class="fa fa-file"></i>
                     </a>
-                    <a v-else :href="#">
+                    <a v-else href="#">
                         <span>{{item}}</span>
                         <i class="fa fa-file"></i>
                     </a>

From 57d3d3af13a29548efde28cf880739bbb7032473 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 2 Jul 2024 10:28:35 +0200
Subject: [PATCH 0874/1461] removes the shared storage for the searchbar and
 saves the data local in the searchbar again

---
 public/js/components/searchbar/searchbar.js      |  8 +++++---
 public/js/components/searchbar/sharedSettings.js | 10 ----------
 2 files changed, 5 insertions(+), 13 deletions(-)
 delete mode 100644 public/js/components/searchbar/sharedSettings.js

diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index bee90fd1e..ec0b298be 100755
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -2,7 +2,6 @@ import person from "./person.js";
 import raum from "./raum.js";
 import employee from "./employee.js";
 import organisationunit from "./organisationunit.js";
-import {searchSettings, searchresult} from "./sharedSettings.js";
 
 export default {
     props: [ "searchoptions", "searchfunction","selectedtypes" ],
@@ -12,8 +11,11 @@ export default {
         searchtimer: null,
         hidetimer: null,
         showsettings: false,
-        searchsettings: searchSettings,
-        searchresult: searchresult,
+        searchsettings: {
+            searchstr: '',
+            types: [],
+        },
+        searchresult: [],
         showresult: false,  
         searching: false,
         error: null,
diff --git a/public/js/components/searchbar/sharedSettings.js b/public/js/components/searchbar/sharedSettings.js
deleted file mode 100644
index e427e8483..000000000
--- a/public/js/components/searchbar/sharedSettings.js
+++ /dev/null
@@ -1,10 +0,0 @@
-let searchSettings = Vue.reactive({
-    searchstr: '',
-    types: [],
-       
-});
-
-let searchresult = Vue.reactive([]);
-
-
-export {searchSettings, searchresult};
\ No newline at end of file

From 19753a9ef7788f0237a08299312845e3031d0953 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 2 Jul 2024 14:50:54 +0200
Subject: [PATCH 0875/1461] test api endpoint to include the lvinfo menu link

---
 .../models/ressource/Stundenplan_model.php    |  3 +-
 include/lehreinheit.class.php                 | 39 +++++++++++++++++++
 public/js/api/addons.js                       | 10 +++++
 public/js/api/fhcapifactory.js                |  2 +
 public/js/components/Cis/Mylv/LvUebersicht.js | 11 ++++++
 5 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 public/js/api/addons.js

diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 5ec6ea302..7b7bc24cd 100755
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -19,11 +19,12 @@ class Stundenplan_model extends DB_Model
 	 */
 	public function loadForUid($uid)
 	{
-		$this->addSelect('sp.*');
+		$this->addSelect(['sp.*','le.studiensemester_kurzbz']);
 		$this->db->join('public.tbl_benutzergruppe bg', 'sp.gruppe_kurzbz=bg.gruppe_kurzbz AND bg.uid=?', 'LEFT', false);
 		$this->addJoin('public.tbl_studiensemester ss1', 'bg.studiensemester_kurzbz=ss1.studiensemester_kurzbz AND ss1.start<=sp.datum AND ss1.ende>=sp.datum', 'LEFT');
 		$this->db->join('public.tbl_studentlehrverband slv', "sp.studiengang_kz=slv.studiengang_kz AND slv.student_uid=? AND (slv.semester=sp.semester OR sp.semester IS NULL) AND (slv.verband=sp.verband OR sp.verband IS NULL OR sp.verband='' OR sp.verband='0') AND (slv.gruppe=sp.gruppe OR sp.gruppe IS NULL OR sp.gruppe='' OR sp.gruppe='0') AND sp.gruppe_kurzbz IS NULL", 'LEFT', false);
 		$this->addJoin('public.tbl_studiensemester ss2', 'slv.studiensemester_kurzbz=ss2.studiensemester_kurzbz AND ss2.start<=sp.datum AND ss2.ende>=sp.datum', 'LEFT');
+		$this->addJoin('lehre.tbl_lehreinheit le', 'le.lehreinheit_id=sp.lehreinheit_id', 'LEFT');
 		$this->db->or_where('ss1.studiensemester_kurzbz IS NOT NULL', null, false);
 		$this->db->or_where('ss2.studiensemester_kurzbz IS NOT NULL', null, false);
 		
diff --git a/include/lehreinheit.class.php b/include/lehreinheit.class.php
index 6bf1f7282..bf26f47b9 100755
--- a/include/lehreinheit.class.php
+++ b/include/lehreinheit.class.php
@@ -1122,4 +1122,43 @@ class lehreinheit extends basis_db
 
 		return $ret;
 	}
+
+
+public function lehreinheitInfo($lvid,$angezeigtes_stsem,$lehrfach_id)
+{
+	$qry = "SELECT * FROM (SELECT distinct on(uid) vorname, nachname, tbl_benutzer.uid as uid,
+	CASE WHEN lehrfunktion_kurzbz='LV-Leitung' THEN true ELSE false END as lvleiter
+	FROM lehre.tbl_lehreinheit, lehre.tbl_lehreinheitmitarbeiter, public.tbl_benutzer, public.tbl_person
+	WHERE
+	tbl_lehreinheit.lehreinheit_id=tbl_lehreinheitmitarbeiter.lehreinheit_id AND
+	tbl_lehreinheitmitarbeiter.mitarbeiter_uid=tbl_benutzer.uid AND
+	tbl_person.person_id=tbl_benutzer.person_id AND
+	lehrveranstaltung_id=".$this->db_add_param($lvid, FHC_INTEGER)." AND
+	tbl_lehreinheitmitarbeiter.mitarbeiter_uid NOT like '_Dummy%' AND
+	tbl_benutzer.aktiv=true AND tbl_person.aktiv=true AND
+	studiensemester_kurzbz=".$this->db_add_param($angezeigtes_stsem);
+
+	if($lehrfach_id!='')
+	$qry.=" AND tbl_lehreinheit.lehrfach_id=".$this->db_add_param($lehrfach_id);
+
+	$qry.=" ORDER BY uid, lvleiter desc) as a ORDER BY lvleiter desc, nachname, vorname";
+
+	$result = $this->db_query($qry);
+	if (!$result)
+	{
+		$this->errormsg=$this->db_last_error().$qry;
+		return false;
+	}
+	$ret = array();
+
+	while($row = $this->db_fetch_object($result))
+	{
+		$ret[] = $row;
+	}
+
+	return $ret;
 }
+}
+
+
+
diff --git a/public/js/api/addons.js b/public/js/api/addons.js
new file mode 100644
index 000000000..b40ea65cb
--- /dev/null
+++ b/public/js/api/addons.js
@@ -0,0 +1,10 @@
+export default {
+    getAddonLink(addon, lehrveranstaltung_id, studiensemester_kurzbz) {
+          return this.$fhcApi.get(
+              FHC_JS_DATA_STORAGE_OBJECT.app_root +
+              `/addons/${addon}/cis/testapi.php`,
+              { lehrveranstaltung_id: lehrveranstaltung_id,
+                studiensemester_kurzbz: studiensemester_kurzbz }
+          );
+      },
+  }
\ No newline at end of file
diff --git a/public/js/api/fhcapifactory.js b/public/js/api/fhcapifactory.js
index c2ba6b5da..0f0d6a53b 100644
--- a/public/js/api/fhcapifactory.js
+++ b/public/js/api/fhcapifactory.js
@@ -23,6 +23,7 @@ import studstatus from "./studstatus.js";
 import ort from "./ort.js";
 import cms from "./cms.js";
 import lehre from "./lehre.js";
+import addons from "./addons.js";
 
 export default {
     search,
@@ -33,4 +34,5 @@ export default {
     ort,
     cms,
     lehre,
+    addons,
 };
diff --git a/public/js/components/Cis/Mylv/LvUebersicht.js b/public/js/components/Cis/Mylv/LvUebersicht.js
index ed992da5d..7c16b8fb9 100644
--- a/public/js/components/Cis/Mylv/LvUebersicht.js
+++ b/public/js/components/Cis/Mylv/LvUebersicht.js
@@ -32,9 +32,20 @@ export default  {
                 // prepare the mailto link with all the emails from the students of the lv
                 this.emailAnStudierende = "mailto:"+res.data.join(",");
             });
+
+            this.$fhcApi.factory.addons.getAddonLink("lvinfo",this.event.lehrveranstaltung_id, this.event.studiensemester_kurzbz).then(res =>{
+                console.log(res,"this is the result from the api call");
+            });
         },
     },
     mounted(){
+        
+        
+        // make axios call to the active addons
+        /* $addon_obj->loadAddons();
+        foreach($addon_obj->result as $addon)
+        {
+        if(file_exists('../../../addons/'.$addon->kurzbz.'/cis/init.js.php')) */
         this.modal = this.$refs.modalContainer;
         
     },

From affbe7821a8d507334b5074b53911304685cfd67 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 2 Jul 2024 16:51:42 +0200
Subject: [PATCH 0876/1461] =?UTF-8?q?email=20vorlagen=20sql=20insert;=20tr?=
 =?UTF-8?q?im=20entschuldigungs=20begr=C3=BCndung=20to=20max=20size;=20WIP?=
 =?UTF-8?q?=20routing;=20WIP=20fancy=20loader=20overlay;=20WIP=20Api=20Tes?=
 =?UTF-8?q?ting;=20lektor=20ui=20finetuning;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/tw/cis_menu_lv.inc.php | 14 +++---
 locale/de-AT/lehre.php         |  1 +
 locale/en-US/lehre.php         |  1 +
 system/phrasesupdate.php       | 80 ++++++++++++++++++++++++++++++++++
 4 files changed, 88 insertions(+), 8 deletions(-)

diff --git a/include/tw/cis_menu_lv.inc.php b/include/tw/cis_menu_lv.inc.php
index 978e59de5..f42543817 100644
--- a/include/tw/cis_menu_lv.inc.php
+++ b/include/tw/cis_menu_lv.inc.php
@@ -245,18 +245,16 @@ function checkZeilenUmbruch()
 	{
 
 		$link='';
-		$name='';
 		$text='';
 
-		$name = 'Digitale Anwesenheiten';
-		$link= APP_ROOT."index.ci.php/extensions/FHC-Core-Anwesenheiten/?stg_kz=$studiengang_kz&sem=$semester&lvid=$lvid&sem_kurzbz=$angezeigtes_stsem";
+		$link= APP_ROOT."index.ci.php/extensions/FHC-Core-Anwesenheiten/?stg_kz=$studiengang_kz&sem=$semester&lvid=$lvid&sem_kurzbz=$angezeigtes_stsem&nav=false";
 
 		$menu[]=array
 		(
-			'id'=>'core_menu_anwesenheitslisten',
-			'position'=>'40',
-			'name'=> $name,
-			'icon'=>'../../../skin/images/button_listen.png',
+			'id'=>'core_menu_digitale_anwesenheitslisten',
+			'position'=>'50',
+			'name'=> $p->t('lehre/digiAnw'),
+			'icon'=>'../../../skin/images/button_kreuzerltool.png',
 			'link'=>$link,
 			'text'=>$text
 		);
@@ -268,7 +266,7 @@ function checkZeilenUmbruch()
 		$menu[]=array
 		(
 			'id'=>'core_menu_feedback',
-			'position'=>'50',
+			'position'=>'60',
 			'name'=>$p->t('lehre/feedback'),
 			'icon'=>'../../../skin/images/button_feedback.png',
 			'link'=>'feedback.php?lvid='.$lvid,
diff --git a/locale/de-AT/lehre.php b/locale/de-AT/lehre.php
index c5be73401..cdab4c12a 100644
--- a/locale/de-AT/lehre.php
+++ b/locale/de-AT/lehre.php
@@ -16,6 +16,7 @@ $this->phrasen['lehre/upload']='Upload';
 $this->phrasen['lehre/ziparchiv']='Zip-Archiv';
 $this->phrasen['lehre/ziparchivTitle']='Alle Dateien im Download Verzeichnis als Zip-Archiv herunterladen';
 $this->phrasen['lehre/anwesenheitsUndNotenlisten']='Anwesenheits- und Notenlisten';
+$this->phrasen['lehre/digiAnw']='Digitale Anwesenheiten';
 $this->phrasen['lehre/leistungsuebersicht']='Leistungsübersicht';
 $this->phrasen['lehre/newsgroups']='Newsgroups';
 $this->phrasen['lehre/feedback']='Feedback';
diff --git a/locale/en-US/lehre.php b/locale/en-US/lehre.php
index e8a78c38b..cba02e08c 100644
--- a/locale/en-US/lehre.php
+++ b/locale/en-US/lehre.php
@@ -16,6 +16,7 @@ $this->phrasen['lehre/upload']='Upload';
 $this->phrasen['lehre/ziparchiv']='Zip-File';
 $this->phrasen['lehre/ziparchivTitle']='Download all Files as Zip-File';
 $this->phrasen['lehre/anwesenheitsUndNotenlisten']='Attendance and grade list';
+$this->phrasen['lehre/digiAnw']='Digital Attendances';
 $this->phrasen['lehre/leistungsuebersicht']='Performance List';
 $this->phrasen['lehre/newsgroups']='Newsgroups';
 $this->phrasen['lehre/feedback']='Feedback';
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 354b12fde..31624abdf 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -25821,6 +25821,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'missingParameters',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Unvollständige Parameterübergabe',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Parameters are missing',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
@@ -26521,6 +26541,66 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'anwInfoKeineTermineGefunden',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Keine Termine zum LV-Teil gefunden!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No dates found for teaching unit!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'digiAnw',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Digitale Anwesenheiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Digital Attendances',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'anwNotizUpdated',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Notiz wurde erfolgreich bearbeitet.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Note has been edited sucessfully',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	)
 	// FHC-CORE-ANWESENHEITEN END
 );
 

From 2a7735bca5a2f2ba7db35eca1c66adf20cb20123 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 3 Jul 2024 11:56:18 +0200
Subject: [PATCH 0877/1461] outsources internal queryies to the appropriate
 classes, to assign the values to the needed variables to fill the menu array
 of the menu_lv.inc.php

---
 .../models/ressource/Stundenplan_model.php    |  2 +-
 include/lehreinheit.class.php                 | 57 +++++++++++++++++++
 include/lehrveranstaltung.class.php           | 31 ++++++++++
 3 files changed, 89 insertions(+), 1 deletion(-)

diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 7b7bc24cd..511bf5000 100755
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -24,7 +24,7 @@ class Stundenplan_model extends DB_Model
 		$this->addJoin('public.tbl_studiensemester ss1', 'bg.studiensemester_kurzbz=ss1.studiensemester_kurzbz AND ss1.start<=sp.datum AND ss1.ende>=sp.datum', 'LEFT');
 		$this->db->join('public.tbl_studentlehrverband slv', "sp.studiengang_kz=slv.studiengang_kz AND slv.student_uid=? AND (slv.semester=sp.semester OR sp.semester IS NULL) AND (slv.verband=sp.verband OR sp.verband IS NULL OR sp.verband='' OR sp.verband='0') AND (slv.gruppe=sp.gruppe OR sp.gruppe IS NULL OR sp.gruppe='' OR sp.gruppe='0') AND sp.gruppe_kurzbz IS NULL", 'LEFT', false);
 		$this->addJoin('public.tbl_studiensemester ss2', 'slv.studiensemester_kurzbz=ss2.studiensemester_kurzbz AND ss2.start<=sp.datum AND ss2.ende>=sp.datum', 'LEFT');
-		$this->addJoin('lehre.tbl_lehreinheit le', 'le.lehreinheit_id=sp.lehreinheit_id', 'LEFT');
+		$this->db->join('lehre.tbl_lehreinheit le', 'le.lehreinheit_id=sp.lehreinheit_id', 'LEFT');
 		$this->db->or_where('ss1.studiensemester_kurzbz IS NOT NULL', null, false);
 		$this->db->or_where('ss2.studiensemester_kurzbz IS NOT NULL', null, false);
 		
diff --git a/include/lehreinheit.class.php b/include/lehreinheit.class.php
index bf26f47b9..1b7ed10e4 100755
--- a/include/lehreinheit.class.php
+++ b/include/lehreinheit.class.php
@@ -1158,6 +1158,63 @@ public function lehreinheitInfo($lvid,$angezeigtes_stsem,$lehrfach_id)
 
 	return $ret;
 }
+
+public function lehrfach_id_mitarbeiter($angezeigtes_stsem,$user,$lvid)
+{
+	$qry = "SELECT
+            distinct lehrfach_id
+            FROM
+                lehre.tbl_lehreinheit
+                JOIN lehre.tbl_lehreinheitmitarbeiter USING(lehreinheit_id)
+            WHERE
+                studiensemester_kurzbz=".$this->db_add_param($angezeigtes_stsem)."
+                AND mitarbeiter_uid=".$this->db_add_param($user)."
+                AND lehrveranstaltung_id=".$this->db_add_param($lvid, FHC_INTEGER);
+
+	
+	$result = $this->db_query($qry);
+	if (!$result)
+	{
+		$this->errormsg=$this->db_last_error().$qry;
+		return false;
+	}
+	$ret = array();
+
+	while($row = $this->db_fetch_object($result))
+	{
+		$ret[] = $row;
+	}
+
+	return $ret;
+}
+
+public function lehrfach_id_studierender($lvid,$angezeigtes_stsem,$user)
+{
+	$qry = "SELECT distinct lehrfach_id
+            FROM
+                campus.vw_student_lehrveranstaltung
+            WHERE
+                lehrveranstaltung_id=".$this->db_add_param($lvid, FHC_INTEGER)."
+                AND studiensemester_kurzbz=".$this->db_add_param($angezeigtes_stsem)."
+                AND uid=".$this->db_add_param($user);
+	
+	$result = $this->db_query($qry);
+	if (!$result)
+	{
+		$this->errormsg=$this->db_last_error().$qry;
+		return false;
+	}
+	$ret = array();
+
+	while($row = $this->db_fetch_object($result))
+	{
+		$ret[] = $row;
+	}
+
+	return $ret;
+}
+
+
 }
 
 
diff --git a/include/lehrveranstaltung.class.php b/include/lehrveranstaltung.class.php
index 48edd9d0a..b2a3bc481 100755
--- a/include/lehrveranstaltung.class.php
+++ b/include/lehrveranstaltung.class.php
@@ -2861,5 +2861,36 @@ class lehrveranstaltung extends basis_db
 			return false;
 		}
 	}
+//Berechtigungen auf Fachbereichsebene
+public function getBerechtigungenAufFachberechsebene($lvid,$angezeigtes_stsem)
+{
+	$qry = "SELECT
+	distinct lehrfach.oe_kurzbz
+	FROM
+	lehre.tbl_lehrveranstaltung
+	JOIN lehre.tbl_lehreinheit USING(lehrveranstaltung_id)
+	JOIN lehre.tbl_lehrveranstaltung as lehrfach ON(tbl_lehreinheit.lehrfach_id=lehrfach.lehrveranstaltung_id)
+	WHERE tbl_lehrveranstaltung.lehrveranstaltung_id=".$this->db_add_param($lvid, FHC_INTEGER);
+
+	if(isset($angezeigtes_stsem) && $angezeigtes_stsem!=''){
+		$qry .= " AND studiensemester_kurzbz=".$this->db_add_param($angezeigtes_stsem);
+	}
+
+	$lehrveranstaltungen = [];
+	if($result = $this->db_query($qry))
+	{
+		while($row = $this->db_fetch_object($result))
+		{
+			$lehrveranstaltungen[] = $row;
+		}
+		return $lehrveranstaltungen;
+	}
+	else
+	{
+		$this->errormsg = 'Fehler beim Laden der Daten';
+		return false;
+	}
+}
+	
 }
 ?>

From 92afdf71cdf52488f946eb25314439952d5f3936 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 3 Jul 2024 15:53:01 +0200
Subject: [PATCH 0878/1461] changing fhcapi for the client side for the profil
 WIP

---
 .../controllers/api/frontend/v1/Profil.php    | 616 ++++++++++++++++++
 public/js/api/fhcapifactory.js                |   4 +-
 public/js/api/profil.js                       |  76 +++
 public/js/apps/Cis/Profil.js                  |   4 +-
 .../EditProfilComponents/EditAdresse.js       |   3 +
 5 files changed, 701 insertions(+), 2 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/Profil.php
 create mode 100755 public/js/api/profil.js

diff --git a/application/controllers/api/frontend/v1/Profil.php b/application/controllers/api/frontend/v1/Profil.php
new file mode 100644
index 000000000..88679c636
--- /dev/null
+++ b/application/controllers/api/frontend/v1/Profil.php
@@ -0,0 +1,616 @@
+<?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');
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the SearchBarLib (back-end)
+ * Provides data to the ajax get calls about the searchbar component
+ * This controller works with JSON calls on the HTTP GET and the output is always JSON
+ */
+class Profil extends FHCAPI_Controller
+{
+
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'getView' => self::PERM_LOGGED,
+            'fotoSperre' => self::PERM_LOGGED,
+		]);
+
+
+		$this->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
+		$this->load->model('crm/Student_model', 'StudentModel');
+		$this->load->model('person/Benutzer_model', 'BenutzerModel');
+		$this->load->model('person/Person_model', 'PersonModel');
+		$this->load->model('person/Adresse_model', 'AdresseModel');
+		$this->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
+		$this->load->model('person/Benutzergruppe_model', 'BenutzergruppeModel');
+		$this->load->model('ressource/Betriebsmittelperson_model', 'BetriebsmittelpersonModel');
+		$this->load->model('person/Kontakt_model', 'KontaktModel');
+		$this->load->model('person/Profil_update_model', 'ProfilUpdateModel');
+		$this->load->model('content/DmsVersion_model', 'DmsVersionModel');
+
+
+		//? put the uid and pid inside the controller for reusability
+		$this->uid = getAuthUID();
+		$this->pid = getAuthPersonID();
+
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	
+    /**
+	 * function that returns the data used for the corresponding view
+	 * the client side parses the @param $uid and calls this function to get the data to the correct view 
+	 * @access public
+	 * @param  boolean $uid the userID used to identify which information should be retrieved for which view 
+	 * @return stdClass all the data corresponding to a view of a user
+	 */
+	public function getView($uid)
+	{
+		$res = new stdClass();
+
+		// if parsing the URL did not found a UID then the UID of the logged in user is used
+		if ($uid == "Profil" || $uid == $this->uid) {
+			$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter($this->uid);
+			if (isError($isMitarbeiter)) {
+				show_error("error while checking if UID: " . $this->uid . " is a mitarbeiter");
+			}
+			$isMitarbeiter = getData($isMitarbeiter);
+			if ($isMitarbeiter) {
+				$res->view = "MitarbeiterProfil";
+				$res->data = $this->mitarbeiterProfil();
+				$res->data->pid = $this->pid;
+			} else {
+				$res->view = "StudentProfil";
+				$res->data = $this->studentProfil();
+				$res->data->pid = $this->pid;
+			}
+		}
+		// UID is availabe when accessing Profil/View/:uid
+		else {
+			$this->PersonModel->addSelect(["person_id"]);
+			$pid = $this->PersonModel->getByUid($uid);
+			if (isError($pid)) {
+				show_error("error while trying to update table public.tbl_person while searching for a person with UID: " . $uid);
+			}
+			$pid = hasData($pid) ? getData($pid)[0] : null;
+			if (!$pid) {
+				show_error("Person with UID: " . $uid . " does not exist");
+			}
+			$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter($uid);
+			if (isError($isMitarbeiter)) {
+				show_error("error while checking if UID: " . $uid . " is a mitarbeiter");
+			}
+			$isMitarbeiter = getData($isMitarbeiter);
+			if ($isMitarbeiter) {
+				$res->view = "ViewMitarbeiterProfil";
+				$res->data = $this->viewMitarbeiterProfil($uid);
+
+			} else {
+				$res->view = "ViewStudentProfil";
+				$res->data = $this->viewStudentProfil($uid);
+			}
+		}
+		$this->terminateWithSuccess($res);
+	}
+
+    /**
+	 * update column foto_sperre in public.tbl_person
+	 * @access public
+	 * @param  boolean $value  new value for the column
+	 * @return boolean the new value added to the column in public.tbl_person
+	 */
+	public function fotoSperre($value)
+	{
+        if(!isset($value)){
+            $this->terminateWithError("Missing parameter", self::ERROR_TYPE_GENERAL);
+        }
+
+		$res = $this->PersonModel->update($this->pid, ["foto_sperre" => $value]);
+		if (isError($res)) {
+			show_error("error while trying to update table public.tbl_person");
+		}
+		$this->PersonModel->addSelect("foto_sperre");
+		$res = $this->PersonModel->load($this->pid);
+		if (isError($res)) {
+			show_error("error while trying to query table public.tbl_person");
+		}
+
+        $res = $this->getDataOrTerminateWithError($res);
+		
+        $this->terminateWithSuccess(current($res));
+	}
+
+
+    // -----------------------------------------------------------------------------------------------------------------
+	// Private methods
+
+	/**
+	 * function that returns the data used for viewing another mitarbeiter profile
+	 * @access private 
+	 * @param  integer $uid the userID to retrieve the mitarbeiter data
+	 * @return stdClass restricted mitarbeiter data
+	 */
+	private function viewMitarbeiterProfil($uid)
+	{
+		$mailverteiler_res = $this->getMailverteiler($uid);
+		$benutzer_funktion_res = $this->getBenutzerFunktion($uid);
+		$benutzer_res = $this->getBenutzerAlias($uid);
+		$person_res = $this->getPersonInfo($uid);
+		$mitarbeiter_res = $this->getMitarbeiterInfo($uid);
+		$telefon_res = $this->getTelefonInfo($uid);
+
+		$res = new stdClass();
+		$res->username = $uid;
+
+		//? Person Info
+		foreach ($person_res as $key => $val) {
+			$res->$key = $val;
+		}
+
+		//? Mitarbeiter Info
+		foreach ($mitarbeiter_res as $key => $val) {
+			$res->$key = $val;
+
+		}
+
+		$intern_email = array();
+		$intern_email["type"] = "intern";
+		$intern_email["email"] = $uid . "@" . DOMAIN;
+		$extern_email = array();
+		$extern_email["type"] = "alias";
+		$extern_email["email"] = $benutzer_res->alias . "@" . DOMAIN;
+		$res->emails = array($intern_email, $extern_email);
+
+		$res->funktionen = $benutzer_funktion_res;
+		$res->mailverteiler = $mailverteiler_res;
+		$res->standort_telefon = isset($telefon_res) ? $telefon_res->kontakt : null;
+
+		return $res;
+	}
+
+	/**
+	 * function that returns the data used for viewing another student profile
+	 * @access private 
+	 * @param  integer $uid the userID to retrieve the student data
+	 * @return stdClass restricted student data
+	 */
+	private function viewStudentProfil($uid)
+	{
+		$mailverteiler_res = $this->getMailverteiler($uid);
+		$person_res = $this->getPersonInfo($uid);
+		$student_res = $this->getStudentInfo($uid);
+		$matr_res = $this->getMatrikelNummer($uid);
+
+		$res = new stdClass();
+		$res->username = $uid;
+
+		//? Person Information
+		foreach ($person_res as $key => $value) {
+			$res->$key = $value;
+		}
+
+		//? Student Information
+		foreach ($student_res as $key => $value) {
+			$res->$key = $value;
+		}
+
+		$intern_email = array();
+		$intern_email["type"] = "intern";
+		$intern_email["email"] = $uid . "@" . DOMAIN;
+
+		$res->emails = [$intern_email];
+		$res->matrikelnummer = $matr_res->matr_nr;
+		$res->mailverteiler = $mailverteiler_res;
+
+		return $res;
+	}
+
+	/**
+	 * function that returns the data used for the mitarbeiter profile
+	 * @access private 
+	 * @return stdClass mitarbeiter data
+	 */
+	private function mitarbeiterProfil()
+	{
+
+		$zutrittskarte_ausgegebenam = $this->getZutrittskarteDatum($this->uid);
+		$adresse_res = $this->getAdressenInfo($this->pid);
+		$kontakte_res = $this->getKontaktInfo($this->pid);
+		$mailverteiler_res = $this->getMailverteiler($this->uid);
+		$person_res = $this->getPersonInfo($this->uid, true);
+		$benutzer_funktion_res = $this->getBenutzerFunktion($this->uid);
+		$betriebsmittelperson_res = $this->getBetriebsmittelInfo($this->pid);
+		$profilUpdates = $this->getProfilUpdates($this->uid);
+		$telefon_res = $this->getTelefonInfo($this->uid);
+		$mitarbeiter_res = $this->getMitarbeiterInfo($this->uid);
+
+		$res = new stdClass();
+		$res->username = $this->uid;
+
+		//? Person Information
+		foreach ($person_res as $key => $value) {
+			$res->$key = $value;
+		}
+
+		//? Mitarbeiter Information
+		foreach ($mitarbeiter_res as $key => $value) {
+			$res->$key = $value;
+		}
+
+		$res->adressen = $adresse_res;
+		$res->zutrittsdatum = $zutrittskarte_ausgegebenam;
+		$res->kontakte = $kontakte_res;
+		$res->mittel = $betriebsmittelperson_res;
+		$res->mailverteiler = $mailverteiler_res;
+
+		$intern_email = array();
+		$intern_email["type"] = "intern";
+		$intern_email["email"] = $this->uid . "@" . DOMAIN;
+		$extern_email = array();
+		$extern_email["type"] = "alias";
+		$extern_email["email"] = $mitarbeiter_res->alias . "@" . DOMAIN;
+		$res->emails = [$intern_email, $extern_email];
+
+		$res->funktionen = $benutzer_funktion_res;
+		$res->standort_telefon = $telefon_res;
+		$res->profilUpdates = $profilUpdates;
+
+		return $res;
+	}
+
+	/**
+	 * function that returns the data used for the student profile
+	 * @access private 
+	 * @return stdClass student data
+	 */
+	private function studentProfil()
+	{
+		$betriebsmittelperson_res = $this->getBetriebsmittelInfo($this->pid);
+		$kontakte_res = $this->getKontaktInfo($this->pid);
+		$zutrittskarte_ausgegebenam = $this->getZutrittskarteDatum($this->uid);
+		$adresse_res = $this->getAdressenInfo($this->pid);
+		$mailverteiler_res = $this->getMailverteiler($this->uid);
+		$person_res = $this->getPersonInfo($this->uid, true);
+		$zutrittsgruppe_res = $this->getZutrittsgruppen($this->uid);
+		$student_res = $this->getStudentInfo($this->uid);
+		$matr_res = $this->getMatrikelNummer($this->uid);
+		$profilUpdates = $this->getProfilUpdates($this->uid);
+
+		$res = new stdClass();
+		$res->username = $this->uid;
+
+		//? Person Information
+		foreach ($person_res as $key => $value) {
+			$res->$key = $value;
+		}
+
+		//? Student Information
+		foreach ($student_res as $key => $value) {
+			$res->$key = trim($value);
+		}
+
+		$intern_email = array();
+		$intern_email["type"] = "intern";
+		$intern_email["email"] = $this->uid . "@" . DOMAIN;
+
+		$res->emails = [$intern_email];
+		$res->adressen = $adresse_res;
+		$res->zutrittsdatum = $zutrittskarte_ausgegebenam;
+		$res->kontakte = $kontakte_res;
+		$res->mittel = $betriebsmittelperson_res;
+		$res->matrikelnummer = $matr_res->matr_nr;
+		$res->zuttritsgruppen = $zutrittsgruppe_res;
+		$res->mailverteiler = $mailverteiler_res;
+		$res->profilUpdates = $profilUpdates;
+
+		return $res;
+	}
+
+
+    /**
+	 * gets all the mailverteiler using the tables: tbl_benutzer, tbl_benutzergruppe, tbl_gruppe
+	 * @access private
+	 * @param  integer $uid  the userID used to retrieve the mailverteiler 
+	 * @return array returns the mailvertailer corresponding to a userID 
+	 */
+	private function getMailverteiler($uid)
+	{
+		$this->PersonModel->addSelect('gruppe_kurzbz, beschreibung');
+		$this->PersonModel->addJoin('tbl_benutzer', 'person_id');
+		$this->PersonModel->addJoin('tbl_benutzergruppe', 'uid');
+		$this->PersonModel->addJoin('tbl_gruppe', 'gruppe_kurzbz');
+
+		$mailverteiler_res = $this->PersonModel->loadWhere(array('mailgrp' => true, 'uid' => $uid));
+		if (isError($mailverteiler_res)) {
+			show_error("was not able to query the table public.tbl_benutzer:" . getData($mailverteiler_res));
+		}
+		$mailverteiler_res = hasData($mailverteiler_res) ? getData($mailverteiler_res) : null;
+		$mailverteiler_res = array_map(function ($element) {
+			$element->mailto = "mailto:" . $element->gruppe_kurzbz . "@" . DOMAIN;
+			return $element;
+		}, $mailverteiler_res);
+		return $mailverteiler_res;
+	}
+
+	/**
+	 * gets all the Benutzerfunktionen of a corresponding user
+	 * @access private
+	 * @param  integer $uid  the userID used to retrieve the Benutzerfunktionen 
+	 * @return array returns the Benutzerfunktionen corresponding to a userID 
+	 */
+	private function getBenutzerFunktion($uid)
+	{
+		$this->BenutzerfunktionModel->addSelect(["tbl_benutzerfunktion.bezeichnung as Bezeichnung", "tbl_organisationseinheit.bezeichnung as Organisationseinheit", "datum_von as Gültig_von", "datum_bis as Gültig_bis", "wochenstunden as Wochenstunden"]);
+		$this->BenutzerfunktionModel->addJoin("tbl_organisationseinheit", "oe_kurzbz");
+
+		$benutzer_funktion_res = $this->BenutzerfunktionModel->loadWhere(array('uid' => $uid));
+		if (isError($benutzer_funktion_res)) {
+			show_error("was not able to query the table public.tbl_benutzerfunktion:" . getData($benutzer_funktion_res));
+		}
+		$benutzer_funktion_res = hasData($benutzer_funktion_res) ? getData($benutzer_funktion_res) : null;
+		return $benutzer_funktion_res;
+	}
+
+	/**
+	 * gets all the Betriebsmittel of a corresponding user
+	 * @access private
+	 * @param  integer $uid  the userID used to retrieve the Betriebsmittel 
+	 * @return array returns the Betriebsmittel corresponding to a userID 
+	 */
+	private function getBetriebsmittelInfo($pid)
+	{
+		$this->BetriebsmittelpersonModel->addSelect(["CONCAT(betriebsmitteltyp, ' ' ,beschreibung) as Betriebsmittel", "nummer as Nummer", "ausgegebenam as Ausgegeben_am"]);
+
+		//? betriebsmittel are not needed in a view
+		$betriebsmittelperson_res = $this->BetriebsmittelpersonModel->getBetriebsmittel($pid);
+		if (isError($betriebsmittelperson_res)) {
+			show_error("was not able to query the table public.tbl_betriebsmittelperson:" . getData($betriebsmittelperson_res));
+		}
+		$betriebsmittelperson_res = hasData($betriebsmittelperson_res) ? getData($betriebsmittelperson_res) : null;
+		return $betriebsmittelperson_res;
+	}
+
+	/**
+	 * gets the alias of a corresponding user
+	 * @access private
+	 * @param  integer $uid the userID used to get the alias
+	 * @return string the alias of the userID
+	 */
+	private function getBenutzerAlias($uid)
+	{
+		$this->BenutzerModel->addSelect(["alias"]);
+		$benutzer_res = $this->BenutzerModel->load([$uid]);
+		if (isError($benutzer_res)) {
+			show_error("was not able to query the table public.tbl_benutzer:" . getData($benutzer_res));
+		} else {
+			$benutzer_res = hasData($benutzer_res) ? getData($benutzer_res)[0] : null;
+		}
+
+		return $benutzer_res;
+	}
+
+	/**
+	 * gets the person information corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the person information
+	 * @param  integer $geburtsInfo flag wether to add the columns gebort, gebdatum, foto_sperre or not
+	 * @return array all the person informaion corresponding to a userID
+	 */
+	private function getPersonInfo($uid, $geburtsInfo = null)
+	{
+		$selectClause = ["foto", "anrede", "titelpost as postnomen", "titelpre as titel", "vorname", "nachname"];
+		/** @param integer $geburtsInfo */
+		if ($geburtsInfo) {
+			array_push($selectClause, "gebort");
+			array_push($selectClause, "gebdatum");
+			array_push($selectClause, "foto_sperre");
+		}
+		$this->BenutzerModel->addSelect($selectClause);
+		$this->BenutzerModel->addJoin("tbl_person", "person_id");
+
+		$person_res = $this->BenutzerModel->load([$uid]);
+		if (isError($person_res)) {
+			show_error("was not able to query the table public.tbl_benutzer:" . getData($person_res));
+		} else {
+			$person_res = hasData($person_res) ? getData($person_res)[0] : null;
+		}
+
+		return $person_res;
+	}
+
+	/**
+	 * gets the mitarbeiter information corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the mitarbeiter information
+	 * @return array all the mitarbeiter informaion corresponding to a userID
+	 */
+	private function getMitarbeiterInfo($uid)
+	{
+		$this->MitarbeiterModel->addSelect(["kurzbz", "telefonklappe", "alias", "ort_kurzbz"]);
+		$this->MitarbeiterModel->addJoin("tbl_benutzer", "tbl_benutzer.uid = tbl_mitarbeiter.mitarbeiter_uid");
+		$mitarbeiter_res = $this->MitarbeiterModel->load($uid);
+		if (isError($mitarbeiter_res)) {
+			show_error("was not able to query the table public.tbl_mitarbeiter:" . getData($mitarbeiter_res));
+		} else {
+			$mitarbeiter_res = hasData($mitarbeiter_res) ? getData($mitarbeiter_res)[0] : null;
+		}
+
+		return $mitarbeiter_res;
+	}
+
+	/**
+	 * gets the telefon information corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the telefon information
+	 * @return array all the telefon informaion corresponding to a userID
+	 */
+	private function getTelefonInfo($uid)
+	{
+		$this->MitarbeiterModel->addSelect(["kontakt"]);
+		$this->MitarbeiterModel->addJoin("tbl_kontakt", "tbl_mitarbeiter.standort_id = tbl_kontakt.standort_id");
+		$this->MitarbeiterModel->addLimit(1);
+		$telefon_res = $this->MitarbeiterModel->loadWhere(["mitarbeiter_uid" => $uid, "kontakttyp" => "telefon"]);
+		if (isError($telefon_res)) {
+			show_error("was not able to query the table public.tbl_mitarbeiter:" . getData($telefon_res));
+		}
+		$telefon_res = hasData($telefon_res) ? getData($telefon_res)[0] : null;
+		return $telefon_res;
+	}
+
+	/**
+	 * gets the student information corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the student information
+	 * @return array all the student informaion corresponding to a userID
+	 */
+	private function getStudentInfo($uid)
+	{
+		$this->StudentModel->addSelect(['tbl_studiengang.bezeichnung as studiengang', 'tbl_student.semester', 'tbl_student.verband', 'tbl_student.gruppe', 'tbl_student.matrikelnr as personenkennzeichen']);
+		$this->StudentModel->addJoin('tbl_studiengang', "tbl_studiengang.studiengang_kz=tbl_student.studiengang_kz");
+
+		$student_res = $this->StudentModel->load([$uid]);
+		if (isError($student_res)) {
+			show_error("was not able to query the table public.tbl_student:" . getData($student_res));
+		}
+		$student_res = hasData($student_res) ? getData($student_res)[0] : null;
+		return $student_res;
+	}
+
+	/**
+	 * gets the profil updates corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the profil updates
+	 * @return array all the profil updates corresponding to a userID
+	 */
+	private function getProfilUpdates($uid)
+	{
+		$profilUpdates = $this->ProfilUpdateModel->getProfilUpdatesWhere(['uid' => $uid]);
+		if (isError($profilUpdates)) {
+			show_error("was not able to query the table public.tbl_profil_update:" . getData($profilUpdates));
+		}
+		$profilUpdates = hasData($profilUpdates) ? getData($profilUpdates) : null;
+		return $profilUpdates;
+	}
+
+	/**
+	 * gets the Matrikelnummer corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the Matrikelnummer
+	 * @return integer the Matrikelnummer corresponding to a userID
+	 */
+	private function getMatrikelNummer($uid)
+	{
+		$this->BenutzerModel->addSelect(["matr_nr"]);
+		$this->BenutzerModel->addJoin("tbl_person", "person_id");
+
+		$matr_res = $this->BenutzerModel->load([$uid]);
+		if (isError($matr_res)) {
+			show_error("was not able to query the table public.tbl_benutzer:" . getData($matr_res));
+		}
+		$matr_res = hasData($matr_res) ? getData($matr_res)[0] : [];
+		return $matr_res;
+	}
+
+	/**
+	 * gets the Zutrittsgruppen corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the Zutrittsgruppen
+	 * @return array all the Zutrittsgruppen corresponding to a userID
+	 */
+	private function getZutrittsgruppen($uid)
+	{
+		$this->BenutzergruppeModel->addSelect(['bezeichnung']);
+		$this->BenutzergruppeModel->addJoin('tbl_gruppe', 'gruppe_kurzbz');
+
+		$zutrittsgruppe_res = $this->BenutzergruppeModel->loadWhere(array("uid" => $uid, "zutrittssystem" => true));
+		if (isError($zutrittsgruppe_res)) {
+			show_error("was not able to query the table public.tbl_benutzergruppe:" . getData($zutrittsgruppe_res));
+		}
+		$zutrittsgruppe_res = hasData($zutrittsgruppe_res) ? getData($zutrittsgruppe_res) : null;
+		return $zutrittsgruppe_res;
+	}
+
+	/**
+	 * gets the address information corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the address information
+	 * @return array all the address information corresponding to a userID
+	 */
+	private function getAdressenInfo($pid)
+	{
+		$adresse_res = $this->AdresseModel->addSelect(["adresse_id", "strasse", "tbl_adressentyp.bezeichnung as typ", "plz", "ort", "zustelladresse", "gemeinde", "nation"]);
+		$adresse_res = $this->AdresseModel->addOrder("zustelladresse", "DESC");
+		$adresse_res = $this->AdresseModel->addJoin("tbl_adressentyp", "typ=adressentyp_kurzbz");
+
+		$adresse_res = $this->AdresseModel->loadWhere(["person_id" => $pid]);
+		if (isError($adresse_res)) {
+			show_error("was not able to query the table public.tbl_adresse:" . getData($adresse_res));
+		}
+		$adresse_res = hasData($adresse_res) ? getData($adresse_res) : null;
+		return $adresse_res;
+	}
+
+	/**
+	 * gets the kontakt information corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the kontakt information
+	 * @return array all the kontakt information corresponding to a userID
+	 */
+	private function getKontaktInfo($pid)
+	{
+		$this->KontaktModel->addSelect(['kontakttyp', 'kontakt_id', 'kontakt', 'tbl_kontakt.anmerkung', 'tbl_kontakt.zustellung']);
+		$this->KontaktModel->addJoin('public.tbl_standort', 'standort_id', 'LEFT');
+		$this->KontaktModel->addJoin('public.tbl_firma', 'firma_id', 'LEFT');
+		$this->KontaktModel->addOrder('kontakttyp, kontakt, tbl_kontakt.updateamum, tbl_kontakt.insertamum');
+
+		$kontakte_res = $this->KontaktModel->loadWhere(['person_id' => $pid]);
+		if (isError($kontakte_res)) {
+			show_error("was not able to query the table public.tbl_kontakt:" . getData($kontakte_res));
+		}
+		$kontakte_res = hasData($kontakte_res) ? getData($kontakte_res) : null;
+		return $kontakte_res;
+	}
+
+	/**
+	 * gets the date of issue of the FH access card corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the date of issue of the FH access card
+	 * @return string the date of issue of the FH access card corresponding to a userID
+	 */
+	private function getZutrittskarteDatum($uid)
+	{
+		$zutrittskarte_ausgegebenam = $this->BetriebsmittelpersonModel->getBetriebsmittelByUid($uid, "Zutrittskarte");
+		if (isError($zutrittskarte_ausgegebenam)) {
+			show_error("was not able to query the table wavi.tbl_bentriebsmittelperson:" . getData($zutrittskarte_ausgegebenam));
+		}
+		$zutrittskarte_ausgegebenam = hasData($zutrittskarte_ausgegebenam) ? getData($zutrittskarte_ausgegebenam)[0]->ausgegebenam : null;
+
+		//? formats date from 01-01-2000 to 01.01.2000
+		$zutrittskarte_ausgegebenam = str_replace("-", ".", $zutrittskarte_ausgegebenam);
+		return $zutrittskarte_ausgegebenam;
+	}
+}
+
diff --git a/public/js/api/fhcapifactory.js b/public/js/api/fhcapifactory.js
index 41c89ef50..c993a86d6 100644
--- a/public/js/api/fhcapifactory.js
+++ b/public/js/api/fhcapifactory.js
@@ -20,11 +20,13 @@ import phrasen from "./phrasen.js";
 import navigation from "./navigation.js";
 import filter from "./filter.js";
 import studstatus from "./studstatus.js";
+import profil from "./profil.js";
 
 export default {
     search,
     phrasen,
     navigation,
     filter,
-    studstatus
+    studstatus,
+    profil,
 };
diff --git a/public/js/api/profil.js b/public/js/api/profil.js
new file mode 100755
index 000000000..e2fba5f83
--- /dev/null
+++ b/public/js/api/profil.js
@@ -0,0 +1,76 @@
+export default {
+
+  getView: function (uid) {
+    return this.$fhcApi.get(
+      FHC_JS_DATA_STORAGE_OBJECT.app_root + 
+      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+      `/api/frontend/v1/Profil/getView/${uid}`,{}
+    );
+  },
+
+  fotoSperre: function (value) {
+    return this.$fhcApi.get(
+      FHC_JS_DATA_STORAGE_OBJECT.app_root + 
+      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+      `/api/frontend/v1/Profil/fotoSperre/${value}`,
+      {}
+    );
+    
+  },
+
+  isStudent: function (uid) {
+    return this.$fhcApi.get(
+      FHC_JS_DATA_STORAGE_OBJECT.app_root + 
+      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+      `/api/frontend/v1/Profil/isStudent`,
+      {
+        uid:uid,
+      }
+    );
+  },
+
+  isMitarbeiter: function (uid) {
+    return this.$fhcApi.get(
+      FHC_JS_DATA_STORAGE_OBJECT.app_root + 
+      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+      `/api/frontend/v1/Profil/isMitarbeiter`,
+      {
+        uid:uid,
+      }
+    );
+  },
+
+  getZustellAdresse: function () {
+    return this.$fhcApi.get(
+      FHC_JS_DATA_STORAGE_OBJECT.app_root + 
+      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+      `/api/frontend/v1/Profil/getZustellAdresse`,{}
+    );
+  },
+
+  getZustellKontakt: function () {
+    return this.$fhcApi.get(
+      FHC_JS_DATA_STORAGE_OBJECT.app_root + 
+      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+      `/api/frontend/v1/Profil/getZustellKontakt`,{}
+    );
+  },
+
+  getGemeinden: function(nation,zip=null){
+    return this.$fhcApi.get(
+      FHC_JS_DATA_STORAGE_OBJECT.app_root + 
+      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+      "/api/frontend/v1/Profil/getGemeinden",
+      { nation: nation,
+      ...(zip? {zip:zip}:{}) }
+    );
+    
+  },
+  getAllNationen:function(){
+    return this.$fhcApi.get(
+      FHC_JS_DATA_STORAGE_OBJECT.app_root + 
+      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+      "/api/frontend/v1/Profil/getAllNationen",{}
+    );
+  },
+}
\ No newline at end of file
diff --git a/public/js/apps/Cis/Profil.js b/public/js/apps/Cis/Profil.js
index 9df5d42ae..3c3855147 100755
--- a/public/js/apps/Cis/Profil.js
+++ b/public/js/apps/Cis/Profil.js
@@ -5,6 +5,7 @@ import ViewMitarbeiterProfil from "../../components/Cis/Profil/MitarbeiterViewPr
 import fhcapifactory from "../api/fhcapifactory.js";
 import Loading from "../../components/Loader.js";
 import Phrasen from "../../plugin/Phrasen.js";
+import fhcapi from "../../plugin/FhcApi.js";
 
 Vue.$fhcapi = fhcapifactory;
 Vue.$collapseFormatter = function (data) {
@@ -373,7 +374,7 @@ const profilApp = Vue.createApp({
     //? uid contains the last part of the uri
     let uid = location.pathname.split("/").pop();
 
-    Vue.$fhcapi.UserData.getView(uid).then((res) => {
+    this.$fhcApi.factory.profil.getView(uid).then((res) => {
       if (!res.data) {
         this.notFoundUID = uid;
       } else {
@@ -403,4 +404,5 @@ const profilApp = Vue.createApp({
 profilApp
   .use(primevue.config.default, { zIndex: { overlay: 9999 } })
   .use(Phrasen)
+  .use(fhcapi)
   .mount("#content");
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js
index 47842a8c3..d1199686c 100755
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js
@@ -43,6 +43,7 @@ export default {
         this.data.plz > 999 &&
         this.data.plz < 32000
       ) {
+        
         Vue.$fhcapi.UserData.getGemeinden(this.data.nation, this.data.plz).then(
           (res) => {
             if (res.data.length) {
@@ -91,6 +92,8 @@ export default {
   },
 
   created() {
+
+
     Vue.$fhcapi.UserData.getAllNationen().then((res) => {
       this.nationenList = res.data;
       this.getGemeinde();

From 79ffc1c07773f72e25571012fa8806410d8a563a Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 4 Jul 2024 15:37:50 +0200
Subject: [PATCH 0879/1461] creating lvMenu with Event hooks WIP

---
 application/config/Events.php                 |  2 +
 .../controllers/api/frontend/v1/LvMenu.php    | 87 +++++++++++++++++++
 application/core/CI3_Events.php               |  5 ++
 public/js/api/addons.js                       | 11 +++
 public/js/components/Cis/Mylv/LvUebersicht.js |  4 +
 5 files changed, 109 insertions(+)
 create mode 100644 application/controllers/api/frontend/v1/LvMenu.php

diff --git a/application/config/Events.php b/application/config/Events.php
index 191a1eb98..14eb30d3e 100644
--- a/application/config/Events.php
+++ b/application/config/Events.php
@@ -3,6 +3,8 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 use CI3_Events as Events;
 
+// build the menu for fhc 
+
 /**
  * NOTE(chris): example:
 	Events::on('stv_conf_student', function (&$res) {
diff --git a/application/controllers/api/frontend/v1/LvMenu.php b/application/controllers/api/frontend/v1/LvMenu.php
new file mode 100644
index 000000000..d9a4550eb
--- /dev/null
+++ b/application/controllers/api/frontend/v1/LvMenu.php
@@ -0,0 +1,87 @@
+<?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 SearchBarLib (back-end)
+ * Provides data to the ajax get calls about the searchbar component
+ * This controller works with JSON calls on the HTTP GET and the output is always JSON
+ */
+class LvMenu extends FHCAPI_Controller
+{
+    
+
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+        
+		// NOTE(chris): additional permission checks will be done in SearchBarLib
+		parent::__construct([
+			'getLvMenu' => self::PERM_LOGGED
+		]);
+
+		
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * Gets a JSON body via HTTP POST and provides the parameters
+	 */
+	public function getLvMenu($lvid, $studiensemester_kurzbz)
+	{
+		
+		if(!isset($lvid) || !isset($studiensemester_kurzbz))
+			$this->terminateWithError('Missing parameters', self::ERROR_TYPE_GENERAL);
+
+		$menu = array();
+
+        // get the menu of the fhc core, look menu_lv.class.php
+		//todo
+
+		require_once(FHCPATH.'config/cis.config.inc.php');
+		require_once(FHCPATH.'include/lehrveranstaltung.class.php');
+		require_once(FHCPATH.'include/studiensemester.class.php');
+		require_once(FHCPATH.'include/lehreinheit.class.php');
+		require_once(FHCPATH.'include/vertrag.class.php');
+		require_once(FHCPATH.'include/functions.inc.php');
+		require_once(FHCPATH.'include/benutzerberechtigung.class.php');
+		require_once(FHCPATH.'include/studiengang.class.php');
+		require_once(FHCPATH.'include/phrasen.class.php');
+
+        Events::trigger('lvMenuBuild', 
+						// callback function for the onEvents to add newValues to the $menu
+						function ($newValue) use (&$menu) {
+							$menu[]= $newValue;
+						},
+						$lvid,
+						$studiensemester_kurzbz
+		);
+
+		$this->terminateWithSuccess($menu);
+
+	}
+}
+
diff --git a/application/core/CI3_Events.php b/application/core/CI3_Events.php
index 33a96b89e..7e7e471b1 100644
--- a/application/core/CI3_Events.php
+++ b/application/core/CI3_Events.php
@@ -46,6 +46,11 @@ class CI3_Events
  * NOTE(chris): Autoload Events config
  */
 require_once(APPPATH.'config/Events.php');
+
 foreach (scandir(APPPATH.'config/extensions') as $dir)
 	if ($dir[0] != '.' && file_exists(APPPATH.'config/extensions/'.$dir.'/Events.php'))
 		require_once APPPATH.'config/extensions/'.$dir.'/Events.php';
+
+foreach (scandir(FHCPATH.'addons') as $dir)
+	if ($dir[0] != '.' && file_exists(FHCPATH.'addons/'.$dir.'/Events.php'))
+		require_once FHCPATH.'addons/'.$dir.'/Events.php';
diff --git a/public/js/api/addons.js b/public/js/api/addons.js
index b40ea65cb..249457ac5 100644
--- a/public/js/api/addons.js
+++ b/public/js/api/addons.js
@@ -7,4 +7,15 @@ export default {
                 studiensemester_kurzbz: studiensemester_kurzbz }
           );
       },
+
+      getLvMenu(lvid, studiensemester_kurzbz) {
+        return this.$fhcApi.get(
+            FHC_JS_DATA_STORAGE_OBJECT.app_root +
+            FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+            `/api/frontend/v1/LvMenu/getLvMenu/${lvid}/${studiensemester_kurzbz}`,
+            {}
+        );
+    },
+
+      
   }
\ No newline at end of file
diff --git a/public/js/components/Cis/Mylv/LvUebersicht.js b/public/js/components/Cis/Mylv/LvUebersicht.js
index 7c16b8fb9..0762208af 100644
--- a/public/js/components/Cis/Mylv/LvUebersicht.js
+++ b/public/js/components/Cis/Mylv/LvUebersicht.js
@@ -27,6 +27,9 @@ export default  {
     },
     methods:{
         showModal: function(){
+            this.$fhcApi.factory.addons.getLvMenu(this.event.lehrveranstaltung_id, this.event.studiensemester_kurzbz).then(res =>{
+                console.log("this is the addon endpoint res",res);
+            });
             this.$fhcApi.factory.lehre.getStudentenMail(this.event.lehreinheit_id).then(res =>
             {
                 // prepare the mailto link with all the emails from the students of the lv
@@ -41,6 +44,7 @@ export default  {
     mounted(){
         
         
+        
         // make axios call to the active addons
         /* $addon_obj->loadAddons();
         foreach($addon_obj->result as $addon)

From 08555a77be0632dc650c14b089bfe9b8cf911eda Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 5 Jul 2024 10:00:54 +0200
Subject: [PATCH 0880/1461] makes contentModal bigger for the room content and
 uses the raum_info component to insert the tabulator in the content

---
 application/views/CisHmvc/Dashboard.php      |  1 +
 application/views/CisHtml/Dashboard.php      |  1 +
 application/views/CisVue/Dashboard.php       |  1 +
 public/js/components/Cis/Cms/ContentModal.js | 11 +++++++----
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/application/views/CisHmvc/Dashboard.php b/application/views/CisHmvc/Dashboard.php
index 46d769a38..06da8cd7f 100755
--- a/application/views/CisHmvc/Dashboard.php
+++ b/application/views/CisHmvc/Dashboard.php
@@ -1,6 +1,7 @@
 <?php
 	$includesArray = array(
 		'title' => 'FH-Complete',
+		'tabulator5'=>true,
 		'customJSModules' => ['public/js/apps/Dashboard/Fhc.js'],
 		'customCSSs' => [
 			'public/css/components/dashboard.css'
diff --git a/application/views/CisHtml/Dashboard.php b/application/views/CisHtml/Dashboard.php
index c2190620d..7948840ad 100755
--- a/application/views/CisHtml/Dashboard.php
+++ b/application/views/CisHtml/Dashboard.php
@@ -1,6 +1,7 @@
 <?php
 $includesArray = array(
 	'title' => 'Dashboard',
+	'tabulator5'=>true,
 	'customJSModules' => ['public/js/apps/Dashboard/Fhc.js'],
 	'customCSSs' => [
 		'public/css/components/dashboard.css'
diff --git a/application/views/CisVue/Dashboard.php b/application/views/CisVue/Dashboard.php
index 06c2620cc..10721630e 100755
--- a/application/views/CisVue/Dashboard.php
+++ b/application/views/CisVue/Dashboard.php
@@ -1,5 +1,6 @@
 <?php
 $includesArray = array(
+	'tabulator5'=>true,
 	'customJSModules' => ['public/js/apps/Dashboard/Fhc.js'],
 	'customCSSs' => [
 		'public/css/components/dashboard.css'
diff --git a/public/js/components/Cis/Cms/ContentModal.js b/public/js/components/Cis/Cms/ContentModal.js
index 0a5903ccc..7a8d9beb8 100644
--- a/public/js/components/Cis/Cms/ContentModal.js
+++ b/public/js/components/Cis/Cms/ContentModal.js
@@ -1,4 +1,5 @@
 import BsModal from "../../Bootstrap/Modal";
+import RaumContent from "./Content_types/Raum_contentmittitel";
 
 
 export default {
@@ -8,6 +9,7 @@ export default {
     
     components:{
         BsModal,
+        RaumContent,
     },
     props:{
         contentID:{
@@ -36,7 +38,8 @@ export default {
             
             if(this.contentID){
                 this.$fhcApi.factory.cms.content(this.contentID).then(res =>{
-                this.content = res.data;
+                this.content = res.data.content;
+                this.type = res.data.type;
                 
                 })
             } 
@@ -44,17 +47,17 @@ export default {
     },
     mounted(){
         this.modal = this.$refs.modalContainer;
-          
+        
     },
     
     template:/*html*/`
-    <bs-modal @hideBsModal="modalHidden" @showBsModal="modalShown" ref="modalContainer" dialogClass="modal-lg">
+    <bs-modal @hideBsModal="modalHidden" dialogClass="modal-xl" @showBsModal="modalShown" ref="modalContainer" dialogClass="modal-lg">
         <template #title>
             <span v-if="ort_kurzbz">{{ort_kurzbz}}</span>
             <span v-else>Raum Informationen</span>
         </template>
         <template #default>
-            <div v-if="content" v-html="content"></div>
+            <RaumContent v-if="content" :content="content"></RaumContent>
             <div v-else>Der Content für diesen Raum konnte nicht geladen werden</div>
         </template>
         <template #footer>

From 578afaeb089bbec9e5b841a851ab13a2824aaa7e Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 5 Jul 2024 15:21:14 +0200
Subject: [PATCH 0881/1461] adds fh-core menu logic WIP

---
 .../controllers/api/frontend/v1/LvMenu.php    | 281 +++++++++++++++++-
 1 file changed, 268 insertions(+), 13 deletions(-)

diff --git a/application/controllers/api/frontend/v1/LvMenu.php b/application/controllers/api/frontend/v1/LvMenu.php
index d9a4550eb..199c6f8df 100644
--- a/application/controllers/api/frontend/v1/LvMenu.php
+++ b/application/controllers/api/frontend/v1/LvMenu.php
@@ -35,31 +35,26 @@ class LvMenu extends FHCAPI_Controller
 	 */
 	public function __construct()
 	{
-        
-		// NOTE(chris): additional permission checks will be done in SearchBarLib
 		parent::__construct([
 			'getLvMenu' => self::PERM_LOGGED
 		]);
-
-		
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods
 
 	/**
-	 * Gets a JSON body via HTTP POST and provides the parameters
+	 * 
 	 */
 	public function getLvMenu($lvid, $studiensemester_kurzbz)
 	{
-		
+
+		// return early if parameters are missing
 		if(!isset($lvid) || !isset($studiensemester_kurzbz))
 			$this->terminateWithError('Missing parameters', self::ERROR_TYPE_GENERAL);
 
-		$menu = array();
-
-        // get the menu of the fhc core, look menu_lv.class.php
-		//todo
+		// FH-Core Variables 
+		// #############################################
 
 		require_once(FHCPATH.'config/cis.config.inc.php');
 		require_once(FHCPATH.'include/lehrveranstaltung.class.php');
@@ -71,17 +66,277 @@ class LvMenu extends FHCAPI_Controller
 		require_once(FHCPATH.'include/studiengang.class.php');
 		require_once(FHCPATH.'include/phrasen.class.php');
 
+		// get the sprache
+		$sprache = getSprache();
+		$p = new phrasen($sprache);
+
+		// get the db
+		if (!$db = new basis_db())
+		die($p->t('global/fehlerBeimOeffnenDerDatenbankverbindung'));
+
+		// get the user
+		if (!$user=get_uid())
+			die($p->t('global/nichtAngemeldet'));
+
+		// check if is_lector
+		if(check_lektor($user))
+			$is_lector=true;
+		else
+			$is_lector=false;
+
+		// definition of user_is_allowed_to_upload
+		$user_is_allowed_to_upload=false;
+
+		// rechte des users
+		$rechte = new benutzerberechtigung();
+		$rechte->getBerechtigungen($user);
+
+		$angezeigtes_stsem = $studiensemester_kurzbz;
+
+		// load lehreinheit
+		$lehreinheit = new lehreinheit($lvid);
+
+		// load lehrveranstaltung
+		$lv_obj = new lehrveranstaltung();
+		$lv_obj->load($lvid);
+		$lv=$lv_obj;
+
+		// define studiengang_kz / semester / lehrverzeichnis
+		$studiengang_kz = $lv->studiengang_kz;
+		$semester = $lv->semester;
+		$short = $lv->lehreverzeichnis;
+
+		// load studiengang
+		$stg_obj = new studiengang();
+		$stg_obj->load($lv->studiengang_kz);
+		$kurzbz = $stg_obj->kuerzel;
+
+		$short_name = $lv->bezeichnung;
+		$short_short_name = $lv->lehreverzeichnis;
+
+		// angemeldet
+		$angemeldet = true;
+		if(defined('CIS_LEHRVERANSTALTUNG_WENNANGEMELDET_DETAILS_ANZEIGEN') && CIS_LEHRVERANSTALTUNG_WENNANGEMELDET_DETAILS_ANZEIGEN && !$is_lector)
+		{
+			$angemeldet = false;
+
+			$lehrveranstaltung_obj = new lehrveranstaltung();
+			$result = $lehrveranstaltung_obj->getLehreinheitenOfLv($lvid, $user, $angezeigtes_stsem);
+
+			if(count($result)>0)
+				$angemeldet = true;
+		}
+
+		// lehrfach
+		$lehrfach_id='';
+		
+		if(defined('CIS_LEHRVERANSTALTUNG_LEHRFACH_ANZEIGEN') && CIS_LEHRVERANSTALTUNG_LEHRFACH_ANZEIGEN)
+		{
+			// Wenn der eingeloggte User zu einer der Lehreinheiten zugeteilt ist
+			// wird zusätzlich das Lehrfach der Lehreinheit angezeigt.
+			if($is_lector )
+			{
+				$result = $this->lehreinheit->lehrfach_id_mitarbeiter($angezeigtes_stsem,$user,$lvid);
+			}
+			else
+			{
+				$result = $this->lehreinheit->lehrfach_id_studierender($angezeigtes_stsem,$user,$lvid);
+				
+			}
+
+			// Wenn die LV mehrere verschiedenen Lehrfaecher hat, und der User zu mehreren davon zugeteilt ist
+			// wird das Lehrfach nicht angezeigt damit es nicht zu verwirrungen kommt.
+			if(count($result)==1 && $row = $result[0])
+			{   
+				$lehrfach_id=$row->lehrfach_id;
+			}
+		}
+
+		// lektor der lv
+		$lektor_der_lv=false;
+		
+		$db_result = $lehreinheit->lehreinheitInfo($lvid,$angezeigtes_stsem,$lehrfach_id);
+
+		$num_rows_result = count($db_result);
+
+		if($num_rows_result > 0)
+		{
+			
+			foreach($db_result as $row_lector)
+			{
+				
+				// Lektor wird erst angezeigt wenn der Auftrag erteilt wurde
+				if (defined('CIS_LV_LEKTORINNENZUTEILUNG_VERTRAGSPRUEFUNG_VON')
+					&& CIS_LV_LEKTORINNENZUTEILUNG_VERTRAGSPRUEFUNG_VON != '')
+				{
+					$vertrag = new vertrag();
+					if (!$vertrag->isVertragErteiltLV($lvid, $angezeigtes_stsem, $row_lector->uid))
+					{
+						continue;
+					}
+				}
+
+			
+				if($user==$row_lector->uid)
+				{
+					$lektor_der_lv=true;
+					$user_is_allowed_to_upload=true;
+				}
+
+				// style of the link
+				if($row_lector->lvleiter=='t')
+					$style='style="font-weight: bold"';
+				else
+					$style='';
+
+			}
+		}
+
+		//Berechtigungen auf Fachbereichsebene
+		$lehrfach_oe_kurzbz_arr = array();
+		if($result = $lv_obj->getBerechtigungenAufFachberechsebene($lvid,$angezeigtes_stsem))
+		{
+			foreach($result as $row)
+			{
+				$lehrfach_oe_kurzbz_arr[]=$row->oe_kurzbz;
+				if($rechte->isBerechtigt('lehre',$row->oe_kurzbz) || $rechte->isBerechtigt('assistenz',$stg_obj->oe_kurzbz)){
+					$user_is_allowed_to_upload=true;
+				}
+			}
+		}
+
+		// FH-Core Menu Logic 
+		// #############################################
+
+		$menu = array();
+
+		$this->fhc_menu_lvinfo($menu, $lvid, $studiengang_kz, $lektor_der_lv, $is_lector, $rechte, $lehrfach_oe_kurzbz_arr, $p);
+
+		$this->fhc_menu_semesterplan($menu, $angemeldet, $user_is_allowed_to_upload, $rechte, $lvid, $studiengang_kz, $kurzbz, $semester, $short_short_name, $p);
+
+		// Addons Menu Logic
+		// #############################################
+		
         Events::trigger('lvMenuBuild', 
 						// callback function for the onEvents to add newValues to the $menu
-						function ($newValue) use (&$menu) {
-							$menu[]= $newValue;
+						function ($addonMenu) use (&$menu) {
+							foreach($addonMenu as $m){
+								$menu[]= $m;
+							}
 						},
 						$lvid,
-						$studiensemester_kurzbz
+						$studiensemester_kurzbz,
+						$studiengang_kz,
+						$p,
+						$rechte,
+						$lv,
+						$angezeigtes_stsem,
+						$lektor_der_lv,
+						$lehrfach_oe_kurzbz_arr,
+						$is_lector
 		);
 
 		$this->terminateWithSuccess($menu);
 
 	}
+
+
+	private function fhc_menu_lvinfo(&$menu, $lvid, $studiengang_kz, $lektor_der_lv, $is_lector, $rechte, $lehrfach_oe_kurzbz_arr, $p){
+		
+		// LVINFO
+		if(!defined('CIS_LEHRVERANSTALTUNG_LVINFO_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_LVINFO_ANZEIGEN)
+		{
+			$text='';
+			$need_br=false;
+
+			// Bearbeiten Button anzeigen wenn Lektor der LV und bearbeiten fuer Lektoren aktiviert ist
+			// Oder Berechtigung zum Bearbeiten eingetragen ist
+			if((!defined('CIS_LEHRVERANSTALTUNG_LVINFO_LEKTOR_EDIT') && $lektor_der_lv)
+			|| (defined('CIS_LEHRVERANSTALTUNG_LVINFO_LEKTOR_EDIT') && CIS_LEHRVERANSTALTUNG_LVINFO_LEKTOR_EDIT==true && $lektor_der_lv)
+			|| $rechte->isBerechtigt('lehre/lvinfo',$studiengang_kz)
+			|| $rechte->isBerechtigtMultipleOe('lehre/lvinfo', $lehrfach_oe_kurzbz_arr)
+			)
+			{
+				if($need_br)
+					$text.= "<br>";
+				$text.= "<a href='ects/index.php?lvid=$lvid' target='_blank' class='Item'>".$p->t('lehre/lvInfoBearbeiten')."</a>";
+			}
+			elseif ($is_lector)
+			{
+				$text.= "<br>Bearbeiten der LV-Infos derzeit gesperrt";
+			}
+
+			$menu[]=array
+			(
+				'id'=>'core_menu_lvinfo',
+				'position'=>'10',
+				'name'=>$p->t('lehre/lehrveranstaltungsinformation'),
+				'icon'=>'../../../skin/images/button_lvinfo.png',
+				'link'=>'',
+				'text'=>$text
+			);
+		}
+	}
+
+	private function fhc_menu_semesterplan(&$menu, $angemeldet, $user_is_allowed_to_upload, $rechte, $lvid, $studiengang_kz, $kurzbz, $semester, $short_short_name, $p){
+		
+		// Semesterplan
+		if((!defined('CIS_LEHRVERANSTALTUNG_SEMESTERPLAN_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_SEMESTERPLAN_ANZEIGEN) && $angemeldet)
+		{
+			$dir_name = $this->ensureDirectoryExists($kurzbz, $semester, $short_short_name, 'semesterplan','teacher');
+			
+			$dir_empty = count(scandir($dir_name)) == 2 ? true : false;
+
+			if($dir_empty == false)
+			{
+				$link = $dir_name.'/';
+			}
+			else
+				$link = '';
+
+			$text='';
+			if((!defined('CIS_LEHRVERANSTALTUNG_SEMESTERPLAN_LEKTOR_EDIT') && $user_is_allowed_to_upload)
+			|| (defined('CIS_LEHRVERANSTALTUNG_SEMESTERPLAN_LEKTOR_EDIT') && CIS_LEHRVERANSTALTUNG_SEMESTERPLAN_LEKTOR_EDIT==true && $user_is_allowed_to_upload)
+			|| $rechte->isBerechtigt('admin',$studiengang_kz) || $rechte->isBerechtigt('lehre',$studiengang_kz))
+			{
+				$text.= '<a class="Item" href="#" onClick="javascript:window.open(\'semupload.php?lvid='.$lvid.'\',\'_blank\',\'width=400,height=300,location=no,menubar=no,status=no,toolbar=no\');return false;">';
+				$text.= $p->t('lehre/semesterplanUpload')."</a>";
+
+				$text.= '&nbsp;&nbsp;&nbsp;<a class="Item" href="semdownhlp.php" >';
+				$text.= $p->t('lehre/semesterplanVorlage');
+				$text.= ' [html]';
+				$text.= '</a>';
+				$text.= '&nbsp;<a class="Item" href="semdownhlp.php?format=doc" >';
+				$text.= '[doc]';
+				$text.= '</a>';
+				$text.= '&nbsp;<a href="#" onClick="showSemPlanHelp()";>('.$p->t('lehre/semesterplanVorlageHilfe').')</a>';
+			}
+
+			$menu[]=array
+			(
+				'id'=>'core_menu_semesterplan',
+				'position'=>'20',
+				'name'=>$p->t('lehre/semesterplan'),
+				'icon'=>'../../../skin/images/button_semplan.png',
+				'link'=>$link,
+				'link_target'=>'_blank',
+				'text'=>$text
+			);
+		}
+	}
+
+	private function ensureDirectoryExists($kurzbz, $semester, $short_short_name, $type, $role){
+		$dir_name = DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name).'/'.$type;
+
+		if (!is_dir($dir_name)) {
+			exec('mkdir -m 775 -p '.escapeshellarg($dir_name));
+			exec('sudo chown www-data:teacher '.escapeshellarg(DOC_ROOT.'/documents/'.mb_strtolower($kurzbz)));
+			exec('sudo chown www-data:teacher '.escapeshellarg(DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester));
+			exec('sudo chown www-data:teacher '.escapeshellarg(DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name)));
+			exec('sudo chown www-data:'.$role.' '.escapeshellarg($dir_name));
+		}
+
+		return $dir_name;
+	}
 }
 

From e98f59e984916e7cdc7e3359a08a636b205bbb7d Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 8 Jul 2024 10:54:39 +0200
Subject: [PATCH 0882/1461] adds all menu punkte from fh-core to the LvMenu
 endpoint function

---
 .../controllers/api/frontend/v1/LvMenu.php    | 384 +++++++++++++++++-
 1 file changed, 378 insertions(+), 6 deletions(-)

diff --git a/application/controllers/api/frontend/v1/LvMenu.php b/application/controllers/api/frontend/v1/LvMenu.php
index 199c6f8df..a9cbf4647 100644
--- a/application/controllers/api/frontend/v1/LvMenu.php
+++ b/application/controllers/api/frontend/v1/LvMenu.php
@@ -54,7 +54,7 @@ class LvMenu extends FHCAPI_Controller
 			$this->terminateWithError('Missing parameters', self::ERROR_TYPE_GENERAL);
 
 		// FH-Core Variables 
-		// #############################################
+		// ##########################################################################################
 
 		require_once(FHCPATH.'config/cis.config.inc.php');
 		require_once(FHCPATH.'include/lehrveranstaltung.class.php');
@@ -65,6 +65,7 @@ class LvMenu extends FHCAPI_Controller
 		require_once(FHCPATH.'include/benutzerberechtigung.class.php');
 		require_once(FHCPATH.'include/studiengang.class.php');
 		require_once(FHCPATH.'include/phrasen.class.php');
+		require_once(FHCPATH.'include/lvangebot.class.php');
 
 		// get the sprache
 		$sprache = getSprache();
@@ -114,6 +115,14 @@ class LvMenu extends FHCAPI_Controller
 		$short_name = $lv->bezeichnung;
 		$short_short_name = $lv->lehreverzeichnis;
 
+		// create documents directory
+		$dir_name=DOC_ROOT.'/documents';
+		if(!is_dir($dir_name))
+		{
+			exec('mkdir -m 755 '.escapeshellarg($dir_name));
+			exec('sudo chown www-data:teacher '.escapeshellarg($dir_name));
+		}
+
 		// angemeldet
 		$angemeldet = true;
 		if(defined('CIS_LEHRVERANSTALTUNG_WENNANGEMELDET_DETAILS_ANZEIGEN') && CIS_LEHRVERANSTALTUNG_WENNANGEMELDET_DETAILS_ANZEIGEN && !$is_lector)
@@ -206,17 +215,38 @@ class LvMenu extends FHCAPI_Controller
 		}
 
 		// FH-Core Menu Logic 
-		// #############################################
+		// ##########################################################################################
 
 		$menu = array();
 
 		$this->fhc_menu_lvinfo($menu, $lvid, $studiengang_kz, $lektor_der_lv, $is_lector, $rechte, $lehrfach_oe_kurzbz_arr, $p);
 
 		$this->fhc_menu_semesterplan($menu, $angemeldet, $user_is_allowed_to_upload, $rechte, $lvid, $studiengang_kz, $kurzbz, $semester, $short_short_name, $p);
+		
+		$this->fhc_menu_download($menu, $angemeldet, $user_is_allowed_to_upload, $rechte, $semester, $kurzbz, $studiengang_kz, $short_short_name, $short, $p);
+		
+		$this->fhc_menu_notenliste($menu, $angemeldet, $is_lector, $lvid, $studiengang_kz, $angezeigtes_stsem, $kurzbz, $semester, $short_short_name, $p);
+
+		$this->fhc_menu_feedback($menu, $angemeldet, $lvid, $p);
+
+		$this->fhc_menu_gesamtnote($menu, $angemeldet, $lvid, $lv_obj, $is_lector, $angezeigtes_stsem, $p);
+
+		$this->fhc_menu_stundenupload($menu, $angemeldet, $lvid, $is_lector, $studiengang_kz, $kurzbz, $semester, $short, $short_short_name, $p);
+
+		$this->fhc_menu_emailStudierende($menu, $angemeldet, $lehreinheit->lehreinheit_id, $p);
+
+		$this->fhc_menu_pinboard($menu, $angemeldet, $is_lector, $studiengang_kz, $semester, $p);
+
+		$this->fhc_menu_abmeldung($menu, $user, $is_lector, $lvid, $angezeigtes_stsem, $p);
+
+		$this->fhc_menu_lehretools($menu, $lvid, $angezeigtes_stsem, $sprache);
+
+		$this->fhc_menu_anrechnungStudent($menu, $rechte, $lvid, $angezeigtes_stsem, $p);
+
+		$this->fhc_menu_anrechnungLector($menu, $rechte, $angezeigtes_stsem, $p);
 
 		// Addons Menu Logic
-		// #############################################
-		
+		// ##########################################################################################		
         Events::trigger('lvMenuBuild', 
 						// callback function for the onEvents to add newValues to the $menu
 						function ($addonMenu) use (&$menu) {
@@ -233,9 +263,22 @@ class LvMenu extends FHCAPI_Controller
 						$angezeigtes_stsem,
 						$lektor_der_lv,
 						$lehrfach_oe_kurzbz_arr,
-						$is_lector
+						$is_lector,
+						$angemeldet
 		);
 
+
+		// Menu sortieren
+		// ##########################################################################################
+		foreach ($menu as $key => $row){
+			$pos[$key] = $row['position'];
+		}
+
+		array_multisort($pos, SORT_ASC, SORT_NUMERIC, $menu);
+
+		// HTTP response
+		// ##########################################################################################
+
 		$this->terminateWithSuccess($menu);
 
 	}
@@ -285,7 +328,7 @@ class LvMenu extends FHCAPI_Controller
 		{
 			$dir_name = $this->ensureDirectoryExists($kurzbz, $semester, $short_short_name, 'semesterplan','teacher');
 			
-			$dir_empty = count(scandir($dir_name)) == 2 ? true : false;
+			$dir_empty = $this->isDirectoryEmpty($dir_name);
 
 			if($dir_empty == false)
 			{
@@ -325,6 +368,331 @@ class LvMenu extends FHCAPI_Controller
 		}
 	}
 
+	private function fhc_menu_download(&$menu, $angemeldet, $user_is_allowed_to_upload, $rechte, $semester, $kurzbz, $studiengang_kz, $short_short_name, $short, $p){
+		
+		if((!defined('CIS_LEHRVERANSTALTUNG_DOWNLOAD_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_DOWNLOAD_ANZEIGEN) && $angemeldet)
+		{
+			$dir_name = $this->ensureDirectoryExists($kurzbz, $semester, $short_short_name, 'download','teacher');
+			$dir_empty = $this->isDirectoryEmpty($dir_name);
+
+			$text = '';
+			if($dir_empty == false)
+			{
+				$link = $dir_name.'/';
+			}
+			else
+				$link = '';
+
+			//Wenn user eine Lehrfachzuteilung fuer dieses Lehrfach hat wird
+			//Ein Link zum Upload angezeigt und ein Link um das Download-Verzeichnis
+			//als Zip Archiv herunterzuladen
+			if($user_is_allowed_to_upload || $rechte->isBerechtigt('admin',$studiengang_kz) || $rechte->isBerechtigt('lehre',$studiengang_kz))// || $rechte->isBerechtigt('lehre',null,null,$fachbereich_id))
+			{
+				$text.= mb_strtolower("$kurzbz/$semester/$short/download");
+				$text.=  '<br>';
+				$text.=  "<a class='Item' target='_blank' href='upload.php?course_id=$studiengang_kz&term_id=$semester&short=$short'>".$p->t('lehre/upload')."</a>";
+				$text.=  '&nbsp;&nbsp;&nbsp;';
+			}
+
+			$menu[]=array
+			(
+				'id'=>'core_menu_download',
+				'position'=>'30',
+				'name'=>$p->t('lehre/download'),
+				'icon'=>'../../../skin/images/button_download.png',
+				'link'=>$link,
+				'text'=>$text
+			);
+		}
+	}
+
+	private function fhc_menu_notenliste(&$menu, $angemeldet, $is_lector, $lvid, $studiengang_kz, $angezeigtes_stsem, $kurzbz, $semester, $short_short_name, $p){
+		// Anwesenheits und Notenlisten
+		if(CIS_LEHRVERANSTALTUNG_LEISTUNGSUEBERSICHT_ANZEIGEN || $is_lector)
+		{
+			$link='';
+			$name='';
+			if($is_lector)
+			{
+				$name = $p->t('lehre/anwesenheitsUndNotenlisten');
+				$link= "anwesenheitsliste.php?stg_kz=$studiengang_kz&sem=$semester&lvid=$lvid&stsem=$angezeigtes_stsem";
+			}
+
+			$text='';
+			if(CIS_LEHRVERANSTALTUNG_LEISTUNGSUEBERSICHT_ANZEIGEN && ($angemeldet || $is_lector))
+			{
+				$dir_name = $this->ensureDirectoryExists($kurzbz, $semester, $short_short_name, 'leistung','teacher');
+				$dir_empty = $this->isDirectoryEmpty($dir_name);
+
+				if($dir_empty == false)
+				{
+					
+					if($is_lector)
+					{
+						$text.= '<a href="'.$dir_name.'" target="_blank">';
+						$text.= '<strong>'.$p->t('lehre/leistungsuebersicht').'</strong>';
+						$text.= '</a>';
+					}
+					else
+					{
+						$name = $p->t('lehre/leistungsuebersicht');
+						$link = $dir_name;
+					}
+				}
+				else
+				{
+					if($is_lector)
+					{
+						$text.= '<strong>'.$p->t('lehre/leistungsuebersicht').'</strong>';
+					}
+					else
+					{
+						$name = $p->t('lehre/leistungsuebersicht');
+						$link = '';
+					}
+				}
+			}
+
+			$menu[]=array
+			(
+				'id'=>'core_menu_anwesenheitslisten',
+				'position'=>'40',
+				'name'=>$name,
+				'icon'=>'../../../skin/images/button_listen.png',
+				'link'=>$link,
+				'text'=>$text
+			);
+		}
+	}
+
+	private function fhc_menu_feedback(&$menu, $angemeldet, $lvid, $p){
+		//FEEDBACK
+		if((!defined('CIS_LEHRVERANSTALTUNG_FEEDBACK_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_FEEDBACK_ANZEIGEN) && $angemeldet)
+		{
+			$menu[]=array
+			(
+				'id'=>'core_menu_feedback',
+				'position'=>'50',
+				'name'=>$p->t('lehre/feedback'),
+				'icon'=>'../../../skin/images/button_feedback.png',
+				'link'=>'feedback.php?lvid='.$lvid,
+				'text'=>''
+			);
+		}
+	}
+
+	private function fhc_menu_gesamtnote(&$menu, $angemeldet, $lvid, $lv_obj, $is_lector, $angezeigtes_stsem, $p){
+		//Gesamtnote
+		if($is_lector && ((!defined('CIS_LEHRVERANSTALTUNG_GESAMTNOTE_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_GESAMTNOTE_ANZEIGEN) && $angemeldet))
+		{
+			if($lv_obj->benotung)
+			{
+				$menu[]=array
+				(
+					'id'=>'core_menu_gesamtnote',
+					'position'=>'80',
+					'name'=>$p->t('lehre/gesamtnote'),
+					'icon'=>'../../../skin/images/button_endnote.png',
+					'link'=>'benotungstool/lvgesamtnoteverwalten.php?lvid='.urlencode($lvid).'&stsem='.urlencode($angezeigtes_stsem)
+				);
+			}
+			else
+			{
+				$menu[]=array
+				(
+					'id'=>'core_menu_gesamtnote',
+					'position'=>'80',
+					'name'=>$p->t('lehre/gesamtnote'),
+					'icon'=>'../../../skin/images/button_endnote.png',
+					'text'=>$p->t('lehre/noteneingabedeaktiviert')
+				);
+			}
+		}
+	}
+
+	private function fhc_menu_stundenupload(&$menu, $angemeldet, $lvid, $is_lector, $studiengang_kz, $kurzbz, $semester, $short, $short_short_name, $p){
+		// Studentenupload
+		if((!defined('CIS_LEHRVERANSTALTUNG_STUDENTENUPLOAD_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_STUDENTENUPLOAD_ANZEIGEN) && $angemeldet)
+		{
+			$link='';
+			$link_target='';
+
+			$dir_name = $this->ensureDirectoryExists($kurzbz, $semester, $short_short_name, 'upload','student');
+			$dir_empty = $this->isDirectoryEmpty($dir_name);
+
+			if(isset($dir_empty) && $dir_empty == false)
+			{
+				if($is_lector == true)
+				{
+					$link='lector_choice.php?lvid='.urlencode($lvid);
+					$link_target='_blank';
+				}
+				else
+				{
+					$link='upload.php?course_id='.urlencode($studiengang_kz).'&term_id='.urlencode($semester).'&short='.urlencode($short);
+					$link_target='_blank';
+				}
+			}
+			else
+			{
+				if($is_lector == true)
+				{
+					$link='';
+				}
+				else
+				{
+					$link='upload.php?course_id='.urlencode($studiengang_kz).'&term_id='.urlencode($semester).'&short='.urlencode($short);
+					$link_target='_blank';
+				}
+			}
+			$menu[]=array
+			(
+				'id'=>'core_menu_studentenupload',
+				'position'=>'90',
+				'name'=>$p->t('lehre/studentenAbgabe'),
+				'icon'=>'../../../skin/images/button_studiupload.png',
+				'link'=>$link,
+				'link_target'=>$link_target
+			);
+		}
+	}
+
+	private function fhc_menu_emailStudierende(&$menu, $angemeldet, $lehreinheit_id,$p){
+		// Email an Studierende
+		if((!defined('CIS_LEHRVERANSTALTUNG_MAILSTUDIERENDE_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_MAILSTUDIERENDE_ANZEIGEN) && $angemeldet)
+		{
+			$nomail='';
+			$mailto='mailto:';
+			
+			// load the Lehreinheit model and get the student mails
+			$this->load->model('education/Lehreinheit_model','LehreinheitModel');
+			$studentMails = $this->LehreinheitModel->getStudentenMail($lehreinheit_id);
+			
+			// get the data of the database result and map the array of objects to their object property
+			$studentMails = $this->getDataOrTerminateWithError($studentMails, 'No student mails found');
+			$studentMails = array_map(
+			function($mail_obj){
+				return $mail_obj->mail;
+			},$studentMails);
+
+			$mailto = implode(',',$studentMails);
+			
+			//todo logic for nomail is missing
+			if($nomail!='')
+				$link_onclick='alert(\''.$p->t('lehre/keinMailverteiler',array($nomail)).'\');';
+			else
+				$link_onclick='';
+
+			$menu[]=array
+			(
+				'id'=>'core_menu_mailanstudierende',
+				'position'=>'100',
+				'name'=>$p->t('lehre/mail'),
+				'icon'=>'../../../skin/images/button_feedback.png',
+				'link'=>$mailto,
+				'link_onclick'=>$link_onclick
+			);
+		} 
+	}
+
+	private function  fhc_menu_pinboard(&$menu, $angemeldet, $is_lector, $studiengang_kz, $semester, $p){
+		// Pinboard
+		if((!defined('CIS_LEHRVERANSTALTUNG_PINBOARD_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_PINBOARD_ANZEIGEN) && $angemeldet)
+		{
+			$text='';
+			if($is_lector)
+				$text.= "<a href='../../../cms/newsverwaltung.php?studiengang_kz=$studiengang_kz&semester=$semester' class='Item'>".$p->t('profil/adminstration')."</a>";
+
+			$menu[]=array
+			(
+				'id'=>'core_menu_pinboard',
+				'position'=>'110',
+				'name'=>$p->t('lehre/pinboard'),
+				'icon'=>'../../../skin/images/button_pinboard.png',
+				'link'=>'../../../cms/news.php?studiengang_kz='.urlencode($studiengang_kz).'&semester='.urlencode($semester),
+				'text'=>$text
+			);
+		}
+	}
+
+	private function fhc_menu_abmeldung(&$menu, $user, $is_lector, $lvid, $angezeigtes_stsem, $p){
+		if(!defined('CIS_LEHRVERANSTALTUNG_ABMELDUNG_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_ABMELDUNG_ANZEIGEN)
+		{
+			if(!$is_lector)
+			{
+				$lvangebot = new lvangebot();
+				$gruppen = $lvangebot->AbmeldungMoeglich($lvid, $angezeigtes_stsem, $user);
+				if(count($gruppen)>0)
+				{
+					$menu[]=array
+					(
+						'id'=>'core_menu_abmeldung',
+						'position'=>'120',
+						'name'=>$p->t('lehre/abmelden'),
+						'icon'=>'../../../skin/images/button_studiupload.png',
+						'link'=>'abmeldung.php?lvid='.urlencode($lvid).'&stsem='.urlencode($angezeigtes_stsem),
+					);
+
+				}
+			}
+		}
+	}
+
+	private function fhc_menu_lehretools(&$menu, $lvid, $angezeigtes_stsem, $sprache){
+		//Anzeigen von zusaetzlichen Lehre-Tools
+		$lehretools = new lehre_tools();
+		if($lehretools->getTools($lvid, $angezeigtes_stsem))
+		{
+			if(count($lehretools->result)>0)
+			{
+				foreach($lehretools->result as $row)
+				{
+					$menu[]=array
+					(
+						'id'=>'core_menu_lehretools_'.$row->lehre_tools_id,
+						'position'=>'1000',
+						'name'=>$row->bezeichnung[$sprache],
+						'icon'=>'../../../cms/dms.php?id='.$row->logo_dms_id,
+						'link'=>$row->basis_url,
+						'link_target'=>'_blank'
+					);
+				}
+			}
+		}
+	}
+
+	private function fhc_menu_anrechnungStudent(&$menu, $rechte, $lvid, $angezeigtes_stsem, $p){
+		// Anerkennung nachgewiesener Kenntnisse (Anrechnung) - Anzeige fuer Studenten
+		if((!defined('CIS_LEHRVERANSTALTUNG_ANRECHNUNG_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_ANRECHNUNG_ANZEIGEN)
+        && $rechte->isBerechtigt('student/anrechnung_beantragen'))
+		{
+			$menu[]=array
+			(
+				'id'=>'core_menu_anerkennungNachgewiesenerKenntnisse',
+				'position'=>'128',
+				'name'=>$p->t('lehre/anrechnung'),
+				'icon'=>'../../../skin/images/button_listen.png',
+				'link' => APP_ROOT. 'index.ci.php/lehre/anrechnung/RequestAnrechnung?studiensemester='.urlencode($angezeigtes_stsem).'&lv_id='.urlencode($lvid)
+			);
+		}
+	}
+
+	private function fhc_menu_anrechnungLector(&$menu, $rechte, $angezeigtes_stsem, $p){
+		// Anerkennung nachgewiesener Kenntnisse (Anrechnung) - Anzeige fuer LektorInnen
+		if((!defined('CIS_LEHRVERANSTALTUNG_ANRECHNUNG_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_ANRECHNUNG_ANZEIGEN)
+		&& $rechte->isBerechtigt('lehre/anrechnung_empfehlen'))
+		{
+		$menu[]=array
+		(
+			'id'=>'core_menu_anerkennungNachgewiesenerKenntnisse_empfehlen',
+			'position'=>'128',
+			'name'=>$p->t('lehre/anrechnungen'),
+			'icon'=>'../../../skin/images/button_listen.png',
+			'link' => APP_ROOT. 'index.ci.php/lehre/anrechnung/ReviewAnrechnungUebersicht?studiensemester='.urlencode($angezeigtes_stsem)
+		);
+		}
+	}
+
 	private function ensureDirectoryExists($kurzbz, $semester, $short_short_name, $type, $role){
 		$dir_name = DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name).'/'.$type;
 
@@ -338,5 +706,9 @@ class LvMenu extends FHCAPI_Controller
 
 		return $dir_name;
 	}
+
+	private function isDirectoryEmpty($dir){
+		return count(scandir($dir)) == 2 ? true : false;
+	}
 }
 

From 0347f8bf02733221fe52648b62afd78f74a3b12b Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 8 Jul 2024 11:43:48 +0200
Subject: [PATCH 0883/1461] filters the menu to remove all elements that don't
 have the position property

---
 .../controllers/api/frontend/v1/LvMenu.php    | 41 ++++++++++++-------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/application/controllers/api/frontend/v1/LvMenu.php b/application/controllers/api/frontend/v1/LvMenu.php
index a9cbf4647..76f5afd2e 100644
--- a/application/controllers/api/frontend/v1/LvMenu.php
+++ b/application/controllers/api/frontend/v1/LvMenu.php
@@ -66,6 +66,7 @@ class LvMenu extends FHCAPI_Controller
 		require_once(FHCPATH.'include/studiengang.class.php');
 		require_once(FHCPATH.'include/phrasen.class.php');
 		require_once(FHCPATH.'include/lvangebot.class.php');
+		require_once(FHCPATH.'include/lehre_tools.class.php');
 
 		// get the sprache
 		$sprache = getSprache();
@@ -247,39 +248,49 @@ class LvMenu extends FHCAPI_Controller
 
 		// Addons Menu Logic
 		// ##########################################################################################		
-        Events::trigger('lvMenuBuild', 
+        $params = [
+			'lvid'=>$lvid,
+			'studiensemester_kurzbz'=>$studiensemester_kurzbz,
+			'studiengang_kz'=>$studiengang_kz,
+			'p'=>$p,
+			'rechte'=>$rechte,
+			'lv'=>$lv,
+			'angezeigtes_stsem'=>$angezeigtes_stsem,
+			'lektor_der_lv'=>$lektor_der_lv,
+			'lehrfach_oe_kurzbz_arr'=>$lehrfach_oe_kurzbz_arr,
+			'is_lector'=>$is_lector,
+			'angemeldet'=>$angemeldet
+		];
+		
+		Events::trigger('lvMenuBuild', 
 						// callback function for the onEvents to add newValues to the $menu
 						function ($addonMenu) use (&$menu) {
 							foreach($addonMenu as $m){
 								$menu[]= $m;
 							}
 						},
-						$lvid,
-						$studiensemester_kurzbz,
-						$studiengang_kz,
-						$p,
-						$rechte,
-						$lv,
-						$angezeigtes_stsem,
-						$lektor_der_lv,
-						$lehrfach_oe_kurzbz_arr,
-						$is_lector,
-						$angemeldet
+						$params
 		);
 
 
 		// Menu sortieren
 		// ##########################################################################################
 		foreach ($menu as $key => $row){
-			$pos[$key] = $row['position'];
+			if(isset($row['position'])){
+				$pos[$key] = $row['position'];
+			}
 		}
 
-		array_multisort($pos, SORT_ASC, SORT_NUMERIC, $menu);
+		$sortable_menu = array_filter($menu, function($element){
+			return isset($element['position']);
+		});
+
+		array_multisort($pos, SORT_ASC, SORT_NUMERIC, $sortable_menu);
 
 		// HTTP response
 		// ##########################################################################################
 
-		$this->terminateWithSuccess($menu);
+		$this->terminateWithSuccess($sortable_menu);
 
 	}
 

From 4e053a4769183e5287d1a6aa562cc0d34790b348 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Mon, 8 Jul 2024 12:24:44 +0200
Subject: [PATCH 0884/1461] Updated phrases: Added phrases for
 Softwareanforderung in category Softwarebereitstellung

---
 system/phrasesupdate.php | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 0c9b70261..1f6b19418 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -26700,6 +26700,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'swAnforderungUeberAuswahlVonSw',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Softwareanforderung über die Auswahl von Software",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Software Requirements based on the Selection of Software",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'swAnforderungUeberAuswahlVonLvs',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Softwareanforderung über die Auswahl von Lehrveranstaltungen",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Software Requirements based on the Selection of Courses",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 );
 
 

From 4d48dfe0181dc43f78a6a518239a90381fb93f41 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Mon, 8 Jul 2024 12:26:41 +0200
Subject: [PATCH 0885/1461] Added method getLvsByStudiensemesterAndOes to
 Lehrveranstaltung_model.php

getLvsByStudiensemesterAndOes: Gets Lehrveranstaltungen with its Stg, OE and OE-type and filters by Studiensemester and Organisationseinheiten if necessary.
---
 .../education/Lehrveranstaltung_model.php     | 59 +++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/application/models/education/Lehrveranstaltung_model.php b/application/models/education/Lehrveranstaltung_model.php
index c7f32fef6..129e2af41 100644
--- a/application/models/education/Lehrveranstaltung_model.php
+++ b/application/models/education/Lehrveranstaltung_model.php
@@ -80,6 +80,65 @@ class Lehrveranstaltung_model extends DB_Model
 		return $this->execQuery($qry, $params);
 	}
 
+	/**
+	 * Get Lehrveranstaltungen with its Stg, OE and OE-type.
+	 * Filter by Studiensemester and Organisationseinheiten if necessary.
+	 * @param $eventQuery String
+	 * @param string $studiensemester_kurzbz Filter by Studiensemester
+	 * @param array $oes Filter by Organisationseinheiten
+	 * @return array
+	 */
+	public function getLvsByStudiensemesterAndOes($studiensemester_kurzbz = null, $oes = null)
+	{
+		$params = [];
+		$qry = '
+			SELECT DISTINCT ON (lv_oe_kurzbz, stg_bezeichnung, lehrveranstaltung_id)
+			    le.studiensemester_kurzbz,
+                lv.oe_kurzbz AS "lv_oe_kurzbz",
+                CASE
+                    WHEN oe.organisationseinheittyp_kurzbz = \'Kompetenzfeld\' THEN (\'KF \' || oe.bezeichnung)
+                    WHEN oe.organisationseinheittyp_kurzbz = \'Department\' THEN (\'DEP \' || oe.bezeichnung)
+                    ELSE (oe.organisationseinheittyp_kurzbz || \' \' || oe.bezeichnung)
+                END AS "lv_oe_bezeichnung",
+                stg.studiengang_kz,
+                upper(stg.typ || stg.kurzbz) AS "stg_typ_kurzbz",    
+                stg.bezeichnung AS "stg_bezeichnung",
+                lv.semester,   
+                lv.lehrveranstaltung_id,
+                lv.bezeichnung AS "lv_bezeichnung"           
+            FROM
+				lehre.tbl_lehrveranstaltung     		lv 
+				JOIN lehre.tbl_lehreinheit           	le USING (lehrveranstaltung_id)
+				JOIN public.tbl_organisationseinheit 	oe USING (oe_kurzbz)
+				JOIN public.tbl_studiengang          	stg ON stg.studiengang_kz = lv.studiengang_kz
+            WHERE
+				/* filter negative studiengaenge */
+                stg.studiengang_kz > 0 ';
+
+		if (isset($studiensemester_kurzbz) && is_string($studiensemester_kurzbz))
+		{
+			/* filter studiensemester */
+			$qry.= ' AND le.studiensemester_kurzbz =  ? ';
+			$params[]= $studiensemester_kurzbz;
+		}
+
+		if (isset($oes) && is_array($oes))
+		{
+			/* filter organisationseinheit */
+			$qry.= ' AND lv.oe_kurzbz IN ? ';
+			$params[]= $oes;
+		}
+
+		$qry.= '
+                /* filter active lehrveranstaltungen */
+                AND lv.aktiv = TRUE
+                /* filter active organisationseinheiten */
+                AND oe.aktiv = TRUE
+		';
+
+		return $this->execQuery($qry, $params);
+	}
+
 	/**
 	 * Gets unique Groupstrings for Lehrveranstaltungen, e.g. WS2018_BIF_1_PRJM_VZ_LV12345
 	 * @param string $studiensemester_kurzbz

From 1a8a7cc260c070c106fba40a57714c93e18207b8 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Mon, 8 Jul 2024 12:42:32 +0200
Subject: [PATCH 0886/1461] prestudent model gethistoryprestudent: added order
 by for insertamum, ext_id

---
 application/models/crm/Prestudent_model.php | 38 ++++++++++-----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/application/models/crm/Prestudent_model.php b/application/models/crm/Prestudent_model.php
index 4c295c3cd..b783715c2 100644
--- a/application/models/crm/Prestudent_model.php
+++ b/application/models/crm/Prestudent_model.php
@@ -736,18 +736,18 @@ class Prestudent_model extends DB_Model
 	public function getHistoryPrestudent($prestudent_id, $index_lang)
 	{
 		$query = "
-					SELECT 
-					ps.status_kurzbz, 
-					ps.studiensemester_kurzbz, 
+					SELECT
+					ps.status_kurzbz,
+					ps.studiensemester_kurzbz,
 					ps.ausbildungssemester,
 					CASE WHEN ps.status_kurzbz IN ('Student', 'Diplomand','Abbrecher','Unterbrecher')
 					THEN CONCAT(lv.semester, lv.verband, lv.gruppe)
 					ELSE ''
-					END AS lehrverband, 
-					ps.datum, 
+					END AS lehrverband,
+					ps.datum,
 					TO_CHAR(ps.datum::timestamp, 'DD.MM.YYYY') AS format_datum,
-					sp.bezeichnung, 
-					ps.bestaetigtam, 
+					sp.bezeichnung,
+					ps.bestaetigtam,
 					TO_CHAR(ps.bestaetigtam::timestamp, 'DD.MM.YYYY') AS format_bestaetigtam,
 					ps.bewerbung_abgeschicktamum,
 					TO_CHAR(ps.bewerbung_abgeschicktamum::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS format_bewerbung_abgeschicktamum,
@@ -764,23 +764,23 @@ class Prestudent_model extends DB_Model
 					TO_CHAR(ps.updateamum::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS format_updateamum,
 					ps.updatevon,
 					stg.beschreibung[?] as statusgrund_beschreibung
-				FROM 
+				FROM
 					public.tbl_prestudentstatus ps
-				LEFT JOIN 
+				LEFT JOIN
 					public.tbl_student st USING (prestudent_id)
-				LEFT JOIN 
+				LEFT JOIN
 					public.tbl_studiengang sg ON (st.studiengang_kz = sg.studiengang_kz)
-				LEFT JOIN 
-					lehre.tbl_studienplan sp USING (studienplan_id) 
-				LEFT JOIN 
-					public.tbl_status_grund stg USING (statusgrund_id) 
-				LEFT JOIN 
-					public.tbl_studentlehrverband lv ON 
-						(st.student_uid = lv.student_uid 
-							 AND st.student_uid IS NOT NULL 
+				LEFT JOIN
+					lehre.tbl_studienplan sp USING (studienplan_id)
+				LEFT JOIN
+					public.tbl_status_grund stg USING (statusgrund_id)
+				LEFT JOIN
+					public.tbl_studentlehrverband lv ON
+						(st.student_uid = lv.student_uid
+							 AND st.student_uid IS NOT NULL
 							 AND lv.studiensemester_kurzbz = ps.studiensemester_kurzbz)
 				WHERE prestudent_id = ?
-				ORDER BY datum DESC
+				ORDER BY ps.datum DESC, ps.insertamum DESC, ps.ext_id DESC
 		";
 
 		return $this->execQuery($query, array($index_lang, $prestudent_id));

From 84029fc72963b29f31af68524251c2864c6ca147 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 8 Jul 2024 15:15:08 +0200
Subject: [PATCH 0887/1461] updates editAdressen in the Profil

---
 application/controllers/Cis/Profil.php        |  28 +--
 .../controllers/api/frontend/v1/Profil.php    |  27 +++
 application/models/codex/Gemeinde_model.php   |  24 ++
 public/js/api/profil.js                       |   7 +-
 public/js/apps/Cis/Profil.js                  |   6 +-
 .../Cis/Profil/MitarbeiterProfil.js           |   1 +
 .../ProfilComponents/ProfilInformation.js     |   8 +-
 .../EditProfilComponents/EditAdresse.js       | 221 +++++++++---------
 .../js/components/Cis/Profil/StudentProfil.js |   3 +
 9 files changed, 194 insertions(+), 131 deletions(-)

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index dd2c1a311..1141808fe 100755
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -244,23 +244,23 @@ class Profil extends Auth_Controller
 		$this->GemeindeModel->addDistinct();
 		$this->GemeindeModel->addSelect(["name"]);
 		if ($nation == "A") {
-			if (isset($zip) && $zip > 999 && $zip < 32000) {
+				if (isset($zip) && $zip > 999 && $zip < 32000) {
 
-				$gemeinde_res = $this->GemeindeModel->loadWhere(['plz' => $zip]);
-				if (isError($gemeinde_res)) {
-					show_error("error while trying to query bis.tbl_gemeinde");
+						$gemeinde_res = $this->GemeindeModel->loadWhere(['plz' => $zip]);
+						if (isError($gemeinde_res)) {
+								show_error("error while trying to query bis.tbl_gemeinde");
+						}
+						$gemeinde_res = hasData($gemeinde_res) ? getData($gemeinde_res) : null;
+						$gemeinde_res = array_map(function ($obj) {
+								return $obj->name;
+						}, $gemeinde_res);
+						echo json_encode($gemeinde_res);
+
+				} else {
+						echo json_encode(error("ortschaftskennziffer code was not valid"));
 				}
-				$gemeinde_res = hasData($gemeinde_res) ? getData($gemeinde_res) : null;
-				$gemeinde_res = array_map(function ($obj) {
-					return $obj->name;
-				}, $gemeinde_res);
-				echo json_encode($gemeinde_res);
-
-			} else {
-				echo json_encode(error("ortschaftskennziffer code was not valid"));
-			}
 		} else {
-			echo json_encode(error("Nation was not 'A' (Austria)"));
+				echo json_encode(error("Nation was not 'A' (Austria)"));
 		}
 	}
 
diff --git a/application/controllers/api/frontend/v1/Profil.php b/application/controllers/api/frontend/v1/Profil.php
index 88679c636..401c0b791 100644
--- a/application/controllers/api/frontend/v1/Profil.php
+++ b/application/controllers/api/frontend/v1/Profil.php
@@ -34,6 +34,8 @@ class Profil extends FHCAPI_Controller
 		parent::__construct([
 			'getView' => self::PERM_LOGGED,
             'fotoSperre' => self::PERM_LOGGED,
+			'getGemeinden' => self::PERM_LOGGED,
+			
 		]);
 
 
@@ -143,6 +145,31 @@ class Profil extends FHCAPI_Controller
         $this->terminateWithSuccess(current($res));
 	}
 
+	public function getGemeinden($nation, $zip)
+	{
+		if(!isset($nation) || !isset($zip)){
+			echo json_encode(error("Missing parameters"));
+			return;
+		}
+		
+		$this->load->model('codex/Gemeinde_model', "GemeindeModel");
+		
+
+		$gemeinde_res = $this->GemeindeModel->getGemeindeByPlz($zip);
+		
+		if (isError($gemeinde_res)) {
+			$this->terminateWithError(getError($gemeinde_res),self::ERROR_TYPE_GENERAL);
+		}
+		$gemeinde_res = $this->getDataOrTerminateWithError($gemeinde_res);
+		
+		/* $gemeinde_res = array_map(function ($obj) {
+			return $obj->ortschaftsname;
+		}, $gemeinde_res); */
+
+		$this->terminateWithSuccess($gemeinde_res);	
+		
+	}
+
 
     // -----------------------------------------------------------------------------------------------------------------
 	// Private methods
diff --git a/application/models/codex/Gemeinde_model.php b/application/models/codex/Gemeinde_model.php
index c782346a0..92f0e0ca4 100755
--- a/application/models/codex/Gemeinde_model.php
+++ b/application/models/codex/Gemeinde_model.php
@@ -19,4 +19,28 @@ class Gemeinde_model extends DB_Model
 		
 		return $this->loadWhere(array("plz" => $plz));
 	}
+
+	public function getGemeindeByNation($nation, $zip){
+		
+		
+		$this->addSelect(["name"]);
+
+		if ($nation == "A") {
+			if (isset($zip) && $zip > 999 && $zip < 32000) {
+
+				$gemeinde_res = $this->GemeindeModel->loadWhere(['plz' => $zip]);
+				if (isError($gemeinde_res)) {
+					show_error("error while trying to query bis.tbl_gemeinde");
+				}
+				$gemeinde_res = hasData($gemeinde_res) ? getData($gemeinde_res) : null;
+				$gemeinde_res = array_map(function ($obj) {
+					return $obj->name;
+				}, $gemeinde_res);
+				echo json_encode($gemeinde_res);
+
+			} else {
+				echo json_encode(error("ortschaftskennziffer code was not valid"));
+			}
+		} else {}
+	}
 }
\ No newline at end of file
diff --git a/public/js/api/profil.js b/public/js/api/profil.js
index e2fba5f83..eefe7d880 100755
--- a/public/js/api/profil.js
+++ b/public/js/api/profil.js
@@ -56,13 +56,12 @@ export default {
     );
   },
 
-  getGemeinden: function(nation,zip=null){
+  getGemeinden: function(nation,zip){
     return this.$fhcApi.get(
       FHC_JS_DATA_STORAGE_OBJECT.app_root + 
       FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-      "/api/frontend/v1/Profil/getGemeinden",
-      { nation: nation,
-      ...(zip? {zip:zip}:{}) }
+      `/api/frontend/v1/Profil/getGemeinden/${nation}/${zip}`,
+      {}
     );
     
   },
diff --git a/public/js/apps/Cis/Profil.js b/public/js/apps/Cis/Profil.js
index 3c3855147..f2726a3db 100755
--- a/public/js/apps/Cis/Profil.js
+++ b/public/js/apps/Cis/Profil.js
@@ -318,16 +318,16 @@ const profilApp = Vue.createApp({
               ?.filter((item) => {
                 return !this.data.profilUpdates?.some((update) => {
                   return (
-                    update.status === "pending" &&
+                    update.status === this.profilUpdateStates["Pending"] &&
                     update.requested_change?.adresse_id == item.adresse_id
                   );
                 });
               })
-              .map((kontakt) => {
+              .map((adresse) => {
                 return {
                   listview: "Adresse",
                   view: "EditAdresse",
-                  data: kontakt,
+                  data: adresse,
                 };
               }),
           },
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index a899b0050..6653c8253 100755
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -238,6 +238,7 @@ export default {
   created() {
     //? sorts the profil Updates: pending -> accepted -> rejected
     this.data.profilUpdates?.sort(this.sortProfilUpdates);
+    
   },
 
   template: /*html*/ ` 
diff --git a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
index a82f7bf3e..78e198170 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
@@ -20,11 +20,9 @@ export default {
       if (!this.data) {
         return;
       }
-      Vue.$fhcapi.UserData.sperre_foto_function(!this.FotoSperre).then(
-        (res) => {
-          this.FotoSperre = res.data.foto_sperre;
-        }
-      );
+      this.$fhcApi.factory.profil.fotoSperre(!this.FotoSperre).then(res =>{
+        this.FotoSperre = res.data.foto_sperre;
+      })
     },
   },
   computed: {
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js
index d1199686c..e51bef24c 100755
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js
@@ -16,6 +16,7 @@ export default {
   data() {
     return {
       gemeinden: [],
+      ortschaftnamen: [],
       selectedNation: null,
       nationenList: [],
       originalValue: null,
@@ -27,13 +28,25 @@ export default {
     "data.gemeinde": function (newValue, oldValue) {
       this.$emit("profilUpdate", this.isChanged ? this.data : null);
     },
+    "data.ort": function (newValue, oldValue) {
+      this.$emit("profilUpdate", this.isChanged ? this.data : null);
+    },
   },
 
   methods: {
-    autocompleteSearch: function (event) {
+    test: function () {
+      console.log(this.gemeinden, "this are the gemeinden");
+      console.log(this.ortschaftnamen, "this are the ortschaftsnamen");
+    },
+
+    autocompleteSearchGemeinden: function (event) {
       this.gemeinden = this.gemeinden.map((gemeinde) => gemeinde);
     },
 
+    autocompleteSearchOrtschaftsnamen: function (event) {
+      this.ortschaftnamen = this.ortschaftnamen.map((ortschaft) => ortschaft);
+    },
+
     getGemeinde: function () {
       //? only query the gemeinde is the nation is Austria and the PLZ is greater than 999 and less than 32000
       if (
@@ -43,14 +56,27 @@ export default {
         this.data.plz > 999 &&
         this.data.plz < 32000
       ) {
-        
-        Vue.$fhcapi.UserData.getGemeinden(this.data.nation, this.data.plz).then(
-          (res) => {
+        this.$fhcApi.factory.profil
+          .getGemeinden(this.data.nation, this.data.plz)
+          .then((res) => {
             if (res.data.length) {
-              this.gemeinden = res.data;
+              console.log(res.data, "this is the data from the gemeinden");
+              this.gemeinden = [
+                ...new Set(
+                  res.data.map((element) => {
+                    return element.name;
+                  })
+                ),
+              ];
+              this.ortschaftnamen = [
+                ...new Set(
+                  res.data.map((element) => {
+                    return element.ortschaftsname;
+                  })
+                ),
+              ];
             }
-          }
-        );
+          });
       } else {
         this.gemeinden = [];
       }
@@ -87,13 +113,12 @@ export default {
       ) {
         return false;
       }
+
       return this.originalValue !== JSON.stringify(this.data);
     },
   },
 
   created() {
-
-
     Vue.$fhcapi.UserData.getAllNationen().then((res) => {
       this.nationenList = res.data;
       this.getGemeinde();
@@ -104,103 +129,89 @@ export default {
   },
 
   template: /*html*/ `
-     <div class="gy-3 row justify-content-center align-items-center">
-    
-     <!-- warning message for too many zustellungs Adressen -->
-     <div v-if="showZustellAdressenWarning" class="col-12 ">
-     <div class="card bg-danger mx-2">
-     <div class="card-body text-white ">
-     <span>{{$p.t('profilUpdate','zustelladresseWarning')}}</span>
-     </div>
-     </div>
-     </div>
-     <!-- End of warning -->
+<div class="gy-3 row justify-content-center align-items-center">
 
-
-     <div class="col-12 ">
-        
-       
-            <div class="form-check mb-2">
-                <input class="form-check-input" type="checkbox" @change="updateValue($event,'zustelladresse')" :checked="data.zustelladresse" id="flexCheckDefault">
-                <label class="form-check-label" for="flexCheckDefault">
-                    {{$p.t('person','zustelladresse')}}
-                </label>
-            </div>
-        
-       
-           
-            
-            
-        </div>
-      
-      
-        <div  class="col-12 col-sm-9 col-xl-12 col-xxl-9 order-1">
-
-        <div class="form-underline ">
-        <div class="form-underline-titel">{{$p.t('person','strasse')}}*</div>
-        <input  class="form-control" :value="data.strasse" @input="updateValue($event,'strasse')" :placeholder="data.strasse">
-        
-        </div>
-
-
-        </div>
-        
-        <div class=" order-2 order-sm-4 order-xl-3 order-xxl-4 col-12 col-sm-5  col-xl-8 col-xxl-5  ">
-            
-            <div  class="form-underline">
-                <div class="form-underline-titel">{{$p.t('profilUpdate','kontaktTyp')}}*</div>
-        
-                <select  :value="data.typ" @change="updateValue($event,'typ')" class="form-select" aria-label="Select Kontakttyp">
-                    <option selected></option>
-                    <option value="Nebenwohnsitz">{{$p.t('profilUpdate','nebenwohnsitz')}}</option>
-                    <option value="Hauptwohnsitz">{{$p.t('profilUpdate','hauptwohnsitz')}}</option>
-                    <option v-if="isMitarbeiter" value="Homeoffice">{{$p.t('profilUpdate','homeoffice')}}</option>
-                    <option v-if="isMitarbeiter" value="Rechnungsadresse">{{$p.t('profilUpdate','rechnungsadresse')}}</option>
-                  
-                </select>    
-            </div>
-        
-
-            
-            </template>
-
-        </div>
-
-        <div  class="order-3 order-sm-3 order-xl-2 order-xxl-3 col-12 col-sm-7 col-xl-12 col-xxl-7 " >
-            
-            <div class="form-underline ">
-            <div class="form-underline-titel">{{$p.t('person','ort')}}*</div>
-            <input  class="form-control" :value="data.ort" @input="updateValue($event,'ort')" :placeholder="data.ort">
-        
-            </div>
-        </div>
-        <div  class="order-4 order-sm-2 order-xl-4 order-xxl-2 col-12 col-sm-3 col-xl-4 col-xxl-3 ">
-            <div class="form-underline ">
-            <div class="form-underline-titel">{{$p.t('person','plz')}}*</div>
-    
-            <input  class="form-control" :value="data.plz" @input="updateValue($event,'plz')" @input="getGemeinde" :placeholder="data.plz">
-        
-            </div>
-        </div>
-        <div class="col-6 order-5">
-       
-        <div class="form-underline ">
-        <div class="form-underline-titel">{{$p.t('person','gemeinde')}}*</div>
-        <auto-complete class="w-100" v-model="data.gemeinde" dropdown :forceSelection="data.nation ==='A'?true:false" :suggestions="gemeinden" @complete="autocompleteSearch" ></auto-complete>
-        </div>
-        </div>
-        <div class="col-6 order-5 ">
-        <div class="form-underline ">
-        <div class="form-underline-titel">{{$p.t('person','nation')}}*</div>
-            <select  :value="data.nation" @change="updateValue($event,'nation')" @change="getGemeinde" class="form-select" aria-label="Select Kontakttyp">
-                <option selected></option>
-                <option :value="nation.code" v-for="nation in nationenList">{{nation.langtext}}</option>
-            
-            </select> 
-        
-        </div>
-        </div>
-       
+  <!-- warning message for too many zustellungs Adressen -->
+  <div v-if="showZustellAdressenWarning" class="col-12 ">
+    <div class="card bg-danger mx-2">
+      <div class="card-body text-white ">
+        <span>{{$p.t('profilUpdate','zustelladresseWarning')}}</span>
+      </div>
     </div>
+  </div>
+  <!-- End of warning -->
+
+
+  <div class="col-12 ">
+    <div class="form-check mb-2">
+      <input class="form-check-input" type="checkbox" @change="updateValue($event,'zustelladresse')" :checked="data.zustelladresse" id="flexCheckDefault">
+      <label class="form-check-label" for="flexCheckDefault">
+      {{$p.t('person','zustelladresse')}}
+      </label>
+    </div>  
+  </div>
+
+  <!-- NATION -->
+  <div class="col-8">
+    <div class="form-underline ">
+      <div class="form-underline-titel">{{$p.t('person','nation')}}*</div>
+      <select  :value="data.nation" @change="updateValue($event,'nation')" @change="getGemeinde" class="form-select" aria-label="Select Kontakttyp">
+        <option selected></option>
+        <option :value="nation.code" v-for="nation in nationenList">{{nation.langtext}}</option>
+      </select> 
+    </div>
+  </div>
+
+  <!-- PLZ -->
+  <div class=" col-4">
+    <div class="form-underline">
+      <div class="form-underline-titel">{{$p.t('person','plz')}}*</div>
+      <input class="form-control" :value="data.plz" @input="updateValue($event,'plz')" @input="getGemeinde" :placeholder="data.plz">
+    </div>
+  </div>
+
+  <!-- GEMEINDE -->
+  <div class="col-lg-6">
+    <div class="form-underline ">
+      <div class="form-underline-titel">{{$p.t('person','gemeinde')}}*</div>
+      <auto-complete class="w-100" v-model="data.gemeinde" dropdown :forceSelection="data.nation ==='A'?true:false" :suggestions="gemeinden" @complete="autocompleteSearchGemeinden" ></auto-complete>
+    </div>
+  </div>
+
+  <!-- ORT -->
+  <div  class="col-lg-6" >
+    <div class="form-underline ">
+      <div class="form-underline-titel">{{$p.t('person','ort')}}*</div>
+      <auto-complete class="w-100" v-model="data.ort" dropdown :forceSelection="data.nation ==='A'?true:false" :suggestions="ortschaftnamen" @complete="autocompleteSearchOrtschaftsnamen" ></auto-complete>
+    </div>
+  </div>
+
+  <!-- STRASSE -->
+  <div  class="col-lg-8">
+    <div class="form-underline ">
+      <div class="form-underline-titel">{{$p.t('person','strasse')}}*</div>
+      <input  class="form-control" :value="data.strasse" @input="updateValue($event,'strasse')" :placeholder="data.strasse">
+    </div>
+  </div>
+  
+  <!-- ADRESSEN TYP -->
+  <div class="col-lg-4">
+    <div  class="form-underline">
+      <div class="form-underline-titel">{{$p.t('profilUpdate','kontaktTyp')}}*</div>
+      <select  :value="data.typ" @change="updateValue($event,'typ')" class="form-select" aria-label="Select Kontakttyp">
+        <option selected></option>
+        <option value="Nebenwohnsitz">{{$p.t('profilUpdate','nebenwohnsitz')}}</option>
+        <option value="Hauptwohnsitz">{{$p.t('profilUpdate','hauptwohnsitz')}}</option>
+        <option v-if="isMitarbeiter" value="Homeoffice">{{$p.t('profilUpdate','homeoffice')}}</option>
+        <option v-if="isMitarbeiter" value="Rechnungsadresse">{{$p.t('profilUpdate','rechnungsadresse')}}</option>
+      </select>    
+    </div>
+  </div>
+
+
+  
+
+
+</div>
     `,
 };
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index 059742c69..ffb0d0fd3 100755
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -85,6 +85,7 @@ export default {
     editData: Object,
   },
   methods: {
+    
     betriebsmittelTableBuilt: function () {
       this.$refs.betriebsmittelTable.tabulator.setData(this.data.mittel);
     },
@@ -181,6 +182,7 @@ export default {
   created() {
     //? sorts the profil Updates: pending -> accepted -> rejected
     this.data.profilUpdates?.sort(this.sortProfilUpdates);
+    
   },
 
   
@@ -205,6 +207,7 @@ export default {
   
               <div class="row ">
               <div class="col mb-3">
+              
               <button @click="showEditProfilModal" type="button" class="text-start  w-100 btn btn-outline-secondary" >
                 <div class="row">
                   <div class="col-2">

From 8a44a9e1afd54074ae532fe903a02bd1e0004ec1 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 9 Jul 2024 10:37:43 +0200
Subject: [PATCH 0888/1461] passes the menu as a reference to the on Events
 instead of using a callback function

---
 .../controllers/api/frontend/v1/LvMenu.php    | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/application/controllers/api/frontend/v1/LvMenu.php b/application/controllers/api/frontend/v1/LvMenu.php
index 76f5afd2e..22b5a3a3d 100644
--- a/application/controllers/api/frontend/v1/LvMenu.php
+++ b/application/controllers/api/frontend/v1/LvMenu.php
@@ -249,6 +249,7 @@ class LvMenu extends FHCAPI_Controller
 		// Addons Menu Logic
 		// ##########################################################################################		
         $params = [
+			'user'=>$user,
 			'lvid'=>$lvid,
 			'studiensemester_kurzbz'=>$studiensemester_kurzbz,
 			'studiengang_kz'=>$studiengang_kz,
@@ -264,10 +265,8 @@ class LvMenu extends FHCAPI_Controller
 		
 		Events::trigger('lvMenuBuild', 
 						// callback function for the onEvents to add newValues to the $menu
-						function ($addonMenu) use (&$menu) {
-							foreach($addonMenu as $m){
-								$menu[]= $m;
-							}
+						function & () use (&$menu) {
+							return $menu;
 						},
 						$params
 		);
@@ -276,21 +275,15 @@ class LvMenu extends FHCAPI_Controller
 		// Menu sortieren
 		// ##########################################################################################
 		foreach ($menu as $key => $row){
-			if(isset($row['position'])){
-				$pos[$key] = $row['position'];
-			}
+			$pos[$key] = $row['position'];
 		}
 
-		$sortable_menu = array_filter($menu, function($element){
-			return isset($element['position']);
-		});
-
-		array_multisort($pos, SORT_ASC, SORT_NUMERIC, $sortable_menu);
+		array_multisort($pos, SORT_ASC, SORT_NUMERIC, $menu);
 
 		// HTTP response
 		// ##########################################################################################
 
-		$this->terminateWithSuccess($sortable_menu);
+		$this->terminateWithSuccess($menu);
 
 	}
 

From 37fb9dd851e6e04905e28ae724db9c3725a7d47e Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 9 Jul 2024 11:38:16 +0200
Subject: [PATCH 0889/1461] use date that seems more stable than one that
 depends on a config entry that may change over time and then change the date
 in previous documents

---
 rdf/AntragWiederholung.xml.php | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/rdf/AntragWiederholung.xml.php b/rdf/AntragWiederholung.xml.php
index e972a46a2..d38775020 100644
--- a/rdf/AntragWiederholung.xml.php
+++ b/rdf/AntragWiederholung.xml.php
@@ -78,15 +78,14 @@ if ($config['note_blacklist_wiederholung']) {
 
 $query = "
 	SELECT stg.bezeichnung, tbl_orgform.bezeichnung_mehrsprachig[(SELECT index FROM public.tbl_sprache WHERE sprache=" . $db->db_add_param(getSprache(), FHC_STRING) . ")], studierendenantrag_id, matrikelnr, studienjahr_kurzbz, a.studiensemester_kurzbz, vorname, nachname, studiengang_kz, pss.ausbildungssemester AS semester, (
-			SELECT pr.datum
-			FROM lehre.tbl_pruefung pr
-			JOIN lehre.tbl_note n USING (note)
-			WHERE pr.student_uid = tbl_student.student_uid 
-			AND pr.datum <= a.datum
-			AND pr.pruefungstyp_kurzbz IN ('kommPruef', 'zusKommPruef')
-			AND n.positiv=FALSE
-			" . $blacklist . "
-			ORDER BY datum DESC
+			SELECT
+				insertamum::date
+			FROM
+				campus.tbl_studierendenantrag_status
+			WHERE
+				studierendenantrag_id = a.studierendenantrag_id AND studierendenantrag_statustyp_kurzbz = 'Abgemeldet'
+			ORDER BY
+				insertamum DESC
 			LIMIT 1
 		) AS abmeldedatum, (SELECT pt.text FROM system.tbl_phrase p JOIN system.tbl_phrasentext pt USING(phrase_id) WHERE p.category=" . $db->db_add_param('studierendenantrag', FHC_STRING) . " AND p.phrase=" . $db->db_add_param('grund_Wiederholung_deadline', FHC_STRING) . " AND pt.sprache=" . $db->db_add_param(getSprache(), FHC_STRING) . " LIMIT 1) AS grund
 	FROM
@@ -110,7 +109,6 @@ if (!$db->db_query($query) || !$db->db_num_rows())
 	<?php while($row = $db->db_fetch_object()) { ?>
 		<?php
 			$abmeldedatum = new DateTime($row->abmeldedatum);
-			$abmeldedatum->modify($config['wiederholung_job_deadline_date_modifier']);
 		?>
 		<antrag>
 			<name><![CDATA[<?= trim($row->vorname . ' ' . $row->nachname); ?>]]></name>

From e79a70fc2f7a749fcf4e7a37fb5404e6312793bf Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 9 Jul 2024 14:06:29 +0200
Subject: [PATCH 0890/1461] Betriebsmittel: stabilized

---
 .../v1/betriebsmittel/BetriebsmittelP.php     | 387 +++++++++++-------
 application/core/Auth_Controller.php          |  62 +++
 application/libraries/PermissionLib.php       |  32 +-
 .../ressource/Betriebsmittelperson_model.php  |  18 +-
 public/js/api/betriebsmittel/person.js        |   9 +-
 .../Betriebsmittel/Betriebsmittel.js          | 356 ++++++++--------
 system/phrasesupdate.php                      |  40 ++
 7 files changed, 550 insertions(+), 354 deletions(-)

diff --git a/application/controllers/api/frontend/v1/betriebsmittel/BetriebsmittelP.php b/application/controllers/api/frontend/v1/betriebsmittel/BetriebsmittelP.php
index 8a6d7e340..8e44b2326 100644
--- a/application/controllers/api/frontend/v1/betriebsmittel/BetriebsmittelP.php
+++ b/application/controllers/api/frontend/v1/betriebsmittel/BetriebsmittelP.php
@@ -6,14 +6,16 @@ use \DateTime as DateTime;
 
 class BetriebsmittelP extends FHCAPI_Controller
 {
+	private $person_id = null;
+
 	public function __construct()
 	{
 		parent::__construct([
 			'getAllBetriebsmittel' => ['admin:r', 'assistenz:r'],
-			'addNewBetriebsmittel' => ['admin:r', 'assistenz:r'],
-			'updateBetriebsmittel' => ['admin:r', 'assistenz:r'],
+			'addNewBetriebsmittel' => self::PERM_LOGGED,
+			'updateBetriebsmittel' => self::PERM_LOGGED,
 			'loadBetriebsmittel' => ['admin:r', 'assistenz:r'],
-			'deleteBetriebsmittel' => ['admin:r', 'assistenz:r'],
+			'deleteBetriebsmittel' => self::PERM_LOGGED,
 			'getTypenBetriebsmittel' => ['admin:r', 'assistenz:r'],
 			'loadInventarliste' => ['admin:r', 'assistenz:r']
 		]);
@@ -22,6 +24,29 @@ class BetriebsmittelP extends FHCAPI_Controller
 		$this->load->model('ressource/Betriebsmittel_model', 'BetriebsmittelModel');
 		$this->load->model('ressource/Betriebsmittelperson_model', 'BetriebsmittelpersonModel');
 
+		// Additional Permission Checks
+		if ($this->router->method == 'addNewBetriebsmittel') {
+			$this->person_id = current(array_slice($this->uri->rsegments, 2));
+			
+			$this->checkPermissionsForPerson(
+				$this->person_id,
+				['admin:rw', 'mitarbeiter:rw', 'basis/betriebsmittel:rw'],
+				['admin:rw', 'assistenz:rw', 'basis/betriebsmittel:rw']
+			);
+		} elseif ($this->router->method == 'updateBetriebsmittel' || $this->router->method == 'deleteBetriebsmittel') {
+			$betriebsmittelperson_id = current(array_slice($this->uri->rsegments, 2));
+			$result = $this->BetriebsmittelpersonModel->load($betriebsmittelperson_id);
+			if (!hasData($result))
+				show_404();
+			$this->person_id = current(getData($result))->person_id;
+			
+			$this->checkPermissionsForPerson(
+				$this->person_id,
+				['admin:rw', 'mitarbeiter:rw', 'basis/betriebsmittel:rw'],
+				['admin:rw', 'assistenz:rw', 'basis/betriebsmittel:rw']
+			);
+		}
+
 		// Load Libraries
 		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
 		$this->load->library('form_validation');
@@ -44,187 +69,265 @@ class BetriebsmittelP extends FHCAPI_Controller
 		$this->terminateWithSuccess((getData($result) ?: []));
 	}
 
-	public function addNewBetriebsmittel($person_id)
+	protected function validateNewOrUpdate()
 	{
-		$this->form_validation->set_rules('kaution', 'Kaution', 'numeric', [
-			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Kaution'])
+		$this->form_validation->set_rules('betriebsmitteltyp', 'Typ', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired')
 		]);
 
-		$this->form_validation->set_rules('betriebsmitteltyp', 'TYP', 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Typ'])
+		$this->form_validation->set_rules('kaution', 'Kaution', 'numeric|less_than_equal_to[9999.99]', [
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric')
 		]);
 
-		$this->form_validation->set_rules('ausgegebenam', 'Ausgegeben am', 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Ausgegeben am'])
+		$this->form_validation->set_rules('ausgegebenam', 'Ausgegeben am', 'required|is_valid_date', [
+			'required' => $this->p->t('ui', 'error_fieldRequired')
 		]);
 
-		if ($this->form_validation->run() == false) {
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		if ($this->input->post('ausgegebenam') && $this->input->post('retouram')) {
+			$this->form_validation->set_rules('retouram', 'Retour am', [
+				'is_valid_date',
+				['is_not_before_ausgegebenam', function ($value) {
+					return (new DateTime($value) >= new DateTime($this->input->post('ausgegebenam')));
+				}]
+			], [
+				'is_not_before_ausgegebenam' => $this->p->t('wawi', 'error_retourdatumVorAusgabe')
+			]);
+		} else {
+			$this->form_validation->set_rules('retouram', 'Retour am', 'is_valid_date');
 		}
 
-		$uid_user = getAuthUID();
+		$this->form_validation->set_rules('anmerkung', 'Anmerkung', 'max_length[256]');
+
+		if ($this->input->post('betriebsmitteltyp') == 'Inventar') {
+			// Inventar
+			$this->form_validation->set_rules('betriebsmittel_id', 'Inventarnummer', 'required');
+		} elseif ($this->input->post('betriebsmitteltyp') == 'Zutrittskarte') {
+			// Zutrittskarte
+			if ($this->input->post('nummer') === null && $this->input->post('nummer') === null) {
+				$this->form_validation->set_rules('nummer', 'Nummer', 'required', [
+					'required' => $this->p->t('wawi', 'error_zutrittskarteOhneNummer')
+				]);
+				$this->form_validation->set_rules('nummer2', 'Nummer2', 'required', [
+					'required' => $this->p->t('wawi', 'error_zutrittskarteOhneNummer')
+				]);
+			} else {
+				if ($this->input->post('nummer') === null) {
+					$result = $this->BetriebsmittelpersonModel->loadViewWhere([
+						'betriebsmitteltyp' => $this->input->post('betriebsmitteltyp'),
+						'nummer2' => $this->input->post('nummer2'),
+						'person_id !=' => $this->person_id,
+						'retouram IS NULL' => null
+					]);
+					if (hasData($result))
+						$this->form_validation->set_rules('nummer2', 'Nummer2', 'is_array', [
+							'is_array' => $this->p->t('wawi', 'error_bmZutrittskarteOccupied', (array)current(getData($result)))
+						]);
+				} else {
+					$result = $this->BetriebsmittelpersonModel->loadViewWhere([
+						'betriebsmitteltyp' => $this->input->post('betriebsmitteltyp'),
+						'nummer' => $this->input->post('nummer'),
+						'person_id !=' => $this->person_id,
+						'retouram IS NULL' => null
+					]);
+					if (hasData($result))
+						$this->form_validation->set_rules('nummer', 'Nummer', 'is_array', [
+							'is_array' => $this->p->t('wawi', 'error_bmZutrittskarteOccupied', (array)current(getData($result)))
+						]);
+				}
+			}
+		}
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+	}
+
+	public function addNewBetriebsmittel($person_id)
+	{
+		$this->form_validation->set_rules('uid', 'UID', [
+			['uid_in_person', function ($value) use ($person_id) {
+				if ($value === null)
+					return true;
+				$this->load->model('person/Benutzer_model', 'BenutzerModel');
+				$result = $this->BenutzerModel->loadWhere([
+					'uid' => $value,
+					'person_id' => $person_id
+				]);
+
+				return hasData($result);
+			}]
+		], [
+			'uid_in_person' => $this->p->t('person', 'error_uidNotInPerson')
+		]);
+		$this->validateNewOrUpdate();
+
 		$betriebsmitteltyp = $this->input->post('betriebsmitteltyp');
 		$nummer = $this->input->post('nummer');
 		$nummer2 = $this->input->post('nummer2');
-		$inventarData = $this->input->post('inventarData');
 		$beschreibung = $this->input->post('beschreibung');
-		$kaution = $this->input->post('kaution');
+		$betriebsmittel_id = $this->input->post('betriebsmittel_id');
 		$anmerkung = $this->input->post('anmerkung');
+		$kaution = $this->input->post('kaution');
 		$ausgegebenam = $this->input->post('ausgegebenam');
 		$retouram = $this->input->post('retouram');
 		$uid = $this->input->post('uid');
 
-		if ($inventarData) {
-			$betriebsmitteltyp = $inventarData['betriebsmitteltyp'];
-			$betriebsmittel_id = $inventarData['betriebsmittel_id'];
-		}
+		// NOTE(chris): transform_kartennummer
+		if ($betriebsmitteltyp == 'Zutrittskarte' && $nummer)
+			$nummer = is_numeric($nummer) ? ltrim($nummer, "0") : hexdec(implode("", array_reverse(str_split(trim($nummer)))));
 
-		if ($betriebsmitteltyp == 'Zutrittskarte' && !$nummer) {
-			return $this->terminateWithError($this->p->t('wawi', 'error_zutrittskarteOhneNummer'), self::ERROR_TYPE_GENERAL);
-		}
+		$this->db->trans_start();
 
-		if ($retouram && $retouram < $ausgegebenam) {
-			return $this->terminateWithError($this->p->t('wawi', 'error_retourdatumVorAusgabe'), self::ERROR_TYPE_GENERAL);
-		}
+		if ($betriebsmitteltyp != 'Inventar') {
+			$this->BetriebsmittelModel->addOrder('updateamum', 'DESC');
+			if ($betriebsmitteltyp == 'Zutrittskarte' && $nummer === null) {
+				$result = $this->BetriebsmittelModel->loadWhere([
+					'betriebsmitteltyp' => $betriebsmitteltyp,
+					'nummer2' => $nummer2
+				]);
+			} else {
+				$result = $this->BetriebsmittelModel->loadWhere([
+					'betriebsmitteltyp' => $betriebsmitteltyp,
+					'nummer' => $nummer
+				]);
+			}
+			$data = $this->getDataOrTerminateWithError($result);
 
-		if ($betriebsmitteltyp == "Inventar" && !($inventarData['inventarnummer'])) {
-			return $this->terminateWithError($this->p->t('wawi', 'error_inventarWaehlen'), self::ERROR_TYPE_GENERAL);
-		}
-
-		// Start DB transaction
-		$this->db->trans_begin();
-
-		$betriebsmitteltyp = utf8_decode($betriebsmitteltyp);
-
-		if (!$inventarData) {
-			$result = $this->BetriebsmittelModel->insert(
-				[
+			if ($data) {
+				$data = current($data);
+				if ($data->nummer !== $nummer || $data->nummer2 !== $nummer2 || $data->beschreibung !== $beschreibung) {
+					$result = $this->BetriebsmittelModel->update($data->betriebsmittel_id, [
+						'nummer' => $nummer,
+						'nummer2' => $nummer2,
+						'beschreibung' => $beschreibung,
+						'updateamum' => date('c'),
+						'updatevon' => getAuthUID()
+					]);
+					$this->getDataOrTerminateWithError($result);
+				}
+				$betriebsmittel_id = $data->betriebsmittel_id;
+			} else {
+				$result = $this->BetriebsmittelModel->insert([
 					'betriebsmitteltyp' => $betriebsmitteltyp,
 					'nummer' => $nummer,
 					'nummer2' => $nummer2,
 					'beschreibung' => $beschreibung,
-					'anmerkung' => $anmerkung,
-					'insertvon' => $uid_user,
-					'insertamum' => date('c')
-				]
-			);
-			if ($this->db->trans_status() === false || isError($result)) {
-				$this->db->trans_rollback();
-				return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+					'reservieren' => false,
+					'ort_kurzbz' => null,
+					'insertamum' => date('c'),
+					'insertvon' => getAuthUID(),
+				]);
+				$betriebsmittel_id = $this->getDataOrTerminateWithError($result);
 			}
-			$betriebsmittel_id = $result->retval;
 		}
 
-		$result = $this->BetriebsmittelpersonModel->insert(
-			[
-				'betriebsmittel_id' => $betriebsmittel_id,
-				'person_id' => $person_id,
-				'kaution' => $kaution,
-				'anmerkung' => $anmerkung,
-				'ausgegebenam' => $ausgegebenam,
-				'retouram ' => $retouram,
-				'insertvon' => $uid_user,
-				'insertamum' => date('c'),
-				'uid' => $uid
-			]
-		);
+		$result = $this->BetriebsmittelpersonModel->insert([
+			'person_id' => $person_id,
+			'betriebsmittel_id' => $betriebsmittel_id,
+			'anmerkung' => $anmerkung,
+			'kaution' => $kaution,
+			'ausgegebenam' => $ausgegebenam,
+			'retouram' => $retouram,
+			'uid' => $uid,
+			'insertamum' => date('c'),
+			'insertvon' => getAuthUID()
+		]);
 
-		if ($this->db->trans_status() === false || isError($result)) {
-			$this->db->trans_rollback();
-			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
+		$data = $this->getDataOrTerminateWithError($result);
 
-		$this->db->trans_commit();
-		return $this->terminateWithSuccess(true);
+		$this->db->trans_complete();
+
+		$this->terminateWithSuccess(true);
 	}
 
 	public function updateBetriebsmittel($betriebsmittelperson_id)
 	{
-		$uid_user = getAuthUID();
-		$betriebsmittel_id = $this->input->post('betriebsmittel_id');
+		$this->validateNewOrUpdate();
+
 		$betriebsmitteltyp = $this->input->post('betriebsmitteltyp');
 		$nummer = $this->input->post('nummer');
 		$nummer2 = $this->input->post('nummer2');
 		$beschreibung = $this->input->post('beschreibung');
-		$kaution = $this->input->post('kaution');
+		$betriebsmittel_id = $this->input->post('betriebsmittel_id');
 		$anmerkung = $this->input->post('anmerkung');
+		$kaution = $this->input->post('kaution');
 		$ausgegebenam = $this->input->post('ausgegebenam');
 		$retouram = $this->input->post('retouram');
-		$person_id = $this->input->post('person_id');
-		$uid = $this->input->post('uid');
 
-		$this->form_validation->set_rules('kaution', 'Kaution', 'numeric', [
-			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Kaution'])
+		// NOTE(chris): transform_kartennummer
+		if ($betriebsmitteltyp == 'Zutrittskarte' && $nummer)
+			$nummer = is_numeric($nummer) ? ltrim($nummer, "0") : hexdec(implode("", array_reverse(str_split(trim($nummer)))));
+
+		$this->db->trans_start();
+
+		if ($betriebsmitteltyp != 'Inventar') {
+			$found = false;
+			if ($nummer !== null && $betriebsmittel_id !== null) {
+				$result = $this->BetriebsmittelModel->load($betriebsmittel_id);
+				$data = $this->getDataOrTerminateWithError($result);
+				if ($data && current($data)->nummer == $nummer) {
+					$found = true;
+				}
+			}
+
+			if (!$found) {
+				$this->BetriebsmittelModel->addOrder('updateamum', 'DESC');
+				if ($betriebsmitteltyp == 'Zutrittskarte' && $nummer === null) {
+					$result = $this->BetriebsmittelModel->loadWhere([
+						'betriebsmitteltyp' => $betriebsmitteltyp,
+						'nummer2' => $nummer2
+					]);
+				} else {
+					$result = $this->BetriebsmittelModel->loadWhere([
+						'betriebsmitteltyp' => $betriebsmitteltyp,
+						'nummer' => $nummer
+					]);
+				}
+				$data = $this->getDataOrTerminateWithError($result);
+			}
+
+			if ($data) {
+				$data = current($data);
+				if ($data->nummer !== $nummer || $data->nummer2 !== $nummer2 || $data->beschreibung !== $beschreibung) {
+					$result = $this->BetriebsmittelModel->update($data->betriebsmittel_id, [
+						'nummer' => $nummer,
+						'nummer2' => $nummer2,
+						'beschreibung' => $beschreibung,
+						'updateamum' => date('c'),
+						'updatevon' => getAuthUID()
+					]);
+					$this->getDataOrTerminateWithError($result);
+				}
+				$betriebsmittel_id = $data->betriebsmittel_id;
+			} else {
+				$result = $this->BetriebsmittelModel->insert([
+					'betriebsmitteltyp' => $betriebsmitteltyp,
+					'nummer' => $nummer,
+					'nummer2' => $nummer2,
+					'beschreibung' => $beschreibung,
+					'reservieren' => false,
+					'ort_kurzbz' => null,
+					'insertamum' => date('c'),
+					'insertvon' => getAuthUID(),
+				]);
+				$betriebsmittel_id = $this->getDataOrTerminateWithError($result);
+			}
+		}
+
+		$result = $this->BetriebsmittelpersonModel->update($betriebsmittelperson_id, [
+			'betriebsmittel_id' => $betriebsmittel_id,
+			'anmerkung' => $anmerkung,
+			'kaution' => $kaution,
+			'ausgegebenam' => $ausgegebenam,
+			'retouram' => $retouram,
+			'updateamum' => date('c'),
+			'updatevon' => getAuthUID()
 		]);
 
-		$this->form_validation->set_rules('betriebsmitteltyp', 'TYP', 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Typ'])
-		]);
+		$data = $this->getDataOrTerminateWithError($result);
 
-		$this->form_validation->set_rules('ausgegebenam', 'Ausgegeben am', 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Ausgegeben am'])
-		]);
+		$this->db->trans_complete();
 
-
-		if ($this->form_validation->run() == false) {
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-		}
-
-		if ($betriebsmitteltyp == 'Zutrittskarte' && !$nummer) {
-			return $this->terminateWithError($this->p->t('wawi', 'error_zutrittskarteOhneNummer'), self::ERROR_TYPE_GENERAL);
-		}
-
-		if ($retouram && $retouram < $ausgegebenam) {
-			return $this->terminateWithError($this->p->t('wawi', 'error_retourdatumVorAusgabe'), self::ERROR_TYPE_GENERAL);
-		}
-
-
-		// Start DB transaction
-		$this->db->trans_begin();
-
-		$result = $this->BetriebsmittelpersonModel->update(
-			[
-				'betriebsmittelperson_id' => $betriebsmittelperson_id,
-
-			],
-			[
-				'person_id' => $person_id,
-				'uid' => $uid,
-				'kaution' => $kaution,
-				'anmerkung' => $anmerkung,
-				'ausgegebenam' => $ausgegebenam,
-				'retouram ' => $retouram,
-				'updatevon' => $uid_user,
-				'updateamum' => date('c')
-			]
-		);
-
-		if ($this->db->trans_status() === false || isError($result)) {
-			$this->db->trans_rollback();
-			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-
-		$result = $this->BetriebsmittelModel->update(
-			[
-				'betriebsmittel_id' => $betriebsmittel_id
-			],
-			[
-				'betriebsmitteltyp' => $betriebsmitteltyp,
-				'nummer' => $nummer,
-				'nummer2' => $nummer2,
-				'beschreibung' => $beschreibung,
-				'anmerkung' => $anmerkung,
-				'updatevon' => $uid_user,
-				'updateamum' => date('c')
-			]
-		);
-		if ($this->db->trans_status() === false || isError($result)) {
-			$this->db->trans_rollback();
-			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-
-		$this->db->trans_commit();
-		return $this->terminateWithSuccess(true);
+		$this->terminateWithSuccess(true);
 	}
 
 	public function loadBetriebsmittel($betriebsmittelperson_id)
@@ -274,10 +377,10 @@ class BetriebsmittelP extends FHCAPI_Controller
 	public function loadInventarliste($searchString)
 	{
 		$result = $this->BetriebsmittelModel->loadInventarliste($searchString);
-		if (isError($result)) {
-			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess($result ?: []);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
 	}
 }
 
diff --git a/application/core/Auth_Controller.php b/application/core/Auth_Controller.php
index d170a7eca..e9621332f 100644
--- a/application/core/Auth_Controller.php
+++ b/application/core/Auth_Controller.php
@@ -67,6 +67,68 @@ abstract class Auth_Controller extends FHC_Controller
 		}
 	}
 
+	/**
+	 * Checks for Permissions depending if the given person is a
+	 * Mitarbeiter and/or Student
+	 * and exits/outputs an error if they are not met.
+	 *
+	 * @param integer 				$person_id
+	 * @param array 				$permMa		Perms if the person is a Mitarbeiter
+	 * @param array 				$permStud	Perms if the person is a Student
+	 *
+	 * @return void
+	 */
+	protected function checkPermissionsForPerson($person_id, $permMa, $permStud)
+	{
+		$res = $this->hasPermissionsForPerson($person_id, $permMa, $permStud);
+		
+		if ($res) {
+			$perm = array_keys(array_flip(array_merge($res|1 ? $permMa : [], $res|2 ? $permStud : [])));
+			$this->_outputAuthError([$this->router->method => $perm]);
+		}
+	}
+
+	/**
+	 * Checks for Permissions depending if the given person is a
+	 * Mitarbeiter and/or Student
+	 * and returns the result.
+	 *
+	 * @param integer 				$person_id
+	 * @param array 				$permMa		Perms if the person is a Mitarbeiter
+	 * @param array 				$permStud	Perms if the person is a Student
+	 *
+	 * @return boolean
+	 */
+	protected function hasPermissionsForPerson($person_id, $permMa, $permStud)
+	{
+		$res = 0;
+		$this->load->model('person/Person_model', 'PersonModel');
+		$this->PersonModel->addJoin('public.tbl_benutzer', 'person_id');
+		$this->PersonModel->addJoin('public.tbl_mitarbeiter', 'uid = mitarbeiter_uid');
+		$result = $this->PersonModel->load($person_id);
+		if (hasData($result)) {
+			if ($this->permissionlib->isEntitled(['a' => $permMa], 'a'))
+				return 0;
+			$res = 1;
+		}
+		$this->PersonModel->addJoin('public.tbl_prestudent', 'person_id');
+		$result = $this->PersonModel->load($person_id);
+		if (hasData($result)) {
+			$permStudConverted = [];
+			foreach (getData($result) as $row) {
+				foreach ($permStud as $k => $v) {
+					if (!isset($permStudConverted[$k])) {
+						$permStudConverted[$k] = $this->permissionlib->convertAccessType($v);
+					}
+					if ($this->permissionlib->isBerechtigt($permStudConverted[$k][0], $permStudConverted[$k][1], $row->studiengang_kz))
+						return 0;
+				}
+			}
+			$res += 2;
+		}
+		return $res;
+	}
+
 	/**
 	 * Outputs an error message and sets the HTTP Header.
 	 * This function is protected so that it can be overwritten.
diff --git a/application/libraries/PermissionLib.php b/application/libraries/PermissionLib.php
index bf8174cf4..857defbf7 100644
--- a/application/libraries/PermissionLib.php
+++ b/application/libraries/PermissionLib.php
@@ -147,19 +147,7 @@ class PermissionLib
 							if (strpos($permissions[$pCounter], PermissionLib::PERMISSION_SEPARATOR) !== false)
 							{
 								// Retrieves permission and required access type from the $requiredPermissions array
-								list($permission, $requiredAccessType) = explode(PermissionLib::PERMISSION_SEPARATOR, $permissions[$pCounter]);
-
-								$accessType = '';
-
-								// Set the access type
-								if (strpos($requiredAccessType, PermissionLib::READ_RIGHT) !== false)
-								{
-									$accessType = PermissionLib::SELECT_RIGHT; // S
-								}
-								if (strpos($requiredAccessType, PermissionLib::WRITE_RIGHT) !== false)
-								{
-									$accessType .= PermissionLib::REPLACE_RIGHT.PermissionLib::DELETE_RIGHT; // UID
-								}
+								list($permission, $accessType) = $this->convertAccessType($permissions[$pCounter]);
 
 								if (!isEmptyString($accessType)) // if compliant
 								{
@@ -209,6 +197,24 @@ class PermissionLib
 		return $checkPermissions;
 	}
 
+	/**
+	 * Retrieves permission and required access type from the newly formatted permission string
+	 *
+	 * @param string $permission
+	 *
+	 * @return array
+	 */
+	public function convertAccessType($permission)
+	{
+		list($permission, $reqAccessType) = explode(PermissionLib::PERMISSION_SEPARATOR, $permission);
+		$accessType = '';
+		if (strpos($reqAccessType, PermissionLib::READ_RIGHT) !== false)
+			$accessType = PermissionLib::SELECT_RIGHT;
+		if (strpos($reqAccessType, PermissionLib::WRITE_RIGHT) !== false)
+			$accessType = PermissionLib::REPLACE_RIGHT.PermissionLib::DELETE_RIGHT;
+		return [$permission, $accessType];
+	}
+
 	/**
 	 * Checks if at least one of the permissions given as parameter (requiredPermissions) belongs to the authenticated user
 	 * It checks the given permissions against a given method (controller method name) and a given permission type (R and/or W)
diff --git a/application/models/ressource/Betriebsmittelperson_model.php b/application/models/ressource/Betriebsmittelperson_model.php
index 48c35381f..39f08b5cd 100644
--- a/application/models/ressource/Betriebsmittelperson_model.php
+++ b/application/models/ressource/Betriebsmittelperson_model.php
@@ -109,7 +109,7 @@ class Betriebsmittelperson_model extends DB_Model
 			case 'betriebsmittelperson_id':
 				$cond = 'bmp.betriebsmittelperson_id';
 				break;
-			default:
+			default: 
 				return error("ID nicht gültig");
 		}
 
@@ -125,4 +125,20 @@ class Betriebsmittelperson_model extends DB_Model
 
 		return $this->execQuery($query, array($id));
 	}
+
+	/**
+	 * Perform a loadWhere on the vw_betriebsmittelperson DB View
+	 *
+	 * @param array $where
+	 *
+	 * @return stdClass
+	 */
+	public function loadViewWhere($where)
+	{
+		$table = $this->dbTable;
+		$this->dbTable = 'public.vw_betriebsmittelperson';
+		$result = $this->loadWhere($where);
+		$this->dbTable = $table;
+		return $result;
+	}
 }
diff --git a/public/js/api/betriebsmittel/person.js b/public/js/api/betriebsmittel/person.js
index 13138de55..7ad6d49b7 100644
--- a/public/js/api/betriebsmittel/person.js
+++ b/public/js/api/betriebsmittel/person.js
@@ -2,16 +2,16 @@ export default {
 	getAllBetriebsmittel(url, config, params){
 		return this.$fhcApi.get('api/frontend/v1/betriebsmittel/betriebsmittelP/getAllBetriebsmittel/' + params.type + '/' + params.id);
 	},
-	addNewBetriebsmittel(person_id, formData) {
-		return this.$fhcApi.post('api/frontend/v1/betriebsmittel/betriebsmittelP/addNewBetriebsmittel/' +
+	addNewBetriebsmittel(form, person_id, formData) {
+		return this.$fhcApi.post(form, 'api/frontend/v1/betriebsmittel/betriebsmittelP/addNewBetriebsmittel/' +
 			person_id, formData
 		);
 	},
 	loadBetriebsmittel(betriebsmittelperson_id){
 		return this.$fhcApi.post('api/frontend/v1/betriebsmittel/betriebsmittelP/loadBetriebsmittel/' + betriebsmittelperson_id);
 	},
-	updateBetriebsmittel(betriebsmittelperson_id, formData) {
-		return this.$fhcApi.post('api/frontend/v1/betriebsmittel/betriebsmittelP/updateBetriebsmittel/' + betriebsmittelperson_id,
+	updateBetriebsmittel(form, betriebsmittelperson_id, formData) {
+		return this.$fhcApi.post(form, 'api/frontend/v1/betriebsmittel/betriebsmittelP/updateBetriebsmittel/' + betriebsmittelperson_id,
 			formData);
 	},
 	deleteBetriebsmittel(betriebsmittelperson_id){
@@ -21,7 +21,6 @@ export default {
 		return this.$fhcApi.get('api/frontend/v1/betriebsmittel/betriebsmittelP/getTypenBetriebsmittel/');
 	},
 	loadInventarliste(query){
-		console.log(query);
 		return this.$fhcApi.get('api/frontend/v1/betriebsmittel/betriebsmittelP/loadInventarliste/' +	query);
 	}
 }
\ No newline at end of file
diff --git a/public/js/components/Betriebsmittel/Betriebsmittel.js b/public/js/components/Betriebsmittel/Betriebsmittel.js
index 38563633f..e0ebe904d 100644
--- a/public/js/components/Betriebsmittel/Betriebsmittel.js
+++ b/public/js/components/Betriebsmittel/Betriebsmittel.js
@@ -1,19 +1,15 @@
-import VueDatePicker from '../vueDatepicker.js.php';
 import {CoreFilterCmpt} from "../filter/Filter.js";
-import PvAutoComplete from "../../../../index.ci.php/public/js/components/primevue/autocomplete/autocomplete.esm.min.js";
 
 import BsModal from "../Bootstrap/Modal.js";
-import FormForm from '../Form/Form.js';
+import CoreForm from '../Form/Form.js';
 import FormInput from '../Form/Input.js';
 
 export default {
 	components: {
 		CoreFilterCmpt,
-		VueDatePicker,
 		BsModal,
-		FormForm,
-		FormInput,
-		PvAutoComplete
+		CoreForm,
+		FormInput
 	},
 	inject: {
 		cisRoot: {
@@ -52,11 +48,11 @@ export default {
 					{title: "Anmerkung", field: "anmerkung", visible: false},
 					{title: "Retourdatum", field: "format_retour", width: 128},
 					{title: "Beschreibung", field: "beschreibung"},
-					{title: "Uid", field: "uid", width: 87},
+					{title: "UID", field: "uid", width: 87},
 					{title: "Kaution", field: "kaution", visible: false},
-					{title: "Ausgabedatum", field: "format_ausgabe", width: 144},
-					{title: "Betriebsmittel_id", field: "betriebsmittel_id", visible: false},
-					{title: "Betriebsmittelperson_id", field: "betriebsmittelperson_id", visible: false},
+					{title: "Ausgabedatum", field: "format_ausgabe", width: 144, visible: false},
+					{title: "Betriebsmittel ID", field: "betriebsmittel_id", visible: false},
+					{title: "Betriebsmittelperson ID", field: "betriebsmittelperson_id", visible: false},
 					{
 						title: 'Aktionen', field: 'actions',
 						minWidth: 150, // Ensures Action-buttons will be always fully displayed
@@ -142,11 +138,9 @@ export default {
 					}
 				}
 			],
-			betriebsmittelData: {},
-			betriebsmittelperson_id : null,
 			listBetriebsmitteltyp: [],
 			formData: {
-				ausgegebenam : this.getDefaultDate(),
+				ausgegebenam : new Date(),
 				betriebsmitteltyp: 'Zutrittskarte'
 			},
 			statusNew: true,
@@ -154,95 +148,89 @@ export default {
 		}
 	},
 	watch: {
-		uid() {
-			this.$refs.table.tabulator.setData(this.endpoint.getAllBetriebsmittel + '/' + this.typeId + '/' + this.id);
+		id() {
+			this.$refs.table.tabulator.setData('dummy', {type: this.typeId, id: this.id});
 		}
 	},
 	methods: {
 		actionEditBetriebsmittel(betriebsmittelperson_id) {
 			this.statusNew = false;
-			this.loadBetriebsmittel(betriebsmittelperson_id);
-			this.$refs.betriebsmittelModal.show();
+			this
+				.loadBetriebsmittel(betriebsmittelperson_id)
+				.then(this.$refs.betriebsmittelModal.show);
 		},
 		actionNewBetriebsmittel() {
 			this.resetModal();
 			this.$refs.betriebsmittelModal.show();
-			this.statusNew = true;
-			this.formData.ausgegebenam = this.getDefaultDate();
-			this.reload();
 		},
 		actionDeleteBetriebsmittel(betriebsmittelperson_id) {
-			this.loadBetriebsmittel(betriebsmittelperson_id).then(() => {
-				this.$refs.deleteBetriebsmittelModal.show();
-			});
+			this.$fhcAlert
+				.confirmDelete()
+				.then(result => result
+					? betriebsmittelperson_id
+					: Promise.reject({handled: true}))
+				.then(this.endpoint.deleteBetriebsmittel)
+				.then(result => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
+					window.scrollTo(0, 0);
+					this.reload();
+				})
+				.catch(this.$fhcAlert.handleSystemError);
 		},
 		addNewBetriebsmittel() {
 			//just append uid to formdata
 			this.formData.uid = this.uid;
-			return this.endpoint.addNewBetriebsmittel(this.id, this.formData)
+			if (this.formData.betriebsmitteltyp == 'Inventar')
+				this.formData.betriebsmittel_id = this.formData.inventarData?.betriebsmittel_id;
+			return this.endpoint
+				.addNewBetriebsmittel(this.$refs.betriebsmittelData, this.id, this.formData)
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
-					this.hideModal('betriebsmittelModal');
+					this.$refs.betriebsmittelModal.hide();
 					this.resetModal();
-				}).catch(this.$fhcAlert.handleSystemError)
-				.finally(() => {
 					window.scrollTo(0, 0);
 					this.reload();
-				});
-		},
-		deleteBetriebsmittel(betriebsmittelperson_id) {
-			return this.endpoint.deleteBetriebsmittel(betriebsmittelperson_id)
-				.then(
-					result => {
-						this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
-						this.hideModal('deleteBetriebsmittelModal');
-						this.resetModal();
-					})
-				.catch(this.$fhcAlert.handleSystemError)
-				.finally(() => {
-					window.scrollTo(0, 0);
-					this.reload();
-				});
+				})
+				.catch(this.$fhcAlert.handleSystemError);
 		},
 		updateBetriebsmittel(betriebsmittelperson_id) {
-			this.formData.uid = this.uid;
-			return this.endpoint.updateBetriebsmittel(betriebsmittelperson_id, this.formData)
-			.then(response => {
-				this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
-				this.hideModal('betriebsmittelModal');
-				this.resetModal();
-			}).catch(this.$fhcAlert.handleSystemError)
-				.finally(() => {
+			if (this.formData.betriebsmitteltyp == 'Inventar')
+				this.formData.betriebsmittel_id = this.formData.inventarData?.betriebsmittel_id;
+			return this.endpoint
+				.updateBetriebsmittel(this.$refs.betriebsmittelData, betriebsmittelperson_id, this.formData)
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+					this.$refs.betriebsmittelModal.hide();
+					this.resetModal();
 					window.scrollTo(0, 0);
 					this.reload();
-				});
+				})
+				.catch(this.$fhcAlert.handleSystemError);
 		},
 		loadBetriebsmittel(betriebsmittelperson_id) {
 			this.resetModal();
 			this.statusNew = false;
-			return this.endpoint.loadBetriebsmittel(betriebsmittelperson_id)
-				.then(result => result.data)
+			return this.endpoint
+				.loadBetriebsmittel(betriebsmittelperson_id)
 				.then(result => {
-					this.formData = result;
+					this.formData = result.data;
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
 		searchInventar(event) {
 			const encodedQuery = encodeURIComponent(event.query);
-			return this.endpoint.loadInventarliste(encodedQuery)
+			return this.endpoint
+				.loadInventarliste(encodedQuery)
 				.then(result => {
-					this.filteredInventar = result.data.retval;
+					this.filteredInventar = result.data;
 				});
 		},
 		reload() {
 			this.$refs.table.reloadTable();
 		},
-		hideModal(modalRef) {
-			this.$refs[modalRef].hide();
-		},
 		resetModal() {
 			this.formData = {};
-			this.formData.ausgegebenam = this.getDefaultDate();
+			this.formData.ausgegebenam = new Date();
 			this.formData.retouram = null;
 			this.formData.betriebsmitteltyp = null;
 			this.formData.nummer = null;
@@ -250,34 +238,19 @@ export default {
 			this.formData.kaution = null;
 			this.formData.anmerkung = null;
 			this.formData.beschreibung = null;
-			this.betriebsmittelperson_id = {};
 			this.statusNew = true;
-		},
-		getDefaultDate() {
-			const today = new Date();
-			return today;
 		}
 	},
-	created(){
-		return this.endpoint.getTypenBetriebsmittel()
-			.then(result => result.data)
+	created() {
+		return this.endpoint
+			.getTypenBetriebsmittel()
 			.then(result => {
-				this.listBetriebsmitteltyp = result;
+				this.listBetriebsmitteltyp = result.data;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 	},
 	template: `
 	<div class="core-betriebsmittel h-100 d-flex flex-column">
-		
-		<!--Modal: deleteBetriebsmittelModal-->
-		<BsModal ref="deleteBetriebsmittelModal">
-			<template #title>{{$p.t('ui', 'betriebsmittel_delete')}}</template>
-			<template #default><p>{{$p.t('ui', 'betriebsmittel_confirm_delete')}}</p></template>
-			<template #footer>
-				<button ref="Close" type="button" class="btn btn-primary" @click="deleteBetriebsmittel(formData.betriebsmittelperson_id)">OK</button>
-			</template>
-		</BsModal>
-		
 		<core-filter-cmpt
 			ref="table"
 			:tabulator-options="tabulatorOptions"
@@ -297,12 +270,11 @@ export default {
 				<p v-if="statusNew" class="fw-bold mt-3">{{$p.t('ui', 'add_betriebsmittel')}}</p>
 				<p v-else class="fw-bold mt-3">{{$p.t('ui', 'edit_betriebsmittel')}}</p>
 			</template>
-		
-			<form-form class="row g-3" ref="betriebsmittelData">		
+			
+			<core-form class="row g-3" ref="betriebsmittelData">		
 				<legend>Details</legend>
-					
-					<div class="row mb-3">
-						<form-input
+				<div class="row mb-3">
+					<form-input
 						type="select"
 						:label="$p.t('global/typ')"
 						name="typ"
@@ -316,121 +288,119 @@ export default {
 							>
 							{{entry.beschreibung}}
 						</option>
-						</form-input>
-					</div>
+					</form-input>
+				</div>
+			
+				<div v-if="formData.betriebsmitteltyp == 'Inventar'" class="row mb-3">
+					<form-input
+						type="autocomplete"
+						:label="$p.t('wawi/inventarnummer')"
+						name="betriebsmittel_id"
+						v-model="formData.inventarData"
+						option-label="dropdowntext" 
+						:suggestions="filteredInventar" 
+						@complete="searchInventar" 
+						:min-length="3"
+						>
+					</form-input>
+				</div>
+				<div v-else-if="formData.inventarnummer" class="row mb-3">
+					<form-input
+						type="text"
+						:label="$p.t('wawi/inventarnummer')"
+						name="inventarnummer"
+						v-model="formData.inventarnummer"
+						:disabled="!statusNew"
+						>
+					</form-input>
+				</div>
 				
-					<div v-if="formData.betriebsmitteltyp == 'Inventar'" class="row mb-3">
-						<form-input
-							type="autocomplete"
-							:label="$p.t('wawi/inventarnummer')"
-							name="inventarnummer"
-							v-model="formData.inventarData"
-							optionLabel="dropdowntext" 
-							:suggestions="filteredInventar" 
-							@complete="searchInventar" 
-							minLength="3"
+				<div v-if="formData.betriebsmitteltyp!='Inventar' && !formData.inventarnummer" class="row mb-3">
+					<form-input
+						type="text"
+						:label="$p.t('wawi/nummer')"
+						name="nummer"
+						v-model="formData['nummer']"
 						>
-						</form-input>
-					</div>
-					<div v-else-if="formData.inventarnummer" class="row mb-3">
-						<form-input
-							type="text"
-							:label="$p.t('wawi/inventarnummer')"
-							name="inventarnummer"
-							v-model="formData.inventarnummer"
-							:disabled="!statusNew"
-						>
-						</form-input>
-					</div>
-					
-					<div v-if="formData.betriebsmitteltyp!='Inventar' && !formData.inventarnummer" class="row mb-3">
-						<form-input
-							type="text"
-							:label="$p.t('wawi/nummer')"
-							name="nummer"
-							v-model="formData['nummer']"
-						>
-						</form-input>
-					</div>
-					
-					<div v-if="formData.betriebsmitteltyp!='Inventar' && !formData.inventarnummer" class="row mb-3">
-						<form-input
-							type="text"
-							:label="$p.t('wawi/nummer') + ' 2'"
-							name="nummer2"
-							v-model="formData['nummer2']"
-						>
-						</form-input>
-					</div>
+					</form-input>
+				</div>
 				
-					<div v-if="formData.betriebsmitteltyp!='Inventar'" class="row mb-3">
-						<form-input
-							type="textarea"
-							:label="$p.t('global/beschreibung')"
-							name="beschreibung"
-							v-model="formData['beschreibung']"
-							:disabled="formData.inventarnummer"
+				<div v-if="formData.betriebsmitteltyp!='Inventar' && !formData.inventarnummer" class="row mb-3">
+					<form-input
+						type="text"
+						:label="$p.t('wawi/nummer') + ' 2'"
+						name="nummer2"
+						v-model="formData['nummer2']"
 						>
-						</form-input>
-					</div>
-					
-					<div class="row mb-3">
-						<form-input
-							type="text"
-							:label="$p.t('infocenter/kaution')"
-							name="kaution"
-							v-model="formData['kaution']"
+					</form-input>
+				</div>
+			
+				<div v-if="formData.betriebsmitteltyp!='Inventar'" class="row mb-3">
+					<form-input
+						type="textarea"
+						:label="$p.t('global/beschreibung')"
+						name="beschreibung"
+						v-model="formData['beschreibung']"
+						:disabled="formData.inventarnummer"
 						>
-						</form-input>
-					</div>
-					
-					<div class="row mb-3">
-						<form-input
-							type="textarea"
-							:label="$p.t('global/anmerkung')"
-							name="anmerkung"
-							v-model="formData['anmerkung']"
-						>
-						</form-input>
-					</div>
-					
-					<div class="row mb-3">
-						<form-input
-							type="DatePicker"
-							:label="$p.t('wawi/ausgegebenam')"
-							name="datum"
-							v-model="formData['ausgegebenam']"
-							auto-apply
-							:enable-time-picker="false"
-							format="dd.MM.yyyy"
-							preview-format="dd.MM.yyyy"
-							:teleport="true"
-						></form-input>
-					</div>
-					
-					<div class="row mb-3">
-						<form-input
-							type="DatePicker"
-							:label="$p.t('wawi/retouram')"
-							name="datum"
-							v-model="formData['retouram']"
-							auto-apply
-							:enable-time-picker="false"
-							format="dd.MM.yyyy"
-							preview-format="dd.MM.yyyy"
-							:teleport="true"
-						></form-input>
-					</div>
-				</form-form>
+					</form-input>
+				</div>
 				
-				<template #footer>
-					<button v-if="statusNew"  ref="Close" type="button" class="btn btn-primary" @click="addNewBetriebsmittel()">{{$p.t('ui', 'speichern')}}</button>
-
-					<button v-else  ref="Close" type="button" class="btn btn-primary" @click="updateBetriebsmittel(formData.betriebsmittelperson_id)">{{$p.t('ui', 'speichern')}}</button>
-				</template>
-					
+				<div class="row mb-3">
+					<form-input
+						type="text"
+						:label="$p.t('infocenter/kaution')"
+						name="kaution"
+						v-model="formData['kaution']"
+						>
+					</form-input>
+				</div>
+				
+				<div class="row mb-3">
+					<form-input
+						type="textarea"
+						:label="$p.t('global/anmerkung')"
+						name="anmerkung"
+						v-model="formData['anmerkung']"
+						>
+					</form-input>
+				</div>
+				
+				<div class="row mb-3">
+					<form-input
+						type="DatePicker"
+						:label="$p.t('wawi/ausgegebenam')"
+						name="datum"
+						v-model="formData['ausgegebenam']"
+						auto-apply
+						:enable-time-picker="false"
+						format="dd.MM.yyyy"
+						preview-format="dd.MM.yyyy"
+						:teleport="true"
+						>
+					</form-input>
+				</div>
+				
+				<div class="row mb-3">
+					<form-input
+						type="DatePicker"
+						:label="$p.t('wawi/retouram')"
+						name="datum"
+						v-model="formData['retouram']"
+						auto-apply
+						:enable-time-picker="false"
+						format="dd.MM.yyyy"
+						preview-format="dd.MM.yyyy"
+						:teleport="true"
+						>
+					</form-input>
+				</div>
+			</core-form>
+			
+			<template #footer>
+				<button type="button" class="btn btn-primary" @click="statusNew ? addNewBetriebsmittel() : updateBetriebsmittel(formData.betriebsmittelperson_id)">{{$p.t('ui', 'speichern')}}</button>
+			</template>
 		</bs-modal>
-				
 	</div>`
 }
 
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 3b819a256..0de6eb923 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -2522,6 +2522,26 @@ $phrases = array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'error_uidNotInPerson',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Die angegebene UID passt nicht zu der angegebenen Person',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Given UID is not assigned to the given Person',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 
 	//****************	CORE/lehre
 	array(
@@ -27016,6 +27036,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'wawi',
+		'phrase' => 'error_bmZutrittskarteOccupied',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Diese Zutrittskarte ist bereits ausgegeben an: {vorname} {nachname} ({uid})',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'This access card has already been issued to: {vorname} {nachname} ({uid})',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'wawi',

From 56080f6681c83915d6746a5d06c8c8085f3d8239 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 9 Jul 2024 15:28:28 +0200
Subject: [PATCH 0891/1461] changes the LVUebersicht and the endpoint

---
 addons/template/cis/index.html                |   0
 addons/template/cis/init.js.php               |  44 --------
 addons/template/cis/vorlage_profil_array.php  |  55 ----------
 addons/template/content/index.html            |   0
 addons/template/content/init.js.php           |  90 ----------------
 addons/template/dbcheck.php                   | 101 ------------------
 addons/template/index.html                    |   0
 addons/template/install.php                   |  66 ------------
 addons/template/locale/README.txt             |   6 --
 addons/template/locale/index.html             |   0
 addons/template/soap/index.html               |   0
 addons/template/system/index.html             |   0
 addons/template/system/vorlage_zip/README.txt |   2 -
 addons/template/version.php                   |  29 -----
 addons/template/vilesci/index.php             |  44 --------
 addons/template/vilesci/init.js.php           |  44 --------
 addons/template/vilesci/menu.inc.php          |  44 --------
 .../vilesci/vorlage_generateuid.inc.php       |  69 ------------
 .../template/vilesci/vorlage_passwort.inc.php |  39 -------
 .../vilesci/vorlage_serviceterminal.inc.php   |  72 -------------
 addons/template/xml/index.html                |   0
 .../controllers/api/frontend/v1/LvMenu.php    |  38 ++++---
 .../models/education/Lehreinheit_model.php    |  19 ++--
 application/views/CisHtml/Dashboard.php       |   3 +-
 public/js/api/addons.js                       |  11 +-
 public/js/components/Cis/Mylv/LvUebersicht.js |  57 ++--------
 .../Cis/Profil/MitarbeiterProfil.js           |   6 ++
 public/js/components/Dashboard/Dashboard.js   |   8 --
 28 files changed, 58 insertions(+), 789 deletions(-)
 delete mode 100755 addons/template/cis/index.html
 delete mode 100755 addons/template/cis/init.js.php
 delete mode 100755 addons/template/cis/vorlage_profil_array.php
 delete mode 100755 addons/template/content/index.html
 delete mode 100755 addons/template/content/init.js.php
 delete mode 100755 addons/template/dbcheck.php
 delete mode 100755 addons/template/index.html
 delete mode 100755 addons/template/install.php
 delete mode 100755 addons/template/locale/README.txt
 delete mode 100755 addons/template/locale/index.html
 delete mode 100755 addons/template/soap/index.html
 delete mode 100755 addons/template/system/index.html
 delete mode 100755 addons/template/system/vorlage_zip/README.txt
 delete mode 100755 addons/template/version.php
 delete mode 100755 addons/template/vilesci/index.php
 delete mode 100755 addons/template/vilesci/init.js.php
 delete mode 100755 addons/template/vilesci/menu.inc.php
 delete mode 100755 addons/template/vilesci/vorlage_generateuid.inc.php
 delete mode 100755 addons/template/vilesci/vorlage_passwort.inc.php
 delete mode 100755 addons/template/vilesci/vorlage_serviceterminal.inc.php
 delete mode 100755 addons/template/xml/index.html

diff --git a/addons/template/cis/index.html b/addons/template/cis/index.html
deleted file mode 100755
index e69de29bb..000000000
diff --git a/addons/template/cis/init.js.php b/addons/template/cis/init.js.php
deleted file mode 100755
index 174f620ed..000000000
--- a/addons/template/cis/init.js.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/* Copyright (C) 2015 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 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- *
- * Authors: Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at>
- */
-/**
- * Initialisierung des Addons
- */
-?>
-if(typeof addon =='undefined')
-	var addon=Array();
-
-addon.push( 
-{
-	init: function(page, params) 
-	{
-		// Diese Funktion wird nach dem Laden der Seite im CIS aufgerufen
-
-		/*
-		switch(page)
-		{
-			case 'cis/private/tools/zeitaufzeichnung.php':
-				break;
-
-			default:
-				break;
-		}
-		*/
-	}
-});
diff --git a/addons/template/cis/vorlage_profil_array.php b/addons/template/cis/vorlage_profil_array.php
deleted file mode 100755
index 3b4a04a65..000000000
--- a/addons/template/cis/vorlage_profil_array.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/* Copyright (C) 2014 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 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- *
- * Authors: Andreas Österreicher <andreas.oesterreicher@technikum-wien.at>
- */
-/**
- * Diese Datei fügt zusätzliche Links im CIS Profil ein
- * Dazu muss die Datei umbenannt werden in profil_array.php
- *
- * Dazu wird ein Array aufgebaut welches die Links enthaelt.
- * 
- * $menu = array('MeinLink'=>array('name'=>'Name des Links','link'=>'../path/to/file.php','target'='content'));
- */
-
-
-// Unterschiedliche Links für Studierende und Mitarbeiter
-if($type=='student')
-{
-	if(!$ansicht)
-		$menu['Notenliste']=array('name'=>$p->t('profil/leistungsbeurteilung'), 'link'=>'../lehre/notenliste.php', 'target'=>'content');
-	$menu['LVPlan']=array('name'=>$p->t('profil/lvplanVon').' '.$user->nachname, 'link'=>'../lvplan/stpl_week.php?pers_uid='.$user->uid.'&type=student', 'target'=>'content');	
-}
-else
-{
-	if(!$ansicht)
-	{
-		$menu['Zeitwunsch']=array('name'=>$p->t('profil/zeitwuensche'), 'link'=>'zeitwunsch.php?uid='.$user->uid, 'target'=>'content');
-		$menu['Lehrveranstaltungen']=array('name'=>$p->t('lvaliste/lehrveranstaltungen'), 'link'=>'lva_liste.php?uid='.$user->uid, 'target'=>'content');
-	}
-
-	if(check_lektor(get_uid()))
-	{
-		$menu['Zeitsperren']=array('name'=>$p->t('profil/zeitsperrenVon').' '.$user->nachname, 'link'=>'zeitsperre_days.php?days=30&lektor='.$user->uid, 'target'=>'content');
-	}
-
-	if($uid!=get_uid())
-	{
-		$menu['LVPlan']=array('name'=>$p->t('profil/lvplanVon').' '.$user->nachname, 'link'=>'../lvplan/stpl_week.php?pers_uid='.$user->uid.'&type=lektor', 'target'=>'content');
-	}
-}
-?>
diff --git a/addons/template/content/index.html b/addons/template/content/index.html
deleted file mode 100755
index e69de29bb..000000000
diff --git a/addons/template/content/init.js.php b/addons/template/content/init.js.php
deleted file mode 100755
index 4209c2f12..000000000
--- a/addons/template/content/init.js.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/* Copyright (C) 2013 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 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- *
- * Authors: Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at>
- */
-/**
- * Initialisierung des Addons
- */
-?>
-addon.push( 
-{
-	init: function() 
-	{
-		// Diese Funktion wird nach dem Laden des FAS aufgerufen
-
-		/*
-
-		// Hinzufuegen eines zusaetzlichen Tabs bei Mitarbeitern mit einem Label darin
-		var tabitem = document.createElement("tab");
-		tabitem.setAttribute("id","addon-template-tab");
-		tabitem.setAttribute("label","Template");
-
-		var mitarbeitertabs = document.getElementById("mitarbeiter-tabs");
-		mitarbeitertabs.appendChild(tabitem);
-
-		var tabpanelitem = document.createElement("vbox");
-		tabpanelitem.setAttribute("id","addon-template-tabpannel-vbox");
-		var label = document.createElement("label");
-		label.setAttribute("value","Template");
-		tabpanelitem.appendChild(label);
-
-		var mitarbeitertabpanels=document.getElementById("mitarbeiter-tabpanels-main");
-		mitarbeitertabpanels.appendChild(tabpanelitem);
-
-		// zusaetzliche Funktion beim klicken des Suchen Button bei Mitarbeitern hinzufuegen
-		searchbutton = document.getElementById("mitarbeiter-toolbar-button-search");
-		searchbutton.addEventListener("command",AddonTemplateMitarbeiterSearch, true);
-
-		// Menuepunkt hinzufuegen
-		statistikmenue = document.getElementById("menu-statistic-popup");
-
-		var menuentry = document.createElement("menuitem");
-		menuentry.setAttribute("id","addons-template-mymenuentry");
-		menuentry.setAttribute("label","Addon Template Menu Entry");
-		menuentry.addEventListener("command",AddonTemplateMenuEntry, true);
-	
-		statistikmenue.appendChild(menuentry);
-		
-		*/
-	},
-	selectMitarbeiter: function(person_id, mitarbeiter_uid)
-	{
-	},
-	selectStudent: function(person_id, prestudent_id, student_uid)
-	{
-	},
-	selectVerband: function(item)
-	{
-	},
-	selectInstitut: function(institut)
-	{
-	},
-	selectLektor: function(lektor)
-	{
-	}
-});
-
-function AddonTemplateMitarbeiterSearch()
-{
-	alert("AddonTemplateSearchButtonClicked");
-}
-
-function AddonTemplateMenuEntry()
-{
-	alert("AddonTemplateMenuEntry clicked");
-}
diff --git a/addons/template/dbcheck.php b/addons/template/dbcheck.php
deleted file mode 100755
index a5f9e8b30..000000000
--- a/addons/template/dbcheck.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/* Copyright (C) 2013 FH 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.
- *
- */
-/**
- * FH-Complete Addon Template Datenbank Check
- *
- * Prueft und aktualisiert die Datenbank
- */
-require_once('../../config/system.config.inc.php');
-require_once('../../include/basis_db.class.php');
-require_once('../../include/functions.inc.php');
-require_once('../../include/benutzerberechtigung.class.php');
-
-// Datenbank Verbindung
-$db = new basis_db();
-
-echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<link rel="stylesheet" href="../../skin/fhcomplete.css" type="text/css">
-	<link rel="stylesheet" href="../../skin/vilesci.css" type="text/css">
-	<title>Addon Datenbank Check</title>
-</head>
-<body>
-<h1>Addon Datenbank Check</h1>';
-
-$uid = get_uid();
-$rechte = new benutzerberechtigung();
-$rechte->getBerechtigungen($uid);
-
-if(!$rechte->isBerechtigt('basis/addon', null, 'suid'))
-{
-	exit('Sie haben keine Berechtigung für die Verwaltung von Addons');
-}
-
-echo '<h2>Aktualisierung der Datenbank</h2>';
-
-// Code fuer die Datenbankanpassungen
-
-/*
-if(!$result = @$db->db_query("SELECT 1 FROM addon.tbl_template_items"))
-{
-
-	$qry = 'CREATE TABLE addon.tbl_template_items
-			(
-				template_items_kurzbz varchar(32),
-				bezeichnung varchar(256)
-			);';
-
-	if(!$db->db_query($qry))
-		echo '<strong>addon.tbl_template_items: '.$db->db_last_error().'</strong><br>';
-	else
-		echo ' addon.tbl_template_items: Tabelle addon.template_items hinzugefuegt!<br>';
-
-}
-*/
-
-echo '<br>Aktualisierung abgeschlossen<br><br>';
-echo '<h2>Gegenprüfung</h2>';
-
-
-// Liste der verwendeten Tabellen / Spalten des Addons
-$tabellen=array(
-	"addon.tbl_template_items"  => array("template_items_kurzbz","bezeichnung"),
-);
-
-
-$tabs=array_keys($tabellen);
-$i=0;
-foreach ($tabellen AS $attribute)
-{
-	$sql_attr='';
-	foreach($attribute AS $attr)
-		$sql_attr.=$attr.',';
-	$sql_attr=substr($sql_attr, 0, -1);
-
-	if (!@$db->db_query('SELECT '.$sql_attr.' FROM '.$tabs[$i].' LIMIT 1;'))
-		echo '<BR><strong>'.$tabs[$i].': '.$db->db_last_error().' </strong><BR>';
-	else
-		echo $tabs[$i].': OK - ';
-	flush();
-	$i++;
-}
-?>
diff --git a/addons/template/index.html b/addons/template/index.html
deleted file mode 100755
index e69de29bb..000000000
diff --git a/addons/template/install.php b/addons/template/install.php
deleted file mode 100755
index d9644bd3e..000000000
--- a/addons/template/install.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/* Copyright (C) 2013 FH 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.
- *
- */
-/**
- * FH-Complete Addon Template Installation
- *
- * Installationsscript zur Erstinitialisierung des Addons
- */
-require_once('version.php');
-require_once('../../version.php');
-require_once('../../config/system.config.inc.php');
-require_once('../../include/functions.inc.php');
-require_once('../../include/benutzerberechtigung.class.php');
-
-echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<link rel="stylesheet" href="../../skin/fhcomplete.css" type="text/css">
-	<link rel="stylesheet" href="../../skin/vilesci.css" type="text/css">
-	<title>Addon Installation</title>
-</head>
-<body>
-<h1>Addon Installation</h1>';
-
-$uid = get_uid();
-$rechte = new benutzerberechtigung();
-$rechte->getBerechtigungen($uid);
-
-if(!$rechte->isBerechtigt('basis/addon', null, 'suid'))
-{
-	exit('Sie haben keine Berechtigung für die Verwaltung von Addons');
-}
-
-if($fhcomplete_version>=$fhcomplete_target_version)
-{
-	echo 'Installiere Addon <span class="marked">'.$addon_name.'</span> Version <span class="marked">'.$addon_version.'</span><br><br>';
-
-	/**
-	 * Fuegen Sie hier Ihre Installationsroutine hinzu
-	 */
-
- 	echo '<a href="dbcheck.php">&gt;&gt; weiter zur Aktualisierung der Datenbank</a>';
-}
-else
-{
-	echo 'Dieses Addon funktioniert erst mit FHComplete Version '.$fhcomplete_target_version;
-	echo 'Installation abgebrochen';
-}
-?>
diff --git a/addons/template/locale/README.txt b/addons/template/locale/README.txt
deleted file mode 100755
index fcf4930cd..000000000
--- a/addons/template/locale/README.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-In diesem Ordner können Locale-Dateien abgelegt werden.
-Diese überschreiben globale Locales die unter /locale/ abgelegt sind.
-
-In den Dateien müssen nicht alle Phrasen vorhanden sein. Es genügt, wenn nur die Phrasen vorhanden sind die überschrieben werden sollen. Alle anderen Phrasen werden aus dem Standard-Ordner übernommen.
-
-Die Datei mit der Phrase muss jedoch den selben Namen haben wie die Ursprungsdatei in der die Phrase enthalten ist.
diff --git a/addons/template/locale/index.html b/addons/template/locale/index.html
deleted file mode 100755
index e69de29bb..000000000
diff --git a/addons/template/soap/index.html b/addons/template/soap/index.html
deleted file mode 100755
index e69de29bb..000000000
diff --git a/addons/template/system/index.html b/addons/template/system/index.html
deleted file mode 100755
index e69de29bb..000000000
diff --git a/addons/template/system/vorlage_zip/README.txt b/addons/template/system/vorlage_zip/README.txt
deleted file mode 100755
index 33c9e2414..000000000
--- a/addons/template/system/vorlage_zip/README.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-In diesem Ordner können modifizierte ODT Vorlagen für die Dokumentenerstellung abgelegt werden. 
-Vorlagen die in diesem Ordner abgelegt werden, werden bevorzugt gegenüber jenen die unter /system/vorlage_zip abgelegt sind.
diff --git a/addons/template/version.php b/addons/template/version.php
deleted file mode 100755
index 447a26c2a..000000000
--- a/addons/template/version.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/* Copyright (C) 2013 FH 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.
- *
- */
-
-// Name des Addons
-$addon_name = 'Template';
-
-// Versionsnummer des Addons
-$addon_version = '0.01';
-
-// FH-Complete Min-Version
-$fhcomplete_target_version = '2.2';
-
-?>
diff --git a/addons/template/vilesci/index.php b/addons/template/vilesci/index.php
deleted file mode 100755
index 6ed5cbfba..000000000
--- a/addons/template/vilesci/index.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/* Copyright (C) 2013 FH 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('../../../config/vilesci.config.inc.php');
-require_once('../../../include/functions.inc.php');
-require_once('../../../include/benutzerberechtigung.class.php');
-
-echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<link rel="stylesheet" href="../../../skin/fhcomplete.css" type="text/css">
-	<link rel="stylesheet" href="../../../skin/vilesci.css" type="text/css">
-	<title>Template</title>
-</head>
-<body>
-<h1>Template</h1>';
-
-$uid = get_uid();
-$rechte = new benutzerberechtigung();
-$rechte->getBerechtigungen($uid);
-
-if(!$rechte->isBerechtigt('basis/addon'))
-{
-	die('Sie haben keine Berechtigung fuer diese Seite');
-}
-echo 'Template Addon Vilesci Integration';
-?>
diff --git a/addons/template/vilesci/init.js.php b/addons/template/vilesci/init.js.php
deleted file mode 100755
index 5ac9310ca..000000000
--- a/addons/template/vilesci/init.js.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/* Copyright (C) 2015 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 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- *
- * Authors: Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at>
- */
-/**
- * Initialisierung des Addons
- */
-?>
-if(typeof addon =='undefined')
-	var addon=Array();
-
-addon.push(
-{
-	init: function(page, params)
-	{
-		// Diese Funktion wird nach dem Laden der Seite im Vilesci aufgerufen
-
-		/*
-		switch(page)
-		{
-			case 'vilesci/lehre/lehrveranstaltung.php':
-				break;
-
-			default:
-				break;
-		}
-		*/
-	}
-});
diff --git a/addons/template/vilesci/menu.inc.php b/addons/template/vilesci/menu.inc.php
deleted file mode 100755
index 77e9c8ec3..000000000
--- a/addons/template/vilesci/menu.inc.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/* Copyright (C) 2017 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 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- *
- * Authors: Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at>,
- */
-/**
- * Hier koennen neue Menuepunkte im Vilesci definiert werden
- */
-
-// Hauptmenuepunkt hinzufuegen
-$menu_addon = array
-(
-	'Template'=>array
-	(
-		'name'=>'Template', 'opener'=>'true', 'hide'=>'true', 'permissions'=>array('basis/addon'), 'image'=>'../../skin/images/vilesci_addons.png',
-		'link'=>'left.php?categorie=Template', 'target'=>'nav',
-		'TemplateEntry1'=>array('name'=>'Template Entry1', 'link'=>'../addons/template/vilesci/index.php', 'target'=>'main'),
-		'TemplateEntry2'=>array('name'=>'Template Entry2', 'link'=>'../addons/template/vilesci/index.php', 'target'=>'main')
-	)
-);
-$menu = array_merge($menu,$menu_addon);
-
-// Submenuepunkt hinzufuegen unter dem Hauptmenue Punkt "Admin"
-$menu_addon = array
-(
-	'TemplateSubmenu'=>array('name'=>'Template', 'link'=>'../addons/template/vilesci/index.php', 'target'=>'main','permissions'=>array('basis/addon')),
-
-);
-$menu['Admin'] = array_merge($menu['Admin'],$menu_addon);
-?>
diff --git a/addons/template/vilesci/vorlage_generateuid.inc.php b/addons/template/vilesci/vorlage_generateuid.inc.php
deleted file mode 100755
index ebe2be3e2..000000000
--- a/addons/template/vilesci/vorlage_generateuid.inc.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/* Copyright (C) 2014 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 2 of the
-* License, or (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-*
-* Authors: Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at> and
-*/
-/**
- * Benutzerdefinierte Funktion zur Generierung der UIDs
- * Zur Aktivierung muss die Datei in generateuid.inc.php umbenannt werden
- */
-
-/**
- * Generiert die UID für Studierende
- *
- * @param $stgkzl Studiengangskuerzel
- * @param $jahr Studienjahr (zB 2014)
- * @param $stgtyp Studiengangstyp einstellige Ziffer
- * @param $matrikelnummer Personenkennzeichen des Studierenden
- */
-function generateUID($stgkzl, $jahr, $stgtyp, $matrikelnummer)
-{
-	return $matrikelnummer;
-}
-
-/**
- * Gerneriert die Mitarbeiter UID
- * Format v.nachname max 20 Zeichen
- * Im Fall von Doppelnamen wird vor dem Bindestrich abgeschnitten
- *
- * @param $vorname Vorname
- * @param $nachname Nachname
- * @param $lektor Boolean true wenn Lektor sonst false
- */
-function generateMitarbeiterUID($vorname, $nachname, $lektor, $fixangestellt=true)
-{
-	$bn = new benutzer();
-	$uid='';
-
-	// Wenn ein Bindestrich vorhanden ist (Doppelname), dort abschneiden
-	if(mb_strpos($nachname,'-')!==false)
-		$nachname = mb_substr($nachname, 0, mb_strpos($nachname,'-'));
-	// Nachname wird so lange verkuerzt bis eine eindeutige UID entsteht die noch nicht vergeben ist
-	for($nn=18;$nn!=0;$nn--)
-	{
-		$uid = mb_substr($vorname,0,1);
-		$uid .= mb_substr($nachname,0,$nn);
-
-		$uid = mb_str_replace(' ','',$uid);
-		$uid = mb_str_replace('-','',$uid);
-
-		$uid = mb_strtolower($uid);
-		if(!$bn->uid_exists($uid))
-			return $uid;
-	}
-	return false;
-}
diff --git a/addons/template/vilesci/vorlage_passwort.inc.php b/addons/template/vilesci/vorlage_passwort.inc.php
deleted file mode 100755
index 0d922f6bc..000000000
--- a/addons/template/vilesci/vorlage_passwort.inc.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/* Copyright (C) 2014 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 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- *
- * Authors: Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at>
- */
-/*
- * Diese Datei überschreibt die Default-Funktionen zur Passwort Änderung
- * Zur Aktivierung muss die Datei in passwort.inc.php umbenannt werden
- * 
- * Ansonsten wird die Default Funktionalität unter /include/tw/passwort.inc.php verwendet
- */
-
-/**
- * Aendert das Passwort 
- * @param $passwort_alt Altes (aktuelles) Passwort
- * @param $passwort_neu neues Passwort
- * @param $uid - UID/Benutzername des Users
- * @return true wenn erfolgreich - Fehlermeldung im Fehlerfall
- */
-function change_password($passwort_alt, $passwort_neu, $uid)
-{
-	return 'Passwort Änderung fehlgeschlagen.';
-}
-
-?>
diff --git a/addons/template/vilesci/vorlage_serviceterminal.inc.php b/addons/template/vilesci/vorlage_serviceterminal.inc.php
deleted file mode 100755
index 25debceea..000000000
--- a/addons/template/vilesci/vorlage_serviceterminal.inc.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/* Copyright (C) 2014 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 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- *
- * Authors: Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at>
- */
-
-// Raumtyp der per Default am Infoterminal angezeigt wird
-$ServiceTerminalDefaultRaumtyp='EDV';
-
-// Liste der Raumtypen die am Infoterminal angezeigt werden
-$ServiceTerminalRaumtypen=array(
-			array("type"=>"EDV","beschreibung"=>"&nbsp;Freie&nbsp;<br>&nbsp;PC R&auml;ume&nbsp;","img"=>""),
-			array("type"=>"HS","beschreibung"=>"&nbsp;Freie&nbsp;<br>&nbsp;H&ouml;rs&auml;le&nbsp;","img"=>""),
-			array("type"=>"SEM","beschreibung"=>"&nbsp;Freie&nbsp;<br>&nbsp;Seminarr&auml;ume&nbsp;","img"=>""),
-			array("type"=>"Lab","beschreibung"=>"&nbsp;Freie&nbsp;<br>&nbsp;Laborr&auml;ume&nbsp;","img"=>""),
-			);		
-
-/**
- * Prueft ob die Karte verlaengert werden darf
- * @param $uid
- * @return Array mit boolean und Errormsg
- */
-function ServiceTerminalCheckVerlaengerung($uid)
-{
-	if(!check_lektor($uid))	
-    {
-
-		$konto = new konto(); 
-		if($aktSemester= $konto->getLastStudienbeitrag($uid))
-	    {
-			return array(true,'Studienbeitrag für Semester '.$aktSemester.' bezahlt');
-		}
-		else
-		{
-			return array(false,'Verlängerung der Karte ist derzeit nicht möglich da der Studienbeitrag noch nicht bezahlt wurde');
-		}
-	}
-	else
-		return array(false,'Für Mitarbeiter ist eine Kartenverlängerung nicht möglich');
-}
-
-/**
- * Liefert den Text der auf die Karte gedruckt werden soll oder einer Errormsg
- * @param $uid UID des Users
- * @return array mit Datum/Drucktext und errorMessage
- */ 
-function ServiceTerminalGetDrucktext($uid)
-{
-	// hole Semester des letzten eingezahlten Studienbeitrages
-	$konto = new konto(); 
-	if(!$aktSemester= $konto->getLastStudienbeitrag($uid))
-	{
-	    return array('datum'=>'', 'errorMessage'=>'Fehler beim Auslesen des Studienganges. Bitte wenden Sie sich an den Service Desk.');  
-	}  
-	
-	return array('datum'=>'Gueltig fuer/valid for '.$aktSemester, 'errorMessage'=>'');  
-}
-?>
diff --git a/addons/template/xml/index.html b/addons/template/xml/index.html
deleted file mode 100755
index e69de29bb..000000000
diff --git a/application/controllers/api/frontend/v1/LvMenu.php b/application/controllers/api/frontend/v1/LvMenu.php
index 22b5a3a3d..d1ca7e8d6 100644
--- a/application/controllers/api/frontend/v1/LvMenu.php
+++ b/application/controllers/api/frontend/v1/LvMenu.php
@@ -271,11 +271,12 @@ class LvMenu extends FHCAPI_Controller
 						$params
 		);
 
-
+		
 		// Menu sortieren
 		// ##########################################################################################
 		foreach ($menu as $key => $row){
 			$pos[$key] = $row['position'];
+			$menu[$key]['icon'] = base_url(str_replace("../../..","",$row['icon']));
 		}
 
 		array_multisort($pos, SORT_ASC, SORT_NUMERIC, $menu);
@@ -574,19 +575,32 @@ class LvMenu extends FHCAPI_Controller
 			
 			// get the data of the database result and map the array of objects to their object property
 			$studentMails = $this->getDataOrTerminateWithError($studentMails, 'No student mails found');
-			$studentMails = array_map(
-			function($mail_obj){
-				return $mail_obj->mail;
-			},$studentMails);
-
-			$mailto = implode(',',$studentMails);
 			
-			//todo logic for nomail is missing
-			if($nomail!='')
-				$link_onclick='alert(\''.$p->t('lehre/keinMailverteiler',array($nomail)).'\');';
-			else
-				$link_onclick='';
+			// emails used to create the mailto link
+			$mailtoMails = array();
+			$noMails = array();
+			$noMailLink = FALSE;
 
+			
+
+			foreach($studentMails as $mail){
+				
+				if($mail->mail == 'nomail'){
+					$noMails[]=$mail->gruppe_kurzbz;
+					$noMailLink= TRUE;
+				}else{
+					$mailtoMails[]=$mail->mail;
+				}
+			}
+
+			if($noMailLink){
+				$link_onclick='alert(\''.$p->t('lehre/keinMailverteiler',array(implode(" ",$noMails))).'\');';
+			}else{
+				$link_onclick='';
+			}
+			
+			$mailto .= implode(',',$mailtoMails);
+			
 			$menu[]=array
 			(
 				'id'=>'core_menu_mailanstudierende',
diff --git a/application/models/education/Lehreinheit_model.php b/application/models/education/Lehreinheit_model.php
index 35281c8cc..869f0a19c 100755
--- a/application/models/education/Lehreinheit_model.php
+++ b/application/models/education/Lehreinheit_model.php
@@ -125,15 +125,22 @@ class Lehreinheit_model extends DB_Model
 		// logic used from cis_menu_lv.inc.php line 335
 		return $this->execReadOnlyQuery("
 		SELECT
-				CASE 
-					WHEN gruppe_kurzbz !='' THEN LOWER(gruppe_kurzbz || '@' || ?)
-					ELSE LOWER(stg_typ || stg_kurzbz || semester || TRIM(verband) || TRIM(gruppe) || '@' || ?) 
-				END AS mail
+			gruppe_kurzbz,
+			CASE 
+				WHEN nomail = TRUE THEN 'nomail'
+				WHEN gruppe_kurzbz !='' THEN LOWER(gruppe_kurzbz || '@' || ?)
+				ELSE LOWER(stg_typ || stg_kurzbz || semester || TRIM(verband) || TRIM(gruppe) || '@' || ?) 
+			END AS mail
+			
 		FROM 
 		(
 			SELECT 
 				distinct vw_lehreinheit.studiensemester_kurzbz, vw_lehreinheit.stg_kurzbz, vw_lehreinheit.stg_typ, vw_lehreinheit.semester,
-				COALESCE(vw_lehreinheit.verband,'') as verband, COALESCE(vw_lehreinheit.gruppe,'') as gruppe, vw_lehreinheit.gruppe_kurzbz, tbl_gruppe.mailgrp
+				COALESCE(vw_lehreinheit.verband,'') as verband, COALESCE(vw_lehreinheit.gruppe,'') as gruppe, vw_lehreinheit.gruppe_kurzbz, tbl_gruppe.mailgrp,
+				CASE
+					WHEN mailgrp = TRUE OR mailgrp IS NULL THEN FALSE
+					ELSE TRUE
+				END as nomail
 			FROM campus.vw_lehreinheit
 			LEFT JOIN public.tbl_gruppe USING(gruppe_kurzbz)
 			WHERE 
@@ -143,7 +150,7 @@ class Lehreinheit_model extends DB_Model
 				vw_lehreinheit.studiensemester_kurzbz =
 				(select distinct studiensemester_kurzbz from campus.vw_lehreinheit where lehreinheit_id=?)
 				AND (vw_lehreinheit.gruppe_kurzbz IS NULL OR
-					(vw_lehreinheit.gruppe_kurzbz IS NOT NULL AND tbl_gruppe.mailgrp = TRUE AND (SELECT COUNT(*) FROM public.tbl_benutzergruppe where gruppe_kurzbz = vw_lehreinheit.gruppe_kurzbz AND studiensemester_kurzbz = vw_lehreinheit.studiensemester_kurzbz) > 0))
+					(vw_lehreinheit.gruppe_kurzbz IS NOT NULL AND (SELECT COUNT(*) FROM public.tbl_benutzergruppe where gruppe_kurzbz = vw_lehreinheit.gruppe_kurzbz AND studiensemester_kurzbz = vw_lehreinheit.studiensemester_kurzbz) > 0))
 				
 		
 		) AS subquery
diff --git a/application/views/CisHtml/Dashboard.php b/application/views/CisHtml/Dashboard.php
index 7948840ad..1eddba454 100755
--- a/application/views/CisHtml/Dashboard.php
+++ b/application/views/CisHtml/Dashboard.php
@@ -14,8 +14,7 @@ $this->load->view('templates/CISHTML-Header', $includesArray);
 <div id="content">
 	<h2>Dashboard</h2>
 	<hr>
-	<fhc-dashboard active_addons="<?php echo ACTIVE_ADDONS ?>" 
-	mail_studierende="<?php echo !defined('CIS_LEHRVERANSTALTUNG_MAILSTUDIERENDE_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_MAILSTUDIERENDE_ANZEIGEN ?>" dashboard="CIS"/>
+	<fhc-dashboard dashboard="CIS"/>
 </div>
 
 <?php $this->load->view('templates/CISHTML-Footer', $includesArray); ?>
diff --git a/public/js/api/addons.js b/public/js/api/addons.js
index 249457ac5..6a6b430c6 100644
--- a/public/js/api/addons.js
+++ b/public/js/api/addons.js
@@ -1,14 +1,5 @@
 export default {
-    getAddonLink(addon, lehrveranstaltung_id, studiensemester_kurzbz) {
-          return this.$fhcApi.get(
-              FHC_JS_DATA_STORAGE_OBJECT.app_root +
-              `/addons/${addon}/cis/testapi.php`,
-              { lehrveranstaltung_id: lehrveranstaltung_id,
-                studiensemester_kurzbz: studiensemester_kurzbz }
-          );
-      },
-
-      getLvMenu(lvid, studiensemester_kurzbz) {
+    getLvMenu(lvid, studiensemester_kurzbz) {
         return this.$fhcApi.get(
             FHC_JS_DATA_STORAGE_OBJECT.app_root +
             FHC_JS_DATA_STORAGE_OBJECT.ci_router +
diff --git a/public/js/components/Cis/Mylv/LvUebersicht.js b/public/js/components/Cis/Mylv/LvUebersicht.js
index 0762208af..2e14a11fd 100644
--- a/public/js/components/Cis/Mylv/LvUebersicht.js
+++ b/public/js/components/Cis/Mylv/LvUebersicht.js
@@ -10,72 +10,37 @@ export default  {
     },
     data(){
         return {
-            // reactive data
-            items:["lehrveranstaltungsInformationen","Notenlisten","Moodle","Gesamtnote","E-mail","Pinboard","Alle Termine der LV","Anrechnung","Evaluierung","Neue Einmeldung"],
-            lehreinheit:null,
-            stg:null,
-            lv:null,
-            emailAnStudierende:null,
-
             result: false,
+            menu: [],
         }
     },
-    inject:["active_addons","mail_studierende"],
     mixins:[BsModal],
     components:{
         BsModal,
     },
     methods:{
         showModal: function(){
-            this.$fhcApi.factory.addons.getLvMenu(this.event.lehrveranstaltung_id, this.event.studiensemester_kurzbz).then(res =>{
-                console.log("this is the addon endpoint res",res);
-            });
-            this.$fhcApi.factory.lehre.getStudentenMail(this.event.lehreinheit_id).then(res =>
-            {
-                // prepare the mailto link with all the emails from the students of the lv
-                this.emailAnStudierende = "mailto:"+res.data.join(",");
-            });
-
-            this.$fhcApi.factory.addons.getAddonLink("lvinfo",this.event.lehrveranstaltung_id, this.event.studiensemester_kurzbz).then(res =>{
-                console.log(res,"this is the result from the api call");
+            //this.$fhcApi.factory.addons.getLvMenu(this.event.lehrveranstaltung_id, this.event.studiensemester_kurzbz).then(res =>{
+            this.$fhcApi.factory.addons.getLvMenu(750, "WS2005").then(res =>{
+                    this.menu = res.data;
             });
         },
     },
     mounted(){
-        
-        
-        
-        // make axios call to the active addons
-        /* $addon_obj->loadAddons();
-        foreach($addon_obj->result as $addon)
-        {
-        if(file_exists('../../../addons/'.$addon->kurzbz.'/cis/init.js.php')) */
         this.modal = this.$refs.modalContainer;
-        
     },
     template:/*html*/`
     <bs-modal @showBsModal="showModal" ref="modalContainer" dialogClass="modal-lg">
         <template #title>
-        
-        <p>{{JSON.stringify(emailAnStudierende,null,2)}}</p>    
-        <p>{{JSON.stringify(event,null,2)}}</p>
-            <!--<span v-if="lv ">
-            {{lv + (stg?' / ' + stg:'')}}
-            </span>
-            <span v-else>
-            Lehrveranstaltungs Übersicht
-            </span>-->
+            <span v-if="lv ">{{lv + (stg?' / ' + stg:'')}}</span>
+            <span v-else>Lehrveranstaltungs Übersicht</span>
         </template>
         <template #default>
-            <div :style="{'display':'grid', 'row-gap':'10px', 'column-gap':'10px', 'grid-template-columns':'repeat(3,minmax(100px,1fr))', 'grid-template-rows':'repeat('+Math.ceil(items.length / 3)+',minmax(100px,1fr))'} ">
-                <div class="d-flex flex-column align-items-center justify-content-center" v-for="item in items" :key="item">
-                    <a v-if="item=='E-mail'" :href="emailAnStudierende">
-                        <span>{{item}}</span>
-                        <i class="fa fa-file"></i>
-                    </a>
-                    <a v-else href="#">
-                        <span>{{item}}</span>
-                        <i class="fa fa-file"></i>
+            <div :style="{'display':'grid', 'row-gap':'10px', 'column-gap':'10px', 'grid-template-columns':'repeat(3,minmax(100px,1fr))', 'grid-template-rows':'repeat('+Math.ceil(menu.length / 3)+',minmax(100px,1fr))'} ">
+                <div  v-for="(menuItem, index) in menu" :key="index">
+                    <a :onclick="menuItem.link_onclick" class="d-flex flex-column align-items-center justify-content-center" :href="menuItem.link_onclick?'#':menuItem.link" :title="menuItem.name">
+                        <span>{{menuItem.name}}</span>
+                        <img :src="menuItem.icon" :alt="menuItem.name" ></img>
                     </a>
                 </div>
             </div>
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index a899b0050..e6f82d566 100755
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -239,6 +239,12 @@ export default {
     //? sorts the profil Updates: pending -> accepted -> rejected
     this.data.profilUpdates?.sort(this.sortProfilUpdates);
   },
+  mounted(){
+    // this is a test api call to test whether the addon lvevaluierung the menu point adds if the logged in user is the lector of the lehrveranstaltung
+    this.$fhcApi.factory.addons.getLvMenu(750, "WS2005").then(res =>{
+      console.log("this is the addon endpoint res",res);
+    });
+  },
 
   template: /*html*/ ` 
   <div class="container-fluid text-break fhc-form"  >
diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js
index c36143bb2..65ec211eb 100755
--- a/public/js/components/Dashboard/Dashboard.js
+++ b/public/js/components/Dashboard/Dashboard.js
@@ -9,15 +9,7 @@ export default {
 	},
 	props: [
 		"dashboard",
-		"active_addons",
-		"mail_studierende",
 	],
-	provide(){
-		return{
-			active_addons: this.active_addons,
-			mail_studierende: this.mail_studierende,
-		}
-	},
 	data: () => ({
 		sections: [],
 		widgets: null

From cccf85f3d94bde0fd1e4fb666b450c907524adcd Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 9 Jul 2024 16:10:08 +0200
Subject: [PATCH 0892/1461] StV List: Accessibility fix

---
 .../Stv/Studentenverwaltung/List.js           | 45 ++++++++++++-------
 1 file changed, 29 insertions(+), 16 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index 9965c0b83..bb4c35211 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -100,6 +100,10 @@ export default {
 				{
 					event: 'dataProcessed',
 					handler: this.autoSelectRows
+				},
+				{
+					event: 'rowClick',
+					handler: this.handleRowClick // TODO(chris): this should be in the filter component
 				}
 			],
 			focusObj: null, // TODO(chris): this should be in the filter component
@@ -178,38 +182,47 @@ export default {
 					e.preventDefault();
 					var next = this.focusObj.previousElementSibling;
 					if (next)
-						this.focusObj = this.changeFocus(this.focusObj, next);
+						this.changeFocus(this.focusObj, next);
 					break;
 				case 'ArrowDown':
 					e.preventDefault();
 					var next = this.focusObj.nextElementSibling;
 					if (next)
-						this.focusObj = this.changeFocus(this.focusObj, next);
+						this.changeFocus(this.focusObj, next);
 					break;
 			}
 		},
 		changeFocus(a, b) { // TODO(chris): this should be in the filter component
-			a.tabIndex = -1;
 			if (b) {
 				b.tabIndex = 0;
+				this.focusObj = b;
 				b.focus();
-			}
-			return b;
-		},
-		onBlur(e) { // TODO(chris): this should be in the filter component
-			const tableholder = e.target.closest('.tabulator-tableholder');
-			if (tableholder && tableholder != e.target && !e.relatedTarget?.classList.contains('tabulator-row')) {
-				e.target.tabIndex = -1;
-				tableholder.tabIndex = 0;
+			} else {
 				this.focusObj = null;
 			}
+			a.tabIndex = -1;
+			return this.focusObj;
 		},
 		onFocus(e) { // TODO(chris): this should be in the filter component
-			if (e.target.classList.contains('tablulator-container')) {
-				this.focusObj = this.changeFocus(e.target, e.target.querySelector('.tabulator-row'));
+			if (!this.focusObj) {
+				var container, target;
+				if (e.target.classList.contains('tabulator-container')) {
+					container = e.target;
+					target = container.querySelector('.tabulator-row');
+				} else if (e.target.classList.contains('tabulator-row')) {
+					container = e.target.closest('.tabulator-container');
+					target = e.target;
+				}
+				if (container && target) {
+					this.changeFocus(container, target);
+				}
 			}
-			if (e.target.classList.contains('tabulator-tableholder')) {
-				this.focusObj = this.changeFocus(e.target, e.target.querySelector('.tabulator-row'));
+		},
+		handleRowClick(e, row) { // TODO(chris): this should be in the filter component
+			if (this.focusObj) {
+				let el = row.getElement();
+				if (el != this.focusObj)
+					this.changeFocus(this.focusObj, el);
 			}
 		}
 	},
@@ -217,7 +230,7 @@ export default {
 	// TODO(chris): filter component column chooser has no accessibilty features
 	template: `
 	<div class="stv-list h-100 pt-3">
-		<div class="tablulator-container d-flex flex-column h-100" :class="{'has-filter': filterKontoCount0 || filterKontoMissingCounter}" tabindex="0" @focusin="onFocus" @focusout="onBlur" @keydown="onKeydown">
+		<div class="tabulator-container d-flex flex-column h-100" :class="{'has-filter': filterKontoCount0 || filterKontoMissingCounter}" tabindex="0" @focusin="onFocus" @keydown="onKeydown">
 			<core-filter-cmpt
 				ref="table"
 				:tabulator-options="tabulatorOptions"

From 108045ac5444886e0f02ec70899db3a9ab775f36 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 9 Jul 2024 16:14:43 +0200
Subject: [PATCH 0893/1461] Betriebsmittel Compontent: names

---
 .../Betriebsmittel/Betriebsmittel.js          | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/public/js/components/Betriebsmittel/Betriebsmittel.js b/public/js/components/Betriebsmittel/Betriebsmittel.js
index e0ebe904d..211455dbf 100644
--- a/public/js/components/Betriebsmittel/Betriebsmittel.js
+++ b/public/js/components/Betriebsmittel/Betriebsmittel.js
@@ -277,7 +277,7 @@ export default {
 					<form-input
 						type="select"
 						:label="$p.t('global/typ')"
-						name="typ"
+						name="betriebsmitteltyp"
 						v-model="formData.betriebsmitteltyp"
 						:disabled="!statusNew"
 						>
@@ -320,7 +320,7 @@ export default {
 						type="text"
 						:label="$p.t('wawi/nummer')"
 						name="nummer"
-						v-model="formData['nummer']"
+						v-model="formData.nummer"
 						>
 					</form-input>
 				</div>
@@ -330,7 +330,7 @@ export default {
 						type="text"
 						:label="$p.t('wawi/nummer') + ' 2'"
 						name="nummer2"
-						v-model="formData['nummer2']"
+						v-model="formData.nummer2"
 						>
 					</form-input>
 				</div>
@@ -340,7 +340,7 @@ export default {
 						type="textarea"
 						:label="$p.t('global/beschreibung')"
 						name="beschreibung"
-						v-model="formData['beschreibung']"
+						v-model="formData.beschreibung"
 						:disabled="formData.inventarnummer"
 						>
 					</form-input>
@@ -351,7 +351,7 @@ export default {
 						type="text"
 						:label="$p.t('infocenter/kaution')"
 						name="kaution"
-						v-model="formData['kaution']"
+						v-model="formData.kaution"
 						>
 					</form-input>
 				</div>
@@ -361,7 +361,7 @@ export default {
 						type="textarea"
 						:label="$p.t('global/anmerkung')"
 						name="anmerkung"
-						v-model="formData['anmerkung']"
+						v-model="formData.anmerkung"
 						>
 					</form-input>
 				</div>
@@ -370,8 +370,8 @@ export default {
 					<form-input
 						type="DatePicker"
 						:label="$p.t('wawi/ausgegebenam')"
-						name="datum"
-						v-model="formData['ausgegebenam']"
+						name="ausgegebenam"
+						v-model="formData.ausgegebenam"
 						auto-apply
 						:enable-time-picker="false"
 						format="dd.MM.yyyy"
@@ -385,8 +385,8 @@ export default {
 					<form-input
 						type="DatePicker"
 						:label="$p.t('wawi/retouram')"
-						name="datum"
-						v-model="formData['retouram']"
+						name="retouram"
+						v-model="formData.retouram"
 						auto-apply
 						:enable-time-picker="false"
 						format="dd.MM.yyyy"

From a930247eec4af95f5868ee10cd356cc5e8aed5c7 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 10 Jul 2024 08:44:04 +0200
Subject: [PATCH 0894/1461] Cleanup

---
 public/js/components/Stv/Studentenverwaltung/List.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index bb4c35211..7248bb113 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -1,5 +1,4 @@
 import {CoreFilterCmpt} from "../../filter/Filter.js";
-import {CoreRESTClient} from '../../../RESTClient.js';
 import ListNew from './List/New.js';
 
 

From bc9f24732384e89fc24fdd705c264decba196ed8 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 10 Jul 2024 09:10:35 +0200
Subject: [PATCH 0895/1461] replaces wrong quatations in the menu items if the
 link_onclick array key is defined

---
 application/controllers/api/frontend/v1/LvMenu.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/application/controllers/api/frontend/v1/LvMenu.php b/application/controllers/api/frontend/v1/LvMenu.php
index d1ca7e8d6..f7f5d2557 100644
--- a/application/controllers/api/frontend/v1/LvMenu.php
+++ b/application/controllers/api/frontend/v1/LvMenu.php
@@ -248,7 +248,8 @@ class LvMenu extends FHCAPI_Controller
 
 		// Addons Menu Logic
 		// ##########################################################################################		
-        $params = [
+        
+		$params = [
 			'user'=>$user,
 			'lvid'=>$lvid,
 			'studiensemester_kurzbz'=>$studiensemester_kurzbz,
@@ -271,12 +272,17 @@ class LvMenu extends FHCAPI_Controller
 						$params
 		);
 
-		
 		// Menu sortieren
 		// ##########################################################################################
+		
 		foreach ($menu as $key => $row){
 			$pos[$key] = $row['position'];
+			// replace the path to the icon
 			$menu[$key]['icon'] = base_url(str_replace("../../..","",$row['icon']));
+			// replace the quatations in the link_onclick
+			if(array_key_exists("link_onclick",$menu[$key])){
+				$menu[$key]['link_onclick'] = str_replace("\"","'",$menu[$key]['link_onclick']);
+			}
 		}
 
 		array_multisort($pos, SORT_ASC, SORT_NUMERIC, $menu);

From d364630d927d2be6df957b6272be42abdc09ed87 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 10 Jul 2024 10:48:24 +0200
Subject: [PATCH 0896/1461] instead of modifying the original menu keys, it
 adds new keys for the cis4 version of the menu

---
 .../controllers/api/frontend/v1/LvMenu.php    | 20 +++++++++++++++----
 public/js/components/Cis/Mylv/LvUebersicht.js | 13 ++++++------
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/application/controllers/api/frontend/v1/LvMenu.php b/application/controllers/api/frontend/v1/LvMenu.php
index f7f5d2557..84cdd3f62 100644
--- a/application/controllers/api/frontend/v1/LvMenu.php
+++ b/application/controllers/api/frontend/v1/LvMenu.php
@@ -277,11 +277,23 @@ class LvMenu extends FHCAPI_Controller
 		
 		foreach ($menu as $key => $row){
 			$pos[$key] = $row['position'];
-			// replace the path to the icon
-			$menu[$key]['icon'] = base_url(str_replace("../../..","",$row['icon']));
-			// replace the quatations in the link_onclick
+
+			// adds new key with modified icon path to the menu
+			$menu[$key]['cis4_icon'] = base_url(str_replace("../../..","",$row['icon']));
+			
+			// adds new key with modified link_onclick link to the menu 
 			if(array_key_exists("link_onclick",$menu[$key])){
-				$menu[$key]['link_onclick'] = str_replace("\"","'",$menu[$key]['link_onclick']);
+				$menu[$key]['cis4_link_onclick'] = str_replace("\"","'",$menu[$key]['link_onclick']);
+			}
+
+			// adds new key with modified link to the menu 
+			if(array_key_exists("link",$menu[$key])){
+				// only replace the link key if the link has an old path
+				if(strpos($menu[$key]['link'],"../../..") != false){
+					$menu[$key]['cis4_link'] = base_url(str_replace("../../..","",$row['link']));
+				}else{
+					$menu[$key]['cis4_link'] = $menu[$key]['link'];
+				}
 			}
 		}
 
diff --git a/public/js/components/Cis/Mylv/LvUebersicht.js b/public/js/components/Cis/Mylv/LvUebersicht.js
index 2e14a11fd..d0f0ea09e 100644
--- a/public/js/components/Cis/Mylv/LvUebersicht.js
+++ b/public/js/components/Cis/Mylv/LvUebersicht.js
@@ -20,8 +20,8 @@ export default  {
     },
     methods:{
         showModal: function(){
-            //this.$fhcApi.factory.addons.getLvMenu(this.event.lehrveranstaltung_id, this.event.studiensemester_kurzbz).then(res =>{
-            this.$fhcApi.factory.addons.getLvMenu(750, "WS2005").then(res =>{
+            this.$fhcApi.factory.addons.getLvMenu(this.event.lehrveranstaltung_id, this.event.studiensemester_kurzbz).then(res =>{
+            //this.$fhcApi.factory.addons.getLvMenu(750, "WS2005").then(res =>{
                     this.menu = res.data;
             });
         },
@@ -32,15 +32,16 @@ export default  {
     template:/*html*/`
     <bs-modal @showBsModal="showModal" ref="modalContainer" dialogClass="modal-lg">
         <template #title>
-            <span v-if="lv ">{{lv + (stg?' / ' + stg:'')}}</span>
-            <span v-else>Lehrveranstaltungs Übersicht</span>
+            <!--<span v-if="event.lv ">{{event.lv + (event.stg?' / ' + event.stg:'')}}</span>-->
+            <span >{{JSON.stringify(event,null,2)}}</span>
+            <!--Lehrveranstaltungs Übersicht-->
         </template>
         <template #default>
             <div :style="{'display':'grid', 'row-gap':'10px', 'column-gap':'10px', 'grid-template-columns':'repeat(3,minmax(100px,1fr))', 'grid-template-rows':'repeat('+Math.ceil(menu.length / 3)+',minmax(100px,1fr))'} ">
                 <div  v-for="(menuItem, index) in menu" :key="index">
-                    <a :onclick="menuItem.link_onclick" class="d-flex flex-column align-items-center justify-content-center" :href="menuItem.link_onclick?'#':menuItem.link" :title="menuItem.name">
+                    <a :onclick="menuItem.cis4_link_onclick?menuItem.cis4_link_onclick:null" class="d-flex flex-column align-items-center justify-content-center" :href="menuItem.cis4_link_onclick?'#':menuItem.cis4_link" :title="menuItem.name">
                         <span>{{menuItem.name}}</span>
-                        <img :src="menuItem.icon" :alt="menuItem.name" ></img>
+                        <img :src="menuItem.cis4_icon" :alt="menuItem.name" ></img>
                     </a>
                 </div>
             </div>

From a83e07350eeaa1ac8fc42a7c40194035e074e12f Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 10 Jul 2024 11:35:36 +0200
Subject: [PATCH 0897/1461] makes the pinboard link redirect to all news

---
 .../controllers/api/frontend/v1/LvMenu.php    | 20 +++++++++++++++----
 application/views/CisHmvc/Cms/Content.php     | 12 ++++++-----
 application/views/CisHtml/Cms/Content.php     | 11 ++++++----
 application/views/CisVue/Cms/Content.php      | 11 ++++++----
 public/js/components/Cis/Mylv/LvUebersicht.js | 11 ++++++----
 5 files changed, 44 insertions(+), 21 deletions(-)

diff --git a/application/controllers/api/frontend/v1/LvMenu.php b/application/controllers/api/frontend/v1/LvMenu.php
index 84cdd3f62..7b3db87ff 100644
--- a/application/controllers/api/frontend/v1/LvMenu.php
+++ b/application/controllers/api/frontend/v1/LvMenu.php
@@ -289,8 +289,8 @@ class LvMenu extends FHCAPI_Controller
 			// adds new key with modified link to the menu 
 			if(array_key_exists("link",$menu[$key])){
 				// only replace the link key if the link has an old path
-				if(strpos($menu[$key]['link'],"../../..") != false){
-					$menu[$key]['cis4_link'] = base_url(str_replace("../../..","",$row['link']));
+				if(strpos($menu[$key]['link'],"../../..") !== false){
+					$menu[$key]['cis4_link'] = base_url(str_replace("../../..","",$menu[$key]['link']));
 				}else{
 					$menu[$key]['cis4_link'] = $menu[$key]['link'];
 				}
@@ -638,8 +638,20 @@ class LvMenu extends FHCAPI_Controller
 			$text='';
 			if($is_lector)
 				$text.= "<a href='../../../cms/newsverwaltung.php?studiengang_kz=$studiengang_kz&semester=$semester' class='Item'>".$p->t('profil/adminstration')."</a>";
-
+			
+			// this is the new cis4 version
 			$menu[]=array
+			(
+				'id'=>'core_menu_pinboard',
+				'position'=>'110',
+				'name'=>$p->t('lehre/pinboard'),
+				'icon'=>'../../../skin/images/button_pinboard.png',
+				'link'=>base_url("CisHtml/Cms/news"),
+				'text'=>$text
+			);
+
+			// this is the old cis version
+			/* $menu[]=array
 			(
 				'id'=>'core_menu_pinboard',
 				'position'=>'110',
@@ -647,7 +659,7 @@ class LvMenu extends FHCAPI_Controller
 				'icon'=>'../../../skin/images/button_pinboard.png',
 				'link'=>'../../../cms/news.php?studiengang_kz='.urlencode($studiengang_kz).'&semester='.urlencode($semester),
 				'text'=>$text
-			);
+			); */
 		}
 	}
 
diff --git a/application/views/CisHmvc/Cms/Content.php b/application/views/CisHmvc/Cms/Content.php
index bf54d9d5f..5e9b7357d 100755
--- a/application/views/CisHmvc/Cms/Content.php
+++ b/application/views/CisHmvc/Cms/Content.php
@@ -7,13 +7,15 @@ $includesArray = array(
 		#'skin/style.css.php'
 	]
 );
-
-switch($template_kurzbz){
-	case 'raum_contentmittitel': 
-		$includesArray['tabulator5'] = true; 
-		break;
+if(isset($template_kurzbz)){
+	switch($template_kurzbz){
+		case 'raum_contentmittitel': 
+			$includesArray['tabulator5'] = true; 
+			break;
+	}
 }
 
+
 $this->load->view('templates/CISVUE-Header', $includesArray);
 ?>
 
diff --git a/application/views/CisHtml/Cms/Content.php b/application/views/CisHtml/Cms/Content.php
index bf54d9d5f..814ca79c6 100755
--- a/application/views/CisHtml/Cms/Content.php
+++ b/application/views/CisHtml/Cms/Content.php
@@ -8,12 +8,15 @@ $includesArray = array(
 	]
 );
 
-switch($template_kurzbz){
-	case 'raum_contentmittitel': 
-		$includesArray['tabulator5'] = true; 
-		break;
+if(isset($template_kurzbz)){
+	switch($template_kurzbz){
+		case 'raum_contentmittitel': 
+			$includesArray['tabulator5'] = true; 
+			break;
+	}
 }
 
+
 $this->load->view('templates/CISVUE-Header', $includesArray);
 ?>
 
diff --git a/application/views/CisVue/Cms/Content.php b/application/views/CisVue/Cms/Content.php
index bf54d9d5f..814ca79c6 100755
--- a/application/views/CisVue/Cms/Content.php
+++ b/application/views/CisVue/Cms/Content.php
@@ -8,12 +8,15 @@ $includesArray = array(
 	]
 );
 
-switch($template_kurzbz){
-	case 'raum_contentmittitel': 
-		$includesArray['tabulator5'] = true; 
-		break;
+if(isset($template_kurzbz)){
+	switch($template_kurzbz){
+		case 'raum_contentmittitel': 
+			$includesArray['tabulator5'] = true; 
+			break;
+	}
 }
 
+
 $this->load->view('templates/CISVUE-Header', $includesArray);
 ?>
 
diff --git a/public/js/components/Cis/Mylv/LvUebersicht.js b/public/js/components/Cis/Mylv/LvUebersicht.js
index d0f0ea09e..d302e4e18 100644
--- a/public/js/components/Cis/Mylv/LvUebersicht.js
+++ b/public/js/components/Cis/Mylv/LvUebersicht.js
@@ -6,12 +6,14 @@ export default  {
         event:{
             type:Object,
             required:true,
+            default:null,
         }
     },
     data(){
         return {
             result: false,
             menu: [],
+            
         }
     },
     mixins:[BsModal],
@@ -20,6 +22,7 @@ export default  {
     },
     methods:{
         showModal: function(){
+
             this.$fhcApi.factory.addons.getLvMenu(this.event.lehrveranstaltung_id, this.event.studiensemester_kurzbz).then(res =>{
             //this.$fhcApi.factory.addons.getLvMenu(750, "WS2005").then(res =>{
                     this.menu = res.data;
@@ -32,14 +35,14 @@ export default  {
     template:/*html*/`
     <bs-modal @showBsModal="showModal" ref="modalContainer" dialogClass="modal-lg">
         <template #title>
-            <!--<span v-if="event.lv ">{{event.lv + (event.stg?' / ' + event.stg:'')}}</span>-->
-            <span >{{JSON.stringify(event,null,2)}}</span>
-            <!--Lehrveranstaltungs Übersicht-->
+            <span v-if="event?.lehrfach_bez ">{{event?.lehrfach_bez + (event?.stg_kurzbzlang?' / ' + event?.stg_kurzbzlang:'')}}</span>
+            <span v-else>Lehrveranstaltungs Übersicht</span>
+            
         </template>
         <template #default>
             <div :style="{'display':'grid', 'row-gap':'10px', 'column-gap':'10px', 'grid-template-columns':'repeat(3,minmax(100px,1fr))', 'grid-template-rows':'repeat('+Math.ceil(menu.length / 3)+',minmax(100px,1fr))'} ">
                 <div  v-for="(menuItem, index) in menu" :key="index">
-                    <a :onclick="menuItem.cis4_link_onclick?menuItem.cis4_link_onclick:null" class="d-flex flex-column align-items-center justify-content-center" :href="menuItem.cis4_link_onclick?'#':menuItem.cis4_link" :title="menuItem.name">
+                    <a :onclick="menuItem.cis4_link_onclick?menuItem.cis4_link_onclick:null" class="d-flex flex-column align-items-center justify-content-center" target="_blank" :href="menuItem.cis4_link_onclick?'#':menuItem.cis4_link" :title="menuItem.name">
                         <span>{{menuItem.name}}</span>
                         <img :src="menuItem.cis4_icon" :alt="menuItem.name" ></img>
                     </a>

From eead73f10cb69a2820cce9f294bb44a517808fdc Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Wed, 10 Jul 2024 14:44:01 +0200
Subject: [PATCH 0898/1461] Added phrases for core and softwarebereitstellung
 to phrasesupdate.php

---
 system/phrasesupdate.php | 80 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 80 insertions(+)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 1f6b19418..6b1c0134d 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -26740,6 +26740,86 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'lizenzAnzahlNeu',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Lizenz-Anzahl NEU",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "License Number NEW",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'lizenzanzahlAendern',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Lizenzanzahl ändern",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Change Number of Licenses",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'eingabeFehlt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Eingabe fehlt",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Input missing",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'unveraendert',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Unverändert",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Unchanged",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 );
 
 

From 46ea054bac435a6af98bfe5438d224927b92e56d Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 10 Jul 2024 15:52:57 +0200
Subject: [PATCH 0899/1461] change text, add config to show hint or not,
 styling

---
 config/global.config-default.inc.php          |  2 ++
 content/student/studentoverlay.js.php         |  3 ++-
 .../student/studentpruefungoverlay.xul.php    | 21 +++++++++++++------
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/config/global.config-default.inc.php b/config/global.config-default.inc.php
index d12b23828..b945a15d2 100644
--- a/config/global.config-default.inc.php
+++ b/config/global.config-default.inc.php
@@ -332,4 +332,6 @@ define('DOCSBOX_ENABLED', false);
 // (true | false)
 define('DIENSTVERHAELTNIS_SUPPORT', false);
 
+// Falls Studstatus (Abmeldung, AbmeldungStg, Unterbrechung, Wiederholung) verwendet wird zeige Hinweistext bei Eingabe einer kommissionellen oder zusaetzlichen kommissionellen Pruefung
+define('FAS_STUDSTATUS_SHOW_KOMM_PRFG_HINT', false);
 ?>
diff --git a/content/student/studentoverlay.js.php b/content/student/studentoverlay.js.php
index 687729ae5..86a56c916 100644
--- a/content/student/studentoverlay.js.php
+++ b/content/student/studentoverlay.js.php
@@ -5198,7 +5198,8 @@ function StudentPruefungTypChange()
 {
 	var typ = document.getElementById('student-pruefung-menulist-typ').value;
 	var hinweisid = document.getElementById('student-pruefung-textbox-datum-hinweis');
-	hinweisid.hidden = (typ != 'kommPruef');
+	//if(hinweisid === NULL) return;
+	hinweisid.hidden = (typ != 'kommPruef' && typ != 'zusKommPruef');
 }
 
 // ****
diff --git a/content/student/studentpruefungoverlay.xul.php b/content/student/studentpruefungoverlay.xul.php
index 6fcbca6de..0e2148a43 100644
--- a/content/student/studentpruefungoverlay.xul.php
+++ b/content/student/studentpruefungoverlay.xul.php
@@ -34,6 +34,11 @@ if(defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE)
 else
 	$punktehidden = 'true';
 
+if(defined('FAS_STUDSTATUS_SHOW_KOMM_PRFG_HINT') && FAS_STUDSTATUS_SHOW_KOMM_PRFG_HINT)
+    $show_komm_prfg_hint = true;
+else
+    $show_komm_prfg_hint = false;
+
 echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 
 ?>
@@ -252,15 +257,19 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 					      					<spacer flex="1" />
 					      				</hbox>
 									</row>
+<?php if($show_komm_prfg_hint) { ?>
 									<row id="student-pruefung-textbox-datum-hinweis" hidden="true">
 										<label></label>
-										<hbox>
-					      					<image height="17" width="17" class="alert-icon"/>
-					      					<description class="small-margin">
-					      						Bitte das Datum der Benotung eintragen und nicht das Datum der Prüfung.
-					      					</description>
-					      				</hbox>
+										<hbox style="font-size: 75%;">
+										    <image style="width: 20px; margin: 15px 5px 15px 10px;" class="message-icon"/>
+										    <vbox>
+											<description class="small-margin">Bitte bei der Neuanlage das Datum der Noteneintragung (i. d. R. heute) eintragen, </description>
+											<description class="small-margin">um einen korrekten Fristenablauf der Wiederholung zu ermöglichen. </description>
+											<description class="small-margin">Das Datum der Prüfung bitte im Anmerkungsfeld vermerken.</description>
+										    </vbox>
+										</hbox>
 									</row>
+<?php } ?>
 					      			<row>
 					      				<label value="Anmerkung" control="student-pruefung-textbox-anmerkung"/>
 							      		<textbox id="student-pruefung-textbox-anmerkung" disabled="true" maxlength="256"/>

From f2ca9f765f7804ef054465cfcaf8dfa5b094d2b1 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 10 Jul 2024 16:02:13 +0200
Subject: [PATCH 0900/1461] StV: Prestudent History disabled class

---
 .../Studentenverwaltung/Details/Prestudent/History.js  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
index 53b824b24..31ca8e894 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
@@ -27,11 +27,13 @@ export default{
 					{title:"PrestudentId", field:"prestudent_id", visible:false}
 				],
 				rowFormatter(row) {
-					if (["Abgewiesener","Abbrecher","Absolvent"].includes(row.getData().status_kurzbz)) {
-						row.getElement().classList.add('text-muted');
+					const rowData = row.getData();
+					const element = row.getElement();
+					if (["Abgewiesener","Abbrecher","Absolvent"].includes(rowData.status_kurzbz)) {
+						element.classList.add('disabled');
 					}
-					if (row.getData().prestudent_id == prestudent_id) {
-						row.getElement().classList.add('fw-bold');
+					if (rowData.prestudent_id == prestudent_id) {
+						element.classList.add('fw-bold');
 					}
 				},
 				layout: 'fitDataFill',

From 0b48e94d3c6e000ff1039847bbaace655851d11b Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Thu, 11 Jul 2024 10:44:12 +0200
Subject: [PATCH 0901/1461] Added config variable
 $config['explain_equivalence'] (Begruendung zu Gleichwertigkeit)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

...to display and enable 'Begründung zu Gleichwertigkeit'-fields
---
 application/config/anrechnung.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/application/config/anrechnung.php b/application/config/anrechnung.php
index 768ec3197..2466d2bb1 100644
--- a/application/config/anrechnung.php
+++ b/application/config/anrechnung.php
@@ -21,3 +21,6 @@ $config['grades_blocking_application'] = array(
 $config['fbl'] = FALSE;
 //Enables Info Mails
 $config['send_mail'] = TRUE;
+
+// Display fields to explain equivalence of ECTS and LV-Inhalte
+$config['explain_equivalence'] = TRUE;

From 8c3b85066ad87efdbfd29757334d31c125866e83 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Thu, 11 Jul 2024 10:49:05 +0200
Subject: [PATCH 0902/1461] Adapted Controller RequestAnrechnung.php to handle
 Begruendung-zur-Gleichwertigkeit fields

...depending on $config['explain_equivalence']
---
 .../lehre/anrechnung/RequestAnrechnung.php        | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/application/controllers/lehre/anrechnung/RequestAnrechnung.php b/application/controllers/lehre/anrechnung/RequestAnrechnung.php
index 3cba756cf..ebc272e3e 100644
--- a/application/controllers/lehre/anrechnung/RequestAnrechnung.php
+++ b/application/controllers/lehre/anrechnung/RequestAnrechnung.php
@@ -111,8 +111,13 @@ class requestAnrechnung extends Auth_Controller
 		$lehrveranstaltung_id = $this->input->post('lv_id');
 		$studiensemester_kurzbz = $this->input->post('studiensemester');
 		$bestaetigung = $this->input->post('bestaetigung');
-		$begruendung_ects = $this->input->post('begruendung_ects');
-		$begruendung_lvinhalt = $this->input->post('begruendung_lvinhalt');
+		$begruendung_ects = $this->config->item('explain_equivalence') === TRUE
+			? $this->input->post('begruendung_ects')
+			: NULL;
+		$begruendung_lvinhalt = $this->config->item('explain_equivalence') === TRUE
+			? $this->input->post('begruendung_lvinhalt')
+			: NULL;
+
 
 		// Validate data
 		if (empty($_FILES['uploadfile']['name']))
@@ -124,8 +129,8 @@ class requestAnrechnung extends Auth_Controller
 			isEmptyString($anmerkung) ||
 			isEmptyString($lehrveranstaltung_id) ||
 			isEmptyString($studiensemester_kurzbz) ||
-			isEmptyString($begruendung_ects) ||
-			isEmptyString($begruendung_lvinhalt))
+			($this->config->item('explain_equivalence') === TRUE && isEmptyString($begruendung_ects)) ||
+			($this->config->item('explain_equivalence') === TRUE && isEmptyString($begruendung_lvinhalt)))
 		{
 			return $this->outputJsonError($this->p->t('ui', 'errorFelderFehlen'));
 		}
@@ -168,7 +173,7 @@ class requestAnrechnung extends Auth_Controller
 		
 		// Hold just inserted DMS ID
 		$lastInsert_dms_id = $result->retval['dms_id'];
-		
+
 		// Save Anrechnung and Anrechnungstatus
 		$result = $this->AnrechnungModel->createAnrechnungsantrag(
 			$prestudent_id,

From 1139b251ef2b10e08f074d710a3da2778134b3b9 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Thu, 11 Jul 2024 10:52:51 +0200
Subject: [PATCH 0903/1461] Adapted Views to handle display of
 Begruendung-zur-Gleichwertigkeit fields

...depending on $config['explain_equivalence']
---
 .../anrechnung/approveAnrechnungDetail.php    | 19 +++++----
 .../lehre/anrechnung/requestAnrechnung.php    | 41 +++++++++++--------
 .../anrechnung/reviewAnrechnungDetail.php     | 19 +++++----
 3 files changed, 45 insertions(+), 34 deletions(-)

diff --git a/application/views/lehre/anrechnung/approveAnrechnungDetail.php b/application/views/lehre/anrechnung/approveAnrechnungDetail.php
index 0970b6edd..c96631781 100644
--- a/application/views/lehre/anrechnung/approveAnrechnungDetail.php
+++ b/application/views/lehre/anrechnung/approveAnrechnungDetail.php
@@ -1,4 +1,5 @@
 <?php
+$this->load->config('anrechnung');
 $this->load->view(
 	'templates/FHC-Header',
 	array(
@@ -172,14 +173,16 @@ $this->load->view(
                                                 <th class="col-xs-4"><?php echo $this->p->t('global', 'begruendung'); ?></th>
                                                 <td><span id="begruendung_id" data-begruendung_id="<?php echo $anrechnungData->begruendung_id ?>" ><?php echo $anrechnungData->begruendung ?></span></td>
                                             </tr>
-                                            <tr>
-                                                <th class="col-xs-4"><?php echo $this->p->t('anrechnung', 'begruendungEctsLabel'); ?></th>
-                                                <td><span><?php echo $anrechnungData->begruendung_ects ?></span></td>
-                                            </tr>
-                                            <tr>
-                                                <th class="col-xs-4"><?php echo $this->p->t('anrechnung', 'begruendungLvinhaltLabel'); ?></th>
-                                                <td><span><?php echo $anrechnungData->begruendung_lvinhalt ?></span></td>
-                                            </tr>
+											<?php if ($this->config->item('explain_equivalence')): ?>
+                                                <tr>
+                                                    <th class="col-xs-4"><?php echo $this->p->t('anrechnung', 'begruendungEctsLabel'); ?></th>
+                                                    <td><span><?php echo $anrechnungData->begruendung_ects ?></span></td>
+                                                </tr>
+                                                <tr>
+                                                    <th class="col-xs-4"><?php echo $this->p->t('anrechnung', 'begruendungLvinhaltLabel'); ?></th>
+                                                    <td><span><?php echo $anrechnungData->begruendung_lvinhalt ?></span></td>
+                                                </tr>
+											<?php endif; ?>
 											</tbody>
 										</table>
 									</div>
diff --git a/application/views/lehre/anrechnung/requestAnrechnung.php b/application/views/lehre/anrechnung/requestAnrechnung.php
index 18fd66a67..bb3c48235 100644
--- a/application/views/lehre/anrechnung/requestAnrechnung.php
+++ b/application/views/lehre/anrechnung/requestAnrechnung.php
@@ -4,6 +4,7 @@ const CHAR_LENGTH150 = 150;
 const CHAR_LENGTH500 = 500;
 const CHAR_LENGTH1000 = 1000;
 
+$this->load->config('anrechnung');
 $this->load->view(
 	'templates/FHC-Header',
 	array(
@@ -200,27 +201,29 @@ $this->load->view(
 									</div>
 								</div>
 							</div>
-                            <!-- Begruendung ECTS -->
-                            <div class="row">
-                                <div class="col-lg-12">
-                                    <div class="panel panel-default">
-                                        <div class="panel-heading">
-                                            <b><?php echo $this->p->t('anrechnung', 'begruendungEcts'); ?></b>&emsp;
-                                            <span class="requestAnrechnung-anrechnungInfoTooltip" data-toggle="tooltip" data-placement="right"
-                                                  title="<?php echo $this->p->t('anrechnung', 'anrechnungBegruendungEctsTooltipText'); ?>">
-                                                <i class="fa fa-lg fa-info-circle" aria-hidden="true"></i>
-                                            </span>
-                                        </div>
-                                        <div class="panel-body">
-                                            <textarea class="form-control" name="begruendung_ects" rows="1" id="requestAnrechnung-begruendungEcts"
-                                                      maxlength="<?php echo CHAR_LENGTH150 ?>" required><?php echo $anrechnungData->begruendung_ects; ?></textarea>
-                                            <small><span class="text-muted pull-right"><?php echo $this->p->t('ui', 'maxZeichen'); ?> :<span id="requestAnrechnung-begruendungEcts-charCounter"><?php echo CHAR_LENGTH150 ?></span></span></small>
+
+							<?php if ($this->config->item('explain_equivalence')): ?>
+                                <!-- Begruendung ECTS -->
+                                <div class="row">
+                                    <div class="col-lg-12">
+                                        <div class="panel panel-default">
+                                            <div class="panel-heading">
+                                                <b><?php echo $this->p->t('anrechnung', 'begruendungEcts'); ?></b>&emsp;
+                                                <span class="requestAnrechnung-anrechnungInfoTooltip" data-toggle="tooltip" data-placement="right"
+                                                      title="<?php echo $this->p->t('anrechnung', 'anrechnungBegruendungEctsTooltipText'); ?>">
+                                                    <i class="fa fa-lg fa-info-circle" aria-hidden="true"></i>
+                                                </span>
+                                            </div>
+                                            <div class="panel-body">
+                                                <textarea class="form-control" name="begruendung_ects" rows="1" id="requestAnrechnung-begruendungEcts"
+                                                          maxlength="<?php echo CHAR_LENGTH150 ?>" required><?php echo $anrechnungData->begruendung_ects; ?></textarea>
+                                                <small><span class="text-muted pull-right"><?php echo $this->p->t('ui', 'maxZeichen'); ?> :<span id="requestAnrechnung-begruendungEcts-charCounter"><?php echo CHAR_LENGTH150 ?></span></span></small>
+                                            </div>
                                         </div>
                                     </div>
                                 </div>
-                            </div>
-                            <!-- Begruendung LV Inhalt -->
-                            <div class="row">
+                                <!-- Begruendung LV Inhalt -->
+                                <div class="row">
                                 <div class="col-lg-12">
                                     <div class="panel panel-default">
                                         <div class="panel-heading">
@@ -240,6 +243,8 @@ $this->load->view(
                                     </div>
                                 </div>
                             </div>
+							<?php endif; ?>
+
 							<!-- Dokument Upload-->
 							<div class="row">
 								<div class="col-lg-12">
diff --git a/application/views/lehre/anrechnung/reviewAnrechnungDetail.php b/application/views/lehre/anrechnung/reviewAnrechnungDetail.php
index 08d23d8c4..98fee67a3 100644
--- a/application/views/lehre/anrechnung/reviewAnrechnungDetail.php
+++ b/application/views/lehre/anrechnung/reviewAnrechnungDetail.php
@@ -1,4 +1,5 @@
 <?php
+$this->load->config('anrechnung');
 $this->load->view(
 	'templates/FHC-Header',
 	array(
@@ -143,14 +144,16 @@ $this->load->view(
 													   target="_blank"><?php echo htmlentities($anrechnungData->dokumentname) ?></a>
 												</td>
 											</tr>
-                                            <tr>
-                                                <th class="col-xs-4"><?php echo $this->p->t('anrechnung', 'begruendungEctsLabel'); ?></th>
-                                                <td><span><?php echo $anrechnungData->begruendung_ects ?></span></td>
-                                            </tr>
-                                            <tr>
-                                                <th class="col-xs-4"><?php echo $this->p->t('anrechnung', 'begruendungLvinhaltLabel'); ?></th>
-                                                <td><span><?php echo $anrechnungData->begruendung_lvinhalt ?></span></td>
-                                            </tr>
+											<?php if ($this->config->item('explain_equivalence')): ?>
+                                                <tr>
+                                                    <th class="col-xs-4"><?php echo $this->p->t('anrechnung', 'begruendungEctsLabel'); ?></th>
+                                                    <td><span><?php echo $anrechnungData->begruendung_ects ?></span></td>
+                                                </tr>
+                                                <tr>
+                                                    <th class="col-xs-4"><?php echo $this->p->t('anrechnung', 'begruendungLvinhaltLabel'); ?></th>
+                                                    <td><span><?php echo $anrechnungData->begruendung_lvinhalt ?></span></td>
+                                                </tr>
+											<?php endif; ?>
 											</tbody>
 										</table>
 

From a728bec15f43cd87c20a663b3816fdfbbcc1f77f Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 11 Jul 2024 10:52:59 +0200
Subject: [PATCH 0904/1461] BewerberZuStudent: new action turnIntoStudent

---
 .../api/frontend/v1/stv/Status.php            | 269 +++++++++++++++++-
 application/libraries/PrestudentLib.php       |  96 ++++++-
 application/models/crm/Student_model.php      |  97 +++++++
 application/models/person/Benutzer_model.php  |  76 +++++
 application/models/person/Notiz_model.php     |   1 -
 application/models/person/Person_model.php    |  49 ++++
 .../Details/Prestudent/MultiStatus.js         | 181 +++++++-----
 system/phrasesupdate.php                      |  22 +-
 8 files changed, 691 insertions(+), 100 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 9995320ea..3a253b3e2 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -11,14 +11,17 @@ class Status extends FHCAPI_Controller
 		parent::__construct([
 			'getHistoryPrestudent' => ['admin:r', 'assistenz:r'],
 			'addNewStatus' => ['admin:r', 'assistenz:r', 'student/keine_studstatuspruefung'],
+			'turnIntoStudent' => ['admin:r', 'assistenz:r', 'student/keine_studstatuspruefung'],
 			'getStatusgruende' => self::PERM_LOGGED,
 			'getLastBismeldestichtag' => self::PERM_LOGGED,
 			'isLastStatus' => self::PERM_LOGGED,
+			'isErsterStudent' => self::PERM_LOGGED,
 			'deleteStatus' => ['admin:r','assistenz:r'],
 			'loadStatus' => ['admin:r', 'assistenz:r'],
 			'updateStatus' => ['admin:r', 'assistenz:r'],
 			'advanceStatus' => ['admin:r', 'assistenz:r'],
-			'confirmStatus' => ['admin:r', 'assistenz:r']
+			'confirmStatus' => ['admin:r', 'assistenz:r'],
+
 		]);
 
 		//Load Models
@@ -91,6 +94,23 @@ class Status extends FHCAPI_Controller
 		return $this->terminateWithSuccess($result);
 	}
 
+	public function isErsterStudent($prestudent_id)
+	{
+		//check if studentrolle already exists
+		$this->load->model('crm/Student_model','StudentModel');
+		$result = $this->StudentModel->checkIfExistingStudentRolle($prestudent_id);
+		if (isError($result))
+		{
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		if($result->retval == "0")
+		{
+			return $this->terminateWithSuccess($result);
+		}
+		return $this->terminateWithSuccess($result);
+
+	}
+
 	public function addNewStatus($prestudent_id)
 	{
 		//get Studiengang von prestudent_id
@@ -129,7 +149,7 @@ class Status extends FHCAPI_Controller
 		$statusgrund_id = $this->input->post('statusgrund_id');
 		$rt_stufe = $this->input->post('rt_stufe');
 		$bestaetigtvon = $uid;
-		$name = $this->input->post('name');
+		//$name = $this->input->post('name');
 
 		//Form Validation
 		$this->load->library('form_validation');
@@ -213,6 +233,7 @@ class Status extends FHCAPI_Controller
 		}
 		$result = current(getData($result));
 		$typ = $result->typ;
+		//$stgkzl = $result->kurzbz;
 
 		if(!defined("ZGV_CHECK") || ZGV_CHECK)
 		{
@@ -413,14 +434,248 @@ class Status extends FHCAPI_Controller
 					]
 				);
 
-				if (isError($result)) {
+				if (isError($result))
+				{
 					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-				} else
+				}
+				else
 					$this->terminateWithSuccess($prestudent_id);
 			}
 		}
 	}
 
+	public function turnIntoStudent($prestudent_id)
+	{
+		//get Studiengang von prestudent_id
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+		$this->PrestudentModel->addJoin('public.tbl_person p', 'ON (p.person_id = public.tbl_prestudent.person_id)');
+		$this->PrestudentModel->addJoin('public.tbl_studiengang sg', 'ON (sg.studiengang_kz = public.tbl_prestudent.studiengang_kz)');
+		$result = $this->PrestudentModel->load([
+			'prestudent_id' => $prestudent_id,
+		]);
+		if (isError($result)) {
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		$result = current(getData($result));
+
+		$stg = $result->studiengang_kz;
+		$stgkzl = $result->kurzbz;
+		$person_id = $result->person_id;
+
+		if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg)) {
+			$result = $this->p->t('lehre', 'error_keineSchreibrechte');
+
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+
+		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+
+		$uid = getAuthUID();
+		$status_kurzbz = $this->input->post('status_kurzbz');
+		$ausbildungssemester = $this->input->post('ausbildungssemester');
+		$bestaetigtam = $this->input->post('bestaetigtam');
+		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
+		$bestaetigtvon = $uid;
+
+		//Form Validation
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('ausbildungssemester', 'Ausbildungssemester', 'integer', [
+			'integer' => $this->p->t('ui', 'error_fieldNotInteger', ['field' => 'Ausbildungssemester'])
+		]);
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		//GET lastStatus
+		$result = $this->PrestudentstatusModel->getLastStatus($prestudent_id);
+
+		if (isError($result)) {
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		} elseif (!hasData($result)) {
+			$lastStatusData = [];
+		} else
+			$lastStatusData = current(getData($result));
+
+		//check if studentrolle already exists
+		$this->load->model('crm/Student_model', 'StudentModel');
+		$result = $this->StudentModel->checkIfExistingStudentRolle($prestudent_id);
+		if (isError($result)) {
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		if ($result->retval == "0") {
+			$isStudent = false;
+		} else
+			$isStudent = true;
+
+		if (!$isStudent) {
+			//check if bewerberstatus exists
+			$result = $result = $this->prestudentstatuschecklib->checkIfExistingBewerberstatus($prestudent_id);
+			if (isError($result)) {
+				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			}
+
+			//Check ZGV
+			if ($status_kurzbz == Prestudentstatus_model::STATUS_BEWERBER) {
+				$result = $this->prestudentstatuschecklib->checkIfZGVEingetragen($prestudent_id);
+				if (isError($result)) {
+					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+				}
+			}
+
+			//Check ZGV-Master
+			$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+			$result = $this->StudiengangModel->load([
+				'studiengang_kz' => $stg
+			]);
+			if (isError($result)) {
+				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+				return $this->outputJson(getError($result));
+			}
+			$result = current(getData($result));
+			$typ = $result->typ;
+
+			if (!defined("ZGV_CHECK") || ZGV_CHECK) {
+				if ($status_kurzbz == Prestudentstatus_model::STATUS_BEWERBER && $typ == 'm') {
+					$result = $this->prestudentstatuschecklib->checkIfZGVEingetragen($prestudent_id, $typ);
+					if (isError($result)) {
+						return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+					}
+				}
+			}
+
+			//checkIf Kaution bezahlt
+			//TODO(Manu)
+
+			//generate Personenkennzeichen(matrikelnr)
+			//TODO(manu) check if generateMatrikelnummer verwenden or use new version2 (with Type Param)
+			$resultMat = $this->StudentModel->generateMatrikelnummer2($stg, $studiensemester_kurzbz, $typ);
+			if (isError($resultMat)) {
+				return $this->terminateWithError($resultMat, self::ERROR_TYPE_GENERAL);
+			}
+			$matrikelnr = getData($resultMat);
+			$jahr = mb_substr($matrikelnr, 0, 2);
+
+			//generate UID
+			//TODO(Manu) check ausbildungssemester: testfall prestudent_id 26381
+			$resultUid = $this->StudentModel->generateUID($stgkzl, $jahr, $typ, $matrikelnr);
+			if (isError($resultMat)) {
+				return $this->terminateWithError("in generateUid" . $resultUid, self::ERROR_TYPE_GENERAL);
+			}
+			$uidStudent = getData($resultUid);
+
+			//Check for additional logic (config entries, addons)
+			//TODO(Manu) check include/tw/generatematrikelnr.inc.php
+			//(1) addons durchsuchen, ob eigene Logik für Matrikelnr-erstellung existiert
+			//Default: keine Matrikelnummer wird generiert
+
+			//(2) personenkz = uid
+			if (defined('SET_UID_AS_PERSONENKENNZEICHEN') && SET_UID_AS_PERSONENKENNZEICHEN) {
+				$matrikelnr = $uidStudent;
+			}
+
+			//(3) Matrikelnummer = uid
+			if (defined('SET_UID_AS_MATRIKELNUMMER') && SET_UID_AS_MATRIKELNUMMER) {
+				//update person
+				$result = $this->PersonModel->update(
+					[
+						'person_id' => $person_id,
+					],
+					[
+						'matr_nr' => $uidStudent,
+					]
+				);
+				if (isError($result)) {
+					return $this->terminateWithError("uidAsMatrikelnummer" . getError($result), self::ERROR_TYPE_GENERAL);
+				}
+			}
+
+			//TODO(Manu) check if benutzer already exists ok?
+			//person kann mehrere Benutzer haben...
+			//add benutzerdatensatz mit Aktierungscode
+			$this->load->model('person/Benutzer_model', 'BenutzerModel');
+			$result = $this->BenutzerModel->checkIfExistingBenutzer($person_id);
+			if (isError($result)) {
+				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			}
+			if ($result->retval == "0") {
+
+				//activation key
+				$aktivierungscode = null;
+				$result = $this->BenutzerModel->generateActivationKey();
+				if (isError($result)) {
+					return $this->terminateWithError("in Error " . $result, self::ERROR_TYPE_GENERAL);
+				}
+				$aktivierungscode = getData($result);
+
+
+				//Alias generieren
+				$result = $this->PersonModel->generateAliasByPersonId($person_id);
+				if (isError($result)) {
+					return $this->terminateWithError("in generate alias " . $result, self::ERROR_TYPE_GENERAL);
+				}
+				$alias = getData($result) ?: null;
+				$alias = $alias->retval[0];
+
+				$sanitizedVorname = $this->_sanitizeAliasName($alias->vorname);
+				$sanitizedNachname = $this->_sanitizeAliasName($alias->nachname);
+
+				// Erstelle den Alias
+				$alias = $sanitizedVorname . '.' . $sanitizedNachname;
+
+				if (isError($result)) {
+					return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+				}
+
+				$result = $this->BenutzerModel->insert(
+					[
+						'person_id' => $person_id,
+						'uid' => $uidStudent,
+						'aktiv' => true,
+						'aktivierungscode' => $aktivierungscode,
+						'alias' => $alias,
+						'insertvon' => $uid,
+						'insertamum' => date('c'),
+					]
+				);
+
+				if (isError($result)) {
+					return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+				}
+
+			} else
+				return $this->terminateWithError("Benutzer already existing" . $person_id, self::ERROR_TYPE_GENERAL);
+
+			//Student anlegen
+			$result = $this->StudentModel->insert(
+				[
+					'student_uid' => $uidStudent,
+					'prestudent_id' => $prestudent_id,
+					'matrikelnr' => $matrikelnr,
+					'studiengang_kz' => $stg,
+					'semester' => $ausbildungssemester,
+					'verband' => '',
+					'gruppe' => '',
+					'insertvon' => $uid,
+					'insertamum' => date('c')
+				]
+			);
+			if (isError($result))
+			{
+				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			}
+
+			$this->load->library('PrestudentLib');
+			$result = $this->prestudentlib->setFirstStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, null, $bestaetigtam, $bestaetigtvon, $stg, $uidStudent);
+
+			if (isError($result)) {
+				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			} else
+				$this->terminateWithSuccess($prestudent_id);
+
+		}
+	}
+
 	public function loadStatus()
 	{
 		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
@@ -1331,4 +1586,10 @@ class Status extends FHCAPI_Controller
 		}
 		return $this->outputJsonSuccess(true);
 	}
+
+	private function _sanitizeAliasName($str)
+	{
+		$str = sanitizeProblemChars($str);
+		return mb_strtolower(str_replace(' ','_', $str));
+	}
 }
diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php
index b1a94490c..693f328f5 100644
--- a/application/libraries/PrestudentLib.php
+++ b/application/libraries/PrestudentLib.php
@@ -421,7 +421,6 @@ class PrestudentLib
 		return success();
 	}
 
-
 	public function setStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id, $bestaetigtAm, $bestaetigtVon)
 	{
 		$insertvon = getAuthUID();
@@ -522,6 +521,101 @@ class PrestudentLib
 		return success();
 	}
 
+	public function setFirstStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id, $bestaetigtAm, $bestaetigtVon, $stg_kz, $uidStudent)
+	{
+		$insertvon = getAuthUID();
+
+		$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
+		if (isError($result))
+			return $result;
+		$resultStatus = getData($result);
+
+		//check if ausbildungssemester is last
+		$this->_ci->StudiengangModel->addJoin('public.tbl_prestudent p', 'studiengang_kz');
+		$resultStg = $this->_ci->StudiengangModel->loadWhere(['p.prestudent_id' => $prestudent_id]);
+		if(isError($resultStg))
+			return $resultStg;
+/*		if(!hasData($resultStg))
+			return error($this->_ci->p->t('studierendenantrag', 'error_no_stg_for_prestudent', [
+				'prestudent_id' => $prestudent_id
+			]));*/
+
+
+		$studiengang = current(getData($resultStg)) ?: null;
+
+		$prestudent_status = ($resultStatus[0]);
+		if(!$prestudent_status)
+		{
+			return error($this->_ci->p->t('studierendenantrag', 'error_no_prestudent_in_sem', [
+				'prestudent_id' => $prestudent_id,
+				'studiensemester_kurzbz' => $studiensemester_kurzbz
+			]));
+		}
+
+/*		$result = $this->_ci->StudentModel->loadWhere(['prestudent_id' => $prestudent_id]);
+
+		if (isError($result))
+			return $result;
+		$result = getData($result);
+		if (!$result)
+			return error($this->_ci->p->t('studierendenantrag', 'error_no_student_for_prestudent', ['prestudent_id' => $prestudent_id]));
+
+		$student = current($result);*/
+
+		//Status updaten
+		$result = $this->_ci->PrestudentstatusModel->insert([
+			'prestudent_id' => $prestudent_id,
+			'status_kurzbz' => Prestudentstatus_model::STATUS_STUDENT,
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'ausbildungssemester' => $ausbildungssemester,
+			'datum' => date('c'),
+			'insertvon' => $insertvon,
+			'insertamum' => date('c'),
+			'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz,
+			'studienplan_id'=> $prestudent_status->studienplan_id,
+			'bestaetigtvon' => $bestaetigtVon,
+			'bestaetigtam' => $bestaetigtAm
+		]);
+
+		if (isError($result))
+			return $result;
+
+/*		$result = $this->_ci->StudentModel->checkIfUid($prestudent_id);
+		if (isError($result)) {
+			return $result;
+		}
+		$student_uid = $result->retval;*/
+
+		//load student
+/*		$result = $this->_ci->StudentModel->loadWhere(
+			array(
+				'student_uid' => $uidStudent
+			)
+		);
+		if (isError($result))
+		{
+			return $result;
+		}
+
+		$studentData = current(getData($result) ? : []);*/
+		$verband = '';
+		$gruppe = '';
+		$studiengang_kz = $stg_kz;
+
+		//process studentlehrverband
+		$this->_ci->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
+		$result = $this->_ci->StudentlehrverbandModel->processStudentlehrverband(
+			$uidStudent,
+			$studiengang_kz,
+			$ausbildungssemester,
+			$verband,
+			$gruppe,
+			$studiensemester_kurzbz
+		);
+
+		return success();
+	}
+
 	public function setDiplomand($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester)
 	{
 		$insertvon = getAuthUID();
diff --git a/application/models/crm/Student_model.php b/application/models/crm/Student_model.php
index ec97aefcc..eede97037 100644
--- a/application/models/crm/Student_model.php
+++ b/application/models/crm/Student_model.php
@@ -43,9 +43,106 @@ class Student_model extends DB_Model
 			$max = 0;
 
 		$max += 1;
+
 		return $matrikelnummer.sprintf("%03d", $max);
 	}
 
+	// ****
+	// * Generiert die Matrikelnummer
+	// * FORMAT: 0710254001
+	// * 07 = Jahr
+	// * 1/2/0  = WS/SS/incoming
+	// * 0254 = Studiengangskennzahl vierstellig
+	// * 001 = Laufende Nummer
+	// * copy of generateMatrikelnummer plus
+	// * logic FH Burgenland
+	// ****
+	public function generateMatrikelnummer2($studiengang_kz, $studiensemester_kurzbz, $typ = null)
+	{
+		// Validierung der Eingabewerte
+		if (strlen($studiensemester_kurzbz) < 6) {
+			throw new InvalidArgumentException("Ungültiges studiensemester_kurzbz Format.");
+		}
+
+		$jahr = mb_substr($studiensemester_kurzbz, 4);
+		$art = substr($studiensemester_kurzbz, 0, 2);
+
+		if (($studiengang_kz < 0) || (isset($typ) && ($typ == 'l')))
+		{
+			$studiengang_kz=abs($studiengang_kz);
+			//Lehrgang
+			switch($art)
+			{
+				case 'WS': $art = '3'; break;
+				case 'SS': $art = '4'; break;
+				default: $art = '0'; break;
+			}
+		}
+		else
+		{
+			//Studiengang
+			switch($art)
+			{
+				case 'WS': $art = '1'; break;
+				case 'SS': $art = '2'; break;
+				default: $art = '0'; break;
+			}
+		}
+		if($art=='2' || $art=='4')
+			$jahr = $jahr-1;
+
+		//FH-Burgenland - weil leider die AO Studiengänge aufgeteilt sind
+		//(AO sind normal 9+erhalter Nummer, matrikelnr/personenkz wird auch im DVUH Extension berücksichtigt)
+		if ($studiengang_kz >= 90010 && $studiengang_kz <= 90019)
+		{
+			$matrikelnummer = sprintf("%02d",$jahr).$art.substr($studiengang_kz, 0, 4);
+		}
+		else
+		{
+			$matrikelnummer = sprintf("%02d",$jahr).$art.sprintf("%04d",$studiengang_kz);
+		}
+
+		$qry = "SELECT matrikelnr FROM public.tbl_student WHERE matrikelnr LIKE ? ORDER BY matrikelnr DESC LIMIT 1";
+		$matrikelnrres = $this->execQuery($qry, array($matrikelnummer.'%'));
+
+		$max = 0;
+		if ($matrikelnrres && hasData($matrikelnrres)) {
+			$max = mb_substr($matrikelnrres->retval[0]->matrikelnr, 7);
+			if (!is_numeric($max)) {
+				$max = 0;
+			}
+		}
+
+		$max += 1;
+		return success ($matrikelnummer.sprintf("%03d", $max));
+	}
+
+	// ****
+	// * Generiert die UID
+	// * FORMAT: el07b001
+	// * $stgkzl: el = studiengangskuerzel
+	// * $jahr: 07 = Jahr
+	// * $stgtyp: b/m/d/x = Bachelor/Master/Diplom/Incoming
+	// * $matrikelnummer
+	// * 001 = Laufende Nummer  Wenn StSem==SS dann wird zur Nummer 500 dazugezaehlt
+	// * Bei Incoming im Masterstudiengang wird auch 500 dazugezaehlt
+	// ****
+	function generateUID($stgkzl, $jahr, $stgtyp, $matrikelnummer)
+	{
+		$art = mb_substr($matrikelnummer, 2, 1);
+		$nr = mb_substr($matrikelnummer, mb_strlen(trim($matrikelnummer))-3);
+		if($art=='2') //Sommersemester
+			$nr = $nr+500;
+		elseif($art=='0' && $stgtyp=='m') //Incoming im Masterstudiengang
+			$nr = $nr+500;
+		elseif($art=='4' && $stgtyp=='l') // Lehrgangsteilnehmer im Sommersemester
+			$nr = $nr+500;
+
+
+		return success (mb_strtolower($stgkzl.$jahr.($art!='0'?$stgtyp:'x').$nr));
+	}
+
+
 	/**
 	 * Get students UID by PrestudentID.
 	 * @param $prestudent_id
diff --git a/application/models/person/Benutzer_model.php b/application/models/person/Benutzer_model.php
index eff1329a6..04f689585 100644
--- a/application/models/person/Benutzer_model.php
+++ b/application/models/person/Benutzer_model.php
@@ -89,9 +89,31 @@ class Benutzer_model extends DB_Model
 			if (hasData($aliasexists) && !getData($aliasexists)[0])
 				$aliasres = $alias;
 		}
+
 		return success($aliasres);
 	}
 
+	/**
+	 * Generates alias for a uid.
+	 * @param $uid
+	 * @return array the alias if newly generated
+	 */
+	public function generateAliasByPersonId($person_id)
+	{
+		$sql = 'SELECT p.vorname, p.nachname
+				FROM public.tbl_person p
+				where person_id = ?';
+
+		$nameresult = $this->execQuery($sql, array($person_id));
+
+		$nameresult = getData($nameresult) ?: null;
+
+	//	if($aliasdata)
+	//		$alias = $this->_sanitizeAliasName($aliasdata->vorname).'.'.$this->_sanitizeAliasName($aliasdata->nachname);
+
+		return success($nameresult->vorname . " " . $nameresult->nachname);
+	}
+
 	// --------------------------------------------------------------------------------------------
 	// Private methods
 
@@ -105,4 +127,58 @@ class Benutzer_model extends DB_Model
 		$str = sanitizeProblemChars($str);
 		return mb_strtolower(str_replace(' ','_', $str));
 	}
+
+	/**
+	 * Generiert einen Aktivierungscode
+	 */
+	function generateActivationKey()
+	{
+		$keyvalues=array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F');
+		$key='';
+		for($i=0;$i<32;$i++)
+			$key.=$keyvalues[mt_rand(0,15)];
+
+		return success(md5(encryptData(uniqid(mt_rand(), true),$key)));
+	}
+
+	/**
+	 * Check if Benutzer already exists
+	 * @param integer $person_id
+	 * @return 0 if not exists, 1 if it does
+	 */
+	public function checkIfExistingBenutzer($person_id)
+	{
+		$qry = "SELECT 
+    				count(*) as anzahl 
+				FROM 
+				    public.tbl_benutzer 
+				WHERE 
+				    person_id = ? ";
+
+		$result = $this->execQuery($qry, array($person_id));
+
+		if (isError($result))
+		{
+			return error($result);
+		}
+		else
+		{
+			$resultObject = current(getData($result));
+
+			if (property_exists($resultObject, 'anzahl')) {
+				$resultValue = (int) $resultObject->anzahl;
+
+				if ($resultValue > 0)
+				{
+					return success("1");
+				}
+				else
+				{
+					return success("0");
+				}
+			} else {
+				return error("BenutzerModel: Error During Check if Existing Benutzer.");
+			}
+		}
+	}
 }
diff --git a/application/models/person/Notiz_model.php b/application/models/person/Notiz_model.php
index 560d6c0c7..d3bed7e56 100644
--- a/application/models/person/Notiz_model.php
+++ b/application/models/person/Notiz_model.php
@@ -180,7 +180,6 @@ class Notiz_model extends DB_Model
 		{
 			$notiz_id = $result->retval;
 
-			//TODO(Manu) neue Function assign Notiz
 			if($type == "software_id")
 			{
 				// Loads extension Model
diff --git a/application/models/person/Person_model.php b/application/models/person/Person_model.php
index 88813220e..7cfa63369 100644
--- a/application/models/person/Person_model.php
+++ b/application/models/person/Person_model.php
@@ -374,5 +374,54 @@ class Person_model extends DB_Model
 			'prestudent_id' => $prestudent_id
 		]);
 	}
+
+	public function generateAliasByPersonId($person_id)
+	{
+
+		$this->addSelect('vorname, nachname');
+
+		return success ($this->loadWhere(array('person_id' => $person_id)));
+	}
+
+/*	public function generateAliasByPersonId($person_id)
+	{
+
+		$this->addSelect('vorname, nachname');
+
+		$result = $this->loadWhere(array('person_id' => $person_id));
+
+		// Überprüfe, ob ein Ergebnis zurückgegeben wurde
+		if ($result) {
+			$result = getData($result);
+			$result = $result->retval[0];
+			$vorname = $result->vorname;
+			$nachname = $result->nachname;
+
+			// Sanitize the extracted names
+			$sanitizedVorname = $this->sanitizeAliasName($vorname);
+			$sanitizedNachname = $this->sanitizeAliasName($nachname);
+
+			// Erstelle den Alias
+			$alias = $sanitizedVorname . '.' . $sanitizedNachname;
+
+			// Gib den Erfolg zurück mit dem generierten Alias
+			return success($alias);
+		} else {
+				// Falls kein Ergebnis gefunden wurde, gib einen Fehler zurück
+				return error('Person not found');
+			}
+
+	}*/
+
+	/**
+	 * Sanitizes a string used for alias. Replaces special characters, spaces, sets lower case.
+	 * @param string $str
+	 * @return string
+	 */
+	public function sanitizeAliasName($str)
+	{
+		$str = sanitizeProblemChars($str);
+		return success (mb_strtolower(str_replace(' ','_', $str)));
+	}
 }
 
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index ca3f3bd81..7dab9e51c 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -275,7 +275,8 @@ export default{
 			newArray: {},
 			abbruchData: {},
 			newStatus: '',
-			statusNew: true
+			statusNew: true,
+			isErsterStudent: false
 		}
 	},
 	watch: {
@@ -411,7 +412,8 @@ export default{
 				};
 
 			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData, ausbildungssemester: this.actionSem}));
-			this.addNewStatus(prestudentIds);
+			//BewerberZuStudent
+			this.turnIntoStudent(prestudentIds);
 		},
 		changeStatusToWiederholer(prestudentIds){
 			this.hideModal('askForAusbildungssemester');
@@ -457,6 +459,98 @@ export default{
 /*			console.log("in changeStatusToAbsolvent" + prestudentIds);
 			this.hideModal('addMultiStatus');*/
 			this.addNewStatus(prestudentIds);
+		},
+		turnIntoStudent(prestudentIds){
+
+			//erste Voraussetzung: kein check auf checkIfExistingStudent
+			// macht aus einem Bewerber einen Studenten
+			// Voraussetzungen:
+			// - ZGV muss ausgefuellt sein (bei Master beide)
+			// - Kaution muss bezahlt sein
+			// - Rolle Bewerber muss existieren
+			// Wenn die Voraussetzungen erfuellt sind, dann wird die Matrikelnr
+			// und UID generiert und der Studentendatensatz angelegt.
+			let changeData = {};
+
+			//for Feedback Sucess, Error
+			let countSuccess = 0;
+			let countError = 0;
+
+			const promises = prestudentIds.map(prestudentId => {
+
+				this.checkIfErsterStudent(prestudentId).then(() => {
+
+					if(this.isErsterStudent)
+					{
+						console.log(prestudentId + ": isersterStudent: " + this.isErsterStudent + " Logik turnIntoStudent");
+
+						changeData = this.newArray.find(item => item.prestudent_id === prestudentId);
+
+						return this.$fhcApi.post('api/frontend/v1/stv/status/turnIntoStudent/' + prestudentId,
+							changeData
+						).then(response => {
+							countSuccess++;
+							return response;
+						})
+							//.catch(this.$fhcAlert.handleSystemError)
+							.catch(error => {
+								countError++;
+								//For each Prestudent show Error in Alert
+								this.$fhcAlert.handleSystemError(error);
+							});
+					}
+					else
+					{
+						console.log(prestudentId + ": isersterStudent: " + this.isErsterStudent + " Add New Status");
+
+						changeData = this.newArray.find(item => item.prestudent_id === prestudentId);
+
+						return this.$fhcApi.post('api/frontend/v1/stv/status/addNewStatus/' + prestudentId,
+							changeData
+						).then(response => {
+							countSuccess++;
+							return response;
+						})
+							//.catch(this.$fhcAlert.handleSystemError)
+							.catch(error => {
+								countError++;
+								//For each Prestudent show Error in Alert
+								this.$fhcAlert.handleSystemError(error);
+							});
+					}
+				});
+			});
+
+			Promise
+				.allSettled(promises)
+				.then(values => {
+
+					//Feedback Success als infoalert
+					if (countSuccess > 0) {
+						this.$fhcAlert.alertInfo(this.$p.t('ui', 'successNewStatus', {
+							'countSuccess': countSuccess,
+							'status': this.newStatus,
+							'countError': countError
+						}));
+					}
+
+/*					if (this.modelValue.prestudent_id) {
+						this.reload();
+						//TODO(manu) reload Detailtab after Abbrecher to see current status activ, verband and gruppe
+						//TODO(manu) reload Tab STatus after turned Into Student to see new status
+					}*/
+					if(this.isErsterStudent) {
+						this.reload();
+						this.isErsterStudent = false;
+					}
+					else {
+						this.$reloadList();
+					}
+					this.hideModal('statusModal');
+					this.resetModal();
+				});
+
+
 		},
 		addNewStatus(prestudentIds){
 			//Array.isArray(prestudentIds) ? this.modelValue.prestudent_id : [prestudentIds];
@@ -600,6 +694,16 @@ export default{
 					})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
+		checkIfErsterStudent(prestudent_id){
+			return this.$fhcApi
+				.get('api/frontend/v1/stv/status/isErsterStudent/' + prestudent_id)
+				.then(
+					result => {
+						this.isErsterStudent = result.data.retval == 0 ? 1 : 0;
+						return result;
+					})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
 		loadStatus(status_id){
 			this.statusNew = false;
 			return this.$fhcApi.post('api/frontend/v1/stv/status/loadStatus/',
@@ -659,7 +763,6 @@ export default{
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 	},
-	mounted(){},
 	template: `
 		<div class="stv-list h-100 pt-3">
 			
@@ -863,75 +966,7 @@ export default{
 					</div>					
 				</template>
 			</BsModal>
-			
-<!--			<BsModal ref="addMultiStatus" id="addMultiStatus">
-				<template #title>Status ändern zu</template>
-				<template #default>
-					<button type="button" class="btn btn-primary d-block mb-2" data-bs-toggle="collapse" data-bs-target="#submenu1">
-						Abbrecher
-					</button>
-					<div class="collapse" id="submenu1">
-						<button type="button" class="btn btn-light d-block mb-2" @click="actionConfirmDialogue(updateData, 'abbrecherStgl', 'Abbrecher')">durch Stgl</button>
-						<button type="button" class="btn btn-light d-block mb-2" @click="actionConfirmDialogue(updateData, 'abbrecherStud','Abbrecher')">durch Student</button>
-					</div>
-				
-					<button type="button" class="btn btn-primary d-block mb-2" @click="actionConfirmDialogue(updateData, 'unterbrecher','Unterbrecher')">
-						Unterbrecher
-					</button>
-					
-					<button type="button" class="btn btn-primary d-block mb-2" data-bs-toggle="collapse" data-bs-target="#submenu2">
-						Student
-					</button>
-					<div class="collapse" id="submenu2">
-						<button type="button" class="btn btn-light d-block mb-2" @click="actionConfirmDialogue(updateData, 'student','Student')">Student</button>
-						<button type="button" class="btn btn-light d-block mb-2" @click="actionConfirmDialogue(updateData, 'student','Wiederholer')">Wiederholer</button>
-					</div>
-				   
-					<button type="button" class="btn btn-primary d-block mb-2" @click="changeStatusToDiplomand(prestudentIds)">
-						Diplomand
-					</button>	
-					<button type="button" class="btn btn-primary d-block mb-2" @click="changeStatusToAbsolvent(prestudentIds)">
-						Absolvent
-					</button>
-					
-				</template>
-				<template #footer>
-					<div v-if="actionButton=='abbrecherStgl'">
-						<button  ref="Close" type="button" class="btn btn-primary" @click="changeStatusToAbbrecherStgl(prestudentIds)">OK</button>
-					</div>
-					<div v-if="actionButton=='abbrecherStud'">
-						<button  ref="Close" type="button" class="btn btn-primary" @click="changeStatusToAbbrecherStud(prestudentIds)">OK</button>
-					</div>
-					<div v-if="actionButton=='unterbrecher'">
-						<button  ref="Close" type="button" class="btn btn-primary" @click="changeStatusToUnterbrecher(prestudentIds)">OK</button>
-					</div>					
-				</template>
-			</BsModal>-->
-			
-<!--			<ul class="dropdown-menu" ref="addMultiStatus3" id="addMultiStatus3">
-				<li class="dropdown-submenu">
-					<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'abbrecherStgl', 'Abbrecher')">Abbrecher durch Stgl 5</a>
-				</li>
-				<li class="dropdown-submenu">
-					<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'abbrecherStud','Abbrecher')">Abbrecher durch Student</a>
-				</li>
-				<li class="dropdown-submenu">
-					<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'unterbrecher','Unterbrecher')">Unterbrecher</a>
-				</li>
-				<li class="dropdown-submenu">
-					<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'student','Student')">Student</a>
-				</li>
-				<li class="dropdown-submenu">
-					<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'student','Wiederholer')">Wiederholer</a>
-				</li>
-				<li class="dropdown-submenu">
-					<a class="dropdown-item" @click="changeStatusToDiplomand(prestudentIds)">Diplomand</a>
-				</li>
-				<li class="dropdown-submenu">
-					<a class="dropdown-item" @click="changeStatusToAbsolvent(prestudentIds)">Absolvent</a>
-				</li>							
-			</ul>-->
-			
+								
 			<!--Modal: askForAusbildungssemester-->
 			<BsModal ref="askForAusbildungssemester">
 				<template #title>{{$p.t('lehre', 'status_edit')}}</template>
@@ -1029,7 +1064,7 @@ export default{
 				<button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
 					Status Ändern
 				</button>
-			
+							
 				<ul class="dropdown-menu">
 					<li class="dropdown-submenu">
 						<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'abbrecherStgl', 'Abbrecher')">Abbrecher durch Stgl</a>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 0de6eb923..9c00104e2 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -25974,27 +25974,7 @@ array(
 				'insertvon' => 'system'
 			)
 		)
-	),
-	array(
-		'app' => 'core',
-		'category' => 'lehre',
-		'phrase' => 'modal_askAusbildungssemPlural2',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'In welches Semester sollen diese {count} PrestudentInnen ({status}) verschoben werden?',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'To which education semester should these {count} prestudents ({status}) be moved?',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
+	)
 	//Prestudent
 	array(
 		'app' => 'core',

From a23b133217d7940c9ab3fc46782a9f70eb7384d7 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Thu, 11 Jul 2024 10:54:43 +0200
Subject: [PATCH 0905/1461] Adapted requestAnrechnung.js to handle submit data
 and events on Begruendung-zur-Gleichwertigkeit fields

...depending on $config['explain_equivalence']
---
 .../js/lehre/anrechnung/requestAnrechnung.js  | 32 ++++++++++++-------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/public/js/lehre/anrechnung/requestAnrechnung.js b/public/js/lehre/anrechnung/requestAnrechnung.js
index 2947aebe9..0a8a09ea0 100644
--- a/public/js/lehre/anrechnung/requestAnrechnung.js
+++ b/public/js/lehre/anrechnung/requestAnrechnung.js
@@ -101,8 +101,12 @@ $(function(){
                 begruendung: this.begruendung.value,
                 lv_id: this.lv_id.value,
                 studiensemester: this.studiensemester.value,
-                begruendung_ects: this.begruendung_ects.value,
-                begruendung_lvinhalt: this.begruendung_lvinhalt.value,
+                begruendung_ects: this.begruendung_ects && this.begruendung_ects.value
+                    ? this.begruendung_ects.value
+                    : null,
+                begruendung_lvinhalt: this.begruendung_lvinhalt && this.begruendung_lvinhalt.value
+                    ? this.begruendung_lvinhalt.value
+                    : null,
                 bestaetigung: this.bestaetigung.value,
                 uploadfile: this.uploadfile.files
             },
@@ -216,18 +220,22 @@ var requestAnrechnung = {
             $('#requestAnrechnung-herkunftDerKenntnisse-charCounter').text(length);
         });
 
-        $('#requestAnrechnung-begruendungEcts').keyup(function() {
-            let length = CHAR_LENGTH150 - $(this).val().length;
-            $('#requestAnrechnung-begruendungEcts-charCounter').text(length);
-        });
+        if ($('#requestAnrechnung-begruendungEcts').length) {
+            $('#requestAnrechnung-begruendungEcts').keyup(function () {
+                let length = CHAR_LENGTH150 - $(this).val().length;
+                $('#requestAnrechnung-begruendungEcts-charCounter').text(length);
+            });
+        }
 
-        $('#requestAnrechnung-begruendungLvinhalt').keyup(function() {
-            let maxlength = CHAR_LENGTH1000 - $(this).val().length;
-            $('#requestAnrechnung-begruendungLvinhalt-charCounterMax').text(maxlength);
+        if ($('#requestAnrechnung-begruendungLvinhalt').length){
+            $('#requestAnrechnung-begruendungLvinhalt').keyup(function() {
+                let maxlength = CHAR_LENGTH1000 - $(this).val().length;
+                $('#requestAnrechnung-begruendungLvinhalt-charCounterMax').text(maxlength);
 
-            let minlength = CHAR_LENGTH500 - $(this).val().length;
-            $('#requestAnrechnung-begruendungLvinhalt-charCounterMin').text(minlength);
-        });
+                let minlength = CHAR_LENGTH500 - $(this).val().length;
+                $('#requestAnrechnung-begruendungLvinhalt-charCounterMin').text(minlength);
+            });
+        }
     },
     formatAnrechnungIsApplied: function (antragdatum, dms_id, filename){
         $('#requestAnrechnung-antragdatum').text(antragdatum);

From 115151473a795f5188e8018f0a814b5ece668ebf Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 11 Jul 2024 11:57:45 +0200
Subject: [PATCH 0906/1461] backport recent changes of Betriebsmittel component
 and phrases from feature-30660/FHC4_StudierendenGUI_Prototyp Branch

---
 .../v1/betriebsmittel/BetriebsmittelP.php     | 387 +++++++++++-------
 application/core/Auth_Controller.php          |  62 +++
 application/helpers/hlp_common_helper.php     |  76 ++++
 .../language/english/form_validation_lang.php |  43 ++
 application/libraries/PermissionLib.php       |  32 +-
 .../ressource/Betriebsmittelperson_model.php  |  18 +-
 .../Betriebsmittel/Betriebsmittel.js          | 358 ++++++++--------
 system/phrasesupdate.php                      | 100 +++++
 8 files changed, 726 insertions(+), 350 deletions(-)
 create mode 100644 application/language/english/form_validation_lang.php

diff --git a/application/controllers/api/frontend/v1/betriebsmittel/BetriebsmittelP.php b/application/controllers/api/frontend/v1/betriebsmittel/BetriebsmittelP.php
index 8a6d7e340..8e44b2326 100644
--- a/application/controllers/api/frontend/v1/betriebsmittel/BetriebsmittelP.php
+++ b/application/controllers/api/frontend/v1/betriebsmittel/BetriebsmittelP.php
@@ -6,14 +6,16 @@ use \DateTime as DateTime;
 
 class BetriebsmittelP extends FHCAPI_Controller
 {
+	private $person_id = null;
+
 	public function __construct()
 	{
 		parent::__construct([
 			'getAllBetriebsmittel' => ['admin:r', 'assistenz:r'],
-			'addNewBetriebsmittel' => ['admin:r', 'assistenz:r'],
-			'updateBetriebsmittel' => ['admin:r', 'assistenz:r'],
+			'addNewBetriebsmittel' => self::PERM_LOGGED,
+			'updateBetriebsmittel' => self::PERM_LOGGED,
 			'loadBetriebsmittel' => ['admin:r', 'assistenz:r'],
-			'deleteBetriebsmittel' => ['admin:r', 'assistenz:r'],
+			'deleteBetriebsmittel' => self::PERM_LOGGED,
 			'getTypenBetriebsmittel' => ['admin:r', 'assistenz:r'],
 			'loadInventarliste' => ['admin:r', 'assistenz:r']
 		]);
@@ -22,6 +24,29 @@ class BetriebsmittelP extends FHCAPI_Controller
 		$this->load->model('ressource/Betriebsmittel_model', 'BetriebsmittelModel');
 		$this->load->model('ressource/Betriebsmittelperson_model', 'BetriebsmittelpersonModel');
 
+		// Additional Permission Checks
+		if ($this->router->method == 'addNewBetriebsmittel') {
+			$this->person_id = current(array_slice($this->uri->rsegments, 2));
+			
+			$this->checkPermissionsForPerson(
+				$this->person_id,
+				['admin:rw', 'mitarbeiter:rw', 'basis/betriebsmittel:rw'],
+				['admin:rw', 'assistenz:rw', 'basis/betriebsmittel:rw']
+			);
+		} elseif ($this->router->method == 'updateBetriebsmittel' || $this->router->method == 'deleteBetriebsmittel') {
+			$betriebsmittelperson_id = current(array_slice($this->uri->rsegments, 2));
+			$result = $this->BetriebsmittelpersonModel->load($betriebsmittelperson_id);
+			if (!hasData($result))
+				show_404();
+			$this->person_id = current(getData($result))->person_id;
+			
+			$this->checkPermissionsForPerson(
+				$this->person_id,
+				['admin:rw', 'mitarbeiter:rw', 'basis/betriebsmittel:rw'],
+				['admin:rw', 'assistenz:rw', 'basis/betriebsmittel:rw']
+			);
+		}
+
 		// Load Libraries
 		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
 		$this->load->library('form_validation');
@@ -44,187 +69,265 @@ class BetriebsmittelP extends FHCAPI_Controller
 		$this->terminateWithSuccess((getData($result) ?: []));
 	}
 
-	public function addNewBetriebsmittel($person_id)
+	protected function validateNewOrUpdate()
 	{
-		$this->form_validation->set_rules('kaution', 'Kaution', 'numeric', [
-			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Kaution'])
+		$this->form_validation->set_rules('betriebsmitteltyp', 'Typ', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired')
 		]);
 
-		$this->form_validation->set_rules('betriebsmitteltyp', 'TYP', 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Typ'])
+		$this->form_validation->set_rules('kaution', 'Kaution', 'numeric|less_than_equal_to[9999.99]', [
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric')
 		]);
 
-		$this->form_validation->set_rules('ausgegebenam', 'Ausgegeben am', 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Ausgegeben am'])
+		$this->form_validation->set_rules('ausgegebenam', 'Ausgegeben am', 'required|is_valid_date', [
+			'required' => $this->p->t('ui', 'error_fieldRequired')
 		]);
 
-		if ($this->form_validation->run() == false) {
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		if ($this->input->post('ausgegebenam') && $this->input->post('retouram')) {
+			$this->form_validation->set_rules('retouram', 'Retour am', [
+				'is_valid_date',
+				['is_not_before_ausgegebenam', function ($value) {
+					return (new DateTime($value) >= new DateTime($this->input->post('ausgegebenam')));
+				}]
+			], [
+				'is_not_before_ausgegebenam' => $this->p->t('wawi', 'error_retourdatumVorAusgabe')
+			]);
+		} else {
+			$this->form_validation->set_rules('retouram', 'Retour am', 'is_valid_date');
 		}
 
-		$uid_user = getAuthUID();
+		$this->form_validation->set_rules('anmerkung', 'Anmerkung', 'max_length[256]');
+
+		if ($this->input->post('betriebsmitteltyp') == 'Inventar') {
+			// Inventar
+			$this->form_validation->set_rules('betriebsmittel_id', 'Inventarnummer', 'required');
+		} elseif ($this->input->post('betriebsmitteltyp') == 'Zutrittskarte') {
+			// Zutrittskarte
+			if ($this->input->post('nummer') === null && $this->input->post('nummer') === null) {
+				$this->form_validation->set_rules('nummer', 'Nummer', 'required', [
+					'required' => $this->p->t('wawi', 'error_zutrittskarteOhneNummer')
+				]);
+				$this->form_validation->set_rules('nummer2', 'Nummer2', 'required', [
+					'required' => $this->p->t('wawi', 'error_zutrittskarteOhneNummer')
+				]);
+			} else {
+				if ($this->input->post('nummer') === null) {
+					$result = $this->BetriebsmittelpersonModel->loadViewWhere([
+						'betriebsmitteltyp' => $this->input->post('betriebsmitteltyp'),
+						'nummer2' => $this->input->post('nummer2'),
+						'person_id !=' => $this->person_id,
+						'retouram IS NULL' => null
+					]);
+					if (hasData($result))
+						$this->form_validation->set_rules('nummer2', 'Nummer2', 'is_array', [
+							'is_array' => $this->p->t('wawi', 'error_bmZutrittskarteOccupied', (array)current(getData($result)))
+						]);
+				} else {
+					$result = $this->BetriebsmittelpersonModel->loadViewWhere([
+						'betriebsmitteltyp' => $this->input->post('betriebsmitteltyp'),
+						'nummer' => $this->input->post('nummer'),
+						'person_id !=' => $this->person_id,
+						'retouram IS NULL' => null
+					]);
+					if (hasData($result))
+						$this->form_validation->set_rules('nummer', 'Nummer', 'is_array', [
+							'is_array' => $this->p->t('wawi', 'error_bmZutrittskarteOccupied', (array)current(getData($result)))
+						]);
+				}
+			}
+		}
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+	}
+
+	public function addNewBetriebsmittel($person_id)
+	{
+		$this->form_validation->set_rules('uid', 'UID', [
+			['uid_in_person', function ($value) use ($person_id) {
+				if ($value === null)
+					return true;
+				$this->load->model('person/Benutzer_model', 'BenutzerModel');
+				$result = $this->BenutzerModel->loadWhere([
+					'uid' => $value,
+					'person_id' => $person_id
+				]);
+
+				return hasData($result);
+			}]
+		], [
+			'uid_in_person' => $this->p->t('person', 'error_uidNotInPerson')
+		]);
+		$this->validateNewOrUpdate();
+
 		$betriebsmitteltyp = $this->input->post('betriebsmitteltyp');
 		$nummer = $this->input->post('nummer');
 		$nummer2 = $this->input->post('nummer2');
-		$inventarData = $this->input->post('inventarData');
 		$beschreibung = $this->input->post('beschreibung');
-		$kaution = $this->input->post('kaution');
+		$betriebsmittel_id = $this->input->post('betriebsmittel_id');
 		$anmerkung = $this->input->post('anmerkung');
+		$kaution = $this->input->post('kaution');
 		$ausgegebenam = $this->input->post('ausgegebenam');
 		$retouram = $this->input->post('retouram');
 		$uid = $this->input->post('uid');
 
-		if ($inventarData) {
-			$betriebsmitteltyp = $inventarData['betriebsmitteltyp'];
-			$betriebsmittel_id = $inventarData['betriebsmittel_id'];
-		}
+		// NOTE(chris): transform_kartennummer
+		if ($betriebsmitteltyp == 'Zutrittskarte' && $nummer)
+			$nummer = is_numeric($nummer) ? ltrim($nummer, "0") : hexdec(implode("", array_reverse(str_split(trim($nummer)))));
 
-		if ($betriebsmitteltyp == 'Zutrittskarte' && !$nummer) {
-			return $this->terminateWithError($this->p->t('wawi', 'error_zutrittskarteOhneNummer'), self::ERROR_TYPE_GENERAL);
-		}
+		$this->db->trans_start();
 
-		if ($retouram && $retouram < $ausgegebenam) {
-			return $this->terminateWithError($this->p->t('wawi', 'error_retourdatumVorAusgabe'), self::ERROR_TYPE_GENERAL);
-		}
+		if ($betriebsmitteltyp != 'Inventar') {
+			$this->BetriebsmittelModel->addOrder('updateamum', 'DESC');
+			if ($betriebsmitteltyp == 'Zutrittskarte' && $nummer === null) {
+				$result = $this->BetriebsmittelModel->loadWhere([
+					'betriebsmitteltyp' => $betriebsmitteltyp,
+					'nummer2' => $nummer2
+				]);
+			} else {
+				$result = $this->BetriebsmittelModel->loadWhere([
+					'betriebsmitteltyp' => $betriebsmitteltyp,
+					'nummer' => $nummer
+				]);
+			}
+			$data = $this->getDataOrTerminateWithError($result);
 
-		if ($betriebsmitteltyp == "Inventar" && !($inventarData['inventarnummer'])) {
-			return $this->terminateWithError($this->p->t('wawi', 'error_inventarWaehlen'), self::ERROR_TYPE_GENERAL);
-		}
-
-		// Start DB transaction
-		$this->db->trans_begin();
-
-		$betriebsmitteltyp = utf8_decode($betriebsmitteltyp);
-
-		if (!$inventarData) {
-			$result = $this->BetriebsmittelModel->insert(
-				[
+			if ($data) {
+				$data = current($data);
+				if ($data->nummer !== $nummer || $data->nummer2 !== $nummer2 || $data->beschreibung !== $beschreibung) {
+					$result = $this->BetriebsmittelModel->update($data->betriebsmittel_id, [
+						'nummer' => $nummer,
+						'nummer2' => $nummer2,
+						'beschreibung' => $beschreibung,
+						'updateamum' => date('c'),
+						'updatevon' => getAuthUID()
+					]);
+					$this->getDataOrTerminateWithError($result);
+				}
+				$betriebsmittel_id = $data->betriebsmittel_id;
+			} else {
+				$result = $this->BetriebsmittelModel->insert([
 					'betriebsmitteltyp' => $betriebsmitteltyp,
 					'nummer' => $nummer,
 					'nummer2' => $nummer2,
 					'beschreibung' => $beschreibung,
-					'anmerkung' => $anmerkung,
-					'insertvon' => $uid_user,
-					'insertamum' => date('c')
-				]
-			);
-			if ($this->db->trans_status() === false || isError($result)) {
-				$this->db->trans_rollback();
-				return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+					'reservieren' => false,
+					'ort_kurzbz' => null,
+					'insertamum' => date('c'),
+					'insertvon' => getAuthUID(),
+				]);
+				$betriebsmittel_id = $this->getDataOrTerminateWithError($result);
 			}
-			$betriebsmittel_id = $result->retval;
 		}
 
-		$result = $this->BetriebsmittelpersonModel->insert(
-			[
-				'betriebsmittel_id' => $betriebsmittel_id,
-				'person_id' => $person_id,
-				'kaution' => $kaution,
-				'anmerkung' => $anmerkung,
-				'ausgegebenam' => $ausgegebenam,
-				'retouram ' => $retouram,
-				'insertvon' => $uid_user,
-				'insertamum' => date('c'),
-				'uid' => $uid
-			]
-		);
+		$result = $this->BetriebsmittelpersonModel->insert([
+			'person_id' => $person_id,
+			'betriebsmittel_id' => $betriebsmittel_id,
+			'anmerkung' => $anmerkung,
+			'kaution' => $kaution,
+			'ausgegebenam' => $ausgegebenam,
+			'retouram' => $retouram,
+			'uid' => $uid,
+			'insertamum' => date('c'),
+			'insertvon' => getAuthUID()
+		]);
 
-		if ($this->db->trans_status() === false || isError($result)) {
-			$this->db->trans_rollback();
-			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
+		$data = $this->getDataOrTerminateWithError($result);
 
-		$this->db->trans_commit();
-		return $this->terminateWithSuccess(true);
+		$this->db->trans_complete();
+
+		$this->terminateWithSuccess(true);
 	}
 
 	public function updateBetriebsmittel($betriebsmittelperson_id)
 	{
-		$uid_user = getAuthUID();
-		$betriebsmittel_id = $this->input->post('betriebsmittel_id');
+		$this->validateNewOrUpdate();
+
 		$betriebsmitteltyp = $this->input->post('betriebsmitteltyp');
 		$nummer = $this->input->post('nummer');
 		$nummer2 = $this->input->post('nummer2');
 		$beschreibung = $this->input->post('beschreibung');
-		$kaution = $this->input->post('kaution');
+		$betriebsmittel_id = $this->input->post('betriebsmittel_id');
 		$anmerkung = $this->input->post('anmerkung');
+		$kaution = $this->input->post('kaution');
 		$ausgegebenam = $this->input->post('ausgegebenam');
 		$retouram = $this->input->post('retouram');
-		$person_id = $this->input->post('person_id');
-		$uid = $this->input->post('uid');
 
-		$this->form_validation->set_rules('kaution', 'Kaution', 'numeric', [
-			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Kaution'])
+		// NOTE(chris): transform_kartennummer
+		if ($betriebsmitteltyp == 'Zutrittskarte' && $nummer)
+			$nummer = is_numeric($nummer) ? ltrim($nummer, "0") : hexdec(implode("", array_reverse(str_split(trim($nummer)))));
+
+		$this->db->trans_start();
+
+		if ($betriebsmitteltyp != 'Inventar') {
+			$found = false;
+			if ($nummer !== null && $betriebsmittel_id !== null) {
+				$result = $this->BetriebsmittelModel->load($betriebsmittel_id);
+				$data = $this->getDataOrTerminateWithError($result);
+				if ($data && current($data)->nummer == $nummer) {
+					$found = true;
+				}
+			}
+
+			if (!$found) {
+				$this->BetriebsmittelModel->addOrder('updateamum', 'DESC');
+				if ($betriebsmitteltyp == 'Zutrittskarte' && $nummer === null) {
+					$result = $this->BetriebsmittelModel->loadWhere([
+						'betriebsmitteltyp' => $betriebsmitteltyp,
+						'nummer2' => $nummer2
+					]);
+				} else {
+					$result = $this->BetriebsmittelModel->loadWhere([
+						'betriebsmitteltyp' => $betriebsmitteltyp,
+						'nummer' => $nummer
+					]);
+				}
+				$data = $this->getDataOrTerminateWithError($result);
+			}
+
+			if ($data) {
+				$data = current($data);
+				if ($data->nummer !== $nummer || $data->nummer2 !== $nummer2 || $data->beschreibung !== $beschreibung) {
+					$result = $this->BetriebsmittelModel->update($data->betriebsmittel_id, [
+						'nummer' => $nummer,
+						'nummer2' => $nummer2,
+						'beschreibung' => $beschreibung,
+						'updateamum' => date('c'),
+						'updatevon' => getAuthUID()
+					]);
+					$this->getDataOrTerminateWithError($result);
+				}
+				$betriebsmittel_id = $data->betriebsmittel_id;
+			} else {
+				$result = $this->BetriebsmittelModel->insert([
+					'betriebsmitteltyp' => $betriebsmitteltyp,
+					'nummer' => $nummer,
+					'nummer2' => $nummer2,
+					'beschreibung' => $beschreibung,
+					'reservieren' => false,
+					'ort_kurzbz' => null,
+					'insertamum' => date('c'),
+					'insertvon' => getAuthUID(),
+				]);
+				$betriebsmittel_id = $this->getDataOrTerminateWithError($result);
+			}
+		}
+
+		$result = $this->BetriebsmittelpersonModel->update($betriebsmittelperson_id, [
+			'betriebsmittel_id' => $betriebsmittel_id,
+			'anmerkung' => $anmerkung,
+			'kaution' => $kaution,
+			'ausgegebenam' => $ausgegebenam,
+			'retouram' => $retouram,
+			'updateamum' => date('c'),
+			'updatevon' => getAuthUID()
 		]);
 
-		$this->form_validation->set_rules('betriebsmitteltyp', 'TYP', 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Typ'])
-		]);
+		$data = $this->getDataOrTerminateWithError($result);
 
-		$this->form_validation->set_rules('ausgegebenam', 'Ausgegeben am', 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Ausgegeben am'])
-		]);
+		$this->db->trans_complete();
 
-
-		if ($this->form_validation->run() == false) {
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-		}
-
-		if ($betriebsmitteltyp == 'Zutrittskarte' && !$nummer) {
-			return $this->terminateWithError($this->p->t('wawi', 'error_zutrittskarteOhneNummer'), self::ERROR_TYPE_GENERAL);
-		}
-
-		if ($retouram && $retouram < $ausgegebenam) {
-			return $this->terminateWithError($this->p->t('wawi', 'error_retourdatumVorAusgabe'), self::ERROR_TYPE_GENERAL);
-		}
-
-
-		// Start DB transaction
-		$this->db->trans_begin();
-
-		$result = $this->BetriebsmittelpersonModel->update(
-			[
-				'betriebsmittelperson_id' => $betriebsmittelperson_id,
-
-			],
-			[
-				'person_id' => $person_id,
-				'uid' => $uid,
-				'kaution' => $kaution,
-				'anmerkung' => $anmerkung,
-				'ausgegebenam' => $ausgegebenam,
-				'retouram ' => $retouram,
-				'updatevon' => $uid_user,
-				'updateamum' => date('c')
-			]
-		);
-
-		if ($this->db->trans_status() === false || isError($result)) {
-			$this->db->trans_rollback();
-			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-
-		$result = $this->BetriebsmittelModel->update(
-			[
-				'betriebsmittel_id' => $betriebsmittel_id
-			],
-			[
-				'betriebsmitteltyp' => $betriebsmitteltyp,
-				'nummer' => $nummer,
-				'nummer2' => $nummer2,
-				'beschreibung' => $beschreibung,
-				'anmerkung' => $anmerkung,
-				'updatevon' => $uid_user,
-				'updateamum' => date('c')
-			]
-		);
-		if ($this->db->trans_status() === false || isError($result)) {
-			$this->db->trans_rollback();
-			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-
-		$this->db->trans_commit();
-		return $this->terminateWithSuccess(true);
+		$this->terminateWithSuccess(true);
 	}
 
 	public function loadBetriebsmittel($betriebsmittelperson_id)
@@ -274,10 +377,10 @@ class BetriebsmittelP extends FHCAPI_Controller
 	public function loadInventarliste($searchString)
 	{
 		$result = $this->BetriebsmittelModel->loadInventarliste($searchString);
-		if (isError($result)) {
-			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess($result ?: []);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
 	}
 }
 
diff --git a/application/core/Auth_Controller.php b/application/core/Auth_Controller.php
index d170a7eca..e9621332f 100644
--- a/application/core/Auth_Controller.php
+++ b/application/core/Auth_Controller.php
@@ -67,6 +67,68 @@ abstract class Auth_Controller extends FHC_Controller
 		}
 	}
 
+	/**
+	 * Checks for Permissions depending if the given person is a
+	 * Mitarbeiter and/or Student
+	 * and exits/outputs an error if they are not met.
+	 *
+	 * @param integer 				$person_id
+	 * @param array 				$permMa		Perms if the person is a Mitarbeiter
+	 * @param array 				$permStud	Perms if the person is a Student
+	 *
+	 * @return void
+	 */
+	protected function checkPermissionsForPerson($person_id, $permMa, $permStud)
+	{
+		$res = $this->hasPermissionsForPerson($person_id, $permMa, $permStud);
+		
+		if ($res) {
+			$perm = array_keys(array_flip(array_merge($res|1 ? $permMa : [], $res|2 ? $permStud : [])));
+			$this->_outputAuthError([$this->router->method => $perm]);
+		}
+	}
+
+	/**
+	 * Checks for Permissions depending if the given person is a
+	 * Mitarbeiter and/or Student
+	 * and returns the result.
+	 *
+	 * @param integer 				$person_id
+	 * @param array 				$permMa		Perms if the person is a Mitarbeiter
+	 * @param array 				$permStud	Perms if the person is a Student
+	 *
+	 * @return boolean
+	 */
+	protected function hasPermissionsForPerson($person_id, $permMa, $permStud)
+	{
+		$res = 0;
+		$this->load->model('person/Person_model', 'PersonModel');
+		$this->PersonModel->addJoin('public.tbl_benutzer', 'person_id');
+		$this->PersonModel->addJoin('public.tbl_mitarbeiter', 'uid = mitarbeiter_uid');
+		$result = $this->PersonModel->load($person_id);
+		if (hasData($result)) {
+			if ($this->permissionlib->isEntitled(['a' => $permMa], 'a'))
+				return 0;
+			$res = 1;
+		}
+		$this->PersonModel->addJoin('public.tbl_prestudent', 'person_id');
+		$result = $this->PersonModel->load($person_id);
+		if (hasData($result)) {
+			$permStudConverted = [];
+			foreach (getData($result) as $row) {
+				foreach ($permStud as $k => $v) {
+					if (!isset($permStudConverted[$k])) {
+						$permStudConverted[$k] = $this->permissionlib->convertAccessType($v);
+					}
+					if ($this->permissionlib->isBerechtigt($permStudConverted[$k][0], $permStudConverted[$k][1], $row->studiengang_kz))
+						return 0;
+				}
+			}
+			$res += 2;
+		}
+		return $res;
+	}
+
 	/**
 	 * Outputs an error message and sets the HTTP Header.
 	 * This function is protected so that it can be overwritten.
diff --git a/application/helpers/hlp_common_helper.php b/application/helpers/hlp_common_helper.php
index 3e682e56c..40aed007c 100644
--- a/application/helpers/hlp_common_helper.php
+++ b/application/helpers/hlp_common_helper.php
@@ -422,3 +422,79 @@ function isValidDate($dateString)
 		return false;
 	}
 }
+
+
+// ------------------------------------------------------------------------
+// Collection of utility functions for form validation purposes
+// ------------------------------------------------------------------------
+
+/**
+ * check if string can be converted to a date
+ */
+function is_valid_date($dateString)
+{
+	try
+	{
+		return (new DateTime($dateString)) !== false;
+	}
+	catch(Exception $e)
+	{
+		return false;
+	}
+}
+
+/**
+ * check if given permissions are met
+ */
+function has_write_permissions($value, $permissions = '')
+{
+	if (!$permissions)
+		$permissions = $value;
+	$permissions = explode(',', $permissions);
+
+	$CI =& get_instance();
+	$CI->load->library('AuthLib');
+	$CI->load->library('PermissionLib');
+
+	return $CI->permissionlib->hasAtLeastOne(
+		$permissions,
+		'sometable',
+		PermissionLib::WRITE_RIGHT
+	);
+}
+
+/**
+ * check if has permissions for a studiengang_kz
+ */
+function has_permissions_for_stg($studiengang_kz, $permissions = '')
+{
+	if (!$permissions)
+		return false;
+	$permissions = explode(',', $permissions);
+
+	$CI =& get_instance();
+	$CI->load->library('AuthLib');
+	$CI->load->library('PermissionLib');
+
+	foreach ($permissions as $perm) {
+		if (strpos($perm, PermissionLib::PERMISSION_SEPARATOR) === false) {
+			$CI->addError(
+				'The given permission does not use the correct format',
+				FHCAPI_Controller::ERROR_TYPE_GENERAL
+			);
+			return false;
+		}
+
+		list($perm, $accesstype) = explode(PermissionLib::PERMISSION_SEPARATOR, $perm);
+		$at = '';
+		if (strpos($accesstype, PermissionLib::READ_RIGHT) !== false)
+			$at = PermissionLib::SELECT_RIGHT; // S
+		if (strpos($accesstype, PermissionLib::WRITE_RIGHT) !== false)
+			$at .= PermissionLib::REPLACE_RIGHT.PermissionLib::DELETE_RIGHT; // UID
+
+		if ($CI->permissionlib->isBerechtigt($perm, $at, $studiengang_kz))
+			return true;
+	}
+
+	return false;
+}
diff --git a/application/language/english/form_validation_lang.php b/application/language/english/form_validation_lang.php
new file mode 100644
index 000000000..b8918a721
--- /dev/null
+++ b/application/language/english/form_validation_lang.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * CodeIgniter
+ *
+ * An open source application development framework for PHP
+ *
+ * This content is released under the MIT License (MIT)
+ *
+ * Copyright (c) 2019 - 2022, CodeIgniter Foundation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @package	CodeIgniter
+ * @author	EllisLab Dev Team
+ * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
+ * @copyright	Copyright (c) 2014 - 2019, British Columbia Institute of Technology (https://bcit.ca/)
+ * @copyright	Copyright (c) 2019 - 2022, CodeIgniter Foundation (https://codeigniter.com/)
+ * @license	https://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
+ * @since	Version 1.0.0
+ * @filesource
+ */
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+$lang['form_validation_has_write_permissions']	= 'You have no rights to edit {field} field.';
+$lang['form_validation_is_valid_date']	= 'The date format is invalid or out of range.';
+$lang['form_validation_has_permissions_for_stg']	= 'You have no rights for stg {field}.';
diff --git a/application/libraries/PermissionLib.php b/application/libraries/PermissionLib.php
index bf8174cf4..857defbf7 100644
--- a/application/libraries/PermissionLib.php
+++ b/application/libraries/PermissionLib.php
@@ -147,19 +147,7 @@ class PermissionLib
 							if (strpos($permissions[$pCounter], PermissionLib::PERMISSION_SEPARATOR) !== false)
 							{
 								// Retrieves permission and required access type from the $requiredPermissions array
-								list($permission, $requiredAccessType) = explode(PermissionLib::PERMISSION_SEPARATOR, $permissions[$pCounter]);
-
-								$accessType = '';
-
-								// Set the access type
-								if (strpos($requiredAccessType, PermissionLib::READ_RIGHT) !== false)
-								{
-									$accessType = PermissionLib::SELECT_RIGHT; // S
-								}
-								if (strpos($requiredAccessType, PermissionLib::WRITE_RIGHT) !== false)
-								{
-									$accessType .= PermissionLib::REPLACE_RIGHT.PermissionLib::DELETE_RIGHT; // UID
-								}
+								list($permission, $accessType) = $this->convertAccessType($permissions[$pCounter]);
 
 								if (!isEmptyString($accessType)) // if compliant
 								{
@@ -209,6 +197,24 @@ class PermissionLib
 		return $checkPermissions;
 	}
 
+	/**
+	 * Retrieves permission and required access type from the newly formatted permission string
+	 *
+	 * @param string $permission
+	 *
+	 * @return array
+	 */
+	public function convertAccessType($permission)
+	{
+		list($permission, $reqAccessType) = explode(PermissionLib::PERMISSION_SEPARATOR, $permission);
+		$accessType = '';
+		if (strpos($reqAccessType, PermissionLib::READ_RIGHT) !== false)
+			$accessType = PermissionLib::SELECT_RIGHT;
+		if (strpos($reqAccessType, PermissionLib::WRITE_RIGHT) !== false)
+			$accessType = PermissionLib::REPLACE_RIGHT.PermissionLib::DELETE_RIGHT;
+		return [$permission, $accessType];
+	}
+
 	/**
 	 * Checks if at least one of the permissions given as parameter (requiredPermissions) belongs to the authenticated user
 	 * It checks the given permissions against a given method (controller method name) and a given permission type (R and/or W)
diff --git a/application/models/ressource/Betriebsmittelperson_model.php b/application/models/ressource/Betriebsmittelperson_model.php
index 48c35381f..39f08b5cd 100644
--- a/application/models/ressource/Betriebsmittelperson_model.php
+++ b/application/models/ressource/Betriebsmittelperson_model.php
@@ -109,7 +109,7 @@ class Betriebsmittelperson_model extends DB_Model
 			case 'betriebsmittelperson_id':
 				$cond = 'bmp.betriebsmittelperson_id';
 				break;
-			default:
+			default: 
 				return error("ID nicht gültig");
 		}
 
@@ -125,4 +125,20 @@ class Betriebsmittelperson_model extends DB_Model
 
 		return $this->execQuery($query, array($id));
 	}
+
+	/**
+	 * Perform a loadWhere on the vw_betriebsmittelperson DB View
+	 *
+	 * @param array $where
+	 *
+	 * @return stdClass
+	 */
+	public function loadViewWhere($where)
+	{
+		$table = $this->dbTable;
+		$this->dbTable = 'public.vw_betriebsmittelperson';
+		$result = $this->loadWhere($where);
+		$this->dbTable = $table;
+		return $result;
+	}
 }
diff --git a/public/js/components/Betriebsmittel/Betriebsmittel.js b/public/js/components/Betriebsmittel/Betriebsmittel.js
index 38563633f..211455dbf 100644
--- a/public/js/components/Betriebsmittel/Betriebsmittel.js
+++ b/public/js/components/Betriebsmittel/Betriebsmittel.js
@@ -1,19 +1,15 @@
-import VueDatePicker from '../vueDatepicker.js.php';
 import {CoreFilterCmpt} from "../filter/Filter.js";
-import PvAutoComplete from "../../../../index.ci.php/public/js/components/primevue/autocomplete/autocomplete.esm.min.js";
 
 import BsModal from "../Bootstrap/Modal.js";
-import FormForm from '../Form/Form.js';
+import CoreForm from '../Form/Form.js';
 import FormInput from '../Form/Input.js';
 
 export default {
 	components: {
 		CoreFilterCmpt,
-		VueDatePicker,
 		BsModal,
-		FormForm,
-		FormInput,
-		PvAutoComplete
+		CoreForm,
+		FormInput
 	},
 	inject: {
 		cisRoot: {
@@ -52,11 +48,11 @@ export default {
 					{title: "Anmerkung", field: "anmerkung", visible: false},
 					{title: "Retourdatum", field: "format_retour", width: 128},
 					{title: "Beschreibung", field: "beschreibung"},
-					{title: "Uid", field: "uid", width: 87},
+					{title: "UID", field: "uid", width: 87},
 					{title: "Kaution", field: "kaution", visible: false},
-					{title: "Ausgabedatum", field: "format_ausgabe", width: 144},
-					{title: "Betriebsmittel_id", field: "betriebsmittel_id", visible: false},
-					{title: "Betriebsmittelperson_id", field: "betriebsmittelperson_id", visible: false},
+					{title: "Ausgabedatum", field: "format_ausgabe", width: 144, visible: false},
+					{title: "Betriebsmittel ID", field: "betriebsmittel_id", visible: false},
+					{title: "Betriebsmittelperson ID", field: "betriebsmittelperson_id", visible: false},
 					{
 						title: 'Aktionen', field: 'actions',
 						minWidth: 150, // Ensures Action-buttons will be always fully displayed
@@ -142,11 +138,9 @@ export default {
 					}
 				}
 			],
-			betriebsmittelData: {},
-			betriebsmittelperson_id : null,
 			listBetriebsmitteltyp: [],
 			formData: {
-				ausgegebenam : this.getDefaultDate(),
+				ausgegebenam : new Date(),
 				betriebsmitteltyp: 'Zutrittskarte'
 			},
 			statusNew: true,
@@ -154,95 +148,89 @@ export default {
 		}
 	},
 	watch: {
-		uid() {
-			this.$refs.table.tabulator.setData(this.endpoint.getAllBetriebsmittel + '/' + this.typeId + '/' + this.id);
+		id() {
+			this.$refs.table.tabulator.setData('dummy', {type: this.typeId, id: this.id});
 		}
 	},
 	methods: {
 		actionEditBetriebsmittel(betriebsmittelperson_id) {
 			this.statusNew = false;
-			this.loadBetriebsmittel(betriebsmittelperson_id);
-			this.$refs.betriebsmittelModal.show();
+			this
+				.loadBetriebsmittel(betriebsmittelperson_id)
+				.then(this.$refs.betriebsmittelModal.show);
 		},
 		actionNewBetriebsmittel() {
 			this.resetModal();
 			this.$refs.betriebsmittelModal.show();
-			this.statusNew = true;
-			this.formData.ausgegebenam = this.getDefaultDate();
-			this.reload();
 		},
 		actionDeleteBetriebsmittel(betriebsmittelperson_id) {
-			this.loadBetriebsmittel(betriebsmittelperson_id).then(() => {
-				this.$refs.deleteBetriebsmittelModal.show();
-			});
+			this.$fhcAlert
+				.confirmDelete()
+				.then(result => result
+					? betriebsmittelperson_id
+					: Promise.reject({handled: true}))
+				.then(this.endpoint.deleteBetriebsmittel)
+				.then(result => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
+					window.scrollTo(0, 0);
+					this.reload();
+				})
+				.catch(this.$fhcAlert.handleSystemError);
 		},
 		addNewBetriebsmittel() {
 			//just append uid to formdata
 			this.formData.uid = this.uid;
-			return this.endpoint.addNewBetriebsmittel(this.id, this.formData)
+			if (this.formData.betriebsmitteltyp == 'Inventar')
+				this.formData.betriebsmittel_id = this.formData.inventarData?.betriebsmittel_id;
+			return this.endpoint
+				.addNewBetriebsmittel(this.$refs.betriebsmittelData, this.id, this.formData)
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
-					this.hideModal('betriebsmittelModal');
+					this.$refs.betriebsmittelModal.hide();
 					this.resetModal();
-				}).catch(this.$fhcAlert.handleSystemError)
-				.finally(() => {
 					window.scrollTo(0, 0);
 					this.reload();
-				});
-		},
-		deleteBetriebsmittel(betriebsmittelperson_id) {
-			return this.endpoint.deleteBetriebsmittel(betriebsmittelperson_id)
-				.then(
-					result => {
-						this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
-						this.hideModal('deleteBetriebsmittelModal');
-						this.resetModal();
-					})
-				.catch(this.$fhcAlert.handleSystemError)
-				.finally(() => {
-					window.scrollTo(0, 0);
-					this.reload();
-				});
+				})
+				.catch(this.$fhcAlert.handleSystemError);
 		},
 		updateBetriebsmittel(betriebsmittelperson_id) {
-			this.formData.uid = this.uid;
-			return this.endpoint.updateBetriebsmittel(betriebsmittelperson_id, this.formData)
-			.then(response => {
-				this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
-				this.hideModal('betriebsmittelModal');
-				this.resetModal();
-			}).catch(this.$fhcAlert.handleSystemError)
-				.finally(() => {
+			if (this.formData.betriebsmitteltyp == 'Inventar')
+				this.formData.betriebsmittel_id = this.formData.inventarData?.betriebsmittel_id;
+			return this.endpoint
+				.updateBetriebsmittel(this.$refs.betriebsmittelData, betriebsmittelperson_id, this.formData)
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+					this.$refs.betriebsmittelModal.hide();
+					this.resetModal();
 					window.scrollTo(0, 0);
 					this.reload();
-				});
+				})
+				.catch(this.$fhcAlert.handleSystemError);
 		},
 		loadBetriebsmittel(betriebsmittelperson_id) {
 			this.resetModal();
 			this.statusNew = false;
-			return this.endpoint.loadBetriebsmittel(betriebsmittelperson_id)
-				.then(result => result.data)
+			return this.endpoint
+				.loadBetriebsmittel(betriebsmittelperson_id)
 				.then(result => {
-					this.formData = result;
+					this.formData = result.data;
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
 		searchInventar(event) {
 			const encodedQuery = encodeURIComponent(event.query);
-			return this.endpoint.loadInventarliste(encodedQuery)
+			return this.endpoint
+				.loadInventarliste(encodedQuery)
 				.then(result => {
-					this.filteredInventar = result.data.retval;
+					this.filteredInventar = result.data;
 				});
 		},
 		reload() {
 			this.$refs.table.reloadTable();
 		},
-		hideModal(modalRef) {
-			this.$refs[modalRef].hide();
-		},
 		resetModal() {
 			this.formData = {};
-			this.formData.ausgegebenam = this.getDefaultDate();
+			this.formData.ausgegebenam = new Date();
 			this.formData.retouram = null;
 			this.formData.betriebsmitteltyp = null;
 			this.formData.nummer = null;
@@ -250,34 +238,19 @@ export default {
 			this.formData.kaution = null;
 			this.formData.anmerkung = null;
 			this.formData.beschreibung = null;
-			this.betriebsmittelperson_id = {};
 			this.statusNew = true;
-		},
-		getDefaultDate() {
-			const today = new Date();
-			return today;
 		}
 	},
-	created(){
-		return this.endpoint.getTypenBetriebsmittel()
-			.then(result => result.data)
+	created() {
+		return this.endpoint
+			.getTypenBetriebsmittel()
 			.then(result => {
-				this.listBetriebsmitteltyp = result;
+				this.listBetriebsmitteltyp = result.data;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 	},
 	template: `
 	<div class="core-betriebsmittel h-100 d-flex flex-column">
-		
-		<!--Modal: deleteBetriebsmittelModal-->
-		<BsModal ref="deleteBetriebsmittelModal">
-			<template #title>{{$p.t('ui', 'betriebsmittel_delete')}}</template>
-			<template #default><p>{{$p.t('ui', 'betriebsmittel_confirm_delete')}}</p></template>
-			<template #footer>
-				<button ref="Close" type="button" class="btn btn-primary" @click="deleteBetriebsmittel(formData.betriebsmittelperson_id)">OK</button>
-			</template>
-		</BsModal>
-		
 		<core-filter-cmpt
 			ref="table"
 			:tabulator-options="tabulatorOptions"
@@ -297,15 +270,14 @@ export default {
 				<p v-if="statusNew" class="fw-bold mt-3">{{$p.t('ui', 'add_betriebsmittel')}}</p>
 				<p v-else class="fw-bold mt-3">{{$p.t('ui', 'edit_betriebsmittel')}}</p>
 			</template>
-		
-			<form-form class="row g-3" ref="betriebsmittelData">		
+			
+			<core-form class="row g-3" ref="betriebsmittelData">		
 				<legend>Details</legend>
-					
-					<div class="row mb-3">
-						<form-input
+				<div class="row mb-3">
+					<form-input
 						type="select"
 						:label="$p.t('global/typ')"
-						name="typ"
+						name="betriebsmitteltyp"
 						v-model="formData.betriebsmitteltyp"
 						:disabled="!statusNew"
 						>
@@ -316,121 +288,119 @@ export default {
 							>
 							{{entry.beschreibung}}
 						</option>
-						</form-input>
-					</div>
+					</form-input>
+				</div>
+			
+				<div v-if="formData.betriebsmitteltyp == 'Inventar'" class="row mb-3">
+					<form-input
+						type="autocomplete"
+						:label="$p.t('wawi/inventarnummer')"
+						name="betriebsmittel_id"
+						v-model="formData.inventarData"
+						option-label="dropdowntext" 
+						:suggestions="filteredInventar" 
+						@complete="searchInventar" 
+						:min-length="3"
+						>
+					</form-input>
+				</div>
+				<div v-else-if="formData.inventarnummer" class="row mb-3">
+					<form-input
+						type="text"
+						:label="$p.t('wawi/inventarnummer')"
+						name="inventarnummer"
+						v-model="formData.inventarnummer"
+						:disabled="!statusNew"
+						>
+					</form-input>
+				</div>
 				
-					<div v-if="formData.betriebsmitteltyp == 'Inventar'" class="row mb-3">
-						<form-input
-							type="autocomplete"
-							:label="$p.t('wawi/inventarnummer')"
-							name="inventarnummer"
-							v-model="formData.inventarData"
-							optionLabel="dropdowntext" 
-							:suggestions="filteredInventar" 
-							@complete="searchInventar" 
-							minLength="3"
+				<div v-if="formData.betriebsmitteltyp!='Inventar' && !formData.inventarnummer" class="row mb-3">
+					<form-input
+						type="text"
+						:label="$p.t('wawi/nummer')"
+						name="nummer"
+						v-model="formData.nummer"
 						>
-						</form-input>
-					</div>
-					<div v-else-if="formData.inventarnummer" class="row mb-3">
-						<form-input
-							type="text"
-							:label="$p.t('wawi/inventarnummer')"
-							name="inventarnummer"
-							v-model="formData.inventarnummer"
-							:disabled="!statusNew"
-						>
-						</form-input>
-					</div>
-					
-					<div v-if="formData.betriebsmitteltyp!='Inventar' && !formData.inventarnummer" class="row mb-3">
-						<form-input
-							type="text"
-							:label="$p.t('wawi/nummer')"
-							name="nummer"
-							v-model="formData['nummer']"
-						>
-						</form-input>
-					</div>
-					
-					<div v-if="formData.betriebsmitteltyp!='Inventar' && !formData.inventarnummer" class="row mb-3">
-						<form-input
-							type="text"
-							:label="$p.t('wawi/nummer') + ' 2'"
-							name="nummer2"
-							v-model="formData['nummer2']"
-						>
-						</form-input>
-					</div>
+					</form-input>
+				</div>
 				
-					<div v-if="formData.betriebsmitteltyp!='Inventar'" class="row mb-3">
-						<form-input
-							type="textarea"
-							:label="$p.t('global/beschreibung')"
-							name="beschreibung"
-							v-model="formData['beschreibung']"
-							:disabled="formData.inventarnummer"
+				<div v-if="formData.betriebsmitteltyp!='Inventar' && !formData.inventarnummer" class="row mb-3">
+					<form-input
+						type="text"
+						:label="$p.t('wawi/nummer') + ' 2'"
+						name="nummer2"
+						v-model="formData.nummer2"
 						>
-						</form-input>
-					</div>
-					
-					<div class="row mb-3">
-						<form-input
-							type="text"
-							:label="$p.t('infocenter/kaution')"
-							name="kaution"
-							v-model="formData['kaution']"
+					</form-input>
+				</div>
+			
+				<div v-if="formData.betriebsmitteltyp!='Inventar'" class="row mb-3">
+					<form-input
+						type="textarea"
+						:label="$p.t('global/beschreibung')"
+						name="beschreibung"
+						v-model="formData.beschreibung"
+						:disabled="formData.inventarnummer"
 						>
-						</form-input>
-					</div>
-					
-					<div class="row mb-3">
-						<form-input
-							type="textarea"
-							:label="$p.t('global/anmerkung')"
-							name="anmerkung"
-							v-model="formData['anmerkung']"
-						>
-						</form-input>
-					</div>
-					
-					<div class="row mb-3">
-						<form-input
-							type="DatePicker"
-							:label="$p.t('wawi/ausgegebenam')"
-							name="datum"
-							v-model="formData['ausgegebenam']"
-							auto-apply
-							:enable-time-picker="false"
-							format="dd.MM.yyyy"
-							preview-format="dd.MM.yyyy"
-							:teleport="true"
-						></form-input>
-					</div>
-					
-					<div class="row mb-3">
-						<form-input
-							type="DatePicker"
-							:label="$p.t('wawi/retouram')"
-							name="datum"
-							v-model="formData['retouram']"
-							auto-apply
-							:enable-time-picker="false"
-							format="dd.MM.yyyy"
-							preview-format="dd.MM.yyyy"
-							:teleport="true"
-						></form-input>
-					</div>
-				</form-form>
+					</form-input>
+				</div>
 				
-				<template #footer>
-					<button v-if="statusNew"  ref="Close" type="button" class="btn btn-primary" @click="addNewBetriebsmittel()">{{$p.t('ui', 'speichern')}}</button>
-
-					<button v-else  ref="Close" type="button" class="btn btn-primary" @click="updateBetriebsmittel(formData.betriebsmittelperson_id)">{{$p.t('ui', 'speichern')}}</button>
-				</template>
-					
+				<div class="row mb-3">
+					<form-input
+						type="text"
+						:label="$p.t('infocenter/kaution')"
+						name="kaution"
+						v-model="formData.kaution"
+						>
+					</form-input>
+				</div>
+				
+				<div class="row mb-3">
+					<form-input
+						type="textarea"
+						:label="$p.t('global/anmerkung')"
+						name="anmerkung"
+						v-model="formData.anmerkung"
+						>
+					</form-input>
+				</div>
+				
+				<div class="row mb-3">
+					<form-input
+						type="DatePicker"
+						:label="$p.t('wawi/ausgegebenam')"
+						name="ausgegebenam"
+						v-model="formData.ausgegebenam"
+						auto-apply
+						:enable-time-picker="false"
+						format="dd.MM.yyyy"
+						preview-format="dd.MM.yyyy"
+						:teleport="true"
+						>
+					</form-input>
+				</div>
+				
+				<div class="row mb-3">
+					<form-input
+						type="DatePicker"
+						:label="$p.t('wawi/retouram')"
+						name="retouram"
+						v-model="formData.retouram"
+						auto-apply
+						:enable-time-picker="false"
+						format="dd.MM.yyyy"
+						preview-format="dd.MM.yyyy"
+						:teleport="true"
+						>
+					</form-input>
+				</div>
+			</core-form>
+			
+			<template #footer>
+				<button type="button" class="btn btn-primary" @click="statusNew ? addNewBetriebsmittel() : updateBetriebsmittel(formData.betriebsmittelperson_id)">{{$p.t('ui', 'speichern')}}</button>
+			</template>
 		</bs-modal>
-				
 	</div>`
 }
 
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 34862d600..994003998 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -2261,6 +2261,26 @@ $phrases = array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'error_uidNotInPerson',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Die angegebene UID passt nicht zu der angegebenen Person',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Given UID is not assigned to the given Person',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 
 	//****************	CORE/lehre
 	array(
@@ -22890,6 +22910,66 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'error_fieldRequired',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Das Eingabefeld {field} ist erforderlich',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The Input Field {field} is required',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'error_fieldNotNumeric',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Das Eingabefeld {field} darf nur Zahlen enthalten.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The Field {Field} must contain only numbers.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'error_fieldNoValidEmail',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Das Eingabefeld {field} muss eine gültige Email-Adresse enthalten.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The field {field} must contain a valid email address.',
+				'description' => '',
+				'insertvon' => 'system'
+				)
+		)
+	),
 	// Personalverwaltung begin
 	array(
 		'app' => 'core',
@@ -25000,6 +25080,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'wawi',
+		'phrase' => 'error_bmZutrittskarteOccupied',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Diese Zutrittskarte ist bereits ausgegeben an: {vorname} {nachname} ({uid})',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'This access card has already been issued to: {vorname} {nachname} ({uid})',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'wawi',

From 3706b0f972b7343934ab831f1424610700770703 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 11 Jul 2024 13:22:11 +0200
Subject: [PATCH 0907/1461] Delete action in Tab Contact and Status:
 primeVueAlert instead of BSModal

---
 .../Details/Kontakt/Address.js                |  24 +-
 .../Details/Kontakt/Bankaccount.js            | 233 +-----------------
 .../Details/Kontakt/Contact.js                |  24 +-
 .../Details/Prestudent/MultiStatus.js         |  42 +---
 4 files changed, 36 insertions(+), 287 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
index 7e4cbc3db..c6bd07be4 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
@@ -205,8 +205,15 @@ export default{
 				if(this.addressData.adresse_id)
 					if(this.addressData.heimatadresse)
 						this.$fhcAlert.alertError(this.$p.t('person', 'error_deleteHomeAdress'));
-					else
-						this.$refs.deleteAdressModal.show();
+					else {
+						this.$fhcAlert
+							.confirmDelete()
+							.then(result => result
+								? adress_id
+								: Promise.reject({handled: true}))
+							.then(this.deleteAddress)
+							.catch(this.$fhcAlert.handleSystemError);
+					}
 			});
 		},
 		addNewAddress(addressData) {
@@ -254,7 +261,6 @@ export default{
 				}).catch(this.$fhcAlert.handleSystemError)
 				.finally(()=> {
 					window.scrollTo(0, 0);
-					this.hideModal('deleteAdressModal');
 					this.reload();
 				});
 		},
@@ -559,18 +565,6 @@ export default{
 				<button v-else type="button" class="btn btn-primary" @click="updateAddress(addressData.adresse_id)">OK</button>
             </template>
 		</bs-modal>
-		
-		<!--Modal: deleteAdressModal-->
-		<bs-modal ref="deleteAdressModal">
-			<template #title>{{$p.t('person', 'adresse_delete')}}</template>
-			<template #default>
-				<p>{{$p.t('person', 'adresse_confirm_delete')}}</p>
-			</template>
-			<template #footer>
-				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">{{$p.t('ui', 'abbrechen')}}</button>
-				<button type="button" class="btn btn-primary" @click="deleteAddress(addressData.adresse_id)">OK</button>
-			</template>
-		</bs-modal>
 			
 		<core-filter-cmpt
 			ref="table"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
index 7d3e3e7da..7eb1229f7 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
@@ -141,8 +141,13 @@ export default{
 		},
 		actionDeleteBankverbindung(bankverbindung_id){
 			this.loadBankverbindung(bankverbindung_id).then(() => {
-				if(this.bankverbindungData.bankverbindung_id)
-					this.$refs.deleteBankverbindungModal.show();
+				this.$fhcAlert
+					.confirmDelete()
+					.then(result => result
+						? bankverbindung_id
+						: Promise.reject({handled: true}))
+					.then(this.deleteBankverbindung)
+					.catch(this.$fhcAlert.handleSystemError);
 			});
 		},
 		addNewBankverbindung(bankverbindungData) {
@@ -188,7 +193,6 @@ export default{
 				}).catch(this.$fhcAlert.handleSystemError)
 			.finally(()=> {
 				window.scrollTo(0, 0);
-				this.hideModal('deleteBankverbindungModal');
 				this.resetModal();
 				this.reload();
 			});
@@ -315,230 +319,7 @@ export default{
 			</template>
 			
 		</BsModal>
-		
-		<!--Modal: Add Bankverbindung-->
-<!--		<BsModal title="Bankverbindung anlegen" ref="newBankverbindungModal">
-
-			<template #title>{{$p.t('person', 'bankvb_new')}}</template>
-			<form-form class="row g-3" ref="bankverbindungData">
-				<div class="row mb-3">
-					<label for="name" class="form-label col-sm-4">Name</label>
-					<div class="col-sm-6">
-						<form-input 
-							type="text" 
-							name="name" 
-							v-model="bankverbindungData.name"
-						>
-						</form-input>
-					</div>
-				</div>
-				<div class="row mb-3">										   
-					<label for="anschrift" class="form-label col-sm-4">{{$p.t('person', 'anschrift')}}</label>
-					<div class="col-sm-6">
-						<form-input 
-							type="text" 
-							name="anschrift" 
-								v-model="bankverbindungData.anschrift"
-						>
-						</form-input>
-					</div>
-				</div>
-
-					<div class="row mb-3">									   
-						<label for="iban" class="form-label col-sm-4">IBAN<sup>*</sup></label>
-						<div class="col-sm-6">
-							<form-input 
-								type="text" 
-								name="iban" 
-								v-model="bankverbindungData.iban"
-								required
-							>
-							</form-input>
-						</div>
-					</div>
-					<div class="row mb-3">								   
-						<label for="bic" class="form-label col-sm-4">BIC</label>
-						<div class="col-sm-6">
-							<form-input 
-								type="text" 
-								name="bic" 
-								v-model="bankverbindungData.bic"
-								>
-							</form-input>
-						</div>
-					</div>
-					<div class="row mb-3">							   
-						<label for="kontonr" class="form-label col-sm-4">{{$p.t('person', 'kontonr')}}</label>
-						<div class="col-sm-6">
-							<form-input 
-								type="text" 
-								name="kontonr" 
-								v-model="bankverbindungData.kontonr"
-								>
-							</form-input>
-						</div>
-					</div>
-					<div class="row mb-3">										   
-						<label for="blz" class="form-label col-sm-4">{{$p.t('person', 'blz')}}</label>
-						<div class="col-sm-6">
-							<form-input 
-								type="text" 
-								name="blz" 
-								v-model="bankverbindungData.blz"
-								>
-							</form-input>
-						</div>
-					</div>
-					<div class="row mb-3">
-						<label for="typ" class="form-label col-sm-4">{{$p.t('global', 'typ')}}<sup>*</sup></label>
-						<div class="col-sm-6">
-							<form-input 
-								type="select" 
-								name="typ" 
-								v-model="bankverbindungData.typ"
-								required
-								>
-								<option  value="p">{{$p.t('person', 'privatkonto')}}</option>
-								<option  value="f">{{$p.t('person', 'firmenkonto')}}</option>
-							</form-input>
-						</div>
-					</div>
-					<div class="row mb-3">
-					<label for="verrechnung" class="form-label col-sm-4">{{$p.t('person', 'verrechnung')}}</label>
-					<div class="col-sm-4">
-						<form-input
-							container-class="form-check"
-							type="checkbox"
-							name="verrechnung"
-							v-model="bankverbindungData.verrechnung"
-						>
-						</form-input>
-					</div>
-				</div>
-			</form-form>
-            <template #footer>
-            		<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{$p.t('ui', 'abbrechen')}}</button>
-					<button type="button" class="btn btn-primary" @click="addNewBankverbindung()">OK</button>
-            </template>
-		</BsModal>-->
 				
-		<!--Modal: Edit Bankverbindung-->
-<!--		<BsModal ref="editBankverbindungModal">
-			<template #title>{{$p.t('person', 'bankvb_edit')}}</template>
-				<form-form class="row g-3" ref="bankverbindungData">
-				
-					<div class="row mb-3">
-						<label for="name" class="form-label col-sm-4">Name</label>
-						<div class="col-sm-6">
-							<form-input 
-								type="text" 
-								name="name" 
-								v-model="bankverbindungData.name"
-							>
-							</form-input>
-						</div>
-					</div>
-					<div class="row mb-3">									   
-						<label for="anschrift" class="form-label col-sm-4">{{$p.t('person', 'anschrift')}}</label>
-						<div class="col-sm-6">
-							<form-input 
-								type="text" 
-								name="anschrift" 
-								v-model="bankverbindungData.anschrift"
-							>
-							</form-input>
-						</div>
-					</div>
-					<div class="row mb-3">
-						<label for="iban" class="form-label col-sm-4">IBAN<sup>*</sup></label>
-						<div class="col-sm-6">
-							<form-input 
-								type="text" 
-								name="iban" 
-								v-model="bankverbindungData.iban"
-								required
-							>
-							</form-input>
-						</div>
-					</div>
-					<div class="row mb-3">									   
-						<label for="bic" class="form-label col-sm-4">BIC</label>
-						<div class="col-sm-6">
-							<form-input 
-								type="text" 
-								name="bic" 
-								v-model="bankverbindungData.bic"
-								>
-							</form-input>
-						</div>
-					</div>
-					<div class="row mb-3">									   
-						<label for="kontonr" class="form-label col-sm-4">{{$p.t('person', 'kontonr')}}</label>
-						<div class="col-sm-6">
-							<form-input 
-								type="text" 
-								name="kontonr" 
-								v-model="bankverbindungData.kontonr"
-								>
-							</form-input>
-						</div>
-					</div>
-					<div class="row mb-3">									   
-						<label for="blz" class="form-label col-sm-4">{{$p.t('person', 'blz')}}</label>
-						<div class="col-sm-6">
-							<form-input 
-								type="text" 
-								name="blz" 
-								v-model="bankverbindungData.blz"
-								>
-							</form-input>
-						</div>
-					</div>
-					<div class="row mb-3">
-						<label for="typ" class="form-label col-sm-4">{{$p.t('global', 'typ')}}<sup>*</sup></label>
-						<div class="col-sm-6">
-							<form-input 
-								type="select" 
-								name="typ" 
-								v-model="bankverbindungData.typ"
-								required
-								>
-								<option  value="p">{{$p.t('person', 'privatkonto')}}</option>
-								<option  value="f">{{$p.t('person', 'firmenkonto')}}</option>
-							</form-input>
-						</div>
-					</div>
-					<div class="row mb-3">
-						<label for="verrechnung" class="form-label col-sm-4">{{$p.t('person', 'verrechnung')}}</label>
-						<div class="col-sm-4">
-							<form-input
-								container-class="form-check"
-								type="checkbox"
-								name="verrechnung"
-								v-model="bankverbindungData.verrechnung"
-							>
-							</form-input>
-						</div>
-					</div>															   
-				</form-form>
-				<template #footer>
-					<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">{{$p.t('ui', 'abbrechen')}}</button>
-					<button ref="Close" type="button" class="btn btn-primary" @click="updateBankverbindung(bankverbindungData.bankverbindung_id)">OK</button>
-            	</template>
-		</BsModal>-->
-		
-		<!--Modal: Delete Bankverbindung-->
-		<BsModal ref="deleteBankverbindungModal">
-			<template #title>{{$p.t('person', 'bankvb_delete')}}</template>
-			<template #default>
-				<p>{{$p.t('person', 'bankvb_confirm_delete')}}</p>
-			</template>									
-			<template #footer>
-				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">{{$p.t('ui', 'abbrechen')}}</button>
-				<button ref="Close" type="button" class="btn btn-primary" @click="deleteBankverbindung(bankverbindungData.bankverbindung_id)">OK</button>
-			</template>
-		</BsModal>
-			
 		<core-filter-cmpt
 			ref="table"
 			:tabulator-options="tabulatorOptions"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
index 04656607d..3acb6353d 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
@@ -146,7 +146,14 @@ export default{
 		},
 		actionDeleteContact(contact_id){
 			this.loadContact(contact_id);
-			this.$refs.deleteContactModal.show();
+
+			this.$fhcAlert
+				.confirmDelete()
+				.then(result => result
+					? contact_id
+					: Promise.reject({handled: true}))
+				.then(this.deleteContact)
+				.catch(this.$fhcAlert.handleSystemError);
 		},
 		addNewContact(formData) {
 			this.$fhcApi.post('api/frontend/v1/stv/kontakt/addNewContact/' + this.uid,
@@ -181,7 +188,6 @@ export default{
 				.catch(this.$fhcAlert.handleSystemError)
 				.finally(()=> {
 					window.scrollTo(0, 0);
-					this.hideModal('deleteContactModal');
 					this.resetModal();
 					this.reload();
 			});
@@ -378,19 +384,7 @@ export default{
 				<button v-else type="button" class="btn btn-primary" @click="updateContact(contactData.kontakt_id)">OK</button>
 			</template>
 		</BsModal>
-										
-		<!--Modal: Delete Contact-->
-		<BsModal ref="deleteContactModal">
-			<template #title>{{$p.t('person', 'kontakt_delete')}}</template>  
-			<template #default>
-				<p>{{$p.t('person', 'kontakt_confirm_delete')}}</p>
-			</template>												
-			<template #footer>
-				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="resetModal">{{$p.t('ui', 'abbrechen')}}</button>
-				<button ref="Close" type="button" class="btn btn-primary" @click="deleteContact(contactData.kontakt_id)">OK</button>
-			</template>
-		</BsModal>
-					
+														
 		<core-filter-cmpt
 			ref="table"
 			:tabulator-options="tabulatorOptions"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index 7dab9e51c..b8002b64e 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -327,8 +327,17 @@ export default{
 
 			this.loadStatus(this.statusId).then(() => {
 				if(this.statusData)
-					this.$refs.deleteStatusModal.show();
+				{
+					this.$fhcAlert
+						.confirmDelete()
+						.then(result => result
+							? this.statusId
+							: Promise.reject({handled: true}))
+						.then(this.deleteStatus)
+						.catch(this.$fhcAlert.handleSystemError);
+				}
 			});
+
 		},
 		actionAdvanceStatus(status, stdsem, ausbildungssemester){
 			this.statusId = {
@@ -355,7 +364,6 @@ export default{
 			});
 		},
 		actionConfirmDialogue(data, statusgrund, statusText){
-		//	this.hideModal('addMultiStatus');
 			this.actionButton = statusgrund;
 			this.actionStatusText = statusText;
 
@@ -426,8 +434,6 @@ export default{
 				};
 
 			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData, ausbildungssemester: this.actionSem}));
-
-			console.log("in changeStatusToWiederholer" + prestudentIds);
 			this.addNewStatus(prestudentIds);
 		},
 		changeStatusToDiplomand(prestudentIds){
@@ -440,9 +446,6 @@ export default{
 				};
 
 			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData}));
-
-/*			console.log("in changeStatusToDiplomand" + prestudentIds);
-			this.hideModal('addMultiStatus');*/
 			this.addNewStatus(prestudentIds);
 		},
 		changeStatusToAbsolvent(prestudentIds){
@@ -455,9 +458,6 @@ export default{
 				};
 
 			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData}));
-
-/*			console.log("in changeStatusToAbsolvent" + prestudentIds);
-			this.hideModal('addMultiStatus');*/
 			this.addNewStatus(prestudentIds);
 		},
 		turnIntoStudent(prestudentIds){
@@ -502,7 +502,6 @@ export default{
 					else
 					{
 						console.log(prestudentId + ": isersterStudent: " + this.isErsterStudent + " Add New Status");
-
 						changeData = this.newArray.find(item => item.prestudent_id === prestudentId);
 
 						return this.$fhcApi.post('api/frontend/v1/stv/status/addNewStatus/' + prestudentId,
@@ -537,7 +536,6 @@ export default{
 /*					if (this.modelValue.prestudent_id) {
 						this.reload();
 						//TODO(manu) reload Detailtab after Abbrecher to see current status activ, verband and gruppe
-						//TODO(manu) reload Tab STatus after turned Into Student to see new status
 					}*/
 					if(this.isErsterStudent) {
 						this.reload();
@@ -652,7 +650,6 @@ export default{
 				.then(
 					result => {
 						this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
-							this.hideModal('deleteStatusModal');
 							this.resetModal();
 					})
 				.catch(this.$fhcAlert.handleSystemError)
@@ -924,24 +921,7 @@ export default{
 				</template>
 								
 			</BsModal>
-		
-			<!--Modal: Delete Status-->
-			<BsModal ref="deleteStatusModal">
-				<template #title>{{$p.t('lehre', 'status_edit')}}</template>
-				<template #default>
-				<div v-if="isLastStatus == 1">
-					<p>{{$p.t('lehre', 'last_status_confirm_delete')}}</p>
-				</div>
-				<div v-else>
-					<p>{{$p.t('lehre', 'status_confirm_delete')}}</p>
-				</div>
-					
-				</template>
-				<template #footer>
-					<button ref="Close" type="button" class="btn btn-primary" @click="deleteStatus(statusId)">OK</button>
-				</template>
-			</BsModal>
-			
+				
 			<!--Modal: Confirm Abbruch-->
 			<BsModal ref="confirmStatusAction">
 				<template #title>{{$p.t('lehre', 'status_edit')}}</template>

From 8a88aa21281d8f6e82de8c7f5cce2bf953fa6332 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 11 Jul 2024 14:23:53 +0200
Subject: [PATCH 0908/1461] Correctly use FhcApi in Bismeldestichtag

---
 application/controllers/api/frontend/v1/stv/Status.php     | 7 +++----
 .../Studentenverwaltung/Details/Prestudent/MultiStatus.js  | 6 +++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 3a253b3e2..3ce4926b7 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -72,10 +72,9 @@ class Status extends FHCAPI_Controller
 		$this->load->model('codex/Bismeldestichtag_model', 'BismeldestichtagModel');
 
 		$result = $this->BismeldestichtagModel->getLastReachedMeldestichtag();
-		if (isError($result)) {
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-		return $this->terminateWithSuccess($result);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
 	}
 
 	public function isLastStatus($prestudent_id)
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index b8002b64e..ae5a98958 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -199,7 +199,6 @@ export default{
 					if (this.dataMeldestichtag && this.dataMeldestichtag > rowData.datum)
 					{
 						row.getElement().classList.add('disabled');
-
 					}
 				},
 				layout: 'fitDataFill',
@@ -754,9 +753,10 @@ export default{
 			.catch(this.$fhcAlert.handleSystemError);
 		this.$fhcApi
 			.get('api/frontend/v1/stv/status/getLastBismeldestichtag/')
-			.then(result => result.data)
 			.then(result => {
-				this.dataMeldestichtag = result.retval[0].meldestichtag;
+				this.dataMeldestichtag = result.data[0].meldestichtag;
+				if (this.$refs.table.tableBuilt)
+					this.$refs.table.tabulator.redraw(true);
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 	},

From 4c862932e80794ff9009157222db1619e96dbd36 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 11 Jul 2024 14:28:29 +0200
Subject: [PATCH 0909/1461] use CI Model functions for
 Bismeldestichtag_model->getLastReachedMeldestichtag()

---
 .../models/codex/Bismeldestichtag_model.php   | 42 +++++++------------
 1 file changed, 14 insertions(+), 28 deletions(-)

diff --git a/application/models/codex/Bismeldestichtag_model.php b/application/models/codex/Bismeldestichtag_model.php
index 6c0858b35..bc01f6673 100644
--- a/application/models/codex/Bismeldestichtag_model.php
+++ b/application/models/codex/Bismeldestichtag_model.php
@@ -13,38 +13,24 @@ class Bismeldestichtag_model extends DB_Model
 
 	public function getLastReachedMeldestichtag($studiensemester_kurzbz = null)
 	{
-		$qry = "
-				SELECT
-					meldestichtag_id, meldestichtag, studiensemester_kurzbz, insertamum, insertvon, updateamum, updatevon
-				FROM
-					bis.tbl_bismeldestichtag
-				WHERE
-					meldestichtag < NOW()
-		";
+		$this->addSelect('meldestichtag_id');
+		$this->addSelect('meldestichtag');
+		$this->addSelect('studiensemester_kurzbz');
+		$this->addSelect('insertamum');
+		$this->addSelect('insertvon');
+		$this->addSelect('updateamum');
+		$this->addSelect('updatevon');
 
-		if (isset($studiensemester_kurzbz))
-		{
-			$qry .=	"
-				AND
-					studiensemester_kurzbz= ?";
+		if ($studiensemester_kurzbz) {
+			$this->db->where('studiensemester_kurzbz', $studiensemester_kurzbz);
 		}
 
-		$qry .= "
-				ORDER BY
-					meldestichtag DESC
-				LIMIT 1;";
-
-		$result = $this->execQuery($qry, array($studiensemester_kurzbz));
-
-		if (isError($result))
-		{
-			return error($result);
-		}
-		if (!hasData($result)) {
-			return success("0",'Kein Meldestichtag vorhanden');
-		}
-		return $result;
+		$this->addOrder('meldestichtag', 'DESC');
+		$this->addLimit(1);
 
+		return $this->loadWhere([
+			'meldestichtag < NOW()' => null
+		]);
 	}
 
 	/**

From ce7b368a8eae38fa7b16de08d8f922d85bc40ba4 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Thu, 11 Jul 2024 14:33:38 +0200
Subject: [PATCH 0910/1461] Adapted lv.orgform_kurzbz to selects in
 Lehrveranstaltung_model.php

---
 application/models/education/Lehrveranstaltung_model.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/application/models/education/Lehrveranstaltung_model.php b/application/models/education/Lehrveranstaltung_model.php
index 129e2af41..de0bcbdbb 100644
--- a/application/models/education/Lehrveranstaltung_model.php
+++ b/application/models/education/Lehrveranstaltung_model.php
@@ -42,7 +42,8 @@ class Lehrveranstaltung_model extends DB_Model
                 stg.bezeichnung AS "stg_bezeichnung",
                 lv.semester,   
                 lv.lehrveranstaltung_id,
-                lv.bezeichnung AS "lv_bezeichnung"           
+                lv.bezeichnung AS "lv_bezeichnung",
+				lv.orgform_kurzbz
             FROM
                     lehre.tbl_lehrveranstaltung     lv 
                     JOIN lehre.tbl_lehreinheit           le USING (lehrveranstaltung_id)
@@ -105,7 +106,8 @@ class Lehrveranstaltung_model extends DB_Model
                 stg.bezeichnung AS "stg_bezeichnung",
                 lv.semester,   
                 lv.lehrveranstaltung_id,
-                lv.bezeichnung AS "lv_bezeichnung"           
+                lv.bezeichnung AS "lv_bezeichnung",
+				lv.orgform_kurzbz
             FROM
 				lehre.tbl_lehrveranstaltung     		lv 
 				JOIN lehre.tbl_lehreinheit           	le USING (lehrveranstaltung_id)

From e9ae0465926327a4f38b51b98d3f3d43087178f9 Mon Sep 17 00:00:00 2001
From: KarpAlex <karpenko@technikum-wien.at>
Date: Thu, 11 Jul 2024 16:44:22 +0200
Subject: [PATCH 0911/1461] Prestudentstatuschecklib: checks also work when
 dates of two status are the same

---
 .../libraries/PrestudentstatusCheckLib.php    | 93 ++++++++++++-------
 1 file changed, 57 insertions(+), 36 deletions(-)

diff --git a/application/libraries/PrestudentstatusCheckLib.php b/application/libraries/PrestudentstatusCheckLib.php
index 3b191619f..b238219a8 100644
--- a/application/libraries/PrestudentstatusCheckLib.php
+++ b/application/libraries/PrestudentstatusCheckLib.php
@@ -106,7 +106,7 @@ class PrestudentstatusCheckLib
 		$status_kurzbz,
 		$tudiensemester_kurzbz,
 		$ausbildungssemester
-	) 
+	)
 	{
 		$resultApp =  $this->_getApplicationData($prestudent_id);
 		if(isError($resultApp))
@@ -140,7 +140,7 @@ class PrestudentstatusCheckLib
 	 * @return error if invalid
 	 * @return error, if role does not exist, else count(roles) if it does
 	 */
-	public function checkIfExistingStudentRolle($prestudent_id) 
+	public function checkIfExistingStudentRolle($prestudent_id)
 	{
 		$resultApp =  $this->_getApplicationData($prestudent_id);
 		if(isError($resultApp))
@@ -169,7 +169,7 @@ class PrestudentstatusCheckLib
 	 * @param integer $prestudent_id
 	 * @return booleans $reihungstest_angetreten, error if not angetreten
 	 */
-	public function checkIfAngetreten($prestudent_id) 
+	public function checkIfAngetreten($prestudent_id)
 	{
 		$result =  $this->_getApplicationData($prestudent_id);
 		if(isError($result))
@@ -190,7 +190,7 @@ class PrestudentstatusCheckLib
 	 * @param integer $prestudent_id
 	 * @return booleans $zgv_code, error if not registered
 	 */
-	public function checkIfZGVEingetragen($prestudent_id, $typ=null) 
+	public function checkIfZGVEingetragen($prestudent_id, $typ=null)
 	{
 		$result =  $this->_getApplicationData($prestudent_id);
 		if(isError($result))
@@ -201,18 +201,18 @@ class PrestudentstatusCheckLib
 		$studentName = trim ($result->vorname.' '.$result->nachname);
 
 		if ($typ && $typ=='m' && !$result->zgvmas_code)
-		{			
+		{
 			return error($this->_ci->p->t('lehre', 'error_ZGVMasterNichtEingetragen', ['name' => $studentName]));
 		}
 		else
 			return success($result->zgvmas_code);
-		
+
 
 		if(!$result->zgv_code)
-		{		
+		{
 			return error($this->_ci->p->t('lehre', 'error_ZGVNichtEingetragen', ['name' => $studentName]));
 		}
-	
+
 		return success($result->zgv_code);
 	}
 
@@ -221,7 +221,7 @@ class PrestudentstatusCheckLib
 	 * @return error if invalid
 	 * @return error if no bewerberstatus, success otherwise
 	 */
-	public function checkIfExistingBewerberstatus($prestudent_id) 
+	public function checkIfExistingBewerberstatus($prestudent_id)
 	{
 		$result =  $this->_getApplicationData($prestudent_id);
 		if(isError($result))
@@ -239,7 +239,7 @@ class PrestudentstatusCheckLib
 			return getData($result);
 		}
 		if(getData($result) == "0")
-		{		
+		{
 			return error($this->_ci->p->t('lehre','error_keinBewerber', ['name' => $studentName]));
 		}
 		return success(getData($result));
@@ -258,7 +258,7 @@ class PrestudentstatusCheckLib
 			return getData($result);
 		}
 		if(getData($result) == "1")
-		{		
+		{
 			return error($this->_ci->p->t('lehre','error_dataVorMeldestichtag'));
 		}
 		return success(getData($result));
@@ -325,23 +325,53 @@ class PrestudentstatusCheckLib
 		$new_status_datum_form = new DateTime($new_status_datum);
 		$new_status_semesterstart_form = new DateTime($new_status_semesterstart);
 
-		$neuer_status = new stdClass();
-		$neuer_status->status_kurzbz = $status_kurzbz;
-		$neuer_status->studiensemester_kurzbz = $new_status_studiensemester_kurzbz;
-		$neuer_status->datum = $new_status_datum;
-		$neuer_status->ausbildungssemester = $new_status_ausbildungssemester;
-		$neuer_status->studienplan_orgform_kurzbz = $new_studienplan_orgform_kurzbz;
+		if (!isEmptyArray($resultArr))
+		{
+			// neuen Status zum Hinzufügen
+			$first_status = $resultArr[0];
+			$neuer_status = new stdClass();
+			$neuer_status->status_kurzbz = $status_kurzbz;
+			$neuer_status->studiensemester_kurzbz = $new_status_studiensemester_kurzbz;
+			$neuer_status->datum = $new_status_datum;
+			$neuer_status->ausbildungssemester = $new_status_ausbildungssemester;
+			$neuer_status->studienplan_orgform_kurzbz = $new_studienplan_orgform_kurzbz;
+			$neuer_status->matrikelnr = $first_status->matrikelnr;
+			$neuer_status->vorname = $first_status->vorname;
+			$neuer_status->nachname = $first_status->nachname;
+
+			// Status, welcher gerade geändert wird, holen
+			$status_to_change = array_filter(
+				$resultArr,
+				function ($status) use ($status_kurzbz, $old_status_studiensemester, $old_status_ausbildungssemester) {
+					return
+						$status->status_kurzbz == $status_kurzbz
+						&& $status->studiensemester_kurzbz == $old_status_studiensemester
+						&& $status->ausbildungssemester == $old_status_ausbildungssemester;
+				}
+			);
+
+			if (!isEmptyArray($status_to_change))
+			{
+				$status_to_change_index = key($status_to_change);
+
+				// wenn sich Studiensemester und Ausbildungssemester nicht geändert haben...
+				if ($new_status_studiensemester_kurzbz == $old_status_studiensemester
+					&& $new_status_ausbildungssemester == $old_status_ausbildungssemester)
+				{
+					// ...neuen status an selber stelle einfügen wie zu ändernder Status
+					$resultArr[$status_to_change_index] = (object) array_merge((array) $resultArr[$status_to_change_index], (array) $neuer_status);
+					$newStatusInserted = true;
+				}
+				else
+				{
+					// bei Status mit neuem Semester: alten Status entfernen
+					unset($resultArr[$status_to_change_index]);
+				}
+			}
+		}
 
 		foreach ($resultArr as $row)
 		{
-			// Status, der gerade in Bearbeitung ist, überspringen
-			if (isset($old_status_studiensemester)
-				&& isset($old_status_ausbildungssemester)
-				&& $row->status_kurzbz == $status_kurzbz
-				&& $row->studiensemester_kurzbz == $old_status_studiensemester
-				&& $row->ausbildungssemester == $old_status_ausbildungssemester)
-				continue;
-
 			$studiensemester_start = new DateTime($row->studiensemester_start);
 			$status_datum = new DateTime($row->datum);
 
@@ -350,15 +380,6 @@ class PrestudentstatusCheckLib
 				if (!$newStatusInserted)
 				{
 					// neuer Status erstmals größer als Datum eines bestehenden Status -> neuen Status EINMALIG einfügen für spätere Statusprüfung
-					$neuer_status = new stdClass();
-					$neuer_status->status_kurzbz = $status_kurzbz;
-					$neuer_status->studiensemester_kurzbz = $new_status_studiensemester_kurzbz;
-					$neuer_status->datum = $new_status_datum;
-					$neuer_status->ausbildungssemester = $new_status_ausbildungssemester;
-					$neuer_status->studienplan_orgform_kurzbz = $new_studienplan_orgform_kurzbz;
-					$neuer_status->matrikelnr = $row->matrikelnr;
-					$neuer_status->vorname = $row->vorname;
-					$neuer_status->nachname = $row->nachname;
 					$statusArr[] = $neuer_status;
 					$newStatusInserted = true;
 				}
@@ -478,10 +499,10 @@ class PrestudentstatusCheckLib
 	 * @param integer $prestudent_id
 	 * @return error if not valid, array with ApplicationData if valid
 	 */
-	private function _getApplicationData($prestudent_id) 
+	private function _getApplicationData($prestudent_id)
 	{
 		$this->_ci->PrestudentModel->addJoin('public.tbl_person p', 'ON (p.person_id = public.tbl_prestudent.person_id)');
-		
+
 		$result = $this->_ci->PrestudentModel->load([
 			'prestudent_id'=> $prestudent_id,
 		]);

From 3f84024ce8011241125619042b4520823a490225 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 11 Jul 2024 17:35:18 +0200
Subject: [PATCH 0912/1461] uncomment null check, layout of hint

---
 content/student/studentoverlay.js.php          |  2 +-
 content/student/studentpruefungoverlay.xul.php | 13 +++++--------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/content/student/studentoverlay.js.php b/content/student/studentoverlay.js.php
index 86a56c916..d2030f493 100644
--- a/content/student/studentoverlay.js.php
+++ b/content/student/studentoverlay.js.php
@@ -5198,7 +5198,7 @@ function StudentPruefungTypChange()
 {
 	var typ = document.getElementById('student-pruefung-menulist-typ').value;
 	var hinweisid = document.getElementById('student-pruefung-textbox-datum-hinweis');
-	//if(hinweisid === NULL) return;
+	if(hinweisid === null) return;
 	hinweisid.hidden = (typ != 'kommPruef' && typ != 'zusKommPruef');
 }
 
diff --git a/content/student/studentpruefungoverlay.xul.php b/content/student/studentpruefungoverlay.xul.php
index 0e2148a43..e325ee284 100644
--- a/content/student/studentpruefungoverlay.xul.php
+++ b/content/student/studentpruefungoverlay.xul.php
@@ -258,15 +258,12 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 					      				</hbox>
 									</row>
 <?php if($show_komm_prfg_hint) { ?>
-									<row id="student-pruefung-textbox-datum-hinweis" hidden="true">
+									<row id="student-pruefung-textbox-datum-hinweis" hidden="true" maxwidth="700">
 										<label></label>
-										<hbox style="font-size: 75%;">
-										    <image style="width: 20px; margin: 15px 5px 15px 10px;" class="message-icon"/>
-										    <vbox>
-											<description class="small-margin">Bitte bei der Neuanlage das Datum der Noteneintragung (i. d. R. heute) eintragen, </description>
-											<description class="small-margin">um einen korrekten Fristenablauf der Wiederholung zu ermöglichen. </description>
-											<description class="small-margin">Das Datum der Prüfung bitte im Anmerkungsfeld vermerken.</description>
-										    </vbox>
+										<hbox maxwidth="600" align="center">
+										    <image width="20" class="message-icon"/>
+										    <description flex="1" maxwidth="200" style="font-size: 70%;">Bitte bei der Neuanlage das Datum der Noteneintragung (i. d. R. heute) eintragen, um den korrekten Fristenablauf der Wiederholung zu ermöglichen. Das Datum der Prüfung bitte im Anmerkungsfeld vermerken.</description>
+										    <spacer flex="1" />
 										</hbox>
 									</row>
 <?php } ?>

From 9d455c35d0b26bfd954003384ad0204a1f4b77eb Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 11 Jul 2024 18:32:47 +0200
Subject: [PATCH 0913/1461] Betriebsmittel.js: use arrow function for dynamic
 ajaxParams, Filter.js: remove required from filterType

---
 .../js/components/Betriebsmittel/Betriebsmittel.js   | 12 +++++++-----
 public/js/components/filter/Filter.js                |  3 +--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/public/js/components/Betriebsmittel/Betriebsmittel.js b/public/js/components/Betriebsmittel/Betriebsmittel.js
index 211455dbf..05ea141d1 100644
--- a/public/js/components/Betriebsmittel/Betriebsmittel.js
+++ b/public/js/components/Betriebsmittel/Betriebsmittel.js
@@ -36,10 +36,12 @@ export default {
 			tabulatorOptions: {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: this.endpoint.getAllBetriebsmittel,
-				ajaxParams: {
-					type: this.typeId,
-					id: this.id
-				},
+				ajaxParams: () => {
+                                    return {
+                                        type: this.typeId,
+                                        id: this.id
+                                    }
+                                },
 				ajaxResponse: (url, params, response) => response.data,
 				columns: [
 					{title: "Nummer", field: "nummer", width: 150},
@@ -149,7 +151,7 @@ export default {
 	},
 	watch: {
 		id() {
-			this.$refs.table.tabulator.setData('dummy', {type: this.typeId, id: this.id});
+			this.$refs.table.tabulator.setData('dummy');
 		}
 	},
 	methods: {
diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index a7d93523e..5d8954d36 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -48,8 +48,7 @@ export const CoreFilterCmpt = {
 			default: true
 		},
 		filterType: {
-			type: String,
-			required: true
+			type: String
 		},
 		tabulatorOptions: Object,
 		tabulatorEvents: Array,

From 464dbba457d7af9df3100c8c84f3b7af0b4fac0c Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 11 Jul 2024 18:43:31 +0200
Subject: [PATCH 0914/1461] add missing api js files

---
 public/js/api/betriebsmittel.js        |  5 +++++
 public/js/api/betriebsmittel/person.js | 26 ++++++++++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 public/js/api/betriebsmittel.js
 create mode 100644 public/js/api/betriebsmittel/person.js

diff --git a/public/js/api/betriebsmittel.js b/public/js/api/betriebsmittel.js
new file mode 100644
index 000000000..bd088b195
--- /dev/null
+++ b/public/js/api/betriebsmittel.js
@@ -0,0 +1,5 @@
+import person from "./betriebsmittel/person.js";
+
+export default {
+	person
+}
\ No newline at end of file
diff --git a/public/js/api/betriebsmittel/person.js b/public/js/api/betriebsmittel/person.js
new file mode 100644
index 000000000..7ad6d49b7
--- /dev/null
+++ b/public/js/api/betriebsmittel/person.js
@@ -0,0 +1,26 @@
+export default {
+	getAllBetriebsmittel(url, config, params){
+		return this.$fhcApi.get('api/frontend/v1/betriebsmittel/betriebsmittelP/getAllBetriebsmittel/' + params.type + '/' + params.id);
+	},
+	addNewBetriebsmittel(form, person_id, formData) {
+		return this.$fhcApi.post(form, 'api/frontend/v1/betriebsmittel/betriebsmittelP/addNewBetriebsmittel/' +
+			person_id, formData
+		);
+	},
+	loadBetriebsmittel(betriebsmittelperson_id){
+		return this.$fhcApi.post('api/frontend/v1/betriebsmittel/betriebsmittelP/loadBetriebsmittel/' + betriebsmittelperson_id);
+	},
+	updateBetriebsmittel(form, betriebsmittelperson_id, formData) {
+		return this.$fhcApi.post(form, 'api/frontend/v1/betriebsmittel/betriebsmittelP/updateBetriebsmittel/' + betriebsmittelperson_id,
+			formData);
+	},
+	deleteBetriebsmittel(betriebsmittelperson_id){
+		return this.$fhcApi.post('api/frontend/v1/betriebsmittel/betriebsmittelP/deleteBetriebsmittel/' +	betriebsmittelperson_id);
+	},
+	getTypenBetriebsmittel(){
+		return this.$fhcApi.get('api/frontend/v1/betriebsmittel/betriebsmittelP/getTypenBetriebsmittel/');
+	},
+	loadInventarliste(query){
+		return this.$fhcApi.get('api/frontend/v1/betriebsmittel/betriebsmittelP/loadInventarliste/' +	query);
+	}
+}
\ No newline at end of file

From 78471a2c3a7ee9ded4197a2db89fd5ecf21dbce8 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 12 Jul 2024 08:30:57 +0200
Subject: [PATCH 0915/1461] Use Prestudentstatus_model instead of
 Prestudent_model for status history

---
 .../api/frontend/v1/stv/Status.php            | 16 +----
 application/models/crm/Prestudent_model.php   | 58 ----------------
 .../models/crm/Prestudentstatus_model.php     | 66 +++++++++++++++++++
 3 files changed, 69 insertions(+), 71 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 3ce4926b7..e7b416c57 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -39,21 +39,11 @@ class Status extends FHCAPI_Controller
 
 	public function getHistoryPrestudent($prestudent_id)
 	{
-		$this->load->model('system/Sprache_model', 'SpracheModel');
-		$this->SpracheModel->addSelect('index');
-		$result = $this->SpracheModel->loadWhere(array('sprache' => getUserLanguage()));
+		$result = $this->PrestudentstatusModel->getHistoryPrestudent($prestudent_id);
 
-		// Return language index
-		$lang =  hasData($result) ? getData($result)[0]->index : 1;
+		$data = $this->getDataOrTerminateWithError($result);
 
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-
-		$result = $this->PrestudentModel->getHistoryPrestudent($prestudent_id, $lang);
-		if (isError($result))
-		{
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess((getData($result) ?: []));
+		$this->terminateWithSuccess($data);
 	}
 
 	public function getStatusgruende()
diff --git a/application/models/crm/Prestudent_model.php b/application/models/crm/Prestudent_model.php
index b783715c2..9721e473f 100644
--- a/application/models/crm/Prestudent_model.php
+++ b/application/models/crm/Prestudent_model.php
@@ -727,62 +727,4 @@ class Prestudent_model extends DB_Model
 
 		return $this->execQuery($query, array($person_id));
 	}
-
-	/**
-	 * Gets history of prestudent, prestudent_id given
-	 * @param int $prestudent_id
-	 * @return object
-	 */
-	public function getHistoryPrestudent($prestudent_id, $index_lang)
-	{
-		$query = "
-					SELECT
-					ps.status_kurzbz,
-					ps.studiensemester_kurzbz,
-					ps.ausbildungssemester,
-					CASE WHEN ps.status_kurzbz IN ('Student', 'Diplomand','Abbrecher','Unterbrecher')
-					THEN CONCAT(lv.semester, lv.verband, lv.gruppe)
-					ELSE ''
-					END AS lehrverband,
-					ps.datum,
-					TO_CHAR(ps.datum::timestamp, 'DD.MM.YYYY') AS format_datum,
-					sp.bezeichnung,
-					ps.bestaetigtam,
-					TO_CHAR(ps.bestaetigtam::timestamp, 'DD.MM.YYYY') AS format_bestaetigtam,
-					ps.bewerbung_abgeschicktamum,
-					TO_CHAR(ps.bewerbung_abgeschicktamum::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS format_bewerbung_abgeschicktamum,
-					stg.statusgrund_kurzbz,
-					ps.orgform_kurzbz,
-					ps.prestudent_id,
-					sp.studienplan_id,
-					ps.anmerkung,
-					ps.bestaetigtvon,
-					ps.insertamum,
-					TO_CHAR(ps.insertamum::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS format_insertamum,
-					ps.insertvon,
-					ps.updateamum,
-					TO_CHAR(ps.updateamum::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS format_updateamum,
-					ps.updatevon,
-					stg.beschreibung[?] as statusgrund_beschreibung
-				FROM
-					public.tbl_prestudentstatus ps
-				LEFT JOIN
-					public.tbl_student st USING (prestudent_id)
-				LEFT JOIN
-					public.tbl_studiengang sg ON (st.studiengang_kz = sg.studiengang_kz)
-				LEFT JOIN
-					lehre.tbl_studienplan sp USING (studienplan_id)
-				LEFT JOIN
-					public.tbl_status_grund stg USING (statusgrund_id)
-				LEFT JOIN
-					public.tbl_studentlehrverband lv ON
-						(st.student_uid = lv.student_uid
-							 AND st.student_uid IS NOT NULL
-							 AND lv.studiensemester_kurzbz = ps.studiensemester_kurzbz)
-				WHERE prestudent_id = ?
-				ORDER BY ps.datum DESC, ps.insertamum DESC, ps.ext_id DESC
-		";
-
-		return $this->execQuery($query, array($index_lang, $prestudent_id));
-	}
 }
diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php
index 5223d5764..dac5fbb23 100644
--- a/application/models/crm/Prestudentstatus_model.php
+++ b/application/models/crm/Prestudentstatus_model.php
@@ -514,4 +514,70 @@ class Prestudentstatus_model extends DB_Model
 
 		return $this->execQuery($qry, array($prestudent_id));
 	}
+
+	/**
+	 * Gets status history of a prestudent
+	 * This function uses the language of the logged in user to
+	 * translate the given statusgrund
+	 *
+	 * @param integer				$prestudent_id
+	 *
+	 * @return stdClass
+	 */
+	public function getHistoryPrestudent($prestudent_id)
+	{
+		$this->addSelect('tbl_prestudentstatus.prestudent_id');
+		$this->addSelect('tbl_prestudentstatus.status_kurzbz');
+		$this->addSelect('tbl_prestudentstatus.studiensemester_kurzbz');
+		$this->addSelect('tbl_prestudentstatus.ausbildungssemester');
+		$this->addSelect('tbl_prestudentstatus.datum');
+		$this->addSelect('tbl_prestudentstatus.insertamum');
+		$this->addSelect('tbl_prestudentstatus.insertvon');
+		$this->addSelect('tbl_prestudentstatus.updateamum');
+		$this->addSelect('tbl_prestudentstatus.updatevon');
+		$this->addSelect('tbl_prestudentstatus.orgform_kurzbz');
+		$this->addSelect('tbl_prestudentstatus.bestaetigtam');
+		$this->addSelect('tbl_prestudentstatus.bestaetigtvon');
+		$this->addSelect('tbl_prestudentstatus.bewerbung_abgeschicktamum');
+		$this->addSelect('tbl_prestudentstatus.anmerkung');
+		$this->addSelect('plan.studienplan_id');
+		$this->addSelect('plan.bezeichnung');
+		$this->addSelect('grund.beschreibung[(
+			SELECT index 
+			FROM public.tbl_sprache 
+			WHERE sprache=' . $this->escape(getUserLanguage()) . '
+		)] AS statusgrund_bezeichnung', false);
+		$this->addSelect("CASE 
+			WHEN s.student_uid IS NOT NULL 
+			AND tbl_prestudentstatus.status_kurzbz IN (" . implode(",", $this->escape([
+				'Student',
+				'Diplomand',
+				'Abbrecher',
+				'Absolvent',
+				'Ausserodentlicher',
+				'Incoming',
+				'Outgoing',
+				'Unterbrecher'
+			])) . ") 
+			THEN lv.semester || lv.verband || lv.gruppe 
+			ELSE '-'
+			END AS lehrverband", false);
+
+		$this->addJoin('lehre.tbl_studienplan plan', 'studienplan_id', 'LEFT');
+		$this->addJoin('public.tbl_status_grund grund', 'statusgrund_id', 'LEFT');
+		$this->addJoin('public.tbl_student s', 'prestudent_id', 'LEFT');
+		$this->addJoin(
+			'public.tbl_studentlehrverband lv',
+			's.student_uid IS NOT NULL AND s.student_uid=lv.student_uid AND tbl_prestudentstatus.studiensemester_kurzbz=lv.studiensemester_kurzbz',
+			'LEFT'
+		);
+
+		$this->addOrder('tbl_prestudentstatus.datum', 'DESC');
+		$this->addOrder('tbl_prestudentstatus.insertamum', 'DESC');
+		$this->addOrder('tbl_prestudentstatus.ext_id', 'DESC');
+
+		return $this->loadWhere([
+			'tbl_prestudentstatus.prestudent_id' => $prestudent_id
+		]);
+	}
 }

From 0bb5cb1fdcd38b52dd7cc791a3039a630be932ca Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 12 Jul 2024 09:20:42 +0200
Subject: [PATCH 0916/1461] bugfix generateMatrikelnnummer, Reihenfolge
 validierung turnIntoStudent

---
 .../api/frontend/v1/stv/Status.php            | 24 +++++++++----------
 application/models/crm/Student_model.php      |  4 ++--
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 3a253b3e2..803e070ba 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -293,7 +293,9 @@ class Status extends FHCAPI_Controller
 			//TODO(manu) check Berechtigung
 			//check if Bismeldestichtag erreicht ADDNEW status
 			$result = $this->prestudentstatuschecklib->checkIfMeldestichtagErreicht($new_status_datum, $studiensemester_kurzbz);
-			return $this->terminateWithError("here", self::ERROR_TYPE_GENERAL);
+
+			//just testing
+			//return $this->terminateWithError("here", self::ERROR_TYPE_GENERAL);
 			if (isError($result))
 			{
 				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
@@ -509,11 +511,6 @@ class Status extends FHCAPI_Controller
 			$isStudent = true;
 
 		if (!$isStudent) {
-			//check if bewerberstatus exists
-			$result = $result = $this->prestudentstatuschecklib->checkIfExistingBewerberstatus($prestudent_id);
-			if (isError($result)) {
-				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			}
 
 			//Check ZGV
 			if ($status_kurzbz == Prestudentstatus_model::STATUS_BEWERBER) {
@@ -544,11 +541,16 @@ class Status extends FHCAPI_Controller
 				}
 			}
 
+			//check if bewerberstatus exists
+			$result = $result = $this->prestudentstatuschecklib->checkIfExistingBewerberstatus($prestudent_id);
+			if (isError($result)) {
+				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			}
+
 			//checkIf Kaution bezahlt
 			//TODO(Manu)
 
 			//generate Personenkennzeichen(matrikelnr)
-			//TODO(manu) check if generateMatrikelnummer verwenden or use new version2 (with Type Param)
 			$resultMat = $this->StudentModel->generateMatrikelnummer2($stg, $studiensemester_kurzbz, $typ);
 			if (isError($resultMat)) {
 				return $this->terminateWithError($resultMat, self::ERROR_TYPE_GENERAL);
@@ -557,7 +559,6 @@ class Status extends FHCAPI_Controller
 			$jahr = mb_substr($matrikelnr, 0, 2);
 
 			//generate UID
-			//TODO(Manu) check ausbildungssemester: testfall prestudent_id 26381
 			$resultUid = $this->StudentModel->generateUID($stgkzl, $jahr, $typ, $matrikelnr);
 			if (isError($resultMat)) {
 				return $this->terminateWithError("in generateUid" . $resultUid, self::ERROR_TYPE_GENERAL);
@@ -590,8 +591,8 @@ class Status extends FHCAPI_Controller
 				}
 			}
 
-			//TODO(Manu) check if benutzer already exists ok?
-			//person kann mehrere Benutzer haben...
+			//TODO(Manu) check if benutzer already exists to avoid conflicts..
+			//person kann mehrere Benutzer haben... student_uid?
 			//add benutzerdatensatz mit Aktierungscode
 			$this->load->model('person/Benutzer_model', 'BenutzerModel');
 			$result = $this->BenutzerModel->checkIfExistingBenutzer($person_id);
@@ -1192,8 +1193,7 @@ class Status extends FHCAPI_Controller
 		//check if Bismeldestichtag erreicht
 		if(!$isBerechtigtNoStudstatusCheck)
 		{
-			$result = $this->prestudentstatuschecklib->checkIfMeldestichtagErreicht($new_status_datum);
-			return $this->terminateWithError("here2", self::ERROR_TYPE_GENERAL);
+			$result = $this->prestudentstatuschecklib->checkIfMeldestichtagErreicht($datum);
 			if (isError($result))
 			{
 				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
diff --git a/application/models/crm/Student_model.php b/application/models/crm/Student_model.php
index eede97037..92a6ed25b 100644
--- a/application/models/crm/Student_model.php
+++ b/application/models/crm/Student_model.php
@@ -108,9 +108,9 @@ class Student_model extends DB_Model
 		$max = 0;
 		if ($matrikelnrres && hasData($matrikelnrres)) {
 			$max = mb_substr($matrikelnrres->retval[0]->matrikelnr, 7);
-			if (!is_numeric($max)) {
+/*			if (!is_numeric($max)) {
 				$max = 0;
-			}
+			}*/
 		}
 
 		$max += 1;

From eb12b35e3749647c1dacd598fff6cba41a5f6691 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 12 Jul 2024 11:29:38 +0200
Subject: [PATCH 0917/1461] reload detailtab after changedStatus, update
 getUserLanguage()

---
 application/models/crm/Prestudentstatus_model.php              | 3 ++-
 .../js/components/Stv/Studentenverwaltung/Details/Details.js   | 3 +++
 .../Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js  | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php
index dac5fbb23..26b603a66 100644
--- a/application/models/crm/Prestudentstatus_model.php
+++ b/application/models/crm/Prestudentstatus_model.php
@@ -526,6 +526,7 @@ class Prestudentstatus_model extends DB_Model
 	 */
 	public function getHistoryPrestudent($prestudent_id)
 	{
+		$lang= getUserLanguage();
 		$this->addSelect('tbl_prestudentstatus.prestudent_id');
 		$this->addSelect('tbl_prestudentstatus.status_kurzbz');
 		$this->addSelect('tbl_prestudentstatus.studiensemester_kurzbz');
@@ -545,7 +546,7 @@ class Prestudentstatus_model extends DB_Model
 		$this->addSelect('grund.beschreibung[(
 			SELECT index 
 			FROM public.tbl_sprache 
-			WHERE sprache=' . $this->escape(getUserLanguage()) . '
+			WHERE sprache=' . $this->escape($lang) . '
 		)] AS statusgrund_bezeichnung', false);
 		$this->addSelect("CASE 
 			WHEN s.student_uid IS NOT NULL 
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
index feec7a580..ae4f92b20 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
@@ -121,6 +121,9 @@ export default {
 		},
 		udfsLoaded(udfs) {
 			this.original = {...(this.original || {}), ...udfs};
+		},
+		reload(){
+			this.updateStudent(this.modelValue);
 		}
 	},
 	created() {
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index ae5a98958..a8528c4b9 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -410,6 +410,8 @@ export default{
 			this.addNewStatus(prestudentIds);
 		},
 		changeStatusToStudent(prestudentIds){
+
+			//TODO Manu validation if Bewerber already before asking for ausbildungssemester
 			this.hideModal('askForAusbildungssemester');
 			let deltaData =
 				{

From 16147711509e236bef273bb56722222d1e21a21f Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 12 Jul 2024 13:17:44 +0200
Subject: [PATCH 0918/1461] loads content of the menu punkte in iframe inside a
 full-screen modal

---
 .../controllers/api/frontend/v1/LvMenu.php    | 95 ++++++++++++-------
 public/css/components/dashboard.css           | 14 +++
 public/js/components/Cis/Mylv/LvUebersicht.js | 39 ++++++--
 3 files changed, 106 insertions(+), 42 deletions(-)

diff --git a/application/controllers/api/frontend/v1/LvMenu.php b/application/controllers/api/frontend/v1/LvMenu.php
index 7b3db87ff..3f55caf62 100644
--- a/application/controllers/api/frontend/v1/LvMenu.php
+++ b/application/controllers/api/frontend/v1/LvMenu.php
@@ -250,22 +250,34 @@ class LvMenu extends FHCAPI_Controller
 		// ##########################################################################################		
         
 		$params = [
-			'user'=>$user,
-			'lvid'=>$lvid,
-			'studiensemester_kurzbz'=>$studiensemester_kurzbz,
-			'studiengang_kz'=>$studiengang_kz,
+			'sprache'=>$sprache,
 			'p'=>$p,
+			'db'=>$db,
+			'user'=>$user,
+			'is_lector'=>$is_lector,
+			'user_is_allowed_to_upload'=>$user_is_allowed_to_upload,
 			'rechte'=>$rechte,
-			'lv'=>$lv,
 			'angezeigtes_stsem'=>$angezeigtes_stsem,
+			'lehreinheit'=>$lehreinheit,
+			'lv_obj'=>$lv_obj,
+			'lv'=>$lv,
+			'lvid'=>$lvid,
+			'studiengang_kz'=>$studiengang_kz,
+			'semester'=>$semester,
+			'short'=>$short,
+			'stg_obj'=>$stg_obj,
+			'kurzbz'=>$kurzbz,
+			'short_name'=>$short_name,
+			'short_short_name'=>$short_short_name,
+			'dir_name'=>$dir_name,
+			'angemeldet'=>$angemeldet,
+			'lehrfach_id'=>$lehrfach_id,
 			'lektor_der_lv'=>$lektor_der_lv,
 			'lehrfach_oe_kurzbz_arr'=>$lehrfach_oe_kurzbz_arr,
-			'is_lector'=>$is_lector,
-			'angemeldet'=>$angemeldet
 		];
 		
 		Events::trigger('lvMenuBuild', 
-						// callback function for the onEvents to add newValues to the $menu
+						// passing $menu per reference
 						function & () use (&$menu) {
 							return $menu;
 						},
@@ -276,8 +288,20 @@ class LvMenu extends FHCAPI_Controller
 		// ##########################################################################################
 		
 		foreach ($menu as $key => $row){
+			
+			// fills pos array to sort the menu 
 			$pos[$key] = $row['position'];
 
+			//adds base_url to both the c4_icon and c4_link
+			/* if(array_key_exists('c4_icon',$menu[$key]) ){
+				$menu[$key]['c4_icon']=base_url($menu[$key]['c4_icon']);
+			}
+			if(array_key_exists('c4_link',$menu[$key]) ){
+				$menu[$key]['c4_link']=base_url($menu[$key]['c4_link']);
+			} */
+			
+
+			/* 
 			// adds new key with modified icon path to the menu
 			$menu[$key]['cis4_icon'] = base_url(str_replace("../../..","",$row['icon']));
 			
@@ -294,7 +318,7 @@ class LvMenu extends FHCAPI_Controller
 				}else{
 					$menu[$key]['cis4_link'] = $menu[$key]['link'];
 				}
-			}
+			} */
 		}
 
 		array_multisort($pos, SORT_ASC, SORT_NUMERIC, $menu);
@@ -339,6 +363,8 @@ class LvMenu extends FHCAPI_Controller
 				'name'=>$p->t('lehre/lehrveranstaltungsinformation'),
 				'icon'=>'../../../skin/images/button_lvinfo.png',
 				'link'=>'',
+				'c4_icon'=> base_url('skin/images/button_lvinfo.png'),
+				'c4_link'=>'',
 				'text'=>$text
 			);
 		}
@@ -385,6 +411,8 @@ class LvMenu extends FHCAPI_Controller
 				'name'=>$p->t('lehre/semesterplan'),
 				'icon'=>'../../../skin/images/button_semplan.png',
 				'link'=>$link,
+				'c4_icon'=> base_url('skin/images/button_semplan.png'),
+				'c4_link'=> $link,
 				'link_target'=>'_blank',
 				'text'=>$text
 			);
@@ -424,6 +452,8 @@ class LvMenu extends FHCAPI_Controller
 				'name'=>$p->t('lehre/download'),
 				'icon'=>'../../../skin/images/button_download.png',
 				'link'=>$link,
+				'c4_icon'=> base_url('skin/images/button_download.png'),
+				'c4_link'=>$link,
 				'text'=>$text
 			);
 		}
@@ -483,6 +513,8 @@ class LvMenu extends FHCAPI_Controller
 				'name'=>$name,
 				'icon'=>'../../../skin/images/button_listen.png',
 				'link'=>$link,
+				'c4_icon'=> base_url('skin/images/button_listen.png'),
+				'c4_link'=>$link,
 				'text'=>$text
 			);
 		}
@@ -499,6 +531,8 @@ class LvMenu extends FHCAPI_Controller
 				'name'=>$p->t('lehre/feedback'),
 				'icon'=>'../../../skin/images/button_feedback.png',
 				'link'=>'feedback.php?lvid='.$lvid,
+				'c4_icon'=> base_url('skin/images/button_feedback.png'),
+				'c4_link'=> base_url('feedback.php?lvid='.$lvid),
 				'text'=>''
 			);
 		}
@@ -515,8 +549,8 @@ class LvMenu extends FHCAPI_Controller
 					'id'=>'core_menu_gesamtnote',
 					'position'=>'80',
 					'name'=>$p->t('lehre/gesamtnote'),
-					'icon'=>'../../../skin/images/button_endnote.png',
-					'link'=>'benotungstool/lvgesamtnoteverwalten.php?lvid='.urlencode($lvid).'&stsem='.urlencode($angezeigtes_stsem)
+					'c4_icon'=> base_url('skin/images/button_endnote.png'),
+					'c4_link'=> base_url('benotungstool/lvgesamtnoteverwalten.php?lvid='.urlencode($lvid).'&stsem='.urlencode($angezeigtes_stsem))
 				);
 			}
 			else
@@ -526,7 +560,7 @@ class LvMenu extends FHCAPI_Controller
 					'id'=>'core_menu_gesamtnote',
 					'position'=>'80',
 					'name'=>$p->t('lehre/gesamtnote'),
-					'icon'=>'../../../skin/images/button_endnote.png',
+					'c4_icon'=>'skin/images/button_endnote.png',
 					'text'=>$p->t('lehre/noteneingabedeaktiviert')
 				);
 			}
@@ -573,8 +607,8 @@ class LvMenu extends FHCAPI_Controller
 				'id'=>'core_menu_studentenupload',
 				'position'=>'90',
 				'name'=>$p->t('lehre/studentenAbgabe'),
-				'icon'=>'../../../skin/images/button_studiupload.png',
-				'link'=>$link,
+				'c4_icon'=>'skin/images/button_studiupload.png',
+				'c4_link'=>$link,
 				'link_target'=>$link_target
 			);
 		}
@@ -599,8 +633,6 @@ class LvMenu extends FHCAPI_Controller
 			$noMails = array();
 			$noMailLink = FALSE;
 
-			
-
 			foreach($studentMails as $mail){
 				
 				if($mail->mail == 'nomail'){
@@ -624,8 +656,8 @@ class LvMenu extends FHCAPI_Controller
 				'id'=>'core_menu_mailanstudierende',
 				'position'=>'100',
 				'name'=>$p->t('lehre/mail'),
-				'icon'=>'../../../skin/images/button_feedback.png',
-				'link'=>$mailto,
+				'c4_icon'=>base_url('skin/images/button_feedback.png'),
+				'c4_link'=>$mailto,
 				'link_onclick'=>$link_onclick
 			);
 		} 
@@ -645,21 +677,12 @@ class LvMenu extends FHCAPI_Controller
 				'id'=>'core_menu_pinboard',
 				'position'=>'110',
 				'name'=>$p->t('lehre/pinboard'),
-				'icon'=>'../../../skin/images/button_pinboard.png',
-				'link'=>base_url("CisHtml/Cms/news"),
+				'c4_icon'=>base_url('skin/images/button_pinboard.png'),
+				'c4_link'=>base_url('CisHtml/Cms/news'),
 				'text'=>$text
 			);
 
-			// this is the old cis version
-			/* $menu[]=array
-			(
-				'id'=>'core_menu_pinboard',
-				'position'=>'110',
-				'name'=>$p->t('lehre/pinboard'),
-				'icon'=>'../../../skin/images/button_pinboard.png',
-				'link'=>'../../../cms/news.php?studiengang_kz='.urlencode($studiengang_kz).'&semester='.urlencode($semester),
-				'text'=>$text
-			); */
+			
 		}
 	}
 
@@ -679,6 +702,8 @@ class LvMenu extends FHCAPI_Controller
 						'name'=>$p->t('lehre/abmelden'),
 						'icon'=>'../../../skin/images/button_studiupload.png',
 						'link'=>'abmeldung.php?lvid='.urlencode($lvid).'&stsem='.urlencode($angezeigtes_stsem),
+						'c4_icon'=>base_url('skin/images/button_studiupload.png'),
+						'c4_link'=>base_url('abmeldung.php?lvid='.urlencode($lvid).'&stsem='.urlencode($angezeigtes_stsem)),
 					);
 
 				}
@@ -702,6 +727,8 @@ class LvMenu extends FHCAPI_Controller
 						'name'=>$row->bezeichnung[$sprache],
 						'icon'=>'../../../cms/dms.php?id='.$row->logo_dms_id,
 						'link'=>$row->basis_url,
+						'c4_icon'=>base_url('cms/dms.php?id='.$row->logo_dms_id),
+						'c4_link'=>$row->basis_url,
 						'link_target'=>'_blank'
 					);
 				}
@@ -720,7 +747,9 @@ class LvMenu extends FHCAPI_Controller
 				'position'=>'128',
 				'name'=>$p->t('lehre/anrechnung'),
 				'icon'=>'../../../skin/images/button_listen.png',
-				'link' => APP_ROOT. 'index.ci.php/lehre/anrechnung/RequestAnrechnung?studiensemester='.urlencode($angezeigtes_stsem).'&lv_id='.urlencode($lvid)
+				'link' => APP_ROOT. 'index.ci.php/lehre/anrechnung/RequestAnrechnung?studiensemester='.urlencode($angezeigtes_stsem).'&lv_id='.urlencode($lvid),
+				'c4_icon'=>base_url('skin/images/button_listen.png'),
+				'c4_link' => base_url('index.ci.php/lehre/anrechnung/RequestAnrechnung?studiensemester='.urlencode($angezeigtes_stsem).'&lv_id='.urlencode($lvid))
 			);
 		}
 	}
@@ -736,7 +765,9 @@ class LvMenu extends FHCAPI_Controller
 			'position'=>'128',
 			'name'=>$p->t('lehre/anrechnungen'),
 			'icon'=>'../../../skin/images/button_listen.png',
-			'link' => APP_ROOT. 'index.ci.php/lehre/anrechnung/ReviewAnrechnungUebersicht?studiensemester='.urlencode($angezeigtes_stsem)
+			'link' => APP_ROOT. 'index.ci.php/lehre/anrechnung/ReviewAnrechnungUebersicht?studiensemester='.urlencode($angezeigtes_stsem),
+			'c4_icon'=> base_url('skin/images/button_listen.png'),
+			'c4_link' => base_url('index.ci.php/lehre/anrechnung/ReviewAnrechnungUebersicht?studiensemester='.urlencode($angezeigtes_stsem))
 		);
 		}
 	}
diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
index 9da199442..16bde1a83 100755
--- a/public/css/components/dashboard.css
+++ b/public/css/components/dashboard.css
@@ -33,3 +33,17 @@
 .cursor-move {
 	cursor: move;
 }
+
+.lvUebersichtMenuPunkt{
+	position: relative;
+}
+.lvUebersichtMenuPunkt:hover::before{
+	content:'';
+	position: absolute;
+	top:0;  
+	left:0;
+	width:100%;
+	height:100%;
+	background-color:rgba(0, 100, 156, 0.25);
+
+}
diff --git a/public/js/components/Cis/Mylv/LvUebersicht.js b/public/js/components/Cis/Mylv/LvUebersicht.js
index d302e4e18..e650ef194 100644
--- a/public/js/components/Cis/Mylv/LvUebersicht.js
+++ b/public/js/components/Cis/Mylv/LvUebersicht.js
@@ -13,6 +13,7 @@ export default  {
         return {
             result: false,
             menu: [],
+            selectedMenu:null,
             
         }
     },
@@ -21,6 +22,18 @@ export default  {
         BsModal,
     },
     methods:{
+        selectMenu: function(menuItem){
+            console.log(menuItem,"menuItem")
+            switch(menuItem.id){
+                case "core_menu_mailanstudierende": window.location.href=menuItem.c4_link; break;
+                default:
+                    this.selectedMenu=menuItem;
+            }
+            
+        },
+        hiddenModal: function(){
+            this.selectedMenu = null;
+        },
         showModal: function(){
 
             this.$fhcApi.factory.addons.getLvMenu(this.event.lehrveranstaltung_id, this.event.studiensemester_kurzbz).then(res =>{
@@ -33,25 +46,31 @@ export default  {
         this.modal = this.$refs.modalContainer;
     },
     template:/*html*/`
-    <bs-modal @showBsModal="showModal" ref="modalContainer" dialogClass="modal-lg">
+    <bs-modal :bodyClass="selectedMenu ? '' : 'px-4 py-5'" @showBsModal="showModal" @hiddenBsModal="hiddenModal" ref="modalContainer" :dialogClass="{'modal-lg': !selectedMenu, 'modal-fullscreen':selectedMenu}">
         <template #title>
             <span v-if="event?.lehrfach_bez ">{{event?.lehrfach_bez + (event?.stg_kurzbzlang?' / ' + event?.stg_kurzbzlang:'')}}</span>
             <span v-else>Lehrveranstaltungs Übersicht</span>
             
         </template>
         <template #default>
-            <div :style="{'display':'grid', 'row-gap':'10px', 'column-gap':'10px', 'grid-template-columns':'repeat(3,minmax(100px,1fr))', 'grid-template-rows':'repeat('+Math.ceil(menu.length / 3)+',minmax(100px,1fr))'} ">
-                <div  v-for="(menuItem, index) in menu" :key="index">
-                    <a :onclick="menuItem.cis4_link_onclick?menuItem.cis4_link_onclick:null" class="d-flex flex-column align-items-center justify-content-center" target="_blank" :href="menuItem.cis4_link_onclick?'#':menuItem.cis4_link" :title="menuItem.name">
-                        <span>{{menuItem.name}}</span>
-                        <img :src="menuItem.cis4_icon" :alt="menuItem.name" ></img>
-                    </a>
+
+          <div v-if="selectedMenu" class="d-flex flex-column h-100">
+                <div class="d-flex mb-2">
+                <button v-if="selectedMenu" @click="selectedMenu=null" class="btn btn-secondary me-2"><i class="fa fa-chevron-left"></i> Back</button>
+                <h2>{{selectedMenu.name}}</h2>
+                </div>
+                <iframe class="h-100 w-100" :src="selectedMenu.c4_link" :title="selectedMenu.name"></iframe>
+            </div>
+            <div v-else :style="{'display':'grid', 'row-gap':'10px', 'column-gap':'10px', 'grid-template-columns':'repeat(3,minmax(100px,1fr))', 'grid-template-rows':'repeat('+Math.ceil(menu.length / 3)+',minmax(100px,1fr))'} ">
+                <div role="button" @click="selectMenu(menuItem)" :title="menuItem.name" class="lvUebersichtMenuPunkt border border-1 d-flex flex-column align-items-center justify-content-center" v-for="(menuItem, index) in menu" :key="index">
+                        <img :src="menuItem.c4_icon" :alt="menuItem.name" ></img>    
+                        <span class="mt-2">{{menuItem.name}}</span>
                 </div>
             </div>
         </template>
-        <template #footer>
-            <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
-        </template>
+        
     </bs-modal>
+
+    
     `,
 };
\ No newline at end of file

From 14df81cbfb28fb025cdc6c1339fa3bffc0210e93 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 12 Jul 2024 16:14:20 +0200
Subject: [PATCH 0919/1461] adds c4_linkList and additional styling to the
 LvUebersicht Menu

---
 .../controllers/api/frontend/v1/LvMenu.php    | 599 +++++++++---------
 public/css/components/dashboard.css           |  19 +-
 public/js/components/Cis/Mylv/LvUebersicht.js |  18 +-
 3 files changed, 313 insertions(+), 323 deletions(-)

diff --git a/application/controllers/api/frontend/v1/LvMenu.php b/application/controllers/api/frontend/v1/LvMenu.php
index 3f55caf62..d5effafa7 100644
--- a/application/controllers/api/frontend/v1/LvMenu.php
+++ b/application/controllers/api/frontend/v1/LvMenu.php
@@ -146,11 +146,11 @@ class LvMenu extends FHCAPI_Controller
 			// wird zusätzlich das Lehrfach der Lehreinheit angezeigt.
 			if($is_lector )
 			{
-				$result = $this->lehreinheit->lehrfach_id_mitarbeiter($angezeigtes_stsem,$user,$lvid);
+				$result = $lehreinheit->lehrfach_id_mitarbeiter($angezeigtes_stsem,$user,$lvid);
 			}
 			else
 			{
-				$result = $this->lehreinheit->lehrfach_id_studierender($angezeigtes_stsem,$user,$lvid);
+				$result = $lehreinheit->lehrfach_id_studierender($angezeigtes_stsem,$user,$lvid);
 				
 			}
 
@@ -221,30 +221,28 @@ class LvMenu extends FHCAPI_Controller
 		$menu = array();
 
 		$this->fhc_menu_lvinfo($menu, $lvid, $studiengang_kz, $lektor_der_lv, $is_lector, $rechte, $lehrfach_oe_kurzbz_arr, $p);
-
-		$this->fhc_menu_semesterplan($menu, $angemeldet, $user_is_allowed_to_upload, $rechte, $lvid, $studiengang_kz, $kurzbz, $semester, $short_short_name, $p);
 		
-		$this->fhc_menu_download($menu, $angemeldet, $user_is_allowed_to_upload, $rechte, $semester, $kurzbz, $studiengang_kz, $short_short_name, $short, $p);
-		
-		$this->fhc_menu_notenliste($menu, $angemeldet, $is_lector, $lvid, $studiengang_kz, $angezeigtes_stsem, $kurzbz, $semester, $short_short_name, $p);
-
 		$this->fhc_menu_feedback($menu, $angemeldet, $lvid, $p);
-
+		
 		$this->fhc_menu_gesamtnote($menu, $angemeldet, $lvid, $lv_obj, $is_lector, $angezeigtes_stsem, $p);
-
-		$this->fhc_menu_stundenupload($menu, $angemeldet, $lvid, $is_lector, $studiengang_kz, $kurzbz, $semester, $short, $short_short_name, $p);
-
+		
 		$this->fhc_menu_emailStudierende($menu, $angemeldet, $lehreinheit->lehreinheit_id, $p);
-
-		$this->fhc_menu_pinboard($menu, $angemeldet, $is_lector, $studiengang_kz, $semester, $p);
-
+		
 		$this->fhc_menu_abmeldung($menu, $user, $is_lector, $lvid, $angezeigtes_stsem, $p);
-
+		
 		$this->fhc_menu_lehretools($menu, $lvid, $angezeigtes_stsem, $sprache);
-
+		
 		$this->fhc_menu_anrechnungStudent($menu, $rechte, $lvid, $angezeigtes_stsem, $p);
-
+		
 		$this->fhc_menu_anrechnungLector($menu, $rechte, $angezeigtes_stsem, $p);
+		
+		// LEGACY FH-CORE MENU POINTS
+		//$this->fhc_menu_notenliste($menu, $angemeldet, $is_lector, $lvid, $studiengang_kz, $angezeigtes_stsem, $kurzbz, $semester, $short_short_name, $p);
+		//$this->fhc_menu_download($menu, $angemeldet, $user_is_allowed_to_upload, $rechte, $semester, $kurzbz, $studiengang_kz, $short_short_name, $short, $p);
+		//$this->fhc_menu_semesterplan($menu, $angemeldet, $user_is_allowed_to_upload, $rechte, $lvid, $studiengang_kz, $kurzbz, $semester, $short_short_name, $p);
+		//$this->fhc_menu_stundenupload($menu, $angemeldet, $lvid, $is_lector, $studiengang_kz, $kurzbz, $semester, $short, $short_short_name, $p);
+		//$this->fhc_menu_pinboard($menu, $angemeldet, $is_lector, $studiengang_kz, $semester, $p);
+
 
 		// Addons Menu Logic
 		// ##########################################################################################		
@@ -288,44 +286,27 @@ class LvMenu extends FHCAPI_Controller
 		// ##########################################################################################
 		
 		foreach ($menu as $key => $row){
+
+			// removes menu points that are not needed in the c4 lvUebersicht
+			if( !array_key_exists('c4_link',$row) || !array_key_exists('c4_icon',$row)){
+				unset($menu[$key]);
+				continue;
+			}
 			
 			// fills pos array to sort the menu 
 			$pos[$key] = $row['position'];
 
-			//adds base_url to both the c4_icon and c4_link
-			/* if(array_key_exists('c4_icon',$menu[$key]) ){
-				$menu[$key]['c4_icon']=base_url($menu[$key]['c4_icon']);
-			}
-			if(array_key_exists('c4_link',$menu[$key]) ){
-				$menu[$key]['c4_link']=base_url($menu[$key]['c4_link']);
-			} */
-			
-
-			/* 
-			// adds new key with modified icon path to the menu
-			$menu[$key]['cis4_icon'] = base_url(str_replace("../../..","",$row['icon']));
-			
-			// adds new key with modified link_onclick link to the menu 
-			if(array_key_exists("link_onclick",$menu[$key])){
-				$menu[$key]['cis4_link_onclick'] = str_replace("\"","'",$menu[$key]['link_onclick']);
-			}
-
-			// adds new key with modified link to the menu 
-			if(array_key_exists("link",$menu[$key])){
-				// only replace the link key if the link has an old path
-				if(strpos($menu[$key]['link'],"../../..") !== false){
-					$menu[$key]['cis4_link'] = base_url(str_replace("../../..","",$menu[$key]['link']));
-				}else{
-					$menu[$key]['cis4_link'] = $menu[$key]['link'];
-				}
-			} */
 		}
 
 		array_multisort($pos, SORT_ASC, SORT_NUMERIC, $menu);
 
+		// DEBUGGING
+		$this->addMeta("is_lector",$is_lector);
+		$this->addMeta("lektor_der_lv",$lektor_der_lv);
+
 		// HTTP response
 		// ##########################################################################################
-
+		
 		$this->terminateWithSuccess($menu);
 
 	}
@@ -336,9 +317,8 @@ class LvMenu extends FHCAPI_Controller
 		// LVINFO
 		if(!defined('CIS_LEHRVERANSTALTUNG_LVINFO_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_LVINFO_ANZEIGEN)
 		{
-			$text='';
-			$need_br=false;
-
+			$c4_linkList=array();
+			
 			// Bearbeiten Button anzeigen wenn Lektor der LV und bearbeiten fuer Lektoren aktiviert ist
 			// Oder Berechtigung zum Bearbeiten eingetragen ist
 			if((!defined('CIS_LEHRVERANSTALTUNG_LVINFO_LEKTOR_EDIT') && $lektor_der_lv)
@@ -347,13 +327,14 @@ class LvMenu extends FHCAPI_Controller
 			|| $rechte->isBerechtigtMultipleOe('lehre/lvinfo', $lehrfach_oe_kurzbz_arr)
 			)
 			{
-				if($need_br)
-					$text.= "<br>";
-				$text.= "<a href='ects/index.php?lvid=$lvid' target='_blank' class='Item'>".$p->t('lehre/lvInfoBearbeiten')."</a>";
+				$c4_linkList[$p->t('lehre/lvInfoBearbeiten')]= 'ects/index.php?lvid='.$lvid;
+				$c4_linkList['test']= 'ects/index.php?lvid='.$lvid;
+				$c4_linkList['asdf']= 'ects/index.php?lvid='.$lvid;
+				$c4_linkList['qewr']= 'ects/index.php?lvid='.$lvid;
 			}
 			elseif ($is_lector)
 			{
-				$text.= "<br>Bearbeiten der LV-Infos derzeit gesperrt";
+				$c4_linkList["Bearbeiten der LV-Infos derzeit gesperrt"]= '#';
 			}
 
 			$menu[]=array
@@ -365,11 +346,216 @@ class LvMenu extends FHCAPI_Controller
 				'link'=>'',
 				'c4_icon'=> base_url('skin/images/button_lvinfo.png'),
 				'c4_link'=>'',
-				'text'=>$text
+				'c4_linkList'=>$c4_linkList
 			);
 		}
 	}
 
+	private function fhc_menu_feedback(&$menu, $angemeldet, $lvid, $p){
+		//FEEDBACK
+		if((!defined('CIS_LEHRVERANSTALTUNG_FEEDBACK_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_FEEDBACK_ANZEIGEN) && $angemeldet)
+		{
+			$menu[]=array
+			(
+				'id'=>'core_menu_feedback',
+				'position'=>'50',
+				'name'=>$p->t('lehre/feedback'),
+				'c4_icon'=> base_url('skin/images/button_feedback.png'),
+				'c4_link'=> base_url('feedback.php?lvid='.$lvid),
+			);
+		}
+	}
+
+	private function fhc_menu_gesamtnote(&$menu, $angemeldet, $lvid, $lv_obj, $is_lector, $angezeigtes_stsem, $p){
+		//Gesamtnote
+		if($is_lector && ((!defined('CIS_LEHRVERANSTALTUNG_GESAMTNOTE_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_GESAMTNOTE_ANZEIGEN) && $angemeldet))
+		{
+			if($lv_obj->benotung)
+			{
+				$menu[]=array
+				(
+					'id'=>'core_menu_gesamtnote',
+					'position'=>'80',
+					'name'=>$p->t('lehre/gesamtnote'),
+					'c4_icon'=> base_url('skin/images/button_endnote.png'),
+					'c4_link'=> base_url('benotungstool/lvgesamtnoteverwalten.php?lvid='.urlencode($lvid).'&stsem='.urlencode($angezeigtes_stsem))
+				);
+			}
+			else
+			{
+				$menu[]=array
+				(
+					'id'=>'core_menu_gesamtnote',
+					'position'=>'80',
+					'name'=>$p->t('lehre/gesamtnote'),
+					'c4_icon'=>'skin/images/button_endnote.png',
+					'c4_link'=>'',
+					'c4_linkList'=>[$p->t('lehre/noteneingabedeaktiviert')=>'#'],
+				);
+			}
+		}
+	}
+
+	
+
+	private function fhc_menu_emailStudierende(&$menu, $angemeldet, $lehreinheit_id,$p){
+		// Email an Studierende
+		if((!defined('CIS_LEHRVERANSTALTUNG_MAILSTUDIERENDE_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_MAILSTUDIERENDE_ANZEIGEN) && $angemeldet)
+		{
+			$mailto='mailto:';
+			$c4_linkList=array();
+			
+			// load the Lehreinheit model and get the student mails
+			$this->load->model('education/Lehreinheit_model','LehreinheitModel');
+			$studentMails = $this->LehreinheitModel->getStudentenMail($lehreinheit_id);
+			
+			// get the data of the database result and map the array of objects to their object property
+			$studentMails = $this->getDataOrTerminateWithError($studentMails, 'No student mails found');
+			
+			// emails used to create the mailto link
+			$mailtoMails = array();
+			$noMails = array();
+			$noMailLink = FALSE;
+
+			foreach($studentMails as $mail){
+				
+				if($mail->mail == 'nomail'){
+					$noMails[]=$mail->gruppe_kurzbz;
+					$noMailLink= TRUE;
+				}else{
+					$mailtoMails[]=$mail->mail;
+				}
+			}
+
+			if($noMailLink){
+				$c4_linkList[$p->t('lehre/keinMailverteiler',array(implode(" ",$noMails)))]='#';
+				$link_onclick='alert(\''.$p->t('lehre/keinMailverteiler',array(implode(" ",$noMails))).'\');';
+			}else{
+				$link_onclick='';
+			}
+			
+			$mailto .= implode(',',$mailtoMails);
+			
+			$menu[]=array
+			(
+				'id'=>'core_menu_mailanstudierende',
+				'position'=>'100',
+				'name'=>$p->t('lehre/mail'),
+				'c4_icon'=>base_url('skin/images/button_feedback.png'),
+				'c4_link'=>$mailto,
+				'c4_linkList'=>$c4_linkList,
+				'link_onclick'=>$link_onclick
+			);
+		} 
+	}
+
+	
+
+	private function fhc_menu_abmeldung(&$menu, $user, $is_lector, $lvid, $angezeigtes_stsem, $p){
+		if(!defined('CIS_LEHRVERANSTALTUNG_ABMELDUNG_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_ABMELDUNG_ANZEIGEN)
+		{
+			if(!$is_lector)
+			{
+				$lvangebot = new lvangebot();
+				$gruppen = $lvangebot->AbmeldungMoeglich($lvid, $angezeigtes_stsem, $user);
+				if(count($gruppen)>0)
+				{
+					$menu[]=array
+					(
+						'id'=>'core_menu_abmeldung',
+						'position'=>'120',
+						'name'=>$p->t('lehre/abmelden'),
+						'c4_icon'=>base_url('skin/images/button_studiupload.png'),
+						'c4_link'=>base_url('abmeldung.php?lvid='.urlencode($lvid).'&stsem='.urlencode($angezeigtes_stsem)),
+					);
+
+				}
+			}
+		}
+	}
+
+	private function fhc_menu_lehretools(&$menu, $lvid, $angezeigtes_stsem, $sprache){
+		//Anzeigen von zusaetzlichen Lehre-Tools
+		$lehretools = new lehre_tools();
+		if($lehretools->getTools($lvid, $angezeigtes_stsem))
+		{
+			if(count($lehretools->result)>0)
+			{
+				foreach($lehretools->result as $row)
+				{
+					$menu[]=array
+					(
+						'id'=>'core_menu_lehretools_'.$row->lehre_tools_id,
+						'position'=>'1000',
+						'name'=>$row->bezeichnung[$sprache],
+						'c4_icon'=>base_url('cms/dms.php?id='.$row->logo_dms_id),
+						'c4_link'=>$row->basis_url,
+					);
+				}
+			}
+		}
+	}
+
+	private function fhc_menu_anrechnungStudent(&$menu, $rechte, $lvid, $angezeigtes_stsem, $p){
+		// Anerkennung nachgewiesener Kenntnisse (Anrechnung) - Anzeige fuer Studenten
+		if((!defined('CIS_LEHRVERANSTALTUNG_ANRECHNUNG_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_ANRECHNUNG_ANZEIGEN)
+        && $rechte->isBerechtigt('student/anrechnung_beantragen'))
+		{
+			$menu[]=array
+			(
+				'id'=>'core_menu_anerkennungNachgewiesenerKenntnisse',
+				'position'=>'128',
+				'name'=>$p->t('lehre/anrechnung'),
+				'c4_icon'=>base_url('skin/images/button_listen.png'),
+				'c4_link' => base_url('index.ci.php/lehre/anrechnung/RequestAnrechnung?studiensemester='.urlencode($angezeigtes_stsem).'&lv_id='.urlencode($lvid))
+			);
+		}
+	}
+
+	private function fhc_menu_anrechnungLector(&$menu, $rechte, $angezeigtes_stsem, $p){
+		// Anerkennung nachgewiesener Kenntnisse (Anrechnung) - Anzeige fuer LektorInnen
+		if((!defined('CIS_LEHRVERANSTALTUNG_ANRECHNUNG_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_ANRECHNUNG_ANZEIGEN)
+		&& $rechte->isBerechtigt('lehre/anrechnung_empfehlen'))
+		{
+		$menu[]=array
+		(
+			'id'=>'core_menu_anerkennungNachgewiesenerKenntnisse_empfehlen',
+			'position'=>'128',
+			'name'=>$p->t('lehre/anrechnungen'),
+			'c4_icon'=> base_url('skin/images/button_listen.png'),
+			'c4_link' => base_url('index.ci.php/lehre/anrechnung/ReviewAnrechnungUebersicht?studiensemester='.urlencode($angezeigtes_stsem))
+		);
+		}
+	}
+
+// OLD PINBOARD MENU POINT *********************************************************************************************************************************************
+/*
+private function  fhc_menu_pinboard(&$menu, $angemeldet, $is_lector, $studiengang_kz, $semester, $p){
+		// Pinboard
+		if((!defined('CIS_LEHRVERANSTALTUNG_PINBOARD_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_PINBOARD_ANZEIGEN) && $angemeldet)
+		{
+			$text='';
+			if($is_lector)
+				$text.= "<a href='../../../cms/newsverwaltung.php?studiengang_kz=$studiengang_kz&semester=$semester' class='Item'>".$p->t('profil/adminstration')."</a>";
+			
+			// this is the new cis4 version
+			$menu[]=array
+			(
+				'id'=>'core_menu_pinboard',
+				'position'=>'110',
+				'name'=>$p->t('lehre/pinboard'),
+				'c4_icon'=>base_url('skin/images/button_pinboard.png'),
+				'c4_link'=>base_url('CisHtml/Cms/news'),
+				'text'=>$text
+			);
+
+			
+		}
+	}
+*/
+
+// LEGACY MENU POINTS THAT USED OWN DIRECTORIES *************************************************************************************************************************
+/* 	
 	private function fhc_menu_semesterplan(&$menu, $angemeldet, $user_is_allowed_to_upload, $rechte, $lvid, $studiengang_kz, $kurzbz, $semester, $short_short_name, $p){
 		
 		// Semesterplan
@@ -417,8 +603,55 @@ class LvMenu extends FHCAPI_Controller
 				'text'=>$text
 			);
 		}
-	}
+	} 
+	
+	private function fhc_menu_stundenupload(&$menu, $angemeldet, $lvid, $is_lector, $studiengang_kz, $kurzbz, $semester, $short, $short_short_name, $p){
+		// Studentenupload
+		if((!defined('CIS_LEHRVERANSTALTUNG_STUDENTENUPLOAD_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_STUDENTENUPLOAD_ANZEIGEN) && $angemeldet)
+		{
+			$link='';
+			$link_target='';
 
+			$dir_name = $this->ensureDirectoryExists($kurzbz, $semester, $short_short_name, 'upload','student');
+			$dir_empty = $this->isDirectoryEmpty($dir_name);
+
+			if(isset($dir_empty) && $dir_empty == false)
+			{
+				if($is_lector == true)
+				{
+					$link='lector_choice.php?lvid='.urlencode($lvid);
+					$link_target='_blank';
+				}
+				else
+				{
+					$link='upload.php?course_id='.urlencode($studiengang_kz).'&term_id='.urlencode($semester).'&short='.urlencode($short);
+					$link_target='_blank';
+				}
+			}
+			else
+			{
+				if($is_lector == true)
+				{
+					$link='';
+				}
+				else
+				{
+					$link='upload.php?course_id='.urlencode($studiengang_kz).'&term_id='.urlencode($semester).'&short='.urlencode($short);
+					$link_target='_blank';
+				}
+			}
+			$menu[]=array
+			(
+				'id'=>'core_menu_studentenupload',
+				'position'=>'90',
+				'name'=>$p->t('lehre/studentenAbgabe'),
+				'c4_icon'=>'skin/images/button_studiupload.png',
+				'c4_link'=>$link,
+				'link_target'=>$link_target
+			);
+		}
+	}
+	
 	private function fhc_menu_download(&$menu, $angemeldet, $user_is_allowed_to_upload, $rechte, $semester, $kurzbz, $studiengang_kz, $short_short_name, $short, $p){
 		
 		if((!defined('CIS_LEHRVERANSTALTUNG_DOWNLOAD_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_DOWNLOAD_ANZEIGEN) && $angemeldet)
@@ -520,258 +753,6 @@ class LvMenu extends FHCAPI_Controller
 		}
 	}
 
-	private function fhc_menu_feedback(&$menu, $angemeldet, $lvid, $p){
-		//FEEDBACK
-		if((!defined('CIS_LEHRVERANSTALTUNG_FEEDBACK_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_FEEDBACK_ANZEIGEN) && $angemeldet)
-		{
-			$menu[]=array
-			(
-				'id'=>'core_menu_feedback',
-				'position'=>'50',
-				'name'=>$p->t('lehre/feedback'),
-				'icon'=>'../../../skin/images/button_feedback.png',
-				'link'=>'feedback.php?lvid='.$lvid,
-				'c4_icon'=> base_url('skin/images/button_feedback.png'),
-				'c4_link'=> base_url('feedback.php?lvid='.$lvid),
-				'text'=>''
-			);
-		}
-	}
-
-	private function fhc_menu_gesamtnote(&$menu, $angemeldet, $lvid, $lv_obj, $is_lector, $angezeigtes_stsem, $p){
-		//Gesamtnote
-		if($is_lector && ((!defined('CIS_LEHRVERANSTALTUNG_GESAMTNOTE_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_GESAMTNOTE_ANZEIGEN) && $angemeldet))
-		{
-			if($lv_obj->benotung)
-			{
-				$menu[]=array
-				(
-					'id'=>'core_menu_gesamtnote',
-					'position'=>'80',
-					'name'=>$p->t('lehre/gesamtnote'),
-					'c4_icon'=> base_url('skin/images/button_endnote.png'),
-					'c4_link'=> base_url('benotungstool/lvgesamtnoteverwalten.php?lvid='.urlencode($lvid).'&stsem='.urlencode($angezeigtes_stsem))
-				);
-			}
-			else
-			{
-				$menu[]=array
-				(
-					'id'=>'core_menu_gesamtnote',
-					'position'=>'80',
-					'name'=>$p->t('lehre/gesamtnote'),
-					'c4_icon'=>'skin/images/button_endnote.png',
-					'text'=>$p->t('lehre/noteneingabedeaktiviert')
-				);
-			}
-		}
-	}
-
-	private function fhc_menu_stundenupload(&$menu, $angemeldet, $lvid, $is_lector, $studiengang_kz, $kurzbz, $semester, $short, $short_short_name, $p){
-		// Studentenupload
-		if((!defined('CIS_LEHRVERANSTALTUNG_STUDENTENUPLOAD_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_STUDENTENUPLOAD_ANZEIGEN) && $angemeldet)
-		{
-			$link='';
-			$link_target='';
-
-			$dir_name = $this->ensureDirectoryExists($kurzbz, $semester, $short_short_name, 'upload','student');
-			$dir_empty = $this->isDirectoryEmpty($dir_name);
-
-			if(isset($dir_empty) && $dir_empty == false)
-			{
-				if($is_lector == true)
-				{
-					$link='lector_choice.php?lvid='.urlencode($lvid);
-					$link_target='_blank';
-				}
-				else
-				{
-					$link='upload.php?course_id='.urlencode($studiengang_kz).'&term_id='.urlencode($semester).'&short='.urlencode($short);
-					$link_target='_blank';
-				}
-			}
-			else
-			{
-				if($is_lector == true)
-				{
-					$link='';
-				}
-				else
-				{
-					$link='upload.php?course_id='.urlencode($studiengang_kz).'&term_id='.urlencode($semester).'&short='.urlencode($short);
-					$link_target='_blank';
-				}
-			}
-			$menu[]=array
-			(
-				'id'=>'core_menu_studentenupload',
-				'position'=>'90',
-				'name'=>$p->t('lehre/studentenAbgabe'),
-				'c4_icon'=>'skin/images/button_studiupload.png',
-				'c4_link'=>$link,
-				'link_target'=>$link_target
-			);
-		}
-	}
-
-	private function fhc_menu_emailStudierende(&$menu, $angemeldet, $lehreinheit_id,$p){
-		// Email an Studierende
-		if((!defined('CIS_LEHRVERANSTALTUNG_MAILSTUDIERENDE_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_MAILSTUDIERENDE_ANZEIGEN) && $angemeldet)
-		{
-			$nomail='';
-			$mailto='mailto:';
-			
-			// load the Lehreinheit model and get the student mails
-			$this->load->model('education/Lehreinheit_model','LehreinheitModel');
-			$studentMails = $this->LehreinheitModel->getStudentenMail($lehreinheit_id);
-			
-			// get the data of the database result and map the array of objects to their object property
-			$studentMails = $this->getDataOrTerminateWithError($studentMails, 'No student mails found');
-			
-			// emails used to create the mailto link
-			$mailtoMails = array();
-			$noMails = array();
-			$noMailLink = FALSE;
-
-			foreach($studentMails as $mail){
-				
-				if($mail->mail == 'nomail'){
-					$noMails[]=$mail->gruppe_kurzbz;
-					$noMailLink= TRUE;
-				}else{
-					$mailtoMails[]=$mail->mail;
-				}
-			}
-
-			if($noMailLink){
-				$link_onclick='alert(\''.$p->t('lehre/keinMailverteiler',array(implode(" ",$noMails))).'\');';
-			}else{
-				$link_onclick='';
-			}
-			
-			$mailto .= implode(',',$mailtoMails);
-			
-			$menu[]=array
-			(
-				'id'=>'core_menu_mailanstudierende',
-				'position'=>'100',
-				'name'=>$p->t('lehre/mail'),
-				'c4_icon'=>base_url('skin/images/button_feedback.png'),
-				'c4_link'=>$mailto,
-				'link_onclick'=>$link_onclick
-			);
-		} 
-	}
-
-	private function  fhc_menu_pinboard(&$menu, $angemeldet, $is_lector, $studiengang_kz, $semester, $p){
-		// Pinboard
-		if((!defined('CIS_LEHRVERANSTALTUNG_PINBOARD_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_PINBOARD_ANZEIGEN) && $angemeldet)
-		{
-			$text='';
-			if($is_lector)
-				$text.= "<a href='../../../cms/newsverwaltung.php?studiengang_kz=$studiengang_kz&semester=$semester' class='Item'>".$p->t('profil/adminstration')."</a>";
-			
-			// this is the new cis4 version
-			$menu[]=array
-			(
-				'id'=>'core_menu_pinboard',
-				'position'=>'110',
-				'name'=>$p->t('lehre/pinboard'),
-				'c4_icon'=>base_url('skin/images/button_pinboard.png'),
-				'c4_link'=>base_url('CisHtml/Cms/news'),
-				'text'=>$text
-			);
-
-			
-		}
-	}
-
-	private function fhc_menu_abmeldung(&$menu, $user, $is_lector, $lvid, $angezeigtes_stsem, $p){
-		if(!defined('CIS_LEHRVERANSTALTUNG_ABMELDUNG_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_ABMELDUNG_ANZEIGEN)
-		{
-			if(!$is_lector)
-			{
-				$lvangebot = new lvangebot();
-				$gruppen = $lvangebot->AbmeldungMoeglich($lvid, $angezeigtes_stsem, $user);
-				if(count($gruppen)>0)
-				{
-					$menu[]=array
-					(
-						'id'=>'core_menu_abmeldung',
-						'position'=>'120',
-						'name'=>$p->t('lehre/abmelden'),
-						'icon'=>'../../../skin/images/button_studiupload.png',
-						'link'=>'abmeldung.php?lvid='.urlencode($lvid).'&stsem='.urlencode($angezeigtes_stsem),
-						'c4_icon'=>base_url('skin/images/button_studiupload.png'),
-						'c4_link'=>base_url('abmeldung.php?lvid='.urlencode($lvid).'&stsem='.urlencode($angezeigtes_stsem)),
-					);
-
-				}
-			}
-		}
-	}
-
-	private function fhc_menu_lehretools(&$menu, $lvid, $angezeigtes_stsem, $sprache){
-		//Anzeigen von zusaetzlichen Lehre-Tools
-		$lehretools = new lehre_tools();
-		if($lehretools->getTools($lvid, $angezeigtes_stsem))
-		{
-			if(count($lehretools->result)>0)
-			{
-				foreach($lehretools->result as $row)
-				{
-					$menu[]=array
-					(
-						'id'=>'core_menu_lehretools_'.$row->lehre_tools_id,
-						'position'=>'1000',
-						'name'=>$row->bezeichnung[$sprache],
-						'icon'=>'../../../cms/dms.php?id='.$row->logo_dms_id,
-						'link'=>$row->basis_url,
-						'c4_icon'=>base_url('cms/dms.php?id='.$row->logo_dms_id),
-						'c4_link'=>$row->basis_url,
-						'link_target'=>'_blank'
-					);
-				}
-			}
-		}
-	}
-
-	private function fhc_menu_anrechnungStudent(&$menu, $rechte, $lvid, $angezeigtes_stsem, $p){
-		// Anerkennung nachgewiesener Kenntnisse (Anrechnung) - Anzeige fuer Studenten
-		if((!defined('CIS_LEHRVERANSTALTUNG_ANRECHNUNG_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_ANRECHNUNG_ANZEIGEN)
-        && $rechte->isBerechtigt('student/anrechnung_beantragen'))
-		{
-			$menu[]=array
-			(
-				'id'=>'core_menu_anerkennungNachgewiesenerKenntnisse',
-				'position'=>'128',
-				'name'=>$p->t('lehre/anrechnung'),
-				'icon'=>'../../../skin/images/button_listen.png',
-				'link' => APP_ROOT. 'index.ci.php/lehre/anrechnung/RequestAnrechnung?studiensemester='.urlencode($angezeigtes_stsem).'&lv_id='.urlencode($lvid),
-				'c4_icon'=>base_url('skin/images/button_listen.png'),
-				'c4_link' => base_url('index.ci.php/lehre/anrechnung/RequestAnrechnung?studiensemester='.urlencode($angezeigtes_stsem).'&lv_id='.urlencode($lvid))
-			);
-		}
-	}
-
-	private function fhc_menu_anrechnungLector(&$menu, $rechte, $angezeigtes_stsem, $p){
-		// Anerkennung nachgewiesener Kenntnisse (Anrechnung) - Anzeige fuer LektorInnen
-		if((!defined('CIS_LEHRVERANSTALTUNG_ANRECHNUNG_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_ANRECHNUNG_ANZEIGEN)
-		&& $rechte->isBerechtigt('lehre/anrechnung_empfehlen'))
-		{
-		$menu[]=array
-		(
-			'id'=>'core_menu_anerkennungNachgewiesenerKenntnisse_empfehlen',
-			'position'=>'128',
-			'name'=>$p->t('lehre/anrechnungen'),
-			'icon'=>'../../../skin/images/button_listen.png',
-			'link' => APP_ROOT. 'index.ci.php/lehre/anrechnung/ReviewAnrechnungUebersicht?studiensemester='.urlencode($angezeigtes_stsem),
-			'c4_icon'=> base_url('skin/images/button_listen.png'),
-			'c4_link' => base_url('index.ci.php/lehre/anrechnung/ReviewAnrechnungUebersicht?studiensemester='.urlencode($angezeigtes_stsem))
-		);
-		}
-	}
-
 	private function ensureDirectoryExists($kurzbz, $semester, $short_short_name, $type, $role){
 		$dir_name = DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name).'/'.$type;
 
@@ -789,5 +770,9 @@ class LvMenu extends FHCAPI_Controller
 	private function isDirectoryEmpty($dir){
 		return count(scandir($dir)) == 2 ? true : false;
 	}
+
+	*/
+
+
 }
 
diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
index 16bde1a83..18d00dc15 100755
--- a/public/css/components/dashboard.css
+++ b/public/css/components/dashboard.css
@@ -34,16 +34,13 @@
 	cursor: move;
 }
 
-.lvUebersichtMenuPunkt{
-	position: relative;
-}
-.lvUebersichtMenuPunkt:hover::before{
-	content:'';
-	position: absolute;
-	top:0;  
-	left:0;
-	width:100%;
-	height:100%;
+.lvUebersichtMenuPunkt:hover{
 	background-color:rgba(0, 100, 156, 0.25);
-
 }
+
+.underline_hover:hover{
+	color:var(--bs-primary);
+	text-decoration: underline;
+}
+
+
diff --git a/public/js/components/Cis/Mylv/LvUebersicht.js b/public/js/components/Cis/Mylv/LvUebersicht.js
index e650ef194..ccd8abc8c 100644
--- a/public/js/components/Cis/Mylv/LvUebersicht.js
+++ b/public/js/components/Cis/Mylv/LvUebersicht.js
@@ -22,12 +22,17 @@ export default  {
         BsModal,
     },
     methods:{
-        selectMenu: function(menuItem){
+        selectMenu: function(menuItem, key=null){
             console.log(menuItem,"menuItem")
             switch(menuItem.id){
                 case "core_menu_mailanstudierende": window.location.href=menuItem.c4_link; break;
                 default:
-                    this.selectedMenu=menuItem;
+                    this.selectedMenu= {...menuItem};
+            }
+
+            if( this.selectedMenu && key != null && menuItem.c4_linkList[key] !='#'){
+                this.selectedMenu.c4_link = menuItem.c4_linkList[key];
+                this.selectedMenu.name += ' - ' + key;
             }
             
         },
@@ -62,11 +67,14 @@ export default  {
                 <iframe class="h-100 w-100" :src="selectedMenu.c4_link" :title="selectedMenu.name"></iframe>
             </div>
             <div v-else :style="{'display':'grid', 'row-gap':'10px', 'column-gap':'10px', 'grid-template-columns':'repeat(3,minmax(100px,1fr))', 'grid-template-rows':'repeat('+Math.ceil(menu.length / 3)+',minmax(100px,1fr))'} ">
-                <div role="button" @click="selectMenu(menuItem)" :title="menuItem.name" class="lvUebersichtMenuPunkt border border-1 d-flex flex-column align-items-center justify-content-center" v-for="(menuItem, index) in menu" :key="index">
-                        <img :src="menuItem.c4_icon" :alt="menuItem.name" ></img>    
-                        <span class="mt-2">{{menuItem.name}}</span>
+                <div :title="menuItem.name" role="button" @click="selectMenu(menuItem)" class="lvUebersichtMenuPunkt border border-1 d-flex flex-column align-items-center justify-content-center p-1" v-for="(menuItem, index) in menu" :key="index">
+                    <img :src="menuItem.c4_icon" :alt="menuItem.name" ></img>    
+                    <span @click="selectMenu(menuItem)" class="underline_hover mt-2">{{menuItem.name}}</span> 
+                    <span v-for="(value,key,index) in menuItem.c4_linkList" @click.stop="selectMenu(menuItem,key)" class="underline_hover mt-1" :index="index">{{key}}</span>
+                        
                 </div>
             </div>
+            <div>{{JSON.stringify(event,null,2)}}</div>
         </template>
         
     </bs-modal>

From 9af7ec3ff5ec81736a90969217f774fc3f607727 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 15 Jul 2024 10:58:10 +0200
Subject: [PATCH 0920/1461] Prefetch Tab config to prevent reloading tabcontent
 on student change

---
 .../Stv/Studentenverwaltung/Details.js        | 26 ++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details.js b/public/js/components/Stv/Studentenverwaltung/Details.js
index 9b888093f..4df148063 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details.js
@@ -7,6 +7,12 @@ export default {
 	components: {
 		FhcTabs
 	},
+	data() {
+		return {
+			configStudent: null,
+			configStudents: null
+		};
+	},
 	props: {
 		students: Array
 	},
@@ -21,20 +27,34 @@ export default {
 				this.$refs.tabs.$refs.current.reload();
 		}
 	},
+	created() {
+		this.$fhcApi
+			.factory.stv.configStudent()
+			.then(result => {
+				this.configStudent = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+		this.$fhcApi
+			.factory.stv.configStudents()
+			.then(result => {
+				this.configStudents = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+	},
 	template: `
 	<div class="stv-details h-100 pb-3 d-flex flex-column">
 		<div v-if="!students?.length" class="justify-content-center d-flex h-100 align-items-center">
 			Bitte StudentIn auswählen!
 		</div>
-		<div v-else class="d-flex flex-column h-100 pb-3">
+		<div v-else-if="configStudent && configStudents" class="d-flex flex-column h-100 pb-3">
 			<div class="d-flex justify-content-start align-items-center w-100 pb-3 gap-3" style="max-height:8rem">
 				<img v-for="student in students" :key="student.person_id" class="d-block h-100 rounded" alt="profilbild" :src="appRoot + 'cis/public/bild.php?src=person&person_id=' + student.person_id">
 				<div v-if="students.length == 1">
 					<h2 class="h4">{{students[0].titlepre}} {{students[0].vorname}} {{students[0].nachname}} {{students[0].titlepost}}</h2>
 				</div>
 			</div>
-			<fhc-tabs v-if="students.length == 1" ref="tabs" :modelValue="students[0]" :config="$fhcApi.factory.stv.configStudent()" :default="$route.params.tab" style="flex: 1 1 0%; height: 0%" @changed="reload"></fhc-tabs>
-			<fhc-tabs v-else ref="tabs" :modelValue="students" :config="$fhcApi.factory.stv.configStudents()" :default="$route.params.tab" style="flex: 1 1 0%; height: 0%" @changed="reload"></fhc-tabs>
+			<fhc-tabs v-if="students.length == 1" ref="tabs" :modelValue="students[0]" :config="configStudent" :default="$route.params.tab" style="flex: 1 1 0%; height: 0%" @changed="reload"></fhc-tabs>
+			<fhc-tabs v-else ref="tabs" :modelValue="students" :config="configStudents" :default="$route.params.tab" style="flex: 1 1 0%; height: 0%" @changed="reload"></fhc-tabs>
 		</div>
 	</div>`
 };
\ No newline at end of file

From 5dbeea80df5dc5c6d9fae026cf2d78931493cc78 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 15 Jul 2024 11:39:05 +0200
Subject: [PATCH 0921/1461] reload Tables correctly on student change

---
 public/js/components/Betriebsmittel/Betriebsmittel.js | 10 ++++++----
 public/js/components/Notiz/Notiz.js                   | 11 ++++++++---
 .../Studentenverwaltung/Details/Prestudent/History.js | 10 +++++++---
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/public/js/components/Betriebsmittel/Betriebsmittel.js b/public/js/components/Betriebsmittel/Betriebsmittel.js
index 211455dbf..a3acb6673 100644
--- a/public/js/components/Betriebsmittel/Betriebsmittel.js
+++ b/public/js/components/Betriebsmittel/Betriebsmittel.js
@@ -36,9 +36,11 @@ export default {
 			tabulatorOptions: {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: this.endpoint.getAllBetriebsmittel,
-				ajaxParams: {
-					type: this.typeId,
-					id: this.id
+				ajaxParams: () => {
+					return {
+						type: this.typeId,
+						id: this.id
+					};
 				},
 				ajaxResponse: (url, params, response) => response.data,
 				columns: [
@@ -149,7 +151,7 @@ export default {
 	},
 	watch: {
 		id() {
-			this.$refs.table.tabulator.setData('dummy', {type: this.typeId, id: this.id});
+			this.$refs.table.reloadTable();
 		}
 	},
 	methods: {
diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index f766b96eb..18d483985 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -49,9 +49,11 @@ export default {
 			tabulatorOptions: {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: this.endpoint.getNotizen,
-				ajaxParams: {
-					id: this.id,
-					type: this.typeId
+				ajaxParams: () => {
+					return {
+						id: this.id,
+						type: this.typeId
+					};
 				},
 				ajaxResponse: (url, params, response) => response.data,
 				columns: [
@@ -479,6 +481,9 @@ export default {
 				}
 			},
 			deep: true
+		},
+		id() {
+			this.reload();
 		}
 	},
 	beforeDestroy() {
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
index 31ca8e894..ac071d306 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
@@ -9,7 +9,6 @@ export default{
 		prestudentId: Number
 	},
 	data() {
-		let prestudent_id = this.prestudentId;
 		return {
 			tabulatorOptions: {
 				ajaxURL: 'api/frontend/v1/stv/Prestudent/getHistoryPrestudents/' + this.personId,
@@ -26,13 +25,13 @@ export default{
 					{title:"Status", field:"status"},
 					{title:"PrestudentId", field:"prestudent_id", visible:false}
 				],
-				rowFormatter(row) {
+				rowFormatter: row => {
 					const rowData = row.getData();
 					const element = row.getElement();
 					if (["Abgewiesener","Abbrecher","Absolvent"].includes(rowData.status_kurzbz)) {
 						element.classList.add('disabled');
 					}
-					if (rowData.prestudent_id == prestudent_id) {
+					if (rowData.prestudent_id == this.prestudentId) {
 						element.classList.add('fw-bold');
 					}
 				},
@@ -62,6 +61,11 @@ export default{
 			]
 		}
 	},
+	watch: {
+		personId() {
+			this.$refs.table.tabulator.setData('api/frontend/v1/stv/Prestudent/getHistoryPrestudents/' + this.personId);
+		}
+	},
 	template: `
 	<div class="stv-details-prestudent-history h-100 pt-3">
 		<core-filter-cmpt

From 780dce293dfbede817ed6f1ad0a55425dcc688cc Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 15 Jul 2024 11:57:16 +0200
Subject: [PATCH 0922/1461] refactor addStudent, bugfix updateList after
 delete, check organisationsform ersterStudent

---
 .../api/frontend/v1/stv/Status.php            | 333 +++++++++++++++++-
 application/models/person/Benutzer_model.php  |  37 +-
 .../Details/Prestudent/MultiStatus.js         | 130 ++++++-
 system/phrasesupdate.php                      |  22 +-
 4 files changed, 493 insertions(+), 29 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 07fa2e9c7..f305cd29e 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -12,10 +12,12 @@ class Status extends FHCAPI_Controller
 			'getHistoryPrestudent' => ['admin:r', 'assistenz:r'],
 			'addNewStatus' => ['admin:r', 'assistenz:r', 'student/keine_studstatuspruefung'],
 			'turnIntoStudent' => ['admin:r', 'assistenz:r', 'student/keine_studstatuspruefung'],
+			'addStudent' => ['admin:r', 'assistenz:r', 'student/keine_studstatuspruefung'],
 			'getStatusgruende' => self::PERM_LOGGED,
 			'getLastBismeldestichtag' => self::PERM_LOGGED,
 			'isLastStatus' => self::PERM_LOGGED,
 			'isErsterStudent' => self::PERM_LOGGED,
+			'hasStatusBewerber' => self::PERM_LOGGED,
 			'deleteStatus' => ['admin:r','assistenz:r'],
 			'loadStatus' => ['admin:r', 'assistenz:r'],
 			'updateStatus' => ['admin:r', 'assistenz:r'],
@@ -100,6 +102,16 @@ class Status extends FHCAPI_Controller
 
 	}
 
+	public function hasStatusBewerber($prestudent_id)
+	{
+		$result = $this->prestudentstatuschecklib->checkIfExistingBewerberstatus($prestudent_id);
+		if (isError($result))
+		{
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess($result);
+	}
+
 	public function addNewStatus($prestudent_id)
 	{
 		//get Studiengang von prestudent_id
@@ -138,7 +150,6 @@ class Status extends FHCAPI_Controller
 		$statusgrund_id = $this->input->post('statusgrund_id');
 		$rt_stufe = $this->input->post('rt_stufe');
 		$bestaetigtvon = $uid;
-		//$name = $this->input->post('name');
 
 		//Form Validation
 		$this->load->library('form_validation');
@@ -245,6 +256,7 @@ class Status extends FHCAPI_Controller
 			{
 				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 			}
+
 		}
 
 		//check if studentrolle already exists
@@ -435,8 +447,10 @@ class Status extends FHCAPI_Controller
 		}
 	}
 
+	//TODO(Manu) DEPRECATED
 	public function turnIntoStudent($prestudent_id)
 	{
+
 		//get Studiengang von prestudent_id
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 		$this->PrestudentModel->addJoin('public.tbl_person p', 'ON (p.person_id = public.tbl_prestudent.person_id)');
@@ -664,6 +678,323 @@ class Status extends FHCAPI_Controller
 				$this->terminateWithSuccess($prestudent_id);
 
 		}
+		else
+			return $this->terminateWithError("addNewStatus(student)", self::ERROR_TYPE_GENERAL);
+	}
+
+	public function addStudent($prestudent_id)
+	{
+		//get Studiengang von prestudent_id
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+		$this->PrestudentModel->addJoin('public.tbl_person p', 'ON (p.person_id = public.tbl_prestudent.person_id)');
+		$this->PrestudentModel->addJoin('public.tbl_studiengang sg', 'ON (sg.studiengang_kz = public.tbl_prestudent.studiengang_kz)');
+		$result = $this->PrestudentModel->load([
+			'prestudent_id' => $prestudent_id,
+		]);
+		if (isError($result)) {
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		$result = current(getData($result));
+
+		$stg = $result->studiengang_kz;
+		$stgkzl = $result->kurzbz;
+		$person_id = $result->person_id;
+
+		if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg)) {
+			$result = $this->p->t('lehre', 'error_keineSchreibrechte');
+
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+
+		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+
+		$uid = getAuthUID();
+		$status_kurzbz = $this->input->post('status_kurzbz');
+		$ausbildungssemester = $this->input->post('ausbildungssemester');
+		$bestaetigtam = $this->input->post('bestaetigtam');
+		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
+		$bestaetigtvon = $uid;
+		$studienplan_id = $this->input->post('studienplan_id');
+		$statusgrund_id = $this->input->post('statusgrund_id');
+
+		//Form Validation
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('ausbildungssemester', 'Ausbildungssemester', 'integer', [
+			'integer' => $this->p->t('ui', 'error_fieldNotInteger', ['field' => 'Ausbildungssemester'])
+		]);
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		//GET lastStatus
+		$result = $this->PrestudentstatusModel->getLastStatus($prestudent_id);
+
+		if (isError($result)) {
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		} elseif (!hasData($result)) {
+			$lastStatusData = [];
+		} else
+			$lastStatusData = current(getData($result));
+
+		//check if studentrolle already exists
+		$this->load->model('crm/Student_model', 'StudentModel');
+		$result = $this->StudentModel->checkIfExistingStudentRolle($prestudent_id);
+		if (isError($result)) {
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		if ($result->retval == "0") {
+			$isStudent = false;
+		} else
+			$isStudent = true;
+
+
+		//TODO(manu) check if for ersterStudent and Student
+		if(REIHUNGSTEST_CHECK)
+		{
+			if($status_kurzbz==Prestudentstatus_model::STATUS_BEWERBER)
+			{
+				$result = $this->prestudentstatuschecklib->checkIfAngetreten($prestudent_id);
+				if (isError($result))
+				{
+					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+				}
+			}
+		}
+
+		//Check ZGV
+		if(!defined("ZGV_CHECK") || ZGV_CHECK)
+		{
+			if($status_kurzbz==Prestudentstatus_model::STATUS_BEWERBER)
+			{
+				$result = $this->prestudentstatuschecklib->checkIfZGVEingetragen($prestudent_id);
+				if (isError($result))
+				{
+					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+				}
+			}
+		}
+
+
+		//Check ZGV-Master
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+		$result = $this->StudiengangModel->load([
+			'studiengang_kz'=> $stg
+		]);
+		if(isError($result))
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson(getError($result));
+		}
+		$result = current(getData($result));
+		$typ = $result->typ;
+		//$stgkzl = $result->kurzbz;
+
+		if(!defined("ZGV_CHECK") || ZGV_CHECK)
+		{
+			if($status_kurzbz==Prestudentstatus_model::STATUS_BEWERBER && $typ=='m')
+			{
+				$result = $this->prestudentstatuschecklib->checkIfZGVEingetragen($prestudent_id, $typ);
+				if (isError($result))
+				{
+					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+				}
+			}
+		}
+
+		//check if bewerberstatus exists
+		if($status_kurzbz == Prestudentstatus_model::STATUS_AUFGENOMMENER || $status_kurzbz == Prestudentstatus_model::STATUS_WARTENDER)
+		{
+
+			$result = $this->prestudentstatuschecklib->checkIfExistingBewerberstatus($prestudent_id);
+			if (isError($result))
+			{
+				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			}
+		}
+
+		$isBerechtigtNoStudstatusCheck =  $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung');
+
+		if(!$isBerechtigtNoStudstatusCheck) {
+			//Block STATUSCHECKS
+			$new_status_datum = isset($datum) ? $datum : date('Y-m-d');
+
+			$result = $this->prestudentstatuschecklib->checkStatusAdd(
+				$prestudent_id,
+				$status_kurzbz,
+				$studiensemester_kurzbz,
+				$new_status_datum,
+				$ausbildungssemester,
+				$studienplan_id
+			);
+
+			if (isError($result)) {
+				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			}
+
+			//TODO(manu) check Berechtigung
+			//check if Bismeldestichtag erreicht ADDNEW status
+			$result = $this->prestudentstatuschecklib->checkIfMeldestichtagErreicht($new_status_datum, $studiensemester_kurzbz);
+
+			if (isError($result)) {
+				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			}
+		}
+
+		// return ($this->terminateWithError("Is Student " . $isStudent, self::ERROR_TYPE_GENERAL));
+
+		if(!$isStudent)
+		{
+			//checkIf Kaution bezahlt
+			//TODO(Manu)
+
+			//generate Personenkennzeichen(matrikelnr)
+			$resultMat = $this->StudentModel->generateMatrikelnummer2($stg, $studiensemester_kurzbz, $typ);
+			if (isError($resultMat)) {
+				return $this->terminateWithError($resultMat, self::ERROR_TYPE_GENERAL);
+			}
+			$matrikelnr = getData($resultMat);
+			$jahr = mb_substr($matrikelnr, 0, 2);
+
+			//generate UID
+			$resultUid = $this->StudentModel->generateUID($stgkzl, $jahr, $typ, $matrikelnr);
+			if (isError($resultMat)) {
+				return $this->terminateWithError("in generateUid" . $resultUid, self::ERROR_TYPE_GENERAL);
+			}
+			$uidStudent = getData($resultUid);
+
+			//Check for additional logic (config entries, addons)
+			//TODO(Manu) check include/tw/generatematrikelnr.inc.php
+			//(1) addons durchsuchen, ob eigene Logik für Matrikelnr-erstellung existiert
+			//Default: keine Matrikelnummer wird generiert
+
+			//(2) personenkz = uid
+			if (defined('SET_UID_AS_PERSONENKENNZEICHEN') && SET_UID_AS_PERSONENKENNZEICHEN) {
+				$matrikelnr = $uidStudent;
+			}
+
+			//(3) Matrikelnummer = uid
+			if (defined('SET_UID_AS_MATRIKELNUMMER') && SET_UID_AS_MATRIKELNUMMER) {
+				//update person
+				$result = $this->PersonModel->update(
+					[
+						'person_id' => $person_id,
+					],
+					[
+						'matr_nr' => $uidStudent,
+					]
+				);
+				if (isError($result)) {
+					return $this->terminateWithError("uidAsMatrikelnummer" . getError($result), self::ERROR_TYPE_GENERAL);
+				}
+			}
+
+			//add benutzerdatensatz mit Aktierungscode
+			$this->load->model('person/Benutzer_model', 'BenutzerModel');
+			$result = $this->BenutzerModel->checkIfExistingBenutzer($uidStudent);
+			if (isError($result)) {
+				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			}
+			if ($result->retval != "0")
+			{
+			//	return ($this->terminateWithError($result->retval . " uid: " . $uid, self::ERROR_TYPE_GENERAL));
+				return $this->terminateWithError($this->p->t('lehre','error_benutzerBereitsVorhanden', self::ERROR_TYPE_GENERAL));
+			}
+			//activation key
+			$aktivierungscode = null;
+			$result = $this->BenutzerModel->generateActivationKey();
+			if (isError($result)) {
+				return $this->terminateWithError("in Error " . $result, self::ERROR_TYPE_GENERAL);
+			}
+			$aktivierungscode = getData($result);
+
+			//Alias generieren
+			$result = $this->PersonModel->generateAliasByPersonId($person_id);
+			if (isError($result))
+			{
+				return $this->terminateWithError("in generate alias " . $result, self::ERROR_TYPE_GENERAL);
+			}
+			$alias = getData($result) ?: null;
+			$alias = $alias->retval[0];
+
+			$sanitizedVorname = $this->_sanitizeAliasName($alias->vorname);
+			$sanitizedNachname = $this->_sanitizeAliasName($alias->nachname);
+
+			// Erstelle den Alias
+			$alias = $sanitizedVorname . '.' . $sanitizedNachname;
+
+			if (isError($result))
+			{
+				return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			}
+			$result = $this->BenutzerModel->insert(
+				[
+					'person_id' => $person_id,
+					'uid' => $uidStudent,
+					'aktiv' => true,
+					'aktivierungscode' => $aktivierungscode,
+					'alias' => $alias,
+					'insertvon' => $uid,
+					'insertamum' => date('c'),
+				]
+			);
+
+			if (isError($result)) {
+				return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			}
+
+
+			//Student anlegen
+			$result = $this->StudentModel->insert(
+				[
+					'student_uid' => $uidStudent,
+					'prestudent_id' => $prestudent_id,
+					'matrikelnr' => $matrikelnr,
+					'studiengang_kz' => $stg,
+					'semester' => $ausbildungssemester,
+					'verband' => '',
+					'gruppe' => '',
+					'insertvon' => $uid,
+					'insertamum' => date('c')
+				]
+			);
+			if (isError($result))
+			{
+				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			}
+
+			$this->load->library('PrestudentLib');
+			$result = $this->prestudentlib->setFirstStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, null, $bestaetigtam, $bestaetigtvon, $stg, $uidStudent);
+
+			if (isError($result)) {
+				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			} else
+				$this->terminateWithSuccess($prestudent_id);
+
+		}
+		//if not ersterStudent
+		else
+		{
+			//check if studentrolle already exists
+			if($status_kurzbz == Prestudentstatus_model::STATUS_STUDENT || $status_kurzbz == Prestudentstatus_model::STATUS_DIPLOMAND || $lastStatusData->status_kurzbz == Prestudentstatus_model::STATUS_STUDENT)
+			{
+				$result = $this->prestudentstatuschecklib->checkIfExistingStudentRolle($prestudent_id);
+				if (isError($result))
+				{
+					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+				}
+			}
+
+			$this->load->library('PrestudentLib');
+			$result = $this->prestudentlib->setStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id, $bestaetigtam, $bestaetigtvon);
+
+			if (isError($result))
+			{
+				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			}
+			else
+				$this->terminateWithSuccess($prestudent_id);
+		}
 	}
 
 	public function loadStatus()
diff --git a/application/models/person/Benutzer_model.php b/application/models/person/Benutzer_model.php
index 04f689585..d6b3cf8a1 100644
--- a/application/models/person/Benutzer_model.php
+++ b/application/models/person/Benutzer_model.php
@@ -143,42 +143,39 @@ class Benutzer_model extends DB_Model
 
 	/**
 	 * Check if Benutzer already exists
-	 * @param integer $person_id
+	 * @param String $uid
 	 * @return 0 if not exists, 1 if it does
 	 */
-	public function checkIfExistingBenutzer($person_id)
+	public function checkIfExistingBenutzer($uid)
 	{
 		$qry = "SELECT 
     				count(*) as anzahl 
 				FROM 
 				    public.tbl_benutzer 
 				WHERE 
-				    person_id = ? ";
+				    uid = ? ";
 
-		$result = $this->execQuery($qry, array($person_id));
+		$result = $this->execQuery($qry, array($uid));
 
 		if (isError($result))
 		{
 			return error($result);
 		}
-		else
+
+		$resultObject = current(getData($result));
+
+		if (property_exists($resultObject, 'anzahl'))
 		{
-			$resultObject = current(getData($result));
+			$resultValue = (int) $resultObject->anzahl;
 
-			if (property_exists($resultObject, 'anzahl')) {
-				$resultValue = (int) $resultObject->anzahl;
-
-				if ($resultValue > 0)
-				{
-					return success("1");
-				}
-				else
-				{
-					return success("0");
-				}
-			} else {
-				return error("BenutzerModel: Error During Check if Existing Benutzer.");
+			if ($resultValue > 0)
+			{
+				return success("1");
 			}
-		}
+			else
+			{
+				return success("0");
+			}
+		}	
 	}
 }
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index a8528c4b9..4806584f2 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -65,6 +65,7 @@ export default{
 					prestudent_id : this.modelValue.prestudent_id,
 					studiensemester_kurzbz : this.defaultSemester,
 					ausbildungssemester : this.modelValue.semester,
+					orgform_kurzbz: this.modelValue.orgform_kurzbz,
 					name: `${this.modelValue.vorname} ${this.modelValue.nachname}`
 				};
 				dataArray.push(newObj);
@@ -77,6 +78,7 @@ export default{
 						prestudent_id: item.prestudent_id,
 						ausbildungssemester: item.semester,
 						studiensemester_kurzbz: this.defaultSemester,
+						orgform_kurzbz: item.modelValue.orgform_kurzbz,
 						name: `${item.vorname} ${item.nachname}`
 					};
 					dataArray.push(newObj);
@@ -275,7 +277,8 @@ export default{
 			abbruchData: {},
 			newStatus: '',
 			statusNew: true,
-			isErsterStudent: false
+			isErsterStudent: false,
+			isBewerber: true
 		}
 	},
 	watch: {
@@ -368,8 +371,14 @@ export default{
 
 			if(this.actionStatusText != "Student" && this.actionStatusText != "Wiederholer")
 				this.$refs.confirmStatusAction.show();
-			else
+			else {
+				//haut einzeln hin
+/*				console.log("check if Bewerberstatus");
+				this.checkIfBewerber(this.prestudentIds);
+				console.log(this.isBewerber);*/
+
 				this.$refs.askForAusbildungssemester.show();
+			}
 		},
 		changeStatusToAbbrecherStgl(prestudentIds){
 			this.hideModal('confirmStatusAction');
@@ -410,8 +419,8 @@ export default{
 			this.addNewStatus(prestudentIds);
 		},
 		changeStatusToStudent(prestudentIds){
-
 			//TODO Manu validation if Bewerber already before asking for ausbildungssemester
+			//this.checkIfBewerber();
 			this.hideModal('askForAusbildungssemester');
 			let deltaData =
 				{
@@ -422,7 +431,7 @@ export default{
 
 			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData, ausbildungssemester: this.actionSem}));
 			//BewerberZuStudent
-			this.turnIntoStudent(prestudentIds);
+			this.addStudent(prestudentIds);
 		},
 		changeStatusToWiederholer(prestudentIds){
 			this.hideModal('askForAusbildungssemester');
@@ -550,6 +559,60 @@ export default{
 				});
 
 
+		},
+		addStudent(prestudentIds){
+			//Array.isArray(prestudentIds) ? this.modelValue.prestudent_id : [prestudentIds];
+			let changeData = {};
+
+			//for Feedback Sucess, Error
+			let countSuccess = 0;
+			let countError = 0;
+
+			if(!prestudentIds)
+				prestudentIds = [this.modelValue.prestudent_id];
+
+			const promises = prestudentIds.map(prestudentId => {
+				//TODO(manu) besserer check
+				changeData = this.statusData.status_kurzbz ? this.statusData : this.newArray.find(item => item.prestudent_id === prestudentId);
+
+				return this.$fhcApi.post('api/frontend/v1/stv/status/addStudent/' + prestudentId,
+					changeData
+				).then(response => {
+					countSuccess++;
+					return response;
+				})
+					//.catch(this.$fhcAlert.handleSystemError)
+					.catch(error => {
+						countError++;
+						//For each Prestudent show Error in Alert
+						this.$fhcAlert.handleSystemError(error);
+					});
+			});
+
+			Promise
+				.allSettled(promises)
+				.then(values => {
+
+					this.newStatus = 'Student';
+
+					//Feedback Success als infoalert
+					if (countSuccess > 0) {
+						this.$fhcAlert.alertInfo(this.$p.t('ui', 'successNewStatus', {
+							'countSuccess': countSuccess,
+							'status': this.newStatus,
+							'countError': countError
+						}));
+					}
+
+					if (this.modelValue.prestudent_id) {
+						this.reload();
+					}
+					else {
+						this.$reloadList();
+					}
+					this.hideModal('statusModal');
+					this.resetModal();
+				});
 		},
 		addNewStatus(prestudentIds){
 			//Array.isArray(prestudentIds) ? this.modelValue.prestudent_id : [prestudentIds];
@@ -605,7 +668,6 @@ export default{
 
 					if (this.modelValue.prestudent_id) {
 						this.reload();
-						//TODO(manu) reload Detailtab after Abbrecher to see current status activ, verband and gruppe
 					}
 					else {
 						this.$reloadList();
@@ -657,6 +719,7 @@ export default{
 				.finally(() => {
 					window.scrollTo(0, 0);
 					this.reload();
+					this.$reloadList();
 				});
 		},
 		editStatus(){
@@ -702,6 +765,58 @@ export default{
 					})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
+/*		checkIfBewerber(prestudentIds){
+
+			if(!prestudentIds)
+				prestudentIds = [this.modelValue.prestudent_id];
+
+			const promises = prestudentIds.map(prestudentId => {
+
+				return this.$fhcApi.post('api/frontend/v1/stv/status/hasStatusBewerber/' + prestudentId,
+				).then(response => {
+					countSuccess++;
+					return response;
+				})
+					//.catch(this.$fhcAlert.handleSystemError)
+					.catch(error => {
+						countError++;
+						//For each Prestudent show Error in Alert
+						this.$fhcAlert.handleSystemError(error);
+					});
+			});
+
+			Promise
+				.allSettled(promises)
+				.then(values => {
+
+						//Feedback Success als infoalert
+						if (countSuccess > 0) {
+							this.$fhcAlert.alertInfo(this.$p.t('ui', 'successNewStatus', {
+								'countSuccess': countSuccess,
+								'status': this.newStatus,
+								'countError': countError
+							}));
+						}
+
+						if (this.modelValue.prestudent_id) {
+							this.reload();
+							//TODO(manu) reload Detailtab after Abbrecher to see current status activ, verband and gruppe
+						}
+						else {
+							this.$reloadList();
+						}
+
+/!*			return this.$fhcApi
+				.get('api/frontend/v1/stv/status/hasStatusBewerber/' + prestudent_id)
+				.then(
+					result => {
+						this.isBewerber = result.data;
+						console.log(result);
+						return result;
+					})
+				.catch(this.$fhcAlert.handleSystemError);*!/
+			//}
+		},*/
 		loadStatus(status_id){
 			this.statusNew = false;
 			return this.$fhcApi.post('api/frontend/v1/stv/status/loadStatus/',
@@ -757,8 +872,9 @@ export default{
 			.get('api/frontend/v1/stv/status/getLastBismeldestichtag/')
 			.then(result => {
 				this.dataMeldestichtag = result.data[0].meldestichtag;
-				if (this.$refs.table.tableBuilt)
-					this.$refs.table.tabulator.redraw(true);
+				//TODO(Manu) wirft plötzlich fehler bei multiselect status
+/*				if (this.$refs.table.tableBuilt)
+					this.$refs.table.tabulator.redraw(true);*/
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 	},
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 4a53e15e0..171fd77e6 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -29902,7 +29902,27 @@ array(
 				'insertvon' => 'system'
 			)
 		)
-	)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'error_benutzerBereitsVorhanden',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Benutzer für uid {uid} bereits vorhanden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error: User for uid {uid} already exists',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 );
 
 

From 0a457c4bac9d2f4dfd52eca41a8dbb1cbe6d8bfb Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 15 Jul 2024 15:13:41 +0200
Subject: [PATCH 0923/1461] use "getStudiensemester" from dedicated Lists
 Controller

---
 .../api/frontend/v1/stv/Prestudent.php            | 15 ---------------
 public/js/components/Stv/Studentenverwaltung.js   |  1 +
 .../Details/Prestudent/MultiStatus.js             | 13 ++++---------
 3 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Prestudent.php b/application/controllers/api/frontend/v1/stv/Prestudent.php
index 7c8cf5cfb..8e9e0bf0b 100644
--- a/application/controllers/api/frontend/v1/stv/Prestudent.php
+++ b/application/controllers/api/frontend/v1/stv/Prestudent.php
@@ -19,7 +19,6 @@ class Prestudent extends FHCAPI_Controller
 			'getAufmerksamdurch' => self::PERM_LOGGED,
 			'getBerufstaetigkeit' => self::PERM_LOGGED,
 			'getTypenStg' => self::PERM_LOGGED,
-			'getStudiensemester' => self::PERM_LOGGED,
 			'getStudienplaene' => self::PERM_LOGGED
 		]);
 
@@ -265,20 +264,6 @@ class Prestudent extends FHCAPI_Controller
 		return $this->terminateWithSuccess(getData($result) ?: []);
 	}
 
-	public function getStudiensemester()
-	{
-		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-
-		$this->StudiensemesterModel->addOrder('start', 'DESC');
-		$this->StudiensemesterModel->addLimit(20);
-
-		$result = $this->StudiensemesterModel->load();
-		if (isError($result)) {
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-		return $this->terminateWithSuccess(getData($result) ?: []);
-	}
-
 	public function getStudienplaene($prestudent_ids)
 	{
 		$prestudent_ids = urldecode($prestudent_ids);
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 80c24fed4..dc1efbb34 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -164,6 +164,7 @@ export default {
 			.get('api/frontend/v1/stv/lists/getStudiensemester')
 			.then(result => {
 				this.lists.studiensemester = result.data;
+				this.lists.studiensemester_desc = result.data.toReversed();
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 	},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index 4806584f2..a160c173d 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -42,6 +42,9 @@ export default{
 			from: 'hasPermissionRtAufsicht',
 			default: false
 		},
+		lists: {
+			from: 'lists'
+		},
 		$reloadList: {
 			from: '$reloadList',
 			required: true
@@ -259,7 +262,6 @@ export default{
 				}
 			],
 			statusData: {},
-			listStudiensemester: [],
 			maxSem:  Array.from({ length: 11 }, (_, index) => index),
 			listStudienplaene: [],
 			aufnahmestufen: {1: 1, 2: 2, 3: 3},
@@ -847,13 +849,6 @@ export default{
 		}
 	},
 	created(){
-		this.$fhcApi
-			.get('api/frontend/v1/stv/prestudent/getStudiensemester')
-			.then(result => result.data)
-			.then(result => {
-				this.listStudiensemester = result;
-			})
-			.catch(this.$fhcAlert.handleSystemError);
 		this.$fhcApi
 			.get('api/frontend/v1/stv/prestudent/getStudienplaene/' + encodeURIComponent(this.paramIds))
 			.then(result => result.data)
@@ -925,7 +920,7 @@ export default{
 							v-model="statusData['studiensemester_kurzbz']"
 							:disabled="statusData.datum < dataMeldestichtag"
 						>
-							<option v-for="sem in listStudiensemester" :key="sem.studiensemester_kurzbz" :value="sem.studiensemester_kurzbz"  :selected="sem.studiensemester_kurzbz === defaultSemester">{{sem.studiensemester_kurzbz}}</option>
+							<option v-for="sem in lists.studiensemester_desc" :key="sem.studiensemester_kurzbz" :value="sem.studiensemester_kurzbz"  :selected="sem.studiensemester_kurzbz === defaultSemester">{{sem.studiensemester_kurzbz}}</option>
 						</form-input>
 					</div>
 					<!-- TODO(manu) if(defined('VORRUECKUNG_STATUS_MAX_SEMESTER') && VORRUECKUNG_STATUS_MAX_SEMESTER==false) 100 Semester-->

From 5043f00c97b45e668642823611c738aeef195392 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 15 Jul 2024 15:16:52 +0200
Subject: [PATCH 0924/1461] added missing end tag & removed :value="NULL" since
 this is not allowed in option tags

---
 .../Studentenverwaltung/Details/Prestudent/MultiStatus.js   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index a160c173d..9261eee1d 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -1008,7 +1008,7 @@ export default{
 						v-model="statusData['rt_stufe']"
 						:disabled="statusData.datum < dataMeldestichtag"
 						>
-						<option :value="NULL">-- {{$p.t('fehlermonitoring', 'keineAuswahl')}} --</option>
+						<option value="">-- {{$p.t('fehlermonitoring', 'keineAuswahl')}} --</option>
 						<option v-for="entry in aufnahmestufen" :key="entry" :value="entry">{{entry}}</option>
 						</form-input>
 					</div>
@@ -1020,7 +1020,7 @@ export default{
 							:label="$p.t('studierendenantrag/antrag_grund')"
 							v-model="statusData['statusgrund_id']"
 							>
-							<option :value="NULL"></option>
+							<option value=""></option>
 							<option v-for="grund in gruende" :key="grund.statusgrund_id" :value="grund.statusgrund_id">{{grund.beschreibung[0]}}</option>
 						</form-input>
 					</div>
@@ -1145,7 +1145,7 @@ export default{
 							</li>							
 						</ul>
 					</div>
-					
+				</template>
 			</core-filter-cmpt>
 			
 			<div 

From 58403ff00ede4f0fda50f6e994c3882d290ec127 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 15 Jul 2024 15:41:45 +0200
Subject: [PATCH 0925/1461] bugfixes changeStatus, generateMatrikelnummer,
 updateLists, validations

---
 .../api/frontend/v1/stv/Status.php            | 456 ++++++++++--------
 .../libraries/PrestudentstatusCheckLib.php    |  29 ++
 .../models/crm/Prestudentstatus_model.php     |  43 ++
 application/models/crm/Student_model.php      |   6 +-
 .../Details/Prestudent/MultiStatus.js         | 112 +----
 system/phrasesupdate.php                      |  22 +-
 6 files changed, 351 insertions(+), 317 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index f305cd29e..aa779c78f 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -11,7 +11,7 @@ class Status extends FHCAPI_Controller
 		parent::__construct([
 			'getHistoryPrestudent' => ['admin:r', 'assistenz:r'],
 			'addNewStatus' => ['admin:r', 'assistenz:r', 'student/keine_studstatuspruefung'],
-			'turnIntoStudent' => ['admin:r', 'assistenz:r', 'student/keine_studstatuspruefung'],
+			//'turnIntoStudent' => ['admin:r', 'assistenz:r', 'student/keine_studstatuspruefung'],
 			'addStudent' => ['admin:r', 'assistenz:r', 'student/keine_studstatuspruefung'],
 			'getStatusgruende' => self::PERM_LOGGED,
 			'getLastBismeldestichtag' => self::PERM_LOGGED,
@@ -28,6 +28,7 @@ class Status extends FHCAPI_Controller
 
 		//Load Models
 		$this->load->model('crm/Prestudentstatus_model','PrestudentstatusModel');
+		$this->load->model('person/Person_model','PersonModel');
 
 		// Load Libraries
 		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
@@ -448,239 +449,251 @@ class Status extends FHCAPI_Controller
 	}
 
 	//TODO(Manu) DEPRECATED
-	public function turnIntoStudent($prestudent_id)
-	{
+	// public function turnIntoStudent($prestudent_id)
+	// {
 
-		//get Studiengang von prestudent_id
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-		$this->PrestudentModel->addJoin('public.tbl_person p', 'ON (p.person_id = public.tbl_prestudent.person_id)');
-		$this->PrestudentModel->addJoin('public.tbl_studiengang sg', 'ON (sg.studiengang_kz = public.tbl_prestudent.studiengang_kz)');
-		$result = $this->PrestudentModel->load([
-			'prestudent_id' => $prestudent_id,
-		]);
-		if (isError($result)) {
-			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-		$result = current(getData($result));
+	// 	//get Studiengang von prestudent_id
+	// 	$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+	// 	$this->PrestudentModel->addJoin('public.tbl_person p', 'ON (p.person_id = public.tbl_prestudent.person_id)');
+	// 	$this->PrestudentModel->addJoin('public.tbl_studiengang sg', 'ON (sg.studiengang_kz = public.tbl_prestudent.studiengang_kz)');
+	// 	$result = $this->PrestudentModel->load([
+	// 		'prestudent_id' => $prestudent_id,
+	// 	]);
+	// 	if (isError($result)) {
+	// 		return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+	// 	}
+	// 	$result = current(getData($result));
 
-		$stg = $result->studiengang_kz;
-		$stgkzl = $result->kurzbz;
-		$person_id = $result->person_id;
+	// 	$stg = $result->studiengang_kz;
+	// 	$stgkzl = $result->kurzbz;
+	// 	$person_id = $result->person_id;
 
-		if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg)) {
-			$result = $this->p->t('lehre', 'error_keineSchreibrechte');
+	// 	if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg)) {
+	// 		$result = $this->p->t('lehre', 'error_keineSchreibrechte');
 
-			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
+	// 		return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+	// 	}
 
-		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+	// 	$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
 
-		$uid = getAuthUID();
-		$status_kurzbz = $this->input->post('status_kurzbz');
-		$ausbildungssemester = $this->input->post('ausbildungssemester');
-		$bestaetigtam = $this->input->post('bestaetigtam');
-		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
-		$bestaetigtvon = $uid;
+	// 	$uid = getAuthUID();
+	// 	$status_kurzbz = $this->input->post('status_kurzbz');
+	// 	$ausbildungssemester = $this->input->post('ausbildungssemester');
+	// 	$bestaetigtam = $this->input->post('bestaetigtam');
+	// 	$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
+	// 	$bestaetigtvon = $uid;
 
-		//Form Validation
-		$this->load->library('form_validation');
+	// 	//Form Validation
+	// 	$this->load->library('form_validation');
 
-		$this->form_validation->set_rules('ausbildungssemester', 'Ausbildungssemester', 'integer', [
-			'integer' => $this->p->t('ui', 'error_fieldNotInteger', ['field' => 'Ausbildungssemester'])
-		]);
+	// 	$this->form_validation->set_rules('ausbildungssemester', 'Ausbildungssemester', 'integer', [
+	// 		'integer' => $this->p->t('ui', 'error_fieldNotInteger', ['field' => 'Ausbildungssemester'])
+	// 	]);
 
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
+	// 	if (!$this->form_validation->run())
+	// 		$this->terminateWithValidationErrors($this->form_validation->error_array());
 
-		//GET lastStatus
-		$result = $this->PrestudentstatusModel->getLastStatus($prestudent_id);
+	// 	//GET lastStatus
+	// 	$result = $this->PrestudentstatusModel->getLastStatus($prestudent_id);
 
-		if (isError($result)) {
-			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		} elseif (!hasData($result)) {
-			$lastStatusData = [];
-		} else
-			$lastStatusData = current(getData($result));
+	// 	if (isError($result)) {
+	// 		return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+	// 	} elseif (!hasData($result)) {
+	// 		$lastStatusData = [];
+	// 	} else
+	// 		$lastStatusData = current(getData($result));
 
-		//check if studentrolle already exists
-		$this->load->model('crm/Student_model', 'StudentModel');
-		$result = $this->StudentModel->checkIfExistingStudentRolle($prestudent_id);
-		if (isError($result)) {
-			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-		if ($result->retval == "0") {
-			$isStudent = false;
-		} else
-			$isStudent = true;
+	// 	//check if studentrolle already exists
+	// 	$this->load->model('crm/Student_model', 'StudentModel');
+	// 	$result = $this->StudentModel->checkIfExistingStudentRolle($prestudent_id);
+	// 	if (isError($result)) {
+	// 		return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+	// 	}
+	// 	if ($result->retval == "0") {
+	// 		$isStudent = false;
+	// 	} else
+	// 		$isStudent = true;
 
-		if (!$isStudent) {
+	// 	return $this->terminateWithError("here: before check: isStudent: " . $isStudent, self::ERROR_TYPE_GENERAL);
 
-			//Check ZGV
-			if ($status_kurzbz == Prestudentstatus_model::STATUS_BEWERBER) {
-				$result = $this->prestudentstatuschecklib->checkIfZGVEingetragen($prestudent_id);
-				if (isError($result)) {
-					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-				}
-			}
+	// 	if (!$isStudent) {
 
-			//Check ZGV-Master
-			$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-			$result = $this->StudiengangModel->load([
-				'studiengang_kz' => $stg
-			]);
-			if (isError($result)) {
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson(getError($result));
-			}
-			$result = current(getData($result));
-			$typ = $result->typ;
+	// 		//Check ZGV
+	// 		if ($status_kurzbz == Prestudentstatus_model::STATUS_BEWERBER) {
+	// 			$result = $this->prestudentstatuschecklib->checkIfZGVEingetragen($prestudent_id);
+	// 			if (isError($result)) {
+	// 				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+	// 			}
+	// 		}
 
-			if (!defined("ZGV_CHECK") || ZGV_CHECK) {
-				if ($status_kurzbz == Prestudentstatus_model::STATUS_BEWERBER && $typ == 'm') {
-					$result = $this->prestudentstatuschecklib->checkIfZGVEingetragen($prestudent_id, $typ);
-					if (isError($result)) {
-						return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-					}
-				}
-			}
+	// 		//Check ZGV-Master
+	// 		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+	// 		$result = $this->StudiengangModel->load([
+	// 			'studiengang_kz' => $stg
+	// 		]);
+	// 		if (isError($result)) {
+	// 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+	// 			return $this->outputJson(getError($result));
+	// 		}
+	// 		$result = current(getData($result));
+	// 		$typ = $result->typ;
 
-			//check if bewerberstatus exists
-			$result = $result = $this->prestudentstatuschecklib->checkIfExistingBewerberstatus($prestudent_id);
-			if (isError($result)) {
-				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			}
+	// 		if (!defined("ZGV_CHECK") || ZGV_CHECK) {
+	// 			if ($status_kurzbz == Prestudentstatus_model::STATUS_BEWERBER && $typ == 'm') {
+	// 				$result = $this->prestudentstatuschecklib->checkIfZGVEingetragen($prestudent_id, $typ);
+	// 				if (isError($result)) {
+	// 					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+	// 				}
+	// 			}
+	// 		}
 
-			//checkIf Kaution bezahlt
-			//TODO(Manu)
+	// 		//check if bewerberstatus exists
+	// 		$result = $this->prestudentstatuschecklib->checkIfExistingBewerberstatus($prestudent_id);
+	// 		if (isError($result)) {
+	// 			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+	// 		}
 
-			//generate Personenkennzeichen(matrikelnr)
-			$resultMat = $this->StudentModel->generateMatrikelnummer2($stg, $studiensemester_kurzbz, $typ);
-			if (isError($resultMat)) {
-				return $this->terminateWithError($resultMat, self::ERROR_TYPE_GENERAL);
-			}
-			$matrikelnr = getData($resultMat);
-			$jahr = mb_substr($matrikelnr, 0, 2);
+	// 		//checkIf Kaution bezahlt
+	// 		//TODO(Manu)
 
-			//generate UID
-			$resultUid = $this->StudentModel->generateUID($stgkzl, $jahr, $typ, $matrikelnr);
-			if (isError($resultMat)) {
-				return $this->terminateWithError("in generateUid" . $resultUid, self::ERROR_TYPE_GENERAL);
-			}
-			$uidStudent = getData($resultUid);
+	// 		//check if Aufgenommenener Status
+	// 		$result = $this->prestudentstatuschecklib->checkIfExistingAufgenommenerstatus($prestudent_id);
+	// 		if (isError($result)) {
+	// 			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+	// 		}
 
-			//Check for additional logic (config entries, addons)
-			//TODO(Manu) check include/tw/generatematrikelnr.inc.php
-			//(1) addons durchsuchen, ob eigene Logik für Matrikelnr-erstellung existiert
-			//Default: keine Matrikelnummer wird generiert
-
-			//(2) personenkz = uid
-			if (defined('SET_UID_AS_PERSONENKENNZEICHEN') && SET_UID_AS_PERSONENKENNZEICHEN) {
-				$matrikelnr = $uidStudent;
-			}
-
-			//(3) Matrikelnummer = uid
-			if (defined('SET_UID_AS_MATRIKELNUMMER') && SET_UID_AS_MATRIKELNUMMER) {
-				//update person
-				$result = $this->PersonModel->update(
-					[
-						'person_id' => $person_id,
-					],
-					[
-						'matr_nr' => $uidStudent,
-					]
-				);
-				if (isError($result)) {
-					return $this->terminateWithError("uidAsMatrikelnummer" . getError($result), self::ERROR_TYPE_GENERAL);
-				}
-			}
-
-			//TODO(Manu) check if benutzer already exists to avoid conflicts..
-			//person kann mehrere Benutzer haben... student_uid?
-			//add benutzerdatensatz mit Aktierungscode
-			$this->load->model('person/Benutzer_model', 'BenutzerModel');
-			$result = $this->BenutzerModel->checkIfExistingBenutzer($person_id);
-			if (isError($result)) {
-				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			}
-			if ($result->retval == "0") {
-
-				//activation key
-				$aktivierungscode = null;
-				$result = $this->BenutzerModel->generateActivationKey();
-				if (isError($result)) {
-					return $this->terminateWithError("in Error " . $result, self::ERROR_TYPE_GENERAL);
-				}
-				$aktivierungscode = getData($result);
+	// 		return $this->terminateWithError("here: after check: new Student", self::ERROR_TYPE_GENERAL);
 
 
-				//Alias generieren
-				$result = $this->PersonModel->generateAliasByPersonId($person_id);
-				if (isError($result)) {
-					return $this->terminateWithError("in generate alias " . $result, self::ERROR_TYPE_GENERAL);
-				}
-				$alias = getData($result) ?: null;
-				$alias = $alias->retval[0];
+	// 		//generate Personenkennzeichen(matrikelnr)
+	// 		//getStudiensemester vom Status aufgenommen
+	// 		$resultMat = $this->StudentModel->generateMatrikelnummer2($stg, $studiensemester_kurzbz, $typ);
+	// 		if (isError($resultMat)) {
+	// 			return $this->terminateWithError($resultMat, self::ERROR_TYPE_GENERAL);
+	// 		}
+	// 		$matrikelnr = getData($resultMat);
+	// 		$jahr = mb_substr($matrikelnr, 0, 2);
 
-				$sanitizedVorname = $this->_sanitizeAliasName($alias->vorname);
-				$sanitizedNachname = $this->_sanitizeAliasName($alias->nachname);
+	// 		//generate UID
+	// 		$resultUid = $this->StudentModel->generateUID($stgkzl, $jahr, $typ, $matrikelnr);
+	// 		if (isError($resultMat)) {
+	// 			return $this->terminateWithError("in generateUid" . $resultUid, self::ERROR_TYPE_GENERAL);
+	// 		}
+	// 		$uidStudent = getData($resultUid);
 
-				// Erstelle den Alias
-				$alias = $sanitizedVorname . '.' . $sanitizedNachname;
+	// 		//Check for additional logic (config entries, addons)
+	// 		//TODO(Manu) check include/tw/generatematrikelnr.inc.php
+	// 		//(1) addons durchsuchen, ob eigene Logik für Matrikelnr-erstellung existiert
+	// 		//Default: keine Matrikelnummer wird generiert
 
-				if (isError($result)) {
-					return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-				}
+	// 		//(2) personenkz = uid
+	// 		if (defined('SET_UID_AS_PERSONENKENNZEICHEN') && SET_UID_AS_PERSONENKENNZEICHEN) {
+	// 			$matrikelnr = $uidStudent;
+	// 		}
 
-				$result = $this->BenutzerModel->insert(
-					[
-						'person_id' => $person_id,
-						'uid' => $uidStudent,
-						'aktiv' => true,
-						'aktivierungscode' => $aktivierungscode,
-						'alias' => $alias,
-						'insertvon' => $uid,
-						'insertamum' => date('c'),
-					]
-				);
+	// 		//(3) Matrikelnummer = uid
+	// 		if (defined('SET_UID_AS_MATRIKELNUMMER') && SET_UID_AS_MATRIKELNUMMER) {
+	// 			//update person
+	// 			$result = $this->PersonModel->update(
+	// 				[
+	// 					'person_id' => $person_id,
+	// 				],
+	// 				[
+	// 					'matr_nr' => $uidStudent,
+	// 				]
+	// 			);
+	// 			if (isError($result)) {
+	// 				return $this->terminateWithError("uidAsMatrikelnummer" . getError($result), self::ERROR_TYPE_GENERAL);
+	// 			}
+	// 		}
 
-				if (isError($result)) {
-					return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-				}
+	// 		//TODO(Manu) check if benutzer already exists to avoid conflicts..
+	// 		//person kann mehrere Benutzer haben... student_uid?
+	// 		//add benutzerdatensatz mit Aktierungscode
+	// 		$this->load->model('person/Benutzer_model', 'BenutzerModel');
+	// 		$result = $this->BenutzerModel->checkIfExistingBenutzer($person_id);
+	// 		if (isError($result)) {
+	// 			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+	// 		}
+	// 		if ($result->retval == "0") {
 
-			} else
-				return $this->terminateWithError("Benutzer already existing" . $person_id, self::ERROR_TYPE_GENERAL);
+	// 			//activation key
+	// 			$aktivierungscode = null;
+	// 			$result = $this->BenutzerModel->generateActivationKey();
+	// 			if (isError($result)) {
+	// 				return $this->terminateWithError("in Error " . $result, self::ERROR_TYPE_GENERAL);
+	// 			}
+	// 			$aktivierungscode = getData($result);
 
-			//Student anlegen
-			$result = $this->StudentModel->insert(
-				[
-					'student_uid' => $uidStudent,
-					'prestudent_id' => $prestudent_id,
-					'matrikelnr' => $matrikelnr,
-					'studiengang_kz' => $stg,
-					'semester' => $ausbildungssemester,
-					'verband' => '',
-					'gruppe' => '',
-					'insertvon' => $uid,
-					'insertamum' => date('c')
-				]
-			);
-			if (isError($result))
-			{
-				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			}
 
-			$this->load->library('PrestudentLib');
-			$result = $this->prestudentlib->setFirstStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, null, $bestaetigtam, $bestaetigtvon, $stg, $uidStudent);
+	// 			//Alias generieren
+	// 			$result = $this->PersonModel->generateAliasByPersonId($person_id);
+	// 			if (isError($result)) {
+	// 				return $this->terminateWithError("in generate alias " . $result, self::ERROR_TYPE_GENERAL);
+	// 			}
+	// 			$alias = getData($result) ?: null;
+	// 			$alias = $alias->retval[0];
 
-			if (isError($result)) {
-				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			} else
-				$this->terminateWithSuccess($prestudent_id);
+	// 			$sanitizedVorname = $this->_sanitizeAliasName($alias->vorname);
+	// 			$sanitizedNachname = $this->_sanitizeAliasName($alias->nachname);
 
-		}
-		else
-			return $this->terminateWithError("addNewStatus(student)", self::ERROR_TYPE_GENERAL);
-	}
+	// 			// Erstelle den Alias
+	// 			$alias = $sanitizedVorname . '.' . $sanitizedNachname;
+
+	// 			if (isError($result)) {
+	// 				return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+	// 			}
+
+	// 			$result = $this->BenutzerModel->insert(
+	// 				[
+	// 					'person_id' => $person_id,
+	// 					'uid' => $uidStudent,
+	// 					'aktiv' => true,
+	// 					'aktivierungscode' => $aktivierungscode,
+	// 					'alias' => $alias,
+	// 					'insertvon' => $uid,
+	// 					'insertamum' => date('c'),
+	// 				]
+	// 			);
+
+	// 			if (isError($result)) {
+	// 				return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+	// 			}
+
+	// 		} else
+	// 			return $this->terminateWithError("Benutzer already existing" . $person_id, self::ERROR_TYPE_GENERAL);
+
+	// 		//Student anlegen
+	// 		$result = $this->StudentModel->insert(
+	// 			[
+	// 				'student_uid' => $uidStudent,
+	// 				'prestudent_id' => $prestudent_id,
+	// 				'matrikelnr' => $matrikelnr,
+	// 				'studiengang_kz' => $stg,
+	// 				'semester' => $ausbildungssemester,
+	// 				'verband' => '',
+	// 				'gruppe' => '',
+	// 				'insertvon' => $uid,
+	// 				'insertamum' => date('c')
+	// 			]
+	// 		);
+	// 		if (isError($result))
+	// 		{
+	// 			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+	// 		}
+
+	// 		$this->load->library('PrestudentLib');
+	// 		$result = $this->prestudentlib->setFirstStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, null, $bestaetigtam, $bestaetigtvon, $stg, $uidStudent);
+
+	// 		if (isError($result)) {
+	// 			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+	// 		} else
+	// 			$this->terminateWithSuccess($prestudent_id);
+
+	// 	}
+	// 	else
+	// 		return $this->terminateWithError("addNewStatus(student)", self::ERROR_TYPE_GENERAL);
+	// }
 
 	public function addStudent($prestudent_id)
 	{
@@ -803,7 +816,7 @@ class Status extends FHCAPI_Controller
 		}
 
 		//check if bewerberstatus exists
-		if($status_kurzbz == Prestudentstatus_model::STATUS_AUFGENOMMENER || $status_kurzbz == Prestudentstatus_model::STATUS_WARTENDER)
+		if($status_kurzbz == Prestudentstatus_model::STATUS_AUFGENOMMENER || $status_kurzbz == Prestudentstatus_model::STATUS_WARTENDER ||$status_kurzbz == Prestudentstatus_model::STATUS_STUDENT)
 		{
 
 			$result = $this->prestudentstatuschecklib->checkIfExistingBewerberstatus($prestudent_id);
@@ -841,15 +854,32 @@ class Status extends FHCAPI_Controller
 			}
 		}
 
-		// return ($this->terminateWithError("Is Student " . $isStudent, self::ERROR_TYPE_GENERAL));
-
 		if(!$isStudent)
 		{
 			//checkIf Kaution bezahlt
 			//TODO(Manu)
 
+			//check if Aufgenommenener Status
+			$result = $this->prestudentstatuschecklib->checkIfExistingAufgenommenerstatus($prestudent_id);
+			if (isError($result)) {
+				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			}
+
+			//getSemester of Status Aufgenommen
+			$result = $this->PrestudentstatusModel->loadWhere([
+				"prestudent_id" => $prestudent_id,
+				"status_kurzbz" => Prestudentstatus_model::STATUS_AUFGENOMMENER
+				]);
+				//$this->PrestudentstatusModel->addOrder('ausbildungssemester', 'DESC');
+				$this->PrestudentstatusModel->addLimit(1);
+			if (isError($result)) 
+			{
+				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			}
+			$semesterAufgenommen = current(getData($result));
+
 			//generate Personenkennzeichen(matrikelnr)
-			$resultMat = $this->StudentModel->generateMatrikelnummer2($stg, $studiensemester_kurzbz, $typ);
+			$resultMat = $this->StudentModel->generateMatrikelnummer2($stg, $semesterAufgenommen->studiensemester_kurzbz, $typ);
 			if (isError($resultMat)) {
 				return $this->terminateWithError($resultMat, self::ERROR_TYPE_GENERAL);
 			}
@@ -859,7 +889,7 @@ class Status extends FHCAPI_Controller
 			//generate UID
 			$resultUid = $this->StudentModel->generateUID($stgkzl, $jahr, $typ, $matrikelnr);
 			if (isError($resultMat)) {
-				return $this->terminateWithError("in generateUid" . $resultUid, self::ERROR_TYPE_GENERAL);
+				return $this->terminateWithError(getData($resultUid), self::ERROR_TYPE_GENERAL);
 			}
 			$uidStudent = getData($resultUid);
 
@@ -897,30 +927,29 @@ class Status extends FHCAPI_Controller
 			}
 			if ($result->retval != "0")
 			{
-			//	return ($this->terminateWithError($result->retval . " uid: " . $uid, self::ERROR_TYPE_GENERAL));
 				return $this->terminateWithError($this->p->t('lehre','error_benutzerBereitsVorhanden', self::ERROR_TYPE_GENERAL));
 			}
-			//activation key
+
 			$aktivierungscode = null;
 			$result = $this->BenutzerModel->generateActivationKey();
 			if (isError($result)) {
-				return $this->terminateWithError("in Error " . $result, self::ERROR_TYPE_GENERAL);
+				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 			}
 			$aktivierungscode = getData($result);
 
-			//Alias generieren
+			//generate Alias
 			$result = $this->PersonModel->generateAliasByPersonId($person_id);
+
 			if (isError($result))
 			{
-				return $this->terminateWithError("in generate alias " . $result, self::ERROR_TYPE_GENERAL);
+				return $this->terminateWithError(getData($result), self::ERROR_TYPE_GENERAL);
 			}
+
 			$alias = getData($result) ?: null;
 			$alias = $alias->retval[0];
 
 			$sanitizedVorname = $this->_sanitizeAliasName($alias->vorname);
 			$sanitizedNachname = $this->_sanitizeAliasName($alias->nachname);
-
-			// Erstelle den Alias
 			$alias = $sanitizedVorname . '.' . $sanitizedNachname;
 
 			if (isError($result))
@@ -943,7 +972,6 @@ class Status extends FHCAPI_Controller
 				return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 			}
 
-
 			//Student anlegen
 			$result = $this->StudentModel->insert(
 				[
diff --git a/application/libraries/PrestudentstatusCheckLib.php b/application/libraries/PrestudentstatusCheckLib.php
index b238219a8..23afb7563 100644
--- a/application/libraries/PrestudentstatusCheckLib.php
+++ b/application/libraries/PrestudentstatusCheckLib.php
@@ -245,6 +245,35 @@ class PrestudentstatusCheckLib
 		return success(getData($result));
 	}
 
+	/**
+	 * Checks if status aufgenommen already exists.
+	 * @return error if invalid
+	 * @return error if no status Aufgenommen, success otherwise
+	 */
+	public function checkIfExistingAufgenommenerstatus($prestudent_id)
+	{
+		$result =  $this->_getApplicationData($prestudent_id);
+		if(isError($result))
+		{
+			return getData($result);
+		}
+		$result =  current(getData($result));
+		$studentName = trim ($result->vorname.' '.$result->nachname);
+
+		$result =  $this->_ci->PrestudentstatusModel->checkIfExistingAufgenommenerstatus(
+			$prestudent_id
+		);
+		if(isError($result))
+		{
+			return getData($result);
+		}
+		if(getData($result) == "0")
+		{
+			return error($this->_ci->p->t('lehre','error_keinAufgenommener', ['name' => $studentName]));
+		}
+		return success(getData($result));
+	}
+
 	/**
 	 * Check if Bismeldestichtag erreicht
 	 * @param Date $statusDatum
diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php
index 26b603a66..b13bc6306 100644
--- a/application/models/crm/Prestudentstatus_model.php
+++ b/application/models/crm/Prestudentstatus_model.php
@@ -12,6 +12,7 @@ class Prestudentstatus_model extends DB_Model
 	const STATUS_AUFGENOMMENER = 'Aufgenommener';
 	const STATUS_WARTENDER = 'Wartender';
 	const STATUS_ABGEWIESENER = 'Abgewiesener';
+	const STATUS_INTERESSENT = 'Interessent';
 
 	/**
 	 * Constructor
@@ -438,6 +439,48 @@ class Prestudentstatus_model extends DB_Model
 		}
 	}
 
+		/**
+	 * Check if Rolle there is an existing Aufgenommenerstatus
+	 * @param integer $prestudent_id
+	 * @return error if no status Aufgenommener, success if existing
+	 */
+	public function checkIfExistingAufgenommenerstatus($prestudent_id)
+	{
+		$studentName = '';
+
+		$nameRes = $this->PersonModel->loadPrestudent($prestudent_id);
+
+		if (hasData($nameRes))
+		{
+			$nameData = getData($nameRes)[0];
+			$studentName = $nameData->vorname.' '.$nameData->nachname;
+		}
+
+		$qry = "SELECT
+					*
+				FROM
+				    public.tbl_prestudentstatus
+				WHERE
+					prestudent_id = ?
+				AND
+				    status_kurzbz = 'Aufgenommener'";
+
+		$result = $this->execQuery($qry, array($prestudent_id));
+
+		if (isError($result))
+		{
+			return error($result);
+		}
+		elseif (!hasData($result))
+		{
+			return success("0", $this->p->t('lehre','error_keinAufgenommener', ['name' => $studentName]));
+		}
+		else
+		{
+			return success($result);
+		}
+	}
+
 	/**
 	 * Check if there is only one prestudentstatus left
 	 * @param integer $prestudent_id
diff --git a/application/models/crm/Student_model.php b/application/models/crm/Student_model.php
index 92a6ed25b..1bc77420c 100644
--- a/application/models/crm/Student_model.php
+++ b/application/models/crm/Student_model.php
@@ -108,9 +108,9 @@ class Student_model extends DB_Model
 		$max = 0;
 		if ($matrikelnrres && hasData($matrikelnrres)) {
 			$max = mb_substr($matrikelnrres->retval[0]->matrikelnr, 7);
-/*			if (!is_numeric($max)) {
-				$max = 0;
-			}*/
+			if (!is_numeric($max)) {
+				$max = (int) $max;
+			}
 		}
 
 		$max += 1;
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index 9261eee1d..b0569842d 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -471,99 +471,9 @@ export default{
 
 			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData}));
 			this.addNewStatus(prestudentIds);
-		},
-		turnIntoStudent(prestudentIds){
-
-			//erste Voraussetzung: kein check auf checkIfExistingStudent
-			// macht aus einem Bewerber einen Studenten
-			// Voraussetzungen:
-			// - ZGV muss ausgefuellt sein (bei Master beide)
-			// - Kaution muss bezahlt sein
-			// - Rolle Bewerber muss existieren
-			// Wenn die Voraussetzungen erfuellt sind, dann wird die Matrikelnr
-			// und UID generiert und der Studentendatensatz angelegt.
-			let changeData = {};
-
-			//for Feedback Sucess, Error
-			let countSuccess = 0;
-			let countError = 0;
-
-			const promises = prestudentIds.map(prestudentId => {
-
-				this.checkIfErsterStudent(prestudentId).then(() => {
-
-					if(this.isErsterStudent)
-					{
-						console.log(prestudentId + ": isersterStudent: " + this.isErsterStudent + " Logik turnIntoStudent");
-
-						changeData = this.newArray.find(item => item.prestudent_id === prestudentId);
-
-						return this.$fhcApi.post('api/frontend/v1/stv/status/turnIntoStudent/' + prestudentId,
-							changeData
-						).then(response => {
-							countSuccess++;
-							return response;
-						})
-							//.catch(this.$fhcAlert.handleSystemError)
-							.catch(error => {
-								countError++;
-								//For each Prestudent show Error in Alert
-								this.$fhcAlert.handleSystemError(error);
-							});
-					}
-					else
-					{
-						console.log(prestudentId + ": isersterStudent: " + this.isErsterStudent + " Add New Status");
-						changeData = this.newArray.find(item => item.prestudent_id === prestudentId);
-
-						return this.$fhcApi.post('api/frontend/v1/stv/status/addNewStatus/' + prestudentId,
-							changeData
-						).then(response => {
-							countSuccess++;
-							return response;
-						})
-							//.catch(this.$fhcAlert.handleSystemError)
-							.catch(error => {
-								countError++;
-								//For each Prestudent show Error in Alert
-								this.$fhcAlert.handleSystemError(error);
-							});
-					}
-				});
-			});
-
-			Promise
-				.allSettled(promises)
-				.then(values => {
-
-					//Feedback Success als infoalert
-					if (countSuccess > 0) {
-						this.$fhcAlert.alertInfo(this.$p.t('ui', 'successNewStatus', {
-							'countSuccess': countSuccess,
-							'status': this.newStatus,
-							'countError': countError
-						}));
-					}
-
-/*					if (this.modelValue.prestudent_id) {
-						this.reload();
-						//TODO(manu) reload Detailtab after Abbrecher to see current status activ, verband and gruppe
-					}*/
-					if(this.isErsterStudent) {
-						this.reload();
-						this.isErsterStudent = false;
-					}
-					else {
-						this.$reloadList();
-					}
-					this.hideModal('statusModal');
-					this.resetModal();
-				});
-
-
 		},
 		addStudent(prestudentIds){
-			//Array.isArray(prestudentIds) ? this.modelValue.prestudent_id : [prestudentIds];
+
 			let changeData = {};
 
 			//for Feedback Sucess, Error
@@ -668,12 +578,16 @@ export default{
 						 }));
 					 }
 
-					if (this.modelValue.prestudent_id) {
-						this.reload();
-					}
-					else {
-						this.$reloadList();
-					}
+					 //TODO(Manu) bei status Interessent, Bewerber, aufgenommener, reload nicht working
+					 this.reload();
+					 this.reloadList();
+
+					// if (this.modelValue.prestudent_id) {
+					// 	this.reload();
+					// }
+					// else {
+					// 	this.$reloadList();
+					// }
 					this.hideModal('statusModal');
 					this.resetModal();
 				});
@@ -868,8 +782,8 @@ export default{
 			.then(result => {
 				this.dataMeldestichtag = result.data[0].meldestichtag;
 				//TODO(Manu) wirft plötzlich fehler bei multiselect status
-/*				if (this.$refs.table.tableBuilt)
-					this.$refs.table.tabulator.redraw(true);*/
+		//	if (this.$refs.table.tableBuilt)
+		//		this.$refs.table.tabulator.redraw(true);
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 	},
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 171fd77e6..6f458b465 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -27535,7 +27535,7 @@ array(
 				'insertvon' => 'system'
 			)
 		)
-	)
+	),
 	//Prestudent
 	array(
 		'app' => 'core',
@@ -28057,6 +28057,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'error_keinAufgenommener',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '{name} muss zuerst Aufgenommener sein, um zum Studenten gemacht werden zu können!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '{name} must first be admitted in order to be made a student!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'lehre',

From 630d2659b365822bef29cd458f3e745b6a121619 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 15 Jul 2024 17:38:13 +0200
Subject: [PATCH 0926/1461] extension/anwesenheit_assistenz ->
 extension/anw_ent_admin; removed hardocoded status; check for overlapping
 excuse timespans; and a lot more ;)

---
 public/js/components/Form/Upload/Dms.js |  11 ++-
 system/phrasesupdate.php                | 107 ++++++++++++++++++++++--
 2 files changed, 110 insertions(+), 8 deletions(-)

diff --git a/public/js/components/Form/Upload/Dms.js b/public/js/components/Form/Upload/Dms.js
index fe58fa74b..83fab90f6 100644
--- a/public/js/components/Form/Upload/Dms.js
+++ b/public/js/components/Form/Upload/Dms.js
@@ -11,7 +11,11 @@ export default {
 		id: String,
 		name: String,
 		inputClass: [String, Array, Object],
-		noList: Boolean
+		noList: Boolean,
+		accept: {
+			type: String,
+			default: ''
+		}
 	},
 	methods: {
 		stringifyFile(file) {
@@ -71,10 +75,11 @@ export default {
 			this.$emit('update:modelValue', dt.files);
 		}
 	},
+
 	template: `
 	<div class="form-upload-dms">
-		<input ref="upload" class="form-control" :class="inputClass" :id="id" :name="name" :multiple="multiple" type="file" @change="addFiles">
-		<ul v-if="modelValue.length && multiple && !noList" class="list-unstyled m-0">
+		<input ref="upload" class="form-control" :accept="accept" :class="inputClass" :id="id" :name="name" :multiple="multiple" type="file" @change="addFiles">
+		<ul v-if="modelValue.length && multiple && !noList" :accept="accept" class="list-unstyled m-0">
 			<li v-for="(file, index) in modelValue" :key="index" class="d-flex mx-1 mt-1 align-items-start">
 				<span class="col-auto"><i class="fa fa-file me-1"></i></span>
 				<span class="col">{{ file.name }}</span>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 29815f1f2..cae3fa258 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -25060,7 +25060,6 @@ array(
 			)
 		)
 	),
-	// FHC-CORE-ANWESENHEITEN BEGIN
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
@@ -25144,7 +25143,27 @@ array(
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
-		'phrase' => 'entschuldigungAngenommen',
+		'phrase' => 'abgelehnt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Abgelehnt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'declined',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'entschuldigungAkzeptiert',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
@@ -25161,6 +25180,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'akzeptiert',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Akzeptiert',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'accepted',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
@@ -25175,7 +25214,27 @@ array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'excuse note open',
+				'text' => 'excuse note status open',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'hochgeladen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Hochgeladen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'uploaded',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -25441,6 +25500,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'entschuldigungAutoEmailBetreff',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Entschuldigung zur Befreiung der Anwesenheitspflicht: Neues Dokument wurde hochgeladen.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Excuse note for digital attendances - a new document has been uploaded.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
@@ -26960,8 +27039,26 @@ array(
 				'insertvon' => 'system'
 			)
 		)
-	)
-	// FHC-CORE-ANWESENHEITEN END
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorInvalidFiletype',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ungültiges Dateiformat!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Invalid Filetype!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
 	),
 	array(
 		'app' => 'core',

From f49161420d067ffa07bdd7f2974f0fbb3855b175 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 15 Jul 2024 18:18:53 +0200
Subject: [PATCH 0927/1461] try to improve layout

---
 content/student/studentpruefungoverlay.xul.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/content/student/studentpruefungoverlay.xul.php b/content/student/studentpruefungoverlay.xul.php
index e325ee284..d109366b0 100644
--- a/content/student/studentpruefungoverlay.xul.php
+++ b/content/student/studentpruefungoverlay.xul.php
@@ -61,7 +61,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 				<column flex="1"/>
 			</columns>
 			<rows>
-				<row>
+				<row style="min-height: 325px;">
 					<vbox>
 						<hbox>
 							<spacer flex="1"/>
@@ -258,13 +258,12 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 					      				</hbox>
 									</row>
 <?php if($show_komm_prfg_hint) { ?>
-									<row id="student-pruefung-textbox-datum-hinweis" hidden="true" maxwidth="700">
+									<row id="student-pruefung-textbox-datum-hinweis" hidden="true" style="border: 1px solid #f00;">
 										<label></label>
-										<hbox maxwidth="600" align="center">
-										    <image width="20" class="message-icon"/>
-										    <description flex="1" maxwidth="200" style="font-size: 70%;">Bitte bei der Neuanlage das Datum der Noteneintragung (i. d. R. heute) eintragen, um den korrekten Fristenablauf der Wiederholung zu ermöglichen. Das Datum der Prüfung bitte im Anmerkungsfeld vermerken.</description>
-										    <spacer flex="1" />
-										</hbox>
+										<!--hbox align="center" style="border: 1px solid #0f0;"-->
+										    <!--image width="20" class="message-icon"/-->
+										    <description width="400" style="font-size: 70%; border: solid 1px #00f;">Bitte bei der Neuanlage das Datum der Noteneintragung (i. d. R. heute) eintragen, um den korrekten Fristenablauf der Wiederholung zu ermöglichen. Das Datum der Prüfung bitte im Anmerkungsfeld vermerken.</description>
+										<!--/hbox-->
 									</row>
 <?php } ?>
 					      			<row>

From bf1f0428ea05fe7bf76dc2833508bb55e79aadc2 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 15 Jul 2024 19:06:19 +0200
Subject: [PATCH 0928/1461] use textbox to retain layout

---
 content/student/studentpruefungoverlay.xul.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/content/student/studentpruefungoverlay.xul.php b/content/student/studentpruefungoverlay.xul.php
index d109366b0..a018ea70b 100644
--- a/content/student/studentpruefungoverlay.xul.php
+++ b/content/student/studentpruefungoverlay.xul.php
@@ -258,12 +258,9 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 					      				</hbox>
 									</row>
 <?php if($show_komm_prfg_hint) { ?>
-									<row id="student-pruefung-textbox-datum-hinweis" hidden="true" style="border: 1px solid #f00;">
-										<label></label>
-										<!--hbox align="center" style="border: 1px solid #0f0;"-->
-										    <!--image width="20" class="message-icon"/-->
-										    <description width="400" style="font-size: 70%; border: solid 1px #00f;">Bitte bei der Neuanlage das Datum der Noteneintragung (i. d. R. heute) eintragen, um den korrekten Fristenablauf der Wiederholung zu ermöglichen. Das Datum der Prüfung bitte im Anmerkungsfeld vermerken.</description>
-										<!--/hbox-->
+									<row id="student-pruefung-textbox-datum-hinweis" hidden="true">
+										<label><image width="20" class="message-icon"/></label>
+										<textbox readonly="true" multiline="true" rows="3" value="Bitte bei der Neuanlage das Datum der Noteneintragung (i. d. R. heute) eintragen, um den korrekten Fristenablauf der Wiederholung zu ermöglichen. Das Datum der Prüfung bitte im Anmerkungsfeld vermerken."></textbox>
 									</row>
 <?php } ?>
 					      			<row>

From b8601bac512d441529df839e9996ffd4e818be5b Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 16 Jul 2024 07:33:52 +0200
Subject: [PATCH 0929/1461] Multistatus: copypasta

---
 .../Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index b0569842d..7259b83a3 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -867,7 +867,7 @@ export default{
 					<div class="row mb-3">
 						<form-input
 							type="DatePicker"
-							name="datum"
+							name="bestaetigtam"
 							:label="$p.t('lehre/bestaetigt_am')"
 							v-model="statusData.bestaetigtam"
 							auto-apply
@@ -881,7 +881,7 @@ export default{
 					<div class="row mb-3">
 						<form-input
 							type="DatePicker"
-							name="datum"
+							name="bewerbung_abgeschickt_am"
 							:label="$p.t('lehre/bewerbung_abgeschickt_am')"
 							v-model="statusData['bewerbung_abgeschicktamum']"
 							auto-apply

From 8860969649b69c5dae644b19e192bc94a7c964a7 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 16 Jul 2024 07:47:18 +0200
Subject: [PATCH 0930/1461] bugfix redraw only if table, refactor
 generate_personenkennzeichen

---
 .../controllers/api/frontend/v1/stv/Status.php  | 17 ++++++++++++-----
 .../Details/Prestudent/MultiStatus.js           |  5 ++---
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index aa779c78f..15499557c 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -2,6 +2,7 @@
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
+use CI3_Events as Events;
 use \DateTime as DateTime;
 
 class Status extends FHCAPI_Controller
@@ -879,12 +880,18 @@ class Status extends FHCAPI_Controller
 			$semesterAufgenommen = current(getData($result));
 
 			//generate Personenkennzeichen(matrikelnr)
-			$resultMat = $this->StudentModel->generateMatrikelnummer2($stg, $semesterAufgenommen->studiensemester_kurzbz, $typ);
-			if (isError($resultMat)) {
-				return $this->terminateWithError($resultMat, self::ERROR_TYPE_GENERAL);
+			$matrikelnr = false;
+			Events::trigger('generate_personenkennzeichen', $stg, $semesterAufgenommen, $typ, function ($value) use ($matrikelnr) {
+				$matrikelnr = $value;
+			});
+			if ($matrikelnr === false) {
+				$resultMat = $this->StudentModel->generateMatrikelnummer2($stg, $semesterAufgenommen->studiensemester_kurzbz, $typ);
+				if (isError($resultMat)) {
+					return $this->terminateWithError($resultMat, self::ERROR_TYPE_GENERAL);
+				}
+				$matrikelnr = getData($resultMat);
 			}
-			$matrikelnr = getData($resultMat);
-			$jahr = mb_substr($matrikelnr, 0, 2);
+			$jahr = mb_substr($semesterAufgenommen, 4, 2);
 
 			//generate UID
 			$resultUid = $this->StudentModel->generateUID($stgkzl, $jahr, $typ, $matrikelnr);
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index 7259b83a3..a62f7cde9 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -781,9 +781,8 @@ export default{
 			.get('api/frontend/v1/stv/status/getLastBismeldestichtag/')
 			.then(result => {
 				this.dataMeldestichtag = result.data[0].meldestichtag;
-				//TODO(Manu) wirft plötzlich fehler bei multiselect status
-		//	if (this.$refs.table.tableBuilt)
-		//		this.$refs.table.tabulator.redraw(true);
+				if (this.$refs.table && this.$refs.table.tableBuilt)
+					this.$refs.table.tabulator.redraw(true);
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 	},

From 043d876642ce0d25ab955deb5625a954276163b3 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 16 Jul 2024 09:20:40 +0200
Subject: [PATCH 0931/1461] bugfix orgform_kurzbz

---
 .../Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index a62f7cde9..9d275522d 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -81,7 +81,7 @@ export default{
 						prestudent_id: item.prestudent_id,
 						ausbildungssemester: item.semester,
 						studiensemester_kurzbz: this.defaultSemester,
-						orgform_kurzbz: item.modelValue.orgform_kurzbz,
+						orgform_kurzbz: item.orgform_kurzbz,
 						name: `${item.vorname} ${item.nachname}`
 					};
 					dataArray.push(newObj);
@@ -484,7 +484,7 @@ export default{
 				prestudentIds = [this.modelValue.prestudent_id];
 
 			const promises = prestudentIds.map(prestudentId => {
-				//TODO(manu) besserer check
+
 				changeData = this.statusData.status_kurzbz ? this.statusData : this.newArray.find(item => item.prestudent_id === prestudentId);
 
 				return this.$fhcApi.post('api/frontend/v1/stv/status/addStudent/' + prestudentId,

From 7031a4d9c4a6e3691edba5923d04474e724b93d9 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 16 Jul 2024 09:59:10 +0200
Subject: [PATCH 0932/1461] Use only active Statusgruende & "--keine Auswahl--"

---
 .../controllers/api/frontend/v1/stv/Status.php    | 10 +++++-----
 application/models/crm/Statusgrund_model.php      | 15 +++++++++++++++
 .../Details/Prestudent/MultiStatus.js             |  4 ++--
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 15499557c..8c61fe85a 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -54,11 +54,11 @@ class Status extends FHCAPI_Controller
 	{
 		$this->load->model('crm/Statusgrund_model', 'StatusgrundModel');
 
-		$result = $this->StatusgrundModel->load();
-		if (isError($result)) {
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-		return $this->terminateWithSuccess(getData($result) ?: []);
+		$result = $this->StatusgrundModel->getAktiveGruende();
+
+		$data = $this->getDataOrTerminateWithError($result);
+		
+		$this->terminateWithSuccess($data);
 	}
 
 	public function getLastBismeldestichtag()
diff --git a/application/models/crm/Statusgrund_model.php b/application/models/crm/Statusgrund_model.php
index d488e12d1..8fc2a3a62 100644
--- a/application/models/crm/Statusgrund_model.php
+++ b/application/models/crm/Statusgrund_model.php
@@ -27,4 +27,19 @@ class Statusgrund_model extends DB_Model
 
 		return success($status->retval);
 	}
+
+	public function getAktiveGruende()
+	{
+		$lang = '[(SELECT index FROM public.tbl_sprache WHERE sprache=' . $this->escape(getUserLanguage()) . ' LIMIT 1)]';
+
+		$this->addSelect('tbl_status_grund.*');
+		$this->addSelect('bezeichnung_mehrsprachig' . $lang . ' AS bezeichnung');
+		$this->addSelect('beschreibung' . $lang . ' AS beschreibung');
+
+		$this->addOrder('bezeichnung_mehrsprachig' . $lang);
+
+		return $this->loadWhere([
+			'aktiv' => true
+		]);
+	}
 }
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index 9d275522d..2c469d99b 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -933,8 +933,8 @@ export default{
 							:label="$p.t('studierendenantrag/antrag_grund')"
 							v-model="statusData['statusgrund_id']"
 							>
-							<option value=""></option>
-							<option v-for="grund in gruende" :key="grund.statusgrund_id" :value="grund.statusgrund_id">{{grund.beschreibung[0]}}</option>
+							<option value="">-- {{$p.t('fehlermonitoring', 'keineAuswahl')}} --</option>
+							<option v-for="grund in gruende" :key="grund.statusgrund_id" :value="grund.statusgrund_id">{{grund.bezeichnung}}</option>
 						</form-input>
 					</div>
 				

From 3c50ffd94593301145b8d5b70220c8a43f31f12b Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 16 Jul 2024 14:07:44 +0200
Subject: [PATCH 0933/1461] remove unnecessary style

---
 content/student/studentpruefungoverlay.xul.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/student/studentpruefungoverlay.xul.php b/content/student/studentpruefungoverlay.xul.php
index a018ea70b..10070b6c5 100644
--- a/content/student/studentpruefungoverlay.xul.php
+++ b/content/student/studentpruefungoverlay.xul.php
@@ -61,7 +61,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 				<column flex="1"/>
 			</columns>
 			<rows>
-				<row style="min-height: 325px;">
+				<row>
 					<vbox>
 						<hbox>
 							<spacer flex="1"/>

From 8c9ed2c52cc2a74b90bbb3d01be3eb633cce8002 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 16 Jul 2024 14:19:32 +0200
Subject: [PATCH 0934/1461] Textaenderung

---
 content/student/studentpruefungoverlay.xul.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/student/studentpruefungoverlay.xul.php b/content/student/studentpruefungoverlay.xul.php
index 10070b6c5..b1fa4c325 100644
--- a/content/student/studentpruefungoverlay.xul.php
+++ b/content/student/studentpruefungoverlay.xul.php
@@ -260,7 +260,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 <?php if($show_komm_prfg_hint) { ?>
 									<row id="student-pruefung-textbox-datum-hinweis" hidden="true">
 										<label><image width="20" class="message-icon"/></label>
-										<textbox readonly="true" multiline="true" rows="3" value="Bitte bei der Neuanlage das Datum der Noteneintragung (i. d. R. heute) eintragen, um den korrekten Fristenablauf der Wiederholung zu ermöglichen. Das Datum der Prüfung bitte im Anmerkungsfeld vermerken."></textbox>
+										<textbox readonly="true" multiline="true" rows="3" value="Bitte bei Neuanlage einer kommissionellen Prüfung das Datum der Noteneintragung (i. d. R. heute) eintragen, um den korrekten Fristenablauf der Wiederholung zu ermöglichen. Das Datum der Prüfung bitte im Anmerkungsfeld vermerken."></textbox>
 									</row>
 <?php } ?>
 					      			<row>

From 3417dcd41d28a45071adef10921a6c8020fa7fd5 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 16 Jul 2024 15:18:23 +0200
Subject: [PATCH 0935/1461] centers the text, displays default message and
 makes # links not clickable and removes the link styling from them

---
 .../controllers/api/frontend/v1/LvMenu.php    | 14 +++++------
 public/js/components/Cis/Mylv/LvUebersicht.js | 23 +++++++++++--------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/application/controllers/api/frontend/v1/LvMenu.php b/application/controllers/api/frontend/v1/LvMenu.php
index d5effafa7..3e1b2347b 100644
--- a/application/controllers/api/frontend/v1/LvMenu.php
+++ b/application/controllers/api/frontend/v1/LvMenu.php
@@ -67,6 +67,9 @@ class LvMenu extends FHCAPI_Controller
 		require_once(FHCPATH.'include/phrasen.class.php');
 		require_once(FHCPATH.'include/lvangebot.class.php');
 		require_once(FHCPATH.'include/lehre_tools.class.php');
+		// data gets not returned
+		//require_once(FHCPATH.'addons/moodle/lib/LogicCourses.php');
+		//require_once(FHCPATH.'addons/moodle/lib/Database.php');
 
 		// get the sprache
 		$sprache = getSprache();
@@ -327,14 +330,11 @@ class LvMenu extends FHCAPI_Controller
 			|| $rechte->isBerechtigtMultipleOe('lehre/lvinfo', $lehrfach_oe_kurzbz_arr)
 			)
 			{
-				$c4_linkList[$p->t('lehre/lvInfoBearbeiten')]= 'ects/index.php?lvid='.$lvid;
-				$c4_linkList['test']= 'ects/index.php?lvid='.$lvid;
-				$c4_linkList['asdf']= 'ects/index.php?lvid='.$lvid;
-				$c4_linkList['qewr']= 'ects/index.php?lvid='.$lvid;
+				$c4_linkList[]= [$p->t('lehre/lvInfoBearbeiten'), 'ects/index.php?lvid='.$lvid];
 			}
 			elseif ($is_lector)
 			{
-				$c4_linkList["Bearbeiten der LV-Infos derzeit gesperrt"]= '#';
+				$c4_linkList[]= ["Bearbeiten der LV-Infos derzeit gesperrt",'#'];
 			}
 
 			$menu[]=array
@@ -390,7 +390,7 @@ class LvMenu extends FHCAPI_Controller
 					'name'=>$p->t('lehre/gesamtnote'),
 					'c4_icon'=>'skin/images/button_endnote.png',
 					'c4_link'=>'',
-					'c4_linkList'=>[$p->t('lehre/noteneingabedeaktiviert')=>'#'],
+					'c4_linkList'=>[[$p->t('lehre/noteneingabedeaktiviert'),'#']],
 				);
 			}
 		}
@@ -428,7 +428,7 @@ class LvMenu extends FHCAPI_Controller
 			}
 
 			if($noMailLink){
-				$c4_linkList[$p->t('lehre/keinMailverteiler',array(implode(" ",$noMails)))]='#';
+				$c4_linkList[]=[$p->t('lehre/keinMailverteiler',array(implode(" ",$noMails))), '#'];
 				$link_onclick='alert(\''.$p->t('lehre/keinMailverteiler',array(implode(" ",$noMails))).'\');';
 			}else{
 				$link_onclick='';
diff --git a/public/js/components/Cis/Mylv/LvUebersicht.js b/public/js/components/Cis/Mylv/LvUebersicht.js
index ccd8abc8c..d3ded0518 100644
--- a/public/js/components/Cis/Mylv/LvUebersicht.js
+++ b/public/js/components/Cis/Mylv/LvUebersicht.js
@@ -22,19 +22,21 @@ export default  {
         BsModal,
     },
     methods:{
-        selectMenu: function(menuItem, key=null){
-            console.log(menuItem,"menuItem")
+        selectMenu: function(menuItem, index=null){
+            
+            // early return if link is #
+            if(index != null && menuItem.c4_linkList[index][1] == '#') return;
+
             switch(menuItem.id){
                 case "core_menu_mailanstudierende": window.location.href=menuItem.c4_link; break;
                 default:
                     this.selectedMenu= {...menuItem};
             }
 
-            if( this.selectedMenu && key != null && menuItem.c4_linkList[key] !='#'){
-                this.selectedMenu.c4_link = menuItem.c4_linkList[key];
-                this.selectedMenu.name += ' - ' + key;
+            if( this.selectedMenu && index != null && menuItem.c4_linkList[index][1] !='#'){
+                this.selectedMenu.c4_link = menuItem.c4_linkList[index][1];
+                this.selectedMenu.name += ' - ' + menuItem.c4_linkList[index][0];
             }
-            
         },
         hiddenModal: function(){
             this.selectedMenu = null;
@@ -43,7 +45,10 @@ export default  {
 
             this.$fhcApi.factory.addons.getLvMenu(this.event.lehrveranstaltung_id, this.event.studiensemester_kurzbz).then(res =>{
             //this.$fhcApi.factory.addons.getLvMenu(750, "WS2005").then(res =>{
+                if(res.data){
                     this.menu = res.data;
+                }
+            
             });
         },
     },
@@ -66,15 +71,15 @@ export default  {
                 </div>
                 <iframe class="h-100 w-100" :src="selectedMenu.c4_link" :title="selectedMenu.name"></iframe>
             </div>
+            <div v-else-if="!menu">No Menu available</div>
             <div v-else :style="{'display':'grid', 'row-gap':'10px', 'column-gap':'10px', 'grid-template-columns':'repeat(3,minmax(100px,1fr))', 'grid-template-rows':'repeat('+Math.ceil(menu.length / 3)+',minmax(100px,1fr))'} ">
-                <div :title="menuItem.name" role="button" @click="selectMenu(menuItem)" class="lvUebersichtMenuPunkt border border-1 d-flex flex-column align-items-center justify-content-center p-1" v-for="(menuItem, index) in menu" :key="index">
+                <div :title="menuItem.name" role="button" @click="selectMenu(menuItem)" class="lvUebersichtMenuPunkt border border-1 d-flex flex-column align-items-center justify-content-center p-1 text-center" v-for="(menuItem, index) in menu" :key="index">
                     <img :src="menuItem.c4_icon" :alt="menuItem.name" ></img>    
                     <span @click="selectMenu(menuItem)" class="underline_hover mt-2">{{menuItem.name}}</span> 
-                    <span v-for="(value,key,index) in menuItem.c4_linkList" @click.stop="selectMenu(menuItem,key)" class="underline_hover mt-1" :index="index">{{key}}</span>
+                    <span v-for="([text,link],index) in menuItem.c4_linkList" @click.stop="selectMenu(menuItem,index)"  :class="{'underline_hover':menuItem.c4_linkList[index][1] != '#'}" class="mt-1" :index="index">{{text}}</span>
                         
                 </div>
             </div>
-            <div>{{JSON.stringify(event,null,2)}}</div>
         </template>
         
     </bs-modal>

From da8bb697dfb5db5f518448f5331a042a748c359d Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 16 Jul 2024 15:42:42 +0200
Subject: [PATCH 0936/1461] change url of Gesamtnote Menu Punkt

---
 application/controllers/api/frontend/v1/LvMenu.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/controllers/api/frontend/v1/LvMenu.php b/application/controllers/api/frontend/v1/LvMenu.php
index 3e1b2347b..67adaf96c 100644
--- a/application/controllers/api/frontend/v1/LvMenu.php
+++ b/application/controllers/api/frontend/v1/LvMenu.php
@@ -378,7 +378,7 @@ class LvMenu extends FHCAPI_Controller
 					'position'=>'80',
 					'name'=>$p->t('lehre/gesamtnote'),
 					'c4_icon'=> base_url('skin/images/button_endnote.png'),
-					'c4_link'=> base_url('benotungstool/lvgesamtnoteverwalten.php?lvid='.urlencode($lvid).'&stsem='.urlencode($angezeigtes_stsem))
+					'c4_link'=> base_url('cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php?lvid='.urlencode($lvid).'&stsem='.urlencode($angezeigtes_stsem))
 				);
 			}
 			else

From 287d44f64ad7eb5f9a20f54792bdf31cd9bcc984 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 17 Jul 2024 09:20:31 +0200
Subject: [PATCH 0937/1461] add formatted dates to sql query
 getHistoryPrestudent

---
 application/models/crm/Prestudentstatus_model.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php
index b13bc6306..2600ae64a 100644
--- a/application/models/crm/Prestudentstatus_model.php
+++ b/application/models/crm/Prestudentstatus_model.php
@@ -575,17 +575,21 @@ class Prestudentstatus_model extends DB_Model
 		$this->addSelect('tbl_prestudentstatus.studiensemester_kurzbz');
 		$this->addSelect('tbl_prestudentstatus.ausbildungssemester');
 		$this->addSelect('tbl_prestudentstatus.datum');
+		$this->addSelect("TO_CHAR(tbl_prestudentstatus.datum::timestamp, 'DD.MM.YYYY') AS format_datum");
 		$this->addSelect('tbl_prestudentstatus.insertamum');
 		$this->addSelect('tbl_prestudentstatus.insertvon');
 		$this->addSelect('tbl_prestudentstatus.updateamum');
 		$this->addSelect('tbl_prestudentstatus.updatevon');
 		$this->addSelect('tbl_prestudentstatus.orgform_kurzbz');
 		$this->addSelect('tbl_prestudentstatus.bestaetigtam');
+		$this->addSelect("TO_CHAR(tbl_prestudentstatus.bestaetigtam::timestamp, 'DD.MM.YYYY') AS format_bestaetigtam");
 		$this->addSelect('tbl_prestudentstatus.bestaetigtvon');
 		$this->addSelect('tbl_prestudentstatus.bewerbung_abgeschicktamum');
+		$this->addSelect("TO_CHAR(tbl_prestudentstatus.bewerbung_abgeschicktamum::timestamp, 'DD.MM.YYYY') AS format_bewerbung_abgeschicktamum");
 		$this->addSelect('tbl_prestudentstatus.anmerkung');
 		$this->addSelect('plan.studienplan_id');
 		$this->addSelect('plan.bezeichnung');
+
 		$this->addSelect('grund.beschreibung[(
 			SELECT index 
 			FROM public.tbl_sprache 
@@ -607,6 +611,7 @@ class Prestudentstatus_model extends DB_Model
 			ELSE '-'
 			END AS lehrverband", false);
 
+
 		$this->addJoin('lehre.tbl_studienplan plan', 'studienplan_id', 'LEFT');
 		$this->addJoin('public.tbl_status_grund grund', 'statusgrund_id', 'LEFT');
 		$this->addJoin('public.tbl_student s', 'prestudent_id', 'LEFT');

From fdd30262121d40b8c9d48838b937b4bf56b1d1e3 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 18 Jul 2024 08:53:45 +0200
Subject: [PATCH 0938/1461] adds getAllNationen to the new Profil
 FhcAPIController

---
 .../controllers/api/frontend/v1/Profil.php    | 23 +++++++++++++++++++
 .../EditProfilComponents/EditAdresse.js       |  8 +++----
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Profil.php b/application/controllers/api/frontend/v1/Profil.php
index 401c0b791..00e2b9219 100644
--- a/application/controllers/api/frontend/v1/Profil.php
+++ b/application/controllers/api/frontend/v1/Profil.php
@@ -35,6 +35,7 @@ class Profil extends FHCAPI_Controller
 			'getView' => self::PERM_LOGGED,
             'fotoSperre' => self::PERM_LOGGED,
 			'getGemeinden' => self::PERM_LOGGED,
+			'getAllNationen' => self::PERM_LOGGED,
 			
 		]);
 
@@ -145,6 +146,28 @@ class Profil extends FHCAPI_Controller
         $this->terminateWithSuccess(current($res));
 	}
 
+	/**
+	 * gets all nations in the table bis.tbl_nation
+	 *
+	 * @access public
+	 * @return array all the nations in table bis.tbl_nation
+	 */
+	public function getAllNationen()
+	{
+		// load the nationen from the database
+		$this->load->model('codex/Nation_model', "NationModel");
+		$this->NationModel->addSelect(["nation_code as code", "langtext"]);
+		$nation_res = $this->NationModel->load();
+
+		if (isError($nation_res)) {
+			show_error("error while trying to query table codex.tbl_nation");
+		}
+		
+		$nation_res = $this->getDataOrTerminateWithError($nation_res);
+
+		$this->terminateWithSuccess($nation_res);
+	}
+
 	public function getGemeinden($nation, $zip)
 	{
 		if(!isset($nation) || !isset($zip)){
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js
index e51bef24c..c3f194958 100755
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js
@@ -60,7 +60,6 @@ export default {
           .getGemeinden(this.data.nation, this.data.plz)
           .then((res) => {
             if (res.data.length) {
-              console.log(res.data, "this is the data from the gemeinden");
               this.gemeinden = [
                 ...new Set(
                   res.data.map((element) => {
@@ -119,11 +118,12 @@ export default {
   },
 
   created() {
-    Vue.$fhcapi.UserData.getAllNationen().then((res) => {
+    // get all available nationen
+    this.$fhcApi.factory.profil.getAllNationen().then((res)=>{
       this.nationenList = res.data;
       this.getGemeinde();
-    });
-
+    })
+   
     this.originalValue = JSON.stringify(this.data);
     this.zustellAdressenCount = this.getZustelladressenCount();
   },

From 29aa7f505644f5f92552b20b28292c7d453cbe75 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 18 Jul 2024 09:36:30 +0200
Subject: [PATCH 0939/1461] adds isMitarbeiter to the new Profil
 FhcAPIController

---
 .../controllers/api/frontend/v1/Profil.php    | 26 +++++-
 public/js/api/profil.js                       |  6 +-
 .../ProfilComponents/FetchProfilUpdates.js    | 82 +------------------
 3 files changed, 29 insertions(+), 85 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Profil.php b/application/controllers/api/frontend/v1/Profil.php
index 00e2b9219..ffb7449f8 100644
--- a/application/controllers/api/frontend/v1/Profil.php
+++ b/application/controllers/api/frontend/v1/Profil.php
@@ -36,6 +36,7 @@ class Profil extends FHCAPI_Controller
             'fotoSperre' => self::PERM_LOGGED,
 			'getGemeinden' => self::PERM_LOGGED,
 			'getAllNationen' => self::PERM_LOGGED,
+			'isMitarbeiter' => self::PERM_LOGGED,
 			
 		]);
 
@@ -160,7 +161,7 @@ class Profil extends FHCAPI_Controller
 		$nation_res = $this->NationModel->load();
 
 		if (isError($nation_res)) {
-			show_error("error while trying to query table codex.tbl_nation");
+			$this->terminateWithError("error while trying to query table codex.tbl_nation", self::ERROR_TYPE_GENERAL);
 		}
 		
 		$nation_res = $this->getDataOrTerminateWithError($nation_res);
@@ -278,6 +279,29 @@ class Profil extends FHCAPI_Controller
 		return $res;
 	}
 
+	/**
+	 * checks whether a specific userID is a mitarbeiter or not (foreword declaration of the function isMitarbeiter in Mitarbeiter_model.php)
+	 * @access public
+	 * @param  $uid the userID used to check if it is a mitarbeiter
+	 * @return boolean 
+	 */
+	public function isMitarbeiter($uid)
+	{
+
+		if(!$uid) $this->terminateWithError("No uid provided", self::ERROR_TYPE_GENERAL);
+		
+		
+		$result = $this->MitarbeiterModel->isMitarbeiter($uid);
+		
+		if (isError($result)) {
+			$this->terminateWithError("error when calling Mitarbeiter_model function isMitarbeiter with uid " . $uid, self::ERROR_TYPE_GENERAL);
+		}
+
+		$result = $this->getDataOrTerminateWithError($result);
+		
+		$this->terminateWithSuccess($result);
+	}
+
 	/**
 	 * function that returns the data used for the mitarbeiter profile
 	 * @access private 
diff --git a/public/js/api/profil.js b/public/js/api/profil.js
index eefe7d880..3cb9f34cd 100755
--- a/public/js/api/profil.js
+++ b/public/js/api/profil.js
@@ -33,10 +33,8 @@ export default {
     return this.$fhcApi.get(
       FHC_JS_DATA_STORAGE_OBJECT.app_root + 
       FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-      `/api/frontend/v1/Profil/isMitarbeiter`,
-      {
-        uid:uid,
-      }
+      `/api/frontend/v1/Profil/isMitarbeiter/${uid}`,
+      {}
     );
   },
 
diff --git a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
index 0159f772b..9ae5c5a00 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
@@ -74,11 +74,9 @@ export default {
         files: files,
       };
 
-      //?TODO: check if updateRequest.uid is a mitarbeiter, if so add the flag isMitarbeiter:true
       if (view === "EditAdresse") {
-        const isMitarbeiter = await Vue.$fhcapi.UserData.isMitarbeiter(
-          updateRequest.uid
-        ).then((res) => res.data);
+        
+        const isMitarbeiter = await this.$fhcApi.factory.profil.isMitarbeiter(updateRequest.uid).then((res)=>res.data);
 
         if (isMitarbeiter) {
           content["isMitarbeiter"] = isMitarbeiter;
@@ -141,83 +139,7 @@ export default {
       }
     },
 
-    // OLD way to open the editProfil modal, which was dynamically added to the html and then removed
-    async openModal(updateRequest) {
-      let view = this.getView(updateRequest.topic, updateRequest.status);
-
-      let data = null;
-      let content = null;
-      let files = null;
-      let withFiles = false;
-
-      if (view === "TextInputDokument") {
-        data = {
-          titel: updateRequest.topic,
-          value: updateRequest.requested_change.value,
-        };
-
-        const filesFromDatabase =
-          await Vue.$fhcapi.ProfilUpdate.getProfilRequestFiles(
-            updateRequest.profil_update_id
-          ).then((res) => {
-            return res.data;
-          });
-
-        files = filesFromDatabase;
-        if (files) {
-          withFiles = true;
-        }
-      } else {
-        data = updateRequest.requested_change;
-      }
-
-      content = {
-        updateID: updateRequest.profil_update_id,
-        view: view,
-        data: data,
-        withFiles: withFiles,
-        topic: updateRequest.topic,
-        files: files,
-      };
-
-      //?TODO: check if updateRequest.uid is a mitarbeiter, if so add the flag isMitarbeiter:true
-      if (view === "EditAdresse") {
-        const isMitarbeiter = await Vue.$fhcapi.UserData.isMitarbeiter(
-          updateRequest.uid
-        ).then((res) => res.data);
-
-        if (isMitarbeiter) {
-          content["isMitarbeiter"] = isMitarbeiter;
-        }
-      }
-
-      //? adds the status information if the profil update request was rejected or accepted
-      if (updateRequest.status !== this.profilUpdateStates["Pending"]) {
-        content["status"] = updateRequest.status;
-        content["status_message"] = updateRequest.status_message;
-        content["status_timestamp"] = updateRequest.status_timestamp;
-      }
-
-      //? only show the popup if also the right content is available
-      if (content) {
-        EditProfil.popup({
-          value: content,
-          title: updateRequest.topic,
-          zustellkontakteCount: this.getZustellkontakteCount,
-          zustelladressenCount: this.getZustelladressenCount,
-        })
-          .then((res) => {
-            if (res === true) {
-              this.$emit("fetchUpdates");
-            }
-          })
-          .catch((e) => {
-            // Wenn der User das Modal abbricht ohne Änderungen
-          });
-      }
-    },
   },
-
   created() {},
 
   computed: {},

From 885315c22bcc9cd87e94374c102742320f456b93 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 18 Jul 2024 09:52:08 +0200
Subject: [PATCH 0940/1461] adds getStatus to the new ProfilUpdate
 FhcAPIController

---
 .../api/frontend/v1/ProfilUpdate.php          |  99 ++++++++++++++
 public/js/api/fhcapifactory.js                |   2 +
 public/js/api/profilUpdate.js                 | 129 ++++++++++++++++++
 public/js/apps/Cis/Profil.js                  |   6 +-
 public/js/apps/Cis/ProfilUpdateRequests.js    |   1 +
 5 files changed, 235 insertions(+), 2 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/ProfilUpdate.php
 create mode 100644 public/js/api/profilUpdate.js

diff --git a/application/controllers/api/frontend/v1/ProfilUpdate.php b/application/controllers/api/frontend/v1/ProfilUpdate.php
new file mode 100644
index 000000000..2890b1f59
--- /dev/null
+++ b/application/controllers/api/frontend/v1/ProfilUpdate.php
@@ -0,0 +1,99 @@
+<?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');
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the SearchBarLib (back-end)
+ * Provides data to the ajax get calls about the searchbar component
+ * This controller works with JSON calls on the HTTP GET and the output is always JSON
+ */
+class ProfilUpdate extends FHCAPI_Controller
+{
+
+    public static $STATUS_PENDING = NULL;
+	public static $STATUS_ACCEPTED = NULL;
+	public static $STATUS_REJECTED = NULL;
+
+	public static $TOPICS = [];
+
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+            'getStatus' => self::PERM_LOGGED,
+            'fotoSperre' => self::PERM_LOGGED,
+			
+		]);
+
+
+        $this->load->model('person/Profil_update_model', 'ProfilUpdateModel');
+		$this->load->model('person/Kontakt_model', 'KontaktModel');
+		$this->load->model('person/Adresse_model', 'AdresseModel');
+		$this->load->model('person/Adressentyp_model', 'AdressenTypModel');
+		$this->load->model('person/Person_model', 'PersonModel');
+		$this->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
+		$this->load->model('crm/Student_model', 'StudentModel');
+		$this->load->model('person/Benutzer_model', 'BenutzerModel');
+		$this->load->model('system/Sprache_model', 'SpracheModel');
+		$this->load->model('person/Profil_update_status_model', 'ProfilUpdateStatusModel');
+		$this->load->model('person/Profil_update_topic_model', 'ProfilUpdateTopicModel');
+
+		$this->load->library('DmsLib');
+		$this->load->library('PermissionLib');
+
+		//? put the uid and pid inside the controller for reusability
+		$this->uid = getAuthUID();
+		$this->pid = getAuthPersonID();
+
+		// setup the ProfilUpdate states
+		$this->ProfilUpdateStatusModel->addSelect(['status_kurzbz']);
+		$status_kurzbz = $this->ProfilUpdateStatusModel->load();
+		if (hasData($status_kurzbz)) {
+			list($status_pending, $status_accepted, $status_rejected) = getData($status_kurzbz);
+
+			self::$STATUS_PENDING = $status_pending->status_kurzbz;
+			self::$STATUS_ACCEPTED = $status_accepted->status_kurzbz;
+			self::$STATUS_REJECTED = $status_rejected->status_kurzbz;
+		}
+		// setup the ProfilUpdate topics
+		$this->ProfilUpdateTopicModel->addSelect(['topic_kurzbz']);
+		$topic_kurzbz = $this->ProfilUpdateTopicModel->load();
+
+		if (hasData($topic_kurzbz)) {
+			foreach (getData($topic_kurzbz) as $topic) {
+				self::$TOPICS[$topic->topic_kurzbz] = $topic->topic_kurzbz;
+			}
+		}
+
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+    public function getStatus()
+	{
+		$this->terminateWithSuccess([self::$STATUS_PENDING => self::$STATUS_PENDING, self::$STATUS_ACCEPTED => self::$STATUS_ACCEPTED, self::$STATUS_REJECTED => self::$STATUS_REJECTED]);
+	}
+
+
+}
+	
+   
\ No newline at end of file
diff --git a/public/js/api/fhcapifactory.js b/public/js/api/fhcapifactory.js
index c993a86d6..73ce0dd7f 100644
--- a/public/js/api/fhcapifactory.js
+++ b/public/js/api/fhcapifactory.js
@@ -21,6 +21,7 @@ import navigation from "./navigation.js";
 import filter from "./filter.js";
 import studstatus from "./studstatus.js";
 import profil from "./profil.js";
+import profilUpdate from "./profilUpdate.js";
 
 export default {
     search,
@@ -29,4 +30,5 @@ export default {
     filter,
     studstatus,
     profil,
+    profilUpdate,
 };
diff --git a/public/js/api/profilUpdate.js b/public/js/api/profilUpdate.js
new file mode 100644
index 000000000..08b9ad4b7
--- /dev/null
+++ b/public/js/api/profilUpdate.js
@@ -0,0 +1,129 @@
+export default {
+    //! API calls for profil update requests
+  
+    getStatus: function () {
+        return this.$fhcApi.get(
+        FHC_JS_DATA_STORAGE_OBJECT.app_root +
+        FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+        `/api/frontend/v1/ProfilUpdate/getStatus`,{});
+    },
+  
+    getTopic: function () {
+        return this.$fhcApi.get(
+        FHC_JS_DATA_STORAGE_OBJECT.app_root +
+        FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+        `/Cis/ProfilUpdate/getTopic`,{});
+    },
+  
+    getProfilUpdateRequest: function () {
+
+        return this.$fhcApi.get(
+        FHC_JS_DATA_STORAGE_OBJECT.app_root +
+        FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+        `/Cis/ProfilUpdate/getAllRequests`,{});
+      
+    },
+  
+
+    //TODO post request
+    acceptProfilRequest: function (payload) {
+
+        const url =
+        FHC_JS_DATA_STORAGE_OBJECT.app_root +
+        FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+        "/Cis/ProfilUpdate/acceptProfilRequest";
+      return axios.post(url, payload); 
+    },
+  
+    //TODO post request
+    denyProfilRequest: function (payload) {
+      const url =
+        FHC_JS_DATA_STORAGE_OBJECT.app_root +
+        FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+        "/Cis/ProfilUpdate/denyProfilRequest";
+      return axios.post(url, payload);
+    },
+  
+    //TODO post request
+    replaceProfilUpdateAttachment: function (dms) {
+      const url =
+        FHC_JS_DATA_STORAGE_OBJECT.app_root +
+        FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+        `/Cis/ProfilUpdate/replaceProfilUpdateAttachment`;
+  
+      return axios.post(url, dms, {
+        headers: { "Content-Type": "multipart/form-data" },
+      });
+    },
+  
+    //TODO post request
+    //? new reuquests
+    insertFile: function (dms, replace = null) {
+      const url =
+        FHC_JS_DATA_STORAGE_OBJECT.app_root +
+        FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+        `/Cis/ProfilUpdate/insertFile/${replace}`;
+  
+      return axios.post(url, dms, {
+        headers: { "Content-Type": "multipart/form-data" },
+      });
+    },
+  
+    //TODO post request
+    getProfilRequestFiles: function (requestID) {
+      const url =
+        FHC_JS_DATA_STORAGE_OBJECT.app_root +
+        FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+        `/Cis/ProfilUpdate/getProfilRequestFiles`;
+  
+      return axios.post(url, requestID);
+    },
+  
+    selectProfilRequest: function (uid = null, id = null) {
+
+        return this.$fhcApi.get(
+        FHC_JS_DATA_STORAGE_OBJECT.app_root +
+        FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+        `/Cis/ProfilUpdate/selectProfilRequest`,{ uid: uid, id: id });
+    },
+  
+    //TODO post request
+    insertProfilRequest: function (topic, payload, fileID = null) {
+      const url =
+        FHC_JS_DATA_STORAGE_OBJECT.app_root +
+        FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+        `/Cis/ProfilUpdate/insertProfilRequest`;
+  
+      return axios.post(url, {
+        topic,
+        payload,
+        ...(fileID ? { fileID: fileID } : {}),
+      });
+    },
+  
+    //TODO post request
+    updateProfilRequest: function (topic, payload, ID, fileID = null) {
+      const url =
+        FHC_JS_DATA_STORAGE_OBJECT.app_root +
+        FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+        `/Cis/ProfilUpdate/updateProfilRequest`;
+  
+      return axios.post(url, {
+        topic,
+        payload,
+        ID,
+        ...(fileID ? { fileID: fileID } : {}),
+      });
+    },
+  
+    //TODO post request
+    deleteProfilRequest: function (requestID) {
+      const url =
+        FHC_JS_DATA_STORAGE_OBJECT.app_root +
+        FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+        `/Cis/ProfilUpdate/deleteProfilRequest`;
+  
+      return axios.post(url, requestID);
+    },
+  };
+  
\ No newline at end of file
diff --git a/public/js/apps/Cis/Profil.js b/public/js/apps/Cis/Profil.js
index f2726a3db..728bcd09f 100755
--- a/public/js/apps/Cis/Profil.js
+++ b/public/js/apps/Cis/Profil.js
@@ -353,10 +353,12 @@ const profilApp = Vue.createApp({
     },
   },
 
-  created() {
+  async created() {
     // fetch profilUpdateStates to provide them to children components
-    Vue.$fhcapi.ProfilUpdate.getStatus()
+
+    await this.$fhcApi.factory.profilUpdate.getStatus()
       .then((response) => {
+        console.log(response.data,"this is the response when we set the status")
         this.profilUpdateStates = response.data;
       })
       .catch((error) => {
diff --git a/public/js/apps/Cis/ProfilUpdateRequests.js b/public/js/apps/Cis/ProfilUpdateRequests.js
index f62d096af..c72a7592f 100755
--- a/public/js/apps/Cis/ProfilUpdateRequests.js
+++ b/public/js/apps/Cis/ProfilUpdateRequests.js
@@ -22,6 +22,7 @@ const app = Vue.createApp({
   },
   methods: {},
   created() {
+    console.log("this is the place i am searching for")
     Vue.$fhcapi.ProfilUpdate.getStatus()
       .then((response) => {
         this.profilUpdateStates = response.data;

From 328a46f16dfdee143017b241eea8e7d38db57982 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 18 Jul 2024 10:40:30 +0200
Subject: [PATCH 0941/1461] adds getTopic to the new ProfilUpdate
 FhcAPIController

---
 .../controllers/api/frontend/v1/ProfilUpdate.php       | 10 +++++++++-
 public/js/api/profilUpdate.js                          |  2 +-
 public/js/apps/Cis/Profil.js                           |  3 +--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/application/controllers/api/frontend/v1/ProfilUpdate.php b/application/controllers/api/frontend/v1/ProfilUpdate.php
index 2890b1f59..df594d3cf 100644
--- a/application/controllers/api/frontend/v1/ProfilUpdate.php
+++ b/application/controllers/api/frontend/v1/ProfilUpdate.php
@@ -39,7 +39,7 @@ class ProfilUpdate extends FHCAPI_Controller
 	{
 		parent::__construct([
             'getStatus' => self::PERM_LOGGED,
-            'fotoSperre' => self::PERM_LOGGED,
+            'getTopic' => self::PERM_LOGGED,
 			
 		]);
 
@@ -94,6 +94,14 @@ class ProfilUpdate extends FHCAPI_Controller
 	}
 
 
+    public function getTopic()
+	{
+        if(!count(self::$TOPICS)){
+            $this->terminateWithError('No topics found');
+        }
+		$this->terminateWithSuccess(self::$TOPICS);
+	}
+
 }
 	
    
\ No newline at end of file
diff --git a/public/js/api/profilUpdate.js b/public/js/api/profilUpdate.js
index 08b9ad4b7..5d4978ce4 100644
--- a/public/js/api/profilUpdate.js
+++ b/public/js/api/profilUpdate.js
@@ -12,7 +12,7 @@ export default {
         return this.$fhcApi.get(
         FHC_JS_DATA_STORAGE_OBJECT.app_root +
         FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-        `/Cis/ProfilUpdate/getTopic`,{});
+        `/api/frontend/v1/ProfilUpdate/getTopic`,{});
     },
   
     getProfilUpdateRequest: function () {
diff --git a/public/js/apps/Cis/Profil.js b/public/js/apps/Cis/Profil.js
index 728bcd09f..1fa2e404b 100755
--- a/public/js/apps/Cis/Profil.js
+++ b/public/js/apps/Cis/Profil.js
@@ -358,14 +358,13 @@ const profilApp = Vue.createApp({
 
     await this.$fhcApi.factory.profilUpdate.getStatus()
       .then((response) => {
-        console.log(response.data,"this is the response when we set the status")
         this.profilUpdateStates = response.data;
       })
       .catch((error) => {
         console.error(error);
       });
 
-    Vue.$fhcapi.ProfilUpdate.getTopic()
+    this.$fhcApi.factory.profilUpdate.getTopic()
       .then((response) => {
         this.profilUpdateTopic = response.data;
       })

From 2711113a69a974d70f7c6c55a10c059e429e64d4 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 18 Jul 2024 11:43:08 +0200
Subject: [PATCH 0942/1461] solves column title race condition

---
 .../Cis/ProfilUpdate/ProfilUpdateView.js      | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
index 66420b81a..bf20c1805 100644
--- a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
+++ b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
@@ -45,8 +45,11 @@ export default {
       events: [],
       profil_update_id: Number(this.id),
 
-      // tabulator options
-      profil_updates_table_options: {
+  };
+  },
+  computed:{
+    profilUpdateOptions: function(){
+      return {
         ajaxURL:
           FHC_JS_DATA_STORAGE_OBJECT.app_root +
           FHC_JS_DATA_STORAGE_OBJECT.ci_router +
@@ -187,7 +190,7 @@ export default {
 
         columns: [
           {
-            title: Vue.computed(() => this.$p.t("profilUpdate", "UID")),
+            title: this.$p.t("profilUpdate", "UID"),
             field: "uid",
             minWidth: 200,
             resizable: true,
@@ -195,7 +198,7 @@ export default {
             //responsive:0,
           },
           {
-            title: Vue.computed(() => this.$p.t("profilUpdate", "Name")),
+            title: this.$p.t("profilUpdate", "Name"),
             field: "name",
             minWidth: 200,
             resizable: true,
@@ -203,7 +206,7 @@ export default {
             //responsive:0,
           },
           {
-            title: Vue.computed(() => this.$p.t("profilUpdate", "Topic")),
+            title: this.$p.t("profilUpdate", "Topic"),
             field: "topic",
             resizable: true,
             minWidth: 200,
@@ -211,7 +214,7 @@ export default {
             //responsive:0,
           },
           {
-            title: Vue.computed(() => this.$p.t("profilUpdate", "insertamum")),
+            title: this.$p.t("profilUpdate", "insertamum"),
             field: "insertamum",
             resizable: true,
             headerFilter: true,
@@ -219,7 +222,7 @@ export default {
             //responsive:0,
           },
           {
-            title: Vue.computed(() => this.$p.t("profilUpdate", "Status")),
+            title: this.$p.t("profilUpdate", "Status"),
             field: "status_translated",
             hozAlign: "center",
             headerFilter: true,
@@ -245,7 +248,7 @@ export default {
             //responsive:0,
           },
           {
-            title: Vue.computed(() => this.$p.t("profilUpdate", "actions")),
+            title: this.$p.t("profilUpdate", "actions"),
             headerSort: false,
             formatter: (cell, params) => {
               let STATUS_PENDING =
@@ -293,8 +296,9 @@ export default {
             hozAlign: "center",
           },
         ],
-      },
-    };
+      };
+    }
+    
   },
   methods: {
     denyProfilUpdate: function (data) {
@@ -409,7 +413,7 @@ export default {
     </div>
     <loading ref="loadingModalRef" :timeout="0"></loading>
     
-    <core-filter-cmpt v-if="profilUpdateStates && categoryLoaded" :title="$p.t('profilUpdate','profilUpdateRequests')"  ref="UpdatesTable" :tabulatorEvents="events" :tabulator-options="profil_updates_table_options" tableOnly :sideMenu="false" />
+    <core-filter-cmpt v-if="profilUpdateStates && categoryLoaded" :title="$p.t('profilUpdate','profilUpdateRequests')"  ref="UpdatesTable" :tabulatorEvents="events" :tabulator-options="profilUpdateOptions" tableOnly :sideMenu="false" />
 
     </div>`,
 };

From b62634242aab0d6c4b2d3a55d294dbf77fda1dad Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 18 Jul 2024 12:01:15 +0200
Subject: [PATCH 0943/1461] Bismeldestichtag_model fix missing DateTime

---
 application/models/codex/Bismeldestichtag_model.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/application/models/codex/Bismeldestichtag_model.php b/application/models/codex/Bismeldestichtag_model.php
index bc01f6673..df9e53920 100644
--- a/application/models/codex/Bismeldestichtag_model.php
+++ b/application/models/codex/Bismeldestichtag_model.php
@@ -72,7 +72,9 @@ class Bismeldestichtag_model extends DB_Model
 			return success("0",'No Statusdata vorhanden');
 		}
 		$stichtag = current(getData($result));
-		$stichtag = $stichtag->meldestichtag;
+		$stichtag = new DateTime($stichtag->meldestichtag);
+
+		$statusDatum = new DateTime($status_datum);
 
 		// Prüfen, ob Studentstatusdatum oder Studiensemester vor dem Stichtagsdatum liegen
 		if (isset($statusDatum))

From 7a8d2986af4bf0ba6414f4b8f448338ba760a615 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 18 Jul 2024 12:02:12 +0200
Subject: [PATCH 0944/1461] Checklib fix checkIfExistingStudentRolle &
 checkIfMeldestichtagErreicht

---
 .../libraries/PrestudentstatusCheckLib.php    | 50 +++++++------------
 1 file changed, 18 insertions(+), 32 deletions(-)

diff --git a/application/libraries/PrestudentstatusCheckLib.php b/application/libraries/PrestudentstatusCheckLib.php
index 23afb7563..43fb5ad78 100644
--- a/application/libraries/PrestudentstatusCheckLib.php
+++ b/application/libraries/PrestudentstatusCheckLib.php
@@ -137,31 +137,19 @@ class PrestudentstatusCheckLib
 
 	/**
 	 * Checks if a student role already exists.
-	 * @return error if invalid
-	 * @return error, if role does not exist, else count(roles) if it does
+	 *
+	 * @param integer				$prestudent_id
+	 *
+	 * @return boolean
 	 */
 	public function checkIfExistingStudentRolle($prestudent_id)
 	{
-		$resultApp =  $this->_getApplicationData($prestudent_id);
-		if(isError($resultApp))
-		{
-			return getData($resultApp);
-		}
-		$resultApp =  current(getData($resultApp));
-		$studentName = trim ($resultApp->vorname.' '.$resultApp->nachname);
-
 		$result = $this->_ci->StudentModel->checkIfExistingStudentRolle($prestudent_id);
-		if(isError($result))
-		{
-			return getData($result);
-		}
-		$result = getData($result);
 
-		if($result == '0')
-		{
-			return error($this->_ci->p->t('lehre', 'error_noStudstatus', ['name' => $studentName]));
-		}
-		return success($result);
+		if (isError($result))
+			return $result;
+
+		return success(getData($result) != '0');
 	}
 
 	/**
@@ -276,21 +264,19 @@ class PrestudentstatusCheckLib
 
 	/**
 	 * Check if Bismeldestichtag erreicht
-	 * @param Date $statusDatum
-	 * @return error if Bismeldestichtag erreicht
+	 *
+	 * @param DateTime				$datum
+	 *
+	 * @return boolean
 	 */
-	public function checkIfMeldestichtagErreicht($statusDatum, $studiensemester_kurzbz=null)
+	public function checkIfMeldestichtagErreicht($statusDatum, $studiensemester_kurzbz = null)
 	{
 		$result = $this->_ci->BismeldestichtagModel->checkIfMeldestichtagErreicht($statusDatum, $studiensemester_kurzbz);
-		if(isError($result))
-		{
-			return getData($result);
-		}
-		if(getData($result) == "1")
-		{
-			return error($this->_ci->p->t('lehre','error_dataVorMeldestichtag'));
-		}
-		return success(getData($result));
+		
+		if (isError($result))
+			return $result;
+		
+		return success(getData($result) != "1");
 	}
 
 	/**

From f55b5120ff7c660082df98b88cb0847a91261b81 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 18 Jul 2024 12:03:18 +0200
Subject: [PATCH 0945/1461] Auth_Controller helper function for checking stg
 access rights for a prestudent

---
 application/core/Auth_Controller.php | 44 ++++++++++++++++++++++++++--
 1 file changed, 42 insertions(+), 2 deletions(-)

diff --git a/application/core/Auth_Controller.php b/application/core/Auth_Controller.php
index e9621332f..466627fe3 100644
--- a/application/core/Auth_Controller.php
+++ b/application/core/Auth_Controller.php
@@ -88,6 +88,22 @@ abstract class Auth_Controller extends FHC_Controller
 		}
 	}
 
+	/**
+	 * Checks for Permissions depending on the Studiengang of a Prestudent
+	 * and exits/outputs an error if they are not met.
+	 *
+	 * @param integer 				$prestudent_id
+	 * @param array 				$permStud	Perms if the person is a Student
+	 *
+	 * @return void
+	 */
+	protected function checkPermissionsForPrestudent($prestudent_id, $permStud)
+	{
+		if (!$this->hasPermissionsForPrestudent($prestudent_id, $permStud)) {
+			$this->_outputAuthError([$this->router->method => $permStud]);
+		}
+	}
+
 	/**
 	 * Checks for Permissions depending if the given person is a
 	 * Mitarbeiter and/or Student
@@ -97,11 +113,11 @@ abstract class Auth_Controller extends FHC_Controller
 	 * @param array 				$permMa		Perms if the person is a Mitarbeiter
 	 * @param array 				$permStud	Perms if the person is a Student
 	 *
-	 * @return boolean
+	 * @return integer				0 if permission is granted
 	 */
 	protected function hasPermissionsForPerson($person_id, $permMa, $permStud)
 	{
-		$res = 0;
+		$res = 3;
 		$this->load->model('person/Person_model', 'PersonModel');
 		$this->PersonModel->addJoin('public.tbl_benutzer', 'person_id');
 		$this->PersonModel->addJoin('public.tbl_mitarbeiter', 'uid = mitarbeiter_uid');
@@ -129,6 +145,30 @@ abstract class Auth_Controller extends FHC_Controller
 		return $res;
 	}
 
+	/**
+	 * Checks for Permissions depending on the Studiengang of a Prestudent
+	 * and returns the result.
+	 *
+	 * @param integer 				$prestudent_id
+	 * @param array 				$permStud	Perms if the person is a Student
+	 *
+	 * @return boolean
+	 */
+	protected function hasPermissionsForPrestudent($prestudent_id, $permStud)
+	{
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+		$result = $this->PrestudentModel->load($prestudent_id);
+		if (!hasData($result))
+			show_404();
+		$stg = current(getData($result))->studiengang_kz;
+		foreach ($permStud as $k => $v) {
+			$perm = $this->permissionlib->convertAccessType($v);
+			if ($this->permissionlib->isBerechtigt($perm[0], $perm[1], $stg))
+				return true;
+		}
+		return false;
+	}
+
 	/**
 	 * Outputs an error message and sets the HTTP Header.
 	 * This function is protected so that it can be overwritten.

From e38e45c283c7ba6b9f91da987015b63c7cae9f70 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 18 Jul 2024 12:04:35 +0200
Subject: [PATCH 0946/1461] Status insert-function & better access testing for
 updateStatus-function

---
 .../api/frontend/v1/stv/Status.php            | 104 ++++++++++++++----
 1 file changed, 85 insertions(+), 19 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 8c61fe85a..1229ae861 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -11,6 +11,7 @@ class Status extends FHCAPI_Controller
 	{
 		parent::__construct([
 			'getHistoryPrestudent' => ['admin:r', 'assistenz:r'],
+			'insert' => ['admin:rw', 'assistenz:rw'],
 			'addNewStatus' => ['admin:r', 'assistenz:r', 'student/keine_studstatuspruefung'],
 			//'turnIntoStudent' => ['admin:r', 'assistenz:r', 'student/keine_studstatuspruefung'],
 			'addStudent' => ['admin:r', 'assistenz:r', 'student/keine_studstatuspruefung'],
@@ -21,7 +22,7 @@ class Status extends FHCAPI_Controller
 			'hasStatusBewerber' => self::PERM_LOGGED,
 			'deleteStatus' => ['admin:r','assistenz:r'],
 			'loadStatus' => ['admin:r', 'assistenz:r'],
-			'updateStatus' => ['admin:r', 'assistenz:r'],
+			'updateStatus' => ['admin:rw', 'assistenz:rw'],
 			'advanceStatus' => ['admin:r', 'assistenz:r'],
 			'confirmStatus' => ['admin:r', 'assistenz:r'],
 
@@ -35,6 +36,12 @@ class Status extends FHCAPI_Controller
 		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
 		$this->load->library('PrestudentstatusCheckLib');
 
+		// Additional Permission Checks
+		if ($this->router->method == 'insert' || $this->router->method == 'updateStatus') {
+			$prestudent_id = current(array_slice($this->uri->rsegments, 2));
+			$this->checkPermissionsForPrestudent($prestudent_id, ['admin:rw', 'assistenz:rw']);
+		}
+
 		// Load language phrases
 		$this->loadPhrases([
 			'ui', 'bismeldestichtag','lehre','studierendenantrag'
@@ -50,6 +57,83 @@ class Status extends FHCAPI_Controller
 		$this->terminateWithSuccess($data);
 	}
 
+	public function insert($prestudent_id)
+	{
+		$isBerechtigtNoStudstatusCheck = $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung');
+		$isBerechtigtNoStudstatusCheck = false; // TODO(chris): DEBUG
+
+		$status_kurzbz = $this->input->post('status_kurzbz');
+		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
+		$ausbildungssemester = $this->input->post('ausbildungssemester');
+		$datum = $this->input->post('datum');
+
+
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules(
+			'datum',
+			$this->p->t('global', 'datum'),
+			[
+				'required', // In FAS empty datum results in todays
+				'is_valid_date',
+				['meldestichtag_not_exceeded', function ($value) use ($isBerechtigtNoStudstatusCheck) {
+					if ($isBerechtigtNoStudstatusCheck)
+						return true; // Skip if access right says so
+					
+					$result = $this->prestudentstatuschecklib->checkIfMeldestichtagErreicht($value);
+					
+					return !$this->getDataOrTerminateWithError($result);
+				}]
+			],
+			[
+				'meldestichtag_not_exceeded' => $this->p->t('lehre', 'error_dataVorMeldestichtag')
+			]
+		);
+
+		$this->form_validation->set_rules(
+			'status_kurzbz',
+			$this->p->t('lehre', 'status_rolle'),
+			[
+				'required',
+				['status_stud_exists', function ($value) use ($prestudent_id) {
+					if ($value != 'Student')
+						return true; // Only test if new status is Student
+					
+					$result = $this->prestudentstatuschecklib->checkIfExistingStudentRolle($prestudent_id);
+
+					return $this->getDataOrTerminateWithError($result);
+				}]
+			],
+			[
+				'status_stud_exists' => $this->p->t('lehre', 'error_noStudstatus')
+			]
+		);
+		
+		$this->form_validation->set_rules('studiensemester_kurzbz', $this->p->t('lehre', 'studiensemester'), 'required');
+		
+		$this->form_validation->set_rules('ausbildungssemester', $this->p->t('lehre', 'ausbildungssemester'), 'required');
+
+		$this->form_validation->set_rules('bestaetigtam', $this->p->t('lehre', 'bestaetigt_am'), 'is_valid_date');
+
+		$this->form_validation->set_rules('_default', '', [
+			['rolle_doesnt_exist', function () use ($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester) {
+				if (!$status_kurzbz || !$studiensemester_kurzbz || !$ausbildungssemester)
+					return true; // Error will be handled by the required statements above
+
+				$result = $this->PrestudentstatusModel->load([$ausbildungssemester, $studiensemester_kurzbz, $status_kurzbz, $prestudent_id]);
+
+				return $this->getDataOrTerminateWithError($result);
+			}]
+		], [
+			'rolle_doesnt_exist' => $this->p->t('lehre', 'error_rolleBereitsVorhanden')
+		]);
+		
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		// TODO(chris): IMPLEMENT!
+		$this->terminateWithSuccess($prestudent_id);
+	}
+
 	public function getStatusgruende()
 	{
 		$this->load->model('crm/Statusgrund_model', 'StatusgrundModel');
@@ -1511,24 +1595,6 @@ class Status extends FHCAPI_Controller
 		$isStudent = false;
 		$isBerechtigtNoStudstatusCheck =  $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung');
 
-		//get Studiengang von prestudent_id
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-		$result = $this->PrestudentModel->load([
-			'prestudent_id'=> $key_prestudent_id,
-		]);
-		if(isError($result))
-		{
-			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-		$result = current(getData($result));
-
-		$stg = $result->studiengang_kz;
-
-		if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg))
-		{
-			return $this->terminateWithError($this->p->t('lehre','error_keineSchreibrechte'), self::ERROR_TYPE_GENERAL);
-		}
-
 		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
 
 		$uid = getAuthUID();

From b17195992042dc8ca2a1aa6b7146c7847fbe61da Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 18 Jul 2024 13:19:28 +0200
Subject: [PATCH 0947/1461] Improvements to statusModal & use Status insert
 function in Component

---
 .../Details/Prestudent/MultiStatus.js         | 259 +++++++++---------
 1 file changed, 133 insertions(+), 126 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index 2c469d99b..c6aba8040 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -2,6 +2,7 @@ import {CoreFilterCmpt} from "../../../../filter/Filter.js";
 import BsModal from "../../../../Bootstrap/Modal.js";
 import FormForm from '../../../../Form/Form.js';
 import FormInput from '../../../../Form/Input.js';
+import FormValidation from '../../../../Form/Validation.js';
 
 export default{
 	components: {
@@ -9,6 +10,7 @@ export default{
 		BsModal,
 		FormForm,
 		FormInput,
+		FormValidation,
 	},
 	inject: {
 		defaultSemester: {
@@ -526,6 +528,20 @@ export default{
 					this.resetModal();
 				});
 		},
+		// Manually inserts a new Status with use of the statusModal
+		insertStatus() {
+			this.$refs.statusData
+				.post(
+					'api/frontend/v1/stv/status/insert/' + this.modelValue.prestudent_id,
+					this.statusData
+				)
+				.then(result => {
+					this.reload();
+					this.$reloadList();
+					this.$refs.statusModal.hide();
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
 		addNewStatus(prestudentIds){
 			//Array.isArray(prestudentIds) ? this.modelValue.prestudent_id : [prestudentIds];
 			let changeData = {};
@@ -790,14 +806,14 @@ export default{
 		<div class="stv-list h-100 pt-3">
 			
 			<!--Modal: statusModal-->
-			<BsModal ref="statusModal">
+			<bs-modal ref="statusModal">
 				<template #title>
-					<p v-if="statusNew" class="fw-bold mt-3">{{$p.t('lehre', 'status_new')}}</p>
-					<p v-else class="fw-bold mt-3">{{$p.t('lehre', 'status_edit')}}</p>
+					<p v-if="statusNew" class="fw-bold mt-3">{{$p.t('lehre', 'status_new')}} ({{modelValue.nachname}} {{modelValue.vorname}})</p>
+					<p v-else class="fw-bold mt-3">{{$p.t('lehre', 'status_edit')}} ({{modelValue.nachname}} {{modelValue.vorname}})</p>
 				</template>
 
-				<form-form class="row g-3" ref="statusData">
-					<p class="pt-2 fw-bold">Details {{modelValue.nachname}} {{modelValue.vorname}} </p>
+				<form-form ref="statusData">
+					<form-validation></form-validation>
 					<p v-if="statusData.datum < dataMeldestichtag && !isStatusBeforeStudent">
 						<b>{{$p.t('bismeldestichtag', 'info_MeldestichtagStatusgrund')}}</b>
 					</p>
@@ -805,116 +821,109 @@ export default{
 						<b>{{$p.t('bismeldestichtag', 'info_MeldestichtagStatusgrundSemester')}}</b>
 					</p>
 					<input type="hidden" id="statusId" name="statusId" value="statusData.statusId">
-					<div class="row mb-3">	
-						<form-input
-							required
-							v-model="statusData['status_kurzbz']"
-							name="status_kurzbz"
-							:label="$p.t('lehre/status_rolle')"
-							type="select"
-							:disabled="!statusNew"
-							>
-							<option  value="Interessent">InteressentIn</option>
-							<option  value="Bewerber">BewerberIn</option>
-							<option  value="Aufgenommener">Aufgenommene/r</option>
-							<option  value="Student">StudentIn</option>
-							<option  value="Unterbrecher">UnterbrecherIn</option>
-							<option  value="Diplomand">DiplomandIn</option>
-							<option  value="Incoming">Incoming</option>
-							<option v-if="!statusNew" value="Absolvent">Absolvent</option>
-							<option v-if="!statusNew" value="Abbrecher">Abbrecher</option>
-						</form-input>
-					</div>
-					<div class="row mb-3">		   
-						<form-input
-							type="select"
-							name="studiensemester_kurzbz"
-							:label="$p.t('lehre/studiensemester')"
-							v-model="statusData['studiensemester_kurzbz']"
-							:disabled="statusData.datum < dataMeldestichtag"
+					<form-input
+						container-class="mb-3"
+						required
+						v-model="statusData['status_kurzbz']"
+						name="status_kurzbz"
+						:label="$p.t('lehre/status_rolle')"
+						type="select"
+						:disabled="!statusNew"
 						>
-							<option v-for="sem in lists.studiensemester_desc" :key="sem.studiensemester_kurzbz" :value="sem.studiensemester_kurzbz"  :selected="sem.studiensemester_kurzbz === defaultSemester">{{sem.studiensemester_kurzbz}}</option>
-						</form-input>
-					</div>
+						<option  value="Interessent">InteressentIn</option>
+						<option  value="Bewerber">BewerberIn</option>
+						<option  value="Aufgenommener">Aufgenommene/r</option>
+						<option  value="Student">StudentIn</option>
+						<option  value="Unterbrecher">UnterbrecherIn</option>
+						<option  value="Diplomand">DiplomandIn</option>
+						<option  value="Incoming">Incoming</option>
+						<option v-if="!statusNew" value="Absolvent">Absolvent</option>
+						<option v-if="!statusNew" value="Abbrecher">Abbrecher</option>
+					</form-input>
+					<form-input
+						container-class="mb-3"
+						type="select"
+						name="studiensemester_kurzbz"
+						:label="$p.t('lehre/studiensemester')"
+						v-model="statusData['studiensemester_kurzbz']"
+						:disabled="statusData.datum < dataMeldestichtag"
+						>
+						<option v-for="sem in lists.studiensemester_desc" :key="sem.studiensemester_kurzbz" :value="sem.studiensemester_kurzbz"  :selected="sem.studiensemester_kurzbz === defaultSemester">{{sem.studiensemester_kurzbz}}</option>
+					</form-input>
 					<!-- TODO(manu) if(defined('VORRUECKUNG_STATUS_MAX_SEMESTER') && VORRUECKUNG_STATUS_MAX_SEMESTER==false) 100 Semester-->
-					<div class="row mb-3">
-						<form-input
-							type="select"
-							name="ausbildungssemester"
-							:label="$p.t('lehre/ausbildungssemester')"
-							v-model="statusData.ausbildungssemester"
-							:disabled="statusData.datum < dataMeldestichtag && !isStatusBeforeStudent"
+					<form-input
+						container-class="mb-3"
+						type="select"
+						name="ausbildungssemester"
+						:label="$p.t('lehre/ausbildungssemester')"
+						v-model="statusData.ausbildungssemester"
+						:disabled="statusData.datum < dataMeldestichtag && !isStatusBeforeStudent"
 						>
-						 <option v-for="number in maxSem" :key="number" :value="number">{{ number }}</option>
-						</form-input>
-					</div>
-					
-					<div class="row mb-3">
-						<form-input
-							type="DatePicker"
-							name="datum"
-							:label="$p.t('global/datum')"
-							v-model="statusData.datum"
-							auto-apply
-							:enable-time-picker="false"
-							format="dd.MM.yyyy"
-							preview-format="dd.MM.yyyy"
-							:teleport="true"
-							:disabled="statusData.datum < dataMeldestichtag"
-						></form-input>
-					</div>
-					<div class="row mb-3">
-						<form-input
-							type="DatePicker"
-							name="bestaetigtam"
-							:label="$p.t('lehre/bestaetigt_am')"
-							v-model="statusData.bestaetigtam"
-							auto-apply
-							:enable-time-picker="false"
-							format="dd.MM.yyyy"
-							preview-format="dd.MM.yyyy"
-							:teleport="true"
-							:disabled="statusData.datum < dataMeldestichtag"
-						></form-input>
-					</div>
-					<div class="row mb-3">
-						<form-input
-							type="DatePicker"
-							name="bewerbung_abgeschickt_am"
-							:label="$p.t('lehre/bewerbung_abgeschickt_am')"
-							v-model="statusData['bewerbung_abgeschicktamum']"
-							auto-apply
-							:enable-time-picker="false"
-							format="dd.MM.yyyy"
-							preview-format="dd.MM.yyyy"
-							:teleport="true"
-							:disabled="statusData.datum < dataMeldestichtag"
-						></form-input>
-					</div>
-					<div class="row mb-3">
-						<form-input
-							type="select"
-							name="studienplan"
-							:label="$p.t('lehre/studienplan')"
-							v-model="statusData['studienplan_id']"
-							:disabled="statusData.datum < dataMeldestichtag"
+					 <option v-for="number in maxSem" :key="number" :value="number">{{ number }}</option>
+					</form-input>
+					<form-input
+						container-class="mb-3"
+						type="DatePicker"
+						name="datum"
+						:label="$p.t('global/datum')"
+						v-model="statusData.datum"
+						auto-apply
+						:enable-time-picker="false"
+						format="dd.MM.yyyy"
+						preview-format="dd.MM.yyyy"
+						:teleport="true"
+						:disabled="statusData.datum < dataMeldestichtag"
+						>
+					</form-input>
+					<form-input
+						container-class="mb-3"
+						type="DatePicker"
+						name="bestaetigtam"
+						:label="$p.t('lehre/bestaetigt_am')"
+						v-model="statusData.bestaetigtam"
+						auto-apply
+						:enable-time-picker="false"
+						format="dd.MM.yyyy"
+						preview-format="dd.MM.yyyy"
+						:teleport="true"
+						:disabled="statusData.datum < dataMeldestichtag"
+						>
+					</form-input>
+					<form-input
+						container-class="mb-3"
+						type="DatePicker"
+						name="bewerbung_abgeschickt_am"
+						:label="$p.t('lehre/bewerbung_abgeschickt_am')"
+						v-model="statusData['bewerbung_abgeschicktamum']"
+						auto-apply
+						:enable-time-picker="false"
+						format="dd.MM.yyyy"
+						preview-format="dd.MM.yyyy"
+						:teleport="true"
+						:disabled="statusData.datum < dataMeldestichtag"
+						>
+					</form-input>
+					<form-input
+						container-class="mb-3"
+						type="select"
+						name="studienplan"
+						:label="$p.t('lehre/studienplan')"
+						v-model="statusData['studienplan_id']"
+						:disabled="statusData.datum < dataMeldestichtag"
 						>		
-							<option v-for="sp in listStudienplaene" :key="sp.studienplan_id" :value="sp.studienplan_id">{{sp.bezeichnung}}</option>
-						</form-input>
-					</div>
-					<div class="row mb-3">
-						<form-input
-							type="text"
-							name="anmerkung"
-							:label="$p.t('global/anmerkung')"
-							v-model="statusData['anmerkung']"
-							:disabled="statusData.datum < dataMeldestichtag"
+						<option v-for="sp in listStudienplaene" :key="sp.studienplan_id" :value="sp.studienplan_id">{{sp.bezeichnung}}</option>
+					</form-input>
+					<form-input
+						container-class="mb-3"
+						type="text"
+						name="anmerkung"
+						:label="$p.t('global/anmerkung')"
+						v-model="statusData['anmerkung']"
+						:disabled="statusData.datum < dataMeldestichtag"
 						>						
-						</form-input>
-					</div>
-					
-					<div class="row mb-3">								   
-						<form-input
+					</form-input>
+					<form-input
+						container-class="mb-3"
 						type="select"
 						name="aufnahmestufe"
 						:label="$p.t('lehre/aufnahmestufe')"
@@ -923,30 +932,28 @@ export default{
 						>
 						<option value="">-- {{$p.t('fehlermonitoring', 'keineAuswahl')}} --</option>
 						<option v-for="entry in aufnahmestufen" :key="entry" :value="entry">{{entry}}</option>
-						</form-input>
-					</div>
+					</form-input>
 									
-					<div v-if="gruende.length > 0" class="row mb-3">
-						<form-input
-							type="select"
-							name="statusgrund"
-							:label="$p.t('studierendenantrag/antrag_grund')"
-							v-model="statusData['statusgrund_id']"
-							>
-							<option value="">-- {{$p.t('fehlermonitoring', 'keineAuswahl')}} --</option>
-							<option v-for="grund in gruende" :key="grund.statusgrund_id" :value="grund.statusgrund_id">{{grund.bezeichnung}}</option>
-						</form-input>
-					</div>
+					<form-input
+					 	v-if="gruende.length > 0"
+					 	container-class="mb-3"
+						type="select"
+						name="statusgrund"
+						:label="$p.t('studierendenantrag/antrag_grund')"
+						v-model="statusData['statusgrund_id']"
+						>
+						<option value="">-- {{$p.t('fehlermonitoring', 'keineAuswahl')}} --</option>
+						<option v-for="grund in gruende" :key="grund.statusgrund_id" :value="grund.statusgrund_id">{{grund.bezeichnung}}</option>
+					</form-input>
 				
 				</form-form>
 				
 				<template #footer>
-					<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{$p.t('ui', 'abbrechen')}}</button>
-					<button v-if="statusNew" type="button" class="btn btn-primary" @click="addNewStatus()">OK</button>
+					<button v-if="statusNew" type="button" class="btn btn-primary" @click="insertStatus">OK</button>
 					<button v-else type="button" class="btn btn-primary" @click="editStatus()">OK</button>
 				</template>
 								
-			</BsModal>
+			</bs-modal>
 				
 			<!--Modal: Confirm Abbruch-->
 			<BsModal ref="confirmStatusAction">

From 3514b02960dc0fc68cc49d8e6d7a096a9d0580b0 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 18 Jul 2024 13:27:30 +0200
Subject: [PATCH 0948/1461] Status: Saver list reload

---
 .../Studentenverwaltung/Details/Prestudent/MultiStatus.js  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index c6aba8040..a66631187 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -293,7 +293,12 @@ export default{
 			deep: true
 		},
 		modelValue(){
-			this.$refs.table.tabulator.setData('api/frontend/v1/stv/Status/getHistoryPrestudent/' + this.modelValue.prestudent_id);
+			if (this.$refs.table) {
+				if (this.$refs.table.tableBuilt)
+					this.$refs.table.tabulator.setData('api/frontend/v1/stv/Status/getHistoryPrestudent/' + this.modelValue.prestudent_id);
+				else
+					this.data.tabulatorOptions.ajaxURL = 'api/frontend/v1/stv/Status/getHistoryPrestudent/' + this.modelValue.prestudent_id;
+			}
 		}
 	},
 	methods: {

From 69b88b35b9f84f1ce35346e731d386edb1603f0e Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 18 Jul 2024 13:28:18 +0200
Subject: [PATCH 0949/1461] Status: person name in phrase for modal header

---
 .../Studentenverwaltung/Details/Prestudent/MultiStatus.js | 5 ++---
 system/phrasesupdate.php                                  | 8 ++++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index a66631187..9fefcb842 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -813,8 +813,7 @@ export default{
 			<!--Modal: statusModal-->
 			<bs-modal ref="statusModal">
 				<template #title>
-					<p v-if="statusNew" class="fw-bold mt-3">{{$p.t('lehre', 'status_new')}} ({{modelValue.nachname}} {{modelValue.vorname}})</p>
-					<p v-else class="fw-bold mt-3">{{$p.t('lehre', 'status_edit')}} ({{modelValue.nachname}} {{modelValue.vorname}})</p>
+					$p.t('lehre', statusNew ? 'status_new' : 'status_edit', modelValue)
 				</template>
 
 				<form-form ref="statusData">
@@ -962,7 +961,7 @@ export default{
 				
 			<!--Modal: Confirm Abbruch-->
 			<BsModal ref="confirmStatusAction">
-				<template #title>{{$p.t('lehre', 'status_edit')}}</template>
+				<template #title>{{$p.t('lehre', 'status_edit', modelValue)}}</template>
 				<template #default>
 					<div v-if="prestudentIds.length == 1">
 						<p>Diese Person wirklich zum {{actionStatusText}} machen?</p>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index eb1904515..b6cfe2dac 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -27264,13 +27264,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Neuen Status hinzufügen',
+				'text' => 'Neuen Status hinzufügen ({vorname} {nachname})',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'add new status',
+				'text' => 'add new status ({vorname} {nachname})',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -27284,13 +27284,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Status bearbeiten',
+				'text' => 'Status bearbeiten ({vorname} {nachname})',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'edit status',
+				'text' => 'edit status ({vorname} {nachname})',
 				'description' => '',
 				'insertvon' => 'system'
 			)

From 5c4c3872f0c5b0d52b7a90ffbbd4e77ea9ad6fd7 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 18 Jul 2024 13:32:19 +0200
Subject: [PATCH 0950/1461] Fix missing {{ }}

---
 .../Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index 9fefcb842..dfceca4e5 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -813,7 +813,7 @@ export default{
 			<!--Modal: statusModal-->
 			<bs-modal ref="statusModal">
 				<template #title>
-					$p.t('lehre', statusNew ? 'status_new' : 'status_edit', modelValue)
+					{{ $p.t('lehre', statusNew ? 'status_new' : 'status_edit', modelValue) }}
 				</template>
 
 				<form-form ref="statusData">

From f4376d44a2a25eba896588a14a9630af44541e3d Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 18 Jul 2024 13:40:52 +0200
Subject: [PATCH 0951/1461] Fix Bugs in Bismeldestichtag_model
 checkIfMeldestichtagErreicht

---
 application/models/codex/Bismeldestichtag_model.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/application/models/codex/Bismeldestichtag_model.php b/application/models/codex/Bismeldestichtag_model.php
index df9e53920..319aa7be7 100644
--- a/application/models/codex/Bismeldestichtag_model.php
+++ b/application/models/codex/Bismeldestichtag_model.php
@@ -54,19 +54,18 @@ class Bismeldestichtag_model extends DB_Model
 			);
 			if(isError($result))
 			{
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return $this->outputJson(getError($result));
+				return $result;
 			}
 			$result = current(getData($result));
 
-			$studiensemester_ende = $result->ende;
+			$studiensemester_ende = new DateTime($result->ende);
 		}
 
 		// letztes erreichtes Bismeldedatum holen
 		$result = $this->getLastReachedMeldestichtag();
 		if (isError($result))
 		{
-			return error($result);
+			return $result;
 		}
 		if (!hasData($result)) {
 			return success("0",'No Statusdata vorhanden');
@@ -88,7 +87,7 @@ class Bismeldestichtag_model extends DB_Model
 			$erreicht = $erreicht || $studiensemester_ende < $stichtag;
 		}
 
-		if($erreicht)
+		if ($erreicht)
 			return success("1", "Studentstatus mit Datum oder Semesterende vor erreichtem Meldestichtag können nicht hinzugefügt werden");
 
 		return success("0", "Meldestatus nicht erreicht");

From 605ecb164a4cb28a98e20fe55523bafeff7a98fa Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 18 Jul 2024 13:50:30 +0200
Subject: [PATCH 0952/1461] Status: clear validation for statusModal

---
 .../Studentenverwaltung/Details/Prestudent/MultiStatus.js    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index dfceca4e5..bc192fc57 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -311,6 +311,7 @@ export default{
 			this.statusData.datum = this.getDefaultDate();
 			this.statusData.bestaetigtam = this.getDefaultDate();
 			this.statusData.name = this.modelValue.vorname + ' ' + this.modelValue.nachname;
+			this.$refs.statusData.clearValidation();
 			this.$refs.statusModal.show();
 		},
 		actionEditStatus(status, stdsem, ausbildungssemester){
@@ -322,8 +323,10 @@ export default{
 				'ausbildungssemester': ausbildungssemester
 			};
 			this.loadStatus(this.statusId).then(() => {
-				if(this.statusData)
+				if(this.statusData) {
+					this.$refs.statusData.clearValidation();
 					this.$refs.statusModal.show();
+				}
 			});
 		},
 		actionDeleteStatus(status, stdsem, ausbildungssemester){

From 7db059b910458ec61e91944f62da7152f1bd5f54 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 18 Jul 2024 13:51:14 +0200
Subject: [PATCH 0953/1461] PrestudentCheckLib: correct return value for
 checkIfMeldestichtagErreicht

---
 application/libraries/PrestudentstatusCheckLib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/libraries/PrestudentstatusCheckLib.php b/application/libraries/PrestudentstatusCheckLib.php
index 43fb5ad78..c458bf907 100644
--- a/application/libraries/PrestudentstatusCheckLib.php
+++ b/application/libraries/PrestudentstatusCheckLib.php
@@ -276,7 +276,7 @@ class PrestudentstatusCheckLib
 		if (isError($result))
 			return $result;
 		
-		return success(getData($result) != "1");
+		return success(getData($result) == "1");
 	}
 
 	/**

From 9a4061910acfab05a8c1726a1f73f9198e2c818c Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 18 Jul 2024 13:51:44 +0200
Subject: [PATCH 0954/1461] Status insert-function: some updates

---
 application/controllers/api/frontend/v1/stv/Status.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 1229ae861..a55b3f19d 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -44,7 +44,7 @@ class Status extends FHCAPI_Controller
 
 		// Load language phrases
 		$this->loadPhrases([
-			'ui', 'bismeldestichtag','lehre','studierendenantrag'
+			'global', 'ui', 'bismeldestichtag','lehre','studierendenantrag'
 		]);
 	}
 
@@ -76,9 +76,12 @@ class Status extends FHCAPI_Controller
 			[
 				'required', // In FAS empty datum results in todays
 				'is_valid_date',
+				// TODO(chris): before today
 				['meldestichtag_not_exceeded', function ($value) use ($isBerechtigtNoStudstatusCheck) {
 					if ($isBerechtigtNoStudstatusCheck)
 						return true; // Skip if access right says so
+					if (!$value)
+						return true; // Error will be handled by the required statement above
 					
 					$result = $this->prestudentstatuschecklib->checkIfMeldestichtagErreicht($value);
 					
@@ -122,7 +125,7 @@ class Status extends FHCAPI_Controller
 
 				$result = $this->PrestudentstatusModel->load([$ausbildungssemester, $studiensemester_kurzbz, $status_kurzbz, $prestudent_id]);
 
-				return $this->getDataOrTerminateWithError($result);
+				return !$this->getDataOrTerminateWithError($result);
 			}]
 		], [
 			'rolle_doesnt_exist' => $this->p->t('lehre', 'error_rolleBereitsVorhanden')

From ddd4d5bafeee74718b2362f4333a824216771936 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 18 Jul 2024 14:03:15 +0200
Subject: [PATCH 0955/1461] parses the links in the moodle addon dynamically,
 so that other addons can easily override the phrase used for the links

---
 application/controllers/api/frontend/v1/LvMenu.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/application/controllers/api/frontend/v1/LvMenu.php b/application/controllers/api/frontend/v1/LvMenu.php
index 67adaf96c..08d44821e 100644
--- a/application/controllers/api/frontend/v1/LvMenu.php
+++ b/application/controllers/api/frontend/v1/LvMenu.php
@@ -379,6 +379,7 @@ class LvMenu extends FHCAPI_Controller
 					'name'=>$p->t('lehre/gesamtnote'),
 					'c4_icon'=> base_url('skin/images/button_endnote.png'),
 					'c4_link'=> base_url('cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php?lvid='.urlencode($lvid).'&stsem='.urlencode($angezeigtes_stsem))
+					//'c4_link'=> base_url('benotungstool/lvgesamtnoteverwalten.php?lvid='.urlencode($lvid).'&stsem='.urlencode($angezeigtes_stsem))
 				);
 			}
 			else
@@ -388,8 +389,8 @@ class LvMenu extends FHCAPI_Controller
 					'id'=>'core_menu_gesamtnote',
 					'position'=>'80',
 					'name'=>$p->t('lehre/gesamtnote'),
-					'c4_icon'=>'skin/images/button_endnote.png',
-					'c4_link'=>'',
+					'c4_icon'=>base_url('skin/images/button_endnote.png'),
+					'c4_link'=>'#',
 					'c4_linkList'=>[[$p->t('lehre/noteneingabedeaktiviert'),'#']],
 				);
 			}

From de41668e71a6d7c1e38b69678d381a2db9bc6766 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 18 Jul 2024 16:46:07 +0200
Subject: [PATCH 0956/1461] ToolbarInteressent, Start with Actions Interessent

---
 public/css/Studentenverwaltung.css            |  17 ++
 .../Details/Prestudent/MultiStatus.js         | 220 ++++++++++++++++--
 2 files changed, 224 insertions(+), 13 deletions(-)

diff --git a/public/css/Studentenverwaltung.css b/public/css/Studentenverwaltung.css
index 1fa35623e..ff7fbb09f 100644
--- a/public/css/Studentenverwaltung.css
+++ b/public/css/Studentenverwaltung.css
@@ -47,6 +47,23 @@ html {
 	color: var(--gray-500);
 }
 
+/* Dropdown Toolbar Interessent, submenu */
+.dropdown-menu-right {
+	left: 100%;
+	top: 5;
+	margin-left: 0.1rem;
+	margin-top: -1rem;
+}
+
+.dropdown-submenu:hover>.dropdown-menu-right {
+	display: block;
+}
+
+.dropdown-submenu>.dropdown-menu-right {
+	display: none;
+	position: absolute;
+}
+
 @media (min-width: 768px) {
 	#sidebarMenu {
 		visibility: visible!important;
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index bc192fc57..09a132809 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -107,6 +107,25 @@ export default{
 		isStatusBeforeStudent(){
 			let isStatusStudent = ['Student', 'Absolvent', 'Diplomand'];
 			return !isStatusStudent.includes(this.statusData.status_kurzbz);
+		},
+		showToolbarStudent() {
+			if (Array.isArray(this.modelValue)) {
+				if (!this.modelValue.length)
+					return false;
+				return this.modelValue.every(item => item.uid);
+			}
+			return !!this.modelValue.uid;
+		},
+		showToolbar() {
+			return this.showToolbarStudent || this.showToolbarInteressent;
+		},
+		showToolbarInteressent() {
+			if (Array.isArray(this.modelValue)) {
+				if (!this.modelValue.length)
+					return false;
+				return !this.modelValue.some(item => item.uid);
+			}
+			return !this.modelValue.uid;
 		}
 	},
 	props: {
@@ -482,6 +501,68 @@ export default{
 			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData}));
 			this.addNewStatus(prestudentIds);
 		},
+		changeStatusToBewerber(prestudentIds){
+			let def_date = this.getDefaultDate();
+			let deltaData =
+				{
+					status_kurzbz: 'Bewerber',
+					datum: def_date,
+					bestaetigtam: def_date,
+					ausbildungssemester: 1
+				};
+
+			this.newArray = this.updateData.map(objekt => ({
+				...objekt,
+				...deltaData}));
+			this.addNewStatus(prestudentIds);
+		},
+		changeStatusToAufgenommener(prestudentIds){
+			this.hideModal('confirmStatusAction');
+			let def_date = this.getDefaultDate();
+			let deltaData =
+				{
+					status_kurzbz: 'Aufgenommener',
+					datum: def_date,
+					bestaetigtam: def_date
+				};
+
+			this.newArray = this.updateData.map(objekt => ({
+				...objekt,
+				...deltaData,
+					}));
+
+			//TODO(Manu) change studiensemester_kurzbz in backend
+			//studiensemester_kurzbz: this.getStudiensemesterOfBewerber(objekt.prestudent_id)
+			this.addNewStatus(prestudentIds);
+
+		},
+		changeInteressentToStudent(prestudentIds){
+
+			console.log("in function changeInteressentToStudent")
+			let def_date = this.getDefaultDate();
+			let deltaData =
+				{
+					status_kurzbz: 'Student',
+					datum: def_date,
+					bestaetigtam: def_date
+				};
+
+			this.newArray = this.updateData.map(objekt => ({
+				...objekt,
+				...deltaData,
+					}));
+
+			//TODO(Manu) change studiensemester_kurzbz in backend
+			//studiensemester_kurzbz: this.getStudiensemesterOfBewerber(objekt.prestudent_id)
+			//this.addStudent(prestudentIds);
+
+		},
+		changeStatusToAbgewiesen(prestudentIds){
+			console.log("in function changeStatusToAbgewiesen");
+		},
+		changeStatusToWartend(prestudentIds){	
+			console.log("in function changeStatusToWartend");
+		},
 		addStudent(prestudentIds){
 
 			let changeData = {};
@@ -603,15 +684,15 @@ export default{
 					 }
 
 					 //TODO(Manu) bei status Interessent, Bewerber, aufgenommener, reload nicht working
-					 this.reload();
-					 this.reloadList();
+					//  this.reload();
+					//  this.reloadList();
 
-					// if (this.modelValue.prestudent_id) {
-					// 	this.reload();
-					// }
-					// else {
-					// 	this.$reloadList();
-					// }
+					if (this.modelValue.prestudent_id) {
+						this.reload();
+					}
+					else {
+						this.$reloadList();
+					}
 					this.hideModal('statusModal');
 					this.resetModal();
 				});
@@ -983,6 +1064,18 @@ export default{
 					</div>
 					<div v-if="actionButton=='unterbrecher'">
 						<button  ref="Close" type="button" class="btn btn-primary" @click="changeStatusToUnterbrecher(prestudentIds)">OK</button>
+					</div>
+					<div v-if="actionButton=='aufgenommener'">
+						<button  ref="Close" type="button" class="btn btn-primary" @click="changeStatusToAufgenommener(prestudentIds)">OK</button>
+					</div>
+					<div v-if="actionButton=='student'">
+						<button  ref="Close" type="button" class="btn btn-primary" @click="changeInteressentToStudent(prestudentIds)">OK</button>
+					</div>
+					<div v-if="actionButton=='wartender'">
+						<button  ref="Close" type="button" class="btn btn-primary" @click="changeStatusToWartend(prestudentIds)">OK</button>
+					</div>
+					<div v-if="actionButton=='abgewiesener'">
+						<button  ref="Close" type="button" class="btn btn-primary" @click="changeStatusToAbgewiesen(prestudentIds)">OK</button>
 					</div>					
 				</template>
 			</BsModal>
@@ -1047,8 +1140,59 @@ export default{
 						<button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
 							{{$p.t('lehre', 'btn_statusAendern')}}
 						</button>
+												
+						<!--toolbar Interessent-->		
+						<ul v-if="showToolbarInteressent" class="dropdown-menu">
+							<li class="dropdown-submenu">
+								<a class="dropdown-item" @click="changeStatusToBewerber(prestudentIds)">Bewerber</a>
+							</li>
+							<li class="dropdown-submenu">
+								<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'aufgenommener','Aufgenommenen')">Aufgenommener</a>
+							</li>				
+							<li class="dropdown-submenu">
+								<a class="dropdown-item dropdown-toggle" href="#">Student</a>
+								<ul class="dropdown-menu dropdown-menu-right">
+									<li>
+										<a class="dropdown-item" @click="changeInteressentToStudent(prestudentIds)">Student</a>
+									</li>
+									<li>
+										<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'student', 'PreAbbrecher')">Pre-Abbrecher</a>
+									</li>
+									<li>
+										<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'student', 'PreWiederholer')">Pre-Wiederholer</a>
+									</li>
+									<li>
+										<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'student', 'Wiederholer')">Wiederholer</a>
+									</li>
+								</ul>
+							</li>
+							<li class="dropdown-submenu">
+								<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'wartender', 'Wartenden')">Wartender</a>
+							</li>
+							<li class="dropdown-submenu">
+								<a class="dropdown-item" @click="changeStatusToAbsolvent(prestudentIds)">Absolvent</a>
+							</li>
+							<li class="dropdown-submenu">
+								<a class="dropdown-item dropdown-toggle" href="#">Absage</a>
+								<ul class="dropdown-menu dropdown-menu-right">
+									<li>
+										<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'abgewiesener', 'Abgewiesenen')">Aufnahme in anderen Studiengang</a>
+									</li>
+									<li>
+										<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'abgewiesener', 'Abgewiesenen')">Keine Antwort</a>
+									</li>
+									<li>
+										<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'abgewiesener', 'Abgewiesenen')">Sonstiges</a>
+									</li>
+									<li>
+										<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'abgewiesener', 'Abgewiesenen')">...</a>
+									</li>
+								</ul>
+							</li>					
+						</ul>
 					
-						<ul class="dropdown-menu">
+						<!--toolbar Student-->
+						<ul v-if="showToolbarStudent" class="dropdown-menu">
 							<li class="dropdown-submenu">
 								<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'abbrecherStgl', 'Abbrecher')">Abbrecher durch Stgl</a>
 							</li>
@@ -1073,6 +1217,7 @@ export default{
 						</ul>
 					</div>
 				</template>
+
 			</core-filter-cmpt>
 			
 			<div 
@@ -1080,12 +1225,63 @@ export default{
 				ref="buttonsStatusMulti"
 			>	
 			<!--MultiSelectButton-->
-			<div class="btn-group">						
+			<div v-if="showToolbar" class="btn-group">						
 				<button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
 					Status Ändern
 				</button>
 							
-				<ul class="dropdown-menu">
+				<!--toolbar Interessent-->		
+				<ul v-if="showToolbarInteressent" class="dropdown-menu">
+					<li class="dropdown-submenu">
+						<a class="dropdown-item" @click="changeStatusToBewerber(prestudentIds)">Bewerber</a>
+					</li>
+					<li class="dropdown-submenu">
+						<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'aufgenommener','Aufgenommenen')">Aufgenommener</a>
+					</li>				
+					<li class="dropdown-submenu">
+						<a class="dropdown-item dropdown-toggle" href="#">Student</a>
+						<ul class="dropdown-menu dropdown-menu-right">
+							<li>
+								<a class="dropdown-item" @click="changeStatusToStudent(prestudentIds)">Student</a>
+							</li>
+							<li>
+								<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'student', 'PreAbbrecher')">Pre-Abbrecher</a>
+							</li>
+							<li>
+								<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'student', 'PreWiederholer')">Pre-Wiederholer</a>
+							</li>
+							<li>
+								<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'student', 'Wiederholer')">Wiederholer</a>
+							</li>
+						</ul>
+					</li>
+					<li class="dropdown-submenu">
+						<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'wartender', 'Wartenden')">Wartender</a>
+					</li>
+					<li class="dropdown-submenu">
+						<a class="dropdown-item" @click="changeStatusToAbsolvent(prestudentIds)">Absolvent</a>
+					</li>
+					<li class="dropdown-submenu">
+						<a class="dropdown-item dropdown-toggle" href="#">Absage</a>
+						<ul class="dropdown-menu dropdown-menu-right">
+							<li>
+								<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'abgewiesener', 'Abgewiesenen')">Aufnahme in anderen Studiengang</a>
+							</li>
+							<li>
+								<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'abgewiesener', 'Abgewiesenen')">Keine Antwort</a>
+							</li>
+							<li>
+								<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'abgewiesener', 'Abgewiesenen')">Sonstiges</a>
+							</li>
+							<li>
+								<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'abgewiesener', 'Abgewiesenen')">...</a>
+							</li>
+						</ul>
+					</li>					
+				</ul>
+			
+				<!--toolbar Student-->
+				<ul v-if="showToolbarStudent" class="dropdown-menu">
 					<li class="dropdown-submenu">
 						<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'abbrecherStgl', 'Abbrecher')">Abbrecher durch Stgl</a>
 					</li>
@@ -1109,8 +1305,6 @@ export default{
 					</li>							
 				</ul>
 			</div>
-			
-			</div>
 		
 		</div>`
 

From dcb001e0d9b510d2c25bcd702c600b093d988c5f Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 19 Jul 2024 07:52:52 +0200
Subject: [PATCH 0957/1461] rename addNewStatus to changeStatus

---
 .../api/frontend/v1/stv/Status.php            |  6 +-
 .../Details/Prestudent/MultiStatus.js         | 57 ++++++++++---------
 2 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index a55b3f19d..8d7a9df20 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -12,7 +12,7 @@ class Status extends FHCAPI_Controller
 		parent::__construct([
 			'getHistoryPrestudent' => ['admin:r', 'assistenz:r'],
 			'insert' => ['admin:rw', 'assistenz:rw'],
-			'addNewStatus' => ['admin:r', 'assistenz:r', 'student/keine_studstatuspruefung'],
+			'changeStatus' => ['admin:r', 'assistenz:r', 'student/keine_studstatuspruefung'],
 			//'turnIntoStudent' => ['admin:r', 'assistenz:r', 'student/keine_studstatuspruefung'],
 			'addStudent' => ['admin:r', 'assistenz:r', 'student/keine_studstatuspruefung'],
 			'getStatusgruende' => self::PERM_LOGGED,
@@ -201,7 +201,7 @@ class Status extends FHCAPI_Controller
 		return $this->terminateWithSuccess($result);
 	}
 
-	public function addNewStatus($prestudent_id)
+	public function changeStatus($prestudent_id)
 	{
 		//get Studiengang von prestudent_id
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
@@ -780,7 +780,7 @@ class Status extends FHCAPI_Controller
 
 	// 	}
 	// 	else
-	// 		return $this->terminateWithError("addNewStatus(student)", self::ERROR_TYPE_GENERAL);
+	// 		return $this->terminateWithError("changeStatus(student)", self::ERROR_TYPE_GENERAL);
 	// }
 
 	public function addStudent($prestudent_id)
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index 09a132809..0b44431a5 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -413,51 +413,55 @@ export default{
 		},
 		changeStatusToAbbrecherStgl(prestudentIds){
 			this.hideModal('confirmStatusAction');
+			let def_date = this.getDefaultDate();
 			let abbruchData =
 				{
 					status_kurzbz: 'Abbrecher',
-					datum: this.getDefaultDate(),
-					bestaetigtam: this.getDefaultDate(),
+					datum: def_date,
+					bestaetigtam: def_date,
 					statusgrund_id: 17
 				};
 			console.log(this.updateData);
 			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...abbruchData }));
-			this.addNewStatus(prestudentIds);
+			this.changeStatus(prestudentIds);
 		},
 		changeStatusToAbbrecherStud(prestudentIds){
 			this.hideModal('confirmStatusAction');
+			let def_date = this.getDefaultDate();
 			let deltaData =
 				{
 					status_kurzbz: 'Abbrecher',
-					datum: this.getDefaultDate(),
-					bestaetigtam: this.getDefaultDate(),
+					datum: def_date,
+					bestaetigtam: def_date,
 					statusgrund_id: 18
 				};
 
 			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData }));
-			this.addNewStatus(prestudentIds);
+			this.changeStatus(prestudentIds);
 		},
 		changeStatusToUnterbrecher(prestudentIds){
 			this.hideModal('confirmStatusAction');
+			let def_date = this.getDefaultDate();
 			let deltaData =
 				{
 					status_kurzbz: 'Unterbrecher',
-					datum: this.getDefaultDate(),
-					bestaetigtam: this.getDefaultDate()
+					datum: def_date,
+					bestaetigtam: def_date
 				};
 
 			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData }));
-			this.addNewStatus(prestudentIds);
+			this.changeStatus(prestudentIds);
 		},
 		changeStatusToStudent(prestudentIds){
+			let def_date = this.getDefaultDate();
 			//TODO Manu validation if Bewerber already before asking for ausbildungssemester
 			//this.checkIfBewerber();
 			this.hideModal('askForAusbildungssemester');
 			let deltaData =
 				{
 					status_kurzbz: 'Student',
-					datum: this.getDefaultDate(),
-					bestaetigtam: this.getDefaultDate()
+					datum: def_date,
+					bestaetigtam: def_date
 				};
 
 			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData, ausbildungssemester: this.actionSem}));
@@ -466,40 +470,41 @@ export default{
 		},
 		changeStatusToWiederholer(prestudentIds){
 			this.hideModal('askForAusbildungssemester');
+			let def_date = this.getDefaultDate();
 			let deltaData =
 				{
 					status_kurzbz: 'Student',
-					datum: this.getDefaultDate(),
-					bestaetigtam: this.getDefaultDate(),
+					datum: def_date,
+					bestaetigtam: def_date,
 					statusgrund_id: 16
 				};
 
 			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData, ausbildungssemester: this.actionSem}));
-			this.addNewStatus(prestudentIds);
+			this.changeStatus(prestudentIds);
 		},
 		changeStatusToDiplomand(prestudentIds){
-
+			let def_date = this.getDefaultDate();
 			let deltaData =
 				{
 					status_kurzbz: 'Diplomand',
-					datum: this.getDefaultDate(),
-					bestaetigtam: this.getDefaultDate(),
+					datum: def_date,
+					bestaetigtam: def_date,
 				};
 
 			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData}));
-			this.addNewStatus(prestudentIds);
+			this.changeStatus(prestudentIds);
 		},
 		changeStatusToAbsolvent(prestudentIds){
-
+			let def_date = this.getDefaultDate();
 			let deltaData =
 				{
 					status_kurzbz: 'Absolvent',
-					datum: this.getDefaultDate(),
-					bestaetigtam: this.getDefaultDate(),
+					datum: def_date,
+					bestaetigtam: def_date,
 				};
 
 			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData}));
-			this.addNewStatus(prestudentIds);
+			this.changeStatus(prestudentIds);
 		},
 		changeStatusToBewerber(prestudentIds){
 			let def_date = this.getDefaultDate();
@@ -514,7 +519,7 @@ export default{
 			this.newArray = this.updateData.map(objekt => ({
 				...objekt,
 				...deltaData}));
-			this.addNewStatus(prestudentIds);
+			this.changeStatus(prestudentIds);
 		},
 		changeStatusToAufgenommener(prestudentIds){
 			this.hideModal('confirmStatusAction');
@@ -533,7 +538,7 @@ export default{
 
 			//TODO(Manu) change studiensemester_kurzbz in backend
 			//studiensemester_kurzbz: this.getStudiensemesterOfBewerber(objekt.prestudent_id)
-			this.addNewStatus(prestudentIds);
+			this.changeStatus(prestudentIds);
 
 		},
 		changeInteressentToStudent(prestudentIds){
@@ -631,7 +636,7 @@ export default{
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
-		addNewStatus(prestudentIds){
+		changeStatus(prestudentIds){
 			//Array.isArray(prestudentIds) ? this.modelValue.prestudent_id : [prestudentIds];
 			let changeData = {};
 
@@ -646,7 +651,7 @@ export default{
 				//TODO(manu) besserer check
 				changeData = this.statusData.status_kurzbz ? this.statusData : this.newArray.find(item => item.prestudent_id === prestudentId);
 
-				return this.$fhcApi.post('api/frontend/v1/stv/status/addNewStatus/' + prestudentId,
+				return this.$fhcApi.post('api/frontend/v1/stv/status/changeStatus/' + prestudentId,
 					changeData
 				).then(response => {
 						countSuccess++;

From 4075245dcb7909345c9fccd0ccf58e49f7fbb1a8 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 19 Jul 2024 09:03:40 +0200
Subject: [PATCH 0958/1461] getSemesterOfBewerber for Aufgenommen

---
 .../api/frontend/v1/stv/Status.php            | 340 +++++-------------
 .../Details/Prestudent/MultiStatus.js         |   2 -
 2 files changed, 92 insertions(+), 250 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 8d7a9df20..3dd75bec0 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -201,6 +201,22 @@ class Status extends FHCAPI_Controller
 		return $this->terminateWithSuccess($result);
 	}
 
+	public function getStudiensemesterOfStatus($prestudent_id, $status)
+	{
+		$result = $this->PrestudentstatusModel->loadWhere([
+			"prestudent_id" => $prestudent_id,
+			"status_kurzbz" => $status
+		]);
+		$this->PrestudentstatusModel->addLimit(1);
+		if (isError($result))
+		{
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		$studiensem = current(getData($result));
+
+		return $studiensem->studiensemester_kurzbz;
+	}
+
 	public function changeStatus($prestudent_id)
 	{
 		//get Studiengang von prestudent_id
@@ -269,6 +285,11 @@ class Status extends FHCAPI_Controller
 		{
 			$ausbildungssemester = $lastStatusData->ausbildungssemester;
 		}
+		if($status_kurzbz == Prestudentstatus_model::STATUS_AUFGENOMMENER)
+		{
+			$studiensemester_kurzbz = 	$this->getStudiensemesterOfStatus($prestudent_id, Prestudentstatus_model::STATUS_BEWERBER);
+
+		}
 
 		//check if Rolle already exists
 		$result = $this->prestudentstatuschecklib->checkIfExistingPrestudentRolle(
@@ -502,6 +523,76 @@ class Status extends FHCAPI_Controller
 
 				}
 				break;
+			case Prestudentstatus_model::STATUS_BEWERBER:
+				{
+					$this->load->library('PrestudentLib');
+					$result = $this->prestudentlib->setBewerber($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
+
+					if (isError($result))
+					{
+						return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+					}
+					else
+						$this->terminateWithSuccess($prestudent_id);
+
+				}
+				break;
+			// case Prestudentstatus_model::STATUS_BEWERBER:
+			// 	{
+			// 		$this->load->library('PrestudentLib');
+			// 		$result = $this->prestudentlib->setBewerber($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
+
+			// 		if (isError($result))
+			// 		{
+			// 			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			// 		}
+			// 		else
+			// 			$this->terminateWithSuccess($prestudent_id);
+
+			// 	}
+			// 	break;
+			// case Prestudentstatus_model::STATUS_AUFGENOMMENER: //auch Student...
+			// 	{
+			// 		$this->load->library('PrestudentLib');
+			// 		$result = $this->prestudentlib->setStudentFromInteressent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
+
+			// 		if (isError($result))
+			// 		{
+			// 			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			// 		}
+			// 		else
+			// 			$this->terminateWithSuccess($prestudent_id);
+
+			// 	}
+			// 	break;
+			// case Prestudentstatus_model::STATUS_AUFGENOMMENER:
+			// 	{
+			// 		$this->load->library('PrestudentLib');
+			// 		$result = $this->prestudentlib->setAufgenommener($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
+
+			// 		if (isError($result))
+			// 		{
+			// 			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			// 		}
+			// 		else
+			// 			$this->terminateWithSuccess($prestudent_id);
+
+			// 	}
+			// 	break;
+			// case Prestudentstatus_model::STATUS_ABGEWIESENER:
+			// 	{
+			// 		$this->load->library('PrestudentLib');
+			// 		$result = $this->prestudentlib->setAufgenommener($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
+
+			// 		if (isError($result))
+			// 		{
+			// 			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			// 		}
+			// 		else
+			// 			$this->terminateWithSuccess($prestudent_id);
+
+			// 	}
+			// 	break;
 			default:
 			{
 /*				if ($isStudent) {
@@ -536,254 +627,7 @@ class Status extends FHCAPI_Controller
 		}
 	}
 
-	//TODO(Manu) DEPRECATED
-	// public function turnIntoStudent($prestudent_id)
-	// {
-
-	// 	//get Studiengang von prestudent_id
-	// 	$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-	// 	$this->PrestudentModel->addJoin('public.tbl_person p', 'ON (p.person_id = public.tbl_prestudent.person_id)');
-	// 	$this->PrestudentModel->addJoin('public.tbl_studiengang sg', 'ON (sg.studiengang_kz = public.tbl_prestudent.studiengang_kz)');
-	// 	$result = $this->PrestudentModel->load([
-	// 		'prestudent_id' => $prestudent_id,
-	// 	]);
-	// 	if (isError($result)) {
-	// 		return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-	// 	}
-	// 	$result = current(getData($result));
-
-	// 	$stg = $result->studiengang_kz;
-	// 	$stgkzl = $result->kurzbz;
-	// 	$person_id = $result->person_id;
-
-	// 	if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg)) {
-	// 		$result = $this->p->t('lehre', 'error_keineSchreibrechte');
-
-	// 		return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-	// 	}
-
-	// 	$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-
-	// 	$uid = getAuthUID();
-	// 	$status_kurzbz = $this->input->post('status_kurzbz');
-	// 	$ausbildungssemester = $this->input->post('ausbildungssemester');
-	// 	$bestaetigtam = $this->input->post('bestaetigtam');
-	// 	$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
-	// 	$bestaetigtvon = $uid;
-
-	// 	//Form Validation
-	// 	$this->load->library('form_validation');
-
-	// 	$this->form_validation->set_rules('ausbildungssemester', 'Ausbildungssemester', 'integer', [
-	// 		'integer' => $this->p->t('ui', 'error_fieldNotInteger', ['field' => 'Ausbildungssemester'])
-	// 	]);
-
-	// 	if (!$this->form_validation->run())
-	// 		$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-	// 	//GET lastStatus
-	// 	$result = $this->PrestudentstatusModel->getLastStatus($prestudent_id);
-
-	// 	if (isError($result)) {
-	// 		return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-	// 	} elseif (!hasData($result)) {
-	// 		$lastStatusData = [];
-	// 	} else
-	// 		$lastStatusData = current(getData($result));
-
-	// 	//check if studentrolle already exists
-	// 	$this->load->model('crm/Student_model', 'StudentModel');
-	// 	$result = $this->StudentModel->checkIfExistingStudentRolle($prestudent_id);
-	// 	if (isError($result)) {
-	// 		return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-	// 	}
-	// 	if ($result->retval == "0") {
-	// 		$isStudent = false;
-	// 	} else
-	// 		$isStudent = true;
-
-	// 	return $this->terminateWithError("here: before check: isStudent: " . $isStudent, self::ERROR_TYPE_GENERAL);
-
-	// 	if (!$isStudent) {
-
-	// 		//Check ZGV
-	// 		if ($status_kurzbz == Prestudentstatus_model::STATUS_BEWERBER) {
-	// 			$result = $this->prestudentstatuschecklib->checkIfZGVEingetragen($prestudent_id);
-	// 			if (isError($result)) {
-	// 				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-	// 			}
-	// 		}
-
-	// 		//Check ZGV-Master
-	// 		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-	// 		$result = $this->StudiengangModel->load([
-	// 			'studiengang_kz' => $stg
-	// 		]);
-	// 		if (isError($result)) {
-	// 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-	// 			return $this->outputJson(getError($result));
-	// 		}
-	// 		$result = current(getData($result));
-	// 		$typ = $result->typ;
-
-	// 		if (!defined("ZGV_CHECK") || ZGV_CHECK) {
-	// 			if ($status_kurzbz == Prestudentstatus_model::STATUS_BEWERBER && $typ == 'm') {
-	// 				$result = $this->prestudentstatuschecklib->checkIfZGVEingetragen($prestudent_id, $typ);
-	// 				if (isError($result)) {
-	// 					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-	// 				}
-	// 			}
-	// 		}
-
-	// 		//check if bewerberstatus exists
-	// 		$result = $this->prestudentstatuschecklib->checkIfExistingBewerberstatus($prestudent_id);
-	// 		if (isError($result)) {
-	// 			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-	// 		}
-
-	// 		//checkIf Kaution bezahlt
-	// 		//TODO(Manu)
-
-	// 		//check if Aufgenommenener Status
-	// 		$result = $this->prestudentstatuschecklib->checkIfExistingAufgenommenerstatus($prestudent_id);
-	// 		if (isError($result)) {
-	// 			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-	// 		}
-
-	// 		return $this->terminateWithError("here: after check: new Student", self::ERROR_TYPE_GENERAL);
-
-
-	// 		//generate Personenkennzeichen(matrikelnr)
-	// 		//getStudiensemester vom Status aufgenommen
-	// 		$resultMat = $this->StudentModel->generateMatrikelnummer2($stg, $studiensemester_kurzbz, $typ);
-	// 		if (isError($resultMat)) {
-	// 			return $this->terminateWithError($resultMat, self::ERROR_TYPE_GENERAL);
-	// 		}
-	// 		$matrikelnr = getData($resultMat);
-	// 		$jahr = mb_substr($matrikelnr, 0, 2);
-
-	// 		//generate UID
-	// 		$resultUid = $this->StudentModel->generateUID($stgkzl, $jahr, $typ, $matrikelnr);
-	// 		if (isError($resultMat)) {
-	// 			return $this->terminateWithError("in generateUid" . $resultUid, self::ERROR_TYPE_GENERAL);
-	// 		}
-	// 		$uidStudent = getData($resultUid);
-
-	// 		//Check for additional logic (config entries, addons)
-	// 		//TODO(Manu) check include/tw/generatematrikelnr.inc.php
-	// 		//(1) addons durchsuchen, ob eigene Logik für Matrikelnr-erstellung existiert
-	// 		//Default: keine Matrikelnummer wird generiert
-
-	// 		//(2) personenkz = uid
-	// 		if (defined('SET_UID_AS_PERSONENKENNZEICHEN') && SET_UID_AS_PERSONENKENNZEICHEN) {
-	// 			$matrikelnr = $uidStudent;
-	// 		}
-
-	// 		//(3) Matrikelnummer = uid
-	// 		if (defined('SET_UID_AS_MATRIKELNUMMER') && SET_UID_AS_MATRIKELNUMMER) {
-	// 			//update person
-	// 			$result = $this->PersonModel->update(
-	// 				[
-	// 					'person_id' => $person_id,
-	// 				],
-	// 				[
-	// 					'matr_nr' => $uidStudent,
-	// 				]
-	// 			);
-	// 			if (isError($result)) {
-	// 				return $this->terminateWithError("uidAsMatrikelnummer" . getError($result), self::ERROR_TYPE_GENERAL);
-	// 			}
-	// 		}
-
-	// 		//TODO(Manu) check if benutzer already exists to avoid conflicts..
-	// 		//person kann mehrere Benutzer haben... student_uid?
-	// 		//add benutzerdatensatz mit Aktierungscode
-	// 		$this->load->model('person/Benutzer_model', 'BenutzerModel');
-	// 		$result = $this->BenutzerModel->checkIfExistingBenutzer($person_id);
-	// 		if (isError($result)) {
-	// 			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-	// 		}
-	// 		if ($result->retval == "0") {
-
-	// 			//activation key
-	// 			$aktivierungscode = null;
-	// 			$result = $this->BenutzerModel->generateActivationKey();
-	// 			if (isError($result)) {
-	// 				return $this->terminateWithError("in Error " . $result, self::ERROR_TYPE_GENERAL);
-	// 			}
-	// 			$aktivierungscode = getData($result);
-
-
-	// 			//Alias generieren
-	// 			$result = $this->PersonModel->generateAliasByPersonId($person_id);
-	// 			if (isError($result)) {
-	// 				return $this->terminateWithError("in generate alias " . $result, self::ERROR_TYPE_GENERAL);
-	// 			}
-	// 			$alias = getData($result) ?: null;
-	// 			$alias = $alias->retval[0];
-
-	// 			$sanitizedVorname = $this->_sanitizeAliasName($alias->vorname);
-	// 			$sanitizedNachname = $this->_sanitizeAliasName($alias->nachname);
-
-	// 			// Erstelle den Alias
-	// 			$alias = $sanitizedVorname . '.' . $sanitizedNachname;
-
-	// 			if (isError($result)) {
-	// 				return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-	// 			}
-
-	// 			$result = $this->BenutzerModel->insert(
-	// 				[
-	// 					'person_id' => $person_id,
-	// 					'uid' => $uidStudent,
-	// 					'aktiv' => true,
-	// 					'aktivierungscode' => $aktivierungscode,
-	// 					'alias' => $alias,
-	// 					'insertvon' => $uid,
-	// 					'insertamum' => date('c'),
-	// 				]
-	// 			);
-
-	// 			if (isError($result)) {
-	// 				return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-	// 			}
-
-	// 		} else
-	// 			return $this->terminateWithError("Benutzer already existing" . $person_id, self::ERROR_TYPE_GENERAL);
-
-	// 		//Student anlegen
-	// 		$result = $this->StudentModel->insert(
-	// 			[
-	// 				'student_uid' => $uidStudent,
-	// 				'prestudent_id' => $prestudent_id,
-	// 				'matrikelnr' => $matrikelnr,
-	// 				'studiengang_kz' => $stg,
-	// 				'semester' => $ausbildungssemester,
-	// 				'verband' => '',
-	// 				'gruppe' => '',
-	// 				'insertvon' => $uid,
-	// 				'insertamum' => date('c')
-	// 			]
-	// 		);
-	// 		if (isError($result))
-	// 		{
-	// 			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-	// 		}
-
-	// 		$this->load->library('PrestudentLib');
-	// 		$result = $this->prestudentlib->setFirstStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, null, $bestaetigtam, $bestaetigtvon, $stg, $uidStudent);
-
-	// 		if (isError($result)) {
-	// 			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-	// 		} else
-	// 			$this->terminateWithSuccess($prestudent_id);
-
-	// 	}
-	// 	else
-	// 		return $this->terminateWithError("changeStatus(student)", self::ERROR_TYPE_GENERAL);
-	// }
-
-	public function addStudent($prestudent_id)
+		public function addStudent($prestudent_id)
 	{
 		//get Studiengang von prestudent_id
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index 0b44431a5..c8d569020 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -689,8 +689,6 @@ export default{
 					 }
 
 					 //TODO(Manu) bei status Interessent, Bewerber, aufgenommener, reload nicht working
-					//  this.reload();
-					//  this.reloadList();
 
 					if (this.modelValue.prestudent_id) {
 						this.reload();

From 9eb61649eba507db13ef4518393d864f847fb1a9 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 19 Jul 2024 09:06:49 +0200
Subject: [PATCH 0959/1461] adds getProfilRequestFiles to the new ProfilUpdate
 FhcAPIController

---
 .../api/frontend/v1/ProfilUpdate.php          | 109 +++++++++++++++++-
 public/js/api/profilUpdate.js                 |  24 ++--
 public/js/apps/Cis/ProfilUpdateRequests.js    |   3 +-
 .../ProfilComponents/FetchProfilUpdates.js    |  11 +-
 .../EditProfilComponents/Status.js            |   2 +-
 .../Cis/ProfilUpdate/AcceptDenyUpdate.js      |   2 +-
 6 files changed, 127 insertions(+), 24 deletions(-)

diff --git a/application/controllers/api/frontend/v1/ProfilUpdate.php b/application/controllers/api/frontend/v1/ProfilUpdate.php
index df594d3cf..56dd4486b 100644
--- a/application/controllers/api/frontend/v1/ProfilUpdate.php
+++ b/application/controllers/api/frontend/v1/ProfilUpdate.php
@@ -40,10 +40,10 @@ class ProfilUpdate extends FHCAPI_Controller
 		parent::__construct([
             'getStatus' => self::PERM_LOGGED,
             'getTopic' => self::PERM_LOGGED,
+			'getProfilRequestFiles' => self::PERM_LOGGED,
 			
 		]);
 
-
         $this->load->model('person/Profil_update_model', 'ProfilUpdateModel');
 		$this->load->model('person/Kontakt_model', 'KontaktModel');
 		$this->load->model('person/Adresse_model', 'AdresseModel');
@@ -102,6 +102,113 @@ class ProfilUpdate extends FHCAPI_Controller
 		$this->terminateWithSuccess(self::$TOPICS);
 	}
 
+	public function getProfilRequestFiles($id)
+	{
+		 if(!$id){
+			$this->terminateWithError("parameter id is missing");
+		 }
+
+		$this->ProfilUpdateModel->addSelect(["attachment_id"]);
+		$attachmentID = $this->ProfilUpdateModel->load([$id]);
+		if (isError($attachmentID)) {
+			$this->terminateWithError(error($this->p->t('profilUpdate', 'profilUpdate_loading_error')),self::ERROR_TYPE_GENERAL);
+		}
+		//? get the attachmentID
+		$dms_id = $this->getDataOrTerminateWithError($attachmentID)[0]->attachment_id;
+
+		//? get the name to the file
+		$this->DmsVersionModel->addSelect(["name", "dms_id"]);
+		$attachment = $this->DmsVersionModel->load([$dms_id, 0]);
+		if (isError($attachment)) {
+			$this->terminateWithError(error($this->p->t('profilUpdate', 'profilUpdate_dmsVersion_error')),self::ERROR_TYPE_GENERAL);
+		}
+		$attachment = $this->getDataOrTerminateWithError($attachment);
+		//? returns {name:..., dms_id:...}
+		$this->terminateWithSuccess($attachment);
+	}
+
+	/* public function insertFile($replace)
+	{
+		$replace = json_decode($replace);
+
+		if (!count($_FILES)) {
+			$this->terminateWithSuccess([]);
+			return;
+		}
+
+		//? if replace is set it contains the profil_update_id in which the attachment_id has to be replaced
+		if (isset($replace)) {
+			$this->ProfilUpdateModel->addSelect(["attachment_id"]);
+			$profilUpdate = $this->ProfilUpdateModel->load([$replace]);
+			if (isError($profilUpdate)) {
+				$this->terminateWithError(error($this->p->t('profilUpdate', 'profilUpdate_loading_error')),self::ERROR_TYPE_GENERAL);
+			}
+			//? get the attachmentID
+			$dms_id = $this->getDataOrTerminateWithError($profilUpdate)[0];
+
+			//? delete old dms_file of Profil Update
+			$this->deleteOldVersionFile($dms_id);
+		}
+
+
+		$files = $_FILES['files'];
+		$file_count = count($files['name']);
+
+		$res = [];
+
+		for ($i = 0; $i < $file_count; $i++) {
+			$_FILES['files']['name'] = $files['name'][$i];
+			$_FILES['files']['type'] = $files['type'][$i];
+			$_FILES['files']['tmp_name'] = $files['tmp_name'][$i];
+			$_FILES['files']['error'] = $files['error'][$i];
+			$_FILES['files']['size'] = $files['size'][$i];
+
+			$dms = [
+				"kategorie_kurzbz" => "profil_aenderung",
+				"version" => 0,
+				"name" => $_FILES['files']['name'],
+				"mimetype" => $_FILES['files']['type'],
+				"beschreibung" => $this->uid . " Profil Änderung",
+				"insertvon" => $this->uid,
+				"insertamum" => "NOW()",
+			];
+
+			$tmp_res = $this->dmslib->upload($dms, 'files', array("jpg", "png", "pdf"));
+
+			$tmp_res = $this->getDataOrTerminateWithError($tmp_res);
+			array_push($res, $tmp_res);
+		}
+
+		$this->terminateWithSuccess($res);
+	}
+
+	private function deleteOldVersionFile($dms_id)
+	{
+		if (!isset($dms_id)) {
+			return;
+		}
+
+		//? collect all the results of the deleted versions in an array 
+		$res = array();
+
+		//? delete all the different versions of the dms_file
+		$dmsVersions = $this->DmsVersionModel->loadWhere(["dms_id" => $dms_id]);
+		$dmsVersions = $this->getDataOrTerminateWithError($dmsVersions);
+		if (isset($dmsVersions)) {
+			$zwischen_res = array_map(function ($item) {
+				return $item->version;
+			}, $dmsVersions);
+			foreach ($zwischen_res as $version) {
+				array_push($res, $this->DmsVersionModel->delete([$dms_id, $version]));
+			}
+		} else {
+			$this->terminateWithError(error($this->p->t('profilUpdate', 'profilUpdate_dmsVersion_error')), self::ERROR_TYPE_GENERAL);
+		}
+
+		//? returns a result for each deleted dms_file
+		return $res;
+	}
+ */
 }
 	
    
\ No newline at end of file
diff --git a/public/js/api/profilUpdate.js b/public/js/api/profilUpdate.js
index 5d4978ce4..ca009547d 100644
--- a/public/js/api/profilUpdate.js
+++ b/public/js/api/profilUpdate.js
@@ -15,15 +15,6 @@ export default {
         `/api/frontend/v1/ProfilUpdate/getTopic`,{});
     },
   
-    getProfilUpdateRequest: function () {
-
-        return this.$fhcApi.get(
-        FHC_JS_DATA_STORAGE_OBJECT.app_root +
-        FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-        `/Cis/ProfilUpdate/getAllRequests`,{});
-      
-    },
-  
 
     //TODO post request
     acceptProfilRequest: function (payload) {
@@ -68,16 +59,19 @@ export default {
         headers: { "Content-Type": "multipart/form-data" },
       });
     },
-  
-    //TODO post request
+    
     getProfilRequestFiles: function (requestID) {
-      const url =
+      return this.$fhcApi.get(
         FHC_JS_DATA_STORAGE_OBJECT.app_root +
         FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-        `/Cis/ProfilUpdate/getProfilRequestFiles`;
-  
-      return axios.post(url, requestID);
+        `/api/frontend/v1/ProfilUpdate/getProfilRequestFiles/${requestID}`,{});
     },
+
+    search(searchsettings) {
+      const url = '/api/frontend/v1/searchbar/search';
+      return this.$fhcApi.post(url, searchsettings);
+    },
+
   
     selectProfilRequest: function (uid = null, id = null) {
 
diff --git a/public/js/apps/Cis/ProfilUpdateRequests.js b/public/js/apps/Cis/ProfilUpdateRequests.js
index c72a7592f..42e5bd576 100755
--- a/public/js/apps/Cis/ProfilUpdateRequests.js
+++ b/public/js/apps/Cis/ProfilUpdateRequests.js
@@ -22,8 +22,7 @@ const app = Vue.createApp({
   },
   methods: {},
   created() {
-    console.log("this is the place i am searching for")
-    Vue.$fhcapi.ProfilUpdate.getStatus()
+    this.$fhcApi.factory.profilUpdate.getStatus()
       .then((response) => {
         this.profilUpdateStates = response.data;
       })
diff --git a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
index 9ae5c5a00..368b5e111 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
@@ -37,21 +37,23 @@ export default {
     },
 
     async showEditProfilModal(updateRequest) {
-      let view = this.getView(updateRequest.topic, updateRequest.status);
 
+      let view = this.getView(updateRequest.topic, updateRequest.status);
+  
       let data = null;
       let content = null;
       let files = null;
       let withFiles = false;
 
       if (view === "TextInputDokument") {
+        console.log("text input")
         data = {
           titel: updateRequest.topic,
           value: updateRequest.requested_change.value,
         };
-
+        
         const filesFromDatabase =
-          await Vue.$fhcapi.ProfilUpdate.getProfilRequestFiles(
+          await this.$fhcApi.factory.profilUpdate.getProfilRequestFiles(
             updateRequest.profil_update_id
           ).then((res) => {
             return res.data;
@@ -140,7 +142,8 @@ export default {
     },
 
   },
-  created() {},
+  created() {
+  },
 
   computed: {},
 
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/Status.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/Status.js
index 307a0cc62..437bb1fb5 100755
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/Status.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/Status.js
@@ -65,7 +65,7 @@ export default {
     topic: { type: String },
   },
   created() {
-    Vue.$fhcapi.ProfilUpdate.getProfilRequestFiles(this.updateID).then(
+    this.$fhcApi.factory.profilUpdate.getProfilRequestFiles(this.updateID).then(
       (res) => {
         this.files = res.data;
       }
diff --git a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
index 76a2e2b6a..bbf1489a5 100755
--- a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
+++ b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
@@ -95,7 +95,7 @@ export default {
   created() {
     // only fetching the profilUpdate Attachemnts if the profilUpdate actually has attachments
     if (this.value.attachment_id) {
-      Vue.$fhcapi.ProfilUpdate.getProfilRequestFiles(
+      this.$fhcApi.factory.profilUpdate.getProfilRequestFiles(
         this.data.profil_update_id
       ).then((res) => {
         this.files = res.data;

From be661506318a5d9c7aba3cd782efc21d303836d4 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 19 Jul 2024 11:38:15 +0200
Subject: [PATCH 0960/1461] adds acceptProfilRequest and denyProfilRequest to
 the new ProfilUpdate FhcAPIController

---
 application/controllers/Cis/ProfilUpdate.php  |   2 -
 .../api/frontend/v1/ProfilUpdate.php          | 322 ++++++++++++++----
 public/js/api/profilUpdate.js                 |  17 +-
 .../Cis/ProfilUpdate/AcceptDenyUpdate.js      |   2 +-
 .../Cis/ProfilUpdate/ProfilUpdateView.js      |  12 +-
 5 files changed, 261 insertions(+), 94 deletions(-)

diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
index 97a86488f..4dce86573 100755
--- a/application/controllers/Cis/ProfilUpdate.php
+++ b/application/controllers/Cis/ProfilUpdate.php
@@ -525,8 +525,6 @@ class ProfilUpdate extends Auth_Controller
 
 	public function acceptProfilRequest()
 	{
-
-
 		$_POST = json_decode($this->input->raw_input_stream, true);
 		$id = $this->input->post('profil_update_id', true);
 		$uid = $this->input->post('uid', true);
diff --git a/application/controllers/api/frontend/v1/ProfilUpdate.php b/application/controllers/api/frontend/v1/ProfilUpdate.php
index 56dd4486b..706f2bf29 100644
--- a/application/controllers/api/frontend/v1/ProfilUpdate.php
+++ b/application/controllers/api/frontend/v1/ProfilUpdate.php
@@ -41,9 +41,22 @@ class ProfilUpdate extends FHCAPI_Controller
             'getStatus' => self::PERM_LOGGED,
             'getTopic' => self::PERM_LOGGED,
 			'getProfilRequestFiles' => self::PERM_LOGGED,
+			'denyProfilRequest' => ['student/stammdaten:rw', 'mitarbeiter/stammdaten:rw'],
+			'acceptProfilRequest' => ['student/stammdaten:rw', 'mitarbeiter/stammdaten:rw'],
 			
 		]);
 
+		// Load language phrases
+		$this->loadPhrases(
+			array(
+				'ui',
+				'global',
+				'person',
+				'profil',
+				'profilUpdate'
+			)
+		);
+
         $this->load->model('person/Profil_update_model', 'ProfilUpdateModel');
 		$this->load->model('person/Kontakt_model', 'KontaktModel');
 		$this->load->model('person/Adresse_model', 'AdresseModel');
@@ -127,88 +140,247 @@ class ProfilUpdate extends FHCAPI_Controller
 		$this->terminateWithSuccess($attachment);
 	}
 
-	/* public function insertFile($replace)
+	public function denyProfilRequest()
 	{
-		$replace = json_decode($replace);
+		$id = $this->input->post('profil_update_id', true);
+		$uid = $this->input->post('uid', true);
+		$topic = $this->input->post('topic', true);
+		$status_message = $this->input->post('status_message', true); //optional
 
-		if (!count($_FILES)) {
-			$this->terminateWithSuccess([]);
-			return;
+		if(!isset($id) || !isset($uid) || !isset($topic)){
+			$this->terminateWithError("parameter id, uid, topic or status_message is missing");
 		}
 
-		//? if replace is set it contains the profil_update_id in which the attachment_id has to be replaced
-		if (isset($replace)) {
-			$this->ProfilUpdateModel->addSelect(["attachment_id"]);
-			$profilUpdate = $this->ProfilUpdateModel->load([$replace]);
-			if (isError($profilUpdate)) {
-				$this->terminateWithError(error($this->p->t('profilUpdate', 'profilUpdate_loading_error')),self::ERROR_TYPE_GENERAL);
-			}
-			//? get the attachmentID
-			$dms_id = $this->getDataOrTerminateWithError($profilUpdate)[0];
+		$is_mitarbeiter = $this->MitarbeiterModel->isMitarbeiter($uid);
+		$is_mitarbeiter = $this->getDataOrTerminateWithError($is_mitarbeiter);
+		
+		$is_student = $this->StudentModel->isStudent($uid);
+		$is_student = $this->getDataOrTerminateWithError($is_student);
 
-			//? delete old dms_file of Profil Update
-			$this->deleteOldVersionFile($dms_id);
-		}
-
-
-		$files = $_FILES['files'];
-		$file_count = count($files['name']);
-
-		$res = [];
-
-		for ($i = 0; $i < $file_count; $i++) {
-			$_FILES['files']['name'] = $files['name'][$i];
-			$_FILES['files']['type'] = $files['type'][$i];
-			$_FILES['files']['tmp_name'] = $files['tmp_name'][$i];
-			$_FILES['files']['error'] = $files['error'][$i];
-			$_FILES['files']['size'] = $files['size'][$i];
-
-			$dms = [
-				"kategorie_kurzbz" => "profil_aenderung",
-				"version" => 0,
-				"name" => $_FILES['files']['name'],
-				"mimetype" => $_FILES['files']['type'],
-				"beschreibung" => $this->uid . " Profil Änderung",
-				"insertvon" => $this->uid,
-				"insertamum" => "NOW()",
-			];
-
-			$tmp_res = $this->dmslib->upload($dms, 'files', array("jpg", "png", "pdf"));
-
-			$tmp_res = $this->getDataOrTerminateWithError($tmp_res);
-			array_push($res, $tmp_res);
-		}
-
-		$this->terminateWithSuccess($res);
-	}
-
-	private function deleteOldVersionFile($dms_id)
-	{
-		if (!isset($dms_id)) {
-			return;
-		}
-
-		//? collect all the results of the deleted versions in an array 
-		$res = array();
-
-		//? delete all the different versions of the dms_file
-		$dmsVersions = $this->DmsVersionModel->loadWhere(["dms_id" => $dms_id]);
-		$dmsVersions = $this->getDataOrTerminateWithError($dmsVersions);
-		if (isset($dmsVersions)) {
-			$zwischen_res = array_map(function ($item) {
-				return $item->version;
-			}, $dmsVersions);
-			foreach ($zwischen_res as $version) {
-				array_push($res, $this->DmsVersionModel->delete([$dms_id, $version]));
-			}
+		if (
+			$is_student && $this->permissionlib->isBerechtigt('student/stammdaten', "suid", $this->getOE_from_student($uid)) ||
+			$is_mitarbeiter && $this->permissionlib->isBerechtigt('mitarbeiter/stammdaten', "suid") 
+		) {
+			$this->sendEmail_onProfilUpdate_response($uid, $topic, self::$STATUS_REJECTED);
+			$this->terminateWithSuccess($this->setStatusOnUpdateRequest($id, self::$STATUS_REJECTED, $status_message));
 		} else {
-			$this->terminateWithError(error($this->p->t('profilUpdate', 'profilUpdate_dmsVersion_error')), self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_permission_error'),self::ERROR_TYPE_GENERAL);
+		}
+	}
+
+	public function acceptProfilRequest()
+	{
+		$id = $this->input->post('profil_update_id', true);
+		$uid = $this->input->post('uid', true);
+		$topic = $this->input->post('topic', true);
+		$requested_change = $this->input->post('requested_change');
+		$status_message = $this->input->post('status_message', true); //optional
+
+		//? fetching person_id using UID
+		$personID = $this->PersonModel->getByUid($uid);
+		$personID = $this->getDataOrTerminateWithError($personID)[0]->person_id;
+
+		//! check for required information
+		if (!isset($id) || !isset($uid) || !isset($personID) || !isset($requested_change) || !isset($topic)) {
+			$this->terminateWithError(error($this->p->t('profilUpdate', 'profilUpdate_requiredInformation_error')));
 		}
 
-		//? returns a result for each deleted dms_file
-		return $res;
+		$is_mitarbeiter = $this->MitarbeiterModel->isMitarbeiter($uid);
+		$is_mitarbeiter = $this->getDataOrTerminateWithError($is_mitarbeiter);
+
+		$is_student = $this->StudentModel->isStudent($uid);
+		$is_student = $this->getDataOrTerminateWithError($is_student);
+
+
+		//? check if the permissions are set correctly
+		if (
+			$is_student && $this->permissionlib->isBerechtigt('student/stammdaten', "suid", $this->getOE_from_student($uid)) ||
+			$is_mitarbeiter && $this->permissionlib->isBerechtigt('mitarbeiter/stammdaten', "suid") 
+		) {
+
+			if (is_array($requested_change) && array_key_exists("adresse_id", $requested_change)) {
+				$insertID = $this->handleAdresse($requested_change, $personID);
+				$insertID = getData($insertID);
+				if (isset($insertID)) {
+					$requested_change['adresse_id'] = $insertID;
+					$update_res = $this->updateRequestedChange($id, $requested_change);
+					if (isError($update_res)) {
+						$this->terminateWithError(error($this->p->t('profilUpdate', 'profilUpdate_address_error', [$insertID])));
+					}
+				}
+
+			} else if (is_array($requested_change) && array_key_exists("kontakt_id", $requested_change)) {
+				$insertID = $this->handleKontakt($requested_change, $personID);
+				$insertID = getData($insertID);
+				if (isset($insertID)) {
+					$requested_change['kontakt_id'] = $insertID;
+					$update_res = $this->updateRequestedChange($id, $requested_change);
+					if (isError($update_res)) {
+						$this->terminateWithError(error($this->p->t('profilUpdate', 'profilUpdate_kontakt_error', [$insertID])));
+					}
+				}
+
+
+			} else {
+				switch ($topic) {
+					// mapping phrasen to database columns to make the update with the correct column names
+					case self::$TOPICS['Titel']:
+						$topic = "titelpre";
+						break;
+					case self::$TOPICS['Postnomen']:
+						$topic = "titelpost";
+						break;
+					case self::$TOPICS['Vorname']:
+						$topic = "vorname";
+						break;
+					case self::$TOPICS['Nachname']:
+						$topic = "nachname";
+						break;
+					default:
+						$this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_topic_error', [$topic]));
+				}
+
+				$result = $this->PersonModel->update($personID, [$topic => $requested_change["value"]]);
+				if (isError($result)) $this->terminateWithError(error($this->p->t('profilUpdate', 'profilUpdate_insert_error')));
+			
+			}
+			$this->sendEmail_onProfilUpdate_response($uid, $topic, self::$STATUS_ACCEPTED);
+
+			$this->terminateWithSuccess($this->setStatusOnUpdateRequest($id, self::$STATUS_ACCEPTED, $status_message, $requested_change));
+		} else {
+			$this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_permission_error'));
+		}
+
+
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Private methods
+
+
+	private function sendEmail_onProfilUpdate_response($uid, $topic, $status)
+	{
+		$this->load->helper('hlp_sancho_helper');
+		$email = $uid . "@" . DOMAIN;
+
+
+		function languageQuery($language)
+		{
+			return "select index from public.tbl_sprache where sprache = '" + $language + "'";
+		}
+
+		$this->ProfilUpdateStatusModel->addSelect(["bezeichnung_mehrsprachig[(" . languageQuery('German') . ")] as status_de", "bezeichnung_mehrsprachig[(" . languageQuery('English') . ")] as status_en"]);
+		
+		$status_translation = $this->ProfilUpdateStatusModel->loadWhere(["status_kurzbz" => $status]);
+		
+		if (isError($status_translation)) {
+			$this->terminateWithError($this->p->t('profilUpdate', 'ProfilUpdateStatusTranslationError'));
+		}
+
+		$status_translation = hasData($status_translation) ? getData($status_translation)[0] : null;
+
+		if (isset($status_translation)) {
+			$mail_res = sendSanchoMail("profil_update_response", ['topic' => $topic, 'status_de' => $status_translation->status_de, 'status_en' => $status_translation->status_en, 'href' => APP_ROOT . 'Cis/Profil'], $email, ("Profil Änderung " . $this->p->t('profilUpdate', 'pending')));
+			if (!$mail_res) {
+				$this->addError($this->p->t('profilUpdate', 'profilUpdate_email_error'));
+			}
+		}
+	}
+
+	private function setStatusOnUpdateRequest($id, $status, $status_message)
+	{
+		return $this->ProfilUpdateModel->update([$id], ["status" => $status, "status_timestamp" => "NOW()", "status_message" => $status_message]);
 	}
- */
-}
 	
-   
\ No newline at end of file
+	private function updateRequestedChange($id, $requested_change)
+	{
+		return $this->ProfilUpdateModel->update([$id], ['requested_change' => json_encode($requested_change)]);
+	}
+
+	private function handleAdresse($requested_change, $personID)
+	{
+		$this->AdressenTypModel->addSelect(["adressentyp_kurzbz"]);
+		$adr_kurzbz = $this->AdressenTypModel->loadWhere(["bezeichnung" => $requested_change['typ']]);
+		$adr_kurzbz = $this->getDataOrTerminateWithError($adr_kurzbz)[0]->adressentyp_kurzbz;
+		
+		//? replace the address_typ with its correct kurzbz foreign key
+		$requested_change['typ'] = $adr_kurzbz;
+
+		$adresse_id = $requested_change["adresse_id"];
+
+		//? removes the adresse_id because we don't want to update the kontakt_id in the database
+		unset($requested_change["adresse_id"]);
+
+		//! ADD
+		if (array_key_exists('add', $requested_change) && $requested_change['add']) {
+
+			//? removes add flag
+			unset($requested_change['add']);
+			$requested_change['insertamum'] = "NOW()";
+			$requested_change['insertvon'] = getAuthUID();
+			$requested_change['person_id'] = $personID;
+			//TODO: zustelladresse, heimatadresse, rechnungsadresse und nation werden nicht beachtet
+			$insertID = $this->AdresseModel->insert($requested_change);
+			$insert_adresse_id = $insertID;
+			if (isError($insert_adresse_id)) {
+				$this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_insertAdresse_error'));
+			}
+			$insert_adresse_id = $this->getDataOrTerminateWithError($insert_adresse_id);
+			if ($insert_adresse_id) {
+				$this->handleDupplicateZustellAdressen($requested_change['zustelladresse'], $insert_adresse_id);
+			}
+
+		}
+		//! DELETE
+		elseif (array_key_exists('delete', $requested_change) && $requested_change['delete']) {
+			$result = $this->AdresseModel->delete($adresse_id);
+			if(isError($result)){
+				$this->terminateWithError(error($result));
+			}
+		}
+		//! UPDATE
+		else {
+			$requested_change['updateamum'] = "NOW()";
+			$requested_change['updatevon'] = getAuthUID();
+			$update_adresse_id = $this->AdresseModel->update($adresse_id, $requested_change);
+			if (isError($update_adresse_id)) {
+				$this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_updateAdresse_error'));
+			}
+			$update_adresse_id = $this->getDataOrTerminateWithError($update_adresse_id);
+			$this->handleDupplicateZustellAdressen($requested_change['zustelladresse'], $update_adresse_id);
+			
+		}
+		return $insertID ?? null;
+	}
+
+
+	private function handleDupplicateZustellAdressen($zustellung, $adresse_id)
+	{
+		if ($zustellung) {
+			$this->PersonModel->addSelect("public.tbl_adresse.adresse_id");
+			$this->PersonModel->addJoin("public.tbl_adresse", "public.tbl_adresse.person_id = public.tbl_person.person_id");
+			$zustellAdressenArray = $this->PersonModel->loadWhere(["public.tbl_person.person_id" => $this->pid, "zustelladresse" => TRUE]);
+			if (isError($zustellAdressenArray)) {
+				$this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_loadingZustellAdressen_error'));
+			}
+			$zustellAdressenArray = $this->getDataOrTerminateWithError($zustellAdressenArray);
+
+			if (count($zustellAdressenArray) > 0) {
+
+				$zustellAdressenArray = array_filter($zustellAdressenArray, function ($adresse) use ($adresse_id) {
+
+					return $adresse->adresse_id != $adresse_id;
+				});
+
+				// remove the zustelladresse from all other zustelladressen
+				foreach ($zustellAdressenArray as $adresse) {
+					$this->AdresseModel->update($adresse->adresse_id, ["zustelladresse" => FALSE]);
+				}
+
+			}
+		}
+	}
+
+}
+
+
diff --git a/public/js/api/profilUpdate.js b/public/js/api/profilUpdate.js
index ca009547d..8d121fa65 100644
--- a/public/js/api/profilUpdate.js
+++ b/public/js/api/profilUpdate.js
@@ -15,24 +15,19 @@ export default {
         `/api/frontend/v1/ProfilUpdate/getTopic`,{});
     },
   
+    acceptProfilRequest: function ({profil_update_id, uid, status_message, topic, requested_change}) {
 
-    //TODO post request
-    acceptProfilRequest: function (payload) {
-
-        const url =
+      return this.$fhcApi.post(
         FHC_JS_DATA_STORAGE_OBJECT.app_root +
         FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-        "/Cis/ProfilUpdate/acceptProfilRequest";
-      return axios.post(url, payload); 
+        "/api/frontend/v1/ProfilUpdate/acceptProfilRequest",{profil_update_id, uid, status_message, topic, requested_change});
     },
   
-    //TODO post request
-    denyProfilRequest: function (payload) {
-      const url =
+    denyProfilRequest: function ({profil_update_id, uid, topic, status_message}) {
+      return this.$fhcApi.post(
         FHC_JS_DATA_STORAGE_OBJECT.app_root +
         FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-        "/Cis/ProfilUpdate/denyProfilRequest";
-      return axios.post(url, payload);
+        "/api/frontend/v1/ProfilUpdate/denyProfilRequest",{profil_update_id,uid,topic,status_message});
     },
   
     //TODO post request
diff --git a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
index bbf1489a5..01232b4d6 100755
--- a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
+++ b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
@@ -62,7 +62,7 @@ export default {
     handleRequest: function (type) {
       this.loading = true;
       this.setLoading(true);
-      Vue.$fhcapi.ProfilUpdate[
+      this.$fhcApi.factory.profilUpdate[
         type.toLowerCase() == "accept"
           ? "acceptProfilRequest"
           : "denyProfilRequest"
diff --git a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
index bf20c1805..03bbb1071 100644
--- a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
+++ b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
@@ -131,7 +131,7 @@ export default {
                     "this is the data of the context menu action",
                     column.getData()
                   );
-                  Vue.$fhcapi.ProfilUpdate.acceptProfilRequest(column.getData())
+                  this.$fhcApi.factory.profilUpdate.acceptProfilRequest(column.getData())
                     .then((res) => {
                       this.$refs.UpdatesTable.tabulator.setData();
                     })
@@ -149,7 +149,7 @@ export default {
                   "denyUpdate"
                 )}`,
                 action: (e, column) => {
-                  Vue.$fhcapi.ProfilUpdate.denyProfilRequest(column.getData())
+                  this.$fhcApi.factory.profilUpdate.denyProfilRequest(column.getData())
                     .then((res) => {
                       this.$refs.UpdatesTable.tabulator.setData();
                     })
@@ -260,7 +260,9 @@ export default {
                 ${
                   STATUS_PENDING ?
                   `<button class="btn border-success border-2" id="acceptButton"><i class='fa fa-lg fa-circle-check text-success'></i></button>
-                  <button class="btn border-danger border-2" id="denyButton"><i class=' fa fa-lg fa-circle-xmark text-danger'></i></button>`:''
+                  <button class="btn border-danger border-2" id="denyButton"><i class=' fa fa-lg fa-circle-xmark text-danger'></i></button>`
+                  :
+                  ``
                 }
               </div>`;
 
@@ -302,7 +304,7 @@ export default {
   },
   methods: {
     denyProfilUpdate: function (data) {
-      Vue.$fhcapi.ProfilUpdate.denyProfilRequest(data)
+      this.$fhcApi.factory.profilUpdate.denyProfilRequest(data)
         .then((res) => {
           // block when the request was successful
         })
@@ -314,7 +316,7 @@ export default {
         });
     },
     acceptProfilUpdate: function (data) {
-      Vue.$fhcapi.ProfilUpdate.acceptProfilRequest(data)
+      this.$fhcApi.factory.profilUpdate.acceptProfilRequest(data)
         .then((res) => {
           // block when the request was successful
         })

From a06f9b581fe0677f74768c892b6a353f0384f7b5 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 19 Jul 2024 13:11:58 +0200
Subject: [PATCH 0961/1461] adds selectProfilRequest to the new ProfilUpdate
 FhcAPIController

---
 .../api/frontend/v1/ProfilUpdate.php          | 19 +++++++++++++++++++
 public/js/api/profilUpdate.js                 | 13 +++++--------
 .../Cis/Profil/MitarbeiterProfil.js           | 14 ++++++--------
 .../js/components/Cis/Profil/StudentProfil.js | 12 ++++++------
 4 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/application/controllers/api/frontend/v1/ProfilUpdate.php b/application/controllers/api/frontend/v1/ProfilUpdate.php
index 706f2bf29..75e3bf9f0 100644
--- a/application/controllers/api/frontend/v1/ProfilUpdate.php
+++ b/application/controllers/api/frontend/v1/ProfilUpdate.php
@@ -43,6 +43,7 @@ class ProfilUpdate extends FHCAPI_Controller
 			'getProfilRequestFiles' => self::PERM_LOGGED,
 			'denyProfilRequest' => ['student/stammdaten:rw', 'mitarbeiter/stammdaten:rw'],
 			'acceptProfilRequest' => ['student/stammdaten:rw', 'mitarbeiter/stammdaten:rw'],
+			'selectProfilRequest' => self::PERM_LOGGED,
 			
 		]);
 
@@ -115,6 +116,24 @@ class ProfilUpdate extends FHCAPI_Controller
 		$this->terminateWithSuccess(self::$TOPICS);
 	}
 
+	public function selectProfilRequest()
+	{
+
+		$uid = $this->input->get('uid',true);
+		$id = $this->input->get('id',true);
+		$whereClause = ['uid' => $this->uid];
+		
+		if (isset($uid))
+			$whereClause['uid'] = $uid;
+		if (isset($id))
+			$whereClause['id'] = $id;
+
+		$res = $this->ProfilUpdateModel->getProfilUpdatesWhere($whereClause);
+		$res = $this->getDataOrTerminateWithError($res);
+		$this->terminateWithSuccess($res);
+
+	}
+
 	public function getProfilRequestFiles($id)
 	{
 		 if(!$id){
diff --git a/public/js/api/profilUpdate.js b/public/js/api/profilUpdate.js
index 8d121fa65..ccef2f0b2 100644
--- a/public/js/api/profilUpdate.js
+++ b/public/js/api/profilUpdate.js
@@ -43,7 +43,7 @@ export default {
     },
   
     //TODO post request
-    //? new reuquests
+    //? new requests
     insertFile: function (dms, replace = null) {
       const url =
         FHC_JS_DATA_STORAGE_OBJECT.app_root +
@@ -61,19 +61,16 @@ export default {
         FHC_JS_DATA_STORAGE_OBJECT.ci_router +
         `/api/frontend/v1/ProfilUpdate/getProfilRequestFiles/${requestID}`,{});
     },
-
-    search(searchsettings) {
-      const url = '/api/frontend/v1/searchbar/search';
-      return this.$fhcApi.post(url, searchsettings);
-    },
-
   
     selectProfilRequest: function (uid = null, id = null) {
 
         return this.$fhcApi.get(
         FHC_JS_DATA_STORAGE_OBJECT.app_root +
         FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-        `/Cis/ProfilUpdate/selectProfilRequest`,{ uid: uid, id: id });
+        `/api/frontend/v1/ProfilUpdate/selectProfilRequest`,
+        {...(uid?{uid}:{}),
+          ...(id?{id}:{})
+        });
     },
   
     //TODO post request
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 6653c8253..94ae0078f 100755
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -151,17 +151,17 @@ export default {
     hideEditProfilModal: function () {
       //? checks the editModal component property result, if the user made a successful request or not
       if (this.$refs.editModal.result) {
-        Vue.$fhcapi.ProfilUpdate.selectProfilRequest()
+        this.$fhcApi.factory.profilUpdate.selectProfilRequest()
           .then((request) => {
-            if (!request.error) {
+            if (!request.error && request) {
               this.data.profilUpdates = request.data;
               this.data.profilUpdates.sort(this.sortProfilUpdates);
             } else {
-              console.log("Error when fetching profile updates: " + res.data);
+              console.error("Error when fetching profile updates: " + res.data);
             }
           })
           .catch((err) => {
-            console.log(err);
+            console.error(err);
           });
       } else {
         // when modal was closed without submitting request
@@ -184,8 +184,8 @@ export default {
     },
 
     fetchProfilUpdates: function () {
-      Vue.$fhcapi.ProfilUpdate.selectProfilRequest().then((res) => {
-        if (!res.error) {
+      this.$fhcApi.factory.profilUpdate.selectProfilRequest().then((res) => {
+        if (!res.error && res) {
           this.data.profilUpdates = res.data?.length
             ? res.data.sort(this.sortProfilUpdates)
             : null;
@@ -451,8 +451,6 @@ export default {
 
                 <div v-if="data.profilUpdates" class="row d-none d-md-block mb-3">
                 <div class="col mb-3">
-  
-  
                     <!-- PROFIL UPDATES -->
                     <fetch-profil-updates v-if="data.profilUpdates && data.profilUpdates.length" @fetchUpdates="fetchProfilUpdates" :data="data.profilUpdates"></fetch-profil-updates>
                 
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index ffb0d0fd3..5cf92fd9f 100755
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -95,8 +95,8 @@ export default {
       );
     },
     fetchProfilUpdates: function () {
-      Vue.$fhcapi.ProfilUpdate.selectProfilRequest().then((res) => {
-        if (!res.error) {
+      this.$fhcApi.factory.profilUpdate.selectProfilRequest().then((res) => {
+        if (!res.error && res) {
           this.data.profilUpdates = res.data?.length
             ? res.data.sort(this.sortProfilUpdates)
             : null;
@@ -107,17 +107,17 @@ export default {
     hideEditProfilModal: function () {
       //? checks the editModal component property result, if the user made a successful request or not
       if (this.$refs.editModal.result) {
-        Vue.$fhcapi.ProfilUpdate.selectProfilRequest()
+        this.$fhcApi.factory.profilUpdate.selectProfilRequest()
           .then((request) => {
-            if (!request.error) {
+            if (!request.error && res) {
               this.data.profilUpdates = request.data;
               this.data.profilUpdates.sort(this.sortProfilUpdates);
             } else {
-              console.log("Error when fetching profile updates: " + res.data);
+              console.error("Error when fetching profile updates: " + res.data);
             }
           })
           .catch((err) => {
-            console.log(err);
+            console.error(err);
           });
       } else {
         // when modal was closed without submitting request

From 31abd39ba8b40306438b29d0a925a2eeed231176 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 19 Jul 2024 13:34:56 +0200
Subject: [PATCH 0962/1461] PrestudentstatusCheckLib: status history

---
 .../libraries/PrestudentstatusCheckLib.php    | 322 +++++++++++++++++-
 .../models/crm/Prestudentstatus_model.php     |  69 ++++
 2 files changed, 388 insertions(+), 3 deletions(-)

diff --git a/application/libraries/PrestudentstatusCheckLib.php b/application/libraries/PrestudentstatusCheckLib.php
index c458bf907..c7ecad0bf 100644
--- a/application/libraries/PrestudentstatusCheckLib.php
+++ b/application/libraries/PrestudentstatusCheckLib.php
@@ -17,6 +17,8 @@ class PrestudentstatusCheckLib
 	private $_statusAbfolgeVorStudent = [self::INTERESSENT_STATUS, self::BEWERBER_STATUS, self::AUFGENOMMENER_STATUS];
 	private $_endStatusArr = [self::ABSOLVENT_STATUS, self::ABBRECHER_STATUS];
 
+	private $_cache_history = [];
+
 	/**
 	 * Object initialization
 	 */
@@ -140,7 +142,7 @@ class PrestudentstatusCheckLib
 	 *
 	 * @param integer				$prestudent_id
 	 *
-	 * @return boolean
+	 * @return stdClass
 	 */
 	public function checkIfExistingStudentRolle($prestudent_id)
 	{
@@ -265,9 +267,10 @@ class PrestudentstatusCheckLib
 	/**
 	 * Check if Bismeldestichtag erreicht
 	 *
-	 * @param DateTime				$datum
+	 * @param DateTime				$statusDatum
+	 * @param string				$studiensemester_kurzbz
 	 *
-	 * @return boolean
+	 * @return stdClass
 	 */
 	public function checkIfMeldestichtagErreicht($statusDatum, $studiensemester_kurzbz = null)
 	{
@@ -279,6 +282,319 @@ class PrestudentstatusCheckLib
 		return success(getData($result) == "1");
 	}
 
+	/**
+	 * Runs all checks on Status History and saves it in cache.
+	 *
+	 * @param integer				$prestudent_id
+	 * @param string				$status_kurzbz
+	 * @param DateTime				$new_date
+	 * @param string				$new_studiensemester_kurzbz
+	 * @param integer				$new_ausbildungssemester
+	 * @param string				$old_studiensemester_kurzbz
+	 * @param integer				$old_ausbildungssemester
+	 *
+	 * @return stdClass
+	 */
+	protected function prepareStatusHistory(
+		$prestudent_id,
+		$status_kurzbz,
+		$new_date,
+		$new_studiensemester_kurzbz,
+		$new_ausbildungssemester,
+		$old_studiensemester_kurzbz,
+		$old_ausbildungssemester
+	) {
+		// Generate key for caching
+		$primary = implode('|', [
+			$prestudent_id,
+			$status_kurzbz,
+			$new_date->format('Y-m-d'),
+			$new_studiensemester_kurzbz,
+			$new_ausbildungssemester,
+			$old_studiensemester_kurzbz,
+			$old_ausbildungssemester
+		]);
+
+		if (isset($this->_cache_history[$primary]))
+			return $this->_cache_history[$primary];
+
+		$this->_ci->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
+
+		// Get the history
+		$result = $this->_ci->PrestudentstatusModel->getHistoryWithNewOrEditedState(
+			$prestudent_id,
+			$status_kurzbz,
+			$new_date,
+			$new_studiensemester_kurzbz,
+			$new_ausbildungssemester,
+			$old_studiensemester_kurzbz,
+			$old_ausbildungssemester
+		);
+
+		if (isError($result))
+			return $result;
+
+		if (!hasData($result))
+			return error('This is impossible');
+
+		$history = getData($result);
+		$historyCount = count($history);
+
+		// Run checks
+		$checks = [
+			'timesequence' => true,
+			'laststatus' => true,
+			'unterbrechersemester' => true,
+			'abbrechersemester' => true,
+			'diplomant' => true
+		];
+
+		for ($n = 0, $c = 1; $c < $historyCount; $n++, $c++) {
+			if (!$checks['timesequence']
+				&& !$checks['laststatus']
+				&& !$checks['unterbrechersemester']
+				&& !$checks['abbrechersemester']
+				&& !$checks['diplomant']
+			)
+				break; // early out
+
+			$next = $history[$n];
+			$current = $history[$c];
+
+			// Zeitabfolge ungültig?
+			if ($checks['timesequence']
+				&& $next->start < $current->start
+			)
+				$checks['timesequence'] = false;
+
+			// Abbrecher- oder Absolventenstatus muss Endstatus sein
+			if ($checks['laststatus']
+				&& in_array($current->status_kurzbz, ['Absolvent', 'Abbrecher'])
+			)
+				$checks['laststatus'] = false;
+
+			// wenn Unterbrecher auf Unterbrecher folgt, muss Ausbildungssemester gleich sein
+			if ($checks['unterbrechersemester']
+				&& $current->status_kurzbz == 'Unterbrecher'
+				&& $next->status_kurzbz == 'Unterbrecher'
+				&& $current->ausbildungssemester != $next->ausbildungssemester
+			)
+				$checks['unterbrechersemester'] = false;
+
+			// wenn Abbrecher auf Unterbrecher folgt, muss Ausbildungssemester gleich sein
+			if ($checks['abbrechersemester']
+				&& $current->status_kurzbz == 'Unterbrecher'
+				&& $next->status_kurzbz == 'Abbrecher'
+				&& $current->ausbildungssemester != $next->ausbildungssemester
+			)
+				$checks['abbrechersemester'] = false;
+
+			// keine Studenten nach Diplomand Status
+			if ($checks['diplomant']
+				&& $current->status_kurzbz == 'Diplomand'
+				&& $next->status_kurzbz == 'Student'
+			)
+				$checks['diplomant'] = false;
+		}
+
+		$this->_cache_history[$primary] = success($checks);
+
+		return success($checks);
+	}
+
+	/**
+	 * Checks if the time sequence of the status history is valid.
+	 *
+	 * @param integer				$prestudent_id
+	 * @param string				$status_kurzbz
+	 * @param DateTime				$new_date
+	 * @param string				$new_studiensemester_kurzbz
+	 * @param integer				$new_ausbildungssemester
+	 * @param string				$old_studiensemester_kurzbz
+	 * @param integer				$old_ausbildungssemester
+	 *
+	 * @return stdClass
+	 */
+	public function checkStatusHistoryTimesequence(
+		$prestudent_id,
+		$status_kurzbz,
+		$new_date,
+		$new_studiensemester_kurzbz,
+		$new_ausbildungssemester,
+		$old_studiensemester_kurzbz,
+		$old_ausbildungssemester
+	) {
+		$result = $this->prepareStatusHistory(
+			$prestudent_id,
+			$status_kurzbz,
+			$new_date,
+			$new_studiensemester_kurzbz,
+			$new_ausbildungssemester,
+			$old_studiensemester_kurzbz,
+			$old_ausbildungssemester
+		);
+
+		if (isError($result))
+			return $result;
+
+		return success(getData($result)['timesequence']);
+	}
+
+	/**
+	 * Checks if the last status of the status history is not Abbrecher or
+	 * Absolvent.
+	 *
+	 * @param integer				$prestudent_id
+	 * @param string				$status_kurzbz
+	 * @param DateTime				$new_date
+	 * @param string				$new_studiensemester_kurzbz
+	 * @param integer				$new_ausbildungssemester
+	 * @param string				$old_studiensemester_kurzbz
+	 * @param integer				$old_ausbildungssemester
+	 *
+	 * @return stdClass
+	 */
+	public function checkStatusHistoryLaststatus(
+		$prestudent_id,
+		$status_kurzbz,
+		$new_date,
+		$new_studiensemester_kurzbz,
+		$new_ausbildungssemester,
+		$old_studiensemester_kurzbz,
+		$old_ausbildungssemester
+	) {
+		$result = $this->prepareStatusHistory(
+			$prestudent_id,
+			$status_kurzbz,
+			$new_date,
+			$new_studiensemester_kurzbz,
+			$new_ausbildungssemester,
+			$old_studiensemester_kurzbz,
+			$old_ausbildungssemester
+		);
+
+		if (isError($result))
+			return $result;
+
+		return success(getData($result)['laststatus']);
+	}
+
+	/**
+	 * Checks if two consecutively Unterbrecher have the same
+	 * ausbildungssemester in the status history.
+	 *
+	 * @param integer				$prestudent_id
+	 * @param string				$status_kurzbz
+	 * @param DateTime				$new_date
+	 * @param string				$new_studiensemester_kurzbz
+	 * @param integer				$new_ausbildungssemester
+	 * @param string				$old_studiensemester_kurzbz
+	 * @param integer				$old_ausbildungssemester
+	 *
+	 * @return stdClass
+	 */
+	public function checkStatusHistoryUnterbrechersemester(
+		$prestudent_id,
+		$status_kurzbz,
+		$new_date,
+		$new_studiensemester_kurzbz,
+		$new_ausbildungssemester,
+		$old_studiensemester_kurzbz,
+		$old_ausbildungssemester
+	) {
+		$result = $this->prepareStatusHistory(
+			$prestudent_id,
+			$status_kurzbz,
+			$new_date,
+			$new_studiensemester_kurzbz,
+			$new_ausbildungssemester,
+			$old_studiensemester_kurzbz,
+			$old_ausbildungssemester
+		);
+
+		if (isError($result))
+			return $result;
+
+		return success(getData($result)['unterbrechersemester']);
+	}
+
+	/**
+	 * Checks if an Unterbrecher followed by an Abbrecher have the same
+	 * ausbildungssemester in the status history.
+	 *
+	 * @param integer				$prestudent_id
+	 * @param string				$status_kurzbz
+	 * @param DateTime				$new_date
+	 * @param string				$new_studiensemester_kurzbz
+	 * @param integer				$new_ausbildungssemester
+	 * @param string				$old_studiensemester_kurzbz
+	 * @param integer				$old_ausbildungssemester
+	 *
+	 * @return stdClass
+	 */
+	public function checkStatusHistoryAbbrechersemester(
+		$prestudent_id,
+		$status_kurzbz,
+		$new_date,
+		$new_studiensemester_kurzbz,
+		$new_ausbildungssemester,
+		$old_studiensemester_kurzbz,
+		$old_ausbildungssemester
+	) {
+		$result = $this->prepareStatusHistory(
+			$prestudent_id,
+			$status_kurzbz,
+			$new_date,
+			$new_studiensemester_kurzbz,
+			$new_ausbildungssemester,
+			$old_studiensemester_kurzbz,
+			$old_ausbildungssemester
+		);
+
+		if (isError($result))
+			return $result;
+
+		return success(getData($result)['abbrechersemester']);
+	}
+
+	/**
+	 * Checks if no Diplomant is followed by a Student in the status history.
+	 *
+	 * @param integer				$prestudent_id
+	 * @param string				$status_kurzbz
+	 * @param DateTime				$new_date
+	 * @param string				$new_studiensemester_kurzbz
+	 * @param integer				$new_ausbildungssemester
+	 * @param string				$old_studiensemester_kurzbz
+	 * @param integer				$old_ausbildungssemester
+	 *
+	 * @return stdClass
+	 */
+	public function checkStatusHistoryDiplomant(
+		$prestudent_id,
+		$status_kurzbz,
+		$new_date,
+		$new_studiensemester_kurzbz,
+		$new_ausbildungssemester,
+		$old_studiensemester_kurzbz,
+		$old_ausbildungssemester
+	) {
+		$result = $this->prepareStatusHistory(
+			$prestudent_id,
+			$status_kurzbz,
+			$new_date,
+			$new_studiensemester_kurzbz,
+			$new_ausbildungssemester,
+			$old_studiensemester_kurzbz,
+			$old_ausbildungssemester
+		);
+
+		if (isError($result))
+			return $result;
+
+		return success(getData($result)['diplomant']);
+	}
+
 	/**
 	 * Check if History of StatusData is valid
 	 * @param integer $prestudent_id
diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php
index 2600ae64a..a19c465ec 100644
--- a/application/models/crm/Prestudentstatus_model.php
+++ b/application/models/crm/Prestudentstatus_model.php
@@ -629,4 +629,73 @@ class Prestudentstatus_model extends DB_Model
 			'tbl_prestudentstatus.prestudent_id' => $prestudent_id
 		]);
 	}
+
+	/**
+	 * Gets status history of a prestudent for checking purposes.
+	 * This function adds the new state or replaces the edited.
+	 *
+	 * @param integer				$prestudent_id
+	 * @param string				$status_kurzbz
+	 * @param DateTime				$new_date
+	 * @param string				$new_studiensemester_kurzbz
+	 * @param integer				$new_ausbildungssemester
+	 * @param string				$old_studiensemester_kurzbz
+	 * @param integer				$old_ausbildungssemester
+	 *
+	 * @return stdClass
+	 */
+	public function getHistoryWithNewOrEditedState(
+		$prestudent_id,
+		$status_kurzbz,
+		$new_date,
+		$new_studiensemester_kurzbz,
+		$new_ausbildungssemester,
+		$old_studiensemester_kurzbz,
+		$old_ausbildungssemester
+	) {
+		$new_date = $new_date->format('Y-m-d');
+
+		$this->addSelect('status_kurzbz');
+		$this->addSelect('studiensemester_kurzbz');
+		$this->addSelect('ausbildungssemester');
+		$this->addSelect('datum');
+		$this->addSelect('insertamum');
+		$this->addSelect('ext_id');
+
+		if ($old_studiensemester_kurzbz || $old_ausbildungssemester) {
+			$this->db->not_group_start();
+			$this->db->where('status_kurzbz', $status_kurzbz);
+			$this->db->where('studiensemester_kurzbz', $old_studiensemester_kurzbz);
+			$this->db->where('ausbildungssemester', $old_ausbildungssemester);
+			$this->db->group_end();
+		}
+
+		$this->db->where('prestudent_id', $prestudent_id);
+
+		$tmpTable = $this->db->get_compiled_select($this->dbTable);
+
+		$tmpTable .= "UNION
+			SELECT " .
+				$this->escape($status_kurzbz) . " AS status_kurzbz, " .
+				$this->escape($new_studiensemester_kurzbz) . " AS studiensemester_kurzbz, " .
+				$this->escape($new_ausbildungssemester) . " AS ausbildungssemester, " .
+				$this->escape($new_date) . "::date AS datum," .
+				$this->escape(date('c')) . "::date AS insertamum," .
+				"NULL AS ext_id";
+
+		$this->addJoin('public.tbl_studiensemester sem', 'studiensemester_kurzbz');
+
+		$this->addOrder('s.datum', 'DESC');
+		$this->addOrder('s.insertamum', 'DESC');
+		$this->addOrder('s.ext_id', 'DESC');
+
+		$dbTable = $this->dbTable;
+		$this->dbTable = "(" . $tmpTable . ") s";
+
+		$result = $this->load();
+
+		$this->dbTable = $dbTable;
+
+		return $result;
+	}
 }

From fe4b5bf5824fa7c6184daae1af096f8ac2efa93f Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 19 Jul 2024 13:35:21 +0200
Subject: [PATCH 0963/1461] Status insert checks

---
 .../api/frontend/v1/stv/Status.php            | 149 +++++++++++++++++-
 1 file changed, 146 insertions(+), 3 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 3dd75bec0..a524a3c6a 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -76,7 +76,12 @@ class Status extends FHCAPI_Controller
 			[
 				'required', // In FAS empty datum results in todays
 				'is_valid_date',
-				// TODO(chris): before today
+				['is_date_not_before_today', function ($value) {
+					if (!is_valid_date($value))
+						return true; // Error will be handled by the is_valid_date statement above
+					$today = new DateTime('today');
+					return (new DateTime($value) >= $today);
+				}],
 				['meldestichtag_not_exceeded', function ($value) use ($isBerechtigtNoStudstatusCheck) {
 					if ($isBerechtigtNoStudstatusCheck)
 						return true; // Skip if access right says so
@@ -89,7 +94,8 @@ class Status extends FHCAPI_Controller
 				}]
 			],
 			[
-				'meldestichtag_not_exceeded' => $this->p->t('lehre', 'error_dataVorMeldestichtag')
+				'meldestichtag_not_exceeded' => $this->p->t('lehre', 'error_dataVorMeldestichtag'),
+				'is_date_not_before_today' => $this->p->t('lehre', 'error_entryInPast')
 			]
 		);
 
@@ -118,6 +124,10 @@ class Status extends FHCAPI_Controller
 
 		$this->form_validation->set_rules('bestaetigtam', $this->p->t('lehre', 'bestaetigt_am'), 'is_valid_date');
 
+		// Set Datum to null to prevent multiple is_valid_date checks in the following validation rules
+		if (!is_valid_date($datum))
+			$datum = null;
+
 		$this->form_validation->set_rules('_default', '', [
 			['rolle_doesnt_exist', function () use ($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester) {
 				if (!$status_kurzbz || !$studiensemester_kurzbz || !$ausbildungssemester)
@@ -126,9 +136,142 @@ class Status extends FHCAPI_Controller
 				$result = $this->PrestudentstatusModel->load([$ausbildungssemester, $studiensemester_kurzbz, $status_kurzbz, $prestudent_id]);
 
 				return !$this->getDataOrTerminateWithError($result);
+			}],
+			['history_timesequence', function () use (
+				$isBerechtigtNoStudstatusCheck,
+				$prestudent_id,
+				$status_kurzbz,
+				$datum,
+				$studiensemester_kurzbz,
+				$ausbildungssemester
+			) {
+				if ($isBerechtigtNoStudstatusCheck)
+					return true; // Skip if access right says so
+				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester)
+					return true; // Error will be handled by the required statements above
+
+				$result = $this->prestudentstatuschecklib->checkStatusHistoryTimesequence(
+					$prestudent_id,
+					$status_kurzbz,
+					new DateTime($datum),
+					$studiensemester_kurzbz,
+					$ausbildungssemester,
+					'',
+					''
+				);
+
+				return $this->getDataOrTerminateWithError($result);
+			}],
+			['history_laststatus', function () use (
+				$isBerechtigtNoStudstatusCheck,
+				$prestudent_id,
+				$status_kurzbz,
+				$datum,
+				$studiensemester_kurzbz,
+				$ausbildungssemester
+			) {
+				if ($isBerechtigtNoStudstatusCheck)
+					return true; // Skip if access right says so
+				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester)
+					return true; // Error will be handled by the required statements above
+
+				$result = $this->prestudentstatuschecklib->checkStatusHistoryLaststatus(
+					$prestudent_id,
+					$status_kurzbz,
+					new DateTime($datum),
+					$studiensemester_kurzbz,
+					$ausbildungssemester,
+					'',
+					''
+				);
+
+				return $this->getDataOrTerminateWithError($result);
+			}],
+			['history_unterbrecher', function () use (
+				$isBerechtigtNoStudstatusCheck,
+				$prestudent_id,
+				$status_kurzbz,
+				$datum,
+				$studiensemester_kurzbz,
+				$ausbildungssemester
+			) {
+				if ($isBerechtigtNoStudstatusCheck)
+					return true; // Skip if access right says so
+				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester)
+					return true; // Error will be handled by the required statements above
+
+				$result = $this->prestudentstatuschecklib->checkStatusHistoryUnterbrechersemester(
+					$prestudent_id,
+					$status_kurzbz,
+					new DateTime($datum),
+					$studiensemester_kurzbz,
+					$ausbildungssemester,
+					'',
+					''
+				);
+
+				return $this->getDataOrTerminateWithError($result);
+			}],
+			['history_abbrecher', function () use (
+				$isBerechtigtNoStudstatusCheck,
+				$prestudent_id,
+				$status_kurzbz,
+				$datum,
+				$studiensemester_kurzbz,
+				$ausbildungssemester
+			) {
+				if ($isBerechtigtNoStudstatusCheck)
+					return true; // Skip if access right says so
+				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester)
+					return true; // Error will be handled by the required statements above
+
+				$result = $this->prestudentstatuschecklib->checkStatusHistoryAbbrechersemester(
+					$prestudent_id,
+					$status_kurzbz,
+					new DateTime($datum),
+					$studiensemester_kurzbz,
+					$ausbildungssemester,
+					'',
+					''
+				);
+
+				return $this->getDataOrTerminateWithError($result);
+			}],
+			['history_diplomant', function () use (
+				$isBerechtigtNoStudstatusCheck,
+				$prestudent_id,
+				$status_kurzbz,
+				$datum,
+				$studiensemester_kurzbz,
+				$ausbildungssemester
+			) {
+				if ($isBerechtigtNoStudstatusCheck)
+					return true; // Skip if access right says so
+				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester)
+					return true; // Error will be handled by the required statements above
+
+				$result = $this->prestudentstatuschecklib->checkStatusHistoryDiplomant(
+					$prestudent_id,
+					$status_kurzbz,
+					new DateTime($datum),
+					$studiensemester_kurzbz,
+					$ausbildungssemester,
+					'',
+					''
+				);
+
+				return $this->getDataOrTerminateWithError($result);
 			}]
+			// TODO(chris): check status history error_wrongStatusOrderBeforeStudent
+			// TODO(chris): check status history error_personenkennzeichenPasstNichtZuStudiensemester
+			// TODO(chris): check status history error_bewerberOrgformUngleichStudentOrgform
 		], [
-			'rolle_doesnt_exist' => $this->p->t('lehre', 'error_rolleBereitsVorhanden')
+			'rolle_doesnt_exist' => $this->p->t('lehre', 'error_rolleBereitsVorhanden'),
+			'history_timesequence' => $this->p->t('lehre', 'error_statuseintrag_zeitabfolge'),
+			'history_laststatus' => $this->p->t('lehre', 'error_endstatus'),
+			'history_unterbrecher' => $this->p->t('lehre', 'error_consecutiveUnterbrecher'),
+			'history_abbrecher' => $this->p->t('lehre', 'error_consecutiveUnterbrecherAbbrecher'),
+			'history_diplomant' => $this->p->t('lehre', 'error_consecutiveDiplomandStudent')
 		]);
 		
 		if (!$this->form_validation->run())

From 12626511e93da3cd60cc521a0a1501d76cc84b4e Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 19 Jul 2024 14:00:40 +0200
Subject: [PATCH 0964/1461] adds insertProfilRequest to the new ProfilUpdate
 FhcAPIController

---
 .../api/frontend/v1/ProfilUpdate.php          | 146 +++++++++++++++++-
 public/js/api/profilUpdate.js                 |  16 +-
 .../js/components/Calendar/CalendarModal.js   |   2 +-
 .../Cis/Profil/ProfilModal/EditProfil.js      |  20 ++-
 4 files changed, 166 insertions(+), 18 deletions(-)

diff --git a/application/controllers/api/frontend/v1/ProfilUpdate.php b/application/controllers/api/frontend/v1/ProfilUpdate.php
index 75e3bf9f0..27bc10349 100644
--- a/application/controllers/api/frontend/v1/ProfilUpdate.php
+++ b/application/controllers/api/frontend/v1/ProfilUpdate.php
@@ -44,7 +44,7 @@ class ProfilUpdate extends FHCAPI_Controller
 			'denyProfilRequest' => ['student/stammdaten:rw', 'mitarbeiter/stammdaten:rw'],
 			'acceptProfilRequest' => ['student/stammdaten:rw', 'mitarbeiter/stammdaten:rw'],
 			'selectProfilRequest' => self::PERM_LOGGED,
-			
+			'insertProfilRequest' => self::PERM_LOGGED,
 		]);
 
 		// Load language phrases
@@ -134,6 +134,81 @@ class ProfilUpdate extends FHCAPI_Controller
 
 	}
 
+	public function insertProfilRequest()
+	{
+
+		$payload = $this->input->post('payload',true);
+		$topic = $this->input->post('topic',true);
+		$fileID = $this->input->post('fileID',true);
+
+		if(!isset($payload) || !isset($topic)){
+			$this->terminateWithError("required parameters are missing");
+		}
+
+		$identifier = array_key_exists("kontakt_id", $payload) ? "kontakt_id" : (array_key_exists("adresse_id", $payload) ? "adresse_id" : null);
+		
+		$data = ["topic" => $topic, "uid" => $this->uid, "requested_change" => json_encode($payload), "insertamum" => "NOW()", "insertvon" => $this->uid, "status" => self::$STATUS_PENDING ?: 'Pending'];
+
+		//? insert fileID in the dataset if sent with post request
+		if (isset($fileID)) {
+			$data['attachment_id'] = $fileID;
+		}
+
+		//? loops over all updateRequests from a user to validate if the new request is valid
+		$res = $this->ProfilUpdateModel->getProfilUpdatesWhere(["uid" => $this->uid]);
+		if (isError($res)) {
+			$this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_loading_error'));
+		}
+		$res = $this->getDataOrTerminateWithError($res);
+
+		//? the user cannot delete a zustelladresse/kontakt
+		if (isset($payload->delete) && $payload->{$identifier == "kontakt_id" ? "zustellung" : "zustelladresse"}) {
+			$this->terminateWithError(error($this->p->t('profilUpdate', 'profilUpdate_deleteZustellung_error')));
+		}
+
+		//? if the user tries to delete a adresse, checks whether the adresse is a heimatadresse, if so an error is raised
+		if (isset($payload->delete) && $identifier == "adresse_id") {
+			$adr = $this->AdresseModel->load($payload->$identifier);
+			$adr = $this->getDataOrTerminateWithError($adr)[0];
+			if ($adr->heimatadresse) {
+				$this->terminateWithError(error($this->p->t('profilUpdate', 'profilUpdate_deleteZustellung_error')));
+			}
+		}
+
+		if ($res) {
+			$pending_changes = array_filter($res, function ($element) {
+				return $element->status == (self::$STATUS_PENDING ?: "Pending");
+			});
+
+			foreach ($pending_changes as $update_request) {
+				$existing_change = $update_request->requested_change;
+				
+				//? the user can add as many new kontakte/adressen as he likes
+				if (!isset($payload->add) && property_exists($existing_change, $identifier) && property_exists($payload, $identifier) && $existing_change->$identifier == $payload->$identifier) {
+					//? the kontakt_id / adresse_id of a change has to be unique 
+					$this->terminateWithError(error($this->p->t('profilUpdate', 'profilUpdate_changeTwice_error')));
+				}
+
+				//? if it is not updating any kontakt/adresse, the topic has to be unique
+				elseif (!$identifier && $update_request->topic == $topic) {
+					$this->terminateWithError(error($this->p->t('profilUpdate', 'profilUpdate_changeTopicTwice_error', ['0' => $update_request->topic])));
+				}
+			}
+		}
+
+		$insertID = $this->ProfilUpdateModel->insert($data);
+
+		if (isError($insertID)) {
+			$this->terminateWithError(error($insertID));
+		} else {
+			
+			$insertID = hasData($insertID) ? getData($insertID) : null;
+			//? sends emails to the correspondents of the $uid
+			$this->sendEmail_onProfilUpdate_insertion($this->uid, $insertID, $topic);
+			$this->terminateWithSuccess(success($insertID));
+		}
+	}
+
 	public function getProfilRequestFiles($id)
 	{
 		 if(!$id){
@@ -277,6 +352,75 @@ class ProfilUpdate extends FHCAPI_Controller
 	// Private methods
 
 
+	private function sendEmail_onProfilUpdate_insertion($uid, $profil_update_id, $topic)
+	{
+
+		$this->load->helper('hlp_sancho_helper');
+		$emails = [];
+
+		$is_mitarbeiter = $this->MitarbeiterModel->isMitarbeiter($uid);
+		if (isError($is_mitarbeiter)) {
+			$this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_mitarbeiterCheck_error'));
+		}
+		$is_mitarbeiter = $this->getDataOrTerminateWithError($is_mitarbeiter);
+
+		//! if the $uid is a mitarbeiter and student, only the hr is notified by email
+		if ($is_mitarbeiter) {
+			//? user is not a student therefore he is a mitarbeiter, send email to Personalverwaltung
+			//? use constant variable MAIL_GST to mail to the personalverwaltung
+			$this->MitarbeiterModel->addSelect([TRUE]);
+			$this->MitarbeiterModel->addJoin("public.tbl_benutzer", "public.tbl_benutzer.uid = public.tbl_mitarbeiter.mitarbeiter_uid");
+			//? check if the the userID is a mitarbeiter and if the benutzer is active
+			$res = $this->MitarbeiterModel->loadWhere(["public.tbl_mitarbeiter.mitarbeiter_uid" => $uid, "public.tbl_benutzer.aktiv" => TRUE]);
+			if (isError($res)) {
+				$this->terminateWithError("was not able to query the mitarbeiter and benutzer by the uid: " . $uid);
+			}
+			if (hasData($res)) {
+				array_push($emails, MAIL_GST);
+			} else {
+				$this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_mitarbeiterCheck_error'));
+			}
+		} else {
+			//? if it is not a mitarbeiter, check whether it is a student and send email to studiengang
+			$is_student = $this->StudentModel->isStudent($uid);
+			if (isError($is_student)) {
+				$this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_studentCheck_error'));
+			}
+			$is_student = $this->getDataOrTerminateWithError($is_student);
+			if ($is_student) {
+				//? Send email to the Studiengangsassistentinnen
+				$this->StudentModel->addSelect(["public.tbl_studiengang.email"]);
+				$this->StudentModel->addJoin("public.tbl_benutzer", "public.tbl_benutzer.uid = public.tbl_student.student_uid");
+				$this->StudentModel->addJoin("public.tbl_prestudent", "public.tbl_benutzer.person_id = public.tbl_prestudent.person_id");
+				$this->StudentModel->addJoin("public.tbl_prestudentstatus", "public.tbl_prestudentstatus.prestudent_id = public.tbl_prestudent.prestudent_id");
+				$this->StudentModel->addJoin("public.tbl_studiengang", "public.tbl_studiengang.studiengang_kz = public.tbl_prestudent.studiengang_kz");
+				//* check if the benutzer itself is active
+				//* check if the student status is Student or Diplomand (active students)
+				$this->StudentModel->db->where_in("public.tbl_prestudentstatus.status_kurzbz", ['Student', 'Diplomand']);
+				$res = $this->StudentModel->loadWhere(["public.tbl_benutzer.aktiv" => TRUE, "public.tbl_student.student_uid" => $uid]);
+				if (isError($res)) {
+					$this->terminateWithError(getData($res));
+				} else {
+					$res = $this->getDataOrTerminateWithError($res);
+					foreach ($res as $emailObj) {
+						array_push($emails, $emailObj->email);
+					}
+				}
+			}
+		}
+		$mail_res = [];
+		//? sending email
+		foreach ($emails as $email) {
+			array_push($mail_res, sendSanchoMail("profil_update", ['uid' => $uid, 'topic' => $topic, 'href' => APP_ROOT . 'Cis/ProfilUpdate/id/' . $profil_update_id], $email, ("Profil Änderung von " . $uid)));
+		}
+		foreach ($mail_res as $m_res) {
+			if (!$m_res) {
+				$this->addError($this->p->t('profilUpdate', 'profilUpdate_email_error'));
+			}
+		}
+
+	}
+	
 	private function sendEmail_onProfilUpdate_response($uid, $topic, $status)
 	{
 		$this->load->helper('hlp_sancho_helper');
diff --git a/public/js/api/profilUpdate.js b/public/js/api/profilUpdate.js
index ccef2f0b2..ea4ca69c7 100644
--- a/public/js/api/profilUpdate.js
+++ b/public/js/api/profilUpdate.js
@@ -75,16 +75,16 @@ export default {
   
     //TODO post request
     insertProfilRequest: function (topic, payload, fileID = null) {
-      const url =
+
+      return this.$fhcApi.post(
         FHC_JS_DATA_STORAGE_OBJECT.app_root +
         FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-        `/Cis/ProfilUpdate/insertProfilRequest`;
-  
-      return axios.post(url, {
-        topic,
-        payload,
-        ...(fileID ? { fileID: fileID } : {}),
-      });
+        "/api/frontend/v1/ProfilUpdate/insertProfilRequest",
+        {
+          topic,
+          payload,
+          ...(fileID ? { fileID } : {}),
+        });
     },
   
     //TODO post request
diff --git a/public/js/components/Calendar/CalendarModal.js b/public/js/components/Calendar/CalendarModal.js
index 5f6fd9d09..293ca49b8 100644
--- a/public/js/components/Calendar/CalendarModal.js
+++ b/public/js/components/Calendar/CalendarModal.js
@@ -95,7 +95,7 @@ export default {
               .catch((err) => {
                 console.error(err);
               })
-          : Vue.$fhcapi.ProfilUpdate.insertProfilRequest(
+          : this.$fhcApi.factory.profilUpdate.insertProfilRequest(
               this.topic,
               this.profilUpdate,
               this.fileID ? this.fileID[0] : null
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfil.js b/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
index 189dd8f5d..e3b2f08f3 100755
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
@@ -55,6 +55,10 @@ export default {
     },
 
     async submitProfilChange() {
+
+      //todo delete this debugging line
+      console.log("this is a test")
+
       //? check if data is valid before making a request
       if (this.topic && this.profilUpdate) {
         //? if profil update contains any attachment
@@ -71,18 +75,18 @@ export default {
           this.loading = false;
           this.setLoading(false);
 
-          if (res.data.error == 0) {
-            this.result = true;
-            this.hide();
-            Alert.popup(
-              "Ihre Anfrage wurde erfolgreich gesendet. Bitte warten Sie, während sich das Team um Ihre Anfrage kümmert."
-            );
-          } else {
+          if (res.data.error) {
             this.result = false;
             this.hide();
             Alert.popup(
               "Ein Fehler ist aufgetreten: " + JSON.stringify(res.data.retval)
             );
+          } else {
+            this.result = true;
+            this.hide();
+            Alert.popup(
+              "Ihre Anfrage wurde erfolgreich gesendet. Bitte warten Sie, während sich das Team um Ihre Anfrage kümmert."
+            );
           }
         };
 
@@ -104,7 +108,7 @@ export default {
               .catch((err) => {
                 console.error(err);
               })
-          : Vue.$fhcapi.ProfilUpdate.insertProfilRequest(
+          : this.$fhcApi.factory.profilUpdate.insertProfilRequest(
               this.topic,
               this.profilUpdate,
               this.fileID ? this.fileID[0] : null

From 8700abd0fae34c3592448af282029214ba9184e8 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 19 Jul 2024 14:50:00 +0200
Subject: [PATCH 0965/1461] adds updateProfilRequest to the new ProfilUpdate
 FhcAPIController

---
 .../api/frontend/v1/ProfilUpdate.php          | 55 ++++++++++++++-----
 public/js/api/profilUpdate.js                 | 20 +++----
 .../js/components/Calendar/CalendarModal.js   |  2 +-
 .../Cis/Profil/ProfilModal/EditProfil.js      |  2 +-
 system/phrasesupdate.php                      |  2 +-
 5 files changed, 54 insertions(+), 27 deletions(-)

diff --git a/application/controllers/api/frontend/v1/ProfilUpdate.php b/application/controllers/api/frontend/v1/ProfilUpdate.php
index 27bc10349..c9b453c78 100644
--- a/application/controllers/api/frontend/v1/ProfilUpdate.php
+++ b/application/controllers/api/frontend/v1/ProfilUpdate.php
@@ -45,6 +45,8 @@ class ProfilUpdate extends FHCAPI_Controller
 			'acceptProfilRequest' => ['student/stammdaten:rw', 'mitarbeiter/stammdaten:rw'],
 			'selectProfilRequest' => self::PERM_LOGGED,
 			'insertProfilRequest' => self::PERM_LOGGED,
+			'updateProfilRequest' => self::PERM_LOGGED,
+			
 		]);
 
 		// Load language phrases
@@ -163,7 +165,7 @@ class ProfilUpdate extends FHCAPI_Controller
 
 		//? the user cannot delete a zustelladresse/kontakt
 		if (isset($payload->delete) && $payload->{$identifier == "kontakt_id" ? "zustellung" : "zustelladresse"}) {
-			$this->terminateWithError(error($this->p->t('profilUpdate', 'profilUpdate_deleteZustellung_error')));
+			$this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_deleteZustellung_error'));
 		}
 
 		//? if the user tries to delete a adresse, checks whether the adresse is a heimatadresse, if so an error is raised
@@ -171,7 +173,7 @@ class ProfilUpdate extends FHCAPI_Controller
 			$adr = $this->AdresseModel->load($payload->$identifier);
 			$adr = $this->getDataOrTerminateWithError($adr)[0];
 			if ($adr->heimatadresse) {
-				$this->terminateWithError(error($this->p->t('profilUpdate', 'profilUpdate_deleteZustellung_error')));
+				$this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_deleteZustellung_error'));
 			}
 		}
 
@@ -186,12 +188,12 @@ class ProfilUpdate extends FHCAPI_Controller
 				//? the user can add as many new kontakte/adressen as he likes
 				if (!isset($payload->add) && property_exists($existing_change, $identifier) && property_exists($payload, $identifier) && $existing_change->$identifier == $payload->$identifier) {
 					//? the kontakt_id / adresse_id of a change has to be unique 
-					$this->terminateWithError(error($this->p->t('profilUpdate', 'profilUpdate_changeTwice_error')));
+					$this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_changeTwice_error'));
 				}
 
 				//? if it is not updating any kontakt/adresse, the topic has to be unique
 				elseif (!$identifier && $update_request->topic == $topic) {
-					$this->terminateWithError(error($this->p->t('profilUpdate', 'profilUpdate_changeTopicTwice_error', ['0' => $update_request->topic])));
+					$this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_changeTopicTwice_error', ['0' => $update_request->topic]));
 				}
 			}
 		}
@@ -199,7 +201,7 @@ class ProfilUpdate extends FHCAPI_Controller
 		$insertID = $this->ProfilUpdateModel->insert($data);
 
 		if (isError($insertID)) {
-			$this->terminateWithError(error($insertID));
+			$this->terminateWithError(getError($insertID));
 		} else {
 			
 			$insertID = hasData($insertID) ? getData($insertID) : null;
@@ -209,6 +211,33 @@ class ProfilUpdate extends FHCAPI_Controller
 		}
 	}
 
+	public function updateProfilRequest()
+	{
+		$topic = $this->input->post('topic', true);
+		$payload = $this->input->post('payload', true);
+		$ID = $this->input->post('ID', true);
+		$fileID = $this->input->post('fileID', true);//optional
+
+		if(!isset($topic) || !isset($payload) || !isset($ID)){
+			$this->terminateWithError("required parameters are missing");
+		}
+
+		$updateData = ["requested_change" => json_encode($payload), "updateamum" => "NOW()", "updatevon" => $this->uid];
+		if (isset($fileID)) {
+			$updateData['attachment_id'] = json_decode($fileID);
+		}
+		$updateID = $this->ProfilUpdateModel->update([$ID], $updateData);
+		//? insert fileID in the dataset if sent with post request
+
+		if (isError($updateID)) {
+			$this->terminateWithError(getError($updateID));
+		}
+		
+		$updateID = $this->getDataOrTerminateWithError($updateID)[0];
+		
+		$this->terminateWithSuccess(success($updateID));
+	}
+
 	public function getProfilRequestFiles($id)
 	{
 		 if(!$id){
@@ -218,7 +247,7 @@ class ProfilUpdate extends FHCAPI_Controller
 		$this->ProfilUpdateModel->addSelect(["attachment_id"]);
 		$attachmentID = $this->ProfilUpdateModel->load([$id]);
 		if (isError($attachmentID)) {
-			$this->terminateWithError(error($this->p->t('profilUpdate', 'profilUpdate_loading_error')),self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_loading_error'),self::ERROR_TYPE_GENERAL);
 		}
 		//? get the attachmentID
 		$dms_id = $this->getDataOrTerminateWithError($attachmentID)[0]->attachment_id;
@@ -227,7 +256,7 @@ class ProfilUpdate extends FHCAPI_Controller
 		$this->DmsVersionModel->addSelect(["name", "dms_id"]);
 		$attachment = $this->DmsVersionModel->load([$dms_id, 0]);
 		if (isError($attachment)) {
-			$this->terminateWithError(error($this->p->t('profilUpdate', 'profilUpdate_dmsVersion_error')),self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_dmsVersion_error'),self::ERROR_TYPE_GENERAL);
 		}
 		$attachment = $this->getDataOrTerminateWithError($attachment);
 		//? returns {name:..., dms_id:...}
@@ -276,7 +305,7 @@ class ProfilUpdate extends FHCAPI_Controller
 
 		//! check for required information
 		if (!isset($id) || !isset($uid) || !isset($personID) || !isset($requested_change) || !isset($topic)) {
-			$this->terminateWithError(error($this->p->t('profilUpdate', 'profilUpdate_requiredInformation_error')));
+			$this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_requiredInformation_error'));
 		}
 
 		$is_mitarbeiter = $this->MitarbeiterModel->isMitarbeiter($uid);
@@ -299,7 +328,7 @@ class ProfilUpdate extends FHCAPI_Controller
 					$requested_change['adresse_id'] = $insertID;
 					$update_res = $this->updateRequestedChange($id, $requested_change);
 					if (isError($update_res)) {
-						$this->terminateWithError(error($this->p->t('profilUpdate', 'profilUpdate_address_error', [$insertID])));
+						$this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_address_error', [$insertID]));
 					}
 				}
 
@@ -310,7 +339,7 @@ class ProfilUpdate extends FHCAPI_Controller
 					$requested_change['kontakt_id'] = $insertID;
 					$update_res = $this->updateRequestedChange($id, $requested_change);
 					if (isError($update_res)) {
-						$this->terminateWithError(error($this->p->t('profilUpdate', 'profilUpdate_kontakt_error', [$insertID])));
+						$this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_kontakt_error', [$insertID]));
 					}
 				}
 
@@ -335,7 +364,7 @@ class ProfilUpdate extends FHCAPI_Controller
 				}
 
 				$result = $this->PersonModel->update($personID, [$topic => $requested_change["value"]]);
-				if (isError($result)) $this->terminateWithError(error($this->p->t('profilUpdate', 'profilUpdate_insert_error')));
+				if (isError($result)) $this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_insert_error'));
 			
 			}
 			$this->sendEmail_onProfilUpdate_response($uid, $topic, self::$STATUS_ACCEPTED);
@@ -399,7 +428,7 @@ class ProfilUpdate extends FHCAPI_Controller
 				$this->StudentModel->db->where_in("public.tbl_prestudentstatus.status_kurzbz", ['Student', 'Diplomand']);
 				$res = $this->StudentModel->loadWhere(["public.tbl_benutzer.aktiv" => TRUE, "public.tbl_student.student_uid" => $uid]);
 				if (isError($res)) {
-					$this->terminateWithError(getData($res));
+					$this->terminateWithError(getError($res));
 				} else {
 					$res = $this->getDataOrTerminateWithError($res);
 					foreach ($res as $emailObj) {
@@ -498,7 +527,7 @@ class ProfilUpdate extends FHCAPI_Controller
 		elseif (array_key_exists('delete', $requested_change) && $requested_change['delete']) {
 			$result = $this->AdresseModel->delete($adresse_id);
 			if(isError($result)){
-				$this->terminateWithError(error($result));
+				$this->terminateWithError(getError($result));
 			}
 		}
 		//! UPDATE
diff --git a/public/js/api/profilUpdate.js b/public/js/api/profilUpdate.js
index ea4ca69c7..50ced7cdd 100644
--- a/public/js/api/profilUpdate.js
+++ b/public/js/api/profilUpdate.js
@@ -73,7 +73,6 @@ export default {
         });
     },
   
-    //TODO post request
     insertProfilRequest: function (topic, payload, fileID = null) {
 
       return this.$fhcApi.post(
@@ -87,19 +86,18 @@ export default {
         });
     },
   
-    //TODO post request
     updateProfilRequest: function (topic, payload, ID, fileID = null) {
-      const url =
+
+      return this.$fhcApi.post(
         FHC_JS_DATA_STORAGE_OBJECT.app_root +
         FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-        `/Cis/ProfilUpdate/updateProfilRequest`;
-  
-      return axios.post(url, {
-        topic,
-        payload,
-        ID,
-        ...(fileID ? { fileID: fileID } : {}),
-      });
+        `/api/frontend/v1/ProfilUpdate/updateProfilRequest`,
+        {
+          topic,
+          payload,
+          ID,
+          ...(fileID ? { fileID: fileID } : {}),
+        });
     },
   
     //TODO post request
diff --git a/public/js/components/Calendar/CalendarModal.js b/public/js/components/Calendar/CalendarModal.js
index 293ca49b8..a9a11f8f7 100644
--- a/public/js/components/Calendar/CalendarModal.js
+++ b/public/js/components/Calendar/CalendarModal.js
@@ -83,7 +83,7 @@ export default {
         this.setLoading(true);
 
         this.editData.updateID
-          ? Vue.$fhcapi.ProfilUpdate.updateProfilRequest(
+          ? this.$fhcApi.factory.profilUpdate.updateProfilRequest(
               this.topic,
               this.profilUpdate,
               this.editData.updateID,
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfil.js b/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
index e3b2f08f3..86b704c25 100755
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
@@ -96,7 +96,7 @@ export default {
         this.setLoading(true);
 
         this.editData.updateID
-          ? Vue.$fhcapi.ProfilUpdate.updateProfilRequest(
+          ? this.$fhcApi.factory.profilUpdate.updateProfilRequest(
               this.topic,
               this.profilUpdate,
               this.editData.updateID,
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 8c140ea63..8dc1d163f 100755
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -25873,7 +25873,7 @@ array(
 			'phrases' => array(
 				array(
 					'sprache' => 'German',
-					'text' => '!Achtung: Eine deiner Adressen ist bereits als Zustelladresse gespeichert, sind sie sicher, dass sie die aktuelle Adresse stattdessen als Zustelladresse speichern wollen?',
+					'text' => '!Achtung: Eine Ihrer Adressen ist bereits als Zustelladresse gespeichert, sind sie sicher, dass sie die aktuelle Adresse stattdessen als Zustelladresse speichern wollen?',
 					'description' => '',
 					'insertvon' => 'system'
 				),

From 0cc62221757639ad30f4afe7d1777fa246a65fa8 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 19 Jul 2024 14:57:42 +0200
Subject: [PATCH 0966/1461] adds deleteProfilRequest to the new ProfilUpdate
 FhcAPIController

---
 .../controllers/api/frontend/v1/ProfilUpdate.php  | 15 +++++++++++++--
 public/js/api/profilUpdate.js                     | 11 ++++++-----
 .../Profil/ProfilComponents/FetchProfilUpdates.js |  5 +++--
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/application/controllers/api/frontend/v1/ProfilUpdate.php b/application/controllers/api/frontend/v1/ProfilUpdate.php
index c9b453c78..44d70afb4 100644
--- a/application/controllers/api/frontend/v1/ProfilUpdate.php
+++ b/application/controllers/api/frontend/v1/ProfilUpdate.php
@@ -46,8 +46,8 @@ class ProfilUpdate extends FHCAPI_Controller
 			'selectProfilRequest' => self::PERM_LOGGED,
 			'insertProfilRequest' => self::PERM_LOGGED,
 			'updateProfilRequest' => self::PERM_LOGGED,
-			
-		]);
+			'deleteProfilRequest' => self::PERM_LOGGED,
+			]);
 
 		// Load language phrases
 		$this->loadPhrases(
@@ -238,6 +238,17 @@ class ProfilUpdate extends FHCAPI_Controller
 		$this->terminateWithSuccess(success($updateID));
 	}
 
+	public function deleteProfilRequest()
+	{
+
+		$requestID = $this->input->post('requestID', true);
+		$result = $this->ProfilUpdateModel->delete([$requestID]);
+		if (isError($result)) {
+			$this->terminateWithError(getError($result));
+		}
+		$this->terminateWithSuccess($result);
+	}
+
 	public function getProfilRequestFiles($id)
 	{
 		 if(!$id){
diff --git a/public/js/api/profilUpdate.js b/public/js/api/profilUpdate.js
index 50ced7cdd..742e4a1b1 100644
--- a/public/js/api/profilUpdate.js
+++ b/public/js/api/profilUpdate.js
@@ -100,14 +100,15 @@ export default {
         });
     },
   
-    //TODO post request
     deleteProfilRequest: function (requestID) {
-      const url =
+
+      return this.$fhcApi.post(
         FHC_JS_DATA_STORAGE_OBJECT.app_root +
         FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-        `/Cis/ProfilUpdate/deleteProfilRequest`;
-  
-      return axios.post(url, requestID);
+        `/api/frontend/v1/ProfilUpdate/deleteProfilRequest`,
+        {
+          requestID,
+        });
     },
   };
   
\ No newline at end of file
diff --git a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
index 368b5e111..9caee9468 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
@@ -107,17 +107,18 @@ export default {
     },
 
     deleteRequest: function (item) {
-      Vue.$fhcapi.ProfilUpdate.deleteProfilRequest(item.profil_update_id).then(
+      this.$fhcApi.factory.profilUpdate.deleteProfilRequest(item.profil_update_id).then(
         (res) => {
           if (res.data.error) {
             //? open alert
-            console.log(res.data);
+            console.error("error happened",res.data);
           } else {
             this.$emit("fetchUpdates");
           }
         }
       );
     },
+    
     getView: function (topic, status) {
       if (!(status === this.profilUpdateStates["Pending"])) {
         return "Status";

From a0871657cafc401cc4f71b60b8da8dabde896ddd Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 22 Jul 2024 11:24:47 +0200
Subject: [PATCH 0967/1461] adds insertFile to the new ProfilUpdate
 FhcAPIController and starts a transaction when deleting the foreign key from
 the profil update and deleting the old file

---
 .../api/frontend/v1/ProfilUpdate.php          | 115 ++++++++++++++++++
 .../models/person/Profil_update_model.php     |  15 +++
 public/js/api/profilUpdate.js                 |  11 +-
 .../js/components/Calendar/CalendarModal.js   |   4 +-
 .../Cis/Profil/ProfilModal/EditProfil.js      |   4 +-
 5 files changed, 139 insertions(+), 10 deletions(-)

diff --git a/application/controllers/api/frontend/v1/ProfilUpdate.php b/application/controllers/api/frontend/v1/ProfilUpdate.php
index 44d70afb4..4b9dedb48 100644
--- a/application/controllers/api/frontend/v1/ProfilUpdate.php
+++ b/application/controllers/api/frontend/v1/ProfilUpdate.php
@@ -47,6 +47,7 @@ class ProfilUpdate extends FHCAPI_Controller
 			'insertProfilRequest' => self::PERM_LOGGED,
 			'updateProfilRequest' => self::PERM_LOGGED,
 			'deleteProfilRequest' => self::PERM_LOGGED,
+			'insertFile' => self::PERM_LOGGED,
 			]);
 
 		// Load language phrases
@@ -388,6 +389,68 @@ class ProfilUpdate extends FHCAPI_Controller
 
 	}
 
+	public function insertFile($replace)
+	{
+		$replace = json_decode($replace);
+		
+		if (!count($_FILES)) {
+			$this->terminateWithError("No file available for upload");
+		}
+
+		//? if replace is set it contains the profil_update_id in which the attachment_id has to be replaced
+		if (isset($replace)) {
+			
+			$this->ProfilUpdateModel->addSelect(["attachment_id"]);
+			$profilUpdate = $this->ProfilUpdateModel->load([$replace]);
+			if (isError($profilUpdate)) {
+				$this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_loading_error'));
+			}
+			//? get the attachmentID
+			$dms_id = $this->getDataOrTerminateWithError($profilUpdate)[0]->attachment_id;
+
+			//? delete old dms_file of Profil Update
+			$deleteOldFile_result = $this->deleteOldVersionFile($dms_id);
+			if(!$deleteOldFile_result){
+				$this->terminateWithError("error while deleting the old file");
+			}
+		}
+
+
+		$files = $_FILES['files'];
+		$file_count = count($files['name']);
+
+		$res = [];
+
+		for ($i = 0; $i < $file_count; $i++) {
+			$_FILES['files']['name'] = $files['name'][$i];
+			$_FILES['files']['type'] = $files['type'][$i];
+			$_FILES['files']['tmp_name'] = $files['tmp_name'][$i];
+			$_FILES['files']['error'] = $files['error'][$i];
+			$_FILES['files']['size'] = $files['size'][$i];
+
+			$dms = [
+				"kategorie_kurzbz" => "profil_aenderung",
+				"version" => 0,
+				"name" => $_FILES['files']['name'],
+				"mimetype" => $_FILES['files']['type'],
+				"beschreibung" => $this->uid . " Profil Änderung",
+				"insertvon" => $this->uid,
+				"insertamum" => "NOW()",
+			];
+
+			$tmp_res = $this->dmslib->upload($dms, 'files', array("jpg", "png", "pdf"));
+			
+			if(isError($tmp_res)){
+				$this->addError(getError($tmp_res));
+			}
+
+			$tmp_res = $this->getDataOrTerminateWithError($tmp_res);
+			array_push($res, $tmp_res);
+		}
+
+		$this->terminateWithSuccess($res);
+	}
+
 	//------------------------------------------------------------------------------------------------------------------
 	// Private methods
 
@@ -584,6 +647,58 @@ class ProfilUpdate extends FHCAPI_Controller
 		}
 	}
 
+	private function deleteOldVersionFile($dms_id)
+	{
+		// starting the transaction
+		$this->db->trans_start();
+
+
+		if (!isset($dms_id)) {
+			return;
+		}
+
+		//? delete the file from the profilUpdate first
+		$profilUpdateFileDelete = $this->ProfilUpdateModel->removeFileFromProfilUpdate($dms_id);
+		if(isError($profilUpdateFileDelete)){
+			$this->terminateWithError(getError($profilUpdateFileDelete));
+		}
+		
+		//? delete all the different versions of the dms_file
+		$dmsVersions = $this->DmsVersionModel->loadWhere(["dms_id" => $dms_id]);
+		$dmsVersions = $this->getDataOrTerminateWithError($dmsVersions);
+		
+		
+
+		$dms_versions = array_map(function ($item) {
+			return $item->version;
+		}, $dmsVersions);
+
+
+		$test_array = array();
+		foreach ($dms_versions as $version) {
+			
+			$delete_result = $this->dmslib->removeVersion($dms_id, $version);
+			array_push($test_array, $delete_result);
+			
+			if(isError($delete_result)){
+				$this->addError(getError($delete_result));
+			}
+		}
+
+		// transaction complete
+		$this->db->trans_complete();
+
+		if ($this->db->trans_status() === FALSE)
+		{
+			return false;
+		}
+		else
+		{
+			return true;
+		}
+		
+	}
+
 }
 
 
diff --git a/application/models/person/Profil_update_model.php b/application/models/person/Profil_update_model.php
index 68394dd9a..ffb04b7e7 100755
--- a/application/models/person/Profil_update_model.php
+++ b/application/models/person/Profil_update_model.php
@@ -77,6 +77,21 @@ class Profil_update_model extends DB_Model
 
 	}
 
+	//? remove File from the Profil Update
+	public function removeFileFromProfilUpdate($dms_id)
+	{
+
+		if(!is_int($dms_id) || $dms_id < 0){
+			return error("not valid dms_id");
+		}
+		
+		return $this->execReadOnlyQuery("
+		UPDATE public.tbl_profil_update
+		SET attachment_id = NULL
+		WHERE attachment_id = ?", [$dms_id]);
+
+	}
+
 
 	/**
 	 * getProfilUpdateWithPermission
diff --git a/public/js/api/profilUpdate.js b/public/js/api/profilUpdate.js
index 742e4a1b1..acfe99813 100644
--- a/public/js/api/profilUpdate.js
+++ b/public/js/api/profilUpdate.js
@@ -45,14 +45,13 @@ export default {
     //TODO post request
     //? new requests
     insertFile: function (dms, replace = null) {
-      const url =
+
+      return this.$fhcApi.post(
         FHC_JS_DATA_STORAGE_OBJECT.app_root +
         FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-        `/Cis/ProfilUpdate/insertFile/${replace}`;
-  
-      return axios.post(url, dms, {
-        headers: { "Content-Type": "multipart/form-data" },
-      });
+        `/api/frontend/v1/ProfilUpdate/insertFile/${replace}`,
+        dms);
+
     },
     
     getProfilRequestFiles: function (requestID) {
diff --git a/public/js/components/Calendar/CalendarModal.js b/public/js/components/Calendar/CalendarModal.js
index a9a11f8f7..1d143986a 100644
--- a/public/js/components/Calendar/CalendarModal.js
+++ b/public/js/components/Calendar/CalendarModal.js
@@ -116,14 +116,14 @@ export default {
         const result = this.editData.updateID
           ? //? updating old attachment by replacing
             //* second parameter of api request insertFile checks if the file has to be replaced or not
-            await Vue.$fhcapi.ProfilUpdate.insertFile(
+            await this.$fhcApi.factory.profilUpdate.insertFile(
               formData,
               this.editData.updateID
             ).then((res) => {
               return res.data?.map((file) => file.dms_id);
             })
           : //? fresh insert of new attachment
-            await Vue.$fhcapi.ProfilUpdate.insertFile(formData).then((res) => {
+            await this.$fhcApi.factory.profilUpdate.insertFile(formData).then((res) => {
               return res.data?.map((file) => file.dms_id);
             });
         return result;
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfil.js b/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
index 86b704c25..1b54fe7f6 100755
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
@@ -129,14 +129,14 @@ export default {
         const result = this.editData.updateID
           ? //? updating old attachment by replacing
             //* second parameter of api request insertFile checks if the file has to be replaced or not
-            await Vue.$fhcapi.ProfilUpdate.insertFile(
+            await this.$fhcApi.factory.profilUpdate.insertFile(
               formData,
               this.editData.updateID
             ).then((res) => {
               return res.data?.map((file) => file.dms_id);
             })
           : //? fresh insert of new attachment
-            await Vue.$fhcapi.ProfilUpdate.insertFile(formData).then((res) => {
+            await this.$fhcApi.factory.profilUpdate.insertFile(formData).then((res) => {
               return res.data?.map((file) => file.dms_id);
             });
         return result;

From 82417a7f6f62b74e2d6f712fd47a99bc48e66405 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 22 Jul 2024 11:36:12 +0200
Subject: [PATCH 0968/1461] removes old api files and removes the use(fhcApi)
 because it is already imported in the Phrasen plugin

---
 public/js/api/profilUpdate.js              |  14 ---
 public/js/apps/Cis/Profil.js               |   5 +-
 public/js/apps/Cis/ProfilUpdateRequests.js |   2 -
 public/js/apps/api/profilUpdate.js         | 120 ---------------------
 public/js/apps/api/userdata.js             |  58 ----------
 5 files changed, 1 insertion(+), 198 deletions(-)
 delete mode 100755 public/js/apps/api/profilUpdate.js
 delete mode 100755 public/js/apps/api/userdata.js

diff --git a/public/js/api/profilUpdate.js b/public/js/api/profilUpdate.js
index acfe99813..fe15a295e 100644
--- a/public/js/api/profilUpdate.js
+++ b/public/js/api/profilUpdate.js
@@ -30,20 +30,6 @@ export default {
         "/api/frontend/v1/ProfilUpdate/denyProfilRequest",{profil_update_id,uid,topic,status_message});
     },
   
-    //TODO post request
-    replaceProfilUpdateAttachment: function (dms) {
-      const url =
-        FHC_JS_DATA_STORAGE_OBJECT.app_root +
-        FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-        `/Cis/ProfilUpdate/replaceProfilUpdateAttachment`;
-  
-      return axios.post(url, dms, {
-        headers: { "Content-Type": "multipart/form-data" },
-      });
-    },
-  
-    //TODO post request
-    //? new requests
     insertFile: function (dms, replace = null) {
 
       return this.$fhcApi.post(
diff --git a/public/js/apps/Cis/Profil.js b/public/js/apps/Cis/Profil.js
index 1fa2e404b..7a084744a 100755
--- a/public/js/apps/Cis/Profil.js
+++ b/public/js/apps/Cis/Profil.js
@@ -2,12 +2,10 @@ import StudentProfil from "../../components/Cis/Profil/StudentProfil.js";
 import MitarbeiterProfil from "../../components/Cis/Profil/MitarbeiterProfil.js";
 import ViewStudentProfil from "../../components/Cis/Profil/StudentViewProfil.js";
 import ViewMitarbeiterProfil from "../../components/Cis/Profil/MitarbeiterViewProfil.js";
-import fhcapifactory from "../api/fhcapifactory.js";
 import Loading from "../../components/Loader.js";
 import Phrasen from "../../plugin/Phrasen.js";
-import fhcapi from "../../plugin/FhcApi.js";
 
-Vue.$fhcapi = fhcapifactory;
+
 Vue.$collapseFormatter = function (data) {
   //data - an array of objects containing the column title and value for each cell
   var container = document.createElement("div");
@@ -405,5 +403,4 @@ const profilApp = Vue.createApp({
 profilApp
   .use(primevue.config.default, { zIndex: { overlay: 9999 } })
   .use(Phrasen)
-  .use(fhcapi)
   .mount("#content");
diff --git a/public/js/apps/Cis/ProfilUpdateRequests.js b/public/js/apps/Cis/ProfilUpdateRequests.js
index 42e5bd576..b2c761b6e 100755
--- a/public/js/apps/Cis/ProfilUpdateRequests.js
+++ b/public/js/apps/Cis/ProfilUpdateRequests.js
@@ -1,7 +1,5 @@
-import fhcapifactory from "../api/fhcapifactory.js";
 import ProfilUpdateView from "../../components/Cis/ProfilUpdate/ProfilUpdateView.js";
 import Phrasen from "../../plugin/Phrasen.js";
-Vue.$fhcapi = fhcapifactory;
 
 const app = Vue.createApp({
   components: {
diff --git a/public/js/apps/api/profilUpdate.js b/public/js/apps/api/profilUpdate.js
deleted file mode 100755
index 9a63dc4d6..000000000
--- a/public/js/apps/api/profilUpdate.js
+++ /dev/null
@@ -1,120 +0,0 @@
-export default {
-  //! API calls for profil update requests
-
-  getStatus: function () {
-    const url =
-      FHC_JS_DATA_STORAGE_OBJECT.app_root +
-      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-      "/Cis/ProfilUpdate/getStatus";
-    return axios.get(url);
-  },
-
-  getTopic: function () {
-    const url =
-      FHC_JS_DATA_STORAGE_OBJECT.app_root +
-      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-      "/Cis/ProfilUpdate/getTopic";
-    return axios.get(url);
-  },
-
-  getProfilUpdateRequest: function () {
-    const url =
-      FHC_JS_DATA_STORAGE_OBJECT.app_root +
-      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-      "/Cis/ProfilUpdate/getAllRequests";
-    return axios.get(url);
-  },
-
-  acceptProfilRequest: function (payload) {
-    const url =
-      FHC_JS_DATA_STORAGE_OBJECT.app_root +
-      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-      "/Cis/ProfilUpdate/acceptProfilRequest";
-    return axios.post(url, payload);
-  },
-
-  denyProfilRequest: function (payload) {
-    const url =
-      FHC_JS_DATA_STORAGE_OBJECT.app_root +
-      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-      "/Cis/ProfilUpdate/denyProfilRequest";
-    return axios.post(url, payload);
-  },
-
-  replaceProfilUpdateAttachment: function (dms) {
-    const url =
-      FHC_JS_DATA_STORAGE_OBJECT.app_root +
-      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-      `/Cis/ProfilUpdate/replaceProfilUpdateAttachment`;
-
-    return axios.post(url, dms, {
-      headers: { "Content-Type": "multipart/form-data" },
-    });
-  },
-
-  //? new reuquests
-  insertFile: function (dms, replace = null) {
-    const url =
-      FHC_JS_DATA_STORAGE_OBJECT.app_root +
-      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-      `/Cis/ProfilUpdate/insertFile/${replace}`;
-
-    return axios.post(url, dms, {
-      headers: { "Content-Type": "multipart/form-data" },
-    });
-  },
-
-  getProfilRequestFiles: function (requestID) {
-    const url =
-      FHC_JS_DATA_STORAGE_OBJECT.app_root +
-      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-      `/Cis/ProfilUpdate/getProfilRequestFiles`;
-
-    return axios.post(url, requestID);
-  },
-
-  selectProfilRequest: function (uid = null, id = null) {
-    const url =
-      FHC_JS_DATA_STORAGE_OBJECT.app_root +
-      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-      `/Cis/ProfilUpdate/selectProfilRequest`;
-
-    return axios.get(url, { uid: uid, id: id });
-  },
-
-  insertProfilRequest: function (topic, payload, fileID = null) {
-    const url =
-      FHC_JS_DATA_STORAGE_OBJECT.app_root +
-      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-      `/Cis/ProfilUpdate/insertProfilRequest`;
-
-    return axios.post(url, {
-      topic,
-      payload,
-      ...(fileID ? { fileID: fileID } : {}),
-    });
-  },
-
-  updateProfilRequest: function (topic, payload, ID, fileID = null) {
-    const url =
-      FHC_JS_DATA_STORAGE_OBJECT.app_root +
-      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-      `/Cis/ProfilUpdate/updateProfilRequest`;
-
-    return axios.post(url, {
-      topic,
-      payload,
-      ID,
-      ...(fileID ? { fileID: fileID } : {}),
-    });
-  },
-
-  deleteProfilRequest: function (requestID) {
-    const url =
-      FHC_JS_DATA_STORAGE_OBJECT.app_root +
-      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-      `/Cis/ProfilUpdate/deleteProfilRequest`;
-
-    return axios.post(url, requestID);
-  },
-};
diff --git a/public/js/apps/api/userdata.js b/public/js/apps/api/userdata.js
deleted file mode 100755
index defea2cbb..000000000
--- a/public/js/apps/api/userdata.js
+++ /dev/null
@@ -1,58 +0,0 @@
-export default {
-  //! API Calls for Profil Views
-
-  getGemeinden: function(nation,zip=null){
-    const url =
-      FHC_JS_DATA_STORAGE_OBJECT.app_root +
-      `cis.php/Cis/Profil/getGemeinden`;
-    return axios.get(url,{params:{nation:nation,zip:zip}});
-  },
-
-  getAllNationen:function(){
-    const url =
-      FHC_JS_DATA_STORAGE_OBJECT.app_root +
-      `cis.php/Cis/Profil/getAllNationen`;
-    return axios.get(url);
-  },
-
-  getView: function (uid) {
-    const url =
-      FHC_JS_DATA_STORAGE_OBJECT.app_root + `cis.php/Cis/Profil/getView/${uid}`;
-    return axios.get(url);
-  },
-
-  sperre_foto_function: function (value) {
-    const url =
-      FHC_JS_DATA_STORAGE_OBJECT.app_root +
-      `cis.php/Cis/Profil/foto_sperre_function/${value}`;
-    return axios.get(url);
-  },
-
-  isStudent: function (uid) {
-    const url =
-      FHC_JS_DATA_STORAGE_OBJECT.app_root +
-      `cis.php/Cis/Profil/isStudent/${uid}`;
-    return axios.get(url);
-  },
-
-  isMitarbeiter: function (uid) {
-    const url =
-      FHC_JS_DATA_STORAGE_OBJECT.app_root +
-      `cis.php/Cis/Profil/isMitarbeiter/${uid}`;
-    return axios.get(url);
-  },
-
-  getZustellAdresse: function () {
-    const url =
-      FHC_JS_DATA_STORAGE_OBJECT.app_root +
-      `cis.php/Cis/Profil/getZustellAdresse`;
-    return axios.get(url);
-  },
-
-  getZustellKontakt: function () {
-    const url =
-      FHC_JS_DATA_STORAGE_OBJECT.app_root +
-      `cis.php/Cis/Profil/getZustellKontakt`;
-    return axios.get(url);
-  },
-};

From 0df9385f3360a82aedb45235a8061c4d8f06e2d8 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Mon, 22 Jul 2024 12:02:08 +0200
Subject: [PATCH 0969/1461] Adapted DB query to filter only Lehrveranstaltungen
 with lehrtyp_kurzbz 'lv'

---
 application/models/education/Lehrveranstaltung_model.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/application/models/education/Lehrveranstaltung_model.php b/application/models/education/Lehrveranstaltung_model.php
index de0bcbdbb..0889232a9 100644
--- a/application/models/education/Lehrveranstaltung_model.php
+++ b/application/models/education/Lehrveranstaltung_model.php
@@ -68,6 +68,8 @@ class Lehrveranstaltung_model extends DB_Model
 			}
 
 		$qry.= '
+				/* filter lv type only */
+                AND lv.lehrtyp_kurzbz = \'lv\'
                 /* filter active lehrveranstaltungen */
                 AND lv.aktiv = TRUE
                 /* filter active organisationseinheiten */
@@ -132,6 +134,8 @@ class Lehrveranstaltung_model extends DB_Model
 		}
 
 		$qry.= '
+				/* filter lv type only */
+                AND lv.lehrtyp_kurzbz = \'lv\'
                 /* filter active lehrveranstaltungen */
                 AND lv.aktiv = TRUE
                 /* filter active organisationseinheiten */

From 0ee57e488d6065dccaed53b4d02c0799e037fb55 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 22 Jul 2024 13:42:13 +0200
Subject: [PATCH 0970/1461] PrestudentstatusCheckLib:
 checkIfExistingPrestudentRolle

---
 .../api/frontend/v1/stv/Status.php            | 137 ++++++++++++------
 .../libraries/PrestudentstatusCheckLib.php    |  35 ++---
 2 files changed, 102 insertions(+), 70 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index a524a3c6a..43c51be91 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -406,6 +406,26 @@ class Status extends FHCAPI_Controller
 			'integer' => $this->p->t('ui', 'error_fieldNotInteger', ['field' => 'Ausbildungssemester'])
 		]);
 
+		$this->form_validation->set_rules('_global', '', [
+			//check if Rolle already exists
+			['checkIfExistingPrestudentRolle', function () use (
+				$prestudent_id,
+				$status_kurzbz,
+				$studiensemester_kurzbz,
+				$ausbildungssemester
+			) {
+				$result = $this->prestudentstatuschecklib->checkIfExistingPrestudentRolle(
+					$prestudent_id,
+					$status_kurzbz,
+					$studiensemester_kurzbz,
+					$ausbildungssemester
+				);
+				return $this->getDataOrTerminateWithError($result);
+			}]
+		], [
+			'checkIfExistingPrestudentRolle' => $this->p->t('lehre', 'error_rolleBereitsVorhanden')
+		]);
+
 		if (!$this->form_validation->run())
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 
@@ -434,19 +454,6 @@ class Status extends FHCAPI_Controller
 
 		}
 
-		//check if Rolle already exists
-		$result = $this->prestudentstatuschecklib->checkIfExistingPrestudentRolle(
-			$prestudent_id,
-			$status_kurzbz,
-			$studiensemester_kurzbz,
-			$ausbildungssemester
-		);
-
-		if (isError($result))
-		{
-			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-
 		//Check Reihungstest
 		if(REIHUNGSTEST_CHECK)
 		{
@@ -520,7 +527,7 @@ class Status extends FHCAPI_Controller
 			{
 				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 			}
-			$isStudent = true;
+			$isStudent = getData($result);
 		}
 
 		$isBerechtigtNoStudstatusCheck =  $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung');
@@ -770,7 +777,7 @@ class Status extends FHCAPI_Controller
 		}
 	}
 
-		public function addStudent($prestudent_id)
+	public function addStudent($prestudent_id)
 	{
 		//get Studiengang von prestudent_id
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
@@ -1611,21 +1618,37 @@ class Status extends FHCAPI_Controller
 			}
 		}
 
-		//check if Rolle already exists
-		if(($key_studiensemester_kurzbz != $studiensemester_kurzbz)
-			|| ($key_ausbildungssemester != $ausbildungssemester))
-		{
-			$result = $this->prestudentstatuschecklib->checkIfExistingPrestudentRolle(
+		//Form Validation
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('_global', '', [
+			//check if Rolle already exists
+			['checkIfExistingPrestudentRolle', function () use (
 				$prestudent_id,
 				$status_kurzbz,
 				$studiensemester_kurzbz,
-				$ausbildungssemester
-			);
-			if (isError($result))
-			{
-				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			}
-		}
+				$ausbildungssemester,
+				$key_studiensemester_kurzbz,
+				$key_ausbildungssemester
+			) {
+				if ($key_studiensemester_kurzbz == $studiensemester_kurzbz
+					&&  $key_ausbildungssemester == $ausbildungssemester
+				)
+					return true;
+				$result = $this->prestudentstatuschecklib->checkIfExistingPrestudentRolle(
+					$prestudent_id,
+					$status_kurzbz,
+					$studiensemester_kurzbz,
+					$ausbildungssemester
+				);
+				return $this->getDataOrTerminateWithError($result);
+			}]
+		], [
+			'checkIfExistingPrestudentRolle' => $this->p->t('lehre', 'error_rolleBereitsVorhanden')
+		]);
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
 
 		//check if studentrolle already exists
 		if($status_kurzbz == Prestudentstatus_model::STATUS_STUDENT || $status_kurzbz == Prestudentstatus_model::STATUS_DIPLOMAND )
@@ -1638,7 +1661,7 @@ class Status extends FHCAPI_Controller
 			{
 				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 			}
-			$isStudent = true;
+			$isStudent = getData($result);
 		}
 
 
@@ -1806,17 +1829,45 @@ class Status extends FHCAPI_Controller
 
 		$ausbildungssem_next = $key_ausbildungssemester+1;
 
-		//check if Rolle already exists
-		$result = $this->prestudentstatuschecklib->checkIfExistingPrestudentRolle(
-			$key_prestudent_id,
-			$key_status_kurzbz,
-			$studiensem_next,
-			$ausbildungssem_next
-		);
-		if (isError($result))
-		{
-			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
+		//Form Validation
+		$this->load->library('form_validation');
+
+		$last_status_kurzbz = $lastStatusData->status_kurzbz; // TODO(chris): copy pasta!
+
+		$this->form_validation->set_rules('_global', '', [
+			//check if Rolle already exists
+			['checkIfExistingPrestudentRolle', function () use (
+				$key_prestudent_id,
+				$key_status_kurzbz,
+				$studiensem_next,
+				$ausbildungssem_next
+			) {
+				$result = $this->prestudentstatuschecklib->checkIfExistingPrestudentRolle(
+					$key_prestudent_id,
+					$key_status_kurzbz,
+					$studiensem_next,
+					$ausbildungssem_next
+				);
+				return $this->getDataOrTerminateWithError($result);
+			}],
+			['status_stud_exists', function () use ($key_prestudent_id, $key_status_kurzbz, $last_status_kurzbz) {
+				if ($key_status_kurzbz != Prestudentstatus_model::STATUS_STUDENT
+					&& $key_status_kurzbz != Prestudentstatus_model::STATUS_DIPLOMAND
+					&& $last_status_kurzbz != Prestudentstatus_model::STATUS_STUDENT
+				)
+					return true;
+				
+				$result = $this->prestudentstatuschecklib->checkIfExistingStudentRolle($key_prestudent_id);
+
+				return $this->getDataOrTerminateWithError($result);
+			}]
+		], [
+			'checkIfExistingPrestudentRolle' => $this->p->t('lehre', 'error_rolleBereitsVorhanden'),
+			'status_stud_exists' => $this->p->t('lehre', 'error_noStudstatus')
+		]);
+		
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
 
 		//check if studentrolle already exists
 		// if($key_status_kurzbz == Prestudentstatus_model::STATUS_STUDENT)
@@ -1832,14 +1883,6 @@ class Status extends FHCAPI_Controller
 		// 		return $this->terminateWithError($this->p->t('lehre','error_noStudstatus'), self::ERROR_TYPE_GENERAL);
 		// 	}
 		// }
-		if($key_status_kurzbz == Prestudentstatus_model::STATUS_STUDENT || $key_status_kurzbz == Prestudentstatus_model::STATUS_DIPLOMAND || $lastStatusData->status_kurzbz == Prestudentstatus_model::STATUS_STUDENT)
-		{
-			$result = $this->prestudentstatuschecklib->checkIfExistingStudentRolle($key_prestudent_id);
-			if (isError($result))
-			{
-				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			}
-		}
 
 		// Start DB transaction
 		$this->db->trans_begin();
diff --git a/application/libraries/PrestudentstatusCheckLib.php b/application/libraries/PrestudentstatusCheckLib.php
index c7ecad0bf..62d5b69e0 100644
--- a/application/libraries/PrestudentstatusCheckLib.php
+++ b/application/libraries/PrestudentstatusCheckLib.php
@@ -98,43 +98,32 @@ class PrestudentstatusCheckLib
 		);
 	}
 
-		/**
+	/**
 	 * Checks if a prestudent role already exists.
-	 * @return error if invalid
-	 * @return 1 if role already exists, 0 if it does not
+	 *
+	 * @param integer				$prestudent_id
+	 * @param string				$status_kurzbz
+	 * @param string				$studiensemester_kurzbz
+	 * @param integer				$ausbildungssemester
+	 *
+	 * @return stdClass
 	 */
 	public function checkIfExistingPrestudentRolle(
 		$prestudent_id,
 		$status_kurzbz,
 		$tudiensemester_kurzbz,
 		$ausbildungssemester
-	)
-	{
-		$resultApp =  $this->_getApplicationData($prestudent_id);
-		if(isError($resultApp))
-		{
-			return getData($resultApp);
-		}
-		$resultApp =  current(getData($resultApp));
-		$studentName = trim ($resultApp->vorname.' '.$resultApp->nachname);
-
+	) {
 		$result =  $this->_ci->PrestudentstatusModel->checkIfExistingPrestudentRolle(
 			$prestudent_id,
 			$status_kurzbz,
 			$tudiensemester_kurzbz,
 			$ausbildungssemester
 		);
-		if(isError($result))
-		{
-			return getData($result);
-		}
-		$result = getData($result);
+		if (isError($result))
+			return $result;
 
-		if($result == '1')
-		{
-			return error($studentName . ": " . $this->_ci->p->t('lehre', 'error_rolleBereitsVorhanden'));
-		}
-		return success($result);
+		return success(getData($result) != '1');
 	}
 
 	/**

From 917065326096f9be0e9e9c5dd114cd109f14d097 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 22 Jul 2024 14:07:00 +0200
Subject: [PATCH 0971/1461] adds a childaction for the rooms when searching for
 a room to see the eventoverview of the room

---
 application/controllers/CisVue/Cms.php        |   4 +-
 application/models/content/Content_model.php  |   2 +-
 .../views/CisVue/Cms/RoomInformation.php      |   7 +-
 public/js/apps/Cis.js                         |   8 ++
 public/js/apps/Cis/RoomInformation.js         | 117 +----------------
 .../js/components/Cis/Mylv/RoomInformation.js | 123 ++++++++++++++++++
 public/js/components/searchbar/raum.js        |  17 +++
 7 files changed, 162 insertions(+), 116 deletions(-)
 create mode 100644 public/js/components/Cis/Mylv/RoomInformation.js

diff --git a/application/controllers/CisVue/Cms.php b/application/controllers/CisVue/Cms.php
index f8bd61a7b..17700b223 100755
--- a/application/controllers/CisVue/Cms.php
+++ b/application/controllers/CisVue/Cms.php
@@ -116,7 +116,7 @@ class Cms extends FHC_Controller
 		}
 	}
 
-	public function getRoomInformation(){
-		$this->load->view('CisVue/Cms/RoomInformation');
+	public function getRoomInformation($ort_kurzbz){
+		$this->load->view('CisVue/Cms/RoomInformation',['ort_kurzbz'=>$ort_kurzbz]);
 	}
 }
diff --git a/application/models/content/Content_model.php b/application/models/content/Content_model.php
index f42a395f9..c703ee3c1 100755
--- a/application/models/content/Content_model.php
+++ b/application/models/content/Content_model.php
@@ -170,7 +170,7 @@ class Content_model extends DB_Model
 						"content_id": 1000008,
 						"template_kurzbz": "redirect",
 						"titel": "room information (to delete)",
-						"content": "<content><url><![CDATA[' . site_url('/CisVue/Cms/getRoomInformation') . ']]></url><target><![CDATA[]]></target></content>",
+						"content": "<content><url><![CDATA[' . site_url('/CisVue/Cms/getRoomInformation/EDV_F4.26') . ']]></url><target><![CDATA[]]></target></content>",
 						"menu_open": false,
 						"aktiv": true,
 						"childs": []
diff --git a/application/views/CisVue/Cms/RoomInformation.php b/application/views/CisVue/Cms/RoomInformation.php
index c14b68024..5111a56bd 100644
--- a/application/views/CisVue/Cms/RoomInformation.php
+++ b/application/views/CisVue/Cms/RoomInformation.php
@@ -9,9 +9,12 @@ $this->load->view('templates/CISHTML-Header', $includesArray);
 ?>
 
 <div >
-	<h2>Room Information</h2>
+	<h2>Room Information: <?php echo $ort_kurzbz ?></h2>
 	<hr>
-    <div id="content"></div>
+	<div id="content">
+	<room-information ort_kurzbz="<?php echo $ort_kurzbz ?>"></room-information>
+	</div>
+    
 </div>
 
 <?php $this->load->view('templates/CISHTML-Footer', $includesArray); ?>
diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js
index b514f3662..5294778bb 100755
--- a/public/js/apps/Cis.js
+++ b/public/js/apps/Cis.js
@@ -52,6 +52,14 @@ Vue.createApp({
                                 action: function(data) {
                                     return data.booklink;
                                 }
+                            },
+                            {
+                                label: "Raumübersicht",
+                                icon: "fas fa-bookmark",
+                                type: "link",
+                                action: function(data) {
+                                    return data.roomoverview;
+                                }
                             }
                         ]
                     },
diff --git a/public/js/apps/Cis/RoomInformation.js b/public/js/apps/Cis/RoomInformation.js
index 62920cb66..f11326c11 100644
--- a/public/js/apps/Cis/RoomInformation.js
+++ b/public/js/apps/Cis/RoomInformation.js
@@ -1,121 +1,16 @@
-import FhcCalendar from "../../components/Calendar/Calendar.js";
-import CalendarDate from "../../composables/CalendarDate.js";
-import FhcApi from "../../plugin/FhcApi.js";
 import Phrasen from "../../plugin/Phrasen.js";
+import RoomInformation from "../../components/Cis/Mylv/RoomInformation.js";
+
 const app = Vue.createApp({
+    
 	components: {
-		FhcCalendar
+        RoomInformation
 	},
 	data() {
 		return {
-			stunden: [],
-			events: null,
-            calendarWeek: new CalendarDate(new Date()),
-            events_loaded:false,
-        }
-	},
-    computed:{
-        currentDate: function(){
-            return new Date(this.calendarWeek.y, this.calendarWeek.m, this.calendarWeek.d);
-        },
-        weekFirstDay: function(){
-            return this.calendarDateToString(this.calendarWeek.cdFirstDayOfWeek);
-        },
-        weekLastDay: function(){
-            return this.calendarDateToString(this.calendarWeek.cdLastDayOfWeek);
-        },
-    },
-    methods:{
-        // returns the string YYYY-MM-DD if param is instance of CalendarDate and null otherwise
-        calendarDateToString: function(calendarDate){
-            
-            return calendarDate instanceof CalendarDate? 
-            [calendarDate.y, calendarDate.m+1, calendarDate.d].join('-'):
-            null; 
-            
-        },
-        
-    },
-	created() {
-
-        this.$fhcApi.factory.stundenplan.getStunden().then(res =>{
-            res.data.forEach(std => {
-				this.stunden[std.stunde] = std; // TODO(chris): geht besser
-			});
-
-
-           // old testing room EDV_A6.09
-            this.$fhcApi.factory.stundenplan.getRoomInfo('EDV_F4.26', this.weekFirstDay, this.weekLastDay).then(res =>{
-                let events;
-                if (res.data && res.data.forEach) {
-                    res.data.forEach((el, i) => {
-
-                        el.id = i;
-                        if(el.type === 'reservierung')
-                        {
-                            el.color = '#' + (el.farbe || 'FFFFFF');
-                        }else{
-                            el.color = '#' + (el.farbe || 'CCCCCC');
-                        }
-                        
-                        el.start = new Date(el.datum + ' ' + this.stunden[el.stunde].beginn);
-                        el.end = new Date(el.datum + ' ' + this.stunden[el.stunde].ende);
-                        el.title = el.lehrfach;
-                        if (el.lehrform)
-                            el.title += '-' + el.lehrform;
-                    });
-                    
-                    this.events = res.data;
-                }
-
-                // reservierungen are loaded with the stundenplan
-                /* this.$fhcApi.factory.stundenplan.getReservierungen('EDV_F4.26', this.weekFirstDay, this.weekLastDay).then(res => {
-                    if (res.data && res.data.forEach) {
-                        res.data.forEach((el, i) => {
-                            el.reservierung = true;
-                            el.color = '#' + (el.farbe || 'ffffff');
-                            el.start = new Date(el.datum + ' ' + this.stunden[el.stunde].beginn);
-                            el.end = new Date(el.datum + ' ' + this.stunden[el.stunde].ende);
-                            el.title = el.titel;
-                            if (el.lehrform)
-                                el.title += '-' + el.lehrform;
-                        });
-                        
-                    }
-    
-                    let reservierungs_events = res.data;
-                    this.events = [...(this.events?this.events:[]),...reservierungs_events];
-                    
-                    
-                }); */
-            });
-
-           
-        });
-
-	},
-    template: /*html*/`
-    <div>
-        <fhc-calendar  v-slot="{event,day}" :initialDate="currentDate" :events="events" initial-mode="week" show-weeks>
-           
-            <a class="text-decoration-none text-dark" href="#" :title="event.orig.title + ' - ' + event.orig.lehrfach_bez + ' [' + event.orig.ort_kurzbz+']'"   >    
-                <div class="d-flex flex-column align-items-center justify-content-evenly h-100" >
-                    
-                        <!-- render content for stundenplan -->
-                        <span >{{event.orig.topic}}</span>
-                        <span v-for="gruppe in event.orig.gruppe.split('/')" :key="gruppe">{{gruppe}}</span>	
-                        <span v-for="lektor in event.orig.lektor.split('/')" :key="lektor">{{lektor}}</span>
-                        <!-- add the beschreibung if the event is a reservierung -->
-                        <span v-if="event.orig.type === 'reservierung'">{{event.orig.beschreibung}}</span>
-                        
-                    
-                </div>
-            </a>
-        </fhc-calendar>
-    </div>
-    `,
+		}
+	}
 });
 app.config.unwrapInjectedRef = true;
-app.use(FhcApi);
 app.use(Phrasen);
 app.mount('#content');
\ No newline at end of file
diff --git a/public/js/components/Cis/Mylv/RoomInformation.js b/public/js/components/Cis/Mylv/RoomInformation.js
new file mode 100644
index 000000000..885130a5f
--- /dev/null
+++ b/public/js/components/Cis/Mylv/RoomInformation.js
@@ -0,0 +1,123 @@
+import FhcCalendar from "../../Calendar/Calendar.js";
+import CalendarDate from "../../../composables/CalendarDate.js";
+
+
+export default{
+    props:{
+        ort_kurzbz: {
+            type: String,
+            required: true,
+        }
+    },
+	components: {
+		FhcCalendar
+	},
+	data() {
+		return {
+			stunden: [],
+			events: null,
+            calendarWeek: new CalendarDate(new Date()),
+            events_loaded:false,
+        }
+	},
+    computed:{
+        currentDate: function(){
+            return new Date(this.calendarWeek.y, this.calendarWeek.m, this.calendarWeek.d);
+        },
+        weekFirstDay: function(){
+            return this.calendarDateToString(this.calendarWeek.cdFirstDayOfWeek);
+        },
+        weekLastDay: function(){
+            return this.calendarDateToString(this.calendarWeek.cdLastDayOfWeek);
+        },
+    },
+    methods:{
+        // returns the string YYYY-MM-DD if param is instance of CalendarDate and null otherwise
+        calendarDateToString: function(calendarDate){
+            
+            return calendarDate instanceof CalendarDate? 
+            [calendarDate.y, calendarDate.m+1, calendarDate.d].join('-'):
+            null; 
+            
+        },
+        
+    },
+	created() {
+
+        this.$fhcApi.factory.stundenplan.getStunden().then(res =>{
+            res.data.forEach(std => {
+				this.stunden[std.stunde] = std; // TODO(chris): geht besser
+			});
+
+
+           // old testing room EDV_A6.09
+            this.$fhcApi.factory.stundenplan.getRoomInfo(this.ort_kurzbz, this.weekFirstDay, this.weekLastDay).then(res =>{
+                let events;
+                if (res.data && res.data.forEach) {
+                    res.data.forEach((el, i) => {
+
+                        el.id = i;
+                        if(el.type === 'reservierung')
+                        {
+                            el.color = '#' + (el.farbe || 'FFFFFF');
+                        }else{
+                            el.color = '#' + (el.farbe || 'CCCCCC');
+                        }
+                        
+                        el.start = new Date(el.datum + ' ' + this.stunden[el.stunde].beginn);
+                        el.end = new Date(el.datum + ' ' + this.stunden[el.stunde].ende);
+                        el.title = el.lehrfach;
+                        if (el.lehrform)
+                            el.title += '-' + el.lehrform;
+                    });
+                    
+                    this.events = res.data;
+                }
+
+                // reservierungen are loaded with the stundenplan
+                /* this.$fhcApi.factory.stundenplan.getReservierungen('EDV_F4.26', this.weekFirstDay, this.weekLastDay).then(res => {
+                    if (res.data && res.data.forEach) {
+                        res.data.forEach((el, i) => {
+                            el.reservierung = true;
+                            el.color = '#' + (el.farbe || 'ffffff');
+                            el.start = new Date(el.datum + ' ' + this.stunden[el.stunde].beginn);
+                            el.end = new Date(el.datum + ' ' + this.stunden[el.stunde].ende);
+                            el.title = el.titel;
+                            if (el.lehrform)
+                                el.title += '-' + el.lehrform;
+                        });
+                        
+                    }
+    
+                    let reservierungs_events = res.data;
+                    this.events = [...(this.events?this.events:[]),...reservierungs_events];
+                    
+                    
+                }); */
+            });
+
+           
+        });
+
+	},
+    template: /*html*/`
+    <div>
+        <fhc-calendar  v-slot="{event,day}" :initialDate="currentDate" :events="events" initial-mode="week" show-weeks>
+           
+            <a class="text-decoration-none text-dark" href="#" :title="event.orig.title + ' - ' + event.orig.lehrfach_bez + ' [' + event.orig.ort_kurzbz+']'"   >    
+                <div class="d-flex flex-column align-items-center justify-content-evenly h-100" >
+                    
+                        <!-- render content for stundenplan -->
+                        <span >{{event.orig.topic}}</span>
+                        <span v-for="gruppe in event.orig.gruppe.split('/')" :key="gruppe">{{gruppe}}</span>	
+                        <span v-for="lektor in event.orig.lektor.split('/')" :key="lektor">{{lektor}}</span>
+                        <!-- add the beschreibung if the event is a reservierung -->
+                        <span v-if="event.orig.type === 'reservierung'">{{event.orig.beschreibung}}</span>
+                        
+                    
+                </div>
+            </a>
+        </fhc-calendar>
+    </div>
+    `,
+};
\ No newline at end of file
diff --git a/public/js/components/searchbar/raum.js b/public/js/components/searchbar/raum.js
index 69e303ed4..87fcc7747 100755
--- a/public/js/components/searchbar/raum.js
+++ b/public/js/components/searchbar/raum.js
@@ -15,6 +15,19 @@ export default {
             return FHC_JS_DATA_STORAGE_OBJECT.app_root+'cms/content.php?content_id='+data.content_id;
         }
       }; */ 
+
+      this.res.roomoverview= FHC_JS_DATA_STORAGE_OBJECT.app_root +
+      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+      `/CisVue/Cms/getRoomInformation/${this.res.ort_kurzbz}`; 
+
+      if(this.res.content_id !=="N/A"){
+        this.res.infolink= FHC_JS_DATA_STORAGE_OBJECT.app_root +
+        FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+        `/CisVue/Cms/content/${this.res.content_id}`;
+      }else{
+        this.res.infolink= '#';
+      }
+      
     },
     emits: [ 'actionexecuted' ],
     template: /*html*/`
@@ -37,6 +50,10 @@ export default {
                   <div class="searchbar_tablecell">Standort</div>
                   <div class="searchbar_tablecell">{{ res.standort }}</div>
                 </div>
+                <div class="searchbar_tablerow">
+                  <div class="searchbar_tablecell">data</div>
+                  <div class="searchbar_tablecell">{{ JSON.stringify(res,null,2) }}</div>
+                </div>
                 <div class="searchbar_tablerow">
                   <div class="searchbar_tablecell">Sitzplätze</div>
                   <div class="searchbar_tablecell">{{ res.sitzplaetze }}</div>

From e613ac3255a21a6c6ab63eaf9c68be4e598341ff Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 22 Jul 2024 14:33:19 +0200
Subject: [PATCH 0972/1461] computes the childactions for the room in the
 search result independently

---
 public/js/components/searchbar/raum.js      | 15 +----------
 public/js/components/searchbar/searchbar.js | 29 ++++++++++++++++++++-
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/public/js/components/searchbar/raum.js b/public/js/components/searchbar/raum.js
index 87fcc7747..85a7e3ce8 100755
--- a/public/js/components/searchbar/raum.js
+++ b/public/js/components/searchbar/raum.js
@@ -14,20 +14,7 @@ export default {
         action: function(data) { 
             return FHC_JS_DATA_STORAGE_OBJECT.app_root+'cms/content.php?content_id='+data.content_id;
         }
-      }; */ 
-
-      this.res.roomoverview= FHC_JS_DATA_STORAGE_OBJECT.app_root +
-      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-      `/CisVue/Cms/getRoomInformation/${this.res.ort_kurzbz}`; 
-
-      if(this.res.content_id !=="N/A"){
-        this.res.infolink= FHC_JS_DATA_STORAGE_OBJECT.app_root +
-        FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-        `/CisVue/Cms/content/${this.res.content_id}`;
-      }else{
-        this.res.infolink= '#';
-      }
-      
+      }; */
     },
     emits: [ 'actionexecuted' ],
     template: /*html*/`
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index d4b35dc80..d116ab286 100755
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -47,7 +47,7 @@ export default {
                 <person v-if="res.type === 'person'" :res="res" :actions="this.searchoptions.actions.person" @actionexecuted="this.hideresult"></person>
                 <employee v-else-if="res.type === 'mitarbeiter'" :res="res" :actions="this.searchoptions.actions.employee" @actionexecuted="this.hideresult"></employee>
                 <organisationunit v-else-if="res.type === 'organisationunit'" :res="res" :actions="this.searchoptions.actions.organisationunit" @actionexecuted="this.hideresult"></organisationunit>
-                <raum v-else-if="res.type === 'raum'" :res="res" :actions="this.searchoptions.actions.raum" @actionexecuted="this.hideresult"></raum>
+                <raum v-else-if="res.type === 'raum'" :res="res" :actions="getActionsForRoom(res)" @actionexecuted="this.hideresult"></raum>
                 <div v-else="">Unbekannter Ergebnistyp: '{{ res.type }}'.</div>
               </template>
             </div>
@@ -69,6 +69,33 @@ export default {
         this.updateSearchOptions();
     },
     methods: {
+        getActionsForRoom: function(res){
+            res.roomoverview= FHC_JS_DATA_STORAGE_OBJECT.app_root +
+            FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+            `/CisVue/Cms/getRoomInformation/${res.ort_kurzbz}`; 
+
+            if(res.content_id !=="N/A"){
+                res.infolink= FHC_JS_DATA_STORAGE_OBJECT.app_root +
+                FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+                `/CisVue/Cms/content/${res.content_id}`;
+            }
+
+            let child = this.searchoptions.actions.raum.childactions.filter((child)=>{
+                if(child.label =="Rauminformation" && res.content_id =="N/A"){
+                    return false;
+                }
+                return true;
+            });
+
+            let computedActions = {
+                childactions:child,
+                defaultaction:this.searchoptions.actions.raum.defaultaction
+            }
+            
+            return computedActions;
+            
+            
+        },
         updateSearchOptions: function() {
             this.searchsettings.types = [];
             for( const idx in this.searchoptions.types ) {

From 4b97e33e203aca3a9695c51fcd4be01de08d925c Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 23 Jul 2024 08:58:33 +0200
Subject: [PATCH 0973/1461] comment

---
 application/controllers/api/frontend/v1/stv/Status.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 43c51be91..a50c3e138 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -1099,7 +1099,7 @@ class Status extends FHCAPI_Controller
 				{
 					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 				}
-			}
+			} // NOTE(chris): this does not do anything since $isStudent did the same thing and returned positive success
 
 			$this->load->library('PrestudentLib');
 			$result = $this->prestudentlib->setStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id, $bestaetigtam, $bestaetigtvon);

From f2074198593764d8d71e6a2633d6708dd09f1c92 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 23 Jul 2024 08:58:52 +0200
Subject: [PATCH 0974/1461] removes the import for userdata and profilUpdate
 from the old fhcapi which should be replaced by the new fhcapi

---
 application/views/Cis/Documents.php | 7 ++++---
 public/js/apps/api/fhcapifactory.js | 4 ----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/application/views/Cis/Documents.php b/application/views/Cis/Documents.php
index 191558d86..9ca3bc961 100755
--- a/application/views/Cis/Documents.php
+++ b/application/views/Cis/Documents.php
@@ -12,9 +12,10 @@ $this->load->view('templates/CISHTML-Header', $includesArray);
 	<div class="fhc-header">
 		<h1><?= $this->p->t('tools', 'dokumente'); ?><small><?= $this->p->t('tools', 'bestaetigungenZeugnisse'); ?></small></h1>
 	</div>
-
+	
 	<div class="row">
-		<div class="col<?= $selfservice ? '-8' : ''; ?>">
+		<!--<div class="col<?= $selfservice ? '-8' : ''; ?>">-->
+		<div class="col-lg-8">
 			<div class="fhc-table mb-3">
 				<div class="fhc-table-header d-flex align-items-center mb-2 gap-2">
 					<h3 class="h5 col m-0"><?= $this->p->t('tools', 'inskriptionsbestaetigung'); ?><?= $studienbuchblatt ? ' & ' . $this->p->t('tools', 'studienbuchblatt') : ''; ?></h3>
@@ -199,7 +200,7 @@ $this->load->view('templates/CISHTML-Header', $includesArray);
 			<?php } ?>
 		</div>
 		<?php if ($selfservice) { ?>
-			<div class="col-4">
+			<div class="col-lg-4">
 				<div class="alert alert-warning" role="alert">
 					<?= $this->p->t('tools', 'warnungDruckDigitaleSignatur'); ?>
 				</div>
diff --git a/public/js/apps/api/fhcapifactory.js b/public/js/apps/api/fhcapifactory.js
index 9d4e3609a..35120779f 100755
--- a/public/js/apps/api/fhcapifactory.js
+++ b/public/js/apps/api/fhcapifactory.js
@@ -1,11 +1,7 @@
 import Search from "./search.js";
 import Cms from "./cms.js";
-import UserData from "./userdata.js";
-import ProfilUpdate from "./profilUpdate.js"
 
 export default {
     "Search": Search,
-    "UserData": UserData,
-    "ProfilUpdate": ProfilUpdate,
     "Cms": Cms,
 };

From 2083e95f8cf724ef7a57ee2099bd59813282818d Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 23 Jul 2024 09:14:38 +0200
Subject: [PATCH 0975/1461] adds vertical layout for the documents view when
 the viewport is less than lg

---
 application/views/Cis/Documents.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/application/views/Cis/Documents.php b/application/views/Cis/Documents.php
index 9ca3bc961..74d7b1349 100755
--- a/application/views/Cis/Documents.php
+++ b/application/views/Cis/Documents.php
@@ -14,8 +14,8 @@ $this->load->view('templates/CISHTML-Header', $includesArray);
 	</div>
 	
 	<div class="row">
-		<!--<div class="col<?= $selfservice ? '-8' : ''; ?>">-->
-		<div class="col-lg-8">
+	
+		<div class="order-2 col-lg-8">
 			<div class="fhc-table mb-3">
 				<div class="fhc-table-header d-flex align-items-center mb-2 gap-2">
 					<h3 class="h5 col m-0"><?= $this->p->t('tools', 'inskriptionsbestaetigung'); ?><?= $studienbuchblatt ? ' & ' . $this->p->t('tools', 'studienbuchblatt') : ''; ?></h3>
@@ -200,12 +200,13 @@ $this->load->view('templates/CISHTML-Header', $includesArray);
 			<?php } ?>
 		</div>
 		<?php if ($selfservice) { ?>
-			<div class="col-lg-4">
+			<div class="order-1 order-lg-3 col-lg-4">
 				<div class="alert alert-warning" role="alert">
 					<?= $this->p->t('tools', 'warnungDruckDigitaleSignatur'); ?>
 				</div>
 			</div>
 		<?php } ?>
+		
 	</div>
 </div>
 

From 7e983292ea842aa4a69d9acca6733a1e5a8b71ff Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 23 Jul 2024 11:26:52 +0200
Subject: [PATCH 0976/1461] adds the endpoint that fetches all ampeln of a user
 that are not confirmed by the user yet and also removes some unnecessary
 comments from other enpoints

---
 .../controllers/api/frontend/v1/Ampeln.php    | 84 +++++++++++++++++++
 .../controllers/api/frontend/v1/Profil.php    |  5 --
 .../api/frontend/v1/ProfilUpdate.php          |  5 --
 public/js/api/ampeln.js                       | 10 +++
 public/js/api/fhcapifactory.js                |  2 +
 public/js/apps/Dashboard/Fhc.js               |  2 +
 6 files changed, 98 insertions(+), 10 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/Ampeln.php
 create mode 100644 public/js/api/ampeln.js

diff --git a/application/controllers/api/frontend/v1/Ampeln.php b/application/controllers/api/frontend/v1/Ampeln.php
new file mode 100644
index 000000000..e4029f841
--- /dev/null
+++ b/application/controllers/api/frontend/v1/Ampeln.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Copyright (C) 2024 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Ampeln extends FHCAPI_Controller
+{
+
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'getAmpeln' => self::PERM_LOGGED,
+            
+		]);
+
+
+		$this->load->model('content/Ampel_model', 'AmpelModel');
+
+
+		//? put the uid and pid inside the controller for reusability
+		$this->uid = getAuthUID();
+		$this->pid = getAuthPersonID();
+
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	
+    /**
+	 * function that queries all the ampeln that are addressed to the user uid
+     * @access public
+	 * 
+	 */
+	public function getAmpeln()
+	{
+        $userAmpeln = array();
+        $ampel_result = $this->AmpelModel->active();
+
+        $ampel_result = $this->getDataOrTerminateWithError($ampel_result);
+
+        $is_confirmed_array = array();
+        foreach($ampel_result as $ampel){
+            
+            $confirmedByUser = $this->AmpelModel->isConfirmed($ampel->ampel_id,$this->uid);
+            if(!$confirmedByUser){
+                $userUID_array = $this->AmpelModel->execBenutzerSelect($ampel->benutzer_select);
+                $userUID_array = $this->getDataOrTerminateWithError($userUID_array);
+                foreach($userUID_array as $user_obj){
+                    
+                    $user_uid = property_exists($user_obj,"uid") ? $user_obj->uid : $user_obj->mitarbeiter_uid;
+                    if($user_uid === $this->uid){
+                        $userAmpeln[] = $ampel;
+                    }
+                }
+                    
+            }
+            
+        }
+
+        $this->terminateWithSuccess($userAmpeln);
+	}
+
+    
+}
+
diff --git a/application/controllers/api/frontend/v1/Profil.php b/application/controllers/api/frontend/v1/Profil.php
index ffb7449f8..63e86d1b2 100644
--- a/application/controllers/api/frontend/v1/Profil.php
+++ b/application/controllers/api/frontend/v1/Profil.php
@@ -18,11 +18,6 @@
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
-/**
- * This controller operates between (interface) the JS (GUI) and the SearchBarLib (back-end)
- * Provides data to the ajax get calls about the searchbar component
- * This controller works with JSON calls on the HTTP GET and the output is always JSON
- */
 class Profil extends FHCAPI_Controller
 {
 
diff --git a/application/controllers/api/frontend/v1/ProfilUpdate.php b/application/controllers/api/frontend/v1/ProfilUpdate.php
index 4b9dedb48..7a528b2de 100644
--- a/application/controllers/api/frontend/v1/ProfilUpdate.php
+++ b/application/controllers/api/frontend/v1/ProfilUpdate.php
@@ -18,11 +18,6 @@
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
-/**
- * This controller operates between (interface) the JS (GUI) and the SearchBarLib (back-end)
- * Provides data to the ajax get calls about the searchbar component
- * This controller works with JSON calls on the HTTP GET and the output is always JSON
- */
 class ProfilUpdate extends FHCAPI_Controller
 {
 
diff --git a/public/js/api/ampeln.js b/public/js/api/ampeln.js
new file mode 100644
index 000000000..8173d8511
--- /dev/null
+++ b/public/js/api/ampeln.js
@@ -0,0 +1,10 @@
+export default {
+    
+    getAmpeln: function () {
+        return this.$fhcApi.get(
+        FHC_JS_DATA_STORAGE_OBJECT.app_root +
+        FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+        `/api/frontend/v1/Ampeln/getAmpeln`,{});
+    },
+
+}
\ No newline at end of file
diff --git a/public/js/api/fhcapifactory.js b/public/js/api/fhcapifactory.js
index 73ce0dd7f..6df1d7467 100644
--- a/public/js/api/fhcapifactory.js
+++ b/public/js/api/fhcapifactory.js
@@ -22,6 +22,7 @@ import filter from "./filter.js";
 import studstatus from "./studstatus.js";
 import profil from "./profil.js";
 import profilUpdate from "./profilUpdate.js";
+import ampeln from "./ampeln.js";
 
 export default {
     search,
@@ -31,4 +32,5 @@ export default {
     studstatus,
     profil,
     profilUpdate,
+    ampeln,
 };
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index ebcbb4b78..98f06f329 100755
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -1,4 +1,5 @@
 import FhcDashboard from '../../components/Dashboard/Dashboard.js';
+import Phrasen from "../../plugin/Phrasen.js"
 
 const app = Vue.createApp({
   data: () => ({
@@ -9,4 +10,5 @@ const app = Vue.createApp({
   }
 });
 app.config.unwrapInjectedRef = true;
+app.use(Phrasen);
 app.mount('#content');

From 1211d63ccfa845c985b412c94d6d21a1e95fb650 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 23 Jul 2024 13:59:04 +0200
Subject: [PATCH 0977/1461] adds placeholders for the ampeln and adds new
 endpoints that fetch activeAmpeln and confirmedActiveAmpeln of the user

---
 .../controllers/api/frontend/v1/Ampeln.php    | 59 ++++++++++++++++++-
 public/js/api/ampeln.js                       | 18 +++++-
 public/js/components/DashboardWidget/Ampel.js | 46 +++++++++++++--
 3 files changed, 114 insertions(+), 9 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Ampeln.php b/application/controllers/api/frontend/v1/Ampeln.php
index e4029f841..b29d6934e 100644
--- a/application/controllers/api/frontend/v1/Ampeln.php
+++ b/application/controllers/api/frontend/v1/Ampeln.php
@@ -27,7 +27,9 @@ class Ampeln extends FHCAPI_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'getAmpeln' => self::PERM_LOGGED,
+			'getNonConfirmedActiveAmpeln' => self::PERM_LOGGED,
+            'getAllActiveAmpeln' => self::PERM_LOGGED,
+            'getConfirmedActiveAmpeln' => self::PERM_LOGGED,
             
 		]);
 
@@ -50,7 +52,7 @@ class Ampeln extends FHCAPI_Controller
      * @access public
 	 * 
 	 */
-	public function getAmpeln()
+	public function getNonConfirmedActiveAmpeln()
 	{
         $userAmpeln = array();
         $ampel_result = $this->AmpelModel->active();
@@ -79,6 +81,59 @@ class Ampeln extends FHCAPI_Controller
         $this->terminateWithSuccess($userAmpeln);
 	}
 
+    public function getAllActiveAmpeln()
+	{
+        $userAmpeln = array();
+        $ampel_result = $this->AmpelModel->active();
+
+        $ampel_result = $this->getDataOrTerminateWithError($ampel_result);
+
+        foreach($ampel_result as $ampel){
+            
+            $userUID_array = $this->AmpelModel->execBenutzerSelect($ampel->benutzer_select);
+            $userUID_array = $this->getDataOrTerminateWithError($userUID_array);
+            foreach($userUID_array as $user_obj){
+                
+                $user_uid = property_exists($user_obj,"uid") ? $user_obj->uid : $user_obj->mitarbeiter_uid;
+                if($user_uid === $this->uid){
+                    $userAmpeln[] = $ampel;
+                }
+            }
+            
+        }
+
+        $this->terminateWithSuccess($userAmpeln);
+	}
+
+    public function getConfirmedActiveAmpeln()
+	{
+        $userAmpeln = array();
+        $ampel_result = $this->AmpelModel->active();
+
+        $ampel_result = $this->getDataOrTerminateWithError($ampel_result);
+
+        $is_confirmed_array = array();
+        foreach($ampel_result as $ampel){
+            
+            $confirmedByUser = $this->AmpelModel->isConfirmed($ampel->ampel_id,$this->uid);
+            if($confirmedByUser){
+                $userUID_array = $this->AmpelModel->execBenutzerSelect($ampel->benutzer_select);
+                $userUID_array = $this->getDataOrTerminateWithError($userUID_array);
+                foreach($userUID_array as $user_obj){
+                    
+                    $user_uid = property_exists($user_obj,"uid") ? $user_obj->uid : $user_obj->mitarbeiter_uid;
+                    if($user_uid === $this->uid){
+                        $userAmpeln[] = $ampel;
+                    }
+                }
+                    
+            }
+            
+        }
+
+        $this->terminateWithSuccess($userAmpeln);
+	}
+
     
 }
 
diff --git a/public/js/api/ampeln.js b/public/js/api/ampeln.js
index 8173d8511..7e0aef247 100644
--- a/public/js/api/ampeln.js
+++ b/public/js/api/ampeln.js
@@ -1,10 +1,24 @@
 export default {
     
-    getAmpeln: function () {
+    getNonConfirmedActiveAmpeln: function () {
         return this.$fhcApi.get(
         FHC_JS_DATA_STORAGE_OBJECT.app_root +
         FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-        `/api/frontend/v1/Ampeln/getAmpeln`,{});
+        `/api/frontend/v1/Ampeln/getNonConfirmedActiveAmpeln`,{});
+    },
+
+    getAllActiveAmpeln: function () {
+        return this.$fhcApi.get(
+        FHC_JS_DATA_STORAGE_OBJECT.app_root +
+        FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+        `/api/frontend/v1/Ampeln/getAllActiveAmpeln`,{});
+    },
+
+    getConfirmedActiveAmpeln: function () {
+        return this.$fhcApi.get(
+        FHC_JS_DATA_STORAGE_OBJECT.app_root +
+        FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+        `/api/frontend/v1/Ampeln/getConfirmedActiveAmpeln`,{});
     },
 
 }
\ No newline at end of file
diff --git a/public/js/components/DashboardWidget/Ampel.js b/public/js/components/DashboardWidget/Ampel.js
index 9f0918aa7..6cb61ee47 100755
--- a/public/js/components/DashboardWidget/Ampel.js
+++ b/public/js/components/DashboardWidget/Ampel.js
@@ -7,7 +7,7 @@ export default {
     data: () => ({
         filter: '',
         source: '',
-        ampeln: []
+        ampeln: [],
     }),
     mixins: [
         AbstractWidget
@@ -76,13 +76,33 @@ export default {
             return buttontext == null ? 'Bestätigen' : buttontext;
         }
     },
-    created() {
+    async created() {
+        
+        let temporary_ampeln=null;
+        let temporary_confirmedAmpeln=null;
+
+        await this.$fhcApi.factory.ampeln.getAllActiveAmpeln().then(res=>{
+            temporary_ampeln = res.data;
+        }); 
+
+        await this.$fhcApi.factory.ampeln.getConfirmedActiveAmpeln().then(res=>{
+            temporary_confirmedAmpeln = res.data;
+        });
+
+
+        /* this.ampeln = temporary_ampeln.filter((ampel)=>{
+                if(temporary_confirmedAmpeln.some((confirmedAmpel)=> confirmedAmpel.ampel_id === ampel.ampel_id)){
+                    return false;
+                }
+                return true;
+            });
+ */
         this.$emit('setConfig', false);
-        this.ampeln = TEST_OFFENE_AMPELN;
+        
     },
-    template: `
+    template: /*html*/`
     <div class="widgets-ampel w-100 h-100">
-        <div class="d-flex flex-column justify-content-between">
+        <div v-if="ampeln" class="d-flex flex-column justify-content-between">
             <div class="d-flex">
                 <header class="me-auto"><b>Neueste Ampeln</b></header>
                 <div class="mb-2 text-danger"><a href="#allAmpelOffcanvas" data-bs-toggle="offcanvas">Alle Ampeln</a></div>
@@ -105,12 +125,28 @@ export default {
                     </div>
                 </div>
             </div>
+            
             <div v-if="ampeln.length == 0" class="card card-body mt-4 p-4 text-center">
                 <span class="text-success h2"><i class="fa fa-solid fa-circle-check"></i></span>
                 <span class="text-success h5">Super!</span><br>
                 <span class="small">Keine offenen Ampeln.</span>
             </div>
         </div>
+        <div v-else>
+        <header class="me-auto"><b>Neueste Ampeln</b></header>
+            <template v-for="n in 4">
+                <div class="mt-2 card" aria-hidden="true">
+                <div class="card-body">
+                    <p class="card-text placeholder-glow">
+                    <span class="placeholder col-7"></span>
+                    <span class="placeholder col-12"></span>
+                    </p>
+                </div>
+                </div>
+            </template>
+
+        </div>
+        
     </div>
 
     <!-- All Ampeln Offcanvas -->

From 7a5bec077ff9c1eb016e323f685ed1a92c4dc462 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 23 Jul 2024 14:47:23 +0200
Subject: [PATCH 0978/1461] Check Personenkennzeichen

---
 .../libraries/PrestudentstatusCheckLib.php    | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/application/libraries/PrestudentstatusCheckLib.php b/application/libraries/PrestudentstatusCheckLib.php
index 62d5b69e0..3e5563d62 100644
--- a/application/libraries/PrestudentstatusCheckLib.php
+++ b/application/libraries/PrestudentstatusCheckLib.php
@@ -584,6 +584,46 @@ class PrestudentstatusCheckLib
 		return success(getData($result)['diplomant']);
 	}
 
+	/**
+	 * Checks if Personenkennzeichen is set correctly.
+	 *
+	 * @param integer				$prestudent_id
+	 *
+	 * @return stdClass
+	 */
+	public function checkPersonenkennzeichen($prestudent_id)
+	{
+		$this->_ci->PrestudentstatusModel->addSelect('tbl_prestudentstatus.prestudent_id');
+		$this->_ci->PrestudentstatusModel->addSelect('tbl_student.matrikelnr');
+
+		$this->_ci->PrestudentstatusModel->addJoin('public.tbl_student', 'prestudent_id');
+
+		$this->_ci->PrestudentstatusModel->addOrder('tbl_prestudentstatus.datum', 'DESC');
+		$this->_ci->PrestudentstatusModel->addOrder('tbl_prestudentstatus.insertamum', 'DESC');
+		$this->_ci->PrestudentstatusModel->addOrder('tbl_prestudentstatus.ext_id', 'DESC');
+		
+		$this->_ci->PrestudentstatusModel->addLimit(1);
+		
+		$result = $this->_ci->PrestudentstatusModel->loadWhere([
+			'tbl_prestudentstatus.status_kurzbz' => self::STATUS_STUDENT
+		]);
+
+		if (isError($result))
+			return $result;
+
+		if (!hasData($result))
+			return success(true); // Not a student yet so no wrong personenkennzeichen
+
+		$data = current(getData($result));
+
+		$jahr = $this->_ci->StudiensemesterModel->getStudienjahrNumberFromStudiensemester($data->studiensemester_kurzbz);
+
+
+		return success($jahr == mb_substr($data->matrikelnr, 0, 2));
+	}
+
+	// TODO(chris): check status history error_bewerberOrgformUngleichStudentOrgform
+
 	/**
 	 * Check if History of StatusData is valid
 	 * @param integer $prestudent_id

From d12f3dd8461639f2bc21fdb4693aa89e13c81073 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 23 Jul 2024 14:51:42 +0200
Subject: [PATCH 0979/1461] Check History for Student status

---
 .../api/frontend/v1/stv/Status.php            |  3 -
 .../libraries/PrestudentstatusCheckLib.php    | 77 ++++++++++++++++---
 2 files changed, 65 insertions(+), 15 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index a50c3e138..459b22927 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -262,9 +262,6 @@ class Status extends FHCAPI_Controller
 
 				return $this->getDataOrTerminateWithError($result);
 			}]
-			// TODO(chris): check status history error_wrongStatusOrderBeforeStudent
-			// TODO(chris): check status history error_personenkennzeichenPasstNichtZuStudiensemester
-			// TODO(chris): check status history error_bewerberOrgformUngleichStudentOrgform
 		], [
 			'rolle_doesnt_exist' => $this->p->t('lehre', 'error_rolleBereitsVorhanden'),
 			'history_timesequence' => $this->p->t('lehre', 'error_statuseintrag_zeitabfolge'),
diff --git a/application/libraries/PrestudentstatusCheckLib.php b/application/libraries/PrestudentstatusCheckLib.php
index 3e5563d62..86066fdda 100644
--- a/application/libraries/PrestudentstatusCheckLib.php
+++ b/application/libraries/PrestudentstatusCheckLib.php
@@ -335,7 +335,8 @@ class PrestudentstatusCheckLib
 			'laststatus' => true,
 			'unterbrechersemester' => true,
 			'abbrechersemester' => true,
-			'diplomant' => true
+			'diplomant' => true,
+			'student' => true
 		];
 
 		for ($n = 0, $c = 1; $c < $historyCount; $n++, $c++) {
@@ -344,6 +345,7 @@ class PrestudentstatusCheckLib
 				&& !$checks['unterbrechersemester']
 				&& !$checks['abbrechersemester']
 				&& !$checks['diplomant']
+				&& !$checks['student']
 			)
 				break; // early out
 
@@ -358,32 +360,44 @@ class PrestudentstatusCheckLib
 
 			// Abbrecher- oder Absolventenstatus muss Endstatus sein
 			if ($checks['laststatus']
-				&& in_array($current->status_kurzbz, ['Absolvent', 'Abbrecher'])
+				&& in_array($current->status_kurzbz, [self::ABSOLVENT_STATUS, self::ABBRECHER_STATUS])
 			)
 				$checks['laststatus'] = false;
 
 			// wenn Unterbrecher auf Unterbrecher folgt, muss Ausbildungssemester gleich sein
 			if ($checks['unterbrechersemester']
-				&& $current->status_kurzbz == 'Unterbrecher'
-				&& $next->status_kurzbz == 'Unterbrecher'
+				&& $current->status_kurzbz == self::UNTERBRECHER_STATUS
+				&& $next->status_kurzbz == self::UNTERBRECHER_STATUS
 				&& $current->ausbildungssemester != $next->ausbildungssemester
 			)
 				$checks['unterbrechersemester'] = false;
 
 			// wenn Abbrecher auf Unterbrecher folgt, muss Ausbildungssemester gleich sein
 			if ($checks['abbrechersemester']
-				&& $current->status_kurzbz == 'Unterbrecher'
-				&& $next->status_kurzbz == 'Abbrecher'
+				&& $current->status_kurzbz == self::UNTERBRECHER_STATUS
+				&& $next->status_kurzbz == self::ABBRECHER_STATUS
 				&& $current->ausbildungssemester != $next->ausbildungssemester
 			)
 				$checks['abbrechersemester'] = false;
 
-			// keine Studenten nach Diplomand Status
-			if ($checks['diplomant']
-				&& $current->status_kurzbz == 'Diplomand'
-				&& $next->status_kurzbz == 'Student'
-			)
-				$checks['diplomant'] = false;
+			if (($checks['diplomant']
+				|| $checks['student'])
+				&& $next->status_kurzbz == self::STUDENT_STATUS
+			) {
+				$restl_stati = array_unique(array_column(array_slice($history, $c), 'status_kurzbz'));
+
+				// keine Studenten nach Diplomand Status
+				if ($checks['diplomant']
+					&& in_array(self::DIPLOMAND_STATUS, $restl_stati)
+				)
+					$checks['diplomant'] = false;
+
+				// vor Studentenstatus müssen bestimmte Status vorhanden sein
+				if ($checks['student']
+					&& array_values(array_intersect($restl_stati, $this->_statusAbfolgeVorStudent)) != array_values($this->_statusAbfolgeVorStudent)
+				)
+					$checks['student'] = false;
+			}
 		}
 
 		$this->_cache_history[$primary] = success($checks);
@@ -584,6 +598,44 @@ class PrestudentstatusCheckLib
 		return success(getData($result)['diplomant']);
 	}
 
+	/**
+	 * Checks if a Student precedes given stati in the status history.
+	 *
+	 * @param integer				$prestudent_id
+	 * @param string				$status_kurzbz
+	 * @param DateTime				$new_date
+	 * @param string				$new_studiensemester_kurzbz
+	 * @param integer				$new_ausbildungssemester
+	 * @param string				$old_studiensemester_kurzbz
+	 * @param integer				$old_ausbildungssemester
+	 *
+	 * @return stdClass
+	 */
+	public function checkStatusHistoryStudent(
+		$prestudent_id,
+		$status_kurzbz,
+		$new_date,
+		$new_studiensemester_kurzbz,
+		$new_ausbildungssemester,
+		$old_studiensemester_kurzbz,
+		$old_ausbildungssemester
+	) {
+		$result = $this->prepareStatusHistory(
+			$prestudent_id,
+			$status_kurzbz,
+			$new_date,
+			$new_studiensemester_kurzbz,
+			$new_ausbildungssemester,
+			$old_studiensemester_kurzbz,
+			$old_ausbildungssemester
+		);
+
+		if (isError($result))
+			return $result;
+
+		return success(getData($result)['student']);
+	}
+
 	/**
 	 * Checks if Personenkennzeichen is set correctly.
 	 *
@@ -605,6 +657,7 @@ class PrestudentstatusCheckLib
 		$this->_ci->PrestudentstatusModel->addLimit(1);
 		
 		$result = $this->_ci->PrestudentstatusModel->loadWhere([
+			'tbl_prestudentstatus.prestudent_id' => $prestudent_id,
 			'tbl_prestudentstatus.status_kurzbz' => self::STATUS_STUDENT
 		]);
 

From 7498b327d48f546557251b4e95affc2e42717d4e Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 24 Jul 2024 08:42:19 +0200
Subject: [PATCH 0980/1461] dynamic Toolbars Interessent, Student, update
 actions interessent

---
 .../api/frontend/v1/stv/Status.php            |  64 ++--
 application/models/crm/Status_model.php       |  18 +
 .../Details/Prestudent/MultiStatus.js         | 316 ++++++++++++++----
 3 files changed, 306 insertions(+), 92 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 459b22927..fa3fab1df 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -13,13 +13,13 @@ class Status extends FHCAPI_Controller
 			'getHistoryPrestudent' => ['admin:r', 'assistenz:r'],
 			'insert' => ['admin:rw', 'assistenz:rw'],
 			'changeStatus' => ['admin:r', 'assistenz:r', 'student/keine_studstatuspruefung'],
-			//'turnIntoStudent' => ['admin:r', 'assistenz:r', 'student/keine_studstatuspruefung'],
 			'addStudent' => ['admin:r', 'assistenz:r', 'student/keine_studstatuspruefung'],
 			'getStatusgruende' => self::PERM_LOGGED,
 			'getLastBismeldestichtag' => self::PERM_LOGGED,
 			'isLastStatus' => self::PERM_LOGGED,
 			'isErsterStudent' => self::PERM_LOGGED,
 			'hasStatusBewerber' => self::PERM_LOGGED,
+			'getStatusarray' => self::PERM_LOGGED,
 			'deleteStatus' => ['admin:r','assistenz:r'],
 			'loadStatus' => ['admin:r', 'assistenz:r'],
 			'updateStatus' => ['admin:rw', 'assistenz:rw'],
@@ -357,6 +357,22 @@ class Status extends FHCAPI_Controller
 		return $studiensem->studiensemester_kurzbz;
 	}
 
+	public function getStatusarray()
+	{
+		$this->load->model('crm/Status_model', 'StatusModel');
+		$result = $this->StatusModel->getAllStatiWithStatusgruende();
+
+		if(isError($result))
+		{
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+
+	}
+
 	public function changeStatus($prestudent_id)
 	{
 		//get Studiengang von prestudent_id
@@ -445,7 +461,11 @@ class Status extends FHCAPI_Controller
 		{
 			$ausbildungssemester = $lastStatusData->ausbildungssemester;
 		}
-		if($status_kurzbz == Prestudentstatus_model::STATUS_AUFGENOMMENER)
+		if(
+			$status_kurzbz == Prestudentstatus_model::STATUS_AUFGENOMMENER ||
+			$status_kurzbz == Prestudentstatus_model::STATUS_WARTENDER ||
+			$status_kurzbz == Prestudentstatus_model::STATUS_ABGEWIESENER
+		)
 		{
 			$studiensemester_kurzbz = 	$this->getStudiensemesterOfStatus($prestudent_id, Prestudentstatus_model::STATUS_BEWERBER);
 
@@ -560,36 +580,6 @@ class Status extends FHCAPI_Controller
 			}
 		}
 
-		//TODO(Manu) DELETE
-		// $new_status_datum = isset($datum) ? $datum : date('Y-m-d');
-
-		// $result = $this->prestudentstatuschecklib->checkStatusAdd(
-		// 	$prestudent_id,
-		// 	$status_kurzbz,
-		// 	$studiensemester_kurzbz,
-		// 	$new_status_datum,
-		// 	$ausbildungssemester,
-		// 	$studienplan_id
-		// );
-
-		// if (isError($result))
-		// {
-		// 	return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		// }
-
-		// $this->load->model('codex/Bismeldestichtag_model', 'BismeldestichtagModel');
-		// $result = $this->BismeldestichtagModel->checkIfMeldestichtagErreicht($datum, $studiensemester_kurzbz);
-		// return $this->terminateWithError("retval: " . $result->retval, self::ERROR_TYPE_GENERAL);
-
-		// if (isError($result))
-		// {
-		// 	return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		// }
-		// if ($result->retval == "1")
-		// {
-		// 	return $this->terminateWithError($this->p->t('lehre','error_dataVorMeldestichtag'), self::ERROR_TYPE_GENERAL);
-		// }
-
 		switch($status_kurzbz){
 			case Prestudentstatus_model::STATUS_ABBRECHER:
 				{
@@ -670,7 +660,7 @@ class Status extends FHCAPI_Controller
 
 				}
 				break;
-			case Prestudentstatus_model::STATUS_BEWERBER:
+/*			case Prestudentstatus_model::STATUS_BEWERBER:
 				{
 					$this->load->library('PrestudentLib');
 					$result = $this->prestudentlib->setBewerber($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
@@ -683,7 +673,7 @@ class Status extends FHCAPI_Controller
 						$this->terminateWithSuccess($prestudent_id);
 
 				}
-				break;
+				break;*/
 			// case Prestudentstatus_model::STATUS_BEWERBER:
 			// 	{
 			// 		$this->load->library('PrestudentLib');
@@ -956,6 +946,8 @@ class Status extends FHCAPI_Controller
 				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 			}
 			$semesterAufgenommen = current(getData($result));
+			$semesterAufgenommen = $semesterAufgenommen->studiensemester_kurzbz;
+
 
 			//generate Personenkennzeichen(matrikelnr)
 			$matrikelnr = false;
@@ -963,7 +955,7 @@ class Status extends FHCAPI_Controller
 				$matrikelnr = $value;
 			});
 			if ($matrikelnr === false) {
-				$resultMat = $this->StudentModel->generateMatrikelnummer2($stg, $semesterAufgenommen->studiensemester_kurzbz, $typ);
+				$resultMat = $this->StudentModel->generateMatrikelnummer2($stg, $semesterAufgenommen, $typ);
 				if (isError($resultMat)) {
 					return $this->terminateWithError($resultMat, self::ERROR_TYPE_GENERAL);
 				}
@@ -1023,6 +1015,8 @@ class Status extends FHCAPI_Controller
 			$aktivierungscode = getData($result);
 
 			//generate Alias
+			//TODO(Manu) check if alias already exists
+
 			$result = $this->PersonModel->generateAliasByPersonId($person_id);
 
 			if (isError($result))
diff --git a/application/models/crm/Status_model.php b/application/models/crm/Status_model.php
index 7b1b38ecb..6133b64e2 100644
--- a/application/models/crm/Status_model.php
+++ b/application/models/crm/Status_model.php
@@ -11,4 +11,22 @@ class Status_model extends DB_Model
 		$this->dbTable = 'public.tbl_status';
 		$this->pk = 'status_kurzbz';
 	}
+
+	public function getAllStatiWithStatusgruende()
+	{
+		$lang = '[(SELECT index FROM public.tbl_sprache WHERE sprache=' . $this->escape(getUserLanguage()) . ' LIMIT 1)]';
+
+		$this->addSelect('sg.status_kurzbz');
+
+		$this->addSelect('statusgrund_id');
+		$this->addSelect('sg.bezeichnung_mehrsprachig' . $lang . ' AS bezeichnung');
+		$this->addSelect('sg.beschreibung' . $lang . ' AS beschreibung');
+
+		$this->addJoin('public.tbl_status_grund sg', 'ON (sg.status_kurzbz = public.tbl_status.status_kurzbz)', 'LEFT');
+
+		return $this->loadWhere([
+			'aktiv'=> true,
+		]);
+
+	}
 }
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index c8d569020..67bcde30f 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -126,6 +126,74 @@ export default{
 				return !this.modelValue.some(item => item.uid);
 			}
 			return !this.modelValue.uid;
+		},
+		toolbarInteressent() {
+			return this.listDataToolbar.filter(item => this.statiInteressent.includes(item.status_kurzbz));
+		},
+		toolbarStudent() {
+			return this.listDataToolbar.filter(item => this.statiStudent.includes(item.status_kurzbz));
+		},
+		resultInteressentArray() {
+			const result = [];
+			this.statiInteressent.forEach(status => {
+				const defaultObject = {
+					status_kurzbz: status,
+					statusgrund_id: null,
+					link: `changeStatusTo${status}`,
+					dropEntry: null
+				};
+
+				if (status === "Student") {
+					defaultObject.link = 'changeInteressentToStudent';
+				}
+
+				result.push(defaultObject);
+
+				this.toolbarInteressent.forEach(item => {
+					if (item.status_kurzbz === status) {
+
+						const itemObject = {
+							status_kurzbz: item.status_kurzbz,
+							statusgrund_id: item.statusgrund_id,
+							beschreibung: item.beschreibung,
+							link: `changeStatusTo${item.status_kurzbz}(${item.statusgrund_id})`,
+							dropEntry: `[${item.beschreibung}]`
+						};
+
+						if (item.status_kurzbz === "Student") {
+							itemObject.link = `changeInteressentTo${item.status_kurzbz}(${item.statusgrund_id})`;
+						}
+
+						result.push(itemObject);
+
+					}
+				});
+			});
+			return result;
+		},
+		resultStudentArray() {
+			const result = [];
+			this.statiStudent.forEach(status => {
+				result.push({
+					status_kurzbz: status,
+					statusgrund_id: null,
+					link: `changeStatusTo${status}`,
+					dropEntry: null
+				});
+
+				this.toolbarStudent.forEach(item => {
+					if (item.status_kurzbz === status) {
+						result.push({
+							status_kurzbz: item.status_kurzbz,
+							statusgrund_id: item.statusgrund_id,
+							beschreibung: item.beschreibung,
+							link: `changeStatusTo${item.status_kurzbz}(${item.statusgrund_id})`,
+							dropEntry: `[${item.beschreibung}]`,
+						});
+					}
+				});
+			});
+			return result;
 		}
 	},
 	props: {
@@ -301,7 +369,12 @@ export default{
 			newStatus: '',
 			statusNew: true,
 			isErsterStudent: false,
-			isBewerber: true
+			isBewerber: true,
+			listDataToolbar: [],
+			//TODO(Manu) get from config
+			statiInteressent: ["Bewerber", "Aufgenommener", "Student" , "Wartender", "Abgewiesener"],
+			statiStudent: ["Abbrecher", "Unterbrecher", "Student" , "Diplomand", "Absolvent"],
+			selectedStatus: 'default'
 		}
 	},
 	watch: {
@@ -452,7 +525,8 @@ export default{
 			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData }));
 			this.changeStatus(prestudentIds);
 		},
-		changeStatusToStudent(prestudentIds){
+		changeStatusToStudent(statusgrund_id){
+			console.log("in function changeStatusToStudent: ", statusgrund_id);
 			let def_date = this.getDefaultDate();
 			//TODO Manu validation if Bewerber already before asking for ausbildungssemester
 			//this.checkIfBewerber();
@@ -461,12 +535,14 @@ export default{
 				{
 					status_kurzbz: 'Student',
 					datum: def_date,
-					bestaetigtam: def_date
+					bestaetigtam: def_date,
+					statusgrund_id: statusgrund_id
 				};
 
 			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData, ausbildungssemester: this.actionSem}));
-			//BewerberZuStudent
-			this.addStudent(prestudentIds);
+
+			//TODO(Manu) get bezeichnung von statusgrund_kurzbz
+			this.actionConfirmDialogue(this.updateData, 'student','Studenten');
 		},
 		changeStatusToWiederholer(prestudentIds){
 			this.hideModal('askForAusbildungssemester');
@@ -506,7 +582,7 @@ export default{
 			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData}));
 			this.changeStatus(prestudentIds);
 		},
-		changeStatusToBewerber(prestudentIds){
+		changeStatusToBewerber(){
 			let def_date = this.getDefaultDate();
 			let deltaData =
 				{
@@ -519,10 +595,9 @@ export default{
 			this.newArray = this.updateData.map(objekt => ({
 				...objekt,
 				...deltaData}));
-			this.changeStatus(prestudentIds);
+			this.changeStatus(this.prestudentIds);
 		},
-		changeStatusToAufgenommener(prestudentIds){
-			this.hideModal('confirmStatusAction');
+		changeStatusToAufgenommener(){
 			let def_date = this.getDefaultDate();
 			let deltaData =
 				{
@@ -534,39 +609,62 @@ export default{
 			this.newArray = this.updateData.map(objekt => ({
 				...objekt,
 				...deltaData,
-					}));
+			}));
 
-			//TODO(Manu) change studiensemester_kurzbz in backend
-			//studiensemester_kurzbz: this.getStudiensemesterOfBewerber(objekt.prestudent_id)
-			this.changeStatus(prestudentIds);
+			this.actionConfirmDialogue(this.updateData, 'aufgenommener','Aufgenommenen');
 
 		},
-		changeInteressentToStudent(prestudentIds){
-
-			console.log("in function changeInteressentToStudent")
+		changeInteressentToStudent(statusgrund_id){
+			//TODO(Manu) test statusgrund_id
+			console.log("in function changeInteressentToStudent mit statusgrund_id", statusgrund_id);
 			let def_date = this.getDefaultDate();
 			let deltaData =
 				{
 					status_kurzbz: 'Student',
 					datum: def_date,
-					bestaetigtam: def_date
+					bestaetigtam: def_date,
+					statusgrund_id: statusgrund_id
 				};
 
 			this.newArray = this.updateData.map(objekt => ({
 				...objekt,
 				...deltaData,
-					}));
+			}));
 
-			//TODO(Manu) change studiensemester_kurzbz in backend
-			//studiensemester_kurzbz: this.getStudiensemesterOfBewerber(objekt.prestudent_id)
-			//this.addStudent(prestudentIds);
+			this.addStudent(this.prestudentIds);
 
 		},
-		changeStatusToAbgewiesen(prestudentIds){
-			console.log("in function changeStatusToAbgewiesen");
+		changeStatusToAbgewiesener(statusgrund_id){
+			let def_date = this.getDefaultDate();
+			let deltaData =
+				{
+					status_kurzbz: 'Abgewiesener',
+					datum: def_date,
+					bestaetigtam: def_date,
+					statusgrund_id: statusgrund_id
+				};
+
+			this.newArray = this.updateData.map(objekt => ({
+				...objekt,
+				...deltaData,
+			}));
+
+			this.actionConfirmDialogue(this.updateData, 'abgewiesener','Abgewiesenen');
 		},
-		changeStatusToWartend(prestudentIds){	
-			console.log("in function changeStatusToWartend");
+		changeStatusToWartender(){
+			let def_date = this.getDefaultDate();
+			let deltaData =
+				{
+					status_kurzbz: 'Wartender',
+					datum: def_date,
+					bestaetigtam: def_date
+				};
+			this.newArray = this.updateData.map(objekt => ({
+				...objekt,
+				...deltaData,
+			}));
+
+			this.actionConfirmDialogue(this.updateData, 'wartender','Wartenden');
 		},
 		addStudent(prestudentIds){
 
@@ -637,6 +735,7 @@ export default{
 				.catch(this.$fhcAlert.handleSystemError);
 		},
 		changeStatus(prestudentIds){
+			this.hideModal('confirmStatusAction');
 			//Array.isArray(prestudentIds) ? this.modelValue.prestudent_id : [prestudentIds];
 			let changeData = {};
 
@@ -868,6 +967,17 @@ export default{
 		getDefaultDate() {
 			const today = new Date();
 			return today;
+		},
+		handleSelectionChange(event) {
+			const selectedValue = event.target.value;
+			const selectedItem = this.resultInteressentArray.find(item =>
+				item.status_kurzbz + (item.statusgrund_id !== null ? '-' + item.statusgrund_id : '') === selectedValue
+			);
+			if (selectedItem && typeof this[selectedItem.link] === 'function') {
+				this[selectedItem.link]();
+			} else {
+				console.warn(`No method found for ${selectedItem.link}`);
+			}
 		}
 	},
 	created(){
@@ -893,9 +1003,37 @@ export default{
 					this.$refs.table.tabulator.redraw(true);
 			})
 			.catch(this.$fhcAlert.handleSystemError);
+		this.$fhcApi
+			.get('api/frontend/v1/stv/status/getStatusarray/')
+			.then(result => result.data)
+			.then(result => {
+				this.listDataToolbar = result;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
 	},
 	template: `
 		<div class="stv-list h-100 pt-3">
+		
+	<!--<div>
+				<table class="table">
+				<thead>
+					<tr>
+					<th>Status Kurzbez</th>
+					<th>Bezeichnung</th>
+					<th>Status Grund ID</th>
+					<th>Link</th>
+					</tr>
+				</thead>
+				<tbody>
+					<tr v-for="item in resultInteressentArray" :key="item.status_kurzbz + (item.statusgrund_id !== null ? '-' + item.statusgrund_id : '')">
+					<td>{{ item.status_kurzbz }}</td>
+					<td>{{ item.beschreibung }}</td>
+					<td>{{ item.statusgrund_id }}</td>
+					<td><a :href="item.link">{{ item.link }}</a></td>
+					</tr>
+				</tbody>
+				</table>
+			</div> -->
 			
 			<!--Modal: statusModal-->
 			<bs-modal ref="statusModal">
@@ -930,6 +1068,7 @@ export default{
 						<option  value="Incoming">Incoming</option>
 						<option v-if="!statusNew" value="Absolvent">Absolvent</option>
 						<option v-if="!statusNew" value="Abbrecher">Abbrecher</option>
+						<option v-if="!statusNew" value="Abgewiesener">Abgewiesener</option>
 					</form-input>
 					<form-input
 						container-class="mb-3"
@@ -1069,16 +1208,16 @@ export default{
 						<button  ref="Close" type="button" class="btn btn-primary" @click="changeStatusToUnterbrecher(prestudentIds)">OK</button>
 					</div>
 					<div v-if="actionButton=='aufgenommener'">
-						<button  ref="Close" type="button" class="btn btn-primary" @click="changeStatusToAufgenommener(prestudentIds)">OK</button>
+						<button  ref="Close" type="button" class="btn btn-primary" @click="changeStatus(prestudentIds)">OK</button>
 					</div>
 					<div v-if="actionButton=='student'">
 						<button  ref="Close" type="button" class="btn btn-primary" @click="changeInteressentToStudent(prestudentIds)">OK</button>
 					</div>
 					<div v-if="actionButton=='wartender'">
-						<button  ref="Close" type="button" class="btn btn-primary" @click="changeStatusToWartend(prestudentIds)">OK</button>
+						<button  ref="Close" type="button" class="btn btn-primary" @click="changeStatus(prestudentIds)">OK</button>
 					</div>
 					<div v-if="actionButton=='abgewiesener'">
-						<button  ref="Close" type="button" class="btn btn-primary" @click="changeStatusToAbgewiesen(prestudentIds)">OK</button>
+						<button  ref="Close" type="button" class="btn btn-primary" @click="changeStatus(prestudentIds)">OK</button>
 					</div>					
 				</template>
 			</BsModal>
@@ -1150,7 +1289,7 @@ export default{
 								<a class="dropdown-item" @click="changeStatusToBewerber(prestudentIds)">Bewerber</a>
 							</li>
 							<li class="dropdown-submenu">
-								<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'aufgenommener','Aufgenommenen')">Aufgenommener</a>
+								<a class="dropdown-item" @click="changeStatusToAufgenommener">Aufgenommener</a>
 							</li>				
 							<li class="dropdown-submenu">
 								<a class="dropdown-item dropdown-toggle" href="#">Student</a>
@@ -1159,40 +1298,57 @@ export default{
 										<a class="dropdown-item" @click="changeInteressentToStudent(prestudentIds)">Student</a>
 									</li>
 									<li>
-										<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'student', 'PreAbbrecher')">Pre-Abbrecher</a>
+										<a class="dropdown-item" @click="changeInteressentToStudent(19)">Pre-Abbrecher</a>
 									</li>
 									<li>
-										<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'student', 'PreWiederholer')">Pre-Wiederholer</a>
+										<a class="dropdown-item" @click="changeInteressentToStudent(15)">Pre-Wiederholer</a>
 									</li>
 									<li>
-										<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'student', 'Wiederholer')">Wiederholer</a>
+										<a class="dropdown-item" @click="changeInteressentToStudent(16)">Wiederholer</a>
 									</li>
 								</ul>
 							</li>
 							<li class="dropdown-submenu">
-								<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'wartender', 'Wartenden')">Wartender</a>
-							</li>
-							<li class="dropdown-submenu">
-								<a class="dropdown-item" @click="changeStatusToAbsolvent(prestudentIds)">Absolvent</a>
+								<a class="dropdown-item" @click="changeStatusToWartender">Wartender</a>
 							</li>
 							<li class="dropdown-submenu">
 								<a class="dropdown-item dropdown-toggle" href="#">Absage</a>
 								<ul class="dropdown-menu dropdown-menu-right">
 									<li>
-										<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'abgewiesener', 'Abgewiesenen')">Aufnahme in anderen Studiengang</a>
+										<a class="dropdown-item" @click="changeStatusToAbgewiesener(2)">Keine Antwort</a>
 									</li>
 									<li>
-										<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'abgewiesener', 'Abgewiesenen')">Keine Antwort</a>
-									</li>
+										<a class="dropdown-item" @click="changeStatusToAbgewiesener(3)">ZGV nicht erfüllt</a>
+									</li>									
 									<li>
-										<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'abgewiesener', 'Abgewiesenen')">Sonstiges</a>
-									</li>
+										<a class="dropdown-item" @click="changeStatusToAbgewiesener(4)">Von BewerberIn storniert</a>
+									</li>									
 									<li>
-										<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'abgewiesener', 'Abgewiesenen')">...</a>
+										<a class="dropdown-item" @click="changeStatusToAbgewiesener(5)">Aufnahme in anderen Studiengang</a>
+									</li>									
+									<li>
+										<a class="dropdown-item" @click="changeStatusToAbgewiesener(6)">Reihungstestergebnis unzureichend</a>
+									</li>									
+									<li>
+										<a class="dropdown-item" @click="changeStatusToAbgewiesener(7)">Sonstiges</a>
 									</li>
 								</ul>
 							</li>					
 						</ul>
+												
+						<!-- SingleSelectButton Dynamisch Interessent-->
+						<div v-if="showToolbarInteressent" class="btn-group">
+							<select v-model="selectedStatus" class="form-select button-dropdown" @change="handleSelectionChange">
+							<option value="default">---SELECT STATUS INTERESSENT---</option>
+							<option 
+								v-for="item in resultInteressentArray" 
+								:key="item.status_kurzbz + (item.statusgrund_id !== null ? '-' + item.statusgrund_id : '')"
+								:value="item.status_kurzbz + (item.statusgrund_id !== null ? '-' + item.statusgrund_id : '')"
+							>
+								{{ item.status_kurzbz }} {{ item.bezeichnung }} {{ item.dropEntry }}
+							</option>
+							</select>
+						</div>
 					
 						<!--toolbar Student-->
 						<ul v-if="showToolbarStudent" class="dropdown-menu">
@@ -1219,6 +1375,21 @@ export default{
 							</li>							
 						</ul>
 					</div>
+					
+					<!-- Dynamisch Student-->
+					<div v-if="showToolbarStudent" class="btn-group">
+						<select v-model="selectedStatus" class="form-select button-dropdown" @change="handleSelectionChange">
+						<option value="default">---SELECT STATUS STUDENT---</option>
+						<option 
+							v-for="item in resultStudentArray" 
+							:key="item.status_kurzbz + (item.statusgrund_id !== null ? '-' + item.statusgrund_id : '')"
+							 :value="item.status_kurzbz + (item.statusgrund_id !== null ? '-' + item.statusgrund_id : '')"
+						>
+							{{ item.status_kurzbz }} {{ item.bezeichnung }} {{ item.dropEntry }}
+						</option>
+						</select>
+					</div>
+				</template>
 				</template>
 
 			</core-filter-cmpt>
@@ -1239,49 +1410,66 @@ export default{
 						<a class="dropdown-item" @click="changeStatusToBewerber(prestudentIds)">Bewerber</a>
 					</li>
 					<li class="dropdown-submenu">
-						<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'aufgenommener','Aufgenommenen')">Aufgenommener</a>
+						<a class="dropdown-item" @click="changeStatusToAufgenommener">Aufgenommener</a>
 					</li>				
 					<li class="dropdown-submenu">
 						<a class="dropdown-item dropdown-toggle" href="#">Student</a>
 						<ul class="dropdown-menu dropdown-menu-right">
 							<li>
-								<a class="dropdown-item" @click="changeStatusToStudent(prestudentIds)">Student</a>
+								<a class="dropdown-item" @click="changeInteressentToStudent(prestudentIds)">Student</a>
 							</li>
 							<li>
-								<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'student', 'PreAbbrecher')">Pre-Abbrecher</a>
+								<a class="dropdown-item" @click="changeInteressentToStudent(19)">Pre-Abbrecher</a>
 							</li>
 							<li>
-								<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'student', 'PreWiederholer')">Pre-Wiederholer</a>
+								<a class="dropdown-item" @click="changeInteressentToStudent(15)">Pre-Wiederholer</a>
 							</li>
 							<li>
-								<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'student', 'Wiederholer')">Wiederholer</a>
+								<a class="dropdown-item" @click="changeInteressentToStudent(16)">Wiederholer</a>
 							</li>
 						</ul>
 					</li>
 					<li class="dropdown-submenu">
-						<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'wartender', 'Wartenden')">Wartender</a>
-					</li>
-					<li class="dropdown-submenu">
-						<a class="dropdown-item" @click="changeStatusToAbsolvent(prestudentIds)">Absolvent</a>
+						<a class="dropdown-item" @click="changeStatusToWartender">Wartender</a>
 					</li>
 					<li class="dropdown-submenu">
 						<a class="dropdown-item dropdown-toggle" href="#">Absage</a>
 						<ul class="dropdown-menu dropdown-menu-right">
 							<li>
-								<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'abgewiesener', 'Abgewiesenen')">Aufnahme in anderen Studiengang</a>
+								<a class="dropdown-item" @click="changeStatusToAbgewiesener(2)">Keine Antwort</a>
 							</li>
 							<li>
-								<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'abgewiesener', 'Abgewiesenen')">Keine Antwort</a>
-							</li>
+								<a class="dropdown-item" @click="changeStatusToAbgewiesener(3)">ZGV nicht erfüllt</a>
+							</li>									
 							<li>
-								<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'abgewiesener', 'Abgewiesenen')">Sonstiges</a>
-							</li>
+								<a class="dropdown-item" @click="changeStatusToAbgewiesener(4)">Von BewerberIn storniert</a>
+							</li>									
 							<li>
-								<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'abgewiesener', 'Abgewiesenen')">...</a>
+								<a class="dropdown-item" @click="changeStatusToAbgewiesener(5)">Aufnahme in anderen Studiengang</a>
+							</li>									
+							<li>
+								<a class="dropdown-item" @click="changeStatusToAbgewiesener(6)">Reihungstestergebnis unzureichend</a>
+							</li>									
+							<li>
+								<a class="dropdown-item" @click="changeStatusToAbgewiesener(7)">Sonstiges</a>
 							</li>
 						</ul>
 					</li>					
 				</ul>
+				
+				<!-- Dynamisch Interessent-->
+				<div v-if="showToolbarInteressent" class="btn-group">
+					<select v-model="selectedStatus" class="form-select button-dropdown" @change="handleSelectionChange">
+					<option value="default">---SELECT STATUS INTERESSENT---</option>
+					<option 
+						v-for="item in resultInteressentArray" 
+						:key="item.status_kurzbz + (item.statusgrund_id !== null ? '-' + item.statusgrund_id : '')"
+						:value="item.status_kurzbz + (item.statusgrund_id !== null ? '-' + item.statusgrund_id : '')"
+					>
+						{{ item.status_kurzbz }} {{ item.bezeichnung }} {{ item.dropEntry }}
+					</option>
+					</select>
+				</div>
 			
 				<!--toolbar Student-->
 				<ul v-if="showToolbarStudent" class="dropdown-menu">
@@ -1308,6 +1496,20 @@ export default{
 					</li>							
 				</ul>
 			</div>
+			
+			<!-- Dynamisch Student-->
+			<div v-if="showToolbarStudent" class="btn-group">
+				<select v-model="selectedStatus" class="form-select button-dropdown" @change="handleSelectionChange">
+				<option value="default">---SELECT STATUS STUDENT---</option>
+				<option 
+					v-for="item in resultStudentArray" 
+					:key="item.status_kurzbz + (item.statusgrund_id !== null ? '-' + item.statusgrund_id : '')"
+						:value="item.status_kurzbz + (item.statusgrund_id !== null ? '-' + item.statusgrund_id : '')"
+				>
+					{{ item.status_kurzbz }} {{ item.bezeichnung }} {{ item.dropEntry }}
+				</option>
+				</select>
+			</div>
 		
 		</div>`
 

From d9cba6bf5c5bf6e5a9bd2f19244192340c9f6783 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 24 Jul 2024 08:45:48 +0200
Subject: [PATCH 0981/1461] Check orgform student/bewerber

---
 .../libraries/PrestudentstatusCheckLib.php    | 20 ++++++++++-
 .../models/crm/Prestudentstatus_model.php     | 35 +++++++++++++++++++
 2 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/application/libraries/PrestudentstatusCheckLib.php b/application/libraries/PrestudentstatusCheckLib.php
index 86066fdda..20b42b46a 100644
--- a/application/libraries/PrestudentstatusCheckLib.php
+++ b/application/libraries/PrestudentstatusCheckLib.php
@@ -620,6 +620,7 @@ class PrestudentstatusCheckLib
 		$old_studiensemester_kurzbz,
 		$old_ausbildungssemester
 	) {
+		// TODO(chris): TEST
 		$result = $this->prepareStatusHistory(
 			$prestudent_id,
 			$status_kurzbz,
@@ -645,6 +646,7 @@ class PrestudentstatusCheckLib
 	 */
 	public function checkPersonenkennzeichen($prestudent_id)
 	{
+		// TODO(chris): TEST
 		$this->_ci->PrestudentstatusModel->addSelect('tbl_prestudentstatus.prestudent_id');
 		$this->_ci->PrestudentstatusModel->addSelect('tbl_student.matrikelnr');
 
@@ -675,7 +677,23 @@ class PrestudentstatusCheckLib
 		return success($jahr == mb_substr($data->matrikelnr, 0, 2));
 	}
 
-	// TODO(chris): check status history error_bewerberOrgformUngleichStudentOrgform
+	/**
+	 * Checks if Orgform of Student status and Bewerber status match.
+	 *
+	 * @param integer				$prestudent_id
+	 *
+	 * @return stdClass
+	 */
+	public function checkStudentOrgform($prestudent_id)
+	{
+		// TODO(chris): TEST
+		$result = $this->_ci->PrestudentstatusModel->getBewerberWhereOrgformNotStudent($prestudent_id);
+
+		if (isError($result))
+			return $result;
+
+		return success(!hasData($result));
+	}
 
 	/**
 	 * Check if History of StatusData is valid
diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php
index a19c465ec..e52bbf577 100644
--- a/application/models/crm/Prestudentstatus_model.php
+++ b/application/models/crm/Prestudentstatus_model.php
@@ -698,4 +698,39 @@ class Prestudentstatus_model extends DB_Model
 
 		return $result;
 	}
+
+	/**
+	 * For checks if Orgform of Student status and Bewerber status match.
+	 * Returns any Bewerber status that does not match the first Student
+	 * status' Orgform.
+	 *
+	 * @param integer				$prestudent_id
+	 *
+	 * @return stdClass
+	 */
+	public function getBewerberWhereOrgformNotStudent($prestudent_id)
+	{
+		$this->addSelect('plan.orgform_kurzbz');
+
+		$this->addJoin('lehre.tbl_studienplan plan', 'studienplan_id', 'LEFT');
+
+		$this->addOrder('tbl_prestudentstatus.datum', 'DESC');
+		$this->addOrder('tbl_prestudentstatus.insertamum', 'DESC');
+		$this->addOrder('tbl_prestudentstatus.ext_id', 'DESC');
+		
+		$this->addLimit(1);
+
+		$this->db->where('prestudent_id', $prestudent_id);
+		$this->db->where('status_kurzbz', self::STATUS_STUDENT);
+		
+		$sql = $this->db->get_compiled_select($this->dbTable);
+
+		$this->addJoin('lehre.tbl_studienplan plan', 'studienplan_id', 'LEFT');
+
+		$this->db->where('plan.orgform_kurzbz !=', '(' . $sql . ')', false);
+		return $this->loadWhere([
+			'prestudent_id' => $prestudent_id,
+			'status_kurzbz' => self::STATUS_BEWERBER
+		]);
+	}
 }

From 93b301ee084f8a5462354d63aeac06cf1121d2ca Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 24 Jul 2024 13:24:15 +0200
Subject: [PATCH 0982/1461] Finish Status insert function

---
 .../api/frontend/v1/stv/Status.php            | 99 ++++++++++++++++++-
 .../models/crm/Prestudentstatus_model.php     |  1 +
 2 files changed, 97 insertions(+), 3 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index fa3fab1df..581d18bad 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -57,15 +57,30 @@ class Status extends FHCAPI_Controller
 		$this->terminateWithSuccess($data);
 	}
 
+	/**
+	 * Inserts a status with less validations and extra logic for manual
+	 * manipulation
+	 *
+	 * @param integer				$prestudent_id
+	 *
+	 * @return void
+	 */
 	public function insert($prestudent_id)
 	{
 		$isBerechtigtNoStudstatusCheck = $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung');
-		$isBerechtigtNoStudstatusCheck = false; // TODO(chris): DEBUG
+
 
 		$status_kurzbz = $this->input->post('status_kurzbz');
 		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
 		$ausbildungssemester = $this->input->post('ausbildungssemester');
 		$datum = $this->input->post('datum');
+		$bestaetigtam = $this->input->post('bestaetigtam');
+		$orgform_kurzbz = $this->input->post('orgform_kurzbz');
+		$anmerkung = $this->input->post('anmerkung');
+		$bewerbung_abgeschicktamum = $this->input->post('bewerbung_abgeschicktamum');
+		$studienplan_id = $this->input->post('studienplan_id');
+		$rt_stufe = $this->input->post('rt_stufe');
+		$statusgrund_id = $this->input->post('statusgrund_id');
 
 
 		$this->load->library('form_validation');
@@ -125,7 +140,7 @@ class Status extends FHCAPI_Controller
 		$this->form_validation->set_rules('bestaetigtam', $this->p->t('lehre', 'bestaetigt_am'), 'is_valid_date');
 
 		// Set Datum to null to prevent multiple is_valid_date checks in the following validation rules
-		if (!is_valid_date($datum))
+		if (!$datum || !is_valid_date($datum))
 			$datum = null;
 
 		$this->form_validation->set_rules('_default', '', [
@@ -273,7 +288,85 @@ class Status extends FHCAPI_Controller
 		
 		if (!$this->form_validation->run())
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
-		// TODO(chris): IMPLEMENT!
+		
+
+		$this->db->trans_start();
+
+		if (in_array($status_kurzbz, [
+			Prestudentstatus_model::STATUS_STUDENT,
+			Prestudentstatus_model::STATUS_DIPLOMAND,
+			Prestudentstatus_model::STATUS_ABSOLVENT,
+			Prestudentstatus_model::STATUS_INCOMING,
+			Prestudentstatus_model::STATUS_ABBRECHER,
+			Prestudentstatus_model::STATUS_UNTERBRECHER
+		])) {
+			$result = $this->StudentModel->loadWhere([
+				'prestudent_id' => $prestudent_id
+			]);
+
+			$student = $this->getDataOrTerminateWithError($result);
+
+			if ($student) {
+				$student = current($student);
+				
+				$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
+				$result = $this->StudentlehrverbandModel->loadWhere([
+					'student_uid' => $student->student_uid,
+					'studiensemester_kurzbz' => $studiensemester_kurzbz
+				]);
+
+				$studentlvb = $this->getDataOrTerminateWithError($result);
+
+				// NOTE(chris): if $studentlvb then update to the same values as before (except updatevon). So do nothing.
+				// TODO(chris): check if that is correct (in FAS)?
+				if (!$studentlvb) {
+					$this->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
+					
+					$this->LehrverbandModel->addLimit(1);
+					$result = $this->LehrverbandModel->loadWhere([
+						'studiengang_kz' => $student->studiengang_kz,
+						'semester' => $ausbildungssemester,
+						'verband' => $student->verband,
+						'gruppe' => $student->gruppe
+					]);
+					$lv = $this->getDataOrTerminateWithError($result);
+
+					$this->StudentlehrverbandModel->insert([
+						'student_uid' => $student->student_uid,
+						'studiensemester_kurzbz' => $studiensemester_kurzbz,
+						'studiengang_kz' => $student->studiengang_kz,
+						'semester' => $lv ? $ausbildungssemester : $student->semester,
+						'verband' => $student->verband,
+						'gruppe' => $student->gruppe,
+						'insertamum' => date('c'),
+						'insertvon' => getAuthUID()
+					]);
+				}
+			}
+		}
+
+		$result = $this->PrestudentstatusModel->insert([
+			'prestudent_id' => $prestudent_id,
+			'status_kurzbz' => $status_kurzbz,
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'ausbildungssemester' => $ausbildungssemester,
+			'datum' => $datum,
+			'insertamum' => date('c'),
+			'insertvon' => getAuthUID(),
+			'orgform_kurzbz' => $orgform_kurzbz,
+			'bestaetigtam' => $bestaetigtam,
+			'bestaetigtvon' => $bestaetigtam ? getAuthUID() : null,
+			'anmerkung' => $anmerkung,
+			'bewerbung_abgeschicktamum' => $bewerbung_abgeschicktamum,
+			'studienplan_id' => $studienplan_id,
+			'rt_stufe' => $rt_stufe,
+			'statusgrund_id' => $statusgrund_id
+		]);
+
+		$this->getDataOrTerminateWithError($result);
+
+		$this->db->trans_complete();
+
 		$this->terminateWithSuccess($prestudent_id);
 	}
 
diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php
index e52bbf577..bb88c0f8c 100644
--- a/application/models/crm/Prestudentstatus_model.php
+++ b/application/models/crm/Prestudentstatus_model.php
@@ -13,6 +13,7 @@ class Prestudentstatus_model extends DB_Model
 	const STATUS_WARTENDER = 'Wartender';
 	const STATUS_ABGEWIESENER = 'Abgewiesener';
 	const STATUS_INTERESSENT = 'Interessent';
+	const STATUS_INCOMING = 'Incoming';
 
 	/**
 	 * Constructor

From 1e3146d33f7d21e72d8faf2bff18fd0b58fedb48 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 24 Jul 2024 13:31:00 +0200
Subject: [PATCH 0983/1461] dashboardAmpeln

---
 .../controllers/api/frontend/v1/Ampeln.php    |  56 ++++----
 application/models/content/Ampel_model.php    |  14 ++
 public/js/api/ampeln.js                       |   6 +-
 public/js/components/DashboardWidget/Ampel.js | 124 +++++++++++++-----
 .../components/DashboardWidget/Stundenplan.js |   4 +-
 5 files changed, 134 insertions(+), 70 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Ampeln.php b/application/controllers/api/frontend/v1/Ampeln.php
index b29d6934e..62f061e82 100644
--- a/application/controllers/api/frontend/v1/Ampeln.php
+++ b/application/controllers/api/frontend/v1/Ampeln.php
@@ -30,6 +30,7 @@ class Ampeln extends FHCAPI_Controller
 			'getNonConfirmedActiveAmpeln' => self::PERM_LOGGED,
             'getAllActiveAmpeln' => self::PERM_LOGGED,
             'getConfirmedActiveAmpeln' => self::PERM_LOGGED,
+            'confirmAmpel' => self::PERM_LOGGED,
             
 		]);
 
@@ -46,6 +47,27 @@ class Ampeln extends FHCAPI_Controller
 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods
 
+    /**
+	 * function that queries all the ampeln that are addressed to the user uid
+     * @access public
+	 * 
+	 */
+	public function confirmAmpel($ampel_id)
+	{
+        if(!isset($ampel_id)){
+            $this->terminateWithError("missing parameter");
+        }
+
+        $insert_into_result = $this->AmpelModel->confirmAmpel($ampel_id,$this->uid);
+
+        if(isError($insert_into_result)){
+            $this->terminateWithError(getError($insert_into_result));
+        }
+
+        $insert_into_result = $this->getDataOrTerminateWithError($insert_into_result);
+
+        $this->terminateWithSuccess($insert_into_result);
+    }
 	
     /**
 	 * function that queries all the ampeln that are addressed to the user uid
@@ -59,10 +81,10 @@ class Ampeln extends FHCAPI_Controller
 
         $ampel_result = $this->getDataOrTerminateWithError($ampel_result);
 
-        $is_confirmed_array = array();
         foreach($ampel_result as $ampel){
             
             $confirmedByUser = $this->AmpelModel->isConfirmed($ampel->ampel_id,$this->uid);
+            $ampel->bestaetigt = $confirmedByUser;
             if(!$confirmedByUser){
                 $userUID_array = $this->AmpelModel->execBenutzerSelect($ampel->benutzer_select);
                 $userUID_array = $this->getDataOrTerminateWithError($userUID_array);
@@ -90,6 +112,8 @@ class Ampeln extends FHCAPI_Controller
 
         foreach($ampel_result as $ampel){
             
+            $confirmedByUser = $this->AmpelModel->isConfirmed($ampel->ampel_id,$this->uid);
+            $ampel->bestaetigt = $confirmedByUser;
             $userUID_array = $this->AmpelModel->execBenutzerSelect($ampel->benutzer_select);
             $userUID_array = $this->getDataOrTerminateWithError($userUID_array);
             foreach($userUID_array as $user_obj){
@@ -104,35 +128,7 @@ class Ampeln extends FHCAPI_Controller
 
         $this->terminateWithSuccess($userAmpeln);
 	}
-
-    public function getConfirmedActiveAmpeln()
-	{
-        $userAmpeln = array();
-        $ampel_result = $this->AmpelModel->active();
-
-        $ampel_result = $this->getDataOrTerminateWithError($ampel_result);
-
-        $is_confirmed_array = array();
-        foreach($ampel_result as $ampel){
-            
-            $confirmedByUser = $this->AmpelModel->isConfirmed($ampel->ampel_id,$this->uid);
-            if($confirmedByUser){
-                $userUID_array = $this->AmpelModel->execBenutzerSelect($ampel->benutzer_select);
-                $userUID_array = $this->getDataOrTerminateWithError($userUID_array);
-                foreach($userUID_array as $user_obj){
-                    
-                    $user_uid = property_exists($user_obj,"uid") ? $user_obj->uid : $user_obj->mitarbeiter_uid;
-                    if($user_uid === $this->uid){
-                        $userAmpeln[] = $ampel;
-                    }
-                }
-                    
-            }
-            
-        }
-
-        $this->terminateWithSuccess($userAmpeln);
-	}
+    
 
     
 }
diff --git a/application/models/content/Ampel_model.php b/application/models/content/Ampel_model.php
index c50025a12..c4e32e21b 100755
--- a/application/models/content/Ampel_model.php
+++ b/application/models/content/Ampel_model.php
@@ -90,4 +90,18 @@ class Ampel_model extends DB_Model
 		else
 			return $result; //will contain the error-msg from execQuery
 	}
+
+
+	public function confirmAmpel($ampel_id, $uid)
+	{
+		if(isset($ampel_id) && isset($uid)){
+			return $this->execQuery('
+			INSERT INTO public.tbl_ampel_benutzer_bestaetigt (ampel_id, uid)
+			VALUES (?,?);', array($ampel_id, $uid));
+		}else{
+
+			return error("parameter were missing to execute the insert into");
+		}
+		
+	}
 }
diff --git a/public/js/api/ampeln.js b/public/js/api/ampeln.js
index 7e0aef247..85cd08df2 100644
--- a/public/js/api/ampeln.js
+++ b/public/js/api/ampeln.js
@@ -14,11 +14,13 @@ export default {
         `/api/frontend/v1/Ampeln/getAllActiveAmpeln`,{});
     },
 
-    getConfirmedActiveAmpeln: function () {
+    
+
+    confirmAmpel: function (ampel_id) {
         return this.$fhcApi.get(
         FHC_JS_DATA_STORAGE_OBJECT.app_root +
         FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-        `/api/frontend/v1/Ampeln/getConfirmedActiveAmpeln`,{});
+        `/api/frontend/v1/Ampeln/confirmAmpel/${ampel_id}`,{});
     },
 
 }
\ No newline at end of file
diff --git a/public/js/components/DashboardWidget/Ampel.js b/public/js/components/DashboardWidget/Ampel.js
index 6cb61ee47..855eb15b6 100755
--- a/public/js/components/DashboardWidget/Ampel.js
+++ b/public/js/components/DashboardWidget/Ampel.js
@@ -7,33 +7,76 @@ export default {
     data: () => ({
         filter: '',
         source: '',
-        ampeln: [],
+        ampeln: null,
+        allAmpeln:null,
+        activeAmpeln:null,
     }),
     mixins: [
         AbstractWidget
     ],
     computed: {
+        filteredAmpeln(){
+            
+            if (this.source == 'offen')
+            {
+                switch(this.filter)
+                {
+                    case 'verpflichtend': return this.activeAmpeln?.filter(item => item.verpflichtend);
+                    case 'ueberfaellig': return this.activeAmpeln?.filter(item => (new Date() > new Date(item.deadline)) && !item.bestaetigt);
+                    default: return this.activeAmpeln;
+                }
+            }
+            if (this.source == 'alle')
+            {
+                switch(this.filter)
+                {
+                    case 'verpflichtend': return this.allActiveAmpeln?.filter(item => item.verpflichtend);
+                    case 'ueberfaellig': return this.allActiveAmpeln?.filter(item => (new Date() > new Date(item.deadline)) && !item.bestaetigt);
+                    default: return this.allActiveAmpeln;
+                }
+                
+            }
+            return this.activeAmpeln;
+        },
+        openAmpeln () {
+            return this.ampeln.filter(ampel=>{
+                if(!ampel.bestaetigt){
+                    return true;
+                }
+                return false;
+            })  
+        },
         widgetAmpeln () {
-            return this.ampeln.slice(0, 4);  // show only newest 4 ampeln
+            return this.activeAmpeln?.slice(0, 4);  // show only newest 4 ampeln
         },
         offcanvasAmpeln ()
         {
             switch(this.filter)
             {
-                case 'verpflichtend': return this.ampeln.filter(item => item.verpflichtend);
-                case 'ueberfaellig': return this.ampeln.filter(item => (new Date() > new Date(item.deadline)) && !item.bestaetigt);
-                default: return this.ampeln;
+                case 'verpflichtend': return this.activeAmpeln?.filter(item => item.verpflichtend);
+                case 'ueberfaellig': return this.activeAmpeln?.filter(item => (new Date() > new Date(item.deadline)) && !item.bestaetigt);
+                default: return this.activeAmpeln;
             }
         },
         count () {
+            let datasource = this.activeAmpeln;
+            if (this.source == 'offen') datasource = this.activeAmpeln;
+            if (this.source == 'alle') datasource = this.allActiveAmpeln;
+
             return {
-                verpflichtend: this.ampeln.filter(item => item.verpflichtend).length,
-                ueberfaellig: this.ampeln.filter(item => (new Date() > new Date(item.deadline)) && !item.bestaetigt).length,
-                alle: this.ampeln.length
+                verpflichtend: datasource?.filter(item => item.verpflichtend).length,
+                ueberfaellig: datasource?.filter(item => (new Date() > new Date(item.deadline)) && !item.bestaetigt).length,
+                alle: datasource?.length
             }
+            
         }
     },
     methods: {
+
+        toggleFilter(value){
+            this.filter === value ? this.filter = '' : this.filter = value;
+        },
+        
         closeOffcanvasAmpeln()
         {
             for (let i = 0; i < this.offcanvasAmpeln.length; i++)
@@ -52,20 +95,38 @@ export default {
         closeOffcanvas(){
             this.filter = '';
         },
-        confirm(ampelId){
-            let indexToRemove = this.ampeln.findIndex((obj => obj.ampel_id === ampelId));
-            this.ampeln.splice(indexToRemove, 1);
+        async fetchActiveAmpeln(){
+
+            await this.$fhcApi.factory.ampeln.getNonConfirmedActiveAmpeln().then(res=>{
+                this.activeAmpeln = res.data;
+            }); 
+        },
+        async fetchAllAmpeln(){
+
+            await this.$fhcApi.factory.ampeln.getAllActiveAmpeln().then(res=>{
+                this.allActiveAmpeln = res.data;
+            }); 
+        },
+        async confirm(ampelId){
+            this.$fhcApi.factory.ampeln.confirmAmpel(ampelId).then(res =>{
+                console.log(res,"result of the insert into")
+            });
+
+            // fetch all the ampeln after an ampel has been confirmed
+            await this.fetchActiveAmpeln();
+            await this.fetchAllAmpeln();
+
         },
         changeDisplay(){
             this.filter = '';
             if (this.source == 'offen')
             {
-                this.ampeln = TEST_OFFENE_AMPELN;
+                //this.ampeln = openAmpeln;
             }
 
             if (this.source == 'alle')
             {
-                this.ampeln = TEST_ALLE_AMPELN;
+                //this.ampeln = TEST_ALLE_AMPELN;
                 // axios
                 //     .get(this.apiurl + '/dashboard/Api/getAmpeln')
                 //     .then(res => { this.ampeln = res.data })
@@ -78,31 +139,22 @@ export default {
     },
     async created() {
         
-        let temporary_ampeln=null;
-        let temporary_confirmedAmpeln=null;
+        await this.fetchActiveAmpeln();
+        await this.fetchAllAmpeln();
 
-        await this.$fhcApi.factory.ampeln.getAllActiveAmpeln().then(res=>{
-            temporary_ampeln = res.data;
-        }); 
-
-        await this.$fhcApi.factory.ampeln.getConfirmedActiveAmpeln().then(res=>{
-            temporary_confirmedAmpeln = res.data;
-        });
-
-
-        /* this.ampeln = temporary_ampeln.filter((ampel)=>{
-                if(temporary_confirmedAmpeln.some((confirmedAmpel)=> confirmedAmpel.ampel_id === ampel.ampel_id)){
-                    return false;
-                }
-                return true;
-            });
- */
+        // add the first element of the active ampeln again just for testing purposes
+        /* let duplicate = {...this.allActiveAmpeln[0]};
+        duplicate.verpflichtend= false;
+        this.allActiveAmpeln.push(duplicate);
+        console.log(this.activeAmpeln,"this are the active ampeln")
+        console.log(this.allActiveAmpeln,"this are all the ampeln")
+  */
         this.$emit('setConfig', false);
         
     },
     template: /*html*/`
     <div class="widgets-ampel w-100 h-100">
-        <div v-if="ampeln" class="d-flex flex-column justify-content-between">
+        <div v-if="activeAmpeln" class="d-flex flex-column justify-content-between">
             <div class="d-flex">
                 <header class="me-auto"><b>Neueste Ampeln</b></header>
                 <div class="mb-2 text-danger"><a href="#allAmpelOffcanvas" data-bs-toggle="offcanvas">Alle Ampeln</a></div>
@@ -126,7 +178,7 @@ export default {
                 </div>
             </div>
             
-            <div v-if="ampeln.length == 0" class="card card-body mt-4 p-4 text-center">
+            <div v-if="activeAmpeln && activeAmpeln.length == 0" class="card card-body mt-4 p-4 text-center">
                 <span class="text-success h2"><i class="fa fa-solid fa-circle-check"></i></span>
                 <span class="text-success h5">Super!</span><br>
                 <span class="small">Keine offenen Ampeln.</span>
@@ -165,10 +217,10 @@ export default {
             </div>
             <div class="col"><button class="btn btn-light w-100" @click="filter = ''"><small>Alle: <b>{{ count.alle }}</b></small></button></div>
             <div class="row row-cols-2 g-2 mt-1">
-                <div class="col"><button class="btn btn-danger w-100"  @click="filter = 'ueberfaellig'"><i class="fa fa-solid fa-bolt me-2"></i><small>Überfällig: <b>{{ count.ueberfaellig }}</b></small></button></div>
-                <div class="col"><button class="btn btn-warning w-100" @click="filter = 'verpflichtend'"><i class="fa fa-solid fa-triangle-exclamation me-2"></i><small>Pflicht: <b>{{ count.verpflichtend }}</b></small></button></div>
+                <div class="col"><button class="btn btn-danger w-100"  @click="toggleFilter('ueberfaellig')"><i class="fa fa-solid fa-bolt me-2"></i><small :style="{...(filter==='ueberfaellig'?{'text-decoration':'underline','font-weight':'bold'}:{})}">Überfällig: <b>{{ count.ueberfaellig }}</b></small></button></div>
+                <div class="col"><button class="btn btn-warning w-100" @click="toggleFilter('verpflichtend')"><i class="fa fa-solid fa-triangle-exclamation me-2"></i><small :style="{...(filter==='verpflichtend'?{'text-decoration':'underline','font-weight':'bold'}:{})}">Pflicht: <b>{{ count.verpflichtend }}</b></small></button></div>
             </div>
-            <div v-for="ampel in offcanvasAmpeln" :key="ampel.ampel_id" class="mt-2">
+            <div v-for="ampel in filteredAmpeln" :key="ampel.ampel_id" class="mt-2">
                 <ul class="list-group">
                 <li class="list-group-item small">
                 <div class="position-relative"><!-- prevents streched-link from stretching outside this parent element -->
diff --git a/public/js/components/DashboardWidget/Stundenplan.js b/public/js/components/DashboardWidget/Stundenplan.js
index b74095b32..0b0840d73 100755
--- a/public/js/components/DashboardWidget/Stundenplan.js
+++ b/public/js/components/DashboardWidget/Stundenplan.js
@@ -36,7 +36,7 @@ export default {
 	},
 	created() {
 		this.$emit('setConfig', false);
-		axios
+		/* axios
 			.get(this.apiurl + '/components/Cis/Stundenplan/Stunden').then(res => {
 				res.data.retval.forEach(std => {
 					this.stunden[std.stunde] = std; // TODO(chris): geht besser
@@ -57,7 +57,7 @@ export default {
 					})
 					.catch(err => { console.log(err);console.error('ERROR: ', err.response.data) });
 			})
-			.catch(err => { console.error('ERROR: ', err.response.data) });
+			.catch(err => { console.error('ERROR: ', err.response.data) }); */
 	},
 	template: `
 	<div class="dashboard-widget-stundenplan d-flex flex-column h-100">

From 94df440f881713d76e1fedecd3000bc53a88266e Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 24 Jul 2024 14:49:58 +0200
Subject: [PATCH 0984/1461] adds a heading to the Content and the News View
 again

---
 application/views/CisHmvc/Cms/Content.php | 2 +-
 application/views/CisHtml/Cms/Content.php | 2 +-
 application/views/CisVue/Cms/Content.php  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/views/CisHmvc/Cms/Content.php b/application/views/CisHmvc/Cms/Content.php
index bf54d9d5f..108100843 100755
--- a/application/views/CisHmvc/Cms/Content.php
+++ b/application/views/CisHmvc/Cms/Content.php
@@ -20,7 +20,7 @@ $this->load->view('templates/CISVUE-Header', $includesArray);
 
 
 <div id="cms">
-
+<h2><?php echo isset($content_id)? "Content" : "News" ?></h2>
 <?php echo (isset($content_id) ? '<cms-content :content_id="'.$content_id.'" :version="'.$version.'" :sprache="'.$sprache.'" :sichtbar="'.$sichtbar.'" />' : '<cms-news/>'); ?>
 	
 </div>
diff --git a/application/views/CisHtml/Cms/Content.php b/application/views/CisHtml/Cms/Content.php
index bf54d9d5f..108100843 100755
--- a/application/views/CisHtml/Cms/Content.php
+++ b/application/views/CisHtml/Cms/Content.php
@@ -20,7 +20,7 @@ $this->load->view('templates/CISVUE-Header', $includesArray);
 
 
 <div id="cms">
-
+<h2><?php echo isset($content_id)? "Content" : "News" ?></h2>
 <?php echo (isset($content_id) ? '<cms-content :content_id="'.$content_id.'" :version="'.$version.'" :sprache="'.$sprache.'" :sichtbar="'.$sichtbar.'" />' : '<cms-news/>'); ?>
 	
 </div>
diff --git a/application/views/CisVue/Cms/Content.php b/application/views/CisVue/Cms/Content.php
index bf54d9d5f..108100843 100755
--- a/application/views/CisVue/Cms/Content.php
+++ b/application/views/CisVue/Cms/Content.php
@@ -20,7 +20,7 @@ $this->load->view('templates/CISVUE-Header', $includesArray);
 
 
 <div id="cms">
-
+<h2><?php echo isset($content_id)? "Content" : "News" ?></h2>
 <?php echo (isset($content_id) ? '<cms-content :content_id="'.$content_id.'" :version="'.$version.'" :sprache="'.$sprache.'" :sichtbar="'.$sichtbar.'" />' : '<cms-news/>'); ?>
 	
 </div>

From e9d45b65326ab88000d58a2f39b07b235a7caf7f Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 24 Jul 2024 14:51:04 +0200
Subject: [PATCH 0985/1461] removes the old way a modal was shown in the news
 widget of the dashboard

---
 public/js/components/DashboardWidget/News.js | 35 +-------------------
 1 file changed, 1 insertion(+), 34 deletions(-)

diff --git a/public/js/components/DashboardWidget/News.js b/public/js/components/DashboardWidget/News.js
index 260f65353..6813601ff 100755
--- a/public/js/components/DashboardWidget/News.js
+++ b/public/js/components/DashboardWidget/News.js
@@ -85,38 +85,5 @@ export default {
           </div>
       </div>
 </div>
-</div>
-
-
-  <!-- News Modal old way of showing the news content if clicking on the little content format-->
-  <!--<BsModal ref="newsModal" id="newsModal" dialog-class="modal-lg">
-    <template #title>
-      <div class="row">
-        <div class="col-5"><img :src="placeHolderImgURL" class="img-fluid rounded-start"></div>
-        <div class="col-7 d-flex align-items-end">
-        <p>{{ singleNews?.content_obj?.betreff?singleNews?.content_obj?.betreff:'Kein Betreff vorhanden' }}<br><small class="text-muted">{{ formatDateTime(singleNews.insertamum) }}</small></p>
-        </div>
-    </template>
-    <template #default>{{ singleNews.text }}</template>
-  </BsModal>
-  -->
-
-  <!-- All News Modal old way of showing all the different news -->
-  <!--<BsModal ref="allNewsModal" id="allNewsModal" dialog-class="modal-fullscreen">
-    <template #title>Alle News</template>
-    <template #default>
-    <div class="row row-cols-md-2 row-cols-lg-3 row-cols-xl-5 g-4 h-100 px-5">
-     <div v-for="news in allNewsList" :key="news.id">
-            <div class="card h-100">
-                <img :src="placeHolderImgURL" class="card-img-top">
-                <div class="card-footer"><span class="card-subtitle small">{{ formatDateTime(news.insertamum) }}</span></div>
-                <div class="card-body">
-                  <a href="" class="card-title h5 stretched-link" @click="setSingleNews1(news)">{{ news.betreff }}</a><br>
-                  <p class="card-text">{{ news.text }}</p>
-                </div>
-            </div>
-          </div>
-          </div>
-	</template>
-  </BsModal>-->`
+</div>`
 }

From 012cbe9a25a690fd4991bcb7361de62a6231c24a Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 24 Jul 2024 14:57:11 +0200
Subject: [PATCH 0986/1461] pulls the header out of the content div which makes
 the headings smaller in the content view with a specific css

---
 application/views/CisHmvc/Cms/Content.php | 3 +--
 application/views/CisHtml/Cms/Content.php | 4 +---
 application/views/CisVue/Cms/Content.php  | 3 +--
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/application/views/CisHmvc/Cms/Content.php b/application/views/CisHmvc/Cms/Content.php
index 108100843..85c3343ff 100755
--- a/application/views/CisHmvc/Cms/Content.php
+++ b/application/views/CisHmvc/Cms/Content.php
@@ -18,9 +18,8 @@ $this->load->view('templates/CISVUE-Header', $includesArray);
 ?>
 
 
-
+<h2 ><?php echo isset($content_id)? "Content" : "News" ?></h2>
 <div id="cms">
-<h2><?php echo isset($content_id)? "Content" : "News" ?></h2>
 <?php echo (isset($content_id) ? '<cms-content :content_id="'.$content_id.'" :version="'.$version.'" :sprache="'.$sprache.'" :sichtbar="'.$sichtbar.'" />' : '<cms-news/>'); ?>
 	
 </div>
diff --git a/application/views/CisHtml/Cms/Content.php b/application/views/CisHtml/Cms/Content.php
index 108100843..df38e2e9c 100755
--- a/application/views/CisHtml/Cms/Content.php
+++ b/application/views/CisHtml/Cms/Content.php
@@ -17,10 +17,8 @@ switch($template_kurzbz){
 $this->load->view('templates/CISVUE-Header', $includesArray);
 ?>
 
-
-
-<div id="cms">
 <h2><?php echo isset($content_id)? "Content" : "News" ?></h2>
+<div id="cms">
 <?php echo (isset($content_id) ? '<cms-content :content_id="'.$content_id.'" :version="'.$version.'" :sprache="'.$sprache.'" :sichtbar="'.$sichtbar.'" />' : '<cms-news/>'); ?>
 	
 </div>
diff --git a/application/views/CisVue/Cms/Content.php b/application/views/CisVue/Cms/Content.php
index 108100843..85c3343ff 100755
--- a/application/views/CisVue/Cms/Content.php
+++ b/application/views/CisVue/Cms/Content.php
@@ -18,9 +18,8 @@ $this->load->view('templates/CISVUE-Header', $includesArray);
 ?>
 
 
-
+<h2 ><?php echo isset($content_id)? "Content" : "News" ?></h2>
 <div id="cms">
-<h2><?php echo isset($content_id)? "Content" : "News" ?></h2>
 <?php echo (isset($content_id) ? '<cms-content :content_id="'.$content_id.'" :version="'.$version.'" :sprache="'.$sprache.'" :sichtbar="'.$sichtbar.'" />' : '<cms-news/>'); ?>
 	
 </div>

From 0849e795a03224e2970ab2fe04a1e47b1b923b1b Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 24 Jul 2024 14:59:02 +0200
Subject: [PATCH 0987/1461] also adds the horizontal line under the heading

---
 application/views/CisHmvc/Cms/Content.php | 1 +
 application/views/CisHtml/Cms/Content.php | 1 +
 application/views/CisVue/Cms/Content.php  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/application/views/CisHmvc/Cms/Content.php b/application/views/CisHmvc/Cms/Content.php
index 85c3343ff..494add9a4 100755
--- a/application/views/CisHmvc/Cms/Content.php
+++ b/application/views/CisHmvc/Cms/Content.php
@@ -19,6 +19,7 @@ $this->load->view('templates/CISVUE-Header', $includesArray);
 
 
 <h2 ><?php echo isset($content_id)? "Content" : "News" ?></h2>
+<hr/>
 <div id="cms">
 <?php echo (isset($content_id) ? '<cms-content :content_id="'.$content_id.'" :version="'.$version.'" :sprache="'.$sprache.'" :sichtbar="'.$sichtbar.'" />' : '<cms-news/>'); ?>
 	
diff --git a/application/views/CisHtml/Cms/Content.php b/application/views/CisHtml/Cms/Content.php
index df38e2e9c..a132addbf 100755
--- a/application/views/CisHtml/Cms/Content.php
+++ b/application/views/CisHtml/Cms/Content.php
@@ -18,6 +18,7 @@ $this->load->view('templates/CISVUE-Header', $includesArray);
 ?>
 
 <h2><?php echo isset($content_id)? "Content" : "News" ?></h2>
+<hr/>
 <div id="cms">
 <?php echo (isset($content_id) ? '<cms-content :content_id="'.$content_id.'" :version="'.$version.'" :sprache="'.$sprache.'" :sichtbar="'.$sichtbar.'" />' : '<cms-news/>'); ?>
 	
diff --git a/application/views/CisVue/Cms/Content.php b/application/views/CisVue/Cms/Content.php
index 85c3343ff..494add9a4 100755
--- a/application/views/CisVue/Cms/Content.php
+++ b/application/views/CisVue/Cms/Content.php
@@ -19,6 +19,7 @@ $this->load->view('templates/CISVUE-Header', $includesArray);
 
 
 <h2 ><?php echo isset($content_id)? "Content" : "News" ?></h2>
+<hr/>
 <div id="cms">
 <?php echo (isset($content_id) ? '<cms-content :content_id="'.$content_id.'" :version="'.$version.'" :sprache="'.$sprache.'" :sichtbar="'.$sichtbar.'" />' : '<cms-news/>'); ?>
 	

From e42e0154104696bb4f88da5ab022abc90eea8e4a Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 24 Jul 2024 15:04:19 +0200
Subject: [PATCH 0988/1461] Status update function

---
 .../api/frontend/v1/stv/Status.php            | 427 ++++++++++++------
 1 file changed, 282 insertions(+), 145 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 581d18bad..8631abaa1 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -70,6 +70,7 @@ class Status extends FHCAPI_Controller
 		$isBerechtigtNoStudstatusCheck = $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung');
 
 
+		$authUID = getAuthUID();
 		$status_kurzbz = $this->input->post('status_kurzbz');
 		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
 		$ausbildungssemester = $this->input->post('ausbildungssemester');
@@ -288,8 +289,9 @@ class Status extends FHCAPI_Controller
 		
 		if (!$this->form_validation->run())
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
-		
 
+
+		// Start DB transaction
 		$this->db->trans_start();
 
 		if (in_array($status_kurzbz, [
@@ -339,12 +341,13 @@ class Status extends FHCAPI_Controller
 						'verband' => $student->verband,
 						'gruppe' => $student->gruppe,
 						'insertamum' => date('c'),
-						'insertvon' => getAuthUID()
+						'insertvon' => $authUID
 					]);
 				}
 			}
 		}
 
+		//insert status
 		$result = $this->PrestudentstatusModel->insert([
 			'prestudent_id' => $prestudent_id,
 			'status_kurzbz' => $status_kurzbz,
@@ -352,10 +355,10 @@ class Status extends FHCAPI_Controller
 			'ausbildungssemester' => $ausbildungssemester,
 			'datum' => $datum,
 			'insertamum' => date('c'),
-			'insertvon' => getAuthUID(),
+			'insertvon' => $authUID,
 			'orgform_kurzbz' => $orgform_kurzbz,
 			'bestaetigtam' => $bestaetigtam,
-			'bestaetigtvon' => $bestaetigtam ? getAuthUID() : null,
+			'bestaetigtvon' => $bestaetigtam ? $authUID : null,
 			'anmerkung' => $anmerkung,
 			'bewerbung_abgeschicktamum' => $bewerbung_abgeschicktamum,
 			'studienplan_id' => $studienplan_id,
@@ -367,7 +370,7 @@ class Status extends FHCAPI_Controller
 
 		$this->db->trans_complete();
 
-		$this->terminateWithSuccess($prestudent_id);
+		$this->terminateWithSuccess(true);
 	}
 
 	public function getStatusgruende()
@@ -1671,43 +1674,63 @@ class Status extends FHCAPI_Controller
 		return $this->terminateWithSuccess(true);
 	}
 
-	public function updateStatus($key_prestudent_id, $key_status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester)
+	public function updateStatus($prestudent_id, $status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester)
 	{
-		$isStudent = false;
+		$result = $this->PrestudentstatusModel->load([
+			$key_ausbildungssemester,
+			$key_studiensemester_kurzbz,
+			$status_kurzbz,
+			$prestudent_id
+		]);
+		$oldstatus = $this->getDataOrTerminateWithError($result);
+		if (!$oldstatus)
+			show_404(); // Status that should be updated does not exist
+
+		$oldstatus = current($oldstatus);
+
+		
 		$isBerechtigtNoStudstatusCheck =  $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung');
 
-		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
 
-		$uid = getAuthUID();
-		$prestudent_id = $this->input->post('prestudent_id');
-		$status_kurzbz = $this->input->post('status_kurzbz');
-		$ausbildungssemester = $this->input->post('ausbildungssemester');
-		$datum = $this->input->post('datum');
-		$bestaetigtam = $this->input->post('bestaetigtam');
-		$bewerbung_abgeschicktamum = $this->input->post('bewerbung_abgeschicktamum');
-		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
-		$studienplan_id = $this->input->post('studienplan_id');
-		$anmerkung  = $this->input->post('anmerkung');
-		$statusgrund_id = $this->input->post('statusgrund_id');
-		$rt_stufe = $this->input->post('rt_stufe');
-		$bestaetigtvon = $uid;
+		$authUID = getAuthUID();
+		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz') ?: $oldstatus->studiensemester_kurzbz;
+		$ausbildungssemester = $this->input->post('ausbildungssemester') ?: $oldstatus->ausbildungssemester;
+		$datum = $this->input->post('datum') ?: $oldstatus->datum;
 
-		//check if Bismeldestichtag erreicht
-		if(!$isBerechtigtNoStudstatusCheck)
-		{
-			$result = $this->prestudentstatuschecklib->checkIfMeldestichtagErreicht($datum);
-			if (isError($result))
-			{
-				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			}
-		}
 
 		//Form Validation
 		$this->load->library('form_validation');
 
-		$this->form_validation->set_rules('_global', '', [
+		$this->form_validation->set_rules(
+			'datum',
+			$this->p->t('global', 'datum'),
+			[
+				'is_valid_date',
+				['meldestichtag_not_exceeded', function ($value) use ($isBerechtigtNoStudstatusCheck) {
+					if ($isBerechtigtNoStudstatusCheck)
+						return true; // Skip if access right says so
+					if (!$value)
+						return true; // Error will be handled by the required statement above
+					
+					$result = $this->prestudentstatuschecklib->checkIfMeldestichtagErreicht($value);
+					
+					return !$this->getDataOrTerminateWithError($result);
+				}]
+			],
+			[
+				'meldestichtag_not_exceeded' => $this->p->t('lehre', 'error_dataVorMeldestichtag')
+			]
+		);
+
+		$this->form_validation->set_rules('bestaetigtam', $this->p->t('lehre', 'bestaetigt_am'), 'is_valid_date');
+
+		if (!is_valid_date($datum))
+			$datum = null;
+
+		// Set Datum to null to prevent multiple is_valid_date checks in the following validation rules
+		$this->form_validation->set_rules('_default', '', [
 			//check if Rolle already exists
-			['checkIfExistingPrestudentRolle', function () use (
+			['new_rolle_doesnt_exist', function () use (
 				$prestudent_id,
 				$status_kurzbz,
 				$studiensemester_kurzbz,
@@ -1716,143 +1739,257 @@ class Status extends FHCAPI_Controller
 				$key_ausbildungssemester
 			) {
 				if ($key_studiensemester_kurzbz == $studiensemester_kurzbz
-					&&  $key_ausbildungssemester == $ausbildungssemester
+					&& $key_ausbildungssemester == $ausbildungssemester
 				)
-					return true;
-				$result = $this->prestudentstatuschecklib->checkIfExistingPrestudentRolle(
+					return true; // Primary key has not change we update in place
+
+				$result = $this->PrestudentstatusModel->load([
+					$ausbildungssemester,
+					$studiensemester_kurzbz,
+					$status_kurzbz,
+					$prestudent_id
+				]);
+				return !$this->getDataOrTerminateWithError($result);
+			}],
+			['history_timesequence', function () use (
+				$isBerechtigtNoStudstatusCheck,
+				$prestudent_id,
+				$status_kurzbz,
+				$datum,
+				$studiensemester_kurzbz,
+				$ausbildungssemester,
+				$key_studiensemester_kurzbz,
+				$key_ausbildungssemester
+			) {
+				if ($isBerechtigtNoStudstatusCheck)
+					return true; // Skip if access right says so
+				if (!$datum)
+					return true; // Error will be handled by the is_valid_date statement above
+
+				$result = $this->prestudentstatuschecklib->checkStatusHistoryTimesequence(
 					$prestudent_id,
 					$status_kurzbz,
+					new DateTime($datum),
 					$studiensemester_kurzbz,
-					$ausbildungssemester
+					$ausbildungssemester,
+					$key_studiensemester_kurzbz,
+					$key_ausbildungssemester
 				);
+
+				return $this->getDataOrTerminateWithError($result);
+			}],
+			['history_laststatus', function () use (
+				$isBerechtigtNoStudstatusCheck,
+				$prestudent_id,
+				$status_kurzbz,
+				$datum,
+				$studiensemester_kurzbz,
+				$ausbildungssemester,
+				$key_studiensemester_kurzbz,
+				$key_ausbildungssemester
+			) {
+				if ($isBerechtigtNoStudstatusCheck)
+					return true; // Skip if access right says so
+				if (!$datum)
+					return true; // Error will be handled by the is_valid_date statement above
+
+				$result = $this->prestudentstatuschecklib->checkStatusHistoryLaststatus(
+					$prestudent_id,
+					$status_kurzbz,
+					new DateTime($datum),
+					$studiensemester_kurzbz,
+					$ausbildungssemester,
+					$key_studiensemester_kurzbz,
+					$key_ausbildungssemester
+				);
+
+				return $this->getDataOrTerminateWithError($result);
+			}],
+			['history_unterbrecher', function () use (
+				$isBerechtigtNoStudstatusCheck,
+				$prestudent_id,
+				$status_kurzbz,
+				$datum,
+				$studiensemester_kurzbz,
+				$ausbildungssemester,
+				$key_studiensemester_kurzbz,
+				$key_ausbildungssemester
+			) {
+				if ($isBerechtigtNoStudstatusCheck)
+					return true; // Skip if access right says so
+				if (!$datum)
+					return true; // Error will be handled by the is_valid_date statement above
+
+				$result = $this->prestudentstatuschecklib->checkStatusHistoryUnterbrechersemester(
+					$prestudent_id,
+					$status_kurzbz,
+					new DateTime($datum),
+					$studiensemester_kurzbz,
+					$ausbildungssemester,
+					$key_studiensemester_kurzbz,
+					$key_ausbildungssemester
+				);
+
+				return $this->getDataOrTerminateWithError($result);
+			}],
+			['history_abbrecher', function () use (
+				$isBerechtigtNoStudstatusCheck,
+				$prestudent_id,
+				$status_kurzbz,
+				$datum,
+				$studiensemester_kurzbz,
+				$ausbildungssemester,
+				$key_studiensemester_kurzbz,
+				$key_ausbildungssemester
+			) {
+				if ($isBerechtigtNoStudstatusCheck)
+					return true; // Skip if access right says so
+				if (!$datum)
+					return true; // Error will be handled by the is_valid_date statement above
+
+				$result = $this->prestudentstatuschecklib->checkStatusHistoryAbbrechersemester(
+					$prestudent_id,
+					$status_kurzbz,
+					new DateTime($datum),
+					$studiensemester_kurzbz,
+					$ausbildungssemester,
+					$key_studiensemester_kurzbz,
+					$key_ausbildungssemester
+				);
+
+				return $this->getDataOrTerminateWithError($result);
+			}],
+			['history_diplomant', function () use (
+				$isBerechtigtNoStudstatusCheck,
+				$prestudent_id,
+				$status_kurzbz,
+				$datum,
+				$studiensemester_kurzbz,
+				$ausbildungssemester,
+				$key_studiensemester_kurzbz,
+				$key_ausbildungssemester
+			) {
+				if ($isBerechtigtNoStudstatusCheck)
+					return true; // Skip if access right says so
+				if (!$datum)
+					return true; // Error will be handled by the is_valid_date statement above
+
+				$result = $this->prestudentstatuschecklib->checkStatusHistoryDiplomant(
+					$prestudent_id,
+					$status_kurzbz,
+					new DateTime($datum),
+					$studiensemester_kurzbz,
+					$ausbildungssemester,
+					$key_studiensemester_kurzbz,
+					$key_ausbildungssemester
+				);
+
 				return $this->getDataOrTerminateWithError($result);
 			}]
 		], [
-			'checkIfExistingPrestudentRolle' => $this->p->t('lehre', 'error_rolleBereitsVorhanden')
+			'new_rolle_doesnt_exist' => $this->p->t('lehre', 'error_rolleBereitsVorhanden'),
+			'history_timesequence' => $this->p->t('lehre', 'error_statuseintrag_zeitabfolge'),
+			'history_laststatus' => $this->p->t('lehre', 'error_endstatus'),
+			'history_unterbrecher' => $this->p->t('lehre', 'error_consecutiveUnterbrecher'),
+			'history_abbrecher' => $this->p->t('lehre', 'error_consecutiveUnterbrecherAbbrecher'),
+			'history_diplomant' => $this->p->t('lehre', 'error_consecutiveDiplomandStudent')
 		]);
 
 		if (!$this->form_validation->run())
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 
-		//check if studentrolle already exists
-		if($status_kurzbz == Prestudentstatus_model::STATUS_STUDENT || $status_kurzbz == Prestudentstatus_model::STATUS_DIPLOMAND )
-		
-		//TODO(manu): check why $lastStatusDAta
-		// if($status_kurzbz == Prestudentstatus_model::STATUS_STUDENT || $status_kurzbz == Prestudentstatus_model::STATUS_DIPLOMAND || $lastStatusData->status_kurzbz == Prestudentstatus_model::STATUS_STUDENT)
-		{
-			$result = $this->prestudentstatuschecklib->checkIfExistingStudentRolle($prestudent_id);
-			if (isError($result))
-			{
-				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			}
-			$isStudent = getData($result);
-		}
-
-
-		if(!$isBerechtigtNoStudstatusCheck)
-		{
-			//Block STATUSCHECKS
-
-			$result = $this->prestudentstatuschecklib->checkStatusUpdate(
-				$prestudent_id,
-				$status_kurzbz,
-				$studiensemester_kurzbz,
-				$datum,
-				$ausbildungssemester,
-				$studienplan_id,
-				$key_studiensemester_kurzbz,
-				$key_ausbildungssemester
-			);
-
-			if (isError($result))
-			{
-				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			}
-		}
-
 
 		// Start DB transaction
-		$this->db->trans_begin();
+		$this->db->trans_start();
 
-		//update status
-		$result = $this->PrestudentstatusModel->update(
-			[
-				'prestudent_id' => $key_prestudent_id,
-				'status_kurzbz' => $key_status_kurzbz,
-				'studiensemester_kurzbz' => $key_studiensemester_kurzbz,
-				'ausbildungssemester' => $key_ausbildungssemester,
-			],
-			[
-				'status_kurzbz' => $status_kurzbz,
-				'studiensemester_kurzbz' => $studiensemester_kurzbz,
-				'ausbildungssemester' => $ausbildungssemester,
-				'bewerbung_abgeschicktamum' => $bewerbung_abgeschicktamum,
-				'studienplan_id' => $studienplan_id,
-				'anmerkung' => $anmerkung,
-				'statusgrund_id' => $statusgrund_id,
-				'updatevon' => $uid,
-				'updateamum' => date('c'),
-				'bestaetigtam' => $bestaetigtam,
-				'bestaetigtvon' => $bestaetigtvon,
-				'datum' => $datum,
-				'rt_stufe' => $rt_stufe
-			]
-		);
-		if (isError($result))
-		{
-			$this->db->trans_rollback();
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson(getError($result));
-		}
+		if (in_array($status_kurzbz, [
+			Prestudentstatus_model::STATUS_STUDENT,
+			Prestudentstatus_model::STATUS_DIPLOMAND,
+			Prestudentstatus_model::STATUS_ABSOLVENT,
+			Prestudentstatus_model::STATUS_INCOMING,
+			Prestudentstatus_model::STATUS_ABBRECHER,
+			Prestudentstatus_model::STATUS_UNTERBRECHER
+		])) {
+			$result = $this->StudentModel->loadWhere([
+				'prestudent_id' => $prestudent_id
+			]);
 
+			$student = $this->getDataOrTerminateWithError($result);
 
-		if($isStudent)
-		{
-			//check Studentlehrverband
-			$this->load->model('crm/Student_model', 'StudentModel');
-			$result = $this->StudentModel->checkIfUid($prestudent_id);
-			if (isError($result))
-			{
-				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			}
-			if (!hasData($result))
-			{
-				$this->terminateWithError($this->p->t('studierendenantrag','error_no_student_for_prestudent',['prestudent_id' => $prestudent_id]), self::ERROR_TYPE_GENERAL);
-			}
-			$student_uid = $result->retval;
-
-			//process studentlehrverband
-			$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
-			$result = $this->StudentlehrverbandModel->loadWhere(
-				array(
-					'student_uid' => $student_uid,
+			if ($student) {
+				$student = current($student);
+				
+				$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
+				$result = $this->StudentlehrverbandModel->loadWhere([
+					'student_uid' => $student->student_uid,
 					'studiensemester_kurzbz' => $studiensemester_kurzbz
-				)
-			);
-			if (isError($result))
-			{
-				$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-			}
+				]);
 
-			//Data of current Semester
-			$studentlvbData = current(getData($result) ? : []);
+				$studentlvb = $this->getDataOrTerminateWithError($result);
 
-			$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
-			$result = $this->StudentlehrverbandModel->processStudentlehrverband(
-				$student_uid,
-				$studentlvbData->studiengang_kz,
-				$ausbildungssemester,
-				$studentlvbData->verband,
-				$studentlvbData->gruppe,
-				$studiensemester_kurzbz
-			);
-			if ($this->db->trans_status() === false || isError($result))
-			{
-				$this->db->trans_rollback();
-				return $this->terminateWithError($this->p->t('lehre','error_duringInsertUpdateLehrverband'), self::ERROR_TYPE_GENERAL);
+				// NOTE(chris): if $studentlvb then update to the same values as before (except updatevon). So do nothing.
+				// TODO(chris): check if that is correct (in FAS)?
+				if (!$studentlvb) {
+					$this->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
+					
+					$this->LehrverbandModel->addLimit(1);
+					$result = $this->LehrverbandModel->loadWhere([
+						'studiengang_kz' => $student->studiengang_kz,
+						'semester' => $ausbildungssemester,
+						'verband' => $student->verband,
+						'gruppe' => $student->gruppe
+					]);
+					$lv = $this->getDataOrTerminateWithError($result);
+
+					$this->StudentlehrverbandModel->insert([
+						'student_uid' => $student->student_uid,
+						'studiensemester_kurzbz' => $studiensemester_kurzbz,
+						'studiengang_kz' => $student->studiengang_kz,
+						'semester' => $lv ? $ausbildungssemester : $student->semester,
+						'verband' => $student->verband,
+						'gruppe' => $student->gruppe,
+						'insertamum' => date('c'),
+						'insertvon' => $authUID
+					]);
+				}
 			}
 		}
+		
+		//update status
+		$updateData = [
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'ausbildungssemester' => $ausbildungssemester,
+			'datum' => $datum,
+			'updateamum' => date('c'),
+			'updatevon' => $authUID
+		];
+		foreach ([
+			'orgform_kurzbz',
+			'anmerkung',
+			'bewerbung_abgeschicktamum',
+			'studienplan_id',
+			'rt_stufe',
+			'statusgrund_id'
+		] as $key)
+			if ($this->input->post($key))
+				$updateData[$key] = $this->input->post($key);
+		
+		if ($this->input->post('bestaetigtam')) {
+			$updateData['bestaetigtam'] = $this->input->post('bestaetigtam');
+			$updateData['bestaetigtvon'] = $authUID;
+		}
+		
+		$result = $this->PrestudentstatusModel->update([
+			'prestudent_id' => $prestudent_id,
+			'status_kurzbz' => $status_kurzbz,
+			'studiensemester_kurzbz' => $key_studiensemester_kurzbz,
+			'ausbildungssemester' => $key_ausbildungssemester,
+		], $updateData);
+
+		$this->getDataOrTerminateWithError($result);
+
 		$this->db->trans_commit();
+
 		return $this->outputJsonSuccess(true);
 	}
 

From 70dff47f26b60979e79d55237ed08332177589c1 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 24 Jul 2024 15:18:16 +0200
Subject: [PATCH 0989/1461] Rearrange/Rename functions & outsource shared code
 into a subfunction

---
 .../api/frontend/v1/stv/Status.php            | 718 +++++++++---------
 .../Details/Prestudent/MultiStatus.js         |   2 +-
 2 files changed, 349 insertions(+), 371 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 8631abaa1..bb1b512c6 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -11,7 +11,6 @@ class Status extends FHCAPI_Controller
 	{
 		parent::__construct([
 			'getHistoryPrestudent' => ['admin:r', 'assistenz:r'],
-			'insert' => ['admin:rw', 'assistenz:rw'],
 			'changeStatus' => ['admin:r', 'assistenz:r', 'student/keine_studstatuspruefung'],
 			'addStudent' => ['admin:r', 'assistenz:r', 'student/keine_studstatuspruefung'],
 			'getStatusgruende' => self::PERM_LOGGED,
@@ -22,6 +21,7 @@ class Status extends FHCAPI_Controller
 			'getStatusarray' => self::PERM_LOGGED,
 			'deleteStatus' => ['admin:r','assistenz:r'],
 			'loadStatus' => ['admin:r', 'assistenz:r'],
+			'insertStatus' => ['admin:rw', 'assistenz:rw'],
 			'updateStatus' => ['admin:rw', 'assistenz:rw'],
 			'advanceStatus' => ['admin:r', 'assistenz:r'],
 			'confirmStatus' => ['admin:r', 'assistenz:r'],
@@ -37,7 +37,7 @@ class Status extends FHCAPI_Controller
 		$this->load->library('PrestudentstatusCheckLib');
 
 		// Additional Permission Checks
-		if ($this->router->method == 'insert' || $this->router->method == 'updateStatus') {
+		if ($this->router->method == 'insertStatus' || $this->router->method == 'updateStatus') {
 			$prestudent_id = current(array_slice($this->uri->rsegments, 2));
 			$this->checkPermissionsForPrestudent($prestudent_id, ['admin:rw', 'assistenz:rw']);
 		}
@@ -57,322 +57,6 @@ class Status extends FHCAPI_Controller
 		$this->terminateWithSuccess($data);
 	}
 
-	/**
-	 * Inserts a status with less validations and extra logic for manual
-	 * manipulation
-	 *
-	 * @param integer				$prestudent_id
-	 *
-	 * @return void
-	 */
-	public function insert($prestudent_id)
-	{
-		$isBerechtigtNoStudstatusCheck = $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung');
-
-
-		$authUID = getAuthUID();
-		$status_kurzbz = $this->input->post('status_kurzbz');
-		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
-		$ausbildungssemester = $this->input->post('ausbildungssemester');
-		$datum = $this->input->post('datum');
-		$bestaetigtam = $this->input->post('bestaetigtam');
-		$orgform_kurzbz = $this->input->post('orgform_kurzbz');
-		$anmerkung = $this->input->post('anmerkung');
-		$bewerbung_abgeschicktamum = $this->input->post('bewerbung_abgeschicktamum');
-		$studienplan_id = $this->input->post('studienplan_id');
-		$rt_stufe = $this->input->post('rt_stufe');
-		$statusgrund_id = $this->input->post('statusgrund_id');
-
-
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules(
-			'datum',
-			$this->p->t('global', 'datum'),
-			[
-				'required', // In FAS empty datum results in todays
-				'is_valid_date',
-				['is_date_not_before_today', function ($value) {
-					if (!is_valid_date($value))
-						return true; // Error will be handled by the is_valid_date statement above
-					$today = new DateTime('today');
-					return (new DateTime($value) >= $today);
-				}],
-				['meldestichtag_not_exceeded', function ($value) use ($isBerechtigtNoStudstatusCheck) {
-					if ($isBerechtigtNoStudstatusCheck)
-						return true; // Skip if access right says so
-					if (!$value)
-						return true; // Error will be handled by the required statement above
-					
-					$result = $this->prestudentstatuschecklib->checkIfMeldestichtagErreicht($value);
-					
-					return !$this->getDataOrTerminateWithError($result);
-				}]
-			],
-			[
-				'meldestichtag_not_exceeded' => $this->p->t('lehre', 'error_dataVorMeldestichtag'),
-				'is_date_not_before_today' => $this->p->t('lehre', 'error_entryInPast')
-			]
-		);
-
-		$this->form_validation->set_rules(
-			'status_kurzbz',
-			$this->p->t('lehre', 'status_rolle'),
-			[
-				'required',
-				['status_stud_exists', function ($value) use ($prestudent_id) {
-					if ($value != 'Student')
-						return true; // Only test if new status is Student
-					
-					$result = $this->prestudentstatuschecklib->checkIfExistingStudentRolle($prestudent_id);
-
-					return $this->getDataOrTerminateWithError($result);
-				}]
-			],
-			[
-				'status_stud_exists' => $this->p->t('lehre', 'error_noStudstatus')
-			]
-		);
-		
-		$this->form_validation->set_rules('studiensemester_kurzbz', $this->p->t('lehre', 'studiensemester'), 'required');
-		
-		$this->form_validation->set_rules('ausbildungssemester', $this->p->t('lehre', 'ausbildungssemester'), 'required');
-
-		$this->form_validation->set_rules('bestaetigtam', $this->p->t('lehre', 'bestaetigt_am'), 'is_valid_date');
-
-		// Set Datum to null to prevent multiple is_valid_date checks in the following validation rules
-		if (!$datum || !is_valid_date($datum))
-			$datum = null;
-
-		$this->form_validation->set_rules('_default', '', [
-			['rolle_doesnt_exist', function () use ($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester) {
-				if (!$status_kurzbz || !$studiensemester_kurzbz || !$ausbildungssemester)
-					return true; // Error will be handled by the required statements above
-
-				$result = $this->PrestudentstatusModel->load([$ausbildungssemester, $studiensemester_kurzbz, $status_kurzbz, $prestudent_id]);
-
-				return !$this->getDataOrTerminateWithError($result);
-			}],
-			['history_timesequence', function () use (
-				$isBerechtigtNoStudstatusCheck,
-				$prestudent_id,
-				$status_kurzbz,
-				$datum,
-				$studiensemester_kurzbz,
-				$ausbildungssemester
-			) {
-				if ($isBerechtigtNoStudstatusCheck)
-					return true; // Skip if access right says so
-				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester)
-					return true; // Error will be handled by the required statements above
-
-				$result = $this->prestudentstatuschecklib->checkStatusHistoryTimesequence(
-					$prestudent_id,
-					$status_kurzbz,
-					new DateTime($datum),
-					$studiensemester_kurzbz,
-					$ausbildungssemester,
-					'',
-					''
-				);
-
-				return $this->getDataOrTerminateWithError($result);
-			}],
-			['history_laststatus', function () use (
-				$isBerechtigtNoStudstatusCheck,
-				$prestudent_id,
-				$status_kurzbz,
-				$datum,
-				$studiensemester_kurzbz,
-				$ausbildungssemester
-			) {
-				if ($isBerechtigtNoStudstatusCheck)
-					return true; // Skip if access right says so
-				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester)
-					return true; // Error will be handled by the required statements above
-
-				$result = $this->prestudentstatuschecklib->checkStatusHistoryLaststatus(
-					$prestudent_id,
-					$status_kurzbz,
-					new DateTime($datum),
-					$studiensemester_kurzbz,
-					$ausbildungssemester,
-					'',
-					''
-				);
-
-				return $this->getDataOrTerminateWithError($result);
-			}],
-			['history_unterbrecher', function () use (
-				$isBerechtigtNoStudstatusCheck,
-				$prestudent_id,
-				$status_kurzbz,
-				$datum,
-				$studiensemester_kurzbz,
-				$ausbildungssemester
-			) {
-				if ($isBerechtigtNoStudstatusCheck)
-					return true; // Skip if access right says so
-				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester)
-					return true; // Error will be handled by the required statements above
-
-				$result = $this->prestudentstatuschecklib->checkStatusHistoryUnterbrechersemester(
-					$prestudent_id,
-					$status_kurzbz,
-					new DateTime($datum),
-					$studiensemester_kurzbz,
-					$ausbildungssemester,
-					'',
-					''
-				);
-
-				return $this->getDataOrTerminateWithError($result);
-			}],
-			['history_abbrecher', function () use (
-				$isBerechtigtNoStudstatusCheck,
-				$prestudent_id,
-				$status_kurzbz,
-				$datum,
-				$studiensemester_kurzbz,
-				$ausbildungssemester
-			) {
-				if ($isBerechtigtNoStudstatusCheck)
-					return true; // Skip if access right says so
-				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester)
-					return true; // Error will be handled by the required statements above
-
-				$result = $this->prestudentstatuschecklib->checkStatusHistoryAbbrechersemester(
-					$prestudent_id,
-					$status_kurzbz,
-					new DateTime($datum),
-					$studiensemester_kurzbz,
-					$ausbildungssemester,
-					'',
-					''
-				);
-
-				return $this->getDataOrTerminateWithError($result);
-			}],
-			['history_diplomant', function () use (
-				$isBerechtigtNoStudstatusCheck,
-				$prestudent_id,
-				$status_kurzbz,
-				$datum,
-				$studiensemester_kurzbz,
-				$ausbildungssemester
-			) {
-				if ($isBerechtigtNoStudstatusCheck)
-					return true; // Skip if access right says so
-				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester)
-					return true; // Error will be handled by the required statements above
-
-				$result = $this->prestudentstatuschecklib->checkStatusHistoryDiplomant(
-					$prestudent_id,
-					$status_kurzbz,
-					new DateTime($datum),
-					$studiensemester_kurzbz,
-					$ausbildungssemester,
-					'',
-					''
-				);
-
-				return $this->getDataOrTerminateWithError($result);
-			}]
-		], [
-			'rolle_doesnt_exist' => $this->p->t('lehre', 'error_rolleBereitsVorhanden'),
-			'history_timesequence' => $this->p->t('lehre', 'error_statuseintrag_zeitabfolge'),
-			'history_laststatus' => $this->p->t('lehre', 'error_endstatus'),
-			'history_unterbrecher' => $this->p->t('lehre', 'error_consecutiveUnterbrecher'),
-			'history_abbrecher' => $this->p->t('lehre', 'error_consecutiveUnterbrecherAbbrecher'),
-			'history_diplomant' => $this->p->t('lehre', 'error_consecutiveDiplomandStudent')
-		]);
-		
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-
-		// Start DB transaction
-		$this->db->trans_start();
-
-		if (in_array($status_kurzbz, [
-			Prestudentstatus_model::STATUS_STUDENT,
-			Prestudentstatus_model::STATUS_DIPLOMAND,
-			Prestudentstatus_model::STATUS_ABSOLVENT,
-			Prestudentstatus_model::STATUS_INCOMING,
-			Prestudentstatus_model::STATUS_ABBRECHER,
-			Prestudentstatus_model::STATUS_UNTERBRECHER
-		])) {
-			$result = $this->StudentModel->loadWhere([
-				'prestudent_id' => $prestudent_id
-			]);
-
-			$student = $this->getDataOrTerminateWithError($result);
-
-			if ($student) {
-				$student = current($student);
-				
-				$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
-				$result = $this->StudentlehrverbandModel->loadWhere([
-					'student_uid' => $student->student_uid,
-					'studiensemester_kurzbz' => $studiensemester_kurzbz
-				]);
-
-				$studentlvb = $this->getDataOrTerminateWithError($result);
-
-				// NOTE(chris): if $studentlvb then update to the same values as before (except updatevon). So do nothing.
-				// TODO(chris): check if that is correct (in FAS)?
-				if (!$studentlvb) {
-					$this->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
-					
-					$this->LehrverbandModel->addLimit(1);
-					$result = $this->LehrverbandModel->loadWhere([
-						'studiengang_kz' => $student->studiengang_kz,
-						'semester' => $ausbildungssemester,
-						'verband' => $student->verband,
-						'gruppe' => $student->gruppe
-					]);
-					$lv = $this->getDataOrTerminateWithError($result);
-
-					$this->StudentlehrverbandModel->insert([
-						'student_uid' => $student->student_uid,
-						'studiensemester_kurzbz' => $studiensemester_kurzbz,
-						'studiengang_kz' => $student->studiengang_kz,
-						'semester' => $lv ? $ausbildungssemester : $student->semester,
-						'verband' => $student->verband,
-						'gruppe' => $student->gruppe,
-						'insertamum' => date('c'),
-						'insertvon' => $authUID
-					]);
-				}
-			}
-		}
-
-		//insert status
-		$result = $this->PrestudentstatusModel->insert([
-			'prestudent_id' => $prestudent_id,
-			'status_kurzbz' => $status_kurzbz,
-			'studiensemester_kurzbz' => $studiensemester_kurzbz,
-			'ausbildungssemester' => $ausbildungssemester,
-			'datum' => $datum,
-			'insertamum' => date('c'),
-			'insertvon' => $authUID,
-			'orgform_kurzbz' => $orgform_kurzbz,
-			'bestaetigtam' => $bestaetigtam,
-			'bestaetigtvon' => $bestaetigtam ? $authUID : null,
-			'anmerkung' => $anmerkung,
-			'bewerbung_abgeschicktamum' => $bewerbung_abgeschicktamum,
-			'studienplan_id' => $studienplan_id,
-			'rt_stufe' => $rt_stufe,
-			'statusgrund_id' => $statusgrund_id
-		]);
-
-		$this->getDataOrTerminateWithError($result);
-
-		$this->db->trans_complete();
-
-		$this->terminateWithSuccess(true);
-	}
-
 	public function getStatusgruende()
 	{
 		$this->load->model('crm/Statusgrund_model', 'StatusgrundModel');
@@ -1674,6 +1358,281 @@ class Status extends FHCAPI_Controller
 		return $this->terminateWithSuccess(true);
 	}
 
+	/**
+	 * Inserts a status with less validations and extra logic for manual
+	 * manipulation
+	 *
+	 * @param integer				$prestudent_id
+	 *
+	 * @return void
+	 */
+	public function insertStatus($prestudent_id)
+	{
+		$isBerechtigtNoStudstatusCheck = $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung');
+
+
+		$authUID = getAuthUID();
+		$status_kurzbz = $this->input->post('status_kurzbz');
+		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
+		$ausbildungssemester = $this->input->post('ausbildungssemester');
+		$datum = $this->input->post('datum');
+		$bestaetigtam = $this->input->post('bestaetigtam');
+		$orgform_kurzbz = $this->input->post('orgform_kurzbz');
+		$anmerkung = $this->input->post('anmerkung');
+		$bewerbung_abgeschicktamum = $this->input->post('bewerbung_abgeschicktamum');
+		$studienplan_id = $this->input->post('studienplan_id');
+		$rt_stufe = $this->input->post('rt_stufe');
+		$statusgrund_id = $this->input->post('statusgrund_id');
+
+
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules(
+			'datum',
+			$this->p->t('global', 'datum'),
+			[
+				'required', // In FAS empty datum results in todays
+				'is_valid_date',
+				['is_date_not_before_today', function ($value) {
+					if (!is_valid_date($value))
+						return true; // Error will be handled by the is_valid_date statement above
+					$today = new DateTime('today');
+					return (new DateTime($value) >= $today);
+				}],
+				['meldestichtag_not_exceeded', function ($value) use ($isBerechtigtNoStudstatusCheck) {
+					if ($isBerechtigtNoStudstatusCheck)
+						return true; // Skip if access right says so
+					if (!$value)
+						return true; // Error will be handled by the required statement above
+					
+					$result = $this->prestudentstatuschecklib->checkIfMeldestichtagErreicht($value);
+					
+					return !$this->getDataOrTerminateWithError($result);
+				}]
+			],
+			[
+				'meldestichtag_not_exceeded' => $this->p->t('lehre', 'error_dataVorMeldestichtag'),
+				'is_date_not_before_today' => $this->p->t('lehre', 'error_entryInPast')
+			]
+		);
+
+		$this->form_validation->set_rules(
+			'status_kurzbz',
+			$this->p->t('lehre', 'status_rolle'),
+			[
+				'required',
+				['status_stud_exists', function ($value) use ($prestudent_id) {
+					if ($value != 'Student')
+						return true; // Only test if new status is Student
+					
+					$result = $this->prestudentstatuschecklib->checkIfExistingStudentRolle($prestudent_id);
+
+					return $this->getDataOrTerminateWithError($result);
+				}]
+			],
+			[
+				'status_stud_exists' => $this->p->t('lehre', 'error_noStudstatus')
+			]
+		);
+		
+		$this->form_validation->set_rules('studiensemester_kurzbz', $this->p->t('lehre', 'studiensemester'), 'required');
+		
+		$this->form_validation->set_rules('ausbildungssemester', $this->p->t('lehre', 'ausbildungssemester'), 'required');
+
+		$this->form_validation->set_rules('bestaetigtam', $this->p->t('lehre', 'bestaetigt_am'), 'is_valid_date');
+
+		// Set Datum to null to prevent multiple is_valid_date checks in the following validation rules
+		if (!$datum || !is_valid_date($datum))
+			$datum = null;
+
+		$this->form_validation->set_rules('_default', '', [
+			['rolle_doesnt_exist', function () use ($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester) {
+				if (!$status_kurzbz || !$studiensemester_kurzbz || !$ausbildungssemester)
+					return true; // Error will be handled by the required statements above
+
+				$result = $this->PrestudentstatusModel->load([$ausbildungssemester, $studiensemester_kurzbz, $status_kurzbz, $prestudent_id]);
+
+				return !$this->getDataOrTerminateWithError($result);
+			}],
+			['history_timesequence', function () use (
+				$isBerechtigtNoStudstatusCheck,
+				$prestudent_id,
+				$status_kurzbz,
+				$datum,
+				$studiensemester_kurzbz,
+				$ausbildungssemester
+			) {
+				if ($isBerechtigtNoStudstatusCheck)
+					return true; // Skip if access right says so
+				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester)
+					return true; // Error will be handled by the required statements above
+
+				$result = $this->prestudentstatuschecklib->checkStatusHistoryTimesequence(
+					$prestudent_id,
+					$status_kurzbz,
+					new DateTime($datum),
+					$studiensemester_kurzbz,
+					$ausbildungssemester,
+					'',
+					''
+				);
+
+				return $this->getDataOrTerminateWithError($result);
+			}],
+			['history_laststatus', function () use (
+				$isBerechtigtNoStudstatusCheck,
+				$prestudent_id,
+				$status_kurzbz,
+				$datum,
+				$studiensemester_kurzbz,
+				$ausbildungssemester
+			) {
+				if ($isBerechtigtNoStudstatusCheck)
+					return true; // Skip if access right says so
+				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester)
+					return true; // Error will be handled by the required statements above
+
+				$result = $this->prestudentstatuschecklib->checkStatusHistoryLaststatus(
+					$prestudent_id,
+					$status_kurzbz,
+					new DateTime($datum),
+					$studiensemester_kurzbz,
+					$ausbildungssemester,
+					'',
+					''
+				);
+
+				return $this->getDataOrTerminateWithError($result);
+			}],
+			['history_unterbrecher', function () use (
+				$isBerechtigtNoStudstatusCheck,
+				$prestudent_id,
+				$status_kurzbz,
+				$datum,
+				$studiensemester_kurzbz,
+				$ausbildungssemester
+			) {
+				if ($isBerechtigtNoStudstatusCheck)
+					return true; // Skip if access right says so
+				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester)
+					return true; // Error will be handled by the required statements above
+
+				$result = $this->prestudentstatuschecklib->checkStatusHistoryUnterbrechersemester(
+					$prestudent_id,
+					$status_kurzbz,
+					new DateTime($datum),
+					$studiensemester_kurzbz,
+					$ausbildungssemester,
+					'',
+					''
+				);
+
+				return $this->getDataOrTerminateWithError($result);
+			}],
+			['history_abbrecher', function () use (
+				$isBerechtigtNoStudstatusCheck,
+				$prestudent_id,
+				$status_kurzbz,
+				$datum,
+				$studiensemester_kurzbz,
+				$ausbildungssemester
+			) {
+				if ($isBerechtigtNoStudstatusCheck)
+					return true; // Skip if access right says so
+				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester)
+					return true; // Error will be handled by the required statements above
+
+				$result = $this->prestudentstatuschecklib->checkStatusHistoryAbbrechersemester(
+					$prestudent_id,
+					$status_kurzbz,
+					new DateTime($datum),
+					$studiensemester_kurzbz,
+					$ausbildungssemester,
+					'',
+					''
+				);
+
+				return $this->getDataOrTerminateWithError($result);
+			}],
+			['history_diplomant', function () use (
+				$isBerechtigtNoStudstatusCheck,
+				$prestudent_id,
+				$status_kurzbz,
+				$datum,
+				$studiensemester_kurzbz,
+				$ausbildungssemester
+			) {
+				if ($isBerechtigtNoStudstatusCheck)
+					return true; // Skip if access right says so
+				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester)
+					return true; // Error will be handled by the required statements above
+
+				$result = $this->prestudentstatuschecklib->checkStatusHistoryDiplomant(
+					$prestudent_id,
+					$status_kurzbz,
+					new DateTime($datum),
+					$studiensemester_kurzbz,
+					$ausbildungssemester,
+					'',
+					''
+				);
+
+				return $this->getDataOrTerminateWithError($result);
+			}]
+		], [
+			'rolle_doesnt_exist' => $this->p->t('lehre', 'error_rolleBereitsVorhanden'),
+			'history_timesequence' => $this->p->t('lehre', 'error_statuseintrag_zeitabfolge'),
+			'history_laststatus' => $this->p->t('lehre', 'error_endstatus'),
+			'history_unterbrecher' => $this->p->t('lehre', 'error_consecutiveUnterbrecher'),
+			'history_abbrecher' => $this->p->t('lehre', 'error_consecutiveUnterbrecherAbbrecher'),
+			'history_diplomant' => $this->p->t('lehre', 'error_consecutiveDiplomandStudent')
+		]);
+		
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+
+		// Start DB transaction
+		$this->db->trans_start();
+
+		$this->updateLehrverbandForInsertAndUpdate($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester, $authUID);
+
+		//insert status
+		$result = $this->PrestudentstatusModel->insert([
+			'prestudent_id' => $prestudent_id,
+			'status_kurzbz' => $status_kurzbz,
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'ausbildungssemester' => $ausbildungssemester,
+			'datum' => $datum,
+			'insertamum' => date('c'),
+			'insertvon' => $authUID,
+			'orgform_kurzbz' => $orgform_kurzbz,
+			'bestaetigtam' => $bestaetigtam,
+			'bestaetigtvon' => $bestaetigtam ? $authUID : null,
+			'anmerkung' => $anmerkung,
+			'bewerbung_abgeschicktamum' => $bewerbung_abgeschicktamum,
+			'studienplan_id' => $studienplan_id,
+			'rt_stufe' => $rt_stufe,
+			'statusgrund_id' => $statusgrund_id
+		]);
+
+		$this->getDataOrTerminateWithError($result);
+
+		$this->db->trans_complete();
+
+		$this->terminateWithSuccess(true);
+	}
+
+	/**
+	 * Updates a status entry
+	 *
+	 * @param integer				$prestudent_id
+	 * @param string				$status_kurzbz
+	 * @param string				$key_studiensemester_kurzbz
+	 * @param integer				$key_ausbildungssemester
+	 *
+	 * @return void
+	 */
 	public function updateStatus($prestudent_id, $status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester)
 	{
 		$result = $this->PrestudentstatusModel->load([
@@ -1902,59 +1861,8 @@ class Status extends FHCAPI_Controller
 		// Start DB transaction
 		$this->db->trans_start();
 
-		if (in_array($status_kurzbz, [
-			Prestudentstatus_model::STATUS_STUDENT,
-			Prestudentstatus_model::STATUS_DIPLOMAND,
-			Prestudentstatus_model::STATUS_ABSOLVENT,
-			Prestudentstatus_model::STATUS_INCOMING,
-			Prestudentstatus_model::STATUS_ABBRECHER,
-			Prestudentstatus_model::STATUS_UNTERBRECHER
-		])) {
-			$result = $this->StudentModel->loadWhere([
-				'prestudent_id' => $prestudent_id
-			]);
+		$this->updateLehrverbandForInsertAndUpdate($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester, $authUID);
 
-			$student = $this->getDataOrTerminateWithError($result);
-
-			if ($student) {
-				$student = current($student);
-				
-				$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
-				$result = $this->StudentlehrverbandModel->loadWhere([
-					'student_uid' => $student->student_uid,
-					'studiensemester_kurzbz' => $studiensemester_kurzbz
-				]);
-
-				$studentlvb = $this->getDataOrTerminateWithError($result);
-
-				// NOTE(chris): if $studentlvb then update to the same values as before (except updatevon). So do nothing.
-				// TODO(chris): check if that is correct (in FAS)?
-				if (!$studentlvb) {
-					$this->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
-					
-					$this->LehrverbandModel->addLimit(1);
-					$result = $this->LehrverbandModel->loadWhere([
-						'studiengang_kz' => $student->studiengang_kz,
-						'semester' => $ausbildungssemester,
-						'verband' => $student->verband,
-						'gruppe' => $student->gruppe
-					]);
-					$lv = $this->getDataOrTerminateWithError($result);
-
-					$this->StudentlehrverbandModel->insert([
-						'student_uid' => $student->student_uid,
-						'studiensemester_kurzbz' => $studiensemester_kurzbz,
-						'studiengang_kz' => $student->studiengang_kz,
-						'semester' => $lv ? $ausbildungssemester : $student->semester,
-						'verband' => $student->verband,
-						'gruppe' => $student->gruppe,
-						'insertamum' => date('c'),
-						'insertvon' => $authUID
-					]);
-				}
-			}
-		}
-		
 		//update status
 		$updateData = [
 			'studiensemester_kurzbz' => $studiensemester_kurzbz,
@@ -2262,6 +2170,76 @@ class Status extends FHCAPI_Controller
 		return $this->outputJsonSuccess(true);
 	}
 
+	/**
+	 * Helper function for insertStatus and updateStatus.
+	 *
+	 * @param integer					$prestudent_id
+	 * @param string					$status_kurzbz
+	 * @param string					$studiensemester_kurzbz
+	 * @param integer					$ausbildungssemester
+	 * @param string					$authUID
+	 *
+	 * @return void
+	 */
+	private function updateLehrverbandForInsertAndUpdate($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester, $authUID)
+	{
+		if (!in_array($status_kurzbz, [
+			Prestudentstatus_model::STATUS_STUDENT,
+			Prestudentstatus_model::STATUS_DIPLOMAND,
+			Prestudentstatus_model::STATUS_ABSOLVENT,
+			Prestudentstatus_model::STATUS_INCOMING,
+			Prestudentstatus_model::STATUS_ABBRECHER,
+			Prestudentstatus_model::STATUS_UNTERBRECHER
+		]))
+			return; // No Update necessary
+
+		$result = $this->StudentModel->loadWhere([
+			'prestudent_id' => $prestudent_id
+		]);
+
+		$student = $this->getDataOrTerminateWithError($result);
+
+		if (!$student)
+			return; // No Update necessary
+
+		$student = current($student);
+		
+		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
+		$result = $this->StudentlehrverbandModel->loadWhere([
+			'student_uid' => $student->student_uid,
+			'studiensemester_kurzbz' => $studiensemester_kurzbz
+		]);
+
+		$studentlvb = $this->getDataOrTerminateWithError($result);
+
+		// NOTE(chris): if $studentlvb then update to the same values as before (except updatevon). So do nothing?
+		// TODO(chris): check if that is correct (in FAS)?
+		if ($studentlvb)
+			return; // No Update necessary
+
+		$this->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
+		
+		$this->LehrverbandModel->addLimit(1);
+		$result = $this->LehrverbandModel->loadWhere([
+			'studiengang_kz' => $student->studiengang_kz,
+			'semester' => $ausbildungssemester,
+			'verband' => $student->verband,
+			'gruppe' => $student->gruppe
+		]);
+		$lv = $this->getDataOrTerminateWithError($result);
+
+		$this->StudentlehrverbandModel->insert([
+			'student_uid' => $student->student_uid,
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'studiengang_kz' => $student->studiengang_kz,
+			'semester' => $lv ? $ausbildungssemester : $student->semester,
+			'verband' => $student->verband,
+			'gruppe' => $student->gruppe,
+			'insertamum' => date('c'),
+			'insertvon' => $authUID
+		]);
+	}
+
 	private function _sanitizeAliasName($str)
 	{
 		$str = sanitizeProblemChars($str);
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index 67bcde30f..41b3c93bc 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -724,7 +724,7 @@ export default{
 		insertStatus() {
 			this.$refs.statusData
 				.post(
-					'api/frontend/v1/stv/status/insert/' + this.modelValue.prestudent_id,
+					'api/frontend/v1/stv/status/insertStatus/' + this.modelValue.prestudent_id,
 					this.statusData
 				)
 				.then(result => {

From df3927254430e56d3e75c5dc102ce01fe259f5cd Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 24 Jul 2024 15:38:26 +0200
Subject: [PATCH 0990/1461] update dynamic Toolbar Interessent with bootstrap
 dropdown-menu-right

---
 .../api/frontend/v1/stv/Status.php            |   2 +-
 application/libraries/PrestudentLib.php       |   1 +
 .../Details/Prestudent/MultiStatus.js         | 266 ++++++------------
 3 files changed, 91 insertions(+), 178 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index bb1b512c6..af9effa99 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -851,7 +851,7 @@ class Status extends FHCAPI_Controller
 			}
 
 			$this->load->library('PrestudentLib');
-			$result = $this->prestudentlib->setFirstStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, null, $bestaetigtam, $bestaetigtvon, $stg, $uidStudent);
+			$result = $this->prestudentlib->setFirstStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id, $bestaetigtam, $bestaetigtvon, $stg, $uidStudent);
 
 			if (isError($result)) {
 				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php
index 693f328f5..38ae487d3 100644
--- a/application/libraries/PrestudentLib.php
+++ b/application/libraries/PrestudentLib.php
@@ -568,6 +568,7 @@ class PrestudentLib
 			'status_kurzbz' => Prestudentstatus_model::STATUS_STUDENT,
 			'studiensemester_kurzbz' => $studiensemester_kurzbz,
 			'ausbildungssemester' => $ausbildungssemester,
+			'statusgrund_id' => $statusgrund_id,
 			'datum' => date('c'),
 			'insertvon' => $insertvon,
 			'insertamum' => date('c'),
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index 41b3c93bc..306c940c6 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -133,6 +133,14 @@ export default{
 		toolbarStudent() {
 			return this.listDataToolbar.filter(item => this.statiStudent.includes(item.status_kurzbz));
 		},
+		sortedGruende() {
+			return this.listDataToolbar.reduce((result,current) => {
+				if (!result[current.status_kurzbz])
+					result[current.status_kurzbz] = [];
+				result[current.status_kurzbz].push(current);
+				return result;
+			}, {});
+		},
 		resultInteressentArray() {
 			const result = [];
 			this.statiInteressent.forEach(status => {
@@ -140,18 +148,16 @@ export default{
 					status_kurzbz: status,
 					statusgrund_id: null,
 					link: `changeStatusTo${status}`,
-					dropEntry: null
+					dropEntry: null,
+					children: []
 				};
 
 				if (status === "Student") {
 					defaultObject.link = 'changeInteressentToStudent';
 				}
-
 				result.push(defaultObject);
-
-				this.toolbarInteressent.forEach(item => {
-					if (item.status_kurzbz === status) {
-
+				if(this.sortedGruende[status]) {
+					this.sortedGruende[status].forEach(item => {
 						const itemObject = {
 							status_kurzbz: item.status_kurzbz,
 							statusgrund_id: item.statusgrund_id,
@@ -164,10 +170,9 @@ export default{
 							itemObject.link = `changeInteressentTo${item.status_kurzbz}(${item.statusgrund_id})`;
 						}
 
-						result.push(itemObject);
-
-					}
-				});
+						defaultObject.children.push(itemObject);
+					});
+				}
 			});
 			return result;
 		},
@@ -667,7 +672,7 @@ export default{
 			this.actionConfirmDialogue(this.updateData, 'wartender','Wartenden');
 		},
 		addStudent(prestudentIds){
-
+			//this.hideModal('confirmStatusAction');
 			let changeData = {};
 
 			//for Feedback Sucess, Error
@@ -968,17 +973,18 @@ export default{
 			const today = new Date();
 			return today;
 		},
-		handleSelectionChange(event) {
-			const selectedValue = event.target.value;
-			const selectedItem = this.resultInteressentArray.find(item =>
-				item.status_kurzbz + (item.statusgrund_id !== null ? '-' + item.statusgrund_id : '') === selectedValue
-			);
-			if (selectedItem && typeof this[selectedItem.link] === 'function') {
-				this[selectedItem.link]();
+		executeLink(link) {
+			// Split the link string to extract the function name and arguments
+			const match = link.match(/(\w+)\(([^)]*)\)/);
+			const functionName = match ? match[1] : link;
+			const args = match ? match[2].split(',').map(arg => arg.trim()) : [];
+			
+			if (typeof this[functionName] === 'function') {
+				this[functionName](...args);
 			} else {
-				console.warn(`No method found for ${selectedItem.link}`);
+				console.error(`Method ${functionName} not found`);
 			}
-		}
+		},
 	},
 	created(){
 		this.$fhcApi
@@ -1014,27 +1020,7 @@ export default{
 	template: `
 		<div class="stv-list h-100 pt-3">
 		
-	<!--<div>
-				<table class="table">
-				<thead>
-					<tr>
-					<th>Status Kurzbez</th>
-					<th>Bezeichnung</th>
-					<th>Status Grund ID</th>
-					<th>Link</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr v-for="item in resultInteressentArray" :key="item.status_kurzbz + (item.statusgrund_id !== null ? '-' + item.statusgrund_id : '')">
-					<td>{{ item.status_kurzbz }}</td>
-					<td>{{ item.beschreibung }}</td>
-					<td>{{ item.statusgrund_id }}</td>
-					<td><a :href="item.link">{{ item.link }}</a></td>
-					</tr>
-				</tbody>
-				</table>
-			</div> -->
-			
+		
 			<!--Modal: statusModal-->
 			<bs-modal ref="statusModal">
 				<template #title>
@@ -1279,76 +1265,39 @@ export default{
 				<template #actions="{updateData2}">
 					<!-- SingleSelectButton-->
 					<div class="btn-group">						
-						<button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
+						<button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" data-bs-auto-close="outside" aria-expanded="false">
 							{{$p.t('lehre', 'btn_statusAendern')}}
 						</button>
-												
-						<!--toolbar Interessent-->		
-						<ul v-if="showToolbarInteressent" class="dropdown-menu">
-							<li class="dropdown-submenu">
-								<a class="dropdown-item" @click="changeStatusToBewerber(prestudentIds)">Bewerber</a>
-							</li>
-							<li class="dropdown-submenu">
-								<a class="dropdown-item" @click="changeStatusToAufgenommener">Aufgenommener</a>
-							</li>				
-							<li class="dropdown-submenu">
-								<a class="dropdown-item dropdown-toggle" href="#">Student</a>
-								<ul class="dropdown-menu dropdown-menu-right">
-									<li>
-										<a class="dropdown-item" @click="changeInteressentToStudent(prestudentIds)">Student</a>
+															
+						    <ul v-if="showToolbarInteressent" class="dropdown-menu">
+							  <li v-for="item in resultInteressentArray" :key="item.status_kurzbz" class="w-100">
+
+								<div v-if="item.children.length > 0" class="btn-group dropend w-100">
+								  <a
+									class="dropdown-item dropdown-toggle"
+									data-bs-toggle="dropdown"
+									aria-expanded="false"
+									href="#"
+								  >
+									{{ item.status_kurzbz }}
+								  </a>
+								  <ul class="dropdown-menu dropdown-menu-right">
+									<li v-for="child in item.children" :key="child.statusgrund_id">
+									  <a class="dropdown-item" @click="executeLink(child.link)">{{ child.beschreibung }}</a>
 									</li>
-									<li>
-										<a class="dropdown-item" @click="changeInteressentToStudent(19)">Pre-Abbrecher</a>
-									</li>
-									<li>
-										<a class="dropdown-item" @click="changeInteressentToStudent(15)">Pre-Wiederholer</a>
-									</li>
-									<li>
-										<a class="dropdown-item" @click="changeInteressentToStudent(16)">Wiederholer</a>
-									</li>
-								</ul>
-							</li>
-							<li class="dropdown-submenu">
-								<a class="dropdown-item" @click="changeStatusToWartender">Wartender</a>
-							</li>
-							<li class="dropdown-submenu">
-								<a class="dropdown-item dropdown-toggle" href="#">Absage</a>
-								<ul class="dropdown-menu dropdown-menu-right">
-									<li>
-										<a class="dropdown-item" @click="changeStatusToAbgewiesener(2)">Keine Antwort</a>
-									</li>
-									<li>
-										<a class="dropdown-item" @click="changeStatusToAbgewiesener(3)">ZGV nicht erfüllt</a>
-									</li>									
-									<li>
-										<a class="dropdown-item" @click="changeStatusToAbgewiesener(4)">Von BewerberIn storniert</a>
-									</li>									
-									<li>
-										<a class="dropdown-item" @click="changeStatusToAbgewiesener(5)">Aufnahme in anderen Studiengang</a>
-									</li>									
-									<li>
-										<a class="dropdown-item" @click="changeStatusToAbgewiesener(6)">Reihungstestergebnis unzureichend</a>
-									</li>									
-									<li>
-										<a class="dropdown-item" @click="changeStatusToAbgewiesener(7)">Sonstiges</a>
-									</li>
-								</ul>
-							</li>					
-						</ul>
-												
-						<!-- SingleSelectButton Dynamisch Interessent-->
-						<div v-if="showToolbarInteressent" class="btn-group">
-							<select v-model="selectedStatus" class="form-select button-dropdown" @change="handleSelectionChange">
-							<option value="default">---SELECT STATUS INTERESSENT---</option>
-							<option 
-								v-for="item in resultInteressentArray" 
-								:key="item.status_kurzbz + (item.statusgrund_id !== null ? '-' + item.statusgrund_id : '')"
-								:value="item.status_kurzbz + (item.statusgrund_id !== null ? '-' + item.statusgrund_id : '')"
-							>
-								{{ item.status_kurzbz }} {{ item.bezeichnung }} {{ item.dropEntry }}
-							</option>
-							</select>
-						</div>
+								  </ul>
+								</div>
+						
+								<div v-else>
+								  <a
+									class="dropdown-item"
+									@click="executeLink(item.link)"
+								  >
+									{{ item.status_kurzbz }}
+								  </a>
+								</div>
+							  </li>
+							</ul>	
 					
 						<!--toolbar Student-->
 						<ul v-if="showToolbarStudent" class="dropdown-menu">
@@ -1399,78 +1348,41 @@ export default{
 				ref="buttonsStatusMulti"
 			>	
 			<!--MultiSelectButton-->
-			<div v-if="showToolbar" class="btn-group">						
-				<button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
-					Status Ändern
+			<div v-if="showToolbar"  class="btn-group">						
+				<button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" data-bs-auto-close="outside" aria-expanded="false">
+					{{$p.t('lehre', 'btn_statusAendern')}}
 				</button>
-							
-				<!--toolbar Interessent-->		
-				<ul v-if="showToolbarInteressent" class="dropdown-menu">
-					<li class="dropdown-submenu">
-						<a class="dropdown-item" @click="changeStatusToBewerber(prestudentIds)">Bewerber</a>
-					</li>
-					<li class="dropdown-submenu">
-						<a class="dropdown-item" @click="changeStatusToAufgenommener">Aufgenommener</a>
-					</li>				
-					<li class="dropdown-submenu">
-						<a class="dropdown-item dropdown-toggle" href="#">Student</a>
-						<ul class="dropdown-menu dropdown-menu-right">
-							<li>
-								<a class="dropdown-item" @click="changeInteressentToStudent(prestudentIds)">Student</a>
+													
+					<ul v-if="showToolbarInteressent" class="dropdown-menu">
+					  <li v-for="item in resultInteressentArray" :key="item.status_kurzbz" class="w-100">
+
+						<div v-if="item.children.length > 0" class="btn-group dropend w-100">
+						  <a
+							class="dropdown-item dropdown-toggle"
+							data-bs-toggle="dropdown"
+							aria-expanded="false"
+							href="#"
+						  >
+							{{ item.status_kurzbz }}
+						  </a>
+						  <ul class="dropdown-menu dropdown-menu-right">
+							<li v-for="child in item.children" :key="child.statusgrund_id">
+							  <a class="dropdown-item" @click="executeLink(child.link)">{{ child.beschreibung }}</a>
 							</li>
-							<li>
-								<a class="dropdown-item" @click="changeInteressentToStudent(19)">Pre-Abbrecher</a>
-							</li>
-							<li>
-								<a class="dropdown-item" @click="changeInteressentToStudent(15)">Pre-Wiederholer</a>
-							</li>
-							<li>
-								<a class="dropdown-item" @click="changeInteressentToStudent(16)">Wiederholer</a>
-							</li>
-						</ul>
-					</li>
-					<li class="dropdown-submenu">
-						<a class="dropdown-item" @click="changeStatusToWartender">Wartender</a>
-					</li>
-					<li class="dropdown-submenu">
-						<a class="dropdown-item dropdown-toggle" href="#">Absage</a>
-						<ul class="dropdown-menu dropdown-menu-right">
-							<li>
-								<a class="dropdown-item" @click="changeStatusToAbgewiesener(2)">Keine Antwort</a>
-							</li>
-							<li>
-								<a class="dropdown-item" @click="changeStatusToAbgewiesener(3)">ZGV nicht erfüllt</a>
-							</li>									
-							<li>
-								<a class="dropdown-item" @click="changeStatusToAbgewiesener(4)">Von BewerberIn storniert</a>
-							</li>									
-							<li>
-								<a class="dropdown-item" @click="changeStatusToAbgewiesener(5)">Aufnahme in anderen Studiengang</a>
-							</li>									
-							<li>
-								<a class="dropdown-item" @click="changeStatusToAbgewiesener(6)">Reihungstestergebnis unzureichend</a>
-							</li>									
-							<li>
-								<a class="dropdown-item" @click="changeStatusToAbgewiesener(7)">Sonstiges</a>
-							</li>
-						</ul>
-					</li>					
-				</ul>
+						  </ul>
+						</div>
 				
-				<!-- Dynamisch Interessent-->
-				<div v-if="showToolbarInteressent" class="btn-group">
-					<select v-model="selectedStatus" class="form-select button-dropdown" @change="handleSelectionChange">
-					<option value="default">---SELECT STATUS INTERESSENT---</option>
-					<option 
-						v-for="item in resultInteressentArray" 
-						:key="item.status_kurzbz + (item.statusgrund_id !== null ? '-' + item.statusgrund_id : '')"
-						:value="item.status_kurzbz + (item.statusgrund_id !== null ? '-' + item.statusgrund_id : '')"
-					>
-						{{ item.status_kurzbz }} {{ item.bezeichnung }} {{ item.dropEntry }}
-					</option>
-					</select>
-				</div>
-			
+						<div v-else>
+						  <a
+							class="dropdown-item"
+							@click="executeLink(item.link)"
+						  >
+							{{ item.status_kurzbz }}
+						  </a>
+						</div>
+					  </li>
+					</ul>	
+							
 				<!--toolbar Student-->
 				<ul v-if="showToolbarStudent" class="dropdown-menu">
 					<li class="dropdown-submenu">

From 7f0373e0e9696117b8e195e94bbf163b6a55808b Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 24 Jul 2024 16:08:46 +0200
Subject: [PATCH 0991/1461] bewerbung_abgeschicktamum rechte

---
 .../controllers/Studentenverwaltung.php       |  1 +
 .../api/frontend/v1/stv/Status.php            | 24 ++++++++++++++++++-
 .../js/components/Stv/Studentenverwaltung.js  |  1 +
 .../Details/Prestudent/MultiStatus.js         |  8 +++++--
 system/phrasesupdate.php                      | 20 ++++++++++++++++
 5 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/application/controllers/Studentenverwaltung.php b/application/controllers/Studentenverwaltung.php
index 75faf2cba..5a400d969 100644
--- a/application/controllers/Studentenverwaltung.php
+++ b/application/controllers/Studentenverwaltung.php
@@ -23,6 +23,7 @@ class Studentenverwaltung extends FHC_Controller
 				'student/bpk' => $this->permissionlib->isBerechtigt('student/bpk'),
 				'student/alias' => $this->permissionlib->isBerechtigt('student/alias'),
 				'basis/prestudent' => $this->permissionlib->isBerechtigt('basis/prestudent'),
+				'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'),
diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index af9effa99..bfac248d1 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -1369,6 +1369,7 @@ class Status extends FHCAPI_Controller
 	public function insertStatus($prestudent_id)
 	{
 		$isBerechtigtNoStudstatusCheck = $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung');
+		$isBerechtigtBasisPrestudentstatus = $this->permissionlib->isBerechtigt('basis/prestudentstatus');
 
 
 		$authUID = getAuthUID();
@@ -1387,6 +1388,16 @@ class Status extends FHCAPI_Controller
 
 		$this->load->library('form_validation');
 
+		if (!$isBerechtigtBasisPrestudentstatus)
+			$this->form_validation->set_rules(
+				'bewerbung_abgeschicktamum',
+				$this->p->t('lehre', 'bewerbung_abgeschickt_am'),
+				'is_null',
+				[
+					'is_null' => $this->p->t('ui', 'error_fieldWriteAccess')
+				]
+			);
+
 		$this->form_validation->set_rules(
 			'datum',
 			$this->p->t('global', 'datum'),
@@ -1649,7 +1660,8 @@ class Status extends FHCAPI_Controller
 
 		
 		$isBerechtigtNoStudstatusCheck =  $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung');
-
+		$isBerechtigtBasisPrestudentstatus = $this->permissionlib->isBerechtigt('basis/prestudentstatus');
+		
 
 		$authUID = getAuthUID();
 		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz') ?: $oldstatus->studiensemester_kurzbz;
@@ -1660,6 +1672,16 @@ class Status extends FHCAPI_Controller
 		//Form Validation
 		$this->load->library('form_validation');
 
+		if (!$isBerechtigtBasisPrestudentstatus)
+			$this->form_validation->set_rules(
+				'bewerbung_abgeschicktamum',
+				$this->p->t('lehre', 'bewerbung_abgeschickt_am'),
+				'is_null',
+				[
+					'is_null' => $this->p->t('ui', 'error_fieldWriteAccess')
+				]
+			);
+
 		$this->form_validation->set_rules(
 			'datum',
 			$this->p->t('global', 'datum'),
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index dc1efbb34..e2ca8e349 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -50,6 +50,7 @@ export default {
 			hasBpkPermission: this.permissions['student/bpk'],
 			hasAliasPermission: this.permissions['student/alias'],
 			hasPrestudentPermission: this.permissions['basis/prestudent'],
+			hasPrestudentstatusPermission: this.permissions['basis/prestudentstatus'],
 			hasAssistenzPermissionForStgs: this.permissions['assistenz_stgs'],
 			hasSchreibrechtAss: this.permissions['assistenz_schreibrechte'],
 			hasAdminPermission: this.permissions['admin'],
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index 306c940c6..a816af46e 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -24,6 +24,10 @@ export default{
 			from: 'hasPrestudentPermission',
 			default: false
 		},
+		hasPrestudentstatusPermission: {
+			from: 'hasPrestudentstatusPermission',
+			default: false
+		},
 		hasAssistenzPermission: {
 			from: 'hasAssistenzPermission',
 			default: false
@@ -1108,7 +1112,7 @@ export default{
 					<form-input
 						container-class="mb-3"
 						type="DatePicker"
-						name="bewerbung_abgeschickt_am"
+						name="bewerbung_abgeschicktamum"
 						:label="$p.t('lehre/bewerbung_abgeschickt_am')"
 						v-model="statusData['bewerbung_abgeschicktamum']"
 						auto-apply
@@ -1116,7 +1120,7 @@ export default{
 						format="dd.MM.yyyy"
 						preview-format="dd.MM.yyyy"
 						:teleport="true"
-						:disabled="statusData.datum < dataMeldestichtag"
+						:disabled="statusData.datum < dataMeldestichtag || !hasPrestudentstatusPermission"
 						>
 					</form-input>
 					<form-input
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index b6cfe2dac..8800b37f7 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -1735,6 +1735,26 @@ $phrases = array(
             )
         )
     ),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'error_fieldWriteAccess',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Sie haben keine Schreibrechte für dieses Feld',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'You do not have writing rights for this field',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 	'app' => 'core',
 	'category' => 'anrechnung',

From a3377a77faa55d22924efefbdbd6f65be8a04d0c Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 25 Jul 2024 10:46:45 +0200
Subject: [PATCH 0992/1461] update functions changeStatus, part 1, fix tags

---
 .../Details/Prestudent/MultiStatus.js         | 283 +++++++++++++-----
 1 file changed, 202 insertions(+), 81 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index a816af46e..6cb9714ec 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -152,12 +152,13 @@ export default{
 					status_kurzbz: status,
 					statusgrund_id: null,
 					link: `changeStatusTo${status}`,
-					dropEntry: null,
+				//	dropEntry: null,
 					children: []
 				};
 
 				if (status === "Student") {
 					defaultObject.link = 'changeInteressentToStudent';
+
 				}
 				result.push(defaultObject);
 				if(this.sortedGruende[status]) {
@@ -167,15 +168,25 @@ export default{
 							statusgrund_id: item.statusgrund_id,
 							beschreibung: item.beschreibung,
 							link: `changeStatusTo${item.status_kurzbz}(${item.statusgrund_id})`,
-							dropEntry: `[${item.beschreibung}]`
+						//dropEntry: `[${item.beschreibung}]`
 						};
 
 						if (item.status_kurzbz === "Student") {
 							itemObject.link = `changeInteressentTo${item.status_kurzbz}(${item.statusgrund_id})`;
 						}
-
 						defaultObject.children.push(itemObject);
 					});
+					//push one item object if student is in the array
+					const hasStudentChild = defaultObject.children.some(child => child.status_kurzbz === "Student");
+
+					if (hasStudentChild) {
+						defaultObject.children.push({
+							status_kurzbz: 'Student',
+							statusgrund_id: null,
+							beschreibung: 'Student',
+							link: 'changeInteressentToStudent'
+						});
+					}
 				}
 			});
 			return result;
@@ -183,24 +194,37 @@ export default{
 		resultStudentArray() {
 			const result = [];
 			this.statiStudent.forEach(status => {
-				result.push({
+				const defaultObject = {
 					status_kurzbz: status,
 					statusgrund_id: null,
 					link: `changeStatusTo${status}`,
-					dropEntry: null
-				});
+					dropEntry: null,
+					children: []
+				};
+				result.push(defaultObject);
+				if(this.sortedGruende[status]) {
+					this.sortedGruende[status].forEach(item => {
+							const itemObject = {
+								status_kurzbz: item.status_kurzbz,
+								statusgrund_id: item.statusgrund_id,
+								beschreibung: item.beschreibung,
+								link: `changeStatusTo${item.status_kurzbz}(${item.statusgrund_id})`,
+								dropEntry: `[${item.beschreibung}]`,
+							};
+						defaultObject.children.push(itemObject);
+					});
+				}
+				//push one item object if student is in the array
+				const hasStudentChild = defaultObject.children.some(child => child.status_kurzbz === "Student");
 
-				this.toolbarStudent.forEach(item => {
-					if (item.status_kurzbz === status) {
-						result.push({
-							status_kurzbz: item.status_kurzbz,
-							statusgrund_id: item.statusgrund_id,
-							beschreibung: item.beschreibung,
-							link: `changeStatusTo${item.status_kurzbz}(${item.statusgrund_id})`,
-							dropEntry: `[${item.beschreibung}]`,
-						});
-					}
-				});
+				if (hasStudentChild) {
+					defaultObject.children.push({
+						status_kurzbz: 'Student',
+						statusgrund_id: null,
+						beschreibung: 'Student',
+						link: 'changeStatusToStudent'
+					});
+				}
 			});
 			return result;
 		}
@@ -493,36 +517,26 @@ export default{
 				this.$refs.askForAusbildungssemester.show();
 			}
 		},
-		changeStatusToAbbrecherStgl(prestudentIds){
+		changeStatusToAbbrecher(statusgrund_id){
 			this.hideModal('confirmStatusAction');
+			this.hideModal('askForAusbildungssemester');
+			console.log("in function changeStatusToAbbrecher: ", statusgrund_id);
 			let def_date = this.getDefaultDate();
 			let abbruchData =
 				{
 					status_kurzbz: 'Abbrecher',
 					datum: def_date,
 					bestaetigtam: def_date,
-					statusgrund_id: 17
+					statusgrund_id: statusgrund_id
 				};
-			console.log(this.updateData);
 			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...abbruchData }));
-			this.changeStatus(prestudentIds);
-		},
-		changeStatusToAbbrecherStud(prestudentIds){
-			this.hideModal('confirmStatusAction');
-			let def_date = this.getDefaultDate();
-			let deltaData =
-				{
-					status_kurzbz: 'Abbrecher',
-					datum: def_date,
-					bestaetigtam: def_date,
-					statusgrund_id: 18
-				};
 
-			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData }));
-			this.changeStatus(prestudentIds);
+			this.actionConfirmDialogue(this.updateData, 'studenten','Abbrecher');
+			//this.changeStatus(prestudentIds);
 		},
-		changeStatusToUnterbrecher(prestudentIds){
+		changeStatusToUnterbrecher(){
 			this.hideModal('confirmStatusAction');
+			this.hideModal('askForAusbildungssemester');
 			let def_date = this.getDefaultDate();
 			let deltaData =
 				{
@@ -532,14 +546,32 @@ export default{
 				};
 
 			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData }));
-			this.changeStatus(prestudentIds);
+			this.actionConfirmDialogue(this.updateData, 'studenten','Unterbrecher');
 		},
 		changeStatusToStudent(statusgrund_id){
+			this.hideModal('confirmStatusAction');
+			this.hideModal('askForAusbildungssemester');
 			console.log("in function changeStatusToStudent: ", statusgrund_id);
 			let def_date = this.getDefaultDate();
 			//TODO Manu validation if Bewerber already before asking for ausbildungssemester
 			//this.checkIfBewerber();
-			this.hideModal('askForAusbildungssemester');
+
+			this.actionButton = 'student';
+
+			if(statusgrund_id == 19){
+				this.actionStatusText = 'Pre-Abbrecher';
+			}
+			if(statusgrund_id == 11){
+				this.actionStatusText = 'Pre-Wiederholer';
+			}
+			if(statusgrund_id == 16){
+				this.actionStatusText = 'Wiederholer';
+			}
+			if(!statusgrund_id){
+				this.actionStatusText = 'Student';
+			}
+
+
 			let deltaData =
 				{
 					status_kurzbz: 'Student',
@@ -548,24 +580,12 @@ export default{
 					statusgrund_id: statusgrund_id
 				};
 
-			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData, ausbildungssemester: this.actionSem}));
+		//	this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData, ausbildungssemester: this.actionSem}));
 
-			//TODO(Manu) get bezeichnung von statusgrund_kurzbz
-			this.actionConfirmDialogue(this.updateData, 'student','Studenten');
-		},
-		changeStatusToWiederholer(prestudentIds){
-			this.hideModal('askForAusbildungssemester');
-			let def_date = this.getDefaultDate();
-			let deltaData =
-				{
-					status_kurzbz: 'Student',
-					datum: def_date,
-					bestaetigtam: def_date,
-					statusgrund_id: 16
-				};
+			//now actionSem is asked later
+			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData}));
 
-			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData, ausbildungssemester: this.actionSem}));
-			this.changeStatus(prestudentIds);
+			this.actionConfirmDialogue(this.updateData, this.actionButton, this.actionStatusText);
 		},
 		changeStatusToDiplomand(prestudentIds){
 			let def_date = this.getDefaultDate();
@@ -592,6 +612,8 @@ export default{
 			this.changeStatus(prestudentIds);
 		},
 		changeStatusToBewerber(){
+			this.hideModal('confirmStatusAction');
+			this.hideModal('askForAusbildungssemester');
 			let def_date = this.getDefaultDate();
 			let deltaData =
 				{
@@ -607,6 +629,8 @@ export default{
 			this.changeStatus(this.prestudentIds);
 		},
 		changeStatusToAufgenommener(){
+			this.hideModal('confirmStatusAction');
+			this.hideModal('askForAusbildungssemester');
 			let def_date = this.getDefaultDate();
 			let deltaData =
 				{
@@ -624,6 +648,8 @@ export default{
 
 		},
 		changeInteressentToStudent(statusgrund_id){
+			this.hideModal('confirmStatusAction');
+			this.hideModal('askForAusbildungssemester');
 			//TODO(Manu) test statusgrund_id
 			console.log("in function changeInteressentToStudent mit statusgrund_id", statusgrund_id);
 			let def_date = this.getDefaultDate();
@@ -644,6 +670,8 @@ export default{
 
 		},
 		changeStatusToAbgewiesener(statusgrund_id){
+			this.hideModal('confirmStatusAction');
+			this.hideModal('askForAusbildungssemester');
 			let def_date = this.getDefaultDate();
 			let deltaData =
 				{
@@ -661,6 +689,8 @@ export default{
 			this.actionConfirmDialogue(this.updateData, 'abgewiesener','Abgewiesenen');
 		},
 		changeStatusToWartender(){
+			this.hideModal('confirmStatusAction');
+			this.hideModal('askForAusbildungssemester');
 			let def_date = this.getDefaultDate();
 			let deltaData =
 				{
@@ -745,6 +775,7 @@ export default{
 		},
 		changeStatus(prestudentIds){
 			this.hideModal('confirmStatusAction');
+			this.hideModal('askForAusbildungssemester');
 			//Array.isArray(prestudentIds) ? this.modelValue.prestudent_id : [prestudentIds];
 			let changeData = {};
 
@@ -755,6 +786,18 @@ export default{
 			if(!prestudentIds)
 				prestudentIds = [this.modelValue.prestudent_id];
 
+			// Check if ausbildungssemester is already in this.newArray
+			const existingEntry = this.newArray.find(
+				(entry) => entry.ausbildungssemester === this.actionSem
+			);
+
+			// If the entry doesn't exist, add a new object with ausbildungssemester
+			if (!existingEntry) {
+				this.newArray.push({ ausbildungssemester: this.actionSem });
+			}
+
+			console.log(this.actionSem + ' ' + this.newArray['ausbildungssemester']);
+
 			const promises = prestudentIds.map(prestudentId => {
 				//TODO(manu) besserer check
 				changeData = this.statusData.status_kurzbz ? this.statusData : this.newArray.find(item => item.prestudent_id === prestudentId);
@@ -776,16 +819,16 @@ export default{
 			Promise
 				.allSettled(promises)
 				.then(values => {
-					if (this.abbruchData.length < 1) {
+/*					if (this.abbruchData.length < 1) {
 					}
-					else{
-						if(this.newArray.length > 0) {
-							this.newStatus = this.newArray[0].status_kurzbz;
-						}
-						else {
-							this.newStatus = this.statusData.status_kurzbz;
-						}
+					else{*/
+					if(this.newArray.length > 0) {
+						this.newStatus = this.newArray[0].status_kurzbz;
 					}
+					else {
+						this.newStatus = this.statusData.status_kurzbz;
+					}
+				//	}
 
 					//Feedback Success als infoalert
 					 if (countSuccess > 0) {
@@ -1025,6 +1068,70 @@ export default{
 		<div class="stv-list h-100 pt-3">
 		
 		
+			<table class="table">
+				<thead>
+					<tr>
+					<th>Status Kurzbez</th>
+					<th>Bezeichnung</th>
+					<th>Status Grund ID</th>
+					<th>Link</th>
+					<th>Link statusgrund_id</th>
+					</tr>
+				</thead>
+				<tbody>
+					<tr v-for="item in resultStudentArray" :key="item.status_kurzbz + (item.statusgrund_id !== null ? '-' + item.statusgrund_id : '')">
+					
+						<td>{{item.status_kurzbz}}</td>
+						
+						<td v-if="item.children[0]">
+							<div v-for="child in item.children">
+								{{child.beschreibung}}
+							</div>
+						</td>
+						<td v-else>{{ item.beschreibung }}</td>
+						<td>{{ item.children[0] }}</td>
+						<td><a :href="item.link">{{ item.link }}</a></td>
+						<td v-if="item.children[0]">
+							<div v-for="child in item.children">
+								{{child.link}}
+							</div>
+						</td>
+					</tr>
+				</tbody>
+			</table>
+			
+<!--			<table class="table">
+				<thead>
+					<tr>
+					<th>Status Kurzbez</th>
+					<th>Bezeichnung</th>
+					<th>Status Grund ID</th>
+					<th>Link</th>
+					<th>Link statusgrund_id</th>
+					</tr>
+				</thead>
+				<tbody>
+					<tr v-for="item in resultInteressentArray" :key="item.status_kurzbz + (item.statusgrund_id !== null ? '-' + item.statusgrund_id : '')">
+					
+						<td>{{item.status_kurzbz}}</td>
+						
+						<td v-if="item.children[0]">
+							<div v-for="child in item.children">
+								{{child.beschreibung}}
+							</div>
+						</td>
+						<td v-else>{{ item.beschreibung }}</td>
+						<td>{{ item.children[0] }}</td>
+						<td><a :href="item.link">{{ item.link }}</a></td>
+						<td v-if="item.children[0]">
+							<div v-for="child in item.children">
+								{{child.link}}
+							</div>
+						</td>
+					</tr>
+				</tbody>
+			</table>-->
+		
 			<!--Modal: statusModal-->
 			<bs-modal ref="statusModal">
 				<template #title>
@@ -1188,19 +1295,20 @@ export default{
 					
 				</template>
 				<template #footer>
-					<div v-if="actionButton=='abbrecherStgl'">
-						<button  ref="Close" type="button" class="btn btn-primary" @click="changeStatusToAbbrecherStgl(prestudentIds)">OK</button>
+<!--					<div v-if="actionButton=='abbrecherStgl'">
+						<button  ref="Close" type="button" class="btn btn-primary" @click="changeStatusToAbbrecher(17)">OK</button>
 					</div>
 					<div v-if="actionButton=='abbrecherStud'">
-						<button  ref="Close" type="button" class="btn btn-primary" @click="changeStatusToAbbrecherStud(prestudentIds)">OK</button>
+						<button  ref="Close" type="button" class="btn btn-primary" @click="changeStatusToAbbrecher(18)">OK</button>
 					</div>
 					<div v-if="actionButton=='unterbrecher'">
-						<button  ref="Close" type="button" class="btn btn-primary" @click="changeStatusToUnterbrecher(prestudentIds)">OK</button>
+						<button  ref="Close" type="button" class="btn btn-primary" @click="changeStatusToUnterbrecher()">OK</button>
 					</div>
 					<div v-if="actionButton=='aufgenommener'">
 						<button  ref="Close" type="button" class="btn btn-primary" @click="changeStatus(prestudentIds)">OK</button>
-					</div>
-					<div v-if="actionButton=='student'">
+					</div>-->
+					
+<!--					<div v-if="actionButton=='student'">
 						<button  ref="Close" type="button" class="btn btn-primary" @click="changeInteressentToStudent(prestudentIds)">OK</button>
 					</div>
 					<div v-if="actionButton=='wartender'">
@@ -1208,7 +1316,12 @@ export default{
 					</div>
 					<div v-if="actionButton=='abgewiesener'">
 						<button  ref="Close" type="button" class="btn btn-primary" @click="changeStatus(prestudentIds)">OK</button>
-					</div>					
+					</div>-->		
+					
+					<!--Action changeStatus-->
+					<div>
+						<button  ref="Close" type="button" class="btn btn-primary" @click="changeStatus(prestudentIds)">OK</button>
+					</div>				
 				</template>
 			</BsModal>
 								
@@ -1242,11 +1355,15 @@ export default{
 				</template>
 				<template #footer>
 
-				<div v-if="actionStatusText=='Student'">
+<!--				<div v-if="actionStatusText=='Student'">
 					<button  ref="Close" type="button" class="btn btn-primary" @click="changeStatusToStudent(prestudentIds)">OK</button>
 				</div>
 				<div v-if="actionStatusText=='Wiederholer'">
-					<button  ref="Close" type="button" class="btn btn-primary" @click="changeStatusToWiederholer(prestudentIds)">OK</button>
+					<button  ref="Close" type="button" class="btn btn-primary" @click="changeStatusTo(prestudentIds)">OK</button>
+				</div>-->
+				
+				<div>
+					<button  ref="Close" type="button" class="btn btn-primary" @click="changeStatus(prestudentIds)">OK</button>
 				</div>
 					
 				</template>
@@ -1306,25 +1423,31 @@ export default{
 						<!--toolbar Student-->
 						<ul v-if="showToolbarStudent" class="dropdown-menu">
 							<li class="dropdown-submenu">
-								<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'abbrecherStgl', 'Abbrecher')">Abbrecher durch Stgl</a>
+								<a class="dropdown-item" @click="changeStatusToAbbrecher(17)">Abbrecher durch Stgl</a>
 							</li>
 							<li class="dropdown-submenu">
-								<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'abbrecherStud','Abbrecher')">Abbrecher durch Student</a>
+								<a class="dropdown-item" @click="changeStatusToAbbrecher(18)">Abbrecher durch Student</a>
 							</li>
 							<li class="dropdown-submenu">
-								<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'unterbrecher','Unterbrecher')">Unterbrecher</a>
+								<a class="dropdown-item" @click="changeStatusToUnterbrecher()">Unterbrecher</a>
 							</li>
 							<li class="dropdown-submenu">
-								<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'student','Student')">Student</a>
+								<a class="dropdown-item" @click="changeStatusToStudent()">Student</a>
 							</li>
 							<li class="dropdown-submenu">
-								<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'student','Wiederholer')">Wiederholer</a>
+								<a class="dropdown-item" @click="changeStatusToStudent(16)">Wiederholer</a>
 							</li>
 							<li class="dropdown-submenu">
-								<a class="dropdown-item" @click="changeStatusToDiplomand(prestudentIds)">Diplomand</a>
+								<a class="dropdown-item" @click="changeStatusToStudent(15)">Pre-Wiederholer</a>
 							</li>
 							<li class="dropdown-submenu">
-								<a class="dropdown-item" @click="changeStatusToAbsolvent(prestudentIds)">Absolvent</a>
+								<a class="dropdown-item" @click="changeStatusToStudent(19)">Pre-Abbrecher</a>
+							</li>
+							<li class="dropdown-submenu">
+								<a class="dropdown-item" @click="changeStatusToDiplomand()">Diplomand</a>
+							</li>
+							<li class="dropdown-submenu">
+								<a class="dropdown-item" @click="changeStatusToAbsolvent()">Absolvent</a>
 							</li>							
 						</ul>
 					</div>
@@ -1343,7 +1466,6 @@ export default{
 						</select>
 					</div>
 				</template>
-				</template>
 
 			</core-filter-cmpt>
 			
@@ -1426,7 +1548,6 @@ export default{
 				</option>
 				</select>
 			</div>
-		
-		</div>`
-
+	 	</div>	
+	</div>`
 };
\ No newline at end of file

From df6f4a07d6cdff885b9bcf5f4126264e80662dd4 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 25 Jul 2024 13:18:13 +0200
Subject: [PATCH 0993/1461] dynamic toolbarStudent

---
 .../api/frontend/v1/stv/Status.php            |   4 +-
 .../Details/Prestudent/MultiStatus.js         | 298 ++++++------------
 2 files changed, 95 insertions(+), 207 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index bfac248d1..ef0806c4d 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -399,7 +399,7 @@ class Status extends FHCAPI_Controller
 						$this->terminateWithSuccess($prestudent_id);
 				}
 				break;
-			case Prestudentstatus_model::STATUS_STUDENT:
+/*			case Prestudentstatus_model::STATUS_STUDENT:
 				{
 					$this->load->library('PrestudentLib');
 					$result = $this->prestudentlib->setStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id, $bestaetigtam, $bestaetigtvon);
@@ -412,7 +412,7 @@ class Status extends FHCAPI_Controller
 						$this->terminateWithSuccess($prestudent_id);
 
 				}
-				break;
+				break;*/
 			case Prestudentstatus_model::STATUS_DIPLOMAND:
 				{
 					$this->load->library('PrestudentLib');
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index 6cb9714ec..915594473 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -152,7 +152,6 @@ export default{
 					status_kurzbz: status,
 					statusgrund_id: null,
 					link: `changeStatusTo${status}`,
-				//	dropEntry: null,
 					children: []
 				};
 
@@ -168,7 +167,6 @@ export default{
 							statusgrund_id: item.statusgrund_id,
 							beschreibung: item.beschreibung,
 							link: `changeStatusTo${item.status_kurzbz}(${item.statusgrund_id})`,
-						//dropEntry: `[${item.beschreibung}]`
 						};
 
 						if (item.status_kurzbz === "Student") {
@@ -505,22 +503,10 @@ export default{
 		actionConfirmDialogue(data, statusgrund, statusText){
 			this.actionButton = statusgrund;
 			this.actionStatusText = statusText;
-
-			if(this.actionStatusText != "Student" && this.actionStatusText != "Wiederholer")
-				this.$refs.confirmStatusAction.show();
-			else {
-				//haut einzeln hin
-/*				console.log("check if Bewerberstatus");
-				this.checkIfBewerber(this.prestudentIds);
-				console.log(this.isBewerber);*/
-
-				this.$refs.askForAusbildungssemester.show();
-			}
+			this.$refs.confirmStatusAction.show();
 		},
 		changeStatusToAbbrecher(statusgrund_id){
-			this.hideModal('confirmStatusAction');
-			this.hideModal('askForAusbildungssemester');
-			console.log("in function changeStatusToAbbrecher: ", statusgrund_id);
+			this.resetChangeModals();
 			let def_date = this.getDefaultDate();
 			let abbruchData =
 				{
@@ -535,8 +521,7 @@ export default{
 			//this.changeStatus(prestudentIds);
 		},
 		changeStatusToUnterbrecher(){
-			this.hideModal('confirmStatusAction');
-			this.hideModal('askForAusbildungssemester');
+			this.resetChangeModals();
 			let def_date = this.getDefaultDate();
 			let deltaData =
 				{
@@ -549,8 +534,7 @@ export default{
 			this.actionConfirmDialogue(this.updateData, 'studenten','Unterbrecher');
 		},
 		changeStatusToStudent(statusgrund_id){
-			this.hideModal('confirmStatusAction');
-			this.hideModal('askForAusbildungssemester');
+			this.resetChangeModals();
 			console.log("in function changeStatusToStudent: ", statusgrund_id);
 			let def_date = this.getDefaultDate();
 			//TODO Manu validation if Bewerber already before asking for ausbildungssemester
@@ -561,7 +545,7 @@ export default{
 			if(statusgrund_id == 19){
 				this.actionStatusText = 'Pre-Abbrecher';
 			}
-			if(statusgrund_id == 11){
+			if(statusgrund_id == 15){
 				this.actionStatusText = 'Pre-Wiederholer';
 			}
 			if(statusgrund_id == 16){
@@ -570,8 +554,6 @@ export default{
 			if(!statusgrund_id){
 				this.actionStatusText = 'Student';
 			}
-
-
 			let deltaData =
 				{
 					status_kurzbz: 'Student',
@@ -579,15 +561,17 @@ export default{
 					bestaetigtam: def_date,
 					statusgrund_id: statusgrund_id
 				};
-
-		//	this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData, ausbildungssemester: this.actionSem}));
-
-			//now actionSem is asked later
 			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData}));
 
-			this.actionConfirmDialogue(this.updateData, this.actionButton, this.actionStatusText);
+			if(statusgrund_id == 16 || !statusgrund_id){
+				this.$refs.askForAusbildungssemester.show();
+			}
+			else
+			{
+				this.actionConfirmDialogue(this.updateData, this.actionButton, this.actionStatusText);
+			}
 		},
-		changeStatusToDiplomand(prestudentIds){
+		changeStatusToDiplomand(){
 			let def_date = this.getDefaultDate();
 			let deltaData =
 				{
@@ -597,9 +581,9 @@ export default{
 				};
 
 			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData}));
-			this.changeStatus(prestudentIds);
+			this.changeStatus(this.prestudentIds);
 		},
-		changeStatusToAbsolvent(prestudentIds){
+		changeStatusToAbsolvent(){
 			let def_date = this.getDefaultDate();
 			let deltaData =
 				{
@@ -609,11 +593,14 @@ export default{
 				};
 
 			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData}));
-			this.changeStatus(prestudentIds);
+			this.changeStatus(this.prestudentIds);
+		},
+		saveNewAusbildungssemester(){
+			this.newArray = this.newArray.map(objekt => ({ ...objekt, ausbildungssemester: this.actionSem}));
+			this.changeStatus(this.prestudentIds);
 		},
 		changeStatusToBewerber(){
-			this.hideModal('confirmStatusAction');
-			this.hideModal('askForAusbildungssemester');
+			this.resetChangeModals();
 			let def_date = this.getDefaultDate();
 			let deltaData =
 				{
@@ -629,8 +616,7 @@ export default{
 			this.changeStatus(this.prestudentIds);
 		},
 		changeStatusToAufgenommener(){
-			this.hideModal('confirmStatusAction');
-			this.hideModal('askForAusbildungssemester');
+			this.resetChangeModals();
 			let def_date = this.getDefaultDate();
 			let deltaData =
 				{
@@ -648,8 +634,7 @@ export default{
 
 		},
 		changeInteressentToStudent(statusgrund_id){
-			this.hideModal('confirmStatusAction');
-			this.hideModal('askForAusbildungssemester');
+			this.resetChangeModals();
 			//TODO(Manu) test statusgrund_id
 			console.log("in function changeInteressentToStudent mit statusgrund_id", statusgrund_id);
 			let def_date = this.getDefaultDate();
@@ -670,8 +655,7 @@ export default{
 
 		},
 		changeStatusToAbgewiesener(statusgrund_id){
-			this.hideModal('confirmStatusAction');
-			this.hideModal('askForAusbildungssemester');
+			this.resetChangeModals();
 			let def_date = this.getDefaultDate();
 			let deltaData =
 				{
@@ -689,8 +673,7 @@ export default{
 			this.actionConfirmDialogue(this.updateData, 'abgewiesener','Abgewiesenen');
 		},
 		changeStatusToWartender(){
-			this.hideModal('confirmStatusAction');
-			this.hideModal('askForAusbildungssemester');
+			this.resetChangeModals();
 			let def_date = this.getDefaultDate();
 			let deltaData =
 				{
@@ -774,8 +757,7 @@ export default{
 				.catch(this.$fhcAlert.handleSystemError);
 		},
 		changeStatus(prestudentIds){
-			this.hideModal('confirmStatusAction');
-			this.hideModal('askForAusbildungssemester');
+			this.resetChangeModals();
 			//Array.isArray(prestudentIds) ? this.modelValue.prestudent_id : [prestudentIds];
 			let changeData = {};
 
@@ -796,8 +778,6 @@ export default{
 				this.newArray.push({ ausbildungssemester: this.actionSem });
 			}
 
-			console.log(this.actionSem + ' ' + this.newArray['ausbildungssemester']);
-
 			const promises = prestudentIds.map(prestudentId => {
 				//TODO(manu) besserer check
 				changeData = this.statusData.status_kurzbz ? this.statusData : this.newArray.find(item => item.prestudent_id === prestudentId);
@@ -1016,6 +996,10 @@ export default{
 			this.actionStatusText = {};
 			this.actionSem = null;
 		},
+		resetChangeModals(){
+			this.hideModal('confirmStatusAction');
+			this.hideModal('askForAusbildungssemester');
+		},
 		getDefaultDate() {
 			const today = new Date();
 			return today;
@@ -1066,72 +1050,7 @@ export default{
 	},
 	template: `
 		<div class="stv-list h-100 pt-3">
-		
-		
-			<table class="table">
-				<thead>
-					<tr>
-					<th>Status Kurzbez</th>
-					<th>Bezeichnung</th>
-					<th>Status Grund ID</th>
-					<th>Link</th>
-					<th>Link statusgrund_id</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr v-for="item in resultStudentArray" :key="item.status_kurzbz + (item.statusgrund_id !== null ? '-' + item.statusgrund_id : '')">
-					
-						<td>{{item.status_kurzbz}}</td>
-						
-						<td v-if="item.children[0]">
-							<div v-for="child in item.children">
-								{{child.beschreibung}}
-							</div>
-						</td>
-						<td v-else>{{ item.beschreibung }}</td>
-						<td>{{ item.children[0] }}</td>
-						<td><a :href="item.link">{{ item.link }}</a></td>
-						<td v-if="item.children[0]">
-							<div v-for="child in item.children">
-								{{child.link}}
-							</div>
-						</td>
-					</tr>
-				</tbody>
-			</table>
 			
-<!--			<table class="table">
-				<thead>
-					<tr>
-					<th>Status Kurzbez</th>
-					<th>Bezeichnung</th>
-					<th>Status Grund ID</th>
-					<th>Link</th>
-					<th>Link statusgrund_id</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr v-for="item in resultInteressentArray" :key="item.status_kurzbz + (item.statusgrund_id !== null ? '-' + item.statusgrund_id : '')">
-					
-						<td>{{item.status_kurzbz}}</td>
-						
-						<td v-if="item.children[0]">
-							<div v-for="child in item.children">
-								{{child.beschreibung}}
-							</div>
-						</td>
-						<td v-else>{{ item.beschreibung }}</td>
-						<td>{{ item.children[0] }}</td>
-						<td><a :href="item.link">{{ item.link }}</a></td>
-						<td v-if="item.children[0]">
-							<div v-for="child in item.children">
-								{{child.link}}
-							</div>
-						</td>
-					</tr>
-				</tbody>
-			</table>-->
-		
 			<!--Modal: statusModal-->
 			<bs-modal ref="statusModal">
 				<template #title>
@@ -1354,18 +1273,9 @@ export default{
 				</div>			
 				</template>
 				<template #footer>
-
-<!--				<div v-if="actionStatusText=='Student'">
-					<button  ref="Close" type="button" class="btn btn-primary" @click="changeStatusToStudent(prestudentIds)">OK</button>
-				</div>
-				<div v-if="actionStatusText=='Wiederholer'">
-					<button  ref="Close" type="button" class="btn btn-primary" @click="changeStatusTo(prestudentIds)">OK</button>
-				</div>-->
-				
-				<div>
-					<button  ref="Close" type="button" class="btn btn-primary" @click="changeStatus(prestudentIds)">OK</button>
-				</div>
-					
+					<div>
+						<button  ref="Close" type="button" class="btn btn-primary" @click="saveNewAusbildungssemester()">OK</button>
+					</div>					
 				</template>
 			</BsModal>
 			
@@ -1420,50 +1330,36 @@ export default{
 							  </li>
 							</ul>	
 					
-						<!--toolbar Student-->
-						<ul v-if="showToolbarStudent" class="dropdown-menu">
-							<li class="dropdown-submenu">
-								<a class="dropdown-item" @click="changeStatusToAbbrecher(17)">Abbrecher durch Stgl</a>
-							</li>
-							<li class="dropdown-submenu">
-								<a class="dropdown-item" @click="changeStatusToAbbrecher(18)">Abbrecher durch Student</a>
-							</li>
-							<li class="dropdown-submenu">
-								<a class="dropdown-item" @click="changeStatusToUnterbrecher()">Unterbrecher</a>
-							</li>
-							<li class="dropdown-submenu">
-								<a class="dropdown-item" @click="changeStatusToStudent()">Student</a>
-							</li>
-							<li class="dropdown-submenu">
-								<a class="dropdown-item" @click="changeStatusToStudent(16)">Wiederholer</a>
-							</li>
-							<li class="dropdown-submenu">
-								<a class="dropdown-item" @click="changeStatusToStudent(15)">Pre-Wiederholer</a>
-							</li>
-							<li class="dropdown-submenu">
-								<a class="dropdown-item" @click="changeStatusToStudent(19)">Pre-Abbrecher</a>
-							</li>
-							<li class="dropdown-submenu">
-								<a class="dropdown-item" @click="changeStatusToDiplomand()">Diplomand</a>
-							</li>
-							<li class="dropdown-submenu">
-								<a class="dropdown-item" @click="changeStatusToAbsolvent()">Absolvent</a>
-							</li>							
-						</ul>
-					</div>
-					
-					<!-- Dynamisch Student-->
-					<div v-if="showToolbarStudent" class="btn-group">
-						<select v-model="selectedStatus" class="form-select button-dropdown" @change="handleSelectionChange">
-						<option value="default">---SELECT STATUS STUDENT---</option>
-						<option 
-							v-for="item in resultStudentArray" 
-							:key="item.status_kurzbz + (item.statusgrund_id !== null ? '-' + item.statusgrund_id : '')"
-							 :value="item.status_kurzbz + (item.statusgrund_id !== null ? '-' + item.statusgrund_id : '')"
-						>
-							{{ item.status_kurzbz }} {{ item.bezeichnung }} {{ item.dropEntry }}
-						</option>
-						</select>
+							<!--toolbar Student-->
+							<ul v-if="showToolbarStudent" class="dropdown-menu">
+							  <li v-for="item in resultStudentArray" :key="item.status_kurzbz" class="w-100">
+
+								<div v-if="item.children.length > 0" class="btn-group dropend w-100">
+								  <a
+									class="dropdown-item dropdown-toggle"
+									data-bs-toggle="dropdown"
+									aria-expanded="false"
+									href="#"
+								  >
+									{{ item.status_kurzbz }}
+								  </a>
+								  <ul class="dropdown-menu dropdown-menu-right">
+									<li v-for="child in item.children" :key="child.statusgrund_id">
+									  <a class="dropdown-item" @click="executeLink(child.link)">{{ child.beschreibung }}</a>
+									</li>
+								  </ul>
+								</div>
+						
+								<div v-else>
+								  <a
+									class="dropdown-item"
+									@click="executeLink(item.link)"
+								  >
+									{{ item.status_kurzbz }}
+								  </a>
+								</div>
+							  </li>
+							</ul>	
 					</div>
 				</template>
 
@@ -1510,44 +1406,36 @@ export default{
 					</ul>	
 							
 				<!--toolbar Student-->
-				<ul v-if="showToolbarStudent" class="dropdown-menu">
-					<li class="dropdown-submenu">
-						<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'abbrecherStgl', 'Abbrecher')">Abbrecher durch Stgl</a>
-					</li>
-					<li class="dropdown-submenu">
-						<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'abbrecherStud','Abbrecher')">Abbrecher durch Student</a>
-					</li>
-					<li class="dropdown-submenu">
-						<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'unterbrecher','Unterbrecher')">Unterbrecher</a>
-					</li>
-					<li class="dropdown-submenu">
-						<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'student','Student')">Student</a>
-					</li>
-					<li class="dropdown-submenu">
-						<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'student','Wiederholer')">Wiederholer</a>
-					</li>
-					<li class="dropdown-submenu">
-						<a class="dropdown-item" @click="changeStatusToDiplomand(prestudentIds)">Diplomand</a>
-					</li>
-					<li class="dropdown-submenu">
-						<a class="dropdown-item" @click="changeStatusToAbsolvent(prestudentIds)">Absolvent</a>
-					</li>							
-				</ul>
-			</div>
-			
-			<!-- Dynamisch Student-->
-			<div v-if="showToolbarStudent" class="btn-group">
-				<select v-model="selectedStatus" class="form-select button-dropdown" @change="handleSelectionChange">
-				<option value="default">---SELECT STATUS STUDENT---</option>
-				<option 
-					v-for="item in resultStudentArray" 
-					:key="item.status_kurzbz + (item.statusgrund_id !== null ? '-' + item.statusgrund_id : '')"
-						:value="item.status_kurzbz + (item.statusgrund_id !== null ? '-' + item.statusgrund_id : '')"
-				>
-					{{ item.status_kurzbz }} {{ item.bezeichnung }} {{ item.dropEntry }}
-				</option>
-				</select>
-			</div>
+					<ul v-if="showToolbarStudent" class="dropdown-menu">
+					  <li v-for="item in resultStudentArray" :key="item.status_kurzbz" class="w-100">
+
+						<div v-if="item.children.length > 0" class="btn-group dropend w-100">
+						  <a
+							class="dropdown-item dropdown-toggle"
+							data-bs-toggle="dropdown"
+							aria-expanded="false"
+							href="#"
+						  >
+							{{ item.status_kurzbz }}
+						  </a>
+						  <ul class="dropdown-menu dropdown-menu-right">
+							<li v-for="child in item.children" :key="child.statusgrund_id">
+							  <a class="dropdown-item" @click="executeLink(child.link)">{{ child.beschreibung }}</a>
+							</li>
+						  </ul>
+						</div>
+				
+						<div v-else>
+						  <a
+							class="dropdown-item"
+							@click="executeLink(item.link)"
+						  >
+							{{ item.status_kurzbz }}
+						  </a>
+						</div>
+					  </li>
+					</ul>
+			</div>			
 	 	</div>	
 	</div>`
 };
\ No newline at end of file

From 725015474882d7cf82d230f0358e623a9c74bc39 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 25 Jul 2024 13:35:47 +0200
Subject: [PATCH 0994/1461] Multistatus Modal as own Component

---
 .../Details/MultiStatus.js                    |   7 +-
 .../Details/Prestudent/MultiStatus.js         |  15 +-
 .../Details/Status/Modal.js                   | 334 ++++++++++++++++++
 3 files changed, 346 insertions(+), 10 deletions(-)
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/MultiStatus.js
index dfbfa17b3..83788f611 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/MultiStatus.js
@@ -8,11 +8,8 @@ export default {
 		modelValue: Object,
 	},
 	template: `
-	<div class="stv-details-multistatus h-100 pb-3">
-		<div class="col-12 pb-3">
-			<legend>Status</legend>
-			<tbl-multi-status :model-value="modelValue"></tbl-multi-status>		
-		</div>
+	<div class="stv-details-multistatus h-100">
+		<tbl-multi-status :model-value="modelValue"></tbl-multi-status>		
 	</div>
 	`
 }
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index 915594473..0c1cb6e60 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -3,6 +3,7 @@ import BsModal from "../../../../Bootstrap/Modal.js";
 import FormForm from '../../../../Form/Form.js';
 import FormInput from '../../../../Form/Input.js';
 import FormValidation from '../../../../Form/Validation.js';
+import StatusModal from '../Status/Modal.js';
 
 export default{
 	components: {
@@ -11,6 +12,7 @@ export default{
 		FormForm,
 		FormInput,
 		FormValidation,
+		StatusModal
 	},
 	inject: {
 		defaultSemester: {
@@ -426,7 +428,8 @@ export default{
 	},
 	methods: {
 		actionNewStatus() {
-			this.statusNew = true;
+			this.$refs.test.open(this.modelValue);
+			/*this.statusNew = true;
 			this.resetModal();
 			this.statusData.status_kurzbz = 'Interessent';
 			this.statusData.studiensemester_kurzbz = this.defaultSemester;
@@ -435,10 +438,11 @@ export default{
 			this.statusData.bestaetigtam = this.getDefaultDate();
 			this.statusData.name = this.modelValue.vorname + ' ' + this.modelValue.nachname;
 			this.$refs.statusData.clearValidation();
-			this.$refs.statusModal.show();
+			this.$refs.statusModal.show();*/
 		},
-		actionEditStatus(status, stdsem, ausbildungssemester){
-			this.statusNew = false;
+		actionEditStatus(status, stdsem, ausbildungssemester) {
+			this.$refs.test.open(this.modelValue, status, stdsem, ausbildungssemester);
+			/*this.statusNew = false;
 			this.statusId = {
 				'prestudent_id': this.modelValue.prestudent_id,
 				'status_kurzbz': status,
@@ -450,7 +454,7 @@ export default{
 					this.$refs.statusData.clearValidation();
 					this.$refs.statusModal.show();
 				}
-			});
+			});*/
 		},
 		actionDeleteStatus(status, stdsem, ausbildungssemester){
 			this.statusId = {
@@ -1051,6 +1055,7 @@ export default{
 	template: `
 		<div class="stv-list h-100 pt-3">
 			
+			<status-modal ref="test" :meldestichtag="new Date(dataMeldestichtag)" @saved="reload"></status-modal>
 			<!--Modal: statusModal-->
 			<bs-modal ref="statusModal">
 				<template #title>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js b/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js
new file mode 100644
index 000000000..5c9f5594c
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js
@@ -0,0 +1,334 @@
+import BsModal from "../../../../Bootstrap/Modal.js";
+import CoreForm from '../../../../Form/Form.js';
+import FormValidation from '../../../../Form/Validation.js';
+import FormInput from '../../../../Form/Input.js';
+
+export default{
+	components: {
+		BsModal,
+		CoreForm,
+		FormValidation,
+		FormInput
+	},
+	inject: {
+		defaultSemester: {
+			from: 'defaultSemester',
+		},
+		hasPrestudentstatusPermission: {
+			from: 'hasPrestudentstatusPermission',
+			default: false
+		},
+		lists: {
+			from: 'lists'
+		},
+		$reloadList: {
+			from: '$reloadList',
+			required: true
+		}
+	},
+	emit: [
+		'saved'
+	],
+	props: {
+		meldestichtag: {
+			type: Date,
+			required: true
+		}
+	},
+	data() {
+		return {
+			prestudent: {},
+			orig_datum: null,
+			statusNew: true,
+			statusId: {},
+			formData: {},
+			listStudienplaene: [],
+			listStatusgruende: [],
+			// TODO(chris): IMPLEMENT!
+			maxSem:  Array.from({ length: 11 }, (_, index) => index),
+		};
+	},
+	computed: {
+		bisLocked() {
+			// TODO(chris): special right
+			if (this.statusNew)
+				return false;
+
+			if (!this.orig_datum || !this.meldestichtag)
+				return true;
+			
+			return this.orig_datum < this.meldestichtag;
+		},
+		isStatusBeforeStudent() {
+			let isStatusStudent = ['Student', 'Absolvent', 'Diplomand'];
+			return !isStatusStudent.includes(this.formData.status_kurzbz);
+		},
+		gruende() {
+			return this.listStatusgruende.filter(grund => grund.status_kurzbz == this.formData.status_kurzbz);
+		}
+	},
+	methods: {
+		open(prestudent, status_kurzbz, studiensemester_kurzbz, ausbildungssemester) {
+			this.$refs.modal.hide();
+			this.prestudent = prestudent;
+			if (!status_kurzbz && !studiensemester_kurzbz && !ausbildungssemester) {
+				this.statusNew = true;
+				this.statusId = prestudent.prestudent_id;
+				this.formData = {
+					status_kurzbz: 'Interessent',
+					studiensemester_kurzbz: this.defaultSemester,
+					ausbildungssemester: 1,
+					datum: new Date(),
+					bestaetigtam: new Date(),
+					bewerbung_abgeschicktamum: null,
+					studienplan_id: null,
+					anmerkung: null,
+					rt_stufe: null,
+					statusgrund_id: null
+				};
+				this.orig_datum = null;
+				this.$refs.form.clearValidation();
+				this.$refs.modal.show();
+			} else {
+				this.statusId = {
+					prestudent_id: prestudent.prestudent_id,
+					status_kurzbz,
+					studiensemester_kurzbz,
+					ausbildungssemester
+				};
+				this.$fhcApi
+					.post('api/frontend/v1/stv/status/loadStatus/', this.statusId)
+					.then(result => {
+						this.statusNew = false;
+						this.formData = result.data;
+						this.orig_datum = new Date(result.data.datum);
+						this.$refs.form.clearValidation();
+						this.$refs.modal.show();
+					})
+					.catch(this.$fhcAlert.handleSystemError);
+			}
+		},
+		insertStatus() {
+			this.$refs.form
+				.post(
+					'api/frontend/v1/stv/status/insertStatus/' + this.statusId,
+					this.formData
+				)
+				.then(result => {
+					this.$reloadList();
+					this.emit('saved');
+					this.$refs.modal.hide();
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		editStatus() {
+			this.$refs.form
+				.post(
+					'api/frontend/v1/stv/status/updateStatus/' + this.statusId.join('/'),
+					this.formData
+				)
+				.then(result => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+					this.$reloadList();
+					this.emit('saved');
+					this.$refs.modal.hide();
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		}
+	},
+	created() {
+		// TODO(chris): reload studienpläne on prestudent change
+		this.$fhcApi
+			.get('api/frontend/v1/stv/prestudent/getStudienplaene/' + this.prestudent.prestudent_id)
+			.then(result => result.data)
+			.then(result => {
+				this.listStudienplaene = result;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+		this.$fhcApi
+			.get('api/frontend/v1/stv/status/getStatusgruende/')
+			.then(result => result.data)
+			.then(result => {
+				this.listStatusgruende = result;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+	},
+	template: `
+	<bs-modal class="stv-status-modal" ref="modal">
+		<template #title>
+			TODO: {{ $p.t('lehre', statusNew ? 'status_new' : 'status_edit', prestudent) }}
+		</template>
+
+		<core-form ref="form">
+			
+			<form-validation></form-validation>
+			
+			<p v-if="bisLocked && !isStatusBeforeStudent">
+				<b>{{$p.t('bismeldestichtag', 'info_MeldestichtagStatusgrund')}}</b>
+			</p>
+			<p v-if="bisLocked && isStatusBeforeStudent">
+				<b>{{$p.t('bismeldestichtag', 'info_MeldestichtagStatusgrundSemester')}}</b>
+			</p>
+			
+			<form-input
+				container-class="mb-3"
+				type="select"
+				v-model="formData.status_kurzbz"
+				name="status_kurzbz"
+				:label="$p.t('lehre/status_rolle')"
+				required
+				:disabled="!statusNew"
+				>
+				<option value="Interessent">InteressentIn</option>
+				<option value="Bewerber">BewerberIn</option>
+				<option value="Aufgenommener">Aufgenommene/r</option>
+				<option value="Student">StudentIn</option>
+				<option value="Unterbrecher">UnterbrecherIn</option>
+				<option value="Diplomand">DiplomandIn</option>
+				<option value="Incoming">Incoming</option>
+				<option v-if="!statusNew" value="Absolvent">Absolvent</option>
+				<option v-if="!statusNew" value="Abbrecher">Abbrecher</option>
+				<option v-if="!statusNew" value="Abgewiesener">Abgewiesener</option>
+			</form-input>
+			<form-input
+				container-class="mb-3"
+				type="select"
+				v-model="formData.studiensemester_kurzbz"
+				name="studiensemester_kurzbz"
+				:label="$p.t('lehre/studiensemester')"
+				:disabled="bisLocked"
+				>
+				<option
+					v-for="sem in lists.studiensemester_desc"
+					:key="sem.studiensemester_kurzbz"
+					:value="sem.studiensemester_kurzbz"
+					>
+					{{ sem.studiensemester_kurzbz }}
+				</option>
+			</form-input>
+			<!-- TODO(manu) if(defined('VORRUECKUNG_STATUS_MAX_SEMESTER') && VORRUECKUNG_STATUS_MAX_SEMESTER==false) 100 Semester-->
+			<form-input
+				container-class="mb-3"
+				type="select"
+				v-model="formData.ausbildungssemester"
+				name="ausbildungssemester"
+				:label="$p.t('lehre/ausbildungssemester')"
+				:disabled="bisLocked && !isStatusBeforeStudent"
+				>
+				<option
+					v-for="number in maxSem"
+					:key="number"
+					:value="number"
+					>
+					{{ number }}
+				</option>
+			</form-input>
+			<form-input
+				container-class="mb-3"
+				type="DatePicker"
+				v-model="formData.datum"
+				name="datum"
+				:label="$p.t('global/datum')"
+				auto-apply
+				:enable-time-picker="false"
+				format="dd.MM.yyyy"
+				preview-format="dd.MM.yyyy"
+				:teleport="true"
+				:disabled="bisLocked"
+				>
+			</form-input>
+			<form-input
+				container-class="mb-3"
+				type="DatePicker"
+				v-model="formData.bestaetigtam"
+				name="bestaetigtam"
+				:label="$p.t('lehre/bestaetigt_am')"
+				auto-apply
+				:enable-time-picker="false"
+				format="dd.MM.yyyy"
+				preview-format="dd.MM.yyyy"
+				:teleport="true"
+				:disabled="bisLocked"
+				>
+			</form-input>
+			<form-input
+				container-class="mb-3"
+				type="DatePicker"
+				v-model="formData.bewerbung_abgeschicktamum"
+				name="bewerbung_abgeschicktamum"
+				:label="$p.t('lehre/bewerbung_abgeschickt_am')"
+				auto-apply
+				:enable-time-picker="false"
+				format="dd.MM.yyyy"
+				preview-format="dd.MM.yyyy"
+				:teleport="true"
+				:disabled="bisLocked || !hasPrestudentstatusPermission"
+				>
+			</form-input>
+			<form-input
+				container-class="mb-3"
+				type="select"
+				v-model="formData.studienplan_id"
+				name="studienplan_id"
+				:label="$p.t('lehre/studienplan')"
+				:disabled="bisLocked"
+				>
+				<option
+					v-for="sp in listStudienplaene"
+					:key="sp.studienplan_id"
+					:value="sp.studienplan_id"
+					>
+					{{ sp.bezeichnung }}
+				</option>
+			</form-input>
+			<form-input
+				container-class="mb-3"
+				type="text"
+				v-model="formData.anmerkung"
+				name="anmerkung"
+				:label="$p.t('global/anmerkung')"
+				:disabled="bisLocked"
+				>
+			</form-input>
+			<form-input
+				container-class="mb-3"
+				type="select"
+				v-model="formData.rt_stufe"
+				name="rt_stufe"
+				:label="$p.t('lehre/aufnahmestufe')"
+				:disabled="bisLocked"
+				>
+				<option :value="null">-- {{$p.t('fehlermonitoring', 'keineAuswahl')}} --</option>
+				<option v-for="entry in [1,2,3]" :key="entry" :value="entry">{{entry}}</option>
+			</form-input>
+			<form-input
+			 	v-if="gruende.length"
+			 	container-class="mb-3"
+				type="select"
+				v-model="formData.statusgrund_id"
+				name="statusgrund_id"
+				:label="$p.t('studierendenantrag/antrag_grund')"
+				>
+				<option :value="null">-- {{$p.t('fehlermonitoring', 'keineAuswahl')}} --</option>
+				<option
+					v-for="grund in gruende"
+					:key="grund.statusgrund_id"
+					:value="grund.statusgrund_id"
+					>
+					{{ grund.bezeichnung }}
+				</option>
+			</form-input>
+		
+		</core-form>
+		
+		<template #footer>
+		<button
+			type="button"
+			class="btn btn-primary"
+			@click="statusNew ? insertStatus() : editStatus()"
+			>
+			{{ $p.t('ui', 'ok') }}
+		</button>
+		</template>
+	</bs-modal>`
+};
\ No newline at end of file

From 60fc774ade523c461e6e6a717148d001316b2f33 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 25 Jul 2024 13:57:00 +0200
Subject: [PATCH 0995/1461] Multistatus cleanup

---
 .../Details/Prestudent/MultiStatus.js         | 300 +-----------------
 1 file changed, 9 insertions(+), 291 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index 0c1cb6e60..317b58878 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -1,17 +1,13 @@
 import {CoreFilterCmpt} from "../../../../filter/Filter.js";
 import BsModal from "../../../../Bootstrap/Modal.js";
-import FormForm from '../../../../Form/Form.js';
 import FormInput from '../../../../Form/Input.js';
-import FormValidation from '../../../../Form/Validation.js';
 import StatusModal from '../Status/Modal.js';
 
 export default{
 	components: {
 		CoreFilterCmpt,
 		BsModal,
-		FormForm,
 		FormInput,
-		FormValidation,
 		StatusModal
 	},
 	inject: {
@@ -22,54 +18,20 @@ export default{
 			from: 'hasPermissionToSkipStatusCheck',
 			default: false
 		},
-		hasPrestudentPermission: {
-			from: 'hasPrestudentPermission',
-			default: false
-		},
-		hasPrestudentstatusPermission: {
-			from: 'hasPrestudentstatusPermission',
-			default: false
-		},
-		hasAssistenzPermission: {
-			from: 'hasAssistenzPermission',
-			default: false
-		},
-		hasAdminPermission: {
-			from: 'hasAdminPermission',
-			default: false
-		},
-		hasAssistenzPermissionForStgs: {
-			from: 'hasAssistenzPermissionForStgs',
-			default: false
-		},
-		hasSchreibrechtAss: {
-			from: 'hasSchreibrechtAss',
-			default: false
-		},
-		hasPermissionRtAufsicht: {
-			from: 'hasPermissionRtAufsicht',
-			default: false
-		},
-		lists: {
-			from: 'lists'
-		},
 		$reloadList: {
 			from: '$reloadList',
 			required: true
 		}
 	},
 	computed: {
-		prestudentIds(){
+		prestudentIds() {
 			if (this.modelValue.prestudent_id)
 			{
 				return [this.modelValue.prestudent_id];
 			}
 			return this.modelValue.map(e => e.prestudent_id);
 		},
-		paramIds(){
-			return  Array.isArray(this.prestudentIds) ? this.prestudentIds.join(',') : this.prestudentIds;
-		},
-		updateData(){
+		updateData() {
 			const dataArray = [];
 			if (this.modelValue.prestudent_id) {
 				const newObj = {
@@ -98,22 +60,6 @@ export default{
 				return dataArray;
 			}
 		},
-		gruende() {
-			return this.listStatusgruende.filter(grund => grund.status_kurzbz == this.statusData.status_kurzbz);
-		},
-		arrayStg(){
-			let stgInteger = this.hasAssistenzPermissionForStgs.map(item => {
-				return parseInt(item);
-			});
-			return stgInteger;
-		},
-		hasPermissionCurrentStg(){
-			return this.arrayStg.includes(this.studiengang_kz);
-		},
-		isStatusBeforeStudent(){
-			let isStatusStudent = ['Student', 'Absolvent', 'Diplomand'];
-			return !isStatusStudent.includes(this.statusData.status_kurzbz);
-		},
 		showToolbarStudent() {
 			if (Array.isArray(this.modelValue)) {
 				if (!this.modelValue.length)
@@ -233,7 +179,6 @@ export default{
 		modelValue: Object,
 	},
 	data() {
-
 		return {
 			tabulatorOptions: {
 				ajaxURL: 'api/frontend/v1/stv/Status/getHistoryPrestudent/' + this.modelValue.prestudent_id,
@@ -384,16 +329,9 @@ export default{
 				}
 			],
 			statusData: {},
-			maxSem:  Array.from({ length: 11 }, (_, index) => index),
-			listStudienplaene: [],
-			aufnahmestufen: {1: 1, 2: 2, 3: 3},
-			listStatusgruende: [],
 			statusId: {},
-			gruendeLength: {},
 			dataMeldestichtag: null,
-			stichtag: {},
 			isLastStatus: {},
-			hasPermissionThisStg: {},
 			actionButton: {},
 			actionStatusText: {},
 			actionSem: null,
@@ -417,7 +355,7 @@ export default{
 			},
 			deep: true
 		},
-		modelValue(){
+		modelValue() {
 			if (this.$refs.table) {
 				if (this.$refs.table.tableBuilt)
 					this.$refs.table.tabulator.setData('api/frontend/v1/stv/Status/getHistoryPrestudent/' + this.modelValue.prestudent_id);
@@ -429,32 +367,9 @@ export default{
 	methods: {
 		actionNewStatus() {
 			this.$refs.test.open(this.modelValue);
-			/*this.statusNew = true;
-			this.resetModal();
-			this.statusData.status_kurzbz = 'Interessent';
-			this.statusData.studiensemester_kurzbz = this.defaultSemester;
-			this.statusData.ausbildungssemester = 1;
-			this.statusData.datum = this.getDefaultDate();
-			this.statusData.bestaetigtam = this.getDefaultDate();
-			this.statusData.name = this.modelValue.vorname + ' ' + this.modelValue.nachname;
-			this.$refs.statusData.clearValidation();
-			this.$refs.statusModal.show();*/
 		},
 		actionEditStatus(status, stdsem, ausbildungssemester) {
 			this.$refs.test.open(this.modelValue, status, stdsem, ausbildungssemester);
-			/*this.statusNew = false;
-			this.statusId = {
-				'prestudent_id': this.modelValue.prestudent_id,
-				'status_kurzbz': status,
-				'studiensemester_kurzbz': stdsem,
-				'ausbildungssemester': ausbildungssemester
-			};
-			this.loadStatus(this.statusId).then(() => {
-				if(this.statusData) {
-					this.$refs.statusData.clearValidation();
-					this.$refs.statusModal.show();
-				}
-			});*/
 		},
 		actionDeleteStatus(status, stdsem, ausbildungssemester){
 			this.statusId = {
@@ -742,24 +657,9 @@ export default{
 					else {
 						this.$reloadList();
 					}
-					this.hideModal('statusModal');
 					this.resetModal();
 				});
 		},
-		// Manually inserts a new Status with use of the statusModal
-		insertStatus() {
-			this.$refs.statusData
-				.post(
-					'api/frontend/v1/stv/status/insertStatus/' + this.modelValue.prestudent_id,
-					this.statusData
-				)
-				.then(result => {
-					this.reload();
-					this.$reloadList();
-					this.$refs.statusModal.hide();
-				})
-				.catch(this.$fhcAlert.handleSystemError);
-		},
 		changeStatus(prestudentIds){
 			this.resetChangeModals();
 			//Array.isArray(prestudentIds) ? this.modelValue.prestudent_id : [prestudentIds];
@@ -831,7 +731,6 @@ export default{
 					else {
 						this.$reloadList();
 					}
-					this.hideModal('statusModal');
 					this.resetModal();
 				});
 		},
@@ -881,25 +780,6 @@ export default{
 					this.$reloadList();
 				});
 		},
-		editStatus(){
-			return this.$fhcApi.post('api/frontend/v1/stv/status/updateStatus/' +
-				this.statusId.prestudent_id + '/' +
-				this.statusId.status_kurzbz + '/' +
-				this.statusId.studiensemester_kurzbz + '/' +
-				this.statusId.ausbildungssemester,
-				this.statusData)
-				.then(
-					result => {
-						this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
-						this.hideModal('statusModal');
-						this.resetModal();
-					})
-				.catch(this.$fhcAlert.handleSystemError)
-				.finally(() => {
-					window.scrollTo(0, 0);
-					this.reload();
-				});
-		},
 		checkIfLastStatus(){
 			return this.$fhcApi
 				.get('api/frontend/v1/stv/status/isLastStatus/' + this.modelValue.prestudent_id)
@@ -924,7 +804,7 @@ export default{
 					})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
-/*		checkIfBewerber(prestudentIds){
+		/*checkIfBewerber(prestudentIds){
 
 			if(!prestudentIds)
 				prestudentIds = [this.modelValue.prestudent_id];
@@ -965,7 +845,7 @@ export default{
 							this.$reloadList();
 						}
 
-/!*			return this.$fhcApi
+			/!*return this.$fhcApi
 				.get('api/frontend/v1/stv/status/hasStatusBewerber/' + prestudent_id)
 				.then(
 					result => {
@@ -986,14 +866,15 @@ export default{
 					})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
-		reload(){
-			this.$refs.table.reloadTable(); //bei multiactions not working
+		reload() {
+			if (this.$refs.table)
+				this.$refs.table.reloadTable();
 		},
 		hideModal(modalRef){
 			this.$refs[modalRef].hide();
 			this.statusNew = true;
 		},
-		resetModal(){
+		resetModal() {
 			this.statusData = {};
 			this.statusId = {};
 			this.actionButton = {};
@@ -1022,20 +903,6 @@ export default{
 		},
 	},
 	created(){
-		this.$fhcApi
-			.get('api/frontend/v1/stv/prestudent/getStudienplaene/' + encodeURIComponent(this.paramIds))
-			.then(result => result.data)
-			.then(result => {
-				this.listStudienplaene = result;
-			})
-			.catch(this.$fhcAlert.handleSystemError);
-		this.$fhcApi
-			.get('api/frontend/v1/stv/status/getStatusgruende/')
-			.then(result => result.data)
-			.then(result => {
-				this.listStatusgruende = result;
-			})
-			.catch(this.$fhcAlert.handleSystemError);
 		this.$fhcApi
 			.get('api/frontend/v1/stv/status/getLastBismeldestichtag/')
 			.then(result => {
@@ -1056,155 +923,6 @@ export default{
 		<div class="stv-list h-100 pt-3">
 			
 			<status-modal ref="test" :meldestichtag="new Date(dataMeldestichtag)" @saved="reload"></status-modal>
-			<!--Modal: statusModal-->
-			<bs-modal ref="statusModal">
-				<template #title>
-					{{ $p.t('lehre', statusNew ? 'status_new' : 'status_edit', modelValue) }}
-				</template>
-
-				<form-form ref="statusData">
-					<form-validation></form-validation>
-					<p v-if="statusData.datum < dataMeldestichtag && !isStatusBeforeStudent">
-						<b>{{$p.t('bismeldestichtag', 'info_MeldestichtagStatusgrund')}}</b>
-					</p>
-					<p v-if="statusData.datum < dataMeldestichtag && isStatusBeforeStudent">
-						<b>{{$p.t('bismeldestichtag', 'info_MeldestichtagStatusgrundSemester')}}</b>
-					</p>
-					<input type="hidden" id="statusId" name="statusId" value="statusData.statusId">
-					<form-input
-						container-class="mb-3"
-						required
-						v-model="statusData['status_kurzbz']"
-						name="status_kurzbz"
-						:label="$p.t('lehre/status_rolle')"
-						type="select"
-						:disabled="!statusNew"
-						>
-						<option  value="Interessent">InteressentIn</option>
-						<option  value="Bewerber">BewerberIn</option>
-						<option  value="Aufgenommener">Aufgenommene/r</option>
-						<option  value="Student">StudentIn</option>
-						<option  value="Unterbrecher">UnterbrecherIn</option>
-						<option  value="Diplomand">DiplomandIn</option>
-						<option  value="Incoming">Incoming</option>
-						<option v-if="!statusNew" value="Absolvent">Absolvent</option>
-						<option v-if="!statusNew" value="Abbrecher">Abbrecher</option>
-						<option v-if="!statusNew" value="Abgewiesener">Abgewiesener</option>
-					</form-input>
-					<form-input
-						container-class="mb-3"
-						type="select"
-						name="studiensemester_kurzbz"
-						:label="$p.t('lehre/studiensemester')"
-						v-model="statusData['studiensemester_kurzbz']"
-						:disabled="statusData.datum < dataMeldestichtag"
-						>
-						<option v-for="sem in lists.studiensemester_desc" :key="sem.studiensemester_kurzbz" :value="sem.studiensemester_kurzbz"  :selected="sem.studiensemester_kurzbz === defaultSemester">{{sem.studiensemester_kurzbz}}</option>
-					</form-input>
-					<!-- TODO(manu) if(defined('VORRUECKUNG_STATUS_MAX_SEMESTER') && VORRUECKUNG_STATUS_MAX_SEMESTER==false) 100 Semester-->
-					<form-input
-						container-class="mb-3"
-						type="select"
-						name="ausbildungssemester"
-						:label="$p.t('lehre/ausbildungssemester')"
-						v-model="statusData.ausbildungssemester"
-						:disabled="statusData.datum < dataMeldestichtag && !isStatusBeforeStudent"
-						>
-					 <option v-for="number in maxSem" :key="number" :value="number">{{ number }}</option>
-					</form-input>
-					<form-input
-						container-class="mb-3"
-						type="DatePicker"
-						name="datum"
-						:label="$p.t('global/datum')"
-						v-model="statusData.datum"
-						auto-apply
-						:enable-time-picker="false"
-						format="dd.MM.yyyy"
-						preview-format="dd.MM.yyyy"
-						:teleport="true"
-						:disabled="statusData.datum < dataMeldestichtag"
-						>
-					</form-input>
-					<form-input
-						container-class="mb-3"
-						type="DatePicker"
-						name="bestaetigtam"
-						:label="$p.t('lehre/bestaetigt_am')"
-						v-model="statusData.bestaetigtam"
-						auto-apply
-						:enable-time-picker="false"
-						format="dd.MM.yyyy"
-						preview-format="dd.MM.yyyy"
-						:teleport="true"
-						:disabled="statusData.datum < dataMeldestichtag"
-						>
-					</form-input>
-					<form-input
-						container-class="mb-3"
-						type="DatePicker"
-						name="bewerbung_abgeschicktamum"
-						:label="$p.t('lehre/bewerbung_abgeschickt_am')"
-						v-model="statusData['bewerbung_abgeschicktamum']"
-						auto-apply
-						:enable-time-picker="false"
-						format="dd.MM.yyyy"
-						preview-format="dd.MM.yyyy"
-						:teleport="true"
-						:disabled="statusData.datum < dataMeldestichtag || !hasPrestudentstatusPermission"
-						>
-					</form-input>
-					<form-input
-						container-class="mb-3"
-						type="select"
-						name="studienplan"
-						:label="$p.t('lehre/studienplan')"
-						v-model="statusData['studienplan_id']"
-						:disabled="statusData.datum < dataMeldestichtag"
-						>		
-						<option v-for="sp in listStudienplaene" :key="sp.studienplan_id" :value="sp.studienplan_id">{{sp.bezeichnung}}</option>
-					</form-input>
-					<form-input
-						container-class="mb-3"
-						type="text"
-						name="anmerkung"
-						:label="$p.t('global/anmerkung')"
-						v-model="statusData['anmerkung']"
-						:disabled="statusData.datum < dataMeldestichtag"
-						>						
-					</form-input>
-					<form-input
-						container-class="mb-3"
-						type="select"
-						name="aufnahmestufe"
-						:label="$p.t('lehre/aufnahmestufe')"
-						v-model="statusData['rt_stufe']"
-						:disabled="statusData.datum < dataMeldestichtag"
-						>
-						<option value="">-- {{$p.t('fehlermonitoring', 'keineAuswahl')}} --</option>
-						<option v-for="entry in aufnahmestufen" :key="entry" :value="entry">{{entry}}</option>
-					</form-input>
-									
-					<form-input
-					 	v-if="gruende.length > 0"
-					 	container-class="mb-3"
-						type="select"
-						name="statusgrund"
-						:label="$p.t('studierendenantrag/antrag_grund')"
-						v-model="statusData['statusgrund_id']"
-						>
-						<option value="">-- {{$p.t('fehlermonitoring', 'keineAuswahl')}} --</option>
-						<option v-for="grund in gruende" :key="grund.statusgrund_id" :value="grund.statusgrund_id">{{grund.bezeichnung}}</option>
-					</form-input>
-				
-				</form-form>
-				
-				<template #footer>
-					<button v-if="statusNew" type="button" class="btn btn-primary" @click="insertStatus">OK</button>
-					<button v-else type="button" class="btn btn-primary" @click="editStatus()">OK</button>
-				</template>
-								
-			</bs-modal>
 				
 			<!--Modal: Confirm Abbruch-->
 			<BsModal ref="confirmStatusAction">

From 3809e6f994cdcaaf863c08a763e56038b6de5a89 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 25 Jul 2024 14:50:40 +0200
Subject: [PATCH 0996/1461] =?UTF-8?q?MultiStatus=20Modal:=20+Wartender=20&?=
 =?UTF-8?q?=20SkipCheckPermissions=20&=20reload=20Studienpl=C3=A4ne=20on?=
 =?UTF-8?q?=20Student=20change?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Details/Status/Modal.js                   | 49 +++++++++++--------
 1 file changed, 29 insertions(+), 20 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js b/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js
index 5c9f5594c..963d4ab58 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js
@@ -14,6 +14,10 @@ export default{
 		defaultSemester: {
 			from: 'defaultSemester',
 		},
+		hasPermissionToSkipStatusCheck: {
+			from: 'hasPermissionToSkipStatusCheck',
+			default: false
+		},
 		hasPrestudentstatusPermission: {
 			from: 'hasPrestudentstatusPermission',
 			default: false
@@ -50,8 +54,7 @@ export default{
 	},
 	computed: {
 		bisLocked() {
-			// TODO(chris): special right
-			if (this.statusNew)
+			if (this.statusNew || this.hasPermissionToSkipStatusCheck)
 				return false;
 
 			if (!this.orig_datum || !this.meldestichtag)
@@ -70,7 +73,7 @@ export default{
 	methods: {
 		open(prestudent, status_kurzbz, studiensemester_kurzbz, ausbildungssemester) {
 			this.$refs.modal.hide();
-			this.prestudent = prestudent;
+			
 			if (!status_kurzbz && !studiensemester_kurzbz && !ausbildungssemester) {
 				this.statusNew = true;
 				this.statusId = prestudent.prestudent_id;
@@ -87,8 +90,11 @@ export default{
 					statusgrund_id: null
 				};
 				this.orig_datum = null;
-				this.$refs.form.clearValidation();
-				this.$refs.modal.show();
+				
+				this.loadStudienplaeneAndSetPrestudent(prestudent)
+					.then(this.$refs.form.clearValidation)
+					.then(this.$refs.modal.show)
+					.catch(this.$fhcAlert.handleSystemError);
 			} else {
 				this.statusId = {
 					prestudent_id: prestudent.prestudent_id,
@@ -96,15 +102,18 @@ export default{
 					studiensemester_kurzbz,
 					ausbildungssemester
 				};
+				
 				this.$fhcApi
 					.post('api/frontend/v1/stv/status/loadStatus/', this.statusId)
 					.then(result => {
 						this.statusNew = false;
 						this.formData = result.data;
 						this.orig_datum = new Date(result.data.datum);
-						this.$refs.form.clearValidation();
-						this.$refs.modal.show();
+						return prestudent;
 					})
+					.then(this.loadStudienplaeneAndSetPrestudent)
+					.then(this.$refs.form.clearValidation)
+					.then(this.$refs.modal.show)
 					.catch(this.$fhcAlert.handleSystemError);
 			}
 		},
@@ -134,29 +143,28 @@ export default{
 					this.$refs.modal.hide();
 				})
 				.catch(this.$fhcAlert.handleSystemError);
+		},
+		loadStudienplaeneAndSetPrestudent(prestudent) {
+			const old_id = this.prestudent.prestudent_id;
+			this.prestudent = prestudent;
+			if (old_id == prestudent.prestudent_id)
+				return Promise.resolve();
+			
+			return this.$fhcApi
+				.get('api/frontend/v1/stv/prestudent/getStudienplaene/' + prestudent.prestudent_id)
+				.then(result => this.listStudienplaene = result.data);
 		}
 	},
 	created() {
-		// TODO(chris): reload studienpläne on prestudent change
-		this.$fhcApi
-			.get('api/frontend/v1/stv/prestudent/getStudienplaene/' + this.prestudent.prestudent_id)
-			.then(result => result.data)
-			.then(result => {
-				this.listStudienplaene = result;
-			})
-			.catch(this.$fhcAlert.handleSystemError);
 		this.$fhcApi
 			.get('api/frontend/v1/stv/status/getStatusgruende/')
-			.then(result => result.data)
-			.then(result => {
-				this.listStatusgruende = result;
-			})
+			.then(result => this.listStatusgruende = result.data)
 			.catch(this.$fhcAlert.handleSystemError);
 	},
 	template: `
 	<bs-modal class="stv-status-modal" ref="modal">
 		<template #title>
-			TODO: {{ $p.t('lehre', statusNew ? 'status_new' : 'status_edit', prestudent) }}
+			{{ $p.t('lehre', statusNew ? 'status_new' : 'status_edit', prestudent) }}
 		</template>
 
 		<core-form ref="form">
@@ -189,6 +197,7 @@ export default{
 				<option v-if="!statusNew" value="Absolvent">Absolvent</option>
 				<option v-if="!statusNew" value="Abbrecher">Abbrecher</option>
 				<option v-if="!statusNew" value="Abgewiesener">Abgewiesener</option>
+				<option v-if="!statusNew" value="Wartender">Wartender</option>
 			</form-input>
 			<form-input
 				container-class="mb-3"

From 5ab9acfe897c4790e90c73e601a0243ba8894a32 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 25 Jul 2024 15:11:08 +0200
Subject: [PATCH 0997/1461] Dynamic Status List

---
 .../controllers/api/frontend/v1/stv/Lists.php | 26 +++++-
 .../Details/Status/Modal.js                   | 83 +++++++++++++------
 2 files changed, 82 insertions(+), 27 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Lists.php b/application/controllers/api/frontend/v1/stv/Lists.php
index eceaf8c8c..1a75cdb50 100644
--- a/application/controllers/api/frontend/v1/stv/Lists.php
+++ b/application/controllers/api/frontend/v1/stv/Lists.php
@@ -33,7 +33,8 @@ class Lists extends FHCAPI_Controller
 			'getSprachen' => self::PERM_LOGGED,
 			'getGeschlechter' => self::PERM_LOGGED,
 			'getAusbildungen' => self::PERM_LOGGED,
-			'getOrgforms' => self::PERM_LOGGED
+			'getOrgforms' => self::PERM_LOGGED,
+			'getStati' => self::PERM_LOGGED
 		]);
 	}
 
@@ -118,4 +119,27 @@ class Lists extends FHCAPI_Controller
 		
 		$this->terminateWithSuccess($data);
 	}
+
+	public function getStati()
+	{
+		$lang = getUserLanguage();
+		$this->load->model('crm/Status_model', 'StatusModel');
+
+		$this->StatusModel->addSelect('*');
+		$this->StatusModel->addSelect(
+			'bezeichnung_mehrsprachig[(
+				SELECT index
+				FROM public.tbl_sprache
+				WHERE sprache=' . $this->StatusModel->escape($lang) . '
+				LIMIT 1
+			)] AS bezeichnung',
+			false
+		);
+		#$this->StatusModel->addOrder('ext_id');
+
+		$result = $this->StatusModel->load();
+		$data = $this->getDataOrTerminateWithError($result);
+		
+		$this->terminateWithSuccess($data);
+	}
 }
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js b/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js
index 963d4ab58..167479ca5 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js
@@ -42,12 +42,22 @@ export default{
 	data() {
 		return {
 			prestudent: {},
-			orig_datum: null,
+			originalDatum: null,
 			statusNew: true,
 			statusId: {},
 			formData: {},
-			listStudienplaene: [],
-			listStatusgruende: [],
+			studienplaene: [],
+			statusgruende: [],
+			stati: [],
+			allowedNewStatus: [
+				'Interessent',
+				'Bewerber',
+				'Aufgenommener',
+				'Student',
+				'Unterbrecher',
+				'Diplomand',
+				'Incoming'
+			],
 			// TODO(chris): IMPLEMENT!
 			maxSem:  Array.from({ length: 11 }, (_, index) => index),
 		};
@@ -57,17 +67,26 @@ export default{
 			if (this.statusNew || this.hasPermissionToSkipStatusCheck)
 				return false;
 
-			if (!this.orig_datum || !this.meldestichtag)
+			if (!this.originalDatum || !this.meldestichtag)
 				return true;
 			
-			return this.orig_datum < this.meldestichtag;
+			return this.originalDatum < this.meldestichtag;
 		},
 		isStatusBeforeStudent() {
 			let isStatusStudent = ['Student', 'Absolvent', 'Diplomand'];
 			return !isStatusStudent.includes(this.formData.status_kurzbz);
 		},
+		allowedStati() {
+			if (!this.stati)
+				return [];
+			
+			if (this.statusNew)
+				return this.stati.filter(status => this.allowedNewStatus.includes(status.status_kurzbz));
+
+			return this.stati;
+		},
 		gruende() {
-			return this.listStatusgruende.filter(grund => grund.status_kurzbz == this.formData.status_kurzbz);
+			return this.statusgruende.filter(grund => grund.status_kurzbz == this.formData.status_kurzbz);
 		}
 	},
 	methods: {
@@ -89,7 +108,7 @@ export default{
 					rt_stufe: null,
 					statusgrund_id: null
 				};
-				this.orig_datum = null;
+				this.originalDatum = null;
 				
 				this.loadStudienplaeneAndSetPrestudent(prestudent)
 					.then(this.$refs.form.clearValidation)
@@ -108,7 +127,7 @@ export default{
 					.then(result => {
 						this.statusNew = false;
 						this.formData = result.data;
-						this.orig_datum = new Date(result.data.datum);
+						this.originalDatum = new Date(result.data.datum);
 						return prestudent;
 					})
 					.then(this.loadStudienplaeneAndSetPrestudent)
@@ -152,14 +171,31 @@ export default{
 			
 			return this.$fhcApi
 				.get('api/frontend/v1/stv/prestudent/getStudienplaene/' + prestudent.prestudent_id)
-				.then(result => this.listStudienplaene = result.data);
+				.then(result => this.studienplaene = result.data);
 		}
 	},
 	created() {
 		this.$fhcApi
-			.get('api/frontend/v1/stv/status/getStatusgruende/')
-			.then(result => this.listStatusgruende = result.data)
+			.get('api/frontend/v1/stv/status/getStatusgruende')
+			.then(result => this.statusgruende = result.data)
 			.catch(this.$fhcAlert.handleSystemError);
+		/*this.$fhcApi
+			.get('api/frontend/v1/stv/lists/getStati')
+			.then(result => this.stati = result.data)
+			.catch(this.$fhcAlert.handleSystemError);*/
+		this.stati = [
+			{ status_kurzbz: 'Interessent', bezeichnung: 'Interessent'},
+			{ status_kurzbz: 'Bewerber', bezeichnung: 'Bewerber'},
+			{ status_kurzbz: 'Aufgenommener', bezeichnung: 'Aufgenommener'},
+			{ status_kurzbz: 'Student', bezeichnung: 'Student'},
+			{ status_kurzbz: 'Unterbrecher', bezeichnung: 'Unterbrecher'},
+			{ status_kurzbz: 'Diplomand', bezeichnung: 'Diplomand'},
+			{ status_kurzbz: 'Incoming', bezeichnung: 'Incoming'},
+			{ status_kurzbz: 'Absolvent', bezeichnung: 'Absolvent'},
+			{ status_kurzbz: 'Abbrecher', bezeichnung: 'Abbrecher'},
+			{ status_kurzbz: 'Abgewiesener', bezeichnung: 'Abgewiesener'},
+			{ status_kurzbz: 'Wartender', bezeichnung: 'Wartender'}
+		];
 	},
 	template: `
 	<bs-modal class="stv-status-modal" ref="modal">
@@ -187,17 +223,12 @@ export default{
 				required
 				:disabled="!statusNew"
 				>
-				<option value="Interessent">InteressentIn</option>
-				<option value="Bewerber">BewerberIn</option>
-				<option value="Aufgenommener">Aufgenommene/r</option>
-				<option value="Student">StudentIn</option>
-				<option value="Unterbrecher">UnterbrecherIn</option>
-				<option value="Diplomand">DiplomandIn</option>
-				<option value="Incoming">Incoming</option>
-				<option v-if="!statusNew" value="Absolvent">Absolvent</option>
-				<option v-if="!statusNew" value="Abbrecher">Abbrecher</option>
-				<option v-if="!statusNew" value="Abgewiesener">Abgewiesener</option>
-				<option v-if="!statusNew" value="Wartender">Wartender</option>
+				<option
+					v-for="status in allowedStati"
+					:value="status.status_kurzbz"
+					>
+					{{ status.bezeichnung }}
+				</option>
 			</form-input>
 			<form-input
 				container-class="mb-3"
@@ -283,11 +314,11 @@ export default{
 				:disabled="bisLocked"
 				>
 				<option
-					v-for="sp in listStudienplaene"
-					:key="sp.studienplan_id"
-					:value="sp.studienplan_id"
+					v-for="plan in studienplaene"
+					:key="plan.studienplan_id"
+					:value="plan.studienplan_id"
 					>
-					{{ sp.bezeichnung }}
+					{{ plan.bezeichnung }}
 				</option>
 			</form-input>
 			<form-input

From e1b179a248121f242d20c7fef85fab867476d549 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 25 Jul 2024 15:12:59 +0200
Subject: [PATCH 0998/1461] More secure status list

---
 .../components/Stv/Studentenverwaltung/Details/Status/Modal.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js b/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js
index 167479ca5..ff6df4cc6 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js
@@ -83,7 +83,7 @@ export default{
 			if (this.statusNew)
 				return this.stati.filter(status => this.allowedNewStatus.includes(status.status_kurzbz));
 
-			return this.stati;
+			return this.stati.filter(status => this.statusId.status_kurzbz == status.status_kurzbz);
 		},
 		gruende() {
 			return this.statusgruende.filter(grund => grund.status_kurzbz == this.formData.status_kurzbz);

From ca6e3a84630e113878338559b997c5b1e5d39755 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 25 Jul 2024 15:16:01 +0200
Subject: [PATCH 0999/1461] adds endpoint to query all user ampeln that were
 assigned after the start_working_date with the appropriate beschreibungs
 translations

---
 .../controllers/api/frontend/v1/Ampeln.php    | 13 ++++
 application/models/content/Ampel_model.php    | 61 +++++++++++++++++++
 public/js/api/ampeln.js                       |  7 +++
 3 files changed, 81 insertions(+)

diff --git a/application/controllers/api/frontend/v1/Ampeln.php b/application/controllers/api/frontend/v1/Ampeln.php
index 62f061e82..23aa239a4 100644
--- a/application/controllers/api/frontend/v1/Ampeln.php
+++ b/application/controllers/api/frontend/v1/Ampeln.php
@@ -31,6 +31,7 @@ class Ampeln extends FHCAPI_Controller
             'getAllActiveAmpeln' => self::PERM_LOGGED,
             'getConfirmedActiveAmpeln' => self::PERM_LOGGED,
             'confirmAmpel' => self::PERM_LOGGED,
+            'alleAmpeln' => self::PERM_LOGGED,
             
 		]);
 
@@ -128,6 +129,18 @@ class Ampeln extends FHCAPI_Controller
 
         $this->terminateWithSuccess($userAmpeln);
 	}
+
+    public function alleAmpeln(){
+
+        $alle_ampeln = $this->AmpelModel->alleAmpeln($this->uid);
+
+        if(isError($alle_ampeln)) $this->terminateWithError(getError($alle_ampeln));
+
+        $alle_ampeln = $this->getDataOrTerminateWithError($alle_ampeln);
+
+        $this->terminateWithSuccess($alle_ampeln);
+
+    }
     
 
     
diff --git a/application/models/content/Ampel_model.php b/application/models/content/Ampel_model.php
index c4e32e21b..0bb500c55 100755
--- a/application/models/content/Ampel_model.php
+++ b/application/models/content/Ampel_model.php
@@ -104,4 +104,65 @@ class Ampel_model extends DB_Model
 		}
 		
 	}
+
+
+	function alleAmpeln($uid){
+
+		$datum = new datum();
+		$now = $datum->mktime_fromdate(date('Y-m-d'));
+
+		// start date of user
+		$benutzerStartDate = $this->execReadOnlyQuery("
+			SELECT insertamum FROM public.tbl_benutzer WHERE uid = ?", [$uid]);
+		$benutzerStartDate = $datum->mktime_fromdate(date(current(getData($benutzerStartDate))->insertamum));
+
+		// user language 
+		$userLanguage = getUserLanguage();
+		$this->load->model('system/Sprache_model','SpracheModel');
+		$this->SpracheModel->addSelect(["index"]);
+		$userLanguage = $this->SpracheModel->loadWhere(["sprache" => $userLanguage]);
+		//checking for error
+		if(isError($userLanguage)) return error(getError($userLanguage));
+		$userLanguage = getData($userLanguage)[0]->index - 1; // why does the index start at 1?
+
+		$zugeteile_ampeln = [];
+		
+		$allAmpeln = $this->execReadOnlyQuery("
+			SELECT * FROM 
+			public.tbl_ampel");
+		
+		if(isError($allAmpeln)) return error(getError($allAmpeln));
+
+		$allAmpeln = getData($allAmpeln);
+
+		foreach($allAmpeln as $ampel){
+			$zugeteilt = $this->execReadOnlyQuery("
+			SELECT 
+				CASE WHEN ? IN (?) 
+					THEN true 
+					ELSE false
+				END as zugeteilt	
+			", [$uid, $ampel->benutzer_select]);
+
+			if(isError($zugeteilt)) return error(getError($zugeteilt));
+			
+			if($zugeteilt 
+				// datum der Ampel liegt nicht vor der Vorlaufzeit
+				&& (isset($ampel->vorlaufzeit) && !($now < strtotime('-' .  $ampel->vorlaufzeit . ' day', $datum->mktime_fromdate($ampel->deadline)) ))
+				// verfallszeit nicht vor dem start Datum des Benutzers abgelaufen
+				&& isset($ampel->verfallszeit) && $benutzerStartDate < strtotime('+' . $ampel->verfallszeit . ' day', $datum->mktime_fromdate($ampel->deadline))
+
+				// verfallszeit ist abgelaufen
+				//&& $now > strtotime('+' . $ampel->verfallszeit . ' day', $ampel->deadline)
+				
+			){
+				$ampel->beschreibung = $ampel->beschreibung[$userLanguage];
+				$ampel->buttontext = $ampel->buttontext[$userLanguage];
+				$zugeteile_ampeln[] = $ampel;
+			}
+		}
+
+		return success($zugeteile_ampeln);
+	}
+
 }
diff --git a/public/js/api/ampeln.js b/public/js/api/ampeln.js
index 85cd08df2..248903415 100644
--- a/public/js/api/ampeln.js
+++ b/public/js/api/ampeln.js
@@ -23,4 +23,11 @@ export default {
         `/api/frontend/v1/Ampeln/confirmAmpel/${ampel_id}`,{});
     },
 
+    alleAmpeln: function () {
+        return this.$fhcApi.get(
+        FHC_JS_DATA_STORAGE_OBJECT.app_root +
+        FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+        `/api/frontend/v1/Ampeln/alleAmpeln`,{});
+    },
+
 }
\ No newline at end of file

From 0534ab4ac2f183b2779eee3b1fde1db23aa89b94 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 25 Jul 2024 15:51:30 +0200
Subject: [PATCH 1000/1461] =?UTF-8?q?corrected=20Studienpl=C3=A4ne=20Query?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/frontend/v1/stv/Prestudent.php        | 15 +++++-------
 .../models/organisation/Studienplan_model.php | 23 +++++++++----------
 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Prestudent.php b/application/controllers/api/frontend/v1/stv/Prestudent.php
index 8e9e0bf0b..635358808 100644
--- a/application/controllers/api/frontend/v1/stv/Prestudent.php
+++ b/application/controllers/api/frontend/v1/stv/Prestudent.php
@@ -264,18 +264,15 @@ class Prestudent extends FHCAPI_Controller
 		return $this->terminateWithSuccess(getData($result) ?: []);
 	}
 
-	public function getStudienplaene($prestudent_ids)
+	public function getStudienplaene($prestudent_id)
 	{
-		$prestudent_ids = urldecode($prestudent_ids);
-
+		if (!is_int($prestudent_id))
+			show_404();
 		$this->load->model('organisation/Studienplan_model', 'StudienplanModel');
-		$result = $this->StudienplanModel->getStudienplaeneByPrestudents($prestudent_ids);
+		$result = $this->StudienplanModel->getStudienplaeneByPrestudents($prestudent_id);
 
+		$data = $this->getDataOrTerminateWithError($result);
 
-		if (isError($result))
-		{
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-		return $this->terminateWithSuccess(getData($result) ?: []);
+		return $this->terminateWithSuccess($data);
 	}
 }
diff --git a/application/models/organisation/Studienplan_model.php b/application/models/organisation/Studienplan_model.php
index 3c6e0b2d2..e35ba52fb 100644
--- a/application/models/organisation/Studienplan_model.php
+++ b/application/models/organisation/Studienplan_model.php
@@ -120,19 +120,18 @@ class Studienplan_model extends DB_Model
 		]);
 	}
 
-	public function getStudienplaeneByPrestudents($prestudentIds)
+	public function getStudienplaeneByPrestudents($prestudent_id)
 	{
-		$prestudentIds = intVal($prestudentIds);
+		$this->addDistinct();
+		$this->addSelect($this->dbTable . '.*');
+		$this->addSelect('sem.start AS start_stsem');
+		$this->addJoin('lehre.tbl_studienordnung o', 'studienordnung_id');
+		$this->addJoin('public.tbl_prestudent p', 'studiengang_kz');
+		$this->addJoin('public.tbl_studiensemester sem', 'sem.studiensemester_kurzbz = o.gueltigvon', 'LEFT');
+		$this->addOrder('sem.start');
 
-		$query = "
-			SELECT so.studienordnung_id, sp.bezeichnung 
-			FROM public.tbl_prestudent ps
-			JOIN lehre.tbl_studienordnung so ON (ps.studiengang_kz = so.studiengang_kz)
-			JOIN lehre.tbl_studienplan sp ON (sp.studienordnung_id = so.studienordnung_id)
-			WHERE ps.prestudent_id IN (?)
-			ORDER BY so.studienordnung_id DESC
-		";
-
-		return $this->execQuery($query, array($prestudentIds));
+		return $this->loadWhere([
+			'prestudent_id' => $prestudent_id
+		]);
 	}
 }

From dec08f5eb1b3286813e0433e13898d71f90c8bf1 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 26 Jul 2024 09:17:26 +0200
Subject: [PATCH 1001/1461] Update/Cleanup ConfirmStatus Endpoint

---
 .../api/frontend/v1/stv/Status.php            | 127 ++++++++----------
 1 file changed, 57 insertions(+), 70 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index ef0806c4d..c56c8013f 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -24,7 +24,7 @@ class Status extends FHCAPI_Controller
 			'insertStatus' => ['admin:rw', 'assistenz:rw'],
 			'updateStatus' => ['admin:rw', 'assistenz:rw'],
 			'advanceStatus' => ['admin:r', 'assistenz:r'],
-			'confirmStatus' => ['admin:r', 'assistenz:r'],
+			'confirmStatus' => ['admin:rw', 'assistenz:rw'],
 
 		]);
 
@@ -37,7 +37,10 @@ class Status extends FHCAPI_Controller
 		$this->load->library('PrestudentstatusCheckLib');
 
 		// Additional Permission Checks
-		if ($this->router->method == 'insertStatus' || $this->router->method == 'updateStatus') {
+		if ($this->router->method == 'insertStatus'
+			|| $this->router->method == 'updateStatus'
+			|| $this->router->method == 'confirmStatus'
+		) {
 			$prestudent_id = current(array_slice($this->uri->rsegments, 2));
 			$this->checkPermissionsForPrestudent($prestudent_id, ['admin:rw', 'assistenz:rw']);
 		}
@@ -2111,85 +2114,69 @@ class Status extends FHCAPI_Controller
 		return $this->outputJsonSuccess(true);
 	}
 
-	public function confirmStatus($key_prestudent_id, $key_status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester)
+	/**
+	 * Confirms a status entry
+	 *
+	 * @param integer				$prestudent_id
+	 * @param string				$status_kurzbz
+	 * @param string				$key_studiensemester_kurzbz
+	 * @param integer				$key_ausbildungssemester
+	 *
+	 * @return void
+	 */
+	public function confirmStatus($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester)
 	{
-		$uid = getAuthUID();
-
-		//get Studiengang von prestudent_id
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-		$result = $this->PrestudentModel->load([
-			'prestudent_id'=> $key_prestudent_id,
+		$result = $this->PrestudentstatusModel->load([
+			$ausbildungssemester,
+			$studiensemester_kurzbz,
+			$status_kurzbz,
+			$prestudent_id
 		]);
-		if(isError($result))
-		{
-			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-		$result = current(getData($result));
+		$oldstatus = $this->getDataOrTerminateWithError($result);
+		if (!$oldstatus)
+			show_404(); // Status that should be updated does not exist
 
-		$stg = $result->studiengang_kz;
+		$oldstatus = current($oldstatus);
 
-		if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg))
-		{
-			return $this->terminateWithError($this->p->t('lehre','error_keineSchreibrechte'), self::ERROR_TYPE_GENERAL);
-		}
 
-		$result = $this->PrestudentstatusModel->loadWhere(
-			array(
-				'prestudent_id' => $key_prestudent_id,
-				'status_kurzbz' => $key_status_kurzbz,
-				'ausbildungssemester' => $key_ausbildungssemester,
-				'studiensemester_kurzbz' => $key_studiensemester_kurzbz
-			)
-		);
+		$authUID = getAuthUID();
+		$now = date('c');
 
-		if (isError($result))
-		{
-			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
+		//Form Validation
+		$this->load->library('form_validation');
 
-		elseif (!hasData($result))
-		{
-			return $this->terminateWithError($this->p->t('lehre','error_noStatusFound'), self::ERROR_TYPE_GENERAL);
-		}
+		$this->form_validation->set_rules('Status', '', [
+			['status_not_yet_confirmed', function () use ($oldstatus) {
+				return !$oldstatus->bestaetigtam;
+			}],
+			['bewerbung_abgeschickt', function () use ($oldstatus) {
+				return !!$oldstatus->bewerbung_abgeschicktamum;
+			}]
+		], [
+			'status_not_yet_confirmed' => $this->p->t('lehre', 'error_statusConfirmedYet'),
+			'bewerbung_abgeschickt' => $this->p->t('lehre', 'error_bewerbungNochNichtAbgeschickt')
+		]);
 
-		$statusData = current(getData($result));
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
 
-		//check if Status is unconfirmed..
-		if($statusData->bestaetigtam != null)
-		{
-			//return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			return $this->terminateWithError($this->p->t('lehre','error_statusConfirmedYet'), self::ERROR_TYPE_GENERAL);
-		}
 
-		//check if Bewerbung abgeschickt
-		if($statusData->bewerbung_abgeschicktamum == null)
-		{
-			return $this->terminateWithError($this->p->t('lehre','error_bewerbungNochNichtAbgeschickt'), self::ERROR_TYPE_GENERAL);
-		}
+		//update status
+		$result = $this->PrestudentstatusModel->update([
+			'prestudent_id' => $prestudent_id,
+			'status_kurzbz' => $status_kurzbz,
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'ausbildungssemester' => $ausbildungssemester,
+		], [
+			'bestaetigtam' => $now,
+			'bestaetigtvon' => $authUID,
+			'updateamum' => $now,
+			'updatevon' => $authUID
+		]);
 
-		$result = $this->PrestudentstatusModel->update(
-			[
-				'prestudent_id' => $key_prestudent_id,
-				'status_kurzbz' => $key_status_kurzbz,
-				'studiensemester_kurzbz' => $key_studiensemester_kurzbz,
-				'ausbildungssemester' => $key_ausbildungssemester,
-			],
-			[
-				'prestudent_id' => $key_prestudent_id,
-				'status_kurzbz' => $key_status_kurzbz,
-				'studiensemester_kurzbz' => $key_studiensemester_kurzbz,
-				'ausbildungssemester' => $key_ausbildungssemester,
-				'bestaetigtam' => date('c'),
-				'bestaetigtvon' => $uid,
-				'updateamum' => date('c'),
-				'updatevon' => $uid
-			]
-		);
-		if (isError($result))
-		{
-			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-		return $this->outputJsonSuccess(true);
+		$this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess(true);
 	}
 
 	/**

From d286c3784dd949b07942778f876ae85120d7f4bf Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 26 Jul 2024 09:47:15 +0200
Subject: [PATCH 1002/1461] Popup for Status Confirm

---
 .../Details/Prestudent/MultiStatus.js         | 40 +++++++------------
 system/phrasesupdate.php                      | 21 ++++++++++
 2 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index 317b58878..ebd7afb0f 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -1,5 +1,6 @@
 import {CoreFilterCmpt} from "../../../../filter/Filter.js";
 import BsModal from "../../../../Bootstrap/Modal.js";
+import BsConfirm from "../../../../Bootstrap/Confirm.js";
 import FormInput from '../../../../Form/Input.js';
 import StatusModal from '../Status/Modal.js';
 
@@ -407,17 +408,19 @@ export default{
 					this.advanceStatus(this.statusId);
 			});
 		},
-		actionConfirmStatus(status, stdsem, ausbildungssemester){
-			this.statusId = {
-				'prestudent_id': this.modelValue.prestudent_id,
-				'status_kurzbz': status,
-				'studiensemester_kurzbz': stdsem,
-				'ausbildungssemester': ausbildungssemester
-			};
-			this.loadStatus(this.statusId).then(() => {
-				if(this.statusData)
-					this.confirmStatus(this.statusId);
-			});
+		actionConfirmStatus(status, stdsem, ausbildungssemester) {
+			BsConfirm
+				.popup(this.$p.t('stv', 'status_confirm_popup'))
+				.then(() => this.$fhcApi.post(
+					'api/frontend/v1/stv/status/confirmStatus/' +
+					this.modelValue.prestudent_id + '/' +
+					status + '/' +
+					stdsem + '/' +
+					ausbildungssemester
+				))
+				.then(() => this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successConfirm')))
+				.then(this.reload)
+				.catch(this.$fhcAlert.handleSystemError);
 		},
 		actionConfirmDialogue(data, statusgrund, statusText){
 			this.actionButton = statusgrund;
@@ -750,21 +753,6 @@ export default{
 					this.reload();
 				});
 		},
-		confirmStatus(statusId){
-			return this.$fhcApi.post('api/frontend/v1/stv/status/confirmStatus/' +
-				this.statusId.prestudent_id + '/' +
-				this.statusId.status_kurzbz + '/' +
-				this.statusId.studiensemester_kurzbz + '/' +
-				this.statusId.ausbildungssemester)
-				.then(
-					result => {
-						this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successConfirm'));
-					})
-				.catch(this.$fhcAlert.handleSystemError)
-				.finally(() => {
-					this.reload();
-				});
-		},
 		deleteStatus(status_id){
 			return this.$fhcApi.post('api/frontend/v1/stv/status/deleteStatus/',
 				status_id)
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 8800b37f7..cdc277e62 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -29402,6 +29402,27 @@ array(
 			)
 		)
 	),
+	// status
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'status_confirm_popup',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Diesen Status bestaetigen?',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Confirm this status?',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 
 	//****************************	 FHC-Core-SAP
 	array(

From 916cecca734dcc413a40bec42c61a8696e7bee4c Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 26 Jul 2024 09:51:35 +0200
Subject: [PATCH 1003/1461] Disable Confirm Button if preconditions not met

---
 .../Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index ebd7afb0f..8257c3623 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -236,6 +236,8 @@ export default{
 							button.addEventListener('click', () =>
 								this.actionConfirmStatus(cell.getData().status_kurzbz, cell.getData().studiensemester_kurzbz, cell.getData().ausbildungssemester)
 							);
+							if (cell.getData().bestaetigtam || !cell.getData().bewerbung_abgeschicktamum)
+								button.disabled = true;
 							container.append(button);
 
 							button = document.createElement('button');

From 57e4f585fe649c2cdba0433d4888fe7f9f887dbb Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 26 Jul 2024 11:29:08 +0200
Subject: [PATCH 1004/1461] Bugfixes Status edit

---
 application/controllers/api/frontend/v1/stv/Prestudent.php  | 2 +-
 .../Stv/Studentenverwaltung/Details/Status/Modal.js         | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Prestudent.php b/application/controllers/api/frontend/v1/stv/Prestudent.php
index 635358808..c423a61b8 100644
--- a/application/controllers/api/frontend/v1/stv/Prestudent.php
+++ b/application/controllers/api/frontend/v1/stv/Prestudent.php
@@ -266,7 +266,7 @@ class Prestudent extends FHCAPI_Controller
 
 	public function getStudienplaene($prestudent_id)
 	{
-		if (!is_int($prestudent_id))
+		if (!is_int((int)$prestudent_id) || (int)$prestudent_id . '' != $prestudent_id)
 			show_404();
 		$this->load->model('organisation/Studienplan_model', 'StudienplanModel');
 		$result = $this->StudienplanModel->getStudienplaeneByPrestudents($prestudent_id);
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js b/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js
index ff6df4cc6..d97d15225 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js
@@ -144,7 +144,7 @@ export default{
 				)
 				.then(result => {
 					this.$reloadList();
-					this.emit('saved');
+					this.$emit('saved');
 					this.$refs.modal.hide();
 				})
 				.catch(this.$fhcAlert.handleSystemError);
@@ -152,13 +152,13 @@ export default{
 		editStatus() {
 			this.$refs.form
 				.post(
-					'api/frontend/v1/stv/status/updateStatus/' + this.statusId.join('/'),
+					'api/frontend/v1/stv/status/updateStatus/' + Object.values(this.statusId).join('/'),
 					this.formData
 				)
 				.then(result => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 					this.$reloadList();
-					this.emit('saved');
+					this.$emit('saved');
 					this.$refs.modal.hide();
 				})
 				.catch(this.$fhcAlert.handleSystemError);

From 32a20f478385d4224004414a031b0d83991a9c7b Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 26 Jul 2024 11:56:52 +0200
Subject: [PATCH 1005/1461] ChangeStatusLogic in component Dropdown

---
 .../api/frontend/v1/stv/Status.php            |   4 +-
 .../Details/Prestudent/MultiStatus.js         | 709 +----------------
 .../Details/Status/Dropdown.js                | 725 ++++++++++++++++++
 3 files changed, 765 insertions(+), 673 deletions(-)
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index c56c8013f..11db9f73d 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -402,7 +402,7 @@ class Status extends FHCAPI_Controller
 						$this->terminateWithSuccess($prestudent_id);
 				}
 				break;
-/*			case Prestudentstatus_model::STATUS_STUDENT:
+			case Prestudentstatus_model::STATUS_STUDENT:
 				{
 					$this->load->library('PrestudentLib');
 					$result = $this->prestudentlib->setStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id, $bestaetigtam, $bestaetigtvon);
@@ -415,7 +415,7 @@ class Status extends FHCAPI_Controller
 						$this->terminateWithSuccess($prestudent_id);
 
 				}
-				break;*/
+				break;
 			case Prestudentstatus_model::STATUS_DIPLOMAND:
 				{
 					$this->load->library('PrestudentLib');
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index 8257c3623..585dd2977 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -3,13 +3,15 @@ import BsModal from "../../../../Bootstrap/Modal.js";
 import BsConfirm from "../../../../Bootstrap/Confirm.js";
 import FormInput from '../../../../Form/Input.js';
 import StatusModal from '../Status/Modal.js';
+import StatusDropdown from '../Status/Dropdown.js';
 
 export default{
 	components: {
 		CoreFilterCmpt,
 		BsModal,
 		FormInput,
-		StatusModal
+		StatusModal,
+		StatusDropdown
 	},
 	inject: {
 		defaultSemester: {
@@ -79,101 +81,6 @@ export default{
 				return !this.modelValue.some(item => item.uid);
 			}
 			return !this.modelValue.uid;
-		},
-		toolbarInteressent() {
-			return this.listDataToolbar.filter(item => this.statiInteressent.includes(item.status_kurzbz));
-		},
-		toolbarStudent() {
-			return this.listDataToolbar.filter(item => this.statiStudent.includes(item.status_kurzbz));
-		},
-		sortedGruende() {
-			return this.listDataToolbar.reduce((result,current) => {
-				if (!result[current.status_kurzbz])
-					result[current.status_kurzbz] = [];
-				result[current.status_kurzbz].push(current);
-				return result;
-			}, {});
-		},
-		resultInteressentArray() {
-			const result = [];
-			this.statiInteressent.forEach(status => {
-				const defaultObject = {
-					status_kurzbz: status,
-					statusgrund_id: null,
-					link: `changeStatusTo${status}`,
-					children: []
-				};
-
-				if (status === "Student") {
-					defaultObject.link = 'changeInteressentToStudent';
-
-				}
-				result.push(defaultObject);
-				if(this.sortedGruende[status]) {
-					this.sortedGruende[status].forEach(item => {
-						const itemObject = {
-							status_kurzbz: item.status_kurzbz,
-							statusgrund_id: item.statusgrund_id,
-							beschreibung: item.beschreibung,
-							link: `changeStatusTo${item.status_kurzbz}(${item.statusgrund_id})`,
-						};
-
-						if (item.status_kurzbz === "Student") {
-							itemObject.link = `changeInteressentTo${item.status_kurzbz}(${item.statusgrund_id})`;
-						}
-						defaultObject.children.push(itemObject);
-					});
-					//push one item object if student is in the array
-					const hasStudentChild = defaultObject.children.some(child => child.status_kurzbz === "Student");
-
-					if (hasStudentChild) {
-						defaultObject.children.push({
-							status_kurzbz: 'Student',
-							statusgrund_id: null,
-							beschreibung: 'Student',
-							link: 'changeInteressentToStudent'
-						});
-					}
-				}
-			});
-			return result;
-		},
-		resultStudentArray() {
-			const result = [];
-			this.statiStudent.forEach(status => {
-				const defaultObject = {
-					status_kurzbz: status,
-					statusgrund_id: null,
-					link: `changeStatusTo${status}`,
-					dropEntry: null,
-					children: []
-				};
-				result.push(defaultObject);
-				if(this.sortedGruende[status]) {
-					this.sortedGruende[status].forEach(item => {
-							const itemObject = {
-								status_kurzbz: item.status_kurzbz,
-								statusgrund_id: item.statusgrund_id,
-								beschreibung: item.beschreibung,
-								link: `changeStatusTo${item.status_kurzbz}(${item.statusgrund_id})`,
-								dropEntry: `[${item.beschreibung}]`,
-							};
-						defaultObject.children.push(itemObject);
-					});
-				}
-				//push one item object if student is in the array
-				const hasStudentChild = defaultObject.children.some(child => child.status_kurzbz === "Student");
-
-				if (hasStudentChild) {
-					defaultObject.children.push({
-						status_kurzbz: 'Student',
-						statusgrund_id: null,
-						beschreibung: 'Student',
-						link: 'changeStatusToStudent'
-					});
-				}
-			});
-			return result;
 		}
 	},
 	props: {
@@ -335,20 +242,12 @@ export default{
 			statusId: {},
 			dataMeldestichtag: null,
 			isLastStatus: {},
-			actionButton: {},
-			actionStatusText: {},
-			actionSem: null,
-			newArray: {},
+			//newArray: {},
 			abbruchData: {},
 			newStatus: '',
 			statusNew: true,
 			isErsterStudent: false,
 			isBewerber: true,
-			listDataToolbar: [],
-			//TODO(Manu) get from config
-			statiInteressent: ["Bewerber", "Aufgenommener", "Student" , "Wartender", "Abgewiesener"],
-			statiStudent: ["Abbrecher", "Unterbrecher", "Student" , "Diplomand", "Absolvent"],
-			selectedStatus: 'default'
 		}
 	},
 	watch: {
@@ -424,321 +323,6 @@ export default{
 				.then(this.reload)
 				.catch(this.$fhcAlert.handleSystemError);
 		},
-		actionConfirmDialogue(data, statusgrund, statusText){
-			this.actionButton = statusgrund;
-			this.actionStatusText = statusText;
-			this.$refs.confirmStatusAction.show();
-		},
-		changeStatusToAbbrecher(statusgrund_id){
-			this.resetChangeModals();
-			let def_date = this.getDefaultDate();
-			let abbruchData =
-				{
-					status_kurzbz: 'Abbrecher',
-					datum: def_date,
-					bestaetigtam: def_date,
-					statusgrund_id: statusgrund_id
-				};
-			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...abbruchData }));
-
-			this.actionConfirmDialogue(this.updateData, 'studenten','Abbrecher');
-			//this.changeStatus(prestudentIds);
-		},
-		changeStatusToUnterbrecher(){
-			this.resetChangeModals();
-			let def_date = this.getDefaultDate();
-			let deltaData =
-				{
-					status_kurzbz: 'Unterbrecher',
-					datum: def_date,
-					bestaetigtam: def_date
-				};
-
-			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData }));
-			this.actionConfirmDialogue(this.updateData, 'studenten','Unterbrecher');
-		},
-		changeStatusToStudent(statusgrund_id){
-			this.resetChangeModals();
-			console.log("in function changeStatusToStudent: ", statusgrund_id);
-			let def_date = this.getDefaultDate();
-			//TODO Manu validation if Bewerber already before asking for ausbildungssemester
-			//this.checkIfBewerber();
-
-			this.actionButton = 'student';
-
-			if(statusgrund_id == 19){
-				this.actionStatusText = 'Pre-Abbrecher';
-			}
-			if(statusgrund_id == 15){
-				this.actionStatusText = 'Pre-Wiederholer';
-			}
-			if(statusgrund_id == 16){
-				this.actionStatusText = 'Wiederholer';
-			}
-			if(!statusgrund_id){
-				this.actionStatusText = 'Student';
-			}
-			let deltaData =
-				{
-					status_kurzbz: 'Student',
-					datum: def_date,
-					bestaetigtam: def_date,
-					statusgrund_id: statusgrund_id
-				};
-			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData}));
-
-			if(statusgrund_id == 16 || !statusgrund_id){
-				this.$refs.askForAusbildungssemester.show();
-			}
-			else
-			{
-				this.actionConfirmDialogue(this.updateData, this.actionButton, this.actionStatusText);
-			}
-		},
-		changeStatusToDiplomand(){
-			let def_date = this.getDefaultDate();
-			let deltaData =
-				{
-					status_kurzbz: 'Diplomand',
-					datum: def_date,
-					bestaetigtam: def_date,
-				};
-
-			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData}));
-			this.changeStatus(this.prestudentIds);
-		},
-		changeStatusToAbsolvent(){
-			let def_date = this.getDefaultDate();
-			let deltaData =
-				{
-					status_kurzbz: 'Absolvent',
-					datum: def_date,
-					bestaetigtam: def_date,
-				};
-
-			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData}));
-			this.changeStatus(this.prestudentIds);
-		},
-		saveNewAusbildungssemester(){
-			this.newArray = this.newArray.map(objekt => ({ ...objekt, ausbildungssemester: this.actionSem}));
-			this.changeStatus(this.prestudentIds);
-		},
-		changeStatusToBewerber(){
-			this.resetChangeModals();
-			let def_date = this.getDefaultDate();
-			let deltaData =
-				{
-					status_kurzbz: 'Bewerber',
-					datum: def_date,
-					bestaetigtam: def_date,
-					ausbildungssemester: 1
-				};
-
-			this.newArray = this.updateData.map(objekt => ({
-				...objekt,
-				...deltaData}));
-			this.changeStatus(this.prestudentIds);
-		},
-		changeStatusToAufgenommener(){
-			this.resetChangeModals();
-			let def_date = this.getDefaultDate();
-			let deltaData =
-				{
-					status_kurzbz: 'Aufgenommener',
-					datum: def_date,
-					bestaetigtam: def_date
-				};
-
-			this.newArray = this.updateData.map(objekt => ({
-				...objekt,
-				...deltaData,
-			}));
-
-			this.actionConfirmDialogue(this.updateData, 'aufgenommener','Aufgenommenen');
-
-		},
-		changeInteressentToStudent(statusgrund_id){
-			this.resetChangeModals();
-			//TODO(Manu) test statusgrund_id
-			console.log("in function changeInteressentToStudent mit statusgrund_id", statusgrund_id);
-			let def_date = this.getDefaultDate();
-			let deltaData =
-				{
-					status_kurzbz: 'Student',
-					datum: def_date,
-					bestaetigtam: def_date,
-					statusgrund_id: statusgrund_id
-				};
-
-			this.newArray = this.updateData.map(objekt => ({
-				...objekt,
-				...deltaData,
-			}));
-
-			this.addStudent(this.prestudentIds);
-
-		},
-		changeStatusToAbgewiesener(statusgrund_id){
-			this.resetChangeModals();
-			let def_date = this.getDefaultDate();
-			let deltaData =
-				{
-					status_kurzbz: 'Abgewiesener',
-					datum: def_date,
-					bestaetigtam: def_date,
-					statusgrund_id: statusgrund_id
-				};
-
-			this.newArray = this.updateData.map(objekt => ({
-				...objekt,
-				...deltaData,
-			}));
-
-			this.actionConfirmDialogue(this.updateData, 'abgewiesener','Abgewiesenen');
-		},
-		changeStatusToWartender(){
-			this.resetChangeModals();
-			let def_date = this.getDefaultDate();
-			let deltaData =
-				{
-					status_kurzbz: 'Wartender',
-					datum: def_date,
-					bestaetigtam: def_date
-				};
-			this.newArray = this.updateData.map(objekt => ({
-				...objekt,
-				...deltaData,
-			}));
-
-			this.actionConfirmDialogue(this.updateData, 'wartender','Wartenden');
-		},
-		addStudent(prestudentIds){
-			//this.hideModal('confirmStatusAction');
-			let changeData = {};
-
-			//for Feedback Sucess, Error
-			let countSuccess = 0;
-			let countError = 0;
-
-			if(!prestudentIds)
-				prestudentIds = [this.modelValue.prestudent_id];
-
-			const promises = prestudentIds.map(prestudentId => {
-
-				changeData = this.statusData.status_kurzbz ? this.statusData : this.newArray.find(item => item.prestudent_id === prestudentId);
-
-				return this.$fhcApi.post('api/frontend/v1/stv/status/addStudent/' + prestudentId,
-					changeData
-				).then(response => {
-					countSuccess++;
-					return response;
-				})
-					//.catch(this.$fhcAlert.handleSystemError)
-					.catch(error => {
-						countError++;
-						//For each Prestudent show Error in Alert
-						this.$fhcAlert.handleSystemError(error);
-					});
-			});
-
-			Promise
-				.allSettled(promises)
-				.then(values => {
-
-					this.newStatus = 'Student';
-
-					//Feedback Success als infoalert
-					if (countSuccess > 0) {
-						this.$fhcAlert.alertInfo(this.$p.t('ui', 'successNewStatus', {
-							'countSuccess': countSuccess,
-							'status': this.newStatus,
-							'countError': countError
-						}));
-					}
-
-					if (this.modelValue.prestudent_id) {
-						this.reload();
-					}
-					else {
-						this.$reloadList();
-					}
-					this.resetModal();
-				});
-		},
-		changeStatus(prestudentIds){
-			this.resetChangeModals();
-			//Array.isArray(prestudentIds) ? this.modelValue.prestudent_id : [prestudentIds];
-			let changeData = {};
-
-			//for Feedback Sucess, Error
-			let countSuccess = 0;
-			let countError = 0;
-
-			if(!prestudentIds)
-				prestudentIds = [this.modelValue.prestudent_id];
-
-			// Check if ausbildungssemester is already in this.newArray
-			const existingEntry = this.newArray.find(
-				(entry) => entry.ausbildungssemester === this.actionSem
-			);
-
-			// If the entry doesn't exist, add a new object with ausbildungssemester
-			if (!existingEntry) {
-				this.newArray.push({ ausbildungssemester: this.actionSem });
-			}
-
-			const promises = prestudentIds.map(prestudentId => {
-				//TODO(manu) besserer check
-				changeData = this.statusData.status_kurzbz ? this.statusData : this.newArray.find(item => item.prestudent_id === prestudentId);
-
-				return this.$fhcApi.post('api/frontend/v1/stv/status/changeStatus/' + prestudentId,
-					changeData
-				).then(response => {
-						countSuccess++;
-						return response;
-						})
-					//.catch(this.$fhcAlert.handleSystemError)
-					.catch(error => {
-						countError++;
-						//For each Prestudent show Error in Alert
-						this.$fhcAlert.handleSystemError(error);
-					});
-			});
-
-			Promise
-				.allSettled(promises)
-				.then(values => {
-/*					if (this.abbruchData.length < 1) {
-					}
-					else{*/
-					if(this.newArray.length > 0) {
-						this.newStatus = this.newArray[0].status_kurzbz;
-					}
-					else {
-						this.newStatus = this.statusData.status_kurzbz;
-					}
-				//	}
-
-					//Feedback Success als infoalert
-					 if (countSuccess > 0) {
-						 this.$fhcAlert.alertInfo(this.$p.t('ui', 'successNewStatus', {
-							 'countSuccess': countSuccess,
-							 'status': this.newStatus,
-							 'countError': countError
-						 }));
-					 }
-
-					 //TODO(Manu) bei status Interessent, Bewerber, aufgenommener, reload nicht working
-
-					if (this.modelValue.prestudent_id) {
-						this.reload();
-					}
-					else {
-						this.$reloadList();
-					}
-					this.resetModal();
-				});
-		},
 		advanceStatus(statusId){
 			return this.$fhcApi.post('api/frontend/v1/stv/status/advanceStatus/' +
 				this.statusId.prestudent_id + '/' +
@@ -784,16 +368,16 @@ export default{
 					})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
-		checkIfErsterStudent(prestudent_id){
-			return this.$fhcApi
-				.get('api/frontend/v1/stv/status/isErsterStudent/' + prestudent_id)
-				.then(
-					result => {
-						this.isErsterStudent = result.data.retval == 0 ? 1 : 0;
-						return result;
-					})
-				.catch(this.$fhcAlert.handleSystemError);
-		},
+		// checkIfErsterStudent(prestudent_id){
+		// 	return this.$fhcApi
+		// 		.get('api/frontend/v1/stv/status/isErsterStudent/' + prestudent_id)
+		// 		.then(
+		// 			result => {
+		// 				this.isErsterStudent = result.data.retval == 0 ? 1 : 0;
+		// 				return result;
+		// 			})
+		// 		.catch(this.$fhcAlert.handleSystemError);
+		// },
 		/*checkIfBewerber(prestudentIds){
 
 			if(!prestudentIds)
@@ -870,27 +454,7 @@ export default{
 			this.actionButton = {};
 			this.actionStatusText = {};
 			this.actionSem = null;
-		},
-		resetChangeModals(){
-			this.hideModal('confirmStatusAction');
-			this.hideModal('askForAusbildungssemester');
-		},
-		getDefaultDate() {
-			const today = new Date();
-			return today;
-		},
-		executeLink(link) {
-			// Split the link string to extract the function name and arguments
-			const match = link.match(/(\w+)\(([^)]*)\)/);
-			const functionName = match ? match[1] : link;
-			const args = match ? match[2].split(',').map(arg => arg.trim()) : [];
-			
-			if (typeof this[functionName] === 'function') {
-				this[functionName](...args);
-			} else {
-				console.error(`Method ${functionName} not found`);
-			}
-		},
+		}
 	},
 	created(){
 		this.$fhcApi
@@ -901,98 +465,12 @@ export default{
 					this.$refs.table.tabulator.redraw(true);
 			})
 			.catch(this.$fhcAlert.handleSystemError);
-		this.$fhcApi
-			.get('api/frontend/v1/stv/status/getStatusarray/')
-			.then(result => result.data)
-			.then(result => {
-				this.listDataToolbar = result;
-			})
-			.catch(this.$fhcAlert.handleSystemError);
 	},
 	template: `
 		<div class="stv-list h-100 pt-3">
 			
 			<status-modal ref="test" :meldestichtag="new Date(dataMeldestichtag)" @saved="reload"></status-modal>
 				
-			<!--Modal: Confirm Abbruch-->
-			<BsModal ref="confirmStatusAction">
-				<template #title>{{$p.t('lehre', 'status_edit', modelValue)}}</template>
-				<template #default>
-					<div v-if="prestudentIds.length == 1">
-						<p>Diese Person wirklich zum {{actionStatusText}} machen?</p>
-					</div>
-					<div v-else>
-						<p>Diese {{prestudentIds.length}} Personen wirklich zum {{actionStatusText}} machen?</p>
-					</div>
-					
-				</template>
-				<template #footer>
-<!--					<div v-if="actionButton=='abbrecherStgl'">
-						<button  ref="Close" type="button" class="btn btn-primary" @click="changeStatusToAbbrecher(17)">OK</button>
-					</div>
-					<div v-if="actionButton=='abbrecherStud'">
-						<button  ref="Close" type="button" class="btn btn-primary" @click="changeStatusToAbbrecher(18)">OK</button>
-					</div>
-					<div v-if="actionButton=='unterbrecher'">
-						<button  ref="Close" type="button" class="btn btn-primary" @click="changeStatusToUnterbrecher()">OK</button>
-					</div>
-					<div v-if="actionButton=='aufgenommener'">
-						<button  ref="Close" type="button" class="btn btn-primary" @click="changeStatus(prestudentIds)">OK</button>
-					</div>-->
-					
-<!--					<div v-if="actionButton=='student'">
-						<button  ref="Close" type="button" class="btn btn-primary" @click="changeInteressentToStudent(prestudentIds)">OK</button>
-					</div>
-					<div v-if="actionButton=='wartender'">
-						<button  ref="Close" type="button" class="btn btn-primary" @click="changeStatus(prestudentIds)">OK</button>
-					</div>
-					<div v-if="actionButton=='abgewiesener'">
-						<button  ref="Close" type="button" class="btn btn-primary" @click="changeStatus(prestudentIds)">OK</button>
-					</div>-->		
-					
-					<!--Action changeStatus-->
-					<div>
-						<button  ref="Close" type="button" class="btn btn-primary" @click="changeStatus(prestudentIds)">OK</button>
-					</div>				
-				</template>
-			</BsModal>
-								
-			<!--Modal: askForAusbildungssemester-->
-			<BsModal ref="askForAusbildungssemester">
-				<template #title>{{$p.t('lehre', 'status_edit')}}</template>
-				<template #default>
-				<div v-if="prestudentIds.length == 1">
-					<p>
-					{{$p.t('lehre', 'modal_askAusbildungssem', { status: actionStatusText })}}</p>
-				</div>
-				<div v-else>
-					<p>
-					{{$p.t('lehre', 'modal_askAusbildungssemPlural', { count: prestudentIds.length,
-					status: actionStatusText
-						})}}</p>
-				</div>
-				
-				<div class="row mb-3">
-					<label for="studiensemester" class="form-label col-sm-4">{{$p.t('lehre', 'studiensemester')}}</label>
-					<div class="col-sm-6">
-						<form-input
-							type="text"
-							name="studiensemester"
-							v-model="actionSem"
-							maxlength="2"
-						>				
-						</form-input>
-					</div>
-				</div>			
-				</template>
-				<template #footer>
-					<div>
-						<button  ref="Close" type="button" class="btn btn-primary" @click="saveNewAusbildungssemester()">OK</button>
-					</div>					
-				</template>
-			</BsModal>
-			
-				
 			<core-filter-cmpt
 				v-if="!this.modelValue.length"
 				ref="table"
@@ -1008,147 +486,36 @@ export default{
 				
 				<template #actions="{updateData2}">
 					<!-- SingleSelectButton-->
-					<div class="btn-group">						
-						<button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" data-bs-auto-close="outside" aria-expanded="false">
-							{{$p.t('lehre', 'btn_statusAendern')}}
-						</button>
-															
-						    <ul v-if="showToolbarInteressent" class="dropdown-menu">
-							  <li v-for="item in resultInteressentArray" :key="item.status_kurzbz" class="w-100">
-
-								<div v-if="item.children.length > 0" class="btn-group dropend w-100">
-								  <a
-									class="dropdown-item dropdown-toggle"
-									data-bs-toggle="dropdown"
-									aria-expanded="false"
-									href="#"
-								  >
-									{{ item.status_kurzbz }}
-								  </a>
-								  <ul class="dropdown-menu dropdown-menu-right">
-									<li v-for="child in item.children" :key="child.statusgrund_id">
-									  <a class="dropdown-item" @click="executeLink(child.link)">{{ child.beschreibung }}</a>
-									</li>
-								  </ul>
-								</div>
-						
-								<div v-else>
-								  <a
-									class="dropdown-item"
-									@click="executeLink(item.link)"
-								  >
-									{{ item.status_kurzbz }}
-								  </a>
-								</div>
-							  </li>
-							</ul>	
-					
-							<!--toolbar Student-->
-							<ul v-if="showToolbarStudent" class="dropdown-menu">
-							  <li v-for="item in resultStudentArray" :key="item.status_kurzbz" class="w-100">
-
-								<div v-if="item.children.length > 0" class="btn-group dropend w-100">
-								  <a
-									class="dropdown-item dropdown-toggle"
-									data-bs-toggle="dropdown"
-									aria-expanded="false"
-									href="#"
-								  >
-									{{ item.status_kurzbz }}
-								  </a>
-								  <ul class="dropdown-menu dropdown-menu-right">
-									<li v-for="child in item.children" :key="child.statusgrund_id">
-									  <a class="dropdown-item" @click="executeLink(child.link)">{{ child.beschreibung }}</a>
-									</li>
-								  </ul>
-								</div>
-						
-								<div v-else>
-								  <a
-									class="dropdown-item"
-									@click="executeLink(item.link)"
-								  >
-									{{ item.status_kurzbz }}
-								  </a>
-								</div>
-							  </li>
-							</ul>	
-					</div>
-				</template>
+					<status-dropdown 
+						ref="statusDropdown"
+						:showToolbar="showToolbar"
+						:showToolbarStudent="showToolbarStudent"
+						:showToolbarInteressent="showToolbarInteressent"
+						:prestudentIds="prestudentIds"
+						:updateData="updateData"
+						@reload-table="reload"
+					>		
+					</status-dropdown>		
+				</template>	
 
 			</core-filter-cmpt>
-			
+
 			<div 
 				v-if="this.modelValue.length"
 				ref="buttonsStatusMulti"
 			>	
-			<!--MultiSelectButton-->
-			<div v-if="showToolbar"  class="btn-group">						
-				<button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" data-bs-auto-close="outside" aria-expanded="false">
-					{{$p.t('lehre', 'btn_statusAendern')}}
-				</button>
-													
-					<ul v-if="showToolbarInteressent" class="dropdown-menu">
-					  <li v-for="item in resultInteressentArray" :key="item.status_kurzbz" class="w-100">
-
-						<div v-if="item.children.length > 0" class="btn-group dropend w-100">
-						  <a
-							class="dropdown-item dropdown-toggle"
-							data-bs-toggle="dropdown"
-							aria-expanded="false"
-							href="#"
-						  >
-							{{ item.status_kurzbz }}
-						  </a>
-						  <ul class="dropdown-menu dropdown-menu-right">
-							<li v-for="child in item.children" :key="child.statusgrund_id">
-							  <a class="dropdown-item" @click="executeLink(child.link)">{{ child.beschreibung }}</a>
-							</li>
-						  </ul>
-						</div>
+					<!--MultiSelectButton-->
+					<status-dropdown 
+						ref="statusDropdown"
+						:showToolbar="showToolbar"
+						:showToolbarStudent="showToolbarStudent"
+						:showToolbarInteressent="showToolbarInteressent"
+						:prestudentIds="prestudentIds"
+						:updateData="updateData"
+						@reload-table="reload"
+					>		
+					</status-dropdown>	
 				
-						<div v-else>
-						  <a
-							class="dropdown-item"
-							@click="executeLink(item.link)"
-						  >
-							{{ item.status_kurzbz }}
-						  </a>
-						</div>
-					  </li>
-					</ul>	
-							
-				<!--toolbar Student-->
-					<ul v-if="showToolbarStudent" class="dropdown-menu">
-					  <li v-for="item in resultStudentArray" :key="item.status_kurzbz" class="w-100">
-
-						<div v-if="item.children.length > 0" class="btn-group dropend w-100">
-						  <a
-							class="dropdown-item dropdown-toggle"
-							data-bs-toggle="dropdown"
-							aria-expanded="false"
-							href="#"
-						  >
-							{{ item.status_kurzbz }}
-						  </a>
-						  <ul class="dropdown-menu dropdown-menu-right">
-							<li v-for="child in item.children" :key="child.statusgrund_id">
-							  <a class="dropdown-item" @click="executeLink(child.link)">{{ child.beschreibung }}</a>
-							</li>
-						  </ul>
-						</div>
-				
-						<div v-else>
-						  <a
-							class="dropdown-item"
-							@click="executeLink(item.link)"
-						  >
-							{{ item.status_kurzbz }}
-						  </a>
-						</div>
-					  </li>
-					</ul>
-			</div>			
 	 	</div>	
 	</div>`
 };
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js b/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js
new file mode 100644
index 000000000..a6d120b60
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js
@@ -0,0 +1,725 @@
+import BsModal from "../../../../Bootstrap/Modal.js";
+import CoreForm from '../../../../Form/Form.js';
+import FormValidation from '../../../../Form/Validation.js';
+import FormInput from '../../../../Form/Input.js';
+
+export default {
+	components: {
+		BsModal,
+		CoreForm,
+		FormValidation,
+		FormInput
+	},
+	inject: {
+		$reloadList: {
+			from: '$reloadList',
+			required: true
+		}
+	},
+	props: {
+		showToolbar: {
+			type: Boolean,
+			required: true
+		},
+		showToolbarStudent: {
+			type: Boolean,
+			required: true
+		},
+		showToolbarInteressent: {
+			type: Boolean,
+			required: true
+		},
+		prestudentIds: {
+			type: Array,
+			required: true,
+			default: () => []
+		},
+		updateData: {
+			type: Array,
+			required: true,
+			default: () => []
+		}
+	},
+	data() {
+		return {
+			listDataToolbar: [],
+			//TODO(Manu) get from config
+			statiInteressent: ["Bewerber", "Aufgenommener", "Student" , "Wartender", "Abgewiesener"],
+			statiStudent: ["Abbrecher", "Unterbrecher", "Student" , "Diplomand", "Absolvent"],
+			selectedStatus: 'default',
+			actionButton: {},
+			actionStatusText: {},
+			actionSem: null
+		};
+	},
+	computed: {
+		toolbarInteressent() {
+			return this.listDataToolbar.filter(item => this.statiInteressent.includes(item.status_kurzbz));
+		},
+		toolbarStudent() {
+			return this.listDataToolbar.filter(item => this.statiStudent.includes(item.status_kurzbz));
+		},
+		sortedGruende() {
+			return this.listDataToolbar.reduce((result,current) => {
+				if (!result[current.status_kurzbz])
+					result[current.status_kurzbz] = [];
+				result[current.status_kurzbz].push(current);
+				return result;
+			}, {});
+		},
+		resultInteressentArray() {
+			const result = [];
+			this.statiInteressent.forEach(status => {
+				const defaultObject = {
+					status_kurzbz: status,
+					statusgrund_id: null,
+					link: `changeStatusTo${status}`,
+					children: []
+				};
+
+				if (status === "Student") {
+					defaultObject.link = 'changeInteressentToStudent';
+
+				}
+				result.push(defaultObject);
+				if(this.sortedGruende[status]) {
+					this.sortedGruende[status].forEach(item => {
+						const itemObject = {
+							status_kurzbz: item.status_kurzbz,
+							statusgrund_id: item.statusgrund_id,
+							beschreibung: item.beschreibung,
+							link: `changeStatusTo${item.status_kurzbz}(${item.statusgrund_id})`,
+						};
+
+						if (item.status_kurzbz === "Student") {
+							itemObject.link = `changeInteressentTo${item.status_kurzbz}(${item.statusgrund_id})`;
+						}
+						defaultObject.children.push(itemObject);
+					});
+					//push one item object if student is in the array
+					const hasStudentChild = defaultObject.children.some(child => child.status_kurzbz === "Student");
+
+					if (hasStudentChild) {
+						defaultObject.children.push({
+							status_kurzbz: 'Student',
+							statusgrund_id: null,
+							beschreibung: 'Student',
+							link: 'changeInteressentToStudent'
+						});
+					}
+				}
+			});
+			return result;
+		},
+		resultStudentArray() {
+			const result = [];
+			this.statiStudent.forEach(status => {
+				const defaultObject = {
+					status_kurzbz: status,
+					statusgrund_id: null,
+					link: `changeStatusTo${status}`,
+					dropEntry: null,
+					children: []
+				};
+				result.push(defaultObject);
+				if(this.sortedGruende[status]) {
+					this.sortedGruende[status].forEach(item => {
+						const itemObject = {
+							status_kurzbz: item.status_kurzbz,
+							statusgrund_id: item.statusgrund_id,
+							beschreibung: item.beschreibung,
+							link: `changeStatusTo${item.status_kurzbz}(${item.statusgrund_id})`,
+							dropEntry: `[${item.beschreibung}]`,
+						};
+						defaultObject.children.push(itemObject);
+					});
+				}
+				//push one item object if student is in the array
+				const hasStudentChild = defaultObject.children.some(child => child.status_kurzbz === "Student");
+
+				if (hasStudentChild) {
+					defaultObject.children.push({
+						status_kurzbz: 'Student',
+						statusgrund_id: null,
+						beschreibung: 'Student',
+						link: 'changeStatusToStudent'
+					});
+				}
+			});
+			return result;
+		},
+		gruende() {
+			return this.listStatusgruende.filter(grund => grund.status_kurzbz == this.formData.status_kurzbz);
+		}
+	},
+	methods: {
+		executeLink(link) {
+			// Split the link string to extract the function name and arguments
+			const match = link.match(/(\w+)\(([^)]*)\)/);
+			const functionName = match ? match[1] : link;
+			const args = match ? match[2].split(',').map(arg => arg.trim()) : [];
+
+			if (typeof this[functionName] === 'function') {
+				this[functionName](...args);
+			} else {
+				console.error(`Method ${functionName} not found`);
+			}
+		},
+		actionConfirmDialogue(data, statusgrund, statusText){
+			this.actionButton = statusgrund;
+			this.actionStatusText = statusText;
+			this.$refs.confirmStatusAction.show();
+		},
+		addStudent(prestudentIds){
+			console.log("function addStudent ");
+			//this.hideModal('confirmStatusAction');
+			let changeData = {};
+
+			//for Feedback Sucess, Error
+			let countSuccess = 0;
+			let countError = 0;
+
+			//if(!prestudentIds)
+			//	prestudentIds = [this.modelValue.prestudent_id];
+
+			const promises = prestudentIds.map(prestudentId => {
+
+				changeData = this.newArray.find(item => item.prestudent_id === prestudentId);
+
+				//changeData = this.statusData.status_kurzbz ? this.statusData : this.newArray.find(item => item.prestudent_id === prestudentId);
+
+				return this.$fhcApi.post('api/frontend/v1/stv/status/addStudent/' + prestudentId,
+					changeData
+				).then(response => {
+					countSuccess++;
+					return response;
+				})
+					//.catch(this.$fhcAlert.handleSystemError)
+					.catch(error => {
+						countError++;
+						//For each Prestudent show Error in Alert
+						this.$fhcAlert.handleSystemError(error);
+					});
+			});
+
+			Promise
+				.allSettled(promises)
+				.then(values => {
+
+					this.newStatus = 'Student';
+
+					//Feedback Success als infoalert
+					if (countSuccess > 0) {
+						this.$fhcAlert.alertInfo(this.$p.t('ui', 'successNewStatus', {
+							'countSuccess': countSuccess,
+							'status': this.newStatus,
+							'countError': countError
+						}));
+					}
+
+					if(this.prestudentIds.length == 1){
+						this.reload();
+						this.$reloadList();
+					}
+					else {
+						this.$reloadList();
+					}
+					this.resetModal();
+				});
+		},
+		changeStatusToAbbrecher(statusgrund_id){
+			this.resetChangeModals();
+			let def_date = this.getDefaultDate();
+			let abbruchData =
+				{
+					status_kurzbz: 'Abbrecher',
+					datum: def_date,
+					bestaetigtam: def_date,
+					statusgrund_id: statusgrund_id
+				};
+			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...abbruchData }));
+
+			this.actionConfirmDialogue(this.updateData, 'studenten','Abbrecher');
+			//this.changeStatus(prestudentIds);
+		},
+		changeStatusToUnterbrecher(){
+			this.resetChangeModals();
+			let def_date = this.getDefaultDate();
+			let deltaData =
+				{
+					status_kurzbz: 'Unterbrecher',
+					datum: def_date,
+					bestaetigtam: def_date
+				};
+
+			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData }));
+			this.actionConfirmDialogue(this.updateData, 'studenten','Unterbrecher');
+		},
+		changeStatusToStudent(statusgrund_id){
+			this.resetChangeModals();
+			let def_date = this.getDefaultDate();
+			//TODO Manu validation if Bewerber already before asking for ausbildungssemester
+			//this.checkIfBewerber();
+
+			this.actionButton = 'student';
+
+			if(statusgrund_id == 19){
+				this.actionStatusText = 'Pre-Abbrecher';
+			}
+			if(statusgrund_id == 15){
+				this.actionStatusText = 'Pre-Wiederholer';
+			}
+			if(statusgrund_id == 16){
+				this.actionStatusText = 'Wiederholer';
+			}
+			if(!statusgrund_id){
+				this.actionStatusText = 'Student';
+			}
+			let deltaData =
+				{
+					status_kurzbz: 'Student',
+					datum: def_date,
+					bestaetigtam: def_date,
+					statusgrund_id: statusgrund_id
+				};
+			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData}));
+
+			if(statusgrund_id == 16 || !statusgrund_id){
+				this.$refs.askForAusbildungssemester.show();
+			}
+			else
+			{
+				this.actionConfirmDialogue(this.updateData, this.actionButton, this.actionStatusText);
+			}
+		},
+		changeStatusToDiplomand(){
+			let def_date = this.getDefaultDate();
+			let deltaData =
+				{
+					status_kurzbz: 'Diplomand',
+					datum: def_date,
+					bestaetigtam: def_date,
+				};
+
+			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData}));
+			this.changeStatus(this.prestudentIds);
+		},
+		changeStatusToAbsolvent(){
+			let def_date = this.getDefaultDate();
+			let deltaData =
+				{
+					status_kurzbz: 'Absolvent',
+					datum: def_date,
+					bestaetigtam: def_date,
+				};
+
+			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData}));
+			this.changeStatus(this.prestudentIds);
+		},
+		changeStatusToBewerber(){
+			this.resetChangeModals();
+			let def_date = this.getDefaultDate();
+			let deltaData =
+				{
+					status_kurzbz: 'Bewerber',
+					datum: def_date,
+					bestaetigtam: def_date,
+					ausbildungssemester: 1
+				};
+
+			this.newArray = this.updateData.map(objekt => ({
+				...objekt,
+				...deltaData}));
+			this.changeStatus(this.prestudentIds);
+		},
+		changeStatusToAufgenommener(){
+			this.resetChangeModals();
+			let def_date = this.getDefaultDate();
+			let deltaData =
+				{
+					status_kurzbz: 'Aufgenommener',
+					datum: def_date,
+					bestaetigtam: def_date
+				};
+
+			this.newArray = this.updateData.map(objekt => ({
+				...objekt,
+				...deltaData,
+			}));
+
+			this.actionConfirmDialogue(this.updateData, 'aufgenommener','Aufgenommenen');
+
+		},
+		changeInteressentToStudent(statusgrund_id){
+			this.resetChangeModals();
+			//TODO(Manu) test statusgrund_id
+			console.log("in function changeInteressentToStudent mit statusgrund_id", statusgrund_id);
+			let def_date = this.getDefaultDate();
+			let deltaData =
+				{
+					status_kurzbz: 'Student',
+					datum: def_date,
+					bestaetigtam: def_date,
+					statusgrund_id: statusgrund_id
+				};
+
+			this.newArray = this.updateData.map(objekt => ({
+				...objekt,
+				...deltaData,
+			}));
+
+			this.addStudent(this.prestudentIds);
+
+		},
+		changeStatusToAbgewiesener(statusgrund_id){
+			this.resetChangeModals();
+			let def_date = this.getDefaultDate();
+			let deltaData =
+				{
+					status_kurzbz: 'Abgewiesener',
+					datum: def_date,
+					bestaetigtam: def_date,
+					statusgrund_id: statusgrund_id
+				};
+
+			this.newArray = this.updateData.map(objekt => ({
+				...objekt,
+				...deltaData,
+			}));
+
+			this.actionConfirmDialogue(this.updateData, 'abgewiesener','Abgewiesenen');
+		},
+		changeStatusToWartender(){
+			this.resetChangeModals();
+			let def_date = this.getDefaultDate();
+			let deltaData =
+				{
+					status_kurzbz: 'Wartender',
+					datum: def_date,
+					bestaetigtam: def_date
+				};
+			this.newArray = this.updateData.map(objekt => ({
+				...objekt,
+				...deltaData,
+			}));
+
+			this.actionConfirmDialogue(this.updateData, 'wartender','Wartenden');
+		},
+		changeStatus(prestudentIds){
+			console.log("function changeStatus ");
+			this.resetChangeModals();
+			//Array.isArray(prestudentIds) ? this.modelValue.prestudent_id : [prestudentIds];
+			let changeData = {};
+
+			//for Feedback Sucess, Error
+			let countSuccess = 0;
+			let countError = 0;
+
+			// Check if ausbildungssemester is already in this.newArray
+			const existingEntry = this.newArray.find(
+				(entry) => entry.ausbildungssemester === this.actionSem
+			);
+
+			// If the entry doesn't exist, add a new object with ausbildungssemester
+			if (!existingEntry) {
+				this.newArray.push({ ausbildungssemester: this.actionSem });
+			}
+
+			console.log("ausbildungssem: " + this.actionSem);
+
+			const promises = prestudentIds.map(prestudentId => {
+
+				changeData = this.newArray.find(item => item.prestudent_id === prestudentId);
+
+				return this.$fhcApi.post('api/frontend/v1/stv/status/changeStatus/' + prestudentId,
+					changeData
+				).then(response => {
+					countSuccess++;
+					return response;
+				})
+					//.catch(this.$fhcAlert.handleSystemError)
+					.catch(error => {
+						countError++;
+						//For each Prestudent show Error in Alert
+						this.$fhcAlert.handleSystemError(error);
+					});
+			});
+
+			Promise
+				.allSettled(promises)
+				.then(values => {
+					/*					if (this.abbruchData.length < 1) {
+										}
+										else{*/
+					if(this.newArray.length > 0) {
+						this.newStatus = this.newArray[0].status_kurzbz;
+					}
+					else {
+						this.newStatus = this.statusData.status_kurzbz;
+					}
+					//	}
+
+					//Feedback Success als infoalert
+					if (countSuccess > 0) {
+						this.$fhcAlert.alertInfo(this.$p.t('ui', 'successNewStatus', {
+							'countSuccess': countSuccess,
+							'status': this.newStatus,
+							'countError': countError
+						}));
+					}
+
+					//TODO(Manu) bei status Interessent, Bewerber, aufgenommener, reload nicht working
+
+					if(this.prestudentIds.length == 1){
+						this.reload();
+
+						//necessary to see new status in List
+						this.$reloadList();
+						//to change ToolbarInteressent to ToolbarStudent
+
+
+					}
+					else {
+						this.$reloadList();
+					}
+					this.resetModal();
+				});
+		},
+		checkIfErsterStudent(prestudent_id){
+			return this.$fhcApi
+				.get('api/frontend/v1/stv/status/isErsterStudent/' + prestudent_id)
+				.then(
+					result => {
+						this.isErsterStudent = result.data.retval == 0 ? 1 : 0;
+						return result;
+					})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		/*checkIfBewerber(prestudentIds){
+
+			if(!prestudentIds)
+				prestudentIds = [this.modelValue.prestudent_id];
+
+			const promises = prestudentIds.map(prestudentId => {
+
+				return this.$fhcApi.post('api/frontend/v1/stv/status/hasStatusBewerber/' + prestudentId,
+				).then(response => {
+					countSuccess++;
+					return response;
+				})
+					//.catch(this.$fhcAlert.handleSystemError)
+					.catch(error => {
+						countError++;
+						//For each Prestudent show Error in Alert
+						this.$fhcAlert.handleSystemError(error);
+					});
+			});
+
+			Promise
+				.allSettled(promises)
+				.then(values => {
+
+						//Feedback Success als infoalert
+						if (countSuccess > 0) {
+							this.$fhcAlert.alertInfo(this.$p.t('ui', 'successNewStatus', {
+								'countSuccess': countSuccess,
+								'status': this.newStatus,
+								'countError': countError
+							}));
+						}
+
+						if (this.modelValue.prestudent_id) {
+							this.reload();
+							//TODO(manu) reload Detailtab after Abbrecher to see current status activ, verband and gruppe
+						}
+						else {
+							this.$reloadList();
+						}
+
+			/!*return this.$fhcApi
+				.get('api/frontend/v1/stv/status/hasStatusBewerber/' + prestudent_id)
+				.then(
+					result => {
+						this.isBewerber = result.data;
+						console.log(result);
+						return result;
+					})
+				.catch(this.$fhcAlert.handleSystemError);*!/
+			//}
+		},*/
+		getDefaultDate() {
+			const today = new Date();
+			return today;
+		},
+		hideModal(modalRef){
+			this.$refs[modalRef].hide();
+			this.statusNew = true;
+		},
+		reload() {
+			this.$emit('reload-table');
+		},
+		reloadList() {
+			this.$emit('reload-list');
+		},
+		resetChangeModals(){
+			this.hideModal('confirmStatusAction');
+			this.hideModal('askForAusbildungssemester');
+		},
+		resetModal() {
+			this.statusData = {};
+			this.statusId = {};
+			this.actionButton = {};
+			this.actionStatusText = {};
+			this.actionSem = null;
+		},
+		saveNewAusbildungssemester(){
+			this.newArray = this.newArray.map(objekt => ({ ...objekt, ausbildungssemester: this.actionSem}));
+			console.log("ausbildungssem" + this.actionSem);
+			this.changeStatus(this.prestudentIds);
+		},
+
+	},
+	created() {
+		this.$fhcApi
+			.get('api/frontend/v1/stv/status/getStatusarray/')
+			.then(result => result.data)
+			.then(result => {
+				this.listDataToolbar = result;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+		//TODO(manu) check if necessary
+		this.$fhcApi
+			.get('api/frontend/v1/stv/status/getStatusgruende/')
+			.then(result => result.data)
+			.then(result => {
+				this.listStatusgruende = result;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+	},
+	template: `
+		<div class="stv-status-dropdown">
+			
+			<!--Modal: ConfirmStatusAction-->
+			<BsModal ref="confirmStatusAction">
+				<template #title>{{$p.t('lehre', 'status_edit')}}</template>
+				<template #default>
+					<div v-if="prestudentIds.length == 1">
+						<p>Diese Person wirklich zum {{actionStatusText}} machen?</p>
+					</div>
+					<div v-else>
+						<p>Diese {{prestudentIds.length}} Personen wirklich zum {{actionStatusText}} machen?</p>
+					</div>
+					
+				</template>
+				<template #footer>	
+					<!--Action changeStatus-->
+					<div>
+						<button  ref="Close" type="button" class="btn btn-primary" @click="changeStatus(prestudentIds)">OK</button>
+					</div>				
+				</template>
+			</BsModal>
+								
+			<!--Modal: askForAusbildungssemester-->
+			<BsModal ref="askForAusbildungssemester">
+				<template #title>{{$p.t('lehre', 'status_edit')}}</template>
+				<template #default>
+				<div v-if="prestudentIds.length == 1">
+					<p>
+					{{$p.t('lehre', 'modal_askAusbildungssem', { status: actionStatusText })}}</p>
+				</div>
+				<div v-else>
+					<p>
+					{{$p.t('lehre', 'modal_askAusbildungssemPlural', { count: prestudentIds.length,
+					status: actionStatusText
+						})}}</p>
+				</div>
+				
+				<div class="row mb-3">
+					<label for="studiensemester" class="form-label col-sm-4">{{$p.t('lehre', 'studiensemester')}}</label>
+					<div class="col-sm-6">
+						<form-input
+							type="text"
+							name="studiensemester"
+							v-model="actionSem"
+							maxlength="2"
+						>				
+						</form-input>
+					</div>
+				</div>			
+				</template>
+				<template #footer>
+					<div>
+						<button  ref="Close" type="button" class="btn btn-primary" @click="saveNewAusbildungssemester()">OK</button>
+					</div>					
+				</template>
+			</BsModal>
+		
+			<!-- Dropdown -->
+			<div v-if="showToolbar"  class="btn-group">						
+				<button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" data-bs-auto-close="outside" aria-expanded="false">
+					{{$p.t('lehre', 'btn_statusAendern')}}
+				</button>
+						
+				<ul  v-if="showToolbarInteressent" class="dropdown-menu">
+				  <li v-for="item in resultInteressentArray" :key="item.status_kurzbz" class="w-100">
+
+					<div v-if="item.children.length > 0" class="btn-group dropend w-100">
+					  <a
+						class="dropdown-item dropdown-toggle"
+						data-bs-toggle="dropdown"
+						aria-expanded="false"
+						href="#"
+					  >
+						{{ item.status_kurzbz }}
+					  </a>
+					  <ul class="dropdown-menu dropdown-menu-right">
+						<li v-for="child in item.children" :key="child.statusgrund_id">
+						  <a class="dropdown-item" @click="executeLink(child.link)">{{ child.beschreibung }}</a>
+						</li>
+					  </ul>
+					</div>
+			
+					<div v-else>
+					  <a
+						class="dropdown-item"
+						@click="executeLink(item.link)"
+					  >
+						{{ item.status_kurzbz }}
+					  </a>
+					</div>
+				  </li>
+				</ul>	
+						
+			<!--toolbar Student-->
+				<ul v-if="showToolbarStudent" class="dropdown-menu">
+				  <li v-for="item in resultStudentArray" :key="item.status_kurzbz" class="w-100">
+
+					<div v-if="item.children.length > 0" class="btn-group dropend w-100">
+					  <a
+						class="dropdown-item dropdown-toggle"
+						data-bs-toggle="dropdown"
+						aria-expanded="false"
+						href="#"
+					  >
+						{{ item.status_kurzbz }}
+					  </a>
+					  <ul class="dropdown-menu dropdown-menu-right">
+						<li v-for="child in item.children" :key="child.statusgrund_id">
+						  <a class="dropdown-item" @click="executeLink(child.link)">{{ child.beschreibung }}</a>
+						</li>
+					  </ul>
+					</div>
+			
+					<div v-else>
+					  <a
+						class="dropdown-item"
+						@click="executeLink(item.link)"
+					  >
+						{{ item.status_kurzbz }}
+					  </a>
+					</div>
+				  </li>
+				</ul>
+			</div>
+		</div> `
+};
\ No newline at end of file

From d4db49e09e36e33072c0799c0d25c09e3ca0cc71 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 26 Jul 2024 12:04:20 +0200
Subject: [PATCH 1006/1461] Status->isLastStatus corrected

---
 .../api/frontend/v1/stv/Status.php            | 15 ++---
 .../models/crm/Prestudentstatus_model.php     | 64 +++++++++----------
 2 files changed, 34 insertions(+), 45 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 11db9f73d..158ad8a22 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -85,15 +85,8 @@ class Status extends FHCAPI_Controller
 	{
 		$result = $this->PrestudentstatusModel->checkIfLastStatusEntry($prestudent_id);
 
+		$result = $this->getDataOrTerminateWithError($result);
 
-		if (isError($result))
-		{
-			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-		if($result->retval == "1")
-		{
-			$this->terminateWithError($this->p->t('lehre','error_lastRole'), self::ERROR_TYPE_GENERAL);
-		}
 		return $this->terminateWithSuccess($result);
 	}
 
@@ -963,7 +956,7 @@ class Status extends FHCAPI_Controller
 		{
 			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
-		if($result->retval == "1")
+		if($result->retval)
 		{
 			//Berechtigungen nach Check prüfen!
 			if(!$isBerechtigtAdmin && !$isBerechtigtNoStudstatusCheck)
@@ -1098,13 +1091,13 @@ class Status extends FHCAPI_Controller
 		$logId = $result->retval;
 
 		//Delete Studentlehrverband if no Status left
-		$result = $this->PrestudentstatusModel->checkIfLastStatusEntry($prestudent_id, true);
+		$result = $this->PrestudentstatusModel->checkIfLastStudentStatusEntry($prestudent_id);
 
 		if (isError($result))
 		{
 			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 		}
-		if ($result->retval == "1")
+		if ($result->retval)
 		{
 			//get student_uid
 			$this->load->model('crm/Student_model', 'StudentModel');
diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php
index bb88c0f8c..f99a8e73f 100644
--- a/application/models/crm/Prestudentstatus_model.php
+++ b/application/models/crm/Prestudentstatus_model.php
@@ -484,48 +484,44 @@ class Prestudentstatus_model extends DB_Model
 
 	/**
 	 * Check if there is only one prestudentstatus left
-	 * @param integer $prestudent_id
-	 * @return success("1") if last prestudentstatusentry, else success("0")
+	 *
+	 * @param integer					$prestudent_id
+	 *
+	 * @return stdClass
 	 */
-	public function checkIfLastStatusEntry($prestudent_id, $isStudent=false )
+	public function checkIfLastStatusEntry($prestudent_id)
 	{
-		$qry = "SELECT
-					COUNT(*) as anzahl
-				FROM
-				    public.tbl_prestudentstatus
-				WHERE
-					prestudent_id = ?
-				";
+		$this->addSelect('COUNT(*) AS anzahl', false);
 
-		if($isStudent)
-		{
-			$qry .= "AND status_kurzbz = 'Student'";
-		}
-
-		$result = $this->execQuery($qry, array($prestudent_id));
+		$result = $this->loadWhere([
+			'prestudent_id' => $prestudent_id
+		]);
 
 		if (isError($result))
-		{
-			return error($result);
-		}
+			return $result;
 
-		$resultObject = current(getData($result));
+		$resultObject = current($result->retval);
 
-		if (property_exists($resultObject, 'anzahl'))
-		{
-			$anzahl = (int) $resultObject->anzahl;
-			if ($anzahl <= 1 )
-			{
-				return success("1", $this->p->t('lehre','error_lastRole'));
-			}
-			else
-				return success("0",  $this->p->t('lehre','anzahl_existingRoles', ['anzahl' => $anzahl]));
+		$anzahl = (int)$resultObject->anzahl;
 
-		}
-		else
-		{
-			return error($result);
-		}
+		if ($anzahl <= 1)
+			return success(true, $this->p->t('lehre', 'error_lastRole'));
+
+		return success(false, $this->p->t('lehre', 'anzahl_existingRoles', ['anzahl' => $anzahl]));
+	}
+
+	/**
+	 * Check if there is only one "Student" prestudentstatus left
+	 *
+	 * @param integer					$prestudent_id
+	 *
+	 * @return stdClass
+	 */
+	public function checkIfLastStudentStatusEntry($prestudent_id)
+	{
+		$this->db->where('status_kurzbz', self::STATUS_STUDENT);
+		
+		return $this->checkIfLastStatusEntry($prestudent_id);
 	}
 
 	public function getAllPrestudentstatiWithStudiensemester($prestudent_id)

From fb30a8e009599a73e8970ff7440510ec027bd0c4 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 26 Jul 2024 14:07:56 +0200
Subject: [PATCH 1007/1461] translates the ampel queries in separate private
 function

---
 .../controllers/api/frontend/v1/Ampeln.php    | 71 +++++++++++++++----
 application/models/content/Ampel_model.php    | 15 +---
 2 files changed, 61 insertions(+), 25 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Ampeln.php b/application/controllers/api/frontend/v1/Ampeln.php
index 23aa239a4..21fa83c4d 100644
--- a/application/controllers/api/frontend/v1/Ampeln.php
+++ b/application/controllers/api/frontend/v1/Ampeln.php
@@ -37,6 +37,7 @@ class Ampeln extends FHCAPI_Controller
 
 
 		$this->load->model('content/Ampel_model', 'AmpelModel');
+        $this->load->model('system/Sprache_model','SpracheModel');
 
 
 		//? put the uid and pid inside the controller for reusability
@@ -49,7 +50,7 @@ class Ampeln extends FHCAPI_Controller
 	// Public methods
 
     /**
-	 * function that queries all the ampeln that are addressed to the user uid
+	 * confirms ampel and inserts ampelID in public.tbl_ampel_benutzer_bestaetigt
      * @access public
 	 * 
 	 */
@@ -71,32 +72,40 @@ class Ampeln extends FHCAPI_Controller
     }
 	
     /**
-	 * function that queries all the ampeln that are addressed to the user uid
+	 * queries active and not confirmed ampeln by the user 
      * @access public
 	 * 
 	 */
 	public function getNonConfirmedActiveAmpeln()
 	{
+
         $userAmpeln = array();
-        $ampel_result = $this->AmpelModel->active();
 
-        $ampel_result = $this->getDataOrTerminateWithError($ampel_result);
+        // fetch active ampeln
+        $activeAmpeln = $this->AmpelModel->active();
 
-        foreach($ampel_result as $ampel){
+        $activeAmpeln = $this->getDataOrTerminateWithError($activeAmpeln);
+
+        foreach($activeAmpeln as $ampel){
             
+            // check if ampel is confirmed by user
             $confirmedByUser = $this->AmpelModel->isConfirmed($ampel->ampel_id,$this->uid);
             $ampel->bestaetigt = $confirmedByUser;
+
+            // only include non confirmed active ampeln in the result
             if(!$confirmedByUser){
                 $userUID_array = $this->AmpelModel->execBenutzerSelect($ampel->benutzer_select);
                 $userUID_array = $this->getDataOrTerminateWithError($userUID_array);
+
+                // check if user is assigned to the ampel
                 foreach($userUID_array as $user_obj){
-                    
+                    // property is called uid for students and mitarbeiter_uid for employees
                     $user_uid = property_exists($user_obj,"uid") ? $user_obj->uid : $user_obj->mitarbeiter_uid;
-                    if($user_uid === $this->uid){
-                        $userAmpeln[] = $ampel;
-                    }
-                }
                     
+                    if($user_uid === $this->uid){
+                        $userAmpeln[] = $this->translateAmpel($ampel);
+                    }
+                } 
             }
             
         }
@@ -104,6 +113,11 @@ class Ampeln extends FHCAPI_Controller
         $this->terminateWithSuccess($userAmpeln);
 	}
 
+    /**
+	 * queries active ampeln by the user 
+     * @access public
+	 * 
+	 */
     public function getAllActiveAmpeln()
 	{
         $userAmpeln = array();
@@ -121,27 +135,60 @@ class Ampeln extends FHCAPI_Controller
                 
                 $user_uid = property_exists($user_obj,"uid") ? $user_obj->uid : $user_obj->mitarbeiter_uid;
                 if($user_uid === $this->uid){
-                    $userAmpeln[] = $ampel;
+                    $userAmpeln[] = $this->translateAmpel($ampel);
                 }
             }
-            
         }
 
         $this->terminateWithSuccess($userAmpeln);
 	}
 
+    /**
+	 * queries all ampeln that were assigned to the user until start of first work day
+     * @access public
+	 * 
+	 */
     public function alleAmpeln(){
 
+        //fetch all ampeln
         $alle_ampeln = $this->AmpelModel->alleAmpeln($this->uid);
 
         if(isError($alle_ampeln)) $this->terminateWithError(getError($alle_ampeln));
 
         $alle_ampeln = $this->getDataOrTerminateWithError($alle_ampeln);
 
+        // translate ampeln
+        array_map(function($ampel){ return $this->translateAmpel($ampel);}, $alle_ampeln);
+
         $this->terminateWithSuccess($alle_ampeln);
 
     }
+
+    //------------------------------------------------------------------------------------------------------------------
+	// Private methods
     
+    /**
+	 * translate ampel description and button text
+     * @access private
+	 * 
+	 */
+    public function translateAmpel($ampel){
+
+        // fetch user language 
+        $userLanguage = getUserLanguage();
+        
+        $userLanguage = $this->SpracheModel->loadWhere(["sprache" => $userLanguage]);
+        
+        if(isError($userLanguage)) $this->terminateWithError(getError($userLanguage));
+        $userLanguage = $this->getDataOrTerminateWithError($userLanguage)[0]->index - 1; // why does the index start at 1?
+
+        // translate the ampel description and button text
+        $ampel->beschreibung = $ampel->beschreibung[$userLanguage];
+        $ampel->buttontext = $ampel->buttontext[$userLanguage];
+
+        return $ampel;
+
+    }
 
     
 }
diff --git a/application/models/content/Ampel_model.php b/application/models/content/Ampel_model.php
index 0bb500c55..136d4b38d 100755
--- a/application/models/content/Ampel_model.php
+++ b/application/models/content/Ampel_model.php
@@ -108,6 +108,8 @@ class Ampel_model extends DB_Model
 
 	function alleAmpeln($uid){
 
+		$zugeteile_ampeln = [];
+		
 		$datum = new datum();
 		$now = $datum->mktime_fromdate(date('Y-m-d'));
 
@@ -116,17 +118,6 @@ class Ampel_model extends DB_Model
 			SELECT insertamum FROM public.tbl_benutzer WHERE uid = ?", [$uid]);
 		$benutzerStartDate = $datum->mktime_fromdate(date(current(getData($benutzerStartDate))->insertamum));
 
-		// user language 
-		$userLanguage = getUserLanguage();
-		$this->load->model('system/Sprache_model','SpracheModel');
-		$this->SpracheModel->addSelect(["index"]);
-		$userLanguage = $this->SpracheModel->loadWhere(["sprache" => $userLanguage]);
-		//checking for error
-		if(isError($userLanguage)) return error(getError($userLanguage));
-		$userLanguage = getData($userLanguage)[0]->index - 1; // why does the index start at 1?
-
-		$zugeteile_ampeln = [];
-		
 		$allAmpeln = $this->execReadOnlyQuery("
 			SELECT * FROM 
 			public.tbl_ampel");
@@ -156,8 +147,6 @@ class Ampel_model extends DB_Model
 				//&& $now > strtotime('+' . $ampel->verfallszeit . ' day', $ampel->deadline)
 				
 			){
-				$ampel->beschreibung = $ampel->beschreibung[$userLanguage];
-				$ampel->buttontext = $ampel->buttontext[$userLanguage];
 				$zugeteile_ampeln[] = $ampel;
 			}
 		}

From fbcd1bd7dee103c17cf0523204c18f2ff902bb13 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 26 Jul 2024 15:01:21 +0200
Subject: [PATCH 1008/1461] update prestudentlib

---
 .../api/frontend/v1/stv/Status.php            |  84 ++++------
 application/libraries/PrestudentLib.php       | 153 ++++++++++++------
 2 files changed, 135 insertions(+), 102 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 158ad8a22..e1f713e1e 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -436,7 +436,7 @@ class Status extends FHCAPI_Controller
 
 				}
 				break;
-/*			case Prestudentstatus_model::STATUS_BEWERBER:
+			case Prestudentstatus_model::STATUS_BEWERBER:
 				{
 					$this->load->library('PrestudentLib');
 					$result = $this->prestudentlib->setBewerber($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
@@ -449,68 +449,38 @@ class Status extends FHCAPI_Controller
 						$this->terminateWithSuccess($prestudent_id);
 
 				}
-				break;*/
-			// case Prestudentstatus_model::STATUS_BEWERBER:
-			// 	{
-			// 		$this->load->library('PrestudentLib');
-			// 		$result = $this->prestudentlib->setBewerber($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
+				break;
+			case Prestudentstatus_model::STATUS_AUFGENOMMENER:
+				{
+					$this->load->library('PrestudentLib');
+					$result = $this->prestudentlib->setAufgenommener($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
 
-			// 		if (isError($result))
-			// 		{
-			// 			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			// 		}
-			// 		else
-			// 			$this->terminateWithSuccess($prestudent_id);
+					if (isError($result))
+					{
+						return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+					}
+					else
+						$this->terminateWithSuccess($prestudent_id);
 
-			// 	}
-			// 	break;
-			// case Prestudentstatus_model::STATUS_AUFGENOMMENER: //auch Student...
-			// 	{
-			// 		$this->load->library('PrestudentLib');
-			// 		$result = $this->prestudentlib->setStudentFromInteressent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
+				}
+				break;
+			case Prestudentstatus_model::STATUS_ABGEWIESENER:
+				{
+					$this->load->library('PrestudentLib');
+					$result = $this->prestudentlib->setAbgewiesener($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
 
-			// 		if (isError($result))
-			// 		{
-			// 			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			// 		}
-			// 		else
-			// 			$this->terminateWithSuccess($prestudent_id);
+					if (isError($result))
+					{
+						return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+					}
+					else
+						$this->terminateWithSuccess($prestudent_id);
 
-			// 	}
-			// 	break;
-			// case Prestudentstatus_model::STATUS_AUFGENOMMENER:
-			// 	{
-			// 		$this->load->library('PrestudentLib');
-			// 		$result = $this->prestudentlib->setAufgenommener($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
-
-			// 		if (isError($result))
-			// 		{
-			// 			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			// 		}
-			// 		else
-			// 			$this->terminateWithSuccess($prestudent_id);
-
-			// 	}
-			// 	break;
-			// case Prestudentstatus_model::STATUS_ABGEWIESENER:
-			// 	{
-			// 		$this->load->library('PrestudentLib');
-			// 		$result = $this->prestudentlib->setAufgenommener($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
-
-			// 		if (isError($result))
-			// 		{
-			// 			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			// 		}
-			// 		else
-			// 			$this->terminateWithSuccess($prestudent_id);
-
-			// 	}
-			// 	break;
+				}
+				break;
 			default:
 			{
-/*				if ($isStudent) {
-					return $this->terminateWithError("LehrverbandData needs no handling", self::ERROR_TYPE_GENERAL);
-				}*/
+				$this->terminateWithError("Action not yet defined in Prestudentlib", self::ERROR_TYPE_GENERAL);
 				$result = $this->PrestudentstatusModel->insert(
 					[
 						'prestudent_id' => $prestudent_id,
diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php
index 38ae487d3..09da501d3 100644
--- a/application/libraries/PrestudentLib.php
+++ b/application/libraries/PrestudentLib.php
@@ -523,27 +523,10 @@ class PrestudentLib
 
 	public function setFirstStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id, $bestaetigtAm, $bestaetigtVon, $stg_kz, $uidStudent)
 	{
-		$insertvon = getAuthUID();
-
 		$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
 		if (isError($result))
 			return $result;
-		$resultStatus = getData($result);
-
-		//check if ausbildungssemester is last
-		$this->_ci->StudiengangModel->addJoin('public.tbl_prestudent p', 'studiengang_kz');
-		$resultStg = $this->_ci->StudiengangModel->loadWhere(['p.prestudent_id' => $prestudent_id]);
-		if(isError($resultStg))
-			return $resultStg;
-/*		if(!hasData($resultStg))
-			return error($this->_ci->p->t('studierendenantrag', 'error_no_stg_for_prestudent', [
-				'prestudent_id' => $prestudent_id
-			]));*/
-
-
-		$studiengang = current(getData($resultStg)) ?: null;
-
-		$prestudent_status = ($resultStatus[0]);
+		$prestudent_status = current(getData($result));
 		if(!$prestudent_status)
 		{
 			return error($this->_ci->p->t('studierendenantrag', 'error_no_prestudent_in_sem', [
@@ -552,15 +535,13 @@ class PrestudentLib
 			]));
 		}
 
-/*		$result = $this->_ci->StudentModel->loadWhere(['prestudent_id' => $prestudent_id]);
+		//check studiensemester_kurzbz is last
+		$studiensemester_kurzbz = $prestudent_status->studiensemester_kurzbz != $studiensemester_kurzbz ?
+			$prestudent_status->studiensemester_kurzbz : $studiensemester_kurzbz;
 
-		if (isError($result))
-			return $result;
-		$result = getData($result);
-		if (!$result)
-			return error($this->_ci->p->t('studierendenantrag', 'error_no_student_for_prestudent', ['prestudent_id' => $prestudent_id]));
-
-		$student = current($result);*/
+		//check if ausbildungssemester is last
+		$ausbildungssemester = $prestudent_status->ausbildungssemester != $ausbildungssemester ?
+			$prestudent_status->ausbildungssemester : $ausbildungssemester;
 
 		//Status updaten
 		$result = $this->_ci->PrestudentstatusModel->insert([
@@ -570,7 +551,7 @@ class PrestudentLib
 			'ausbildungssemester' => $ausbildungssemester,
 			'statusgrund_id' => $statusgrund_id,
 			'datum' => date('c'),
-			'insertvon' => $insertvon,
+			'insertvon' => getAuthUID(),
 			'insertamum' => date('c'),
 			'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz,
 			'studienplan_id'=> $prestudent_status->studienplan_id,
@@ -581,24 +562,6 @@ class PrestudentLib
 		if (isError($result))
 			return $result;
 
-/*		$result = $this->_ci->StudentModel->checkIfUid($prestudent_id);
-		if (isError($result)) {
-			return $result;
-		}
-		$student_uid = $result->retval;*/
-
-		//load student
-/*		$result = $this->_ci->StudentModel->loadWhere(
-			array(
-				'student_uid' => $uidStudent
-			)
-		);
-		if (isError($result))
-		{
-			return $result;
-		}
-
-		$studentData = current(getData($result) ? : []);*/
 		$verband = '';
 		$gruppe = '';
 		$studiengang_kz = $stg_kz;
@@ -785,4 +748,104 @@ class PrestudentLib
 		return success();
 	}
 
+	public function setBewerber($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester)
+	{
+		$resultLastStatus = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
+		if (isError($resultLastStatus))
+			return $resultLastStatus;
+		$resultLastStatus = getData($resultLastStatus);
+
+		$prestudent_status = current($resultLastStatus);
+
+		//check studiensemester_kurzbz:
+		$studiensemester_kurzbz = $prestudent_status->studiensemester_kurzbz != $studiensemester_kurzbz ?
+			$prestudent_status->studiensemester_kurzbz : $studiensemester_kurzbz;
+
+		//Status updaten
+		$result = $this->_ci->PrestudentstatusModel->insert([
+			'prestudent_id' => $prestudent_id,
+			'status_kurzbz' => Prestudentstatus_model::STATUS_BEWERBER,
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'ausbildungssemester' => $ausbildungssemester,
+			'datum' => date('c'),
+			'insertvon' => getAuthUID(),
+			'insertamum' => date('c'),
+			'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz,
+			'studienplan_id'=> $prestudent_status->studienplan_id,
+			'bestaetigtvon' => getAuthUID(),
+			'bestaetigtam' => date('c')
+		]);
+
+		if (isError($result))
+		{
+			return $result;
+		}
+		else
+			return success();
+	}
+
+	public function setAufgenommener($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester){
+
+		$resultLastStatus = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
+		if (isError($resultLastStatus))
+			return $resultLastStatus;
+		$resultLastStatus = getData($resultLastStatus);
+
+		$prestudent_status = current($resultLastStatus);
+
+
+		//Status updaten
+		$result = $this->_ci->PrestudentstatusModel->insert([
+			'prestudent_id' => $prestudent_id,
+			'status_kurzbz' => Prestudentstatus_model::STATUS_AUFGENOMMENER,
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'ausbildungssemester' => $ausbildungssemester,
+			'datum' => date('c'),
+			'insertvon' => getAuthUID(),
+			'insertamum' => date('c'),
+			'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz,
+			'studienplan_id'=> $prestudent_status->studienplan_id,
+			'bestaetigtvon' => getAuthUID(),
+			'bestaetigtam' => date('c')
+		]);
+
+		if (isError($result))
+		{
+			return $result;
+		}
+		else
+			return success();
+	}
+
+	public function setAbgewiesener($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester){
+
+		$resultLastStatus = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
+		if (isError($resultLastStatus))
+			return $resultLastStatus;
+		$resultLastStatus = getData($resultLastStatus);
+
+		$prestudent_status = current($resultLastStatus);
+
+		//Status updaten
+		$result = $this->_ci->PrestudentstatusModel->insert([
+			'prestudent_id' => $prestudent_id,
+			'status_kurzbz' => Prestudentstatus_model::STATUS_ABGEWIESENER,
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'ausbildungssemester' => $ausbildungssemester,
+			'datum' => date('c'),
+			'insertvon' => getAuthUID(),
+			'insertamum' => date('c'),
+			'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz,
+			'studienplan_id'=> $prestudent_status->studienplan_id,
+			'bestaetigtvon' => getAuthUID(),
+			'bestaetigtam' => date('c')
+		]);
+
+		if (isError($result))
+		{
+			return $result;
+		}
+		else
+			return success();
+	}
 }

From 65b71191a0bb9a5875057e1d805f26126dd803ac Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 26 Jul 2024 15:41:21 +0200
Subject: [PATCH 1009/1461] adds +1 to month in getMonth() function because the
 month index of a javascript date starts with 0, additional cleanup in
 Ampel.js Widgett

---
 .../js/components/DashboardWidget/Abstract.js |   4 +-
 public/js/components/DashboardWidget/Ampel.js | 329 ++++--------------
 2 files changed, 61 insertions(+), 272 deletions(-)

diff --git a/public/js/components/DashboardWidget/Abstract.js b/public/js/components/DashboardWidget/Abstract.js
index a21c9834f..c121dba9a 100755
--- a/public/js/components/DashboardWidget/Abstract.js
+++ b/public/js/components/DashboardWidget/Abstract.js
@@ -19,12 +19,12 @@ export default {
 	methods: {
 		formatDateTime: function(dateTime) {
 			const dt = new Date(dateTime);
-			return dt.getDate() + '.' + dt.getMonth() + '.' + dt.getFullYear() + ' | '
+			return dt.getDate() + '.' + (dt.getMonth()+1) + '.' + dt.getFullYear() + ' | '
 				+ dt.getHours() + ':' + dt.getMinutes();
 		},
 		getDate: function(dateTime){
 			const dt = new Date(dateTime);
-			return dt.getDate() + '.' + dt.getMonth() + '.' + dt.getFullYear();
+			return dt.getDate() + '.' + (dt.getMonth()+1) + '.' + dt.getFullYear();
 		}
 	}
 }
diff --git a/public/js/components/DashboardWidget/Ampel.js b/public/js/components/DashboardWidget/Ampel.js
index 855eb15b6..271aa2326 100755
--- a/public/js/components/DashboardWidget/Ampel.js
+++ b/public/js/components/DashboardWidget/Ampel.js
@@ -1,6 +1,8 @@
 import AbstractWidget from './Abstract';
 import BaseOffcanvas from '../Base/Offcanvas';
 
+const widgetAmpelMAX = 4;
+
 export default {
     name: 'WidgetsAmpel',
     components: { BaseOffcanvas },
@@ -15,53 +17,23 @@ export default {
         AbstractWidget
     ],
     computed: {
-        filteredAmpeln(){
+        ampelnComputed(){
             
-            if (this.source == 'offen')
+            switch(this.source)
             {
-                switch(this.filter)
-                {
-                    case 'verpflichtend': return this.activeAmpeln?.filter(item => item.verpflichtend);
-                    case 'ueberfaellig': return this.activeAmpeln?.filter(item => (new Date() > new Date(item.deadline)) && !item.bestaetigt);
-                    default: return this.activeAmpeln;
-                }
+                case 'offen': return this.applyFilter(this.activeAmpeln);
+                case 'alle': return this.applyFilter(this.allAmpeln);
+                default: return this.activeAmpeln; 
             }
-            if (this.source == 'alle')
-            {
-                switch(this.filter)
-                {
-                    case 'verpflichtend': return this.allActiveAmpeln?.filter(item => item.verpflichtend);
-                    case 'ueberfaellig': return this.allActiveAmpeln?.filter(item => (new Date() > new Date(item.deadline)) && !item.bestaetigt);
-                    default: return this.allActiveAmpeln;
-                }
-                
-            }
-            return this.activeAmpeln;
+            
         },
-        openAmpeln () {
-            return this.ampeln.filter(ampel=>{
-                if(!ampel.bestaetigt){
-                    return true;
-                }
-                return false;
-            })  
-        },
-        widgetAmpeln () {
-            return this.activeAmpeln?.slice(0, 4);  // show only newest 4 ampeln
-        },
-        offcanvasAmpeln ()
-        {
-            switch(this.filter)
-            {
-                case 'verpflichtend': return this.activeAmpeln?.filter(item => item.verpflichtend);
-                case 'ueberfaellig': return this.activeAmpeln?.filter(item => (new Date() > new Date(item.deadline)) && !item.bestaetigt);
-                default: return this.activeAmpeln;
-            }
+        ampelnOverview () {
+            return this.activeAmpeln?.slice(0, widgetAmpelMAX);  // show only newest 4 active ampeln
         },
         count () {
             let datasource = this.activeAmpeln;
             if (this.source == 'offen') datasource = this.activeAmpeln;
-            if (this.source == 'alle') datasource = this.allActiveAmpeln;
+            if (this.source == 'alle') datasource = this.allAmpeln;
 
             return {
                 verpflichtend: datasource?.filter(item => item.verpflichtend).length,
@@ -72,6 +44,26 @@ export default {
         }
     },
     methods: {
+        applyFilter(data){
+            switch(this.filter)
+                {
+                    case 'verpflichtend': return data?.filter(item => item.verpflichtend);
+                    case 'ueberfaellig': return data?.filter(item => (new Date() > new Date(item.deadline)) && !item.bestaetigt);
+                    default: return data;
+                }
+        },
+        isExpiredAmpel(ampel){
+        
+            let deadline = new Date(ampel.deadline);
+            if(ampel.verfallszeit instanceof Number) deadline.setDate(deadline.getDate() + ampel.verfallszeit);
+            deadline.setHours(0, 0, 0, 0); 
+
+            let today = new Date();
+            today.setHours(0, 0, 0, 0);
+
+            return deadline < today ? true : false;
+            
+        },
 
         toggleFilter(value){
             this.filter === value ? this.filter = '' : this.filter = value;
@@ -79,9 +71,9 @@ export default {
         
         closeOffcanvasAmpeln()
         {
-            for (let i = 0; i < this.offcanvasAmpeln.length; i++)
+            for (let i = 0; i < this.ampelnComputed.length; i++)
             {
-                let ampelId = this.offcanvasAmpeln[i].ampel_id;
+                let ampelId = this.ampelnComputed[i].ampel_id;
                 this.$refs['ampelCollapse_' + ampelId][0].classList.remove('show');
             }
         },
@@ -98,18 +90,18 @@ export default {
         async fetchActiveAmpeln(){
 
             await this.$fhcApi.factory.ampeln.getNonConfirmedActiveAmpeln().then(res=>{
-                this.activeAmpeln = res.data;
+                this.activeAmpeln = res.data.sort((a,b) => new Date(b.deadline) - new Date(a.deadline));
             }); 
         },
         async fetchAllAmpeln(){
 
-            await this.$fhcApi.factory.ampeln.getAllActiveAmpeln().then(res=>{
-                this.allActiveAmpeln = res.data;
+            await this.$fhcApi.factory.ampeln.alleAmpeln().then(res=>{
+                this.allAmpeln = res.data.sort((a,b) => new Date(b.deadline) - new Date(a.deadline));
             }); 
         },
         async confirm(ampelId){
-            this.$fhcApi.factory.ampeln.confirmAmpel(ampelId).then(res =>{
-                console.log(res,"result of the insert into")
+            await this.$fhcApi.factory.ampeln.confirmAmpel(ampelId).then(res =>{
+                res.data ? this.$toast.success('Ampel bestätigt') : this.$toast.error('Fehler beim Bestätigen der Ampel');
             });
 
             // fetch all the ampeln after an ampel has been confirmed
@@ -117,40 +109,23 @@ export default {
             await this.fetchAllAmpeln();
 
         },
-        changeDisplay(){
-            this.filter = '';
-            if (this.source == 'offen')
-            {
-                //this.ampeln = openAmpeln;
-            }
-
-            if (this.source == 'alle')
-            {
-                //this.ampeln = TEST_ALLE_AMPELN;
-                // axios
-                //     .get(this.apiurl + '/dashboard/Api/getAmpeln')
-                //     .then(res => { this.ampeln = res.data })
-                //     .catch(err => { console.error('ERROR: ', err.response.data) });
-            }
-        },
         validateBtnTxt(buttontext){
-            return buttontext == null ? 'Bestätigen' : buttontext;
+
+            if(buttontext instanceof Array && !buttontext.length) return 'Bestätigen';
+
+            if(!buttontext) return 'Bestätigen';
+
+            return buttontext;
         }
     },
-    async created() {
+    created() {
+
+        this.$emit('setConfig', false);    
+    },
+    async mounted() {
         
         await this.fetchActiveAmpeln();
         await this.fetchAllAmpeln();
-
-        // add the first element of the active ampeln again just for testing purposes
-        /* let duplicate = {...this.allActiveAmpeln[0]};
-        duplicate.verpflichtend= false;
-        this.allActiveAmpeln.push(duplicate);
-        console.log(this.activeAmpeln,"this are the active ampeln")
-        console.log(this.allActiveAmpeln,"this are all the ampeln")
-  */
-        this.$emit('setConfig', false);
-        
     },
     template: /*html*/`
     <div class="widgets-ampel w-100 h-100">
@@ -162,7 +137,7 @@ export default {
             <div class="d-flex justify-content-end">
                 <a v-if="count.ueberfaellig > 0" href="#allAmpelOffcanvas" data-bs-toggle="offcanvas" @click="filter = 'ueberfaellig'" class="text-decoration-none"><span class="badge bg-danger me-1"><i class="fa fa-solid fa-bolt"></i> Überfällig: <b>{{ count.ueberfaellig }}</b></span></a>
             </div>
-            <div v-for="ampel in widgetAmpeln" :key="ampel.ampel_id" class="mt-2">
+            <div v-for="ampel in ampelnOverview" :key="ampel.ampel_id" class="mt-2">
                 <div class="card">
                     <div class="card-body">
                         <div class="position-relative">
@@ -186,7 +161,7 @@ export default {
         </div>
         <div v-else>
         <header class="me-auto"><b>Neueste Ampeln</b></header>
-            <template v-for="n in 4">
+            <template v-for="n in widgetAmpelMAX">
                 <div class="mt-2 card" aria-hidden="true">
                 <div class="card-body">
                     <p class="card-text placeholder-glow">
@@ -207,11 +182,11 @@ export default {
         <template #body>
             <div class="d-flex justify-content-evenly">
                 <div class="form-check form-check-inline form-control-sm">
-                <input class="form-check-input" type="radio" v-model="source" id="offen" value="offen" @change="changeDisplay" checked>
+                <input class="form-check-input" type="radio" v-model="source" id="offen" value="offen"  checked>
                 <label class="form-check-label" for="offen">Offene Ampeln</label>
             </div>
             <div class="form-check form-check-inline form-control-sm">
-                <input class="form-check-input" type="radio" v-model="source" id="alle" value="alle" @change="changeDisplay">
+                <input class="form-check-input" type="radio" v-model="source" id="alle" value="alle" >
                 <label class="form-check-label" for="alle">Alle Ampeln</label>
             </div>
             </div>
@@ -220,9 +195,9 @@ export default {
                 <div class="col"><button class="btn btn-danger w-100"  @click="toggleFilter('ueberfaellig')"><i class="fa fa-solid fa-bolt me-2"></i><small :style="{...(filter==='ueberfaellig'?{'text-decoration':'underline','font-weight':'bold'}:{})}">Überfällig: <b>{{ count.ueberfaellig }}</b></small></button></div>
                 <div class="col"><button class="btn btn-warning w-100" @click="toggleFilter('verpflichtend')"><i class="fa fa-solid fa-triangle-exclamation me-2"></i><small :style="{...(filter==='verpflichtend'?{'text-decoration':'underline','font-weight':'bold'}:{})}">Pflicht: <b>{{ count.verpflichtend }}</b></small></button></div>
             </div>
-            <div v-for="ampel in filteredAmpeln" :key="ampel.ampel_id" class="mt-2">
+            <div v-for="ampel in ampelnComputed" :key="ampel.ampel_id" class="mt-2">
                 <ul class="list-group">
-                <li class="list-group-item small">
+                <li :style="{...(isExpiredAmpel(ampel)? {'background':'#E2E3E5'} : {})}" class="list-group-item small">
                 <div class="position-relative"><!-- prevents streched-link from stretching outside this parent element -->
                     <div class="d-flex">
                         <span class="small text-muted me-auto"><small>Deadline: {{ getDate(ampel.deadline) }}</small></span>
@@ -230,12 +205,12 @@ export default {
                         <div v-if="ampel.verpflichtend"><span class="badge bg-warning ms-1"><i class="fa fa-solid fa-triangle-exclamation"></span></div>
                         <div v-if="ampel.bestaetigt"><span class="badge bg-success ms-1"><i class="fa fa-solid fa-circle-check"></i></span></div>
                     </div>
-                    <a :href="'#ampelCollapse_' + ampel.ampel_id" data-bs-toggle="collapse" class="stretched-link">{{ ampel.kurzbz }}</a><br>
+                    <a :class="{...(isExpiredAmpel(ampel)? {'text-reset':true, 'text-decoration-none':true} : {})}" :href="'#ampelCollapse_' + ampel.ampel_id" data-bs-toggle="collapse" class="stretched-link">{{ ampel.kurzbz }}</a><br>
                 </div>
                 <div class="collapse my-3" :id="'ampelCollapse_' + ampel.ampel_id" :ref="'ampelCollapse_' + ampel.ampel_id">
-                    {{ ampel.beschreibung[0] }}
-                    <div class="d-flex justify-content-end mt-3">
-                        <button class="btn btn-sm btn-primary" :class="{disabled: ampel.bestaetigt}" @click="confirm(ampel.ampel_id)">{{ validateBtnTxt(ampel.buttontext[0]) }}</button>
+                    <div v-html="ampel.beschreibung"></div>
+                    <div v-if="!isExpiredAmpel(ampel)" class="d-flex justify-content-end mt-3">
+                        <button  class="btn btn-sm btn-primary" :class="{disabled: ampel.bestaetigt}" @click="confirm(ampel.ampel_id)">{{ validateBtnTxt(ampel.buttontext) }}</button>
                     </div>
                 </div>
                 </li>
@@ -245,189 +220,3 @@ export default {
     </BaseOffcanvas>`
 }
 
-const TEST_ALLE_AMPELN = [
-    {
-        ampel_id: 0,
-        kurzbz: 'Ampeltitel 1',
-        deadline: '2022-12-31',
-        verfallszeit: 10,
-        verpflichtend: false,
-        bestaetigt: false,
-        buttontext: ['Bestätigen', 'Confirm'],
-        insertamum: '2022-09-21 15:25:00',
-        beschreibung: [
-            '1-Deutscher Text Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod.',
-            '1-Englischer Text Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod.'
-        ]
-    },
-    {
-        ampel_id: 1,
-        kurzbz: 'Ampeltitel 2 kann auch etwas länger sein',
-        deadline: '2023-10-03',
-        verfallszeit: 20,
-        verpflichtend: true,
-        bestaetigt: false,
-        buttontext: ['Gelesen', 'Read'],
-        insertamum: '2022-09-21 15:25:00',
-        beschreibung: [
-            '2-Deutscher Text Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod.',
-            '2-Englischer Text Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod.'
-        ]
-    },
-    {
-        ampel_id: 2,
-        kurzbz: 'Ampeltitel 3',
-        deadline: '2022-10-31',
-        verfallszeit: null,		// Dauerampel, Bis zur Bestätigung
-        verpflichtend: false,
-        bestaetigt: true,
-        buttontext: ['Bestätigen', 'Confirm'],
-        insertamum: '2022-09-21 15:25:00',
-        beschreibung: [
-            '3-Deutscher Text Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod.',
-            '3-Englischer Text Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod.'
-        ]
-    },
-    {
-        ampel_id: 3,
-        kurzbz: 'Ampeltitel 4',
-        deadline: '2022-10-31',
-        verfallszeit: 40,
-        verpflichtend: false,
-        bestaetigt: true,
-        buttontext: ['Bestätigen', 'Confirm'],
-        insertamum: '2022-09-21 15:25:00',
-        beschreibung: [
-            'Deutscher Text Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod.',
-            'Englischer Text Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod.'
-        ]
-    },
-    {
-        ampel_id: 4,
-        kurzbz: 'Ampeltitel 5',
-        deadline: '2022-10-31',
-        verfallszeit: 10,
-        verpflichtend: false,
-        bestaetigt: true,
-        buttontext: ['Bestätigen', 'Confirm'],
-        insertamum: '2022-09-21 15:25:00',
-        beschreibung: [
-            'Deutscher Text Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod.',
-            'Englischer Text Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod.'
-        ]
-    },
-    {
-        ampel_id: 5,
-        kurzbz: 'Ampeltitel 6',
-        deadline: '2022-10-31',
-        verfallszeit: 40,
-        verpflichtend: false,
-        bestaetigt: true,
-        buttontext: ['Bestätigen', 'Confirm'],
-        insertamum: '2022-09-21 15:25:00',
-        beschreibung: [
-            'Deutscher Text Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod.',
-            'Englischer Text Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod.'
-        ]
-    },
-    {
-        ampel_id: 6,
-        kurzbz: 'Ampeltitel 7',
-        deadline: '2020-12-31',
-        verfallszeit: 10,
-        verpflichtend: false,
-        bestaetigt: true,
-        buttontext: ['Bestätigen', 'Confirm'],
-        insertamum: '2022-09-21 15:25:00',
-        beschreibung: [
-            'Deutscher Text Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod.',
-            'Englischer Text Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod.'
-        ]
-    },{
-        ampel_id: 7,
-        kurzbz: 'Ampeltitel 8',
-        deadline: '2022-09-25',
-        verfallszeit: 40,
-        verpflichtend: false,
-        bestaetigt: false,
-        buttontext: ['Bestätigen', 'Confirm'],
-        insertamum: '2022-09-21 15:25:00',
-        beschreibung: [
-            'Deutscher Text Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod.',
-            'Englischer Text Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod.'
-        ]
-    },
-    {
-        ampel_id: 8,
-        kurzbz: 'Ampeltitel 9',
-        deadline: '2022-10-01',
-        verfallszeit: 10,
-        verpflichtend: false,
-        bestaetigt: false,
-        buttontext: ['Bestätigen', 'Confirm'],
-        insertamum: '2022-09-21 15:25:00',
-        beschreibung: [
-            'Deutscher Text Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod.',
-            'Englischer Text Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod.'
-        ]
-    }
-]
-
-const TEST_OFFENE_AMPELN = [
-    {
-        ampel_id: 0,
-        kurzbz: 'Ampeltitel 1',
-        deadline: '2022-12-31',
-        verfallszeit: 10,
-        verpflichtend: false,
-        bestaetigt: false,
-        buttontext: ['Bestätigen', 'Confirm'],
-        insertamum: '2022-09-21 15:25:00',
-        beschreibung: [
-            '1-Deutscher Text Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod.',
-            '1-Englischer Text Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod.'
-        ]
-    },
-    {
-        ampel_id: 1,
-        kurzbz: 'Ampeltitel 2 kann auch etwas länger sein',
-        deadline: '2023-10-03',
-        verfallszeit: 20,
-        verpflichtend: true,
-        bestaetigt: false,
-        buttontext: ['Gelesen', 'Read'],
-        insertamum: '2022-09-21 15:25:00',
-        beschreibung: [
-            '2-Deutscher Text Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod.',
-            '2-Englischer Text Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod.'
-        ]
-    },
-    {
-        ampel_id: 7,
-        kurzbz: 'Ampeltitel 8',
-        deadline: '2022-09-25',
-        verfallszeit: 40,
-        verpflichtend: false,
-        bestaetigt: false,
-        buttontext: ['Bestätigen', 'Confirm'],
-        insertamum: '2022-09-21 15:25:00',
-        beschreibung: [
-            'Deutscher Text Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod.',
-            'Englischer Text Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod.'
-        ]
-    },
-    {
-        ampel_id: 8,
-        kurzbz: 'Ampeltitel 9',
-        deadline: '2022-10-01',
-        verfallszeit: 10,
-        verpflichtend: false,
-        bestaetigt: false,
-        buttontext: ['Bestätigen', 'Confirm'],
-        insertamum: '2022-09-21 15:25:00',
-        beschreibung: [
-            'Deutscher Text Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod.',
-            'Englischer Text Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod.'
-        ]
-    }
-];
\ No newline at end of file

From 31a21954d9b09b048722b41c7a48444174c60b96 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Sun, 28 Jul 2024 19:12:40 +0200
Subject: [PATCH 1010/1461] issueresolver: improved comment

---
 application/controllers/jobs/IssueResolver.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/controllers/jobs/IssueResolver.php b/application/controllers/jobs/IssueResolver.php
index f0f13694e..d7e2aaeb4 100755
--- a/application/controllers/jobs/IssueResolver.php
+++ b/application/controllers/jobs/IssueResolver.php
@@ -51,7 +51,7 @@ class IssueResolver extends IssueResolver_Controller
 			'CORE_PERSON_0004' => 'CORE_PERSON_0004'
 		);
 
-		// fehler which are resolved the same way as they are produced
+		// fehler which are resolved by the job the same way as they are produced
 		// structure: fehlercode => class (library) name for resolving
 		$this->_codeProducerLibMappings = array(
 			'CORE_STUDENTSTATUS_0001' => 'AbbrecherAktiv',

From 6680e9b8827f1704bf8c1bffdc9c352ea573da72 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Sun, 28 Jul 2024 19:15:27 +0200
Subject: [PATCH 1011/1461] issueresolver: improved another comment

---
 application/controllers/jobs/IssueResolver.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/controllers/jobs/IssueResolver.php b/application/controllers/jobs/IssueResolver.php
index d7e2aaeb4..ca07439c3 100755
--- a/application/controllers/jobs/IssueResolver.php
+++ b/application/controllers/jobs/IssueResolver.php
@@ -10,7 +10,7 @@ class IssueResolver extends IssueResolver_Controller
 		parent::__construct();
 
 		// set fehler codes which can be resolved by the job, with own resolver defined
-		// structure: fehlercode => class (library) name for resolving
+		// structure: fehlercode => class (library) name for resolving in "resolvers" folder
 		$this->_codeLibMappings = array(
 			'CORE_ZGV_0001' => 'CORE_ZGV_0001',
 			'CORE_ZGV_0002' => 'CORE_ZGV_0002',
@@ -52,7 +52,7 @@ class IssueResolver extends IssueResolver_Controller
 		);
 
 		// fehler which are resolved by the job the same way as they are produced
-		// structure: fehlercode => class (library) name for resolving
+		// structure: fehlercode => class (library) name for resolving in "plausichecks" folder
 		$this->_codeProducerLibMappings = array(
 			'CORE_STUDENTSTATUS_0001' => 'AbbrecherAktiv',
 		);

From f1d1c3cbfd27644919589b20e197a054d6a66e5c Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Sun, 28 Jul 2024 19:34:58 +0200
Subject: [PATCH 1012/1461] issueresolver: improved yet another comment

---
 application/libraries/issues/plausichecks/PlausiChecker.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/libraries/issues/plausichecks/PlausiChecker.php b/application/libraries/issues/plausichecks/PlausiChecker.php
index 5e9c2469f..7e5fe7db0 100644
--- a/application/libraries/issues/plausichecks/PlausiChecker.php
+++ b/application/libraries/issues/plausichecks/PlausiChecker.php
@@ -9,7 +9,7 @@ abstract class PlausiChecker
 	protected $_config; // all applicable configuration parameters for this plausicheck
 	protected $_db; // database for queries
 
-	protected $_isForResolutionCheck;
+	protected $_isForResolutionCheck; // if true, additional parameters only needed for resolution are checked
 
 	protected $_config_params = []; // name of all config params which should be applied for this plausicheck, with sql [name] => [sql]
 	protected $_params_for_checking = []; // name of all passed params for checking, with sql [name] => [sql]

From 88b5fbc4c9a974c7ca0f4d6a189413a7992ff5e4 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Sun, 28 Jul 2024 19:40:10 +0200
Subject: [PATCH 1013/1461] PlausicheckResolverLib: resolving of issues without
 explicit resolver can also be used in extensions

---
 application/libraries/issues/PlausicheckResolverLib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/libraries/issues/PlausicheckResolverLib.php b/application/libraries/issues/PlausicheckResolverLib.php
index 618611cee..26da985f6 100644
--- a/application/libraries/issues/PlausicheckResolverLib.php
+++ b/application/libraries/issues/PlausicheckResolverLib.php
@@ -25,7 +25,7 @@ class PlausicheckResolverLib
 		$this->_ci =& get_instance(); // get ci instance
 
 		$this->_ci->load->library('IssuesLib');
-		$this->_ci->load->library('issues/PlausicheckProducerLib', ['isForResolutionCheck' => true]);
+		$this->_ci->load->library('issues/PlausicheckProducerLib', ['extensionName' => $this->_extensionName, 'isForResolutionCheck' => true]);
 	}
 
 	/**

From e81856afb9d6c5aa0561839a1f1a0f8d297b1821 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 29 Jul 2024 11:58:42 +0200
Subject: [PATCH 1014/1461] Phrases confirmChangeStatus

---
 .../Details/Status/Dropdown.js                |  6 ++-
 system/phrasesupdate.php                      | 40 +++++++++++++++++++
 2 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js b/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js
index a6d120b60..a8bd7782a 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js
@@ -604,10 +604,12 @@ export default {
 				<template #title>{{$p.t('lehre', 'status_edit')}}</template>
 				<template #default>
 					<div v-if="prestudentIds.length == 1">
-						<p>Diese Person wirklich zum {{actionStatusText}} machen?</p>
+						<p>{{$p.t('lehre', 'modal_StatusactionSingle', { status: actionStatusText })}}</p>
 					</div>
 					<div v-else>
-						<p>Diese {{prestudentIds.length}} Personen wirklich zum {{actionStatusText}} machen?</p>
+						<p>{{$p.t('lehre', 'modal_StatusactionPlural', { count: prestudentIds.length,
+					status: actionStatusText
+						})}}</p>
 					</div>
 					
 				</template>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index cdc277e62..b0259bfb3 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -30006,6 +30006,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'modal_StatusactionSingle',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Den Status dieser Person wirklich auf {status} setzen?',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Really set this person\'s status to {status}?',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'modal_StatusactionPlural',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Den Status dieser {count} Personen wirklich auf {status} setzen?',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Really set the status of these {count} people to {status}?',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 );
 
 

From 2c4547887705ce633f825cbd6eb56a11cd4ba50b Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 29 Jul 2024 13:17:29 +0200
Subject: [PATCH 1015/1461] fixes the fetched ampeln in the ampelWidget

---
 .../controllers/api/frontend/v1/Ampeln.php    | 73 ++++++++++-----
 .../helpers/hlp_return_object_helper.php      |  5 +-
 application/models/content/Ampel_model.php    | 88 +++++++++++++++----
 public/js/components/DashboardWidget/Ampel.js | 43 ++++-----
 4 files changed, 141 insertions(+), 68 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Ampeln.php b/application/controllers/api/frontend/v1/Ampeln.php
index 21fa83c4d..2e64ba8b6 100644
--- a/application/controllers/api/frontend/v1/Ampeln.php
+++ b/application/controllers/api/frontend/v1/Ampeln.php
@@ -78,14 +78,14 @@ class Ampeln extends FHCAPI_Controller
 	 */
 	public function getNonConfirmedActiveAmpeln()
 	{
-
+        
         $userAmpeln = array();
 
         // fetch active ampeln
         $activeAmpeln = $this->AmpelModel->active();
 
         $activeAmpeln = $this->getDataOrTerminateWithError($activeAmpeln);
-
+        
         foreach($activeAmpeln as $ampel){
             
             // check if ampel is confirmed by user
@@ -94,22 +94,40 @@ class Ampeln extends FHCAPI_Controller
 
             // only include non confirmed active ampeln in the result
             if(!$confirmedByUser){
-                $userUID_array = $this->AmpelModel->execBenutzerSelect($ampel->benutzer_select);
-                $userUID_array = $this->getDataOrTerminateWithError($userUID_array);
+                
+                // check if the user was assigned to the ampel
+                $zugeteilt = $this->AmpelModel->isZugeteilt($this->uid, $ampel->benutzer_select);
 
+                if(isError($zugeteilt)){
+                    $this->addError(getError($zugeteilt));
+                    $zugeteilt = false;
+                }else{
+                    $zugeteilt = $this->getDataOrTerminateWithError($zugeteilt);
+                }
+
+                if($zugeteilt) $userAmpeln[] = $this->translateAmpel($ampel);
+                
+                // old way to check if an ampel was assigned to the user
+                /* $userUID_array = $this->AmpelModel->execBenutzerSelect($ampel->benutzer_select);
+                if(isError($userUID_array)){
+                    $this->addError(getError($userUID_array));
+                }
+                $userUID_array = $this->getDataOrTerminateWithError($userUID_array);
+                
+                
                 // check if user is assigned to the ampel
                 foreach($userUID_array as $user_obj){
                     // property is called uid for students and mitarbeiter_uid for employees
                     $user_uid = property_exists($user_obj,"uid") ? $user_obj->uid : $user_obj->mitarbeiter_uid;
-                    
                     if($user_uid === $this->uid){
                         $userAmpeln[] = $this->translateAmpel($ampel);
                     }
-                } 
-            }
-            
-        }
+                } */ 
+                
 
+            }
+        }
+        
         $this->terminateWithSuccess($userAmpeln);
 	}
 
@@ -121,23 +139,27 @@ class Ampeln extends FHCAPI_Controller
     public function getAllActiveAmpeln()
 	{
         $userAmpeln = array();
+        
         $ampel_result = $this->AmpelModel->active();
 
         $ampel_result = $this->getDataOrTerminateWithError($ampel_result);
-
+        
         foreach($ampel_result as $ampel){
-            
             $confirmedByUser = $this->AmpelModel->isConfirmed($ampel->ampel_id,$this->uid);
             $ampel->bestaetigt = $confirmedByUser;
-            $userUID_array = $this->AmpelModel->execBenutzerSelect($ampel->benutzer_select);
-            $userUID_array = $this->getDataOrTerminateWithError($userUID_array);
-            foreach($userUID_array as $user_obj){
-                
-                $user_uid = property_exists($user_obj,"uid") ? $user_obj->uid : $user_obj->mitarbeiter_uid;
-                if($user_uid === $this->uid){
-                    $userAmpeln[] = $this->translateAmpel($ampel);
-                }
+            
+            // check if the ampel was assigned to the user
+            $zugeteilt = $this->AmpelModel->isZugeteilt($this->uid, $ampel->benutzer_select);
+
+            if(isError($zugeteilt)){
+                $this->addError(getError($zugeteilt));
+                $zugeteilt = false;
+            }else{
+                $zugeteilt = $this->getDataOrTerminateWithError($zugeteilt);
             }
+
+            if($zugeteilt) $userAmpeln[] = $this->translateAmpel($ampel);
+                        
         }
 
         $this->terminateWithSuccess($userAmpeln);
@@ -157,8 +179,13 @@ class Ampeln extends FHCAPI_Controller
 
         $alle_ampeln = $this->getDataOrTerminateWithError($alle_ampeln);
 
-        // translate ampeln
-        array_map(function($ampel){ return $this->translateAmpel($ampel);}, $alle_ampeln);
+        $alle_ampeln = array_map(function($ampel){ 
+            // check if ampel is confirmed by user
+            $confirmedByUser = $this->AmpelModel->isConfirmed($ampel->ampel_id,$this->uid);
+            $ampel->bestaetigt = $confirmedByUser;
+            // translate ampeln
+            return $this->translateAmpel($ampel);
+        }, $alle_ampeln);
 
         $this->terminateWithSuccess($alle_ampeln);
 
@@ -183,8 +210,8 @@ class Ampeln extends FHCAPI_Controller
         $userLanguage = $this->getDataOrTerminateWithError($userLanguage)[0]->index - 1; // why does the index start at 1?
 
         // translate the ampel description and button text
-        $ampel->beschreibung = $ampel->beschreibung[$userLanguage];
-        $ampel->buttontext = $ampel->buttontext[$userLanguage];
+        if(isset($ampel->beschreibung) && count($ampel->beschreibung)>=($userLanguage+1)) $ampel->beschreibung = $ampel->beschreibung[$userLanguage];
+        if(isset($ampel->buttontext) && count($ampel->buttontext)>=($userLanguage+1)) $ampel->buttontext = $ampel->buttontext[$userLanguage];
 
         return $ampel;
 
diff --git a/application/helpers/hlp_return_object_helper.php b/application/helpers/hlp_return_object_helper.php
index cc896856d..d9004d993 100755
--- a/application/helpers/hlp_return_object_helper.php
+++ b/application/helpers/hlp_return_object_helper.php
@@ -28,6 +28,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
  */
 function _createReturnObject($code, $error, $retval)
 {
+	
 	$returnObject = new stdClass();
 	$returnObject->code = $code;
 	$returnObject->error = $error;
@@ -39,7 +40,7 @@ function _createReturnObject($code, $error, $retval)
 /**
  * Success
  *
- * @return  array
+ * @return  stdClass
  */
 function success($retval = null, $code = null)
 {
@@ -49,7 +50,7 @@ function success($retval = null, $code = null)
 /**
  * Error
  *
- * @return  array
+ * @return  stdClass
  */
 function error($retval = null, $code = null)
 {
diff --git a/application/models/content/Ampel_model.php b/application/models/content/Ampel_model.php
index 136d4b38d..8f89ff3e9 100755
--- a/application/models/content/Ampel_model.php
+++ b/application/models/content/Ampel_model.php
@@ -33,10 +33,16 @@ class Ampel_model extends DB_Model
 		}
 
 		$query .= '(
-			(NOW()<(deadline+(COALESCE(verfallszeit,0) || \' days\')::interval)::date)
-			    OR (verfallszeit IS NULL)
-			   AND (NOW()>(deadline-(COALESCE(vorlaufzeit,0) || \' days\')::interval)::date)
-			    OR (vorlaufzeit IS NULL AND NOW() < deadline))';
+			(
+				(NOW()<(deadline+(COALESCE(verfallszeit,0) || \' days\')::interval)::date)
+				OR (verfallszeit IS NULL)
+			)
+			AND 
+			(
+				(NOW()>(deadline-(COALESCE(vorlaufzeit,0) || \' days\')::interval)::date)
+			    OR (vorlaufzeit IS NULL AND NOW() < deadline)
+			)
+			)';
 
 		$query .= ' ORDER BY deadline DESC';
 
@@ -92,6 +98,12 @@ class Ampel_model extends DB_Model
 	}
 
 
+	/**
+	 * confirms Ampel by the user.
+	 * @param int $ampel_id Ampel-ID
+	 * @param string $uid UID
+	 * @return bool insert into result
+	 */
 	public function confirmAmpel($ampel_id, $uid)
 	{
 		if(isset($ampel_id) && isset($uid)){
@@ -105,6 +117,33 @@ class Ampel_model extends DB_Model
 		
 	}
 
+	/**
+	 * checks if a user is assigned to an ampel
+	 * @param string $uid userID
+	 * @param string $benutzer_select the select query which gets all the user that are assigned to an ampel
+	 * @return stdClass 
+	 */
+	public function isZugeteilt($uid, $benutzer_select){
+		$zugeteilt = $this->execReadOnlyQuery("
+			SELECT 
+				CASE WHEN ? IN (".$benutzer_select.") 
+					THEN true 
+					ELSE false
+				END as zugeteilt	
+			", [$uid]);
+
+		if(isError($zugeteilt)){
+			return $zugeteilt;
+		}
+
+		$zugeteilt = getData($zugeteilt);
+
+		return success(current($zugeteilt)->zugeteilt);
+
+	}
+
+	
+
 
 	function alleAmpeln($uid){
 
@@ -125,30 +164,43 @@ class Ampel_model extends DB_Model
 		if(isError($allAmpeln)) return error(getError($allAmpeln));
 
 		$allAmpeln = getData($allAmpeln);
-
 		foreach($allAmpeln as $ampel){
+
+			// check if the ampel is assigned to the user
 			$zugeteilt = $this->execReadOnlyQuery("
 			SELECT 
-				CASE WHEN ? IN (?) 
+				CASE WHEN ? IN (".$ampel->benutzer_select.") 
 					THEN true 
 					ELSE false
 				END as zugeteilt	
-			", [$uid, $ampel->benutzer_select]);
-
-			if(isError($zugeteilt)) return error(getError($zugeteilt));
+			", [$uid]);
 			
-			if($zugeteilt 
-				// datum der Ampel liegt nicht vor der Vorlaufzeit
-				&& (isset($ampel->vorlaufzeit) && !($now < strtotime('-' .  $ampel->vorlaufzeit . ' day', $datum->mktime_fromdate($ampel->deadline)) ))
-				// verfallszeit nicht vor dem start Datum des Benutzers abgelaufen
-				&& isset($ampel->verfallszeit) && $benutzerStartDate < strtotime('+' . $ampel->verfallszeit . ' day', $datum->mktime_fromdate($ampel->deadline))
+			if(isError($zugeteilt)) return error(getError($zugeteilt));
 
-				// verfallszeit ist abgelaufen
-				//&& $now > strtotime('+' . $ampel->verfallszeit . ' day', $ampel->deadline)
-				
+			$zugeteilt = current(getData($zugeteilt))->zugeteilt;
+			
+			
+			// abgelaufen check
+			// $now > strtotime('+' . $ampel->verfallszeit . ' day', $ampel->deadline)
+
+			if(
+				// aktuelles datum liegt vor der Vorlaufzeit der Ampel
+				(isset($ampel->vorlaufzeit) && $now < strtotime('-' .  $ampel->vorlaufzeit . ' day', $datum->mktime_fromdate($ampel->deadline)))
+				||
+				// ampel ist vor Arbeitsstart abgelaufen
+				(isset($ampel->verfallszeit) && $benutzerStartDate > strtotime('+' . $ampel->verfallszeit . ' day', $datum->mktime_fromdate($ampel->deadline)))
+				||
+				// ampel ist vor Arbeitsstart abgelaufen (verfallszeit nicht vorhanden)
+				($benutzerStartDate > strtotime('+' . $ampel->verfallszeit . ' day', $datum->mktime_fromdate($ampel->deadline)))
 			){
-				$zugeteile_ampeln[] = $ampel;
+				// continue iteration if ampel is expired before work start or shouldn't be visible yet
+				continue;
 			}
+
+			$ampel->zugeteilt = $zugeteilt;
+
+			if($zugeteilt) $zugeteile_ampeln[] = $ampel; 
+			   
 		}
 
 		return success($zugeteile_ampeln);
diff --git a/public/js/components/DashboardWidget/Ampel.js b/public/js/components/DashboardWidget/Ampel.js
index 271aa2326..1f1154a3b 100755
--- a/public/js/components/DashboardWidget/Ampel.js
+++ b/public/js/components/DashboardWidget/Ampel.js
@@ -52,18 +52,7 @@ export default {
                     default: return data;
                 }
         },
-        isExpiredAmpel(ampel){
         
-            let deadline = new Date(ampel.deadline);
-            if(ampel.verfallszeit instanceof Number) deadline.setDate(deadline.getDate() + ampel.verfallszeit);
-            deadline.setHours(0, 0, 0, 0); 
-
-            let today = new Date();
-            today.setHours(0, 0, 0, 0);
-
-            return deadline < today ? true : false;
-            
-        },
 
         toggleFilter(value){
             this.filter === value ? this.filter = '' : this.filter = value;
@@ -87,27 +76,31 @@ export default {
         closeOffcanvas(){
             this.filter = '';
         },
-        async fetchActiveAmpeln(){
+        async fetchNonConfirmedActiveAmpeln(){
 
             await this.$fhcApi.factory.ampeln.getNonConfirmedActiveAmpeln().then(res=>{
                 this.activeAmpeln = res.data.sort((a,b) => new Date(b.deadline) - new Date(a.deadline));
             }); 
         },
-        async fetchAllAmpeln(){
+        async fetchAllActiveAmpeln(){
 
-            await this.$fhcApi.factory.ampeln.alleAmpeln().then(res=>{
+            await this.$fhcApi.factory.ampeln.getAllActiveAmpeln().then(res=>{
                 this.allAmpeln = res.data.sort((a,b) => new Date(b.deadline) - new Date(a.deadline));
             }); 
         },
         async confirm(ampelId){
-            await this.$fhcApi.factory.ampeln.confirmAmpel(ampelId).then(res =>{
-                res.data ? this.$toast.success('Ampel bestätigt') : this.$toast.error('Fehler beim Bestätigen der Ampel');
+            this.$fhcApi.factory.ampeln.confirmAmpel(ampelId).then(res =>{
+                // response of the enpoint when confirming an ampel (true if confirmed and false if not confirmed)
+                if(res.data){
+                    console.log("ampel was successfully confirmed");
+                }else{
+                    console.error("ampel was not successfully confirmed");
+                } 
             });
 
-            // fetch all the ampeln after an ampel has been confirmed
-            await this.fetchActiveAmpeln();
-            await this.fetchAllAmpeln();
-
+            // update the ampeln by refetching them
+            this.fetchNonConfirmedActiveAmpeln();
+            this.fetchAllActiveAmpeln();
         },
         validateBtnTxt(buttontext){
 
@@ -124,8 +117,8 @@ export default {
     },
     async mounted() {
         
-        await this.fetchActiveAmpeln();
-        await this.fetchAllAmpeln();
+        await this.fetchNonConfirmedActiveAmpeln();
+        await this.fetchAllActiveAmpeln();
     },
     template: /*html*/`
     <div class="widgets-ampel w-100 h-100">
@@ -197,7 +190,7 @@ export default {
             </div>
             <div v-for="ampel in ampelnComputed" :key="ampel.ampel_id" class="mt-2">
                 <ul class="list-group">
-                <li :style="{...(isExpiredAmpel(ampel)? {'background':'#E2E3E5'} : {})}" class="list-group-item small">
+                <li class="list-group-item small">
                 <div class="position-relative"><!-- prevents streched-link from stretching outside this parent element -->
                     <div class="d-flex">
                         <span class="small text-muted me-auto"><small>Deadline: {{ getDate(ampel.deadline) }}</small></span>
@@ -205,11 +198,11 @@ export default {
                         <div v-if="ampel.verpflichtend"><span class="badge bg-warning ms-1"><i class="fa fa-solid fa-triangle-exclamation"></span></div>
                         <div v-if="ampel.bestaetigt"><span class="badge bg-success ms-1"><i class="fa fa-solid fa-circle-check"></i></span></div>
                     </div>
-                    <a :class="{...(isExpiredAmpel(ampel)? {'text-reset':true, 'text-decoration-none':true} : {})}" :href="'#ampelCollapse_' + ampel.ampel_id" data-bs-toggle="collapse" class="stretched-link">{{ ampel.kurzbz }}</a><br>
+                    <a :href="'#ampelCollapse_' + ampel.ampel_id" data-bs-toggle="collapse" class="stretched-link">{{ ampel.kurzbz }}</a><br>
                 </div>
                 <div class="collapse my-3" :id="'ampelCollapse_' + ampel.ampel_id" :ref="'ampelCollapse_' + ampel.ampel_id">
                     <div v-html="ampel.beschreibung"></div>
-                    <div v-if="!isExpiredAmpel(ampel)" class="d-flex justify-content-end mt-3">
+                    <div v-if="!ampel.bestaetigt " class="d-flex justify-content-end mt-3">
                         <button  class="btn btn-sm btn-primary" :class="{disabled: ampel.bestaetigt}" @click="confirm(ampel.ampel_id)">{{ validateBtnTxt(ampel.buttontext) }}</button>
                     </div>
                 </div>

From f4210e7671060b6c854223056433c0f5b1e06b67 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 29 Jul 2024 13:44:17 +0200
Subject: [PATCH 1016/1461] fixes the Vue component layout for the ampeln
 dashboardwidget

---
 public/js/components/DashboardWidget/Ampel.js | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/public/js/components/DashboardWidget/Ampel.js b/public/js/components/DashboardWidget/Ampel.js
index 1f1154a3b..7aaf152ec 100755
--- a/public/js/components/DashboardWidget/Ampel.js
+++ b/public/js/components/DashboardWidget/Ampel.js
@@ -17,13 +17,16 @@ export default {
         AbstractWidget
     ],
     computed: {
+        widgetAmpelMAX(){
+            return widgetAmpelMAX;
+        },
         ampelnComputed(){
             
             switch(this.source)
             {
                 case 'offen': return this.applyFilter(this.activeAmpeln);
                 case 'alle': return this.applyFilter(this.allAmpeln);
-                default: return this.activeAmpeln; 
+                default: return this.applyFilter(this.activeAmpeln); 
             }
             
         },
@@ -63,7 +66,9 @@ export default {
             for (let i = 0; i < this.ampelnComputed.length; i++)
             {
                 let ampelId = this.ampelnComputed[i].ampel_id;
-                this.$refs['ampelCollapse_' + ampelId][0].classList.remove('show');
+                if(this.$refs['ampelCollapse_' + ampelId]){
+                    this.$refs['ampelCollapse_' + ampelId][0].classList.remove('show');
+                } 
             }
         },
         openOffcanvasAmpel(ampelId){
@@ -74,7 +79,9 @@ export default {
             this.$refs['ampelCollapse_' + ampelId][0].classList.add('show');
         },
         closeOffcanvas(){
+            this.closeOffcanvasAmpeln();
             this.filter = '';
+            // maybe we also want to reset the source (open/alle) of the displayed ampeln
         },
         async fetchNonConfirmedActiveAmpeln(){
 
@@ -153,8 +160,9 @@ export default {
             </div>
         </div>
         <div v-else>
-        <header class="me-auto"><b>Neueste Ampeln</b></header>
+        <header class="me-auto"><b>Neueste Ampeln </b></header>
             <template v-for="n in widgetAmpelMAX">
+            
                 <div class="mt-2 card" aria-hidden="true">
                 <div class="card-body">
                     <p class="card-text placeholder-glow">

From f2b81ea68c99eb72c5a8ef1bb338168a041e94f9 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 29 Jul 2024 13:58:20 +0200
Subject: [PATCH 1017/1461] Bug: Anzeige Statusgrund

---
 .../Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index 585dd2977..c49558438 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -101,7 +101,7 @@ export default{
 					{title: "Studienplan", field: "bezeichnung"},
 					{title: "BestätigtAm", field: "format_bestaetigtam"},
 					{title: "AbgeschicktAm", field: "format_bewerbung_abgeschicktamum", visible:false},
-					{title: "Statusgrund", field: "statusgrund_beschreibung"},
+					{title: "Statusgrund", field: "statusgrund_bezeichnung"},
 					{title: "Organisationsform", field: "orgform_kurzbz", visible: false},
 					{title: "PrestudentInId", field: "prestudent_id", visible: false},
 					{title: "StudienplanId", field: "studienplan_id", visible: false},

From e6684a0116d11358e9285632bca69c50d6b01b6c Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 29 Jul 2024 17:41:24 +0200
Subject: [PATCH 1018/1461] add db view that contains oe path

---
 system/dbupdate_3.4.php                       |  1 +
 system/dbupdate_3.4/41150_oe-pfad_db_view.php | 37 +++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 system/dbupdate_3.4/41150_oe-pfad_db_view.php

diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index 9fb7f0ee9..f728910e9 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -56,6 +56,7 @@ require_once('dbupdate_3.4/36530_bis_internationsalisierung_codextabelle_neuerun
 require_once('dbupdate_3.4/34543_ux_template.php');
 require_once('dbupdate_3.4/17513_Entwicklungsteam.php');
 require_once('dbupdate_3.4/28575_softwarebereitstellung.php');
+require_once('dbupdate_3.4/41150_oe-pfad_db_view.php');
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
diff --git a/system/dbupdate_3.4/41150_oe-pfad_db_view.php b/system/dbupdate_3.4/41150_oe-pfad_db_view.php
new file mode 100644
index 000000000..077033fbb
--- /dev/null
+++ b/system/dbupdate_3.4/41150_oe-pfad_db_view.php
@@ -0,0 +1,37 @@
+<?php
+if (! defined('DB_NAME')) exit('No direct script access allowed');
+
+if ($result = $db->db_query("SELECT * FROM information_schema.views WHERE table_catalog = '" . DB_NAME . "' AND table_schema = 'public' AND table_name = 'vw_oe_path'"))
+{
+    if($db->db_num_rows($result) == 0)
+    {
+	$qry = "
+	    CREATE OR REPLACE VIEW public.vw_oe_path AS
+		WITH RECURSIVE vw_oe_path(oe_kurzbz, bezeichnung, oe_parent_kurzbz, organisationseinheittyp_kurzbz, oetyp_bezeichnung, depth, path) AS (
+		  SELECT 
+		    oe.oe_kurzbz, oe.bezeichnung, oe.oe_parent_kurzbz, oe.organisationseinheittyp_kurzbz, oetyp.bezeichnung AS oetyp_bezeichnung, 0, '/' || oetyp.bezeichnung || ' ' || oe.bezeichnung AS path 
+		  FROM 
+		    public.tbl_organisationseinheit oe
+		  JOIN
+		    public.tbl_organisationseinheittyp oetyp USING(organisationseinheittyp_kurzbz)
+		  WHERE
+		    oe.oe_parent_kurzbz IS NULL
+		  UNION ALL
+		  SELECT 
+		    oe.oe_kurzbz, oe.bezeichnung, oe.oe_parent_kurzbz, oe.organisationseinheittyp_kurzbz, oetyp.bezeichnung AS oetyp_bezeichnung, depth + 1, oet.path || '/'  || oetyp.bezeichnung || ' ' || oe.bezeichnung
+		  FROM 
+		    public.tbl_organisationseinheit oe, vw_oe_path oet
+		  JOIN
+		    public.tbl_organisationseinheittyp oetyp USING(organisationseinheittyp_kurzbz)
+		  WHERE
+		    oe.oe_parent_kurzbz = oet.oe_kurzbz
+		)
+		SELECT * FROM vw_oe_path ORDER BY path, depth;
+		";
+	
+	if (!$db->db_query($qry))
+		echo '<strong>public.vw_oe_path: ' . $db->db_last_error() . '</strong><br />';
+	else
+		echo 'public.vw_oe_path: erstellt<br />';
+    }
+}

From d0f3cee7de0dd7a1ba5c5b42702ff1db88301ddb Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 29 Jul 2024 18:11:13 +0200
Subject: [PATCH 1019/1461] add permissions for vw_oe_path

---
 system/dbupdate_3.4/41150_oe-pfad_db_view.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/system/dbupdate_3.4/41150_oe-pfad_db_view.php b/system/dbupdate_3.4/41150_oe-pfad_db_view.php
index 077033fbb..c108fcd77 100644
--- a/system/dbupdate_3.4/41150_oe-pfad_db_view.php
+++ b/system/dbupdate_3.4/41150_oe-pfad_db_view.php
@@ -27,6 +27,8 @@ if ($result = $db->db_query("SELECT * FROM information_schema.views WHERE table_
 		    oe.oe_parent_kurzbz = oet.oe_kurzbz
 		)
 		SELECT * FROM vw_oe_path ORDER BY path, depth;
+
+		GRANT SELECT ON public.vw_oe_path TO vilesci;
 		";
 	
 	if (!$db->db_query($qry))

From 8a637f3fa92b41daa29f6b6a76e2cf2e4c83d138 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 30 Jul 2024 09:54:46 +0200
Subject: [PATCH 1020/1461] Fix List Reload Bug

---
 public/js/components/Stv/Studentenverwaltung/List.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index 7248bb113..8eaf7847c 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -119,6 +119,7 @@ export default {
 			this.$refs.new.open();
 		},
 		rowSelectionChanged(data) {
+			this.lastSelected = this.selected;
 			this.$emit('update:selected', data);
 		},
 		autoSelectRows(data) {
@@ -129,8 +130,6 @@ export default {
 				// or maybe reselect only the last one?
 				selected = selected.filter(el => el);
 
-				this.lastSelected = null;
-
 				if (selected.length)
 					this.$refs.table.tabulator.selectRow(selected);
 			} else if(this.lastSelected === undefined) {

From dd23bc26a21e9209690b56390512b574cd22bfc8 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 30 Jul 2024 09:57:37 +0200
Subject: [PATCH 1021/1461] Improvements: Status delete

---
 .../api/frontend/v1/stv/Status.php            | 501 ++++--------------
 .../models/crm/Prestudentstatus_model.php     |   6 +-
 .../Details/Prestudent/MultiStatus.js         |  47 +-
 3 files changed, 134 insertions(+), 420 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index e1f713e1e..cbf6befa5 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -19,7 +19,7 @@ class Status extends FHCAPI_Controller
 			'isErsterStudent' => self::PERM_LOGGED,
 			'hasStatusBewerber' => self::PERM_LOGGED,
 			'getStatusarray' => self::PERM_LOGGED,
-			'deleteStatus' => ['admin:r','assistenz:r'],
+			'deleteStatus' => ['admin:rw','assistenz:rw'],
 			'loadStatus' => ['admin:r', 'assistenz:r'],
 			'insertStatus' => ['admin:rw', 'assistenz:rw'],
 			'updateStatus' => ['admin:rw', 'assistenz:rw'],
@@ -40,6 +40,7 @@ class Status extends FHCAPI_Controller
 		if ($this->router->method == 'insertStatus'
 			|| $this->router->method == 'updateStatus'
 			|| $this->router->method == 'confirmStatus'
+			|| $this->router->method == 'deleteStatus'
 		) {
 			$prestudent_id = current(array_slice($this->uri->rsegments, 2));
 			$this->checkPermissionsForPrestudent($prestudent_id, ['admin:rw', 'assistenz:rw']);
@@ -882,140 +883,61 @@ class Status extends FHCAPI_Controller
 		}
 	}
 
-	public function deleteStatus()
+	public function deleteStatus($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester)
 	{
-		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-
-		$prestudent_id = $this->input->post('prestudent_id');
-		$status_kurzbz = $this->input->post('status_kurzbz');
-		$ausbildungssemester = $this->input->post('ausbildungssemester');
-		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
-		$deletePrestudent = false;
-
-		//get Studiengang von prestudent_id
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-		$result = $this->PrestudentModel->load([
-			'prestudent_id'=> $prestudent_id,
+		$result = $this->PrestudentstatusModel->load([
+			$ausbildungssemester,
+			$studiensemester_kurzbz,
+			$status_kurzbz,
+			$prestudent_id
 		]);
-		if(isError($result))
-		{
-			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-		$result = current(getData($result));
+		$oldstatus = $this->getDataOrTerminateWithError($result);
+		if (!$oldstatus)
+			show_404(); // Status that should be updated does not exist
 
-		$stg = $result->studiengang_kz;
+		$oldstatus = current($oldstatus);
 
-		$isBerechtigtAdmin = $this->permissionlib->isBerechtigt('admin', null, 'suid');
-		$isBerechtigtNoStudstatusCheck = $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung', null, 'suid');
-		$isBerechtigtToDeleteAbgewiesen = $this->permissionlib->isBerechtigt('lehre/reihungstestAufsicht') && $status_kurzbz == Prestudentstatus_model::STATUS_ABGEWIESENER;
 
-		if(!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg) && !$isBerechtigtToDeleteAbgewiesen)
-		{
-			return $this->terminateWithError($this->p->t('lehre','error_keineSchreibrechte'), self::ERROR_TYPE_GENERAL);
-		}
+		$erweiterteBerechtigung = $this->permissionlib->isBerechtigt('admin', null, 'suid') || $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung', null, 'suid');
 
-		if($status_kurzbz==Prestudentstatus_model::STATUS_STUDENT && !$isBerechtigtAdmin && !$isBerechtigtNoStudstatusCheck)
-		{
-			return $this->terminateWithError($this->p->t('lehre','error_onlyAdminDeleteRolleStudent'), self::ERROR_TYPE_GENERAL);
-		}
 
 		//check if last status
 		$result = $this->PrestudentstatusModel->checkIfLastStatusEntry($prestudent_id);
 
-		if (isError($result))
-		{
-			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-		if($result->retval)
-		{
-			//Berechtigungen nach Check prüfen!
-			if(!$isBerechtigtAdmin && !$isBerechtigtNoStudstatusCheck)
-			{
-				return $this->terminateWithError($this->p->t('lehre','error_onlyAdminDeleteLastStatus'), self::ERROR_TYPE_GENERAL);
-			}
-			else
-			{
-				$deletePrestudent = true;
-			}
+		$result = $this->getDataOrTerminateWithError($result);
+
+		$deletePrestudent = $result;
+
+
+		//Berechtigungen nach Check prüfen!
+		if (!$erweiterteBerechtigung) {
+			if ($status_kurzbz == Prestudentstatus_model::STATUS_STUDENT)
+				$this->terminateWithError(
+					$this->p->t('lehre', 'error_onlyAdminDeleteRolleStudent'),
+					self::ERROR_TYPE_GENERAL,
+					REST_Controller::HTTP_FORBIDDEN
+				);
+
+			if ($deletePrestudent)
+				$this->terminateWithError(
+					$this->p->t('lehre', 'error_onlyAdminDeleteLastStatus'),
+					self::ERROR_TYPE_GENERAL,
+					REST_Controller::HTTP_FORBIDDEN
+				);
+
+			$result = $this->prestudentstatuschecklib->checkIfMeldestichtagErreicht($oldstatus->datum);
+
+			if (!$this->getDataOrTerminateWithError($result))
+				$this->terminateWithError(
+					$this->p->t('lehre', 'error_dataVorMeldestichtag'),
+					self::ERROR_TYPE_GENERAL,
+					REST_Controller::HTTP_FORBIDDEN
+				);
 		}
 
 		// Start DB transaction
 		$this->db->trans_begin();
 
-		//load rolle für LOG sqlundo
-		$result = $this->PrestudentstatusModel->loadWhere(
-			array(
-				'prestudent_id' => $prestudent_id,
-				'status_kurzbz' => $status_kurzbz,
-				'ausbildungssemester' => $ausbildungssemester,
-				'studiensemester_kurzbz' => $studiensemester_kurzbz
-			)
-		);
-
-		if (isError($result))
-		{
-			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-		if (!hasData($result)) {
-			return $this->terminateWithError($this->p->t('lehre','error_noStatusFound'), self::ERROR_TYPE_GENERAL);
-
-		}
-
-		//Data of current Rolle
-		$statusData = current(getData($result));
-
-		$datum = $statusData->datum == '' ? 'null' : $statusData->datum;
-		$insertamum = $statusData->insertamum == '' ? 'null' : $statusData->insertamum;
-		$insertvon = $statusData->insertvon == '' ? 'null' : $statusData->insertvon;
-		$updateamum = $statusData->updateamum == '' ? 'null' : $statusData->updateamum;
-		$updatevon = $statusData->updatevon == '' ? 'null' : $statusData->updatevon;
-		$ext_id = $statusData->ext_id == '' ? 'null' : $statusData->ext_id;
-		$orgform_kurzbz = $statusData->orgform_kurzbz == '' ? 'null' : $statusData->orgform_kurzbz;
-		$bestaetigtam = $statusData->bestaetigtam == '' ? 'null' : $statusData->bestaetigtam;
-		$bestaetigtvon = $statusData->bestaetigtvon == '' ? 'null' : $statusData->bestaetigtvon;
-		$anmerkung = $statusData->anmerkung == '' ? 'null' : $statusData->anmerkung;
-		$bewerbung_abgeschicktamum = $statusData->bewerbung_abgeschicktamum == '' ? 'null' : $statusData->bewerbung_abgeschicktamum;
-		$studienplan_id = $statusData->studienplan_id == '' ? 'null' : $statusData->studienplan_id;
-		$rt_stufe = $statusData->rt_stufe == '' ? 'null' : $statusData->rt_stufe;
-		$statusgrund_id = $statusData->statusgrund_id == '' ? 'null' : $statusData->statusgrund_id;
-
-		$quotes_datum = $datum == "null" ? " " : "'";
-		$quotes_insertamum = $insertamum == "null" ? " " : "'";
-		$quotes_insertvon = $insertvon == "null" ? " " : "'";
-		$quotes_updateamum = $updateamum == "null" ? " " : "'";
-		$quotes_updatevon = $updatevon == "null" ? " " : "'";
-		$quotes_ext_id = $ext_id == "null" ? " " : "'";
-		$quotes_orgform_kurzbz = $orgform_kurzbz == "null" ? " " : "'";
-		$quotes_bestaetigtam = $bestaetigtam == "null" ? " " : "'";
-		$quotes_bestaetigtvon = $bestaetigtvon == "null" ? " " : "'";
-		$quotes_anmerkung = $anmerkung == "null" ? " " : "'";
-		$quotes_bewerbung_abgeschicktamum = $bewerbung_abgeschicktamum == "null" ? " " : "'";
-		$quotes_studienplan_id = $studienplan_id == "null" ? " " : "'";
-		$quotes_rt_stufe = $rt_stufe == "null" ? " " : "'";
-		$quotes_statusgrund_id = $statusgrund_id == "null" ? " " : "'";
-
-		$sqlundo =
-			"
-			INSERT INTO public.tbl_prestudentstatus(prestudent_id, status_kurzbz, studiensemester_kurzbz, ausbildungssemester,
-				datum, insertamum, insertvon, updateamum, updatevon, ext_id, orgform_kurzbz, bestaetigtam, bestaetigtvon,
-				anmerkung, bewerbung_abgeschicktamum, studienplan_id,  rt_stufe, statusgrund_id)
-			VALUES('" . $prestudent_id . "','" . $status_kurzbz . "','" . $studiensemester_kurzbz . "','" . $ausbildungssemester . "',"
-			. $quotes_datum . $datum . $quotes_datum . ","
-			. $quotes_insertamum . $insertamum . $quotes_insertamum . ","
-			. $quotes_insertvon . $insertvon . $quotes_insertvon . ","
-			. $quotes_updateamum . $updateamum . $quotes_updateamum . ","
-			. $quotes_updatevon . $updatevon . $quotes_updatevon . ","
-			. $quotes_ext_id . $ext_id . $quotes_ext_id . ","
-			. $quotes_orgform_kurzbz . $orgform_kurzbz . $quotes_orgform_kurzbz . ","
-			. $quotes_bestaetigtam . $bestaetigtam . $quotes_bestaetigtam . ","
-			. $quotes_bestaetigtvon . $bestaetigtvon . $quotes_bestaetigtvon . ","
-			. $quotes_anmerkung . $anmerkung . $quotes_anmerkung . ","
-			. $quotes_bewerbung_abgeschicktamum . $bewerbung_abgeschicktamum . $quotes_bewerbung_abgeschicktamum . ","
-			. $quotes_studienplan_id . $studienplan_id . $quotes_studienplan_id . ","
-			. $quotes_rt_stufe . $rt_stufe . $quotes_rt_stufe . ","
-			. $quotes_statusgrund_id . $statusgrund_id . $quotes_statusgrund_id . ");
-			";
-
 		//Delete Status
 		$result = $this->PrestudentstatusModel->delete(
 			[
@@ -1026,300 +948,83 @@ class Status extends FHCAPI_Controller
 			]
 		);
 
-		if($this->db->trans_status() === false || isError($result))
-		{
-			$this->db->trans_rollback();
-			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-		if(!hasData($result))
-		{
-			return $this->terminateWithError($this->p->t('lehre','error_noStatusFound'), self::ERROR_TYPE_GENERAL);
+		$this->getDataOrTerminateWithError($result);
 
-		}
+		//Delete Studentlehrverband if no Status left in this semester
+		$result = $this->PrestudentstatusModel->checkIfLastStatusEntry($prestudent_id, $studiensemester_kurzbz);
 
-		//save log delete prestudentstatus
-		$uid = getAuthUID();
-		$beschreibung = 'Loeschen der Rolle ' . $status_kurzbz . " bei " . $prestudent_id;
-		$sql = "DELETE FROM public.tbl_prestudentstatus
-                WHERE prestudent_id = " . $prestudent_id . "
-			  AND status_kurzbz = '" . $status_kurzbz . "'
-			  AND ausbildungssemester ='" . $ausbildungssemester . "'
-			  AND studiensemester_kurzbz = '" . $studiensemester_kurzbz . "'";
-
-		$this->load->model('system/Log_model', 'LogModel');
-		$result = $this->LogModel->insert([
-			'mitarbeiter_uid' => $uid,
-			'beschreibung' => $beschreibung,
-			'sql' => $sql,
-			'sqlundo' => $sqlundo
-		]);
-		if (isError($result) || !hasData($result))
-		{
-			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-
-		$logId = $result->retval;
-
-		//Delete Studentlehrverband if no Status left
-		$result = $this->PrestudentstatusModel->checkIfLastStudentStatusEntry($prestudent_id);
-
-		if (isError($result))
-		{
-			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-		if ($result->retval)
+		$result = $this->getDataOrTerminateWithError($result);
+		if ($result)
 		{
 			//get student_uid
 			$this->load->model('crm/Student_model', 'StudentModel');
-			$result = $this->StudentModel->checkIfUid($prestudent_id);
-			if (isError($result))
+			$result = $this->StudentModel->loadWhere([
+				'prestudent_id' => $prestudent_id
+			]);
+
+			$student = $this->getDataOrTerminateWithError($result);
+			if ($student)
 			{
-				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+				// TODO(chris): what if no student?
+				$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
+				$result = $this->StudentlehrverbandModel->delete(
+					array(
+						'student_uid' => $student->student_uid,
+						'studiensemester_kurzbz' => $studiensemester_kurzbz
+					)
+				);
+
+				$this->getDataOrTerminateWithError($result);
 			}
-			if (!hasData($result))
-			{
-				return $this->terminateWithError($this->p->t('studierendenantrag','error_no_student_for_prestudent',['prestudent_id' => $prestudent_id]), self::ERROR_TYPE_GENERAL);
-			}
-			$student_uid = $result->retval;
-
-			$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
-			$result = $this->StudentlehrverbandModel->delete(
-				array(
-					'student_uid' => $student_uid,
-					'studiensemester_kurzbz' => $studiensemester_kurzbz
-				)
-			);
-
-			if ($this->db->trans_status() === false || isError($result) || !hasData($result))
-			{
-				$this->db->trans_rollback();
-
-				return $this->terminateWithError($this->p->t('lehre','error_duringDeleteLehrverband'), self::ERROR_TYPE_GENERAL);
-			}
-
 		}
 		//Delete Prestudent if no data is left
-		if($deletePrestudent && $isBerechtigtAdmin)
+		if ($deletePrestudent)
 		{
-			//TODO(manu) check all connected tables, Handling of Deletion
-			//check if existing dokumentprestudent
-			$this->load->model('crm/Dokumentprestudent_model', 'DokumentprestudentModel');
-			$result = $this->DokumentprestudentModel->loadWhere(
-				array(
-					'prestudent_id' => $prestudent_id
-				)
-			);
-			if (isError($result))
-			{
-				$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			/*
+				//TODO(manu) check all connected tables, Handling of Deletion
+				//check if existing dokumentprestudent
+				$this->load->model('crm/Dokumentprestudent_model', 'DokumentprestudentModel');
+				$result = $this->DokumentprestudentModel->loadWhere(
+					array(
+						'prestudent_id' => $prestudent_id
+					)
+				);
+				if (isError($result))
+				{
+					$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 
-			}
-			if (hasData($result))
-			{
-				return $this->terminateWithError("Es sind noch zu loeschende Dokumente vorhanden: ", self::ERROR_TYPE_GENERAL);
-			}
-
-			//check if Anrechnungen tbl_anrechnung
-			$output_anrechnungen = '';
-			$this->load->model('education/Anrechnung_model', 'AnrechnungModel');
-			$result = $this->AnrechnungModel->loadWhere(
-				array(
-					'prestudent_id' => $prestudent_id
-				)
-			);
-			if (isError($result))
-			{
-				$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-			}
-			if (hasData($result))
-			{
-				return $this->terminateWithError("Mit dieser Prestudent_id sind verbundene Anrechnungen vorhanden!", self::ERROR_TYPE_GENERAL);
-			}
+				}
+				if (hasData($result))
+				{
+					return $this->terminateWithError("Es sind noch zu loeschende Dokumente vorhanden: ", self::ERROR_TYPE_GENERAL);
+				}
 
+				//check if Anrechnungen tbl_anrechnung
+				$output_anrechnungen = '';
+				$this->load->model('education/Anrechnung_model', 'AnrechnungModel');
+				$result = $this->AnrechnungModel->loadWhere(
+					array(
+						'prestudent_id' => $prestudent_id
+					)
+				);
+				if (isError($result))
+				{
+					$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+				}
+				if (hasData($result))
+				{
+					return $this->terminateWithError("Mit dieser Prestudent_id sind verbundene Anrechnungen vorhanden!", self::ERROR_TYPE_GENERAL);
+				}
+			*/
 			//DELETE Prestudent
-
-			//save log delete prestudent
-			$uid = getAuthUID();
-			$beschreibung = 'Loeschen der Prestudent ID ' . $prestudent_id;
-			$sql = "DELETE FROM public.tbl_prestudent
-                WHERE prestudent_id = " . $prestudent_id;
-
-			//load prestudent für LOG sqlundo
 			$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-			$result = $this->PrestudentModel->loadWhere(
-				array(
-					'prestudent_id' => $prestudent_id
-				)
-			);
-			if (isError($result) || !hasData($result))
-			{
-				//TODO(Manu) in this case: löschen status erlauben aber rückmeldung, dass Prestudent nicht gelöscht wurde
-				return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-			}
+			$result = $this->PrestudentModel->delete($prestudent_id);
 
-			//Data of current Prestudent
-			$prestudentData = current(getData($result));
-
-			$aufmerksamdurch_kurzbz = $prestudentData->aufmerksamdurch_kurzbz == '' ? 'null' : $prestudentData->aufmerksamdurch_kurzbz;
-			$studiengang_kz = $prestudentData->studiengang_kz == '' ? 'null' : $prestudentData->studiengang_kz;
-			$berufstaetigkeit_code = $prestudentData->berufstaetigkeit_code == '' ? 'null' : $prestudentData->berufstaetigkeit_code;
-			$ausbildungcode = $prestudentData->ausbildungcode == '' ? 'null' : $prestudentData->ausbildungcode;
-			$zgv_code = $prestudentData->zgv_code == '' ? 'null' : $prestudentData->zgv_code;
-			$zgvort = $prestudentData->zgvort == '' ? 'null' : $prestudentData->zgvort;
-			$zgvdatum = $prestudentData->zgvdatum == '' ? 'null' : $prestudentData->zgvdatum;
-			$zgvnation = $prestudentData->zgvnation == '' ? 'null' : $prestudentData->zgvnation;
-			$zgv_erfuellt = $prestudentData->zgv_erfuellt == '' ? 'null' : $prestudentData->zgv_erfuellt;
-			$zgvmas_code = $prestudentData->zgvmas_code == '' ? 'null' : $prestudentData->zgvmas_code;
-			$zgvmaort = $prestudentData->zgvmaort == '' ? 'null' : $prestudentData->zgvmaort;
-			$zgvmadatum = $prestudentData->zgvmadatum == '' ? 'null' : $prestudentData->zgvmadatum;
-			$zgvmanation = $prestudentData->zgvmanation == '' ? 'null' : $prestudentData->zgvmanation;
-			$zgvmas_erfuellt = $prestudentData->zgvmas_erfuellt == '' ? 'null' : $prestudentData->zgvmas_erfuellt;
-			$aufnahmeschluessel = $prestudentData->aufnahmeschluessel == '' ? 'null' : $prestudentData->aufnahmeschluessel;
-			$facheinschlberuf = $prestudentData->facheinschlberuf == '' ? 'null' : $prestudentData->facheinschlberuf;
-			$anmeldungreihungstest = $prestudentData->anmeldungreihungstest == '' ? 'null' : $prestudentData->anmeldungreihungstest;
-			$reihungstestangetreten = $prestudentData->reihungstestangetreten == 1 ? 'true' : 'false';
-			$reihungstest_id = $prestudentData->reihungstest_id == '' ? 'null' : $prestudentData->reihungstest_id;
-			$rt_gesamtpunkte = $prestudentData->rt_gesamtpunkte == '' ? 'null' : $prestudentData->rt_gesamtpunkte;
-			$rt_punkte1 = $prestudentData->rt_punkte1 == '' ? 'null' : $prestudentData->rt_punkte1;
-			$rt_punkte2 = $prestudentData->rt_punkte2 == '' ? 'null' : $prestudentData->rt_punkte2;
-			$rt_punkte3 = $prestudentData->rt_punkte3 == '' ? 'null' : $prestudentData->rt_punkte3;
-			$bismelden = $prestudentData->bismelden == 1 ? 'true' : 'false';
-			$person_id = $prestudentData->person_id == '' ? 'null' : $prestudentData->person_id;
-			$anmerkung = $prestudentData->anmerkung == '' ? 'null' : $prestudentData->anmerkung;
-			$mentor = $prestudentData->mentor == '' ? 'null' : $prestudentData->mentor;
-			$ext_id = $prestudentData->ext_id == '' ? 'null' : $prestudentData->ext_id;
-			$dual = $prestudentData->dual == 1 ? 'true' : 'false';
-			$ausstellungsstaat = $prestudentData->ausstellungsstaat == '' ? 'null' : $prestudentData->ausstellungsstaat;
-			$zgvdoktor_code = $prestudentData->zgvdoktor_code == '' ? 'null' : $prestudentData->zgvdoktor_code;
-			$zgvdoktorort = $prestudentData->zgvdoktorort == '' ? 'null' : $prestudentData->zgvdoktorort;
-			$zgvdoktordatum = $prestudentData->zgvdoktordatum == '' ? 'null' : $prestudentData->zgvdoktordatum;
-			$zgvdoktornation = $prestudentData->zgvdoktornation == '' ? 'null' : $prestudentData->zgvdoktornation;
-			$gsstudientyp_kurzbz = $prestudentData->gsstudientyp_kurzbz == '' ? 'null' : $prestudentData->gsstudientyp_kurzbz;
-			$aufnahmegruppe_kurzbz = $prestudentData->aufnahmegruppe_kurzbz == '' ? 'null' : $prestudentData->aufnahmegruppe_kurzbz;
-			$priorisierung = $prestudentData->priorisierung == '' ? 'null' : $prestudentData->priorisierung;
-			$zgvdoktor_erfuellt= $prestudentData->zgvdoktor_erfuellt == '' ? 'null' : $prestudentData->zgvdoktor_erfuellt;
-
-			$quotes_aufmerksamdurch_kurzbz = $aufmerksamdurch_kurzbz == "null" ? " " : "'";
-			$quotes_studiengang_kz = $studiengang_kz == "null" ? " " : "'";
-			$quotes_berufstaetigkeit_code = $berufstaetigkeit_code == "null" ? " " : "'";
-			$quotes_ausbildungcode = $ausbildungcode == "null" ? " " : "'";
-			$quotes_zgv_code = $zgv_code == "null" ? " " : "'";
-			$quotes_zgvort = $zgvort == "null" ? " " : "'";
-			$quotes_zgvdatum = $zgvdatum == "null" ? " " : "'";
-			$quotes_zgvnation = $zgvnation == "null" ? " " : "'";
-			$quotes_zgv_erfuellt = $zgv_erfuellt == "null" ? " " : "'";
-			$quotes_zgvmas_code = $zgvmas_code == "null" ? " " : "'";
-			$quotes_zgvmaort = $zgvmaort == "null" ? " " : "'";
-			$quotes_zgvmadatum = $zgvmadatum == "null" ? " " : "'";
-			$quotes_zgvmanation = $zgvmanation == "null" ? " " : "'";
-			$quotes_zgvmas_erfuellt = $zgvmas_erfuellt == "null" ? " " : "'";
-			$quotes_aufnahmeschluessel = $aufnahmeschluessel == "null" ? " " : "'";
-			$quotes_facheinschlberuf = $facheinschlberuf == "null" ? " " : "'";
-			$quotes_anmeldungreihungstest = $anmeldungreihungstest == "null" ? " " : "'";
-			$quotes_reihungstestangetreten = $reihungstestangetreten == "null" ? " " : "'";
-			$quotes_reihungstest_id = $reihungstest_id == "null" ? " " : "'";
-			$quotes_rt_gesamtpunkte = $rt_gesamtpunkte == "null" ? " " : "'";
-			$quotes_rt_punkte1 = $rt_punkte1 == "null" ? " " : "'";
-			$quotes_rt_punkte2 = $rt_punkte2 == "null" ? " " : "'";
-			$quotes_rt_punkte3 = $rt_punkte3 == "null" ? " " : "'";
-			$quotes_bismelden = $bismelden == "null" ? " " : "'";
-			$quotes_person_id = $person_id == "null" ? " " : "'";
-			$quotes_anmerkung = $anmerkung == "null" ? " " : "'";
-			$quotes_mentor = $mentor == "null" ? " " : "'";
-			$quotes_ext_id = $ext_id == "null" ? " " : "'";
-			$quotes_dual = $dual == "null" ? " " : "'";
-			$quotes_ausstellungsstaat = $ausstellungsstaat == "null" ? " " : "'";
-			$quotes_zgvdoktor_code = $zgvdoktor_code == "null" ? " " : "'";
-			$quotes_zgvdoktorort = $zgvdoktorort == "null" ? " " : "'";
-			$quotes_zgvdoktordatum = $zgvdoktordatum == "null" ? " " : "'";
-			$quotes_zgvdoktornation = $zgvdoktornation == "null" ? " " : "'";
-			$quotes_gsstudientyp_kurzbz = $gsstudientyp_kurzbz == "null" ? " " : "'";
-			$quotes_aufnahmegruppe_kurzbz = $aufnahmegruppe_kurzbz == "null" ? " " : "'";
-			$quotes_priorisierung = $priorisierung == "null" ? " " : "'";
-			$quotes_zgvdoktor_erfuellt = $zgvdoktor_erfuellt == "null" ? " " : "'";
-
-
-			$sqlundo =
-				"
-				INSERT INTO public.tbl_prestudent(prestudent_id, aufmerksamdurch_kurzbz, studiengang_kz, berufstaetigkeit_code, ausbildungcode,
-				zgv_code, zgvort, zgvdatum, zgvnation,zgv_erfuellt, zgvmas_code, zgvmaort, zgvmadatum, zgvmanation,zgvmas_erfuellt,
-				aufnahmeschluessel, facheinschlberuf, anmeldungreihungstest, reihungstestangetreten, reihungstest_id,
-				rt_gesamtpunkte, rt_punkte1, rt_punkte2, rt_punkte3, bismelden, person_id, anmerkung, mentor, ext_id,
-				dual, ausstellungsstaat, zgvdoktor_code, zgvdoktorort, zgvdoktordatum, zgvdoktornation,
-				gsstudientyp_kurzbz, aufnahmegruppe_kurzbz, priorisierung, zgvdoktor_erfuellt)
-				VALUES('" . $prestudent_id . "',"
-				. $quotes_aufmerksamdurch_kurzbz . $aufmerksamdurch_kurzbz . $quotes_aufmerksamdurch_kurzbz . ","
-				. $quotes_studiengang_kz . $studiengang_kz . $quotes_studiengang_kz . ","
-				. $quotes_berufstaetigkeit_code . $berufstaetigkeit_code . $quotes_berufstaetigkeit_code . ","
-				. $quotes_ausbildungcode . $ausbildungcode . $quotes_ausbildungcode . ","
-				. $quotes_zgv_code . $zgv_code . $quotes_zgv_code . ","
-				. $quotes_zgvort . $zgvort . $quotes_zgvort . ","
-				. $quotes_zgvdatum . $zgvdatum . $quotes_zgvdatum . ","
-				. $quotes_zgvnation . $zgvnation . $quotes_zgvnation . ","
-				. $quotes_zgv_erfuellt . $zgv_erfuellt . $quotes_zgv_erfuellt . ","
-				. $quotes_zgvmas_code . $zgvmas_code . $quotes_zgvmas_code . ","
-				. $quotes_zgvmaort . $zgvmaort . $quotes_zgvmaort . ","
-				. $quotes_zgvmadatum . $zgvmadatum . $quotes_zgvmadatum . ","
-				. $quotes_zgvmanation . $zgvmanation . $quotes_zgvmanation . ","
-				. $quotes_zgvmas_erfuellt . $zgvmas_erfuellt . $quotes_zgvmas_erfuellt . ","
-				. $quotes_aufnahmeschluessel . $aufnahmeschluessel . $quotes_aufnahmeschluessel . ","
-				. $quotes_facheinschlberuf . $facheinschlberuf . $quotes_facheinschlberuf . ","
-				. $quotes_anmeldungreihungstest . $anmeldungreihungstest . $quotes_anmeldungreihungstest . ","
-				. $quotes_reihungstestangetreten . $reihungstestangetreten . $quotes_reihungstestangetreten . ","
-				. $quotes_reihungstest_id . $reihungstest_id . $quotes_reihungstest_id . ","
-				. $quotes_rt_gesamtpunkte . $rt_gesamtpunkte . $quotes_rt_gesamtpunkte . ","
-				. $quotes_rt_punkte1 . $rt_punkte1 . $quotes_rt_punkte1 . ","
-				. $quotes_rt_punkte2 . $rt_punkte2 . $quotes_rt_punkte2 . ","
-				. $quotes_rt_punkte3 . $rt_punkte3 . $quotes_rt_punkte3 . ","
-				. $quotes_bismelden . $bismelden . $quotes_bismelden . ","
-				. $quotes_person_id . $person_id . $quotes_person_id . ","
-				. $quotes_anmerkung . $anmerkung . $quotes_anmerkung . ","
-				. $quotes_mentor . $mentor . $quotes_mentor . ","
-				. $quotes_ext_id . $ext_id . $quotes_ext_id . ","
-				. $quotes_dual . $dual . $quotes_dual . ","
-				. $quotes_ausstellungsstaat . $ausstellungsstaat . $quotes_ausstellungsstaat . ","
-				. $quotes_zgvdoktor_code . $zgvdoktor_code . $quotes_zgvdoktor_code . ","
-				. $quotes_zgvdoktorort . $zgvdoktorort . $quotes_zgvdoktorort . ","
-				. $quotes_zgvdoktordatum . $zgvdoktordatum . $quotes_zgvdoktordatum . ","
-				. $quotes_zgvdoktornation . $zgvdoktornation . $quotes_zgvdoktornation . ","
-				. $quotes_gsstudientyp_kurzbz . $gsstudientyp_kurzbz . $quotes_gsstudientyp_kurzbz . ","
-				. $quotes_aufnahmegruppe_kurzbz . $aufnahmegruppe_kurzbz . $quotes_aufnahmegruppe_kurzbz . ","
-				. $quotes_priorisierung . $priorisierung . $quotes_priorisierung . ","
-				. $quotes_zgvdoktor_erfuellt . $zgvdoktor_erfuellt . $quotes_zgvdoktor_erfuellt . ");
-			";
-
-			$this->load->model('system/Log_model', 'LogModel');
-			$result = $this->LogModel->insert([
-				'mitarbeiter_uid' => $uid,
-				'beschreibung' => $beschreibung,
-				'sql' => $sql,
-				'sqlundo' => $sqlundo
-			]);
-			if (isError($result) || !hasData($result))
-			{
-				return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-			}
-
-			//$logId = $result->retval;
-
-			//independent transaction
-			$this->db->trans_start();
-
-			$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-			$result = $this->PrestudentModel->delete(
-				array(
-					'prestudent_id' => $prestudent_id
-				)
-			);
-			if ($this->db->trans_status() === false)
-			{
-				$this->db->trans_rollback();
-				$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-			}
-			$this->db->trans_commit();
-			$this->terminateWithSuccess($result);
+			$this->getDataOrTerminateWithError($result);
 		}
-		$this->db->trans_commit();
+
+		$this->db->trans_rollback(); // TODO(chris): DEBUG!
+		#$this->db->trans_commit();
 
 		return $this->terminateWithSuccess(true);
 	}
diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php
index f99a8e73f..8ba52ba2d 100644
--- a/application/models/crm/Prestudentstatus_model.php
+++ b/application/models/crm/Prestudentstatus_model.php
@@ -486,13 +486,17 @@ class Prestudentstatus_model extends DB_Model
 	 * Check if there is only one prestudentstatus left
 	 *
 	 * @param integer					$prestudent_id
+	 * @param string					$studiensemester_kurzbz
 	 *
 	 * @return stdClass
 	 */
-	public function checkIfLastStatusEntry($prestudent_id)
+	public function checkIfLastStatusEntry($prestudent_id, $studiensemester_kurzbz = null)
 	{
 		$this->addSelect('COUNT(*) AS anzahl', false);
 
+		if ($studiensemester_kurzbz)
+			$this->db->where('studiensemester_kurzbz', $studiensemester_kurzbz);
+
 		$result = $this->loadWhere([
 			'prestudent_id' => $prestudent_id
 		]);
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index c49558438..5148b95b3 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -273,29 +273,34 @@ export default{
 		actionEditStatus(status, stdsem, ausbildungssemester) {
 			this.$refs.test.open(this.modelValue, status, stdsem, ausbildungssemester);
 		},
-		actionDeleteStatus(status, stdsem, ausbildungssemester){
-			this.statusId = {
-				'prestudent_id': this.modelValue.prestudent_id,
-				'status_kurzbz': status,
-				'studiensemester_kurzbz': stdsem,
-				'ausbildungssemester': ausbildungssemester
+		actionDeleteStatus(status, stdsem, ausbildungssemester) {
+			const statusId = {
+				prestudent_id: this.modelValue.prestudent_id,
+				status_kurzbz: status,
+				studiensemester_kurzbz: stdsem,
+				ausbildungssemester: ausbildungssemester
 			};
 
-			this.checkIfLastStatus();
-
-			this.loadStatus(this.statusId).then(() => {
-				if(this.statusData)
-				{
-					this.$fhcAlert
-						.confirmDelete()
-						.then(result => result
-							? this.statusId
-							: Promise.reject({handled: true}))
-						.then(this.deleteStatus)
-						.catch(this.$fhcAlert.handleSystemError);
-				}
-			});
-
+			this.$fhcAlert
+				.confirmDelete()
+				.then(result => result
+					? 'api/frontend/v1/stv/status/isLastStatus/' + statusId.prestudent_id
+					: Promise.reject({handled: true})
+				)
+				.then(this.$fhcApi.get)
+				.then(result => result.data
+					? new Promise((resolve, reject) => { BsConfirm.popup('TEST').then(resolve).catch(() => reject({handled:true})) })
+					: true
+				) // TODO(chris): correct confirm
+				.then(result => result
+					? 'api/frontend/v1/stv/status/deleteStatus/' + Object.values(statusId).join('/')
+					: Promise.reject({handled: true})
+				)
+				.then(this.$fhcApi.post)
+				.then(() => this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete')))
+				.then(this.reload)
+				.then(this.$reloadList)
+				.catch(this.$fhcAlert.handleSystemError);
 		},
 		actionAdvanceStatus(status, stdsem, ausbildungssemester){
 			this.statusId = {

From 1a4f04cb8109703f31ab691f6352c79b05fab56f Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 30 Jul 2024 11:16:32 +0200
Subject: [PATCH 1022/1461] Dropdown close & style improvements

---
 public/css/Studentenverwaltung.css            |  16 +-
 .../Details/Status/Dropdown.js                | 250 +++++++++---------
 2 files changed, 131 insertions(+), 135 deletions(-)

diff --git a/public/css/Studentenverwaltung.css b/public/css/Studentenverwaltung.css
index ff7fbb09f..efa4dbb1a 100644
--- a/public/css/Studentenverwaltung.css
+++ b/public/css/Studentenverwaltung.css
@@ -48,20 +48,8 @@ html {
 }
 
 /* Dropdown Toolbar Interessent, submenu */
-.dropdown-menu-right {
-	left: 100%;
-	top: 5;
-	margin-left: 0.1rem;
-	margin-top: -1rem;
-}
-
-.dropdown-submenu:hover>.dropdown-menu-right {
-	display: block;
-}
-
-.dropdown-submenu>.dropdown-menu-right {
-	display: none;
-	position: absolute;
+.dropend .dropdown-toggle.d-flex::after {
+	height: 0;
 }
 
 @media (min-width: 768px) {
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js b/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js
index a8bd7782a..5f10b2454 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js
@@ -154,6 +154,7 @@ export default {
 	},
 	methods: {
 		executeLink(link) {
+			bootstrap.Dropdown.getInstance(this.$refs.toolbarButton).hide();
 			// Split the link string to extract the function name and arguments
 			const match = link.match(/(\w+)\(([^)]*)\)/);
 			const functionName = match ? match[1] : link;
@@ -597,131 +598,138 @@ export default {
 			.catch(this.$fhcAlert.handleSystemError);
 	},
 	template: `
-		<div class="stv-status-dropdown">
-			
-			<!--Modal: ConfirmStatusAction-->
-			<BsModal ref="confirmStatusAction">
-				<template #title>{{$p.t('lehre', 'status_edit')}}</template>
-				<template #default>
-					<div v-if="prestudentIds.length == 1">
-						<p>{{$p.t('lehre', 'modal_StatusactionSingle', { status: actionStatusText })}}</p>
-					</div>
-					<div v-else>
-						<p>{{$p.t('lehre', 'modal_StatusactionPlural', { count: prestudentIds.length,
-					status: actionStatusText
-						})}}</p>
-					</div>
-					
-				</template>
-				<template #footer>	
-					<!--Action changeStatus-->
-					<div>
-						<button  ref="Close" type="button" class="btn btn-primary" @click="changeStatus(prestudentIds)">OK</button>
-					</div>				
-				</template>
-			</BsModal>
-								
-			<!--Modal: askForAusbildungssemester-->
-			<BsModal ref="askForAusbildungssemester">
-				<template #title>{{$p.t('lehre', 'status_edit')}}</template>
-				<template #default>
+	<div class="stv-status-dropdown">
+		
+		<!--Modal: ConfirmStatusAction-->
+		<BsModal ref="confirmStatusAction">
+			<template #title>{{$p.t('lehre', 'status_edit')}}</template>
+			<template #default>
 				<div v-if="prestudentIds.length == 1">
-					<p>
-					{{$p.t('lehre', 'modal_askAusbildungssem', { status: actionStatusText })}}</p>
+					<p>{{$p.t('lehre', 'modal_StatusactionSingle', { status: actionStatusText })}}</p>
 				</div>
 				<div v-else>
-					<p>
-					{{$p.t('lehre', 'modal_askAusbildungssemPlural', { count: prestudentIds.length,
-					status: actionStatusText
-						})}}</p>
+					<p>{{$p.t('lehre', 'modal_StatusactionPlural', { count: prestudentIds.length,
+				status: actionStatusText
+					})}}</p>
 				</div>
 				
-				<div class="row mb-3">
-					<label for="studiensemester" class="form-label col-sm-4">{{$p.t('lehre', 'studiensemester')}}</label>
-					<div class="col-sm-6">
-						<form-input
-							type="text"
-							name="studiensemester"
-							v-model="actionSem"
-							maxlength="2"
-						>				
-						</form-input>
-					</div>
-				</div>			
-				</template>
-				<template #footer>
-					<div>
-						<button  ref="Close" type="button" class="btn btn-primary" @click="saveNewAusbildungssemester()">OK</button>
-					</div>					
-				</template>
-			</BsModal>
-		
-			<!-- Dropdown -->
-			<div v-if="showToolbar"  class="btn-group">						
-				<button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" data-bs-auto-close="outside" aria-expanded="false">
-					{{$p.t('lehre', 'btn_statusAendern')}}
-				</button>
-						
-				<ul  v-if="showToolbarInteressent" class="dropdown-menu">
-				  <li v-for="item in resultInteressentArray" :key="item.status_kurzbz" class="w-100">
-
-					<div v-if="item.children.length > 0" class="btn-group dropend w-100">
-					  <a
-						class="dropdown-item dropdown-toggle"
-						data-bs-toggle="dropdown"
-						aria-expanded="false"
-						href="#"
-					  >
-						{{ item.status_kurzbz }}
-					  </a>
-					  <ul class="dropdown-menu dropdown-menu-right">
-						<li v-for="child in item.children" :key="child.statusgrund_id">
-						  <a class="dropdown-item" @click="executeLink(child.link)">{{ child.beschreibung }}</a>
-						</li>
-					  </ul>
-					</div>
-			
-					<div v-else>
-					  <a
-						class="dropdown-item"
-						@click="executeLink(item.link)"
-					  >
-						{{ item.status_kurzbz }}
-					  </a>
-					</div>
-				  </li>
-				</ul>	
-						
-			<!--toolbar Student-->
-				<ul v-if="showToolbarStudent" class="dropdown-menu">
-				  <li v-for="item in resultStudentArray" :key="item.status_kurzbz" class="w-100">
-
-					<div v-if="item.children.length > 0" class="btn-group dropend w-100">
-					  <a
-						class="dropdown-item dropdown-toggle"
-						data-bs-toggle="dropdown"
-						aria-expanded="false"
-						href="#"
-					  >
-						{{ item.status_kurzbz }}
-					  </a>
-					  <ul class="dropdown-menu dropdown-menu-right">
-						<li v-for="child in item.children" :key="child.statusgrund_id">
-						  <a class="dropdown-item" @click="executeLink(child.link)">{{ child.beschreibung }}</a>
-						</li>
-					  </ul>
-					</div>
-			
-					<div v-else>
-					  <a
-						class="dropdown-item"
-						@click="executeLink(item.link)"
-					  >
-						{{ item.status_kurzbz }}
-					  </a>
-					</div>
-				  </li>
-				</ul>
+			</template>
+			<template #footer>	
+				<!--Action changeStatus-->
+				<div>
+					<button  ref="Close" type="button" class="btn btn-primary" @click="changeStatus(prestudentIds)">OK</button>
+				</div>				
+			</template>
+		</BsModal>
+							
+		<!--Modal: askForAusbildungssemester-->
+		<BsModal ref="askForAusbildungssemester">
+			<template #title>{{$p.t('lehre', 'status_edit')}}</template>
+			<template #default>
+			<div v-if="prestudentIds.length == 1">
+				<p>
+				{{$p.t('lehre', 'modal_askAusbildungssem', { status: actionStatusText })}}</p>
 			</div>
-		</div> `
+			<div v-else>
+				<p>
+				{{$p.t('lehre', 'modal_askAusbildungssemPlural', { count: prestudentIds.length,
+				status: actionStatusText
+					})}}</p>
+			</div>
+			
+			<div class="row mb-3">
+				<label for="studiensemester" class="form-label col-sm-4">{{$p.t('lehre', 'studiensemester')}}</label>
+				<div class="col-sm-6">
+					<form-input
+						type="text"
+						name="studiensemester"
+						v-model="actionSem"
+						maxlength="2"
+					>				
+					</form-input>
+				</div>
+			</div>			
+			</template>
+			<template #footer>
+				<div>
+					<button  ref="Close" type="button" class="btn btn-primary" @click="saveNewAusbildungssemester()">OK</button>
+				</div>					
+			</template>
+		</BsModal>
+	
+		<!-- Dropdown -->
+		<div v-if="showToolbar"  class="btn-group">						
+			<button ref="toolbarButton" type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" data-bs-auto-close="outside" aria-expanded="false">
+				{{$p.t('lehre', 'btn_statusAendern')}}
+			</button>
+
+			<ul class="dropdown-menu">
+				
+				<!--toolbar Interessent-->
+				<template v-if="showToolbarInteressent">
+					<li v-for="item in resultInteressentArray" :key="item.status_kurzbz" class="w-100">
+
+						<div v-if="item.children.length > 0" class="btn-group dropend w-100">
+							<a
+								class="dropdown-item dropdown-toggle d-flex justify-content-between align-items-center"
+								data-bs-toggle="dropdown"
+								aria-expanded="false"
+								href="#"
+								>
+								{{ item.status_kurzbz }}
+							</a>
+							<ul class="dropdown-menu dropdown-menu-right">
+								<li v-for="child in item.children" :key="child.statusgrund_id">
+									<a class="dropdown-item" @click.prevent="executeLink(child.link)" href="#">{{ child.beschreibung }}</a>
+								</li>
+							</ul>
+						</div>
+						<div v-else>
+							<a
+								class="dropdown-item"
+								@click.prevent="executeLink(item.link)"
+								href="#"
+								>
+								{{ item.status_kurzbz }}
+							</a>
+						</div>
+
+					</li>
+				</template>
+
+				<!--toolbar Student-->
+				<template v-if="showToolbarStudent">
+					<li v-for="item in resultStudentArray" :key="item.status_kurzbz" class="w-100">
+
+						<div v-if="item.children.length > 0" class="btn-group dropend w-100">
+							<a
+								class="dropdown-item dropdown-toggle d-flex justify-content-between align-items-center"
+								data-bs-toggle="dropdown"
+								aria-expanded="false"
+								href="#"
+								>
+								{{ item.status_kurzbz }}
+							</a>
+							<ul class="dropdown-menu dropdown-menu-right">
+								<li v-for="child in item.children" :key="child.statusgrund_id">
+									<a class="dropdown-item" @click.prevent="executeLink(child.link)" href="#">{{ child.beschreibung }}</a>
+								</li>
+							</ul>
+						</div>
+						<div v-else>
+							<a
+								class="dropdown-item"
+								@click.prevent="executeLink(item.link)"
+								href="#"
+								>
+								{{ item.status_kurzbz }}
+							</a>
+						</div>
+
+					</li>
+				</template>
+
+			</ul>
+		</div>
+	</div> `
 };
\ No newline at end of file

From 284cf711fd45deff4be46f2d0d34be33a5ad7e5a Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 30 Jul 2024 11:26:22 +0200
Subject: [PATCH 1023/1461] adds the sql scripts to create
 dashboard.tbl_bookmark and dashboard.tbl_bookmark_sequence

---
 system/dbupdate_3.4.php                       |  3 ++
 .../41134_bookmark_dashboardWidget.php        | 42 +++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 system/dbupdate_3.4/41134_bookmark_dashboardWidget.php

diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index b3c070095..17487b5d3 100755
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -58,6 +58,7 @@ require_once('dbupdate_3.4/25999_cis4_cms.php');
 require_once('dbupdate_3.4/36530_bis_internationsalisierung_codextabelle_neuerungen.php');
 require_once('dbupdate_3.4/34543_ux_template.php');
 require_once('dbupdate_3.4/17513_Entwicklungsteam.php');
+require_once('dbupdate_3.4/41134_bookmark_dashboardWidget.php');
 
 
 	
@@ -410,6 +411,8 @@ $tabellen=array(
 	"wawi.tbl_rechnungsbetrag"  => array("rechnungsbetrag_id","rechnung_id","mwst","betrag","bezeichnung","ext_id"),
 	"wawi.tbl_aufteilung"  => array("aufteilung_id","bestellung_id","oe_kurzbz","anteil","insertamum","insertvon","updateamum","updatevon"),
 	"wawi.tbl_aufteilung_default"  => array("aufteilung_id","kostenstelle_id","oe_kurzbz","anteil","insertamum","insertvon","updateamum","updatevon"),
+	"dashboard.tbl_bookmark"  => array("bookmark_id","uid","url","title","tag","insertamum","insertvon","updateamum","updatevon"),
+
 );
 
 $tabs=array_keys($tabellen);
diff --git a/system/dbupdate_3.4/41134_bookmark_dashboardWidget.php b/system/dbupdate_3.4/41134_bookmark_dashboardWidget.php
new file mode 100644
index 000000000..dc3919730
--- /dev/null
+++ b/system/dbupdate_3.4/41134_bookmark_dashboardWidget.php
@@ -0,0 +1,42 @@
+<?php
+
+$qry = "BEGIN TRANSACTION;
+
+        CREATE TABLE IF NOT EXISTS dashboard.tbl_bookmark(
+            bookmark_id BIGINT PRIMARY KEY,
+            uid VARCHAR(255) NOT NULL,
+            url VARCHAR(511) NOT NULL,
+            title VARCHAR(255) NULL,
+            tag VARCHAR(255) NULL,
+            insertamum TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
+            insertvon VARCHAR(255) NULL REFERENCES public.tbl_benutzer(uid),
+            updateamum TIMESTAMP NULL,
+            updatevon VARCHAR(255) NULL REFERENCES public.tbl_benutzer(uid)
+        );
+
+        ALTER TABLE dashboard.tbl_bookmark ADD CONSTRAINT tbl_bookmark_fk FOREIGN KEY(uid) REFERENCES public.tbl_benutzer(uid);
+
+        CREATE SEQUENCE IF NOT EXISTS dashboard.tbl_bookmark_sequence 
+        AS BIGINT
+        INCREMENT BY 1
+        NO MINVALUE
+        NO MAXVALUE
+        START WITH 1
+        CACHE 1
+        OWNED BY dashboard.tbl_bookmark.bookmark_id;
+
+        ALTER TABLE dashboard.tbl_bookmark ALTER COLUMN bookmark_id SET DEFAULT nextval('dashboard.tbl_bookmark_sequence ');
+
+        GRANT SELECT, INSERT, UPDATE, DELETE ON dashboard.tbl_bookmark TO vilesci;
+        GRANT SELECT, INSERT, UPDATE, DELETE ON dashboard.tbl_bookmark TO web; 
+        GRANT SELECT, UPDATE ON dashboard.tbl_bookmark_sequence TO vilesci;
+        GRANT SELECT, UPDATE ON dashboard.tbl_bookmark_sequence TO web;
+
+        COMMIT TRANSACTION;";
+
+if (!$db->db_query($qry))
+        echo '<strong>error occurred during tbl_bookmark creation: ' . $db->db_last_error() . '</strong><br>';
+    else
+        echo '<br>dashboard.tbl_bookmark and dashboard.tbl_bookmark_sequence was created';
+
+

From 25d6d9b59ed6ba39cf31d75694a692bef72108fc Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 30 Jul 2024 11:36:43 +0200
Subject: [PATCH 1024/1461] Finish Status delete & correct
 updateLehrverbandForInsertAndUpdate

---
 .../api/frontend/v1/stv/Status.php            | 98 ++++++++-----------
 1 file changed, 43 insertions(+), 55 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index cbf6befa5..f5e77b258 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -883,6 +883,16 @@ class Status extends FHCAPI_Controller
 		}
 	}
 
+	/**
+	 * Delete a status entry
+	 *
+	 * @param integer				$prestudent_id
+	 * @param string				$status_kurzbz
+	 * @param string				$studiensemester_kurzbz
+	 * @param integer				$ausbildungssemester
+	 *
+	 * @return void
+	 */
 	public function deleteStatus($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester)
 	{
 		$result = $this->PrestudentstatusModel->load([
@@ -898,7 +908,9 @@ class Status extends FHCAPI_Controller
 		$oldstatus = current($oldstatus);
 
 
-		$erweiterteBerechtigung = $this->permissionlib->isBerechtigt('admin', null, 'suid') || $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung', null, 'suid');
+		$erweiterteBerechtigung =
+			$this->permissionlib->isBerechtigt('admin', null, 'suid')
+			|| $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung', null, 'suid');
 
 
 		//check if last status
@@ -965,7 +977,6 @@ class Status extends FHCAPI_Controller
 			$student = $this->getDataOrTerminateWithError($result);
 			if ($student)
 			{
-				// TODO(chris): what if no student?
 				$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
 				$result = $this->StudentlehrverbandModel->delete(
 					array(
@@ -977,54 +988,17 @@ class Status extends FHCAPI_Controller
 				$this->getDataOrTerminateWithError($result);
 			}
 		}
+
 		//Delete Prestudent if no data is left
 		if ($deletePrestudent)
 		{
-			/*
-				//TODO(manu) check all connected tables, Handling of Deletion
-				//check if existing dokumentprestudent
-				$this->load->model('crm/Dokumentprestudent_model', 'DokumentprestudentModel');
-				$result = $this->DokumentprestudentModel->loadWhere(
-					array(
-						'prestudent_id' => $prestudent_id
-					)
-				);
-				if (isError($result))
-				{
-					$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-
-				}
-				if (hasData($result))
-				{
-					return $this->terminateWithError("Es sind noch zu loeschende Dokumente vorhanden: ", self::ERROR_TYPE_GENERAL);
-				}
-
-				//check if Anrechnungen tbl_anrechnung
-				$output_anrechnungen = '';
-				$this->load->model('education/Anrechnung_model', 'AnrechnungModel');
-				$result = $this->AnrechnungModel->loadWhere(
-					array(
-						'prestudent_id' => $prestudent_id
-					)
-				);
-				if (isError($result))
-				{
-					$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-				}
-				if (hasData($result))
-				{
-					return $this->terminateWithError("Mit dieser Prestudent_id sind verbundene Anrechnungen vorhanden!", self::ERROR_TYPE_GENERAL);
-				}
-			*/
-			//DELETE Prestudent
 			$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 			$result = $this->PrestudentModel->delete($prestudent_id);
 
 			$this->getDataOrTerminateWithError($result);
 		}
 
-		$this->db->trans_rollback(); // TODO(chris): DEBUG!
-		#$this->db->trans_commit();
+		$this->db->trans_commit();
 
 		return $this->terminateWithSuccess(true);
 	}
@@ -1881,6 +1855,7 @@ class Status extends FHCAPI_Controller
 
 		$student = current($student);
 		
+
 		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
 		$result = $this->StudentlehrverbandModel->loadWhere([
 			'student_uid' => $student->student_uid,
@@ -1889,10 +1864,6 @@ class Status extends FHCAPI_Controller
 
 		$studentlvb = $this->getDataOrTerminateWithError($result);
 
-		// NOTE(chris): if $studentlvb then update to the same values as before (except updatevon). So do nothing?
-		// TODO(chris): check if that is correct (in FAS)?
-		if ($studentlvb)
-			return; // No Update necessary
 
 		$this->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
 		
@@ -1905,16 +1876,33 @@ class Status extends FHCAPI_Controller
 		]);
 		$lv = $this->getDataOrTerminateWithError($result);
 
-		$this->StudentlehrverbandModel->insert([
-			'student_uid' => $student->student_uid,
-			'studiensemester_kurzbz' => $studiensemester_kurzbz,
-			'studiengang_kz' => $student->studiengang_kz,
-			'semester' => $lv ? $ausbildungssemester : $student->semester,
-			'verband' => $student->verband,
-			'gruppe' => $student->gruppe,
-			'insertamum' => date('c'),
-			'insertvon' => $authUID
-		]);
+
+		if ($studentlvb && !$lv)
+			return; // No Update necessary
+
+		if ($studentlvb) // Update current Student-Lehrverband entry
+			$this->StudentlehrverbandModel->update([
+				'student_uid' => $student->student_uid,
+				'studiensemester_kurzbz' => $studiensemester_kurzbz
+			], [
+				'studiengang_kz' => $student->studiengang_kz,
+				'semester' => $ausbildungssemester,
+				'verband' => $student->verband,
+				'gruppe' => $student->gruppe,
+				'updateamum' => date('c'),
+				'updatevon' => $authUID
+			]);
+		else // Add new Student-Lehrverband entry
+			$this->StudentlehrverbandModel->insert([
+				'student_uid' => $student->student_uid,
+				'studiensemester_kurzbz' => $studiensemester_kurzbz,
+				'studiengang_kz' => $student->studiengang_kz,
+				'semester' => $lv ? $ausbildungssemester : $student->semester,
+				'verband' => $student->verband,
+				'gruppe' => $student->gruppe,
+				'insertamum' => date('c'),
+				'insertvon' => $authUID
+			]);
 	}
 
 	private function _sanitizeAliasName($str)

From 96b9571ee1bab541a4f2d7d6a149f99b715d0009 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 30 Jul 2024 11:40:57 +0200
Subject: [PATCH 1025/1461] Delete Status: correct confirm

---
 .../Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index 5148b95b3..5e183badc 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -289,9 +289,9 @@ export default{
 				)
 				.then(this.$fhcApi.get)
 				.then(result => result.data
-					? new Promise((resolve, reject) => { BsConfirm.popup('TEST').then(resolve).catch(() => reject({handled:true})) })
+					? new Promise((resolve, reject) => { BsConfirm.popup(this.$p.t('lehre', 'last_status_confirm_delete')).then(resolve).catch(() => reject({handled:true})) })
 					: true
-				) // TODO(chris): correct confirm
+				)
 				.then(result => result
 					? 'api/frontend/v1/stv/status/deleteStatus/' + Object.values(statusId).join('/')
 					: Promise.reject({handled: true})

From b423fff07488e0d5496609df550613f5f1eaa346 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 30 Jul 2024 11:49:00 +0200
Subject: [PATCH 1026/1461] Status Delete: cleanup

---
 .../Details/Prestudent/MultiStatus.js         | 128 +-----------------
 1 file changed, 7 insertions(+), 121 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index 5e183badc..6658e541e 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -84,7 +84,7 @@ export default{
 		}
 	},
 	props: {
-		modelValue: Object,
+		modelValue: Object
 	},
 	data() {
 		return {
@@ -241,22 +241,10 @@ export default{
 			statusData: {},
 			statusId: {},
 			dataMeldestichtag: null,
-			isLastStatus: {},
-			//newArray: {},
-			abbruchData: {},
-			newStatus: '',
-			statusNew: true,
-			isErsterStudent: false,
-			isBewerber: true,
-		}
+			statusNew: true
+		};
 	},
 	watch: {
-		data: {
-			handler(n) {
-				const start = this.status_kurzbz;
-			},
-			deep: true
-		},
 		modelValue() {
 			if (this.$refs.table) {
 				if (this.$refs.table.tableBuilt)
@@ -302,7 +290,7 @@ export default{
 				.then(this.$reloadList)
 				.catch(this.$fhcAlert.handleSystemError);
 		},
-		actionAdvanceStatus(status, stdsem, ausbildungssemester){
+		actionAdvanceStatus(status, stdsem, ausbildungssemester) {
 			this.statusId = {
 				'prestudent_id': this.modelValue.prestudent_id,
 				'status_kurzbz': status,
@@ -328,7 +316,7 @@ export default{
 				.then(this.reload)
 				.catch(this.$fhcAlert.handleSystemError);
 		},
-		advanceStatus(statusId){
+		advanceStatus(statusId) {
 			return this.$fhcApi.post('api/frontend/v1/stv/status/advanceStatus/' +
 				this.statusId.prestudent_id + '/' +
 				this.statusId.status_kurzbz + '/' +
@@ -344,98 +332,7 @@ export default{
 					this.reload();
 				});
 		},
-		deleteStatus(status_id){
-			return this.$fhcApi.post('api/frontend/v1/stv/status/deleteStatus/',
-				status_id)
-				.then(
-					result => {
-						this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
-							this.resetModal();
-					})
-				.catch(this.$fhcAlert.handleSystemError)
-				.finally(() => {
-					window.scrollTo(0, 0);
-					this.reload();
-					this.$reloadList();
-				});
-		},
-		checkIfLastStatus(){
-			return this.$fhcApi
-				.get('api/frontend/v1/stv/status/isLastStatus/' + this.modelValue.prestudent_id)
-				.then(
-					result => {
-						if(result.data){
-							this.isLastStatus = result.data;
-						} else {
-							this.isLastStatus = {};
-						}
-						return result;
-					})
-				.catch(this.$fhcAlert.handleSystemError);
-		},
-		// checkIfErsterStudent(prestudent_id){
-		// 	return this.$fhcApi
-		// 		.get('api/frontend/v1/stv/status/isErsterStudent/' + prestudent_id)
-		// 		.then(
-		// 			result => {
-		// 				this.isErsterStudent = result.data.retval == 0 ? 1 : 0;
-		// 				return result;
-		// 			})
-		// 		.catch(this.$fhcAlert.handleSystemError);
-		// },
-		/*checkIfBewerber(prestudentIds){
-
-			if(!prestudentIds)
-				prestudentIds = [this.modelValue.prestudent_id];
-
-			const promises = prestudentIds.map(prestudentId => {
-
-				return this.$fhcApi.post('api/frontend/v1/stv/status/hasStatusBewerber/' + prestudentId,
-				).then(response => {
-					countSuccess++;
-					return response;
-				})
-					//.catch(this.$fhcAlert.handleSystemError)
-					.catch(error => {
-						countError++;
-						//For each Prestudent show Error in Alert
-						this.$fhcAlert.handleSystemError(error);
-					});
-			});
-
-			Promise
-				.allSettled(promises)
-				.then(values => {
-
-						//Feedback Success als infoalert
-						if (countSuccess > 0) {
-							this.$fhcAlert.alertInfo(this.$p.t('ui', 'successNewStatus', {
-								'countSuccess': countSuccess,
-								'status': this.newStatus,
-								'countError': countError
-							}));
-						}
-
-						if (this.modelValue.prestudent_id) {
-							this.reload();
-							//TODO(manu) reload Detailtab after Abbrecher to see current status activ, verband and gruppe
-						}
-						else {
-							this.$reloadList();
-						}
-
-			/!*return this.$fhcApi
-				.get('api/frontend/v1/stv/status/hasStatusBewerber/' + prestudent_id)
-				.then(
-					result => {
-						this.isBewerber = result.data;
-						console.log(result);
-						return result;
-					})
-				.catch(this.$fhcAlert.handleSystemError);*!/
-			//}
-		},*/
-		loadStatus(status_id){
+		loadStatus(status_id) {
 			this.statusNew = false;
 			return this.$fhcApi.post('api/frontend/v1/stv/status/loadStatus/',
 				status_id)
@@ -448,20 +345,9 @@ export default{
 		reload() {
 			if (this.$refs.table)
 				this.$refs.table.reloadTable();
-		},
-		hideModal(modalRef){
-			this.$refs[modalRef].hide();
-			this.statusNew = true;
-		},
-		resetModal() {
-			this.statusData = {};
-			this.statusId = {};
-			this.actionButton = {};
-			this.actionStatusText = {};
-			this.actionSem = null;
 		}
 	},
-	created(){
+	created() {
 		this.$fhcApi
 			.get('api/frontend/v1/stv/status/getLastBismeldestichtag/')
 			.then(result => {

From 02cf36c17c609ab16ba7ad4662dc60f16069dcfe Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 30 Jul 2024 12:25:26 +0200
Subject: [PATCH 1027/1461] adds Phrasen to the dashboard ampel-widget

---
 public/js/components/DashboardWidget/Ampel.js |  51 +++---
 system/phrasesupdate.php                      | 164 +++++++++++++++++-
 2 files changed, 191 insertions(+), 24 deletions(-)

diff --git a/public/js/components/DashboardWidget/Ampel.js b/public/js/components/DashboardWidget/Ampel.js
index 7aaf152ec..fdf7752c7 100755
--- a/public/js/components/DashboardWidget/Ampel.js
+++ b/public/js/components/DashboardWidget/Ampel.js
@@ -1,24 +1,24 @@
 import AbstractWidget from './Abstract';
 import BaseOffcanvas from '../Base/Offcanvas';
 
-const widgetAmpelMAX = 4;
-
 export default {
     name: 'WidgetsAmpel',
     components: { BaseOffcanvas },
     data: () => ({
+        WIDGET_AMPEL_MAX: 4,
         filter: '',
         source: '',
-        ampeln: null,
         allAmpeln:null,
         activeAmpeln:null,
+        phrasen: {ampeln:false, ui:false},
     }),
     mixins: [
         AbstractWidget
     ],
     computed: {
-        widgetAmpelMAX(){
-            return widgetAmpelMAX;
+        arePhrasenLoaded(){
+            // checks if both the phrasen categories 'ampeln' and 'ui' are loaded
+            return this.phrasen.ampeln && this.phrasen.ui;            
         },
         ampelnComputed(){
             
@@ -31,7 +31,7 @@ export default {
             
         },
         ampelnOverview () {
-            return this.activeAmpeln?.slice(0, widgetAmpelMAX);  // show only newest 4 active ampeln
+            return this.activeAmpeln?.slice(0, this.WIDGET_AMPEL_MAX);  // show only newest 4 active ampeln
         },
         count () {
             let datasource = this.activeAmpeln;
@@ -111,15 +111,20 @@ export default {
         },
         validateBtnTxt(buttontext){
 
-            if(buttontext instanceof Array && !buttontext.length) return 'Bestätigen';
+            if(buttontext instanceof Array && !buttontext.length) return this.$p.t('ui','bestaetigen');
 
-            if(!buttontext) return 'Bestätigen';
+            if(!buttontext) return this.$p.t('ui','bestaetigen');
 
             return buttontext;
         }
     },
     created() {
-
+        this.$p.loadCategory('ampel').then(() => {
+            this.isPhrasenLoaded = true;
+        });
+        this.$p.loadCategory('ui').then(() => {
+            this.isPhrasenLoaded = true;
+        });
         this.$emit('setConfig', false);    
     },
     async mounted() {
@@ -131,18 +136,18 @@ export default {
     <div class="widgets-ampel w-100 h-100">
         <div v-if="activeAmpeln" class="d-flex flex-column justify-content-between">
             <div class="d-flex">
-                <header class="me-auto"><b>Neueste Ampeln</b></header>
-                <div class="mb-2 text-danger"><a href="#allAmpelOffcanvas" data-bs-toggle="offcanvas">Alle Ampeln</a></div>
+                <header class="me-auto"><b>{{$p.t('ampeln','newestAmpeln')}}</b></header>
+                <div class="mb-2 text-danger"><a href="#allAmpelOffcanvas" data-bs-toggle="offcanvas">{{$p.t('ampeln','allAmpeln')}}</a></div>
             </div>
             <div class="d-flex justify-content-end">
-                <a v-if="count.ueberfaellig > 0" href="#allAmpelOffcanvas" data-bs-toggle="offcanvas" @click="filter = 'ueberfaellig'" class="text-decoration-none"><span class="badge bg-danger me-1"><i class="fa fa-solid fa-bolt"></i> Überfällig: <b>{{ count.ueberfaellig }}</b></span></a>
+                <a v-if="count.ueberfaellig > 0" href="#allAmpelOffcanvas" data-bs-toggle="offcanvas" @click="filter = 'ueberfaellig'" class="text-decoration-none"><span class="badge bg-danger me-1"><i class="fa fa-solid fa-bolt"></i> {{$p.t('ampeln','overdue')}}: <b>{{ count.ueberfaellig }}</b></span></a>
             </div>
             <div v-for="ampel in ampelnOverview" :key="ampel.ampel_id" class="mt-2">
                 <div class="card">
                     <div class="card-body">
                         <div class="position-relative">
                             <div class="d-flex">
-                                <div class="text-muted small me-auto"><small>Deadline: {{ getDate(ampel.deadline) }}</small></div>
+                                <div class="text-muted small me-auto"><small>{{$p.t('ampeln','deadline')}}: {{ getDate(ampel.deadline) }}</small></div>
                                 <div v-if="(new Date() > new Date(ampel.deadline)) && !ampel.bestaetigt "><span class="badge bg-danger"><i class="fa fa-solid fa-bolt"></i></span></div>
                                 <div v-if="ampel.verpflichtend"><span class="badge bg-warning ms-1"><i class="fa fa-solid fa-triangle-exclamation"></i></span></div>
                                 <div v-if="ampel.bestaetigt"><span class="badge bg-success ms-1"><i class="fa fa-solid fa-circle-check"></i></span></div>
@@ -156,12 +161,12 @@ export default {
             <div v-if="activeAmpeln && activeAmpeln.length == 0" class="card card-body mt-4 p-4 text-center">
                 <span class="text-success h2"><i class="fa fa-solid fa-circle-check"></i></span>
                 <span class="text-success h5">Super!</span><br>
-                <span class="small">Keine offenen Ampeln.</span>
+                <span class="small">{{$p.t('ampeln','noOpenAmpeln')}}</span>
             </div>
         </div>
         <div v-else>
-        <header class="me-auto"><b>Neueste Ampeln </b></header>
-            <template v-for="n in widgetAmpelMAX">
+        <header class="me-auto"><b>{{$p.t('ampeln','newestAmpeln')}} </b></header>
+            <template v-for="n in WIDGET_AMPEL_MAX">
             
                 <div class="mt-2 card" aria-hidden="true">
                 <div class="card-body">
@@ -179,29 +184,29 @@ export default {
 
     <!-- All Ampeln Offcanvas -->
     <BaseOffcanvas id="allAmpelOffcanvas" :closeFunc="closeOffcanvas">
-        <template #title><header><b>Alle meine Ampeln</b></header></template>
+        <template #title><header><b>{{$p.t('ampeln','allMyAmpeln')}}</b></header></template>
         <template #body>
             <div class="d-flex justify-content-evenly">
                 <div class="form-check form-check-inline form-control-sm">
                 <input class="form-check-input" type="radio" v-model="source" id="offen" value="offen"  checked>
-                <label class="form-check-label" for="offen">Offene Ampeln</label>
+                <label class="form-check-label" for="offen">{{$p.t('ampeln','openAmpeln')}}</label>
             </div>
             <div class="form-check form-check-inline form-control-sm">
                 <input class="form-check-input" type="radio" v-model="source" id="alle" value="alle" >
-                <label class="form-check-label" for="alle">Alle Ampeln</label>
+                <label class="form-check-label" for="alle">{{$p.t('ampeln','allAmpeln')}}</label>
             </div>
             </div>
-            <div class="col"><button class="btn btn-light w-100" @click="filter = ''"><small>Alle: <b>{{ count.alle }}</b></small></button></div>
+            <div class="col"><button class="btn btn-light w-100" @click="filter = ''"><small>{{$p.t('ui','alle')}}: <b>{{ count.alle }}</b></small></button></div>
             <div class="row row-cols-2 g-2 mt-1">
-                <div class="col"><button class="btn btn-danger w-100"  @click="toggleFilter('ueberfaellig')"><i class="fa fa-solid fa-bolt me-2"></i><small :style="{...(filter==='ueberfaellig'?{'text-decoration':'underline','font-weight':'bold'}:{})}">Überfällig: <b>{{ count.ueberfaellig }}</b></small></button></div>
-                <div class="col"><button class="btn btn-warning w-100" @click="toggleFilter('verpflichtend')"><i class="fa fa-solid fa-triangle-exclamation me-2"></i><small :style="{...(filter==='verpflichtend'?{'text-decoration':'underline','font-weight':'bold'}:{})}">Pflicht: <b>{{ count.verpflichtend }}</b></small></button></div>
+                <div class="col"><button class="btn btn-danger w-100"  @click="toggleFilter('ueberfaellig')"><i class="fa fa-solid fa-bolt me-2"></i><small :class="{'text-decoration-underline':filter==='ueberfaellig', 'fw-bold':filter==='ueberfaellig'}">{{$p.t('ampeln','overdue')}}: <b>{{ count.ueberfaellig }}</b></small></button></div>
+                <div class="col"><button class="btn btn-warning w-100" @click="toggleFilter('verpflichtend')"><i class="fa fa-solid fa-triangle-exclamation me-2"></i><small :class="{'text-decoration-underline':filter==='ueberfaellig', 'fw-bold':filter==='ueberfaellig'}" >{{$p.t('ampeln','mandatory')}}: <b>{{ count.verpflichtend }}</b></small></button></div>
             </div>
             <div v-for="ampel in ampelnComputed" :key="ampel.ampel_id" class="mt-2">
                 <ul class="list-group">
                 <li class="list-group-item small">
                 <div class="position-relative"><!-- prevents streched-link from stretching outside this parent element -->
                     <div class="d-flex">
-                        <span class="small text-muted me-auto"><small>Deadline: {{ getDate(ampel.deadline) }}</small></span>
+                        <span class="small text-muted me-auto"><small>{{$p.t('ampeln','deadline')}}: {{ getDate(ampel.deadline) }}</small></span>
                         <div v-if="(new Date() > new Date(ampel.deadline)) && !ampel.bestaetigt"><span class="badge bg-danger"><i class="fa fa-solid fa-bolt"></span></div>
                         <div v-if="ampel.verpflichtend"><span class="badge bg-warning ms-1"><i class="fa fa-solid fa-triangle-exclamation"></span></div>
                         <div v-if="ampel.bestaetigt"><span class="badge bg-success ms-1"><i class="fa fa-solid fa-circle-check"></i></span></div>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 8dc1d163f..d9c72a29a 100755
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -27489,7 +27489,169 @@ array(
 				'insertvon' => 'system'
 			)
 		)
-	)
+	),
+	// AMPELN PHRASEN -----------------------------------------------------------------------------
+	array(
+		'app' => 'core',
+		'category' => 'ampeln',
+		'phrase' => 'newestAmpeln',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Neueste Ampeln',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Newest Ampeln',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ampeln',
+		'phrase' => 'allAmpeln',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Alle Ampeln',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'All Ampeln',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ampeln',
+		'phrase' => 'overdue',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Überfällig',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Overdue',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ampeln',
+		'phrase' => 'deadline',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Stichtag',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Deadline',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ampeln',
+		'phrase' => 'noOpenAmpeln',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Keine offenen Ampeln.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No open Ampeln.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ampeln',
+		'phrase' => 'openAmpeln',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Offene Ampeln',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Open Ampeln',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ampeln',
+		'phrase' => 'allMyAmpeln',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Alle meine Ampeln',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'All my Ampeln',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ampeln',
+		'phrase' => 'mandatory',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Pflicht',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Mandatory',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+
 );
 
 

From 198b866268fd7c2ea5bb8c60c62ec479843baf3f Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 30 Jul 2024 12:37:05 +0200
Subject: [PATCH 1028/1461] adds fhcalert when confirming an ampel

---
 public/js/apps/Dashboard/Admin.js             |  3 +++
 public/js/apps/Dashboard/Fhc.js               |  3 ++-
 public/js/components/DashboardWidget/Ampel.js | 14 ++++++-------
 system/phrasesupdate.php                      | 20 +++++++++++++++++++
 4 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/public/js/apps/Dashboard/Admin.js b/public/js/apps/Dashboard/Admin.js
index 426a2fce4..ad4c2cf63 100755
--- a/public/js/apps/Dashboard/Admin.js
+++ b/public/js/apps/Dashboard/Admin.js
@@ -1,5 +1,7 @@
 import {CoreNavigationCmpt} from '../../components/navigation/Navigation.js';
 import DashboardAdmin from '../../components/Dashboard/Admin.js';
+import Phrasen from "../../plugin/Phrasen.js"
+import FhcAlert from "../../plugin/FhcAlert.js"
 
 const app = Vue.createApp({
   data: () => ({
@@ -11,4 +13,5 @@ const app = Vue.createApp({
   }
 });
 app.config.unwrapInjectedRef = true;
+app.use(Phrasen).use(FhcAlert);
 app.mount('#main');
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index 98f06f329..824f03bd2 100755
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -1,5 +1,6 @@
 import FhcDashboard from '../../components/Dashboard/Dashboard.js';
 import Phrasen from "../../plugin/Phrasen.js"
+import FhcAlert from "../../plugin/FhcAlert.js"
 
 const app = Vue.createApp({
   data: () => ({
@@ -10,5 +11,5 @@ const app = Vue.createApp({
   }
 });
 app.config.unwrapInjectedRef = true;
-app.use(Phrasen);
+app.use(Phrasen).use(FhcAlert);
 app.mount('#content');
diff --git a/public/js/components/DashboardWidget/Ampel.js b/public/js/components/DashboardWidget/Ampel.js
index fdf7752c7..1b4efa022 100755
--- a/public/js/components/DashboardWidget/Ampel.js
+++ b/public/js/components/DashboardWidget/Ampel.js
@@ -96,14 +96,12 @@ export default {
             }); 
         },
         async confirm(ampelId){
-            this.$fhcApi.factory.ampeln.confirmAmpel(ampelId).then(res =>{
-                // response of the enpoint when confirming an ampel (true if confirmed and false if not confirmed)
-                if(res.data){
-                    console.log("ampel was successfully confirmed");
-                }else{
-                    console.error("ampel was not successfully confirmed");
-                } 
-            });
+            this.$fhcApi.factory.ampeln.confirmAmpel(ampelId)
+            .then(res => res.data)
+            .then(result => {
+                this.$fhcAlert.alertSuccess(this.$p.t('ampeln','ampelBestaetigt'));
+            })
+            .catch(this.$fhcAlert.handleSystemError);
 
             // update the ampeln by refetching them
             this.fetchNonConfirmedActiveAmpeln();
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index d9c72a29a..b34a1ade1 100755
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -27651,6 +27651,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'ampeln',
+		'phrase' => 'ampelBestaetigt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ampel bestätigt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Ampel confirmed',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 
 );
 

From 39574c1b3a1f8454bfaaa9647679e42baee7768a Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 30 Jul 2024 15:27:24 +0200
Subject: [PATCH 1029/1461] adds delete endpoint for the dashboard bookmark
 widget

---
 .../controllers/api/frontend/v1/Bookmark.php  | 99 +++++++++++++++++++
 .../models/dashboard/Bookmark_model.php       | 57 +++++++++++
 public/js/api/bookmark.js                     | 21 ++++
 public/js/api/fhcapifactory.js                |  2 +
 public/js/apps/Dashboard/Fhc.js               |  3 +
 public/js/components/DashboardWidget/Url.js   | 67 ++++++++++---
 system/phrasesupdate.php                      | 65 +++++++++++-
 7 files changed, 300 insertions(+), 14 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/Bookmark.php
 create mode 100644 application/models/dashboard/Bookmark_model.php
 create mode 100644 public/js/api/bookmark.js

diff --git a/application/controllers/api/frontend/v1/Bookmark.php b/application/controllers/api/frontend/v1/Bookmark.php
new file mode 100644
index 000000000..c18afc751
--- /dev/null
+++ b/application/controllers/api/frontend/v1/Bookmark.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Copyright (C) 2024 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Bookmark extends FHCAPI_Controller
+{
+
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'getBookmarks' => self::PERM_LOGGED,
+            'delete' => self::PERM_LOGGED,
+        ]);
+
+		$this->load->model('dashboard/Bookmark_model', 'BookmarkModel');
+
+		$this->uid = getAuthUID();
+		$this->pid = getAuthPersonID();
+
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	
+    /**
+	 * gets the bookmarks associated to a user 
+	 * @access public
+	 * @return void
+	 */
+	public function getBookmarks()
+	{
+        $bookmarks = $this->BookmarkModel->getAll($this->uid);
+
+        if(isError($bookmarks)){
+            $this->terminateWithError(getError($bookmarks));
+        }
+
+        $bookmarks = $this->getDataOrTerminateWithError($bookmarks);
+
+        $this->terminateWithSuccess($bookmarks);
+    }
+
+    /**
+	 * deletes bookmark from associated user 
+	 * @access public
+	 * @return void
+	 */
+    public function delete($bookmark_id)
+	{
+        if(!isset($bookmark_id)) $this->terminateWithError("missing required parameters");
+        
+        $bookmark = $this->BookmarkModel->get($bookmark_id);
+
+        if(isError($bookmark)){
+            $this->terminateWithError(getError($bookmark));
+        }
+
+        $bookmark = current($this->getDataOrTerminateWithError($bookmark));
+
+        // only delete bookmark if the user is the owner of the bookmark
+        $this->load->library('PermissionLib');
+
+        if($bookmark->uid == $this->uid || $this->permissionlib->isBerechtigt('admin')){
+
+            $delete_result = $this->BookmarkModel->delete($bookmark_id);
+
+            if(isError($delete_result)){
+                $this->terminateWithError(getError($delete_result));
+            }
+
+            $delete_result = $this->getDataOrTerminateWithError($delete_result);
+
+            $this->terminateWithSuccess($delete_result);
+        }else{
+            $this->terminateWithError("You are not authorized to delete this bookmark");
+        }
+    }
+}
+
diff --git a/application/models/dashboard/Bookmark_model.php b/application/models/dashboard/Bookmark_model.php
new file mode 100644
index 000000000..3b44d055c
--- /dev/null
+++ b/application/models/dashboard/Bookmark_model.php
@@ -0,0 +1,57 @@
+<?php
+class Bookmark_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'dashboard.tbl_bookmark';
+		$this->pk = 'bookmark_id';
+	}
+
+
+	/**
+	 * Get Bookmarks of UID.
+	 * @param string user uid
+	 * @return array
+	 */
+	public function getAll($uid)
+	{
+		return $this->execReadOnlyQuery("
+            SELECT * 
+            FROM dashboard.tbl_bookmark 
+            WHERE uid = ?
+            ",[$uid]);
+	}
+
+    /**
+	 * Gets Bookmark by bookmark_id.
+	 * @param int $bookmark_id 
+	 * @return array
+	 */
+    public function get($bookmark_id)
+	{
+		return $this->execReadOnlyQuery("
+            SELECT * 
+            FROM dashboard.tbl_bookmark 
+            WHERE bookmark_id = ?
+            ",[$bookmark_id]);
+	}
+
+    /**
+	 * Gets Bookmark by bookmark_id.
+	 * @param int $bookmark_id
+	 * @return array
+	 */
+	public function delete($bookmark_id)
+	{
+		return $this->execReadOnlyQuery("
+            DELETE
+            FROM dashboard.tbl_bookmark 
+            WHERE bookmark_id = ?
+            ",[$bookmark_id]);
+	}
+}
diff --git a/public/js/api/bookmark.js b/public/js/api/bookmark.js
new file mode 100644
index 000000000..6a6b3c309
--- /dev/null
+++ b/public/js/api/bookmark.js
@@ -0,0 +1,21 @@
+export default {
+
+    getBookmarks: function (uid) {
+      return this.$fhcApi.get(
+        FHC_JS_DATA_STORAGE_OBJECT.app_root + 
+        FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+        `/api/frontend/v1/Bookmark/getBookmarks`
+        ,{}
+      );
+    },
+  
+    deleteBookmark: function (bookmark_id) {
+      
+      return this.$fhcApi.get(
+        FHC_JS_DATA_STORAGE_OBJECT.app_root + 
+        FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+        `/api/frontend/v1/Bookmark/delete/${bookmark_id}`
+        ,{}
+      ); 
+    },
+}
\ No newline at end of file
diff --git a/public/js/api/fhcapifactory.js b/public/js/api/fhcapifactory.js
index 73ce0dd7f..99f154992 100644
--- a/public/js/api/fhcapifactory.js
+++ b/public/js/api/fhcapifactory.js
@@ -22,6 +22,7 @@ import filter from "./filter.js";
 import studstatus from "./studstatus.js";
 import profil from "./profil.js";
 import profilUpdate from "./profilUpdate.js";
+import bookmark from "./bookmark.js";
 
 export default {
     search,
@@ -31,4 +32,5 @@ export default {
     studstatus,
     profil,
     profilUpdate,
+    bookmark,
 };
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index ebcbb4b78..824f03bd2 100755
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -1,4 +1,6 @@
 import FhcDashboard from '../../components/Dashboard/Dashboard.js';
+import Phrasen from "../../plugin/Phrasen.js"
+import FhcAlert from "../../plugin/FhcAlert.js"
 
 const app = Vue.createApp({
   data: () => ({
@@ -9,4 +11,5 @@ const app = Vue.createApp({
   }
 });
 app.config.unwrapInjectedRef = true;
+app.use(Phrasen).use(FhcAlert);
 app.mount('#content');
diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index f374b7ed8..23631c88c 100755
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -3,7 +3,7 @@ import AbstractWidget from './Abstract';
 export default {
     name: 'WidgetsUrl',
     data: () => ({
-        links: []
+        links: null
     }),
     mixins: [
         AbstractWidget
@@ -14,6 +14,14 @@ export default {
         }
     },
     methods: {
+        async fetchBookmarks(){
+            await this.$fhcApi.factory.bookmark.getBookmarks()
+            .then(res => res.data)
+            .then(result => {
+                this.links = result;
+            })
+            .catch();
+        },
         addLink(){
             let linkId = this.links.length;
 
@@ -24,37 +32,70 @@ export default {
                 url: this.url
                 })
         },
-        removeLink(linkId){
-            let indexToRemove = this.links.findIndex((obj => obj.id === linkId));
-            this.links.splice(indexToRemove, 1);
+        removeLink(bookmark_id){
+            this.$fhcApi.factory.bookmark.deleteBookmark(bookmark_id)
+            .then(res => res.data)
+            .then(result => {
+                this.$fhcAlert.alertInfo(this.$p.t('bookmark','bookmarkDeleted'));
+            })
+            .catch();
         }
     },
+    
     created() {
-        this.links = TEST_LINKS;
+        //this.links = TEST_LINKS;
         // this.links = TEST_KEINE_LINKS;
     },
-    template: `
+    async mounted(){
+        await this.fetchBookmarks();
+    },
+    template: /*html*/`
     <div class="widgets-url w-100 h-100">
         <div v-if="configMode">
             <div class="mb-3">
 
-                <header><b>Neuer Link</b></header><br>
+                <header><b>{{$p.t('bookmark','newLink')}}</b></header><br>
                 <div>
                     <input class="form-control form-control-sm" placeholder="Titel" type="text" v-model="title" name="title" maxlength="50" required>
                     <input class="form-control form-control-sm mt-2" type="url" placeholder="URL" v-model="url" name="url" required>
-                    <button class="btn btn-outline-secondary btn-sm w-100 mt-2" @click="addLink()" type="button">Link speichern</button>
+                    <button class="btn btn-outline-secondary btn-sm w-100 mt-2" @click="addLink()" type="button">{{$p.t('bookmark','saveLink')}}</button>
                 </div>
             </div>
         </div>
         <div class="d-flex flex-column justify-content-between">
-            <header><b>{{ widgetTag }}</b></header>
-            <div v-for="link in links" :key="link.id" class="d-flex mt-2">
-                <a target="_blank" :href="link.url"><i class="fa fa-solid fa-arrow-up-right-from-square"></i> {{ link.title }}</a>
-                <a class="ms-auto" href="#" @click.prevent="removeLink(link.id)" v-show="configMode"><i class="fa fa-regular fa-trash-can"></i></a>
-            </div>
+        <!-- todo: widgetTag ?? -->
+            <template v-if="links">
+                <header><b>{{ widgetTag }}</b></header>
+                <div v-for="link in links" :key="link.id" class="d-flex mt-2">
+                    <a target="_blank" :href="link.url"><i class="fa fa-solid fa-arrow-up-right-from-square"></i> {{ link.title }}</a>
+                    <a class="ms-auto" href="#" @click.prevent="removeLink(link.bookmark_id)" v-show="configMode"><i class="fa fa-regular fa-trash-can"></i></a>
+                </div>
+            </template>
+            <template v-else>
+                <p v-for="i in 4" class="placeholder-glow">
+                    <span class="placeholder" :class="{'col-9' : true}"></span>
+                </p>
+            </template>
         </div>
     </div>`
 }
+
+/*
+Link JSON structure:
+{ 
+    "bookmark_id": number,
+    "uid": string,
+    "url": string,
+    "title": string,
+    "tag": string,
+    "insertamum": "2024-07-30 14:33:03.699318",
+    "insertvon": null,
+    "updateamum": null,
+    "updatevon": null
+}
+*/
+
+
 const TEST_KEINE_LINKS = [];
 const TEST_LINKS = [
     {
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 8dc1d163f..688023295 100755
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -27489,7 +27489,70 @@ array(
 				'insertvon' => 'system'
 			)
 		)
-	)
+	),
+	// BOOKMARK PHRASEN ----------------------------------------------------------------------
+	array(
+		'app' => 'core',
+		'category' => 'bookmark',
+		'phrase' => 'newLink',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Neuer Link',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'New Link',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'bookmark',
+		'phrase' => 'saveLink',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Link speichern',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Save link',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'bookmark',
+		'phrase' => 'bookmarkDeleted',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Link gelöscht',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Link deleted',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	
+
 );
 
 

From 414a0d7d6e55daf6d7e875cc744bae477344eb1b Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Tue, 30 Jul 2024 15:36:16 +0200
Subject: [PATCH 1030/1461] Changed filter SoftwareManagement to display column
 anzahl_lizenzen

---
 system/filtersupdate.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/system/filtersupdate.php b/system/filtersupdate.php
index fa8a361f4..915a59343 100644
--- a/system/filtersupdate.php
+++ b/system/filtersupdate.php
@@ -1298,6 +1298,7 @@ $filters = array(
 					{"name": "os"},
 					{"name": "lizenzserver_kurzbz"},
 					{"name": "lizenzserver_port"},
+					{"name": "anzahl_lizenzen"},
 					{"name": "softwarestatus_kurzbz"}
 				],
 				"filters": []

From 49bd14496aeba86338101bc0d96f2f0e2af29a85 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Tue, 30 Jul 2024 15:38:02 +0200
Subject: [PATCH 1031/1461] Adapted db query to get Lehrveranstaltungen via
 Studienplan instead of Lehreinheit

---
 .../education/Lehrveranstaltung_model.php     | 142 +++++++-----------
 1 file changed, 54 insertions(+), 88 deletions(-)

diff --git a/application/models/education/Lehrveranstaltung_model.php b/application/models/education/Lehrveranstaltung_model.php
index 0889232a9..5a9053f73 100644
--- a/application/models/education/Lehrveranstaltung_model.php
+++ b/application/models/education/Lehrveranstaltung_model.php
@@ -24,61 +24,16 @@ class Lehrveranstaltung_model extends DB_Model
 	 */
 	public function getAutocompleteSuggestions($eventQuery, $studiensemester_kurzbz = null, $oes = null)
 	{
+		$subQry = $this->_getQryLvsByStudienplan($studiensemester_kurzbz, $oes);
 		$params = [];
 
-		$eventQuery = '%' . $eventQuery . '%';
+		/* filter by input string */
+		if (is_string($eventQuery)) {
+			$subQry.= ' AND lv.bezeichnung ILIKE ?';
+			$params[] = '%' . $eventQuery . '%';
+		}
 
-		$qry = '
-			SELECT DISTINCT ON (lv_oe_kurzbz, stg_bezeichnung, lehrveranstaltung_id)
-			    le.studiensemester_kurzbz,
-                lv.oe_kurzbz AS "lv_oe_kurzbz",
-                CASE
-                    WHEN oe.organisationseinheittyp_kurzbz = \'Kompetenzfeld\' THEN (\'KF \' || oe.bezeichnung)
-                    WHEN oe.organisationseinheittyp_kurzbz = \'Department\' THEN (\'DEP \' || oe.bezeichnung)
-                    ELSE (oe.organisationseinheittyp_kurzbz || \' \' || oe.bezeichnung)
-                END AS "lv_oe_bezeichnung",
-                stg.studiengang_kz,
-                upper(stg.typ || stg.kurzbz) AS "stg_typ_kurzbz",    
-                stg.bezeichnung AS "stg_bezeichnung",
-                lv.semester,   
-                lv.lehrveranstaltung_id,
-                lv.bezeichnung AS "lv_bezeichnung",
-				lv.orgform_kurzbz
-            FROM
-                    lehre.tbl_lehrveranstaltung     lv 
-                    JOIN lehre.tbl_lehreinheit           le USING (lehrveranstaltung_id)
-                    JOIN PUBLIC.tbl_organisationseinheit oe USING (oe_kurzbz)
-                    JOIN PUBLIC.tbl_studiengang          stg ON stg.studiengang_kz = lv.studiengang_kz
-            WHERE
-				/* filter negative studiengaenge */
-                stg.studiengang_kz > 0 ';
-
-			if (isset($studiensemester_kurzbz) && is_string($studiensemester_kurzbz))
-			{
-				/* filter studiensemester */
-				$qry.= ' AND le.studiensemester_kurzbz =  ? ';
-				$params[]= $studiensemester_kurzbz;
-			}
-
-			if (isset($oes) && is_array($oes))
-			{
-				/* filter organisationseinheit */
-				$qry.= ' AND lv.oe_kurzbz IN ? ';
-				$params[]= $oes;
-			}
-
-		$qry.= '
-				/* filter lv type only */
-                AND lv.lehrtyp_kurzbz = \'lv\'
-                /* filter active lehrveranstaltungen */
-                AND lv.aktiv = TRUE
-                /* filter active organisationseinheiten */
-                AND oe.aktiv = TRUE
-				/* filter by search entry */
-				AND lv.bezeichnung ILIKE ?
-		';
-
-		$params[]= $eventQuery;
+		$qry = 'SELECT DISTINCT ON (lehrveranstaltung_id) * FROM ('. $subQry. ') AS tmp';
 
 		return $this->execQuery($qry, $params);
 	}
@@ -91,58 +46,69 @@ class Lehrveranstaltung_model extends DB_Model
 	 * @param array $oes Filter by Organisationseinheiten
 	 * @return array
 	 */
-	public function getLvsByStudiensemesterAndOes($studiensemester_kurzbz = null, $oes = null)
+	public function getLvsByStudienplan($studiensemester_kurzbz = null, $oes = null)
+	{
+		$subQry = $this->_getQryLvsByStudienplan($studiensemester_kurzbz, $oes);
+		$qry = 'SELECT DISTINCT ON (lehrveranstaltung_id) * FROM ('. $subQry. ') AS tmp ORDER BY lehrveranstaltung_id, orgform_kurzbz DESC'; // TODO: hier VZ zuerst. aber eig nicht relevant...check
+
+		return $this->execQuery($qry);
+	}
+
+	/**
+	 * Get basic query to retrieve Lehrveranstaltungen according to the Orgforms and Ausbildungssemesters actual Studienplan.
+	 *
+	 * @return string
+	 */
+	private function _getQryLvsByStudienplan($studiensemester_kurzbz = null, $oes = null,  $lehrtyp_kurzbz = 'lv')
 	{
-		$params = [];
 		$qry = '
-			SELECT DISTINCT ON (lv_oe_kurzbz, stg_bezeichnung, lehrveranstaltung_id)
-			    le.studiensemester_kurzbz,
-                lv.oe_kurzbz AS "lv_oe_kurzbz",
-                CASE
+			SELECT
+				lv.oe_kurzbz AS "lv_oe_kurzbz",
+				CASE
                     WHEN oe.organisationseinheittyp_kurzbz = \'Kompetenzfeld\' THEN (\'KF \' || oe.bezeichnung)
                     WHEN oe.organisationseinheittyp_kurzbz = \'Department\' THEN (\'DEP \' || oe.bezeichnung)
                     ELSE (oe.organisationseinheittyp_kurzbz || \' \' || oe.bezeichnung)
                 END AS "lv_oe_bezeichnung",
-                stg.studiengang_kz,
-                upper(stg.typ || stg.kurzbz) AS "stg_typ_kurzbz",    
-                stg.bezeichnung AS "stg_bezeichnung",
-                lv.semester,   
-                lv.lehrveranstaltung_id,
-                lv.bezeichnung AS "lv_bezeichnung",
-				lv.orgform_kurzbz
+				stplsem.studiensemester_kurzbz,
+				studienordnung_id,
+				sto.studiengang_kz,
+				stpl.studienplan_id,
+				stplsem.semester,
+				stpl.orgform_kurzbz,
+				upper(stg.typ || stg.kurzbz) AS "stg_typ_kurzbz",    
+				stg.bezeichnung AS "stg_bezeichnung",
+				stgtyp.bezeichnung AS "stg_typ_bezeichnung",
+			    lv.lehrveranstaltung_id,
+				lv.semester,   		
+				lv.bezeichnung AS "lv_bezeichnung"
             FROM
-				lehre.tbl_lehrveranstaltung     		lv 
-				JOIN lehre.tbl_lehreinheit           	le USING (lehrveranstaltung_id)
-				JOIN public.tbl_organisationseinheit 	oe USING (oe_kurzbz)
-				JOIN public.tbl_studiengang          	stg ON stg.studiengang_kz = lv.studiengang_kz
-            WHERE
-				/* filter negative studiengaenge */
-                stg.studiengang_kz > 0 ';
+				lehre.tbl_studienplan 							stpl
+				JOIN lehre.tbl_studienordnung 					sto USING (studienordnung_id)
+				JOIN lehre.tbl_studienplan_semester 			stplsem USING (studienplan_id)
+				JOIN lehre.tbl_studienplan_lehrveranstaltung 	stpllv ON (stpllv.studienplan_id = stpl.studienplan_id AND stpllv.semester = stplsem.semester)
+				JOIN lehre.tbl_lehrveranstaltung 				lv USING (lehrveranstaltung_id)
+				JOIN public.tbl_organisationseinheit 			oe USING (oe_kurzbz)
+				JOIN public.tbl_studiengang          			stg ON stg.studiengang_kz = sto.studiengang_kz
+				JOIN public.tbl_studiengangstyp 				stgtyp ON stgtyp.typ = stg.typ
+			/* filter by lehrtyp_kurzbz, default is lvs only */
+			WHERE 
+			      lehrtyp_kurzbz = '. $this->db->escape($lehrtyp_kurzbz);
 
 		if (isset($studiensemester_kurzbz) && is_string($studiensemester_kurzbz))
 		{
-			/* filter studiensemester */
-			$qry.= ' AND le.studiensemester_kurzbz =  ? ';
-			$params[]= $studiensemester_kurzbz;
+			/* filter by studiensemester */
+			$qry.= ' AND stplsem.studiensemester_kurzbz = '. $this->db->escape($studiensemester_kurzbz);
+
 		}
 
 		if (isset($oes) && is_array($oes))
 		{
-			/* filter organisationseinheit */
-			$qry.= ' AND lv.oe_kurzbz IN ? ';
-			$params[]= $oes;
+			/* filter by organisationseinheit */
+			$implodedOes = "'". implode("', '", $oes). "'";
+			$qry.= ' AND lv.oe_kurzbz IN ('. $implodedOes. ')';
 		}
 
-		$qry.= '
-				/* filter lv type only */
-                AND lv.lehrtyp_kurzbz = \'lv\'
-                /* filter active lehrveranstaltungen */
-                AND lv.aktiv = TRUE
-                /* filter active organisationseinheiten */
-                AND oe.aktiv = TRUE
-		';
-
-		return $this->execQuery($qry, $params);
+		return $qry;
 	}
 
 	/**

From 6f216dbe520b5f6cb6cf98a9279de773aeaaef3d Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Tue, 30 Jul 2024 15:38:36 +0200
Subject: [PATCH 1032/1461] Added phrases to Softwarebereitstellung

---
 system/phrasesupdate.php | 60 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 6b1c0134d..75b8ce435 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -26820,6 +26820,66 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'anforderungenVorruecken',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Anforderungen vorrücken",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Take over Requirements",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'vorrueckenInStudiensemester',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Vorrücken in Studiensemester",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Take over to semester",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'anteiligInProzent',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Anteilig in %",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Percentage share",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 );
 
 

From 8492a0aa13b2a0c9155804d8a9530de02819798c Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 30 Jul 2024 16:37:39 +0200
Subject: [PATCH 1033/1461] Advance Status

---
 .../api/frontend/v1/stv/Status.php            | 279 ++++++++----------
 .../Details/Prestudent/MultiStatus.js         | 107 +++----
 2 files changed, 165 insertions(+), 221 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index f5e77b258..6bfd2b020 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -23,14 +23,14 @@ class Status extends FHCAPI_Controller
 			'loadStatus' => ['admin:r', 'assistenz:r'],
 			'insertStatus' => ['admin:rw', 'assistenz:rw'],
 			'updateStatus' => ['admin:rw', 'assistenz:rw'],
-			'advanceStatus' => ['admin:r', 'assistenz:r'],
+			'advanceStatus' => ['admin:rw', 'assistenz:rw'],
 			'confirmStatus' => ['admin:rw', 'assistenz:rw'],
 
 		]);
 
 		//Load Models
-		$this->load->model('crm/Prestudentstatus_model','PrestudentstatusModel');
-		$this->load->model('person/Person_model','PersonModel');
+		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
+		$this->load->model('person/Person_model', 'PersonModel');
 
 		// Load Libraries
 		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
@@ -41,6 +41,7 @@ class Status extends FHCAPI_Controller
 			|| $this->router->method == 'updateStatus'
 			|| $this->router->method == 'confirmStatus'
 			|| $this->router->method == 'deleteStatus'
+			|| $this->router->method == 'advanceStatus'
 		) {
 			$prestudent_id = current(array_slice($this->uri->rsegments, 2));
 			$this->checkPermissionsForPrestudent($prestudent_id, ['admin:rw', 'assistenz:rw']);
@@ -1078,7 +1079,7 @@ class Status extends FHCAPI_Controller
 			[
 				'required',
 				['status_stud_exists', function ($value) use ($prestudent_id) {
-					if ($value != 'Student')
+					if ($value != Prestudentstatus_model::STATUS_STUDENT)
 						return true; // Only test if new status is Student
 					
 					$result = $this->prestudentstatuschecklib->checkIfExistingStudentRolle($prestudent_id);
@@ -1568,189 +1569,163 @@ class Status extends FHCAPI_Controller
 		return $this->outputJsonSuccess(true);
 	}
 
-	public function advanceStatus($key_prestudent_id, $key_status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester)
+	public function advanceStatus($prestudent_id, $status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester)
 	{
-		//get Studiengang von prestudent_id
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-		$result = $this->PrestudentModel->load([
-			'prestudent_id'=> $key_prestudent_id,
+		$result = $this->PrestudentstatusModel->load([
+			$key_ausbildungssemester,
+			$key_studiensemester_kurzbz,
+			$status_kurzbz,
+			$prestudent_id
 		]);
-		if(isError($result))
-		{
-			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-		$result = current(getData($result));
+		$oldstatus = $this->getDataOrTerminateWithError($result);
+		if (!$oldstatus)
+			show_404(); // Status that should be updated does not exist
 
-		$stg = $result->studiengang_kz;
+		$oldstatus = current($oldstatus);
 
-		if(!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg))
-		{
-			return $this->terminateWithError($this->p->t('lehre','error_keineSchreibrechte'), self::ERROR_TYPE_GENERAL);
-		}
-
-		//Data Vorrücken
-		$result = $this->PrestudentstatusModel->loadWhere(
-			array(
-				'prestudent_id' => $key_prestudent_id,
-				'status_kurzbz' => $key_status_kurzbz,
-				'ausbildungssemester' => $key_ausbildungssemester,
-				'studiensemester_kurzbz' => $key_studiensemester_kurzbz
-			)
-		);
-
-		if (isError($result))
-		{
-			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-
-		elseif (!hasData($result))
-		{
-			return $this->terminateWithError($this->p->t('lehre','error_noStatusFound'), self::ERROR_TYPE_GENERAL);
-		}
-		else
-		{
-			$statusData = current(getData($result));
-		}
 
+		//Target studiensemester_kurzbz
 		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
 		$result = $this->StudiensemesterModel->getNextFrom($key_studiensemester_kurzbz);
 
-		if (isError($result))
-		{
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson(getError($result));
-		}
-		$studiensem_next = current(getData($result));
-		$studiensem_next = $studiensem_next->studiensemester_kurzbz;
+		$studiensemester_kurzbz = $this->getDataOrTerminateWithError($result);
+		$studiensemester_kurzbz = current($studiensemester_kurzbz)->studiensemester_kurzbz;
+
+
+		//Target ausbildungssemester
+		$ausbildungssemester = $key_ausbildungssemester + 1;
 
-		$ausbildungssem_next = $key_ausbildungssemester+1;
 
 		//Form Validation
 		$this->load->library('form_validation');
+		
+		$this->form_validation->set_data([
+			'status_kurzbz' => $status_kurzbz
+		]);
 
-		$last_status_kurzbz = $lastStatusData->status_kurzbz; // TODO(chris): copy pasta!
-
-		$this->form_validation->set_rules('_global', '', [
-			//check if Rolle already exists
-			['checkIfExistingPrestudentRolle', function () use (
-				$key_prestudent_id,
-				$key_status_kurzbz,
-				$studiensem_next,
-				$ausbildungssem_next
-			) {
-				$result = $this->prestudentstatuschecklib->checkIfExistingPrestudentRolle(
-					$key_prestudent_id,
-					$key_status_kurzbz,
-					$studiensem_next,
-					$ausbildungssem_next
-				);
-				return $this->getDataOrTerminateWithError($result);
-			}],
-			['status_stud_exists', function () use ($key_prestudent_id, $key_status_kurzbz, $last_status_kurzbz) {
-				if ($key_status_kurzbz != Prestudentstatus_model::STATUS_STUDENT
-					&& $key_status_kurzbz != Prestudentstatus_model::STATUS_DIPLOMAND
-					&& $last_status_kurzbz != Prestudentstatus_model::STATUS_STUDENT
-				)
+		$this->form_validation->set_rules('status_kurzbz', $this->p->t('lehre', 'status_rolle'), [
+			'in_list[' .
+				Prestudentstatus_model::STATUS_STUDENT . ',' .
+				Prestudentstatus_model::STATUS_DIPLOMAND . ',' .
+				Prestudentstatus_model::STATUS_UNTERBRECHER . ']',
+			['status_stud_exists', function ($value) use ($prestudent_id) {
+				if ($value != Prestudentstatus_model::STATUS_STUDENT)
 					return true;
 				
-				$result = $this->prestudentstatuschecklib->checkIfExistingStudentRolle($key_prestudent_id);
+				$result = $this->prestudentstatuschecklib->checkIfExistingStudentRolle($prestudent_id);
 
 				return $this->getDataOrTerminateWithError($result);
 			}]
 		], [
-			'checkIfExistingPrestudentRolle' => $this->p->t('lehre', 'error_rolleBereitsVorhanden'),
 			'status_stud_exists' => $this->p->t('lehre', 'error_noStudstatus')
 		]);
 		
+		$this->form_validation->set_rules('_default', '', [
+			//check if Rolle already exists
+			['rolle_doesnt_exist', function () use (
+				$prestudent_id,
+				$status_kurzbz,
+				$studiensemester_kurzbz,
+				$ausbildungssemester
+			) {
+				$result = $this->PrestudentstatusModel->load([$ausbildungssemester, $studiensemester_kurzbz, $status_kurzbz, $prestudent_id]);
+
+				return !$this->getDataOrTerminateWithError($result);
+			}]
+		], [
+			'rolle_doesnt_exist' => $this->p->t('lehre', 'error_rolleBereitsVorhanden')
+		]);
+		
 		if (!$this->form_validation->run())
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 
-		//check if studentrolle already exists
-		// if($key_status_kurzbz == Prestudentstatus_model::STATUS_STUDENT)
-		// {
-		// 	$this->load->model('crm/Student_model', 'StudentModel');
-		// 	$result = $this->StudentModel->checkIfExistingStudentRolle($key_prestudent_id);
-		// 	if (isError($result))
-		// 	{
-		// 		return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		// 	}
-		// 	if ($result->retval == "0")
-		// 	{
-		// 		return $this->terminateWithError($this->p->t('lehre','error_noStudstatus'), self::ERROR_TYPE_GENERAL);
-		// 	}
-		// }
 
 		// Start DB transaction
 		$this->db->trans_begin();
 
+		$authUID = getAuthUID();
+		$now = date('c');
+
 		//insert prestudentstatus
-		$uid = getAuthUID();
-		$result = $this->PrestudentstatusModel->insert(
-			[
-				'prestudent_id' => $key_prestudent_id,
-				'status_kurzbz' => $key_status_kurzbz,
-				'studiensemester_kurzbz' => $studiensem_next,
-				'ausbildungssemester' => $ausbildungssem_next,
-				'insertamum' => date('c'),
-				'insertvon' => $uid,
-				'bestaetigtam' => date('c'),
-				'bestaetigtvon' => $uid,
-				'studienplan_id' => $statusData->studienplan_id,
-				'datum' => date('c'),
-				'anmerkung' => $statusData->anmerkung
-			]
-		);
+		$result = $this->PrestudentstatusModel->insert([
+			'prestudent_id' => $prestudent_id,
+			'status_kurzbz' => $status_kurzbz,
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'ausbildungssemester' => $ausbildungssemester,
+			'datum' => $now,
+			'insertamum' => $now,
+			'insertvon' => $authUID,
+			'orgform_kurzbz' => $oldstatus->orgform_kurzbz,
+			'studienplan_id' => $oldstatus->studienplan_id,
+			'bestaetigtam' => $now,
+			'bestaetigtvon' => $authUID,
+			'anmerkung' => $oldstatus->anmerkung
+		]);
 
-		if (isError($result))
-		{
-			$this->db->trans_rollback();
-			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
+		$this->getDataOrTerminateWithError($result);
 
+
+		//get student_uid
 		$this->load->model('crm/Student_model', 'StudentModel');
-		$result = $this->StudentModel->checkIfUid($key_prestudent_id);
-		if(isError($result))
-		{
-			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-		if (!hasData($result))
-		{
-			$this->terminateWithError($this->p->t('studierendenantrag','error_no_student_for_prestudent', ['prestudent_id' => $prestudent_id]), self::ERROR_TYPE_GENERAL);
-		}
-		$student_uid = $result->retval;
+		$result = $this->StudentModel->loadWhere([
+			'prestudent_id' => $prestudent_id
+		]);
 
+		$student = $this->getDataOrTerminateWithError($result);
+
+		if (!$student)
+			$this->terminateWithError($this->p->t('studierendenantrag', 'error_no_student_for_prestudent', ['prestudent_id' => $prestudent_id]));
+
+		
 		//process studentlehrverband
 		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
-		$result = $this->StudentlehrverbandModel->loadWhere(
-			array(
-				'student_uid' => $student_uid,
-				'studiensemester_kurzbz' => $key_studiensemester_kurzbz
-			)
-		);
-		if (isError($result))
-		{
-			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
+		$result = $this->StudentlehrverbandModel->load([
+			$key_studiensemester_kurzbz,
+			$student->student_uid
+		]);
+
+		$studentlvb = $this->getDataOrTerminateWithError($result);
+		if (!$studentlvb)
+			$this->terminateWithError($this->p->t('lehre', 'error_noStudentlehrverband'));
 
 		//Data of current Semester
-		$result = getData($result) ? : [];
-		$studentlvbData = current($result);
+		$studentlvb = current($studentlvb);
 
-		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
-		$result = $this->StudentlehrverbandModel->processStudentlehrverband(
-			$student_uid,
-			$studentlvbData->studiengang_kz,
-			$ausbildungssem_next,
-			$studentlvbData->verband,
-			$studentlvbData->gruppe,
-			$studiensem_next
-		);
-		if ($this->db->trans_status() === false || isError($result))
-		{
-			$this->db->trans_rollback();
-			return $this->terminateWithError($this->p->t('lehre','error_duringInsertUpdateLehrverband'), self::ERROR_TYPE_GENERAL);
-		}
 
+		$newStudentlvb = [
+			'student_uid' => $studentlvb->student_uid,
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'studiengang_kz' => $studentlvb->studiengang_kz,
+			'semester' => $studentlvb->semester,
+			'verband' => $studentlvb->verband,
+			'gruppe' => $studentlvb->gruppe,
+			'insertamum' => $now,
+			'insertvon' => $authUID,
+			'ext_id' => $studentlvb->ext_id
+
+		];
+
+
+		$this->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
+
+		$result = $this->LehrverbandModel->load([
+			$student->gruppe,
+			$student->verband,
+			$ausbildungssemester,
+			$student->studiengang_kz
+		]);
+
+		$lv = $this->getDataOrTerminateWithError($result);
+		if ($lv) {
+			$newStudentlvb['semester'] = $ausbildungssemester;
+		} // If there is no lehrverband just use the same as in the previous studiensemester
+
+
+		//add studentlehrverband
+		$result = $this->StudentlehrverbandModel->insert($newStudentlvb);
+
+		$this->getDataOrTerminateWithError($result);
+		
 		$this->db->trans_commit();
 
 		return $this->outputJsonSuccess(true);
@@ -1868,11 +1843,11 @@ class Status extends FHCAPI_Controller
 		$this->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
 		
 		$this->LehrverbandModel->addLimit(1);
-		$result = $this->LehrverbandModel->loadWhere([
-			'studiengang_kz' => $student->studiengang_kz,
-			'semester' => $ausbildungssemester,
-			'verband' => $student->verband,
-			'gruppe' => $student->gruppe
+		$result = $this->LehrverbandModel->load([
+			$student->gruppe,
+			$student->verband,
+			$ausbildungssemester,
+			$student->studiengang_kz
 		]);
 		$lv = $this->getDataOrTerminateWithError($result);
 
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index 6658e541e..146450341 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -116,59 +116,53 @@ export default{
 						minWidth: 150, // Ensures Action-buttons will be always fully displayed
 						formatter: (cell, formatterParams, onRendered) => {
 
-							let container = document.createElement('div');
+							const container = document.createElement('div');
 							container.className = "d-flex gap-2";
 
+							const data = cell.getData();
+
 							let button = document.createElement('button');
-							if (this.dataMeldestichtag && this.dataMeldestichtag > cell.getData().datum && !this.hasPermissionToSkipStatusCheck)
-								button.className = 'btn btn-outline-secondary btn-action';
-							else
-								button.className = 'btn btn-outline-secondary btn-action';
+							button.className = 'btn btn-outline-secondary btn-action';
 							button.innerHTML = '<i class="fa fa-forward"></i>';
 							button.title = 'Status vorrücken';
-							button.addEventListener(
-								'click',
-								() =>
-								this.actionAdvanceStatus(cell.getData().status_kurzbz, cell.getData().studiensemester_kurzbz, cell.getData().ausbildungssemester)
-							);
-							container.append(button);
-
-							button = document.createElement('button');
-							if (this.dataMeldestichtag && this.dataMeldestichtag > cell.getData().datum && !this.hasPermissionToSkipStatusCheck)
-								button.className = 'btn btn-outline-secondary btn-action';
-							else
-								button.className = 'btn btn-outline-secondary btn-action';
-							button.innerHTML = '<i class="fa fa-check"></i>';
-							button.title = 'Status bestätigen';
 							button.addEventListener('click', () =>
-								this.actionConfirmStatus(cell.getData().status_kurzbz, cell.getData().studiensemester_kurzbz, cell.getData().ausbildungssemester)
+								this.actionAdvanceStatus(data.status_kurzbz, data.studiensemester_kurzbz, data.ausbildungssemester)
 							);
-							if (cell.getData().bestaetigtam || !cell.getData().bewerbung_abgeschicktamum)
+							if (!['Student', 'Diplomand', 'Unterbrecher'].includes(data.status_kurzbz))
 								button.disabled = true;
 							container.append(button);
 
 							button = document.createElement('button');
-							if (this.dataMeldestichtag && this.dataMeldestichtag > cell.getData().datum && !this.hasPermissionToSkipStatusCheck)
-								button.className = 'btn btn-outline-secondary btn-action';
-							else
-								button.className = 'btn btn-outline-secondary btn-action';
-							button.innerHTML = '<i class="fa fa-edit"></i>';
-							button.title = 'Status bearbeiten';
-							button.addEventListener('click', (event) =>
-								this.actionEditStatus(cell.getData().status_kurzbz, cell.getData().studiensemester_kurzbz, cell.getData().ausbildungssemester)
+							button.className = 'btn btn-outline-secondary btn-action';
+							button.innerHTML = '<i class="fa fa-check"></i>';
+							button.title = 'Status bestätigen';
+							button.addEventListener('click', () =>
+								this.actionConfirmStatus(data.status_kurzbz, data.studiensemester_kurzbz, data.ausbildungssemester)
 							);
+							if (data.bestaetigtam || !data.bewerbung_abgeschicktamum)
+								button.disabled = true;
 							container.append(button);
 
 							button = document.createElement('button');
-							if (this.dataMeldestichtag && this.dataMeldestichtag > cell.getData().datum && !this.hasPermissionToSkipStatusCheck)
-								button.className = 'btn btn-outline-secondary btn-action';
-							else
-								button.className = 'btn btn-outline-secondary btn-action';
+							button.className = 'btn btn-outline-secondary btn-action';
+							button.innerHTML = '<i class="fa fa-edit"></i>';
+							button.title = 'Status bearbeiten';
+							button.addEventListener('click', () =>
+								this.actionEditStatus(data.status_kurzbz, data.studiensemester_kurzbz, data.ausbildungssemester)
+							);
+							if (this.dataMeldestichtag && this.dataMeldestichtag > data.datum && !this.hasPermissionToSkipStatusCheck)
+								button.disabled = true;
+							container.append(button);
+
+							button = document.createElement('button');
+							button.className = 'btn btn-outline-secondary btn-action';
 							button.innerHTML = '<i class="fa fa-xmark"></i>';
 							button.title = 'Status löschen';
 							button.addEventListener('click', () =>
-								this.actionDeleteStatus(cell.getData().status_kurzbz, cell.getData().studiensemester_kurzbz, cell.getData().ausbildungssemester)
+								this.actionDeleteStatus(data.status_kurzbz, data.studiensemester_kurzbz, data.ausbildungssemester)
 							);
+							if (this.dataMeldestichtag && this.dataMeldestichtag > data.datum && !this.hasPermissionToSkipStatusCheck)
+								button.disabled = true;
 							container.append(button);
 
 							return container;
@@ -291,16 +285,17 @@ export default{
 				.catch(this.$fhcAlert.handleSystemError);
 		},
 		actionAdvanceStatus(status, stdsem, ausbildungssemester) {
-			this.statusId = {
-				'prestudent_id': this.modelValue.prestudent_id,
-				'status_kurzbz': status,
-				'studiensemester_kurzbz': stdsem,
-				'ausbildungssemester': ausbildungssemester
+			const statusId = {
+				prestudent_id: this.modelValue.prestudent_id,
+				status_kurzbz: status,
+				studiensemester_kurzbz: stdsem,
+				ausbildungssemester: ausbildungssemester
 			};
-			this.loadStatus(this.statusId).then(() => {
-				if(this.statusData)
-					this.advanceStatus(this.statusId);
-			});
+			this.$fhcApi
+				.post('api/frontend/v1/stv/status/advanceStatus/' + Object.values(statusId).join('/'))
+				.then(() => this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successAdvance')))
+				.then(this.reload)
+				.catch(this.$fhcAlert.handleSystemError);
 		},
 		actionConfirmStatus(status, stdsem, ausbildungssemester) {
 			BsConfirm
@@ -316,32 +311,6 @@ export default{
 				.then(this.reload)
 				.catch(this.$fhcAlert.handleSystemError);
 		},
-		advanceStatus(statusId) {
-			return this.$fhcApi.post('api/frontend/v1/stv/status/advanceStatus/' +
-				this.statusId.prestudent_id + '/' +
-				this.statusId.status_kurzbz + '/' +
-				this.statusId.studiensemester_kurzbz + '/' +
-				this.statusId.ausbildungssemester)
-				.then(
-					result => {
-						this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successAdvance'));
-					})
-				.catch(this.$fhcAlert.handleSystemError)
-				.finally(() => {
-					window.scrollTo(0, 0);
-					this.reload();
-				});
-		},
-		loadStatus(status_id) {
-			this.statusNew = false;
-			return this.$fhcApi.post('api/frontend/v1/stv/status/loadStatus/',
-				status_id)
-					.then(result => {
-							this.statusData = result.data;
-						return result;
-					})
-				.catch(this.$fhcAlert.handleSystemError);
-		},
 		reload() {
 			if (this.$refs.table)
 				this.$refs.table.reloadTable();

From 10444e31cec38280ea49c64059e1ae9aab38e0c0 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 30 Jul 2024 16:39:59 +0200
Subject: [PATCH 1034/1461] Add Comment

---
 .../controllers/api/frontend/v1/stv/Status.php        | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 6bfd2b020..e4f28f236 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -1569,6 +1569,17 @@ class Status extends FHCAPI_Controller
 		return $this->outputJsonSuccess(true);
 	}
 
+	/**
+	 * Advances a status entry
+	 * must be of type Student, Diplomand or Unterbrecher
+	 *
+	 * @param integer				$prestudent_id
+	 * @param string				$status_kurzbz
+	 * @param string				$key_studiensemester_kurzbz
+	 * @param integer				$key_ausbildungssemester
+	 *
+	 * @return void
+	 */
 	public function advanceStatus($prestudent_id, $status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester)
 	{
 		$result = $this->PrestudentstatusModel->load([

From 3d27c68deea22515c3d4dd9f0ec64ae9234264c1 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 31 Jul 2024 09:06:42 +0200
Subject: [PATCH 1035/1461] adapt functions toolbarInteressent, Phrases

---
 .../api/frontend/v1/stv/Status.php            | 266 ++++++++++--------
 application/libraries/PrestudentLib.php       |  46 ++-
 .../libraries/PrestudentstatusCheckLib.php    |   4 +-
 .../models/crm/Prestudentstatus_model.php     |  12 +-
 .../Details/Status/Dropdown.js                |  90 +-----
 system/phrasesupdate.php                      |  20 ++
 6 files changed, 229 insertions(+), 209 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index e4f28f236..647de1e98 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -69,7 +69,7 @@ class Status extends FHCAPI_Controller
 		$result = $this->StatusgrundModel->getAktiveGruende();
 
 		$data = $this->getDataOrTerminateWithError($result);
-		
+
 		$this->terminateWithSuccess($data);
 	}
 
@@ -168,58 +168,6 @@ class Status extends FHCAPI_Controller
 		$stg = $result->studiengang_kz;
 		$isStudent = false;
 
-		if(!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg))
-		{
-			$result =  $this->p->t('lehre','error_keineSchreibrechte');
-
-			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-
-		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-
-		$uid = getAuthUID();
-		$status_kurzbz = $this->input->post('status_kurzbz');
-		$ausbildungssemester = $this->input->post('ausbildungssemester');
-		$datum = $this->input->post('datum');
-		$bestaetigtam = $this->input->post('bestaetigtam');
-		$bewerbung_abgeschicktamum = $this->input->post('bewerbung_abgeschicktamum');
-		$studienplan_id = $this->input->post('studienplan_id');
-		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
-		$anmerkung = $this->input->post('anmerkung');
-		$statusgrund_id = $this->input->post('statusgrund_id');
-		$rt_stufe = $this->input->post('rt_stufe');
-		$bestaetigtvon = $uid;
-
-		//Form Validation
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('ausbildungssemester', 'Ausbildungssemester', 'integer', [
-			'integer' => $this->p->t('ui', 'error_fieldNotInteger', ['field' => 'Ausbildungssemester'])
-		]);
-
-		$this->form_validation->set_rules('_global', '', [
-			//check if Rolle already exists
-			['checkIfExistingPrestudentRolle', function () use (
-				$prestudent_id,
-				$status_kurzbz,
-				$studiensemester_kurzbz,
-				$ausbildungssemester
-			) {
-				$result = $this->prestudentstatuschecklib->checkIfExistingPrestudentRolle(
-					$prestudent_id,
-					$status_kurzbz,
-					$studiensemester_kurzbz,
-					$ausbildungssemester
-				);
-				return $this->getDataOrTerminateWithError($result);
-			}]
-		], [
-			'checkIfExistingPrestudentRolle' => $this->p->t('lehre', 'error_rolleBereitsVorhanden')
-		]);
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
 		//GET lastStatus
 		$result = $this->PrestudentstatusModel->getLastStatus($prestudent_id);
 
@@ -234,19 +182,101 @@ class Status extends FHCAPI_Controller
 		else
 			$lastStatusData = current(getData($result));
 
+
+		if(!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg))
+		{
+			$result =  $this->p->t('lehre','error_keineSchreibrechte');
+
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+
+		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+
+		$uid = getAuthUID();
+		$status_kurzbz = $this->input->post('status_kurzbz');
+		$ausbildungssemester =  $this->input->post('ausbildungssemester') ? $this->input->post('ausbildungssemester') : $lastStatusData->ausbildungssemester;
+		$datum = $this->input->post('datum');
+		$bestaetigtam = $this->input->post('bestaetigtam');
+		$bewerbung_abgeschicktamum = $this->input->post('bewerbung_abgeschicktamum');
+		$studienplan_id = $this->input->post('studienplan_id');
+		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
+		$anmerkung = $this->input->post('anmerkung');
+		$statusgrund_id = $this->input->post('statusgrund_id');
+		$rt_stufe = $this->input->post('rt_stufe');
+		$bestaetigtvon = $uid;
+		$name = $this->input->post('name');
+
 		//Different handling depending on newStatus
 		if($status_kurzbz == Prestudentstatus_model::STATUS_ABSOLVENT || $status_kurzbz == Prestudentstatus_model::STATUS_DIPLOMAND)
 		{
 			$ausbildungssemester = $lastStatusData->ausbildungssemester;
 		}
+
+		if($status_kurzbz == Prestudentstatus_model::STATUS_BEWERBER){
+			//check studiensemester_kurzbz:
+			$studiensemester_kurzbz = $lastStatusData->studiensemester_kurzbz != $studiensemester_kurzbz ?
+				$lastStatusData->studiensemester_kurzbz : $studiensemester_kurzbz;
+		}
+		//Check if Bewerberstatus exists
 		if(
 			$status_kurzbz == Prestudentstatus_model::STATUS_AUFGENOMMENER ||
 			$status_kurzbz == Prestudentstatus_model::STATUS_WARTENDER ||
 			$status_kurzbz == Prestudentstatus_model::STATUS_ABGEWIESENER
 		)
 		{
-			$studiensemester_kurzbz = 	$this->getStudiensemesterOfStatus($prestudent_id, Prestudentstatus_model::STATUS_BEWERBER);
+			$result = $this->prestudentstatuschecklib->checkIfExistingBewerberstatus($prestudent_id);
+			if (isError($result))
+			{
+				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			}
 
+			$studiensemester_kurzbz = 	$this->getStudiensemesterOfStatus($prestudent_id, Prestudentstatus_model::STATUS_BEWERBER);
+		}
+
+		//Form Validation
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('ausbildungssemester', 'Ausbildungssemester', 'integer', [
+			'integer' => $this->p->t('ui', 'error_fieldNotInteger', ['field' => 'Ausbildungssemester'])
+		]);
+
+		//TODO(Manu) how to work with name: with $this->p->t('lehre','error_rolleBereitsVorhandenMitNamen', ['name' => $studentName]));
+		/*		$this->form_validation->set_rules('_global', '', [
+					//check if Rolle already exists
+					['checkIfExistingPrestudentRolle', function () use (
+						$prestudent_id,
+						$status_kurzbz,
+						$studiensemester_kurzbz,
+						$ausbildungssemester
+					) {
+						$result = $this->prestudentstatuschecklib->checkIfExistingPrestudentRolle(
+							$prestudent_id,
+							$status_kurzbz,
+							$studiensemester_kurzbz,
+							$ausbildungssemester
+						);
+						return $this->getDataOrTerminateWithError($result);
+					}]
+				], [
+					'checkIfExistingPrestudentRolle' => $this->p->t('lehre', 'error_rolleBereitsVorhanden')
+				]);*/
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+
+		//check if prestudent_rolle exists
+		$result = $this->PrestudentstatusModel->checkIfExistingPrestudentRolle($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester);
+
+		if (isError($result))
+		{
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		//	return $this->terminateWithError($result->retval, self::ERROR_TYPE_GENERAL);
+
+		if($result->retval == '1')
+		{
+			return $this->terminateWithError($this->p->t('lehre','error_rolleBereitsVorhandenMitNamen', ['name' => $name]), self::ERROR_TYPE_GENERAL);
 		}
 
 		//Check Reihungstest
@@ -302,16 +332,14 @@ class Status extends FHCAPI_Controller
 			}
 		}
 
-		//check if bewerberstatus exists
+		//check if bewerberstatus exists TODO(Manu) necessary?
 		if($status_kurzbz == Prestudentstatus_model::STATUS_AUFGENOMMENER || $status_kurzbz == Prestudentstatus_model::STATUS_WARTENDER)
 		{
-
-			$result = $result = $this->prestudentstatuschecklib->checkIfExistingBewerberstatus($prestudent_id);
+			$result = $this->prestudentstatuschecklib->checkIfExistingBewerberstatus($prestudent_id);
 			if (isError($result))
 			{
 				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 			}
-
 		}
 
 		//check if studentrolle already exists
@@ -350,8 +378,6 @@ class Status extends FHCAPI_Controller
 			//check if Bismeldestichtag erreicht ADDNEW status
 			$result = $this->prestudentstatuschecklib->checkIfMeldestichtagErreicht($new_status_datum, $studiensemester_kurzbz);
 
-			//just testing
-			//return $this->terminateWithError("here", self::ERROR_TYPE_GENERAL);
 			if (isError($result))
 			{
 				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
@@ -371,7 +397,7 @@ class Status extends FHCAPI_Controller
 					}
 					$result = current(getData($result));
 					$statusgrund_kurzbz = $result->statusgrund_kurzbz;
-		
+
 					$this->load->library('PrestudentLib');
 					$result = $this->prestudentlib->setAbbrecher($prestudent_id, $studiensemester_kurzbz, null, $statusgrund_kurzbz, $datum, $bestaetigtam, $bestaetigtvon);
 					if (isError($result))
@@ -469,7 +495,21 @@ class Status extends FHCAPI_Controller
 			case Prestudentstatus_model::STATUS_ABGEWIESENER:
 				{
 					$this->load->library('PrestudentLib');
-					$result = $this->prestudentlib->setAbgewiesener($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
+					$result = $this->prestudentlib->setAbgewiesener($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id);
+
+					if (isError($result))
+					{
+						return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+					}
+					else
+						$this->terminateWithSuccess($prestudent_id);
+
+				}
+				break;
+			case Prestudentstatus_model::STATUS_WARTENDER:
+				{
+					$this->load->library('PrestudentLib');
+					$result = $this->prestudentlib->setWartender($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
 
 					if (isError($result))
 					{
@@ -686,10 +726,10 @@ class Status extends FHCAPI_Controller
 			$result = $this->PrestudentstatusModel->loadWhere([
 				"prestudent_id" => $prestudent_id,
 				"status_kurzbz" => Prestudentstatus_model::STATUS_AUFGENOMMENER
-				]);
-				//$this->PrestudentstatusModel->addOrder('ausbildungssemester', 'DESC');
-				$this->PrestudentstatusModel->addLimit(1);
-			if (isError($result)) 
+			]);
+			//$this->PrestudentstatusModel->addOrder('ausbildungssemester', 'DESC');
+			$this->PrestudentstatusModel->addLimit(1);
+			if (isError($result))
 			{
 				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 			}
@@ -1061,9 +1101,9 @@ class Status extends FHCAPI_Controller
 						return true; // Skip if access right says so
 					if (!$value)
 						return true; // Error will be handled by the required statement above
-					
+
 					$result = $this->prestudentstatuschecklib->checkIfMeldestichtagErreicht($value);
-					
+
 					return !$this->getDataOrTerminateWithError($result);
 				}]
 			],
@@ -1081,7 +1121,7 @@ class Status extends FHCAPI_Controller
 				['status_stud_exists', function ($value) use ($prestudent_id) {
 					if ($value != Prestudentstatus_model::STATUS_STUDENT)
 						return true; // Only test if new status is Student
-					
+
 					$result = $this->prestudentstatuschecklib->checkIfExistingStudentRolle($prestudent_id);
 
 					return $this->getDataOrTerminateWithError($result);
@@ -1091,9 +1131,9 @@ class Status extends FHCAPI_Controller
 				'status_stud_exists' => $this->p->t('lehre', 'error_noStudstatus')
 			]
 		);
-		
+
 		$this->form_validation->set_rules('studiensemester_kurzbz', $this->p->t('lehre', 'studiensemester'), 'required');
-		
+
 		$this->form_validation->set_rules('ausbildungssemester', $this->p->t('lehre', 'ausbildungssemester'), 'required');
 
 		$this->form_validation->set_rules('bestaetigtam', $this->p->t('lehre', 'bestaetigt_am'), 'is_valid_date');
@@ -1244,7 +1284,7 @@ class Status extends FHCAPI_Controller
 			'history_abbrecher' => $this->p->t('lehre', 'error_consecutiveUnterbrecherAbbrecher'),
 			'history_diplomant' => $this->p->t('lehre', 'error_consecutiveDiplomandStudent')
 		]);
-		
+
 		if (!$this->form_validation->run())
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 
@@ -1304,10 +1344,10 @@ class Status extends FHCAPI_Controller
 
 		$oldstatus = current($oldstatus);
 
-		
+
 		$isBerechtigtNoStudstatusCheck =  $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung');
 		$isBerechtigtBasisPrestudentstatus = $this->permissionlib->isBerechtigt('basis/prestudentstatus');
-		
+
 
 		$authUID = getAuthUID();
 		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz') ?: $oldstatus->studiensemester_kurzbz;
@@ -1338,9 +1378,9 @@ class Status extends FHCAPI_Controller
 						return true; // Skip if access right says so
 					if (!$value)
 						return true; // Error will be handled by the required statement above
-					
+
 					$result = $this->prestudentstatuschecklib->checkIfMeldestichtagErreicht($value);
-					
+
 					return !$this->getDataOrTerminateWithError($result);
 				}]
 			],
@@ -1540,21 +1580,21 @@ class Status extends FHCAPI_Controller
 			'updatevon' => $authUID
 		];
 		foreach ([
-			'orgform_kurzbz',
-			'anmerkung',
-			'bewerbung_abgeschicktamum',
-			'studienplan_id',
-			'rt_stufe',
-			'statusgrund_id'
-		] as $key)
+					 'orgform_kurzbz',
+					 'anmerkung',
+					 'bewerbung_abgeschicktamum',
+					 'studienplan_id',
+					 'rt_stufe',
+					 'statusgrund_id'
+				 ] as $key)
 			if ($this->input->post($key))
 				$updateData[$key] = $this->input->post($key);
-		
+
 		if ($this->input->post('bestaetigtam')) {
 			$updateData['bestaetigtam'] = $this->input->post('bestaetigtam');
 			$updateData['bestaetigtvon'] = $authUID;
 		}
-		
+
 		$result = $this->PrestudentstatusModel->update([
 			'prestudent_id' => $prestudent_id,
 			'status_kurzbz' => $status_kurzbz,
@@ -1609,7 +1649,7 @@ class Status extends FHCAPI_Controller
 
 		//Form Validation
 		$this->load->library('form_validation');
-		
+
 		$this->form_validation->set_data([
 			'status_kurzbz' => $status_kurzbz
 		]);
@@ -1622,7 +1662,7 @@ class Status extends FHCAPI_Controller
 			['status_stud_exists', function ($value) use ($prestudent_id) {
 				if ($value != Prestudentstatus_model::STATUS_STUDENT)
 					return true;
-				
+
 				$result = $this->prestudentstatuschecklib->checkIfExistingStudentRolle($prestudent_id);
 
 				return $this->getDataOrTerminateWithError($result);
@@ -1630,7 +1670,7 @@ class Status extends FHCAPI_Controller
 		], [
 			'status_stud_exists' => $this->p->t('lehre', 'error_noStudstatus')
 		]);
-		
+
 		$this->form_validation->set_rules('_default', '', [
 			//check if Rolle already exists
 			['rolle_doesnt_exist', function () use (
@@ -1646,7 +1686,7 @@ class Status extends FHCAPI_Controller
 		], [
 			'rolle_doesnt_exist' => $this->p->t('lehre', 'error_rolleBereitsVorhanden')
 		]);
-		
+
 		if (!$this->form_validation->run())
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 
@@ -1687,7 +1727,7 @@ class Status extends FHCAPI_Controller
 		if (!$student)
 			$this->terminateWithError($this->p->t('studierendenantrag', 'error_no_student_for_prestudent', ['prestudent_id' => $prestudent_id]));
 
-		
+
 		//process studentlehrverband
 		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
 		$result = $this->StudentlehrverbandModel->load([
@@ -1736,7 +1776,7 @@ class Status extends FHCAPI_Controller
 		$result = $this->StudentlehrverbandModel->insert($newStudentlvb);
 
 		$this->getDataOrTerminateWithError($result);
-		
+
 		$this->db->trans_commit();
 
 		return $this->outputJsonSuccess(true);
@@ -1840,7 +1880,6 @@ class Status extends FHCAPI_Controller
 			return; // No Update necessary
 
 		$student = current($student);
-		
 
 		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
 		$result = $this->StudentlehrverbandModel->loadWhere([
@@ -1850,9 +1889,13 @@ class Status extends FHCAPI_Controller
 
 		$studentlvb = $this->getDataOrTerminateWithError($result);
 
+		// NOTE(chris): if $studentlvb then update to the same values as before (except updatevon). So do nothing?
+		// TODO(chris): check if that is correct (in FAS)?
+		if ($studentlvb)
+			return; // No Update necessary
 
 		$this->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
-		
+
 		$this->LehrverbandModel->addLimit(1);
 		$result = $this->LehrverbandModel->load([
 			$student->gruppe,
@@ -1862,33 +1905,16 @@ class Status extends FHCAPI_Controller
 		]);
 		$lv = $this->getDataOrTerminateWithError($result);
 
-
-		if ($studentlvb && !$lv)
-			return; // No Update necessary
-
-		if ($studentlvb) // Update current Student-Lehrverband entry
-			$this->StudentlehrverbandModel->update([
-				'student_uid' => $student->student_uid,
-				'studiensemester_kurzbz' => $studiensemester_kurzbz
-			], [
-				'studiengang_kz' => $student->studiengang_kz,
-				'semester' => $ausbildungssemester,
-				'verband' => $student->verband,
-				'gruppe' => $student->gruppe,
-				'updateamum' => date('c'),
-				'updatevon' => $authUID
-			]);
-		else // Add new Student-Lehrverband entry
-			$this->StudentlehrverbandModel->insert([
-				'student_uid' => $student->student_uid,
-				'studiensemester_kurzbz' => $studiensemester_kurzbz,
-				'studiengang_kz' => $student->studiengang_kz,
-				'semester' => $lv ? $ausbildungssemester : $student->semester,
-				'verband' => $student->verband,
-				'gruppe' => $student->gruppe,
-				'insertamum' => date('c'),
-				'insertvon' => $authUID
-			]);
+		$this->StudentlehrverbandModel->insert([
+			'student_uid' => $student->student_uid,
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'studiengang_kz' => $student->studiengang_kz,
+			'semester' => $lv ? $ausbildungssemester : $student->semester,
+			'verband' => $student->verband,
+			'gruppe' => $student->gruppe,
+			'insertamum' => date('c'),
+			'insertvon' => $authUID
+		]);
 	}
 
 	private function _sanitizeAliasName($str)
diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php
index 09da501d3..ab274805f 100644
--- a/application/libraries/PrestudentLib.php
+++ b/application/libraries/PrestudentLib.php
@@ -423,8 +423,7 @@ class PrestudentLib
 
 	public function setStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id, $bestaetigtAm, $bestaetigtVon)
 	{
-		$insertvon = getAuthUID();
-		
+
 		$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
 		if (isError($result))
 			return $result;
@@ -474,7 +473,7 @@ class PrestudentLib
 			'statusgrund_id' => $statusgrund_id,
 			'ausbildungssemester' => $ausbildungssemester,
 			'datum' => date('c'),
-			'insertvon' => $insertvon,
+			'insertvon' => getAuthUID(),
 			'insertamum' => date('c'),
 			'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz,
 			'studienplan_id'=> $prestudent_status->studienplan_id,
@@ -757,9 +756,9 @@ class PrestudentLib
 
 		$prestudent_status = current($resultLastStatus);
 
-		//check studiensemester_kurzbz:
-		$studiensemester_kurzbz = $prestudent_status->studiensemester_kurzbz != $studiensemester_kurzbz ?
-			$prestudent_status->studiensemester_kurzbz : $studiensemester_kurzbz;
+		//check studiensemester_kurzbz TODO(Manu) check if Necessary: already checked in staus.php changeStatus()
+/*		$studiensemester_kurzbz = $prestudent_status->studiensemester_kurzbz != $studiensemester_kurzbz ?
+			$prestudent_status->studiensemester_kurzbz : $studiensemester_kurzbz;*/
 
 		//Status updaten
 		$result = $this->_ci->PrestudentstatusModel->insert([
@@ -817,7 +816,7 @@ class PrestudentLib
 			return success();
 	}
 
-	public function setAbgewiesener($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester){
+	public function setAbgewiesener($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id){
 
 		$resultLastStatus = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
 		if (isError($resultLastStatus))
@@ -838,6 +837,39 @@ class PrestudentLib
 			'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz,
 			'studienplan_id'=> $prestudent_status->studienplan_id,
 			'bestaetigtvon' => getAuthUID(),
+			'bestaetigtam' => date('c'),
+			'statusgrund_id' => $statusgrund_id
+		]);
+
+		if (isError($result))
+		{
+			return $result;
+		}
+		else
+			return success();
+	}
+
+	public function setWartender($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester){
+
+		$resultLastStatus = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
+		if (isError($resultLastStatus))
+			return $resultLastStatus;
+		$resultLastStatus = getData($resultLastStatus);
+
+		$prestudent_status = current($resultLastStatus);
+
+		//Status updaten
+		$result = $this->_ci->PrestudentstatusModel->insert([
+			'prestudent_id' => $prestudent_id,
+			'status_kurzbz' => Prestudentstatus_model::STATUS_WARTENDER,
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'ausbildungssemester' => $ausbildungssemester,
+			'datum' => date('c'),
+			'insertvon' => getAuthUID(),
+			'insertamum' => date('c'),
+			'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz,
+			'studienplan_id'=> $prestudent_status->studienplan_id,
+			'bestaetigtvon' => getAuthUID(),
 			'bestaetigtam' => date('c')
 		]);
 
diff --git a/application/libraries/PrestudentstatusCheckLib.php b/application/libraries/PrestudentstatusCheckLib.php
index 20b42b46a..55488cf4c 100644
--- a/application/libraries/PrestudentstatusCheckLib.php
+++ b/application/libraries/PrestudentstatusCheckLib.php
@@ -111,13 +111,13 @@ class PrestudentstatusCheckLib
 	public function checkIfExistingPrestudentRolle(
 		$prestudent_id,
 		$status_kurzbz,
-		$tudiensemester_kurzbz,
+		$studiensemester_kurzbz,
 		$ausbildungssemester
 	) {
 		$result =  $this->_ci->PrestudentstatusModel->checkIfExistingPrestudentRolle(
 			$prestudent_id,
 			$status_kurzbz,
-			$tudiensemester_kurzbz,
+			$studiensemester_kurzbz,
 			$ausbildungssemester
 		);
 		if (isError($result))
diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php
index 8ba52ba2d..96380a6c0 100644
--- a/application/models/crm/Prestudentstatus_model.php
+++ b/application/models/crm/Prestudentstatus_model.php
@@ -369,6 +369,16 @@ class Prestudentstatus_model extends DB_Model
 	 */
 	public function checkIfExistingPrestudentRolle($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester)
 	{
+		$studentName = '';
+
+		$nameRes = $this->PersonModel->loadPrestudent($prestudent_id);
+
+		if (hasData($nameRes))
+		{
+			$nameData = getData($nameRes)[0];
+			$studentName = $nameData->vorname.' '.$nameData->nachname;
+		}
+
 		$qry = "SELECT
 					*
 				FROM
@@ -394,7 +404,7 @@ class Prestudentstatus_model extends DB_Model
 		}
 		else
 		{
-			return success("1", $this->p->t('lehre','error_rolleBereitsVorhanden'));
+			return success("1", $this->p->t('lehre','error_rolleBereitsVorhandenMitNamen', ['name' => $studentName]));
 		}
 	}
 
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js b/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js
index 5f10b2454..78df8ad2d 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js
@@ -172,35 +172,28 @@ export default {
 			this.$refs.confirmStatusAction.show();
 		},
 		addStudent(prestudentIds){
-			console.log("function addStudent ");
-			//this.hideModal('confirmStatusAction');
+			this.resetChangeModals();
 			let changeData = {};
 
 			//for Feedback Sucess, Error
 			let countSuccess = 0;
 			let countError = 0;
 
-			//if(!prestudentIds)
-			//	prestudentIds = [this.modelValue.prestudent_id];
-
 			const promises = prestudentIds.map(prestudentId => {
 
 				changeData = this.newArray.find(item => item.prestudent_id === prestudentId);
 
-				//changeData = this.statusData.status_kurzbz ? this.statusData : this.newArray.find(item => item.prestudent_id === prestudentId);
-
 				return this.$fhcApi.post('api/frontend/v1/stv/status/addStudent/' + prestudentId,
 					changeData
 				).then(response => {
 					countSuccess++;
 					return response;
 				})
-					//.catch(this.$fhcAlert.handleSystemError)
-					.catch(error => {
-						countError++;
-						//For each Prestudent show Error in Alert
-						this.$fhcAlert.handleSystemError(error);
-					});
+				.catch(error => {
+					countError++;
+					//For each Prestudent show Error in Alert
+					this.$fhcAlert.handleSystemError(error);
+				});
 			});
 
 			Promise
@@ -257,7 +250,6 @@ export default {
 			this.actionConfirmDialogue(this.updateData, 'studenten','Unterbrecher');
 		},
 		changeStatusToStudent(statusgrund_id){
-			this.resetChangeModals();
 			let def_date = this.getDefaultDate();
 			//TODO Manu validation if Bewerber already before asking for ausbildungssemester
 			//this.checkIfBewerber();
@@ -348,13 +340,11 @@ export default {
 				...deltaData,
 			}));
 
-			this.actionConfirmDialogue(this.updateData, 'aufgenommener','Aufgenommenen');
+			this.actionConfirmDialogue(this.updateData, 'aufgenommener','Aufgenommener');
 
 		},
 		changeInteressentToStudent(statusgrund_id){
 			this.resetChangeModals();
-			//TODO(Manu) test statusgrund_id
-			console.log("in function changeInteressentToStudent mit statusgrund_id", statusgrund_id);
 			let def_date = this.getDefaultDate();
 			let deltaData =
 				{
@@ -388,7 +378,7 @@ export default {
 				...deltaData,
 			}));
 
-			this.actionConfirmDialogue(this.updateData, 'abgewiesener','Abgewiesenen');
+			this.actionConfirmDialogue(this.updateData, 'abgewiesener','Abgewiesener');
 		},
 		changeStatusToWartender(){
 			this.resetChangeModals();
@@ -404,12 +394,10 @@ export default {
 				...deltaData,
 			}));
 
-			this.actionConfirmDialogue(this.updateData, 'wartender','Wartenden');
+			this.actionConfirmDialogue(this.updateData, 'wartender','Wartender');
 		},
 		changeStatus(prestudentIds){
-			console.log("function changeStatus ");
 			this.resetChangeModals();
-			//Array.isArray(prestudentIds) ? this.modelValue.prestudent_id : [prestudentIds];
 			let changeData = {};
 
 			//for Feedback Sucess, Error
@@ -426,8 +414,6 @@ export default {
 				this.newArray.push({ ausbildungssemester: this.actionSem });
 			}
 
-			console.log("ausbildungssem: " + this.actionSem);
-
 			const promises = prestudentIds.map(prestudentId => {
 
 				changeData = this.newArray.find(item => item.prestudent_id === prestudentId);
@@ -461,7 +447,7 @@ export default {
 					//	}
 
 					//Feedback Success als infoalert
-					if (countSuccess > 0) {
+					if (countSuccess > 0 || countError > 0 ) {
 						this.$fhcAlert.alertInfo(this.$p.t('ui', 'successNewStatus', {
 							'countSuccess': countSuccess,
 							'status': this.newStatus,
@@ -469,9 +455,7 @@ export default {
 						}));
 					}
 
-					//TODO(Manu) bei status Interessent, Bewerber, aufgenommener, reload nicht working
-
-					if(this.prestudentIds.length == 1){
+					if(this.prestudentIds.length == 1 && countSuccess > 0){
 						this.reload();
 
 						//necessary to see new status in List
@@ -496,58 +480,6 @@ export default {
 					})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
-		/*checkIfBewerber(prestudentIds){
-
-			if(!prestudentIds)
-				prestudentIds = [this.modelValue.prestudent_id];
-
-			const promises = prestudentIds.map(prestudentId => {
-
-				return this.$fhcApi.post('api/frontend/v1/stv/status/hasStatusBewerber/' + prestudentId,
-				).then(response => {
-					countSuccess++;
-					return response;
-				})
-					//.catch(this.$fhcAlert.handleSystemError)
-					.catch(error => {
-						countError++;
-						//For each Prestudent show Error in Alert
-						this.$fhcAlert.handleSystemError(error);
-					});
-			});
-
-			Promise
-				.allSettled(promises)
-				.then(values => {
-
-						//Feedback Success als infoalert
-						if (countSuccess > 0) {
-							this.$fhcAlert.alertInfo(this.$p.t('ui', 'successNewStatus', {
-								'countSuccess': countSuccess,
-								'status': this.newStatus,
-								'countError': countError
-							}));
-						}
-
-						if (this.modelValue.prestudent_id) {
-							this.reload();
-							//TODO(manu) reload Detailtab after Abbrecher to see current status activ, verband and gruppe
-						}
-						else {
-							this.$reloadList();
-						}
-
-			/!*return this.$fhcApi
-				.get('api/frontend/v1/stv/status/hasStatusBewerber/' + prestudent_id)
-				.then(
-					result => {
-						this.isBewerber = result.data;
-						console.log(result);
-						return result;
-					})
-				.catch(this.$fhcAlert.handleSystemError);*!/
-			//}
-		},*/
 		getDefaultDate() {
 			const today = new Date();
 			return today;
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index b0259bfb3..6052de48e 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -27997,6 +27997,26 @@ array(
 				)
 			)
 		),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'error_rolleBereitsVorhandenMitNamen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '{name}: Diese Rolle ist bereits vorhanden!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '{name}: This role already exists!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'lehre',

From 8c84a63757f28c63222e6bbff3e1b8de274b584a Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 31 Jul 2024 09:40:50 +0200
Subject: [PATCH 1036/1461] corrects how both the ampel and the ui phrasen are
 loaded

---
 public/js/components/DashboardWidget/Ampel.js | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/public/js/components/DashboardWidget/Ampel.js b/public/js/components/DashboardWidget/Ampel.js
index 1b4efa022..ca7442578 100755
--- a/public/js/components/DashboardWidget/Ampel.js
+++ b/public/js/components/DashboardWidget/Ampel.js
@@ -10,16 +10,13 @@ export default {
         source: '',
         allAmpeln:null,
         activeAmpeln:null,
-        phrasen: {ampeln:false, ui:false},
+        isPhrasenLoaded: false,
     }),
     mixins: [
         AbstractWidget
     ],
     computed: {
-        arePhrasenLoaded(){
-            // checks if both the phrasen categories 'ampeln' and 'ui' are loaded
-            return this.phrasen.ampeln && this.phrasen.ui;            
-        },
+        
         ampelnComputed(){
             
             switch(this.source)
@@ -117,10 +114,7 @@ export default {
         }
     },
     created() {
-        this.$p.loadCategory('ampel').then(() => {
-            this.isPhrasenLoaded = true;
-        });
-        this.$p.loadCategory('ui').then(() => {
+        this.$p.loadCategory(['ampel','ui']).then(() => {
             this.isPhrasenLoaded = true;
         });
         this.$emit('setConfig', false);    

From 009360a12741377eeb6235030b2979628b46d066 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 31 Jul 2024 09:45:20 +0200
Subject: [PATCH 1037/1461] Confirm Status Message

---
 .../api/frontend/v1/stv/Status.php            | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 647de1e98..3c59eed06 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -1844,6 +1844,48 @@ class Status extends FHCAPI_Controller
 
 		$this->getDataOrTerminateWithError($result);
 
+
+		//Send Message
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+		
+		$this->PrestudentModel->addSelect('p.*');
+		$this->PrestudentModel->addSelect('stg.oe_kurzbz');
+		$this->PrestudentModel->addSelect('stg.bezeichnung AS stg_bezeichnung');
+		$this->PrestudentModel->addSelect('stg.email AS stg_email');
+		$this->PrestudentModel->addSelect('plan.orgform_kurzbz');
+		$this->PrestudentModel->addSelect('typ.bezeichnung AS typ_bezeichnung');
+
+		$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
+		$this->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz');
+		$this->PrestudentModel->addJoin('public.tbl_studiengangstyp typ', 'typ');
+		$this->PrestudentModel->addJoin('public.tbl_studienplan plan', 'studienplan_id', 'LEFT');
+		
+		$result = $this->PrestudentModel->load($prestudent_id);
+
+		$studentdata = $this->getDataOrTerminateWithError($result);
+
+		$this->load->library('MessageLib');
+		$result = $this->messagelib->sendMessageUserTemplate(
+			$studentdata->person_id,				// receiversPersonId
+			'MailStatConfirm' . $status_kurzbz,		// vorlage
+			[
+				'anrede' => $studentdata->anrede,
+				'vorname' => $studentdata->vorname,
+				'nachname' => $studentdata->nachname,
+				'typ' => $studentdata->typ_bezeichnung,
+				'studiengang' => $studentdata->stg_bezeichnung,
+				'orgform' => $studentdata->orgform_kurzbz ?: $oldstatus->orgform_kurzbz,
+				'stgMail' => $studentdata->stg_email
+			],										// parseData
+			null,									// orgform
+			1,										// TODO
+			$studentdata->oe_kurzbz,				// senderOU
+			null,									// relationmessage_id
+			MSG_PRIORITY_NORMAL,					// priority
+			true									// multiPartMime
+		);
+
+
 		$this->terminateWithSuccess(true);
 	}
 

From 085ca2a16d0f27da9ed14c881a1b575c22cf98c3 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Wed, 31 Jul 2024 11:44:42 +0200
Subject: [PATCH 1038/1461] Adapted getLvsByStudienplan query to get all LVs,
 not only VZ

---
 application/models/education/Lehrveranstaltung_model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/models/education/Lehrveranstaltung_model.php b/application/models/education/Lehrveranstaltung_model.php
index 5a9053f73..09b635a58 100644
--- a/application/models/education/Lehrveranstaltung_model.php
+++ b/application/models/education/Lehrveranstaltung_model.php
@@ -49,7 +49,7 @@ class Lehrveranstaltung_model extends DB_Model
 	public function getLvsByStudienplan($studiensemester_kurzbz = null, $oes = null)
 	{
 		$subQry = $this->_getQryLvsByStudienplan($studiensemester_kurzbz, $oes);
-		$qry = 'SELECT DISTINCT ON (lehrveranstaltung_id) * FROM ('. $subQry. ') AS tmp ORDER BY lehrveranstaltung_id, orgform_kurzbz DESC'; // TODO: hier VZ zuerst. aber eig nicht relevant...check
+		$qry = 'SELECT * FROM ('. $subQry. ') AS tmp ORDER BY stg_typ_kurzbz, orgform_kurzbz DESC';
 
 		return $this->execQuery($qry);
 	}

From c2be0a4790d3eb0fb411382ec3443b16497a1e72 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 31 Jul 2024 12:41:03 +0200
Subject: [PATCH 1039/1461] adds content to Url.js

---
 .../controllers/api/frontend/v1/Bookmark.php  | 35 +++++++++-
 .../models/dashboard/Bookmark_model.php       | 41 +-----------
 public/js/api/bookmark.js                     | 12 ++++
 public/js/components/Dashboard/Item.js        | 10 ++-
 public/js/components/DashboardWidget/Url.js   | 54 +++++++++++----
 .../41134_bookmark_dashboardWidget.php        | 66 ++++++++++---------
 6 files changed, 127 insertions(+), 91 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Bookmark.php b/application/controllers/api/frontend/v1/Bookmark.php
index c18afc751..9fb8a6519 100644
--- a/application/controllers/api/frontend/v1/Bookmark.php
+++ b/application/controllers/api/frontend/v1/Bookmark.php
@@ -29,6 +29,7 @@ class Bookmark extends FHCAPI_Controller
 		parent::__construct([
 			'getBookmarks' => self::PERM_LOGGED,
             'delete' => self::PERM_LOGGED,
+            'insert' => self::PERM_LOGGED,
         ]);
 
 		$this->load->model('dashboard/Bookmark_model', 'BookmarkModel');
@@ -49,7 +50,7 @@ class Bookmark extends FHCAPI_Controller
 	 */
 	public function getBookmarks()
 	{
-        $bookmarks = $this->BookmarkModel->getAll($this->uid);
+        $bookmarks = $this->BookmarkModel->loadWhere(["uid"=>$this->uid]);
 
         if(isError($bookmarks)){
             $this->terminateWithError(getError($bookmarks));
@@ -69,7 +70,7 @@ class Bookmark extends FHCAPI_Controller
 	{
         if(!isset($bookmark_id)) $this->terminateWithError("missing required parameters");
         
-        $bookmark = $this->BookmarkModel->get($bookmark_id);
+        $bookmark = $this->BookmarkModel->load($bookmark_id);
 
         if(isError($bookmark)){
             $this->terminateWithError(getError($bookmark));
@@ -95,5 +96,35 @@ class Bookmark extends FHCAPI_Controller
             $this->terminateWithError("You are not authorized to delete this bookmark");
         }
     }
+
+    /**
+	 * inserts new bookmark into the bookmark table 
+	 * @access public
+	 * @return void
+	 */
+    public function insert()
+	{
+        $url = $this->input->post('url',true);
+        $title = $this->input->post('title',true);
+        $tag = $this->input->post('tag',true);
+
+        // set the parameters to null if they are not present in the request payload
+        if($title == FALSE) $title = NULL;
+        if($tag == FALSE) $tag = NULL;
+
+        if(!isset($url))$this->terminateWithError("missing required parameters");
+
+        $insert_into_result = $this->BookmarkModel->execReadOnlyQuery("
+        INSERT INTO dashboard.tbl_bookmark (uid, url, title,tag, insertvon, updateamum, updatevon) VALUES (?,?,?,?,?,NULL,NULL);",[$this->uid,$url,$title,$tag,$this->uid]);
+
+        if(isError($insert_into_result)){
+            $this->terminateWithError(getError($insert_into_result));
+        }
+
+        $insert_into_result = $this->getDataOrTerminateWithError($insert_into_result);
+
+        $this->terminateWithSuccess($insert_into_result);
+
+    }
 }
 
diff --git a/application/models/dashboard/Bookmark_model.php b/application/models/dashboard/Bookmark_model.php
index 3b44d055c..5efacc26b 100644
--- a/application/models/dashboard/Bookmark_model.php
+++ b/application/models/dashboard/Bookmark_model.php
@@ -13,45 +13,6 @@ class Bookmark_model extends DB_Model
 	}
 
 
-	/**
-	 * Get Bookmarks of UID.
-	 * @param string user uid
-	 * @return array
-	 */
-	public function getAll($uid)
-	{
-		return $this->execReadOnlyQuery("
-            SELECT * 
-            FROM dashboard.tbl_bookmark 
-            WHERE uid = ?
-            ",[$uid]);
-	}
+	
 
-    /**
-	 * Gets Bookmark by bookmark_id.
-	 * @param int $bookmark_id 
-	 * @return array
-	 */
-    public function get($bookmark_id)
-	{
-		return $this->execReadOnlyQuery("
-            SELECT * 
-            FROM dashboard.tbl_bookmark 
-            WHERE bookmark_id = ?
-            ",[$bookmark_id]);
-	}
-
-    /**
-	 * Gets Bookmark by bookmark_id.
-	 * @param int $bookmark_id
-	 * @return array
-	 */
-	public function delete($bookmark_id)
-	{
-		return $this->execReadOnlyQuery("
-            DELETE
-            FROM dashboard.tbl_bookmark 
-            WHERE bookmark_id = ?
-            ",[$bookmark_id]);
-	}
 }
diff --git a/public/js/api/bookmark.js b/public/js/api/bookmark.js
index 6a6b3c309..5c99a4010 100644
--- a/public/js/api/bookmark.js
+++ b/public/js/api/bookmark.js
@@ -18,4 +18,16 @@ export default {
         ,{}
       ); 
     },
+
+    insertBookmark: function ({url, title, tag}) {
+      
+      return this.$fhcApi.post(
+        FHC_JS_DATA_STORAGE_OBJECT.app_root + 
+        FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+        `/api/frontend/v1/Bookmark/insert`
+        ,{url: url,
+          title: title,
+          tag: tag}
+      ); 
+    },
 }
\ No newline at end of file
diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index 43e03ebc7..10c436047 100755
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -38,9 +38,13 @@ export default {
 		},
 		ready() {
 			return this.component && this.arguments !== null
-		}
+		},
+		widgetHasFooter(){
+			return this.widget?.setup?.name == "Bookmark" ? false : true;
+		},
 	},
 	methods: {
+		
 		mouseDown(e) {
 			this.target = e.target;
 		},
@@ -97,7 +101,7 @@ export default {
 		this.arguments = {...this.widget.arguments, ...this.config};
 		this.tmpConfig = {...this.arguments};
 	},
-	template: `
+	template: /*html*/`
 	<div v-if="loading">
 		<div class="d-flex justify-content-center align-items-center h-100">
 			<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
@@ -127,7 +131,7 @@ export default {
 				<component v-if="ready && !isLoading" :is="component" :config="tmpConfig" @change="changeConfig" :configMode="true"></component>
 				<div v-else class="text-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></div>
 			</template>
-			<template v-slot:footer>
+			<template v-if="widgetHasFooter" v-slot:footer>
 				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
 				<button type="button" class="btn btn-primary" @click="changeConfig">Save changes</button>
 			</template>
diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index 23631c88c..11502abe4 100755
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -3,7 +3,10 @@ import AbstractWidget from './Abstract';
 export default {
     name: 'WidgetsUrl',
     data: () => ({
-        links: null
+        links: null,
+        title_input: '',
+        url_input: '',
+        isPhrasenLoaded: false,
     }),
     mixins: [
         AbstractWidget
@@ -22,27 +25,50 @@ export default {
             })
             .catch();
         },
-        addLink(){
-            let linkId = this.links.length;
-
-            this.links.push({
-                id: linkId,
-                tag: this.config.tag,
-                title: this.title,
-                url: this.url
-                })
+        async confirmDelete() {
+            if (await this.$fhcAlert.confirmDelete() === false)
+                return;
         },
-        removeLink(bookmark_id){
+        addLink(){
+            //let linkId = this.links.length;
+
+            this.$fhcApi.factory.bookmark.insertBookmark({
+                tag: this.config.tag,
+                title: this.title_input,
+                url: this.url_input
+                })
+                .then(res => res.data)
+                .then(result => {
+                    this.$fhcAlert.alertInfo("bookmark added");
+                })
+                .catch();
+
+            // reset the values for the title and url inputs
+            this.title_input = '';
+            this.url_input = '';
+
+            // refetch the bookmarks to see the updates
+            this.fetchBookmarks();
+
+        },
+        async removeLink(bookmark_id){
+            await this.confirmDelete();
             this.$fhcApi.factory.bookmark.deleteBookmark(bookmark_id)
             .then(res => res.data)
             .then(result => {
                 this.$fhcAlert.alertInfo(this.$p.t('bookmark','bookmarkDeleted'));
             })
             .catch();
+
+            // refetch the bookmarks to see the updates
+            this.fetchBookmarks();
         }
     },
     
     created() {
+        this.$p.loadCategory('bookmark').then(()=>{
+            this.isPhrasenLoaded = true;
+        })
         //this.links = TEST_LINKS;
         // this.links = TEST_KEINE_LINKS;
     },
@@ -56,9 +82,9 @@ export default {
 
                 <header><b>{{$p.t('bookmark','newLink')}}</b></header><br>
                 <div>
-                    <input class="form-control form-control-sm" placeholder="Titel" type="text" v-model="title" name="title" maxlength="50" required>
-                    <input class="form-control form-control-sm mt-2" type="url" placeholder="URL" v-model="url" name="url" required>
-                    <button class="btn btn-outline-secondary btn-sm w-100 mt-2" @click="addLink()" type="button">{{$p.t('bookmark','saveLink')}}</button>
+                    <input class="form-control form-control-sm" placeholder="Titel" type="text" v-model="title_input" name="title" maxlength="50" required>
+                    <input class="form-control form-control-sm mt-2" type="url" placeholder="URL" v-model="url_input" name="url" required>
+                    <button class="btn btn-outline-secondary btn-sm w-100 mt-2" @click="addLink" type="button">{{$p.t('bookmark','saveLink')}}</button>
                 </div>
             </div>
         </div>
diff --git a/system/dbupdate_3.4/41134_bookmark_dashboardWidget.php b/system/dbupdate_3.4/41134_bookmark_dashboardWidget.php
index dc3919730..28171367c 100644
--- a/system/dbupdate_3.4/41134_bookmark_dashboardWidget.php
+++ b/system/dbupdate_3.4/41134_bookmark_dashboardWidget.php
@@ -1,42 +1,44 @@
 <?php
 
-$qry = "BEGIN TRANSACTION;
+if (!$result = @$db->db_query("SELECT to_regclass('dashboard.tbl_bookmark')")) 
+{
+    $qry = "BEGIN TRANSACTION;
 
-        CREATE TABLE IF NOT EXISTS dashboard.tbl_bookmark(
-            bookmark_id BIGINT PRIMARY KEY,
-            uid VARCHAR(255) NOT NULL,
-            url VARCHAR(511) NOT NULL,
-            title VARCHAR(255) NULL,
-            tag VARCHAR(255) NULL,
-            insertamum TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
-            insertvon VARCHAR(255) NULL REFERENCES public.tbl_benutzer(uid),
-            updateamum TIMESTAMP NULL,
-            updatevon VARCHAR(255) NULL REFERENCES public.tbl_benutzer(uid)
-        );
+            CREATE TABLE IF NOT EXISTS dashboard.tbl_bookmark(
+                bookmark_id BIGINT PRIMARY KEY,
+                uid VARCHAR(255) NOT NULL,
+                url VARCHAR(511) NOT NULL,
+                title VARCHAR(255) NULL,
+                tag VARCHAR(255) NULL,
+                insertamum TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
+                insertvon VARCHAR(255) NULL REFERENCES public.tbl_benutzer(uid),
+                updateamum TIMESTAMP NULL,
+                updatevon VARCHAR(255) NULL REFERENCES public.tbl_benutzer(uid)
+            );
 
-        ALTER TABLE dashboard.tbl_bookmark ADD CONSTRAINT tbl_bookmark_fk FOREIGN KEY(uid) REFERENCES public.tbl_benutzer(uid);
+            ALTER TABLE dashboard.tbl_bookmark ADD CONSTRAINT tbl_bookmark_fk FOREIGN KEY(uid) REFERENCES public.tbl_benutzer(uid);
 
-        CREATE SEQUENCE IF NOT EXISTS dashboard.tbl_bookmark_sequence 
-        AS BIGINT
-        INCREMENT BY 1
-        NO MINVALUE
-        NO MAXVALUE
-        START WITH 1
-        CACHE 1
-        OWNED BY dashboard.tbl_bookmark.bookmark_id;
+            CREATE SEQUENCE IF NOT EXISTS dashboard.tbl_bookmark_sequence 
+            AS BIGINT
+            INCREMENT BY 1
+            NO MINVALUE
+            NO MAXVALUE
+            START WITH 1
+            CACHE 1
+            OWNED BY dashboard.tbl_bookmark.bookmark_id;
 
-        ALTER TABLE dashboard.tbl_bookmark ALTER COLUMN bookmark_id SET DEFAULT nextval('dashboard.tbl_bookmark_sequence ');
+            ALTER TABLE dashboard.tbl_bookmark ALTER COLUMN bookmark_id SET DEFAULT nextval('dashboard.tbl_bookmark_sequence ');
 
-        GRANT SELECT, INSERT, UPDATE, DELETE ON dashboard.tbl_bookmark TO vilesci;
-        GRANT SELECT, INSERT, UPDATE, DELETE ON dashboard.tbl_bookmark TO web; 
-        GRANT SELECT, UPDATE ON dashboard.tbl_bookmark_sequence TO vilesci;
-        GRANT SELECT, UPDATE ON dashboard.tbl_bookmark_sequence TO web;
+            GRANT SELECT, INSERT, UPDATE, DELETE ON dashboard.tbl_bookmark TO vilesci;
+            GRANT SELECT, INSERT, UPDATE, DELETE ON dashboard.tbl_bookmark TO web; 
+            GRANT SELECT, UPDATE ON dashboard.tbl_bookmark_sequence TO vilesci;
+            GRANT SELECT, UPDATE ON dashboard.tbl_bookmark_sequence TO web;
 
-        COMMIT TRANSACTION;";
-
-if (!$db->db_query($qry))
-        echo '<strong>error occurred during tbl_bookmark creation: ' . $db->db_last_error() . '</strong><br>';
-    else
-        echo '<br>dashboard.tbl_bookmark and dashboard.tbl_bookmark_sequence was created';
+            COMMIT TRANSACTION;";
 
+    if (!$db->db_query($qry))
+            echo '<strong>error occurred during tbl_bookmark creation: ' . $db->db_last_error() . '</strong><br>';
+        else
+            echo '<br>dashboard.tbl_bookmark and dashboard.tbl_bookmark_sequence was created';
 
+}

From cf440ffb43110640354778ef0b320f861f3f7d4b Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 31 Jul 2024 13:13:16 +0200
Subject: [PATCH 1040/1461] Shared Data in Widget Component and Widget Config
 Component

---
 public/js/components/Dashboard/Item.js           |  7 ++++---
 public/js/components/DashboardWidget/Abstract.js | 14 ++++++++++++--
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index 10c436047..67b814946 100755
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -12,7 +12,8 @@ export default {
 		widget: null,
 		tmpConfig: {},
 		isLoading: false,
-		hasConfig: true
+		hasConfig: true,
+		sharedData: null
 	}),
 	emits: [
 		"change",
@@ -120,7 +121,7 @@ export default {
 			</div>
 		</div>
 		<div v-if="ready" class="card-body overflow-hidden">
-			<component :is="component" :config="arguments" :width="width" :height="height" @setConfig="setConfig" @change="changeConfigManually"></component>
+			<component :is="component" v-model:shared-data="sharedData" :config="arguments" :width="width" :height="height" @setConfig="setConfig" @change="changeConfigManually"></component>
 		</div>
 		<div v-else class="card-body overflow-hidden text-center d-flex flex-column justify-content-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></div>
 		<bs-modal ref="config">
@@ -128,7 +129,7 @@ export default {
 				{{ widget ? 'Config for ' + widget.setup.name : '' }}
 			</template>
 			<template v-slot:default>
-				<component v-if="ready && !isLoading" :is="component" :config="tmpConfig" @change="changeConfig" :configMode="true"></component>
+				<component v-if="ready && !isLoading" :is="component" v-model:shared-data="sharedData" :config="tmpConfig" @change="changeConfig" :configMode="true"></component>
 				<div v-else class="text-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></div>
 			</template>
 			<template v-if="widgetHasFooter" v-slot:footer>
diff --git a/public/js/components/DashboardWidget/Abstract.js b/public/js/components/DashboardWidget/Abstract.js
index a21c9834f..25c5cfb9c 100755
--- a/public/js/components/DashboardWidget/Abstract.js
+++ b/public/js/components/DashboardWidget/Abstract.js
@@ -3,17 +3,27 @@ export default {
 		"config",
 		"width",
 		"height",
-		"configMode"
+		"configMode",
+		"sharedData"
 	],
 	emits: [
 		"setConfig",
-		"change" // TODO(chris): do we need this?
+		"change", // TODO(chris): do we need this?
+		"update:sharedData"
 	],
 	computed: {
 		apiurl() {
 			const app_root = FHC_JS_DATA_STORAGE_OBJECT.app_root;
 			const ci_router = FHC_JS_DATA_STORAGE_OBJECT.ci_router;
 			return app_root + ci_router;
+		},
+		shared: {
+			get() {
+				return this.sharedData;
+			},
+			set(value) {
+				this.$emit('update:sharedData', value);
+			}
 		}
 	},
 	methods: {

From 3641047963bd303f2d58bbca58ae9a64b9c18e4d Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 31 Jul 2024 13:51:34 +0200
Subject: [PATCH 1041/1461] adds bookmark phrasen and makes the data shared
 between the dashboard widget and the configuration view of the widget

---
 public/js/components/DashboardWidget/Url.js | 181 +++++++++-----------
 system/phrasesupdate.php                    |  60 +++++++
 2 files changed, 139 insertions(+), 102 deletions(-)

diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index 11502abe4..b2df0d450 100755
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -1,81 +1,84 @@
 import AbstractWidget from './Abstract';
 
 export default {
-    name: 'WidgetsUrl',
-    data: () => ({
-        links: null,
-        title_input: '',
-        url_input: '',
-        isPhrasenLoaded: false,
-    }),
-    mixins: [
-        AbstractWidget
-    ],
-    computed: {
-        tagName() {
-            return this.config.tag !== undefined && this.config.tag.length > 0 ? this.config.tag : 'Meine Urls';
-        }
+  name: "WidgetsUrl",
+  data: () => ({
+    title_input: "",
+    url_input: "",
+    isPhrasenLoaded: false,
+  }),
+  mixins: [AbstractWidget],
+  computed: {
+    tagName() {
+      return this.config.tag !== undefined && this.config.tag.length > 0
+        ? this.config.tag
+        : this.$p.t("bookmark", "myBookmarks");
     },
-    methods: {
-        async fetchBookmarks(){
-            await this.$fhcApi.factory.bookmark.getBookmarks()
-            .then(res => res.data)
-            .then(result => {
-                this.links = result;
-            })
-            .catch();
-        },
-        async confirmDelete() {
-            if (await this.$fhcAlert.confirmDelete() === false)
-                return;
-        },
-        addLink(){
-            //let linkId = this.links.length;
+    emptyBookmarks() {
+      if (this.shared instanceof Array && this.shared.length == 0) return true;
 
-            this.$fhcApi.factory.bookmark.insertBookmark({
-                tag: this.config.tag,
-                title: this.title_input,
-                url: this.url_input
-                })
-                .then(res => res.data)
-                .then(result => {
-                    this.$fhcAlert.alertInfo("bookmark added");
-                })
-                .catch();
+      if (!this.shared) return true;
 
-            // reset the values for the title and url inputs
-            this.title_input = '';
-            this.url_input = '';
-
-            // refetch the bookmarks to see the updates
-            this.fetchBookmarks();
-
-        },
-        async removeLink(bookmark_id){
-            await this.confirmDelete();
-            this.$fhcApi.factory.bookmark.deleteBookmark(bookmark_id)
-            .then(res => res.data)
-            .then(result => {
-                this.$fhcAlert.alertInfo(this.$p.t('bookmark','bookmarkDeleted'));
-            })
-            .catch();
-
-            // refetch the bookmarks to see the updates
-            this.fetchBookmarks();
-        }
+      return false;
     },
-    
-    created() {
-        this.$p.loadCategory('bookmark').then(()=>{
-            this.isPhrasenLoaded = true;
+  },
+  methods: {
+    async fetchBookmarks() {
+      await this.$fhcApi.factory.bookmark
+        .getBookmarks()
+        .then((res) => res.data)
+        .then((result) => {
+          this.shared = result;
         })
-        //this.links = TEST_LINKS;
-        // this.links = TEST_KEINE_LINKS;
+        .catch();
     },
-    async mounted(){
-        await this.fetchBookmarks();
+    async confirmDelete() {
+      if ((await this.$fhcAlert.confirmDelete()) === false) return;
     },
-    template: /*html*/`
+    addLink() {
+      this.$fhcApi.factory.bookmark
+        .insertBookmark({
+          tag: this.config.tag,
+          title: this.title_input,
+          url: this.url_input,
+        })
+        .then((res) => res.data)
+        .then((result) => {
+          this.$fhcAlert.alertInfo("bookmark added");
+        })
+        .catch();
+
+      // reset the values for the title and url inputs
+      this.title_input = "";
+      this.url_input = "";
+
+      // refetch the bookmarks to see the updates
+      this.fetchBookmarks();
+    },
+    async removeLink(bookmark_id) {
+      await this.confirmDelete();
+      this.$fhcApi.factory.bookmark
+        .deleteBookmark(bookmark_id)
+        .then((res) => res.data)
+        .then((result) => {
+          this.$fhcAlert.alertInfo(this.$p.t("bookmark", "bookmarkDeleted"));
+        })
+        .catch();
+
+      // refetch the bookmarks to see the updates
+      this.fetchBookmarks();
+    },
+  },
+
+  created() {
+    this.$p.loadCategory("bookmark").then(() => {
+      this.isPhrasenLoaded = true;
+    });
+  },
+  async mounted() {
+    await this.fetchBookmarks();
+  },
+  template: /*html*/ `
     <div class="widgets-url w-100 h-100">
         <div v-if="configMode">
             <div class="mb-3">
@@ -90,12 +93,15 @@ export default {
         </div>
         <div class="d-flex flex-column justify-content-between">
         <!-- todo: widgetTag ?? -->
-            <template v-if="links">
-                <header><b>{{ widgetTag }}</b></header>
-                <div v-for="link in links" :key="link.id" class="d-flex mt-2">
+            <template v-if="shared">
+                <header><b>{{ tagName }}</b></header>
+                <div v-if="!emptyBookmarks" v-for="link in shared" :key="link.id" class="d-flex mt-2">
                     <a target="_blank" :href="link.url"><i class="fa fa-solid fa-arrow-up-right-from-square"></i> {{ link.title }}</a>
                     <a class="ms-auto" href="#" @click.prevent="removeLink(link.bookmark_id)" v-show="configMode"><i class="fa fa-regular fa-trash-can"></i></a>
                 </div>
+                <div v-else class="d-flex mt-2">
+                    <span>{{$p.t('bookmark','emptyBookmarks')}}</span>
+                </div>
             </template>
             <template v-else>
                 <p v-for="i in 4" class="placeholder-glow">
@@ -103,8 +109,8 @@ export default {
                 </p>
             </template>
         </div>
-    </div>`
-}
+    </div>`,
+};
 
 /*
 Link JSON structure:
@@ -120,32 +126,3 @@ Link JSON structure:
     "updatevon": null
 }
 */
-
-
-const TEST_KEINE_LINKS = [];
-const TEST_LINKS = [
-    {
-        id: 0,
-        tag: 'Zeitverwaltung',
-        title: 'Zeitverwaltung' + 'link 0',
-        url: 'https://www.technikum-wien.at'
-    },
-    {
-        id: 1,
-        tag: 'Zeitverwaltung',
-        title: 'Zeitverwaltung' + 'link 1',
-        url: 'https://www.technikum-wien.at'
-    },
-    {
-        id: 2,
-        tag: 'Zeitverwaltung',
-        title: 'Zeitverwaltung' + 'link 2',
-        url: 'https://www.technikum-wien.at'
-    },
-    {
-        id: 3,
-        tag: 'Zeitverwaltung',
-        title: 'Zeitverwaltung' + 'link 3',
-        url: 'https://www.technikum-wien.at'
-    }
-];
\ No newline at end of file
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 688023295..49a3a0bdc 100755
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -27551,6 +27551,66 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'bookmark',
+		'phrase' => 'bookmarkAdded',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Link hinzugefügt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Link added',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'bookmark',
+		'phrase' => 'myBookmarks',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Meine Urls',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'My Urls',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'bookmark',
+		'phrase' => 'emptyBookmarks',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Du hast noch keine Bookmarks gesetzt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'You have not set any bookmarks yet',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	
 
 );

From c9471c344d146b4cb07969e6267409f58006e7a2 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 31 Jul 2024 14:37:26 +0200
Subject: [PATCH 1042/1461] added unruly person boolean column to tbl_person;
 studStatus/leitung added a checkbox to mark persons as unruly unrelated to
 studstatus datastate;

---
 .../api/frontend/v1/studstatus/Abmeldung.php  |  5 +-
 .../frontend/v1/unrulyperson/UnrulyPerson.php | 51 ++++++++++++
 .../controllers/lehre/Studierendenantrag.php  |  8 +-
 .../system/infocenter/InfoCenter.php          | 10 ++-
 application/libraries/AntragLib.php           | 22 ++---
 .../models/crm/Prestudentstatus_model.php     |  3 +-
 .../education/Studierendenantrag_model.php    | 16 +++-
 application/models/person/Person_model.php    | 26 +++++-
 application/views/lehre/Antrag/Create.php     |  3 +-
 .../system/infocenter/infocenterDetails.php   | 19 ++++-
 public/js/api/fhcapifactory.js                |  6 +-
 public/js/api/unrulyperson.js                 | 13 +++
 .../components/Studierendenantrag/Antrag.js   |  6 +-
 .../Studierendenantrag/Form/AbmeldungStgl.js  | 21 ++++-
 .../Studierendenantrag/Leitung/Table.js       |  5 +-
 system/dbupdate_3.4.php                       |  5 +-
 .../40896_kennzeichnung_unruly_person.php     | 17 ++++
 system/phrasesupdate.php                      | 82 ++++++++++++++++++-
 18 files changed, 283 insertions(+), 35 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/unrulyperson/UnrulyPerson.php
 create mode 100644 public/js/api/unrulyperson.js
 create mode 100644 system/dbupdate_3.4/40896_kennzeichnung_unruly_person.php

diff --git a/application/controllers/api/frontend/v1/studstatus/Abmeldung.php b/application/controllers/api/frontend/v1/studstatus/Abmeldung.php
index 875b6484c..87fec9918 100644
--- a/application/controllers/api/frontend/v1/studstatus/Abmeldung.php
+++ b/application/controllers/api/frontend/v1/studstatus/Abmeldung.php
@@ -136,6 +136,7 @@ class Abmeldung extends FHCAPI_Controller
 		$grund = $this->input->post('grund');
 		$studiensemester = $this->input->post('studiensemester');
 		$prestudent_id = $this->input->post('prestudent_id');
+		$unruly = $this->input->post('unruly');
 
 		$result = $this->antraglib->getPrestudentAbmeldeBerechtigt($prestudent_id);
 		$result = $this->getDataOrTerminateWithError($result);
@@ -146,7 +147,7 @@ class Abmeldung extends FHCAPI_Controller
 		elseif ($result < 0)
 			$this->terminateWithError($this->p->t('studierendenantrag', 'error_antrag_exists'), self::ERROR_TYPE_GENERAL);
 
-		$result = $this->antraglib->createAbmeldung($prestudent_id, $studiensemester, getAuthUID(), $grund);
+		$result = $this->antraglib->createAbmeldung($prestudent_id, $studiensemester, getAuthUID(), $grund, $unruly);
 		$data = $this->getDataOrTerminateWithError($result);
 
 		$result = $this->antraglib->getDetailsForAntrag($data);
@@ -184,4 +185,4 @@ class Abmeldung extends FHCAPI_Controller
 		
 		$this->terminateWithSuccess($data);
 	}
-}
+}
\ No newline at end of file
diff --git a/application/controllers/api/frontend/v1/unrulyperson/UnrulyPerson.php b/application/controllers/api/frontend/v1/unrulyperson/UnrulyPerson.php
new file mode 100644
index 000000000..a1673739a
--- /dev/null
+++ b/application/controllers/api/frontend/v1/unrulyperson/UnrulyPerson.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright (C) 2024 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class UnrulyPerson extends FHCAPI_Controller
+{
+
+	// TODO: BERECHTIGUNGEN
+	public function __construct()
+	{
+		parent::__construct([
+			'updatePersonUnrulyStatus' => 'basis/mitarbeiter:rw'
+		]);
+
+		$this->_ci =& get_instance();
+		$this->_ci->load->model('person/Person_model', 'PersonModel');
+	}
+
+	public function updatePersonUnrulyStatus()
+	{
+		$data = json_decode($this->input->raw_input_stream, true);
+
+		$person_id = $data['person_id'];
+		$unruly = $data['unruly'];
+
+		$result = $this->_ci->PersonModel->updateUnruly($person_id, $unruly);
+
+		if(isError($result)) {
+			$this->terminateWithError($result);
+		} else if (isSuccess($result)) {
+			$this->terminateWithSuccess($result);
+		}
+
+	}
+}
\ No newline at end of file
diff --git a/application/controllers/lehre/Studierendenantrag.php b/application/controllers/lehre/Studierendenantrag.php
index d6d6b2c50..3baf30355 100644
--- a/application/controllers/lehre/Studierendenantrag.php
+++ b/application/controllers/lehre/Studierendenantrag.php
@@ -21,6 +21,7 @@ class Studierendenantrag extends FHC_Controller
 
 		// Load Models
 		$this->load->model('education/Studierendenantrag_model', 'StudierendenantragModel');
+		$this->load->model('person/Person_model', 'PersonModel');
 
 		// Load language phrases
 		$this->loadPhrases([
@@ -102,10 +103,13 @@ class Studierendenantrag extends FHC_Controller
 
 	public function abmeldungstgl($prestudent_id, $studierendenantrag_id = null)
 	{
+		$unruly = getData($this->PersonModel->loadPrestudent($prestudent_id))[0]->unruly;
+
 		$this->load->view('lehre/Antrag/Create', [
 			'prestudent_id' => $prestudent_id,
 			'studierendenantrag_id' => $studierendenantrag_id,
-			'antrag_type' => 'AbmeldungStgl'
+			'antrag_type' => 'AbmeldungStgl',
+			'unruly' => $unruly
 		]);
 	}
 
@@ -185,4 +189,4 @@ class Studierendenantrag extends FHC_Controller
 
 		return $strRequiredPermissions;
 	}
-}
+}
\ No newline at end of file
diff --git a/application/controllers/system/infocenter/InfoCenter.php b/application/controllers/system/infocenter/InfoCenter.php
index cf0c6755a..d5cb50a00 100644
--- a/application/controllers/system/infocenter/InfoCenter.php
+++ b/application/controllers/system/infocenter/InfoCenter.php
@@ -337,10 +337,13 @@ class InfoCenter extends Auth_Controller
 		$persondata = $this->_loadPersonData($person_id);
 
 		$checkPerson = $this->PersonModel->checkDuplicate($person_id);
-
 		if (isError($checkPerson)) show_error(getError($checkPerson));
 
+		$checkUnruly = $this->PersonModel->checkUnruly($persondata['stammdaten']->vorname, $persondata['stammdaten']->nachname, $persondata['stammdaten']->gebdatum);
+		if (isError($checkUnruly)) show_error(getError($checkUnruly));
+
 		$duplicate = array('duplicated' => getData($checkPerson));
+		$unruly = array('unruly' => getData($checkUnruly));
 
 		$prestudentdata = $this->_loadPrestudentData($person_id);
 
@@ -351,7 +354,8 @@ class InfoCenter extends Auth_Controller
 			$persondata,
 			$prestudentdata,
 			$dokumentdata,
-			$duplicate
+			$duplicate,
+			$unruly
 		);
 
 		$data[self::FHC_CONTROLLER_ID] = $this->getControllerId();
@@ -2383,4 +2387,4 @@ class InfoCenter extends Auth_Controller
 
 		$this->outputJsonSuccess("Success");
 	}
-}
+}
\ No newline at end of file
diff --git a/application/libraries/AntragLib.php b/application/libraries/AntragLib.php
index ce4485279..41b6e4ced 100644
--- a/application/libraries/AntragLib.php
+++ b/application/libraries/AntragLib.php
@@ -911,7 +911,7 @@ class AntragLib
 	public function createWiederholung($prestudent_id, $studiensemester_kurzbz, $insertvon, $repeat)
 	{
 		$result = $this->_ci->StudierendenantragModel->loadIdAndStatusWhere([
-			'prestudent_id' => $prestudent_id,
+			'tbl_studierendenantrag.prestudent_id' => $prestudent_id,
 			'studiensemester_kurzbz'=> $studiensemester_kurzbz,
 			'typ' => Studierendenantrag_model::TYP_WIEDERHOLUNG
 		]);
@@ -1341,7 +1341,7 @@ class AntragLib
 
 		if (!in_array($result->status_kurzbz, $this->_ci->config->item('antrag_prestudentstatus_whitelist_abmeldung'))) {
 			$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere([
-				'prestudent_id' => $prestudent_id,
+				'tbl_studierendenantrag.prestudent_id' => $prestudent_id,
 				's.studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_APPROVED
 			], [
 				Studierendenantrag_model::TYP_ABMELDUNG,
@@ -1353,7 +1353,7 @@ class AntragLib
 				return success(-1);
 
 			$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere([
-				'prestudent_id' => $prestudent_id,
+				'tbl_studierendenantrag.prestudent_id' => $prestudent_id,
 				's.studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_PAUSE
 			], [
 				Studierendenantrag_model::TYP_ABMELDUNG,
@@ -1367,7 +1367,7 @@ class AntragLib
 			return success(0);
 		}
 
-		$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere(['prestudent_id' => $prestudent_id]);
+		$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere(['tbl_studierendenantrag.prestudent_id' => $prestudent_id]);
 		if (isError($result))
 			return $result;
 		if (!hasData($result))
@@ -1428,7 +1428,7 @@ class AntragLib
 			&& $result->status_kurzbz != 'Unterbrecher') {
 			return success(0);
 		}
-		$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere(['prestudent_id' => $prestudent_id]);
+		$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere(['tbl_studierendenantrag.prestudent_id' => $prestudent_id]);
 		if (isError($result))
 			return $result;
 		if (!hasData($result))
@@ -1510,7 +1510,7 @@ class AntragLib
 		$datumStatus = $result->datum;
 		if (!in_array($result->status_kurzbz, $this->_ci->config->item('antrag_prestudentstatus_whitelist'))) {
 			$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere([
-				'prestudent_id' => $prestudent_id,
+				'tbl_studierendenantrag.prestudent_id' => $prestudent_id,
 				'typ' => Studierendenantrag_model::TYP_WIEDERHOLUNG,
 				's.studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_APPROVED
 			]);
@@ -1520,7 +1520,7 @@ class AntragLib
 				return success(-1);
 
 			$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere([
-				'prestudent_id' => $prestudent_id,
+				'tbl_studierendenantrag.prestudent_id' => $prestudent_id,
 				'typ' => Studierendenantrag_model::TYP_WIEDERHOLUNG,
 				's.studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_DEREGISTERED
 			]);
@@ -1530,7 +1530,7 @@ class AntragLib
 				return success(-1);
 
 			$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere([
-				'prestudent_id' => $prestudent_id,
+				'tbl_studierendenantrag.prestudent_id' => $prestudent_id,
 				'typ' => Studierendenantrag_model::TYP_WIEDERHOLUNG,
 				's.studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_PAUSE
 			]);
@@ -1541,7 +1541,7 @@ class AntragLib
 
 			return success(0);
 		}
-		$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere(['prestudent_id' => $prestudent_id]);
+		$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere(['tbl_studierendenantrag.prestudent_id' => $prestudent_id]);
 		if (isError($result))
 			return $result;
 		if (!hasData($result))
@@ -1594,7 +1594,7 @@ class AntragLib
 	public function getDetailsForLastAntrag($prestudent_id, $typ = null)
 	{
 		$where = [
-			'prestudent_id' => $prestudent_id
+			'tbl_studierendenantrag.prestudent_id' => $prestudent_id
 		];
 		$types = null;
 		if ($typ) {
@@ -2180,4 +2180,4 @@ class AntragLib
 		$result = $this->_ci->StudierendenantraglehrveranstaltungModel->getLvsForPrestudent($prestudent_id, $studiensemester_kurzbz);
 		return $result;
 	}
-}
+}
\ No newline at end of file
diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php
index b3dc45321..f5435a1df 100644
--- a/application/models/crm/Prestudentstatus_model.php
+++ b/application/models/crm/Prestudentstatus_model.php
@@ -280,6 +280,7 @@ class Prestudentstatus_model extends DB_Model
 		$this->addSelect('ss.studienjahr_kurzbz');
 		$this->addSelect('pers.vorname');
 		$this->addSelect('pers.nachname');
+		$this->addSelect('pers.unruly');
 		$this->addSelect('TRIM(CONCAT(pers.vorname, \' \', pers.nachname)) AS name');
 		$this->addSelect('pers.person_id');
 		$this->addSelect('g.studiengang_kz');
@@ -339,4 +340,4 @@ class Prestudentstatus_model extends DB_Model
 
 		return $this;
 	}
-}
+}
\ No newline at end of file
diff --git a/application/models/education/Studierendenantrag_model.php b/application/models/education/Studierendenantrag_model.php
index e138d1a1c..e86ef6be0 100644
--- a/application/models/education/Studierendenantrag_model.php
+++ b/application/models/education/Studierendenantrag_model.php
@@ -38,6 +38,7 @@ class Studierendenantrag_model extends DB_Model
 		$this->addSelect('studienjahr_kurzbz');
 		$this->addSelect('vorname');
 		$this->addSelect('nachname');
+		$this->addSelect('unruly');
 		$this->addSelect('p.prestudent_id');
 		$this->addSelect('p.studiengang_kz');
 		$this->addSelect('semester');
@@ -148,6 +149,7 @@ class Studierendenantrag_model extends DB_Model
 		$this->addSelect('s.studierendenantrag_statustyp_kurzbz status');
 		$this->addSelect('s.insertvon status_insertvon');
 		$this->addSelect('t.bezeichnung[(' . $lang . ')] statustyp');
+		$this->addSelect('p.unruly AS unruly');
 
 		$this->addJoin(
 			'campus.tbl_studierendenantrag_status s',
@@ -157,6 +159,18 @@ class Studierendenantrag_model extends DB_Model
 			'campus.tbl_studierendenantrag_statustyp t',
 			's.studierendenantrag_statustyp_kurzbz=t.studierendenantrag_statustyp_kurzbz'
 		);
+		$this->addJoin(
+			'public.tbl_student st',
+			'st.prestudent_id=tbl_studierendenantrag.prestudent_id'
+		);
+		$this->addJoin(
+			'public.tbl_benutzer b',
+			'st.student_uid=b.uid'
+		);
+		$this->addJoin(
+			'public.tbl_person p',
+			'b.person_id=p.person_id'
+		);
 
 		if ($types && is_array($types)) {
 			$this->db->where_in('typ', $types);
@@ -471,4 +485,4 @@ class Studierendenantrag_model extends DB_Model
 		
 		return hasData($this->load());
 	}
-}
+}
\ No newline at end of file
diff --git a/application/models/person/Person_model.php b/application/models/person/Person_model.php
index 88813220e..c3a6c34f1 100644
--- a/application/models/person/Person_model.php
+++ b/application/models/person/Person_model.php
@@ -374,5 +374,29 @@ class Person_model extends DB_Model
 			'prestudent_id' => $prestudent_id
 		]);
 	}
-}
 
+	public function checkUnruly($vorname, $nachname, $gebdatum)
+	{
+		$qry = "SELECT *
+				FROM tbl_person
+				WHERE tbl_person.vorname = ? 
+					AND tbl_person.nachname = ? 
+					AND tbl_person.gebdatum = ? 
+					AND tbl_person.unruly = TRUE;";
+
+		return $this->execQuery($qry, [$vorname, $nachname, $gebdatum]);
+	}
+
+	public function updateUnruly($person_id, $unruly)
+	{
+		$result = $this->update($person_id, array(
+			'unruly' => $unruly
+		));
+
+		if (isError($result)) {
+			return error($result->msg, EXIT_ERROR);
+		} else if (isSuccess($result) && hasData($result)) {
+			return success($result);
+		}
+	}
+}
\ No newline at end of file
diff --git a/application/views/lehre/Antrag/Create.php b/application/views/lehre/Antrag/Create.php
index 91b20c9b7..f4a7d1c3c 100644
--- a/application/views/lehre/Antrag/Create.php
+++ b/application/views/lehre/Antrag/Create.php
@@ -35,6 +35,7 @@ $this->load->view(
 				:prestudent-id="<?= $prestudent_id; ?>"
 				antrag-type="<?= $antrag_type; ?>"
 				:studierendenantrag-id="<?= $studierendenantrag_id ?: 'undefined'; ?>"
+				:unruly="<?php echo json_encode($unruly) ?>"
 				v-model:info-array="infoArray"
 				v-model:status-msg="status.msg"
 				v-model:status-severity="status.severity"
@@ -52,4 +53,4 @@ $this->load->view(
 $this->load->view(
 	'templates/FHC-Footer',
 	$sitesettings
-);
+);
\ No newline at end of file
diff --git a/application/views/system/infocenter/infocenterDetails.php b/application/views/system/infocenter/infocenterDetails.php
index a8e6e3e13..53fbda8b5 100644
--- a/application/views/system/infocenter/infocenterDetails.php
+++ b/application/views/system/infocenter/infocenterDetails.php
@@ -74,6 +74,22 @@
 						</div>
 					</div>
 				</div>
+				<?php if (!is_null($unruly)): ?>
+					<div class="row alert-info">
+						<h3 class="header col-lg-12">
+							<?php echo $this->p->t('infocenter', 'unrulyPersonFound') . ':'; ?>
+						</h3>
+						<div class="text-left col-lg-12">
+							<?php
+							foreach ($unruly as $unruled)
+							{
+								echo  'Person ID: ' . $unruled->person_id . '<br />';
+							}
+							?>
+						</div>
+
+					</div>
+				<?php endif; ?>
 				<?php if (!is_null($duplicated)): ?>
 					<div class="row alert-warning">
 						<h3 class="header col-lg-12">
@@ -201,5 +217,4 @@
 	</div> <!-- ./wrapper -->
 	<button id="scrollToTop" title="Go to top"><i class="fa fa-chevron-up"></i></button>
 
-<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
-
+<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
\ No newline at end of file
diff --git a/public/js/api/fhcapifactory.js b/public/js/api/fhcapifactory.js
index f496cd491..1448be1dd 100644
--- a/public/js/api/fhcapifactory.js
+++ b/public/js/api/fhcapifactory.js
@@ -21,6 +21,7 @@ import navigation from "./navigation.js";
 import filter from "./filter.js";
 import studstatus from "./studstatus.js";
 import betriebsmittel from "./betriebsmittel.js";
+import unrulyperson from "./unrulyperson.js";
 
 export default {
     search,
@@ -28,5 +29,6 @@ export default {
     navigation,
     filter,
     studstatus,
-    betriebsmittel
-};
+    betriebsmittel,
+    unrulyperson
+};
\ No newline at end of file
diff --git a/public/js/api/unrulyperson.js b/public/js/api/unrulyperson.js
new file mode 100644
index 000000000..361aecd43
--- /dev/null
+++ b/public/js/api/unrulyperson.js
@@ -0,0 +1,13 @@
+export default {
+	updatePersonUnrulyStatus(person_id, unrulyParam) {
+
+		try {
+			const payload = {person_id, unruly: unrulyParam}
+			const url = '/api/frontend/v1/unrulyperson/UnrulyPerson/updatePersonUnrulyStatus';
+			return this.$fhcApi.post(url, payload, null);
+		} catch (error) {
+			throw error;
+		}
+
+	}
+}
\ No newline at end of file
diff --git a/public/js/components/Studierendenantrag/Antrag.js b/public/js/components/Studierendenantrag/Antrag.js
index 197fe2206..37de9314d 100644
--- a/public/js/components/Studierendenantrag/Antrag.js
+++ b/public/js/components/Studierendenantrag/Antrag.js
@@ -21,7 +21,8 @@ export default {
 		studierendenantragId: Number,
 		infoArray: Array,
 		statusMsg: String,
-		statusSeverity: String
+		statusSeverity: String,
+		unruly: Boolean
 	},
 	data() {
 		return {
@@ -49,10 +50,11 @@ export default {
 			v-model:status="status"
 			:prestudent-id="prestudentId"
 			:studierendenantrag-id="studierendenantragId"
+			:unruly="unruly"
 			@setInfos="$emit('update:infoArray', $event)"
 			@setStatus="$emit('update:statusMsg', $event.msg);$emit('update:statusSeverity', $event.severity)"
 			>
 		</component>
 	</div>
 	`
-}
+}
\ No newline at end of file
diff --git a/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js b/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
index 004f6f4d0..f7daa8d23 100644
--- a/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
+++ b/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
@@ -18,7 +18,8 @@ export default {
 	],
 	props: {
 		prestudentId: Number,
-		studierendenantragId: Number
+		studierendenantragId: Number,
+		unruly: Boolean
 	},
 	data() {
 		return {
@@ -26,7 +27,8 @@ export default {
 			saving: false,
 			formData: {
 				grund: ''
-			}
+			},
+			unrulyInternal: this.unruly
 		}
 	},
 	computed: {
@@ -107,6 +109,14 @@ export default {
 				? this.$p.t('studierendenantrag', event.target.value)
 				: '';
 		},
+		saveUnrulyPerson(event) {
+			this.$fhcApi.factory.unrulyperson.updatePersonUnrulyStatus(this.data.person_id, this.unrulyInternal).then(
+				(res)=> {
+					if(res?.meta?.status === "success") {
+						this.$fhcAlert.alertSuccess(this.$p.t('studierendenantrag', 'antrag_unruly_updated'))
+					}
+				})
+		}
 	},
 	created() {
 		this.uuid = _uuid++;
@@ -187,6 +197,11 @@ export default {
 					</form-input>
 				</div>
 				
+				<div class="col-6 d-flex " style="height: 40px; align-items: center;">
+					<input type="checkbox" v-model="unrulyInternal" @change=saveUnrulyPerson id="unruly" :disabled="saving" ref="unrulyCheckbox">
+					<label for="unruly" style="margin-left: 12px;" >{{ $p.t('studierendenantrag', 'mark_person_as_unruly') }}</label>
+				</div>
+				
 				<div class="col-12 text-end">
 					<button
 						v-if="!data?.studierendenantrag_id"
@@ -239,4 +254,4 @@ export default {
 			</template>
 		</core-fetch-cmpt>
 	</div>`
-}
+}
\ No newline at end of file
diff --git a/public/js/components/Studierendenantrag/Leitung/Table.js b/public/js/components/Studierendenantrag/Leitung/Table.js
index 778f91c00..0f8b22540 100644
--- a/public/js/components/Studierendenantrag/Leitung/Table.js
+++ b/public/js/components/Studierendenantrag/Leitung/Table.js
@@ -230,6 +230,9 @@ export default {
 
 					return val ? link : '&nbsp;';
 				}
+			}, {
+				field: 'unruly',
+				title: this.$p.t('studierendenantrag', 'antrag_unruly')
 			}, {
 				field: 'dms_id',
 				title: this.$p.t('studierendenantrag', 'antrag_dateianhaenge'),
@@ -485,4 +488,4 @@ export default {
 		</lv-popup>
 	</div>
 	`
-}
+}
\ No newline at end of file
diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index 9fb7f0ee9..7406ff92a 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -56,6 +56,7 @@ require_once('dbupdate_3.4/36530_bis_internationsalisierung_codextabelle_neuerun
 require_once('dbupdate_3.4/34543_ux_template.php');
 require_once('dbupdate_3.4/17513_Entwicklungsteam.php');
 require_once('dbupdate_3.4/28575_softwarebereitstellung.php');
+require_once('dbupdate_3.4/40896_kennzeichnung_unruly_person.php');
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
@@ -299,7 +300,7 @@ $tabellen=array(
 	"public.tbl_ortraumtyp"  => array("ort_kurzbz","hierarchie","raumtyp_kurzbz"),
 	"public.tbl_organisationseinheit" => array("oe_kurzbz", "oe_parent_kurzbz", "bezeichnung","organisationseinheittyp_kurzbz", "aktiv","mailverteiler","freigabegrenze","kurzzeichen","lehre","standort","warn_semesterstunden_frei","warn_semesterstunden_fix","standort_id"),
 	"public.tbl_organisationseinheittyp" => array("organisationseinheittyp_kurzbz", "bezeichnung", "beschreibung"),
-	"public.tbl_person"  => array("person_id","staatsbuergerschaft","geburtsnation","sprache","anrede","titelpost","titelpre","nachname","vorname","vornamen","gebdatum","gebort","gebzeit","foto","anmerkung","homepage","svnr","ersatzkennzeichen","familienstand","geschlecht","anzahlkinder","aktiv","insertamum","insertvon","updateamum","updatevon","ext_id","bundesland_code","kompetenzen","kurzbeschreibung","zugangscode", "foto_sperre","matr_nr","zugangscode_timestamp","udf_values","bpk","matr_aktiv","wahlname"),
+	"public.tbl_person"  => array("person_id","staatsbuergerschaft","geburtsnation","sprache","anrede","titelpost","titelpre","nachname","vorname","vornamen","gebdatum","gebort","gebzeit","foto","anmerkung","homepage","svnr","ersatzkennzeichen","familienstand","geschlecht","anzahlkinder","aktiv","insertamum","insertvon","updateamum","updatevon","ext_id","bundesland_code","kompetenzen","kurzbeschreibung","zugangscode", "foto_sperre","matr_nr","zugangscode_timestamp","udf_values","bpk","matr_aktiv","wahlname","unruly"),
 	"public.tbl_person_fotostatus"  => array("person_fotostatus_id","person_id","fotostatus_kurzbz","datum","insertamum","insertvon","updateamum","updatevon"),
 	"public.tbl_personfunktionstandort"  => array("personfunktionstandort_id","funktion_kurzbz","person_id","standort_id","position","anrede"),
 	"public.tbl_preincoming"  => array("preincoming_id","person_id","mobilitaetsprogramm_code","zweck_code","firma_id","universitaet","aktiv","bachelorthesis","masterthesis","von","bis","uebernommen","insertamum","insertvon","updateamum","updatevon","anmerkung","zgv","zgv_ort","zgv_datum","zgv_name","zgvmaster","zgvmaster_datum","zgvmaster_ort","zgvmaster_name","program_name","bachelor","master","jahre","person_id_emergency","person_id_coordinator_dep","person_id_coordinator_int","code","deutschkurs1","deutschkurs2","research_area","deutschkurs3","ext_id"),
@@ -475,4 +476,4 @@ if (!$result=@$db->db_query($sql_query))
 		}
 if($error==false)
 	echo '<br>Gegenpruefung fehlerfrei';
-?>
+?>
\ No newline at end of file
diff --git a/system/dbupdate_3.4/40896_kennzeichnung_unruly_person.php b/system/dbupdate_3.4/40896_kennzeichnung_unruly_person.php
new file mode 100644
index 000000000..32c01502c
--- /dev/null
+++ b/system/dbupdate_3.4/40896_kennzeichnung_unruly_person.php
@@ -0,0 +1,17 @@
+<?php
+if (! defined('DB_NAME')) exit('No direct script access allowed');
+
+// add unruly column public.tbl_person
+if($result = $db->db_query("SELECT 1 FROM information_schema.columns WHERE table_schema = 'public' 
+                                           AND table_name = 'tbl_person' AND column_name = 'unruly'"))
+{
+	if($db->db_num_rows($result) === 0)
+	{
+		$qry = "ALTER TABLE tbl_person ADD COLUMN unruly BOOLEAN NOT NULL DEFAULT FALSE";
+
+		if(!$db->db_query($qry))
+			echo '<strong>Public Tabelle person: '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br>spalte unruly hinzugefuegt';
+	}
+}
\ No newline at end of file
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index ad2b6aa57..d4a3777b1 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -4920,6 +4920,26 @@ The invoice will be sent to you again. <u><strong>The amount is only to be trans
 			)
 		)
 	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'unrulyPersonFound',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Unerwünschte Person wurde gefunden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Unruly Person detected',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'password',
@@ -20389,6 +20409,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'antrag_unruly',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Unerwünscht',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Unruly',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'antrag_unruly_updated',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Unerwünschte Person Status wurde aktualisiert.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Unruly person status has been updated.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'studierendenantrag',
@@ -22910,6 +22970,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'mark_person_as_unruly',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Person ist unerwünscht',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Person is unruly.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'ui',
@@ -27065,4 +27145,4 @@ foreach ($phrases as $phrase)
 }
 
 if(!$new)
-	echo '<b>Keine neuen Phrasen</b><br>';
+	echo '<b>Keine neuen Phrasen</b><br>';
\ No newline at end of file

From bd7e45547fd5c8821c247628a4038ecd7313db31 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 31 Jul 2024 14:51:43 +0200
Subject: [PATCH 1043/1461] adds Phrasen to the Stundenplan dashboard widget

---
 public/js/components/DashboardWidget/News.js | 110 ++++++++++---------
 system/phrasesupdate.php                     |  63 ++++++++++-
 2 files changed, 122 insertions(+), 51 deletions(-)

diff --git a/public/js/components/DashboardWidget/News.js b/public/js/components/DashboardWidget/News.js
index 6813601ff..1196a04b0 100755
--- a/public/js/components/DashboardWidget/News.js
+++ b/public/js/components/DashboardWidget/News.js
@@ -3,67 +3,77 @@ import BsModal from '../Bootstrap/Modal';
 const MAX_LOADED_NEWS = 10;
 
 export default {
-	name: 'WidgetsNews',
-	components: { BsModal },
-	data: () => ({
-		allNewsList: [],
-		singleNews: {}
-	}),
-	mixins: [
-		AbstractWidget
-	],
-	computed: {
+  name: "WidgetsNews",
+  components: { BsModal },
+  data: () => ({
+    allNewsList: [],
+    singleNews: {},
+  }),
+  mixins: [AbstractWidget],
+  computed: {
+    newsList() {
+      //Return news amount depending on widget width and size
+      let quantity = this.width;
 
-    
+      if (this.width === 1) {
+        quantity = this.height === 1 ? 4 : 10;
+      }
 
-		newsList(){
-			//Return news amount depending on widget width and size
-			let quantity = this.width;
-
-			if (this.width === 1) {
-				quantity = this.height === 1 ? 4 : 10;
-			}
-
-			return this.allNewsList.slice(0, quantity);
-		},
-                placeHolderImgURL: function() {
-                    return FHC_JS_DATA_STORAGE_OBJECT.app_root + 'skin/images/fh_technikum_wien_illustration_klein.png';
-                }
-	},
-	created(){
-		this.$fhcApi.factory.cms.news(MAX_LOADED_NEWS)
-    .then(res => { this.allNewsList = res.data })
-    .catch(err => { console.error('ERROR: ', err.response.data) });
-
-      
-		this.$emit('setConfig', false);
-	},
-	methods: {
-
-    contentURI: function(content_id){
-      return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/CisVue/Cms/content/' + content_id;
+      return this.allNewsList.slice(0, quantity);
     },
-    allNewsURI: function(){
-      return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/CisVue/Cms/news';
+    placeHolderImgURL: function () {
+      return (
+        FHC_JS_DATA_STORAGE_OBJECT.app_root +
+        "skin/images/fh_technikum_wien_illustration_klein.png"
+      );
     },
-		setSingleNews(singleNews){
-			this.singleNews = singleNews;
-			this.$refs.newsModal.show();
-		}
-	},
-	template: /*html*/`<div class="widgets-news w-100 h-100">
+  },
+  created() {
+    this.$fhcApi.factory.cms
+      .news(MAX_LOADED_NEWS)
+      .then((res) => {
+        this.allNewsList = res.data;
+      })
+      .catch((err) => {
+        console.error("ERROR: ", err.response.data);
+      });
+
+    this.$emit("setConfig", false);
+  },
+  methods: {
+    contentURI: function (content_id) {
+      return (
+        FHC_JS_DATA_STORAGE_OBJECT.app_root +
+        FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+        "/CisVue/Cms/content/" +
+        content_id
+      );
+    },
+    allNewsURI: function () {
+      return (
+        FHC_JS_DATA_STORAGE_OBJECT.app_root +
+        FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+        "/CisVue/Cms/news"
+      );
+    },
+    setSingleNews(singleNews) {
+      this.singleNews = singleNews;
+      this.$refs.newsModal.show();
+    },
+  },
+  template: /*html*/ `<div class="widgets-news w-100 h-100">
   
       <div class="d-flex flex-column h-100 ">
       <div class="d-flex">
-        <header><b>Top News</b></header>
+        <header><b>{{$p.t('news','topNews')}}</b></header>
         <a :href="allNewsURI()" class="ms-auto mb-2">
-          <i class="fa fa-arrow-up-right-from-square me-1"></i>Alle News</a>
+          <i class="fa fa-arrow-up-right-from-square me-1"></i>{{$p.t('news','allNews')}}</a>
       </div>
       <div class="h-100 overflow-scroll" v-if="width == 1">
         <div  v-for="news in newsList" :key="news.id" class="mt-2">
           <div  class="card">
             <div class=" card-body">
-              <a :href="contentURI(news.content_id)" class="stretched-link" >{{ news.content_obj.betreff?news.content_obj.betreff:'Kein Betreff vorhanden' }}</a><br>
+              <a :href="contentURI(news.content_id)" class="stretched-link" >{{ news.content_obj.betreff?news.content_obj.betreff:getDate(news.insertamum) }}</a><br>
               <span class="small text-muted">{{ formatDateTime(news.insertamum) }}</span>
             </div>
           </div>
@@ -85,5 +95,5 @@ export default {
           </div>
       </div>
 </div>
-</div>`
-}
+</div>`,
+};
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 8dc1d163f..7c80bbe56 100755
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -27489,7 +27489,68 @@ array(
 				'insertvon' => 'system'
 			)
 		)
-	)
+	),
+	// NEWS PHRASEN ---------------------------------------------------------------------------
+	array(
+		'app' => 'core',
+		'category' => 'news',
+		'phrase' => 'allNews',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Alle News',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'All News',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'news',
+		'phrase' => 'topNews',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Top Nachrichten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Top News',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'news',
+		'phrase' => 'noSubject',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kein Betreff vorhanden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No Subject available',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 );
 
 

From e548e17776de33a62a06204077372e00c1a4e64c Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 31 Jul 2024 15:09:09 +0200
Subject: [PATCH 1044/1461] Status insert/edit: Orgform in Mischform Stg

---
 .../api/frontend/v1/stv/Prestudent.php        | 27 ++++++++++++++++---
 .../Details/Status/Modal.js                   | 22 ++++++++++++++-
 2 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Prestudent.php b/application/controllers/api/frontend/v1/stv/Prestudent.php
index c423a61b8..d75ad5fbc 100644
--- a/application/controllers/api/frontend/v1/stv/Prestudent.php
+++ b/application/controllers/api/frontend/v1/stv/Prestudent.php
@@ -19,7 +19,8 @@ class Prestudent extends FHCAPI_Controller
 			'getAufmerksamdurch' => self::PERM_LOGGED,
 			'getBerufstaetigkeit' => self::PERM_LOGGED,
 			'getTypenStg' => self::PERM_LOGGED,
-			'getStudienplaene' => self::PERM_LOGGED
+			'getStudienplaene' => self::PERM_LOGGED,
+			'getStudiengang' => self::PERM_LOGGED
 		]);
 
 		// Load Libraries
@@ -266,8 +267,6 @@ class Prestudent extends FHCAPI_Controller
 
 	public function getStudienplaene($prestudent_id)
 	{
-		if (!is_int((int)$prestudent_id) || (int)$prestudent_id . '' != $prestudent_id)
-			show_404();
 		$this->load->model('organisation/Studienplan_model', 'StudienplanModel');
 		$result = $this->StudienplanModel->getStudienplaeneByPrestudents($prestudent_id);
 
@@ -275,4 +274,26 @@ class Prestudent extends FHCAPI_Controller
 
 		return $this->terminateWithSuccess($data);
 	}
+
+	/**
+	 * Gets details for the Studiengang of the Prestudent
+	 *
+	 * @param integer					$prestudent_id
+	 *
+	 * @return stdClass
+	 */
+	public function getStudiengang($prestudent_id)
+	{
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+		$this->PrestudentModel->addSelect('stg.*');
+
+		$this->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz');
+
+		$result = $this->PrestudentModel->load($prestudent_id);
+
+		$stg = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess(current($stg));
+	}
 }
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js b/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js
index d97d15225..5a77c7348 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js
@@ -44,6 +44,7 @@ export default{
 			prestudent: {},
 			originalDatum: null,
 			statusNew: true,
+			mischform: false,
 			statusId: {},
 			formData: {},
 			studienplaene: [],
@@ -171,7 +172,9 @@ export default{
 			
 			return this.$fhcApi
 				.get('api/frontend/v1/stv/prestudent/getStudienplaene/' + prestudent.prestudent_id)
-				.then(result => this.studienplaene = result.data);
+				.then(result => this.studienplaene = result.data)
+				.then(() => this.$fhcApi.get('api/frontend/v1/stv/prestudent/getStudiengang/' + prestudent.prestudent_id))
+				.then(result => this.mischform = result.data.mischform);
 		}
 	},
 	created() {
@@ -263,6 +266,23 @@ export default{
 					{{ number }}
 				</option>
 			</form-input>
+			<form-input
+				v-if="mischform"
+				container-class="mb-3"
+				type="select"
+				v-model="formData.orgform_kurzbz"
+				name="orgform_kurzbz"
+				:label="$p.t('lehre/organisationsform')"
+				:disabled="bisLocked && !isStatusBeforeStudent"
+				>
+				<option
+					v-for="orgform in lists.orgforms"
+					:key="orgform.orgform_kurzbz"
+					:value="orgform.orgform_kurzbz"
+					>
+					{{ orgform.bezeichnung }}
+				</option>
+			</form-input>
 			<form-input
 				container-class="mb-3"
 				type="DatePicker"

From 0be45703b5b61cff4064383629cfef3e29db2096 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 1 Aug 2024 08:43:59 +0200
Subject: [PATCH 1045/1461] validation checks changeStatus

---
 .../api/frontend/v1/stv/Status.php            | 522 ++++++++++--------
 application/libraries/PrestudentLib.php       |   6 +-
 .../libraries/PrestudentstatusCheckLib.php    | 102 ++--
 3 files changed, 338 insertions(+), 292 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 3c59eed06..d88259cb9 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -153,236 +153,319 @@ class Status extends FHCAPI_Controller
 
 	public function changeStatus($prestudent_id)
 	{
-		//get Studiengang von prestudent_id
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-		$this->PrestudentModel->addJoin('public.tbl_person p', 'ON (p.person_id = public.tbl_prestudent.person_id)');
-		$result = $this->PrestudentModel->load([
-			'prestudent_id'=> $prestudent_id,
-		]);
-		if(isError($result))
-		{
-			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-		$result = current(getData($result));
+		$isBerechtigtNoStudstatusCheck = $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung');
+		$isBerechtigtBasisPrestudentstatus = $this->permissionlib->isBerechtigt('basis/prestudentstatus');
 
-		$stg = $result->studiengang_kz;
-		$isStudent = false;
+		//$isStudent = false;
 
 		//GET lastStatus
 		$result = $this->PrestudentstatusModel->getLastStatus($prestudent_id);
 
-		if (isError($result))
-		{
-			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-		elseif(!hasData($result))
-		{
-			$lastStatusData = [];
-		}
-		else
-			$lastStatusData = current(getData($result));
+		$lastStatusData = $this->getDataOrTerminateWithError($result);
+		$lastStatusData = current($lastStatusData);
 
+		//TODO(Manu) check phrase: why bewerbung?
+		if (!$isBerechtigtBasisPrestudentstatus)
+			$this->form_validation->set_rules(
+				'bewerbung_abgeschicktamum',
+				$this->p->t('lehre', 'bewerbung_abgeschickt_am'),
+				'is_null',
+				[
+					'is_null' => $this->p->t('ui', 'error_fieldWriteAccess')
+				]
+			);
 
-		if(!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg))
-		{
-			$result =  $this->p->t('lehre','error_keineSchreibrechte');
+		$this->load->model('person/Person_model', 'PersonModel');
+		$this->PersonModel->addJoin('public.tbl_prestudent', 'person_id');
+		$result = $this->PersonModel->loadWhere(['prestudent_id' => $prestudent_id]);
+		$prestudent_person = $this->getDataOrTerminateWithError($result);
+		$prestudent_person = current($prestudent_person);
 
-			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
+		$studentName = trim($prestudent_person->vorname . ' ' . $prestudent_person->nachname);
 
-		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
-
-		$uid = getAuthUID();
 		$status_kurzbz = $this->input->post('status_kurzbz');
-		$ausbildungssemester =  $this->input->post('ausbildungssemester') ? $this->input->post('ausbildungssemester') : $lastStatusData->ausbildungssemester;
-		$datum = $this->input->post('datum');
-		$bestaetigtam = $this->input->post('bestaetigtam');
-		$bewerbung_abgeschicktamum = $this->input->post('bewerbung_abgeschicktamum');
-		$studienplan_id = $this->input->post('studienplan_id');
-		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
-		$anmerkung = $this->input->post('anmerkung');
+
+		$studiensemester_kurzbz = $lastStatusData->studiensemester_kurzbz;
+		if ($status_kurzbz == Prestudentstatus_model::STATUS_ABSOLVENT
+			|| $status_kurzbz == Prestudentstatus_model::STATUS_DIPLOMAND
+		) {
+			$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+			$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
+		}
+
+		$ausbildungssemester = $lastStatusData->ausbildungssemester;
+		if ($status_kurzbz == Prestudentstatus_model::STATUS_STUDENT) {
+			$ausbildungssemester = $this->input->post('ausbildungssemester');
+		}
+
 		$statusgrund_id = $this->input->post('statusgrund_id');
-		$rt_stufe = $this->input->post('rt_stufe');
-		$bestaetigtvon = $uid;
-		$name = $this->input->post('name');
-
-		//Different handling depending on newStatus
-		if($status_kurzbz == Prestudentstatus_model::STATUS_ABSOLVENT || $status_kurzbz == Prestudentstatus_model::STATUS_DIPLOMAND)
-		{
-			$ausbildungssemester = $lastStatusData->ausbildungssemester;
-		}
-
-		if($status_kurzbz == Prestudentstatus_model::STATUS_BEWERBER){
-			//check studiensemester_kurzbz:
-			$studiensemester_kurzbz = $lastStatusData->studiensemester_kurzbz != $studiensemester_kurzbz ?
-				$lastStatusData->studiensemester_kurzbz : $studiensemester_kurzbz;
-		}
-		//Check if Bewerberstatus exists
-		if(
-			$status_kurzbz == Prestudentstatus_model::STATUS_AUFGENOMMENER ||
-			$status_kurzbz == Prestudentstatus_model::STATUS_WARTENDER ||
-			$status_kurzbz == Prestudentstatus_model::STATUS_ABGEWIESENER
-		)
-		{
-			$result = $this->prestudentstatuschecklib->checkIfExistingBewerberstatus($prestudent_id);
-			if (isError($result))
-			{
-				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			}
-
-			$studiensemester_kurzbz = 	$this->getStudiensemesterOfStatus($prestudent_id, Prestudentstatus_model::STATUS_BEWERBER);
-		}
+		$datum = $this->input->post('datum');
 
 		//Form Validation
 		$this->load->library('form_validation');
 
-		$this->form_validation->set_rules('ausbildungssemester', 'Ausbildungssemester', 'integer', [
-			'integer' => $this->p->t('ui', 'error_fieldNotInteger', ['field' => 'Ausbildungssemester'])
-		]);
+		$this->form_validation->set_rules(
+			'status_kurzbz',
+			$this->p->t('lehre', 'status_rolle'),
+			[
+				'required',
+				//Check Reihungstest
+				['reihungstest_check', function ($value) use ($prestudent_person) {
+					if (!REIHUNGSTEST_CHECK)
+						return true;
+					if ($value != Prestudentstatus_model::STATUS_BEWERBER)
+						return true;
+					$result = $this->prestudentstatuschecklib->checkIfAngetreten($prestudent_person);
+					return $this->getDataOrTerminateWithError($result);
+				}]
+			],
+			//Check ZGV
+			['checkIfZGV', function ($value) use ($prestudent_person) {
+				if (!ZGV_CHECK)
+					return true;
+				if ($value != Prestudentstatus_model::STATUS_BEWERBER)
+					return true;
+				$result = $this->prestudentstatuschecklib->checkIfZGVEingetragen($prestudent_person);
+				return $this->getDataOrTerminateWithError($result);
+			}],
+			//Check ZGV Master
+			['checkIfZGVMaster', function ($value) use ($prestudent_person) {
+				if (!ZGV_CHECK)
+					return true;
+				if ($value != Prestudentstatus_model::STATUS_BEWERBER)
+					return true;
+				$result = $this->prestudentstatuschecklib->checkIfZGVEingetragenMaster($prestudent_person);
+				return $this->getDataOrTerminateWithError($result);
+			}],
+			//Check Bewerberstatus
+			['checkIfExistingBewerberstatus', function () use ($prestudent_id, $status_kurzbz) {
+				if ($status_kurzbz != Prestudentstatus_model::STATUS_AUFGENOMMENER &&
+					$status_kurzbz != Prestudentstatus_model::STATUS_WARTENDER &&
+					$status_kurzbz != Prestudentstatus_model::STATUS_ABGEWIESENER)
+					return true;
+				$result = $this->prestudentstatuschecklib->checkIfExistingBewerberstatus($prestudent_id);
+				return $this->getDataOrTerminateWithError($result);
+			}],
+			//Check If Student
+			[
+				'required',
+				['status_stud_exists', function ($value) use ($prestudent_id) {
+					if ($value != Prestudentstatus_model::STATUS_STUDENT)
+						return true; // Only test if new status is Student
 
-		//TODO(Manu) how to work with name: with $this->p->t('lehre','error_rolleBereitsVorhandenMitNamen', ['name' => $studentName]));
-		/*		$this->form_validation->set_rules('_global', '', [
-					//check if Rolle already exists
-					['checkIfExistingPrestudentRolle', function () use (
-						$prestudent_id,
-						$status_kurzbz,
-						$studiensemester_kurzbz,
-						$ausbildungssemester
-					) {
-						$result = $this->prestudentstatuschecklib->checkIfExistingPrestudentRolle(
-							$prestudent_id,
-							$status_kurzbz,
-							$studiensemester_kurzbz,
-							$ausbildungssemester
-						);
-						return $this->getDataOrTerminateWithError($result);
-					}]
-				], [
-					'checkIfExistingPrestudentRolle' => $this->p->t('lehre', 'error_rolleBereitsVorhanden')
-				]);*/
+					$result = $this->prestudentstatuschecklib->checkIfExistingStudentRolle($prestudent_id);
 
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
+					return $this->getDataOrTerminateWithError($result);
+				}],
 
+		],
+		[
+			'reihungstest_check' => $this->p->t('lehre', 'error_keinReihungstestverfahren', ['name' => $studentName]),
+			'checkIfExistingBewerberstatus' => $this->p->t('lehre', 'error_keinBewerber', ['name' => $studentName]),
+			'checkIfZGV' => $this->p->t('lehre', 'error_ZGVNichtEingetragen', ['name' => $studentName]),
+			'checkIfZGVMaster' => $this->p->t('lehre', 'error_ZGVMasterNichtEingetragen', ['name' => $studentName]),
+			'status_stud_exists' => $this->p->t('lehre', 'error_noStudstatus')
+		]
+		);
 
-		//check if prestudent_rolle exists
-		$result = $this->PrestudentstatusModel->checkIfExistingPrestudentRolle($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester);
+		if ($status_kurzbz == Prestudentstatus_model::STATUS_STUDENT)
+			$this->form_validation->set_rules('ausbildungssemester', $this->p->t('lehre', 'ausbildungssemester'), 'required|integer', [
+				'integer' => $this->p->t('ui', 'error_fieldNotInteger')
+			]);
+		else
+			$this->form_validation->set_rules('ausbildungssemester', $this->p->t('lehre', 'ausbildungssemester'), 'integer', [
+				'integer' => $this->p->t('ui', 'error_fieldNotInteger')
+			]);
 
-		if (isError($result))
-		{
-			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-		//	return $this->terminateWithError($result->retval, self::ERROR_TYPE_GENERAL);
-
-		if($result->retval == '1')
-		{
-			return $this->terminateWithError($this->p->t('lehre','error_rolleBereitsVorhandenMitNamen', ['name' => $name]), self::ERROR_TYPE_GENERAL);
-		}
-
-		//Check Reihungstest
-		if(REIHUNGSTEST_CHECK)
-		{
-			if($status_kurzbz==Prestudentstatus_model::STATUS_BEWERBER)
-			{
-				$result = $this->prestudentstatuschecklib->checkIfAngetreten($prestudent_id);
-				if (isError($result))
-				{
-					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-				}
-			}
-		}
-
-		//Check ZGV
-		if(!defined("ZGV_CHECK") || ZGV_CHECK)
-		{
-			if($status_kurzbz==Prestudentstatus_model::STATUS_BEWERBER)
-			{
-				$result = $this->prestudentstatuschecklib->checkIfZGVEingetragen($prestudent_id);
-				if (isError($result))
-				{
-					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-				}
-			}
-		}
-
-
-		//Check ZGV-Master
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-		$result = $this->StudiengangModel->load([
-			'studiengang_kz'=> $stg
-		]);
-		if(isError($result))
-		{
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson(getError($result));
-		}
-		$result = current(getData($result));
-		$typ = $result->typ;
-		//$stgkzl = $result->kurzbz;
-
-		if(!defined("ZGV_CHECK") || ZGV_CHECK)
-		{
-			if($status_kurzbz==Prestudentstatus_model::STATUS_BEWERBER && $typ=='m')
-			{
-				$result = $this->prestudentstatuschecklib->checkIfZGVEingetragen($prestudent_id, $typ);
-				if (isError($result))
-				{
-					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-				}
-			}
-		}
-
-		//check if bewerberstatus exists TODO(Manu) necessary?
-		if($status_kurzbz == Prestudentstatus_model::STATUS_AUFGENOMMENER || $status_kurzbz == Prestudentstatus_model::STATUS_WARTENDER)
-		{
-			$result = $this->prestudentstatuschecklib->checkIfExistingBewerberstatus($prestudent_id);
-			if (isError($result))
-			{
-				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			}
-		}
-
-		//check if studentrolle already exists
-		if($status_kurzbz == Prestudentstatus_model::STATUS_STUDENT || $status_kurzbz == Prestudentstatus_model::STATUS_DIPLOMAND || $lastStatusData->status_kurzbz == Prestudentstatus_model::STATUS_STUDENT)
-		{
-			$result = $this->prestudentstatuschecklib->checkIfExistingStudentRolle($prestudent_id);
-			if (isError($result))
-			{
-				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			}
-			$isStudent = getData($result);
-		}
-
-		$isBerechtigtNoStudstatusCheck =  $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung');
-
-		if(!$isBerechtigtNoStudstatusCheck)
-		{
-			//Block STATUSCHECKS
-			$new_status_datum = isset($datum) ? $datum : date('Y-m-d');
-
-			$result = $this->prestudentstatuschecklib->checkStatusAdd(
+		$this->form_validation->set_rules('_default', '', [
+			//check if Rolle already exists
+			['checkIfExistingPrestudentRolle', function () use (
 				$prestudent_id,
 				$status_kurzbz,
 				$studiensemester_kurzbz,
-				$new_status_datum,
-				$ausbildungssemester,
-				$studienplan_id
-			);
+				$ausbildungssemester
+			) {
+				if (!$ausbildungssemester)
+					return true; // Error will be handled by the required statement above
+				$result = $this->prestudentstatuschecklib->checkIfExistingPrestudentRolle(
+					$prestudent_id,
+					$status_kurzbz,
+					$studiensemester_kurzbz,
+					$ausbildungssemester
+				);
+				return $this->getDataOrTerminateWithError($result);
+			}]
+		], [
+			'checkIfExistingPrestudentRolle' => $this->p->t('lehre', 'error_rolleBereitsVorhandenMitNamen', ['name' => $studentName])
+		]);
 
-			if (isError($result))
-			{
-				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			}
+		//TODO(Manu) check if really necessary, in FAS code
+		$this->form_validation->set_rules(
+			'datum',
+			$this->p->t('global', 'datum'),
+			[
+				'is_valid_date',
+				['meldestichtag_not_exceeded', function ($value) use ($isBerechtigtNoStudstatusCheck) {
+					if ($isBerechtigtNoStudstatusCheck)
+						return true; // Skip if access right says so
+					if (!$value)
+						return true; // Error will be handled by the required statement above
 
-			//TODO(manu) check Berechtigung
-			//check if Bismeldestichtag erreicht ADDNEW status
-			$result = $this->prestudentstatuschecklib->checkIfMeldestichtagErreicht($new_status_datum, $studiensemester_kurzbz);
+					$result = $this->prestudentstatuschecklib->checkIfMeldestichtagErreicht($value);
 
-			if (isError($result))
-			{
-				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			}
-		}
+					return !$this->getDataOrTerminateWithError($result);
+				}]
+			],
+			[
+				'meldestichtag_not_exceeded' => $this->p->t('lehre', 'error_dataVorMeldestichtag')
+			]
+		);
+
+		$this->form_validation->set_rules('_default', '', [
+			['rolle_doesnt_exist', function () use ($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester) {
+				if (!$status_kurzbz || !$studiensemester_kurzbz || !$ausbildungssemester)
+					return true; // Error will be handled by the required statements above
+
+				$result = $this->PrestudentstatusModel->load([$ausbildungssemester, $studiensemester_kurzbz, $status_kurzbz, $prestudent_id]);
+
+				return !$this->getDataOrTerminateWithError($result);
+			}],
+			['history_timesequence', function () use (
+				$isBerechtigtNoStudstatusCheck,
+				$prestudent_id,
+				$status_kurzbz,
+				$datum,
+				$studiensemester_kurzbz,
+				$ausbildungssemester
+			) {
+				if ($isBerechtigtNoStudstatusCheck)
+					return true; // Skip if access right says so
+				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester)
+					return true; // Error will be handled by the required statements above
+
+				$result = $this->prestudentstatuschecklib->checkStatusHistoryTimesequence(
+					$prestudent_id,
+					$status_kurzbz,
+					new DateTime($datum),
+					$studiensemester_kurzbz,
+					$ausbildungssemester,
+					'',
+					''
+				);
+
+				return $this->getDataOrTerminateWithError($result);
+			}],
+			['history_laststatus', function () use (
+				$isBerechtigtNoStudstatusCheck,
+				$prestudent_id,
+				$status_kurzbz,
+				$datum,
+				$studiensemester_kurzbz,
+				$ausbildungssemester
+			) {
+				if ($isBerechtigtNoStudstatusCheck)
+					return true; // Skip if access right says so
+				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester)
+					return true; // Error will be handled by the required statements above
+
+				$result = $this->prestudentstatuschecklib->checkStatusHistoryLaststatus(
+					$prestudent_id,
+					$status_kurzbz,
+					new DateTime($datum),
+					$studiensemester_kurzbz,
+					$ausbildungssemester,
+					'',
+					''
+				);
+
+				return $this->getDataOrTerminateWithError($result);
+			}],
+			['history_unterbrecher', function () use (
+				$isBerechtigtNoStudstatusCheck,
+				$prestudent_id,
+				$status_kurzbz,
+				$datum,
+				$studiensemester_kurzbz,
+				$ausbildungssemester
+			) {
+				if ($isBerechtigtNoStudstatusCheck)
+					return true; // Skip if access right says so
+				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester)
+					return true; // Error will be handled by the required statements above
+
+				$result = $this->prestudentstatuschecklib->checkStatusHistoryUnterbrechersemester(
+					$prestudent_id,
+					$status_kurzbz,
+					new DateTime($datum),
+					$studiensemester_kurzbz,
+					$ausbildungssemester,
+					'',
+					''
+				);
+
+				return $this->getDataOrTerminateWithError($result);
+			}],
+			['history_abbrecher', function () use (
+				$isBerechtigtNoStudstatusCheck,
+				$prestudent_id,
+				$status_kurzbz,
+				$datum,
+				$studiensemester_kurzbz,
+				$ausbildungssemester
+			) {
+				if ($isBerechtigtNoStudstatusCheck)
+					return true; // Skip if access right says so
+				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester)
+					return true; // Error will be handled by the required statements above
+
+				$result = $this->prestudentstatuschecklib->checkStatusHistoryAbbrechersemester(
+					$prestudent_id,
+					$status_kurzbz,
+					new DateTime($datum),
+					$studiensemester_kurzbz,
+					$ausbildungssemester,
+					'',
+					''
+				);
+
+				return $this->getDataOrTerminateWithError($result);
+			}],
+			['history_diplomant', function () use (
+				$isBerechtigtNoStudstatusCheck,
+				$prestudent_id,
+				$status_kurzbz,
+				$datum,
+				$studiensemester_kurzbz,
+				$ausbildungssemester
+			) {
+				if ($isBerechtigtNoStudstatusCheck)
+					return true; // Skip if access right says so
+				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester)
+					return true; // Error will be handled by the required statements above
+
+				$result = $this->prestudentstatuschecklib->checkStatusHistoryDiplomant(
+					$prestudent_id,
+					$status_kurzbz,
+					new DateTime($datum),
+					$studiensemester_kurzbz,
+					$ausbildungssemester,
+					'',
+					''
+				);
+
+				return $this->getDataOrTerminateWithError($result);
+			}]
+		], [
+			'rolle_doesnt_exist' => $this->p->t('lehre', 'error_rolleBereitsVorhanden'),
+			'history_timesequence' => $this->p->t('lehre', 'error_statuseintrag_zeitabfolge'),
+			'history_laststatus' => $this->p->t('lehre', 'error_endstatus'),
+			'history_unterbrecher' => $this->p->t('lehre', 'error_consecutiveUnterbrecher'),
+			'history_abbrecher' => $this->p->t('lehre', 'error_consecutiveUnterbrecherAbbrecher'),
+			'history_diplomant' => $this->p->t('lehre', 'error_consecutiveDiplomandStudent')
+		]);
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
 
 		switch($status_kurzbz){
 			case Prestudentstatus_model::STATUS_ABBRECHER:
@@ -399,7 +482,7 @@ class Status extends FHCAPI_Controller
 					$statusgrund_kurzbz = $result->statusgrund_kurzbz;
 
 					$this->load->library('PrestudentLib');
-					$result = $this->prestudentlib->setAbbrecher($prestudent_id, $studiensemester_kurzbz, null, $statusgrund_kurzbz, $datum, $bestaetigtam, $bestaetigtvon);
+					$result = $this->prestudentlib->setAbbrecher($prestudent_id, $studiensemester_kurzbz, null, $statusgrund_kurzbz, $datum, null, null);
 					if (isError($result))
 					{
 						return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
@@ -426,7 +509,7 @@ class Status extends FHCAPI_Controller
 			case Prestudentstatus_model::STATUS_STUDENT:
 				{
 					$this->load->library('PrestudentLib');
-					$result = $this->prestudentlib->setStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id, $bestaetigtam, $bestaetigtvon);
+					$result = $this->prestudentlib->setStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id);
 
 					if (isError($result))
 					{
@@ -517,37 +600,11 @@ class Status extends FHCAPI_Controller
 					}
 					else
 						$this->terminateWithSuccess($prestudent_id);
-
 				}
 				break;
 			default:
 			{
 				$this->terminateWithError("Action not yet defined in Prestudentlib", self::ERROR_TYPE_GENERAL);
-				$result = $this->PrestudentstatusModel->insert(
-					[
-						'prestudent_id' => $prestudent_id,
-						'status_kurzbz' => $status_kurzbz,
-						'bewerbung_abgeschicktamum' => $bewerbung_abgeschicktamum,
-						'studiensemester_kurzbz' => $studiensemester_kurzbz,
-						'studienplan_id' => $lastStatusData->studienplan_id,
-						'ausbildungssemester' => $ausbildungssemester,
-						'anmerkung' => $anmerkung,
-						'statusgrund_id' => $statusgrund_id,
-						'insertvon' => $uid,
-						'insertamum' => date('c'),
-						'bestaetigtam' => $bestaetigtam,
-						'bestaetigtvon' => $bestaetigtvon,
-						'datum' => $datum,
-						'rt_stufe' => $rt_stufe
-					]
-				);
-
-				if (isError($result))
-				{
-					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-				}
-				else
-					$this->terminateWithSuccess($prestudent_id);
 			}
 		}
 	}
@@ -1018,6 +1075,7 @@ class Status extends FHCAPI_Controller
 			$student = $this->getDataOrTerminateWithError($result);
 			if ($student)
 			{
+				$student = current($student);
 				$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
 				$result = $this->StudentlehrverbandModel->delete(
 					array(
diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php
index ab274805f..c034caece 100644
--- a/application/libraries/PrestudentLib.php
+++ b/application/libraries/PrestudentLib.php
@@ -421,7 +421,7 @@ class PrestudentLib
 		return success();
 	}
 
-	public function setStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id, $bestaetigtAm, $bestaetigtVon)
+	public function setStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id)
 	{
 
 		$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
@@ -477,8 +477,8 @@ class PrestudentLib
 			'insertamum' => date('c'),
 			'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz,
 			'studienplan_id'=> $prestudent_status->studienplan_id,
-			'bestaetigtvon' => $bestaetigtVon,
-			'bestaetigtam' => $bestaetigtAm
+			'bestaetigtvon' => getAuthUID(),
+			'bestaetigtam' => date('c')
 		]);
 
 		if (isError($result))
diff --git a/application/libraries/PrestudentstatusCheckLib.php b/application/libraries/PrestudentstatusCheckLib.php
index 55488cf4c..ed9b0dd69 100644
--- a/application/libraries/PrestudentstatusCheckLib.php
+++ b/application/libraries/PrestudentstatusCheckLib.php
@@ -145,85 +145,73 @@ class PrestudentstatusCheckLib
 
 	/**
 	 * Check if Reihungstest was admitted
-	 * @param integer $prestudent_id
-	 * @return booleans $reihungstest_angetreten, error if not angetreten
+	 *
+	 * @param stdClass $prestudent
+	 *
+	 * @return stdClass
 	 */
-	public function checkIfAngetreten($prestudent_id)
+	public function checkIfAngetreten($prestudent)
 	{
-		$result =  $this->_getApplicationData($prestudent_id);
-		if(isError($result))
-		{
-			return getData($result);
-		}
-		$result =  current(getData($result));
-		$studentName = trim ($result->vorname.' '.$result->nachname);
-
-		if (!$result->reihungstestangetreten)
-		return error($this->_ci->p->t('lehre', 'error_keinReihungstestverfahren', ['name' => $studentName]));
-
-		return success($result->reihungstestangetreten);
+		return success($prestudent->reihungstestangetreten);
 	}
 
-		/**
+	/**
 	 * Check if ZGV-Code is registered
-	 * @param integer $prestudent_id
+	 *
+	 * @param stdClass $prestudent
+	 *
+	 * @return stdClass
+	 */
+	public function checkIfZGVEingetragen($prestudent_person)
+	{
+		return success((boolean)$prestudent_person->zgv_code);
+		return !!$prestudent_person->zgv_code;
+		//return success(false);
+		//return error(false);
+	}
+
+	/**
+	 * Check if Master ZGV-Code is registered
+	 *
+	 * @param stdClass $prestudent
+	 *
 	 * @return booleans $zgv_code, error if not registered
 	 */
-	public function checkIfZGVEingetragen($prestudent_id, $typ=null)
+	//TODO(Manu) TEST
+	public function checkIfZGVEingetragenMaster($prestudent, $typ=null)
 	{
-		$result =  $this->_getApplicationData($prestudent_id);
-		if(isError($result))
-		{
-			return getData($result);
-		}
-		$result =  current(getData($result));
-		$studentName = trim ($result->vorname.' '.$result->nachname);
+		$this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
+		$result = $this->_ci->StudiengangModel->load($prestudent->studiengang_kz);
+		if (isError($result))
+			return $result;
+		if (!hasData($result))
+			return error($this->_ci->p->t('studierendenantrag','error_no_stg', ['studiengang_kz' => $prestudent->studiengang_kz])); // TODO(chris): phrase
 
-		if ($typ && $typ=='m' && !$result->zgvmas_code)
-		{
-			return error($this->_ci->p->t('lehre', 'error_ZGVMasterNichtEingetragen', ['name' => $studentName]));
-		}
-		else
-			return success($result->zgvmas_code);
+		if (current($result->retval)->typ != 'm')
+			return success(true); // TODO(chris): correct?
 
-
-		if(!$result->zgv_code)
-		{
-			return error($this->_ci->p->t('lehre', 'error_ZGVNichtEingetragen', ['name' => $studentName]));
-		}
-
-		return success($result->zgv_code);
+		return success((boolean)$prestudent->zgv_code);
 	}
 
 	/**
 	 * Checks if a bewerber status already exists.
-	 * @return error if invalid
-	 * @return error if no bewerberstatus, success otherwise
+	 *
+	 * @param integer $prestudent_id
+	 * *
+	 * @return stdClass
 	 */
 	public function checkIfExistingBewerberstatus($prestudent_id)
 	{
-		$result =  $this->_getApplicationData($prestudent_id);
-		if(isError($result))
-		{
-			return getData($result);
-		}
-		$result =  current(getData($result));
-		$studentName = trim ($result->vorname.' '.$result->nachname);
-
 		$result =  $this->_ci->PrestudentstatusModel->checkIfExistingBewerberstatus(
 			$prestudent_id
 		);
-		if(isError($result))
-		{
-			return getData($result);
-		}
-		if(getData($result) == "0")
-		{
-			return error($this->_ci->p->t('lehre','error_keinBewerber', ['name' => $studentName]));
-		}
-		return success(getData($result));
+		if (isError($result))
+			return $result;
+
+		return success(getData($result) != '0');
 	}
 
+
 	/**
 	 * Checks if status aufgenommen already exists.
 	 * @return error if invalid

From 96b8d49ef28a8b9ddf7369c14e6e8ac249c7a69f Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 1 Aug 2024 08:52:38 +0200
Subject: [PATCH 1046/1461] add changeStatus to PermissionChecks

---
 application/controllers/api/frontend/v1/stv/Status.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index d88259cb9..096285c43 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -42,6 +42,7 @@ class Status extends FHCAPI_Controller
 			|| $this->router->method == 'confirmStatus'
 			|| $this->router->method == 'deleteStatus'
 			|| $this->router->method == 'advanceStatus'
+			|| $this->router->method == 'changeStatus'
 		) {
 			$prestudent_id = current(array_slice($this->uri->rsegments, 2));
 			$this->checkPermissionsForPrestudent($prestudent_id, ['admin:rw', 'assistenz:rw']);

From 6fcc8cf7e845915fc861b9e497865ef148b11545 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 1 Aug 2024 11:49:14 +0200
Subject: [PATCH 1047/1461] code review changes

---
 .../controllers/api/frontend/v1/Bookmark.php  |  39 +---
 public/js/api/bookmark.js                     |  20 +-
 public/js/apps/Dashboard/Fhc.js               |   5 +-
 public/js/components/Dashboard/Item.js        | 199 +++++++++---------
 public/js/components/DashboardWidget/Url.js   |  25 +--
 .../41134_bookmark_dashboardWidget.php        |   2 +-
 6 files changed, 124 insertions(+), 166 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Bookmark.php b/application/controllers/api/frontend/v1/Bookmark.php
index 9fb8a6519..a811843ce 100644
--- a/application/controllers/api/frontend/v1/Bookmark.php
+++ b/application/controllers/api/frontend/v1/Bookmark.php
@@ -52,10 +52,6 @@ class Bookmark extends FHCAPI_Controller
 	{
         $bookmarks = $this->BookmarkModel->loadWhere(["uid"=>$this->uid]);
 
-        if(isError($bookmarks)){
-            $this->terminateWithError(getError($bookmarks));
-        }
-
         $bookmarks = $this->getDataOrTerminateWithError($bookmarks);
 
         $this->terminateWithSuccess($bookmarks);
@@ -68,32 +64,20 @@ class Bookmark extends FHCAPI_Controller
 	 */
     public function delete($bookmark_id)
 	{
-        if(!isset($bookmark_id)) $this->terminateWithError("missing required parameters");
-        
         $bookmark = $this->BookmarkModel->load($bookmark_id);
 
-        if(isError($bookmark)){
-            $this->terminateWithError(getError($bookmark));
-        }
-
         $bookmark = current($this->getDataOrTerminateWithError($bookmark));
 
         // only delete bookmark if the user is the owner of the bookmark
-        $this->load->library('PermissionLib');
-
         if($bookmark->uid == $this->uid || $this->permissionlib->isBerechtigt('admin')){
 
             $delete_result = $this->BookmarkModel->delete($bookmark_id);
 
-            if(isError($delete_result)){
-                $this->terminateWithError(getError($delete_result));
-            }
-
             $delete_result = $this->getDataOrTerminateWithError($delete_result);
 
             $this->terminateWithSuccess($delete_result);
         }else{
-            $this->terminateWithError("You are not authorized to delete this bookmark");
+            $this->_outputAuthError(['delete' => ['admin:rw']]);
         }
     }
 
@@ -104,22 +88,17 @@ class Bookmark extends FHCAPI_Controller
 	 */
     public function insert()
 	{
+        // form validation
+        $this->load->library('form_validation');
+        $this->form_validation->set_rules('url', 'URL', 'required|valid_url|max_length[511]');
+        $this->form_validation->set_rules('title', 'Title', 'required|max_length[255]');
+        if($this->form_validation->run() == FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
+
         $url = $this->input->post('url',true);
         $title = $this->input->post('title',true);
-        $tag = $this->input->post('tag',true);
+        $tag = $this->input->post('tag', true);
 
-        // set the parameters to null if they are not present in the request payload
-        if($title == FALSE) $title = NULL;
-        if($tag == FALSE) $tag = NULL;
-
-        if(!isset($url))$this->terminateWithError("missing required parameters");
-
-        $insert_into_result = $this->BookmarkModel->execReadOnlyQuery("
-        INSERT INTO dashboard.tbl_bookmark (uid, url, title,tag, insertvon, updateamum, updatevon) VALUES (?,?,?,?,?,NULL,NULL);",[$this->uid,$url,$title,$tag,$this->uid]);
-
-        if(isError($insert_into_result)){
-            $this->terminateWithError(getError($insert_into_result));
-        }
+        $insert_into_result = $this->BookmarkModel->insert(['uid'=>$this->uid, 'url'=>$url, 'title'=>$title,'tag'=>$tag, 'insertvon'=>$this->uid, 'updateamum'=>NULL, 'updatevon'=>NULL]);
 
         $insert_into_result = $this->getDataOrTerminateWithError($insert_into_result);
 
diff --git a/public/js/api/bookmark.js b/public/js/api/bookmark.js
index 5c99a4010..30e49d50d 100644
--- a/public/js/api/bookmark.js
+++ b/public/js/api/bookmark.js
@@ -1,33 +1,27 @@
 export default {
 
-    getBookmarks: function (uid) {
+    getBookmarks: function () {
       return this.$fhcApi.get(
-        FHC_JS_DATA_STORAGE_OBJECT.app_root + 
-        FHC_JS_DATA_STORAGE_OBJECT.ci_router +
         `/api/frontend/v1/Bookmark/getBookmarks`
         ,{}
       );
     },
   
-    deleteBookmark: function (bookmark_id) {
-      
+    delete: function (bookmark_id) {
       return this.$fhcApi.get(
-        FHC_JS_DATA_STORAGE_OBJECT.app_root + 
-        FHC_JS_DATA_STORAGE_OBJECT.ci_router +
         `/api/frontend/v1/Bookmark/delete/${bookmark_id}`
         ,{}
       ); 
     },
 
-    insertBookmark: function ({url, title, tag}) {
-      
+    insert: function ({url, title, tag}) {
       return this.$fhcApi.post(
-        FHC_JS_DATA_STORAGE_OBJECT.app_root + 
-        FHC_JS_DATA_STORAGE_OBJECT.ci_router +
         `/api/frontend/v1/Bookmark/insert`
-        ,{url: url,
+        ,{
+          url: url,
           title: title,
-          tag: tag}
+          tag: tag
+        }
       ); 
     },
 }
\ No newline at end of file
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index 824f03bd2..a20bb5b64 100755
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -1,6 +1,5 @@
 import FhcDashboard from '../../components/Dashboard/Dashboard.js';
-import Phrasen from "../../plugin/Phrasen.js"
-import FhcAlert from "../../plugin/FhcAlert.js"
+import Phrasen from "../../plugin/Phrasen.js";
 
 const app = Vue.createApp({
   data: () => ({
@@ -11,5 +10,5 @@ const app = Vue.createApp({
   }
 });
 app.config.unwrapInjectedRef = true;
-app.use(Phrasen).use(FhcAlert);
+app.use(Phrasen);
 app.mount('#content');
diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index 67b814946..42608899d 100755
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -2,107 +2,98 @@ import BsModal from "../Bootstrap/Modal.js";
 import CachedWidgetLoader from "../../composables/Dashboard/CachedWidgetLoader.js";
 
 export default {
-	components: {
-		BsModal
-	},
-	data: () => ({
-		component: '',
-		arguments: null,
-		target: false,
-		widget: null,
-		tmpConfig: {},
-		isLoading: false,
-		hasConfig: true,
-		sharedData: null
-	}),
-	emits: [
-		"change",
-		"remove",
-		"dragstart",
-		"resizestart",
-	],
-	props: [
-		"id",
-		"config",
-		"width",
-		"height",
-		"custom",
-		"hidden",
-		"editMode",
-		"loading"
-	],
-	computed: {
-		isResizeable() {
-			if (!this.widget)
-				return false;
-			return this.widget.setup.width.max || this.widget.setup.height.max;
-		},
-		ready() {
-			return this.component && this.arguments !== null
-		},
-		widgetHasFooter(){
-			return this.widget?.setup?.name == "Bookmark" ? false : true;
-		},
-	},
-	methods: {
-		
-		mouseDown(e) {
-			this.target = e.target;
-		},
-		startDrag(e) {
-			if (this.$refs.dragHandle.contains(this.target)) {
-				this.$emit('dragstart', e);
-			} else if (this.isResizeable && this.$refs.resizeHandle.contains(this.target)) {
-				if (this.isResizeable)
-					this.$emit('resizestart', e);
-				else
-					e.preventDefault();
-			} else {
-				e.preventDefault();
-			}
-		},
-		openConfig() {
-			this.tmpConfig = {...this.arguments};
-			this.$refs.config.show();
-		},
-		setConfig(hasConfig) {
-			this.hasConfig = hasConfig;
-		},
-		changeConfig() {
-			this.isLoading = true;
-			let config = {...this.tmpConfig};
-			this.sendChangeConfig(config);
-		},
-		changeConfigManually() {
-			let config = {...this.arguments};
-			this.sendChangeConfig(config);
-		},
-		sendChangeConfig(config) {
-			for (var k in config) {
-				if (this.widget.arguments[k] == config[k]) {
-					delete config[k];
-				}
-			}
-			this.$emit('change', config);
-		}
-	},
-	watch: {
-		config() {
-			this.arguments = {...this.widget.arguments, ...this.config};
-			this.tmpConfig = {...this.arguments};
-			this.$refs.config.hide();
-			this.isLoading = false;
-		}
-	},
-	async created() {
-		this.widget = await CachedWidgetLoader.loadWidget(this.id);
-		let component = (await import('../' + this.widget.setup.file)).default;
-		this.$options.components['widget' + this.widget.widget_id] = component;
-		this.component = 'widget' + this.widget.widget_id;
-		this.arguments = {...this.widget.arguments, ...this.config};
-		this.tmpConfig = {...this.arguments};
-	},
-	template: /*html*/`
+  components: {
+    BsModal,
+  },
+  data: () => ({
+    component: "",
+    arguments: null,
+    target: false,
+    widget: null,
+    tmpConfig: {},
+    isLoading: false,
+    hasConfig: true,
+    sharedData: null,
+  }),
+  emits: ["change", "remove", "dragstart", "resizestart"],
+  props: [
+    "id",
+    "config",
+    "width",
+    "height",
+    "custom",
+    "hidden",
+    "editMode",
+    "loading",
+  ],
+  computed: {
+    isResizeable() {
+      if (!this.widget) return false;
+      return this.widget.setup.width.max || this.widget.setup.height.max;
+    },
+    ready() {
+      return this.component && this.arguments !== null;
+    },
+  },
+  methods: {
+    mouseDown(e) {
+      this.target = e.target;
+    },
+    startDrag(e) {
+      if (this.$refs.dragHandle.contains(this.target)) {
+        this.$emit("dragstart", e);
+      } else if (
+        this.isResizeable &&
+        this.$refs.resizeHandle.contains(this.target)
+      ) {
+        if (this.isResizeable) this.$emit("resizestart", e);
+        else e.preventDefault();
+      } else {
+        e.preventDefault();
+      }
+    },
+    openConfig() {
+      this.tmpConfig = { ...this.arguments };
+      this.$refs.config.show();
+    },
+    setConfig(hasConfig) {
+      this.hasConfig = hasConfig;
+    },
+    changeConfig() {
+      this.isLoading = true;
+      let config = { ...this.tmpConfig };
+      this.sendChangeConfig(config);
+    },
+    changeConfigManually() {
+      let config = { ...this.arguments };
+      this.sendChangeConfig(config);
+    },
+    sendChangeConfig(config) {
+      for (var k in config) {
+        if (this.widget.arguments[k] == config[k]) {
+          delete config[k];
+        }
+      }
+      this.$emit("change", config);
+    },
+  },
+  watch: {
+    config() {
+      this.arguments = { ...this.widget.arguments, ...this.config };
+      this.tmpConfig = { ...this.arguments };
+      this.$refs.config.hide();
+      this.isLoading = false;
+    },
+  },
+  async created() {
+    this.widget = await CachedWidgetLoader.loadWidget(this.id);
+    let component = (await import("../" + this.widget.setup.file)).default;
+    this.$options.components["widget" + this.widget.widget_id] = component;
+    this.component = "widget" + this.widget.widget_id;
+    this.arguments = { ...this.widget.arguments, ...this.config };
+    this.tmpConfig = { ...this.arguments };
+  },
+  template: /*html*/ `
 	<div v-if="loading">
 		<div class="d-flex justify-content-center align-items-center h-100">
 			<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
@@ -132,7 +123,7 @@ export default {
 				<component v-if="ready && !isLoading" :is="component" v-model:shared-data="sharedData" :config="tmpConfig" @change="changeConfig" :configMode="true"></component>
 				<div v-else class="text-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></div>
 			</template>
-			<template v-if="widgetHasFooter" v-slot:footer>
+			<template v-if="!widget?.setup?.hideFooter" v-slot:footer>
 				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
 				<button type="button" class="btn btn-primary" @click="changeConfig">Save changes</button>
 			</template>
@@ -140,5 +131,5 @@ export default {
 		<div v-if="editMode && isResizeable" class="card-footer d-flex justify-content-end p-0">
 			<span drag-action="resize" class="col-auto px-1 cursor-nw-resize"><i class="fa-solid fa-up-right-and-down-left-from-center mirror-x"></i></span>
 		</div>
-	</div>`
-}
\ No newline at end of file
+	</div>`,
+};
\ No newline at end of file
diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index b2df0d450..2d27d2f41 100755
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -5,7 +5,6 @@ export default {
   data: () => ({
     title_input: "",
     url_input: "",
-    isPhrasenLoaded: false,
   }),
   mixins: [AbstractWidget],
   computed: {
@@ -37,16 +36,16 @@ export default {
     },
     addLink() {
       this.$fhcApi.factory.bookmark
-        .insertBookmark({
+        .insert({
           tag: this.config.tag,
           title: this.title_input,
           url: this.url_input,
         })
         .then((res) => res.data)
         .then((result) => {
-          this.$fhcAlert.alertInfo("bookmark added");
+          this.$fhcAlert.alertInfo(this.$p.t("bookmark", "bookmarkAdded"));
         })
-        .catch();
+        .catch(this.$fhcAlert.handleSystemError);
 
       // reset the values for the title and url inputs
       this.title_input = "";
@@ -58,7 +57,7 @@ export default {
     async removeLink(bookmark_id) {
       await this.confirmDelete();
       this.$fhcApi.factory.bookmark
-        .deleteBookmark(bookmark_id)
+        .delete(bookmark_id)
         .then((res) => res.data)
         .then((result) => {
           this.$fhcAlert.alertInfo(this.$p.t("bookmark", "bookmarkDeleted"));
@@ -69,12 +68,6 @@ export default {
       this.fetchBookmarks();
     },
   },
-
-  created() {
-    this.$p.loadCategory("bookmark").then(() => {
-      this.isPhrasenLoaded = true;
-    });
-  },
   async mounted() {
     await this.fetchBookmarks();
   },
@@ -95,10 +88,12 @@ export default {
         <!-- todo: widgetTag ?? -->
             <template v-if="shared">
                 <header><b>{{ tagName }}</b></header>
-                <div v-if="!emptyBookmarks" v-for="link in shared" :key="link.id" class="d-flex mt-2">
-                    <a target="_blank" :href="link.url"><i class="fa fa-solid fa-arrow-up-right-from-square"></i> {{ link.title }}</a>
-                    <a class="ms-auto" href="#" @click.prevent="removeLink(link.bookmark_id)" v-show="configMode"><i class="fa fa-regular fa-trash-can"></i></a>
-                </div>
+                <template v-if="!emptyBookmarks">
+                  <div v-for="link in shared" :key="link.id" class="d-flex mt-2">
+                      <a target="_blank" :href="link.url"><i class="fa fa-solid fa-arrow-up-right-from-square"></i> {{ link.title }}</a>
+                      <a class="ms-auto" href="#" @click.prevent="removeLink(link.bookmark_id)" v-show="configMode"><i class="fa fa-regular fa-trash-can"></i></a>
+                  </div>
+                </template>
                 <div v-else class="d-flex mt-2">
                     <span>{{$p.t('bookmark','emptyBookmarks')}}</span>
                 </div>
diff --git a/system/dbupdate_3.4/41134_bookmark_dashboardWidget.php b/system/dbupdate_3.4/41134_bookmark_dashboardWidget.php
index 28171367c..ebcdeba91 100644
--- a/system/dbupdate_3.4/41134_bookmark_dashboardWidget.php
+++ b/system/dbupdate_3.4/41134_bookmark_dashboardWidget.php
@@ -8,7 +8,7 @@ if (!$result = @$db->db_query("SELECT to_regclass('dashboard.tbl_bookmark')"))
                 bookmark_id BIGINT PRIMARY KEY,
                 uid VARCHAR(255) NOT NULL,
                 url VARCHAR(511) NOT NULL,
-                title VARCHAR(255) NULL,
+                title VARCHAR(255) NOT NULL,
                 tag VARCHAR(255) NULL,
                 insertamum TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
                 insertvon VARCHAR(255) NULL REFERENCES public.tbl_benutzer(uid),

From f2180257c516e281e611e6664fbff1f7c09f3a8f Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 1 Aug 2024 12:45:55 +0200
Subject: [PATCH 1048/1461] adapt validation changeStatus

---
 .../api/frontend/v1/stv/Status.php            | 144 ++++++++++++------
 1 file changed, 100 insertions(+), 44 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 096285c43..11528214c 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -205,9 +205,68 @@ class Status extends FHCAPI_Controller
 		//Form Validation
 		$this->load->library('form_validation');
 
+		// $this->form_validation->set_rules('status_kurzbz', $this->p->t('lehre', 'status_kurzbz'), 
+		// [
+		// 	'required',
+		// 	//Check Reihungstest
+		// 	['reihungstest_check', function ($value) use ($prestudent_person) {
+		// 		if (!REIHUNGSTEST_CHECK)
+		// 			return true;
+		// 		if ($value != Prestudentstatus_model::STATUS_BEWERBER)
+		// 			return true;
+		// 		$result = $this->prestudentstatuschecklib->checkIfAngetreten($prestudent_person);
+		// 		return $this->getDataOrTerminateWithError($result);
+		// 	}],
+		// 	//Check ZGV
+		// 	['checkIfZGV', function ($value) use ($prestudent_person) {
+		// 		if (!ZGV_CHECK)
+		// 			return true;
+		// 		if ($value != Prestudentstatus_model::STATUS_BEWERBER)
+		// 			return true;
+		// 		$result = $this->prestudentstatuschecklib->checkIfZGVEingetragen($prestudent_person);
+		// 		return $this->getDataOrTerminateWithError($result);
+		// 	}],
+		// ], 
+
+		// [
+		// 	'reihungstest_check' => $this->p->t('lehre', 'error_keinReihungstestverfahren', ['name' => $studentName]),
+		// 	'checkIfZGV' => $this->p->t('lehre', 'error_ZGVNichtEingetragen', ['name' => $studentName]),
+		// ]);
+
+
+		// $this->form_validation->set_rules(
+		// 	'status_kurzbz', 
+		// 	$this->p->t('lehre', 'status_kurzbz'), 
+		// 	[
+		// 		'required',
+		// 		//Check Reihungstest
+		// 		['reihungstest_check', function ($value) use ($prestudent_person) {
+		// 			if (!REIHUNGSTEST_CHECK)
+		// 				return true;
+		// 			if ($value != Prestudentstatus_model::STATUS_BEWERBER)
+		// 				return true;
+		// 			$result = $this->prestudentstatuschecklib->checkIfAngetreten($prestudent_person);
+		// 			return $this->getDataOrTerminateWithError($result);
+		// 		}]
+		// 	],
+		// 	//Check Bewerberstatus
+		// 	[
+		// 		'checkIfExistingBewerberstatus', function () use ($prestudent_id, $status_kurzbz) {
+		// 		if ($status_kurzbz != Prestudentstatus_model::STATUS_AUFGENOMMENER &&
+		// 			$status_kurzbz != Prestudentstatus_model::STATUS_WARTENDER &&
+		// 			$status_kurzbz != Prestudentstatus_model::STATUS_ABGEWIESENER)
+		// 			return true;
+		// 		$result = $this->prestudentstatuschecklib->checkIfExistingBewerberstatus($prestudent_id);
+		// 		return $this->getDataOrTerminateWithError($result);
+		// 		}]
+		// 	, [
+		// 		'reihungstest_check' => $this->p->t('lehre', 'error_keinReihungstestverfahren', ['name' => $studentName]),
+		// 		'checkIfExistingBewerberstatus' => $this->p->t('lehre', 'error_keinBewerber', ['name' => $studentName]),
+		// 	]);
+
 		$this->form_validation->set_rules(
 			'status_kurzbz',
-			$this->p->t('lehre', 'status_rolle'),
+			'Status',
 			[
 				'required',
 				//Check Reihungstest
@@ -218,38 +277,36 @@ class Status extends FHCAPI_Controller
 						return true;
 					$result = $this->prestudentstatuschecklib->checkIfAngetreten($prestudent_person);
 					return $this->getDataOrTerminateWithError($result);
-				}]
-			],
-			//Check ZGV
-			['checkIfZGV', function ($value) use ($prestudent_person) {
-				if (!ZGV_CHECK)
-					return true;
-				if ($value != Prestudentstatus_model::STATUS_BEWERBER)
-					return true;
-				$result = $this->prestudentstatuschecklib->checkIfZGVEingetragen($prestudent_person);
-				return $this->getDataOrTerminateWithError($result);
-			}],
-			//Check ZGV Master
-			['checkIfZGVMaster', function ($value) use ($prestudent_person) {
-				if (!ZGV_CHECK)
-					return true;
-				if ($value != Prestudentstatus_model::STATUS_BEWERBER)
-					return true;
-				$result = $this->prestudentstatuschecklib->checkIfZGVEingetragenMaster($prestudent_person);
-				return $this->getDataOrTerminateWithError($result);
-			}],
-			//Check Bewerberstatus
-			['checkIfExistingBewerberstatus', function () use ($prestudent_id, $status_kurzbz) {
-				if ($status_kurzbz != Prestudentstatus_model::STATUS_AUFGENOMMENER &&
-					$status_kurzbz != Prestudentstatus_model::STATUS_WARTENDER &&
-					$status_kurzbz != Prestudentstatus_model::STATUS_ABGEWIESENER)
-					return true;
-				$result = $this->prestudentstatuschecklib->checkIfExistingBewerberstatus($prestudent_id);
-				return $this->getDataOrTerminateWithError($result);
-			}],
-			//Check If Student
-			[
-				'required',
+				}],		
+				//Check ZGV
+				['checkIfZGV', function ($value) use ($prestudent_person) {
+					if (!ZGV_CHECK)
+						return true;
+					if ($value != Prestudentstatus_model::STATUS_BEWERBER)
+						return true;
+					$result = $this->prestudentstatuschecklib->checkIfZGVEingetragen($prestudent_person);
+					return $this->getDataOrTerminateWithError($result);
+				}],
+				//Check ZGV Master
+				['checkIfZGVMaster', function ($value) use ($prestudent_person) {
+					if (!ZGV_CHECK)
+						return true;
+					if ($value != Prestudentstatus_model::STATUS_BEWERBER)
+						return true;
+					$result = $this->prestudentstatuschecklib->checkIfZGVEingetragenMaster($prestudent_person);
+					return $this->getDataOrTerminateWithError($result);
+				}],
+				//Check Bewerberstatus
+				[
+				'checkIfExistingBewerberstatus', function () use ($prestudent_id, $status_kurzbz) {
+					if ($status_kurzbz != Prestudentstatus_model::STATUS_AUFGENOMMENER &&
+						$status_kurzbz != Prestudentstatus_model::STATUS_WARTENDER &&
+						$status_kurzbz != Prestudentstatus_model::STATUS_ABGEWIESENER)
+						return true;
+					$result = $this->prestudentstatuschecklib->checkIfExistingBewerberstatus($prestudent_id);
+					return $this->getDataOrTerminateWithError($result);
+				}],
+				//Check If Student
 				['status_stud_exists', function ($value) use ($prestudent_id) {
 					if ($value != Prestudentstatus_model::STATUS_STUDENT)
 						return true; // Only test if new status is Student
@@ -258,17 +315,15 @@ class Status extends FHCAPI_Controller
 
 					return $this->getDataOrTerminateWithError($result);
 				}],
-
-		],
-		[
-			'reihungstest_check' => $this->p->t('lehre', 'error_keinReihungstestverfahren', ['name' => $studentName]),
-			'checkIfExistingBewerberstatus' => $this->p->t('lehre', 'error_keinBewerber', ['name' => $studentName]),
-			'checkIfZGV' => $this->p->t('lehre', 'error_ZGVNichtEingetragen', ['name' => $studentName]),
-			'checkIfZGVMaster' => $this->p->t('lehre', 'error_ZGVMasterNichtEingetragen', ['name' => $studentName]),
-			'status_stud_exists' => $this->p->t('lehre', 'error_noStudstatus')
-		]
+			],	[
+				'reihungstest_check' => $this->p->t('lehre', 'error_keinReihungstestverfahren', ['name' => $studentName]),
+				'checkIfExistingBewerberstatus' => $this->p->t('lehre', 'error_keinBewerber', ['name' => $studentName]),
+				'checkIfZGV' => $this->p->t('lehre', 'error_ZGVNichtEingetragen', ['name' => $studentName]),
+				'checkIfZGVMaster' => $this->p->t('lehre', 'error_ZGVMasterNichtEingetragen', ['name' => $studentName]),
+				'status_stud_exists' => $this->p->t('lehre', 'error_noStudstatus')
+				]
 		);
-
+ 
 		if ($status_kurzbz == Prestudentstatus_model::STATUS_STUDENT)
 			$this->form_validation->set_rules('ausbildungssemester', $this->p->t('lehre', 'ausbildungssemester'), 'required|integer', [
 				'integer' => $this->p->t('ui', 'error_fieldNotInteger')
@@ -278,6 +333,7 @@ class Status extends FHCAPI_Controller
 				'integer' => $this->p->t('ui', 'error_fieldNotInteger')
 			]);
 
+		//TODO(Manu) check if really necessary, sth similiar above: rolle_doesnt_exist
 		$this->form_validation->set_rules('_default', '', [
 			//check if Rolle already exists
 			['checkIfExistingPrestudentRolle', function () use (
@@ -457,7 +513,7 @@ class Status extends FHCAPI_Controller
 				return $this->getDataOrTerminateWithError($result);
 			}]
 		], [
-			'rolle_doesnt_exist' => $this->p->t('lehre', 'error_rolleBereitsVorhanden'),
+			'rolle_doesnt_exist' => $this->p->t('lehre', 'error_rolleBereitsVorhandenMitNamen', ['name' => $studentName]),
 			'history_timesequence' => $this->p->t('lehre', 'error_statuseintrag_zeitabfolge'),
 			'history_laststatus' => $this->p->t('lehre', 'error_endstatus'),
 			'history_unterbrecher' => $this->p->t('lehre', 'error_consecutiveUnterbrecher'),

From 6f0e46ac575f18c8cdd43e1599bc6d8d88eef020 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 1 Aug 2024 12:57:06 +0200
Subject: [PATCH 1049/1461] Status: Max Semester

---
 .../api/frontend/v1/stv/Status.php            | 36 +++++++++++++++++++
 .../models/organisation/Lehrverband_model.php | 30 ++++++++++++++++
 .../Details/Prestudent/MultiStatus.js         | 20 +++++++++--
 .../Details/Status/Modal.js                   | 16 +++++----
 system/phrasesupdate.php                      | 20 +++++++++++
 5 files changed, 113 insertions(+), 9 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 11528214c..ac6d4b3aa 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -11,6 +11,7 @@ class Status extends FHCAPI_Controller
 	{
 		parent::__construct([
 			'getHistoryPrestudent' => ['admin:r', 'assistenz:r'],
+			'getMaxSemester' => ['admin:r', 'assistenz:r'],
 			'changeStatus' => ['admin:r', 'assistenz:r', 'student/keine_studstatuspruefung'],
 			'addStudent' => ['admin:r', 'assistenz:r', 'student/keine_studstatuspruefung'],
 			'getStatusgruende' => self::PERM_LOGGED,
@@ -63,6 +64,41 @@ class Status extends FHCAPI_Controller
 		$this->terminateWithSuccess($data);
 	}
 
+	/**
+	 * Gets the maximum possible semester for one or more Studiengaenge.
+	 * If there are more than one Studiengang each maximum is calculated and
+	 * the smallest result is returned.
+	 *
+	 * @return void
+	 */
+	public function getMaxSemester()
+	{
+		$studiengang_kzs = $this->input->post('studiengang_kzs');
+
+		if (!$studiengang_kzs || !is_array($studiengang_kzs)) {
+			$this->load->library('form_validation');
+
+			$this->form_validation->set_rules('studiengang_kzs', '', 'required|is_null', [
+				'is_null' => $this->p->t('ui', 'error_fieldMustBeArray')
+			]);
+
+			if (!$this->form_validation->run())
+				$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+		
+
+		if (defined('VORRUECKUNG_STATUS_MAX_SEMESTER') && VORRUECKUNG_STATUS_MAX_SEMESTER == false)
+			$this->terminateWithSuccess(100);
+
+		$this->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
+		
+		$result = $this->LehrverbandModel->getMaxSemester($studiengang_kzs);
+		
+		$maxsem = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($maxsem ? current($maxsem)->maxsem : 10);
+	}
+
 	public function getStatusgruende()
 	{
 		$this->load->model('crm/Statusgrund_model', 'StatusgrundModel');
diff --git a/application/models/organisation/Lehrverband_model.php b/application/models/organisation/Lehrverband_model.php
index 2573b92e8..bc4858e5f 100644
--- a/application/models/organisation/Lehrverband_model.php
+++ b/application/models/organisation/Lehrverband_model.php
@@ -53,4 +53,34 @@ class Lehrverband_model extends DB_Model
 			return success("1","Lehrverband vorhanden!");
 		}
 	}
+
+	/**
+	 * Gets the maximum possible semester for one or more Studiengaenge.
+	 * If there are more than one Studiengang each maximum is calculated and
+	 * the smallest result is returned.
+	 *
+	 * @param array					$studiengang_kzs
+	 *
+	 * @return stdClass
+	 */
+	public function getMaxSemester($studiengang_kzs)
+	{
+		$sqls = [];
+		foreach ($studiengang_kzs as $studiengang_kz) {
+			$this->addSelect('MAX(semester) AS maxsem');
+			$this->db->where('studiengang_kz', $studiengang_kz);
+			$sqls[] = $this->db->get_compiled_select($this->dbTable);
+		}
+		
+		$this->addSelect('MIN(a.maxsem) AS maxsem');
+		
+		$dbTable = $this->dbTable;
+		$this->dbTable = '(' . implode(' UNION ', $sqls) . ') AS a';
+		
+		$result = $this->load();
+		
+		$this->dbTable = $dbTable;
+
+		return $result;
+	}
 }
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index 146450341..8cab0ea1a 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -235,7 +235,8 @@ export default{
 			statusData: {},
 			statusId: {},
 			dataMeldestichtag: null,
-			statusNew: true
+			statusNew: true,
+			maxSem: 0
 		};
 	},
 	watch: {
@@ -246,9 +247,20 @@ export default{
 				else
 					this.data.tabulatorOptions.ajaxURL = 'api/frontend/v1/stv/Status/getHistoryPrestudent/' + this.modelValue.prestudent_id;
 			}
+			this.getMaxSem();
 		}
 	},
 	methods: {
+		getMaxSem() {
+			const studiengang_kzs = this.modelValue.studiengang_kz
+				? [this.modelValue.studiengang_kz]
+				: this.modelValue.map(prestudent => prestudent.studiengang_kz);
+			this.maxSem = 0;
+			this.$fhcApi
+				.post('api/frontend/v1/stv/status/getMaxSemester/', {studiengang_kzs})
+				.then(result => this.maxSem = result.data)
+				.catch(this.$fhcAlert.handleSystemError);
+		},
 		actionNewStatus() {
 			this.$refs.test.open(this.modelValue);
 		},
@@ -317,6 +329,8 @@ export default{
 		}
 	},
 	created() {
+		this.getMaxSem();
+
 		this.$fhcApi
 			.get('api/frontend/v1/stv/status/getLastBismeldestichtag/')
 			.then(result => {
@@ -327,9 +341,9 @@ export default{
 			.catch(this.$fhcAlert.handleSystemError);
 	},
 	template: `
-		<div class="stv-list h-100 pt-3">
+		<div class="stv-multistatus h-100 pt-3">
 			
-			<status-modal ref="test" :meldestichtag="new Date(dataMeldestichtag)" @saved="reload"></status-modal>
+			<status-modal ref="test" :meldestichtag="new Date(dataMeldestichtag)" :max-sem="maxSem" @saved="reload"></status-modal>
 				
 			<core-filter-cmpt
 				v-if="!this.modelValue.length"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js b/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js
index 5a77c7348..2b3f2f580 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js
@@ -37,6 +37,10 @@ export default{
 		meldestichtag: {
 			type: Date,
 			required: true
+		},
+		maxSem: {
+			type: Number,
+			required: true
 		}
 	},
 	data() {
@@ -58,12 +62,13 @@ export default{
 				'Unterbrecher',
 				'Diplomand',
 				'Incoming'
-			],
-			// TODO(chris): IMPLEMENT!
-			maxSem:  Array.from({ length: 11 }, (_, index) => index),
+			]
 		};
 	},
 	computed: {
+		semester() {
+			return Array.from({length: this.maxSem}, (_, index) => index);
+		},
 		bisLocked() {
 			if (this.statusNew || this.hasPermissionToSkipStatusCheck)
 				return false;
@@ -207,7 +212,7 @@ export default{
 		</template>
 
 		<core-form ref="form">
-			
+
 			<form-validation></form-validation>
 			
 			<p v-if="bisLocked && !isStatusBeforeStudent">
@@ -249,7 +254,6 @@ export default{
 					{{ sem.studiensemester_kurzbz }}
 				</option>
 			</form-input>
-			<!-- TODO(manu) if(defined('VORRUECKUNG_STATUS_MAX_SEMESTER') && VORRUECKUNG_STATUS_MAX_SEMESTER==false) 100 Semester-->
 			<form-input
 				container-class="mb-3"
 				type="select"
@@ -259,7 +263,7 @@ export default{
 				:disabled="bisLocked && !isStatusBeforeStudent"
 				>
 				<option
-					v-for="number in maxSem"
+					v-for="number in semester"
 					:key="number"
 					:value="number"
 					>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 6052de48e..3d6cc87e0 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -1755,6 +1755,26 @@ $phrases = array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'error_fieldMustBeArray',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Das {field} Feld muss ein Array sein',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The {field} field must be an array',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 	'app' => 'core',
 	'category' => 'anrechnung',

From 3213c051b3f08a46006a533ea580d5f9e7a7cc5a Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Thu, 1 Aug 2024 13:48:06 +0200
Subject: [PATCH 1050/1461] Adapted getLvsByStudienplan query to get by given
 Lehrveranstaltungen

---
 .../models/education/Lehrveranstaltung_model.php   | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/application/models/education/Lehrveranstaltung_model.php b/application/models/education/Lehrveranstaltung_model.php
index 09b635a58..928237118 100644
--- a/application/models/education/Lehrveranstaltung_model.php
+++ b/application/models/education/Lehrveranstaltung_model.php
@@ -44,12 +44,22 @@ class Lehrveranstaltung_model extends DB_Model
 	 * @param $eventQuery String
 	 * @param string $studiensemester_kurzbz Filter by Studiensemester
 	 * @param array $oes Filter by Organisationseinheiten
+	 * @param array $lv_ids Filter by Lehrveranstaltung-Ids
 	 * @return array
 	 */
-	public function getLvsByStudienplan($studiensemester_kurzbz = null, $oes = null)
+	public function getLvsByStudienplan($studiensemester_kurzbz = null, $oes = null, $lv_ids = null)
 	{
 		$subQry = $this->_getQryLvsByStudienplan($studiensemester_kurzbz, $oes);
-		$qry = 'SELECT * FROM ('. $subQry. ') AS tmp ORDER BY stg_typ_kurzbz, orgform_kurzbz DESC';
+		$qry = 'SELECT * FROM ('. $subQry. ') AS tmp';
+
+		if (isset($lv_ids) && is_array($lv_ids))
+		{
+			/* filter by lv_ids */
+			$implodedLvIds = "'". implode("', '", $lv_ids). "'";
+			$qry.= ' WHERE lehrveranstaltung_id IN ('. $implodedLvIds. ')';
+		}
+
+		$qry.= ' ORDER BY stg_typ_kurzbz, orgform_kurzbz DESC';
 
 		return $this->execQuery($qry);
 	}

From 4317d5ebe98aacf705afe1b10bbf95945104d1e4 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 1 Aug 2024 14:16:20 +0200
Subject: [PATCH 1051/1461] tab spaces/ catch alerts

---
 public/js/components/Dashboard/Item.js      | 257 ++++++++++----------
 public/js/components/DashboardWidget/Url.js |   4 +-
 2 files changed, 133 insertions(+), 128 deletions(-)

diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index 42608899d..7e6134f75 100755
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -2,134 +2,139 @@ import BsModal from "../Bootstrap/Modal.js";
 import CachedWidgetLoader from "../../composables/Dashboard/CachedWidgetLoader.js";
 
 export default {
-  components: {
-    BsModal,
-  },
-  data: () => ({
-    component: "",
-    arguments: null,
-    target: false,
-    widget: null,
-    tmpConfig: {},
-    isLoading: false,
-    hasConfig: true,
-    sharedData: null,
-  }),
-  emits: ["change", "remove", "dragstart", "resizestart"],
-  props: [
-    "id",
-    "config",
-    "width",
-    "height",
-    "custom",
-    "hidden",
-    "editMode",
-    "loading",
-  ],
-  computed: {
-    isResizeable() {
-      if (!this.widget) return false;
-      return this.widget.setup.width.max || this.widget.setup.height.max;
+    components: {
+        BsModal,
     },
-    ready() {
-      return this.component && this.arguments !== null;
+    data: () => ({
+        component: "",
+        arguments: null,
+        target: false,
+        widget: null,
+        tmpConfig: {},
+        isLoading: false,
+        hasConfig: true,
+        sharedData: null,
+    }),
+    emits: [
+        "change",
+        "remove",
+        "dragstart",
+        "resizestart"
+    ],
+    props: [
+        "id",
+        "config",
+        "width",
+        "height",
+        "custom",
+        "hidden",
+        "editMode",
+        "loading",
+    ],
+    computed: {
+        isResizeable() {
+            if (!this.widget) return false;
+            return this.widget.setup.width.max || this.widget.setup.height.max;
+        },
+        ready() {
+            return this.component && this.arguments !== null;
+        },
     },
-  },
-  methods: {
-    mouseDown(e) {
-      this.target = e.target;
+    methods: {
+        mouseDown(e) {
+            this.target = e.target;
+        },
+        startDrag(e) {
+            if (this.$refs.dragHandle.contains(this.target)) {
+                this.$emit("dragstart", e);
+            } else if (
+                this.isResizeable &&
+                this.$refs.resizeHandle.contains(this.target)
+            ) {
+                if (this.isResizeable) this.$emit("resizestart", e);
+                else e.preventDefault();
+            } else {
+                e.preventDefault();
+            }
+        },
+        openConfig() {
+            this.tmpConfig = { ...this.arguments };
+            this.$refs.config.show();
+        },
+        setConfig(hasConfig) {
+            this.hasConfig = hasConfig;
+        },
+        changeConfig() {
+            this.isLoading = true;
+            let config = { ...this.tmpConfig };
+            this.sendChangeConfig(config);
+        },
+        changeConfigManually() {
+            let config = { ...this.arguments };
+            this.sendChangeConfig(config);
+        },
+        sendChangeConfig(config) {
+            for (var k in config) {
+                if (this.widget.arguments[k] == config[k]) {
+                delete config[k];
+                }
+            }
+            this.$emit("change", config);
+        },
     },
-    startDrag(e) {
-      if (this.$refs.dragHandle.contains(this.target)) {
-        this.$emit("dragstart", e);
-      } else if (
-        this.isResizeable &&
-        this.$refs.resizeHandle.contains(this.target)
-      ) {
-        if (this.isResizeable) this.$emit("resizestart", e);
-        else e.preventDefault();
-      } else {
-        e.preventDefault();
-      }
+    watch: {
+        config() {
+            this.arguments = { ...this.widget.arguments, ...this.config };
+            this.tmpConfig = { ...this.arguments };
+            this.$refs.config.hide();
+            this.isLoading = false;
+        },
     },
-    openConfig() {
-      this.tmpConfig = { ...this.arguments };
-      this.$refs.config.show();
+    async created() {
+        this.widget = await CachedWidgetLoader.loadWidget(this.id);
+        let component = (await import("../" + this.widget.setup.file)).default;
+        this.$options.components["widget" + this.widget.widget_id] = component;
+        this.component = "widget" + this.widget.widget_id;
+        this.arguments = { ...this.widget.arguments, ...this.config };
+        this.tmpConfig = { ...this.arguments };
     },
-    setConfig(hasConfig) {
-      this.hasConfig = hasConfig;
-    },
-    changeConfig() {
-      this.isLoading = true;
-      let config = { ...this.tmpConfig };
-      this.sendChangeConfig(config);
-    },
-    changeConfigManually() {
-      let config = { ...this.arguments };
-      this.sendChangeConfig(config);
-    },
-    sendChangeConfig(config) {
-      for (var k in config) {
-        if (this.widget.arguments[k] == config[k]) {
-          delete config[k];
-        }
-      }
-      this.$emit("change", config);
-    },
-  },
-  watch: {
-    config() {
-      this.arguments = { ...this.widget.arguments, ...this.config };
-      this.tmpConfig = { ...this.arguments };
-      this.$refs.config.hide();
-      this.isLoading = false;
-    },
-  },
-  async created() {
-    this.widget = await CachedWidgetLoader.loadWidget(this.id);
-    let component = (await import("../" + this.widget.setup.file)).default;
-    this.$options.components["widget" + this.widget.widget_id] = component;
-    this.component = "widget" + this.widget.widget_id;
-    this.arguments = { ...this.widget.arguments, ...this.config };
-    this.tmpConfig = { ...this.arguments };
-  },
-  template: /*html*/ `
-	<div v-if="loading">
-		<div class="d-flex justify-content-center align-items-center h-100">
-			<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
-		</div>
-	</div>
-	<div v-else-if="!hidden || editMode" class="dashboard-item card overflow-hidden h-100" :class="arguments && arguments.className ? arguments.className : ''">
-		<div v-if="editMode && widget" class="card-header d-flex ps-0 pe-2">
-			<span drag-action="move" class="col-auto mx-2 px-2 cursor-move"><i class="fa-solid fa-grip-vertical"></i></span>
-			<span class="col">{{ widget.setup.name }}</span>
-			<a v-if="hasConfig" class="col-auto px-1" href="#" @click.prevent="openConfig"><i class="fa-solid fa-gear"></i></a>
-			<a v-if="custom" class="col-auto px-1" href="#" @click.prevent="$emit('remove')">
-				<i class="fa-solid fa-trash"></i>
-			</a>
-			<div v-else class="col-auto px-1 form-switch">
-				<input class="form-check-input ms-0" type="checkbox" role="switch" id="flexSwitchCheckChecked" :checked="!hidden" @input="$emit('remove', hidden)">
-			</div>
-		</div>
-		<div v-if="ready" class="card-body overflow-hidden">
-			<component :is="component" v-model:shared-data="sharedData" :config="arguments" :width="width" :height="height" @setConfig="setConfig" @change="changeConfigManually"></component>
-		</div>
-		<div v-else class="card-body overflow-hidden text-center d-flex flex-column justify-content-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></div>
-		<bs-modal ref="config">
-			<template v-slot:title>
-				{{ widget ? 'Config for ' + widget.setup.name : '' }}
-			</template>
-			<template v-slot:default>
-				<component v-if="ready && !isLoading" :is="component" v-model:shared-data="sharedData" :config="tmpConfig" @change="changeConfig" :configMode="true"></component>
-				<div v-else class="text-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></div>
-			</template>
-			<template v-if="!widget?.setup?.hideFooter" v-slot:footer>
-				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
-				<button type="button" class="btn btn-primary" @click="changeConfig">Save changes</button>
-			</template>
-		</bs-modal>
-		<div v-if="editMode && isResizeable" class="card-footer d-flex justify-content-end p-0">
-			<span drag-action="resize" class="col-auto px-1 cursor-nw-resize"><i class="fa-solid fa-up-right-and-down-left-from-center mirror-x"></i></span>
-		</div>
-	</div>`,
-};
\ No newline at end of file
+    template: /*html*/ `
+    <div v-if="loading">
+        <div class="d-flex justify-content-center align-items-center h-100">
+            <i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
+        </div>
+    </div>
+    <div v-else-if="!hidden || editMode" class="dashboard-item card overflow-hidden h-100" :class="arguments && arguments.className ? arguments.className : ''">
+        <div v-if="editMode && widget" class="card-header d-flex ps-0 pe-2">
+            <span drag-action="move" class="col-auto mx-2 px-2 cursor-move"><i class="fa-solid fa-grip-vertical"></i></span>
+            <span class="col">{{ widget.setup.name }}</span>
+            <a v-if="hasConfig" class="col-auto px-1" href="#" @click.prevent="openConfig"><i class="fa-solid fa-gear"></i></a>
+            <a v-if="custom" class="col-auto px-1" href="#" @click.prevent="$emit('remove')">
+                <i class="fa-solid fa-trash"></i>
+            </a>
+            <div v-else class="col-auto px-1 form-switch">
+                <input class="form-check-input ms-0" type="checkbox" role="switch" id="flexSwitchCheckChecked" :checked="!hidden" @input="$emit('remove', hidden)">
+            </div>
+        </div>
+        <div v-if="ready" class="card-body overflow-hidden">
+            <component :is="component" v-model:shared-data="sharedData" :config="arguments" :width="width" :height="height" @setConfig="setConfig" @change="changeConfigManually"></component>
+        </div>
+        <div v-else class="card-body overflow-hidden text-center d-flex flex-column justify-content-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></div>
+        <bs-modal ref="config">
+            <template v-slot:title>
+                {{ widget ? 'Config for ' + widget.setup.name : '' }}
+            </template>
+            <template v-slot:default>
+                <component v-if="ready && !isLoading" :is="component" v-model:shared-data="sharedData" :config="tmpConfig" @change="changeConfig" :configMode="true"></component>
+                <div v-else class="text-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></div>
+            </template>
+            <template v-if="!widget?.setup?.hideFooter" v-slot:footer>
+                <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
+                <button type="button" class="btn btn-primary" @click="changeConfig">Save changes</button>
+            </template>
+        </bs-modal>
+        <div v-if="editMode && isResizeable" class="card-footer d-flex justify-content-end p-0">
+            <span drag-action="resize" class="col-auto px-1 cursor-nw-resize"><i class="fa-solid fa-up-right-and-down-left-from-center mirror-x"></i></span>
+        </div>
+    </div>`,
+};
diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index 2d27d2f41..eb7dfdae4 100755
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -29,7 +29,7 @@ export default {
         .then((result) => {
           this.shared = result;
         })
-        .catch();
+        .catch(this.$fhcAlert.handleSystemError);
     },
     async confirmDelete() {
       if ((await this.$fhcAlert.confirmDelete()) === false) return;
@@ -62,7 +62,7 @@ export default {
         .then((result) => {
           this.$fhcAlert.alertInfo(this.$p.t("bookmark", "bookmarkDeleted"));
         })
-        .catch();
+        .catch(this.$fhcAlert.handleSystemError);
 
       // refetch the bookmarks to see the updates
       this.fetchBookmarks();

From d4e33eb1dfd85222174004b93b242beb3e5ad2ed Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 1 Aug 2024 15:04:18 +0200
Subject: [PATCH 1052/1461] refactor

---
 .../controllers/api/frontend/v1/Ampeln.php    | 79 +++++--------------
 .../helpers/hlp_return_object_helper.php      |  1 +
 application/models/content/Ampel_model.php    | 22 +++---
 public/js/api/ampeln.js                       | 27 ++-----
 public/js/apps/Dashboard/Admin.js             |  5 +-
 public/js/apps/Dashboard/Fhc.js               |  3 +-
 public/js/components/DashboardWidget/Ampel.js | 16 +---
 .../components/DashboardWidget/Stundenplan.js |  4 +-
 8 files changed, 44 insertions(+), 113 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Ampeln.php b/application/controllers/api/frontend/v1/Ampeln.php
index 2e64ba8b6..debdb917d 100644
--- a/application/controllers/api/frontend/v1/Ampeln.php
+++ b/application/controllers/api/frontend/v1/Ampeln.php
@@ -27,20 +27,15 @@ class Ampeln extends FHCAPI_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'getNonConfirmedActiveAmpeln' => self::PERM_LOGGED,
-            'getAllActiveAmpeln' => self::PERM_LOGGED,
-            'getConfirmedActiveAmpeln' => self::PERM_LOGGED,
-            'confirmAmpel' => self::PERM_LOGGED,
+			'open' => self::PERM_LOGGED,
+            'all' => self::PERM_LOGGED,
+            'confirm' => self::PERM_LOGGED,
             'alleAmpeln' => self::PERM_LOGGED,
-            
 		]);
 
-
 		$this->load->model('content/Ampel_model', 'AmpelModel');
         $this->load->model('system/Sprache_model','SpracheModel');
 
-
-		//? put the uid and pid inside the controller for reusability
 		$this->uid = getAuthUID();
 		$this->pid = getAuthPersonID();
 
@@ -50,22 +45,19 @@ class Ampeln extends FHCAPI_Controller
 	// Public methods
 
     /**
-	 * confirms ampel and inserts ampelID in public.tbl_ampel_benutzer_bestaetigt
+	 * confirms ampel and inserts ampel_id in public.tbl_ampel_benutzer_bestaetigt
      * @access public
 	 * 
 	 */
-	public function confirmAmpel($ampel_id)
+	public function confirm($ampel_id)
 	{
-        if(!isset($ampel_id)){
-            $this->terminateWithError("missing parameter");
-        }
+        $this->load->library('form_validation');
+        $this->form_validation->set_data(['ampel_id'=> $ampel_id]);
+        $this->form_validation->set_rules('ampel_id', 'Ampel ID', 'required|integer');
+        if($this->form_validation->run() == FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
 
         $insert_into_result = $this->AmpelModel->confirmAmpel($ampel_id,$this->uid);
 
-        if(isError($insert_into_result)){
-            $this->terminateWithError(getError($insert_into_result));
-        }
-
         $insert_into_result = $this->getDataOrTerminateWithError($insert_into_result);
 
         $this->terminateWithSuccess($insert_into_result);
@@ -76,9 +68,8 @@ class Ampeln extends FHCAPI_Controller
      * @access public
 	 * 
 	 */
-	public function getNonConfirmedActiveAmpeln()
+	public function open()
 	{
-        
         $userAmpeln = array();
 
         // fetch active ampeln
@@ -98,33 +89,9 @@ class Ampeln extends FHCAPI_Controller
                 // check if the user was assigned to the ampel
                 $zugeteilt = $this->AmpelModel->isZugeteilt($this->uid, $ampel->benutzer_select);
 
-                if(isError($zugeteilt)){
-                    $this->addError(getError($zugeteilt));
-                    $zugeteilt = false;
-                }else{
-                    $zugeteilt = $this->getDataOrTerminateWithError($zugeteilt);
-                }
+                $zugeteilt = $this->getDataOrTerminateWithError($zugeteilt);
 
                 if($zugeteilt) $userAmpeln[] = $this->translateAmpel($ampel);
-                
-                // old way to check if an ampel was assigned to the user
-                /* $userUID_array = $this->AmpelModel->execBenutzerSelect($ampel->benutzer_select);
-                if(isError($userUID_array)){
-                    $this->addError(getError($userUID_array));
-                }
-                $userUID_array = $this->getDataOrTerminateWithError($userUID_array);
-                
-                
-                // check if user is assigned to the ampel
-                foreach($userUID_array as $user_obj){
-                    // property is called uid for students and mitarbeiter_uid for employees
-                    $user_uid = property_exists($user_obj,"uid") ? $user_obj->uid : $user_obj->mitarbeiter_uid;
-                    if($user_uid === $this->uid){
-                        $userAmpeln[] = $this->translateAmpel($ampel);
-                    }
-                } */ 
-                
-
             }
         }
         
@@ -132,11 +99,11 @@ class Ampeln extends FHCAPI_Controller
 	}
 
     /**
-	 * queries active ampeln by the user 
+	 * queries all ampeln of the user 
      * @access public
 	 * 
 	 */
-    public function getAllActiveAmpeln()
+    public function all()
 	{
         $userAmpeln = array();
         
@@ -151,15 +118,9 @@ class Ampeln extends FHCAPI_Controller
             // check if the ampel was assigned to the user
             $zugeteilt = $this->AmpelModel->isZugeteilt($this->uid, $ampel->benutzer_select);
 
-            if(isError($zugeteilt)){
-                $this->addError(getError($zugeteilt));
-                $zugeteilt = false;
-            }else{
-                $zugeteilt = $this->getDataOrTerminateWithError($zugeteilt);
-            }
+            $zugeteilt = $this->getDataOrTerminateWithError($zugeteilt);
 
-            if($zugeteilt) $userAmpeln[] = $this->translateAmpel($ampel);
-                        
+            if($zugeteilt) $userAmpeln[] = $this->translateAmpel($ampel);    
         }
 
         $this->terminateWithSuccess($userAmpeln);
@@ -175,8 +136,6 @@ class Ampeln extends FHCAPI_Controller
         //fetch all ampeln
         $alle_ampeln = $this->AmpelModel->alleAmpeln($this->uid);
 
-        if(isError($alle_ampeln)) $this->terminateWithError(getError($alle_ampeln));
-
         $alle_ampeln = $this->getDataOrTerminateWithError($alle_ampeln);
 
         $alle_ampeln = array_map(function($ampel){ 
@@ -206,12 +165,14 @@ class Ampeln extends FHCAPI_Controller
         
         $userLanguage = $this->SpracheModel->loadWhere(["sprache" => $userLanguage]);
         
-        if(isError($userLanguage)) $this->terminateWithError(getError($userLanguage));
         $userLanguage = $this->getDataOrTerminateWithError($userLanguage)[0]->index - 1; // why does the index start at 1?
 
         // translate the ampel description and button text
-        if(isset($ampel->beschreibung) && count($ampel->beschreibung)>=($userLanguage+1)) $ampel->beschreibung = $ampel->beschreibung[$userLanguage];
-        if(isset($ampel->buttontext) && count($ampel->buttontext)>=($userLanguage+1)) $ampel->buttontext = $ampel->buttontext[$userLanguage];
+        if(isset($ampel->beschreibung) && count($ampel->beschreibung)>=($userLanguage+1)) 
+        $ampel->beschreibung = $ampel->beschreibung[$userLanguage];
+        
+        if(isset($ampel->buttontext) && count($ampel->buttontext)>=($userLanguage+1)) 
+        $ampel->buttontext = $ampel->buttontext[$userLanguage];
 
         return $ampel;
 
diff --git a/application/helpers/hlp_return_object_helper.php b/application/helpers/hlp_return_object_helper.php
index d9004d993..4db5eb9e3 100755
--- a/application/helpers/hlp_return_object_helper.php
+++ b/application/helpers/hlp_return_object_helper.php
@@ -25,6 +25,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 /**
  * Used to create a return object, should not be used directly
+ * @return  stdClass
  */
 function _createReturnObject($code, $error, $retval)
 {
diff --git a/application/models/content/Ampel_model.php b/application/models/content/Ampel_model.php
index 8f89ff3e9..7c3bf1900 100755
--- a/application/models/content/Ampel_model.php
+++ b/application/models/content/Ampel_model.php
@@ -16,7 +16,7 @@ class Ampel_model extends DB_Model
 	 * 1. not after the deadline date
 	 * 2. not before the vorlaufszeit
 	 * @param bool $email If true, then only ampeln are retrieved that are marked to be sent by mail.
-	 * @return array Returns array of objects.
+	 * @return stdClass Returns array of objects.
 	 */
 	public function active($email = false)
 	{
@@ -52,7 +52,7 @@ class Ampel_model extends DB_Model
 	/**
 	 * Returns all Ampel-receiver of a specific Ampel.
 	 * @param string $benutzer_select SQL Statement which defines the Ampel-receiver.
-	 * @return array Returns array of objects with property 'uid'.
+	 * @return stdClass Returns array of objects with property 'uid'.
 	 */
 	public function execBenutzerSelect($benutzer_select)
 	{
@@ -102,19 +102,16 @@ class Ampel_model extends DB_Model
 	 * confirms Ampel by the user.
 	 * @param int $ampel_id Ampel-ID
 	 * @param string $uid UID
-	 * @return bool insert into result
+	 * @return stdClass insert into result
 	 */
 	public function confirmAmpel($ampel_id, $uid)
 	{
-		if(isset($ampel_id) && isset($uid)){
-			return $this->execQuery('
-			INSERT INTO public.tbl_ampel_benutzer_bestaetigt (ampel_id, uid)
-			VALUES (?,?);', array($ampel_id, $uid));
-		}else{
-
-			return error("parameter were missing to execute the insert into");
-		}
-		
+		if(isset($ampel_id) && isset($uid))
+            return error("parameter were missing to execute the insert into");
+        
+        return $this->execQuery('
+        INSERT INTO public.tbl_ampel_benutzer_bestaetigt (ampel_id, uid)
+        VALUES (?,?);', array($ampel_id, $uid));
 	}
 
 	/**
@@ -139,7 +136,6 @@ class Ampel_model extends DB_Model
 		$zugeteilt = getData($zugeteilt);
 
 		return success(current($zugeteilt)->zugeteilt);
-
 	}
 
 	
diff --git a/public/js/api/ampeln.js b/public/js/api/ampeln.js
index 248903415..1c8ba81a2 100644
--- a/public/js/api/ampeln.js
+++ b/public/js/api/ampeln.js
@@ -1,33 +1,18 @@
 export default {
     
-    getNonConfirmedActiveAmpeln: function () {
+    open: function () {
         return this.$fhcApi.get(
-        FHC_JS_DATA_STORAGE_OBJECT.app_root +
-        FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-        `/api/frontend/v1/Ampeln/getNonConfirmedActiveAmpeln`,{});
+        `/api/frontend/v1/Ampeln/open`,{});
     },
 
-    getAllActiveAmpeln: function () {
+    all: function () {
         return this.$fhcApi.get(
-        FHC_JS_DATA_STORAGE_OBJECT.app_root +
-        FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-        `/api/frontend/v1/Ampeln/getAllActiveAmpeln`,{});
+        `/api/frontend/v1/Ampeln/all`,{});
     },
 
-    
-
-    confirmAmpel: function (ampel_id) {
+    confirm: function (ampel_id) {
         return this.$fhcApi.get(
-        FHC_JS_DATA_STORAGE_OBJECT.app_root +
-        FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-        `/api/frontend/v1/Ampeln/confirmAmpel/${ampel_id}`,{});
-    },
-
-    alleAmpeln: function () {
-        return this.$fhcApi.get(
-        FHC_JS_DATA_STORAGE_OBJECT.app_root +
-        FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-        `/api/frontend/v1/Ampeln/alleAmpeln`,{});
+        `/api/frontend/v1/Ampeln/confirm/${ampel_id}`,{});
     },
 
 }
\ No newline at end of file
diff --git a/public/js/apps/Dashboard/Admin.js b/public/js/apps/Dashboard/Admin.js
index ad4c2cf63..49d43657f 100755
--- a/public/js/apps/Dashboard/Admin.js
+++ b/public/js/apps/Dashboard/Admin.js
@@ -1,7 +1,6 @@
 import {CoreNavigationCmpt} from '../../components/navigation/Navigation.js';
 import DashboardAdmin from '../../components/Dashboard/Admin.js';
-import Phrasen from "../../plugin/Phrasen.js"
-import FhcAlert from "../../plugin/FhcAlert.js"
+import Phrasen from "../../plugin/Phrasen.js";
 
 const app = Vue.createApp({
   data: () => ({
@@ -13,5 +12,5 @@ const app = Vue.createApp({
   }
 });
 app.config.unwrapInjectedRef = true;
-app.use(Phrasen).use(FhcAlert);
+app.use(Phrasen);
 app.mount('#main');
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index 824f03bd2..98f06f329 100755
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -1,6 +1,5 @@
 import FhcDashboard from '../../components/Dashboard/Dashboard.js';
 import Phrasen from "../../plugin/Phrasen.js"
-import FhcAlert from "../../plugin/FhcAlert.js"
 
 const app = Vue.createApp({
   data: () => ({
@@ -11,5 +10,5 @@ const app = Vue.createApp({
   }
 });
 app.config.unwrapInjectedRef = true;
-app.use(Phrasen).use(FhcAlert);
+app.use(Phrasen);
 app.mount('#content');
diff --git a/public/js/components/DashboardWidget/Ampel.js b/public/js/components/DashboardWidget/Ampel.js
index ca7442578..4cfa18d51 100755
--- a/public/js/components/DashboardWidget/Ampel.js
+++ b/public/js/components/DashboardWidget/Ampel.js
@@ -10,7 +10,6 @@ export default {
         source: '',
         allAmpeln:null,
         activeAmpeln:null,
-        isPhrasenLoaded: false,
     }),
     mixins: [
         AbstractWidget
@@ -52,12 +51,9 @@ export default {
                     default: return data;
                 }
         },
-        
-
         toggleFilter(value){
             this.filter === value ? this.filter = '' : this.filter = value;
         },
-        
         closeOffcanvasAmpeln()
         {
             for (let i = 0; i < this.ampelnComputed.length; i++)
@@ -81,19 +77,17 @@ export default {
             // maybe we also want to reset the source (open/alle) of the displayed ampeln
         },
         async fetchNonConfirmedActiveAmpeln(){
-
-            await this.$fhcApi.factory.ampeln.getNonConfirmedActiveAmpeln().then(res=>{
+            await this.$fhcApi.factory.ampeln.open().then(res=>{
                 this.activeAmpeln = res.data.sort((a,b) => new Date(b.deadline) - new Date(a.deadline));
             }); 
         },
         async fetchAllActiveAmpeln(){
-
-            await this.$fhcApi.factory.ampeln.getAllActiveAmpeln().then(res=>{
+            await this.$fhcApi.factory.ampeln.all().then(res=>{
                 this.allAmpeln = res.data.sort((a,b) => new Date(b.deadline) - new Date(a.deadline));
             }); 
         },
         async confirm(ampelId){
-            this.$fhcApi.factory.ampeln.confirmAmpel(ampelId)
+            this.$fhcApi.factory.ampeln.confirm(ampelId)
             .then(res => res.data)
             .then(result => {
                 this.$fhcAlert.alertSuccess(this.$p.t('ampeln','ampelBestaetigt'));
@@ -114,13 +108,9 @@ export default {
         }
     },
     created() {
-        this.$p.loadCategory(['ampel','ui']).then(() => {
-            this.isPhrasenLoaded = true;
-        });
         this.$emit('setConfig', false);    
     },
     async mounted() {
-        
         await this.fetchNonConfirmedActiveAmpeln();
         await this.fetchAllActiveAmpeln();
     },
diff --git a/public/js/components/DashboardWidget/Stundenplan.js b/public/js/components/DashboardWidget/Stundenplan.js
index 0b0840d73..b74095b32 100755
--- a/public/js/components/DashboardWidget/Stundenplan.js
+++ b/public/js/components/DashboardWidget/Stundenplan.js
@@ -36,7 +36,7 @@ export default {
 	},
 	created() {
 		this.$emit('setConfig', false);
-		/* axios
+		axios
 			.get(this.apiurl + '/components/Cis/Stundenplan/Stunden').then(res => {
 				res.data.retval.forEach(std => {
 					this.stunden[std.stunde] = std; // TODO(chris): geht besser
@@ -57,7 +57,7 @@ export default {
 					})
 					.catch(err => { console.log(err);console.error('ERROR: ', err.response.data) });
 			})
-			.catch(err => { console.error('ERROR: ', err.response.data) }); */
+			.catch(err => { console.error('ERROR: ', err.response.data) });
 	},
 	template: `
 	<div class="dashboard-widget-stundenplan d-flex flex-column h-100">

From 1d4f03e3f1402c4d1e3b6f7647af7fc4e91dc318 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 2 Aug 2024 08:24:57 +0200
Subject: [PATCH 1053/1461] adds single phrase

---
 public/js/components/DashboardWidget/Ampel.js |  2 +-
 system/phrasesupdate.php                      | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/public/js/components/DashboardWidget/Ampel.js b/public/js/components/DashboardWidget/Ampel.js
index 4cfa18d51..5617c5c53 100755
--- a/public/js/components/DashboardWidget/Ampel.js
+++ b/public/js/components/DashboardWidget/Ampel.js
@@ -142,7 +142,7 @@ export default {
             
             <div v-if="activeAmpeln && activeAmpeln.length == 0" class="card card-body mt-4 p-4 text-center">
                 <span class="text-success h2"><i class="fa fa-solid fa-circle-check"></i></span>
-                <span class="text-success h5">Super!</span><br>
+                <span class="text-success h5">{{$p.t('ampeln','super')}}</span><br>
                 <span class="small">{{$p.t('ampeln','noOpenAmpeln')}}</span>
             </div>
         </div>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index b34a1ade1..9182de60a 100755
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -27671,6 +27671,26 @@ array(
 			)
 		)
 	),
+    array(
+		'app' => 'core',
+		'category' => 'ampeln',
+		'phrase' => 'super',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Super!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Super!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 
 );
 

From 9dc421e789ad82a32ce99084b9b9ed63f0c3e90b Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 2 Aug 2024 08:25:53 +0200
Subject: [PATCH 1054/1461] Form Validations addStudent

---
 .../api/frontend/v1/stv/Status.php            | 647 ++++++++----------
 .../libraries/PrestudentstatusCheckLib.php    |  65 +-
 system/phrasesupdate.php                      |  19 +
 3 files changed, 316 insertions(+), 415 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index ac6d4b3aa..ad155c11d 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -44,6 +44,7 @@ class Status extends FHCAPI_Controller
 			|| $this->router->method == 'deleteStatus'
 			|| $this->router->method == 'advanceStatus'
 			|| $this->router->method == 'changeStatus'
+			|| $this->router->method == 'addStudent'
 		) {
 			$prestudent_id = current(array_slice($this->uri->rsegments, 2));
 			$this->checkPermissionsForPrestudent($prestudent_id, ['admin:rw', 'assistenz:rw']);
@@ -193,8 +194,6 @@ class Status extends FHCAPI_Controller
 		$isBerechtigtNoStudstatusCheck = $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung');
 		$isBerechtigtBasisPrestudentstatus = $this->permissionlib->isBerechtigt('basis/prestudentstatus');
 
-		//$isStudent = false;
-
 		//GET lastStatus
 		$result = $this->PrestudentstatusModel->getLastStatus($prestudent_id);
 
@@ -241,65 +240,6 @@ class Status extends FHCAPI_Controller
 		//Form Validation
 		$this->load->library('form_validation');
 
-		// $this->form_validation->set_rules('status_kurzbz', $this->p->t('lehre', 'status_kurzbz'), 
-		// [
-		// 	'required',
-		// 	//Check Reihungstest
-		// 	['reihungstest_check', function ($value) use ($prestudent_person) {
-		// 		if (!REIHUNGSTEST_CHECK)
-		// 			return true;
-		// 		if ($value != Prestudentstatus_model::STATUS_BEWERBER)
-		// 			return true;
-		// 		$result = $this->prestudentstatuschecklib->checkIfAngetreten($prestudent_person);
-		// 		return $this->getDataOrTerminateWithError($result);
-		// 	}],
-		// 	//Check ZGV
-		// 	['checkIfZGV', function ($value) use ($prestudent_person) {
-		// 		if (!ZGV_CHECK)
-		// 			return true;
-		// 		if ($value != Prestudentstatus_model::STATUS_BEWERBER)
-		// 			return true;
-		// 		$result = $this->prestudentstatuschecklib->checkIfZGVEingetragen($prestudent_person);
-		// 		return $this->getDataOrTerminateWithError($result);
-		// 	}],
-		// ], 
-
-		// [
-		// 	'reihungstest_check' => $this->p->t('lehre', 'error_keinReihungstestverfahren', ['name' => $studentName]),
-		// 	'checkIfZGV' => $this->p->t('lehre', 'error_ZGVNichtEingetragen', ['name' => $studentName]),
-		// ]);
-
-
-		// $this->form_validation->set_rules(
-		// 	'status_kurzbz', 
-		// 	$this->p->t('lehre', 'status_kurzbz'), 
-		// 	[
-		// 		'required',
-		// 		//Check Reihungstest
-		// 		['reihungstest_check', function ($value) use ($prestudent_person) {
-		// 			if (!REIHUNGSTEST_CHECK)
-		// 				return true;
-		// 			if ($value != Prestudentstatus_model::STATUS_BEWERBER)
-		// 				return true;
-		// 			$result = $this->prestudentstatuschecklib->checkIfAngetreten($prestudent_person);
-		// 			return $this->getDataOrTerminateWithError($result);
-		// 		}]
-		// 	],
-		// 	//Check Bewerberstatus
-		// 	[
-		// 		'checkIfExistingBewerberstatus', function () use ($prestudent_id, $status_kurzbz) {
-		// 		if ($status_kurzbz != Prestudentstatus_model::STATUS_AUFGENOMMENER &&
-		// 			$status_kurzbz != Prestudentstatus_model::STATUS_WARTENDER &&
-		// 			$status_kurzbz != Prestudentstatus_model::STATUS_ABGEWIESENER)
-		// 			return true;
-		// 		$result = $this->prestudentstatuschecklib->checkIfExistingBewerberstatus($prestudent_id);
-		// 		return $this->getDataOrTerminateWithError($result);
-		// 		}]
-		// 	, [
-		// 		'reihungstest_check' => $this->p->t('lehre', 'error_keinReihungstestverfahren', ['name' => $studentName]),
-		// 		'checkIfExistingBewerberstatus' => $this->p->t('lehre', 'error_keinBewerber', ['name' => $studentName]),
-		// 	]);
-
 		$this->form_validation->set_rules(
 			'status_kurzbz',
 			'Status',
@@ -369,7 +309,7 @@ class Status extends FHCAPI_Controller
 				'integer' => $this->p->t('ui', 'error_fieldNotInteger')
 			]);
 
-		//TODO(Manu) check if really necessary, sth similiar above: rolle_doesnt_exist
+		//TODO(Manu) check if really necessary, sth similiar with check rolle_doesnt_exist
 		$this->form_validation->set_rules('_default', '', [
 			//check if Rolle already exists
 			['checkIfExistingPrestudentRolle', function () use (
@@ -704,7 +644,159 @@ class Status extends FHCAPI_Controller
 
 	public function addStudent($prestudent_id)
 	{
-		//get Studiengang von prestudent_id
+
+		$isBerechtigtBasisPrestudentstatus = $this->permissionlib->isBerechtigt('basis/prestudentstatus');
+
+		//TODO(Manu) check phrase: why bewerbung?
+		if (!$isBerechtigtBasisPrestudentstatus)
+			$this->form_validation->set_rules(
+				'bewerbung_abgeschicktamum',
+				$this->p->t('lehre', 'bewerbung_abgeschickt_am'),
+				'is_null',
+				[
+					'is_null' => $this->p->t('ui', 'error_fieldWriteAccess')
+				]
+			);
+
+		//get studentname for validations
+		$this->load->model('person/Person_model', 'PersonModel');
+		$this->PersonModel->addJoin('public.tbl_prestudent', 'person_id');
+		$result = $this->PersonModel->loadWhere(['prestudent_id' => $prestudent_id]);
+		$prestudent_person = $this->getDataOrTerminateWithError($result);
+		$prestudent_person = current($prestudent_person);
+
+		$studentName = trim($prestudent_person->vorname . ' ' . $prestudent_person->nachname);
+
+		$status_kurzbz = $this->input->post('status_kurzbz');
+		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
+		$ausbildungssemester = $this->input->post('ausbildungssemester');
+
+		//Form Validation
+		$this->load->library('form_validation');
+
+		$statusgrund_id = $this->input->post('statusgrund_id');
+		$datum = $this->input->post('datum');
+
+		//Form Validation
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules(
+			'status_kurzbz',
+			'Status',
+			[
+				'required',
+				//Check Reihungstest
+				['reihungstest_check', function ($value) use ($prestudent_person) {
+					if (!REIHUNGSTEST_CHECK)
+						return true;
+					if ($value != Prestudentstatus_model::STATUS_BEWERBER)
+						return true;
+					$result = $this->prestudentstatuschecklib->checkIfAngetreten($prestudent_person);
+					return $this->getDataOrTerminateWithError($result);
+				}],
+				//Check ZGV
+				['checkIfZGV', function ($value) use ($prestudent_person) {
+					if (!ZGV_CHECK)
+						return true;
+					if ($value != Prestudentstatus_model::STATUS_BEWERBER)
+						return true;
+					$result = $this->prestudentstatuschecklib->checkIfZGVEingetragen($prestudent_person);
+					return $this->getDataOrTerminateWithError($result);
+				}],
+				//Check ZGV Master //TODO(Manu) test
+				['checkIfZGVMaster', function ($value) use ($prestudent_person) {
+					if (!ZGV_CHECK)
+						return true;
+					if ($value != Prestudentstatus_model::STATUS_BEWERBER)
+						return true;
+					$result = $this->prestudentstatuschecklib->checkIfZGVEingetragenMaster($prestudent_person);
+					return $this->getDataOrTerminateWithError($result);
+				}],
+				//Check Bewerberstatus
+				['checkIfExistingBewerberstatus', function () use ($prestudent_id, $status_kurzbz) {
+					if ($status_kurzbz != Prestudentstatus_model::STATUS_AUFGENOMMENER &&
+						$status_kurzbz != Prestudentstatus_model::STATUS_WARTENDER &&
+						$status_kurzbz != Prestudentstatus_model::STATUS_ABGEWIESENER)
+						return true;
+					$result = $this->prestudentstatuschecklib->checkIfExistingBewerberstatus($prestudent_id);
+					return $this->getDataOrTerminateWithError($result);
+				}],
+				//Check Aufgenommenerstatus
+				['checkIfExistingAufgenommenerstatus', function () use ($prestudent_id, $status_kurzbz) {
+					if ($status_kurzbz != Prestudentstatus_model::STATUS_STUDENT)
+						return true;
+					$result = $this->prestudentstatuschecklib->checkIfExistingAufgenommenerstatus($prestudent_id);
+					return $this->getDataOrTerminateWithError($result);
+				}],
+				//Check If FirstStudent
+				['check_isFirstStudStatus', function ($value) use ($prestudent_id) {
+					if ($value != Prestudentstatus_model::STATUS_STUDENT)
+						return true;
+
+					$result = $this->prestudentstatuschecklib->checkIfIsErsterStudent($prestudent_id);
+
+					return $this->getDataOrTerminateWithError($result);
+				}],
+				//Check If Existing PrestudentRolle
+				['checkIfExistingPrestudentRolle', function () use (
+					$prestudent_id,
+					$status_kurzbz,
+					$studiensemester_kurzbz,
+					$ausbildungssemester
+				) {
+					$result = $this->prestudentstatuschecklib->checkIfExistingPrestudentRolle(
+						$prestudent_id,
+						$status_kurzbz,
+						$studiensemester_kurzbz,
+						$ausbildungssemester
+					);
+					return $this->getDataOrTerminateWithError($result);
+				}]
+			],	[
+				'reihungstest_check' => $this->p->t('lehre', 'error_keinReihungstestverfahren', ['name' => $studentName]),
+				'checkIfExistingBewerberstatus' => $this->p->t('lehre', 'error_keinBewerber', ['name' => $studentName]),
+				'checkIfExistingAufgenommenerstatus' => $this->p->t('lehre', 'error_keinAufgenommener', ['name' => $studentName]),
+				'checkIfZGV' => $this->p->t('lehre', 'error_ZGVNichtEingetragen', ['name' => $studentName]),
+				'checkIfZGVMaster' => $this->p->t('lehre', 'error_ZGVMasterNichtEingetragen', ['name' => $studentName]),
+				'check_isFirstStudStatus' => $this->p->t('lehre', 'error_personBereitsStudent', ['name' => $studentName]),
+				'checkIfExistingPrestudentRolle' => $this->p->t('lehre', 'error_rolleBereitsVorhandenMitNamen', ['name' => $studentName])
+			]
+		);
+
+		$this->form_validation->set_rules('ausbildungssemester', $this->p->t('lehre', 'ausbildungssemester'), 'required|integer', [
+			'integer' => $this->p->t('ui', 'error_fieldNotInteger')
+		]);
+
+
+		$this->form_validation->set_rules('ausbildungssemester', 'Ausbildungssemester', 'integer', [
+			'integer' => $this->p->t('ui', 'error_fieldNotInteger', ['field' => 'Ausbildungssemester'])
+		]);
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		//TODO(Manu) check if necessary
+		//Das Studiensemester oder Ausbildungsemester des Bewerberstatus und des Aufgenommenenstatus passen nicht überein"
+
+		//Vor dem Studentenstatus müssen folgende Status eingetragen werden: {0}'
+		//private $_statusAbfolgeVorStudent = [self::INTERESSENT_STATUS, self::BEWERBER_STATUS, self::AUFGENOMMENER_STATUS
+
+		//getSemester of Status Aufgenommen
+		$result = $this->PrestudentstatusModel->loadWhere([
+			"prestudent_id" => $prestudent_id,
+			"status_kurzbz" => Prestudentstatus_model::STATUS_AUFGENOMMENER
+		]);
+
+		$this->PrestudentstatusModel->addLimit(1);
+		if (isError($result))
+		{
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		$semesterAufgenommen = current(getData($result));
+		$semesterAufgenommen = $semesterAufgenommen->studiensemester_kurzbz;
+
+
+		//generate Personenkennzeichen(matrikelnr)
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 		$this->PrestudentModel->addJoin('public.tbl_person p', 'ON (p.person_id = public.tbl_prestudent.person_id)');
 		$this->PrestudentModel->addJoin('public.tbl_studiengang sg', 'ON (sg.studiengang_kz = public.tbl_prestudent.studiengang_kz)');
@@ -717,329 +809,138 @@ class Status extends FHCAPI_Controller
 		$result = current(getData($result));
 
 		$stg = $result->studiengang_kz;
+		$typ = $result->typ;
 		$stgkzl = $result->kurzbz;
 		$person_id = $result->person_id;
+		$matrikelnr = false;
 
-		if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg)) {
-			$result = $this->p->t('lehre', 'error_keineSchreibrechte');
+		Events::trigger('generate_personenkennzeichen', $stg, $semesterAufgenommen, $typ, function ($value) use ($matrikelnr) {
+			$matrikelnr = $value;
+		});
+		if ($matrikelnr === false) {
+			$resultMat = $this->StudentModel->generateMatrikelnummer2($stg, $semesterAufgenommen, $typ);
+			if (isError($resultMat)) {
+				return $this->terminateWithError($resultMat, self::ERROR_TYPE_GENERAL);
+			}
+			$matrikelnr = getData($resultMat);
+		}
+		$jahr = mb_substr($semesterAufgenommen, 4, 2);
 
+		//generate UID
+		$resultUid = $this->StudentModel->generateUID($stgkzl, $jahr, $typ, $matrikelnr);
+		if (isError($resultUid)) {
+			return $this->terminateWithError(getData($resultUid), self::ERROR_TYPE_GENERAL);
+		}
+		$uidStudent = getData($resultUid);
+
+		//TODO(Manu)  Check for additional logic (config entries, addons)
+		//check include/tw/generatematrikelnr.inc.php
+		//(1) addons durchsuchen, ob eigene Logik für Matrikelnr-erstellung existiert
+		//Default: keine Matrikelnummer wird generiert
+
+		//(2) personenkz = uid
+/*		if (defined('SET_UID_AS_PERSONENKENNZEICHEN') && SET_UID_AS_PERSONENKENNZEICHEN) {
+			$matrikelnr = $uidStudent;
+		}*/
+
+		//(3) Matrikelnummer = uid
+/*		if (defined('SET_UID_AS_MATRIKELNUMMER') && SET_UID_AS_MATRIKELNUMMER) {
+			//update person
+			$result = $this->PersonModel->update(
+				[
+					'person_id' => $person_id,
+				],
+				[
+					'matr_nr' => $uidStudent,
+				]
+			);
+			if (isError($result)) {
+				return $this->terminateWithError("uidAsMatrikelnummer" . getError($result), self::ERROR_TYPE_GENERAL);
+			}
+		}*/
+
+		//add benutzerdatensatz mit Aktierungscode
+		$this->load->model('person/Benutzer_model', 'BenutzerModel');
+		$result = $this->BenutzerModel->checkIfExistingBenutzer($uidStudent);
+		if (isError($result)) {
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		if ($result->retval != "0")
+		{
+			return $this->terminateWithError($this->p->t('lehre','error_benutzerBereitsVorhanden', ['uid' => $uidStudent]), self::ERROR_TYPE_GENERAL);
+		}
+
+		$aktivierungscode = null;
+		$result = $this->BenutzerModel->generateActivationKey();
+		if (isError($result)) {
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		$aktivierungscode = getData($result);
+
+		//generate Alias
+		//TODO(Manu) check if alias already exists
+
+		$result = $this->PersonModel->generateAliasByPersonId($person_id);
+
+		if (isError($result))
+		{
+			return $this->terminateWithError(getData($result), self::ERROR_TYPE_GENERAL);
+		}
+
+		$alias = getData($result) ?: null;
+		$alias = $alias->retval[0];
+
+		$sanitizedVorname = $this->_sanitizeAliasName($alias->vorname);
+		$sanitizedNachname = $this->_sanitizeAliasName($alias->nachname);
+		$alias = $sanitizedVorname . '.' . $sanitizedNachname;
+
+		if (isError($result))
+		{
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		$result = $this->BenutzerModel->insert(
+			[
+				'person_id' => $person_id,
+				'uid' => $uidStudent,
+				'aktiv' => true,
+				'aktivierungscode' => $aktivierungscode,
+				'alias' => $alias,
+				'insertvon' => getAuthUID(),
+				'insertamum' => date('c'),
+			]
+		);
+
+		if (isError($result)) {
 			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
 
-		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+		//Student anlegen
+		$result = $this->StudentModel->insert(
+			[
+				'student_uid' => $uidStudent,
+				'prestudent_id' => $prestudent_id,
+				'matrikelnr' => $matrikelnr,
+				'studiengang_kz' => $stg,
+				'semester' => $ausbildungssemester,
+				'verband' => '',
+				'gruppe' => '',
+				'insertvon' => getAuthUID(),
+				'insertamum' => date('c')
+			]
+		);
+		if (isError($result))
+		{
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
 
-		$uid = getAuthUID();
-		$status_kurzbz = $this->input->post('status_kurzbz');
-		$ausbildungssemester = $this->input->post('ausbildungssemester');
-		$bestaetigtam = $this->input->post('bestaetigtam');
-		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
-		$bestaetigtvon = $uid;
-		$studienplan_id = $this->input->post('studienplan_id');
-		$statusgrund_id = $this->input->post('statusgrund_id');
-
-		//Form Validation
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('ausbildungssemester', 'Ausbildungssemester', 'integer', [
-			'integer' => $this->p->t('ui', 'error_fieldNotInteger', ['field' => 'Ausbildungssemester'])
-		]);
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		//GET lastStatus
-		$result = $this->PrestudentstatusModel->getLastStatus($prestudent_id);
+		$this->load->library('PrestudentLib');
+		$result = $this->prestudentlib->setFirstStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id, date('c'), getAuthUID(), $stg, $uidStudent);
 
 		if (isError($result)) {
 			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		} elseif (!hasData($result)) {
-			$lastStatusData = [];
 		} else
-			$lastStatusData = current(getData($result));
+			$this->terminateWithSuccess($prestudent_id);
 
-		//check if studentrolle already exists
-		$this->load->model('crm/Student_model', 'StudentModel');
-		$result = $this->StudentModel->checkIfExistingStudentRolle($prestudent_id);
-		if (isError($result)) {
-			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-		if ($result->retval == "0") {
-			$isStudent = false;
-		} else
-			$isStudent = true;
-
-
-		//TODO(manu) check if for ersterStudent and Student
-		if(REIHUNGSTEST_CHECK)
-		{
-			if($status_kurzbz==Prestudentstatus_model::STATUS_BEWERBER)
-			{
-				$result = $this->prestudentstatuschecklib->checkIfAngetreten($prestudent_id);
-				if (isError($result))
-				{
-					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-				}
-			}
-		}
-
-		//Check ZGV
-		if(!defined("ZGV_CHECK") || ZGV_CHECK)
-		{
-			if($status_kurzbz==Prestudentstatus_model::STATUS_BEWERBER)
-			{
-				$result = $this->prestudentstatuschecklib->checkIfZGVEingetragen($prestudent_id);
-				if (isError($result))
-				{
-					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-				}
-			}
-		}
-
-
-		//Check ZGV-Master
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-		$result = $this->StudiengangModel->load([
-			'studiengang_kz'=> $stg
-		]);
-		if(isError($result))
-		{
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJson(getError($result));
-		}
-		$result = current(getData($result));
-		$typ = $result->typ;
-		//$stgkzl = $result->kurzbz;
-
-		if(!defined("ZGV_CHECK") || ZGV_CHECK)
-		{
-			if($status_kurzbz==Prestudentstatus_model::STATUS_BEWERBER && $typ=='m')
-			{
-				$result = $this->prestudentstatuschecklib->checkIfZGVEingetragen($prestudent_id, $typ);
-				if (isError($result))
-				{
-					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-				}
-			}
-		}
-
-		//check if bewerberstatus exists
-		if($status_kurzbz == Prestudentstatus_model::STATUS_AUFGENOMMENER || $status_kurzbz == Prestudentstatus_model::STATUS_WARTENDER ||$status_kurzbz == Prestudentstatus_model::STATUS_STUDENT)
-		{
-
-			$result = $this->prestudentstatuschecklib->checkIfExistingBewerberstatus($prestudent_id);
-			if (isError($result))
-			{
-				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			}
-		}
-
-		$isBerechtigtNoStudstatusCheck =  $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung');
-
-		if(!$isBerechtigtNoStudstatusCheck) {
-			//Block STATUSCHECKS
-			$new_status_datum = isset($datum) ? $datum : date('Y-m-d');
-
-			$result = $this->prestudentstatuschecklib->checkStatusAdd(
-				$prestudent_id,
-				$status_kurzbz,
-				$studiensemester_kurzbz,
-				$new_status_datum,
-				$ausbildungssemester,
-				$studienplan_id
-			);
-
-			if (isError($result)) {
-				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			}
-
-			//TODO(manu) check Berechtigung
-			//check if Bismeldestichtag erreicht ADDNEW status
-			$result = $this->prestudentstatuschecklib->checkIfMeldestichtagErreicht($new_status_datum, $studiensemester_kurzbz);
-
-			if (isError($result)) {
-				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			}
-		}
-
-		if(!$isStudent)
-		{
-			//checkIf Kaution bezahlt
-			//TODO(Manu)
-
-			//check if Aufgenommenener Status
-			$result = $this->prestudentstatuschecklib->checkIfExistingAufgenommenerstatus($prestudent_id);
-			if (isError($result)) {
-				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			}
-
-			//getSemester of Status Aufgenommen
-			$result = $this->PrestudentstatusModel->loadWhere([
-				"prestudent_id" => $prestudent_id,
-				"status_kurzbz" => Prestudentstatus_model::STATUS_AUFGENOMMENER
-			]);
-			//$this->PrestudentstatusModel->addOrder('ausbildungssemester', 'DESC');
-			$this->PrestudentstatusModel->addLimit(1);
-			if (isError($result))
-			{
-				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			}
-			$semesterAufgenommen = current(getData($result));
-			$semesterAufgenommen = $semesterAufgenommen->studiensemester_kurzbz;
-
-
-			//generate Personenkennzeichen(matrikelnr)
-			$matrikelnr = false;
-			Events::trigger('generate_personenkennzeichen', $stg, $semesterAufgenommen, $typ, function ($value) use ($matrikelnr) {
-				$matrikelnr = $value;
-			});
-			if ($matrikelnr === false) {
-				$resultMat = $this->StudentModel->generateMatrikelnummer2($stg, $semesterAufgenommen, $typ);
-				if (isError($resultMat)) {
-					return $this->terminateWithError($resultMat, self::ERROR_TYPE_GENERAL);
-				}
-				$matrikelnr = getData($resultMat);
-			}
-			$jahr = mb_substr($semesterAufgenommen, 4, 2);
-
-			//generate UID
-			$resultUid = $this->StudentModel->generateUID($stgkzl, $jahr, $typ, $matrikelnr);
-			if (isError($resultMat)) {
-				return $this->terminateWithError(getData($resultUid), self::ERROR_TYPE_GENERAL);
-			}
-			$uidStudent = getData($resultUid);
-
-			//Check for additional logic (config entries, addons)
-			//TODO(Manu) check include/tw/generatematrikelnr.inc.php
-			//(1) addons durchsuchen, ob eigene Logik für Matrikelnr-erstellung existiert
-			//Default: keine Matrikelnummer wird generiert
-
-			//(2) personenkz = uid
-			if (defined('SET_UID_AS_PERSONENKENNZEICHEN') && SET_UID_AS_PERSONENKENNZEICHEN) {
-				$matrikelnr = $uidStudent;
-			}
-
-			//(3) Matrikelnummer = uid
-			if (defined('SET_UID_AS_MATRIKELNUMMER') && SET_UID_AS_MATRIKELNUMMER) {
-				//update person
-				$result = $this->PersonModel->update(
-					[
-						'person_id' => $person_id,
-					],
-					[
-						'matr_nr' => $uidStudent,
-					]
-				);
-				if (isError($result)) {
-					return $this->terminateWithError("uidAsMatrikelnummer" . getError($result), self::ERROR_TYPE_GENERAL);
-				}
-			}
-
-			//add benutzerdatensatz mit Aktierungscode
-			$this->load->model('person/Benutzer_model', 'BenutzerModel');
-			$result = $this->BenutzerModel->checkIfExistingBenutzer($uidStudent);
-			if (isError($result)) {
-				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			}
-			if ($result->retval != "0")
-			{
-				return $this->terminateWithError($this->p->t('lehre','error_benutzerBereitsVorhanden', self::ERROR_TYPE_GENERAL));
-			}
-
-			$aktivierungscode = null;
-			$result = $this->BenutzerModel->generateActivationKey();
-			if (isError($result)) {
-				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			}
-			$aktivierungscode = getData($result);
-
-			//generate Alias
-			//TODO(Manu) check if alias already exists
-
-			$result = $this->PersonModel->generateAliasByPersonId($person_id);
-
-			if (isError($result))
-			{
-				return $this->terminateWithError(getData($result), self::ERROR_TYPE_GENERAL);
-			}
-
-			$alias = getData($result) ?: null;
-			$alias = $alias->retval[0];
-
-			$sanitizedVorname = $this->_sanitizeAliasName($alias->vorname);
-			$sanitizedNachname = $this->_sanitizeAliasName($alias->nachname);
-			$alias = $sanitizedVorname . '.' . $sanitizedNachname;
-
-			if (isError($result))
-			{
-				return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-			}
-			$result = $this->BenutzerModel->insert(
-				[
-					'person_id' => $person_id,
-					'uid' => $uidStudent,
-					'aktiv' => true,
-					'aktivierungscode' => $aktivierungscode,
-					'alias' => $alias,
-					'insertvon' => $uid,
-					'insertamum' => date('c'),
-				]
-			);
-
-			if (isError($result)) {
-				return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-			}
-
-			//Student anlegen
-			$result = $this->StudentModel->insert(
-				[
-					'student_uid' => $uidStudent,
-					'prestudent_id' => $prestudent_id,
-					'matrikelnr' => $matrikelnr,
-					'studiengang_kz' => $stg,
-					'semester' => $ausbildungssemester,
-					'verband' => '',
-					'gruppe' => '',
-					'insertvon' => $uid,
-					'insertamum' => date('c')
-				]
-			);
-			if (isError($result))
-			{
-				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			}
-
-			$this->load->library('PrestudentLib');
-			$result = $this->prestudentlib->setFirstStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id, $bestaetigtam, $bestaetigtvon, $stg, $uidStudent);
-
-			if (isError($result)) {
-				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			} else
-				$this->terminateWithSuccess($prestudent_id);
-
-		}
-		//if not ersterStudent
-		else
-		{
-			//check if studentrolle already exists
-			if($status_kurzbz == Prestudentstatus_model::STATUS_STUDENT || $status_kurzbz == Prestudentstatus_model::STATUS_DIPLOMAND || $lastStatusData->status_kurzbz == Prestudentstatus_model::STATUS_STUDENT)
-			{
-				$result = $this->prestudentstatuschecklib->checkIfExistingStudentRolle($prestudent_id);
-				if (isError($result))
-				{
-					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-				}
-			} // NOTE(chris): this does not do anything since $isStudent did the same thing and returned positive success
-
-			$this->load->library('PrestudentLib');
-			$result = $this->prestudentlib->setStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id, $bestaetigtam, $bestaetigtvon);
-
-			if (isError($result))
-			{
-				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			}
-			else
-				$this->terminateWithSuccess($prestudent_id);
-		}
 	}
 
 	public function loadStatus()
diff --git a/application/libraries/PrestudentstatusCheckLib.php b/application/libraries/PrestudentstatusCheckLib.php
index ed9b0dd69..27bbc4194 100644
--- a/application/libraries/PrestudentstatusCheckLib.php
+++ b/application/libraries/PrestudentstatusCheckLib.php
@@ -165,9 +165,6 @@ class PrestudentstatusCheckLib
 	public function checkIfZGVEingetragen($prestudent_person)
 	{
 		return success((boolean)$prestudent_person->zgv_code);
-		return !!$prestudent_person->zgv_code;
-		//return success(false);
-		//return error(false);
 	}
 
 	/**
@@ -197,7 +194,7 @@ class PrestudentstatusCheckLib
 	 * Checks if a bewerber status already exists.
 	 *
 	 * @param integer $prestudent_id
-	 * *
+	 * 
 	 * @return stdClass
 	 */
 	public function checkIfExistingBewerberstatus($prestudent_id)
@@ -214,19 +211,13 @@ class PrestudentstatusCheckLib
 
 	/**
 	 * Checks if status aufgenommen already exists.
-	 * @return error if invalid
-	 * @return error if no status Aufgenommen, success otherwise
+	 *
+	 * @param integer $prestudent_id
+	 * 
+	 *  @return stdClass
 	 */
 	public function checkIfExistingAufgenommenerstatus($prestudent_id)
 	{
-		$result =  $this->_getApplicationData($prestudent_id);
-		if(isError($result))
-		{
-			return getData($result);
-		}
-		$result =  current(getData($result));
-		$studentName = trim ($result->vorname.' '.$result->nachname);
-
 		$result =  $this->_ci->PrestudentstatusModel->checkIfExistingAufgenommenerstatus(
 			$prestudent_id
 		);
@@ -234,11 +225,24 @@ class PrestudentstatusCheckLib
 		{
 			return getData($result);
 		}
-		if(getData($result) == "0")
-		{
-			return error($this->_ci->p->t('lehre','error_keinAufgenommener', ['name' => $studentName]));
-		}
-		return success(getData($result));
+		return success(getData($result) != '0');
+	}
+
+	/**
+	 * Checks if is the first student Status
+	 *
+	 * @param integer				$prestudent_id
+	 *
+	 * @return stdClass
+	 */
+	public function checkIfIsErsterStudent($prestudent_id)
+	{
+		$result = $this->_ci->StudentModel->checkIfExistingStudentRolle($prestudent_id);
+
+		if (isError($result))
+			return $result;
+
+		return success(getData($result) == '0');
 	}
 
 	/**
@@ -910,27 +914,4 @@ class PrestudentstatusCheckLib
 		return $resultPs;
 	}
 
-
-
-
-	/**
-	 * Provides Application Data
-	 * @param integer $prestudent_id
-	 * @return error if not valid, array with ApplicationData if valid
-	 */
-	private function _getApplicationData($prestudent_id)
-	{
-		$this->_ci->PrestudentModel->addJoin('public.tbl_person p', 'ON (p.person_id = public.tbl_prestudent.person_id)');
-
-		$result = $this->_ci->PrestudentModel->load([
-			'prestudent_id'=> $prestudent_id,
-		]);
-		if(isError($result))
-		{
-			return getData($result);
-		}
-
-		return $result;
-	}
-
 }
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 3d6cc87e0..69773fef3 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -28037,6 +28037,25 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'error_personBereitsStudent',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '{name}: Diese Person ist bereits Student!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '{name}: This person already is student!',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'lehre',

From 2de307682cc4296854da3e11e0522a7c87e65abd Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 2 Aug 2024 09:26:39 +0200
Subject: [PATCH 1055/1461] convert identation to tabs

---
 public/js/components/Dashboard/Item.js | 270 ++++++++++++-------------
 1 file changed, 135 insertions(+), 135 deletions(-)

diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index 7e6134f75..484171857 100755
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -2,139 +2,139 @@ import BsModal from "../Bootstrap/Modal.js";
 import CachedWidgetLoader from "../../composables/Dashboard/CachedWidgetLoader.js";
 
 export default {
-    components: {
-        BsModal,
-    },
-    data: () => ({
-        component: "",
-        arguments: null,
-        target: false,
-        widget: null,
-        tmpConfig: {},
-        isLoading: false,
-        hasConfig: true,
-        sharedData: null,
-    }),
-    emits: [
-        "change",
-        "remove",
-        "dragstart",
-        "resizestart"
-    ],
-    props: [
-        "id",
-        "config",
-        "width",
-        "height",
-        "custom",
-        "hidden",
-        "editMode",
-        "loading",
-    ],
-    computed: {
-        isResizeable() {
-            if (!this.widget) return false;
-            return this.widget.setup.width.max || this.widget.setup.height.max;
-        },
-        ready() {
-            return this.component && this.arguments !== null;
-        },
-    },
-    methods: {
-        mouseDown(e) {
-            this.target = e.target;
-        },
-        startDrag(e) {
-            if (this.$refs.dragHandle.contains(this.target)) {
-                this.$emit("dragstart", e);
-            } else if (
-                this.isResizeable &&
-                this.$refs.resizeHandle.contains(this.target)
-            ) {
-                if (this.isResizeable) this.$emit("resizestart", e);
-                else e.preventDefault();
-            } else {
-                e.preventDefault();
-            }
-        },
-        openConfig() {
-            this.tmpConfig = { ...this.arguments };
-            this.$refs.config.show();
-        },
-        setConfig(hasConfig) {
-            this.hasConfig = hasConfig;
-        },
-        changeConfig() {
-            this.isLoading = true;
-            let config = { ...this.tmpConfig };
-            this.sendChangeConfig(config);
-        },
-        changeConfigManually() {
-            let config = { ...this.arguments };
-            this.sendChangeConfig(config);
-        },
-        sendChangeConfig(config) {
-            for (var k in config) {
-                if (this.widget.arguments[k] == config[k]) {
-                delete config[k];
-                }
-            }
-            this.$emit("change", config);
-        },
-    },
-    watch: {
-        config() {
-            this.arguments = { ...this.widget.arguments, ...this.config };
-            this.tmpConfig = { ...this.arguments };
-            this.$refs.config.hide();
-            this.isLoading = false;
-        },
-    },
-    async created() {
-        this.widget = await CachedWidgetLoader.loadWidget(this.id);
-        let component = (await import("../" + this.widget.setup.file)).default;
-        this.$options.components["widget" + this.widget.widget_id] = component;
-        this.component = "widget" + this.widget.widget_id;
-        this.arguments = { ...this.widget.arguments, ...this.config };
-        this.tmpConfig = { ...this.arguments };
-    },
-    template: /*html*/ `
-    <div v-if="loading">
-        <div class="d-flex justify-content-center align-items-center h-100">
-            <i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
-        </div>
-    </div>
-    <div v-else-if="!hidden || editMode" class="dashboard-item card overflow-hidden h-100" :class="arguments && arguments.className ? arguments.className : ''">
-        <div v-if="editMode && widget" class="card-header d-flex ps-0 pe-2">
-            <span drag-action="move" class="col-auto mx-2 px-2 cursor-move"><i class="fa-solid fa-grip-vertical"></i></span>
-            <span class="col">{{ widget.setup.name }}</span>
-            <a v-if="hasConfig" class="col-auto px-1" href="#" @click.prevent="openConfig"><i class="fa-solid fa-gear"></i></a>
-            <a v-if="custom" class="col-auto px-1" href="#" @click.prevent="$emit('remove')">
-                <i class="fa-solid fa-trash"></i>
-            </a>
-            <div v-else class="col-auto px-1 form-switch">
-                <input class="form-check-input ms-0" type="checkbox" role="switch" id="flexSwitchCheckChecked" :checked="!hidden" @input="$emit('remove', hidden)">
-            </div>
-        </div>
-        <div v-if="ready" class="card-body overflow-hidden">
-            <component :is="component" v-model:shared-data="sharedData" :config="arguments" :width="width" :height="height" @setConfig="setConfig" @change="changeConfigManually"></component>
-        </div>
-        <div v-else class="card-body overflow-hidden text-center d-flex flex-column justify-content-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></div>
-        <bs-modal ref="config">
-            <template v-slot:title>
-                {{ widget ? 'Config for ' + widget.setup.name : '' }}
-            </template>
-            <template v-slot:default>
-                <component v-if="ready && !isLoading" :is="component" v-model:shared-data="sharedData" :config="tmpConfig" @change="changeConfig" :configMode="true"></component>
-                <div v-else class="text-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></div>
-            </template>
-            <template v-if="!widget?.setup?.hideFooter" v-slot:footer>
-                <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
-                <button type="button" class="btn btn-primary" @click="changeConfig">Save changes</button>
-            </template>
-        </bs-modal>
-        <div v-if="editMode && isResizeable" class="card-footer d-flex justify-content-end p-0">
-            <span drag-action="resize" class="col-auto px-1 cursor-nw-resize"><i class="fa-solid fa-up-right-and-down-left-from-center mirror-x"></i></span>
-        </div>
-    </div>`,
+	components: {
+		BsModal,
+	},
+	data: () => ({
+		component: "",
+		arguments: null,
+		target: false,
+		widget: null,
+		tmpConfig: {},
+		isLoading: false,
+		hasConfig: true,
+		sharedData: null,
+	}),
+	emits: [
+		"change",
+		"remove",
+		"dragstart",
+		"resizestart"
+	],
+	props: [
+		"id",
+		"config",
+		"width",
+		"height",
+		"custom",
+		"hidden",
+		"editMode",
+		"loading",
+	],
+	computed: {
+		isResizeable() {
+			if (!this.widget) return false;
+			return this.widget.setup.width.max || this.widget.setup.height.max;
+		},
+		ready() {
+			return this.component && this.arguments !== null;
+		},
+	},
+	methods: {
+		mouseDown(e) {
+			this.target = e.target;
+		},
+		startDrag(e) {
+			if (this.$refs.dragHandle.contains(this.target)) {
+				this.$emit("dragstart", e);
+			} else if (
+				this.isResizeable &&
+				this.$refs.resizeHandle.contains(this.target)
+			) {
+				if (this.isResizeable) this.$emit("resizestart", e);
+				else e.preventDefault();
+			} else {
+				e.preventDefault();
+			}
+		},
+		openConfig() {
+			this.tmpConfig = { ...this.arguments };
+			this.$refs.config.show();
+		},
+		setConfig(hasConfig) {
+			this.hasConfig = hasConfig;
+		},
+		changeConfig() {
+			this.isLoading = true;
+			let config = { ...this.tmpConfig };
+			this.sendChangeConfig(config);
+		},
+		changeConfigManually() {
+			let config = { ...this.arguments };
+			this.sendChangeConfig(config);
+		},
+		sendChangeConfig(config) {
+			for (var k in config) {
+				if (this.widget.arguments[k] == config[k]) {
+				delete config[k];
+				}
+			}
+			this.$emit("change", config);
+		},
+	},
+	watch: {
+		config() {
+			this.arguments = { ...this.widget.arguments, ...this.config };
+			this.tmpConfig = { ...this.arguments };
+			this.$refs.config.hide();
+			this.isLoading = false;
+		},
+	},
+	async created() {
+		this.widget = await CachedWidgetLoader.loadWidget(this.id);
+		let component = (await import("../" + this.widget.setup.file)).default;
+		this.$options.components["widget" + this.widget.widget_id] = component;
+		this.component = "widget" + this.widget.widget_id;
+		this.arguments = { ...this.widget.arguments, ...this.config };
+		this.tmpConfig = { ...this.arguments };
+	},
+	template: /*html*/ `
+	<div v-if="loading">
+		<div class="d-flex justify-content-center align-items-center h-100">
+			<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
+		</div>
+	</div>
+	<div v-else-if="!hidden || editMode" class="dashboard-item card overflow-hidden h-100" :class="arguments && arguments.className ? arguments.className : ''">
+		<div v-if="editMode && widget" class="card-header d-flex ps-0 pe-2">
+			<span drag-action="move" class="col-auto mx-2 px-2 cursor-move"><i class="fa-solid fa-grip-vertical"></i></span>
+			<span class="col">{{ widget.setup.name }}</span>
+			<a v-if="hasConfig" class="col-auto px-1" href="#" @click.prevent="openConfig"><i class="fa-solid fa-gear"></i></a>
+			<a v-if="custom" class="col-auto px-1" href="#" @click.prevent="$emit('remove')">
+				<i class="fa-solid fa-trash"></i>
+			</a>
+			<div v-else class="col-auto px-1 form-switch">
+				<input class="form-check-input ms-0" type="checkbox" role="switch" id="flexSwitchCheckChecked" :checked="!hidden" @input="$emit('remove', hidden)">
+			</div>
+		</div>
+		<div v-if="ready" class="card-body overflow-hidden">
+			<component :is="component" v-model:shared-data="sharedData" :config="arguments" :width="width" :height="height" @setConfig="setConfig" @change="changeConfigManually"></component>
+		</div>
+		<div v-else class="card-body overflow-hidden text-center d-flex flex-column justify-content-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></div>
+		<bs-modal ref="config">
+			<template v-slot:title>
+				{{ widget ? 'Config for ' + widget.setup.name : '' }}
+			</template>
+			<template v-slot:default>
+				<component v-if="ready && !isLoading" :is="component" v-model:shared-data="sharedData" :config="tmpConfig" @change="changeConfig" :configMode="true"></component>
+				<div v-else class="text-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></div>
+			</template>
+			<template v-if="!widget?.setup?.hideFooter" v-slot:footer>
+				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
+				<button type="button" class="btn btn-primary" @click="changeConfig">Save changes</button>
+			</template>
+		</bs-modal>
+		<div v-if="editMode && isResizeable" class="card-footer d-flex justify-content-end p-0">
+			<span drag-action="resize" class="col-auto px-1 cursor-nw-resize"><i class="fa-solid fa-up-right-and-down-left-from-center mirror-x"></i></span>
+		</div>
+	</div>`,
 };

From 9e1bd2b64d89625f7602d58092849b96faa9ea80 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 2 Aug 2024 10:36:34 +0200
Subject: [PATCH 1056/1461] adds form_validation

---
 .../api/frontend/v1/Stundenplan.php           | 139 ++++--------------
 public/js/api/fhcapifactory.js                |   2 +-
 2 files changed, 26 insertions(+), 115 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 37b384630..614f02919 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -18,11 +18,6 @@
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
-/**
- * This controller operates between (interface) the JS (GUI) and the SearchBarLib (back-end)
- * Provides data to the ajax get calls about the searchbar component
- * This controller works with JSON calls on the HTTP GET and the output is always JSON
- */
 class Stundenplan extends FHCAPI_Controller
 {
 
@@ -46,32 +41,48 @@ class Stundenplan extends FHCAPI_Controller
 			'dbLogType' => 'API', // required
 			'dbExecuteUser' => 'RESTful API'
 		));
+
+        $this->load->library('form_validation');
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods
 
+    /**
+     * fetches Stunden layout from database
+     * @access public
+     * 
+     */
     public function Stunden()
 	{
 		$this->load->model('ressource/Stunde_model', 'StundeModel');
 
-		$result = $this->StundeModel->load();
+		$stunden = $this->StundeModel->load();
 
-		if (isError($result))
-			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+        $stunden = $this->getDataOrTerminateWithError($stunden);
 
-		$this->terminateWithSuccess(getData($result));
+		$this->terminateWithSuccess($stunden);
 	}
-    
-	/**
-	 * Gets a JSON body via HTTP POST and provides the parameters
-	 */
+
+    /**
+     * fetches room events from a certain date
+     * @access public
+     * 
+     */
 	public function roomInformation()
 	{
        
         $this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
 		$this->load->model('ressource/Stunde_model', 'StundeModel');
-
+		
+        // form validation
+        $this->load->library('form_validation');
+        $this->form_validation->set_data($_GET);
+        $this->form_validation->set_rules('ort_kurzbz',"Ort","required");
+        $this->form_validation->set_rules('start_date',"start_date","required");
+        $this->form_validation->set_rules('end_date',"end_date","required");
+        if($this->form_validation->run() === FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array()); 
+        
         // storing the get parameter in local variables
         $ort_kurzbz = $this->input->get('ort_kurzbz', TRUE);
         $start_date = $this->input->get('start_date', TRUE);
@@ -106,106 +117,6 @@ class Stundenplan extends FHCAPI_Controller
             }
         }
 
-        // this is the old way the events were grouped, kept in case that the query doesnt work out as expected
-        /* 
-        $final_events = array();
-        $grouped = array();
-        $associative_day_events = $this->filterEventsIntoAssociativeDateArray($result, $start_date, $end_date);
-        foreach($associative_day_events as $date => $day_events ){
-            
-            foreach($stunden as $stunde){
-
-                // filtering all the events at the same hour of the day
-                $stunden_events = array_filter($day_events, function($entry) use ($stunde){
-                    return $entry->stunde == $stunde->stunde;
-                });
-
-                $lehrverband_array = array();
-
-                // for loop that is just used to fill the lehrverband_array
-                foreach($stunden_events as $key=>$stunden_event){
-
-                    // lehrverband bestimmen
-                    if(strlen($stunden_event->gruppe_kurzbz)>0){
-                        $lehrverband = $stunden_event->gruppe_kurzbz;
-                    }else{
-                        $lehrverband=$stunden_event->stg_typ . $stunden_event->stg_kurzbz .'-'.$stunden_event->semester;
-                        // checks whether the verband is not null, '' or '0'
-                        if($stunden_event->verband !=null && $stunden_event->verband != '0' && $stunden_event->verband != ''){ 
-                            $lehrverband.=$stunden_event->verband;
-                            // if gruppe is not set it will concatenate nothing but it is only appended if the verband is set
-                            $lehrverband.=$stunden_event->gruppe;
-                        }
-                    }
-                    $lehrverband_array[$key] = $lehrverband;
-                }
-                
-                // compare nested loop start
-                foreach($stunden_events as $event_key => $stunden_event){
-                    
-                    // skip the loop iteration if the event was already grouped
-                    if(isset($grouped[$event_key])){
-                        continue;
-                    }
-                     
-                    // lektor bestimmen
-                    if($stunden_event->mitarbeiter_kurzbz != null){
-                        $stunden_events[$event_key]->lektor = $stunden_event->mitarbeiter_kurzbz;
-                    }
-
-                    // lehrfach bestimmen
-                    if(isset($stunden_event->lehrform)){
-                        $stunden_events[$event_key]->lehrfach .= '-'.$stunden_event->lehrform;
-                    }
-                    
-                    // GRUPIEREN DER GLEICHEN EVENTS
-                    // vergleiche das aktuelle Event mit allen anderen Events die am gleichen Tag und zur gleichen Stunde gehalten werden
-                    foreach($stunden_events as $compare_key => $stunden_event_compare){
-                        
-                        if($compare_key != $event_key){
-                            
-                            // will be used to skip the loop iteration with this index because it was already grouped
-                            $grouped[$compare_key] = TRUE;
-
-                            // can the events be grouped?
-                           if ( 
-                                // the unr's have to be equal to be grouped
-                                $stunden_event->unr==$stunden_event_compare->unr && 
-                                // and either the lektor or the ort_kurzbz have to be equal
-                                ($stunden_event->ort_kurzbz==$stunden_event_compare->ort_kurzbz 
-                                || $stunden_event->lektor==$stunden_event_compare->lektor)
-                           )
-                                {
-                                    // Bezeichnung des Events zusammenfuehren
-                                    // group the events properties if they are groupable
-
-                                    //Lektoren
-                                    if(!mb_strstr($stunden_event->lektor,$stunden_event_compare->lektor)){
-                                        $stunden_events[$event_key]->lektor = $stunden_event->lektor . ' \ ' . $stunden_event_compare->lektor;
-                                        $stunden_events[$event_key]->mitarbeiter_kurzbz = $stunden_event->mitarbeiter_kurzbz . ' \ ' . $stunden_event_compare->mitarbeiter_kurzbz;
-                                    }
-
-                                    //Ort
-                                    if(!mb_strstr($stunden_event->ort_kurzbz,$stunden_event_compare->ort_kurzbz)){
-                                        $stunden_events[$event_key]->ort_kurzbz = $stunden_event->ort_kurzbz . ' \ ' . $stunden_event_compare->ort_kurzbz;
-                                    }
-
-                                    //Lehrverband
-                                    if(!mb_strstr($lehrverband_array[$event_key],$lehrverband_array[$compare_key])){
-                                         $lehrverband_array[$event_key] .= ' / ' . $lehrverband_array[$compare_key];
-                                    }
-
-                                }
-                        }
-                    }
-
-                    // add the grouped lehrverband entry to the event
-                    $stunden_events[$event_key]->stg = $lehrverband_array[$event_key];
-                    $final_events[] = $stunden_events[$event_key];
-                }
-            }
-        } */     
-        
 		$this->terminateWithSuccess($result);
 		
 	}
diff --git a/public/js/api/fhcapifactory.js b/public/js/api/fhcapifactory.js
index f8e088ff9..65bde56fd 100644
--- a/public/js/api/fhcapifactory.js
+++ b/public/js/api/fhcapifactory.js
@@ -31,6 +31,6 @@ export default {
     filter,
     studstatus,
     profil,
-    profilUpdate,,
+    profilUpdate,
     stundenplan,
 };

From e6ba29154959f89d3b64165afd5b1897cdec2fd5 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 2 Aug 2024 11:00:11 +0200
Subject: [PATCH 1057/1461] adds the translation of the beschreibung and the
 buttontext in the Ampel_model and not in the Ampel controller

---
 .../controllers/api/frontend/v1/Ampeln.php    | 28 +------------------
 application/core/DB_Model.php                 |  2 ++
 application/models/content/Ampel_model.php    | 16 +++++++++--
 3 files changed, 17 insertions(+), 29 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Ampeln.php b/application/controllers/api/frontend/v1/Ampeln.php
index debdb917d..19f465a11 100644
--- a/application/controllers/api/frontend/v1/Ampeln.php
+++ b/application/controllers/api/frontend/v1/Ampeln.php
@@ -91,7 +91,7 @@ class Ampeln extends FHCAPI_Controller
 
                 $zugeteilt = $this->getDataOrTerminateWithError($zugeteilt);
 
-                if($zugeteilt) $userAmpeln[] = $this->translateAmpel($ampel);
+                if($zugeteilt) $userAmpeln[] = $ampel;
             }
         }
         
@@ -150,33 +150,7 @@ class Ampeln extends FHCAPI_Controller
 
     }
 
-    //------------------------------------------------------------------------------------------------------------------
-	// Private methods
-    
-    /**
-	 * translate ampel description and button text
-     * @access private
-	 * 
-	 */
-    public function translateAmpel($ampel){
 
-        // fetch user language 
-        $userLanguage = getUserLanguage();
-        
-        $userLanguage = $this->SpracheModel->loadWhere(["sprache" => $userLanguage]);
-        
-        $userLanguage = $this->getDataOrTerminateWithError($userLanguage)[0]->index - 1; // why does the index start at 1?
-
-        // translate the ampel description and button text
-        if(isset($ampel->beschreibung) && count($ampel->beschreibung)>=($userLanguage+1)) 
-        $ampel->beschreibung = $ampel->beschreibung[$userLanguage];
-        
-        if(isset($ampel->buttontext) && count($ampel->buttontext)>=($userLanguage+1)) 
-        $ampel->buttontext = $ampel->buttontext[$userLanguage];
-
-        return $ampel;
-
-    }
 
     
 }
diff --git a/application/core/DB_Model.php b/application/core/DB_Model.php
index 901587893..86f8f57b2 100755
--- a/application/core/DB_Model.php
+++ b/application/core/DB_Model.php
@@ -94,6 +94,8 @@ class DB_Model extends CI_Model
 		$this->load->library('UDFLib');
 		// Loads the logs library
 		$this->load->library('LogLib');
+
+		
 	}
 
 	// ------------------------------------------------------------------------------------------
diff --git a/application/models/content/Ampel_model.php b/application/models/content/Ampel_model.php
index 7c3bf1900..dfdbc668e 100755
--- a/application/models/content/Ampel_model.php
+++ b/application/models/content/Ampel_model.php
@@ -20,9 +20,12 @@ class Ampel_model extends DB_Model
 	 */
 	public function active($email = false)
 	{
+		
+		$userLanguage = getUserLanguage();
+
 		$parametersArray = null;
 		$query = '
-			SELECT *
+			SELECT *, beschreibung[('.$this->getLanguageIndex($this->escape($userLanguage)).')], buttontext[('. $this->getLanguageIndex($this->escape($userLanguage)).')]
 			  FROM public.tbl_ampel
 			 WHERE';
 
@@ -142,6 +145,7 @@ class Ampel_model extends DB_Model
 
 
 	function alleAmpeln($uid){
+		$userLanguage = getUserLanguage();
 
 		$zugeteile_ampeln = [];
 		
@@ -154,7 +158,7 @@ class Ampel_model extends DB_Model
 		$benutzerStartDate = $datum->mktime_fromdate(date(current(getData($benutzerStartDate))->insertamum));
 
 		$allAmpeln = $this->execReadOnlyQuery("
-			SELECT * FROM 
+			SELECT *, beschreibung[('.$this->getLanguageIndex($userLanguage).')], buttontext[('.$this->getLanguageIndex($userLanguage).')] FROM 
 			public.tbl_ampel");
 		
 		if(isError($allAmpeln)) return error(getError($allAmpeln));
@@ -202,4 +206,12 @@ class Ampel_model extends DB_Model
 		return success($zugeteile_ampeln);
 	}
 
+	private function getLanguageIndex($userLanguage)
+	{
+		return "
+			SELECT index 
+			FROM public.tbl_sprache 
+			WHERE sprache = " . $userLanguage;
+	}
+
 }

From 4811f223b921ead52efeda41fe083e746e84eb30 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 2 Aug 2024 11:01:32 +0200
Subject: [PATCH 1058/1461] corrects little typo

---
 application/models/content/Ampel_model.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/application/models/content/Ampel_model.php b/application/models/content/Ampel_model.php
index dfdbc668e..7d5714c98 100755
--- a/application/models/content/Ampel_model.php
+++ b/application/models/content/Ampel_model.php
@@ -20,7 +20,6 @@ class Ampel_model extends DB_Model
 	 */
 	public function active($email = false)
 	{
-		
 		$userLanguage = getUserLanguage();
 
 		$parametersArray = null;
@@ -158,7 +157,7 @@ class Ampel_model extends DB_Model
 		$benutzerStartDate = $datum->mktime_fromdate(date(current(getData($benutzerStartDate))->insertamum));
 
 		$allAmpeln = $this->execReadOnlyQuery("
-			SELECT *, beschreibung[('.$this->getLanguageIndex($userLanguage).')], buttontext[('.$this->getLanguageIndex($userLanguage).')] FROM 
+			SELECT *, beschreibung[(".$this->getLanguageIndex($this->escape($userLanguage)).")], buttontext[(".$this->getLanguageIndex($this->escape($userLanguage)).")] FROM 
 			public.tbl_ampel");
 		
 		if(isError($allAmpeln)) return error(getError($allAmpeln));

From 3bb87ef8d3ba355a806243c4bf3b985e05ee6bfe Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 2 Aug 2024 11:44:58 +0200
Subject: [PATCH 1059/1461] corrects the translation of the ampel queries

---
 .../controllers/api/frontend/v1/Ampeln.php    | 15 +++++------
 application/models/content/Ampel_model.php    | 26 +++++++++++--------
 public/js/components/DashboardWidget/Ampel.js | 10 +++----
 3 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Ampeln.php b/application/controllers/api/frontend/v1/Ampeln.php
index 19f465a11..bc2bca597 100644
--- a/application/controllers/api/frontend/v1/Ampeln.php
+++ b/application/controllers/api/frontend/v1/Ampeln.php
@@ -74,10 +74,10 @@ class Ampeln extends FHCAPI_Controller
 
         // fetch active ampeln
         $activeAmpeln = $this->AmpelModel->active();
-
+		
         $activeAmpeln = $this->getDataOrTerminateWithError($activeAmpeln);
-        
-        foreach($activeAmpeln as $ampel){
+
+		foreach($activeAmpeln as $ampel){
             
             // check if ampel is confirmed by user
             $confirmedByUser = $this->AmpelModel->isConfirmed($ampel->ampel_id,$this->uid);
@@ -108,8 +108,8 @@ class Ampeln extends FHCAPI_Controller
         $userAmpeln = array();
         
         $ampel_result = $this->AmpelModel->active();
-
-        $ampel_result = $this->getDataOrTerminateWithError($ampel_result);
+		
+		$ampel_result = $this->getDataOrTerminateWithError($ampel_result);
         
         foreach($ampel_result as $ampel){
             $confirmedByUser = $this->AmpelModel->isConfirmed($ampel->ampel_id,$this->uid);
@@ -120,7 +120,7 @@ class Ampeln extends FHCAPI_Controller
 
             $zugeteilt = $this->getDataOrTerminateWithError($zugeteilt);
 
-            if($zugeteilt) $userAmpeln[] = $this->translateAmpel($ampel);    
+            if($zugeteilt) $userAmpeln[] = $ampel;    
         }
 
         $this->terminateWithSuccess($userAmpeln);
@@ -142,8 +142,7 @@ class Ampeln extends FHCAPI_Controller
             // check if ampel is confirmed by user
             $confirmedByUser = $this->AmpelModel->isConfirmed($ampel->ampel_id,$this->uid);
             $ampel->bestaetigt = $confirmedByUser;
-            // translate ampeln
-            return $this->translateAmpel($ampel);
+            return $ampel;
         }, $alle_ampeln);
 
         $this->terminateWithSuccess($alle_ampeln);
diff --git a/application/models/content/Ampel_model.php b/application/models/content/Ampel_model.php
index 7d5714c98..33de9fbbe 100755
--- a/application/models/content/Ampel_model.php
+++ b/application/models/content/Ampel_model.php
@@ -22,12 +22,12 @@ class Ampel_model extends DB_Model
 	{
 		$userLanguage = getUserLanguage();
 
-		$parametersArray = null;
+		$parametersArray = [];
 		$query = '
-			SELECT *, beschreibung[('.$this->getLanguageIndex($this->escape($userLanguage)).')], buttontext[('. $this->getLanguageIndex($this->escape($userLanguage)).')]
+			SELECT *, beschreibung[('.$this->getLanguageIndex($this->escape($userLanguage)).')] as beschreibung_trans, buttontext[('.$this->getLanguageIndex($this->escape($userLanguage)).')] as buttontext_trans
 			  FROM public.tbl_ampel
 			 WHERE';
-
+		
 		if ($email === true)
 		{
 			$parametersArray['email'] = $email;
@@ -108,10 +108,15 @@ class Ampel_model extends DB_Model
 	 */
 	public function confirmAmpel($ampel_id, $uid)
 	{
-		if(isset($ampel_id) && isset($uid))
-            return error("parameter were missing to execute the insert into");
-        
-        return $this->execQuery('
+		$this->load->library('form_validation');
+		$this->form_validation->set_data(['ampel_id' => $ampel_id, 'uid' => $uid]);
+		$this->form_validation->set_rules('ampel_id', 'Ampel ID', 'required|integer');
+		$this->form_validation->set_rules('uid', 'UID', 'required');
+
+		if ($this->form_validation->run() == FALSE)
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		return $this->execQuery('
         INSERT INTO public.tbl_ampel_benutzer_bestaetigt (ampel_id, uid)
         VALUES (?,?);', array($ampel_id, $uid));
 	}
@@ -140,9 +145,8 @@ class Ampel_model extends DB_Model
 		return success(current($zugeteilt)->zugeteilt);
 	}
 
-	
-
-
+	// THIS FUNCTION IS NOT IN USE
+	// fetches all ampeln that were assigned to the user after the working start_date
 	function alleAmpeln($uid){
 		$userLanguage = getUserLanguage();
 
@@ -157,7 +161,7 @@ class Ampel_model extends DB_Model
 		$benutzerStartDate = $datum->mktime_fromdate(date(current(getData($benutzerStartDate))->insertamum));
 
 		$allAmpeln = $this->execReadOnlyQuery("
-			SELECT *, beschreibung[(".$this->getLanguageIndex($this->escape($userLanguage)).")], buttontext[(".$this->getLanguageIndex($this->escape($userLanguage)).")] FROM 
+			SELECT *, beschreibung[(".$this->getLanguageIndex($this->escape($userLanguage)).")] as beschreibung_trans, buttontext[(".$this->getLanguageIndex($this->escape($userLanguage)).")] as buttontext_trans FROM 
 			public.tbl_ampel");
 		
 		if(isError($allAmpeln)) return error(getError($allAmpeln));
diff --git a/public/js/components/DashboardWidget/Ampel.js b/public/js/components/DashboardWidget/Ampel.js
index 5617c5c53..7257d70c1 100755
--- a/public/js/components/DashboardWidget/Ampel.js
+++ b/public/js/components/DashboardWidget/Ampel.js
@@ -139,7 +139,7 @@ export default {
                     </div>
                 </div>
             </div>
-            
+
             <div v-if="activeAmpeln && activeAmpeln.length == 0" class="card card-body mt-4 p-4 text-center">
                 <span class="text-success h2"><i class="fa fa-solid fa-circle-check"></i></span>
                 <span class="text-success h5">{{$p.t('ampeln','super')}}</span><br>
@@ -149,7 +149,7 @@ export default {
         <div v-else>
         <header class="me-auto"><b>{{$p.t('ampeln','newestAmpeln')}} </b></header>
             <template v-for="n in WIDGET_AMPEL_MAX">
-            
+
                 <div class="mt-2 card" aria-hidden="true">
                 <div class="card-body">
                     <p class="card-text placeholder-glow">
@@ -161,7 +161,7 @@ export default {
             </template>
 
         </div>
-        
+
     </div>
 
     <!-- All Ampeln Offcanvas -->
@@ -196,9 +196,9 @@ export default {
                     <a :href="'#ampelCollapse_' + ampel.ampel_id" data-bs-toggle="collapse" class="stretched-link">{{ ampel.kurzbz }}</a><br>
                 </div>
                 <div class="collapse my-3" :id="'ampelCollapse_' + ampel.ampel_id" :ref="'ampelCollapse_' + ampel.ampel_id">
-                    <div v-html="ampel.beschreibung"></div>
+                    <div v-html="ampel.beschreibung_trans"></div>
                     <div v-if="!ampel.bestaetigt " class="d-flex justify-content-end mt-3">
-                        <button  class="btn btn-sm btn-primary" :class="{disabled: ampel.bestaetigt}" @click="confirm(ampel.ampel_id)">{{ validateBtnTxt(ampel.buttontext) }}</button>
+                        <button  class="btn btn-sm btn-primary" :class="{disabled: ampel.bestaetigt}" @click="confirm(ampel.ampel_id)">{{ validateBtnTxt(ampel.buttontext_trans) }}</button>
                     </div>
                 </div>
                 </li>

From c5f57a0689aaae00f76cf5c6fb95a475cebecafc Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 2 Aug 2024 12:52:21 +0200
Subject: [PATCH 1060/1461] adds the bestaetigt property of the ampel when
 fetching all the active ampeln

---
 .../controllers/api/frontend/v1/Ampeln.php     | 12 +++---------
 application/models/content/Ampel_model.php     | 18 +++++++++++++++---
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Ampeln.php b/application/controllers/api/frontend/v1/Ampeln.php
index bc2bca597..037996009 100644
--- a/application/controllers/api/frontend/v1/Ampeln.php
+++ b/application/controllers/api/frontend/v1/Ampeln.php
@@ -73,18 +73,14 @@ class Ampeln extends FHCAPI_Controller
         $userAmpeln = array();
 
         // fetch active ampeln
-        $activeAmpeln = $this->AmpelModel->active();
+        $activeAmpeln = $this->AmpelModel->active(false, $this->uid);
 		
         $activeAmpeln = $this->getDataOrTerminateWithError($activeAmpeln);
 
 		foreach($activeAmpeln as $ampel){
             
-            // check if ampel is confirmed by user
-            $confirmedByUser = $this->AmpelModel->isConfirmed($ampel->ampel_id,$this->uid);
-            $ampel->bestaetigt = $confirmedByUser;
-
             // only include non confirmed active ampeln in the result
-            if(!$confirmedByUser){
+            if(!$ampel->bestaetigt){
                 
                 // check if the user was assigned to the ampel
                 $zugeteilt = $this->AmpelModel->isZugeteilt($this->uid, $ampel->benutzer_select);
@@ -107,13 +103,11 @@ class Ampeln extends FHCAPI_Controller
 	{
         $userAmpeln = array();
         
-        $ampel_result = $this->AmpelModel->active();
+        $ampel_result = $this->AmpelModel->active(false, $this->uid);
 		
 		$ampel_result = $this->getDataOrTerminateWithError($ampel_result);
         
         foreach($ampel_result as $ampel){
-            $confirmedByUser = $this->AmpelModel->isConfirmed($ampel->ampel_id,$this->uid);
-            $ampel->bestaetigt = $confirmedByUser;
             
             // check if the ampel was assigned to the user
             $zugeteilt = $this->AmpelModel->isZugeteilt($this->uid, $ampel->benutzer_select);
diff --git a/application/models/content/Ampel_model.php b/application/models/content/Ampel_model.php
index 33de9fbbe..9a8b211b8 100755
--- a/application/models/content/Ampel_model.php
+++ b/application/models/content/Ampel_model.php
@@ -18,15 +18,27 @@ class Ampel_model extends DB_Model
 	 * @param bool $email If true, then only ampeln are retrieved that are marked to be sent by mail.
 	 * @return stdClass Returns array of objects.
 	 */
-	public function active($email = false)
+	public function active($email = false, $uid = null)
 	{
 		$userLanguage = getUserLanguage();
 
+		$bestaetigt = '';
+		if($uid != null){
+			$bestaetigt = ',
+				COALESCE((
+				SELECT true
+			  	FROM public.tbl_ampel_benutzer_bestaetigt a
+			 	WHERE a.ampel_id = ampel_id
+			   	AND uid = ' . $this->escape($uid) . ' LIMIT 1), false) as bestaetigt';
+		}
+
 		$parametersArray = [];
 		$query = '
 			SELECT *, beschreibung[('.$this->getLanguageIndex($this->escape($userLanguage)).')] as beschreibung_trans, buttontext[('.$this->getLanguageIndex($this->escape($userLanguage)).')] as buttontext_trans
-			  FROM public.tbl_ampel
-			 WHERE';
+			'.$bestaetigt
+			.'
+			FROM public.tbl_ampel
+			WHERE';
 		
 		if ($email === true)
 		{

From 90162ed2c9c39beb69aff7ef8e0793ca556802ab Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 2 Aug 2024 13:55:46 +0200
Subject: [PATCH 1061/1461] refactor generate alias, add transaction to
 addStatus

---
 .../api/frontend/v1/stv/Status.php            | 41 +++++++---------
 application/models/person/Benutzer_model.php  | 22 ++++++---
 application/models/person/Person_model.php    | 48 -------------------
 3 files changed, 33 insertions(+), 78 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index ad155c11d..62b36bcd9 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -781,6 +781,9 @@ class Status extends FHCAPI_Controller
 		//Vor dem Studentenstatus müssen folgende Status eingetragen werden: {0}'
 		//private $_statusAbfolgeVorStudent = [self::INTERESSENT_STATUS, self::BEWERBER_STATUS, self::AUFGENOMMENER_STATUS
 
+		// Start DB transaction
+		$this->db->trans_start();
+
 		//getSemester of Status Aufgenommen
 		$result = $this->PrestudentstatusModel->loadWhere([
 			"prestudent_id" => $prestudent_id,
@@ -878,26 +881,10 @@ class Status extends FHCAPI_Controller
 		$aktivierungscode = getData($result);
 
 		//generate Alias
-		//TODO(Manu) check if alias already exists
+		$result = $this->BenutzerModel->generateAliasByPersonId($person_id);
+		$this->getDataOrTerminateWithError($result);
+		$alias = getData($result);
 
-		$result = $this->PersonModel->generateAliasByPersonId($person_id);
-
-		if (isError($result))
-		{
-			return $this->terminateWithError(getData($result), self::ERROR_TYPE_GENERAL);
-		}
-
-		$alias = getData($result) ?: null;
-		$alias = $alias->retval[0];
-
-		$sanitizedVorname = $this->_sanitizeAliasName($alias->vorname);
-		$sanitizedNachname = $this->_sanitizeAliasName($alias->nachname);
-		$alias = $sanitizedVorname . '.' . $sanitizedNachname;
-
-		if (isError($result))
-		{
-			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
 		$result = $this->BenutzerModel->insert(
 			[
 				'person_id' => $person_id,
@@ -936,11 +923,11 @@ class Status extends FHCAPI_Controller
 		$this->load->library('PrestudentLib');
 		$result = $this->prestudentlib->setFirstStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id, date('c'), getAuthUID(), $stg, $uidStudent);
 
-		if (isError($result)) {
-			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		} else
-			$this->terminateWithSuccess($prestudent_id);
+		$this->getDataOrTerminateWithError($result);
 
+		$this->db->trans_commit();
+
+		return $this->outputJsonSuccess(true);
 	}
 
 	public function loadStatus()
@@ -2011,6 +1998,14 @@ class Status extends FHCAPI_Controller
 		]);
 	}
 
+	/**
+	 * Helper function for sanitizing Alias Name
+	 * replaces empty spaces with underlines
+	 *
+	 * @param string					$str
+	 *
+	 * @return string
+	 */
 	private function _sanitizeAliasName($str)
 	{
 		$str = sanitizeProblemChars($str);
diff --git a/application/models/person/Benutzer_model.php b/application/models/person/Benutzer_model.php
index d6b3cf8a1..ed275c52c 100644
--- a/application/models/person/Benutzer_model.php
+++ b/application/models/person/Benutzer_model.php
@@ -94,9 +94,9 @@ class Benutzer_model extends DB_Model
 	}
 
 	/**
-	 * Generates alias for a uid.
-	 * @param $uid
-	 * @return array the alias if newly generated
+	 * Generates alias for a person_id
+	 * @param $person_id
+	 * @return string
 	 */
 	public function generateAliasByPersonId($person_id)
 	{
@@ -106,12 +106,19 @@ class Benutzer_model extends DB_Model
 
 		$nameresult = $this->execQuery($sql, array($person_id));
 
-		$nameresult = getData($nameresult) ?: null;
+		$nameresult = current(getData($nameresult)) ?: null;
 
-	//	if($aliasdata)
-	//		$alias = $this->_sanitizeAliasName($aliasdata->vorname).'.'.$this->_sanitizeAliasName($aliasdata->nachname);
+		if($nameresult)
+		{
+			$alias = $this->_sanitizeAliasName($nameresult->vorname).'.'.$this->_sanitizeAliasName($nameresult->nachname);
 
-		return success($nameresult->vorname . " " . $nameresult->nachname);
+			$aliasexists = $this->aliasExists($alias);
+
+			if (hasData($aliasexists) && current(getData($aliasexists)))
+				$alias = "";
+		}
+
+		return success($alias);
 	}
 
 	// --------------------------------------------------------------------------------------------
@@ -122,6 +129,7 @@ class Benutzer_model extends DB_Model
 	 * @param string $str
 	 * @return string
 	 */
+
 	private function _sanitizeAliasName($str)
 	{
 		$str = sanitizeProblemChars($str);
diff --git a/application/models/person/Person_model.php b/application/models/person/Person_model.php
index 7cfa63369..31b7b03b7 100644
--- a/application/models/person/Person_model.php
+++ b/application/models/person/Person_model.php
@@ -375,53 +375,5 @@ class Person_model extends DB_Model
 		]);
 	}
 
-	public function generateAliasByPersonId($person_id)
-	{
-
-		$this->addSelect('vorname, nachname');
-
-		return success ($this->loadWhere(array('person_id' => $person_id)));
-	}
-
-/*	public function generateAliasByPersonId($person_id)
-	{
-
-		$this->addSelect('vorname, nachname');
-
-		$result = $this->loadWhere(array('person_id' => $person_id));
-
-		// Überprüfe, ob ein Ergebnis zurückgegeben wurde
-		if ($result) {
-			$result = getData($result);
-			$result = $result->retval[0];
-			$vorname = $result->vorname;
-			$nachname = $result->nachname;
-
-			// Sanitize the extracted names
-			$sanitizedVorname = $this->sanitizeAliasName($vorname);
-			$sanitizedNachname = $this->sanitizeAliasName($nachname);
-
-			// Erstelle den Alias
-			$alias = $sanitizedVorname . '.' . $sanitizedNachname;
-
-			// Gib den Erfolg zurück mit dem generierten Alias
-			return success($alias);
-		} else {
-				// Falls kein Ergebnis gefunden wurde, gib einen Fehler zurück
-				return error('Person not found');
-			}
-
-	}*/
-
-	/**
-	 * Sanitizes a string used for alias. Replaces special characters, spaces, sets lower case.
-	 * @param string $str
-	 * @return string
-	 */
-	public function sanitizeAliasName($str)
-	{
-		$str = sanitizeProblemChars($str);
-		return success (mb_strtolower(str_replace(' ','_', $str)));
-	}
 }
 

From a555067c43a37f262abd88b387f4286a9a077dc9 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 2 Aug 2024 14:24:50 +0200
Subject: [PATCH 1062/1461] Prepare for Translated fields in DB_Model

---
 application/controllers/api/frontend/v1/stv/Lists.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/application/controllers/api/frontend/v1/stv/Lists.php b/application/controllers/api/frontend/v1/stv/Lists.php
index 1a75cdb50..1c0c25db7 100644
--- a/application/controllers/api/frontend/v1/stv/Lists.php
+++ b/application/controllers/api/frontend/v1/stv/Lists.php
@@ -88,6 +88,7 @@ class Lists extends FHCAPI_Controller
 		$this->GeschlechtModel->addOrder('geschlecht');
 
 		$this->GeschlechtModel->addSelect('*');
+		#$this->GeschlechtModel->addTranslatedSelect("bezeichnung_mehrsprachig", "bezeichnung");
 		$this->GeschlechtModel->addSelect("bezeichnung_mehrsprachig[(SELECT index FROM public.tbl_sprache WHERE sprache=" . $this->GeschlechtModel->escape(DEFAULT_LANGUAGE) . " LIMIT 1)] AS bezeichnung");
 
 		$result = $this->GeschlechtModel->load();
@@ -126,6 +127,7 @@ class Lists extends FHCAPI_Controller
 		$this->load->model('crm/Status_model', 'StatusModel');
 
 		$this->StatusModel->addSelect('*');
+		#$this->StatusModel->addTranslatedSelect('bezeichnung_mehrsprachig', 'bezeichnung');
 		$this->StatusModel->addSelect(
 			'bezeichnung_mehrsprachig[(
 				SELECT index

From b350c9da5614b79e32d1d51c63a987dd29b00733 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 2 Aug 2024 14:46:22 +0200
Subject: [PATCH 1063/1461] refactors the news controller

---
 application/controllers/CisHmvc/Cms.php       |  42 ------
 application/controllers/CisHtml/Cms.php       |  45 -------
 application/controllers/CisVue/Cms.php        |  67 +---------
 .../controllers/api/frontend/v1/Cms.php       | 121 ++++++++++++------
 application/views/CisHtml/Cms/Content.php     |   4 +-
 public/js/api/cms.js                          |  49 ++++---
 public/js/apps/Cis/Cms.js                     |   4 +-
 public/js/apps/api/cms.js                     |  21 ---
 public/js/apps/api/fhcapifactory.js           |   2 -
 public/js/components/Cis/Cms/News.js          |  23 ++--
 10 files changed, 132 insertions(+), 246 deletions(-)
 delete mode 100644 public/js/apps/api/cms.js

diff --git a/application/controllers/CisHmvc/Cms.php b/application/controllers/CisHmvc/Cms.php
index d8bb3a3db..fad3366d4 100755
--- a/application/controllers/CisHmvc/Cms.php
+++ b/application/controllers/CisHmvc/Cms.php
@@ -112,46 +112,4 @@ class Cms extends Auth_Controller
 	{
 		$this->load->view('CisHtml/Cms/Content', ['infoscreen' => $infoscreen, 'studiengang_kz' => $studiengang_kz, 'semester' => $semester, 'mischen' => $mischen, 'titel' => $titel, 'edit' => $edit, 'sichtbar' => $sichtbar, "template_kurzbz"=>"news"]);
 	}
-
-	public function getNews($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
-	{
-		$get_page = intval($this->input->get('page', true));
-		$get_page_size = intval($this->input->get('page_size', true));
-		if ($get_page) {
-			$page = $get_page;
-		}
-		if ($get_page_size) {
-			$page_size = $get_page_size;
-		} else {
-			$page_size = $this->page_size;
-		}
-		$news = $this->cmslib->getNews($infoscreen, $studiengang_kz, $semester, $mischen, $titel, $edit, $sichtbar, $page, $page_size);
-
-		if (isError($news)) {
-			$this->terminateWithJsonError(getError($news));
-		}
-		$news = hasData($news) ? getData($news) : null;
-		if ($news) {
-			echo json_encode($news);
-		} else {
-			show_error("News: No data found");
-		}
-
-	}
-
-	public function getNewsRowCount($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $fachbereich_kurzbz = null, $maxalter = 0, $edit = false, $sichtbar = true, $page = 1, $page_size = 10)
-	{
-		list($studiengang_kz, $semester) = $this->cmslib->getStgAndSem($studiengang_kz, $semester);
-		$all = $edit;
-		$num_rows = $this->NewsModel->countNewsWithContent(getSprache(), $studiengang_kz, $semester, $fachbereich_kurzbz, $sichtbar, $maxalter, $page, $this->page_size, $all, $mischen);
-		if (isError($num_rows)) {
-			$this->terminateWithJsonError(getError($num_rows));
-		}
-		$num_rows = hasData($num_rows) ? getData($num_rows) : null;
-		if ($num_rows) {
-			echo json_encode($num_rows);
-		} else {
-			show_error("News number rows: No data found");
-		}
-	}
 }
diff --git a/application/controllers/CisHtml/Cms.php b/application/controllers/CisHtml/Cms.php
index 40126925c..102d0eff4 100755
--- a/application/controllers/CisHtml/Cms.php
+++ b/application/controllers/CisHtml/Cms.php
@@ -26,10 +26,6 @@ class Cms extends FHC_Controller
 			'global'
 		]);
 
-		$this->load->model('content/News_model', 'NewsModel');
-
-		// setting up the papgination_size
-		$this->page_size = 10;
 	}
 
 	// -----------------------------------------------------------------------------------------------------------------
@@ -78,45 +74,4 @@ class Cms extends FHC_Controller
 		$this->load->view('CisHtml/Cms/Content', ['infoscreen' => $infoscreen, 'studiengang_kz' => $studiengang_kz, 'semester' => $semester, 'mischen' => $mischen, 'titel' => $titel, 'edit' => $edit, 'sichtbar' => $sichtbar, "template_kurzbz"=>"news"]);
 	}
 
-	public function getNews($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
-	{
-		$get_page = intval($this->input->get('page', true));
-		$get_page_size = intval($this->input->get('page_size', true));
-		if ($get_page) {
-			$page = $get_page;
-		}
-		if ($get_page_size) {
-			$page_size = $get_page_size;
-		} else {
-			$page_size = $this->page_size;
-		}
-		$news = $this->cmslib->getNews($infoscreen, $studiengang_kz, $semester, $mischen, $titel, $edit, $sichtbar, $page, $page_size);
-
-		if (isError($news)) {
-			$this->terminateWithJsonError(getError($news));
-		}
-		$news = hasData($news) ? getData($news) : null;
-		if ($news) {
-			echo json_encode($news);
-		} else {
-			show_error("News: No data found");
-		}
-
-	}
-
-	public function getNewsRowCount($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $fachbereich_kurzbz = null, $maxalter = 0, $edit = false, $sichtbar = true, $page = 1, $page_size = 10)
-	{
-		list($studiengang_kz, $semester) = $this->cmslib->getStgAndSem($studiengang_kz, $semester);
-		$all = $edit;
-		$num_rows = $this->NewsModel->countNewsWithContent(getSprache(), $studiengang_kz, $semester, $fachbereich_kurzbz, $sichtbar, $maxalter, $page, $this->page_size, $all, $mischen);
-		if (isError($num_rows)) {
-			$this->terminateWithJsonError(getError($num_rows));
-		}
-		$num_rows = hasData($num_rows) ? getData($num_rows) : null;
-		if ($num_rows) {
-			echo json_encode($num_rows);
-		} else {
-			show_error("News number rows: No data found");
-		}
-	}
 }
diff --git a/application/controllers/CisVue/Cms.php b/application/controllers/CisVue/Cms.php
index f4ce98e89..4770a8399 100755
--- a/application/controllers/CisVue/Cms.php
+++ b/application/controllers/CisVue/Cms.php
@@ -25,8 +25,6 @@ class Cms extends FHC_Controller
 			'global'
 		]);
 
-		$this->load->model('content/Content_model', 'ContentModel');
-		
 	}
 
 	// -----------------------------------------------------------------------------------------------------------------
@@ -42,35 +40,15 @@ class Cms extends FHC_Controller
 	 */
 	public function content($content_id, $version = null, $sprache = null, $sichtbar = true)
 	{
-		// return early if the content_id for the content is missing
-		if(!isset($content_id))
-			$this->terminateWithError("content_id is missing");
-
 		$content = $this->ContentModel->load($content_id);		
-		if (isError($content))
-			$this->terminateWithError(getError($content));	
-
-		$content = getData($content);
 		
-		if(NULL === $content)
-			$this->terminateWithError("Content not found");
-
+		$content = $this->getDataOrTerminateWithError($content);
+		
 		$content = current($content);
 
 		$this->load->view('CisVue/Cms/Content', ['content_id' => $content_id, 'template_kurzbz'=>$content->template_kurzbz , 'version' => $version, 'sprache' => $sprache, 'sichtbar' => $sichtbar]);
 	}
 
-	/**
-	 * @param boolean			$infoscreen
-	 * @param string | null		$studiengang_kz
-	 * @param int | null		$semester
-	 * @param boolean			$mischen
-	 * @param string			$titel
-	 * @param boolean			$edit
-	 * @param boolean			$sichtbar
-	 *
-	 * @return void
-	 */
 	/**
 	 * @param boolean			$infoscreen
 	 * @param string | null		$studiengang_kz
@@ -87,45 +65,4 @@ class Cms extends FHC_Controller
 		$this->load->view('CisHtml/Cms/Content', ['infoscreen' => $infoscreen, 'studiengang_kz' => $studiengang_kz, 'semester' => $semester, 'mischen' => $mischen, 'titel' => $titel, 'edit' => $edit, 'sichtbar' => $sichtbar, "template_kurzbz"=>"news"]);
 	}
 
-	public function getNews($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
-	{
-		$get_page = intval($this->input->get('page', true));
-		$get_page_size = intval($this->input->get('page_size', true));
-		if ($get_page) {
-			$page = $get_page;
-		}
-		if ($get_page_size) {
-			$page_size = $get_page_size;
-		} else {
-			$page_size = $this->page_size;
-		}
-		$news = $this->cmslib->getNews($infoscreen, $studiengang_kz, $semester, $mischen, $titel, $edit, $sichtbar, $page, $page_size);
-
-		if (isError($news)) {
-			$this->terminateWithJsonError(getError($news));
-		}
-		$news = hasData($news) ? getData($news) : null;
-		if ($news) {
-			echo json_encode($news);
-		} else {
-			show_error("News: No data found");
-		}
-
-	}
-
-	public function getNewsRowCount($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $fachbereich_kurzbz = null, $maxalter = 0, $edit = false, $sichtbar = true, $page = 1, $page_size = 10)
-	{
-		list($studiengang_kz, $semester) = $this->cmslib->getStgAndSem($studiengang_kz, $semester);
-		$all = $edit;
-		$num_rows = $this->NewsModel->countNewsWithContent(getSprache(), $studiengang_kz, $semester, $fachbereich_kurzbz, $sichtbar, $maxalter, $page, $this->page_size, $all, $mischen);
-		if (isError($num_rows)) {
-			$this->terminateWithJsonError(getError($num_rows));
-		}
-		$num_rows = hasData($num_rows) ? getData($num_rows) : null;
-		if ($num_rows) {
-			echo json_encode($num_rows);
-		} else {
-			show_error("News number rows: No data found");
-		}
-	}
 }
diff --git a/application/controllers/api/frontend/v1/Cms.php b/application/controllers/api/frontend/v1/Cms.php
index 50ce50805..5ba635a8a 100644
--- a/application/controllers/api/frontend/v1/Cms.php
+++ b/application/controllers/api/frontend/v1/Cms.php
@@ -37,8 +37,16 @@ class Cms extends FHCAPI_Controller
 			'getOrtKurzbzContent' => self::PERM_LOGGED,
             'content' => self::PERM_LOGGED,
 			'news' => self::PERM_LOGGED,
+			'getNewsRowCount' => self::PERM_LOGGED,
+			'getNews' => self::PERM_LOGGED,
+
 		]);
 
+		$this->load->model('content/News_model', 'NewsModel');
+
+		// setting up the papgination_size
+		$this->page_size = 10;
+
 		$this->load->library('CmsLib');
 
 	}
@@ -46,19 +54,6 @@ class Cms extends FHCAPI_Controller
 	//------------------------------------------------------------------------------------------------------------------
 	// Private methods
 
-	private function fetchContent($content_id){
-		$content = $this->cmslib->getContent($content_id);
-		
-		if (isError($content)){
-			$this->terminateWithError(getError($content), self::ERROR_TYPE_GENERAL);
-		}
-
-		if(getData($content)){
-			return getData($content);
-		}else{
-			$this->terminateWithError("No content was found", self::ERROR_TYPE_GENERAL);
-		}
-	}
 
 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods
@@ -68,17 +63,21 @@ class Cms extends FHCAPI_Controller
 	 */
     public function content()
 	{
-        // getting the get parameters
+		// form validation
+		$this->load->library('form_validation');
+		$this->form_validation->set_data($_GET);
+		$this->form_validation->set_rules('content_id','Content ID','required|is_natural');
+		if($this->form_validation->run() == FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		// getting the get parameters
         $content_id = $this->input->get("content_id",TRUE);
         $version = $this->input->get("version",TRUE);
         $sprache = $this->input->get("sprache",TRUE);
         $sichtbar = $this->input->get("sichtbar",TRUE);
 
-        // return early if the content_id is missing
-		if(!isset($content_id))
-			$this->terminateWithError("content_id is missing", self::ERROR_TYPE_GENERAL);
+		$content = $this->cmslib->getContent($content_id);
 
-		$content = $this->fetchContent($content_id); 
+		$content = $this->getDataOrTerminateWithError($content);
 
 		$this->terminateWithSuccess($content);
 	}
@@ -88,57 +87,95 @@ class Cms extends FHCAPI_Controller
 	 */
 	public function ContentID()
 	{
-		// if error
-		//$this->terminateWithError(SearchBarLib::ERROR_WRONG_JSON, self::ERROR_TYPE_GENERAL);
-		
+		// form validation
+		$this->load->library('form_validation');
+		$this->form_validation->set_data($_GET);
+		$this->form_validation->set_rules('ort_kurzbz', 'Ort', 'required');
+		if ($this->form_validation->run() == FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
+
 		$ort_kurzbz = $this->input->get('ort_kurzbz',TRUE);
 		
-		if(!$ort_kurzbz){
-			$this->terminateWithError("missing ort_kurzbz parameter", self::ERROR_TYPE_GENERAL);
-		}
+		$content_id = $this->OrtModel->getContentID($ort_kurzbz);
 
-		$result = $this->OrtModel->getContentID($ort_kurzbz);
+		$content_id = current($this->getDataOrTerminateWithError($content_id))->content_id;
 		
-		if(isError($result)){
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-
-		$result = hasData($result) ? current(getData($result)) : null;
-		
-		$this->terminateWithSuccess($result->content_id ?? NULL);
+		$this->terminateWithSuccess($content_id);
 	}
 
+	//todo: there is the method news and getNews but only one should exist
 	public function news()
 	{
+		// form validation
+		$this->load->library('form_validation');
+		$this->form_validation->set_data($_GET);
+		$this->form_validation->set_rules('limit','Limit','required|is_natural_no_zero');
+		if($this->form_validation->run() == FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
+		
 		$this->load->model('content/news_model', 'NewsModel');
 		
 		$limit =  $this->input->get('limit',TRUE);
 		
-		// return early if the limit parameter is missing or is not greater than 0
-		if(!isset($limit) || $limit < 1)
-		$this->terminateWithError("API parameters are missing", self::ERROR_TYPE_GENERAL);
-
 		//query the news
 		$news = $this->NewsModel->getAll($limit);
 
 		//get the data or terminate with error
 		$news = $this->getDataOrTerminateWithError($news);
 
-		// check if any news are there
-		if($news === NULL){
-			$this->terminateWithError("No news content has been found");
-		}
-
 		// collect the content of the news
 		foreach($news as $news_element){
 			$this->addMeta("content_id",$news_element->content_id);
-			$news_element->content_obj = $this->fetchContent($news_element->content_id);
+
+			$content = $this->cmslib->getContent($news_element->content_id);
+
+			$content = $this->getDataOrTerminateWithError($content);
+			
+			$news_element->content_obj = $content;
 		}
 
 		$this->terminateWithSuccess($news);
         
 	}
 
+	public function getNewsRowCount($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $fachbereich_kurzbz = null, $maxalter = 0, $edit = false, $sichtbar = true, $page = 1, $page_size = 10)
+	{
+		list($studiengang_kz, $semester) = $this->cmslib->getStgAndSem($studiengang_kz, $semester);
+		$all = $edit;
+		
+		$this->load->model('content/News_model','NewsModel');
+
+		$num_rows = $this->NewsModel->countNewsWithContent(getSprache(), $studiengang_kz, $semester, $fachbereich_kurzbz, $sichtbar, $maxalter, $page, $page_size, $all, $mischen);
+		
+		$num_rows = $this->getDataOrTerminateWithError($num_rows);
+		
+		$this->terminateWithSuccess($num_rows);
+		
+	}
+
+
+	public function getNews($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
+	{
+		//form validation
+		$this->load->library('form_validation');
+		$this->form_validation->set_data($_GET);
+		$this->form_validation->set_rules('page','Page','required|is_natural');
+		$this->form_validation->set_rules('page_size', 'PageSize', 'is_natural');
+		if($this->form_validation->run() == FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		// getting the GET parameters
+		$page = intval($this->input->get('page', true));
+		$page_size = intval($this->input->get('page_size', true));
+
+		// default value for the page_size is 10
+		$page_size = $page_size ?? 10;
+		
+		$news = $this->cmslib->getNews($infoscreen, $studiengang_kz, $semester, $mischen, $titel, $edit, $sichtbar, $page, $page_size);
+
+		$news = $this->getDataOrTerminateWithError($news);
+
+		$this->terminateWithSuccess($news);
+
+	}
+
 	
 }
 
diff --git a/application/views/CisHtml/Cms/Content.php b/application/views/CisHtml/Cms/Content.php
index a132addbf..037f21cb6 100755
--- a/application/views/CisHtml/Cms/Content.php
+++ b/application/views/CisHtml/Cms/Content.php
@@ -14,7 +14,7 @@ switch($template_kurzbz){
 		break;
 }
 
-$this->load->view('templates/CISVUE-Header', $includesArray);
+$this->load->view('templates/CISHTML-Header', $includesArray);
 ?>
 
 <h2><?php echo isset($content_id)? "Content" : "News" ?></h2>
@@ -24,5 +24,5 @@ $this->load->view('templates/CISVUE-Header', $includesArray);
 	
 </div>
 
-<?php $this->load->view('templates/CISVUE-Footer', $includesArray); ?>
+<?php $this->load->view('templates/CISHTML-Footer', $includesArray); ?>
 
diff --git a/public/js/api/cms.js b/public/js/api/cms.js
index 490023053..28cb56961 100644
--- a/public/js/api/cms.js
+++ b/public/js/api/cms.js
@@ -1,25 +1,40 @@
 export default {
     content(content_id, version=null, sprache=null, sichtbar=null) {
-          return this.$fhcApi.get(
-              FHC_JS_DATA_STORAGE_OBJECT.app_root +
-              FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-              "/api/frontend/v1/Cms/content",
-              { content_id: content_id,
-                ...(version?{version}:{}),
-                ...(sprache?{sprache}:{}),
-                ...(sichtbar?{sichtbar}:{}),
-              }
-          );
-      },
-      news(limit) {
         return this.$fhcApi.get(
-            FHC_JS_DATA_STORAGE_OBJECT.app_root +
-            FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-            "/api/frontend/v1/Cms/news",
-            {
-              limit: limit
+			"/api/frontend/v1/Cms/content",
+			{ 
+				content_id: content_id,
+				...(version?{version}:{}),
+				...(sprache?{sprache}:{}),
+				...(sichtbar?{sichtbar}:{}),
             }
         );
     },
+
+    news(limit) {
+        return this.$fhcApi.get(
+            "/api/frontend/v1/Cms/news",
+            {
+        		limit: limit
+            }
+        );
+    },
+
+	getNews(page = 1, page_size = 10) {
+		return this.$fhcApi.get(
+			"/api/frontend/v1/Cms/getNews",
+			{
+				page,
+				page_size,
+			},
+		);
+	},
+
+	getNewsRowCount: function () {
+		return this.$fhcApi.get(
+			"/api/frontend/v1/Cms/getNewsRowCount",
+			{}
+		);
+	},
    
   }
\ No newline at end of file
diff --git a/public/js/apps/Cis/Cms.js b/public/js/apps/Cis/Cms.js
index dd059fb92..a2f9691b3 100755
--- a/public/js/apps/Cis/Cms.js
+++ b/public/js/apps/Cis/Cms.js
@@ -2,7 +2,7 @@ import BsConfirm from "../../components/Bootstrap/Confirm.js";
 //import Pagination from "../../components/Pagination/Pagination.js";
 import CmsNews from "../../components/Cis/Cms/News.js";
 import CmsContent from "../../components/Cis/Cms/Content.js";
-import Fhcapi from "../../plugin/FhcApi.js";
+import Phrasen from "../../plugin/Phrasen.js";
 
 
 const app = Vue.createApp({
@@ -35,6 +35,6 @@ const app = Vue.createApp({
   },
 });
 app.use(primevue.config.default, { zIndex: { overlay: 9999 } });
-app.use(Fhcapi);
+app.use(Phrasen);
 app.mount("#cms");
 //#cms [data-confirm], #cms [data-href]
diff --git a/public/js/apps/api/cms.js b/public/js/apps/api/cms.js
deleted file mode 100644
index 6fbb0e727..000000000
--- a/public/js/apps/api/cms.js
+++ /dev/null
@@ -1,21 +0,0 @@
-export default {
-  getNews: function (page = 1, page_size = 10) {
-    const url =
-      FHC_JS_DATA_STORAGE_OBJECT.app_root +
-      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-      "/CisHtml/Cms/getNews";
-    return axios.get(url, {
-      params: {
-        page,
-        page_size,
-      },
-    });
-  },
-  getNewsRowCount: function () {
-    const url =
-      FHC_JS_DATA_STORAGE_OBJECT.app_root +
-      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-      "/CisHtml/Cms/getNewsRowCount";
-    return axios.get(url);
-  },
-};
diff --git a/public/js/apps/api/fhcapifactory.js b/public/js/apps/api/fhcapifactory.js
index 35120779f..4b35b807a 100755
--- a/public/js/apps/api/fhcapifactory.js
+++ b/public/js/apps/api/fhcapifactory.js
@@ -1,7 +1,5 @@
 import Search from "./search.js";
-import Cms from "./cms.js";
 
 export default {
     "Search": Search,
-    "Cms": Cms,
 };
diff --git a/public/js/components/Cis/Cms/News.js b/public/js/components/Cis/Cms/News.js
index bac28c23c..819f617b4 100644
--- a/public/js/components/Cis/Cms/News.js
+++ b/public/js/components/Cis/Cms/News.js
@@ -13,18 +13,25 @@ export default {
   },
   methods: {
     loadNewPageContent: function (data) {
-      Vue.$fhcapi.Cms.getNews(data.page, data.rows).then((result) => {
-        this.content = result.data;
-      });
+		this.$fhcApi.factory.cms.getNews(data.page, data.rows)
+		.then(res => res.data)
+		.then(result => {
+			this.content = result;
+		});
+		
     },
   },
   created() {
-    Vue.$fhcapi.Cms.getNews(1, this.page_size).then((result) => {
-      this.content = result.data;
-    });
+    this.$fhcApi.factory.cms.getNews(1, this.page_size)
+	.then(res => res.data)
+	.then(result => {
+		this.content = result;
+	});
 
-    Vue.$fhcapi.Cms.getNewsRowCount().then((result) => {
-      this.maxPageCount = result.data;
+    this.$fhcApi.factory.cms.getNewsRowCount()
+	.then(res => res.data)
+	.then(result => {
+    	this.maxPageCount = result;
     });
   },
   template: /*html*/ `

From e44c1bccb3e0a85c0584995626a43c0fd5a3b6d5 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 5 Aug 2024 09:17:04 +0200
Subject: [PATCH 1064/1461] adds shorthands with getDataOrTerminateWithError
 and adds also form_validation

---
 .../api/frontend/v1/Stundenplan.php           | 42 ++++++-------------
 1 file changed, 13 insertions(+), 29 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 614f02919..1e6aa494d 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -88,28 +88,14 @@ class Stundenplan extends FHCAPI_Controller
         $start_date = $this->input->get('start_date', TRUE);
         $end_date = $this->input->get('end_date', TRUE);
         
-        //return early if the get parameter are not present
-        if(!$ort_kurzbz || !$start_date || !$end_date){
-            $this->terminateWithError("Missing parameters", self::ERROR_TYPE_GENERAL);
-        }
-        
 		// querying the stunden
         $stunden = $this->StundeModel->load();
 
-        if(isError($stunden))
-            $this->terminateWithError(getError($stunden), self::ERROR_TYPE_GENERAL);
-        
-        $stunden = getData($stunden);
+        $stunden = $this->getDataOrTerminateWithError($stunden);
 
 		$result = $this->StundenplanModel->groupedCalendarEvents($ort_kurzbz,$start_date,$end_date);  
-        //$this->loglib->logErrorDB(print_r($result,TRUE),"this is the result of the grouped query");
 		
-        if(isError($result)){
-            $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-        }
-
-        $result = hasData($result) ? getData($result) : [];
-        
+        $result = $this->getDataOrTerminateWithError($result);
 
         foreach($result as $entry){
             if(COUNT($entry->lektor)>1){
@@ -121,37 +107,35 @@ class Stundenplan extends FHCAPI_Controller
 		
 	}
 
+	// reservierungen is not used in the prototype for the students
     public function Reservierungen()
 	{
         $this->load->model('ressource/Reservierung_model', 'ReservierungModel');
         $this->load->model('ressource/Stunde_model', 'StundeModel');
         $this->load->model('ressource/Mitarbeiter_model','MitarbeiterModel');
 
+		//form validation
+		$this->load->library('form_validation');
+		$this->form_validation->set_data($_GET);
+		$this->form_validation->set_rules('ort_kurzbz',"Ort","required");
+		$this->form_validation->set_rules('start_date', "StartDate", "required");
+		$this->form_validation->set_rules('end_date', "EndDate", "required");
+		if($this->form_validation->run() == FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
+
         // storing the get parameter in local variables
         $ort_kurzbz = $this->input->get('ort_kurzbz', TRUE);
         $start_date = $this->input->get('start_date', TRUE);
         $end_date = $this->input->get('end_date', TRUE);
 
-        // return early if the get parameter are not present
-        if(!$ort_kurzbz || !$start_date || !$end_date){
-            $this->terminateWithError("Missing parameters", self::ERROR_TYPE_GENERAL);
-        }
-
         // querying the stunden
         $stunden = $this->StundeModel->load();
 
-        if(isError($stunden))
-            $this->terminateWithError(getError($stunden), self::ERROR_TYPE_GENERAL);
-        
-        $stunden = getData($stunden);
+        $stunden = $this->getDataOrTerminateWithError($stunden);
 
 		// querying the reservierungen
 		$result = $this->ReservierungModel->getRoomReservierungen($ort_kurzbz, $start_date, $end_date);
 
-		if (isError($result))
-			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-        
-        $result = hasData($result) ? getData($result) : [];
+        $result = $this->getDataOrTerminateWithError($result);
         
         // loop over the days
         $day_events = $this->filterEventsIntoAssociativeDateArray($result, $start_date, $end_date);

From b0821be46541d7c6ca305388c4880e1bf683726b Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Mon, 5 Aug 2024 10:52:15 +0200
Subject: [PATCH 1065/1461] Added methods getLastOrAktStudienjahr /
 getAktOrNextStudienjahr to retrieve the last or next Studienjahr during the
 summer term

---
 .../models/organisation/Studienjahr_model.php | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)

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

From f0db878623de84d3dc20af06019b439a58c861f9 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 5 Aug 2024 11:48:57 +0200
Subject: [PATCH 1066/1461] changes the headers from the news template from h5
 to h2 but adds the bootstrap h5 class

---
 system/dbupdate_3.4/25999_cis4_cms.php | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/system/dbupdate_3.4/25999_cis4_cms.php b/system/dbupdate_3.4/25999_cis4_cms.php
index fb95ac015..3118f1c85 100755
--- a/system/dbupdate_3.4/25999_cis4_cms.php
+++ b/system/dbupdate_3.4/25999_cis4_cms.php
@@ -120,18 +120,20 @@ EOXML04;
 		<xsl:param name="news_id" select="news_id"/>
 		<article class="news-list-item card mb-3">
 			<header class="card-header d-flex justify-content-between align-items-center">
-				<h5 class="mb-0">
-					<xsl:value-of select="betreff"/>
-				</h5>
-				<div class="d-flex flex-wrap justify-content-end">
-					<address class="fw-bold small mb-0">
-						<xsl:value-of select="verfasser"/>
-					</address>
-					<xsl:if test="\$datum">
-						<time class="small text-end w-100" datetime="{\$datumdetail}">
-							<xsl:value-of select="\$datum"/>
-						</time>
-					</xsl:if>
+				<div class="row ">
+                    <h2 class="h5 col-auto me-auto">
+                        <xsl:value-of select="betreff"/>
+                    </h2>
+                    <div class="col-auto">	
+						<address class="fw-bold small mb-0">
+							<xsl:value-of select="verfasser"/>
+						</address>
+						<xsl:if test="\$datum">
+							<time class="small text-end w-100" datetime="{\$datumdetail}">
+								<xsl:value-of select="\$datum"/>
+							</time>
+						</xsl:if>
+					</div>
 				</div>
 			</header>
 			<xsl:if test="text">

From 437fd64a6fc3f92c3d7525df3c7e1432e8811568 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 5 Aug 2024 16:52:46 +0200
Subject: [PATCH 1067/1461] refactor setFunctions and processStudentlehrverband

---
 .../api/frontend/v1/stv/Status.php            |  71 +++---
 application/libraries/PrestudentLib.php       | 231 ++++--------------
 .../education/Studentlehrverband_model.php    |  68 ++++--
 3 files changed, 121 insertions(+), 249 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 62b36bcd9..b695fff11 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -86,15 +86,15 @@ class Status extends FHCAPI_Controller
 			if (!$this->form_validation->run())
 				$this->terminateWithValidationErrors($this->form_validation->error_array());
 		}
-		
+
 
 		if (defined('VORRUECKUNG_STATUS_MAX_SEMESTER') && VORRUECKUNG_STATUS_MAX_SEMESTER == false)
 			$this->terminateWithSuccess(100);
 
 		$this->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
-		
+
 		$result = $this->LehrverbandModel->getMaxSemester($studiengang_kzs);
-		
+
 		$maxsem = $this->getDataOrTerminateWithError($result);
 
 		$this->terminateWithSuccess($maxsem ? current($maxsem)->maxsem : 10);
@@ -133,7 +133,7 @@ class Status extends FHCAPI_Controller
 	public function isErsterStudent($prestudent_id)
 	{
 		//check if studentrolle already exists
-		$this->load->model('crm/Student_model','StudentModel');
+		$this->load->model('crm/Student_model', 'StudentModel');
 		$result = $this->StudentModel->checkIfExistingStudentRolle($prestudent_id);
 		if (isError($result))
 		{
@@ -144,7 +144,6 @@ class Status extends FHCAPI_Controller
 			return $this->terminateWithSuccess($result);
 		}
 		return $this->terminateWithSuccess($result);
-
 	}
 
 	public function hasStatusBewerber($prestudent_id)
@@ -200,11 +199,10 @@ class Status extends FHCAPI_Controller
 		$lastStatusData = $this->getDataOrTerminateWithError($result);
 		$lastStatusData = current($lastStatusData);
 
-		//TODO(Manu) check phrase: why bewerbung?
 		if (!$isBerechtigtBasisPrestudentstatus)
 			$this->form_validation->set_rules(
-				'bewerbung_abgeschicktamum',
-				$this->p->t('lehre', 'bewerbung_abgeschickt_am'),
+				'berechtigt',
+				$this->p->t('ui', 'nurLeseberechtigung'),
 				'is_null',
 				[
 					'is_null' => $this->p->t('ui', 'error_fieldWriteAccess')
@@ -253,7 +251,7 @@ class Status extends FHCAPI_Controller
 						return true;
 					$result = $this->prestudentstatuschecklib->checkIfAngetreten($prestudent_person);
 					return $this->getDataOrTerminateWithError($result);
-				}],		
+				}],
 				//Check ZGV
 				['checkIfZGV', function ($value) use ($prestudent_person) {
 					if (!ZGV_CHECK)
@@ -274,7 +272,7 @@ class Status extends FHCAPI_Controller
 				}],
 				//Check Bewerberstatus
 				[
-				'checkIfExistingBewerberstatus', function () use ($prestudent_id, $status_kurzbz) {
+					'checkIfExistingBewerberstatus', function () use ($prestudent_id, $status_kurzbz) {
 					if ($status_kurzbz != Prestudentstatus_model::STATUS_AUFGENOMMENER &&
 						$status_kurzbz != Prestudentstatus_model::STATUS_WARTENDER &&
 						$status_kurzbz != Prestudentstatus_model::STATUS_ABGEWIESENER)
@@ -297,9 +295,9 @@ class Status extends FHCAPI_Controller
 				'checkIfZGV' => $this->p->t('lehre', 'error_ZGVNichtEingetragen', ['name' => $studentName]),
 				'checkIfZGVMaster' => $this->p->t('lehre', 'error_ZGVMasterNichtEingetragen', ['name' => $studentName]),
 				'status_stud_exists' => $this->p->t('lehre', 'error_noStudstatus')
-				]
+			]
 		);
- 
+
 		if ($status_kurzbz == Prestudentstatus_model::STATUS_STUDENT)
 			$this->form_validation->set_rules('ausbildungssemester', $this->p->t('lehre', 'ausbildungssemester'), 'required|integer', [
 				'integer' => $this->p->t('ui', 'error_fieldNotInteger')
@@ -647,11 +645,10 @@ class Status extends FHCAPI_Controller
 
 		$isBerechtigtBasisPrestudentstatus = $this->permissionlib->isBerechtigt('basis/prestudentstatus');
 
-		//TODO(Manu) check phrase: why bewerbung?
 		if (!$isBerechtigtBasisPrestudentstatus)
 			$this->form_validation->set_rules(
-				'bewerbung_abgeschicktamum',
-				$this->p->t('lehre', 'bewerbung_abgeschickt_am'),
+				'berechtigt',
+				$this->p->t('ui', 'nurLeseberechtigung'),
 				'is_null',
 				[
 					'is_null' => $this->p->t('ui', 'error_fieldWriteAccess')
@@ -842,25 +839,25 @@ class Status extends FHCAPI_Controller
 		//Default: keine Matrikelnummer wird generiert
 
 		//(2) personenkz = uid
-/*		if (defined('SET_UID_AS_PERSONENKENNZEICHEN') && SET_UID_AS_PERSONENKENNZEICHEN) {
-			$matrikelnr = $uidStudent;
-		}*/
+		/*		if (defined('SET_UID_AS_PERSONENKENNZEICHEN') && SET_UID_AS_PERSONENKENNZEICHEN) {
+					$matrikelnr = $uidStudent;
+				}*/
 
 		//(3) Matrikelnummer = uid
-/*		if (defined('SET_UID_AS_MATRIKELNUMMER') && SET_UID_AS_MATRIKELNUMMER) {
-			//update person
-			$result = $this->PersonModel->update(
-				[
-					'person_id' => $person_id,
-				],
-				[
-					'matr_nr' => $uidStudent,
-				]
-			);
-			if (isError($result)) {
-				return $this->terminateWithError("uidAsMatrikelnummer" . getError($result), self::ERROR_TYPE_GENERAL);
-			}
-		}*/
+		/*		if (defined('SET_UID_AS_MATRIKELNUMMER') && SET_UID_AS_MATRIKELNUMMER) {
+					//update person
+					$result = $this->PersonModel->update(
+						[
+							'person_id' => $person_id,
+						],
+						[
+							'matr_nr' => $uidStudent,
+						]
+					);
+					if (isError($result)) {
+						return $this->terminateWithError("uidAsMatrikelnummer" . getError($result), self::ERROR_TYPE_GENERAL);
+					}
+				}*/
 
 		//add benutzerdatensatz mit Aktierungscode
 		$this->load->model('person/Benutzer_model', 'BenutzerModel');
@@ -1695,9 +1692,9 @@ class Status extends FHCAPI_Controller
 
 		$this->form_validation->set_rules('status_kurzbz', $this->p->t('lehre', 'status_rolle'), [
 			'in_list[' .
-				Prestudentstatus_model::STATUS_STUDENT . ',' .
-				Prestudentstatus_model::STATUS_DIPLOMAND . ',' .
-				Prestudentstatus_model::STATUS_UNTERBRECHER . ']',
+			Prestudentstatus_model::STATUS_STUDENT . ',' .
+			Prestudentstatus_model::STATUS_DIPLOMAND . ',' .
+			Prestudentstatus_model::STATUS_UNTERBRECHER . ']',
 			['status_stud_exists', function ($value) use ($prestudent_id) {
 				if ($value != Prestudentstatus_model::STATUS_STUDENT)
 					return true;
@@ -1886,7 +1883,7 @@ class Status extends FHCAPI_Controller
 
 		//Send Message
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-		
+
 		$this->PrestudentModel->addSelect('p.*');
 		$this->PrestudentModel->addSelect('stg.oe_kurzbz');
 		$this->PrestudentModel->addSelect('stg.bezeichnung AS stg_bezeichnung');
@@ -1898,7 +1895,7 @@ class Status extends FHCAPI_Controller
 		$this->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz');
 		$this->PrestudentModel->addJoin('public.tbl_studiengangstyp typ', 'typ');
 		$this->PrestudentModel->addJoin('public.tbl_studienplan plan', 'studienplan_id', 'LEFT');
-		
+
 		$result = $this->PrestudentModel->load($prestudent_id);
 
 		$studentdata = $this->getDataOrTerminateWithError($result);
diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php
index c034caece..45d8acb8d 100644
--- a/application/libraries/PrestudentLib.php
+++ b/application/libraries/PrestudentLib.php
@@ -88,51 +88,20 @@ class PrestudentLib
 		if (isError($result))
 			return $result;
 
-
-		//Verband anlegen
-		$result = $this->_ci->LehrverbandModel->load([
-			'studiengang_kz' => $student->studiengang_kz,
-			'semester' => 0,
-			'verband' => 'A',
-			'gruppe' => ''
-		]);
+		//refactored with processStudentlehrverband
+		$result = $this->_ci->StudentlehrverbandModel->processStudentlehrverband(
+			$student->student_uid,
+			$student->studiengang_kz,
+			0,
+			'A',
+			'',
+			$studiensemester_kurzbz,
+			Prestudentstatus_model::STATUS_ABBRECHER
+		);
 
 		if (isError($result))
 			return $result;
-		$result = getData($result);
-		if (!$result)
-		{
-			$result = $this->_ci->LehrverbandModel->load([
-				'studiengang_kz' => $student->studiengang_kz,
-				'semester' => 0,
-				'verband' => '',
-				'gruppe' => ''
-			]);
-			if (isError($result))
-				return $result;
-			$result = getData($result);
 
-			if(!$result)
-			{
-				$this->_ci->LehrverbandModel->insert([
-					'studiengang_kz' => $student->studiengang_kz,
-					'semester' => 0,
-					'verband' => '',
-					'gruppe' => '',
-					'bezeichnung' => 'Ab-Unterbrecher',
-					'aktiv' => true,
-				]);
-			}
-
-			$this->_ci->LehrverbandModel->insert([
-				'studiengang_kz' => $student->studiengang_kz,
-				'semester' => 0,
-				'verband' => 'A',
-				'gruppe' => '',
-				'bezeichnung' => 'Abbrecher',
-				'aktiv' => true
-			]);
-		}
 
 		//noch nicht eingetragene Zeugnisnoten auf 9 setzen
 		$result = $this->_ci->ZeugnisnoteModel->getZeugnisnoten($student->student_uid, $prestudent_status->studiensemester_kurzbz);
@@ -165,33 +134,6 @@ class PrestudentLib
 			}
 		}
 
-
-		//Update Aktionen
-
-		//StudentModel updaten
-		$this->_ci->StudentModel->update([
-			'student_uid' => $student->student_uid
-		], [
-			'verband' => 'A',
-			'gruppe' => '',
-			'semester' => 0,
-			'updatevon' => $insertvon,
-			'updateamum' => date('c')
-		]);
-
-		//Studentlehrverband setzen
-		$this->_ci->StudentlehrverbandModel->update([
-			'studiensemester_kurzbz' => $prestudent_status->studiensemester_kurzbz,
-			'student_uid' => $student->student_uid
-		], [
-			'studiengang_kz' => $student->studiengang_kz,
-			'semester' => 0,
-			'verband' => 'A',
-			'gruppe' => '',
-			'updateamum' => date('c'),
-			'updatevon' => $insertvon
-		]);
-
 		//Benutzer inaktiv setzen
 		$this->_ci->BenutzerModel->update([
 			'uid' =>  $student->student_uid
@@ -298,50 +240,19 @@ class PrestudentLib
 		if (isError($result))
 			return $result;
 
-		//Verband anlegen
-		$result = $this->_ci->LehrverbandModel->load([
-			'studiengang_kz' => $student->studiengang_kz,
-			'semester' => 0,
-			'verband' => 'B',
-			'gruppe' => ''
-		]);
+		//refactored with processStudentlehrverband
+		$result = $this->_ci->StudentlehrverbandModel->processStudentlehrverband(
+			$student->student_uid,
+			$student->studiengang_kz,
+			0,
+			'B',
+			'',
+			$studiensemester_kurzbz,
+			Prestudentstatus_model::STATUS_UNTERBRECHER
+		);
 
 		if (isError($result))
 			return $result;
-		$result = getData($result);
-		if (!$result)
-		{
-			$result = $this->_ci->LehrverbandModel->load([
-				'studiengang_kz' => $student->studiengang_kz,
-				'semester' => 0,
-				'verband' => '',
-				'gruppe' => ''
-			]);
-			if (isError($result))
-				return $result;
-			$result = getData($result);
-
-			if(!$result)
-			{
-				$this->_ci->LehrverbandModel->insert([
-					'studiengang_kz' => $student->studiengang_kz,
-					'semester' => 0,
-					'verband' => '',
-					'gruppe' => '',
-					'bezeichnung' => 'Ab-Unterbrecher',
-					'aktiv' => true,
-				]);
-			}
-
-			$this->_ci->LehrverbandModel->insert([
-				'studiengang_kz' => $student->studiengang_kz,
-				'semester' => 0,
-				'verband' => 'B',
-				'gruppe' => '',
-				'bezeichnung' => 'Unterbrecher',
-				'aktiv' => true
-			]);
-		}
 
 		//noch nicht eingetragene Zeugnisnoten auf 9 setzen
 		$result = $this->_ci->ZeugnisnoteModel->getZeugnisnoten($student->student_uid, $studiensemester_kurzbz);
@@ -374,56 +285,11 @@ class PrestudentLib
 			}
 		}
 
-
-		//Update Aktionen
-
-		//StudentModel updaten
-		$this->_ci->StudentModel->update([
-			'student_uid' => $student->student_uid
-		], [
-			'verband' => 'B',
-			'gruppe' => '',
-			'semester' => 0,
-			'updatevon' => $insertvon,
-			'updateamum' => date('c')
-		]);
-
-		//Studentlehrverband setzen
-		$result = $this->_ci->StudentlehrverbandModel->loadWhere([
-			'studiensemester_kurzbz' => $studiensemester_kurzbz,
-			'student_uid' => $student->student_uid
-		]);
-		if (hasData($result)) {
-			$this->_ci->StudentlehrverbandModel->update([
-				'studiensemester_kurzbz' => $studiensemester_kurzbz,
-				'student_uid' => $student->student_uid
-			], [
-				'studiengang_kz' => $student->studiengang_kz,
-				'semester' => 0,
-				'verband' => 'B',
-				'gruppe' => '',
-				'updateamum' => date('c'),
-				'updatevon' => $insertvon
-			]);
-		} else {
-			$this->_ci->StudentlehrverbandModel->insert([
-				'student_uid' => $student->student_uid,
-				'studiensemester_kurzbz' => $studiensemester_kurzbz,
-				'studiengang_kz' => $student->studiengang_kz,
-				'semester' => 0,
-				'verband' => 'B',
-				'gruppe' => '',
-				'insertamum' => date('c'),
-				'insertvon' => $insertvon
-			]);
-		}
-
 		return success();
 	}
 
 	public function setStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id)
 	{
-
 		$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
 		if (isError($result))
 			return $result;
@@ -445,7 +311,7 @@ class PrestudentLib
 
 			$studiengang = current(getData($resultStg));
 
-			$prestudent_status = ($resultStatus[0]);
+			$prestudent_status = ($resultStatus[0] ?: null );
 			if(!$prestudent_status)
 			{
 				return error($this->_ci->p->t('studierendenantrag', 'error_no_prestudent_in_sem', [
@@ -463,7 +329,7 @@ class PrestudentLib
 		if (!$result)
 			return error($this->_ci->p->t('studierendenantrag', 'error_no_student_for_prestudent', ['prestudent_id' => $prestudent_id]));
 
-		$student = current($result);
+		//	$student = current($result);
 
 		//Status updaten
 		$result = $this->_ci->PrestudentstatusModel->insert([
@@ -488,7 +354,8 @@ class PrestudentLib
 		if (isError($result)) {
 			return $result;
 		}
-		$student_uid = $result->retval;
+		//$student_uid = $result->retval;
+		$student_uid = getData($result);
 
 		//load student
 		$result = $this->_ci->StudentModel->loadWhere(
@@ -502,8 +369,9 @@ class PrestudentLib
 		}
 
 		$studentData = current(getData($result) ? : []);
-		$verband = $studentData->verband == '' ? '' : $studentData->verband;
-		$gruppe = $studentData->gruppe == '' ? '' : $studentData->gruppe;
+		//TODO(Manu) check why in FAS == 0; correct there??
+		//$verband = $studentData->verband == '' ? '' : $studentData->verband;
+		//$gruppe = $studentData->gruppe == '' ? '' : $studentData->gruppe;
 		$studiengang_kz = $studentData->studiengang_kz;
 
 		//process studentlehrverband
@@ -512,11 +380,16 @@ class PrestudentLib
 			$student_uid,
 			$studiengang_kz,
 			$ausbildungssemester,
-			$verband,
-			$gruppe,
+			"", //TODO(Manu) checkFAS: 0
+			"",//TODO(Manu) checkFAS: 0
 			$studiensemester_kurzbz
 		);
 
+		if (isError($result))
+		{
+			return $result;
+		}
+
 		return success();
 	}
 
@@ -576,18 +449,21 @@ class PrestudentLib
 			$studiensemester_kurzbz
 		);
 
+		if (isError($result))
+		{
+			return $result;
+		}
+
 		return success();
 	}
 
 	public function setDiplomand($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester)
 	{
-		$insertvon = getAuthUID();
-
 		$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
 		if (isError($result))
 			return $result;
 		if (!hasData($result))
-		return error($this->_ci->p->t('studierendenantrag', 'error_no_student_for_prestudent', ['prestudent_id' => $prestudent_id]));
+			return error($this->_ci->p->t('studierendenantrag', 'error_no_student_for_prestudent', ['prestudent_id' => $prestudent_id]));
 
 		$result = getData($result) ?: [];
 
@@ -600,8 +476,6 @@ class PrestudentLib
 		if (!$result)
 			return error($this->_ci->p->t('studierendenantrag', 'error_no_student_for_prestudent', ['prestudent_id' => $prestudent_id]));
 
-		$student = current($result);
-
 		//Status updaten
 		$result = $this->_ci->PrestudentstatusModel->insert([
 			'prestudent_id' => $prestudent_id,
@@ -609,11 +483,11 @@ class PrestudentLib
 			'studiensemester_kurzbz' => $studiensemester_kurzbz,
 			'ausbildungssemester' => $ausbildungssemester,
 			'datum' => date('c'),
-			'insertvon' => $insertvon,
+			'insertvon' => getAuthUID(),
 			'insertamum' => date('c'),
 			'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz,
 			'studienplan_id'=> $prestudent_status->studienplan_id,
-			'bestaetigtvon' => $insertvon,
+			'bestaetigtvon' => getAuthUID(),
 			'bestaetigtam' => date('c'),
 		]);
 
@@ -662,17 +536,6 @@ class PrestudentLib
 
 	public function setAbsolvent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester)
 	{
-		//TODO(Manu) why no lvb?
-/*		if (gettype($ausbildungssemester) != "integer") {
-			$ausbildungssemester = (int)$ausbildungssemester;
-		}*/
-
-/*		if (!is_string($ausbildungssemester)) {
-			$ausbildungssemester = (string)$ausbildungssemester; // Oder verwende strval($ausbildungssemester)
-		}*/
-
-		$insertvon = getAuthUID();
-		 
 		$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
 		if (isError($result))
 			return $result;
@@ -687,8 +550,6 @@ class PrestudentLib
 		if (!$result)
 			return error($this->_ci->p->t('studierendenantrag', 'error_no_student_for_prestudent', ['prestudent_id' => $prestudent_id]));
 
-		$student = current($result);
-
 		//Status updaten
 		$result = $this->_ci->PrestudentstatusModel->insert([
 			'prestudent_id' => $prestudent_id,
@@ -696,11 +557,11 @@ class PrestudentLib
 			'studiensemester_kurzbz' => $studiensemester_kurzbz,
 			'ausbildungssemester' => $ausbildungssemester,
 			'datum' => date('c'),
-			'insertvon' => $insertvon,
+			'insertvon' => getAuthUID(),
 			'insertamum' => date('c'),
 			'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz,
 			'studienplan_id'=> $prestudent_status->studienplan_id,
-			'bestaetigtvon' => $insertvon,
+			'bestaetigtvon' => getAuthUID(),
 			'bestaetigtam' => date('c'),
 		]);
 
@@ -757,8 +618,8 @@ class PrestudentLib
 		$prestudent_status = current($resultLastStatus);
 
 		//check studiensemester_kurzbz TODO(Manu) check if Necessary: already checked in staus.php changeStatus()
-/*		$studiensemester_kurzbz = $prestudent_status->studiensemester_kurzbz != $studiensemester_kurzbz ?
-			$prestudent_status->studiensemester_kurzbz : $studiensemester_kurzbz;*/
+		/*		$studiensemester_kurzbz = $prestudent_status->studiensemester_kurzbz != $studiensemester_kurzbz ?
+					$prestudent_status->studiensemester_kurzbz : $studiensemester_kurzbz;*/
 
 		//Status updaten
 		$result = $this->_ci->PrestudentstatusModel->insert([
diff --git a/application/models/education/Studentlehrverband_model.php b/application/models/education/Studentlehrverband_model.php
index d8c8c5da5..829ce856a 100644
--- a/application/models/education/Studentlehrverband_model.php
+++ b/application/models/education/Studentlehrverband_model.php
@@ -11,13 +11,18 @@ class Studentlehrverband_model extends DB_Model
 		$this->dbTable = 'public.tbl_studentlehrverband';
 		$this->pk = array('studiensemester_kurzbz', 'student_uid');
 		$this->hasSequence = false;
+
+		$this->load->model('crm/prestudentstatus_model', 'PrestudentstatusModel');
 	}
 
 	/**
 	 * Check if Studentlehrverband already exists
+	 *
 	 * @param string $student_id
+	 *
 	 * @param string $studiensemester_kurzbz
-	 * @return 1: if Rolle exists, 0: if it doesn't
+	 *
+	 * @return 1: if Studentlehrverband exists, 0: if it doesn't
 	 */
 	public function checkIfStudentlehrverbandExists($student_uid, $studiensemester_kurzbz)
 	{
@@ -46,50 +51,65 @@ class Studentlehrverband_model extends DB_Model
 		}
 	}
 
-	public function processStudentlehrverband($student_uid, $studiengang_kz, $ausbildungssemester, $verband, $gruppe, $studiensemester_kurzbz)
+	/**
+	 * update Lehrverband and Studenlehrverband
+	 *
+	 * @param char 					$student_id
+	 * @param integer 				$studiengang_kz
+	 * @param integer 				$ausbildungssemester
+	 * @param char 					$verband
+	 * @param char 					$gruppe
+	 * @param string 				$studiensemester_kurzbz
+	 *
+	 * @return success if handling lehrverband, studentlehrverband successfull
+	 * 			error if not
+	 *
+	 */
+	public function processStudentlehrverband($student_uid, $studiengang_kz, $ausbildungssemester, $verband, $gruppe, $studiensemester_kurzbz, $status_kurzbz=null)
 	{
 		$uid = getAuthUID();
-		$this->db->trans_begin(); // Start Transaktion
 
 		$this->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
 		$result = $this->LehrverbandModel->checkIfLehrverbandExists($studiengang_kz, $ausbildungssemester, $verband, $gruppe);
 		if (isError($result))
 		{
-			$this->db->trans_rollback();
 			return error("0", $this->p->t('lehre','error_updateLehrverband'));
 		}
 
-		if ($result->retval == "0") {
-
+		if ($result->retval == "0")
+		{
 			// Übergeordneten Lehrverband check and/or insert
 			$result = $this->LehrverbandModel->checkIfLehrverbandExists($studiengang_kz, $ausbildungssemester, '', '');
 			if (isError($result)) {
-				$this->db->trans_rollback();
 				return error("0", $this->p->t('lehre','error_updateLehrverband'));
 			}
 
 			if ($result->retval == "0")
 			{
+				$bezeichnung = ($status_kurzbz == PrestudentstatusModel::STATUS_ABBRECHER || $status_kurzbz == Prestudentstatus_model::STATUS_UNTERBRECHER)  ? 'Ab-Unterbrecher' : '';
 				$result = $this->LehrverbandModel->insert([
 					'studiengang_kz' => $studiengang_kz,
 					'semester' => $ausbildungssemester,
 					'verband' => '',
 					'gruppe' => '',
 					'aktiv' => true,
-					'bezeichnung' => 'Ab-Unterbrecher'
+					'bezeichnung' => $bezeichnung
 				]);
 
-				if ($this->db->trans_status() === false || isError($result))
+				if (isError($result))
 				{
-					$this->db->trans_rollback();
 					return error("0", $this->p->t('lehre','error_updateLehrverband'));
 				}
 			}
 
-
-
 			// Lehrverband insert
-			$bezeichnung = $verband == 'A' ? ' Abbrecher' : 'Unterbrecher';
+			if ($verband == 'A')
+				$bezeichnung = Prestudentstatus_model::STATUS_ABBRECHER;
+			else if ($verband == 'B')
+				$bezeichnung = Prestudentstatus_model::STATUS_BEWERBER;
+			else
+				$bezeichnung = '';
+
 			$result = $this->LehrverbandModel->insert([
 				'studiengang_kz' => $studiengang_kz,
 				'semester' => $ausbildungssemester,
@@ -99,20 +119,17 @@ class Studentlehrverband_model extends DB_Model
 				'aktiv' => true
 			]);
 
-			if ($this->db->trans_status() === false || isError($result)) {
-				$this->db->trans_rollback();
+			if (isError($result)) {
 				return error("0", $this->p->t('lehre','error_updateLehrverband'));
 			}
 		}
 
-
 		// Studentlehrverband insert or update
 		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
 		$result = $this->StudentlehrverbandModel->checkIfStudentLehrverbandExists($student_uid, $studiensemester_kurzbz);
 		if (isError($result))
 		{
-			$this->db->trans_rollback();
-			return error(getError($result));
+			return error($result);
 		}
 
 		if ($result->retval == "0")
@@ -127,8 +144,7 @@ class Studentlehrverband_model extends DB_Model
 				'insertvon' => $uid,
 				'studiengang_kz' => $studiengang_kz
 			]);
-			if ($this->db->trans_status() === false || isError($result)) {
-				$this->db->trans_rollback();
+			if (isError($result)) {
 				return error("0", $this->p->t('lehre','error_updateStudentlehrverband'));
 			}
 		}
@@ -148,18 +164,16 @@ class Studentlehrverband_model extends DB_Model
 					'studiengang_kz' => $studiengang_kz
 				]
 			);
-			if ($this->db->trans_status() === false || isError($result)) {
-				$this->db->trans_rollback();
+			if (isError($result)) {
 				return error("0", $this->p->t('lehre','error_updateStudentlehrverband'));
 			}
 		}
 
-		// finish transaktion
-		if ($this->db->trans_status() === false || isError($result)) {
-			$this->db->trans_rollback();
+		if (isError($result)) {
 			return error("0", $this->p->t('lehre','error_updateStudentlehrverband'));
-		} else {
-			$this->db->trans_commit();
+		}
+		else
+		{
 			return success();
 		}
 	}

From a78976b136f91fc271a09837c13de79bb224e64d Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 6 Aug 2024 08:21:02 +0200
Subject: [PATCH 1068/1461] codesniff Status.php

---
 .../api/frontend/v1/stv/Status.php            | 222 +++++++++---------
 1 file changed, 108 insertions(+), 114 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index b695fff11..df6fdb5b5 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -185,7 +185,6 @@ class Status extends FHCAPI_Controller
 		$data = $this->getDataOrTerminateWithError($result);
 
 		$this->terminateWithSuccess($data);
-
 	}
 
 	public function changeStatus($prestudent_id)
@@ -273,13 +272,14 @@ class Status extends FHCAPI_Controller
 				//Check Bewerberstatus
 				[
 					'checkIfExistingBewerberstatus', function () use ($prestudent_id, $status_kurzbz) {
-					if ($status_kurzbz != Prestudentstatus_model::STATUS_AUFGENOMMENER &&
-						$status_kurzbz != Prestudentstatus_model::STATUS_WARTENDER &&
-						$status_kurzbz != Prestudentstatus_model::STATUS_ABGEWIESENER)
+						if ($status_kurzbz != Prestudentstatus_model::STATUS_AUFGENOMMENER &&
+							$status_kurzbz != Prestudentstatus_model::STATUS_WARTENDER &&
+							$status_kurzbz != Prestudentstatus_model::STATUS_ABGEWIESENER
+							)
 						return true;
-					$result = $this->prestudentstatuschecklib->checkIfExistingBewerberstatus($prestudent_id);
-					return $this->getDataOrTerminateWithError($result);
-				}],
+						$result = $this->prestudentstatuschecklib->checkIfExistingBewerberstatus($prestudent_id);
+						return $this->getDataOrTerminateWithError($result);
+					}],
 				//Check If Student
 				['status_stud_exists', function ($value) use ($prestudent_id) {
 					if ($value != Prestudentstatus_model::STATUS_STUDENT)
@@ -289,7 +289,8 @@ class Status extends FHCAPI_Controller
 
 					return $this->getDataOrTerminateWithError($result);
 				}],
-			],	[
+			],
+			[
 				'reihungstest_check' => $this->p->t('lehre', 'error_keinReihungstestverfahren', ['name' => $studentName]),
 				'checkIfExistingBewerberstatus' => $this->p->t('lehre', 'error_keinBewerber', ['name' => $studentName]),
 				'checkIfZGV' => $this->p->t('lehre', 'error_ZGVNichtEingetragen', ['name' => $studentName]),
@@ -500,143 +501,126 @@ class Status extends FHCAPI_Controller
 
 		switch($status_kurzbz){
 			case Prestudentstatus_model::STATUS_ABBRECHER:
+				$studiensemester_kurzbz = $lastStatusData->studiensemester_kurzbz;
+
+				$this->load->model('crm/Statusgrund_model', 'StatusgrundModel');
+				$result = $this->StatusgrundModel->load($statusgrund_id);
+				if (isError($result))
 				{
-					$studiensemester_kurzbz = $lastStatusData->studiensemester_kurzbz;
-
-					$this->load->model('crm/Statusgrund_model', 'StatusgrundModel');
-					$result = $this->StatusgrundModel->load($statusgrund_id);
-					if (isError($result))
-					{
-						return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-					}
-					$result = current(getData($result));
-					$statusgrund_kurzbz = $result->statusgrund_kurzbz;
-
-					$this->load->library('PrestudentLib');
-					$result = $this->prestudentlib->setAbbrecher($prestudent_id, $studiensemester_kurzbz, null, $statusgrund_kurzbz, $datum, null, null);
-					if (isError($result))
-					{
-						return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-					}
-					else
-						$this->terminateWithSuccess($prestudent_id);
+					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 				}
+				$result = current(getData($result));
+				$statusgrund_kurzbz = $result->statusgrund_kurzbz;
+
+				$this->load->library('PrestudentLib');
+				$result = $this->prestudentlib->setAbbrecher(
+					$prestudent_id,
+					$studiensemester_kurzbz,
+					null,
+					$statusgrund_kurzbz,
+					$datum,
+					null,
+					null
+				);
+				if (isError($result))
+				{
+					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+				}
+				else
+					$this->terminateWithSuccess($prestudent_id);
 				break;
 			case Prestudentstatus_model::STATUS_UNTERBRECHER:
-				{
-					$ausbildungssemester = $lastStatusData->ausbildungssemester;
-					$studiensemester_kurzbz = $lastStatusData->studiensemester_kurzbz;
+				$ausbildungssemester = $lastStatusData->ausbildungssemester;
+				$studiensemester_kurzbz = $lastStatusData->studiensemester_kurzbz;
 
-					$this->load->library('PrestudentLib');
-					$result = $this->prestudentlib->setUnterbrecher($prestudent_id, $studiensemester_kurzbz, null, null, $ausbildungssemester);
-					if (isError($result))
-					{
-						return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-					}
-					else
-						$this->terminateWithSuccess($prestudent_id);
+				$this->load->library('PrestudentLib');
+				$result = $this->prestudentlib->setUnterbrecher($prestudent_id, $studiensemester_kurzbz, null, null, $ausbildungssemester);
+				if (isError($result))
+				{
+					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 				}
+				else
+					$this->terminateWithSuccess($prestudent_id);
 				break;
 			case Prestudentstatus_model::STATUS_STUDENT:
+				$this->load->library('PrestudentLib');
+				$result = $this->prestudentlib->setStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id);
+
+				if (isError($result))
 				{
-					$this->load->library('PrestudentLib');
-					$result = $this->prestudentlib->setStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id);
-
-					if (isError($result))
-					{
-						return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-					}
-					else
-						$this->terminateWithSuccess($prestudent_id);
-
+					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 				}
+				else
+					$this->terminateWithSuccess($prestudent_id);
 				break;
 			case Prestudentstatus_model::STATUS_DIPLOMAND:
-				{
-					$this->load->library('PrestudentLib');
-					$result = $this->prestudentlib->setDiplomand($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
+				$this->load->library('PrestudentLib');
+				$result = $this->prestudentlib->setDiplomand($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
 
-					if (isError($result))
-					{
-						return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-					}
-					else
-						$this->terminateWithSuccess($prestudent_id);
+				if (isError($result))
+				{
+					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 				}
+				else
+					$this->terminateWithSuccess($prestudent_id);
 				break;
 			case Prestudentstatus_model::STATUS_ABSOLVENT:
+				$this->load->library('PrestudentLib');
+				$result = $this->prestudentlib->setAbsolvent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
+
+				if (isError($result))
 				{
-					$this->load->library('PrestudentLib');
-					$result = $this->prestudentlib->setAbsolvent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
-
-					if (isError($result))
-					{
-						return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-					}
-					else
-						$this->terminateWithSuccess($prestudent_id);
-
+					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 				}
+				else
+					$this->terminateWithSuccess($prestudent_id);
 				break;
 			case Prestudentstatus_model::STATUS_BEWERBER:
+				$this->load->library('PrestudentLib');
+				$result = $this->prestudentlib->setBewerber($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
+
+				if (isError($result))
 				{
-					$this->load->library('PrestudentLib');
-					$result = $this->prestudentlib->setBewerber($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
-
-					if (isError($result))
-					{
-						return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-					}
-					else
-						$this->terminateWithSuccess($prestudent_id);
-
+					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 				}
+				else
+					$this->terminateWithSuccess($prestudent_id);
 				break;
 			case Prestudentstatus_model::STATUS_AUFGENOMMENER:
+				$this->load->library('PrestudentLib');
+				$result = $this->prestudentlib->setAufgenommener($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
+
+				if (isError($result))
 				{
-					$this->load->library('PrestudentLib');
-					$result = $this->prestudentlib->setAufgenommener($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
-
-					if (isError($result))
-					{
-						return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-					}
-					else
-						$this->terminateWithSuccess($prestudent_id);
-
+					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 				}
+				else
+					$this->terminateWithSuccess($prestudent_id);
 				break;
 			case Prestudentstatus_model::STATUS_ABGEWIESENER:
+				$this->load->library('PrestudentLib');
+				$result = $this->prestudentlib->setAbgewiesener($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id);
+
+				if (isError($result))
 				{
-					$this->load->library('PrestudentLib');
-					$result = $this->prestudentlib->setAbgewiesener($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id);
-
-					if (isError($result))
-					{
-						return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-					}
-					else
-						$this->terminateWithSuccess($prestudent_id);
-
+					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 				}
+				else
+					$this->terminateWithSuccess($prestudent_id);
 				break;
 			case Prestudentstatus_model::STATUS_WARTENDER:
-				{
-					$this->load->library('PrestudentLib');
-					$result = $this->prestudentlib->setWartender($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
+				$this->load->library('PrestudentLib');
+				$result = $this->prestudentlib->setWartender($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
 
-					if (isError($result))
-					{
-						return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-					}
-					else
-						$this->terminateWithSuccess($prestudent_id);
+				if (isError($result))
+				{
+					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 				}
+				else
+					$this->terminateWithSuccess($prestudent_id);
 				break;
 			default:
-			{
 				$this->terminateWithError("Action not yet defined in Prestudentlib", self::ERROR_TYPE_GENERAL);
-			}
 		}
 	}
 
@@ -700,7 +684,7 @@ class Status extends FHCAPI_Controller
 					$result = $this->prestudentstatuschecklib->checkIfZGVEingetragen($prestudent_person);
 					return $this->getDataOrTerminateWithError($result);
 				}],
-				//Check ZGV Master //TODO(Manu) test
+				//Check ZGV Master
 				['checkIfZGVMaster', function ($value) use ($prestudent_person) {
 					if (!ZGV_CHECK)
 						return true;
@@ -749,7 +733,8 @@ class Status extends FHCAPI_Controller
 					);
 					return $this->getDataOrTerminateWithError($result);
 				}]
-			],	[
+			],
+			[
 				'reihungstest_check' => $this->p->t('lehre', 'error_keinReihungstestverfahren', ['name' => $studentName]),
 				'checkIfExistingBewerberstatus' => $this->p->t('lehre', 'error_keinBewerber', ['name' => $studentName]),
 				'checkIfExistingAufgenommenerstatus' => $this->p->t('lehre', 'error_keinAufgenommener', ['name' => $studentName]),
@@ -867,7 +852,7 @@ class Status extends FHCAPI_Controller
 		}
 		if ($result->retval != "0")
 		{
-			return $this->terminateWithError($this->p->t('lehre','error_benutzerBereitsVorhanden', ['uid' => $uidStudent]), self::ERROR_TYPE_GENERAL);
+			return $this->terminateWithError($this->p->t('lehre', 'error_benutzerBereitsVorhanden', ['uid' => $uidStudent]), self::ERROR_TYPE_GENERAL);
 		}
 
 		$aktivierungscode = null;
@@ -918,7 +903,16 @@ class Status extends FHCAPI_Controller
 		}
 
 		$this->load->library('PrestudentLib');
-		$result = $this->prestudentlib->setFirstStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id, date('c'), getAuthUID(), $stg, $uidStudent);
+		$result = $this->prestudentlib->setFirstStudent(
+			$prestudent_id,
+			$studiensemester_kurzbz,
+			$ausbildungssemester,
+			$statusgrund_id,
+			date('c'),
+			getAuthUID(),
+			$stg,
+			$uidStudent
+		);
 
 		$this->getDataOrTerminateWithError($result);
 
@@ -951,7 +945,7 @@ class Status extends FHCAPI_Controller
 
 		elseif (!hasData($result))
 		{
-			$this->terminateWithError($this->p->t('lehre','error_noStatusFound'), self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError($this->p->t('lehre', 'error_noStatusFound'), self::ERROR_TYPE_GENERAL);
 		}
 		else
 		{
@@ -2006,6 +2000,6 @@ class Status extends FHCAPI_Controller
 	private function _sanitizeAliasName($str)
 	{
 		$str = sanitizeProblemChars($str);
-		return mb_strtolower(str_replace(' ','_', $str));
+		return mb_strtolower(str_replace(' ', '_', $str));
 	}
 }

From a728d20b70610d38a70c8f66a163242c646936d6 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 6 Aug 2024 08:42:20 +0200
Subject: [PATCH 1069/1461] codesniff Models

---
 application/models/crm/Prestudent_model.php   |  3 +-
 .../models/crm/Prestudentstatus_model.php     |  8 ++--
 application/models/crm/Status_model.php       |  1 -
 application/models/crm/Student_model.php      | 48 ++++++++++++-------
 application/models/person/Benutzer_model.php  | 14 +++---
 5 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/application/models/crm/Prestudent_model.php b/application/models/crm/Prestudent_model.php
index 9721e473f..be5337162 100644
--- a/application/models/crm/Prestudent_model.php
+++ b/application/models/crm/Prestudent_model.php
@@ -708,7 +708,8 @@ class Prestudent_model extends DB_Model
 	public function getHistoryPrestudents($person_id)
 	{
 		$query = "
-			SELECT ps.studiensemester_kurzbz, p.priorisierung, p.studiengang_kz, sg.kurzbzlang, sg.orgform_kurzbz, ps.status_kurzbz, s.student_uid, sp.bezeichnung, ps.ausbildungssemester,
+			SELECT ps.studiensemester_kurzbz, p.priorisierung, p.studiengang_kz, sg.kurzbzlang, sg.orgform_kurzbz, 
+					ps.status_kurzbz, s.student_uid, sp.bezeichnung, ps.ausbildungssemester,
 			       CONCAT(ps.status_kurzbz, ' (', ps.ausbildungssemester, '. Semester)') as status, p.prestudent_id
 			FROM public.tbl_prestudent p
 			JOIN (
diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php
index 96380a6c0..aa2a8a3b0 100644
--- a/application/models/crm/Prestudentstatus_model.php
+++ b/application/models/crm/Prestudentstatus_model.php
@@ -404,7 +404,7 @@ class Prestudentstatus_model extends DB_Model
 		}
 		else
 		{
-			return success("1", $this->p->t('lehre','error_rolleBereitsVorhandenMitNamen', ['name' => $studentName]));
+			return success("1", $this->p->t('lehre', 'error_rolleBereitsVorhandenMitNamen', ['name' => $studentName]));
 		}
 	}
 
@@ -442,7 +442,7 @@ class Prestudentstatus_model extends DB_Model
 		}
 		elseif (!hasData($result))
 		{
-			return success("0", $this->p->t('lehre','error_keinBewerber', ['name' => $studentName]));
+			return success("0", $this->p->t('lehre', 'error_keinBewerber', ['name' => $studentName]));
 		}
 		else
 		{
@@ -450,7 +450,7 @@ class Prestudentstatus_model extends DB_Model
 		}
 	}
 
-		/**
+	/**
 	 * Check if Rolle there is an existing Aufgenommenerstatus
 	 * @param integer $prestudent_id
 	 * @return error if no status Aufgenommener, success if existing
@@ -484,7 +484,7 @@ class Prestudentstatus_model extends DB_Model
 		}
 		elseif (!hasData($result))
 		{
-			return success("0", $this->p->t('lehre','error_keinAufgenommener', ['name' => $studentName]));
+			return success("0", $this->p->t('lehre', 'error_keinAufgenommener', ['name' => $studentName]));
 		}
 		else
 		{
diff --git a/application/models/crm/Status_model.php b/application/models/crm/Status_model.php
index 6133b64e2..1ee2a5199 100644
--- a/application/models/crm/Status_model.php
+++ b/application/models/crm/Status_model.php
@@ -27,6 +27,5 @@ class Status_model extends DB_Model
 		return $this->loadWhere([
 			'aktiv'=> true,
 		]);
-
 	}
 }
diff --git a/application/models/crm/Student_model.php b/application/models/crm/Student_model.php
index 1bc77420c..023751f7c 100644
--- a/application/models/crm/Student_model.php
+++ b/application/models/crm/Student_model.php
@@ -73,9 +73,15 @@ class Student_model extends DB_Model
 			//Lehrgang
 			switch($art)
 			{
-				case 'WS': $art = '3'; break;
-				case 'SS': $art = '4'; break;
-				default: $art = '0'; break;
+				case 'WS':
+					$art = '3';
+					break;
+				case 'SS':
+					$art = '4';
+					break;
+				default:
+					$art = '0';
+					break;
 			}
 		}
 		else
@@ -83,9 +89,15 @@ class Student_model extends DB_Model
 			//Studiengang
 			switch($art)
 			{
-				case 'WS': $art = '1'; break;
-				case 'SS': $art = '2'; break;
-				default: $art = '0'; break;
+				case 'WS':
+					$art = '1';
+					break;
+				case 'SS':
+					$art = '2';
+					break;
+				default:
+					$art = '0';
+					break;
 			}
 		}
 		if($art=='2' || $art=='4')
@@ -95,11 +107,11 @@ class Student_model extends DB_Model
 		//(AO sind normal 9+erhalter Nummer, matrikelnr/personenkz wird auch im DVUH Extension berücksichtigt)
 		if ($studiengang_kz >= 90010 && $studiengang_kz <= 90019)
 		{
-			$matrikelnummer = sprintf("%02d",$jahr).$art.substr($studiengang_kz, 0, 4);
+			$matrikelnummer = sprintf("%02d", $jahr).$art.substr($studiengang_kz, 0, 4);
 		}
 		else
 		{
-			$matrikelnummer = sprintf("%02d",$jahr).$art.sprintf("%04d",$studiengang_kz);
+			$matrikelnummer = sprintf("%02d", $jahr).$art.sprintf("%04d", $studiengang_kz);
 		}
 
 		$qry = "SELECT matrikelnr FROM public.tbl_student WHERE matrikelnr LIKE ? ORDER BY matrikelnr DESC LIMIT 1";
@@ -109,12 +121,12 @@ class Student_model extends DB_Model
 		if ($matrikelnrres && hasData($matrikelnrres)) {
 			$max = mb_substr($matrikelnrres->retval[0]->matrikelnr, 7);
 			if (!is_numeric($max)) {
-				$max = (int) $max;
+				$max = (int)$max;
 			}
 		}
 
 		$max += 1;
-		return success ($matrikelnummer.sprintf("%03d", $max));
+		return success($matrikelnummer.sprintf("%03d", $max));
 	}
 
 	// ****
@@ -127,7 +139,7 @@ class Student_model extends DB_Model
 	// * 001 = Laufende Nummer  Wenn StSem==SS dann wird zur Nummer 500 dazugezaehlt
 	// * Bei Incoming im Masterstudiengang wird auch 500 dazugezaehlt
 	// ****
-	function generateUID($stgkzl, $jahr, $stgtyp, $matrikelnummer)
+	public function generateUID($stgkzl, $jahr, $stgtyp, $matrikelnummer)
 	{
 		$art = mb_substr($matrikelnummer, 2, 1);
 		$nr = mb_substr($matrikelnummer, mb_strlen(trim($matrikelnummer))-3);
@@ -139,7 +151,7 @@ class Student_model extends DB_Model
 			$nr = $nr+500;
 
 
-		return success (mb_strtolower($stgkzl.$jahr.($art!='0'?$stgtyp:'x').$nr));
+		return success(mb_strtolower($stgkzl.$jahr.($art!='0'?$stgtyp:'x').$nr));
 	}
 
 
@@ -179,18 +191,17 @@ class Student_model extends DB_Model
 
 		if(isError($result))
 		{
-			return error( "Error while checking student_uid");
+			return error("Error while checking student_uid");
 		}
 
 		if (!hasData($result))
 		{
-			return success("0","Keine Student_uid vorhanden");
+			return success("0", "Keine Student_uid vorhanden");
 		}
 
 		$student_uid = $result->retval[0]->student_uid;
 
-		return success ($student_uid);
-
+		return success($student_uid);
 	}
 
 	public function searchStudent($filter)
@@ -204,7 +215,8 @@ class Student_model extends DB_Model
 			OR lower(person.nachname) like ".$this->db->escape('%'.$filter.'%')."
 			OR lower(person.vorname) like ".$this->db->escape('%'.$filter.'%')."
 			OR lower(person.nachname || ' ' || person.vorname) like ".$this->db->escape('%'.$filter.'%')."
-			OR lower(person.vorname || ' ' || person.nachname) like ".$this->db->escape('%'.$filter.'%'));
+			OR lower(person.vorname || ' ' || person.nachname) like ".$this->db->escape('%'.$filter.'%')
+		);
 
 		return $result;
 	}
@@ -245,7 +257,7 @@ class Student_model extends DB_Model
 			$resultObject = current(getData($result));
 
 			if (property_exists($resultObject, 'anzahl')) {
-				$resultValue = (int) $resultObject->anzahl;
+				$resultValue = (int)$resultObject->anzahl;
 
 				if ($resultValue > 0)
 				{
diff --git a/application/models/person/Benutzer_model.php b/application/models/person/Benutzer_model.php
index ed275c52c..0c1a6fddf 100644
--- a/application/models/person/Benutzer_model.php
+++ b/application/models/person/Benutzer_model.php
@@ -133,20 +133,20 @@ class Benutzer_model extends DB_Model
 	private function _sanitizeAliasName($str)
 	{
 		$str = sanitizeProblemChars($str);
-		return mb_strtolower(str_replace(' ','_', $str));
+		return mb_strtolower(str_replace(' ', '_', $str));
 	}
 
 	/**
 	 * Generiert einen Aktivierungscode
 	 */
-	function generateActivationKey()
+	public function generateActivationKey()
 	{
 		$keyvalues=array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F');
 		$key='';
-		for($i=0;$i<32;$i++)
-			$key.=$keyvalues[mt_rand(0,15)];
+		for($i=0; $i<32; $i++)
+			$key.=$keyvalues[mt_rand(0, 15)];
 
-		return success(md5(encryptData(uniqid(mt_rand(), true),$key)));
+		return success(md5(encryptData(uniqid(mt_rand(), true), $key)));
 	}
 
 	/**
@@ -174,7 +174,7 @@ class Benutzer_model extends DB_Model
 
 		if (property_exists($resultObject, 'anzahl'))
 		{
-			$resultValue = (int) $resultObject->anzahl;
+			$resultValue = (int)$resultObject->anzahl;
 
 			if ($resultValue > 0)
 			{
@@ -184,6 +184,6 @@ class Benutzer_model extends DB_Model
 			{
 				return success("0");
 			}
-		}	
+		}
 	}
 }

From 235a8a73e96ddfa3b1ad47c7f94fa601276ac9bf Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 6 Aug 2024 08:49:23 +0200
Subject: [PATCH 1070/1461] codessniff studentlehrverband_model

---
 .../education/Studentlehrverband_model.php    | 36 ++++++++++++-------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/application/models/education/Studentlehrverband_model.php b/application/models/education/Studentlehrverband_model.php
index 829ce856a..e3c96c2ac 100644
--- a/application/models/education/Studentlehrverband_model.php
+++ b/application/models/education/Studentlehrverband_model.php
@@ -43,11 +43,11 @@ class Studentlehrverband_model extends DB_Model
 		}
 		elseif (!hasData($result))
 		{
-			return success("0", $this->p->t('lehre','error_noStudentlehrverband'));
+			return success("0", $this->p->t('lehre', 'error_noStudentlehrverband'));
 		}
 		else
 		{
-			return success("1", $this->p->t('lehre','error_updateStudentlehrverband'));
+			return success("1", $this->p->t('lehre', 'error_updateStudentlehrverband'));
 		}
 	}
 
@@ -65,15 +65,22 @@ class Studentlehrverband_model extends DB_Model
 	 * 			error if not
 	 *
 	 */
-	public function processStudentlehrverband($student_uid, $studiengang_kz, $ausbildungssemester, $verband, $gruppe, $studiensemester_kurzbz, $status_kurzbz=null)
-	{
+	public function processStudentlehrverband(
+		$student_uid,
+		$studiengang_kz,
+		$ausbildungssemester,
+		$verband,
+		$gruppe,
+		$studiensemester_kurzbz,
+		$status_kurzbz = null
+	) {
 		$uid = getAuthUID();
 
 		$this->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
 		$result = $this->LehrverbandModel->checkIfLehrverbandExists($studiengang_kz, $ausbildungssemester, $verband, $gruppe);
 		if (isError($result))
 		{
-			return error("0", $this->p->t('lehre','error_updateLehrverband'));
+			return error("0", $this->p->t('lehre', 'error_updateLehrverband'));
 		}
 
 		if ($result->retval == "0")
@@ -81,12 +88,15 @@ class Studentlehrverband_model extends DB_Model
 			// Übergeordneten Lehrverband check and/or insert
 			$result = $this->LehrverbandModel->checkIfLehrverbandExists($studiengang_kz, $ausbildungssemester, '', '');
 			if (isError($result)) {
-				return error("0", $this->p->t('lehre','error_updateLehrverband'));
+				return error("0", $this->p->t('lehre', 'error_updateLehrverband'));
 			}
 
 			if ($result->retval == "0")
 			{
-				$bezeichnung = ($status_kurzbz == PrestudentstatusModel::STATUS_ABBRECHER || $status_kurzbz == Prestudentstatus_model::STATUS_UNTERBRECHER)  ? 'Ab-Unterbrecher' : '';
+				$bezeichnung = (
+					$status_kurzbz == PrestudentstatusModel::STATUS_ABBRECHER
+					|| $status_kurzbz == Prestudentstatus_model::STATUS_UNTERBRECHER)
+					? 'Ab-Unterbrecher' : '';
 				$result = $this->LehrverbandModel->insert([
 					'studiengang_kz' => $studiengang_kz,
 					'semester' => $ausbildungssemester,
@@ -98,14 +108,14 @@ class Studentlehrverband_model extends DB_Model
 
 				if (isError($result))
 				{
-					return error("0", $this->p->t('lehre','error_updateLehrverband'));
+					return error("0", $this->p->t('lehre', 'error_updateLehrverband'));
 				}
 			}
 
 			// Lehrverband insert
 			if ($verband == 'A')
 				$bezeichnung = Prestudentstatus_model::STATUS_ABBRECHER;
-			else if ($verband == 'B')
+			elseif ($verband == 'B')
 				$bezeichnung = Prestudentstatus_model::STATUS_BEWERBER;
 			else
 				$bezeichnung = '';
@@ -120,7 +130,7 @@ class Studentlehrverband_model extends DB_Model
 			]);
 
 			if (isError($result)) {
-				return error("0", $this->p->t('lehre','error_updateLehrverband'));
+				return error("0", $this->p->t('lehre', 'error_updateLehrverband'));
 			}
 		}
 
@@ -145,7 +155,7 @@ class Studentlehrverband_model extends DB_Model
 				'studiengang_kz' => $studiengang_kz
 			]);
 			if (isError($result)) {
-				return error("0", $this->p->t('lehre','error_updateStudentlehrverband'));
+				return error("0", $this->p->t('lehre', 'error_updateStudentlehrverband'));
 			}
 		}
 		else
@@ -165,12 +175,12 @@ class Studentlehrverband_model extends DB_Model
 				]
 			);
 			if (isError($result)) {
-				return error("0", $this->p->t('lehre','error_updateStudentlehrverband'));
+				return error("0", $this->p->t('lehre', 'error_updateStudentlehrverband'));
 			}
 		}
 
 		if (isError($result)) {
-			return error("0", $this->p->t('lehre','error_updateStudentlehrverband'));
+			return error("0", $this->p->t('lehre', 'error_updateStudentlehrverband'));
 		}
 		else
 		{

From 50b15b9506ada180acadbdbb900a83deda90d9a3 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 6 Aug 2024 09:47:39 +0200
Subject: [PATCH 1071/1461] codesniff libs

---
 application/libraries/PrestudentLib.php       | 12 +++----
 .../libraries/PrestudentstatusCheckLib.php    | 33 +++++++++----------
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php
index 45d8acb8d..d8950ad43 100644
--- a/application/libraries/PrestudentLib.php
+++ b/application/libraries/PrestudentLib.php
@@ -644,8 +644,8 @@ class PrestudentLib
 			return success();
 	}
 
-	public function setAufgenommener($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester){
-
+	public function setAufgenommener($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester)
+	{
 		$resultLastStatus = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
 		if (isError($resultLastStatus))
 			return $resultLastStatus;
@@ -677,8 +677,8 @@ class PrestudentLib
 			return success();
 	}
 
-	public function setAbgewiesener($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id){
-
+	public function setAbgewiesener($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id)
+	{
 		$resultLastStatus = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
 		if (isError($resultLastStatus))
 			return $resultLastStatus;
@@ -710,8 +710,8 @@ class PrestudentLib
 			return success();
 	}
 
-	public function setWartender($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester){
-
+	public function setWartender($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester)
+	{
 		$resultLastStatus = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
 		if (isError($resultLastStatus))
 			return $resultLastStatus;
diff --git a/application/libraries/PrestudentstatusCheckLib.php b/application/libraries/PrestudentstatusCheckLib.php
index 27bbc4194..56739e567 100644
--- a/application/libraries/PrestudentstatusCheckLib.php
+++ b/application/libraries/PrestudentstatusCheckLib.php
@@ -175,14 +175,14 @@ class PrestudentstatusCheckLib
 	 * @return booleans $zgv_code, error if not registered
 	 */
 	//TODO(Manu) TEST
-	public function checkIfZGVEingetragenMaster($prestudent, $typ=null)
+	public function checkIfZGVEingetragenMaster($prestudent, $typ = null)
 	{
 		$this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
 		$result = $this->_ci->StudiengangModel->load($prestudent->studiengang_kz);
 		if (isError($result))
 			return $result;
 		if (!hasData($result))
-			return error($this->_ci->p->t('studierendenantrag','error_no_stg', ['studiengang_kz' => $prestudent->studiengang_kz])); // TODO(chris): phrase
+			return error($this->_ci->p->t('studierendenantrag', 'error_no_stg', ['studiengang_kz' => $prestudent->studiengang_kz])); // TODO(chris): phrase
 
 		if (current($result->retval)->typ != 'm')
 			return success(true); // TODO(chris): correct?
@@ -194,7 +194,7 @@ class PrestudentstatusCheckLib
 	 * Checks if a bewerber status already exists.
 	 *
 	 * @param integer $prestudent_id
-	 * 
+	 *
 	 * @return stdClass
 	 */
 	public function checkIfExistingBewerberstatus($prestudent_id)
@@ -213,8 +213,8 @@ class PrestudentstatusCheckLib
 	 * Checks if status aufgenommen already exists.
 	 *
 	 * @param integer $prestudent_id
-	 * 
-	 *  @return stdClass
+	 *
+	 * @return stdClass
 	 */
 	public function checkIfExistingAufgenommenerstatus($prestudent_id)
 	{
@@ -782,7 +782,7 @@ class PrestudentstatusCheckLib
 					&& $new_status_ausbildungssemester == $old_status_ausbildungssemester)
 				{
 					// ...neuen status an selber stelle einfügen wie zu ändernder Status
-					$resultArr[$status_to_change_index] = (object) array_merge((array) $resultArr[$status_to_change_index], (array) $neuer_status);
+					$resultArr[$status_to_change_index] = (object)array_merge((array)$resultArr[$status_to_change_index], (array)$neuer_status);
 					$newStatusInserted = true;
 				}
 				else
@@ -894,18 +894,18 @@ class PrestudentstatusCheckLib
 
 			// wenn erster Studentstatus, checken ob Orgform des Bewerbers mit Studenten übereinstimmt
 			if (!isEmptyArray(
-					array_filter(
-						$restliche_status_obj,
-						function ($s) use ($ersterStudent) {
-							return
-								$s->status_kurzbz == self::BEWERBER_STATUS
-								&& (
-									$s->studienplan_orgform_kurzbz != $ersterStudent->studienplan_orgform_kurzbz
-								);
-						}
-					)
+				array_filter(
+					$restliche_status_obj,
+					function ($s) use ($ersterStudent) {
+						return
+							$s->status_kurzbz == self::BEWERBER_STATUS
+							&& (
+								$s->studienplan_orgform_kurzbz != $ersterStudent->studienplan_orgform_kurzbz
+							);
+					}
 				)
 			)
+			)
 			{
 				return error($studentName . ' ' . $this->_ci->p->t('lehre', 'error_bewerberOrgformUngleichStudentOrgform'));
 			}
@@ -913,5 +913,4 @@ class PrestudentstatusCheckLib
 
 		return $resultPs;
 	}
-
 }

From 7abe95ba5f0d1d49fc4a6eb48ae2efa7a6e54143 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Tue, 6 Aug 2024 10:48:20 +0200
Subject: [PATCH 1072/1461] Adapted LvsByStudienplan query to retrieve also
 Lehreinheitgruppen

---
 .../education/Lehrveranstaltung_model.php     | 37 ++++++++++++++++---
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git a/application/models/education/Lehrveranstaltung_model.php b/application/models/education/Lehrveranstaltung_model.php
index 928237118..904433439 100644
--- a/application/models/education/Lehrveranstaltung_model.php
+++ b/application/models/education/Lehrveranstaltung_model.php
@@ -73,24 +73,49 @@ class Lehrveranstaltung_model extends DB_Model
 	{
 		$qry = '
 			SELECT
-				lv.oe_kurzbz AS "lv_oe_kurzbz",
+				lv.oe_kurzbz AS lv_oe_kurzbz,
 				CASE
                     WHEN oe.organisationseinheittyp_kurzbz = \'Kompetenzfeld\' THEN (\'KF \' || oe.bezeichnung)
                     WHEN oe.organisationseinheittyp_kurzbz = \'Department\' THEN (\'DEP \' || oe.bezeichnung)
                     ELSE (oe.organisationseinheittyp_kurzbz || \' \' || oe.bezeichnung)
-                END AS "lv_oe_bezeichnung",
+                END AS lv_oe_bezeichnung,
 				stplsem.studiensemester_kurzbz,
 				studienordnung_id,
 				sto.studiengang_kz,
 				stpl.studienplan_id,
 				stplsem.semester,
 				stpl.orgform_kurzbz,
-				upper(stg.typ || stg.kurzbz) AS "stg_typ_kurzbz",    
-				stg.bezeichnung AS "stg_bezeichnung",
-				stgtyp.bezeichnung AS "stg_typ_bezeichnung",
+				upper(stg.typ || stg.kurzbz) AS stg_typ_kurzbz,    
+				stg.bezeichnung AS stg_bezeichnung,
+				stgtyp.bezeichnung AS stg_typ_bezeichnung,
 			    lv.lehrveranstaltung_id,
 				lv.semester,   		
-				lv.bezeichnung AS "lv_bezeichnung"
+				lv.bezeichnung AS lv_bezeichnung,
+				(
+				    -- comma seperated string of all lehreinheitgruppen
+					SELECT string_agg(bezeichnung, \', \') AS lehreinheitgruppe_bezeichnung
+					FROM(
+					    -- distinct bezeichnung, as may come multiple times from different lehreinheiten
+						SELECT DISTINCT ON (studiengang_kz, bezeichnung) studiengang_kz, bezeichnung FROM
+						(
+							-- distinct lehreinheitgruppe, as may come multiple times from different lehrform
+							SELECT DISTINCT ON (legr.lehreinheitgruppe_id) legr.studiengang_kz,
+								-- get Spezialgruppe or Lehrverbandgruppe 
+								COALESCE(
+									legr.gruppe_kurzbz,
+									CONCAT( UPPER(stg1.typ), UPPER(stg1.kurzbz), \'-\', legr.semester, legr.verband, legr.gruppe )
+								) as bezeichnung
+							FROM lehre.tbl_lehreinheitgruppe 	legr
+							JOIN lehre.tbl_lehreinheit 			le USING (lehreinheit_id)
+							JOIN lehre.tbl_lehrveranstaltung 	lv1 USING (lehrveranstaltung_id)
+							JOIN public.tbl_studiengang 		stg1 ON stg1.studiengang_kz = legr.studiengang_kz
+							WHERE lv1.lehrveranstaltung_id 		= lv.lehrveranstaltung_id
+							AND le.studiensemester_kurzbz 		= stplsem.studiensemester_kurzbz
+						) AS lehreinheitgruppen
+					    GROUP BY studiengang_kz, bezeichnung
+						ORDER BY studiengang_kz DESC
+					) AS uniqueLehreinheitgruppen_bezeichnung
+				) AS lehreinheitgruppen_bezeichnung
             FROM
 				lehre.tbl_studienplan 							stpl
 				JOIN lehre.tbl_studienordnung 					sto USING (studienordnung_id)

From 34db041ac4dc20335f8d871b898410a64ccbae49 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 6 Aug 2024 14:19:54 +0200
Subject: [PATCH 1073/1461] Status Frontend cleanup

---
 .../Details/Status/Dropdown.js                | 253 +++++++-----------
 1 file changed, 100 insertions(+), 153 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js b/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js
index 78df8ad2d..8cef52f3c 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js
@@ -1,13 +1,11 @@
 import BsModal from "../../../../Bootstrap/Modal.js";
-import CoreForm from '../../../../Form/Form.js';
-import FormValidation from '../../../../Form/Validation.js';
+import BsConfirm from "../../../../Bootstrap/Confirm.js";
+import BsPrompt from "../../../../Bootstrap/Prompt.js";
 import FormInput from '../../../../Form/Input.js';
 
 export default {
 	components: {
 		BsModal,
-		CoreForm,
-		FormValidation,
 		FormInput
 	},
 	inject: {
@@ -46,7 +44,6 @@ export default {
 			//TODO(Manu) get from config
 			statiInteressent: ["Bewerber", "Aufgenommener", "Student" , "Wartender", "Abgewiesener"],
 			statiStudent: ["Abbrecher", "Unterbrecher", "Student" , "Diplomand", "Absolvent"],
-			selectedStatus: 'default',
 			actionButton: {},
 			actionStatusText: {},
 			actionSem: null
@@ -73,7 +70,7 @@ export default {
 				const defaultObject = {
 					status_kurzbz: status,
 					statusgrund_id: null,
-					link: `changeStatusTo${status}`,
+					link: this['changeStatusTo' + status],
 					children: []
 				};
 
@@ -88,11 +85,11 @@ export default {
 							status_kurzbz: item.status_kurzbz,
 							statusgrund_id: item.statusgrund_id,
 							beschreibung: item.beschreibung,
-							link: `changeStatusTo${item.status_kurzbz}(${item.statusgrund_id})`,
+							link: () => this['changeStatusTo' + item.status_kurzbz](item.statusgrund_id),
 						};
 
 						if (item.status_kurzbz === "Student") {
-							itemObject.link = `changeInteressentTo${item.status_kurzbz}(${item.statusgrund_id})`;
+							itemObject.link = () => this['changeInteressentTo' + item.status_kurzbz](item.statusgrund_id);
 						}
 						defaultObject.children.push(itemObject);
 					});
@@ -104,7 +101,7 @@ export default {
 							status_kurzbz: 'Student',
 							statusgrund_id: null,
 							beschreibung: 'Student',
-							link: 'changeInteressentToStudent'
+							link: this.changeInteressentToStudent
 						});
 					}
 				}
@@ -117,8 +114,7 @@ export default {
 				const defaultObject = {
 					status_kurzbz: status,
 					statusgrund_id: null,
-					link: `changeStatusTo${status}`,
-					dropEntry: null,
+					link: this['changeStatusTo' + status],
 					children: []
 				};
 				result.push(defaultObject);
@@ -128,8 +124,7 @@ export default {
 							status_kurzbz: item.status_kurzbz,
 							statusgrund_id: item.statusgrund_id,
 							beschreibung: item.beschreibung,
-							link: `changeStatusTo${item.status_kurzbz}(${item.statusgrund_id})`,
-							dropEntry: `[${item.beschreibung}]`,
+							link: () => this['changeStatusTo' + item.status_kurzbz](item.statusgrund_id)
 						};
 						defaultObject.children.push(itemObject);
 					});
@@ -142,7 +137,7 @@ export default {
 						status_kurzbz: 'Student',
 						statusgrund_id: null,
 						beschreibung: 'Student',
-						link: 'changeStatusToStudent'
+						link: this.changeStatusToStudent
 					});
 				}
 			});
@@ -153,25 +148,12 @@ export default {
 		}
 	},
 	methods: {
-		executeLink(link) {
-			bootstrap.Dropdown.getInstance(this.$refs.toolbarButton).hide();
-			// Split the link string to extract the function name and arguments
-			const match = link.match(/(\w+)\(([^)]*)\)/);
-			const functionName = match ? match[1] : link;
-			const args = match ? match[2].split(',').map(arg => arg.trim()) : [];
-
-			if (typeof this[functionName] === 'function') {
-				this[functionName](...args);
-			} else {
-				console.error(`Method ${functionName} not found`);
-			}
-		},
-		actionConfirmDialogue(data, statusgrund, statusText){
+		actionConfirmDialogue(data, statusgrund, statusText) {
 			this.actionButton = statusgrund;
 			this.actionStatusText = statusText;
 			this.$refs.confirmStatusAction.show();
 		},
-		addStudent(prestudentIds){
+		addStudent() {
 			this.resetChangeModals();
 			let changeData = {};
 
@@ -179,11 +161,9 @@ export default {
 			let countSuccess = 0;
 			let countError = 0;
 
-			const promises = prestudentIds.map(prestudentId => {
+			const promises = this.newArray.map(changeData => {
 
-				changeData = this.newArray.find(item => item.prestudent_id === prestudentId);
-
-				return this.$fhcApi.post('api/frontend/v1/stv/status/addStudent/' + prestudentId,
+				return this.$fhcApi.post('api/frontend/v1/stv/status/addStudent/' + changeData.prestudent_id,
 					changeData
 				).then(response => {
 					countSuccess++;
@@ -203,40 +183,34 @@ export default {
 					this.newStatus = 'Student';
 
 					//Feedback Success als infoalert
-					if (countSuccess > 0) {
-						this.$fhcAlert.alertInfo(this.$p.t('ui', 'successNewStatus', {
-							'countSuccess': countSuccess,
-							'status': this.newStatus,
-							'countError': countError
-						}));
-					}
+					this.$fhcAlert.alertInfo(this.$p.t('ui', 'successNewStatus', {
+						'countSuccess': countSuccess,
+						'status': this.newStatus,
+						'countError': countError
+					}));
 
-					if(this.prestudentIds.length == 1){
+					if (this.prestudentIds.length == 1) {
 						this.reload();
-						this.$reloadList();
-					}
-					else {
-						this.$reloadList();
 					}
+					this.$reloadList();
 					this.resetModal();
 				});
 		},
-		changeStatusToAbbrecher(statusgrund_id){
-			this.resetChangeModals();
-			let def_date = this.getDefaultDate();
-			let abbruchData =
-				{
-					status_kurzbz: 'Abbrecher',
-					datum: def_date,
-					bestaetigtam: def_date,
-					statusgrund_id: statusgrund_id
-				};
-			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...abbruchData }));
-
-			this.actionConfirmDialogue(this.updateData, 'studenten','Abbrecher');
-			//this.changeStatus(prestudentIds);
+		changeStatusToAbbrecher(statusgrund_id) {
+			const data = this.prestudentIds.map(prestudent_id => ({
+				prestudent_id,
+				status_kurzbz: 'Abbrecher',
+				statusgrund_id
+			}));
+			BsConfirm
+				.popup(this.$p.t('lehre', data.length > 1 ? 'modal_StatusactionPlural' : 'modal_StatusactionSingle', {
+					count: data.length,
+					status: 'Abbrecher'
+				}))
+				.then(() => this.changeStatusNeu('Abbrecher', data))
+				.catch(this.$fhcAlert.handleSystemError);
 		},
-		changeStatusToUnterbrecher(){
+		changeStatusToUnterbrecher() {
 			this.resetChangeModals();
 			let def_date = this.getDefaultDate();
 			let deltaData =
@@ -247,45 +221,26 @@ export default {
 				};
 
 			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData }));
-			this.actionConfirmDialogue(this.updateData, 'studenten','Unterbrecher');
+			this.actionConfirmDialogue(this.updateData, 'studenten', 'Unterbrecher');
 		},
-		changeStatusToStudent(statusgrund_id){
-			let def_date = this.getDefaultDate();
-			//TODO Manu validation if Bewerber already before asking for ausbildungssemester
-			//this.checkIfBewerber();
-
-			this.actionButton = 'student';
-
-			if(statusgrund_id == 19){
-				this.actionStatusText = 'Pre-Abbrecher';
-			}
-			if(statusgrund_id == 15){
-				this.actionStatusText = 'Pre-Wiederholer';
-			}
-			if(statusgrund_id == 16){
-				this.actionStatusText = 'Wiederholer';
-			}
-			if(!statusgrund_id){
-				this.actionStatusText = 'Student';
-			}
-			let deltaData =
-				{
-					status_kurzbz: 'Student',
-					datum: def_date,
-					bestaetigtam: def_date,
-					statusgrund_id: statusgrund_id
-				};
-			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData}));
-
-			if(statusgrund_id == 16 || !statusgrund_id){
-				this.$refs.askForAusbildungssemester.show();
-			}
-			else
-			{
-				this.actionConfirmDialogue(this.updateData, this.actionButton, this.actionStatusText);
-			}
+		changeStatusToStudent(statusgrund_id) {
+			const data = this.prestudentIds.map(prestudent_id => ({
+				prestudent_id,
+				status_kurzbz: 'Student',
+				statusgrund_id
+			}));
+			BsPrompt
+				.popup(this.$p.t('lehre', data.length > 1 ? 'modal_askAusbildungssemPlural' : 'modal_askAusbildungssem', {
+					count: data.length,
+					status: 'Student'
+				}))
+				.then(ausbildungssemester => this.changeStatusNeu('Student', data.map(item => {
+					item.ausbildungssemester = ausbildungssemester;
+					return item;
+				})))
+				.catch(this.$fhcAlert.handleSystemError);
 		},
-		changeStatusToDiplomand(){
+		changeStatusToDiplomand() {
 			let def_date = this.getDefaultDate();
 			let deltaData =
 				{
@@ -297,7 +252,7 @@ export default {
 			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData}));
 			this.changeStatus(this.prestudentIds);
 		},
-		changeStatusToAbsolvent(){
+		changeStatusToAbsolvent() {
 			let def_date = this.getDefaultDate();
 			let deltaData =
 				{
@@ -309,7 +264,7 @@ export default {
 			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData}));
 			this.changeStatus(this.prestudentIds);
 		},
-		changeStatusToBewerber(){
+		changeStatusToBewerber() {
 			this.resetChangeModals();
 			let def_date = this.getDefaultDate();
 			let deltaData =
@@ -325,7 +280,7 @@ export default {
 				...deltaData}));
 			this.changeStatus(this.prestudentIds);
 		},
-		changeStatusToAufgenommener(){
+		changeStatusToAufgenommener() {
 			this.resetChangeModals();
 			let def_date = this.getDefaultDate();
 			let deltaData =
@@ -340,10 +295,9 @@ export default {
 				...deltaData,
 			}));
 
-			this.actionConfirmDialogue(this.updateData, 'aufgenommener','Aufgenommener');
-
+			this.actionConfirmDialogue(this.updateData, 'aufgenommener', 'Aufgenommener');
 		},
-		changeInteressentToStudent(statusgrund_id){
+		changeInteressentToStudent(statusgrund_id) {
 			this.resetChangeModals();
 			let def_date = this.getDefaultDate();
 			let deltaData =
@@ -360,9 +314,8 @@ export default {
 			}));
 
 			this.addStudent(this.prestudentIds);
-
 		},
-		changeStatusToAbgewiesener(statusgrund_id){
+		changeStatusToAbgewiesener(statusgrund_id) {
 			this.resetChangeModals();
 			let def_date = this.getDefaultDate();
 			let deltaData =
@@ -378,9 +331,9 @@ export default {
 				...deltaData,
 			}));
 
-			this.actionConfirmDialogue(this.updateData, 'abgewiesener','Abgewiesener');
+			this.actionConfirmDialogue(this.updateData, 'abgewiesener', 'Abgewiesener');
 		},
-		changeStatusToWartender(){
+		changeStatusToWartender() {
 			this.resetChangeModals();
 			let def_date = this.getDefaultDate();
 			let deltaData =
@@ -394,9 +347,29 @@ export default {
 				...deltaData,
 			}));
 
-			this.actionConfirmDialogue(this.updateData, 'wartender','Wartender');
+			this.actionConfirmDialogue(this.updateData, 'wartender', 'Wartender');
 		},
-		changeStatus(prestudentIds){
+		changeStatusNeu(status_kurzbz, data) {
+			Promise
+				.allSettled(data.map(item => this.$fhcApi.post('api/frontend/v1/stv/status/changeStatus/' + item.prestudent_id, item)))
+				.then(results => {
+					let successes = results.filter(result => result.status == "fulfilled").length,
+						errors = results.length - successes;
+					
+					//Feedback Success als infoalert
+					this.$fhcAlert.alertInfo(this.$p.t('ui', 'successNewStatus', {
+						'countSuccess': successes,
+						'status': status_kurzbz,
+						'countError': errors
+					}));
+
+					if(results.length == 1 && successes > 0){
+						this.reload();
+					}
+					this.$reloadList();
+				});
+		},
+		changeStatus() {
 			this.resetChangeModals();
 			let changeData = {};
 
@@ -406,7 +379,7 @@ export default {
 
 			// Check if ausbildungssemester is already in this.newArray
 			const existingEntry = this.newArray.find(
-				(entry) => entry.ausbildungssemester === this.actionSem
+				(entry) => entry.ausbildungssemester
 			);
 
 			// If the entry doesn't exist, add a new object with ausbildungssemester
@@ -414,11 +387,9 @@ export default {
 				this.newArray.push({ ausbildungssemester: this.actionSem });
 			}
 
-			const promises = prestudentIds.map(prestudentId => {
+			const promises = this.newArray.map(changeData => {
 
-				changeData = this.newArray.find(item => item.prestudent_id === prestudentId);
-
-				return this.$fhcApi.post('api/frontend/v1/stv/status/changeStatus/' + prestudentId,
+				return this.$fhcApi.post('api/frontend/v1/stv/status/changeStatus/' + changeData.prestudent_id,
 					changeData
 				).then(response => {
 					countSuccess++;
@@ -435,56 +406,34 @@ export default {
 			Promise
 				.allSettled(promises)
 				.then(values => {
-					/*					if (this.abbruchData.length < 1) {
-										}
-										else{*/
 					if(this.newArray.length > 0) {
 						this.newStatus = this.newArray[0].status_kurzbz;
 					}
 					else {
 						this.newStatus = this.statusData.status_kurzbz;
 					}
-					//	}
 
 					//Feedback Success als infoalert
-					if (countSuccess > 0 || countError > 0 ) {
-						this.$fhcAlert.alertInfo(this.$p.t('ui', 'successNewStatus', {
-							'countSuccess': countSuccess,
-							'status': this.newStatus,
-							'countError': countError
-						}));
-					}
+					this.$fhcAlert.alertInfo(this.$p.t('ui', 'successNewStatus', {
+						'countSuccess': countSuccess,
+						'status': this.newStatus,
+						'countError': countError
+					}));
 
 					if(this.prestudentIds.length == 1 && countSuccess > 0){
 						this.reload();
-
 						//necessary to see new status in List
-						this.$reloadList();
-						//to change ToolbarInteressent to ToolbarStudent
-
-
-					}
-					else {
-						this.$reloadList();
 					}
+					this.$reloadList();
+					//to change ToolbarInteressent to ToolbarStudent
 					this.resetModal();
 				});
 		},
-		checkIfErsterStudent(prestudent_id){
-			return this.$fhcApi
-				.get('api/frontend/v1/stv/status/isErsterStudent/' + prestudent_id)
-				.then(
-					result => {
-						this.isErsterStudent = result.data.retval == 0 ? 1 : 0;
-						return result;
-					})
-				.catch(this.$fhcAlert.handleSystemError);
-		},
 		getDefaultDate() {
 			const today = new Date();
 			return today;
 		},
-		hideModal(modalRef){
+		hideModal(modalRef) {
 			this.$refs[modalRef].hide();
 			this.statusNew = true;
 		},
@@ -494,7 +443,7 @@ export default {
 		reloadList() {
 			this.$emit('reload-list');
 		},
-		resetChangeModals(){
+		resetChangeModals() {
 			this.hideModal('confirmStatusAction');
 			this.hideModal('askForAusbildungssemester');
 		},
@@ -505,12 +454,10 @@ export default {
 			this.actionStatusText = {};
 			this.actionSem = null;
 		},
-		saveNewAusbildungssemester(){
+		saveNewAusbildungssemester() {
 			this.newArray = this.newArray.map(objekt => ({ ...objekt, ausbildungssemester: this.actionSem}));
-			console.log("ausbildungssem" + this.actionSem);
 			this.changeStatus(this.prestudentIds);
-		},
-
+		}
 	},
 	created() {
 		this.$fhcApi
@@ -612,14 +559,14 @@ export default {
 							</a>
 							<ul class="dropdown-menu dropdown-menu-right">
 								<li v-for="child in item.children" :key="child.statusgrund_id">
-									<a class="dropdown-item" @click.prevent="executeLink(child.link)" href="#">{{ child.beschreibung }}</a>
+									<a class="dropdown-item" @click.prevent="child.link" href="#">{{ child.beschreibung }}</a>
 								</li>
 							</ul>
 						</div>
 						<div v-else>
 							<a
 								class="dropdown-item"
-								@click.prevent="executeLink(item.link)"
+								@click.prevent="item.link"
 								href="#"
 								>
 								{{ item.status_kurzbz }}
@@ -644,14 +591,14 @@ export default {
 							</a>
 							<ul class="dropdown-menu dropdown-menu-right">
 								<li v-for="child in item.children" :key="child.statusgrund_id">
-									<a class="dropdown-item" @click.prevent="executeLink(child.link)" href="#">{{ child.beschreibung }}</a>
+									<a class="dropdown-item" @click.prevent="child.link" href="#">{{ child.beschreibung }}</a>
 								</li>
 							</ul>
 						</div>
 						<div v-else>
 							<a
 								class="dropdown-item"
-								@click.prevent="executeLink(item.link)"
+								@click.prevent="item.link"
 								href="#"
 								>
 								{{ item.status_kurzbz }}

From ee78a94aa2c6c4cfa7c0cb0c22809c73b19429fc Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 6 Aug 2024 14:20:22 +0200
Subject: [PATCH 1074/1461] codesniff Prestudentstatus_model

---
 application/models/crm/Prestudentstatus_model.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php
index aa2a8a3b0..37b6c6762 100644
--- a/application/models/crm/Prestudentstatus_model.php
+++ b/application/models/crm/Prestudentstatus_model.php
@@ -348,10 +348,10 @@ class Prestudentstatus_model extends DB_Model
 	 */
 	public function withGrund($statusgrund_kurzbz)
 	{
-		if($statusgrund_kurzbz)
+		if ($statusgrund_kurzbz)
 			$this->db->set(
 				'statusgrund_id',
-				'(SELECT statusgrund_id FROM public.tbl_status_grund WHERE statusgrund_kurzbz =' . $this->db->escape($statusgrund_kurzbz) .')',
+				'(SELECT statusgrund_id FROM public.tbl_status_grund WHERE statusgrund_kurzbz=' . $this->db->escape($statusgrund_kurzbz) . ')',
 				false
 			);
 

From 9b034a6753a92d57f394dab5944cd36f48d5fb09 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 6 Aug 2024 14:21:53 +0200
Subject: [PATCH 1075/1461] Status cleanup

---
 .../api/frontend/v1/stv/Status.php            | 152 +++++-------------
 1 file changed, 44 insertions(+), 108 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index df6fdb5b5..ef5030c0d 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -12,12 +12,11 @@ class Status extends FHCAPI_Controller
 		parent::__construct([
 			'getHistoryPrestudent' => ['admin:r', 'assistenz:r'],
 			'getMaxSemester' => ['admin:r', 'assistenz:r'],
-			'changeStatus' => ['admin:r', 'assistenz:r', 'student/keine_studstatuspruefung'],
-			'addStudent' => ['admin:r', 'assistenz:r', 'student/keine_studstatuspruefung'],
+			'changeStatus' => ['admin:rw', 'assistenz:rw'],
+			'addStudent' => ['admin:rw', 'assistenz:rw'],
 			'getStatusgruende' => self::PERM_LOGGED,
 			'getLastBismeldestichtag' => self::PERM_LOGGED,
 			'isLastStatus' => self::PERM_LOGGED,
-			'isErsterStudent' => self::PERM_LOGGED,
 			'hasStatusBewerber' => self::PERM_LOGGED,
 			'getStatusarray' => self::PERM_LOGGED,
 			'deleteStatus' => ['admin:rw','assistenz:rw'],
@@ -130,22 +129,6 @@ class Status extends FHCAPI_Controller
 		return $this->terminateWithSuccess($result);
 	}
 
-	public function isErsterStudent($prestudent_id)
-	{
-		//check if studentrolle already exists
-		$this->load->model('crm/Student_model', 'StudentModel');
-		$result = $this->StudentModel->checkIfExistingStudentRolle($prestudent_id);
-		if (isError($result))
-		{
-			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-		if($result->retval == "0")
-		{
-			return $this->terminateWithSuccess($result);
-		}
-		return $this->terminateWithSuccess($result);
-	}
-
 	public function hasStatusBewerber($prestudent_id)
 	{
 		$result = $this->prestudentstatuschecklib->checkIfExistingBewerberstatus($prestudent_id);
@@ -190,7 +173,6 @@ class Status extends FHCAPI_Controller
 	public function changeStatus($prestudent_id)
 	{
 		$isBerechtigtNoStudstatusCheck = $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung');
-		$isBerechtigtBasisPrestudentstatus = $this->permissionlib->isBerechtigt('basis/prestudentstatus');
 
 		//GET lastStatus
 		$result = $this->PrestudentstatusModel->getLastStatus($prestudent_id);
@@ -198,16 +180,6 @@ class Status extends FHCAPI_Controller
 		$lastStatusData = $this->getDataOrTerminateWithError($result);
 		$lastStatusData = current($lastStatusData);
 
-		if (!$isBerechtigtBasisPrestudentstatus)
-			$this->form_validation->set_rules(
-				'berechtigt',
-				$this->p->t('ui', 'nurLeseberechtigung'),
-				'is_null',
-				[
-					'is_null' => $this->p->t('ui', 'error_fieldWriteAccess')
-				]
-			);
-
 		$this->load->model('person/Person_model', 'PersonModel');
 		$this->PersonModel->addJoin('public.tbl_prestudent', 'person_id');
 		$result = $this->PersonModel->loadWhere(['prestudent_id' => $prestudent_id]);
@@ -232,14 +204,15 @@ class Status extends FHCAPI_Controller
 		}
 
 		$statusgrund_id = $this->input->post('statusgrund_id');
-		$datum = $this->input->post('datum');
+		$datum_string = date('c');
+		$datum = new DateTime($datum_string);
 
 		//Form Validation
 		$this->load->library('form_validation');
 
 		$this->form_validation->set_rules(
 			'status_kurzbz',
-			'Status',
+			$this->p->t('global', 'status'),
 			[
 				'required',
 				//Check Reihungstest
@@ -253,7 +226,7 @@ class Status extends FHCAPI_Controller
 				}],
 				//Check ZGV
 				['checkIfZGV', function ($value) use ($prestudent_person) {
-					if (!ZGV_CHECK)
+					if (defined("ZGV_CHECK") && !ZGV_CHECK)
 						return true;
 					if ($value != Prestudentstatus_model::STATUS_BEWERBER)
 						return true;
@@ -262,7 +235,7 @@ class Status extends FHCAPI_Controller
 				}],
 				//Check ZGV Master
 				['checkIfZGVMaster', function ($value) use ($prestudent_person) {
-					if (!ZGV_CHECK)
+					if (defined("ZGV_CHECK") && !ZGV_CHECK)
 						return true;
 					if ($value != Prestudentstatus_model::STATUS_BEWERBER)
 						return true;
@@ -270,19 +243,19 @@ class Status extends FHCAPI_Controller
 					return $this->getDataOrTerminateWithError($result);
 				}],
 				//Check Bewerberstatus
-				[
-					'checkIfExistingBewerberstatus', function () use ($prestudent_id, $status_kurzbz) {
-						if ($status_kurzbz != Prestudentstatus_model::STATUS_AUFGENOMMENER &&
-							$status_kurzbz != Prestudentstatus_model::STATUS_WARTENDER &&
-							$status_kurzbz != Prestudentstatus_model::STATUS_ABGEWIESENER
-							)
+				['checkIfExistingBewerberstatus', function ($value) use ($prestudent_id) {
+					if ($value != Prestudentstatus_model::STATUS_AUFGENOMMENER
+						&& $value != Prestudentstatus_model::STATUS_WARTENDER
+					)
 						return true;
-						$result = $this->prestudentstatuschecklib->checkIfExistingBewerberstatus($prestudent_id);
-						return $this->getDataOrTerminateWithError($result);
-					}],
+					$result = $this->prestudentstatuschecklib->checkIfExistingBewerberstatus($prestudent_id);
+					return $this->getDataOrTerminateWithError($result);
+				}],
 				//Check If Student
 				['status_stud_exists', function ($value) use ($prestudent_id) {
-					if ($value != Prestudentstatus_model::STATUS_STUDENT)
+					if ($value != Prestudentstatus_model::STATUS_STUDENT
+						&& $value != Prestudentstatus_model::STATUS_ABBRECHER
+					)
 						return true; // Only test if new status is Student
 
 					$result = $this->prestudentstatuschecklib->checkIfExistingStudentRolle($prestudent_id);
@@ -308,52 +281,16 @@ class Status extends FHCAPI_Controller
 				'integer' => $this->p->t('ui', 'error_fieldNotInteger')
 			]);
 
-		//TODO(Manu) check if really necessary, sth similiar with check rolle_doesnt_exist
 		$this->form_validation->set_rules('_default', '', [
+			['meldestichtag_not_exceeded', function () use ($datum, $isBerechtigtNoStudstatusCheck) {
+				if ($isBerechtigtNoStudstatusCheck)
+					return true; // Skip if access right says so
+
+				$result = $this->prestudentstatuschecklib->checkIfMeldestichtagErreicht($datum);
+
+				return !$this->getDataOrTerminateWithError($result);
+			}],
 			//check if Rolle already exists
-			['checkIfExistingPrestudentRolle', function () use (
-				$prestudent_id,
-				$status_kurzbz,
-				$studiensemester_kurzbz,
-				$ausbildungssemester
-			) {
-				if (!$ausbildungssemester)
-					return true; // Error will be handled by the required statement above
-				$result = $this->prestudentstatuschecklib->checkIfExistingPrestudentRolle(
-					$prestudent_id,
-					$status_kurzbz,
-					$studiensemester_kurzbz,
-					$ausbildungssemester
-				);
-				return $this->getDataOrTerminateWithError($result);
-			}]
-		], [
-			'checkIfExistingPrestudentRolle' => $this->p->t('lehre', 'error_rolleBereitsVorhandenMitNamen', ['name' => $studentName])
-		]);
-
-		//TODO(Manu) check if really necessary, in FAS code
-		$this->form_validation->set_rules(
-			'datum',
-			$this->p->t('global', 'datum'),
-			[
-				'is_valid_date',
-				['meldestichtag_not_exceeded', function ($value) use ($isBerechtigtNoStudstatusCheck) {
-					if ($isBerechtigtNoStudstatusCheck)
-						return true; // Skip if access right says so
-					if (!$value)
-						return true; // Error will be handled by the required statement above
-
-					$result = $this->prestudentstatuschecklib->checkIfMeldestichtagErreicht($value);
-
-					return !$this->getDataOrTerminateWithError($result);
-				}]
-			],
-			[
-				'meldestichtag_not_exceeded' => $this->p->t('lehre', 'error_dataVorMeldestichtag')
-			]
-		);
-
-		$this->form_validation->set_rules('_default', '', [
 			['rolle_doesnt_exist', function () use ($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester) {
 				if (!$status_kurzbz || !$studiensemester_kurzbz || !$ausbildungssemester)
 					return true; // Error will be handled by the required statements above
@@ -372,13 +309,13 @@ class Status extends FHCAPI_Controller
 			) {
 				if ($isBerechtigtNoStudstatusCheck)
 					return true; // Skip if access right says so
-				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester)
-					return true; // Error will be handled by the required statements above
+				if (!$status_kurzbz)
+					return true; // Error will be handled by the required statement above
 
 				$result = $this->prestudentstatuschecklib->checkStatusHistoryTimesequence(
 					$prestudent_id,
 					$status_kurzbz,
-					new DateTime($datum),
+					$datum,
 					$studiensemester_kurzbz,
 					$ausbildungssemester,
 					'',
@@ -397,13 +334,13 @@ class Status extends FHCAPI_Controller
 			) {
 				if ($isBerechtigtNoStudstatusCheck)
 					return true; // Skip if access right says so
-				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester)
-					return true; // Error will be handled by the required statements above
+				if (!$status_kurzbz)
+					return true; // Error will be handled by the required statement above
 
 				$result = $this->prestudentstatuschecklib->checkStatusHistoryLaststatus(
 					$prestudent_id,
 					$status_kurzbz,
-					new DateTime($datum),
+					$datum,
 					$studiensemester_kurzbz,
 					$ausbildungssemester,
 					'',
@@ -422,13 +359,13 @@ class Status extends FHCAPI_Controller
 			) {
 				if ($isBerechtigtNoStudstatusCheck)
 					return true; // Skip if access right says so
-				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester)
-					return true; // Error will be handled by the required statements above
+				if (!$status_kurzbz)
+					return true; // Error will be handled by the required statement above
 
 				$result = $this->prestudentstatuschecklib->checkStatusHistoryUnterbrechersemester(
 					$prestudent_id,
 					$status_kurzbz,
-					new DateTime($datum),
+					$datum,
 					$studiensemester_kurzbz,
 					$ausbildungssemester,
 					'',
@@ -447,13 +384,13 @@ class Status extends FHCAPI_Controller
 			) {
 				if ($isBerechtigtNoStudstatusCheck)
 					return true; // Skip if access right says so
-				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester)
-					return true; // Error will be handled by the required statements above
+				if (!$status_kurzbz)
+					return true; // Error will be handled by the required statement above
 
 				$result = $this->prestudentstatuschecklib->checkStatusHistoryAbbrechersemester(
 					$prestudent_id,
 					$status_kurzbz,
-					new DateTime($datum),
+					$datum,
 					$studiensemester_kurzbz,
 					$ausbildungssemester,
 					'',
@@ -472,13 +409,13 @@ class Status extends FHCAPI_Controller
 			) {
 				if ($isBerechtigtNoStudstatusCheck)
 					return true; // Skip if access right says so
-				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester)
-					return true; // Error will be handled by the required statements above
+				if (!$status_kurzbz)
+					return true; // Error will be handled by the required statement above
 
 				$result = $this->prestudentstatuschecklib->checkStatusHistoryDiplomant(
 					$prestudent_id,
 					$status_kurzbz,
-					new DateTime($datum),
+					$datum,
 					$studiensemester_kurzbz,
 					$ausbildungssemester,
 					'',
@@ -486,8 +423,9 @@ class Status extends FHCAPI_Controller
 				);
 
 				return $this->getDataOrTerminateWithError($result);
-			}]
+			}] // TODO(chris): history_student?
 		], [
+			'meldestichtag_not_exceeded' => $this->p->t('lehre', 'error_dataVorMeldestichtag'),
 			'rolle_doesnt_exist' => $this->p->t('lehre', 'error_rolleBereitsVorhandenMitNamen', ['name' => $studentName]),
 			'history_timesequence' => $this->p->t('lehre', 'error_statuseintrag_zeitabfolge'),
 			'history_laststatus' => $this->p->t('lehre', 'error_endstatus'),
@@ -501,8 +439,6 @@ class Status extends FHCAPI_Controller
 
 		switch($status_kurzbz){
 			case Prestudentstatus_model::STATUS_ABBRECHER:
-				$studiensemester_kurzbz = $lastStatusData->studiensemester_kurzbz;
-
 				$this->load->model('crm/Statusgrund_model', 'StatusgrundModel');
 				$result = $this->StatusgrundModel->load($statusgrund_id);
 				if (isError($result))
@@ -518,13 +454,13 @@ class Status extends FHCAPI_Controller
 					$studiensemester_kurzbz,
 					null,
 					$statusgrund_kurzbz,
-					$datum,
+					$datum_string,
 					null,
 					null
 				);
 				if (isError($result))
 				{
-					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+					return $this->terminateWithError(getError($result));
 				}
 				else
 					$this->terminateWithSuccess($prestudent_id);

From e6676e8868e3dbb26fc375bb04ec82b44edbbaac Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 6 Aug 2024 14:26:52 +0200
Subject: [PATCH 1076/1461] setAbbrecherNeu

---
 .../api/frontend/v1/stv/Status.php            |  31 ++--
 application/libraries/PrestudentLib.php       | 152 ++++++++++++++++++
 2 files changed, 165 insertions(+), 18 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index ef5030c0d..6e4a671ee 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -437,33 +437,22 @@ class Status extends FHCAPI_Controller
 		if (!$this->form_validation->run())
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 
+		
+		$this->load->library('PrestudentLib');
+
+		$this->db->trans_start();
+		
 		switch($status_kurzbz){
 			case Prestudentstatus_model::STATUS_ABBRECHER:
-				$this->load->model('crm/Statusgrund_model', 'StatusgrundModel');
-				$result = $this->StatusgrundModel->load($statusgrund_id);
-				if (isError($result))
-				{
-					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-				}
-				$result = current(getData($result));
-				$statusgrund_kurzbz = $result->statusgrund_kurzbz;
-
-				$this->load->library('PrestudentLib');
-				$result = $this->prestudentlib->setAbbrecher(
+				$result = $this->prestudentlib->setAbbrecherNeu(
 					$prestudent_id,
 					$studiensemester_kurzbz,
 					null,
-					$statusgrund_kurzbz,
+					$statusgrund_id,
 					$datum_string,
 					null,
 					null
 				);
-				if (isError($result))
-				{
-					return $this->terminateWithError(getError($result));
-				}
-				else
-					$this->terminateWithSuccess($prestudent_id);
 				break;
 			case Prestudentstatus_model::STATUS_UNTERBRECHER:
 				$ausbildungssemester = $lastStatusData->ausbildungssemester;
@@ -558,6 +547,12 @@ class Status extends FHCAPI_Controller
 			default:
 				$this->terminateWithError("Action not yet defined in Prestudentlib", self::ERROR_TYPE_GENERAL);
 		}
+
+		$this->getDataOrTerminateWithError($result);
+
+		$this->trans_complete();
+
+		$this->terminateWithSuccess($prestudent_id);
 	}
 
 	public function addStudent($prestudent_id)
diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php
index d8950ad43..58e519565 100644
--- a/application/libraries/PrestudentLib.php
+++ b/application/libraries/PrestudentLib.php
@@ -35,6 +35,141 @@ class PrestudentLib
 		$this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
 	}
 
+	public function setAbbrecherNeu(
+		$prestudent_id,
+		$studiensemester_kurzbz,
+		$insertvon = null,
+		$statusgrund_id = null,
+		$datum = null,
+		$bestaetigtam = null,
+		$bestaetigtvon = null
+	) {
+		if (!$insertvon)
+			$insertvon = getAuthUID();
+		if (!$bestaetigtvon)
+			$bestaetigtvon = $insertvon;
+
+		$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id, $studiensemester_kurzbz);
+		if (isError($result))
+			return $result;
+		$result = getData($result);
+		if (!$result)
+			return error($this->_ci->p->t('studierendenantrag', 'error_no_prestudent_in_sem', [
+				'prestudent_id' => $prestudent_id,
+				'studiensemester_kurzbz' => $studiensemester_kurzbz
+			]));
+
+		$prestudent_status = current($result);
+
+		$result = $this->_ci->StudentModel->loadWhere(['prestudent_id' => $prestudent_id]);
+
+		if (isError($result))
+			return $result;
+		$result = getData($result);
+		if (!$result)
+			return error($this->_ci->p->t('studierendenantrag', 'error_no_student_for_prestudent', ['prestudent_id' => $prestudent_id]));
+
+		$student = current($result);
+
+		if(!$datum)
+			$datum = date('c');
+
+		if(!$bestaetigtam)
+			$bestaetigtam = date('c');
+
+		//Status und Statusgrund updaten
+		$result = $this->_ci->PrestudentstatusModel->insert([
+			'prestudent_id' => $prestudent_id,
+			'status_kurzbz' => Prestudentstatus_model::STATUS_ABBRECHER,
+			'studiensemester_kurzbz' => $prestudent_status->studiensemester_kurzbz,
+			'ausbildungssemester' => $prestudent_status->ausbildungssemester,
+			'datum' => $datum,
+			'insertvon' => $insertvon,
+			'insertamum' => date('c'),
+			'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz,
+			'studienplan_id'=> $prestudent_status->studienplan_id,
+			'bestaetigtvon' => $bestaetigtvon,
+			'bestaetigtam' => $bestaetigtam,
+			'statusgrund_id' => $statusgrund_id
+		]);
+
+		if (isError($result))
+			return $result;
+
+		//refactored with processStudentlehrverband
+		$result = $this->_ci->StudentlehrverbandModel->processStudentlehrverband(
+			$student->student_uid,
+			$student->studiengang_kz,
+			0,
+			'A',
+			'',
+			$studiensemester_kurzbz,
+			Prestudentstatus_model::STATUS_ABBRECHER
+		);
+
+		if (isError($result))
+			return $result;
+
+
+		//noch nicht eingetragene Zeugnisnoten auf 9 setzen
+		$result = $this->_ci->ZeugnisnoteModel->getZeugnisnoten($student->student_uid, $prestudent_status->studiensemester_kurzbz);
+		if (isError($result))
+			return $result;
+		$result = getData($result) ?: [];
+
+		foreach ($result as $lv)
+		{
+			if (!$lv->note)
+			{
+				$result = $this->_ci->ZeugnisnoteModel->insert([
+					'note' => 9,
+					'studiensemester_kurzbz' => $lv->studiensemester_kurzbz,
+					'student_uid' => $lv->uid,
+					'lehrveranstaltung_id' => $lv->lehrveranstaltung_id
+				]);
+				if (isError($result)) {
+					$result = $this->_ci->ZeugnisnoteModel->update([
+						'studiensemester_kurzbz' => $lv->studiensemester_kurzbz,
+						'student_uid' => $lv->uid,
+						'lehrveranstaltung_id' => $lv->lehrveranstaltung_id
+					], [
+						'note' => 9
+					]);
+
+					if (isError($result))
+						return $result;
+				}
+			}
+		}
+
+
+		//Update Aktionen
+
+		//StudentModel updaten
+		$this->_ci->StudentModel->update([
+			'student_uid' => $student->student_uid
+		], [
+			'verband' => 'A',
+			'gruppe' => '',
+			'semester' => 0,
+			'updatevon' => $insertvon,
+			'updateamum' => date('c')
+		]);
+
+		//Benutzer inaktiv setzen
+		$this->_ci->BenutzerModel->update([
+			'uid' =>  $student->student_uid
+		], [
+			'aktiv' => false,
+			'updateaktivvon' => $insertvon,
+			'updateaktivam' => date('c'),
+			'updatevon' => $insertvon,
+			'updateamum' => date('c')
+		]);
+
+		return success();
+	}
+
 	public function setAbbrecher($prestudent_id, $studiensemester_kurzbz, $insertvon = null, $statusgrund_kurzbz = null, $datum = null, $bestaetigtam = null, $bestaetigtvon = null)
 	{
 		if (!$insertvon)
@@ -134,6 +269,9 @@ class PrestudentLib
 			}
 		}
 
+		// TODO(chris): student updaten (hier oder in studentlehrverband)
+		// TODO(chris): db transaction
+
 		//Benutzer inaktiv setzen
 		$this->_ci->BenutzerModel->update([
 			'uid' =>  $student->student_uid
@@ -285,6 +423,20 @@ class PrestudentLib
 			}
 		}
 
+
+		//Update Aktionen
+
+		//StudentModel updaten
+		$this->_ci->StudentModel->update([
+			'student_uid' => $student->student_uid
+		], [
+			'verband' => 'B',
+			'gruppe' => '',
+			'semester' => 0,
+			'updatevon' => $insertvon,
+			'updateamum' => date('c')
+		]);
+
 		return success();
 	}
 

From 46a070605735fcf940c783b6f5b46325e902cd40 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 6 Aug 2024 14:29:24 +0200
Subject: [PATCH 1077/1461] updates roomEvents on change:range / groups the
 results of a studenplan query

---
 .../api/frontend/v1/Stundenplan.php           |  13 +--
 .../components/Cis/Stundenplan.php            |   8 +-
 .../models/ressource/Stundenplan_model.php    |  67 +++++++++++-
 .../js/components/Cis/Mylv/RoomInformation.js | 100 ++++++++----------
 4 files changed, 116 insertions(+), 72 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 1e6aa494d..923c7f6bb 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -87,22 +87,11 @@ class Stundenplan extends FHCAPI_Controller
         $ort_kurzbz = $this->input->get('ort_kurzbz', TRUE);
         $start_date = $this->input->get('start_date', TRUE);
         $end_date = $this->input->get('end_date', TRUE);
-        
-		// querying the stunden
-        $stunden = $this->StundeModel->load();
 
-        $stunden = $this->getDataOrTerminateWithError($stunden);
-
-		$result = $this->StundenplanModel->groupedCalendarEvents($ort_kurzbz,$start_date,$end_date);  
+		$result = $this->StundenplanModel->stundenPlanGruppierung($this->StundenplanModel->getRoomQuery($ort_kurzbz, $start_date, $end_date));  
 		
         $result = $this->getDataOrTerminateWithError($result);
 
-        foreach($result as $entry){
-            if(COUNT($entry->lektor)>1){
-                // gruppierung hat stattgefunden und das array muss in einem String konvertiert werden
-            }
-        }
-
 		$this->terminateWithSuccess($result);
 		
 	}
diff --git a/application/controllers/components/Cis/Stundenplan.php b/application/controllers/components/Cis/Stundenplan.php
index 6a89458a7..31ed34dbd 100755
--- a/application/controllers/components/Cis/Stundenplan.php
+++ b/application/controllers/components/Cis/Stundenplan.php
@@ -30,12 +30,14 @@ class Stundenplan extends Auth_Controller
 	{
 		$this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
 
-		$result = $this->StundenplanModel->loadForUid(get_uid());
+		/* $result = $this->StundenplanModel->loadForUid(get_uid());
 
 		if (isError($result))
 			return $this->outputJsonError(getError($result));
-
-		$this->outputJsonSuccess(getData($result));
+ */
+		$res = $this->StundenplanModel->stundenPlanGruppierung($this->StundenplanModel->getStudenPlanQuery(get_uid())); 
+		$res = getData($res);	
+		$this->outputJsonSuccess($res);
 	}
 
 	/**
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 693825e79..fed70ac74 100755
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -133,6 +133,71 @@ class Stundenplan_model extends DB_Model
 		return $gruppierteEvents;
 	}
 
+	public function stundenPlanGruppierung($stundenplanViewQuery)
+	{
+		
+
+		$gruppierteEvents = $this->execReadOnlyQuery("
+		SELECT 
+			
+		'stundenplan' as type,
+		unr,datum, stunde,
+		CONCAT(lehrfach,'-',lehrform) as topic,
+		'' as beschreibung,
+		string_agg(DISTINCT gruppe, '/') as gruppe,
+		string_agg(DISTINCT lektor, '/') as lektor,  
+		ort_kurzbz, studiengang_kz, titel,'' as beschreibung,lehreinheit_id,lehrfach_id,anmerkung,fix,lehrveranstaltung_id,stg_kurzbzlang,stg_bezeichnung,stg_typ,fachbereich_kurzbz,lehrfach,lehrfach_bez,farbe,lehrform,anmerkung_lehreinheit 
+
+		FROM
+		(
+			SELECT
+ 			unr,datum, stunde,
+			CASE
+				WHEN gruppe_kurzbz IS NOT NULL THEN gruppe_kurzbz 
+				ELSE CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) 
+			END as gruppe,
+			CASE
+				WHEN sp.mitarbeiter_kurzbz IS NOT NULL THEN sp.mitarbeiter_kurzbz
+				ELSE lektor
+			END as lektor,
+			ort_kurzbz, studiengang_kz, titel,'' as beschreibung,lehreinheit_id,lehrfach_id,anmerkung,fix,lehrveranstaltung_id,stg_kurzbzlang,stg_bezeichnung,stg_typ,fachbereich_kurzbz,lehrfach,lehrfach_bez,farbe,lehrform,anmerkung_lehreinheit 
+
+			FROM (".$stundenplanViewQuery.") sp
+
+		) as sp
+
+		GROUP BY 
+
+			ort_kurzbz,unr, datum, stunde, lehreinheit_id, lehrfach_id,studiengang_kz,titel,anmerkung,fix,lehrveranstaltung_id,stg_kurzbzlang,stg_bezeichnung,stg_typ,fachbereich_kurzbz,lehrfach,lehrfach_bez,farbe,lehrform,anmerkung_lehreinheit
+
+		ORDER BY datum, stunde
+		");
+
+		return $gruppierteEvents;
+	}
+
+	public function getStudenPlanQuery($uid){
+			return 
+			"select sp.*
+			from lehre.vw_stundenplan sp
+			left join public.tbl_benutzergruppe bg ON sp.gruppe_kurzbz=bg.gruppe_kurzbz AND bg.uid =".$this->escape($uid)." 
+			left join public.tbl_studiensemester ss1 ON bg.studiensemester_kurzbz=ss1.studiensemester_kurzbz AND ss1.start <=sp.datum AND ss1.ende>= sp.datum
+			left join public.tbl_studentlehrverband slv ON sp.studiengang_kz=slv.studiengang_kz and slv.student_uid=".$this->escape($uid)." and (slv.semester=sp.semester OR sp.semester IS NULL) AND (slv.verband=sp.verband OR sp.verband IS NULL OR sp.verband='' OR sp.verband='0') AND
+			(slv.gruppe=sp.gruppe OR sp.gruppe IS NULL OR sp.gruppe='' OR sp.gruppe='0') AND sp.gruppe_kurzbz IS NULL
+			left join public.tbl_studiensemester ss2 ON slv.studiensemester_kurzbz=ss2.studiensemester_kurzbz AND ss2.start<=sp.datum and ss2.ende >= sp.datum
+			WHERE ss1.studiensemester_kurzbz IS NOT NULL or ss2.studiensemester_kurzbz IS NOT NULL";
+	}
+
+	public function getRoomQuery($ort_kurzbz, $start_date, $end_date)
+	{
+		return
+			"select sp.*
+			FROM lehre.vw_stundenplan sp
+			WHERE ort_kurzbz = ".$this->escape($ort_kurzbz)." 
+			AND datum >= ".$this->escape($start_date)." 
+			AND datum <= ".$this->escape($end_date);
+	}
+
 	/**
 	 * @param string $uid
 	 * 
@@ -149,7 +214,7 @@ class Stundenplan_model extends DB_Model
 		$this->db->or_where('ss2.studiensemester_kurzbz IS NOT NULL', null, false);
 		
 		$query = $this->db->get_compiled_select('lehre.vw_stundenplan sp');
-		
+
 		return $this->execQuery($query, [$uid, $uid]);
 	}
 
diff --git a/public/js/components/Cis/Mylv/RoomInformation.js b/public/js/components/Cis/Mylv/RoomInformation.js
index 885130a5f..c905dabd8 100644
--- a/public/js/components/Cis/Mylv/RoomInformation.js
+++ b/public/js/components/Cis/Mylv/RoomInformation.js
@@ -32,6 +32,13 @@ export default{
         },
     },
     methods:{
+		updateRange: function(data){
+			this.calendarWeek = new CalendarDate(data.start);
+			Vue.nextTick(() => {
+				this.loadRoomEvents();
+			});
+		},
+
         // returns the string YYYY-MM-DD if param is instance of CalendarDate and null otherwise
         calendarDateToString: function(calendarDate){
             
@@ -40,69 +47,50 @@ export default{
             null; 
             
         },
+
+		loadStunden: async function(){
+			await this.$fhcApi.factory.stundenplan.getStunden().then(res => {
+				res.data.forEach(std => {
+					this.stunden[std.stunde] = std; // TODO(chris): geht besser
+				});
+			});
+		},
+
+		loadRoomEvents: function(){
+			this.$fhcApi.factory.stundenplan.getRoomInfo(this.ort_kurzbz, this.weekFirstDay, this.weekLastDay).then(res => {
+				let events;
+				if (res.data && res.data.forEach) {
+					res.data.forEach((el, i) => {
+
+						el.id = i;
+						if (el.type === 'reservierung') {
+							el.color = '#' + (el.farbe || 'FFFFFF');
+						} else {
+							el.color = '#' + (el.farbe || 'CCCCCC');
+						}
+
+						el.start = new Date(el.datum + ' ' + this.stunden[el.stunde].beginn);
+						el.end = new Date(el.datum + ' ' + this.stunden[el.stunde].ende);
+						el.title = el.lehrfach;
+						if (el.lehrform)
+							el.title += '-' + el.lehrform;
+					});
+
+					this.events = res.data;
+				}
+			});
+		}
         
     },
-	created() {
+	async mounted() {
 
-        this.$fhcApi.factory.stundenplan.getStunden().then(res =>{
-            res.data.forEach(std => {
-				this.stunden[std.stunde] = std; // TODO(chris): geht besser
-			});
-
-
-           // old testing room EDV_A6.09
-            this.$fhcApi.factory.stundenplan.getRoomInfo(this.ort_kurzbz, this.weekFirstDay, this.weekLastDay).then(res =>{
-                let events;
-                if (res.data && res.data.forEach) {
-                    res.data.forEach((el, i) => {
-
-                        el.id = i;
-                        if(el.type === 'reservierung')
-                        {
-                            el.color = '#' + (el.farbe || 'FFFFFF');
-                        }else{
-                            el.color = '#' + (el.farbe || 'CCCCCC');
-                        }
-                        
-                        el.start = new Date(el.datum + ' ' + this.stunden[el.stunde].beginn);
-                        el.end = new Date(el.datum + ' ' + this.stunden[el.stunde].ende);
-                        el.title = el.lehrfach;
-                        if (el.lehrform)
-                            el.title += '-' + el.lehrform;
-                    });
-                    
-                    this.events = res.data;
-                }
-
-                // reservierungen are loaded with the stundenplan
-                /* this.$fhcApi.factory.stundenplan.getReservierungen('EDV_F4.26', this.weekFirstDay, this.weekLastDay).then(res => {
-                    if (res.data && res.data.forEach) {
-                        res.data.forEach((el, i) => {
-                            el.reservierung = true;
-                            el.color = '#' + (el.farbe || 'ffffff');
-                            el.start = new Date(el.datum + ' ' + this.stunden[el.stunde].beginn);
-                            el.end = new Date(el.datum + ' ' + this.stunden[el.stunde].ende);
-                            el.title = el.titel;
-                            if (el.lehrform)
-                                el.title += '-' + el.lehrform;
-                        });
-                        
-                    }
-    
-                    let reservierungs_events = res.data;
-                    this.events = [...(this.events?this.events:[]),...reservierungs_events];
-                    
-                    
-                }); */
-            });
-
-           
-        });
+        this.loadStunden();
+		this.loadRoomEvents();
 
 	},
     template: /*html*/`
     <div>
-        <fhc-calendar  v-slot="{event,day}" :initialDate="currentDate" :events="events" initial-mode="week" show-weeks>
+		<fhc-calendar @change:range="updateRange" v-slot="{event,day}" :initialDate="currentDate" :events="events" initial-mode="week" show-weeks>
            
             <a class="text-decoration-none text-dark" href="#" :title="event.orig.title + ' - ' + event.orig.lehrfach_bez + ' [' + event.orig.ort_kurzbz+']'"   >    
                 <div class="d-flex flex-column align-items-center justify-content-evenly h-100" >

From 07400e7551ddb7a8b8a0066d76d9461a96f5e7d5 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 6 Aug 2024 14:49:20 +0200
Subject: [PATCH 1078/1461] change all setAbbrecher to setAbbrecherNeu and
 rename

---
 .../api/frontend/v1/studstatus/Leitung.php    |   3 +-
 .../api/frontend/v1/stv/Status.php            |   2 +-
 application/controllers/jobs/AntragJob.php    |  18 ++-
 application/libraries/AntragLib.php           |  31 ++++-
 application/libraries/PrestudentLib.php       | 118 +-----------------
 system/phrasesupdate.php                      |  20 +++
 6 files changed, 66 insertions(+), 126 deletions(-)

diff --git a/application/controllers/api/frontend/v1/studstatus/Leitung.php b/application/controllers/api/frontend/v1/studstatus/Leitung.php
index 2699a3dbb..87099ad74 100644
--- a/application/controllers/api/frontend/v1/studstatus/Leitung.php
+++ b/application/controllers/api/frontend/v1/studstatus/Leitung.php
@@ -53,7 +53,8 @@ class Leitung extends FHCAPI_Controller
 
 		// Load language phrases
 		$this->loadPhrases([
-			'studierendenantrag'
+			'studierendenantrag',
+			'lehre'
 		]);
 	}
 
diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 6e4a671ee..9df1a8ec4 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -444,7 +444,7 @@ class Status extends FHCAPI_Controller
 		
 		switch($status_kurzbz){
 			case Prestudentstatus_model::STATUS_ABBRECHER:
-				$result = $this->prestudentlib->setAbbrecherNeu(
+				$result = $this->prestudentlib->setAbbrecher(
 					$prestudent_id,
 					$studiensemester_kurzbz,
 					null,
diff --git a/application/controllers/jobs/AntragJob.php b/application/controllers/jobs/AntragJob.php
index 0bac8794f..d079658af 100644
--- a/application/controllers/jobs/AntragJob.php
+++ b/application/controllers/jobs/AntragJob.php
@@ -29,6 +29,10 @@ class AntragJob extends JOB_Controller
 		$this->load->model('crm/Student_model', 'StudentModel');
 		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
 		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
+		$this->loadPhrases([
+			'lehre'
+		]);
 	}
 
 	/**
@@ -451,11 +455,23 @@ class AntragJob extends JOB_Controller
 					if (isError($result))
 						$this->logError(getError($result));
 
+					$this->load->model('crm/Statusgrund_model', 'StatusgrundModel');
+					$result = $this->StatusgrundModel->loadWhere(['statusgrund_kurzbz' => 'abbrecherStgl']);
+					if (isError($result)) {
+						$this->logError(getError($result));
+						continue;
+					} elseif (!hasData($result)) {
+						$this->logError($this->p->t('lehre', 'error_noStatusgrund', ['statusgrund_kurzbz' => 'abbrecherStgl'])); // TODO(chris): phrase
+						continue;
+					}
+					
+					$statusgrund = current(getData($result));
+
 					$result = $this->prestudentlib->setAbbrecher(
 	                    $antrag->prestudent_id,
 	                    $antrag->studiensemester_kurzbz,
 	                    'AntragJob',
-	                    'abbrecherStgl',
+	                    $statusgrund->statusgrund_id,
 	                    $antrag->insertamum,
 	                    null,
 	                    $antrag->insertvon ?: $insertvon
diff --git a/application/libraries/AntragLib.php b/application/libraries/AntragLib.php
index ce4485279..c1649587d 100644
--- a/application/libraries/AntragLib.php
+++ b/application/libraries/AntragLib.php
@@ -121,7 +121,7 @@ class AntragLib
 	public function unpauseAntrag($antrag_id, $insertvon)
 	{
 		if ($insertvon == Studierendenantragstatus_model::INSERTVON_DEREGISTERED)
-			return error($this->p->t('studierendenantrag', 'error_no_right'));
+			return error($this->_ci->p->t('studierendenantrag', 'error_no_right'));
 		if ($insertvon == Studierendenantragstatus_model::INSERTVON_ABMELDUNGSTGL) {
 			return $this->_ci->StudierendenantragstatusModel->resumeAntraegeForAbmeldungStgl($antrag_id);
 		}
@@ -257,18 +257,28 @@ class AntragLib
 						if (isError($result))
 							$errors[] = getError($result);
 
+						$this->_ci->load->model('crm/Statusgrund_model', 'StatusgrundModel');
+						$result = $this->_ci->StatusgrundModel->loadWhere(['statusgrund_kurzbz' => 'abbrecherStud']);
+						if (isError($result)) {
+							$errors[] = getError($result);
+							continue;
+						} elseif (!hasData($result)) {
+							$errors[] = $this->_ci->p->t('lehre', 'error_noStatusgrund', ['statusgrund_kurzbz' => 'abbrecherStud']);
+							continue;
+						}
+						$statusgrund = current(getData($result));
+
 						$result = $this->_ci->prestudentlib->setAbbrecher(
                             $antrag->prestudent_id,
                             $antrag->studiensemester_kurzbz,
                             $insertvon,
-                            'abbrecherStud',
+                            $statusgrund->statusgrund_id,
                             $antrag->datum,
                             $insertam
                         );
-						if (isError($result))
-						{
+						if (isError($result)) {
 							$errors[] = getError($result);
-							return $errors;
+							continue;
 						}
 
 						$result = $this->_ci->PersonModel->loadPrestudent($antrag->prestudent_id);
@@ -421,11 +431,20 @@ class AntragLib
 			// NOTE(chris): here we should have error handling but at the
 			// moment there is no way to notify the user for "soft" errors
 
+			$this->_ci->load->model('crm/Statusgrund_model', 'StatusgrundModel');
+			$result = $this->_ci->StatusgrundModel->loadWhere(['statusgrund_kurzbz' => 'abbrecherStgl']);
+			if (isError($result))
+				return $result;
+			if (!hasData($result))
+				return error($this->_ci->p->t('lehre', 'error_noStatusgrund', ['statusgrund_kurzbz' => 'abbrecherStgl']));
+			
+			$statusgrund = current(getData($result));
+
 			$result = $this->_ci->prestudentlib->setAbbrecher(
                 $antrag->prestudent_id,
                 $antrag->studiensemester_kurzbz,
                 $insertvon,
-                'abbrecherStgl',
+                $statusgrund->statusgrund_id,
                 $status->insertamum
             );
 
diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php
index 58e519565..e8ee7902f 100644
--- a/application/libraries/PrestudentLib.php
+++ b/application/libraries/PrestudentLib.php
@@ -35,7 +35,7 @@ class PrestudentLib
 		$this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
 	}
 
-	public function setAbbrecherNeu(
+	public function setAbbrecher(
 		$prestudent_id,
 		$studiensemester_kurzbz,
 		$insertvon = null,
@@ -170,122 +170,6 @@ class PrestudentLib
 		return success();
 	}
 
-	public function setAbbrecher($prestudent_id, $studiensemester_kurzbz, $insertvon = null, $statusgrund_kurzbz = null, $datum = null, $bestaetigtam = null, $bestaetigtvon = null)
-	{
-		if (!$insertvon)
-			$insertvon = getAuthUID();
-		if (!$bestaetigtvon)
-			$bestaetigtvon = $insertvon;
-
-		$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id, $studiensemester_kurzbz);
-		if (isError($result))
-			return $result;
-		$result = getData($result);
-		if (!$result)
-			return error($this->_ci->p->t('studierendenantrag', 'error_no_prestudent_in_sem', [
-				'prestudent_id' => $prestudent_id,
-				'studiensemester_kurzbz' => $studiensemester_kurzbz
-			]));
-
-		$prestudent_status = current($result);
-
-		$result = $this->_ci->StudentModel->loadWhere(['prestudent_id' => $prestudent_id]);
-
-		if (isError($result))
-			return $result;
-		$result = getData($result);
-		if (!$result)
-			return error($this->_ci->p->t('studierendenantrag', 'error_no_student_for_prestudent', ['prestudent_id' => $prestudent_id]));
-
-		$student = current($result);
-
-		if(!$datum)
-			$datum = date('c');
-
-		if(!$bestaetigtam)
-			$bestaetigtam = date('c');
-
-		//Status und Statusgrund updaten
-		$result = $this->_ci->PrestudentstatusModel->withGrund($statusgrund_kurzbz)->insert([
-			'prestudent_id' => $prestudent_id,
-			'status_kurzbz' => Prestudentstatus_model::STATUS_ABBRECHER,
-			'studiensemester_kurzbz' => $prestudent_status->studiensemester_kurzbz,
-			'ausbildungssemester' => $prestudent_status->ausbildungssemester,
-			'datum' => $datum,
-			'insertvon' => $insertvon,
-			'insertamum' => date('c'),
-			'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz,
-			'studienplan_id'=> $prestudent_status->studienplan_id,
-			'bestaetigtvon' => $bestaetigtvon,
-			'bestaetigtam' => $bestaetigtam
-		]);
-
-		if (isError($result))
-			return $result;
-
-		//refactored with processStudentlehrverband
-		$result = $this->_ci->StudentlehrverbandModel->processStudentlehrverband(
-			$student->student_uid,
-			$student->studiengang_kz,
-			0,
-			'A',
-			'',
-			$studiensemester_kurzbz,
-			Prestudentstatus_model::STATUS_ABBRECHER
-		);
-
-		if (isError($result))
-			return $result;
-
-
-		//noch nicht eingetragene Zeugnisnoten auf 9 setzen
-		$result = $this->_ci->ZeugnisnoteModel->getZeugnisnoten($student->student_uid, $prestudent_status->studiensemester_kurzbz);
-		if (isError($result))
-			return $result;
-		$result = getData($result) ?: [];
-
-		foreach ($result as $lv)
-		{
-			if (!$lv->note)
-			{
-				$result = $this->_ci->ZeugnisnoteModel->insert([
-					'note' => 9,
-					'studiensemester_kurzbz' => $lv->studiensemester_kurzbz,
-					'student_uid' => $lv->uid,
-					'lehrveranstaltung_id' => $lv->lehrveranstaltung_id
-				]);
-				if (isError($result)) {
-					$result = $this->_ci->ZeugnisnoteModel->update([
-						'studiensemester_kurzbz' => $lv->studiensemester_kurzbz,
-						'student_uid' => $lv->uid,
-						'lehrveranstaltung_id' => $lv->lehrveranstaltung_id
-					], [
-						'note' => 9
-					]);
-
-					if (isError($result))
-						return $result;
-				}
-			}
-		}
-
-		// TODO(chris): student updaten (hier oder in studentlehrverband)
-		// TODO(chris): db transaction
-
-		//Benutzer inaktiv setzen
-		$this->_ci->BenutzerModel->update([
-			'uid' =>  $student->student_uid
-		], [
-			'aktiv' => false,
-			'updateaktivvon' => $insertvon,
-			'updateaktivam' => date('c'),
-			'updatevon' => $insertvon,
-			'updateamum' => date('c')
-		]);
-
-		return success();
-	}
-
 	public function setUnterbrecher($prestudent_id, $studiensemester_kurzbz, $studierendenantrag_id = null, $insertvon = null, $ausbildungssemester = null)
 	{
 		$ausbildungssemester_plus = 0;
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 69773fef3..5be674fc5 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -30065,6 +30065,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'error_noStatusgrund',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Statusgrund {statusgrundkurzbz} nicht gefunden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Statusgrund {statusgrundkurzbz} not found',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'lehre',

From 21e69c6d94b9d812a398aa16ce3728ab2ab66af5 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 6 Aug 2024 16:19:35 +0200
Subject: [PATCH 1079/1461] Status: Unterbrecher & Student

---
 .../api/frontend/v1/stv/Status.php            |  38 ++--
 application/libraries/PrestudentLib.php       | 195 ++++++++++--------
 .../Details/Status/Modal.js                   |   2 +-
 system/phrasesupdate.php                      |  20 ++
 4 files changed, 148 insertions(+), 107 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 9df1a8ec4..63c149a82 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -280,6 +280,10 @@ class Status extends FHCAPI_Controller
 			$this->form_validation->set_rules('ausbildungssemester', $this->p->t('lehre', 'ausbildungssemester'), 'integer', [
 				'integer' => $this->p->t('ui', 'error_fieldNotInteger')
 			]);
+			
+		$this->form_validation->set_rules('statusgrund_id', $this->p->t('international', 'grund'), 'integer', [
+			'integer' => $this->p->t('ui', 'error_fieldNotInteger')
+		]);
 
 		$this->form_validation->set_rules('_default', '', [
 			['meldestichtag_not_exceeded', function () use ($datum, $isBerechtigtNoStudstatusCheck) {
@@ -455,28 +459,22 @@ class Status extends FHCAPI_Controller
 				);
 				break;
 			case Prestudentstatus_model::STATUS_UNTERBRECHER:
-				$ausbildungssemester = $lastStatusData->ausbildungssemester;
-				$studiensemester_kurzbz = $lastStatusData->studiensemester_kurzbz;
-
-				$this->load->library('PrestudentLib');
-				$result = $this->prestudentlib->setUnterbrecher($prestudent_id, $studiensemester_kurzbz, null, null, $ausbildungssemester);
-				if (isError($result))
-				{
-					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-				}
-				else
-					$this->terminateWithSuccess($prestudent_id);
+				$result = $this->prestudentlib->setUnterbrecher(
+					$prestudent_id,
+					$studiensemester_kurzbz,
+					null,
+					null,
+					$ausbildungssemester,
+					$statusgrund_id
+				);
 				break;
 			case Prestudentstatus_model::STATUS_STUDENT:
-				$this->load->library('PrestudentLib');
-				$result = $this->prestudentlib->setStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id);
-
-				if (isError($result))
-				{
-					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-				}
-				else
-					$this->terminateWithSuccess($prestudent_id);
+				$result = $this->prestudentlib->setStudent(
+					$prestudent_id,
+					$studiensemester_kurzbz,
+					$ausbildungssemester,
+					$statusgrund_id
+				);
 				break;
 			case Prestudentstatus_model::STATUS_DIPLOMAND:
 				$this->load->library('PrestudentLib');
diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php
index e8ee7902f..fcbf46419 100644
--- a/application/libraries/PrestudentLib.php
+++ b/application/libraries/PrestudentLib.php
@@ -77,7 +77,7 @@ class PrestudentLib
 		if(!$bestaetigtam)
 			$bestaetigtam = date('c');
 
-		//Status und Statusgrund updaten
+		// Status und Statusgrund updaten
 		$result = $this->_ci->PrestudentstatusModel->insert([
 			'prestudent_id' => $prestudent_id,
 			'status_kurzbz' => Prestudentstatus_model::STATUS_ABBRECHER,
@@ -96,7 +96,7 @@ class PrestudentLib
 		if (isError($result))
 			return $result;
 
-		//refactored with processStudentlehrverband
+		// refactored with processStudentlehrverband
 		$result = $this->_ci->StudentlehrverbandModel->processStudentlehrverband(
 			$student->student_uid,
 			$student->studiengang_kz,
@@ -111,7 +111,7 @@ class PrestudentLib
 			return $result;
 
 
-		//noch nicht eingetragene Zeugnisnoten auf 9 setzen
+		// noch nicht eingetragene Zeugnisnoten auf 9 setzen
 		$result = $this->_ci->ZeugnisnoteModel->getZeugnisnoten($student->student_uid, $prestudent_status->studiensemester_kurzbz);
 		if (isError($result))
 			return $result;
@@ -143,9 +143,9 @@ class PrestudentLib
 		}
 
 
-		//Update Aktionen
+		// Update Aktionen
 
-		//StudentModel updaten
+		// StudentModel updaten
 		$this->_ci->StudentModel->update([
 			'student_uid' => $student->student_uid
 		], [
@@ -156,7 +156,7 @@ class PrestudentLib
 			'updateamum' => date('c')
 		]);
 
-		//Benutzer inaktiv setzen
+		// Benutzer inaktiv setzen
 		$this->_ci->BenutzerModel->update([
 			'uid' =>  $student->student_uid
 		], [
@@ -170,17 +170,28 @@ class PrestudentLib
 		return success();
 	}
 
-	public function setUnterbrecher($prestudent_id, $studiensemester_kurzbz, $studierendenantrag_id = null, $insertvon = null, $ausbildungssemester = null)
-	{
+	public function setUnterbrecher(
+		$prestudent_id,
+		$studiensemester_kurzbz,
+		$studierendenantrag_id = null,
+		$insertvon = null,
+		$ausbildungssemester = null,
+		$statusgrund_id = null
+	) {
 		$ausbildungssemester_plus = 0;
+		
 		if (!$insertvon)
 			$insertvon = getAuthUID();
 
+
 		$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id, $studiensemester_kurzbz);
+		
 		if (isError($result))
 			return $result;
+		
 		$result = getData($result);
-		if (!$result) {
+		
+		if (!$result) { // NOTE(chris): no status in target stdsem
 			//NOTE(manu): only valid if nextSemester focus max
 
 			$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
@@ -188,7 +199,7 @@ class PrestudentLib
 				return $result;
 			$result = getData($result);
 
-			//check if ausbildungssemester is last
+			// check if ausbildungssemester is last
 			$this->_ci->StudiengangModel->addJoin('public.tbl_prestudent p', 'studiengang_kz');
 			$res = $this->_ci->StudiengangModel->loadWhere(['p.prestudent_id' => $prestudent_id]);
 			if(isError($res))
@@ -213,17 +224,22 @@ class PrestudentLib
 		}
 
 		$prestudent_status = current($result);
+
+
 		$result = $this->_ci->StudentModel->loadWhere(['prestudent_id' => $prestudent_id]);
 
 		if (isError($result))
 			return $result;
+
 		$result = getData($result);
+		
 		if (!$result)
 			return error($this->_ci->p->t('studierendenantrag', 'error_no_student_for_prestudent', ['prestudent_id' => $prestudent_id]));
 
 		$student = current($result);
 
-		if($studierendenantrag_id)
+
+		if ($studierendenantrag_id)
 		{
 			$resultAntrag = $this->_ci->StudierendenantragModel->load($studierendenantrag_id);
 			if (isError($resultAntrag))
@@ -238,12 +254,12 @@ class PrestudentLib
 		else
 			$anmerkung = '';
 
-		if($ausbildungssemester)
+		if ($ausbildungssemester)
 			$semester = $ausbildungssemester;
 		else
 			$semester = $prestudent_status->ausbildungssemester + $ausbildungssemester_plus;
 
-		//Status updaten
+		// Status updaten
 		$result = $this->_ci->PrestudentstatusModel->insert([
 			'prestudent_id' => $prestudent_id,
 			'status_kurzbz' => Prestudentstatus_model::STATUS_UNTERBRECHER,
@@ -256,13 +272,14 @@ class PrestudentLib
 			'studienplan_id'=> $prestudent_status->studienplan_id,
 			'bestaetigtvon' => $insertvon,
 			'bestaetigtam' => date('c'),
-			'anmerkung'=> $anmerkung
+			'anmerkung'=> $anmerkung,
+			'statusgrund_id' => $statusgrund_id
 		]);
 
 		if (isError($result))
 			return $result;
 
-		//refactored with processStudentlehrverband
+		// refactored with processStudentlehrverband
 		$result = $this->_ci->StudentlehrverbandModel->processStudentlehrverband(
 			$student->student_uid,
 			$student->studiengang_kz,
@@ -276,7 +293,7 @@ class PrestudentLib
 		if (isError($result))
 			return $result;
 
-		//noch nicht eingetragene Zeugnisnoten auf 9 setzen
+		// noch nicht eingetragene Zeugnisnoten auf 9 setzen
 		$result = $this->_ci->ZeugnisnoteModel->getZeugnisnoten($student->student_uid, $studiensemester_kurzbz);
 		if (isError($result))
 			return $result;
@@ -308,9 +325,9 @@ class PrestudentLib
 		}
 
 
-		//Update Aktionen
+		// Update Aktionen
 
-		//StudentModel updaten
+		// StudentModel updaten
 		$this->_ci->StudentModel->update([
 			'student_uid' => $student->student_uid
 		], [
@@ -326,106 +343,112 @@ class PrestudentLib
 
 	public function setStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id)
 	{
+		$authUID = getAuthUID();
+		$now = date('c');
+
+
 		$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
+
 		if (isError($result))
 			return $result;
-		$resultStatus = getData($result);
+		if (!hasData($result))
+			return error($this->_ci->p->t('studierendenantrag', 'error_no_prestudentstatus', [
+				'prestudent_id' => $prestudent_id
+			]));
 
-		//if not Wiederholer
-		if($statusgrund_id != 16)
-		{
-			//check if ausbildungssemester is last
-			$this->_ci->StudiengangModel->addJoin('public.tbl_prestudent p', 'studiengang_kz');
-			$resultStg = $this->_ci->StudiengangModel->loadWhere(['p.prestudent_id' => $prestudent_id]);
-			if(isError($resultStg))
-				return $resultStg;
-			if(!hasData($resultStg))
-				return error($this->_ci->p->t('studierendenantrag', 'error_no_stg_for_prestudent', [
-					'prestudent_id' => $prestudent_id
-				]));
+		$prestudent_status = current(getData($result));
 
 
-			$studiengang = current(getData($resultStg));
-
-			$prestudent_status = ($resultStatus[0] ?: null );
-			if(!$prestudent_status)
-			{
-				return error($this->_ci->p->t('studierendenantrag', 'error_no_prestudent_in_sem', [
-					'prestudent_id' => $prestudent_id,
-					'studiensemester_kurzbz' => $studiensemester_kurzbz
-				]));
-			}
-		}
-
 		$result = $this->_ci->StudentModel->loadWhere(['prestudent_id' => $prestudent_id]);
 
 		if (isError($result))
 			return $result;
-		$result = getData($result);
-		if (!$result)
+		if (!hasData($result))
 			return error($this->_ci->p->t('studierendenantrag', 'error_no_student_for_prestudent', ['prestudent_id' => $prestudent_id]));
 
-		//	$student = current($result);
+		$student = current(getData($result));
 
-		//Status updaten
+
+		$this->_ci->load->library('VariableLib', ['uid' => $authUID]);
+		$semester_aktuell = $this->variablelib->getVar('semester_aktuell');
+
+
+		// Update Aktionen
+
+		// Status updaten
 		$result = $this->_ci->PrestudentstatusModel->insert([
 			'prestudent_id' => $prestudent_id,
 			'status_kurzbz' => Prestudentstatus_model::STATUS_STUDENT,
 			'studiensemester_kurzbz' => $studiensemester_kurzbz,
 			'statusgrund_id' => $statusgrund_id,
 			'ausbildungssemester' => $ausbildungssemester,
-			'datum' => date('c'),
-			'insertvon' => getAuthUID(),
-			'insertamum' => date('c'),
+			'datum' => $now,
+			'insertvon' => $authUID,
+			'insertamum' => $now,
 			'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz,
 			'studienplan_id'=> $prestudent_status->studienplan_id,
-			'bestaetigtvon' => getAuthUID(),
-			'bestaetigtam' => date('c')
+			'bestaetigtvon' => $authUID,
+			'bestaetigtam' => $now
 		]);
 
 		if (isError($result))
 			return $result;
 
-		$result = $this->_ci->StudentModel->checkIfUid($prestudent_id);
-		if (isError($result)) {
-			return $result;
-		}
-		//$student_uid = $result->retval;
-		$student_uid = getData($result);
 
-		//load student
-		$result = $this->_ci->StudentModel->loadWhere(
-			array(
-				'student_uid' => $student_uid
-			)
-		);
-		if (isError($result))
-		{
-			return $result;
-		}
-
-		$studentData = current(getData($result) ? : []);
-		//TODO(Manu) check why in FAS == 0; correct there??
-		//$verband = $studentData->verband == '' ? '' : $studentData->verband;
-		//$gruppe = $studentData->gruppe == '' ? '' : $studentData->gruppe;
-		$studiengang_kz = $studentData->studiengang_kz;
-
-		//process studentlehrverband
-		$this->_ci->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
-		$result = $this->_ci->StudentlehrverbandModel->processStudentlehrverband(
-			$student_uid,
-			$studiengang_kz,
-			$ausbildungssemester,
-			"", //TODO(Manu) checkFAS: 0
-			"",//TODO(Manu) checkFAS: 0
-			$studiensemester_kurzbz
-		);
+		// Student updaten
+		$result = $this->_ci->StudentModel->update([
+			'student_uid' => $student->student_uid
+		], [
+			'studiensemester_kurzbz' => $semester_aktuell,
+			'semester' => $ausbildungssemester,
+			'verband' => '',
+			'gruppe' => '',
+			'updatevon' => $authUID,
+			'updateamum' => $now
+		]);
 
 		if (isError($result))
-		{
 			return $result;
+
+
+		// Studentlehrverband updaten
+		$result = $this->_ci->StudentlehrverbandModel->update([
+			'student_uid' => $student->student_uid,
+			'studiensemester_kurzbz' => $semester_aktuell
+		], [
+			'semester' => $ausbildungssemester,
+			'verband' => '',
+			'gruppe' => '',
+			'updatevon' => $authUID,
+			'updateamum' => $now
+		]);
+
+		if (isError($result))
+			return $result;
+
+
+		// Benutzer updaten
+		$result = $this->_ci->BenutzerModel->load([$student->student_uid]);
+
+		if (isError($result))
+			return $result;
+		if (!hasData($result))
+			return error($this->_ci->p->t('person', 'error_noBenutzer'));
+
+		$benutzer = current(getData($result));
+		$updateData = [
+			'aktiv' => true,
+			'updateamum' => $now,
+			'updatevon' => $authUID
+		];
+		if (!$benutzer->aktiv) {
+			$updateData['updateaktivam'] = $now;
+			$updateData['updateaktivvon'] = $authUID;
 		}
 
+
+		$this->_ci->BenutzerModel->update([$student->student_uid], $updateData);
+
 		return success();
 	}
 
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js b/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js
index 2b3f2f580..0b0736ea1 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js
@@ -371,7 +371,7 @@ export default{
 				type="select"
 				v-model="formData.statusgrund_id"
 				name="statusgrund_id"
-				:label="$p.t('studierendenantrag/antrag_grund')"
+				:label="$p.t('international/grund')"
 				>
 				<option :value="null">-- {{$p.t('fehlermonitoring', 'keineAuswahl')}} --</option>
 				<option
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 5be674fc5..ad6019c05 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -2662,6 +2662,26 @@ $phrases = array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'error_noBenutzer',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kein Benutzer gefunden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No User found',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 
 	//****************	CORE/lehre
 	array(

From 09a0536921ba617d1ae9839ab0a18b868d9cd2ea Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 6 Aug 2024 16:24:38 +0200
Subject: [PATCH 1080/1461] Status Diplomand

---
 .../api/frontend/v1/stv/Status.php            | 14 ++----
 application/libraries/PrestudentLib.php       | 50 ++-----------------
 2 files changed, 9 insertions(+), 55 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 63c149a82..929cf7cad 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -477,15 +477,11 @@ class Status extends FHCAPI_Controller
 				);
 				break;
 			case Prestudentstatus_model::STATUS_DIPLOMAND:
-				$this->load->library('PrestudentLib');
-				$result = $this->prestudentlib->setDiplomand($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
-
-				if (isError($result))
-				{
-					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-				}
-				else
-					$this->terminateWithSuccess($prestudent_id);
+				$result = $this->prestudentlib->setDiplomand(
+					$prestudent_id,
+					$studiensemester_kurzbz,
+					$ausbildungssemester
+				);
 				break;
 			case Prestudentstatus_model::STATUS_ABSOLVENT:
 				$this->load->library('PrestudentLib');
diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php
index fcbf46419..9e8ee63d1 100644
--- a/application/libraries/PrestudentLib.php
+++ b/application/libraries/PrestudentLib.php
@@ -519,23 +519,18 @@ class PrestudentLib
 	public function setDiplomand($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester)
 	{
 		$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
+
 		if (isError($result))
 			return $result;
 		if (!hasData($result))
 			return error($this->_ci->p->t('studierendenantrag', 'error_no_student_for_prestudent', ['prestudent_id' => $prestudent_id]));
 
-		$result = getData($result) ?: [];
+		$prestudent_status = current(getData($result));
 
-		$prestudent_status = current($result);
-		$result = $this->_ci->StudentModel->loadWhere(['prestudent_id' => $prestudent_id]);
 
-		if (isError($result))
-			return $result;
-		$result = getData($result);
-		if (!$result)
-			return error($this->_ci->p->t('studierendenantrag', 'error_no_student_for_prestudent', ['prestudent_id' => $prestudent_id]));
+		// Update Aktionen
 
-		//Status updaten
+		// Status updaten
 		$result = $this->_ci->PrestudentstatusModel->insert([
 			'prestudent_id' => $prestudent_id,
 			'status_kurzbz' => Prestudentstatus_model::STATUS_DIPLOMAND,
@@ -553,43 +548,6 @@ class PrestudentLib
 		if (isError($result))
 			return $result;
 
-		$result = $this->_ci->StudentModel->checkIfUid($prestudent_id);
-		if (isError($result)) {
-			return $result;
-		}
-		$student_uid = $result->retval;
-
-		//load student
-		$result = $this->_ci->StudentModel->loadWhere(
-			array(
-				'student_uid' => $student_uid
-			)
-		);
-		if (isError($result))
-		{
-			return $result;
-		}
-
-		$studentData = current(getData($result) ? : []);
-		$verband = $studentData->verband == '' ? '' : $studentData->verband;
-		$gruppe = $studentData->gruppe == '' ? '' : $studentData->gruppe;
-		$studiengang_kz = $studentData->studiengang_kz;
-
-		//process studentlehrverband
-		$this->_ci->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
-		$result = $this->_ci->StudentlehrverbandModel->processStudentlehrverband(
-			$student_uid,
-			$studiengang_kz,
-			$ausbildungssemester,
-			$verband,
-			$gruppe,
-			$studiensemester_kurzbz
-		);
-		if (isError($result))
-		{
-			return $result;
-		}
-
 		return success();
 	}
 

From 942e8a9229a90ff89f797943db04d505f99f3111 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 6 Aug 2024 16:27:45 +0200
Subject: [PATCH 1081/1461] Status: Absolvent

---
 .../api/frontend/v1/stv/Status.php            | 14 ++---
 application/libraries/PrestudentLib.php       | 57 ++++---------------
 2 files changed, 15 insertions(+), 56 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 929cf7cad..db59541b5 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -484,15 +484,11 @@ class Status extends FHCAPI_Controller
 				);
 				break;
 			case Prestudentstatus_model::STATUS_ABSOLVENT:
-				$this->load->library('PrestudentLib');
-				$result = $this->prestudentlib->setAbsolvent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
-
-				if (isError($result))
-				{
-					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-				}
-				else
-					$this->terminateWithSuccess($prestudent_id);
+				$result = $this->prestudentlib->setAbsolvent(
+					$prestudent_id,
+					$studiensemester_kurzbz,
+					$ausbildungssemester
+				);
 				break;
 			case Prestudentstatus_model::STATUS_BEWERBER:
 				$this->load->library('PrestudentLib');
diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php
index 9e8ee63d1..f48084dc0 100644
--- a/application/libraries/PrestudentLib.php
+++ b/application/libraries/PrestudentLib.php
@@ -523,7 +523,9 @@ class PrestudentLib
 		if (isError($result))
 			return $result;
 		if (!hasData($result))
-			return error($this->_ci->p->t('studierendenantrag', 'error_no_student_for_prestudent', ['prestudent_id' => $prestudent_id]));
+			return error($this->_ci->p->t('studierendenantrag', 'error_no_prestudentstatus', [
+				'prestudent_id' => $prestudent_id
+			]));
 
 		$prestudent_status = current(getData($result));
 
@@ -554,18 +556,16 @@ class PrestudentLib
 	public function setAbsolvent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester)
 	{
 		$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
-		if (isError($result))
-			return $result;
-		$result = getData($result);
-
-		$prestudent_status = current($result);
-		$result = $this->_ci->StudentModel->loadWhere(['prestudent_id' => $prestudent_id]);
 
 		if (isError($result))
 			return $result;
-		$result = getData($result);
-		if (!$result)
-			return error($this->_ci->p->t('studierendenantrag', 'error_no_student_for_prestudent', ['prestudent_id' => $prestudent_id]));
+		if (!hasData($result))
+			return error($this->_ci->p->t('studierendenantrag', 'error_no_prestudentstatus', [
+				'prestudent_id' => $prestudent_id
+			]));
+
+		$prestudent_status = current(getData($result));
+
 
 		//Status updaten
 		$result = $this->_ci->PrestudentstatusModel->insert([
@@ -585,43 +585,6 @@ class PrestudentLib
 		if (isError($result))
 			return $result;
 
-		$result = $this->_ci->StudentModel->checkIfUid($prestudent_id);
-		if (isError($result)) {
-			return $result;
-		}
-		$student_uid = $result->retval;
-
-		//load student
-		$result = $this->_ci->StudentModel->loadWhere(
-			array(
-				'student_uid' => $student_uid
-			)
-		);
-		if (isError($result))
-		{
-			return $result;
-		}
-
-		$studentData = current(getData($result) ? : []);
-		$verband = $studentData->verband == '' ? '' : $studentData->verband;
-		$gruppe = $studentData->gruppe == '' ? '' : $studentData->gruppe;
-		$studiengang_kz = $studentData->studiengang_kz;
-
-		//process studentlehrverband
-		$this->_ci->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
-		$result = $this->_ci->StudentlehrverbandModel->processStudentlehrverband(
-			$student_uid,
-			$studiengang_kz,
-			$ausbildungssemester,
-			$verband,
-			$gruppe,
-			$studiensemester_kurzbz
-		);
-		if (isError($result))
-		{
-			return $result;
-		}
-
 		return success();
 	}
 

From 749b29a2395682a455168905775314180ee5472c Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 6 Aug 2024 16:30:50 +0200
Subject: [PATCH 1082/1461] Status: Bewerber

---
 .../api/frontend/v1/stv/Status.php            | 14 +++----
 application/libraries/PrestudentLib.php       | 37 +++++++++++--------
 2 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index db59541b5..35c480b37 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -491,15 +491,11 @@ class Status extends FHCAPI_Controller
 				);
 				break;
 			case Prestudentstatus_model::STATUS_BEWERBER:
-				$this->load->library('PrestudentLib');
-				$result = $this->prestudentlib->setBewerber($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
-
-				if (isError($result))
-				{
-					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-				}
-				else
-					$this->terminateWithSuccess($prestudent_id);
+				$result = $this->prestudentlib->setBewerber(
+					$prestudent_id,
+					$studiensemester_kurzbz,
+					$ausbildungssemester
+				);
 				break;
 			case Prestudentstatus_model::STATUS_AUFGENOMMENER:
 				$this->load->library('PrestudentLib');
diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php
index f48084dc0..ba51c4d6a 100644
--- a/application/libraries/PrestudentLib.php
+++ b/application/libraries/PrestudentLib.php
@@ -567,7 +567,9 @@ class PrestudentLib
 		$prestudent_status = current(getData($result));
 
 
-		//Status updaten
+		// Update Aktionen
+
+		// Status updaten
 		$result = $this->_ci->PrestudentstatusModel->insert([
 			'prestudent_id' => $prestudent_id,
 			'status_kurzbz' => Prestudentstatus_model::STATUS_ABSOLVENT,
@@ -590,18 +592,21 @@ class PrestudentLib
 
 	public function setBewerber($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester)
 	{
-		$resultLastStatus = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
-		if (isError($resultLastStatus))
-			return $resultLastStatus;
-		$resultLastStatus = getData($resultLastStatus);
+		$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
 
-		$prestudent_status = current($resultLastStatus);
+		if (isError($result))
+			return $result;
+		if (!hasData($result))
+			return error($this->_ci->p->t('studierendenantrag', 'error_no_prestudentstatus', [
+				'prestudent_id' => $prestudent_id
+			]));
 
-		//check studiensemester_kurzbz TODO(Manu) check if Necessary: already checked in staus.php changeStatus()
-		/*		$studiensemester_kurzbz = $prestudent_status->studiensemester_kurzbz != $studiensemester_kurzbz ?
-					$prestudent_status->studiensemester_kurzbz : $studiensemester_kurzbz;*/
+		$prestudent_status = current(getData($result));
 
-		//Status updaten
+
+		// Update Aktionen
+
+		// Status updaten
 		$result = $this->_ci->PrestudentstatusModel->insert([
 			'prestudent_id' => $prestudent_id,
 			'status_kurzbz' => Prestudentstatus_model::STATUS_BEWERBER,
@@ -616,12 +621,14 @@ class PrestudentLib
 			'bestaetigtam' => date('c')
 		]);
 
-		if (isError($result))
-		{
-			return $result;
+		if (SEND_BEWERBER_INFOMAIL) {
+			// TODO(chris): IMPLEMENT!
 		}
-		else
-			return success();
+
+		if (isError($result))
+			return $result;
+
+		return success();
 	}
 
 	public function setAufgenommener($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester)

From f87277e1f2d9e63a17896e38cb0e755b337b3c2f Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 6 Aug 2024 16:35:59 +0200
Subject: [PATCH 1083/1461] Status: Aufgenommener & code reuse

---
 .../api/frontend/v1/stv/Status.php            |  14 +-
 application/libraries/PrestudentLib.php       | 169 +++++-------------
 2 files changed, 47 insertions(+), 136 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 35c480b37..a002926f9 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -498,15 +498,11 @@ class Status extends FHCAPI_Controller
 				);
 				break;
 			case Prestudentstatus_model::STATUS_AUFGENOMMENER:
-				$this->load->library('PrestudentLib');
-				$result = $this->prestudentlib->setAufgenommener($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
-
-				if (isError($result))
-				{
-					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-				}
-				else
-					$this->terminateWithSuccess($prestudent_id);
+				$result = $this->prestudentlib->setAufgenommener(
+					$prestudent_id,
+					$studiensemester_kurzbz,
+					$ausbildungssemester
+				);
 				break;
 			case Prestudentstatus_model::STATUS_ABGEWIESENER:
 				$this->load->library('PrestudentLib');
diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php
index ba51c4d6a..4a0b45034 100644
--- a/application/libraries/PrestudentLib.php
+++ b/application/libraries/PrestudentLib.php
@@ -518,150 +518,28 @@ class PrestudentLib
 
 	public function setDiplomand($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester)
 	{
-		$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
-
-		if (isError($result))
-			return $result;
-		if (!hasData($result))
-			return error($this->_ci->p->t('studierendenantrag', 'error_no_prestudentstatus', [
-				'prestudent_id' => $prestudent_id
-			]));
-
-		$prestudent_status = current(getData($result));
-
-
-		// Update Aktionen
-
-		// Status updaten
-		$result = $this->_ci->PrestudentstatusModel->insert([
-			'prestudent_id' => $prestudent_id,
-			'status_kurzbz' => Prestudentstatus_model::STATUS_DIPLOMAND,
-			'studiensemester_kurzbz' => $studiensemester_kurzbz,
-			'ausbildungssemester' => $ausbildungssemester,
-			'datum' => date('c'),
-			'insertvon' => getAuthUID(),
-			'insertamum' => date('c'),
-			'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz,
-			'studienplan_id'=> $prestudent_status->studienplan_id,
-			'bestaetigtvon' => getAuthUID(),
-			'bestaetigtam' => date('c'),
-		]);
-
-		if (isError($result))
-			return $result;
-
-		return success();
+		return $this->setBasic(Prestudentstatus_model::STATUS_DIPLOMAND, $prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
 	}
 
 	public function setAbsolvent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester)
 	{
-		$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
-
-		if (isError($result))
-			return $result;
-		if (!hasData($result))
-			return error($this->_ci->p->t('studierendenantrag', 'error_no_prestudentstatus', [
-				'prestudent_id' => $prestudent_id
-			]));
-
-		$prestudent_status = current(getData($result));
-
-
-		// Update Aktionen
-
-		// Status updaten
-		$result = $this->_ci->PrestudentstatusModel->insert([
-			'prestudent_id' => $prestudent_id,
-			'status_kurzbz' => Prestudentstatus_model::STATUS_ABSOLVENT,
-			'studiensemester_kurzbz' => $studiensemester_kurzbz,
-			'ausbildungssemester' => $ausbildungssemester,
-			'datum' => date('c'),
-			'insertvon' => getAuthUID(),
-			'insertamum' => date('c'),
-			'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz,
-			'studienplan_id'=> $prestudent_status->studienplan_id,
-			'bestaetigtvon' => getAuthUID(),
-			'bestaetigtam' => date('c'),
-		]);
-
-		if (isError($result))
-			return $result;
-
-		return success();
+		return $this->setBasic(Prestudentstatus_model::STATUS_ABSOLVENT, $prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
 	}
 
 	public function setBewerber($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester)
 	{
-		$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
-
-		if (isError($result))
-			return $result;
-		if (!hasData($result))
-			return error($this->_ci->p->t('studierendenantrag', 'error_no_prestudentstatus', [
-				'prestudent_id' => $prestudent_id
-			]));
-
-		$prestudent_status = current(getData($result));
-
-
-		// Update Aktionen
-
-		// Status updaten
-		$result = $this->_ci->PrestudentstatusModel->insert([
-			'prestudent_id' => $prestudent_id,
-			'status_kurzbz' => Prestudentstatus_model::STATUS_BEWERBER,
-			'studiensemester_kurzbz' => $studiensemester_kurzbz,
-			'ausbildungssemester' => $ausbildungssemester,
-			'datum' => date('c'),
-			'insertvon' => getAuthUID(),
-			'insertamum' => date('c'),
-			'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz,
-			'studienplan_id'=> $prestudent_status->studienplan_id,
-			'bestaetigtvon' => getAuthUID(),
-			'bestaetigtam' => date('c')
-		]);
+		$result = $this->setBasic(Prestudentstatus_model::STATUS_BEWERBER, $prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
 
 		if (SEND_BEWERBER_INFOMAIL) {
 			// TODO(chris): IMPLEMENT!
 		}
 
-		if (isError($result))
-			return $result;
-
-		return success();
+		return $result;
 	}
 
 	public function setAufgenommener($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester)
 	{
-		$resultLastStatus = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
-		if (isError($resultLastStatus))
-			return $resultLastStatus;
-		$resultLastStatus = getData($resultLastStatus);
-
-		$prestudent_status = current($resultLastStatus);
-
-
-		//Status updaten
-		$result = $this->_ci->PrestudentstatusModel->insert([
-			'prestudent_id' => $prestudent_id,
-			'status_kurzbz' => Prestudentstatus_model::STATUS_AUFGENOMMENER,
-			'studiensemester_kurzbz' => $studiensemester_kurzbz,
-			'ausbildungssemester' => $ausbildungssemester,
-			'datum' => date('c'),
-			'insertvon' => getAuthUID(),
-			'insertamum' => date('c'),
-			'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz,
-			'studienplan_id'=> $prestudent_status->studienplan_id,
-			'bestaetigtvon' => getAuthUID(),
-			'bestaetigtam' => date('c')
-		]);
-
-		if (isError($result))
-		{
-			return $result;
-		}
-		else
-			return success();
+		return $this->setBasic(Prestudentstatus_model::STATUS_AUFGENOMMENER, $prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
 	}
 
 	public function setAbgewiesener($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id)
@@ -728,4 +606,41 @@ class PrestudentLib
 		else
 			return success();
 	}
+
+	protected function setBasic($status_kurzbz, $prestudent_id, $studiensemester_kurzbz, $ausbildungssemester)
+	{
+		$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
+
+		if (isError($result))
+			return $result;
+		if (!hasData($result))
+			return error($this->_ci->p->t('studierendenantrag', 'error_no_prestudentstatus', [
+				'prestudent_id' => $prestudent_id
+			]));
+
+		$prestudent_status = current(getData($result));
+
+
+		// Update Aktionen
+
+		// Status updaten
+		$result = $this->_ci->PrestudentstatusModel->insert([
+			'prestudent_id' => $prestudent_id,
+			'status_kurzbz' => $status_kurzbz,
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'ausbildungssemester' => $ausbildungssemester,
+			'datum' => date('c'),
+			'insertvon' => getAuthUID(),
+			'insertamum' => date('c'),
+			'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz,
+			'studienplan_id'=> $prestudent_status->studienplan_id,
+			'bestaetigtvon' => getAuthUID(),
+			'bestaetigtam' => date('c')
+		]);
+
+		if (isError($result))
+			return $result;
+
+		return success();
+	}
 }

From b3e105908bd24baf6c0bf23707986d87a87e6e69 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 6 Aug 2024 16:41:38 +0200
Subject: [PATCH 1084/1461] Fix Status Absolvent & Bewerber

---
 application/libraries/PrestudentLib.php | 42 +++++++++++++++++++++++--
 1 file changed, 40 insertions(+), 2 deletions(-)

diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php
index 4a0b45034..6394713e5 100644
--- a/application/libraries/PrestudentLib.php
+++ b/application/libraries/PrestudentLib.php
@@ -523,18 +523,56 @@ class PrestudentLib
 
 	public function setAbsolvent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester)
 	{
-		return $this->setBasic(Prestudentstatus_model::STATUS_ABSOLVENT, $prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
+		$authUID = getAuthUID();
+		$now = date('c');
+
+
+		$result = $this->setBasic(Prestudentstatus_model::STATUS_ABSOLVENT, $prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
+
+		if (isError($result))
+			return $result;
+
+		
+		// Load Student
+		$result = $this->_ci->StudentModel->loadWhere(['prestudent_id' => $prestudent_id]);
+
+		if (isError($result))
+			return $result;
+		if (!hasData($result))
+			return error($this->_ci->p->t('studierendenantrag', 'error_no_student_for_prestudent', ['prestudent_id' => $prestudent_id]));
+
+		$student = current(getData($result));
+
+
+		// Benutzer inaktiv setzen
+		$this->_ci->BenutzerModel->update([
+			'uid' =>  $student->student_uid
+		], [
+			'aktiv' => false,
+			'updateaktivvon' => $authUID,
+			'updateaktivam' => $now,
+			'updatevon' => $authUID,
+			'updateamum' => $now
+		]);
+
+		if (isError($result))
+			return $result;
+
+		return success();
 	}
 
 	public function setBewerber($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester)
 	{
 		$result = $this->setBasic(Prestudentstatus_model::STATUS_BEWERBER, $prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
 
+		if (isError($result))
+			return $result;
+
 		if (SEND_BEWERBER_INFOMAIL) {
 			// TODO(chris): IMPLEMENT!
 		}
 
-		return $result;
+		return success();
 	}
 
 	public function setAufgenommener($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester)

From 6dd779b42108c62523c5429888c7bd41fea5d865 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 6 Aug 2024 16:47:12 +0200
Subject: [PATCH 1085/1461] Status Abgewiesener

---
 .../api/frontend/v1/stv/Status.php            | 23 ++++-----
 application/libraries/PrestudentLib.php       | 51 +++++--------------
 2 files changed, 22 insertions(+), 52 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index a002926f9..c25ffbe6c 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -480,40 +480,37 @@ class Status extends FHCAPI_Controller
 				$result = $this->prestudentlib->setDiplomand(
 					$prestudent_id,
 					$studiensemester_kurzbz,
-					$ausbildungssemester
+					$ausbildungssemester // TODO(chris): statusgrund_id
 				);
 				break;
 			case Prestudentstatus_model::STATUS_ABSOLVENT:
 				$result = $this->prestudentlib->setAbsolvent(
 					$prestudent_id,
 					$studiensemester_kurzbz,
-					$ausbildungssemester
+					$ausbildungssemester // TODO(chris): statusgrund_id
 				);
 				break;
 			case Prestudentstatus_model::STATUS_BEWERBER:
 				$result = $this->prestudentlib->setBewerber(
 					$prestudent_id,
 					$studiensemester_kurzbz,
-					$ausbildungssemester
+					$ausbildungssemester // TODO(chris): statusgrund_id
 				);
 				break;
 			case Prestudentstatus_model::STATUS_AUFGENOMMENER:
 				$result = $this->prestudentlib->setAufgenommener(
 					$prestudent_id,
 					$studiensemester_kurzbz,
-					$ausbildungssemester
+					$ausbildungssemester // TODO(chris): statusgrund_id
 				);
 				break;
 			case Prestudentstatus_model::STATUS_ABGEWIESENER:
-				$this->load->library('PrestudentLib');
-				$result = $this->prestudentlib->setAbgewiesener($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id);
-
-				if (isError($result))
-				{
-					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-				}
-				else
-					$this->terminateWithSuccess($prestudent_id);
+				$result = $this->prestudentlib->setAbgewiesener(
+					$prestudent_id,
+					$studiensemester_kurzbz,
+					$ausbildungssemester,
+					$statusgrund_id
+				);
 				break;
 			case Prestudentstatus_model::STATUS_WARTENDER:
 				$this->load->library('PrestudentLib');
diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php
index 6394713e5..33a2ef328 100644
--- a/application/libraries/PrestudentLib.php
+++ b/application/libraries/PrestudentLib.php
@@ -518,7 +518,7 @@ class PrestudentLib
 
 	public function setDiplomand($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester)
 	{
-		return $this->setBasic(Prestudentstatus_model::STATUS_DIPLOMAND, $prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
+		return $this->setBasic(getAuthUID(), date('c'), Prestudentstatus_model::STATUS_DIPLOMAND, $prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
 	}
 
 	public function setAbsolvent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester)
@@ -527,7 +527,7 @@ class PrestudentLib
 		$now = date('c');
 
 
-		$result = $this->setBasic(Prestudentstatus_model::STATUS_ABSOLVENT, $prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
+		$result = $this->setBasic($authUID, $now, Prestudentstatus_model::STATUS_ABSOLVENT, $prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
 
 		if (isError($result))
 			return $result;
@@ -563,7 +563,7 @@ class PrestudentLib
 
 	public function setBewerber($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester)
 	{
-		$result = $this->setBasic(Prestudentstatus_model::STATUS_BEWERBER, $prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
+		$result = $this->setBasic(getAuthUID(), date('c'), Prestudentstatus_model::STATUS_BEWERBER, $prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
 
 		if (isError($result))
 			return $result;
@@ -577,40 +577,12 @@ class PrestudentLib
 
 	public function setAufgenommener($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester)
 	{
-		return $this->setBasic(Prestudentstatus_model::STATUS_AUFGENOMMENER, $prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
+		return $this->setBasic(getAuthUID(), $now, Prestudentstatus_model::STATUS_AUFGENOMMENER, $prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
 	}
 
 	public function setAbgewiesener($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id)
 	{
-		$resultLastStatus = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
-		if (isError($resultLastStatus))
-			return $resultLastStatus;
-		$resultLastStatus = getData($resultLastStatus);
-
-		$prestudent_status = current($resultLastStatus);
-
-		//Status updaten
-		$result = $this->_ci->PrestudentstatusModel->insert([
-			'prestudent_id' => $prestudent_id,
-			'status_kurzbz' => Prestudentstatus_model::STATUS_ABGEWIESENER,
-			'studiensemester_kurzbz' => $studiensemester_kurzbz,
-			'ausbildungssemester' => $ausbildungssemester,
-			'datum' => date('c'),
-			'insertvon' => getAuthUID(),
-			'insertamum' => date('c'),
-			'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz,
-			'studienplan_id'=> $prestudent_status->studienplan_id,
-			'bestaetigtvon' => getAuthUID(),
-			'bestaetigtam' => date('c'),
-			'statusgrund_id' => $statusgrund_id
-		]);
-
-		if (isError($result))
-		{
-			return $result;
-		}
-		else
-			return success();
+		return $this->setBasic(getAuthUID(), $now, Prestudentstatus_model::STATUS_ABGEWIESENER, $prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id);
 	}
 
 	public function setWartender($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester)
@@ -645,7 +617,7 @@ class PrestudentLib
 			return success();
 	}
 
-	protected function setBasic($status_kurzbz, $prestudent_id, $studiensemester_kurzbz, $ausbildungssemester)
+	protected function setBasic($authUID, $now, $status_kurzbz, $prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id = null)
 	{
 		$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
 
@@ -667,13 +639,14 @@ class PrestudentLib
 			'status_kurzbz' => $status_kurzbz,
 			'studiensemester_kurzbz' => $studiensemester_kurzbz,
 			'ausbildungssemester' => $ausbildungssemester,
-			'datum' => date('c'),
-			'insertvon' => getAuthUID(),
-			'insertamum' => date('c'),
+			'datum' => $now,
+			'insertvon' => $authUID,
+			'insertamum' => $now,
 			'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz,
 			'studienplan_id'=> $prestudent_status->studienplan_id,
-			'bestaetigtvon' => getAuthUID(),
-			'bestaetigtam' => date('c')
+			'bestaetigtvon' => $authUID,
+			'bestaetigtam' => $now,
+			'statusgrund_id' => $statusgrund_id
 		]);
 
 		if (isError($result))

From baa7417c2205992916fb6cf88ecab8febaf699e1 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 6 Aug 2024 16:49:11 +0200
Subject: [PATCH 1086/1461] Status: Wartender

---
 .../api/frontend/v1/stv/Status.php            | 15 ++++-----
 application/libraries/PrestudentLib.php       | 31 ++-----------------
 2 files changed, 8 insertions(+), 38 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index c25ffbe6c..d6039f4ba 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -513,15 +513,12 @@ class Status extends FHCAPI_Controller
 				);
 				break;
 			case Prestudentstatus_model::STATUS_WARTENDER:
-				$this->load->library('PrestudentLib');
-				$result = $this->prestudentlib->setWartender($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
-
-				if (isError($result))
-				{
-					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-				}
-				else
-					$this->terminateWithSuccess($prestudent_id);
+				$result = $this->prestudentlib->setWartender(
+					$prestudent_id,
+					$studiensemester_kurzbz,
+					$ausbildungssemester,
+					$statusgrund_id
+				);
 				break;
 			default:
 				$this->terminateWithError("Action not yet defined in Prestudentlib", self::ERROR_TYPE_GENERAL);
diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php
index 33a2ef328..bdac3e8b7 100644
--- a/application/libraries/PrestudentLib.php
+++ b/application/libraries/PrestudentLib.php
@@ -585,36 +585,9 @@ class PrestudentLib
 		return $this->setBasic(getAuthUID(), $now, Prestudentstatus_model::STATUS_ABGEWIESENER, $prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id);
 	}
 
-	public function setWartender($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester)
+	public function setWartender($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id)
 	{
-		$resultLastStatus = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
-		if (isError($resultLastStatus))
-			return $resultLastStatus;
-		$resultLastStatus = getData($resultLastStatus);
-
-		$prestudent_status = current($resultLastStatus);
-
-		//Status updaten
-		$result = $this->_ci->PrestudentstatusModel->insert([
-			'prestudent_id' => $prestudent_id,
-			'status_kurzbz' => Prestudentstatus_model::STATUS_WARTENDER,
-			'studiensemester_kurzbz' => $studiensemester_kurzbz,
-			'ausbildungssemester' => $ausbildungssemester,
-			'datum' => date('c'),
-			'insertvon' => getAuthUID(),
-			'insertamum' => date('c'),
-			'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz,
-			'studienplan_id'=> $prestudent_status->studienplan_id,
-			'bestaetigtvon' => getAuthUID(),
-			'bestaetigtam' => date('c')
-		]);
-
-		if (isError($result))
-		{
-			return $result;
-		}
-		else
-			return success();
+		return $this->setBasic(getAuthUID(), $now, Prestudentstatus_model::STATUS_WARTENDER, $prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id);
 	}
 
 	protected function setBasic($authUID, $now, $status_kurzbz, $prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id = null)

From 9af8117749072effbb512fddd096d9939a0c530c Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 6 Aug 2024 16:53:48 +0200
Subject: [PATCH 1087/1461] add statusgrund_id

---
 .../api/frontend/v1/stv/Status.php            | 12 ++--
 application/libraries/PrestudentLib.php       | 68 ++++++++++++++++---
 2 files changed, 66 insertions(+), 14 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index d6039f4ba..b354ec41c 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -480,28 +480,32 @@ class Status extends FHCAPI_Controller
 				$result = $this->prestudentlib->setDiplomand(
 					$prestudent_id,
 					$studiensemester_kurzbz,
-					$ausbildungssemester // TODO(chris): statusgrund_id
+					$ausbildungssemester,
+					$statusgrund_id
 				);
 				break;
 			case Prestudentstatus_model::STATUS_ABSOLVENT:
 				$result = $this->prestudentlib->setAbsolvent(
 					$prestudent_id,
 					$studiensemester_kurzbz,
-					$ausbildungssemester // TODO(chris): statusgrund_id
+					$ausbildungssemester,
+					$statusgrund_id
 				);
 				break;
 			case Prestudentstatus_model::STATUS_BEWERBER:
 				$result = $this->prestudentlib->setBewerber(
 					$prestudent_id,
 					$studiensemester_kurzbz,
-					$ausbildungssemester // TODO(chris): statusgrund_id
+					$ausbildungssemester,
+					$statusgrund_id
 				);
 				break;
 			case Prestudentstatus_model::STATUS_AUFGENOMMENER:
 				$result = $this->prestudentlib->setAufgenommener(
 					$prestudent_id,
 					$studiensemester_kurzbz,
-					$ausbildungssemester // TODO(chris): statusgrund_id
+					$ausbildungssemester,
+					$statusgrund_id
 				);
 				break;
 			case Prestudentstatus_model::STATUS_ABGEWIESENER:
diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php
index bdac3e8b7..69d141f52 100644
--- a/application/libraries/PrestudentLib.php
+++ b/application/libraries/PrestudentLib.php
@@ -516,18 +516,34 @@ class PrestudentLib
 		return success();
 	}
 
-	public function setDiplomand($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester)
+	public function setDiplomand($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id)
 	{
-		return $this->setBasic(getAuthUID(), date('c'), Prestudentstatus_model::STATUS_DIPLOMAND, $prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
+		return $this->setBasic(
+			getAuthUID(),
+			date('c'),
+			Prestudentstatus_model::STATUS_DIPLOMAND,
+			$prestudent_id,
+			$studiensemester_kurzbz,
+			$ausbildungssemester,
+			$statusgrund_id
+		);
 	}
 
-	public function setAbsolvent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester)
+	public function setAbsolvent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id)
 	{
 		$authUID = getAuthUID();
 		$now = date('c');
 
 
-		$result = $this->setBasic($authUID, $now, Prestudentstatus_model::STATUS_ABSOLVENT, $prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
+		$result = $this->setBasic(
+			$authUID,
+			$now,
+			Prestudentstatus_model::STATUS_ABSOLVENT,
+			$prestudent_id,
+			$studiensemester_kurzbz,
+			$ausbildungssemester,
+			$statusgrund_id
+		);
 
 		if (isError($result))
 			return $result;
@@ -561,9 +577,17 @@ class PrestudentLib
 		return success();
 	}
 
-	public function setBewerber($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester)
+	public function setBewerber($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id)
 	{
-		$result = $this->setBasic(getAuthUID(), date('c'), Prestudentstatus_model::STATUS_BEWERBER, $prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
+		$result = $this->setBasic(
+			getAuthUID(),
+			date('c'),
+			Prestudentstatus_model::STATUS_BEWERBER,
+			$prestudent_id,
+			$studiensemester_kurzbz,
+			$ausbildungssemester,
+			$statusgrund_id
+		);
 
 		if (isError($result))
 			return $result;
@@ -575,19 +599,43 @@ class PrestudentLib
 		return success();
 	}
 
-	public function setAufgenommener($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester)
+	public function setAufgenommener($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id)
 	{
-		return $this->setBasic(getAuthUID(), $now, Prestudentstatus_model::STATUS_AUFGENOMMENER, $prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
+		return $this->setBasic(
+			getAuthUID(),
+			date('c'),
+			Prestudentstatus_model::STATUS_AUFGENOMMENER,
+			$prestudent_id,
+			$studiensemester_kurzbz,
+			$ausbildungssemester,
+			$statusgrund_id
+		);
 	}
 
 	public function setAbgewiesener($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id)
 	{
-		return $this->setBasic(getAuthUID(), $now, Prestudentstatus_model::STATUS_ABGEWIESENER, $prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id);
+		return $this->setBasic(
+			getAuthUID(),
+			date('c'),
+			Prestudentstatus_model::STATUS_ABGEWIESENER,
+			$prestudent_id,
+			$studiensemester_kurzbz,
+			$ausbildungssemester,
+			$statusgrund_id
+		);
 	}
 
 	public function setWartender($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id)
 	{
-		return $this->setBasic(getAuthUID(), $now, Prestudentstatus_model::STATUS_WARTENDER, $prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id);
+		return $this->setBasic(
+			getAuthUID(),
+			date('c'),
+			Prestudentstatus_model::STATUS_WARTENDER,
+			$prestudent_id,
+			$studiensemester_kurzbz,
+			$ausbildungssemester,
+			$statusgrund_id
+		);
 	}
 
 	protected function setBasic($authUID, $now, $status_kurzbz, $prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id = null)

From 428a56cfd0c7a6e7f9e12d926f66fc161de65046 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 7 Aug 2024 09:41:36 +0200
Subject: [PATCH 1088/1461] Cleanup MultiStatus Component & Dropdown Component

---
 .../Details/Prestudent/MultiStatus.js         | 125 ++---
 .../Details/Status/Dropdown.js                | 470 ++++--------------
 2 files changed, 141 insertions(+), 454 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index 8cab0ea1a..ac4a2dd9e 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -34,35 +34,6 @@ export default{
 			}
 			return this.modelValue.map(e => e.prestudent_id);
 		},
-		updateData() {
-			const dataArray = [];
-			if (this.modelValue.prestudent_id) {
-				const newObj = {
-					prestudent_id : this.modelValue.prestudent_id,
-					studiensemester_kurzbz : this.defaultSemester,
-					ausbildungssemester : this.modelValue.semester,
-					orgform_kurzbz: this.modelValue.orgform_kurzbz,
-					name: `${this.modelValue.vorname} ${this.modelValue.nachname}`
-				};
-				dataArray.push(newObj);
-				return dataArray;
-			}
-			else
-			{
-				for (const item of this.modelValue) {
-					const newObj = {
-						prestudent_id: item.prestudent_id,
-						ausbildungssemester: item.semester,
-						studiensemester_kurzbz: this.defaultSemester,
-						orgform_kurzbz: item.orgform_kurzbz,
-						name: `${item.vorname} ${item.nachname}`
-					};
-					dataArray.push(newObj);
-				}
-
-				return dataArray;
-			}
-		},
 		showToolbarStudent() {
 			if (Array.isArray(this.modelValue)) {
 				if (!this.modelValue.length)
@@ -71,9 +42,6 @@ export default{
 			}
 			return !!this.modelValue.uid;
 		},
-		showToolbar() {
-			return this.showToolbarStudent || this.showToolbarInteressent;
-		},
 		showToolbarInteressent() {
 			if (Array.isArray(this.modelValue)) {
 				if (!this.modelValue.length)
@@ -341,55 +309,54 @@ export default{
 			.catch(this.$fhcAlert.handleSystemError);
 	},
 	template: `
-		<div class="stv-multistatus h-100 pt-3">
+	<div class="stv-multistatus h-100 pt-3">
+		
+		<status-modal
+			ref="test"
+			:meldestichtag="new Date(dataMeldestichtag)"
+			:max-sem="maxSem"
+			@saved="reload"
+			>
+		</status-modal>
 			
-			<status-modal ref="test" :meldestichtag="new Date(dataMeldestichtag)" :max-sem="maxSem" @saved="reload"></status-modal>
-				
-			<core-filter-cmpt
-				v-if="!this.modelValue.length"
-				ref="table"
-				:tabulator-options="tabulatorOptions"
-				:tabulator-events="tabulatorEvents"
-				table-only
-				:side-menu="false"
-				reload
-				new-btn-show
-				new-btn-label="Status"
-				@click:new="actionNewStatus"
-				>
-				
-				<template #actions="{updateData2}">
-					<!-- SingleSelectButton-->
-					<status-dropdown 
-						ref="statusDropdown"
-						:showToolbar="showToolbar"
-						:showToolbarStudent="showToolbarStudent"
-						:showToolbarInteressent="showToolbarInteressent"
-						:prestudentIds="prestudentIds"
-						:updateData="updateData"
-						@reload-table="reload"
-					>		
-					</status-dropdown>		
-				</template>	
+		<core-filter-cmpt
+			v-if="!this.modelValue.length"
+			ref="table"
+			:tabulator-options="tabulatorOptions"
+			:tabulator-events="tabulatorEvents"
+			table-only
+			:side-menu="false"
+			reload
+			new-btn-show
+			new-btn-label="Status"
+			@click:new="actionNewStatus"
+			>
+			
+			<template #actions="{updateData2}">
+				<!-- SingleSelectButton-->
+				<status-dropdown 
+					ref="statusDropdown"
+					:show-toolbar-student="showToolbarStudent"
+					:show-toolbar-interessent="showToolbarInteressent"
+					:prestudent-ids="prestudentIds"
+					@reload-table="reload"
+				>		
+				</status-dropdown>
+			</template>	
 
-			</core-filter-cmpt>
+		</core-filter-cmpt>
+
+		<div v-else>
+			<!--MultiSelectButton-->
+			<status-dropdown 
+				ref="statusDropdown"
+				:show-toolbar-student="showToolbarStudent"
+				:show-toolbar-interessent="showToolbarInteressent"
+				:prestudent-ids="prestudentIds"
+				@reload-table="reload"
+				>		
+			</status-dropdown>
+	 	</div>
 
-			<div 
-				v-if="this.modelValue.length"
-				ref="buttonsStatusMulti"
-			>	
-					<!--MultiSelectButton-->
-					<status-dropdown 
-						ref="statusDropdown"
-						:showToolbar="showToolbar"
-						:showToolbarStudent="showToolbarStudent"
-						:showToolbarInteressent="showToolbarInteressent"
-						:prestudentIds="prestudentIds"
-						:updateData="updateData"
-						@reload-table="reload"
-					>		
-					</status-dropdown>	
-				
-	 	</div>	
 	</div>`
 };
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js b/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js
index 8cef52f3c..7edceb538 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js
@@ -14,11 +14,10 @@ export default {
 			required: true
 		}
 	},
+	emits: [
+		'reloadTable'
+	],
 	props: {
-		showToolbar: {
-			type: Boolean,
-			required: true
-		},
 		showToolbarStudent: {
 			type: Boolean,
 			required: true
@@ -31,11 +30,6 @@ export default {
 			type: Array,
 			required: true,
 			default: () => []
-		},
-		updateData: {
-			type: Array,
-			required: true,
-			default: () => []
 		}
 	},
 	data() {
@@ -43,18 +37,12 @@ export default {
 			listDataToolbar: [],
 			//TODO(Manu) get from config
 			statiInteressent: ["Bewerber", "Aufgenommener", "Student" , "Wartender", "Abgewiesener"],
-			statiStudent: ["Abbrecher", "Unterbrecher", "Student" , "Diplomand", "Absolvent"],
-			actionButton: {},
-			actionStatusText: {},
-			actionSem: null
+			statiStudent: ["Abbrecher", "Unterbrecher", "Student" , "Diplomand", "Absolvent"]
 		};
 	},
 	computed: {
-		toolbarInteressent() {
-			return this.listDataToolbar.filter(item => this.statiInteressent.includes(item.status_kurzbz));
-		},
-		toolbarStudent() {
-			return this.listDataToolbar.filter(item => this.statiStudent.includes(item.status_kurzbz));
+		showToolbar() {
+			return this.showToolbarStudent || this.showToolbarInteressent;
 		},
 		sortedGruende() {
 			return this.listDataToolbar.reduce((result,current) => {
@@ -142,321 +130,119 @@ export default {
 				}
 			});
 			return result;
-		},
-		gruende() {
-			return this.listStatusgruende.filter(grund => grund.status_kurzbz == this.formData.status_kurzbz);
 		}
 	},
 	methods: {
-		actionConfirmDialogue(data, statusgrund, statusText) {
-			this.actionButton = statusgrund;
-			this.actionStatusText = statusText;
-			this.$refs.confirmStatusAction.show();
+		changeInteressentToStudent(statusgrund_id) {
+			this.addStudent({status_kurzbz: 'student', statusgrund_id});
 		},
 		addStudent() {
-			this.resetChangeModals();
-			let changeData = {};
-
-			//for Feedback Sucess, Error
-			let countSuccess = 0;
-			let countError = 0;
-
-			const promises = this.newArray.map(changeData => {
-
-				return this.$fhcApi.post('api/frontend/v1/stv/status/addStudent/' + changeData.prestudent_id,
-					changeData
-				).then(response => {
-					countSuccess++;
-					return response;
-				})
-				.catch(error => {
-					countError++;
-					//For each Prestudent show Error in Alert
-					this.$fhcAlert.handleSystemError(error);
-				});
-			});
-
 			Promise
-				.allSettled(promises)
-				.then(values => {
-
-					this.newStatus = 'Student';
-
-					//Feedback Success als infoalert
-					this.$fhcAlert.alertInfo(this.$p.t('ui', 'successNewStatus', {
-						'countSuccess': countSuccess,
-						'status': this.newStatus,
-						'countError': countError
-					}));
-
-					if (this.prestudentIds.length == 1) {
-						this.reload();
-					}
-					this.$reloadList();
-					this.resetModal();
-				});
+				.allSettled(
+					this.prestudentIds.map(prestudent_id => this.$fhcApi.post(
+						'api/frontend/v1/stv/status/addStudent/' + prestudent_id,
+						data
+					))
+				)
+				.then(this.showFeedback);
 		},
 		changeStatusToAbbrecher(statusgrund_id) {
-			const data = this.prestudentIds.map(prestudent_id => ({
-				prestudent_id,
-				status_kurzbz: 'Abbrecher',
-				statusgrund_id
-			}));
-			BsConfirm
-				.popup(this.$p.t('lehre', data.length > 1 ? 'modal_StatusactionPlural' : 'modal_StatusactionSingle', {
-					count: data.length,
-					status: 'Abbrecher'
-				}))
-				.then(() => this.changeStatusNeu('Abbrecher', data))
+			this
+				.confirmStatusChange('Abbrecher', statusgrund_id)
+				.then(this.changeStatus)
 				.catch(this.$fhcAlert.handleSystemError);
 		},
-		changeStatusToUnterbrecher() {
-			this.resetChangeModals();
-			let def_date = this.getDefaultDate();
-			let deltaData =
-				{
-					status_kurzbz: 'Unterbrecher',
-					datum: def_date,
-					bestaetigtam: def_date
-				};
-
-			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData }));
-			this.actionConfirmDialogue(this.updateData, 'studenten', 'Unterbrecher');
+		changeStatusToUnterbrecher(statusgrund_id) {
+			this
+				.confirmStatusChange('Unterbrecher', statusgrund_id)
+				.then(this.changeStatus)
+				.catch(this.$fhcAlert.handleSystemError);
 		},
 		changeStatusToStudent(statusgrund_id) {
-			const data = this.prestudentIds.map(prestudent_id => ({
-				prestudent_id,
-				status_kurzbz: 'Student',
-				statusgrund_id
-			}));
-			BsPrompt
-				.popup(this.$p.t('lehre', data.length > 1 ? 'modal_askAusbildungssemPlural' : 'modal_askAusbildungssem', {
-					count: data.length,
-					status: 'Student'
-				}))
-				.then(ausbildungssemester => this.changeStatusNeu('Student', data.map(item => {
-					item.ausbildungssemester = ausbildungssemester;
-					return item;
-				})))
+			this
+				.promtAusbildungssemester('Student')
+				.then(this.changeStatus)
 				.catch(this.$fhcAlert.handleSystemError);
 		},
-		changeStatusToDiplomand() {
-			let def_date = this.getDefaultDate();
-			let deltaData =
-				{
-					status_kurzbz: 'Diplomand',
-					datum: def_date,
-					bestaetigtam: def_date,
-				};
-
-			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData}));
-			this.changeStatus(this.prestudentIds);
+		changeStatusToDiplomand(statusgrund_id) {
+			this.changeStatus({status_kurzbz: 'Diplomand', statusgrund_id});
 		},
-		changeStatusToAbsolvent() {
-			let def_date = this.getDefaultDate();
-			let deltaData =
-				{
-					status_kurzbz: 'Absolvent',
-					datum: def_date,
-					bestaetigtam: def_date,
-				};
-
-			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData}));
-			this.changeStatus(this.prestudentIds);
+		changeStatusToAbsolvent(statusgrund_id) {
+			this.changeStatus({status_kurzbz'Absolvent', statusgrund_id});
 		},
-		changeStatusToBewerber() {
-			this.resetChangeModals();
-			let def_date = this.getDefaultDate();
-			let deltaData =
-				{
-					status_kurzbz: 'Bewerber',
-					datum: def_date,
-					bestaetigtam: def_date,
-					ausbildungssemester: 1
-				};
-
-			this.newArray = this.updateData.map(objekt => ({
-				...objekt,
-				...deltaData}));
-			this.changeStatus(this.prestudentIds);
+		changeStatusToBewerber(statusgrund_id) {
+			this.changeStatus({status_kurzbz: 'Bewerber', statusgrund_id});
 		},
-		changeStatusToAufgenommener() {
-			this.resetChangeModals();
-			let def_date = this.getDefaultDate();
-			let deltaData =
-				{
-					status_kurzbz: 'Aufgenommener',
-					datum: def_date,
-					bestaetigtam: def_date
-				};
-
-			this.newArray = this.updateData.map(objekt => ({
-				...objekt,
-				...deltaData,
-			}));
-
-			this.actionConfirmDialogue(this.updateData, 'aufgenommener', 'Aufgenommener');
-		},
-		changeInteressentToStudent(statusgrund_id) {
-			this.resetChangeModals();
-			let def_date = this.getDefaultDate();
-			let deltaData =
-				{
-					status_kurzbz: 'Student',
-					datum: def_date,
-					bestaetigtam: def_date,
-					statusgrund_id: statusgrund_id
-				};
-
-			this.newArray = this.updateData.map(objekt => ({
-				...objekt,
-				...deltaData,
-			}));
-
-			this.addStudent(this.prestudentIds);
+		changeStatusToAufgenommener(statusgrund_id) {
+			this
+				.confirmStatusChange('Aufgenommener', statusgrund_id)
+				.then(this.changeStatus)
+				.catch(this.$fhcAlert.handleSystemError);
 		},
 		changeStatusToAbgewiesener(statusgrund_id) {
-			this.resetChangeModals();
-			let def_date = this.getDefaultDate();
-			let deltaData =
-				{
-					status_kurzbz: 'Abgewiesener',
-					datum: def_date,
-					bestaetigtam: def_date,
-					statusgrund_id: statusgrund_id
-				};
-
-			this.newArray = this.updateData.map(objekt => ({
-				...objekt,
-				...deltaData,
-			}));
-
-			this.actionConfirmDialogue(this.updateData, 'abgewiesener', 'Abgewiesener');
+			this
+				.confirmStatusChange('Abgewiesener', statusgrund_id)
+				.then(this.changeStatus)
+				.catch(this.$fhcAlert.handleSystemError);
 		},
-		changeStatusToWartender() {
-			this.resetChangeModals();
-			let def_date = this.getDefaultDate();
-			let deltaData =
-				{
-					status_kurzbz: 'Wartender',
-					datum: def_date,
-					bestaetigtam: def_date
-				};
-			this.newArray = this.updateData.map(objekt => ({
-				...objekt,
-				...deltaData,
-			}));
-
-			this.actionConfirmDialogue(this.updateData, 'wartender', 'Wartender');
+		changeStatusToWartender(statusgrund_id) {
+			this
+				.confirmStatusChange('Wartender', statusgrund_id)
+				.then(this.changeStatus)
+				.catch(this.$fhcAlert.handleSystemError);
 		},
-		changeStatusNeu(status_kurzbz, data) {
+		confirmStatusChange(status, statusgrund_id) {
+			const count = this.prestudentIds.length;
+			return BsConfirm
+				.popup(this.$p.t(
+					'lehre',
+					count > 1 ? 'modal_StatusactionPlural' : 'modal_StatusactionSingle',
+					{ count, status }
+				))
+				.then(() => ({
+					status_kurzbz: status,
+					statusgrund_id
+				}));
+		},
+		promtAusbildungssemester(status, statusgrund_id) {
+			const count = this.prestudentIds.length;
+			return BsPrompt
+				.popup(this.$p.t(
+					'lehre',
+					count > 1 ? 'modal_askAusbildungssemPlural' : 'modal_askAusbildungssem',
+					{ count, status }
+				))
+				.then(ausbildungssemester => ({
+					status_kurzbz: status,
+					ausbildungssemester,
+					statusgrund_id
+				}));
+		},
+		changeStatus(data) {
 			Promise
-				.allSettled(data.map(item => this.$fhcApi.post('api/frontend/v1/stv/status/changeStatus/' + item.prestudent_id, item)))
-				.then(results => {
-					let successes = results.filter(result => result.status == "fulfilled").length,
-						errors = results.length - successes;
-					
-					//Feedback Success als infoalert
-					this.$fhcAlert.alertInfo(this.$p.t('ui', 'successNewStatus', {
-						'countSuccess': successes,
-						'status': status_kurzbz,
-						'countError': errors
-					}));
-
-					if(results.length == 1 && successes > 0){
-						this.reload();
-					}
-					this.$reloadList();
-				});
+				.allSettled(
+					this.prestudentIds.map(prestudent_id => this.$fhcApi.post(
+						'api/frontend/v1/stv/status/changeStatus/' + prestudent_id,
+						data
+					))
+				)
+				.then(this.showFeedback);
 		},
-		changeStatus() {
-			this.resetChangeModals();
-			let changeData = {};
+		showFeedback(results) {
+			const countSuccess = results.filter(result => result.status == "fulfilled").length;
+			const countError = results.length - successes;
+			
+			//Feedback Success als infoalert
+			this.$fhcAlert.alertInfo(this.$p.t('ui', 'successNewStatus', {
+				countSuccess,
+				status: data.status_kurzbz,
+				countError
+			}));
 
-			//for Feedback Sucess, Error
-			let countSuccess = 0;
-			let countError = 0;
-
-			// Check if ausbildungssemester is already in this.newArray
-			const existingEntry = this.newArray.find(
-				(entry) => entry.ausbildungssemester
-			);
-
-			// If the entry doesn't exist, add a new object with ausbildungssemester
-			if (!existingEntry) {
-				this.newArray.push({ ausbildungssemester: this.actionSem });
+			if(results.length == 1 && countSuccess > 0){
+				this.$emit('reloadTable');
 			}
-
-			const promises = this.newArray.map(changeData => {
-
-				return this.$fhcApi.post('api/frontend/v1/stv/status/changeStatus/' + changeData.prestudent_id,
-					changeData
-				).then(response => {
-					countSuccess++;
-					return response;
-				})
-					//.catch(this.$fhcAlert.handleSystemError)
-					.catch(error => {
-						countError++;
-						//For each Prestudent show Error in Alert
-						this.$fhcAlert.handleSystemError(error);
-					});
-			});
-
-			Promise
-				.allSettled(promises)
-				.then(values => {
-					if(this.newArray.length > 0) {
-						this.newStatus = this.newArray[0].status_kurzbz;
-					}
-					else {
-						this.newStatus = this.statusData.status_kurzbz;
-					}
-
-					//Feedback Success als infoalert
-					this.$fhcAlert.alertInfo(this.$p.t('ui', 'successNewStatus', {
-						'countSuccess': countSuccess,
-						'status': this.newStatus,
-						'countError': countError
-					}));
-
-					if(this.prestudentIds.length == 1 && countSuccess > 0){
-						this.reload();
-						//necessary to see new status in List
-					}
-					this.$reloadList();
-					//to change ToolbarInteressent to ToolbarStudent
-					this.resetModal();
-				});
-		},
-		getDefaultDate() {
-			const today = new Date();
-			return today;
-		},
-		hideModal(modalRef) {
-			this.$refs[modalRef].hide();
-			this.statusNew = true;
-		},
-		reload() {
-			this.$emit('reload-table');
-		},
-		reloadList() {
-			this.$emit('reload-list');
-		},
-		resetChangeModals() {
-			this.hideModal('confirmStatusAction');
-			this.hideModal('askForAusbildungssemester');
-		},
-		resetModal() {
-			this.statusData = {};
-			this.statusId = {};
-			this.actionButton = {};
-			this.actionStatusText = {};
-			this.actionSem = null;
-		},
-		saveNewAusbildungssemester() {
-			this.newArray = this.newArray.map(objekt => ({ ...objekt, ausbildungssemester: this.actionSem}));
-			this.changeStatus(this.prestudentIds);
+			this.$reloadList();
 		}
 	},
 	created() {
@@ -467,76 +253,10 @@ export default {
 				this.listDataToolbar = result;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
-		//TODO(manu) check if necessary
-		this.$fhcApi
-			.get('api/frontend/v1/stv/status/getStatusgruende/')
-			.then(result => result.data)
-			.then(result => {
-				this.listStatusgruende = result;
-			})
-			.catch(this.$fhcAlert.handleSystemError);
 	},
 	template: `
 	<div class="stv-status-dropdown">
 		
-		<!--Modal: ConfirmStatusAction-->
-		<BsModal ref="confirmStatusAction">
-			<template #title>{{$p.t('lehre', 'status_edit')}}</template>
-			<template #default>
-				<div v-if="prestudentIds.length == 1">
-					<p>{{$p.t('lehre', 'modal_StatusactionSingle', { status: actionStatusText })}}</p>
-				</div>
-				<div v-else>
-					<p>{{$p.t('lehre', 'modal_StatusactionPlural', { count: prestudentIds.length,
-				status: actionStatusText
-					})}}</p>
-				</div>
-				
-			</template>
-			<template #footer>	
-				<!--Action changeStatus-->
-				<div>
-					<button  ref="Close" type="button" class="btn btn-primary" @click="changeStatus(prestudentIds)">OK</button>
-				</div>				
-			</template>
-		</BsModal>
-							
-		<!--Modal: askForAusbildungssemester-->
-		<BsModal ref="askForAusbildungssemester">
-			<template #title>{{$p.t('lehre', 'status_edit')}}</template>
-			<template #default>
-			<div v-if="prestudentIds.length == 1">
-				<p>
-				{{$p.t('lehre', 'modal_askAusbildungssem', { status: actionStatusText })}}</p>
-			</div>
-			<div v-else>
-				<p>
-				{{$p.t('lehre', 'modal_askAusbildungssemPlural', { count: prestudentIds.length,
-				status: actionStatusText
-					})}}</p>
-			</div>
-			
-			<div class="row mb-3">
-				<label for="studiensemester" class="form-label col-sm-4">{{$p.t('lehre', 'studiensemester')}}</label>
-				<div class="col-sm-6">
-					<form-input
-						type="text"
-						name="studiensemester"
-						v-model="actionSem"
-						maxlength="2"
-					>				
-					</form-input>
-				</div>
-			</div>			
-			</template>
-			<template #footer>
-				<div>
-					<button  ref="Close" type="button" class="btn btn-primary" @click="saveNewAusbildungssemester()">OK</button>
-				</div>					
-			</template>
-		</BsModal>
-	
-		<!-- Dropdown -->
 		<div v-if="showToolbar"  class="btn-group">						
 			<button ref="toolbarButton" type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" data-bs-auto-close="outside" aria-expanded="false">
 				{{$p.t('lehre', 'btn_statusAendern')}}
@@ -610,5 +330,5 @@ export default {
 
 			</ul>
 		</div>
-	</div> `
+	</div>`
 };
\ No newline at end of file

From 911eb66c4af7b61c6d43a1bbecd65bf86f77482f Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 7 Aug 2024 09:44:28 +0200
Subject: [PATCH 1089/1461] Missing :

---
 .../Stv/Studentenverwaltung/Details/Status/Dropdown.js          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js b/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js
index 7edceb538..ba30ae5dc 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js
@@ -168,7 +168,7 @@ export default {
 			this.changeStatus({status_kurzbz: 'Diplomand', statusgrund_id});
 		},
 		changeStatusToAbsolvent(statusgrund_id) {
-			this.changeStatus({status_kurzbz'Absolvent', statusgrund_id});
+			this.changeStatus({status_kurzbz: 'Absolvent', statusgrund_id});
 		},
 		changeStatusToBewerber(statusgrund_id) {
 			this.changeStatus({status_kurzbz: 'Bewerber', statusgrund_id});

From 47a4b63172c6009c3f9923b972a349c56bf9ef2a Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 7 Aug 2024 09:53:37 +0200
Subject: [PATCH 1090/1461] changes the zustellungs warning for the Profil
 Adressen/Kontakte

---
 .../components/Cis/Profil/ProfilModal/EditProfil.js |  3 ---
 .../ProfilModal/EditProfilComponents/EditAdresse.js | 11 ++++++-----
 .../ProfilModal/EditProfilComponents/EditKontakt.js | 10 +++++++---
 system/phrasesupdate.php                            | 13 +++++++------
 4 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfil.js b/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
index 1b54fe7f6..ec14a9486 100755
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
@@ -56,9 +56,6 @@ export default {
 
     async submitProfilChange() {
 
-      //todo delete this debugging line
-      console.log("this is a test")
-
       //? check if data is valid before making a request
       if (this.topic && this.profilUpdate) {
         //? if profil update contains any attachment
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js
index c3f194958..c38f6fd31 100755
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js
@@ -34,10 +34,6 @@ export default {
   },
 
   methods: {
-    test: function () {
-      console.log(this.gemeinden, "this are the gemeinden");
-      console.log(this.ortschaftnamen, "this are the ortschaftsnamen");
-    },
 
     autocompleteSearchGemeinden: function (event) {
       this.gemeinden = this.gemeinden.map((gemeinde) => gemeinde);
@@ -97,6 +93,11 @@ export default {
 
   computed: {
     showZustellAdressenWarning: function () {
+
+	  // if the address was already a zustellungsadresse when editing the address, then the warning will not be shown and the zustellungsadresse will just be overwritten
+	  if (JSON.parse(this.originalValue).zustelladresse){
+		return false;
+	  }
       // if zustellAdressenCount is not 0 and the own kontakt has the flag zustellung set to true
       if (!this.zustellAdressenCount.includes(this.data.adresse_id)) {
         return this.data.zustelladresse && this.zustellAdressenCount.length;
@@ -135,7 +136,7 @@ export default {
   <div v-if="showZustellAdressenWarning" class="col-12 ">
     <div class="card bg-danger mx-2">
       <div class="card-body text-white ">
-        <span>{{$p.t('profilUpdate','zustelladresseWarning')}}</span>
+	  <span>{{$p.t('profilUpdate','zustell_adressen_warning')}}</span>
       </div>
     </div>
   </div>
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditKontakt.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditKontakt.js
index 03bd8dcd7..ee1cc938c 100755
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditKontakt.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditKontakt.js
@@ -27,6 +27,10 @@ export default {
 
   computed: {
     showZustellKontakteWarning: function () {
+	  // if the kontakt is already a zustellungskontakt when the user is editing the kontakt, then no warning is shown and the zustellung will be overwritten
+	  if (JSON.parse(this.originalValue).zustellung) {
+	    return false;
+	  } 
       // if zustellKontakteCount is not 0 and the own kontakt has the flag zustellung set to true
       if (!this.zustellKontakteCount.includes(this.data.kontakt_id)) {
         return this.data.zustellung && this.zustellKontakteCount.length;
@@ -50,14 +54,14 @@ export default {
   template:
     /*html*/
     `
-    
-    <div class="gy-3 row align-items-center justify-content-center">    
+
+    <div class="gy-3 row align-items-center justify-content-center">
 
     <!-- warning message for too many zustellungs Kontakte -->
     <div v-if="showZustellKontakteWarning" class="col-12 ">
     <div class="card bg-danger mx-2">
     <div class="card-body text-white ">
-    <span>{{$p.t('profilUpdate','zustellkontakteWarning')}}</span>
+    <span>{{$p.t('profilUpdate','zustell_kontakte_warning')}}</span>
     </div>
     </div>
     </div>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 49a3a0bdc..23281cb96 100755
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -25868,18 +25868,18 @@ array(
 		array(
 			'app' => 'core',
 			'category' => 'profilUpdate',
-			'phrase' => 'zustelladresseWarning',
+			'phrase' => 'zustell_adressen_warning',
 			'insertvon' => 'system',
 			'phrases' => array(
 				array(
 					'sprache' => 'German',
-					'text' => '!Achtung: Eine Ihrer Adressen ist bereits als Zustelladresse gespeichert, sind sie sicher, dass sie die aktuelle Adresse stattdessen als Zustelladresse speichern wollen?',
+					'text' => 'Einer ihrer Adressen wird bereits zur Zustellung verwendet, möchten sie diese Adressen als Zustellungsadresse übernehmen?',
 					'description' => '',
 					'insertvon' => 'system'
 				),
 				array(
 					'sprache' => 'English',
-					'text' => '!Attention: One of your addresses is already saved as a delivery address, are you sure you want to save the current address as a delivery address instead?',
+					'text' => 'One of your addresses is already used as a contact address, would you like to use this address as your new contact address?',
 					'description' => '',
 					'insertvon' => 'system'
 				)
@@ -25888,23 +25888,24 @@ array(
 		array(
 			'app' => 'core',
 			'category' => 'profilUpdate',
-			'phrase' => 'zustellkontakteWarning',
+			'phrase' => 'zustell_kontakte_warning',
 			'insertvon' => 'system',
 			'phrases' => array(
 				array(
 					'sprache' => 'German',
-					'text' => '!Achtung: Eine deiner Kontakte ist bereits als Zustellungskontakt gespeichert, sind sie sicher, dass sie den aktuellen Kontakt stattdessen als Zustellkontakt speichern wollen?',
+					'text' => 'Einer ihrer Kontakte wird bereits zur Zustellung verwendet, möchten sie diesen Kontakt als Zustellungskontakt übernehmen?',
 					'description' => '',
 					'insertvon' => 'system'
 				),
 				array(
 					'sprache' => 'English',
-					'text' => '!Attention: One of your contacts is already saved as a delivery contact, are you sure you want to save the current contact as a delivery contact instead?',
+					'text' => 'One of your contacts is already used as a communication mean, would you like to use this contact as your new communication mean?',
 					'description' => '',
 					'insertvon' => 'system'
 				)
 			)
 		),
+		
 		array(
 			'app' => 'core',
 			'category' => 'profilUpdate',

From 4b7e445a2522ae0fa4e108dc77719464c724ef74 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 7 Aug 2024 09:53:40 +0200
Subject: [PATCH 1091/1461] Bugfixes: Eventobject as parameter

---
 .../Studentenverwaltung/Details/Status/Dropdown.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js b/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js
index ba30ae5dc..4a62eb49b 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js
@@ -58,12 +58,12 @@ export default {
 				const defaultObject = {
 					status_kurzbz: status,
 					statusgrund_id: null,
-					link: this['changeStatusTo' + status],
+					link: () => this['changeStatusTo' + status](),
 					children: []
 				};
 
 				if (status === "Student") {
-					defaultObject.link = 'changeInteressentToStudent';
+					defaultObject.link = () => this.changeInteressentToStudent();
 
 				}
 				result.push(defaultObject);
@@ -89,7 +89,7 @@ export default {
 							status_kurzbz: 'Student',
 							statusgrund_id: null,
 							beschreibung: 'Student',
-							link: this.changeInteressentToStudent
+							link: () => this.changeInteressentToStudent()
 						});
 					}
 				}
@@ -102,7 +102,7 @@ export default {
 				const defaultObject = {
 					status_kurzbz: status,
 					statusgrund_id: null,
-					link: this['changeStatusTo' + status],
+					link: () => this['changeStatusTo' + status](),
 					children: []
 				};
 				result.push(defaultObject);
@@ -125,7 +125,7 @@ export default {
 						status_kurzbz: 'Student',
 						statusgrund_id: null,
 						beschreibung: 'Student',
-						link: this.changeStatusToStudent
+						link: () => this.changeStatusToStudent()
 					});
 				}
 			});
@@ -136,7 +136,7 @@ export default {
 		changeInteressentToStudent(statusgrund_id) {
 			this.addStudent({status_kurzbz: 'student', statusgrund_id});
 		},
-		addStudent() {
+		addStudent(data) {
 			Promise
 				.allSettled(
 					this.prestudentIds.map(prestudent_id => this.$fhcApi.post(
@@ -160,7 +160,7 @@ export default {
 		},
 		changeStatusToStudent(statusgrund_id) {
 			this
-				.promtAusbildungssemester('Student')
+				.promtAusbildungssemester('Student', statusgrund_id)
 				.then(this.changeStatus)
 				.catch(this.$fhcAlert.handleSystemError);
 		},

From e89677c36df4ace97198af6481572eff77540b29 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 7 Aug 2024 11:08:39 +0200
Subject: [PATCH 1092/1461] Comments

---
 application/controllers/api/frontend/v1/stv/Status.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index b354ec41c..24e1dd5ae 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -170,6 +170,13 @@ class Status extends FHCAPI_Controller
 		$this->terminateWithSuccess($data);
 	}
 
+	/**
+	 * Changes the status of a prestudent with full additional logic.
+	 *
+	 * @param integer				$prestudent_id
+	 *
+	 * @return stdClass
+	 */
 	public function changeStatus($prestudent_id)
 	{
 		$isBerechtigtNoStudstatusCheck = $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung');
@@ -427,7 +434,7 @@ class Status extends FHCAPI_Controller
 				);
 
 				return $this->getDataOrTerminateWithError($result);
-			}] // TODO(chris): history_student?
+			}]
 		], [
 			'meldestichtag_not_exceeded' => $this->p->t('lehre', 'error_dataVorMeldestichtag'),
 			'rolle_doesnt_exist' => $this->p->t('lehre', 'error_rolleBereitsVorhandenMitNamen', ['name' => $studentName]),

From ceb8eb967171de00aa4544ee1962fa62b8d4d0e0 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 7 Aug 2024 11:52:50 +0200
Subject: [PATCH 1093/1461] corrects the way how to active ampeln check whether
 an ampel was bestaetigt or not and adds the Ampel_Benutzer_Bestaetigt_model

---
 .../controllers/api/frontend/v1/Ampeln.php    |   8 +-
 application/core/DB_Model.php                 |   2 -
 .../Ampel_Benutzer_Bestaetigt_model.php       |  14 +
 application/models/content/Ampel_model.php    |  26 +-
 public/js/components/DashboardWidget/Ampel.js | 385 +++++++++---------
 5 files changed, 213 insertions(+), 222 deletions(-)
 create mode 100644 application/models/content/Ampel_Benutzer_Bestaetigt_model.php

diff --git a/application/controllers/api/frontend/v1/Ampeln.php b/application/controllers/api/frontend/v1/Ampeln.php
index 037996009..6bba658b7 100644
--- a/application/controllers/api/frontend/v1/Ampeln.php
+++ b/application/controllers/api/frontend/v1/Ampeln.php
@@ -56,7 +56,9 @@ class Ampeln extends FHCAPI_Controller
         $this->form_validation->set_rules('ampel_id', 'Ampel ID', 'required|integer');
         if($this->form_validation->run() == FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
 
-        $insert_into_result = $this->AmpelModel->confirmAmpel($ampel_id,$this->uid);
+		// load Ampel_benutzer_bestaetigt_model to confirm the ampel
+		$this->load->model('content/Ampel_Benutzer_Bestaetigt_model', 'AmpelBenutzerBestaetigtModel');
+        $insert_into_result = $this->AmpelBenutzerBestaetigtModel->insert(["ampel_id"=> $ampel_id, "uid"=> $this->uid]);
 
         $insert_into_result = $this->getDataOrTerminateWithError($insert_into_result);
 
@@ -78,8 +80,8 @@ class Ampeln extends FHCAPI_Controller
         $activeAmpeln = $this->getDataOrTerminateWithError($activeAmpeln);
 
 		foreach($activeAmpeln as $ampel){
-            
-            // only include non confirmed active ampeln in the result
+			
+			// only include non confirmed active ampeln in the result
             if(!$ampel->bestaetigt){
                 
                 // check if the user was assigned to the ampel
diff --git a/application/core/DB_Model.php b/application/core/DB_Model.php
index 86f8f57b2..901587893 100755
--- a/application/core/DB_Model.php
+++ b/application/core/DB_Model.php
@@ -94,8 +94,6 @@ class DB_Model extends CI_Model
 		$this->load->library('UDFLib');
 		// Loads the logs library
 		$this->load->library('LogLib');
-
-		
 	}
 
 	// ------------------------------------------------------------------------------------------
diff --git a/application/models/content/Ampel_Benutzer_Bestaetigt_model.php b/application/models/content/Ampel_Benutzer_Bestaetigt_model.php
new file mode 100644
index 000000000..72373c2d8
--- /dev/null
+++ b/application/models/content/Ampel_Benutzer_Bestaetigt_model.php
@@ -0,0 +1,14 @@
+<?php
+class Ampel_Benutzer_Bestaetigt_model extends DB_Model
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_ampel_benutzer_bestaetigt';
+		$this->pk = 'ampel_benutzer_bestaetigt_id';
+	}
+
+}
diff --git a/application/models/content/Ampel_model.php b/application/models/content/Ampel_model.php
index 9a8b211b8..f5404ecb2 100755
--- a/application/models/content/Ampel_model.php
+++ b/application/models/content/Ampel_model.php
@@ -23,12 +23,12 @@ class Ampel_model extends DB_Model
 		$userLanguage = getUserLanguage();
 
 		$bestaetigt = '';
-		if($uid != null){
+		if($uid != null ){
 			$bestaetigt = ',
 				COALESCE((
 				SELECT true
 			  	FROM public.tbl_ampel_benutzer_bestaetigt a
-			 	WHERE a.ampel_id = ampel_id
+			 	WHERE a.ampel_id = ' . $this->dbTable . '.ampel_id
 			   	AND uid = ' . $this->escape($uid) . ' LIMIT 1), false) as bestaetigt';
 		}
 
@@ -111,28 +111,6 @@ class Ampel_model extends DB_Model
 			return $result; //will contain the error-msg from execQuery
 	}
 
-
-	/**
-	 * confirms Ampel by the user.
-	 * @param int $ampel_id Ampel-ID
-	 * @param string $uid UID
-	 * @return stdClass insert into result
-	 */
-	public function confirmAmpel($ampel_id, $uid)
-	{
-		$this->load->library('form_validation');
-		$this->form_validation->set_data(['ampel_id' => $ampel_id, 'uid' => $uid]);
-		$this->form_validation->set_rules('ampel_id', 'Ampel ID', 'required|integer');
-		$this->form_validation->set_rules('uid', 'UID', 'required');
-
-		if ($this->form_validation->run() == FALSE)
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		return $this->execQuery('
-        INSERT INTO public.tbl_ampel_benutzer_bestaetigt (ampel_id, uid)
-        VALUES (?,?);', array($ampel_id, $uid));
-	}
-
 	/**
 	 * checks if a user is assigned to an ampel
 	 * @param string $uid userID
diff --git a/public/js/components/DashboardWidget/Ampel.js b/public/js/components/DashboardWidget/Ampel.js
index 7257d70c1..a3a36eb94 100755
--- a/public/js/components/DashboardWidget/Ampel.js
+++ b/public/js/components/DashboardWidget/Ampel.js
@@ -2,209 +2,208 @@ import AbstractWidget from './Abstract';
 import BaseOffcanvas from '../Base/Offcanvas';
 
 export default {
-    name: 'WidgetsAmpel',
-    components: { BaseOffcanvas },
-    data: () => ({
-        WIDGET_AMPEL_MAX: 4,
-        filter: '',
-        source: '',
-        allAmpeln:null,
-        activeAmpeln:null,
-    }),
-    mixins: [
-        AbstractWidget
-    ],
-    computed: {
-        
-        ampelnComputed(){
-            
-            switch(this.source)
-            {
-                case 'offen': return this.applyFilter(this.activeAmpeln);
-                case 'alle': return this.applyFilter(this.allAmpeln);
-                default: return this.applyFilter(this.activeAmpeln); 
-            }
-            
-        },
-        ampelnOverview () {
-            return this.activeAmpeln?.slice(0, this.WIDGET_AMPEL_MAX);  // show only newest 4 active ampeln
-        },
-        count () {
-            let datasource = this.activeAmpeln;
-            if (this.source == 'offen') datasource = this.activeAmpeln;
-            if (this.source == 'alle') datasource = this.allAmpeln;
+	name: 'WidgetsAmpel',
+	components: { BaseOffcanvas },
+	data: () => ({
+		WIDGET_AMPEL_MAX: 4,
+		filter: '',
+		source: '',
+		allAmpeln:null,
+		activeAmpeln:null,
+	}),
+	mixins: [
+		AbstractWidget
+	],
+	computed: {
+		
+		ampelnComputed(){
+			
+			switch(this.source)
+			{
+				case 'offen': return this.applyFilter(this.activeAmpeln);
+				case 'alle': return this.applyFilter(this.allAmpeln);
+				default: return this.applyFilter(this.activeAmpeln); 
+			}
+			
+		},
+		ampelnOverview () {
+			return this.activeAmpeln?.slice(0, this.WIDGET_AMPEL_MAX);  // show only newest 4 active ampeln
+		},
+		count () {
+			let datasource = this.activeAmpeln;
+			if (this.source == 'offen') datasource = this.activeAmpeln;
+			if (this.source == 'alle') datasource = this.allAmpeln;
 
-            return {
-                verpflichtend: datasource?.filter(item => item.verpflichtend).length,
-                ueberfaellig: datasource?.filter(item => (new Date() > new Date(item.deadline)) && !item.bestaetigt).length,
-                alle: datasource?.length
-            }
-            
-        }
-    },
-    methods: {
-        applyFilter(data){
-            switch(this.filter)
-                {
-                    case 'verpflichtend': return data?.filter(item => item.verpflichtend);
-                    case 'ueberfaellig': return data?.filter(item => (new Date() > new Date(item.deadline)) && !item.bestaetigt);
-                    default: return data;
-                }
-        },
-        toggleFilter(value){
-            this.filter === value ? this.filter = '' : this.filter = value;
-        },
-        closeOffcanvasAmpeln()
-        {
-            for (let i = 0; i < this.ampelnComputed.length; i++)
-            {
-                let ampelId = this.ampelnComputed[i].ampel_id;
-                if(this.$refs['ampelCollapse_' + ampelId]){
-                    this.$refs['ampelCollapse_' + ampelId][0].classList.remove('show');
-                } 
-            }
-        },
-        openOffcanvasAmpel(ampelId){
-            // Close earlier opened Ampeln
-            this.closeOffcanvasAmpeln();
+			return {
+				verpflichtend: datasource?.filter(item => item.verpflichtend).length,
+				ueberfaellig: datasource?.filter(item => (new Date() > new Date(item.deadline)) && !item.bestaetigt).length,
+				alle: datasource?.length
+			}
+			
+		}
+	},
+	methods: {
+		applyFilter(data){
+			switch(this.filter)
+				{
+					case 'verpflichtend': return data?.filter(item => item.verpflichtend);
+					case 'ueberfaellig': return data?.filter(item => (new Date() > new Date(item.deadline)) && !item.bestaetigt);
+					default: return data;
+				}
+		},
+		toggleFilter(value){
+			this.filter === value ? this.filter = '' : this.filter = value;
+		},
+		closeOffcanvasAmpeln()
+		{
+			for (let i = 0; i < this.ampelnComputed.length; i++)
+			{
+				let ampelId = this.ampelnComputed[i].ampel_id;
+				if(this.$refs['ampelCollapse_' + ampelId]){
+					this.$refs['ampelCollapse_' + ampelId][0].classList.remove('show');
+				} 
+			}
+		},
+		openOffcanvasAmpel(ampelId){
+			// Close earlier opened Ampeln
+			this.closeOffcanvasAmpeln();
 
-            // Show given Ampel
-            this.$refs['ampelCollapse_' + ampelId][0].classList.add('show');
-        },
-        closeOffcanvas(){
-            this.closeOffcanvasAmpeln();
-            this.filter = '';
-            // maybe we also want to reset the source (open/alle) of the displayed ampeln
-        },
-        async fetchNonConfirmedActiveAmpeln(){
-            await this.$fhcApi.factory.ampeln.open().then(res=>{
-                this.activeAmpeln = res.data.sort((a,b) => new Date(b.deadline) - new Date(a.deadline));
-            }); 
-        },
-        async fetchAllActiveAmpeln(){
-            await this.$fhcApi.factory.ampeln.all().then(res=>{
-                this.allAmpeln = res.data.sort((a,b) => new Date(b.deadline) - new Date(a.deadline));
-            }); 
-        },
-        async confirm(ampelId){
-            this.$fhcApi.factory.ampeln.confirm(ampelId)
-            .then(res => res.data)
-            .then(result => {
-                this.$fhcAlert.alertSuccess(this.$p.t('ampeln','ampelBestaetigt'));
-            })
-            .catch(this.$fhcAlert.handleSystemError);
+			// Show given Ampel
+			this.$refs['ampelCollapse_' + ampelId][0].classList.add('show');
+		},
+		closeOffcanvas(){
+			this.closeOffcanvasAmpeln();
+			this.filter = '';
+			// maybe we also want to reset the source (open/alle) of the displayed ampeln
+		},
+		async fetchNonConfirmedActiveAmpeln(){
+			await this.$fhcApi.factory.ampeln.open().then(res=>{
+				this.activeAmpeln = res.data.sort((a,b) => new Date(b.deadline) - new Date(a.deadline));
+			}); 
+		},
+		async fetchAllActiveAmpeln(){
+			await this.$fhcApi.factory.ampeln.all().then(res=>{
+				this.allAmpeln = res.data.sort((a,b) => new Date(b.deadline) - new Date(a.deadline));
+			}); 
+		},
+		async confirm(ampelId){
+			this.$fhcApi.factory.ampeln.confirm(ampelId)
+			.then(() => {
+				this.$fhcAlert.alertSuccess(this.$p.t('ampeln','ampelBestaetigt'));
+			})
+			.catch(this.$fhcAlert.handleSystemError);
 
-            // update the ampeln by refetching them
-            this.fetchNonConfirmedActiveAmpeln();
-            this.fetchAllActiveAmpeln();
-        },
-        validateBtnTxt(buttontext){
+			// update the ampeln by refetching them
+			this.fetchNonConfirmedActiveAmpeln();
+			this.fetchAllActiveAmpeln();
+		},
+		validateBtnTxt(buttontext){
 
-            if(buttontext instanceof Array && !buttontext.length) return this.$p.t('ui','bestaetigen');
+			if(buttontext instanceof Array && !buttontext.length) return this.$p.t('ui','bestaetigen');
 
-            if(!buttontext) return this.$p.t('ui','bestaetigen');
+			if(!buttontext) return this.$p.t('ui','bestaetigen');
 
-            return buttontext;
-        }
-    },
-    created() {
-        this.$emit('setConfig', false);    
-    },
-    async mounted() {
-        await this.fetchNonConfirmedActiveAmpeln();
-        await this.fetchAllActiveAmpeln();
-    },
-    template: /*html*/`
-    <div class="widgets-ampel w-100 h-100">
-        <div v-if="activeAmpeln" class="d-flex flex-column justify-content-between">
-            <div class="d-flex">
-                <header class="me-auto"><b>{{$p.t('ampeln','newestAmpeln')}}</b></header>
-                <div class="mb-2 text-danger"><a href="#allAmpelOffcanvas" data-bs-toggle="offcanvas">{{$p.t('ampeln','allAmpeln')}}</a></div>
-            </div>
-            <div class="d-flex justify-content-end">
-                <a v-if="count.ueberfaellig > 0" href="#allAmpelOffcanvas" data-bs-toggle="offcanvas" @click="filter = 'ueberfaellig'" class="text-decoration-none"><span class="badge bg-danger me-1"><i class="fa fa-solid fa-bolt"></i> {{$p.t('ampeln','overdue')}}: <b>{{ count.ueberfaellig }}</b></span></a>
-            </div>
-            <div v-for="ampel in ampelnOverview" :key="ampel.ampel_id" class="mt-2">
-                <div class="card">
-                    <div class="card-body">
-                        <div class="position-relative">
-                            <div class="d-flex">
-                                <div class="text-muted small me-auto"><small>{{$p.t('ampeln','deadline')}}: {{ getDate(ampel.deadline) }}</small></div>
-                                <div v-if="(new Date() > new Date(ampel.deadline)) && !ampel.bestaetigt "><span class="badge bg-danger"><i class="fa fa-solid fa-bolt"></i></span></div>
-                                <div v-if="ampel.verpflichtend"><span class="badge bg-warning ms-1"><i class="fa fa-solid fa-triangle-exclamation"></i></span></div>
-                                <div v-if="ampel.bestaetigt"><span class="badge bg-success ms-1"><i class="fa fa-solid fa-circle-check"></i></span></div>
-                            </div>
-                        </div>
-                        <a href="#allAmpelOffcanvas" data-bs-toggle="offcanvas" class="stretched-link" @click="openOffcanvasAmpel(ampel.ampel_id)">{{ ampel.kurzbz }}</a><br>
-                    </div>
-                </div>
-            </div>
+			return buttontext;
+		}
+	},
+	created() {
+		this.$emit('setConfig', false);    
+	},
+	async mounted() {
+		await this.fetchNonConfirmedActiveAmpeln();
+		await this.fetchAllActiveAmpeln();
+	},
+	template: /*html*/`
+	<div class="widgets-ampel w-100 h-100">
+		<div v-if="activeAmpeln" class="d-flex flex-column justify-content-between">
+			<div class="d-flex">
+				<header class="me-auto"><b>{{$p.t('ampeln','newestAmpeln')}}</b></header>
+				<div class="mb-2 text-danger"><a href="#allAmpelOffcanvas" data-bs-toggle="offcanvas">{{$p.t('ampeln','allAmpeln')}}</a></div>
+			</div>
+			<div class="d-flex justify-content-end">
+				<a v-if="count.ueberfaellig > 0" href="#allAmpelOffcanvas" data-bs-toggle="offcanvas" @click="filter = 'ueberfaellig'" class="text-decoration-none"><span class="badge bg-danger me-1"><i class="fa fa-solid fa-bolt"></i> {{$p.t('ampeln','overdue')}}: <b>{{ count.ueberfaellig }}</b></span></a>
+			</div>
+			<div v-for="ampel in ampelnOverview" :key="ampel.ampel_id" class="mt-2">
+				<div class="card">
+					<div class="card-body">
+						<div class="position-relative">
+							<div class="d-flex">
+								<div class="text-muted small me-auto"><small>{{$p.t('ampeln','deadline')}}: {{ getDate(ampel.deadline) }}</small></div>
+								<div v-if="(new Date() > new Date(ampel.deadline)) && !ampel.bestaetigt "><span class="badge bg-danger"><i class="fa fa-solid fa-bolt"></i></span></div>
+								<div v-if="ampel.verpflichtend"><span class="badge bg-warning ms-1"><i class="fa fa-solid fa-triangle-exclamation"></i></span></div>
+								<div v-if="ampel.bestaetigt"><span class="badge bg-success ms-1"><i class="fa fa-solid fa-circle-check"></i></span></div>
+							</div>
+						</div>
+						<a href="#allAmpelOffcanvas" data-bs-toggle="offcanvas" class="stretched-link" @click="openOffcanvasAmpel(ampel.ampel_id)">{{ ampel.kurzbz }}</a><br>
+					</div>
+				</div>
+			</div>
 
-            <div v-if="activeAmpeln && activeAmpeln.length == 0" class="card card-body mt-4 p-4 text-center">
-                <span class="text-success h2"><i class="fa fa-solid fa-circle-check"></i></span>
-                <span class="text-success h5">{{$p.t('ampeln','super')}}</span><br>
-                <span class="small">{{$p.t('ampeln','noOpenAmpeln')}}</span>
-            </div>
-        </div>
-        <div v-else>
-        <header class="me-auto"><b>{{$p.t('ampeln','newestAmpeln')}} </b></header>
-            <template v-for="n in WIDGET_AMPEL_MAX">
+			<div v-if="activeAmpeln && activeAmpeln.length == 0" class="card card-body mt-4 p-4 text-center">
+				<span class="text-success h2"><i class="fa fa-solid fa-circle-check"></i></span>
+				<span class="text-success h5">{{$p.t('ampeln','super')}}</span><br>
+				<span class="small">{{$p.t('ampeln','noOpenAmpeln')}}</span>
+			</div>
+		</div>
+		<div v-else>
+		<header class="me-auto"><b>{{$p.t('ampeln','newestAmpeln')}} </b></header>
+			<template v-for="n in WIDGET_AMPEL_MAX">
 
-                <div class="mt-2 card" aria-hidden="true">
-                <div class="card-body">
-                    <p class="card-text placeholder-glow">
-                    <span class="placeholder col-7"></span>
-                    <span class="placeholder col-12"></span>
-                    </p>
-                </div>
-                </div>
-            </template>
+				<div class="mt-2 card" aria-hidden="true">
+				<div class="card-body">
+					<p class="card-text placeholder-glow">
+					<span class="placeholder col-7"></span>
+					<span class="placeholder col-12"></span>
+					</p>
+				</div>
+				</div>
+			</template>
 
-        </div>
+		</div>
 
-    </div>
+	</div>
 
-    <!-- All Ampeln Offcanvas -->
-    <BaseOffcanvas id="allAmpelOffcanvas" :closeFunc="closeOffcanvas">
-        <template #title><header><b>{{$p.t('ampeln','allMyAmpeln')}}</b></header></template>
-        <template #body>
-            <div class="d-flex justify-content-evenly">
-                <div class="form-check form-check-inline form-control-sm">
-                <input class="form-check-input" type="radio" v-model="source" id="offen" value="offen"  checked>
-                <label class="form-check-label" for="offen">{{$p.t('ampeln','openAmpeln')}}</label>
-            </div>
-            <div class="form-check form-check-inline form-control-sm">
-                <input class="form-check-input" type="radio" v-model="source" id="alle" value="alle" >
-                <label class="form-check-label" for="alle">{{$p.t('ampeln','allAmpeln')}}</label>
-            </div>
-            </div>
-            <div class="col"><button class="btn btn-light w-100" @click="filter = ''"><small>{{$p.t('ui','alle')}}: <b>{{ count.alle }}</b></small></button></div>
-            <div class="row row-cols-2 g-2 mt-1">
-                <div class="col"><button class="btn btn-danger w-100"  @click="toggleFilter('ueberfaellig')"><i class="fa fa-solid fa-bolt me-2"></i><small :class="{'text-decoration-underline':filter==='ueberfaellig', 'fw-bold':filter==='ueberfaellig'}">{{$p.t('ampeln','overdue')}}: <b>{{ count.ueberfaellig }}</b></small></button></div>
-                <div class="col"><button class="btn btn-warning w-100" @click="toggleFilter('verpflichtend')"><i class="fa fa-solid fa-triangle-exclamation me-2"></i><small :class="{'text-decoration-underline':filter==='ueberfaellig', 'fw-bold':filter==='ueberfaellig'}" >{{$p.t('ampeln','mandatory')}}: <b>{{ count.verpflichtend }}</b></small></button></div>
-            </div>
-            <div v-for="ampel in ampelnComputed" :key="ampel.ampel_id" class="mt-2">
-                <ul class="list-group">
-                <li class="list-group-item small">
-                <div class="position-relative"><!-- prevents streched-link from stretching outside this parent element -->
-                    <div class="d-flex">
-                        <span class="small text-muted me-auto"><small>{{$p.t('ampeln','deadline')}}: {{ getDate(ampel.deadline) }}</small></span>
-                        <div v-if="(new Date() > new Date(ampel.deadline)) && !ampel.bestaetigt"><span class="badge bg-danger"><i class="fa fa-solid fa-bolt"></span></div>
-                        <div v-if="ampel.verpflichtend"><span class="badge bg-warning ms-1"><i class="fa fa-solid fa-triangle-exclamation"></span></div>
-                        <div v-if="ampel.bestaetigt"><span class="badge bg-success ms-1"><i class="fa fa-solid fa-circle-check"></i></span></div>
-                    </div>
-                    <a :href="'#ampelCollapse_' + ampel.ampel_id" data-bs-toggle="collapse" class="stretched-link">{{ ampel.kurzbz }}</a><br>
-                </div>
-                <div class="collapse my-3" :id="'ampelCollapse_' + ampel.ampel_id" :ref="'ampelCollapse_' + ampel.ampel_id">
-                    <div v-html="ampel.beschreibung_trans"></div>
-                    <div v-if="!ampel.bestaetigt " class="d-flex justify-content-end mt-3">
-                        <button  class="btn btn-sm btn-primary" :class="{disabled: ampel.bestaetigt}" @click="confirm(ampel.ampel_id)">{{ validateBtnTxt(ampel.buttontext_trans) }}</button>
-                    </div>
-                </div>
-                </li>
-                </ul>
-            </div>
-        </template>
-    </BaseOffcanvas>`
+	<!-- All Ampeln Offcanvas -->
+	<BaseOffcanvas id="allAmpelOffcanvas" :closeFunc="closeOffcanvas">
+		<template #title><header><b>{{$p.t('ampeln','allMyAmpeln')}}</b></header></template>
+		<template #body>
+			<div class="d-flex justify-content-evenly">
+				<div class="form-check form-check-inline form-control-sm">
+				<input class="form-check-input" type="radio" v-model="source" id="offen" value="offen"  checked>
+				<label class="form-check-label" for="offen">{{$p.t('ampeln','openAmpeln')}}</label>
+			</div>
+			<div class="form-check form-check-inline form-control-sm">
+				<input class="form-check-input" type="radio" v-model="source" id="alle" value="alle" >
+				<label class="form-check-label" for="alle">{{$p.t('ampeln','allAmpeln')}}</label>
+			</div>
+			</div>
+			<div class="col"><button class="btn btn-light w-100" @click="filter = ''"><small>{{$p.t('ui','alle')}}: <b>{{ count.alle }}</b></small></button></div>
+			<div class="row row-cols-2 g-2 mt-1">
+				<div class="col"><button class="btn btn-danger w-100"  @click="toggleFilter('ueberfaellig')"><i class="fa fa-solid fa-bolt me-2"></i><small :class="{'text-decoration-underline':filter==='ueberfaellig', 'fw-bold':filter==='ueberfaellig'}">{{$p.t('ampeln','overdue')}}: <b>{{ count.ueberfaellig }}</b></small></button></div>
+				<div class="col"><button class="btn btn-warning w-100" @click="toggleFilter('verpflichtend')"><i class="fa fa-solid fa-triangle-exclamation me-2"></i><small :class="{'text-decoration-underline':filter==='ueberfaellig', 'fw-bold':filter==='ueberfaellig'}" >{{$p.t('ampeln','mandatory')}}: <b>{{ count.verpflichtend }}</b></small></button></div>
+			</div>
+			<div v-for="ampel in ampelnComputed" :key="ampel.ampel_id" class="mt-2">
+				<ul class="list-group">
+				<li class="list-group-item small">
+				<div class="position-relative"><!-- prevents streched-link from stretching outside this parent element -->
+					<div class="d-flex">
+						<span class="small text-muted me-auto"><small>{{$p.t('ampeln','deadline')}}: {{ getDate(ampel.deadline) }}</small></span>
+						<div v-if="(new Date() > new Date(ampel.deadline)) && !ampel.bestaetigt"><span class="badge bg-danger"><i class="fa fa-solid fa-bolt"></span></div>
+						<div v-if="ampel.verpflichtend"><span class="badge bg-warning ms-1"><i class="fa fa-solid fa-triangle-exclamation"></span></div>
+						<div v-if="ampel.bestaetigt"><span class="badge bg-success ms-1"><i class="fa fa-solid fa-circle-check"></i></span></div>
+					</div>
+					<a :href="'#ampelCollapse_' + ampel.ampel_id" data-bs-toggle="collapse" class="stretched-link">{{ ampel.kurzbz }}</a><br>
+				</div>
+				<div class="collapse my-3" :id="'ampelCollapse_' + ampel.ampel_id" :ref="'ampelCollapse_' + ampel.ampel_id">
+					<div v-html="ampel.beschreibung_trans"></div>
+					<div v-if="!ampel.bestaetigt " class="d-flex justify-content-end mt-3">
+						<button  class="btn btn-sm btn-primary" :class="{disabled: ampel.bestaetigt}" @click="confirm(ampel.ampel_id)">{{ validateBtnTxt(ampel.buttontext_trans) }}</button>
+					</div>
+				</div>
+				</li>
+				</ul>
+			</div>
+		</template>
+	</BaseOffcanvas>`
 }
 

From e7a29dc21a69fa597684b946f4501fba51a8dab9 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 7 Aug 2024 11:56:00 +0200
Subject: [PATCH 1094/1461] Identation

---
 public/js/components/DashboardWidget/Ampel.js | 173 +++++++++++-------
 1 file changed, 105 insertions(+), 68 deletions(-)

diff --git a/public/js/components/DashboardWidget/Ampel.js b/public/js/components/DashboardWidget/Ampel.js
index a3a36eb94..8f8281276 100755
--- a/public/js/components/DashboardWidget/Ampel.js
+++ b/public/js/components/DashboardWidget/Ampel.js
@@ -15,16 +15,12 @@ export default {
 		AbstractWidget
 	],
 	computed: {
-		
-		ampelnComputed(){
-			
-			switch(this.source)
-			{
+		ampelnComputed() {
+			switch(this.source) {
 				case 'offen': return this.applyFilter(this.activeAmpeln);
 				case 'alle': return this.applyFilter(this.allAmpeln);
 				default: return this.applyFilter(this.activeAmpeln); 
 			}
-			
 		},
 		ampelnOverview () {
 			return this.activeAmpeln?.slice(0, this.WIDGET_AMPEL_MAX);  // show only newest 4 active ampeln
@@ -39,23 +35,20 @@ export default {
 				ueberfaellig: datasource?.filter(item => (new Date() > new Date(item.deadline)) && !item.bestaetigt).length,
 				alle: datasource?.length
 			}
-			
 		}
 	},
 	methods: {
-		applyFilter(data){
-			switch(this.filter)
-				{
-					case 'verpflichtend': return data?.filter(item => item.verpflichtend);
-					case 'ueberfaellig': return data?.filter(item => (new Date() > new Date(item.deadline)) && !item.bestaetigt);
-					default: return data;
-				}
+		applyFilter(data) {
+			switch(this.filter) {
+				case 'verpflichtend': return data?.filter(item => item.verpflichtend);
+				case 'ueberfaellig': return data?.filter(item => (new Date() > new Date(item.deadline)) && !item.bestaetigt);
+				default: return data;
+			}
 		},
-		toggleFilter(value){
+		toggleFilter(value) {
 			this.filter === value ? this.filter = '' : this.filter = value;
 		},
-		closeOffcanvasAmpeln()
-		{
+		closeOffcanvasAmpeln() {
 			for (let i = 0; i < this.ampelnComputed.length; i++)
 			{
 				let ampelId = this.ampelnComputed[i].ampel_id;
@@ -64,29 +57,29 @@ export default {
 				} 
 			}
 		},
-		openOffcanvasAmpel(ampelId){
+		openOffcanvasAmpel(ampelId) {
 			// Close earlier opened Ampeln
 			this.closeOffcanvasAmpeln();
 
 			// Show given Ampel
 			this.$refs['ampelCollapse_' + ampelId][0].classList.add('show');
 		},
-		closeOffcanvas(){
+		closeOffcanvas() {
 			this.closeOffcanvasAmpeln();
 			this.filter = '';
 			// maybe we also want to reset the source (open/alle) of the displayed ampeln
 		},
-		async fetchNonConfirmedActiveAmpeln(){
-			await this.$fhcApi.factory.ampeln.open().then(res=>{
+		async fetchNonConfirmedActiveAmpeln() {
+			await this.$fhcApi.factory.ampeln.open().then(res => {
 				this.activeAmpeln = res.data.sort((a,b) => new Date(b.deadline) - new Date(a.deadline));
 			}); 
 		},
-		async fetchAllActiveAmpeln(){
-			await this.$fhcApi.factory.ampeln.all().then(res=>{
+		async fetchAllActiveAmpeln() {
+			await this.$fhcApi.factory.ampeln.all().then(res => {
 				this.allAmpeln = res.data.sort((a,b) => new Date(b.deadline) - new Date(a.deadline));
 			}); 
 		},
-		async confirm(ampelId){
+		async confirm(ampelId) {
 			this.$fhcApi.factory.ampeln.confirm(ampelId)
 			.then(() => {
 				this.$fhcAlert.alertSuccess(this.$p.t('ampeln','ampelBestaetigt'));
@@ -97,11 +90,10 @@ export default {
 			this.fetchNonConfirmedActiveAmpeln();
 			this.fetchAllActiveAmpeln();
 		},
-		validateBtnTxt(buttontext){
+		validateBtnTxt(buttontext) {
+			if (buttontext instanceof Array && !buttontext.length) return this.$p.t('ui','bestaetigen');
 
-			if(buttontext instanceof Array && !buttontext.length) return this.$p.t('ui','bestaetigen');
-
-			if(!buttontext) return this.$p.t('ui','bestaetigen');
+			if (!buttontext) return this.$p.t('ui', 'bestaetigen');
 
 			return buttontext;
 		}
@@ -117,11 +109,19 @@ export default {
 	<div class="widgets-ampel w-100 h-100">
 		<div v-if="activeAmpeln" class="d-flex flex-column justify-content-between">
 			<div class="d-flex">
-				<header class="me-auto"><b>{{$p.t('ampeln','newestAmpeln')}}</b></header>
-				<div class="mb-2 text-danger"><a href="#allAmpelOffcanvas" data-bs-toggle="offcanvas">{{$p.t('ampeln','allAmpeln')}}</a></div>
+				<header class="me-auto"><b>{{$p.t('ampeln', 'newestAmpeln')}}</b></header>
+				<div class="mb-2 text-danger">
+					<a href="#allAmpelOffcanvas" data-bs-toggle="offcanvas">
+						{{$p.t('ampeln', 'allAmpeln')}}
+					</a>
+				</div>
 			</div>
 			<div class="d-flex justify-content-end">
-				<a v-if="count.ueberfaellig > 0" href="#allAmpelOffcanvas" data-bs-toggle="offcanvas" @click="filter = 'ueberfaellig'" class="text-decoration-none"><span class="badge bg-danger me-1"><i class="fa fa-solid fa-bolt"></i> {{$p.t('ampeln','overdue')}}: <b>{{ count.ueberfaellig }}</b></span></a>
+				<a v-if="count.ueberfaellig > 0" href="#allAmpelOffcanvas" data-bs-toggle="offcanvas" @click="filter = 'ueberfaellig'" class="text-decoration-none">
+					<span class="badge bg-danger me-1">
+						<i class="fa fa-solid fa-bolt"></i> {{$p.t('ampeln','overdue')}}: <b>{{ count.ueberfaellig }}</b>
+					</span>
+				</a>
 			</div>
 			<div v-for="ampel in ampelnOverview" :key="ampel.ampel_id" class="mt-2">
 				<div class="card">
@@ -139,28 +139,25 @@ export default {
 				</div>
 			</div>
 
-			<div v-if="activeAmpeln && activeAmpeln.length == 0" class="card card-body mt-4 p-4 text-center">
+			<div v-if="activeAmpeln.length == 0" class="card card-body mt-4 p-4 text-center">
 				<span class="text-success h2"><i class="fa fa-solid fa-circle-check"></i></span>
 				<span class="text-success h5">{{$p.t('ampeln','super')}}</span><br>
 				<span class="small">{{$p.t('ampeln','noOpenAmpeln')}}</span>
 			</div>
 		</div>
 		<div v-else>
-		<header class="me-auto"><b>{{$p.t('ampeln','newestAmpeln')}} </b></header>
+			<header class="me-auto"><b>{{$p.t('ampeln', 'newestAmpeln')}} </b></header>
 			<template v-for="n in WIDGET_AMPEL_MAX">
-
 				<div class="mt-2 card" aria-hidden="true">
-				<div class="card-body">
-					<p class="card-text placeholder-glow">
-					<span class="placeholder col-7"></span>
-					<span class="placeholder col-12"></span>
-					</p>
-				</div>
+					<div class="card-body">
+						<p class="card-text placeholder-glow">
+							<span class="placeholder col-7"></span>
+							<span class="placeholder col-12"></span>
+						</p>
+					</div>
 				</div>
 			</template>
-
 		</div>
-
 	</div>
 
 	<!-- All Ampeln Offcanvas -->
@@ -169,38 +166,78 @@ export default {
 		<template #body>
 			<div class="d-flex justify-content-evenly">
 				<div class="form-check form-check-inline form-control-sm">
-				<input class="form-check-input" type="radio" v-model="source" id="offen" value="offen"  checked>
-				<label class="form-check-label" for="offen">{{$p.t('ampeln','openAmpeln')}}</label>
+					<input class="form-check-input" type="radio" v-model="source" id="offen" value="offen"  checked>
+					<label class="form-check-label" for="offen">{{$p.t('ampeln','openAmpeln')}}</label>
+				</div>
+				<div class="form-check form-check-inline form-control-sm">
+					<input class="form-check-input" type="radio" v-model="source" id="alle" value="alle" >
+					<label class="form-check-label" for="alle">{{$p.t('ampeln','allAmpeln')}}</label>
+				</div>
 			</div>
-			<div class="form-check form-check-inline form-control-sm">
-				<input class="form-check-input" type="radio" v-model="source" id="alle" value="alle" >
-				<label class="form-check-label" for="alle">{{$p.t('ampeln','allAmpeln')}}</label>
+			<div class="col">
+				<button class="btn btn-light w-100" @click="filter = ''">
+					<small>{{$p.t('ui','alle')}}: <b>{{ count.alle }}</b></small>
+				</button>
 			</div>
-			</div>
-			<div class="col"><button class="btn btn-light w-100" @click="filter = ''"><small>{{$p.t('ui','alle')}}: <b>{{ count.alle }}</b></small></button></div>
 			<div class="row row-cols-2 g-2 mt-1">
-				<div class="col"><button class="btn btn-danger w-100"  @click="toggleFilter('ueberfaellig')"><i class="fa fa-solid fa-bolt me-2"></i><small :class="{'text-decoration-underline':filter==='ueberfaellig', 'fw-bold':filter==='ueberfaellig'}">{{$p.t('ampeln','overdue')}}: <b>{{ count.ueberfaellig }}</b></small></button></div>
-				<div class="col"><button class="btn btn-warning w-100" @click="toggleFilter('verpflichtend')"><i class="fa fa-solid fa-triangle-exclamation me-2"></i><small :class="{'text-decoration-underline':filter==='ueberfaellig', 'fw-bold':filter==='ueberfaellig'}" >{{$p.t('ampeln','mandatory')}}: <b>{{ count.verpflichtend }}</b></small></button></div>
+				<div class="col">
+					<button class="btn btn-danger w-100"  @click="toggleFilter('ueberfaellig')">
+						<i class="fa fa-solid fa-bolt me-2"></i>
+						<small :class="{'text-decoration-underline':filter==='ueberfaellig', 'fw-bold':filter==='ueberfaellig'}">
+							{{$p.t('ampeln','overdue')}}: <b>{{ count.ueberfaellig }}</b>
+						</small>
+					</button>
+				</div>
+				<div class="col">
+					<button class="btn btn-warning w-100" @click="toggleFilter('verpflichtend')">
+						<i class="fa fa-solid fa-triangle-exclamation me-2"></i>
+						<small :class="{'text-decoration-underline':filter==='ueberfaellig', 'fw-bold':filter==='ueberfaellig'}" >
+							{{$p.t('ampeln','mandatory')}}: <b>{{ count.verpflichtend }}</b>
+						</small>
+					</button>
+				</div>
 			</div>
 			<div v-for="ampel in ampelnComputed" :key="ampel.ampel_id" class="mt-2">
 				<ul class="list-group">
-				<li class="list-group-item small">
-				<div class="position-relative"><!-- prevents streched-link from stretching outside this parent element -->
-					<div class="d-flex">
-						<span class="small text-muted me-auto"><small>{{$p.t('ampeln','deadline')}}: {{ getDate(ampel.deadline) }}</small></span>
-						<div v-if="(new Date() > new Date(ampel.deadline)) && !ampel.bestaetigt"><span class="badge bg-danger"><i class="fa fa-solid fa-bolt"></span></div>
-						<div v-if="ampel.verpflichtend"><span class="badge bg-warning ms-1"><i class="fa fa-solid fa-triangle-exclamation"></span></div>
-						<div v-if="ampel.bestaetigt"><span class="badge bg-success ms-1"><i class="fa fa-solid fa-circle-check"></i></span></div>
-					</div>
-					<a :href="'#ampelCollapse_' + ampel.ampel_id" data-bs-toggle="collapse" class="stretched-link">{{ ampel.kurzbz }}</a><br>
-				</div>
-				<div class="collapse my-3" :id="'ampelCollapse_' + ampel.ampel_id" :ref="'ampelCollapse_' + ampel.ampel_id">
-					<div v-html="ampel.beschreibung_trans"></div>
-					<div v-if="!ampel.bestaetigt " class="d-flex justify-content-end mt-3">
-						<button  class="btn btn-sm btn-primary" :class="{disabled: ampel.bestaetigt}" @click="confirm(ampel.ampel_id)">{{ validateBtnTxt(ampel.buttontext_trans) }}</button>
-					</div>
-				</div>
-				</li>
+					<li class="list-group-item small">
+						<div class="position-relative">
+							<!-- prevents streched-link from stretching outside this parent element -->
+							<div class="d-flex">
+								<span class="small text-muted me-auto">
+									<small>
+										{{$p.t('ampeln','deadline')}}: {{ getDate(ampel.deadline) }}
+									</small>
+								</span>
+								<div v-if="(new Date() > new Date(ampel.deadline)) && !ampel.bestaetigt">
+									<span class="badge bg-danger">
+										<i class="fa fa-solid fa-bolt"></i>
+									</span>
+								</div>
+								<div v-if="ampel.verpflichtend">
+									<span class="badge bg-warning ms-1">
+										<i class="fa fa-solid fa-triangle-exclamation"></i>
+									</span>
+								</div>
+								<div v-if="ampel.bestaetigt">
+									<span class="badge bg-success ms-1">
+										<i class="fa fa-solid fa-circle-check"></i>
+									</span>
+								</div>
+							</div>
+							<a :href="'#ampelCollapse_' + ampel.ampel_id" data-bs-toggle="collapse" class="stretched-link">
+								{{ ampel.kurzbz }}
+							</a>
+							<br>
+						</div>
+						<div class="collapse my-3" :id="'ampelCollapse_' + ampel.ampel_id" :ref="'ampelCollapse_' + ampel.ampel_id">
+							<div v-html="ampel.beschreibung_trans"></div>
+							<div v-if="!ampel.bestaetigt " class="d-flex justify-content-end mt-3">
+								<button  class="btn btn-sm btn-primary" :class="{disabled: ampel.bestaetigt}" @click="confirm(ampel.ampel_id)">
+									{{ validateBtnTxt(ampel.buttontext_trans) }}
+								</button>
+							</div>
+						</div>
+					</li>
 				</ul>
 			</div>
 		</template>

From a6bef318620af04f6ae6c5c635cfc4f9750bc142 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 7 Aug 2024 12:00:24 +0200
Subject: [PATCH 1095/1461] corrects filter styling problem

---
 public/js/components/DashboardWidget/Ampel.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/DashboardWidget/Ampel.js b/public/js/components/DashboardWidget/Ampel.js
index 8f8281276..1f2319b58 100755
--- a/public/js/components/DashboardWidget/Ampel.js
+++ b/public/js/components/DashboardWidget/Ampel.js
@@ -191,7 +191,7 @@ export default {
 				<div class="col">
 					<button class="btn btn-warning w-100" @click="toggleFilter('verpflichtend')">
 						<i class="fa fa-solid fa-triangle-exclamation me-2"></i>
-						<small :class="{'text-decoration-underline':filter==='ueberfaellig', 'fw-bold':filter==='ueberfaellig'}" >
+						<small :class="{'text-decoration-underline':filter==='verpflichtend', 'fw-bold':filter==='verpflichtend'}" >
 							{{$p.t('ampeln','mandatory')}}: <b>{{ count.verpflichtend }}</b>
 						</small>
 					</button>

From 8b590dc58a21a2208e27d1f0dd67ac3abb6ab60c Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 7 Aug 2024 14:23:35 +0200
Subject: [PATCH 1096/1461] optimizing Ampel Widget

---
 public/js/components/DashboardWidget/Ampel.js | 333 ++++++++++--------
 1 file changed, 180 insertions(+), 153 deletions(-)

diff --git a/public/js/components/DashboardWidget/Ampel.js b/public/js/components/DashboardWidget/Ampel.js
index 1f2319b58..9ec65fa14 100755
--- a/public/js/components/DashboardWidget/Ampel.js
+++ b/public/js/components/DashboardWidget/Ampel.js
@@ -1,16 +1,21 @@
 import AbstractWidget from './Abstract';
 import BaseOffcanvas from '../Base/Offcanvas';
 
+let _idcounter = 0;
+
 export default {
 	name: 'WidgetsAmpel',
 	components: { BaseOffcanvas },
-	data: () => ({
-		WIDGET_AMPEL_MAX: 4,
-		filter: '',
-		source: '',
-		allAmpeln:null,
-		activeAmpeln:null,
-	}),
+	data() {
+		return {
+			WIDGET_AMPEL_MAX: 4,
+			filter: '',
+			source: 'offen',
+			allAmpeln:null,
+			activeAmpeln:null,
+			idcounter: this.configMode ? 0 : ++_idcounter
+		};
+	},
 	mixins: [
 		AbstractWidget
 	],
@@ -26,13 +31,14 @@ export default {
 			return this.activeAmpeln?.slice(0, this.WIDGET_AMPEL_MAX);  // show only newest 4 active ampeln
 		},
 		count () {
+			const now = new Date();
 			let datasource = this.activeAmpeln;
 			if (this.source == 'offen') datasource = this.activeAmpeln;
 			if (this.source == 'alle') datasource = this.allAmpeln;
 
 			return {
 				verpflichtend: datasource?.filter(item => item.verpflichtend).length,
-				ueberfaellig: datasource?.filter(item => (new Date() > new Date(item.deadline)) && !item.bestaetigt).length,
+				ueberfaellig: datasource?.filter(item => (now > new Date(item.deadline)) && !item.bestaetigt).length,
 				alle: datasource?.length
 			}
 		}
@@ -41,7 +47,7 @@ export default {
 		applyFilter(data) {
 			switch(this.filter) {
 				case 'verpflichtend': return data?.filter(item => item.verpflichtend);
-				case 'ueberfaellig': return data?.filter(item => (new Date() > new Date(item.deadline)) && !item.bestaetigt);
+				case 'ueberfaellig': const now = new Date(); return data?.filter(item => (now > new Date(item.deadline)) && !item.bestaetigt);
 				default: return data;
 			}
 		},
@@ -69,29 +75,46 @@ export default {
 			this.filter = '';
 			// maybe we also want to reset the source (open/alle) of the displayed ampeln
 		},
-		async fetchNonConfirmedActiveAmpeln() {
-			await this.$fhcApi.factory.ampeln.open().then(res => {
-				this.activeAmpeln = res.data.sort((a,b) => new Date(b.deadline) - new Date(a.deadline));
-			}); 
+		fetchNonConfirmedActiveAmpeln() {
+			this.$fhcApi.factory
+				.ampeln.open()
+				.then(res => {
+					this.activeAmpeln = res.data;
+				})
+				.catch(error => {
+					if (error.code === 'ECONNABORTED')
+						this.fetchNonConfirmedActiveAmpeln();
+					else
+						this.$fhcAlert.handleSystemError(error);
+				});
 		},
-		async fetchAllActiveAmpeln() {
-			await this.$fhcApi.factory.ampeln.all().then(res => {
-				this.allAmpeln = res.data.sort((a,b) => new Date(b.deadline) - new Date(a.deadline));
-			}); 
+		fetchAllActiveAmpeln() {
+			this.$fhcApi.factory
+				.ampeln.all()
+				.then(res => {
+					this.allAmpeln = res.data;
+				})
+				.catch(error => {
+					if (error.code === 'ECONNABORTED')
+						this.fetchAllActiveAmpeln();
+					else
+						this.$fhcAlert.handleSystemError(error);
+				});
+
 		},
 		async confirm(ampelId) {
-			this.$fhcApi.factory.ampeln.confirm(ampelId)
-			.then(() => {
-				this.$fhcAlert.alertSuccess(this.$p.t('ampeln','ampelBestaetigt'));
-			})
-			.catch(this.$fhcAlert.handleSystemError);
-
-			// update the ampeln by refetching them
-			this.fetchNonConfirmedActiveAmpeln();
-			this.fetchAllActiveAmpeln();
+			this.$fhcApi.factory
+				.ampeln.confirm(ampelId)
+				.then(() => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ampeln', 'ampelBestaetigt'));
+					// update the ampeln by refetching them
+					this.fetchNonConfirmedActiveAmpeln();
+					this.fetchAllActiveAmpeln();
+				})
+				.catch(this.$fhcAlert.handleSystemError);
 		},
 		validateBtnTxt(buttontext) {
-			if (buttontext instanceof Array && !buttontext.length) return this.$p.t('ui','bestaetigen');
+			if (buttontext instanceof Array && !buttontext.length) return this.$p.t('ui', 'bestaetigen');
 
 			if (!buttontext) return this.$p.t('ui', 'bestaetigen');
 
@@ -99,148 +122,152 @@ export default {
 		}
 	},
 	created() {
-		this.$emit('setConfig', false);    
+		this.$emit('setConfig', false);
 	},
 	async mounted() {
-		await this.fetchNonConfirmedActiveAmpeln();
-		await this.fetchAllActiveAmpeln();
+		if (!this.configMode) {
+			this.fetchNonConfirmedActiveAmpeln();
+			this.fetchAllActiveAmpeln();
+		}
 	},
 	template: /*html*/`
 	<div class="widgets-ampel w-100 h-100">
-		<div v-if="activeAmpeln" class="d-flex flex-column justify-content-between">
-			<div class="d-flex">
-				<header class="me-auto"><b>{{$p.t('ampeln', 'newestAmpeln')}}</b></header>
-				<div class="mb-2 text-danger">
-					<a href="#allAmpelOffcanvas" data-bs-toggle="offcanvas">
-						{{$p.t('ampeln', 'allAmpeln')}}
+		<div  v-if="!configMode">
+			<div v-if="activeAmpeln" class="d-flex flex-column justify-content-between">
+				<div class="d-flex">
+					<header class="me-auto"><b>{{$p.t('ampeln', 'newestAmpeln')}}</b></header>
+					<div class="mb-2 text-danger">
+						<a :href="'#allAmpelOffcanvas' + idcounter" data-bs-toggle="offcanvas">
+							{{$p.t('ampeln', 'allAmpeln')}}
+						</a>
+					</div>
+				</div>
+				<div class="d-flex justify-content-end">
+					<a v-if="count.ueberfaellig > 0" :href="'#allAmpelOffcanvas' + idcounter" data-bs-toggle="offcanvas" @click="filter = 'ueberfaellig'" class="text-decoration-none">
+						<span class="badge bg-danger me-1">
+							<i class="fa fa-solid fa-bolt"></i> {{$p.t('ampeln','overdue')}}: <b>{{ count.ueberfaellig }}</b>
+						</span>
 					</a>
 				</div>
-			</div>
-			<div class="d-flex justify-content-end">
-				<a v-if="count.ueberfaellig > 0" href="#allAmpelOffcanvas" data-bs-toggle="offcanvas" @click="filter = 'ueberfaellig'" class="text-decoration-none">
-					<span class="badge bg-danger me-1">
-						<i class="fa fa-solid fa-bolt"></i> {{$p.t('ampeln','overdue')}}: <b>{{ count.ueberfaellig }}</b>
-					</span>
-				</a>
-			</div>
-			<div v-for="ampel in ampelnOverview" :key="ampel.ampel_id" class="mt-2">
-				<div class="card">
-					<div class="card-body">
-						<div class="position-relative">
-							<div class="d-flex">
-								<div class="text-muted small me-auto"><small>{{$p.t('ampeln','deadline')}}: {{ getDate(ampel.deadline) }}</small></div>
-								<div v-if="(new Date() > new Date(ampel.deadline)) && !ampel.bestaetigt "><span class="badge bg-danger"><i class="fa fa-solid fa-bolt"></i></span></div>
-								<div v-if="ampel.verpflichtend"><span class="badge bg-warning ms-1"><i class="fa fa-solid fa-triangle-exclamation"></i></span></div>
-								<div v-if="ampel.bestaetigt"><span class="badge bg-success ms-1"><i class="fa fa-solid fa-circle-check"></i></span></div>
+				<div v-for="ampel in ampelnOverview" :key="ampel.ampel_id" class="mt-2">
+					<div class="card">
+						<div class="card-body">
+							<div class="position-relative">
+								<div class="d-flex">
+									<div class="text-muted small me-auto"><small>{{$p.t('ampeln','deadline')}}: {{ getDate(ampel.deadline) }}</small></div>
+									<div v-if="(new Date() > new Date(ampel.deadline)) && !ampel.bestaetigt "><span class="badge bg-danger"><i class="fa fa-solid fa-bolt"></i></span></div>
+									<div v-if="ampel.verpflichtend"><span class="badge bg-warning ms-1"><i class="fa fa-solid fa-triangle-exclamation"></i></span></div>
+									<div v-if="ampel.bestaetigt"><span class="badge bg-success ms-1"><i class="fa fa-solid fa-circle-check"></i></span></div>
+								</div>
 							</div>
+							<a :href="'#allAmpelOffcanvas' + idcounter" data-bs-toggle="offcanvas" class="stretched-link" @click="openOffcanvasAmpel(ampel.ampel_id)">{{ ampel.kurzbz }}</a><br>
 						</div>
-						<a href="#allAmpelOffcanvas" data-bs-toggle="offcanvas" class="stretched-link" @click="openOffcanvasAmpel(ampel.ampel_id)">{{ ampel.kurzbz }}</a><br>
 					</div>
 				</div>
-			</div>
 
-			<div v-if="activeAmpeln.length == 0" class="card card-body mt-4 p-4 text-center">
-				<span class="text-success h2"><i class="fa fa-solid fa-circle-check"></i></span>
-				<span class="text-success h5">{{$p.t('ampeln','super')}}</span><br>
-				<span class="small">{{$p.t('ampeln','noOpenAmpeln')}}</span>
+				<div v-if="activeAmpeln.length == 0" class="card card-body mt-4 p-4 text-center">
+					<span class="text-success h2"><i class="fa fa-solid fa-circle-check"></i></span>
+					<span class="text-success h5">{{$p.t('ampeln','super')}}</span><br>
+					<span class="small">{{$p.t('ampeln','noOpenAmpeln')}}</span>
+				</div>
+			</div>
+			<div v-else>
+				<header class="me-auto"><b>{{$p.t('ampeln', 'newestAmpeln')}} </b></header>
+				<template v-for="n in WIDGET_AMPEL_MAX">
+					<div class="mt-2 card" aria-hidden="true">
+						<div class="card-body">
+							<p class="card-text placeholder-glow">
+								<span class="placeholder col-7"></span>
+								<span class="placeholder col-12"></span>
+							</p>
+						</div>
+					</div>
+				</template>
 			</div>
 		</div>
-		<div v-else>
-			<header class="me-auto"><b>{{$p.t('ampeln', 'newestAmpeln')}} </b></header>
-			<template v-for="n in WIDGET_AMPEL_MAX">
-				<div class="mt-2 card" aria-hidden="true">
-					<div class="card-body">
-						<p class="card-text placeholder-glow">
-							<span class="placeholder col-7"></span>
-							<span class="placeholder col-12"></span>
-						</p>
+
+		<!-- All Ampeln Offcanvas -->
+		<BaseOffcanvas v-if="!configMode" :id="'allAmpelOffcanvas' + idcounter" :closeFunc="closeOffcanvas">
+			<template #title><header><b>{{$p.t('ampeln','allMyAmpeln')}}</b></header></template>
+			<template #body>
+				<div class="d-flex justify-content-evenly">
+					<div class="form-check form-check-inline form-control-sm">
+						<input class="form-check-input" type="radio" v-model="source" :id="'offen' + idcounter" value="offen">
+						<label class="form-check-label" :for="'offen' + idcounter">{{$p.t('ampeln','openAmpeln')}}</label>
 					</div>
+					<div class="form-check form-check-inline form-control-sm">
+						<input class="form-check-input" type="radio" v-model="source" :id="'alle' + idcounter" value="alle" >
+						<label class="form-check-label" :for="'alle' + idcounter">{{$p.t('ampeln','allAmpeln')}}</label>
+					</div>
+				</div>
+				<div class="col">
+					<button class="btn btn-light w-100" @click="filter = ''">
+						<small :class="{'fw-bold':filter===''}">{{$p.t('ui','alle')}}: <b>{{ count.alle }}</b></small>
+					</button>
+				</div>
+				<div class="row row-cols-2 g-2 mt-1">
+					<div class="col">
+						<button class="btn btn-danger w-100"  @click="toggleFilter('ueberfaellig')">
+							<i class="fa fa-solid fa-bolt me-2"></i>
+							<small :class="{'fw-bold':filter==='ueberfaellig'}">
+								{{$p.t('ampeln','overdue')}}: <b>{{ count.ueberfaellig }}</b>
+							</small>
+						</button>
+					</div>
+					<div class="col">
+						<button class="btn btn-warning w-100" @click="toggleFilter('verpflichtend')">
+							<i class="fa fa-solid fa-triangle-exclamation me-2"></i>
+							<small :class="{'fw-bold':filter==='verpflichtend'}" >
+								{{$p.t('ampeln','mandatory')}}: <b>{{ count.verpflichtend }}</b>
+							</small>
+						</button>
+					</div>
+				</div>
+				<div v-for="ampel in ampelnComputed" :key="ampel.ampel_id" class="mt-2">
+					<ul class="list-group">
+						<li class="list-group-item small">
+							<div class="position-relative">
+								<!-- prevents streched-link from stretching outside this parent element -->
+								<div class="d-flex">
+									<span class="small text-muted me-auto">
+										<small>
+											{{$p.t('ampeln','deadline')}}: {{ getDate(ampel.deadline) }}
+										</small>
+									</span>
+									<div v-if="(new Date() > new Date(ampel.deadline)) && !ampel.bestaetigt">
+										<span class="badge bg-danger">
+											<i class="fa fa-solid fa-bolt"></i>
+										</span>
+									</div>
+									<div v-if="ampel.verpflichtend">
+										<span class="badge bg-warning ms-1">
+											<i class="fa fa-solid fa-triangle-exclamation"></i>
+										</span>
+									</div>
+									<div v-if="ampel.bestaetigt">
+										<span class="badge bg-success ms-1">
+											<i class="fa fa-solid fa-circle-check"></i>
+										</span>
+									</div>
+								</div>
+								<a :href="'#ampelCollapse' + idcounter + '_' + ampel.ampel_id" data-bs-toggle="collapse" class="stretched-link">
+									{{ ampel.kurzbz }}
+								</a>
+								<br>
+							</div>
+							<div class="collapse my-3" :id="'ampelCollapse' + idcounter + '_' + ampel.ampel_id" :ref="'ampelCollapse_' + ampel.ampel_id">
+								<div v-html="ampel.beschreibung_trans"></div>
+								<div v-if="!ampel.bestaetigt " class="d-flex justify-content-end mt-3">
+									<button class="btn btn-sm btn-primary" :class="{disabled: ampel.bestaetigt}" @click="confirm(ampel.ampel_id)">
+										{{ validateBtnTxt(ampel.buttontext_trans) }}
+									</button>
+								</div>
+							</div>
+						</li>
+					</ul>
 				</div>
 			</template>
-		</div>
-	</div>
-
-	<!-- All Ampeln Offcanvas -->
-	<BaseOffcanvas id="allAmpelOffcanvas" :closeFunc="closeOffcanvas">
-		<template #title><header><b>{{$p.t('ampeln','allMyAmpeln')}}</b></header></template>
-		<template #body>
-			<div class="d-flex justify-content-evenly">
-				<div class="form-check form-check-inline form-control-sm">
-					<input class="form-check-input" type="radio" v-model="source" id="offen" value="offen"  checked>
-					<label class="form-check-label" for="offen">{{$p.t('ampeln','openAmpeln')}}</label>
-				</div>
-				<div class="form-check form-check-inline form-control-sm">
-					<input class="form-check-input" type="radio" v-model="source" id="alle" value="alle" >
-					<label class="form-check-label" for="alle">{{$p.t('ampeln','allAmpeln')}}</label>
-				</div>
-			</div>
-			<div class="col">
-				<button class="btn btn-light w-100" @click="filter = ''">
-					<small>{{$p.t('ui','alle')}}: <b>{{ count.alle }}</b></small>
-				</button>
-			</div>
-			<div class="row row-cols-2 g-2 mt-1">
-				<div class="col">
-					<button class="btn btn-danger w-100"  @click="toggleFilter('ueberfaellig')">
-						<i class="fa fa-solid fa-bolt me-2"></i>
-						<small :class="{'text-decoration-underline':filter==='ueberfaellig', 'fw-bold':filter==='ueberfaellig'}">
-							{{$p.t('ampeln','overdue')}}: <b>{{ count.ueberfaellig }}</b>
-						</small>
-					</button>
-				</div>
-				<div class="col">
-					<button class="btn btn-warning w-100" @click="toggleFilter('verpflichtend')">
-						<i class="fa fa-solid fa-triangle-exclamation me-2"></i>
-						<small :class="{'text-decoration-underline':filter==='verpflichtend', 'fw-bold':filter==='verpflichtend'}" >
-							{{$p.t('ampeln','mandatory')}}: <b>{{ count.verpflichtend }}</b>
-						</small>
-					</button>
-				</div>
-			</div>
-			<div v-for="ampel in ampelnComputed" :key="ampel.ampel_id" class="mt-2">
-				<ul class="list-group">
-					<li class="list-group-item small">
-						<div class="position-relative">
-							<!-- prevents streched-link from stretching outside this parent element -->
-							<div class="d-flex">
-								<span class="small text-muted me-auto">
-									<small>
-										{{$p.t('ampeln','deadline')}}: {{ getDate(ampel.deadline) }}
-									</small>
-								</span>
-								<div v-if="(new Date() > new Date(ampel.deadline)) && !ampel.bestaetigt">
-									<span class="badge bg-danger">
-										<i class="fa fa-solid fa-bolt"></i>
-									</span>
-								</div>
-								<div v-if="ampel.verpflichtend">
-									<span class="badge bg-warning ms-1">
-										<i class="fa fa-solid fa-triangle-exclamation"></i>
-									</span>
-								</div>
-								<div v-if="ampel.bestaetigt">
-									<span class="badge bg-success ms-1">
-										<i class="fa fa-solid fa-circle-check"></i>
-									</span>
-								</div>
-							</div>
-							<a :href="'#ampelCollapse_' + ampel.ampel_id" data-bs-toggle="collapse" class="stretched-link">
-								{{ ampel.kurzbz }}
-							</a>
-							<br>
-						</div>
-						<div class="collapse my-3" :id="'ampelCollapse_' + ampel.ampel_id" :ref="'ampelCollapse_' + ampel.ampel_id">
-							<div v-html="ampel.beschreibung_trans"></div>
-							<div v-if="!ampel.bestaetigt " class="d-flex justify-content-end mt-3">
-								<button  class="btn btn-sm btn-primary" :class="{disabled: ampel.bestaetigt}" @click="confirm(ampel.ampel_id)">
-									{{ validateBtnTxt(ampel.buttontext_trans) }}
-								</button>
-							</div>
-						</div>
-					</li>
-				</ul>
-			</div>
-		</template>
-	</BaseOffcanvas>`
+		</BaseOffcanvas>
+	</div>`
 }
 

From 05e0d219f434941fd3ca375b07789f1df268af75 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 7 Aug 2024 14:32:44 +0200
Subject: [PATCH 1097/1461] Codequality

---
 .../controllers/api/frontend/v1/Ampeln.php    | 141 +++++++++---------
 1 file changed, 67 insertions(+), 74 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Ampeln.php b/application/controllers/api/frontend/v1/Ampeln.php
index 6bba658b7..5560d1c69 100644
--- a/application/controllers/api/frontend/v1/Ampeln.php
+++ b/application/controllers/api/frontend/v1/Ampeln.php
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-if (! defined('BASEPATH')) exit('No direct script access allowed');
+if (!defined('BASEPATH')) exit('No direct script access allowed');
 
 class Ampeln extends FHCAPI_Controller
 {
@@ -28,125 +28,118 @@ class Ampeln extends FHCAPI_Controller
 	{
 		parent::__construct([
 			'open' => self::PERM_LOGGED,
-            'all' => self::PERM_LOGGED,
-            'confirm' => self::PERM_LOGGED,
-            'alleAmpeln' => self::PERM_LOGGED,
+			'all' => self::PERM_LOGGED,
+			'confirm' => self::PERM_LOGGED,
+			'alleAmpeln' => self::PERM_LOGGED,
 		]);
 
 		$this->load->model('content/Ampel_model', 'AmpelModel');
-        $this->load->model('system/Sprache_model','SpracheModel');
+		$this->load->model('system/Sprache_model', 'SpracheModel');
 
 		$this->uid = getAuthUID();
 		$this->pid = getAuthPersonID();
-
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods
 
-    /**
+	/**
 	 * confirms ampel and inserts ampel_id in public.tbl_ampel_benutzer_bestaetigt
-     * @access public
-	 * 
+	 * @access public
+	 *
 	 */
 	public function confirm($ampel_id)
 	{
-        $this->load->library('form_validation');
-        $this->form_validation->set_data(['ampel_id'=> $ampel_id]);
-        $this->form_validation->set_rules('ampel_id', 'Ampel ID', 'required|integer');
-        if($this->form_validation->run() == FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
+		$this->load->library('form_validation');
+		$this->form_validation->set_data(['ampel_id'=> $ampel_id]);
+		$this->form_validation->set_rules('ampel_id', 'Ampel ID', 'required|integer');
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
 
 		// load Ampel_benutzer_bestaetigt_model to confirm the ampel
 		$this->load->model('content/Ampel_Benutzer_Bestaetigt_model', 'AmpelBenutzerBestaetigtModel');
-        $insert_into_result = $this->AmpelBenutzerBestaetigtModel->insert(["ampel_id"=> $ampel_id, "uid"=> $this->uid]);
+		$insert_into_result = $this->AmpelBenutzerBestaetigtModel->insert(["ampel_id"=> $ampel_id, "uid"=> $this->uid]);
 
-        $insert_into_result = $this->getDataOrTerminateWithError($insert_into_result);
+		$insert_into_result = $this->getDataOrTerminateWithError($insert_into_result);
 
-        $this->terminateWithSuccess($insert_into_result);
-    }
+		$this->terminateWithSuccess($insert_into_result);
+	}
 	
-    /**
-	 * queries active and not confirmed ampeln by the user 
-     * @access public
-	 * 
+	/**
+	 * queries active and not confirmed ampeln by the user
+	 * @access public
+	 *
 	 */
 	public function open()
 	{
-        $userAmpeln = array();
+		$userAmpeln = array();
 
-        // fetch active ampeln
-        $activeAmpeln = $this->AmpelModel->active(false, $this->uid);
+		// fetch active ampeln
+		$activeAmpeln = $this->AmpelModel->active(false, $this->uid);
 		
-        $activeAmpeln = $this->getDataOrTerminateWithError($activeAmpeln);
+		$activeAmpeln = $this->getDataOrTerminateWithError($activeAmpeln);
 
-		foreach($activeAmpeln as $ampel){
-			
+		foreach ($activeAmpeln as $ampel) {
 			// only include non confirmed active ampeln in the result
-            if(!$ampel->bestaetigt){
-                
-                // check if the user was assigned to the ampel
-                $zugeteilt = $this->AmpelModel->isZugeteilt($this->uid, $ampel->benutzer_select);
+			if (!$ampel->bestaetigt) {
+				// check if the user was assigned to the ampel
+				$zugeteilt = $this->AmpelModel->isZugeteilt($this->uid, $ampel->benutzer_select);
 
-                $zugeteilt = $this->getDataOrTerminateWithError($zugeteilt);
+				$zugeteilt = $this->getDataOrTerminateWithError($zugeteilt);
 
-                if($zugeteilt) $userAmpeln[] = $ampel;
-            }
-        }
-        
-        $this->terminateWithSuccess($userAmpeln);
+				if($zugeteilt) $userAmpeln[] = $ampel;
+			}
+		}
+		
+		$this->terminateWithSuccess($userAmpeln);
 	}
 
-    /**
-	 * queries all ampeln of the user 
-     * @access public
-	 * 
+	/**
+	 * queries all ampeln of the user
+	 * @access public
+	 *
 	 */
-    public function all()
+	public function all()
 	{
-        $userAmpeln = array();
-        
-        $ampel_result = $this->AmpelModel->active(false, $this->uid);
+		$userAmpeln = array();
+		
+		$ampel_result = $this->AmpelModel->active(false, $this->uid);
 		
 		$ampel_result = $this->getDataOrTerminateWithError($ampel_result);
-        
-        foreach($ampel_result as $ampel){
-            
-            // check if the ampel was assigned to the user
-            $zugeteilt = $this->AmpelModel->isZugeteilt($this->uid, $ampel->benutzer_select);
+		
+		foreach ($ampel_result as $ampel) {
+			// check if the ampel was assigned to the user
+			$zugeteilt = $this->AmpelModel->isZugeteilt($this->uid, $ampel->benutzer_select);
 
-            $zugeteilt = $this->getDataOrTerminateWithError($zugeteilt);
+			$zugeteilt = $this->getDataOrTerminateWithError($zugeteilt);
 
-            if($zugeteilt) $userAmpeln[] = $ampel;    
-        }
+			if ($zugeteilt) $userAmpeln[] = $ampel;
+		}
 
-        $this->terminateWithSuccess($userAmpeln);
+		$this->terminateWithSuccess($userAmpeln);
 	}
 
-    /**
+	/**
 	 * queries all ampeln that were assigned to the user until start of first work day
-     * @access public
-	 * 
+	 * @access public
+	 *
 	 */
-    public function alleAmpeln(){
+	public function alleAmpeln()
+	{
 
-        //fetch all ampeln
-        $alle_ampeln = $this->AmpelModel->alleAmpeln($this->uid);
+		//fetch all ampeln
+		$alle_ampeln = $this->AmpelModel->alleAmpeln($this->uid);
 
-        $alle_ampeln = $this->getDataOrTerminateWithError($alle_ampeln);
+		$alle_ampeln = $this->getDataOrTerminateWithError($alle_ampeln);
 
-        $alle_ampeln = array_map(function($ampel){ 
-            // check if ampel is confirmed by user
-            $confirmedByUser = $this->AmpelModel->isConfirmed($ampel->ampel_id,$this->uid);
-            $ampel->bestaetigt = $confirmedByUser;
-            return $ampel;
-        }, $alle_ampeln);
+		$alle_ampeln = array_map(function ($ampel) {
+			// check if ampel is confirmed by user
+			$confirmedByUser = $this->AmpelModel->isConfirmed($ampel->ampel_id, $this->uid);
+			$ampel->bestaetigt = $confirmedByUser;
+			return $ampel;
+		}, $alle_ampeln);
 
-        $this->terminateWithSuccess($alle_ampeln);
-
-    }
-
-
-
-    
+		$this->terminateWithSuccess($alle_ampeln);
+	}
 }
 

From 3f86961bdaaaa38871febd51fbf9273b3b6bbc5e Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 7 Aug 2024 15:21:22 +0200
Subject: [PATCH 1098/1461] adds parameter to ampeln deadline/overdue phrase

---
 application/helpers/hlp_return_object_helper.php |  7 +++----
 public/js/components/DashboardWidget/Ampel.js    |  8 ++++----
 system/phrasesupdate.php                         | 10 +++++-----
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/application/helpers/hlp_return_object_helper.php b/application/helpers/hlp_return_object_helper.php
index 4db5eb9e3..602008d3b 100755
--- a/application/helpers/hlp_return_object_helper.php
+++ b/application/helpers/hlp_return_object_helper.php
@@ -25,11 +25,10 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 /**
  * Used to create a return object, should not be used directly
- * @return  stdClass
+ * @return stdClass
  */
 function _createReturnObject($code, $error, $retval)
 {
-	
 	$returnObject = new stdClass();
 	$returnObject->code = $code;
 	$returnObject->error = $error;
@@ -41,7 +40,7 @@ function _createReturnObject($code, $error, $retval)
 /**
  * Success
  *
- * @return  stdClass
+ * @return stdClass
  */
 function success($retval = null, $code = null)
 {
@@ -51,7 +50,7 @@ function success($retval = null, $code = null)
 /**
  * Error
  *
- * @return  stdClass
+ * @return stdClass
  */
 function error($retval = null, $code = null)
 {
diff --git a/public/js/components/DashboardWidget/Ampel.js b/public/js/components/DashboardWidget/Ampel.js
index 9ec65fa14..be5db43ea 100755
--- a/public/js/components/DashboardWidget/Ampel.js
+++ b/public/js/components/DashboardWidget/Ampel.js
@@ -145,7 +145,7 @@ export default {
 				<div class="d-flex justify-content-end">
 					<a v-if="count.ueberfaellig > 0" :href="'#allAmpelOffcanvas' + idcounter" data-bs-toggle="offcanvas" @click="filter = 'ueberfaellig'" class="text-decoration-none">
 						<span class="badge bg-danger me-1">
-							<i class="fa fa-solid fa-bolt"></i> {{$p.t('ampeln','overdue')}}: <b>{{ count.ueberfaellig }}</b>
+							<i class="fa fa-solid fa-bolt"></i> {{$p.t('ampeln','overdue',{count:count.ueberfaellig})}}
 						</span>
 					</a>
 				</div>
@@ -154,7 +154,7 @@ export default {
 						<div class="card-body">
 							<div class="position-relative">
 								<div class="d-flex">
-									<div class="text-muted small me-auto"><small>{{$p.t('ampeln','deadline')}}: {{ getDate(ampel.deadline) }}</small></div>
+									<div class="text-muted small me-auto"><small>{{$p.t('ampeln','ampelnDeadline',{value:getDate(ampel.deadline)})}}</small></div>
 									<div v-if="(new Date() > new Date(ampel.deadline)) && !ampel.bestaetigt "><span class="badge bg-danger"><i class="fa fa-solid fa-bolt"></i></span></div>
 									<div v-if="ampel.verpflichtend"><span class="badge bg-warning ms-1"><i class="fa fa-solid fa-triangle-exclamation"></i></span></div>
 									<div v-if="ampel.bestaetigt"><span class="badge bg-success ms-1"><i class="fa fa-solid fa-circle-check"></i></span></div>
@@ -210,7 +210,7 @@ export default {
 						<button class="btn btn-danger w-100"  @click="toggleFilter('ueberfaellig')">
 							<i class="fa fa-solid fa-bolt me-2"></i>
 							<small :class="{'fw-bold':filter==='ueberfaellig'}">
-								{{$p.t('ampeln','overdue')}}: <b>{{ count.ueberfaellig }}</b>
+								{{$p.t('ampeln','overdue',{count:count.ueberfaellig})}}
 							</small>
 						</button>
 					</div>
@@ -231,7 +231,7 @@ export default {
 								<div class="d-flex">
 									<span class="small text-muted me-auto">
 										<small>
-											{{$p.t('ampeln','deadline')}}: {{ getDate(ampel.deadline) }}
+											{{$p.t('ampeln','ampelnDeadline',{value:getDate(ampel.deadline)})}}
 										</small>
 									</span>
 									<div v-if="(new Date() > new Date(ampel.deadline)) && !ampel.bestaetigt">
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 9182de60a..b22e6c8cf 100755
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -27539,13 +27539,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Überfällig',
+				'text' => 'Überfällig: {count}',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Overdue',
+				'text' => 'Overdue: {count}',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -27554,18 +27554,18 @@ array(
 	array(
 		'app' => 'core',
 		'category' => 'ampeln',
-		'phrase' => 'deadline',
+		'phrase' => 'ampelnDeadline',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Stichtag',
+				'text' => 'Stichtag: {value}',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Deadline',
+				'text' => 'Deadline: {value}',
 				'description' => '',
 				'insertvon' => 'system'
 			)

From 1fc7f9d3e8decd60fea15b0a85b7c7b93aa0719d Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 7 Aug 2024 15:37:43 +0200
Subject: [PATCH 1099/1461] correct checkIfExistingBewerberstatus

---
 .../api/frontend/v1/stv/Status.php            | 11 -----
 .../libraries/PrestudentstatusCheckLib.php    |  9 ++--
 .../models/crm/Prestudentstatus_model.php     | 42 -------------------
 3 files changed, 5 insertions(+), 57 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 24e1dd5ae..8a7588897 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -17,7 +17,6 @@ class Status extends FHCAPI_Controller
 			'getStatusgruende' => self::PERM_LOGGED,
 			'getLastBismeldestichtag' => self::PERM_LOGGED,
 			'isLastStatus' => self::PERM_LOGGED,
-			'hasStatusBewerber' => self::PERM_LOGGED,
 			'getStatusarray' => self::PERM_LOGGED,
 			'deleteStatus' => ['admin:rw','assistenz:rw'],
 			'loadStatus' => ['admin:r', 'assistenz:r'],
@@ -129,16 +128,6 @@ class Status extends FHCAPI_Controller
 		return $this->terminateWithSuccess($result);
 	}
 
-	public function hasStatusBewerber($prestudent_id)
-	{
-		$result = $this->prestudentstatuschecklib->checkIfExistingBewerberstatus($prestudent_id);
-		if (isError($result))
-		{
-			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-		return $this->terminateWithSuccess($result);
-	}
-
 	public function getStudiensemesterOfStatus($prestudent_id, $status)
 	{
 		$result = $this->PrestudentstatusModel->loadWhere([
diff --git a/application/libraries/PrestudentstatusCheckLib.php b/application/libraries/PrestudentstatusCheckLib.php
index 56739e567..d9b77fdf5 100644
--- a/application/libraries/PrestudentstatusCheckLib.php
+++ b/application/libraries/PrestudentstatusCheckLib.php
@@ -199,13 +199,14 @@ class PrestudentstatusCheckLib
 	 */
 	public function checkIfExistingBewerberstatus($prestudent_id)
 	{
-		$result =  $this->_ci->PrestudentstatusModel->checkIfExistingBewerberstatus(
-			$prestudent_id
-		);
+		$result =  $this->_ci->PrestudentstatusModel->loadWhere([
+			'prestudent_id' => $prestudent_id,
+			'status_kurzbz' => Prestudentstatus_model::STATUS_BEWERBER
+		]);
 		if (isError($result))
 			return $result;
 
-		return success(getData($result) != '0');
+		return success(hasData($result));
 	}
 
 
diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php
index 37b6c6762..5093019bb 100644
--- a/application/models/crm/Prestudentstatus_model.php
+++ b/application/models/crm/Prestudentstatus_model.php
@@ -408,48 +408,6 @@ class Prestudentstatus_model extends DB_Model
 		}
 	}
 
-	/**
-	 * Check if Rolle there is an existing Bewerberstatus
-	 * @param integer $prestudent_id
-	 * @return error if no bewerberstatus, success if existing
-	 */
-	public function checkIfExistingBewerberstatus($prestudent_id)
-	{
-		$studentName = '';
-
-		$nameRes = $this->PersonModel->loadPrestudent($prestudent_id);
-
-		if (hasData($nameRes))
-		{
-			$nameData = getData($nameRes)[0];
-			$studentName = $nameData->vorname.' '.$nameData->nachname;
-		}
-
-		$qry = "SELECT
-					*
-				FROM
-				    public.tbl_prestudentstatus
-				WHERE
-					prestudent_id = ?
-				AND
-				    status_kurzbz = 'Bewerber'";
-
-		$result = $this->execQuery($qry, array($prestudent_id));
-
-		if (isError($result))
-		{
-			return error($result);
-		}
-		elseif (!hasData($result))
-		{
-			return success("0", $this->p->t('lehre', 'error_keinBewerber', ['name' => $studentName]));
-		}
-		else
-		{
-			return success($result);
-		}
-	}
-
 	/**
 	 * Check if Rolle there is an existing Aufgenommenerstatus
 	 * @param integer $prestudent_id

From 0621073f8d14f37d80467915e8b7347748ba37ce Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 7 Aug 2024 15:40:11 +0200
Subject: [PATCH 1100/1461] correct checkIfExistingAufgenommenerstatus

---
 .../libraries/PrestudentstatusCheckLib.php    | 16 +++----
 .../models/crm/Prestudentstatus_model.php     | 42 -------------------
 2 files changed, 8 insertions(+), 50 deletions(-)

diff --git a/application/libraries/PrestudentstatusCheckLib.php b/application/libraries/PrestudentstatusCheckLib.php
index d9b77fdf5..b14542e8f 100644
--- a/application/libraries/PrestudentstatusCheckLib.php
+++ b/application/libraries/PrestudentstatusCheckLib.php
@@ -219,14 +219,14 @@ class PrestudentstatusCheckLib
 	 */
 	public function checkIfExistingAufgenommenerstatus($prestudent_id)
 	{
-		$result =  $this->_ci->PrestudentstatusModel->checkIfExistingAufgenommenerstatus(
-			$prestudent_id
-		);
-		if(isError($result))
-		{
-			return getData($result);
-		}
-		return success(getData($result) != '0');
+		$result =  $this->_ci->PrestudentstatusModel->loadWhere([
+			'prestudent_id' => $prestudent_id,
+			'status_kurzbz' => Prestudentstatus_model::STATUS_AUFGENOMMENER
+		]);
+		if (isError($result))
+			return $result;
+
+		return success(hasData($result));
 	}
 
 	/**
diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php
index 5093019bb..1695d5b02 100644
--- a/application/models/crm/Prestudentstatus_model.php
+++ b/application/models/crm/Prestudentstatus_model.php
@@ -408,48 +408,6 @@ class Prestudentstatus_model extends DB_Model
 		}
 	}
 
-	/**
-	 * Check if Rolle there is an existing Aufgenommenerstatus
-	 * @param integer $prestudent_id
-	 * @return error if no status Aufgenommener, success if existing
-	 */
-	public function checkIfExistingAufgenommenerstatus($prestudent_id)
-	{
-		$studentName = '';
-
-		$nameRes = $this->PersonModel->loadPrestudent($prestudent_id);
-
-		if (hasData($nameRes))
-		{
-			$nameData = getData($nameRes)[0];
-			$studentName = $nameData->vorname.' '.$nameData->nachname;
-		}
-
-		$qry = "SELECT
-					*
-				FROM
-				    public.tbl_prestudentstatus
-				WHERE
-					prestudent_id = ?
-				AND
-				    status_kurzbz = 'Aufgenommener'";
-
-		$result = $this->execQuery($qry, array($prestudent_id));
-
-		if (isError($result))
-		{
-			return error($result);
-		}
-		elseif (!hasData($result))
-		{
-			return success("0", $this->p->t('lehre', 'error_keinAufgenommener', ['name' => $studentName]));
-		}
-		else
-		{
-			return success($result);
-		}
-	}
-
 	/**
 	 * Check if there is only one prestudentstatus left
 	 *

From ba2c450bd27e072fbe576156072e8b9c8e155095 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 7 Aug 2024 15:43:20 +0200
Subject: [PATCH 1101/1461] uses the codeigniter querybuilder to construct the
 active ampeln query

---
 .../controllers/api/frontend/v1/Ampeln.php    |  2 +-
 application/models/content/Ampel_model.php    | 74 ++++++++++++++-----
 2 files changed, 57 insertions(+), 19 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Ampeln.php b/application/controllers/api/frontend/v1/Ampeln.php
index 5560d1c69..e0ffb4df5 100644
--- a/application/controllers/api/frontend/v1/Ampeln.php
+++ b/application/controllers/api/frontend/v1/Ampeln.php
@@ -75,7 +75,7 @@ class Ampeln extends FHCAPI_Controller
 		$userAmpeln = array();
 
 		// fetch active ampeln
-		$activeAmpeln = $this->AmpelModel->active(false, $this->uid);
+		$activeAmpeln = $this->AmpelModel->openActive($this->uid, false);
 		
 		$activeAmpeln = $this->getDataOrTerminateWithError($activeAmpeln);
 
diff --git a/application/models/content/Ampel_model.php b/application/models/content/Ampel_model.php
index f5404ecb2..1f6cf9f93 100755
--- a/application/models/content/Ampel_model.php
+++ b/application/models/content/Ampel_model.php
@@ -21,10 +21,10 @@ class Ampel_model extends DB_Model
 	public function active($email = false, $uid = null)
 	{
 		$userLanguage = getUserLanguage();
-
-		$bestaetigt = '';
+		$selectStatement='*,beschreibung[('.$this->getLanguageIndex($this->escape($userLanguage)).')] as beschreibung_trans, buttontext[('.$this->getLanguageIndex($this->escape($userLanguage)).')] as buttontext_trans';
+		
 		if($uid != null ){
-			$bestaetigt = ',
+			$selectStatement .= ',
 				COALESCE((
 				SELECT true
 			  	FROM public.tbl_ampel_benutzer_bestaetigt a
@@ -32,21 +32,59 @@ class Ampel_model extends DB_Model
 			   	AND uid = ' . $this->escape($uid) . ' LIMIT 1), false) as bestaetigt';
 		}
 
-		$parametersArray = [];
-		$query = '
-			SELECT *, beschreibung[('.$this->getLanguageIndex($this->escape($userLanguage)).')] as beschreibung_trans, buttontext[('.$this->getLanguageIndex($this->escape($userLanguage)).')] as buttontext_trans
-			'.$bestaetigt
-			.'
-			FROM public.tbl_ampel
-			WHERE';
-		
-		if ($email === true)
-		{
-			$parametersArray['email'] = $email;
-			$query .= ' email = ? AND';
+		$this->addSelect($selectStatement);
+		$whereStatement='';
+
+		if ($email === true) {
+			$whereStatement .= ' email = '.$this->escape($email).' AND';
 		}
 
-		$query .= '(
+		$whereStatement .=
+		'(
+			(
+				(NOW()<(deadline+(COALESCE(verfallszeit,0) || \' days\')::interval)::date)
+				OR (verfallszeit IS NULL)
+			)
+			AND 
+			(
+				(NOW()>(deadline-(COALESCE(vorlaufzeit,0) || \' days\')::interval)::date)
+			    OR (vorlaufzeit IS NULL AND NOW() < deadline)
+			)
+			)';
+		
+		$this->addOrder('deadline', 'DESC');
+		return $this->loadWhere($whereStatement);
+
+	}
+
+	public function openActive($uid, $email = false)
+	{
+		$userLanguage = getUserLanguage();
+		$selectStatement = '*,beschreibung[(' . $this->getLanguageIndex($this->escape($userLanguage)) . ')] as beschreibung_trans, buttontext[(' . $this->getLanguageIndex($this->escape($userLanguage)) . ')] as buttontext_trans';
+
+		
+		$selectStatement .= ',
+			COALESCE((
+			SELECT true
+			FROM public.tbl_ampel_benutzer_bestaetigt a
+			WHERE a.ampel_id = ' . $this->dbTable . '.ampel_id
+			AND uid = ' . $this->escape($uid) . ' LIMIT 1), false) as bestaetigt';
+
+		$this->addSelect($selectStatement);
+		$whereStatement = '';
+
+		if ($email === true) {
+			$whereStatement .= ' email = ' . $this->escape($email) . ' AND';
+		}
+
+		$whereStatement .=
+			'
+			(COALESCE((
+			SELECT true
+			FROM public.tbl_ampel_benutzer_bestaetigt a
+			WHERE a.ampel_id = ' . $this->dbTable . '.ampel_id
+			AND uid = ' . $this->escape($uid) . ' LIMIT 1), false) = FALSE) AND 
+			(
 			(
 				(NOW()<(deadline+(COALESCE(verfallszeit,0) || \' days\')::interval)::date)
 				OR (verfallszeit IS NULL)
@@ -58,9 +96,9 @@ class Ampel_model extends DB_Model
 			)
 			)';
 
-		$query .= ' ORDER BY deadline DESC';
+		$this->addOrder('deadline', 'DESC');
+		return $this->loadWhere($whereStatement);
 
-		return $this->execQuery($query, $parametersArray);
 	}
 
 	/**

From 24d74dd332a23944208d15e862f082e6e8424137 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 7 Aug 2024 15:51:19 +0200
Subject: [PATCH 1102/1461] correct student check

---
 .../api/frontend/v1/stv/Status.php            |  6 +--
 .../libraries/PrestudentstatusCheckLib.php    | 27 +++---------
 application/models/crm/Student_model.php      | 42 -------------------
 3 files changed, 9 insertions(+), 66 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 8a7588897..b14c38eb8 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -254,7 +254,7 @@ class Status extends FHCAPI_Controller
 					)
 						return true; // Only test if new status is Student
 
-					$result = $this->prestudentstatuschecklib->checkIfExistingStudentRolle($prestudent_id);
+					$result = $this->prestudentstatuschecklib->checkIfExistingStudent($prestudent_id);
 
 					return $this->getDataOrTerminateWithError($result);
 				}],
@@ -1059,7 +1059,7 @@ class Status extends FHCAPI_Controller
 					if ($value != Prestudentstatus_model::STATUS_STUDENT)
 						return true; // Only test if new status is Student
 
-					$result = $this->prestudentstatuschecklib->checkIfExistingStudentRolle($prestudent_id);
+					$result = $this->prestudentstatuschecklib->checkIfExistingStudent($prestudent_id);
 
 					return $this->getDataOrTerminateWithError($result);
 				}]
@@ -1600,7 +1600,7 @@ class Status extends FHCAPI_Controller
 				if ($value != Prestudentstatus_model::STATUS_STUDENT)
 					return true;
 
-				$result = $this->prestudentstatuschecklib->checkIfExistingStudentRolle($prestudent_id);
+				$result = $this->prestudentstatuschecklib->checkIfExistingStudent($prestudent_id);
 
 				return $this->getDataOrTerminateWithError($result);
 			}]
diff --git a/application/libraries/PrestudentstatusCheckLib.php b/application/libraries/PrestudentstatusCheckLib.php
index b14542e8f..e3320de7e 100644
--- a/application/libraries/PrestudentstatusCheckLib.php
+++ b/application/libraries/PrestudentstatusCheckLib.php
@@ -127,20 +127,22 @@ class PrestudentstatusCheckLib
 	}
 
 	/**
-	 * Checks if a student role already exists.
+	 * Checks if a student already exists.
 	 *
 	 * @param integer				$prestudent_id
 	 *
 	 * @return stdClass
 	 */
-	public function checkIfExistingStudentRolle($prestudent_id)
+	public function checkIfExistingStudent($prestudent_id)
 	{
-		$result = $this->_ci->StudentModel->checkIfExistingStudentRolle($prestudent_id);
+		$result = $this->_ci->StudentModel->loadWhere([
+			'prestudent_id' => $prestudent_id
+		]);
 
 		if (isError($result))
 			return $result;
 
-		return success(getData($result) != '0');
+		return success(hasData($result));
 	}
 
 	/**
@@ -229,23 +231,6 @@ class PrestudentstatusCheckLib
 		return success(hasData($result));
 	}
 
-	/**
-	 * Checks if is the first student Status
-	 *
-	 * @param integer				$prestudent_id
-	 *
-	 * @return stdClass
-	 */
-	public function checkIfIsErsterStudent($prestudent_id)
-	{
-		$result = $this->_ci->StudentModel->checkIfExistingStudentRolle($prestudent_id);
-
-		if (isError($result))
-			return $result;
-
-		return success(getData($result) == '0');
-	}
-
 	/**
 	 * Check if Bismeldestichtag erreicht
 	 *
diff --git a/application/models/crm/Student_model.php b/application/models/crm/Student_model.php
index 023751f7c..fec72cbfc 100644
--- a/application/models/crm/Student_model.php
+++ b/application/models/crm/Student_model.php
@@ -230,46 +230,4 @@ class Student_model extends DB_Model
 	{
 		return $student_uid . '@' . DOMAIN;
 	}
-
-	/**
-	 * Check if StudentenRolle already exists
-	 * @param integer $prestudent_id
-	 * @return 0 if not exists, count(rollen) if it does
-	 * Copy from studentDBDML.php
-	 */
-	public function checkIfExistingStudentRolle($prestudent_id)
-	{
-		$qry = "SELECT 
-    				count(*) as anzahl 
-				FROM 
-				    public.tbl_student 
-				WHERE 
-				    prestudent_id = ? ";
-
-		$result = $this->execQuery($qry, array($prestudent_id));
-
-		if (isError($result))
-		{
-			return error($result);
-		}
-		else
-		{
-			$resultObject = current(getData($result));
-
-			if (property_exists($resultObject, 'anzahl')) {
-				$resultValue = (int)$resultObject->anzahl;
-
-				if ($resultValue > 0)
-				{
-					return success($resultValue, $resultValue . " vorhandene Rollen");
-				}
-				else
-				{
-					return success("0");
-				}
-			} else {
-				return error("StudentModel: Error During Check if Existing Student Rolle.");
-			}
-		}
-	}
 }

From 59314ae0aad34c5e1d84167ae2d565dce37f1ee2 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 7 Aug 2024 15:56:07 +0200
Subject: [PATCH 1103/1461] correct rolle exists check

---
 .../api/frontend/v1/stv/Status.php            |  6 +--
 .../libraries/PrestudentstatusCheckLib.php    | 28 -----------
 .../models/crm/Prestudentstatus_model.php     | 50 -------------------
 3 files changed, 3 insertions(+), 81 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index b14c38eb8..d15a06da1 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -290,7 +290,7 @@ class Status extends FHCAPI_Controller
 
 				return !$this->getDataOrTerminateWithError($result);
 			}],
-			//check if Rolle already exists
+			//Check if Rolle already exists
 			['rolle_doesnt_exist', function () use ($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester) {
 				if (!$status_kurzbz || !$studiensemester_kurzbz || !$ausbildungssemester)
 					return true; // Error will be handled by the required statements above
@@ -1333,7 +1333,7 @@ class Status extends FHCAPI_Controller
 
 		// Set Datum to null to prevent multiple is_valid_date checks in the following validation rules
 		$this->form_validation->set_rules('_default', '', [
-			//check if Rolle already exists
+			//Check if Rolle already exists
 			['new_rolle_doesnt_exist', function () use (
 				$prestudent_id,
 				$status_kurzbz,
@@ -1609,7 +1609,7 @@ class Status extends FHCAPI_Controller
 		]);
 
 		$this->form_validation->set_rules('_default', '', [
-			//check if Rolle already exists
+			//Check if Rolle already exists
 			['rolle_doesnt_exist', function () use (
 				$prestudent_id,
 				$status_kurzbz,
diff --git a/application/libraries/PrestudentstatusCheckLib.php b/application/libraries/PrestudentstatusCheckLib.php
index e3320de7e..1ad772eb8 100644
--- a/application/libraries/PrestudentstatusCheckLib.php
+++ b/application/libraries/PrestudentstatusCheckLib.php
@@ -98,34 +98,6 @@ class PrestudentstatusCheckLib
 		);
 	}
 
-	/**
-	 * Checks if a prestudent role already exists.
-	 *
-	 * @param integer				$prestudent_id
-	 * @param string				$status_kurzbz
-	 * @param string				$studiensemester_kurzbz
-	 * @param integer				$ausbildungssemester
-	 *
-	 * @return stdClass
-	 */
-	public function checkIfExistingPrestudentRolle(
-		$prestudent_id,
-		$status_kurzbz,
-		$studiensemester_kurzbz,
-		$ausbildungssemester
-	) {
-		$result =  $this->_ci->PrestudentstatusModel->checkIfExistingPrestudentRolle(
-			$prestudent_id,
-			$status_kurzbz,
-			$studiensemester_kurzbz,
-			$ausbildungssemester
-		);
-		if (isError($result))
-			return $result;
-
-		return success(getData($result) != '1');
-	}
-
 	/**
 	 * Checks if a student already exists.
 	 *
diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php
index 1695d5b02..ddeeba20c 100644
--- a/application/models/crm/Prestudentstatus_model.php
+++ b/application/models/crm/Prestudentstatus_model.php
@@ -358,56 +358,6 @@ class Prestudentstatus_model extends DB_Model
 		return $this;
 	}
 
-	/**
-	 * Check if Rolle already exists
-	 * @param integer $prestudent_id
-	 * @param string $status_kurzbz
-	 * @param string $studiensemester_kurzbz
-	 * @param integer $ausbildungssemester
-	 * @return 1: if Rolle exists, 0: if it doesn't
-	 * Copy from studentDBDML.php
-	 */
-	public function checkIfExistingPrestudentRolle($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester)
-	{
-		$studentName = '';
-
-		$nameRes = $this->PersonModel->loadPrestudent($prestudent_id);
-
-		if (hasData($nameRes))
-		{
-			$nameData = getData($nameRes)[0];
-			$studentName = $nameData->vorname.' '.$nameData->nachname;
-		}
-
-		$qry = "SELECT
-					*
-				FROM
-				    public.tbl_prestudentstatus
-				WHERE
-					prestudent_id = ?
-				AND
-				    status_kurzbz = ?
-				AND
-				    studiensemester_kurzbz = ?
-				AND
-				    ausbildungssemester = ?";
-
-		$result = $this->execQuery($qry, array($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester));
-
-		if (isError($result))
-		{
-			return error($result);
-		}
-		elseif (!hasData($result))
-		{
-			return success(0);
-		}
-		else
-		{
-			return success("1", $this->p->t('lehre', 'error_rolleBereitsVorhandenMitNamen', ['name' => $studentName]));
-		}
-	}
-
 	/**
 	 * Check if there is only one prestudentstatus left
 	 *

From ac292477833c76d6e3d59122f5e38438e273cfd4 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 7 Aug 2024 16:19:15 +0200
Subject: [PATCH 1104/1461] checkIfLastBewerberAndAufgenommenerShareSemesters

---
 .../libraries/PrestudentstatusCheckLib.php    | 53 ++++++++++++++++++-
 system/phrasesupdate.php                      | 20 +++++++
 2 files changed, 71 insertions(+), 2 deletions(-)

diff --git a/application/libraries/PrestudentstatusCheckLib.php b/application/libraries/PrestudentstatusCheckLib.php
index 1ad772eb8..d197e30c6 100644
--- a/application/libraries/PrestudentstatusCheckLib.php
+++ b/application/libraries/PrestudentstatusCheckLib.php
@@ -173,7 +173,7 @@ class PrestudentstatusCheckLib
 	 */
 	public function checkIfExistingBewerberstatus($prestudent_id)
 	{
-		$result =  $this->_ci->PrestudentstatusModel->loadWhere([
+		$result = $this->_ci->PrestudentstatusModel->loadWhere([
 			'prestudent_id' => $prestudent_id,
 			'status_kurzbz' => Prestudentstatus_model::STATUS_BEWERBER
 		]);
@@ -193,7 +193,7 @@ class PrestudentstatusCheckLib
 	 */
 	public function checkIfExistingAufgenommenerstatus($prestudent_id)
 	{
-		$result =  $this->_ci->PrestudentstatusModel->loadWhere([
+		$result = $this->_ci->PrestudentstatusModel->loadWhere([
 			'prestudent_id' => $prestudent_id,
 			'status_kurzbz' => Prestudentstatus_model::STATUS_AUFGENOMMENER
 		]);
@@ -203,6 +203,55 @@ class PrestudentstatusCheckLib
 		return success(hasData($result));
 	}
 
+	/**
+	 * Checks if the last Bewerber status and the last Aufgenommener status
+	 * have the same studiensemester and ausbildungssemester.
+	 *
+	 * Attention:
+	 * If one of those two status is missing the function returns true!
+	 *
+	 * @param integer				$prestudent_id
+	 *
+	 * @return stdClass
+	 */
+	public function checkIfLastBewerberAndAufgenommenerShareSemesters($prestudent_id)
+	{
+		$this->_ci->PrestudentstatusModel->addOrder('datum', 'DESC');
+		$this->_ci->PrestudentstatusModel->addOrder('insertamum', 'DESC');
+		$this->_ci->PrestudentstatusModel->addLimit(1);
+		$result = $this->_ci->PrestudentstatusModel->loadWhere([
+			'prestudent_id' => $prestudent_id,
+			'status_kurzbz' => Prestudentstatus_model::STATUS_BEWERBER
+		]);
+
+		if (isError($result))
+			return $result;
+		if (!hasData($result))
+			return success(true);
+
+		$bewerber = current(getData($result));
+
+		$this->_ci->PrestudentstatusModel->addOrder('datum', 'DESC');
+		$this->_ci->PrestudentstatusModel->addOrder('insertamum', 'DESC');
+		$this->_ci->PrestudentstatusModel->addLimit(1);
+		$result = $this->_ci->PrestudentstatusModel->loadWhere([
+			'prestudent_id' => $prestudent_id,
+			'status_kurzbz' => Prestudentstatus_model::STATUS_AUFGENOMMENER
+		]);
+
+		if (isError($result))
+			return $result;
+		if (!hasData($result))
+			return success(true);
+
+		$aufgenommener = current(getData($result));
+
+		return success(
+			$bewerber->studiensemester_kurzbz == $aufgenommener->studiensemester_kurzbz
+			&& $bewerber->ausbildungssemester == $aufgenommener->ausbildungssemester
+		);
+	}
+
 	/**
 	 * Check if Bismeldestichtag erreicht
 	 *
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index ad6019c05..56a7304d4 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -28176,6 +28176,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'error_lastBewerberAndAufgenommenerSemesters',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Das Studiensemester oder Ausbildungsemester des Berwerberstatus und des Aufgenommenenstatus passen nicht überein',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The study semester or training semester of the applicant status and the accepted status do not match',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'lehre',

From dad5127d4ca09057f0396383aa98b2fe53cd7e82 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 7 Aug 2024 16:19:30 +0200
Subject: [PATCH 1105/1461] addStudent validation

---
 .../api/frontend/v1/stv/Status.php            | 162 ++++++------------
 1 file changed, 55 insertions(+), 107 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index d15a06da1..d9d9aa4b6 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -533,19 +533,6 @@ class Status extends FHCAPI_Controller
 
 	public function addStudent($prestudent_id)
 	{
-
-		$isBerechtigtBasisPrestudentstatus = $this->permissionlib->isBerechtigt('basis/prestudentstatus');
-
-		if (!$isBerechtigtBasisPrestudentstatus)
-			$this->form_validation->set_rules(
-				'berechtigt',
-				$this->p->t('ui', 'nurLeseberechtigung'),
-				'is_null',
-				[
-					'is_null' => $this->p->t('ui', 'error_fieldWriteAccess')
-				]
-			);
-
 		//get studentname for validations
 		$this->load->model('person/Person_model', 'PersonModel');
 		$this->PersonModel->addJoin('public.tbl_prestudent', 'person_id');
@@ -555,110 +542,71 @@ class Status extends FHCAPI_Controller
 
 		$studentName = trim($prestudent_person->vorname . ' ' . $prestudent_person->nachname);
 
-		$status_kurzbz = $this->input->post('status_kurzbz');
+		/*$status_kurzbz = $this->input->post('status_kurzbz');
 		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
 		$ausbildungssemester = $this->input->post('ausbildungssemester');
-
-		//Form Validation
-		$this->load->library('form_validation');
-
 		$statusgrund_id = $this->input->post('statusgrund_id');
-		$datum = $this->input->post('datum');
+		$datum = $this->input->post('datum');*/
+
 
 		//Form Validation
 		$this->load->library('form_validation');
 
-		$this->form_validation->set_rules(
-			'status_kurzbz',
-			'Status',
-			[
-				'required',
-				//Check Reihungstest
-				['reihungstest_check', function ($value) use ($prestudent_person) {
-					if (!REIHUNGSTEST_CHECK)
-						return true;
-					if ($value != Prestudentstatus_model::STATUS_BEWERBER)
-						return true;
-					$result = $this->prestudentstatuschecklib->checkIfAngetreten($prestudent_person);
-					return $this->getDataOrTerminateWithError($result);
-				}],
-				//Check ZGV
-				['checkIfZGV', function ($value) use ($prestudent_person) {
-					if (!ZGV_CHECK)
-						return true;
-					if ($value != Prestudentstatus_model::STATUS_BEWERBER)
-						return true;
-					$result = $this->prestudentstatuschecklib->checkIfZGVEingetragen($prestudent_person);
-					return $this->getDataOrTerminateWithError($result);
-				}],
-				//Check ZGV Master
-				['checkIfZGVMaster', function ($value) use ($prestudent_person) {
-					if (!ZGV_CHECK)
-						return true;
-					if ($value != Prestudentstatus_model::STATUS_BEWERBER)
-						return true;
-					$result = $this->prestudentstatuschecklib->checkIfZGVEingetragenMaster($prestudent_person);
-					return $this->getDataOrTerminateWithError($result);
-				}],
-				//Check Bewerberstatus
-				['checkIfExistingBewerberstatus', function () use ($prestudent_id, $status_kurzbz) {
-					if ($status_kurzbz != Prestudentstatus_model::STATUS_AUFGENOMMENER &&
-						$status_kurzbz != Prestudentstatus_model::STATUS_WARTENDER &&
-						$status_kurzbz != Prestudentstatus_model::STATUS_ABGEWIESENER)
-						return true;
-					$result = $this->prestudentstatuschecklib->checkIfExistingBewerberstatus($prestudent_id);
-					return $this->getDataOrTerminateWithError($result);
-				}],
-				//Check Aufgenommenerstatus
-				['checkIfExistingAufgenommenerstatus', function () use ($prestudent_id, $status_kurzbz) {
-					if ($status_kurzbz != Prestudentstatus_model::STATUS_STUDENT)
-						return true;
-					$result = $this->prestudentstatuschecklib->checkIfExistingAufgenommenerstatus($prestudent_id);
-					return $this->getDataOrTerminateWithError($result);
-				}],
-				//Check If FirstStudent
-				['check_isFirstStudStatus', function ($value) use ($prestudent_id) {
-					if ($value != Prestudentstatus_model::STATUS_STUDENT)
-						return true;
+		$this->form_validation->set_rules('_default', '', [
+			'required',
+			//Check ZGV
+			['checkIfZGV', function () use ($prestudent_person) {
+				if (defined("ZGV_CHECK") && !ZGV_CHECK)
+					return true;
+				$result = $this->prestudentstatuschecklib->checkIfZGVEingetragen($prestudent_person);
+				return $this->getDataOrTerminateWithError($result);
+			}],
+			//Check ZGV Master
+			['checkIfZGVMaster', function () use ($prestudent_person) {
+				if (defined("ZGV_CHECK") && !ZGV_CHECK)
+					return true;
+				$result = $this->prestudentstatuschecklib->checkIfZGVEingetragenMaster($prestudent_person);
+				return $this->getDataOrTerminateWithError($result);
+			}],
+			//Check Bewerberstatus
+			['checkIfExistingBewerberstatus', function () use ($prestudent_id) {
+				$result = $this->prestudentstatuschecklib->checkIfExistingBewerberstatus($prestudent_id);
+				return $this->getDataOrTerminateWithError($result);
+			}],
+			//Check Aufgenommenerstatus
+			['checkIfExistingAufgenommenerstatus', function () use ($prestudent_id) {
+				$result = $this->prestudentstatuschecklib->checkIfExistingAufgenommenerstatus($prestudent_id);
+				return $this->getDataOrTerminateWithError($result);
+			}],
+			//Check Bewerberstatus & Aufgenommenerstatus semester
+			['checkIfLastBewerberAndAufgenommenerShareSemesters', function () use ($prestudent_id) {
+				$result = $this->prestudentstatuschecklib->checkIfLastBewerberAndAufgenommenerShareSemesters($prestudent_id);
+				return $this->getDataOrTerminateWithError($result);
+			}],
+			//Check If FirstStudent
+			['check_isFirstStudStatus', function () use ($prestudent_id) {
+				$result = $this->prestudentstatuschecklib->checkIfExistingStudent($prestudent_id);
 
-					$result = $this->prestudentstatuschecklib->checkIfIsErsterStudent($prestudent_id);
+				return !$this->getDataOrTerminateWithError($result);
+			}],
+			//Check if Rolle already exists
+			['rolle_doesnt_exist', function () use ($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester) {
+				if (!$status_kurzbz || !$studiensemester_kurzbz || !$ausbildungssemester)
+					return true; // Error will be handled by the required statements above
 
-					return $this->getDataOrTerminateWithError($result);
-				}],
-				//Check If Existing PrestudentRolle
-				['checkIfExistingPrestudentRolle', function () use (
-					$prestudent_id,
-					$status_kurzbz,
-					$studiensemester_kurzbz,
-					$ausbildungssemester
-				) {
-					$result = $this->prestudentstatuschecklib->checkIfExistingPrestudentRolle(
-						$prestudent_id,
-						$status_kurzbz,
-						$studiensemester_kurzbz,
-						$ausbildungssemester
-					);
-					return $this->getDataOrTerminateWithError($result);
-				}]
-			],
-			[
-				'reihungstest_check' => $this->p->t('lehre', 'error_keinReihungstestverfahren', ['name' => $studentName]),
-				'checkIfExistingBewerberstatus' => $this->p->t('lehre', 'error_keinBewerber', ['name' => $studentName]),
-				'checkIfExistingAufgenommenerstatus' => $this->p->t('lehre', 'error_keinAufgenommener', ['name' => $studentName]),
-				'checkIfZGV' => $this->p->t('lehre', 'error_ZGVNichtEingetragen', ['name' => $studentName]),
-				'checkIfZGVMaster' => $this->p->t('lehre', 'error_ZGVMasterNichtEingetragen', ['name' => $studentName]),
-				'check_isFirstStudStatus' => $this->p->t('lehre', 'error_personBereitsStudent', ['name' => $studentName]),
-				'checkIfExistingPrestudentRolle' => $this->p->t('lehre', 'error_rolleBereitsVorhandenMitNamen', ['name' => $studentName])
-			]
-		);
+				$result = $this->PrestudentstatusModel->load([$ausbildungssemester, $studiensemester_kurzbz, $status_kurzbz, $prestudent_id]);
 
-		$this->form_validation->set_rules('ausbildungssemester', $this->p->t('lehre', 'ausbildungssemester'), 'required|integer', [
-			'integer' => $this->p->t('ui', 'error_fieldNotInteger')
-		]);
-
-
-		$this->form_validation->set_rules('ausbildungssemester', 'Ausbildungssemester', 'integer', [
-			'integer' => $this->p->t('ui', 'error_fieldNotInteger', ['field' => 'Ausbildungssemester'])
+				return !$this->getDataOrTerminateWithError($result);
+			}]
+		], [
+			'reihungstest_check' => $this->p->t('lehre', 'error_keinReihungstestverfahren', ['name' => $studentName]),
+			'checkIfExistingBewerberstatus' => $this->p->t('lehre', 'error_keinBewerber', ['name' => $studentName]),
+			'checkIfExistingAufgenommenerstatus' => $this->p->t('lehre', 'error_keinAufgenommener', ['name' => $studentName]),
+			'checkIfLastBewerberAndAufgenommenerShareSemesters' => $this->p->t('lehre', 'error_lastBewerberAndAufgenommenerSemesters'),
+			'checkIfZGV' => $this->p->t('lehre', 'error_ZGVNichtEingetragen', ['name' => $studentName]),
+			'checkIfZGVMaster' => $this->p->t('lehre', 'error_ZGVMasterNichtEingetragen', ['name' => $studentName]),
+			'check_isFirstStudStatus' => $this->p->t('lehre', 'error_personBereitsStudent', ['name' => $studentName]),
+			'rolle_doesnt_exist' => $this->p->t('lehre', 'error_rolleBereitsVorhandenMitNamen', ['name' => $studentName])
 		]);
 
 		if (!$this->form_validation->run())

From 8fbd680ebd852a244cf1095a304c2a8ce4791fa0 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 7 Aug 2024 16:25:56 +0200
Subject: [PATCH 1106/1461] correct rolle_doesnt_exist validation in addStudent

---
 .../api/frontend/v1/stv/Status.php            | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index d9d9aa4b6..42cd81778 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -590,11 +590,26 @@ class Status extends FHCAPI_Controller
 				return !$this->getDataOrTerminateWithError($result);
 			}],
 			//Check if Rolle already exists
-			['rolle_doesnt_exist', function () use ($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester) {
-				if (!$status_kurzbz || !$studiensemester_kurzbz || !$ausbildungssemester)
-					return true; // Error will be handled by the required statements above
+			['rolle_doesnt_exist', function () use ($prestudent_id) {
+				$this->PrestudentstatusModel->addOrder('datum', 'DESC');
+				$this->PrestudentstatusModel->addOrder('insertamum', 'DESC');
+				$this->PrestudentstatusModel->addLimit(1);
+				$result = $this->PrestudentstatusModel->loadWhere([
+					'prestudent_id' => $prestudent_id,
+					'status_kurzbz' => Prestudentstatus_model::STATUS_AUFGENOMMENER
+				]);
+				$lastAufgenommener = $this->getDataOrTerminateWithError($result);
+				if (!$lastAufgenommener)
+					return true; // Error will be handled by the checkIfExistingAufgenommenerstatus statement above
 
-				$result = $this->PrestudentstatusModel->load([$ausbildungssemester, $studiensemester_kurzbz, $status_kurzbz, $prestudent_id]);
+				$lastAufgenommener = current($lastAufgenommener);
+
+
+				$result = $this->PrestudentstatusModel->loadWhere([
+					'studiensemester_kurzbz' => $lastAufgenommener->studiensemester_kurzbz,
+					'status_kurzbz' => Prestudentstatus_model::STATUS_STUDENT,
+					'prestudent_id' => $prestudent_id
+				]);
 
 				return !$this->getDataOrTerminateWithError($result);
 			}]

From 0f75b269c3ed362bc2fd293dca1b683bd12611fe Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 7 Aug 2024 16:55:20 +0200
Subject: [PATCH 1107/1461] remove comment

---
 application/controllers/api/frontend/v1/stv/Status.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 42cd81778..b0c262d6a 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -627,11 +627,6 @@ class Status extends FHCAPI_Controller
 		if (!$this->form_validation->run())
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 
-		//TODO(Manu) check if necessary
-		//Das Studiensemester oder Ausbildungsemester des Bewerberstatus und des Aufgenommenenstatus passen nicht überein"
-
-		//Vor dem Studentenstatus müssen folgende Status eingetragen werden: {0}'
-		//private $_statusAbfolgeVorStudent = [self::INTERESSENT_STATUS, self::BEWERBER_STATUS, self::AUFGENOMMENER_STATUS
 
 		// Start DB transaction
 		$this->db->trans_start();

From b54449012bfc45a53041e158a8755fbd38c29fd0 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 8 Aug 2024 11:30:56 +0200
Subject: [PATCH 1108/1461] implement version without processLehrverband for
 setAbbrecher and setUnterbrecher

---
 application/libraries/PrestudentLib.php | 145 ++++++++++++++++++++----
 1 file changed, 124 insertions(+), 21 deletions(-)

diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php
index 69d141f52..bc2e5b1bd 100644
--- a/application/libraries/PrestudentLib.php
+++ b/application/libraries/PrestudentLib.php
@@ -96,20 +96,50 @@ class PrestudentLib
 		if (isError($result))
 			return $result;
 
-		// refactored with processStudentlehrverband
-		$result = $this->_ci->StudentlehrverbandModel->processStudentlehrverband(
-			$student->student_uid,
-			$student->studiengang_kz,
-			0,
-			'A',
-			'',
-			$studiensemester_kurzbz,
-			Prestudentstatus_model::STATUS_ABBRECHER
-		);
+		//Verband anlegen
+		$result = $this->_ci->LehrverbandModel->load([
+			'studiengang_kz' => $student->studiengang_kz,
+			'semester' => 0,
+			'verband' => 'A',
+			'gruppe' => ''
+		]);
 
 		if (isError($result))
 			return $result;
+		$result = getData($result);
+		if (!$result)
+		{
+			$result = $this->_ci->LehrverbandModel->load([
+				'studiengang_kz' => $student->studiengang_kz,
+				'semester' => 0,
+				'verband' => '',
+				'gruppe' => ''
+			]);
+			if (isError($result))
+				return $result;
+			$result = getData($result);
 
+			if(!$result)
+			{
+				$this->_ci->LehrverbandModel->insert([
+					'studiengang_kz' => $student->studiengang_kz,
+					'semester' => 0,
+					'verband' => '',
+					'gruppe' => '',
+					'bezeichnung' => 'Ab-Unterbrecher',
+					'aktiv' => true,
+				]);
+			}
+
+			$this->_ci->LehrverbandModel->insert([
+				'studiengang_kz' => $student->studiengang_kz,
+				'semester' => 0,
+				'verband' => 'A',
+				'gruppe' => '',
+				'bezeichnung' => 'Abbrecher',
+				'aktiv' => true
+			]);
+		}
 
 		// noch nicht eingetragene Zeugnisnoten auf 9 setzen
 		$result = $this->_ci->ZeugnisnoteModel->getZeugnisnoten($student->student_uid, $prestudent_status->studiensemester_kurzbz);
@@ -156,6 +186,19 @@ class PrestudentLib
 			'updateamum' => date('c')
 		]);
 
+		//Studentlehrverband setzen
+		$this->_ci->StudentlehrverbandModel->update([
+			'studiensemester_kurzbz' => $prestudent_status->studiensemester_kurzbz,
+			'student_uid' => $student->student_uid
+		], [
+			'studiengang_kz' => $student->studiengang_kz,
+			'semester' => 0,
+			'verband' => 'A',
+			'gruppe' => '',
+			'updateamum' => date('c'),
+			'updatevon' => $insertvon
+		]);
+
 		// Benutzer inaktiv setzen
 		$this->_ci->BenutzerModel->update([
 			'uid' =>  $student->student_uid
@@ -279,19 +322,50 @@ class PrestudentLib
 		if (isError($result))
 			return $result;
 
-		// refactored with processStudentlehrverband
-		$result = $this->_ci->StudentlehrverbandModel->processStudentlehrverband(
-			$student->student_uid,
-			$student->studiengang_kz,
-			0,
-			'B',
-			'',
-			$studiensemester_kurzbz,
-			Prestudentstatus_model::STATUS_UNTERBRECHER
-		);
+		//Verband anlegen
+		$result = $this->_ci->LehrverbandModel->load([
+			'studiengang_kz' => $student->studiengang_kz,
+			'semester' => 0,
+			'verband' => 'B',
+			'gruppe' => ''
+		]);
 
 		if (isError($result))
 			return $result;
+		$result = getData($result);
+		if (!$result)
+		{
+			$result = $this->_ci->LehrverbandModel->load([
+				'studiengang_kz' => $student->studiengang_kz,
+				'semester' => 0,
+				'verband' => '',
+				'gruppe' => ''
+			]);
+			if (isError($result))
+				return $result;
+			$result = getData($result);
+
+			if(!$result)
+			{
+				$this->_ci->LehrverbandModel->insert([
+					'studiengang_kz' => $student->studiengang_kz,
+					'semester' => 0,
+					'verband' => '',
+					'gruppe' => '',
+					'bezeichnung' => 'Ab-Unterbrecher',
+					'aktiv' => true,
+				]);
+			}
+
+			$this->_ci->LehrverbandModel->insert([
+				'studiengang_kz' => $student->studiengang_kz,
+				'semester' => 0,
+				'verband' => 'B',
+				'gruppe' => '',
+				'bezeichnung' => 'Unterbrecher',
+				'aktiv' => true
+			]);
+		}
 
 		// noch nicht eingetragene Zeugnisnoten auf 9 setzen
 		$result = $this->_ci->ZeugnisnoteModel->getZeugnisnoten($student->student_uid, $studiensemester_kurzbz);
@@ -324,7 +398,6 @@ class PrestudentLib
 			}
 		}
 
-
 		// Update Aktionen
 
 		// StudentModel updaten
@@ -338,6 +411,36 @@ class PrestudentLib
 			'updateamum' => date('c')
 		]);
 
+		//Studentlehrverband setzen
+		$result = $this->_ci->StudentlehrverbandModel->loadWhere([
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'student_uid' => $student->student_uid
+		]);
+		if (hasData($result)) {
+			$this->_ci->StudentlehrverbandModel->update([
+				'studiensemester_kurzbz' => $studiensemester_kurzbz,
+				'student_uid' => $student->student_uid
+			], [
+				'studiengang_kz' => $student->studiengang_kz,
+				'semester' => 0,
+				'verband' => 'B',
+				'gruppe' => '',
+				'updateamum' => date('c'),
+				'updatevon' => $insertvon
+			]);
+		} else {
+			$this->_ci->StudentlehrverbandModel->insert([
+				'student_uid' => $student->student_uid,
+				'studiensemester_kurzbz' => $studiensemester_kurzbz,
+				'studiengang_kz' => $student->studiengang_kz,
+				'semester' => 0,
+				'verband' => 'B',
+				'gruppe' => '',
+				'insertamum' => date('c'),
+				'insertvon' => $insertvon
+			]);
+		}
+
 		return success();
 	}
 

From f1a2ef25c790d1b279499dd17f2be16ab6deff18 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 8 Aug 2024 12:45:36 +0200
Subject: [PATCH 1109/1461] Remove unused functions

---
 .../models/crm/Prestudentstatus_model.php     |  23 ---
 application/models/crm/Student_model.php      |  28 ----
 .../education/Studentlehrverband_model.php    |  36 -----
 .../models/organisation/Standort_model.php    |  17 ---
 application/models/person/Adresse_model.php   |  49 +------
 application/models/person/Notiz_model.php     | 135 ------------------
 application/models/person/Person_model.php    |   1 -
 7 files changed, 1 insertion(+), 288 deletions(-)

diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php
index ddeeba20c..6405569db 100644
--- a/application/models/crm/Prestudentstatus_model.php
+++ b/application/models/crm/Prestudentstatus_model.php
@@ -24,15 +24,6 @@ class Prestudentstatus_model extends DB_Model
 		$this->dbTable = 'public.tbl_prestudentstatus';
 		$this->pk = array('ausbildungssemester', 'studiensemester_kurzbz', 'status_kurzbz', 'prestudent_id');
 		$this->hasSequence = false;
-
-/*		$CI =& get_instance();
-
-		$CI->load->library('PhrasesLib');
-
-		// Load language phrases
-		$CI->loadPhrases([
-			'ui', 'lehre'
-		]);*/
 	}
 
 	/**
@@ -390,20 +381,6 @@ class Prestudentstatus_model extends DB_Model
 		return success(false, $this->p->t('lehre', 'anzahl_existingRoles', ['anzahl' => $anzahl]));
 	}
 
-	/**
-	 * Check if there is only one "Student" prestudentstatus left
-	 *
-	 * @param integer					$prestudent_id
-	 *
-	 * @return stdClass
-	 */
-	public function checkIfLastStudentStatusEntry($prestudent_id)
-	{
-		$this->db->where('status_kurzbz', self::STATUS_STUDENT);
-		
-		return $this->checkIfLastStatusEntry($prestudent_id);
-	}
-
 	public function getAllPrestudentstatiWithStudiensemester($prestudent_id)
 	{
 		$qry = "
diff --git a/application/models/crm/Student_model.php b/application/models/crm/Student_model.php
index fec72cbfc..adeef07fc 100644
--- a/application/models/crm/Student_model.php
+++ b/application/models/crm/Student_model.php
@@ -176,34 +176,6 @@ class Student_model extends DB_Model
 		return $result->retval[0]->student_uid;
 	}
 
-	/**
-	 * Get students UID by PrestudentID.
-	 * @param $prestudent_id
-	 * @return mixed
-	 */
-	public function checkIfUID($prestudent_id)
-	{
-		$this->addSelect('student_uid');
-
-		$result = $this->loadWhere(
-			array('prestudent_id' => $prestudent_id)
-		);
-
-		if(isError($result))
-		{
-			return error("Error while checking student_uid");
-		}
-
-		if (!hasData($result))
-		{
-			return success("0", "Keine Student_uid vorhanden");
-		}
-
-		$student_uid = $result->retval[0]->student_uid;
-
-		return success($student_uid);
-	}
-
 	public function searchStudent($filter)
 	{
 		$this->addSelect('vorname, nachname, gebdatum, person.person_id, student_uid');
diff --git a/application/models/education/Studentlehrverband_model.php b/application/models/education/Studentlehrverband_model.php
index e3c96c2ac..e4eabe89d 100644
--- a/application/models/education/Studentlehrverband_model.php
+++ b/application/models/education/Studentlehrverband_model.php
@@ -15,42 +15,6 @@ class Studentlehrverband_model extends DB_Model
 		$this->load->model('crm/prestudentstatus_model', 'PrestudentstatusModel');
 	}
 
-	/**
-	 * Check if Studentlehrverband already exists
-	 *
-	 * @param string $student_id
-	 *
-	 * @param string $studiensemester_kurzbz
-	 *
-	 * @return 1: if Studentlehrverband exists, 0: if it doesn't
-	 */
-	public function checkIfStudentlehrverbandExists($student_uid, $studiensemester_kurzbz)
-	{
-		$qry = "SELECT
-					*
-				FROM 
-				    public.tbl_studentlehrverband
-				WHERE
-					student_uid = ? 
-				AND
-				    studiensemester_kurzbz = ?";
-
-		$result = $this->execQuery($qry, array($student_uid, $studiensemester_kurzbz));
-
-		if (isError($result))
-		{
-			return error($result);
-		}
-		elseif (!hasData($result))
-		{
-			return success("0", $this->p->t('lehre', 'error_noStudentlehrverband'));
-		}
-		else
-		{
-			return success("1", $this->p->t('lehre', 'error_updateStudentlehrverband'));
-		}
-	}
-
 	/**
 	 * update Lehrverband and Studenlehrverband
 	 *
diff --git a/application/models/organisation/Standort_model.php b/application/models/organisation/Standort_model.php
index d46dad1c6..aeeab4497 100644
--- a/application/models/organisation/Standort_model.php
+++ b/application/models/organisation/Standort_model.php
@@ -29,23 +29,6 @@ class Standort_model extends DB_Model
 		return $this->execQuery($qry);
 	}
 
-/*	public function searchStandorteByFirma($filter)
-	{
-		$filter = strtoLower($filter);
-		$qry = "
-			SELECT 
-				s.kurzbz, s.standort_id
-			FROM 
-			    public.tbl_firma f
-			LEFT JOIN 
-			        public.tbl_standort s ON(f.firma_id = s.firma_id)
-			WHERE 
-			    f.firma_id = '". $this->db->escape_like_str($filter)."'";
-
-
-		return $this->execQuery($qry);
-	}*/
-
 	public function getStandorteByFirma($firma_id)
 	{
 		$this->addSelect("DISTINCT ON (standort_id) bezeichnung, standort_id");
diff --git a/application/models/person/Adresse_model.php b/application/models/person/Adresse_model.php
index cc6d68673..4dd03ea6b 100644
--- a/application/models/person/Adresse_model.php
+++ b/application/models/person/Adresse_model.php
@@ -24,51 +24,4 @@ class Adresse_model extends DB_Model
 		$this->addSelect($select);
 		return $this->loadWhere(array('person_id' => $person_id, 'zustelladresse'=> true));
 	}
-
-	/**
-	 * Get Array of Names of Gemeinden having Postleitzahl
-	 * @param integer $plz Postleitzahl
-	 * @return array $result[]
-	 */
-	public function getGemeinden($plz)
-	{
-		$qry = "
-			SELECT distinct
-				g.name
-			FROM bis.tbl_gemeinde g
-			WHERE g.plz=?
-			ORDER BY g.name
-			";
-
-		return $this->execQuery($qry, array($plz));
-	}
-
-	/**
-	 * Get Array of Names of Ortschaften having Postleitzahl
-	 * @param integer $plz Postleitzahl
-	 * @param String $gemeindename Name Gemeinde
-	 * @return array $result[]
-	 */
-	public function getOrtschaften($plz, $gemeinde=null)
-	{
-		$params = array($plz);
-		$qry = "
-			SELECT distinct
-				g.ortschaftsname
-			FROM bis.tbl_gemeinde g
-			WHERE g.plz=? ";
-
-		if (isset($gemeinde))
-		{
-			$qry .= "AND g.name=?";
-			$params[] = $gemeinde;
-		}
-
-		$qry .=	"ORDER BY g.ortschaftsname";
-
-		return $this->execQuery($qry, $params);
-	}
-}
-
-
-
+}
\ No newline at end of file
diff --git a/application/models/person/Notiz_model.php b/application/models/person/Notiz_model.php
index d3bed7e56..349eaac60 100644
--- a/application/models/person/Notiz_model.php
+++ b/application/models/person/Notiz_model.php
@@ -133,141 +133,6 @@ class Notiz_model extends DB_Model
 		return $result;
 	}
 
-	/**
-	 * Add a Notiz with Notizuordnung for a given type
-	 * @param type type of id for Notizzuordnung (example: person, prestudent, mitarbeiter, projekt, projektphase, projekttask,
-	 *        bestellung, lehreinheit, anrechnung)
-	 * @param id for Dokumentzuordnung (person_id, prestudent_id, uid, projekt_id...)
-	 * @param titel, text, start, ende, erledigt, verfasser_uid, bearbeiter_uid, insertvon Parameter for notiz
-	 */
-	public function addNotizForType(
-		$type,
-		$id,
-		$titel,
-		$text,
-		$insertvon,
-		$start = null,
-		$ende = null,
-		$erledigt = false,
-		$verfasser_uid = null,
-		$bearbeiter_uid = null
-	) {
-
-		//check, ob id und type valid
-		if (!isset($id) || ($id == "undefined")) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return error("Id(". $id. ') ist keine gültige ID!');
-		}
-
-		// Loads model Notizzuordnung_model
-		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
-
-		//check if valid type
-		$result = $this->NotizzuordnungModel->isValidType($type);
-		if (isError($result))
-		{
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return error($type . ' ist kein gültiger ID_TYP!');
-		}
-
-		// Start DB transaction
-		$this->db->trans_start(false);
-
-		$result = $this->insert(array('titel' => $titel, 'text' => $text, 'erledigt' => $erledigt, 'verfasser_uid' => $verfasser_uid,
-			"insertvon" => $insertvon, 'start' => $start, 'ende' => $ende, 'bearbeiter_uid' => $bearbeiter_uid));
-
-		if (isSuccess($result))
-		{
-			$notiz_id = $result->retval;
-
-			if($type == "software_id")
-			{
-				// Loads extension Model
-				$this->load->model('extensions/FHC-Core-Softwarebereitstellung/Softwarenotizzuordnung_model', 'ExtensionnotizzuordnungModel');
-				$result = $this->ExtensionnotizzuordnungModel->insert([
-					'notiz_id' => $notiz_id,
-					'id' => $id,
-					'type_id' => $type
-				]);
-			}
-			else
-			{
-				$result = $this->NotizzuordnungModel->insert(array('notiz_id' => $notiz_id, $type => $id));
-			}
-			if (isError($result))
-			{
-				$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-				return error('Fehler Insert Zuordnungstabelle');
-			}
-		}
-
-
-		// Transaction complete!
-		$this->db->trans_complete();
-
-		// Check if everything went ok during the transaction
-		if ($this->db->trans_status() === false || isError($result))
-		{
-			$this->db->trans_rollback();
-			$result = error($result->msg, EXIT_ERROR);
-		}
-		else
-		{
-			$this->db->trans_commit();
-			$result = success($notiz_id);
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Add a Notiz for a given person with DMS_id
-	 *
-	 */
-	//Todo(manu) deprecated?
-/*	public function addNotizForPersonWithDoc($person_id, $titel, $text, $erledigt, $verfasser_uid, $von, $bis, $dms_id = null)
-	{
-		// Loads model Notizzuordnung_model
-		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
-
-		// Start DB transaction
-		$this->db->trans_start(false);
-
-		$result = $this->insert(array('titel' => $titel, 'text' => $text, 'erledigt' => $erledigt, 'verfasser_uid' => $verfasser_uid,
-			"insertvon" => $verfasser_uid, 'start' => $von, 'ende' => $bis));
-
-		if (isSuccess($result))
-		{
-			$notiz_id = $result->retval;
-			$result = $this->NotizzuordnungModel->insert(array('notiz_id' => $notiz_id, 'person_id' => $person_id));
-
-			if($dms_id)
-			{
-				// Loads model Notizdokument_model
-				$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
-
-				$result = $this->NotizdokumentModel->insert(array('notiz_id' => $notiz_id, 'dms_id' => $dms_id));
-			}
-		}
-
-		// Transaction complete!
-		$this->db->trans_complete();
-
-		// Check if everything went ok during the transaction
-		if ($this->db->trans_status() === false || isError($result))
-		{
-			$this->db->trans_rollback();
-			$result = error($result->msg, EXIT_ERROR);
-		}
-		else
-		{
-			$this->db->trans_commit();
-			$result = success($notiz_id);
-		}
-
-		return $result;
-	}*/
-
 	/**
 	 * gets all Notizen for a person
 	 * @param $person_id
diff --git a/application/models/person/Person_model.php b/application/models/person/Person_model.php
index 31b7b03b7..88813220e 100644
--- a/application/models/person/Person_model.php
+++ b/application/models/person/Person_model.php
@@ -374,6 +374,5 @@ class Person_model extends DB_Model
 			'prestudent_id' => $prestudent_id
 		]);
 	}
-
 }
 

From ffabd681c87ea12fbadc5a4016fc50df34bcab0f Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 8 Aug 2024 16:24:23 +0200
Subject: [PATCH 1110/1461] setFirstStudent logic

---
 .../api/frontend/v1/stv/Status.php            | 202 +++--------------
 application/libraries/PrestudentLib.php       | 213 ++++++++++++++----
 application/models/crm/Student_model.php      |  97 ++++++--
 .../education/Studentlehrverband_model.php    | 137 -----------
 .../models/organisation/Lehrverband_model.php |  42 ----
 application/models/person/Benutzer_model.php  | 149 ++++++------
 6 files changed, 349 insertions(+), 491 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index b0c262d6a..f54283303 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -533,6 +533,19 @@ class Status extends FHCAPI_Controller
 
 	public function addStudent($prestudent_id)
 	{
+		// Prepare lastAufgenommener Status
+		$this->PrestudentstatusModel->addOrder('datum', 'DESC');
+		$this->PrestudentstatusModel->addOrder('insertamum', 'DESC');
+		$this->PrestudentstatusModel->addLimit(1);
+		$result = $this->PrestudentstatusModel->loadWhere([
+			'prestudent_id' => $prestudent_id,
+			'status_kurzbz' => Prestudentstatus_model::STATUS_AUFGENOMMENER
+		]);
+		$lastAufgenommener = $this->getDataOrTerminateWithError($result);
+
+		if ($lastAufgenommener)
+			$lastAufgenommener = current($lastAufgenommener);
+
 		//get studentname for validations
 		$this->load->model('person/Person_model', 'PersonModel');
 		$this->PersonModel->addJoin('public.tbl_prestudent', 'person_id');
@@ -542,16 +555,14 @@ class Status extends FHCAPI_Controller
 
 		$studentName = trim($prestudent_person->vorname . ' ' . $prestudent_person->nachname);
 
-		/*$status_kurzbz = $this->input->post('status_kurzbz');
-		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
-		$ausbildungssemester = $this->input->post('ausbildungssemester');
-		$statusgrund_id = $this->input->post('statusgrund_id');
-		$datum = $this->input->post('datum');*/
-
-
+		
 		//Form Validation
 		$this->load->library('form_validation');
 
+		$this->form_validation->set_rules('statusgrund_id', $this->p->t('international', 'grund'), 'integer', [
+			'integer' => $this->p->t('ui', 'error_fieldNotInteger')
+		]);
+
 		$this->form_validation->set_rules('_default', '', [
 			'required',
 			//Check ZGV
@@ -574,9 +585,8 @@ class Status extends FHCAPI_Controller
 				return $this->getDataOrTerminateWithError($result);
 			}],
 			//Check Aufgenommenerstatus
-			['checkIfExistingAufgenommenerstatus', function () use ($prestudent_id) {
-				$result = $this->prestudentstatuschecklib->checkIfExistingAufgenommenerstatus($prestudent_id);
-				return $this->getDataOrTerminateWithError($result);
+			['checkIfExistingAufgenommenerstatus', function () use ($lastAufgenommener) {
+				return !!$lastAufgenommener;
 			}],
 			//Check Bewerberstatus & Aufgenommenerstatus semester
 			['checkIfLastBewerberAndAufgenommenerShareSemesters', function () use ($prestudent_id) {
@@ -590,21 +600,10 @@ class Status extends FHCAPI_Controller
 				return !$this->getDataOrTerminateWithError($result);
 			}],
 			//Check if Rolle already exists
-			['rolle_doesnt_exist', function () use ($prestudent_id) {
-				$this->PrestudentstatusModel->addOrder('datum', 'DESC');
-				$this->PrestudentstatusModel->addOrder('insertamum', 'DESC');
-				$this->PrestudentstatusModel->addLimit(1);
-				$result = $this->PrestudentstatusModel->loadWhere([
-					'prestudent_id' => $prestudent_id,
-					'status_kurzbz' => Prestudentstatus_model::STATUS_AUFGENOMMENER
-				]);
-				$lastAufgenommener = $this->getDataOrTerminateWithError($result);
+			['rolle_doesnt_exist', function () use ($prestudent_id, $lastAufgenommener) {
 				if (!$lastAufgenommener)
 					return true; // Error will be handled by the checkIfExistingAufgenommenerstatus statement above
 
-				$lastAufgenommener = current($lastAufgenommener);
-
-
 				$result = $this->PrestudentstatusModel->loadWhere([
 					'studiensemester_kurzbz' => $lastAufgenommener->studiensemester_kurzbz,
 					'status_kurzbz' => Prestudentstatus_model::STATUS_STUDENT,
@@ -631,152 +630,13 @@ class Status extends FHCAPI_Controller
 		// Start DB transaction
 		$this->db->trans_start();
 
-		//getSemester of Status Aufgenommen
-		$result = $this->PrestudentstatusModel->loadWhere([
-			"prestudent_id" => $prestudent_id,
-			"status_kurzbz" => Prestudentstatus_model::STATUS_AUFGENOMMENER
-		]);
-
-		$this->PrestudentstatusModel->addLimit(1);
-		if (isError($result))
-		{
-			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-		$semesterAufgenommen = current(getData($result));
-		$semesterAufgenommen = $semesterAufgenommen->studiensemester_kurzbz;
-
-
-		//generate Personenkennzeichen(matrikelnr)
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-		$this->PrestudentModel->addJoin('public.tbl_person p', 'ON (p.person_id = public.tbl_prestudent.person_id)');
-		$this->PrestudentModel->addJoin('public.tbl_studiengang sg', 'ON (sg.studiengang_kz = public.tbl_prestudent.studiengang_kz)');
-		$result = $this->PrestudentModel->load([
-			'prestudent_id' => $prestudent_id,
-		]);
-		if (isError($result)) {
-			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-		$result = current(getData($result));
-
-		$stg = $result->studiengang_kz;
-		$typ = $result->typ;
-		$stgkzl = $result->kurzbz;
-		$person_id = $result->person_id;
-		$matrikelnr = false;
-
-		Events::trigger('generate_personenkennzeichen', $stg, $semesterAufgenommen, $typ, function ($value) use ($matrikelnr) {
-			$matrikelnr = $value;
-		});
-		if ($matrikelnr === false) {
-			$resultMat = $this->StudentModel->generateMatrikelnummer2($stg, $semesterAufgenommen, $typ);
-			if (isError($resultMat)) {
-				return $this->terminateWithError($resultMat, self::ERROR_TYPE_GENERAL);
-			}
-			$matrikelnr = getData($resultMat);
-		}
-		$jahr = mb_substr($semesterAufgenommen, 4, 2);
-
-		//generate UID
-		$resultUid = $this->StudentModel->generateUID($stgkzl, $jahr, $typ, $matrikelnr);
-		if (isError($resultUid)) {
-			return $this->terminateWithError(getData($resultUid), self::ERROR_TYPE_GENERAL);
-		}
-		$uidStudent = getData($resultUid);
-
-		//TODO(Manu)  Check for additional logic (config entries, addons)
-		//check include/tw/generatematrikelnr.inc.php
-		//(1) addons durchsuchen, ob eigene Logik für Matrikelnr-erstellung existiert
-		//Default: keine Matrikelnummer wird generiert
-
-		//(2) personenkz = uid
-		/*		if (defined('SET_UID_AS_PERSONENKENNZEICHEN') && SET_UID_AS_PERSONENKENNZEICHEN) {
-					$matrikelnr = $uidStudent;
-				}*/
-
-		//(3) Matrikelnummer = uid
-		/*		if (defined('SET_UID_AS_MATRIKELNUMMER') && SET_UID_AS_MATRIKELNUMMER) {
-					//update person
-					$result = $this->PersonModel->update(
-						[
-							'person_id' => $person_id,
-						],
-						[
-							'matr_nr' => $uidStudent,
-						]
-					);
-					if (isError($result)) {
-						return $this->terminateWithError("uidAsMatrikelnummer" . getError($result), self::ERROR_TYPE_GENERAL);
-					}
-				}*/
-
-		//add benutzerdatensatz mit Aktierungscode
-		$this->load->model('person/Benutzer_model', 'BenutzerModel');
-		$result = $this->BenutzerModel->checkIfExistingBenutzer($uidStudent);
-		if (isError($result)) {
-			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-		if ($result->retval != "0")
-		{
-			return $this->terminateWithError($this->p->t('lehre', 'error_benutzerBereitsVorhanden', ['uid' => $uidStudent]), self::ERROR_TYPE_GENERAL);
-		}
-
-		$aktivierungscode = null;
-		$result = $this->BenutzerModel->generateActivationKey();
-		if (isError($result)) {
-			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-		$aktivierungscode = getData($result);
-
-		//generate Alias
-		$result = $this->BenutzerModel->generateAliasByPersonId($person_id);
-		$this->getDataOrTerminateWithError($result);
-		$alias = getData($result);
-
-		$result = $this->BenutzerModel->insert(
-			[
-				'person_id' => $person_id,
-				'uid' => $uidStudent,
-				'aktiv' => true,
-				'aktivierungscode' => $aktivierungscode,
-				'alias' => $alias,
-				'insertvon' => getAuthUID(),
-				'insertamum' => date('c'),
-			]
-		);
-
-		if (isError($result)) {
-			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-
-		//Student anlegen
-		$result = $this->StudentModel->insert(
-			[
-				'student_uid' => $uidStudent,
-				'prestudent_id' => $prestudent_id,
-				'matrikelnr' => $matrikelnr,
-				'studiengang_kz' => $stg,
-				'semester' => $ausbildungssemester,
-				'verband' => '',
-				'gruppe' => '',
-				'insertvon' => getAuthUID(),
-				'insertamum' => date('c')
-			]
-		);
-		if (isError($result))
-		{
-			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-
-		$this->load->library('PrestudentLib');
-		$result = $this->prestudentlib->setFirstStudent(
+		$this->prestudentlib->setFirstStudent(
 			$prestudent_id,
-			$studiensemester_kurzbz,
-			$ausbildungssemester,
-			$statusgrund_id,
-			date('c'),
-			getAuthUID(),
-			$stg,
-			$uidStudent
+			$lastAufgenommener->studiensemester_kurzbz,
+			$lastAufgenommener->ausbildungssemester,
+			$lastAufgenommener->orgform_kurzbz,
+			$lastAufgenommener->studienplan_id,
+			$this->input->post('statusgrund_id')
 		);
 
 		$this->getDataOrTerminateWithError($result);
@@ -969,6 +829,10 @@ class Status extends FHCAPI_Controller
 
 		$this->load->library('form_validation');
 
+		$this->form_validation->set_rules('statusgrund_id', $this->p->t('international', 'grund'), 'integer', [
+			'integer' => $this->p->t('ui', 'error_fieldNotInteger')
+		]);
+
 		if (!$isBerechtigtBasisPrestudentstatus)
 			$this->form_validation->set_rules(
 				'bewerbung_abgeschicktamum',
@@ -1253,6 +1117,10 @@ class Status extends FHCAPI_Controller
 		//Form Validation
 		$this->load->library('form_validation');
 
+		$this->form_validation->set_rules('statusgrund_id', $this->p->t('international', 'grund'), 'integer', [
+			'integer' => $this->p->t('ui', 'error_fieldNotInteger')
+		]);
+
 		if (!$isBerechtigtBasisPrestudentstatus)
 			$this->form_validation->set_rules(
 				'bewerbung_abgeschicktamum',
diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php
index bc2e5b1bd..b66324928 100644
--- a/application/libraries/PrestudentLib.php
+++ b/application/libraries/PrestudentLib.php
@@ -555,67 +555,192 @@ class PrestudentLib
 		return success();
 	}
 
-	public function setFirstStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id, $bestaetigtAm, $bestaetigtVon, $stg_kz, $uidStudent)
-	{
-		$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
+	public function setFirstStudent(
+		$prestudent_id,
+		$studiensemester_kurzbz,
+		$ausbildungssemester,
+		$orgform_kurzbz,
+		$studienplan_id,
+		$statusgrund_id
+	) {
+		$this->_ci->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
+		$this->_ci->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz');
+		$result = $this->_ci->PrestudentModel->load($prestudent_id);
+
 		if (isError($result))
 			return $result;
-		$prestudent_status = current(getData($result));
-		if(!$prestudent_status)
-		{
-			return error($this->_ci->p->t('studierendenantrag', 'error_no_prestudent_in_sem', [
-				'prestudent_id' => $prestudent_id,
-				'studiensemester_kurzbz' => $studiensemester_kurzbz
-			]));
+
+		if (!hasData($result))
+			return error('No prestudent');
+
+		$student_data = current(getData($result));
+
+
+		$authUID = getAuthUID();
+		$now = date('c');
+		$today = date('Y-m-d');
+
+		$jahr = mb_substr($studiensemester_kurzbz, 4, 2);
+
+
+		// Genererate Personenkennzeichen
+		$personenkennzeichen = $this->_ci->StudentModel->generateMatrikelnummer2(
+			$student_data->studiengang_kz,
+			$studiensemester_kurzbz,
+			$student_data->typ
+		);
+		if (isError($personenkennzeichen))
+			return $personenkennzeichen;
+		$personenkennzeichen = getData($personenkennzeichen);
+		
+		
+		// Generate UID
+		$uid = $this->_ci->StudentModel->generateUID(
+			$student_data->kurzbz,
+			$jahr,
+			$student_data->typ,
+			$personenkennzeichen,
+			$student_data->vorname,
+			$student_data->nachname
+		);
+		if (isError($uid))
+			return $uid;
+		$uid = getData($uid);
+
+
+		// Generate Matrikelnummer
+		$matrikelnummer = $this->_ci->BenutzerModel->generateMatrikelnummer(
+			$student_data->oe_kurzbz
+		);
+		if (isError($matrikelnummer))
+			return $matrikelnummer;
+		$matrikelnummer = getData($matrikelnummer);
+
+
+		// Generate Alias
+		$alias = '';
+		if (!defined('GENERATE_ALIAS_STUDENT')
+			|| GENERATE_ALIAS_STUDENT === true
+		) {
+			$result = $this->_ci->BenutzerModel->generateAliasFromName($student_data->vorname, $student_data->nachname);
+			if (isError($result))
+				return $result;
+			$alias = getData($result);
 		}
 
-		//check studiensemester_kurzbz is last
-		$studiensemester_kurzbz = $prestudent_status->studiensemester_kurzbz != $studiensemester_kurzbz ?
-			$prestudent_status->studiensemester_kurzbz : $studiensemester_kurzbz;
+		// Generate Activation Key
+		$activationkey = $this->_ci->BenutzerModel->generateActivationkey();
 
-		//check if ausbildungssemester is last
-		$ausbildungssemester = $prestudent_status->ausbildungssemester != $ausbildungssemester ?
-			$prestudent_status->ausbildungssemester : $ausbildungssemester;
 
-		//Status updaten
-		$result = $this->_ci->PrestudentstatusModel->insert([
-			'prestudent_id' => $prestudent_id,
-			'status_kurzbz' => Prestudentstatus_model::STATUS_STUDENT,
-			'studiensemester_kurzbz' => $studiensemester_kurzbz,
-			'ausbildungssemester' => $ausbildungssemester,
-			'statusgrund_id' => $statusgrund_id,
-			'datum' => date('c'),
-			'insertvon' => getAuthUID(),
-			'insertamum' => date('c'),
-			'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz,
-			'studienplan_id'=> $prestudent_status->studienplan_id,
-			'bestaetigtvon' => $bestaetigtVon,
-			'bestaetigtam' => $bestaetigtAm
+		// Overwrite stuff
+		if (defined('SET_UID_AS_MATRIKELNUMMER')
+			&& SET_UID_AS_MATRIKELNUMMER)
+			$matrikelnummer = $uid;
+		if (defined('SET_UID_AS_PERSONENKENNZEICHEN')
+			&& SET_UID_AS_PERSONENKENNZEICHEN)
+			$personenkennzeichen = $uid;
+
+
+		// Update Person
+		$this->_ci->load->model('person/Person_model', 'PersonModel');
+		$result = $this->_ci->PersonModel->update([
+			'person_id' => $student_data->person_id,
+			'matr_nr' => null
+		], [
+			'matr_nr' => $matrikelnummer
 		]);
 
 		if (isError($result))
 			return $result;
 
-		$verband = '';
-		$gruppe = '';
-		$studiengang_kz = $stg_kz;
 
-		//process studentlehrverband
-		$this->_ci->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
-		$result = $this->_ci->StudentlehrverbandModel->processStudentlehrverband(
-			$uidStudent,
-			$studiengang_kz,
-			$ausbildungssemester,
-			$verband,
-			$gruppe,
-			$studiensemester_kurzbz
-		);
+		// Add Benutzer
+		$result = $this->_ci->BenutzerModel->insert([
+			'uid' => $uid,
+			'person_id' => $student_data->person_id,
+			'aktiv' => true,
+			'aktivierungscode' => $activationkey,
+			'alias' => $alias,
+			'insertvon' => $authUID,
+			'insertamum' => $now,
+		]);
 
 		if (isError($result))
-		{
 			return $result;
+		
+
+		// Add Student
+		$result = $this->_ci->StudentModel->insert([
+			'student_uid' => $uid,
+			'matrikelnr' => $personenkennzeichen,
+			'prestudent_id' => $prestudent_id,
+			'studiengang_kz' => $student_data->studiengang_kz,
+			'semester' => $ausbildungssemester,
+			'verband' => ' ',
+			'gruppe' => ' ',
+			'insertvon' => $authUID,
+			'insertamum' => $now
+		]);
+
+		if (isError($result))
+			return $result;
+		
+
+		// Add Lehrverband if it does not exist
+		$result = $this->_ci->LehrverbandModel->load([' ', ' ', $ausbildungssemester, $student_data->studiengang_kz]);
+		
+		if (isError($result))
+			return $result;
+		
+		if (!hasData($result)) {
+			$result = $this->_ci->LehrverbandModel->insert([
+				'studiengang_kz' => $student_data->studiengang_kz,
+				'semester' => $ausbildungssemester,
+				'verband' => ' ',
+				'gruppe' => ' ',
+				'aktiv' => true
+			]);
+
+			if (isError($result))
+				return $result;
 		}
 
+
+		// Add Rolle
+		$result = $this->_ci->PrestudentstatusModel->insert([
+			'prestudent_id' => $prestudent_id,
+			'status_kurzbz' => Prestudentstatus_model::STATUS_STUDENT,
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'ausbildungssemester' => $ausbildungssemester,
+			'orgform_kurzbz'=> $orgform_kurzbz,
+			'studienplan_id'=> $studienplan_id,
+			'datum' => $today,
+			'insertamum' => $now,
+			'insertvon' => $authUID,
+			'bestaetigtam' => $today,
+			'bestaetigtvon' => $authUID,
+			'statusgrund_id' => $statusgrund_id
+		]);
+
+		if (isError($result))
+			return $result;
+
+
+		// Add Studentlehrverband
+		$result = $this->_ci->StudentlehrverbandModel->insert([
+			'student_uid' => $uid,
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'studiengang_kz' => $student_data->studiengang_kz,
+			'semester' => $ausbildungssemester,
+			'verband' => ' ',
+			'gruppe' => ' ',
+			'insertamum' => $now,
+			'insertvon' => $authUID
+		]);
+
+		if (isError($result))
+			return $result;
+
 		return success();
 	}
 
diff --git a/application/models/crm/Student_model.php b/application/models/crm/Student_model.php
index adeef07fc..bd7ab41b6 100644
--- a/application/models/crm/Student_model.php
+++ b/application/models/crm/Student_model.php
@@ -1,4 +1,8 @@
 <?php
+
+use \InvalidArgumentException as InvalidArgumentException;
+use \CI3_Events as Events;
+
 class Student_model extends DB_Model
 {
 
@@ -47,18 +51,42 @@ class Student_model extends DB_Model
 		return $matrikelnummer.sprintf("%03d", $max);
 	}
 
-	// ****
-	// * Generiert die Matrikelnummer
-	// * FORMAT: 0710254001
-	// * 07 = Jahr
-	// * 1/2/0  = WS/SS/incoming
-	// * 0254 = Studiengangskennzahl vierstellig
-	// * 001 = Laufende Nummer
-	// * copy of generateMatrikelnummer plus
-	// * logic FH Burgenland
-	// ****
+	/**
+	 * Generiert die Matrikelnummer
+	 * FORMAT: 0710254001
+	 * 07 = Jahr
+	 * 1/2/0  = WS/SS/incoming
+	 * 0254 = Studiengangskennzahl vierstellig
+	 * 001 = Laufende Nummer
+	 * copy of generateMatrikelnummer plus
+	 * logic FH Burgenland
+	 *
+	 * TODO(chris): replace function above with this?
+	 * TODO(chris): rename to generatePersonenkennzeichen?
+	 *
+	 * @param integer					$studiengang_kz
+	 * @param string					$studiensemester_kurzbz
+	 * @param string					$typ
+	 *
+	 * @return stdClass
+	 */
 	public function generateMatrikelnummer2($studiengang_kz, $studiensemester_kurzbz, $typ = null)
 	{
+		$personenkennzeichen = false;
+
+		Events::trigger(
+			'generate_personenkennzeichen',
+			function ($value) use ($personenkennzeichen) {
+				$personenkennzeichen = $value;
+			},
+			$studiengang_kz,
+			$studiensemester_kurzbz,
+			$typ
+		);
+
+		if ($personenkennzeichen !== false)
+			return success($personenkennzeichen);
+
 		// Validierung der Eingabewerte
 		if (strlen($studiensemester_kurzbz) < 6) {
 			throw new InvalidArgumentException("Ungültiges studiensemester_kurzbz Format.");
@@ -129,18 +157,45 @@ class Student_model extends DB_Model
 		return success($matrikelnummer.sprintf("%03d", $max));
 	}
 
-	// ****
-	// * Generiert die UID
-	// * FORMAT: el07b001
-	// * $stgkzl: el = studiengangskuerzel
-	// * $jahr: 07 = Jahr
-	// * $stgtyp: b/m/d/x = Bachelor/Master/Diplom/Incoming
-	// * $matrikelnummer
-	// * 001 = Laufende Nummer  Wenn StSem==SS dann wird zur Nummer 500 dazugezaehlt
-	// * Bei Incoming im Masterstudiengang wird auch 500 dazugezaehlt
-	// ****
-	public function generateUID($stgkzl, $jahr, $stgtyp, $matrikelnummer)
+	/**
+	 * Generiert die UID
+	 * FORMAT: el07b001
+	 * $stgkzl: el = studiengangskuerzel
+	 * $jahr: 07 = Jahr
+	 * $stgtyp: b/m/d/x = Bachelor/Master/Diplom/Incoming
+	 * $matrikelnummer
+	 * 001 = Laufende Nummer  Wenn StSem==SS dann wird zur Nummer 500 dazugezaehlt
+	 * Bei Incoming im Masterstudiengang wird auch 500 dazugezaehlt
+	 *
+	 * @param string					$stgkzl
+	 * @param string					$jahr
+	 * @param string					$stgtyp
+	 * @param string					$matrikelnummer
+	 * @param string					$vorname
+	 * @param string					$nachname
+	 *
+	 * @return stdClass
+	 */
+	public function generateUID($stgkzl, $jahr, $stgtyp, $matrikelnummer, $vorname, $nachname)
 	{
+		$uid = false;
+
+		Events::trigger(
+			'generate_student_uid',
+			function ($value) use ($uid) {
+				$uid = $value;
+			},
+			$stgkzl,
+			$jahr,
+			$stgtyp,
+			$matrikelnummer,
+			$vorname,
+			$nachname
+		);
+
+		if ($uid !== false)
+			return success($uid);
+
 		$art = mb_substr($matrikelnummer, 2, 1);
 		$nr = mb_substr($matrikelnummer, mb_strlen(trim($matrikelnummer))-3);
 		if($art=='2') //Sommersemester
diff --git a/application/models/education/Studentlehrverband_model.php b/application/models/education/Studentlehrverband_model.php
index e4eabe89d..2ef14e58e 100644
--- a/application/models/education/Studentlehrverband_model.php
+++ b/application/models/education/Studentlehrverband_model.php
@@ -14,141 +14,4 @@ class Studentlehrverband_model extends DB_Model
 
 		$this->load->model('crm/prestudentstatus_model', 'PrestudentstatusModel');
 	}
-
-	/**
-	 * update Lehrverband and Studenlehrverband
-	 *
-	 * @param char 					$student_id
-	 * @param integer 				$studiengang_kz
-	 * @param integer 				$ausbildungssemester
-	 * @param char 					$verband
-	 * @param char 					$gruppe
-	 * @param string 				$studiensemester_kurzbz
-	 *
-	 * @return success if handling lehrverband, studentlehrverband successfull
-	 * 			error if not
-	 *
-	 */
-	public function processStudentlehrverband(
-		$student_uid,
-		$studiengang_kz,
-		$ausbildungssemester,
-		$verband,
-		$gruppe,
-		$studiensemester_kurzbz,
-		$status_kurzbz = null
-	) {
-		$uid = getAuthUID();
-
-		$this->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
-		$result = $this->LehrverbandModel->checkIfLehrverbandExists($studiengang_kz, $ausbildungssemester, $verband, $gruppe);
-		if (isError($result))
-		{
-			return error("0", $this->p->t('lehre', 'error_updateLehrverband'));
-		}
-
-		if ($result->retval == "0")
-		{
-			// Übergeordneten Lehrverband check and/or insert
-			$result = $this->LehrverbandModel->checkIfLehrverbandExists($studiengang_kz, $ausbildungssemester, '', '');
-			if (isError($result)) {
-				return error("0", $this->p->t('lehre', 'error_updateLehrverband'));
-			}
-
-			if ($result->retval == "0")
-			{
-				$bezeichnung = (
-					$status_kurzbz == PrestudentstatusModel::STATUS_ABBRECHER
-					|| $status_kurzbz == Prestudentstatus_model::STATUS_UNTERBRECHER)
-					? 'Ab-Unterbrecher' : '';
-				$result = $this->LehrverbandModel->insert([
-					'studiengang_kz' => $studiengang_kz,
-					'semester' => $ausbildungssemester,
-					'verband' => '',
-					'gruppe' => '',
-					'aktiv' => true,
-					'bezeichnung' => $bezeichnung
-				]);
-
-				if (isError($result))
-				{
-					return error("0", $this->p->t('lehre', 'error_updateLehrverband'));
-				}
-			}
-
-			// Lehrverband insert
-			if ($verband == 'A')
-				$bezeichnung = Prestudentstatus_model::STATUS_ABBRECHER;
-			elseif ($verband == 'B')
-				$bezeichnung = Prestudentstatus_model::STATUS_BEWERBER;
-			else
-				$bezeichnung = '';
-
-			$result = $this->LehrverbandModel->insert([
-				'studiengang_kz' => $studiengang_kz,
-				'semester' => $ausbildungssemester,
-				'verband' => $verband,
-				'gruppe' => $gruppe,
-				'bezeichnung' => $bezeichnung,
-				'aktiv' => true
-			]);
-
-			if (isError($result)) {
-				return error("0", $this->p->t('lehre', 'error_updateLehrverband'));
-			}
-		}
-
-		// Studentlehrverband insert or update
-		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
-		$result = $this->StudentlehrverbandModel->checkIfStudentLehrverbandExists($student_uid, $studiensemester_kurzbz);
-		if (isError($result))
-		{
-			return error($result);
-		}
-
-		if ($result->retval == "0")
-		{
-			$result = $this->StudentlehrverbandModel->insert([
-				'student_uid' => $student_uid,
-				'studiensemester_kurzbz' => $studiensemester_kurzbz,
-				'semester' => $ausbildungssemester,
-				'verband' => $verband,
-				'gruppe' => $gruppe,
-				'insertamum' => date('c'),
-				'insertvon' => $uid,
-				'studiengang_kz' => $studiengang_kz
-			]);
-			if (isError($result)) {
-				return error("0", $this->p->t('lehre', 'error_updateStudentlehrverband'));
-			}
-		}
-		else
-		{
-			$result = $this->StudentlehrverbandModel->update(
-				[
-					'student_uid' => $student_uid,
-					'studiensemester_kurzbz' => $studiensemester_kurzbz
-				],
-				[
-					'semester' => $ausbildungssemester,
-					'verband' => $verband,
-					'gruppe' => $gruppe,
-					'updateamum' => date('c'),
-					'updatevon' => $uid,
-					'studiengang_kz' => $studiengang_kz
-				]
-			);
-			if (isError($result)) {
-				return error("0", $this->p->t('lehre', 'error_updateStudentlehrverband'));
-			}
-		}
-
-		if (isError($result)) {
-			return error("0", $this->p->t('lehre', 'error_updateStudentlehrverband'));
-		}
-		else
-		{
-			return success();
-		}
-	}
 }
diff --git a/application/models/organisation/Lehrverband_model.php b/application/models/organisation/Lehrverband_model.php
index bc4858e5f..0e760a116 100644
--- a/application/models/organisation/Lehrverband_model.php
+++ b/application/models/organisation/Lehrverband_model.php
@@ -12,48 +12,6 @@ class Lehrverband_model extends DB_Model
 		$this->pk = array('gruppe', 'verband', 'semester', 'studiengang_kz');
 	}
 
-	/**
-	 * Check if Lehrverband already exists
-	 * @param Integer $studiengang_kz
-	 * @param Integer $semester
-	 * @param char $verband
-	 * @param char $gruppe
-	 * @return 1: if Lehrverband exists, 0: if it doesn't
-	 */
-	public function checkIfLehrverbandExists($studiengang_kz, $semester, $verband, $gruppe)
-	{
-		$qry = "SELECT
-					*
-				FROM 
-				    public.tbl_lehrverband
-				WHERE
-					studiengang_kz = ? 
-				AND
-				    semester = ?
-				AND
-				    verband = ?
-				AND
-				    gruppe = ?
-				    
-				    ";
-
-		$result = $this->execQuery($qry, array($studiengang_kz, $semester, $verband, $gruppe));
-
-
-		if(isError($result))
-		{
-			return error($result);
-		}
-		elseif(!hasData($result))
-		{
-			return success("0", "Kein Lehrverband vorhanden!");
-		}
-		else
-		{
-			return success("1","Lehrverband vorhanden!");
-		}
-	}
-
 	/**
 	 * Gets the maximum possible semester for one or more Studiengaenge.
 	 * If there are more than one Studiengang each maximum is calculated and
diff --git a/application/models/person/Benutzer_model.php b/application/models/person/Benutzer_model.php
index 0c1a6fddf..65121dbb5 100644
--- a/application/models/person/Benutzer_model.php
+++ b/application/models/person/Benutzer_model.php
@@ -1,4 +1,7 @@
 <?php
+
+use \CI3_Events as Events;
+
 class Benutzer_model extends DB_Model
 {
 
@@ -74,53 +77,90 @@ class Benutzer_model extends DB_Model
 	 */
 	public function generateAlias($uid)
 	{
-		$aliasres = '';
 		$this->addLimit(1);
 		$this->addSelect('vorname, nachname');
 		$this->addJoin('public.tbl_person', 'person_id');
 		$nameresult = $this->loadWhere(array('uid' => $uid));
 
-		if (hasData($nameresult))
-		{
-			$aliasdata = getData($nameresult);
-			$alias = $this->_sanitizeAliasName($aliasdata[0]->vorname).'.'.$this->_sanitizeAliasName($aliasdata[0]->nachname);
-			$aliasexists = $this->aliasExists($alias);
+		if (isError($nameresult))
+			return $nameresult;
 
-			if (hasData($aliasexists) && !getData($aliasexists)[0])
-				$aliasres = $alias;
-		}
+		if (!hasData($nameresult))
+			return success('');
+		
+		$aliasdata = current(getData($nameresult));
 
-		return success($aliasres);
+		return $this->generateAliasFromName($aliasdata->vorname, $aliasdata->nachname);
 	}
 
 	/**
-	 * Generates alias for a person_id
-	 * @param $person_id
-	 * @return string
+	 * Generates alias for a vor- and nachname.
+	 *
+	 * @param string						$vorname
+	 * @param string						$nachname
+	 *
+	 * @return stdClass
 	 */
-	public function generateAliasByPersonId($person_id)
+	public function generateAliasFromName($vorname, $nachname)
 	{
-		$sql = 'SELECT p.vorname, p.nachname
-				FROM public.tbl_person p
-				where person_id = ?';
+		$alias = $this->_sanitizeAliasName($vorname . '.' . $nachname);
+		
+		$result = $this->aliasExists($alias);
 
-		$nameresult = $this->execQuery($sql, array($person_id));
+		if (isError($result))
+			return $result;
 
-		$nameresult = current(getData($nameresult)) ?: null;
-
-		if($nameresult)
-		{
-			$alias = $this->_sanitizeAliasName($nameresult->vorname).'.'.$this->_sanitizeAliasName($nameresult->nachname);
-
-			$aliasexists = $this->aliasExists($alias);
-
-			if (hasData($aliasexists) && current(getData($aliasexists)))
-				$alias = "";
-		}
+		if (current(getData($result)))
+			return success('');
 
 		return success($alias);
 	}
 
+	/**
+	 * Generates a matrikelnummer
+	 *
+	 * @param string						$oe_kurzbz
+	 *
+	 * @return stdClass
+	 */
+	public function generateMatrikelnummer($oe_kurzbz)
+	{
+		$matrikelnummer = false;
+
+		Events::trigger(
+			'generate_matrikelnummer',
+			function ($value) use ($matrikelnummer) {
+				$matrikelnummer = $value;
+			},
+			$oe_kurzbz
+		);
+
+		if ($matrikelnummer !== false)
+			return success($matrikelnummer);
+
+		return success(null);
+	}
+
+	/**
+	 * Generates an activation key
+	 *
+	 * @return string
+	 */
+	public function generateActivationkey()
+	{
+		$this->load->library('CryptLib');
+
+		$key = '';
+		for ($i=0; $i<32; $i++)
+			$key .= ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'][mt_rand(0, 15)];
+
+		$value = uniqid(mt_rand(), true);
+		$length = strlen($value);
+		$value = str_pad($value, $length + 32 - ($length % 32), chr(0));
+
+		return md5($this->cryptlib->RIJNDAEL_256_ECB($value, $key, true));
+	}
+
 	// --------------------------------------------------------------------------------------------
 	// Private methods
 
@@ -135,55 +175,4 @@ class Benutzer_model extends DB_Model
 		$str = sanitizeProblemChars($str);
 		return mb_strtolower(str_replace(' ', '_', $str));
 	}
-
-	/**
-	 * Generiert einen Aktivierungscode
-	 */
-	public function generateActivationKey()
-	{
-		$keyvalues=array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F');
-		$key='';
-		for($i=0; $i<32; $i++)
-			$key.=$keyvalues[mt_rand(0, 15)];
-
-		return success(md5(encryptData(uniqid(mt_rand(), true), $key)));
-	}
-
-	/**
-	 * Check if Benutzer already exists
-	 * @param String $uid
-	 * @return 0 if not exists, 1 if it does
-	 */
-	public function checkIfExistingBenutzer($uid)
-	{
-		$qry = "SELECT 
-    				count(*) as anzahl 
-				FROM 
-				    public.tbl_benutzer 
-				WHERE 
-				    uid = ? ";
-
-		$result = $this->execQuery($qry, array($uid));
-
-		if (isError($result))
-		{
-			return error($result);
-		}
-
-		$resultObject = current(getData($result));
-
-		if (property_exists($resultObject, 'anzahl'))
-		{
-			$resultValue = (int)$resultObject->anzahl;
-
-			if ($resultValue > 0)
-			{
-				return success("1");
-			}
-			else
-			{
-				return success("0");
-			}
-		}
-	}
 }

From 8b1ade86ace8b61dabab7aca794873316094b850 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 8 Aug 2024 16:39:47 +0200
Subject: [PATCH 1111/1461] revert wrong changes from "adapt function
 toolbarInteressent, Phrases"

---
 .../api/frontend/v1/stv/Status.php            | 41 ++++++++++++-------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index f54283303..2efa88572 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -1694,10 +1694,6 @@ class Status extends FHCAPI_Controller
 
 		$studentlvb = $this->getDataOrTerminateWithError($result);
 
-		// NOTE(chris): if $studentlvb then update to the same values as before (except updatevon). So do nothing?
-		// TODO(chris): check if that is correct (in FAS)?
-		if ($studentlvb)
-			return; // No Update necessary
 
 		$this->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
 
@@ -1710,16 +1706,33 @@ class Status extends FHCAPI_Controller
 		]);
 		$lv = $this->getDataOrTerminateWithError($result);
 
-		$this->StudentlehrverbandModel->insert([
-			'student_uid' => $student->student_uid,
-			'studiensemester_kurzbz' => $studiensemester_kurzbz,
-			'studiengang_kz' => $student->studiengang_kz,
-			'semester' => $lv ? $ausbildungssemester : $student->semester,
-			'verband' => $student->verband,
-			'gruppe' => $student->gruppe,
-			'insertamum' => date('c'),
-			'insertvon' => $authUID
-		]);
+
+		if ($studentlvb && !$lv)
+			return; // No Update necessary
+
+		if ($studentlvb) // Update current Student-Lehrverband entry
+			$this->StudentlehrverbandModel->update([
+				'student_uid' => $student->student_uid,
+				'studiensemester_kurzbz' => $studiensemester_kurzbz
+			], [
+				'studiengang_kz' => $student->studiengang_kz,
+				'semester' => $ausbildungssemester,
+				'verband' => $student->verband,
+				'gruppe' => $student->gruppe,
+				'updateamum' => date('c'),
+				'updatevon' => $authUID
+			]);
+		else // Add new Student-Lehrverband entry
+			$this->StudentlehrverbandModel->insert([
+				'student_uid' => $student->student_uid,
+				'studiensemester_kurzbz' => $studiensemester_kurzbz,
+				'studiengang_kz' => $student->studiengang_kz,
+				'semester' => $lv ? $ausbildungssemester : $student->semester,
+				'verband' => $student->verband,
+				'gruppe' => $student->gruppe,
+				'insertamum' => date('c'),
+				'insertvon' => $authUID
+			]);
 	}
 
 	/**

From 59e501e52b8d2380f11fa3e7692c959745aea0b2 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 9 Aug 2024 13:23:41 +0200
Subject: [PATCH 1112/1461] use new FHCAPI features in UDF controller

---
 .../controllers/api/frontend/v1/Udf.php       | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Udf.php b/application/controllers/api/frontend/v1/Udf.php
index 99ed2a10d..4bdc613e0 100644
--- a/application/controllers/api/frontend/v1/Udf.php
+++ b/application/controllers/api/frontend/v1/Udf.php
@@ -31,11 +31,10 @@ class Udf extends FHCAPI_Controller
 	 */
 	public function __construct()
 	{
-		// TODO(chris): permissions
 		// NOTE: UdfLib has its own permissions checks
 		parent::__construct([
-			'load' => 'admin:r',#self::PERM_LOGGED,
-			'save' => 'admin:r'#self::PERM_LOGGED
+			'load' => self::PERM_LOGGED,
+			'save' => self::PERM_LOGGED
 		]);
 
 		// Libraries
@@ -73,10 +72,7 @@ class Udf extends FHCAPI_Controller
 
 		$result = $this->udflib->getFieldArray($this->TargetModel, $id);
 
-		#$fields = $this->getDataOrTerminateWithError($result);
-		if (isError($result))
-			$this->terminateWithError(getError($result));
-		$fields = $result->retval;
+		$fields = $this->getDataOrTerminateWithError($result);
 
 		$this->terminateWithSuccess($fields);
 	}
@@ -94,10 +90,7 @@ class Udf extends FHCAPI_Controller
 
 		$result = $this->udflib->getCiValidations($this->TargetModel, $this->input->post());
 		
-		#$fieldValidations = $this->getDataOrTerminateWithError($result);
-		if (isError($result))
-			$this->terminateWithError(getError($result));
-		$fieldvalidations = $result->retval;
+		$fieldValidations = $this->getDataOrTerminateWithError($result);
 
 		$this->form_validation->set_rules($fieldvalidations);
 
@@ -117,9 +110,7 @@ class Udf extends FHCAPI_Controller
 
 		$result = $this->TargetModel->update($id, $fields);
 
-		#$this->getDataOrTerminateWithError($result);
-		if (isError($result))
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		$this->getDataOrTerminateWithError($result);
 
 		$this->terminateWithSuccess(array_fill_keys(array_keys($fields), ''));
 	}

From d57bd7d7ba93ebab1e4773db485855c6f980cabe Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 9 Aug 2024 13:24:39 +0200
Subject: [PATCH 1113/1461] Bugfixes in Students Controller

---
 .../api/frontend/v1/stv/Students.php          |  11 +-
 .../controllers/components/stv/Students.php   | 711 ------------------
 2 files changed, 6 insertions(+), 716 deletions(-)
 delete mode 100644 application/controllers/components/stv/Students.php

diff --git a/application/controllers/api/frontend/v1/stv/Students.php b/application/controllers/api/frontend/v1/stv/Students.php
index 7b7bfc87d..9d09d6f8c 100644
--- a/application/controllers/api/frontend/v1/stv/Students.php
+++ b/application/controllers/api/frontend/v1/stv/Students.php
@@ -124,10 +124,10 @@ class Students extends FHCAPI_Controller
 			$org = $params[0];
 			if ($count > 1 && $params[1] == 'prestudent') {
 				if ($count == 2)
-					return $this->getPrestudents(null, null, $org);
+					return $this->getPrestudents($method, null, null, $org);
 				if ($count == 3)
-					return $this->getPrestudents($params[2], null, $org);
-				return $this->getPrestudents($params[2], $params[$count-1], $org);
+					return $this->getPrestudents($method, $params[2], null, $org);
+				return $this->getPrestudents($method, $params[2], $params[$count-1], $org);
 			}
 			$sem = $count > 1 ? $params[1] : null;
 			if ($count == 4 && $params[2] == 'grp') {
@@ -310,6 +310,7 @@ class Students extends FHCAPI_Controller
 				break;
 			default:
 				if (!$studiensemester_kurzbz) {
+					// TODO(chris): this does not work with $orgform_kurzbz != null
 					$where['ps.status_kurzbz'] = null;
 				} else {
 					$this->PrestudentModel->db->where_in('ps.status_kurzbz', [
@@ -348,7 +349,7 @@ class Students extends FHCAPI_Controller
 		$this->addSelectPrioRel();
 
 		$this->addFilter($studiensemester_kurzbz);
-		
+
 		$result = $this->PrestudentModel->loadWhere($where);
 
 		$data = $this->getDataOrTerminateWithError($result);
@@ -422,7 +423,7 @@ class Students extends FHCAPI_Controller
 						WHERE prestudent_id=tbl_prestudent.prestudent_id 
 						AND studiensemester_kurzbz=" . $this->PrestudentModel->escape($studiensemester_kurzbz) . " 
 						ORDER BY datum DESC, insertamum DESC, ext_id DESC LIMIT 1
-					)",
+					) =",
 					$this->PrestudentModel->escape($orgform_kurzbz),
 					false
 				);
diff --git a/application/controllers/components/stv/Students.php b/application/controllers/components/stv/Students.php
deleted file mode 100644
index 59b2c2970..000000000
--- a/application/controllers/components/stv/Students.php
+++ /dev/null
@@ -1,711 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-// TODO(chris): Prestudent status missing
-// TODO(chris): Prestudent studiengang missing
-
-class Students extends FHC_Controller
-{
-	public function __construct()
-	{
-		// TODO(chris): access!
-		parent::__construct();
-
-		// Load Libraries
-		$this->load->library('AuthLib');
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-	}
-
-	/**
-	 * Remap calls:
-	 * /													=> return []
-	 * /inout												=> return []
-	 * /inout/incoming										=> getIncoming
-	 * /inout/outgoing										=> getOutgoing
-	 * /inout/gemeinsamestudien								=> getGemeinsamestudien
-	 * /(studiengang_kz)									=> getStudents
-	 * /(studiengang_kz)/prestudent							=> getPrestudents
-	 * /(studiengang_kz)/prestudent/*						=> getPrestudents
-	 * /(studiengang_kz)/(semester)							=> getStudents
-	 * /(studiengang_kz)/(semester)/grp/(gruppe_kurzbz)		=> getStudents
-	 * /(studiengang_kz)/(semester)/(verband)				=> getStudents
-	 * /(studiengang_kz)/(semester)/(verband)/(gruppe)		=> getStudents
-	 * /(studiengang_kz)/(org_form)							=> getStudents
-	 * /(studiengang_kz)/(org_form)/prestudent				=> getPrestudents
-	 * /(studiengang_kz)/(org_form)/prestudent/*			=> getPrestudents
-	 * /(studiengang_kz)/(org_form)/(semester)				=> getStudents
-	 * /(studiengang_kz)/(org_form)/(semester)/grp/(gruppe_kurzbz)
-	 * 														=> getStudents
-	 * /(studiengang_kz)/(org_form)/(semester)/(verband)	=> getStudents
-	 * /(studiengang_kz)/(org_form)/(semester)/(verband)/(gruppe)
-	 * 														=> getStudents
-	 * /uid/(student_uid)									=> getStudent
-	 * /prestudent/(prestudent_id)							=> getPrestudent
-	 * /person/(person_id)									=> getPerson
-	 *
-	 * @param string		$method
-	 * @param array			$params				(optional)
-	 *
-	 * @return void
-	 */
-	public function _remap($method, $params = [])
-	{
-		if ($method == '' || $method == 'index')
-			return $this->outputJson([]);
-
-		if ($method == 'inout') {
-			if (!count($params))
-				return $this->outputJson([]);
-			switch ($params[0]) {
-				case 'incoming':
-					return $this->getIncoming();
-				case 'outgoing':
-					return $this->getOutgoing();
-				case 'gemeinsamestudien':
-					return $this->getGemeinsamestudien();
-				default:
-					return show_404();
-			}
-		}
-
-		$count = count($params);
-		if (!$count)
-			return $this->getStudents($method);
-
-		if ($method == 'uid' && $count == 1)
-			return $this->getStudent($params[0]);
-
-		if ($method == 'prestudent' && $count == 1)
-			return $this->getPrestudent($params[0]);
-
-		if ($method == 'person' && $count == 1)
-			return $this->getPerson($params[0]);
-
-		if (is_numeric($params[0])) {
-			$sem = $params[0];
-			if ($count == 3 && $params[1] == 'grp') {
-				$g = $params[2];
-				$ver = null;
-				$grp = null;
-			} else {
-				$g = null;
-				$ver = $count > 1 ? $params[1] : null;
-				$grp = $count > 2 ? $params[2] : null;
-			}
-			return $this->getStudents($method, $sem, $ver, $grp, $g);
-		} elseif ($params[0] == 'prestudent') {
-			if ($count == 1)
-				return $this->getPrestudents($method);
-			if ($count == 2)
-				return $this->getPrestudents($method, $params[1]);
-			return $this->getPrestudents($method, $params[1], $params[$count-1]);
-		} else {
-			$org = $params[0];
-			if ($count > 1 && $params[1] == 'prestudent') {
-				if ($count == 2)
-					return $this->getPrestudents(null, null, $org);
-				if ($count == 3)
-					return $this->getPrestudents($params[2], null, $org);
-				return $this->getPrestudents($params[2], $params[$count-1], $org);
-			}
-			$sem = $count > 1 ? $params[1] : null;
-			if ($count == 4 && $params[2] == 'grp') {
-				$g = $params[3];
-				$ver = null;
-				$grp = null;
-			} else {
-				$g = null;
-				$ver = $count > 2 ? $params[2] : null;
-				$grp = $count > 3 ? $params[3] : null;
-			}
-
-			return $this->getStudents($method, $sem, $ver, $grp, $g, $org);
-		}
-		
-		show_404();
-	}
-
-	/**
-	 * @return void
-	 */
-	protected function getIncoming()
-	{
-		// TODO(chris): IMPLEMENT!
-		$this->outputJson([]);
-	}
-
-	/**
-	 * @return void
-	 */
-	protected function getOutgoing()
-	{
-		// TODO(chris): IMPLEMENT!
-		$this->outputJson([]);
-	}
-
-	/**
-	 * @return void
-	 */
-	protected function getGemeinsamestudien()
-	{
-		// TODO(chris): IMPLEMENT!
-		$this->outputJson([]);
-	}
-
-	/**
-	 * @param integer		$studiengang_kz
-	 * @param string		$studiensemester_kurzbz			(optional)
-	 * @param string		$filter							(optional)
-	 * @param string		$orgform_kurzbz					(optional)
-	 *
-	 * @return void
-	 */
-	protected function getPrestudents($studiengang_kz, $studiensemester_kurzbz = null, $filter = null, $orgform_kurzbz = null)
-	{
-		// TODO(chris): @see: prestudent.class::loadInteressentenUndBewerber
-		// TODO(chris): IMPLEMENT!
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-
-		$stdsemEsc = $this->PrestudentModel->escape($studiensemester_kurzbz);
-		
-		$where = [];
-		if ($orgform_kurzbz) {
-			$where['ps.orgform_kurzbz'] = $orgform_kurzbz;
-		}
-
-		switch ($filter) {
-			case "interessenten":
-				$where['ps.status_kurzbz'] = 'Interessent';
-				break;
-			case "bewerbungnichtabgeschickt":
-				$where['ps.status_kurzbz'] = 'Interessent';
-				$where['bewerbung_abgeschicktamum'] = null;
-				break;
-			case "bewerbungabgeschickt":
-				$where['ps.status_kurzbz'] = 'Interessent';
-				$where['bewerbung_abgeschicktamum IS NOT'] = null;
-				$where['bestaetigtam'] = null;
-				break;
-			case "statusbestaetigt":
-				$where['ps.status_kurzbz'] = 'Interessent';
-				$where['bestaetigtam IS NOT'] = null;
-				break;
-			case "statusbestaetigtrtnichtangemeldet":
-				$where['ps.status_kurzbz'] = 'Interessent';
-				$where['bestaetigtam IS NOT'] = null;
-				$this->PrestudentModel->db->where('NOT EXISTS(SELECT 1 FROM public.tbl_rt_person JOIN public.tbl_reihungstest r ON (rt_id = reihungstest_id) WHERE person_id=p.person_id AND studienplan_id IN (SELECT studienplan_id FROM lehre.tbl_studienplan JOIN lehre.tbl_studienordnung o USING(studienordnung_id) WHERE o.studiengang_kz=tbl_prestudent.studiengang_kz) AND r.studiensemesterkurzbz=' . $stdsemEsc . ')', null, false);
-				break;
-			case "statusbestaetigtrtangemeldet":
-				$where['ps.status_kurzbz'] = 'Interessent';
-				$where['bestaetigtam IS NOT'] = null;
-				$this->PrestudentModel->db->where('EXISTS(SELECT 1 FROM public.tbl_rt_person JOIN public.tbl_reihungstest r ON (rt_id = reihungstest_id) WHERE person_id=p.person_id AND studienplan_id IN (SELECT studienplan_id FROM lehre.tbl_studienplan JOIN lehre.tbl_studienordnung o USING(studienordnung_id) WHERE o.studiengang_kz=tbl_prestudent.studiengang_kz) AND r.studiensemesterkurzbz=' . $stdsemEsc . ')', null, false);
-				break;
-			case "zgv":
-				$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-
-				$result = $this->StudiengangModel->load($studiengang_kz);
-				if (isError($result)) {
-					$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-					return $this->outputJson(getError($result));
-				} elseif (!hasData($result)) {
-					$this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST);
-					// TODO(chris): phrase
-					return $this->outputJson("Studiengang does not exist");
-				}
-				$stg = current(getData($result));
-
-				$where['ps.status_kurzbz'] = 'Interessent';
-				
-				if ($stg->typ == 'm') {
-					$where['zgvmas_code IS NOT'] = null;
-					if (defined('ZGV_ERFUELLT_ANZEIGEN') && ZGV_ERFUELLT_ANZEIGEN)
-						$where['zgvmas_erfuellt'] = true;
-				} elseif ($stg->typ == 'p') {
-					$where['zgvdoktor_code IS NOT'] = null;
-					if (defined('ZGV_DOKTOR_ANZEIGEN') && ZGV_DOKTOR_ANZEIGEN)
-						$where['zgvdoktor_erfuellt'] = true;
-				} else {
-					$where['zgv_code IS NOT'] = null;
-					if (defined('ZGV_ERFUELLT_ANZEIGEN') && ZGV_ERFUELLT_ANZEIGEN)
-						$where['zgv_erfuellt'] = true;
-				}
-				break;
-			case "reihungstestangemeldet":
-				$where['ps.status_kurzbz'] = 'Interessent';
-				$this->PrestudentModel->db->where('EXISTS(SELECT 1 FROM public.tbl_rt_person JOIN public.tbl_reihungstest r ON (rt_id = reihungstest_id) WHERE person_id=p.person_id AND studienplan_id IN (SELECT studienplan_id FROM lehre.tbl_studienplan JOIN lehre.tbl_studienordnung o USING(studienordnung_id) WHERE o.studiengang_kz=tbl_prestudent.studiengang_kz) AND r.studiensemesterkurzbz=' . $stdsemEsc . ')', null, false);
-				break;
-			case "reihungstestnichtangemeldet":
-				$where['ps.status_kurzbz'] = 'Interessent';
-				$this->PrestudentModel->db->where('NOT EXISTS(SELECT 1 FROM public.tbl_rt_person JOIN public.tbl_reihungstest r ON (rt_id = reihungstest_id) WHERE person_id=p.person_id AND studienplan_id IN (SELECT studienplan_id FROM lehre.tbl_studienplan JOIN lehre.tbl_studienordnung o USING(studienordnung_id) WHERE o.studiengang_kz=tbl_prestudent.studiengang_kz) AND r.studiensemesterkurzbz=' . $stdsemEsc . ')', null, false);
-				break;
-			case "bewerber":
-				$where['ps.status_kurzbz'] = 'Bewerber';
-				break;
-			case "aufgenommen":
-				$where['ps.status_kurzbz'] = 'Aufgenommener';
-				break;
-			case "warteliste":
-				$where['ps.status_kurzbz'] = 'Wartender';
-				break;
-			case "absage":
-				$where['ps.status_kurzbz'] = 'Abgewiesener';
-				break;
-			case "absolvent":
-				$where['ps.status_kurzbz'] = 'Absolvent';
-				break;
-			case "diplomand":
-				$where['ps.status_kurzbz'] = 'Diplomand';
-				break;
-			default:
-				if (!$studiensemester_kurzbz) {
-					// TODO(chris): should work ... needs testing
-					// we want all prestudents without status?
-					$where['ps.status_kurzbz'] = null;
-				} else {
-					$this->PrestudentModel->db->where_in('ps.status_kurzbz', [
-						'Interessent',
-						'Bewerber',
-						'Aufgenommener',
-						'Wartender',
-						'Abgewiesener'
-					]);
-				}
-				break;
-		}
-
-		$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
-		#$this->PrestudentModel->addJoin('public.tbl_prestudentstatus ps', 'ps.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, ' . $this->PrestudentModel->escape($studiensemester_kurzbz) . ') AND ps.prestudent_id=tbl_prestudent.prestudent_id');
-		$this->PrestudentModel->addJoin('public.tbl_prestudentstatus ps', 'ps.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ') AND ps.prestudent_id=tbl_prestudent.prestudent_id AND ps.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ') AND ps.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ')', 'LEFT');
-		// TODO(chris): check what functions are returning when no entry exists
-		
-		$this->PrestudentModel->addSelect('p.person_id');
-		$this->PrestudentModel->addSelect('tbl_prestudent.prestudent_id');
-		$this->PrestudentModel->addSelect("'' AS uid");
-		$this->PrestudentModel->addSelect('titelpre');
-		$this->PrestudentModel->addSelect('titelpost');
-		$this->PrestudentModel->addSelect('vorname');
-		$this->PrestudentModel->addSelect('wahlname');
-		$this->PrestudentModel->addSelect('vornamen');
-		$this->PrestudentModel->addSelect('geschlecht');
-		$this->PrestudentModel->addSelect('nachname');
-		$this->PrestudentModel->addSelect('gebdatum');
-		$this->PrestudentModel->addSelect('tbl_prestudent.anmerkung');
-		$this->PrestudentModel->addSelect('ersatzkennzeichen');
-		$this->PrestudentModel->addSelect('svnr');
-		$this->PrestudentModel->addSelect("'' AS matrikelnr");
-		$this->PrestudentModel->addSelect('p.anmerkung AS anmerkungen');
-		$this->PrestudentModel->addSelect("'' AS semester");
-		$this->PrestudentModel->addSelect("'' AS verband");
-		$this->PrestudentModel->addSelect("'' AS gruppe");
-		$this->PrestudentModel->addSelect('tbl_prestudent.studiengang_kz');
-		$this->PrestudentModel->addSelect('aufmerksamdurch_kurzbz');
-		$this->PrestudentModel->addSelect('mentor');
-		$this->PrestudentModel->addSelect('FALSE AS bnaktiv');
-		$this->PrestudentModel->addSelect(
-			"(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung LIMIT 1) AS email_privat",
-			false
-		);
-		$this->PrestudentModel->addSelect(
-			"(SELECT rt_gesamtpunkte AS punkte FROM public.tbl_prestudent WHERE prestudent_id=s.prestudent_id) AS punkte",
-			false
-		);
-		$this->PrestudentModel->addSelect('tbl_prestudent.dual');
-		$this->PrestudentModel->addSelect('tbl_prestudent.reihungstest_id');
-		$this->PrestudentModel->addSelect('tbl_prestudent.anmeldungreihungstest');
-		$this->PrestudentModel->addSelect('p.matr_nr');
-		$this->PrestudentModel->addSelect('tbl_prestudent.gsstudientyp_kurzbz');
-		$this->PrestudentModel->addSelect('tbl_prestudent.aufnahmegruppe_kurzbz');
-		$this->PrestudentModel->addSelect('tbl_prestudent.priorisierung');
-		$this->PrestudentModel->addSelect('p.zugangscode');
-		$this->PrestudentModel->addSelect('p.bpk');
-
-		$this->PrestudentModel->addOrder('nachname');
-		$this->PrestudentModel->addOrder('vorname');
-
-		$this->addFilter($studiensemester_kurzbz);
-
-		$this->outputJson([]);
-	}
-
-	/**
-	 * @param integer		$studiengang_kz
-	 * @param integer		$semester						(optional)
-	 * @param string		$verband						(optional)
-	 * @param integer		$gruppe							(optional)
-	 * @param string		$gruppe_kurzbz					(optional)
-	 * @param string		$orgform_kurzbz					(optional)
-	 *
-	 * @return void
-	 */
-	protected function getStudents($studiengang_kz, $semester = null, $verband = null, $gruppe = null, $gruppe_kurzbz = null, $orgform_kurzbz = null)
-	{
-		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
-		
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-
-		$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
-		$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id');
-		$this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid');
-		$this->PrestudentModel->addJoin(
-			'public.tbl_studentlehrverband v',
-			'v.student_uid=s.student_uid AND v.studiensemester_kurzbz=' . $this->PrestudentModel->escape($studiensemester_kurzbz)
-		);
-
-		$this->PrestudentModel->addSelect('p.person_id');
-		$this->PrestudentModel->addSelect('s.prestudent_id');
-		$this->PrestudentModel->addSelect('b.uid');
-		$this->PrestudentModel->addSelect('titelpre');
-		$this->PrestudentModel->addSelect('titelpost');
-		$this->PrestudentModel->addSelect('vorname');
-		$this->PrestudentModel->addSelect('wahlname');
-		$this->PrestudentModel->addSelect('vornamen');
-		$this->PrestudentModel->addSelect('geschlecht');
-		$this->PrestudentModel->addSelect('nachname');
-		$this->PrestudentModel->addSelect('gebdatum');
-		$this->PrestudentModel->addSelect('tbl_prestudent.anmerkung');
-		$this->PrestudentModel->addSelect('ersatzkennzeichen');
-		$this->PrestudentModel->addSelect('svnr');
-		$this->PrestudentModel->addSelect('s.matrikelnr');
-		$this->PrestudentModel->addSelect('p.anmerkung AS anmerkungen');
-		$this->PrestudentModel->addSelect('v.semester');
-		$this->PrestudentModel->addSelect('v.verband');
-		$this->PrestudentModel->addSelect('v.gruppe');
-		$this->PrestudentModel->addSelect('tbl_prestudent.studiengang_kz');
-		$this->PrestudentModel->addSelect('aufmerksamdurch_kurzbz');
-		$this->PrestudentModel->addSelect('mentor');
-		$this->PrestudentModel->addSelect('b.aktiv AS bnaktiv');
-		$this->PrestudentModel->addSelect(
-			"(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung LIMIT 1) AS email_privat",
-			false
-		);
-		$this->PrestudentModel->addSelect(
-			"(SELECT rt_gesamtpunkte AS punkte FROM public.tbl_prestudent WHERE prestudent_id=s.prestudent_id) AS punkte",
-			false
-		);
-		$this->PrestudentModel->addSelect('tbl_prestudent.dual');
-		$this->PrestudentModel->addSelect('tbl_prestudent.reihungstest_id');
-		$this->PrestudentModel->addSelect('tbl_prestudent.anmeldungreihungstest');
-		$this->PrestudentModel->addSelect('p.matr_nr');
-		$this->PrestudentModel->addSelect('tbl_prestudent.gsstudientyp_kurzbz');
-		$this->PrestudentModel->addSelect('tbl_prestudent.aufnahmegruppe_kurzbz');
-		$this->PrestudentModel->addSelect('tbl_prestudent.priorisierung');
-		$this->PrestudentModel->addSelect('p.zugangscode');
-		$this->PrestudentModel->addSelect('p.bpk');
-
-		$this->PrestudentModel->addOrder('nachname');
-		$this->PrestudentModel->addOrder('vorname');
-
-
-		$where = [];
-
-		if ($gruppe_kurzbz !== null) {
-			$this->PrestudentModel->addJoin('public.tbl_benutzergruppe g', 'uid');
-			$where['g.gruppe_kurzbz'] = $gruppe_kurzbz;
-			$where['g.studiensemester_kurzbz'] = $studiensemester_kurzbz;
-		} else {
-			$where['v.studiengang_kz'] = $studiengang_kz;
-
-			if ($semester !== null)
-				$where['v.semester'] = $semester;
-
-			if ($verband !== null)
-				$where['v.verband'] = $verband;
-
-			if ($gruppe !== null)
-				$where['v.gruppe'] = $gruppe;
-	
-			if (!$verband && !$gruppe && $orgform_kurzbz !== null) {
-				$this->PrestudentModel->db->where(
-					"(
-						SELECT orgform_kurzbz 
-						FROM public.tbl_prestudentstatus 
-						WHERE prestudent_id=tbl_prestudent.prestudent_id 
-						AND studiensemester_kurzbz=" . $this->PrestudentModel->escape($studiensemester_kurzbz) . " 
-						ORDER BY datum DESC, insertamum DESC, ext_id DESC LIMIT 1
-					)",
-					$this->PrestudentModel->escape($orgform_kurzbz),
-					false
-				);
-			}
-
-		}
-
-		$this->addFilter($studiensemester_kurzbz);
-
-		$result = $this->PrestudentModel->loadWhere($where);
-		
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			$this->outputJson(getError($result));
-		} else {
-			$this->outputJson(getData($result) ?: []);
-		}
-	}
-
-	/**
-	 * @param string		$prestudent_id
-	 *
-	 * @return void
-	 */
-	protected function getPrestudent($prestudent_id)
-	{
-		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
-
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-
-		$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
-		$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id', 'LEFT');
-		$this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid', 'LEFT');
-		$this->PrestudentModel->addJoin(
-			'public.tbl_studentlehrverband v',
-			'v.student_uid=s.student_uid AND v.studiensemester_kurzbz=' . $this->PrestudentModel->escape($studiensemester_kurzbz),
-			'LEFT'
-		);
-
-		$this->PrestudentModel->addSelect('p.person_id');
-		$this->PrestudentModel->addSelect('tbl_prestudent.prestudent_id');
-		$this->PrestudentModel->addSelect('b.uid');
-		$this->PrestudentModel->addSelect('titelpre');
-		$this->PrestudentModel->addSelect('titelpost');
-		$this->PrestudentModel->addSelect('vorname');
-		$this->PrestudentModel->addSelect('wahlname');
-		$this->PrestudentModel->addSelect('vornamen');
-		$this->PrestudentModel->addSelect('geschlecht');
-		$this->PrestudentModel->addSelect('nachname');
-		$this->PrestudentModel->addSelect('gebdatum');
-		$this->PrestudentModel->addSelect('tbl_prestudent.anmerkung');
-		$this->PrestudentModel->addSelect('ersatzkennzeichen');
-		$this->PrestudentModel->addSelect('svnr');
-		$this->PrestudentModel->addSelect('s.matrikelnr');
-		$this->PrestudentModel->addSelect('p.anmerkung AS anmerkungen');
-		$this->PrestudentModel->addSelect('v.semester');
-		$this->PrestudentModel->addSelect('v.verband');
-		$this->PrestudentModel->addSelect('v.gruppe');
-		$this->PrestudentModel->addSelect('tbl_prestudent.studiengang_kz');
-		$this->PrestudentModel->addSelect('aufmerksamdurch_kurzbz');
-		$this->PrestudentModel->addSelect('mentor');
-		$this->PrestudentModel->addSelect('b.aktiv AS bnaktiv');
-		$this->PrestudentModel->addSelect(
-			"(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung LIMIT 1) AS email_privat",
-			false
-		);
-		$this->PrestudentModel->addSelect(
-			"(SELECT rt_gesamtpunkte AS punkte FROM public.tbl_prestudent WHERE prestudent_id=s.prestudent_id) AS punkte",
-			false
-		);
-		$this->PrestudentModel->addSelect('tbl_prestudent.dual');
-		$this->PrestudentModel->addSelect('tbl_prestudent.reihungstest_id');
-		$this->PrestudentModel->addSelect('tbl_prestudent.anmeldungreihungstest');
-		$this->PrestudentModel->addSelect('p.matr_nr');
-		$this->PrestudentModel->addSelect('tbl_prestudent.gsstudientyp_kurzbz');
-		$this->PrestudentModel->addSelect('tbl_prestudent.aufnahmegruppe_kurzbz');
-		$this->PrestudentModel->addSelect('tbl_prestudent.priorisierung');
-		$this->PrestudentModel->addSelect('p.zugangscode');
-		$this->PrestudentModel->addSelect('p.bpk');
-
-		$this->addFilter($studiensemester_kurzbz);
-
-		$result = $this->PrestudentModel->loadWhere([
-			'tbl_prestudent.prestudent_id' => $prestudent_id
-		]);
-
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			$this->outputJson(getError($result));
-		} else {
-			$this->outputJson(getData($result) ?: []);
-		}
-	}
-
-	/**
-	 * @param string		$student_uid
-	 *
-	 * @return void
-	 */
-	protected function getStudent($student_uid)
-	{
-		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
-
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-
-		$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
-		$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id');
-		$this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid');
-		$this->PrestudentModel->addJoin(
-			'public.tbl_studentlehrverband v',
-			'v.student_uid=s.student_uid AND v.studiensemester_kurzbz=' . $this->PrestudentModel->escape($studiensemester_kurzbz),
-			'LEFT'
-		);
-
-		$this->PrestudentModel->addSelect('p.person_id');
-		$this->PrestudentModel->addSelect('s.prestudent_id');
-		$this->PrestudentModel->addSelect('b.uid');
-		$this->PrestudentModel->addSelect('titelpre');
-		$this->PrestudentModel->addSelect('titelpost');
-		$this->PrestudentModel->addSelect('vorname');
-		$this->PrestudentModel->addSelect('wahlname');
-		$this->PrestudentModel->addSelect('vornamen');
-		$this->PrestudentModel->addSelect('geschlecht');
-		$this->PrestudentModel->addSelect('nachname');
-		$this->PrestudentModel->addSelect('gebdatum');
-		$this->PrestudentModel->addSelect('tbl_prestudent.anmerkung');
-		$this->PrestudentModel->addSelect('ersatzkennzeichen');
-		$this->PrestudentModel->addSelect('svnr');
-		$this->PrestudentModel->addSelect('s.matrikelnr');
-		$this->PrestudentModel->addSelect('p.anmerkung AS anmerkungen');
-		$this->PrestudentModel->addSelect('v.semester');
-		$this->PrestudentModel->addSelect('v.verband');
-		$this->PrestudentModel->addSelect('v.gruppe');
-		$this->PrestudentModel->addSelect('tbl_prestudent.studiengang_kz');
-		$this->PrestudentModel->addSelect('aufmerksamdurch_kurzbz');
-		$this->PrestudentModel->addSelect('mentor');
-		$this->PrestudentModel->addSelect('b.aktiv AS bnaktiv');
-		$this->PrestudentModel->addSelect(
-			"(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung LIMIT 1) AS email_privat",
-			false
-		);
-		$this->PrestudentModel->addSelect(
-			"(SELECT rt_gesamtpunkte AS punkte FROM public.tbl_prestudent WHERE prestudent_id=s.prestudent_id) AS punkte",
-			false
-		);
-		$this->PrestudentModel->addSelect('tbl_prestudent.dual');
-		$this->PrestudentModel->addSelect('tbl_prestudent.reihungstest_id');
-		$this->PrestudentModel->addSelect('tbl_prestudent.anmeldungreihungstest');
-		$this->PrestudentModel->addSelect('p.matr_nr');
-		$this->PrestudentModel->addSelect('tbl_prestudent.gsstudientyp_kurzbz');
-		$this->PrestudentModel->addSelect('tbl_prestudent.aufnahmegruppe_kurzbz');
-		$this->PrestudentModel->addSelect('tbl_prestudent.priorisierung');
-		$this->PrestudentModel->addSelect('p.zugangscode');
-		$this->PrestudentModel->addSelect('p.bpk');
-
-		$this->addFilter($studiensemester_kurzbz);
-
-		$result = $this->PrestudentModel->loadWhere([
-			's.student_uid' => $student_uid
-		]);
-		
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			$this->outputJson(getError($result));
-		} else {
-			$this->outputJson(getData($result) ?: []);
-		}
-	}
-
-	/**
-	 * @param integer		$person_id
-	 *
-	 * @return void
-	 */
-	protected function getPerson($person_id)
-	{
-		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
-
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-
-		$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
-		$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id');
-		$this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid');
-		$this->PrestudentModel->addJoin(
-			'public.tbl_studentlehrverband v',
-			'v.student_uid=s.student_uid AND v.studiensemester_kurzbz=' . $this->PrestudentModel->escape($studiensemester_kurzbz),
-			'LEFT'
-		);
-
-		$this->PrestudentModel->addSelect('p.person_id');
-		$this->PrestudentModel->addSelect('s.prestudent_id');
-		$this->PrestudentModel->addSelect('b.uid');
-		$this->PrestudentModel->addSelect('titelpre');
-		$this->PrestudentModel->addSelect('titelpost');
-		$this->PrestudentModel->addSelect('vorname');
-		$this->PrestudentModel->addSelect('wahlname');
-		$this->PrestudentModel->addSelect('vornamen');
-		$this->PrestudentModel->addSelect('geschlecht');
-		$this->PrestudentModel->addSelect('nachname');
-		$this->PrestudentModel->addSelect('gebdatum');
-		$this->PrestudentModel->addSelect('tbl_prestudent.anmerkung');
-		$this->PrestudentModel->addSelect('ersatzkennzeichen');
-		$this->PrestudentModel->addSelect('svnr');
-		$this->PrestudentModel->addSelect('s.matrikelnr');
-		$this->PrestudentModel->addSelect('p.anmerkung AS anmerkungen');
-		$this->PrestudentModel->addSelect('v.semester');
-		$this->PrestudentModel->addSelect('v.verband');
-		$this->PrestudentModel->addSelect('v.gruppe');
-		$this->PrestudentModel->addSelect('tbl_prestudent.studiengang_kz');
-		$this->PrestudentModel->addSelect('aufmerksamdurch_kurzbz');
-		$this->PrestudentModel->addSelect('mentor');
-		$this->PrestudentModel->addSelect('b.aktiv AS bnaktiv');
-		$this->PrestudentModel->addSelect(
-			"(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung LIMIT 1) AS email_privat",
-			false
-		);
-		$this->PrestudentModel->addSelect(
-			"(SELECT rt_gesamtpunkte AS punkte FROM public.tbl_prestudent WHERE prestudent_id=s.prestudent_id) AS punkte",
-			false
-		);
-		$this->PrestudentModel->addSelect('tbl_prestudent.dual');
-		$this->PrestudentModel->addSelect('tbl_prestudent.reihungstest_id');
-		$this->PrestudentModel->addSelect('tbl_prestudent.anmeldungreihungstest');
-		$this->PrestudentModel->addSelect('p.matr_nr');
-		$this->PrestudentModel->addSelect('tbl_prestudent.gsstudientyp_kurzbz');
-		$this->PrestudentModel->addSelect('tbl_prestudent.aufnahmegruppe_kurzbz');
-		$this->PrestudentModel->addSelect('tbl_prestudent.priorisierung');
-		$this->PrestudentModel->addSelect('p.zugangscode');
-		$this->PrestudentModel->addSelect('p.bpk');
-
-		$this->addFilter($studiensemester_kurzbz);
-
-		$result = $this->PrestudentModel->loadWhere([
-			'p.person_id' => $person_id
-		]);
-		
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			$this->outputJson(getError($result));
-		} else {
-			$this->outputJson(getData($result) ?: []);
-		}
-	}
-
-	/**
-	 * Adds additional filters to the query
-	 *
-	 * @param string		$studiensemester_kurzbz
-	 *
-	 * @return void
-	 */
-	protected function addFilter($studiensemester_kurzbz)
-	{
-		$filter = $this->input->get('filter');
-		if (isset($filter['konto_count_0'])) {
-			$bt = $this->PrestudentModel->escape($filter['konto_count_0']);
-			$stdsem = $this->PrestudentModel->escape($studiensemester_kurzbz);
-
-			$this->PrestudentModel->db->where('(
-				SELECT count(*) 
-				FROM public.tbl_konto 
-				WHERE person_id=tbl_prestudent.person_id 
-				AND buchungstyp_kurzbz=' . $bt . ' 
-				AND studiensemester_kurzbz=' . $stdsem . '
-			) =', 0);
-			$this->PrestudentModel->db->where('get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) !=', 'Incoming');
-		}
-		if (isset($filter['konto_missing_counter'])) {
-			$bt = $this->PrestudentModel->escape($filter['konto_missing_counter']);
-			$stg = '';
-			if ($this->variablelib->getVar('kontofilterstg') == 'true')
-				$stg = ' AND studiengang_kz=tbl_prestudent.studiengang_kz';
-
-			$bt = $bt == 'alle' ? '' : ' AND buchungstyp_kurzbz=' . $bt;
-
-			$this->PrestudentModel->db->where('(
-				SELECT sum(betrag) 
-				FROM public.tbl_konto 
-				WHERE person_id=tbl_prestudent.person_id' .
-				$bt .
-				$stg . '
-			) !=', 0);
-		}
-	}
-}

From 02c12c6a54ef04a80326ef076f27ca74ce8ddf2c Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 9 Aug 2024 13:25:21 +0200
Subject: [PATCH 1114/1461] Bugfixes in PrestudentstatusCheckLib

---
 application/libraries/PrestudentstatusCheckLib.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/application/libraries/PrestudentstatusCheckLib.php b/application/libraries/PrestudentstatusCheckLib.php
index d197e30c6..5e3d8a307 100644
--- a/application/libraries/PrestudentstatusCheckLib.php
+++ b/application/libraries/PrestudentstatusCheckLib.php
@@ -148,20 +148,19 @@ class PrestudentstatusCheckLib
 	 *
 	 * @return booleans $zgv_code, error if not registered
 	 */
-	//TODO(Manu) TEST
-	public function checkIfZGVEingetragenMaster($prestudent, $typ = null)
+	public function checkIfZGVEingetragenMaster($prestudent)
 	{
 		$this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
 		$result = $this->_ci->StudiengangModel->load($prestudent->studiengang_kz);
 		if (isError($result))
 			return $result;
 		if (!hasData($result))
-			return error($this->_ci->p->t('studierendenantrag', 'error_no_stg', ['studiengang_kz' => $prestudent->studiengang_kz])); // TODO(chris): phrase
+			return error($this->_ci->p->t('studierendenantrag', 'error_no_stg', ['studiengang_kz' => $prestudent->studiengang_kz]));
 
 		if (current($result->retval)->typ != 'm')
-			return success(true); // TODO(chris): correct?
+			return success(true); // NOTE(chris): we only test master stgs, all other stgs should default to true
 
-		return success((boolean)$prestudent->zgv_code);
+		return success((boolean)$prestudent->zgvmas_code);
 	}
 
 	/**

From 7e302adf531c904bc6ad090b4a10c87827a5d4cc Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 9 Aug 2024 13:25:42 +0200
Subject: [PATCH 1115/1461] Bugfix in Prestudent model

---
 application/models/crm/Prestudent_model.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/application/models/crm/Prestudent_model.php b/application/models/crm/Prestudent_model.php
index be5337162..e2acde497 100644
--- a/application/models/crm/Prestudent_model.php
+++ b/application/models/crm/Prestudent_model.php
@@ -707,8 +707,9 @@ class Prestudent_model extends DB_Model
 	 */
 	public function getHistoryPrestudents($person_id)
 	{
+
 		$query = "
-			SELECT ps.studiensemester_kurzbz, p.priorisierung, p.studiengang_kz, sg.kurzbzlang, sg.orgform_kurzbz, 
+			SELECT ps.studiensemester_kurzbz, p.priorisierung, p.studiengang_kz, sg.kurzbzlang, ps.orgform_kurzbz, 
 					ps.status_kurzbz, s.student_uid, sp.bezeichnung, ps.ausbildungssemester,
 			       CONCAT(ps.status_kurzbz, ' (', ps.ausbildungssemester, '. Semester)') as status, p.prestudent_id
 			FROM public.tbl_prestudent p

From c378ec43476a99a5ce233c2de8d7947ee1df0f32 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 9 Aug 2024 13:26:07 +0200
Subject: [PATCH 1116/1461] Remove unnecessary comments

---
 application/controllers/api/frontend/v1/stv/Verband.php | 2 --
 application/controllers/jobs/AntragJob.php              | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Verband.php b/application/controllers/api/frontend/v1/stv/Verband.php
index efdf25a12..7b2a7d7ef 100644
--- a/application/controllers/api/frontend/v1/stv/Verband.php
+++ b/application/controllers/api/frontend/v1/stv/Verband.php
@@ -190,8 +190,6 @@ class Verband extends FHCAPI_Controller
 					$this->StudienordnungModel->addSelect("CONCAT(studiengang_kz, '/', p.orgform_kurzbz) AS link");
 					$this->StudienordnungModel->addSelect("p.orgform_kurzbz AS name");
 
-					// TODO(chris): semester for gruppe_kurzbz <- what did i mean by that?
-
 					$this->StudienordnungModel->addJoin('lehre.tbl_studienplan p', 'studienordnung_id');
 
 					$result = $this->StudienordnungModel->loadWhere([
diff --git a/application/controllers/jobs/AntragJob.php b/application/controllers/jobs/AntragJob.php
index d079658af..4ad601070 100644
--- a/application/controllers/jobs/AntragJob.php
+++ b/application/controllers/jobs/AntragJob.php
@@ -461,7 +461,7 @@ class AntragJob extends JOB_Controller
 						$this->logError(getError($result));
 						continue;
 					} elseif (!hasData($result)) {
-						$this->logError($this->p->t('lehre', 'error_noStatusgrund', ['statusgrund_kurzbz' => 'abbrecherStgl'])); // TODO(chris): phrase
+						$this->logError($this->p->t('lehre', 'error_noStatusgrund', ['statusgrund_kurzbz' => 'abbrecherStgl']));
 						continue;
 					}
 					

From d7abc411379dbd498fe69940fba20b257ff33d0f Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 9 Aug 2024 13:32:00 +0200
Subject: [PATCH 1117/1461] adds digitaleAnwesenheiten menu point

---
 .../controllers/api/frontend/v1/LvMenu.php    | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/application/controllers/api/frontend/v1/LvMenu.php b/application/controllers/api/frontend/v1/LvMenu.php
index 08d44821e..d2f6b2a3f 100644
--- a/application/controllers/api/frontend/v1/LvMenu.php
+++ b/application/controllers/api/frontend/v1/LvMenu.php
@@ -223,6 +223,9 @@ class LvMenu extends FHCAPI_Controller
 
 		$menu = array();
 
+		//todo: digitale anwesenheiten sollte ein Events.php im config/ folder beinhalten
+		//$this->fhc_menu_digitale_anwesenheiten($menu, $angemeldet, $studiengang_kz, $semester, $lvid, $angezeigtes_stsem, $p);
+
 		$this->fhc_menu_lvinfo($menu, $lvid, $studiengang_kz, $lektor_der_lv, $is_lector, $rechte, $lehrfach_oe_kurzbz_arr, $p);
 		
 		$this->fhc_menu_feedback($menu, $angemeldet, $lvid, $p);
@@ -315,6 +318,23 @@ class LvMenu extends FHCAPI_Controller
 	}
 
 
+	private function fhc_menu_digitale_anwesenheiten(&$menu, $angemeldet, $studiengang_kz, $semester, $lvid, $angezeigtes_stsem, $p){
+		
+		// DIGITALE ANWESENHEITEN
+		if (CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN && $angemeldet) {
+
+			$menu[] = array
+			(
+				'id' => 'core_menu_digitale_anwesenheitslisten',
+				'position' => '50',
+				'name' => $p->t('lehre/digiAnw'),
+				'c4_icon' => base_url('skin/images/button_kreuzerltool.png'),
+				'c4_link' => base_url("index.ci.php/extensions/FHC-Core-Anwesenheiten/?stg_kz=$studiengang_kz&sem=$semester&lvid=$lvid&sem_kurzbz=$angezeigtes_stsem&nav=false"),
+				'c4_linkList' => []
+			);
+		}
+	}
+
 	private function fhc_menu_lvinfo(&$menu, $lvid, $studiengang_kz, $lektor_der_lv, $is_lector, $rechte, $lehrfach_oe_kurzbz_arr, $p){
 		
 		// LVINFO
@@ -358,7 +378,7 @@ class LvMenu extends FHCAPI_Controller
 			$menu[]=array
 			(
 				'id'=>'core_menu_feedback',
-				'position'=>'50',
+				'position'=>'60',
 				'name'=>$p->t('lehre/feedback'),
 				'c4_icon'=> base_url('skin/images/button_feedback.png'),
 				'c4_link'=> base_url('feedback.php?lvid='.$lvid),

From 20ed9ffc41c0de6bf8d611a3055b5b4ec8b406fb Mon Sep 17 00:00:00 2001
From: KarpAlex <karpenko@technikum-wien.at>
Date: Sun, 11 Aug 2024 21:59:13 +0200
Subject: [PATCH 1118/1461] UHSTAT Formular: added "unknown" options to every
 input

---
 application/controllers/codex/UHSTAT1.php |   6 +-
 application/views/codex/uhstat1.php       | 162 ++++++++++++++--------
 system/phrasesupdate.php                  |  22 ++-
 3 files changed, 128 insertions(+), 62 deletions(-)

diff --git a/application/controllers/codex/UHSTAT1.php b/application/controllers/codex/UHSTAT1.php
index 4486f9d74..38b0f3b6d 100644
--- a/application/controllers/codex/UHSTAT1.php
+++ b/application/controllers/codex/UHSTAT1.php
@@ -363,7 +363,11 @@ class UHSTAT1 extends FHC_Controller
 
 		// get realistic birth years, dated back from current year
 		$currYear = date("Y");
-		$formMetaData['jahre'] = range($currYear - self::UPPER_BOUNDARY_YEARS, $currYear - self::LOWER_BOUNDARY_YEARS);
+		$yearRange = range($currYear - self::UPPER_BOUNDARY_YEARS, $currYear - self::LOWER_BOUNDARY_YEARS);
+		$formMetaData['jahre'] = array_combine($yearRange, $yearRange);
+
+		// add "unknown" option
+		$formMetaData['jahre'][9999] = 'unbekannt';
 
 		return success($formMetaData);
 	}
diff --git a/application/views/codex/uhstat1.php b/application/views/codex/uhstat1.php
index 78a30b3e5..a255781f1 100644
--- a/application/views/codex/uhstat1.php
+++ b/application/views/codex/uhstat1.php
@@ -74,16 +74,23 @@ $saved = isset($saved) && $saved === true;
 				<div class="form-group">
 					<label for="mutter_geburtsjahr" class="col-sm-3 control-label"><?php echo ucfirst($this->p->t('uhstat', 'geburtsjahr')) ?></label>
 					<div class="col-sm-9">
-						<select type="text" name="mutter_geburtsjahr" id="mutter_geburtsjahr" class="form-control" <?php echo $disabled ?>>
-							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
-							<?php foreach ($formMetaData['jahre'] as $jahr): ?>
-								<option
-									value="<?php echo $jahr ?>"
-									<?php echo $jahr == $mutter_geburtsjahr ? " selected" : "" ?>>
-									<?php echo $jahr ?>
-								</option>
-							<?php endforeach; ?>
-						</select>
+						<div class="input-group">
+							<select type="text" name="mutter_geburtsjahr" id="mutter_geburtsjahr" class="form-control" <?php echo $disabled ?>>
+								<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
+								<?php foreach ($formMetaData['jahre'] as $jahrKey => $jahr): ?>
+									<option
+										value="<?php echo $jahrKey ?>"
+										<?php echo $jahrKey == $mutter_geburtsjahr ? " selected" : "" ?>>
+										<?php echo $jahr ?>
+									</option>
+								<?php endforeach; ?>
+							</select>
+							<span class="input-group-btn">
+								<button type="button" class="btn btn-default" onclick="document.getElementById('mutter_geburtsjahr').value = 9999; return false;" <?php echo $disabled ?>>
+									<?php echo $this->p->t('uhstat', 'unbekannt') ?>
+								</button>
+							</span>
+						</div>
 						<?php echo form_error('mutter_geburtsjahr'); ?>
 					</div>
 				</div>
@@ -94,16 +101,23 @@ $saved = isset($saved) && $saved === true;
 						<?php echo '('.ucfirst($this->p->t('uhstat', 'inDenHeutigenGrenzen')).')' ?>
 					</label>
 					<div class="col-sm-9">
-						<select type="text" name="mutter_geburtsstaat" id="mutter_geburtsstaat" class="form-control" <?php echo $disabled ?>>
-							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
-							<?php foreach ($formMetaData['nation'] as $nation): ?>
-								<option
-									value="<?php echo $nation->nation_code ?>"
-									<?php echo $mutter_geburtsstaat == $nation->nation_code ? " selected" : "" ?>>
-									<?php echo $nation->nation_text ?>
-								</option>
-							<?php endforeach; ?>
-						</select>
+						<div class="input-group">
+							<select type="text" name="mutter_geburtsstaat" id="mutter_geburtsstaat" class="form-control" <?php echo $disabled ?>>
+								<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
+								<?php foreach ($formMetaData['nation'] as $nation): ?>
+									<option
+										value="<?php echo $nation->nation_code ?>"
+										<?php echo $mutter_geburtsstaat == $nation->nation_code ? " selected" : "" ?>>
+										<?php echo $nation->nation_text ?>
+									</option>
+								<?php endforeach; ?>
+							</select>
+							<span class="input-group-btn">
+								<button type="button" class="btn btn-default" onclick="document.getElementById('mutter_geburtsstaat').value = 'XXX'; return false;" <?php echo $disabled ?>>
+									<?php echo $this->p->t('uhstat', 'unbekannt') ?>
+								</button>
+							</span>
+						</div>
 						<?php echo form_error('mutter_geburtsstaat'); ?>
 					</div>
 				</div>
@@ -114,16 +128,23 @@ $saved = isset($saved) && $saved === true;
 						<?php echo '('.ucfirst($this->p->t('uhstat', 'inDenHeutigenGrenzen')).')' ?>
 					</label>
 					<div class="col-sm-9">
-						<select type="text" name="mutter_bildungsstaat" id="mutter_bildungsstaat" class="form-control" <?php echo $disabled ?>>
-							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
-							<?php foreach ($formMetaData['nation'] as $nation): ?>
-								<option
-									value="<?php echo $nation->nation_code ?>"
-									<?php echo $mutter_bildungsstaat == $nation->nation_code ? " selected" : "" ?>>
-									<?php echo $nation->nation_text ?>
-								</option>
-							<?php endforeach; ?>
-						</select>
+						<div class="input-group">
+							<select type="text" name="mutter_bildungsstaat" id="mutter_bildungsstaat" class="form-control" <?php echo $disabled ?>>
+								<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
+								<?php foreach ($formMetaData['nation'] as $nation): ?>
+									<option
+										value="<?php echo $nation->nation_code ?>"
+										<?php echo $mutter_bildungsstaat == $nation->nation_code ? " selected" : "" ?>>
+										<?php echo $nation->nation_text ?>
+									</option>
+								<?php endforeach; ?>
+							</select>
+							<span class="input-group-btn">
+								<button type="button" class="btn btn-default" onclick="document.getElementById('mutter_bildungsstaat').value = 'XXX'; return false;" <?php echo $disabled ?>>
+									<?php echo $this->p->t('uhstat', 'unbekannt') ?>
+								</button>
+							</span>
+						</div>
 						<?php echo form_error('mutter_bildungsstaat'); ?>
 					</div>
 				</div>
@@ -161,16 +182,23 @@ $saved = isset($saved) && $saved === true;
 				<div class="form-group">
 					<label for="vater_geburtsjahr" class="col-sm-3 control-label"><?php echo ucfirst($this->p->t('uhstat', 'geburtsjahr')) ?></label>
 					<div class="col-sm-9">
-						<select type="text" name="vater_geburtsjahr" id="vater_geburtsjahr" class="form-control" <?php echo $disabled ?>>
-							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
-							<?php foreach ($formMetaData['jahre'] as $jahr): ?>
-								<option
-									value="<?php echo $jahr ?>"
-									<?php echo $vater_geburtsjahr == $jahr ? " selected" : "" ?>>
+						<div class="input-group">
+							<select type="text" name="vater_geburtsjahr" id="vater_geburtsjahr" class="form-control" <?php echo $disabled ?>>
+								<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
+								<?php foreach ($formMetaData['jahre'] as $jahrKey => $jahr): ?>
+									<option
+										value="<?php echo $jahrKey ?>"
+										<?php echo $vater_geburtsjahr == $jahrKey ? " selected" : "" ?>>
 										<?php echo $jahr ?>
 									</option>
-							<?php endforeach; ?>
-						</select>
+								<?php endforeach; ?>
+							</select>
+							<span class="input-group-btn">
+								<button type="button" class="btn btn-default" onclick="document.getElementById('vater_geburtsjahr').value = 9999; return false;" <?php echo $disabled ?>>
+									<?php echo $this->p->t('uhstat', 'unbekannt') ?>
+								</button>
+							</span>
+						</div>
 						<?php echo form_error('vater_geburtsjahr'); ?>
 					</div>
 				</div>
@@ -181,16 +209,23 @@ $saved = isset($saved) && $saved === true;
 						<?php echo '('.ucfirst($this->p->t('uhstat', 'inDenHeutigenGrenzen')).')' ?>
 					</label>
 					<div class="col-sm-9">
-						<select type="text" name="vater_geburtsstaat" id="vater_geburtsstaat" class="form-control" <?php echo $disabled ?>>
-							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
-							<?php foreach ($formMetaData['nation'] as $nation): ?>
-								<option
-									value="<?php echo $nation->nation_code ?>"
-									<?php echo $vater_geburtsstaat == $nation->nation_code ? " selected" : "" ?>>
-										<?php echo $nation->nation_text ?>
-								</option>
-							<?php endforeach; ?>
-						</select>
+						<div class="input-group">
+							<select type="text" name="vater_geburtsstaat" id="vater_geburtsstaat" class="form-control" <?php echo $disabled ?>>
+								<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
+								<?php foreach ($formMetaData['nation'] as $nation): ?>
+									<option
+										value="<?php echo $nation->nation_code ?>"
+										<?php echo $vater_geburtsstaat == $nation->nation_code ? " selected" : "" ?>>
+											<?php echo $nation->nation_text ?>
+									</option>
+								<?php endforeach; ?>
+							</select>
+							<span class="input-group-btn">
+								<button type="button" class="btn btn-default" onclick="document.getElementById('vater_geburtsstaat').value = 'XXX'; return false;" <?php echo $disabled ?>>
+									<?php echo $this->p->t('uhstat', 'unbekannt') ?>
+								</button>
+							</span>
+						</div>
 						<?php echo form_error('vater_geburtsstaat'); ?>
 					</div>
 				</div>
@@ -201,16 +236,23 @@ $saved = isset($saved) && $saved === true;
 						<?php echo '('.ucfirst($this->p->t('uhstat', 'inDenHeutigenGrenzen')).')' ?>
 					</label>
 					<div class="col-sm-9">
-						<select type="text" name="vater_bildungsstaat" id="vater_bildungsstaat" class="form-control" <?php echo $disabled ?>>
-							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
-							<?php foreach ($formMetaData['nation'] as $nation): ?>
-								<option
-									value="<?php echo $nation->nation_code ?>"
-									<?php echo $vater_bildungsstaat == $nation->nation_code ? " selected" : "" ?>>
-										<?php echo $nation->nation_text ?>
-								</option>
-							<?php endforeach; ?>
-						</select>
+						<div class="input-group">
+							<select type="text" name="vater_bildungsstaat" id="vater_bildungsstaat" class="form-control" <?php echo $disabled ?>>
+								<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
+								<?php foreach ($formMetaData['nation'] as $nation): ?>
+									<option
+										value="<?php echo $nation->nation_code ?>"
+										<?php echo $vater_bildungsstaat == $nation->nation_code ? " selected" : "" ?>>
+											<?php echo $nation->nation_text ?>
+									</option>
+								<?php endforeach; ?>
+							</select>
+							<span class="input-group-btn">
+								<button type="button" class="btn btn-default" onclick="document.getElementById('vater_bildungsstaat').value = 'XXX'; return false;" <?php echo $disabled ?>>
+									<?php echo $this->p->t('uhstat', 'unbekannt') ?>
+								</button>
+							</span>
+						</div>
 						<?php echo form_error('vater_bildungsstaat'); ?>
 					</div>
 				</div>
@@ -271,7 +313,7 @@ $saved = isset($saved) && $saved === true;
 				</div>
 			</form>
 		<?php endif; ?>
-	</div>
-</div>
+	</div> <!-- subcontainer -->
+</div> <!-- container -->
 
 <?php $this->load->view('templates/FHC-Footer'); ?>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index ad2b6aa57..6fcaf4bf6 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -24698,7 +24698,7 @@ array(
 				'insertvon' => 'system'
 			)
 		)
-	),	
+	),
 	array(
 		'app' => 'personalverwaltung',
 		'category' => 'gehaltsband',
@@ -26942,6 +26942,26 @@ array(
 		)
 	),
 	// Betriebsmittel end
+	array(
+		'app' => 'core',
+		'category' => 'uhstat',
+		'phrase' => 'unbekannt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'unbekannt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'unknown',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	)
 );
 
 

From 781b4b31cd383fd2d636dc44bfcbfc1fae52561b Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 12 Aug 2024 09:43:45 +0200
Subject: [PATCH 1119/1461] Bugfix: misspelled function call

---
 application/controllers/api/frontend/v1/stv/Status.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 2efa88572..94847fed9 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -526,7 +526,7 @@ class Status extends FHCAPI_Controller
 
 		$this->getDataOrTerminateWithError($result);
 
-		$this->trans_complete();
+		$this->db->trans_complete();
 
 		$this->terminateWithSuccess($prestudent_id);
 	}

From 0a150a60bb64715beba5f475c3d71dd0c738c6a6 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 12 Aug 2024 09:44:12 +0200
Subject: [PATCH 1120/1461] improved error message

---
 .../Stv/Studentenverwaltung/Details/Status/Dropdown.js      | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js b/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js
index 4a62eb49b..19c67e708 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js
@@ -141,7 +141,8 @@ export default {
 				.allSettled(
 					this.prestudentIds.map(prestudent_id => this.$fhcApi.post(
 						'api/frontend/v1/stv/status/addStudent/' + prestudent_id,
-						data
+						data,
+						{ errorHeader: prestudent_id }
 					))
 				)
 				.then(this.showFeedback);
@@ -223,7 +224,8 @@ export default {
 				.allSettled(
 					this.prestudentIds.map(prestudent_id => this.$fhcApi.post(
 						'api/frontend/v1/stv/status/changeStatus/' + prestudent_id,
-						data
+						data,
+						{ errorHeader: prestudent_id }
 					))
 				)
 				.then(this.showFeedback);

From fea7ed8f76af7bdeea0b755b8c08f7c3c5dc82ff Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 12 Aug 2024 09:45:34 +0200
Subject: [PATCH 1121/1461] copy pasta

---
 application/controllers/api/frontend/v1/stv/Status.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 94847fed9..c215afe7a 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -564,7 +564,6 @@ class Status extends FHCAPI_Controller
 		]);
 
 		$this->form_validation->set_rules('_default', '', [
-			'required',
 			//Check ZGV
 			['checkIfZGV', function () use ($prestudent_person) {
 				if (defined("ZGV_CHECK") && !ZGV_CHECK)

From d19a47d4b23604ad21f860f7885edf29bea11c3c Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 12 Aug 2024 09:47:13 +0200
Subject: [PATCH 1122/1461] Bugfix: missing load->library

---
 application/controllers/api/frontend/v1/stv/Status.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index c215afe7a..c5daf78a2 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -629,6 +629,8 @@ class Status extends FHCAPI_Controller
 		// Start DB transaction
 		$this->db->trans_start();
 
+		$this->load->library('PrestudentLib');
+
 		$this->prestudentlib->setFirstStudent(
 			$prestudent_id,
 			$lastAufgenommener->studiensemester_kurzbz,

From 47ddebf7c4b712284b59bff88edd152488a2d54d Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 12 Aug 2024 09:54:00 +0200
Subject: [PATCH 1123/1461] Bugfix: wrong variablename

---
 .../Stv/Studentenverwaltung/Details/Status/Dropdown.js          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js b/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js
index 19c67e708..469c818c9 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js
@@ -232,7 +232,7 @@ export default {
 		},
 		showFeedback(results) {
 			const countSuccess = results.filter(result => result.status == "fulfilled").length;
-			const countError = results.length - successes;
+			const countError = results.length - countSuccess;
 			
 			//Feedback Success als infoalert
 			this.$fhcAlert.alertInfo(this.$p.t('ui', 'successNewStatus', {

From 097a507c9a9e3fc9ba42ec172fa20e9268775283 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 12 Aug 2024 09:54:23 +0200
Subject: [PATCH 1124/1461] Bugfix: missing data in showFeedback function

---
 .../Stv/Studentenverwaltung/Details/Status/Dropdown.js    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js b/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js
index 469c818c9..77e1db67b 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js
@@ -145,7 +145,7 @@ export default {
 						{ errorHeader: prestudent_id }
 					))
 				)
-				.then(this.showFeedback);
+				.then(res => this.showFeedback(res, data.status_kurzbz));
 		},
 		changeStatusToAbbrecher(statusgrund_id) {
 			this
@@ -228,16 +228,16 @@ export default {
 						{ errorHeader: prestudent_id }
 					))
 				)
-				.then(this.showFeedback);
+				.then(res => this.showFeedback(res, data.status_kurzbz));
 		},
-		showFeedback(results) {
+		showFeedback(results, status_kurzbz) {
 			const countSuccess = results.filter(result => result.status == "fulfilled").length;
 			const countError = results.length - countSuccess;
 			
 			//Feedback Success als infoalert
 			this.$fhcAlert.alertInfo(this.$p.t('ui', 'successNewStatus', {
 				countSuccess,
-				status: data.status_kurzbz,
+				status: status_kurzbz,
 				countError
 			}));
 

From 054e59a89154214d98d6b4a739f4f543b84292a6 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 12 Aug 2024 12:22:43 +0200
Subject: [PATCH 1125/1461] Bugfixes PrestudentLib

---
 application/libraries/PrestudentLib.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php
index b66324928..af62668cf 100644
--- a/application/libraries/PrestudentLib.php
+++ b/application/libraries/PrestudentLib.php
@@ -473,7 +473,7 @@ class PrestudentLib
 
 
 		$this->_ci->load->library('VariableLib', ['uid' => $authUID]);
-		$semester_aktuell = $this->variablelib->getVar('semester_aktuell');
+		$semester_aktuell = $this->_ci->variablelib->getVar('semester_aktuell');
 
 
 		// Update Aktionen
@@ -502,7 +502,6 @@ class PrestudentLib
 		$result = $this->_ci->StudentModel->update([
 			'student_uid' => $student->student_uid
 		], [
-			'studiensemester_kurzbz' => $semester_aktuell,
 			'semester' => $ausbildungssemester,
 			'verband' => '',
 			'gruppe' => '',

From 73dd89e5afc95c7b5165f8453933133001b0ec05 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 12 Aug 2024 14:09:21 +0200
Subject: [PATCH 1126/1461] adds phrasen library to LvMenu

---
 application/controllers/CisHtml/Dashboard.php      | 8 ++++++--
 application/controllers/api/frontend/v1/LvMenu.php | 4 ++++
 application/views/CisHtml/Dashboard.php            | 3 ++-
 public/js/components/Cis/Mylv/LvUebersicht.js      | 1 +
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/application/controllers/CisHtml/Dashboard.php b/application/controllers/CisHtml/Dashboard.php
index 243f16e1e..9c34f3245 100755
--- a/application/controllers/CisHtml/Dashboard.php
+++ b/application/controllers/CisHtml/Dashboard.php
@@ -17,6 +17,10 @@ class Dashboard extends Auth_Controller
 				'index' => 'user:r'
 			)
 		);
+
+		$this->load->library("PhrasesLib");
+		$this->loadPhrases(array('global'));
+
 	}
 
 	// -----------------------------------------------------------------------------------------------------------------
@@ -26,7 +30,7 @@ class Dashboard extends Auth_Controller
 	 * @return void
 	 */
 	public function index()
-	{
-		$this->load->view('CisHtml/Dashboard.php');
+	{	
+		$this->load->view('CisHtml/Dashboard.php',["test"=>$this->p->t('global/digitalesAnwManagement')]);
 	}
 }
diff --git a/application/controllers/api/frontend/v1/LvMenu.php b/application/controllers/api/frontend/v1/LvMenu.php
index d2f6b2a3f..5a4e14d15 100644
--- a/application/controllers/api/frontend/v1/LvMenu.php
+++ b/application/controllers/api/frontend/v1/LvMenu.php
@@ -38,6 +38,9 @@ class LvMenu extends FHCAPI_Controller
 		parent::__construct([
 			'getLvMenu' => self::PERM_LOGGED
 		]);
+
+		$this->load->library("PhrasesLib");
+		$this->loadPhrases(array('global'));
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
@@ -74,6 +77,7 @@ class LvMenu extends FHCAPI_Controller
 		// get the sprache
 		$sprache = getSprache();
 		$p = new phrasen($sprache);
+		//$p = $this->$p;
 
 		// get the db
 		if (!$db = new basis_db())
diff --git a/application/views/CisHtml/Dashboard.php b/application/views/CisHtml/Dashboard.php
index 1eddba454..89738ada5 100755
--- a/application/views/CisHtml/Dashboard.php
+++ b/application/views/CisHtml/Dashboard.php
@@ -1,6 +1,7 @@
 <?php
 $includesArray = array(
 	'title' => 'Dashboard',
+	'phrases'=> array('global'),
 	'tabulator5'=>true,
 	'customJSModules' => ['public/js/apps/Dashboard/Fhc.js'],
 	'customCSSs' => [
@@ -12,7 +13,7 @@ $this->load->view('templates/CISHTML-Header', $includesArray);
 ?>
 
 <div id="content">
-	<h2>Dashboard</h2>
+	<h2>Dashboard </h2>
 	<hr>
 	<fhc-dashboard dashboard="CIS"/>
 </div>
diff --git a/public/js/components/Cis/Mylv/LvUebersicht.js b/public/js/components/Cis/Mylv/LvUebersicht.js
index d3ded0518..3e3baced9 100644
--- a/public/js/components/Cis/Mylv/LvUebersicht.js
+++ b/public/js/components/Cis/Mylv/LvUebersicht.js
@@ -63,6 +63,7 @@ export default  {
             
         </template>
         <template #default>
+		<h1>{{$p.t('global','digitalesAnwManagement')}}</h1>
 
           <div v-if="selectedMenu" class="d-flex flex-column h-100">
                 <div class="d-flex mb-2">

From 38e13088656788fbd755b31a51ef185ed5d1e0e5 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 12 Aug 2024 14:12:01 +0200
Subject: [PATCH 1127/1461] revert change on already deprcated file

---
 public/js/apps/api/fhcapifactory.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/public/js/apps/api/fhcapifactory.js b/public/js/apps/api/fhcapifactory.js
index 9303a941c..c1f1e0d5c 100644
--- a/public/js/apps/api/fhcapifactory.js
+++ b/public/js/apps/api/fhcapifactory.js
@@ -1,7 +1,5 @@
 import Search from "./search.js";
-import stv from "../../api/stv.js";
 
 export default {
-    "Search": Search,
-    stv
+    "Search": Search
 };

From 8232224b217d0f2d9650a0f522e730d6cbe6055a Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 12 Aug 2024 14:20:42 +0200
Subject: [PATCH 1128/1461] LvMenu.php added codeigniter phrasen object to
 params; Using ci_phrases in Events.php for cis4 menu;

---
 application/controllers/api/frontend/v1/LvMenu.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/controllers/api/frontend/v1/LvMenu.php b/application/controllers/api/frontend/v1/LvMenu.php
index 5a4e14d15..97cdcc294 100644
--- a/application/controllers/api/frontend/v1/LvMenu.php
+++ b/application/controllers/api/frontend/v1/LvMenu.php
@@ -260,6 +260,7 @@ class LvMenu extends FHCAPI_Controller
 		$params = [
 			'sprache'=>$sprache,
 			'p'=>$p,
+			'ci_p'=> $this->p,
 			'db'=>$db,
 			'user'=>$user,
 			'is_lector'=>$is_lector,
@@ -799,5 +800,4 @@ private function  fhc_menu_pinboard(&$menu, $angemeldet, $is_lector, $studiengan
 	*/
 
 
-}
-
+}
\ No newline at end of file

From cce58fdc31b1c4c0d1a8d8080461e874f15e5ad7 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 12 Aug 2024 14:24:37 +0200
Subject: [PATCH 1129/1461] removes debugging prints

---
 application/controllers/CisHtml/Dashboard.php | 5 +----
 application/views/CisHtml/Dashboard.php       | 3 +--
 public/js/components/Cis/Mylv/LvUebersicht.js | 2 --
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/application/controllers/CisHtml/Dashboard.php b/application/controllers/CisHtml/Dashboard.php
index 9c34f3245..e4d422788 100755
--- a/application/controllers/CisHtml/Dashboard.php
+++ b/application/controllers/CisHtml/Dashboard.php
@@ -18,9 +18,6 @@ class Dashboard extends Auth_Controller
 			)
 		);
 
-		$this->load->library("PhrasesLib");
-		$this->loadPhrases(array('global'));
-
 	}
 
 	// -----------------------------------------------------------------------------------------------------------------
@@ -31,6 +28,6 @@ class Dashboard extends Auth_Controller
 	 */
 	public function index()
 	{	
-		$this->load->view('CisHtml/Dashboard.php',["test"=>$this->p->t('global/digitalesAnwManagement')]);
+		$this->load->view('CisHtml/Dashboard.php');
 	}
 }
diff --git a/application/views/CisHtml/Dashboard.php b/application/views/CisHtml/Dashboard.php
index 89738ada5..1eddba454 100755
--- a/application/views/CisHtml/Dashboard.php
+++ b/application/views/CisHtml/Dashboard.php
@@ -1,7 +1,6 @@
 <?php
 $includesArray = array(
 	'title' => 'Dashboard',
-	'phrases'=> array('global'),
 	'tabulator5'=>true,
 	'customJSModules' => ['public/js/apps/Dashboard/Fhc.js'],
 	'customCSSs' => [
@@ -13,7 +12,7 @@ $this->load->view('templates/CISHTML-Header', $includesArray);
 ?>
 
 <div id="content">
-	<h2>Dashboard </h2>
+	<h2>Dashboard</h2>
 	<hr>
 	<fhc-dashboard dashboard="CIS"/>
 </div>
diff --git a/public/js/components/Cis/Mylv/LvUebersicht.js b/public/js/components/Cis/Mylv/LvUebersicht.js
index 3e3baced9..d080bd715 100644
--- a/public/js/components/Cis/Mylv/LvUebersicht.js
+++ b/public/js/components/Cis/Mylv/LvUebersicht.js
@@ -63,8 +63,6 @@ export default  {
             
         </template>
         <template #default>
-		<h1>{{$p.t('global','digitalesAnwManagement')}}</h1>
-
           <div v-if="selectedMenu" class="d-flex flex-column h-100">
                 <div class="d-flex mb-2">
                 <button v-if="selectedMenu" @click="selectedMenu=null" class="btn btn-secondary me-2"><i class="fa fa-chevron-left"></i> Back</button>

From d3025dc4a8d18001800c58ce791542bc95fda8e1 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 12 Aug 2024 15:59:15 +0200
Subject: [PATCH 1130/1461] Berechtigungscheck Kontakt

---
 .../api/frontend/v1/stv/Kontakt.php           | 94 +++++++++++++++++--
 1 file changed, 84 insertions(+), 10 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Kontakt.php b/application/controllers/api/frontend/v1/stv/Kontakt.php
index 5ebe03f09..379184ee0 100644
--- a/application/controllers/api/frontend/v1/stv/Kontakt.php
+++ b/application/controllers/api/frontend/v1/stv/Kontakt.php
@@ -10,18 +10,18 @@ class Kontakt extends FHCAPI_Controller
 	{
 		parent::__construct([
 			'getAdressen' => ['admin:r', 'assistenz:r'],
-			'addNewAddress' => ['admin:r', 'assistenz:r'],
-			'addNewContact' => ['admin:r', 'assistenz:r'],
-			'addNewBankverbindung' => ['mitarbeiter/bankdaten:w', 'student/bankdaten:w'],
-			'updateAddress' => ['admin:r', 'assistenz:r'],
-			'updateContact' => ['admin:r', 'assistenz:r'],
-			'updateBankverbindung' => ['mitarbeiter/bankdaten:w', 'student/bankdaten:w'],
+			'addNewAddress' => ['admin:rw', 'assistenz:rw'],
+			'addNewContact' => ['admin:rw', 'assistenz:rw'],
+			'addNewBankverbindung' => ['mitarbeiter/bankdaten:rw', 'student/bankdaten:rw'],
+			'updateAddress' => ['admin:rw', 'assistenz:rw'],
+			'updateContact' => ['admin:rw', 'assistenz:rw'],
+			'updateBankverbindung' => ['mitarbeiter/bankdaten:rw', 'student/bankdaten:rw'],
 			'loadAddress' => ['admin:r', 'assistenz:r'],
 			'loadContact' => ['admin:r', 'assistenz:r'],
 			'loadBankverbindung' => ['mitarbeiter/bankdaten:r', 'student/bankdaten:r'],
-			'deleteAddress' => ['admin:r', 'assistenz:r'],
-			'deleteContact' => ['admin:r','assistenz:r'],
-			'deleteBankverbindung' => ['mitarbeiter/bankdaten:w','astudent/bankdaten:w'],
+			'deleteAddress' => ['admin:rw', 'assistenz:rw'],
+			'deleteContact' => ['admin:rw','assistenz:rw'],
+			'deleteBankverbindung' => ['mitarbeiter/bankdaten:rw','astudent/bankdaten:rw'],
 			'getAdressentypen' => ['admin:r', 'assistenz:r'],
 			'getKontakttypen' => ['admin:r', 'assistenz:r'],
 			'getFirmen' => ['admin:r', 'assistenz:r'],
@@ -47,8 +47,82 @@ class Kontakt extends FHCAPI_Controller
 		$this->load->model('ressource/firma_model', 'FirmaModel');
 		$this->load->model('person/Kontakt_model', 'KontaktModel');
 
-	}
+		// Extra Permissionchecks
+		$permsMa = [];
+		$permsStud = [];
+		switch ($this->router->method) {
+			case 'getBankverbindung':
+			case 'loadBankverbindung':
+				$permsMa = ['mitarbeiter/bankdaten:r'];
+				$permsStud = ['student/bankdaten:r'];
+				break;
+			case 'addNewBankverbindung':
+			case 'updateBankverbindung':
+			case 'deleteBankverbindung':
+				$permsMa = ['mitarbeiter/bankdaten:rw'];
+				$permsStud = ['student/bankdaten:rw'];
+				break;
+			case 'getAdressen':
+			case 'getKontakte':
+			case 'loadAddress':
+			case 'loadContact':
+				$permsMa = $permsStud = ['admin:r', 'assistenz:r'];
+				break;
+			case 'addNewAddress':
+			case 'addNewContact':
+			case 'updateAddress':
+			case 'updateContact':
+			case 'deleteAddress':
+			case 'deleteContact':
+				$permsMa = $permsStud = ['admin:rw', 'assistenz:rw'];
+				break;
+		}
+		if ($this->router->method == 'getAdressen'
+			|| $this->router->method == 'getKontakte'
+			|| $this->router->method == 'getBankverbindung'
+			|| $this->router->method == 'addNewAddress'
+			|| $this->router->method == 'addNewContact'
+			|| $this->router->method == 'addNewBankverbindung'
+		) {
+			$person_id = current(array_slice($this->uri->rsegments, 2));
+			
+			$this->checkPermissionsForPerson($person_id, $permsMa, $permsStud);
+		} elseif ($this->router->method == 'loadAddress'
+			|| $this->router->method == 'loadContact'
+			|| $this->router->method == 'loadBankverbindung'
+			|| $this->router->method == 'updateAddress'
+			|| $this->router->method == 'updateContact'
+			|| $this->router->method == 'updateBankverbindung'
+			|| $this->router->method == 'deleteAddress'
+			|| $this->router->method == 'deleteContact'
+			|| $this->router->method == 'deleteBankverbindung'
+		) {
+			$id = current(array_slice($this->uri->rsegments, 2));
 
+			$model = 'person/Adresse_model';
+			if ($this->router->method == 'loadContact'
+				|| $this->router->method == 'updateContact'
+				|| $this->router->method == 'deleteContact'
+			) {
+				$model = 'person/Kontakt_model';
+			} elseif ($this->router->method == 'loadBankverbindung'
+				|| $this->router->method == 'updateBankverbindung'
+				|| $this->router->method == 'deleteBankverbindung'
+			) {
+				$model = 'person/Bankverbindung_model';
+			}
+
+			$this->load->model($model, 'TempModel');
+			$result = $this->TempModel->load($id);
+			$data = $this->getDataOrTerminateWithError($result);
+			if (!$result)
+				show_404();
+
+			$person_id = current($data)->person_id;
+			
+			$this->checkPermissionsForPerson($person_id, $permsMa, $permsStud);
+		}
+	}
 	public function getAdressen($person_id)
 	{
 		$this->AdresseModel->addSelect('public.tbl_adresse.*');

From a45fd217d93248135d173f9b3f5f1d193e95e05b Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 12 Aug 2024 15:59:23 +0200
Subject: [PATCH 1131/1461] Berechtigungscheck Details

---
 .../controllers/api/frontend/v1/stv/Student.php | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php
index 6b018ec8b..2f7b02972 100644
--- a/application/controllers/api/frontend/v1/stv/Student.php
+++ b/application/controllers/api/frontend/v1/stv/Student.php
@@ -33,17 +33,26 @@ class Student extends FHCAPI_Controller
 	 */
 	public function __construct()
 	{
-		// TODO(chris): permissions
 		parent::__construct([
 			'get' => ['admin:r', 'assistenz:r'],
-			'save' => ['admin:w', 'assistenz:w'],
-			'check' => ['admin:w', 'assistenz:w'],
-			'add' => ['admin:w', 'assistenz:w']
+			'save' => ['admin:rw', 'assistenz:rw'],
+			'check' => ['admin:rw', 'assistenz:rw'],
+			'add' => ['admin:rw', 'assistenz:rw'] // TODO(chris): extra permissions
 		]);
 
 		// Load Libraries
 		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
 
+		if ($this->router->method == 'get'
+			|| $this->router->method == 'save'
+		) {
+			$prestudent_id = current(array_slice($this->uri->rsegments, 2));
+			if ($this->router->method == 'get')
+				$this->checkPermissionsForPrestudent($prestudent_id, ['admin:r', 'assistenz:r']);
+			else
+				$this->checkPermissionsForPrestudent($prestudent_id, ['admin:rw', 'assistenz:rw']);
+		}
+
 		// Load language phrases
 		$this->loadPhrases([
 			'ui'

From 9ac9ab6818db3f62dad19875702595d8b2d57fe4 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 12 Aug 2024 16:02:06 +0200
Subject: [PATCH 1132/1461] Berechtigungscheck Studentenliste

---
 .../controllers/api/frontend/v1/stv/Students.php   | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/application/controllers/api/frontend/v1/stv/Students.php b/application/controllers/api/frontend/v1/stv/Students.php
index 9d09d6f8c..1a90b51cd 100644
--- a/application/controllers/api/frontend/v1/stv/Students.php
+++ b/application/controllers/api/frontend/v1/stv/Students.php
@@ -25,14 +25,24 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
  */
 class Students extends FHCAPI_Controller
 {
+	private $allowedStgs = [];
+
+
 	public function __construct()
 	{
-		// TODO(chris): permissions
 		$permissions = [];
 		$router = load_class('Router');
 		$permissions[$router->method] = self::PERM_LOGGED;
 		parent::__construct($permissions);
 
+		$this->allowedStgs = $this->permissionlib->getSTG_isEntitledFor('admin') ?: [];
+		$this->allowedStgs = array_merge($this->allowedStgs, $this->permissionlib->getSTG_isEntitledFor('assistenz') ?: []);
+		
+		if (!$this->allowedStgs) {
+			$this->_outputAuthError([$router->method => ['admin:r', 'assistenz:r']]);
+			exit;
+		}
+
 		// Load Libraries
 		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
 	}
@@ -658,6 +668,8 @@ class Students extends FHCAPI_Controller
 		$this->PrestudentModel->addSelect('p.zugangscode');
 		$this->PrestudentModel->addSelect('p.bpk');*/
 
+		$this->PrestudentModel->db->where_in('tbl_prestudent.studiengang_kz', $this->allowedStgs);
+
 		$this->PrestudentModel->addOrder('nachname');
 		$this->PrestudentModel->addOrder('vorname');
 	}

From d025359f72ce0ddd951e6f506edb3d23025d7e8d Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 13 Aug 2024 08:51:01 +0200
Subject: [PATCH 1133/1461] Berechtigungscheck Verbandstree

---
 .../controllers/api/frontend/v1/stv/Verband.php | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Verband.php b/application/controllers/api/frontend/v1/stv/Verband.php
index 7b2a7d7ef..8d508399b 100644
--- a/application/controllers/api/frontend/v1/stv/Verband.php
+++ b/application/controllers/api/frontend/v1/stv/Verband.php
@@ -27,10 +27,9 @@ class Verband extends FHCAPI_Controller
 {
 	public function __construct()
 	{
-		// TODO(chris): permissions
 		$permissions = [];
 		$router = load_class('Router');
-		$permissions[$router->method] = self::PERM_LOGGED;
+		$permissions[$router->method] = ['admin:r', 'assistenz:r'];
 		parent::__construct($permissions);
 
 		// Load Models
@@ -57,6 +56,13 @@ class Verband extends FHCAPI_Controller
 		if ($method == '' || $method == 'index')
 			return $this->getBase();
 
+		// NOTE(chris): Test if access is allowed ($method is the Studiengang)
+		if (!$this->permissionlib->isBerechtigt('assistenz', 's', $method)
+			&& !$this->permissionlib->isBerechtigt('admin', 's', $method)
+		) {
+			return $this->_outputAuthError([$method => ['admin:r', 'assistenz:r']]);
+		}
+
 		$count = count($params);
 		if (!$count)
 			return $this->getStudiengang($method);
@@ -104,8 +110,11 @@ class Verband extends FHCAPI_Controller
 
 		$stgs = $this->permissionlib->getSTG_isEntitledFor('admin') ?: [];
 		$stgs = array_merge($stgs, $this->permissionlib->getSTG_isEntitledFor('assistenz') ?: []);
-		if ($stgs)
-			$this->StudiengangModel->db->where_in('studiengang_kz', $stgs);
+
+		if (!$stgs)
+			$this->terminateWithSuccess([]);
+
+		$this->StudiengangModel->db->where_in('studiengang_kz', $stgs);
 
 		$result = $this->StudiengangModel->loadWhere(['v.aktiv' => true]);
 

From 307ee8fb56d1a41d56a71a1158fd0e86230b621f Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 13 Aug 2024 09:00:49 +0200
Subject: [PATCH 1134/1461] Berechtigungscheck f. Studentenverwaltung
 Controller

---
 application/controllers/Studentenverwaltung.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/application/controllers/Studentenverwaltung.php b/application/controllers/Studentenverwaltung.php
index 5a400d969..e09d04c6a 100644
--- a/application/controllers/Studentenverwaltung.php
+++ b/application/controllers/Studentenverwaltung.php
@@ -2,11 +2,17 @@
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
-class Studentenverwaltung extends FHC_Controller
+class Studentenverwaltung extends Auth_Controller
 {
 	public function __construct()
 	{
-		parent::__construct();
+		$permissions = [];
+		$router = load_class('Router');
+		$permissions[$router->method] = ['admin:r', 'assistenz:r'];
+		parent::__construct($permissions);
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
 	}
 
 	/**
@@ -14,10 +20,6 @@ class Studentenverwaltung extends FHC_Controller
 	 */
 	public function _remap()
 	{
-		$this->load->library('AuthLib');
-		$this->load->library('PermissionLib');
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-
 		$this->load->view('Studentenverwaltung', [
 			'permissions' => [
 				'student/bpk' => $this->permissionlib->isBerechtigt('student/bpk'),

From db8e2bfb691f856b8fb7c115ec69b0a28525261f Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 13 Aug 2024 11:01:49 +0200
Subject: [PATCH 1135/1461] =?UTF-8?q?Interessent=20hinzuf=C3=BCgen=20und?=
 =?UTF-8?q?=20Notenkarteireiter=20ausblenden?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/api/frontend/v1/stv/Config.php | 2 ++
 public/js/components/Stv/Studentenverwaltung/List.js   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index 35ee552b0..45ae7be01 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -91,10 +91,12 @@ class Config extends FHCAPI_Controller
 			'title' => $this->p->t('stv', 'tab_resources'),
 			'component' => './Stv/Studentenverwaltung/Details/Betriebsmittel.js'
 		];
+		/* TODO(chris): Ausgeblendet für Testing
 		$result['grades'] = [
 			'title' => $this->p->t('stv', 'tab_grades'),
 			'component' => './Stv/Studentenverwaltung/Details/Noten.js'
 		];
+		*/
 
 		Events::trigger('stv_conf_student', function & () use (&$result) {
 			return $result;
diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index 8eaf7847c..0eac360d9 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -236,7 +236,9 @@ export default {
 				table-only
 				:side-menu="false"
 				reload
+				` + /* TODO(chris): Ausgeblendet für Testing
 				new-btn-show
+				*/`
 				:new-btn-label="$p.t('stv/action_new')"
 				@click:new="actionNewPrestudent"
 			>

From ed69d3a0610061ecfb825b8f7621f970bd3706c5 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 13 Aug 2024 11:05:35 +0200
Subject: [PATCH 1136/1461] Prestudenttab einzelne Felder ausblenden

---
 .../components/Stv/Studentenverwaltung/Details/Prestudent.js  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
index f38712469..6857bef0b 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
@@ -395,6 +395,7 @@ export default {
 					</form-input>
 				</div>
 				
+				` + /* TODO(chris): Ausgeblendet für Testing
 				<div class="row mb-3">
 					<form-input
 						container-class="col-4"
@@ -429,6 +430,7 @@ export default {
 					</form-input>
 				 
 				</div>
+				*/`
 				
 				<div class="row mb-3">
 					<form-input
@@ -481,6 +483,7 @@ export default {
 							>
 						</form-input>
 					</div>
+					` + /* TODO(chris): Ausgeblendet für Testing
 					<form-input
 						container-class="col-3"
 						:label="$p.t('lehre', 'foerderrelevant')"
@@ -490,6 +493,7 @@ export default {
 						>
 						<option v-for="entry in listFoerderrelevant" :value="entry.value">{{entry.text}}</option>
 					</form-input>
+					*/`
 					
 					<form-input
 						container-class="col-1"

From 761ec966625f08e8ab780c3e2acb111122c2541c Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 13 Aug 2024 11:20:32 +0200
Subject: [PATCH 1137/1461] Bugfix: uft8 json & codequality

---
 .../api/frontend/v1/stv/Prestudent.php        | 55 +++++--------------
 1 file changed, 14 insertions(+), 41 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Prestudent.php b/application/controllers/api/frontend/v1/stv/Prestudent.php
index d75ad5fbc..5917ae8f1 100644
--- a/application/controllers/api/frontend/v1/stv/Prestudent.php
+++ b/application/controllers/api/frontend/v1/stv/Prestudent.php
@@ -10,7 +10,7 @@ class Prestudent extends FHCAPI_Controller
 	{
 		parent::__construct([
 			'get' => ['admin:r', 'assistenz:r'],
-			'updatePrestudent' =>  ['admin:w', 'assistenz:w'],
+			'updatePrestudent' =>  ['admin:rw', 'assistenz:rw'],
 			'getHistoryPrestudents' => ['admin:r', 'assistenz:r'],
 			'getBezeichnungZGV' => self::PERM_LOGGED,
 			'getBezeichnungDZgv' => self::PERM_LOGGED,
@@ -23,6 +23,11 @@ class Prestudent extends FHCAPI_Controller
 			'getStudiengang' => self::PERM_LOGGED
 		]);
 
+		if ($this->router->method == 'updatePrestudent') {
+			$prestudent_id = current(array_slice($this->uri->rsegments, 2));
+			$this->checkPermissionsForPrestudent($prestudent_id, ['admin:rw', 'assistenz:rw']);
+		}
+
 		// Load Libraries
 		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
 
@@ -52,30 +57,11 @@ class Prestudent extends FHCAPI_Controller
 
 	public function updatePrestudent($prestudent_id)
 	{
-		$this->load->library('form_validation');
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-
-		//get Studiengang von prestudent_id
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-		$result = $this->PrestudentModel->load([
-			'prestudent_id'=> $prestudent_id,
-		]);
-		if(isError($result))
-		{
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-		$result = current(getData($result));
-
-		$stg = $result->studiengang_kz;
-
-		if(!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg))
-		{
-			return $this->terminateWithError($this->p->t('lehre','error_keineSchreibrechte'), self::ERROR_TYPE_GENERAL);
-		}
-
 		//Form validation
+		$this->load->library('form_validation');
+
 		$this->form_validation->set_rules('priorisierung', 'Priorisierung', 'numeric', [
-			'numeric' => $this->p->t('ui','error_fieldNotNumeric',['field' => 'Priorisierung'])
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Priorisierung'])
 		]);
 
 		if ($this->form_validation->run() == false)
@@ -83,8 +69,6 @@ class Prestudent extends FHCAPI_Controller
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 		}
 
-		$deltaData = $_POST;
-
 		$uid = getAuthUID();
 
 		$array_allowed_props_prestudent = [
@@ -124,7 +108,7 @@ class Prestudent extends FHCAPI_Controller
 		$update_prestudent = array();
 		foreach ($array_allowed_props_prestudent as $prop)
 		{
-			$val = isset($deltaData[$prop]) ? $deltaData[$prop] : null;
+			$val = $this->input->post($prop);
 			if ($val !== null || $prop == 'foerderrelevant') {
 				$update_prestudent[$prop] = $val;
 			}
@@ -133,28 +117,17 @@ class Prestudent extends FHCAPI_Controller
 		$update_prestudent['updateamum'] = date('c');
 		$update_prestudent['updatevon'] = $uid;
 
-		//utf8-decode for special chars (eg tag der offenen Tür, FH-Führer)
-		function utf8_decode_if_string($value)
-		{
-			if (is_string($value)) {
-				return utf8_decode($value);
-			} else {
-				return $value;
-			}
-		}
-		$update_prestudent_encoded = array_map('utf8_decode_if_string', $update_prestudent);
-
 		if (count($update_prestudent))
 		{
 			$result = $this->PrestudentModel->update(
 				$prestudent_id,
-				$update_prestudent_encoded
+				$update_prestudent
 			);
-			if (isError($result)) {
-				$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			}
+			$this->getDataOrTerminateWithError($result);
+
 			return $this->terminateWithSuccess(true);
 		}
+		return $this->terminateWithSuccess(false);
 	}
 
 	public function getHistoryPrestudents($person_id)

From 3d07aa3bd0ae57942dbdfa74b794f72f3c3bfa6a Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 13 Aug 2024 11:29:24 +0200
Subject: [PATCH 1138/1461] UDFs Prestudent aktivieren

---
 .../api/frontend/v1/stv/Prestudent.php         | 18 ++++++++++++++++++
 .../api/frontend/v1/stv/Student.php            |  4 ++--
 .../Studentenverwaltung/Details/Prestudent.js  |  9 ++++++++-
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Prestudent.php b/application/controllers/api/frontend/v1/stv/Prestudent.php
index 5917ae8f1..df8b14710 100644
--- a/application/controllers/api/frontend/v1/stv/Prestudent.php
+++ b/application/controllers/api/frontend/v1/stv/Prestudent.php
@@ -57,9 +57,19 @@ class Prestudent extends FHCAPI_Controller
 
 	public function updatePrestudent($prestudent_id)
 	{
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+		// UDF
+		$this->load->library('UDFLib');
+		
+		$result = $this->udflib->getCiValidations($this->PrestudentModel, $this->input->post());
+		$udf_field_validations = $this->getDataOrTerminateWithError($result);
+
 		//Form validation
 		$this->load->library('form_validation');
 
+		$this->form_validation->set_rules($udf_field_validations);
+
 		$this->form_validation->set_rules('priorisierung', 'Priorisierung', 'numeric', [
 			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Priorisierung'])
 		]);
@@ -105,6 +115,14 @@ class Prestudent extends FHCAPI_Controller
 			'standort_code'
 		];
 
+		// add UDFs
+		$result = $this->udflib->getDefinitionForModel($this->PrestudentModel);
+
+		$definitions = $this->getDataOrTerminateWithError($result);
+
+		foreach ($definitions as $def)
+			$array_allowed_props_prestudent[] = $def['name'];
+
 		$update_prestudent = array();
 		foreach ($array_allowed_props_prestudent as $prop)
 		{
diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php
index 2f7b02972..89c317ae4 100644
--- a/application/controllers/api/frontend/v1/stv/Student.php
+++ b/application/controllers/api/frontend/v1/stv/Student.php
@@ -143,9 +143,9 @@ class Student extends FHCAPI_Controller
 		$result = $this->udflib->getCiValidations($this->PersonModel, $this->input->post());
 
 		//TODO(Manu) check with Chris: input number not allowed
-		$field_validations = $this->getDataOrTerminateWithError($result);
+		$udf_field_validations = $this->getDataOrTerminateWithError($result);
 
-		$this->form_validation->set_rules($field_validations);
+		$this->form_validation->set_rules($udf_field_validations);
 
 		if (!$this->form_validation->run())
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
index 6857bef0b..e6db926cc 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
@@ -2,11 +2,14 @@ import FormForm from '../../../Form/Form.js';
 import FormInput from '../../../Form/Input.js';
 import TblHistory from "./Prestudent/History.js";
 
+import CoreUdf from '../../../Udf/Udf.js';
+
 export default {
 	components: {
 		FormForm,
 		FormInput,
-		TblHistory
+		TblHistory,
+		CoreUdf
 	},
 	inject: {
 		lists: {
@@ -98,6 +101,9 @@ export default {
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
+		udfsLoaded(udfs) {
+			this.initialFormData = {...(this.initialFormData || {}), ...udfs};
+		},
 		updatePrestudent(){
 			this.$refs.form
 				.post('api/frontend/v1/stv/prestudent/updatePrestudent/' + this.modelValue.prestudent_id, this.deltaArray)
@@ -505,6 +511,7 @@ export default {
 						>
 					</form-input>
 				</div>
+				<core-udf @load="udfsLoaded" v-model="data" class="row-cols-3 g-3 mb-3" ci-model="crm/prestudent" :pk="{prestudent_id:modelValue.prestudent_id}"></core-udf>
 			</fieldset>
 		</form-form>
 		<div>

From e5217afc0942eef4ace84277234597674f4f32f4 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 13 Aug 2024 13:10:11 +0200
Subject: [PATCH 1139/1461] ZGV Ausstellungsstaat

---
 application/models/crm/Prestudent_model.php | 33 +++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/application/models/crm/Prestudent_model.php b/application/models/crm/Prestudent_model.php
index e2acde497..242c26518 100644
--- a/application/models/crm/Prestudent_model.php
+++ b/application/models/crm/Prestudent_model.php
@@ -14,6 +14,39 @@ class Prestudent_model extends DB_Model
 		$this->load->model('crm/prestudentstatus_model', 'PrestudentstatusModel');
 	}
 
+	/**
+	 * Update Data in DB-Table
+	 *
+	 * @param   string $id  PK for DB-Table
+	 * @param   array $data  DataArray for Insert
+	 * @return  array
+	 */
+	public function update($id, $data, $encryptedColumns = null)
+	{
+		if (isset($data['zgvmas_code'])
+			|| isset($data['zgvmanation'])
+			|| isset($data['zgv_code'])
+			|| isset($data['zgvnation'])
+		) {
+			/**
+			 * Falls ZGV vorhanden, setze Ausstellungsstaat (für BIS-Meldung)
+			 * auf Nation der höchsten angegebenen ZGV
+			 */
+			$case = '(CASE 
+				WHEN zgvmas_code IS NOT NULL AND zgvmanation IS NOT NULL THEN zgvmanation 
+				WHEN zgv_code IS NOT NULL AND zgvnation IS NOT NULL THEN zgvnation 
+				ELSE NULL END)';
+			
+			foreach (['zgvmas_code', 'zgvmanation', 'zgv_code', 'zgvnation'] as $key)
+				if (isset($data[$key]))
+					$case = str_replace($key, $this->escape($data[$key]), $case);
+			
+			$this->db->set('ausstellungsstaat', $case, false);
+		}
+
+		return parent::update($id, $data, $encryptedColumns);
+	}
+
 	/**
 	 * getLastStatuses
 	 */

From f9a41b9685a5a03d562e92b14f46074018a62ff1 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 13 Aug 2024 13:25:10 +0200
Subject: [PATCH 1140/1461] Studienplan & Studiensemester => Auth Controller

---
 application/controllers/components/stv/Studienplan.php    | 6 ++++--
 .../controllers/components/stv/Studiensemester.php        | 8 ++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/application/controllers/components/stv/Studienplan.php b/application/controllers/components/stv/Studienplan.php
index 2e7c2f425..b60388ac1 100644
--- a/application/controllers/components/stv/Studienplan.php
+++ b/application/controllers/components/stv/Studienplan.php
@@ -2,12 +2,14 @@
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
-class Studienplan extends FHC_Controller
+class Studienplan extends Auth_Controller
 {
 	public function __construct()
 	{
 		// TODO(chris): access!
-		parent::__construct();
+		parent::__construct([
+			'get' => self::PERM_LOGGED
+		]);
 	}
 
 	public function get()
diff --git a/application/controllers/components/stv/Studiensemester.php b/application/controllers/components/stv/Studiensemester.php
index 09bbf8886..17c229e2c 100644
--- a/application/controllers/components/stv/Studiensemester.php
+++ b/application/controllers/components/stv/Studiensemester.php
@@ -2,12 +2,16 @@
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
-class Studiensemester extends FHC_Controller
+class Studiensemester extends Auth_Controller
 {
 	public function __construct()
 	{
 		// TODO(chris): access!
-		parent::__construct();
+		parent::__construct([
+			'index' => self::PERM_LOGGED,
+			'now' => self::PERM_LOGGED,
+			'set' => self::PERM_LOGGED
+		]);
 	}
 
 	public function index()

From 6fb050fa58932842d9fc357f4243966a18f05873 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 13 Aug 2024 13:32:29 +0200
Subject: [PATCH 1141/1461] Tab Config Permissions

---
 application/controllers/api/frontend/v1/stv/Config.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index 45ae7be01..c28c49485 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -33,8 +33,8 @@ class Config extends FHCAPI_Controller
 	{
 		// TODO(chris): permissions
 		parent::__construct([
-			'student' => self::PERM_LOGGED,
-			'students' => self::PERM_LOGGED
+			'student' => ['admin:r', 'assistenz:r'],
+			'students' => ['admin:r', 'assistenz:r']
 		]);
 
 

From a988ff20c886887b22566bcc6929ff06acf37247 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 13 Aug 2024 13:38:09 +0200
Subject: [PATCH 1142/1461] Notiz Permissions

---
 application/controllers/api/frontend/v1/stv/Notiz.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Notiz.php b/application/controllers/api/frontend/v1/stv/Notiz.php
index 426408863..19e568f33 100644
--- a/application/controllers/api/frontend/v1/stv/Notiz.php
+++ b/application/controllers/api/frontend/v1/stv/Notiz.php
@@ -11,9 +11,9 @@ class Notiz extends Notiz_Controller
 		parent::__construct([
 			'getUid' => ['admin:r', 'assistenz:r'],
 			'getNotizen' => ['admin:r', 'assistenz:r'],
-			'loadNotiz' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
-			'addNewNotiz' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
-			'updateNotiz' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
+			'loadNotiz' => ['admin:r', 'assistenz:r'], // TODO(manu): self::PERM_LOGGED
+			'addNewNotiz' => ['admin:rw', 'assistenz:rw'], // TODO(manu): self::PERM_LOGGED
+			'updateNotiz' => ['admin:rw', 'assistenz:rw'], // TODO(manu): self::PERM_LOGGED
 			'deleteNotiz' => ['admin:r', 'assistenz:r'],
 			'loadDokumente' => ['admin:r', 'assistenz:r'],
 			'getMitarbeiter' => ['admin:r', 'assistenz:r']

From f8f352fe65683178977aee1de8c3bf5dabc21eaf Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 13 Aug 2024 13:41:35 +0200
Subject: [PATCH 1143/1461] Students Permissions

---
 application/controllers/api/frontend/v1/stv/Students.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/controllers/api/frontend/v1/stv/Students.php b/application/controllers/api/frontend/v1/stv/Students.php
index 1a90b51cd..5fb7b592c 100644
--- a/application/controllers/api/frontend/v1/stv/Students.php
+++ b/application/controllers/api/frontend/v1/stv/Students.php
@@ -32,7 +32,7 @@ class Students extends FHCAPI_Controller
 	{
 		$permissions = [];
 		$router = load_class('Router');
-		$permissions[$router->method] = self::PERM_LOGGED;
+		$permissions[$router->method] = ['admin:r', 'assistenz:r'];
 		parent::__construct($permissions);
 
 		$this->allowedStgs = $this->permissionlib->getSTG_isEntitledFor('admin') ?: [];

From 4fc61c342c622300f0d142c4084749d9e29467ac Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 13 Aug 2024 13:52:04 +0200
Subject: [PATCH 1144/1461] Prestudent Permissions

---
 .../api/frontend/v1/stv/Prestudent.php        | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Prestudent.php b/application/controllers/api/frontend/v1/stv/Prestudent.php
index df8b14710..abbbb16d9 100644
--- a/application/controllers/api/frontend/v1/stv/Prestudent.php
+++ b/application/controllers/api/frontend/v1/stv/Prestudent.php
@@ -12,20 +12,29 @@ class Prestudent extends FHCAPI_Controller
 			'get' => ['admin:r', 'assistenz:r'],
 			'updatePrestudent' =>  ['admin:rw', 'assistenz:rw'],
 			'getHistoryPrestudents' => ['admin:r', 'assistenz:r'],
-			'getBezeichnungZGV' => self::PERM_LOGGED,
-			'getBezeichnungDZgv' => self::PERM_LOGGED,
-			'getBezeichnungMZgv' => self::PERM_LOGGED,
-			'getAusbildung' => self::PERM_LOGGED,
-			'getAufmerksamdurch' => self::PERM_LOGGED,
-			'getBerufstaetigkeit' => self::PERM_LOGGED,
-			'getTypenStg' => self::PERM_LOGGED,
-			'getStudienplaene' => self::PERM_LOGGED,
-			'getStudiengang' => self::PERM_LOGGED
+			'getBezeichnungZGV' => ['admin:r', 'assistenz:r'],
+			'getBezeichnungDZgv' => ['admin:r', 'assistenz:r'],
+			'getBezeichnungMZgv' => ['admin:r', 'assistenz:r'],
+			'getAusbildung' => ['admin:r', 'assistenz:r'],
+			'getAufmerksamdurch' => ['admin:r', 'assistenz:r'],
+			'getBerufstaetigkeit' => ['admin:r', 'assistenz:r'],
+			'getTypenStg' => ['admin:r', 'assistenz:r'],
+			'getStudienplaene' => ['admin:r', 'assistenz:r'],
+			'getStudiengang' => ['admin:r', 'assistenz:r']
 		]);
 
 		if ($this->router->method == 'updatePrestudent') {
 			$prestudent_id = current(array_slice($this->uri->rsegments, 2));
 			$this->checkPermissionsForPrestudent($prestudent_id, ['admin:rw', 'assistenz:rw']);
+		} elseif ($this->router->method == 'get'
+			|| $this->router->method == 'getStudienplaene'
+			|| $this->router->method == 'getStudiengang'
+		) {
+			$prestudent_id = current(array_slice($this->uri->rsegments, 2));
+			$this->checkPermissionsForPrestudent($prestudent_id, ['admin:r', 'assistenz:r']);
+		} elseif ($this->router->method == 'getHistoryPrestudents') {
+			$person_id = current(array_slice($this->uri->rsegments, 2));
+			$this->checkPermissionsForPrestudent($person_id, ['admin:r', 'assistenz:r'], ['admin:r', 'assistenz:r']);
 		}
 
 		// Load Libraries

From 5d169e188a082215538a8d624307c2d5359f97da Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 13 Aug 2024 14:12:55 +0200
Subject: [PATCH 1145/1461] move permissions from abstract to concrete Notiz
 Controller

---
 .../api/frontend/v1/notiz/NotizPerson.php     |  8 +++
 .../core/Abstract_Searchbar_Controller.php    | 69 +++++++++++++++++++
 application/core/Notiz_Controller.php         | 35 ++++++----
 3 files changed, 100 insertions(+), 12 deletions(-)
 create mode 100644 application/core/Abstract_Searchbar_Controller.php

diff --git a/application/controllers/api/frontend/v1/notiz/NotizPerson.php b/application/controllers/api/frontend/v1/notiz/NotizPerson.php
index 15445bd14..cb9d31024 100644
--- a/application/controllers/api/frontend/v1/notiz/NotizPerson.php
+++ b/application/controllers/api/frontend/v1/notiz/NotizPerson.php
@@ -9,6 +9,14 @@ class NotizPerson extends Notiz_Controller
 	public function __construct()
 	{
 		parent::__construct([
+			'getUid' => ['admin:r', 'assistenz:r'],
+			'getNotizen' => ['admin:r', 'assistenz:r'],
+			'loadNotiz' => ['admin:r', 'assistenz:r'],
+			'addNewNotiz' => ['admin:rw', 'assistenz:rw'],
+			'updateNotiz' => ['admin:rw', 'assistenz:rw'],
+			'deleteNotiz' => ['admin:rw', 'assistenz:rw'],
+			'loadDokumente' => ['admin:r', 'assistenz:r'],
+			'getMitarbeiter' => ['admin:r', 'assistenz:r'],
 			'isBerechtigt' => ['admin:r', 'assistenz:r'],
 		]);
 	}
diff --git a/application/core/Abstract_Searchbar_Controller.php b/application/core/Abstract_Searchbar_Controller.php
new file mode 100644
index 000000000..8b383e042
--- /dev/null
+++ b/application/core/Abstract_Searchbar_Controller.php
@@ -0,0 +1,69 @@
+<?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');
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the SearchBarLib (back-end)
+ * Provides data to the ajax get calls about the searchbar component
+ * This controller works with JSON calls on the HTTP GET and the output is always JSON
+ */
+class Searchbar extends FHCAPI_Controller
+{
+	const SEARCHSTR_PARAM = 'searchstr';
+	const TYPES_PARAM = 'types';
+
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+		// NOTE(chris): additional permission checks will be done in SearchBarLib
+		parent::__construct([
+			'search' => self::PERM_LOGGED
+		]);
+
+		// Load the library SearchBarLib
+		$this->load->library('SearchBarLib');
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * Gets a JSON body via HTTP POST and provides the parameters
+	 */
+	public function search()
+	{
+		$this->load->library('form_validation');
+
+		// Checks if the searchstr and the types parameters are in the POSTed JSON
+		$this->form_validation->set_rules(self::SEARCHSTR_PARAM, null, 'required');
+		$this->form_validation->set_rules(self::TYPES_PARAM . '[]', null, 'required');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithError(SearchBarLib::ERROR_WRONG_JSON, self::ERROR_TYPE_GENERAL);
+
+		// Convert to json the result from searchbarlib->search
+		$result = $this->searchbarlib->search($this->input->post(self::SEARCHSTR_PARAM), $this->input->post(self::TYPES_PARAM));
+		if (property_exists($result, 'error'))
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		$this->terminateWithSuccess($result);
+	}
+}
+
diff --git a/application/core/Notiz_Controller.php b/application/core/Notiz_Controller.php
index 17bd28481..05f70ee85 100644
--- a/application/core/Notiz_Controller.php
+++ b/application/core/Notiz_Controller.php
@@ -6,20 +6,31 @@ use \DateTime as DateTime;
 
 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()
+	public function __construct($permissions)
 	{
-		parent::__construct([
-			'getUid' => self::PERM_LOGGED,
-			'getNotizen' => self::PERM_LOGGED,
-			'loadNotiz' => self::PERM_LOGGED,
-			'addNewNotiz' => self::PERM_LOGGED,
-			'updateNotiz' => self::PERM_LOGGED,
-			'deleteNotiz' => ['admin:w', 'assistenz:w'],
-			'loadDokumente' => ['admin:w', 'assistenz:w'],
-			'getMitarbeiter' => self::PERM_LOGGED,
-			'isBerechtigt' => self::PERM_LOGGED,
-		]);
+		$default_permissions = [
+			'getUid' => self::DEFAULT_PERMISSION_R,
+			'getNotizen' => self::DEFAULT_PERMISSION_R,
+			'loadNotiz' => self::DEFAULT_PERMISSION_R,
+			'addNewNotiz' => self::DEFAULT_PERMISSION_RW,
+			'updateNotiz' => self::DEFAULT_PERMISSION_RW,
+			'deleteNotiz' => self::DEFAULT_PERMISSION_RW,
+			'loadDokumente' => self::DEFAULT_PERMISSION_R,
+			'getMitarbeiter' => self::DEFAULT_PERMISSION_R,
+			'isBerechtigt' => self::DEFAULT_PERMISSION_R,
+		];
+		
+		if(!is_array($permissions))
+		{
+		    $this->terminateWithError("Notiz_controller construct: permissions must be an array");
+		}
+		
+		$merged_permissions = array_merge($default_permissions, $permissions);
+		
+		parent::__construct($merged_permissions);
 
 		//Load Models
 		$this->load->model('person/Notiz_model', 'NotizModel');

From 50a96b3e4f6c0636556e12f6c5d6110a95f9b81d Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 13 Aug 2024 14:20:40 +0200
Subject: [PATCH 1146/1461] Prestudent History: Wrong Function for
 Permissioncheck

---
 application/controllers/api/frontend/v1/stv/Prestudent.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/controllers/api/frontend/v1/stv/Prestudent.php b/application/controllers/api/frontend/v1/stv/Prestudent.php
index abbbb16d9..ef9aeb111 100644
--- a/application/controllers/api/frontend/v1/stv/Prestudent.php
+++ b/application/controllers/api/frontend/v1/stv/Prestudent.php
@@ -34,7 +34,7 @@ class Prestudent extends FHCAPI_Controller
 			$this->checkPermissionsForPrestudent($prestudent_id, ['admin:r', 'assistenz:r']);
 		} elseif ($this->router->method == 'getHistoryPrestudents') {
 			$person_id = current(array_slice($this->uri->rsegments, 2));
-			$this->checkPermissionsForPrestudent($person_id, ['admin:r', 'assistenz:r'], ['admin:r', 'assistenz:r']);
+			$this->checkPermissionsForPerson($person_id, ['admin:r', 'assistenz:r'], ['admin:r', 'assistenz:r']);
 		}
 
 		// Load Libraries

From 98f335ec0085621a30bb6fed39dc8d06b7cfec7a Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 13 Aug 2024 14:30:25 +0200
Subject: [PATCH 1147/1461] mising fileextension on import in Prompt.js

---
 public/js/components/Bootstrap/Prompt.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Bootstrap/Prompt.js b/public/js/components/Bootstrap/Prompt.js
index 74e5c8b3f..f7af263b0 100644
--- a/public/js/components/Bootstrap/Prompt.js
+++ b/public/js/components/Bootstrap/Prompt.js
@@ -1,5 +1,5 @@
 
-import BsAlert from './Alert';
+import BsAlert from './Alert.js';
 
 export default {
 	mixins: [

From 2e3576b06e773e978dd3b01ee7695739da689537 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 13 Aug 2024 14:34:53 +0200
Subject: [PATCH 1148/1461] Bugfix: Advance Status: object in array

---
 application/controllers/api/frontend/v1/stv/Status.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index c5daf78a2..074f4029e 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -1490,6 +1490,7 @@ class Status extends FHCAPI_Controller
 
 		if (!$student)
 			$this->terminateWithError($this->p->t('studierendenantrag', 'error_no_student_for_prestudent', ['prestudent_id' => $prestudent_id]));
+		$student = current($student);
 
 
 		//process studentlehrverband

From e24c610bf17d0580a32d02664c4cc1fca996b7a9 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 13 Aug 2024 14:59:54 +0200
Subject: [PATCH 1149/1461] Studiensemester now: change getAkt to getNearest

---
 application/controllers/components/stv/Studiensemester.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/controllers/components/stv/Studiensemester.php b/application/controllers/components/stv/Studiensemester.php
index 17c229e2c..c3db99686 100644
--- a/application/controllers/components/stv/Studiensemester.php
+++ b/application/controllers/components/stv/Studiensemester.php
@@ -32,7 +32,7 @@ class Studiensemester extends Auth_Controller
 	{
 		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
 
-		$result = $this->StudiensemesterModel->getAkt();
+		$result = $this->StudiensemesterModel->getNearest();
 
 		if (isError($result)) {
 			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);

From 308412b5a305daa0edba92aa23704ddabff1e928 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 13 Aug 2024 15:00:13 +0200
Subject: [PATCH 1150/1461] Bugfix Creditpoints

---
 .../components/Stv/Studentenverwaltung/Details/Konto/New.js   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js b/public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js
index 52e15a4d5..ddbb59faa 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js
@@ -89,7 +89,7 @@ export default {
 				buchungstext: '',
 				mahnspanne: 30,
 				studiensemester_kurzbz: this.defaultSemester,
-				credit_points: '',
+				credit_points: null,
 				anmerkung: ''
 			};
 			this.$refs.modal.show();
@@ -110,7 +110,7 @@ export default {
 			if (!this.data.buchungstext)
 				this.data.buchungstext = text;
 
-			if (this.config.showCreditpoints && this.data.credit_points == '0.00')
+			if (this.config.showCreditpoints && (this.data.credit_points == '0.00' || this.data.credit_points === null))
 				this.data.credit_points = creditpoints;
 		}
 	},

From 36bd1795ed57af353652886fd252deb51c75a030 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 13 Aug 2024 15:04:44 +0200
Subject: [PATCH 1151/1461] makes the cis4 side menu sticky

---
 application/views/templates/CISHTML-Header.php | 4 ++--
 public/css/Cis4/Cis.css                        | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/application/views/templates/CISHTML-Header.php b/application/views/templates/CISHTML-Header.php
index 58d6f2443..6a034cfb4 100755
--- a/application/views/templates/CISHTML-Header.php
+++ b/application/views/templates/CISHTML-Header.php
@@ -35,12 +35,12 @@ if (!isset($menu)) {
 		<img src="<?= base_url('/public/images/logo-300x160.png'); ?>" alt="Logo">
 	</a>
 	<nav id="nav-main" class="offcanvas offcanvas-start bg-dark" tabindex="-1" aria-labelledby="nav-main-btn" data-bs-backdrop="false">
-		<div id="nav-main-toggle" class="position-static d-none d-lg-block bg-dark">
+		<div id="nav-main-toggle" class="d-none d-lg-flex bg-dark">
 			<button type="button" class="btn bg-dark text-light rounded-0 p-1 d-flex align-items-center" data-bs-toggle="collapse" data-bs-target="#nav-main-menu" aria-expanded="true" aria-controls="nav-main-menu">
 				<i class="fa fa-arrow-circle-left"></i>
 			</button>
 		</div>
-		<div class="offcanvas-body p-0">
+		<div class="offcanvas-body flex-grow-0 p-0">
 			<fhc-searchbar id="nav-search" class="fhc-searchbar w-100" :searchoptions="searchbaroptions" :searchfunction="searchfunction"></fhc-searchbar>
 			<button id="nav-user-btn" class="btn btn-link rounded-0" type="button" data-bs-toggle="collapse" data-bs-target="#nav-user-menu" aria-expanded="false" aria-controls="nav-user-menu">
 				<img src="<?= site_url('Cis/Pub/bild/person/' . getAuthPersonId()); ?>" class="avatar rounded-circle"/>
diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index 44ffc2fec..3122fe97e 100755
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -36,6 +36,7 @@ html {
   :root {
     --fhc-cis-menu-width: 250px;
     --fhc-cis-header-height: 60px;
+	--fhc-cis-toggle-height: 30px;
     --fhc-cis-menu-bg: #72777A;
   }
 }
@@ -43,6 +44,7 @@ html {
   :root {
     --fhc-cis-menu-width: 400px;
     --fhc-cis-header-height: 40px;
+	--fhc-cis-toggle-height: 0px;
     --fhc-cis-menu-bg: #343a40;
   }
 }
@@ -233,6 +235,9 @@ html {
     height: 100%;
   }
   #nav-main-toggle {
+	position: sticky;
+	top: var(--fhc-cis-header-height);
+	height: var(--fhc-cis-toggle-height);
     width: 0;
     z-index: 1;
   }
@@ -247,6 +252,10 @@ html {
     transform: scaleX(-1);
     color: var(--bs-dark);
   }
+  #nav-main .offcanvas-body{
+	position: sticky;
+	top: calc(var(--fhc-cis-header-height) + var(--fhc-cis-toggle-height));
+  }
   #nav-search {
     position: fixed;
     top: 0;

From 8bc8c67f8d16be5253f245c1e39f26ba14cb3c5b Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 13 Aug 2024 15:10:23 +0200
Subject: [PATCH 1152/1461] better comments

---
 .../models/ressource/Stundenplan_model.php    | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index fed70ac74..5936106f2 100755
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -133,7 +133,14 @@ class Stundenplan_model extends DB_Model
 		return $gruppierteEvents;
 	}
 
-	public function stundenPlanGruppierung($stundenplanViewQuery)
+
+	/**
+	 * function that takes a query that fetches lehre.vw_stundenplan rows and groups them so that they can be displayed in a calendar
+	 * @param string $stundenplanViewQuery the subquery used to group the result
+	 * 
+	 * @return stdClass
+	 */
+	public function stundenplanGruppierung($stundenplanViewQuery)
 	{
 		
 
@@ -176,6 +183,12 @@ class Stundenplan_model extends DB_Model
 		return $gruppierteEvents;
 	}
 
+	/**
+	 * NO STANDALONE FUNCTION - Generates a SQL query string to fetch 'stundenplan' events for a specific student within the current semester.
+	 * @param string $uid the user id that is used to fetch the stundenplan rows from the lehre.vw_studenplan table
+	 * 
+	 * @return string
+	 */
 	public function getStudenPlanQuery($uid){
 			return 
 			"select sp.*
@@ -188,6 +201,14 @@ class Stundenplan_model extends DB_Model
 			WHERE ss1.studiensemester_kurzbz IS NOT NULL or ss2.studiensemester_kurzbz IS NOT NULL";
 	}
 
+	/**
+	 * NO STANDALONE FUNCTION - Generates a SQL query string to fetch 'stundenplan' events for a specific room within a date range.
+	 * @param string $ort_kurzbz the ort from which we want to query the stundenplan events 
+	 * @param string $start_date (inclusive) the minimum date that an event should have to be fetched
+	 * @param string $end_date (inclusive) the maximum date that an event should not extend to be fetched
+	 * 
+	 * @return string
+	 */
 	public function getRoomQuery($ort_kurzbz, $start_date, $end_date)
 	{
 		return

From 3a466e8e0fe71e1a5187cbb8e7bf6befeced2aa8 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 13 Aug 2024 15:27:51 +0200
Subject: [PATCH 1153/1461] puts nav-toggle and nav-menu-items in a sticky
 container

---
 .../views/templates/CISHTML-Header.php        | 44 ++++++++++---------
 public/css/Cis4/Cis.css                       | 13 ++----
 2 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/application/views/templates/CISHTML-Header.php b/application/views/templates/CISHTML-Header.php
index 6a034cfb4..811047093 100755
--- a/application/views/templates/CISHTML-Header.php
+++ b/application/views/templates/CISHTML-Header.php
@@ -35,27 +35,29 @@ if (!isset($menu)) {
 		<img src="<?= base_url('/public/images/logo-300x160.png'); ?>" alt="Logo">
 	</a>
 	<nav id="nav-main" class="offcanvas offcanvas-start bg-dark" tabindex="-1" aria-labelledby="nav-main-btn" data-bs-backdrop="false">
-		<div id="nav-main-toggle" class="d-none d-lg-flex bg-dark">
-			<button type="button" class="btn bg-dark text-light rounded-0 p-1 d-flex align-items-center" data-bs-toggle="collapse" data-bs-target="#nav-main-menu" aria-expanded="true" aria-controls="nav-main-menu">
-				<i class="fa fa-arrow-circle-left"></i>
-			</button>
-		</div>
-		<div class="offcanvas-body flex-grow-0 p-0">
-			<fhc-searchbar id="nav-search" class="fhc-searchbar w-100" :searchoptions="searchbaroptions" :searchfunction="searchfunction"></fhc-searchbar>
-			<button id="nav-user-btn" class="btn btn-link rounded-0" type="button" data-bs-toggle="collapse" data-bs-target="#nav-user-menu" aria-expanded="false" aria-controls="nav-user-menu">
-				<img src="<?= site_url('Cis/Pub/bild/person/' . getAuthPersonId()); ?>" class="avatar rounded-circle"/>
-			</button>
-			<ul id="nav-user-menu" class="collapse list-unstyled" aria-labelledby="nav-user-btn">
-				<li><a class="btn btn-level-2 rounded-0 d-block" href="<?= site_url('Cis/Profil'); ?>" id="menu-profil">Profil</a></li>
-				<li><a class="btn btn-level-2 rounded-0 d-block" href="#">Ampeln</a></li>
-				<li><hr class="dropdown-divider"></li>
-				<li><a class="btn btn-level-2 rounded-0 d-block" href="<?= site_url('Cis/Auth/logout'); ?>">Logout</a></li>
-			</ul>
-			<div id="nav-main-menu" class="collapse collapse-horizontal show">
-				<div>
-				<?php foreach($menu->childs as $entry)
-					$this->load->view('templates/CISHTML-Menu/Entry', ['entry' => $entry, 'menu_id' => 'menu']);
-				?>
+		<div id="nav-main-sticky">
+			<div id="nav-main-toggle" class="position-static d-none d-lg-flex bg-dark">
+				<button type="button" class="btn bg-dark text-light rounded-0 p-1 d-flex align-items-center" data-bs-toggle="collapse" data-bs-target="#nav-main-menu" aria-expanded="true" aria-controls="nav-main-menu">
+					<i class="fa fa-arrow-circle-left"></i>
+				</button>
+			</div>
+			<div class="p-0">
+				<fhc-searchbar id="nav-search" class="fhc-searchbar w-100" :searchoptions="searchbaroptions" :searchfunction="searchfunction"></fhc-searchbar>
+				<button id="nav-user-btn" class="btn btn-link rounded-0" type="button" data-bs-toggle="collapse" data-bs-target="#nav-user-menu" aria-expanded="false" aria-controls="nav-user-menu">
+					<img src="<?= site_url('Cis/Pub/bild/person/' . getAuthPersonId()); ?>" class="avatar rounded-circle"/>
+				</button>
+				<ul id="nav-user-menu" class="collapse list-unstyled" aria-labelledby="nav-user-btn">
+					<li><a class="btn btn-level-2 rounded-0 d-block" href="<?= site_url('Cis/Profil'); ?>" id="menu-profil">Profil</a></li>
+					<li><a class="btn btn-level-2 rounded-0 d-block" href="#">Ampeln</a></li>
+					<li><hr class="dropdown-divider"></li>
+					<li><a class="btn btn-level-2 rounded-0 d-block" href="<?= site_url('Cis/Auth/logout'); ?>">Logout</a></li>
+				</ul>
+				<div id="nav-main-menu" class="collapse collapse-horizontal show">
+					<div>
+					<?php foreach($menu->childs as $entry)
+						$this->load->view('templates/CISHTML-Menu/Entry', ['entry' => $entry, 'menu_id' => 'menu']);
+					?>
+					</div>
 				</div>
 			</div>
 		</div>
diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index 3122fe97e..bbad5f056 100755
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -36,7 +36,6 @@ html {
   :root {
     --fhc-cis-menu-width: 250px;
     --fhc-cis-header-height: 60px;
-	--fhc-cis-toggle-height: 30px;
     --fhc-cis-menu-bg: #72777A;
   }
 }
@@ -44,7 +43,6 @@ html {
   :root {
     --fhc-cis-menu-width: 400px;
     --fhc-cis-header-height: 40px;
-	--fhc-cis-toggle-height: 0px;
     --fhc-cis-menu-bg: #343a40;
   }
 }
@@ -234,10 +232,11 @@ html {
     width: 100%;
     height: 100%;
   }
+  #nav-main-sticky {
+  	position: sticky;
+  	top: var(--fhc-cis-header-height);
+  }
   #nav-main-toggle {
-	position: sticky;
-	top: var(--fhc-cis-header-height);
-	height: var(--fhc-cis-toggle-height);
     width: 0;
     z-index: 1;
   }
@@ -252,10 +251,6 @@ html {
     transform: scaleX(-1);
     color: var(--bs-dark);
   }
-  #nav-main .offcanvas-body{
-	position: sticky;
-	top: calc(var(--fhc-cis-header-height) + var(--fhc-cis-toggle-height));
-  }
   #nav-search {
     position: fixed;
     top: 0;

From 2bd578edb3426d6714e92f0cb5a256056f973c06 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 13 Aug 2024 16:42:09 +0200
Subject: [PATCH 1154/1461] remove unused Abstract_Searchbar_Controller

---
 .../core/Abstract_Searchbar_Controller.php    | 69 -------------------
 1 file changed, 69 deletions(-)
 delete mode 100644 application/core/Abstract_Searchbar_Controller.php

diff --git a/application/core/Abstract_Searchbar_Controller.php b/application/core/Abstract_Searchbar_Controller.php
deleted file mode 100644
index 8b383e042..000000000
--- a/application/core/Abstract_Searchbar_Controller.php
+++ /dev/null
@@ -1,69 +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');
-
-/**
- * This controller operates between (interface) the JS (GUI) and the SearchBarLib (back-end)
- * Provides data to the ajax get calls about the searchbar component
- * This controller works with JSON calls on the HTTP GET and the output is always JSON
- */
-class Searchbar extends FHCAPI_Controller
-{
-	const SEARCHSTR_PARAM = 'searchstr';
-	const TYPES_PARAM = 'types';
-
-	/**
-	 * Object initialization
-	 */
-	public function __construct()
-	{
-		// NOTE(chris): additional permission checks will be done in SearchBarLib
-		parent::__construct([
-			'search' => self::PERM_LOGGED
-		]);
-
-		// Load the library SearchBarLib
-		$this->load->library('SearchBarLib');
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * Gets a JSON body via HTTP POST and provides the parameters
-	 */
-	public function search()
-	{
-		$this->load->library('form_validation');
-
-		// Checks if the searchstr and the types parameters are in the POSTed JSON
-		$this->form_validation->set_rules(self::SEARCHSTR_PARAM, null, 'required');
-		$this->form_validation->set_rules(self::TYPES_PARAM . '[]', null, 'required');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithError(SearchBarLib::ERROR_WRONG_JSON, self::ERROR_TYPE_GENERAL);
-
-		// Convert to json the result from searchbarlib->search
-		$result = $this->searchbarlib->search($this->input->post(self::SEARCHSTR_PARAM), $this->input->post(self::TYPES_PARAM));
-		if (property_exists($result, 'error'))
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		$this->terminateWithSuccess($result);
-	}
-}
-

From 8a9e040554f63d9310d97b9c9234c5808c7832f3 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Tue, 13 Aug 2024 16:57:05 +0200
Subject: [PATCH 1155/1461] added Gehaltstyp model

---
 .../vertragsbestandteil/GehaltsTyp_model.php  | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 application/models/vertragsbestandteil/GehaltsTyp_model.php

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

From 2c6212f75fb5f4d6a786af002be906de59d7ae16 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 14 Aug 2024 07:36:14 +0200
Subject: [PATCH 1156/1461] fix reuse of  for multiple purposes overwriting
 each other

---
 application/controllers/api/frontend/v1/stv/Konto.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Konto.php b/application/controllers/api/frontend/v1/stv/Konto.php
index a4344889c..ac36b5d8f 100644
--- a/application/controllers/api/frontend/v1/stv/Konto.php
+++ b/application/controllers/api/frontend/v1/stv/Konto.php
@@ -246,11 +246,11 @@ class Konto extends FHCAPI_Controller
 			if (isError($id)) {
 				$this->addError(getError($id), self::ERROR_TYPE_DB);
 			} else {
-				$data = $this->KontoModel->withAdditionalInfo()->load(getData($id));
-				if (isError($data))
-					$this->addError(getError($data), self::ERROR_TYPE_DB);
+				$kontodata = $this->KontoModel->withAdditionalInfo()->load(getData($id));
+				if (isError($kontodata))
+					$this->addError(getError($kontodata), self::ERROR_TYPE_DB);
 				else
-					$result[] = current(getData($data));
+					$result[] = current(getData($kontodata));
 			}
 		}
 

From d33163aae8e5e72a920cb65a1df75e1b2b74e873 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 14 Aug 2024 09:09:13 +0200
Subject: [PATCH 1157/1461] Add stv_favorites to variablenames

---
 system/dbupdate_3.4/44031_stv_favorites.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 system/dbupdate_3.4/44031_stv_favorites.php

diff --git a/system/dbupdate_3.4/44031_stv_favorites.php b/system/dbupdate_3.4/44031_stv_favorites.php
new file mode 100644
index 000000000..473001c68
--- /dev/null
+++ b/system/dbupdate_3.4/44031_stv_favorites.php
@@ -0,0 +1,16 @@
+<?php
+if (!defined('DB_NAME')) exit('No direct script access allowed');
+
+// Add new name type in public.tbl_variablenname
+if ($result = @$db->db_query("SELECT 1 FROM public.tbl_variablenname WHERE name = 'stv_favorites';"))
+{
+	if ($db->db_num_rows($result) == 0)
+	{
+		$qry = "INSERT INTO public.tbl_variablenname(name, defaultwert) VALUES('stv_favorites', null);";
+
+		if (!$db->db_query($qry))
+			echo '<strong>public.tbl_variablenname '.$db->db_last_error().'</strong><br>';
+		else
+			echo 'public.tbl_variablenname: Added name "stv_favorites"<br>';
+	}
+}

From 67398607d8041a428cea5c923209667734e54965 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 14 Aug 2024 09:11:14 +0200
Subject: [PATCH 1158/1461] dbupdate entry

---
 system/dbupdate_3.4.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index f728910e9..11880fd55 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -57,6 +57,7 @@ require_once('dbupdate_3.4/34543_ux_template.php');
 require_once('dbupdate_3.4/17513_Entwicklungsteam.php');
 require_once('dbupdate_3.4/28575_softwarebereitstellung.php');
 require_once('dbupdate_3.4/41150_oe-pfad_db_view.php');
+require_once('dbupdate_3.4/44031_stv_favorites.php');
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';

From f771b54f10c86223ce6af987d64828d1f76f2e17 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 14 Aug 2024 09:16:11 +0200
Subject: [PATCH 1159/1461] StV: Favorites use now correct API return functions

---
 application/controllers/api/frontend/v1/stv/Favorites.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Favorites.php b/application/controllers/api/frontend/v1/stv/Favorites.php
index e651bf85e..8d7a6cd14 100644
--- a/application/controllers/api/frontend/v1/stv/Favorites.php
+++ b/application/controllers/api/frontend/v1/stv/Favorites.php
@@ -46,9 +46,9 @@ class Favorites extends FHCAPI_Controller
 		$data = $this->getDataOrTerminateWithError($result);
 
 		if (!$data)
-			$this->outputJson(null);
+			$this->terminateWithSuccess(null);
 		else
-			$this->outputJson($data['stv_favorites']);
+			$this->terminateWithSuccess($data['stv_favorites']);
 	}
 
 	public function set()
@@ -66,6 +66,6 @@ class Favorites extends FHCAPI_Controller
 
 		$this->getDataOrTerminateWithError($result);
 		
-		$this->outputJsonSuccess(true);
+		$this->terminateWithSuccess(true);
 	}
 }

From a594ddeb753403efce0fb814e1945a62037d7b78 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 19 Aug 2024 13:08:12 +0200
Subject: [PATCH 1160/1461] AntragJob: Abmeldungen durch Stg config mismatch

---
 application/controllers/jobs/AntragJob.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/controllers/jobs/AntragJob.php b/application/controllers/jobs/AntragJob.php
index 4ad601070..46a31f3d6 100644
--- a/application/controllers/jobs/AntragJob.php
+++ b/application/controllers/jobs/AntragJob.php
@@ -421,7 +421,7 @@ class AntragJob extends JOB_Controller
 
 		$this->StudierendenantragModel->db->where_in(
 			'public.get_rolle_prestudent(prestudent_id, studiensemester_kurzbz)',
-			$this->config->item('antrag_prestudentstatus_whitelist')
+			$this->config->item('antrag_prestudentstatus_whitelist_abmeldung')
 		);
 
 		$result = $this->StudierendenantragModel->getWithLastStatusWhere([

From a2f9fba8964781871bdf6f95d1d3aeb70c0e2270 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 21 Aug 2024 12:50:58 +0200
Subject: [PATCH 1161/1461] =?UTF-8?q?Bugfix:=20Favorites:=20Correct=20load?=
 =?UTF-8?q?ing=20procedure=20for=20Prestudent-Subverb=C3=A4nde?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/api/frontend/v1/stv/Verband.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/application/controllers/api/frontend/v1/stv/Verband.php b/application/controllers/api/frontend/v1/stv/Verband.php
index 8d508399b..e8c532652 100644
--- a/application/controllers/api/frontend/v1/stv/Verband.php
+++ b/application/controllers/api/frontend/v1/stv/Verband.php
@@ -70,12 +70,16 @@ class Verband extends FHCAPI_Controller
 		if ($count == 1) {
 			if (is_numeric($params[0]))
 				return $this->getSemester($method, $params[0]);
+			elseif ($params[0] == 'prestudent')
+				return $this->terminateWithSuccess($this->getStdSem($method . '/prestudent/', $method));
 			else
 				return $this->getStudiengang($method, $params[0]);
 		}
 		if ($count == 2) {
 			if (is_numeric($params[0]))
 				return $this->getVerband($method, $params[0], $params[1]);
+			elseif ($params[1] == 'prestudent')
+				return $this->terminateWithSuccess($this->getStdSem($method . '/' . $params[0] . '/prestudent/', $method));
 			else
 				return $this->getSemester($method, $params[1], $params[0]);
 		}

From 3963358d95aa1f08ff413b7c176c38e4d4a82568 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Tue, 13 Aug 2024 14:01:57 +0200
Subject: [PATCH 1162/1461] Added getTemplateLvTree method to
 Lehrveranstaltung_model.php

This method gets all Templates and unions with all Lehrveranstaltungen of given Studiensemester and Oes, that are assigned to
a template. This data structure can be used for nested tabulator data tree.
---
 .../education/Lehrveranstaltung_model.php     | 160 ++++++++++++++++++
 1 file changed, 160 insertions(+)

diff --git a/application/models/education/Lehrveranstaltung_model.php b/application/models/education/Lehrveranstaltung_model.php
index 904433439..50d7b9ad4 100644
--- a/application/models/education/Lehrveranstaltung_model.php
+++ b/application/models/education/Lehrveranstaltung_model.php
@@ -146,6 +146,166 @@ class Lehrveranstaltung_model extends DB_Model
 		return $qry;
 	}
 
+	/**
+	 * Get all Templates and union with all Lehrveranstaltungen of given Studiensemester and Oes, that are assigned to
+	 * a template. This data structure can be used for nested tabulator data tree.
+	 *
+	 * @param null|string $studiensemester_kurzbz
+	 * @param null|array $oes
+	 * @return array|stdClass|null
+	 */
+	public function getTemplateLvTree($studiensemester_kurzbz = null, $oes = null){
+		$params = [];
+		$qry = '
+		WITH 	
+			-- All Lvs that are assigned to a template in given Studiensemester for given Oes
+			-- joining via actual Studienplan
+			standardisierteLvs AS (
+				SELECT
+					lv.*,
+					stpl.studienplan_id::text as studienplan_id,
+					stpl.bezeichnung AS studienplan_bezeichnung,
+					stplsem.studiensemester_kurzbz
+				FROM
+					lehre.tbl_studienplan 							stpl
+					JOIN lehre.tbl_studienordnung 					sto USING (studienordnung_id)
+					JOIN lehre.tbl_studienplan_semester 			stplsem USING (studienplan_id)
+					JOIN lehre.tbl_studienplan_lehrveranstaltung 	stpllv ON (stpllv.studienplan_id = stpl.studienplan_id AND stpllv.semester = stplsem.semester)
+					JOIN lehre.tbl_lehrveranstaltung 				lv USING (lehrveranstaltung_id)
+					JOIN public.tbl_organisationseinheit 			oe USING (oe_kurzbz)
+					JOIN public.tbl_studiengang          			stg ON stg.studiengang_kz = sto.studiengang_kz
+					JOIN public.tbl_studiengangstyp 				stgtyp ON stgtyp.typ = stg.typ
+				WHERE 
+					-- filter type lv
+				  	lehrtyp_kurzbz = \'lv\'
+				  	-- filter lvs assigned to template (= standardisierte lv)
+					AND lehrveranstaltung_template_id IS NOT NULL';
+
+					if (is_string($studiensemester_kurzbz))
+					{
+						/* filter by studiensemester */
+						$params[]= $studiensemester_kurzbz;
+						$qry.= ' AND stplsem.studiensemester_kurzbz = ? ';
+
+					}
+
+					if (is_array($oes))
+					{
+						/* filter by organisationseinheit */
+						$params[]= $oes;
+						$qry.= ' AND lv.oe_kurzbz IN ? ';
+					}
+		$qry.= '
+			),
+			-- All templates
+			templateLvs AS (
+				SELECT 
+					lv.*,
+					NULL AS studienplan_id,
+					(
+						SELECT string_agg(stpl_bezeichnung, \', \')
+						FROM
+						(
+							SELECT stlv.studienplan_bezeichnung AS stpl_bezeichnung
+							FROM standardisierteLvs stlv
+							WHERE stlv.lehrveranstaltung_template_id = lv.lehrveranstaltung_id
+						) AS studienplaene
+					) AS studienplan_bezeichnung,
+					NULL AS studiensemester_kurzbz
+				FROM 
+					lehre.tbl_lehrveranstaltung lv
+				WHERE 
+					-- filter type template
+					lehrtyp_kurzbz = \'tpl\'
+					-- filter semester that were retrieved by standardisierte lvs semester for selected studiensemester
+					AND EXISTS (
+						SELECT 1
+						FROM standardisierteLvs std
+						WHERE std.lehrveranstaltung_template_id = lv.lehrveranstaltung_id
+					)';
+
+		if (is_array($oes))
+		{
+			/* filter by organisationseinheit */
+			$params[]= $oes;
+			$qry.= ' AND lv.oe_kurzbz IN ? ';
+		}
+		$qry.= '
+			)	
+		';
+
+		$qry.= '
+			SELECT 
+				lv.lehrveranstaltung_id,
+				lv.kurzbz,
+			    lv.lehrtyp_kurzbz,
+				lv.bezeichnung AS lv_bezeichnung, 
+				lv.bezeichnung_english,
+				lv.studiengang_kz,
+				lv.semester,
+				lv.oe_kurzbz,
+				lv.ects,
+				lv.lehrform_kurzbz,
+				lv.orgform_kurzbz,
+				lv.sprache, 
+				lv.aktiv,
+				lv.lehrveranstaltung_template_id,
+				lv.studienplan_id,
+			    lv.studienplan_bezeichnung,
+			    lv.studiensemester_kurzbz,
+			    upper(stg.typ || stg.kurzbz) AS "stg_typ_kurzbz",    
+				stg.bezeichnung AS "stg_bezeichnung",
+				stgtyp.bezeichnung AS "stg_typ_bezeichnung",
+				CASE
+   			 		WHEN oe.organisationseinheittyp_kurzbz = \'Kompetenzfeld\' THEN (\'KF \' || oe.bezeichnung)
+                    WHEN oe.organisationseinheittyp_kurzbz = \'Department\' THEN (\'DEP \' || oe.bezeichnung)
+                    ELSE (oe.organisationseinheittyp_kurzbz || \' \' || oe.bezeichnung)
+                END AS "lv_oe_bezeichnung",
+			   (
+				    -- comma seperated string of all lehreinheitgruppen
+					SELECT string_agg(bezeichnung, \', \') AS lehreinheitgruppe_bezeichnung
+					FROM(
+					    -- distinct bezeichnung, as may come multiple times from different lehreinheiten
+						SELECT DISTINCT ON (studiengang_kz, bezeichnung) studiengang_kz, bezeichnung FROM
+						(
+							-- distinct lehreinheitgruppe, as may come multiple times from different lehrform
+							SELECT DISTINCT ON (legr.lehreinheitgruppe_id) legr.studiengang_kz,
+								-- get Spezialgruppe or Lehrverbandgruppe 
+								COALESCE(
+									legr.gruppe_kurzbz,
+									CONCAT( UPPER(stg1.typ), UPPER(stg1.kurzbz), \'-\', legr.semester, legr.verband, legr.gruppe )
+								) as bezeichnung
+							FROM lehre.tbl_lehreinheitgruppe 	legr
+							JOIN lehre.tbl_lehreinheit 			le USING (lehreinheit_id)
+							JOIN lehre.tbl_lehrveranstaltung 	lv1 USING (lehrveranstaltung_id)
+							JOIN public.tbl_studiengang 		stg1 ON stg1.studiengang_kz = legr.studiengang_kz
+							WHERE lv1.lehrveranstaltung_id 		= lv.lehrveranstaltung_id
+							AND le.studiensemester_kurzbz 		= lv.studiensemester_kurzbz
+						) AS lehreinheitgruppen
+					    GROUP BY studiengang_kz, bezeichnung
+						ORDER BY studiengang_kz DESC
+					) AS uniqueLehreinheitgruppen_bezeichnung
+				) AS lehreinheitgruppen_bezeichnung
+			FROM (
+				SELECT 
+					* 
+				FROM 
+				     standardisierteLvs 
+				UNION
+				SELECT 
+				   * 
+				FROM templateLvs 
+			) AS lv
+				JOIN public.tbl_studiengang          	stg ON stg.studiengang_kz = lv.studiengang_kz
+				JOIN public.tbl_studiengangstyp 		stgtyp ON stgtyp.typ = stg.typ
+				JOIN public.tbl_organisationseinheit 	oe ON oe.oe_kurzbz = lv.oe_kurzbz
+		ORDER BY
+			oe.bezeichnung, lv.semester, lv.bezeichnung
+		';
+
+		return $this->execQuery($qry, $params);
+	}
+
 	/**
 	 * Gets unique Groupstrings for Lehrveranstaltungen, e.g. WS2018_BIF_1_PRJM_VZ_LV12345
 	 * @param string $studiensemester_kurzbz

From 4dc698a6be000ae03bef6d36dbf421b847834724 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Wed, 21 Aug 2024 13:17:54 +0200
Subject: [PATCH 1163/1461] Added navigation menu item 'Lehrveranstaltungen' >
 'LV Template Uebersicht'

---
 application/config/navigation.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

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

From bff5d4ffbe80bf72cee3a163235784dcd8f95c37 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Wed, 21 Aug 2024 13:22:15 +0200
Subject: [PATCH 1164/1461] Added api Controller Lehrveranstaltung.php + method
 getTemplateLvTree

---
 .../v1/education/Lehrveranstaltung.php        | 63 +++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 application/controllers/api/frontend/v1/education/Lehrveranstaltung.php

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

From d07f19d8936dbc4e99c25c0341ea225bf43ff4cf Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Wed, 21 Aug 2024 13:23:26 +0200
Subject: [PATCH 1165/1461] Added api Controller Studiensemester.php + methods
 getAll and getAktNext

---
 .../v1/organisation/Studiensemester.php       | 118 ++++++++++++++++++
 1 file changed, 118 insertions(+)
 create mode 100644 application/controllers/api/frontend/v1/organisation/Studiensemester.php

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

From 6168a6b806bef926ab69c93456d51ea37e9d764f Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Wed, 21 Aug 2024 13:26:20 +0200
Subject: [PATCH 1166/1461] Added Controller LvTemplateUebersicht.php

---
 .../lehre/lvplanung/LvTemplateUebersicht.php  | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 application/controllers/lehre/lvplanung/LvTemplateUebersicht.php

diff --git a/application/controllers/lehre/lvplanung/LvTemplateUebersicht.php b/application/controllers/lehre/lvplanung/LvTemplateUebersicht.php
new file mode 100644
index 000000000..eb01d90c8
--- /dev/null
+++ b/application/controllers/lehre/lvplanung/LvTemplateUebersicht.php
@@ -0,0 +1,45 @@
+<?php
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class LvTemplateUebersicht extends Auth_Controller
+{
+	public function __construct()
+	{
+		// Set required permissions
+		parent::__construct(
+			array(
+				'index' => 'basis/vilesci:rw',
+			)
+		);
+
+		// Load libraries
+		$this->load->library('AuthLib');
+
+
+		// Load language phrases
+		$this->loadPhrases(
+			array(
+				'global',
+				'lehre'
+			)
+		);
+
+		$this->_setAuthUID();
+	}
+
+	public function index()
+	{
+		$this->load->view('lehre/lvplanung/lvTemplateUebersicht.php');
+	}
+
+
+	/**
+	 * Retrieve the UID of the logged user and checks if it is valid
+	 */
+	private function _setAuthUID()
+	{
+		$this->_uid = getAuthUID();
+
+		if (!$this->_uid) show_error('User authentification failed');
+	}
+}
\ No newline at end of file

From eb308b78ef4691186f452172ac50a3c46ed6a95f Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Wed, 21 Aug 2024 13:28:56 +0200
Subject: [PATCH 1167/1461] Added App LvTemplates.js

---
 public/js/apps/lehre/lvplanung/LvTemplates.js | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 public/js/apps/lehre/lvplanung/LvTemplates.js

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

From fc8c748bc4b0ba3bcfa18bb2d293534d58a4a27a Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Wed, 21 Aug 2024 13:32:14 +0200
Subject: [PATCH 1168/1461] Added View LvTemplateUebersicht.php

---
 .../lehre/lvplanung/lvTemplateUebersicht.php  | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 application/views/lehre/lvplanung/lvTemplateUebersicht.php

diff --git a/application/views/lehre/lvplanung/lvTemplateUebersicht.php b/application/views/lehre/lvplanung/lvTemplateUebersicht.php
new file mode 100644
index 000000000..54afad0a5
--- /dev/null
+++ b/application/views/lehre/lvplanung/lvTemplateUebersicht.php
@@ -0,0 +1,26 @@
+<?php
+$includesArray = array(
+	'title' => 'LV Template Übersicht',
+	'vue3' => true,
+	'axios027' => true,
+	'bootstrap5' => true,
+	'tabulator5' => true,
+	'fontawesome6' => true,
+	'primevue3' => true,
+	'navigationcomponent' => true,
+	'filtercomponent' => true,
+	'customJSModules' => array('public/js/apps/lehre/lvplanung/LvTemplates.js'),
+	'customCSSs' => array('public/css/Fhc.css')
+);
+
+$this->load->view('templates/FHC-Header', $includesArray);
+?>
+
+<div id="main">
+    <!-- Navigation component -->
+    <core-navigation-cmpt></core-navigation-cmpt>
+
+    <lv-template-uebersicht></lv-template-uebersicht>
+</div>
+
+<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>

From e5e4bb2ea17fc0dda390595e285541efe03998dc Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Wed, 21 Aug 2024 13:32:37 +0200
Subject: [PATCH 1169/1461] Added Component LvTemplateUebersicht.js

---
 .../lehre/lvplanung/LvTemplateUebersicht.js   | 267 ++++++++++++++++++
 1 file changed, 267 insertions(+)
 create mode 100644 public/js/lehre/lvplanung/LvTemplateUebersicht.js

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

From 7fb7263424d5ed7a40c337f58b30f6c7ed16cf6a Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Wed, 21 Aug 2024 13:34:11 +0200
Subject: [PATCH 1170/1461] Added phrases for LV Templates Overview

---
 system/phrasesupdate.php | 60 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 2390b2261..8a9c72831 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -27322,6 +27322,66 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'verwalten',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Verwalten",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Administrate",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'lvTemplatesVerwalten',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "LV Templates verwalten",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Administrate Course Templates",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'lvTemplatesUebersicht',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "LV Templates Übersicht",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Course Templates Overview",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 );
 
 

From f2be396e7aa7518f384c74ec80d0678525bd6953 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Wed, 21 Aug 2024 13:53:49 +0200
Subject: [PATCH 1171/1461] Adapted to use new fhcApi.getUri method

---
 public/js/lehre/lvplanung/LvTemplateUebersicht.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/public/js/lehre/lvplanung/LvTemplateUebersicht.js b/public/js/lehre/lvplanung/LvTemplateUebersicht.js
index 6ffc02881..9724fd42a 100644
--- a/public/js/lehre/lvplanung/LvTemplateUebersicht.js
+++ b/public/js/lehre/lvplanung/LvTemplateUebersicht.js
@@ -118,8 +118,8 @@ export default {
 			await this.loadAndSetStudiensemester();
 
 			// Set table data
-			// TODO change with brandnew FHCAPI getUrl after merge master
-			this.table.setData(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+			this.table.setData(
+				this.$fhcApi.getUri() +
 				'/api/frontend/v1/education/Lehrveranstaltung/getTemplateLvTree' +
 				'?studiensemester_kurzbz=' + this.selectedStudiensemester
 			);
@@ -133,16 +133,16 @@ export default {
 		},
 		onChangeStudiensemester(){
 			// Reset table data
-			// TODO change with brandnew FHCAPI getUrl after merge master
-			// ...danach im SWB auch die core rest clients raus bzw. ggf änderung requests auf api/frontend/... wie hier und core rest client ggf raus.
-			this.table.setData(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+			this.table.setData(
+				this.$fhcApi.getUri() +
 				'/api/frontend/v1/education/Lehrveranstaltung/getTemplateLvTree' +
 				'?studiensemester_kurzbz=' + this.selectedStudiensemester
 			);
 		},
 		openAdminLvTemplate(event, row){
 			const url = FHC_JS_DATA_STORAGE_OBJECT.app_root +
-				'vilesci/lehre/lehrveranstaltung.php?stg_kz=&semester=-1&orgform=-1&lehrveranstaltung_id=' + row.getData().lehrveranstaltung_id;
+				'vilesci/lehre/lehrveranstaltung.php?stg_kz=&semester=-1&orgform=-1&lehrveranstaltung_id=' +
+				row.getData().lehrveranstaltung_id;
 
 			window.open(url, '_blank').focus();
 		},

From ec6efc5c2b76a09576ac3c206ab0d2d0f1933d17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Wed, 21 Aug 2024 16:54:22 +0200
Subject: [PATCH 1172/1461] Added studiengang_kz to Akadgrad DropDown

---
 vilesci/lehre/studienordnung.inc.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/vilesci/lehre/studienordnung.inc.php b/vilesci/lehre/studienordnung.inc.php
index fc84e7047..c354e0484 100644
--- a/vilesci/lehre/studienordnung.inc.php
+++ b/vilesci/lehre/studienordnung.inc.php
@@ -139,7 +139,7 @@ switch($method)
 				$selected=' selected';
 			else
 				$selected='';
-			echo '<option value="'.$row->akadgrad_id.'"'.$selected.'>'.$row->akadgrad_kurzbz.' - '.$row->titel.'</option>';
+			echo '<option value="'.$row->akadgrad_id.'"'.$selected.'>'.$row->studiengang_kz.' - '.$row->akadgrad_kurzbz.' - '.$row->titel.'</option>';
 		}
 		echo '
 					</select>
@@ -312,7 +312,7 @@ switch($method)
 		</table>
 		';
 		break;
-        
+
     case 'semesterSTPLZuordnung':
 		$studienplan_id = $_GET["studienplan_id"];
 
@@ -362,7 +362,7 @@ switch($method)
 		{
 			if (array_key_exists($row->studiensemester, $studiensemester_array))
 				$studiensemester_array[$row->studiensemester] = true;
-				
+
 			echo '<tr id="row_'.$row->studiensemester.'" style="font-size: 1em !important;"><td style="font-size: 1em; padding: 0.5em 0.5em 0.5em 0.5em;" align="center">'.$row->studiensemester.'</td>';
 			for($i = 1; $i<=$ausbildungssemester; $i++)
 			{
@@ -385,7 +385,7 @@ switch($method)
 				foreach($studiensemester_array AS $key => $value)
 				{
 					if ($value == true)
-					{							
+					{
 						echo '<option value='.$key.' disabled="disabled">'.$key.'</option>';
 						$lastStudiensemesterActive = false;
 					}

From d03678e3dc4d864a6743d0462d9051936b49b09d Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 27 Aug 2024 15:30:17 +0200
Subject: [PATCH 1173/1461] WIP

---
 .../Studierendenantrag/Leitung/Table.js       |  3 ---
 system/phrasesupdate.php                      | 20 +++++++++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/public/js/components/Studierendenantrag/Leitung/Table.js b/public/js/components/Studierendenantrag/Leitung/Table.js
index 0f8b22540..8201462b4 100644
--- a/public/js/components/Studierendenantrag/Leitung/Table.js
+++ b/public/js/components/Studierendenantrag/Leitung/Table.js
@@ -230,9 +230,6 @@ export default {
 
 					return val ? link : '&nbsp;';
 				}
-			}, {
-				field: 'unruly',
-				title: this.$p.t('studierendenantrag', 'antrag_unruly')
 			}, {
 				field: 'dms_id',
 				title: this.$p.t('studierendenantrag', 'antrag_dateianhaenge'),
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index d4a3777b1..dce318771 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -2281,6 +2281,26 @@ $phrases = array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'unruly',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Unerwünscht',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Unruly',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 
 	//****************	CORE/lehre
 	array(

From 8c5ca521acfa8cd823678521d40b19d77f79f0e0 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 2 Sep 2024 10:42:01 +0200
Subject: [PATCH 1174/1461] adopts the side menu for the desktop and mobile
 view

---
 public/css/Cis4/Cis.css | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index bbad5f056..23ae120ad 100755
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -192,6 +192,10 @@ html {
   padding: var(--fhc-cis-main-py) var(--fhc-cis-main-px);
 }
 
+#nav-main-sticky {
+	max-height: calc(100vh - var(--fhc-cis-header-height));
+}
+
 /* desktop */
 @media (min-width: 992px) {
   body {
@@ -235,6 +239,11 @@ html {
   #nav-main-sticky {
   	position: sticky;
   	top: var(--fhc-cis-header-height);
+	display: flex;
+	flex-direction: column;
+  }
+  #nav-main-sticky > :not(#nav-main-toggle) {
+	overflow: auto;
   }
   #nav-main-toggle {
     width: 0;
@@ -314,6 +323,9 @@ html {
     height: var(--fhc-cis-header-height);
     width: auto;
   }
+  #nav-main-sticky {
+  	overflow: auto;
+  }
   #nav-search {
     position: relative;
   }

From f19c1b4eafb8e975bde42cd7f278226c113c3bc8 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 2 Sep 2024 14:47:40 +0200
Subject: [PATCH 1175/1461] adds the lector and the gruppe as objects to the
 endpoint result instead of just strings

---
 .../components/Cis/Stundenplan.php            | 44 ++++++++++++++++++-
 .../models/ressource/Stundenplan_model.php    | 26 ++++++-----
 public/js/apps/Cis/Stundenplan.js             |  3 +-
 public/js/components/Calendar/Calendar.js     |  1 -
 4 files changed, 60 insertions(+), 14 deletions(-)

diff --git a/application/controllers/components/Cis/Stundenplan.php b/application/controllers/components/Cis/Stundenplan.php
index 31ed34dbd..8755212af 100755
--- a/application/controllers/components/Cis/Stundenplan.php
+++ b/application/controllers/components/Cis/Stundenplan.php
@@ -35,8 +35,48 @@ class Stundenplan extends Auth_Controller
 		if (isError($result))
 			return $this->outputJsonError(getError($result));
  */
-		$res = $this->StundenplanModel->stundenPlanGruppierung($this->StundenplanModel->getStudenPlanQuery(get_uid())); 
-		$res = getData($res);	
+
+
+		$res = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getStudenPlanQuery(get_uid())); 
+		
+		$res = getData($res);
+
+		// get the benutzer object for the lektor of the lv	
+		$this->load->model('ressource/Mitarbeiter_model','MitarbeiterModel');
+		$this->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
+		foreach($res as $item){
+			$lektor_obj_array = array();
+			$gruppe_obj_array = array();
+			foreach($item->lektor as $lv_lektor){
+				$lektor_obj = $this->MitarbeiterModel->loadWhere(["kurzbz"=>$lv_lektor]);
+				if (isError($lektor_obj)) {
+					$this->outputJsonError(getError($lektor_obj));
+				}
+				$lektor_obj = getData($lektor_obj);
+				$lektor_obj_array[] = $lektor_obj;
+			}
+			foreach ($item->gruppe as $lv_gruppe) {
+				$lv_gruppe = str_replace("(","",$lv_gruppe);
+				$lv_gruppe = str_replace(")", "", $lv_gruppe);
+				$lv_gruppe_array = explode(",",$lv_gruppe);
+				$gruppe = str_replace("\"","",$lv_gruppe_array[0]);
+				$verband = $lv_gruppe_array[1];
+				$semester = $lv_gruppe_array[2];
+				$studiengang_kz = $lv_gruppe_array[3];
+				$lehrverband_obj = $this->LehrverbandModel->loadWhere(["gruppe" => $gruppe, "verband" => $verband, "semester" => $semester, "studiengang_kz" => $studiengang_kz]);
+				if (isError($lehrverband_obj)) {
+					$this->outputJsonError(getError($lehrverband_obj));
+				}
+				$lehrverband_obj = getData($lehrverband_obj);
+				$gruppe_obj_array[] = $lehrverband_obj;
+			}
+			//replace the array of lektor strings with the objects of lektor information
+			$item->lektor = $lektor_obj_array;
+			//replace the array of gruppen string with the lehrverband object information
+			$item->gruppe = $gruppe_obj_array;
+			
+		}
+		
 		$this->outputJsonSuccess($res);
 	}
 
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 5936106f2..11299fe3c 100755
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -142,8 +142,11 @@ class Stundenplan_model extends DB_Model
 	 */
 	public function stundenplanGruppierung($stundenplanViewQuery)
 	{
-		
 
+		/* CASE
+				WHEN gruppe_kurzbz IS NOT NULL THEN gruppe_kurzbz 
+				ELSE CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) 
+			END as gruppe, */
 		$gruppierteEvents = $this->execReadOnlyQuery("
 		SELECT 
 			
@@ -151,23 +154,26 @@ class Stundenplan_model extends DB_Model
 		unr,datum, stunde,
 		CONCAT(lehrfach,'-',lehrform) as topic,
 		'' as beschreibung,
-		string_agg(DISTINCT gruppe, '/') as gruppe,
-		string_agg(DISTINCT lektor, '/') as lektor,  
-		ort_kurzbz, studiengang_kz, titel,'' as beschreibung,lehreinheit_id,lehrfach_id,anmerkung,fix,lehrveranstaltung_id,stg_kurzbzlang,stg_bezeichnung,stg_typ,fachbereich_kurzbz,lehrfach,lehrfach_bez,farbe,lehrform,anmerkung_lehreinheit 
+		array_agg(DISTINCT (gruppe,verband,semester,studiengang_kz)) as gruppe,
+		array_agg(DISTINCT gruppe_bezeichnung) as gruppe_bezeichnung,
+		array_agg(DISTINCT lektor) as lektor,  
+		
+		ort_kurzbz, studiengang_kz, titel, lehrform, lehrfach, semester, verband
 
 		FROM
 		(
 			SELECT
  			unr,datum, stunde,
-			CASE
-				WHEN gruppe_kurzbz IS NOT NULL THEN gruppe_kurzbz 
-				ELSE CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) 
-			END as gruppe,
+			
 			CASE
 				WHEN sp.mitarbeiter_kurzbz IS NOT NULL THEN sp.mitarbeiter_kurzbz
 				ELSE lektor
 			END as lektor,
-			ort_kurzbz, studiengang_kz, titel,'' as beschreibung,lehreinheit_id,lehrfach_id,anmerkung,fix,lehrveranstaltung_id,stg_kurzbzlang,stg_bezeichnung,stg_typ,fachbereich_kurzbz,lehrfach,lehrfach_bez,farbe,lehrform,anmerkung_lehreinheit 
+			CASE
+				WHEN gruppe_kurzbz IS NOT NULL THEN gruppe_kurzbz 
+				ELSE CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) 
+			END as gruppe_bezeichnung,
+			ort_kurzbz, studiengang_kz, titel,'' as beschreibung,lehreinheit_id,lehrfach_id,anmerkung,fix,lehrveranstaltung_id,stg_kurzbzlang,stg_bezeichnung,stg_typ,fachbereich_kurzbz,lehrfach,lehrfach_bez,farbe,lehrform,anmerkung_lehreinheit,gruppe, verband, semester
 
 			FROM (".$stundenplanViewQuery.") sp
 
@@ -175,7 +181,7 @@ class Stundenplan_model extends DB_Model
 
 		GROUP BY 
 
-			ort_kurzbz,unr, datum, stunde, lehreinheit_id, lehrfach_id,studiengang_kz,titel,anmerkung,fix,lehrveranstaltung_id,stg_kurzbzlang,stg_bezeichnung,stg_typ,fachbereich_kurzbz,lehrfach,lehrfach_bez,farbe,lehrform,anmerkung_lehreinheit
+			unr, datum, stunde, lehrfach, lehrform, ort_kurzbz, titel, studiengang_kz, lehrform, lehrfach, semester, verband
 
 		ORDER BY datum, stunde
 		");
diff --git a/public/js/apps/Cis/Stundenplan.js b/public/js/apps/Cis/Stundenplan.js
index 47d945c29..70d3f6361 100755
--- a/public/js/apps/Cis/Stundenplan.js
+++ b/public/js/apps/Cis/Stundenplan.js
@@ -54,9 +54,10 @@ const app = Vue.createApp({
 	<hr>
 	<fhc-calendar v-slot="{event, day}" :events="events" initial-mode="week" show-weeks>
 		<div class="d-flex flex-column align-items-center justify-content-evenly h-100">
+			<!--<span>{{JSON.stringify(event.orig,null,2)}}</span>-->
 			<span>{{event.orig.title}}</span>
 			<span>{{event.orig.ort_kurzbz}}</span>
-			<span>{{event.orig.mitarbeiter_kurzbz}}</span>
+			<span>{{event.orig.lektor}}</span>
 		</div>
 	</fhc-calendar>
 	`
diff --git a/public/js/components/Calendar/Calendar.js b/public/js/components/Calendar/Calendar.js
index 4fb4c821e..00f450d15 100755
--- a/public/js/components/Calendar/Calendar.js
+++ b/public/js/components/Calendar/Calendar.js
@@ -113,7 +113,6 @@ export default {
 				this.$refs.calendarModal.show();
 			})
 			
-			console.log(day,"this is the day")
 			this.$emit(day[0], day[1]);
 		}
 	},

From 87f82b7f5dd97063df4fd874d3039cf607bb80a9 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 3 Sep 2024 12:07:13 +0200
Subject: [PATCH 1176/1461] also adds the stundenplan information as object in
 the response of the endpoint

---
 .../components/Cis/Stundenplan.php            | 24 +++++++++++--------
 .../models/ressource/Stundenplan_model.php    | 19 +++++----------
 public/js/apps/Cis/Stundenplan.js             |  3 +--
 .../js/components/Calendar/CalendarModal.js   |  5 ++--
 4 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/application/controllers/components/Cis/Stundenplan.php b/application/controllers/components/Cis/Stundenplan.php
index 8755212af..b33a0ddee 100755
--- a/application/controllers/components/Cis/Stundenplan.php
+++ b/application/controllers/components/Cis/Stundenplan.php
@@ -47,32 +47,36 @@ class Stundenplan extends Auth_Controller
 		foreach($res as $item){
 			$lektor_obj_array = array();
 			$gruppe_obj_array = array();
+			// load lektor object
 			foreach($item->lektor as $lv_lektor){
+				$this->MitarbeiterModel->addLimit(1);
 				$lektor_obj = $this->MitarbeiterModel->loadWhere(["kurzbz"=>$lv_lektor]);
 				if (isError($lektor_obj)) {
 					$this->outputJsonError(getError($lektor_obj));
 				}
-				$lektor_obj = getData($lektor_obj);
+				$lektor_obj = current(getData($lektor_obj));
 				$lektor_obj_array[] = $lektor_obj;
 			}
+			// load gruppe object
 			foreach ($item->gruppe as $lv_gruppe) {
-				$lv_gruppe = str_replace("(","",$lv_gruppe);
-				$lv_gruppe = str_replace(")", "", $lv_gruppe);
+				$lv_gruppe = strtr($lv_gruppe,['('=>'',')'=>'','"'=>'']); 
 				$lv_gruppe_array = explode(",",$lv_gruppe);
-				$gruppe = str_replace("\"","",$lv_gruppe_array[0]);
-				$verband = $lv_gruppe_array[1];
-				$semester = $lv_gruppe_array[2];
-				$studiengang_kz = $lv_gruppe_array[3];
+				list($gruppe,$verband, $semester,$studiengang_kz) = $lv_gruppe_array;
+				$this->LehrverbandModel->addLimit(1);
 				$lehrverband_obj = $this->LehrverbandModel->loadWhere(["gruppe" => $gruppe, "verband" => $verband, "semester" => $semester, "studiengang_kz" => $studiengang_kz]);
 				if (isError($lehrverband_obj)) {
 					$this->outputJsonError(getError($lehrverband_obj));
 				}
-				$lehrverband_obj = getData($lehrverband_obj);
+				$lehrverband_obj = current(getData($lehrverband_obj));
 				$gruppe_obj_array[] = $lehrverband_obj;
 			}
-			//replace the array of lektor strings with the objects of lektor information
+			// studiengangs object
+			$this->load->model('organisation/Studiengang_model','StudiengangModel');
+			$this->StudiengangModel->addLimit(1);
+			$studiengang_object = $this->StudiengangModel->load($item->studiengang_kz);
+			$studiengang_object = current(getData($studiengang_object));
+			$item->studiengang = $studiengang_object;
 			$item->lektor = $lektor_obj_array;
-			//replace the array of gruppen string with the lehrverband object information
 			$item->gruppe = $gruppe_obj_array;
 			
 		}
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 11299fe3c..9f699c6cb 100755
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -142,23 +142,16 @@ class Stundenplan_model extends DB_Model
 	 */
 	public function stundenplanGruppierung($stundenplanViewQuery)
 	{
-
-		/* CASE
-				WHEN gruppe_kurzbz IS NOT NULL THEN gruppe_kurzbz 
-				ELSE CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) 
-			END as gruppe, */
 		$gruppierteEvents = $this->execReadOnlyQuery("
 		SELECT 
 			
-		'stundenplan' as type,
 		unr,datum, stunde,
 		CONCAT(lehrfach,'-',lehrform) as topic,
-		'' as beschreibung,
+		array_agg(DISTINCT gruppen_kurzbz) as gruppen_kurzbz,
 		array_agg(DISTINCT (gruppe,verband,semester,studiengang_kz)) as gruppe,
-		array_agg(DISTINCT gruppe_bezeichnung) as gruppe_bezeichnung,
-		array_agg(DISTINCT lektor) as lektor,  
+		array_agg(DISTINCT lektor) as lektor,
 		
-		ort_kurzbz, studiengang_kz, titel, lehrform, lehrfach, semester, verband
+		ort_kurzbz, studiengang_kz, titel, lehrfach, lehrform, lehrfach_bez
 
 		FROM
 		(
@@ -172,8 +165,8 @@ class Stundenplan_model extends DB_Model
 			CASE
 				WHEN gruppe_kurzbz IS NOT NULL THEN gruppe_kurzbz 
 				ELSE CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) 
-			END as gruppe_bezeichnung,
-			ort_kurzbz, studiengang_kz, titel,'' as beschreibung,lehreinheit_id,lehrfach_id,anmerkung,fix,lehrveranstaltung_id,stg_kurzbzlang,stg_bezeichnung,stg_typ,fachbereich_kurzbz,lehrfach,lehrfach_bez,farbe,lehrform,anmerkung_lehreinheit,gruppe, verband, semester
+			END as gruppen_kurzbz,
+			ort_kurzbz, studiengang_kz, titel,lehreinheit_id,lehrfach_id,anmerkung,fix,lehrveranstaltung_id,stg_kurzbzlang,stg_bezeichnung,stg_typ,fachbereich_kurzbz,lehrfach,lehrfach_bez,farbe,lehrform,anmerkung_lehreinheit,gruppe, verband, semester,stg_kurzbz
 
 			FROM (".$stundenplanViewQuery.") sp
 
@@ -181,7 +174,7 @@ class Stundenplan_model extends DB_Model
 
 		GROUP BY 
 
-			unr, datum, stunde, lehrfach, lehrform, ort_kurzbz, titel, studiengang_kz, lehrform, lehrfach, semester, verband
+			unr, datum, stunde, ort_kurzbz, titel, studiengang_kz, lehrform, lehrfach, lehrfach_bez
 
 		ORDER BY datum, stunde
 		");
diff --git a/public/js/apps/Cis/Stundenplan.js b/public/js/apps/Cis/Stundenplan.js
index 70d3f6361..773495c27 100755
--- a/public/js/apps/Cis/Stundenplan.js
+++ b/public/js/apps/Cis/Stundenplan.js
@@ -54,10 +54,9 @@ const app = Vue.createApp({
 	<hr>
 	<fhc-calendar v-slot="{event, day}" :events="events" initial-mode="week" show-weeks>
 		<div class="d-flex flex-column align-items-center justify-content-evenly h-100">
-			<!--<span>{{JSON.stringify(event.orig,null,2)}}</span>-->
 			<span>{{event.orig.title}}</span>
+			<span v-for="lektor in event.orig.lektor">{{lektor.kurzbz}}</span>
 			<span>{{event.orig.ort_kurzbz}}</span>
-			<span>{{event.orig.lektor}}</span>
 		</div>
 	</fhc-calendar>
 	`
diff --git a/public/js/components/Calendar/CalendarModal.js b/public/js/components/Calendar/CalendarModal.js
index 7ca6e7930..40fb3a7b3 100644
--- a/public/js/components/Calendar/CalendarModal.js
+++ b/public/js/components/Calendar/CalendarModal.js
@@ -55,7 +55,8 @@ export default {
   template: /*html*/ `
   <bs-modal ref="modalContainer" v-bind="$props" body-class="" dialog-class="modal-lg" class="bootstrap-alert" backdrop="false" >
     <template v-slot:title>
-      {{data.title + ' - ' + data.lehrfach_bez + ' [' + data.ort_kurzbz+']' }}  
+    	<template v-if="data.titel">{{ data.titel + ' - ' + data.lehrfach_bez + ' [' + data.ort_kurzbz+']'}}</template>
+		<template v-else>{{ data.lehrfach_bez + ' [' + data.ort_kurzbz+']'}}</template>
     </template>
     <template v-slot:default>
         <div class="row">
@@ -72,7 +73,7 @@ export default {
         </div>
         <div class="row">
         <div class="offset-3 col-4"><span>Lektor:</span></div>
-        <div class=" col"><span>{{data.lektor}}</span></div>
+        <div class=" col"><span>{{data.lektor.map(lektor=>lektor.kurzbz).join("/")}}</span></div>
         </div>
         <div class="row">
         <div class="offset-3 col-4"><span>Zeitraum:</span></div>

From 6076d59c4b35d683e75d61080e5b0ff6f4c7fb44 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Wed, 4 Sep 2024 10:59:25 +0200
Subject: [PATCH 1177/1461] Removed Group by Organisationseinheit

Instead added Organisationseinheit as column for filtering reasons.
Column is invisible by default.
---
 .../lehre/lvplanung/LvTemplateUebersicht.js   | 22 +++----------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/public/js/lehre/lvplanung/LvTemplateUebersicht.js b/public/js/lehre/lvplanung/LvTemplateUebersicht.js
index 9724fd42a..13efeb0e3 100644
--- a/public/js/lehre/lvplanung/LvTemplateUebersicht.js
+++ b/public/js/lehre/lvplanung/LvTemplateUebersicht.js
@@ -16,14 +16,7 @@ export default {
 			table: null,
 			studiensemester: [],
 			selectedStudiensemester: '',
-			cbDataTreeStartExpanded: false,	// checkbox expand dataTree or not
-			cbGroupStartOpen: true,	// checkbox group organisationseinheit start open
-		}
-	},
-	watch: {
-		cbGroupStartOpen(newVal){
-			this.table.setGroupStartOpen(newVal);
-			this.table.setData();
+			cbDataTreeStartExpanded: false	// checkbox expand dataTree or not
 		}
 	},
 	computed: {
@@ -43,9 +36,6 @@ export default {
 				dataTree: true,
 				dataTreeStartExpanded: self.cbDataTreeStartExpanded,
 				dataTreeChildIndent: 15, //indent child rows by 15 px
-				groupBy: ["lv_oe_bezeichnung"],
-				groupToggleElement:"header", //toggle group on click anywhere in the group header
-				groupStartOpen: self.cbGroupStartOpen,
 				persistence:{
 					filter: false, //persist filter sorting
 				},
@@ -53,8 +43,9 @@ export default {
 					{title: 'LV-ID', field: 'lehrveranstaltung_id', headerFilter: true, visible: false},
 					{title: 'LV Kurzbz', field: 'kurzbz', headerFilter: true, visible:false, width: 70},
 					{title: 'STG Kurzbz', field: 'stg_typ_kurzbz', headerFilter: true, visible:true, width: 80},
+					{title: 'OrgEinheit', field: 'lv_oe_bezeichnung', headerFilter: true, visible: false, width: 250},
 					{title: 'Lehrtyp Kurzbz', field: 'lehrtyp_kurzbz', headerFilter: true, visible:false, width: 70},
-					{title: 'Studiengangtyp', field: 'stg_typ_bezeichnung', headerFilter: true, width: 250},
+					{title: 'Studiengangtyp', field: 'stg_typ_bezeichnung', headerFilter: true, width: 150},
 					{title: 'OrgForm', field: 'orgform_kurzbz', headerFilter: true, width: 70},
 					{title: 'Semester', field: 'semester', headerFilter: true, width: 50},
 					{title: 'Lehrveranstaltung', field: 'lv_bezeichnung', headerFilter: true, minWidth: 250},
@@ -241,13 +232,6 @@ export default {
 				:tabulator-events="[{event: 'tableBuilt', handler: onTableBuilt}]">
 				<template v-slot:actions>
 					<a type="button" class="btn btn-primary" :href="urlToAdminAllTemplates" target="_blank"><i class="fa fa-external-link me-2"></i>{{ $p.t('lehre/lvTemplatesVerwalten') }}</a>
-					<div class="form-check form-check-inline ms-3">
-						<input
-							class="form-check-input"
-							type="checkbox"
-							v-model="cbGroupStartOpen">
-						<label class="form-check-label">KF {{ $p.t('global/aufgeklappt') }}</label>
-					</div>
 					<div class="form-check form-check-inline">
 						<input
 							class="form-check-input"

From f74ccb0513dfa9bb8c79909b6ae0b496d764b147 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Wed, 4 Sep 2024 10:59:46 +0200
Subject: [PATCH 1178/1461] Removed column Lehreinheitgruppen

---
 public/js/lehre/lvplanung/LvTemplateUebersicht.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/public/js/lehre/lvplanung/LvTemplateUebersicht.js b/public/js/lehre/lvplanung/LvTemplateUebersicht.js
index 13efeb0e3..414434904 100644
--- a/public/js/lehre/lvplanung/LvTemplateUebersicht.js
+++ b/public/js/lehre/lvplanung/LvTemplateUebersicht.js
@@ -64,7 +64,6 @@ export default {
 						}
 					},
 					{title: 'Studienplan', field: 'studienplan_bezeichnung', headerFilter: true, visible:true, width: 220},
-					{title: 'LE-Gruppen', field: 'lehreinheitgruppen_bezeichnung', headerFilter: true, width: 200},
 					{title: 'OE Kurzbz', field: 'lv_oe_kurzbz', headerFilter: true, visible:false, minWidth: 80},
 					{
 						title: this.$p.t('global/aktionen'),

From e33162d20e6268de90a0503650005b1b490d73a1 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 4 Sep 2024 14:59:56 +0200
Subject: [PATCH 1179/1461] changes the structure of the JSON data from the
 stundenplan

---
 .../api/frontend/v1/Stundenplan.php           | 28 +++++--
 .../components/Cis/Stundenplan.php            | 47 +-----------
 .../models/ressource/Reservierung_model.php   | 50 ++++++++++---
 .../models/ressource/Stundenplan_model.php    | 75 ++++++++++++++++---
 include/lehrstunde.class.php                  |  2 +-
 include/wochenplan.class.php                  |  2 +-
 public/js/api/fhcapifactory.js                |  2 +-
 .../js/api/{studenplan.js => stundenplan.js}  |  2 +-
 .../js/components/Cis/Mylv/RoomInformation.js | 60 +++++++++++----
 9 files changed, 176 insertions(+), 92 deletions(-)
 rename public/js/api/{studenplan.js => stundenplan.js} (89%)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 923c7f6bb..019a8ab4a 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -28,9 +28,10 @@ class Stundenplan extends FHCAPI_Controller
 	{
 	
 		parent::__construct([
-			'roomInformation' => self::PERM_LOGGED,
+			'getRoomplan' => self::PERM_LOGGED,
             'Stunden' => self::PERM_LOGGED,
-            'Reservierungen' => self::PERM_LOGGED
+            'Reservierungen' => self::PERM_LOGGED,
+			'getStundenplan' => self::PERM_LOGGED,
 		]);
 
         $this->load->library('LogLib');
@@ -69,7 +70,7 @@ class Stundenplan extends FHCAPI_Controller
      * @access public
      * 
      */
-	public function roomInformation()
+	public function getRoomplan()
 	{
        
         $this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
@@ -88,7 +89,7 @@ class Stundenplan extends FHCAPI_Controller
         $start_date = $this->input->get('start_date', TRUE);
         $end_date = $this->input->get('end_date', TRUE);
 
-		$result = $this->StundenplanModel->stundenPlanGruppierung($this->StundenplanModel->getRoomQuery($ort_kurzbz, $start_date, $end_date));  
+		$result = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getRoomQuery($ort_kurzbz, $start_date, $end_date));  
 		
         $result = $this->getDataOrTerminateWithError($result);
 
@@ -96,6 +97,22 @@ class Stundenplan extends FHCAPI_Controller
 		
 	}
 
+	public function getStundenplan(){
+		
+		$this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+
+		/* $result = $this->StundenplanModel->loadForUid(get_uid());
+
+		if (isError($result))
+			return $this->outputJsonError(getError($result));
+ 		*/
+		$res = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getStundenplanQuery(get_uid())); 
+		
+		$res = getData($res);
+		
+		$this->outputJsonSuccess($res);
+	}
+
 	// reservierungen is not used in the prototype for the students
     public function Reservierungen()
 	{
@@ -125,7 +142,7 @@ class Stundenplan extends FHCAPI_Controller
 		$result = $this->ReservierungModel->getRoomReservierungen($ort_kurzbz, $start_date, $end_date);
 
         $result = $this->getDataOrTerminateWithError($result);
-        
+        $this->terminateWithSuccess($result);
         // loop over the days
         $day_events = $this->filterEventsIntoAssociativeDateArray($result, $start_date, $end_date);
         $final_reservierungen = array();
@@ -173,7 +190,6 @@ class Stundenplan extends FHCAPI_Controller
                         $grouped_uids[]= $entry->uid;
                     }
 
-                    // grouping the 
                     
                 }
 
diff --git a/application/controllers/components/Cis/Stundenplan.php b/application/controllers/components/Cis/Stundenplan.php
index b33a0ddee..a88d061cb 100755
--- a/application/controllers/components/Cis/Stundenplan.php
+++ b/application/controllers/components/Cis/Stundenplan.php
@@ -17,7 +17,6 @@ class Stundenplan extends Auth_Controller
 			'index' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
 			'Reservierungen' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
 			'Stunden' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
-			'RoomInformation'=> ['student/anrechnung_beantragen:r','user:r'],
 		]);
 	}
 
@@ -34,52 +33,10 @@ class Stundenplan extends Auth_Controller
 
 		if (isError($result))
 			return $this->outputJsonError(getError($result));
- */
-
-
-		$res = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getStudenPlanQuery(get_uid())); 
+ 		*/
+		$res = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getStundenplanQuery(get_uid())); 
 		
 		$res = getData($res);
-
-		// get the benutzer object for the lektor of the lv	
-		$this->load->model('ressource/Mitarbeiter_model','MitarbeiterModel');
-		$this->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
-		foreach($res as $item){
-			$lektor_obj_array = array();
-			$gruppe_obj_array = array();
-			// load lektor object
-			foreach($item->lektor as $lv_lektor){
-				$this->MitarbeiterModel->addLimit(1);
-				$lektor_obj = $this->MitarbeiterModel->loadWhere(["kurzbz"=>$lv_lektor]);
-				if (isError($lektor_obj)) {
-					$this->outputJsonError(getError($lektor_obj));
-				}
-				$lektor_obj = current(getData($lektor_obj));
-				$lektor_obj_array[] = $lektor_obj;
-			}
-			// load gruppe object
-			foreach ($item->gruppe as $lv_gruppe) {
-				$lv_gruppe = strtr($lv_gruppe,['('=>'',')'=>'','"'=>'']); 
-				$lv_gruppe_array = explode(",",$lv_gruppe);
-				list($gruppe,$verband, $semester,$studiengang_kz) = $lv_gruppe_array;
-				$this->LehrverbandModel->addLimit(1);
-				$lehrverband_obj = $this->LehrverbandModel->loadWhere(["gruppe" => $gruppe, "verband" => $verband, "semester" => $semester, "studiengang_kz" => $studiengang_kz]);
-				if (isError($lehrverband_obj)) {
-					$this->outputJsonError(getError($lehrverband_obj));
-				}
-				$lehrverband_obj = current(getData($lehrverband_obj));
-				$gruppe_obj_array[] = $lehrverband_obj;
-			}
-			// studiengangs object
-			$this->load->model('organisation/Studiengang_model','StudiengangModel');
-			$this->StudiengangModel->addLimit(1);
-			$studiengang_object = $this->StudiengangModel->load($item->studiengang_kz);
-			$studiengang_object = current(getData($studiengang_object));
-			$item->studiengang = $studiengang_object;
-			$item->lektor = $lektor_obj_array;
-			$item->gruppe = $gruppe_obj_array;
-			
-		}
 		
 		$this->outputJsonSuccess($res);
 	}
diff --git a/application/models/ressource/Reservierung_model.php b/application/models/ressource/Reservierung_model.php
index e149cf0d7..c06fce206 100755
--- a/application/models/ressource/Reservierung_model.php
+++ b/application/models/ressource/Reservierung_model.php
@@ -22,20 +22,46 @@ class Reservierung_model extends DB_Model
 	{
 
 		$raum_reservierungen= $this->execReadOnlyQuery("
-		SELECT res.*, mit.kurzbz as person_kurzbz , 
-		CASE
-			WHEN res.verband IS NOT NULL OR res.semester IS NOT NULL THEN
-				CONCAT(UPPER(studg.typ),UPPER(studg.kurzbz),'-',res.verband,res.semester) 
-			ELSE
-				CONCAT(UPPER(studg.typ),UPPER(studg.kurzbz)) 
-		END AS stg
-		FROM lehre.vw_reservierung res
-		JOIN public.tbl_mitarbeiter mit ON mit.mitarbeiter_uid=res.uid
-		JOIN public.tbl_studiengang studg ON studg.studiengang_kz=res.studiengang_kz
-		WHERE res.ort_kurzbz = ? AND datum >= ? AND datum <= ? 
+		SELECT ort_kurzbz, studiengang_kz, array_agg(uid) as lektor, stunde, datum, titel, beschreibung, gruppe, gruppe_kurzbz, stg_kurzbz, stg 
+		FROM 
+		(
+			SELECT res.* , 
+			CASE
+				WHEN res.verband IS NOT NULL OR res.semester IS NOT NULL THEN
+					CONCAT(UPPER(studg.typ),UPPER(studg.kurzbz),'-',res.verband,res.semester) 
+				ELSE
+					CONCAT(UPPER(studg.typ),UPPER(studg.kurzbz)) 
+			END AS stg
+			FROM lehre.vw_reservierung res
+			JOIN public.tbl_studiengang studg ON studg.studiengang_kz=res.studiengang_kz
+			WHERE res.ort_kurzbz = ? AND datum >= ? AND datum <= ?
+		) AS reservierungen
+		GROUP BY ort_kurzbz, studiengang_kz, stunde, datum, titel, beschreibung, gruppe, stg, gruppe_kurzbz, stg_kurzbz
 		", [$ort_kurzbz, $start_date, $end_date]);
 
-		return $raum_reservierungen;
+		if(isError($raum_reservierungen)){
+			show_error(getError($raum_reservierungen));
+		}
+
+		$raum_reservierungen = getData($raum_reservierungen) ?? [];
+		
+		$this->load->model("ressrouce/Mitarbeiter_model","MitarbeiterModel");
+		foreach($raum_reservierungen as $reservierung){
+			$lektoren_array = array();
+			foreach($reservierung->lektor as $lektor){
+				$this->MitarbeiterModel->addLimit(1);
+				$lektor_obj= $this->MitarbeiterModel->load($lektor);
+				if(isError($lektor_obj)){
+					show_error(getError($lektor_obj));
+				}
+				$lektor_obj = current(getData($lektor_obj));
+				$lektoren_array[] = $lektor_obj;
+			}
+
+			$reservierung->lektor = $lektoren_array;
+			
+		}
+		return success($raum_reservierungen);
 	}
 
 	/**
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 9f699c6cb..6b1ed4ef0 100755
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -145,18 +145,17 @@ class Stundenplan_model extends DB_Model
 		$gruppierteEvents = $this->execReadOnlyQuery("
 		SELECT 
 			
-		unr,datum, stunde,
+		unr,datum, sp.stunde,
 		CONCAT(lehrfach,'-',lehrform) as topic,
-		array_agg(DISTINCT gruppen_kurzbz) as gruppen_kurzbz,
-		array_agg(DISTINCT (gruppe,verband,semester,studiengang_kz)) as gruppe,
+		array_agg(DISTINCT (gruppe,verband,semester,studiengang_kz,gruppen_kuerzel)) as gruppe,
 		array_agg(DISTINCT lektor) as lektor,
 		
-		ort_kurzbz, studiengang_kz, titel, lehrfach, lehrform, lehrfach_bez
+		ort_kurzbz, titel, lehrfach, lehrform, lehrfach_bez, beginn, ende
 
 		FROM
 		(
 			SELECT
- 			unr,datum, stunde,
+ 			unr,datum, sp.stunde,beginn, ende,
 			
 			CASE
 				WHEN sp.mitarbeiter_kurzbz IS NOT NULL THEN sp.mitarbeiter_kurzbz
@@ -165,30 +164,84 @@ class Stundenplan_model extends DB_Model
 			CASE
 				WHEN gruppe_kurzbz IS NOT NULL THEN gruppe_kurzbz 
 				ELSE CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) 
-			END as gruppen_kurzbz,
+			END as gruppen_kuerzel,
 			ort_kurzbz, studiengang_kz, titel,lehreinheit_id,lehrfach_id,anmerkung,fix,lehrveranstaltung_id,stg_kurzbzlang,stg_bezeichnung,stg_typ,fachbereich_kurzbz,lehrfach,lehrfach_bez,farbe,lehrform,anmerkung_lehreinheit,gruppe, verband, semester,stg_kurzbz
 
 			FROM (".$stundenplanViewQuery.") sp
+			JOIN lehre.tbl_stunde ON lehre.tbl_stunde.stunde = sp.stunde
 
 		) as sp
 
 		GROUP BY 
 
-			unr, datum, stunde, ort_kurzbz, titel, studiengang_kz, lehrform, lehrfach, lehrfach_bez
+			unr, datum, sp.stunde, ort_kurzbz, titel, lehrform, lehrfach, lehrfach_bez, beginn, ende
 
-		ORDER BY datum, stunde
+		ORDER BY datum, sp.stunde
 		");
 
-		return $gruppierteEvents;
+		if(isError($gruppierteEvents)){
+			$this->output(getError($gruppierteEvents));
+		}
+		
+		$gruppierteEvents = getData($gruppierteEvents) ?? [];
+
+		// get the benutzer object for the lektor of the lv	
+		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
+		$this->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+		$this->load->model('person/Benutzer_model', 'BenutzerModel');
+		
+		foreach ($gruppierteEvents as $item) {
+			$lektor_obj_array = array();
+			$gruppe_obj_array = array();
+			
+			// load lektor object
+			foreach ($item->lektor as $lv_lektor) {
+				$this->MitarbeiterModel->addLimit(1);
+				$lektor_object = $this->execReadOnlyQuery("
+				SELECT mitarbeiter_uid, vorname, nachname, kurzbz 
+				FROM public.tbl_mitarbeiter 
+				JOIN public.tbl_benutzer benutzer ON benutzer.uid = mitarbeiter_uid
+				JOIN public.tbl_person person ON person.person_id = benutzer.person_id 
+				WHERE kurzbz = ?",[$lv_lektor]);
+				if (isError($lektor_object)) {
+					$this->show_error(getError($lektor_object));
+				}
+				$lektor_object = current(getData($lektor_object));
+				// only provide needed information of the mitarbeiter object 
+				$lektor_obj_array[] = $lektor_object;
+			}
+
+			// load gruppe object
+			foreach ($item->gruppe as $lv_gruppe) {
+				$lv_gruppe = strtr($lv_gruppe, ['(' => '', ')' => '', '"' => '']);
+				$lv_gruppe_array = explode(",", $lv_gruppe);
+				list($gruppe, $verband, $semester, $studiengang_kz, $gruppen_kuerzel) = $lv_gruppe_array;
+				
+				$lv_gruppe_object = new stdClass();
+				$lv_gruppe_object->gruppe = $gruppe;
+				$lv_gruppe_object->verband = $verband;
+				$lv_gruppe_object->semester = $semester;
+				$lv_gruppe_object->studiengang_kz = $studiengang_kz;
+				$lv_gruppe_object->kuerzel = $gruppen_kuerzel;
+				
+				$gruppe_obj_array[] = $lv_gruppe_object;
+			}
+
+			$item->lektor = $lektor_obj_array;
+			$item->gruppe = $gruppe_obj_array;
+		}
+
+		return success($gruppierteEvents);
 	}
 
 	/**
 	 * NO STANDALONE FUNCTION - Generates a SQL query string to fetch 'stundenplan' events for a specific student within the current semester.
-	 * @param string $uid the user id that is used to fetch the stundenplan rows from the lehre.vw_studenplan table
+	 * @param string $uid the user id that is used to fetch the stundenplan rows from the lehre.vw_stundenplan table
 	 * 
 	 * @return string
 	 */
-	public function getStudenPlanQuery($uid){
+	public function getStundenPlanQuery($uid){
 			return 
 			"select sp.*
 			from lehre.vw_stundenplan sp
diff --git a/include/lehrstunde.class.php b/include/lehrstunde.class.php
index a0f52d799..dff4faba2 100755
--- a/include/lehrstunde.class.php
+++ b/include/lehrstunde.class.php
@@ -1073,7 +1073,7 @@ class lehrstunde extends basis_db
 	}
 
 	/**
-	 * Holt Studenplandaten.
+	 * Holt Stundenplandaten.
 	 *
 	 * @param $db_stpl_table
 	 * @param null $lehrveranstaltung_id
diff --git a/include/wochenplan.class.php b/include/wochenplan.class.php
index 34fbadc63..5274beefb 100755
--- a/include/wochenplan.class.php
+++ b/include/wochenplan.class.php
@@ -123,7 +123,7 @@ class wochenplan extends basis_db
 	}
 
 	/**
-	 * initialisiert den Studenplan
+	 * initialisiert den Stundenplan
 	 *
 	 */
 	public function init_stdplan()
diff --git a/public/js/api/fhcapifactory.js b/public/js/api/fhcapifactory.js
index 65bde56fd..c053f272c 100644
--- a/public/js/api/fhcapifactory.js
+++ b/public/js/api/fhcapifactory.js
@@ -22,7 +22,7 @@ import filter from "./filter.js";
 import studstatus from "./studstatus.js";
 import profil from "./profil.js";
 import profilUpdate from "./profilUpdate.js";
-import stundenplan from "./studenplan.js";
+import stundenplan from "./stundenplan.js";
 
 export default {
     search,
diff --git a/public/js/api/studenplan.js b/public/js/api/stundenplan.js
similarity index 89%
rename from public/js/api/studenplan.js
rename to public/js/api/stundenplan.js
index d691a72cf..a522ef3ca 100644
--- a/public/js/api/studenplan.js
+++ b/public/js/api/stundenplan.js
@@ -2,7 +2,7 @@
 export default {
 	getRoomInfo(ort_kurzbz, start_date, end_date) {
 		return this.$fhcApi.get(
-			'/api/frontend/v1/Stundenplan/roomInformation',
+			'/api/frontend/v1/Stundenplan/getRoomplan',
 			{  ort_kurzbz, start_date, end_date}
 		);
 	},
diff --git a/public/js/components/Cis/Mylv/RoomInformation.js b/public/js/components/Cis/Mylv/RoomInformation.js
index c905dabd8..877869fa3 100644
--- a/public/js/components/Cis/Mylv/RoomInformation.js
+++ b/public/js/components/Cis/Mylv/RoomInformation.js
@@ -17,7 +17,7 @@ export default{
 			stunden: [],
 			events: null,
             calendarWeek: new CalendarDate(new Date()),
-            events_loaded:false,
+            
         }
 	},
     computed:{
@@ -36,6 +36,7 @@ export default{
 			this.calendarWeek = new CalendarDate(data.start);
 			Vue.nextTick(() => {
 				this.loadRoomEvents();
+				//this.loadReservierungen();
 			});
 		},
 
@@ -56,9 +57,37 @@ export default{
 			});
 		},
 
-		loadRoomEvents: function(){
-			this.$fhcApi.factory.stundenplan.getRoomInfo(this.ort_kurzbz, this.weekFirstDay, this.weekLastDay).then(res => {
-				let events;
+		loadRoomEvents: async function () {
+			await this.$fhcApi.factory.stundenplan.getRoomInfo(this.ort_kurzbz, this.weekFirstDay, this.weekLastDay).then(res => {
+				
+				if (res.data && res.data.forEach) {
+					res.data.forEach((el, i) => {
+
+						el.id = i;
+						if (el.type === 'reservierung') {
+							el.color = '#' + (el.farbe || 'FFFFFF');
+						} else {
+							el.color = '#' + (el.farbe || 'CCCCCC');
+						}
+
+						el.start = new Date(el.datum + ' ' + this.stunden[el.stunde].beginn);
+						el.end = new Date(el.datum + ' ' + this.stunden[el.stunde].ende);
+						el.title = el.lehrfach;
+						if (el.lehrform)
+							el.title += '-' + el.lehrform;
+					});
+					if (this.events){
+						this.events = [...this.events, ...res.data];
+					}else{
+						this.events = res.data;
+					}
+				}
+			});
+		},
+
+		
+		loadReservierungen: async function () {
+			await this.$fhcApi.factory.stundenplan.getReservierungen(this.ort_kurzbz, this.weekFirstDay, this.weekLastDay).then(res => {
 				if (res.data && res.data.forEach) {
 					res.data.forEach((el, i) => {
 
@@ -76,33 +105,36 @@ export default{
 							el.title += '-' + el.lehrform;
 					});
 
-					this.events = res.data;
+					if (this.events) {
+						this.events = [...this.events, ...res.data];
+					} else {
+						this.events = res.data;
+					}
 				}
 			});
 		}
-        
+
     },
 	async mounted() {
 
         this.loadStunden();
 		this.loadRoomEvents();
+		this.loadReservierungen();
 
 	},
     template: /*html*/`
     <div>
 		<fhc-calendar @change:range="updateRange" v-slot="{event,day}" :initialDate="currentDate" :events="events" initial-mode="week" show-weeks>
-           
-            <a class="text-decoration-none text-dark" href="#" :title="event.orig.title + ' - ' + event.orig.lehrfach_bez + ' [' + event.orig.ort_kurzbz+']'"   >    
+            <a class="text-decoration-none text-dark" href="#" :title="event.orig.title + ' - ' + event.orig.lehrfach_bez + ' [' + event.orig.ort_kurzbz+']'"   >
                 <div class="d-flex flex-column align-items-center justify-content-evenly h-100" >
-                    
+
                         <!-- render content for stundenplan -->
                         <span >{{event.orig.topic}}</span>
-                        <span v-for="gruppe in event.orig.gruppe.split('/')" :key="gruppe">{{gruppe}}</span>	
-                        <span v-for="lektor in event.orig.lektor.split('/')" :key="lektor">{{lektor}}</span>
-                        <!-- add the beschreibung if the event is a reservierung -->
-                        <span v-if="event.orig.type === 'reservierung'">{{event.orig.beschreibung}}</span>
+                        <span v-for="gruppe_kurzbz in event.orig.gruppen_kurzbz" >{{gruppe_kurzbz}}</span>
+                        <span v-for="lektor in event.orig.lektor" >{{lektor.kurzbz}}</span>
+                        <!-- add the beschreibung if the event is a reservierung
+                        <span v-if="event.orig.type === 'reservierung'">{{event.orig.beschreibung}}</span>-->
                         
-                    
                 </div>
             </a>
         </fhc-calendar>

From f9b69fe08c3948bce5726df9476069762f767ec0 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 5 Sep 2024 14:57:57 +0200
Subject: [PATCH 1180/1461] changes how the reservierungen are fetched from the
 database to have the same information as the room events

---
 .../api/frontend/v1/Stundenplan.php           |  6 +-
 .../models/ressource/Reservierung_model.php   | 66 ++++++++++++++-----
 .../models/ressource/Stundenplan_model.php    |  3 +-
 .../js/components/Cis/Mylv/RoomInformation.js |  5 +-
 4 files changed, 58 insertions(+), 22 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 019a8ab4a..d746990be 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -143,8 +143,8 @@ class Stundenplan extends FHCAPI_Controller
 
         $result = $this->getDataOrTerminateWithError($result);
         $this->terminateWithSuccess($result);
-        // loop over the days
-        $day_events = $this->filterEventsIntoAssociativeDateArray($result, $start_date, $end_date);
+        // imperative approach
+        /* $day_events = $this->filterEventsIntoAssociativeDateArray($result, $start_date, $end_date);
         $final_reservierungen = array();
         foreach($day_events as $date => $day_eventArray){
 
@@ -203,7 +203,7 @@ class Stundenplan extends FHCAPI_Controller
             }
 
         }
-        $this->terminateWithSuccess($final_reservierungen);
+        $this->terminateWithSuccess($final_reservierungen); */
 	}
 
     private function filterEventsIntoAssociativeDateArray($events, $start_date, $end_date){
diff --git a/application/models/ressource/Reservierung_model.php b/application/models/ressource/Reservierung_model.php
index c06fce206..b4fedba5e 100755
--- a/application/models/ressource/Reservierung_model.php
+++ b/application/models/ressource/Reservierung_model.php
@@ -22,21 +22,26 @@ class Reservierung_model extends DB_Model
 	{
 
 		$raum_reservierungen= $this->execReadOnlyQuery("
-		SELECT ort_kurzbz, studiengang_kz, array_agg(uid) as lektor, stunde, datum, titel, beschreibung, gruppe, gruppe_kurzbz, stg_kurzbz, stg 
+		SELECT 
+		
+		array_agg(DISTINCT uid) as lektor,
+		array_agg(DISTINCT (gruppe,verband,semester,studiengang_kz,gruppen_kuerzel)) as gruppe,
+		COALESCE(titel, beschreibung) as topic,
+		ort_kurzbz, studiengang_kz, reservierungen.stunde, datum, beginn, ende
+		
 		FROM 
 		(
-			SELECT res.* , 
+			SELECT res.*, beginn, ende,
 			CASE
-				WHEN res.verband IS NOT NULL OR res.semester IS NOT NULL THEN
-					CONCAT(UPPER(studg.typ),UPPER(studg.kurzbz),'-',res.verband,res.semester) 
-				ELSE
-					CONCAT(UPPER(studg.typ),UPPER(studg.kurzbz)) 
-			END AS stg
+				WHEN res.gruppe_kurzbz IS NOT NULL THEN res.gruppe_kurzbz 
+				ELSE CONCAT(UPPER(studg.typ),UPPER(studg.kurzbz),'-',COALESCE(CAST(res.semester AS varchar),'/'),COALESCE(CAST(res.verband AS varchar),'/')) 
+			END as gruppen_kuerzel
 			FROM lehre.vw_reservierung res
 			JOIN public.tbl_studiengang studg ON studg.studiengang_kz=res.studiengang_kz
+			JOIN lehre.tbl_stunde ON lehre.tbl_stunde.stunde = res.stunde
 			WHERE res.ort_kurzbz = ? AND datum >= ? AND datum <= ?
 		) AS reservierungen
-		GROUP BY ort_kurzbz, studiengang_kz, stunde, datum, titel, beschreibung, gruppe, stg, gruppe_kurzbz, stg_kurzbz
+		GROUP BY ort_kurzbz, studiengang_kz, reservierungen.stunde, datum, titel, beschreibung, beginn, ende
 		", [$ort_kurzbz, $start_date, $end_date]);
 
 		if(isError($raum_reservierungen)){
@@ -46,19 +51,48 @@ class Reservierung_model extends DB_Model
 		$raum_reservierungen = getData($raum_reservierungen) ?? [];
 		
 		$this->load->model("ressrouce/Mitarbeiter_model","MitarbeiterModel");
+
 		foreach($raum_reservierungen as $reservierung){
-			$lektoren_array = array();
-			foreach($reservierung->lektor as $lektor){
+
+			$lektor_obj_array = array();
+			$gruppe_obj_array = array();
+
+			// load lektor object
+			foreach ($reservierung->lektor as $lektor) {
 				$this->MitarbeiterModel->addLimit(1);
-				$lektor_obj= $this->MitarbeiterModel->load($lektor);
-				if(isError($lektor_obj)){
-					show_error(getError($lektor_obj));
+				$lektor_object = $this->execReadOnlyQuery("
+				SELECT mitarbeiter_uid, vorname, nachname, kurzbz 
+				FROM public.tbl_mitarbeiter 
+				JOIN public.tbl_benutzer benutzer ON benutzer.uid = mitarbeiter_uid
+				JOIN public.tbl_person person ON person.person_id = benutzer.person_id 
+				WHERE mitarbeiter_uid = ?", [$lektor]);
+				if (isError($lektor_object)) {
+					$this->show_error(getError($lektor_object));
 				}
-				$lektor_obj = current(getData($lektor_obj));
-				$lektoren_array[] = $lektor_obj;
+				$lektor_object = current(getData($lektor_object));
+				// only provide needed information of the mitarbeiter object 
+				$lektor_obj_array[] = $lektor_object;
 			}
 
-			$reservierung->lektor = $lektoren_array;
+			// load gruppe object
+			foreach ($reservierung->gruppe as $lv_gruppe) {
+				$lv_gruppe = strtr($lv_gruppe, ['(' => '', ')' => '', '"' => '']);
+				$lv_gruppe_array = explode(",", $lv_gruppe);
+				list($gruppe, $verband, $semester, $studiengang_kz, $gruppen_kuerzel) = $lv_gruppe_array;
+
+				$lv_gruppe_object = new stdClass();
+				$lv_gruppe_object->gruppe = $gruppe;
+				$lv_gruppe_object->verband = $verband;
+				$lv_gruppe_object->semester = $semester;
+				$lv_gruppe_object->studiengang_kz = $studiengang_kz;
+				$lv_gruppe_object->kuerzel = $gruppen_kuerzel;
+
+				$gruppe_obj_array[] = $lv_gruppe_object;
+			}
+
+
+			$reservierung->gruppe = $gruppe_obj_array;
+			$reservierung->lektor = $lektor_obj_array;
 			
 		}
 		return success($raum_reservierungen);
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 6b1ed4ef0..482e1a30a 100755
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -145,12 +145,11 @@ class Stundenplan_model extends DB_Model
 		$gruppierteEvents = $this->execReadOnlyQuery("
 		SELECT 
 			
-		unr,datum, sp.stunde,
 		CONCAT(lehrfach,'-',lehrform) as topic,
 		array_agg(DISTINCT (gruppe,verband,semester,studiengang_kz,gruppen_kuerzel)) as gruppe,
 		array_agg(DISTINCT lektor) as lektor,
 		
-		ort_kurzbz, titel, lehrfach, lehrform, lehrfach_bez, beginn, ende
+		unr,datum, sp.stunde, ort_kurzbz, titel, lehrfach, lehrform, lehrfach_bez, beginn, ende
 
 		FROM
 		(
diff --git a/public/js/components/Cis/Mylv/RoomInformation.js b/public/js/components/Cis/Mylv/RoomInformation.js
index 877869fa3..4be66938b 100644
--- a/public/js/components/Cis/Mylv/RoomInformation.js
+++ b/public/js/components/Cis/Mylv/RoomInformation.js
@@ -100,6 +100,9 @@ export default{
 
 						el.start = new Date(el.datum + ' ' + this.stunden[el.stunde].beginn);
 						el.end = new Date(el.datum + ' ' + this.stunden[el.stunde].ende);
+						if(el.titel){
+							
+						}
 						el.title = el.lehrfach;
 						if (el.lehrform)
 							el.title += '-' + el.lehrform;
@@ -130,7 +133,7 @@ export default{
 
                         <!-- render content for stundenplan -->
                         <span >{{event.orig.topic}}</span>
-                        <span v-for="gruppe_kurzbz in event.orig.gruppen_kurzbz" >{{gruppe_kurzbz}}</span>
+                        <span v-for="gruppe in event.orig.gruppe" >{{gruppe.kuerzel}} </span>
                         <span v-for="lektor in event.orig.lektor" >{{lektor.kurzbz}}</span>
                         <!-- add the beschreibung if the event is a reservierung
                         <span v-if="event.orig.type === 'reservierung'">{{event.orig.beschreibung}}</span>-->

From 493405951d037a94176c24ca64de8db6359986a4 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 5 Sep 2024 16:31:56 +0200
Subject: [PATCH 1181/1461] zusaetzlicher Filter bei Handyverwaltung nach
 beendeten DVs

---
 system/filtersupdate.php | 47 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 43 insertions(+), 4 deletions(-)

diff --git a/system/filtersupdate.php b/system/filtersupdate.php
index 3872d1905..e885b4e14 100644
--- a/system/filtersupdate.php
+++ b/system/filtersupdate.php
@@ -1402,14 +1402,53 @@ $filters = array(
 						{"name": "Wochenstunden"}, 
 						{"name": "WS_von"}, 
 						{"name": "WS_bis"}, 
-						{"name": "Standardkostenstelle"}
+						{"name": "Standardkostenstelle"},
+						{"name": "DV_status"}
 					],
 					"filters": [
 						{
-							"name": "Nachname",
+							"name": "DV_status",
 							"option": "",
-							"operation": "",
-							"condition": ""
+							"operation": "nequal",
+							"condition": "beendet"
+						}
+					]
+				}
+			',
+			'oe_kurzbz' => null,
+		),
+		array(
+			'app' => 'personalverwaltung',
+			'dataset_name' => 'handyverwaltung',
+			'filter_kurzbz' => 'ma4handyverwaltung_beendet',
+			'description' => '{MA Handyverwaltung (DV beendet)}',
+			'sort' => 2,
+			'default_filter' => false,
+			'filter' => '
+				{
+					"name": "MA Handyverwaltung (DV beendet)",
+					"columns": [
+						{"name": "UID"},
+						{"name": "PersonId"},
+						{"name": "Vorname"},
+						{"name": "Nachname"},
+						{"name": "EMail"}, 
+						{"name": "Unternehmen"}, 
+						{"name": "Vertragsart"}, 
+						{"name": "DV_von"}, 
+						{"name": "DV_bis"}, 
+						{"name": "Wochenstunden"}, 
+						{"name": "WS_von"}, 
+						{"name": "WS_bis"}, 
+						{"name": "Standardkostenstelle"},
+						{"name": "DV_status"}
+					],
+					"filters": [
+						{
+							"name": "DV_status",
+							"option": "",
+							"operation": "equal",
+							"condition": "beendet"
 						}
 					]
 				}

From 8376e8b92d53dd2de0c81fa5e5724e527d2f5232 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 6 Sep 2024 11:02:14 +0200
Subject: [PATCH 1182/1461] bundles the room_events and the reservierungen api
 calls together with Promise.allSettled

---
 .../models/ressource/Reservierung_model.php   | 16 ++-
 .../models/ressource/Stundenplan_model.php    | 18 ++--
 .../js/components/Cis/Mylv/RoomInformation.js | 97 +++++++------------
 3 files changed, 52 insertions(+), 79 deletions(-)

diff --git a/application/models/ressource/Reservierung_model.php b/application/models/ressource/Reservierung_model.php
index b4fedba5e..e3bc9a0b6 100755
--- a/application/models/ressource/Reservierung_model.php
+++ b/application/models/ressource/Reservierung_model.php
@@ -23,11 +23,12 @@ class Reservierung_model extends DB_Model
 
 		$raum_reservierungen= $this->execReadOnlyQuery("
 		SELECT 
-		
+		'reservierung' as type, beginn, ende, subquery.stunde, datum,
+		COALESCE(titel, beschreibung) as topic,
 		array_agg(DISTINCT uid) as lektor,
 		array_agg(DISTINCT (gruppe,verband,semester,studiengang_kz,gruppen_kuerzel)) as gruppe,
-		COALESCE(titel, beschreibung) as topic,
-		ort_kurzbz, studiengang_kz, reservierungen.stunde, datum, beginn, ende
+		
+		ort_kurzbz 
 		
 		FROM 
 		(
@@ -36,12 +37,17 @@ class Reservierung_model extends DB_Model
 				WHEN res.gruppe_kurzbz IS NOT NULL THEN res.gruppe_kurzbz 
 				ELSE CONCAT(UPPER(studg.typ),UPPER(studg.kurzbz),'-',COALESCE(CAST(res.semester AS varchar),'/'),COALESCE(CAST(res.verband AS varchar),'/')) 
 			END as gruppen_kuerzel
+
 			FROM lehre.vw_reservierung res
 			JOIN public.tbl_studiengang studg ON studg.studiengang_kz=res.studiengang_kz
 			JOIN lehre.tbl_stunde ON lehre.tbl_stunde.stunde = res.stunde
 			WHERE res.ort_kurzbz = ? AND datum >= ? AND datum <= ?
-		) AS reservierungen
-		GROUP BY ort_kurzbz, studiengang_kz, reservierungen.stunde, datum, titel, beschreibung, beginn, ende
+
+		) AS subquery
+
+		GROUP BY datum, subquery.stunde, beginn, ende, ort_kurzbz, titel, beschreibung
+		
+		ORDER BY datum, subquery.stunde 
 		", [$ort_kurzbz, $start_date, $end_date]);
 
 		if(isError($raum_reservierungen)){
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 482e1a30a..1944feb8a 100755
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -144,18 +144,16 @@ class Stundenplan_model extends DB_Model
 	{
 		$gruppierteEvents = $this->execReadOnlyQuery("
 		SELECT 
-			
+		unr, beginn, ende, subquery.stunde, datum,	
 		CONCAT(lehrfach,'-',lehrform) as topic,
-		array_agg(DISTINCT (gruppe,verband,semester,studiengang_kz,gruppen_kuerzel)) as gruppe,
 		array_agg(DISTINCT lektor) as lektor,
+		array_agg(DISTINCT (gruppe,verband,semester,studiengang_kz,gruppen_kuerzel)) as gruppe,
 		
-		unr,datum, sp.stunde, ort_kurzbz, titel, lehrfach, lehrform, lehrfach_bez, beginn, ende
+		ort_kurzbz, titel, lehrfach, lehrform, lehrfach_bez
 
 		FROM
 		(
-			SELECT
- 			unr,datum, sp.stunde,beginn, ende,
-			
+			SELECT unr,datum, sp.stunde,beginn, ende,
 			CASE
 				WHEN sp.mitarbeiter_kurzbz IS NOT NULL THEN sp.mitarbeiter_kurzbz
 				ELSE lektor
@@ -169,13 +167,11 @@ class Stundenplan_model extends DB_Model
 			FROM (".$stundenplanViewQuery.") sp
 			JOIN lehre.tbl_stunde ON lehre.tbl_stunde.stunde = sp.stunde
 
-		) as sp
+		) as subquery
 
-		GROUP BY 
+		GROUP BY unr, datum, subquery.stunde, beginn, ende, ort_kurzbz, titel, lehrform, lehrfach, lehrfach_bez
 
-			unr, datum, sp.stunde, ort_kurzbz, titel, lehrform, lehrfach, lehrfach_bez, beginn, ende
-
-		ORDER BY datum, sp.stunde
+		ORDER BY datum, subquery.stunde
 		");
 
 		if(isError($gruppierteEvents)){
diff --git a/public/js/components/Cis/Mylv/RoomInformation.js b/public/js/components/Cis/Mylv/RoomInformation.js
index 4be66938b..33c37db63 100644
--- a/public/js/components/Cis/Mylv/RoomInformation.js
+++ b/public/js/components/Cis/Mylv/RoomInformation.js
@@ -35,8 +35,7 @@ export default{
 		updateRange: function(data){
 			this.calendarWeek = new CalendarDate(data.start);
 			Vue.nextTick(() => {
-				this.loadRoomEvents();
-				//this.loadReservierungen();
+				this.loadEvents();
 			});
 		},
 
@@ -50,80 +49,52 @@ export default{
         },
 
 		loadStunden: async function(){
-			await this.$fhcApi.factory.stundenplan.getStunden().then(res => {
+			this.$fhcApi.factory.stundenplan.getStunden().then(res => {
 				res.data.forEach(std => {
 					this.stunden[std.stunde] = std; // TODO(chris): geht besser
 				});
 			});
 		},
 
-		loadRoomEvents: async function () {
-			await this.$fhcApi.factory.stundenplan.getRoomInfo(this.ort_kurzbz, this.weekFirstDay, this.weekLastDay).then(res => {
-				
-				if (res.data && res.data.forEach) {
-					res.data.forEach((el, i) => {
+		loadEvents: function(){
 
-						el.id = i;
-						if (el.type === 'reservierung') {
-							el.color = '#' + (el.farbe || 'FFFFFF');
-						} else {
-							el.color = '#' + (el.farbe || 'CCCCCC');
+			// bundles the room_events and the reservierungen together into the this.events array
+			Promise.allSettled([
+				this.$fhcApi.factory.stundenplan.getRoomInfo(this.ort_kurzbz, this.weekFirstDay, this.weekLastDay),
+				this.$fhcApi.factory.stundenplan.getReservierungen(this.ort_kurzbz, this.weekFirstDay, this.weekLastDay)
+			]).then((result) => {
+				let events = [];
+				result.forEach((promise_result) => {
+					if(promise_result.status === 'fulfilled' && promise_result.value.meta.status === "success"){
+						
+						let data = promise_result.value.data;
+						// adding additional information to the events 
+						if (data && data.forEach) {
+							data.forEach((el, i) => {
+
+								el.id = i;
+								if (el.type === 'reservierung') {
+									el.color = '#' + (el.farbe || 'FFFFFF');
+								} else {
+									el.color = '#' + (el.farbe || 'CCCCCC');
+								}
+
+								el.start = new Date(el.datum + ' ' + this.stunden[el.stunde].beginn);
+								el.end = new Date(el.datum + ' ' + this.stunden[el.stunde].ende);
+								
+							});
 						}
-
-						el.start = new Date(el.datum + ' ' + this.stunden[el.stunde].beginn);
-						el.end = new Date(el.datum + ' ' + this.stunden[el.stunde].ende);
-						el.title = el.lehrfach;
-						if (el.lehrform)
-							el.title += '-' + el.lehrform;
-					});
-					if (this.events){
-						this.events = [...this.events, ...res.data];
-					}else{
-						this.events = res.data;
+						events = events.concat(data);
 					}
-				}
-			});
+				})
+				this.events = events;
+			})
 		},
-
 		
-		loadReservierungen: async function () {
-			await this.$fhcApi.factory.stundenplan.getReservierungen(this.ort_kurzbz, this.weekFirstDay, this.weekLastDay).then(res => {
-				if (res.data && res.data.forEach) {
-					res.data.forEach((el, i) => {
-
-						el.id = i;
-						if (el.type === 'reservierung') {
-							el.color = '#' + (el.farbe || 'FFFFFF');
-						} else {
-							el.color = '#' + (el.farbe || 'CCCCCC');
-						}
-
-						el.start = new Date(el.datum + ' ' + this.stunden[el.stunde].beginn);
-						el.end = new Date(el.datum + ' ' + this.stunden[el.stunde].ende);
-						if(el.titel){
-							
-						}
-						el.title = el.lehrfach;
-						if (el.lehrform)
-							el.title += '-' + el.lehrform;
-					});
-
-					if (this.events) {
-						this.events = [...this.events, ...res.data];
-					} else {
-						this.events = res.data;
-					}
-				}
-			});
-		}
-
     },
 	async mounted() {
-
-        this.loadStunden();
-		this.loadRoomEvents();
-		this.loadReservierungen();
-
+		// the stunden data are required to display the events accordingly on the calendar
+		await this.loadStunden();
 	},
     template: /*html*/`
     <div>

From 122673d29142a87c749b8f775bd1ab367ff71663 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 6 Sep 2024 11:20:20 +0200
Subject: [PATCH 1183/1461] gets rid of the stunden dependency and uses the
 beginn and ende property of the queried events

---
 .../models/ressource/Reservierung_model.php     | 10 +++++-----
 .../models/ressource/Stundenplan_model.php      | 10 +++++-----
 .../js/components/Cis/Mylv/RoomInformation.js   | 17 ++---------------
 3 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/application/models/ressource/Reservierung_model.php b/application/models/ressource/Reservierung_model.php
index e3bc9a0b6..73e21eb2c 100755
--- a/application/models/ressource/Reservierung_model.php
+++ b/application/models/ressource/Reservierung_model.php
@@ -23,12 +23,12 @@ class Reservierung_model extends DB_Model
 
 		$raum_reservierungen= $this->execReadOnlyQuery("
 		SELECT 
-		'reservierung' as type, beginn, ende, subquery.stunde, datum,
+		'reservierung' as type, beginn, ende, datum,
 		COALESCE(titel, beschreibung) as topic,
 		array_agg(DISTINCT uid) as lektor,
-		array_agg(DISTINCT (gruppe,verband,semester,studiengang_kz,gruppen_kuerzel)) as gruppe,
+		array_agg(DISTINCT (gruppe,verband,semester,studiengang_kz,gruppen_kuerzel)) as gruppe, 
 		
-		ort_kurzbz 
+		ort_kurzbz, 'FFFFFF' as farbe
 		
 		FROM 
 		(
@@ -45,9 +45,9 @@ class Reservierung_model extends DB_Model
 
 		) AS subquery
 
-		GROUP BY datum, subquery.stunde, beginn, ende, ort_kurzbz, titel, beschreibung
+		GROUP BY datum, beginn, ende, ort_kurzbz, titel, beschreibung
 		
-		ORDER BY datum, subquery.stunde 
+		ORDER BY datum, beginn
 		", [$ort_kurzbz, $start_date, $end_date]);
 
 		if(isError($raum_reservierungen)){
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 1944feb8a..5b61d5351 100755
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -144,16 +144,16 @@ class Stundenplan_model extends DB_Model
 	{
 		$gruppierteEvents = $this->execReadOnlyQuery("
 		SELECT 
-		unr, beginn, ende, subquery.stunde, datum,	
+		'lehreinheit' as type, beginn, ende, datum,	
 		CONCAT(lehrfach,'-',lehrform) as topic,
 		array_agg(DISTINCT lektor) as lektor,
 		array_agg(DISTINCT (gruppe,verband,semester,studiengang_kz,gruppen_kuerzel)) as gruppe,
 		
-		ort_kurzbz, titel, lehrfach, lehrform, lehrfach_bez
+		ort_kurzbz, titel, lehrfach, lehrform, lehrfach_bez, farbe
 
 		FROM
 		(
-			SELECT unr,datum, sp.stunde,beginn, ende,
+			SELECT unr,datum,beginn, ende,
 			CASE
 				WHEN sp.mitarbeiter_kurzbz IS NOT NULL THEN sp.mitarbeiter_kurzbz
 				ELSE lektor
@@ -169,9 +169,9 @@ class Stundenplan_model extends DB_Model
 
 		) as subquery
 
-		GROUP BY unr, datum, subquery.stunde, beginn, ende, ort_kurzbz, titel, lehrform, lehrfach, lehrfach_bez
+		GROUP BY unr, datum, beginn, ende, ort_kurzbz, titel, lehrform, lehrfach, lehrfach_bez, farbe
 
-		ORDER BY datum, subquery.stunde
+		ORDER BY datum, beginn
 		");
 
 		if(isError($gruppierteEvents)){
diff --git a/public/js/components/Cis/Mylv/RoomInformation.js b/public/js/components/Cis/Mylv/RoomInformation.js
index 33c37db63..a01af0ebc 100644
--- a/public/js/components/Cis/Mylv/RoomInformation.js
+++ b/public/js/components/Cis/Mylv/RoomInformation.js
@@ -48,14 +48,6 @@ export default{
             
         },
 
-		loadStunden: async function(){
-			this.$fhcApi.factory.stundenplan.getStunden().then(res => {
-				res.data.forEach(std => {
-					this.stunden[std.stunde] = std; // TODO(chris): geht besser
-				});
-			});
-		},
-
 		loadEvents: function(){
 
 			// bundles the room_events and the reservierungen together into the this.events array
@@ -71,7 +63,6 @@ export default{
 						// adding additional information to the events 
 						if (data && data.forEach) {
 							data.forEach((el, i) => {
-
 								el.id = i;
 								if (el.type === 'reservierung') {
 									el.color = '#' + (el.farbe || 'FFFFFF');
@@ -79,8 +70,8 @@ export default{
 									el.color = '#' + (el.farbe || 'CCCCCC');
 								}
 
-								el.start = new Date(el.datum + ' ' + this.stunden[el.stunde].beginn);
-								el.end = new Date(el.datum + ' ' + this.stunden[el.stunde].ende);
+								el.start = new Date(el.datum + ' ' + el.beginn);
+								el.end = new Date(el.datum + ' ' + el.ende);
 								
 							});
 						}
@@ -92,10 +83,6 @@ export default{
 		},
 		
     },
-	async mounted() {
-		// the stunden data are required to display the events accordingly on the calendar
-		await this.loadStunden();
-	},
     template: /*html*/`
     <div>
 		<fhc-calendar @change:range="updateRange" v-slot="{event,day}" :initialDate="currentDate" :events="events" initial-mode="week" show-weeks>

From ec8b3ccb6f0847163e8bb9d9770793439126d5c4 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 6 Sep 2024 13:11:22 +0200
Subject: [PATCH 1184/1461] adds the organisations bezeichnung through a
 subquery to the lehrveranstaltungs events

---
 .../models/ressource/Stundenplan_model.php        | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 5b61d5351..845b114eb 100755
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -149,7 +149,7 @@ class Stundenplan_model extends DB_Model
 		array_agg(DISTINCT lektor) as lektor,
 		array_agg(DISTINCT (gruppe,verband,semester,studiengang_kz,gruppen_kuerzel)) as gruppe,
 		
-		ort_kurzbz, titel, lehrfach, lehrform, lehrfach_bez, farbe
+		ort_kurzbz, titel, lehrfach, lehrform, lehrfach_bez, organisationseinheit, farbe
 
 		FROM
 		(
@@ -162,14 +162,21 @@ class Stundenplan_model extends DB_Model
 				WHEN gruppe_kurzbz IS NOT NULL THEN gruppe_kurzbz 
 				ELSE CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) 
 			END as gruppen_kuerzel,
+			(SELECT bezeichnung 
+			FROM public.tbl_organisationseinheit
+			WHERE oe_kurzbz IN(
+				SELECT oe_kurzbz
+				FROM lehre.tbl_lehrveranstaltung
+				WHERE lehrveranstaltung_id = sp.lehrveranstaltung_id
+			)) as organisationseinheit,
 			ort_kurzbz, studiengang_kz, titel,lehreinheit_id,lehrfach_id,anmerkung,fix,lehrveranstaltung_id,stg_kurzbzlang,stg_bezeichnung,stg_typ,fachbereich_kurzbz,lehrfach,lehrfach_bez,farbe,lehrform,anmerkung_lehreinheit,gruppe, verband, semester,stg_kurzbz
 
 			FROM (".$stundenplanViewQuery.") sp
 			JOIN lehre.tbl_stunde ON lehre.tbl_stunde.stunde = sp.stunde
-
+			
 		) as subquery
 
-		GROUP BY unr, datum, beginn, ende, ort_kurzbz, titel, lehrform, lehrfach, lehrfach_bez, farbe
+		GROUP BY unr, datum, beginn, ende, ort_kurzbz, titel, lehrform, lehrfach, lehrfach_bez, organisationseinheit, farbe
 
 		ORDER BY datum, beginn
 		");
@@ -189,7 +196,7 @@ class Stundenplan_model extends DB_Model
 		foreach ($gruppierteEvents as $item) {
 			$lektor_obj_array = array();
 			$gruppe_obj_array = array();
-			
+
 			// load lektor object
 			foreach ($item->lektor as $lv_lektor) {
 				$this->MitarbeiterModel->addLimit(1);

From 33122a0708657be37dc5699357e8b55ba88e50d1 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 9 Sep 2024 10:49:21 +0200
Subject: [PATCH 1185/1461] WIP performance testing & UI upgrades

---
 application/views/templates/FHC-Footer.php |  3 +--
 include/tw/cis_menu_lv.inc.php             |  4 ++--
 public/js/plugin/FhcAlert.js               | 25 ++++++++++++++++------
 system/phrasesupdate.php                   | 22 ++++++++++++++++++-
 4 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/application/views/templates/FHC-Footer.php b/application/views/templates/FHC-Footer.php
index 31e610289..34e1ee15c 100644
--- a/application/views/templates/FHC-Footer.php
+++ b/application/views/templates/FHC-Footer.php
@@ -176,5 +176,4 @@
 	</body>
 </html>
 
-<!-- Footer end -->
-
+<!-- Footer end -->
\ No newline at end of file
diff --git a/include/tw/cis_menu_lv.inc.php b/include/tw/cis_menu_lv.inc.php
index f42543817..529c1aa5a 100644
--- a/include/tw/cis_menu_lv.inc.php
+++ b/include/tw/cis_menu_lv.inc.php
@@ -247,7 +247,7 @@ function checkZeilenUmbruch()
 		$link='';
 		$text='';
 
-		$link= APP_ROOT."index.ci.php/extensions/FHC-Core-Anwesenheiten/?stg_kz=$studiengang_kz&sem=$semester&lvid=$lvid&sem_kurzbz=$angezeigtes_stsem&nav=false";
+		$link= APP_ROOT."index.ci.php/extensions/FHC-Core-Anwesenheiten/?stg_kz=$studiengang_kz&sem=$semester&lvid=$lvid&sem_kurzbz=$angezeigtes_stsem";
 
 		$menu[]=array
 		(
@@ -604,4 +604,4 @@ function isDirectoryEmpty($DOC_ROOT, $kurzbz, $semester, $short_short_name, $typ
 }
   ?>
 	</tr>
-</table>
+</table>
\ No newline at end of file
diff --git a/public/js/plugin/FhcAlert.js b/public/js/plugin/FhcAlert.js
index eb6516820..ac5adba02 100644
--- a/public/js/plugin/FhcAlert.js
+++ b/public/js/plugin/FhcAlert.js
@@ -208,15 +208,26 @@ export default {
 				helperAppInstance.$refs.alert.add({ severity: 'error', summary: 'Systemfehler', detail: message});
 			},
 			confirmDelete() {
+				return confirm({
+					group: 'fhcAlertConfirm',
+					header: 'Achtung',
+					message: 'Möchten Sie sicher löschen?',
+					acceptLabel: 'Löschen',
+					acceptClass: 'btn btn-danger',
+					rejectLabel: 'Abbrechen',
+					rejectClass: 'btn btn-outline-secondary',
+				})
+			},
+			confirm(options) {
 				return new Promise((resolve, reject) => {
 					helperAppInstance.$confirm.require({
-						group: 'fhcAlertConfirm',
-						header: 'Achtung',
-						message: 'Möchten Sie sicher löschen?',
-						acceptLabel: 'Löschen',
-						acceptClass: 'btn btn-danger',
-						rejectLabel: 'Abbrechen',
-						rejectClass: 'btn btn-outline-secondary',
+						group: options?.group ?? 'fhcAlertConfirm',
+						header: options?.header ?? 'Achtung',
+						message: options?.message ?? 'Möchten',
+						acceptLabel: options?.acceptLabel ?? 'Ok',
+						acceptClass: options?.acceptClass ?? 'btn btn-primary',
+						rejectLabel: options?.rejectLabel ?? 'Abbrechen',
+						rejectClass: options?.rejectClass ?? 'btn btn-outline-secondary',
 						accept() {
 							resolve(true);
 						},
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index cae3fa258..9063bfcde 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -27060,6 +27060,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'anwCountTermin',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anwesend am gewählten Termin',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Attending at date',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'global',
@@ -28623,4 +28643,4 @@ foreach ($phrases as $phrase)
 }
 
 if(!$new)
-	echo '<b>Keine neuen Phrasen</b><br>';
+	echo '<b>Keine neuen Phrasen</b><br>';
\ No newline at end of file

From 26a05213791513f6107b18a9e90ef8fd8ec1fa62 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 9 Sep 2024 13:12:11 +0200
Subject: [PATCH 1186/1461] fixes fhcapi

---
 public/js/api/fhcapifactory.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/api/fhcapifactory.js b/public/js/api/fhcapifactory.js
index f6a4d6f6d..4228ead8e 100644
--- a/public/js/api/fhcapifactory.js
+++ b/public/js/api/fhcapifactory.js
@@ -41,7 +41,7 @@ export default {
     bookmark,
     stv,
     notiz,
-    betriebsmittel
+    betriebsmittel,
     ampeln,
     ort,
     cms,

From 7a63301f087da36c442060c9a90792887a29f48c Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 9 Sep 2024 13:49:38 +0200
Subject: [PATCH 1187/1461] puts profil settings ul outside of the sticky
 container

---
 application/views/templates/CISHTML-Header.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/application/views/templates/CISHTML-Header.php b/application/views/templates/CISHTML-Header.php
index 51740e28f..79b9b84ec 100755
--- a/application/views/templates/CISHTML-Header.php
+++ b/application/views/templates/CISHTML-Header.php
@@ -36,7 +36,13 @@ if (!isset($menu)) {
 		<img src="<?= base_url('/public/images/logo-300x160.png'); ?>" alt="Logo">
 	</a>
 	<nav id="nav-main" class="offcanvas offcanvas-start bg-dark" tabindex="-1" aria-labelledby="nav-main-btn" data-bs-backdrop="false">
-		<div id="nav-main-sticky">
+	<ul id="nav-user-menu" class="collapse list-unstyled" aria-labelledby="nav-user-btn">
+					<li><a class="btn btn-level-2 rounded-0 d-block" href="<?= site_url('Cis/Profil'); ?>" id="menu-profil">Profil</a></li>
+					<li><a class="btn btn-level-2 rounded-0 d-block" href="#">Ampeln</a></li>
+					<li><hr class="dropdown-divider"></li>
+					<li><a class="btn btn-level-2 rounded-0 d-block" href="<?= site_url('Cis/Auth/logout'); ?>">Logout</a></li>
+	</ul>	
+	<div id="nav-main-sticky">
 			<div id="nav-main-toggle" class="position-static d-none d-lg-flex bg-dark">
 				<button type="button" class="btn bg-dark text-light rounded-0 p-1 d-flex align-items-center" data-bs-toggle="collapse" data-bs-target="#nav-main-menu" aria-expanded="true" aria-controls="nav-main-menu">
 					<i class="fa fa-arrow-circle-left"></i>
@@ -47,12 +53,6 @@ if (!isset($menu)) {
 				<button id="nav-user-btn" class="btn btn-link rounded-0" type="button" data-bs-toggle="collapse" data-bs-target="#nav-user-menu" aria-expanded="false" aria-controls="nav-user-menu">
 					<img src="<?= site_url('Cis/Pub/bild/person/' . getAuthPersonId()); ?>" class="avatar rounded-circle"/>
 				</button>
-				<ul id="nav-user-menu" class="collapse list-unstyled" aria-labelledby="nav-user-btn">
-					<li><a class="btn btn-level-2 rounded-0 d-block" href="<?= site_url('Cis/Profil'); ?>" id="menu-profil">Profil</a></li>
-					<li><a class="btn btn-level-2 rounded-0 d-block" href="#">Ampeln</a></li>
-					<li><hr class="dropdown-divider"></li>
-					<li><a class="btn btn-level-2 rounded-0 d-block" href="<?= site_url('Cis/Auth/logout'); ?>">Logout</a></li>
-				</ul>
 				<div id="nav-main-menu" class="collapse collapse-horizontal show">
 					<div>
 					<?php foreach($menu->childs as $entry)

From 7b110aaf50c8e613c3ae7dcd92bbe80194629c4f Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 9 Sep 2024 14:16:37 +0200
Subject: [PATCH 1188/1461] adds the needed phrase to the api/frontend/v1/Cms
 Controller

---
 application/controllers/api/frontend/v1/Cms.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/application/controllers/api/frontend/v1/Cms.php b/application/controllers/api/frontend/v1/Cms.php
index 5ba635a8a..afebe3995 100644
--- a/application/controllers/api/frontend/v1/Cms.php
+++ b/application/controllers/api/frontend/v1/Cms.php
@@ -49,6 +49,11 @@ class Cms extends FHCAPI_Controller
 
 		$this->load->library('CmsLib');
 
+		// Loads phrases system
+		$this->loadPhrases([
+			'global'
+		]);
+
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
@@ -105,6 +110,7 @@ class Cms extends FHCAPI_Controller
 	//todo: there is the method news and getNews but only one should exist
 	public function news()
 	{
+
 		// form validation
 		$this->load->library('form_validation');
 		$this->form_validation->set_data($_GET);

From 888e3878bdb714188902449a4bd14f20c479d005 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 9 Sep 2024 17:16:05 +0200
Subject: [PATCH 1189/1461] studstatus unruly als grund

---
 .../components/Studierendenantrag/Antrag.js   |  3 +++
 .../Studierendenantrag/Form/Abmeldung.js      | 16 ++++++++++++++-
 .../Studierendenantrag/Form/AbmeldungStgl.js  | 15 ++------------
 system/phrasesupdate.php                      | 20 +++++++++++++++++++
 4 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/public/js/components/Studierendenantrag/Antrag.js b/public/js/components/Studierendenantrag/Antrag.js
index 37de9314d..29ed40592 100644
--- a/public/js/components/Studierendenantrag/Antrag.js
+++ b/public/js/components/Studierendenantrag/Antrag.js
@@ -37,6 +37,9 @@ export default {
 			return this.$p.t('studierendenantrag/info_' + this.antragType + '_' + this.status);
 		}
 	},
+	mounted() {
+		console.log(this)
+	},
 	template: `
 	<div class="studierendenantrag-antrag card">
 		<div class="card-header">
diff --git a/public/js/components/Studierendenantrag/Form/Abmeldung.js b/public/js/components/Studierendenantrag/Form/Abmeldung.js
index 1660957c5..ab75c7a53 100644
--- a/public/js/components/Studierendenantrag/Form/Abmeldung.js
+++ b/public/js/components/Studierendenantrag/Form/Abmeldung.js
@@ -77,6 +77,17 @@ export default {
 					this.formData.grund
 				)
 				.then(result => {
+					console.log(this.formData.grund)
+					// TODO: replace this with actual identifier after demo porpuses
+					if(this.formData.grund === '<< PHRASE textLong_unruly>>') {
+						this.$fhcApi.factory.unrulyperson.updatePersonUnrulyStatus(this.data.person_id, true).then(
+							(res)=> {
+								if(res?.meta?.status === "success") {
+									this.$fhcAlert.alertSuccess(this.$p.t('studierendenantrag', 'antrag_unruly_updated'))
+								}
+							})
+					}
+
 					if (result.data === true)
 						document.location += "";
 
@@ -144,6 +155,9 @@ export default {
 	created() {
 		this.uuid = _uuid++;
 	},
+	mounted() {
+		console.log(this)
+	},
 	template: `
 	<div class="studierendenantrag-form-abmeldung">
 		<core-fetch-cmpt :api-function="load">
@@ -259,4 +273,4 @@ export default {
 			</template>
 		</core-fetch-cmpt>
 	</div>`
-}
+}
\ No newline at end of file
diff --git a/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js b/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
index f7daa8d23..16cf187b4 100644
--- a/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
+++ b/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
@@ -108,14 +108,6 @@ export default {
 			this.formData.grund = event.target.value
 				? this.$p.t('studierendenantrag', event.target.value)
 				: '';
-		},
-		saveUnrulyPerson(event) {
-			this.$fhcApi.factory.unrulyperson.updatePersonUnrulyStatus(this.data.person_id, this.unrulyInternal).then(
-				(res)=> {
-					if(res?.meta?.status === "success") {
-						this.$fhcAlert.alertSuccess(this.$p.t('studierendenantrag', 'antrag_unruly_updated'))
-					}
-				})
 		}
 	},
 	created() {
@@ -182,6 +174,8 @@ export default {
 							<option value="textLong_plageat">{{$p.t('studierendenantrag', 'dropdown_plageat')}}
 							</option>					
 							<option value="textLong_MissingZgv">{{$p.t('studierendenantrag', 'dropdown_MissingZgv')}}
+							</option>	
+							<option value="textLong_unruly">{{$p.t('studierendenantrag', 'mark_person_as_unruly')}}
 							</option>						
 						</select>	
 					</div>
@@ -197,11 +191,6 @@ export default {
 					</form-input>
 				</div>
 				
-				<div class="col-6 d-flex " style="height: 40px; align-items: center;">
-					<input type="checkbox" v-model="unrulyInternal" @change=saveUnrulyPerson id="unruly" :disabled="saving" ref="unrulyCheckbox">
-					<label for="unruly" style="margin-left: 12px;" >{{ $p.t('studierendenantrag', 'mark_person_as_unruly') }}</label>
-				</div>
-				
 				<div class="col-12 text-end">
 					<button
 						v-if="!data?.studierendenantrag_id"
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index dce318771..868086828 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -22810,6 +22810,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'textLong_unruly',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Person ist unerwünscht',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Person is unruly',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'studierendenantrag',

From 6bc58c00b79e7d07a592bc1a26e6e62e1b0d7e74 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 10 Sep 2024 10:50:02 +0200
Subject: [PATCH 1190/1461] unruly controller benutzerrechte; studstatus unruly
 api fix;

---
 .../api/frontend/v1/unrulyperson/UnrulyPerson.php |  2 +-
 public/js/components/Studierendenantrag/Antrag.js |  3 ---
 .../Studierendenantrag/Form/Abmeldung.js          | 13 -------------
 .../Studierendenantrag/Form/AbmeldungStgl.js      | 15 +++++++++++++++
 4 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/application/controllers/api/frontend/v1/unrulyperson/UnrulyPerson.php b/application/controllers/api/frontend/v1/unrulyperson/UnrulyPerson.php
index a1673739a..b25e3dd02 100644
--- a/application/controllers/api/frontend/v1/unrulyperson/UnrulyPerson.php
+++ b/application/controllers/api/frontend/v1/unrulyperson/UnrulyPerson.php
@@ -25,7 +25,7 @@ class UnrulyPerson extends FHCAPI_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'updatePersonUnrulyStatus' => 'basis/mitarbeiter:rw'
+			'updatePersonUnrulyStatus' => array('basis/mitarbeiter:rw', 'student/antragfreigabe:rw', 'student/anrechnung:rw' , 'student/studierendenantrag:rw')
 		]);
 
 		$this->_ci =& get_instance();
diff --git a/public/js/components/Studierendenantrag/Antrag.js b/public/js/components/Studierendenantrag/Antrag.js
index 29ed40592..37de9314d 100644
--- a/public/js/components/Studierendenantrag/Antrag.js
+++ b/public/js/components/Studierendenantrag/Antrag.js
@@ -37,9 +37,6 @@ export default {
 			return this.$p.t('studierendenantrag/info_' + this.antragType + '_' + this.status);
 		}
 	},
-	mounted() {
-		console.log(this)
-	},
 	template: `
 	<div class="studierendenantrag-antrag card">
 		<div class="card-header">
diff --git a/public/js/components/Studierendenantrag/Form/Abmeldung.js b/public/js/components/Studierendenantrag/Form/Abmeldung.js
index ab75c7a53..7486f9095 100644
--- a/public/js/components/Studierendenantrag/Form/Abmeldung.js
+++ b/public/js/components/Studierendenantrag/Form/Abmeldung.js
@@ -77,16 +77,6 @@ export default {
 					this.formData.grund
 				)
 				.then(result => {
-					console.log(this.formData.grund)
-					// TODO: replace this with actual identifier after demo porpuses
-					if(this.formData.grund === '<< PHRASE textLong_unruly>>') {
-						this.$fhcApi.factory.unrulyperson.updatePersonUnrulyStatus(this.data.person_id, true).then(
-							(res)=> {
-								if(res?.meta?.status === "success") {
-									this.$fhcAlert.alertSuccess(this.$p.t('studierendenantrag', 'antrag_unruly_updated'))
-								}
-							})
-					}
 
 					if (result.data === true)
 						document.location += "";
@@ -155,9 +145,6 @@ export default {
 	created() {
 		this.uuid = _uuid++;
 	},
-	mounted() {
-		console.log(this)
-	},
 	template: `
 	<div class="studierendenantrag-form-abmeldung">
 		<core-fetch-cmpt :api-function="load">
diff --git a/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js b/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
index 16cf187b4..ccb25a632 100644
--- a/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
+++ b/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
@@ -79,6 +79,16 @@ export default {
 					this.formData.grund
 				)
 				.then(result => {
+
+					if(this.unrulyInternal) {
+						this.$fhcApi.factory.unrulyperson.updatePersonUnrulyStatus(this.data.person_id, true).then(
+							(res)=> {
+								if(res?.meta?.status === "success") {
+									this.$fhcAlert.alertSuccess(this.$p.t('studierendenantrag', 'antrag_unruly_updated'))
+								}
+							})
+					}
+
 					if (result.data === true)
 						document.location += "";
 					
@@ -113,6 +123,11 @@ export default {
 	created() {
 		this.uuid = _uuid++;
 	},
+	watch: {
+		'formData.grund'(newVal) {
+			this.unrulyInternal = (newVal === this.$p.t('studierendenantrag', 'mark_person_as_unruly'))
+		}
+	},
 	template: `
 	<div class="studierendenantrag-form-abmeldung">
 		<core-fetch-cmpt :api-function="load">

From 555e74b8cd8d183629ae5cd2d0492d4b9a9c8c64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Tue, 10 Sep 2024 11:48:43 +0200
Subject: [PATCH 1191/1461] =?UTF-8?q?Projektexport=20ist=20jetzt=20auch=20?=
 =?UTF-8?q?m=C3=B6glich=20wenn=20aktuell=20keine=20Projekte=20zugeordnet?=
 =?UTF-8?q?=20sind?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cis/private/tools/zeitaufzeichnung.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

From 715b8075b80a1ae8a606d197ab394dfab452206f Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 10 Sep 2024 12:30:40 +0200
Subject: [PATCH 1192/1461] reworks the query for the reservierungen
 stundenplan/room

---
 .../api/frontend/v1/Stundenplan.php           | 134 ++++--------------
 .../models/ressource/Reservierung_model.php   |  39 +++--
 .../models/ressource/Stundenplan_model.php    |   9 +-
 public/js/api/stundenplan.js                  |  16 ++-
 public/js/apps/Cis/Stundenplan.js             | 102 ++++++++-----
 .../js/components/Cis/Mylv/RoomInformation.js |   2 +-
 6 files changed, 141 insertions(+), 161 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index d746990be..61dc5233f 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -97,24 +97,36 @@ class Stundenplan extends FHCAPI_Controller
 		
 	}
 
+	/**
+	 * fetches stundenplan events from a UID and start/end date
+	 * @access public
+	 * 
+	 */
 	public function getStundenplan(){
+
+		// form validation
+		$this->load->library('form_validation');
+		$this->form_validation->set_data($_GET);
+		$this->form_validation->set_rules('start_date', "start_date", "required");
+		$this->form_validation->set_rules('end_date', "end_date", "required");
+		if ($this->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		// storing the get parameter in local variables
+		$start_date = $this->input->get('start_date', TRUE);
+		$end_date = $this->input->get('end_date', TRUE);
 		
 		$this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
 
-		/* $result = $this->StundenplanModel->loadForUid(get_uid());
-
-		if (isError($result))
-			return $this->outputJsonError(getError($result));
- 		*/
-		$res = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getStundenplanQuery(get_uid())); 
+		// the stundenplan query needs the uid and a start and end date
+		$stundenplan_data = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getStundenplanQuery(get_uid(),$start_date,$end_date)); 
+		$stundenplan_data = $this->getDataOrTerminateWithError($stundenplan_data);
 		
-		$res = getData($res);
-		
-		$this->outputJsonSuccess($res);
+		$this->terminateWithSuccess($stundenplan_data);
 	}
 
-	// reservierungen is not used in the prototype for the students
-    public function Reservierungen()
+	// gets the reservierungen of a room if the ort_kurzbz parameter is supplied otherwise gets the reservierungen of the stundenplan of a student
+    public function Reservierungen($ort_kurzbz = null)
 	{
         $this->load->model('ressource/Reservierung_model', 'ReservierungModel');
         $this->load->model('ressource/Stunde_model', 'StundeModel');
@@ -123,13 +135,11 @@ class Stundenplan extends FHCAPI_Controller
 		//form validation
 		$this->load->library('form_validation');
 		$this->form_validation->set_data($_GET);
-		$this->form_validation->set_rules('ort_kurzbz',"Ort","required");
 		$this->form_validation->set_rules('start_date', "StartDate", "required");
 		$this->form_validation->set_rules('end_date', "EndDate", "required");
 		if($this->form_validation->run() == FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
 
         // storing the get parameter in local variables
-        $ort_kurzbz = $this->input->get('ort_kurzbz', TRUE);
         $start_date = $this->input->get('start_date', TRUE);
         $end_date = $this->input->get('end_date', TRUE);
 
@@ -139,100 +149,18 @@ class Stundenplan extends FHCAPI_Controller
         $stunden = $this->getDataOrTerminateWithError($stunden);
 
 		// querying the reservierungen
-		$result = $this->ReservierungModel->getRoomReservierungen($ort_kurzbz, $start_date, $end_date);
+		if(isset($ort_kurzbz)){
+			$result = $this->ReservierungModel->getReservierungen($start_date, $end_date, $ort_kurzbz);
+		}else{
+			$result = $this->ReservierungModel->getReservierungen($start_date, $end_date);
+		}
 
         $result = $this->getDataOrTerminateWithError($result);
-        $this->terminateWithSuccess($result);
-        // imperative approach
-        /* $day_events = $this->filterEventsIntoAssociativeDateArray($result, $start_date, $end_date);
-        $final_reservierungen = array();
-        foreach($day_events as $date => $day_eventArray){
-
-            // loop over the stunden
-            foreach( $stunden as $stunde){
-                // filtering all the day reservierungen to the reservierungen that happen at the same hour of the day
-                $hour_reservierungen = array_filter($day_eventArray, function($day_entry) use ($stunde){
-                    return $day_entry->stunde == $stunde->stunde;
-                });
-
-                // if there are no reservierungen within that hour than we skip that iteration of the loop
-                if(count($hour_reservierungen) <1){
-                    continue;
-                }
-
-                $this->loglib->logInfoDB(print_r($hour_reservierungen,true),"this is the hour reservierungen");
-                
-                // grouping the reservierung information of reservervations of the same hour on the same day
-                $grouped_uids = array();
-                foreach($hour_reservierungen as $entry){
-
-                    // grouping the reservierungs participants
-
-                    $mitarbeiter_check = $this->MitarbeiterModel->isMitarbeiter($entry->uid);
-                    
-                    if(isError($mitarbeiter_check)){
-                        $this->terminateWithError(getError($mitarbeiter_check), self::ERROR_TYPE_GENERAL);
-                    }
-
-                    $mitarbeiter_check = getData($mitarbeiter_check);
-
-                    // if the uid belongs to a mitarbeiter store the mitarbeiter_kurzbz otherwise store the student uid
-                    if($mitarbeiter_check){
-                        $mitarbeiterKurzbz = $this->MitarbeiterModel->generateKurzbz($entry->uid);
-                        
-                        if(isError($mitarbeiterKurzbz)){
-                            $this->terminateWithError(getError($mitarbeiterKurzbz), self::ERROR_TYPE_GENERAL);
-                        }
-
-                        $grouped_uids[] = getData($mitarbeiterKurzbz);
-
-                    }else{
-                        $grouped_uids[]= $entry->uid;
-                    }
-
-                    
-                }
-
-                
-                // merging all the information into the first entry
-                $final_reservierung = current($hour_reservierungen);
-                
-                $final_reservierung->person_kurzbz = implode(" / ",$grouped_uids);
-
-                $final_reservierungen[] = $final_reservierung;
-            }
-
-        }
-        $this->terminateWithSuccess($final_reservierungen); */
+		$this->terminateWithSuccess($result);
+        
 	}
 
-    private function filterEventsIntoAssociativeDateArray($events, $start_date, $end_date){
-        $php_start_date = new DateTime($start_date);
-        $php_end_date = new DateTime($end_date);
-        // count is used to ensure that the loop does not iterate more than 7 times (7 days per week)
-        $count =0;
-
-        $result = array();
-
-        // loop over the days
-        while($php_start_date <= $php_end_date && $count <7){
-            
-            $date = $php_start_date->format('Y-m-d');
-
-            // filtering all the reservierungen with the date
-            $day_events = array_filter($events, function($event) use ($date){
-                // no filtering is done if the event entries do not have a datum property
-                return isset($event->datum) ? $event->datum == $date : true; 
-                
-            });
-
-            $result[$date] = $day_events;
-            ++$count;
-            $php_start_date->modify('+1 day');
-        }
-
-        return $result;
-    }
+    
 
 }
 
diff --git a/application/models/ressource/Reservierung_model.php b/application/models/ressource/Reservierung_model.php
index 73e21eb2c..9a5bc6af0 100755
--- a/application/models/ressource/Reservierung_model.php
+++ b/application/models/ressource/Reservierung_model.php
@@ -18,8 +18,31 @@ class Reservierung_model extends DB_Model
 	 * 
 	 * @return stdClass
 	 */
-	public function getRoomReservierungen($ort_kurzbz, $start_date, $end_date)
+	public function getReservierungen($start_date, $end_date, $ort_kurzbz = null)
 	{
+		
+		$stundenplan_reservierungen="SELECT r.* , beginn, ende
+			FROM campus.vw_reservierung r
+			LEFT JOIN public.tbl_benutzergruppe bg ON r.gruppe_kurzbz=bg.gruppe_kurzbz AND bg.uid=?
+			LEFT JOIN public.tbl_studiensemester ss1 ON bg.studiensemester_kurzbz=ss1.studiensemester_kurzbz AND ss1.start <= r.datum AND ss1.ende >= r.datum
+			LEFT JOIN public.tbl_studentlehrverband slv ON r.studiengang_kz=slv.studiengang_kz AND slv.student_uid=? AND (slv.semester=r.semester OR r.semester IS NULL) AND (slv.verband=r.verband OR r.verband IS NULL OR r.verband='' OR r.verband='0') AND (slv.gruppe=r.gruppe OR r.gruppe IS NULL OR r.gruppe ='' OR r.gruppe ='0') AND r.gruppe_kurzbz IS NULL 
+			LEFT JOIN public.tbl_studiensemester ss2 ON slv.studiensemester_kurzbz = ss2.studiensemester_kurzbz AND ss2.start <=r.datum AND ss2.ende >= r.datum 
+			JOIN lehre.tbl_stunde ON lehre.tbl_stunde.stunde = r.stunde
+			WHERE datum >= ? AND datum <= ? AND (ss1.studiensemester_kurzbz IS NOT NULL
+			OR ss2.studiensemester_kurzbz IS NOT NULL)";
+		
+		$raum_reservierungen = "SELECT res.*, beginn, ende,
+			CASE
+				WHEN res.gruppe_kurzbz IS NOT NULL THEN res.gruppe_kurzbz 
+				ELSE CONCAT(UPPER(studg.typ),UPPER(studg.kurzbz),'-',COALESCE(CAST(res.semester AS varchar),'/'),COALESCE(CAST(res.verband AS varchar),'/')) 
+			END as gruppen_kuerzel
+
+			FROM lehre.vw_reservierung res
+			JOIN public.tbl_studiengang studg ON studg.studiengang_kz=res.studiengang_kz
+			JOIN lehre.tbl_stunde ON lehre.tbl_stunde.stunde = res.stunde
+			WHERE res.ort_kurzbz = ? AND datum >= ? AND datum <= ?";
+
+			
 
 		$raum_reservierungen= $this->execReadOnlyQuery("
 		SELECT 
@@ -32,23 +55,13 @@ class Reservierung_model extends DB_Model
 		
 		FROM 
 		(
-			SELECT res.*, beginn, ende,
-			CASE
-				WHEN res.gruppe_kurzbz IS NOT NULL THEN res.gruppe_kurzbz 
-				ELSE CONCAT(UPPER(studg.typ),UPPER(studg.kurzbz),'-',COALESCE(CAST(res.semester AS varchar),'/'),COALESCE(CAST(res.verband AS varchar),'/')) 
-			END as gruppen_kuerzel
-
-			FROM lehre.vw_reservierung res
-			JOIN public.tbl_studiengang studg ON studg.studiengang_kz=res.studiengang_kz
-			JOIN lehre.tbl_stunde ON lehre.tbl_stunde.stunde = res.stunde
-			WHERE res.ort_kurzbz = ? AND datum >= ? AND datum <= ?
-
+			". is_null($ort_kurzbz)? $stundenplan_reservierungen:$raum_reservierungen ."
 		) AS subquery
 
 		GROUP BY datum, beginn, ende, ort_kurzbz, titel, beschreibung
 		
 		ORDER BY datum, beginn
-		", [$ort_kurzbz, $start_date, $end_date]);
+		", is_null($ort_kurzbz) ?[getAuthUID(), getAuthUID(),$start_date,$end_date]: [$ort_kurzbz, $start_date, $end_date]);
 
 		if(isError($raum_reservierungen)){
 			show_error(getError($raum_reservierungen));
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 845b114eb..6f291d743 100755
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -148,8 +148,9 @@ class Stundenplan_model extends DB_Model
 		CONCAT(lehrfach,'-',lehrform) as topic,
 		array_agg(DISTINCT lektor) as lektor,
 		array_agg(DISTINCT (gruppe,verband,semester,studiengang_kz,gruppen_kuerzel)) as gruppe,
+		string_agg(DISTINCT ort_kurzbz, '/') as ort_kurzbz,
 		
-		ort_kurzbz, titel, lehrfach, lehrform, lehrfach_bez, organisationseinheit, farbe
+		titel, lehrfach, lehrform, lehrfach_bez, organisationseinheit, farbe
 
 		FROM
 		(
@@ -243,7 +244,7 @@ class Stundenplan_model extends DB_Model
 	 * 
 	 * @return string
 	 */
-	public function getStundenPlanQuery($uid){
+	public function getStundenplanQuery($uid, $start_date, $end_date){
 			return 
 			"select sp.*
 			from lehre.vw_stundenplan sp
@@ -252,7 +253,9 @@ class Stundenplan_model extends DB_Model
 			left join public.tbl_studentlehrverband slv ON sp.studiengang_kz=slv.studiengang_kz and slv.student_uid=".$this->escape($uid)." and (slv.semester=sp.semester OR sp.semester IS NULL) AND (slv.verband=sp.verband OR sp.verband IS NULL OR sp.verband='' OR sp.verband='0') AND
 			(slv.gruppe=sp.gruppe OR sp.gruppe IS NULL OR sp.gruppe='' OR sp.gruppe='0') AND sp.gruppe_kurzbz IS NULL
 			left join public.tbl_studiensemester ss2 ON slv.studiensemester_kurzbz=ss2.studiensemester_kurzbz AND ss2.start<=sp.datum and ss2.ende >= sp.datum
-			WHERE ss1.studiensemester_kurzbz IS NOT NULL or ss2.studiensemester_kurzbz IS NOT NULL";
+			WHERE ss1.studiensemester_kurzbz IS NOT NULL or ss2.studiensemester_kurzbz IS NOT NULL
+			AND sp.datum >= ".$this->escape($start_date)." 
+			AND sp.datum <= ".$this->escape($end_date);
 	}
 
 	/**
diff --git a/public/js/api/stundenplan.js b/public/js/api/stundenplan.js
index a522ef3ca..1e06d3d8c 100644
--- a/public/js/api/stundenplan.js
+++ b/public/js/api/stundenplan.js
@@ -6,16 +6,28 @@ export default {
 			{  ort_kurzbz, start_date, end_date}
 		);
 	},
+	getStundenplan(start_date, end_date) {
+		return this.$fhcApi.get(
+			'/api/frontend/v1/Stundenplan/getStundenplan',
+			{ start_date, end_date }
+		);
+	},
 	getStunden() {
 		return this.$fhcApi.get(
 			'/api/frontend/v1/Stundenplan/Stunden',
 			{}
 		);
 	},
-	getReservierungen(ort_kurzbz, start_date, end_date) {
+	getOrtReservierungen(ort_kurzbz, start_date, end_date) {
+		return this.$fhcApi.get(
+			`/api/frontend/v1/Stundenplan/Reservierungen/${ort_kurzbz}`,
+			{ start_date, end_date}
+		);
+	},
+	getStundenplanReservierungen(start_date, end_date) {
 		return this.$fhcApi.get(
 			'/api/frontend/v1/Stundenplan/Reservierungen',
-			{  ort_kurzbz, start_date, end_date}
+			{ start_date, end_date }
 		);
 	},
 };
\ No newline at end of file
diff --git a/public/js/apps/Cis/Stundenplan.js b/public/js/apps/Cis/Stundenplan.js
index 773495c27..88ed725c2 100755
--- a/public/js/apps/Cis/Stundenplan.js
+++ b/public/js/apps/Cis/Stundenplan.js
@@ -1,53 +1,77 @@
 import FhcCalendar from "../../components/Calendar/Calendar.js";
 import Phrasen from "../../plugin/Phrasen.js";
+import CalendarDate from "../../composables/CalendarDate.js";
+
 
 const app = Vue.createApp({
-	components: {
-		FhcCalendar
-	},
 	data() {
 		return {
 			stunden: [],
-			events: null
+			events: null,
+			calendarWeek: new CalendarDate(new Date()),
+
 		}
 	},
-	created() {
-		axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/Cis/Stundenplan/Stunden').then(res => {
-			res.data.retval.forEach(std => {
-				this.stunden[std.stunde] = std; // TODO(chris): geht besser
-			});
-			axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/Cis/Stundenplan').then(res => {
-				let events;
-				if (res.data.retval && res.data.retval.forEach) {
-					res.data.retval.forEach((el, i) => {
-						el.id = i;
-						el.color = '#' + (el.farbe || 'CCCCCC');
-						el.start = new Date(el.datum + ' ' + this.stunden[el.stunde].beginn);
-						el.end = new Date(el.datum + ' ' + this.stunden[el.stunde].ende);
-						el.title = el.lehrfach;
-						if (el.lehrform)
-							el.title += '-' + el.lehrform;
-					});
-					events = res.data.retval;
-				}
-				// TODO(chris): do we need that
-				axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/Cis/Stundenplan/Reservierungen').then(res => {
-					if (res.data.retval && res.data.retval.forEach) {
-						res.data.retval.forEach((el, i) => {
-							el.id = i + events.length;
-							el.color = '#CCCCCC';
-							el.start = new Date(el.datum + ' ' + this.stunden[el.stunde].beginn);
-							el.end = new Date(el.datum + ' ' + this.stunden[el.stunde].ende);
-							el.title = el.lehrfach;
-							if (el.lehrform)
-								el.title += '-' + el.lehrform;
-						});
-						events = [...events, ...res.data.retval];
+	components: {
+		FhcCalendar
+	},
+	computed:{
+		weekFirstDay: function () {
+			return this.calendarDateToString(this.calendarWeek.cdFirstDayOfWeek);
+		},
+		weekLastDay: function () {
+			return this.calendarDateToString(this.calendarWeek.cdLastDayOfWeek);
+		},
+	},
+	methods:{
+
+		calendarDateToString: function (calendarDate) {
+
+			return calendarDate instanceof CalendarDate ?
+				[calendarDate.y, calendarDate.m + 1, calendarDate.d].join('-') :
+				null;
+
+		},
+
+		loadEvents: function(){
+			console.log("this are the days with which i am testing", this.weekFirstDay, this.weekLastDay)
+			Promise.allSettled([
+				this.$fhcApi.factory.stundenplan.getStundenplan(this.weekFirstDay, this.weekLastDay),
+				this.$fhcApi.factory.stundenplan.getStundenplanReservierungen(this.weekFirstDay, this.weekLastDay)
+			]).then((result) => {
+				let promise_events = [];
+				result.forEach((promise_result) => {
+					if (promise_result.status === 'fulfilled' && promise_result.value.meta.status === "success") {
+
+						let data = promise_result.value.data;
+						// adding additional information to the events 
+						if (data && data.forEach) {
+
+							data.forEach((el, i) => {
+								el.id = i;
+								if (el.type === 'reservierung') {
+									el.color = '#' + (el.farbe || 'FFFFFF');
+								} else {
+									el.color = '#' + (el.farbe || 'CCCCCC');
+								}
+
+								el.start = new Date(el.datum + ' ' + el.beginn);
+								el.end = new Date(el.datum + ' ' + el.ende);
+
+							});
+						}
+						promise_events = promise_events.concat(data);
 					}
-					this.events = events;
-				});
+				})
+				this.events = promise_events;
 			});
-		});
+		},
+	},
+	created() {
+		this.loadEvents();
+			
+			
+		
 	},
 	template:/*html*/`
 	<h2>Stundenplan</h2>
diff --git a/public/js/components/Cis/Mylv/RoomInformation.js b/public/js/components/Cis/Mylv/RoomInformation.js
index a01af0ebc..1c5ab31e0 100644
--- a/public/js/components/Cis/Mylv/RoomInformation.js
+++ b/public/js/components/Cis/Mylv/RoomInformation.js
@@ -53,7 +53,7 @@ export default{
 			// bundles the room_events and the reservierungen together into the this.events array
 			Promise.allSettled([
 				this.$fhcApi.factory.stundenplan.getRoomInfo(this.ort_kurzbz, this.weekFirstDay, this.weekLastDay),
-				this.$fhcApi.factory.stundenplan.getReservierungen(this.ort_kurzbz, this.weekFirstDay, this.weekLastDay)
+				this.$fhcApi.factory.stundenplan.getOrtReservierungen(this.ort_kurzbz, this.weekFirstDay, this.weekLastDay)
 			]).then((result) => {
 				let events = [];
 				result.forEach((promise_result) => {

From 1de658ace6d3565cfbc99dc25cb6eccc3ca26628 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 11 Sep 2024 09:32:28 +0200
Subject: [PATCH 1193/1461] fixes the query for the reservierungen in the
 stundenplan and in the raum informations

---
 .../api/frontend/v1/Stundenplan.php           |  8 ++---
 .../models/ressource/Reservierung_model.php   | 30 +++++++++++--------
 public/js/apps/Cis/Stundenplan.js             |  1 -
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 61dc5233f..894fd6870 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -149,11 +149,9 @@ class Stundenplan extends FHCAPI_Controller
         $stunden = $this->getDataOrTerminateWithError($stunden);
 
 		// querying the reservierungen
-		if(isset($ort_kurzbz)){
-			$result = $this->ReservierungModel->getReservierungen($start_date, $end_date, $ort_kurzbz);
-		}else{
-			$result = $this->ReservierungModel->getReservierungen($start_date, $end_date);
-		}
+		
+		$result = $this->ReservierungModel->getReservierungen($start_date, $end_date, $ort_kurzbz);
+		
 
         $result = $this->getDataOrTerminateWithError($result);
 		$this->terminateWithSuccess($result);
diff --git a/application/models/ressource/Reservierung_model.php b/application/models/ressource/Reservierung_model.php
index 9a5bc6af0..727acb219 100755
--- a/application/models/ressource/Reservierung_model.php
+++ b/application/models/ressource/Reservierung_model.php
@@ -21,30 +21,34 @@ class Reservierung_model extends DB_Model
 	public function getReservierungen($start_date, $end_date, $ort_kurzbz = null)
 	{
 		
-		$stundenplan_reservierungen="SELECT r.* , beginn, ende
+		$stundenplan_reservierungen_query="SELECT r.* , stund.beginn, stund.ende,
+			CASE
+				WHEN r.gruppe_kurzbz IS NOT NULL THEN r.gruppe_kurzbz 
+				ELSE CONCAT(UPPER(studg.typ),UPPER(studg.kurzbz),'-',COALESCE(CAST(r.semester AS varchar),'/'),COALESCE(CAST(r.verband AS varchar),'/')) 
+			END as gruppen_kuerzel
 			FROM campus.vw_reservierung r
+			JOIN public.tbl_studiengang studg ON studg.studiengang_kz=r.studiengang_kz
+			JOIN lehre.tbl_stunde stund ON stund.stunde = r.stunde
 			LEFT JOIN public.tbl_benutzergruppe bg ON r.gruppe_kurzbz=bg.gruppe_kurzbz AND bg.uid=?
 			LEFT JOIN public.tbl_studiensemester ss1 ON bg.studiensemester_kurzbz=ss1.studiensemester_kurzbz AND ss1.start <= r.datum AND ss1.ende >= r.datum
 			LEFT JOIN public.tbl_studentlehrverband slv ON r.studiengang_kz=slv.studiengang_kz AND slv.student_uid=? AND (slv.semester=r.semester OR r.semester IS NULL) AND (slv.verband=r.verband OR r.verband IS NULL OR r.verband='' OR r.verband='0') AND (slv.gruppe=r.gruppe OR r.gruppe IS NULL OR r.gruppe ='' OR r.gruppe ='0') AND r.gruppe_kurzbz IS NULL 
 			LEFT JOIN public.tbl_studiensemester ss2 ON slv.studiensemester_kurzbz = ss2.studiensemester_kurzbz AND ss2.start <=r.datum AND ss2.ende >= r.datum 
-			JOIN lehre.tbl_stunde ON lehre.tbl_stunde.stunde = r.stunde
 			WHERE datum >= ? AND datum <= ? AND (ss1.studiensemester_kurzbz IS NOT NULL
 			OR ss2.studiensemester_kurzbz IS NOT NULL)";
 		
-		$raum_reservierungen = "SELECT res.*, beginn, ende,
+		$raum_reservierungen_query = "SELECT res.*, beginn, ende,
 			CASE
 				WHEN res.gruppe_kurzbz IS NOT NULL THEN res.gruppe_kurzbz 
 				ELSE CONCAT(UPPER(studg.typ),UPPER(studg.kurzbz),'-',COALESCE(CAST(res.semester AS varchar),'/'),COALESCE(CAST(res.verband AS varchar),'/')) 
 			END as gruppen_kuerzel
-
 			FROM lehre.vw_reservierung res
 			JOIN public.tbl_studiengang studg ON studg.studiengang_kz=res.studiengang_kz
 			JOIN lehre.tbl_stunde ON lehre.tbl_stunde.stunde = res.stunde
 			WHERE res.ort_kurzbz = ? AND datum >= ? AND datum <= ?";
 
-			
-
-		$raum_reservierungen= $this->execReadOnlyQuery("
+		$subquery = is_null($ort_kurzbz)? $stundenplan_reservierungen_query:$raum_reservierungen_query;
+		
+		$query_result= $this->execReadOnlyQuery("
 		SELECT 
 		'reservierung' as type, beginn, ende, datum,
 		COALESCE(titel, beschreibung) as topic,
@@ -55,7 +59,7 @@ class Reservierung_model extends DB_Model
 		
 		FROM 
 		(
-			". is_null($ort_kurzbz)? $stundenplan_reservierungen:$raum_reservierungen ."
+			". $subquery ."
 		) AS subquery
 
 		GROUP BY datum, beginn, ende, ort_kurzbz, titel, beschreibung
@@ -63,15 +67,15 @@ class Reservierung_model extends DB_Model
 		ORDER BY datum, beginn
 		", is_null($ort_kurzbz) ?[getAuthUID(), getAuthUID(),$start_date,$end_date]: [$ort_kurzbz, $start_date, $end_date]);
 
-		if(isError($raum_reservierungen)){
-			show_error(getError($raum_reservierungen));
+		if(isError($query_result)){
+			show_error(getError($query_result));
 		}
 
-		$raum_reservierungen = getData($raum_reservierungen) ?? [];
+		$query_result = getData($query_result) ?? [];
 		
 		$this->load->model("ressrouce/Mitarbeiter_model","MitarbeiterModel");
 
-		foreach($raum_reservierungen as $reservierung){
+		foreach($query_result as $reservierung){
 
 			$lektor_obj_array = array();
 			$gruppe_obj_array = array();
@@ -114,7 +118,7 @@ class Reservierung_model extends DB_Model
 			$reservierung->lektor = $lektor_obj_array;
 			
 		}
-		return success($raum_reservierungen);
+		return success($query_result);
 	}
 
 	/**
diff --git a/public/js/apps/Cis/Stundenplan.js b/public/js/apps/Cis/Stundenplan.js
index 88ed725c2..13315abb6 100755
--- a/public/js/apps/Cis/Stundenplan.js
+++ b/public/js/apps/Cis/Stundenplan.js
@@ -34,7 +34,6 @@ const app = Vue.createApp({
 		},
 
 		loadEvents: function(){
-			console.log("this are the days with which i am testing", this.weekFirstDay, this.weekLastDay)
 			Promise.allSettled([
 				this.$fhcApi.factory.stundenplan.getStundenplan(this.weekFirstDay, this.weekLastDay),
 				this.$fhcApi.factory.stundenplan.getStundenplanReservierungen(this.weekFirstDay, this.weekLastDay)

From ac35ba3e275d20af97880818c2e7b5b7cb9ef7e4 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 11 Sep 2024 09:50:04 +0200
Subject: [PATCH 1194/1461] puts the logic that adds the object informtion to
 the json reponse in the controllers instead of the models

---
 .../api/frontend/v1/Stundenplan.php           | 113 +++++++++++++++---
 .../models/ressource/Reservierung_model.php   |  52 +-------
 .../models/ressource/Stundenplan_model.php    |  57 +--------
 3 files changed, 101 insertions(+), 121 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 894fd6870..54c6a50e8 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -104,6 +104,12 @@ class Stundenplan extends FHCAPI_Controller
 	 */
 	public function getStundenplan(){
 
+		$this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
+		$this->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+		$this->load->model('person/Benutzer_model', 'BenutzerModel');
+
 		// form validation
 		$this->load->library('form_validation');
 		$this->form_validation->set_data($_GET);
@@ -116,11 +122,51 @@ class Stundenplan extends FHCAPI_Controller
 		$start_date = $this->input->get('start_date', TRUE);
 		$end_date = $this->input->get('end_date', TRUE);
 		
-		$this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
-
 		// the stundenplan query needs the uid and a start and end date
 		$stundenplan_data = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getStundenplanQuery(get_uid(),$start_date,$end_date)); 
-		$stundenplan_data = $this->getDataOrTerminateWithError($stundenplan_data);
+		$stundenplan_data = $this->getDataOrTerminateWithError($stundenplan_data) ?? [];
+
+		// get the benutzer object for the lektor of the lv	
+		foreach ($stundenplan_data as $item) {
+			$lektor_obj_array = array();
+			$gruppe_obj_array = array();
+
+			// load lektor object
+			foreach ($item->lektor as $lv_lektor) {
+				$this->StundenplanModel->addLimit(1);
+				$lektor_object = $this->StundenplanModel->execReadOnlyQuery("
+				SELECT mitarbeiter_uid, vorname, nachname, kurzbz 
+				FROM public.tbl_mitarbeiter 
+				JOIN public.tbl_benutzer benutzer ON benutzer.uid = mitarbeiter_uid
+				JOIN public.tbl_person person ON person.person_id = benutzer.person_id 
+				WHERE kurzbz = ?", [$lv_lektor]);
+				if (isError($lektor_object)) {
+					$this->show_error(getError($lektor_object));
+				}
+				$lektor_object = current(getData($lektor_object));
+				// only provide needed information of the mitarbeiter object 
+				$lektor_obj_array[] = $lektor_object;
+			}
+
+			// load gruppe object
+			foreach ($item->gruppe as $lv_gruppe) {
+				$lv_gruppe = strtr($lv_gruppe, ['(' => '', ')' => '', '"' => '']);
+				$lv_gruppe_array = explode(",", $lv_gruppe);
+				list($gruppe, $verband, $semester, $studiengang_kz, $gruppen_kuerzel) = $lv_gruppe_array;
+
+				$lv_gruppe_object = new stdClass();
+				$lv_gruppe_object->gruppe = $gruppe;
+				$lv_gruppe_object->verband = $verband;
+				$lv_gruppe_object->semester = $semester;
+				$lv_gruppe_object->studiengang_kz = $studiengang_kz;
+				$lv_gruppe_object->kuerzel = $gruppen_kuerzel;
+
+				$gruppe_obj_array[] = $lv_gruppe_object;
+			}
+
+			$item->lektor = $lektor_obj_array;
+			$item->gruppe = $gruppe_obj_array;
+		}
 		
 		$this->terminateWithSuccess($stundenplan_data);
 	}
@@ -129,8 +175,7 @@ class Stundenplan extends FHCAPI_Controller
     public function Reservierungen($ort_kurzbz = null)
 	{
         $this->load->model('ressource/Reservierung_model', 'ReservierungModel');
-        $this->load->model('ressource/Stunde_model', 'StundeModel');
-        $this->load->model('ressource/Mitarbeiter_model','MitarbeiterModel');
+		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
 
 		//form validation
 		$this->load->library('form_validation');
@@ -143,18 +188,56 @@ class Stundenplan extends FHCAPI_Controller
         $start_date = $this->input->get('start_date', TRUE);
         $end_date = $this->input->get('end_date', TRUE);
 
-        // querying the stunden
-        $stunden = $this->StundeModel->load();
-
-        $stunden = $this->getDataOrTerminateWithError($stunden);
-
 		// querying the reservierungen
-		
-		$result = $this->ReservierungModel->getReservierungen($start_date, $end_date, $ort_kurzbz);
-		
+		$reservierungen = $this->ReservierungModel->getReservierungen($start_date, $end_date, $ort_kurzbz);
 
-        $result = $this->getDataOrTerminateWithError($result);
-		$this->terminateWithSuccess($result);
+        $reservierungen = $this->getDataOrTerminateWithError($reservierungen) ?? [];
+
+		foreach ($reservierungen as $reservierung) {
+
+			$lektor_obj_array = array();
+			$gruppe_obj_array = array();
+
+			// load lektor object
+			foreach ($reservierung->lektor as $lektor) {
+				$this->MitarbeiterModel->addLimit(1);
+				$lektor_object = $this->MitarbeiterModel->execReadOnlyQuery("
+				SELECT mitarbeiter_uid, vorname, nachname, kurzbz 
+				FROM public.tbl_mitarbeiter 
+				JOIN public.tbl_benutzer benutzer ON benutzer.uid = mitarbeiter_uid
+				JOIN public.tbl_person person ON person.person_id = benutzer.person_id 
+				WHERE mitarbeiter_uid = ?", [$lektor]);
+				if (isError($lektor_object)) {
+					$this->show_error(getError($lektor_object));
+				}
+				$lektor_object = current(getData($lektor_object));
+				// only provide needed information of the mitarbeiter object 
+				$lektor_obj_array[] = $lektor_object;
+			}
+
+			// load gruppe object
+			foreach ($reservierung->gruppe as $lv_gruppe) {
+				$lv_gruppe = strtr($lv_gruppe, ['(' => '', ')' => '', '"' => '']);
+				$lv_gruppe_array = explode(",", $lv_gruppe);
+				list($gruppe, $verband, $semester, $studiengang_kz, $gruppen_kuerzel) = $lv_gruppe_array;
+
+				$lv_gruppe_object = new stdClass();
+				$lv_gruppe_object->gruppe = $gruppe;
+				$lv_gruppe_object->verband = $verband;
+				$lv_gruppe_object->semester = $semester;
+				$lv_gruppe_object->studiengang_kz = $studiengang_kz;
+				$lv_gruppe_object->kuerzel = $gruppen_kuerzel;
+
+				$gruppe_obj_array[] = $lv_gruppe_object;
+			}
+
+
+			$reservierung->gruppe = $gruppe_obj_array;
+			$reservierung->lektor = $lektor_obj_array;
+
+		}
+
+		$this->terminateWithSuccess($reservierungen);
         
 	}
 
diff --git a/application/models/ressource/Reservierung_model.php b/application/models/ressource/Reservierung_model.php
index 727acb219..3247b173f 100755
--- a/application/models/ressource/Reservierung_model.php
+++ b/application/models/ressource/Reservierung_model.php
@@ -67,58 +67,8 @@ class Reservierung_model extends DB_Model
 		ORDER BY datum, beginn
 		", is_null($ort_kurzbz) ?[getAuthUID(), getAuthUID(),$start_date,$end_date]: [$ort_kurzbz, $start_date, $end_date]);
 
-		if(isError($query_result)){
-			show_error(getError($query_result));
-		}
-
-		$query_result = getData($query_result) ?? [];
 		
-		$this->load->model("ressrouce/Mitarbeiter_model","MitarbeiterModel");
-
-		foreach($query_result as $reservierung){
-
-			$lektor_obj_array = array();
-			$gruppe_obj_array = array();
-
-			// load lektor object
-			foreach ($reservierung->lektor as $lektor) {
-				$this->MitarbeiterModel->addLimit(1);
-				$lektor_object = $this->execReadOnlyQuery("
-				SELECT mitarbeiter_uid, vorname, nachname, kurzbz 
-				FROM public.tbl_mitarbeiter 
-				JOIN public.tbl_benutzer benutzer ON benutzer.uid = mitarbeiter_uid
-				JOIN public.tbl_person person ON person.person_id = benutzer.person_id 
-				WHERE mitarbeiter_uid = ?", [$lektor]);
-				if (isError($lektor_object)) {
-					$this->show_error(getError($lektor_object));
-				}
-				$lektor_object = current(getData($lektor_object));
-				// only provide needed information of the mitarbeiter object 
-				$lektor_obj_array[] = $lektor_object;
-			}
-
-			// load gruppe object
-			foreach ($reservierung->gruppe as $lv_gruppe) {
-				$lv_gruppe = strtr($lv_gruppe, ['(' => '', ')' => '', '"' => '']);
-				$lv_gruppe_array = explode(",", $lv_gruppe);
-				list($gruppe, $verband, $semester, $studiengang_kz, $gruppen_kuerzel) = $lv_gruppe_array;
-
-				$lv_gruppe_object = new stdClass();
-				$lv_gruppe_object->gruppe = $gruppe;
-				$lv_gruppe_object->verband = $verband;
-				$lv_gruppe_object->semester = $semester;
-				$lv_gruppe_object->studiengang_kz = $studiengang_kz;
-				$lv_gruppe_object->kuerzel = $gruppen_kuerzel;
-
-				$gruppe_obj_array[] = $lv_gruppe_object;
-			}
-
-
-			$reservierung->gruppe = $gruppe_obj_array;
-			$reservierung->lektor = $lektor_obj_array;
-			
-		}
-		return success($query_result);
+		return $query_result;
 	}
 
 	/**
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 6f291d743..300794099 100755
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -142,7 +142,7 @@ class Stundenplan_model extends DB_Model
 	 */
 	public function stundenplanGruppierung($stundenplanViewQuery)
 	{
-		$gruppierteEvents = $this->execReadOnlyQuery("
+		$query_result = $this->execReadOnlyQuery("
 		SELECT 
 		'lehreinheit' as type, beginn, ende, datum,	
 		CONCAT(lehrfach,'-',lehrform) as topic,
@@ -182,60 +182,7 @@ class Stundenplan_model extends DB_Model
 		ORDER BY datum, beginn
 		");
 
-		if(isError($gruppierteEvents)){
-			$this->output(getError($gruppierteEvents));
-		}
-		
-		$gruppierteEvents = getData($gruppierteEvents) ?? [];
-
-		// get the benutzer object for the lektor of the lv	
-		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
-		$this->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-		$this->load->model('person/Benutzer_model', 'BenutzerModel');
-		
-		foreach ($gruppierteEvents as $item) {
-			$lektor_obj_array = array();
-			$gruppe_obj_array = array();
-
-			// load lektor object
-			foreach ($item->lektor as $lv_lektor) {
-				$this->MitarbeiterModel->addLimit(1);
-				$lektor_object = $this->execReadOnlyQuery("
-				SELECT mitarbeiter_uid, vorname, nachname, kurzbz 
-				FROM public.tbl_mitarbeiter 
-				JOIN public.tbl_benutzer benutzer ON benutzer.uid = mitarbeiter_uid
-				JOIN public.tbl_person person ON person.person_id = benutzer.person_id 
-				WHERE kurzbz = ?",[$lv_lektor]);
-				if (isError($lektor_object)) {
-					$this->show_error(getError($lektor_object));
-				}
-				$lektor_object = current(getData($lektor_object));
-				// only provide needed information of the mitarbeiter object 
-				$lektor_obj_array[] = $lektor_object;
-			}
-
-			// load gruppe object
-			foreach ($item->gruppe as $lv_gruppe) {
-				$lv_gruppe = strtr($lv_gruppe, ['(' => '', ')' => '', '"' => '']);
-				$lv_gruppe_array = explode(",", $lv_gruppe);
-				list($gruppe, $verband, $semester, $studiengang_kz, $gruppen_kuerzel) = $lv_gruppe_array;
-				
-				$lv_gruppe_object = new stdClass();
-				$lv_gruppe_object->gruppe = $gruppe;
-				$lv_gruppe_object->verband = $verband;
-				$lv_gruppe_object->semester = $semester;
-				$lv_gruppe_object->studiengang_kz = $studiengang_kz;
-				$lv_gruppe_object->kuerzel = $gruppen_kuerzel;
-				
-				$gruppe_obj_array[] = $lv_gruppe_object;
-			}
-
-			$item->lektor = $lektor_obj_array;
-			$item->gruppe = $gruppe_obj_array;
-		}
-
-		return success($gruppierteEvents);
+		return $query_result;
 	}
 
 	/**

From f2a57f85a8c13cda9ad04e24f0e9dc08e446906a Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 11 Sep 2024 10:19:46 +0200
Subject: [PATCH 1195/1461] fixes the errors with the
 stundenplan/reservierungen data query

---
 .../api/frontend/v1/Stundenplan.php           | 132 ++++++------------
 .../models/ressource/Reservierung_model.php   |   4 +-
 public/js/apps/Cis/Stundenplan.js             |   4 +-
 .../js/components/Cis/Mylv/RoomInformation.js |   2 +-
 4 files changed, 50 insertions(+), 92 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 54c6a50e8..398b4e4cc 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -44,6 +44,12 @@ class Stundenplan extends FHCAPI_Controller
 		));
 
         $this->load->library('form_validation');
+
+		//load models
+		$this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+		$this->load->model('ressource/Reservierung_model', 'ReservierungModel');
+
+
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
@@ -72,10 +78,6 @@ class Stundenplan extends FHCAPI_Controller
      */
 	public function getRoomplan()
 	{
-       
-        $this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
-		$this->load->model('ressource/Stunde_model', 'StundeModel');
-		
         // form validation
         $this->load->library('form_validation');
         $this->form_validation->set_data($_GET);
@@ -89,11 +91,13 @@ class Stundenplan extends FHCAPI_Controller
         $start_date = $this->input->get('start_date', TRUE);
         $end_date = $this->input->get('end_date', TRUE);
 
-		$result = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getRoomQuery($ort_kurzbz, $start_date, $end_date));  
+		$roomplan_data = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getRoomQuery($ort_kurzbz, $start_date, $end_date));  
 		
-        $result = $this->getDataOrTerminateWithError($result);
+        $roomplan_data = $this->getDataOrTerminateWithError($roomplan_data);
 
-		$this->terminateWithSuccess($result);
+		$this->expand_object_information($roomplan_data);
+
+		$this->terminateWithSuccess($roomplan_data);
 		
 	}
 
@@ -104,12 +108,6 @@ class Stundenplan extends FHCAPI_Controller
 	 */
 	public function getStundenplan(){
 
-		$this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
-		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
-		$this->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-		$this->load->model('person/Benutzer_model', 'BenutzerModel');
-
 		// form validation
 		$this->load->library('form_validation');
 		$this->form_validation->set_data($_GET);
@@ -126,8 +124,39 @@ class Stundenplan extends FHCAPI_Controller
 		$stundenplan_data = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getStundenplanQuery(get_uid(),$start_date,$end_date)); 
 		$stundenplan_data = $this->getDataOrTerminateWithError($stundenplan_data) ?? [];
 
-		// get the benutzer object for the lektor of the lv	
-		foreach ($stundenplan_data as $item) {
+		$this->expand_object_information($stundenplan_data);
+		
+		$this->terminateWithSuccess($stundenplan_data);
+	}
+
+	// gets the reservierungen of a room if the ort_kurzbz parameter is supplied otherwise gets the reservierungen of the stundenplan of a student
+    public function Reservierungen($ort_kurzbz = null)
+	{
+		//form validation
+		$this->load->library('form_validation');
+		$this->form_validation->set_data($_GET);
+		$this->form_validation->set_rules('start_date', "StartDate", "required");
+		$this->form_validation->set_rules('end_date', "EndDate", "required");
+		if($this->form_validation->run() == FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
+
+        // storing the get parameter in local variables
+        $start_date = $this->input->get('start_date', TRUE);
+        $end_date = $this->input->get('end_date', TRUE);
+
+		// querying the reservierungen
+		$reservierungen = $this->ReservierungModel->getReservierungen($start_date, $end_date, $ort_kurzbz);
+
+        $reservierungen = $this->getDataOrTerminateWithError($reservierungen) ?? [];
+
+		$this->expand_object_information($reservierungen);
+
+		$this->terminateWithSuccess($reservierungen);
+        
+	}
+
+	private function expand_object_information($data){
+		foreach ($data as $item) {
+
 			$lektor_obj_array = array();
 			$gruppe_obj_array = array();
 
@@ -164,81 +193,10 @@ class Stundenplan extends FHCAPI_Controller
 				$gruppe_obj_array[] = $lv_gruppe_object;
 			}
 
-			$item->lektor = $lektor_obj_array;
 			$item->gruppe = $gruppe_obj_array;
-		}
-		
-		$this->terminateWithSuccess($stundenplan_data);
-	}
-
-	// gets the reservierungen of a room if the ort_kurzbz parameter is supplied otherwise gets the reservierungen of the stundenplan of a student
-    public function Reservierungen($ort_kurzbz = null)
-	{
-        $this->load->model('ressource/Reservierung_model', 'ReservierungModel');
-		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
-
-		//form validation
-		$this->load->library('form_validation');
-		$this->form_validation->set_data($_GET);
-		$this->form_validation->set_rules('start_date', "StartDate", "required");
-		$this->form_validation->set_rules('end_date', "EndDate", "required");
-		if($this->form_validation->run() == FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
-
-        // storing the get parameter in local variables
-        $start_date = $this->input->get('start_date', TRUE);
-        $end_date = $this->input->get('end_date', TRUE);
-
-		// querying the reservierungen
-		$reservierungen = $this->ReservierungModel->getReservierungen($start_date, $end_date, $ort_kurzbz);
-
-        $reservierungen = $this->getDataOrTerminateWithError($reservierungen) ?? [];
-
-		foreach ($reservierungen as $reservierung) {
-
-			$lektor_obj_array = array();
-			$gruppe_obj_array = array();
-
-			// load lektor object
-			foreach ($reservierung->lektor as $lektor) {
-				$this->MitarbeiterModel->addLimit(1);
-				$lektor_object = $this->MitarbeiterModel->execReadOnlyQuery("
-				SELECT mitarbeiter_uid, vorname, nachname, kurzbz 
-				FROM public.tbl_mitarbeiter 
-				JOIN public.tbl_benutzer benutzer ON benutzer.uid = mitarbeiter_uid
-				JOIN public.tbl_person person ON person.person_id = benutzer.person_id 
-				WHERE mitarbeiter_uid = ?", [$lektor]);
-				if (isError($lektor_object)) {
-					$this->show_error(getError($lektor_object));
-				}
-				$lektor_object = current(getData($lektor_object));
-				// only provide needed information of the mitarbeiter object 
-				$lektor_obj_array[] = $lektor_object;
-			}
-
-			// load gruppe object
-			foreach ($reservierung->gruppe as $lv_gruppe) {
-				$lv_gruppe = strtr($lv_gruppe, ['(' => '', ')' => '', '"' => '']);
-				$lv_gruppe_array = explode(",", $lv_gruppe);
-				list($gruppe, $verband, $semester, $studiengang_kz, $gruppen_kuerzel) = $lv_gruppe_array;
-
-				$lv_gruppe_object = new stdClass();
-				$lv_gruppe_object->gruppe = $gruppe;
-				$lv_gruppe_object->verband = $verband;
-				$lv_gruppe_object->semester = $semester;
-				$lv_gruppe_object->studiengang_kz = $studiengang_kz;
-				$lv_gruppe_object->kuerzel = $gruppen_kuerzel;
-
-				$gruppe_obj_array[] = $lv_gruppe_object;
-			}
-
-
-			$reservierung->gruppe = $gruppe_obj_array;
-			$reservierung->lektor = $lektor_obj_array;
+			$item->lektor = $lektor_obj_array;
 
 		}
-
-		$this->terminateWithSuccess($reservierungen);
-        
 	}
 
     
diff --git a/application/models/ressource/Reservierung_model.php b/application/models/ressource/Reservierung_model.php
index 3247b173f..fdfc9926b 100755
--- a/application/models/ressource/Reservierung_model.php
+++ b/application/models/ressource/Reservierung_model.php
@@ -41,7 +41,7 @@ class Reservierung_model extends DB_Model
 				WHEN res.gruppe_kurzbz IS NOT NULL THEN res.gruppe_kurzbz 
 				ELSE CONCAT(UPPER(studg.typ),UPPER(studg.kurzbz),'-',COALESCE(CAST(res.semester AS varchar),'/'),COALESCE(CAST(res.verband AS varchar),'/')) 
 			END as gruppen_kuerzel
-			FROM lehre.vw_reservierung res
+			FROM campus.vw_reservierung res
 			JOIN public.tbl_studiengang studg ON studg.studiengang_kz=res.studiengang_kz
 			JOIN lehre.tbl_stunde ON lehre.tbl_stunde.stunde = res.stunde
 			WHERE res.ort_kurzbz = ? AND datum >= ? AND datum <= ?";
@@ -52,7 +52,7 @@ class Reservierung_model extends DB_Model
 		SELECT 
 		'reservierung' as type, beginn, ende, datum,
 		COALESCE(titel, beschreibung) as topic,
-		array_agg(DISTINCT uid) as lektor,
+		array_agg(DISTINCT mitarbeiter_kurzbz) as lektor,
 		array_agg(DISTINCT (gruppe,verband,semester,studiengang_kz,gruppen_kuerzel)) as gruppe, 
 		
 		ort_kurzbz, 'FFFFFF' as farbe
diff --git a/public/js/apps/Cis/Stundenplan.js b/public/js/apps/Cis/Stundenplan.js
index 13315abb6..a38208275 100755
--- a/public/js/apps/Cis/Stundenplan.js
+++ b/public/js/apps/Cis/Stundenplan.js
@@ -76,8 +76,8 @@ const app = Vue.createApp({
 	<h2>Stundenplan</h2>
 	<hr>
 	<fhc-calendar v-slot="{event, day}" :events="events" initial-mode="week" show-weeks>
-		<div class="d-flex flex-column align-items-center justify-content-evenly h-100">
-			<span>{{event.orig.title}}</span>
+		<div type="button" class="d-flex flex-column align-items-center justify-content-evenly h-100">
+			<span>{{event.orig.topic}}</span>
 			<span v-for="lektor in event.orig.lektor">{{lektor.kurzbz}}</span>
 			<span>{{event.orig.ort_kurzbz}}</span>
 		</div>
diff --git a/public/js/components/Cis/Mylv/RoomInformation.js b/public/js/components/Cis/Mylv/RoomInformation.js
index 1c5ab31e0..236b84efd 100644
--- a/public/js/components/Cis/Mylv/RoomInformation.js
+++ b/public/js/components/Cis/Mylv/RoomInformation.js
@@ -87,7 +87,7 @@ export default{
     <div>
 		<fhc-calendar @change:range="updateRange" v-slot="{event,day}" :initialDate="currentDate" :events="events" initial-mode="week" show-weeks>
             <a class="text-decoration-none text-dark" href="#" :title="event.orig.title + ' - ' + event.orig.lehrfach_bez + ' [' + event.orig.ort_kurzbz+']'"   >
-                <div class="d-flex flex-column align-items-center justify-content-evenly h-100" >
+                <div type="button" class="d-flex flex-column align-items-center justify-content-evenly h-100" >
 
                         <!-- render content for stundenplan -->
                         <span >{{event.orig.topic}}</span>

From 8860d9a598c2a83f09b35bdc68a26bd0fe103b23 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 11 Sep 2024 11:26:04 +0200
Subject: [PATCH 1196/1461] adds quick fix for the query builder error that
 comes up when fetching content

---
 application/controllers/api/frontend/v1/Cms.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/application/controllers/api/frontend/v1/Cms.php b/application/controllers/api/frontend/v1/Cms.php
index afebe3995..1c2920dc6 100644
--- a/application/controllers/api/frontend/v1/Cms.php
+++ b/application/controllers/api/frontend/v1/Cms.php
@@ -130,7 +130,9 @@ class Cms extends FHCAPI_Controller
 		// collect the content of the news
 		foreach($news as $news_element){
 			$this->addMeta("content_id",$news_element->content_id);
-
+			
+			//todo: quick fix, for query builder error when fetching content
+			$this->NewsModel->resetQuery();
 			$content = $this->cmslib->getContent($news_element->content_id);
 
 			$content = $this->getDataOrTerminateWithError($content);

From aef267186f290904bf3ae72d3448145af62c44f1 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 11 Sep 2024 13:56:39 +0200
Subject: [PATCH 1197/1461] removes typo and debugging print from Calendar.js

---
 public/js/components/Calendar/Calendar.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/public/js/components/Calendar/Calendar.js b/public/js/components/Calendar/Calendar.js
index 5c1bab5c7..313ec54bf 100755
--- a/public/js/components/Calendar/Calendar.js
+++ b/public/js/components/Calendar/Calendar.js
@@ -104,9 +104,8 @@ export default {
 	},
 	methods: {
 		handleInput(day) {
-			// set the event when clicking on the lernveranstaltung in the data 
+			// set the event when clicking on the lehrveranstaltung in the data 
 			this.currentlySelectedEvent = day[1];
-			console.log(this.currentlySelectedEvent)
 			// showing the modal
 			Vue.nextTick(()=>{
 				this.$refs.calendarModal.show();

From 04aaefd5d82626dbf675a02e6923779052829820 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 11 Sep 2024 14:00:53 +0200
Subject: [PATCH 1198/1461] refetches the Stundenplan events also for the
 Stundenplan and not only for the roomplan

---
 application/models/content/Content_model.php |  9 ---------
 public/js/apps/Cis/Stundenplan.js            | 15 ++++++++-------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/application/models/content/Content_model.php b/application/models/content/Content_model.php
index c703ee3c1..ed447b36a 100755
--- a/application/models/content/Content_model.php
+++ b/application/models/content/Content_model.php
@@ -165,15 +165,6 @@ class Content_model extends DB_Model
 						"menu_open": false,
 						"aktiv": true,
 						"childs": []
-					},
-					{
-						"content_id": 1000008,
-						"template_kurzbz": "redirect",
-						"titel": "room information (to delete)",
-						"content": "<content><url><![CDATA[' . site_url('/CisVue/Cms/getRoomInformation/EDV_F4.26') . ']]></url><target><![CDATA[]]></target></content>",
-						"menu_open": false,
-						"aktiv": true,
-						"childs": []
 					}
 					
 				]
diff --git a/public/js/apps/Cis/Stundenplan.js b/public/js/apps/Cis/Stundenplan.js
index 57b4f7867..0342bb9d2 100755
--- a/public/js/apps/Cis/Stundenplan.js
+++ b/public/js/apps/Cis/Stundenplan.js
@@ -26,6 +26,13 @@ const app = Vue.createApp({
 	},
 	methods:{
 
+		updateRange: function (data) {
+			this.calendarWeek = new CalendarDate(data.start);
+			Vue.nextTick(() => {
+				this.loadEvents();
+			});
+		},
+
 		calendarDateToString: function (calendarDate) {
 
 			return calendarDate instanceof CalendarDate ?
@@ -66,17 +73,11 @@ const app = Vue.createApp({
 				this.events = promise_events;
 			});
 		},
-	},
-	created() {
-		this.loadEvents();
-			
-			
-		
 	},
 	template:/*html*/`
 	<h2>Stundenplan</h2>
 	<hr>
-	<fhc-calendar v-slot="{event, day}" :events="events" initial-mode="week" show-weeks>
+	<fhc-calendar @change:range="updateRange" v-slot="{event, day}" :events="events" initial-mode="week" show-weeks>
 		<div type="button" class="d-flex flex-column align-items-center justify-content-evenly h-100">
 			<span>{{event.orig.topic}}</span>
 			<span v-for="lektor in event.orig.lektor">{{lektor.kurzbz}}</span>

From b2dbe6573962888eec1eb835a44e4503d6cbfd68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Wed, 11 Sep 2024 14:32:47 +0200
Subject: [PATCH 1199/1461] Berechtigungen korrigiert beim Setzen von Unruly
 People

---
 .../api/frontend/v1/unrulyperson/UnrulyPerson.php           | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/application/controllers/api/frontend/v1/unrulyperson/UnrulyPerson.php b/application/controllers/api/frontend/v1/unrulyperson/UnrulyPerson.php
index b25e3dd02..17289cabe 100644
--- a/application/controllers/api/frontend/v1/unrulyperson/UnrulyPerson.php
+++ b/application/controllers/api/frontend/v1/unrulyperson/UnrulyPerson.php
@@ -20,12 +20,10 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 class UnrulyPerson extends FHCAPI_Controller
 {
-
-	// TODO: BERECHTIGUNGEN
 	public function __construct()
 	{
 		parent::__construct([
-			'updatePersonUnrulyStatus' => array('basis/mitarbeiter:rw', 'student/antragfreigabe:rw', 'student/anrechnung:rw' , 'student/studierendenantrag:rw')
+			'updatePersonUnrulyStatus' => array('basis/mitarbeiter:rw', 'student/antragfreigabe:rw', 'student/studierendenantrag:rw')
 		]);
 
 		$this->_ci =& get_instance();
@@ -48,4 +46,4 @@ class UnrulyPerson extends FHCAPI_Controller
 		}
 
 	}
-}
\ No newline at end of file
+}

From 6cf3896d497a0f02e8a96b163c73bcda6763524a Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 11 Sep 2024 14:38:00 +0200
Subject: [PATCH 1200/1461] fixes Calendar.js

---
 public/js/components/Calendar/Calendar.js | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/public/js/components/Calendar/Calendar.js b/public/js/components/Calendar/Calendar.js
index 313ec54bf..caa7aee9e 100755
--- a/public/js/components/Calendar/Calendar.js
+++ b/public/js/components/Calendar/Calendar.js
@@ -5,7 +5,7 @@ import CalendarWeek from './Week.js';
 import CalendarWeeks from './Weeks.js';
 import CalendarMinimized from './Minimized.js';
 import CalendarDate from '../../composables/CalendarDate.js';
-
+import CalendarModal from './CalendarModal.js';
 
 // TODO(chris): week/month toggle
 
@@ -17,14 +17,15 @@ export default {
 		CalendarWeek,
 		CalendarWeeks,
 		CalendarMinimized,
+		CalendarModal
 	},
 	provide() {
 		return {
 			date: this.date,
 			focusDate: this.focusDate,
-			size: Vue.computed({ get: () => this.size, set: v => this.size = v}),
+			size: Vue.computed({ get: () => this.size, set: v => this.size = v }),
 			events: Vue.computed(() => this.eventsPerDay),
-			minimized: Vue.computed({ get: () => this.minimized, set: v => this.$emit('update:minimized',v) }),
+			minimized: Vue.computed({ get: () => this.minimized, set: v => this.$emit('update:minimized', v) }),
 			showWeeks: this.showWeeks,
 			noMonthView: this.noMonthView,
 			noWeekView: this.noWeekView,
@@ -47,7 +48,7 @@ export default {
 			default: 'month'
 		},
 		classHeader: {
-			type: [String,Object,Array],
+			type: [String, Object, Array],
 			default: ''
 		},
 		minimized: Boolean,
@@ -62,7 +63,7 @@ export default {
 	],
 	data() {
 		return {
-			currentlySelectedEvent:null,
+			currentlySelectedEvent: null,
 			header: '',
 			prevMode: null,
 			currMode: null,
@@ -73,7 +74,7 @@ export default {
 	},
 	computed: {
 		sizeClass() {
-			return 'fhc-calendar-' + ['xs','sm','md','lg'][this.size];
+			return 'fhc-calendar-' + ['xs', 'sm', 'md', 'lg'][this.size];
 		},
 		mode: {
 			get() { return this.minimized ? 'minimized' : this.currMode; },
@@ -104,13 +105,13 @@ export default {
 	},
 	methods: {
 		handleInput(day) {
-			// set the event when clicking on the lehrveranstaltung in the data 
+			// set the event when clicking on the lehrveranstaltungen in the data 
 			this.currentlySelectedEvent = day[1];
 			// showing the modal
-			Vue.nextTick(()=>{
+			Vue.nextTick(() => {
 				this.$refs.calendarModal.show();
 			})
-			
+
 			this.$emit(day[0], day[1]);
 		}
 	},

From cfea7e10f23888af8fe97ada2656db1922cdfad2 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 11 Sep 2024 14:51:52 +0200
Subject: [PATCH 1201/1461] adds the reservierungen overview action for the
 search result with a room object and removes debugging prints

---
 public/js/components/Cis/Profil/MitarbeiterProfil.js | 5 +----
 public/js/components/searchbar/raum.js               | 8 ++------
 public/js/components/searchbar/searchbar.js          | 2 +-
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 37685f20d..5798df630 100755
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -241,10 +241,7 @@ export default {
     
   },
   mounted(){
-    // this is a test api call to test whether the addon lvevaluierung the menu point adds if the logged in user is the lector of the lehrveranstaltung
-    this.$fhcApi.factory.addons.getLvMenu(750, "WS2005").then(res =>{
-      console.log("this is the addon endpoint res",res);
-    });
+    
   },
 
   template: /*html*/ ` 
diff --git a/public/js/components/searchbar/raum.js b/public/js/components/searchbar/raum.js
index 85a7e3ce8..a1fc300fb 100755
--- a/public/js/components/searchbar/raum.js
+++ b/public/js/components/searchbar/raum.js
@@ -9,12 +9,12 @@ export default {
     },
     created(){
       //! this should be the default action for a raum
-      /*this.actions.defaultaction = {
+      this.actions.defaultaction = {
         type: "link",
         action: function(data) { 
             return FHC_JS_DATA_STORAGE_OBJECT.app_root+'cms/content.php?content_id='+data.content_id;
         }
-      }; */
+      }; 
     },
     emits: [ 'actionexecuted' ],
     template: /*html*/`
@@ -37,10 +37,6 @@ export default {
                   <div class="searchbar_tablecell">Standort</div>
                   <div class="searchbar_tablecell">{{ res.standort }}</div>
                 </div>
-                <div class="searchbar_tablerow">
-                  <div class="searchbar_tablecell">data</div>
-                  <div class="searchbar_tablecell">{{ JSON.stringify(res,null,2) }}</div>
-                </div>
                 <div class="searchbar_tablerow">
                   <div class="searchbar_tablecell">Sitzplätze</div>
                   <div class="searchbar_tablecell">{{ res.sitzplaetze }}</div>
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index bf2651bb9..83c4c666b 100755
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -98,7 +98,7 @@ export default {
     },
     methods: {
         getActionsForRoom: function(res){
-            res.roomoverview= FHC_JS_DATA_STORAGE_OBJECT.app_root +
+            res.booklink= FHC_JS_DATA_STORAGE_OBJECT.app_root +
             FHC_JS_DATA_STORAGE_OBJECT.ci_router +
             `/CisVue/Cms/getRoomInformation/${res.ort_kurzbz}`; 
 

From e247621f95d6ecbe9e629c293b0b2be8eb2b6611 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 12 Sep 2024 10:47:31 +0200
Subject: [PATCH 1202/1461] fixes the profilBearbeiten phrase and does update
 the topic correctly when adding a new kontakt/addresse in the profil

---
 public/js/components/Cis/Profil/ProfilModal/EditProfil.js     | 4 ++--
 .../js/components/Cis/Profil/ProfilModal/EditProfilSelect.js  | 4 ++--
 public/js/components/Cis/Profil/StudentProfil.js              | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfil.js b/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
index c1e5c73d5..62637678e 100755
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
@@ -159,9 +159,9 @@ export default {
   },
   template: /*html*/ `
   <bs-modal v-show="!loading" ref="modalContainer" v-bind="$props" body-class="" dialog-class="modal-lg" class="bootstrap-alert" backdrop="false" >
-    
+
   <template v-if="title" v-slot:title>
-      {{title }}  
+      {{title }}
     </template>
     <template v-slot:default>
     <div >
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfilSelect.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilSelect.js
index 983e0a20c..32b669c08 100755
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfilSelect.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfilSelect.js
@@ -45,7 +45,7 @@ export default {
       view: null,
       data: null,
       breadcrumbItems: [],
-      topic: null,
+      topic: this.topic,
       properties: null,
     };
   },
@@ -56,7 +56,7 @@ export default {
         this.topic == this.profilUpdateTopic["Private Kontakte"]
           ? "EditKontakt"
           : "EditAdresse";
-
+		  
       //? updates the topic when a Kontakt or an Address should be added
       this.topic =
         this.topic == this.profilUpdateTopic["Private Kontakte"]
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index 5cf92fd9f..18dd03b41 100755
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -187,10 +187,10 @@ export default {
 
   
 
-  template: /*html*/ ` 
+  template: /*html*/ `
 
   <div class="container-fluid text-break fhc-form"  >
-  <edit-profil v-if="showModal" ref="editModal" @hideBsModal="hideEditProfilModal" :value="JSON.parse(JSON.stringify(filteredEditData))" title="$p.t('profil','profilBearbeiten')" ></edit-profil>
+  <edit-profil v-if="showModal" ref="editModal" @hideBsModal="hideEditProfilModal" :value="JSON.parse(JSON.stringify(filteredEditData))" :title="p.t('profil','profilBearbeiten')" ></edit-profil>
     <!-- ROW --> 
           <div class="row">
           <!-- HIDDEN QUICK LINKS -->

From 1de8c009901da4994e82f0e96437840e382f089a Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 12 Sep 2024 11:45:54 +0200
Subject: [PATCH 1203/1461] fixes an error where the payload i treated like an
 object but is an associative array in the controller

---
 .../api/frontend/v1/ProfilUpdate.php           | 15 +++++++++------
 .../Cis/Profil/ProfilModal/EditProfil.js       |  2 +-
 .../Cis/Profil/ProfilModal/EditProfilSelect.js | 18 +++++++++---------
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/application/controllers/api/frontend/v1/ProfilUpdate.php b/application/controllers/api/frontend/v1/ProfilUpdate.php
index 7a528b2de..328ed3d61 100644
--- a/application/controllers/api/frontend/v1/ProfilUpdate.php
+++ b/application/controllers/api/frontend/v1/ProfilUpdate.php
@@ -160,13 +160,13 @@ class ProfilUpdate extends FHCAPI_Controller
 		$res = $this->getDataOrTerminateWithError($res);
 
 		//? the user cannot delete a zustelladresse/kontakt
-		if (isset($payload->delete) && $payload->{$identifier == "kontakt_id" ? "zustellung" : "zustelladresse"}) {
+		if (isset($payload["delete"]) && $payload-[$identifier == "kontakt_id" ? "zustellung" : "zustelladresse"]) {
 			$this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_deleteZustellung_error'));
 		}
 
 		//? if the user tries to delete a adresse, checks whether the adresse is a heimatadresse, if so an error is raised
-		if (isset($payload->delete) && $identifier == "adresse_id") {
-			$adr = $this->AdresseModel->load($payload->$identifier);
+		if (isset($payload["delete"]) && $identifier == "adresse_id") {
+			$adr = $this->AdresseModel->load($payload[$identifier]);
 			$adr = $this->getDataOrTerminateWithError($adr)[0];
 			if ($adr->heimatadresse) {
 				$this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_deleteZustellung_error'));
@@ -177,12 +177,15 @@ class ProfilUpdate extends FHCAPI_Controller
 			$pending_changes = array_filter($res, function ($element) {
 				return $element->status == (self::$STATUS_PENDING ?: "Pending");
 			});
-
+			$test = array();
 			foreach ($pending_changes as $update_request) {
 				$existing_change = $update_request->requested_change;
-				
+				$this->addMeta("paylaod",$payload);
+				$this->addMeta("object style", $payload[$identifier]);
+				$this->addMeta("array style", $payload[$identifier]);
+
 				//? the user can add as many new kontakte/adressen as he likes
-				if (!isset($payload->add) && property_exists($existing_change, $identifier) && property_exists($payload, $identifier) && $existing_change->$identifier == $payload->$identifier) {
+				if (!isset($payload["add"]) && property_exists($existing_change, $identifier) && array_key_exists($identifier,$payload) && $existing_change->$identifier == $payload[$identifier]) {
 					//? the kontakt_id / adresse_id of a change has to be unique 
 					$this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_changeTwice_error'));
 				}
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfil.js b/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
index 62637678e..45a41d8ab 100755
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
@@ -57,7 +57,7 @@ export default {
     async submitProfilChange() {
 
       //? check if data is valid before making a request
-      if (this.topic && this.profilUpdate) {
+	  if (this.topic && this.profilUpdate) {
         //? if profil update contains any attachment
         if (this.fileID) {
           const fileData = await this.uploadFiles(this.fileID);
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfilSelect.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilSelect.js
index 32b669c08..b9b45a1a7 100755
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfilSelect.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfilSelect.js
@@ -45,7 +45,7 @@ export default {
       view: null,
       data: null,
       breadcrumbItems: [],
-      topic: this.topic,
+      modal_topic: this.topic,
       properties: null,
     };
   },
@@ -53,17 +53,17 @@ export default {
   methods: {
     addItem: function () {
       this.view =
-        this.topic == this.profilUpdateTopic["Private Kontakte"]
+        this.modal_topic == this.profilUpdateTopic["Private Kontakte"]
           ? "EditKontakt"
           : "EditAdresse";
 		  
       //? updates the topic when a Kontakt or an Address should be added
-      this.topic =
-        this.topic == this.profilUpdateTopic["Private Kontakte"]
+		this.modal_topic =
+			this.modal_topic == this.profilUpdateTopic["Private Kontakte"]
           ? this.profilUpdateTopic["Add Kontakt"]
           : this.profilUpdateTopic["Add Adresse"];
-      this.$emit("update:topic", this.topic);
-      this.breadcrumbItems.push(this.topic);
+	  this.$emit("update:topic", this.modal_topic);
+	  this.breadcrumbItems.push(this.modal_topic);
       this.$emit("update:breadcrumb", this.breadcrumbItems);
 
       this.data =
@@ -108,13 +108,13 @@ export default {
     },
 
     updateOptions: function (event, item) {
-      this.properties = item;
+	  this.properties = item;
       this.data = item.data;
       this.view = item.view;
       if (item.title) {
         //? emits the selected topic to the parent component
-        this.topic = item.topic;
-        this.$emit("update:topic", this.topic);
+        this.modal_topic = item.topic;
+		this.$emit("update:topic", this.modal_topic);
 
         //? emits the new item for the breadcrumb in the parent component
         this.breadcrumbItems.push(item.title);

From 1208c6829ce429d13b0fbbda7ea46d8445715a44 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 12 Sep 2024 11:53:13 +0200
Subject: [PATCH 1204/1461] when an error happenes to editProfil Modal will
 also be closed then

---
 application/controllers/api/frontend/v1/ProfilUpdate.php  | 2 +-
 public/js/components/Cis/Profil/ProfilModal/EditProfil.js | 8 ++++++++
 .../components/Cis/Profil/ProfilModal/EditProfilSelect.js | 4 ++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/application/controllers/api/frontend/v1/ProfilUpdate.php b/application/controllers/api/frontend/v1/ProfilUpdate.php
index 328ed3d61..c55c9b4f9 100644
--- a/application/controllers/api/frontend/v1/ProfilUpdate.php
+++ b/application/controllers/api/frontend/v1/ProfilUpdate.php
@@ -160,7 +160,7 @@ class ProfilUpdate extends FHCAPI_Controller
 		$res = $this->getDataOrTerminateWithError($res);
 
 		//? the user cannot delete a zustelladresse/kontakt
-		if (isset($payload["delete"]) && $payload-[$identifier == "kontakt_id" ? "zustellung" : "zustelladresse"]) {
+		if (isset($payload["delete"]) && $payload[$identifier == "kontakt_id" ? "zustellung" : "zustelladresse"]) {
 			$this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_deleteZustellung_error'));
 		}
 
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfil.js b/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
index 45a41d8ab..f6be99fd2 100755
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
@@ -104,6 +104,10 @@ export default {
               })
               .catch((err) => {
                 console.error(err);
+				this.loading = false;
+				this.setLoading(false);
+				this.result = false;
+				this.hide();
               })
           : this.$fhcApi.factory.profilUpdate.insertProfilRequest(
               this.topic,
@@ -115,6 +119,10 @@ export default {
               })
               .catch((err) => {
                 console.error(err);
+				this.loading = false;
+				this.setLoading(false);
+				this.result = false;
+				this.hide();
               });
       }
     },
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfilSelect.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilSelect.js
index b9b45a1a7..81b294b57 100755
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfilSelect.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfilSelect.js
@@ -94,10 +94,10 @@ export default {
       item.data.delete = true;
       this.$emit("update:profilUpdate", item.data);
       //? updates the topic when a Kontakt or an Address should be deleted
-      this.topic = this.profilUpdateTopic["Private Adressen"]
+	  this.modal_topic = this.profilUpdateTopic["Private Adressen"]
         ? this.profilUpdateTopic["Delete Adresse"]
         : this.profilUpdateTopic["Delete Kontakt"];
-      this.$emit("update:topic", this.topic);
+	  this.$emit("update:topic", this.modal_topic);
 
       this.$emit("submit");
     },

From 29fac520f37845d5111a76257a58184367cd89c1 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 12 Sep 2024 12:04:42 +0200
Subject: [PATCH 1205/1461] component was setting the topic false when trying
 to delete a kontakt or an adresse

---
 .../js/components/Cis/Profil/ProfilModal/EditProfilSelect.js  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfilSelect.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilSelect.js
index 81b294b57..7b87bad85 100755
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfilSelect.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfilSelect.js
@@ -94,11 +94,11 @@ export default {
       item.data.delete = true;
       this.$emit("update:profilUpdate", item.data);
       //? updates the topic when a Kontakt or an Address should be deleted
-	  this.modal_topic = this.profilUpdateTopic["Private Adressen"]
+	  
+	  this.modal_topic = this.modal_topic == this.profilUpdateTopic["Private Adressen"]
         ? this.profilUpdateTopic["Delete Adresse"]
         : this.profilUpdateTopic["Delete Kontakt"];
 	  this.$emit("update:topic", this.modal_topic);
-
       this.$emit("submit");
     },
 

From 27c312d7d3c800e6c0fd1f604608369bd0a2ee50 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 12 Sep 2024 15:42:21 +0200
Subject: [PATCH 1206/1461] filterPerson unrulyPerson api & person model

---
 .../frontend/v1/unrulyperson/UnrulyPerson.php | 65 ++++++++++++++++++-
 .../controllers/api/v1/person/Person.php      |  2 +-
 application/models/person/Person_model.php    |  9 +++
 public/js/api/unrulyperson.js                 | 11 ++++
 4 files changed, 84 insertions(+), 3 deletions(-)

diff --git a/application/controllers/api/frontend/v1/unrulyperson/UnrulyPerson.php b/application/controllers/api/frontend/v1/unrulyperson/UnrulyPerson.php
index 17289cabe..d1dbea7d8 100644
--- a/application/controllers/api/frontend/v1/unrulyperson/UnrulyPerson.php
+++ b/application/controllers/api/frontend/v1/unrulyperson/UnrulyPerson.php
@@ -23,7 +23,8 @@ class UnrulyPerson extends FHCAPI_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'updatePersonUnrulyStatus' => array('basis/mitarbeiter:rw', 'student/antragfreigabe:rw', 'student/studierendenantrag:rw')
+			'updatePersonUnrulyStatus' => array('basis/mitarbeiter:rw', 'student/antragfreigabe:rw', 'student/studierendenantrag:rw'),
+			'filterPerson' => array('basis/mitarbeiter:rw', 'student/antragfreigabe:rw', 'student/studierendenantrag:rw')
 		]);
 
 		$this->_ci =& get_instance();
@@ -46,4 +47,64 @@ class UnrulyPerson extends FHCAPI_Controller
 		}
 
 	}
-}
+
+	public function filterPerson() {
+		$payload = json_decode($this->input->raw_input_stream, TRUE);
+
+		$nachnameString = '';
+		$vornameString = '';
+		$filterUnruly = true;
+		$birthdateString = null;
+
+		if(array_key_exists( 'nachname', $payload) ) {
+			$nachnameString = $payload['nachname'];
+		}
+
+		if(array_key_exists('vorname', $payload)) {
+			$vornameString = $payload['vorname'];
+		}
+
+		if(array_key_exists('unruly', $payload)){
+			$filterUnruly = $payload['unruly'];
+		}
+
+		if(array_key_exists('gebdatum', $payload)) {
+			// TODO: enable if gebdatum filter for unrulys is desired
+//				$birthdateString = $payload['gebdatum'];
+		}
+
+		$parametersArray = array($nachnameString);
+		$where ="p.nachname~* ? ";
+		if (mb_strlen($nachnameString) == 2)
+		{
+			$where = "p.nachname=? ";
+		}
+
+		if(isset($vorname) && $vorname != '')
+		{
+			$where.= " AND p.vorname~*?";
+			$parametersArray[] = $vorname;
+		}
+
+		if(isset($birthdate) && $birthdate != '')
+		{
+			$where.=" AND p.gebdatum=?";
+			$parametersArray[] = $birthdate;
+		}
+
+		if(isset($filterUnruly))
+		{
+			$where.=" AND p.unruly=?";
+			$parametersArray[] = $filterUnruly;
+		}
+
+		$result = $this->_ci->PersonModel->checkUnrulyWhere($where, $parametersArray);
+
+		if (isSuccess($result))
+			$this->terminateWithSuccess($result);
+		else
+			$this->terminateWithError('Error when searching for person');
+
+
+	}
+}
\ No newline at end of file
diff --git a/application/controllers/api/v1/person/Person.php b/application/controllers/api/v1/person/Person.php
index a686f6060..6a373137f 100644
--- a/application/controllers/api/v1/person/Person.php
+++ b/application/controllers/api/v1/person/Person.php
@@ -264,4 +264,4 @@ class Person extends API_Controller
 
 		return success('Input data are valid');
 	}
-}
+}
\ No newline at end of file
diff --git a/application/models/person/Person_model.php b/application/models/person/Person_model.php
index c3a6c34f1..9f10599fb 100644
--- a/application/models/person/Person_model.php
+++ b/application/models/person/Person_model.php
@@ -387,6 +387,15 @@ class Person_model extends DB_Model
 		return $this->execQuery($qry, [$vorname, $nachname, $gebdatum]);
 	}
 
+	public function checkUnrulyWhere($where, $paramsArray)
+	{
+		$qry =  'SELECT *
+				FROM tbl_person p
+				WHERE '.$where.';';
+
+		return $this->execQuery($qry, $paramsArray);
+	}
+
 	public function updateUnruly($person_id, $unruly)
 	{
 		$result = $this->update($person_id, array(
diff --git a/public/js/api/unrulyperson.js b/public/js/api/unrulyperson.js
index 361aecd43..9e7d16e9f 100644
--- a/public/js/api/unrulyperson.js
+++ b/public/js/api/unrulyperson.js
@@ -9,5 +9,16 @@ export default {
 			throw error;
 		}
 
+	},
+	filterPerson(payload, base = ''){
+
+		try {
+			const url = base + '/api/frontend/v1/unrulyperson/UnrulyPerson/filterPerson';
+			return axios.post(url, payload)
+			// return this.$fhcApi.post(url, payload, null);
+		} catch (error) {
+			throw error;
+		}
+
 	}
 }
\ No newline at end of file

From 2b9406b1725cf638f15ebf6b6fc401942ae130b4 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 13 Sep 2024 11:15:46 +0200
Subject: [PATCH 1207/1461] resolves zustellnungs value bug and removes
 debugging prints

---
 .../api/frontend/v1/ProfilUpdate.php          | 34 ++++++++++++++-----
 .../EditProfilComponents/EditAdresse.js       |  1 -
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/application/controllers/api/frontend/v1/ProfilUpdate.php b/application/controllers/api/frontend/v1/ProfilUpdate.php
index c55c9b4f9..bf1eb8af4 100644
--- a/application/controllers/api/frontend/v1/ProfilUpdate.php
+++ b/application/controllers/api/frontend/v1/ProfilUpdate.php
@@ -135,7 +135,7 @@ class ProfilUpdate extends FHCAPI_Controller
 	public function insertProfilRequest()
 	{
 
-		$payload = $this->input->post('payload',true);
+		$payload = $this->input->post('payload');
 		$topic = $this->input->post('topic',true);
 		$fileID = $this->input->post('fileID',true);
 
@@ -154,9 +154,6 @@ class ProfilUpdate extends FHCAPI_Controller
 
 		//? loops over all updateRequests from a user to validate if the new request is valid
 		$res = $this->ProfilUpdateModel->getProfilUpdatesWhere(["uid" => $this->uid]);
-		if (isError($res)) {
-			$this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_loading_error'));
-		}
 		$res = $this->getDataOrTerminateWithError($res);
 
 		//? the user cannot delete a zustelladresse/kontakt
@@ -177,13 +174,8 @@ class ProfilUpdate extends FHCAPI_Controller
 			$pending_changes = array_filter($res, function ($element) {
 				return $element->status == (self::$STATUS_PENDING ?: "Pending");
 			});
-			$test = array();
 			foreach ($pending_changes as $update_request) {
 				$existing_change = $update_request->requested_change;
-				$this->addMeta("paylaod",$payload);
-				$this->addMeta("object style", $payload[$identifier]);
-				$this->addMeta("array style", $payload[$identifier]);
-
 				//? the user can add as many new kontakte/adressen as he likes
 				if (!isset($payload["add"]) && property_exists($existing_change, $identifier) && array_key_exists($identifier,$payload) && $existing_change->$identifier == $payload[$identifier]) {
 					//? the kontakt_id / adresse_id of a change has to be unique 
@@ -697,6 +689,30 @@ class ProfilUpdate extends FHCAPI_Controller
 		
 	}
 
+
+	private function getOE_from_student($student_uid)
+	{
+
+		//? returns the oe_einheit eines Studenten 
+		$query = "SELECT public.tbl_studiengang.oe_kurzbz
+		FROM public.tbl_student
+		JOIN public.tbl_studiengang ON tbl_student.studiengang_kz = public.tbl_studiengang.studiengang_kz
+		WHERE public.tbl_student.student_uid = ?;";
+
+		$res = $this->StudentModel->execReadOnlyQuery($query, [$student_uid]);
+		if (!isSuccess($res)) {
+			show_error($this->p->t('profilUpdate', 'profilUpdate_loadingOE_error'));
+		}
+		$res = hasData($res) ? getData($res) : [];
+		$res = array_map(
+			function ($item) {
+				return $item->oe_kurzbz;
+			},
+			$res
+		);
+		return $res;
+	}
+
 }
 
 
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js
index c38f6fd31..2aca5c4ce 100755
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js
@@ -131,7 +131,6 @@ export default {
 
   template: /*html*/ `
 <div class="gy-3 row justify-content-center align-items-center">
-
   <!-- warning message for too many zustellungs Adressen -->
   <div v-if="showZustellAdressenWarning" class="col-12 ">
     <div class="card bg-danger mx-2">

From cf1cb44afaf3db474ab1c470bb746db70ee5f4ab Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 13 Sep 2024 12:27:07 +0200
Subject: [PATCH 1208/1461] refactors old ProfilUpdate controller functions

---
 application/controllers/Cis/ProfilUpdate.php  |  55 ++--
 .../api/frontend/v1/ProfilUpdate.php          | 294 ++++++++++++------
 .../Cis/Profil/ProfilModal/EditProfil.js      |  38 +--
 3 files changed, 245 insertions(+), 142 deletions(-)

diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
index 4dce86573..ef767a625 100755
--- a/application/controllers/Cis/ProfilUpdate.php
+++ b/application/controllers/Cis/ProfilUpdate.php
@@ -301,34 +301,6 @@ class ProfilUpdate extends Auth_Controller
 	}
 
 
-	private function deleteOldVersionFile($dms_id)
-	{
-		if (!isset($dms_id)) {
-			return;
-		}
-
-		//? collect all the results of the deleted versions in an array 
-		$res = array();
-
-		//? delete all the different versions of the dms_file
-		$dmsVersions = $this->DmsVersionModel->loadWhere(["dms_id" => $dms_id]);
-		$dmsVersions = hasData($dmsVersions) ? getData($dmsVersions) : null;
-		if (isset($dmsVersions)) {
-			$zwischen_res = array_map(function ($item) {
-				return $item->version;
-			}, $dmsVersions);
-			foreach ($zwischen_res as $version) {
-				array_push($res, $this->DmsVersionModel->delete([$dms_id, $version]));
-			}
-		} else {
-			echo json_encode(error($this->p->t('profilUpdate', 'profilUpdate_dmsVersion_error')));
-		}
-
-		//? returns a result for each deleted dms_file
-		return $res;
-	}
-
-
 	public function selectProfilRequest()
 	{
 		$_GET = json_decode($this->input->raw_input_stream, true);
@@ -650,6 +622,33 @@ class ProfilUpdate extends Auth_Controller
 		return $this->ProfilUpdateModel->update([$id], ["status" => $status, "status_timestamp" => "NOW()", "status_message" => $status_message]);
 	}
 
+	private function deleteOldVersionFile($dms_id)
+	{
+		if (!isset($dms_id)) {
+			return;
+		}
+
+		//? collect all the results of the deleted versions in an array 
+		$res = array();
+
+		//? delete all the different versions of the dms_file
+		$dmsVersions = $this->DmsVersionModel->loadWhere(["dms_id" => $dms_id]);
+		$dmsVersions = hasData($dmsVersions) ? getData($dmsVersions) : null;
+		if (isset($dmsVersions)) {
+			$zwischen_res = array_map(function ($item) {
+				return $item->version;
+			}, $dmsVersions);
+			foreach ($zwischen_res as $version) {
+				array_push($res, $this->DmsVersionModel->delete([$dms_id, $version]));
+			}
+		} else {
+			echo json_encode(error($this->p->t('profilUpdate', 'profilUpdate_dmsVersion_error')));
+		}
+
+		//? returns a result for each deleted dms_file
+		return $res;
+	}
+
 
 	private function handleKontakt($requested_change, $personID)
 	{
diff --git a/application/controllers/api/frontend/v1/ProfilUpdate.php b/application/controllers/api/frontend/v1/ProfilUpdate.php
index bf1eb8af4..35b7e4e64 100644
--- a/application/controllers/api/frontend/v1/ProfilUpdate.php
+++ b/application/controllers/api/frontend/v1/ProfilUpdate.php
@@ -36,6 +36,7 @@ class ProfilUpdate extends FHCAPI_Controller
             'getStatus' => self::PERM_LOGGED,
             'getTopic' => self::PERM_LOGGED,
 			'getProfilRequestFiles' => self::PERM_LOGGED,
+			'getProfilUpdateWithPermission' => ['student/stammdaten:r', 'mitarbeiter/stammdaten:r'],
 			'denyProfilRequest' => ['student/stammdaten:rw', 'mitarbeiter/stammdaten:rw'],
 			'acceptProfilRequest' => ['student/stammdaten:rw', 'mitarbeiter/stammdaten:rw'],
 			'selectProfilRequest' => self::PERM_LOGGED,
@@ -43,6 +44,7 @@ class ProfilUpdate extends FHCAPI_Controller
 			'updateProfilRequest' => self::PERM_LOGGED,
 			'deleteProfilRequest' => self::PERM_LOGGED,
 			'insertFile' => self::PERM_LOGGED,
+			'show' => self::PERM_LOGGED,
 			]);
 
 		// Load language phrases
@@ -114,6 +116,39 @@ class ProfilUpdate extends FHCAPI_Controller
 		$this->terminateWithSuccess(self::$TOPICS);
 	}
 
+	public function show($dms_id)
+	{
+
+		$profil_update = $this->ProfilUpdateModel->loadWhere(['attachment_id' => $dms_id]);
+		$profil_update = hasData($profil_update) ? getData($profil_update)[0] : null;
+
+		//? checks if an profil update exists with the dms_id requested from the user
+		if ($profil_update) {
+			$is_mitarbeiter_profil_update = getData($this->MitarbeiterModel->isMitarbeiter($profil_update->uid));
+			$is_student_profil_update = getData($this->StudentModel->isStudent($profil_update->uid));
+
+			if (
+				$this->permissionlib->isBerechtigt('student/stammdaten:r') && $is_student_profil_update ||
+				$this->permissionlib->isBerechtigt('mitarbeiter/stammdaten:r') && $is_mitarbeiter_profil_update ||
+				$this->uid == $profil_update->uid
+			) {
+				// Get file to be downloaded from DMS
+				$download = $this->dmslib->download($dms_id);
+				$download = $this->getDataOrTerminateWithError($download);
+				// Download file
+				$this->outputFile($download);
+
+
+			} else {
+				$this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_permission_error'));
+			}
+
+		} else {
+			$this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_dms_error'));
+		}
+
+	}
+
 	public function selectProfilRequest()
 	{
 
@@ -441,6 +476,28 @@ class ProfilUpdate extends FHCAPI_Controller
 		$this->terminateWithSuccess($res);
 	}
 
+	public function getProfilUpdateWithPermission($status = null)
+	{
+		// early return if no status has been passed as argument
+		if (!isset($status)) {
+			echo json_encode($this->ProfilUpdateModel->getProfilUpdateWithPermission());
+			return;
+		}
+
+		// get the sprache of the user
+		$sprachenIndex = $this->SpracheModel->loadWhere(["sprache" => getUserLanguage()]);
+		$sprachenIndex = hasData($sprachenIndex) ? getData($sprachenIndex)[0]->index : null;
+
+		if (isset($sprachenIndex) && isset($status)) {
+			// get the corresponding status kurz_bz primary key out of the translation
+			$status = $this->ProfilUpdateStatusModel->execReadOnlyQuery("select * from public.tbl_profil_update_status where ? = ANY(bezeichnung_mehrsprachig)", [$status]);
+			$status = hasData($status) ? getData($status)[0]->status_kurzbz : null;
+			$res = $this->ProfilUpdateModel->getProfilUpdateWithPermission(isset($status) ? ['status' => $status] : null);
+
+			echo json_encode($res);
+		}
+	}
+
 	//------------------------------------------------------------------------------------------------------------------
 	// Private methods
 
@@ -552,13 +609,85 @@ class ProfilUpdate extends FHCAPI_Controller
 	{
 		return $this->ProfilUpdateModel->update([$id], ['requested_change' => json_encode($requested_change)]);
 	}
+	
+	private function deleteOldVersionFile($dms_id)
+	{
+		// starting the transaction
+		$this->db->trans_start();
+		
+		
+		if (!isset($dms_id)) {
+			return;
+		}
+
+		//? delete the file from the profilUpdate first
+		$profilUpdateFileDelete = $this->ProfilUpdateModel->removeFileFromProfilUpdate($dms_id);
+		if(isError($profilUpdateFileDelete)){
+			$this->terminateWithError(getError($profilUpdateFileDelete));
+		}
+		
+		//? delete all the different versions of the dms_file
+		$dmsVersions = $this->DmsVersionModel->loadWhere(["dms_id" => $dms_id]);
+		$dmsVersions = $this->getDataOrTerminateWithError($dmsVersions);
+		
+		
+		
+		$dms_versions = array_map(function ($item) {
+			return $item->version;
+		}, $dmsVersions);
+
+
+		$test_array = array();
+		foreach ($dms_versions as $version) {
+			
+			$delete_result = $this->dmslib->removeVersion($dms_id, $version);
+			array_push($test_array, $delete_result);
+			
+			if(isError($delete_result)){
+				$this->addError(getError($delete_result));
+			}
+		}
+
+		// transaction complete
+		$this->db->trans_complete();
+		
+		if ($this->db->trans_status() === FALSE)
+		{
+			return false;
+		}
+		else
+		{
+			return true;
+		}
+		
+	}
+	
+	
+	private function getOE_from_student($student_uid)
+	{
+		//? returns the oe_einheit eines Studenten 
+		$query = "SELECT public.tbl_studiengang.oe_kurzbz
+		FROM public.tbl_student
+		JOIN public.tbl_studiengang ON tbl_student.studiengang_kz = public.tbl_studiengang.studiengang_kz
+		WHERE public.tbl_student.student_uid = ?;";
+
+		$res = $this->StudentModel->execReadOnlyQuery($query, [$student_uid]);
+		$res = $this->getDataOrTerminateWithError($res, $this->p->t('profilUpdate', 'profilUpdate_loadingOE_error'));	
+		$res = array_map(
+			function ($item) {
+				return $item->oe_kurzbz;
+			},
+			$res
+		);
+		return $res;
+	}
 
 	private function handleAdresse($requested_change, $personID)
 	{
 		$this->AdressenTypModel->addSelect(["adressentyp_kurzbz"]);
 		$adr_kurzbz = $this->AdressenTypModel->loadWhere(["bezeichnung" => $requested_change['typ']]);
 		$adr_kurzbz = $this->getDataOrTerminateWithError($adr_kurzbz)[0]->adressentyp_kurzbz;
-		
+
 		//? replace the address_typ with its correct kurzbz foreign key
 		$requested_change['typ'] = $adr_kurzbz;
 
@@ -578,19 +707,15 @@ class ProfilUpdate extends FHCAPI_Controller
 			//TODO: zustelladresse, heimatadresse, rechnungsadresse und nation werden nicht beachtet
 			$insertID = $this->AdresseModel->insert($requested_change);
 			$insert_adresse_id = $insertID;
-			if (isError($insert_adresse_id)) {
-				$this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_insertAdresse_error'));
-			}
-			$insert_adresse_id = $this->getDataOrTerminateWithError($insert_adresse_id);
+			$insert_adresse_id = $this->getDataOrTerminateWithError($insert_adresse_id, $this->p->t('profilUpdate', 'profilUpdate_insertAdresse_error'));
 			if ($insert_adresse_id) {
 				$this->handleDupplicateZustellAdressen($requested_change['zustelladresse'], $insert_adresse_id);
 			}
-
 		}
 		//! DELETE
 		elseif (array_key_exists('delete', $requested_change) && $requested_change['delete']) {
 			$result = $this->AdresseModel->delete($adresse_id);
-			if(isError($result)){
+			if (isError($result)) {
 				$this->terminateWithError(getError($result));
 			}
 		}
@@ -599,16 +724,52 @@ class ProfilUpdate extends FHCAPI_Controller
 			$requested_change['updateamum'] = "NOW()";
 			$requested_change['updatevon'] = getAuthUID();
 			$update_adresse_id = $this->AdresseModel->update($adresse_id, $requested_change);
-			if (isError($update_adresse_id)) {
-				$this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_updateAdresse_error'));
-			}
-			$update_adresse_id = $this->getDataOrTerminateWithError($update_adresse_id);
+			$update_adresse_id = $this->getDataOrTerminateWithError($update_adresse_id, $this->p->t('profilUpdate', 'profilUpdate_updateAdresse_error'));
 			$this->handleDupplicateZustellAdressen($requested_change['zustelladresse'], $update_adresse_id);
-			
+
 		}
 		return $insertID ?? null;
 	}
 
+	private function handleKontakt($requested_change, $personID)
+	{
+		$kontakt_id = $requested_change["kontakt_id"];
+		//? removes the kontakt_id because we don't want to update the kontakt_id in the database
+		unset($requested_change["kontakt_id"]);
+
+		//! ADD
+		if (array_key_exists('add', $requested_change) && $requested_change['add']) {
+			//? removes add flag
+			unset($requested_change['add']);
+			$requested_change['person_id'] = $personID;
+			$requested_change['insertamum'] = "NOW()";
+			$requested_change['insertvon'] = getAuthUID();
+			$insertID = $this->KontaktModel->insert($requested_change);
+			$insert_kontakt_id = $insertID;
+			$insert_kontakt_id = $this->getDataOrTerminateWithError($insert_kontakt_id, $this->p->t('profilUpdate', 'profilUpdate_insertKontakt_error'));
+			if ($insert_kontakt_id) {
+				$this->handleDupplicateZustellKontakte($requested_change['zustellung'], $insert_kontakt_id);
+			}
+		}
+		//! DELETE
+		elseif (array_key_exists('delete', $requested_change) && $requested_change['delete']) {
+			$result = $this->KontaktModel->delete($kontakt_id);
+			if (isError($result)) {
+				$this->terminateWithError(getError($result));
+			}
+		}
+		//! UPDATE
+		else {
+			$requested_change['updateamum'] = "NOW()";
+			$requested_change['updatevon'] = getAuthUID();
+			$update_kontakt_id = $this->KontaktModel->update($kontakt_id, $requested_change);
+			$update_kontakt_id = $this->getDataOrTerminateWithError($update_kontakt_id, $this->p->t('profilUpdate', 'profilUpdate_updateKontakt_error'));
+			if ($update_kontakt_id) {
+				$this->handleDupplicateZustellKontakte($requested_change['zustellung'], $update_kontakt_id);
+			}
+		}
+		return isset($insertID) ? $insertID : null;
+	}
 
 	private function handleDupplicateZustellAdressen($zustellung, $adresse_id)
 	{
@@ -620,99 +781,46 @@ class ProfilUpdate extends FHCAPI_Controller
 				$this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_loadingZustellAdressen_error'));
 			}
 			$zustellAdressenArray = $this->getDataOrTerminateWithError($zustellAdressenArray);
-
+	
 			if (count($zustellAdressenArray) > 0) {
-
+	
 				$zustellAdressenArray = array_filter($zustellAdressenArray, function ($adresse) use ($adresse_id) {
-
+	
 					return $adresse->adresse_id != $adresse_id;
 				});
-
+	
 				// remove the zustelladresse from all other zustelladressen
 				foreach ($zustellAdressenArray as $adresse) {
 					$this->AdresseModel->update($adresse->adresse_id, ["zustelladresse" => FALSE]);
 				}
+	
+			}
+		}
+	}
+
+	private function handleDupplicateZustellKontakte($zustellung, $kontakt_id)
+	{
+		if ($zustellung) {
+			$this->PersonModel->addSelect("public.tbl_kontakt.kontakt_id");
+			$this->PersonModel->addJoin("public.tbl_kontakt", "public.tbl_kontakt.person_id = public.tbl_person.person_id");
+			$zustellKontakteArray = $this->PersonModel->loadWhere(["public.tbl_person.person_id" => $this->pid, "zustellung" => TRUE]);
+			if (!isSuccess($zustellKontakteArray)) {
+				return error($this->p->t('profilUpdate', 'profilUpdate_loadingZustellkontakte_error'));
+			}
+			$zustellKontakteArray = hasData($zustellKontakteArray) ? getData($zustellKontakteArray) : null;
+
+			if ($zustellung && count($zustellKontakteArray) > 0) {
+				$zustellKontakteArray = array_filter($zustellKontakteArray, function ($kontakt) use ($kontakt_id) {
+					return $kontakt->kontakt_id != $kontakt_id;
+				});
+				foreach ($zustellKontakteArray as $kontakt) {
+					$this->KontaktModel->update($kontakt->kontakt_id, ["zustellung" => FALSE]);
+				}
 
 			}
 		}
 	}
-
-	private function deleteOldVersionFile($dms_id)
-	{
-		// starting the transaction
-		$this->db->trans_start();
-
-
-		if (!isset($dms_id)) {
-			return;
-		}
-
-		//? delete the file from the profilUpdate first
-		$profilUpdateFileDelete = $this->ProfilUpdateModel->removeFileFromProfilUpdate($dms_id);
-		if(isError($profilUpdateFileDelete)){
-			$this->terminateWithError(getError($profilUpdateFileDelete));
-		}
-		
-		//? delete all the different versions of the dms_file
-		$dmsVersions = $this->DmsVersionModel->loadWhere(["dms_id" => $dms_id]);
-		$dmsVersions = $this->getDataOrTerminateWithError($dmsVersions);
-		
-		
-
-		$dms_versions = array_map(function ($item) {
-			return $item->version;
-		}, $dmsVersions);
-
-
-		$test_array = array();
-		foreach ($dms_versions as $version) {
-			
-			$delete_result = $this->dmslib->removeVersion($dms_id, $version);
-			array_push($test_array, $delete_result);
-			
-			if(isError($delete_result)){
-				$this->addError(getError($delete_result));
-			}
-		}
-
-		// transaction complete
-		$this->db->trans_complete();
-
-		if ($this->db->trans_status() === FALSE)
-		{
-			return false;
-		}
-		else
-		{
-			return true;
-		}
-		
-	}
-
-
-	private function getOE_from_student($student_uid)
-	{
-
-		//? returns the oe_einheit eines Studenten 
-		$query = "SELECT public.tbl_studiengang.oe_kurzbz
-		FROM public.tbl_student
-		JOIN public.tbl_studiengang ON tbl_student.studiengang_kz = public.tbl_studiengang.studiengang_kz
-		WHERE public.tbl_student.student_uid = ?;";
-
-		$res = $this->StudentModel->execReadOnlyQuery($query, [$student_uid]);
-		if (!isSuccess($res)) {
-			show_error($this->p->t('profilUpdate', 'profilUpdate_loadingOE_error'));
-		}
-		$res = hasData($res) ? getData($res) : [];
-		$res = array_map(
-			function ($item) {
-				return $item->oe_kurzbz;
-			},
-			$res
-		);
-		return $res;
-	}
-
+	
 }
 
 
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfil.js b/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
index f6be99fd2..8672d2b49 100755
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
@@ -54,6 +54,14 @@ export default {
       this.fileID = newFileID;
     },
 
+	handleFailedError: function (err) {
+		console.error(err);
+		this.loading = false;
+		this.setLoading(false);
+		this.result = false;
+		this.hide();
+	},
+
     async submitProfilChange() {
 
       //? check if data is valid before making a request
@@ -99,31 +107,19 @@ export default {
               this.editData.updateID,
               this.fileID ? this.fileID[0] : null
             )
-              .then((res) => {
-                handleApiResponse(res);
-              })
-              .catch((err) => {
-                console.error(err);
-				this.loading = false;
-				this.setLoading(false);
-				this.result = false;
-				this.hide();
-              })
-          : this.$fhcApi.factory.profilUpdate.insertProfilRequest(
+			.then((res) => {
+			handleApiResponse(res);
+			})
+			.catch((err) => this.handleFailedError)
+			: this.$fhcApi.factory.profilUpdate.insertProfilRequest(
               this.topic,
               this.profilUpdate,
               this.fileID ? this.fileID[0] : null
             )
-              .then((res) => {
-                handleApiResponse(res);
-              })
-              .catch((err) => {
-                console.error(err);
-				this.loading = false;
-				this.setLoading(false);
-				this.result = false;
-				this.hide();
-              });
+			.then((res) => {
+			handleApiResponse(res);
+			})
+			.catch((err) => this.handleFailedError);
       }
     },
 

From 88c38c9228c495a7e012ad9b5a50a58a13925ce5 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 13 Sep 2024 12:37:13 +0200
Subject: [PATCH 1209/1461] fixes ProfilUpdate bugs

---
 .../Cis/ProfilUpdate/AcceptDenyUpdate.js         |  8 +++-----
 .../Cis/ProfilUpdate/ProfilUpdateView.js         | 16 ++++------------
 public/js/components/DashboardWidget/Ampel.js    | 14 ++------------
 3 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
index 01232b4d6..300cfe51c 100755
--- a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
+++ b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
@@ -68,14 +68,12 @@ export default {
           : "denyProfilRequest"
       ](this.data)
         .then((res) => {
-          this.setLoading(false);
-          this.loading = false;
           this.result = true;
         })
-        .catch((e) => {
-          Alert.popup(Vue.h("div", { innerHTML: e.response.data }));
-        })
+		.catch((e) => this.$fhcAlert.handleSystemError)
         .finally(() => {
+		  this.setLoading(false);
+		  this.loading = false;
           this.hide();
         });
     },
diff --git a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
index 03bbb1071..4f5f6578f 100644
--- a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
+++ b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
@@ -135,9 +135,7 @@ export default {
                     .then((res) => {
                       this.$refs.UpdatesTable.tabulator.setData();
                     })
-                    .catch((e) => {
-                      Alert.popup(Vue.h("div", { innerHTML: e.response.data }));
-                    });
+					.catch((e) => this.$fhcAlert.handleSystemError);
                 },
               },
               {
@@ -153,9 +151,7 @@ export default {
                     .then((res) => {
                       this.$refs.UpdatesTable.tabulator.setData();
                     })
-                    .catch((e) => {
-                      Alert.popup(Vue.h("div", { innerHTML: e.response.data }));
-                    });
+					.catch((e) => this.$fhcAlert.handleSystemError);
                 },
               },
               {
@@ -308,9 +304,7 @@ export default {
         .then((res) => {
           // block when the request was successful
         })
-        .catch((e) => {
-          Alert.popup(Vue.h("div", { innerHTML: e.response.data }));
-        })
+		.catch((e) => this.$fhcAlert.handleSystemError)
         .finally(() => {
           this.$refs.UpdatesTable.tabulator.setData();
         });
@@ -320,9 +314,7 @@ export default {
         .then((res) => {
           // block when the request was successful
         })
-        .catch((e) => {
-          Alert.popup(Vue.h("div", { innerHTML: e.response.data }));
-        })
+		.catch((e) => this.$fhcAlert.handleSystemError)
         .finally(() => {
           // update the data inside the table
           this.$refs.UpdatesTable.tabulator.setData();
diff --git a/public/js/components/DashboardWidget/Ampel.js b/public/js/components/DashboardWidget/Ampel.js
index be5db43ea..d7cc60850 100755
--- a/public/js/components/DashboardWidget/Ampel.js
+++ b/public/js/components/DashboardWidget/Ampel.js
@@ -81,12 +81,7 @@ export default {
 				.then(res => {
 					this.activeAmpeln = res.data;
 				})
-				.catch(error => {
-					if (error.code === 'ECONNABORTED')
-						this.fetchNonConfirmedActiveAmpeln();
-					else
-						this.$fhcAlert.handleSystemError(error);
-				});
+				.catch(error => this.$fhcAlert.handleSystemError);
 		},
 		fetchAllActiveAmpeln() {
 			this.$fhcApi.factory
@@ -94,12 +89,7 @@ export default {
 				.then(res => {
 					this.allAmpeln = res.data;
 				})
-				.catch(error => {
-					if (error.code === 'ECONNABORTED')
-						this.fetchAllActiveAmpeln();
-					else
-						this.$fhcAlert.handleSystemError(error);
-				});
+				.catch(error => this.$fhcAlert.handleSystemError);
 
 		},
 		async confirm(ampelId) {

From b30156a65fa1855c84410ad205d75a4d312aeecf Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 13 Sep 2024 12:42:57 +0200
Subject: [PATCH 1210/1461] catches errors better in Profil

---
 .../Cis/Profil/ProfilModal/EditProfil.js      | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfil.js b/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
index 8672d2b49..39faf0a45 100755
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
@@ -77,18 +77,13 @@ export default {
         //* calls the update api call if an update field is present in the data that was passed to the modal
         const handleApiResponse = (res) => {
           //? toggles the loading to false and closes the loading modal
-          this.loading = false;
-          this.setLoading(false);
-
           if (res.data.error) {
             this.result = false;
-            this.hide();
             Alert.popup(
               "Ein Fehler ist aufgetreten: " + JSON.stringify(res.data.retval)
             );
           } else {
             this.result = true;
-            this.hide();
             Alert.popup(
               "Ihre Anfrage wurde erfolgreich gesendet. Bitte warten Sie, während sich das Team um Ihre Anfrage kümmert."
             );
@@ -100,8 +95,9 @@ export default {
         this.loading = true;
         this.setLoading(true);
 
-        this.editData.updateID
-          ? this.$fhcApi.factory.profilUpdate.updateProfilRequest(
+		//? if an updateID is present, updateProfilRequest is called, else insertProfilRequest is called
+        this.editData.updateID? 
+			this.$fhcApi.factory.profilUpdate.updateProfilRequest(
               this.topic,
               this.profilUpdate,
               this.editData.updateID,
@@ -110,8 +106,14 @@ export default {
 			.then((res) => {
 			handleApiResponse(res);
 			})
-			.catch((err) => this.handleFailedError)
-			: this.$fhcApi.factory.profilUpdate.insertProfilRequest(
+			.catch((err) => this.$fhcAlert.handleSystemError)
+			.finally(()=>{
+				this.loading = false;
+				this.setLoading(false);
+				this.hide();
+			})
+			: 
+			this.$fhcApi.factory.profilUpdate.insertProfilRequest(
               this.topic,
               this.profilUpdate,
               this.fileID ? this.fileID[0] : null
@@ -119,7 +121,12 @@ export default {
 			.then((res) => {
 			handleApiResponse(res);
 			})
-			.catch((err) => this.handleFailedError);
+			.catch((err) => this.$fhcAlert.handleSystemError)
+			.finally(() => {
+				this.loading = false;
+				this.setLoading(false);
+				this.hide();
+			});
       }
     },
 

From 4836ed8de0eda65c7d7259fe8c273061cf891eb2 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 13 Sep 2024 13:44:53 +0200
Subject: [PATCH 1211/1461] adds LvMenu to the CalendarModel WIP

---
 .../api/frontend/v1/Stundenplan.php           |  9 +++
 .../models/ressource/Stundenplan_model.php    |  5 +-
 public/js/api/stundenplan.js                  |  6 ++
 .../js/components/Calendar/CalendarModal.js   | 57 ++++++++++++++-----
 4 files changed, 60 insertions(+), 17 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 398b4e4cc..0efd32807 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -32,6 +32,7 @@ class Stundenplan extends FHCAPI_Controller
             'Stunden' => self::PERM_LOGGED,
             'Reservierungen' => self::PERM_LOGGED,
 			'getStundenplan' => self::PERM_LOGGED,
+			'getLehreinheitStudiensemester' => self::PERM_LOGGED,
 		]);
 
         $this->load->library('LogLib');
@@ -154,6 +155,14 @@ class Stundenplan extends FHCAPI_Controller
         
 	}
 
+	public function getLehreinheitStudiensemester($lehreinheit_id){
+		$this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
+		$this->LehreinheitModel->addSelect(["studiensemester_kurzbz"]);
+		$result = $this->LehreinheitModel->load($lehreinheit_id);
+		$result = current($this->getDataOrTerminateWithError($result))->studiensemester_kurzbz;
+		$this->terminateWithSuccess($result);	
+	}
+
 	private function expand_object_information($data){
 		foreach ($data as $item) {
 
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index d52d36b1d..bebbb974f 100755
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -149,8 +149,9 @@ class Stundenplan_model extends DB_Model
 		array_agg(DISTINCT lektor) as lektor,
 		array_agg(DISTINCT (gruppe,verband,semester,studiengang_kz,gruppen_kuerzel)) as gruppe,
 		string_agg(DISTINCT ort_kurzbz, '/') as ort_kurzbz,
+		array_agg(DISTINCT lehreinheit_id) as lehreinheit_id,
 		
-		titel, lehrfach, lehrform, lehrfach_bez, organisationseinheit, farbe
+		titel, lehrfach, lehrform, lehrfach_bez, organisationseinheit, farbe, lehrveranstaltung_id
 
 		FROM
 		(
@@ -177,7 +178,7 @@ class Stundenplan_model extends DB_Model
 			
 		) as subquery
 
-		GROUP BY unr, datum, beginn, ende, ort_kurzbz, titel, lehrform, lehrfach, lehrfach_bez, organisationseinheit, farbe
+		GROUP BY unr, datum, beginn, ende, ort_kurzbz, titel, lehrform, lehrfach, lehrfach_bez, organisationseinheit, farbe, lehrveranstaltung_id
 
 		ORDER BY datum, beginn
 		");
diff --git a/public/js/api/stundenplan.js b/public/js/api/stundenplan.js
index 1e06d3d8c..0d9fad810 100644
--- a/public/js/api/stundenplan.js
+++ b/public/js/api/stundenplan.js
@@ -30,4 +30,10 @@ export default {
 			{ start_date, end_date }
 		);
 	},
+	getLehreinheitStudiensemester(lehreinheit_id) {
+		return this.$fhcApi.get(
+			`/api/frontend/v1/Stundenplan/getLehreinheitStudiensemester/${lehreinheit_id}`,
+			{}
+		);
+	},
 };
\ No newline at end of file
diff --git a/public/js/components/Calendar/CalendarModal.js b/public/js/components/Calendar/CalendarModal.js
index 40fb3a7b3..5d96ad459 100644
--- a/public/js/components/Calendar/CalendarModal.js
+++ b/public/js/components/Calendar/CalendarModal.js
@@ -29,13 +29,11 @@ export default {
   data() {
     return {
       data:this.event,
-    
+	  menu: [],
       result: false,
       info: null,
     };
   },
-  
-
   computed: {
     start_time: function(){
       if(!this.data.start) return 'N/A';
@@ -46,6 +44,27 @@ export default {
       return this.data.end.getHours() + ":" + this.data.end.getMinutes();
     }
   },
+  methods:{
+	onModalShow: function(){
+		console.log(this.event)
+		if (this.event.type == 'lehreinheit') {
+			this.$fhcApi.factory.stundenplan.getLehreinheitStudiensemester(this.event.lehreinheit_id[0]).then(
+				res=>res.data
+			).then(
+				studiensemester_kurzbz =>{
+					this.$fhcApi.factory.addons.getLvMenu(this.data.lehrveranstaltung_id, studiensemester_kurzbz).then(res => {
+						//this.$fhcApi.factory.addons.getLvMenu(750, "WS2005").then(res =>{
+						if (res.data) {
+							this.menu = res.data;
+						}
+
+					});
+				}
+			)
+		}
+			
+	}
+  },
   mounted() {
     this.modal = this.$refs.modalContainer.modal;
   },
@@ -53,31 +72,39 @@ export default {
     return BsModal.popup.bind(this)(null, options);
   },
   template: /*html*/ `
-  <bs-modal ref="modalContainer" v-bind="$props" body-class="" dialog-class="modal-lg" class="bootstrap-alert" backdrop="false" >
+  <bs-modal ref="modalContainer" @showBsModal="onModalShow" v-bind="$props" body-class="" dialog-class="modal-lg" class="bootstrap-alert" backdrop="false" >
     <template v-slot:title>
-    	<template v-if="data.titel">{{ data.titel + ' - ' + data.lehrfach_bez + ' [' + data.ort_kurzbz+']'}}</template>
+  		<template v-if="data.titel">{{ data.titel + ' - ' + data.lehrfach_bez + ' [' + data.ort_kurzbz+']'}}</template>
 		<template v-else>{{ data.lehrfach_bez + ' [' + data.ort_kurzbz+']'}}</template>
     </template>
     <template v-slot:default>
         <div class="row">
-        <div class="offset-3 col-4"><span>Datum:</span></div>
-        <div class=" col"><span>{{data.datum}}</span></div>
+			<div class="offset-3 col-4"><span>Datum:</span></div>
+			<div class=" col"><span>{{data.datum}}</span></div>
         </div>
         <div class="row">
-        <div class="offset-3 col-4"><span>Raum:</span></div>
-        <div class=" col"><span>{{data.ort_kurzbz}}</span></div>
+			<div class="offset-3 col-4"><span>Raum:</span></div>
+			<div class=" col"><span>{{data.ort_kurzbz}}</span></div>
         </div>
         <div class="row">
-        <div class="offset-3 col-4"><span>LV:</span></div>
-        <div class=" col"><span>{{'('+data.lehrform+') ' + data.lehrfach_bez}}</span></div>
+			<div class="offset-3 col-4"><span>LV:</span></div>
+			<div class=" col"><span>{{'('+data.lehrform+') ' + data.lehrfach_bez}}</span></div>
         </div>
         <div class="row">
-        <div class="offset-3 col-4"><span>Lektor:</span></div>
-        <div class=" col"><span>{{data.lektor.map(lektor=>lektor.kurzbz).join("/")}}</span></div>
+			<div class="offset-3 col-4"><span>Lektor:</span></div>
+			<div class=" col"><span>{{data.lektor.map(lektor=>lektor.kurzbz).join("/")}}</span></div>
         </div>
         <div class="row">
-        <div class="offset-3 col-4"><span>Zeitraum:</span></div>
-        <div class=" col"><span>{{start_time + ' - ' + end_time}}</span></div>
+			<div class="offset-3 col-4"><span>Zeitraum:</span></div>
+			<div class=" col"><span>{{start_time + ' - ' + end_time}}</span></div>
+        </div>
+		<div class="row">
+			<div class=" col"><h2>LvMenu:</h2></div>
+        </div>
+		<div v-for="menuPunkt in menu" class="row">
+			<div class="col">
+  				<a target="_blank" :href="menuPunkt.c4_link">{{menuPunkt.name}}</a>
+			</div>
         </div>
     </template>
  

From e1c395146ba5cbae62da5b671490e6f83e268f67 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 16 Sep 2024 14:55:26 +0200
Subject: [PATCH 1212/1461] refactors the LvMenu into its own component and
 removes debugging prints

---
 public/js/apps/Cis.js                         |   1 -
 public/js/apps/Cis/MyLv/Student.js            |   3 +-
 .../js/components/Calendar/CalendarModal.js   | 229 +++++++++---------
 public/js/components/Cis/Mylv/LvMenu.js       |  66 +++++
 public/js/components/Cis/Mylv/LvUebersicht.js |  47 +---
 .../Cis/Mylv/Semester/Studiengang/Lv/Info.js  | 216 +++++++++--------
 .../ProfilComponents/FetchProfilUpdates.js    |   1 -
 .../Cis/ProfilUpdate/ProfilUpdateView.js      |   4 -
 public/js/components/Dashboard/Admin.js       |   1 -
 .../js/components/Dashboard/Admin/Presets.js  |   1 -
 public/js/components/Dashboard/Dashboard.js   |   2 -
 public/js/components/Pagination/Pagination.js |   2 +-
 .../Stv/Studentenverwaltung/List/New.js       |   2 +-
 public/js/components/searchbar/searchbar.js   |  12 -
 .../anrechnung/approveAnrechnungDetail.js     |   1 -
 15 files changed, 314 insertions(+), 274 deletions(-)
 create mode 100644 public/js/components/Cis/Mylv/LvMenu.js

diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js
index 996457268..b626df690 100755
--- a/public/js/apps/Cis.js
+++ b/public/js/apps/Cis.js
@@ -86,7 +86,6 @@ Vue.createApp({
             return Vue.$fhcapi.Search.search(searchsettings);
         },
         updatesearchtypes: function(newValues){
-            console.log(newValues,"this are the new values")
            this.selectedtypes= newValues;
             
         },
diff --git a/public/js/apps/Cis/MyLv/Student.js b/public/js/apps/Cis/MyLv/Student.js
index 27c340a2c..ded0178fb 100755
--- a/public/js/apps/Cis/MyLv/Student.js
+++ b/public/js/apps/Cis/MyLv/Student.js
@@ -1,7 +1,8 @@
 import MylvStudent from "../../../components/Cis/Mylv/Student.js";
+import Phrasen from "../../../plugin/Phrasen.js";
 
 Vue.createApp({
 	components: {
 		MylvStudent
 	}
-}).mount('#content');
\ No newline at end of file
+}).use(Phrasen).mount('#content');
\ No newline at end of file
diff --git a/public/js/components/Calendar/CalendarModal.js b/public/js/components/Calendar/CalendarModal.js
index 5d96ad459..2d42e7ece 100644
--- a/public/js/components/Calendar/CalendarModal.js
+++ b/public/js/components/Calendar/CalendarModal.js
@@ -1,118 +1,123 @@
 import BsModal from "../Bootstrap/Modal.js";
 import Alert from "../Bootstrap/Alert.js";
+import LvMenu from "../Cis/Mylv/LvMenu.js"
 
 export default {
-  components: {
-    BsModal,
-    Alert,
-  },
-  mixins: [BsModal],
-  props: {
-    event:Object,
-    title:{
-        type:String,
-        default:"title"
-    },
-    /*
-     * NOTE(chris):
-     * Hack to expose in "emits" declared events to $props which we use
-     * in the v-bind directive to forward all events.
-     * @see: https://github.com/vuejs/core/issues/3432
-     */
-    onHideBsModal: Function,
-    onHiddenBsModal: Function,
-    onHidePreventedBsModal: Function,
-    onShowBsModal: Function,
-    onShownBsModal: Function,
-  },
-
-  data() {
-    return {
-      data:this.event,
-	  menu: [],
-      result: false,
-      info: null,
-    };
-  },
-  computed: {
-    start_time: function(){
-      if(!this.data.start) return 'N/A';
-      return this.data.start.getHours() + ":" + this.data.start.getMinutes();
-    },
-    end_time: function(){
-      if(!this.data.end) return 'N/A';
-      return this.data.end.getHours() + ":" + this.data.end.getMinutes();
-    }
-  },
-  methods:{
-	onModalShow: function(){
-		console.log(this.event)
-		if (this.event.type == 'lehreinheit') {
-			this.$fhcApi.factory.stundenplan.getLehreinheitStudiensemester(this.event.lehreinheit_id[0]).then(
-				res=>res.data
-			).then(
-				studiensemester_kurzbz =>{
-					this.$fhcApi.factory.addons.getLvMenu(this.data.lehrveranstaltung_id, studiensemester_kurzbz).then(res => {
-						//this.$fhcApi.factory.addons.getLvMenu(750, "WS2005").then(res =>{
-						if (res.data) {
-							this.menu = res.data;
-						}
-
-					});
-				}
-			)
+	components: {
+		BsModal,
+		Alert,
+		LvMenu,
+	},
+	mixins: [BsModal],
+	props: {
+		event:Object,
+		title:{
+		type:String,
+		default:"title"
+	},
+	/*
+	* NOTE(chris):
+	* Hack to expose in "emits" declared events to $props which we use
+	* in the v-bind directive to forward all events.
+	* @see: https://github.com/vuejs/core/issues/3432
+	*/
+		onHideBsModal: Function,
+		onHiddenBsModal: Function,
+		onHidePreventedBsModal: Function,
+		onShowBsModal: Function,
+		onShownBsModal: Function,
+	},
+	data() {
+		return {
+			data:this.event,
+			menu: [],
+			result: false,
+			info: null,
+			isMenuSelected:false,
+		};
+	},
+	computed: {
+		start_time: function(){
+		if(!this.data.start) return 'N/A';
+		return this.data.start.getHours() + ":" + this.data.start.getMinutes();
+		},
+		end_time: function(){
+		if(!this.data.end) return 'N/A';
+		return this.data.end.getHours() + ":" + this.data.end.getMinutes();
 		}
-			
-	}
-  },
-  mounted() {
-    this.modal = this.$refs.modalContainer.modal;
-  },
-  popup(options) {
-    return BsModal.popup.bind(this)(null, options);
-  },
-  template: /*html*/ `
-  <bs-modal ref="modalContainer" @showBsModal="onModalShow" v-bind="$props" body-class="" dialog-class="modal-lg" class="bootstrap-alert" backdrop="false" >
-    <template v-slot:title>
-  		<template v-if="data.titel">{{ data.titel + ' - ' + data.lehrfach_bez + ' [' + data.ort_kurzbz+']'}}</template>
-		<template v-else>{{ data.lehrfach_bez + ' [' + data.ort_kurzbz+']'}}</template>
-    </template>
-    <template v-slot:default>
-        <div class="row">
-			<div class="offset-3 col-4"><span>Datum:</span></div>
-			<div class=" col"><span>{{data.datum}}</span></div>
-        </div>
-        <div class="row">
-			<div class="offset-3 col-4"><span>Raum:</span></div>
-			<div class=" col"><span>{{data.ort_kurzbz}}</span></div>
-        </div>
-        <div class="row">
-			<div class="offset-3 col-4"><span>LV:</span></div>
-			<div class=" col"><span>{{'('+data.lehrform+') ' + data.lehrfach_bez}}</span></div>
-        </div>
-        <div class="row">
-			<div class="offset-3 col-4"><span>Lektor:</span></div>
-			<div class=" col"><span>{{data.lektor.map(lektor=>lektor.kurzbz).join("/")}}</span></div>
-        </div>
-        <div class="row">
-			<div class="offset-3 col-4"><span>Zeitraum:</span></div>
-			<div class=" col"><span>{{start_time + ' - ' + end_time}}</span></div>
-        </div>
-		<div class="row">
-			<div class=" col"><h2>LvMenu:</h2></div>
-        </div>
-		<div v-for="menuPunkt in menu" class="row">
-			<div class="col">
-  				<a target="_blank" :href="menuPunkt.c4_link">{{menuPunkt.name}}</a>
-			</div>
-        </div>
-    </template>
- 
-     <!-- optional footer -->
-     <template  v-slot:footer >
-        
-     <button class="btn btn-outline-secondary " @click="hide">{{$p.t('ui','cancel')}}</button>    
-       </template>
-     <!-- end of optional footer --> 
-  </bs-modal>`,
+	},
+	methods:{
+		onModalShow: function(){
+			if (this.event.type == 'lehreinheit') {
+				this.$fhcApi.factory.stundenplan.getLehreinheitStudiensemester(this.event.lehreinheit_id[0]).then(
+					res=>res.data
+				).then(
+					studiensemester_kurzbz =>{
+						this.$fhcApi.factory.addons.getLvMenu(this.data.lehrveranstaltung_id, studiensemester_kurzbz).then(res => {
+							if (res.data) {
+								this.menu = res.data;
+							}
+						});
+					}
+				)
+			}
+		},
+		onModalHide:function(){
+			this.isMenuSelected = false;
+		}
+	},
+	mounted() {
+		this.modal = this.$refs.modalContainer.modal;
+	},
+	popup(options) {
+		return BsModal.popup.bind(this)(null, options);
+	},
+	template: /*html*/ `
+	<bs-modal ref="modalContainer" @showBsModal="onModalShow" @hideBsModal="onModalHide" v-bind="$props" :bodyClass="''" :dialogClass="{'modal-lg': !isMenuSelected, 'modal-fullscreen':isMenuSelected}" class="bootstrap-alert" backdrop="false" >
+		<template v-slot:title>
+			<template v-if="data.titel">{{ data.titel + ' - ' + data.lehrfach_bez + ' [' + data.ort_kurzbz+']'}}</template>
+			<template v-else>{{ data.lehrfach_bez + ' [' + data.ort_kurzbz+']'}}</template>
+		</template>
+		<template v-slot:default>
+			<template v-if="!isMenuSelected">
+				<div class="row">
+					<div class="col">
+						<h3>Lehrveranstaltungs Informationen</h3>
+					</div>
+				</div>
+				<div class="row">
+					<div class="offset-3 col-4"><span>Datum:</span></div>
+					<div class=" col"><span>{{data.datum}}</span></div>
+				</div>
+				<div class="row">
+					<div class="offset-3 col-4"><span>Raum:</span></div>
+					<div class=" col"><span>{{data.ort_kurzbz}}</span></div>
+				</div>
+				<div class="row">
+					<div class="offset-3 col-4"><span>LV:</span></div>
+					<div class=" col"><span>{{'('+data.lehrform+') ' + data.lehrfach_bez}}</span></div>
+				</div>
+				<div class="row">
+					<div class="offset-3 col-4"><span>Lektor:</span></div>
+					<div class=" col"><span>{{data.lektor.map(lektor=>lektor.kurzbz).join("/")}}</span></div>
+				</div>
+				<div class="row">
+					<div class="offset-3 col-4"><span>Zeitraum:</span></div>
+					<div class=" col"><span>{{start_time + ' - ' + end_time}}</span></div>
+				</div>
+				<hr class="my-5">
+				<div v-if="menu" class="row">
+					<div class="col">
+						<h3>Lehrveranstaltungs Menu</h3>
+					</div>
+				</div>
+			</template>
+			<lv-menu v-model:isMenuSelected="isMenuSelected" :menu="menu"></lv-menu>
+		</template>
+		<!-- optional footer -->
+		<template  v-slot:footer >
+			<button class="btn btn-outline-secondary " @click="hide">{{$p.t('ui','cancel')}}</button>    
+		</template>
+		<!-- end of optional footer --> 
+	</bs-modal>`,
 };
diff --git a/public/js/components/Cis/Mylv/LvMenu.js b/public/js/components/Cis/Mylv/LvMenu.js
new file mode 100644
index 000000000..f0ce41aca
--- /dev/null
+++ b/public/js/components/Cis/Mylv/LvMenu.js
@@ -0,0 +1,66 @@
+
+export default {
+	props:{
+		isMenuSelected:{
+			type:Boolean,
+			default:false,
+		},
+		menu:{
+			type:Array,
+			default:null,
+		},
+	},
+	data(){
+		return{
+			selectedMenu:null,
+		}
+	},
+	watch:{
+		isMenuSelected: function (newValue) {
+			// if no Menu point has been selected, show all Menu options
+			if (!newValue){
+				this.selectedMenu = null;
+			}
+		}
+	},
+	emits:["update:isMenuSelected"],
+	methods:{
+		selectMenu: function (menuItem, index = null) {
+
+			// early return if link is #
+			if (index != null && menuItem.c4_linkList[index][1] == '#') return;
+
+			switch (menuItem.id) {
+				case "core_menu_mailanstudierende": window.location.href = menuItem.c4_link; break;
+				default:
+					this.selectedMenu = { ...menuItem };
+					this.$emit("update:isMenuSelected", true);
+			}
+
+			if (this.selectedMenu && index != null && menuItem.c4_linkList[index][1] != '#') {
+				this.selectedMenu.c4_link = menuItem.c4_linkList[index][1];
+				this.selectedMenu.name += ' - ' + menuItem.c4_linkList[index][0];
+			}
+
+			
+		},
+	},
+	template:/*html*/`
+	<div v-if="selectedMenu" class="d-flex flex-column h-100">
+		<div class="d-flex mb-2">
+			<button v-if="selectedMenu" @click="$emit('update:isMenuSelected', false)" class="btn btn-secondary me-2"><i class="fa fa-chevron-left"></i> Back</button>
+			<h2>{{selectedMenu.name}}</h2>
+		</div>
+		<iframe class="h-100 w-100" :src="selectedMenu.c4_link" :title="selectedMenu.name"></iframe>
+	</div>
+	<div v-else-if="!menu">No Menu available</div>
+	<div v-else :style="{'display':'grid', 'row-gap':'10px', 'column-gap':'10px', 'grid-template-columns':'repeat(3,minmax(100px,1fr))', 'grid-template-rows':'repeat('+Math.ceil(menu.length / 3)+',minmax(100px,1fr))'} ">
+		<div :title="menuItem.name" role="button" @click="selectMenu(menuItem)" class="lvUebersichtMenuPunkt border border-1 d-flex flex-column align-items-center justify-content-center p-1 text-center" v-for="(menuItem, index) in menu" :key="index">
+			<img :src="menuItem.c4_icon" :alt="menuItem.name" ></img>
+			<span @click="selectMenu(menuItem)" class="underline_hover mt-2">{{menuItem.name}}</span>
+			<span v-for="([text,link],index) in menuItem.c4_linkList" @click.stop="selectMenu(menuItem,index)"  :class="{'underline_hover':menuItem.c4_linkList[index][1] != '#'}" class="mt-1" :index="index">{{text}}</span>
+
+		</div>
+	</div>
+	`
+}
\ No newline at end of file
diff --git a/public/js/components/Cis/Mylv/LvUebersicht.js b/public/js/components/Cis/Mylv/LvUebersicht.js
index d080bd715..51a9076ba 100644
--- a/public/js/components/Cis/Mylv/LvUebersicht.js
+++ b/public/js/components/Cis/Mylv/LvUebersicht.js
@@ -1,5 +1,5 @@
 import BsModal from "../../Bootstrap/Modal";
-
+import LvMenu from "./LvMenu";
 export default  {
   
     props:{
@@ -13,42 +13,26 @@ export default  {
         return {
             result: false,
             menu: [],
-            selectedMenu:null,
+			isMenuSelected:false,
             
         }
     },
     mixins:[BsModal],
     components:{
         BsModal,
+		LvMenu,
     },
     methods:{
-        selectMenu: function(menuItem, index=null){
-            
-            // early return if link is #
-            if(index != null && menuItem.c4_linkList[index][1] == '#') return;
-
-            switch(menuItem.id){
-                case "core_menu_mailanstudierende": window.location.href=menuItem.c4_link; break;
-                default:
-                    this.selectedMenu= {...menuItem};
-            }
-
-            if( this.selectedMenu && index != null && menuItem.c4_linkList[index][1] !='#'){
-                this.selectedMenu.c4_link = menuItem.c4_linkList[index][1];
-                this.selectedMenu.name += ' - ' + menuItem.c4_linkList[index][0];
-            }
-        },
+        
         hiddenModal: function(){
-            this.selectedMenu = null;
+			this.isMenuSelected = false;
         },
         showModal: function(){
 
             this.$fhcApi.factory.addons.getLvMenu(this.event.lehrveranstaltung_id, this.event.studiensemester_kurzbz).then(res =>{
-            //this.$fhcApi.factory.addons.getLvMenu(750, "WS2005").then(res =>{
                 if(res.data){
                     this.menu = res.data;
                 }
-            
             });
         },
     },
@@ -56,29 +40,14 @@ export default  {
         this.modal = this.$refs.modalContainer;
     },
     template:/*html*/`
-    <bs-modal :bodyClass="selectedMenu ? '' : 'px-4 py-5'" @showBsModal="showModal" @hiddenBsModal="hiddenModal" ref="modalContainer" :dialogClass="{'modal-lg': !selectedMenu, 'modal-fullscreen':selectedMenu}">
+    <bs-modal :bodyClass="isMenuSelected ? '' : 'px-4 py-5'" @showBsModal="showModal" @hiddenBsModal="hiddenModal" ref="modalContainer" :dialogClass="{'modal-lg': !isMenuSelected, 'modal-fullscreen':isMenuSelected}">
         <template #title>
             <span v-if="event?.lehrfach_bez ">{{event?.lehrfach_bez + (event?.stg_kurzbzlang?' / ' + event?.stg_kurzbzlang:'')}}</span>
             <span v-else>Lehrveranstaltungs Übersicht</span>
-            
+
         </template>
         <template #default>
-          <div v-if="selectedMenu" class="d-flex flex-column h-100">
-                <div class="d-flex mb-2">
-                <button v-if="selectedMenu" @click="selectedMenu=null" class="btn btn-secondary me-2"><i class="fa fa-chevron-left"></i> Back</button>
-                <h2>{{selectedMenu.name}}</h2>
-                </div>
-                <iframe class="h-100 w-100" :src="selectedMenu.c4_link" :title="selectedMenu.name"></iframe>
-            </div>
-            <div v-else-if="!menu">No Menu available</div>
-            <div v-else :style="{'display':'grid', 'row-gap':'10px', 'column-gap':'10px', 'grid-template-columns':'repeat(3,minmax(100px,1fr))', 'grid-template-rows':'repeat('+Math.ceil(menu.length / 3)+',minmax(100px,1fr))'} ">
-                <div :title="menuItem.name" role="button" @click="selectMenu(menuItem)" class="lvUebersichtMenuPunkt border border-1 d-flex flex-column align-items-center justify-content-center p-1 text-center" v-for="(menuItem, index) in menu" :key="index">
-                    <img :src="menuItem.c4_icon" :alt="menuItem.name" ></img>    
-                    <span @click="selectMenu(menuItem)" class="underline_hover mt-2">{{menuItem.name}}</span> 
-                    <span v-for="([text,link],index) in menuItem.c4_linkList" @click.stop="selectMenu(menuItem,index)"  :class="{'underline_hover':menuItem.c4_linkList[index][1] != '#'}" class="mt-1" :index="index">{{text}}</span>
-                        
-                </div>
-            </div>
+			<lv-menu v-model:isMenuSelected="isMenuSelected" :menu="menu"></lv-menu>
         </template>
         
     </bs-modal>
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv/Info.js b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv/Info.js
index f3f284b31..764ebbc09 100755
--- a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv/Info.js
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv/Info.js
@@ -1,11 +1,13 @@
 import BsModal from '../../../../../Bootstrap/Modal.js';
 import Phrasen from '../../../../../../mixins/Phrasen.js';
+import LvMenu from '../../../LvMenu.js';
 
 const infos = {};
 
 export default {
 	components: {
-		BsModal
+		BsModal,
+		LvMenu
 	},
 	mixins: [
 		BsModal,
@@ -35,7 +37,9 @@ export default {
 	},
 	data: () => ({
 		result: true,
-		info: null
+		info: null,
+		isMenuSelected: false,
+		menu: [],
 	}),
 	computed: {
 		lektorNames() {
@@ -76,112 +80,130 @@ export default {
 			}).catch(() => this.info = {});
 		}
 	},
+	methods:{
+		onModelHide() {
+			this.isMenuSelected = false;
+		},
+		onModalShow() {
+			this.$fhcApi.factory.addons.getLvMenu(this.lehrveranstaltung_id, this.studien_semester)
+			.then(res => {
+				this.menu = res.data;
+			})
+			.catch((error) => this.$fhcAlert.handleSystemError);
+		}
+	},
 	mounted() {
 		this.modal = this.$refs.modalContainer.modal;
 	},
 	popup(options) {
 		return BsModal.popup.bind(this)(null, options);
 	},
-	template: `<bs-modal ref="modalContainer" class="bootstrap-alert" v-bind="$props" body-class="" dialog-class="modal-lg">
+	template: /*html*/`
+	<bs-modal ref="modalContainer" @hideBsModal="onModelHide" @showBsModal="onModalShow" class="bootstrap-alert" v-bind="$props" body-class="" :dialogClass="{'modal-lg': !isMenuSelected, 'modal-fullscreen':isMenuSelected}">
 		<template v-slot:title>
 			{{p.t('lvinfo/lehrveranstaltungsinformationen')}}
 		</template>
 		<template v-slot:default>
-			<div v-if="!info" class="text-center">
-				<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
-			</div>
-			<table v-else class="table table-hover">
-				<tbody>
-					<tr>
-						<th>{{p.t('lehre/lehrveranstaltung')}}</th>
-						<td>{{bezeichnung}}</td>
-					</tr>
-					<tr>
-						<th>{{p.t('lehre/studiengang')}}</th>
-						<td>{{studiengang_kuerzel}}</td>
-					</tr>
-					<tr>
-						<th>{{p.t('lehre/semester')}}</th>
-						<td>{{semester}}</td>
-					</tr>
-					<tr>
-						<th>{{p.t('lehre/studiensemester')}}</th>
-						<td>{{studien_semester}}</td>
-					</tr>
-					<tr>
-						<th>{{p.t('lehre/organisationsform')}}</th>
-						<td>{{orgform_kurzbz}}</td>
-					</tr>
-					<tr>
-						<th>{{p.t('lehre/lehrbeauftragter')}}</th>
-						<td>
-							<ul v-if="lektorNames.length" class="list-unstyled mb-0">
-								<li v-for="name in lektorNames" :key="name">
-									<!-- TODO(chris): link? -->
-									{{name}}
-								</li>
-							</ul>
-							<template v-else>
-								{{p.t('lehre/keinLektorZugeordnet')}}
-							</template>
-						</td>
-					</tr>
-					<tr v-if="lvLeitung">
-						<th>{{p.t('lehre/lvleitung')}}</th>
-						<td>
-							<ul class="list-unstyled mb-0">
-								<li v-for="name in lvLeitung" :key="name">
-									<!-- TODO(chris): link? -->
-									{{name}}
-								</li>
-							</ul>
-						</td>
-					</tr>
-					<tr>
-						<th>{{p.t('global/sprache')}}</th>
-						<td>{{sprache}}</td>
-					</tr>
-					<tr>
-						<th>{{p.t('lehre/ects')}}</th>
-						<td>{{ects}}</td>
-					</tr>
-					<tr>
-						<th>{{p.t('lehre/incomingplaetze')}}</th>
-						<td>{{incoming}}</td>
-					</tr>
-					<tr>
-						<th>{{p.t('lehre/organisationseinheit')}}</th>
-						<td>
-							{{oe}} <br>
-							(
-							<i>{{p.t('global/leitung')}}: </i>{{oeLeitung.join(', ')}}
-							<template v-if="koordinator">
-								<i>{{p.t('global/koordination')}}: </i>{{koordinator.join(', ')}}
-							</template>
-							)
-						</td>
-					</tr>
-				</tbody>
-			</table>
-			<div v-if="info && info.lvinfo">
-				<div v-if="Object.keys(info.lvinfo).length > 1" class="text-end">
-					<div class="btn-group" role="group" :title="p.t('global/verfuegbareSprachen')" :aria-label="p.t('global/verfuegbareSprachen')">
-						<template v-for="lang in info.sprachen" :key="lang.index">
-							<button v-if="info.lvinfo[lang.sprache]" type="button" class="btn btn-outline-primary" :class="lang.sprache == currentLang ? 'active' : ''" @click.prevent="info.lastLang = lang.sprache">{{lang.bezeichnung[lang.index-1]}}</button>
-						</template>
-					</div>
+			<template v-if="!isMenuSelected">
+				<div v-if="!info" class="text-center">
+					<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
 				</div>
-				<template v-for="i in info.lvinfo[currentLang]" :key="info">
-					<h4>{{i.header}}</h4>
-					<h6 v-if="i.subheader">{{i.subheader}}</h6>
-					<ul v-if="Array.isArray(i.body)">
-						<li v-for="e in i.body" :key="e">{{e}}</li>
-					</ul>
-					<p v-else>
-						{{i.body}}
-					</p>
-				</template>
-			</div>
+				<table v-else class="table table-hover">
+					<tbody>
+						<tr>
+							<th>{{p.t('lehre/lehrveranstaltung')}}</th>
+							<td>{{bezeichnung}}</td>
+						</tr>
+						<tr>
+							<th>{{p.t('lehre/studiengang')}}</th>
+							<td>{{studiengang_kuerzel}}</td>
+						</tr>
+						<tr>
+							<th>{{p.t('lehre/semester')}}</th>
+							<td>{{semester}}</td>
+						</tr>
+						<tr>
+							<th>{{p.t('lehre/studiensemester')}}</th>
+							<td>{{studien_semester}}</td>
+						</tr>
+						<tr>
+							<th>{{p.t('lehre/organisationsform')}}</th>
+							<td>{{orgform_kurzbz}}</td>
+						</tr>
+						<tr>
+							<th>{{p.t('lehre/lehrbeauftragter')}}</th>
+							<td>
+								<ul v-if="lektorNames.length" class="list-unstyled mb-0">
+									<li v-for="name in lektorNames" :key="name">
+										<!-- TODO(chris): link? -->
+										{{name}}
+									</li>
+								</ul>
+								<template v-else>
+									{{p.t('lehre/keinLektorZugeordnet')}}
+								</template>
+							</td>
+						</tr>
+						<tr v-if="lvLeitung">
+							<th>{{p.t('lehre/lvleitung')}}</th>
+							<td>
+								<ul class="list-unstyled mb-0">
+									<li v-for="name in lvLeitung" :key="name">
+										<!-- TODO(chris): link? -->
+										{{name}}
+									</li>
+								</ul>
+							</td>
+						</tr>
+						<tr>
+							<th>{{p.t('global/sprache')}}</th>
+							<td>{{sprache}}</td>
+						</tr>
+						<tr>
+							<th>{{p.t('lehre/ects')}}</th>
+							<td>{{ects}}</td>
+						</tr>
+						<tr>
+							<th>{{p.t('lehre/incomingplaetze')}}</th>
+							<td>{{incoming}}</td>
+						</tr>
+						<tr>
+							<th>{{p.t('lehre/organisationseinheit')}}</th>
+							<td>
+								{{oe}} <br>
+								(
+								<i>{{p.t('global/leitung')}}: </i>{{oeLeitung.join(', ')}}
+								<template v-if="koordinator">
+									<i>{{p.t('global/koordination')}}: </i>{{koordinator.join(', ')}}
+								</template>
+								)
+							</td>
+						</tr>
+					</tbody>
+				</table>
+			</template>
+			<lv-menu v-model:isMenuSelected="isMenuSelected" :menu="menu"></lv-menu>
+			<template v-if="!isMenuSelected">
+				<div v-if="info && info.lvinfo">
+					<div v-if="Object.keys(info.lvinfo).length > 1" class="text-end">
+						<div class="btn-group" role="group" :title="p.t('global/verfuegbareSprachen')" :aria-label="p.t('global/verfuegbareSprachen')">
+							<template v-for="lang in info.sprachen" :key="lang.index">
+								<button v-if="info.lvinfo[lang.sprache]" type="button" class="btn btn-outline-primary" :class="lang.sprache == currentLang ? 'active' : ''" @click.prevent="info.lastLang = lang.sprache">{{lang.bezeichnung[lang.index-1]}}</button>
+							</template>
+						</div>
+					</div>
+					<template v-for="i in info.lvinfo[currentLang]" :key="info">
+						<h4>{{i.header}}</h4>
+						<h6 v-if="i.subheader">{{i.subheader}}</h6>
+						<ul v-if="Array.isArray(i.body)">
+							<li v-for="e in i.body" :key="e">{{e}}</li>
+						</ul>
+						<p v-else>
+							{{i.body}}
+						</p>
+					</template>
+				</div>
+			</template>
 		</template>
 	</bs-modal>`
 }
diff --git a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
index 9caee9468..11c5960e4 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
@@ -46,7 +46,6 @@ export default {
       let withFiles = false;
 
       if (view === "TextInputDokument") {
-        console.log("text input")
         data = {
           titel: updateRequest.topic,
           value: updateRequest.requested_change.value,
diff --git a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
index 4f5f6578f..c30f1ab89 100644
--- a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
+++ b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
@@ -127,10 +127,6 @@ export default {
                   "acceptUpdate"
                 )}`,
                 action: (e, column) => {
-                  console.log(
-                    "this is the data of the context menu action",
-                    column.getData()
-                  );
                   this.$fhcApi.factory.profilUpdate.acceptProfilRequest(column.getData())
                     .then((res) => {
                       this.$refs.UpdatesTable.tabulator.setData();
diff --git a/public/js/components/Dashboard/Admin.js b/public/js/components/Dashboard/Admin.js
index b92609ad7..f1a837880 100755
--- a/public/js/components/Dashboard/Admin.js
+++ b/public/js/components/Dashboard/Admin.js
@@ -73,7 +73,6 @@ export default {
 	},
 	created() {
 		axios.get(this.apiurl + '/Dashboard').then(res => {
-			//console.log(res.data.retval);
 			this.dashboards = res.data.retval;
 		}).catch(err => console.error('ERROR:', err));
 	},
diff --git a/public/js/components/Dashboard/Admin/Presets.js b/public/js/components/Dashboard/Admin/Presets.js
index 63e010014..8b7e7d8b9 100755
--- a/public/js/components/Dashboard/Admin/Presets.js
+++ b/public/js/components/Dashboard/Admin/Presets.js
@@ -144,7 +144,6 @@ export default {
 	},
 	created() {
 		axios.get(this.apiurl + '/Config/funktionen').then(res => {
-			//console.log(res.data.retval);
 			this.funktionen = {general: 'GENERAL'};
 			res.data.retval.forEach(funktion => {
 				this.funktionen[funktion.funktion_kurzbz] = funktion.beschreibung;
diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js
index 65ec211eb..bc7199af0 100755
--- a/public/js/components/Dashboard/Dashboard.js
+++ b/public/js/components/Dashboard/Dashboard.js
@@ -25,7 +25,6 @@ export default {
 				axios.get(this.apiurl + '/Widget/getWidgetsForDashboard', {params:{
 					db: this.dashboard
 				}}).then(res => {
-					//console.log(res.data.retval);
 					res.data.retval.forEach(widget => {
 						widget.arguments = JSON.parse(widget.arguments);
 						widget.setup = JSON.parse(widget.setup);
@@ -123,7 +122,6 @@ export default {
 		axios.get(this.apiurl + '/Config', {params:{
 			db: this.dashboard
 		}}).then(res => {
-			//console.log(res.data.retval);
 			for (var name in res.data.retval.widgets) {
 				let widgets = [];
 				let remove = [];
diff --git a/public/js/components/Pagination/Pagination.js b/public/js/components/Pagination/Pagination.js
index 8b2688834..60ab9c9a4 100644
--- a/public/js/components/Pagination/Pagination.js
+++ b/public/js/components/Pagination/Pagination.js
@@ -18,7 +18,7 @@ export default {
   },
   methods: {
     newPageEvent: function (data) {
-      //console.log("hier", data.page);
+      
     },
   },
   mounted() {},
diff --git a/public/js/components/Stv/Studentenverwaltung/List/New.js b/public/js/components/Stv/Studentenverwaltung/List/New.js
index c02d9ba29..f66d931b8 100644
--- a/public/js/components/Stv/Studentenverwaltung/List/New.js
+++ b/public/js/components/Stv/Studentenverwaltung/List/New.js
@@ -99,7 +99,7 @@ export default {
 			this.suggestions = [];
 			this.$refs.form.clearValidation();
 		},
-		loadSuggestions() {console.log('loadSuggestions');
+		loadSuggestions() {
 			if (this.abortController.suggestions)
 				this.abortController.suggestions.abort();
 			if (this.person !== null)
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 83c4c666b..50e09eeb2 100755
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -79,23 +79,12 @@ export default {
     watch:{
         'searchsettings.types'(newValue){
             this.search();
-            
-            
         },
-        
     },
     beforeMount: function() {
         this.updateSearchOptions();
         
     },
-    mounted(){
-        window.addEventListener('resize', (event) =>{
-            console.log(this.$refs.settings,"this is the refs of the settings")
-            this.$refs.settings.hide();
-            console.log("resizing")
-        }); 
-        //console.log(this.$refs.settings.show,"this are the refs")
-    },
     methods: {
         getActionsForRoom: function(res){
             res.booklink= FHC_JS_DATA_STORAGE_OBJECT.app_root +
@@ -132,7 +121,6 @@ export default {
         },
         calcSearchResultExtent: function() {
             var rect = this.$refs.searchbox.getBoundingClientRect();
-            //console.log(window.innerWidth + ' ' + window.innerHeight + ' ' + JSON.stringify(rect));
             this.$refs.result.style.top = Math.floor(rect.bottom + 3) + 'px';
             this.$refs.result.style.right = Math.floor(window.innerWidth - rect.right) + 'px';
             this.$refs.result.style.width = Math.floor(window.innerWidth * 0.75) + 'px';
diff --git a/public/js/lehre/anrechnung/approveAnrechnungDetail.js b/public/js/lehre/anrechnung/approveAnrechnungDetail.js
index 3a40503b5..14d31f800 100755
--- a/public/js/lehre/anrechnung/approveAnrechnungDetail.js
+++ b/public/js/lehre/anrechnung/approveAnrechnungDetail.js
@@ -307,7 +307,6 @@ $(function(){
             {
                 successCallback: function (data, textStatus, jqXHR)
                 {
-                    console.log(data);
                     if (data.error && data.retval != null)
                     {
                         // Print error message

From 61e6ad063a08e05b67c3dff489f71b7b8dd1cc37 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 17 Sep 2024 09:28:11 +0200
Subject: [PATCH 1213/1461] solves Telefon displaying as null for some benutzer

---
 public/js/components/Cis/Profil/MitarbeiterProfil.js        | 6 ++----
 public/js/components/Cis/Profil/MitarbeiterViewProfil.js    | 6 ++----
 .../Cis/Profil/ProfilComponents/RoleInformation.js          | 4 ++--
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 5798df630..ed577442c 100755
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -226,10 +226,8 @@ export default {
         Geburtsdatum: this.data.gebdatum,
         Geburtsort: this.data.gebort,
         Kurzzeichen: this.data.kurzbz,
-        Telefon:
-          (this.data.standort_telefon ? this.data.standort_telefon : "") +
-          " " +
-          this.data.telefonklappe,
+        Telefon: 
+			(this.data.standort_telefon ? this.data.standort_telefon + " " + this.data.telefonklappe : this.data.telefonklappe),
         Büro: this.data.ort_kurzbz,
       };
     },
diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
index 6e4b504f6..4d41b21c5 100755
--- a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
@@ -123,10 +123,8 @@ export default {
         Geburtsdatum: this.data.gebdatum,
         Geburtsort: this.data.gebort,
         Kurzzeichen: this.data.kurzbz,
-        Telefon:
-          (this.data.standort_telefon ? this.data.standort_telefon : "") +
-          " " +
-          this.data.telefonklappe,
+		  Telefon:
+			  (this.data.standort_telefon ? this.data.standort_telefon + " " + this.data.telefonklappe : this.data.telefonklappe),
         Büro: this.data.ort_kurzbz,
       };
     },
diff --git a/public/js/components/Cis/Profil/ProfilComponents/RoleInformation.js b/public/js/components/Cis/Profil/ProfilComponents/RoleInformation.js
index 32c6d286c..26fb06876 100755
--- a/public/js/components/Cis/Profil/ProfilComponents/RoleInformation.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/RoleInformation.js
@@ -22,7 +22,7 @@ export default {
     <div class="card">
                  
     <div class="card-header">
-    {{title}}
+	{{title}}
     </div>
     <div class="card-body">
         <div class="gy-3 row">
@@ -32,7 +32,7 @@ export default {
            <div class="form-underline-titel">{{bez }}</div>
 
            <!-- print Telefon link -->
-           <a  v-if="bez=='Telefon'" :href="data.Telefon?'tel:'+data.Telefon:''" class="form-underline-content">{{wert?wert:'-'}}</a>
+           <a  v-if="bez=='Telefon'" :href="data.Telefon?'tel:'+data.Telefon:null" :class="{'form-underline-content':true,'text-decoration-none':!data.Telefon,'text-body':!data.Telefon}">{{wert?wert:'-'}}</a>
            
            <!-- else print information -->
            <span v-else class="form-underline-content">{{wert?wert:'-'}}</span>

From d931aad11c08bb7850e9df4409d69e57c41f2e00 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 17 Sep 2024 09:41:17 +0200
Subject: [PATCH 1214/1461] solves reactive data problem in CalendarModal

---
 public/js/apps/Cis/Stundenplan.js             |  1 -
 .../js/components/Calendar/CalendarModal.js   | 26 +++++++++----------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/public/js/apps/Cis/Stundenplan.js b/public/js/apps/Cis/Stundenplan.js
index 0342bb9d2..836586874 100755
--- a/public/js/apps/Cis/Stundenplan.js
+++ b/public/js/apps/Cis/Stundenplan.js
@@ -1,5 +1,4 @@
 import FhcCalendar from "../../components/Calendar/Calendar.js";
-import CalendarModal from '../../components/Calendar/CalendarModal.js';
 import Phrasen from "../../plugin/Phrasen.js";
 import CalendarDate from "../../composables/CalendarDate.js";
 
diff --git a/public/js/components/Calendar/CalendarModal.js b/public/js/components/Calendar/CalendarModal.js
index 2d42e7ece..475deeaa2 100644
--- a/public/js/components/Calendar/CalendarModal.js
+++ b/public/js/components/Calendar/CalendarModal.js
@@ -29,7 +29,6 @@ export default {
 	},
 	data() {
 		return {
-			data:this.event,
 			menu: [],
 			result: false,
 			info: null,
@@ -38,12 +37,12 @@ export default {
 	},
 	computed: {
 		start_time: function(){
-		if(!this.data.start) return 'N/A';
-		return this.data.start.getHours() + ":" + this.data.start.getMinutes();
+			if(!this.event.start) return 'N/A';
+			return this.event.start.getHours() + ":" + this.event.start.getMinutes();
 		},
 		end_time: function(){
-		if(!this.data.end) return 'N/A';
-		return this.data.end.getHours() + ":" + this.data.end.getMinutes();
+			if (!this.event.end) return 'N/A';
+			return this.event.end.getHours() + ":" + this.event.end.getMinutes();
 		}
 	},
 	methods:{
@@ -53,7 +52,7 @@ export default {
 					res=>res.data
 				).then(
 					studiensemester_kurzbz =>{
-						this.$fhcApi.factory.addons.getLvMenu(this.data.lehrveranstaltung_id, studiensemester_kurzbz).then(res => {
+						this.$fhcApi.factory.addons.getLvMenu(this.event.lehrveranstaltung_id, studiensemester_kurzbz).then(res => {
 							if (res.data) {
 								this.menu = res.data;
 							}
@@ -75,31 +74,32 @@ export default {
 	template: /*html*/ `
 	<bs-modal ref="modalContainer" @showBsModal="onModalShow" @hideBsModal="onModalHide" v-bind="$props" :bodyClass="''" :dialogClass="{'modal-lg': !isMenuSelected, 'modal-fullscreen':isMenuSelected}" class="bootstrap-alert" backdrop="false" >
 		<template v-slot:title>
-			<template v-if="data.titel">{{ data.titel + ' - ' + data.lehrfach_bez + ' [' + data.ort_kurzbz+']'}}</template>
-			<template v-else>{{ data.lehrfach_bez + ' [' + data.ort_kurzbz+']'}}</template>
+			<template v-if="event.titel">{{ event.titel + ' - ' + event.lehrfach_bez + ' [' + event.ort_kurzbz+']'}}</template>
+			<template v-else>{{ event.lehrfach_bez + ' [' + event.ort_kurzbz+']'}}</template>
 		</template>
 		<template v-slot:default>
 			<template v-if="!isMenuSelected">
 				<div class="row">
 					<div class="col">
-						<h3>Lehrveranstaltungs Informationen</h3>
+						<h3>{{$p.t('lvinfo','lehrveranstaltungsinformationen')}}</h3>
 					</div>
 				</div>
+
 				<div class="row">
 					<div class="offset-3 col-4"><span>Datum:</span></div>
-					<div class=" col"><span>{{data.datum}}</span></div>
+					<div class=" col"><span>{{event.datum}}</span></div>
 				</div>
 				<div class="row">
 					<div class="offset-3 col-4"><span>Raum:</span></div>
-					<div class=" col"><span>{{data.ort_kurzbz}}</span></div>
+					<div class=" col"><span>{{event.ort_kurzbz}}</span></div>
 				</div>
 				<div class="row">
 					<div class="offset-3 col-4"><span>LV:</span></div>
-					<div class=" col"><span>{{'('+data.lehrform+') ' + data.lehrfach_bez}}</span></div>
+					<div class=" col"><span>{{'('+event.lehrform+') ' + event.lehrfach_bez}}</span></div>
 				</div>
 				<div class="row">
 					<div class="offset-3 col-4"><span>Lektor:</span></div>
-					<div class=" col"><span>{{data.lektor.map(lektor=>lektor.kurzbz).join("/")}}</span></div>
+					<div class=" col"><span>{{event.lektor.map(lektor=>lektor.kurzbz).join("/")}}</span></div>
 				</div>
 				<div class="row">
 					<div class="offset-3 col-4"><span>Zeitraum:</span></div>

From 7c85e981f9a93741a50b3746b8e004f69365cb10 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Tue, 17 Sep 2024 11:17:44 +0200
Subject: [PATCH 1215/1461] - absteigende sortierung endabgabe

---
 application/models/education/Paabgabe_model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/models/education/Paabgabe_model.php b/application/models/education/Paabgabe_model.php
index b876030a6..5fb58cc81 100644
--- a/application/models/education/Paabgabe_model.php
+++ b/application/models/education/Paabgabe_model.php
@@ -25,7 +25,7 @@ class Paabgabe_model extends DB_Model
 				WHERE projektarbeit_id = ?
 				AND paabgabetyp_kurzbz = 'end'
 				AND paabg.abgabedatum IS NOT NULL
-				ORDER BY paabg.abgabedatum, paabg.datum DESC
+				ORDER BY paabg.abgabedatum DESC, paabg.datum DESC
 				LIMIT 1";
 
 		return $this->execQuery($qry, array($projektarbeit_id));

From 5ca639101c9495d1e34929095c1400330bf4f7ca Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 17 Sep 2024 11:39:39 +0200
Subject: [PATCH 1216/1461] fixes Month display of LVs

---
 public/js/apps/Cis/Stundenplan.js             | 28 ++++--
 .../js/components/Calendar/CalendarModal.js   | 86 ++++++++++++-------
 public/js/components/Calendar/Month/Page.js   |  2 +-
 .../Cis/Mylv/Semester/Studiengang/Lv/Info.js  |  2 +-
 4 files changed, 75 insertions(+), 43 deletions(-)

diff --git a/public/js/apps/Cis/Stundenplan.js b/public/js/apps/Cis/Stundenplan.js
index 836586874..19d8870c0 100755
--- a/public/js/apps/Cis/Stundenplan.js
+++ b/public/js/apps/Cis/Stundenplan.js
@@ -8,7 +8,7 @@ const app = Vue.createApp({
 		return {
 			stunden: [],
 			events: null,
-			calendarWeek: new CalendarDate(new Date()),
+			calendarDate: new CalendarDate(new Date()),
 
 		}
 	},
@@ -17,19 +17,29 @@ const app = Vue.createApp({
 	},
 	computed:{
 		weekFirstDay: function () {
-			return this.calendarDateToString(this.calendarWeek.cdFirstDayOfWeek);
+			return this.calendarDateToString(this.calendarDate.cdFirstDayOfWeek);
 		},
 		weekLastDay: function () {
-			return this.calendarDateToString(this.calendarWeek.cdLastDayOfWeek);
+			return this.calendarDateToString(this.calendarDate.cdLastDayOfWeek);
+		},
+		monthFirstDay: function () {
+			return this.calendarDateToString(this.calendarDate.cdFirstDayOfCalendarMonth);
+		},
+		monthLastDay: function () {
+			return this.calendarDateToString(this.calendarDate.cdLastDayOfCalendarMonth);
 		},
 	},
 	methods:{
 
 		updateRange: function (data) {
-			this.calendarWeek = new CalendarDate(data.start);
-			Vue.nextTick(() => {
-				this.loadEvents();
-			});
+			let tmp_date = new CalendarDate(data.start);
+			// only load month data if the month or year has changed
+			if(tmp_date.m != this.calendarDate.m || tmp_date.y != this.calendarDate.y){
+				this.calendarDate = tmp_date;
+				Vue.nextTick(() => {
+					this.loadEvents();
+				});
+			}
 		},
 
 		calendarDateToString: function (calendarDate) {
@@ -42,8 +52,8 @@ const app = Vue.createApp({
 
 		loadEvents: function(){
 			Promise.allSettled([
-				this.$fhcApi.factory.stundenplan.getStundenplan(this.weekFirstDay, this.weekLastDay),
-				this.$fhcApi.factory.stundenplan.getStundenplanReservierungen(this.weekFirstDay, this.weekLastDay)
+				this.$fhcApi.factory.stundenplan.getStundenplan(this.monthFirstDay, this.monthLastDay),
+				this.$fhcApi.factory.stundenplan.getStundenplanReservierungen(this.monthFirstDay, this.monthLastDay)
 			]).then((result) => {
 				let promise_events = [];
 				result.forEach((promise_result) => {
diff --git a/public/js/components/Calendar/CalendarModal.js b/public/js/components/Calendar/CalendarModal.js
index 475deeaa2..5841b64b7 100644
--- a/public/js/components/Calendar/CalendarModal.js
+++ b/public/js/components/Calendar/CalendarModal.js
@@ -79,38 +79,60 @@ export default {
 		</template>
 		<template v-slot:default>
 			<template v-if="!isMenuSelected">
-				<div class="row">
-					<div class="col">
-						<h3>{{$p.t('lvinfo','lehrveranstaltungsinformationen')}}</h3>
-					</div>
-				</div>
-
-				<div class="row">
-					<div class="offset-3 col-4"><span>Datum:</span></div>
-					<div class=" col"><span>{{event.datum}}</span></div>
-				</div>
-				<div class="row">
-					<div class="offset-3 col-4"><span>Raum:</span></div>
-					<div class=" col"><span>{{event.ort_kurzbz}}</span></div>
-				</div>
-				<div class="row">
-					<div class="offset-3 col-4"><span>LV:</span></div>
-					<div class=" col"><span>{{'('+event.lehrform+') ' + event.lehrfach_bez}}</span></div>
-				</div>
-				<div class="row">
-					<div class="offset-3 col-4"><span>Lektor:</span></div>
-					<div class=" col"><span>{{event.lektor.map(lektor=>lektor.kurzbz).join("/")}}</span></div>
-				</div>
-				<div class="row">
-					<div class="offset-3 col-4"><span>Zeitraum:</span></div>
-					<div class=" col"><span>{{start_time + ' - ' + end_time}}</span></div>
-				</div>
-				<hr class="my-5">
-				<div v-if="menu" class="row">
-					<div class="col">
-						<h3>Lehrveranstaltungs Menu</h3>
-					</div>
-				</div>
+				<h3>{{$p.t('lvinfo','lehrveranstaltungsinformationen')}}</h3>
+				<table class="table table-hover mb-4">
+					<tbody>
+						<tr>
+							<th>{{
+								$p.t('global','datum')?
+								$p.t('global','datum')+':'
+								:''
+							}}</th>
+							<td>{{event.datum}}</td>
+						</tr>
+						<tr>
+							<th>{{
+								$p.t('global','raum')?
+								$p.t('global','raum')+':'
+								:''
+							}}</th>
+							<td>{{event.ort_kurzbz}}</td>
+						</tr>
+						<tr>
+							<th>{{
+								$p.t('lehre','lehrveranstaltung')?
+								$p.t('lehre','lehrveranstaltung')+':'
+								:''
+							}}</th>
+							<td>{{'('+event.lehrform+') ' + event.lehrfach_bez}}</td>
+						</tr>
+						<tr>
+							<th>{{
+								$p.t('lehre','lektor')?
+								$p.t('lehre','lektor')+':'
+								:''
+							}}</th>
+							<td>{{event.lektor.map(lektor=>lektor.kurzbz).join("/")}}</td>
+						</tr>
+						<tr>
+							<th>{{
+								$p.t('ui','zeitraum')?
+								$p.t('ui','zeitraum')+':'
+								:''
+							}}</th>
+							<td>{{start_time + ' - ' + end_time}}</td>
+						</tr>
+						<tr>
+							<th>{{
+								$p.t('lehre','organisationseinheit')?
+								$p.t('lehre','organisationseinheit')+':'
+								:''
+							}}</th>
+							<td>{{event.organisationseinheit}}</td>
+						</tr>
+					</tbody>
+				</table>
+				<h3>Lehrveranstaltungs Menu</h3>
 			</template>
 			<lv-menu v-model:isMenuSelected="isMenuSelected" :menu="menu"></lv-menu>
 		</template>
diff --git a/public/js/components/Calendar/Month/Page.js b/public/js/components/Calendar/Month/Page.js
index 5cb9cdc53..a535546fd 100755
--- a/public/js/components/Calendar/Month/Page.js
+++ b/public/js/components/Calendar/Month/Page.js
@@ -66,7 +66,7 @@ export default {
 				<span class="no">{{day.getDate()}}</span>
 				<span v-if="events[day.toDateString()] && events[day.toDateString()].length" class="events">
 					<span v-for="event in events[day.toDateString()]" :key="event.id" style="color:white" :style="{'background-color': event.color}">
-						{{event.title}}
+						{{event.topic}}
 					</span>
 				</span>
 			</a>
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv/Info.js b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv/Info.js
index 764ebbc09..5d4b628a7 100755
--- a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv/Info.js
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv/Info.js
@@ -108,7 +108,7 @@ export default {
 				<div v-if="!info" class="text-center">
 					<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
 				</div>
-				<table v-else class="table table-hover">
+				<table v-else class="table table-hover mb-4">
 					<tbody>
 						<tr>
 							<th>{{p.t('lehre/lehrveranstaltung')}}</th>

From 6edc411a952c4bad2009c12f206d89d2a11854cd Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 17 Sep 2024 12:34:47 +0200
Subject: [PATCH 1217/1461] adds the LvMenu as dropdown options to the MyLV

---
 public/js/components/Cis/Mylv/LvMenu.js       | 21 ++++++-
 public/js/components/Cis/Mylv/LvUebersicht.js | 25 +++++---
 .../Cis/Mylv/Semester/Studiengang/Lv.js       | 59 +++++++++++++++++--
 .../components/DashboardWidget/Stundenplan.js |  5 +-
 system/phrasesupdate.php                      | 20 +++++++
 5 files changed, 115 insertions(+), 15 deletions(-)

diff --git a/public/js/components/Cis/Mylv/LvMenu.js b/public/js/components/Cis/Mylv/LvMenu.js
index f0ce41aca..7f30de4eb 100644
--- a/public/js/components/Cis/Mylv/LvMenu.js
+++ b/public/js/components/Cis/Mylv/LvMenu.js
@@ -9,6 +9,10 @@ export default {
 			type:Array,
 			default:null,
 		},
+		preselectedMenu: {
+			type: Object,
+			default: null,
+		},
 	},
 	data(){
 		return{
@@ -44,11 +48,26 @@ export default {
 
 			
 		},
+		back: function(){
+			if(this.preselectedMenu){
+				this.$emit('hideModal');
+			}else{
+				this.$emit('update:isMenuSelected', false);
+			}
+		},
+	},
+	watch:{
+		'preselectedMenu': function (newValue) {
+			if (newValue) {
+				this.selectedMenu = newValue;
+				this.$emit("update:isMenuSelected", true);
+			}
+		}
 	},
 	template:/*html*/`
 	<div v-if="selectedMenu" class="d-flex flex-column h-100">
 		<div class="d-flex mb-2">
-			<button v-if="selectedMenu" @click="$emit('update:isMenuSelected', false)" class="btn btn-secondary me-2"><i class="fa fa-chevron-left"></i> Back</button>
+			<button v-if="selectedMenu" @click="back" class="btn btn-secondary me-2"><i class="fa fa-chevron-left"></i> Back</button>
 			<h2>{{selectedMenu.name}}</h2>
 		</div>
 		<iframe class="h-100 w-100" :src="selectedMenu.c4_link" :title="selectedMenu.name"></iframe>
diff --git a/public/js/components/Cis/Mylv/LvUebersicht.js b/public/js/components/Cis/Mylv/LvUebersicht.js
index 51a9076ba..6670a0c76 100644
--- a/public/js/components/Cis/Mylv/LvUebersicht.js
+++ b/public/js/components/Cis/Mylv/LvUebersicht.js
@@ -7,7 +7,13 @@ export default  {
             type:Object,
             required:true,
             default:null,
-        }
+        },
+		// prop used to preselect a menu item and skip the grid overview
+		preselectedMenu: {
+			type: Object,
+			required: false,
+			default: null,
+		}
     },
     data(){
         return {
@@ -28,12 +34,15 @@ export default  {
 			this.isMenuSelected = false;
         },
         showModal: function(){
-
-            this.$fhcApi.factory.addons.getLvMenu(this.event.lehrveranstaltung_id, this.event.studiensemester_kurzbz).then(res =>{
-                if(res.data){
-                    this.menu = res.data;
-                }
-            });
+			if(!this.preselectedMenu){
+				this.$fhcApi.factory.addons.getLvMenu(this.event.lehrveranstaltung_id, this.event.studiensemester_kurzbz).then(res =>{
+					if(res.data){
+						this.menu = res.data;
+					}
+				});
+			}else{
+				this.isMenuSelected = true;
+			}
         },
     },
     mounted(){
@@ -47,7 +56,7 @@ export default  {
 
         </template>
         <template #default>
-			<lv-menu v-model:isMenuSelected="isMenuSelected" :menu="menu"></lv-menu>
+			<lv-menu v-model:isMenuSelected="isMenuSelected" :preselectedMenu="preselectedMenu" :menu="menu" @hideModal="hide"></lv-menu>
         </template>
         
     </bs-modal>
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
index dd6c57b30..5acf29221 100755
--- a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
@@ -1,10 +1,14 @@
 import LvPruefungen from "./Lv/Pruefungen.js";
 import LvInfo from "./Lv/Info.js";
 import Phrasen from "../../../../../mixins/Phrasen.js";
+import LvUebersicht from "../../LvUebersicht.js";
 
 // TODO(chris): L10n
 
 export default {
+	components:{
+		LvUebersicht,
+	},
 	mixins: [
 		Phrasen
 	],
@@ -29,7 +33,9 @@ export default {
 	data: () => {
 		return {
 			pruefungen: null,
-			info: null
+			info: null,
+			menu: null,
+			preselectedMenuItem: null,
 		}
 	},
 	computed: {
@@ -44,6 +50,28 @@ export default {
 		}
 	},
 	methods: {
+		openLvOption(menuItem){
+			if (menuItem.id == "core_menu_mailanstudierende"){
+				window.location.href = menuItem.c4_link;
+			}else{
+				this.preselectedMenuItem = menuItem;
+				Vue.nextTick(() => {
+					this.$refs.lvUebersicht.show();
+				});
+			}
+		},
+		onShowDropdown(){
+			//load menu
+			this.$fhcApi.factory.addons.getLvMenu(this.lehrveranstaltung_id, this.studien_semester)
+				.then(res => {
+					this.menu = res.data;
+				})
+				.catch((error) => this.$fhcAlert.handleSystemError);
+		},
+		onHideDropdown(){
+			//reset menu
+			this.menu = null;
+		},
 		openPruefungen() {
 			if (!this.pruefungen) {
 				this.pruefungen = true;
@@ -71,7 +99,15 @@ export default {
 			}
 		}
 	},
-	template: `<div class="mylv-semester-studiengang-lv card">
+	template: /*html*/`<div class="mylv-semester-studiengang-lv card">
+
+		<lv-uebersicht ref="lvUebersicht" :preselectedMenu="preselectedMenuItem" :event="{
+			lehrveranstaltung_id: lehrveranstaltung_id,
+			studiensemester_kurzbz:studien_semester,
+			lehrfach_bez:studien_semester,
+			stg_kurzbzlang:studien_semester,
+		}"/>
+		
 		<div v-if="module" class="card-header">
 			{{module}}
 		</div>
@@ -80,11 +116,26 @@ export default {
 		</div>
 		<div class="card-footer">
 			<div class="row">
-				<a href="#" class="col-auto text-start text-decoration-none" @click.prevent="openPruefungen">
+				<a href="#" class="col text-start text-decoration-none" @click.prevent="openPruefungen">
 					<i class="fa fa-check text-success" v-if="positiv"></i>
 					{{ grade || p.t('lehre/noGrades') }}
 				</a>
-				<div v-if="lvinfo" class="col text-end">
+				<div class="col-auto text-end">
+					<div class="dropdown">
+						<span @[\`show.bs.dropdown\`]="onShowDropdown" @[\`hide.bs.dropdown\`]="onHideDropdown" class="dropdown-toggle" type="button" id="LvOptions" data-bs-toggle="dropdown" aria-expanded="false">
+							{{$p.t('lehre','lvOptions')}}
+						</span>
+						<ul class="dropdown-menu dropdown-menu-dark" aria-labelledby="LvOptions">
+							<template v-if="menu">
+								<li v-for="menuItem in menu" @click="openLvOption(menuItem)"><span type="button" class="dropdown-item" >{{menuItem.name}}</span></li>
+							</template>
+							<template v-else>
+								<li class="text-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></li>
+							</template>
+						</ul>
+					</div>
+				</div>
+				<div v-if="lvinfo" class="col-auto text-end">
 					<a class="card-link" href="#" @click.prevent="openInfos">
 						<i class="fa fa-info-circle" aria-hidden="true"></i>
 					</a>
diff --git a/public/js/components/DashboardWidget/Stundenplan.js b/public/js/components/DashboardWidget/Stundenplan.js
index 19dfe7e4f..c99395f31 100755
--- a/public/js/components/DashboardWidget/Stundenplan.js
+++ b/public/js/components/DashboardWidget/Stundenplan.js
@@ -61,8 +61,9 @@ export default {
 		},
 		showLvUebersicht: function (event){
 			this.selectedEvent= event;
-			Vue.nextTick(()=>{this.$refs.lvUebersicht.show();});
-			
+			Vue.nextTick(()=>{
+				this.$refs.lvUebersicht.show();
+			});
 		},
 		
 		selectDay(day) {
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 73af3d2f3..1aac799c5 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -2684,6 +2684,26 @@ $phrases = array(
 	),
 
 	//****************	CORE/lehre
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'lvOptions',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Lehrveranstaltungsoptionen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Course options',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'lehre',

From 79ea8c4521f03fb7c8288f2c41e9e2f5a1b8ab47 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 17 Sep 2024 14:09:49 +0200
Subject: [PATCH 1218/1461] renamed unrulyPerson api to checkPerson; built in
 logic into infoCenterDetails to trigger a number of checks about any changed
 data in the info center (in this case unruly) and update the page
 accordingly; Also fixed a bug when saving stammdaten without kontakt entries;

---
 .../CheckPerson.php}                          |  45 ++++++--
 .../system/infocenter/InfoCenter.php          | 108 +++++++++---------
 application/models/person/Person_model.php    |  14 +--
 .../system/infocenter/infocenterDetails.php   |  45 ++------
 .../views/system/infocenter/personCheck.php   |  34 ++++++
 .../api/{unrulyperson.js => checkperson.js}   |   4 +-
 public/js/api/fhcapifactory.js                |   4 +-
 .../Studierendenantrag/Form/AbmeldungStgl.js  |   2 +-
 public/js/infocenter/infocenterDetails.js     |   2 +-
 public/js/infocenter/personcheck.js           |  71 ++++++++++++
 public/js/infocenter/stammdaten.js            |   9 +-
 system/phrasesupdate.php                      |  12 +-
 12 files changed, 235 insertions(+), 115 deletions(-)
 rename application/controllers/api/frontend/v1/{unrulyperson/UnrulyPerson.php => checkperson/CheckPerson.php} (67%)
 create mode 100644 application/views/system/infocenter/personCheck.php
 rename public/js/api/{unrulyperson.js => checkperson.js} (70%)
 create mode 100644 public/js/infocenter/personcheck.js

diff --git a/application/controllers/api/frontend/v1/unrulyperson/UnrulyPerson.php b/application/controllers/api/frontend/v1/checkperson/CheckPerson.php
similarity index 67%
rename from application/controllers/api/frontend/v1/unrulyperson/UnrulyPerson.php
rename to application/controllers/api/frontend/v1/checkperson/CheckPerson.php
index d1dbea7d8..321893610 100644
--- a/application/controllers/api/frontend/v1/unrulyperson/UnrulyPerson.php
+++ b/application/controllers/api/frontend/v1/checkperson/CheckPerson.php
@@ -18,13 +18,15 @@
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
-class UnrulyPerson extends FHCAPI_Controller
+class CheckPerson extends FHCAPI_Controller
 {
 	public function __construct()
 	{
 		parent::__construct([
 			'updatePersonUnrulyStatus' => array('basis/mitarbeiter:rw', 'student/antragfreigabe:rw', 'student/studierendenantrag:rw'),
-			'filterPerson' => array('basis/mitarbeiter:rw', 'student/antragfreigabe:rw', 'student/studierendenantrag:rw')
+			'filterPerson' => array('basis/mitarbeiter:rw', 'student/antragfreigabe:rw', 'student/studierendenantrag:rw'),
+			'checkUnruly' => array('basis/mitarbeiter:r', 'student/antragfreigabe:r', 'student/studierendenantrag:r', 'infocenter:r'),
+			'checkDuplicate' => array('infocenter:r'),
 		]);
 
 		$this->_ci =& get_instance();
@@ -48,13 +50,42 @@ class UnrulyPerson extends FHCAPI_Controller
 
 	}
 
+	public function checkDuplicate() {
+
+		$person_id = $this->input->post('person_id');
+
+		$result = $this->_ci->PersonModel->checkDuplicate($person_id);
+
+		if (isSuccess($result))
+			$this->terminateWithSuccess($result);
+		else
+			$this->terminateWithError('Error when searching for person');
+
+	}
+
+	// performs strict check over vorname, nachname, gebdatum
+	public function checkUnruly() {
+
+		$vorname = $this->input->post('vorname');
+		$nachname = $this->input->post('nachname');
+		$gebdatum = $this->input->post('gebdatum');
+
+		$result = $this->_ci->PersonModel->checkUnruly($vorname, $nachname, $gebdatum);
+
+		if (isSuccess($result))
+			$this->terminateWithSuccess($result);
+		else
+			$this->terminateWithError('Error when searching for person');
+	}
+
+	// filters nachname on similarity and vorname/gebdatum are optional
 	public function filterPerson() {
 		$payload = json_decode($this->input->raw_input_stream, TRUE);
 
 		$nachnameString = '';
 		$vornameString = '';
 		$filterUnruly = true;
-		$birthdateString = null;
+		$birthdateString = '';
 
 		if(array_key_exists( 'nachname', $payload) ) {
 			$nachnameString = $payload['nachname'];
@@ -80,16 +111,16 @@ class UnrulyPerson extends FHCAPI_Controller
 			$where = "p.nachname=? ";
 		}
 
-		if(isset($vorname) && $vorname != '')
+		if(isset($vornameString) && $vornameString != '')
 		{
 			$where.= " AND p.vorname~*?";
-			$parametersArray[] = $vorname;
+			$parametersArray[] = $vornameString;
 		}
 
-		if(isset($birthdate) && $birthdate != '')
+		if(isset($birthdateString) && $birthdateString != '')
 		{
 			$where.=" AND p.gebdatum=?";
-			$parametersArray[] = $birthdate;
+			$parametersArray[] = $birthdateString;
 		}
 
 		if(isset($filterUnruly))
diff --git a/application/controllers/system/infocenter/InfoCenter.php b/application/controllers/system/infocenter/InfoCenter.php
index d5cb50a00..f6e41d2e6 100644
--- a/application/controllers/system/infocenter/InfoCenter.php
+++ b/application/controllers/system/infocenter/InfoCenter.php
@@ -342,7 +342,7 @@ class InfoCenter extends Auth_Controller
 		$checkUnruly = $this->PersonModel->checkUnruly($persondata['stammdaten']->vorname, $persondata['stammdaten']->nachname, $persondata['stammdaten']->gebdatum);
 		if (isError($checkUnruly)) show_error(getError($checkUnruly));
 
-		$duplicate = array('duplicated' => getData($checkPerson));
+		$duplicate = array('duplicate' => getData($checkPerson));
 		$unruly = array('unruly' => getData($checkUnruly));
 
 		$prestudentdata = $this->_loadPrestudentData($person_id);
@@ -1289,67 +1289,28 @@ class InfoCenter extends Auth_Controller
 			$this->terminateWithJsonError($this->p->t('ui', 'fehlerBeimSpeichern'));
 
 		$kontakte = $this->input->post('kontakt');
-		foreach ($kontakte as $kontakt)
-		{
-			$kontaktExists = $this->KontaktModel->loadWhere(array(
-				'kontakt_id' => $kontakt['id'],
-				'person_id' => $person_id,
-			));
+		if($kontakte) {
 
-			if (hasData($kontaktExists))
-			{
-				$kontaktExists = getData($kontaktExists)[0];
+			foreach ($kontakte as $kontakt) {
+				$kontaktExists = $this->KontaktModel->loadWhere(array(
+					'kontakt_id' => $kontakt['id'],
+					'person_id' => $person_id,
+				));
 
-				if ($kontaktExists->kontakt === $kontakt['value'])
-					continue;
+				if (hasData($kontaktExists)) {
+					$kontaktExists = getData($kontaktExists)[0];
 
-				$update = $this->KontaktModel->update(
-					array
-					(
-						'kontakt_id' => $kontakt['id']
-					),
-					array
-					(
-						'kontakt' => isEmptyString($kontakt['value']) ? null : $kontakt['value'],
-						'updateamum' => date('Y-m-d H:i:s'),
-						'updatevon' => $this->_uid
-					)
-				);
+					if ($kontaktExists->kontakt === $kontakt['value'])
+						continue;
 
-				if (isError($update))
-					$this->terminateWithJsonError($this->p->t('ui', 'fehlerBeimSpeichern'));
-			}
-		}
-
-		$adressen = $this->input->post('adresse');
-
-		foreach ($adressen as $adresse)
-		{
-			$adresseExists = $this->AdresseModel->loadWhere(array(
-				'adresse_id' => $adresse['id'],
-				'person_id' => $person_id,
-			));
-
-			if (hasData($adresseExists))
-			{
-				$adresse = $adresse['value'];
-				$adresseExists = getData($adresseExists)[0];
-				if ($adresseExists->strasse !== $adresse['strasse'] ||
-					$adresseExists->plz !== $adresse['plz'] ||
-					$adresseExists->ort !== $adresse['ort'] ||
-					$adresseExists->nation !== $adresse['nation'])
-				{
-					$update = $this->AdresseModel->update(
+					$update = $this->KontaktModel->update(
 						array
 						(
-							'adresse_id' => $adresseExists->adresse_id
+							'kontakt_id' => $kontakt['id']
 						),
 						array
 						(
-							'strasse' => isEmptyString($adresse['strasse']) ? null : $adresse['strasse'],
-							'plz' => isEmptyString($adresse['plz']) ? null : $adresse['plz'],
-							'ort' => isEmptyString($adresse['ort']) ? null : $adresse['ort'],
-							'nation' => isEmptyString($adresse['nation']) ? null : $adresse['nation'],
+							'kontakt' => isEmptyString($kontakt['value']) ? null : $kontakt['value'],
 							'updateamum' => date('Y-m-d H:i:s'),
 							'updatevon' => $this->_uid
 						)
@@ -1358,7 +1319,48 @@ class InfoCenter extends Auth_Controller
 					if (isError($update))
 						$this->terminateWithJsonError($this->p->t('ui', 'fehlerBeimSpeichern'));
 				}
+			}
 
+		}
+
+		$adressen = $this->input->post('adresse');
+
+		if($adressen) {
+
+			foreach ($adressen as $adresse) {
+				$adresseExists = $this->AdresseModel->loadWhere(array(
+					'adresse_id' => $adresse['id'],
+					'person_id' => $person_id,
+				));
+
+				if (hasData($adresseExists)) {
+					$adresse = $adresse['value'];
+					$adresseExists = getData($adresseExists)[0];
+					if ($adresseExists->strasse !== $adresse['strasse'] ||
+						$adresseExists->plz !== $adresse['plz'] ||
+						$adresseExists->ort !== $adresse['ort'] ||
+						$adresseExists->nation !== $adresse['nation']) {
+						$update = $this->AdresseModel->update(
+							array
+							(
+								'adresse_id' => $adresseExists->adresse_id
+							),
+							array
+							(
+								'strasse' => isEmptyString($adresse['strasse']) ? null : $adresse['strasse'],
+								'plz' => isEmptyString($adresse['plz']) ? null : $adresse['plz'],
+								'ort' => isEmptyString($adresse['ort']) ? null : $adresse['ort'],
+								'nation' => isEmptyString($adresse['nation']) ? null : $adresse['nation'],
+								'updateamum' => date('Y-m-d H:i:s'),
+								'updatevon' => $this->_uid
+							)
+						);
+
+						if (isError($update))
+							$this->terminateWithJsonError($this->p->t('ui', 'fehlerBeimSpeichern'));
+					}
+
+				}
 			}
 		}
 
diff --git a/application/models/person/Person_model.php b/application/models/person/Person_model.php
index 9f10599fb..42a3b1431 100644
--- a/application/models/person/Person_model.php
+++ b/application/models/person/Person_model.php
@@ -294,15 +294,15 @@ class Person_model extends DB_Model
 	{
 		$qry = "SELECT person_id
 				FROM public.tbl_prestudent p
-				JOIN 
+				JOIN
 				(
 					SELECT DISTINCT ON(prestudent_id) *
 					FROM public.tbl_prestudentstatus
-					WHERE prestudent_id IN 
+					WHERE prestudent_id IN
 						(
-							SELECT prestudent_id 
-							FROM public.tbl_prestudent 
-							WHERE person_id IN 
+							SELECT prestudent_id
+							FROM public.tbl_prestudent
+							WHERE person_id IN
 							(
 								SELECT p2.person_id
 								FROM public.tbl_person p
@@ -316,8 +316,8 @@ class Person_model extends DB_Model
 					ORDER BY prestudent_id, datum DESC, insertamum DESC
 				) ps USING(prestudent_id)
 				JOIN public.tbl_status USING(status_kurzbz)
-				WHERE status_kurzbz = 'Interessent' 
-				AND studiengang_kz IN 
+				WHERE status_kurzbz = 'Interessent'
+				AND studiengang_kz IN
 				(
 					SELECT studiengang_kz
 					FROM public.tbl_prestudent p
diff --git a/application/views/system/infocenter/infocenterDetails.php b/application/views/system/infocenter/infocenterDetails.php
index 53fbda8b5..51b913b6c 100644
--- a/application/views/system/infocenter/infocenterDetails.php
+++ b/application/views/system/infocenter/infocenterDetails.php
@@ -27,7 +27,8 @@
 			'public/js/infocenter/rueckstellung.js',
 			'public/js/infocenter/zgvUeberpruefung.js',
 			'public/js/infocenter/docUeberpruefung.js',
-			'public/js/infocenter/stammdaten.js'
+			'public/js/infocenter/stammdaten.js',
+			'public/js/infocenter/personcheck.js'
 		),
 		'phrases' => array(
 			'infocenter',
@@ -38,6 +39,14 @@
 
 	$this->load->view('templates/FHC-Header', $includesArray);
 ?>
+
+	<script>
+		// Embed PHP data into JS as JSON to access from script files
+		const viewData = {
+			checkPerson: <?php echo json_encode(array('unruly' => $unruly, 'duplicate' => $duplicate)); ?>,
+		};
+	</script>
+
 	<div id="wrapper">
 	
 		<?php echo $this->widgetlib->widget('NavigationWidget'); ?>
@@ -74,38 +83,8 @@
 						</div>
 					</div>
 				</div>
-				<?php if (!is_null($unruly)): ?>
-					<div class="row alert-info">
-						<h3 class="header col-lg-12">
-							<?php echo $this->p->t('infocenter', 'unrulyPersonFound') . ':'; ?>
-						</h3>
-						<div class="text-left col-lg-12">
-							<?php
-							foreach ($unruly as $unruled)
-							{
-								echo  'Person ID: ' . $unruled->person_id . '<br />';
-							}
-							?>
-						</div>
-
-					</div>
-				<?php endif; ?>
-				<?php if (!is_null($duplicated)): ?>
-					<div class="row alert-warning">
-						<h3 class="header col-lg-12">
-							<?php echo $this->p->t('global', 'bewerberVorhanden') . ':'; ?>
-						</h3>
-						<div class="text-left col-lg-12">
-							<?php
-							foreach ($duplicated as $duplicate)
-							{
-								echo  'Person ID: ' . $duplicate->person_id . '<br />';
-							}
-							?>
-						</div>
-	
-					</div>
-				<?php endif; ?>
+				<br/>
+					<?php $this->load->view('system/infocenter/personCheck.php', array('unruly' => $unruly, 'duplicate' => $duplicate)); ?>
 				<br/>
 				<section>
 					<div class="row">
diff --git a/application/views/system/infocenter/personCheck.php b/application/views/system/infocenter/personCheck.php
new file mode 100644
index 000000000..c43a11bed
--- /dev/null
+++ b/application/views/system/infocenter/personCheck.php
@@ -0,0 +1,34 @@
+
+<div class="row alert-info" id="unruly" style="display: none;">
+	<h3 class="header col-lg-12">
+		<?php echo $this->p->t('infocenter', 'unrulyPersonFound') . ':'; ?>
+	</h3>
+	<div class="text-left col-lg-12" id="unrulylist">
+		<?php
+		if($unruly) {
+			foreach ($unruly as $unruled)
+			{
+				echo '<a>Person ID: ' . $unruled->person_id . '<a/><br />';
+			}
+		}
+		?>
+	</div>
+</div>
+
+<div class="row alert-warning" id="duplicate" style="display: none;">
+
+	<h3 class="header col-lg-12">
+		<?php echo $this->p->t('global', 'bewerberVorhanden') . ':'; ?>
+	</h3>
+	<div class="text-left col-lg-12" id="duplicatelist">
+		<?php
+		if($duplicate) {
+			foreach ($duplicate as $dupe)
+			{
+				echo '<a>Person ID: ' . $dupe->person_id . '<a/><br />';
+			}
+		}
+		?>
+	</div>
+
+</div>
\ No newline at end of file
diff --git a/public/js/api/unrulyperson.js b/public/js/api/checkperson.js
similarity index 70%
rename from public/js/api/unrulyperson.js
rename to public/js/api/checkperson.js
index 9e7d16e9f..9cd85840a 100644
--- a/public/js/api/unrulyperson.js
+++ b/public/js/api/checkperson.js
@@ -3,7 +3,7 @@ export default {
 
 		try {
 			const payload = {person_id, unruly: unrulyParam}
-			const url = '/api/frontend/v1/unrulyperson/UnrulyPerson/updatePersonUnrulyStatus';
+			const url = '/api/frontend/v1/checkperson/CheckPerson/updatePersonUnrulyStatus';
 			return this.$fhcApi.post(url, payload, null);
 		} catch (error) {
 			throw error;
@@ -13,7 +13,7 @@ export default {
 	filterPerson(payload, base = ''){
 
 		try {
-			const url = base + '/api/frontend/v1/unrulyperson/UnrulyPerson/filterPerson';
+			const url = base + '/api/frontend/v1/checkperson/CheckPerson/filterPerson';
 			return axios.post(url, payload)
 			// return this.$fhcApi.post(url, payload, null);
 		} catch (error) {
diff --git a/public/js/api/fhcapifactory.js b/public/js/api/fhcapifactory.js
index 214076616..e30772ca7 100644
--- a/public/js/api/fhcapifactory.js
+++ b/public/js/api/fhcapifactory.js
@@ -23,7 +23,7 @@ import studstatus from "./studstatus.js";
 import stv from "./stv.js";
 import notiz from "./notiz.js";
 import betriebsmittel from "./betriebsmittel.js";
-import unrulyperson from "./unrulyperson.js";
+import checkperson from "./checkperson.js";
 
 export default {
     search,
@@ -34,5 +34,5 @@ export default {
     stv,
     notiz,
     betriebsmittel,
-    unrulyperson
+    checkperson
 };
\ No newline at end of file
diff --git a/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js b/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
index ccb25a632..ca3bb9fbc 100644
--- a/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
+++ b/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
@@ -81,7 +81,7 @@ export default {
 				.then(result => {
 
 					if(this.unrulyInternal) {
-						this.$fhcApi.factory.unrulyperson.updatePersonUnrulyStatus(this.data.person_id, true).then(
+						this.$fhcApi.factory.checkperson.updatePersonUnrulyStatus(this.data.person_id, true).then(
 							(res)=> {
 								if(res?.meta?.status === "success") {
 									this.$fhcAlert.alertSuccess(this.$p.t('studierendenantrag', 'antrag_unruly_updated'))
diff --git a/public/js/infocenter/infocenterDetails.js b/public/js/infocenter/infocenterDetails.js
index 186479a8f..35da8f584 100644
--- a/public/js/infocenter/infocenterDetails.js
+++ b/public/js/infocenter/infocenterDetails.js
@@ -847,4 +847,4 @@ var InfocenterDetails = {
 	{
 		return elementid.substr(elementid.indexOf("_") + 1);
 	}
-};
+};
\ No newline at end of file
diff --git a/public/js/infocenter/personcheck.js b/public/js/infocenter/personcheck.js
new file mode 100644
index 000000000..55ada0b11
--- /dev/null
+++ b/public/js/infocenter/personcheck.js
@@ -0,0 +1,71 @@
+$(document).ready(function ()
+{
+	if(viewData?.checkPerson?.unruly?.length) {
+		const unruly = document.getElementById('unruly')
+		unruly.setAttribute('style', 'display: block;')
+	}
+
+	if(viewData?.checkPerson?.duplicate?.length) {
+		const duplicate = document.getElementById('duplicate')
+		duplicate.setAttribute('style', 'display: block;')
+	}
+
+
+});
+
+var PersonCheck = {
+	update: function(data)
+	{
+		// format date according to db
+		if(data.gebdatum) {
+			const [day, month, year] = data.gebdatum.split('.');
+			data.gebdatum = year + '-' + month + '-' + day
+		}
+
+		FHC_AjaxClient.ajaxCallPost(
+			'api/frontend/v1/checkperson/CheckPerson/checkUnruly',
+			data,
+			{
+				successCallback: function(response, textStatus, jqXHR) {
+					if (response?.meta?.status === 'success')
+					{
+						PersonCheck._updatedUnruly(response);
+					}
+					else
+					{
+						FHC_DialogLib.alertError('unruly error');
+					}
+				},
+				errorCallback: function() {
+					FHC_DialogLib.alertWarning("Fehler beim Speichern!");
+				}
+			}
+		);
+
+	},
+
+	_updatedUnruly: function(response)
+	{
+		const unruly = document.getElementById('unruly')
+
+		if(response?.data?.retval?.length) {
+			viewData.checkPerson.unruly = response?.data?.retval
+
+			// replace existing elements
+			const unrulylist = document.getElementById('unrulylist')
+			const newUnrulyPeople = []
+			viewData.checkPerson.unruly.forEach(u => {
+				newUnrulyPeople.push(document.createTextNode("Person ID: " + u.person_id))
+				newUnrulyPeople.push(document.createElement('br'))
+			})
+			unrulylist.replaceChildren(...newUnrulyPeople)
+
+			// and show it all
+			unruly.setAttribute('style', 'display: block;')
+		} else {
+			// just hide everything
+			unruly.setAttribute('style', 'display: none;')
+		}
+
+	},
+}
\ No newline at end of file
diff --git a/public/js/infocenter/stammdaten.js b/public/js/infocenter/stammdaten.js
index d83690b04..c7600f677 100644
--- a/public/js/infocenter/stammdaten.js
+++ b/public/js/infocenter/stammdaten.js
@@ -14,6 +14,7 @@ $(document).ready(function ()
 
 	$('.saveStammdaten').click(function()
 	{
+
 		var kontakt = [];
 		$('.kontakt_input').each(function(){
 			kontakt.push({
@@ -62,15 +63,16 @@ var Stammdaten = {
 			CALLED_PATH + "/updateStammdaten/",
 			data,
 			{
-				successCallback: function(data, textStatus, jqXHR) {
-					if (FHC_AjaxClient.isSuccess(data))
+				successCallback: function(response, textStatus, jqXHR) {
+					if (FHC_AjaxClient.isSuccess(response))
 					{
 						FHC_DialogLib.alertSuccess("Done!");
 						Stammdaten._updated();
+						PersonCheck.update(data)
 					}
 					else
 					{
-						FHC_DialogLib.alertError(FHC_AjaxClient.getError(data));
+						FHC_DialogLib.alertError(FHC_AjaxClient.getError(response));
 					}
 				},
 				errorCallback: function() {
@@ -149,6 +151,7 @@ var Stammdaten = {
 
 	_updated: function()
 	{
+
 		$('.kontakt_input').each(function() {
 			var span = $(this).parent('td').children('span');
 			var value = $(this).val();
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 27458209a..da7d109dc 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -2670,7 +2670,7 @@ $phrases = array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Unerwünscht',
+				'text' => 'Unruly',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -5349,7 +5349,7 @@ The invoice will be sent to you again. <u><strong>The amount is only to be trans
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Unerwünschte Person wurde gefunden',
+				'text' => 'Unruly Person wurde gefunden',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -20838,7 +20838,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Unerwünscht',
+				'text' => 'Unruly',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -20858,7 +20858,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Unerwünschte Person Status wurde aktualisiert.',
+				'text' => 'Unruly Person Status wurde aktualisiert.',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -23219,7 +23219,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Person ist unerwünscht',
+				'text' => 'Person ist unruly',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -23419,7 +23419,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Person ist unerwünscht',
+				'text' => 'Person ist unruly.',
 				'description' => '',
 				'insertvon' => 'system'
 			),

From 91174ca974f058e88eb92db381f90eafe7fef7f8 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Tue, 17 Sep 2024 15:35:00 +0200
Subject: [PATCH 1219/1461] - schickt message, nur wenn wartender der letzte
 status ist

---
 application/controllers/jobs/OneTimeMessages.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/controllers/jobs/OneTimeMessages.php b/application/controllers/jobs/OneTimeMessages.php
index 58bc1fb7c..525f63c3b 100644
--- a/application/controllers/jobs/OneTimeMessages.php
+++ b/application/controllers/jobs/OneTimeMessages.php
@@ -51,7 +51,7 @@ class OneTimeMessages extends JOB_Controller
 			   FROM public.tbl_prestudent p
 			   JOIN public.tbl_prestudentstatus ps USING (prestudent_id)
  			   JOIN public.tbl_studiengang s USING (studiengang_kz)
-			  WHERE ps.status_kurzbz = \'Wartender\'
+			  WHERE get_rolle_prestudent(ps.prestudent_id, NULL) = \'Wartender\'
 			    AND ps.studiensemester_kurzbz = ?
 			    AND ps.datum <= NOW() - \''.$days.' days\'::interval
 			    AND s.typ = ?

From 910a467fcc47895914f023bb414f7b38a106cb7c Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 18 Sep 2024 11:44:47 +0200
Subject: [PATCH 1220/1461] changes the stundenplan widget to use the new api
 endpoints that query the stundenplan events

---
 .../components/DashboardWidget/Stundenplan.js | 87 +++++++++++++++----
 1 file changed, 70 insertions(+), 17 deletions(-)

diff --git a/public/js/components/DashboardWidget/Stundenplan.js b/public/js/components/DashboardWidget/Stundenplan.js
index c99395f31..3c8610422 100755
--- a/public/js/components/DashboardWidget/Stundenplan.js
+++ b/public/js/components/DashboardWidget/Stundenplan.js
@@ -2,7 +2,8 @@ import Phrasen from '../../mixins/Phrasen.js';
 import AbstractWidget from './Abstract.js';
 import FhcCalendar from '../Calendar/Calendar.js';
 import LvUebersicht from '../Cis/Mylv/LvUebersicht.js';
-import ContentModal from '../Cis/Cms/ContentModal.js';
+import ContentModal from '../Cis/Cms/ContentModal.js'
+import CalendarDate from '../../composables/CalendarDate.js';
 
 export default {
 	mixins: [
@@ -21,10 +22,9 @@ export default {
 			minimized: true,
 			events: null,
 			currentDay: new Date(),
-			// used for contentModal
+			calendarDate: new CalendarDate(new Date()),
 			roomInfoContentID: null,
 			ort_kurzbz: null,
-			// used for LvUbersichtModal
 			selectedEvent: null,
 		}
 	},
@@ -37,12 +37,23 @@ export default {
 			let currentDay = new Date(this.currentDay);
 			currentDay.setDate(currentDay.getDate() + 1);
 			return currentDay;
-		}
+		},
+		monthFirstDay: function () {
+			return this.calendarDateToString(this.calendarDate.cdFirstDayOfCalendarMonth);
+		},
+		monthLastDay: function () {
+			return this.calendarDateToString(this.calendarDate.cdLastDayOfCalendarMonth);
+		},
 	},
 	methods: {
-		
-		showRoomInfoModal: function(ort_kurzbz){
+		calendarDateToString: function (calendarDate) {
 
+			return calendarDate instanceof CalendarDate ?
+				[calendarDate.y, calendarDate.m + 1, calendarDate.d].join('-') :
+				null;
+
+		},
+		showRoomInfoModal: function(ort_kurzbz){
 			// getting the content_id of the ort_kurzbz
 			this.$fhcApi.factory.ort.getContentID(ort_kurzbz).then(res =>{
 				this.roomInfoContentID = res.data;
@@ -70,7 +81,6 @@ export default {
 			this.currentDay = day;
 			this.minimized = true;
 		},
-		// this function was the alternative of showing the room information in the content component instead of showing the room information inside a modal
 		showRoomInfo: function($ort_kurzbz){
 			
 			this.$fhcApi.factory.ort.getContentID($ort_kurzbz).then(res =>{
@@ -78,17 +88,61 @@ export default {
 				window.location.href = FHC_JS_DATA_STORAGE_OBJECT.app_root +
 				FHC_JS_DATA_STORAGE_OBJECT.ci_router +
 				"/CisHtml/Cms/content/" + res.data;
-			
 			})
-		}
+		},
+
+		updateRange: function (data) {
+			
+			let tmp_date = new CalendarDate(data.start);
+			// only load month data if the month or year has changed
+			if (tmp_date.m != this.calendarDate.m || tmp_date.y != this.calendarDate.y) {
+				this.calendarDate = tmp_date;
+				Vue.nextTick(() => {
+					this.loadEvents();
+				});
+			}
+		},
+		
+
+		loadEvents: function () {
+			Promise.allSettled([
+				this.$fhcApi.factory.stundenplan.getStundenplan(this.monthFirstDay, this.monthLastDay),
+				this.$fhcApi.factory.stundenplan.getStundenplanReservierungen(this.monthFirstDay, this.monthLastDay)
+			]).then((result) => {
+				let promise_events = [];
+				result.forEach((promise_result) => {
+					if (promise_result.status === 'fulfilled' && promise_result.value.meta.status === "success") {
+
+						let data = promise_result.value.data;
+						// adding additional information to the events 
+						if (data && data.forEach) {
+
+							data.forEach((el, i) => {
+								el.id = i;
+								if (el.type === 'reservierung') {
+									el.color = '#' + (el.farbe || 'FFFFFF');
+								} else {
+									el.color = '#' + (el.farbe || 'CCCCCC');
+								}
+
+								el.start = new Date(el.datum + ' ' + el.beginn);
+								el.end = new Date(el.datum + ' ' + el.ende);
+
+							});
+						}
+						promise_events = promise_events.concat(data);
+					}
+				})
+				this.events = promise_events;
+			});
+		},
+	
 
 	},
 	created() {
-
-		
-		
 		this.$emit('setConfig', false);
-		axios
+		this.loadEvents();
+		/* axios
 			.get(this.apiurl + '/components/Cis/Stundenplan/Stunden').then(res => {
 				res.data.retval.forEach(std => {
 					this.stunden[std.stunde] = std; // TODO(chris): geht besser
@@ -109,24 +163,23 @@ export default {
 					})
 					.catch(err => { console.log(err);console.error('ERROR: ', err.response.data) });
 			})
-			.catch(err => { console.error('ERROR: ', err.response.data) });
+			.catch(err => { console.error('ERROR: ', err.response.data) }); */
 	},
 	template: /*html*/`
 	<div class="dashboard-widget-stundenplan d-flex flex-column h-100">
 		<lv-uebersicht ref="lvUebersicht" :event="selectedEvent"  />
 		<content-modal :contentID="roomInfoContentID" :ort_kurzbz="" dialogClass="modal-lg" ref="contentModal"/>
-		<fhc-calendar :initial-date="currentDay" class="border-0" class-header="p-0" @select:day="selectDay" v-model:minimized="minimized" :events="events" no-week-view :show-weeks="false" />
+		<fhc-calendar @change:range="updateRange" :initial-date="currentDay" class="border-0" class-header="p-0" @select:day="selectDay" v-model:minimized="minimized" :events="events" no-week-view :show-weeks="false" />
 		<div v-show="minimized" class="flex-grow-1 overflow-scroll">
 			<div v-if="events === null" class="d-flex h-100 justify-content-center align-items-center">
 				<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
 			</div>
 			<div v-else-if="currentEvents.length" class="list-group list-group-flush">
 				<div role="button" @click="showLvUebersicht(evt)" class="" v-for="evt in currentEvents" :key="evt.id" class="list-group-item small" :style="{'background-color':evt.color}">
-					<b>{{evt.title}}</b>
+					<b>{{evt.topic}}</b>
 					<br>
 					<small class="d-flex w-100 justify-content-between">
 						<!-- event modifier stop to prevent opening the modal for the lv Uebersicht when clicking on the ort_kurzbz -->
-						<!-- old event: showRoomInfo(evt.ort_kurzbz) -->
 						<span @click.stop="showRoomInfoModal(evt.ort_kurzbz)" style="text-decoration:underline" type="button">{{evt.ort_kurzbz}}</span>
 						<span>{{evt.start.toLocaleTimeString(undefined, {hour:'numeric',minute:'numeric'})}}-{{evt.end.toLocaleTimeString(undefined, {hour:'numeric',minute:'numeric'})}}</span>
 					</small>

From 164fc4b132767a6c9436e6122b18ced4580822df Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 18 Sep 2024 12:52:55 +0200
Subject: [PATCH 1221/1461] converts the dropdown of the lehrveranstaltungs
 optionen into a list inside the lv card

---
 .../Cis/Mylv/Semester/Studiengang/Lv.js       | 49 +++++++------------
 1 file changed, 19 insertions(+), 30 deletions(-)

diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
index 5acf29221..20b543bd8 100755
--- a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
@@ -60,18 +60,6 @@ export default {
 				});
 			}
 		},
-		onShowDropdown(){
-			//load menu
-			this.$fhcApi.factory.addons.getLvMenu(this.lehrveranstaltung_id, this.studien_semester)
-				.then(res => {
-					this.menu = res.data;
-				})
-				.catch((error) => this.$fhcAlert.handleSystemError);
-		},
-		onHideDropdown(){
-			//reset menu
-			this.menu = null;
-		},
 		openPruefungen() {
 			if (!this.pruefungen) {
 				this.pruefungen = true;
@@ -99,6 +87,13 @@ export default {
 			}
 		}
 	},
+	mounted(){
+		this.$fhcApi.factory.addons.getLvMenu(this.lehrveranstaltung_id, this.studien_semester)
+			.then(res => {
+				this.menu = res.data;
+			})
+			.catch((error) => this.$fhcAlert.handleSystemError);
+	},
 	template: /*html*/`<div class="mylv-semester-studiengang-lv card">
 
 		<lv-uebersicht ref="lvUebersicht" :preselectedMenu="preselectedMenuItem" :event="{
@@ -107,35 +102,29 @@ export default {
 			lehrfach_bez:studien_semester,
 			stg_kurzbzlang:studien_semester,
 		}"/>
-		
+
 		<div v-if="module" class="card-header">
 			{{module}}
 		</div>
 		<div class="card-body d-flex justify-content-center align-items-center" :style="bodyStyle">
 			<h6 class="card-title">{{bezeichnung}}</h6>
+
 		</div>
+		<ul class="list-group border-top-0 border-bottom-0 rounded-0">
+			<template v-if="menu">
+				<li type="button" v-for="menuItem in menu" @click="openLvOption(menuItem)" class="list-group-item border-start-0 border-end-0">{{menuItem.name}}</li>
+			</template>
+			<template v-else>
+				<li class="text-center" class="list-group-item"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></li>
+			</template>	
+		</ul>
 		<div class="card-footer">
 			<div class="row">
-				<a href="#" class="col text-start text-decoration-none" @click.prevent="openPruefungen">
+				<a href="#" class="col-auto text-start text-decoration-none" @click.prevent="openPruefungen">
 					<i class="fa fa-check text-success" v-if="positiv"></i>
 					{{ grade || p.t('lehre/noGrades') }}
 				</a>
-				<div class="col-auto text-end">
-					<div class="dropdown">
-						<span @[\`show.bs.dropdown\`]="onShowDropdown" @[\`hide.bs.dropdown\`]="onHideDropdown" class="dropdown-toggle" type="button" id="LvOptions" data-bs-toggle="dropdown" aria-expanded="false">
-							{{$p.t('lehre','lvOptions')}}
-						</span>
-						<ul class="dropdown-menu dropdown-menu-dark" aria-labelledby="LvOptions">
-							<template v-if="menu">
-								<li v-for="menuItem in menu" @click="openLvOption(menuItem)"><span type="button" class="dropdown-item" >{{menuItem.name}}</span></li>
-							</template>
-							<template v-else>
-								<li class="text-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></li>
-							</template>
-						</ul>
-					</div>
-				</div>
-				<div v-if="lvinfo" class="col-auto text-end">
+				<div v-if="lvinfo" class="col text-end">
 					<a class="card-link" href="#" @click.prevent="openInfos">
 						<i class="fa fa-info-circle" aria-hidden="true"></i>
 					</a>

From f7b3af49393be689adc3041980de900094e6014d Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 18 Sep 2024 13:17:14 +0200
Subject: [PATCH 1222/1461] makes the studiengang_semester reactive using
 computed when providing the value

---
 public/js/components/Cis/Mylv/Semester.js            |  2 +-
 .../components/Cis/Mylv/Semester/Studiengang/Lv.js   | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/public/js/components/Cis/Mylv/Semester.js b/public/js/components/Cis/Mylv/Semester.js
index 58d1d442e..4fa472c1d 100755
--- a/public/js/components/Cis/Mylv/Semester.js
+++ b/public/js/components/Cis/Mylv/Semester.js
@@ -6,7 +6,7 @@ export default {
 	},
 	provide() {
 		return {
-			studien_semester: this.semester
+			studien_semester: Vue.computed(() => this.semester) 
 		}
 	},
 	props: {
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
index 20b543bd8..78f96f235 100755
--- a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
@@ -87,7 +87,16 @@ export default {
 			}
 		}
 	},
-	mounted(){
+	watch:{
+		studien_semester(newValue){
+			this.$fhcApi.factory.addons.getLvMenu(this.lehrveranstaltung_id, newValue)
+				.then(res => {
+					this.menu = res.data;
+				})
+				.catch((error) => this.$fhcAlert.handleSystemError);	
+		}
+	},
+	mounted() {
 		this.$fhcApi.factory.addons.getLvMenu(this.lehrveranstaltung_id, this.studien_semester)
 			.then(res => {
 				this.menu = res.data;
@@ -95,7 +104,6 @@ export default {
 			.catch((error) => this.$fhcAlert.handleSystemError);
 	},
 	template: /*html*/`<div class="mylv-semester-studiengang-lv card">
-
 		<lv-uebersicht ref="lvUebersicht" :preselectedMenu="preselectedMenuItem" :event="{
 			lehrveranstaltung_id: lehrveranstaltung_id,
 			studiensemester_kurzbz:studien_semester,

From 5877411db8ed481169e8042922010e8b58b1ec0e Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 18 Sep 2024 13:52:49 +0200
Subject: [PATCH 1223/1461] also loads the stundenplan data when the component
 is created

---
 public/js/apps/Cis/Stundenplan.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/public/js/apps/Cis/Stundenplan.js b/public/js/apps/Cis/Stundenplan.js
index 19d8870c0..c08e79358 100755
--- a/public/js/apps/Cis/Stundenplan.js
+++ b/public/js/apps/Cis/Stundenplan.js
@@ -83,6 +83,9 @@ const app = Vue.createApp({
 			});
 		},
 	},
+	created(){
+		this.loadEvents();
+	},
 	template:/*html*/`
 	<h2>Stundenplan</h2>
 	<hr>

From b9fd95741d2f090d339918af0484d18c6e55eedb Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 18 Sep 2024 14:40:58 +0200
Subject: [PATCH 1224/1461] moves the CalendarModal into the Stundenplan
 component instead of the Calendar component and changes the start_time and
 end_time computed properties

---
 public/js/apps/Cis/Stundenplan.js              | 16 ++++++++++++----
 public/js/components/Calendar/Calendar.js      | 11 -----------
 public/js/components/Calendar/CalendarModal.js |  6 ++++++
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/public/js/apps/Cis/Stundenplan.js b/public/js/apps/Cis/Stundenplan.js
index c08e79358..0a899f16b 100755
--- a/public/js/apps/Cis/Stundenplan.js
+++ b/public/js/apps/Cis/Stundenplan.js
@@ -1,7 +1,7 @@
 import FhcCalendar from "../../components/Calendar/Calendar.js";
 import Phrasen from "../../plugin/Phrasen.js";
 import CalendarDate from "../../composables/CalendarDate.js";
-
+import CalendarModal from "../../components/Calendar/CalendarModal.js";
 
 const app = Vue.createApp({
 	data() {
@@ -9,11 +9,12 @@ const app = Vue.createApp({
 			stunden: [],
 			events: null,
 			calendarDate: new CalendarDate(new Date()),
-
+			currentlySelectedEvent: null,
 		}
 	},
 	components: {
-		FhcCalendar
+		FhcCalendar,
+		CalendarModal
 	},
 	computed:{
 		weekFirstDay: function () {
@@ -31,6 +32,12 @@ const app = Vue.createApp({
 	},
 	methods:{
 
+		showModal: function(event){
+			this.currentlySelectedEvent = event;
+			Vue.nextTick(() => {
+				this.$refs.calendarModal.show();
+			});
+		},
 		updateRange: function (data) {
 			let tmp_date = new CalendarDate(data.start);
 			// only load month data if the month or year has changed
@@ -89,8 +96,9 @@ const app = Vue.createApp({
 	template:/*html*/`
 	<h2>Stundenplan</h2>
 	<hr>
+	<calendar-modal v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ref="calendarModal"  />
 	<fhc-calendar @change:range="updateRange" v-slot="{event, day}" :events="events" initial-mode="week" show-weeks>
-		<div type="button" class="d-flex flex-column align-items-center justify-content-evenly h-100">
+		<div @click="showModal(event)" type="button" class="d-flex flex-column align-items-center justify-content-evenly h-100">
 			<span>{{event.orig.topic}}</span>
 			<span v-for="lektor in event.orig.lektor">{{lektor.kurzbz}}</span>
 			<span>{{event.orig.ort_kurzbz}}</span>
diff --git a/public/js/components/Calendar/Calendar.js b/public/js/components/Calendar/Calendar.js
index caa7aee9e..3cbed11ca 100755
--- a/public/js/components/Calendar/Calendar.js
+++ b/public/js/components/Calendar/Calendar.js
@@ -5,7 +5,6 @@ import CalendarWeek from './Week.js';
 import CalendarWeeks from './Weeks.js';
 import CalendarMinimized from './Minimized.js';
 import CalendarDate from '../../composables/CalendarDate.js';
-import CalendarModal from './CalendarModal.js';
 
 // TODO(chris): week/month toggle
 
@@ -17,7 +16,6 @@ export default {
 		CalendarWeek,
 		CalendarWeeks,
 		CalendarMinimized,
-		CalendarModal
 	},
 	provide() {
 		return {
@@ -63,7 +61,6 @@ export default {
 	],
 	data() {
 		return {
-			currentlySelectedEvent: null,
 			header: '',
 			prevMode: null,
 			currMode: null,
@@ -105,13 +102,6 @@ export default {
 	},
 	methods: {
 		handleInput(day) {
-			// set the event when clicking on the lehrveranstaltungen in the data 
-			this.currentlySelectedEvent = day[1];
-			// showing the modal
-			Vue.nextTick(() => {
-				this.$refs.calendarModal.show();
-			})
-
 			this.$emit(day[0], day[1]);
 		}
 	},
@@ -145,7 +135,6 @@ export default {
 	},
 	template: /*html*/`
 	<div ref="container" class="fhc-calendar card" :class="sizeClass">
-		<calendar-modal v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ref="calendarModal"  />
 		<component v-slot="{event,day}" :is="'calendar-' + mode" @update:mode="mode=$event" @change:range="$emit('change:range',$event)" @input="handleInput" >
 			<!--Week Page layout-->
 			<slot :event="event" :day="day"></slot>
diff --git a/public/js/components/Calendar/CalendarModal.js b/public/js/components/Calendar/CalendarModal.js
index 5841b64b7..fb2889eae 100644
--- a/public/js/components/Calendar/CalendarModal.js
+++ b/public/js/components/Calendar/CalendarModal.js
@@ -38,10 +38,16 @@ export default {
 	computed: {
 		start_time: function(){
 			if(!this.event.start) return 'N/A';
+			if (!this.event.start instanceof Date){
+				return this.event.start;
+			}
 			return this.event.start.getHours() + ":" + this.event.start.getMinutes();
 		},
 		end_time: function(){
 			if (!this.event.end) return 'N/A';
+			if (!this.event.end instanceof Date) {
+				return this.event.end;
+			}
 			return this.event.end.getHours() + ":" + this.event.end.getMinutes();
 		}
 	},

From 693313a23bb60d308ae859ff96215af49aa58e4e Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 19 Sep 2024 09:35:36 +0200
Subject: [PATCH 1225/1461] renames/reuses lv-modal and fixes bugs associated
 with the modal

---
 public/js/apps/Cis/Stundenplan.js              | 18 +++++++++---------
 .../CalendarModal.js => Cis/Mylv/LvModal.js}   |  6 +++---
 .../components/DashboardWidget/Stundenplan.js  |  8 ++++----
 3 files changed, 16 insertions(+), 16 deletions(-)
 rename public/js/components/{Calendar/CalendarModal.js => Cis/Mylv/LvModal.js} (96%)

diff --git a/public/js/apps/Cis/Stundenplan.js b/public/js/apps/Cis/Stundenplan.js
index 0a899f16b..ae36c0d6c 100755
--- a/public/js/apps/Cis/Stundenplan.js
+++ b/public/js/apps/Cis/Stundenplan.js
@@ -1,7 +1,7 @@
 import FhcCalendar from "../../components/Calendar/Calendar.js";
 import Phrasen from "../../plugin/Phrasen.js";
 import CalendarDate from "../../composables/CalendarDate.js";
-import CalendarModal from "../../components/Calendar/CalendarModal.js";
+import LvModal from "../../components/Cis/Mylv/LvModal.js";
 
 const app = Vue.createApp({
 	data() {
@@ -14,7 +14,7 @@ const app = Vue.createApp({
 	},
 	components: {
 		FhcCalendar,
-		CalendarModal
+		LvModal
 	},
 	computed:{
 		weekFirstDay: function () {
@@ -35,7 +35,7 @@ const app = Vue.createApp({
 		showModal: function(event){
 			this.currentlySelectedEvent = event;
 			Vue.nextTick(() => {
-				this.$refs.calendarModal.show();
+				this.$refs.lvmodal.show();
 			});
 		},
 		updateRange: function (data) {
@@ -96,13 +96,13 @@ const app = Vue.createApp({
 	template:/*html*/`
 	<h2>Stundenplan</h2>
 	<hr>
-	<calendar-modal v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ref="calendarModal"  />
+	<lv-modal v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ref="lvmodal"  />
 	<fhc-calendar @change:range="updateRange" v-slot="{event, day}" :events="events" initial-mode="week" show-weeks>
-		<div @click="showModal(event)" type="button" class="d-flex flex-column align-items-center justify-content-evenly h-100">
-			<span>{{event.orig.topic}}</span>
-			<span v-for="lektor in event.orig.lektor">{{lektor.kurzbz}}</span>
-			<span>{{event.orig.ort_kurzbz}}</span>
-		</div>
+		<div @click="showModal(event?.orig)" type="button" class="d-flex flex-column align-items-center justify-content-evenly h-100">
+			<span>{{event?.orig.topic}}</span>
+			<span v-for="lektor in event?.orig.lektor">{{lektor.kurzbz}}</span>
+			<span>{{event?.orig.ort_kurzbz}}</span>
+		</div>	
 	</fhc-calendar>
 	`
 });
diff --git a/public/js/components/Calendar/CalendarModal.js b/public/js/components/Cis/Mylv/LvModal.js
similarity index 96%
rename from public/js/components/Calendar/CalendarModal.js
rename to public/js/components/Cis/Mylv/LvModal.js
index fb2889eae..472a1e05c 100644
--- a/public/js/components/Calendar/CalendarModal.js
+++ b/public/js/components/Cis/Mylv/LvModal.js
@@ -1,6 +1,6 @@
-import BsModal from "../Bootstrap/Modal.js";
-import Alert from "../Bootstrap/Alert.js";
-import LvMenu from "../Cis/Mylv/LvMenu.js"
+import BsModal from "../../Bootstrap/Modal.js";
+import Alert from "../../Bootstrap/Alert.js";
+import LvMenu from "./LvMenu.js"
 
 export default {
 	components: {
diff --git a/public/js/components/DashboardWidget/Stundenplan.js b/public/js/components/DashboardWidget/Stundenplan.js
index 3c8610422..8a891cc59 100755
--- a/public/js/components/DashboardWidget/Stundenplan.js
+++ b/public/js/components/DashboardWidget/Stundenplan.js
@@ -1,7 +1,7 @@
 import Phrasen from '../../mixins/Phrasen.js';
 import AbstractWidget from './Abstract.js';
 import FhcCalendar from '../Calendar/Calendar.js';
-import LvUebersicht from '../Cis/Mylv/LvUebersicht.js';
+import LvModal from '../Cis/Mylv/LvModal.js';
 import ContentModal from '../Cis/Cms/ContentModal.js'
 import CalendarDate from '../../composables/CalendarDate.js';
 
@@ -12,7 +12,7 @@ export default {
 	],
 	components: {
 		FhcCalendar,
-		LvUebersicht,
+		LvModal,
 		ContentModal,
 	},
 	
@@ -73,7 +73,7 @@ export default {
 		showLvUebersicht: function (event){
 			this.selectedEvent= event;
 			Vue.nextTick(()=>{
-				this.$refs.lvUebersicht.show();
+				this.$refs.lvmodal.show();
 			});
 		},
 		
@@ -167,7 +167,7 @@ export default {
 	},
 	template: /*html*/`
 	<div class="dashboard-widget-stundenplan d-flex flex-column h-100">
-		<lv-uebersicht ref="lvUebersicht" :event="selectedEvent"  />
+		<lv-modal v-if="selectedEvent" ref="lvmodal" :event="selectedEvent"  />
 		<content-modal :contentID="roomInfoContentID" :ort_kurzbz="" dialogClass="modal-lg" ref="contentModal"/>
 		<fhc-calendar @change:range="updateRange" :initial-date="currentDay" class="border-0" class-header="p-0" @select:day="selectDay" v-model:minimized="minimized" :events="events" no-week-view :show-weeks="false" />
 		<div v-show="minimized" class="flex-grow-1 overflow-scroll">

From ca4865011d550b2a0fda7f13946007f440dfc0a3 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 20 Sep 2024 11:21:59 +0200
Subject: [PATCH 1226/1461] adds missing parameters to the getContent function

---
 application/controllers/api/frontend/v1/Cms.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/controllers/api/frontend/v1/Cms.php b/application/controllers/api/frontend/v1/Cms.php
index 1c2920dc6..9b45fe81d 100644
--- a/application/controllers/api/frontend/v1/Cms.php
+++ b/application/controllers/api/frontend/v1/Cms.php
@@ -80,7 +80,7 @@ class Cms extends FHCAPI_Controller
         $sprache = $this->input->get("sprache",TRUE);
         $sichtbar = $this->input->get("sichtbar",TRUE);
 
-		$content = $this->cmslib->getContent($content_id);
+		$content = $this->cmslib->getContent($content_id, $version, $sprache, $sichtbar);
 
 		$content = $this->getDataOrTerminateWithError($content);
 

From 9343d1ee0c273c8585207960386ac57bcf5b7620 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 20 Sep 2024 11:26:08 +0200
Subject: [PATCH 1227/1461] refactor Content_types template

---
 public/js/components/Cis/Cms/Content_types/General.js           | 2 +-
 .../js/components/Cis/Cms/Content_types/Raum_contentmittitel.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Cis/Cms/Content_types/General.js b/public/js/components/Cis/Cms/Content_types/General.js
index f29936dc1..4071d356a 100644
--- a/public/js/components/Cis/Cms/Content_types/General.js
+++ b/public/js/components/Cis/Cms/Content_types/General.js
@@ -31,7 +31,7 @@ export default {
     },
     template: /*html*/ `
       <!-- div that contains the content -->
-      <div v-html="content" v-if="content" :content="content" />
+      <div v-html="content" v-if="content" ></div>
       <p v-else>Content was not found</p>
       `,
   };
diff --git a/public/js/components/Cis/Cms/Content_types/Raum_contentmittitel.js b/public/js/components/Cis/Cms/Content_types/Raum_contentmittitel.js
index 9c0b2105f..934b921c0 100644
--- a/public/js/components/Cis/Cms/Content_types/Raum_contentmittitel.js
+++ b/public/js/components/Cis/Cms/Content_types/Raum_contentmittitel.js
@@ -26,7 +26,7 @@ export default {
     },
     template: /*html*/ `
       <!-- div that contains the content -->
-      <div v-html="content" v-if="content" :content="content" />
+      <div v-html="content" v-if="content" ></div>
       <p v-else>Content was not found</p>
       `,
   };

From a2e4704223f854e4d5e51188cb7ce3a7f17b2601 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Fri, 20 Sep 2024 13:12:50 +0200
Subject: [PATCH 1228/1461] developing new components in lektor ui for ux
 improvements; anw function now explicitely in extension schema

---
 public/js/plugin/FhcApi.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/public/js/plugin/FhcApi.js b/public/js/plugin/FhcApi.js
index 2c7e9e267..fdc3bbadb 100644
--- a/public/js/plugin/FhcApi.js
+++ b/public/js/plugin/FhcApi.js
@@ -47,9 +47,8 @@ export default {
 			return result;
 		}
 		const baseURL = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + "/";
-		console.log(baseURL)
 		const fhcApiAxios = axios.create({
-			timeout: 5000,
+			timeout: 500000,
 			baseURL: FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + "/"
 		});
 

From 958c897467815f22eb8749e60e6d1d85c7c3641e Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Fri, 20 Sep 2024 13:54:32 +0200
Subject: [PATCH 1229/1461] changed unruly html from a tags to p tags since
 they messed with styles somehow

---
 application/views/system/infocenter/personCheck.php | 4 ++--
 public/js/infocenter/personcheck.js                 | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/application/views/system/infocenter/personCheck.php b/application/views/system/infocenter/personCheck.php
index c43a11bed..d24d26419 100644
--- a/application/views/system/infocenter/personCheck.php
+++ b/application/views/system/infocenter/personCheck.php
@@ -8,7 +8,7 @@
 		if($unruly) {
 			foreach ($unruly as $unruled)
 			{
-				echo '<a>Person ID: ' . $unruled->person_id . '<a/><br />';
+				echo '<p>Person ID: ' . $unruled->person_id . '<p/>';
 			}
 		}
 		?>
@@ -25,7 +25,7 @@
 		if($duplicate) {
 			foreach ($duplicate as $dupe)
 			{
-				echo '<a>Person ID: ' . $dupe->person_id . '<a/><br />';
+				echo '<p>Person ID: ' . $dupe->person_id . '<p/>';
 			}
 		}
 		?>
diff --git a/public/js/infocenter/personcheck.js b/public/js/infocenter/personcheck.js
index 55ada0b11..ad0026bac 100644
--- a/public/js/infocenter/personcheck.js
+++ b/public/js/infocenter/personcheck.js
@@ -10,7 +10,6 @@ $(document).ready(function ()
 		duplicate.setAttribute('style', 'display: block;')
 	}
 
-
 });
 
 var PersonCheck = {

From 98c85f1241d69a0b3b6d0a35eb02d5968185c14f Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 20 Sep 2024 14:20:44 +0200
Subject: [PATCH 1230/1461] little changes to the view for the content

---
 application/controllers/CisHtml/Cms.php   | 2 +-
 application/views/CisHtml/Cms/Content.php | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/application/controllers/CisHtml/Cms.php b/application/controllers/CisHtml/Cms.php
index 102d0eff4..c2feccd59 100755
--- a/application/controllers/CisHtml/Cms.php
+++ b/application/controllers/CisHtml/Cms.php
@@ -55,7 +55,7 @@ class Cms extends FHC_Controller
 
 		$content = current($content);
 
-		$this->load->view('CisVue/Cms/Content', ['content_id' => $content_id, 'template_kurzbz'=>$content->template_kurzbz , 'version' => $version, 'sprache' => $sprache, 'sichtbar' => $sichtbar]);
+		$this->load->view('CisHtml/Cms/Content', ['content_id' => $content_id, 'template_kurzbz'=>$content->template_kurzbz , 'version' => $version, 'sprache' => $sprache, 'sichtbar' => $sichtbar]);
 	}
 
 	/**
diff --git a/application/views/CisHtml/Cms/Content.php b/application/views/CisHtml/Cms/Content.php
index 96817a01c..6db49f2ef 100755
--- a/application/views/CisHtml/Cms/Content.php
+++ b/application/views/CisHtml/Cms/Content.php
@@ -19,8 +19,12 @@ if(isset($template_kurzbz)){
 $this->load->view('templates/CISVUE-Header', $includesArray);
 ?>
 
-<h2><?php echo isset($content_id)? "Content" : "News" ?></h2>
-<hr/>
+<?php if(!isset($content_id)) {
+	echo "
+	<h2>News</h2>
+	<hr/>";
+}?>
+
 <div id="cms">
 <?php echo (isset($content_id) ? '<cms-content :content_id="'.$content_id.'" :version="'.$version.'" :sprache="'.$sprache.'" :sichtbar="'.$sichtbar.'" />' : '<cms-news/>'); ?>
 	

From effad6f62da6eee137703faf4f0cd428501f043f Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Fri, 20 Sep 2024 15:16:20 +0200
Subject: [PATCH 1231/1461] only fetch person_id, vorname, nachname & unruly
 from tbl_person on checkUnruly()

---
 application/models/person/Person_model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/models/person/Person_model.php b/application/models/person/Person_model.php
index 42a3b1431..dc925a171 100644
--- a/application/models/person/Person_model.php
+++ b/application/models/person/Person_model.php
@@ -377,7 +377,7 @@ class Person_model extends DB_Model
 
 	public function checkUnruly($vorname, $nachname, $gebdatum)
 	{
-		$qry = "SELECT *
+		$qry = "SELECT person_id, vorname, nachname, gebdatum, unruly
 				FROM tbl_person
 				WHERE tbl_person.vorname = ? 
 					AND tbl_person.nachname = ? 

From 2d3643d1f0f04ff4d8b1913530b7d4fe12255cb8 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Fri, 20 Sep 2024 16:04:27 +0200
Subject: [PATCH 1232/1461] Bismeldestichtag: added method for getting next
 Meldestichtag, loading data only after tabulator is ready

---
 .../models/codex/Bismeldestichtag_model.php   | 17 +++++
 .../apps/Bismeldestichtag/Bismeldestichtag.js | 62 +++++++++++++--
 .../BismeldestichtagHelper.js                 | 22 ++++++
 .../apps/Bismeldestichtag/TabulatorSetup.js   | 75 -------------------
 4 files changed, 94 insertions(+), 82 deletions(-)
 create mode 100644 public/js/apps/Bismeldestichtag/BismeldestichtagHelper.js
 delete mode 100644 public/js/apps/Bismeldestichtag/TabulatorSetup.js

diff --git a/application/models/codex/Bismeldestichtag_model.php b/application/models/codex/Bismeldestichtag_model.php
index 319aa7be7..f9b412e7a 100644
--- a/application/models/codex/Bismeldestichtag_model.php
+++ b/application/models/codex/Bismeldestichtag_model.php
@@ -33,6 +33,23 @@ class Bismeldestichtag_model extends DB_Model
 		]);
 	}
 
+	/**
+	 * Liefert nächstliegenden Bismeldestichtag.
+	 * @return object success or error
+	 */
+	public function getNextMeldestichtag()
+	{
+		$this->addSelect('meldestichtag');
+		$this->addSelect('studiensemester_kurzbz');
+
+		$this->addOrder('meldestichtag', 'ASC');
+		$this->addLimit(1);
+
+		return $this->loadWhere([
+			'meldestichtag >= NOW()' => null
+		]);
+	}
+
 	/**
 	 * Prüft, ob Meldestichtag für ein bestimmtes Statusdatum und Studiensemester erreicht ist.
 	 *
diff --git a/public/js/apps/Bismeldestichtag/Bismeldestichtag.js b/public/js/apps/Bismeldestichtag/Bismeldestichtag.js
index 04275d76a..877805b8f 100644
--- a/public/js/apps/Bismeldestichtag/Bismeldestichtag.js
+++ b/public/js/apps/Bismeldestichtag/Bismeldestichtag.js
@@ -15,8 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import {BismeldestichtagTabulatorOptions} from './TabulatorSetup.js';
-import {BismeldestichtagTabulatorEventHandlers} from './TabulatorSetup.js';
+import {BismeldestichtagHelper} from './BismeldestichtagHelper.js';
 
 import {CoreFilterCmpt} from '../../components/filter/Filter.js';
 import {CoreNavigationCmpt} from '../../components/navigation/Navigation.js';
@@ -29,8 +28,60 @@ import Phrasen from '../../plugin/Phrasen.js';
 const bismeldestichtagApp = Vue.createApp({
 	data: function() {
 		return {
-			bismeldestichtagTabulatorOptions: BismeldestichtagTabulatorOptions,
-			bismeldestichtagTabulatorEventHandlers: BismeldestichtagTabulatorEventHandlers,
+			bismeldestichtagTabulatorOptions: {
+				maxHeight: "100%",
+				minHeight: 50,
+				layout: 'fitColumns',
+				index: 'meldestichtag_id',
+				initialSort:[
+					{column:"meldestichtag", dir:"desc"}
+				],
+				columns: [
+					{title: 'Meldestichtag', field: 'meldestichtag', headerFilter: true, formatter: function(cell){
+							return BismeldestichtagHelper.formatDate(cell.getValue());
+						}
+					},
+					{title: 'Studiensemester', field: 'studiensemester_kurzbz', headerFilter: true, sorter:function(a, b, aRow, bRow, column, dir, sorterParams) {
+
+							//aRow, bRow - the row components for the values being compared
+							let semesterStartA = new Date(aRow.getData().semester_start);
+							let semesterStartB = new Date(bRow.getData().semester_start);
+
+							return semesterStartA - semesterStartB; // difference between studiensemester start dates
+						}
+					},
+					{title: 'Semesterstart',field: 'semester_start', headerFilter: true, visible: false, formatter: function(cell){
+							return BismeldestichtagHelper.formatDate(cell.getValue());
+						}
+					},
+					{title: 'ID', field: 'meldestichtag_id', headerFilter: true, visible: false},
+					{title: 'Insertamum', field: 'insertamum', headerFilter: true, visible: false},
+					{title: 'Insertvon', field: 'insertvon', headerFilter: true, visible: false},
+					{title: 'Löschen', field: 'loeschen', headerFilter: false, formatter:function(cell){
+							return	'<button class="btn btn-outline-secondary delete-btn" data-meldestichtag-id="'+cell.getRow().getIndex()+'">'+
+										'<i class="fa fa-xmark"></i>'+
+									'</button>';
+						}
+					}
+				]
+			},
+			bismeldestichtagTabulatorEventHandlers: [
+				{
+					event: "rowClick",
+					handler: function(e, row) {
+						if (e.target.nodeName == 'DIV') {
+							let data = row.getData();
+							alert(data.studiensemester_kurzbz + ': ' + BismeldestichtagHelper.formatDate(data.meldestichtag));
+						}
+					}
+				},
+				{
+					event: "tableBuilt",
+					handler: () => {
+						this.handlerStudiensemester();
+					}
+				}
+			],
 			meldestichtag: null, // date of Meldestichtag
 			semList: null, // all Studiensemester for dropdown
 			currSem: null, // selected Studiensemester
@@ -47,9 +98,6 @@ const bismeldestichtagApp = Vue.createApp({
 		CoreFetchCmpt,
 		"datepicker": VueDatePicker
 	},
-	created() {
-		this.handlerStudiensemester();
-	},
 	methods: {
 		/**
 		 * Define Studiensemester call and method to be executed after the call
diff --git a/public/js/apps/Bismeldestichtag/BismeldestichtagHelper.js b/public/js/apps/Bismeldestichtag/BismeldestichtagHelper.js
new file mode 100644
index 000000000..d51dc5134
--- /dev/null
+++ b/public/js/apps/Bismeldestichtag/BismeldestichtagHelper.js
@@ -0,0 +1,22 @@
+/**
+ * Copyright (C) 2022 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+export const BismeldestichtagHelper = {
+	formatDate: function(date) {
+		return date.replace(/(.*)-(.*)-(.*)/, '$3.$2.$1');
+	}
+}
diff --git a/public/js/apps/Bismeldestichtag/TabulatorSetup.js b/public/js/apps/Bismeldestichtag/TabulatorSetup.js
deleted file mode 100644
index d98cc993c..000000000
--- a/public/js/apps/Bismeldestichtag/TabulatorSetup.js
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- * Copyright (C) 2022 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- *
- */
-export const BismeldestichtagTabulatorOptions = {
-	maxHeight: "100%",
-	minHeight: 50,
-	layout: 'fitColumns',
-	index: 'meldestichtag_id',
-	columns: [
-		{title: 'Meldestichtag',field: 'meldestichtag', headerFilter: true, formatter: function(cell){
-				return BismeldestichtagTabulatorHelperFunctions._formatDate(cell.getValue());
-			}
-		},
-		{title: 'Studiensemester', field: 'studiensemester_kurzbz', headerFilter: true, sorter:function(a, b, aRow, bRow, column, dir, sorterParams) {
-
-				//aRow, bRow - the row components for the values being compared
-				let semesterStartA = new Date(aRow.getData().semester_start);
-				let semesterStartB = new Date(bRow.getData().semester_start);
-
-				return semesterStartA - semesterStartB; // difference between studiensemester start dates
-			}
-		},
-		{title: 'Semesterstart',field: 'semester_start', headerFilter: true, visible: false, formatter: function(cell){
-				return BismeldestichtagTabulatorHelperFunctions._formatDate(cell.getValue());
-			}
-		},
-		{title: 'ID', field: 'meldestichtag_id', headerFilter: true, visible: false},
-		{title: 'Insertamum', field: 'insertamum', headerFilter: true, visible: false},
-		{title: 'Insertvon', field: 'insertvon', headerFilter: true, visible: false},
-		{title: 'Löschen', field: 'loeschen', headerFilter: false, formatter:function(cell){
-				return	'<button class="btn btn-outline-secondary delete-btn" data-meldestichtag-id="'+cell.getRow().getIndex()+'">'+
-							'<i class="fa fa-xmark"></i>'+
-						'</button>';
-			}
-		}
-	]
-};
-
-/**
- *
- */
-export const BismeldestichtagTabulatorEventHandlers = [
-	{
-		event: "rowClick",
-		handler: function(e, row) {
-			if (e.target.nodeName == 'DIV') {
-				let data = row.getData();
-				alert(data.studiensemester_kurzbz + ': ' + BismeldestichtagTabulatorHelperFunctions._formatDate(data.meldestichtag));
-			}
-		}
-	}
-];
-
-let BismeldestichtagTabulatorHelperFunctions = {
-	_formatDate: function(date) {
-		return date.replace(/(.*)-(.*)-(.*)/, '$3.$2.$1');
-	}
-}

From 3b20f5e45cce2d8aa989b767123fd6097434d113 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Fri, 20 Sep 2024 16:12:14 +0200
Subject: [PATCH 1233/1461] Plausichecks: removed check
 BewerberNichtZumRtAngetreten

---
 application/libraries/issues/PlausicheckDefinitionLib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/libraries/issues/PlausicheckDefinitionLib.php b/application/libraries/issues/PlausicheckDefinitionLib.php
index b44a5ce19..d8c26d43a 100644
--- a/application/libraries/issues/PlausicheckDefinitionLib.php
+++ b/application/libraries/issues/PlausicheckDefinitionLib.php
@@ -15,7 +15,6 @@ class PlausicheckDefinitionLib
 		'AktSemesterNull' => 'AktSemesterNull',
 		'AktiverStudentOhneStatus' => 'AktiverStudentOhneStatus',
 		'AusbildungssemPrestudentUngleichAusbildungssemStatus' => 'AusbildungssemPrestudentUngleichAusbildungssemStatus',
-		'BewerberNichtZumRtAngetreten' => 'BewerberNichtZumRtAngetreten',
 		'DatumAbschlusspruefungFehlt' => 'DatumAbschlusspruefungFehlt',
 		'DatumSponsionFehlt' => 'DatumSponsionFehlt',
 		'DatumStudiensemesterFalscheReihenfolge' => 'DatumStudiensemesterFalscheReihenfolge',
@@ -36,6 +35,7 @@ class PlausicheckDefinitionLib
 		'StudentstatusNachAbbrecher' => 'StudentstatusNachAbbrecher',
 		'DualesStudiumOhneMarkierung' => 'DualesStudiumOhneMarkierung'
 		//'StudienplanUngueltig' => 'StudienplanUngueltig'
+		//'BewerberNichtZumRtAngetreten' => 'BewerberNichtZumRtAngetreten'
 	);
 
 	/**

From 45d350a76e9d5077354e476ccf777e09f3ea6b8c Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 23 Sep 2024 13:24:58 +0200
Subject: [PATCH 1234/1461] changes the header for the news and puts the LV
 title in the card header / removes the lines of the lehrveranstaltungs
 optionenen

---
 application/views/CisHtml/Cms/Content.php     |  2 +-
 .../Cis/Mylv/Semester/Studiengang/Lv.js       | 25 +++++++++----------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/application/views/CisHtml/Cms/Content.php b/application/views/CisHtml/Cms/Content.php
index 6db49f2ef..b22a212dc 100755
--- a/application/views/CisHtml/Cms/Content.php
+++ b/application/views/CisHtml/Cms/Content.php
@@ -16,7 +16,7 @@ if(isset($template_kurzbz)){
 	}
 }
 
-$this->load->view('templates/CISVUE-Header', $includesArray);
+$this->load->view('templates/CISHTML-Header', $includesArray);
 ?>
 
 <?php if(!isset($content_id)) {
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
index 78f96f235..40526162b 100755
--- a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
@@ -111,21 +111,20 @@ export default {
 			stg_kurzbzlang:studien_semester,
 		}"/>
 
-		<div v-if="module" class="card-header">
-			{{module}}
-		</div>
-		<div class="card-body d-flex justify-content-center align-items-center" :style="bodyStyle">
+		<div class="card-header">
+			<!-- {{module}} if the module of the lv is important then query the module from the api endpoint for LV-->
 			<h6 class="card-title">{{bezeichnung}}</h6>
-
 		</div>
-		<ul class="list-group border-top-0 border-bottom-0 rounded-0">
-			<template v-if="menu">
-				<li type="button" v-for="menuItem in menu" @click="openLvOption(menuItem)" class="list-group-item border-start-0 border-end-0">{{menuItem.name}}</li>
-			</template>
-			<template v-else>
-				<li class="text-center" class="list-group-item"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></li>
-			</template>	
-		</ul>
+		<div class="card-body " :style="bodyStyle">
+			<ul class="list-group border-top-0 border-bottom-0 rounded-0">
+				<template v-if="menu">
+					<li type="button" v-for="menuItem in menu" @click="openLvOption(menuItem)" class="list-group-item border-0">{{menuItem.name}}</li>
+				</template>
+				<template v-else>
+					<li class="text-center" class="list-group-item"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></li>
+				</template>
+			</ul>
+		</div>
 		<div class="card-footer">
 			<div class="row">
 				<a href="#" class="col-auto text-start text-decoration-none" @click.prevent="openPruefungen">

From 470192aabd4385581c3736da57233359fbf97165 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 23 Sep 2024 15:14:31 +0200
Subject: [PATCH 1235/1461] fixes some bugs in the View/Entry.php for the Menu

---
 application/views/templates/CISHTML-Menu/Entry.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/application/views/templates/CISHTML-Menu/Entry.php b/application/views/templates/CISHTML-Menu/Entry.php
index bd66fce37..522d8008d 100755
--- a/application/views/templates/CISHTML-Menu/Entry.php
+++ b/application/views/templates/CISHTML-Menu/Entry.php
@@ -22,6 +22,8 @@ switch ($entry->template_kurzbz) {
 
 			if (strpos($url, '../cms/news.php') === 0)
 				$url = site_url('/CisHtml/Cms/news' . substr($url, 15));
+			if (strpos($url, '../index.ci.php') === 0)
+				$url = site_url() . str_replace("../index.ci.php","",$url);
 			if (strpos($url, '../') === 0)
 				$url = APP_ROOT . substr($url, 3);
 		}
@@ -37,7 +39,8 @@ switch ($entry->template_kurzbz) {
 		$this->load->view('templates/CISHTML-Menu/EntryBase', [
 			'entry' => $entry,
 			'menu_id' => $menu_id,
-			'link' => site_url('/CisHtml/Cms/content/' . $entry->content_id)
+			'link' => site_url('/CisHtml/Cms/content/' . $entry->content_id),
+			'target' => ''
 		]);
 		break;
 }

From 5057b2d7613821d94ff76c4b671b030b2796d6e4 Mon Sep 17 00:00:00 2001
From: KarpAlex <karpenko@technikum-wien.at>
Date: Mon, 23 Sep 2024 18:27:19 +0200
Subject: [PATCH 1236/1461] bugfix unbekannte Eltern: unknown can always be
 chosen, and it is valid. Only if Land des Abschlusses in austria, austrian
 max Bildung options can be chosen

---
 application/controllers/codex/UHSTAT1.php | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

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

From 419f608322fd6b24cbb8a25cb692e07bcd554ec2 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Tue, 24 Sep 2024 12:05:09 +0200
Subject: [PATCH 1237/1461] =?UTF-8?q?-=20benotung=20international=20skills?=
 =?UTF-8?q?=20hinzugef=C3=BCgt=20-=20phrase?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 system/phrasesupdate.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 1c41f67d8..96e29ea9c 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -18302,6 +18302,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'international',
+		'category' => 'international',
+		'phrase' => 'mailversenden',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Mail versenden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Send mail',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'international',
 		'category' => 'international',

From b184cee97556ab93823056447141b16cbaeb10ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Tue, 24 Sep 2024 12:40:12 +0200
Subject: [PATCH 1238/1461] =?UTF-8?q?Offset=20f=C3=BCr=20das=20Laden=20von?=
 =?UTF-8?q?=20Geschaeftsjahren=20hinzugef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../models/organisation/Geschaeftsjahr_model.php  | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

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

From 7ed7ce1bb99069356c6eb7304fa0c3cc92c4c617 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 24 Sep 2024 14:57:41 +0200
Subject: [PATCH 1239/1461] active Menu Entry logic for CISVUE

---
 application/controllers/CisVue/Cms.php        |  20 ++-
 application/views/Cis/Profil.php              |   4 +-
 application/views/lehre/Antrag/Create.php     |  32 +++--
 .../views/lehre/Antrag/Student/List.php       |   4 +-
 public/js/components/Cis/Menu.js              |  16 ++-
 public/js/components/Cis/Menu/Entry.js        | 129 ++++++++++++++----
 6 files changed, 159 insertions(+), 46 deletions(-)

diff --git a/application/controllers/CisVue/Cms.php b/application/controllers/CisVue/Cms.php
index 7eb810476..d1ab3c23b 100755
--- a/application/controllers/CisVue/Cms.php
+++ b/application/controllers/CisVue/Cms.php
@@ -40,13 +40,21 @@ class Cms extends FHC_Controller
 	 */
 	public function content($content_id, $version = null, $sprache = null, $sichtbar = true)
 	{
-		$content = $this->ContentModel->load($content_id);		
-		
-		$content = $this->getDataOrTerminateWithError($content);
-		
+		// return early if the content_id for the content is missing
+		if (!isset($content_id))
+			$this->terminateWithError("content_id is missing");
+
+		$content = $this->ContentModel->load($content_id);
+		if (isError($content))
+			$this->terminateWithError(getError($content));
+
+		$content = getData($content);
+		if (NULL === $content)
+			$this->terminateWithError("Content not found");
+
 		$content = current($content);
 
-		$this->load->view('CisVue/Cms/Content', ['content_id' => $content_id, 'template_kurzbz'=>$content->template_kurzbz , 'version' => $version, 'sprache' => $sprache, 'sichtbar' => $sichtbar]);
+		$this->load->view('CisVue/Cms/Content', ['content_id' => $content_id, 'template_kurzbz' => $content->template_kurzbz, 'version' => $version, 'sprache' => $sprache, 'sichtbar' => $sichtbar]);
 	}
 
 	/**
@@ -62,7 +70,7 @@ class Cms extends FHC_Controller
 	 */
 	public function news($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
 	{
-		$this->load->view('CisHtml/Cms/Content', ['infoscreen' => $infoscreen, 'studiengang_kz' => $studiengang_kz, 'semester' => $semester, 'mischen' => $mischen, 'titel' => $titel, 'edit' => $edit, 'sichtbar' => $sichtbar]);
+		$this->load->view('CisVue/Cms/Content', ['infoscreen' => $infoscreen, 'studiengang_kz' => $studiengang_kz, 'semester' => $semester, 'mischen' => $mischen, 'titel' => $titel, 'edit' => $edit, 'sichtbar' => $sichtbar]);
 	}
 
 	public function getNews($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
diff --git a/application/views/Cis/Profil.php b/application/views/Cis/Profil.php
index cb3d28711..788d44360 100755
--- a/application/views/Cis/Profil.php
+++ b/application/views/Cis/Profil.php
@@ -8,11 +8,11 @@ $includesArray = array(
 	
 );
 
-$this->load->view('templates/CISHTML-Header', $includesArray);
+$this->load->view('templates/CISVUE-Header', $includesArray);
 ?>
 
 <div id="content" >
 
 </div>
 
-<?php $this->load->view('templates/CISHTML-Footer', $includesArray); ?>
+<?php $this->load->view('templates/CISVUE-Footer', $includesArray); ?>
diff --git a/application/views/lehre/Antrag/Create.php b/application/views/lehre/Antrag/Create.php
index dcfd29e42..00e41d1cd 100755
--- a/application/views/lehre/Antrag/Create.php
+++ b/application/views/lehre/Antrag/Create.php
@@ -18,10 +18,18 @@ $sitesettings = array(
 	)
 );
 
-$this->load->view(
-	'templates/CISHTML-Header',
-	$sitesettings
-);
+if(defined('CIS4')){
+	$this->load->view(
+		'templates/CISVUE-Header',
+		$sitesettings
+	);
+}else{
+	$this->load->view(
+		'templates/FHC-Header',
+		$sitesettings
+	);
+}
+
 ?>
 
 <div id="wrapper">
@@ -49,7 +57,15 @@ $this->load->view(
 </div>
 
 <?php
-$this->load->view(
-	'templates/CISHTML-Footer',
-	$sitesettings
-);
+
+if (defined('CIS4')) {
+	$this->load->view(
+		'templates/CISVUE-Footer',
+		$sitesettings
+	);
+} else {
+	$this->load->view(
+		'templates/FHC-Footer',
+		$sitesettings
+	);
+}
diff --git a/application/views/lehre/Antrag/Student/List.php b/application/views/lehre/Antrag/Student/List.php
index 2be4f63d7..c2e3060d1 100755
--- a/application/views/lehre/Antrag/Student/List.php
+++ b/application/views/lehre/Antrag/Student/List.php
@@ -18,7 +18,7 @@ $sitesettings = array(
 );
 
 $this->load->view(
-	'templates/CISHTML-Header',
+	'templates/CISVUE-Header',
 	$sitesettings
 );
 ?>
@@ -222,6 +222,6 @@ $this->load->view(
 
 <?php
 $this->load->view(
-	'templates/CISHTML-Footer',
+	'templates/CISVUE-Footer',
 	$sitesettings
 );
diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js
index 71400b3b5..b5f265e3b 100755
--- a/public/js/components/Cis/Menu.js
+++ b/public/js/components/Cis/Menu.js
@@ -16,19 +16,27 @@ export default {
     },
     data: () => {
         return {
-            entries: []
+            entries: [],
+			activeEntry:null,
+			url:null,
         };
     },
+	methods:{
+		setActiveEntry(content_id){
+			this.activeEntry = content_id;
+		}
+	},
     created() {
         axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/CisVue/Menu').then(res => {
             this.entries = res.data.retval.childs;
         });
+		
     },
-    template: `
+    template: /*html*/`
+	<p>CISVUE HEADER</p>
     <button id="nav-main-btn" class="navbar-toggler" type="button" data-bs-toggle="offcanvas" data-bs-target="#nav-main" aria-controls="nav-main" aria-expanded="false" aria-label="Toggle navigation">
         <span class="navbar-toggler-icon"></span>
     </button>
-    
     <a id="nav-logo" :href="rootUrl">
         <img :src="logoUrl" alt="Logo">
     </a>
@@ -51,7 +59,7 @@ export default {
             </ul>
             <div id="nav-main-menu" class="collapse collapse-horizontal show">
                 <div>
-                    <cis-menu-entry v-for="entry in entries" :key="entry.content_id" :entry="entry" />
+                    <cis-menu-entry @activeEntry="setActiveEntry" :activeContent="activeEntry" v-for="entry in entries" :key="entry.content_id" :entry="entry" />
                 </div>
             </div>
         </div>
diff --git a/public/js/components/Cis/Menu/Entry.js b/public/js/components/Cis/Menu/Entry.js
index 93bfc2819..8d2469887 100755
--- a/public/js/components/Cis/Menu/Entry.js
+++ b/public/js/components/Cis/Menu/Entry.js
@@ -5,14 +5,53 @@ export default {
         level: {
             type: Number,
             default: 1
-        }
+        },
+		activeContent: String
     },
     data: () => {
         return {
-            collapse: null
+            collapse: null,
+			url:null,
         }
     },
+	emits: ["activeEntry"],
+	watch:{
+		activeContent: function(newValue){
+			if(newValue == this.entry.content_id){
+				this.entry.menu_open = true;
+			}else{
+				if(this.entry.childs instanceof Array){
+					for(let child of this.entry.childs){
+						child.menu_open = false;
+						
+					}
+				}
+				if (this.searchRecursiveChild(this.entry,newValue)){
+					this.entry.menu_open = true;
+				}else{
+					this.entry.menu_open = false;
+				}
+			}
+		},
+		'entry.menu_open': function (newValue,oldValue) {
+			if (newValue) {
+				console.log(this.entry.titel,"open")
+				this.collapse && this.collapse.show();
+			} else {
+				console.log(this.entry.titel,"close")
+				this.collapse && this.collapse.hide();
+			}
+		}
+	},
+		
     computed: {
+		active: function () {
+			if (this.activeContent) {
+				return this.activeContent == this.entry.content_id;
+			} else {
+				return false;
+			}
+		},
         link() {
             if (this.entry.template_kurzbz == 'redirect') {
                 if (!this.entry.content)
@@ -23,9 +62,19 @@ export default {
                     return '';
                 // TODO(chris): replace get params
                 url = url.childNodes[0].nodeValue + "";
-                url = url.replace(/^\.\.\/cms\/news\.php/, FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/CisVue/Cms/news');
-                url = url.replace(/^\.\.\//, FHC_JS_DATA_STORAGE_OBJECT.app_root);
-                return url;
+				if (url.includes("../cms/news.php")) {
+					let news_regex = new RegExp("^\.\./cms/news\.php");
+					url = url.replace(news_regex, FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/CisVue/Cms/news');
+				}
+				else if(url.includes("../index.ci.php")){
+					let index_regex = new RegExp("^\.\./index\.ci\.php");
+					url = url.replace(index_regex, FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router);
+				}
+				else if (url.includes("../")) {
+					let relative_regex = new RegExp("^\.\./");
+					url = url.replace(relative_regex, FHC_JS_DATA_STORAGE_OBJECT.app_root);
+				}
+				return url;
             }
             return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/CisVue/Cms/content/' + this.entry.content_id;
         },
@@ -50,11 +99,33 @@ export default {
         }
     },
     methods: {
+		searchRecursiveChild(entry,child_content_id){
+			if (entry.childs instanceof Array) {
+				for (let child of entry.childs) {
+					if (child.content_id == child_content_id){
+						return true;
+					}
+					if (this.searchRecursiveChild(child, child_content_id)){
+						return true;
+					}
+				}
+			}
+			return false;
+		},
+		resendEmit(event){
+			console.log(this.entry.titel);
+			this.entry.menu_open = true;
+			this.$emit('activeEntry',event);
+		},
         toggleCollapse(evt) {
-            if (this.collapse !== null) {
+            if (this.level > 1 && this.collapse !== null) {
                 this.entry.menu_open = !this.entry.menu_open;
                 this.collapse.toggle(evt.target);
-            }
+            }else{
+				this.active ? 
+				this.$emit("activeEntry", null): 
+				this.$emit("activeEntry", this.entry.content_id);
+			}
         }
     },
     mounted() {
@@ -63,33 +134,42 @@ export default {
                 this.$refs.children.className += ' show';
             this.collapse = new bootstrap.Collapse(this.$refs.children, { toggle: false });
         }
+
+		this.url = window.location.href;
+		if (window.location.href == this.link) {
+			this.$emit("activeEntry", this.entry.content_id);
+		}
     },
-    template: `
-    <div v-if="entry.template_kurzbz == 'include'">
+    template: /*html*/`
+	<!--<p>activeContent: {{JSON.stringify(activeContent,null,2)}}</p>
+	<p>entry menu: {{JSON.stringify(entry.menu_open,null,2)}}</p>-->
+	<div v-if="entry.template_kurzbz == 'include'">
         INCLUDE
     </div>
     <template v-else>
         <template v-if="hasChilds">
-            <a v-if="link.substr(0, 1) == '#'" 
-                @click.prevent="toggleCollapse" 
-                :aria-expanded="entry.menu_open" 
-                :href="link" 
+			<a v-if="link.substr(0, 1) == '#'"
+                @click.prevent="toggleCollapse"
+                :aria-expanded="entry.menu_open"
+                :href="link"
                 :class="{
                     'btn btn-default rounded-0 w-100 text-start dropdown-toggle': true,
                     ['btn-level-' + level]: true,
                     collapsed: !entry.menu_open
                 }">
-                <span>{{ entry.titel }}</span>
+                <span :class="{'text-decoration-underline':active}">{{ entry.titel }}</span>
+
             </a>
             <div v-else class="btn-group w-100">
-                <a :href="link" :target="target" 
+                <a :href="link" :target="target"
                     :class="{
                         'btn btn-default rounded-0 text-start': true,
-                        ['btn-level-' + level]: true
+                        ['btn-level-' + level]: true,
+						'text-decoration-underline':active
                     }">
                     {{ entry.titel }}
                 </a>
-                <button @click.prevent="toggleCollapse" :aria-expanded="entry.menu_open" 
+                <button @click.prevent="toggleCollapse" :aria-expanded="entry.menu_open"
                     :class="{
                         'btn btn-default rounded-0 dropdown-toggle dropdown-toggle-split flex-grow-0': true,
                         collapsed: !entry.menu_open
@@ -97,17 +177,18 @@ export default {
                     <span class="visually-hidden">Toggle Dropdown</span>
                 </button>
             </div>
-            <ul ref="children" 
+            <ul ref="children"
                 class="nav w-100 collapse">
-                <cis-menu-entry v-for="child in entry.childs" :key="child" :entry="child" :level="level + 1"/>
+                <cis-menu-entry @activeEntry="resendEmit" :activeContent="activeContent" v-for="child in entry.childs" :key="child" :entry="child" :level="level + 1"/>
             </ul>
         </template>
-        <a v-else 
-            :href="link" 
-            :target="target" 
+        <a v-else
+            :href="link"
+            :target="target"
             :class="{
-                'btn btn-default rounded-0 w-100 text-start': true, 
-                ['btn-level-' + level]: true
+                'btn btn-default rounded-0 w-100 text-start': true,
+                ['btn-level-' + level]: true,
+				'text-decoration-underline':active
             }">
             {{ entry.titel }}
         </a>

From f66c3466edbd1ee016e5d34ad5dc36113f9a92d0 Mon Sep 17 00:00:00 2001
From: Christian Paminger <pam@technikum-wien.at>
Date: Wed, 25 Sep 2024 05:40:04 +0200
Subject: [PATCH 1240/1461] Extend HTTP-Basic-Auth for Demo-Mode and easier
 testing

---
 .gitignore                        |    2 +
 .htaccess_exmpl                   |   11 +
 .htpasswd_exmpl                   |   14 +
 application/config/auth.php       |    2 +-
 application/config/constants.php  |    1 +
 application/libraries/AuthLib.php |   40 +-
 composer.json                     |    3 +-
 composer.lock                     | 2479 +++++------------------------
 include/auth_demo.class.php       |   11 +-
 9 files changed, 474 insertions(+), 2089 deletions(-)
 create mode 100644 .htaccess_exmpl
 create mode 100644 .htpasswd_exmpl

diff --git a/.gitignore b/.gitignore
index 96af3e5dc..7894692af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,9 +7,11 @@ vendor/
 .project
 .buildpath
 .ptp-sync*
+.vscode/
 
 .htaccess
 .htaccessbak
+.htpasswd
 
 application/config/development/
 application/config/extensions/
diff --git a/.htaccess_exmpl b/.htaccess_exmpl
new file mode 100644
index 000000000..219cc3a41
--- /dev/null
+++ b/.htaccess_exmpl
@@ -0,0 +1,11 @@
+# Be careful if you change the AuthName, also change it in the configs
+AuthName "FH-Complete"
+AuthType Basic
+# Change this to your root-folder
+AuthUserFile /var/www/html/.htpasswd
+
+require valid-user 
+
+# Follow symbolic links.
+Options +FollowSymLinks
+
diff --git a/.htpasswd_exmpl b/.htpasswd_exmpl
new file mode 100644
index 000000000..f8104a706
--- /dev/null
+++ b/.htpasswd_exmpl
@@ -0,0 +1,14 @@
+admin:$apr1$w6jylrnm$fbKTilbCkJ9M0cySq7lDi1
+pam:$apr1$TJRAwUxR$PifE5Lj0cs7yar7VuAlLC0
+assistenz1:
+assistenz2:
+assistenz2:
+student1:
+student2:
+student3:
+gl1:
+gl2:
+lektor1:
+lektor2:
+lektor3:
+aufnahme:
\ No newline at end of file
diff --git a/application/config/auth.php b/application/config/auth.php
index 2e42a636c..b19b82d3d 100644
--- a/application/config/auth.php
+++ b/application/config/auth.php
@@ -5,7 +5,7 @@ if (!defined('BASEPATH')) exit('No direct script access allowed');
 // Array or a string of authentication methods sorted by priority (highest to lowest)
 // NOTE: AUTH_HBALDAP works also as login page (old ugly HTTP basic authentication)
 //		should be placed at the end of the array
-$config['authentication_foreign_methods'] = array(AUTH_BT, AUTH_HBALDAP);
+$config['authentication_foreign_methods'] = array(AUTH_BT, AUTH_HBA, AUTH_HBALDAP);
 
 // Login method
 $config['authentication_login'] = AUTH_LDAP;
diff --git a/application/config/constants.php b/application/config/constants.php
index cbbf55d8b..3489021e8 100644
--- a/application/config/constants.php
+++ b/application/config/constants.php
@@ -44,6 +44,7 @@ define('BEGINNING_OF_TIME',					'1970-01-01');
 |--------------------------------------------------------------------------
 */
 // Foreign authentication methods
+define('AUTH_HBA',	'httpBasicAuth');
 define('AUTH_HBALDAP',	'httpBasicAuthLDAP');
 define('AUTH_BT',		'bewerbung');
 
diff --git a/application/libraries/AuthLib.php b/application/libraries/AuthLib.php
index de9c15350..67fd7d3d7 100644
--- a/application/libraries/AuthLib.php
+++ b/application/libraries/AuthLib.php
@@ -37,7 +37,8 @@ class AuthLib
 		// Gets CI instance
 		$this->_ci =& get_instance();
 
-		if ($authenticate === true) $this->_authenticate(); // if required -> authenticate the current user
+		if ($authenticate === true) 
+			$this->_authenticate(); // if required -> authenticate the current user
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
@@ -361,6 +362,40 @@ class AuthLib
 		return $bt;
 	}
 
+	/**
+	 * Checks if the user is already authenticated with HTTP basic authentication 
+	 * NOTE: this method also display a login, not possible to be avoided due HTTP basic authentication limitations
+	 */
+	private function _checkHBAuthentication()
+	{
+		$hta = error('Not authenticated', AUTH_NOT_AUTHENTICATED); // by default is NOT authenticated
+
+		// Checks if an HTTP basic authentication is active and checks credentials using LDAP
+		if (!isset($_SERVER['PHP_AUTH_USER']))
+		{
+			// If NOT send the header to perform an HTTP basic authentication
+			header('WWW-Authenticate: Basic realm="'.AUTH_NAME.'"');
+		}
+		else // otherwise
+		{
+			// NOTE: Username needs to be trimmed and lowered because htaccess is allowing login
+			$hta = $this->_createAuthObjByPerson(array('uid' => mb_strtolower(trim($_SERVER['PHP_AUTH_USER']))));
+		}
+
+		// Invalid credentials
+		// NOTE: this is a corner case because of the HTTP basic authentication
+		if (getCode($hta) == AUTH_NOT_AUTHENTICATED || getCode($hta) == AUTH_INVALID_CREDENTIALS)
+		{
+			$this->_showInvalidAuthentication(); // this also stop the execution
+		}
+		elseif (isError($hta)) // display error and stop execution
+		{
+			$this->_showError(getError($hta));
+		}
+
+		return $hta; // if success then is returned!
+	}
+	
 	/**
 	 * Checks if the user is already authenticated with HTTP basic authentication + LDAP
 	 * NOTE: this method also display a login, not possible to be avoided due HTTP basic authentication limitations
@@ -436,6 +471,9 @@ class AuthLib
 				case AUTH_BT: // Bewerbung tool
 					$auth = $this->_checkBTAuthentication();
 					break;
+				case AUTH_HBA: // HTTP basic authentication
+					$auth = $this->_checkHBAuthentication();
+					break;
 				case AUTH_HBALDAP: // HTTP basic authentication + LDAP
 					$auth = $this->_checkHBALDAPAuthentication();
 					break;
diff --git a/composer.json b/composer.json
index 9e0c0fb7c..27ded15b6 100644
--- a/composer.json
+++ b/composer.json
@@ -442,7 +442,6 @@
 		"squizlabs/php_codesniffer": "3.6.*",
 		"phpmd/phpmd": "2.*",
 		"phpmetrics/phpmetrics": "2.*",
-		"sebastian/phpcpd": "3.*",
-		"phpunit/phpunit": "^6"
+		"irstea/phpcpd-shim": "6.*"
 	}
 }
diff --git a/composer.lock b/composer.lock
index 6eb3e0383..75dfe4587 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "eedcd2abe226d372ff8d735498eb3b0a",
+    "content-hash": "596f52b8203fb2ac2976d266bc875459",
     "packages": [
         {
             "name": "afarkas/html5shiv",
@@ -902,30 +902,32 @@
         },
         {
             "name": "fzaninotto/faker",
-            "version": "v1.9.2",
+            "version": "v1.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/fzaninotto/Faker.git",
-                "reference": "848d8125239d7dbf8ab25cb7f054f1a630e68c2e"
+                "reference": "d0190b156bcca848d401fb80f31f504f37141c8d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/848d8125239d7dbf8ab25cb7f054f1a630e68c2e",
-                "reference": "848d8125239d7dbf8ab25cb7f054f1a630e68c2e",
+                "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/d0190b156bcca848d401fb80f31f504f37141c8d",
+                "reference": "d0190b156bcca848d401fb80f31f504f37141c8d",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.3.3 || ^7.0"
+                "php": ">=5.3.3"
             },
             "require-dev": {
-                "ext-intl": "*",
-                "phpunit/phpunit": "^4.8.35 || ^5.7",
-                "squizlabs/php_codesniffer": "^2.9.2"
+                "phpunit/phpunit": "~4.0",
+                "squizlabs/php_codesniffer": "~1.5"
+            },
+            "suggest": {
+                "ext-intl": "*"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.9-dev"
+                    "dev-master": "1.5.x-dev"
                 }
             },
             "autoload": {
@@ -950,10 +952,10 @@
             ],
             "support": {
                 "issues": "https://github.com/fzaninotto/Faker/issues",
-                "source": "https://github.com/fzaninotto/Faker/tree/v1.9.2"
+                "source": "https://github.com/fzaninotto/Faker/tree/master"
             },
             "abandoned": true,
-            "time": "2020-12-11T09:56:16+00:00"
+            "time": "2015-05-29T06:29:14+00:00"
         },
         {
             "name": "joeldbirch/superfish",
@@ -1015,12 +1017,12 @@
             "version": "1.3.7",
             "source": {
                 "type": "git",
-                "url": "https://github.com/justinrainbow/json-schema.git",
+                "url": "https://github.com/jsonrainbow/json-schema.git",
                 "reference": "87b54b460febed69726c781ab67462084e97a105"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/87b54b460febed69726c781ab67462084e97a105",
+                "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/87b54b460febed69726c781ab67462084e97a105",
                 "reference": "87b54b460febed69726c781ab67462084e97a105",
                 "shasum": ""
             },
@@ -1075,8 +1077,8 @@
                 "schema"
             ],
             "support": {
-                "issues": "https://github.com/justinrainbow/json-schema/issues",
-                "source": "https://github.com/justinrainbow/json-schema/tree/master"
+                "issues": "https://github.com/jsonrainbow/json-schema/issues",
+                "source": "https://github.com/jsonrainbow/json-schema/tree/1.3.7"
             },
             "time": "2014-08-25T02:48:14+00:00"
         },
@@ -1116,6 +1118,7 @@
                 "issues": "https://github.com/kingsquare/json-schema-form/issues",
                 "source": "https://github.com/kingsquare/json-schema-form/tree/master"
             },
+            "abandoned": true,
             "time": "2014-07-10T12:27:19+00:00"
         },
         {
@@ -1297,16 +1300,16 @@
         },
         {
             "name": "mottie/tablesorter",
-            "version": "v2.31.3",
+            "version": "v2.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Mottie/tablesorter.git",
-                "reference": "7202d5faf8105a5ecd1a2b7a653777618713ffe5"
+                "reference": "1423f5408982f58d5baa97648d2e5ee0b55fd3b6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Mottie/tablesorter/zipball/7202d5faf8105a5ecd1a2b7a653777618713ffe5",
-                "reference": "7202d5faf8105a5ecd1a2b7a653777618713ffe5",
+                "url": "https://api.github.com/repos/Mottie/tablesorter/zipball/1423f5408982f58d5baa97648d2e5ee0b55fd3b6",
+                "reference": "1423f5408982f58d5baa97648d2e5ee0b55fd3b6",
                 "shasum": ""
             },
             "require": {
@@ -1331,7 +1334,8 @@
                 },
                 {
                     "name": "Rob Garrison",
-                    "email": "wowmotty@gmail.com"
+                    "email": "wowmotty@gmail.com",
+                    "homepage": "https://github.com/Mottie"
                 }
             ],
             "description": "tablesorter (FORK) is a jQuery plugin for turning a standard HTML table with THEAD and TBODY tags into a sortable table without page refreshes. tablesorter can successfully parse and sort many types of data including linked data in a cell.",
@@ -1352,7 +1356,7 @@
                 "source": "https://github.com/Mottie/tablesorter",
                 "wiki": "https://github.com/Mottie/tablesorter/wiki"
             },
-            "time": "2020-03-03T13:46:03+00:00"
+            "time": "2024-08-14T01:23:57+00:00"
         },
         {
             "name": "nategood/httpful",
@@ -1520,16 +1524,16 @@
         },
         {
             "name": "phpseclib/phpseclib",
-            "version": "2.0.46",
+            "version": "2.0.47",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "498e67a0c82bd5791fda9b0dd0f4ec8e8aebb02d"
+                "reference": "b7d7d90ee7df7f33a664b4aea32d50a305d35adb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/498e67a0c82bd5791fda9b0dd0f4ec8e8aebb02d",
-                "reference": "498e67a0c82bd5791fda9b0dd0f4ec8e8aebb02d",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/b7d7d90ee7df7f33a664b4aea32d50a305d35adb",
+                "reference": "b7d7d90ee7df7f33a664b4aea32d50a305d35adb",
                 "shasum": ""
             },
             "require": {
@@ -1610,7 +1614,7 @@
             ],
             "support": {
                 "issues": "https://github.com/phpseclib/phpseclib/issues",
-                "source": "https://github.com/phpseclib/phpseclib/tree/2.0.46"
+                "source": "https://github.com/phpseclib/phpseclib/tree/2.0.47"
             },
             "funding": [
                 {
@@ -1626,7 +1630,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-12-29T01:52:43+00:00"
+            "time": "2024-02-26T04:55:38+00:00"
         },
         {
             "name": "rmariuzzo/jquery-checkboxes",
@@ -1648,29 +1652,29 @@
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.19.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "aed596913b70fae57be53d86faa2e9ef85a2297b"
+                "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/aed596913b70fae57be53d86faa2e9ef85a2297b",
-                "reference": "aed596913b70fae57be53d86faa2e9ef85a2297b",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638",
+                "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.2"
+            },
+            "provide": {
+                "ext-ctype": "*"
             },
             "suggest": {
                 "ext-ctype": "For best performance"
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.19-dev"
-                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -1707,7 +1711,7 @@
                 "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.19.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -1723,7 +1727,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-10-23T09:01:57+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "tapmodo/jcrop",
@@ -1773,30 +1777,30 @@
         },
         {
             "name": "twig/twig",
-            "version": "v1.42.5",
+            "version": "v1.44.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/twigphp/Twig.git",
-                "reference": "87b2ea9d8f6fd014d0621ca089bb1b3769ea3f8e"
+                "reference": "b1f009c449e435a0384814e67205d9190a4d050e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/87b2ea9d8f6fd014d0621ca089bb1b3769ea3f8e",
-                "reference": "87b2ea9d8f6fd014d0621ca089bb1b3769ea3f8e",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/b1f009c449e435a0384814e67205d9190a4d050e",
+                "reference": "b1f009c449e435a0384814e67205d9190a4d050e",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5.0",
+                "php": ">=7.2.5",
                 "symfony/polyfill-ctype": "^1.8"
             },
             "require-dev": {
                 "psr/container": "^1.0",
-                "symfony/phpunit-bridge": "^4.4|^5.0"
+                "symfony/phpunit-bridge": "^4.4.9|^5.0.9"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.42-dev"
+                    "dev-master": "1.44-dev"
                 }
             },
             "autoload": {
@@ -1835,9 +1839,19 @@
             ],
             "support": {
                 "issues": "https://github.com/twigphp/Twig/issues",
-                "source": "https://github.com/twigphp/Twig/tree/1.x"
+                "source": "https://github.com/twigphp/Twig/tree/v1.44.8"
             },
-            "time": "2020-02-11T05:59:23+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/twig/twig",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-09-09T17:17:16+00:00"
         },
         {
             "name": "vuejs/vuedatepicker_css",
@@ -1879,30 +1893,38 @@
     "packages-dev": [
         {
             "name": "composer/pcre",
-            "version": "1.0.1",
+            "version": "3.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/pcre.git",
-                "reference": "67a32d7d6f9f560b726ab25a061b38ff3a80c560"
+                "reference": "63aaeac21d7e775ff9bc9d45021e1745c97521c4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/pcre/zipball/67a32d7d6f9f560b726ab25a061b38ff3a80c560",
-                "reference": "67a32d7d6f9f560b726ab25a061b38ff3a80c560",
+                "url": "https://api.github.com/repos/composer/pcre/zipball/63aaeac21d7e775ff9bc9d45021e1745c97521c4",
+                "reference": "63aaeac21d7e775ff9bc9d45021e1745c97521c4",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.3.2 || ^7.0 || ^8.0"
+                "php": "^7.4 || ^8.0"
+            },
+            "conflict": {
+                "phpstan/phpstan": "<1.11.10"
             },
             "require-dev": {
-                "phpstan/phpstan": "^1.3",
+                "phpstan/phpstan": "^1.11.10",
                 "phpstan/phpstan-strict-rules": "^1.1",
-                "symfony/phpunit-bridge": "^4.2 || ^5"
+                "phpunit/phpunit": "^8 || ^9"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.x-dev"
+                    "dev-main": "3.x-dev"
+                },
+                "phpstan": {
+                    "includes": [
+                        "extension.neon"
+                    ]
                 }
             },
             "autoload": {
@@ -1930,7 +1952,7 @@
             ],
             "support": {
                 "issues": "https://github.com/composer/pcre/issues",
-                "source": "https://github.com/composer/pcre/tree/1.0.1"
+                "source": "https://github.com/composer/pcre/tree/3.3.1"
             },
             "funding": [
                 {
@@ -1946,31 +1968,31 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-21T20:24:37+00:00"
+            "time": "2024-08-27T18:44:43+00:00"
         },
         {
             "name": "composer/xdebug-handler",
-            "version": "2.0.5",
+            "version": "3.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/xdebug-handler.git",
-                "reference": "9e36aeed4616366d2b690bdce11f71e9178c579a"
+                "reference": "6c1925561632e83d60a44492e0b344cf48ab85ef"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/9e36aeed4616366d2b690bdce11f71e9178c579a",
-                "reference": "9e36aeed4616366d2b690bdce11f71e9178c579a",
+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/6c1925561632e83d60a44492e0b344cf48ab85ef",
+                "reference": "6c1925561632e83d60a44492e0b344cf48ab85ef",
                 "shasum": ""
             },
             "require": {
-                "composer/pcre": "^1",
-                "php": "^5.3.2 || ^7.0 || ^8.0",
+                "composer/pcre": "^1 || ^2 || ^3",
+                "php": "^7.2.5 || ^8.0",
                 "psr/log": "^1 || ^2 || ^3"
             },
             "require-dev": {
                 "phpstan/phpstan": "^1.0",
                 "phpstan/phpstan-strict-rules": "^1.1",
-                "symfony/phpunit-bridge": "^4.2 || ^5.0 || ^6.0"
+                "phpunit/phpunit": "^8.5 || ^9.6 || ^10.5"
             },
             "type": "library",
             "autoload": {
@@ -1994,9 +2016,9 @@
                 "performance"
             ],
             "support": {
-                "irc": "irc://irc.freenode.org/composer",
+                "irc": "ircs://irc.libera.chat:6697/composer",
                 "issues": "https://github.com/composer/xdebug-handler/issues",
-                "source": "https://github.com/composer/xdebug-handler/tree/2.0.5"
+                "source": "https://github.com/composer/xdebug-handler/tree/3.0.5"
             },
             "funding": [
                 {
@@ -2012,146 +2034,67 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-02-24T20:20:32+00:00"
+            "time": "2024-05-06T16:37:16+00:00"
         },
         {
-            "name": "doctrine/instantiator",
-            "version": "1.0.5",
+            "name": "irstea/phpcpd-shim",
+            "version": "6.0.3",
             "source": {
                 "type": "git",
-                "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
-                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
-                "shasum": ""
+                "url": "https://gitlab.irstea.fr/pole-is/tools/phpcpd-shim.git",
+                "reference": "5829d11d1379fd92176b7e2105060c7f09f4fdda"
             },
             "require": {
-                "php": ">=5.3,<8.0-DEV"
+                "ext-dom": "*",
+                "php": ">=7.3"
             },
-            "require-dev": {
-                "athletic/athletic": "~0.1.8",
-                "ext-pdo": "*",
-                "ext-phar": "*",
-                "phpunit/phpunit": "~4.0",
-                "squizlabs/php_codesniffer": "~2.0"
+            "replace": {
+                "sebastian/phpcpd": "self.version"
             },
+            "bin": [
+                "phpcpd"
+            ],
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
             "autoload": {
-                "psr-4": {
-                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
-                }
+                "exclude-from-classmap": [
+                    "phpcpd"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
+                "BSD-3-Clause"
             ],
             "authors": [
                 {
-                    "name": "Marco Pivetta",
-                    "email": "ocramius@gmail.com",
-                    "homepage": "http://ocramius.github.com/"
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
                 }
             ],
-            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
-            "homepage": "https://github.com/doctrine/instantiator",
+            "description": "Shim repository for sebastian/phpcpd",
+            "homepage": "https://github.com/sebastianbergmann/phpcpd",
             "keywords": [
-                "constructor",
-                "instantiate"
+                "shim"
             ],
-            "support": {
-                "issues": "https://github.com/doctrine/instantiator/issues",
-                "source": "https://github.com/doctrine/instantiator/tree/1.0.5"
-            },
-            "funding": [
-                {
-                    "url": "https://www.doctrine-project.org/sponsorship.html",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://www.patreon.com/phpdoctrine",
-                    "type": "patreon"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2015-06-14T21:17:01+00:00"
-        },
-        {
-            "name": "myclabs/deep-copy",
-            "version": "1.7.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e",
-                "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.6 || ^7.0"
-            },
-            "require-dev": {
-                "doctrine/collections": "^1.0",
-                "doctrine/common": "^2.6",
-                "phpunit/phpunit": "^4.1"
-            },
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "src/DeepCopy/deep_copy.php"
-                ],
-                "psr-4": {
-                    "DeepCopy\\": "src/DeepCopy/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "Create deep copies (clones) of your objects",
-            "keywords": [
-                "clone",
-                "copy",
-                "duplicate",
-                "object",
-                "object graph"
-            ],
-            "support": {
-                "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.x"
-            },
-            "time": "2017-10-19T19:58:43+00:00"
+            "time": "2020-12-08T03:20:09+00:00"
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.18.0",
+            "version": "v4.19.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999"
+                "reference": "0ed4c8949a32986043e977dbe14776c14d644c45"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bcbb2179f97633e98bbbc87044ee2611c7d7999",
-                "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/0ed4c8949a32986043e977dbe14776c14d644c45",
+                "reference": "0ed4c8949a32986043e977dbe14776c14d644c45",
                 "shasum": ""
             },
             "require": {
                 "ext-tokenizer": "*",
-                "php": ">=7.0"
+                "php": ">=7.1"
             },
             "require-dev": {
                 "ircmaxell/php-yacc": "^0.0.7",
@@ -2187,9 +2130,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.18.0"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.19.2"
             },
-            "time": "2023-12-10T21:03:43+00:00"
+            "time": "2024-09-17T19:36:00+00:00"
         },
         {
             "name": "pdepend/pdepend",
@@ -2254,279 +2197,6 @@
             ],
             "time": "2023-12-17T18:09:59+00:00"
         },
-        {
-            "name": "phar-io/manifest",
-            "version": "1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phar-io/manifest.git",
-                "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/manifest/zipball/2df402786ab5368a0169091f61a7c1e0eb6852d0",
-                "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "ext-phar": "*",
-                "phar-io/version": "^1.0.1",
-                "php": "^5.6 || ^7.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Arne Blankerts",
-                    "email": "arne@blankerts.de",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Sebastian Heuer",
-                    "email": "sebastian@phpeople.de",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
-            "support": {
-                "issues": "https://github.com/phar-io/manifest/issues",
-                "source": "https://github.com/phar-io/manifest/tree/master"
-            },
-            "time": "2017-03-05T18:14:27+00:00"
-        },
-        {
-            "name": "phar-io/version",
-            "version": "1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phar-io/version.git",
-                "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/version/zipball/a70c0ced4be299a63d32fa96d9281d03e94041df",
-                "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.6 || ^7.0"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Arne Blankerts",
-                    "email": "arne@blankerts.de",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Sebastian Heuer",
-                    "email": "sebastian@phpeople.de",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Library for handling version information and constraints",
-            "support": {
-                "issues": "https://github.com/phar-io/version/issues",
-                "source": "https://github.com/phar-io/version/tree/master"
-            },
-            "time": "2017-03-05T17:38:23+00:00"
-        },
-        {
-            "name": "phpdocumentor/reflection-common",
-            "version": "1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
-                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
-                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.6"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jaap van Otterdijk",
-                    "email": "opensource@ijaap.nl"
-                }
-            ],
-            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
-            "homepage": "http://www.phpdoc.org",
-            "keywords": [
-                "FQSEN",
-                "phpDocumentor",
-                "phpdoc",
-                "reflection",
-                "static analysis"
-            ],
-            "support": {
-                "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues",
-                "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/master"
-            },
-            "time": "2017-09-11T18:02:19+00:00"
-        },
-        {
-            "name": "phpdocumentor/reflection-docblock",
-            "version": "4.3.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "da3fd972d6bafd628114f7e7e036f45944b62e9c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/da3fd972d6bafd628114f7e7e036f45944b62e9c",
-                "reference": "da3fd972d6bafd628114f7e7e036f45944b62e9c",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.0",
-                "phpdocumentor/reflection-common": "^1.0.0 || ^2.0.0",
-                "phpdocumentor/type-resolver": "~0.4 || ^1.0.0",
-                "webmozart/assert": "^1.0"
-            },
-            "require-dev": {
-                "doctrine/instantiator": "^1.0.5",
-                "mockery/mockery": "^1.0",
-                "phpdocumentor/type-resolver": "0.4.*",
-                "phpunit/phpunit": "^6.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src/"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
-                }
-            ],
-            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "support": {
-                "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues",
-                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/release/4.x"
-            },
-            "time": "2019-12-28T18:55:12+00:00"
-        },
-        {
-            "name": "phpdocumentor/type-resolver",
-            "version": "0.5.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "cf842904952e64e703800d094cdf34e715a8a3ae"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/cf842904952e64e703800d094cdf34e715a8a3ae",
-                "reference": "cf842904952e64e703800d094cdf34e715a8a3ae",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.0",
-                "phpdocumentor/reflection-common": "^1.0"
-            },
-            "require-dev": {
-                "mockery/mockery": "^1.0",
-                "phpunit/phpunit": "^6.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
-                }
-            ],
-            "support": {
-                "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
-                "source": "https://github.com/phpDocumentor/TypeResolver/tree/master"
-            },
-            "time": "2017-12-30T13:23:38+00:00"
-        },
         {
             "name": "phpmd/phpmd",
             "version": "2.15.0",
@@ -2679,516 +2349,26 @@
             "time": "2023-03-08T15:03:36+00:00"
         },
         {
-            "name": "phpspec/prophecy",
-            "version": "v1.10.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "451c3cd1418cf640de218914901e51b064abb093"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/451c3cd1418cf640de218914901e51b064abb093",
-                "reference": "451c3cd1418cf640de218914901e51b064abb093",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.0.2",
-                "php": "^5.3|^7.0",
-                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0|^5.0",
-                "sebastian/comparator": "^1.2.3|^2.0|^3.0|^4.0",
-                "sebastian/recursion-context": "^1.0|^2.0|^3.0|^4.0"
-            },
-            "require-dev": {
-                "phpspec/phpspec": "^2.5 || ^3.2",
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.10.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Prophecy\\": "src/Prophecy"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                },
-                {
-                    "name": "Marcello Duarte",
-                    "email": "marcello.duarte@gmail.com"
-                }
-            ],
-            "description": "Highly opinionated mocking framework for PHP 5.3+",
-            "homepage": "https://github.com/phpspec/prophecy",
-            "keywords": [
-                "Double",
-                "Dummy",
-                "fake",
-                "mock",
-                "spy",
-                "stub"
-            ],
-            "support": {
-                "issues": "https://github.com/phpspec/prophecy/issues",
-                "source": "https://github.com/phpspec/prophecy/tree/v1.10.3"
-            },
-            "time": "2020-03-05T15:02:03+00:00"
-        },
-        {
-            "name": "phpunit/php-code-coverage",
-            "version": "5.3.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "c89677919c5dd6d3b3852f230a663118762218ac"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c89677919c5dd6d3b3852f230a663118762218ac",
-                "reference": "c89677919c5dd6d3b3852f230a663118762218ac",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "ext-xmlwriter": "*",
-                "php": "^7.0",
-                "phpunit/php-file-iterator": "^1.4.2",
-                "phpunit/php-text-template": "^1.2.1",
-                "phpunit/php-token-stream": "^2.0.1",
-                "sebastian/code-unit-reverse-lookup": "^1.0.1",
-                "sebastian/environment": "^3.0",
-                "sebastian/version": "^2.0.1",
-                "theseer/tokenizer": "^1.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^6.0"
-            },
-            "suggest": {
-                "ext-xdebug": "^2.5.5"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.3.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
-            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
-            "keywords": [
-                "coverage",
-                "testing",
-                "xunit"
-            ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/5.3"
-            },
-            "time": "2018-04-06T15:36:58+00:00"
-        },
-        {
-            "name": "phpunit/php-file-iterator",
-            "version": "1.4.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4",
-                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
-            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
-            "keywords": [
-                "filesystem",
-                "iterator"
-            ],
-            "support": {
-                "irc": "irc://irc.freenode.net/phpunit",
-                "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
-                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/1.4.5"
-            },
-            "time": "2017-11-27T13:52:08+00:00"
-        },
-        {
-            "name": "phpunit/php-text-template",
-            "version": "1.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Simple template engine.",
-            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
-            "keywords": [
-                "template"
-            ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
-                "source": "https://github.com/sebastianbergmann/php-text-template/tree/1.2.1"
-            },
-            "time": "2015-06-21T13:50:34+00:00"
-        },
-        {
-            "name": "phpunit/php-timer",
-            "version": "1.0.9",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
-                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.3 || ^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Utility class for timing",
-            "homepage": "https://github.com/sebastianbergmann/php-timer/",
-            "keywords": [
-                "timer"
-            ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/php-timer/issues",
-                "source": "https://github.com/sebastianbergmann/php-timer/tree/master"
-            },
-            "time": "2017-02-26T11:10:40+00:00"
-        },
-        {
-            "name": "phpunit/php-token-stream",
+            "name": "psr/container",
             "version": "2.0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "791198a2c6254db10131eecfe8c06670700904db"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/791198a2c6254db10131eecfe8c06670700904db",
-                "reference": "791198a2c6254db10131eecfe8c06670700904db",
-                "shasum": ""
-            },
-            "require": {
-                "ext-tokenizer": "*",
-                "php": "^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^6.2.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Wrapper around PHP's tokenizer extension.",
-            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
-            "keywords": [
-                "tokenizer"
-            ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/php-token-stream/issues",
-                "source": "https://github.com/sebastianbergmann/php-token-stream/tree/master"
-            },
-            "abandoned": true,
-            "time": "2017-11-27T05:48:46+00:00"
-        },
-        {
-            "name": "phpunit/phpunit",
-            "version": "6.5.14",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "bac23fe7ff13dbdb461481f706f0e9fe746334b7"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/bac23fe7ff13dbdb461481f706f0e9fe746334b7",
-                "reference": "bac23fe7ff13dbdb461481f706f0e9fe746334b7",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "ext-json": "*",
-                "ext-libxml": "*",
-                "ext-mbstring": "*",
-                "ext-xml": "*",
-                "myclabs/deep-copy": "^1.6.1",
-                "phar-io/manifest": "^1.0.1",
-                "phar-io/version": "^1.0",
-                "php": "^7.0",
-                "phpspec/prophecy": "^1.7",
-                "phpunit/php-code-coverage": "^5.3",
-                "phpunit/php-file-iterator": "^1.4.3",
-                "phpunit/php-text-template": "^1.2.1",
-                "phpunit/php-timer": "^1.0.9",
-                "phpunit/phpunit-mock-objects": "^5.0.9",
-                "sebastian/comparator": "^2.1",
-                "sebastian/diff": "^2.0",
-                "sebastian/environment": "^3.1",
-                "sebastian/exporter": "^3.1",
-                "sebastian/global-state": "^2.0",
-                "sebastian/object-enumerator": "^3.0.3",
-                "sebastian/resource-operations": "^1.0",
-                "sebastian/version": "^2.0.1"
-            },
-            "conflict": {
-                "phpdocumentor/reflection-docblock": "3.0.2",
-                "phpunit/dbunit": "<3.0"
-            },
-            "require-dev": {
-                "ext-pdo": "*"
-            },
-            "suggest": {
-                "ext-xdebug": "*",
-                "phpunit/php-invoker": "^1.1"
-            },
-            "bin": [
-                "phpunit"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "6.5.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "The PHP Unit Testing framework.",
-            "homepage": "https://phpunit.de/",
-            "keywords": [
-                "phpunit",
-                "testing",
-                "xunit"
-            ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/6.5.14"
-            },
-            "time": "2019-02-01T05:22:47+00:00"
-        },
-        {
-            "name": "phpunit/phpunit-mock-objects",
-            "version": "5.0.10",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
-                "reference": "cd1cf05c553ecfec36b170070573e540b67d3f1f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/cd1cf05c553ecfec36b170070573e540b67d3f1f",
-                "reference": "cd1cf05c553ecfec36b170070573e540b67d3f1f",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.0.5",
-                "php": "^7.0",
-                "phpunit/php-text-template": "^1.2.1",
-                "sebastian/exporter": "^3.1"
-            },
-            "conflict": {
-                "phpunit/phpunit": "<6.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^6.5.11"
-            },
-            "suggest": {
-                "ext-soap": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Mock Object library for PHPUnit",
-            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
-            "keywords": [
-                "mock",
-                "xunit"
-            ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/phpunit-mock-objects/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit-mock-objects/tree/5.0.10"
-            },
-            "abandoned": true,
-            "time": "2018-08-09T05:50:03+00:00"
-        },
-        {
-            "name": "psr/container",
-            "version": "1.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/container.git",
-                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f"
+                "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
-                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
+                "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963",
+                "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "php": ">=7.4.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "2.0.x-dev"
                 }
             },
             "autoload": {
@@ -3203,7 +2383,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
             "description": "Common Container Interface (PHP FIG PSR-11)",
@@ -3217,36 +2397,36 @@
             ],
             "support": {
                 "issues": "https://github.com/php-fig/container/issues",
-                "source": "https://github.com/php-fig/container/tree/master"
+                "source": "https://github.com/php-fig/container/tree/2.0.2"
             },
-            "time": "2017-02-14T16:28:37+00:00"
+            "time": "2021-11-05T16:47:00+00:00"
         },
         {
             "name": "psr/log",
-            "version": "1.1.4",
+            "version": "3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/log.git",
-                "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
+                "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
-                "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/f16e1d5863e37f8d8c2a01719f5b34baa2b714d3",
+                "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "php": ">=8.0.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1.x-dev"
+                    "dev-master": "3.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Psr\\Log\\": "Psr/Log/"
+                    "Psr\\Log\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -3267,741 +2447,9 @@
                 "psr-3"
             ],
             "support": {
-                "source": "https://github.com/php-fig/log/tree/1.1.4"
+                "source": "https://github.com/php-fig/log/tree/3.0.2"
             },
-            "time": "2021-05-03T11:20:27+00:00"
-        },
-        {
-            "name": "sebastian/code-unit-reverse-lookup",
-            "version": "1.0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
-                "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/1de8cd5c010cb153fcd68b8d0f64606f523f7619",
-                "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.6"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^8.5"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Looks up which function or method a line of code belongs to",
-            "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues",
-                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/1.0.2"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-11-30T08:15:22+00:00"
-        },
-        {
-            "name": "sebastian/comparator",
-            "version": "2.1.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "34369daee48eafb2651bea869b4b15d75ccc35f9"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/34369daee48eafb2651bea869b4b15d75ccc35f9",
-                "reference": "34369daee48eafb2651bea869b4b15d75ccc35f9",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.0",
-                "sebastian/diff": "^2.0 || ^3.0",
-                "sebastian/exporter": "^3.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^6.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.1.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides the functionality to compare PHP values for equality",
-            "homepage": "https://github.com/sebastianbergmann/comparator",
-            "keywords": [
-                "comparator",
-                "compare",
-                "equality"
-            ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/comparator/issues",
-                "source": "https://github.com/sebastianbergmann/comparator/tree/master"
-            },
-            "time": "2018-02-01T13:46:46+00:00"
-        },
-        {
-            "name": "sebastian/diff",
-            "version": "2.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "347c1d8b49c5c3ee30c7040ea6fc446790e6bddd"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/347c1d8b49c5c3ee30c7040ea6fc446790e6bddd",
-                "reference": "347c1d8b49c5c3ee30c7040ea6fc446790e6bddd",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^6.2"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Kore Nordmann",
-                    "email": "mail@kore-nordmann.de"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Diff implementation",
-            "homepage": "https://github.com/sebastianbergmann/diff",
-            "keywords": [
-                "diff"
-            ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/diff/issues",
-                "source": "https://github.com/sebastianbergmann/diff/tree/master"
-            },
-            "time": "2017-08-03T08:09:46+00:00"
-        },
-        {
-            "name": "sebastian/environment",
-            "version": "3.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/cd0871b3975fb7fc44d11314fd1ee20925fce4f5",
-                "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^6.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.1.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides functionality to handle HHVM/PHP environments",
-            "homepage": "http://www.github.com/sebastianbergmann/environment",
-            "keywords": [
-                "Xdebug",
-                "environment",
-                "hhvm"
-            ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/environment/issues",
-                "source": "https://github.com/sebastianbergmann/environment/tree/master"
-            },
-            "time": "2017-07-01T08:51:00+00:00"
-        },
-        {
-            "name": "sebastian/exporter",
-            "version": "3.1.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "73a9676f2833b9a7c36968f9d882589cd75511e6"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/73a9676f2833b9a7c36968f9d882589cd75511e6",
-                "reference": "73a9676f2833b9a7c36968f9d882589cd75511e6",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.0",
-                "sebastian/recursion-context": "^3.0"
-            },
-            "require-dev": {
-                "ext-mbstring": "*",
-                "phpunit/phpunit": "^8.5"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.1.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@gmail.com"
-                }
-            ],
-            "description": "Provides the functionality to export PHP variables for visualization",
-            "homepage": "http://www.github.com/sebastianbergmann/exporter",
-            "keywords": [
-                "export",
-                "exporter"
-            ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/exporter/issues",
-                "source": "https://github.com/sebastianbergmann/exporter/tree/3.1.5"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2022-09-14T06:00:17+00:00"
-        },
-        {
-            "name": "sebastian/finder-facade",
-            "version": "1.2.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/finder-facade.git",
-                "reference": "4a3174709c2dc565fe5fb26fcf827f6a1fc7b09f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/finder-facade/zipball/4a3174709c2dc565fe5fb26fcf827f6a1fc7b09f",
-                "reference": "4a3174709c2dc565fe5fb26fcf827f6a1fc7b09f",
-                "shasum": ""
-            },
-            "require": {
-                "symfony/finder": "~2.3|~3.0|~4.0",
-                "theseer/fdomdocument": "~1.3"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "FinderFacade is a convenience wrapper for Symfony's Finder component.",
-            "homepage": "https://github.com/sebastianbergmann/finder-facade",
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/finder-facade/issues",
-                "source": "https://github.com/sebastianbergmann/finder-facade/tree/master"
-            },
-            "abandoned": true,
-            "time": "2017-11-18T17:31:49+00:00"
-        },
-        {
-            "name": "sebastian/global-state",
-            "version": "2.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4",
-                "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^6.0"
-            },
-            "suggest": {
-                "ext-uopz": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Snapshotting of global state",
-            "homepage": "http://www.github.com/sebastianbergmann/global-state",
-            "keywords": [
-                "global state"
-            ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/global-state/issues",
-                "source": "https://github.com/sebastianbergmann/global-state/tree/2.0.0"
-            },
-            "time": "2017-04-27T15:39:26+00:00"
-        },
-        {
-            "name": "sebastian/object-enumerator",
-            "version": "3.0.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/object-enumerator.git",
-                "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2",
-                "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.0",
-                "sebastian/object-reflector": "^1.1.1",
-                "sebastian/recursion-context": "^3.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Traverses array structures and object graphs to enumerate all referenced objects",
-            "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/object-enumerator/issues",
-                "source": "https://github.com/sebastianbergmann/object-enumerator/tree/3.0.4"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-11-30T07:40:27+00:00"
-        },
-        {
-            "name": "sebastian/object-reflector",
-            "version": "1.1.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/object-reflector.git",
-                "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/9b8772b9cbd456ab45d4a598d2dd1a1bced6363d",
-                "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.1-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Allows reflection of object attributes, including inherited and non-public ones",
-            "homepage": "https://github.com/sebastianbergmann/object-reflector/",
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/object-reflector/issues",
-                "source": "https://github.com/sebastianbergmann/object-reflector/tree/1.1.2"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-11-30T07:37:18+00:00"
-        },
-        {
-            "name": "sebastian/phpcpd",
-            "version": "3.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpcpd.git",
-                "reference": "dfed51c1288790fc957c9433e2f49ab152e8a564"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpcpd/zipball/dfed51c1288790fc957c9433e2f49ab152e8a564",
-                "reference": "dfed51c1288790fc957c9433e2f49ab152e8a564",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.6|^7.0",
-                "phpunit/php-timer": "^1.0.6",
-                "sebastian/finder-facade": "^1.1",
-                "sebastian/version": "^1.0|^2.0",
-                "symfony/console": "^2.7|^3.0|^4.0"
-            },
-            "bin": [
-                "phpcpd"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Copy/Paste Detector (CPD) for PHP code.",
-            "homepage": "https://github.com/sebastianbergmann/phpcpd",
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/phpcpd/issues",
-                "source": "https://github.com/sebastianbergmann/phpcpd/tree/master"
-            },
-            "abandoned": true,
-            "time": "2017-11-16T08:49:28+00:00"
-        },
-        {
-            "name": "sebastian/recursion-context",
-            "version": "3.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/367dcba38d6e1977be014dc4b22f47a484dac7fb",
-                "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net"
-                }
-            ],
-            "description": "Provides functionality to recursively process PHP variables",
-            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
-                "source": "https://github.com/sebastianbergmann/recursion-context/tree/3.0.1"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-11-30T07:34:24+00:00"
-        },
-        {
-            "name": "sebastian/resource-operations",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/resource-operations.git",
-                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
-                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides a list of PHP built-in functions that operate on resources",
-            "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/resource-operations/issues",
-                "source": "https://github.com/sebastianbergmann/resource-operations/tree/master"
-            },
-            "time": "2015-07-28T20:34:47+00:00"
-        },
-        {
-            "name": "sebastian/version",
-            "version": "2.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019",
-                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.6"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
-            "homepage": "https://github.com/sebastianbergmann/version",
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/version/issues",
-                "source": "https://github.com/sebastianbergmann/version/tree/master"
-            },
-            "time": "2016-10-03T07:35:21+00:00"
+            "time": "2024-09-11T13:17:53+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",
@@ -4075,35 +2523,34 @@
         },
         {
             "name": "symfony/config",
-            "version": "v3.4.47",
+            "version": "v7.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/config.git",
-                "reference": "bc6b3fd3930d4b53a60b42fe2ed6fc466b75f03f"
+                "reference": "2210fc99fa42a259eb6c89d1f724ce0c4d62d5d2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/bc6b3fd3930d4b53a60b42fe2ed6fc466b75f03f",
-                "reference": "bc6b3fd3930d4b53a60b42fe2ed6fc466b75f03f",
+                "url": "https://api.github.com/repos/symfony/config/zipball/2210fc99fa42a259eb6c89d1f724ce0c4d62d5d2",
+                "reference": "2210fc99fa42a259eb6c89d1f724ce0c4d62d5d2",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9|>=7.0.8",
-                "symfony/filesystem": "~2.8|~3.0|~4.0",
+                "php": ">=8.2",
+                "symfony/deprecation-contracts": "^2.5|^3",
+                "symfony/filesystem": "^7.1",
                 "symfony/polyfill-ctype": "~1.8"
             },
             "conflict": {
-                "symfony/dependency-injection": "<3.3",
-                "symfony/finder": "<3.3"
+                "symfony/finder": "<6.4",
+                "symfony/service-contracts": "<2.5"
             },
             "require-dev": {
-                "symfony/dependency-injection": "~3.3|~4.0",
-                "symfony/event-dispatcher": "~3.3|~4.0",
-                "symfony/finder": "~3.3|~4.0",
-                "symfony/yaml": "~3.0|~4.0"
-            },
-            "suggest": {
-                "symfony/yaml": "To use the yaml reference dumper"
+                "symfony/event-dispatcher": "^6.4|^7.0",
+                "symfony/finder": "^6.4|^7.0",
+                "symfony/messenger": "^6.4|^7.0",
+                "symfony/service-contracts": "^2.5|^3",
+                "symfony/yaml": "^6.4|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -4128,10 +2575,10 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony Config Component",
+            "description": "Helps you find, load, combine, autofill and validate configuration values of any kind",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/config/tree/v3.4.47"
+                "source": "https://github.com/symfony/config/tree/v7.1.1"
             },
             "funding": [
                 {
@@ -4147,199 +2594,43 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-10-24T10:57:07+00:00"
-        },
-        {
-            "name": "symfony/console",
-            "version": "v3.4.47",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/console.git",
-                "reference": "a10b1da6fc93080c180bba7219b5ff5b7518fe81"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/a10b1da6fc93080c180bba7219b5ff5b7518fe81",
-                "reference": "a10b1da6fc93080c180bba7219b5ff5b7518fe81",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.5.9|>=7.0.8",
-                "symfony/debug": "~2.8|~3.0|~4.0",
-                "symfony/polyfill-mbstring": "~1.0"
-            },
-            "conflict": {
-                "symfony/dependency-injection": "<3.4",
-                "symfony/process": "<3.3"
-            },
-            "provide": {
-                "psr/log-implementation": "1.0"
-            },
-            "require-dev": {
-                "psr/log": "~1.0",
-                "symfony/config": "~3.3|~4.0",
-                "symfony/dependency-injection": "~3.4|~4.0",
-                "symfony/event-dispatcher": "~2.8|~3.0|~4.0",
-                "symfony/lock": "~3.4|~4.0",
-                "symfony/process": "~3.3|~4.0"
-            },
-            "suggest": {
-                "psr/log": "For using the console logger",
-                "symfony/event-dispatcher": "",
-                "symfony/lock": "",
-                "symfony/process": ""
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Console\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Console Component",
-            "homepage": "https://symfony.com",
-            "support": {
-                "source": "https://github.com/symfony/console/tree/v3.4.47"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-10-24T10:57:07+00:00"
-        },
-        {
-            "name": "symfony/debug",
-            "version": "v3.4.47",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/debug.git",
-                "reference": "ab42889de57fdfcfcc0759ab102e2fd4ea72dcae"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/debug/zipball/ab42889de57fdfcfcc0759ab102e2fd4ea72dcae",
-                "reference": "ab42889de57fdfcfcc0759ab102e2fd4ea72dcae",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.5.9|>=7.0.8",
-                "psr/log": "~1.0"
-            },
-            "conflict": {
-                "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
-            },
-            "require-dev": {
-                "symfony/http-kernel": "~2.8|~3.0|~4.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Debug\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Debug Component",
-            "homepage": "https://symfony.com",
-            "support": {
-                "source": "https://github.com/symfony/debug/tree/v3.4.47"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "abandoned": "symfony/error-handler",
-            "time": "2020-10-24T10:57:07+00:00"
+            "time": "2024-05-31T14:57:53+00:00"
         },
         {
             "name": "symfony/dependency-injection",
-            "version": "v3.4.47",
+            "version": "v7.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dependency-injection.git",
-                "reference": "51d2a2708c6ceadad84393f8581df1dcf9e5e84b"
+                "reference": "38465f925ec4e0707b090e9147c65869837d639d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/51d2a2708c6ceadad84393f8581df1dcf9e5e84b",
-                "reference": "51d2a2708c6ceadad84393f8581df1dcf9e5e84b",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/38465f925ec4e0707b090e9147c65869837d639d",
+                "reference": "38465f925ec4e0707b090e9147c65869837d639d",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9|>=7.0.8",
-                "psr/container": "^1.0"
+                "php": ">=8.2",
+                "psr/container": "^1.1|^2.0",
+                "symfony/deprecation-contracts": "^2.5|^3",
+                "symfony/service-contracts": "^3.5",
+                "symfony/var-exporter": "^6.4|^7.0"
             },
             "conflict": {
-                "symfony/config": "<3.3.7",
-                "symfony/finder": "<3.3",
-                "symfony/proxy-manager-bridge": "<3.4",
-                "symfony/yaml": "<3.4"
+                "ext-psr": "<1.1|>=2",
+                "symfony/config": "<6.4",
+                "symfony/finder": "<6.4",
+                "symfony/yaml": "<6.4"
             },
             "provide": {
-                "psr/container-implementation": "1.0"
+                "psr/container-implementation": "1.1|2.0",
+                "symfony/service-implementation": "1.1|2.0|3.0"
             },
             "require-dev": {
-                "symfony/config": "~3.3|~4.0",
-                "symfony/expression-language": "~2.8|~3.0|~4.0",
-                "symfony/yaml": "~3.4|~4.0"
-            },
-            "suggest": {
-                "symfony/config": "",
-                "symfony/expression-language": "For using expressions in service container configuration",
-                "symfony/finder": "For using double-star glob patterns or when GLOB_BRACE portability is required",
-                "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them",
-                "symfony/yaml": ""
+                "symfony/config": "^6.4|^7.0",
+                "symfony/expression-language": "^6.4|^7.0",
+                "symfony/yaml": "^6.4|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -4364,10 +2655,10 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony DependencyInjection Component",
+            "description": "Allows you to standardize and centralize the way objects are constructed in your application",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/dependency-injection/tree/v3.4.47"
+                "source": "https://github.com/symfony/dependency-injection/tree/v7.1.5"
             },
             "funding": [
                 {
@@ -4383,25 +2674,96 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-10-24T10:57:07+00:00"
+            "time": "2024-09-20T08:28:38+00:00"
         },
         {
-            "name": "symfony/filesystem",
-            "version": "v3.4.47",
+            "name": "symfony/deprecation-contracts",
+            "version": "v3.5.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/filesystem.git",
-                "reference": "e58d7841cddfed6e846829040dca2cca0ebbbbb3"
+                "url": "https://github.com/symfony/deprecation-contracts.git",
+                "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/e58d7841cddfed6e846829040dca2cca0ebbbbb3",
-                "reference": "e58d7841cddfed6e846829040dca2cca0ebbbbb3",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1",
+                "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9|>=7.0.8",
-                "symfony/polyfill-ctype": "~1.8"
+                "php": ">=8.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "3.5-dev"
+                },
+                "thanks": {
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "function.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "A generic function and convention to trigger deprecation notices",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-04-18T09:32:20+00:00"
+        },
+        {
+            "name": "symfony/filesystem",
+            "version": "v7.1.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/filesystem.git",
+                "reference": "61fe0566189bf32e8cfee78335d8776f64a66f5a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/61fe0566189bf32e8cfee78335d8776f64a66f5a",
+                "reference": "61fe0566189bf32e8cfee78335d8776f64a66f5a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.2",
+                "symfony/polyfill-ctype": "~1.8",
+                "symfony/polyfill-mbstring": "~1.8"
+            },
+            "require-dev": {
+                "symfony/process": "^6.4|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -4426,10 +2788,10 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony Filesystem Component",
+            "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v3.4.47"
+                "source": "https://github.com/symfony/filesystem/tree/v7.1.5"
             },
             "funding": [
                 {
@@ -4445,94 +2807,33 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-10-24T10:57:07+00:00"
-        },
-        {
-            "name": "symfony/finder",
-            "version": "v3.4.47",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/finder.git",
-                "reference": "b6b6ad3db3edb1b4b1c1896b1975fb684994de6e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/b6b6ad3db3edb1b4b1c1896b1975fb684994de6e",
-                "reference": "b6b6ad3db3edb1b4b1c1896b1975fb684994de6e",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.5.9|>=7.0.8"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Finder\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Finder Component",
-            "homepage": "https://symfony.com",
-            "support": {
-                "source": "https://github.com/symfony/finder/tree/v3.4.47"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-11-16T17:02:08+00:00"
+            "time": "2024-09-17T09:16:35+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.19.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "b5f7b932ee6fa802fc792eabd77c4c88084517ce"
+                "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/b5f7b932ee6fa802fc792eabd77c4c88084517ce",
-                "reference": "b5f7b932ee6fa802fc792eabd77c4c88084517ce",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341",
+                "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.2"
+            },
+            "provide": {
+                "ext-mbstring": "*"
             },
             "suggest": {
                 "ext-mbstring": "For best performance"
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.19-dev"
-                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -4570,7 +2871,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.19.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -4586,130 +2887,47 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-10-23T09:01:57+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
-            "name": "theseer/fdomdocument",
-            "version": "1.6.7",
+            "name": "symfony/service-contracts",
+            "version": "v3.5.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/theseer/fDOMDocument.git",
-                "reference": "5cddd4f9076a9a2b85c5135935bba2dcb3ed7574"
+                "url": "https://github.com/symfony/service-contracts.git",
+                "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/theseer/fDOMDocument/zipball/5cddd4f9076a9a2b85c5135935bba2dcb3ed7574",
-                "reference": "5cddd4f9076a9a2b85c5135935bba2dcb3ed7574",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/bd1d9e59a81d8fa4acdcea3f617c581f7475a80f",
+                "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f",
                 "shasum": ""
             },
             "require": {
-                "ext-dom": "*",
-                "lib-libxml": "*",
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "php": ">=7.3"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Arne Blankerts",
-                    "email": "arne@blankerts.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "The classes contained within this repository extend the standard DOM to use exceptions at all occasions of errors instead of PHP warnings or notices. They also add various custom methods and shortcuts for convenience and to simplify the usage of DOM.",
-            "homepage": "https://github.com/theseer/fDOMDocument",
-            "support": {
-                "issues": "https://github.com/theseer/fDOMDocument/issues",
-                "source": "https://github.com/theseer/fDOMDocument/tree/1.6.7"
-            },
-            "abandoned": true,
-            "time": "2022-01-25T23:10:35+00:00"
-        },
-        {
-            "name": "theseer/tokenizer",
-            "version": "1.1.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/theseer/tokenizer.git",
-                "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/11336f6f84e16a720dae9d8e6ed5019efa85a0f9",
-                "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "ext-tokenizer": "*",
-                "ext-xmlwriter": "*",
-                "php": "^7.0"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Arne Blankerts",
-                    "email": "arne@blankerts.de",
-                    "role": "Developer"
-                }
-            ],
-            "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
-            "support": {
-                "issues": "https://github.com/theseer/tokenizer/issues",
-                "source": "https://github.com/theseer/tokenizer/tree/master"
-            },
-            "time": "2019-06-13T22:48:21+00:00"
-        },
-        {
-            "name": "webmozart/assert",
-            "version": "1.9.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/webmozarts/assert.git",
-                "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/webmozarts/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389",
-                "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.3 || ^7.0 || ^8.0",
-                "symfony/polyfill-ctype": "^1.8"
+                "php": ">=8.1",
+                "psr/container": "^1.1|^2.0",
+                "symfony/deprecation-contracts": "^2.5|^3"
             },
             "conflict": {
-                "phpstan/phpstan": "<0.12.20",
-                "vimeo/psalm": "<3.9.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.8.36 || ^7.5.13"
+                "ext-psr": "<1.1|>=2"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "3.5-dev"
+                },
+                "thanks": {
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
+                }
+            },
             "autoload": {
                 "psr-4": {
-                    "Webmozart\\Assert\\": "src/"
-                }
+                    "Symfony\\Contracts\\Service\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Test/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -4717,21 +2935,118 @@
             ],
             "authors": [
                 {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@gmail.com"
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Assertions to validate method input/output with nice error messages.",
+            "description": "Generic abstractions related to writing services",
+            "homepage": "https://symfony.com",
             "keywords": [
-                "assert",
-                "check",
-                "validate"
+                "abstractions",
+                "contracts",
+                "decoupling",
+                "interfaces",
+                "interoperability",
+                "standards"
             ],
             "support": {
-                "issues": "https://github.com/webmozarts/assert/issues",
-                "source": "https://github.com/webmozarts/assert/tree/1.9.1"
+                "source": "https://github.com/symfony/service-contracts/tree/v3.5.0"
             },
-            "time": "2020-07-08T17:02:28+00:00"
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-04-18T09:32:20+00:00"
+        },
+        {
+            "name": "symfony/var-exporter",
+            "version": "v7.1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/var-exporter.git",
+                "reference": "b80a669a2264609f07f1667f891dbfca25eba44c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/b80a669a2264609f07f1667f891dbfca25eba44c",
+                "reference": "b80a669a2264609f07f1667f891dbfca25eba44c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.2"
+            },
+            "require-dev": {
+                "symfony/property-access": "^6.4|^7.0",
+                "symfony/serializer": "^6.4|^7.0",
+                "symfony/var-dumper": "^6.4|^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\VarExporter\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Allows exporting any serializable PHP data structure to plain PHP code",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "clone",
+                "construct",
+                "export",
+                "hydrate",
+                "instantiate",
+                "lazy-loading",
+                "proxy",
+                "serialize"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/var-exporter/tree/v7.1.2"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-06-28T08:00:31+00:00"
         }
     ],
     "aliases": [],
@@ -4743,5 +3058,5 @@
         "php": ">=5.6.40"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.2.0"
+    "plugin-api-version": "2.3.0"
 }
diff --git a/include/auth_demo.class.php b/include/auth_demo.class.php
index cc21f9014..16996e36b 100644
--- a/include/auth_demo.class.php
+++ b/include/auth_demo.class.php
@@ -52,7 +52,8 @@ class authentication extends auth
 	// derzeit checkldapuser in functions.inc.php bzw per htaccess
 	public function checkpassword($username, $passwort)
 	{
-		if($passwort=='1q2w3' 
+		var_dump($username);
+		if ($passwort=='1q2w3' 
 			&& ($username=='pam'
 			|| $username=='admin'
 			|| $username=='assistenz1'
@@ -66,8 +67,12 @@ class authentication extends auth
 			|| $username=='lektor1'
 			|| $username=='lektor2'
 			|| $username=='lektor3'
-			|| $username == 'aufnahme'))
-			return true;
+			|| $username=='aufnahme')
+			)
+			{
+				$_SERVER['PHP_AUTH_USER']=$username;
+				return true;
+			}
 		else
 			return false;
 	}

From 3c050438b3a603379cbbd2127a4f490befea1b94 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 25 Sep 2024 09:26:08 +0200
Subject: [PATCH 1241/1461] makes the dropdown button of the menu points darker
 to make them more visible

---
 public/css/Cis4/Cis.css                |  6 ++++++
 public/js/components/Cis/Menu/Entry.js | 14 +-------------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index 7baf07c57..0758522e1 100755
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -67,6 +67,12 @@ html {
   /* border-color: var(--fhc-cis-menu-lvl-1-border-hover); */
   background-color: var(--fhc-cis-menu-lvl-1-bg-hover);
 }
+
+/* makes the dropdown button darker*/
+#cis-header .btn-level-1+.btn:not(.btn-level-1){
+	background-color:var(--fhc-cis-menu-lvl-1-bg-hover) !important;
+}
+
 #cis-header .btn-level-2,
 #cis-header .btn-level-2 + .btn,
 #cis-nav .btn-level-2,
diff --git a/public/js/components/Cis/Menu/Entry.js b/public/js/components/Cis/Menu/Entry.js
index 8d2469887..9e38e86df 100755
--- a/public/js/components/Cis/Menu/Entry.js
+++ b/public/js/components/Cis/Menu/Entry.js
@@ -148,19 +148,7 @@ export default {
     </div>
     <template v-else>
         <template v-if="hasChilds">
-			<a v-if="link.substr(0, 1) == '#'"
-                @click.prevent="toggleCollapse"
-                :aria-expanded="entry.menu_open"
-                :href="link"
-                :class="{
-                    'btn btn-default rounded-0 w-100 text-start dropdown-toggle': true,
-                    ['btn-level-' + level]: true,
-                    collapsed: !entry.menu_open
-                }">
-                <span :class="{'text-decoration-underline':active}">{{ entry.titel }}</span>
-
-            </a>
-            <div v-else class="btn-group w-100">
+			<div class="btn-group w-100">
                 <a :href="link" :target="target"
                     :class="{
                         'btn btn-default rounded-0 text-start': true,

From 951d5bb2c7da91fce804200b602fe827fd0e929f Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 25 Sep 2024 10:46:09 +0200
Subject: [PATCH 1242/1461] all the parents of an active child are also active

---
 public/js/components/Cis/Menu/Entry.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/public/js/components/Cis/Menu/Entry.js b/public/js/components/Cis/Menu/Entry.js
index 9e38e86df..76bb2a916 100755
--- a/public/js/components/Cis/Menu/Entry.js
+++ b/public/js/components/Cis/Menu/Entry.js
@@ -46,7 +46,10 @@ export default {
 		
     computed: {
 		active: function () {
-			if (this.activeContent) {
+			if (this.entry.menu_open){
+				return true;
+			}
+			else if (this.activeContent) {
 				return this.activeContent == this.entry.content_id;
 			} else {
 				return false;

From 2fc0827d49a409a8e8b46d0b2d304fdd24d916f4 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 25 Sep 2024 11:22:59 +0200
Subject: [PATCH 1243/1461] revert erroneously merged pull request

---
 .gitignore                        |    2 -
 .htaccess_exmpl                   |   11 -
 .htpasswd_exmpl                   |   14 -
 application/config/auth.php       |    2 +-
 application/config/constants.php  |    1 -
 application/libraries/AuthLib.php |   40 +-
 composer.json                     |    3 +-
 composer.lock                     | 2529 ++++++++++++++++++++++++-----
 include/auth_demo.class.php       |   11 +-
 9 files changed, 2114 insertions(+), 499 deletions(-)
 delete mode 100644 .htaccess_exmpl
 delete mode 100644 .htpasswd_exmpl

diff --git a/.gitignore b/.gitignore
index 7894692af..96af3e5dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,11 +7,9 @@ vendor/
 .project
 .buildpath
 .ptp-sync*
-.vscode/
 
 .htaccess
 .htaccessbak
-.htpasswd
 
 application/config/development/
 application/config/extensions/
diff --git a/.htaccess_exmpl b/.htaccess_exmpl
deleted file mode 100644
index 219cc3a41..000000000
--- a/.htaccess_exmpl
+++ /dev/null
@@ -1,11 +0,0 @@
-# Be careful if you change the AuthName, also change it in the configs
-AuthName "FH-Complete"
-AuthType Basic
-# Change this to your root-folder
-AuthUserFile /var/www/html/.htpasswd
-
-require valid-user 
-
-# Follow symbolic links.
-Options +FollowSymLinks
-
diff --git a/.htpasswd_exmpl b/.htpasswd_exmpl
deleted file mode 100644
index f8104a706..000000000
--- a/.htpasswd_exmpl
+++ /dev/null
@@ -1,14 +0,0 @@
-admin:$apr1$w6jylrnm$fbKTilbCkJ9M0cySq7lDi1
-pam:$apr1$TJRAwUxR$PifE5Lj0cs7yar7VuAlLC0
-assistenz1:
-assistenz2:
-assistenz2:
-student1:
-student2:
-student3:
-gl1:
-gl2:
-lektor1:
-lektor2:
-lektor3:
-aufnahme:
\ No newline at end of file
diff --git a/application/config/auth.php b/application/config/auth.php
index b19b82d3d..2e42a636c 100644
--- a/application/config/auth.php
+++ b/application/config/auth.php
@@ -5,7 +5,7 @@ if (!defined('BASEPATH')) exit('No direct script access allowed');
 // Array or a string of authentication methods sorted by priority (highest to lowest)
 // NOTE: AUTH_HBALDAP works also as login page (old ugly HTTP basic authentication)
 //		should be placed at the end of the array
-$config['authentication_foreign_methods'] = array(AUTH_BT, AUTH_HBA, AUTH_HBALDAP);
+$config['authentication_foreign_methods'] = array(AUTH_BT, AUTH_HBALDAP);
 
 // Login method
 $config['authentication_login'] = AUTH_LDAP;
diff --git a/application/config/constants.php b/application/config/constants.php
index 3489021e8..cbbf55d8b 100644
--- a/application/config/constants.php
+++ b/application/config/constants.php
@@ -44,7 +44,6 @@ define('BEGINNING_OF_TIME',					'1970-01-01');
 |--------------------------------------------------------------------------
 */
 // Foreign authentication methods
-define('AUTH_HBA',	'httpBasicAuth');
 define('AUTH_HBALDAP',	'httpBasicAuthLDAP');
 define('AUTH_BT',		'bewerbung');
 
diff --git a/application/libraries/AuthLib.php b/application/libraries/AuthLib.php
index 67fd7d3d7..de9c15350 100644
--- a/application/libraries/AuthLib.php
+++ b/application/libraries/AuthLib.php
@@ -37,8 +37,7 @@ class AuthLib
 		// Gets CI instance
 		$this->_ci =& get_instance();
 
-		if ($authenticate === true) 
-			$this->_authenticate(); // if required -> authenticate the current user
+		if ($authenticate === true) $this->_authenticate(); // if required -> authenticate the current user
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
@@ -362,40 +361,6 @@ class AuthLib
 		return $bt;
 	}
 
-	/**
-	 * Checks if the user is already authenticated with HTTP basic authentication 
-	 * NOTE: this method also display a login, not possible to be avoided due HTTP basic authentication limitations
-	 */
-	private function _checkHBAuthentication()
-	{
-		$hta = error('Not authenticated', AUTH_NOT_AUTHENTICATED); // by default is NOT authenticated
-
-		// Checks if an HTTP basic authentication is active and checks credentials using LDAP
-		if (!isset($_SERVER['PHP_AUTH_USER']))
-		{
-			// If NOT send the header to perform an HTTP basic authentication
-			header('WWW-Authenticate: Basic realm="'.AUTH_NAME.'"');
-		}
-		else // otherwise
-		{
-			// NOTE: Username needs to be trimmed and lowered because htaccess is allowing login
-			$hta = $this->_createAuthObjByPerson(array('uid' => mb_strtolower(trim($_SERVER['PHP_AUTH_USER']))));
-		}
-
-		// Invalid credentials
-		// NOTE: this is a corner case because of the HTTP basic authentication
-		if (getCode($hta) == AUTH_NOT_AUTHENTICATED || getCode($hta) == AUTH_INVALID_CREDENTIALS)
-		{
-			$this->_showInvalidAuthentication(); // this also stop the execution
-		}
-		elseif (isError($hta)) // display error and stop execution
-		{
-			$this->_showError(getError($hta));
-		}
-
-		return $hta; // if success then is returned!
-	}
-	
 	/**
 	 * Checks if the user is already authenticated with HTTP basic authentication + LDAP
 	 * NOTE: this method also display a login, not possible to be avoided due HTTP basic authentication limitations
@@ -471,9 +436,6 @@ class AuthLib
 				case AUTH_BT: // Bewerbung tool
 					$auth = $this->_checkBTAuthentication();
 					break;
-				case AUTH_HBA: // HTTP basic authentication
-					$auth = $this->_checkHBAuthentication();
-					break;
 				case AUTH_HBALDAP: // HTTP basic authentication + LDAP
 					$auth = $this->_checkHBALDAPAuthentication();
 					break;
diff --git a/composer.json b/composer.json
index 27ded15b6..9e0c0fb7c 100644
--- a/composer.json
+++ b/composer.json
@@ -442,6 +442,7 @@
 		"squizlabs/php_codesniffer": "3.6.*",
 		"phpmd/phpmd": "2.*",
 		"phpmetrics/phpmetrics": "2.*",
-		"irstea/phpcpd-shim": "6.*"
+		"sebastian/phpcpd": "3.*",
+		"phpunit/phpunit": "^6"
 	}
 }
diff --git a/composer.lock b/composer.lock
index 75dfe4587..6eb3e0383 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "596f52b8203fb2ac2976d266bc875459",
+    "content-hash": "eedcd2abe226d372ff8d735498eb3b0a",
     "packages": [
         {
             "name": "afarkas/html5shiv",
@@ -902,32 +902,30 @@
         },
         {
             "name": "fzaninotto/faker",
-            "version": "v1.5.0",
+            "version": "v1.9.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/fzaninotto/Faker.git",
-                "reference": "d0190b156bcca848d401fb80f31f504f37141c8d"
+                "reference": "848d8125239d7dbf8ab25cb7f054f1a630e68c2e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/d0190b156bcca848d401fb80f31f504f37141c8d",
-                "reference": "d0190b156bcca848d401fb80f31f504f37141c8d",
+                "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/848d8125239d7dbf8ab25cb7f054f1a630e68c2e",
+                "reference": "848d8125239d7dbf8ab25cb7f054f1a630e68c2e",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": "^5.3.3 || ^7.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.0",
-                "squizlabs/php_codesniffer": "~1.5"
-            },
-            "suggest": {
-                "ext-intl": "*"
+                "ext-intl": "*",
+                "phpunit/phpunit": "^4.8.35 || ^5.7",
+                "squizlabs/php_codesniffer": "^2.9.2"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.5.x-dev"
+                    "dev-master": "1.9-dev"
                 }
             },
             "autoload": {
@@ -952,10 +950,10 @@
             ],
             "support": {
                 "issues": "https://github.com/fzaninotto/Faker/issues",
-                "source": "https://github.com/fzaninotto/Faker/tree/master"
+                "source": "https://github.com/fzaninotto/Faker/tree/v1.9.2"
             },
             "abandoned": true,
-            "time": "2015-05-29T06:29:14+00:00"
+            "time": "2020-12-11T09:56:16+00:00"
         },
         {
             "name": "joeldbirch/superfish",
@@ -1017,12 +1015,12 @@
             "version": "1.3.7",
             "source": {
                 "type": "git",
-                "url": "https://github.com/jsonrainbow/json-schema.git",
+                "url": "https://github.com/justinrainbow/json-schema.git",
                 "reference": "87b54b460febed69726c781ab67462084e97a105"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/87b54b460febed69726c781ab67462084e97a105",
+                "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/87b54b460febed69726c781ab67462084e97a105",
                 "reference": "87b54b460febed69726c781ab67462084e97a105",
                 "shasum": ""
             },
@@ -1077,8 +1075,8 @@
                 "schema"
             ],
             "support": {
-                "issues": "https://github.com/jsonrainbow/json-schema/issues",
-                "source": "https://github.com/jsonrainbow/json-schema/tree/1.3.7"
+                "issues": "https://github.com/justinrainbow/json-schema/issues",
+                "source": "https://github.com/justinrainbow/json-schema/tree/master"
             },
             "time": "2014-08-25T02:48:14+00:00"
         },
@@ -1118,7 +1116,6 @@
                 "issues": "https://github.com/kingsquare/json-schema-form/issues",
                 "source": "https://github.com/kingsquare/json-schema-form/tree/master"
             },
-            "abandoned": true,
             "time": "2014-07-10T12:27:19+00:00"
         },
         {
@@ -1300,16 +1297,16 @@
         },
         {
             "name": "mottie/tablesorter",
-            "version": "v2.32.0",
+            "version": "v2.31.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Mottie/tablesorter.git",
-                "reference": "1423f5408982f58d5baa97648d2e5ee0b55fd3b6"
+                "reference": "7202d5faf8105a5ecd1a2b7a653777618713ffe5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Mottie/tablesorter/zipball/1423f5408982f58d5baa97648d2e5ee0b55fd3b6",
-                "reference": "1423f5408982f58d5baa97648d2e5ee0b55fd3b6",
+                "url": "https://api.github.com/repos/Mottie/tablesorter/zipball/7202d5faf8105a5ecd1a2b7a653777618713ffe5",
+                "reference": "7202d5faf8105a5ecd1a2b7a653777618713ffe5",
                 "shasum": ""
             },
             "require": {
@@ -1334,8 +1331,7 @@
                 },
                 {
                     "name": "Rob Garrison",
-                    "email": "wowmotty@gmail.com",
-                    "homepage": "https://github.com/Mottie"
+                    "email": "wowmotty@gmail.com"
                 }
             ],
             "description": "tablesorter (FORK) is a jQuery plugin for turning a standard HTML table with THEAD and TBODY tags into a sortable table without page refreshes. tablesorter can successfully parse and sort many types of data including linked data in a cell.",
@@ -1356,7 +1352,7 @@
                 "source": "https://github.com/Mottie/tablesorter",
                 "wiki": "https://github.com/Mottie/tablesorter/wiki"
             },
-            "time": "2024-08-14T01:23:57+00:00"
+            "time": "2020-03-03T13:46:03+00:00"
         },
         {
             "name": "nategood/httpful",
@@ -1524,16 +1520,16 @@
         },
         {
             "name": "phpseclib/phpseclib",
-            "version": "2.0.47",
+            "version": "2.0.46",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "b7d7d90ee7df7f33a664b4aea32d50a305d35adb"
+                "reference": "498e67a0c82bd5791fda9b0dd0f4ec8e8aebb02d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/b7d7d90ee7df7f33a664b4aea32d50a305d35adb",
-                "reference": "b7d7d90ee7df7f33a664b4aea32d50a305d35adb",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/498e67a0c82bd5791fda9b0dd0f4ec8e8aebb02d",
+                "reference": "498e67a0c82bd5791fda9b0dd0f4ec8e8aebb02d",
                 "shasum": ""
             },
             "require": {
@@ -1614,7 +1610,7 @@
             ],
             "support": {
                 "issues": "https://github.com/phpseclib/phpseclib/issues",
-                "source": "https://github.com/phpseclib/phpseclib/tree/2.0.47"
+                "source": "https://github.com/phpseclib/phpseclib/tree/2.0.46"
             },
             "funding": [
                 {
@@ -1630,7 +1626,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-26T04:55:38+00:00"
+            "time": "2023-12-29T01:52:43+00:00"
         },
         {
             "name": "rmariuzzo/jquery-checkboxes",
@@ -1652,29 +1648,29 @@
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.31.0",
+            "version": "v1.19.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638"
+                "reference": "aed596913b70fae57be53d86faa2e9ef85a2297b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638",
-                "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/aed596913b70fae57be53d86faa2e9ef85a2297b",
+                "reference": "aed596913b70fae57be53d86faa2e9ef85a2297b",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2"
-            },
-            "provide": {
-                "ext-ctype": "*"
+                "php": ">=5.3.3"
             },
             "suggest": {
                 "ext-ctype": "For best performance"
             },
             "type": "library",
             "extra": {
+                "branch-alias": {
+                    "dev-main": "1.19-dev"
+                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -1711,7 +1707,7 @@
                 "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.19.0"
             },
             "funding": [
                 {
@@ -1727,7 +1723,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-09T11:45:10+00:00"
+            "time": "2020-10-23T09:01:57+00:00"
         },
         {
             "name": "tapmodo/jcrop",
@@ -1777,30 +1773,30 @@
         },
         {
             "name": "twig/twig",
-            "version": "v1.44.8",
+            "version": "v1.42.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/twigphp/Twig.git",
-                "reference": "b1f009c449e435a0384814e67205d9190a4d050e"
+                "reference": "87b2ea9d8f6fd014d0621ca089bb1b3769ea3f8e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/b1f009c449e435a0384814e67205d9190a4d050e",
-                "reference": "b1f009c449e435a0384814e67205d9190a4d050e",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/87b2ea9d8f6fd014d0621ca089bb1b3769ea3f8e",
+                "reference": "87b2ea9d8f6fd014d0621ca089bb1b3769ea3f8e",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
+                "php": ">=5.5.0",
                 "symfony/polyfill-ctype": "^1.8"
             },
             "require-dev": {
                 "psr/container": "^1.0",
-                "symfony/phpunit-bridge": "^4.4.9|^5.0.9"
+                "symfony/phpunit-bridge": "^4.4|^5.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.44-dev"
+                    "dev-master": "1.42-dev"
                 }
             },
             "autoload": {
@@ -1839,19 +1835,9 @@
             ],
             "support": {
                 "issues": "https://github.com/twigphp/Twig/issues",
-                "source": "https://github.com/twigphp/Twig/tree/v1.44.8"
+                "source": "https://github.com/twigphp/Twig/tree/1.x"
             },
-            "funding": [
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/twig/twig",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2024-09-09T17:17:16+00:00"
+            "time": "2020-02-11T05:59:23+00:00"
         },
         {
             "name": "vuejs/vuedatepicker_css",
@@ -1893,38 +1879,30 @@
     "packages-dev": [
         {
             "name": "composer/pcre",
-            "version": "3.3.1",
+            "version": "1.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/pcre.git",
-                "reference": "63aaeac21d7e775ff9bc9d45021e1745c97521c4"
+                "reference": "67a32d7d6f9f560b726ab25a061b38ff3a80c560"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/pcre/zipball/63aaeac21d7e775ff9bc9d45021e1745c97521c4",
-                "reference": "63aaeac21d7e775ff9bc9d45021e1745c97521c4",
+                "url": "https://api.github.com/repos/composer/pcre/zipball/67a32d7d6f9f560b726ab25a061b38ff3a80c560",
+                "reference": "67a32d7d6f9f560b726ab25a061b38ff3a80c560",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.4 || ^8.0"
-            },
-            "conflict": {
-                "phpstan/phpstan": "<1.11.10"
+                "php": "^5.3.2 || ^7.0 || ^8.0"
             },
             "require-dev": {
-                "phpstan/phpstan": "^1.11.10",
+                "phpstan/phpstan": "^1.3",
                 "phpstan/phpstan-strict-rules": "^1.1",
-                "phpunit/phpunit": "^8 || ^9"
+                "symfony/phpunit-bridge": "^4.2 || ^5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "3.x-dev"
-                },
-                "phpstan": {
-                    "includes": [
-                        "extension.neon"
-                    ]
+                    "dev-main": "1.x-dev"
                 }
             },
             "autoload": {
@@ -1952,7 +1930,7 @@
             ],
             "support": {
                 "issues": "https://github.com/composer/pcre/issues",
-                "source": "https://github.com/composer/pcre/tree/3.3.1"
+                "source": "https://github.com/composer/pcre/tree/1.0.1"
             },
             "funding": [
                 {
@@ -1968,31 +1946,31 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-08-27T18:44:43+00:00"
+            "time": "2022-01-21T20:24:37+00:00"
         },
         {
             "name": "composer/xdebug-handler",
-            "version": "3.0.5",
+            "version": "2.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/xdebug-handler.git",
-                "reference": "6c1925561632e83d60a44492e0b344cf48ab85ef"
+                "reference": "9e36aeed4616366d2b690bdce11f71e9178c579a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/6c1925561632e83d60a44492e0b344cf48ab85ef",
-                "reference": "6c1925561632e83d60a44492e0b344cf48ab85ef",
+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/9e36aeed4616366d2b690bdce11f71e9178c579a",
+                "reference": "9e36aeed4616366d2b690bdce11f71e9178c579a",
                 "shasum": ""
             },
             "require": {
-                "composer/pcre": "^1 || ^2 || ^3",
-                "php": "^7.2.5 || ^8.0",
+                "composer/pcre": "^1",
+                "php": "^5.3.2 || ^7.0 || ^8.0",
                 "psr/log": "^1 || ^2 || ^3"
             },
             "require-dev": {
                 "phpstan/phpstan": "^1.0",
                 "phpstan/phpstan-strict-rules": "^1.1",
-                "phpunit/phpunit": "^8.5 || ^9.6 || ^10.5"
+                "symfony/phpunit-bridge": "^4.2 || ^5.0 || ^6.0"
             },
             "type": "library",
             "autoload": {
@@ -2016,9 +1994,9 @@
                 "performance"
             ],
             "support": {
-                "irc": "ircs://irc.libera.chat:6697/composer",
+                "irc": "irc://irc.freenode.org/composer",
                 "issues": "https://github.com/composer/xdebug-handler/issues",
-                "source": "https://github.com/composer/xdebug-handler/tree/3.0.5"
+                "source": "https://github.com/composer/xdebug-handler/tree/2.0.5"
             },
             "funding": [
                 {
@@ -2034,67 +2012,146 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-06T16:37:16+00:00"
+            "time": "2022-02-24T20:20:32+00:00"
         },
         {
-            "name": "irstea/phpcpd-shim",
-            "version": "6.0.3",
+            "name": "doctrine/instantiator",
+            "version": "1.0.5",
             "source": {
                 "type": "git",
-                "url": "https://gitlab.irstea.fr/pole-is/tools/phpcpd-shim.git",
-                "reference": "5829d11d1379fd92176b7e2105060c7f09f4fdda"
-            },
-            "require": {
-                "ext-dom": "*",
-                "php": ">=7.3"
-            },
-            "replace": {
-                "sebastian/phpcpd": "self.version"
-            },
-            "bin": [
-                "phpcpd"
-            ],
-            "type": "library",
-            "autoload": {
-                "exclude-from-classmap": [
-                    "phpcpd"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Shim repository for sebastian/phpcpd",
-            "homepage": "https://github.com/sebastianbergmann/phpcpd",
-            "keywords": [
-                "shim"
-            ],
-            "time": "2020-12-08T03:20:09+00:00"
-        },
-        {
-            "name": "nikic/php-parser",
-            "version": "v4.19.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "0ed4c8949a32986043e977dbe14776c14d644c45"
+                "url": "https://github.com/doctrine/instantiator.git",
+                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/0ed4c8949a32986043e977dbe14776c14d644c45",
-                "reference": "0ed4c8949a32986043e977dbe14776c14d644c45",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
+                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3,<8.0-DEV"
+            },
+            "require-dev": {
+                "athletic/athletic": "~0.1.8",
+                "ext-pdo": "*",
+                "ext-phar": "*",
+                "phpunit/phpunit": "~4.0",
+                "squizlabs/php_codesniffer": "~2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Marco Pivetta",
+                    "email": "ocramius@gmail.com",
+                    "homepage": "http://ocramius.github.com/"
+                }
+            ],
+            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
+            "homepage": "https://github.com/doctrine/instantiator",
+            "keywords": [
+                "constructor",
+                "instantiate"
+            ],
+            "support": {
+                "issues": "https://github.com/doctrine/instantiator/issues",
+                "source": "https://github.com/doctrine/instantiator/tree/1.0.5"
+            },
+            "funding": [
+                {
+                    "url": "https://www.doctrine-project.org/sponsorship.html",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://www.patreon.com/phpdoctrine",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2015-06-14T21:17:01+00:00"
+        },
+        {
+            "name": "myclabs/deep-copy",
+            "version": "1.7.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/myclabs/DeepCopy.git",
+                "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e",
+                "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6 || ^7.0"
+            },
+            "require-dev": {
+                "doctrine/collections": "^1.0",
+                "doctrine/common": "^2.6",
+                "phpunit/phpunit": "^4.1"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/DeepCopy/deep_copy.php"
+                ],
+                "psr-4": {
+                    "DeepCopy\\": "src/DeepCopy/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Create deep copies (clones) of your objects",
+            "keywords": [
+                "clone",
+                "copy",
+                "duplicate",
+                "object",
+                "object graph"
+            ],
+            "support": {
+                "issues": "https://github.com/myclabs/DeepCopy/issues",
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.x"
+            },
+            "time": "2017-10-19T19:58:43+00:00"
+        },
+        {
+            "name": "nikic/php-parser",
+            "version": "v4.18.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nikic/PHP-Parser.git",
+                "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bcbb2179f97633e98bbbc87044ee2611c7d7999",
+                "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999",
                 "shasum": ""
             },
             "require": {
                 "ext-tokenizer": "*",
-                "php": ">=7.1"
+                "php": ">=7.0"
             },
             "require-dev": {
                 "ircmaxell/php-yacc": "^0.0.7",
@@ -2130,9 +2187,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.19.2"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.18.0"
             },
-            "time": "2024-09-17T19:36:00+00:00"
+            "time": "2023-12-10T21:03:43+00:00"
         },
         {
             "name": "pdepend/pdepend",
@@ -2197,6 +2254,279 @@
             ],
             "time": "2023-12-17T18:09:59+00:00"
         },
+        {
+            "name": "phar-io/manifest",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phar-io/manifest.git",
+                "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phar-io/manifest/zipball/2df402786ab5368a0169091f61a7c1e0eb6852d0",
+                "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-phar": "*",
+                "phar-io/version": "^1.0.1",
+                "php": "^5.6 || ^7.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Arne Blankerts",
+                    "email": "arne@blankerts.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Heuer",
+                    "email": "sebastian@phpeople.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
+            "support": {
+                "issues": "https://github.com/phar-io/manifest/issues",
+                "source": "https://github.com/phar-io/manifest/tree/master"
+            },
+            "time": "2017-03-05T18:14:27+00:00"
+        },
+        {
+            "name": "phar-io/version",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phar-io/version.git",
+                "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phar-io/version/zipball/a70c0ced4be299a63d32fa96d9281d03e94041df",
+                "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6 || ^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Arne Blankerts",
+                    "email": "arne@blankerts.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Heuer",
+                    "email": "sebastian@phpeople.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Library for handling version information and constraints",
+            "support": {
+                "issues": "https://github.com/phar-io/version/issues",
+                "source": "https://github.com/phar-io/version/tree/master"
+            },
+            "time": "2017-03-05T17:38:23+00:00"
+        },
+        {
+            "name": "phpdocumentor/reflection-common",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
+                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
+                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.6"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jaap van Otterdijk",
+                    "email": "opensource@ijaap.nl"
+                }
+            ],
+            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
+            "homepage": "http://www.phpdoc.org",
+            "keywords": [
+                "FQSEN",
+                "phpDocumentor",
+                "phpdoc",
+                "reflection",
+                "static analysis"
+            ],
+            "support": {
+                "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues",
+                "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/master"
+            },
+            "time": "2017-09-11T18:02:19+00:00"
+        },
+        {
+            "name": "phpdocumentor/reflection-docblock",
+            "version": "4.3.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
+                "reference": "da3fd972d6bafd628114f7e7e036f45944b62e9c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/da3fd972d6bafd628114f7e7e036f45944b62e9c",
+                "reference": "da3fd972d6bafd628114f7e7e036f45944b62e9c",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0",
+                "phpdocumentor/reflection-common": "^1.0.0 || ^2.0.0",
+                "phpdocumentor/type-resolver": "~0.4 || ^1.0.0",
+                "webmozart/assert": "^1.0"
+            },
+            "require-dev": {
+                "doctrine/instantiator": "^1.0.5",
+                "mockery/mockery": "^1.0",
+                "phpdocumentor/type-resolver": "0.4.*",
+                "phpunit/phpunit": "^6.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "me@mikevanriel.com"
+                }
+            ],
+            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
+            "support": {
+                "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues",
+                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/release/4.x"
+            },
+            "time": "2019-12-28T18:55:12+00:00"
+        },
+        {
+            "name": "phpdocumentor/type-resolver",
+            "version": "0.5.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/TypeResolver.git",
+                "reference": "cf842904952e64e703800d094cdf34e715a8a3ae"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/cf842904952e64e703800d094cdf34e715a8a3ae",
+                "reference": "cf842904952e64e703800d094cdf34e715a8a3ae",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0",
+                "phpdocumentor/reflection-common": "^1.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "^1.0",
+                "phpunit/phpunit": "^6.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "me@mikevanriel.com"
+                }
+            ],
+            "support": {
+                "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
+                "source": "https://github.com/phpDocumentor/TypeResolver/tree/master"
+            },
+            "time": "2017-12-30T13:23:38+00:00"
+        },
         {
             "name": "phpmd/phpmd",
             "version": "2.15.0",
@@ -2349,26 +2679,516 @@
             "time": "2023-03-08T15:03:36+00:00"
         },
         {
-            "name": "psr/container",
-            "version": "2.0.2",
+            "name": "phpspec/prophecy",
+            "version": "v1.10.3",
             "source": {
                 "type": "git",
-                "url": "https://github.com/php-fig/container.git",
-                "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963"
+                "url": "https://github.com/phpspec/prophecy.git",
+                "reference": "451c3cd1418cf640de218914901e51b064abb093"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963",
-                "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/451c3cd1418cf640de218914901e51b064abb093",
+                "reference": "451c3cd1418cf640de218914901e51b064abb093",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.4.0"
+                "doctrine/instantiator": "^1.0.2",
+                "php": "^5.3|^7.0",
+                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0|^5.0",
+                "sebastian/comparator": "^1.2.3|^2.0|^3.0|^4.0",
+                "sebastian/recursion-context": "^1.0|^2.0|^3.0|^4.0"
+            },
+            "require-dev": {
+                "phpspec/phpspec": "^2.5 || ^3.2",
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0.x-dev"
+                    "dev-master": "1.10.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Prophecy\\": "src/Prophecy"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Konstantin Kudryashov",
+                    "email": "ever.zet@gmail.com",
+                    "homepage": "http://everzet.com"
+                },
+                {
+                    "name": "Marcello Duarte",
+                    "email": "marcello.duarte@gmail.com"
+                }
+            ],
+            "description": "Highly opinionated mocking framework for PHP 5.3+",
+            "homepage": "https://github.com/phpspec/prophecy",
+            "keywords": [
+                "Double",
+                "Dummy",
+                "fake",
+                "mock",
+                "spy",
+                "stub"
+            ],
+            "support": {
+                "issues": "https://github.com/phpspec/prophecy/issues",
+                "source": "https://github.com/phpspec/prophecy/tree/v1.10.3"
+            },
+            "time": "2020-03-05T15:02:03+00:00"
+        },
+        {
+            "name": "phpunit/php-code-coverage",
+            "version": "5.3.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
+                "reference": "c89677919c5dd6d3b3852f230a663118762218ac"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c89677919c5dd6d3b3852f230a663118762218ac",
+                "reference": "c89677919c5dd6d3b3852f230a663118762218ac",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-xmlwriter": "*",
+                "php": "^7.0",
+                "phpunit/php-file-iterator": "^1.4.2",
+                "phpunit/php-text-template": "^1.2.1",
+                "phpunit/php-token-stream": "^2.0.1",
+                "sebastian/code-unit-reverse-lookup": "^1.0.1",
+                "sebastian/environment": "^3.0",
+                "sebastian/version": "^2.0.1",
+                "theseer/tokenizer": "^1.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.0"
+            },
+            "suggest": {
+                "ext-xdebug": "^2.5.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.3.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
+            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
+            "keywords": [
+                "coverage",
+                "testing",
+                "xunit"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/5.3"
+            },
+            "time": "2018-04-06T15:36:58+00:00"
+        },
+        {
+            "name": "phpunit/php-file-iterator",
+            "version": "1.4.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
+                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4",
+                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
+            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
+            "keywords": [
+                "filesystem",
+                "iterator"
+            ],
+            "support": {
+                "irc": "irc://irc.freenode.net/phpunit",
+                "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
+                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/1.4.5"
+            },
+            "time": "2017-11-27T13:52:08+00:00"
+        },
+        {
+            "name": "phpunit/php-text-template",
+            "version": "1.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Simple template engine.",
+            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+            "keywords": [
+                "template"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
+                "source": "https://github.com/sebastianbergmann/php-text-template/tree/1.2.1"
+            },
+            "time": "2015-06-21T13:50:34+00:00"
+        },
+        {
+            "name": "phpunit/php-timer",
+            "version": "1.0.9",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-timer.git",
+                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
+                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.3 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Utility class for timing",
+            "homepage": "https://github.com/sebastianbergmann/php-timer/",
+            "keywords": [
+                "timer"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-timer/issues",
+                "source": "https://github.com/sebastianbergmann/php-timer/tree/master"
+            },
+            "time": "2017-02-26T11:10:40+00:00"
+        },
+        {
+            "name": "phpunit/php-token-stream",
+            "version": "2.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
+                "reference": "791198a2c6254db10131eecfe8c06670700904db"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/791198a2c6254db10131eecfe8c06670700904db",
+                "reference": "791198a2c6254db10131eecfe8c06670700904db",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": "^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.2.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Wrapper around PHP's tokenizer extension.",
+            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
+            "keywords": [
+                "tokenizer"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-token-stream/issues",
+                "source": "https://github.com/sebastianbergmann/php-token-stream/tree/master"
+            },
+            "abandoned": true,
+            "time": "2017-11-27T05:48:46+00:00"
+        },
+        {
+            "name": "phpunit/phpunit",
+            "version": "6.5.14",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit.git",
+                "reference": "bac23fe7ff13dbdb461481f706f0e9fe746334b7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/bac23fe7ff13dbdb461481f706f0e9fe746334b7",
+                "reference": "bac23fe7ff13dbdb461481f706f0e9fe746334b7",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-json": "*",
+                "ext-libxml": "*",
+                "ext-mbstring": "*",
+                "ext-xml": "*",
+                "myclabs/deep-copy": "^1.6.1",
+                "phar-io/manifest": "^1.0.1",
+                "phar-io/version": "^1.0",
+                "php": "^7.0",
+                "phpspec/prophecy": "^1.7",
+                "phpunit/php-code-coverage": "^5.3",
+                "phpunit/php-file-iterator": "^1.4.3",
+                "phpunit/php-text-template": "^1.2.1",
+                "phpunit/php-timer": "^1.0.9",
+                "phpunit/phpunit-mock-objects": "^5.0.9",
+                "sebastian/comparator": "^2.1",
+                "sebastian/diff": "^2.0",
+                "sebastian/environment": "^3.1",
+                "sebastian/exporter": "^3.1",
+                "sebastian/global-state": "^2.0",
+                "sebastian/object-enumerator": "^3.0.3",
+                "sebastian/resource-operations": "^1.0",
+                "sebastian/version": "^2.0.1"
+            },
+            "conflict": {
+                "phpdocumentor/reflection-docblock": "3.0.2",
+                "phpunit/dbunit": "<3.0"
+            },
+            "require-dev": {
+                "ext-pdo": "*"
+            },
+            "suggest": {
+                "ext-xdebug": "*",
+                "phpunit/php-invoker": "^1.1"
+            },
+            "bin": [
+                "phpunit"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "6.5.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "The PHP Unit Testing framework.",
+            "homepage": "https://phpunit.de/",
+            "keywords": [
+                "phpunit",
+                "testing",
+                "xunit"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/6.5.14"
+            },
+            "time": "2019-02-01T05:22:47+00:00"
+        },
+        {
+            "name": "phpunit/phpunit-mock-objects",
+            "version": "5.0.10",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
+                "reference": "cd1cf05c553ecfec36b170070573e540b67d3f1f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/cd1cf05c553ecfec36b170070573e540b67d3f1f",
+                "reference": "cd1cf05c553ecfec36b170070573e540b67d3f1f",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.0.5",
+                "php": "^7.0",
+                "phpunit/php-text-template": "^1.2.1",
+                "sebastian/exporter": "^3.1"
+            },
+            "conflict": {
+                "phpunit/phpunit": "<6.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.5.11"
+            },
+            "suggest": {
+                "ext-soap": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Mock Object library for PHPUnit",
+            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
+            "keywords": [
+                "mock",
+                "xunit"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/phpunit-mock-objects/issues",
+                "source": "https://github.com/sebastianbergmann/phpunit-mock-objects/tree/5.0.10"
+            },
+            "abandoned": true,
+            "time": "2018-08-09T05:50:03+00:00"
+        },
+        {
+            "name": "psr/container",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/container.git",
+                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
+                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
                 }
             },
             "autoload": {
@@ -2383,7 +3203,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "https://www.php-fig.org/"
+                    "homepage": "http://www.php-fig.org/"
                 }
             ],
             "description": "Common Container Interface (PHP FIG PSR-11)",
@@ -2397,36 +3217,36 @@
             ],
             "support": {
                 "issues": "https://github.com/php-fig/container/issues",
-                "source": "https://github.com/php-fig/container/tree/2.0.2"
+                "source": "https://github.com/php-fig/container/tree/master"
             },
-            "time": "2021-11-05T16:47:00+00:00"
+            "time": "2017-02-14T16:28:37+00:00"
         },
         {
             "name": "psr/log",
-            "version": "3.0.2",
+            "version": "1.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/log.git",
-                "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3"
+                "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/f16e1d5863e37f8d8c2a01719f5b34baa2b714d3",
-                "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
+                "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0.0"
+                "php": ">=5.3.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.x-dev"
+                    "dev-master": "1.1.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Psr\\Log\\": "src"
+                    "Psr\\Log\\": "Psr/Log/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -2447,9 +3267,741 @@
                 "psr-3"
             ],
             "support": {
-                "source": "https://github.com/php-fig/log/tree/3.0.2"
+                "source": "https://github.com/php-fig/log/tree/1.1.4"
             },
-            "time": "2024-09-11T13:17:53+00:00"
+            "time": "2021-05-03T11:20:27+00:00"
+        },
+        {
+            "name": "sebastian/code-unit-reverse-lookup",
+            "version": "1.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
+                "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/1de8cd5c010cb153fcd68b8d0f64606f523f7619",
+                "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^8.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Looks up which function or method a line of code belongs to",
+            "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues",
+                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/1.0.2"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-11-30T08:15:22+00:00"
+        },
+        {
+            "name": "sebastian/comparator",
+            "version": "2.1.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/comparator.git",
+                "reference": "34369daee48eafb2651bea869b4b15d75ccc35f9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/34369daee48eafb2651bea869b4b15d75ccc35f9",
+                "reference": "34369daee48eafb2651bea869b4b15d75ccc35f9",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0",
+                "sebastian/diff": "^2.0 || ^3.0",
+                "sebastian/exporter": "^3.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.1.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides the functionality to compare PHP values for equality",
+            "homepage": "https://github.com/sebastianbergmann/comparator",
+            "keywords": [
+                "comparator",
+                "compare",
+                "equality"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/comparator/issues",
+                "source": "https://github.com/sebastianbergmann/comparator/tree/master"
+            },
+            "time": "2018-02-01T13:46:46+00:00"
+        },
+        {
+            "name": "sebastian/diff",
+            "version": "2.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/diff.git",
+                "reference": "347c1d8b49c5c3ee30c7040ea6fc446790e6bddd"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/347c1d8b49c5c3ee30c7040ea6fc446790e6bddd",
+                "reference": "347c1d8b49c5c3ee30c7040ea6fc446790e6bddd",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kore Nordmann",
+                    "email": "mail@kore-nordmann.de"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Diff implementation",
+            "homepage": "https://github.com/sebastianbergmann/diff",
+            "keywords": [
+                "diff"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/diff/issues",
+                "source": "https://github.com/sebastianbergmann/diff/tree/master"
+            },
+            "time": "2017-08-03T08:09:46+00:00"
+        },
+        {
+            "name": "sebastian/environment",
+            "version": "3.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/environment.git",
+                "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/cd0871b3975fb7fc44d11314fd1ee20925fce4f5",
+                "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.1.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides functionality to handle HHVM/PHP environments",
+            "homepage": "http://www.github.com/sebastianbergmann/environment",
+            "keywords": [
+                "Xdebug",
+                "environment",
+                "hhvm"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/environment/issues",
+                "source": "https://github.com/sebastianbergmann/environment/tree/master"
+            },
+            "time": "2017-07-01T08:51:00+00:00"
+        },
+        {
+            "name": "sebastian/exporter",
+            "version": "3.1.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/exporter.git",
+                "reference": "73a9676f2833b9a7c36968f9d882589cd75511e6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/73a9676f2833b9a7c36968f9d882589cd75511e6",
+                "reference": "73a9676f2833b9a7c36968f9d882589cd75511e6",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.0",
+                "sebastian/recursion-context": "^3.0"
+            },
+            "require-dev": {
+                "ext-mbstring": "*",
+                "phpunit/phpunit": "^8.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.1.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@gmail.com"
+                }
+            ],
+            "description": "Provides the functionality to export PHP variables for visualization",
+            "homepage": "http://www.github.com/sebastianbergmann/exporter",
+            "keywords": [
+                "export",
+                "exporter"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/exporter/issues",
+                "source": "https://github.com/sebastianbergmann/exporter/tree/3.1.5"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-09-14T06:00:17+00:00"
+        },
+        {
+            "name": "sebastian/finder-facade",
+            "version": "1.2.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/finder-facade.git",
+                "reference": "4a3174709c2dc565fe5fb26fcf827f6a1fc7b09f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/finder-facade/zipball/4a3174709c2dc565fe5fb26fcf827f6a1fc7b09f",
+                "reference": "4a3174709c2dc565fe5fb26fcf827f6a1fc7b09f",
+                "shasum": ""
+            },
+            "require": {
+                "symfony/finder": "~2.3|~3.0|~4.0",
+                "theseer/fdomdocument": "~1.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "FinderFacade is a convenience wrapper for Symfony's Finder component.",
+            "homepage": "https://github.com/sebastianbergmann/finder-facade",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/finder-facade/issues",
+                "source": "https://github.com/sebastianbergmann/finder-facade/tree/master"
+            },
+            "abandoned": true,
+            "time": "2017-11-18T17:31:49+00:00"
+        },
+        {
+            "name": "sebastian/global-state",
+            "version": "2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/global-state.git",
+                "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4",
+                "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.0"
+            },
+            "suggest": {
+                "ext-uopz": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Snapshotting of global state",
+            "homepage": "http://www.github.com/sebastianbergmann/global-state",
+            "keywords": [
+                "global state"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/global-state/issues",
+                "source": "https://github.com/sebastianbergmann/global-state/tree/2.0.0"
+            },
+            "time": "2017-04-27T15:39:26+00:00"
+        },
+        {
+            "name": "sebastian/object-enumerator",
+            "version": "3.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/object-enumerator.git",
+                "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2",
+                "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.0",
+                "sebastian/object-reflector": "^1.1.1",
+                "sebastian/recursion-context": "^3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Traverses array structures and object graphs to enumerate all referenced objects",
+            "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/object-enumerator/issues",
+                "source": "https://github.com/sebastianbergmann/object-enumerator/tree/3.0.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-11-30T07:40:27+00:00"
+        },
+        {
+            "name": "sebastian/object-reflector",
+            "version": "1.1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/object-reflector.git",
+                "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/9b8772b9cbd456ab45d4a598d2dd1a1bced6363d",
+                "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Allows reflection of object attributes, including inherited and non-public ones",
+            "homepage": "https://github.com/sebastianbergmann/object-reflector/",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/object-reflector/issues",
+                "source": "https://github.com/sebastianbergmann/object-reflector/tree/1.1.2"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-11-30T07:37:18+00:00"
+        },
+        {
+            "name": "sebastian/phpcpd",
+            "version": "3.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpcpd.git",
+                "reference": "dfed51c1288790fc957c9433e2f49ab152e8a564"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpcpd/zipball/dfed51c1288790fc957c9433e2f49ab152e8a564",
+                "reference": "dfed51c1288790fc957c9433e2f49ab152e8a564",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6|^7.0",
+                "phpunit/php-timer": "^1.0.6",
+                "sebastian/finder-facade": "^1.1",
+                "sebastian/version": "^1.0|^2.0",
+                "symfony/console": "^2.7|^3.0|^4.0"
+            },
+            "bin": [
+                "phpcpd"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Copy/Paste Detector (CPD) for PHP code.",
+            "homepage": "https://github.com/sebastianbergmann/phpcpd",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/phpcpd/issues",
+                "source": "https://github.com/sebastianbergmann/phpcpd/tree/master"
+            },
+            "abandoned": true,
+            "time": "2017-11-16T08:49:28+00:00"
+        },
+        {
+            "name": "sebastian/recursion-context",
+            "version": "3.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/recursion-context.git",
+                "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/367dcba38d6e1977be014dc4b22f47a484dac7fb",
+                "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides functionality to recursively process PHP variables",
+            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
+                "source": "https://github.com/sebastianbergmann/recursion-context/tree/3.0.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-11-30T07:34:24+00:00"
+        },
+        {
+            "name": "sebastian/resource-operations",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/resource-operations.git",
+                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
+                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides a list of PHP built-in functions that operate on resources",
+            "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/resource-operations/issues",
+                "source": "https://github.com/sebastianbergmann/resource-operations/tree/master"
+            },
+            "time": "2015-07-28T20:34:47+00:00"
+        },
+        {
+            "name": "sebastian/version",
+            "version": "2.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/version.git",
+                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019",
+                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
+            "homepage": "https://github.com/sebastianbergmann/version",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/version/issues",
+                "source": "https://github.com/sebastianbergmann/version/tree/master"
+            },
+            "time": "2016-10-03T07:35:21+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",
@@ -2523,34 +4075,35 @@
         },
         {
             "name": "symfony/config",
-            "version": "v7.1.1",
+            "version": "v3.4.47",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/config.git",
-                "reference": "2210fc99fa42a259eb6c89d1f724ce0c4d62d5d2"
+                "reference": "bc6b3fd3930d4b53a60b42fe2ed6fc466b75f03f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/2210fc99fa42a259eb6c89d1f724ce0c4d62d5d2",
-                "reference": "2210fc99fa42a259eb6c89d1f724ce0c4d62d5d2",
+                "url": "https://api.github.com/repos/symfony/config/zipball/bc6b3fd3930d4b53a60b42fe2ed6fc466b75f03f",
+                "reference": "bc6b3fd3930d4b53a60b42fe2ed6fc466b75f03f",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.2",
-                "symfony/deprecation-contracts": "^2.5|^3",
-                "symfony/filesystem": "^7.1",
+                "php": "^5.5.9|>=7.0.8",
+                "symfony/filesystem": "~2.8|~3.0|~4.0",
                 "symfony/polyfill-ctype": "~1.8"
             },
             "conflict": {
-                "symfony/finder": "<6.4",
-                "symfony/service-contracts": "<2.5"
+                "symfony/dependency-injection": "<3.3",
+                "symfony/finder": "<3.3"
             },
             "require-dev": {
-                "symfony/event-dispatcher": "^6.4|^7.0",
-                "symfony/finder": "^6.4|^7.0",
-                "symfony/messenger": "^6.4|^7.0",
-                "symfony/service-contracts": "^2.5|^3",
-                "symfony/yaml": "^6.4|^7.0"
+                "symfony/dependency-injection": "~3.3|~4.0",
+                "symfony/event-dispatcher": "~3.3|~4.0",
+                "symfony/finder": "~3.3|~4.0",
+                "symfony/yaml": "~3.0|~4.0"
+            },
+            "suggest": {
+                "symfony/yaml": "To use the yaml reference dumper"
             },
             "type": "library",
             "autoload": {
@@ -2575,10 +4128,10 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Helps you find, load, combine, autofill and validate configuration values of any kind",
+            "description": "Symfony Config Component",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/config/tree/v7.1.1"
+                "source": "https://github.com/symfony/config/tree/v3.4.47"
             },
             "funding": [
                 {
@@ -2594,43 +4147,199 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:57:53+00:00"
+            "time": "2020-10-24T10:57:07+00:00"
         },
         {
-            "name": "symfony/dependency-injection",
-            "version": "v7.1.5",
+            "name": "symfony/console",
+            "version": "v3.4.47",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/dependency-injection.git",
-                "reference": "38465f925ec4e0707b090e9147c65869837d639d"
+                "url": "https://github.com/symfony/console.git",
+                "reference": "a10b1da6fc93080c180bba7219b5ff5b7518fe81"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/38465f925ec4e0707b090e9147c65869837d639d",
-                "reference": "38465f925ec4e0707b090e9147c65869837d639d",
+                "url": "https://api.github.com/repos/symfony/console/zipball/a10b1da6fc93080c180bba7219b5ff5b7518fe81",
+                "reference": "a10b1da6fc93080c180bba7219b5ff5b7518fe81",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.2",
-                "psr/container": "^1.1|^2.0",
-                "symfony/deprecation-contracts": "^2.5|^3",
-                "symfony/service-contracts": "^3.5",
-                "symfony/var-exporter": "^6.4|^7.0"
+                "php": "^5.5.9|>=7.0.8",
+                "symfony/debug": "~2.8|~3.0|~4.0",
+                "symfony/polyfill-mbstring": "~1.0"
             },
             "conflict": {
-                "ext-psr": "<1.1|>=2",
-                "symfony/config": "<6.4",
-                "symfony/finder": "<6.4",
-                "symfony/yaml": "<6.4"
+                "symfony/dependency-injection": "<3.4",
+                "symfony/process": "<3.3"
             },
             "provide": {
-                "psr/container-implementation": "1.1|2.0",
-                "symfony/service-implementation": "1.1|2.0|3.0"
+                "psr/log-implementation": "1.0"
             },
             "require-dev": {
-                "symfony/config": "^6.4|^7.0",
-                "symfony/expression-language": "^6.4|^7.0",
-                "symfony/yaml": "^6.4|^7.0"
+                "psr/log": "~1.0",
+                "symfony/config": "~3.3|~4.0",
+                "symfony/dependency-injection": "~3.4|~4.0",
+                "symfony/event-dispatcher": "~2.8|~3.0|~4.0",
+                "symfony/lock": "~3.4|~4.0",
+                "symfony/process": "~3.3|~4.0"
+            },
+            "suggest": {
+                "psr/log": "For using the console logger",
+                "symfony/event-dispatcher": "",
+                "symfony/lock": "",
+                "symfony/process": ""
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Console\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Console Component",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/console/tree/v3.4.47"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-10-24T10:57:07+00:00"
+        },
+        {
+            "name": "symfony/debug",
+            "version": "v3.4.47",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/debug.git",
+                "reference": "ab42889de57fdfcfcc0759ab102e2fd4ea72dcae"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/debug/zipball/ab42889de57fdfcfcc0759ab102e2fd4ea72dcae",
+                "reference": "ab42889de57fdfcfcc0759ab102e2fd4ea72dcae",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.5.9|>=7.0.8",
+                "psr/log": "~1.0"
+            },
+            "conflict": {
+                "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
+            },
+            "require-dev": {
+                "symfony/http-kernel": "~2.8|~3.0|~4.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Debug\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Debug Component",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/debug/tree/v3.4.47"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "abandoned": "symfony/error-handler",
+            "time": "2020-10-24T10:57:07+00:00"
+        },
+        {
+            "name": "symfony/dependency-injection",
+            "version": "v3.4.47",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/dependency-injection.git",
+                "reference": "51d2a2708c6ceadad84393f8581df1dcf9e5e84b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/51d2a2708c6ceadad84393f8581df1dcf9e5e84b",
+                "reference": "51d2a2708c6ceadad84393f8581df1dcf9e5e84b",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.5.9|>=7.0.8",
+                "psr/container": "^1.0"
+            },
+            "conflict": {
+                "symfony/config": "<3.3.7",
+                "symfony/finder": "<3.3",
+                "symfony/proxy-manager-bridge": "<3.4",
+                "symfony/yaml": "<3.4"
+            },
+            "provide": {
+                "psr/container-implementation": "1.0"
+            },
+            "require-dev": {
+                "symfony/config": "~3.3|~4.0",
+                "symfony/expression-language": "~2.8|~3.0|~4.0",
+                "symfony/yaml": "~3.4|~4.0"
+            },
+            "suggest": {
+                "symfony/config": "",
+                "symfony/expression-language": "For using expressions in service container configuration",
+                "symfony/finder": "For using double-star glob patterns or when GLOB_BRACE portability is required",
+                "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them",
+                "symfony/yaml": ""
             },
             "type": "library",
             "autoload": {
@@ -2655,10 +4364,10 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Allows you to standardize and centralize the way objects are constructed in your application",
+            "description": "Symfony DependencyInjection Component",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/dependency-injection/tree/v7.1.5"
+                "source": "https://github.com/symfony/dependency-injection/tree/v3.4.47"
             },
             "funding": [
                 {
@@ -2674,96 +4383,25 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-20T08:28:38+00:00"
-        },
-        {
-            "name": "symfony/deprecation-contracts",
-            "version": "v3.5.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1",
-                "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=8.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "3.5-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "function.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "A generic function and convention to trigger deprecation notices",
-            "homepage": "https://symfony.com",
-            "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2024-04-18T09:32:20+00:00"
+            "time": "2020-10-24T10:57:07+00:00"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v7.1.5",
+            "version": "v3.4.47",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "61fe0566189bf32e8cfee78335d8776f64a66f5a"
+                "reference": "e58d7841cddfed6e846829040dca2cca0ebbbbb3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/61fe0566189bf32e8cfee78335d8776f64a66f5a",
-                "reference": "61fe0566189bf32e8cfee78335d8776f64a66f5a",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/e58d7841cddfed6e846829040dca2cca0ebbbbb3",
+                "reference": "e58d7841cddfed6e846829040dca2cca0ebbbbb3",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.2",
-                "symfony/polyfill-ctype": "~1.8",
-                "symfony/polyfill-mbstring": "~1.8"
-            },
-            "require-dev": {
-                "symfony/process": "^6.4|^7.0"
+                "php": "^5.5.9|>=7.0.8",
+                "symfony/polyfill-ctype": "~1.8"
             },
             "type": "library",
             "autoload": {
@@ -2788,10 +4426,10 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Provides basic utilities for the filesystem",
+            "description": "Symfony Filesystem Component",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v7.1.5"
+                "source": "https://github.com/symfony/filesystem/tree/v3.4.47"
             },
             "funding": [
                 {
@@ -2807,33 +4445,94 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-17T09:16:35+00:00"
+            "time": "2020-10-24T10:57:07+00:00"
         },
         {
-            "name": "symfony/polyfill-mbstring",
-            "version": "v1.31.0",
+            "name": "symfony/finder",
+            "version": "v3.4.47",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341"
+                "url": "https://github.com/symfony/finder.git",
+                "reference": "b6b6ad3db3edb1b4b1c1896b1975fb684994de6e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341",
-                "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/b6b6ad3db3edb1b4b1c1896b1975fb684994de6e",
+                "reference": "b6b6ad3db3edb1b4b1c1896b1975fb684994de6e",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2"
+                "php": "^5.5.9|>=7.0.8"
             },
-            "provide": {
-                "ext-mbstring": "*"
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Finder\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Finder Component",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/finder/tree/v3.4.47"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-11-16T17:02:08+00:00"
+        },
+        {
+            "name": "symfony/polyfill-mbstring",
+            "version": "v1.19.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-mbstring.git",
+                "reference": "b5f7b932ee6fa802fc792eabd77c4c88084517ce"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/b5f7b932ee6fa802fc792eabd77c4c88084517ce",
+                "reference": "b5f7b932ee6fa802fc792eabd77c4c88084517ce",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
             },
             "suggest": {
                 "ext-mbstring": "For best performance"
             },
             "type": "library",
             "extra": {
+                "branch-alias": {
+                    "dev-main": "1.19-dev"
+                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -2871,7 +4570,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.19.0"
             },
             "funding": [
                 {
@@ -2887,121 +4586,130 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-09T11:45:10+00:00"
+            "time": "2020-10-23T09:01:57+00:00"
         },
         {
-            "name": "symfony/service-contracts",
-            "version": "v3.5.0",
+            "name": "theseer/fdomdocument",
+            "version": "1.6.7",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f"
+                "url": "https://github.com/theseer/fDOMDocument.git",
+                "reference": "5cddd4f9076a9a2b85c5135935bba2dcb3ed7574"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/bd1d9e59a81d8fa4acdcea3f617c581f7475a80f",
-                "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f",
+                "url": "https://api.github.com/repos/theseer/fDOMDocument/zipball/5cddd4f9076a9a2b85c5135935bba2dcb3ed7574",
+                "reference": "5cddd4f9076a9a2b85c5135935bba2dcb3ed7574",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
-                "psr/container": "^1.1|^2.0",
-                "symfony/deprecation-contracts": "^2.5|^3"
-            },
-            "conflict": {
-                "ext-psr": "<1.1|>=2"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "3.5-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Contracts\\Service\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Test/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Generic abstractions related to writing services",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "abstractions",
-                "contracts",
-                "decoupling",
-                "interfaces",
-                "interoperability",
-                "standards"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v3.5.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2024-04-18T09:32:20+00:00"
-        },
-        {
-            "name": "symfony/var-exporter",
-            "version": "v7.1.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/var-exporter.git",
-                "reference": "b80a669a2264609f07f1667f891dbfca25eba44c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/b80a669a2264609f07f1667f891dbfca25eba44c",
-                "reference": "b80a669a2264609f07f1667f891dbfca25eba44c",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=8.2"
+                "ext-dom": "*",
+                "lib-libxml": "*",
+                "php": ">=5.3.3"
             },
             "require-dev": {
-                "symfony/property-access": "^6.4|^7.0",
-                "symfony/serializer": "^6.4|^7.0",
-                "symfony/var-dumper": "^6.4|^7.0"
+                "php": ">=7.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Arne Blankerts",
+                    "email": "arne@blankerts.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "The classes contained within this repository extend the standard DOM to use exceptions at all occasions of errors instead of PHP warnings or notices. They also add various custom methods and shortcuts for convenience and to simplify the usage of DOM.",
+            "homepage": "https://github.com/theseer/fDOMDocument",
+            "support": {
+                "issues": "https://github.com/theseer/fDOMDocument/issues",
+                "source": "https://github.com/theseer/fDOMDocument/tree/1.6.7"
+            },
+            "abandoned": true,
+            "time": "2022-01-25T23:10:35+00:00"
+        },
+        {
+            "name": "theseer/tokenizer",
+            "version": "1.1.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/theseer/tokenizer.git",
+                "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/11336f6f84e16a720dae9d8e6ed5019efa85a0f9",
+                "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-tokenizer": "*",
+                "ext-xmlwriter": "*",
+                "php": "^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Arne Blankerts",
+                    "email": "arne@blankerts.de",
+                    "role": "Developer"
+                }
+            ],
+            "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
+            "support": {
+                "issues": "https://github.com/theseer/tokenizer/issues",
+                "source": "https://github.com/theseer/tokenizer/tree/master"
+            },
+            "time": "2019-06-13T22:48:21+00:00"
+        },
+        {
+            "name": "webmozart/assert",
+            "version": "1.9.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/webmozarts/assert.git",
+                "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/webmozarts/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389",
+                "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.3 || ^7.0 || ^8.0",
+                "symfony/polyfill-ctype": "^1.8"
+            },
+            "conflict": {
+                "phpstan/phpstan": "<0.12.20",
+                "vimeo/psalm": "<3.9.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.36 || ^7.5.13"
             },
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Symfony\\Component\\VarExporter\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
+                    "Webmozart\\Assert\\": "src/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -3009,44 +4717,21 @@
             ],
             "authors": [
                 {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@gmail.com"
                 }
             ],
-            "description": "Allows exporting any serializable PHP data structure to plain PHP code",
-            "homepage": "https://symfony.com",
+            "description": "Assertions to validate method input/output with nice error messages.",
             "keywords": [
-                "clone",
-                "construct",
-                "export",
-                "hydrate",
-                "instantiate",
-                "lazy-loading",
-                "proxy",
-                "serialize"
+                "assert",
+                "check",
+                "validate"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-exporter/tree/v7.1.2"
+                "issues": "https://github.com/webmozarts/assert/issues",
+                "source": "https://github.com/webmozarts/assert/tree/1.9.1"
             },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2024-06-28T08:00:31+00:00"
+            "time": "2020-07-08T17:02:28+00:00"
         }
     ],
     "aliases": [],
@@ -3058,5 +4743,5 @@
         "php": ">=5.6.40"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.2.0"
 }
diff --git a/include/auth_demo.class.php b/include/auth_demo.class.php
index 16996e36b..cc21f9014 100644
--- a/include/auth_demo.class.php
+++ b/include/auth_demo.class.php
@@ -52,8 +52,7 @@ class authentication extends auth
 	// derzeit checkldapuser in functions.inc.php bzw per htaccess
 	public function checkpassword($username, $passwort)
 	{
-		var_dump($username);
-		if ($passwort=='1q2w3' 
+		if($passwort=='1q2w3' 
 			&& ($username=='pam'
 			|| $username=='admin'
 			|| $username=='assistenz1'
@@ -67,12 +66,8 @@ class authentication extends auth
 			|| $username=='lektor1'
 			|| $username=='lektor2'
 			|| $username=='lektor3'
-			|| $username=='aufnahme')
-			)
-			{
-				$_SERVER['PHP_AUTH_USER']=$username;
-				return true;
-			}
+			|| $username == 'aufnahme'))
+			return true;
 		else
 			return false;
 	}

From a1fade04894bd89883a3184289962eb12c001906 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 25 Sep 2024 12:25:19 +0200
Subject: [PATCH 1244/1461] fixes the recursive function to find a child
 content_id

---
 public/js/components/Cis/Menu.js       |  5 ++--
 public/js/components/Cis/Menu/Entry.js | 38 ++++++++++++++------------
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js
index b5f265e3b..2bc8804c0 100755
--- a/public/js/components/Cis/Menu.js
+++ b/public/js/components/Cis/Menu.js
@@ -29,12 +29,11 @@ export default {
     created() {
         axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/CisVue/Menu').then(res => {
             this.entries = res.data.retval.childs;
-        });
-		
+		});
     },
     template: /*html*/`
 	<p>CISVUE HEADER</p>
-    <button id="nav-main-btn" class="navbar-toggler" type="button" data-bs-toggle="offcanvas" data-bs-target="#nav-main" aria-controls="nav-main" aria-expanded="false" aria-label="Toggle navigation">
+	<button id="nav-main-btn" class="navbar-toggler" type="button" data-bs-toggle="offcanvas" data-bs-target="#nav-main" aria-controls="nav-main" aria-expanded="false" aria-label="Toggle navigation">
         <span class="navbar-toggler-icon"></span>
     </button>
     <a id="nav-logo" :href="rootUrl">
diff --git a/public/js/components/Cis/Menu/Entry.js b/public/js/components/Cis/Menu/Entry.js
index 76bb2a916..43049995f 100755
--- a/public/js/components/Cis/Menu/Entry.js
+++ b/public/js/components/Cis/Menu/Entry.js
@@ -20,16 +20,16 @@ export default {
 			if(newValue == this.entry.content_id){
 				this.entry.menu_open = true;
 			}else{
-				if(this.entry.childs instanceof Array){
-					for(let child of this.entry.childs){
-						child.menu_open = false;
-						
-					}
-				}
-				if (this.searchRecursiveChild(this.entry,newValue)){
+				if (this.searchRecursiveChild(this.entry, newValue)) {
 					this.entry.menu_open = true;
-				}else{
+				} else {
 					this.entry.menu_open = false;
+					if (this.entry.childs instanceof Array) {
+						for (let child of this.entry.childs) {
+							child.menu_open = false;
+
+						}
+					}
 				}
 			}
 		},
@@ -103,20 +103,22 @@ export default {
     },
     methods: {
 		searchRecursiveChild(entry,child_content_id){
-			if (entry.childs instanceof Array) {
-				for (let child of entry.childs) {
-					if (child.content_id == child_content_id){
-						return true;
-					}
+			if (typeof entry.childs == 'object' && !Array.isArray(entry.childs) && Object.entries(entry.childs).length > 0){
+				entry.childs = Object.values(entry.childs);
+			}
+			for (let child of entry.childs) {
+				if (child.content_id == child_content_id) {
+					return true;
+				}
+				if ((child.childs instanceof Array && child.childs.length > 0) || Object.values(child.childs).length > 0) {
 					if (this.searchRecursiveChild(child, child_content_id)){
 						return true;
 					}
 				}
-			}
+			}	
 			return false;
 		},
 		resendEmit(event){
-			console.log(this.entry.titel);
 			this.entry.menu_open = true;
 			this.$emit('activeEntry',event);
 		},
@@ -144,8 +146,10 @@ export default {
 		}
     },
     template: /*html*/`
-	<!--<p>activeContent: {{JSON.stringify(activeContent,null,2)}}</p>
-	<p>entry menu: {{JSON.stringify(entry.menu_open,null,2)}}</p>-->
+	<!-- DEBUGGIING PRINTS
+	<p>entry content_id: {{JSON.stringify(entry.content_id,null,2)}}</p>
+	<p>entry menu: {{JSON.stringify(entry.menu_open,null,2)}}</p>
+	-->
 	<div v-if="entry.template_kurzbz == 'include'">
         INCLUDE
     </div>

From b0a78658cf9b058dfc1367566e1e310a44b74dd9 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 25 Sep 2024 13:35:41 +0200
Subject: [PATCH 1245/1461] also makes the menu points active which redirect to
 an url hash

---
 public/js/components/Cis/Menu/Entry.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Cis/Menu/Entry.js b/public/js/components/Cis/Menu/Entry.js
index 43049995f..6579dbd06 100755
--- a/public/js/components/Cis/Menu/Entry.js
+++ b/public/js/components/Cis/Menu/Entry.js
@@ -140,8 +140,11 @@ export default {
             this.collapse = new bootstrap.Collapse(this.$refs.children, { toggle: false });
         }
 
-		this.url = window.location.href;
-		if (window.location.href == this.link) {
+		this.url = new URL(window.location.href);
+		if (this.url.hash && this.url.hash.slice(1) == this.entry.titel){
+			this.$emit("activeEntry", this.entry.content_id);
+		}
+		else if (this.url.href == this.link) {
 			this.$emit("activeEntry", this.entry.content_id);
 		}
     },

From b174818ed2df9030b6377842687b63c0f24686e4 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 25 Sep 2024 15:02:35 +0200
Subject: [PATCH 1246/1461] updates the active state of the menu based on the
 changed url

---
 public/js/components/Cis/Menu/Entry.js | 34 +++++++++++++++++++++-----
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/public/js/components/Cis/Menu/Entry.js b/public/js/components/Cis/Menu/Entry.js
index 6579dbd06..d072d7771 100755
--- a/public/js/components/Cis/Menu/Entry.js
+++ b/public/js/components/Cis/Menu/Entry.js
@@ -16,6 +16,7 @@ export default {
     },
 	emits: ["activeEntry"],
 	watch:{
+
 		activeContent: function(newValue){
 			if(newValue == this.entry.content_id){
 				this.entry.menu_open = true;
@@ -41,6 +42,10 @@ export default {
 				console.log(this.entry.titel,"close")
 				this.collapse && this.collapse.hide();
 			}
+		},
+		url: function(newValue){
+			// update the active menu based on the new url
+			this.checkActiveUrl();
 		}
 	},
 		
@@ -102,6 +107,19 @@ export default {
         }
     },
     methods: {
+		checkActiveUrl(){
+			let url_hash_spaceSymbol_regex = new RegExp("%20","gi");
+			let url_hash_sharpSymbol_regex = new RegExp("^#");
+			let url_hash = this.url.hash;
+			url_hash = url_hash.replace(url_hash_spaceSymbol_regex, " ").replace(url_hash_sharpSymbol_regex,"");
+			
+			// if the url hash contains the titel of the menu 
+			// or if the url equals the link of a menu 
+			// then set the menu active 
+			if (url_hash == this.entry.titel || this.url.href == this.link) {
+				this.$emit("activeEntry", this.entry.content_id);
+			}
+		},
 		searchRecursiveChild(entry,child_content_id){
 			if (typeof entry.childs == 'object' && !Array.isArray(entry.childs) && Object.entries(entry.childs).length > 0){
 				entry.childs = Object.values(entry.childs);
@@ -141,13 +159,17 @@ export default {
         }
 
 		this.url = new URL(window.location.href);
-		if (this.url.hash && this.url.hash.slice(1) == this.entry.titel){
-			this.$emit("activeEntry", this.entry.content_id);
-		}
-		else if (this.url.href == this.link) {
-			this.$emit("activeEntry", this.entry.content_id);
-		}
+
+		// needed to check for updates on window.location.href
+		window.addEventListener('hashchange', ()=>{
+			this.url = new URL(window.location.href);
+		});
+		
+		
     },
+	beforeDestroy() {
+		window.removeEventListener('hashchange', this.checkActiveUrl);
+	},
     template: /*html*/`
 	<!-- DEBUGGIING PRINTS
 	<p>entry content_id: {{JSON.stringify(entry.content_id,null,2)}}</p>

From bc6bc930fe16647c9833f51ed11df579de41bfc7 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 26 Sep 2024 12:05:44 +0200
Subject: [PATCH 1247/1461] moves the news titel to the component and adds css
 classes for darker dropdown buttons for the different menu levels

---
 application/views/CisVue/Cms/Content.php | 19 ++++++++++++-------
 public/css/Cis4/Cis.css                  | 18 +++++++++++++++++-
 public/js/components/Cis/Cms/News.js     |  2 ++
 3 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/application/views/CisVue/Cms/Content.php b/application/views/CisVue/Cms/Content.php
index 450d014e6..2a623568d 100755
--- a/application/views/CisVue/Cms/Content.php
+++ b/application/views/CisVue/Cms/Content.php
@@ -16,17 +16,22 @@ if(isset($template_kurzbz)){
 	}
 }
 
-
-$this->load->view('templates/CISVUE-Header', $includesArray);
+if(defined('CIS4')){
+	$this->load->view('templates/CISVUE-Header', $includesArray);
+}else{
+	$this->load->view('templates/FHC-Header', $includesArray);
+}
 ?>
 
-
-<h2 ><?php echo isset($content_id)? "Content" : "News" ?></h2>
-<hr/>
 <div id="cms">
 <?php echo (isset($content_id) ? '<cms-content :content_id="'.$content_id.'" :version="'.$version.'" :sprache="'.$sprache.'" :sichtbar="'.$sichtbar.'" />' : '<cms-news/>'); ?>
-	
 </div>
 
-<?php $this->load->view('templates/CISVUE-Footer', $includesArray); ?>
+<?php
+if (defined('CIS4')) {
+	$this->load->view('templates/CISVUE-Footer', $includesArray);
+} else {
+	$this->load->view('templates/FHC-Footer', $includesArray);
+}
+ ?>
 
diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index 0758522e1..87ab72d37 100755
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -68,10 +68,26 @@ html {
   background-color: var(--fhc-cis-menu-lvl-1-bg-hover);
 }
 
-/* makes the dropdown button darker*/
+/* makes the dropdown button darker for level1*/
 #cis-header .btn-level-1+.btn:not(.btn-level-1){
 	background-color:var(--fhc-cis-menu-lvl-1-bg-hover) !important;
 }
+/* makes the dropdown button darker for level2*/
+#cis-header .btn-level-2+.btn:not(.btn-level-2){
+		background-color: var(--fhc-cis-menu-lvl-2-bg-hover) !important;
+}
+/* makes the dropdown button darker for level3*/
+#cis-header .btn-level-3+.btn:not(.btn-level-3){
+		background-color: var(--fhc-cis-menu-lvl-3-bg-hover) !important;
+}
+/* makes the dropdown button darker for level4*/
+#cis-header .btn-level-4+.btn:not(.btn-level-4){
+		background-color: var(--fhc-cis-menu-lvl-4-bg-hover) !important;
+}
+/* makes the dropdown button darker for level5*/
+#cis-header .btn-level-5+.btn:not(.btn-level-5){
+		background-color: var(--fhc-cis-menu-lvl-5-bg-hover) !important;
+}
 
 #cis-header .btn-level-2,
 #cis-header .btn-level-2 + .btn,
diff --git a/public/js/components/Cis/Cms/News.js b/public/js/components/Cis/Cms/News.js
index 819f617b4..85ccfb290 100644
--- a/public/js/components/Cis/Cms/News.js
+++ b/public/js/components/Cis/Cms/News.js
@@ -35,6 +35,8 @@ export default {
     });
   },
   template: /*html*/ `
+  	<h2 >News</h2>
+	<hr/>
     <pagination :page_size="page_size"  @page="loadNewPageContent" :maxPageCount="maxPageCount">
     <div v-html="content"></div>
     </pagination>`,

From 73a2bf59f39911697974ea67ac00effbecb92702 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 27 Sep 2024 10:44:09 +0200
Subject: [PATCH 1248/1461] resolves buggs with the checkActiveUrl method

---
 public/js/components/Cis/Menu.js       |  4 +-
 public/js/components/Cis/Menu/Entry.js | 53 +++++++++++++-------------
 2 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js
index 2bc8804c0..a138fbe98 100755
--- a/public/js/components/Cis/Menu.js
+++ b/public/js/components/Cis/Menu.js
@@ -32,7 +32,9 @@ export default {
 		});
     },
     template: /*html*/`
-	<p>CISVUE HEADER</p>
+	<!--<p>CISVUE HEADER</p>
+	<p>active entry content_id : {{activeEntry}}</p>
+	-->
 	<button id="nav-main-btn" class="navbar-toggler" type="button" data-bs-toggle="offcanvas" data-bs-target="#nav-main" aria-controls="nav-main" aria-expanded="false" aria-label="Toggle navigation">
         <span class="navbar-toggler-icon"></span>
     </button>
diff --git a/public/js/components/Cis/Menu/Entry.js b/public/js/components/Cis/Menu/Entry.js
index d072d7771..86a0311be 100755
--- a/public/js/components/Cis/Menu/Entry.js
+++ b/public/js/components/Cis/Menu/Entry.js
@@ -11,7 +11,6 @@ export default {
     data: () => {
         return {
             collapse: null,
-			url:null,
         }
     },
 	emits: ["activeEntry"],
@@ -19,23 +18,31 @@ export default {
 
 		activeContent: function(newValue){
 			if(newValue == this.entry.content_id){
-				this.entry.menu_open = true;
+				// wenn der Menupunkt nicht bereits offen ist
+				if(!this.entry.menu_open){
+					this.entry.menu_open = true;
+				}
+				
 			}else{
 				if (this.searchRecursiveChild(this.entry, newValue)) {
 					this.entry.menu_open = true;
 				} else {
 					this.entry.menu_open = false;
-					if (this.entry.childs instanceof Array) {
+					/* if (this.entry.childs instanceof Array) {
 						for (let child of this.entry.childs) {
 							child.menu_open = false;
 
 						}
-					}
+					} */
 				}
 			}
 		},
 		'entry.menu_open': function (newValue,oldValue) {
+			if (this.entry.titel == "Mein Studium") {
+				console.log("here",this.entry.titel,newValue,"newValue");
+			}
 			if (newValue) {
+				
 				console.log(this.entry.titel,"open")
 				this.collapse && this.collapse.show();
 			} else {
@@ -43,10 +50,6 @@ export default {
 				this.collapse && this.collapse.hide();
 			}
 		},
-		url: function(newValue){
-			// update the active menu based on the new url
-			this.checkActiveUrl();
-		}
 	},
 		
     computed: {
@@ -107,16 +110,16 @@ export default {
         }
     },
     methods: {
-		checkActiveUrl(){
+		checkActiveUrl(url){
 			let url_hash_spaceSymbol_regex = new RegExp("%20","gi");
 			let url_hash_sharpSymbol_regex = new RegExp("^#");
-			let url_hash = this.url.hash;
+			let url_hash = url.hash;
 			url_hash = url_hash.replace(url_hash_spaceSymbol_regex, " ").replace(url_hash_sharpSymbol_regex,"");
 			
 			// if the url hash contains the titel of the menu 
 			// or if the url equals the link of a menu 
 			// then set the menu active 
-			if (url_hash == this.entry.titel || this.url.href == this.link) {
+			if (url_hash == this.entry.titel || url.href == this.link) {
 				this.$emit("activeEntry", this.entry.content_id);
 			}
 		},
@@ -141,13 +144,19 @@ export default {
 			this.$emit('activeEntry',event);
 		},
         toggleCollapse(evt) {
-            if (this.level > 1 && this.collapse !== null) {
+            if (this.level > 1 && this.collapse !== null) 
+			{
                 this.entry.menu_open = !this.entry.menu_open;
                 this.collapse.toggle(evt.target);
             }else{
-				this.active ? 
-				this.$emit("activeEntry", null): 
-				this.$emit("activeEntry", this.entry.content_id);
+				if (this.active)
+				{
+					this.$emit("activeEntry", null); 
+				}
+				else
+				{
+					this.$emit("activeEntry", this.entry.content_id);
+				}
 			}
         }
     },
@@ -158,18 +167,8 @@ export default {
             this.collapse = new bootstrap.Collapse(this.$refs.children, { toggle: false });
         }
 
-		this.url = new URL(window.location.href);
-
-		// needed to check for updates on window.location.href
-		window.addEventListener('hashchange', ()=>{
-			this.url = new URL(window.location.href);
-		});
-		
-		
+		this.checkActiveUrl(new URL(window.location.href));
     },
-	beforeDestroy() {
-		window.removeEventListener('hashchange', this.checkActiveUrl);
-	},
     template: /*html*/`
 	<!-- DEBUGGIING PRINTS
 	<p>entry content_id: {{JSON.stringify(entry.content_id,null,2)}}</p>
@@ -181,7 +180,7 @@ export default {
     <template v-else>
         <template v-if="hasChilds">
 			<div class="btn-group w-100">
-                <a :href="link" :target="target"
+                <a :href="link" :target="target" @click="toggleCollapse"
                     :class="{
                         'btn btn-default rounded-0 text-start': true,
                         ['btn-level-' + level]: true,

From 23badc340482a40f5414aca35fa3109b6e2abc65 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 27 Sep 2024 12:20:37 +0200
Subject: [PATCH 1249/1461] CIS4 MENU sql update WIP

---
 public/js/components/Cis/Menu/Entry.js | 19 +++---
 system/dbupdate_3.4.php                |  1 +
 system/dbupdate_3.4/25999_C4_Menu.php  | 81 ++++++++++++++++++++++++++
 3 files changed, 91 insertions(+), 10 deletions(-)
 create mode 100755 system/dbupdate_3.4/25999_C4_Menu.php

diff --git a/public/js/components/Cis/Menu/Entry.js b/public/js/components/Cis/Menu/Entry.js
index 86a0311be..3d01a7cfc 100755
--- a/public/js/components/Cis/Menu/Entry.js
+++ b/public/js/components/Cis/Menu/Entry.js
@@ -28,25 +28,24 @@ export default {
 					this.entry.menu_open = true;
 				} else {
 					this.entry.menu_open = false;
-					/* if (this.entry.childs instanceof Array) {
-						for (let child of this.entry.childs) {
-							child.menu_open = false;
-
-						}
-					} */
 				}
 			}
 		},
 		'entry.menu_open': function (newValue,oldValue) {
-			if (this.entry.titel == "Mein Studium") {
+			if (this.entry.titel == "Mein Studium") 
+			{
 				console.log("here",this.entry.titel,newValue,"newValue");
 			}
-			if (newValue) {
-				
+			if (newValue) 
+			{
 				console.log(this.entry.titel,"open")
+				// only invokes .show if this.collapse is not null
 				this.collapse && this.collapse.show();
-			} else {
+			} 
+			else 
+			{
 				console.log(this.entry.titel,"close")
+				// only invokes .hide if this.collapse is not null
 				this.collapse && this.collapse.hide();
 			}
 		},
diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index 621463672..e49fde88a 100755
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -64,6 +64,7 @@ require_once('dbupdate_3.4/28575_softwarebereitstellung.php');
 require_once('dbupdate_3.4/41150_oe-pfad_db_view.php');
 require_once('dbupdate_3.4/44031_stv_favorites.php');
 require_once('dbupdate_3.4/39911_tabulator_in_contentmittitel.php');
+require_once('dbupdate_3.4/25999_C4_Menu.php');
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
diff --git a/system/dbupdate_3.4/25999_C4_Menu.php b/system/dbupdate_3.4/25999_C4_Menu.php
new file mode 100755
index 000000000..c74f2efaf
--- /dev/null
+++ b/system/dbupdate_3.4/25999_C4_Menu.php
@@ -0,0 +1,81 @@
+<?php
+
+if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibung='CIS4_ROOT'")) {
+
+    if ($db->db_num_rows($result) == 0) {
+
+		if (!$db->db_query("BEGIN;")) 
+		{
+			echo '<strong>wasnt able to start transaction: ' . $db->db_last_error() . '</strong><br>';
+		}
+		else
+		{
+
+			$qry =
+				"
+				INSERT INTO campus.tbl_content 
+				(template_kurzbz, oe_kurzbz, insertamum, insertvon, updateamum, updatevon, aktiv, menu_open, beschreibung)
+				VALUES  
+				(
+					'contentmittitel','etw',NOW(),null,null,null,TRUE,FALSE,'CIS4_ROOT'
+				);
+
+				INSERT INTO campus.tbl_contentsprache 
+				(sprache, content_id, version, sichtbar, content, reviewvon, reviewamum, updateamum, updatevon, insertamum, insertvon, titel, gesperrt_uid)
+				VALUES  
+				(
+					'German',
+					-- queries the content_id for the CIS4_ROOT
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'CIS4_ROOT'),
+					1,TRUE,'<content></content>',null,null,null,null,NOW(),null,'Cis40',null
+				);
+
+				INSERT INTO campus.tbl_contentchild
+				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
+				VALUES
+				(
+					-- queries the content_id for the CIS4_ROOT
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'CIS4_ROOT'),
+					10882, NOW(), null, null, null, 100
+				);
+				
+				
+				";
+
+
+
+
+			if (!$db->db_query($qry)) 
+			{
+				echo '<strong>Menu content: ' . $db->db_last_error() . '</strong><br>';
+
+				// Rollback
+				if (!$db->db_query("ROLLBACK;")) 
+				{
+					echo '<strong>wasnt able to rollback: ' . $db->db_last_error() . '</strong><br>';
+				} 
+				else 
+				{
+					echo '<strong>ROLLED BACK</strong><br>';
+				}
+			} 
+			else 
+			{
+				// Commit
+				if (!$db->db_query("COMMIT;")) 
+				{
+					echo '<strong>wasnt able to commit: ' . $db->db_last_error() . '</strong><br>';
+				} 
+				else 
+				{
+					echo '<strong>COMMITED</strong><br>';
+				}
+
+				echo '<br>Menu content created';
+			}
+
+		}
+	}
+}
+
+

From d1070656ac704e55e87d6be21df4380e544c140c Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 27 Sep 2024 13:38:29 +0200
Subject: [PATCH 1250/1461] CIS4 MENU sql update COMPLETE

---
 system/dbupdate_3.4/25999_C4_Menu.php | 523 +++++++++++++++++++++++++-
 1 file changed, 520 insertions(+), 3 deletions(-)

diff --git a/system/dbupdate_3.4/25999_C4_Menu.php b/system/dbupdate_3.4/25999_C4_Menu.php
index c74f2efaf..786011b30 100755
--- a/system/dbupdate_3.4/25999_C4_Menu.php
+++ b/system/dbupdate_3.4/25999_C4_Menu.php
@@ -1,5 +1,7 @@
 <?php
 
+$TLC_content_latest_version = '<content><titel><![CDATA[Das Teaching & Learning Center - Viele Aufgaben, viele Köpfe, viel Expertise]]></titel><inhalt><![CDATA[<table style="width: 80%;" cellspacing="0" cellpadding="0" border="0"><tbody><tr><td class="cmscontent " rowspan="3" valign="top"><table id="t1" style="width: 100%;" border="0" align="left"><tbody><tr><td><h2><strong style="font-size: small;">Erreichbarkeit Student-Support:&nbsp;</strong></h2><p><span style="font-size: small;">F&uuml;r Studierende:&nbsp;</span><br /><span style="font-size: small;">E:&nbsp;<a href="mailto:studentsupport@technikum-wien.at">studentsupport@technikum-wien.at<br /></a></span><span style="font-size: small;">WhatsApp: <a href="https://wa.me/message/5MDJTULYMUU7G1" target="_blank">+43 664 889 60 947</a></span><br /><span style="font-size: small;">R: B2.07<br /><br />F&uuml;r Lehrende:<br /><span>E:&nbsp;</span><a href="mailto:teachingsupport@technikum-wien.at">teachingsupport@technikum-wien.at<br /></a><span>R: A0.05<br /><br />Pre-Student:<br />E:&nbsp;</span><a href="mailto:prestudent@technikum-wien.at" rel="noopener noreferrer" class="op-uc-link">prestudent@technikum-wien.at<br /></a>R: B1.14</span></p></td><td><p><strong><span style="font-size: small;">Erreichbarkeit Moodle-Support:&nbsp; &nbsp;&nbsp;</span></strong></p><p><span style="font-size: small;"><strong>Di - Mi&nbsp; &nbsp; &nbsp; &nbsp;10:00 - 15:00&nbsp; &nbsp;<br />Do&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;12:00 - 16:00<br /></strong><br /></span></p><p style="text-align: left;"><span style="font-size: small; text-align: center;"><br />T:&nbsp;+43 1 333 40 77 - 233<br />E:&nbsp;<a href="mailto:moodle@technikum-wien.at">moodle@technikum-wien.at<br /></a>R: A0.05<br /><br /><br /><a href="https://moodle.technikum-wien.at/course/view.php?id=13353">Moodlekurs Study@FHTW&nbsp;</a><br /><a href="https://moodle.technikum-wien.at/course/view.php?id=16619&amp;section=3">Moodlekurs FHTW-Infobase Lehrende</a></span></p></td><td><p><img src="dms.php?id=247112" width="250" height="295" /></p></td></tr><tr><td><br /><br /></td><td align="left" valign="top"><span style="font-size: small;"><br /></span></td><td align="left" valign="top"><strong><span style="font-size: small;">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;E:&nbsp;</span></strong><a href="mailto:tlc@technikum-wien.at"><strong><span style="font-size: small;">tlc@technikum-wien.at</span></strong><br /></a></td></tr></tbody></table><br /><br /><table class="tablesorter tablesorter_col_0 tablesorter_sort_0" id="t1" style="width: 100%;" border="0" align="left"><thead><tr><th>Leitung</th><th>Arbeitsbereich</th><th>Kontakt</th></tr></thead><tbody><tr><td style="width: 180px;">Lingo, Sylvia</td><td style="width: 320px;">Leitung.</td><td>T. +43 1 3334077 - 4752<br />M. <a href="mailto:sylvia.lingo@technikum-wien.at">sylvia.lingo@technikum-wien.at</a><br />R. B1.13</td></tr></tbody></table><br /><br /><table class="tablesorter tablesorter_col_0 tablesorter_sort_0" id="t1" style="width: 100%;" border="0" align="left"><thead><tr><th><b>Student Support<br /></b><b><a href="mailto:studentsupport@technikum-wien.at" title="mailto:studentsupport@technikum-wien.at">studentsupport@technikum-wien.at</a><a href="mailto:tereza.obrucova@technikum-wien.at">&nbsp;</a></b></th><th>Arbeitsbereich</th><th>Kontakt</th></tr></thead><tbody><tr><td style="width: 180px;"><span>Czedron, Nina</span></td><td style="width: 320px;"><span>Administration, interne Kommunikation, Personal, Bestellwesen.</span></td><td><span>T. +43 1 333 40 77 - 4137</span><br /><span>M.&nbsp;</span><a href="mailto:nina.czedron@technikum-wien.at">nina.czedron@technikum-wien.at</a><br /><span>R. B1.13</span></td></tr><tr><td style="width: 180px;"><span>Lang, Julia Maria</span></td><td style="width: 320px;">Pre-Student-Support (<a href="mailto:prestudent@technikum-wien.at" rel="noopener noreferrer" class="op-uc-link">prestudent@technikum-wien.at</a>):<span><br />Qualifikationskurse, Warm- Up Kurse, FiT- Vorqualifizierungen, Erg&auml;nzungspr&uuml;fungen.</span></td><td>T.&nbsp;+43 1 333 40 77 - 5532<br />M.&nbsp;<span><a href="mailto:julia_maria.lang@technikum-wien.at" title="mailto:julia_maria.lang@technikum-wien.at">julia_maria.lang@technikum-wien.at<br /></a></span>R.&nbsp;B1.14</td></tr><tr><td style="width: 180px;"></td><td style="width: 320px;"><p class="op-uc-p"><span>Schreibwerkstatt</span></p></td><td><span>T.&nbsp;</span><br /><span>M.</span><a href="mailto:nefise.top@technikum-wien.at"><br /></a><span>R.</span></td></tr><tr><td style="width: 180px;"><span><span>M&uuml;hlbacher, Stefan<br /></span></span></td><td style="width: 320px;">Pre-Student-Support (<a href="mailto:prestudent@technikum-wien.at" rel="noopener noreferrer" class="op-uc-link">prestudent@technikum-wien.at</a>):<span><br />Qualifikationskurse, Warm-Up Kurse, FiT-Vorqualifizierungen, Erg&auml;nzungspr&uuml;fungen.</span></td><td><span>T.&nbsp;+43 1 333 40 77 - 3610</span><br /><span>M.&nbsp;</span><a href="mailto:stefan.muehlbacher@technikum-wien.at">stefan.muehlbacher@technikum-wien.at</a><a href="mailto:nefise.top@technikum-wien.at"><br /></a><span>R. B1.14</span></td></tr><tr><td style="width: 180px;"><span><span><span><span><span><span>Obručov&aacute;, Tereza</span></span><br /></span></span></span></span></td><td style="width: 320px;">Lernberatung, Short Tracks,&nbsp;Planung Welcome Days.</td><td><span><span>T.&nbsp;0664-8205594</span><br /><span>M.&nbsp;</span><a href="mailto:tereza.obrucova@technikum-wien.at">tereza.obrucova@technikum-wien.at<br /></a><span>R. B2.07</span></span></td></tr><tr><td style="width: 180px;">Wicker, Larissa</td><td style="width: 320px;">Studierenden-Support,&nbsp;Pre-Student-Support, Betreuung der Jahrgangsvertreter*innen.</td><td>T. 0664-88348182<br />M. <a href="mailto:larissa.wicker@technikum-wien.at">larissa.wicker@technikum-wien.at</a><br />R. B2.07</td></tr></tbody></table><br /><br /><table class="tablesorter tablesorter_col_0 tablesorter_sort_0" id="t1" style="width: 100%;" border="0" align="left"><thead><tr><th><b>Teaching support<br /></b><b><span><a href="mailto:teachingsupport@technikum-wien.at" title="mailto:teachingsupport@technikum-wien.at">teachingsupport@technikum-wien.at</a></span></b><span>&nbsp;</span></th><th>Arbeitsbereich</th><th>Kontakt</th></tr></thead><tbody><tr><td style="width: 180px;"><span>Kert&eacute;sz, D&oacute;ra</span></td><td style="width: 320px;">Medien- und hochschuldidaktische Beratung Ansprechpartnerin:&nbsp;Internes Weiterbildungsangebot f&uuml;r Lehrende&nbsp;(Didaktik).</td><td>T. +43 1 333 40 77 - <span>6715</span><br />M. <a class="Item" href="mailto:dora.kertesz@technikum-wien.at">dora.kertesz@technikum-wien.at</a><a href="mailto:ingrid.preusche@technikum-wien.at"></a><br />R. A0.05</td></tr><tr><td style="width: 180px;">Lanickova, Katerina<br /><em>In Karenz</em></td><td style="width: 320px;">Medien- und hochschuldidaktische Beratung Ansprechpartnerin:&nbsp;Beratungsangebot f&uuml;r Lehrende&nbsp;(Didaktik).</td><td>T. 43 1 333 40 77 - 5406<br />M. <a href="mailto:katerina.lanickova@technikum-wien.at">katerina.lanickova@technikum-wien.at</a><br />R. A0.05</td></tr><tr><td style="width: 180px;">L&uuml;nenborg, Yasmin Ruth<br /><em>In Karenz</em></td><td style="width: 320px;">Medien- und hochschuldidaktische Beratung Ansprechpartnerin:&nbsp;LV-Entwicklung&nbsp;(kollegiale Reflexionsgespr&auml;che).</td><td>T. +43 1 3334077 - 8394<br />M.&nbsp;<a class="Item" href="mailto:yasmin_ruth.luenenborg@technikum-wien.at">yasmin_ruth.luenenborg@technikum-wien.at</a><br />R. A0.05</td></tr><tr><td style="width: 180px;"><span>Schnabel,&nbsp;<span>Lukas</span></span></td><td style="width: 320px;">Medien- und hochschuldidaktische Beratung Ansprechpartnerin:&nbsp;LV-Entwicklung&nbsp;(kollegiale Reflexionsgespr&auml;che).</td><td>T. <span>+43 664 820 54 76</span><br />M.&nbsp;<a href="mailto:lukas.schnabel@technikum-wien.at">lukas.schnabel@technikum-wien.at</a><a class="Item" href="mailto:lukas.schnabel@technikum-wien.at"></a><br />R. A0.05</td></tr><tr><td style="width: 180px;"><span>Grabher, Linus</span></td><td style="width: 320px;"><span>Teaching Support,&nbsp;Pre-Student-Support.</span></td><td>M. <a href="mailto:linus.grabher@technikum-wien.at">linus.grabher@technikum-wien.at<br /></a>R. A0.05</td></tr></tbody></table><br /><br /><table class="tablesorter tablesorter_col_0 tablesorter_sort_0" id="t1" style="width: 100%;" border="0" align="left"><thead><tr><th>eLearning Tools | Moodle<br /><b><a href="mailto:moodle@technikum-wien.at">moodle@technikum-wien.at</a></b></th><th>Arbeitsbereich</th><th>Kontakt</th></tr></thead><tbody><tr><td style="width: 180px;">Perkovic, Patrick</td><td style="width: 320px;">Lehrenden- und Studierenden-Support eLearning Tools | Moodle.</td><td>T.&nbsp;+43 1 333 40 77 - 2209<br />M.&nbsp;<a href="mailto:patrick.perkovic@technikum-wien.at">patrick.perkovic@technikum-wien.at</a><br />R<a class="Item" href="mailto:patrick.perkovic@technikum-wien.at"></a>. A0.05</td></tr><tr><td style="width: 180px;">Kovacevic, Selma</td><td style="width: 320px;">Lehrenden- und Studierenden-Support eLearning Tools | Moodle.</td><td>T. +43 1 333 40 77 - 7236<br />M. <a href="mailto:selma.kovacevic@technikum-wien.at">selma.kovacevic@technikum-wien.at</a><br />R. A0.05</td></tr><tr><td style="width: 180px;"><span>Bogosavljevic,&nbsp;<span>Nikola</span></span></td><td style="width: 320px;"><span>Leitung.<br /><br /></span>Lehrenden- und Studierenden-Support eLearning Tools | Moodle.</td><td>T.&nbsp;+43 1 333 40 77 - 3443<br />M.&nbsp;<a class="Item" href="mailto:nikola.bogosavljevic@technikum-wien.at">nikola.bogosavljevic@technikum-wien.at</a><br />R. A0.05</td></tr></tbody></table><br /><br /><table class="tablesorter tablesorter_col_0 tablesorter_sort_0" id="t1" style="width: 100%;" border="0" align="left"><thead><tr><th><b>Bibliothek<br /></b><b><a href="mailto:bibliothek@technikum-wien.at">bibliothek@technikum-wien.at</a></b>&nbsp;</th><th>Arbeitsbereich</th><th>Kontakt</th></tr></thead><tbody><tr><td style="width: 180px;"><span>Astf&auml;ller, Alexia</span></td><td style="width: 320px;"><p class="op-uc-p"><span>Bestellung Print- und e-Medien, Info-Theke, Medien-Erschlie&szlig;ung, Publikationsdatenbank, Projekte.</span></p></td><td>T: +43 1 333 40 77-5428<br />E:<span>&nbsp;</span><span><a href="mailto:alexia.astfaeller@technikum-wien.at">alexia.astfaeller@technikum-wien.at<br /></a></span>R: A4.09</td></tr><tr><td style="width: 180px;"><span>Baier, Margit</span></td><td style="width: 320px;"><p>Leitung.</p><p>e-Ressourcen-Pakete, Open Access, Projekte, Planung und Koordination.</p></td><td>T: +43 1 333 40 77-3390<br />E:&nbsp;<span><a href="mailto:margit.baier@technikum-wien.at">margit.baier@technikum-wien.at</a><br /></span>R: A4.09</td></tr><tr><td style="width: 180px;"><span>Metz, Sonja<br /><br /></span></td><td style="width: 320px;"><p>Bestellung Print- und e-Medien, Info-Theke, Medien-Erschlie&szlig;ung, Hochschulschriften-Datenbank.</p></td><td>T: <span>+43 1 333 40 77 - 4365</span><br />E:&nbsp;<a class="Item" href="mailto:sonja.metz@technikum-wien.at">sonja.metz@technikum-wien.at</a><a href="mailto:alexia.astfaeller@technikum-wien.at"><br /></a>R: A4.09</td></tr><tr><td style="width: 180px;"><span>Deimbacher-Sand, Maya</span></td><td style="width: 320px;">Bestellung Print- und e-Medien, Info-Theke, Medien-Erschlie&szlig;ung / Field of work: Ordering Print and e-Media, Information Desk, Media Indexing.<p></p></td><td>T: +43 1 333 40 77-4088 <br />E: <a href="mailto:maya.deimbacher-sand@technikum-wien.at">maya.deimbacher-sand@technikum-wien.at</a> <br />R: A4.09</td></tr></tbody></table></td></tr></tbody></table><p></p><h2 style="text-align: left;"><strong>Erreichbarkeit Bibliothek:&nbsp;</strong></h2><p style="text-align: left;"><span style="font-size: small;">E:&nbsp;<a href="mailto:bibliothek@technikum-wien.at">bibliothek@technikum-wien.at</a>&nbsp; &nbsp;<span style="white-space: pre;"> </span></span></p><p style="text-align: left;"><span style="font-size: small;">R: A4.09</span></p><h2 style="text-align: left;">&Ouml;ffnungszeiten:</h2><table rules="rows" cellspacing="0" cellpadding="2" border="0" align="center" style="float: left;"><tbody><tr><td><span style="font-size: small;">Montag:</span></td><td><span style="font-size: small;">13:00 Uhr - 18:00 Uhr</span></td></tr><tr><td><span style="font-size: small;">Dienstag:</span></td><td><span style="font-size: small;">10:00 Uhr - 19:00 Uhr</span></td></tr><tr><td><span style="font-size: small;">Mittwoch:</span></td><td><span style="font-size: small;">10:00 Uhr - 18:00 Uhr</span></td></tr><tr><td><span style="font-size: small;">Donnerstag:</span></td><td><span style="font-size: small;">10:00 Uhr - 18:00 Uhr</span></td></tr><tr><td><span style="font-size: small;">Freitag:</span></td><td><span style="font-size: small;">13:00 Uhr - 18:00 Uhr</span></td></tr></tbody></table><br /><br /><br /><br /><br /><br /><br /><br /><span style="font-size: small;"><br />Mehr Informationen zur Bibliothek unter:&nbsp;<a href="content.php?content_id=6794">https://cis.technikum-wien.at/cms/content.php?content_id=6794</a> und im Moodle-Kurs&nbsp;<a href="https://moodle.technikum-wien.at/course/view.php?id=20218">https://moodle.technikum-wien.at/course/view.php?id=20218</a></span><br /><div><span style="box-sizing: border-box; font-weight: bolder;"><br /></span></div><div><span style="box-sizing: border-box; font-weight: bolder;"><br /></span></div>]]></inhalt></content>';
+
 if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibung='CIS4_ROOT'")) {
 
     if ($db->db_num_rows($result) == 0) {
@@ -13,6 +15,11 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 
 			$qry =
 				"
+
+				-- ##################################### CONTENT
+
+				-- CIS4_ROOT
+
 				INSERT INTO campus.tbl_content 
 				(template_kurzbz, oe_kurzbz, insertamum, insertvon, updateamum, updatevon, aktiv, menu_open, beschreibung)
 				VALUES  
@@ -20,6 +27,73 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					'contentmittitel','etw',NOW(),null,null,null,TRUE,FALSE,'CIS4_ROOT'
 				);
 
+				-- MEIN_STUDIUM
+
+				INSERT INTO campus.tbl_content 
+				(template_kurzbz, oe_kurzbz, insertamum, insertvon, updateamum, updatevon, aktiv, menu_open, beschreibung)
+				VALUES  
+				(
+					'redirect','etw',NOW(),null,null,null,TRUE,FALSE,'MEIN_STUDIUM'
+				);
+
+				-- PROFIL
+
+				INSERT INTO campus.tbl_content 
+				(template_kurzbz, oe_kurzbz, insertamum, insertvon, updateamum, updatevon, aktiv, menu_open, beschreibung)
+				VALUES  
+				(
+					'redirect','etw',NOW(),null,null,null,TRUE,FALSE,'PROFIL'
+				);
+
+				-- NEWS
+
+				INSERT INTO campus.tbl_content 
+				(template_kurzbz, oe_kurzbz, insertamum, insertvon, updateamum, updatevon, aktiv, menu_open, beschreibung)
+				VALUES  
+				(
+					'redirect','etw',NOW(),null,null,null,TRUE,FALSE,'NEWS'
+				);
+
+				-- DOKUMENTE
+
+				INSERT INTO campus.tbl_content 
+				(template_kurzbz, oe_kurzbz, insertamum, insertvon, updateamum, updatevon, aktiv, menu_open, beschreibung)
+				VALUES  
+				(
+					'redirect','etw',NOW(),null,null,null,TRUE,FALSE,'DOKUMENTE'
+				);
+
+				-- STUDIENBETRIEB
+
+				INSERT INTO campus.tbl_content 
+				(template_kurzbz, oe_kurzbz, insertamum, insertvon, updateamum, updatevon, aktiv, menu_open, beschreibung)
+				VALUES  
+				(
+					'redirect','etw',NOW(),null,null,null,TRUE,FALSE,'STUDIENBETRIEB'
+				);
+
+				-- VORLAGEN
+
+				INSERT INTO campus.tbl_content 
+				(template_kurzbz, oe_kurzbz, insertamum, insertvon, updateamum, updatevon, aktiv, menu_open, beschreibung)
+				VALUES  
+				(
+					'redirect','Unternehmenskommunikation',NOW(),null,null,null,TRUE,FALSE,'VORLAGEN'
+				);
+
+				-- TLC
+
+				INSERT INTO campus.tbl_content 
+				(template_kurzbz, oe_kurzbz, insertamum, insertvon, updateamum, updatevon, aktiv, menu_open, beschreibung)
+				VALUES  
+				(
+					'contentmittitel','tlc',NOW(),null,null,null,TRUE,FALSE,'TLC'
+				);
+
+				-- ##################################### CONTENTSPRACHE
+
+				-- CIS4_ROOT
+
 				INSERT INTO campus.tbl_contentsprache 
 				(sprache, content_id, version, sichtbar, content, reviewvon, reviewamum, updateamum, updatevon, insertamum, insertvon, titel, gesperrt_uid)
 				VALUES  
@@ -30,20 +104,463 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					1,TRUE,'<content></content>',null,null,null,null,NOW(),null,'Cis40',null
 				);
 
+				-- MEIN_STUDIUM
+
+				INSERT INTO campus.tbl_contentsprache 
+				(sprache, content_id, version, sichtbar, content, reviewvon, reviewamum, updateamum, updatevon, insertamum, insertvon, titel, gesperrt_uid)
+				VALUES  
+				(
+					'German',
+					-- queries the content_id for the MEIN_STUDIUM
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'MEIN_STUDIUM'),
+					1,TRUE,
+					'<content><url><![CDATA[#Mein Studium]]></url><target><![CDATA[_self]]></target></content>',
+					null,null,null,null,NOW(),null,'Mein Studium',null
+				);
+
+				-- PROFIL
+
+				INSERT INTO campus.tbl_contentsprache 
+				(sprache, content_id, version, sichtbar, content, reviewvon, reviewamum, updateamum, updatevon, insertamum, insertvon, titel, gesperrt_uid)
+				VALUES  
+				(
+					'German',
+					-- queries the content_id for the PROFIL
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'PROFIL'),
+					1,TRUE,
+					'<content><url><![CDATA[../cis.php/Cis/Profil]]></url><target><![CDATA[]]></target></content>',
+					null,null,null,null,NOW(),null,'Profil',null
+				);
+
+				-- NEWS
+
+				INSERT INTO campus.tbl_contentsprache 
+				(sprache, content_id, version, sichtbar, content, reviewvon, reviewamum, updateamum, updatevon, insertamum, insertvon, titel, gesperrt_uid)
+				VALUES  
+				(
+					'German',
+					-- queries the content_id for the NEWS
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'NEWS'),
+					1,TRUE,
+					'<content><url><![CDATA[../cms/news.php]]></url><target><![CDATA[content]]></target></content>',
+					null,null,null,null,NOW(),null,'News',null
+				);
+
+				-- DOKUMENTE
+
+				INSERT INTO campus.tbl_contentsprache 
+				(sprache, content_id, version, sichtbar, content, reviewvon, reviewamum, updateamum, updatevon, insertamum, insertvon, titel, gesperrt_uid)
+				VALUES  
+				(
+					'German',
+					-- queries the content_id for the DOKUMENTE
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'DOKUMENTE'),
+					1,TRUE,
+					'<content><url><![CDATA[#Dokumente]]></url><target><![CDATA[_self]]></target></content>',
+					null,null,null,null,NOW(),null,'Dokumente',null
+				);
+
+				-- STUDIENBETRIEB
+
+				INSERT INTO campus.tbl_contentsprache 
+				(sprache, content_id, version, sichtbar, content, reviewvon, reviewamum, updateamum, updatevon, insertamum, insertvon, titel, gesperrt_uid)
+				VALUES  
+				(
+					'German',
+					-- queries the content_id for the STUDIENBETRIEB
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUDIENBETRIEB'),
+					1,TRUE,
+					'<content><url><![CDATA[#Studienbetrieb]]></url><target><![CDATA[_self]]></target></content>',
+					null,null,null,null,NOW(),null,'Studienbetrieb',null
+				);
+
+				-- VORLAGEN
+
+				INSERT INTO campus.tbl_contentsprache 
+				(sprache, content_id, version, sichtbar, content, reviewvon, reviewamum, updateamum, updatevon, insertamum, insertvon, titel, gesperrt_uid)
+				VALUES  
+				(
+					'German',
+					-- queries the content_id for the VORLAGEN
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'VORLAGEN'),
+					1,TRUE,
+					'<content></content>',
+					null,null,null,null,NOW(),null,'Vorlagen',null
+				);
+
+				-- TLC
+
+				INSERT INTO campus.tbl_contentsprache 
+				(sprache, content_id, version, sichtbar, content, reviewvon, reviewamum, updateamum, updatevon, insertamum, insertvon, titel, gesperrt_uid)
+				VALUES  
+				(
+					'German',
+					-- queries the content_id for the TLC
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'TLC'),
+					1,TRUE,
+					-- queries the content of the latest german TLC version
+					(SELECT content FROM campus.tbl_contentsprache WHERE sprache ='German' AND titel='TLC' AND version = ( SELECT MAX(version) FROM campus.tbl_contentsprache WHERE sprache ='German' AND titel='TLC') ),
+					null,null,null,null,NOW(),null,'TLC',null
+				);
+
+				-- ##################################### CONTENTCHILD
+
+				-- CIS4_ROOT childs
+
 				INSERT INTO campus.tbl_contentchild
 				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
 				VALUES
 				(
 					-- queries the content_id for the CIS4_ROOT
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'CIS4_ROOT'),
+					-- queries the content_id for the MEIN_STUDIUM
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'MEIN_STUDIUM'),
+					NOW(), null, null, null, 100
+				);
+
+				INSERT INTO campus.tbl_contentchild
+				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
+				VALUES
+				(
+					-- queries the content_id for the CIS4_ROOT
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'CIS4_ROOT'),
+					-- 10882 is the content_id for VPN Neu - Zugang für Student*innen
 					10882, NOW(), null, null, null, 100
 				);
-				
-				
+
+				INSERT INTO campus.tbl_contentchild
+				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
+				VALUES
+				(
+					-- queries the content_id for the CIS4_ROOT
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'CIS4_ROOT'),
+					-- queries the content_id for the NEWS
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'NEWS'),
+					NOW(), null, null, null, 100
+				);
+
+				INSERT INTO campus.tbl_contentchild
+				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
+				VALUES
+				(
+					-- queries the content_id for the CIS4_ROOT
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'CIS4_ROOT'),
+					-- queries the content_id for the DOKUMENTE
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'DOKUMENTE'),
+					NOW(), null, null, null, 100
+				);
+
+				INSERT INTO campus.tbl_contentchild
+				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
+				VALUES
+				(
+					-- queries the content_id for the CIS4_ROOT
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'CIS4_ROOT'),
+					-- queries the content_id for the DOKUMENTE
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'TLC'),
+					NOW(), null, null, null, 100
+				);
+
+				INSERT INTO campus.tbl_contentchild
+				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
+				VALUES
+				(
+					-- queries the content_id for the CIS4_ROOT
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'CIS4_ROOT'),
+					-- 10487 is the content_id for Modul International Skills
+					10487, NOW(), null, null, null, 100
+				);
+
+				INSERT INTO campus.tbl_contentchild
+				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
+				VALUES
+				(
+					-- queries the content_id for the CIS4_ROOT
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'CIS4_ROOT'),
+					-- 10568 is the content_id for Zahlungen
+					10568, NOW(), null, null, null, 100
+				);
+
+				-- Mein Studium childs
+
+				INSERT INTO campus.tbl_contentchild
+				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
+				VALUES
+				(
+					-- queries the content_id for the MEIN_STUDIUM
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'MEIN_STUDIUM'),
+					-- queries the content_id for the PROFIL
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'PROFIL'),
+					NOW(), null, null, null, 100
+				);
+
+				-- Profil childs
+
+				INSERT INTO campus.tbl_contentchild
+				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
+				VALUES
+				(
+					-- queries the content_id for the PROFIL
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'PROFIL'),
+					-- 7358 is the content_id for password_aendern
+					7358, NOW(), null, null, null, 100
+				);
+
+				-- News childs
+
+				INSERT INTO campus.tbl_contentchild
+				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
+				VALUES
+				(
+					-- queries the content_id for the NEWS
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'NEWS'),
+					-- 6748 is the content_id for Newsletter FHTW
+					6748, NOW(), null, null, null, 100
+				);
+
+				-- Dokumente childs
+
+				INSERT INTO campus.tbl_contentchild
+				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
+				VALUES
+				(
+					-- queries the content_id for the DOKUMENTE
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'DOKUMENTE'),
+					-- 10246 is the content_id for Allg. FHTW-Glossar
+					10246, NOW(), null, null, null, 100
+				);
+
+				INSERT INTO campus.tbl_contentchild
+				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
+				VALUES
+				(
+					-- queries the content_id for the DOKUMENTE
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'DOKUMENTE'),
+					-- 10339 is the content_id for Hausordnung
+					10339, NOW(), null, null, null, 100
+				);
+
+				INSERT INTO campus.tbl_contentchild
+				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
+				VALUES
+				(
+					-- queries the content_id for the DOKUMENTE
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'DOKUMENTE'),
+					-- 6830 is the content_id for Satzung
+					6830, NOW(), null, null, null, 100
+				);
+
+				INSERT INTO campus.tbl_contentchild
+				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
+				VALUES
+				(
+					-- queries the content_id for the DOKUMENTE
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'DOKUMENTE'),
+					-- queries the content_id for the STUDIENBETRIEB
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUDIENBETRIEB'),
+					NOW(), null, null, null, 100
+				);
+
+				INSERT INTO campus.tbl_contentchild
+				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
+				VALUES
+				(
+					-- queries the content_id for the DOKUMENTE
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'DOKUMENTE'),
+					-- queries the content_id for the VORLAGEN
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'VORLAGEN'),
+					NOW(), null, null, null, 100
+				);
+
+				-- Studienbetrieb childs
+
+				INSERT INTO campus.tbl_contentchild
+				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
+				VALUES
+				(
+					-- queries the content_id for the STUDIENBETRIEB
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUDIENBETRIEB'),
+					-- 7251 is the content_id for Administration
+					7251, NOW(), null, null, null, 100
+				);
+
+				INSERT INTO campus.tbl_contentchild
+				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
+				VALUES
+				(
+					-- queries the content_id for the STUDIENBETRIEB
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUDIENBETRIEB'),
+					-- 7252 is the content_id for Außerordentliche Studierende
+					7252, NOW(), null, null, null, 100
+				);
+
+				INSERT INTO campus.tbl_contentchild
+				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
+				VALUES
+				(
+					-- queries the content_id for the STUDIENBETRIEB
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUDIENBETRIEB'),
+					-- 7253 is the content_id for Berufspraktikum
+					7253, NOW(), null, null, null, 100
+				);
+
+				INSERT INTO campus.tbl_contentchild
+				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
+				VALUES
+				(
+					-- queries the content_id for the STUDIENBETRIEB
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUDIENBETRIEB'),
+					-- 7254 is the content_id for CRM @ FHTW
+					7254, NOW(), null, null, null, 100
+				);
+
+				INSERT INTO campus.tbl_contentchild
+				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
+				VALUES
+				(
+					-- queries the content_id for the STUDIENBETRIEB
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUDIENBETRIEB'),
+					-- 9328 is the content_id for Datenschutz
+					9328, NOW(), null, null, null, 100
+				);
+
+				INSERT INTO campus.tbl_contentchild
+				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
+				VALUES
+				(
+					-- queries the content_id for the STUDIENBETRIEB
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUDIENBETRIEB'),
+					-- 10139 is the content_id for Einteilung Studienjahr
+					10139, NOW(), null, null, null, 100
+				);
+
+				INSERT INTO campus.tbl_contentchild
+				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
+				VALUES
+				(
+					-- queries the content_id for the STUDIENBETRIEB
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUDIENBETRIEB'),
+					-- 7255 is the content_id for Formulare
+					7255, NOW(), null, null, null, 100
+				);
+
+				INSERT INTO campus.tbl_contentchild
+				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
+				VALUES
+				(
+					-- queries the content_id for the STUDIENBETRIEB
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUDIENBETRIEB'),
+					-- 10841 is the content_id for Formulare
+					10841, NOW(), null, null, null, 100
+				);
+
+				INSERT INTO campus.tbl_contentchild
+				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
+				VALUES
+				(
+					-- queries the content_id for the STUDIENBETRIEB
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUDIENBETRIEB'),
+					-- 7256 is the content_id for Internationale BewerberInnen
+					7256, NOW(), null, null, null, 100
+				);
+
+				INSERT INTO campus.tbl_contentchild
+				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
+				VALUES
+				(
+					-- queries the content_id for the STUDIENBETRIEB
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUDIENBETRIEB'),
+					-- 7257 is the content_id for Leistungsstipendium
+					7257, NOW(), null, null, null, 100
+				);
+
+				INSERT INTO campus.tbl_contentchild
+				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
+				VALUES
+				(
+					-- queries the content_id for the STUDIENBETRIEB
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUDIENBETRIEB'),
+					-- 7258 is the content_id for ÖH-Studierendenvertretung
+					7258, NOW(), null, null, null, 100
+				);
+
+				INSERT INTO campus.tbl_contentchild
+				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
+				VALUES
+				(
+					-- queries the content_id for the STUDIENBETRIEB
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUDIENBETRIEB'),
+					-- 8416 is the content_id for ÖH-Studierendenvertretung
+					8416, NOW(), null, null, null, 100
+				);
+
+				INSERT INTO campus.tbl_contentchild
+				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
+				VALUES
+				(
+					-- queries the content_id for the STUDIENBETRIEB
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUDIENBETRIEB'),
+					-- 7259 is the content_id for Prüfungen/Lehre
+					7259, NOW(), null, null, null, 100
+				);
+
+				INSERT INTO campus.tbl_contentchild
+				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
+				VALUES
+				(
+					-- queries the content_id for the STUDIENBETRIEB
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUDIENBETRIEB'),
+					-- 10748 is the content_id for Studienbeitrag & ÖH-Beitrag
+					10748, NOW(), null, null, null, 100
+				);
+
+				INSERT INTO campus.tbl_contentchild
+				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
+				VALUES
+				(
+					-- queries the content_id for the STUDIENBETRIEB
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUDIENBETRIEB'),
+					-- 7260 is the content_id for Studieren, Wohnen & Finanzen
+					7260, NOW(), null, null, null, 100
+				);
+
+				INSERT INTO campus.tbl_contentchild
+				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
+				VALUES
+				(
+					-- queries the content_id for the STUDIENBETRIEB
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUDIENBETRIEB'),
+					-- 7261 is the content_id for Wissenschaftliches Arbeiten 
+					7261, NOW(), null, null, null, 100
+				);
+
+				-- Vorlagen childs
+
+				INSERT INTO campus.tbl_contentchild
+				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
+				VALUES
+				(
+					-- queries the content_id for the VORLAGEN
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'VORLAGEN'),
+					-- 7243 is the content_id for FHTW Corporate Identity & Design
+					7243, NOW(), null, null, null, 100
+				);
+
+				-- TLC childs
+
+				INSERT INTO campus.tbl_contentchild
+				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
+				VALUES
+				(
+					-- queries the content_id for the TLC
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'TLC'),
+					-- 9248 is the content_id for Service für Studierende
+					9248, NOW(), null, null, null, 100
+				);
 				";
 
 
-
+			// Execute query and ROLLBACK on error or COMMIT
 
 			if (!$db->db_query($qry)) 
 			{

From c0596c08c550c24a4996df0e9d8808d42c0e6da3 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 30 Sep 2024 09:43:26 +0200
Subject: [PATCH 1251/1461] changes the header for the Dashboard to the
 CISVUE-Header and passes the selectedTypes props to fix the CISVUE Header
 search

---
 application/views/CisHmvc/Dashboard.php       | 4 ++--
 application/views/CisHtml/Dashboard.php       | 4 ++--
 application/views/templates/CISVUE-Header.php | 3 ++-
 public/js/components/Cis/Menu.js              | 3 ++-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/application/views/CisHmvc/Dashboard.php b/application/views/CisHmvc/Dashboard.php
index 06da8cd7f..6e044c548 100755
--- a/application/views/CisHmvc/Dashboard.php
+++ b/application/views/CisHmvc/Dashboard.php
@@ -8,7 +8,7 @@
 		],
 	);
 
-	$this->load->view('templates/FHC-Header', $includesArray);
+	$this->load->view('templates/CISVUE-Header', $includesArray);
 ?>
 
 <div id="content">
@@ -17,5 +17,5 @@
 	<fhc-dashboard dashboard="CIS"/>
 </div>
 
-<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
+<?php $this->load->view('templates/CISVUE-Footer', $includesArray); ?>
 
diff --git a/application/views/CisHtml/Dashboard.php b/application/views/CisHtml/Dashboard.php
index 1eddba454..ec08a8ffa 100755
--- a/application/views/CisHtml/Dashboard.php
+++ b/application/views/CisHtml/Dashboard.php
@@ -8,7 +8,7 @@ $includesArray = array(
 	],
 );
 
-$this->load->view('templates/CISHTML-Header', $includesArray);
+$this->load->view('templates/CISVUE-Header', $includesArray);
 ?>
 
 <div id="content">
@@ -17,5 +17,5 @@ $this->load->view('templates/CISHTML-Header', $includesArray);
 	<fhc-dashboard dashboard="CIS"/>
 </div>
 
-<?php $this->load->view('templates/CISHTML-Footer', $includesArray); ?>
+<?php $this->load->view('templates/CISVUE-Footer', $includesArray); ?>
 
diff --git a/application/views/templates/CISVUE-Header.php b/application/views/templates/CISVUE-Header.php
index b65e02e13..686656592 100755
--- a/application/views/templates/CISVUE-Header.php
+++ b/application/views/templates/CISVUE-Header.php
@@ -27,7 +27,8 @@ $this->load->view('templates/FHC-Header', $includesArray);
 		root-url="<?= site_url(''); ?>" 
 		logo-url="<?= base_url('/public/images/logo-300x160.png'); ?>" 
 		avatar-url="<?= site_url('Cis/Pub/bild/person/' . getAuthPersonId()); ?>" 
-		logout-url="<?= site_url('Cis/Auth/logout'); ?>" 
+		logout-url="<?= site_url('Cis/Auth/logout'); ?>"
+		:selectedtypes="selectedtypes" 
 		:searchbaroptions="searchbaroptions" 
 		:searchfunction="searchfunction" />
 </header>
diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js
index a138fbe98..53069a83f 100755
--- a/public/js/components/Cis/Menu.js
+++ b/public/js/components/Cis/Menu.js
@@ -11,6 +11,7 @@ export default {
         logoUrl: String,
         avatarUrl: String,
         logoutUrl: String,
+		selectedtypes: Array,
         searchbaroptions: Object,
         searchfunction: Function
     },
@@ -48,7 +49,7 @@ export default {
             </button>
         </div>
         <div class="offcanvas-body p-0">
-            <fhc-searchbar id="nav-search" class="fhc-searchbar w-100" :searchoptions="searchbaroptions" :searchfunction="searchfunction"></fhc-searchbar>
+            <fhc-searchbar id="nav-search" class="fhc-searchbar w-100" :searchoptions="searchbaroptions" :searchfunction="searchfunction" :selectedtypes="selectedtypes"></fhc-searchbar>
             <button id="nav-user-btn" class="btn btn-link rounded-0" type="button" data-bs-toggle="collapse" data-bs-target="#nav-user-menu" aria-expanded="false" aria-controls="nav-user-menu">
                 <img :src="avatarUrl" class="avatar rounded-circle"/>
             </button>

From bbed90c814e28e34bec2abc045b4558fc7338272 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 30 Sep 2024 10:26:23 +0200
Subject: [PATCH 1252/1461] moves the searchbar from the mobile view to the top
 of the header

---
 application/views/templates/CISHTML-Header.php | 1 -
 public/js/components/Cis/Menu.js               | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/application/views/templates/CISHTML-Header.php b/application/views/templates/CISHTML-Header.php
index 79b9b84ec..6ef942df0 100755
--- a/application/views/templates/CISHTML-Header.php
+++ b/application/views/templates/CISHTML-Header.php
@@ -49,7 +49,6 @@ if (!isset($menu)) {
 				</button>
 			</div>
 			<div class="offcanvas-body p-0">
-				<fhc-searchbar id="nav-search" class="fhc-searchbar w-100" :searchoptions="searchbaroptions" :searchfunction="searchfunction"></fhc-searchbar>
 				<button id="nav-user-btn" class="btn btn-link rounded-0" type="button" data-bs-toggle="collapse" data-bs-target="#nav-user-menu" aria-expanded="false" aria-controls="nav-user-menu">
 					<img src="<?= site_url('Cis/Pub/bild/person/' . getAuthPersonId()); ?>" class="avatar rounded-circle"/>
 				</button>
diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js
index 53069a83f..108525780 100755
--- a/public/js/components/Cis/Menu.js
+++ b/public/js/components/Cis/Menu.js
@@ -39,6 +39,7 @@ export default {
 	<button id="nav-main-btn" class="navbar-toggler" type="button" data-bs-toggle="offcanvas" data-bs-target="#nav-main" aria-controls="nav-main" aria-expanded="false" aria-label="Toggle navigation">
         <span class="navbar-toggler-icon"></span>
     </button>
+	<fhc-searchbar id="nav-search" class="fhc-searchbar w-100" :searchoptions="searchbaroptions" :searchfunction="searchfunction" :selectedtypes="selectedtypes"></fhc-searchbar>
     <a id="nav-logo" :href="rootUrl">
         <img :src="logoUrl" alt="Logo">
     </a>
@@ -49,7 +50,6 @@ export default {
             </button>
         </div>
         <div class="offcanvas-body p-0">
-            <fhc-searchbar id="nav-search" class="fhc-searchbar w-100" :searchoptions="searchbaroptions" :searchfunction="searchfunction" :selectedtypes="selectedtypes"></fhc-searchbar>
             <button id="nav-user-btn" class="btn btn-link rounded-0" type="button" data-bs-toggle="collapse" data-bs-target="#nav-user-menu" aria-expanded="false" aria-controls="nav-user-menu">
                 <img :src="avatarUrl" class="avatar rounded-circle"/>
             </button>

From 0e385e8628a8c352392e10a06fe6a83135eb657f Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 30 Sep 2024 10:30:11 +0200
Subject: [PATCH 1253/1461] makes the menu of the CISVUE-Header also sticky now

---
 public/js/components/Cis/Menu.js | 44 +++++++++++++++++---------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js
index 108525780..c0b044ac0 100755
--- a/public/js/components/Cis/Menu.js
+++ b/public/js/components/Cis/Menu.js
@@ -44,26 +44,28 @@ export default {
         <img :src="logoUrl" alt="Logo">
     </a>
     <nav id="nav-main" class="offcanvas offcanvas-start bg-dark" tabindex="-1" aria-labelledby="nav-main-btn" data-bs-backdrop="false">
-        <div id="nav-main-toggle" class="position-static d-none d-lg-block bg-dark">
-            <button type="button" class="btn bg-dark text-light rounded-0 p-1 d-flex align-items-center" data-bs-toggle="collapse" data-bs-target="#nav-main-menu" aria-expanded="true" aria-controls="nav-main-menu">
-                <i class="fa fa-arrow-circle-left"></i>
-            </button>
-        </div>
-        <div class="offcanvas-body p-0">
-            <button id="nav-user-btn" class="btn btn-link rounded-0" type="button" data-bs-toggle="collapse" data-bs-target="#nav-user-menu" aria-expanded="false" aria-controls="nav-user-menu">
-                <img :src="avatarUrl" class="avatar rounded-circle"/>
-            </button>
-            <ul id="nav-user-menu" class="collapse list-unstyled" aria-labelledby="nav-user-btn">
-                <li><a class="btn btn-level-2 rounded-0 d-block" href="#" id="menu-profil">Profil</a></li>
-                <li><a class="btn btn-level-2 rounded-0 d-block" href="#">Ampeln</a></li>
-                <li><hr class="dropdown-divider"></li>
-                <li><a class="btn btn-level-2 rounded-0 d-block" :href="logoutUrl">Logout</a></li>
-            </ul>
-            <div id="nav-main-menu" class="collapse collapse-horizontal show">
-                <div>
-                    <cis-menu-entry @activeEntry="setActiveEntry" :activeContent="activeEntry" v-for="entry in entries" :key="entry.content_id" :entry="entry" />
-                </div>
-            </div>
-        </div>
+		<div id="nav-main-sticky">
+			<div id="nav-main-toggle" class="position-static d-none d-lg-block bg-dark">
+				<button type="button" class="btn bg-dark text-light rounded-0 p-1 d-flex align-items-center" data-bs-toggle="collapse" data-bs-target="#nav-main-menu" aria-expanded="true" aria-controls="nav-main-menu">
+					<i class="fa fa-arrow-circle-left"></i>
+				</button>
+			</div>
+			<div class="offcanvas-body p-0">
+				<button id="nav-user-btn" class="btn btn-link rounded-0" type="button" data-bs-toggle="collapse" data-bs-target="#nav-user-menu" aria-expanded="false" aria-controls="nav-user-menu">
+					<img :src="avatarUrl" class="avatar rounded-circle"/>
+				</button>
+				<ul id="nav-user-menu" class="collapse list-unstyled" aria-labelledby="nav-user-btn">
+					<li><a class="btn btn-level-2 rounded-0 d-block" href="#" id="menu-profil">Profil</a></li>
+					<li><a class="btn btn-level-2 rounded-0 d-block" href="#">Ampeln</a></li>
+					<li><hr class="dropdown-divider"></li>
+					<li><a class="btn btn-level-2 rounded-0 d-block" :href="logoutUrl">Logout</a></li>
+				</ul>
+				<div id="nav-main-menu" class="collapse collapse-horizontal show">
+					<div>
+						<cis-menu-entry @activeEntry="setActiveEntry" :activeContent="activeEntry" v-for="entry in entries" :key="entry.content_id" :entry="entry" />
+					</div>
+				</div>
+			</div>
+		</div>
     </nav>`
 };

From 8c6f9d1bc436555c4acb616d467199e08b6404bd Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 30 Sep 2024 11:14:34 +0200
Subject: [PATCH 1254/1461] loads the menu for the CISVUE-Header in the server
 side instead of the client side

---
 application/views/templates/CISHTML-Header.php |  2 +-
 application/views/templates/CISVUE-Header.php  | 11 ++++++++++-
 public/js/components/Cis/Menu.js               | 11 +++++------
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/application/views/templates/CISHTML-Header.php b/application/views/templates/CISHTML-Header.php
index 6ef942df0..c3790cc95 100755
--- a/application/views/templates/CISHTML-Header.php
+++ b/application/views/templates/CISHTML-Header.php
@@ -18,7 +18,7 @@ $this->load->view('templates/FHC-Header', $includesArray);
 if (!isset($menu)) {
 	$ci =& get_instance(); // get CI instance
 	$ci->load->model('content/Content_model', 'ContentModel');
-	$result = $ci->ContentModel->getMenu(defined('CIS4_MENU_ENTRY') ? CIS4_MENU_ENTRY : null, get_uid());
+	$result = $ci->ContentModel->getMenu(null, get_uid());
 	$menu = getData($result) ?? (object)['childs' => []];
 }
 ?>
diff --git a/application/views/templates/CISVUE-Header.php b/application/views/templates/CISVUE-Header.php
index 686656592..d738dbde9 100755
--- a/application/views/templates/CISVUE-Header.php
+++ b/application/views/templates/CISVUE-Header.php
@@ -15,6 +15,13 @@ $includesArray = array(
 
 $this->load->view('templates/FHC-Header', $includesArray);
 
+
+if (!isset($menu)) {
+	$ci =& get_instance(); // get CI instance
+	$ci->load->model('content/Content_model', 'ContentModel');
+	$result = $ci->ContentModel->getMenu(defined('CIS4_MENU_ENTRY') ? CIS4_MENU_ENTRY : null, get_uid());
+	$menu = getData($result)->childs ?? [];
+}
 ?>
 
 <script type="text/javascript">
@@ -30,7 +37,9 @@ $this->load->view('templates/FHC-Header', $includesArray);
 		logout-url="<?= site_url('Cis/Auth/logout'); ?>"
 		:selectedtypes="selectedtypes" 
 		:searchbaroptions="searchbaroptions" 
-		:searchfunction="searchfunction" />
+		:searchfunction="searchfunction"
+		:menu="<?= htmlspecialchars(json_encode(array_values($menu)), ENT_QUOTES, 'UTF-8') ?>"
+		></cis-menu>
 </header>
 
 <main id="cis-main" class="flex-grow-1 overflow-scroll p-4">
diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js
index c0b044ac0..f44819011 100755
--- a/public/js/components/Cis/Menu.js
+++ b/public/js/components/Cis/Menu.js
@@ -7,7 +7,8 @@ export default {
         FhcSearchbar
     },
     props: {
-        rootUrl: String,
+		menu: Array,
+		rootUrl: String,
         logoUrl: String,
         avatarUrl: String,
         logoutUrl: String,
@@ -27,11 +28,9 @@ export default {
 			this.activeEntry = content_id;
 		}
 	},
-    created() {
-        axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/CisVue/Menu').then(res => {
-            this.entries = res.data.retval.childs;
-		});
-    },
+	mounted(){
+		this.entries = this.menu;
+	},
     template: /*html*/`
 	<!--<p>CISVUE HEADER</p>
 	<p>active entry content_id : {{activeEntry}}</p>

From 24a2b4ba2f117e679378f6a9aa50c3216348a383 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 30 Sep 2024 11:20:20 +0200
Subject: [PATCH 1255/1461] fixes the bug where the Menu is still selected in
 the LvModal after clicking on the back button

---
 public/js/components/Cis/Mylv/LvMenu.js | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/public/js/components/Cis/Mylv/LvMenu.js b/public/js/components/Cis/Mylv/LvMenu.js
index 7f30de4eb..7c292bff2 100644
--- a/public/js/components/Cis/Mylv/LvMenu.js
+++ b/public/js/components/Cis/Mylv/LvMenu.js
@@ -19,14 +19,6 @@ export default {
 			selectedMenu:null,
 		}
 	},
-	watch:{
-		isMenuSelected: function (newValue) {
-			// if no Menu point has been selected, show all Menu options
-			if (!newValue){
-				this.selectedMenu = null;
-			}
-		}
-	},
 	emits:["update:isMenuSelected"],
 	methods:{
 		selectMenu: function (menuItem, index = null) {
@@ -62,6 +54,12 @@ export default {
 				this.selectedMenu = newValue;
 				this.$emit("update:isMenuSelected", true);
 			}
+		},
+		isMenuSelected: function (newValue) {
+			// if no Menu point has been selected, show all Menu options
+			if (!newValue) {
+				this.selectedMenu = null;
+			}
 		}
 	},
 	template:/*html*/`

From 4a5a0198416772320de83cef2ecb2176d6b73846 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 30 Sep 2024 11:33:55 +0200
Subject: [PATCH 1256/1461] loads the menu for the CISVUE-Header in the server
 side and not in the client side

---
 application/models/content/Content_model.php  | 22 +++++++++++++++++++
 application/views/templates/CISVUE-Header.php |  3 ++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/application/models/content/Content_model.php b/application/models/content/Content_model.php
index ed447b36a..93259a57c 100755
--- a/application/models/content/Content_model.php
+++ b/application/models/content/Content_model.php
@@ -66,6 +66,28 @@ class Content_model extends DB_Model
 		return success(current(getData($result)));
 	}
 
+	/**
+	 * Sucht die content_id fuer den CIS4_Root Menu content
+	 *
+	 * @return integer|null			content_id of the Cis4_Root Menu
+	 */
+	public function getCIS4_ContentID(){
+		$CIS4_ROOT_CONTENT = $this->loadWhere(["beschreibung"=>"CIS4_ROOT"]);
+		if(isError($CIS4_ROOT_CONTENT))
+		{
+			return null;
+		}
+		$CIS4_ROOT_CONTENT = getData($CIS4_ROOT_CONTENT);
+		if(count($CIS4_ROOT_CONTENT) > 0)
+		{
+			return current($CIS4_ROOT_CONTENT)->content_id ?? null;
+		}
+		else
+		{
+			return null;
+		}
+	}
+	
 	/**
 	 * Laedt alle Content Eintraege unterhalb eines Contents
 	 * (Ohne Newseintraege)
diff --git a/application/views/templates/CISVUE-Header.php b/application/views/templates/CISVUE-Header.php
index d738dbde9..692d73b86 100755
--- a/application/views/templates/CISVUE-Header.php
+++ b/application/views/templates/CISVUE-Header.php
@@ -19,7 +19,8 @@ $this->load->view('templates/FHC-Header', $includesArray);
 if (!isset($menu)) {
 	$ci =& get_instance(); // get CI instance
 	$ci->load->model('content/Content_model', 'ContentModel');
-	$result = $ci->ContentModel->getMenu(defined('CIS4_MENU_ENTRY') ? CIS4_MENU_ENTRY : null, get_uid());
+	$cis4_content_id = $ci->ContentModel->getCIS4_ContentID();
+	$result = $ci->ContentModel->getMenu($cis4_content_id, get_uid());
 	$menu = getData($result)->childs ?? [];
 }
 ?>

From 964f6c689c9a4765c844eaeaf84982fe5e7e45fe Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 30 Sep 2024 11:44:31 +0200
Subject: [PATCH 1257/1461] removes debugging prints

---
 public/js/components/Cis/Menu/Entry.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/public/js/components/Cis/Menu/Entry.js b/public/js/components/Cis/Menu/Entry.js
index 3d01a7cfc..4e659329b 100755
--- a/public/js/components/Cis/Menu/Entry.js
+++ b/public/js/components/Cis/Menu/Entry.js
@@ -32,22 +32,17 @@ export default {
 			}
 		},
 		'entry.menu_open': function (newValue,oldValue) {
-			if (this.entry.titel == "Mein Studium") 
-			{
-				console.log("here",this.entry.titel,newValue,"newValue");
-			}
 			if (newValue) 
 			{
-				console.log(this.entry.titel,"open")
 				// only invokes .show if this.collapse is not null
 				this.collapse && this.collapse.show();
 			} 
 			else 
 			{
-				console.log(this.entry.titel,"close")
 				// only invokes .hide if this.collapse is not null
 				this.collapse && this.collapse.hide();
 			}
+			// debugging helpers - console.log(this.entry.titel,newValue?"open":"close")
 		},
 	},
 		

From f38b0cf78fb34b41ae0b36dd45ea1c71ff037ba2 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 30 Sep 2024 11:58:20 +0200
Subject: [PATCH 1258/1461] changes all the Headers from the CISHTML-Header to
 the CISVUE-Header

---
 application/controllers/Cis4.php                    | 2 +-
 application/controllers/CisHmvc/Cms.php             | 2 +-
 application/controllers/api/frontend/v1/LvMenu.php  | 2 +-
 application/models/content/Content_model.php        | 4 ++--
 application/views/Cis/Documents.php                 | 4 ++--
 application/views/Cis/MyLv.php                      | 4 ++--
 application/views/Cis/Stundenplan.php               | 4 ++--
 application/views/CisHtml/Dashboard.php             | 4 ++--
 application/views/CisVue/Cms/RoomInformation.php    | 4 ++--
 application/views/CisVue/Dashboard.php              | 1 +
 public/js/components/DashboardWidget/Stundenplan.js | 9 ---------
 11 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/application/controllers/Cis4.php b/application/controllers/Cis4.php
index 68ab1c60d..d05b9e5fc 100755
--- a/application/controllers/Cis4.php
+++ b/application/controllers/Cis4.php
@@ -27,6 +27,6 @@ class Cis4 extends FHC_Controller
 	 */
 	public function index()
 	{
-		$this->load->view('CisHtml/Dashboard.php');
+		$this->load->view('CisVue/Dashboard.php');
 	}
 }
diff --git a/application/controllers/CisHmvc/Cms.php b/application/controllers/CisHmvc/Cms.php
index fad3366d4..06cdb53bc 100755
--- a/application/controllers/CisHmvc/Cms.php
+++ b/application/controllers/CisHmvc/Cms.php
@@ -110,6 +110,6 @@ class Cms extends Auth_Controller
 	 */
 	public function news($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
 	{
-		$this->load->view('CisHtml/Cms/Content', ['infoscreen' => $infoscreen, 'studiengang_kz' => $studiengang_kz, 'semester' => $semester, 'mischen' => $mischen, 'titel' => $titel, 'edit' => $edit, 'sichtbar' => $sichtbar, "template_kurzbz"=>"news"]);
+		$this->load->view('CisHmvc/Cms/Content', ['infoscreen' => $infoscreen, 'studiengang_kz' => $studiengang_kz, 'semester' => $semester, 'mischen' => $mischen, 'titel' => $titel, 'edit' => $edit, 'sichtbar' => $sichtbar, "template_kurzbz"=>"news"]);
 	}
 }
diff --git a/application/controllers/api/frontend/v1/LvMenu.php b/application/controllers/api/frontend/v1/LvMenu.php
index 97cdcc294..182168873 100644
--- a/application/controllers/api/frontend/v1/LvMenu.php
+++ b/application/controllers/api/frontend/v1/LvMenu.php
@@ -571,7 +571,7 @@ private function  fhc_menu_pinboard(&$menu, $angemeldet, $is_lector, $studiengan
 				'position'=>'110',
 				'name'=>$p->t('lehre/pinboard'),
 				'c4_icon'=>base_url('skin/images/button_pinboard.png'),
-				'c4_link'=>base_url('CisHtml/Cms/news'),
+				'c4_link'=>base_url('CisVue/Cms/news'),
 				'text'=>$text
 			);
 
diff --git a/application/models/content/Content_model.php b/application/models/content/Content_model.php
index 93259a57c..9f0a3634e 100755
--- a/application/models/content/Content_model.php
+++ b/application/models/content/Content_model.php
@@ -118,7 +118,7 @@ class Content_model extends DB_Model
 			"content_id": 1000003,
 			"template_kurzbz": "redirect",
 			"titel": "COVID-19",
-			"content": "<content><url><![CDATA[' . site_url('/CisHtml/Cms/content/10012') . ']]></url><target><![CDATA[]]></target></content>",
+			"content": "<content><url><![CDATA[' . site_url('/CisVue/Cms/content/10012') . ']]></url><target><![CDATA[]]></target></content>",
 			"menu_open": false,
 			"aktiv": true,
 			"childs": []
@@ -138,7 +138,7 @@ class Content_model extends DB_Model
 						"content_id": 1000001,
 						"template_kurzbz": "redirect",
 						"titel": "News",
-						"content": "<content><url><![CDATA[' . site_url('/CisHtml/Cms/news') . ']]></url><target><![CDATA[]]></target></content>",
+						"content": "<content><url><![CDATA[' . site_url('/CisVue/Cms/news') . ']]></url><target><![CDATA[]]></target></content>",
 						"menu_open": false,
 						"aktiv": true,
 						"childs": []
diff --git a/application/views/Cis/Documents.php b/application/views/Cis/Documents.php
index 74d7b1349..2d61a849d 100755
--- a/application/views/Cis/Documents.php
+++ b/application/views/Cis/Documents.php
@@ -5,7 +5,7 @@ $includesArray = array(
 	'customJSModules' => ['public/js/apps/Cis/Documents.js']
 );
 
-$this->load->view('templates/CISHTML-Header', $includesArray);
+$this->load->view('templates/CISVUE-Header', $includesArray);
 ?>
 
 <div id="content">
@@ -210,4 +210,4 @@ $this->load->view('templates/CISHTML-Header', $includesArray);
 	</div>
 </div>
 
-<?php $this->load->view('templates/CISHTML-Footer', $includesArray); ?>
+<?php $this->load->view('templates/CISVUE-Footer', $includesArray); ?>
diff --git a/application/views/Cis/MyLv.php b/application/views/Cis/MyLv.php
index ff03f3b51..b4159402d 100755
--- a/application/views/Cis/MyLv.php
+++ b/application/views/Cis/MyLv.php
@@ -4,7 +4,7 @@ $includesArray = array(
 	'customJSModules' => ['public/js/apps/Cis/MyLv/Student.js']
 );
 
-$this->load->view('templates/CISHTML-Header', $includesArray);
+$this->load->view('templates/CISVUE-Header', $includesArray);
 ?>
 
 <div id="content">
@@ -13,4 +13,4 @@ $this->load->view('templates/CISHTML-Header', $includesArray);
 	<mylv-student></mylv-student>
 </div>
 
-<?php $this->load->view('templates/CISHTML-Footer', $includesArray); ?>
+<?php $this->load->view('templates/CISVUE-Footer', $includesArray); ?>
diff --git a/application/views/Cis/Stundenplan.php b/application/views/Cis/Stundenplan.php
index 2983f9ae3..bfab73109 100755
--- a/application/views/Cis/Stundenplan.php
+++ b/application/views/Cis/Stundenplan.php
@@ -5,11 +5,11 @@ $includesArray = array(
 	'customCSSs' => ['public/css/components/calendar.css']
 );
 
-$this->load->view('templates/CISHTML-Header', $includesArray);
+$this->load->view('templates/CISVUE-Header', $includesArray);
 ?>
 
 <div id="content">
 	
 </div>
 
-<?php $this->load->view('templates/CISHTML-Footer', $includesArray); ?>
+<?php $this->load->view('templates/CISVUE-Footer', $includesArray); ?>
diff --git a/application/views/CisHtml/Dashboard.php b/application/views/CisHtml/Dashboard.php
index ec08a8ffa..1eddba454 100755
--- a/application/views/CisHtml/Dashboard.php
+++ b/application/views/CisHtml/Dashboard.php
@@ -8,7 +8,7 @@ $includesArray = array(
 	],
 );
 
-$this->load->view('templates/CISVUE-Header', $includesArray);
+$this->load->view('templates/CISHTML-Header', $includesArray);
 ?>
 
 <div id="content">
@@ -17,5 +17,5 @@ $this->load->view('templates/CISVUE-Header', $includesArray);
 	<fhc-dashboard dashboard="CIS"/>
 </div>
 
-<?php $this->load->view('templates/CISVUE-Footer', $includesArray); ?>
+<?php $this->load->view('templates/CISHTML-Footer', $includesArray); ?>
 
diff --git a/application/views/CisVue/Cms/RoomInformation.php b/application/views/CisVue/Cms/RoomInformation.php
index 5111a56bd..e7b197504 100644
--- a/application/views/CisVue/Cms/RoomInformation.php
+++ b/application/views/CisVue/Cms/RoomInformation.php
@@ -5,7 +5,7 @@ $includesArray = array(
 	'customCSSs' => ['public/css/components/calendar.css']
 );
 
-$this->load->view('templates/CISHTML-Header', $includesArray);
+$this->load->view('templates/CISVUE-Header', $includesArray);
 ?>
 
 <div >
@@ -17,4 +17,4 @@ $this->load->view('templates/CISHTML-Header', $includesArray);
     
 </div>
 
-<?php $this->load->view('templates/CISHTML-Footer', $includesArray); ?>
+<?php $this->load->view('templates/CISVUE-Footer', $includesArray); ?>
diff --git a/application/views/CisVue/Dashboard.php b/application/views/CisVue/Dashboard.php
index 10721630e..ec08a8ffa 100755
--- a/application/views/CisVue/Dashboard.php
+++ b/application/views/CisVue/Dashboard.php
@@ -1,5 +1,6 @@
 <?php
 $includesArray = array(
+	'title' => 'Dashboard',
 	'tabulator5'=>true,
 	'customJSModules' => ['public/js/apps/Dashboard/Fhc.js'],
 	'customCSSs' => [
diff --git a/public/js/components/DashboardWidget/Stundenplan.js b/public/js/components/DashboardWidget/Stundenplan.js
index 8a891cc59..0afdc3845 100755
--- a/public/js/components/DashboardWidget/Stundenplan.js
+++ b/public/js/components/DashboardWidget/Stundenplan.js
@@ -81,15 +81,6 @@ export default {
 			this.currentDay = day;
 			this.minimized = true;
 		},
-		showRoomInfo: function($ort_kurzbz){
-			
-			this.$fhcApi.factory.ort.getContentID($ort_kurzbz).then(res =>{
-
-				window.location.href = FHC_JS_DATA_STORAGE_OBJECT.app_root +
-				FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-				"/CisHtml/Cms/content/" + res.data;
-			})
-		},
 
 		updateRange: function (data) {
 			

From 8f617c62222e6889b2ad12ba64aee86f75d6996c Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 30 Sep 2024 13:20:14 +0200
Subject: [PATCH 1259/1461] fixes littel bug with the edit-profil modal in the
 StudentProfil

---
 public/js/components/Cis/Profil/StudentProfil.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index 18dd03b41..66d33efca 100755
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -190,7 +190,7 @@ export default {
   template: /*html*/ `
 
   <div class="container-fluid text-break fhc-form"  >
-  <edit-profil v-if="showModal" ref="editModal" @hideBsModal="hideEditProfilModal" :value="JSON.parse(JSON.stringify(filteredEditData))" :title="p.t('profil','profilBearbeiten')" ></edit-profil>
+  <edit-profil v-if="showModal" ref="editModal" @hideBsModal="hideEditProfilModal" :value="JSON.parse(JSON.stringify(filteredEditData))" :title="$p.t('profil','profilBearbeiten')" ></edit-profil>
     <!-- ROW --> 
           <div class="row">
           <!-- HIDDEN QUICK LINKS -->

From 6f0f3890f9a820674d2ede815a2879e1d44a9184 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 30 Sep 2024 13:43:26 +0200
Subject: [PATCH 1260/1461] doesnt show the footer in the editProfil modal when
 opening a ProfilUpdate

---
 .../Cis/Profil/ProfilModal/EditProfil.js         | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfil.js b/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
index 39faf0a45..b244091bb 100755
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
@@ -37,7 +37,6 @@ export default {
       fileID: null,
       breadcrumb: null,
       loading: false,
-
       result: false,
       info: null,
     };
@@ -50,7 +49,7 @@ export default {
   },
 
   methods: {
-    updateFileIDFunction: function (newFileID) {
+	updateFileIDFunction: function (newFileID) {
       this.fileID = newFileID;
     },
 
@@ -154,7 +153,16 @@ export default {
       }
     },
   },
-  computed: {},
+  computed: {
+	showFooter: function () {
+		switch(this.value.view){
+			case 'Status': return false;
+			case 'Kontakt':return false;
+			case 'Adresse':return false;
+			default: return true;
+		}	
+    },
+  },
   created() {
     if (this.editData.topic) {
       //? if the topic was passed through the prop add it to the component
@@ -188,7 +196,7 @@ export default {
 
     </template>
     <!-- optional footer -->
-    <template  v-slot:footer v-if="value.view? value.view != 'Status' : true">
+    <template v-slot:footer v-if="showFooter">
     <loader  ref="loaderRef" :timeout="0"></loader>
         
     <button class="btn btn-outline-danger " @click="hide">{{$p.t('ui','cancel')}}</button>    

From fa8aec2c2e4dd7e7f496799ab837c3f25cd13ed8 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 30 Sep 2024 14:13:00 +0200
Subject: [PATCH 1261/1461] adds the MyLv and the Stundenplan Menupunkt to the
 sql inserts and changes the content for the Dokumente redirect

---
 system/dbupdate_3.4/25999_C4_Menu.php | 70 ++++++++++++++++++++++++++-
 1 file changed, 69 insertions(+), 1 deletion(-)

diff --git a/system/dbupdate_3.4/25999_C4_Menu.php b/system/dbupdate_3.4/25999_C4_Menu.php
index 786011b30..c8ecc3e97 100755
--- a/system/dbupdate_3.4/25999_C4_Menu.php
+++ b/system/dbupdate_3.4/25999_C4_Menu.php
@@ -90,6 +90,24 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					'contentmittitel','tlc',NOW(),null,null,null,TRUE,FALSE,'TLC'
 				);
 
+				-- STUNDENPLAN
+
+				INSERT INTO campus.tbl_content 
+				(template_kurzbz, oe_kurzbz, insertamum, insertvon, updateamum, updatevon, aktiv, menu_open, beschreibung)
+				VALUES  
+				(
+					'redirect','etw',NOW(),null,null,null,TRUE,FALSE,'STUNDENPLAN'
+				);
+
+				-- MYLV
+
+				INSERT INTO campus.tbl_content 
+				(template_kurzbz, oe_kurzbz, insertamum, insertvon, updateamum, updatevon, aktiv, menu_open, beschreibung)
+				VALUES  
+				(
+					'redirect','etw',NOW(),null,null,null,TRUE,FALSE,'MYLV'
+				);
+
 				-- ##################################### CONTENTSPRACHE
 
 				-- CIS4_ROOT
@@ -156,7 +174,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					-- queries the content_id for the DOKUMENTE
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'DOKUMENTE'),
 					1,TRUE,
-					'<content><url><![CDATA[#Dokumente]]></url><target><![CDATA[_self]]></target></content>',
+					'<content><url><![CDATA[../cis.php/Cis/Documents]]></url><target><![CDATA[]]></target></content>',
 					null,null,null,null,NOW(),null,'Dokumente',null
 				);
 
@@ -203,6 +221,34 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					null,null,null,null,NOW(),null,'TLC',null
 				);
 
+				-- STUNDENPLAN
+				
+				INSERT INTO campus.tbl_contentsprache 
+				(sprache, content_id, version, sichtbar, content, reviewvon, reviewamum, updateamum, updatevon, insertamum, insertvon, titel, gesperrt_uid)
+				VALUES  
+				(
+					'German',
+					-- queries the content_id for the STUNDENPLAN
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUNDENPLAN'),
+					1,TRUE,
+					'<content><url><![CDATA[../cis.php/Cis/Stundenplan]]></url><target><![CDATA[]]></target></content>',
+					null,null,null,null,NOW(),null,'Stundenplan',null
+				);
+
+				-- MYLV
+				
+				INSERT INTO campus.tbl_contentsprache 
+				(sprache, content_id, version, sichtbar, content, reviewvon, reviewamum, updateamum, updatevon, insertamum, insertvon, titel, gesperrt_uid)
+				VALUES  
+				(
+					'German',
+					-- queries the content_id for the MYLV
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'MYLV'),
+					1,TRUE,
+					'<content><url><![CDATA[../cis.php/Cis/MyLv]]></url><target><![CDATA[]]></target></content>',
+					null,null,null,null,NOW(),null,'MyLv',null
+				);
+
 				-- ##################################### CONTENTCHILD
 
 				-- CIS4_ROOT childs
@@ -283,6 +329,28 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 
 				-- Mein Studium childs
 
+				INSERT INTO campus.tbl_contentchild
+				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
+				VALUES
+				(
+					-- queries the content_id for the MEIN_STUDIUM
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'MEIN_STUDIUM'),
+					-- queries the content_id for the STUNDENPLAN
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUNDENPLAN'),
+					NOW(), null, null, null, 100
+				);
+
+				INSERT INTO campus.tbl_contentchild
+				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
+				VALUES
+				(
+					-- queries the content_id for the MEIN_STUDIUM
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'MEIN_STUDIUM'),
+					-- queries the content_id for the MYLV
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'MYLV'),
+					NOW(), null, null, null, 100
+				);
+
 				INSERT INTO campus.tbl_contentchild
 				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
 				VALUES

From 23b7d18906ccfa100d74b5a79c34191c49c84bed Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 30 Sep 2024 14:24:48 +0200
Subject: [PATCH 1262/1461] gives the content_childs of the CIS4_ROOT the
 correct ordering

---
 system/dbupdate_3.4/25999_C4_Menu.php | 82 +++++++++++++++------------
 1 file changed, 46 insertions(+), 36 deletions(-)

diff --git a/system/dbupdate_3.4/25999_C4_Menu.php b/system/dbupdate_3.4/25999_C4_Menu.php
index c8ecc3e97..e9153fc96 100755
--- a/system/dbupdate_3.4/25999_C4_Menu.php
+++ b/system/dbupdate_3.4/25999_C4_Menu.php
@@ -261,7 +261,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'CIS4_ROOT'),
 					-- queries the content_id for the MEIN_STUDIUM
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'MEIN_STUDIUM'),
-					NOW(), null, null, null, 100
+					NOW(), null, null, null, 1
 				);
 
 				INSERT INTO campus.tbl_contentchild
@@ -271,7 +271,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					-- queries the content_id for the CIS4_ROOT
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'CIS4_ROOT'),
 					-- 10882 is the content_id for VPN Neu - Zugang für Student*innen
-					10882, NOW(), null, null, null, 100
+					10882, NOW(), null, null, null, 2
 				);
 
 				INSERT INTO campus.tbl_contentchild
@@ -282,7 +282,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'CIS4_ROOT'),
 					-- queries the content_id for the NEWS
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'NEWS'),
-					NOW(), null, null, null, 100
+					NOW(), null, null, null, 3
 				);
 
 				INSERT INTO campus.tbl_contentchild
@@ -293,7 +293,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'CIS4_ROOT'),
 					-- queries the content_id for the DOKUMENTE
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'DOKUMENTE'),
-					NOW(), null, null, null, 100
+					NOW(), null, null, null, 4
 				);
 
 				INSERT INTO campus.tbl_contentchild
@@ -302,9 +302,9 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 				(
 					-- queries the content_id for the CIS4_ROOT
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'CIS4_ROOT'),
-					-- queries the content_id for the DOKUMENTE
+					-- queries the content_id for the TLC
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'TLC'),
-					NOW(), null, null, null, 100
+					NOW(), null, null, null, 5
 				);
 
 				INSERT INTO campus.tbl_contentchild
@@ -314,7 +314,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					-- queries the content_id for the CIS4_ROOT
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'CIS4_ROOT'),
 					-- 10487 is the content_id for Modul International Skills
-					10487, NOW(), null, null, null, 100
+					10487, NOW(), null, null, null, 6
 				);
 
 				INSERT INTO campus.tbl_contentchild
@@ -324,7 +324,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					-- queries the content_id for the CIS4_ROOT
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'CIS4_ROOT'),
 					-- 10568 is the content_id for Zahlungen
-					10568, NOW(), null, null, null, 100
+					10568, NOW(), null, null, null, 7
 				);
 
 				-- Mein Studium childs
@@ -337,7 +337,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'MEIN_STUDIUM'),
 					-- queries the content_id for the STUNDENPLAN
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUNDENPLAN'),
-					NOW(), null, null, null, 100
+					NOW(), null, null, null, 1
 				);
 
 				INSERT INTO campus.tbl_contentchild
@@ -348,7 +348,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'MEIN_STUDIUM'),
 					-- queries the content_id for the MYLV
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'MYLV'),
-					NOW(), null, null, null, 100
+					NOW(), null, null, null, 2
 				);
 
 				INSERT INTO campus.tbl_contentchild
@@ -359,7 +359,17 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'MEIN_STUDIUM'),
 					-- queries the content_id for the PROFIL
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'PROFIL'),
-					NOW(), null, null, null, 100
+					NOW(), null, null, null, 3
+				);
+
+				INSERT INTO campus.tbl_contentchild
+				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
+				VALUES
+				(
+					-- queries the content_id for the MEIN_STUDIUM
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'MEIN_STUDIUM'),
+					-- 10795 is the content_id for Studierendenstatus
+					10795, NOW(), null, null, null, 4
 				);
 
 				-- Profil childs
@@ -371,7 +381,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					-- queries the content_id for the PROFIL
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'PROFIL'),
 					-- 7358 is the content_id for password_aendern
-					7358, NOW(), null, null, null, 100
+					7358, NOW(), null, null, null, 1
 				);
 
 				-- News childs
@@ -383,7 +393,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					-- queries the content_id for the NEWS
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'NEWS'),
 					-- 6748 is the content_id for Newsletter FHTW
-					6748, NOW(), null, null, null, 100
+					6748, NOW(), null, null, null, 1
 				);
 
 				-- Dokumente childs
@@ -395,7 +405,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					-- queries the content_id for the DOKUMENTE
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'DOKUMENTE'),
 					-- 10246 is the content_id for Allg. FHTW-Glossar
-					10246, NOW(), null, null, null, 100
+					10246, NOW(), null, null, null, 1
 				);
 
 				INSERT INTO campus.tbl_contentchild
@@ -405,7 +415,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					-- queries the content_id for the DOKUMENTE
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'DOKUMENTE'),
 					-- 10339 is the content_id for Hausordnung
-					10339, NOW(), null, null, null, 100
+					10339, NOW(), null, null, null, 2
 				);
 
 				INSERT INTO campus.tbl_contentchild
@@ -415,7 +425,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					-- queries the content_id for the DOKUMENTE
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'DOKUMENTE'),
 					-- 6830 is the content_id for Satzung
-					6830, NOW(), null, null, null, 100
+					6830, NOW(), null, null, null, 3
 				);
 
 				INSERT INTO campus.tbl_contentchild
@@ -426,7 +436,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'DOKUMENTE'),
 					-- queries the content_id for the STUDIENBETRIEB
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUDIENBETRIEB'),
-					NOW(), null, null, null, 100
+					NOW(), null, null, null, 4
 				);
 
 				INSERT INTO campus.tbl_contentchild
@@ -437,7 +447,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'DOKUMENTE'),
 					-- queries the content_id for the VORLAGEN
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'VORLAGEN'),
-					NOW(), null, null, null, 100
+					NOW(), null, null, null, 5
 				);
 
 				-- Studienbetrieb childs
@@ -449,7 +459,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					-- queries the content_id for the STUDIENBETRIEB
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUDIENBETRIEB'),
 					-- 7251 is the content_id for Administration
-					7251, NOW(), null, null, null, 100
+					7251, NOW(), null, null, null, 1
 				);
 
 				INSERT INTO campus.tbl_contentchild
@@ -459,7 +469,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					-- queries the content_id for the STUDIENBETRIEB
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUDIENBETRIEB'),
 					-- 7252 is the content_id for Außerordentliche Studierende
-					7252, NOW(), null, null, null, 100
+					7252, NOW(), null, null, null, 2
 				);
 
 				INSERT INTO campus.tbl_contentchild
@@ -469,7 +479,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					-- queries the content_id for the STUDIENBETRIEB
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUDIENBETRIEB'),
 					-- 7253 is the content_id for Berufspraktikum
-					7253, NOW(), null, null, null, 100
+					7253, NOW(), null, null, null, 3
 				);
 
 				INSERT INTO campus.tbl_contentchild
@@ -479,7 +489,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					-- queries the content_id for the STUDIENBETRIEB
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUDIENBETRIEB'),
 					-- 7254 is the content_id for CRM @ FHTW
-					7254, NOW(), null, null, null, 100
+					7254, NOW(), null, null, null, 4
 				);
 
 				INSERT INTO campus.tbl_contentchild
@@ -489,7 +499,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					-- queries the content_id for the STUDIENBETRIEB
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUDIENBETRIEB'),
 					-- 9328 is the content_id for Datenschutz
-					9328, NOW(), null, null, null, 100
+					9328, NOW(), null, null, null, 5
 				);
 
 				INSERT INTO campus.tbl_contentchild
@@ -499,7 +509,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					-- queries the content_id for the STUDIENBETRIEB
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUDIENBETRIEB'),
 					-- 10139 is the content_id for Einteilung Studienjahr
-					10139, NOW(), null, null, null, 100
+					10139, NOW(), null, null, null, 6
 				);
 
 				INSERT INTO campus.tbl_contentchild
@@ -509,7 +519,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					-- queries the content_id for the STUDIENBETRIEB
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUDIENBETRIEB'),
 					-- 7255 is the content_id for Formulare
-					7255, NOW(), null, null, null, 100
+					7255, NOW(), null, null, null, 7
 				);
 
 				INSERT INTO campus.tbl_contentchild
@@ -519,7 +529,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					-- queries the content_id for the STUDIENBETRIEB
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUDIENBETRIEB'),
 					-- 10841 is the content_id for Formulare
-					10841, NOW(), null, null, null, 100
+					10841, NOW(), null, null, null, 8
 				);
 
 				INSERT INTO campus.tbl_contentchild
@@ -529,7 +539,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					-- queries the content_id for the STUDIENBETRIEB
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUDIENBETRIEB'),
 					-- 7256 is the content_id for Internationale BewerberInnen
-					7256, NOW(), null, null, null, 100
+					7256, NOW(), null, null, null, 9
 				);
 
 				INSERT INTO campus.tbl_contentchild
@@ -539,7 +549,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					-- queries the content_id for the STUDIENBETRIEB
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUDIENBETRIEB'),
 					-- 7257 is the content_id for Leistungsstipendium
-					7257, NOW(), null, null, null, 100
+					7257, NOW(), null, null, null, 10
 				);
 
 				INSERT INTO campus.tbl_contentchild
@@ -549,7 +559,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					-- queries the content_id for the STUDIENBETRIEB
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUDIENBETRIEB'),
 					-- 7258 is the content_id for ÖH-Studierendenvertretung
-					7258, NOW(), null, null, null, 100
+					7258, NOW(), null, null, null, 11
 				);
 
 				INSERT INTO campus.tbl_contentchild
@@ -559,7 +569,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					-- queries the content_id for the STUDIENBETRIEB
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUDIENBETRIEB'),
 					-- 8416 is the content_id for ÖH-Studierendenvertretung
-					8416, NOW(), null, null, null, 100
+					8416, NOW(), null, null, null, 12
 				);
 
 				INSERT INTO campus.tbl_contentchild
@@ -569,7 +579,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					-- queries the content_id for the STUDIENBETRIEB
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUDIENBETRIEB'),
 					-- 7259 is the content_id for Prüfungen/Lehre
-					7259, NOW(), null, null, null, 100
+					7259, NOW(), null, null, null, 13
 				);
 
 				INSERT INTO campus.tbl_contentchild
@@ -579,7 +589,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					-- queries the content_id for the STUDIENBETRIEB
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUDIENBETRIEB'),
 					-- 10748 is the content_id for Studienbeitrag & ÖH-Beitrag
-					10748, NOW(), null, null, null, 100
+					10748, NOW(), null, null, null, 14
 				);
 
 				INSERT INTO campus.tbl_contentchild
@@ -589,7 +599,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					-- queries the content_id for the STUDIENBETRIEB
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUDIENBETRIEB'),
 					-- 7260 is the content_id for Studieren, Wohnen & Finanzen
-					7260, NOW(), null, null, null, 100
+					7260, NOW(), null, null, null, 15
 				);
 
 				INSERT INTO campus.tbl_contentchild
@@ -599,7 +609,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					-- queries the content_id for the STUDIENBETRIEB
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUDIENBETRIEB'),
 					-- 7261 is the content_id for Wissenschaftliches Arbeiten 
-					7261, NOW(), null, null, null, 100
+					7261, NOW(), null, null, null, 16
 				);
 
 				-- Vorlagen childs
@@ -611,7 +621,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					-- queries the content_id for the VORLAGEN
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'VORLAGEN'),
 					-- 7243 is the content_id for FHTW Corporate Identity & Design
-					7243, NOW(), null, null, null, 100
+					7243, NOW(), null, null, null, 1
 				);
 
 				-- TLC childs
@@ -623,7 +633,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					-- queries the content_id for the TLC
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'TLC'),
 					-- 9248 is the content_id for Service für Studierende
-					9248, NOW(), null, null, null, 100
+					9248, NOW(), null, null, null, 1
 				);
 				";
 

From ce058df3a5fc74af6d9ac6b1b675a936f4bdcc11 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 30 Sep 2024 17:25:51 +0200
Subject: [PATCH 1263/1461] =?UTF-8?q?Student=20Component=20Performance=20F?=
 =?UTF-8?q?ix=20(dont=20subquery=20person=20and=20anwesenheiten=5Fuser=20t?=
 =?UTF-8?q?able=20on=20every=20anw=5Fuser=20row,=20just=20do=20the=20entsc?=
 =?UTF-8?q?huldigung=20offen/abgelehnt=20logic=20in=20client=20before=20re?=
 =?UTF-8?q?ndering);=20entschuldigung=20tab=20route;=20pagination=20on=20s?=
 =?UTF-8?q?tudent=20entschuldigung=20page=20aswell;=20added=20config=20for?=
 =?UTF-8?q?=20einheiten=20l=C3=A4nge=20to=20calculate/show;=20mitarbeiter?=
 =?UTF-8?q?=20selection=20in=20case=20of=20admin=20&=20lektor=20in=20same?=
 =?UTF-8?q?=20account=20behaving=20as=20expected;=20added=20index=20creati?=
 =?UTF-8?q?on=20to=20initial=20sql=20scripts;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 system/phrasesupdate.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 5c9450f37..37364985d 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -27175,6 +27175,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'anteil',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anteil',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Percentage',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',

From 76facc40b9e3b465fd5808e8cdf102349b6215f5 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 1 Oct 2024 12:14:34 +0200
Subject: [PATCH 1264/1461] changes the layout for the LvMenu to a flex instead
 of a grid

---
 public/css/components/dashboard.css     |  4 ----
 public/js/components/Cis/Mylv/LvMenu.js | 12 +++++++-----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
index 10b865027..d2635d4e9 100755
--- a/public/css/components/dashboard.css
+++ b/public/css/components/dashboard.css
@@ -36,10 +36,6 @@
 	cursor: move;
 }
 
-.lvUebersichtMenuPunkt:hover{
-	background-color:rgba(0, 100, 156, 0.25);
-}
-
 .underline_hover:hover{
 	color:var(--bs-primary);
 	text-decoration: underline;
diff --git a/public/js/components/Cis/Mylv/LvMenu.js b/public/js/components/Cis/Mylv/LvMenu.js
index 7c292bff2..bbffe7ad4 100644
--- a/public/js/components/Cis/Mylv/LvMenu.js
+++ b/public/js/components/Cis/Mylv/LvMenu.js
@@ -71,12 +71,14 @@ export default {
 		<iframe class="h-100 w-100" :src="selectedMenu.c4_link" :title="selectedMenu.name"></iframe>
 	</div>
 	<div v-else-if="!menu">No Menu available</div>
-	<div v-else :style="{'display':'grid', 'row-gap':'10px', 'column-gap':'10px', 'grid-template-columns':'repeat(3,minmax(100px,1fr))', 'grid-template-rows':'repeat('+Math.ceil(menu.length / 3)+',minmax(100px,1fr))'} ">
-		<div :title="menuItem.name" role="button" @click="selectMenu(menuItem)" class="lvUebersichtMenuPunkt border border-1 d-flex flex-column align-items-center justify-content-center p-1 text-center" v-for="(menuItem, index) in menu" :key="index">
-			<img :src="menuItem.c4_icon" :alt="menuItem.name" ></img>
-			<span @click="selectMenu(menuItem)" class="underline_hover mt-2">{{menuItem.name}}</span>
-			<span v-for="([text,link],index) in menuItem.c4_linkList" @click.stop="selectMenu(menuItem,index)"  :class="{'underline_hover':menuItem.c4_linkList[index][1] != '#'}" class="mt-1" :index="index">{{text}}</span>
+	<div v-else class="container">
+		<div class="row">
+			<div style="min-height:150px" :title="menuItem.name" role="button" @click="selectMenu(menuItem)" class="col-12 col-lg-6 col-xl-4 border border-1 d-flex flex-column align-items-center justify-content-center p-1 text-center" v-for="(menuItem, index) in menu" :key="index">
+				<img :src="menuItem.c4_icon" :alt="menuItem.name" ></img>
+				<span @click="selectMenu(menuItem)" class="underline_hover mt-2">{{menuItem.name}}</span>
+				<span v-for="([text,link],index) in menuItem.c4_linkList" @click.stop="selectMenu(menuItem,index)"  :class="{'underline_hover':menuItem.c4_linkList[index][1] != '#'}" class="mt-1" :index="index">{{text}}</span>
 
+			</div>
 		</div>
 	</div>
 	`

From 567dd816bebac87db745699459d2f272f2cbd9bb Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 1 Oct 2024 13:54:53 +0200
Subject: [PATCH 1265/1461] better descriptions for the cis4_root_menu sql
 queries

---
 system/dbupdate_3.4/25999_C4_Menu.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/system/dbupdate_3.4/25999_C4_Menu.php b/system/dbupdate_3.4/25999_C4_Menu.php
index e9153fc96..0e1ab3339 100755
--- a/system/dbupdate_3.4/25999_C4_Menu.php
+++ b/system/dbupdate_3.4/25999_C4_Menu.php
@@ -8,7 +8,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 
 		if (!$db->db_query("BEGIN;")) 
 		{
-			echo '<strong>wasnt able to start transaction: ' . $db->db_last_error() . '</strong><br>';
+			echo '<strong>wasnt able to start transaction for CIS4_ROOT_MENU: ' . $db->db_last_error() . '</strong><br>';
 		}
 		else
 		{
@@ -651,7 +651,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 				} 
 				else 
 				{
-					echo '<strong>ROLLED BACK</strong><br>';
+					echo '<strong>ROLLED BACK CIS4_ROOT_MENU</strong><br>';
 				}
 			} 
 			else 
@@ -663,7 +663,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 				} 
 				else 
 				{
-					echo '<strong>COMMITED</strong><br>';
+					echo '<strong>COMMITED CIS4_ROOT_MENU</strong><br>';
 				}
 
 				echo '<br>Menu content created';

From c461480d1dfb9304f5cfb896df113c9935163ffb Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 2 Oct 2024 10:35:58 +0200
Subject: [PATCH 1266/1461] stundenplanQuery optimization

---
 .../controllers/api/frontend/v1/Stundenplan.php       | 11 +++++++++--
 application/models/ressource/Stundenplan_model.php    | 11 +++++++----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 0efd32807..7b67dbeb3 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -108,6 +108,8 @@ class Stundenplan extends FHCAPI_Controller
 	 * 
 	 */
 	public function getStundenplan(){
+		// include Student model to fetch Studiengang_kz and Semester
+		$this->load->model('crm/Student_model', 'StudentModel');
 
 		// form validation
 		$this->load->library('form_validation');
@@ -121,8 +123,13 @@ class Stundenplan extends FHCAPI_Controller
 		$start_date = $this->input->get('start_date', TRUE);
 		$end_date = $this->input->get('end_date', TRUE);
 		
-		// the stundenplan query needs the uid and a start and end date
-		$stundenplan_data = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getStundenplanQuery(get_uid(),$start_date,$end_date)); 
+		// get Student_uid / Studiengang_kz / Semester in order to use index idx_stundenplan_datum_stgsem
+		$student_uid = get_uid();
+		$student_data = $this->StudentModel->load([$student_uid]);
+		$student_data = getData($student_data)[0];
+		$this->addMeta('studg',$student_data->studiengang_kz);
+		$this->addMeta('sem', $student_data->semester);
+		$stundenplan_data = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getStundenplanQuery(get_uid(),$start_date,$end_date,$student_data->studiengang_kz,$student_data->semester)); 
 		$stundenplan_data = $this->getDataOrTerminateWithError($stundenplan_data) ?? [];
 
 		$this->expand_object_information($stundenplan_data);
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index bebbb974f..039b8fdb8 100755
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -192,7 +192,7 @@ class Stundenplan_model extends DB_Model
 	 * 
 	 * @return string
 	 */
-	public function getStundenplanQuery($uid, $start_date, $end_date){
+	public function getStundenplanQuery($uid, $start_date, $end_date,$studiengang_kz,$semester){
 			return 
 			"select sp.*
 			from lehre.vw_stundenplan sp
@@ -201,9 +201,12 @@ class Stundenplan_model extends DB_Model
 			left join public.tbl_studentlehrverband slv ON sp.studiengang_kz=slv.studiengang_kz and slv.student_uid=".$this->escape($uid)." and (slv.semester=sp.semester OR sp.semester IS NULL) AND (slv.verband=sp.verband OR sp.verband IS NULL OR sp.verband='' OR sp.verband='0') AND
 			(slv.gruppe=sp.gruppe OR sp.gruppe IS NULL OR sp.gruppe='' OR sp.gruppe='0') AND sp.gruppe_kurzbz IS NULL
 			left join public.tbl_studiensemester ss2 ON slv.studiensemester_kurzbz=ss2.studiensemester_kurzbz AND ss2.start<=sp.datum and ss2.ende >= sp.datum
-			WHERE ss1.studiensemester_kurzbz IS NOT NULL or ss2.studiensemester_kurzbz IS NOT NULL
-			AND sp.datum >= ".$this->escape($start_date)." 
-			AND sp.datum <= ".$this->escape($end_date);
+			WHERE 
+			sp.datum >= ".$this->escape($start_date)." 
+			AND sp.datum <= ".$this->escape($end_date)."
+			AND sp.studiengang_kz = ".$this->escape($studiengang_kz)."
+			AND sp.semester = ".$this->escape($semester)."
+			AND (ss1.studiensemester_kurzbz IS NOT NULL or ss2.studiensemester_kurzbz IS NOT NULL)";
 	}
 
 	/**

From 7f9352b82081fc2732a047ecea2995ad6eb53955 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 2 Oct 2024 13:25:39 +0200
Subject: [PATCH 1267/1461] prototyp fuer die Stundenplan query fuer
 Studierende

---
 .../api/frontend/v1/Stundenplan.php           | 10 +++-
 .../models/ressource/Stundenplan_model.php    | 59 ++++++++++++++-----
 2 files changed, 54 insertions(+), 15 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 7b67dbeb3..c624f0944 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -108,8 +108,15 @@ class Stundenplan extends FHCAPI_Controller
 	 * 
 	 */
 	public function getStundenplan(){
+
+		// Query fuer Studenten prototyp ok
+		//TODO: getStundenplan fuer Mitarbeiter anpassen
+		//TODO: viele edge cases die es nicht moeglich machen besseren tbl_stundenplan index zu verwenden als idx_stundenplan_datum
+
 		// include Student model to fetch Studiengang_kz and Semester
 		$this->load->model('crm/Student_model', 'StudentModel');
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
 
 		// form validation
 		$this->load->library('form_validation');
@@ -128,7 +135,8 @@ class Stundenplan extends FHCAPI_Controller
 		$student_data = $this->StudentModel->load([$student_uid]);
 		$student_data = getData($student_data)[0];
 		$this->addMeta('studg',$student_data->studiengang_kz);
-		$this->addMeta('sem', $student_data->semester);
+		$this->addMeta('sem', $student_data->semester);	
+
 		$stundenplan_data = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getStundenplanQuery(get_uid(),$start_date,$end_date,$student_data->studiengang_kz,$student_data->semester)); 
 		$stundenplan_data = $this->getDataOrTerminateWithError($stundenplan_data) ?? [];
 
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 039b8fdb8..3966a08e1 100755
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -193,20 +193,51 @@ class Stundenplan_model extends DB_Model
 	 * @return string
 	 */
 	public function getStundenplanQuery($uid, $start_date, $end_date,$studiengang_kz,$semester){
-			return 
-			"select sp.*
-			from lehre.vw_stundenplan sp
-			left join public.tbl_benutzergruppe bg ON sp.gruppe_kurzbz=bg.gruppe_kurzbz AND bg.uid =".$this->escape($uid)." 
-			left join public.tbl_studiensemester ss1 ON bg.studiensemester_kurzbz=ss1.studiensemester_kurzbz AND ss1.start <=sp.datum AND ss1.ende>= sp.datum
-			left join public.tbl_studentlehrverband slv ON sp.studiengang_kz=slv.studiengang_kz and slv.student_uid=".$this->escape($uid)." and (slv.semester=sp.semester OR sp.semester IS NULL) AND (slv.verband=sp.verband OR sp.verband IS NULL OR sp.verband='' OR sp.verband='0') AND
-			(slv.gruppe=sp.gruppe OR sp.gruppe IS NULL OR sp.gruppe='' OR sp.gruppe='0') AND sp.gruppe_kurzbz IS NULL
-			left join public.tbl_studiensemester ss2 ON slv.studiensemester_kurzbz=ss2.studiensemester_kurzbz AND ss2.start<=sp.datum and ss2.ende >= sp.datum
-			WHERE 
-			sp.datum >= ".$this->escape($start_date)." 
-			AND sp.datum <= ".$this->escape($end_date)."
-			AND sp.studiengang_kz = ".$this->escape($studiengang_kz)."
-			AND sp.semester = ".$this->escape($semester)."
-			AND (ss1.studiensemester_kurzbz IS NOT NULL or ss2.studiensemester_kurzbz IS NOT NULL)";
+
+		$studiensemester = null;
+
+		$check_with_start_date = $this->execReadOnlyQuery("SELECT * FROM public.tbl_studiensemester WHERE " . $this->escape($start_date) . " BETWEEN start AND ende ;");
+		$check_with_start_date = getData($check_with_start_date);
+		if (count($check_with_start_date)>0) 
+		{
+			$studiensemester = current($check_with_start_date)->studiensemester_kurzbz;
+		}
+		else
+		{
+			$check_with_end_date = $this->execReadOnlyQuery("SELECT * FROM public.tbl_studiensemester WHERE " . $this->escape($end_date) . " BETWEEN start AND ende ;");
+			$check_with_end_date = getData($check_with_end_date);
+			if (count($check_with_start_date) > 0) 
+			{
+				$studiensemester = current($check_with_end_date)->studiensemester_kurzbz;
+			}
+		}
+
+		if(!is_null($studiensemester))
+		{
+			$semester_with_studiensemester = $this->execReadOnlyQuery("SELECT * FROM public.tbl_studentlehrverband WHERE student_uid = " . $this->escape($uid) . " AND studiensemester_kurzbz = " . $this->escape($studiensemester));
+			$semester_with_studiensemester = getData($semester_with_studiensemester);
+			$semester_with_studiensemester = current($semester_with_studiensemester)->semester;
+
+		return 
+		"select sp.*
+		from lehre.vw_stundenplan sp
+		left join public.tbl_benutzergruppe bg ON sp.gruppe_kurzbz=bg.gruppe_kurzbz AND bg.uid =".$this->escape($uid)." 
+		left join public.tbl_studiensemester ss1 ON bg.studiensemester_kurzbz=ss1.studiensemester_kurzbz AND ss1.start <=sp.datum AND ss1.ende>= sp.datum
+		left join public.tbl_studentlehrverband slv ON sp.studiengang_kz=slv.studiengang_kz and slv.student_uid=".$this->escape($uid)." and (slv.semester=sp.semester OR sp.semester IS NULL) AND (slv.verband=sp.verband OR sp.verband IS NULL OR sp.verband='' OR sp.verband='0') AND
+		(slv.gruppe=sp.gruppe OR sp.gruppe IS NULL OR sp.gruppe='' OR sp.gruppe='0') AND sp.gruppe_kurzbz IS NULL
+		left join public.tbl_studiensemester ss2 ON slv.studiensemester_kurzbz=ss2.studiensemester_kurzbz AND ss2.start<=sp.datum and ss2.ende >= sp.datum
+		WHERE 
+		sp.datum >= ".$this->escape($start_date)." 
+		AND sp.datum <= ".$this->escape($end_date)."
+		AND sp.studiengang_kz = ".$this->escape($studiengang_kz)."
+		AND sp.semester = ".$this->escape($semester_with_studiensemester)."
+		AND (ss1.studiensemester_kurzbz IS NOT NULL or ss2.studiensemester_kurzbz IS NOT NULL)";
+
+		}
+		else
+		{
+			return error("studiensemester could not be retrieved with the student_uid: ".$uid);
+		}
 	}
 
 	/**

From e8f38bfcf6aee5fb268eaee22d11d8e7e2ffa293 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 2 Oct 2024 13:28:18 +0200
Subject: [PATCH 1268/1461] sets the events to null before fetching the new
 events to reactivate the loading spinner

---
 public/js/apps/Cis/Stundenplan.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/public/js/apps/Cis/Stundenplan.js b/public/js/apps/Cis/Stundenplan.js
index ae36c0d6c..807f192d7 100755
--- a/public/js/apps/Cis/Stundenplan.js
+++ b/public/js/apps/Cis/Stundenplan.js
@@ -42,6 +42,8 @@ const app = Vue.createApp({
 			let tmp_date = new CalendarDate(data.start);
 			// only load month data if the month or year has changed
 			if(tmp_date.m != this.calendarDate.m || tmp_date.y != this.calendarDate.y){
+				// reset the events before querying the new events to activate the loading spinner
+				this.events = null;
 				this.calendarDate = tmp_date;
 				Vue.nextTick(() => {
 					this.loadEvents();

From 317796c919bf417a52d624768a774e539eaa976d Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Wed, 2 Oct 2024 14:13:44 +0200
Subject: [PATCH 1269/1461] - legende und phrasen hinzugefuegt

---
 system/phrasesupdate.php | 360 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 360 insertions(+)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 96e29ea9c..78ffca1b7 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -18262,6 +18262,366 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'international',
+		'category' => 'international',
+		'phrase' => 'statusGeplant',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'geplant',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'planned',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'international',
+		'category' => 'international',
+		'phrase' => 'statusGeplantDesc',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Studierende hat die Maßnahme geplant.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The student has planned the measure.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'international',
+		'category' => 'international',
+		'phrase' => 'statusAkzeptiert',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'akzeptiert',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'accepted',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'international',
+		'category' => 'international',
+		'phrase' => 'statusAkzeptiertDesc',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Die geplante Maßnahme wurde akzeptiert.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The planned measure has been accepted.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'international',
+		'category' => 'international',
+		'phrase' => 'statusDurchgefuehrt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'durchgeführt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'performed',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'international',
+		'category' => 'international',
+		'phrase' => 'statusDurchgefuehrtDesc',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Eine Bestätigung wurde hochgeladen.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'A confirmation has been uploaded.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'international',
+		'category' => 'international',
+		'phrase' => 'statusBestaetigt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'bestätigt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'confirmed',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'international',
+		'category' => 'international',
+		'phrase' => 'statusBestaetigtDesc',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Die hochgeladene Bestätigung wurde akzeptiert.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The uploaded confirmation has been accepted.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'international',
+		'category' => 'international',
+		'phrase' => 'statusAbgelehnt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'abgelehnt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'declined',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'international',
+		'category' => 'international',
+		'phrase' => 'statusAbgelehntDesc',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Die Maßnahme wurde abgelehnt.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The measure was rejected.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'international',
+		'category' => 'international',
+		'phrase' => 'ampelRed',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Es wurden keine Maßnahmen geplant oder alle wurden abgelehnt.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No measures have been planned, or all have been rejected.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'international',
+		'category' => 'international',
+		'phrase' => 'ampelYellow',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Mindestens eine Maßnahme wurde akzeptiert.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'At least one measure has been accepted.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'international',
+		'category' => 'international',
+		'phrase' => 'ampelOrange',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Es gibt mindestens eine geplante oder durchgeführte Maßnahme.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'There is at least one planned or performed measure.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'international',
+		'category' => 'international',
+		'phrase' => 'ampelGreenyellow',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Nur bestätigte Maßnahmen vorhanden, aber weniger als 5 ECTs.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Only confirmed measures, but fewer than 5 ECTs.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'international',
+		'category' => 'international',
+		'phrase' => 'ampelGreen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Es wurden 5 ECTs erreicht.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '5 ECTs points have been achieved.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'international',
+		'category' => 'international',
+		'phrase' => 'mailMeldungzuviele',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Die Anzahl der Empfänger überschreitet 50. Bitte verwenden Sie einen Filter (z.B. Semester), um die Empfängeranzahl zu reduzieren.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The number of recipients exceeds 50. Please use a filter (e.g., semester) to reduce the number of recipients.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'international',
+		'category' => 'international',
+		'phrase' => 'mailMeldung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Keine Studierenden ohne geplante Maßnahmen gefunden.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No students without planned measures were found.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'international',
+		'category' => 'international',
+		'phrase' => 'mailButton',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'E-Mail nur an Studierende, die keine Maßnahmen geplant haben.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Send email only to students who have no planned measures.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'international',
 		'category' => 'international',

From 8042f3ae0b667f5caff1b4147ce828a101f4b426 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 2 Oct 2024 14:22:34 +0200
Subject: [PATCH 1270/1461] makes the menu point active with the url matches

---
 public/js/components/Cis/Menu.js       | 11 +++++-
 public/js/components/Cis/Menu/Entry.js | 46 +++++++++++++++++++++++---
 2 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js
index f44819011..92e189af3 100755
--- a/public/js/components/Cis/Menu.js
+++ b/public/js/components/Cis/Menu.js
@@ -21,9 +21,17 @@ export default {
             entries: [],
 			activeEntry:null,
 			url:null,
+			highestMatchingUrlCount:0,
         };
     },
 	methods:{
+		checkHighestMatchingUrlCount(count){
+			if(count > this.highestMatchingUrlCount)
+			{
+				this.highestMatchingUrlCount = count;
+			}
+		},
+
 		setActiveEntry(content_id){
 			this.activeEntry = content_id;
 		}
@@ -34,6 +42,7 @@ export default {
     template: /*html*/`
 	<!--<p>CISVUE HEADER</p>
 	<p>active entry content_id : {{activeEntry}}</p>
+	<p>highest count : {{highestMatchingUrlCount}}</p>
 	-->
 	<button id="nav-main-btn" class="navbar-toggler" type="button" data-bs-toggle="offcanvas" data-bs-target="#nav-main" aria-controls="nav-main" aria-expanded="false" aria-label="Toggle navigation">
         <span class="navbar-toggler-icon"></span>
@@ -61,7 +70,7 @@ export default {
 				</ul>
 				<div id="nav-main-menu" class="collapse collapse-horizontal show">
 					<div>
-						<cis-menu-entry @activeEntry="setActiveEntry" :activeContent="activeEntry" v-for="entry in entries" :key="entry.content_id" :entry="entry" />
+						<cis-menu-entry @UrlCount="checkHighestMatchingUrlCount" @activeEntry="setActiveEntry" :highestMatchingUrlCount="highestMatchingUrlCount" :activeContent="activeEntry" v-for="entry in entries" :key="entry.content_id" :entry="entry" />
 					</div>
 				</div>
 			</div>
diff --git a/public/js/components/Cis/Menu/Entry.js b/public/js/components/Cis/Menu/Entry.js
index 4e659329b..062c63e89 100755
--- a/public/js/components/Cis/Menu/Entry.js
+++ b/public/js/components/Cis/Menu/Entry.js
@@ -6,16 +6,29 @@ export default {
             type: Number,
             default: 1
         },
-		activeContent: String
+		activeContent: String,
+		highestMatchingUrlCount: Number,
     },
     data: () => {
         return {
             collapse: null,
+			urlCount:0,
         }
     },
-	emits: ["activeEntry"],
+	emits: ["activeEntry", "UrlCount"],
 	watch:{
-
+		highestMatchingUrlCount: function(newValue)
+		{
+			// if this entry has the most matching url parts then it should be active
+			if (newValue == this.urlCount)
+			{
+				this.entry.menu_open = true;
+			}
+			else
+			{
+				this.entry.menu_open = false;
+			}
+		},
 		activeContent: function(newValue){
 			if(newValue == this.entry.content_id){
 				// wenn der Menupunkt nicht bereits offen ist
@@ -104,7 +117,31 @@ export default {
         }
     },
     methods: {
+		passUrlCount(count){
+			this.$emit("UrlCount",count);
+		},
+		getUrlMatchPoints(url,link){
+			let splitted_link = link.split('/');
+			let splitted_url = url.href.split('/');
+
+			let count = 0;
+
+			for(let part_url of splitted_url)
+			{
+				for (let part_link of splitted_link)
+				{
+					if(part_url == part_link)
+					{
+						count++;
+					}
+				}
+			}
+			this.urlCount = count;
+			this.$emit("UrlCount",count);
+		},
 		checkActiveUrl(url){
+			this.getUrlMatchPoints(url,this.link);
+			
 			let url_hash_spaceSymbol_regex = new RegExp("%20","gi");
 			let url_hash_sharpSymbol_regex = new RegExp("^#");
 			let url_hash = url.hash;
@@ -167,6 +204,7 @@ export default {
 	<!-- DEBUGGIING PRINTS
 	<p>entry content_id: {{JSON.stringify(entry.content_id,null,2)}}</p>
 	<p>entry menu: {{JSON.stringify(entry.menu_open,null,2)}}</p>
+	<p>highest count : {{urlCount}}</p>
 	-->
 	<div v-if="entry.template_kurzbz == 'include'">
         INCLUDE
@@ -192,7 +230,7 @@ export default {
             </div>
             <ul ref="children"
                 class="nav w-100 collapse">
-                <cis-menu-entry @activeEntry="resendEmit" :activeContent="activeContent" v-for="child in entry.childs" :key="child" :entry="child" :level="level + 1"/>
+                <cis-menu-entry @UrlCount="passUrlCount" @activeEntry="resendEmit" :activeContent="activeContent" v-for="child in entry.childs" :key="child" :entry="child" :level="level + 1"/>
             </ul>
         </template>
         <a v-else

From ed6eb18c4d6fc47cb1dc2c0c271fe4f3f07c2796 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 2 Oct 2024 18:04:30 +0200
Subject: [PATCH 1271/1461] fetch termine from vw_stundenplan, not
 tbl_stundenplan; LE_ID DD chagned to refs (WIP MA_UID DD & Termin DD);
 removed console.logs(); fhcAlert fix; now find closest termin with absolute
 value of timeDiff;

---
 public/js/plugin/FhcAlert.js | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/public/js/plugin/FhcAlert.js b/public/js/plugin/FhcAlert.js
index 6266512a0..2f3d8974a 100644
--- a/public/js/plugin/FhcAlert.js
+++ b/public/js/plugin/FhcAlert.js
@@ -208,22 +208,30 @@ export default {
 				helperAppInstance.$refs.alert.add({ severity: 'error', summary: 'Systemfehler', detail: message});
 			},
 			confirmDelete() {
-				return confirm({
-					group: 'fhcAlertConfirm',
-					header: 'Achtung',
-					message: 'Möchten Sie sicher löschen?',
-					acceptLabel: 'Löschen',
-					acceptClass: 'btn btn-danger',
-					rejectLabel: 'Abbrechen',
-					rejectClass: 'btn btn-outline-secondary',
-				})
+				return new Promise((resolve, reject) => {
+					helperAppInstance.$confirm.require({
+						group: 'fhcAlertConfirm',
+						header: 'Achtung',
+						message: 'Möchten Sie sicher löschen?',
+						acceptLabel: 'Löschen',
+						acceptClass: 'btn btn-danger',
+						rejectLabel: 'Abbrechen',
+						rejectClass: 'btn btn-outline-secondary',
+						accept() {
+							resolve(true);
+						},
+						reject() {
+							resolve(false);
+						},
+					});
+				});
 			},
 			confirm(options) {
 				return new Promise((resolve, reject) => {
 					helperAppInstance.$confirm.require({
 						group: options?.group ?? 'fhcAlertConfirm',
 						header: options?.header ?? 'Achtung',
-						message: options?.message ?? 'Möchten',
+						message: options?.message ?? '',
 						acceptLabel: options?.acceptLabel ?? 'Ok',
 						acceptClass: options?.acceptClass ?? 'btn btn-primary',
 						rejectLabel: options?.rejectLabel ?? 'Abbrechen',
@@ -406,4 +414,4 @@ export default {
 		};
 		app.config.globalProperties.$fhcAlert = $fhcAlert;
 	}
-}
+}
\ No newline at end of file

From dbf59358971684c48b103adc48f4bc5197cf20f0 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 3 Oct 2024 11:14:52 +0200
Subject: [PATCH 1272/1461] check correct grund phrase to trigger unruly api
 request;

---
 public/js/api/checkperson.js                                  | 1 -
 public/js/components/Studierendenantrag/Form/AbmeldungStgl.js | 4 ++--
 system/phrasesupdate.php                                      | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/public/js/api/checkperson.js b/public/js/api/checkperson.js
index 9cd85840a..7cad23c3d 100644
--- a/public/js/api/checkperson.js
+++ b/public/js/api/checkperson.js
@@ -15,7 +15,6 @@ export default {
 		try {
 			const url = base + '/api/frontend/v1/checkperson/CheckPerson/filterPerson';
 			return axios.post(url, payload)
-			// return this.$fhcApi.post(url, payload, null);
 		} catch (error) {
 			throw error;
 		}
diff --git a/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js b/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
index ca3bb9fbc..2dfd2a5e4 100644
--- a/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
+++ b/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
@@ -125,7 +125,7 @@ export default {
 	},
 	watch: {
 		'formData.grund'(newVal) {
-			this.unrulyInternal = (newVal === this.$p.t('studierendenantrag', 'mark_person_as_unruly'))
+			this.unrulyInternal = (newVal === this.$p.t('studierendenantrag', 'textLong_unruly'))
 		}
 	},
 	template: `
@@ -190,7 +190,7 @@ export default {
 							</option>					
 							<option value="textLong_MissingZgv">{{$p.t('studierendenantrag', 'dropdown_MissingZgv')}}
 							</option>	
-							<option value="textLong_unruly">{{$p.t('studierendenantrag', 'mark_person_as_unruly')}}
+							<option value="textLong_unruly">{{$p.t('studierendenantrag', 'dropdown_unruly')}}
 							</option>						
 						</select>	
 					</div>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index fce61b736..8f1d2c491 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -23414,7 +23414,7 @@ array(
 	array(
 		'app' => 'core',
 		'category' => 'studierendenantrag',
-		'phrase' => 'mark_person_as_unruly',
+		'phrase' => 'dropdown_unruly',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(

From 9dbb5291f42ebcfe46ff62f75469ea623a503da7 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Thu, 3 Oct 2024 11:17:09 +0200
Subject: [PATCH 1273/1461] - added limit

---
 application/models/system/Recipient_model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/models/system/Recipient_model.php b/application/models/system/Recipient_model.php
index d74d03243..1c7811f93 100644
--- a/application/models/system/Recipient_model.php
+++ b/application/models/system/Recipient_model.php
@@ -327,7 +327,7 @@ class Recipient_model extends DB_Model
 						pr.nachname,
 						ms.person_id,
 						mrou.token
-			  ORDER BY sent DESC';
+			  ORDER BY sent DESC LIMIT 1500';
 
 		return $this->execQuery($sql, array($person_id, $functions, $person_id));
 	}

From a9d0f177dad639ea4dd4f8c6c3c0d9002c827358 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 3 Oct 2024 13:25:02 +0200
Subject: [PATCH 1274/1461] remove unused unruly code;

---
 .../controllers/api/frontend/v1/studstatus/Abmeldung.php      | 3 +--
 application/controllers/lehre/Studierendenantrag.php          | 4 +---
 public/js/components/Studierendenantrag/Antrag.js             | 4 +---
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/application/controllers/api/frontend/v1/studstatus/Abmeldung.php b/application/controllers/api/frontend/v1/studstatus/Abmeldung.php
index 87fec9918..aada1f436 100644
--- a/application/controllers/api/frontend/v1/studstatus/Abmeldung.php
+++ b/application/controllers/api/frontend/v1/studstatus/Abmeldung.php
@@ -136,7 +136,6 @@ class Abmeldung extends FHCAPI_Controller
 		$grund = $this->input->post('grund');
 		$studiensemester = $this->input->post('studiensemester');
 		$prestudent_id = $this->input->post('prestudent_id');
-		$unruly = $this->input->post('unruly');
 
 		$result = $this->antraglib->getPrestudentAbmeldeBerechtigt($prestudent_id);
 		$result = $this->getDataOrTerminateWithError($result);
@@ -147,7 +146,7 @@ class Abmeldung extends FHCAPI_Controller
 		elseif ($result < 0)
 			$this->terminateWithError($this->p->t('studierendenantrag', 'error_antrag_exists'), self::ERROR_TYPE_GENERAL);
 
-		$result = $this->antraglib->createAbmeldung($prestudent_id, $studiensemester, getAuthUID(), $grund, $unruly);
+		$result = $this->antraglib->createAbmeldung($prestudent_id, $studiensemester, getAuthUID(), $grund);
 		$data = $this->getDataOrTerminateWithError($result);
 
 		$result = $this->antraglib->getDetailsForAntrag($data);
diff --git a/application/controllers/lehre/Studierendenantrag.php b/application/controllers/lehre/Studierendenantrag.php
index 3baf30355..107c9af96 100644
--- a/application/controllers/lehre/Studierendenantrag.php
+++ b/application/controllers/lehre/Studierendenantrag.php
@@ -103,13 +103,11 @@ class Studierendenantrag extends FHC_Controller
 
 	public function abmeldungstgl($prestudent_id, $studierendenantrag_id = null)
 	{
-		$unruly = getData($this->PersonModel->loadPrestudent($prestudent_id))[0]->unruly;
 
 		$this->load->view('lehre/Antrag/Create', [
 			'prestudent_id' => $prestudent_id,
 			'studierendenantrag_id' => $studierendenantrag_id,
-			'antrag_type' => 'AbmeldungStgl',
-			'unruly' => $unruly
+			'antrag_type' => 'AbmeldungStgl'
 		]);
 	}
 
diff --git a/public/js/components/Studierendenantrag/Antrag.js b/public/js/components/Studierendenantrag/Antrag.js
index 37de9314d..b04801075 100644
--- a/public/js/components/Studierendenantrag/Antrag.js
+++ b/public/js/components/Studierendenantrag/Antrag.js
@@ -21,8 +21,7 @@ export default {
 		studierendenantragId: Number,
 		infoArray: Array,
 		statusMsg: String,
-		statusSeverity: String,
-		unruly: Boolean
+		statusSeverity: String
 	},
 	data() {
 		return {
@@ -50,7 +49,6 @@ export default {
 			v-model:status="status"
 			:prestudent-id="prestudentId"
 			:studierendenantrag-id="studierendenantragId"
-			:unruly="unruly"
 			@setInfos="$emit('update:infoArray', $event)"
 			@setStatus="$emit('update:statusMsg', $event.msg);$emit('update:statusSeverity', $event.severity)"
 			>

From 772fe616ff88597dbd6d206a31ff0722c73b2496 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 3 Oct 2024 13:27:05 +0200
Subject: [PATCH 1275/1461] remove unused unruly code nr2;

---
 application/views/lehre/Antrag/Create.php                    | 1 -
 .../js/components/Studierendenantrag/Form/AbmeldungStgl.js   | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/application/views/lehre/Antrag/Create.php b/application/views/lehre/Antrag/Create.php
index f4a7d1c3c..7e8bda874 100644
--- a/application/views/lehre/Antrag/Create.php
+++ b/application/views/lehre/Antrag/Create.php
@@ -35,7 +35,6 @@ $this->load->view(
 				:prestudent-id="<?= $prestudent_id; ?>"
 				antrag-type="<?= $antrag_type; ?>"
 				:studierendenantrag-id="<?= $studierendenantrag_id ?: 'undefined'; ?>"
-				:unruly="<?php echo json_encode($unruly) ?>"
 				v-model:info-array="infoArray"
 				v-model:status-msg="status.msg"
 				v-model:status-severity="status.severity"
diff --git a/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js b/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
index 2dfd2a5e4..c804b20d1 100644
--- a/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
+++ b/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
@@ -18,8 +18,7 @@ export default {
 	],
 	props: {
 		prestudentId: Number,
-		studierendenantragId: Number,
-		unruly: Boolean
+		studierendenantragId: Number
 	},
 	data() {
 		return {
@@ -28,7 +27,7 @@ export default {
 			formData: {
 				grund: ''
 			},
-			unrulyInternal: this.unruly
+			unrulyInternal: false
 		}
 	},
 	computed: {

From 25a64cbcaed86a888f2b3c95ac8ab08883e77bfd Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 4 Oct 2024 12:04:54 +0200
Subject: [PATCH 1276/1461] fixes cis4 Menu for longest matching urls

---
 public/js/components/Cis/Menu/Entry.js | 13 +++----
 system/dbupdate_3.4/25999_C4_Menu.php  | 50 ++++++++++++++++++++++++--
 2 files changed, 53 insertions(+), 10 deletions(-)

diff --git a/public/js/components/Cis/Menu/Entry.js b/public/js/components/Cis/Menu/Entry.js
index 062c63e89..8d8a7770d 100755
--- a/public/js/components/Cis/Menu/Entry.js
+++ b/public/js/components/Cis/Menu/Entry.js
@@ -20,13 +20,9 @@ export default {
 		highestMatchingUrlCount: function(newValue)
 		{
 			// if this entry has the most matching url parts then it should be active
-			if (newValue == this.urlCount)
+			if (this.activeContent == null && newValue == this.urlCount)
 			{
-				this.entry.menu_open = true;
-			}
-			else
-			{
-				this.entry.menu_open = false;
+				this.$emit("activeEntry", this.entry.content_id);
 			}
 		},
 		activeContent: function(newValue){
@@ -55,7 +51,8 @@ export default {
 				// only invokes .hide if this.collapse is not null
 				this.collapse && this.collapse.hide();
 			}
-			// debugging helpers - console.log(this.entry.titel,newValue?"open":"close")
+			// debugging helpers - console.log(this.entry.titel, newValue ? "open" : "close")
+			
 		},
 	},
 		
@@ -230,7 +227,7 @@ export default {
             </div>
             <ul ref="children"
                 class="nav w-100 collapse">
-                <cis-menu-entry @UrlCount="passUrlCount" @activeEntry="resendEmit" :activeContent="activeContent" v-for="child in entry.childs" :key="child" :entry="child" :level="level + 1"/>
+                <cis-menu-entry @UrlCount="passUrlCount" :highestMatchingUrlCount="highestMatchingUrlCount" @activeEntry="resendEmit" :activeContent="activeContent" v-for="child in entry.childs" :key="child" :entry="child" :level="level + 1"/>
             </ul>
         </template>
         <a v-else
diff --git a/system/dbupdate_3.4/25999_C4_Menu.php b/system/dbupdate_3.4/25999_C4_Menu.php
index 0e1ab3339..624eb60d6 100755
--- a/system/dbupdate_3.4/25999_C4_Menu.php
+++ b/system/dbupdate_3.4/25999_C4_Menu.php
@@ -36,6 +36,15 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					'redirect','etw',NOW(),null,null,null,TRUE,FALSE,'MEIN_STUDIUM'
 				);
 
+				-- VPN_STUDIERENDE
+
+				INSERT INTO campus.tbl_content 
+				(template_kurzbz, oe_kurzbz, insertamum, insertvon, updateamum, updatevon, aktiv, menu_open, beschreibung)
+				VALUES  
+				(
+					'redirect','etw',NOW(),null,null,null,TRUE,FALSE,'VPN_STUDIERENDE'
+				);
+
 				-- PROFIL
 
 				INSERT INTO campus.tbl_content 
@@ -136,6 +145,20 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					null,null,null,null,NOW(),null,'Mein Studium',null
 				);
 
+				-- VPN_STUDIERENDE
+
+				INSERT INTO campus.tbl_contentsprache 
+				(sprache, content_id, version, sichtbar, content, reviewvon, reviewamum, updateamum, updatevon, insertamum, insertvon, titel, gesperrt_uid)
+				VALUES  
+				(
+					'German',
+					-- queries the content_id for the VPN_STUDIERENDE
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'VPN_STUDIERENDE'),
+					1,TRUE,
+					'<content><url><![CDATA[#VPN]]></url><target><![CDATA[_self]]></target></content>',
+					null,null,null,null,NOW(),null,'VPN Neu - Zugang für Student*innen',null
+				);
+
 				-- PROFIL
 
 				INSERT INTO campus.tbl_contentsprache 
@@ -270,8 +293,9 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 				(
 					-- queries the content_id for the CIS4_ROOT
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'CIS4_ROOT'),
-					-- 10882 is the content_id for VPN Neu - Zugang für Student*innen
-					10882, NOW(), null, null, null, 2
+					-- queries the content_id for the VPN_STUDIERENDE
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'VPN_STUDIERENDE'),
+					NOW(), null, null, null, 2
 				);
 
 				INSERT INTO campus.tbl_contentchild
@@ -372,6 +396,28 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					10795, NOW(), null, null, null, 4
 				);
 
+				-- VPN_STUDIERENDE childs
+
+				INSERT INTO campus.tbl_contentchild
+				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
+				VALUES
+				(
+					-- queries the content_id for the MEIN_STUDIUM
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'VPN_STUDIERENDE'),
+					-- 10883 is the content_id for VPN Windows für Student*innen
+					10883, NOW(), null, null, null, 1
+				);
+
+				INSERT INTO campus.tbl_contentchild
+				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
+				VALUES
+				(
+					-- queries the content_id for the MEIN_STUDIUM
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'VPN_STUDIERENDE'),
+					-- 10884 is the content_id for VPN Linux für Student*innen
+					10884, NOW(), null, null, null, 2
+				);
+
 				-- Profil childs
 
 				INSERT INTO campus.tbl_contentchild

From 41a10320f873d41f2b8946edacf11762040983f6 Mon Sep 17 00:00:00 2001
From: kindlm <kindlm@technikum-wien.at>
Date: Fri, 4 Oct 2024 13:51:48 +0200
Subject: [PATCH 1277/1461] =?UTF-8?q?Bugfix=20LV-Teile=20Vorr=C3=BCckung,?=
 =?UTF-8?q?=20wenn=20Von-Semester=20leer?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Umbenennung Lehreinheit in LV-Teil
---
 vilesci/lehre/lehreinheiten_vorrueckung.php | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

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

From e75872adaae595d3ef3f97eee4115583d5550832 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 7 Oct 2024 14:49:02 +0200
Subject: [PATCH 1278/1461] lets the user change the view of the calendar in
 the header with a select and highlights the date fields to change the view of
 the current calendar

---
 public/css/components/calendar.css          | 11 ++++++
 public/js/components/Calendar/Abstract.js   |  2 +-
 public/js/components/Calendar/Calendar.js   |  6 ++--
 public/js/components/Calendar/Header.js     | 38 ++++++++++++++++-----
 public/js/components/Calendar/Month.js      |  4 +--
 public/js/components/Calendar/Month/Page.js |  4 +--
 public/js/components/Calendar/Months.js     |  4 +--
 public/js/components/Calendar/Week.js       |  4 +--
 public/js/components/Calendar/Week/Page.js  |  8 ++---
 public/js/components/Calendar/Weeks.js      |  4 +--
 public/js/components/Calendar/Years.js      |  4 +--
 public/js/components/Calendar/Years/Page.js |  4 +--
 12 files changed, 64 insertions(+), 29 deletions(-)

diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index 3bd0b1f15..fed873a31 100755
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -2,6 +2,10 @@
   background-color: #e9ecef;
 }
 
+.fhc-calendar-week-page-header > div:hover{
+	background-color: #dddfe2;
+}
+
 .fhc-calendar-months .col-4,
 .fhc-calendar-years .col-4 {
   padding: 0.1875em 0;
@@ -117,6 +121,13 @@
   align-items: center;
   justify-content: end;
 }
+
+.fhc-calendar-month-page-weekday:hover {
+	background-color:#37789c;
+	color:white;
+	
+}
+
 .fhc-calendar-sm .fhc-calendar-month-page-day,
 .fhc-calendar-xs .fhc-calendar-month-page-day {
   position: relative;
diff --git a/public/js/components/Calendar/Abstract.js b/public/js/components/Calendar/Abstract.js
index 94af02091..54b0304c7 100755
--- a/public/js/components/Calendar/Abstract.js
+++ b/public/js/components/Calendar/Abstract.js
@@ -10,7 +10,7 @@ export default {
 		'size'
 	],
 	emits: [
-		'update:mode',
+		'updateMode',
 		'change:range',
 		'input'
 	]
diff --git a/public/js/components/Calendar/Calendar.js b/public/js/components/Calendar/Calendar.js
index 3cbed11ca..ff6afe4b2 100755
--- a/public/js/components/Calendar/Calendar.js
+++ b/public/js/components/Calendar/Calendar.js
@@ -6,6 +6,7 @@ import CalendarWeeks from './Weeks.js';
 import CalendarMinimized from './Minimized.js';
 import CalendarDate from '../../composables/CalendarDate.js';
 
+
 // TODO(chris): week/month toggle
 
 export default {
@@ -28,7 +29,8 @@ export default {
 			noMonthView: this.noMonthView,
 			noWeekView: this.noWeekView,
 			eventsAreNull: Vue.computed(() => this.events === null),
-			classHeader: this.classHeader
+			classHeader: this.classHeader,
+			mode: Vue.computed(()=>this.mode),
 		};
 	},
 	props: {
@@ -135,7 +137,7 @@ export default {
 	},
 	template: /*html*/`
 	<div ref="container" class="fhc-calendar card" :class="sizeClass">
-		<component v-slot="{event,day}" :is="'calendar-' + mode" @update:mode="mode=$event" @change:range="$emit('change:range',$event)" @input="handleInput" >
+		<component v-slot="{event,day}" :is="'calendar-' + mode" @updateMode="mode = $event" @change:range="$emit('change:range',$event)" @input="handleInput" >
 			<!--Week Page layout-->
 			<slot :event="event" :day="day"></slot>
 		</component>
diff --git a/public/js/components/Calendar/Header.js b/public/js/components/Calendar/Header.js
index 17882aa81..127a2619a 100755
--- a/public/js/components/Calendar/Header.js
+++ b/public/js/components/Calendar/Header.js
@@ -1,13 +1,28 @@
 export default {
+	data(){
+		return{
+			selected: this.mode,
+			modes:{
+				week:"Woche", 
+				weeks:"Kalendarwochen", 
+				month:"Monat", 
+				months:"Monate", 
+				years:"Jahre",
+			},
+		}
+	},
 	inject: [
 		'eventsAreNull',
 		'size',
-		'classHeader'
+		'classHeader',
+		'mode',
+		'updateMode',
 	],
 	props: {
 		title: String
 	},
 	emits: [
+		'updateMode',
 		'prev',
 		'next',
 		'click'
@@ -30,12 +45,19 @@ export default {
 		}
 	},
 	template: `
-	<div class="calendar-header card-header btn-group w-100" :class="classHeader">
-		<button class="btn btn-outline-secondary border-0 flex-grow-0" :class="{'btn-sm':!this.size}" @click="$emit('prev')"><i class="fa fa-chevron-left"></i></button>
-		<button class="btn btn-link link-secondary text-decoration-none" :class="{'btn-sm': !this.size}" @click="$emit('click')">
-			{{ title }}
-			<i v-if="eventsAreNull" class="fa fa-spinner fa-pulse"></i>
-		</button>
-		<button class="btn btn-outline-secondary border-0 flex-grow-0" :class="{'btn-sm': !this.size}" @click="$emit('next')"><i class="fa fa-chevron-right"></i></button>
+	<div class="calendar-header card-header row w-100" :class="classHeader">
+		<button class="btn btn-outline-secondary border-0 col-auto" :class="{'btn-sm':!this.size}" @click="$emit('prev')"><i class="fa fa-chevron-left"></i></button>
+		<div class="col text-center">
+			<div class="d-flex justify-content-center align-items-center">
+				<button class="btn btn-link link-secondary text-decoration-none" :class="{'btn-sm': !this.size}" @click="$emit('click')">
+					{{ title }}
+					<i v-if="eventsAreNull" class="fa fa-spinner fa-pulse"></i>
+				</button>
+				<select class="form-select w-auto" aria-label="Default select example">
+					<option :selected="mode_kurzbz == mode" @click="$emit('updateMode',mode_kurzbz)" v-for="(mode_bezeichnung,mode_kurzbz) in modes">{{mode_bezeichnung}}</option>
+				</select>
+			</div>
+		</div>
+		<button class="col-auto btn btn-outline-secondary border-0" :class="{'btn-sm': !this.size}" @click="$emit('next')"><i class="fa fa-chevron-right"></i></button>
 	</div>`
 }
diff --git a/public/js/components/Calendar/Month.js b/public/js/components/Calendar/Month.js
index a86ce10b6..9d612eeaf 100755
--- a/public/js/components/Calendar/Month.js
+++ b/public/js/components/Calendar/Month.js
@@ -61,9 +61,9 @@ export default {
 	},
 	template: `
 	<div class="fhc-calendar-month">
-		<calendar-header :title="title" @prev="prev" @next="next" @click="$emit('update:mode', 'months')" />
+		<calendar-header :title="title" @prev="prev" @next="next" @updateMode="$emit('updateMode', $event)" @click="$emit('updateMode', 'months')" />
 		<calendar-pane ref="pane" v-slot="slot" @slid="paneChanged">
-			<calendar-month-page :year="focusDate.y" :month="focusDate.m+slot.offset" @update:mode="$emit('update:mode', $event)" @page:back="prev" @page:forward="next" @input="selectDay" />
+			<calendar-month-page :year="focusDate.y" :month="focusDate.m+slot.offset" @updateMode="$emit('updateMode', $event)" @page:back="prev" @page:forward="next" @input="selectDay" />
 		</calendar-pane>
 	</div>`
 }
diff --git a/public/js/components/Calendar/Month/Page.js b/public/js/components/Calendar/Month/Page.js
index a535546fd..f257c442c 100755
--- a/public/js/components/Calendar/Month/Page.js
+++ b/public/js/components/Calendar/Month/Page.js
@@ -14,7 +14,7 @@ export default {
 		month: Number
 	},
 	emits: [
-		'update:mode',
+		'updateMode',
 		'page:back',
 		'page:forward',
 		'input'
@@ -50,7 +50,7 @@ export default {
 			if (!this.noWeekView) {
 				if (!this.focusDate.isInWeek(week.no, week.y))
 					this.focusDate.set(week.days[0]);
-				this.$emit('update:mode', 'week');
+				this.$emit('updateMode', 'week');
 			}
 		}
 	},
diff --git a/public/js/components/Calendar/Months.js b/public/js/components/Calendar/Months.js
index 7dcb96d87..ec61d6de5 100755
--- a/public/js/components/Calendar/Months.js
+++ b/public/js/components/Calendar/Months.js
@@ -22,10 +22,10 @@ export default {
 	},
 	template: `
 	<div class="fhc-calendar-months">
-		<calendar-header :title="title" @prev="focusDate.y--" @next="focusDate.y++" @click="$emit('update:mode', 'years')" />
+		<calendar-header :title="title" @prev="focusDate.y--" @next="focusDate.y++" @click="$emit('updateMode', 'years')" @updateMode="$emit('updateMode', $event)" />
 		<div class="d-flex flex-wrap">
 			<div v-for="(month, key) in months" :key="key" class="d-grid col-4">
-				<button @click="focusDate.m = key; $emit('update:mode', 'month')" class="btn btn-outline-secondary" :class="{'border-0': key != focusDate.m}">
+				<button @click="focusDate.m = key; $emit('updateMode', 'month')" class="btn btn-outline-secondary" :class="{'border-0': key != focusDate.m}">
 					{{month}}
 				</button>
 			</div>
diff --git a/public/js/components/Calendar/Week.js b/public/js/components/Calendar/Week.js
index a6389fe52..f00625a25 100755
--- a/public/js/components/Calendar/Week.js
+++ b/public/js/components/Calendar/Week.js
@@ -40,9 +40,9 @@ export default {
 	},
 	template: `
 	<div class="fhc-calendar-week">
-		<calendar-header :title="title" @prev="prev" @next="next" @click="$emit('update:mode', 'weeks')" />
+		<calendar-header :title="title" @prev="prev" @next="next" @updateMode="$emit('updateMode', $event)" @click="$emit('updateMode', 'weeks')"/>
 		<calendar-pane ref="pane" v-slot="slot" @slid="paneChanged">
-			<calendar-week-page v-slot="{event,day}" :year="focusDate.y" :week="focusDate.w+slot.offset" @update:mode="$emit('update:mode', $event)" @page:back="prev" @page:forward="next" @input="selectEvent" >
+			<calendar-week-page v-slot="{event,day}" :year="focusDate.y" :week="focusDate.w+slot.offset" @updateMode="$emit('updateMode', $event)" @page:back="prev" @page:forward="next" @input="selectEvent" >
 				<slot :event="event" :day="day" ></slot>
 			</calendar-week-page>
 		</calendar-pane>
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index d3059cddf..f2742d1ed 100755
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -16,7 +16,7 @@ export default {
 		week: Number
 	},
 	emits: [
-		'update:mode',
+		'updateMode',
 		'page:back',
 		'page:forward',
 		'input'
@@ -82,7 +82,7 @@ export default {
 			if (!this.noMonthView) {
 				this.date.set(day);
 				this.focusDate.set(day);
-				this.$emit('update:mode', 'month');
+				this.$emit('updateMode', 'month');
 			}
 		},
 		dateToMinutesOfDay(day) {
@@ -97,9 +97,9 @@ export default {
 	
 		<div class="d-flex flex-column border-top">
 			<div class="fhc-calendar-week-page-header border-2 border-bottom text-center d-flex" style="position:sticky; top:0; " >
-				<div v-for="day in days" :key="day" class="flex-grow-1" :title="day.toLocaleString(undefined, {dateStyle:'short'})">
+				<div type="button" v-for="day in days" :key="day" class="test flex-grow-1" :title="day.toLocaleString(undefined, {dateStyle:'short'})" @click.prevent="changeToMonth(day)">
 					<div class="fw-bold">{{day.toLocaleString(undefined, {weekday: size < 2 ? 'narrow' : (size < 3 ? 'short' : 'long')})}}</div>
-					<a href="#" class="small text-secondary text-decoration-none" @click.prevent="changeToMonth(day)">{{day.toLocaleString(undefined, [{day:'numeric',month:'numeric'},{day:'numeric',month:'numeric'},{day:'numeric',month:'numeric'},{dateStyle:'short'}][this.size])}}</a>
+					<a href="#" class="small text-secondary text-decoration-none" >{{day.toLocaleString(undefined, [{day:'numeric',month:'numeric'},{day:'numeric',month:'numeric'},{day:'numeric',month:'numeric'},{dateStyle:'short'}][this.size])}}</a>
 				</div>
 			</div>
 			<div ref="eventcontainer" class="flex-grow-1">
diff --git a/public/js/components/Calendar/Weeks.js b/public/js/components/Calendar/Weeks.js
index 1ec8545bc..6a7c32a58 100755
--- a/public/js/components/Calendar/Weeks.js
+++ b/public/js/components/Calendar/Weeks.js
@@ -22,12 +22,12 @@ export default {
 		setWeek(week) {
 			// TODO(chris): test is there a week jump on year select? => yes there is if the same month/day are in different weeks ... should we prevent that?
 			this.focusDate.w = week;
-			this.$emit('update:mode', 'week');
+			this.$emit('updateMode', 'week');
 		}
 	},
 	template: `
 	<div class="fhc-calendar-weeks">
-		<calendar-header :title="title" @prev="focusDate.y--" @next="focusDate.y++" @click="$emit('update:mode', 'years')" />
+		<calendar-header :title="title" @prev="focusDate.y--" @next="focusDate.y++" @click="$emit('updateMode', 'years')" @updateMode="$emit('updateMode', $event)" />
 		<div class="d-flex flex-wrap">
 			<div v-for="(week, key) in weeks" :key="key" class="d-grid col-2">
 				<button @click="setWeek(week)" class="btn btn-outline-secondary" :class="{'border-0': week != focusDate.w}">
diff --git a/public/js/components/Calendar/Years.js b/public/js/components/Calendar/Years.js
index a372f748d..3edd533c2 100755
--- a/public/js/components/Calendar/Years.js
+++ b/public/js/components/Calendar/Years.js
@@ -51,9 +51,9 @@ export default {
 	},
 	template: `
 	<div class="fhc-calendar-years">
-		<calendar-header :title="title" @prev="prev" @next="next" @click="$emit('update:mode')" />
+		<calendar-header :title="title" @prev="prev" @next="next" @click="$emit('updateMode')" @updateMode="$emit('updateMode')" />
 		<calendar-pane ref="pane" v-slot="slot" @slid="paneChanged">
-			<calendar-years-page :data-test="slot.index" :start="start+range*slot.offset" :end="start+range*slot.offset+range" @update:mode="$emit('update:mode')"/>
+			<calendar-years-page :data-test="slot.index" :start="start+range*slot.offset" :end="start+range*slot.offset+range" @updateMode="$emit('updateMode')"/>
 		</calendar-pane>
 	</div>`
 }
diff --git a/public/js/components/Calendar/Years/Page.js b/public/js/components/Calendar/Years/Page.js
index b65471f82..c6efe0ffc 100755
--- a/public/js/components/Calendar/Years/Page.js
+++ b/public/js/components/Calendar/Years/Page.js
@@ -7,7 +7,7 @@ export default {
 		end: Number
 	},
 	emits: [
-		'update:mode'
+		'updateMode'
 	],
 	data() {
 		return {
@@ -21,7 +21,7 @@ export default {
 	template: `
 	<div class="fhc-calendar-years-page d-flex flex-wrap">
 		<div v-for="year in years" :key="year" class="d-grid col-4">
-			<button class="btn btn-outline-secondary" :class="{'border-0': year != focusDate.y}" @click="focusDate.y = year; $emit('update:mode')">
+			<button class="btn btn-outline-secondary" :class="{'border-0': year != focusDate.y}" @click="focusDate.y = year; $emit('updateMode')">
 				{{year}}
 			</button>
 		</div>

From 008bbedd9857416cc2cf563f4e097111725ec8e4 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 7 Oct 2024 16:22:27 +0200
Subject: [PATCH 1279/1461] phrase

---
 system/phrasesupdate.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 03a14915b..69cb6f56b 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -26095,6 +26095,9 @@ array(
 			)
 		)
 	),
+	//
+	// DIGITALE ANWESENHEITEN PHRASEN BEGIN
+	//
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
@@ -27578,7 +27581,7 @@ array(
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
-		'phrase' => 'anteil',
+		'phrase' => 'anteilAnw',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
@@ -28135,6 +28138,9 @@ array(
 			)
 		)
 	),
+	//
+	// DIGITALE ANWESENHEITEN PHRASEN END
+	//
 	array(
 		'app' => 'core',
 		'category' => 'global',

From 79c8edc6cfb707f140ae78986b54f7dd593e899e Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 8 Oct 2024 13:20:06 +0200
Subject: [PATCH 1280/1461] makes the calendar week mode header align and
 highlights the week or day in the Month view depenedent if there is a week
 view available

---
 public/css/components/calendar.css          |  5 ++++
 public/js/components/Calendar/Header.js     | 26 ++++++++--------
 public/js/components/Calendar/Month/Page.js | 33 +++++++++++++++++----
 public/js/components/Calendar/Week/Page.js  |  4 +--
 4 files changed, 49 insertions(+), 19 deletions(-)

diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index fed873a31..912161097 100755
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -133,6 +133,11 @@
   position: relative;
   aspect-ratio: 1;
 }
+
+.fhc-calendar-month-page-day-highlight {
+	background-color: #f5f5f5;
+}
+
 .fhc-calendar-sm .fhc-calendar-month-page-day.active .no,
 .fhc-calendar-xs .fhc-calendar-month-page-day.active .no {
   background-color: rgba(var(--bs-info-rgb), 0.25);
diff --git a/public/js/components/Calendar/Header.js b/public/js/components/Calendar/Header.js
index 127a2619a..e2f484b28 100755
--- a/public/js/components/Calendar/Header.js
+++ b/public/js/components/Calendar/Header.js
@@ -45,19 +45,21 @@ export default {
 		}
 	},
 	template: `
-	<div class="calendar-header card-header row w-100" :class="classHeader">
-		<button class="btn btn-outline-secondary border-0 col-auto" :class="{'btn-sm':!this.size}" @click="$emit('prev')"><i class="fa fa-chevron-left"></i></button>
-		<div class="col text-center">
-			<div class="d-flex justify-content-center align-items-center">
-				<button class="btn btn-link link-secondary text-decoration-none" :class="{'btn-sm': !this.size}" @click="$emit('click')">
-					{{ title }}
-					<i v-if="eventsAreNull" class="fa fa-spinner fa-pulse"></i>
-				</button>
-				<select class="form-select w-auto" aria-label="Default select example">
-					<option :selected="mode_kurzbz == mode" @click="$emit('updateMode',mode_kurzbz)" v-for="(mode_bezeichnung,mode_kurzbz) in modes">{{mode_bezeichnung}}</option>
-				</select>
+	<div class="calendar-header card-header w-100" :class="classHeader">
+		<div class="row">
+			<button class="btn btn-outline-secondary border-0 col-auto" :class="{'btn-sm':!this.size}" @click="$emit('prev')"><i class="fa fa-chevron-left"></i></button>
+			<div class="col text-center">
+				<div class="d-flex justify-content-center align-items-center">
+					<button class="btn btn-link link-secondary text-decoration-none" :class="{'btn-sm': !this.size}" @click="$emit('click')">
+						{{ title }}
+						<i v-if="eventsAreNull" class="fa fa-spinner fa-pulse"></i>
+					</button>
+					<select class="form-select w-auto" aria-label="Default select example">
+						<option :selected="mode_kurzbz == mode" @click="$emit('updateMode',mode_kurzbz)" v-for="(mode_bezeichnung,mode_kurzbz) in modes">{{mode_bezeichnung}}</option>
+					</select>
+				</div>
 			</div>
+			<button class="col-auto btn btn-outline-secondary border-0" :class="{'btn-sm': !this.size}" @click="$emit('next')"><i class="fa fa-chevron-right"></i></button>
 		</div>
-		<button class="col-auto btn btn-outline-secondary border-0" :class="{'btn-sm': !this.size}" @click="$emit('next')"><i class="fa fa-chevron-right"></i></button>
 	</div>`
 }
diff --git a/public/js/components/Calendar/Month/Page.js b/public/js/components/Calendar/Month/Page.js
index f257c442c..56217ff97 100755
--- a/public/js/components/Calendar/Month/Page.js
+++ b/public/js/components/Calendar/Month/Page.js
@@ -1,13 +1,19 @@
 import CalendarDate from '../../../composables/CalendarDate.js';
 
 export default {
+	data(){
+		return{
+			highlightedWeek: null,
+			highlightedDay: null,
+		}
+	},
 	inject: [
 		'date',
 		'focusDate',
 		'size',
 		'events',
 		'showWeeks',
-		'noWeekView'
+		'noWeekView',
 	],
 	props: {
 		year: Number,
@@ -24,11 +30,12 @@ export default {
 			let firstDayOfMonth = new CalendarDate(this.year, this.month, 1);
 			let startDay = firstDayOfMonth.firstDayOfCalendarMonth;
 			let endDay = firstDayOfMonth.lastDayOfCalendarMonth;
-
+			
 			let res = [];
 			let week = {no:0,y:0,days:[]};
 			while (startDay <= endDay) {
 				week.days.push(new Date(startDay));
+				
 				if (week.days.length == 7) {
 					let d = new CalendarDate(week.days[res.length ? 0 : 6]);
 					week.no = d.w;
@@ -39,7 +46,8 @@ export default {
 				startDay.setDate(startDay.getDate() + 1);
 			}
 			return res;
-		}
+		},
+		
 	},
 	methods: {
 		selectDay(day) {
@@ -52,17 +60,32 @@ export default {
 					this.focusDate.set(week.days[0]);
 				this.$emit('updateMode', 'week');
 			}
+		},
+		highlight(week, day){
+			this.highlightedWeek = week.no; 
+			this.highlightedDay = day;
+		},
+		isHighlighted(week, day) {
+			return this.noWeekView ? day == this.highlightedDay : week.no == this.highlightedWeek;
+		},
+		clickEvent(day,week) {
+			if(this.noWeekView){
+				this.selectDay(day);
+			}else{
+				this.changeToWeek(week);
+			}
 		}
 	},
 	template: `
+	<p>{{minimized}}</p>
 	<div class="fhc-calendar-month-page" :class="{'show-weeks': showWeeks}">
-		<div v-if="showWeeks" class="bg-light fw-bold border-top border-bottom text-center"></div>
+		<div v-if="showWeeks" class=" bg-light fw-bold border-top border-bottom text-center"></div>
 		<div v-for="day in weeks[0].days" :key="day" class="bg-light fw-bold border-top border-bottom text-center">
 			{{day.toLocaleString(undefined, {weekday: size < 1 ? 'narrow' : (size < 3 ? 'short' : 'long')})}}
 		</div>
 		<template v-for="week in weeks" :key="week.no">
 			<a href="#" v-if="showWeeks" class="fhc-calendar-month-page-weekday text-decoration-none text-end opacity-25" @click.prevent="changeToWeek(week)">{{week.no}}</a>
-			<a href="#" v-for="day in week.days" :key="day" class="fhc-calendar-month-page-day text-decoration-none overflow-hidden" :class="{active:date.compare(day),'opacity-50':day.getMonth() != month}" @click.prevent="selectDay(day)">
+			<a href="#" @click.prevent="clickEvent(day,week)" @mouseover="highlight(week,day)" @mouseleave="highlightedWeek = null; highlightedDay = null" v-for="day in week.days" :key="day" :class="{'fhc-calendar-month-page-day-highlight': isHighlighted(week, day)}" class="fhc-calendar-month-page-day text-decoration-none overflow-hidden" :class="{active:date.compare(day),'opacity-50':day.getMonth() != month}" >
 				<span class="no">{{day.getDate()}}</span>
 				<span v-if="events[day.toDateString()] && events[day.toDateString()].length" class="events">
 					<span v-for="event in events[day.toDateString()]" :key="event.id" style="color:white" :style="{'background-color': event.color}">
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index f2742d1ed..7a2d5c509 100755
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -96,8 +96,8 @@ export default {
 	<div class="fhc-calendar-week-page">
 	
 		<div class="d-flex flex-column border-top">
-			<div class="fhc-calendar-week-page-header border-2 border-bottom text-center d-flex" style="position:sticky; top:0; " >
-				<div type="button" v-for="day in days" :key="day" class="test flex-grow-1" :title="day.toLocaleString(undefined, {dateStyle:'short'})" @click.prevent="changeToMonth(day)">
+			<div class="fhc-calendar-week-page-header d-grid border-2 border-bottom text-center" :style="{'grid-template-columns': 'repeat(' + days.length + ', 1fr)', 'grid-template-rows':1}" style="position:sticky; top:0; " >
+				<div type="button" v-for="day in days" :key="day" class="flex-grow-1" :title="day.toLocaleString(undefined, {dateStyle:'short'})" @click.prevent="changeToMonth(day)">
 					<div class="fw-bold">{{day.toLocaleString(undefined, {weekday: size < 2 ? 'narrow' : (size < 3 ? 'short' : 'long')})}}</div>
 					<a href="#" class="small text-secondary text-decoration-none" >{{day.toLocaleString(undefined, [{day:'numeric',month:'numeric'},{day:'numeric',month:'numeric'},{day:'numeric',month:'numeric'},{dateStyle:'short'}][this.size])}}</a>
 				</div>

From ebebf8af6dcbd474a5ba23bbc649afa5060c932f Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 8 Oct 2024 13:29:43 +0200
Subject: [PATCH 1281/1461] changes calendar mode to button-group instead of
 select

---
 public/js/components/Calendar/Header.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/public/js/components/Calendar/Header.js b/public/js/components/Calendar/Header.js
index e2f484b28..663833aef 100755
--- a/public/js/components/Calendar/Header.js
+++ b/public/js/components/Calendar/Header.js
@@ -4,9 +4,7 @@ export default {
 			selected: this.mode,
 			modes:{
 				week:"Woche", 
-				weeks:"Kalendarwochen", 
 				month:"Monat", 
-				months:"Monate", 
 				years:"Jahre",
 			},
 		}
@@ -54,12 +52,16 @@ export default {
 						{{ title }}
 						<i v-if="eventsAreNull" class="fa fa-spinner fa-pulse"></i>
 					</button>
-					<select class="form-select w-auto" aria-label="Default select example">
-						<option :selected="mode_kurzbz == mode" @click="$emit('updateMode',mode_kurzbz)" v-for="(mode_bezeichnung,mode_kurzbz) in modes">{{mode_bezeichnung}}</option>
-					</select>
 				</div>
 			</div>
 			<button class="col-auto btn btn-outline-secondary border-0" :class="{'btn-sm': !this.size}" @click="$emit('next')"><i class="fa fa-chevron-right"></i></button>
 		</div>
+		<div class="row justify-content-center">
+			<div class="col-auto">
+				<div class="btn-group" role="group" aria-label="Kalender Modus">
+					<button type="button" :class="{'active':mode_kurzbz == mode}" @click.prevent="$emit('updateMode',mode_kurzbz)" class="btn btn-outline-secondary" v-for="(mode_bezeichnung,mode_kurzbz) in modes">{{mode_bezeichnung}}</button>
+				</div>
+			</div>
+		</div>
 	</div>`
 }

From 45ff06737911a23e8ca1b96c07a3b3efea517561 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 8 Oct 2024 13:47:48 +0200
Subject: [PATCH 1282/1461] makes the url match to the Menu entries better

---
 public/js/components/Cis/Menu.js | 42 ++++++++++++++++++++------------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js
index 92e189af3..9608bc9de 100755
--- a/public/js/components/Cis/Menu.js
+++ b/public/js/components/Cis/Menu.js
@@ -21,15 +21,25 @@ export default {
             entries: [],
 			activeEntry:null,
 			url:null,
-			highestMatchingUrlCount:0,
+			urlMatchRankings:[],
         };
     },
-	methods:{
-		checkHighestMatchingUrlCount(count){
-			if(count > this.highestMatchingUrlCount)
-			{
-				this.highestMatchingUrlCount = count;
+	computed:{
+		highestMatchingUrlCount(){
+			// gets the hightest ranking inside the array
+			let highestMatch = Math.max(...this.urlMatchRankings);
+
+			if(this.urlMatchRankings.length > 0){
+				// if more than one entry has the same ranking, none should be active
+				return this.urlMatchRankings.filter((value)=>value == highestMatch).length > 1 ? null : highestMatch;
 			}
+
+			return null;
+		},
+	},
+	methods:{
+		addUrlCount(count){
+			this.urlMatchRankings.push(count);
 		},
 
 		setActiveEntry(content_id){
@@ -51,6 +61,15 @@ export default {
     <a id="nav-logo" :href="rootUrl">
         <img :src="logoUrl" alt="Logo">
     </a>
+	<button id="nav-user-btn" class="btn btn-link rounded-0" type="button" data-bs-toggle="collapse" data-bs-target="#nav-user-menu" aria-expanded="false" aria-controls="nav-user-menu">
+		<img :src="avatarUrl" class="avatar rounded-circle"/>
+	</button>
+	<ul id="nav-user-menu" class="collapse list-unstyled" aria-labelledby="nav-user-btn">
+		<li><a class="btn btn-level-2 rounded-0 d-block" href="#" id="menu-profil">Profil</a></li>
+		<li><a class="btn btn-level-2 rounded-0 d-block" href="#">Ampeln</a></li>
+		<li><hr class="dropdown-divider"></li>
+		<li><a class="btn btn-level-2 rounded-0 d-block" :href="logoutUrl">Logout</a></li>
+	</ul>
     <nav id="nav-main" class="offcanvas offcanvas-start bg-dark" tabindex="-1" aria-labelledby="nav-main-btn" data-bs-backdrop="false">
 		<div id="nav-main-sticky">
 			<div id="nav-main-toggle" class="position-static d-none d-lg-block bg-dark">
@@ -59,18 +78,9 @@ export default {
 				</button>
 			</div>
 			<div class="offcanvas-body p-0">
-				<button id="nav-user-btn" class="btn btn-link rounded-0" type="button" data-bs-toggle="collapse" data-bs-target="#nav-user-menu" aria-expanded="false" aria-controls="nav-user-menu">
-					<img :src="avatarUrl" class="avatar rounded-circle"/>
-				</button>
-				<ul id="nav-user-menu" class="collapse list-unstyled" aria-labelledby="nav-user-btn">
-					<li><a class="btn btn-level-2 rounded-0 d-block" href="#" id="menu-profil">Profil</a></li>
-					<li><a class="btn btn-level-2 rounded-0 d-block" href="#">Ampeln</a></li>
-					<li><hr class="dropdown-divider"></li>
-					<li><a class="btn btn-level-2 rounded-0 d-block" :href="logoutUrl">Logout</a></li>
-				</ul>
 				<div id="nav-main-menu" class="collapse collapse-horizontal show">
 					<div>
-						<cis-menu-entry @UrlCount="checkHighestMatchingUrlCount" @activeEntry="setActiveEntry" :highestMatchingUrlCount="highestMatchingUrlCount" :activeContent="activeEntry" v-for="entry in entries" :key="entry.content_id" :entry="entry" />
+						<cis-menu-entry @UrlCount="addUrlCount" @activeEntry="setActiveEntry" :highestMatchingUrlCount="highestMatchingUrlCount" :activeContent="activeEntry" v-for="entry in entries" :key="entry.content_id" :entry="entry" />
 					</div>
 				</div>
 			</div>

From 4d50d4380b9940b741a07f67b01f731fae512b0a Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 8 Oct 2024 13:54:58 +0200
Subject: [PATCH 1283/1461] little bug fix

---
 public/js/components/Calendar/Month/Page.js | 1 -
 public/js/components/Calendar/Years.js      | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/public/js/components/Calendar/Month/Page.js b/public/js/components/Calendar/Month/Page.js
index 56217ff97..1a6fadbb9 100755
--- a/public/js/components/Calendar/Month/Page.js
+++ b/public/js/components/Calendar/Month/Page.js
@@ -77,7 +77,6 @@ export default {
 		}
 	},
 	template: `
-	<p>{{minimized}}</p>
 	<div class="fhc-calendar-month-page" :class="{'show-weeks': showWeeks}">
 		<div v-if="showWeeks" class=" bg-light fw-bold border-top border-bottom text-center"></div>
 		<div v-for="day in weeks[0].days" :key="day" class="bg-light fw-bold border-top border-bottom text-center">
diff --git a/public/js/components/Calendar/Years.js b/public/js/components/Calendar/Years.js
index 3edd533c2..6cda6cfe9 100755
--- a/public/js/components/Calendar/Years.js
+++ b/public/js/components/Calendar/Years.js
@@ -51,7 +51,7 @@ export default {
 	},
 	template: `
 	<div class="fhc-calendar-years">
-		<calendar-header :title="title" @prev="prev" @next="next" @click="$emit('updateMode')" @updateMode="$emit('updateMode')" />
+		<calendar-header :title="title" @prev="prev" @next="next" @updateMode="$emit('updateMode', $event)" />
 		<calendar-pane ref="pane" v-slot="slot" @slid="paneChanged">
 			<calendar-years-page :data-test="slot.index" :start="start+range*slot.offset" :end="start+range*slot.offset+range" @updateMode="$emit('updateMode')"/>
 		</calendar-pane>

From 455d154b6317808531270d893e5cf52b6daa3c8e Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 8 Oct 2024 16:19:57 +0200
Subject: [PATCH 1284/1461] =?UTF-8?q?recht=20lehre/lehrveranstaltung=20sta?=
 =?UTF-8?q?tt=20basis/vilesci,=20schriftgr=C3=B6=C3=9Fe=20verkleinern,=20m?=
 =?UTF-8?q?enuepunkt=20in=20vilesci,=20headerfilter=20angepasst?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lehre/lvplanung/LvTemplateUebersicht.php  |  2 +-
 .../lehre/lvplanung/lvTemplateUebersicht.php  |  5 ++-
 include/tw/vilesci_menu_main.inc.php          |  1 +
 public/css/lvTemplateUebersicht.css           |  3 ++
 .../lehre/lvplanung/LvTemplateUebersicht.js   | 45 +++++++++++++++++--
 5 files changed, 51 insertions(+), 5 deletions(-)
 create mode 100644 public/css/lvTemplateUebersicht.css

diff --git a/application/controllers/lehre/lvplanung/LvTemplateUebersicht.php b/application/controllers/lehre/lvplanung/LvTemplateUebersicht.php
index eb01d90c8..b1ab2fe26 100644
--- a/application/controllers/lehre/lvplanung/LvTemplateUebersicht.php
+++ b/application/controllers/lehre/lvplanung/LvTemplateUebersicht.php
@@ -8,7 +8,7 @@ class LvTemplateUebersicht extends Auth_Controller
 		// Set required permissions
 		parent::__construct(
 			array(
-				'index' => 'basis/vilesci:rw',
+				'index' => 'lehre/lehrveranstaltung:rw',
 			)
 		);
 
diff --git a/application/views/lehre/lvplanung/lvTemplateUebersicht.php b/application/views/lehre/lvplanung/lvTemplateUebersicht.php
index 54afad0a5..5c873486c 100644
--- a/application/views/lehre/lvplanung/lvTemplateUebersicht.php
+++ b/application/views/lehre/lvplanung/lvTemplateUebersicht.php
@@ -10,7 +10,10 @@ $includesArray = array(
 	'navigationcomponent' => true,
 	'filtercomponent' => true,
 	'customJSModules' => array('public/js/apps/lehre/lvplanung/LvTemplates.js'),
-	'customCSSs' => array('public/css/Fhc.css')
+	'customCSSs' => array(
+	    'public/css/Fhc.css',
+	    'public/css/lvTemplateUebersicht.css'
+	)
 );
 
 $this->load->view('templates/FHC-Header', $includesArray);
diff --git a/include/tw/vilesci_menu_main.inc.php b/include/tw/vilesci_menu_main.inc.php
index 2aa2e67d3..2a1ca74ae 100644
--- a/include/tw/vilesci_menu_main.inc.php
+++ b/include/tw/vilesci_menu_main.inc.php
@@ -70,6 +70,7 @@ $menu=array
 		'link'=>'left.php?categorie=Lehre', 'target'=>'nav',
 		'Gruppenverwaltung'=>array('name'=>'Gruppen', 'permissions'=>array('admin','lv-plan','support','lehre/gruppe'), 'link'=>'stammdaten/lvbgruppenverwaltung.php', 'target'=>'main'),
 		'Lehrveranstaltung'=>array('name'=>'Lehrveranstaltung', 'link'=>'lehre/lehrveranstaltung_frameset.html', 'target'=>'main'),
+		'lvTemplateUebersicht'=>array('name'=>'LV-Template Übersicht', 'link'=>'../index.ci.php/lehre/lvplanung/LvTemplateUebersicht', 'target'=>'_blank'),
 		'Studienordnung'=>array('name'=>'Studienordnung', 'link'=>'lehre/studienordnung.php', 'target'=>'_blank','permissions'=>array('lehre/studienordnung')),
 		'StudienplanGueltigkeit'=>array('name'=>'Studienplan Gültigkeit', 'link'=>'lehre/studienplan_gueltigkeit.php', 'target'=>'main','permissions'=>array('lehre/studienordnung')),
 		'StudienplanVorruecken'=>array('name'=>'Studienplan vorrücken', 'link'=>'lehre/studienplan_vorrueckung.php', 'target'=>'main','permissions'=>array('lehre/studienplan')),
diff --git a/public/css/lvTemplateUebersicht.css b/public/css/lvTemplateUebersicht.css
new file mode 100644
index 000000000..af279b8cb
--- /dev/null
+++ b/public/css/lvTemplateUebersicht.css
@@ -0,0 +1,3 @@
+html {
+    font-size: .75em;
+}
\ No newline at end of file
diff --git a/public/js/lehre/lvplanung/LvTemplateUebersicht.js b/public/js/lehre/lvplanung/LvTemplateUebersicht.js
index 414434904..be0da75b8 100644
--- a/public/js/lehre/lvplanung/LvTemplateUebersicht.js
+++ b/public/js/lehre/lvplanung/LvTemplateUebersicht.js
@@ -21,6 +21,45 @@ export default {
 	},
 	computed: {
 		tabulatorOptions() {
+                        const fhcValuesLookup = function(cell) {
+                            var values = {};
+                            const field = cell.getField();
+                            const data = cell.getTable().getData();
+                            const collectvalues = function(rows, field) {
+                                var values = {};
+                                var childvalues = {};
+                                for(const row of rows) {
+                                    const rowvalue = (row[field] !== null) ? row[field] : '';
+                                    values[rowvalue] = rowvalue;
+                                    if(row['_children'] && row['_children'].length > 0) {
+                                      childvalues = collectvalues(row['_children'], field);
+                                      values = {...values, ...childvalues}
+                                    }
+                                }
+                                return values;
+                            }
+                            values = collectvalues(data, field);
+                            const vals = Object.keys(values).sort();
+                            if(vals.indexOf('') === -1) {
+                                vals.unshift('');
+                            }
+                            return vals;
+                        };
+                        const fhctreefilter = function(headerValue, rowValue, rowData, filterParams){
+                            if (rowData['_children'] && rowData['_children'].length > 0) {
+                               for (var i in rowData['_children']) {
+                                  return rowValue == headerValue || 
+                                            fhctreefilter(
+                                                headerValue, 
+                                                rowData['_children'][i][filterParams.field], 
+                                                rowData['_children'][i], 
+                                                filterParams
+                                            );
+                               }
+                            }
+
+                            return rowValue == headerValue;
+                        };
 			const self = this;
 			return {
 				// NOTE: data is set on table built to await preselected actual Studiensemester
@@ -42,11 +81,11 @@ export default {
 				columns: [
 					{title: 'LV-ID', field: 'lehrveranstaltung_id', headerFilter: true, visible: false},
 					{title: 'LV Kurzbz', field: 'kurzbz', headerFilter: true, visible:false, width: 70},
-					{title: 'STG Kurzbz', field: 'stg_typ_kurzbz', headerFilter: true, visible:true, width: 80},
+					{title: 'STG Kurzbz', field: 'stg_typ_kurzbz', headerFilter: "list", headerFilterParams: {valuesLookup: fhcValuesLookup}, headerFilterFunc: fhctreefilter, headerFilterFuncParams: {field: 'stg_typ_kurzbz'}, visible:true, width: 80},
 					{title: 'OrgEinheit', field: 'lv_oe_bezeichnung', headerFilter: true, visible: false, width: 250},
 					{title: 'Lehrtyp Kurzbz', field: 'lehrtyp_kurzbz', headerFilter: true, visible:false, width: 70},
-					{title: 'Studiengangtyp', field: 'stg_typ_bezeichnung', headerFilter: true, width: 150},
-					{title: 'OrgForm', field: 'orgform_kurzbz', headerFilter: true, width: 70},
+					{title: 'Studiengangtyp', field: 'stg_typ_bezeichnung', headerFilter: "list", headerFilterParams: {valuesLookup: fhcValuesLookup}, headerFilterFunc: fhctreefilter, headerFilterFuncParams: {field: 'stg_typ_bezeichnung'}, width: 150},
+					{title: 'OrgForm', field: 'orgform_kurzbz', headerFilter: "list", headerFilterParams: {valuesLookup: fhcValuesLookup}, headerFilterFunc: fhctreefilter, headerFilterFuncParams: {field: 'orgform_kurzbz'}, width: 70},
 					{title: 'Semester', field: 'semester', headerFilter: true, width: 50},
 					{title: 'Lehrveranstaltung', field: 'lv_bezeichnung', headerFilter: true, minWidth: 250},
 					{title: 'Lehrveranstaltung ENG', field: 'bezeichnung_english', headerFilter: true, minWidth: 250},

From 3c4b4b6a5886607e23fbbbddd06c1271a75a09d4 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 8 Oct 2024 16:38:16 +0200
Subject: [PATCH 1285/1461] recht lehre/lehrveranstaltung auch am api endpunkt

---
 .../api/frontend/v1/education/Lehrveranstaltung.php           | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/application/controllers/api/frontend/v1/education/Lehrveranstaltung.php b/application/controllers/api/frontend/v1/education/Lehrveranstaltung.php
index 20e36f461..636c8e3f3 100644
--- a/application/controllers/api/frontend/v1/education/Lehrveranstaltung.php
+++ b/application/controllers/api/frontend/v1/education/Lehrveranstaltung.php
@@ -22,7 +22,9 @@ class Lehrveranstaltung extends FHCAPI_Controller
 	public function __construct()
 	{
 		parent::__construct(array(
-			'getTemplateLvTree' => self::PERM_LOGGED
+			'getTemplateLvTree' => array(
+			    'lehre/lehrveranstaltung:rw'
+			)
 		));
 
 		// Load model LehrveranstaltungModel

From b3258e017c04249d651639646fed7dd7c8f6deff Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 9 Oct 2024 13:14:54 +0200
Subject: [PATCH 1286/1461] add column path_kurzbz to view vw_oe_path

---
 system/dbupdate_3.4/41150_oe-pfad_db_view.php | 32 +++++++++++++------
 1 file changed, 22 insertions(+), 10 deletions(-)

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

From 9ca59f792882ae704a3acaf61f98924c42736bca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Wed, 9 Oct 2024 15:22:41 +0200
Subject: [PATCH 1287/1461] =?UTF-8?q?Paragraph=20Verweis=20korrigiert=20f?=
 =?UTF-8?q?=C3=BCr=20Master=20Plagiatspr=C3=BCfung?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 system/phrasesupdate.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 16631efa8..7ef0269c9 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -9987,13 +9987,13 @@ Any unusual occurrences
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Der Plagiatscheck wurde durchgeführt und bestätigt, dass der zentrale Inhalt der Arbeit im erforderlichen Ausmaß eigenständig verfasst wurde (vgl. Satzungsteil Studienrechtliche Bestimmungen / Prüfungsordnung, § 18 Abs. 2 und 3).',
+				'text' => 'Der Plagiatscheck wurde durchgeführt und bestätigt, dass der zentrale Inhalt der Arbeit im erforderlichen Ausmaß eigenständig verfasst wurde (vgl. Satzungsteil Studienrechtliche Bestimmungen / Prüfungsordnung, § 20 Abs. 2 und 3).',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'The plagiarism check has been carried out and confirms that the central content of the thesis has been written independently to the required extent (cf. part of the Statutes on Studies Act Provisions / Examination Regulations, § 18 Para. 2 and 3).',
+				'text' => 'The plagiarism check has been carried out and confirms that the central content of the thesis has been written independently to the required extent (cf. part of the Statutes on Studies Act Provisions / Examination Regulations, § 20 Para. 2 and 3).',
 				'description' => '',
 				'insertvon' => 'system'
 			)

From 9be5dc3f731d1260b1ca610010b34634365b5d46 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 10 Oct 2024 09:47:40 +0200
Subject: [PATCH 1288/1461] phrasen; tooltips;

---
 system/phrasesupdate.php | 48 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 44 insertions(+), 4 deletions(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 69cb6f56b..60b79531e 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -27106,7 +27106,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Entschuldigung hinzufügen!',
+				'text' => 'Entschuldigung hinzufügen',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -28001,18 +28001,18 @@ array(
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
-		'phrase' => 'showAllDates',
+		'phrase' => 'showAllKontrollen',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Alle Termine anzeigen',
+				'text' => 'Alle Kontrollen anzeigen',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Show All Dates',
+				'text' => 'Show All Attendance Checks',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -28138,6 +28138,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'minuten',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Minuten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'minutes',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'einheiten',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Einheiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'units',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	//
 	// DIGITALE ANWESENHEITEN PHRASEN END
 	//

From bf8085f642f62847994be0c6dec7d755e47328e5 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 10 Oct 2024 11:24:26 +0200
Subject: [PATCH 1289/1461] starts the stundenplan from hour 7 instead of hour
 0

---
 public/css/components/calendar.css         |  3 ++-
 public/js/components/Calendar/Week/Page.js | 11 +++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index 912161097..1b0a4dc39 100755
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -55,7 +55,8 @@
   grid-template-columns: 3em repeat(7, 1fr);
   margin-left: -3em;
   /*min-height: 266.6666666667%;*/
-  background-image: linear-gradient(#f8f9fa calc(100% / 24 - .5px), #dee2e6 calc(100% / 24 - .5px), #dee2e6 calc(100% / 24 + .5px), #f8f9fa calc(100% / 24 + .5px), #f8f9fa calc(200% / 24 - .5px), #dee2e6 calc(200% / 24 - .5px), #dee2e6 calc(200% / 24 + .5px), #f8f9fa calc(200% / 24 + .5px), #f8f9fa calc(300% / 24 - .5px), #dee2e6 calc(300% / 24 - .5px), #dee2e6 calc(300% / 24 + .5px), #f8f9fa calc(300% / 24 + .5px), #f8f9fa calc(400% / 24 - .5px), #dee2e6 calc(400% / 24 - .5px), #dee2e6 calc(400% / 24 + .5px), #f8f9fa calc(400% / 24 + .5px), #f8f9fa calc(500% / 24 - .5px), #dee2e6 calc(500% / 24 - .5px), #dee2e6 calc(500% / 24 + .5px), #f8f9fa calc(500% / 24 + .5px), #f8f9fa calc(600% / 24 - .5px), #dee2e6 calc(600% / 24 - .5px), #dee2e6 calc(600% / 24 + .5px), #f8f9fa calc(600% / 24 + .5px), #f8f9fa calc(700% / 24 - .5px), #dee2e6 calc(700% / 24 - .5px), #dee2e6 calc(700% / 24 + .5px), #f8f9fa calc(700% / 24 + .5px), #f8f9fa calc(800% / 24 - .5px), #dee2e6 calc(800% / 24 - .5px), #dee2e6 calc(800% / 24 + .5px), #fff calc(800% / 24 + .5px), #fff calc(900% / 24 - .5px), #dee2e6 calc(900% / 24 - .5px), #dee2e6 calc(900% / 24 + .5px), #fff calc(900% / 24 + .5px), #fff calc(1000% / 24 - .5px), #dee2e6 calc(1000% / 24 - .5px), #dee2e6 calc(1000% / 24 + .5px), #fff calc(1000% / 24 + .5px), #fff calc(1100% / 24 - .5px), #dee2e6 calc(1100% / 24 - .5px), #dee2e6 calc(1100% / 24 + .5px), #fff calc(1100% / 24 + .5px), #fff calc(1200% / 24 - .5px), #dee2e6 calc(1200% / 24 - .5px), #dee2e6 calc(1200% / 24 + .5px), #fff calc(1200% / 24 + .5px), #fff calc(1300% / 24 - .5px), #dee2e6 calc(1300% / 24 - .5px), #dee2e6 calc(1300% / 24 + .5px), #fff calc(1300% / 24 + .5px), #fff calc(1400% / 24 - .5px), #dee2e6 calc(1400% / 24 - .5px), #dee2e6 calc(1400% / 24 + .5px), #fff calc(1400% / 24 + .5px), #fff calc(1500% / 24 - .5px), #dee2e6 calc(1500% / 24 - .5px), #dee2e6 calc(1500% / 24 + .5px), #fff calc(1500% / 24 + .5px), #fff calc(1600% / 24 - .5px), #dee2e6 calc(1600% / 24 - .5px), #dee2e6 calc(1600% / 24 + .5px), #fff calc(1600% / 24 + .5px), #fff calc(1700% / 24 - .5px), #dee2e6 calc(1700% / 24 - .5px), #dee2e6 calc(1700% / 24 + .5px), #f8f9fa calc(1700% / 24 + .5px), #f8f9fa calc(1800% / 24 - .5px), #dee2e6 calc(1800% / 24 - .5px), #dee2e6 calc(1800% / 24 + .5px), #f8f9fa calc(1800% / 24 + .5px), #f8f9fa calc(1900% / 24 - .5px), #dee2e6 calc(1900% / 24 - .5px), #dee2e6 calc(1900% / 24 + .5px), #f8f9fa calc(1900% / 24 + .5px), #f8f9fa calc(2000% / 24 - .5px), #dee2e6 calc(2000% / 24 - .5px), #dee2e6 calc(2000% / 24 + .5px), #f8f9fa calc(2000% / 24 + .5px), #f8f9fa calc(2100% / 24 - .5px), #dee2e6 calc(2100% / 24 - .5px), #dee2e6 calc(2100% / 24 + .5px), #f8f9fa calc(2100% / 24 + .5px), #f8f9fa calc(2200% / 24 - .5px), #dee2e6 calc(2200% / 24 - .5px), #dee2e6 calc(2200% / 24 + .5px), #f8f9fa calc(2200% / 24 + .5px), #f8f9fa calc(2300% / 24 - .5px), #dee2e6 calc(2300% / 24 - .5px), #dee2e6 calc(2300% / 24 + .5px), #f8f9fa calc(2300% / 24 + .5px));
+  background-image: linear-gradient(#f8f9fa calc(100% / 18 - .55px), #dee2e6 calc(100% / 18 - .55px), #dee2e6 calc(100% / 18 + .55px), #f8f9fa calc(100% / 18 + .55px), #f8f9fa calc(200% / 18 - .55px), #dee2e6 calc(200% / 18 - .55px), #dee2e6 calc(200% / 18 + .55px), #f8f9fa calc(200% / 18 + .55px), #f8f9fa calc(300% / 18 - .55px), #dee2e6 calc(300% / 18 - .55px), #dee2e6 calc(300% / 18 + .55px), #f8f9fa calc(300% / 18 + .55px), #f8f9fa calc(400% / 18 - .55px), #dee2e6 calc(400% / 18 - .55px), #dee2e6 calc(400% / 18 + .55px), #f8f9fa calc(400% / 18 + .55px), #f8f9fa calc(500% / 18 - .55px), #dee2e6 calc(500% / 18 - .55px), #dee2e6 calc(500% / 18 + .55px), #f8f9fa calc(500% / 18 + .55px), #f8f9fa calc(600% / 18 - .55px), #dee2e6 calc(600% / 18 - .55px), #dee2e6 calc(600% / 18 + .55px), #f8f9fa calc(600% / 18 + .55px), #f8f9fa calc(700% / 18 - .55px), #dee2e6 calc(700% / 18 - .55px), #dee2e6 calc(700% / 18 + .55px), #f8f9fa calc(700% / 18 + .55px), #f8f9fa calc(800% / 18 - .55px), #dee2e6 calc(800% / 18 - .55px), #dee2e6 calc(800% / 18 + .55px), #fff calc(800% / 18 + .55px), #fff calc(900% / 18 - .55px), #dee2e6 calc(900% / 18 - .55px), #dee2e6 calc(900% / 18 + .55px), #fff calc(900% / 18 + .55px), #fff calc(1000% / 18 - .55px), #dee2e6 calc(1000% / 18 - .55px), #dee2e6 calc(1000% / 18 + .55px), #fff calc(1000% / 18 + .55px), #fff calc(1100% / 18 - .55px), #dee2e6 calc(1100% / 18 - .55px), #dee2e6 calc(1100% / 18 + .55px), #fff calc(1100% / 18 + .55px), #fff calc(1200% / 18 - .55px), #dee2e6 calc(1200% / 18 - .55px), #dee2e6 calc(1200% / 18 + .55px), #fff calc(1200% / 18 + .55px), #fff calc(1300% / 18 - .55px), #dee2e6 calc(1300% / 18 - .55px), #dee2e6 calc(1300% / 18 + .55px), #fff calc(1300% / 18 + .55px), #fff calc(1400% / 18 - .55px), #dee2e6 calc(1400% / 18 - .55px), #dee2e6 calc(1400% / 18 + .55px), #fff calc(1400% / 18 + .55px), #fff calc(1500% / 18 - .55px), #dee2e6 calc(1500% / 18 - .55px), #dee2e6 calc(1500% / 18 + .55px), #fff calc(1500% / 18 + .55px), #fff calc(1600% / 18 - .55px), #dee2e6 calc(1600% / 18 - .55px), #dee2e6 calc(1600% / 18 + .55px), #fff calc(1600% / 18 + .55px), #fff calc(1700% / 18 - .55px), #dee2e6 calc(1700% / 18 - .55px), #dee2e6 calc(1700% / 18 + .55px), #f8f9fa calc(1700% / 18 + .55px), #f8f9fa calc(1800% / 18 - .55px), #dee2e6 calc(1800% / 18 - .55px), #dee2e6 calc(1800% / 18 + .55px), #f8f9fa calc(1800% / 18 + .55px), #f8f9fa calc(1900% / 18 - .55px), #dee2e6 calc(1900% / 18 - .55px), #dee2e6 calc(1900% / 18 + .55px), #f8f9fa calc(1900% / 18 + .55px), #f8f9fa calc(2000% / 18 - .55px), #dee2e6 calc(2000% / 18 - .55px), #dee2e6 calc(2000% / 18 + .55px), #f8f9fa calc(2000% / 18 + .55px), #f8f9fa calc(2100% / 18 - .55px), #dee2e6 calc(2100% / 18 - .55px), #dee2e6 calc(2100% / 18 + .55px), #f8f9fa calc(2100% / 18 + .55px), #f8f9fa calc(2200% / 18 - .55px), #dee2e6 calc(2200% / 18 - .55px), #dee2e6 calc(2200% / 18 + .55px), #f8f9fa calc(2200% / 18 + .55px), #f8f9fa calc(2300% / 18 - .55px), #dee2e6 calc(2300% / 18 - .55px), #dee2e6 calc(2300% / 18 + .55px), #f8f9fa calc(2300% / 18 + .55px));
+  
 }
 .fhc-calendar-week-page .events .day {
   gap: 1px;
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index 7a2d5c509..1eca1e8a6 100755
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -23,7 +23,7 @@ export default {
 	],
 	data() {
 		return {
-			hours: [...Array(24).keys()]
+			hours: [7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24]
 		};
 	},
 	computed: {
@@ -73,7 +73,7 @@ export default {
 			return res;
 		},
 		smallestTimeFrame() {
-			return [30,15,10,5][this.size];
+			return 10;//[30,15,10,5][this.size];
 		}
 	},
 	methods: {
@@ -86,10 +86,13 @@ export default {
 			}
 		},
 		dateToMinutesOfDay(day) {
-			return Math.floor((day.getHours() * 60 + day.getMinutes()) / this.smallestTimeFrame) + 1;
+			//console.log((day.getHours() * 60 + day.getMinutes()) / this.smallestTimeFrame,"this are the hours");
+			//console.log(Math.floor((day.getHours() * 60 + day.getMinutes()) / this.smallestTimeFrame) + 1,"this is the result of the calculation");
+			return Math.floor(((day.getHours()-7) * 60 + day.getMinutes()) / this.smallestTimeFrame) + 1;
 		}
 	},
 	mounted() {
+		console.log(this.hours,"this are the hours");
 		setTimeout(() => this.$refs.eventcontainer.scrollTop = this.$refs.eventcontainer.scrollHeight / 3 + 1, 0);
 	},
 	template: `
@@ -107,7 +110,7 @@ export default {
 					<div class="hours">
 						<div v-for="hour in hours" style="min-height:100px" :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
 					</div>
-					<div v-for="day in eventsPerDayAndHour" :key="day" class="day border-start" :style="{'grid-template-columns': 'repeat(' + day.lanes + ', 1fr)', 'grid-template-rows': 'repeat(' + (1440 / smallestTimeFrame) + ', 1fr)'}">
+					<div v-for="day in eventsPerDayAndHour" :key="day" class=" day border-start" :style="{'grid-template-columns': 'repeat(' + day.lanes + ', 1fr)', 'grid-template-rows': 'repeat(' + (1080 / smallestTimeFrame) + ', 1fr)'}">
 						<div :style="{'background-color':event.orig.color}" class="mx-2 border border-dark border-2 small rounded overflow-hidden "  @click.prevent="$emit('input', event.orig)" :style="{'grid-column-start': 1+(event.lane-1)*day.lanes/event.maxLane, 'grid-column-end': 1+event.lane*day.lanes/event.maxLane, 'grid-row-start': dateToMinutesOfDay(event.start), 'grid-row-end': dateToMinutesOfDay(event.end) ,'--test': dateToMinutesOfDay(event.end)}" v-for="event in day.events" :key="event">	
 							<slot :event="event" :day="day">
 								<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>

From 469867e98c80451f884404f260c7e0d5ac729cde Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 10 Oct 2024 12:37:57 +0200
Subject: [PATCH 1290/1461] Studstatus: status "EmailVersandt" is not an active
 status

---
 application/models/education/Studierendenantrag_model.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/application/models/education/Studierendenantrag_model.php b/application/models/education/Studierendenantrag_model.php
index e138d1a1c..7595d8036 100644
--- a/application/models/education/Studierendenantrag_model.php
+++ b/application/models/education/Studierendenantrag_model.php
@@ -96,7 +96,8 @@ class Studierendenantrag_model extends DB_Model
 			Studierendenantragstatus_model::STATUS_REJECTED,
 			Studierendenantragstatus_model::STATUS_OBJECTION_DENIED,
 			Studierendenantragstatus_model::STATUS_DEREGISTERED,
-			Studierendenantragstatus_model::STATUS_PAUSE
+			Studierendenantragstatus_model::STATUS_PAUSE,
+			Studierendenantragstatus_model::STATUS_REMINDERSENT
 		]);
 		$this->db->or_group_start();
 		$this->db->where('s.studierendenantrag_statustyp_kurzbz', Studierendenantragstatus_model::STATUS_APPROVED);

From f3fa2fa2dd2741bf1687614826f0fb25f9230d34 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 10 Oct 2024 13:12:01 +0200
Subject: [PATCH 1291/1461] adds the hour gutter for the stundenplan with
 absolute positioned divs instead of a linear gradient

---
 public/css/components/calendar.css         |  2 --
 public/js/components/Calendar/Week/Page.js | 17 +++++++++--------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index 1b0a4dc39..7cb105b85 100755
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -55,8 +55,6 @@
   grid-template-columns: 3em repeat(7, 1fr);
   margin-left: -3em;
   /*min-height: 266.6666666667%;*/
-  background-image: linear-gradient(#f8f9fa calc(100% / 18 - .55px), #dee2e6 calc(100% / 18 - .55px), #dee2e6 calc(100% / 18 + .55px), #f8f9fa calc(100% / 18 + .55px), #f8f9fa calc(200% / 18 - .55px), #dee2e6 calc(200% / 18 - .55px), #dee2e6 calc(200% / 18 + .55px), #f8f9fa calc(200% / 18 + .55px), #f8f9fa calc(300% / 18 - .55px), #dee2e6 calc(300% / 18 - .55px), #dee2e6 calc(300% / 18 + .55px), #f8f9fa calc(300% / 18 + .55px), #f8f9fa calc(400% / 18 - .55px), #dee2e6 calc(400% / 18 - .55px), #dee2e6 calc(400% / 18 + .55px), #f8f9fa calc(400% / 18 + .55px), #f8f9fa calc(500% / 18 - .55px), #dee2e6 calc(500% / 18 - .55px), #dee2e6 calc(500% / 18 + .55px), #f8f9fa calc(500% / 18 + .55px), #f8f9fa calc(600% / 18 - .55px), #dee2e6 calc(600% / 18 - .55px), #dee2e6 calc(600% / 18 + .55px), #f8f9fa calc(600% / 18 + .55px), #f8f9fa calc(700% / 18 - .55px), #dee2e6 calc(700% / 18 - .55px), #dee2e6 calc(700% / 18 + .55px), #f8f9fa calc(700% / 18 + .55px), #f8f9fa calc(800% / 18 - .55px), #dee2e6 calc(800% / 18 - .55px), #dee2e6 calc(800% / 18 + .55px), #fff calc(800% / 18 + .55px), #fff calc(900% / 18 - .55px), #dee2e6 calc(900% / 18 - .55px), #dee2e6 calc(900% / 18 + .55px), #fff calc(900% / 18 + .55px), #fff calc(1000% / 18 - .55px), #dee2e6 calc(1000% / 18 - .55px), #dee2e6 calc(1000% / 18 + .55px), #fff calc(1000% / 18 + .55px), #fff calc(1100% / 18 - .55px), #dee2e6 calc(1100% / 18 - .55px), #dee2e6 calc(1100% / 18 + .55px), #fff calc(1100% / 18 + .55px), #fff calc(1200% / 18 - .55px), #dee2e6 calc(1200% / 18 - .55px), #dee2e6 calc(1200% / 18 + .55px), #fff calc(1200% / 18 + .55px), #fff calc(1300% / 18 - .55px), #dee2e6 calc(1300% / 18 - .55px), #dee2e6 calc(1300% / 18 + .55px), #fff calc(1300% / 18 + .55px), #fff calc(1400% / 18 - .55px), #dee2e6 calc(1400% / 18 - .55px), #dee2e6 calc(1400% / 18 + .55px), #fff calc(1400% / 18 + .55px), #fff calc(1500% / 18 - .55px), #dee2e6 calc(1500% / 18 - .55px), #dee2e6 calc(1500% / 18 + .55px), #fff calc(1500% / 18 + .55px), #fff calc(1600% / 18 - .55px), #dee2e6 calc(1600% / 18 - .55px), #dee2e6 calc(1600% / 18 + .55px), #fff calc(1600% / 18 + .55px), #fff calc(1700% / 18 - .55px), #dee2e6 calc(1700% / 18 - .55px), #dee2e6 calc(1700% / 18 + .55px), #f8f9fa calc(1700% / 18 + .55px), #f8f9fa calc(1800% / 18 - .55px), #dee2e6 calc(1800% / 18 - .55px), #dee2e6 calc(1800% / 18 + .55px), #f8f9fa calc(1800% / 18 + .55px), #f8f9fa calc(1900% / 18 - .55px), #dee2e6 calc(1900% / 18 - .55px), #dee2e6 calc(1900% / 18 + .55px), #f8f9fa calc(1900% / 18 + .55px), #f8f9fa calc(2000% / 18 - .55px), #dee2e6 calc(2000% / 18 - .55px), #dee2e6 calc(2000% / 18 + .55px), #f8f9fa calc(2000% / 18 + .55px), #f8f9fa calc(2100% / 18 - .55px), #dee2e6 calc(2100% / 18 - .55px), #dee2e6 calc(2100% / 18 + .55px), #f8f9fa calc(2100% / 18 + .55px), #f8f9fa calc(2200% / 18 - .55px), #dee2e6 calc(2200% / 18 - .55px), #dee2e6 calc(2200% / 18 + .55px), #f8f9fa calc(2200% / 18 + .55px), #f8f9fa calc(2300% / 18 - .55px), #dee2e6 calc(2300% / 18 - .55px), #dee2e6 calc(2300% / 18 + .55px), #f8f9fa calc(2300% / 18 + .55px));
-  
 }
 .fhc-calendar-week-page .events .day {
   gap: 1px;
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index 1eca1e8a6..d56e9a330 100755
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -73,11 +73,14 @@ export default {
 			return res;
 		},
 		smallestTimeFrame() {
-			return 10;//[30,15,10,5][this.size];
+			return [30,15,10,5][this.size];
 		}
 	},
 	methods: {
-		
+		getAbsolutePositionForHour(hour){
+			// used for the absolute positioning of the gutters of hours
+			return (100 / this.hours.length) * (hour - (24-this.hours.length)) + '%';
+		},
 		changeToMonth(day) {
 			if (!this.noMonthView) {
 				this.date.set(day);
@@ -86,32 +89,30 @@ export default {
 			}
 		},
 		dateToMinutesOfDay(day) {
-			//console.log((day.getHours() * 60 + day.getMinutes()) / this.smallestTimeFrame,"this are the hours");
-			//console.log(Math.floor((day.getHours() * 60 + day.getMinutes()) / this.smallestTimeFrame) + 1,"this is the result of the calculation");
 			return Math.floor(((day.getHours()-7) * 60 + day.getMinutes()) / this.smallestTimeFrame) + 1;
 		}
 	},
 	mounted() {
-		console.log(this.hours,"this are the hours");
 		setTimeout(() => this.$refs.eventcontainer.scrollTop = this.$refs.eventcontainer.scrollHeight / 3 + 1, 0);
 	},
 	template: `
 	<div class="fhc-calendar-week-page">
 	
 		<div class="d-flex flex-column border-top">
-			<div class="fhc-calendar-week-page-header d-grid border-2 border-bottom text-center" :style="{'grid-template-columns': 'repeat(' + days.length + ', 1fr)', 'grid-template-rows':1}" style="position:sticky; top:0; " >
+			<div class="fhc-calendar-week-page-header d-grid border-2 border-bottom text-center" :style="{'z-index':2,'grid-template-columns': 'repeat(' + days.length + ', 1fr)', 'grid-template-rows':1}" style="position:sticky; top:0; " >
 				<div type="button" v-for="day in days" :key="day" class="flex-grow-1" :title="day.toLocaleString(undefined, {dateStyle:'short'})" @click.prevent="changeToMonth(day)">
 					<div class="fw-bold">{{day.toLocaleString(undefined, {weekday: size < 2 ? 'narrow' : (size < 3 ? 'short' : 'long')})}}</div>
 					<a href="#" class="small text-secondary text-decoration-none" >{{day.toLocaleString(undefined, [{day:'numeric',month:'numeric'},{day:'numeric',month:'numeric'},{day:'numeric',month:'numeric'},{dateStyle:'short'}][this.size])}}</a>
 				</div>
 			</div>
-			<div ref="eventcontainer" class="flex-grow-1">
+			<div ref="eventcontainer" class="position-relative flex-grow-1">
+			<div v-for="hour in hours" :key="hour"  class="position-absolute border-top" :style="{top:getAbsolutePositionForHour(hour),left:0,right:0,'z-index':0}"></div>
 				<div class="events">
 					<div class="hours">
 						<div v-for="hour in hours" style="min-height:100px" :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
 					</div>
 					<div v-for="day in eventsPerDayAndHour" :key="day" class=" day border-start" :style="{'grid-template-columns': 'repeat(' + day.lanes + ', 1fr)', 'grid-template-rows': 'repeat(' + (1080 / smallestTimeFrame) + ', 1fr)'}">
-						<div :style="{'background-color':event.orig.color}" class="mx-2 border border-dark border-2 small rounded overflow-hidden "  @click.prevent="$emit('input', event.orig)" :style="{'grid-column-start': 1+(event.lane-1)*day.lanes/event.maxLane, 'grid-column-end': 1+event.lane*day.lanes/event.maxLane, 'grid-row-start': dateToMinutesOfDay(event.start), 'grid-row-end': dateToMinutesOfDay(event.end) ,'--test': dateToMinutesOfDay(event.end)}" v-for="event in day.events" :key="event">	
+						<div :style="{'background-color':event.orig.color}" class="mx-2 border border-dark border-2 small rounded overflow-hidden "  @click.prevent="$emit('input', event.orig)" :style="{'z-index':1,'grid-column-start': 1+(event.lane-1)*day.lanes/event.maxLane, 'grid-column-end': 1+event.lane*day.lanes/event.maxLane, 'grid-row-start': dateToMinutesOfDay(event.start), 'grid-row-end': dateToMinutesOfDay(event.end) ,'--test': dateToMinutesOfDay(event.end)}" v-for="event in day.events" :key="event">	
 							<slot :event="event" :day="day">
 								<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
 							</slot>

From d2ed82cb37b6ea153b6968e6825a0d449da7cca2 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 10 Oct 2024 13:27:26 +0200
Subject: [PATCH 1292/1461] calculates the total amout of hours with an array
 filter instead of statically inserting all hours

---
 public/js/components/Calendar/Week/Page.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index d56e9a330..725a72543 100755
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -21,12 +21,11 @@ export default {
 		'page:forward',
 		'input'
 	],
-	data() {
-		return {
-			hours: [7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24]
-		};
-	},
 	computed: {
+		hours(){
+			// returns an array with elements starting at 7 and ending at 24
+			return [...Array(24).keys()].filter(hour => hour >= 7 && hour <= 24);
+		},
 		days() {
 			
 			let tmpDate = new CalendarDate(this.year,1,1); // NOTE(chris): somewhere in the middle of the year

From 5359539a097864455d07fe4e51dfa1f26296581c Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 10 Oct 2024 20:59:55 +0200
Subject: [PATCH 1293/1461] makes Stundenplan query BLAZINGLY fast

---
 .../api/frontend/v1/Stundenplan.php           | 89 ++++++++++++++++---
 .../models/ressource/Stundenplan_model.php    | 50 +++--------
 public/js/components/Calendar/Week/Page.js    |  2 +-
 3 files changed, 86 insertions(+), 55 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index c624f0944..032519cf6 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -109,14 +109,8 @@ class Stundenplan extends FHCAPI_Controller
 	 */
 	public function getStundenplan(){
 
-		// Query fuer Studenten prototyp ok
+		// Query fuer Studenten MVP
 		//TODO: getStundenplan fuer Mitarbeiter anpassen
-		//TODO: viele edge cases die es nicht moeglich machen besseren tbl_stundenplan index zu verwenden als idx_stundenplan_datum
-
-		// include Student model to fetch Studiengang_kz and Semester
-		$this->load->model('crm/Student_model', 'StudentModel');
-		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
 
 		// form validation
 		$this->load->library('form_validation');
@@ -130,14 +124,81 @@ class Stundenplan extends FHCAPI_Controller
 		$start_date = $this->input->get('start_date', TRUE);
 		$end_date = $this->input->get('end_date', TRUE);
 		
-		// get Student_uid / Studiengang_kz / Semester in order to use index idx_stundenplan_datum_stgsem
-		$student_uid = get_uid();
-		$student_data = $this->StudentModel->load([$student_uid]);
-		$student_data = getData($student_data)[0];
-		$this->addMeta('studg',$student_data->studiengang_kz);
-		$this->addMeta('sem', $student_data->semester);	
+		$student_uid = getAuthUID();
+		if(is_null($student_uid))
+		{
+			$this->terminateWithError("No UID");
+		}
 
-		$stundenplan_data = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getStundenplanQuery(get_uid(),$start_date,$end_date,$student_data->studiengang_kz,$student_data->semester)); 
+		//semester des Studenten ermitteln
+		$lvplan_load_ueber_semesterhaelfte = false;
+		if (defined('LVPLAN_LOAD_UEBER_SEMESTERHAELFTE') && LVPLAN_LOAD_UEBER_SEMESTERHAELFTE === true)
+			$lvplan_load_ueber_semesterhaelfte = true;
+		else
+			$lvplan_load_ueber_semesterhaelfte = false;
+
+		$this->load->model('organisation/Studiensemester_model','StudiensemesterModel');
+		$aktuelle_studiensemester = current(getData($this->StudiensemesterModel->getAkt()))->studiensemester_kurzbz;
+		if($lvplan_load_ueber_semesterhaelfte)
+		{
+			$next_studiensemester = current(getData($this->StudiensemesterModel->getNext()))->studiensemester_kurzbz;
+			$previous_studiensemester = current(getData($this->StudiensemesterModel->getPreviousFrom($aktuelle_studiensemester)))->studiensemester_kurzbz;
+		}
+		else
+		{
+			$nearest_studiensemester = current(getData($this->StudiensemesterModel->getNearestFrom($aktuelle_studiensemester)))->studiensemester_kurzbz;
+		}
+
+		// getting the gruppen_kurzbz of the student in the different studiensemester
+		$this->load->model('person/Benutzergruppe_model','BenutzergruppeModel');
+		$benutzer_gruppen = null;
+		if ($lvplan_load_ueber_semesterhaelfte) 
+		{
+			$benutzer_gruppen = $this->BenutzergruppeModel->execReadOnlyQuery("
+			SELECT * FROM tbl_benutzergruppe where uid = ? AND studiensemester_kurzbz IN ?",[$student_uid, [$aktuelle_studiensemester, $next_studiensemester, $previous_studiensemester]]);
+			$benutzer_gruppen = array_map(function($item){ return "'".$item->gruppe_kurzbz. "'";},getData($benutzer_gruppen));
+		}
+		else
+		{
+			$benutzer_gruppen = $this->BenutzergruppeModel->execReadOnlyQuery("
+			SELECT * FROM tbl_benutzergruppe where uid = ? AND studiensemester_kurzbz IN ?", [$student_uid, [$aktuelle_studiensemester,$nearest_studiensemester]]);
+			$benutzer_gruppen = array_map(function ($item) { return "'".$item->gruppe_kurzbz. "'";}, getData($benutzer_gruppen));
+		}
+
+		// getting the student_lehrverbaende of the student in the different studiensemester
+		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
+		$student_lehrverbaende = null;
+		if ($lvplan_load_ueber_semesterhaelfte) {
+			$student_lehrverbaende = $this->BenutzergruppeModel->execReadOnlyQuery("
+			SELECT * FROM tbl_studentlehrverband where student_uid = ? AND studiensemester_kurzbz IN ?", [$student_uid, [$aktuelle_studiensemester,$next_studiensemester, $previous_studiensemester]]);
+			$student_lehrverbaende = array_map(
+				function ($item)
+				{
+					$result = new stdClass();
+					$result->studiengang_kz = $item->studiengang_kz;
+					$result->semester = $item->semester;
+					$result->verband = $item->verband;
+					$result->gruppe = $item->gruppe;
+					return $result;
+				},
+				getData($student_lehrverbaende));
+		} else {
+			$student_lehrverbaende = $this->BenutzergruppeModel->execReadOnlyQuery("
+			SELECT * FROM tbl_studentlehrverband where student_uid = ? AND studiensemester_kurzbz IN ?", [$student_uid, [$aktuelle_studiensemester,$nearest_studiensemester]]);
+			$student_lehrverbaende = array_map(
+				function ($item) {
+					$result = new stdClass();
+					$result->studiengang_kz = $item->studiengang_kz;
+					$result->semester = $item->semester;
+					$result->verband = $item->verband;
+					$result->gruppe = $item->gruppe;
+					return $result;
+				},
+				getData($student_lehrverbaende)
+			);
+		}
+
+		$stundenplan_data = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getStundenplanQuery($start_date, $end_date, $benutzer_gruppen, $student_lehrverbaende)); 
 		$stundenplan_data = $this->getDataOrTerminateWithError($stundenplan_data) ?? [];
 
 		$this->expand_object_information($stundenplan_data);
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 3966a08e1..e2b031870 100755
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -192,52 +192,22 @@ class Stundenplan_model extends DB_Model
 	 * 
 	 * @return string
 	 */
-	public function getStundenplanQuery($uid, $start_date, $end_date,$studiengang_kz,$semester){
+	public function getStundenplanQuery($start_date, $end_date,$gruppen,$studentlehrverbaende){
 
-		$studiensemester = null;
-
-		$check_with_start_date = $this->execReadOnlyQuery("SELECT * FROM public.tbl_studiensemester WHERE " . $this->escape($start_date) . " BETWEEN start AND ende ;");
-		$check_with_start_date = getData($check_with_start_date);
-		if (count($check_with_start_date)>0) 
-		{
-			$studiensemester = current($check_with_start_date)->studiensemester_kurzbz;
-		}
-		else
-		{
-			$check_with_end_date = $this->execReadOnlyQuery("SELECT * FROM public.tbl_studiensemester WHERE " . $this->escape($end_date) . " BETWEEN start AND ende ;");
-			$check_with_end_date = getData($check_with_end_date);
-			if (count($check_with_start_date) > 0) 
-			{
-				$studiensemester = current($check_with_end_date)->studiensemester_kurzbz;
-			}
-		}
-
-		if(!is_null($studiensemester))
-		{
-			$semester_with_studiensemester = $this->execReadOnlyQuery("SELECT * FROM public.tbl_studentlehrverband WHERE student_uid = " . $this->escape($uid) . " AND studiensemester_kurzbz = " . $this->escape($studiensemester));
-			$semester_with_studiensemester = getData($semester_with_studiensemester);
-			$semester_with_studiensemester = current($semester_with_studiensemester)->semester;
-
-		return 
+		$query =  
 		"select sp.*
 		from lehre.vw_stundenplan sp
-		left join public.tbl_benutzergruppe bg ON sp.gruppe_kurzbz=bg.gruppe_kurzbz AND bg.uid =".$this->escape($uid)." 
-		left join public.tbl_studiensemester ss1 ON bg.studiensemester_kurzbz=ss1.studiensemester_kurzbz AND ss1.start <=sp.datum AND ss1.ende>= sp.datum
-		left join public.tbl_studentlehrverband slv ON sp.studiengang_kz=slv.studiengang_kz and slv.student_uid=".$this->escape($uid)." and (slv.semester=sp.semester OR sp.semester IS NULL) AND (slv.verband=sp.verband OR sp.verband IS NULL OR sp.verband='' OR sp.verband='0') AND
-		(slv.gruppe=sp.gruppe OR sp.gruppe IS NULL OR sp.gruppe='' OR sp.gruppe='0') AND sp.gruppe_kurzbz IS NULL
-		left join public.tbl_studiensemester ss2 ON slv.studiensemester_kurzbz=ss2.studiensemester_kurzbz AND ss2.start<=sp.datum and ss2.ende >= sp.datum
-		WHERE 
+		WHERE
 		sp.datum >= ".$this->escape($start_date)." 
 		AND sp.datum <= ".$this->escape($end_date)."
-		AND sp.studiengang_kz = ".$this->escape($studiengang_kz)."
-		AND sp.semester = ".$this->escape($semester_with_studiensemester)."
-		AND (ss1.studiensemester_kurzbz IS NOT NULL or ss2.studiensemester_kurzbz IS NOT NULL)";
+		AND ( 
+		sp.gruppe_kurzbz IN (".implode(',',$gruppen).")";
+		foreach($studentlehrverbaende as $lehrverband){
+			$query .= "OR (sp.studiengang_kz = ".$this->escape($lehrverband->studiengang_kz)." AND sp.semester = ".$this->escape($lehrverband->semester)." AND sp.verband = ".$this->escape($lehrverband->verband)." AND sp.gruppe = ".$this->escape($lehrverband->gruppe).")"; 
+		}
+		$query .= ")";
 
-		}
-		else
-		{
-			return error("studiensemester could not be retrieved with the student_uid: ".$uid);
-		}
+		return $query;
 	}
 
 	/**
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index 725a72543..4b7c45952 100755
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -97,7 +97,7 @@ export default {
 	template: `
 	<div class="fhc-calendar-week-page">
 	
-		<div class="d-flex flex-column border-top">
+		<div class="d-flex flex-column">
 			<div class="fhc-calendar-week-page-header d-grid border-2 border-bottom text-center" :style="{'z-index':2,'grid-template-columns': 'repeat(' + days.length + ', 1fr)', 'grid-template-rows':1}" style="position:sticky; top:0; " >
 				<div type="button" v-for="day in days" :key="day" class="flex-grow-1" :title="day.toLocaleString(undefined, {dateStyle:'short'})" @click.prevent="changeToMonth(day)">
 					<div class="fw-bold">{{day.toLocaleString(undefined, {weekday: size < 2 ? 'narrow' : (size < 3 ? 'short' : 'long')})}}</div>

From f9e72832c94b9527803441b384a667a3bfc3314c Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 11 Oct 2024 12:33:06 +0200
Subject: [PATCH 1294/1461] adds time inidication on stundenplan on mouse
 position

---
 .../api/frontend/v1/Stundenplan.php           | 17 +++++++---
 public/js/components/Calendar/Week/Page.js    | 33 +++++++++++++++++--
 2 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 032519cf6..a89341654 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -168,7 +168,8 @@ class Stundenplan extends FHCAPI_Controller
 		// getting the student_lehrverbaende of the student in the different studiensemester
 		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
 		$student_lehrverbaende = null;
-		if ($lvplan_load_ueber_semesterhaelfte) {
+		if ($lvplan_load_ueber_semesterhaelfte) 
+		{
 			$student_lehrverbaende = $this->BenutzergruppeModel->execReadOnlyQuery("
 			SELECT * FROM tbl_studentlehrverband where student_uid = ? AND studiensemester_kurzbz IN ?", [$student_uid, [$aktuelle_studiensemester,$next_studiensemester, $previous_studiensemester]]);
 			$student_lehrverbaende = array_map(
@@ -182,7 +183,9 @@ class Stundenplan extends FHCAPI_Controller
 					return $result;
 				},
 				getData($student_lehrverbaende));
-		} else {
+		} 
+		else 
+		{
 			$student_lehrverbaende = $this->BenutzergruppeModel->execReadOnlyQuery("
 			SELECT * FROM tbl_studentlehrverband where student_uid = ? AND studiensemester_kurzbz IN ?", [$student_uid, [$aktuelle_studiensemester,$nearest_studiensemester]]);
 			$student_lehrverbaende = array_map(
@@ -240,13 +243,16 @@ class Stundenplan extends FHCAPI_Controller
 	}
 
 	private function expand_object_information($data){
-		foreach ($data as $item) {
+		
+		foreach ($data as $item) 
+		{
 
 			$lektor_obj_array = array();
 			$gruppe_obj_array = array();
 
 			// load lektor object
-			foreach ($item->lektor as $lv_lektor) {
+			foreach ($item->lektor as $lv_lektor) 
+			{
 				$this->StundenplanModel->addLimit(1);
 				$lektor_object = $this->StundenplanModel->execReadOnlyQuery("
 				SELECT mitarbeiter_uid, vorname, nachname, kurzbz 
@@ -263,7 +269,8 @@ class Stundenplan extends FHCAPI_Controller
 			}
 
 			// load gruppe object
-			foreach ($item->gruppe as $lv_gruppe) {
+			foreach ($item->gruppe as $lv_gruppe) 
+			{
 				$lv_gruppe = strtr($lv_gruppe, ['(' => '', ')' => '', '"' => '']);
 				$lv_gruppe_array = explode(",", $lv_gruppe);
 				list($gruppe, $verband, $semester, $studiengang_kz, $gruppen_kuerzel) = $lv_gruppe_array;
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index 4b7c45952..10c56e13e 100755
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -4,6 +4,12 @@ function ggt(m,n) { return n==0 ? m : ggt(n, m%n); }
 function kgv(m,n) { return (m*n) / ggt(m,n); }
 
 export default {
+	data(){
+		return{
+			hourPosition:null,
+			hourPositionTime:null,
+		}
+	},
 	inject: [
 		'date',
 		'focusDate',
@@ -76,6 +82,26 @@ export default {
 		}
 	},
 	methods: {
+		calcHourPosition(event){
+			let top = this.$refs.eventcontainer.getBoundingClientRect().top;
+			let position = event.clientY - top;
+			this.hourPosition = position;
+			// position percentage of total height
+			let timePercentage = (position / this.$refs.eventcontainer.offsetHeight) * 100;
+			// minute percentage of total minutes
+			let result = (this.hours.length * 60) * (timePercentage/100);
+			// calculate time in float
+			let currentMinutes = ((result+(this.hours[0]*60))/60);
+			// get hour part of time
+			let currentHour = Math.floor(currentMinutes);
+			// get float part of time
+			let minutePercentage = currentMinutes % currentHour;
+			// calculate minutes from float part of time
+			let minute = Math.round(60 * minutePercentage);
+			// add padding to minutes that consist of only one digit
+			minute.toString().length == 1 ? minute = "0" + minute : minute;
+			this.hourPositionTime = currentHour + ":" + minute; 
+		},
 		getAbsolutePositionForHour(hour){
 			// used for the absolute positioning of the gutters of hours
 			return (100 / this.hours.length) * (hour - (24-this.hours.length)) + '%';
@@ -104,13 +130,14 @@ export default {
 					<a href="#" class="small text-secondary text-decoration-none" >{{day.toLocaleString(undefined, [{day:'numeric',month:'numeric'},{day:'numeric',month:'numeric'},{day:'numeric',month:'numeric'},{dateStyle:'short'}][this.size])}}</a>
 				</div>
 			</div>
-			<div ref="eventcontainer" class="position-relative flex-grow-1">
-			<div v-for="hour in hours" :key="hour"  class="position-absolute border-top" :style="{top:getAbsolutePositionForHour(hour),left:0,right:0,'z-index':0}"></div>
+			<div ref="eventcontainer" class="position-relative flex-grow-1" @mousemove="calcHourPosition" @mouseleave="hourPosition=null;hourPositionTime=null" >
+				<div v-for="hour in hours" :key="hour"  class="position-absolute border-top" style="pointer-events: none;" :style="{top:getAbsolutePositionForHour(hour),left:0,right:0,'z-index':0}"></div>
+				<div v-if="hourPosition" class="position-absolute border-top border-primary text-muted small"  style="pointer-events: none; padding-left:3.5rem; margin-top:-1px;z-index:2;" :style="{top:hourPosition+'px',left:0,right:0}">{{hourPositionTime}}</div>
 				<div class="events">
 					<div class="hours">
 						<div v-for="hour in hours" style="min-height:100px" :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
 					</div>
-					<div v-for="day in eventsPerDayAndHour" :key="day" class=" day border-start" :style="{'grid-template-columns': 'repeat(' + day.lanes + ', 1fr)', 'grid-template-rows': 'repeat(' + (1080 / smallestTimeFrame) + ', 1fr)'}">
+					<div v-for="day in eventsPerDayAndHour" :key="day" class=" day border-start" :style="{'grid-template-columns': 'repeat(' + day.lanes + ', 1fr)', 'grid-template-rows': 'repeat(' + (hours.length * 60 / smallestTimeFrame) + ', 1fr)'}">
 						<div :style="{'background-color':event.orig.color}" class="mx-2 border border-dark border-2 small rounded overflow-hidden "  @click.prevent="$emit('input', event.orig)" :style="{'z-index':1,'grid-column-start': 1+(event.lane-1)*day.lanes/event.maxLane, 'grid-column-end': 1+event.lane*day.lanes/event.maxLane, 'grid-row-start': dateToMinutesOfDay(event.start), 'grid-row-end': dateToMinutesOfDay(event.end) ,'--test': dateToMinutesOfDay(event.end)}" v-for="event in day.events" :key="event">	
 							<slot :event="event" :day="day">
 								<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>

From 9fd02460ce16184b6a7325933888fbc40623f9f5 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 14 Oct 2024 09:48:54 +0200
Subject: [PATCH 1295/1461] doesnt refresh the page when the menu entry gets
 closed, does redirect if the menu entry gets opened

---
 public/js/components/Cis/Menu/Entry.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Cis/Menu/Entry.js b/public/js/components/Cis/Menu/Entry.js
index 8d8a7770d..6bbfb962b 100755
--- a/public/js/components/Cis/Menu/Entry.js
+++ b/public/js/components/Cis/Menu/Entry.js
@@ -209,7 +209,7 @@ export default {
     <template v-else>
         <template v-if="hasChilds">
 			<div class="btn-group w-100">
-                <a :href="link" :target="target" @click="toggleCollapse"
+                <a :href="(entry.menu_open)?link:null" :target="target" @click="toggleCollapse"
                     :class="{
                         'btn btn-default rounded-0 text-start': true,
                         ['btn-level-' + level]: true,

From ed1d4b1a5053e61b3c00b8399d1fc2b081afeb93 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 14 Oct 2024 10:17:20 +0200
Subject: [PATCH 1296/1461] regex replaces old content links with new CIS4
 controller links and adopts the Menu Entry links to not refresh the page when
 closing the Menu point

---
 application/controllers/api/frontend/v1/Cms.php | 1 -
 application/libraries/CmsLib.php                | 5 ++++-
 system/dbupdate_3.4/25999_C4_Menu.php           | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Cms.php b/application/controllers/api/frontend/v1/Cms.php
index 9b45fe81d..51acf5067 100644
--- a/application/controllers/api/frontend/v1/Cms.php
+++ b/application/controllers/api/frontend/v1/Cms.php
@@ -81,7 +81,6 @@ class Cms extends FHCAPI_Controller
         $sichtbar = $this->input->get("sichtbar",TRUE);
 
 		$content = $this->cmslib->getContent($content_id, $version, $sprache, $sichtbar);
-
 		$content = $this->getDataOrTerminateWithError($content);
 
 		$this->terminateWithSuccess($content);
diff --git a/application/libraries/CmsLib.php b/application/libraries/CmsLib.php
index 746d7f831..b65e2a71c 100755
--- a/application/libraries/CmsLib.php
+++ b/application/libraries/CmsLib.php
@@ -117,8 +117,11 @@ class CmsLib
 
 		
 		$transformed_content = $processor->transformToXML($XML);
+		//replaces all the dms.php with the new CIS4 Controller
 		$transformed_content = str_replace('dms.php', APP_ROOT . 'cms/dms.php', $transformed_content);
-
+		//replaces all the cms.php with the new CIS4 Controller
+		$transformed_content = preg_replace('/content\.php\?content\_id\=([0-9]+)/', APP_ROOT.'cis.php/CisVue/Cms/content/$1', $transformed_content);
+		
 		return success([
 			"betreff"=>$betreff,
 			"type"=>$content->template_kurzbz,
diff --git a/system/dbupdate_3.4/25999_C4_Menu.php b/system/dbupdate_3.4/25999_C4_Menu.php
index 624eb60d6..ec31f3cc3 100755
--- a/system/dbupdate_3.4/25999_C4_Menu.php
+++ b/system/dbupdate_3.4/25999_C4_Menu.php
@@ -225,7 +225,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					-- queries the content_id for the VORLAGEN
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'VORLAGEN'),
 					1,TRUE,
-					'<content></content>',
+					'<content><url><![CDATA[#Vorlagen]]></url><target><![CDATA[_self]]></target></content>',
 					null,null,null,null,NOW(),null,'Vorlagen',null
 				);
 

From c444e27d0de690e35cf242acd8bc8b643ad53f53 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 14 Oct 2024 10:34:01 +0200
Subject: [PATCH 1297/1461] adds more styling and fixes little bug in the
 currentHour Stundenplan indicator

---
 public/js/components/Calendar/Week/Page.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index 10c56e13e..1733118cd 100755
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -98,6 +98,11 @@ export default {
 			let minutePercentage = currentMinutes % currentHour;
 			// calculate minutes from float part of time
 			let minute = Math.round(60 * minutePercentage);
+			// in case the rounding made the minutes 60, increase the hour and reset the minutes
+			if(minute == 60){
+				currentHour++;
+				minute = 0;
+			}
 			// add padding to minutes that consist of only one digit
 			minute.toString().length == 1 ? minute = "0" + minute : minute;
 			this.hourPositionTime = currentHour + ":" + minute; 
@@ -130,9 +135,11 @@ export default {
 					<a href="#" class="small text-secondary text-decoration-none" >{{day.toLocaleString(undefined, [{day:'numeric',month:'numeric'},{day:'numeric',month:'numeric'},{day:'numeric',month:'numeric'},{dateStyle:'short'}][this.size])}}</a>
 				</div>
 			</div>
-			<div ref="eventcontainer" class="position-relative flex-grow-1" @mousemove="calcHourPosition" @mouseleave="hourPosition=null;hourPositionTime=null" >
+			<div ref="eventcontainer" class="position-relative flex-grow-1" @mousemove="calcHourPosition" @mouseleave="" >
 				<div v-for="hour in hours" :key="hour"  class="position-absolute border-top" style="pointer-events: none;" :style="{top:getAbsolutePositionForHour(hour),left:0,right:0,'z-index':0}"></div>
-				<div v-if="hourPosition" class="position-absolute border-top border-primary text-muted small"  style="pointer-events: none; padding-left:3.5rem; margin-top:-1px;z-index:2;" :style="{top:hourPosition+'px',left:0,right:0}">{{hourPositionTime}}</div>
+				<div v-if="hourPosition" class="position-absolute border-top small"  style="pointer-events: none; padding-left:3.5rem; margin-top:-1px;z-index:2;border-color:#00649C !important" :style="{top:hourPosition+'px',left:0,right:0}">
+					<span class="border border-top-0 px-2 bg-white">{{hourPositionTime}}</span>
+				</div>
 				<div class="events">
 					<div class="hours">
 						<div v-for="hour in hours" style="min-height:100px" :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>

From 4f9591fc3b49ac50f78a90c64fbaf60c2d2e87c3 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 14 Oct 2024 10:36:46 +0200
Subject: [PATCH 1298/1461] fix the z-index of the week stundenplan header

---
 public/js/components/Calendar/Week/Page.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index 1733118cd..2a3fa1bf3 100755
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -129,7 +129,7 @@ export default {
 	<div class="fhc-calendar-week-page">
 	
 		<div class="d-flex flex-column">
-			<div class="fhc-calendar-week-page-header d-grid border-2 border-bottom text-center" :style="{'z-index':2,'grid-template-columns': 'repeat(' + days.length + ', 1fr)', 'grid-template-rows':1}" style="position:sticky; top:0; " >
+			<div class="fhc-calendar-week-page-header d-grid border-2 border-bottom text-center" :style="{'z-index':4,'grid-template-columns': 'repeat(' + days.length + ', 1fr)', 'grid-template-rows':1}" style="position:sticky; top:0; " >
 				<div type="button" v-for="day in days" :key="day" class="flex-grow-1" :title="day.toLocaleString(undefined, {dateStyle:'short'})" @click.prevent="changeToMonth(day)">
 					<div class="fw-bold">{{day.toLocaleString(undefined, {weekday: size < 2 ? 'narrow' : (size < 3 ? 'short' : 'long')})}}</div>
 					<a href="#" class="small text-secondary text-decoration-none" >{{day.toLocaleString(undefined, [{day:'numeric',month:'numeric'},{day:'numeric',month:'numeric'},{day:'numeric',month:'numeric'},{dateStyle:'short'}][this.size])}}</a>

From c67e78d1351635c290a8a94bbfeab508262bf024 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 14 Oct 2024 10:42:49 +0200
Subject: [PATCH 1299/1461] phrasen rewording; formatter change; fix save
 changed anwesenheiten StudentByLvaComponent.js;

---
 system/phrasesupdate.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 60b79531e..008d2901d 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -28041,18 +28041,18 @@ array(
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
-		'phrase' => 'anwInfoKeineTermineGefunden',
+		'phrase' => 'anwInfoKeineKontrollenGefunden',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Keine Termine zum LV-Teil gefunden!',
+				'text' => 'Keine Kontrollen zum LV-Teil gefunden!',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'No dates found for teaching unit!',
+				'text' => 'No digital attendance checks found for teaching unit!',
 				'description' => '',
 				'insertvon' => 'system'
 			)

From 462857080b444b968e80ab67781634d8c383bb57 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 14 Oct 2024 11:06:48 +0200
Subject: [PATCH 1300/1461] makes the parent menu point active if the child
 menu points gets closed

---
 public/js/components/Cis/Menu.js       | 18 +++++++++++++++--
 public/js/components/Cis/Menu/Entry.js | 28 +++++++++++++-------------
 2 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js
index 9608bc9de..1fd5fce96 100755
--- a/public/js/components/Cis/Menu.js
+++ b/public/js/components/Cis/Menu.js
@@ -24,6 +24,11 @@ export default {
 			urlMatchRankings:[],
         };
     },
+	provide(){
+		return{
+			makeParentContentActive: this.makeParentContentActive,
+		}
+	},
 	computed:{
 		highestMatchingUrlCount(){
 			// gets the hightest ranking inside the array
@@ -38,6 +43,15 @@ export default {
 		},
 	},
 	methods:{
+		makeParentContentActive(content_id, collection=this.entries, parent=null){
+			for(let entry of collection){
+				if(entry.content_id == content_id){
+					this.activeEntry = parent;
+				}
+				this.makeParentContentActive(content_id, entry.childs, entry.content_id);
+			}
+			
+		},
 		addUrlCount(count){
 			this.urlMatchRankings.push(count);
 		},
@@ -51,8 +65,8 @@ export default {
 	},
     template: /*html*/`
 	<!--<p>CISVUE HEADER</p>
-	<p>active entry content_id : {{activeEntry}}</p>
 	<p>highest count : {{highestMatchingUrlCount}}</p>
+	<p>active entry content_id : {{activeEntry}}</p>
 	-->
 	<button id="nav-main-btn" class="navbar-toggler" type="button" data-bs-toggle="offcanvas" data-bs-target="#nav-main" aria-controls="nav-main" aria-expanded="false" aria-label="Toggle navigation">
         <span class="navbar-toggler-icon"></span>
@@ -80,7 +94,7 @@ export default {
 			<div class="offcanvas-body p-0">
 				<div id="nav-main-menu" class="collapse collapse-horizontal show">
 					<div>
-						<cis-menu-entry @UrlCount="addUrlCount" @activeEntry="setActiveEntry" :highestMatchingUrlCount="highestMatchingUrlCount" :activeContent="activeEntry" v-for="entry in entries" :key="entry.content_id" :entry="entry" />
+						<cis-menu-entry @makeParentContentActive="makeParentContentActive" @UrlCount="addUrlCount" @activeEntry="setActiveEntry" :highestMatchingUrlCount="highestMatchingUrlCount" :activeContent="activeEntry" v-for="entry in entries" :key="entry.content_id" :entry="entry" />
 					</div>
 				</div>
 			</div>
diff --git a/public/js/components/Cis/Menu/Entry.js b/public/js/components/Cis/Menu/Entry.js
index 6bbfb962b..b75d71918 100755
--- a/public/js/components/Cis/Menu/Entry.js
+++ b/public/js/components/Cis/Menu/Entry.js
@@ -10,12 +10,13 @@ export default {
 		highestMatchingUrlCount: Number,
     },
     data: () => {
-        return {
-            collapse: null,
+		return {
+			collapse: null,
 			urlCount:0,
         }
     },
 	emits: ["activeEntry", "UrlCount"],
+	inject: ['makeParentContentActive'],
 	watch:{
 		highestMatchingUrlCount: function(newValue)
 		{
@@ -50,6 +51,10 @@ export default {
 			{
 				// only invokes .hide if this.collapse is not null
 				this.collapse && this.collapse.hide();
+				if (this.activeContent == this.entry.content_id)
+				{
+					this.makeParentContentActive(this.entry.content_id);
+				}
 			}
 			// debugging helpers - console.log(this.entry.titel, newValue ? "open" : "close")
 			
@@ -172,19 +177,14 @@ export default {
 			this.$emit('activeEntry',event);
 		},
         toggleCollapse(evt) {
-            if (this.level > 1 && this.collapse !== null) 
+			if (this.active)
 			{
-                this.entry.menu_open = !this.entry.menu_open;
-                this.collapse.toggle(evt.target);
-            }else{
-				if (this.active)
-				{
-					this.$emit("activeEntry", null); 
-				}
-				else
-				{
-					this.$emit("activeEntry", this.entry.content_id);
-				}
+				this.makeParentContentActive(this.entry.content_id); 
+			}
+			else
+			{
+				console.log("entered here to make the content active")
+				this.$emit("activeEntry", this.entry.content_id);
 			}
         }
     },

From 0528f3b262b6bb24cc3f9ea5a44bd2cba41d99db Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 14 Oct 2024 11:32:23 +0200
Subject: [PATCH 1301/1461] checks the size of the arrays before using the
 current method and does not allow mitarbeiter to access the student
 stundenplan

---
 .../api/frontend/v1/Stundenplan.php           | 55 ++++++++++++++++---
 .../models/ressource/Stundenplan_model.php    | 21 +++++--
 2 files changed, 63 insertions(+), 13 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index a89341654..11e2e03e4 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -125,6 +125,13 @@ class Stundenplan extends FHCAPI_Controller
 		$end_date = $this->input->get('end_date', TRUE);
 		
 		$student_uid = getAuthUID();
+		// check if authUID is mitarbeiter
+		$this->load->model('ressource/Mitarbeiter_model','MitarbeiterModel');
+		$is_mitarbeiter = getData($this->MitarbeiterModel->isMitarbeiter($student_uid));
+		if($is_mitarbeiter)
+		{
+			$this->terminateWithError("Not possible to look at the Student Calendar as a Mitarbeiter");
+		}
 		if(is_null($student_uid))
 		{
 			$this->terminateWithError("No UID");
@@ -138,15 +145,36 @@ class Stundenplan extends FHCAPI_Controller
 			$lvplan_load_ueber_semesterhaelfte = false;
 
 		$this->load->model('organisation/Studiensemester_model','StudiensemesterModel');
-		$aktuelle_studiensemester = current(getData($this->StudiensemesterModel->getAkt()))->studiensemester_kurzbz;
+		$aktuelle_studiensemester = $this->StudiensemesterModel->getAkt();
+		$aktuelle_studiensemester = $this->getDataOrTerminateWithError($aktuelle_studiensemester);
+		if (count($aktuelle_studiensemester) == 0) {
+			$this->terminateWithError("No aktuelles semester");
+		}
+		$aktuelle_studiensemester = current($aktuelle_studiensemester)->studiensemester_kurzbz;
 		if($lvplan_load_ueber_semesterhaelfte)
 		{
-			$next_studiensemester = current(getData($this->StudiensemesterModel->getNext()))->studiensemester_kurzbz;
-			$previous_studiensemester = current(getData($this->StudiensemesterModel->getPreviousFrom($aktuelle_studiensemester)))->studiensemester_kurzbz;
+			$next_studiensemester = $this->StudiensemesterModel->getNext();
+			$next_studiensemester = $this->getDataOrTerminateWithError($next_studiensemester);
+			if(count($next_studiensemester) == 0)
+			{
+				$this->terminateWithError("No next semester");
+			}
+			$next_studiensemester = current($next_studiensemester)->studiensemester_kurzbz;
+			$previous_studiensemester = $this->StudiensemesterModel->getPreviousFrom($aktuelle_studiensemester);
+			$previous_studiensemester = $this->getDataOrTerminateWithError($previous_studiensemester);
+			if (count($previous_studiensemester) == 0) {
+				$this->terminateWithError("No previous semester");
+			}
+			$previous_studiensemester = current($previous_studiensemester)->studiensemester_kurzbz;
 		}
 		else
 		{
-			$nearest_studiensemester = current(getData($this->StudiensemesterModel->getNearestFrom($aktuelle_studiensemester)))->studiensemester_kurzbz;
+			$nearest_studiensemester = $this->StudiensemesterModel->getNearestFrom($aktuelle_studiensemester);
+			$nearest_studiensemester = $this->getDataOrTerminateWithError($nearest_studiensemester);
+			if (count($nearest_studiensemester) == 0) {
+				$this->terminateWithError("No nearest semester");
+			}
+			$nearest_studiensemester = current($nearest_studiensemester)->studiensemester_kurzbz;
 		}
 
 		// getting the gruppen_kurzbz of the student in the different studiensemester
@@ -156,13 +184,15 @@ class Stundenplan extends FHCAPI_Controller
 		{
 			$benutzer_gruppen = $this->BenutzergruppeModel->execReadOnlyQuery("
 			SELECT * FROM tbl_benutzergruppe where uid = ? AND studiensemester_kurzbz IN ?",[$student_uid, [$aktuelle_studiensemester, $next_studiensemester, $previous_studiensemester]]);
-			$benutzer_gruppen = array_map(function($item){ return "'".$item->gruppe_kurzbz. "'";},getData($benutzer_gruppen));
+			$benutzer_gruppen = $this->getDataOrTerminateWithError($benutzer_gruppen);
+			$benutzer_gruppen = array_map(function($item){ return "'".$item->gruppe_kurzbz. "'";}, $benutzer_gruppen);
 		}
 		else
 		{
 			$benutzer_gruppen = $this->BenutzergruppeModel->execReadOnlyQuery("
 			SELECT * FROM tbl_benutzergruppe where uid = ? AND studiensemester_kurzbz IN ?", [$student_uid, [$aktuelle_studiensemester,$nearest_studiensemester]]);
-			$benutzer_gruppen = array_map(function ($item) { return "'".$item->gruppe_kurzbz. "'";}, getData($benutzer_gruppen));
+			$benutzer_gruppen = $this->getDataOrTerminateWithError($benutzer_gruppen);
+			$benutzer_gruppen = array_map(function ($item) { return "'".$item->gruppe_kurzbz. "'";}, $benutzer_gruppen);
 		}
 
 		// getting the student_lehrverbaende of the student in the different studiensemester
@@ -172,6 +202,7 @@ class Stundenplan extends FHCAPI_Controller
 		{
 			$student_lehrverbaende = $this->BenutzergruppeModel->execReadOnlyQuery("
 			SELECT * FROM tbl_studentlehrverband where student_uid = ? AND studiensemester_kurzbz IN ?", [$student_uid, [$aktuelle_studiensemester,$next_studiensemester, $previous_studiensemester]]);
+			$student_lehrverbaende = $this->getDataOrTerminateWithError($student_lehrverbaende);
 			$student_lehrverbaende = array_map(
 				function ($item)
 				{
@@ -182,12 +213,13 @@ class Stundenplan extends FHCAPI_Controller
 					$result->gruppe = $item->gruppe;
 					return $result;
 				},
-				getData($student_lehrverbaende));
+				$student_lehrverbaende);
 		} 
 		else 
 		{
 			$student_lehrverbaende = $this->BenutzergruppeModel->execReadOnlyQuery("
 			SELECT * FROM tbl_studentlehrverband where student_uid = ? AND studiensemester_kurzbz IN ?", [$student_uid, [$aktuelle_studiensemester,$nearest_studiensemester]]);
+			$student_lehrverbaende = $this->getDataOrTerminateWithError($student_lehrverbaende);
 			$student_lehrverbaende = array_map(
 				function ($item) {
 					$result = new stdClass();
@@ -197,7 +229,7 @@ class Stundenplan extends FHCAPI_Controller
 					$result->gruppe = $item->gruppe;
 					return $result;
 				},
-				getData($student_lehrverbaende)
+				$student_lehrverbaende
 			);
 		}
 
@@ -263,7 +295,12 @@ class Stundenplan extends FHCAPI_Controller
 				if (isError($lektor_object)) {
 					$this->show_error(getError($lektor_object));
 				}
-				$lektor_object = current(getData($lektor_object));
+				$lektor_object = $this->getDataOrTerminateWithError($lektor_object);
+				if(count($lektor_object) == 0)
+				{
+					$this->terminateWithError("No lektor object");
+				}
+				$lektor_object = current($lektor_object);
 				// only provide needed information of the mitarbeiter object 
 				$lektor_obj_array[] = $lektor_object;
 			}
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index e2b031870..e29030279 100755
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -199,13 +199,26 @@ class Stundenplan_model extends DB_Model
 		from lehre.vw_stundenplan sp
 		WHERE
 		sp.datum >= ".$this->escape($start_date)." 
-		AND sp.datum <= ".$this->escape($end_date)."
-		AND ( 
-		sp.gruppe_kurzbz IN (".implode(',',$gruppen).")";
+		AND sp.datum <= ".$this->escape($end_date);
+
+		if(count($gruppen) != 0 || count($studentlehrverbaende) != 0)
+		{
+			$query .= "AND ( ";
+		}
+
+		if(count($gruppen) != 0)
+		{
+			$query .="sp.gruppe_kurzbz IN (".implode(',',$gruppen).")";
+		}
+		
 		foreach($studentlehrverbaende as $lehrverband){
 			$query .= "OR (sp.studiengang_kz = ".$this->escape($lehrverband->studiengang_kz)." AND sp.semester = ".$this->escape($lehrverband->semester)." AND sp.verband = ".$this->escape($lehrverband->verband)." AND sp.gruppe = ".$this->escape($lehrverband->gruppe).")"; 
 		}
-		$query .= ")";
+		
+		if(count($gruppen) != 0 || count($studentlehrverbaende) != 0)
+		{
+			$query .= ")";
+		}
 
 		return $query;
 	}

From b0e96fbab18e193b0eae9ea2944a0d9b46a9d990 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 14 Oct 2024 11:42:30 +0200
Subject: [PATCH 1302/1461] replaces the emits to injections to avoid repassing
 the emits between intermediate parent elements

---
 public/js/components/Cis/Menu.js       |  4 +++-
 public/js/components/Cis/Menu/Entry.js | 20 ++++++--------------
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js
index 1fd5fce96..8ef389c49 100755
--- a/public/js/components/Cis/Menu.js
+++ b/public/js/components/Cis/Menu.js
@@ -26,6 +26,8 @@ export default {
     },
 	provide(){
 		return{
+			setActiveEntry: this.setActiveEntry,
+			addUrlCount: this.addUrlCount,
 			makeParentContentActive: this.makeParentContentActive,
 		}
 	},
@@ -94,7 +96,7 @@ export default {
 			<div class="offcanvas-body p-0">
 				<div id="nav-main-menu" class="collapse collapse-horizontal show">
 					<div>
-						<cis-menu-entry @makeParentContentActive="makeParentContentActive" @UrlCount="addUrlCount" @activeEntry="setActiveEntry" :highestMatchingUrlCount="highestMatchingUrlCount" :activeContent="activeEntry" v-for="entry in entries" :key="entry.content_id" :entry="entry" />
+						<cis-menu-entry :highestMatchingUrlCount="highestMatchingUrlCount" :activeContent="activeEntry" v-for="entry in entries" :key="entry.content_id" :entry="entry" />
 					</div>
 				</div>
 			</div>
diff --git a/public/js/components/Cis/Menu/Entry.js b/public/js/components/Cis/Menu/Entry.js
index b75d71918..aafe19521 100755
--- a/public/js/components/Cis/Menu/Entry.js
+++ b/public/js/components/Cis/Menu/Entry.js
@@ -15,15 +15,14 @@ export default {
 			urlCount:0,
         }
     },
-	emits: ["activeEntry", "UrlCount"],
-	inject: ['makeParentContentActive'],
+	inject: ['makeParentContentActive', 'setActiveEntry','addUrlCount'],
 	watch:{
 		highestMatchingUrlCount: function(newValue)
 		{
 			// if this entry has the most matching url parts then it should be active
 			if (this.activeContent == null && newValue == this.urlCount)
 			{
-				this.$emit("activeEntry", this.entry.content_id);
+				this.setActiveEntry(this.entry.content_id);
 			}
 		},
 		activeContent: function(newValue){
@@ -119,9 +118,6 @@ export default {
         }
     },
     methods: {
-		passUrlCount(count){
-			this.$emit("UrlCount",count);
-		},
 		getUrlMatchPoints(url,link){
 			let splitted_link = link.split('/');
 			let splitted_url = url.href.split('/');
@@ -139,7 +135,7 @@ export default {
 				}
 			}
 			this.urlCount = count;
-			this.$emit("UrlCount",count);
+			this.addUrlCount(count);
 		},
 		checkActiveUrl(url){
 			this.getUrlMatchPoints(url,this.link);
@@ -153,7 +149,7 @@ export default {
 			// or if the url equals the link of a menu 
 			// then set the menu active 
 			if (url_hash == this.entry.titel || url.href == this.link) {
-				this.$emit("activeEntry", this.entry.content_id);
+				this.setActiveEntry(this.entry.content_id);
 			}
 		},
 		searchRecursiveChild(entry,child_content_id){
@@ -172,10 +168,6 @@ export default {
 			}	
 			return false;
 		},
-		resendEmit(event){
-			this.entry.menu_open = true;
-			this.$emit('activeEntry',event);
-		},
         toggleCollapse(evt) {
 			if (this.active)
 			{
@@ -184,7 +176,7 @@ export default {
 			else
 			{
 				console.log("entered here to make the content active")
-				this.$emit("activeEntry", this.entry.content_id);
+				this.setActiveEntry(this.entry.content_id);
 			}
         }
     },
@@ -227,7 +219,7 @@ export default {
             </div>
             <ul ref="children"
                 class="nav w-100 collapse">
-                <cis-menu-entry @UrlCount="passUrlCount" :highestMatchingUrlCount="highestMatchingUrlCount" @activeEntry="resendEmit" :activeContent="activeContent" v-for="child in entry.childs" :key="child" :entry="child" :level="level + 1"/>
+                <cis-menu-entry :highestMatchingUrlCount="highestMatchingUrlCount" :activeContent="activeContent" v-for="child in entry.childs" :key="child" :entry="child" :level="level + 1"/>
             </ul>
         </template>
         <a v-else

From 9ed08fb40c618aeb0343a686d746916265244de3 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 14 Oct 2024 13:36:31 +0200
Subject: [PATCH 1303/1461] default value for hasConfig is false and the emit
 update for the URL dashboard widget and only loads the config component if
 the dashboard widget actually has a config

---
 public/js/components/Dashboard/Item.js      | 6 +++---
 public/js/components/DashboardWidget/Url.js | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index 484171857..d3212c72e 100755
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -12,7 +12,7 @@ export default {
 		widget: null,
 		tmpConfig: {},
 		isLoading: false,
-		hasConfig: true,
+		hasConfig: false,
 		sharedData: null,
 	}),
 	emits: [
@@ -117,10 +117,10 @@ export default {
 			</div>
 		</div>
 		<div v-if="ready" class="card-body overflow-hidden">
-			<component :is="component" v-model:shared-data="sharedData" :config="arguments" :width="width" :height="height" @setConfig="setConfig" @change="changeConfigManually"></component>
+		<component :is="component" v-model:shared-data="sharedData" :config="arguments" :width="width" :height="height" @setConfig="setConfig" @change="changeConfigManually"></component>
 		</div>
 		<div v-else class="card-body overflow-hidden text-center d-flex flex-column justify-content-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></div>
-		<bs-modal ref="config">
+		<bs-modal v-if="hasConfig" ref="config">
 			<template v-slot:title>
 				{{ widget ? 'Config for ' + widget.setup.name : '' }}
 			</template>
diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index eb7dfdae4..b87ef4235 100755
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -71,6 +71,10 @@ export default {
   async mounted() {
     await this.fetchBookmarks();
   },
+  created()
+  {
+	  this.$emit('setConfig', true);
+  },
   template: /*html*/ `
     <div class="widgets-url w-100 h-100">
         <div v-if="configMode">

From 27e3f1d1bc2a91d1cd077e2512754dcd7ec5480c Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 14 Oct 2024 15:40:25 +0200
Subject: [PATCH 1304/1461] take status rejected into account when calculating
 available semster slots for unterbrechung

---
 application/libraries/AntragLib.php                       | 6 ------
 application/models/education/Studierendenantrag_model.php | 7 +++++--
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/application/libraries/AntragLib.php b/application/libraries/AntragLib.php
index c1649587d..e45c4ad34 100644
--- a/application/libraries/AntragLib.php
+++ b/application/libraries/AntragLib.php
@@ -1463,12 +1463,6 @@ class AntragLib
 				elseif($antrag->status == Studierendenantragstatus_model::STATUS_APPROVED && $antrag->datum > $datumStatus)
 					return success(-2);
 			}
-			if ($antrag->typ == Studierendenantrag_model::TYP_UNTERBRECHUNG)
-			{
-				// NOTE(chris): Ignore canceled ones
-				if ($antrag->status == Studierendenantragstatus_model::STATUS_CANCELLED)
-					continue;
-			}
 			if ($antrag->typ == Studierendenantrag_model::TYP_WIEDERHOLUNG)
 			{
 				if($antrag->status == Studierendenantragstatus_model::STATUS_PASS)
diff --git a/application/models/education/Studierendenantrag_model.php b/application/models/education/Studierendenantrag_model.php
index 7595d8036..43edb2449 100644
--- a/application/models/education/Studierendenantrag_model.php
+++ b/application/models/education/Studierendenantrag_model.php
@@ -411,7 +411,7 @@ class Studierendenantrag_model extends DB_Model
 			FROM campus.tbl_studierendenantrag 
 			LEFT JOIN public.tbl_studiensemester USING(studiensemester_kurzbz) 
 			WHERE typ=? 
-			AND campus.get_status_studierendenantrag(studierendenantrag_id) != ?
+			AND campus.get_status_studierendenantrag(studierendenantrag_id) NOT IN ?
 			AND prestudent_id=?
 		) a ON (s.start < a.ende AND s.ende > a.start)
 		WHERE s.start >= (" . $subquery . ")
@@ -421,7 +421,10 @@ class Studierendenantrag_model extends DB_Model
 		return $this->execQuery($sql, [
 			$max_length,
 			self::TYP_UNTERBRECHUNG,
-			Studierendenantragstatus_model::STATUS_CANCELLED,
+			array(
+			    Studierendenantragstatus_model::STATUS_CANCELLED,
+			    Studierendenantragstatus_model::STATUS_REJECTED
+			),
 			$prestudent_id,
 			$studiensemester ?: $prestudent_id,
 			$max_length * $max_starters

From 439ae5113d87d9e4b76bd76f83dbf8d5333ed8ac Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 15 Oct 2024 13:59:11 +0200
Subject: [PATCH 1305/1461] =?UTF-8?q?fix=20unterbrechung=20erstellen=20nic?=
 =?UTF-8?q?ht=20m=C3=B6glich=20wenn=20ein=20abgelehnter=20unterbrechungsan?=
 =?UTF-8?q?trag=20existiert?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/models/education/Studierendenantrag_model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/models/education/Studierendenantrag_model.php b/application/models/education/Studierendenantrag_model.php
index 43edb2449..b7c0667cb 100644
--- a/application/models/education/Studierendenantrag_model.php
+++ b/application/models/education/Studierendenantrag_model.php
@@ -355,7 +355,7 @@ class Studierendenantrag_model extends DB_Model
 		$this->db->where([
 			'prestudent_id' => $prestudent_id,
 			'typ' => Studierendenantrag_model::TYP_UNTERBRECHUNG,
-			'campus.get_status_studierendenantrag(studierendenantrag_id) !=' => Studierendenantragstatus_model::STATUS_CANCELLED,
+			'campus.get_status_studierendenantrag(studierendenantrag_id) NOT IN (\'' . Studierendenantragstatus_model::STATUS_CANCELLED . '\', \'' . Studierendenantragstatus_model::STATUS_REJECTED . '\')' => null,
 			'start < ' . $end => null,
 			'datum_wiedereinstieg > ' . $start => null,
 		]);

From 24ce443e95d7265a7fcb56186f11cf30dca3f0b7 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 15 Oct 2024 17:40:11 +0200
Subject: [PATCH 1306/1461] nur die letzte komm oder zusaetzlichen komm
 Pruefung einer LV beruecksichtigen

---
 application/models/education/Pruefung_model.php | 2 ++
 1 file changed, 2 insertions(+)

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

From e475fe568e11cee436b5d53ffc23084369d2910b Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 17 Oct 2024 09:58:28 +0200
Subject: [PATCH 1307/1461] adds the dashboard menu punkt and adds greeting to
 the dashboard view

---
 application/controllers/Cis4.php           |  9 +++-
 application/models/person/Person_model.php | 15 +++++++
 application/views/CisVue/Dashboard.php     |  2 +-
 system/dbupdate_3.4/25999_C4_Menu.php      | 48 ++++++++++++++++++----
 4 files changed, 65 insertions(+), 9 deletions(-)

diff --git a/application/controllers/Cis4.php b/application/controllers/Cis4.php
index d05b9e5fc..ad4b2dbf9 100755
--- a/application/controllers/Cis4.php
+++ b/application/controllers/Cis4.php
@@ -27,6 +27,13 @@ class Cis4 extends FHC_Controller
 	 */
 	public function index()
 	{
-		$this->load->view('CisVue/Dashboard.php');
+		$this->load->model('person/Person_model','PersonModel');
+		$begrüsung = $this->PersonModel->getFirstName(getAuthUID());
+		if(isError($begrüsung))
+		{
+			show_error("name couldn't be loaded for username ".getAuthUID());
+		}
+		$begrüsung = getData($begrüsung);
+		$this->load->view('CisVue/Dashboard.php',["name"=> $begrüsung]);
 	}
 }
diff --git a/application/models/person/Person_model.php b/application/models/person/Person_model.php
index 88813220e..cc4327318 100755
--- a/application/models/person/Person_model.php
+++ b/application/models/person/Person_model.php
@@ -290,6 +290,21 @@ class Person_model extends DB_Model
 		return success($result->vorname. ' '. $result->nachname);
 	}
 
+	/**
+	 * Get first name of given uid. (Vorname Nachname)
+	 * @param $uid
+	 * @return array
+	 */
+	public function getFirstName($uid)
+	{
+		$result = getData($this->getByUid($uid))[0];
+		if (!$result) {
+			show_error('Failed loading person');
+		}
+
+		return success($result->vorname);
+	}
+
 	public function checkDuplicate($person_id)
 	{
 		$qry = "SELECT person_id
diff --git a/application/views/CisVue/Dashboard.php b/application/views/CisVue/Dashboard.php
index ec08a8ffa..cf97eacab 100755
--- a/application/views/CisVue/Dashboard.php
+++ b/application/views/CisVue/Dashboard.php
@@ -12,7 +12,7 @@ $this->load->view('templates/CISVUE-Header', $includesArray);
 ?>
 
 <div id="content">
-	<h2>Dashboard</h2>
+	<h2>Hallo <?= $name?>!</h2>
 	<hr>
 	<fhc-dashboard dashboard="CIS"/>
 </div>
diff --git a/system/dbupdate_3.4/25999_C4_Menu.php b/system/dbupdate_3.4/25999_C4_Menu.php
index ec31f3cc3..c645fafa1 100755
--- a/system/dbupdate_3.4/25999_C4_Menu.php
+++ b/system/dbupdate_3.4/25999_C4_Menu.php
@@ -117,6 +117,15 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					'redirect','etw',NOW(),null,null,null,TRUE,FALSE,'MYLV'
 				);
 
+				-- DASHBOARD
+
+				INSERT INTO campus.tbl_content 
+				(template_kurzbz, oe_kurzbz, insertamum, insertvon, updateamum, updatevon, aktiv, menu_open, beschreibung)
+				VALUES  
+				(
+					'redirect','etw',NOW(),null,null,null,TRUE,FALSE,'DASHBOARD'
+				);
+
 				-- ##################################### CONTENTSPRACHE
 
 				-- CIS4_ROOT
@@ -272,10 +281,35 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					null,null,null,null,NOW(),null,'MyLv',null
 				);
 
+				-- DASHBOARD
+				
+				INSERT INTO campus.tbl_contentsprache 
+				(sprache, content_id, version, sichtbar, content, reviewvon, reviewamum, updateamum, updatevon, insertamum, insertvon, titel, gesperrt_uid)
+				VALUES  
+				(
+					'German',
+					-- queries the content_id for the DASHBOARD
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'DASHBOARD'),
+					1,TRUE,
+					'<content><url><![CDATA[../cis.php/Cis4]]></url><target><![CDATA[]]></target></content>',
+					null,null,null,null,NOW(),null,'Dashboard',null
+				);
+
 				-- ##################################### CONTENTCHILD
 
 				-- CIS4_ROOT childs
 
+				INSERT INTO campus.tbl_contentchild
+				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
+				VALUES
+				(
+					-- queries the content_id for the CIS4_ROOT
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'CIS4_ROOT'),
+					-- queries the content_id for the DASHBOARD
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'DASHBOARD'),
+					NOW(), null, null, null, 1
+				);
+
 				INSERT INTO campus.tbl_contentchild
 				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
 				VALUES
@@ -284,7 +318,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'CIS4_ROOT'),
 					-- queries the content_id for the MEIN_STUDIUM
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'MEIN_STUDIUM'),
-					NOW(), null, null, null, 1
+					NOW(), null, null, null, 2
 				);
 
 				INSERT INTO campus.tbl_contentchild
@@ -295,7 +329,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'CIS4_ROOT'),
 					-- queries the content_id for the VPN_STUDIERENDE
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'VPN_STUDIERENDE'),
-					NOW(), null, null, null, 2
+					NOW(), null, null, null, 3
 				);
 
 				INSERT INTO campus.tbl_contentchild
@@ -306,7 +340,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'CIS4_ROOT'),
 					-- queries the content_id for the NEWS
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'NEWS'),
-					NOW(), null, null, null, 3
+					NOW(), null, null, null, 4
 				);
 
 				INSERT INTO campus.tbl_contentchild
@@ -317,7 +351,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'CIS4_ROOT'),
 					-- queries the content_id for the DOKUMENTE
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'DOKUMENTE'),
-					NOW(), null, null, null, 4
+					NOW(), null, null, null, 5
 				);
 
 				INSERT INTO campus.tbl_contentchild
@@ -328,7 +362,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'CIS4_ROOT'),
 					-- queries the content_id for the TLC
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'TLC'),
-					NOW(), null, null, null, 5
+					NOW(), null, null, null, 6
 				);
 
 				INSERT INTO campus.tbl_contentchild
@@ -338,7 +372,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					-- queries the content_id for the CIS4_ROOT
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'CIS4_ROOT'),
 					-- 10487 is the content_id for Modul International Skills
-					10487, NOW(), null, null, null, 6
+					10487, NOW(), null, null, null, 7
 				);
 
 				INSERT INTO campus.tbl_contentchild
@@ -348,7 +382,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					-- queries the content_id for the CIS4_ROOT
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'CIS4_ROOT'),
 					-- 10568 is the content_id for Zahlungen
-					10568, NOW(), null, null, null, 7
+					10568, NOW(), null, null, null, 8
 				);
 
 				-- Mein Studium childs

From a04b2725f98fd794c721820ee979ae45f9dfdd64 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 17 Oct 2024 15:04:03 +0200
Subject: [PATCH 1308/1461] csv download lektor table as is; cis_menu_lv link
 hidden behind berechtigungen check; every tabulator now calculates remaining
 height by accessing window.visibleViewport.height and tabulator dataset
 element in order to get virtual DOM behaviour for faster rendering and better
 UX; filter component now emits uuid on created() lifecycle;

---
 include/tw/cis_menu_lv.inc.php        |  6 +++++-
 public/js/components/filter/Filter.js |  6 ++++--
 system/phrasesupdate.php              | 20 ++++++++++++++++++++
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/include/tw/cis_menu_lv.inc.php b/include/tw/cis_menu_lv.inc.php
index 529c1aa5a..6906bcc0f 100644
--- a/include/tw/cis_menu_lv.inc.php
+++ b/include/tw/cis_menu_lv.inc.php
@@ -241,7 +241,11 @@ function checkZeilenUmbruch()
 	}
 
 	// Digitale Anwesenheiten
-	if(CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN && $angemeldet)
+	if(CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN && $angemeldet
+			&& ($rechte->isBerechtigt('extension/anw_ent_admin')
+				|| $rechte->isBerechtigt('extension/anwesenheit_lektor')
+				|| $rechte->isBerechtigt('extension/anwesenheit_student')
+				|| $rechte->isBerechtigt('extension/anwesenheit_admin')))
 	{
 
 		$link='';
diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index 047764609..6a668112c 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -42,7 +42,8 @@ export const CoreFilterCmpt = {
 	},
 	emits: [
 		'nwNewEntry',
-		'click:new'
+		'click:new',
+		'uuidDefined'
 	],
 	props: {
 		onNwNewEntry: Function, // NOTE(chris): Hack to get the nwNewEntry listener into $props
@@ -568,6 +569,7 @@ export const CoreFilterCmpt = {
 		if (this.sideMenu && (!this.$props.onNwNewEntry || !(this.$props.onNwNewEntry instanceof Function)))
 			alert('"nwNewEntry" listener is mandatory when sideMenu is true');
 		this.uuid = _uuid++;
+		this.$emit('uuidDefined', this.uuid)
 		if (!this.tableOnly)
 			this.getFilter(); // get the filter data
 	},
@@ -658,4 +660,4 @@ export const CoreFilterCmpt = {
 		<!-- Tabulator -->
 		<div ref="table" :id="'filterTableDataset' + idExtra" class="filter-table-dataset"></div>
 	`
-};
+};
\ No newline at end of file
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 008d2901d..b260d728c 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -28178,6 +28178,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'prestudentID',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Prestudent ID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Prestudent ID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	//
 	// DIGITALE ANWESENHEITEN PHRASEN END
 	//

From d4494836b16b37fb6ef19b07b4fb72392f1c1030 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 17 Oct 2024 15:34:00 +0200
Subject: [PATCH 1309/1461] fix file permissions erroneously commited as
 a21a292da65580dc641de9d73451ddbc8be3f4df

---
 .gitignore                                          |   0
 CHANGELOG.md                                        |   0
 FHC-vendor/angular-tablesort/.gitignore             |   0
 FHC-vendor/angular-tablesort/LICENSE                |   0
 FHC-vendor/angular-tablesort/README.md              |   0
 FHC-vendor/angular-tablesort/bower.json             |   0
 FHC-vendor/angular-tablesort/example.html           |   0
 FHC-vendor/angular-tablesort/index.js               |   0
 .../angular-tablesort/js/angular-tablesort.js       |   0
 FHC-vendor/angular-tablesort/package.json           |   0
 FHC-vendor/angular-tablesort/tablesort.css          |   0
 FHC-vendor/easyui/changelog.txt                     |   0
 FHC-vendor/easyui/easyloader.js                     |   0
 FHC-vendor/easyui/jquery.easyui.min.js              |   0
 FHC-vendor/easyui/jquery.easyui.mobile.js           |   0
 FHC-vendor/easyui/jquery.min.js                     |   0
 FHC-vendor/easyui/license_freeware.txt              |   0
 FHC-vendor/easyui/locale/easyui-lang-af.js          |   0
 FHC-vendor/easyui/locale/easyui-lang-am.js          |   0
 FHC-vendor/easyui/locale/easyui-lang-ar.js          |   0
 FHC-vendor/easyui/locale/easyui-lang-bg.js          |   0
 FHC-vendor/easyui/locale/easyui-lang-ca.js          |   0
 FHC-vendor/easyui/locale/easyui-lang-cs.js          |   0
 FHC-vendor/easyui/locale/easyui-lang-cz.js          |   0
 FHC-vendor/easyui/locale/easyui-lang-da.js          |   0
 FHC-vendor/easyui/locale/easyui-lang-de.js          |   0
 FHC-vendor/easyui/locale/easyui-lang-el.js          |   0
 FHC-vendor/easyui/locale/easyui-lang-en.js          |   0
 FHC-vendor/easyui/locale/easyui-lang-es.js          |   0
 FHC-vendor/easyui/locale/easyui-lang-fr.js          |   0
 FHC-vendor/easyui/locale/easyui-lang-it.js          |   0
 FHC-vendor/easyui/locale/easyui-lang-jp.js          |   0
 FHC-vendor/easyui/locale/easyui-lang-nl.js          |   0
 FHC-vendor/easyui/locale/easyui-lang-pl.js          |   0
 FHC-vendor/easyui/locale/easyui-lang-pt_BR.js       |   0
 FHC-vendor/easyui/locale/easyui-lang-ru.js          |   0
 FHC-vendor/easyui/locale/easyui-lang-sv_SE.js       |   0
 FHC-vendor/easyui/locale/easyui-lang-tr.js          |   0
 FHC-vendor/easyui/locale/easyui-lang-zh_CN.js       |   0
 FHC-vendor/easyui/locale/easyui-lang-zh_TW.js       |   0
 FHC-vendor/easyui/plugins/jquery.accordion.js       |   0
 FHC-vendor/easyui/plugins/jquery.calendar.js        |   0
 FHC-vendor/easyui/plugins/jquery.combo.js           |   0
 FHC-vendor/easyui/plugins/jquery.combobox.js        |   0
 FHC-vendor/easyui/plugins/jquery.combogrid.js       |   0
 FHC-vendor/easyui/plugins/jquery.combotree.js       |   0
 FHC-vendor/easyui/plugins/jquery.datagrid.js        |   0
 FHC-vendor/easyui/plugins/jquery.datalist.js        |   0
 FHC-vendor/easyui/plugins/jquery.datebox.js         |   0
 FHC-vendor/easyui/plugins/jquery.datetimebox.js     |   0
 FHC-vendor/easyui/plugins/jquery.datetimespinner.js |   0
 FHC-vendor/easyui/plugins/jquery.dialog.js          |   0
 FHC-vendor/easyui/plugins/jquery.draggable.js       |   0
 FHC-vendor/easyui/plugins/jquery.droppable.js       |   0
 FHC-vendor/easyui/plugins/jquery.filebox.js         |   0
 FHC-vendor/easyui/plugins/jquery.form.js            |   0
 FHC-vendor/easyui/plugins/jquery.layout.js          |   0
 FHC-vendor/easyui/plugins/jquery.linkbutton.js      |   0
 FHC-vendor/easyui/plugins/jquery.menu.js            |   0
 FHC-vendor/easyui/plugins/jquery.menubutton.js      |   0
 FHC-vendor/easyui/plugins/jquery.messager.js        |   0
 FHC-vendor/easyui/plugins/jquery.mobile.js          |   0
 FHC-vendor/easyui/plugins/jquery.numberbox.js       |   0
 FHC-vendor/easyui/plugins/jquery.numberspinner.js   |   0
 FHC-vendor/easyui/plugins/jquery.pagination.js      |   0
 FHC-vendor/easyui/plugins/jquery.panel.js           |   0
 FHC-vendor/easyui/plugins/jquery.parser.js          |   0
 FHC-vendor/easyui/plugins/jquery.progressbar.js     |   0
 FHC-vendor/easyui/plugins/jquery.propertygrid.js    |   0
 FHC-vendor/easyui/plugins/jquery.resizable.js       |   0
 FHC-vendor/easyui/plugins/jquery.searchbox.js       |   0
 FHC-vendor/easyui/plugins/jquery.slider.js          |   0
 FHC-vendor/easyui/plugins/jquery.spinner.js         |   0
 FHC-vendor/easyui/plugins/jquery.splitbutton.js     |   0
 FHC-vendor/easyui/plugins/jquery.switchbutton.js    |   0
 FHC-vendor/easyui/plugins/jquery.tabs.js            |   0
 FHC-vendor/easyui/plugins/jquery.textbox.js         |   0
 FHC-vendor/easyui/plugins/jquery.timespinner.js     |   0
 FHC-vendor/easyui/plugins/jquery.tooltip.js         |   0
 FHC-vendor/easyui/plugins/jquery.tree.js            |   0
 FHC-vendor/easyui/plugins/jquery.treegrid.js        |   0
 FHC-vendor/easyui/plugins/jquery.validatebox.js     |   0
 FHC-vendor/easyui/plugins/jquery.window.js          |   0
 FHC-vendor/easyui/readme.txt                        |   0
 FHC-vendor/easyui/src/easyloader.js                 |   0
 FHC-vendor/easyui/src/jquery.accordion.js           |   0
 FHC-vendor/easyui/src/jquery.calendar.js            |   0
 FHC-vendor/easyui/src/jquery.combobox.js            |   0
 FHC-vendor/easyui/src/jquery.datebox.js             |   0
 FHC-vendor/easyui/src/jquery.draggable.js           |   0
 FHC-vendor/easyui/src/jquery.droppable.js           |   0
 FHC-vendor/easyui/src/jquery.form.js                |   0
 FHC-vendor/easyui/src/jquery.linkbutton.js          |   0
 FHC-vendor/easyui/src/jquery.menu.js                |   0
 FHC-vendor/easyui/src/jquery.parser.js              |   0
 FHC-vendor/easyui/src/jquery.progressbar.js         |   0
 FHC-vendor/easyui/src/jquery.propertygrid.js        |   0
 FHC-vendor/easyui/src/jquery.resizable.js           |   0
 FHC-vendor/easyui/src/jquery.slider.js              |   0
 FHC-vendor/easyui/src/jquery.tabs.js                |   0
 FHC-vendor/easyui/src/jquery.window.js              |   0
 FHC-vendor/easyui/themes/black/accordion.css        |   0
 FHC-vendor/easyui/themes/black/calendar.css         |   0
 FHC-vendor/easyui/themes/black/combo.css            |   0
 FHC-vendor/easyui/themes/black/combobox.css         |   0
 FHC-vendor/easyui/themes/black/datagrid.css         |   0
 FHC-vendor/easyui/themes/black/datalist.css         |   0
 FHC-vendor/easyui/themes/black/datebox.css          |   0
 FHC-vendor/easyui/themes/black/dialog.css           |   0
 FHC-vendor/easyui/themes/black/easyui.css           |   0
 FHC-vendor/easyui/themes/black/filebox.css          |   0
 .../easyui/themes/black/images/accordion_arrows.png | Bin
 FHC-vendor/easyui/themes/black/images/blank.gif     | Bin
 .../easyui/themes/black/images/calendar_arrows.png  | Bin
 .../easyui/themes/black/images/combo_arrow.png      | Bin
 .../easyui/themes/black/images/datagrid_icons.png   | Bin
 .../easyui/themes/black/images/datebox_arrow.png    | Bin
 .../easyui/themes/black/images/layout_arrows.png    | Bin
 .../easyui/themes/black/images/linkbutton_bg.png    | Bin
 FHC-vendor/easyui/themes/black/images/loading.gif   | Bin
 .../easyui/themes/black/images/menu_arrows.png      | Bin
 .../easyui/themes/black/images/messager_icons.png   | Bin
 .../easyui/themes/black/images/pagination_icons.png | Bin
 .../easyui/themes/black/images/panel_tools.png      | Bin
 .../easyui/themes/black/images/searchbox_button.png | Bin
 .../easyui/themes/black/images/slider_handle.png    | Bin
 .../easyui/themes/black/images/spinner_arrows.png   | Bin
 .../easyui/themes/black/images/tabs_icons.png       | Bin
 .../easyui/themes/black/images/tree_icons.png       | Bin
 .../themes/black/images/validatebox_warning.png     | Bin
 FHC-vendor/easyui/themes/black/layout.css           |   0
 FHC-vendor/easyui/themes/black/linkbutton.css       |   0
 FHC-vendor/easyui/themes/black/menu.css             |   0
 FHC-vendor/easyui/themes/black/menubutton.css       |   0
 FHC-vendor/easyui/themes/black/messager.css         |   0
 FHC-vendor/easyui/themes/black/numberbox.css        |   0
 FHC-vendor/easyui/themes/black/pagination.css       |   0
 FHC-vendor/easyui/themes/black/panel.css            |   0
 FHC-vendor/easyui/themes/black/progressbar.css      |   0
 FHC-vendor/easyui/themes/black/propertygrid.css     |   0
 FHC-vendor/easyui/themes/black/searchbox.css        |   0
 FHC-vendor/easyui/themes/black/slider.css           |   0
 FHC-vendor/easyui/themes/black/spinner.css          |   0
 FHC-vendor/easyui/themes/black/splitbutton.css      |   0
 FHC-vendor/easyui/themes/black/switchbutton.css     |   0
 FHC-vendor/easyui/themes/black/tabs.css             |   0
 FHC-vendor/easyui/themes/black/textbox.css          |   0
 FHC-vendor/easyui/themes/black/tooltip.css          |   0
 FHC-vendor/easyui/themes/black/tree.css             |   0
 FHC-vendor/easyui/themes/black/validatebox.css      |   0
 FHC-vendor/easyui/themes/black/window.css           |   0
 FHC-vendor/easyui/themes/bootstrap/accordion.css    |   0
 FHC-vendor/easyui/themes/bootstrap/calendar.css     |   0
 FHC-vendor/easyui/themes/bootstrap/combo.css        |   0
 FHC-vendor/easyui/themes/bootstrap/combobox.css     |   0
 FHC-vendor/easyui/themes/bootstrap/datagrid.css     |   0
 FHC-vendor/easyui/themes/bootstrap/datebox.css      |   0
 FHC-vendor/easyui/themes/bootstrap/dialog.css       |   0
 FHC-vendor/easyui/themes/bootstrap/easyui.css       |   0
 FHC-vendor/easyui/themes/bootstrap/filebox.css      |   0
 .../themes/bootstrap/images/accordion_arrows.png    | Bin
 FHC-vendor/easyui/themes/bootstrap/images/blank.gif | Bin
 .../themes/bootstrap/images/calendar_arrows.png     | Bin
 .../easyui/themes/bootstrap/images/combo_arrow.png  | Bin
 .../themes/bootstrap/images/datagrid_icons.png      | Bin
 .../themes/bootstrap/images/datebox_arrow.png       | Bin
 .../themes/bootstrap/images/layout_arrows.png       | Bin
 .../themes/bootstrap/images/linkbutton_bg.png       | Bin
 .../easyui/themes/bootstrap/images/loading.gif      | Bin
 .../easyui/themes/bootstrap/images/menu_arrows.png  | Bin
 .../themes/bootstrap/images/messager_icons.png      | Bin
 .../themes/bootstrap/images/pagination_icons.png    | Bin
 .../easyui/themes/bootstrap/images/panel_tools.png  | Bin
 .../themes/bootstrap/images/searchbox_button.png    | Bin
 .../themes/bootstrap/images/slider_handle.png       | Bin
 .../themes/bootstrap/images/spinner_arrows.png      | Bin
 .../easyui/themes/bootstrap/images/tabs_icons.png   | Bin
 .../easyui/themes/bootstrap/images/tree_icons.png   | Bin
 .../themes/bootstrap/images/validatebox_warning.png | Bin
 FHC-vendor/easyui/themes/bootstrap/layout.css       |   0
 FHC-vendor/easyui/themes/bootstrap/linkbutton.css   |   0
 FHC-vendor/easyui/themes/bootstrap/menu.css         |   0
 FHC-vendor/easyui/themes/bootstrap/menubutton.css   |   0
 FHC-vendor/easyui/themes/bootstrap/messager.css     |   0
 FHC-vendor/easyui/themes/bootstrap/numberbox.css    |   0
 FHC-vendor/easyui/themes/bootstrap/pagination.css   |   0
 FHC-vendor/easyui/themes/bootstrap/panel.css        |   0
 FHC-vendor/easyui/themes/bootstrap/progressbar.css  |   0
 FHC-vendor/easyui/themes/bootstrap/propertygrid.css |   0
 FHC-vendor/easyui/themes/bootstrap/searchbox.css    |   0
 FHC-vendor/easyui/themes/bootstrap/slider.css       |   0
 FHC-vendor/easyui/themes/bootstrap/spinner.css      |   0
 FHC-vendor/easyui/themes/bootstrap/splitbutton.css  |   0
 FHC-vendor/easyui/themes/bootstrap/switchbutton.css |   0
 FHC-vendor/easyui/themes/bootstrap/tabs.css         |   0
 FHC-vendor/easyui/themes/bootstrap/textbox.css      |   0
 FHC-vendor/easyui/themes/bootstrap/tooltip.css      |   0
 FHC-vendor/easyui/themes/bootstrap/tree.css         |   0
 FHC-vendor/easyui/themes/bootstrap/validatebox.css  |   0
 FHC-vendor/easyui/themes/bootstrap/window.css       |   0
 FHC-vendor/easyui/themes/color.css                  |   0
 FHC-vendor/easyui/themes/default/accordion.css      |   0
 FHC-vendor/easyui/themes/default/calendar.css       |   0
 FHC-vendor/easyui/themes/default/combo.css          |   0
 FHC-vendor/easyui/themes/default/combobox.css       |   0
 FHC-vendor/easyui/themes/default/datagrid.css       |   0
 FHC-vendor/easyui/themes/default/datalist.css       |   0
 FHC-vendor/easyui/themes/default/datebox.css        |   0
 FHC-vendor/easyui/themes/default/dialog.css         |   0
 FHC-vendor/easyui/themes/default/easyui.css         |   0
 FHC-vendor/easyui/themes/default/filebox.css        |   0
 .../themes/default/images/accordion_arrows.png      | Bin
 FHC-vendor/easyui/themes/default/images/blank.gif   | Bin
 .../themes/default/images/calendar_arrows.png       | Bin
 .../easyui/themes/default/images/combo_arrow.png    | Bin
 .../easyui/themes/default/images/datagrid_icons.png | Bin
 .../easyui/themes/default/images/datebox_arrow.png  | Bin
 .../easyui/themes/default/images/layout_arrows.png  | Bin
 .../easyui/themes/default/images/linkbutton_bg.png  | Bin
 FHC-vendor/easyui/themes/default/images/loading.gif | Bin
 .../easyui/themes/default/images/menu_arrows.png    | Bin
 .../easyui/themes/default/images/messager_icons.png | Bin
 .../themes/default/images/pagination_icons.png      | Bin
 .../easyui/themes/default/images/panel_tools.png    | Bin
 .../themes/default/images/searchbox_button.png      | Bin
 .../easyui/themes/default/images/slider_handle.png  | Bin
 .../easyui/themes/default/images/spinner_arrows.png | Bin
 .../easyui/themes/default/images/tabs_icons.png     | Bin
 .../easyui/themes/default/images/tree_icons.png     | Bin
 .../themes/default/images/validatebox_warning.png   | Bin
 FHC-vendor/easyui/themes/default/layout.css         |   0
 FHC-vendor/easyui/themes/default/linkbutton.css     |   0
 FHC-vendor/easyui/themes/default/menu.css           |   0
 FHC-vendor/easyui/themes/default/menubutton.css     |   0
 FHC-vendor/easyui/themes/default/messager.css       |   0
 FHC-vendor/easyui/themes/default/numberbox.css      |   0
 FHC-vendor/easyui/themes/default/pagination.css     |   0
 FHC-vendor/easyui/themes/default/panel.css          |   0
 FHC-vendor/easyui/themes/default/progressbar.css    |   0
 FHC-vendor/easyui/themes/default/propertygrid.css   |   0
 FHC-vendor/easyui/themes/default/searchbox.css      |   0
 FHC-vendor/easyui/themes/default/slider.css         |   0
 FHC-vendor/easyui/themes/default/spinner.css        |   0
 FHC-vendor/easyui/themes/default/splitbutton.css    |   0
 FHC-vendor/easyui/themes/default/switchbutton.css   |   0
 FHC-vendor/easyui/themes/default/tabs.css           |   0
 FHC-vendor/easyui/themes/default/textbox.css        |   0
 FHC-vendor/easyui/themes/default/tooltip.css        |   0
 FHC-vendor/easyui/themes/default/tree.css           |   0
 FHC-vendor/easyui/themes/default/validatebox.css    |   0
 FHC-vendor/easyui/themes/default/window.css         |   0
 FHC-vendor/easyui/themes/gray/accordion.css         |   0
 FHC-vendor/easyui/themes/gray/calendar.css          |   0
 FHC-vendor/easyui/themes/gray/combo.css             |   0
 FHC-vendor/easyui/themes/gray/combobox.css          |   0
 FHC-vendor/easyui/themes/gray/datagrid.css          |   0
 FHC-vendor/easyui/themes/gray/datalist.css          |   0
 FHC-vendor/easyui/themes/gray/datebox.css           |   0
 FHC-vendor/easyui/themes/gray/dialog.css            |   0
 FHC-vendor/easyui/themes/gray/easyui.css            |   0
 FHC-vendor/easyui/themes/gray/filebox.css           |   0
 .../easyui/themes/gray/images/accordion_arrows.png  | Bin
 FHC-vendor/easyui/themes/gray/images/blank.gif      | Bin
 .../easyui/themes/gray/images/calendar_arrows.png   | Bin
 .../easyui/themes/gray/images/combo_arrow.png       | Bin
 .../easyui/themes/gray/images/datagrid_icons.png    | Bin
 .../easyui/themes/gray/images/datebox_arrow.png     | Bin
 .../easyui/themes/gray/images/layout_arrows.png     | Bin
 .../easyui/themes/gray/images/linkbutton_bg.png     | Bin
 FHC-vendor/easyui/themes/gray/images/loading.gif    | Bin
 .../easyui/themes/gray/images/menu_arrows.png       | Bin
 .../easyui/themes/gray/images/messager_icons.png    | Bin
 .../easyui/themes/gray/images/pagination_icons.png  | Bin
 .../easyui/themes/gray/images/panel_tools.png       | Bin
 .../easyui/themes/gray/images/searchbox_button.png  | Bin
 .../easyui/themes/gray/images/slider_handle.png     | Bin
 .../easyui/themes/gray/images/spinner_arrows.png    | Bin
 FHC-vendor/easyui/themes/gray/images/tabs_icons.png | Bin
 FHC-vendor/easyui/themes/gray/images/tree_icons.png | Bin
 .../themes/gray/images/validatebox_warning.png      | Bin
 FHC-vendor/easyui/themes/gray/layout.css            |   0
 FHC-vendor/easyui/themes/gray/linkbutton.css        |   0
 FHC-vendor/easyui/themes/gray/menu.css              |   0
 FHC-vendor/easyui/themes/gray/menubutton.css        |   0
 FHC-vendor/easyui/themes/gray/messager.css          |   0
 FHC-vendor/easyui/themes/gray/numberbox.css         |   0
 FHC-vendor/easyui/themes/gray/pagination.css        |   0
 FHC-vendor/easyui/themes/gray/panel.css             |   0
 FHC-vendor/easyui/themes/gray/progressbar.css       |   0
 FHC-vendor/easyui/themes/gray/propertygrid.css      |   0
 FHC-vendor/easyui/themes/gray/searchbox.css         |   0
 FHC-vendor/easyui/themes/gray/slider.css            |   0
 FHC-vendor/easyui/themes/gray/spinner.css           |   0
 FHC-vendor/easyui/themes/gray/splitbutton.css       |   0
 FHC-vendor/easyui/themes/gray/switchbutton.css      |   0
 FHC-vendor/easyui/themes/gray/tabs.css              |   0
 FHC-vendor/easyui/themes/gray/textbox.css           |   0
 FHC-vendor/easyui/themes/gray/tooltip.css           |   0
 FHC-vendor/easyui/themes/gray/tree.css              |   0
 FHC-vendor/easyui/themes/gray/validatebox.css       |   0
 FHC-vendor/easyui/themes/gray/window.css            |   0
 FHC-vendor/easyui/themes/icon.css                   |   0
 FHC-vendor/easyui/themes/icons/back.png             | Bin
 FHC-vendor/easyui/themes/icons/blank.gif            | Bin
 FHC-vendor/easyui/themes/icons/cancel.png           | Bin
 FHC-vendor/easyui/themes/icons/clear.png            | Bin
 FHC-vendor/easyui/themes/icons/cut.png              | Bin
 FHC-vendor/easyui/themes/icons/edit_add.png         | Bin
 FHC-vendor/easyui/themes/icons/edit_remove.png      | Bin
 FHC-vendor/easyui/themes/icons/filesave.png         | Bin
 FHC-vendor/easyui/themes/icons/filter.png           | Bin
 FHC-vendor/easyui/themes/icons/help.png             | Bin
 FHC-vendor/easyui/themes/icons/large_chart.png      | Bin
 FHC-vendor/easyui/themes/icons/large_clipart.png    | Bin
 FHC-vendor/easyui/themes/icons/large_picture.png    | Bin
 FHC-vendor/easyui/themes/icons/large_shapes.png     | Bin
 FHC-vendor/easyui/themes/icons/large_smartart.png   | Bin
 FHC-vendor/easyui/themes/icons/lock.png             | Bin
 FHC-vendor/easyui/themes/icons/man.png              | Bin
 FHC-vendor/easyui/themes/icons/mini_add.png         | Bin
 FHC-vendor/easyui/themes/icons/mini_edit.png        | Bin
 FHC-vendor/easyui/themes/icons/mini_refresh.png     | Bin
 FHC-vendor/easyui/themes/icons/more.png             | Bin
 FHC-vendor/easyui/themes/icons/no.png               | Bin
 FHC-vendor/easyui/themes/icons/ok.png               | Bin
 FHC-vendor/easyui/themes/icons/pencil.png           | Bin
 FHC-vendor/easyui/themes/icons/print.png            | Bin
 FHC-vendor/easyui/themes/icons/redo.png             | Bin
 FHC-vendor/easyui/themes/icons/reload.png           | Bin
 FHC-vendor/easyui/themes/icons/search.png           | Bin
 FHC-vendor/easyui/themes/icons/sum.png              | Bin
 FHC-vendor/easyui/themes/icons/tip.png              | Bin
 FHC-vendor/easyui/themes/icons/undo.png             | Bin
 FHC-vendor/easyui/themes/metro/accordion.css        |   0
 FHC-vendor/easyui/themes/metro/calendar.css         |   0
 FHC-vendor/easyui/themes/metro/combo.css            |   0
 FHC-vendor/easyui/themes/metro/combobox.css         |   0
 FHC-vendor/easyui/themes/metro/datagrid.css         |   0
 FHC-vendor/easyui/themes/metro/datalist.css         |   0
 FHC-vendor/easyui/themes/metro/datebox.css          |   0
 FHC-vendor/easyui/themes/metro/dialog.css           |   0
 FHC-vendor/easyui/themes/metro/easyui.css           |   0
 FHC-vendor/easyui/themes/metro/filebox.css          |   0
 .../easyui/themes/metro/images/accordion_arrows.png | Bin
 FHC-vendor/easyui/themes/metro/images/blank.gif     | Bin
 .../easyui/themes/metro/images/calendar_arrows.png  | Bin
 .../easyui/themes/metro/images/combo_arrow.png      | Bin
 .../easyui/themes/metro/images/datagrid_icons.png   | Bin
 .../easyui/themes/metro/images/datebox_arrow.png    | Bin
 .../easyui/themes/metro/images/layout_arrows.png    | Bin
 .../easyui/themes/metro/images/linkbutton_bg.png    | Bin
 FHC-vendor/easyui/themes/metro/images/loading.gif   | Bin
 .../easyui/themes/metro/images/menu_arrows.png      | Bin
 .../easyui/themes/metro/images/messager_icons.png   | Bin
 .../easyui/themes/metro/images/pagination_icons.png | Bin
 .../easyui/themes/metro/images/panel_tools.png      | Bin
 .../easyui/themes/metro/images/searchbox_button.png | Bin
 .../easyui/themes/metro/images/slider_handle.png    | Bin
 .../easyui/themes/metro/images/spinner_arrows.png   | Bin
 .../easyui/themes/metro/images/tabs_icons.png       | Bin
 .../easyui/themes/metro/images/tree_icons.png       | Bin
 .../themes/metro/images/validatebox_warning.png     | Bin
 FHC-vendor/easyui/themes/metro/layout.css           |   0
 FHC-vendor/easyui/themes/metro/linkbutton.css       |   0
 FHC-vendor/easyui/themes/metro/menu.css             |   0
 FHC-vendor/easyui/themes/metro/menubutton.css       |   0
 FHC-vendor/easyui/themes/metro/messager.css         |   0
 FHC-vendor/easyui/themes/metro/numberbox.css        |   0
 FHC-vendor/easyui/themes/metro/pagination.css       |   0
 FHC-vendor/easyui/themes/metro/panel.css            |   0
 FHC-vendor/easyui/themes/metro/progressbar.css      |   0
 FHC-vendor/easyui/themes/metro/propertygrid.css     |   0
 FHC-vendor/easyui/themes/metro/searchbox.css        |   0
 FHC-vendor/easyui/themes/metro/slider.css           |   0
 FHC-vendor/easyui/themes/metro/spinner.css          |   0
 FHC-vendor/easyui/themes/metro/splitbutton.css      |   0
 FHC-vendor/easyui/themes/metro/switchbutton.css     |   0
 FHC-vendor/easyui/themes/metro/tabs.css             |   0
 FHC-vendor/easyui/themes/metro/textbox.css          |   0
 FHC-vendor/easyui/themes/metro/tooltip.css          |   0
 FHC-vendor/easyui/themes/metro/tree.css             |   0
 FHC-vendor/easyui/themes/metro/validatebox.css      |   0
 FHC-vendor/easyui/themes/metro/window.css           |   0
 FHC-vendor/easyui/themes/mobile.css                 |   0
 FHC-vendor/easyui/themes/vilesci                    |   0
 FHC-vendor/jquery-tablesorter/.gitattributes        |   0
 FHC-vendor/jquery-tablesorter/.gitignore            |   0
 FHC-vendor/jquery-tablesorter/.jscsrc               |   0
 FHC-vendor/jquery-tablesorter/CONTRIBUTING.md       |   0
 FHC-vendor/jquery-tablesorter/Gruntfile.js          |   0
 FHC-vendor/jquery-tablesorter/README.md             |   0
 .../jquery-tablesorter/addons/pager/icons/first.png | Bin
 .../jquery-tablesorter/addons/pager/icons/last.png  | Bin
 .../addons/pager/icons/loading.gif                  | Bin
 .../jquery-tablesorter/addons/pager/icons/next.png  | Bin
 .../jquery-tablesorter/addons/pager/icons/prev.png  | Bin
 .../addons/pager/jquery.tablesorter.pager.css       |   0
 .../addons/pager/jquery.tablesorter.pager.js        |   0
 .../beta-testing/example-pager-custom-controls.html |   0
 .../beta-testing/example-widget-column-reorder.html |   0
 .../beta-testing/pager-custom-controls.js           |   0
 .../beta-testing/widget-reorder.js                  |   0
 FHC-vendor/jquery-tablesorter/bower.json            |   0
 FHC-vendor/jquery-tablesorter/changelog.txt         |   0
 FHC-vendor/jquery-tablesorter/css/bootstrap.less    |   0
 FHC-vendor/jquery-tablesorter/css/dragtable.mod.css |   0
 .../jquery-tablesorter/css/filter.formatter.css     |   0
 .../jquery-tablesorter/css/images/black-asc.gif     | Bin
 .../jquery-tablesorter/css/images/black-desc.gif    | Bin
 .../css/images/black-unsorted.gif                   | Bin
 .../css/images/bootstrap-black-unsorted.png         | Bin
 .../css/images/bootstrap-white-unsorted.png         | Bin
 .../css/images/dragtable-handle.png                 | Bin
 .../css/images/dragtable-handle.svg                 |   0
 .../css/images/dropbox-asc-hovered.png              | Bin
 .../jquery-tablesorter/css/images/dropbox-asc.png   | Bin
 .../css/images/dropbox-desc-hovered.png             | Bin
 .../jquery-tablesorter/css/images/dropbox-desc.png  | Bin
 .../jquery-tablesorter/css/images/green-asc.gif     | Bin
 .../jquery-tablesorter/css/images/green-desc.gif    | Bin
 .../jquery-tablesorter/css/images/green-header.gif  | Bin
 .../css/images/green-unsorted.gif                   | Bin
 .../jquery-tablesorter/css/images/ice-asc.gif       | Bin
 .../jquery-tablesorter/css/images/ice-desc.gif      | Bin
 .../jquery-tablesorter/css/images/ice-unsorted.gif  | Bin
 .../css/images/metro-black-asc.png                  | Bin
 .../css/images/metro-black-desc.png                 | Bin
 .../jquery-tablesorter/css/images/metro-loading.gif | Bin
 .../css/images/metro-unsorted.png                   | Bin
 .../css/images/metro-white-asc.png                  | Bin
 .../css/images/metro-white-desc.png                 | Bin
 .../jquery-tablesorter/css/images/white-asc.gif     | Bin
 .../jquery-tablesorter/css/images/white-desc.gif    | Bin
 .../css/images/white-unsorted.gif                   | Bin
 FHC-vendor/jquery-tablesorter/css/metro.less        |   0
 FHC-vendor/jquery-tablesorter/css/psd/green-asc.psd | Bin
 .../jquery-tablesorter/css/psd/green-desc.psd       | Bin
 .../jquery-tablesorter/css/psd/green-unsorted.psd   | Bin
 .../jquery-tablesorter/css/psd/metro-style.psd      | Bin
 .../jquery-tablesorter/css/theme.black-ice.css      |   0
 FHC-vendor/jquery-tablesorter/css/theme.blue.css    |   0
 .../jquery-tablesorter/css/theme.bootstrap.css      |   0
 .../jquery-tablesorter/css/theme.bootstrap_2.css    |   0
 FHC-vendor/jquery-tablesorter/css/theme.dark.css    |   0
 FHC-vendor/jquery-tablesorter/css/theme.default.css |   0
 FHC-vendor/jquery-tablesorter/css/theme.dropbox.css |   0
 FHC-vendor/jquery-tablesorter/css/theme.green.css   |   0
 FHC-vendor/jquery-tablesorter/css/theme.grey.css    |   0
 FHC-vendor/jquery-tablesorter/css/theme.ice.css     |   0
 FHC-vendor/jquery-tablesorter/css/theme.jui.css     |   0
 FHC-vendor/jquery-tablesorter/css/theme.less        |   0
 .../jquery-tablesorter/css/theme.metro-dark.css     |   0
 .../dist/css/dragtable.mod.min.css                  |   0
 .../dist/css/filter.formatter.min.css               |   0
 .../dist/css/images/black-asc.gif                   | Bin
 .../dist/css/images/black-desc.gif                  | Bin
 .../dist/css/images/black-unsorted.gif              | Bin
 .../dist/css/images/bootstrap-black-unsorted.png    | Bin
 .../dist/css/images/bootstrap-white-unsorted.png    | Bin
 .../dist/css/images/dragtable-handle.png            | Bin
 .../dist/css/images/dragtable-handle.svg            |   0
 .../dist/css/images/dropbox-asc-hovered.png         | Bin
 .../dist/css/images/dropbox-asc.png                 | Bin
 .../dist/css/images/dropbox-desc-hovered.png        | Bin
 .../dist/css/images/dropbox-desc.png                | Bin
 .../jquery-tablesorter/dist/css/images/first.png    | Bin
 .../dist/css/images/green-asc.gif                   | Bin
 .../dist/css/images/green-desc.gif                  | Bin
 .../dist/css/images/green-header.gif                | Bin
 .../dist/css/images/green-unsorted.gif              | Bin
 .../jquery-tablesorter/dist/css/images/ice-asc.gif  | Bin
 .../jquery-tablesorter/dist/css/images/ice-desc.gif | Bin
 .../dist/css/images/ice-unsorted.gif                | Bin
 .../jquery-tablesorter/dist/css/images/last.png     | Bin
 .../jquery-tablesorter/dist/css/images/loading.gif  | Bin
 .../dist/css/images/metro-black-asc.png             | Bin
 .../dist/css/images/metro-black-desc.png            | Bin
 .../dist/css/images/metro-loading.gif               | Bin
 .../dist/css/images/metro-unsorted.png              | Bin
 .../dist/css/images/metro-white-asc.png             | Bin
 .../dist/css/images/metro-white-desc.png            | Bin
 .../jquery-tablesorter/dist/css/images/next.png     | Bin
 .../jquery-tablesorter/dist/css/images/prev.png     | Bin
 .../dist/css/images/white-asc.gif                   | Bin
 .../dist/css/images/white-desc.gif                  | Bin
 .../dist/css/images/white-unsorted.gif              | Bin
 .../dist/css/jquery.tablesorter.pager.min.css       |   0
 .../jquery-tablesorter/dist/css/less/bootstrap.less |   0
 .../jquery-tablesorter/dist/css/less/metro.less     |   0
 .../jquery-tablesorter/dist/css/less/theme.less     |   0
 .../dist/css/theme.blackice.min.css                 |   0
 .../jquery-tablesorter/dist/css/theme.blue.min.css  |   0
 .../dist/css/theme.bootstrap.min.css                |   0
 .../dist/css/theme.bootstrap_2.min.css              |   0
 .../jquery-tablesorter/dist/css/theme.dark.min.css  |   0
 .../dist/css/theme.default.min.css                  |   0
 .../dist/css/theme.dropbox.min.css                  |   0
 .../jquery-tablesorter/dist/css/theme.green.min.css |   0
 .../jquery-tablesorter/dist/css/theme.grey.min.css  |   0
 .../jquery-tablesorter/dist/css/theme.ice.min.css   |   0
 .../jquery-tablesorter/dist/css/theme.jui.min.css   |   0
 .../dist/css/theme.metro-dark.min.css               |   0
 .../dist/js/extras/jquery.dragtable.mod.min.js      |   0
 .../dist/js/extras/jquery.metadata.min.js           |   0
 .../dist/js/extras/jquery.tablesorter.pager.min.js  |   0
 .../dist/js/extras/semver-mod.min.js                |   0
 .../dist/js/jquery.tablesorter.combined.js          |   0
 .../dist/js/jquery.tablesorter.combined.min.js      |   0
 .../dist/js/jquery.tablesorter.js                   |   0
 .../dist/js/jquery.tablesorter.min.js               |   0
 .../dist/js/jquery.tablesorter.widgets.js           |   0
 .../dist/js/jquery.tablesorter.widgets.min.js       |   0
 .../dist/js/parsers/parser-date-extract.min.js      |   0
 .../dist/js/parsers/parser-date-iso8601.min.js      |   0
 .../dist/js/parsers/parser-date-month.min.js        |   0
 .../dist/js/parsers/parser-date-range.min.js        |   0
 .../js/parsers/parser-date-two-digit-year.min.js    |   0
 .../dist/js/parsers/parser-date-weekday.min.js      |   0
 .../dist/js/parsers/parser-date.min.js              |   0
 .../dist/js/parsers/parser-duration.min.js          |   0
 .../js/parsers/parser-feet-inch-fraction.min.js     |   0
 .../dist/js/parsers/parser-file-type.min.js         |   0
 .../dist/js/parsers/parser-globalize.min.js         |   0
 .../dist/js/parsers/parser-ignore-articles.min.js   |   0
 .../dist/js/parsers/parser-image.min.js             |   0
 .../dist/js/parsers/parser-input-select.min.js      |   0
 .../dist/js/parsers/parser-metric.min.js            |   0
 .../dist/js/parsers/parser-named-numbers.min.js     |   0
 .../dist/js/parsers/parser-network.min.js           |   0
 .../dist/js/parsers/parser-roman.min.js             |   0
 .../dist/js/widgets/widget-alignChar.min.js         |   0
 .../dist/js/widgets/widget-build-table.min.js       |   0
 .../dist/js/widgets/widget-chart.min.js             |   0
 .../dist/js/widgets/widget-columnSelector.min.js    |   0
 .../dist/js/widgets/widget-columns.min.js           |   0
 .../dist/js/widgets/widget-cssStickyHeaders.min.js  |   0
 .../dist/js/widgets/widget-editable.min.js          |   0
 .../js/widgets/widget-filter-formatter-html5.min.js |   0
 .../js/widgets/widget-filter-formatter-jui.min.js   |   0
 .../widgets/widget-filter-formatter-select2.min.js  |   0
 .../widgets/widget-filter-type-insideRange.min.js   |   0
 .../dist/js/widgets/widget-filter.min.js            |   0
 .../dist/js/widgets/widget-formatter.min.js         |   0
 .../dist/js/widgets/widget-grouping.min.js          |   0
 .../dist/js/widgets/widget-headerTitles.min.js      |   0
 .../dist/js/widgets/widget-lazyload.min.js          |   0
 .../dist/js/widgets/widget-math.min.js              |   0
 .../dist/js/widgets/widget-output.min.js            |   0
 .../dist/js/widgets/widget-pager.min.js             |   0
 .../dist/js/widgets/widget-print.min.js             |   0
 .../dist/js/widgets/widget-reflow.min.js            |   0
 .../dist/js/widgets/widget-repeatheaders.min.js     |   0
 .../dist/js/widgets/widget-resizable.min.js         |   0
 .../dist/js/widgets/widget-saveSort.min.js          |   0
 .../dist/js/widgets/widget-scroller.min.js          |   0
 .../dist/js/widgets/widget-sort2Hash.min.js         |   0
 .../dist/js/widgets/widget-sortTbodies.min.js       |   0
 .../dist/js/widgets/widget-staticRow.min.js         |   0
 .../dist/js/widgets/widget-stickyHeaders.min.js     |   0
 .../dist/js/widgets/widget-storage.min.js           |   0
 .../dist/js/widgets/widget-toggle.min.js            |   0
 .../dist/js/widgets/widget-uitheme.min.js           |   0
 .../dist/js/widgets/widget-view.min.js              |   0
 .../jquery-tablesorter/docs/assets/City0.json       |   0
 .../jquery-tablesorter/docs/assets/City1.json       |   0
 .../jquery-tablesorter/docs/assets/City2.json       |   0
 .../jquery-tablesorter/docs/assets/City3.json       |   0
 .../docs/assets/ajax-content.html                   |   0
 .../jquery-tablesorter/docs/assets/build.json       |   0
 FHC-vendor/jquery-tablesorter/docs/assets/build.txt |   0
 .../docs/assets/theme_switcher.json                 |   0
 .../docs/css/bootstrap-v2.min.css                   |   0
 .../jquery-tablesorter/docs/css/bootstrap.min.css   |   0
 .../docs/css/images/glyphicons-halflings-white.png  | Bin
 .../docs/css/images/glyphicons-halflings.png        | Bin
 .../ui-bg_diagonals-thick_90_eeeeee_40x40.png       | Bin
 .../docs/css/images/ui-bg_flat_15_cd0a0a_40x100.png | Bin
 .../css/images/ui-bg_glass_100_e4f1fb_1x400.png     | Bin
 .../docs/css/images/ui-bg_glass_50_3baae3_1x400.png | Bin
 .../docs/css/images/ui-bg_glass_80_d7ebf9_1x400.png | Bin
 .../ui-bg_highlight-hard_100_f2f5f7_1x100.png       | Bin
 .../images/ui-bg_highlight-hard_70_000000_1x100.png | Bin
 .../ui-bg_highlight-soft_100_deedf7_1x100.png       | Bin
 .../images/ui-bg_highlight-soft_25_ffef8f_1x100.png | Bin
 .../docs/css/images/ui-icons_2694e8_256x240.png     | Bin
 .../docs/css/images/ui-icons_2e83ff_256x240.png     | Bin
 .../docs/css/images/ui-icons_3d80b3_256x240.png     | Bin
 .../docs/css/images/ui-icons_72a7cf_256x240.png     | Bin
 .../docs/css/images/ui-icons_ffffff_256x240.png     | Bin
 FHC-vendor/jquery-tablesorter/docs/css/jq.css       |   0
 .../jquery-tablesorter/docs/css/jquery-ui.min.css   |   0
 .../jquery-tablesorter/docs/css/magnific-popup.css  |   0
 FHC-vendor/jquery-tablesorter/docs/css/menu.css     |   0
 FHC-vendor/jquery-tablesorter/docs/css/prettify.css |   0
 .../jquery-tablesorter/docs/css/rangeslider.css     |   0
 .../docs/css/select2-3.4.6.min.css                  |   0
 .../jquery-tablesorter/docs/css/select2-spinner.gif | Bin
 FHC-vendor/jquery-tablesorter/docs/css/select2.png  | Bin
 .../jquery-tablesorter/docs/css/select2x2.png       | Bin
 FHC-vendor/jquery-tablesorter/docs/css/tipsy.css    |   0
 .../jquery-tablesorter/docs/example-add-rows.html   |   0
 .../jquery-tablesorter/docs/example-ajax.html       |   0
 .../docs/example-apply-widget.html                  |   0
 .../docs/example-child-rows-filtered.html           |   0
 .../jquery-tablesorter/docs/example-child-rows.html |   0
 .../docs/example-css-highlighting.html              |   0
 .../jquery-tablesorter/docs/example-dragtable.html  |   0
 .../docs/example-empty-table.html                   |   0
 .../docs/example-extending-defaults.html            |   0
 .../docs/example-extractors-parsers.html            |   0
 .../docs/example-header-column-span.html            |   0
 .../docs/example-locale-sort.html                   |   0
 .../docs/example-meta-headers.html                  |   0
 .../docs/example-meta-parsers.html                  |   0
 .../docs/example-meta-sort-list.html                |   0
 .../docs/example-method-sortreset.html              |   0
 .../docs/example-multiple-tbodies.html              |   0
 .../docs/example-option-custom-sort.html            |   0
 .../docs/example-option-date-format.html            |   0
 .../docs/example-option-debug.html                  |   0
 .../docs/example-option-delay-init.html             |   0
 .../docs/example-option-digits.html                 |   0
 .../docs/example-option-render-header.html          |   0
 .../docs/example-option-render-template.html        |   0
 .../docs/example-option-selectorsort.html           |   0
 .../docs/example-option-show-processing.html        |   0
 .../docs/example-option-sort-append.html            |   0
 .../docs/example-option-sort-empty.html             |   0
 .../docs/example-option-sort-force.html             |   0
 .../docs/example-option-sort-key.html               |   0
 .../docs/example-option-sort-list.html              |   0
 .../docs/example-option-sort-order.html             |   0
 .../docs/example-option-sortreset-sortrestart.html  |   0
 .../docs/example-option-text-extraction.html        |   0
 .../docs/example-option-textsorter-semver.html      |   0
 .../docs/example-option-theme-metro-style.html      |   0
 .../example-options-headers-digits-strings.html     |   0
 .../docs/example-options-headers-locked.html        |   0
 .../docs/example-options-headers-order.html         |   0
 .../docs/example-options-headers-parser.html        |   0
 .../docs/example-options-headers.html               |   0
 .../jquery-tablesorter/docs/example-pager-ajax.html |   0
 .../docs/example-pager-filtered.html                |   0
 .../jquery-tablesorter/docs/example-pager.html      |   0
 .../docs/example-parsers-advanced.html              |   0
 .../docs/example-parsers-class-name.html            |   0
 .../docs/example-parsers-date-range.html            |   0
 .../docs/example-parsers-dates.html                 |   0
 .../docs/example-parsers-duration.html              |   0
 .../docs/example-parsers-feet-inch-fraction.html    |   0
 .../docs/example-parsers-file-type.html             |   0
 .../docs/example-parsers-globalize.html             |   0
 .../docs/example-parsers-ignore-articles.html       |   0
 .../docs/example-parsers-ip-address.html            |   0
 .../docs/example-parsers-jquery-data.html           |   0
 .../docs/example-parsers-metric.html                |   0
 .../docs/example-parsers-named-numbers.html         |   0
 .../docs/example-parsers-roman.html                 |   0
 .../jquery-tablesorter/docs/example-parsers.html    |   0
 .../docs/example-trigger-sort.html                  |   0
 .../jquery-tablesorter/docs/example-triggers.html   |   0
 .../jquery-tablesorter/docs/example-update-all.html |   0
 .../docs/example-update-cell.html                   |   0
 .../docs/example-widget-align-character.html        |   0
 .../docs/example-widget-bootstrap-theme-v2.html     |   0
 .../docs/example-widget-bootstrap-theme.html        |   0
 .../docs/example-widget-build-table.html            |   0
 .../docs/example-widget-chart.html                  |   0
 .../docs/example-widget-column-selector.html        |   0
 .../docs/example-widget-columns.html                |   0
 .../docs/example-widget-css-sticky-header.html      |   0
 .../docs/example-widget-editable.html               |   0
 .../docs/example-widget-filter-any-match.html       |   0
 .../docs/example-widget-filter-childrows.html       |   0
 .../docs/example-widget-filter-custom-search.html   |   0
 .../docs/example-widget-filter-custom-search2.html  |   0
 .../docs/example-widget-filter-custom.html          |   0
 .../docs/example-widget-filter-external-inputs.html |   0
 .../docs/example-widget-filter-formatter-1.html     |   0
 .../docs/example-widget-filter-formatter-2.html     |   0
 .../example-widget-filter-formatter-select2.html    |   0
 .../docs/example-widget-filter-selectmenu.html      |   0
 .../docs/example-widget-filter.html                 |   0
 .../docs/example-widget-formatter.html              |   0
 .../example-widget-grouping-filter-childrows.html   |   0
 .../docs/example-widget-grouping.html               |   0
 .../docs/example-widget-header-titles.html          |   0
 .../docs/example-widget-lazyload.html               |   0
 .../docs/example-widget-math.html                   |   0
 .../docs/example-widget-output.html                 |   0
 .../docs/example-widget-pager-ajax.html             |   0
 .../docs/example-widget-pager.html                  |   0
 .../docs/example-widget-print.html                  |   0
 .../docs/example-widget-reflow.html                 |   0
 .../docs/example-widget-reflow1.html                |   0
 .../docs/example-widget-reflow2.html                |   0
 .../docs/example-widget-reflow3.html                |   0
 .../docs/example-widget-resizable.html              |   0
 .../docs/example-widget-savesort.html               |   0
 .../docs/example-widget-scroller.html               |   0
 .../docs/example-widget-sort-tbodies.html           |   0
 .../docs/example-widget-sort-to-hash.html           |   0
 .../docs/example-widget-static-row.html             |   0
 .../docs/example-widget-sticky-header.html          |   0
 .../docs/example-widget-toggle-tablesorter.html     |   0
 .../docs/example-widget-ui-theme.html               |   0
 .../docs/example-widget-view.html                   |   0
 .../docs/example-widget-zebra.html                  |   0
 .../jquery-tablesorter/docs/example-widgets.html    |   0
 .../docs/fonts/glyphicons-halflings-regular.eot     | Bin
 .../docs/fonts/glyphicons-halflings-regular.svg     |   0
 .../docs/fonts/glyphicons-halflings-regular.ttf     | Bin
 .../docs/fonts/glyphicons-halflings-regular.woff    | Bin
 .../docs/fonts/glyphicons-halflings-regular.woff2   | Bin
 FHC-vendor/jquery-tablesorter/docs/img/external.png | Bin
 .../docs/img/grid-default-thumb.png                 | Bin
 FHC-vendor/jquery-tablesorter/docs/img/link.png     | Bin
 .../docs/img/new-product-banner.png                 | Bin
 .../jquery-tablesorter/docs/img/sale-banner.png     | Bin
 .../jquery-tablesorter/docs/img/screens-blue.png    | Bin
 FHC-vendor/jquery-tablesorter/docs/img/screens.png  | Bin
 FHC-vendor/jquery-tablesorter/docs/index.html       |   0
 .../jquery-tablesorter/docs/js/bootstrap.min.js     |   0
 .../docs/js/chili/jquery.chili-2.2.js               |   0
 .../jquery-tablesorter/docs/js/chili/recipes.js     |   0
 .../jquery-tablesorter/docs/js/demo-build-table.js  |   0
 FHC-vendor/jquery-tablesorter/docs/js/docs.js       |   0
 .../jquery-tablesorter/docs/js/jquery-1.2.6.min.js  |   0
 .../jquery-tablesorter/docs/js/jquery-1.4.4.min.js  |   0
 .../jquery-tablesorter/docs/js/jquery-latest.min.js |   0
 .../jquery-tablesorter/docs/js/jquery-ui.min.js     |   0
 .../docs/js/jquery.jui_theme_switch.min.js          |   0
 .../docs/js/jquery.magnific-popup.min.js            |   0
 .../jquery-tablesorter/docs/js/jquery.tipsy.min.js  |   0
 FHC-vendor/jquery-tablesorter/docs/js/prettify.js   |   0
 .../jquery-tablesorter/docs/js/rangeslider.min.js   |   0
 FHC-vendor/jquery-tablesorter/docs/js/search-ie.js  |   0
 FHC-vendor/jquery-tablesorter/docs/js/search.js     |   0
 .../jquery-tablesorter/docs/js/select2-3.4.6.min.js |   0
 FHC-vendor/jquery-tablesorter/docs/js/sugar.min.js  |   0
 FHC-vendor/jquery-tablesorter/docs/themes.html      |   0
 FHC-vendor/jquery-tablesorter/example.json          |   0
 FHC-vendor/jquery-tablesorter/index.html            |   0
 .../js/extras/jquery.dragtable.mod.js               |   0
 .../jquery-tablesorter/js/extras/jquery.metadata.js |   0
 .../jquery-tablesorter/js/extras/semver-mod.js      |   0
 FHC-vendor/jquery-tablesorter/js/extras/semver.js   |   0
 .../js/jquery.tablesorter.combined.js               |   0
 .../jquery-tablesorter/js/jquery.tablesorter.js     |   0
 .../js/jquery.tablesorter.widgets.js                |   0
 .../js/parsers/parser-date-extract.js               |   0
 .../js/parsers/parser-date-iso8601.js               |   0
 .../js/parsers/parser-date-month.js                 |   0
 .../js/parsers/parser-date-range.js                 |   0
 .../js/parsers/parser-date-two-digit-year.js        |   0
 .../js/parsers/parser-date-weekday.js               |   0
 .../jquery-tablesorter/js/parsers/parser-date.js    |   0
 .../js/parsers/parser-duration.js                   |   0
 .../js/parsers/parser-feet-inch-fraction.js         |   0
 .../js/parsers/parser-file-type.js                  |   0
 .../js/parsers/parser-globalize.js                  |   0
 .../js/parsers/parser-ignore-articles.js            |   0
 .../jquery-tablesorter/js/parsers/parser-image.js   |   0
 .../js/parsers/parser-input-select.js               |   0
 .../jquery-tablesorter/js/parsers/parser-metric.js  |   0
 .../js/parsers/parser-named-numbers.js              |   0
 .../jquery-tablesorter/js/parsers/parser-network.js |   0
 .../jquery-tablesorter/js/parsers/parser-roman.js   |   0
 .../js/widgets/widget-alignChar.js                  |   0
 .../js/widgets/widget-build-table.js                |   0
 .../jquery-tablesorter/js/widgets/widget-chart.js   |   0
 .../js/widgets/widget-columnSelector.js             |   0
 .../jquery-tablesorter/js/widgets/widget-columns.js |   0
 .../js/widgets/widget-cssStickyHeaders.js           |   0
 .../js/widgets/widget-editable.js                   |   0
 .../js/widgets/widget-filter-formatter-html5.js     |   0
 .../js/widgets/widget-filter-formatter-jui.js       |   0
 .../js/widgets/widget-filter-formatter-select2.js   |   0
 .../js/widgets/widget-filter-type-insideRange.js    |   0
 .../jquery-tablesorter/js/widgets/widget-filter.js  |   0
 .../js/widgets/widget-formatter.js                  |   0
 .../js/widgets/widget-grouping.js                   |   0
 .../js/widgets/widget-headerTitles.js               |   0
 .../js/widgets/widget-lazyload.js                   |   0
 .../jquery-tablesorter/js/widgets/widget-math.js    |   0
 .../jquery-tablesorter/js/widgets/widget-output.js  |   0
 .../jquery-tablesorter/js/widgets/widget-pager.js   |   0
 .../jquery-tablesorter/js/widgets/widget-print.js   |   0
 .../jquery-tablesorter/js/widgets/widget-reflow.js  |   0
 .../js/widgets/widget-repeatheaders.js              |   0
 .../js/widgets/widget-resizable.js                  |   0
 .../js/widgets/widget-saveSort.js                   |   0
 .../js/widgets/widget-scroller.js                   |   0
 .../js/widgets/widget-sort2Hash.js                  |   0
 .../js/widgets/widget-sortTbodies.js                |   0
 .../js/widgets/widget-staticRow.js                  |   0
 .../js/widgets/widget-stickyHeaders.js              |   0
 .../jquery-tablesorter/js/widgets/widget-storage.js |   0
 .../jquery-tablesorter/js/widgets/widget-toggle.js  |   0
 .../jquery-tablesorter/js/widgets/widget-uitheme.js |   0
 .../jquery-tablesorter/js/widgets/widget-view.js    |   0
 FHC-vendor/jquery-tablesorter/package.json          |   0
 .../jquery-tablesorter/tablesorter.jquery.json      |   0
 FHC-vendor/jquery-tablesorter/test.html             |   0
 .../jquery-tablesorter/testing/qunit-1.20.0.css     |   0
 .../jquery-tablesorter/testing/qunit-1.20.0.js      |   0
 .../jquery-tablesorter/testing/testing-ipv6.js      |   0
 .../jquery-tablesorter/testing/testing-widgets.js   |   0
 FHC-vendor/jquery-tablesorter/testing/testing.css   |   0
 FHC-vendor/jquery-tablesorter/testing/testing.js    |   0
 LICENSE                                             |   0
 README.md                                           |   0
 addons/.gitignore                                   |   0
 addons/CodingGuidelines.txt                         |   0
 addons/index.html                                   |   0
 application/cache/index.html                        |   0
 application/components/extensions/.placeholder      |   0
 application/components/filters/LogsViewer.php       |   0
 application/config/anrechnung.php                   |   0
 application/config/auth.php                         |   0
 application/config/autoload.php                     |   0
 application/config/config.php                       |   0
 application/config/constants.php                    |   0
 application/config/core_includes.php                |   0
 application/config/database.php                     |   0
 application/config/doctypes.php                     |   0
 application/config/extensions/.placeholder          |   0
 application/config/foreign_chars.php                |   0
 application/config/hooks.php                        |   0
 application/config/index.html                       |   0
 application/config/infocenter.php                   |   0
 application/config/jqm.php                          |   0
 application/config/ldap.php                         |   0
 application/config/mail.php                         |   0
 application/config/memcached.php                    |   0
 application/config/message.php                      |   0
 application/config/migration.php                    |   0
 application/config/mimes.php                        |   0
 application/config/navigation.php                   |   0
 application/config/permission.php                   |   0
 application/config/profiler.php                     |   0
 application/config/rest.php                         |   0
 application/config/routes.php                       |   0
 application/config/studierendenantrag.php           |   0
 application/config/udfmasterschema.json             |   0
 application/config/user_agents.php                  |   0
 application/controllers/Cis/Auth.php                |   0
 application/controllers/Cis/Documents.php           |   0
 application/controllers/Cis/MyLv.php                |   0
 application/controllers/Cis/Profil.php              |   0
 application/controllers/Cis/ProfilUpdate.php        |   0
 application/controllers/Cis/Pub.php                 |   0
 application/controllers/Cis/Stundenplan.php         |   0
 application/controllers/Cis4.php                    |   0
 application/controllers/CisHmvc.php                 |   0
 application/controllers/CisHmvc/Cms.php             |   0
 application/controllers/CisHmvc/Dashboard.php       |   0
 application/controllers/CisHtml/Cms.php             |   0
 application/controllers/CisHtml/Dashboard.php       |   0
 application/controllers/CisVue/Cms.php              |   0
 application/controllers/CisVue/Dashboard.php        |   0
 application/controllers/Test.php                    |   0
 application/controllers/Vilesci.php                 |   0
 .../api/frontend/v1/studstatus/Unterbrechung.php    |   0
 application/controllers/api/index.html              |   0
 application/controllers/api/v1/CheckUserAuth.php    |   0
 application/controllers/api/v1/Test.php             |   0
 .../controllers/api/v1/accounting/Aufteilung.php    |   0
 .../controllers/api/v1/accounting/Bestelldetail.php |   0
 .../api/v1/accounting/Bestelldetailtag.php          |   0
 .../controllers/api/v1/accounting/Bestellstatus.php |   0
 .../controllers/api/v1/accounting/Bestellung.php    |   0
 .../controllers/api/v1/accounting/Bestellungtag.php |   0
 .../controllers/api/v1/accounting/Buchung.php       |   0
 .../controllers/api/v1/accounting/Buchungstyp.php   |   0
 .../controllers/api/v1/accounting/Budget.php        |   0
 application/controllers/api/v1/accounting/Konto.php |   0
 .../controllers/api/v1/accounting/Kostenstelle.php  |   0
 .../controllers/api/v1/accounting/Rechnung.php      |   0
 .../api/v1/accounting/Rechnungsbetrag.php           |   0
 .../controllers/api/v1/accounting/Rechnungstyp.php  |   0
 .../controllers/api/v1/accounting/Vertrag.php       |   0
 .../api/v1/accounting/Vertragsstatus.php            |   0
 .../controllers/api/v1/accounting/Vertragstyp.php   |   0
 .../controllers/api/v1/accounting/Zahlungstyp.php   |   0
 application/controllers/api/v1/codex/Akadgrad.php   |   0
 application/controllers/api/v1/codex/Archiv.php     |   0
 .../controllers/api/v1/codex/Aufmerksamdurch.php    |   0
 application/controllers/api/v1/codex/Ausbildung.php |   0
 .../controllers/api/v1/codex/Berufstaetigkeit.php   |   0
 .../api/v1/codex/Beschaeftigungsausmass.php         |   0
 application/controllers/api/v1/codex/Besqual.php    |   0
 .../controllers/api/v1/codex/Bisfunktion.php        |   0
 application/controllers/api/v1/codex/Bisio.php      |   0
 application/controllers/api/v1/codex/Bisorgform.php |   0
 .../controllers/api/v1/codex/Bisverwendung.php      |   0
 application/controllers/api/v1/codex/Bundesland.php |   0
 .../controllers/api/v1/codex/Entwicklungsteam.php   |   0
 application/controllers/api/v1/codex/Gemeinde.php   |   0
 application/controllers/api/v1/codex/Hauptberuf.php |   0
 application/controllers/api/v1/codex/Lehrform.php   |   0
 application/controllers/api/v1/codex/Lgartcode.php  |   0
 .../api/v1/codex/Mobilitaetsprogramm.php            |   0
 application/controllers/api/v1/codex/Nation.php     |   0
 application/controllers/api/v1/codex/Note.php       |   0
 application/controllers/api/v1/codex/Orgform.php    |   0
 application/controllers/api/v1/codex/Verwendung.php |   0
 application/controllers/api/v1/codex/Zgv.php        |   0
 application/controllers/api/v1/codex/Zgvdoktor.php  |   0
 application/controllers/api/v1/codex/Zgvgruppe.php  |   0
 application/controllers/api/v1/codex/Zgvmaster.php  |   0
 application/controllers/api/v1/codex/Zweck.php      |   0
 application/controllers/api/v1/content/Ampel.php    |   0
 application/controllers/api/v1/content/Content.php  |   0
 .../controllers/api/v1/content/Contentchild.php     |   0
 .../controllers/api/v1/content/Contentgruppe.php    |   0
 .../controllers/api/v1/content/Contentlog.php       |   0
 .../controllers/api/v1/content/Contentsprache.php   |   0
 application/controllers/api/v1/content/Dms.php      |   0
 .../controllers/api/v1/content/Infoscreen.php       |   0
 application/controllers/api/v1/content/News.php     |   0
 application/controllers/api/v1/content/Template.php |   0
 .../controllers/api/v1/content/Veranstaltung.php    |   0
 .../api/v1/content/Veranstaltungskategorie.php      |   0
 application/controllers/api/v1/crm/Akte.php         |   0
 .../controllers/api/v1/crm/Aufnahmeschluessel.php   |   0
 .../controllers/api/v1/crm/Aufnahmetermin.php       |   0
 .../controllers/api/v1/crm/Aufnahmetermintyp.php    |   0
 .../controllers/api/v1/crm/Bewerbungstermine.php    |   0
 application/controllers/api/v1/crm/Buchungstyp.php  |   0
 application/controllers/api/v1/crm/Dokument.php     |   0
 .../controllers/api/v1/crm/Dokumentprestudent.php   |   0
 .../controllers/api/v1/crm/Dokumentstudiengang.php  |   0
 application/controllers/api/v1/crm/Konto.php        |   0
 application/controllers/api/v1/crm/Preincoming.php  |   0
 .../controllers/api/v1/crm/Preinteressent.php       |   0
 .../api/v1/crm/Preinteressentstudiengang.php        |   0
 application/controllers/api/v1/crm/Preoutgoing.php  |   0
 application/controllers/api/v1/crm/Prestudent.php   |   0
 .../controllers/api/v1/crm/Prestudentstatus.php     |   0
 application/controllers/api/v1/crm/Reihungstest.php |   0
 application/controllers/api/v1/crm/RtPerson.php     |   0
 application/controllers/api/v1/crm/Status.php       |   0
 application/controllers/api/v1/crm/Statusgrund.php  |   0
 application/controllers/api/v1/crm/Student.php      |   0
 application/controllers/api/v1/education/Abgabe.php |   0
 .../api/v1/education/Abschlussbeurteilung.php       |   0
 .../api/v1/education/Abschlusspruefung.php          |   0
 .../controllers/api/v1/education/Anrechnung.php     |   0
 .../controllers/api/v1/education/Anwesenheit.php    |   0
 .../controllers/api/v1/education/Beispiel.php       |   0
 .../controllers/api/v1/education/Betreuerart.php    |   0
 .../controllers/api/v1/education/Feedback.php       |   0
 .../controllers/api/v1/education/Legesamtnote.php   |   0
 .../controllers/api/v1/education/Lehreinheit.php    |   0
 .../api/v1/education/Lehreinheitgruppe.php          |   0
 .../api/v1/education/Lehreinheitmitarbeiter.php     |   0
 .../controllers/api/v1/education/Lehrfach.php       |   0
 .../controllers/api/v1/education/Lehrfunktion.php   |   0
 .../controllers/api/v1/education/Lehrtyp.php        |   0
 .../api/v1/education/Lehrveranstaltung.php          |   0
 .../api/v1/education/Lenotenschluessel.php          |   0
 .../controllers/api/v1/education/Lepruefung.php     |   0
 .../controllers/api/v1/education/Lvangebot.php      |   0
 .../controllers/api/v1/education/Lvgesamtnote.php   |   0
 application/controllers/api/v1/education/Lvinfo.php |   0
 .../controllers/api/v1/education/Lvregel.php        |   0
 .../controllers/api/v1/education/Lvregeltyp.php     |   0
 .../api/v1/education/Notenschluessel.php            |   0
 .../api/v1/education/Notenschluesselaufteilung.php  |   0
 .../api/v1/education/Notenschluesseluebung.php      |   0
 .../api/v1/education/Notenschluesselzuordnung.php   |   0
 .../controllers/api/v1/education/Paabgabe.php       |   0
 .../controllers/api/v1/education/Paabgabetyp.php    |   0
 .../controllers/api/v1/education/Projektarbeit.php  |   0
 .../api/v1/education/Projektbetreuer.php            |   0
 .../controllers/api/v1/education/Projekttyp.php     |   0
 .../controllers/api/v1/education/Pruefung.php       |   0
 .../api/v1/education/Pruefungsanmeldung.php         |   0
 .../api/v1/education/Pruefungsfenster.php           |   0
 .../api/v1/education/Pruefungsstatus.php            |   0
 .../api/v1/education/Pruefungstermin.php            |   0
 .../controllers/api/v1/education/Pruefungstyp.php   |   0
 .../api/v1/education/Studentbeispiel.php            |   0
 .../api/v1/education/Studentlehrverband.php         |   0
 .../controllers/api/v1/education/Studentuebung.php  |   0
 application/controllers/api/v1/education/Uebung.php |   0
 .../controllers/api/v1/education/Zeugnis.php        |   0
 .../controllers/api/v1/education/Zeugnisnote.php    |   0
 .../controllers/api/v1/organisation/Erhalter.php    |   0
 .../api/v1/organisation/Fachbereich2.php            |   0
 .../controllers/api/v1/organisation/Ferien.php      |   0
 .../api/v1/organisation/Geschaeftsjahr2.php         |   0
 .../controllers/api/v1/organisation/Gruppe.php      |   0
 .../controllers/api/v1/organisation/Lehrverband.php |   0
 .../api/v1/organisation/Organisationseinheit2.php   |   0
 .../api/v1/organisation/Organisationseinheittyp.php |   0
 .../api/v1/organisation/Semesterwochen.php          |   0
 .../controllers/api/v1/organisation/Service.php     |   0
 .../controllers/api/v1/organisation/Standort.php    |   0
 .../controllers/api/v1/organisation/Statistik.php   |   0
 .../api/v1/organisation/Studiengang2.php            |   0
 .../api/v1/organisation/Studiengangstyp.php         |   0
 .../controllers/api/v1/organisation/Studienjahr.php |   0
 .../api/v1/organisation/Studienordnung.php          |   0
 .../api/v1/organisation/Studienordnungstatus.php    |   0
 .../controllers/api/v1/organisation/Studienplan.php |   0
 .../api/v1/organisation/Studienplatz.php            |   0
 .../api/v1/organisation/Studiensemester.php         |   0
 application/controllers/api/v1/person/Adresse.php   |   0
 .../controllers/api/v1/person/Bankverbindung.php    |   0
 application/controllers/api/v1/person/Benutzer.php  |   0
 .../controllers/api/v1/person/Benutzerfunktion.php  |   0
 .../controllers/api/v1/person/Benutzergruppe.php    |   0
 .../controllers/api/v1/person/Fotostatus.php        |   0
 application/controllers/api/v1/person/Freebusy.php  |   0
 .../controllers/api/v1/person/Freebusytyp.php       |   0
 application/controllers/api/v1/person/Kontakt.php   |   0
 .../controllers/api/v1/person/Kontaktmedium.php     |   0
 .../controllers/api/v1/person/Kontakttyp.php        |   0
 application/controllers/api/v1/person/Notiz.php     |   0
 .../controllers/api/v1/person/Notizzuordnung.php    |   0
 application/controllers/api/v1/person/Person.php    |   0
 .../controllers/api/v1/project/Aktivitaet.php       |   0
 .../controllers/api/v1/project/Aufwandstyp.php      |   0
 application/controllers/api/v1/project/Projekt.php  |   0
 .../api/v1/project/Projekt_ressource.php            |   0
 .../controllers/api/v1/project/Projektphase.php     |   0
 .../controllers/api/v1/project/Projekttask.php      |   0
 .../controllers/api/v1/project/Ressource.php        |   0
 .../controllers/api/v1/project/Scrumsprint.php      |   0
 .../controllers/api/v1/ressource/Betriebsmittel.php |   0
 .../api/v1/ressource/Betriebsmittelperson2.php      |   0
 .../api/v1/ressource/Betriebsmittelstatus.php       |   0
 .../api/v1/ressource/Betriebsmitteltyp.php          |   0
 application/controllers/api/v1/ressource/Coodle.php |   0
 .../controllers/api/v1/ressource/Erreichbarkeit.php |   0
 application/controllers/api/v1/ressource/Firma.php  |   0
 .../controllers/api/v1/ressource/Firmatag.php       |   0
 .../controllers/api/v1/ressource/Firmentyp.php      |   0
 .../controllers/api/v1/ressource/Funktion.php       |   0
 .../controllers/api/v1/ressource/Lehrmittel.php     |   0
 .../controllers/api/v1/ressource/Mitarbeiter.php    |   0
 application/controllers/api/v1/ressource/Ort.php    |   0
 .../controllers/api/v1/ressource/Ortraumtyp.php     |   0
 .../api/v1/ressource/Personfunktionstandort.php     |   0
 .../controllers/api/v1/ressource/Raumtyp.php        |   0
 .../controllers/api/v1/ressource/Reservierung.php   |   0
 application/controllers/api/v1/ressource/Stunde.php |   0
 .../controllers/api/v1/ressource/Stundenplan.php    |   0
 .../controllers/api/v1/ressource/Stundenplandev.php |   0
 .../api/v1/ressource/Zeitaufzeichnung.php           |   0
 .../controllers/api/v1/ressource/Zeitfenster.php    |   0
 .../controllers/api/v1/ressource/Zeitsperre.php     |   0
 .../controllers/api/v1/ressource/Zeitsperretyp.php  |   0
 .../controllers/api/v1/ressource/Zeitwunsch.php     |   0
 application/controllers/api/v1/system/Appdaten.php  |   0
 .../controllers/api/v1/system/Benutzerrolle.php     |   0
 .../controllers/api/v1/system/Berechtigung.php      |   0
 application/controllers/api/v1/system/Cronjob.php   |   0
 application/controllers/api/v1/system/Filter.php    |   0
 application/controllers/api/v1/system/Log.php       |   0
 application/controllers/api/v1/system/Message.php   |   0
 application/controllers/api/v1/system/Phrase.php    |   0
 application/controllers/api/v1/system/Rolle.php     |   0
 .../controllers/api/v1/system/Rolleberechtigung.php |   0
 application/controllers/api/v1/system/Server.php    |   0
 application/controllers/api/v1/system/Sprache2.php  |   0
 application/controllers/api/v1/system/Tag.php       |   0
 application/controllers/api/v1/system/UDF.php       |   0
 application/controllers/api/v1/system/Variable.php  |   0
 application/controllers/api/v1/system/Vorlage.php   |   0
 .../api/v1/system/Vorlagestudiengang.php            |   0
 .../controllers/api/v1/system/Webservicelog.php     |   0
 .../controllers/api/v1/system/Webservicerecht.php   |   0
 .../controllers/api/v1/system/Webservicetyp.php     |   0
 application/controllers/api/v1/testtool/Ablauf.php  |   0
 application/controllers/api/v1/testtool/Antwort.php |   0
 application/controllers/api/v1/testtool/Frage.php   |   0
 application/controllers/api/v1/testtool/Gebiet.php  |   0
 .../controllers/api/v1/testtool/Kategorie.php       |   0
 .../controllers/api/v1/testtool/Kriterien.php       |   0
 .../controllers/api/v1/testtool/Pruefling.php       |   0
 .../controllers/api/v1/testtool/Vorschlag.php       |   0
 application/controllers/codex/Oehbeitrag.php        |   0
 application/controllers/codex/UHSTAT1.php           |   0
 .../controllers/components/Antrag/Abmeldung.php     |   0
 .../controllers/components/Antrag/Leitung.php       |   0
 .../controllers/components/Antrag/Wiederholung.php  |   0
 application/controllers/components/Cis/Mylv.php     |   0
 .../controllers/components/Cis/Stundenplan.php      |   0
 application/controllers/components/CisVue.php       |   0
 application/controllers/components/Filter.php       |   0
 application/controllers/components/Phrasen.php      |   0
 application/controllers/components/SearchBar.php    |   0
 application/controllers/crm/Statusgrund.php         |   0
 application/controllers/dashboard/Api.php           |   0
 application/controllers/dashboard/Config.php        |   0
 application/controllers/dashboard/Dashboard.php     |   0
 application/controllers/dashboard/DashboardDemo.php |   0
 application/controllers/dashboard/Widget.php        |   0
 application/controllers/extensions/.placeholder     |   0
 application/controllers/index.html                  |   0
 application/controllers/jobs/AmpelMail.php          |   0
 application/controllers/jobs/AnrechnungJob.php      |   0
 application/controllers/jobs/AntragJob.php          |   0
 application/controllers/jobs/LVPlanJob.php          |   0
 application/controllers/jobs/LehrauftragJob.php     |   0
 application/controllers/jobs/MailJob.php            |   0
 application/controllers/jobs/OneTimeMessages.php    |   0
 .../controllers/jobs/PlausiIssueProducer.php        |   0
 application/controllers/jobs/Prestudentstatus.php   |   0
 application/controllers/jobs/ReihungstestJob.php    |   0
 application/controllers/lehre/Antrag/Attachment.php |   0
 .../controllers/lehre/Antrag/Wiederholung.php       |   0
 .../controllers/lehre/Pruefungsprotokoll.php        |   0
 .../controllers/lehre/Studierendenantrag.php        |   0
 .../lehre/anrechnung/AdminAnrechnung.php            |   0
 .../lehre/anrechnung/ApproveAnrechnungDetail.php    |   0
 .../anrechnung/ApproveAnrechnungUebersicht.php      |   0
 .../lehre/anrechnung/CreateAnrechnung.php           |   0
 .../lehre/anrechnung/RequestAnrechnung.php          |   0
 .../lehre/anrechnung/ReviewAnrechnungDetail.php     |   0
 .../lehre/anrechnung/ReviewAnrechnungUebersicht.php |   0
 .../controllers/lehre/lehrauftrag/Lehrauftrag.php   |   0
 .../lehre/lehrauftrag/LehrauftragAkzeptieren.php    |   0
 .../lehre/lehrauftrag/LehrauftragErteilen.php       |   0
 .../lehre/lvplanung/AdminZeitverfuegbarkeit.php     |   0
 .../controllers/organisation/Reihungstest.php       |   0
 .../controllers/organisation/Studienjahr.php        |   0
 .../controllers/organisation/Studiensemester.php    |   0
 application/controllers/person/BPKWartung.php       |   0
 application/controllers/person/Gradelist.php        |   0
 .../controllers/person/Gruppenmanagement.php        |   0
 application/controllers/system/FAS_UDF.php          |   0
 application/controllers/system/Login.php            |   0
 application/controllers/system/Logout.php           |   0
 application/controllers/system/LogsViewer.php       |   0
 application/controllers/system/Navigation.php       |   0
 application/controllers/system/Phrases.php          |   0
 application/controllers/system/TestSearch.php       |   0
 application/controllers/system/Variables.php        |   0
 application/controllers/system/Vorlage.php          |   0
 .../system/aufnahme/PrestudentMultiAssign.php       |   0
 .../controllers/system/extensions/CLI_Manager.php   |   0
 .../controllers/system/extensions/Manager.php       |   0
 .../controllers/system/infocenter/InfoCenter.php    |   0
 .../controllers/system/infocenter/Rueckstellung.php |   0
 .../system/infocenter/ZGVUeberpruefung.php          |   0
 application/controllers/system/issues/Issues.php    |   0
 .../system/issues/IssuesKonfiguration.php           |   0
 .../system/issues/IssuesZustaendigkeiten.php        |   0
 .../controllers/system/issues/Plausichecks.php      |   0
 .../controllers/system/jq/JobsQueueManager.php      |   0
 .../controllers/system/jq/JobsQueueViewer.php       |   0
 .../controllers/system/messages/FASMessages.php     |   0
 .../controllers/system/messages/MessageClient.php   |   0
 .../controllers/system/messages/Messages.php        |   0
 .../controllers/system/messages/ViewMessage.php     |   0
 application/controllers/widgets/Filters.php         |   0
 application/controllers/widgets/Language.php        |   0
 application/controllers/widgets/Tables.php          |   0
 application/controllers/widgets/UDF.php             |   0
 application/core/API_Controller.php                 |   0
 application/core/Auth_Controller.php                |   0
 application/core/CLI_Controller.php                 |   0
 application/core/DB_Model.php                       |   0
 application/core/FHC_Controller.php                 |   0
 application/core/FS_Model.php                       |   0
 application/core/IIssueResolvedChecker.php          |   0
 application/core/JOB_Controller.php                 |   0
 application/core/JQW_Controller.php                 |   0
 application/core/PlausiIssueProducer_Controller.php |   0
 application/core/RESTFul_Controller.php             |   0
 application/core/index.html                         |   0
 application/extensions/.placeholder                 |   0
 application/helpers/extensions/.placeholder         |   0
 application/helpers/hlp_authentication_helper.php   |   0
 application/helpers/hlp_common_helper.php           |   0
 application/helpers/hlp_header_helper.php           |   0
 application/helpers/hlp_language_helper.php         |   0
 application/helpers/hlp_return_object_helper.php    |   0
 application/helpers/hlp_sancho_helper.php           |   0
 application/helpers/hlp_session_helper.php          |   0
 application/helpers/index.html                      |   0
 application/hooks/extensions/.placeholder           |   0
 application/hooks/index.html                        |   0
 application/index.html                              |   0
 application/language/index.html                     |   0
 application/libraries/AkteLib.php                   |   0
 application/libraries/AnrechnungLib.php             |   0
 application/libraries/AntragLib.php                 |   0
 application/libraries/AuthLDAPLib.php               |   0
 application/libraries/AuthLib.php                   |   0
 application/libraries/CisHmvc/Loader.php            |   0
 application/libraries/CmsLib.php                    |   0
 application/libraries/CryptLib.php                  |   0
 application/libraries/DmsLib.php                    |   0
 application/libraries/DocsboxLib.php                |   0
 application/libraries/DocumentLib.php               |   0
 application/libraries/EPrintfLib.php                |   0
 application/libraries/ExtensionsLib.php             |   0
 application/libraries/FilterCmptLib.php             |   0
 application/libraries/FilterWidgetLib.php           |   0
 application/libraries/IssuesLib.php                 |   0
 application/libraries/JobsQueueLib.php              |   0
 application/libraries/LogLib.php                    |   0
 application/libraries/MailLib.php                   |   0
 application/libraries/MessageLib.php                |   0
 application/libraries/NavigationLib.php             |   0
 application/libraries/OrganisationseinheitLib.php   |   0
 application/libraries/PermissionLib.php             |   0
 application/libraries/PersonLogLib.php              |   0
 application/libraries/PhrasesLib.php                |   0
 application/libraries/PrestudentLib.php             |   0
 application/libraries/ReihungstestLib.php           |   0
 application/libraries/SearchBarLib.php              |   0
 application/libraries/SignatureLib.php              |   0
 application/libraries/StudienplanLib.php            |   0
 application/libraries/TableWidgetLib.php            |   0
 application/libraries/UDFLib.php                    |   0
 application/libraries/VariableLib.php               |   0
 application/libraries/VorlageLib.php                |   0
 application/libraries/WidgetLib.php                 |   0
 application/libraries/dashboard/DashboardLib.php    |   0
 application/libraries/extensions/.placeholder       |   0
 application/libraries/index.html                    |   0
 .../libraries/issues/PlausicheckDefinitionLib.php   |   0
 .../libraries/issues/PlausicheckProducerLib.php     |   0
 .../issues/plausichecks/AbbrecherAktiv.php          |   0
 .../issues/plausichecks/AbschlussstatusFehlt.php    |   0
 .../issues/plausichecks/AktSemesterNull.php         |   0
 .../plausichecks/AktiverStudentOhneStatus.php       |   0
 .../AktiverStudentstatusOhneKontobuchung.php        |   0
 ...ngssemPrestudentUngleichAusbildungssemStatus.php |   0
 .../plausichecks/BewerberNichtZumRtAngetreten.php   |   0
 .../plausichecks/DatumAbschlusspruefungFehlt.php    |   0
 .../issues/plausichecks/DatumSponsionFehlt.php      |   0
 .../DatumStudiensemesterFalscheReihenfolge.php      |   0
 .../FalscheAnzahlAbschlusspruefungen.php            |   0
 .../plausichecks/FalscheAnzahlHeimatadressen.php    |   0
 .../plausichecks/FalscheAnzahlZustelladressen.php   |   0
 .../issues/plausichecks/GbDatumWeitZurueck.php      |   0
 .../plausichecks/InaktiverStudentAktiverStatus.php  |   0
 .../IncomingHeimatNationOesterreich.php             |   0
 .../issues/plausichecks/IncomingOhneIoDatensatz.php |   0
 .../plausichecks/IncomingOrGsFoerderrelevant.php    |   0
 .../plausichecks/InskriptionVorLetzerBismeldung.php |   0
 .../NationNichtOesterreichAberGemeinde.php          |   0
 .../OrgformStgUngleichOrgformPrestudent.php         |   0
 .../libraries/issues/plausichecks/PlausiChecker.php |   0
 .../plausichecks/PrestudentMischformOhneOrgform.php |   0
 .../StgPrestudentUngleichStgStudent.php             |   0
 .../StgPrestudentUngleichStgStudienplan.php         |   0
 .../plausichecks/StudentstatusNachAbbrecher.php     |   0
 .../issues/plausichecks/StudienplanUngueltig.php    |   0
 .../libraries/issues/resolvers/CORE_INOUT_0001.php  |   0
 .../libraries/issues/resolvers/CORE_INOUT_0002.php  |   0
 .../libraries/issues/resolvers/CORE_INOUT_0003.php  |   0
 .../libraries/issues/resolvers/CORE_INOUT_0004.php  |   0
 .../libraries/issues/resolvers/CORE_INOUT_0005.php  |   0
 .../libraries/issues/resolvers/CORE_INOUT_0006.php  |   0
 .../libraries/issues/resolvers/CORE_INOUT_0007.php  |   0
 .../libraries/issues/resolvers/CORE_INOUT_0008.php  |   0
 .../libraries/issues/resolvers/CORE_INOUT_0009.php  |   0
 .../libraries/issues/resolvers/CORE_PERSON_0001.php |   0
 .../libraries/issues/resolvers/CORE_PERSON_0002.php |   0
 .../libraries/issues/resolvers/CORE_PERSON_0003.php |   0
 .../libraries/issues/resolvers/CORE_PERSON_0004.php |   0
 .../libraries/issues/resolvers/CORE_STG_0001.php    |   0
 .../libraries/issues/resolvers/CORE_STG_0002.php    |   0
 .../libraries/issues/resolvers/CORE_STG_0003.php    |   0
 .../libraries/issues/resolvers/CORE_STG_0004.php    |   0
 .../issues/resolvers/CORE_STUDENTSTATUS_0001.php    |   0
 .../issues/resolvers/CORE_STUDENTSTATUS_0002.php    |   0
 .../issues/resolvers/CORE_STUDENTSTATUS_0003.php    |   0
 .../issues/resolvers/CORE_STUDENTSTATUS_0004.php    |   0
 .../issues/resolvers/CORE_STUDENTSTATUS_0005.php    |   0
 .../issues/resolvers/CORE_STUDENTSTATUS_0006.php    |   0
 .../issues/resolvers/CORE_STUDENTSTATUS_0007.php    |   0
 .../issues/resolvers/CORE_STUDENTSTATUS_0008.php    |   0
 .../issues/resolvers/CORE_STUDENTSTATUS_0009.php    |   0
 .../issues/resolvers/CORE_STUDENTSTATUS_0010.php    |   0
 .../issues/resolvers/CORE_STUDENTSTATUS_0011.php    |   0
 .../issues/resolvers/CORE_STUDENTSTATUS_0012.php    |   0
 .../issues/resolvers/CORE_STUDENTSTATUS_0013.php    |   0
 .../issues/resolvers/CORE_STUDENTSTATUS_0014.php    |   0
 .../issues/resolvers/CORE_STUDENTSTATUS_0015.php    |   0
 .../libraries/issues/resolvers/CORE_ZGV_0001.php    |   0
 .../libraries/issues/resolvers/CORE_ZGV_0002.php    |   0
 .../libraries/issues/resolvers/CORE_ZGV_0003.php    |   0
 .../libraries/issues/resolvers/CORE_ZGV_0004.php    |   0
 .../libraries/issues/resolvers/CORE_ZGV_0005.php    |   0
 application/logs/index.html                         |   0
 application/models/CL/Messages_model.php            |   0
 application/models/accounting/Aufteilung_model.php  |   0
 .../models/accounting/Bestelldetail_model.php       |   0
 .../models/accounting/Bestelldetailtag_model.php    |   0
 .../models/accounting/Bestellstatus_model.php       |   0
 application/models/accounting/Bestellung_model.php  |   0
 .../models/accounting/Bestellungtag_model.php       |   0
 application/models/accounting/Buchung_model.php     |   0
 application/models/accounting/Buchungstyp_model.php |   0
 application/models/accounting/Budget_model.php      |   0
 application/models/accounting/Konto_model.php       |   0
 .../models/accounting/Kostenstelle_model.php        |   0
 application/models/accounting/Rechnung_model.php    |   0
 .../models/accounting/Rechnungsbetrag_model.php     |   0
 .../models/accounting/Rechnungstyp_model.php        |   0
 application/models/accounting/Vertrag_model.php     |   0
 .../models/accounting/Vertragsstatus_model.php      |   0
 application/models/accounting/Vertragstyp_model.php |   0
 .../accounting/Vertragvertragsstatus_model.php      |   0
 application/models/accounting/Zahlungstyp_model.php |   0
 application/models/codex/Abschluss_model.php        |   0
 application/models/codex/Akadgrad_model.php         |   0
 application/models/codex/Archiv_model.php           |   0
 .../models/codex/Aufenthaltfoerderung_model.php     |   0
 application/models/codex/Aufmerksamdurch_model.php  |   0
 application/models/codex/Ausbildung_model.php       |   0
 application/models/codex/Berufstaetigkeit_model.php |   0
 .../models/codex/Beschaeftigungsausmass_model.php   |   0
 application/models/codex/Besqual_model.php          |   0
 application/models/codex/Bisfunktion_model.php      |   0
 application/models/codex/Bisio_model.php            |   0
 .../codex/Bisioaufenthaltfoerderung_model.php       |   0
 application/models/codex/Bisiozweck_model.php       |   0
 application/models/codex/Bisorgform_model.php       |   0
 application/models/codex/Bisverwendung_model.php    |   0
 application/models/codex/Bundesland_model.php       |   0
 application/models/codex/Entwicklungsteam_model.php |   0
 application/models/codex/Gemeinde_model.php         |   0
 application/models/codex/Gsprogramm_model.php       |   0
 application/models/codex/Hauptberuf_model.php       |   0
 application/models/codex/Lehrform_model.php         |   0
 application/models/codex/Lgartcode_model.php        |   0
 application/models/codex/Mobilitaet_model.php       |   0
 .../models/codex/Mobilitaetsprogramm_model.php      |   0
 application/models/codex/Nation_model.php           |   0
 application/models/codex/Note_model.php             |   0
 application/models/codex/Oehbeitrag_model.php       |   0
 application/models/codex/Orgform_model.php          |   0
 application/models/codex/Uhstat1daten_model.php     |   0
 application/models/codex/Verwendung_model.php       |   0
 application/models/codex/Zgv_model.php              |   0
 application/models/codex/Zgvdoktor_model.php        |   0
 application/models/codex/Zgvgruppe_model.php        |   0
 application/models/codex/Zgvmaster_model.php        |   0
 application/models/codex/Zweck_model.php            |   0
 application/models/content/Ampel_model.php          |   0
 application/models/content/Content_model.php        |   0
 application/models/content/Contentchild_model.php   |   0
 application/models/content/Contentgruppe_model.php  |   0
 application/models/content/Contentlog_model.php     |   0
 application/models/content/Contentsprache_model.php |   0
 application/models/content/DmsFS_model.php          |   0
 application/models/content/DmsVersion_model.php     |   0
 application/models/content/Dms_model.php            |   0
 application/models/content/Infoscreen_model.php     |   0
 application/models/content/News_model.php           |   0
 application/models/content/TempFS_model.php         |   0
 application/models/content/Template_model.php       |   0
 application/models/content/Veranstaltung_model.php  |   0
 .../content/Veranstaltungskategorie_model.php       |   0
 application/models/crm/Akte_model.php               |   0
 application/models/crm/Aufnahmeschluessel_model.php |   0
 application/models/crm/Bewerbungstermine_model.php  |   0
 application/models/crm/Buchungstyp_model.php        |   0
 application/models/crm/Dokument_model.php           |   0
 application/models/crm/Dokumentprestudent_model.php |   0
 .../models/crm/Dokumentstudiengang_model.php        |   0
 application/models/crm/Konto_model.php              |   0
 application/models/crm/Preincoming_model.php        |   0
 application/models/crm/Preinteressent_model.php     |   0
 .../models/crm/Preinteressentstudiengang_model.php  |   0
 application/models/crm/Preoutgoing_model.php        |   0
 application/models/crm/Prestudent_model.php         |   0
 application/models/crm/Prestudentstatus_model.php   |   0
 application/models/crm/Reihungstest_model.php       |   0
 application/models/crm/RtPerson_model.php           |   0
 application/models/crm/RtStudienplan_model.php      |   0
 .../models/crm/RueckstellungStatus_model.php        |   0
 application/models/crm/Rueckstellung_model.php      |   0
 application/models/crm/Status_model.php             |   0
 application/models/crm/Statusgrund_model.php        |   0
 application/models/crm/Student_model.php            |   0
 application/models/crm/ZGVPruefungStatus_model.php  |   0
 application/models/crm/ZGVPruefung_model.php        |   0
 .../models/dashboard/Dashboard_Override_model.php   |   0
 .../models/dashboard/Dashboard_Preset_model.php     |   0
 .../models/dashboard/Dashboard_Widget_model.php     |   0
 application/models/dashboard/Dashboard_model.php    |   0
 application/models/dashboard/Widget_model.php       |   0
 application/models/education/Abgabe_model.php       |   0
 .../models/education/Abschlussbeurteilung_model.php |   0
 .../models/education/Abschlusspruefung_model.php    |   0
 application/models/education/Anrechnung_model.php   |   0
 .../education/Anrechnungbegruendung_model.php       |   0
 .../models/education/Anrechnungstatus_model.php     |   0
 .../models/education/Anrechnungszeitraum_model.php  |   0
 application/models/education/Anwesenheit_model.php  |   0
 application/models/education/Beispiel_model.php     |   0
 application/models/education/Betreuerart_model.php  |   0
 application/models/education/Feedback_model.php     |   0
 .../models/education/LeNotenschluessel_model.php    |   0
 application/models/education/LePruefung_model.php   |   0
 application/models/education/Legesamtnote_model.php |   0
 application/models/education/Lehreinheit_model.php  |   0
 .../models/education/Lehreinheitgruppe_model.php    |   0
 .../education/Lehreinheitmitarbeiter_model.php      |   0
 application/models/education/Lehrfach_model.php     |   0
 application/models/education/Lehrfunktion_model.php |   0
 application/models/education/Lehrtyp_model.php      |   0
 .../models/education/Lehrveranstaltung_model.php    |   0
 application/models/education/Lvangebot_model.php    |   0
 application/models/education/Lvgesamtnote_model.php |   0
 application/models/education/Lvinfo_model.php       |   0
 application/models/education/Lvregel_model.php      |   0
 application/models/education/Lvregeltyp_model.php   |   0
 .../models/education/Notenschluessel_model.php      |   0
 .../education/Notenschluesselaufteilung_model.php   |   0
 .../education/Notenschluesseluebung_model.php       |   0
 .../education/Notenschluesselzuordnung_model.php    |   0
 application/models/education/Paabgabe_model.php     |   0
 application/models/education/Paabgabetyp_model.php  |   0
 .../models/education/Projektarbeit_model.php        |   0
 .../models/education/Projektbetreuer_model.php      |   0
 application/models/education/Projekttyp_model.php   |   0
 application/models/education/Pruefung_model.php     |   0
 .../models/education/Pruefungsanmeldung_model.php   |   0
 .../models/education/Pruefungsfenster_model.php     |   0
 .../models/education/Pruefungsstatus_model.php      |   0
 .../models/education/Pruefungstermin_model.php      |   0
 application/models/education/Pruefungstyp_model.php |   0
 .../models/education/Studentbeispiel_model.php      |   0
 .../models/education/Studentlehrverband_model.php   |   0
 .../models/education/Studentuebung_model.php        |   0
 .../models/education/Studierendenantrag_model.php   |   0
 .../Studierendenantraglehrveranstaltung_model.php   |   0
 .../education/Studierendenantragstatus_model.php    |   0
 application/models/education/Uebung_model.php       |   0
 application/models/education/Zeugnis_model.php      |   0
 application/models/education/Zeugnisnote_model.php  |   0
 application/models/extensions/.placeholder          |   0
 application/models/index.html                       |   0
 application/models/organisation/Erhalter_model.php  |   0
 .../models/organisation/Fachbereich_model.php       |   0
 application/models/organisation/Ferien_model.php    |   0
 .../models/organisation/Geschaeftsjahr_model.php    |   0
 application/models/organisation/Gruppe_model.php    |   0
 .../models/organisation/Lehrverband_model.php       |   0
 .../organisation/Organisationseinheit_model.php     |   0
 .../organisation/Organisationseinheittyp_model.php  |   0
 .../models/organisation/Semesterwochen_model.php    |   0
 application/models/organisation/Service_model.php   |   0
 application/models/organisation/Standort_model.php  |   0
 application/models/organisation/Statistik_model.php |   0
 .../models/organisation/Studiengang_model.php       |   0
 .../models/organisation/Studiengangstyp_model.php   |   0
 .../models/organisation/Studienjahr_model.php       |   0
 .../models/organisation/Studienordnung_model.php    |   0
 .../organisation/Studienordnungstatus_model.php     |   0
 .../models/organisation/Studienplan_model.php       |   0
 .../models/organisation/Studienplatz_model.php      |   0
 .../models/organisation/Studiensemester_model.php   |   0
 application/models/person/Adresse_model.php         |   0
 application/models/person/Adressentyp_model.php     |   0
 application/models/person/Bankverbindung_model.php  |   0
 application/models/person/Benutzer_model.php        |   0
 .../models/person/Benutzerfunktion_model.php        |   0
 application/models/person/Benutzergruppe_model.php  |   0
 application/models/person/Fotostatus_model.php      |   0
 .../models/person/Fotostatusperson_model.php        |   0
 application/models/person/Freebusy_model.php        |   0
 application/models/person/Freebusytyp_model.php     |   0
 application/models/person/Geschlecht_model.php      |   0
 application/models/person/Kontakt_model.php         |   0
 application/models/person/Kontaktmedium_model.php   |   0
 application/models/person/Kontakttyp_model.php      |   0
 application/models/person/Notiz_model.php           |   0
 application/models/person/Notizzuordnung_model.php  |   0
 application/models/person/Person_model.php          |   0
 application/models/person/Profil_update_model.php   |   0
 application/models/project/Aktivitaet_model.php     |   0
 application/models/project/Aufwandstyp_model.php    |   0
 application/models/project/Projekt_model.php        |   0
 .../models/project/Projekt_ressource_model.php      |   0
 application/models/project/Projektphase_model.php   |   0
 application/models/project/Projekttask_model.php    |   0
 application/models/project/Ressource_model.php      |   0
 application/models/project/Scrumsprint_model.php    |   0
 .../models/ressource/Betriebsmittel_model.php       |   0
 .../models/ressource/Betriebsmittelperson_model.php |   0
 .../models/ressource/Betriebsmittelstatus_model.php |   0
 .../models/ressource/Betriebsmitteltyp_model.php    |   0
 application/models/ressource/Coodle_model.php       |   0
 .../models/ressource/Erreichbarkeit_model.php       |   0
 application/models/ressource/Firma_model.php        |   0
 application/models/ressource/Firmatag_model.php     |   0
 application/models/ressource/Firmentyp_model.php    |   0
 application/models/ressource/Funktion_model.php     |   0
 application/models/ressource/Lehrmittel_model.php   |   0
 application/models/ressource/Mitarbeiter_model.php  |   0
 application/models/ressource/Ort_model.php          |   0
 application/models/ressource/Ortraumtyp_model.php   |   0
 .../ressource/Personfunktionstandort_model.php      |   0
 application/models/ressource/Raumtyp_model.php      |   0
 application/models/ressource/Reservierung_model.php |   0
 application/models/ressource/Stunde_model.php       |   0
 application/models/ressource/Stundenplan_model.php  |   0
 .../models/ressource/Stundenplandev_model.php       |   0
 .../models/ressource/Zeitaufzeichnung_model.php     |   0
 application/models/ressource/Zeitsperre_model.php   |   0
 .../models/ressource/Zeitsperretyp_model.php        |   0
 .../ressource/Zeitwunsch_gueltigkeit_model.php      |   0
 application/models/ressource/Zeitwunsch_model.php   |   0
 application/models/system/Appdaten_model.php        |   0
 application/models/system/Attachment_model.php      |   0
 application/models/system/Benutzerrolle_model.php   |   0
 application/models/system/Berechtigung_model.php    |   0
 application/models/system/Cronjob_model.php         |   0
 application/models/system/Dokument_model.php        |   0
 application/models/system/Extensions_model.php      |   0
 application/models/system/Fehler_model.php          |   0
 .../models/system/Fehlerkonfiguration_model.php     |   0
 .../models/system/Fehlerkonfigurationstyp_model.php |   0
 .../models/system/Fehlerzustaendigkeiten_model.php  |   0
 application/models/system/Filter_model.php          |   0
 application/models/system/Filters_model.php         |   0
 application/models/system/Issue_model.php           |   0
 application/models/system/JobStatuses_model.php     |   0
 application/models/system/JobTriggers_model.php     |   0
 application/models/system/JobTypes_model.php        |   0
 application/models/system/JobsQueue_model.php       |   0
 application/models/system/Log_model.php             |   0
 application/models/system/MessageToken_model.php    |   0
 application/models/system/Message_model.php         |   0
 application/models/system/MsgStatus_model.php       |   0
 application/models/system/PersonLock_model.php      |   0
 application/models/system/PersonLog_model.php       |   0
 application/models/system/Phrase_model.php          |   0
 application/models/system/Phrasentext_model.php     |   0
 application/models/system/Recipient_model.php       |   0
 application/models/system/Rolle_model.php           |   0
 .../models/system/Rolleberechtigung_model.php       |   0
 application/models/system/Server_model.php          |   0
 application/models/system/Sprache_model.php         |   0
 application/models/system/Tag_model.php             |   0
 application/models/system/UDF_model.php             |   0
 application/models/system/Variable_model.php        |   0
 application/models/system/Variablenname_model.php   |   0
 application/models/system/Vorlage_model.php         |   0
 application/models/system/Vorlagedokument_model.php |   0
 .../models/system/Vorlagestudiengang_model.php      |   0
 application/models/system/Webservicelog_model.php   |   0
 application/models/system/Webservicerecht_model.php |   0
 application/models/system/Webservicetyp_model.php   |   0
 application/models/testtool/Ablauf_model.php        |   0
 application/models/testtool/Antwort_model.php       |   0
 application/models/testtool/Frage_model.php         |   0
 application/models/testtool/Gebiet_model.php        |   0
 application/models/testtool/Kategorie_model.php     |   0
 application/models/testtool/Kriterien_model.php     |   0
 application/models/testtool/Pruefling_model.php     |   0
 application/models/testtool/Vorschlag_model.php     |   0
 application/third_party/index.html                  |   0
 application/tmp/.placeholder                        |   0
 .../views/Cis/Cms/News/Xml/Address/Detailed.php     |   0
 .../views/Cis/Cms/News/Xml/Address/Short.php        |   0
 application/views/Cis/Cms/News/Xml/NewsExtras.php   |   0
 application/views/Cis/Documents.php                 |   0
 application/views/Cis/Login.php                     |   0
 application/views/Cis/MyLv.php                      |   0
 application/views/Cis/Profil.php                    |   0
 application/views/Cis/ProfilUpdate.php              |   0
 application/views/Cis/Stundenplan.php               |   0
 application/views/CisHmvc/Cms/Content.php           |   0
 application/views/CisHmvc/Cms/Legacy.php            |   0
 application/views/CisHmvc/Dashboard.php             |   0
 application/views/CisHmvc/Error.php                 |   0
 application/views/CisHtml/Cms/Content.php           |   0
 application/views/CisHtml/Dashboard.php             |   0
 application/views/CisHtml/Error.php                 |   0
 application/views/CisVue/Cms/Content.php            |   0
 application/views/CisVue/Dashboard.php              |   0
 application/views/codex/oehbeitrag.php              |   0
 application/views/codex/uhstat1.php                 |   0
 application/views/crm/statusEdit.php                |   0
 application/views/crm/statusGrundList.php           |   0
 application/views/crm/statusList.php                |   0
 application/views/crm/statusgrund.php               |   0
 application/views/crm/statusgrundEdit.php           |   0
 application/views/crm/statusgrundNew.php            |   0
 application/views/dashboard/dashboard_demo.php      |   0
 .../views/dashboard/dashboard_demo_admin.php        |   0
 application/views/errors/cli/error_404.php          |   0
 application/views/errors/cli/error_db.php           |   0
 application/views/errors/cli/error_exception.php    |   0
 application/views/errors/cli/error_general.php      |   0
 application/views/errors/cli/error_php.php          |   0
 application/views/errors/cli/index.html             |   0
 application/views/errors/html/error_404.php         |   0
 application/views/errors/html/error_db.php          |   0
 application/views/errors/html/error_exception.php   |   0
 application/views/errors/html/error_general.php     |   0
 application/views/errors/html/error_php.php         |   0
 application/views/errors/html/index.html            |   0
 application/views/errors/index.html                 |   0
 application/views/extensions/.placeholder           |   0
 application/views/home.php                          |   0
 application/views/index.html                        |   0
 application/views/lehre/Antrag/Create.php           |   0
 application/views/lehre/Antrag/Leitung/List.php     |   0
 application/views/lehre/Antrag/Student/List.php     |   0
 .../views/lehre/Antrag/Wiederholung/Student.php     |   0
 .../views/lehre/Antrag/Wiederholung/getLvs.rdf.php  |   0
 .../views/lehre/Antrag/Wiederholung/moveLvs.rdf.php |   0
 .../views/lehre/anrechnung/adminAnrechnung.php      |   0
 .../views/lehre/anrechnung/adminAnrechnungData.php  |   0
 .../lehre/anrechnung/approveAnrechnungDetail.php    |   0
 .../anrechnung/approveAnrechnungUebersicht.php      |   0
 .../anrechnung/approveAnrechnungUebersichtData.php  |   0
 .../views/lehre/anrechnung/createAnrechnung.php     |   0
 .../views/lehre/anrechnung/createAnrechnungData.php |   0
 .../views/lehre/anrechnung/requestAnrechnung.php    |   0
 .../lehre/anrechnung/requestAnrechnungImportant.php |   0
 .../lehre/anrechnung/reviewAnrechnungDetail.php     |   0
 .../views/lehre/anrechnung/reviewAnrechnungInfo.php |   0
 .../lehre/anrechnung/reviewAnrechnungUebersicht.php |   0
 .../anrechnung/reviewAnrechnungUebersichtData.php   |   0
 application/views/lehre/lehrauftrag/Dashboard.php   |   0
 .../views/lehre/lehrauftrag/LehrendeUebersicht.php  |   0
 .../views/lehre/lehrauftrag/acceptLehrauftrag.php   |   0
 .../lehre/lehrauftrag/acceptLehrauftragData.php     |   0
 .../lehre/lehrauftrag/acceptLehrauftragHelp.php     |   0
 .../views/lehre/lehrauftrag/approveLehrauftrag.php  |   0
 .../lehre/lehrauftrag/approveLehrauftragData.php    |   0
 .../lehre/lehrauftrag/approveLehrauftragHelp.php    |   0
 .../lehre/lehrauftrag/cancelledLehrauftragData.php  |   0
 .../views/lehre/lehrauftrag/orderLehrauftrag.php    |   0
 .../lehre/lehrauftrag/orderLehrauftragData.php      |   0
 .../lehre/lehrauftrag/orderLehrauftragHelp.php      |   0
 .../lehre/lvplanung/adminZeitverfuegbarkeit.php     |   0
 .../lehre/lvplanung/adminZeitverfuegbarkeitData.php |   0
 application/views/lehre/pruefungsprotokoll.php      |   0
 .../views/lehre/pruefungsprotokollUebersicht.php    |   0
 .../lehre/pruefungsprotokollUebersichtData.php      |   0
 .../reihungstest/ReihungstestUebersichtData.php     |   0
 .../organisation/reihungstest/reihungstest.php      |   0
 application/views/organisation/studienjahr.php      |   0
 application/views/organisation/studienjahrEdit.php  |   0
 application/views/organisation/studienjahrForm.php  |   0
 application/views/organisation/studienjahrNew.php   |   0
 application/views/organisation/studiensemester.php  |   0
 .../views/organisation/studiensemesterEdit.php      |   0
 .../views/organisation/studiensemesterForm.php      |   0
 .../views/organisation/studiensemesterNew.php       |   0
 application/views/person/bpk/bpkData.php            |   0
 application/views/person/bpk/bpkDetails.php         |   0
 application/views/person/bpk/bpkwartung.php         |   0
 application/views/person/cli/view.php               |   0
 application/views/person/gradelist/course.php       |   0
 application/views/person/gradelist/gradelist.php    |   0
 application/views/person/gradelist/semester.php     |   0
 .../person/gruppenmanagement/benutzergruppe.php     |   0
 .../person/gruppenmanagement/gruppenmanagement.php  |   0
 .../gruppenmanagement/gruppenmanagementData.php     |   0
 application/views/person/index.php                  |   0
 application/views/person/view.php                   |   0
 .../views/system/aufnahme/prestudentMultiAssign.php |   0
 application/views/system/extensions/manager.php     |   0
 application/views/system/fas_udf.php                |   0
 application/views/system/infocenter/absageModal.php |   0
 application/views/system/infocenter/addNotiz.php    |   0
 .../system/infocenter/anmerkungenZurBewerbung.php   |   0
 .../views/system/infocenter/dokNachzureichend.php   |   0
 application/views/system/infocenter/dokpruefung.php |   0
 application/views/system/infocenter/infocenter.php  |   0
 .../system/infocenter/infocenterAbgewiesen.php      |   0
 .../system/infocenter/infocenterAbgewiesenData.php  |   0
 .../system/infocenter/infocenterAufgenommen.php     |   0
 .../system/infocenter/infocenterAufgenommenData.php |   0
 .../views/system/infocenter/infocenterData.php      |   0
 .../views/system/infocenter/infocenterDetails.php   |   0
 .../system/infocenter/infocenterFreigegeben.php     |   0
 .../system/infocenter/infocenterFreigegebenData.php |   0
 .../infocenter/infocenterReihungstestAbsolviert.php |   0
 .../infocenterReihungstestAbsolviertData.php        |   0
 .../system/infocenter/infocenterZgvDetails.php      |   0
 .../infocenter/infocenterZgvUeberpruefung.php       |   0
 .../infocenter/infocenterZgvUeberpruefungData.php   |   0
 application/views/system/infocenter/logs.php        |   0
 application/views/system/infocenter/messageList.php |   0
 application/views/system/infocenter/notizen.php     |   0
 application/views/system/infocenter/stammdaten.php  |   0
 .../views/system/infocenter/studiengangZgvInfo.php  |   0
 .../views/system/infocenter/zgvpruefungen.php       |   0
 application/views/system/issues/issues.php          |   0
 application/views/system/issues/issuesData.php      |   0
 .../views/system/issues/issuesKonfiguration.php     |   0
 .../views/system/issues/issuesKonfigurationData.php |   0
 .../views/system/issues/issuesZustaendigkeiten.php  |   0
 .../system/issues/issuesZustaendigkeitenData.php    |   0
 application/views/system/issues/plausichecks.php    |   0
 application/views/system/jq/jobsQueueViewer.php     |   0
 application/views/system/jq/jobsQueueViewerData.php |   0
 application/views/system/login/usernamePassword.php |   0
 application/views/system/logs/logsViewer.php        |   0
 application/views/system/logs/testSearch.php        |   0
 .../views/system/messages/FAShtmlWriteTemplate.php  |   0
 application/views/system/messages/ajaxRead.php      |   0
 application/views/system/messages/ajaxWrite.php     |   0
 .../views/system/messages/ajaxWriteReply.php        |   0
 .../views/system/messages/htmlMessageSentError.php  |   0
 .../system/messages/htmlMessageSentSuccess.php      |   0
 application/views/system/messages/htmlRead.php      |   0
 .../views/system/messages/htmlWriteReply.php        |   0
 .../views/system/messages/htmlWriteTemplate.php     |   0
 .../views/system/phrases/phraseinhaltEdit.php       |   0
 application/views/system/phrases/phrases.php        |   0
 application/views/system/phrases/phrasesEdit.php    |   0
 application/views/system/phrases/phrasesList.php    |   0
 .../views/system/phrases/phrasesinhaltList.php      |   0
 .../views/system/vorlage/templateLinkDocuments.php  |   0
 application/views/system/vorlage/templates.php      |   0
 application/views/system/vorlage/templatesEdit.php  |   0
 application/views/system/vorlage/templatesList.php  |   0
 .../views/system/vorlage/templatetextEdit.php       |   0
 .../views/system/vorlage/templatetextList.php       |   0
 .../views/system/vorlage/templatetextPreview.php    |   0
 application/views/templates/CISHMVC-Footer.php      |   0
 application/views/templates/CISHMVC-Header.php      |   0
 application/views/templates/CISHMVC-Menu/Entry.php  |   0
 application/views/templates/CISHTML-Footer.php      |   0
 application/views/templates/CISHTML-Header.php      |   0
 application/views/templates/CISHTML-Menu/Entry.php  |   0
 .../views/templates/CISHTML-Menu/EntryBase.php      |   0
 .../views/templates/CISHTML-Menu/EntryInclude.php   |   0
 application/views/templates/CISVUE-Footer.php       |   0
 application/views/templates/CISVUE-Header.php       |   0
 application/views/templates/FHC-Common.php          |   0
 application/views/templates/FHC-Footer.php          |   0
 application/views/templates/FHC-Header.php          |   0
 application/views/templates/footer.php              |   0
 application/views/templates/header.php              |   0
 application/views/templates/mailHTML.php            |   0
 application/views/templates/mailTXT.php             |   0
 .../templates/mailtemplates/interessentFreigabe.php |   0
 application/views/templates/vilesci.php             |   0
 application/views/test/Admin.php                    |   0
 application/views/test/Test.php                     |   0
 application/views/widgets/checkbox.php              |   0
 application/views/widgets/dropdown.php              |   0
 application/views/widgets/filter/filter.php         |   0
 application/views/widgets/filter/filterOptions.php  |   0
 application/views/widgets/filter/pivotUIDataset.php |   0
 application/views/widgets/filter/saveFilter.php     |   0
 application/views/widgets/filter/selectFields.php   |   0
 application/views/widgets/filter/selectFilters.php  |   0
 application/views/widgets/filter/tableDataset.php   |   0
 .../views/widgets/filter/tabulatorDataset.php       |   0
 application/views/widgets/jsoneditor.php            |   0
 application/views/widgets/jsonforms.php             |   0
 application/views/widgets/mimetype.php              |   0
 application/views/widgets/navigation.php            |   0
 application/views/widgets/navigationHeader.php      |   0
 application/views/widgets/navigationMenu.php        |   0
 application/views/widgets/phpjsonform.php           |   0
 application/views/widgets/table/pivotUIDataset.php  |   0
 application/views/widgets/table/table.php           |   0
 application/views/widgets/table/tableDataset.php    |   0
 application/views/widgets/table/tableHelpsite.php   |   0
 .../views/widgets/table/tabulatorDataset.php        |   0
 application/views/widgets/textarea.php              |   0
 application/views/widgets/textfield.php             |   0
 application/views/widgets/tinymce.php               |   0
 application/widgets/Aufnahmegruppe_widget.php       |   0
 application/widgets/Ausbildungssemester_widget.php  |   0
 application/widgets/Dropdown_widget.php             |   0
 application/widgets/FilterWidget.php                |   0
 application/widgets/MultipleDropdown_widget.php     |   0
 application/widgets/Nation_widget.php               |   0
 application/widgets/NavigationHeaderWidget.php      |   0
 application/widgets/NavigationMenuWidget.php        |   0
 application/widgets/NavigationWidget.php            |   0
 application/widgets/Organisationseinheit_widget.php |   0
 application/widgets/Orgform_widget.php              |   0
 application/widgets/Reihungstest_widget.php         |   0
 application/widgets/Sprache_widget.php              |   0
 application/widgets/Statusgrund_widget.php          |   0
 application/widgets/Studiengang_widget.php          |   0
 application/widgets/Studiensemester_widget.php      |   0
 application/widgets/Stufe_widget.php                |   0
 application/widgets/TableWidget.php                 |   0
 application/widgets/Vorlage_widget.php              |   0
 application/widgets/Zgv_widget.php                  |   0
 application/widgets/Zgvmaster_widget.php            |   0
 application/widgets/extensions/.placeholder         |   0
 application/widgets/html/CheckboxWidget.php         |   0
 application/widgets/html/DropdownWidget.php         |   0
 application/widgets/html/HTMLWidget.php             |   0
 application/widgets/html/TextareaWidget.php         |   0
 application/widgets/html/TextfieldWidget.php        |   0
 application/widgets/jsoneditor_widget.php           |   0
 application/widgets/jsonforms_widget.php            |   0
 application/widgets/mimetype_widget.php             |   0
 application/widgets/phpjsonform_widget.php          |   0
 application/widgets/tinymce_widget.php              |   0
 application/widgets/udf/CheckboxWidgetUDF.php       |   0
 application/widgets/udf/DropdownWidgetUDF.php       |   0
 application/widgets/udf/TextareaWidgetUDF.php       |   0
 application/widgets/udf/TextfieldWidgetUDF.php      |   0
 application/widgets/udf/UDFWidget.php               |   0
 cis.php                                             |   0
 cis/ampel.php                                       |   0
 cis/cisdocs/index.html                              |   0
 cis/cisdocs/muster_semesterplan.doc                 | Bin
 cis/cisdocs/muster_semesterplan_index.html          |   0
 cis/cisdocs/vorlage_studienbrief.dot                | Bin
 cis/index.html                                      |   0
 cis/index.php                                       |   0
 cis/index_login.php                                 |   0
 cis/infoterminal/feed.png                           | Bin
 cis/infoterminal/go-bottom.png                      | Bin
 cis/infoterminal/go-top.png                         | Bin
 cis/infoterminal/index.php                          |   0
 cis/infoterminal/informationsbildschirm.php         |   0
 cis/infoterminal/infoterm.css                       |   0
 cis/infoterminal/keyboard.php                       |   0
 cis/infoterminal/lvplan.php                         |   0
 cis/infoterminal/system-users_in.png                | Bin
 cis/infoterminal/system-users_out.png               | Bin
 cis/infoterminal/tw_lageplan.jpg                    | Bin
 cis/infoterminal/tw_logo_01.jpg                     | Bin
 cis/infoterminal/twplan.gif                         | Bin
 cis/menu.php                                        |   0
 cis/private/bildupload.php                          |   0
 cis/private/coodle/coodle_autocomplete.php          |   0
 cis/private/coodle/coodle_events.php                |   0
 cis/private/coodle/coodle_worker.php                |   0
 cis/private/coodle/index.html                       |   0
 cis/private/coodle/stammdaten.php                   |   0
 cis/private/coodle/termin.php                       |   0
 cis/private/coodle/uebersicht.php                   |   0
 cis/private/crop.php                                |   0
 cis/private/freifaecher/anmeldung.php               |   0
 cis/private/freifaecher/anmeldungsuebersicht.php    |   0
 cis/private/freifaecher/index.html                  |   0
 cis/private/index.html                              |   0
 cis/private/info/ersthelfer.php                     |   0
 .../Projektarbeitsabgabe_FHTW_Anleitung_A.pdf       | Bin
 .../Projektarbeitsabgabe_FHTW_Anleitung_L.pdf       | Bin
 .../Publikationsdatenbank_FHTW_Handbuch.pdf         | Bin
 .../info/handbuecher/abgabetool_lektoren.pdf        | Bin
 .../info/handbuecher/abgabetool_studenten.pdf       | Bin
 cis/private/info/handbuecher/index.php              |   0
 cis/private/info/index.html                         |   0
 cis/private/info/partnerhochschulen.php             |   0
 cis/private/info/service_uebersicht.php             |   0
 cis/private/info/telefonverzeichnis.php             |   0
 cis/private/jahresplan/index.html                   |   0
 cis/private/jahresplan/index.php                    |   0
 cis/private/jahresplan/jahresplan_bilder.php        |   0
 cis/private/jahresplan/jahresplan_detail.php        |   0
 .../jahresplan/jahresplan_funktionen.inc.php        |   0
 cis/private/jahresplan/jahresplan_kategorie.php     |   0
 cis/private/jahresplan/jahresplan_reservierung.php  |   0
 cis/private/jahresplan/jahresplan_veranstaltung.php |   0
 cis/private/lehre/abgabe_lektor.php                 |   0
 cis/private/lehre/abgabe_lektor_details.php         |   0
 cis/private/lehre/abgabe_lektor_frameset.html       |   0
 cis/private/lehre/abgabe_lektor_multitermin.php     |   0
 .../lehre/abgabe_lektor_terminuebersicht.php        |   0
 cis/private/lehre/abgabe_lektor_zusatz.php          |   0
 cis/private/lehre/abgabe_student.php                |   0
 cis/private/lehre/abgabe_student_details.php        |   0
 cis/private/lehre/abgabe_student_file.php           |   0
 cis/private/lehre/abgabe_student_frameset.php       |   0
 cis/private/lehre/abmeldung.php                     |   0
 cis/private/lehre/anwesenheitsliste.pdf.php         |   0
 cis/private/lehre/anwesenheitsliste.php             |   0
 .../lehre/benotungstool/lvgesamtnote_worker.php     |   0
 .../lehre/benotungstool/lvgesamtnoteeintragen.php   |   0
 .../lehre/benotungstool/lvgesamtnoteverwalten.php   |   0
 .../lehre/benotungstool/nachpruefungeintragen.php   |   0
 cis/private/lehre/benotungstool/notenschluessel.php |   0
 cis/private/lehre/covidstatusliste.php              |   0
 cis/private/lehre/feedback.php                      |   0
 cis/private/lehre/fotoliste.pdf.php                 |   0
 cis/private/lehre/index.html                        |   0
 cis/private/lehre/lector_choice.php                 |   0
 cis/private/lehre/lesson.php                        |   0
 cis/private/lehre/notenliste.php                    |   0
 cis/private/lehre/notenliste.xls.php                |   0
 cis/private/lehre/pruefung/index.php                |   0
 cis/private/lehre/pruefung/lektor_autocomplete.php  |   0
 cis/private/lehre/pruefung/pruefung.js.php          |   0
 .../lehre/pruefung/pruefungsanmeldung.json.php      |   0
 cis/private/lehre/pruefung/pruefungsanmeldung.php   |   0
 .../pruefung/pruefungsanmeldungen_liste.pdf.php     |   0
 .../lehre/pruefung/pruefungsanmeldungen_liste.php   |   0
 .../pruefungsanmeldungen_liste_ohne_namen.php       |   0
 .../pruefung/pruefungsanmeldungen_verwalten.php     |   0
 .../lehre/pruefung/pruefungsbewertung.js.php        |   0
 .../lehre/pruefung/pruefungsbewertung.json.php      |   0
 cis/private/lehre/pruefung/pruefungsbewertung.php   |   0
 .../lehre/pruefung/pruefungsfenster_anlegen.php     |   0
 cis/private/lehre/pruefung/pruefungstermin.json.php |   0
 .../lehre/pruefung/pruefungstermin_aendern.php      |   0
 .../lehre/pruefung/pruefungstermin_festlegen.php    |   0
 .../lehre/pruefung/pruefungstermin_loeschen.php     |   0
 cis/private/lehre/semdownhlp.php                    |   0
 cis/private/lehre/semupload.php                     |   0
 cis/private/lehre/softgrid.php                      |   0
 cis/private/lehre/upload.php                        |   0
 cis/private/lvplan/belegt.php                       |   0
 cis/private/lvplan/index.html                       |   0
 cis/private/lvplan/index.php                        |   0
 cis/private/lvplan/index_out.html                   |   0
 cis/private/lvplan/lvplan_autocomplete.php          |   0
 cis/private/lvplan/raumsuche.php                    |   0
 cis/private/lvplan/stpl_detail.php                  |   0
 cis/private/lvplan/stpl_kalender.php                |   0
 cis/private/lvplan/stpl_reserve_list.php            |   0
 cis/private/lvplan/stpl_week.php                    |   0
 cis/private/lvplan/stpl_week_anzahl_studenten.php   |   0
 cis/private/lvplan/verband_uebersicht.php           |   0
 cis/private/mailverteiler.php                       |   0
 cis/private/open_grp.php                            |   0
 cis/private/outgoing/akte.php                       |   0
 cis/private/outgoing/akteupload.php                 |   0
 cis/private/outgoing/index.html                     |   0
 cis/private/outgoing/outgoing.php                   |   0
 cis/private/outgoing/outgoing_autocomplete.php      |   0
 cis/private/outgoing/registration.php               |   0
 cis/private/pdfExport.php                           |   0
 cis/private/pers_in_grp.php                         |   0
 cis/private/profile/anwesenheit.php                 |   0
 cis/private/profile/anwesenheit_lektor.php          |   0
 cis/private/profile/change_password.php             |   0
 cis/private/profile/dokumente.php                   |   0
 cis/private/profile/freebusy.php                    |   0
 cis/private/profile/index.html                      |   0
 cis/private/profile/index.php                       |   0
 cis/private/profile/lva_liste.php                   |   0
 cis/private/profile/mitarbeiter_buchung.php         |   0
 cis/private/profile/studienplan.php                 |   0
 cis/private/profile/urlaubsfreigabe.php             |   0
 cis/private/profile/urlaubstool.php                 |   0
 cis/private/profile/urlaubstool_autocomplete.php    |   0
 cis/private/profile/zahlungen.php                   |   0
 cis/private/profile/zahlungen_details.php           |   0
 cis/private/profile/zeitsperre.php                  |   0
 cis/private/profile/zeitsperre_days.php             |   0
 cis/private/profile/zeitsperre_export.php           |   0
 cis/private/profile/zeitsperre_resturlaub.php       |   0
 cis/private/profile/zeitwunsch.php                  |   0
 cis/private/profile/zeitwunsch_help.php             |   0
 cis/private/stud_in_grp.php                         |   0
 cis/private/tools/ampelleiteruebersicht.php         |   0
 cis/private/tools/ampelverwaltung.php               |   0
 cis/private/tools/index.html                        |   0
 cis/private/tools/notebook_registration.php         |   0
 cis/private/tools/projektabgabe.php                 |   0
 cis/private/tools/projektabgabe_autocomplete.php    |   0
 cis/private/tools/suche.php                         |   0
 cis/private/tools/zeitaufzeichnung.php              |   0
 cis/private/tools/zeitaufzeichnung_autocomplete.php |   0
 .../tools/zeitaufzeichnung_bisverwendung.php        |   0
 cis/private/tools/zeitaufzeichnung_projektliste.php |   0
 .../tools/zeitaufzeichnung_projektphasen.php        |   0
 cis/private/tools/zeitaufzeichnung_zeitsperren.php  |   0
 cis/public/accountactivation.php                    |   0
 cis/public/bild.php                                 |   0
 cis/public/bildupload.php                           |   0
 cis/public/coodle.php                               |   0
 cis/public/freebusy.php                             |   0
 cis/public/freebusy_coodle.php                      |   0
 cis/public/freebusy_lvplan.php                      |   0
 cis/public/freebusy_sogo.php                        |   0
 cis/public/freebusy_zeitsperren.php                 |   0
 cis/public/ical_coodle.php                          |   0
 cis/public/incoming/akte.php                        |   0
 cis/public/incoming/akteupload.php                  |   0
 cis/public/incoming/auth.php                        |   0
 cis/public/incoming/incoming.php                    |   0
 cis/public/incoming/index.php                       |   0
 cis/public/incoming/logout.php                      |   0
 cis/public/incoming/lvinfo.php                      |   0
 cis/public/incoming/registration.php                |   0
 cis/public/index.html                               |   0
 cis/public/prestudententool/auth.php                |   0
 cis/public/prestudententool/index.php               |   0
 cis/public/prestudententool/logout.php              |   0
 cis/public/prestudententool/prestudent.php          |   0
 cis/public/testtool_test/MathML_Beispiel.jpg        | Bin
 cis/public/testtool_test/audio_testfile.mp3         | Bin
 cis/public/testtool_test/testseite.php              |   0
 cis/testtool/admin/Testtool.pdf                     | Bin
 cis/testtool/admin/add_gebiet.php                   |   0
 cis/testtool/admin/auswertung.php                   |   0
 cis/testtool/admin/auswertung_detail.php            |   0
 cis/testtool/admin/auswertung_detail_frage.php      |   0
 cis/testtool/admin/auswertung_detail_prestudent.php |   0
 cis/testtool/admin/copy_gebiet.php                  |   0
 cis/testtool/admin/edit_ablauf.php                  |   0
 cis/testtool/admin/edit_gebiet.php                  |   0
 cis/testtool/admin/gebieteAnheangen.php             |   0
 cis/testtool/admin/index.php                        |   0
 cis/testtool/admin/uebersichtFragen.php             |   0
 cis/testtool/admin/uebersichtGebiete.php            |   0
 .../audio-player/audio-player-noswfobject.js        |   0
 .../audio-player/audio-player-uncompressed.js       |   0
 cis/testtool/audio-player/audio-player.js           |   0
 cis/testtool/audio-player/license.txt               |   0
 cis/testtool/audio-player/player.swf                | Bin
 cis/testtool/bild.php                               |   0
 cis/testtool/ctop.xsl                               |   0
 cis/testtool/frage.php                              |   0
 cis/testtool/gebietfertig.php                       |   0
 cis/testtool/index.html                             |   0
 cis/testtool/index.php                              |   0
 cis/testtool/login.php                              |   0
 cis/testtool/logout.html                            |   0
 cis/testtool/mathml.xsl                             |   0
 cis/testtool/menu.php                               |   0
 cis/testtool/pmathml.xsl                            |   0
 cis/testtool/prueflinggesperrt.php                  |   0
 cis/testtool/sound.php                              |   0
 cis/testtool/test/MathML_Beispiel.jpg               | Bin
 cis/testtool/test/audio_testfile.mp3                | Bin
 cis/testtool/test/testseite.php                     |   0
 cis/testtool/topbar.html                            |   0
 cis/testtool/topbar.php                             |   0
 cms/admin.php                                       |   0
 cms/admin_dms.php                                   |   0
 cms/content.php                                     |   0
 cms/content_uebersicht.php                          |   0
 cms/dms.php                                         |   0
 cms/image.php                                       |   0
 cms/index.html                                      |   0
 cms/menu.inc.php                                    |   0
 cms/menu/menu_addon.class.php                       |   0
 cms/menu/menu_addon_freifaecher.inc.php             |   0
 cms/menu/menu_addon_lehrveranstaltungen.inc.php     |   0
 ...nu_addon_lehrveranstaltungen_studienplan.inc.php |   0
 cms/menu/menu_addon_meinelehrfaecher.inc.php        |   0
 cms/menu/menu_addon_meinelv.inc.php                 |   0
 cms/menu/menu_addon_spacer.inc.php                  |   0
 cms/menu/menu_addon_test.inc.php                    |   0
 cms/menu/menu_addon_urlaub.inc.php                  |   0
 cms/menu/menu_addon_zeitsperren.inc.php             |   0
 cms/news.php                                        |   0
 cms/newsverwaltung.php                              |   0
 cms/tinymce_dms.php                                 |   0
 composer.json                                       |   0
 composer.lock                                       |   0
 config/.gitignore                                   |   0
 config/cis.config-default.inc.php                   |   0
 config/global.config-default.inc.php                |   0
 config/system.config-default.inc.php                |   0
 config/vilesci.config-default.inc.php               |   0
 config/wawi.config-default.inc.php                  |   0
 content/DragAndDrop.js                              |   0
 content/about.xul.php                               |   0
 content/adressedialog.js.php                        |   0
 content/adressedialog.xul.php                       |   0
 content/akte.php                                    |   0
 content/akteupload.php                              |   0
 content/anwesenheit.js.php                          |   0
 content/anwesenheit.xul.php                         |   0
 content/bankverbindungdialog.js.php                 |   0
 content/bankverbindungdialog.xul.php                |   0
 content/betriebsmitteloverlay.js.php                |   0
 content/betriebsmitteloverlay.xul.php               |   0
 content/bild.php                                    |   0
 content/bildupload.php                              |   0
 content/bindings.css                                |   0
 content/bindings.xml.php                            |   0
 content/datepicker/calendar.png                     | Bin
 content/datepicker/date.png                         | Bin
 content/datepicker/datepicker.css                   |   0
 content/datepicker/datepicker.xml                   |   0
 content/datepicker/navigation.png                   | Bin
 content/dokumentenakt.pdf.php                       |   0
 content/dragboard.js.php                            |   0
 content/fas.xul.php                                 |   0
 content/fasDBDML.php                                |   0
 content/fasoverlay.js.php                           |   0
 content/fasoverlay.xul.php                          |   0
 content/functions.js.php                            |   0
 content/funktionen.js.php                           |   0
 content/funktionen.xul.php                          |   0
 content/kontakt.js.php                              |   0
 content/kontakt.xul.php                             |   0
 content/kontaktdialog.js.php                        |   0
 content/kontaktdialog.xul.php                       |   0
 content/lvplanung/lehrveranstaltungDBDML.php        |   0
 .../lehrveranstaltungdetailoverlay.xul.php          |   0
 .../lvplanung/lehrveranstaltungnotenoverlay.xul.php |   0
 content/lvplanung/lehrveranstaltungoverlay.js.php   |   0
 content/lvplanung/lehrveranstaltungoverlay.xul.php  |   0
 content/lvplanung/ressourcedialog.js.php            |   0
 content/lvplanung/ressourcedialog.xul.php           |   0
 content/lvplanung/stpl-details-dialog.js.php        |   0
 content/lvplanung/stpl-details-dialog.xul.php       |   0
 content/lvplanung/stpl-details-overlay.xul.php      |   0
 content/lvplanung/stpl-semester-overlay.js.php      |   0
 content/lvplanung/stpl-semester-overlay.xul.php     |   0
 content/lvplanung/stpl-week-overlay.js.php          |   0
 content/lvplanung/stpl-week-overlay.xul.php         |   0
 content/lvplanung/timetable-week.xul.php            |   0
 content/messages.js.php                             |   0
 content/messages.xul.php                            |   0
 content/mitarbeiter/lehrtaetigkeit.pdf.php          |   0
 content/mitarbeiter/mitarbeiterDBDML.php            |   0
 content/mitarbeiter/mitarbeiterbuchung.js.php       |   0
 .../mitarbeiter/mitarbeiterbuchungoverlay.xul.php   |   0
 .../mitarbeiter/mitarbeiterdetailoverlay.xul.php    |   0
 .../mitarbeiter/mitarbeiterfunktionoverlay.xul.php  |   0
 content/mitarbeiter/mitarbeiteroverlay.js.php       |   0
 content/mitarbeiter/mitarbeiteroverlay.xul.php      |   0
 content/mitarbeiter/mitarbeitervertrag.js.php       |   0
 .../mitarbeiter/mitarbeitervertragneudialog.js.php  |   0
 .../mitarbeiter/mitarbeitervertragneudialog.xul.php |   0
 .../mitarbeiter/mitarbeitervertragoverlay.xul.php   |   0
 .../mitarbeiter/mitarbeiterverwendungdialog.js.php  |   0
 .../mitarbeiter/mitarbeiterverwendungdialog.xul.php |   0
 content/notiz.xml.php                               |   0
 content/notizdialog.js.php                          |   0
 content/notizdialog.xul.php                         |   0
 content/notizdokdownload.php                        |   0
 content/notizdokupload.php                          |   0
 content/pdfExport.php                               |   0
 content/phpRequest.js.php                           |   0
 content/planner.js.php                              |   0
 content/planner.overlay.js.php                      |   0
 content/planner.overlay.xul.php                     |   0
 content/planner.xul.php                             |   0
 content/projekt/GanttChart.svg                      |   0
 content/projekt/bestellung.overlay.js.php           |   0
 content/projekt/bestellung.overlay.xul.php          |   0
 content/projekt/gantt.css                           |   0
 content/projekt/gantt.overlay.js.php                |   0
 content/projekt/gantt.overlay.xul.php               |   0
 content/projekt/gantt.svg.css                       |   0
 content/projekt/gantt.svg.php                       |   0
 content/projekt/gantt.svg.xbl                       |   0
 content/projekt/mantisdetail.overlay.xul.php        |   0
 content/projekt/parsedown.php                       |   0
 content/projekt/projekt.overlay.js.php              |   0
 content/projekt/projekt.overlay.xul.php             |   0
 content/projekt/projekt_ressource.window.js.php     |   0
 content/projekt/projekt_ressource.window.xul.php    |   0
 content/projekt/projektdetail.overlay.xul.php       |   0
 content/projekt/projektdokument.overlay.js.php      |   0
 content/projekt/projektdokument.overlay.xul.php     |   0
 content/projekt/projektdokument.window.js.php       |   0
 content/projekt/projektdokument.window.xul.php      |   0
 content/projekt/projektphase.overlay.js.php         |   0
 content/projekt/projektphase.overlay.xul.php        |   0
 content/projekt/projektphasedetail.overlay.xul.php  |   0
 content/projekt/projekttask.overlay.js.php          |   0
 content/projekt/projekttask.overlay.xul.php         |   0
 content/projekt/projekttaskdetail.overlay.xul.php   |   0
 content/projekt/ressource.js.php                    |   0
 content/projekt/ressource.overlay.js.php            |   0
 content/projekt/ressource.overlay.xul.php           |   0
 content/projekt/ressource.window.xul.php            |   0
 content/projekt/ressource.xml.php                   |   0
 content/projekt/ressourcenauslastung.php            |   0
 content/projektbeschreibung.php                     |   0
 content/statistik/StudierendeZGV.php                |   0
 content/statistik/abgaengerstatistik.php            |   0
 content/statistik/abschlusspruefungexport.xls.php   |   0
 content/statistik/absolventen.xls.php               |   0
 content/statistik/absolventenstatistik.php          |   0
 content/statistik/absolventenzahlen.php             |   0
 content/statistik/alvsstatistik.php                 |   0
 content/statistik/bama_stromanalyse.php             |   0
 content/statistik/bama_studentenstrom.svg.php       |   0
 content/statistik/bewerberstatistik.php             |   0
 content/statistik/bewerberstatistik.svg.php         |   0
 content/statistik/dokumente.xls.php                 |   0
 content/statistik/dropout.php                       |   0
 content/statistik/dropoutZGV.php                    |   0
 content/statistik/lehrauftragsliste_gst.xls.php     |   0
 content/statistik/lehrauftragsliste_mail.xls.php    |   0
 content/statistik/lvplanung.php                     |   0
 content/statistik/lvplanung.xls.php                 |   0
 content/statistik/mitarbeiterexport.xls.php         |   0
 content/statistik/mitarbeiterstatistik.php          |   0
 content/statistik/notenspiegel.php                  |   0
 content/statistik/notenspiegel_erweitert.php        |   0
 content/statistik/oeh_beitraege.xls.php             |   0
 content/statistik/projektarbeitexport.xls.php       |   0
 content/statistik/studentenexportextended.xls.php   |   0
 content/statistik/studentenprosemester.php          |   0
 content/statistik/studentenstatistik.php            |   0
 content/statistik/studentenstatistik_lehrgaenge.php |   0
 content/statistik/termine.xls.php                   |   0
 content/statistik/vertragsuebersicht.xls.php        |   0
 content/student/aufnahmetermine.js.php              |   0
 content/student/aufnahmetermine.xul.php             |   0
 content/student/interessentdokumentedialog.js.php   |   0
 content/student/interessentdokumentedialog.xul.php  |   0
 content/student/interessentdokumenteoverlay.js.php  |   0
 content/student/interessentdokumenteoverlay.xul.php |   0
 content/student/interessentoverlay.js.php           |   0
 content/student/studentDBDML.php                    |   0
 content/student/studentabschlusspruefung.js.php     |   0
 .../student/studentabschlusspruefungoverlay.xul.php |   0
 content/student/studentanrechnungenoverlay.xul.php  |   0
 content/student/studentdetailoverlay.xul.php        |   0
 content/student/studentenoverlay.xul.php            |   0
 content/student/studentgruppenoverlay.js.php        |   0
 content/student/studentgruppenoverlay.xul.php       |   0
 content/student/studentiooverlay.xul.php            |   0
 content/student/studentkontoneudialog.js.php        |   0
 content/student/studentkontoneudialog.xul.php       |   0
 content/student/studentkontooverlay.xul.php         |   0
 content/student/studentmobilitaetoverlay.js.php     |   0
 content/student/studentmobilitaetoverlay.xul.php    |   0
 content/student/studentnotenoverlay.xul.php         |   0
 content/student/studentoverlay.js.php               |   0
 content/student/studentprojektarbeit.js.php         |   0
 content/student/studentprojektarbeitoverlay.xul.php |   0
 content/student/studentpruefungoverlay.xul.php      |   0
 content/student/studentrolledialog.js.php           |   0
 content/student/studentrolledialog.xul.php          |   0
 content/student/studentzeugnisoverlay.xul.php       |   0
 content/studenten.js                                |   0
 content/tempus.js.php                               |   0
 content/tempus.xul.php                              |   0
 content/tempusDBDML.php                             |   0
 content/tempusoverlay.js.php                        |   0
 content/tempusoverlay.xul.php                       |   0
 content/termine.js.php                              |   0
 content/termine.xul.php                             |   0
 content/udf.js.php                                  |   0
 content/udf.xul.php                                 |   0
 content/zutrittskarte.php                           |   0
 favicon.ico                                         | Bin
 include/DifferenceEngine/DifferenceEngine.php       |   0
 include/Excel/BIFFwriter.php                        |   0
 include/Excel/File.php                              |   0
 include/Excel/Format.php                            |   0
 include/Excel/OLE.php                               |   0
 include/Excel/PEAR.php                              |   0
 include/Excel/PPS.php                               |   0
 include/Excel/Parser.php                            |   0
 include/Excel/Root.php                              |   0
 include/Excel/Validator.php                         |   0
 include/Excel/Workbook.php                          |   0
 include/Excel/Worksheet.php                         |   0
 include/Excel/Writer.php                            |   0
 include/Excel/excel.php                             |   0
 include/File/CSV.php                                |   0
 include/File/Find.php                               |   0
 include/File/Match.php                              |   0
 include/File/Passwd.php                             |   0
 include/File/SearchReplace.php                      |   0
 include/File/Util.php                               |   0
 include/Parser/Parsedown.php                        |   0
 include/ablauf.class.php                            |   0
 include/abschlusspruefung.class.php                 |   0
 include/abschlusspruefung_antritt.class.php         |   0
 include/addon.class.php                             |   0
 include/adresse.class.php                           |   0
 include/adressentyp.class.php                       |   0
 include/akadgrad.class.php                          |   0
 include/akte.class.php                              |   0
 include/ampel.class.php                             |   0
 include/anrechnung.class.php                        |   0
 include/antwort.class.php                           |   0
 include/anwesenheit.class.php                       |   0
 include/appdaten.class.php                          |   0
 include/aufmerksamdurch.class.php                   |   0
 include/auth_demo.class.php                         |   0
 include/auth_mixed.class.php                        |   0
 include/auth_session.class.php                      |   0
 include/authentication.class.php                    |   0
 include/bankverbindung.class.php                    |   0
 include/basis.class.php                             |   0
 include/basis_db.class.php                          |   0
 include/beispiel.class.php                          |   0
 include/benutzer.class.php                          |   0
 include/benutzerberechtigung.class.php              |   0
 include/benutzerfunktion.class.php                  |   0
 include/benutzergruppe.class.php                    |   0
 include/benutzerlvstudiensemester.class.php         |   0
 include/berechtigung.class.php                      |   0
 include/betriebsmittel.class.php                    |   0
 .../betriebsmittel_betriebsmittelstatus.class.php   |   0
 include/betriebsmittelperson.class.php              |   0
 include/betriebsmittelstatus.class.php              |   0
 include/betriebsmitteltyp.class.php                 |   0
 include/bewerbungstermin.class.php                  |   0
 include/bisarchiv.class.php                         |   0
 include/bisberufstaetigkeit.class.php               |   0
 include/bisfunktion.class.php                       |   0
 include/bisio.class.php                             |   0
 include/bisorgform.class.php                        |   0
 include/bisverwendung.class.php                     |   0
 include/buchung.class.php                           |   0
 include/content.class.php                           |   0
 include/coodle.class.php                            |   0
 include/covid/covidhelper.class.php                 |   0
 include/cronjob.class.php                           |   0
 .../ui-bg_diagonals-thick_18_b81900_40x40.png       | Bin
 .../ui-bg_diagonals-thick_20_666666_40x40.png       | Bin
 include/css/images/ui-bg_flat_10_000000_40x100.png  | Bin
 include/css/images/ui-bg_glass_100_f6f6f6_1x400.png | Bin
 include/css/images/ui-bg_glass_100_fdf5ce_1x400.png | Bin
 include/css/images/ui-bg_glass_65_ffffff_1x400.png  | Bin
 .../images/ui-bg_gloss-wave_35_f6a828_500x100.png   | Bin
 .../ui-bg_highlight-soft_100_eeeeee_1x100.png       | Bin
 .../images/ui-bg_highlight-soft_75_ffe45c_1x100.png | Bin
 include/css/images/ui-icons_222222_256x240.png      | Bin
 include/css/images/ui-icons_228ef1_256x240.png      | Bin
 include/css/images/ui-icons_ef8c08_256x240.png      | Bin
 include/css/images/ui-icons_ffd27a_256x240.png      | Bin
 include/css/images/ui-icons_ffffff_256x240.png      | Bin
 include/datum.class.php                             |   0
 include/dms.class.php                               |   0
 include/dokument.class.php                          |   0
 include/dokument_export.class.php                   |   0
 include/dvb.class.php                               |   0
 include/ean13.function.php                          |   0
 include/entwicklungsteam.class.php                  |   0
 include/erhalter.class.php                          |   0
 include/errorhandler.class.php                      |   0
 include/ezcomponents/Base/CREDITS                   |   0
 include/ezcomponents/Base/ChangeLog                 |   0
 include/ezcomponents/Base/DESCRIPTION               |   0
 include/ezcomponents/Base/design/class_diagram.png  | Bin
 include/ezcomponents/Base/design/design.txt         |   0
 .../ezcomponents/Base/docs/repos/Me/myclass1.php    |   0
 .../ezcomponents/Base/docs/repos/Me/myclass2.php    |   0
 .../ezcomponents/Base/docs/repos/You/yourclass1.php |   0
 .../ezcomponents/Base/docs/repos/You/yourclass2.php |   0
 .../Base/docs/repos/autoloads/my_autoload.php       |   0
 .../Base/docs/repos/autoloads/your_autoload.php     |   0
 include/ezcomponents/Base/docs/tutorial.txt         |   0
 .../ezcomponents/Base/docs/tutorial_autoload.php    |   0
 .../ezcomponents/Base/docs/tutorial_example_01.php  |   0
 .../ezcomponents/Base/docs/tutorial_example_02.php  |   0
 .../ezcomponents/Base/docs/tutorial_example_03.php  |   0
 .../Base/docs/tutorial_lazy_initialization.php      |   0
 include/ezcomponents/Base/review-1.5.txt            |   0
 include/ezcomponents/Base/src/base.php              |   0
 .../ezcomponents/Base/src/exceptions/autoload.php   |   0
 .../exceptions/double_class_repository_prefix.php   |   0
 .../ezcomponents/Base/src/exceptions/exception.php  |   0
 .../Base/src/exceptions/extension_not_found.php     |   0
 .../Base/src/exceptions/file_exception.php          |   0
 .../ezcomponents/Base/src/exceptions/file_io.php    |   0
 .../Base/src/exceptions/file_not_found.php          |   0
 .../Base/src/exceptions/file_permission.php         |   0
 .../src/exceptions/init_callback_configured.php     |   0
 .../Base/src/exceptions/invalid_callback_class.php  |   0
 .../Base/src/exceptions/invalid_parent_class.php    |   0
 .../Base/src/exceptions/property_not_found.php      |   0
 .../Base/src/exceptions/property_permission.php     |   0
 .../Base/src/exceptions/setting_not_found.php       |   0
 .../Base/src/exceptions/setting_value.php           |   0
 include/ezcomponents/Base/src/exceptions/value.php  |   0
 .../ezcomponents/Base/src/exceptions/whatever.php   |   0
 include/ezcomponents/Base/src/ezc_bootstrap.php     |   0
 include/ezcomponents/Base/src/features.php          |   0
 include/ezcomponents/Base/src/file.php              |   0
 include/ezcomponents/Base/src/init.php              |   0
 .../src/interfaces/configuration_initializer.php    |   0
 .../Base/src/interfaces/persistable.php             |   0
 include/ezcomponents/Base/src/options.php           |   0
 include/ezcomponents/Base/src/options/autoload.php  |   0
 include/ezcomponents/Base/src/struct.php            |   0
 .../Base/src/structs/repository_directory.php       |   0
 include/ezcomponents/Base/tests/base_init_test.php  |   0
 .../ezcomponents/Base/tests/base_options_test.php   |   0
 include/ezcomponents/Base/tests/base_test.php       |   0
 .../tests/extra_repository/Translation/test.php     |   0
 .../autoload/translation_autoload.php               |   0
 include/ezcomponents/Base/tests/features_test.php   |   0
 .../tests/file_calculate_relative_path_test.php     |   0
 .../Base/tests/file_copy_recursive_test.php         |   0
 .../Base/tests/file_find_recursive_test.php         |   0
 .../Base/tests/file_is_absolute_path.php            |   0
 .../Base/tests/file_remove_recursive_test.php       |   0
 .../Base/tests/init/base_init_callback.php          |   0
 .../Base/tests/init/base_init_class.php             |   0
 include/ezcomponents/Base/tests/struct_test.php     |   0
 include/ezcomponents/Base/tests/suite.php           |   0
 include/ezcomponents/Base/tests/test_options.php    |   0
 .../test_repository/TestClasses/base_test_class.php |   0
 .../TestClasses/base_test_class_number_two.php      |   0
 .../TestClasses/base_test_long_class.php            |   0
 .../autoload_files/basetest_autoload.php            |   0
 .../autoload_files/basetest_long_autoload.php       |   0
 .../autoload_files/object_autoload.php              |   0
 .../Base/tests/test_repository/object/object.php    |   0
 include/ezcomponents/ChangeLog                      |   0
 include/ezcomponents/Graph/CREDITS                  |   0
 include/ezcomponents/Graph/ChangeLog                |   0
 include/ezcomponents/Graph/DESCRIPTION              |   0
 include/ezcomponents/Graph/design/class_diagram.png | Bin
 include/ezcomponents/Graph/design/design.txt        |   0
 .../design/enhancements/interactive_data_points.txt |   0
 .../Graph/design/enhancements/multiple_axis.txt     |   0
 include/ezcomponents/Graph/design/requirements.txt  |   0
 .../design/requirements/interactive_data_points.txt |   0
 .../Graph/design/requirements/multiple_axis.txt     |   0
 .../ezcomponents/Graph/docs/examples/ez_green.php   |   0
 include/ezcomponents/Graph/docs/examples/ez_red.php |   0
 .../Graph/docs/examples/forum_evolution.php         |   0
 .../Graph/docs/examples/forum_month.php             |   0
 .../Graph/docs/examples/forum_weekly.php            |   0
 .../ezcomponents/Graph/docs/examples/forum_year.php |   0
 .../Graph/docs/examples/php_magazine.php            |   0
 .../ezcomponents/Graph/docs/examples/wikipedia.php  |   0
 .../Graph/docs/img/tutorial_axis_datetime.svg.png   | Bin
 .../Graph/docs/img/tutorial_axis_labeled.svg.png    | Bin
 .../Graph/docs/img/tutorial_axis_numeric.svg.png    | Bin
 .../Graph/docs/img/tutorial_bar_chart.svg.png       | Bin
 .../Graph/docs/img/tutorial_bar_chart_3d.svg.png    | Bin
 .../docs/img/tutorial_bar_chart_options.svg.png     | Bin
 .../Graph/docs/img/tutorial_bar_line_chart.svg.png  | Bin
 .../Graph/docs/img/tutorial_bar_options.svg.png     | Bin
 .../docs/img/tutorial_chart_background.svg.png      | Bin
 .../Graph/docs/img/tutorial_chart_legend.svg.png    | Bin
 .../Graph/docs/img/tutorial_chart_title.svg.png     | Bin
 .../docs/img/tutorial_complex_radar_chart.svg.png   | Bin
 .../docs/img/tutorial_custom_odometer_chart.svg.png | Bin
 .../Graph/docs/img/tutorial_custom_palette.svg.png  | Bin
 .../Graph/docs/img/tutorial_dataset_average.svg.png | Bin
 .../Graph/docs/img/tutorial_dataset_numeric.svg.png | Bin
 .../Graph/docs/img/tutorial_driver_flash.swf        | Bin
 .../Graph/docs/img/tutorial_driver_gd.jpg           | Bin
 .../Graph/docs/img/tutorial_driver_svg.svg.png      | Bin
 .../Graph/docs/img/tutorial_legend_options.svg.png  | Bin
 .../Graph/docs/img/tutorial_line_chart.svg.png      | Bin
 .../Graph/docs/img/tutorial_line_chart_3d.svg.png   | Bin
 .../img/tutorial_line_chart_additional_axis.svg.png | Bin
 .../docs/img/tutorial_line_chart_markers.svg.png    | Bin
 .../docs/img/tutorial_modified_palette.svg.png      | Bin
 .../Graph/docs/img/tutorial_odometer_chart.svg.png  | Bin
 .../Graph/docs/img/tutorial_pie_chart_3d.svg.png    | Bin
 .../docs/img/tutorial_pie_chart_options.svg.png     | Bin
 .../docs/img/tutorial_pie_chart_pimped.svg.png      | Bin
 .../Graph/docs/img/tutorial_pie_options.svg.png     | Bin
 .../Graph/docs/img/tutorial_radar_chart.svg.png     | Bin
 .../Graph/docs/img/tutorial_reference_gd.html       |   0
 .../Graph/docs/img/tutorial_reference_gd.png        | Bin
 .../Graph/docs/img/tutorial_reference_svg.svg       |   0
 .../Graph/docs/img/tutorial_renderer_3d.svg.png     | Bin
 .../Graph/docs/img/tutorial_rotated_labels.svg.png  | Bin
 .../Graph/docs/img/tutorial_simple_pie.svg.png      | Bin
 .../docs/img/tutorial_stacked_bar_chart.svg.png     | Bin
 .../Graph/docs/img/tutorial_user_palette.svg.png    | Bin
 include/ezcomponents/Graph/docs/tutorial.txt        |   0
 include/ezcomponents/Graph/docs/tutorial/ez.png     | Bin
 .../ezcomponents/Graph/docs/tutorial/template.svg   |   0
 .../Graph/docs/tutorial/tutorial_autoload.php       |   0
 .../Graph/docs/tutorial/tutorial_axis_datetime.php  |   0
 .../Graph/docs/tutorial/tutorial_axis_labeled.php   |   0
 .../Graph/docs/tutorial/tutorial_axis_numeric.php   |   0
 .../Graph/docs/tutorial/tutorial_bar_chart.php      |   0
 .../Graph/docs/tutorial/tutorial_bar_chart_3d.php   |   0
 .../docs/tutorial/tutorial_bar_chart_options.php    |   0
 .../Graph/docs/tutorial/tutorial_bar_line_chart.php |   0
 .../Graph/docs/tutorial/tutorial_bar_options.php    |   0
 .../docs/tutorial/tutorial_chart_background.php     |   0
 .../Graph/docs/tutorial/tutorial_chart_legend.php   |   0
 .../Graph/docs/tutorial/tutorial_chart_title.php    |   0
 .../docs/tutorial/tutorial_complex_radar_chart.php  |   0
 .../tutorial/tutorial_custom_odometer_chart.php     |   0
 .../Graph/docs/tutorial/tutorial_custom_palette.php |   0
 .../tutorial/tutorial_custom_palette_palette.php    |   0
 .../docs/tutorial/tutorial_dataset_average.php      |   0
 .../docs/tutorial/tutorial_dataset_numeric.php      |   0
 .../Graph/docs/tutorial/tutorial_driver_cairo.php   |   0
 .../Graph/docs/tutorial/tutorial_driver_flash.php   |   0
 .../Graph/docs/tutorial/tutorial_driver_gd.php      |   0
 .../Graph/docs/tutorial/tutorial_driver_svg.php     |   0
 .../Graph/docs/tutorial/tutorial_font.fdb           | Bin
 .../Graph/docs/tutorial/tutorial_font.pfb           | Bin
 .../Graph/docs/tutorial/tutorial_font.ttf           | Bin
 .../Graph/docs/tutorial/tutorial_legend_options.php |   0
 .../Graph/docs/tutorial/tutorial_line_chart.php     |   0
 .../Graph/docs/tutorial/tutorial_line_chart_3d.php  |   0
 .../tutorial_line_chart_additional_axis.php         |   0
 .../docs/tutorial/tutorial_line_chart_markers.php   |   0
 .../docs/tutorial/tutorial_modified_palette.php     |   0
 .../Graph/docs/tutorial/tutorial_odometer_chart.php |   0
 .../Graph/docs/tutorial/tutorial_output.php         |   0
 .../Graph/docs/tutorial/tutorial_pie_chart_3d.php   |   0
 .../docs/tutorial/tutorial_pie_chart_options.php    |   0
 .../docs/tutorial/tutorial_pie_chart_pimped.php     |   0
 .../Graph/docs/tutorial/tutorial_pie_options.php    |   0
 .../Graph/docs/tutorial/tutorial_radar_chart.php    |   0
 .../Graph/docs/tutorial/tutorial_reference_gd.php   |   0
 .../Graph/docs/tutorial/tutorial_reference_svg.php  |   0
 .../Graph/docs/tutorial/tutorial_renderer_3d.php    |   0
 .../Graph/docs/tutorial/tutorial_rotated_labels.php |   0
 .../Graph/docs/tutorial/tutorial_simple_pie.php     |   0
 .../docs/tutorial/tutorial_stacked_bar_chart.php    |   0
 .../Graph/docs/tutorial/tutorial_user_palette.php   |   0
 .../Graph/docs/tutorial/tutorial_wikipedia_data.php |   0
 include/ezcomponents/Graph/src/axis/container.php   |   0
 include/ezcomponents/Graph/src/axis/date.php        |   0
 include/ezcomponents/Graph/src/axis/labeled.php     |   0
 include/ezcomponents/Graph/src/axis/logarithmic.php |   0
 include/ezcomponents/Graph/src/axis/numeric.php     |   0
 include/ezcomponents/Graph/src/charts/bar.php       |   0
 include/ezcomponents/Graph/src/charts/line.php      |   0
 include/ezcomponents/Graph/src/charts/odometer.php  |   0
 include/ezcomponents/Graph/src/charts/pie.php       |   0
 include/ezcomponents/Graph/src/charts/radar.php     |   0
 include/ezcomponents/Graph/src/colors/color.php     |   0
 .../Graph/src/colors/linear_gradient.php            |   0
 .../Graph/src/colors/radial_gradient.php            |   0
 .../ezcomponents/Graph/src/data_container/base.php  |   0
 .../Graph/src/data_container/single.php             |   0
 include/ezcomponents/Graph/src/datasets/array.php   |   0
 include/ezcomponents/Graph/src/datasets/average.php |   0
 include/ezcomponents/Graph/src/datasets/base.php    |   0
 include/ezcomponents/Graph/src/datasets/numeric.php |   0
 .../Graph/src/datasets/property/axis.php            |   0
 .../Graph/src/datasets/property/boolean.php         |   0
 .../Graph/src/datasets/property/color.php           |   0
 .../Graph/src/datasets/property/integer.php         |   0
 .../Graph/src/datasets/property/string.php          |   0
 include/ezcomponents/Graph/src/driver/cairo.php     |   0
 include/ezcomponents/Graph/src/driver/flash.php     |   0
 include/ezcomponents/Graph/src/driver/gd.php        |   0
 include/ezcomponents/Graph/src/driver/svg.php       |   0
 include/ezcomponents/Graph/src/driver/svg_font.php  |   0
 include/ezcomponents/Graph/src/driver/verbose.php   |   0
 include/ezcomponents/Graph/src/element/axis.php     |   0
 .../ezcomponents/Graph/src/element/background.php   |   0
 include/ezcomponents/Graph/src/element/legend.php   |   0
 include/ezcomponents/Graph/src/element/text.php     |   0
 .../Graph/src/exceptions/date_parsing.php           |   0
 .../ezcomponents/Graph/src/exceptions/exception.php |   0
 .../Graph/src/exceptions/flash_bitmap_type.php      |   0
 .../Graph/src/exceptions/font_rendering.php         |   0
 .../ezcomponents/Graph/src/exceptions/font_type.php |   0
 .../Graph/src/exceptions/incompatible_driver.php    |   0
 .../Graph/src/exceptions/invalid_assignement.php    |   0
 .../Graph/src/exceptions/invalid_data.php           |   0
 .../Graph/src/exceptions/invalid_data_source.php    |   0
 .../Graph/src/exceptions/invalid_dimensions.php     |   0
 .../Graph/src/exceptions/invalid_display_type.php   |   0
 .../Graph/src/exceptions/invalid_id.php             |   0
 .../Graph/src/exceptions/invalid_image_file.php     |   0
 .../Graph/src/exceptions/invalid_keys.php           |   0
 .../ezcomponents/Graph/src/exceptions/no_data.php   |   0
 .../Graph/src/exceptions/no_such_data.php           |   0
 .../Graph/src/exceptions/no_such_dataset.php        |   0
 .../Graph/src/exceptions/no_such_element.php        |   0
 .../Graph/src/exceptions/not_rendered.php           |   0
 .../Graph/src/exceptions/out_of_boundings.php       |   0
 .../exceptions/out_of_logarithmical_boundings.php   |   0
 .../Graph/src/exceptions/reducement_failed.php      |   0
 .../Graph/src/exceptions/too_many_datasets.php      |   0
 .../src/exceptions/unknown_color_definition.php     |   0
 .../Graph/src/exceptions/unregular_steps.php        |   0
 .../Graph/src/exceptions/unsupported_image_type.php |   0
 include/ezcomponents/Graph/src/graph.php            |   0
 .../Graph/src/interfaces/axis_label_renderer.php    |   0
 include/ezcomponents/Graph/src/interfaces/chart.php |   0
 .../Graph/src/interfaces/dataset_property.php       |   0
 .../ezcomponents/Graph/src/interfaces/driver.php    |   0
 .../ezcomponents/Graph/src/interfaces/element.php   |   0
 .../Graph/src/interfaces/odometer_renderer.php      |   0
 .../ezcomponents/Graph/src/interfaces/palette.php   |   0
 .../Graph/src/interfaces/radar_renderer.php         |   0
 .../ezcomponents/Graph/src/interfaces/renderer.php  |   0
 .../Graph/src/interfaces/stacked_bar_renderer.php   |   0
 include/ezcomponents/Graph/src/math/boundings.php   |   0
 include/ezcomponents/Graph/src/math/matrix.php      |   0
 include/ezcomponents/Graph/src/math/polynom.php     |   0
 include/ezcomponents/Graph/src/math/rotation.php    |   0
 .../ezcomponents/Graph/src/math/transformation.php  |   0
 include/ezcomponents/Graph/src/math/translation.php |   0
 include/ezcomponents/Graph/src/math/vector.php      |   0
 .../ezcomponents/Graph/src/options/cairo_driver.php |   0
 include/ezcomponents/Graph/src/options/chart.php    |   0
 include/ezcomponents/Graph/src/options/driver.php   |   0
 .../ezcomponents/Graph/src/options/flash_driver.php |   0
 include/ezcomponents/Graph/src/options/font.php     |   0
 .../ezcomponents/Graph/src/options/gd_driver.php    |   0
 .../ezcomponents/Graph/src/options/line_chart.php   |   0
 .../Graph/src/options/odometer_chart.php            |   0
 .../ezcomponents/Graph/src/options/pie_chart.php    |   0
 .../ezcomponents/Graph/src/options/radar_chart.php  |   0
 include/ezcomponents/Graph/src/options/renderer.php |   0
 .../ezcomponents/Graph/src/options/renderer_2d.php  |   0
 .../ezcomponents/Graph/src/options/renderer_3d.php  |   0
 .../ezcomponents/Graph/src/options/svg_driver.php   |   0
 include/ezcomponents/Graph/src/palette/black.php    |   0
 include/ezcomponents/Graph/src/palette/ez.php       |   0
 include/ezcomponents/Graph/src/palette/ez_blue.php  |   0
 include/ezcomponents/Graph/src/palette/ez_green.php |   0
 include/ezcomponents/Graph/src/palette/ez_red.php   |   0
 include/ezcomponents/Graph/src/palette/tango.php    |   0
 include/ezcomponents/Graph/src/renderer/2d.php      |   0
 include/ezcomponents/Graph/src/renderer/3d.php      |   0
 .../Graph/src/renderer/axis_label_boxed.php         |   0
 .../Graph/src/renderer/axis_label_centered.php      |   0
 .../Graph/src/renderer/axis_label_exact.php         |   0
 .../Graph/src/renderer/axis_label_none.php          |   0
 .../Graph/src/renderer/axis_label_radar.php         |   0
 .../Graph/src/renderer/axis_label_rotated.php       |   0
 include/ezcomponents/Graph/src/structs/context.php  |   0
 .../ezcomponents/Graph/src/structs/coordinate.php   |   0
 include/ezcomponents/Graph/src/structs/step.php     |   0
 include/ezcomponents/Graph/src/tools.php            |   0
 include/ezcomponents/GraphDatabaseTiein/CREDITS     |   0
 include/ezcomponents/GraphDatabaseTiein/ChangeLog   |   0
 include/ezcomponents/GraphDatabaseTiein/DEPS        |   0
 include/ezcomponents/GraphDatabaseTiein/DESCRIPTION |   0
 include/ezcomponents/GraphDatabaseTiein/TODO        |   0
 .../GraphDatabaseTiein/design/class_diagram.png     | Bin
 .../GraphDatabaseTiein/design/design.txt            |   0
 .../docs/img/tutorial_multiple.svg.png              | Bin
 .../docs/img/tutorial_simple.svg.png                | Bin
 .../docs/img/tutorial_single.svg.png                | Bin
 .../GraphDatabaseTiein/docs/tutorial.txt            |   0
 .../docs/tutorial/tutorial_autoload.php             |   0
 .../docs/tutorial/tutorial_insert_data.php          |   0
 .../docs/tutorial/tutorial_multiple.php             |   0
 .../docs/tutorial/tutorial_simple.php               |   0
 .../docs/tutorial/tutorial_single.php               |   0
 .../ezcomponents/GraphDatabaseTiein/src/dataset.php |   0
 .../GraphDatabaseTiein/src/exceptions/exception.php |   0
 .../src/exceptions/missing_column.php               |   0
 .../src/exceptions/statement_not_executed.php       |   0
 .../src/exceptions/too_many_columns.php             |   0
 .../GraphDatabaseTiein/tests/dataset_pdo_test.php   |   0
 .../ezcomponents/GraphDatabaseTiein/tests/suite.php |   0
 include/ezcomponents/ImageAnalysis/CREDITS          |   0
 include/ezcomponents/ImageAnalysis/ChangeLog        |   0
 include/ezcomponents/ImageAnalysis/DESCRIPTION      |   0
 .../ImageAnalysis/design/class_diagram.png          | Bin
 .../ImageAnalysis/design/imageanalysis.png          | Bin
 .../ImageAnalysis/design/imageanalysis.xml          |   0
 include/ezcomponents/ImageAnalysis/docs/example.php |   0
 .../docs/img/imageanalysis_example_01.jpg           | Bin
 .../docs/img/imageanalysis_example_02.jpg           | Bin
 .../docs/img/imageanalysis_example_03.jpg           | Bin
 include/ezcomponents/ImageAnalysis/docs/toby.jpg    | Bin
 .../ezcomponents/ImageAnalysis/docs/tutorial.txt    |   0
 .../ImageAnalysis/docs/tutorial_autoload.php        |   0
 .../ImageAnalysis/docs/tutorial_example_01.php      |   0
 .../ImageAnalysis/docs/tutorial_example_02.php      |   0
 .../ImageAnalysis/docs/tutorial_example_03.php      |   0
 include/ezcomponents/ImageAnalysis/src/analyzer.php |   0
 .../ImageAnalysis/src/exceptions/exception.php      |   0
 .../src/exceptions/file_not_processable.php         |   0
 .../src/exceptions/invalid_handler.php              |   0
 .../ImageAnalysis/src/handlers/imagemagick.php      |   0
 .../ezcomponents/ImageAnalysis/src/handlers/php.php |   0
 .../ImageAnalysis/src/interfaces/handler.php        |   0
 .../ImageAnalysis/src/structs/analyzer_data.php     |   0
 .../ImageAnalysis/tests/analyzer_test.php           |   0
 .../ImageAnalysis/tests/data/gif_animated.gif       | Bin
 .../ImageAnalysis/tests/data/gif_nonanimated.gif    | Bin
 .../ImageAnalysis/tests/data/jpeg_exif.jpg          | Bin
 .../ImageAnalysis/tests/data/jpeg_noexif.jpg        | Bin
 .../ImageAnalysis/tests/data/png_nonanimated.png    | Bin
 .../ezcomponents/ImageAnalysis/tests/data/svg.svg   |   0
 .../ImageAnalysis/tests/data/tiff_exif.tiff         | Bin
 .../ImageAnalysis/tests/data/tiff_noexif.tiff       | Bin
 include/ezcomponents/ImageAnalysis/tests/suite.php  |   0
 include/ezcomponents/ImageConversion/CREDITS        |   0
 include/ezcomponents/ImageConversion/ChangeLog      |   0
 include/ezcomponents/ImageConversion/DEPS           |   0
 include/ezcomponents/ImageConversion/DESCRIPTION    |   0
 include/ezcomponents/ImageConversion/TODO           |   0
 .../ImageConversion/design/class_diagram.png        | Bin
 .../ezcomponents/ImageConversion/design/design.htm  |   0
 .../ezcomponents/ImageConversion/design/design.txt  |   0
 .../ezcomponents/ImageConversion/design/image.png   | Bin
 .../ezcomponents/ImageConversion/design/image.xml   |   0
 .../ImageConversion/design/image_exceptions.png     | Bin
 .../ImageConversion/design/image_filters.png        | Bin
 .../ImageConversion/docs/example_general.php        |   0
 .../ImageConversion/docs/example_singleton.php      |   0
 .../docs/img/imageconversion_example_01_after.jpg   | Bin
 .../docs/img/imageconversion_example_01_before.bmp  | Bin
 .../docs/img/imageconversion_example_02_after.jpg   | Bin
 .../docs/img/imageconversion_example_02_before.jpg  | Bin
 .../docs/img/imageconversion_example_03_after.jpg   | Bin
 .../docs/img/imageconversion_example_03_before.jpg  | Bin
 .../docs/img/imageconversion_example_04_after.jpg   | Bin
 .../docs/img/imageconversion_example_04_before.jpg  | Bin
 .../docs/img/imageconversion_example_05_after.jpg   | Bin
 .../docs/img/imageconversion_example_05_before.jpg  | Bin
 .../ImageConversion/docs/img/watermark.png          | Bin
 include/ezcomponents/ImageConversion/docs/jpeg.jpg  | Bin
 .../ezcomponents/ImageConversion/docs/tutorial.txt  |   0
 .../ImageConversion/docs/tutorial_autoload.php      |   0
 .../docs/tutorial_example_01_simpleconvert.php      |   0
 .../docs/tutorial_example_02_simpletrans.php        |   0
 .../docs/tutorial_example_03_complextrans.php       |   0
 .../docs/tutorial_example_04_watermark.php          |   0
 .../docs/tutorial_example_05_thumbnail.php          |   0
 .../ezcomponents/ImageConversion/review-1.3.4.txt   |   0
 .../ezcomponents/ImageConversion/src/converter.php  |   0
 .../ImageConversion/src/exceptions/exception.php    |   0
 .../src/exceptions/file_name_invalid.php            |   0
 .../src/exceptions/file_not_processable.php         |   0
 .../src/exceptions/filter_failed.php                |   0
 .../src/exceptions/filter_not_available.php         |   0
 .../src/exceptions/handler_not_available.php        |   0
 .../src/exceptions/handler_settings_invalid.php     |   0
 .../src/exceptions/invalid_filter_parameter.php     |   0
 .../src/exceptions/invalid_reference.php            |   0
 .../src/exceptions/mime_type_unsupported.php        |   0
 .../src/exceptions/missing_filter_parameter.php     |   0
 .../src/exceptions/transformation.php               |   0
 .../exceptions/transformation_already_exists.php    |   0
 .../src/exceptions/transformation_not_available.php |   0
 .../ImageConversion/src/handlers/gd.php             |   0
 .../ImageConversion/src/handlers/gd_base.php        |   0
 .../ImageConversion/src/handlers/imagemagick.php    |   0
 .../src/handlers/imagemagick_base.php               |   0
 .../ImageConversion/src/interfaces/colorspace.php   |   0
 .../ImageConversion/src/interfaces/effect.php       |   0
 .../ImageConversion/src/interfaces/geometry.php     |   0
 .../ImageConversion/src/interfaces/handler.php      |   0
 .../src/interfaces/methodcall_handler.php           |   0
 .../ImageConversion/src/interfaces/thumbnail.php    |   0
 .../ImageConversion/src/interfaces/watermark.php    |   0
 .../ImageConversion/src/options/save_options.php    |   0
 .../src/structs/converter_settings.php              |   0
 .../ImageConversion/src/structs/filter.php          |   0
 .../src/structs/handler_settings.php                |   0
 .../ImageConversion/src/transformation.php          |   0
 .../ImageConversion/tests/converter_test.php        |   0
 ...onConverterTest_testApplyFilterSuccessColorspace | Bin
 ...t_testApplyFilterSuccessColorspaceDefinedHandler | Bin
 ...versionConverterTest_testApplyFilterSuccessScale | Bin
 ...cImageConversionFiltersGdTest_testColorspaceGrey | Bin
 ...ConversionFiltersGdTest_testColorspaceMonochrome | Bin
 ...ImageConversionFiltersGdTest_testColorspaceSepia | Bin
 ...ConversionFiltersGdTest_testCropNegativeOffset_1 | Bin
 ...ConversionFiltersGdTest_testCropNegativeOffset_2 | Bin
 ...ConversionFiltersGdTest_testCropNegativeOffset_3 | Bin
 ...versionFiltersGdTest_testCropThumbnailHorizontal | Bin
 ...onversionFiltersGdTest_testCropThumbnailVertical | Bin
 ...ImageConversionFiltersGdTest_testCropTransparent | Bin
 ...zcImageConversionFiltersGdTest_testCrop_0_Offset | Bin
 .../ezcImageConversionFiltersGdTest_testCrop_1      | Bin
 .../ezcImageConversionFiltersGdTest_testCrop_2      | Bin
 .../ezcImageConversionFiltersGdTest_testCrop_3      | Bin
 .../ezcImageConversionFiltersGdTest_testCrop_4      | Bin
 ...versionFiltersGdTest_testFillThumbnailHorizontal | Bin
 ...iltersGdTest_testFillThumbnailTooLargeColorArray | Bin
 ...onversionFiltersGdTest_testFillThumbnailVertical | Bin
 ...mageConversionFiltersGdTest_testScaleTransparent | Bin
 ...ersionFiltersGdTest_testWatermarkAbsoluteNoScale | Bin
 ...nversionFiltersGdTest_testWatermarkAbsoluteScale | Bin
 ...versionFiltersGdTest_testWatermarkPercentNoScale | Bin
 ...onversionFiltersGdTest_testWatermarkPercentScale | Bin
 .../ezcImageConversionFiltersShellTest_testBorder_2 | Bin
 .../ezcImageConversionFiltersShellTest_testBorder_5 | Bin
 ...ageConversionFiltersShellTest_testColorspaceGrey | Bin
 ...versionFiltersShellTest_testColorspaceMonochrome | Bin
 ...geConversionFiltersShellTest_testColorspaceSepia | Bin
 ...versionFiltersShellTest_testCropNegativeOffset_1 | Bin
 ...versionFiltersShellTest_testCropNegativeOffset_2 | Bin
 ...versionFiltersShellTest_testCropNegativeOffset_3 | Bin
 ...sionFiltersShellTest_testCropThumbnailHorizontal | Bin
 ...ersionFiltersShellTest_testCropThumbnailVertical | Bin
 ...mageConversionFiltersShellTest_testCrop_0_Offset | Bin
 .../ezcImageConversionFiltersShellTest_testCrop_1   | Bin
 .../ezcImageConversionFiltersShellTest_testCrop_2   | Bin
 .../ezcImageConversionFiltersShellTest_testCrop_3   | Bin
 ...sionFiltersShellTest_testFillThumbnailHorizontal | Bin
 ...ersShellTest_testFillThumbnailTooLargeColorArray | Bin
 ...ersionFiltersShellTest_testFillThumbnailVertical | Bin
 ...mageConversionFiltersShellTest_testNoiseGaussian | Bin
 ...ImageConversionFiltersShellTest_testNoiseImpulse | Bin
 ...ageConversionFiltersShellTest_testNoiseLaplacian | Bin
 ...nversionFiltersShellTest_testNoiseMultiplicative | Bin
 ...ImageConversionFiltersShellTest_testNoisePoisson | Bin
 ...ImageConversionFiltersShellTest_testNoiseUniform | Bin
 .../ezcImageConversionFiltersShellTest_testScale    | Bin
 ...ImageConversionFiltersShellTest_testScaleDown_do | Bin
 ...ageConversionFiltersShellTest_testScaleDown_dont | Bin
 ...ImageConversionFiltersShellTest_testScaleExact_1 | Bin
 ...ImageConversionFiltersShellTest_testScaleExact_2 | Bin
 ...ImageConversionFiltersShellTest_testScaleExact_3 | Bin
 ...ConversionFiltersShellTest_testScaleHeightDown_1 | Bin
 ...ConversionFiltersShellTest_testScaleHeightDown_2 | Bin
 ...geConversionFiltersShellTest_testScaleHeightUp_1 | Bin
 ...geConversionFiltersShellTest_testScaleHeightUp_2 | Bin
 ...ageConversionFiltersShellTest_testScalePercent_1 | Bin
 ...ageConversionFiltersShellTest_testScalePercent_2 | Bin
 ...zcImageConversionFiltersShellTest_testScaleUp_do | Bin
 ...ImageConversionFiltersShellTest_testScaleUp_dont | Bin
 ...ageConversionFiltersShellTest_testScaleWidthBoth | Bin
 ...eConversionFiltersShellTest_testScaleWidthDown_1 | Bin
 ...eConversionFiltersShellTest_testScaleWidthDown_2 | Bin
 ...ageConversionFiltersShellTest_testScaleWidthUp_1 | Bin
 ...ageConversionFiltersShellTest_testScaleWidthUp_2 | Bin
 .../ezcImageConversionFiltersShellTest_testSwirl_10 | Bin
 ...ezcImageConversionFiltersShellTest_testSwirl_100 | Bin
 .../ezcImageConversionFiltersShellTest_testSwirl_50 | Bin
 ...ionFiltersShellTest_testWatermarkAbsoluteNoScale | Bin
 ...rsionFiltersShellTest_testWatermarkAbsoluteScale | Bin
 ...sionFiltersShellTest_testWatermarkPercentNoScale | Bin
 ...ersionFiltersShellTest_testWatermarkPercentScale | Bin
 ...eConversionHandlerGdTest_testApplyFilterMultiple | Bin
 ...ageConversionHandlerGdTest_testApplyFilterSingle | Bin
 ...ndlerGdTest_testConvertTransparentNonTransparent | Bin
 ...geConversionHandlerGdTest_testSaveNewfileConvert | Bin
 ...ConversionHandlerGdTest_testSaveNewfileNoconvert | Bin
 ...ConversionHandlerGdTest_testSaveOldfileNoconvert | Bin
 ...nversionHandlerShellTest_testApplyFilterMultiple | Bin
 ...ConversionHandlerShellTest_testApplyFilterSingle | Bin
 ...erShellTest_testConvertTransparentNonTransparent | Bin
 ...ersionHandlerTest_testSaveIllegalFileNameFailure | Bin
 ...mageConversionHandlerTest_testSaveNewfileConvert | Bin
 ...geConversionHandlerTest_testSaveNewfileNoconvert | Bin
 ...geConversionHandlerTest_testSaveOldfileNoconvert | Bin
 ...versionTransformationTest_testMultiTransformjpeg | Bin
 ...nversionTransformationTest_testMultiTransformpng | Bin
 ...ansformationTest_testTransformSuccessGifAnimated | Bin
 ...sionTransformationTest_testTransformSuccessGif_1 | Bin
 ...sionTransformationTest_testTransformSuccessGif_2 | Bin
 ...sionTransformationTest_testTransformSuccessGif_3 | Bin
 ...ionTransformationTest_testTransformSuccessJpeg_1 | Bin
 ...ionTransformationTest_testTransformSuccessJpeg_2 | Bin
 ...ionTransformationTest_testTransformSuccessJpeg_3 | Bin
 ...sionTransformationTest_testTransformSuccessPng_1 | Bin
 ...sionTransformationTest_testTransformSuccessPng_2 | Bin
 ...sionTransformationTest_testTransformSuccessPng_3 | Bin
 ...sionTransformationTest_testTransformSuccessPng_4 | Bin
 ...est_testTransformationChangingHandlersForFilters | Bin
 .../ImageConversion/tests/data/gif_animated.gif     | Bin
 .../ImageConversion/tests/data/gif_nonanimated.gif  | Bin
 .../ImageConversion/tests/data/jpeg.jpg             | Bin
 .../ezcomponents/ImageConversion/tests/data/png.png | Bin
 .../ImageConversion/tests/data/png_transparent.png  | Bin
 .../ImageConversion/tests/data/text.txt             |   0
 .../ImageConversion/tests/data/watermark.png        | Bin
 .../ezcomponents/ImageConversion/tests/data/xpm.xpm |   0
 .../ImageConversion/tests/filtersgd_test.php        |   0
 .../ImageConversion/tests/filtersshell_test.php     |   0
 .../ImageConversion/tests/handler_test.php          |   0
 .../ImageConversion/tests/handlergd_test.php        |   0
 .../ImageConversion/tests/handlershell_test.php     |   0
 .../ImageConversion/tests/save_options_test.php     |   0
 .../ezcomponents/ImageConversion/tests/suite.php    |   0
 .../ImageConversion/tests/test_case.php             |   0
 .../ImageConversion/tests/transformation_test.php   |   0
 include/ezcomponents/LICENSE                        |   0
 include/ezcomponents/autoload/archive_autoload.php  |   0
 .../autoload/authentication_autoload.php            |   0
 .../autoload/authentication_database_autoload.php   |   0
 .../autoload/authentication_openid_autoload.php     |   0
 include/ezcomponents/autoload/base_autoload.php     |   0
 include/ezcomponents/autoload/cache_autoload.php    |   0
 .../autoload/configuration_autoload.php             |   0
 include/ezcomponents/autoload/console_autoload.php  |   0
 include/ezcomponents/autoload/db_autoload.php       |   0
 .../ezcomponents/autoload/db_schema_autoload.php    |   0
 include/ezcomponents/autoload/debug_autoload.php    |   0
 include/ezcomponents/autoload/document_autoload.php |   0
 .../ezcomponents/autoload/execution_autoload.php    |   0
 include/ezcomponents/autoload/feed_autoload.php     |   0
 include/ezcomponents/autoload/file_autoload.php     |   0
 include/ezcomponents/autoload/graph_autoload.php    |   0
 .../autoload/graph_database_autoload.php            |   0
 .../autoload/image_analyzer_autoload.php            |   0
 include/ezcomponents/autoload/image_autoload.php    |   0
 include/ezcomponents/autoload/input_autoload.php    |   0
 include/ezcomponents/autoload/log_autoload.php      |   0
 .../ezcomponents/autoload/log_database_autoload.php |   0
 include/ezcomponents/autoload/mail_autoload.php     |   0
 .../ezcomponents/autoload/persistent_autoload.php   |   0
 .../autoload/persistent_object_autoload.php         |   0
 .../autoload/php_generator_autoload.php             |   0
 include/ezcomponents/autoload/query_autoload.php    |   0
 include/ezcomponents/autoload/search_autoload.php   |   0
 include/ezcomponents/autoload/signal_autoload.php   |   0
 include/ezcomponents/autoload/system_autoload.php   |   0
 include/ezcomponents/autoload/template_autoload.php |   0
 .../autoload/template_translation_autoload.php      |   0
 .../ezcomponents/autoload/translation_autoload.php  |   0
 .../autoload/translation_cache_autoload.php         |   0
 include/ezcomponents/autoload/tree_autoload.php     |   0
 include/ezcomponents/autoload/tree_db_autoload.php  |   0
 .../autoload/tree_persistent_autoload.php           |   0
 include/ezcomponents/autoload/url_autoload.php      |   0
 include/ezcomponents/autoload/webdav_autoload.php   |   0
 include/ezcomponents/autoload/workflow_autoload.php |   0
 .../autoload/workflow_database_autoload.php         |   0
 .../autoload/workflow_event_autoload.php            |   0
 .../autoload/workflow_signal_autoload.php           |   0
 include/ezcomponents/descriptions.txt               |   0
 include/fachbereich.class.php                       |   0
 include/feedback.class.php                          |   0
 include/ferien.class.php                            |   0
 include/filter.class.php                            |   0
 include/firma.class.php                             |   0
 include/fonts/glyphicons-halflings-regular.eot      | Bin
 include/fonts/glyphicons-halflings-regular.svg      |   0
 include/fonts/glyphicons-halflings-regular.ttf      | Bin
 include/fonts/glyphicons-halflings-regular.woff     | Bin
 include/fotostatus.class.php                        |   0
 include/frage.class.php                             |   0
 include/freebusy.class.php                          |   0
 include/functions.inc.php                           |   0
 include/funktion.class.php                          |   0
 include/gantt.class.php                             |   0
 include/gebiet.class.php                            |   0
 include/gemeinde.class.php                          |   0
 include/geschaeftsjahr.class.php                    |   0
 include/geschlecht.class.php                        |   0
 include/globals.inc.php                             |   0
 include/gruppe.class.php                            |   0
 include/gruppemanager.class.php                     |   0
 include/gsprogramm.class.php                        |   0
 include/ical.class.php                              |   0
 include/index.html                                  |   0
 include/infoscreen.class.php                        |   0
 include/jahresplan.class.php                        |   0
 include/js/JSONeditor/JSONeditor.html               |   0
 include/js/JSONeditor/JSONeditor.js                 |   0
 include/js/JSONeditor/treeBuilderImages/Thumbs.db   | Bin
 include/js/JSONeditor/treeBuilderImages/doc.gif     | Bin
 include/js/JSONeditor/treeBuilderImages/docNode.gif | Bin
 .../js/JSONeditor/treeBuilderImages/docNodeLast.gif | Bin
 .../treeBuilderImages/docNodeLastFirst.gif          | Bin
 include/js/JSONeditor/treeBuilderImages/folder.gif  | Bin
 .../js/JSONeditor/treeBuilderImages/folderNode.gif  | Bin
 .../treeBuilderImages/folderNodeFirst.gif           | Bin
 .../JSONeditor/treeBuilderImages/folderNodeLast.gif | Bin
 .../treeBuilderImages/folderNodeLastFirst.gif       | Bin
 .../JSONeditor/treeBuilderImages/folderNodeOpen.gif | Bin
 .../treeBuilderImages/folderNodeOpenFirst.gif       | Bin
 .../treeBuilderImages/folderNodeOpenLast.gif        | Bin
 .../treeBuilderImages/folderNodeOpenLastFirst.gif   | Bin
 .../js/JSONeditor/treeBuilderImages/folderOpen.gif  | Bin
 .../js/JSONeditor/treeBuilderImages/vertLine.gif    | Bin
 include/js/colorpicker.js                           |   0
 include/js/cropper.js                               |   0
 include/js/croppie.js                               |   0
 include/js/datecheck.js                             |   0
 include/js/fullcalendar/fullcalendar.css            |   0
 include/js/fullcalendar/fullcalendar.js             |   0
 include/js/fullcalendar/fullcalendar.min.js         |   0
 include/js/fullcalendar/fullcalendar.print.css      |   0
 include/js/fullcalendar/gcal.js                     |   0
 include/js/jqSOAPClient.js                          |   0
 include/js/jqXMLUtils.js                            |   0
 include/js/jquery.contextmenu.r2.js                 |   0
 include/js/jquery.js                                |   0
 include/js/jquery.ui.datepicker.translation.js      |   0
 include/js/jstree/README.txt                        |   0
 include/js/jstree/_docs/!style.css                  |   0
 include/js/jstree/_docs/_drive.png                  | Bin
 include/js/jstree/_docs/_html_data.html             |   0
 include/js/jstree/_docs/_json_data.json             |   0
 include/js/jstree/_docs/_search_data.json           |   0
 include/js/jstree/_docs/_search_result.json         |   0
 include/js/jstree/_docs/_xml_flat.xml               |   0
 include/js/jstree/_docs/_xml_nest.xml               |   0
 include/js/jstree/_docs/checkbox.html               |   0
 include/js/jstree/_docs/contextmenu.html            |   0
 include/js/jstree/_docs/cookies.html                |   0
 include/js/jstree/_docs/core.html                   |   0
 include/js/jstree/_docs/crrm.html                   |   0
 include/js/jstree/_docs/dnd.html                    |   0
 include/js/jstree/_docs/hotkeys.html                |   0
 include/js/jstree/_docs/html_data.html              |   0
 include/js/jstree/_docs/index.html                  |   0
 include/js/jstree/_docs/json_data.html              |   0
 include/js/jstree/_docs/languages.html              |   0
 include/js/jstree/_docs/logo.png                    | Bin
 include/js/jstree/_docs/search.html                 |   0
 include/js/jstree/_docs/sort.html                   |   0
 include/js/jstree/_docs/syntax/!script.js           |   0
 include/js/jstree/_docs/syntax/!style.css           |   0
 include/js/jstree/_docs/syntax/clipboard.swf        | Bin
 include/js/jstree/_docs/syntax/help.png             | Bin
 include/js/jstree/_docs/syntax/magnifier.png        | Bin
 include/js/jstree/_docs/syntax/page_white_code.png  | Bin
 include/js/jstree/_docs/syntax/page_white_copy.png  | Bin
 include/js/jstree/_docs/syntax/printer.png          | Bin
 include/js/jstree/_docs/syntax/wrapping.png         | Bin
 include/js/jstree/_docs/themeroller.html            |   0
 include/js/jstree/_docs/themes.html                 |   0
 include/js/jstree/_docs/types.html                  |   0
 include/js/jstree/_docs/ui.html                     |   0
 include/js/jstree/_docs/unique.html                 |   0
 include/js/jstree/_docs/xml_data.html               |   0
 include/js/jstree/_lib/jquery.cookie.js             |   0
 include/js/jstree/_lib/jquery.hotkeys.js            |   0
 include/js/jstree/_lib/jquery.js                    |   0
 include/js/jstree/icons/lehrveranstaltung.png       | Bin
 include/js/jstree/icons/modul.png                   | Bin
 include/js/jstree/jquery.jstree.js                  |   0
 include/js/jstree/themes/apple/bg.jpg               | Bin
 include/js/jstree/themes/apple/d.png                | Bin
 include/js/jstree/themes/apple/dot_for_ie.gif       | Bin
 include/js/jstree/themes/apple/style.css            |   0
 include/js/jstree/themes/apple/throbber.gif         | Bin
 include/js/jstree/themes/classic/d.gif              | Bin
 include/js/jstree/themes/classic/d.png              | Bin
 include/js/jstree/themes/classic/dot_for_ie.gif     | Bin
 include/js/jstree/themes/classic/style.css          |   0
 include/js/jstree/themes/classic/throbber.gif       | Bin
 include/js/jstree/themes/default-rtl/d.gif          | Bin
 include/js/jstree/themes/default-rtl/d.png          | Bin
 include/js/jstree/themes/default-rtl/dots.gif       | Bin
 include/js/jstree/themes/default-rtl/style.css      |   0
 include/js/jstree/themes/default-rtl/throbber.gif   | Bin
 include/js/jstree/themes/default/d.gif              | Bin
 include/js/jstree/themes/default/d.png              | Bin
 include/js/jstree/themes/default/style.css          |   0
 include/js/jstree/themes/default/throbber.gif       | Bin
 include/js/mailcheck.js                             |   0
 include/js/tablesort/icons/01_ascending.gif         | Bin
 include/js/tablesort/icons/01_descending.gif        | Bin
 include/js/tablesort/icons/01_unsorted.gif          | Bin
 include/js/tablesort/table.css                      |   0
 include/js/tablesort/table.js                       |   0
 include/js/treeGrid/.gitignore                      |   0
 include/js/treeGrid/CHANGELOG.txt                   |   0
 include/js/treeGrid/LICENSE                         |   0
 include/js/treeGrid/README.md                       |   0
 include/js/treeGrid/css/jquery.treegrid.css         |   0
 .../bootstrap-2.3.2/css/bootstrap-responsive.css    |   0
 .../css/bootstrap-responsive.min.css                |   0
 .../examples/bootstrap-2.3.2/css/bootstrap.css      |   0
 .../examples/bootstrap-2.3.2/css/bootstrap.min.css  |   0
 .../img/glyphicons-halflings-white.png              | Bin
 .../bootstrap-2.3.2/img/glyphicons-halflings.png    | Bin
 .../examples/bootstrap-2.3.2/js/bootstrap.js        |   0
 .../examples/bootstrap-2.3.2/js/bootstrap.min.js    |   0
 .../bootstrap-3.0.0/css/bootstrap-theme.css         |   0
 .../bootstrap-3.0.0/css/bootstrap-theme.min.css     |   0
 .../examples/bootstrap-3.0.0/css/bootstrap.css      |   0
 .../examples/bootstrap-3.0.0/css/bootstrap.min.css  |   0
 .../fonts/glyphicons-halflings-regular.eot          | Bin
 .../fonts/glyphicons-halflings-regular.svg          |   0
 .../fonts/glyphicons-halflings-regular.ttf          | Bin
 .../fonts/glyphicons-halflings-regular.woff         | Bin
 .../examples/bootstrap-3.0.0/js/bootstrap.js        |   0
 .../examples/bootstrap-3.0.0/js/bootstrap.min.js    |   0
 include/js/treeGrid/examples/example-basic.html     |   0
 .../js/treeGrid/examples/example-bootstrap-2.html   |   0
 .../js/treeGrid/examples/example-bootstrap-3.html   |   0
 include/js/treeGrid/examples/example-column.html    |   0
 .../js/treeGrid/examples/example-save-state.html    |   0
 include/js/treeGrid/img/collapse.png                | Bin
 include/js/treeGrid/img/expand.png                  | Bin
 include/js/treeGrid/img/file.png                    | Bin
 include/js/treeGrid/img/folder.png                  | Bin
 include/js/treeGrid/index.html                      |   0
 include/js/treeGrid/js/jquery-1.10.2.js             |   0
 include/js/treeGrid/js/jquery.cookie.js             |   0
 .../js/treeGrid/js/jquery.treegrid.bootstrap2.js    |   0
 .../js/treeGrid/js/jquery.treegrid.bootstrap3.js    |   0
 include/js/treeGrid/js/jquery.treegrid.js           |   0
 include/js/treeGrid/jstreegrid.js                   |   0
 include/js/treeGrid/params.json                     |   0
 include/js/treeGrid/styles.css                      |   0
 include/js/treeGrid/test.html                       |   0
 include/js/treeGrid/tests/qunit-1.12.0.css          |   0
 include/js/treeGrid/tests/qunit-1.12.0.js           |   0
 include/js/treeGrid/tests/tests.js                  |   0
 include/js/treeGrid/treegrid.jquery.json            |   0
 include/kontakt.class.php                           |   0
 include/konto.class.php                             |   0
 include/legesamtnote.class.php                      |   0
 include/lehre_tools.class.php                       |   0
 include/lehreinheit.class.php                       |   0
 include/lehreinheitgruppe.class.php                 |   0
 include/lehreinheitmitarbeiter.class.php            |   0
 include/lehrelisthelper.class.php                   |   0
 include/lehrfach.class.php                          |   0
 include/lehrform.class.php                          |   0
 include/lehrfunktion.class.php                      |   0
 include/lehrmodus.class.php                         |   0
 include/lehrstunde.class.php                        |   0
 include/lehrtyp.class.php                           |   0
 include/lehrveranstaltung.class.php                 |   0
 include/lehrverband.class.php                       |   0
 include/log.class.php                               |   0
 include/lvangebot.class.php                         |   0
 include/lvgesamtnote.class.php                      |   0
 include/lvinfo.class.php                            |   0
 include/lvregel.class.php                           |   0
 include/mail.class.php                              |   0
 include/mantis.class.php                            |   0
 include/meta/angular-tablesorter.php                |   0
 include/meta/angular.php                            |   0
 include/meta/easyui.php                             |   0
 include/meta/jquery-tablesorter.php                 |   0
 include/meta/jquery.php                             |   0
 include/meta/js_utils.php                           |   0
 include/meta/jsoneditor.php                         |   0
 include/meta/php_utils.php                          |   0
 include/mitarbeiter.class.php                       |   0
 include/mobilitaet.class.php                        |   0
 include/mobilitaetsprogramm.class.php               |   0
 include/nation.class.php                            |   0
 include/nationengruppe.class.php                    |   0
 include/news.class.php                              |   0
 include/note.class.php                              |   0
 include/notenschluessel.class.php                   |   0
 include/notiz.class.php                             |   0
 include/organisationseinheit.class.php              |   0
 include/organisationsform.class.php                 |   0
 include/ort.class.php                               |   0
 include/ortraumtyp.class.php                        |   0
 include/pdf.class.php                               |   0
 include/pdf.inc.php                                 |   0
 include/pdf/FAQ.htm                                 |   0
 include/pdf/doc/acceptpagebreak.htm                 |   0
 include/pdf/doc/addfont.htm                         |   0
 include/pdf/doc/addlink.htm                         |   0
 include/pdf/doc/addpage.htm                         |   0
 include/pdf/doc/aliasnbpages.htm                    |   0
 include/pdf/doc/cell.htm                            |   0
 include/pdf/doc/close.htm                           |   0
 include/pdf/doc/error.htm                           |   0
 include/pdf/doc/footer.htm                          |   0
 include/pdf/doc/fpdf.htm                            |   0
 include/pdf/doc/getstringwidth.htm                  |   0
 include/pdf/doc/getx.htm                            |   0
 include/pdf/doc/gety.htm                            |   0
 include/pdf/doc/header.htm                          |   0
 include/pdf/doc/image.htm                           |   0
 include/pdf/doc/index.htm                           |   0
 include/pdf/doc/line.htm                            |   0
 include/pdf/doc/link.htm                            |   0
 include/pdf/doc/ln.htm                              |   0
 include/pdf/doc/multicell.htm                       |   0
 include/pdf/doc/open.htm                            |   0
 include/pdf/doc/output.htm                          |   0
 include/pdf/doc/pageno.htm                          |   0
 include/pdf/doc/rect.htm                            |   0
 include/pdf/doc/setauthor.htm                       |   0
 include/pdf/doc/setautopagebreak.htm                |   0
 include/pdf/doc/setcompression.htm                  |   0
 include/pdf/doc/setcreator.htm                      |   0
 include/pdf/doc/setdisplaymode.htm                  |   0
 include/pdf/doc/setdrawcolor.htm                    |   0
 include/pdf/doc/setfillcolor.htm                    |   0
 include/pdf/doc/setfont.htm                         |   0
 include/pdf/doc/setfontsize.htm                     |   0
 include/pdf/doc/setkeywords.htm                     |   0
 include/pdf/doc/setleftmargin.htm                   |   0
 include/pdf/doc/setlinewidth.htm                    |   0
 include/pdf/doc/setlink.htm                         |   0
 include/pdf/doc/setmargins.htm                      |   0
 include/pdf/doc/setrightmargin.htm                  |   0
 include/pdf/doc/setsubject.htm                      |   0
 include/pdf/doc/settextcolor.htm                    |   0
 include/pdf/doc/settitle.htm                        |   0
 include/pdf/doc/settopmargin.htm                    |   0
 include/pdf/doc/setx.htm                            |   0
 include/pdf/doc/setxy.htm                           |   0
 include/pdf/doc/sety.htm                            |   0
 include/pdf/doc/text.htm                            |   0
 include/pdf/doc/write.htm                           |   0
 include/pdf/font/courier.php                        |   0
 include/pdf/font/helvetica.php                      |   0
 include/pdf/font/helveticab.php                     |   0
 include/pdf/font/helveticabi.php                    |   0
 include/pdf/font/helveticai.php                     |   0
 include/pdf/font/makefont/cp1250.map                |   0
 include/pdf/font/makefont/cp1251.map                |   0
 include/pdf/font/makefont/cp1252.map                |   0
 include/pdf/font/makefont/cp1253.map                |   0
 include/pdf/font/makefont/cp1254.map                |   0
 include/pdf/font/makefont/cp1255.map                |   0
 include/pdf/font/makefont/cp1257.map                |   0
 include/pdf/font/makefont/cp1258.map                |   0
 include/pdf/font/makefont/cp874.map                 |   0
 include/pdf/font/makefont/iso-8859-1.map            |   0
 include/pdf/font/makefont/iso-8859-11.map           |   0
 include/pdf/font/makefont/iso-8859-15.map           |   0
 include/pdf/font/makefont/iso-8859-16.map           |   0
 include/pdf/font/makefont/iso-8859-2.map            |   0
 include/pdf/font/makefont/iso-8859-4.map            |   0
 include/pdf/font/makefont/iso-8859-5.map            |   0
 include/pdf/font/makefont/iso-8859-7.map            |   0
 include/pdf/font/makefont/iso-8859-9.map            |   0
 include/pdf/font/makefont/koi8-r.map                |   0
 include/pdf/font/makefont/koi8-u.map                |   0
 include/pdf/font/makefont/makefont.php              |   0
 include/pdf/font/symbol.php                         |   0
 include/pdf/font/times.php                          |   0
 include/pdf/font/timesb.php                         |   0
 include/pdf/font/timesbi.php                        |   0
 include/pdf/font/timesi.php                         |   0
 include/pdf/font/zapfdingbats.php                   |   0
 include/pdf/fpdf.css                                |   0
 include/pdf/fpdf.php                                |   0
 include/pdf/histo.htm                               |   0
 include/pdf/install.txt                             |   0
 include/person.class.php                            |   0
 include/personlog.class.php                         |   0
 include/pgsql.class.php                             |   0
 include/phrasen.class.php                           |   0
 include/preincoming.class.php                       |   0
 include/preinteressent.class.php                    |   0
 include/preoutgoing.class.php                       |   0
 include/prestudent.class.php                        |   0
 include/process.class.php                           |   0
 include/projekt.class.php                           |   0
 include/projektarbeit.class.php                     |   0
 include/projektbenutzer.class.php                   |   0
 include/projektbetreuer.class.php                   |   0
 include/projektphase.class.php                      |   0
 include/projekttask.class.php                       |   0
 include/pruefling.class.php                         |   0
 include/pruefung.class.php                          |   0
 include/pruefungCis.class.php                       |   0
 include/pruefungsanmeldung.class.php                |   0
 include/pruefungsfenster.class.php                  |   0
 include/pruefungstermin.class.php                   |   0
 include/raumtyp.class.php                           |   0
 include/rdf.class.php                               |   0
 include/reihungstest.class.php                      |   0
 include/reservierung.class.php                      |   0
 include/ressource.class.php                         |   0
 include/rueckstellung.class.php                     |   0
 include/sabredav/ChangeLog                          |   0
 include/sabredav/LICENSE                            |   0
 include/sabredav/README.md                          |   0
 include/sabredav/bin/build.php                      |   0
 include/sabredav/bin/googlecode_upload.py           |   0
 include/sabredav/bin/migrateto17.php                |   0
 include/sabredav/bin/naturalselection.py            |   0
 include/sabredav/bin/sabredav                       |   0
 include/sabredav/bin/sabredav.php                   |   0
 include/sabredav/bin/vobjectvalidate.php            |   0
 include/sabredav/composer.json                      |   0
 include/sabredav/composer.lock                      |   0
 include/sabredav/examples/addressbookserver.php     |   0
 include/sabredav/examples/basicauth.php             |   0
 include/sabredav/examples/calendarserver.php        |   0
 include/sabredav/examples/digestauth.php            |   0
 include/sabredav/examples/fileserver.php            |   0
 include/sabredav/examples/groupwareserver.php       |   0
 include/sabredav/examples/simplefsserver.php        |   0
 include/sabredav/examples/sql/mysql.addressbook.sql |   0
 include/sabredav/examples/sql/mysql.calendars.sql   |   0
 include/sabredav/examples/sql/mysql.locks.sql       |   0
 include/sabredav/examples/sql/mysql.principals.sql  |   0
 include/sabredav/examples/sql/mysql.users.sql       |   0
 include/sabredav/examples/sql/pgsql.addressbook.sql |   0
 include/sabredav/examples/sql/pgsql.calendars.sql   |   0
 include/sabredav/examples/sql/pgsql.locks.sql       |   0
 include/sabredav/examples/sql/pgsql.principals.sql  |   0
 include/sabredav/examples/sql/pgsql.users.sql       |   0
 .../sabredav/examples/sql/sqlite.addressbooks.sql   |   0
 include/sabredav/examples/sql/sqlite.calendars.sql  |   0
 include/sabredav/examples/sql/sqlite.locks.sql      |   0
 include/sabredav/examples/sql/sqlite.principals.sql |   0
 include/sabredav/examples/sql/sqlite.users.sql      |   0
 .../examples/webserver/apache2_htaccess.conf        |   0
 .../sabredav/examples/webserver/apache2_vhost.conf  |   0
 .../examples/webserver/apache2_vhost_cgi.conf       |   0
 .../lib/Sabre/CalDAV/Backend/AbstractBackend.php    |   0
 .../lib/Sabre/CalDAV/Backend/BackendInterface.php   |   0
 .../Sabre/CalDAV/Backend/NotificationSupport.php    |   0
 include/sabredav/lib/Sabre/CalDAV/Backend/PDO.php   |   0
 .../lib/Sabre/CalDAV/Backend/SharingSupport.php     |   0
 include/sabredav/lib/Sabre/CalDAV/Calendar.php      |   0
 .../sabredav/lib/Sabre/CalDAV/CalendarObject.php    |   0
 .../lib/Sabre/CalDAV/CalendarQueryParser.php        |   0
 .../lib/Sabre/CalDAV/CalendarQueryValidator.php     |   0
 .../sabredav/lib/Sabre/CalDAV/CalendarRootNode.php  |   0
 .../Sabre/CalDAV/Exception/InvalidComponentType.php |   0
 .../sabredav/lib/Sabre/CalDAV/ICSExportPlugin.php   |   0
 include/sabredav/lib/Sabre/CalDAV/ICalendar.php     |   0
 .../sabredav/lib/Sabre/CalDAV/ICalendarObject.php   |   0
 .../lib/Sabre/CalDAV/IShareableCalendar.php         |   0
 .../sabredav/lib/Sabre/CalDAV/ISharedCalendar.php   |   0
 .../lib/Sabre/CalDAV/Notifications/Collection.php   |   0
 .../lib/Sabre/CalDAV/Notifications/ICollection.php  |   0
 .../lib/Sabre/CalDAV/Notifications/INode.php        |   0
 .../CalDAV/Notifications/INotificationType.php      |   0
 .../lib/Sabre/CalDAV/Notifications/Node.php         |   0
 .../CalDAV/Notifications/Notification/Invite.php    |   0
 .../Notifications/Notification/InviteReply.php      |   0
 .../Notifications/Notification/SystemStatus.php     |   0
 include/sabredav/lib/Sabre/CalDAV/Plugin.php        |   0
 .../lib/Sabre/CalDAV/Principal/Collection.php       |   0
 .../lib/Sabre/CalDAV/Principal/IProxyRead.php       |   0
 .../lib/Sabre/CalDAV/Principal/IProxyWrite.php      |   0
 .../lib/Sabre/CalDAV/Principal/ProxyRead.php        |   0
 .../lib/Sabre/CalDAV/Principal/ProxyWrite.php       |   0
 .../sabredav/lib/Sabre/CalDAV/Principal/User.php    |   0
 .../Sabre/CalDAV/Property/AllowedSharingModes.php   |   0
 .../sabredav/lib/Sabre/CalDAV/Property/Invite.php   |   0
 .../CalDAV/Property/ScheduleCalendarTransp.php      |   0
 .../Property/SupportedCalendarComponentSet.php      |   0
 .../Sabre/CalDAV/Property/SupportedCalendarData.php |   0
 .../Sabre/CalDAV/Property/SupportedCollationSet.php |   0
 include/sabredav/lib/Sabre/CalDAV/Schedule/IMip.php |   0
 .../sabredav/lib/Sabre/CalDAV/Schedule/IOutbox.php  |   0
 .../sabredav/lib/Sabre/CalDAV/Schedule/Outbox.php   |   0
 .../sabredav/lib/Sabre/CalDAV/ShareableCalendar.php |   0
 .../sabredav/lib/Sabre/CalDAV/SharedCalendar.php    |   0
 include/sabredav/lib/Sabre/CalDAV/SharingPlugin.php |   0
 include/sabredav/lib/Sabre/CalDAV/UserCalendars.php |   0
 include/sabredav/lib/Sabre/CalDAV/Version.php       |   0
 include/sabredav/lib/Sabre/CardDAV/AddressBook.php  |   0
 .../lib/Sabre/CardDAV/AddressBookQueryParser.php    |   0
 .../sabredav/lib/Sabre/CardDAV/AddressBookRoot.php  |   0
 .../lib/Sabre/CardDAV/Backend/AbstractBackend.php   |   0
 .../lib/Sabre/CardDAV/Backend/BackendInterface.php  |   0
 include/sabredav/lib/Sabre/CardDAV/Backend/PDO.php  |   0
 include/sabredav/lib/Sabre/CardDAV/Card.php         |   0
 include/sabredav/lib/Sabre/CardDAV/IAddressBook.php |   0
 include/sabredav/lib/Sabre/CardDAV/ICard.php        |   0
 include/sabredav/lib/Sabre/CardDAV/IDirectory.php   |   0
 include/sabredav/lib/Sabre/CardDAV/Plugin.php       |   0
 .../Sabre/CardDAV/Property/SupportedAddressData.php |   0
 .../sabredav/lib/Sabre/CardDAV/UserAddressBooks.php |   0
 .../sabredav/lib/Sabre/CardDAV/VCFExportPlugin.php  |   0
 include/sabredav/lib/Sabre/CardDAV/Version.php      |   0
 .../lib/Sabre/DAV/Auth/Backend/AbstractBasic.php    |   0
 .../lib/Sabre/DAV/Auth/Backend/AbstractDigest.php   |   0
 .../sabredav/lib/Sabre/DAV/Auth/Backend/Apache.php  |   0
 .../lib/Sabre/DAV/Auth/Backend/BackendInterface.php |   0
 .../sabredav/lib/Sabre/DAV/Auth/Backend/File.php    |   0
 include/sabredav/lib/Sabre/DAV/Auth/Backend/PDO.php |   0
 include/sabredav/lib/Sabre/DAV/Auth/Plugin.php      |   0
 .../lib/Sabre/DAV/Browser/GuessContentType.php      |   0
 .../lib/Sabre/DAV/Browser/MapGetToPropFind.php      |   0
 include/sabredav/lib/Sabre/DAV/Browser/Plugin.php   |   0
 .../lib/Sabre/DAV/Browser/assets/favicon.ico        | Bin
 .../Sabre/DAV/Browser/assets/icons/addressbook.png  | Bin
 .../lib/Sabre/DAV/Browser/assets/icons/calendar.png | Bin
 .../lib/Sabre/DAV/Browser/assets/icons/card.png     | Bin
 .../Sabre/DAV/Browser/assets/icons/collection.png   | Bin
 .../lib/Sabre/DAV/Browser/assets/icons/file.png     | Bin
 .../lib/Sabre/DAV/Browser/assets/icons/parent.png   | Bin
 .../Sabre/DAV/Browser/assets/icons/principal.png    | Bin
 include/sabredav/lib/Sabre/DAV/Client.php           |   0
 include/sabredav/lib/Sabre/DAV/Collection.php       |   0
 include/sabredav/lib/Sabre/DAV/Exception.php        |   0
 .../sabredav/lib/Sabre/DAV/Exception/BadRequest.php |   0
 .../sabredav/lib/Sabre/DAV/Exception/Conflict.php   |   0
 .../lib/Sabre/DAV/Exception/ConflictingLock.php     |   0
 .../lib/Sabre/DAV/Exception/FileNotFound.php        |   0
 .../sabredav/lib/Sabre/DAV/Exception/Forbidden.php  |   0
 .../lib/Sabre/DAV/Exception/InsufficientStorage.php |   0
 .../lib/Sabre/DAV/Exception/InvalidResourceType.php |   0
 .../lib/Sabre/DAV/Exception/LengthRequired.php      |   0
 .../DAV/Exception/LockTokenMatchesRequestUri.php    |   0
 include/sabredav/lib/Sabre/DAV/Exception/Locked.php |   0
 .../lib/Sabre/DAV/Exception/MethodNotAllowed.php    |   0
 .../lib/Sabre/DAV/Exception/NotAuthenticated.php    |   0
 .../sabredav/lib/Sabre/DAV/Exception/NotFound.php   |   0
 .../lib/Sabre/DAV/Exception/NotImplemented.php      |   0
 .../lib/Sabre/DAV/Exception/PaymentRequired.php     |   0
 .../lib/Sabre/DAV/Exception/PreconditionFailed.php  |   0
 .../lib/Sabre/DAV/Exception/ReportNotSupported.php  |   0
 .../DAV/Exception/RequestedRangeNotSatisfiable.php  |   0
 .../lib/Sabre/DAV/Exception/ServiceUnavailable.php  |   0
 .../Sabre/DAV/Exception/UnsupportedMediaType.php    |   0
 include/sabredav/lib/Sabre/DAV/FS/Directory.php     |   0
 include/sabredav/lib/Sabre/DAV/FS/File.php          |   0
 include/sabredav/lib/Sabre/DAV/FS/Node.php          |   0
 include/sabredav/lib/Sabre/DAV/FSExt/Directory.php  |   0
 include/sabredav/lib/Sabre/DAV/FSExt/File.php       |   0
 include/sabredav/lib/Sabre/DAV/FSExt/Node.php       |   0
 include/sabredav/lib/Sabre/DAV/File.php             |   0
 include/sabredav/lib/Sabre/DAV/ICollection.php      |   0
 .../sabredav/lib/Sabre/DAV/IExtendedCollection.php  |   0
 include/sabredav/lib/Sabre/DAV/IFile.php            |   0
 include/sabredav/lib/Sabre/DAV/INode.php            |   0
 include/sabredav/lib/Sabre/DAV/IProperties.php      |   0
 include/sabredav/lib/Sabre/DAV/IQuota.php           |   0
 .../lib/Sabre/DAV/Locks/Backend/AbstractBackend.php |   0
 .../Sabre/DAV/Locks/Backend/BackendInterface.php    |   0
 include/sabredav/lib/Sabre/DAV/Locks/Backend/FS.php |   0
 .../sabredav/lib/Sabre/DAV/Locks/Backend/File.php   |   0
 .../sabredav/lib/Sabre/DAV/Locks/Backend/PDO.php    |   0
 include/sabredav/lib/Sabre/DAV/Locks/LockInfo.php   |   0
 include/sabredav/lib/Sabre/DAV/Locks/Plugin.php     |   0
 include/sabredav/lib/Sabre/DAV/Mount/Plugin.php     |   0
 include/sabredav/lib/Sabre/DAV/Node.php             |   0
 include/sabredav/lib/Sabre/DAV/ObjectTree.php       |   0
 .../sabredav/lib/Sabre/DAV/PartialUpdate/IFile.php  |   0
 .../lib/Sabre/DAV/PartialUpdate/IPatchSupport.php   |   0
 .../sabredav/lib/Sabre/DAV/PartialUpdate/Plugin.php |   0
 include/sabredav/lib/Sabre/DAV/Property.php         |   0
 .../lib/Sabre/DAV/Property/GetLastModified.php      |   0
 include/sabredav/lib/Sabre/DAV/Property/Href.php    |   0
 .../sabredav/lib/Sabre/DAV/Property/HrefList.php    |   0
 include/sabredav/lib/Sabre/DAV/Property/IHref.php   |   0
 .../lib/Sabre/DAV/Property/LockDiscovery.php        |   0
 .../lib/Sabre/DAV/Property/ResourceType.php         |   0
 .../sabredav/lib/Sabre/DAV/Property/Response.php    |   0
 .../lib/Sabre/DAV/Property/ResponseList.php         |   0
 .../lib/Sabre/DAV/Property/SupportedLock.php        |   0
 .../lib/Sabre/DAV/Property/SupportedReportSet.php   |   0
 .../sabredav/lib/Sabre/DAV/PropertyInterface.php    |   0
 include/sabredav/lib/Sabre/DAV/Server.php           |   0
 include/sabredav/lib/Sabre/DAV/ServerPlugin.php     |   0
 include/sabredav/lib/Sabre/DAV/SimpleCollection.php |   0
 include/sabredav/lib/Sabre/DAV/SimpleFile.php       |   0
 include/sabredav/lib/Sabre/DAV/StringUtil.php       |   0
 .../lib/Sabre/DAV/TemporaryFileFilterPlugin.php     |   0
 include/sabredav/lib/Sabre/DAV/Tree.php             |   0
 include/sabredav/lib/Sabre/DAV/Tree/Filesystem.php  |   0
 include/sabredav/lib/Sabre/DAV/URLUtil.php          |   0
 include/sabredav/lib/Sabre/DAV/UUIDUtil.php         |   0
 include/sabredav/lib/Sabre/DAV/Version.php          |   0
 include/sabredav/lib/Sabre/DAV/XMLUtil.php          |   0
 .../Sabre/DAVACL/AbstractPrincipalCollection.php    |   0
 .../lib/Sabre/DAVACL/Exception/AceConflict.php      |   0
 .../lib/Sabre/DAVACL/Exception/NeedPrivileges.php   |   0
 .../lib/Sabre/DAVACL/Exception/NoAbstract.php       |   0
 .../DAVACL/Exception/NotRecognizedPrincipal.php     |   0
 .../DAVACL/Exception/NotSupportedPrivilege.php      |   0
 include/sabredav/lib/Sabre/DAVACL/IACL.php          |   0
 include/sabredav/lib/Sabre/DAVACL/IPrincipal.php    |   0
 .../lib/Sabre/DAVACL/IPrincipalCollection.php       |   0
 include/sabredav/lib/Sabre/DAVACL/Plugin.php        |   0
 include/sabredav/lib/Sabre/DAVACL/Principal.php     |   0
 .../DAVACL/PrincipalBackend/AbstractBackend.php     |   0
 .../DAVACL/PrincipalBackend/BackendInterface.php    |   0
 .../lib/Sabre/DAVACL/PrincipalBackend/PDO.php       |   0
 .../lib/Sabre/DAVACL/PrincipalCollection.php        |   0
 include/sabredav/lib/Sabre/DAVACL/Property/Acl.php  |   0
 .../lib/Sabre/DAVACL/Property/AclRestrictions.php   |   0
 .../DAVACL/Property/CurrentUserPrivilegeSet.php     |   0
 .../lib/Sabre/DAVACL/Property/Principal.php         |   0
 .../Sabre/DAVACL/Property/SupportedPrivilegeSet.php |   0
 include/sabredav/lib/Sabre/DAVACL/Version.php       |   0
 include/sabredav/lib/Sabre/HTTP/AWSAuth.php         |   0
 include/sabredav/lib/Sabre/HTTP/AbstractAuth.php    |   0
 include/sabredav/lib/Sabre/HTTP/BasicAuth.php       |   0
 include/sabredav/lib/Sabre/HTTP/DigestAuth.php      |   0
 include/sabredav/lib/Sabre/HTTP/Request.php         |   0
 include/sabredav/lib/Sabre/HTTP/Response.php        |   0
 include/sabredav/lib/Sabre/HTTP/Util.php            |   0
 include/sabredav/lib/Sabre/HTTP/Version.php         |   0
 include/sabredav/lib/Sabre/autoload.php             |   0
 .../tests/Sabre/CalDAV/Backend/AbstractPDOTest.php  |   0
 .../tests/Sabre/CalDAV/Backend/AbstractTest.php     |   0
 .../sabredav/tests/Sabre/CalDAV/Backend/Mock.php    |   0
 .../tests/Sabre/CalDAV/Backend/PDOMySQLTest.php     |   0
 .../tests/Sabre/CalDAV/Backend/PDOSqliteTest.php    |   0
 .../tests/Sabre/CalDAV/CalendarObjectTest.php       |   0
 .../tests/Sabre/CalDAV/CalendarQueryParserTest.php  |   0
 .../tests/Sabre/CalDAV/CalendarQueryVAlarmTest.php  |   0
 .../Sabre/CalDAV/CalendarQueryValidatorTest.php     |   0
 .../sabredav/tests/Sabre/CalDAV/CalendarTest.php    |   0
 .../CalDAV/ExpandEventsDTSTARTandDTENDTest.php      |   0
 .../CalDAV/ExpandEventsDTSTARTandDTENDbyDayTest.php |   0
 .../Sabre/CalDAV/ExpandEventsDoubleEventsTest.php   |   0
 .../tests/Sabre/CalDAV/FreeBusyReportTest.php       |   0
 .../tests/Sabre/CalDAV/FreeBusyRequestTest.php      |   0
 .../tests/Sabre/CalDAV/GetEventsByTimerangeTest.php |   0
 .../tests/Sabre/CalDAV/ICSExportPluginTest.php      |   0
 .../sabredav/tests/Sabre/CalDAV/Issue166Test.php    |   0
 .../sabredav/tests/Sabre/CalDAV/Issue172Test.php    |   0
 .../sabredav/tests/Sabre/CalDAV/Issue203Test.php    |   0
 .../sabredav/tests/Sabre/CalDAV/Issue205Test.php    |   0
 .../sabredav/tests/Sabre/CalDAV/Issue211Test.php    |   0
 .../sabredav/tests/Sabre/CalDAV/Issue220Test.php    |   0
 .../sabredav/tests/Sabre/CalDAV/Issue228Test.php    |   0
 .../Sabre/CalDAV/Notifications/CollectionTest.php   |   0
 .../tests/Sabre/CalDAV/Notifications/NodeTest.php   |   0
 .../Notifications/Notification/InviteReplyTest.php  |   0
 .../Notifications/Notification/InviteTest.php       |   0
 .../Notifications/Notification/SystemStatusTest.php |   0
 .../sabredav/tests/Sabre/CalDAV/OutboxPostTest.php  |   0
 include/sabredav/tests/Sabre/CalDAV/PluginTest.php  |   0
 .../tests/Sabre/CalDAV/Principal/CollectionTest.php |   0
 .../tests/Sabre/CalDAV/Principal/ProxyReadTest.php  |   0
 .../tests/Sabre/CalDAV/Principal/ProxyWriteTest.php |   0
 .../tests/Sabre/CalDAV/Principal/UserTest.php       |   0
 .../CalDAV/Property/AllowedSharingModesTest.php     |   0
 .../tests/Sabre/CalDAV/Property/InviteTest.php      |   0
 .../CalDAV/Property/ScheduleCalendarTranspTest.php  |   0
 .../Property/SupportedCalendarComponentSetTest.php  |   0
 .../CalDAV/Property/SupportedCalendarDataTest.php   |   0
 .../CalDAV/Property/SupportedCollationSetTest.php   |   0
 .../tests/Sabre/CalDAV/Schedule/IMip/Mock.php       |   0
 .../tests/Sabre/CalDAV/Schedule/OutboxTest.php      |   0
 .../tests/Sabre/CalDAV/ShareableCalendarTest.php    |   0
 .../tests/Sabre/CalDAV/SharedCalendarTest.php       |   0
 .../tests/Sabre/CalDAV/SharingPluginTest.php        |   0
 include/sabredav/tests/Sabre/CalDAV/TestUtil.php    |   0
 .../CalDAV/UserCalendarsSharedCalendarsTest.php     |   0
 .../tests/Sabre/CalDAV/UserCalendarsTest.php        |   0
 .../tests/Sabre/CalDAV/ValidateICalTest.php         |   0
 include/sabredav/tests/Sabre/CalDAV/VersionTest.php |   0
 .../tests/Sabre/CardDAV/AbstractPluginTest.php      |   0
 .../Sabre/CardDAV/AddressBookQueryParserTest.php    |   0
 .../tests/Sabre/CardDAV/AddressBookQueryTest.php    |   0
 .../tests/Sabre/CardDAV/AddressBookRootTest.php     |   0
 .../tests/Sabre/CardDAV/AddressBookTest.php         |   0
 .../tests/Sabre/CardDAV/Backend/AbstractPDOTest.php |   0
 .../sabredav/tests/Sabre/CardDAV/Backend/Mock.php   |   0
 .../tests/Sabre/CardDAV/Backend/PDOMySQLTest.php    |   0
 .../tests/Sabre/CardDAV/Backend/PDOSqliteTest.php   |   0
 include/sabredav/tests/Sabre/CardDAV/CardTest.php   |   0
 .../sabredav/tests/Sabre/CardDAV/IDirectoryTest.php |   0
 .../sabredav/tests/Sabre/CardDAV/MultiGetTest.php   |   0
 include/sabredav/tests/Sabre/CardDAV/PluginTest.php |   0
 .../CardDAV/Property/SupportedAddressDataTest.php   |   0
 .../Sabre/CardDAV/SogoStripContentTypeTest.php      |   0
 include/sabredav/tests/Sabre/CardDAV/TestUtil.php   |   0
 .../tests/Sabre/CardDAV/UserAddressBooksTest.php    |   0
 .../sabredav/tests/Sabre/CardDAV/VCFExportTest.php  |   0
 .../tests/Sabre/CardDAV/ValidateFilterTest.php      |   0
 .../tests/Sabre/CardDAV/ValidateVCardTest.php       |   0
 .../sabredav/tests/Sabre/CardDAV/VersionTest.php    |   0
 include/sabredav/tests/Sabre/DAV/AbstractServer.php |   0
 .../Sabre/DAV/Auth/Backend/AbstractBasicTest.php    |   0
 .../Sabre/DAV/Auth/Backend/AbstractDigestTest.php   |   0
 .../Sabre/DAV/Auth/Backend/AbstractPDOTest.php      |   0
 .../tests/Sabre/DAV/Auth/Backend/ApacheTest.php     |   0
 .../tests/Sabre/DAV/Auth/Backend/FileTest.php       |   0
 .../sabredav/tests/Sabre/DAV/Auth/Backend/Mock.php  |   0
 .../tests/Sabre/DAV/Auth/Backend/PDOMySQLTest.php   |   0
 .../tests/Sabre/DAV/Auth/Backend/PDOSqliteTest.php  |   0
 .../sabredav/tests/Sabre/DAV/Auth/PluginTest.php    |   0
 include/sabredav/tests/Sabre/DAV/BasicNodeTest.php  |   0
 .../Sabre/DAV/Browser/GuessContentTypeTest.php      |   0
 .../Sabre/DAV/Browser/MapGetToPropFindTest.php      |   0
 .../sabredav/tests/Sabre/DAV/Browser/PluginTest.php |   0
 include/sabredav/tests/Sabre/DAV/ClientMock.php     |   0
 include/sabredav/tests/Sabre/DAV/ClientTest.php     |   0
 .../tests/Sabre/DAV/Exception/LockedTest.php        |   0
 .../Sabre/DAV/Exception/PaymentRequiredTest.php     |   0
 include/sabredav/tests/Sabre/DAV/ExceptionTest.php  |   0
 include/sabredav/tests/Sabre/DAV/FSExt/FileTest.php |   0
 include/sabredav/tests/Sabre/DAV/FSExt/NodeTest.php |   0
 .../sabredav/tests/Sabre/DAV/FSExt/ServerTest.php   |   0
 .../tests/Sabre/DAV/HTTPPreferParsingTest.php       |   0
 include/sabredav/tests/Sabre/DAV/HttpDeleteTest.php |   0
 include/sabredav/tests/Sabre/DAV/HttpPutTest.php    |   0
 include/sabredav/tests/Sabre/DAV/Issue33Test.php    |   0
 .../tests/Sabre/DAV/Locks/Backend/AbstractTest.php  |   0
 .../tests/Sabre/DAV/Locks/Backend/FSTest.php        |   0
 .../tests/Sabre/DAV/Locks/Backend/FileTest.php      |   0
 .../tests/Sabre/DAV/Locks/Backend/PDOMySQLTest.php  |   0
 .../tests/Sabre/DAV/Locks/Backend/PDOTest.php       |   0
 .../tests/Sabre/DAV/Locks/GetIfConditionsTest.php   |   0
 .../sabredav/tests/Sabre/DAV/Locks/MSWordTest.php   |   0
 .../sabredav/tests/Sabre/DAV/Locks/PluginTest.php   |   0
 .../sabredav/tests/Sabre/DAV/Mock/Collection.php    |   0
 include/sabredav/tests/Sabre/DAV/Mock/File.php      |   0
 .../sabredav/tests/Sabre/DAV/Mount/PluginTest.php   |   0
 include/sabredav/tests/Sabre/DAV/ObjectTreeTest.php |   0
 .../tests/Sabre/DAV/PartialUpdate/FileMock.php      |   0
 .../tests/Sabre/DAV/PartialUpdate/PluginTest.php    |   0
 .../Sabre/DAV/PartialUpdate/SpecificationTest.php   |   0
 .../Sabre/DAV/Property/GetLastModifiedTest.php      |   0
 .../tests/Sabre/DAV/Property/HrefListTest.php       |   0
 .../sabredav/tests/Sabre/DAV/Property/HrefTest.php  |   0
 .../tests/Sabre/DAV/Property/ResourceTypeTest.php   |   0
 .../tests/Sabre/DAV/Property/ResponseListTest.php   |   0
 .../tests/Sabre/DAV/Property/ResponseTest.php       |   0
 .../Sabre/DAV/Property/SupportedReportSetTest.php   |   0
 .../sabredav/tests/Sabre/DAV/ServerCopyMoveTest.php |   0
 .../sabredav/tests/Sabre/DAV/ServerEventsTest.php   |   0
 .../sabredav/tests/Sabre/DAV/ServerMKCOLTest.php    |   0
 .../sabredav/tests/Sabre/DAV/ServerPluginTest.php   |   0
 .../tests/Sabre/DAV/ServerPreconditionTest.php      |   0
 .../sabredav/tests/Sabre/DAV/ServerPropsTest.php    |   0
 .../sabredav/tests/Sabre/DAV/ServerRangeTest.php    |   0
 .../sabredav/tests/Sabre/DAV/ServerSimpleTest.php   |   0
 .../tests/Sabre/DAV/ServerUpdatePropertiesTest.php  |   0
 include/sabredav/tests/Sabre/DAV/SimpleFileTest.php |   0
 include/sabredav/tests/Sabre/DAV/StringUtilTest.php |   0
 .../tests/Sabre/DAV/TemporaryFileFilterTest.php     |   0
 include/sabredav/tests/Sabre/DAV/TestPlugin.php     |   0
 .../tests/Sabre/DAV/Tree/FilesystemTest.php         |   0
 include/sabredav/tests/Sabre/DAV/TreeTest.php       |   0
 include/sabredav/tests/Sabre/DAV/URLUtilTest.php    |   0
 include/sabredav/tests/Sabre/DAV/UUIDUtilTest.php   |   0
 include/sabredav/tests/Sabre/DAV/XMLUtilTest.php    |   0
 .../sabredav/tests/Sabre/DAVACL/ACLMethodTest.php   |   0
 .../sabredav/tests/Sabre/DAVACL/AllowAccessTest.php |   0
 .../sabredav/tests/Sabre/DAVACL/BlockAccessTest.php |   0
 .../Sabre/DAVACL/Exception/AceConflictTest.php      |   0
 .../Exception/NeedPrivilegesExceptionTest.php       |   0
 .../tests/Sabre/DAVACL/Exception/NoAbstractTest.php |   0
 .../DAVACL/Exception/NotRecognizedPrincipalTest.php |   0
 .../DAVACL/Exception/NotSupportedPrivilegeTest.php  |   0
 .../tests/Sabre/DAVACL/ExpandPropertiesTest.php     |   0
 include/sabredav/tests/Sabre/DAVACL/MockACLNode.php |   0
 .../sabredav/tests/Sabre/DAVACL/MockPrincipal.php   |   0
 .../sabredav/tests/Sabre/DAVACL/PluginAdminTest.php |   0
 .../tests/Sabre/DAVACL/PluginPropertiesTest.php     |   0
 .../Sabre/DAVACL/PluginUpdatePropertiesTest.php     |   0
 .../DAVACL/PrincipalBackend/AbstractPDOTest.php     |   0
 .../tests/Sabre/DAVACL/PrincipalBackend/Mock.php    |   0
 .../Sabre/DAVACL/PrincipalBackend/PDOMySQLTest.php  |   0
 .../Sabre/DAVACL/PrincipalBackend/PDOSqliteTest.php |   0
 .../tests/Sabre/DAVACL/PrincipalCollectionTest.php  |   0
 .../Sabre/DAVACL/PrincipalPropertySearchTest.php    |   0
 .../Sabre/DAVACL/PrincipalSearchPropertySetTest.php |   0
 .../sabredav/tests/Sabre/DAVACL/PrincipalTest.php   |   0
 .../Sabre/DAVACL/Property/ACLRestrictionsTest.php   |   0
 .../tests/Sabre/DAVACL/Property/ACLTest.php         |   0
 .../DAVACL/Property/CurrentUserPrivilegeSetTest.php |   0
 .../tests/Sabre/DAVACL/Property/PrincipalTest.php   |   0
 .../DAVACL/Property/SupportedPrivilegeSetTest.php   |   0
 .../tests/Sabre/DAVACL/SimplePluginTest.php         |   0
 include/sabredav/tests/Sabre/DAVACL/VersionTest.php |   0
 include/sabredav/tests/Sabre/DAVServerTest.php      |   0
 include/sabredav/tests/Sabre/HTTP/AWSAuthTest.php   |   0
 include/sabredav/tests/Sabre/HTTP/BasicAuthTest.php |   0
 .../sabredav/tests/Sabre/HTTP/DigestAuthTest.php    |   0
 include/sabredav/tests/Sabre/HTTP/RequestTest.php   |   0
 include/sabredav/tests/Sabre/HTTP/ResponseMock.php  |   0
 include/sabredav/tests/Sabre/HTTP/ResponseTest.php  |   0
 include/sabredav/tests/Sabre/HTTP/UtilTest.php      |   0
 include/sabredav/tests/Sabre/HTTP/VersionTest.php   |   0
 include/sabredav/tests/Sabre/TestUtil.php           |   0
 include/sabredav/tests/bootstrap.php                |   0
 include/sabredav/tests/composer.vobject3.json       |   0
 include/sabredav/tests/phpunit.xml                  |   0
 include/sabredav/vendor/autoload.php                |   0
 include/sabredav/vendor/composer/ClassLoader.php    |   0
 .../sabredav/vendor/composer/autoload_classmap.php  |   0
 .../vendor/composer/autoload_namespaces.php         |   0
 include/sabredav/vendor/composer/autoload_psr4.php  |   0
 include/sabredav/vendor/composer/autoload_real.php  |   0
 include/sabredav/vendor/composer/installed.json     |   0
 include/sabredav/vendor/sabre/vobject/.gitignore    |   0
 include/sabredav/vendor/sabre/vobject/.travis.yml   |   0
 include/sabredav/vendor/sabre/vobject/ChangeLog     |   0
 include/sabredav/vendor/sabre/vobject/LICENSE       |   0
 include/sabredav/vendor/sabre/vobject/README.md     |   0
 include/sabredav/vendor/sabre/vobject/bin/bench.php |   0
 .../sabre/vobject/bin/generateicalendardata.php     |   0
 .../vendor/sabre/vobject/bin/vobjectvalidate.php    |   0
 include/sabredav/vendor/sabre/vobject/composer.json |   0
 .../sabre/vobject/lib/Sabre/VObject/Component.php   |   0
 .../vobject/lib/Sabre/VObject/Component/VAlarm.php  |   0
 .../lib/Sabre/VObject/Component/VCalendar.php       |   0
 .../vobject/lib/Sabre/VObject/Component/VCard.php   |   0
 .../vobject/lib/Sabre/VObject/Component/VEvent.php  |   0
 .../lib/Sabre/VObject/Component/VFreeBusy.php       |   0
 .../lib/Sabre/VObject/Component/VJournal.php        |   0
 .../vobject/lib/Sabre/VObject/Component/VTodo.php   |   0
 .../vobject/lib/Sabre/VObject/DateTimeParser.php    |   0
 .../sabre/vobject/lib/Sabre/VObject/Document.php    |   0
 .../sabre/vobject/lib/Sabre/VObject/ElementList.php |   0
 .../vobject/lib/Sabre/VObject/FreeBusyGenerator.php |   0
 .../vendor/sabre/vobject/lib/Sabre/VObject/Node.php |   0
 .../sabre/vobject/lib/Sabre/VObject/Parameter.php   |   0
 .../vobject/lib/Sabre/VObject/ParseException.php    |   0
 .../sabre/vobject/lib/Sabre/VObject/Property.php    |   0
 .../vobject/lib/Sabre/VObject/Property/Compound.php |   0
 .../vobject/lib/Sabre/VObject/Property/DateTime.php |   0
 .../lib/Sabre/VObject/Property/MultiDateTime.php    |   0
 .../sabre/vobject/lib/Sabre/VObject/Reader.php      |   0
 .../lib/Sabre/VObject/RecurrenceIterator.php        |   0
 .../lib/Sabre/VObject/Splitter/ICalendar.php        |   0
 .../Sabre/VObject/Splitter/SplitterInterface.php    |   0
 .../vobject/lib/Sabre/VObject/Splitter/VCard.php    |   0
 .../sabre/vobject/lib/Sabre/VObject/StringUtil.php  |   0
 .../vobject/lib/Sabre/VObject/TimeZoneUtil.php      |   0
 .../sabre/vobject/lib/Sabre/VObject/Version.php     |   0
 .../sabre/vobject/lib/Sabre/VObject/includes.php    |   0
 .../tests/Sabre/VObject/Component/VAlarmTest.php    |   0
 .../tests/Sabre/VObject/Component/VCalendarTest.php |   0
 .../tests/Sabre/VObject/Component/VCardTest.php     |   0
 .../tests/Sabre/VObject/Component/VEventTest.php    |   0
 .../tests/Sabre/VObject/Component/VFreeBusyTest.php |   0
 .../tests/Sabre/VObject/Component/VJournalTest.php  |   0
 .../tests/Sabre/VObject/Component/VTodoTest.php     |   0
 .../vobject/tests/Sabre/VObject/ComponentTest.php   |   0
 .../tests/Sabre/VObject/DateTimeParserTest.php      |   0
 .../vobject/tests/Sabre/VObject/DocumentTest.php    |   0
 .../vobject/tests/Sabre/VObject/ElementListTest.php |   0
 .../vobject/tests/Sabre/VObject/EmClientTest.php    |   0
 .../tests/Sabre/VObject/FreeBusyGeneratorTest.php   |   0
 .../vobject/tests/Sabre/VObject/Issue153Test.php    |   0
 .../vobject/tests/Sabre/VObject/Issue154Test.php    |   0
 .../vobject/tests/Sabre/VObject/Issue48Test.php     |   0
 .../vobject/tests/Sabre/VObject/Issue50Test.php     |   0
 .../vobject/tests/Sabre/VObject/ParameterTest.php   |   0
 .../tests/Sabre/VObject/Property/CompoundTest.php   |   0
 .../tests/Sabre/VObject/Property/DateTimeTest.php   |   0
 .../Sabre/VObject/Property/MultiDateTimeTest.php    |   0
 .../vobject/tests/Sabre/VObject/PropertyTest.php    |   0
 .../vobject/tests/Sabre/VObject/ReaderTest.php      |   0
 .../RecurrenceIteratorFifthTuesdayProblemTest.php   |   0
 .../RecurrenceIteratorIncorrectExpandTest.php       |   0
 .../RecurrenceIteratorInfiniteLoopProblemTest.php   |   0
 .../RecurrenceIteratorMinusOneProblemTest.php       |   0
 .../RecurrenceIteratorMissingOverriddenTest.php     |   0
 .../tests/Sabre/VObject/RecurrenceIteratorTest.php  |   0
 .../vobject/tests/Sabre/VObject/SlashRTest.php      |   0
 .../tests/Sabre/VObject/Splitter/ICalendarTest.php  |   0
 .../tests/Sabre/VObject/Splitter/VCardTest.php      |   0
 .../vobject/tests/Sabre/VObject/StringUtilTest.php  |   0
 .../tests/Sabre/VObject/TimeZoneUtilTest.php        |   0
 .../vobject/tests/Sabre/VObject/VersionTest.php     |   0
 .../sabre/vobject/tests/Sabre/VObject/issue153.vcf  |   0
 .../vendor/sabre/vobject/tests/bootstrap.php        |   0
 .../sabredav/vendor/sabre/vobject/tests/phpunit.xml |   0
 include/sancho.inc.php                              |   0
 include/schluesseltyp.class.php                     |   0
 include/securimage/AHGBold.ttf                      | Bin
 include/securimage/LICENSE.txt                      |   0
 include/securimage/README.FONT.txt                  |   0
 include/securimage/README.txt                       |   0
 include/securimage/WavFile.php                      |   0
 include/securimage/audio/en/0.wav                   | Bin
 include/securimage/audio/en/1.wav                   | Bin
 include/securimage/audio/en/10.wav                  | Bin
 include/securimage/audio/en/11.wav                  | Bin
 include/securimage/audio/en/12.wav                  | Bin
 include/securimage/audio/en/13.wav                  | Bin
 include/securimage/audio/en/14.wav                  | Bin
 include/securimage/audio/en/15.wav                  | Bin
 include/securimage/audio/en/16.wav                  | Bin
 include/securimage/audio/en/17.wav                  | Bin
 include/securimage/audio/en/18.wav                  | Bin
 include/securimage/audio/en/19.wav                  | Bin
 include/securimage/audio/en/2.wav                   | Bin
 include/securimage/audio/en/20.wav                  | Bin
 include/securimage/audio/en/3.wav                   | Bin
 include/securimage/audio/en/4.wav                   | Bin
 include/securimage/audio/en/5.wav                   | Bin
 include/securimage/audio/en/6.wav                   | Bin
 include/securimage/audio/en/7.wav                   | Bin
 include/securimage/audio/en/8.wav                   | Bin
 include/securimage/audio/en/9.wav                   | Bin
 include/securimage/audio/en/A.wav                   | Bin
 include/securimage/audio/en/B.wav                   | Bin
 include/securimage/audio/en/C.wav                   | Bin
 include/securimage/audio/en/D.wav                   | Bin
 include/securimage/audio/en/E.wav                   | Bin
 include/securimage/audio/en/F.wav                   | Bin
 include/securimage/audio/en/G.wav                   | Bin
 include/securimage/audio/en/H.wav                   | Bin
 include/securimage/audio/en/I.wav                   | Bin
 include/securimage/audio/en/J.wav                   | Bin
 include/securimage/audio/en/K.wav                   | Bin
 include/securimage/audio/en/L.wav                   | Bin
 include/securimage/audio/en/M.wav                   | Bin
 include/securimage/audio/en/MINUS.wav               | Bin
 include/securimage/audio/en/N.wav                   | Bin
 include/securimage/audio/en/O.wav                   | Bin
 include/securimage/audio/en/P.wav                   | Bin
 include/securimage/audio/en/PLUS.wav                | Bin
 include/securimage/audio/en/Q.wav                   | Bin
 include/securimage/audio/en/R.wav                   | Bin
 include/securimage/audio/en/S.wav                   | Bin
 include/securimage/audio/en/T.wav                   | Bin
 include/securimage/audio/en/TIMES.wav               | Bin
 include/securimage/audio/en/U.wav                   | Bin
 include/securimage/audio/en/V.wav                   | Bin
 include/securimage/audio/en/W.wav                   | Bin
 include/securimage/audio/en/X.wav                   | Bin
 include/securimage/audio/en/Y.wav                   | Bin
 include/securimage/audio/en/Z.wav                   | Bin
 include/securimage/audio/en/error.wav               | Bin
 include/securimage/audio/noise/check-point-1.wav    | Bin
 include/securimage/audio/noise/crowd-talking-1.wav  | Bin
 include/securimage/audio/noise/crowd-talking-6.wav  | Bin
 include/securimage/audio/noise/crowd-talking-7.wav  | Bin
 include/securimage/audio/noise/kids-playing-1.wav   | Bin
 include/securimage/backgrounds/bg3.jpg              | Bin
 include/securimage/backgrounds/bg4.jpg              | Bin
 include/securimage/backgrounds/bg5.jpg              | Bin
 include/securimage/backgrounds/bg6.png              | Bin
 include/securimage/captcha.html                     |   0
 include/securimage/database/.htaccess               |   0
 include/securimage/database/index.html              |   0
 include/securimage/database/securimage.sq3          | Bin
 include/securimage/images/audio_icon.png            | Bin
 include/securimage/images/refresh.png               | Bin
 include/securimage/securimage.php                   |   0
 include/securimage/securimage_play.php              |   0
 include/securimage/securimage_play.swf              | Bin
 include/securimage/securimage_show.php              |   0
 include/securimage/words/words.txt                  |   0
 include/service.class.php                           |   0
 include/sprache.class.php                           |   0
 include/standort.class.php                          |   0
 include/statistik.class.php                         |   0
 include/statusgrund.class.php                       |   0
 include/student.class.php                           |   0
 include/studentnote.class.php                       |   0
 include/studiengang.class.php                       |   0
 include/studienjahr.class.php                       |   0
 include/studienordnung.class.php                    |   0
 include/studienplan.class.php                       |   0
 include/studienplatz.class.php                      |   0
 include/studiensemester.class.php                   |   0
 include/studierendenantrag.class.php                |   0
 include/stunde.class.php                            |   0
 include/stundenplan.class.php                       |   0
 include/tags.class.php                              |   0
 include/template.class.php                          |   0
 include/tiny_mce/langs/de.js                        |   0
 include/tiny_mce/langs/en.js                        |   0
 include/tiny_mce/license.txt                        |   0
 include/tiny_mce/plugins/advhr/css/advhr.css        |   0
 include/tiny_mce/plugins/advhr/editor_plugin.js     |   0
 include/tiny_mce/plugins/advhr/editor_plugin_src.js |   0
 include/tiny_mce/plugins/advhr/js/rule.js           |   0
 include/tiny_mce/plugins/advhr/langs/de_dlg.js      |   0
 include/tiny_mce/plugins/advhr/langs/en_dlg.js      |   0
 include/tiny_mce/plugins/advhr/rule.htm             |   0
 include/tiny_mce/plugins/advimage/css/advimage.css  |   0
 include/tiny_mce/plugins/advimage/editor_plugin.js  |   0
 .../tiny_mce/plugins/advimage/editor_plugin_src.js  |   0
 include/tiny_mce/plugins/advimage/image.htm         |   0
 include/tiny_mce/plugins/advimage/img/sample.gif    | Bin
 include/tiny_mce/plugins/advimage/js/image.js       |   0
 include/tiny_mce/plugins/advimage/langs/de_dlg.js   |   0
 include/tiny_mce/plugins/advimage/langs/en_dlg.js   |   0
 include/tiny_mce/plugins/advlink/css/advlink.css    |   0
 include/tiny_mce/plugins/advlink/editor_plugin.js   |   0
 .../tiny_mce/plugins/advlink/editor_plugin_src.js   |   0
 include/tiny_mce/plugins/advlink/js/advlink.js      |   0
 include/tiny_mce/plugins/advlink/langs/de_dlg.js    |   0
 include/tiny_mce/plugins/advlink/langs/en_dlg.js    |   0
 include/tiny_mce/plugins/advlink/link.htm           |   0
 include/tiny_mce/plugins/advlist/editor_plugin.js   |   0
 .../tiny_mce/plugins/advlist/editor_plugin_src.js   |   0
 .../tiny_mce/plugins/autoresize/editor_plugin.js    |   0
 .../plugins/autoresize/editor_plugin_src.js         |   0
 include/tiny_mce/plugins/autosave/editor_plugin.js  |   0
 .../tiny_mce/plugins/autosave/editor_plugin_src.js  |   0
 include/tiny_mce/plugins/autosave/langs/en.js       |   0
 include/tiny_mce/plugins/bbcode/editor_plugin.js    |   0
 .../tiny_mce/plugins/bbcode/editor_plugin_src.js    |   0
 .../tiny_mce/plugins/contextmenu/editor_plugin.js   |   0
 .../plugins/contextmenu/editor_plugin_src.js        |   0
 .../plugins/directionality/editor_plugin.js         |   0
 .../plugins/directionality/editor_plugin_src.js     |   0
 include/tiny_mce/plugins/emotions/editor_plugin.js  |   0
 .../tiny_mce/plugins/emotions/editor_plugin_src.js  |   0
 include/tiny_mce/plugins/emotions/emotions.htm      |   0
 .../tiny_mce/plugins/emotions/img/smiley-cool.gif   | Bin
 .../tiny_mce/plugins/emotions/img/smiley-cry.gif    | Bin
 .../plugins/emotions/img/smiley-embarassed.gif      | Bin
 .../plugins/emotions/img/smiley-foot-in-mouth.gif   | Bin
 .../tiny_mce/plugins/emotions/img/smiley-frown.gif  | Bin
 .../plugins/emotions/img/smiley-innocent.gif        | Bin
 .../tiny_mce/plugins/emotions/img/smiley-kiss.gif   | Bin
 .../plugins/emotions/img/smiley-laughing.gif        | Bin
 .../plugins/emotions/img/smiley-money-mouth.gif     | Bin
 .../tiny_mce/plugins/emotions/img/smiley-sealed.gif | Bin
 .../tiny_mce/plugins/emotions/img/smiley-smile.gif  | Bin
 .../plugins/emotions/img/smiley-surprised.gif       | Bin
 .../plugins/emotions/img/smiley-tongue-out.gif      | Bin
 .../plugins/emotions/img/smiley-undecided.gif       | Bin
 .../tiny_mce/plugins/emotions/img/smiley-wink.gif   | Bin
 .../tiny_mce/plugins/emotions/img/smiley-yell.gif   | Bin
 include/tiny_mce/plugins/emotions/js/emotions.js    |   0
 include/tiny_mce/plugins/emotions/langs/de_dlg.js   |   0
 include/tiny_mce/plugins/emotions/langs/en_dlg.js   |   0
 include/tiny_mce/plugins/example/dialog.htm         |   0
 include/tiny_mce/plugins/example/editor_plugin.js   |   0
 .../tiny_mce/plugins/example/editor_plugin_src.js   |   0
 include/tiny_mce/plugins/example/img/example.gif    | Bin
 include/tiny_mce/plugins/example/js/dialog.js       |   0
 include/tiny_mce/plugins/example/langs/en.js        |   0
 include/tiny_mce/plugins/example/langs/en_dlg.js    |   0
 include/tiny_mce/plugins/fullpage/css/fullpage.css  |   0
 include/tiny_mce/plugins/fullpage/editor_plugin.js  |   0
 .../tiny_mce/plugins/fullpage/editor_plugin_src.js  |   0
 include/tiny_mce/plugins/fullpage/fullpage.htm      |   0
 include/tiny_mce/plugins/fullpage/js/fullpage.js    |   0
 include/tiny_mce/plugins/fullpage/langs/de_dlg.js   |   0
 include/tiny_mce/plugins/fullpage/langs/en_dlg.js   |   0
 .../tiny_mce/plugins/fullscreen/editor_plugin.js    |   0
 .../plugins/fullscreen/editor_plugin_src.js         |   0
 include/tiny_mce/plugins/fullscreen/fullscreen.htm  |   0
 include/tiny_mce/plugins/iespell/editor_plugin.js   |   0
 .../tiny_mce/plugins/iespell/editor_plugin_src.js   |   0
 .../tiny_mce/plugins/inlinepopups/editor_plugin.js  |   0
 .../plugins/inlinepopups/editor_plugin_src.js       |   0
 .../inlinepopups/skins/clearlooks2/img/alert.gif    | Bin
 .../inlinepopups/skins/clearlooks2/img/button.gif   | Bin
 .../inlinepopups/skins/clearlooks2/img/buttons.gif  | Bin
 .../inlinepopups/skins/clearlooks2/img/confirm.gif  | Bin
 .../inlinepopups/skins/clearlooks2/img/corners.gif  | Bin
 .../skins/clearlooks2/img/horizontal.gif            | Bin
 .../inlinepopups/skins/clearlooks2/img/vertical.gif | Bin
 .../inlinepopups/skins/clearlooks2/window.css       |   0
 include/tiny_mce/plugins/inlinepopups/template.htm  |   0
 .../plugins/insertdatetime/editor_plugin.js         |   0
 .../plugins/insertdatetime/editor_plugin_src.js     |   0
 include/tiny_mce/plugins/layer/editor_plugin.js     |   0
 include/tiny_mce/plugins/layer/editor_plugin_src.js |   0
 .../tiny_mce/plugins/legacyoutput/editor_plugin.js  |   0
 .../plugins/legacyoutput/editor_plugin_src.js       |   0
 include/tiny_mce/plugins/media/css/media.css        |   0
 include/tiny_mce/plugins/media/editor_plugin.js     |   0
 include/tiny_mce/plugins/media/editor_plugin_src.js |   0
 include/tiny_mce/plugins/media/js/embed.js          |   0
 include/tiny_mce/plugins/media/js/media.js          |   0
 include/tiny_mce/plugins/media/langs/de_dlg.js      |   0
 include/tiny_mce/plugins/media/langs/en_dlg.js      |   0
 include/tiny_mce/plugins/media/media.htm            |   0
 include/tiny_mce/plugins/media/moxieplayer.swf      | Bin
 .../tiny_mce/plugins/nonbreaking/editor_plugin.js   |   0
 .../plugins/nonbreaking/editor_plugin_src.js        |   0
 .../tiny_mce/plugins/noneditable/editor_plugin.js   |   0
 .../plugins/noneditable/editor_plugin_src.js        |   0
 include/tiny_mce/plugins/pagebreak/editor_plugin.js |   0
 .../tiny_mce/plugins/pagebreak/editor_plugin_src.js |   0
 include/tiny_mce/plugins/paste/editor_plugin.js     |   0
 include/tiny_mce/plugins/paste/editor_plugin_src.js |   0
 include/tiny_mce/plugins/paste/js/pastetext.js      |   0
 include/tiny_mce/plugins/paste/js/pasteword.js      |   0
 include/tiny_mce/plugins/paste/langs/de_dlg.js      |   0
 include/tiny_mce/plugins/paste/langs/en_dlg.js      |   0
 include/tiny_mce/plugins/paste/pastetext.htm        |   0
 include/tiny_mce/plugins/paste/pasteword.htm        |   0
 include/tiny_mce/plugins/preview/editor_plugin.js   |   0
 .../tiny_mce/plugins/preview/editor_plugin_src.js   |   0
 include/tiny_mce/plugins/preview/example.html       |   0
 include/tiny_mce/plugins/preview/jscripts/embed.js  |   0
 include/tiny_mce/plugins/preview/preview.html       |   0
 include/tiny_mce/plugins/print/editor_plugin.js     |   0
 include/tiny_mce/plugins/print/editor_plugin_src.js |   0
 include/tiny_mce/plugins/save/editor_plugin.js      |   0
 include/tiny_mce/plugins/save/editor_plugin_src.js  |   0
 .../plugins/searchreplace/css/searchreplace.css     |   0
 .../tiny_mce/plugins/searchreplace/editor_plugin.js |   0
 .../plugins/searchreplace/editor_plugin_src.js      |   0
 .../plugins/searchreplace/js/searchreplace.js       |   0
 .../tiny_mce/plugins/searchreplace/langs/de_dlg.js  |   0
 .../tiny_mce/plugins/searchreplace/langs/en_dlg.js  |   0
 .../plugins/searchreplace/searchreplace.htm         |   0
 .../tiny_mce/plugins/spellchecker/css/content.css   |   0
 .../tiny_mce/plugins/spellchecker/editor_plugin.js  |   0
 .../plugins/spellchecker/editor_plugin_src.js       |   0
 include/tiny_mce/plugins/spellchecker/img/wline.gif | Bin
 include/tiny_mce/plugins/style/css/props.css        |   0
 include/tiny_mce/plugins/style/editor_plugin.js     |   0
 include/tiny_mce/plugins/style/editor_plugin_src.js |   0
 include/tiny_mce/plugins/style/js/props.js          |   0
 include/tiny_mce/plugins/style/langs/de_dlg.js      |   0
 include/tiny_mce/plugins/style/langs/en_dlg.js      |   0
 include/tiny_mce/plugins/style/props.htm            |   0
 include/tiny_mce/plugins/tabfocus/editor_plugin.js  |   0
 .../tiny_mce/plugins/tabfocus/editor_plugin_src.js  |   0
 include/tiny_mce/plugins/table/cell.htm             |   0
 include/tiny_mce/plugins/table/css/cell.css         |   0
 include/tiny_mce/plugins/table/css/row.css          |   0
 include/tiny_mce/plugins/table/css/table.css        |   0
 include/tiny_mce/plugins/table/editor_plugin.js     |   0
 include/tiny_mce/plugins/table/editor_plugin_src.js |   0
 include/tiny_mce/plugins/table/js/cell.js           |   0
 include/tiny_mce/plugins/table/js/merge_cells.js    |   0
 include/tiny_mce/plugins/table/js/row.js            |   0
 include/tiny_mce/plugins/table/js/table.js          |   0
 include/tiny_mce/plugins/table/langs/de_dlg.js      |   0
 include/tiny_mce/plugins/table/langs/en_dlg.js      |   0
 include/tiny_mce/plugins/table/merge_cells.htm      |   0
 include/tiny_mce/plugins/table/row.htm              |   0
 include/tiny_mce/plugins/table/table.htm            |   0
 include/tiny_mce/plugins/template/blank.htm         |   0
 include/tiny_mce/plugins/template/css/template.css  |   0
 include/tiny_mce/plugins/template/editor_plugin.js  |   0
 .../tiny_mce/plugins/template/editor_plugin_src.js  |   0
 include/tiny_mce/plugins/template/js/template.js    |   0
 include/tiny_mce/plugins/template/langs/de_dlg.js   |   0
 include/tiny_mce/plugins/template/langs/en_dlg.js   |   0
 include/tiny_mce/plugins/template/template.htm      |   0
 .../tiny_mce/plugins/visualchars/editor_plugin.js   |   0
 .../plugins/visualchars/editor_plugin_src.js        |   0
 include/tiny_mce/plugins/wordc/langs/de_dlg.js      |   0
 include/tiny_mce/plugins/wordc/langs/en_dlg.js      |   0
 include/tiny_mce/plugins/wordcount/editor_plugin.js |   0
 .../tiny_mce/plugins/wordcount/editor_plugin_src.js |   0
 include/tiny_mce/plugins/xhtmlxtras/abbr.htm        |   0
 include/tiny_mce/plugins/xhtmlxtras/acronym.htm     |   0
 include/tiny_mce/plugins/xhtmlxtras/attributes.htm  |   0
 include/tiny_mce/plugins/xhtmlxtras/cite.htm        |   0
 .../tiny_mce/plugins/xhtmlxtras/css/attributes.css  |   0
 include/tiny_mce/plugins/xhtmlxtras/css/popup.css   |   0
 include/tiny_mce/plugins/xhtmlxtras/del.htm         |   0
 .../tiny_mce/plugins/xhtmlxtras/editor_plugin.js    |   0
 .../plugins/xhtmlxtras/editor_plugin_src.js         |   0
 include/tiny_mce/plugins/xhtmlxtras/ins.htm         |   0
 include/tiny_mce/plugins/xhtmlxtras/js/abbr.js      |   0
 include/tiny_mce/plugins/xhtmlxtras/js/acronym.js   |   0
 .../tiny_mce/plugins/xhtmlxtras/js/attributes.js    |   0
 include/tiny_mce/plugins/xhtmlxtras/js/cite.js      |   0
 include/tiny_mce/plugins/xhtmlxtras/js/del.js       |   0
 .../plugins/xhtmlxtras/js/element_common.js         |   0
 include/tiny_mce/plugins/xhtmlxtras/js/ins.js       |   0
 include/tiny_mce/plugins/xhtmlxtras/langs/de_dlg.js |   0
 include/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js |   0
 include/tiny_mce/themes/advanced/about.htm          |   0
 include/tiny_mce/themes/advanced/anchor.htm         |   0
 include/tiny_mce/themes/advanced/charmap.htm        |   0
 include/tiny_mce/themes/advanced/color_picker.htm   |   0
 include/tiny_mce/themes/advanced/editor_template.js |   0
 .../tiny_mce/themes/advanced/editor_template_src.js |   0
 include/tiny_mce/themes/advanced/image.htm          |   0
 .../tiny_mce/themes/advanced/img/colorpicker.jpg    | Bin
 include/tiny_mce/themes/advanced/img/flash.gif      | Bin
 include/tiny_mce/themes/advanced/img/icons.gif      | Bin
 include/tiny_mce/themes/advanced/img/iframe.gif     | Bin
 include/tiny_mce/themes/advanced/img/pagebreak.gif  | Bin
 include/tiny_mce/themes/advanced/img/quicktime.gif  | Bin
 include/tiny_mce/themes/advanced/img/realmedia.gif  | Bin
 include/tiny_mce/themes/advanced/img/shockwave.gif  | Bin
 include/tiny_mce/themes/advanced/img/trans.gif      | Bin
 include/tiny_mce/themes/advanced/img/video.gif      | Bin
 .../tiny_mce/themes/advanced/img/windowsmedia.gif   | Bin
 include/tiny_mce/themes/advanced/js/about.js        |   0
 include/tiny_mce/themes/advanced/js/anchor.js       |   0
 include/tiny_mce/themes/advanced/js/charmap.js      |   0
 include/tiny_mce/themes/advanced/js/color_picker.js |   0
 include/tiny_mce/themes/advanced/js/image.js        |   0
 include/tiny_mce/themes/advanced/js/link.js         |   0
 .../tiny_mce/themes/advanced/js/source_editor.js    |   0
 include/tiny_mce/themes/advanced/langs/de.js        |   0
 include/tiny_mce/themes/advanced/langs/de_dlg.js    |   0
 include/tiny_mce/themes/advanced/langs/en.js        |   0
 include/tiny_mce/themes/advanced/langs/en_dlg.js    |   0
 include/tiny_mce/themes/advanced/link.htm           |   0
 include/tiny_mce/themes/advanced/shortcuts.htm      |   0
 .../themes/advanced/skins/default/content.css       |   0
 .../themes/advanced/skins/default/dialog.css        |   0
 .../themes/advanced/skins/default/img/buttons.png   | Bin
 .../themes/advanced/skins/default/img/items.gif     | Bin
 .../advanced/skins/default/img/menu_arrow.gif       | Bin
 .../advanced/skins/default/img/menu_check.gif       | Bin
 .../themes/advanced/skins/default/img/progress.gif  | Bin
 .../themes/advanced/skins/default/img/tabs.gif      | Bin
 .../tiny_mce/themes/advanced/skins/default/ui.css   |   0
 .../themes/advanced/skins/highcontrast/content.css  |   0
 .../themes/advanced/skins/highcontrast/dialog.css   |   0
 .../themes/advanced/skins/highcontrast/ui.css       |   0
 .../tiny_mce/themes/advanced/skins/o2k7/content.css |   0
 .../tiny_mce/themes/advanced/skins/o2k7/dialog.css  |   0
 .../themes/advanced/skins/o2k7/img/button_bg.png    | Bin
 .../advanced/skins/o2k7/img/button_bg_black.png     | Bin
 .../advanced/skins/o2k7/img/button_bg_silver.png    | Bin
 include/tiny_mce/themes/advanced/skins/o2k7/ui.css  |   0
 .../themes/advanced/skins/o2k7/ui_black.css         |   0
 .../themes/advanced/skins/o2k7/ui_silver.css        |   0
 include/tiny_mce/themes/advanced/source_editor.htm  |   0
 include/tiny_mce/themes/simple/editor_template.js   |   0
 .../tiny_mce/themes/simple/editor_template_src.js   |   0
 include/tiny_mce/themes/simple/img/icons.gif        | Bin
 include/tiny_mce/themes/simple/langs/de.js          |   0
 include/tiny_mce/themes/simple/langs/en.js          |   0
 .../themes/simple/skins/default/content.css         |   0
 include/tiny_mce/themes/simple/skins/default/ui.css |   0
 .../tiny_mce/themes/simple/skins/o2k7/content.css   |   0
 .../themes/simple/skins/o2k7/img/button_bg.png      | Bin
 include/tiny_mce/themes/simple/skins/o2k7/ui.css    |   0
 include/tiny_mce/tiny_mce.js                        |   0
 include/tiny_mce/tiny_mce_popup.js                  |   0
 include/tiny_mce/tiny_mce_src.js                    |   0
 include/tiny_mce/utils/editable_selects.js          |   0
 include/tiny_mce/utils/form_utils.js                |   0
 include/tiny_mce/utils/mctabs.js                    |   0
 include/tiny_mce/utils/validate.js                  |   0
 include/tw/abgabe_lektor_benotung.php               |   0
 include/tw/cis_menu_lv.inc.php                      |   0
 include/tw/fas_zusatzmenues.inc.php                 |   0
 include/tw/fas_zusatzmenues.js.php                  |   0
 include/tw/generateZahlungsreferenz.inc.php         |   0
 include/tw/generatematrikelnr.inc.php               |   0
 include/tw/generateuid.inc.php                      |   0
 include/tw/index.html                               |   0
 include/tw/passwort.inc.php                         |   0
 include/tw/serviceterminal.inc.php                  |   0
 include/tw/vilesci_menu_main.inc.php                |   0
 include/tw/wawi_menu_main.inc.php                   |   0
 include/udf.class.php                               |   0
 include/uebung.class.php                            |   0
 include/variable.class.php                          |   0
 .../vendor_custom/angular-tablesorter/tablesort.css |   0
 include/vendor_custom/easyui/easyui.css             |   0
 include/vendor_custom/easyui/icon.css               |   0
 .../vendor_custom/jquery-tablesorter/tablesort.css  |   0
 include/vertrag.class.php                           |   0
 include/vorlage.class.php                           |   0
 include/vorschlag.class.php                         |   0
 include/wawi_aufteilung.class.php                   |   0
 include/wawi_bestelldetail.class.php                |   0
 include/wawi_bestellstatus.class.php                |   0
 include/wawi_bestellung.class.php                   |   0
 include/wawi_konto.class.php                        |   0
 include/wawi_kostenstelle.class.php                 |   0
 include/wawi_rechnung.class.php                     |   0
 include/wawi_zahlungstyp.class.php                  |   0
 include/webservicelog.class.php                     |   0
 include/webservicerecht.class.php                   |   0
 include/wochenplan.class.php                        |   0
 include/xmlrpcutils/utils.php                       |   0
 include/xsdformprinter/config.inc.php               |   0
 include/xsdformprinter/examples/shiporder.xml       |   0
 include/xsdformprinter/examples/shiporder1.xsd      |   0
 include/xsdformprinter/examples/shiporder2.xsd      |   0
 include/xsdformprinter/style.css                    |   0
 include/xsdformprinter/types.php                    |   0
 include/xsdformprinter/xfp.php                      |   0
 include/xsdformprinter/xsdformprinter.php           |   0
 include/zeitaufzeichnung.class.php                  |   0
 include/zeitaufzeichnung_gd.class.php               |   0
 include/zeitaufzeichnung_import.class.php           |   0
 include/zeitaufzeichnung_import_csv.class.php       |   0
 include/zeitaufzeichnung_import_post.class.php      |   0
 include/zeitsperre.class.php                        |   0
 include/zeitwunsch.class.php                        |   0
 include/zeitwunsch_gueltigkeit.class.php            |   0
 include/zeugnisnote.class.php                       |   0
 include/zgv.class.php                               |   0
 include/zweck.class.php                             |   0
 index.ci.php                                        |   0
 index.cis.html                                      |   0
 index.vilesci.php                                   |   0
 locale/contents.rdf                                 |   0
 locale/de-AT/abgabetool.php                         |   0
 locale/de-AT/anwesenheitsliste.php                  |   0
 locale/de-AT/benotungstool.php                      |   0
 locale/de-AT/buchungen.php                          |   0
 locale/de-AT/contents.rdf                           |   0
 locale/de-AT/coodle.php                             |   0
 locale/de-AT/courseInformation.php                  |   0
 locale/de-AT/dms_link.php                           |   0
 locale/de-AT/errors.php                             |   0
 locale/de-AT/eventkalender.php                      |   0
 locale/de-AT/fas.dtd                                |   0
 locale/de-AT/feedback.php                           |   0
 locale/de-AT/freebusy.php                           |   0
 locale/de-AT/freifach.php                           |   0
 locale/de-AT/gesamtnote.php                         |   0
 locale/de-AT/global.php                             |   0
 locale/de-AT/incoming.php                           |   0
 locale/de-AT/ktu.php                                |   0
 locale/de-AT/lehre.php                              |   0
 locale/de-AT/lehrveranstaltung.php                  |   0
 locale/de-AT/lvaliste.php                           |   0
 locale/de-AT/lvinfo.php                             |   0
 locale/de-AT/lvplan.php                             |   0
 locale/de-AT/mail.php                               |   0
 locale/de-AT/mailverteiler.php                      |   0
 locale/de-AT/menu.php                               |   0
 locale/de-AT/news.php                               |   0
 locale/de-AT/notebookregister.php                   |   0
 locale/de-AT/notfallbestimmungen.php                |   0
 locale/de-AT/passwort.php                           |   0
 locale/de-AT/personensuche.php                      |   0
 locale/de-AT/planner.dtd                            |   0
 locale/de-AT/profil.php                             |   0
 locale/de-AT/pruefung.php                           |   0
 locale/de-AT/reihungstest.php                       |   0
 locale/de-AT/semesterplan.php                       |   0
 locale/de-AT/services.php                           |   0
 locale/de-AT/studienplan.php                        |   0
 locale/de-AT/studierendenantrag.php                 |   0
 locale/de-AT/telefonverzeichnis.php                 |   0
 locale/de-AT/tempus.dtd                             |   0
 locale/de-AT/testtool.php                           |   0
 locale/de-AT/tools.php                              |   0
 locale/de-AT/upload.php                             |   0
 locale/de-AT/urlaubstool.php                        |   0
 locale/de-AT/zeitaufzeichnung.php                   |   0
 locale/de-AT/zeitsperre.php                         |   0
 locale/de-AT/zeitwunsch.php                         |   0
 locale/de-SFU/contents.rdf                          |   0
 locale/de-SFU/fas.dtd                               |   0
 locale/de-SFU/planner.dtd                           |   0
 locale/de-SFU/tempus.dtd                            |   0
 locale/en-US/abgabetool.php                         |   0
 locale/en-US/anwesenheitsliste.php                  |   0
 locale/en-US/benotungstool.php                      |   0
 locale/en-US/contents.rdf                           |   0
 locale/en-US/coodle.php                             |   0
 locale/en-US/courseInformation.php                  |   0
 locale/en-US/dms_link.php                           |   0
 locale/en-US/errors.php                             |   0
 locale/en-US/eventkalender.php                      |   0
 locale/en-US/feedback.php                           |   0
 locale/en-US/freebusy.php                           |   0
 locale/en-US/freifach.php                           |   0
 locale/en-US/gesamtnote.php                         |   0
 locale/en-US/global.php                             |   0
 locale/en-US/incoming.php                           |   0
 locale/en-US/lehre.php                              |   0
 locale/en-US/lvaliste.php                           |   0
 locale/en-US/lvinfo.php                             |   0
 locale/en-US/lvplan.php                             |   0
 locale/en-US/mail.php                               |   0
 locale/en-US/mailverteiler.php                      |   0
 locale/en-US/menu.php                               |   0
 locale/en-US/news.php                               |   0
 locale/en-US/notebookregister.php                   |   0
 locale/en-US/notfallbestimmungen.php                |   0
 locale/en-US/passwort.php                           |   0
 locale/en-US/personensuche.php                      |   0
 locale/en-US/profil.php                             |   0
 locale/en-US/pruefung.php                           |   0
 locale/en-US/reihungstest.php                       |   0
 locale/en-US/semesterplan.php                       |   0
 locale/en-US/services.php                           |   0
 locale/en-US/studierendenantrag.php                 |   0
 locale/en-US/telefonverzeichnis.php                 |   0
 locale/en-US/tempus.dtd                             |   0
 locale/en-US/testtool.php                           |   0
 locale/en-US/tools.php                              |   0
 locale/en-US/upload.php                             |   0
 locale/en-US/urlaubstool.php                        |   0
 locale/en-US/zeitaufzeichnung.php                   |   0
 locale/en-US/zeitsperre.php                         |   0
 locale/en-US/zeitwunsch.php                         |   0
 locale/it-IT/abgabetool.php                         |   0
 locale/it-IT/anwesenheitsliste.php                  |   0
 locale/it-IT/benotungstool.php                      |   0
 locale/it-IT/buchungen.php                          |   0
 locale/it-IT/coodle.php                             |   0
 locale/it-IT/courseInformation.php                  |   0
 locale/it-IT/dms_link.php                           |   0
 locale/it-IT/errors.php                             |   0
 locale/it-IT/eventkalender.php                      |   0
 locale/it-IT/feedback.php                           |   0
 locale/it-IT/freebusy.php                           |   0
 locale/it-IT/freifach.php                           |   0
 locale/it-IT/gesamtnote.php                         |   0
 locale/it-IT/global.php                             |   0
 locale/it-IT/incoming.php                           |   0
 locale/it-IT/lehre.php                              |   0
 locale/it-IT/lvaliste.php                           |   0
 locale/it-IT/lvinfo.php                             |   0
 locale/it-IT/lvplan.php                             |   0
 locale/it-IT/mail.php                               |   0
 locale/it-IT/mailverteiler.php                      |   0
 locale/it-IT/menu.php                               |   0
 locale/it-IT/news.php                               |   0
 locale/it-IT/notebookregister.php                   |   0
 locale/it-IT/notfallbestimmungen.php                |   0
 locale/it-IT/passwort.php                           |   0
 locale/it-IT/personensuche.php                      |   0
 locale/it-IT/profil.php                             |   0
 locale/it-IT/pruefung.php                           |   0
 locale/it-IT/semesterplan.php                       |   0
 locale/it-IT/services.php                           |   0
 locale/it-IT/studienplan.php                        |   0
 locale/it-IT/telefonverzeichnis.php                 |   0
 locale/it-IT/testtool.php                           |   0
 locale/it-IT/tools.php                              |   0
 locale/it-IT/upload.php                             |   0
 locale/it-IT/urlaubstool.php                        |   0
 locale/it-IT/zeitaufzeichnung.php                   |   0
 locale/it-IT/zeitsperre.php                         |   0
 locale/it-IT/zeitwunsch.php                         |   0
 public/css/AjaxLib.css                              |   0
 public/css/Cis4/Cis.css                             |   0
 public/css/Cis4/Cms.css                             |   0
 public/css/Cis4/Legacy.css                          |   0
 public/css/DialogLib.css                            |   0
 public/css/Fhc.css                                  |   0
 public/css/FilterWidget.css                         |   0
 public/css/Login.css                                |   0
 public/css/NavigationWidget.css                     |   0
 public/css/Tabulator.css                            |   0
 public/css/Tabulator5.css                           |   0
 public/css/TinyMCE5.css                             |   0
 public/css/Widgets.css                              |   0
 public/css/cis4.css                                 |   0
 public/css/cis_bs5.css                              |   0
 public/css/codex/oehbeitrag.css                     |   0
 public/css/codex/uhstat1.css                        |   0
 public/css/components/FilterComponent.css           |   0
 public/css/components/FormUnderline.css             |   0
 public/css/components/NavigationComponent.css       |   0
 public/css/components/Profil.css                    |   0
 public/css/components/calendar.css                  |   0
 public/css/components/dashboard.css                 |   0
 public/css/components/searchbar/searchbar.css       |   0
 public/css/components/verticalsplit.css             |   0
 public/css/fhcomplete.css                           |   0
 public/css/infocenter/infocenterDetails.css         |   0
 public/css/infocenter/infocenterPersonDataset.css   |   0
 public/css/issues/issuesDataset.css                 |   0
 public/css/issues/issuesKonfiguration.css           |   0
 public/css/issues/issuesZustaendigkeiten.css        |   0
 public/css/lehre/anrechnung.css                     |   0
 public/css/lehre/pruefungsprotokoll.css             |   0
 public/css/messaging/message.css                    |   0
 public/css/sbadmin2/admintemplate.css               |   0
 public/css/sbadmin2/admintemplate_contentonly.css   |   0
 public/css/sbadmin2/tablesort_bootstrap.css         |   0
 public/css/tools/auswertung_fhtw.css                |   0
 public/css/tools/gradelist.css                      |   0
 public/extensions/.placeholder                      |   0
 public/images/icons/fa-user-check.png               | Bin
 public/images/icons/fa-user-clock.png               | Bin
 public/images/icons/fa-user-cog.png                 | Bin
 public/images/icons/fa-user-edit.png                | Bin
 public/images/icons/fa-user-graduate.png            | Bin
 public/images/icons/fa-user-lock.png                | Bin
 public/images/icons/fa-user-minus.png               | Bin
 public/images/icons/fa-user-ninja.png               | Bin
 public/images/icons/fa-user-tag.png                 | Bin
 public/images/icons/fa-user-times.png               | Bin
 public/images/icons/fa-users-cog.png                | Bin
 public/images/loader.gif                            | Bin
 public/images/logo-300x160.png                      | Bin
 public/js/AjaxLib.js                                |   0
 public/js/DialogLib.js                              |   0
 public/js/FilterWidget.js                           |   0
 public/js/Login.js                                  |   0
 public/js/NavigationWidget.js                       |   0
 public/js/PhrasesLib.js                             |   0
 public/js/RESTClient.js                             |   0
 public/js/TableWidget.js                            |   0
 public/js/UDFWidget.js                              |   0
 public/js/api/profil.js                             |   0
 public/js/apps/Cis.js                               |   0
 public/js/apps/Cis/Cms.js                           |   0
 public/js/apps/Cis/Documents.js                     |   0
 public/js/apps/Cis/MyLv/Student.js                  |   0
 public/js/apps/Cis/Profil.js                        |   0
 public/js/apps/Cis/ProfilUpdateRequests.js          |   0
 public/js/apps/Cis/Stundenplan.js                   |   0
 public/js/apps/Dashboard.js                         |   0
 public/js/apps/Dashboard/Admin.js                   |   0
 public/js/apps/Dashboard/Fhc.js                     |   0
 public/js/apps/DashboardAdmin.js                    |   0
 public/js/apps/LogsViewer/LogsViewer.js             |   0
 public/js/apps/LogsViewer/TabulatorSetup.js         |   0
 public/js/apps/TestSearch.js                        |   0
 public/js/apps/api/dummyapi.php                     |   0
 public/js/apps/api/fhcapifactory.js                 |   0
 public/js/apps/api/search.js                        |   0
 public/js/apps/lehre/Antrag.js                      |   0
 public/js/apps/lehre/Antrag/Leitung.js              |   0
 public/js/apps/lehre/Antrag/Lvzuweisung.js          |   0
 public/js/apps/lehre/Antrag/Student.js              |   0
 public/js/bootstrapper.js                           |   0
 public/js/codex/oehbeitrag.js                       |   0
 public/js/codex/uhstat1.js                          |   0
 public/js/components/Base/Modal.js                  |   0
 public/js/components/Base/Offcanvas.js              |   0
 public/js/components/Bootstrap/Alert.js             |   0
 public/js/components/Bootstrap/Confirm.js           |   0
 public/js/components/Bootstrap/Modal.js             |   0
 public/js/components/Bootstrap/Prompt.js            |   0
 public/js/components/Calendar/Abstract.js           |   0
 public/js/components/Calendar/Calendar.js           |   0
 public/js/components/Calendar/Header.js             |   0
 public/js/components/Calendar/Minimized.js          |   0
 public/js/components/Calendar/Month.js              |   0
 public/js/components/Calendar/Month/Page.js         |   0
 public/js/components/Calendar/Months.js             |   0
 public/js/components/Calendar/Pane.js               |   0
 public/js/components/Calendar/Week.js               |   0
 public/js/components/Calendar/Week/Page.js          |   0
 public/js/components/Calendar/Weeks.js              |   0
 public/js/components/Calendar/Years.js              |   0
 public/js/components/Calendar/Years/Page.js         |   0
 public/js/components/Cis/Menu.js                    |   0
 public/js/components/Cis/Menu/Entry.js              |   0
 public/js/components/Cis/Mylv/Semester.js           |   0
 .../js/components/Cis/Mylv/Semester/Studiengang.js  |   0
 .../components/Cis/Mylv/Semester/Studiengang/Lv.js  |   0
 .../Cis/Mylv/Semester/Studiengang/Lv/Info.js        |   0
 .../Cis/Mylv/Semester/Studiengang/Lv/Pruefungen.js  |   0
 public/js/components/Cis/Mylv/Student.js            |   0
 .../js/components/Cis/Profil/MitarbeiterProfil.js   |   0
 .../components/Cis/Profil/MitarbeiterViewProfil.js  |   0
 .../Cis/Profil/ProfilComponents/Adresse.js          |   0
 .../Profil/ProfilComponents/FetchProfilUpdates.js   |   0
 .../Cis/Profil/ProfilComponents/FhAusweisStatus.js  |   0
 .../Cis/Profil/ProfilComponents/Kontakt.js          |   0
 .../Cis/Profil/ProfilComponents/Mailverteiler.js    |   0
 .../Cis/Profil/ProfilComponents/ProfilEmails.js     |   0
 .../Profil/ProfilComponents/ProfilInformation.js    |   0
 .../Cis/Profil/ProfilComponents/QuickLinks.js       |   0
 .../Cis/Profil/ProfilComponents/RoleInformation.js  |   0
 .../components/Cis/Profil/ProfilModal/EditProfil.js |   0
 .../ProfilModal/EditProfilComponents/EditAdresse.js |   0
 .../ProfilModal/EditProfilComponents/EditKontakt.js |   0
 .../ProfilModal/EditProfilComponents/Status.js      |   0
 .../Cis/Profil/ProfilModal/EditProfilSelect.js      |   0
 public/js/components/Cis/Profil/StudentProfil.js    |   0
 .../js/components/Cis/Profil/StudentViewProfil.js   |   0
 .../components/Cis/ProfilUpdate/AcceptDenyUpdate.js |   0
 public/js/components/Dashboard/Admin.js             |   0
 public/js/components/Dashboard/Admin/Edit.js        |   0
 public/js/components/Dashboard/Admin/Presets.js     |   0
 public/js/components/Dashboard/Admin/Widgets.js     |   0
 public/js/components/Dashboard/Dashboard.js         |   0
 public/js/components/Dashboard/Item.js              |   0
 public/js/components/Dashboard/Section.js           |   0
 public/js/components/Dashboard/Widget/Picker.js     |   0
 public/js/components/DashboardWidget/Abstract.js    |   0
 public/js/components/DashboardWidget/Ampel.js       |   0
 public/js/components/DashboardWidget/Default.js     |   0
 public/js/components/DashboardWidget/News.js        |   0
 public/js/components/DashboardWidget/Stundenplan.js |   0
 public/js/components/DashboardWidget/Url.js         |   0
 public/js/components/Drop/Grid.js                   |   0
 public/js/components/Drop/Grid/Item.js              |   0
 public/js/components/Fetch.js                       |   0
 public/js/components/Form/Form.js                   |   0
 public/js/components/Form/Input.js                  |   0
 public/js/components/Form/Upload/Dms.js             |   0
 public/js/components/Form/Upload/Image.js           |   0
 public/js/components/Form/Validation.js             |   0
 public/js/components/Loader.js                      |   0
 public/js/components/Studierendenantrag/Antrag.js   |   0
 .../components/Studierendenantrag/Form/Abmeldung.js |   0
 .../Studierendenantrag/Form/AbmeldungStgl.js        |   0
 .../Studierendenantrag/Form/Unterbrechung.js        |   0
 .../Studierendenantrag/Form/Wiederholung.js         |   0
 .../js/components/Studierendenantrag/Infoblock.js   |   0
 public/js/components/Studierendenantrag/Leitung.js  |   0
 .../Studierendenantrag/Leitung/Actions.js           |   0
 .../Studierendenantrag/Leitung/Actions/Columns.js   |   0
 .../Studierendenantrag/Leitung/Actions/New.js       |   0
 .../Studierendenantrag/Leitung/GrundPopup.js        |   0
 .../components/Studierendenantrag/Leitung/Header.js |   0
 .../Studierendenantrag/Leitung/LvPopup.js           |   0
 .../components/Studierendenantrag/Leitung/Table.js  |   0
 .../js/components/Studierendenantrag/Lvzuweisung.js |   0
 public/js/components/Studierendenantrag/Status.js   |   0
 public/js/components/filter/API.js                  |   0
 public/js/components/filter/Filter.js               |   0
 public/js/components/filter/Filter/Columns.js       |   0
 public/js/components/filter/Filter/Config.js        |   0
 public/js/components/filter/Table/Download.js       |   0
 public/js/components/navigation/API.js              |   0
 public/js/components/navigation/Navigation.js       |   0
 public/js/components/searchbar/action.js            |   0
 public/js/components/searchbar/actions.js           |   0
 public/js/components/searchbar/employee.js          |   0
 public/js/components/searchbar/organisationunit.js  |   0
 public/js/components/searchbar/person.js            |   0
 public/js/components/searchbar/raum.js              |   0
 public/js/components/searchbar/searchbar.js         |   0
 public/js/components/verticalsplit/verticalsplit.js |   0
 public/js/components/vueDatepicker.js.php           |   0
 public/js/composables/CalendarDate.js               |   0
 .../js/composables/Dashboard/CachedWidgetLoader.js  |   0
 public/js/composables/GridLogic.js                  |   0
 public/js/composables/ObjectUtils.js                |   0
 public/js/infocenter/docUeberpruefung.js            |   0
 public/js/infocenter/infocenterDetails.js           |   0
 public/js/infocenter/infocenterPersonDataset.js     |   0
 public/js/infocenter/messageList.js                 |   0
 public/js/infocenter/rueckstellung.js               |   0
 public/js/infocenter/stammdaten.js                  |   0
 public/js/infocenter/zgvUeberpruefung.js            |   0
 public/js/issues/issuesDataset.js                   |   0
 public/js/issues/issuesKonfiguration.js             |   0
 public/js/issues/issuesZustaendigkeiten.js          |   0
 public/js/issues/plausichecks.js                    |   0
 public/js/lehre/anrechnung/adminAnrechnung.js       |   0
 .../js/lehre/anrechnung/approveAnrechnungDetail.js  |   0
 .../lehre/anrechnung/approveAnrechnungUebersicht.js |   0
 public/js/lehre/anrechnung/createAnrechnung.js      |   0
 public/js/lehre/anrechnung/requestAnrechnung.js     |   0
 .../js/lehre/anrechnung/reviewAnrechnungDetail.js   |   0
 .../lehre/anrechnung/reviewAnrechnungUebersicht.js  |   0
 public/js/lehre/lehrauftrag/acceptLehrauftrag.js    |   0
 public/js/lehre/lehrauftrag/approveLehrauftrag.js   |   0
 public/js/lehre/lehrauftrag/orderLehrauftrag.js     |   0
 public/js/lehre/lvplanung/zverfueg.js               |   0
 public/js/lehre/pruefungsprotokoll.js               |   0
 public/js/messaging/fasMessageWrite.js              |   0
 public/js/messaging/messageWrite.js                 |   0
 public/js/messaging/messageWriteReply.js            |   0
 public/js/messaging/read.js                         |   0
 public/js/messaging/write.js                        |   0
 public/js/messaging/writeReply.js                   |   0
 public/js/mixins/Phrasen.js                         |   0
 public/js/person/benutzergruppe.js                  |   0
 public/js/pivottable/pivot.de.js                    |   0
 public/js/plugin/Phrasen.js                         |   0
 public/js/tablesort/tablesort.js                    |   0
 public/js/tabulator/filters/Dates.js                |   0
 public/media/.placeholder                           |   0
 rdf/AntragAbmeldung.xml.php                         |   0
 rdf/AntragAbmeldungStgl.xml.php                     |   0
 rdf/AntragUnterbrechung.xml.php                     |   0
 rdf/PHPRequest.txt                                  |   0
 rdf/abschlussbeurteilung.rdf.php                    |   0
 rdf/abschlusspruefung.rdf.php                       |   0
 rdf/abschlusspruefung_antritt.rdf.php               |   0
 rdf/accountinfoblatt.xml.php                        |   0
 rdf/adresse.rdf.php                                 |   0
 rdf/adressentyp.rdf.php                             |   0
 rdf/akadgrad.rdf.php                                |   0
 rdf/akte.rdf.php                                    |   0
 rdf/anrechnung.rdf.php                              |   0
 rdf/anrechnungbegruendung.rdf.php                   |   0
 rdf/anwesenheit.rdf.php                             |   0
 rdf/anwesenheitsliste.xml.php                       |   0
 rdf/anzahlAnwesenheitenStudenplan.rdf.php           |   0
 rdf/aufenthaltfoerderung.rdf.php                    |   0
 rdf/aufmerksamdurch.rdf.php                         |   0
 rdf/aufnahmeschluessel.rdf.php                      |   0
 rdf/aufnahmetermine.rdf.php                         |   0
 rdf/aufwandstyp.rdf.php                             |   0
 rdf/ausbildung.rdf.php                              |   0
 rdf/ausbildungsvertrag.xml.php                      |   0
 rdf/bankverbindung.rdf.php                          |   0
 rdf/benutzer.rdf.php                                |   0
 rdf/benutzerfunktion.rdf.php                        |   0
 rdf/berufstaetigkeit.rdf.php                        |   0
 rdf/beschaeftigungsart1.rdf.php                     |   0
 rdf/beschaeftigungsart2.rdf.php                     |   0
 rdf/beschaeftigungsausmass.rdf.php                  |   0
 rdf/besonderequalifikation.rdf.php                  |   0
 rdf/bestelldetail.rdf.php                           |   0
 rdf/bestellung.rdf.php                              |   0
 rdf/betreuerart.rdf.php                             |   0
 rdf/betriebsmittel.rdf.php                          |   0
 rdf/betriebsmittelperson.rdf.php                    |   0
 rdf/betriebsmitteltyp.rdf.php                       |   0
 rdf/bisfunktion.rdf.php                             |   0
 rdf/bisio.rdf.php                                   |   0
 rdf/bisstandort.rdf.php                             |   0
 rdf/bisverwendung.rdf.php                           |   0
 rdf/buchungstyp.rdf.php                             |   0
 rdf/diplomasupplement.xml.php                       |   0
 rdf/dms.rdf.php                                     |   0
 rdf/dokument.rdf.php                                |   0
 rdf/dokumentprestudent.rdf.php                      |   0
 rdf/dokumenttyp.rdf.php                             |   0
 rdf/entwicklungsteam.rdf.php                        |   0
 rdf/erfolgsnachweis.rdf.php                         |   0
 rdf/fachbereich.rdf.php                             |   0
 rdf/fachbereich_menue.rdf.php                       |   0
 rdf/firma.rdf.php                                   |   0
 rdf/funktion.rdf.php                                |   0
 rdf/gemeinde.rdf.php                                |   0
 rdf/geschlecht.rdf.php                              |   0
 rdf/gruppen.rdf.php                                 |   0
 rdf/gsprogramm.rdf.php                              |   0
 rdf/gsstudientyp.rdf.php                            |   0
 rdf/hauptberuf.rdf.php                              |   0
 rdf/index.html                                      |   0
 rdf/kontakt.rdf.php                                 |   0
 rdf/kontakttyp.rdf.php                              |   0
 rdf/konto.rdf.php                                   |   0
 rdf/ktu_abschlusszeugnis.rdf.php                    |   0
 rdf/ktu_honorarvertrag.xml.php                      |   0
 rdf/ktu_lvinfo.xml.php                              |   0
 rdf/learningagreement.rdf.php                       |   0
 rdf/learningagreement_outgoing.rdf.php              |   0
 rdf/lehrauftrag.xml.php                             |   0
 rdf/lehrauftrag_annehmen.xml.php                    |   0
 rdf/lehreinheit-lvplan.rdf.php                      |   0
 rdf/lehreinheit.rdf.php                             |   0
 rdf/lehreinheit_direkt.rdf.php                      |   0
 rdf/lehreinheitgruppe.rdf.php                       |   0
 rdf/lehreinheitmitarbeiter.rdf.php                  |   0
 rdf/lehrfach.rdf.php                                |   0
 rdf/lehrform.rdf.php                                |   0
 rdf/lehrfunktion.rdf.php                            |   0
 rdf/lehrstunde.rdf.php                              |   0
 rdf/lehrveranstaltung.rdf.php                       |   0
 rdf/lehrveranstaltung_einheiten.rdf.php             |   0
 rdf/lehrveranstaltung_studienplan.rdf.php           |   0
 rdf/lehrveranstaltungszeugnis.rdf.php               |   0
 rdf/lehrveranstaltungszeugnis_ktu.rdf.php           |   0
 rdf/lehrverbandsgruppe.rdf.php                      |   0
 rdf/lektoren.rdf.php                                |   0
 rdf/lvangebot.rdf.php                               |   0
 rdf/lvgesamtnote.rdf.php                            |   0
 rdf/lvinfo.rdf.php                                  |   0
 rdf/mantis.rdf.php                                  |   0
 rdf/mantis_categories.rdf.php                       |   0
 rdf/mantis_projects.rdf.php                         |   0
 rdf/messages.rdf.php                                |   0
 rdf/mitarbeiter.rdf.php                             |   0
 rdf/mobilitaet.rdf.php                              |   0
 rdf/mobilitaetsprogramm.rdf.php                     |   0
 rdf/mobilitaetstyp.rdf.php                          |   0
 rdf/nation.rdf.php                                  |   0
 rdf/note.rdf.php                                    |   0
 rdf/notiz.rdf.php                                   |   0
 rdf/organisationseinheit.rdf.php                    |   0
 rdf/organisationseinheit_menue.rdf.php              |   0
 rdf/ort.rdf.php                                     |   0
 rdf/orte.rdf.php                                    |   0
 rdf/person.rdf.php                                  |   0
 rdf/personal.rdf.php                                |   0
 rdf/prestudent.rdf.php                              |   0
 rdf/prestudenthistorie.rdf.php                      |   0
 rdf/prestudentrolle.rdf.php                         |   0
 rdf/projekt.rdf.php                                 |   0
 rdf/projektarbeit.rdf.php                           |   0
 rdf/projektbeschreibung.rdf.php                     |   0
 rdf/projektbetreuer.rdf.php                         |   0
 rdf/projektphase.rdf.php                            |   0
 rdf/projekttask.rdf.php                             |   0
 rdf/projekttyp.rdf.php                              |   0
 rdf/pruefung.rdf.php                                |   0
 rdf/pruefungstyp.rdf.php                            |   0
 rdf/raumtyp.rdf.php                                 |   0
 rdf/reihungstest.rdf.php                            |   0
 rdf/ressource.rdf.php                               |   0
 rdf/sammelzeugnis.rdf.php                           |   0
 rdf/sprache.rdf.php                                 |   0
 rdf/standort.rdf.php                                |   0
 rdf/status.rdf.php                                  |   0
 rdf/statusbericht.rdf.php                           |   0
 rdf/statusgrund.rdf.php                             |   0
 rdf/student.rdf.php                                 |   0
 rdf/studienblatt.xml.php                            |   0
 rdf/studienerfolg.rdf.php                           |   0
 rdf/studiengang.rdf.php                             |   0
 rdf/studienordnung.rdf.php                          |   0
 rdf/studienplan.rdf.php                             |   0
 rdf/studiensemester.rdf.php                         |   0
 rdf/stundenplan_betriebsmittel.rdf.php              |   0
 rdf/termine.rdf.php                                 |   0
 rdf/undo.rdf.php                                    |   0
 rdf/vertrag.rdf.php                                 |   0
 rdf/vertragdetails.rdf.php                          |   0
 rdf/vertragsstatus.rdf.php                          |   0
 rdf/vertragstyp.rdf.php                             |   0
 rdf/verwendung.rdf.php                              |   0
 rdf/vorlage.rdf.php                                 |   0
 rdf/wawi_buchung.rdf.php                            |   0
 rdf/wawi_buchungstyp.rdf.php                        |   0
 rdf/wawi_konto.rdf.php                              |   0
 rdf/wawi_kostenstelle.rdf.php                       |   0
 rdf/zertifikat.rdf.php                              |   0
 rdf/zeugnis.rdf.php                                 |   0
 rdf/zeugnisnote.rdf.php                             |   0
 rdf/zgv.rdf.php                                     |   0
 rdf/zgvdoktor.rdf.php                               |   0
 rdf/zgvmaster.rdf.php                               |   0
 rdf/zweck.rdf.php                                   |   0
 skin/cis.css                                        |   0
 skin/colorpicker.css                                |   0
 skin/croppie.css                                    |   0
 skin/fas.css                                        |   0
 skin/fhcomplete.css                                 |   0
 skin/fhcomplete_website.css                         |   0
 skin/flexcrollstyles.css                            |   0
 skin/images/CIS.ico                                 | Bin
 skin/images/Calculator.png                          | Bin
 skin/images/Chart.svg                               |   0
 skin/images/DeleteIcon.png                          | Bin
 skin/images/ExcelIcon.png                           | Bin
 skin/images/FAS.ico                                 | Bin
 skin/images/Filter.svg                              |   0
 skin/images/Graphs_clip_art.svg                     |   0
 skin/images/NeuDokument.png                         | Bin
 skin/images/Report.svg                              |   0
 skin/images/Statistik.svg                           |   0
 skin/images/TWLogo_klein.gif                        | Bin
 skin/images/TWLogo_klein.jpg                        | Bin
 skin/images/Tempus.ico                              | Bin
 skin/images/Vilesci.ico                             | Bin
 skin/images/Wawi.ico                                | Bin
 skin/images/addKonto.png                            | Bin
 skin/images/ampel_gelb.png                          | Bin
 skin/images/ampel_gruen.png                         | Bin
 skin/images/ampel_rot.png                           | Bin
 skin/images/anmelden.png                            | Bin
 skin/images/application_form_delete.png             | Bin
 skin/images/application_form_edit.png               | Bin
 skin/images/application_go.png                      | Bin
 skin/images/application_home.png                    | Bin
 skin/images/arbeitspaket.png                        | Bin
 skin/images/arrow-next.png                          | Bin
 skin/images/arrow-previous.png                      | Bin
 skin/images/arrow-single-down-green.png             | Bin
 skin/images/arrow-single-up-green.png               | Bin
 skin/images/arrow_down.png                          | Bin
 skin/images/asc.gif                                 | Bin
 skin/images/bg.gif                                  | Bin
 skin/images/bg_.gif                                 | Bin
 skin/images/bg_sort.gif                             | Bin
 skin/images/blank.gif                               | Bin
 skin/images/bold.png                                | Bin
 skin/images/bullet_arrow_down.png                   | Bin
 skin/images/bullet_arrow_right.png                  | Bin
 skin/images/bullet_go.png                           | Bin
 skin/images/bullet_green.png                        | Bin
 skin/images/bullet_red.png                          | Bin
 skin/images/button_admin.png                        | Bin
 skin/images/button_download.png                     | Bin
 skin/images/button_endnote.png                      | Bin
 skin/images/button_esnack.png                       | Bin
 skin/images/button_feedback.png                     | Bin
 skin/images/button_kreuzerltool.png                 | Bin
 skin/images/button_listen.png                       | Bin
 skin/images/button_lvinfo.png                       | Bin
 skin/images/button_lvplan.png                       | Bin
 skin/images/button_mail.gif                         | Bin
 skin/images/button_moodle.png                       | Bin
 skin/images/button_newsgroups.png                   | Bin
 skin/images/button_opus.png                         | Bin
 skin/images/button_pinboard.png                     | Bin
 skin/images/button_semplan.png                      | Bin
 skin/images/button_studiupload.png                  | Bin
 skin/images/cbox-check.gif                          | Bin
 skin/images/changed.png                             | Bin
 skin/images/check_black.png                         | Bin
 skin/images/checkbox_toggle.png                     | Bin
 skin/images/checkbox_uncheck.png                    | Bin
 skin/images/cis_logo.png                            | Bin
 skin/images/cis_logo_400px.png                      | Bin
 skin/images/cis_logo_weiss.png                      | Bin
 skin/images/clock_down.png                          | Bin
 skin/images/clock_up.png                            | Bin
 skin/images/colorpicker/blank.gif                   | Bin
 skin/images/colorpicker/colorpicker_background.png  | Bin
 skin/images/colorpicker/colorpicker_hex.png         | Bin
 skin/images/colorpicker/colorpicker_hsb_b.png       | Bin
 skin/images/colorpicker/colorpicker_hsb_h.png       | Bin
 skin/images/colorpicker/colorpicker_hsb_s.png       | Bin
 skin/images/colorpicker/colorpicker_indic.gif       | Bin
 skin/images/colorpicker/colorpicker_overlay.png     | Bin
 skin/images/colorpicker/colorpicker_rgb_b.png       | Bin
 skin/images/colorpicker/colorpicker_rgb_g.png       | Bin
 skin/images/colorpicker/colorpicker_rgb_r.png       | Bin
 skin/images/colorpicker/colorpicker_select.gif      | Bin
 skin/images/colorpicker/colorpicker_submit.png      | Bin
 skin/images/colorpicker/custom_background.png       | Bin
 skin/images/colorpicker/custom_hex.png              | Bin
 skin/images/colorpicker/custom_hsb_b.png            | Bin
 skin/images/colorpicker/custom_hsb_h.png            | Bin
 skin/images/colorpicker/custom_hsb_s.png            | Bin
 skin/images/colorpicker/custom_indic.gif            | Bin
 skin/images/colorpicker/custom_rgb_b.png            | Bin
 skin/images/colorpicker/custom_rgb_g.png            | Bin
 skin/images/colorpicker/custom_rgb_r.png            | Bin
 skin/images/colorpicker/custom_submit.png           | Bin
 skin/images/colorpicker/select.png                  | Bin
 skin/images/colorpicker/select2.png                 | Bin
 skin/images/colorpicker/slider.png                  | Bin
 skin/images/copy.png                                | Bin
 skin/images/cross.png                               | Bin
 skin/images/csv.ico                                 | Bin
 skin/images/csv.png                                 | Bin
 skin/images/csv_light.png                           | Bin
 skin/images/date_add.png                            | Bin
 skin/images/date_delete.png                         | Bin
 skin/images/date_edit.png                           | Bin
 skin/images/date_go.png                             | Bin
 skin/images/date_go_grau.png                        | Bin
 skin/images/date_magnify.png                        | Bin
 skin/images/delete.gif                              | Bin
 skin/images/delete.png                              | Bin
 skin/images/delete_round.png                        | Bin
 skin/images/delete_x.png                            | Bin
 skin/images/delete_x_grau.png                       | Bin
 skin/images/desc.gif                                | Bin
 skin/images/doc_icon.png                            | Bin
 skin/images/doppelampel_gelb.gif                    | Bin
 skin/images/doppelampel_grau.gif                    | Bin
 skin/images/doppelampel_rot.gif                     | Bin
 skin/images/doppelampel_rot_gelb.gif                | Bin
 skin/images/down.png                                | Bin
 skin/images/down_lvplan.png                         | Bin
 skin/images/drucken.png                             | Bin
 skin/images/edit-paste.png                          | Bin
 skin/images/edit.png                                | Bin
 skin/images/edit_grau.png                           | Bin
 skin/images/edit_wawi.gif                           | Bin
 skin/images/email.png                               | Bin
 skin/images/entitlement-pot.png                     | Bin
 skin/images/entry.gif                               | Bin
 skin/images/eps-logo_full.gif                       | Bin
 skin/images/excel.gif                               | Bin
 skin/images/exclamation.png                         | Bin
 skin/images/eye.png                                 | Bin
 skin/images/false.png                               | Bin
 skin/images/fh-complete_weiss.png                   | Bin
 skin/images/fh_complete_logo.png                    | Bin
 skin/images/fh_complete_logo_400x61.png             | Bin
 skin/images/fh_logo.png                             | Bin
 .../images/fh_technikum_wien_illustration_klein.png | Bin
 skin/images/fhcomplete.png                          | Bin
 skin/images/fhtw_logo.png                           | Bin
 skin/images/file.gif                                | Bin
 skin/images/flag-green.png                          | Bin
 skin/images/flag-red.png                            | Bin
 skin/images/flag-yellow.png                         | Bin
 skin/images/folder.gif                              | Bin
 skin/images/folderup.gif                            | Bin
 skin/images/green_point.gif                         | Bin
 skin/images/group.png                               | Bin
 skin/images/haken.gif                               | Bin
 skin/images/header_line.gif                         | Bin
 skin/images/header_testtool.png                     | Bin
 skin/images/help.png                                | Bin
 skin/images/html.png                                | Bin
 skin/images/html_light.png                          | Bin
 skin/images/ical1.0.png                             | Bin
 skin/images/ical1.0_light.png                       | Bin
 skin/images/ical2.0.png                             | Bin
 skin/images/ical2.0_light.png                       | Bin
 skin/images/img_icon.png                            | Bin
 skin/images/index.php                               |   0
 skin/images/indicator.gif                           | Bin
 skin/images/info.png                                | Bin
 skin/images/information.png                         | Bin
 skin/images/invisible.png                           | Bin
 skin/images/italic.png                              | Bin
 skin/images/ja.png                                  | Bin
 skin/images/justifycenter.png                       | Bin
 skin/images/justifyleft.png                         | Bin
 skin/images/justifyright.png                        | Bin
 skin/images/left.gif                                | Bin
 skin/images/left.png                                | Bin
 skin/images/left_lvplan.png                         | Bin
 skin/images/lehrtyp_.png                            | Bin
 skin/images/lehrtyp_2.png                           | Bin
 skin/images/lehrtyp_lf.png                          | Bin
 skin/images/lehrtyp_lv.png                          | Bin
 skin/images/lehrtyp_modul.png                       | Bin
 skin/images/list-add.png                            | Bin
 skin/images/liste.gif                               | Bin
 skin/images/lock.png                                | Bin
 skin/images/login.gif                               | Bin
 skin/images/logo.jpg                                | Bin
 skin/images/logo.png                                | Bin
 skin/images/logo_gmbh.jpg                           | Bin
 skin/images/lv.png                                  | Bin
 skin/images/lvaMulti.png                            | Bin
 skin/images/lvaMultiDel.png                         | Bin
 skin/images/lvaSingle.png                           | Bin
 skin/images/lvaSingleDel.png                        | Bin
 skin/images/lvplan.png                              | Bin
 skin/images/map.png                                 | Bin
 skin/images/markdown_button.png                     | Bin
 skin/images/menu_item.gif                           | Bin
 skin/images/menue.png                               | Bin
 skin/images/menue_hover.png                         | Bin
 skin/images/merge.png                               | Bin
 skin/images/milestone.png                           | Bin
 skin/images/modul.png                               | Bin
 skin/images/moreleft.png                            | Bin
 skin/images/moreleft_lvplan.png                     | Bin
 skin/images/moremoreleft.png                        | Bin
 skin/images/moremoreright.png                       | Bin
 skin/images/moreright.png                           | Bin
 skin/images/moreright_lvplan.png                    | Bin
 skin/images/nachgereicht.png                        | Bin
 skin/images/not-available.png                       | Bin
 skin/images/offen.png                               | Bin
 skin/images/ok.png                                  | Bin
 skin/images/open.gif                                | Bin
 skin/images/openoffice0.jpg                         | Bin
 skin/images/organisationseinheit.png                | Bin
 skin/images/outlook.ico                             | Bin
 skin/images/outlook.png                             | Bin
 skin/images/outlook_light.png                       | Bin
 skin/images/p.gif                                   | Bin
 skin/images/page_go.png                             | Bin
 skin/images/page_green.png                          | Bin
 skin/images/pdf.ico                                 | Bin
 skin/images/pdf_icon.png                            | Bin
 skin/images/pdfpic.gif                              | Bin
 skin/images/pencil.png                              | Bin
 skin/images/person.gif                              | Bin
 skin/images/photoupload.png                         | Bin
 skin/images/planner.ico                             | Bin
 skin/images/planner.png                             | Bin
 skin/images/planner_logo.png                        | Bin
 skin/images/planner_logo_weiss.png                  | Bin
 skin/images/plus.png                                | Bin
 skin/images/ppt_icon.png                            | Bin
 skin/images/preferences-system.png                  | Bin
 skin/images/printer.png                             | Bin
 skin/images/profilbild_dummy.jpg                    | Bin
 skin/images/projekt.png                             | Bin
 skin/images/projektphase.png                        | Bin
 skin/images/question.png                            | Bin
 skin/images/red_point.gif                           | Bin
 skin/images/refresh.png                             | Bin
 skin/images/repeat.png                              | Bin
 skin/images/right.gif                               | Bin
 skin/images/right.png                               | Bin
 skin/images/right_lvplan.png                        | Bin
 skin/images/round.png                               | Bin
 skin/images/sancho/sancho_footer.jpg                | Bin
 skin/images/sancho/sancho_footer_DEFAULT.jpg        | Bin
 skin/images/sancho/sancho_footer_DEFAULT_bw.jpg     | Bin
 skin/images/sancho/sancho_footer_min_bw.jpg         | Bin
 skin/images/sancho/sancho_footer_min_bw.xcf         | Bin
 skin/images/sancho/sancho_header_DEFAULT.jpg        | Bin
 skin/images/sancho/sancho_header_DEFAULT_bw.jpg     | Bin
 skin/images/sancho/sancho_header_TEMPLATE.xcf       | Bin
 skin/images/sancho/sancho_header_ampel_overdue.jpg  | Bin
 .../sancho/sancho_header_confirm_timesheet.jpg      | Bin
 .../sancho_header_du_hast_neue_nachrichten.jpg      | Bin
 .../sancho_header_du_hast_verpflichtende_ampeln.jpg | Bin
 skin/images/sancho/sancho_header_min_bw.jpg         | Bin
 ...ancho_header_neue_nachrichten_in_ampelsystem.jpg | Bin
 skin/images/sancho/sancho_roboter.jpg               | Bin
 skin/images/sancho/sancho_roboter_freigestellt.png  | Bin
 skin/images/sancho_round_right_blue.png             | Bin
 skin/images/sancho_round_right_grey.png             | Bin
 skin/images/sancho_round_right_red.png              | Bin
 skin/images/scrollbar_left_right.png                | Bin
 skin/images/scrollbar_up_down.png                   | Bin
 skin/images/scrollbase_bottom.png                   | Bin
 skin/images/scrollbase_left.png                     | Bin
 skin/images/scrollbase_right.png                    | Bin
 skin/images/scrollbase_top.png                      | Bin
 skin/images/search.png                              | Bin
 skin/images/seperator.gif                           | Bin
 skin/images/service.png                             | Bin
 skin/images/spinner.gif                             | Bin
 skin/images/split-arrows.png                        | Bin
 skin/images/square_blue.png                         | Bin
 skin/images/statistic.png                           | Bin
 skin/images/sticky.png                              | Bin
 skin/images/system-index-search.png                 | Bin
 skin/images/tempus_logo.png                         | Bin
 skin/images/tempus_logo_weiss.png                   | Bin
 skin/images/testtool_button.png                     | Bin
 skin/images/testtool_button_hover.png               | Bin
 skin/images/testtool_buttonleft.png                 | Bin
 skin/images/testtool_buttonright.png                | Bin
 skin/images/text-x-generic_with_pencil.png          | Bin
 skin/images/tick.png                                | Bin
 skin/images/timetable.png                           | Bin
 skin/images/transmit.png                            | Bin
 skin/images/tree-diagramm.png                       | Bin
 skin/images/true.png                                | Bin
 skin/images/tw_logo_02.jpg                          | Bin
 .../ui-bg_diagonals-thick_18_b81900_40x40.png       | Bin
 .../ui-bg_diagonals-thick_20_666666_40x40.png       | Bin
 skin/images/ui-bg_flat_0_aaaaaa_40x100.png          | Bin
 skin/images/ui-bg_flat_10_000000_40x100.png         | Bin
 skin/images/ui-bg_flat_75_ffffff_40x100.png         | Bin
 skin/images/ui-bg_glass_100_f6f6f6_1x400.png        | Bin
 skin/images/ui-bg_glass_100_fdf5ce_1x400.png        | Bin
 skin/images/ui-bg_glass_55_fbf9ee_1x400.png         | Bin
 skin/images/ui-bg_glass_65_ffffff_1x400.png         | Bin
 skin/images/ui-bg_glass_75_dadada_1x400.png         | Bin
 skin/images/ui-bg_glass_75_e6e6e6_1x400.png         | Bin
 skin/images/ui-bg_glass_95_fef1ec_1x400.png         | Bin
 skin/images/ui-bg_gloss-wave_35_f6a828_500x100.png  | Bin
 .../ui-bg_highlight-soft_100_eeeeee_1x100.png       | Bin
 .../images/ui-bg_highlight-soft_75_cccccc_1x100.png | Bin
 .../images/ui-bg_highlight-soft_75_ffe45c_1x100.png | Bin
 skin/images/ui-icons_222222_256x240.png             | Bin
 skin/images/ui-icons_228ef1_256x240.png             | Bin
 skin/images/ui-icons_2e83ff_256x240.png             | Bin
 skin/images/ui-icons_454545_256x240.png             | Bin
 skin/images/ui-icons_888888_256x240.png             | Bin
 skin/images/ui-icons_cd0a0a_256x240.png             | Bin
 skin/images/ui-icons_ef8c08_256x240.png             | Bin
 skin/images/ui-icons_ffd27a_256x240.png             | Bin
 skin/images/ui-icons_ffffff_256x240.png             | Bin
 skin/images/underline.png                           | Bin
 skin/images/up.png                                  | Bin
 skin/images/upload.png                              | Bin
 skin/images/user_down.png                           | Bin
 skin/images/user_up.png                             | Bin
 skin/images/verplant_false.png                      | Bin
 skin/images/verplant_true.png                       | Bin
 skin/images/vilesci_addons.png                      | Bin
 skin/images/vilesci_admin.png                       | Bin
 skin/images/vilesci_farbverlauf.png                 | Bin
 skin/images/vilesci_farbverlauf_top.png             | Bin
 skin/images/vilesci_inventar.png                    | Bin
 skin/images/vilesci_lehre.png                       | Bin
 skin/images/vilesci_logo.png                        | Bin
 skin/images/vilesci_logo_weiss.png                  | Bin
 skin/images/vilesci_lvplan.png                      | Bin
 skin/images/vilesci_personen.png                    | Bin
 skin/images/vilesci_stammdaten.png                  | Bin
 skin/images/vilesci_statistik.png                   | Bin
 skin/images/vilesci_wartung.png                     | Bin
 skin/images/wawi_logo.png                           | Bin
 skin/images/wawi_logo_sz.png                        | Bin
 skin/images/wawi_logo_weiss.png                     | Bin
 skin/images/x-office-presentation.svg               |   0
 skin/images/x-office-spreadsheet.svg                |   0
 skin/images/xls.png                                 | Bin
 skin/images/xls_icon.png                            | Bin
 skin/images/xls_light.png                           | Bin
 skin/images/zip_icon.png                            | Bin
 skin/infoscreen.css                                 |   0
 skin/jquery-ui-1.9.2.custom.min.css                 |   0
 skin/jquery.css                                     |   0
 skin/planner.css                                    |   0
 skin/print.css                                      |   0
 skin/simplecropper.css                              |   0
 skin/sounds/inventar_error.ogg                      | Bin
 skin/sounds/testtool_demo.mp3                       | Bin
 skin/sounds/testtool_demo.ogg                       | Bin
 skin/style.css.php                                  |   0
 skin/styles/default/cis_logo_text_400x78.png        | Bin
 skin/styles/default/header.png                      | Bin
 skin/styles/default/logo_250x130.png                | Bin
 skin/styles/example.css                             |   0
 skin/styles/example/description.txt                 |   0
 skin/styles/example/line.jpg                        | Bin
 skin/styles/example/logo.jpg                        | Bin
 skin/styles/example/pixel.jpg                       | Bin
 skin/styles/example/screenshot.jpg                  | Bin
 skin/styles/fhb/description.txt                     |   0
 skin/styles/fhb/logo.png                            | Bin
 skin/styles/fhb/logo_klein.jpg                      | Bin
 skin/styles/jquery.css                              |   0
 skin/styles/mobile.css                              |   0
 skin/styles/mobile/TWLogo_klein.jpg                 | Bin
 skin/styles/mobile/description.txt                  |   0
 skin/styles/mobile/header_line.jpg                  | Bin
 skin/styles/mobile/screenshot.jpg                   | Bin
 skin/styles/stp.css                                 |   0
 skin/styles/stp/BannerLogo.jpg                      | Bin
 skin/styles/stp/KTULogo.jpg                         | Bin
 skin/styles/stp/KTULogo.png                         | Bin
 skin/styles/stp/abschlusspraesentation.jpg          | Bin
 skin/styles/stp/absolventen.jpg                     | Bin
 skin/styles/stp/international_week.jpg              | Bin
 skin/styles/stp/logo.jpg                            | Bin
 skin/styles/stp/logo.png                            | Bin
 skin/styles/stp/pitching.jpg                        | Bin
 skin/styles/stp/projektidee.jpg                     | Bin
 skin/styles/tinymce.css                             |   0
 skin/styles/tw.css                                  |   0
 skin/styles/tw/TWLogo_klein.jpg                     | Bin
 skin/styles/tw/academy.jpg                          | Bin
 skin/styles/tw/cis_logo_text_400x78.png             | Bin
 skin/styles/tw/description.txt                      |   0
 skin/styles/tw/header.png                           | Bin
 skin/styles/tw/header_line.jpg                      | Bin
 skin/styles/tw/lageplan.jpg                         | Bin
 skin/styles/tw/logo.jpg                             | Bin
 skin/styles/tw/logo.png                             | Bin
 skin/styles/tw/logo_200x400.png                     | Bin
 skin/styles/tw/logo_250x130.png                     | Bin
 skin/styles/tw/logo_50x25.png                       | Bin
 skin/styles/tw/logo_academy.png                     | Bin
 skin/styles/tw/logo_klein.png                       | Bin
 skin/styles/tw/logo_ws_50x25.png                    | Bin
 skin/styles/tw/screenshot.jpg                       | Bin
 skin/styles/twgreen.css                             |   0
 skin/styles/twgreen/description.txt                 |   0
 skin/styles/twgreen/menu.jpg                        | Bin
 skin/styles/twgreen/screenshot.jpg                  | Bin
 skin/styles/twgreen/tw_gr_header.jpg                | Bin
 skin/styles/twgreen/tw_gr_logo.jpg                  | Bin
 skin/tablesort.css                                  |   0
 skin/tempus.css                                     |   0
 skin/vilesci.css                                    |   0
 skin/wawi.css                                       |   0
 skin/widgets.css                                    |   0
 soap/datenverbund_client.php                        |   0
 soap/fhcomplete.php                                 |   0
 soap/index.html                                     |   0
 soap/kartenverlaengerung.soap.php                   |   0
 soap/kartenverlaengerung.test.php                   |   0
 soap/kartenverlaengerung.wsdl.php                   |   0
 soap/lehrveranstaltung.json.php                     |   0
 soap/lehrveranstaltung.soap.php                     |   0
 soap/lehrveranstaltung.wsdl.php                     |   0
 soap/lvplan.soap.php                                |   0
 soap/lvplan.wsdl.php                                |   0
 soap/mitarbeiter.soap.php                           |   0
 soap/mitarbeiter.wsdl.php                           |   0
 soap/notiz.soap.php                                 |   0
 soap/notiz.wsdl.php                                 |   0
 soap/ort.soap.php                                   |   0
 soap/ort.wsdl.php                                   |   0
 soap/person.soap.php                                |   0
 soap/person.wsdl.php                                |   0
 soap/projekt.soap.php                               |   0
 soap/projekt.wsdl.php                               |   0
 soap/projekt_jquery_client.php                      |   0
 soap/projektphase.soap.php                          |   0
 soap/projektphase.wsdl.php                          |   0
 soap/projekttask.soap.php                           |   0
 soap/projekttask.wsdl.php                           |   0
 soap/ressource.soap.php                             |   0
 soap/ressource.wsdl.php                             |   0
 soap/ressource_projekt.soap.php                     |   0
 soap/ressource_projekt.wsdl.php                     |   0
 soap/semesterticket.soap.php                        |   0
 soap/semesterticket.wsdl.php                        |   0
 soap/semesterticket_client.php                      |   0
 soap/soap_test_lv.php                               |   0
 soap/soap_test_lvplan.php                           |   0
 soap/soap_test_mitarbeiter.php                      |   0
 soap/soap_test_ort.php                              |   0
 soap/soap_test_person.php                           |   0
 soap/soap_test_student.php                          |   0
 soap/stip.class.php                                 |   0
 soap/stip.soap.php                                  |   0
 soap/stip.wsdl.php                                  |   0
 soap/stip_client.php                                |   0
 soap/stip_client_error.php                          |   0
 soap/student.soap.php                               |   0
 soap/student.wsdl.php                               |   0
 soap/studienordnung.json.php                        |   0
 soap/studienplan.json.php                           |   0
 soap/test.soap.php                                  |   0
 soap/test.wsdl.php                                  |   0
 soap/test_client.php                                |   0
 system/.htaccess_exmpl                              |   0
 system/FH-Complete.txp                              |   0
 system/FHComplete-3.3.sql                           |   0
 system/FHCompleteTDM3PG83.xsl                       |   0
 system/UnitTests/AppdatenTest.php                   |   0
 system/UnitTests/FunctionsTest.php                  |   0
 system/UnitTests/Studienordnung2Test.php            |   0
 system/UnitTests/StudienordnungTest.php             |   0
 system/UnitTests/StudienplanTest.php                |   0
 system/UnitTests/StudienplatzTest.php               |   0
 .../addons/studienplatzverwaltung/AqaClientTest.php |   0
 .../studienplatzverwaltung/AqaFoebisPersonTest.php  |   0
 .../studienplatzverwaltung/AqaFoebisStgTest.php     |   0
 .../addons/studienplatzverwaltung/FunctionsTest.php |   0
 .../StudienplatzverwaltungAPITest.php               |   0
 .../addons/studienplatzverwaltung/testfile.xml      |   0
 system/UnitTests/ut_studienordnung.php              |   0
 system/ampel_erinnerungsmail.php                    |   0
 system/checkStudenten.php                           |   0
 system/check_neue_lektoren.php                      |   0
 system/check_studentlehrverband.php                 |   0
 system/checkroles.php                               |   0
 system/checksystem.php                              |   0
 system/dbupdate_3.0.php                             |   0
 system/dbupdate_3.1.php                             |   0
 system/dbupdate_3.2.php                             |   0
 system/dbupdate_3.2/migrate_reihungstest.php        |   0
 system/dbupdate_3.3.php                             |   0
 system/dbupdate_3.4.php                             |   0
 ...tarbeiter_kurzbz_bei_reservierungen_anzeigen.php |   0
 .../dbupdate_3.4/17512_fehlercode_constraints.php   |   0
 .../19154_beurteilungsformulare_pruefungssenat.php  |   0
 .../24682_reihungstest_zugangscode_fuer_login.php   |   0
 .../24913_tabelle_raumtyp_neues_attribut_aktiv.php  |   0
 .../dbupdate_3.4/25003_notenimport_nachpruefung.php |   0
 system/dbupdate_3.4/25999_C4_Menu.php               |   0
 system/dbupdate_3.4/25999_C4_ma0594.php             |   0
 system/dbupdate_3.4/25999_cis4_cms.php              |   0
 system/dbupdate_3.4/26173_index_webservicelog.php   |   0
 ...07_vilesci_erfassung_abwesenheiten_reinigung.php |   0
 .../27351_digitalisierung_formulare.php             |   0
 .../27388_anrechnungen_zeitfenster_pflegen.php      |   0
 .../27949_infocenter_zurueckstellen_mit_grund.php   |   0
 .../28089_plausichecks_in_extension_hinzufuegen.php |   0
 ...elne_studiengaenge_aus_issuechecks_ausnehmen.php |   0
 .../dbupdate_3.4/29529_infocenter_anpassungen.php   |   0
 ...g_der_uhstat1_daten_ueber_das_bewerbungstool.php |   0
 ...e_anrechnung_neue_attribute_fuer_begruendung.php |   0
 .../30537_anmerkung_in_tbl_rolleberechtigung.php    |   0
 ...er_studienbeitrag_fuer_drittsaatenangehoerig.php |   0
 system/dbupdate_3.4/dbupdate_dashboard.php          |   0
 system/dbupdate_3.4/example.php                     |   0
 system/environment.php                              |   0
 system/erinnerungsmail_coodle.php                   |   0
 system/erinnerungsmail_sek_lehrauftrag.php          |   0
 system/erinnerungsmail_sek_preinteressent.php       |   0
 system/fehlerupdate.php                             |   0
 system/filtersupdate.php                            |   0
 system/generate_missing_sto.php                     |   0
 system/generatestudienordnung.php                   |   0
 system/konsistenzpruefung.php                       |   0
 system/matrikelnummer_clearing_download.php         |   0
 system/matrikelnummer_clearing_import.php           |   0
 system/phpinfo.php                                  |   0
 system/prestudentstatus_studienplan_id.php          |   0
 system/pruefung_bestaetigen.php                     |   0
 system/services/systemd/phantomjs@.service          |   0
 system/services/systemd/unoconv@.service            |   0
 system/services/upstart/unoconv.conf                |   0
 system/sync/sync_stpldev_stpl.php                   |   0
 system/system_check_sql.php                         |   0
 system/templates/contentmittitel.xsd                |   0
 .../contentmittitel_filterwidget_xslt_xhtml.xslt    |   0
 system/templates/contentmittitel_xslt_xhtml.xslt    |   0
 system/templates/contentohnetitel.xsd               |   0
 system/templates/contentohnetitel_xslt_xhtml.xslt   |   0
 system/templates/include.xsd                        |   0
 system/templates/include_xslt_xhtml.xslt            |   0
 system/templates/news.xsd                           |   0
 system/templates/news_infoscreen.xsd                |   0
 system/templates/news_infoscreen_xslt_xhtml.xslt    |   0
 system/templates/news_xslt_xhtml.xslt               |   0
 system/templates/redirect.xsd                       |   0
 system/templates/redirect_xslt_xhtml.xslt           |   0
 system/vorlage_zip/AccountInfo.odt                  | Bin
 system/vorlage_zip/AntragAbmeldung.odt              | Bin
 system/vorlage_zip/AntragAbmeldungStgl.odt          | Bin
 system/vorlage_zip/AntragUnterbrechung.odt          | Bin
 system/vorlage_zip/AnwListBarcode.odt               | Bin
 system/vorlage_zip/Anwesenheitslist.odt             | Bin
 system/vorlage_zip/AusbVerEng.odt                   | Bin
 system/vorlage_zip/Ausbildungsver.odt               | Bin
 system/vorlage_zip/Bakkurkunde.odt                  | Bin
 system/vorlage_zip/BakkurkundeEng.odt               | Bin
 system/vorlage_zip/Bakkzeugnis.odt                  | Bin
 system/vorlage_zip/BakkzeugnisEng.odt               | Bin
 system/vorlage_zip/Bescheid.odt                     | Bin
 system/vorlage_zip/BescheidEng.odt                  | Bin
 system/vorlage_zip/Bestellung.odt                   | Bin
 system/vorlage_zip/Bewerberakt.odt                  | Bin
 system/vorlage_zip/DiplSupplement.odt               | Bin
 system/vorlage_zip/DiplSupplementDebug.odt          | Bin
 system/vorlage_zip/Diplomurkunde.odt                | Bin
 system/vorlage_zip/DiplomurkundeEng.odt             | Bin
 system/vorlage_zip/Diplomzeugnis.odt                | Bin
 system/vorlage_zip/DiplomzeugnisEng.odt             | Bin
 system/vorlage_zip/Erfolgsnachweis.odt              | Bin
 system/vorlage_zip/FHB_Ausbildungsver.odt           | Bin
 system/vorlage_zip/FHB_PrProtBA.odt                 | Bin
 system/vorlage_zip/FHB_PrProtMA.odt                 | Bin
 system/vorlage_zip/Inskription.odt                  | Bin
 system/vorlage_zip/InskriptionEng.odt               | Bin
 system/vorlage_zip/KTU_Studienblatt.odt             | Bin
 system/vorlage_zip/LVZeugnis.odt                    | Bin
 system/vorlage_zip/LVZeugnisEng.odt                 | Bin
 system/vorlage_zip/Lehrauftrag.odt                  | Bin
 system/vorlage_zip/Lehrtaetigkeit.odt               | Bin
 system/vorlage_zip/PrProtBA.odt                     | Bin
 system/vorlage_zip/PrProtBAEng.odt                  | Bin
 system/vorlage_zip/PrProtMA.odt                     | Bin
 system/vorlage_zip/PrProtMAEng.odt                  | Bin
 system/vorlage_zip/PrProtMAEng_alt.odt              | Bin
 system/vorlage_zip/PrProtMA_alt.odt                 | Bin
 system/vorlage_zip/Projektbeschr.odt                | Bin
 system/vorlage_zip/Studienblatt.odt                 | Bin
 system/vorlage_zip/StudienblattEng.odt              | Bin
 system/vorlage_zip/Studienerfolg.odt                | Bin
 system/vorlage_zip/StudienerfolgEng.odt             | Bin
 system/vorlage_zip/Studienordnung.odt               | Bin
 system/vorlage_zip/Uebernahme.odt                   | Bin
 system/vorlage_zip/Zahlung.odt                      | Bin
 system/vorlage_zip/Zertifikat.odt                   | Bin
 system/vorlage_zip/Zertifikat_ktu.odt               | Bin
 system/vorlage_zip/Zeugnis.odt                      | Bin
 system/vorlage_zip/ZeugnisEng.odt                   | Bin
 system/vorlage_zip/ZeugnisEngNeu.odt                | Bin
 system/vorlage_zip/ZeugnisNeu.odt                   | Bin
 system/vorlage_zip/Zutrittskarte.odt                | Bin
 system/vorlage_zip/fotoliste.odt                    | Bin
 system/vorlage_zip/statusbericht.ods                | Bin
 system/xsl/AntragAbmeldung.xsl                      |   0
 system/xsl/AntragAbmeldungStgl.xsl                  |   0
 system/xsl/AntragUnterbrechung.xsl                  |   0
 system/xsl/AnwListBarcode.xsl                       |   0
 system/xsl/Anwesenheitsliste.xsl                    |   0
 system/xsl/AusbVerEngHead_0.xsl                     |   0
 system/xsl/AusbVerEng_0.xsl                         |   0
 system/xsl/AusbildStatus_0.xsl                      |   0
 system/xsl/Ausbildungsver_0.xsl                     |   0
 system/xsl/Bewerberakt.xsl                          |   0
 system/xsl/LehrveranstaltungszeugnisEng_0.xsl       |   0
 system/xsl/Lehrveranstaltungszeugnis_0.xsl          |   0
 system/xsl/Lehrveranstaltungszeugnis_Eng_9005.xsl   |   0
 system/xsl/PrProtBAEng_0.xsl                        |   0
 system/xsl/PrProtBA_0.xsl                           |   0
 system/xsl/PrProtMAEng_0.xsl                        |   0
 system/xsl/PrProtMA_0.xsl                           |   0
 system/xsl/Projektbeschr_0.xsl                      |   0
 system/xsl/StudienblattEng_0.xsl                    |   0
 system/xsl/Studienblatt_0.xsl                       |   0
 system/xsl/Studienordnung_0.xsl                     |   0
 system/xsl/Studienordnung_style_0.xml               |   0
 system/xsl/ZertifikatFreifaecher_0.xsl              |   0
 system/xsl/ZeugnisEng_0.xsl                         |   0
 system/xsl/ZeugnisEng_Lehrgaenge.xsl                |   0
 system/xsl/Zeugnis_0.xsl                            |   0
 system/xsl/Zeugnis_Lehrgaenge.xsl                   |   0
 system/xsl/Zeugnis_style_0.xsl                      |   0
 system/xsl/Zutrittskarte.xsl                        |   0
 system/xsl/accountinfoblatt_0.xsl                   |   0
 system/xsl/bachelorurkundeEng_0.xsl                 |   0
 system/xsl/bachelorurkunde_0.xsl                    |   0
 system/xsl/bakkzeugnisEng_0.xsl                     |   0
 system/xsl/bakkzeugnis_0.xsl                        |   0
 system/xsl/bescheid_0.xsl                           |   0
 system/xsl/bescheid_style_0.xsl                     |   0
 system/xsl/diplomaSuppDebug.xsl                     |   0
 system/xsl/diplomaSupp_0.xsl                        |   0
 system/xsl/diplomaSupp_style_0.xsl                  |   0
 system/xsl/diplomurkundeEng_0.xsl                   |   0
 system/xsl/diplomurkunde_0.xsl                      |   0
 system/xsl/diplomzeugnisEng_0.xsl                   |   0
 system/xsl/diplomzeugnis_0.xsl                      |   0
 system/xsl/fotoliste_0.xsl                          |   0
 system/xsl/inskription_0.xsl                        |   0
 system/xsl/inskription_eng_0.xsl                    |   0
 system/xsl/lehrauftrag_0.xsl                        |   0
 system/xsl/lehrauftrag_style_0.xsl                  |   0
 system/xsl/lehrtaetigkeit_0.xsl                     |   0
 system/xsl/prprotokollbakk_0.xsl                    |   0
 system/xsl/statusbericht.xsl                        |   0
 system/xsl/studienerfolgEng_0.xsl                   |   0
 system/xsl/studienerfolgEng_Lehrgaenge.xsl          |   0
 system/xsl/studienerfolg_0.xsl                      |   0
 system/xsl/studienerfolg_Lehrgaenge.xsl             |   0
 system/xsl/uebernahmebestaetigung_0.xsl             |   0
 system/xsl/zahlung_0.xsl                            |   0
 system/xsl/zahlung_style_0.xsl                      |   0
 .../Sniffs/Classes/FHCPropertyDeclarationSniff.php  |   0
 .../Sniffs/Classes/FHCValidClassNameSniff.php       |   0
 .../ControlStructures/FHCControlSignatureSniff.php  |   0
 .../Sniffs/Methods/FHCMethodDeclarationSniff.php    |   0
 tests/codesniffer/FHComplete/ruleset.xml            |   0
 tests/phpmd/rulesets-dev-only.xml                   |   0
 tests/phpmd/rulesets.xml                            |   0
 version.php                                         |   0
 vilesci/admin/XPI/FASoProduktiv/FASonline.xpi       | Bin
 .../XPI/FASoProduktiv/chrome/content/contents.rdf   |   0
 .../XPI/FASoProduktiv/chrome/content/fasonline.xul  |   0
 .../admin/XPI/FASoProduktiv/chrome/fasonline.jar    | Bin
 vilesci/admin/XPI/FASoProduktiv/install.js          |   0
 vilesci/admin/XPI/FASoProduktiv/install.rdf         |   0
 .../XPI/FASoProduktivSeamonkey2.0/FASonline.xpi     | Bin
 .../XPI/FASoProduktivSeamonkey2.0/chrome.manifest   |   0
 .../chrome/content/contents.rdf                     |   0
 .../chrome/content/fasonline.xul                    |   0
 .../FASoProduktivSeamonkey2.0/chrome/fasonline.jar  | Bin
 .../chrome/skin/fasonline.png                       | Bin
 .../admin/XPI/FASoProduktivSeamonkey2.0/install.rdf |   0
 vilesci/admin/XPI/FASoStPoelten/FASonline.xpi       | Bin
 .../XPI/FASoStPoelten/chrome/content/contents.rdf   |   0
 .../XPI/FASoStPoelten/chrome/content/fasonline.xul  |   0
 .../admin/XPI/FASoStPoelten/chrome/fasonline.jar    | Bin
 vilesci/admin/XPI/FASoStPoelten/install.js          |   0
 vilesci/admin/XPI/FASoStPoelten/install.rdf         |   0
 .../admin/XPI/FASoStPoeltenDEV/FASoStPoelten2.xpi   | Bin
 .../FASoStPoeltenDEV/chrome/content/contents.rdf    |   0
 .../FASoStPoeltenDEV/chrome/content/fasonline2.xul  |   0
 .../XPI/FASoStPoeltenDEV/chrome/fasonline2.jar      | Bin
 vilesci/admin/XPI/FASoStPoeltenDEV/install.js       |   0
 vilesci/admin/XPI/FASoStPoeltenDEV/install.rdf      |   0
 vilesci/admin/XPI/FHCFas/FHCFas.xpi                 | Bin
 .../admin/XPI/FHCFas/chrome/content/contents.rdf    |   0
 vilesci/admin/XPI/FHCFas/chrome/content/fhcfas.xul  |   0
 vilesci/admin/XPI/FHCFas/chrome/fhcfas.jar          | Bin
 vilesci/admin/XPI/FHCFas/install.js                 |   0
 vilesci/admin/XPI/FHCFas/install.rdf                |   0
 vilesci/admin/XPI/FHCTempus/FHCTempus.xpi           | Bin
 .../admin/XPI/FHCTempus/chrome/content/contents.rdf |   0
 .../XPI/FHCTempus/chrome/content/fhctempus.xul      |   0
 vilesci/admin/XPI/FHCTempus/chrome/fhctempus.jar    | Bin
 vilesci/admin/XPI/FHCTempus/install.js              |   0
 vilesci/admin/XPI/FHCTempus/install.rdf             |   0
 vilesci/admin/XPI/PlannerProduktiv/Planner.xpi      | Bin
 .../PlannerProduktiv/chrome/content/contents.rdf    |   0
 .../XPI/PlannerProduktiv/chrome/content/planner.xul |   0
 .../admin/XPI/PlannerProduktiv/chrome/planner.jar   | Bin
 vilesci/admin/XPI/PlannerProduktiv/install.js       |   0
 vilesci/admin/XPI/PlannerProduktiv/install.rdf      |   0
 .../XPI/Seamonkey2.11/fhcomplete/chrome.manifest    |   0
 .../fhcomplete/chrome/content/appchoose.xul         |   0
 .../fhcomplete/chrome/content/contents.rdf          |   0
 .../Seamonkey2.11/fhcomplete/chrome/content/fas.xul |   0
 .../fhcomplete/chrome/content/fhcomplete.js         |   0
 .../fhcomplete/chrome/content/fhcomplete.xul        |   0
 .../fhcomplete/chrome/content/options.xul           |   0
 .../fhcomplete/chrome/content/planner.xul           |   0
 .../fhcomplete/chrome/content/statusbaroverlay.xul  |   0
 .../fhcomplete/chrome/content/tempus.xul            |   0
 .../Seamonkey2.11/fhcomplete/chrome/fhcomplete.jar  | Bin
 .../fhcomplete/chrome/skin/fasonline.png            | Bin
 .../fhcomplete/chrome/skin/fasonline15.png          | Bin
 .../fhcomplete/chrome/skin/fasonline32.png          | Bin
 .../fhcomplete/chrome/skin/fhcomplete.ico           | Bin
 .../fhcomplete/chrome/skin/fhcomplete.png           | Bin
 .../fhcomplete/chrome/skin/planner.png              | Bin
 .../fhcomplete/chrome/skin/planner15.png            | Bin
 .../fhcomplete/chrome/skin/planner32.png            | Bin
 .../fhcomplete/chrome/skin/settings.png             | Bin
 .../Seamonkey2.11/fhcomplete/chrome/skin/tempus.png | Bin
 .../fhcomplete/chrome/skin/tempus15.png             | Bin
 .../fhcomplete/chrome/skin/tempus32.png             | Bin
 .../fhcomplete/defaults/preferences/defaults.js     |   0
 .../XPI/Seamonkey2.11/fhcomplete/fhcomplete.xpi     | Bin
 .../admin/XPI/Seamonkey2.11/fhcomplete/install.rdf  |   0
 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/make.sh  |   0
 vilesci/admin/XPI/TempusStPoelten/Tempus.xpi        | Bin
 .../XPI/TempusStPoelten/chrome/content/contents.rdf |   0
 .../XPI/TempusStPoelten/chrome/content/tempus.xul   |   0
 vilesci/admin/XPI/TempusStPoelten/chrome/tempus.jar | Bin
 vilesci/admin/XPI/TempusStPoelten/install.js        |   0
 vilesci/admin/XPI/TempusStPoelten/install.rdf       |   0
 .../XPI/TempusStPoeltenDEV/TempusStPoelten2.xpi     | Bin
 .../TempusStPoeltenDEV/chrome/content/contents.rdf  |   0
 .../TempusStPoeltenDEV/chrome/content/tempus2.xul   |   0
 .../admin/XPI/TempusStPoeltenDEV/chrome/tempus2.jar | Bin
 vilesci/admin/XPI/TempusStPoeltenDEV/install.js     |   0
 vilesci/admin/XPI/TempusStPoeltenDEV/install.rdf    |   0
 .../TempusStPoeltenExtern/TempusStPoeltenExtern.xpi | Bin
 .../TempusStPoeltenExtern81.xpi                     | Bin
 .../chrome/content/contents.rdf                     |   0
 .../chrome/content/tempusextern81.xul               |   0
 .../TempusStPoeltenExtern/chrome/tempusextern.jar   | Bin
 .../TempusStPoeltenExtern/chrome/tempusextern81.jar | Bin
 vilesci/admin/XPI/TempusStPoeltenExtern/install.js  |   0
 vilesci/admin/XPI/TempusStPoeltenExtern/install.rdf |   0
 vilesci/admin/XPI/TempusTWProduktiv/Tempusdev.xpi   | Bin
 .../TempusTWProduktiv/chrome/content/contents.rdf   |   0
 .../TempusTWProduktiv/chrome/content/tempusdev.xul  |   0
 .../XPI/TempusTWProduktiv/chrome/tempusdev.jar      | Bin
 vilesci/admin/XPI/TempusTWProduktiv/install.js      |   0
 vilesci/admin/XPI/TempusTWProduktiv/install.rdf     |   0
 vilesci/admin/XPI/orbit-1.8f5-MiK.xpi               | Bin
 vilesci/bis/archiv.php                              |   0
 vilesci/bis/bisdaten/.gitignore                     |   0
 vilesci/bis/checkfunktion.php                       |   0
 vilesci/bis/checkverwendung.php                     |   0
 vilesci/bis/lehrgangsmeldung.php                    |   0
 vilesci/bis/personal_generateverwendung.php         |   0
 vilesci/bis/personal_lektorenohnelehrauftrag.php    |   0
 vilesci/bis/personalimport.php                      |   0
 vilesci/bis/personalmeldung.php                     |   0
 vilesci/bis/personalmeldung_uebersicht.php          |   0
 vilesci/bis/studentenmeldung.php                    |   0
 vilesci/cronjobs/bpk.php                            |   0
 vilesci/cronjobs/cronjob.php                        |   0
 vilesci/cronjobs/jobwatcher.php                     |   0
 vilesci/cronjobs/lvplanwartung.php                  |   0
 vilesci/cronjobs/matrikelnummern.php                |   0
 vilesci/cronjobs/testjob.php                        |   0
 vilesci/fhausweis/bildpruefung.php                  |   0
 vilesci/fhausweis/bildzuschnitt.php                 |   0
 vilesci/fhausweis/imageupload.php                   |   0
 vilesci/fhausweis/kartenausgabe.php                 |   0
 vilesci/fhausweis/kartenkorrektur.php               |   0
 vilesci/fhausweis/kartenruecknahme.php              |   0
 vilesci/fhausweis/kartentausch.php                  |   0
 vilesci/fhausweis/kartenverwaltung.php              |   0
 vilesci/fhausweis/kartezuweisen.php                 |   0
 vilesci/fhausweis/search.php                        |   0
 vilesci/fhausweis/verlaengerung.php                 |   0
 vilesci/index.php                                   |   0
 vilesci/inventar/etiketten.php                      |   0
 vilesci/inventar/inventar.php                       |   0
 vilesci/inventar/inventar_afa.php                   |   0
 vilesci/inventar/inventar_autocomplete.php          |   0
 vilesci/inventar/inventar_inventur.php              |   0
 vilesci/inventar/inventar_pflege.php                |   0
 vilesci/inventar/inventarliste.php                  |   0
 vilesci/inventar/konto_detail.php                   |   0
 vilesci/inventar/kostenstelle_detail.php            |   0
 vilesci/inventar/studiengang_detail.php             |   0
 vilesci/left.php                                    |   0
 vilesci/lehre/abgabe_assistenz.php                  |   0
 vilesci/lehre/abgabe_assistenz_details.php          |   0
 vilesci/lehre/abgabe_assistenz_frameset.php         |   0
 vilesci/lehre/abgabe_assistenz_multitermin.php      |   0
 vilesci/lehre/abgabe_assistenz_zusatz.php           |   0
 vilesci/lehre/check/index.html                      |   0
 vilesci/lehre/check/res_check.php                   |   0
 vilesci/lehre/check/stdplan_check.php               |   0
 vilesci/lehre/check/ueberbuchung.php                |   0
 vilesci/lehre/check/verplanungsuebersicht.php       |   0
 vilesci/lehre/einheit_autocomplete.php              |   0
 vilesci/lehre/einheit_det.php                       |   0
 vilesci/lehre/einheit_menu.php                      |   0
 vilesci/lehre/ferienverwaltung.php                  |   0
 vilesci/lehre/freifach.php                          |   0
 vilesci/lehre/freifach_lektoren.php                 |   0
 vilesci/lehre/freifach_studentenvorrueckung.php     |   0
 vilesci/lehre/incoming_delete.php                   |   0
 vilesci/lehre/index.html                            |   0
 vilesci/lehre/lehreinheiten_vorrueckung.php         |   0
 vilesci/lehre/lehrveranstaltung.php                 |   0
 vilesci/lehre/lehrveranstaltung_details.php         |   0
 vilesci/lehre/lehrveranstaltung_frameset.html       |   0
 vilesci/lehre/lehrveranstaltung_kompatibel.php      |   0
 vilesci/lehre/lehrveranstaltung_lvangebot.php       |   0
 vilesci/lehre/lv_merge.php                          |   0
 vilesci/lehre/lvangebot_autocomplete.php            |   0
 vilesci/lehre/lvplan_custom_sync.php                |   0
 vilesci/lehre/lvplanwartung.php                     |   0
 vilesci/lehre/projektarbeitsbenotung.php            |   0
 vilesci/lehre/raumauslastung.php                    |   0
 vilesci/lehre/raummitteilung.php                    |   0
 vilesci/lehre/reservierung_autocomplete.php         |   0
 vilesci/lehre/reservierung_insert.php               |   0
 vilesci/lehre/saveStudienordnung.php                |   0
 vilesci/lehre/stpl_benutzer_kollision.php           |   0
 vilesci/lehre/stpl_benutzer_kollision_details.php   |   0
 vilesci/lehre/stpl_benutzer_kollision_frameset.html |   0
 vilesci/lehre/studienordnung.inc.php                |   0
 vilesci/lehre/studienordnung.js                     |   0
 vilesci/lehre/studienordnung.php                    |   0
 vilesci/lehre/studienordnung_autocomplete.php       |   0
 vilesci/lehre/studienordnung_lvregel.js             |   0
 vilesci/lehre/studienplan_gueltigkeit.php           |   0
 vilesci/lehre/studienplan_vorrueckung.php           |   0
 vilesci/lehre/studienplan_zuteilung.php             |   0
 vilesci/lehre/zeitwuensche.php                      |   0
 vilesci/main.php                                    |   0
 vilesci/personen/akteupdate.php                     |   0
 vilesci/personen/aliquote_reduktion.json.php        |   0
 vilesci/personen/aliquote_reduktion.php             |   0
 vilesci/personen/anwesenheit.php                    |   0
 vilesci/personen/anwesenheitslisten_barcode.php     |   0
 vilesci/personen/aufbaukurscheckliste.php           |   0
 vilesci/personen/funktion.php                       |   0
 vilesci/personen/funktion_det.php                   |   0
 vilesci/personen/import/interessentenimport.php     |   0
 vilesci/personen/import/mitarbeiterimport.php       |   0
 vilesci/personen/incoming_detail.php                |   0
 vilesci/personen/incoming_frameset.php              |   0
 vilesci/personen/incoming_lehrveranstaltungen.php   |   0
 vilesci/personen/incoming_uebersicht.php            |   0
 vilesci/personen/index.html                         |   0
 vilesci/personen/institutsliste.php                 |   0
 vilesci/personen/kontaktdaten_edit.php              |   0
 vilesci/personen/lehrveranstaltungen_json.php       |   0
 vilesci/personen/leistungsstipendium.php            |   0
 vilesci/personen/lektor_uebersicht.php              |   0
 vilesci/personen/outgoing_detail.php                |   0
 vilesci/personen/outgoing_frameset.php              |   0
 vilesci/personen/outgoing_uebersicht.php            |   0
 vilesci/personen/personen_anlegen.php               |   0
 vilesci/personen/personen_details.php               |   0
 vilesci/personen/personendetails.php                |   0
 vilesci/personen/preinteressent_anlegen.php         |   0
 vilesci/personen/preinteressent_detail.php          |   0
 vilesci/personen/preinteressent_frameset.html       |   0
 vilesci/personen/preinteressent_uebernahme.php      |   0
 vilesci/personen/preinteressent_uebersicht.php      |   0
 vilesci/personen/student_edit.php                   |   0
 vilesci/personen/student_vorrueckung.php            |   0
 vilesci/personen/suche.php                          |   0
 vilesci/personen/uniflow.csv.php                    |   0
 vilesci/personen/urlaubsverwaltung.php              |   0
 vilesci/personen/wiederholer.php                    |   0
 vilesci/personen/zeitwunsch.php                     |   0
 vilesci/stammdaten/ampel_details.php                |   0
 vilesci/stammdaten/ampel_frameset.html              |   0
 vilesci/stammdaten/ampel_uebersicht.php             |   0
 vilesci/stammdaten/auswertung_fhtw.php              |   0
 .../benutzerberechtigung_autocomplete.php           |   0
 .../stammdaten/benutzerberechtigung_detailliste.php |   0
 vilesci/stammdaten/benutzerberechtigung_details.php |   0
 .../stammdaten/benutzerberechtigung_frameset.html   |   0
 .../stammdaten/benutzerberechtigung_uebersicht.php  |   0
 vilesci/stammdaten/berechtigungen.php               |   0
 vilesci/stammdaten/berechtigungrolle.php            |   0
 vilesci/stammdaten/betriebsmittel_details.php       |   0
 vilesci/stammdaten/betriebsmittel_frameset.php      |   0
 vilesci/stammdaten/betriebsmittel_uebersicht.php    |   0
 vilesci/stammdaten/buchung_typ.php                  |   0
 vilesci/stammdaten/cronjobverwaltung.php            |   0
 vilesci/stammdaten/dokumentvorlagen_verwaltung.php  |   0
 vilesci/stammdaten/firma_details.php                |   0
 vilesci/stammdaten/firma_detailwork.php             |   0
 vilesci/stammdaten/firma_frameset.html              |   0
 vilesci/stammdaten/firma_uebersicht.php             |   0
 vilesci/stammdaten/firma_zusammen_details.php       |   0
 vilesci/stammdaten/firma_zusammen_uebersicht.php    |   0
 vilesci/stammdaten/gsprogramm.php                   |   0
 vilesci/stammdaten/imexport/dabis.php               |   0
 vilesci/stammdaten/imexport/index.html              |   0
 .../stammdaten/imexport/zutrittskarten/export.php   |   0
 .../imexport/zutrittskarten/generatefromsipass.php  |   0
 .../zutrittskarten/generatefromsipass_predelete.php |   0
 .../stammdaten/imexport/zutrittskarten/import.php   |   0
 .../stammdaten/imexport/zutrittskarten/index.html   |   0
 vilesci/stammdaten/infoscreen_details.php           |   0
 vilesci/stammdaten/infoscreen_frameset.html         |   0
 vilesci/stammdaten/infoscreen_preview.php           |   0
 vilesci/stammdaten/infoscreen_uebersicht.php        |   0
 vilesci/stammdaten/lvbgruppenverwaltung.js          |   0
 vilesci/stammdaten/lvbgruppenverwaltung.php         |   0
 vilesci/stammdaten/lvbgruppenverwaltungDetail.php   |   0
 vilesci/stammdaten/lvbgruppenverwaltungTree.php     |   0
 vilesci/stammdaten/organisationseinheiten.php       |   0
 vilesci/stammdaten/personen_wartung.php             |   0
 vilesci/stammdaten/raum_details.php                 |   0
 vilesci/stammdaten/raum_frameset.html               |   0
 vilesci/stammdaten/raum_uebersicht.php              |   0
 vilesci/stammdaten/reihungstest_administration.php  |   0
 vilesci/stammdaten/reihungstest_zusammenlegung.php  |   0
 vilesci/stammdaten/reihungstestverwaltung.php       |   0
 .../reihungstestverwaltung_autocomplete.php         |   0
 vilesci/stammdaten/service_details.php              |   0
 vilesci/stammdaten/service_frameset.html            |   0
 vilesci/stammdaten/service_uebersicht.php           |   0
 vilesci/stammdaten/set_gemeinde.php                 |   0
 vilesci/stammdaten/stammdaten_autocomplete.php      |   0
 vilesci/stammdaten/statistik_details.php            |   0
 vilesci/stammdaten/statistik_frameset.html          |   0
 vilesci/stammdaten/statistik_uebersicht.php         |   0
 vilesci/stammdaten/studiengang_details.js           |   0
 vilesci/stammdaten/studiengang_details.php          |   0
 vilesci/stammdaten/studiengang_dokumente.php        |   0
 vilesci/stammdaten/studiengang_edit.php             |   0
 vilesci/stammdaten/studiengang_frameset.html        |   0
 vilesci/stammdaten/studiengang_uebersicht.php       |   0
 vilesci/stammdaten/studiensemester.php              |   0
 vilesci/stammdaten/variablen_details.php            |   0
 vilesci/stammdaten/variablen_frameset.html          |   0
 vilesci/stammdaten/variablen_uebersicht.php         |   0
 vilesci/stammdaten/vertrag_typ.php                  |   0
 vilesci/statistik/filter_details.php                |   0
 vilesci/statistik/filter_frameset.html              |   0
 vilesci/statistik/filter_overview.php               |   0
 vilesci/statistik/filter_vorschau.php               |   0
 vilesci/statistik/incoming.php                      |   0
 vilesci/statistik/oehwaehlerverzeichnis.php         |   0
 vilesci/statistik/outgoing.php                      |   0
 vilesci/statistik/statistik.php                     |   0
 vilesci/statistik/statistik_frameset.php            |   0
 vilesci/statistik/statistik_sql.php                 |   0
 vilesci/statistik/studenten_historie.php            |   0
 vilesci/statistik/studierendenliste_oeh.php         |   0
 vilesci/top.php                                     |   0
 wawi/auswertungen/aufteilung.php                    |   0
 wawi/auswertungen/konto.php                         |   0
 wawi/auswertungen/kostenstelle.php                  |   0
 wawi/auswertungen/wawi_tags.php                     |   0
 wawi/auth.php                                       |   0
 wawi/berechtigung.php                               |   0
 wawi/bestellung.php                                 |   0
 wawi/budget.php                                     |   0
 wawi/check_bestellung.php                           |   0
 wawi/firma.php                                      |   0
 wawi/home.php                                       |   0
 wawi/index.php                                      |   0
 wawi/kontouebersicht.php                            |   0
 wawi/kostenstellenuebersicht.php                    |   0
 wawi/login.php                                      |   0
 wawi/logout.php                                     |   0
 wawi/menu.php                                       |   0
 wawi/mwst.html                                      |   0
 wawi/pdfExport.txt                                  |   0
 wawi/rechnung.php                                   |   0
 wawi/wawi_autocomplete.php                          |   0
 webdav/Caldav_Backend.php                           |   0
 webdav/Principal.php                                |   0
 webdav/auth.class.php                               |   0
 webdav/google.txt                                   |   0
 webdav/lvplan.php                                   |   0
 5653 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 .gitignore
 mode change 100755 => 100644 CHANGELOG.md
 mode change 100755 => 100644 FHC-vendor/angular-tablesort/.gitignore
 mode change 100755 => 100644 FHC-vendor/angular-tablesort/LICENSE
 mode change 100755 => 100644 FHC-vendor/angular-tablesort/README.md
 mode change 100755 => 100644 FHC-vendor/angular-tablesort/bower.json
 mode change 100755 => 100644 FHC-vendor/angular-tablesort/example.html
 mode change 100755 => 100644 FHC-vendor/angular-tablesort/index.js
 mode change 100755 => 100644 FHC-vendor/angular-tablesort/js/angular-tablesort.js
 mode change 100755 => 100644 FHC-vendor/angular-tablesort/package.json
 mode change 100755 => 100644 FHC-vendor/angular-tablesort/tablesort.css
 mode change 100755 => 100644 FHC-vendor/easyui/changelog.txt
 mode change 100755 => 100644 FHC-vendor/easyui/easyloader.js
 mode change 100755 => 100644 FHC-vendor/easyui/jquery.easyui.min.js
 mode change 100755 => 100644 FHC-vendor/easyui/jquery.easyui.mobile.js
 mode change 100755 => 100644 FHC-vendor/easyui/jquery.min.js
 mode change 100755 => 100644 FHC-vendor/easyui/license_freeware.txt
 mode change 100755 => 100644 FHC-vendor/easyui/locale/easyui-lang-af.js
 mode change 100755 => 100644 FHC-vendor/easyui/locale/easyui-lang-am.js
 mode change 100755 => 100644 FHC-vendor/easyui/locale/easyui-lang-ar.js
 mode change 100755 => 100644 FHC-vendor/easyui/locale/easyui-lang-bg.js
 mode change 100755 => 100644 FHC-vendor/easyui/locale/easyui-lang-ca.js
 mode change 100755 => 100644 FHC-vendor/easyui/locale/easyui-lang-cs.js
 mode change 100755 => 100644 FHC-vendor/easyui/locale/easyui-lang-cz.js
 mode change 100755 => 100644 FHC-vendor/easyui/locale/easyui-lang-da.js
 mode change 100755 => 100644 FHC-vendor/easyui/locale/easyui-lang-de.js
 mode change 100755 => 100644 FHC-vendor/easyui/locale/easyui-lang-el.js
 mode change 100755 => 100644 FHC-vendor/easyui/locale/easyui-lang-en.js
 mode change 100755 => 100644 FHC-vendor/easyui/locale/easyui-lang-es.js
 mode change 100755 => 100644 FHC-vendor/easyui/locale/easyui-lang-fr.js
 mode change 100755 => 100644 FHC-vendor/easyui/locale/easyui-lang-it.js
 mode change 100755 => 100644 FHC-vendor/easyui/locale/easyui-lang-jp.js
 mode change 100755 => 100644 FHC-vendor/easyui/locale/easyui-lang-nl.js
 mode change 100755 => 100644 FHC-vendor/easyui/locale/easyui-lang-pl.js
 mode change 100755 => 100644 FHC-vendor/easyui/locale/easyui-lang-pt_BR.js
 mode change 100755 => 100644 FHC-vendor/easyui/locale/easyui-lang-ru.js
 mode change 100755 => 100644 FHC-vendor/easyui/locale/easyui-lang-sv_SE.js
 mode change 100755 => 100644 FHC-vendor/easyui/locale/easyui-lang-tr.js
 mode change 100755 => 100644 FHC-vendor/easyui/locale/easyui-lang-zh_CN.js
 mode change 100755 => 100644 FHC-vendor/easyui/locale/easyui-lang-zh_TW.js
 mode change 100755 => 100644 FHC-vendor/easyui/plugins/jquery.accordion.js
 mode change 100755 => 100644 FHC-vendor/easyui/plugins/jquery.calendar.js
 mode change 100755 => 100644 FHC-vendor/easyui/plugins/jquery.combo.js
 mode change 100755 => 100644 FHC-vendor/easyui/plugins/jquery.combobox.js
 mode change 100755 => 100644 FHC-vendor/easyui/plugins/jquery.combogrid.js
 mode change 100755 => 100644 FHC-vendor/easyui/plugins/jquery.combotree.js
 mode change 100755 => 100644 FHC-vendor/easyui/plugins/jquery.datagrid.js
 mode change 100755 => 100644 FHC-vendor/easyui/plugins/jquery.datalist.js
 mode change 100755 => 100644 FHC-vendor/easyui/plugins/jquery.datebox.js
 mode change 100755 => 100644 FHC-vendor/easyui/plugins/jquery.datetimebox.js
 mode change 100755 => 100644 FHC-vendor/easyui/plugins/jquery.datetimespinner.js
 mode change 100755 => 100644 FHC-vendor/easyui/plugins/jquery.dialog.js
 mode change 100755 => 100644 FHC-vendor/easyui/plugins/jquery.draggable.js
 mode change 100755 => 100644 FHC-vendor/easyui/plugins/jquery.droppable.js
 mode change 100755 => 100644 FHC-vendor/easyui/plugins/jquery.filebox.js
 mode change 100755 => 100644 FHC-vendor/easyui/plugins/jquery.form.js
 mode change 100755 => 100644 FHC-vendor/easyui/plugins/jquery.layout.js
 mode change 100755 => 100644 FHC-vendor/easyui/plugins/jquery.linkbutton.js
 mode change 100755 => 100644 FHC-vendor/easyui/plugins/jquery.menu.js
 mode change 100755 => 100644 FHC-vendor/easyui/plugins/jquery.menubutton.js
 mode change 100755 => 100644 FHC-vendor/easyui/plugins/jquery.messager.js
 mode change 100755 => 100644 FHC-vendor/easyui/plugins/jquery.mobile.js
 mode change 100755 => 100644 FHC-vendor/easyui/plugins/jquery.numberbox.js
 mode change 100755 => 100644 FHC-vendor/easyui/plugins/jquery.numberspinner.js
 mode change 100755 => 100644 FHC-vendor/easyui/plugins/jquery.pagination.js
 mode change 100755 => 100644 FHC-vendor/easyui/plugins/jquery.panel.js
 mode change 100755 => 100644 FHC-vendor/easyui/plugins/jquery.parser.js
 mode change 100755 => 100644 FHC-vendor/easyui/plugins/jquery.progressbar.js
 mode change 100755 => 100644 FHC-vendor/easyui/plugins/jquery.propertygrid.js
 mode change 100755 => 100644 FHC-vendor/easyui/plugins/jquery.resizable.js
 mode change 100755 => 100644 FHC-vendor/easyui/plugins/jquery.searchbox.js
 mode change 100755 => 100644 FHC-vendor/easyui/plugins/jquery.slider.js
 mode change 100755 => 100644 FHC-vendor/easyui/plugins/jquery.spinner.js
 mode change 100755 => 100644 FHC-vendor/easyui/plugins/jquery.splitbutton.js
 mode change 100755 => 100644 FHC-vendor/easyui/plugins/jquery.switchbutton.js
 mode change 100755 => 100644 FHC-vendor/easyui/plugins/jquery.tabs.js
 mode change 100755 => 100644 FHC-vendor/easyui/plugins/jquery.textbox.js
 mode change 100755 => 100644 FHC-vendor/easyui/plugins/jquery.timespinner.js
 mode change 100755 => 100644 FHC-vendor/easyui/plugins/jquery.tooltip.js
 mode change 100755 => 100644 FHC-vendor/easyui/plugins/jquery.tree.js
 mode change 100755 => 100644 FHC-vendor/easyui/plugins/jquery.treegrid.js
 mode change 100755 => 100644 FHC-vendor/easyui/plugins/jquery.validatebox.js
 mode change 100755 => 100644 FHC-vendor/easyui/plugins/jquery.window.js
 mode change 100755 => 100644 FHC-vendor/easyui/readme.txt
 mode change 100755 => 100644 FHC-vendor/easyui/src/easyloader.js
 mode change 100755 => 100644 FHC-vendor/easyui/src/jquery.accordion.js
 mode change 100755 => 100644 FHC-vendor/easyui/src/jquery.calendar.js
 mode change 100755 => 100644 FHC-vendor/easyui/src/jquery.combobox.js
 mode change 100755 => 100644 FHC-vendor/easyui/src/jquery.datebox.js
 mode change 100755 => 100644 FHC-vendor/easyui/src/jquery.draggable.js
 mode change 100755 => 100644 FHC-vendor/easyui/src/jquery.droppable.js
 mode change 100755 => 100644 FHC-vendor/easyui/src/jquery.form.js
 mode change 100755 => 100644 FHC-vendor/easyui/src/jquery.linkbutton.js
 mode change 100755 => 100644 FHC-vendor/easyui/src/jquery.menu.js
 mode change 100755 => 100644 FHC-vendor/easyui/src/jquery.parser.js
 mode change 100755 => 100644 FHC-vendor/easyui/src/jquery.progressbar.js
 mode change 100755 => 100644 FHC-vendor/easyui/src/jquery.propertygrid.js
 mode change 100755 => 100644 FHC-vendor/easyui/src/jquery.resizable.js
 mode change 100755 => 100644 FHC-vendor/easyui/src/jquery.slider.js
 mode change 100755 => 100644 FHC-vendor/easyui/src/jquery.tabs.js
 mode change 100755 => 100644 FHC-vendor/easyui/src/jquery.window.js
 mode change 100755 => 100644 FHC-vendor/easyui/themes/black/accordion.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/black/calendar.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/black/combo.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/black/combobox.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/black/datagrid.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/black/datalist.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/black/datebox.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/black/dialog.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/black/easyui.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/black/filebox.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/black/images/accordion_arrows.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/black/images/blank.gif
 mode change 100755 => 100644 FHC-vendor/easyui/themes/black/images/calendar_arrows.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/black/images/combo_arrow.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/black/images/datagrid_icons.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/black/images/datebox_arrow.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/black/images/layout_arrows.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/black/images/linkbutton_bg.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/black/images/loading.gif
 mode change 100755 => 100644 FHC-vendor/easyui/themes/black/images/menu_arrows.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/black/images/messager_icons.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/black/images/pagination_icons.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/black/images/panel_tools.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/black/images/searchbox_button.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/black/images/slider_handle.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/black/images/spinner_arrows.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/black/images/tabs_icons.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/black/images/tree_icons.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/black/images/validatebox_warning.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/black/layout.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/black/linkbutton.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/black/menu.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/black/menubutton.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/black/messager.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/black/numberbox.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/black/pagination.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/black/panel.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/black/progressbar.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/black/propertygrid.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/black/searchbox.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/black/slider.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/black/spinner.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/black/splitbutton.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/black/switchbutton.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/black/tabs.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/black/textbox.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/black/tooltip.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/black/tree.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/black/validatebox.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/black/window.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/bootstrap/accordion.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/bootstrap/calendar.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/bootstrap/combo.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/bootstrap/combobox.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/bootstrap/datagrid.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/bootstrap/datebox.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/bootstrap/dialog.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/bootstrap/easyui.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/bootstrap/filebox.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/bootstrap/images/accordion_arrows.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/bootstrap/images/blank.gif
 mode change 100755 => 100644 FHC-vendor/easyui/themes/bootstrap/images/calendar_arrows.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/bootstrap/images/combo_arrow.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/bootstrap/images/datagrid_icons.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/bootstrap/images/datebox_arrow.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/bootstrap/images/layout_arrows.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/bootstrap/images/linkbutton_bg.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/bootstrap/images/loading.gif
 mode change 100755 => 100644 FHC-vendor/easyui/themes/bootstrap/images/menu_arrows.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/bootstrap/images/messager_icons.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/bootstrap/images/pagination_icons.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/bootstrap/images/panel_tools.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/bootstrap/images/searchbox_button.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/bootstrap/images/slider_handle.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/bootstrap/images/spinner_arrows.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/bootstrap/images/tabs_icons.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/bootstrap/images/tree_icons.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/bootstrap/images/validatebox_warning.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/bootstrap/layout.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/bootstrap/linkbutton.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/bootstrap/menu.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/bootstrap/menubutton.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/bootstrap/messager.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/bootstrap/numberbox.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/bootstrap/pagination.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/bootstrap/panel.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/bootstrap/progressbar.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/bootstrap/propertygrid.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/bootstrap/searchbox.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/bootstrap/slider.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/bootstrap/spinner.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/bootstrap/splitbutton.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/bootstrap/switchbutton.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/bootstrap/tabs.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/bootstrap/textbox.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/bootstrap/tooltip.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/bootstrap/tree.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/bootstrap/validatebox.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/bootstrap/window.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/color.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/default/accordion.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/default/calendar.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/default/combo.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/default/combobox.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/default/datagrid.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/default/datalist.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/default/datebox.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/default/dialog.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/default/easyui.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/default/filebox.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/default/images/accordion_arrows.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/default/images/blank.gif
 mode change 100755 => 100644 FHC-vendor/easyui/themes/default/images/calendar_arrows.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/default/images/combo_arrow.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/default/images/datagrid_icons.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/default/images/datebox_arrow.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/default/images/layout_arrows.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/default/images/linkbutton_bg.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/default/images/loading.gif
 mode change 100755 => 100644 FHC-vendor/easyui/themes/default/images/menu_arrows.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/default/images/messager_icons.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/default/images/pagination_icons.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/default/images/panel_tools.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/default/images/searchbox_button.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/default/images/slider_handle.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/default/images/spinner_arrows.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/default/images/tabs_icons.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/default/images/tree_icons.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/default/images/validatebox_warning.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/default/layout.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/default/linkbutton.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/default/menu.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/default/menubutton.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/default/messager.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/default/numberbox.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/default/pagination.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/default/panel.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/default/progressbar.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/default/propertygrid.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/default/searchbox.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/default/slider.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/default/spinner.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/default/splitbutton.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/default/switchbutton.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/default/tabs.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/default/textbox.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/default/tooltip.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/default/tree.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/default/validatebox.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/default/window.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/gray/accordion.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/gray/calendar.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/gray/combo.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/gray/combobox.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/gray/datagrid.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/gray/datalist.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/gray/datebox.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/gray/dialog.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/gray/easyui.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/gray/filebox.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/gray/images/accordion_arrows.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/gray/images/blank.gif
 mode change 100755 => 100644 FHC-vendor/easyui/themes/gray/images/calendar_arrows.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/gray/images/combo_arrow.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/gray/images/datagrid_icons.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/gray/images/datebox_arrow.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/gray/images/layout_arrows.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/gray/images/linkbutton_bg.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/gray/images/loading.gif
 mode change 100755 => 100644 FHC-vendor/easyui/themes/gray/images/menu_arrows.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/gray/images/messager_icons.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/gray/images/pagination_icons.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/gray/images/panel_tools.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/gray/images/searchbox_button.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/gray/images/slider_handle.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/gray/images/spinner_arrows.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/gray/images/tabs_icons.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/gray/images/tree_icons.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/gray/images/validatebox_warning.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/gray/layout.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/gray/linkbutton.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/gray/menu.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/gray/menubutton.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/gray/messager.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/gray/numberbox.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/gray/pagination.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/gray/panel.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/gray/progressbar.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/gray/propertygrid.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/gray/searchbox.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/gray/slider.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/gray/spinner.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/gray/splitbutton.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/gray/switchbutton.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/gray/tabs.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/gray/textbox.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/gray/tooltip.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/gray/tree.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/gray/validatebox.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/gray/window.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/icon.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/icons/back.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/icons/blank.gif
 mode change 100755 => 100644 FHC-vendor/easyui/themes/icons/cancel.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/icons/clear.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/icons/cut.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/icons/edit_add.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/icons/edit_remove.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/icons/filesave.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/icons/filter.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/icons/help.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/icons/large_chart.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/icons/large_clipart.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/icons/large_picture.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/icons/large_shapes.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/icons/large_smartart.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/icons/lock.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/icons/man.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/icons/mini_add.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/icons/mini_edit.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/icons/mini_refresh.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/icons/more.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/icons/no.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/icons/ok.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/icons/pencil.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/icons/print.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/icons/redo.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/icons/reload.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/icons/search.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/icons/sum.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/icons/tip.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/icons/undo.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/metro/accordion.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/metro/calendar.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/metro/combo.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/metro/combobox.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/metro/datagrid.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/metro/datalist.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/metro/datebox.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/metro/dialog.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/metro/easyui.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/metro/filebox.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/metro/images/accordion_arrows.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/metro/images/blank.gif
 mode change 100755 => 100644 FHC-vendor/easyui/themes/metro/images/calendar_arrows.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/metro/images/combo_arrow.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/metro/images/datagrid_icons.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/metro/images/datebox_arrow.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/metro/images/layout_arrows.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/metro/images/linkbutton_bg.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/metro/images/loading.gif
 mode change 100755 => 100644 FHC-vendor/easyui/themes/metro/images/menu_arrows.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/metro/images/messager_icons.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/metro/images/pagination_icons.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/metro/images/panel_tools.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/metro/images/searchbox_button.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/metro/images/slider_handle.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/metro/images/spinner_arrows.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/metro/images/tabs_icons.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/metro/images/tree_icons.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/metro/images/validatebox_warning.png
 mode change 100755 => 100644 FHC-vendor/easyui/themes/metro/layout.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/metro/linkbutton.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/metro/menu.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/metro/menubutton.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/metro/messager.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/metro/numberbox.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/metro/pagination.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/metro/panel.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/metro/progressbar.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/metro/propertygrid.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/metro/searchbox.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/metro/slider.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/metro/spinner.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/metro/splitbutton.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/metro/switchbutton.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/metro/tabs.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/metro/textbox.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/metro/tooltip.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/metro/tree.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/metro/validatebox.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/metro/window.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/mobile.css
 mode change 100755 => 100644 FHC-vendor/easyui/themes/vilesci
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/.gitattributes
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/.gitignore
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/.jscsrc
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/CONTRIBUTING.md
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/Gruntfile.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/README.md
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/addons/pager/icons/first.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/addons/pager/icons/last.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/addons/pager/icons/loading.gif
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/addons/pager/icons/next.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/addons/pager/icons/prev.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/addons/pager/jquery.tablesorter.pager.css
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/addons/pager/jquery.tablesorter.pager.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/beta-testing/example-pager-custom-controls.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/beta-testing/example-widget-column-reorder.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/beta-testing/pager-custom-controls.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/beta-testing/widget-reorder.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/bower.json
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/changelog.txt
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/css/bootstrap.less
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/css/dragtable.mod.css
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/css/filter.formatter.css
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/css/images/black-asc.gif
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/css/images/black-desc.gif
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/css/images/black-unsorted.gif
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/css/images/bootstrap-black-unsorted.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/css/images/bootstrap-white-unsorted.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/css/images/dragtable-handle.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/css/images/dragtable-handle.svg
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/css/images/dropbox-asc-hovered.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/css/images/dropbox-asc.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/css/images/dropbox-desc-hovered.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/css/images/dropbox-desc.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/css/images/green-asc.gif
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/css/images/green-desc.gif
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/css/images/green-header.gif
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/css/images/green-unsorted.gif
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/css/images/ice-asc.gif
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/css/images/ice-desc.gif
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/css/images/ice-unsorted.gif
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/css/images/metro-black-asc.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/css/images/metro-black-desc.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/css/images/metro-loading.gif
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/css/images/metro-unsorted.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/css/images/metro-white-asc.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/css/images/metro-white-desc.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/css/images/white-asc.gif
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/css/images/white-desc.gif
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/css/images/white-unsorted.gif
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/css/metro.less
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/css/psd/green-asc.psd
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/css/psd/green-desc.psd
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/css/psd/green-unsorted.psd
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/css/psd/metro-style.psd
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/css/theme.black-ice.css
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/css/theme.blue.css
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/css/theme.bootstrap.css
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/css/theme.bootstrap_2.css
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/css/theme.dark.css
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/css/theme.default.css
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/css/theme.dropbox.css
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/css/theme.green.css
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/css/theme.grey.css
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/css/theme.ice.css
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/css/theme.jui.css
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/css/theme.less
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/css/theme.metro-dark.css
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/css/dragtable.mod.min.css
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/css/filter.formatter.min.css
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/css/images/black-asc.gif
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/css/images/black-desc.gif
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/css/images/black-unsorted.gif
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/css/images/bootstrap-black-unsorted.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/css/images/bootstrap-white-unsorted.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/css/images/dragtable-handle.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/css/images/dragtable-handle.svg
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/css/images/dropbox-asc-hovered.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/css/images/dropbox-asc.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/css/images/dropbox-desc-hovered.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/css/images/dropbox-desc.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/css/images/first.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/css/images/green-asc.gif
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/css/images/green-desc.gif
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/css/images/green-header.gif
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/css/images/green-unsorted.gif
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/css/images/ice-asc.gif
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/css/images/ice-desc.gif
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/css/images/ice-unsorted.gif
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/css/images/last.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/css/images/loading.gif
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/css/images/metro-black-asc.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/css/images/metro-black-desc.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/css/images/metro-loading.gif
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/css/images/metro-unsorted.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/css/images/metro-white-asc.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/css/images/metro-white-desc.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/css/images/next.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/css/images/prev.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/css/images/white-asc.gif
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/css/images/white-desc.gif
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/css/images/white-unsorted.gif
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/css/jquery.tablesorter.pager.min.css
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/css/less/bootstrap.less
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/css/less/metro.less
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/css/less/theme.less
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/css/theme.blackice.min.css
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/css/theme.blue.min.css
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/css/theme.bootstrap.min.css
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/css/theme.bootstrap_2.min.css
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/css/theme.dark.min.css
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/css/theme.default.min.css
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/css/theme.dropbox.min.css
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/css/theme.green.min.css
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/css/theme.grey.min.css
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/css/theme.ice.min.css
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/css/theme.jui.min.css
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/css/theme.metro-dark.min.css
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/extras/jquery.dragtable.mod.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/extras/jquery.metadata.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/extras/jquery.tablesorter.pager.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/extras/semver-mod.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.combined.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.combined.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.widgets.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.widgets.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-extract.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-iso8601.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-month.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-range.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-two-digit-year.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-weekday.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-duration.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-feet-inch-fraction.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-file-type.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-globalize.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-ignore-articles.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-image.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-input-select.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-metric.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-named-numbers.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-network.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-roman.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-alignChar.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-build-table.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-chart.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-columnSelector.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-columns.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-cssStickyHeaders.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-editable.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-filter-formatter-html5.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-filter-formatter-jui.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-filter-formatter-select2.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-filter-type-insideRange.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-filter.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-formatter.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-grouping.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-headerTitles.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-lazyload.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-math.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-output.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-pager.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-print.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-reflow.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-repeatheaders.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-resizable.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-saveSort.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-scroller.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-sort2Hash.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-sortTbodies.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-staticRow.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-stickyHeaders.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-storage.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-toggle.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-uitheme.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-view.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/assets/City0.json
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/assets/City1.json
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/assets/City2.json
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/assets/City3.json
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/assets/ajax-content.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/assets/build.json
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/assets/build.txt
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/assets/theme_switcher.json
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/css/bootstrap-v2.min.css
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/css/bootstrap.min.css
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/css/images/glyphicons-halflings-white.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/css/images/glyphicons-halflings.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_flat_15_cd0a0a_40x100.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_glass_100_e4f1fb_1x400.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_glass_50_3baae3_1x400.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_glass_80_d7ebf9_1x400.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_highlight-hard_70_000000_1x100.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_highlight-soft_100_deedf7_1x100.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_highlight-soft_25_ffef8f_1x100.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/css/images/ui-icons_2694e8_256x240.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/css/images/ui-icons_2e83ff_256x240.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/css/images/ui-icons_3d80b3_256x240.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/css/images/ui-icons_72a7cf_256x240.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/css/images/ui-icons_ffffff_256x240.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/css/jq.css
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/css/jquery-ui.min.css
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/css/magnific-popup.css
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/css/menu.css
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/css/prettify.css
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/css/rangeslider.css
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/css/select2-3.4.6.min.css
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/css/select2-spinner.gif
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/css/select2.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/css/select2x2.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/css/tipsy.css
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-add-rows.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-ajax.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-apply-widget.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-child-rows-filtered.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-child-rows.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-css-highlighting.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-dragtable.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-empty-table.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-extending-defaults.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-extractors-parsers.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-header-column-span.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-locale-sort.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-meta-headers.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-meta-parsers.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-meta-sort-list.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-method-sortreset.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-multiple-tbodies.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-option-custom-sort.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-option-date-format.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-option-debug.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-option-delay-init.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-option-digits.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-option-render-header.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-option-render-template.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-option-selectorsort.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-option-show-processing.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-option-sort-append.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-option-sort-empty.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-option-sort-force.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-option-sort-key.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-option-sort-list.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-option-sort-order.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-option-sortreset-sortrestart.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-option-text-extraction.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-option-textsorter-semver.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-option-theme-metro-style.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-options-headers-digits-strings.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-options-headers-locked.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-options-headers-order.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-options-headers-parser.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-options-headers.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-pager-ajax.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-pager-filtered.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-pager.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-parsers-advanced.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-parsers-class-name.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-parsers-date-range.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-parsers-dates.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-parsers-duration.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-parsers-feet-inch-fraction.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-parsers-file-type.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-parsers-globalize.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-parsers-ignore-articles.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-parsers-ip-address.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-parsers-jquery-data.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-parsers-metric.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-parsers-named-numbers.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-parsers-roman.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-parsers.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-trigger-sort.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-triggers.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-update-all.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-update-cell.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-widget-align-character.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-widget-bootstrap-theme-v2.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-widget-bootstrap-theme.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-widget-build-table.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-widget-chart.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-widget-column-selector.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-widget-columns.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-widget-css-sticky-header.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-widget-editable.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-widget-filter-any-match.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-widget-filter-childrows.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-widget-filter-custom-search.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-widget-filter-custom-search2.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-widget-filter-custom.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-widget-filter-external-inputs.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-widget-filter-formatter-1.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-widget-filter-formatter-2.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-widget-filter-formatter-select2.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-widget-filter-selectmenu.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-widget-filter.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-widget-formatter.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-widget-grouping-filter-childrows.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-widget-grouping.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-widget-header-titles.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-widget-lazyload.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-widget-math.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-widget-output.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-widget-pager-ajax.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-widget-pager.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-widget-print.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-widget-reflow.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-widget-reflow1.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-widget-reflow2.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-widget-reflow3.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-widget-resizable.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-widget-savesort.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-widget-scroller.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-widget-sort-tbodies.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-widget-sort-to-hash.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-widget-static-row.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-widget-sticky-header.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-widget-toggle-tablesorter.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-widget-ui-theme.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-widget-view.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-widget-zebra.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/example-widgets.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/fonts/glyphicons-halflings-regular.eot
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/fonts/glyphicons-halflings-regular.svg
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/fonts/glyphicons-halflings-regular.ttf
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/fonts/glyphicons-halflings-regular.woff
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/fonts/glyphicons-halflings-regular.woff2
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/img/external.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/img/grid-default-thumb.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/img/link.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/img/new-product-banner.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/img/sale-banner.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/img/screens-blue.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/img/screens.png
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/index.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/js/bootstrap.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/js/chili/jquery.chili-2.2.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/js/chili/recipes.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/js/demo-build-table.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/js/docs.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/js/jquery-1.2.6.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/js/jquery-1.4.4.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/js/jquery-latest.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/js/jquery-ui.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/js/jquery.jui_theme_switch.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/js/jquery.magnific-popup.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/js/jquery.tipsy.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/js/prettify.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/js/rangeslider.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/js/search-ie.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/js/search.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/js/select2-3.4.6.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/js/sugar.min.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/docs/themes.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/example.json
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/index.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/extras/jquery.dragtable.mod.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/extras/jquery.metadata.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/extras/semver-mod.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/extras/semver.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/jquery.tablesorter.combined.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/jquery.tablesorter.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/jquery.tablesorter.widgets.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/parsers/parser-date-extract.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/parsers/parser-date-iso8601.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/parsers/parser-date-month.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/parsers/parser-date-range.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/parsers/parser-date-two-digit-year.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/parsers/parser-date-weekday.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/parsers/parser-date.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/parsers/parser-duration.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/parsers/parser-feet-inch-fraction.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/parsers/parser-file-type.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/parsers/parser-globalize.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/parsers/parser-ignore-articles.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/parsers/parser-image.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/parsers/parser-input-select.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/parsers/parser-metric.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/parsers/parser-named-numbers.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/parsers/parser-network.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/parsers/parser-roman.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/widgets/widget-alignChar.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/widgets/widget-build-table.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/widgets/widget-chart.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/widgets/widget-columnSelector.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/widgets/widget-columns.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/widgets/widget-cssStickyHeaders.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/widgets/widget-editable.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/widgets/widget-filter-formatter-html5.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/widgets/widget-filter-formatter-jui.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/widgets/widget-filter-formatter-select2.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/widgets/widget-filter-type-insideRange.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/widgets/widget-filter.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/widgets/widget-formatter.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/widgets/widget-grouping.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/widgets/widget-headerTitles.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/widgets/widget-lazyload.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/widgets/widget-math.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/widgets/widget-output.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/widgets/widget-pager.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/widgets/widget-print.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/widgets/widget-reflow.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/widgets/widget-repeatheaders.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/widgets/widget-resizable.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/widgets/widget-saveSort.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/widgets/widget-scroller.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/widgets/widget-sort2Hash.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/widgets/widget-sortTbodies.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/widgets/widget-staticRow.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/widgets/widget-stickyHeaders.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/widgets/widget-storage.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/widgets/widget-toggle.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/widgets/widget-uitheme.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/js/widgets/widget-view.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/package.json
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/tablesorter.jquery.json
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/test.html
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/testing/qunit-1.20.0.css
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/testing/qunit-1.20.0.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/testing/testing-ipv6.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/testing/testing-widgets.js
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/testing/testing.css
 mode change 100755 => 100644 FHC-vendor/jquery-tablesorter/testing/testing.js
 mode change 100755 => 100644 LICENSE
 mode change 100755 => 100644 README.md
 mode change 100755 => 100644 addons/.gitignore
 mode change 100755 => 100644 addons/CodingGuidelines.txt
 mode change 100755 => 100644 addons/index.html
 mode change 100755 => 100644 application/cache/index.html
 mode change 100755 => 100644 application/components/extensions/.placeholder
 mode change 100755 => 100644 application/components/filters/LogsViewer.php
 mode change 100755 => 100644 application/config/anrechnung.php
 mode change 100755 => 100644 application/config/auth.php
 mode change 100755 => 100644 application/config/autoload.php
 mode change 100755 => 100644 application/config/config.php
 mode change 100755 => 100644 application/config/constants.php
 mode change 100755 => 100644 application/config/core_includes.php
 mode change 100755 => 100644 application/config/database.php
 mode change 100755 => 100644 application/config/doctypes.php
 mode change 100755 => 100644 application/config/extensions/.placeholder
 mode change 100755 => 100644 application/config/foreign_chars.php
 mode change 100755 => 100644 application/config/hooks.php
 mode change 100755 => 100644 application/config/index.html
 mode change 100755 => 100644 application/config/infocenter.php
 mode change 100755 => 100644 application/config/jqm.php
 mode change 100755 => 100644 application/config/ldap.php
 mode change 100755 => 100644 application/config/mail.php
 mode change 100755 => 100644 application/config/memcached.php
 mode change 100755 => 100644 application/config/message.php
 mode change 100755 => 100644 application/config/migration.php
 mode change 100755 => 100644 application/config/mimes.php
 mode change 100755 => 100644 application/config/navigation.php
 mode change 100755 => 100644 application/config/permission.php
 mode change 100755 => 100644 application/config/profiler.php
 mode change 100755 => 100644 application/config/rest.php
 mode change 100755 => 100644 application/config/routes.php
 mode change 100755 => 100644 application/config/studierendenantrag.php
 mode change 100755 => 100644 application/config/udfmasterschema.json
 mode change 100755 => 100644 application/config/user_agents.php
 mode change 100755 => 100644 application/controllers/Cis/Auth.php
 mode change 100755 => 100644 application/controllers/Cis/Documents.php
 mode change 100755 => 100644 application/controllers/Cis/MyLv.php
 mode change 100755 => 100644 application/controllers/Cis/Profil.php
 mode change 100755 => 100644 application/controllers/Cis/ProfilUpdate.php
 mode change 100755 => 100644 application/controllers/Cis/Pub.php
 mode change 100755 => 100644 application/controllers/Cis/Stundenplan.php
 mode change 100755 => 100644 application/controllers/Cis4.php
 mode change 100755 => 100644 application/controllers/CisHmvc.php
 mode change 100755 => 100644 application/controllers/CisHmvc/Cms.php
 mode change 100755 => 100644 application/controllers/CisHmvc/Dashboard.php
 mode change 100755 => 100644 application/controllers/CisHtml/Cms.php
 mode change 100755 => 100644 application/controllers/CisHtml/Dashboard.php
 mode change 100755 => 100644 application/controllers/CisVue/Cms.php
 mode change 100755 => 100644 application/controllers/CisVue/Dashboard.php
 mode change 100755 => 100644 application/controllers/Test.php
 mode change 100755 => 100644 application/controllers/Vilesci.php
 mode change 100755 => 100644 application/controllers/api/frontend/v1/studstatus/Unterbrechung.php
 mode change 100755 => 100644 application/controllers/api/index.html
 mode change 100755 => 100644 application/controllers/api/v1/CheckUserAuth.php
 mode change 100755 => 100644 application/controllers/api/v1/Test.php
 mode change 100755 => 100644 application/controllers/api/v1/accounting/Aufteilung.php
 mode change 100755 => 100644 application/controllers/api/v1/accounting/Bestelldetail.php
 mode change 100755 => 100644 application/controllers/api/v1/accounting/Bestelldetailtag.php
 mode change 100755 => 100644 application/controllers/api/v1/accounting/Bestellstatus.php
 mode change 100755 => 100644 application/controllers/api/v1/accounting/Bestellung.php
 mode change 100755 => 100644 application/controllers/api/v1/accounting/Bestellungtag.php
 mode change 100755 => 100644 application/controllers/api/v1/accounting/Buchung.php
 mode change 100755 => 100644 application/controllers/api/v1/accounting/Buchungstyp.php
 mode change 100755 => 100644 application/controllers/api/v1/accounting/Budget.php
 mode change 100755 => 100644 application/controllers/api/v1/accounting/Konto.php
 mode change 100755 => 100644 application/controllers/api/v1/accounting/Kostenstelle.php
 mode change 100755 => 100644 application/controllers/api/v1/accounting/Rechnung.php
 mode change 100755 => 100644 application/controllers/api/v1/accounting/Rechnungsbetrag.php
 mode change 100755 => 100644 application/controllers/api/v1/accounting/Rechnungstyp.php
 mode change 100755 => 100644 application/controllers/api/v1/accounting/Vertrag.php
 mode change 100755 => 100644 application/controllers/api/v1/accounting/Vertragsstatus.php
 mode change 100755 => 100644 application/controllers/api/v1/accounting/Vertragstyp.php
 mode change 100755 => 100644 application/controllers/api/v1/accounting/Zahlungstyp.php
 mode change 100755 => 100644 application/controllers/api/v1/codex/Akadgrad.php
 mode change 100755 => 100644 application/controllers/api/v1/codex/Archiv.php
 mode change 100755 => 100644 application/controllers/api/v1/codex/Aufmerksamdurch.php
 mode change 100755 => 100644 application/controllers/api/v1/codex/Ausbildung.php
 mode change 100755 => 100644 application/controllers/api/v1/codex/Berufstaetigkeit.php
 mode change 100755 => 100644 application/controllers/api/v1/codex/Beschaeftigungsausmass.php
 mode change 100755 => 100644 application/controllers/api/v1/codex/Besqual.php
 mode change 100755 => 100644 application/controllers/api/v1/codex/Bisfunktion.php
 mode change 100755 => 100644 application/controllers/api/v1/codex/Bisio.php
 mode change 100755 => 100644 application/controllers/api/v1/codex/Bisorgform.php
 mode change 100755 => 100644 application/controllers/api/v1/codex/Bisverwendung.php
 mode change 100755 => 100644 application/controllers/api/v1/codex/Bundesland.php
 mode change 100755 => 100644 application/controllers/api/v1/codex/Entwicklungsteam.php
 mode change 100755 => 100644 application/controllers/api/v1/codex/Gemeinde.php
 mode change 100755 => 100644 application/controllers/api/v1/codex/Hauptberuf.php
 mode change 100755 => 100644 application/controllers/api/v1/codex/Lehrform.php
 mode change 100755 => 100644 application/controllers/api/v1/codex/Lgartcode.php
 mode change 100755 => 100644 application/controllers/api/v1/codex/Mobilitaetsprogramm.php
 mode change 100755 => 100644 application/controllers/api/v1/codex/Nation.php
 mode change 100755 => 100644 application/controllers/api/v1/codex/Note.php
 mode change 100755 => 100644 application/controllers/api/v1/codex/Orgform.php
 mode change 100755 => 100644 application/controllers/api/v1/codex/Verwendung.php
 mode change 100755 => 100644 application/controllers/api/v1/codex/Zgv.php
 mode change 100755 => 100644 application/controllers/api/v1/codex/Zgvdoktor.php
 mode change 100755 => 100644 application/controllers/api/v1/codex/Zgvgruppe.php
 mode change 100755 => 100644 application/controllers/api/v1/codex/Zgvmaster.php
 mode change 100755 => 100644 application/controllers/api/v1/codex/Zweck.php
 mode change 100755 => 100644 application/controllers/api/v1/content/Ampel.php
 mode change 100755 => 100644 application/controllers/api/v1/content/Content.php
 mode change 100755 => 100644 application/controllers/api/v1/content/Contentchild.php
 mode change 100755 => 100644 application/controllers/api/v1/content/Contentgruppe.php
 mode change 100755 => 100644 application/controllers/api/v1/content/Contentlog.php
 mode change 100755 => 100644 application/controllers/api/v1/content/Contentsprache.php
 mode change 100755 => 100644 application/controllers/api/v1/content/Dms.php
 mode change 100755 => 100644 application/controllers/api/v1/content/Infoscreen.php
 mode change 100755 => 100644 application/controllers/api/v1/content/News.php
 mode change 100755 => 100644 application/controllers/api/v1/content/Template.php
 mode change 100755 => 100644 application/controllers/api/v1/content/Veranstaltung.php
 mode change 100755 => 100644 application/controllers/api/v1/content/Veranstaltungskategorie.php
 mode change 100755 => 100644 application/controllers/api/v1/crm/Akte.php
 mode change 100755 => 100644 application/controllers/api/v1/crm/Aufnahmeschluessel.php
 mode change 100755 => 100644 application/controllers/api/v1/crm/Aufnahmetermin.php
 mode change 100755 => 100644 application/controllers/api/v1/crm/Aufnahmetermintyp.php
 mode change 100755 => 100644 application/controllers/api/v1/crm/Bewerbungstermine.php
 mode change 100755 => 100644 application/controllers/api/v1/crm/Buchungstyp.php
 mode change 100755 => 100644 application/controllers/api/v1/crm/Dokument.php
 mode change 100755 => 100644 application/controllers/api/v1/crm/Dokumentprestudent.php
 mode change 100755 => 100644 application/controllers/api/v1/crm/Dokumentstudiengang.php
 mode change 100755 => 100644 application/controllers/api/v1/crm/Konto.php
 mode change 100755 => 100644 application/controllers/api/v1/crm/Preincoming.php
 mode change 100755 => 100644 application/controllers/api/v1/crm/Preinteressent.php
 mode change 100755 => 100644 application/controllers/api/v1/crm/Preinteressentstudiengang.php
 mode change 100755 => 100644 application/controllers/api/v1/crm/Preoutgoing.php
 mode change 100755 => 100644 application/controllers/api/v1/crm/Prestudent.php
 mode change 100755 => 100644 application/controllers/api/v1/crm/Prestudentstatus.php
 mode change 100755 => 100644 application/controllers/api/v1/crm/Reihungstest.php
 mode change 100755 => 100644 application/controllers/api/v1/crm/RtPerson.php
 mode change 100755 => 100644 application/controllers/api/v1/crm/Status.php
 mode change 100755 => 100644 application/controllers/api/v1/crm/Statusgrund.php
 mode change 100755 => 100644 application/controllers/api/v1/crm/Student.php
 mode change 100755 => 100644 application/controllers/api/v1/education/Abgabe.php
 mode change 100755 => 100644 application/controllers/api/v1/education/Abschlussbeurteilung.php
 mode change 100755 => 100644 application/controllers/api/v1/education/Abschlusspruefung.php
 mode change 100755 => 100644 application/controllers/api/v1/education/Anrechnung.php
 mode change 100755 => 100644 application/controllers/api/v1/education/Anwesenheit.php
 mode change 100755 => 100644 application/controllers/api/v1/education/Beispiel.php
 mode change 100755 => 100644 application/controllers/api/v1/education/Betreuerart.php
 mode change 100755 => 100644 application/controllers/api/v1/education/Feedback.php
 mode change 100755 => 100644 application/controllers/api/v1/education/Legesamtnote.php
 mode change 100755 => 100644 application/controllers/api/v1/education/Lehreinheit.php
 mode change 100755 => 100644 application/controllers/api/v1/education/Lehreinheitgruppe.php
 mode change 100755 => 100644 application/controllers/api/v1/education/Lehreinheitmitarbeiter.php
 mode change 100755 => 100644 application/controllers/api/v1/education/Lehrfach.php
 mode change 100755 => 100644 application/controllers/api/v1/education/Lehrfunktion.php
 mode change 100755 => 100644 application/controllers/api/v1/education/Lehrtyp.php
 mode change 100755 => 100644 application/controllers/api/v1/education/Lehrveranstaltung.php
 mode change 100755 => 100644 application/controllers/api/v1/education/Lenotenschluessel.php
 mode change 100755 => 100644 application/controllers/api/v1/education/Lepruefung.php
 mode change 100755 => 100644 application/controllers/api/v1/education/Lvangebot.php
 mode change 100755 => 100644 application/controllers/api/v1/education/Lvgesamtnote.php
 mode change 100755 => 100644 application/controllers/api/v1/education/Lvinfo.php
 mode change 100755 => 100644 application/controllers/api/v1/education/Lvregel.php
 mode change 100755 => 100644 application/controllers/api/v1/education/Lvregeltyp.php
 mode change 100755 => 100644 application/controllers/api/v1/education/Notenschluessel.php
 mode change 100755 => 100644 application/controllers/api/v1/education/Notenschluesselaufteilung.php
 mode change 100755 => 100644 application/controllers/api/v1/education/Notenschluesseluebung.php
 mode change 100755 => 100644 application/controllers/api/v1/education/Notenschluesselzuordnung.php
 mode change 100755 => 100644 application/controllers/api/v1/education/Paabgabe.php
 mode change 100755 => 100644 application/controllers/api/v1/education/Paabgabetyp.php
 mode change 100755 => 100644 application/controllers/api/v1/education/Projektarbeit.php
 mode change 100755 => 100644 application/controllers/api/v1/education/Projektbetreuer.php
 mode change 100755 => 100644 application/controllers/api/v1/education/Projekttyp.php
 mode change 100755 => 100644 application/controllers/api/v1/education/Pruefung.php
 mode change 100755 => 100644 application/controllers/api/v1/education/Pruefungsanmeldung.php
 mode change 100755 => 100644 application/controllers/api/v1/education/Pruefungsfenster.php
 mode change 100755 => 100644 application/controllers/api/v1/education/Pruefungsstatus.php
 mode change 100755 => 100644 application/controllers/api/v1/education/Pruefungstermin.php
 mode change 100755 => 100644 application/controllers/api/v1/education/Pruefungstyp.php
 mode change 100755 => 100644 application/controllers/api/v1/education/Studentbeispiel.php
 mode change 100755 => 100644 application/controllers/api/v1/education/Studentlehrverband.php
 mode change 100755 => 100644 application/controllers/api/v1/education/Studentuebung.php
 mode change 100755 => 100644 application/controllers/api/v1/education/Uebung.php
 mode change 100755 => 100644 application/controllers/api/v1/education/Zeugnis.php
 mode change 100755 => 100644 application/controllers/api/v1/education/Zeugnisnote.php
 mode change 100755 => 100644 application/controllers/api/v1/organisation/Erhalter.php
 mode change 100755 => 100644 application/controllers/api/v1/organisation/Fachbereich2.php
 mode change 100755 => 100644 application/controllers/api/v1/organisation/Ferien.php
 mode change 100755 => 100644 application/controllers/api/v1/organisation/Geschaeftsjahr2.php
 mode change 100755 => 100644 application/controllers/api/v1/organisation/Gruppe.php
 mode change 100755 => 100644 application/controllers/api/v1/organisation/Lehrverband.php
 mode change 100755 => 100644 application/controllers/api/v1/organisation/Organisationseinheit2.php
 mode change 100755 => 100644 application/controllers/api/v1/organisation/Organisationseinheittyp.php
 mode change 100755 => 100644 application/controllers/api/v1/organisation/Semesterwochen.php
 mode change 100755 => 100644 application/controllers/api/v1/organisation/Service.php
 mode change 100755 => 100644 application/controllers/api/v1/organisation/Standort.php
 mode change 100755 => 100644 application/controllers/api/v1/organisation/Statistik.php
 mode change 100755 => 100644 application/controllers/api/v1/organisation/Studiengang2.php
 mode change 100755 => 100644 application/controllers/api/v1/organisation/Studiengangstyp.php
 mode change 100755 => 100644 application/controllers/api/v1/organisation/Studienjahr.php
 mode change 100755 => 100644 application/controllers/api/v1/organisation/Studienordnung.php
 mode change 100755 => 100644 application/controllers/api/v1/organisation/Studienordnungstatus.php
 mode change 100755 => 100644 application/controllers/api/v1/organisation/Studienplan.php
 mode change 100755 => 100644 application/controllers/api/v1/organisation/Studienplatz.php
 mode change 100755 => 100644 application/controllers/api/v1/organisation/Studiensemester.php
 mode change 100755 => 100644 application/controllers/api/v1/person/Adresse.php
 mode change 100755 => 100644 application/controllers/api/v1/person/Bankverbindung.php
 mode change 100755 => 100644 application/controllers/api/v1/person/Benutzer.php
 mode change 100755 => 100644 application/controllers/api/v1/person/Benutzerfunktion.php
 mode change 100755 => 100644 application/controllers/api/v1/person/Benutzergruppe.php
 mode change 100755 => 100644 application/controllers/api/v1/person/Fotostatus.php
 mode change 100755 => 100644 application/controllers/api/v1/person/Freebusy.php
 mode change 100755 => 100644 application/controllers/api/v1/person/Freebusytyp.php
 mode change 100755 => 100644 application/controllers/api/v1/person/Kontakt.php
 mode change 100755 => 100644 application/controllers/api/v1/person/Kontaktmedium.php
 mode change 100755 => 100644 application/controllers/api/v1/person/Kontakttyp.php
 mode change 100755 => 100644 application/controllers/api/v1/person/Notiz.php
 mode change 100755 => 100644 application/controllers/api/v1/person/Notizzuordnung.php
 mode change 100755 => 100644 application/controllers/api/v1/person/Person.php
 mode change 100755 => 100644 application/controllers/api/v1/project/Aktivitaet.php
 mode change 100755 => 100644 application/controllers/api/v1/project/Aufwandstyp.php
 mode change 100755 => 100644 application/controllers/api/v1/project/Projekt.php
 mode change 100755 => 100644 application/controllers/api/v1/project/Projekt_ressource.php
 mode change 100755 => 100644 application/controllers/api/v1/project/Projektphase.php
 mode change 100755 => 100644 application/controllers/api/v1/project/Projekttask.php
 mode change 100755 => 100644 application/controllers/api/v1/project/Ressource.php
 mode change 100755 => 100644 application/controllers/api/v1/project/Scrumsprint.php
 mode change 100755 => 100644 application/controllers/api/v1/ressource/Betriebsmittel.php
 mode change 100755 => 100644 application/controllers/api/v1/ressource/Betriebsmittelperson2.php
 mode change 100755 => 100644 application/controllers/api/v1/ressource/Betriebsmittelstatus.php
 mode change 100755 => 100644 application/controllers/api/v1/ressource/Betriebsmitteltyp.php
 mode change 100755 => 100644 application/controllers/api/v1/ressource/Coodle.php
 mode change 100755 => 100644 application/controllers/api/v1/ressource/Erreichbarkeit.php
 mode change 100755 => 100644 application/controllers/api/v1/ressource/Firma.php
 mode change 100755 => 100644 application/controllers/api/v1/ressource/Firmatag.php
 mode change 100755 => 100644 application/controllers/api/v1/ressource/Firmentyp.php
 mode change 100755 => 100644 application/controllers/api/v1/ressource/Funktion.php
 mode change 100755 => 100644 application/controllers/api/v1/ressource/Lehrmittel.php
 mode change 100755 => 100644 application/controllers/api/v1/ressource/Mitarbeiter.php
 mode change 100755 => 100644 application/controllers/api/v1/ressource/Ort.php
 mode change 100755 => 100644 application/controllers/api/v1/ressource/Ortraumtyp.php
 mode change 100755 => 100644 application/controllers/api/v1/ressource/Personfunktionstandort.php
 mode change 100755 => 100644 application/controllers/api/v1/ressource/Raumtyp.php
 mode change 100755 => 100644 application/controllers/api/v1/ressource/Reservierung.php
 mode change 100755 => 100644 application/controllers/api/v1/ressource/Stunde.php
 mode change 100755 => 100644 application/controllers/api/v1/ressource/Stundenplan.php
 mode change 100755 => 100644 application/controllers/api/v1/ressource/Stundenplandev.php
 mode change 100755 => 100644 application/controllers/api/v1/ressource/Zeitaufzeichnung.php
 mode change 100755 => 100644 application/controllers/api/v1/ressource/Zeitfenster.php
 mode change 100755 => 100644 application/controllers/api/v1/ressource/Zeitsperre.php
 mode change 100755 => 100644 application/controllers/api/v1/ressource/Zeitsperretyp.php
 mode change 100755 => 100644 application/controllers/api/v1/ressource/Zeitwunsch.php
 mode change 100755 => 100644 application/controllers/api/v1/system/Appdaten.php
 mode change 100755 => 100644 application/controllers/api/v1/system/Benutzerrolle.php
 mode change 100755 => 100644 application/controllers/api/v1/system/Berechtigung.php
 mode change 100755 => 100644 application/controllers/api/v1/system/Cronjob.php
 mode change 100755 => 100644 application/controllers/api/v1/system/Filter.php
 mode change 100755 => 100644 application/controllers/api/v1/system/Log.php
 mode change 100755 => 100644 application/controllers/api/v1/system/Message.php
 mode change 100755 => 100644 application/controllers/api/v1/system/Phrase.php
 mode change 100755 => 100644 application/controllers/api/v1/system/Rolle.php
 mode change 100755 => 100644 application/controllers/api/v1/system/Rolleberechtigung.php
 mode change 100755 => 100644 application/controllers/api/v1/system/Server.php
 mode change 100755 => 100644 application/controllers/api/v1/system/Sprache2.php
 mode change 100755 => 100644 application/controllers/api/v1/system/Tag.php
 mode change 100755 => 100644 application/controllers/api/v1/system/UDF.php
 mode change 100755 => 100644 application/controllers/api/v1/system/Variable.php
 mode change 100755 => 100644 application/controllers/api/v1/system/Vorlage.php
 mode change 100755 => 100644 application/controllers/api/v1/system/Vorlagestudiengang.php
 mode change 100755 => 100644 application/controllers/api/v1/system/Webservicelog.php
 mode change 100755 => 100644 application/controllers/api/v1/system/Webservicerecht.php
 mode change 100755 => 100644 application/controllers/api/v1/system/Webservicetyp.php
 mode change 100755 => 100644 application/controllers/api/v1/testtool/Ablauf.php
 mode change 100755 => 100644 application/controllers/api/v1/testtool/Antwort.php
 mode change 100755 => 100644 application/controllers/api/v1/testtool/Frage.php
 mode change 100755 => 100644 application/controllers/api/v1/testtool/Gebiet.php
 mode change 100755 => 100644 application/controllers/api/v1/testtool/Kategorie.php
 mode change 100755 => 100644 application/controllers/api/v1/testtool/Kriterien.php
 mode change 100755 => 100644 application/controllers/api/v1/testtool/Pruefling.php
 mode change 100755 => 100644 application/controllers/api/v1/testtool/Vorschlag.php
 mode change 100755 => 100644 application/controllers/codex/Oehbeitrag.php
 mode change 100755 => 100644 application/controllers/codex/UHSTAT1.php
 mode change 100755 => 100644 application/controllers/components/Antrag/Abmeldung.php
 mode change 100755 => 100644 application/controllers/components/Antrag/Leitung.php
 mode change 100755 => 100644 application/controllers/components/Antrag/Wiederholung.php
 mode change 100755 => 100644 application/controllers/components/Cis/Mylv.php
 mode change 100755 => 100644 application/controllers/components/Cis/Stundenplan.php
 mode change 100755 => 100644 application/controllers/components/CisVue.php
 mode change 100755 => 100644 application/controllers/components/Filter.php
 mode change 100755 => 100644 application/controllers/components/Phrasen.php
 mode change 100755 => 100644 application/controllers/components/SearchBar.php
 mode change 100755 => 100644 application/controllers/crm/Statusgrund.php
 mode change 100755 => 100644 application/controllers/dashboard/Api.php
 mode change 100755 => 100644 application/controllers/dashboard/Config.php
 mode change 100755 => 100644 application/controllers/dashboard/Dashboard.php
 mode change 100755 => 100644 application/controllers/dashboard/DashboardDemo.php
 mode change 100755 => 100644 application/controllers/dashboard/Widget.php
 mode change 100755 => 100644 application/controllers/extensions/.placeholder
 mode change 100755 => 100644 application/controllers/index.html
 mode change 100755 => 100644 application/controllers/jobs/AmpelMail.php
 mode change 100755 => 100644 application/controllers/jobs/AnrechnungJob.php
 mode change 100755 => 100644 application/controllers/jobs/AntragJob.php
 mode change 100755 => 100644 application/controllers/jobs/LVPlanJob.php
 mode change 100755 => 100644 application/controllers/jobs/LehrauftragJob.php
 mode change 100755 => 100644 application/controllers/jobs/MailJob.php
 mode change 100755 => 100644 application/controllers/jobs/OneTimeMessages.php
 mode change 100755 => 100644 application/controllers/jobs/PlausiIssueProducer.php
 mode change 100755 => 100644 application/controllers/jobs/Prestudentstatus.php
 mode change 100755 => 100644 application/controllers/jobs/ReihungstestJob.php
 mode change 100755 => 100644 application/controllers/lehre/Antrag/Attachment.php
 mode change 100755 => 100644 application/controllers/lehre/Antrag/Wiederholung.php
 mode change 100755 => 100644 application/controllers/lehre/Pruefungsprotokoll.php
 mode change 100755 => 100644 application/controllers/lehre/Studierendenantrag.php
 mode change 100755 => 100644 application/controllers/lehre/anrechnung/AdminAnrechnung.php
 mode change 100755 => 100644 application/controllers/lehre/anrechnung/ApproveAnrechnungDetail.php
 mode change 100755 => 100644 application/controllers/lehre/anrechnung/ApproveAnrechnungUebersicht.php
 mode change 100755 => 100644 application/controllers/lehre/anrechnung/CreateAnrechnung.php
 mode change 100755 => 100644 application/controllers/lehre/anrechnung/RequestAnrechnung.php
 mode change 100755 => 100644 application/controllers/lehre/anrechnung/ReviewAnrechnungDetail.php
 mode change 100755 => 100644 application/controllers/lehre/anrechnung/ReviewAnrechnungUebersicht.php
 mode change 100755 => 100644 application/controllers/lehre/lehrauftrag/Lehrauftrag.php
 mode change 100755 => 100644 application/controllers/lehre/lehrauftrag/LehrauftragAkzeptieren.php
 mode change 100755 => 100644 application/controllers/lehre/lehrauftrag/LehrauftragErteilen.php
 mode change 100755 => 100644 application/controllers/lehre/lvplanung/AdminZeitverfuegbarkeit.php
 mode change 100755 => 100644 application/controllers/organisation/Reihungstest.php
 mode change 100755 => 100644 application/controllers/organisation/Studienjahr.php
 mode change 100755 => 100644 application/controllers/organisation/Studiensemester.php
 mode change 100755 => 100644 application/controllers/person/BPKWartung.php
 mode change 100755 => 100644 application/controllers/person/Gradelist.php
 mode change 100755 => 100644 application/controllers/person/Gruppenmanagement.php
 mode change 100755 => 100644 application/controllers/system/FAS_UDF.php
 mode change 100755 => 100644 application/controllers/system/Login.php
 mode change 100755 => 100644 application/controllers/system/Logout.php
 mode change 100755 => 100644 application/controllers/system/LogsViewer.php
 mode change 100755 => 100644 application/controllers/system/Navigation.php
 mode change 100755 => 100644 application/controllers/system/Phrases.php
 mode change 100755 => 100644 application/controllers/system/TestSearch.php
 mode change 100755 => 100644 application/controllers/system/Variables.php
 mode change 100755 => 100644 application/controllers/system/Vorlage.php
 mode change 100755 => 100644 application/controllers/system/aufnahme/PrestudentMultiAssign.php
 mode change 100755 => 100644 application/controllers/system/extensions/CLI_Manager.php
 mode change 100755 => 100644 application/controllers/system/extensions/Manager.php
 mode change 100755 => 100644 application/controllers/system/infocenter/InfoCenter.php
 mode change 100755 => 100644 application/controllers/system/infocenter/Rueckstellung.php
 mode change 100755 => 100644 application/controllers/system/infocenter/ZGVUeberpruefung.php
 mode change 100755 => 100644 application/controllers/system/issues/Issues.php
 mode change 100755 => 100644 application/controllers/system/issues/IssuesKonfiguration.php
 mode change 100755 => 100644 application/controllers/system/issues/IssuesZustaendigkeiten.php
 mode change 100755 => 100644 application/controllers/system/issues/Plausichecks.php
 mode change 100755 => 100644 application/controllers/system/jq/JobsQueueManager.php
 mode change 100755 => 100644 application/controllers/system/jq/JobsQueueViewer.php
 mode change 100755 => 100644 application/controllers/system/messages/FASMessages.php
 mode change 100755 => 100644 application/controllers/system/messages/MessageClient.php
 mode change 100755 => 100644 application/controllers/system/messages/Messages.php
 mode change 100755 => 100644 application/controllers/system/messages/ViewMessage.php
 mode change 100755 => 100644 application/controllers/widgets/Filters.php
 mode change 100755 => 100644 application/controllers/widgets/Language.php
 mode change 100755 => 100644 application/controllers/widgets/Tables.php
 mode change 100755 => 100644 application/controllers/widgets/UDF.php
 mode change 100755 => 100644 application/core/API_Controller.php
 mode change 100755 => 100644 application/core/Auth_Controller.php
 mode change 100755 => 100644 application/core/CLI_Controller.php
 mode change 100755 => 100644 application/core/DB_Model.php
 mode change 100755 => 100644 application/core/FHC_Controller.php
 mode change 100755 => 100644 application/core/FS_Model.php
 mode change 100755 => 100644 application/core/IIssueResolvedChecker.php
 mode change 100755 => 100644 application/core/JOB_Controller.php
 mode change 100755 => 100644 application/core/JQW_Controller.php
 mode change 100755 => 100644 application/core/PlausiIssueProducer_Controller.php
 mode change 100755 => 100644 application/core/RESTFul_Controller.php
 mode change 100755 => 100644 application/core/index.html
 mode change 100755 => 100644 application/extensions/.placeholder
 mode change 100755 => 100644 application/helpers/extensions/.placeholder
 mode change 100755 => 100644 application/helpers/hlp_authentication_helper.php
 mode change 100755 => 100644 application/helpers/hlp_common_helper.php
 mode change 100755 => 100644 application/helpers/hlp_header_helper.php
 mode change 100755 => 100644 application/helpers/hlp_language_helper.php
 mode change 100755 => 100644 application/helpers/hlp_return_object_helper.php
 mode change 100755 => 100644 application/helpers/hlp_sancho_helper.php
 mode change 100755 => 100644 application/helpers/hlp_session_helper.php
 mode change 100755 => 100644 application/helpers/index.html
 mode change 100755 => 100644 application/hooks/extensions/.placeholder
 mode change 100755 => 100644 application/hooks/index.html
 mode change 100755 => 100644 application/index.html
 mode change 100755 => 100644 application/language/index.html
 mode change 100755 => 100644 application/libraries/AkteLib.php
 mode change 100755 => 100644 application/libraries/AnrechnungLib.php
 mode change 100755 => 100644 application/libraries/AntragLib.php
 mode change 100755 => 100644 application/libraries/AuthLDAPLib.php
 mode change 100755 => 100644 application/libraries/AuthLib.php
 mode change 100755 => 100644 application/libraries/CisHmvc/Loader.php
 mode change 100755 => 100644 application/libraries/CmsLib.php
 mode change 100755 => 100644 application/libraries/CryptLib.php
 mode change 100755 => 100644 application/libraries/DmsLib.php
 mode change 100755 => 100644 application/libraries/DocsboxLib.php
 mode change 100755 => 100644 application/libraries/DocumentLib.php
 mode change 100755 => 100644 application/libraries/EPrintfLib.php
 mode change 100755 => 100644 application/libraries/ExtensionsLib.php
 mode change 100755 => 100644 application/libraries/FilterCmptLib.php
 mode change 100755 => 100644 application/libraries/FilterWidgetLib.php
 mode change 100755 => 100644 application/libraries/IssuesLib.php
 mode change 100755 => 100644 application/libraries/JobsQueueLib.php
 mode change 100755 => 100644 application/libraries/LogLib.php
 mode change 100755 => 100644 application/libraries/MailLib.php
 mode change 100755 => 100644 application/libraries/MessageLib.php
 mode change 100755 => 100644 application/libraries/NavigationLib.php
 mode change 100755 => 100644 application/libraries/OrganisationseinheitLib.php
 mode change 100755 => 100644 application/libraries/PermissionLib.php
 mode change 100755 => 100644 application/libraries/PersonLogLib.php
 mode change 100755 => 100644 application/libraries/PhrasesLib.php
 mode change 100755 => 100644 application/libraries/PrestudentLib.php
 mode change 100755 => 100644 application/libraries/ReihungstestLib.php
 mode change 100755 => 100644 application/libraries/SearchBarLib.php
 mode change 100755 => 100644 application/libraries/SignatureLib.php
 mode change 100755 => 100644 application/libraries/StudienplanLib.php
 mode change 100755 => 100644 application/libraries/TableWidgetLib.php
 mode change 100755 => 100644 application/libraries/UDFLib.php
 mode change 100755 => 100644 application/libraries/VariableLib.php
 mode change 100755 => 100644 application/libraries/VorlageLib.php
 mode change 100755 => 100644 application/libraries/WidgetLib.php
 mode change 100755 => 100644 application/libraries/dashboard/DashboardLib.php
 mode change 100755 => 100644 application/libraries/extensions/.placeholder
 mode change 100755 => 100644 application/libraries/index.html
 mode change 100755 => 100644 application/libraries/issues/PlausicheckDefinitionLib.php
 mode change 100755 => 100644 application/libraries/issues/PlausicheckProducerLib.php
 mode change 100755 => 100644 application/libraries/issues/plausichecks/AbbrecherAktiv.php
 mode change 100755 => 100644 application/libraries/issues/plausichecks/AbschlussstatusFehlt.php
 mode change 100755 => 100644 application/libraries/issues/plausichecks/AktSemesterNull.php
 mode change 100755 => 100644 application/libraries/issues/plausichecks/AktiverStudentOhneStatus.php
 mode change 100755 => 100644 application/libraries/issues/plausichecks/AktiverStudentstatusOhneKontobuchung.php
 mode change 100755 => 100644 application/libraries/issues/plausichecks/AusbildungssemPrestudentUngleichAusbildungssemStatus.php
 mode change 100755 => 100644 application/libraries/issues/plausichecks/BewerberNichtZumRtAngetreten.php
 mode change 100755 => 100644 application/libraries/issues/plausichecks/DatumAbschlusspruefungFehlt.php
 mode change 100755 => 100644 application/libraries/issues/plausichecks/DatumSponsionFehlt.php
 mode change 100755 => 100644 application/libraries/issues/plausichecks/DatumStudiensemesterFalscheReihenfolge.php
 mode change 100755 => 100644 application/libraries/issues/plausichecks/FalscheAnzahlAbschlusspruefungen.php
 mode change 100755 => 100644 application/libraries/issues/plausichecks/FalscheAnzahlHeimatadressen.php
 mode change 100755 => 100644 application/libraries/issues/plausichecks/FalscheAnzahlZustelladressen.php
 mode change 100755 => 100644 application/libraries/issues/plausichecks/GbDatumWeitZurueck.php
 mode change 100755 => 100644 application/libraries/issues/plausichecks/InaktiverStudentAktiverStatus.php
 mode change 100755 => 100644 application/libraries/issues/plausichecks/IncomingHeimatNationOesterreich.php
 mode change 100755 => 100644 application/libraries/issues/plausichecks/IncomingOhneIoDatensatz.php
 mode change 100755 => 100644 application/libraries/issues/plausichecks/IncomingOrGsFoerderrelevant.php
 mode change 100755 => 100644 application/libraries/issues/plausichecks/InskriptionVorLetzerBismeldung.php
 mode change 100755 => 100644 application/libraries/issues/plausichecks/NationNichtOesterreichAberGemeinde.php
 mode change 100755 => 100644 application/libraries/issues/plausichecks/OrgformStgUngleichOrgformPrestudent.php
 mode change 100755 => 100644 application/libraries/issues/plausichecks/PlausiChecker.php
 mode change 100755 => 100644 application/libraries/issues/plausichecks/PrestudentMischformOhneOrgform.php
 mode change 100755 => 100644 application/libraries/issues/plausichecks/StgPrestudentUngleichStgStudent.php
 mode change 100755 => 100644 application/libraries/issues/plausichecks/StgPrestudentUngleichStgStudienplan.php
 mode change 100755 => 100644 application/libraries/issues/plausichecks/StudentstatusNachAbbrecher.php
 mode change 100755 => 100644 application/libraries/issues/plausichecks/StudienplanUngueltig.php
 mode change 100755 => 100644 application/libraries/issues/resolvers/CORE_INOUT_0001.php
 mode change 100755 => 100644 application/libraries/issues/resolvers/CORE_INOUT_0002.php
 mode change 100755 => 100644 application/libraries/issues/resolvers/CORE_INOUT_0003.php
 mode change 100755 => 100644 application/libraries/issues/resolvers/CORE_INOUT_0004.php
 mode change 100755 => 100644 application/libraries/issues/resolvers/CORE_INOUT_0005.php
 mode change 100755 => 100644 application/libraries/issues/resolvers/CORE_INOUT_0006.php
 mode change 100755 => 100644 application/libraries/issues/resolvers/CORE_INOUT_0007.php
 mode change 100755 => 100644 application/libraries/issues/resolvers/CORE_INOUT_0008.php
 mode change 100755 => 100644 application/libraries/issues/resolvers/CORE_INOUT_0009.php
 mode change 100755 => 100644 application/libraries/issues/resolvers/CORE_PERSON_0001.php
 mode change 100755 => 100644 application/libraries/issues/resolvers/CORE_PERSON_0002.php
 mode change 100755 => 100644 application/libraries/issues/resolvers/CORE_PERSON_0003.php
 mode change 100755 => 100644 application/libraries/issues/resolvers/CORE_PERSON_0004.php
 mode change 100755 => 100644 application/libraries/issues/resolvers/CORE_STG_0001.php
 mode change 100755 => 100644 application/libraries/issues/resolvers/CORE_STG_0002.php
 mode change 100755 => 100644 application/libraries/issues/resolvers/CORE_STG_0003.php
 mode change 100755 => 100644 application/libraries/issues/resolvers/CORE_STG_0004.php
 mode change 100755 => 100644 application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0001.php
 mode change 100755 => 100644 application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0002.php
 mode change 100755 => 100644 application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0003.php
 mode change 100755 => 100644 application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0004.php
 mode change 100755 => 100644 application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0005.php
 mode change 100755 => 100644 application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0006.php
 mode change 100755 => 100644 application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0007.php
 mode change 100755 => 100644 application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0008.php
 mode change 100755 => 100644 application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0009.php
 mode change 100755 => 100644 application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0010.php
 mode change 100755 => 100644 application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0011.php
 mode change 100755 => 100644 application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0012.php
 mode change 100755 => 100644 application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0013.php
 mode change 100755 => 100644 application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0014.php
 mode change 100755 => 100644 application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0015.php
 mode change 100755 => 100644 application/libraries/issues/resolvers/CORE_ZGV_0001.php
 mode change 100755 => 100644 application/libraries/issues/resolvers/CORE_ZGV_0002.php
 mode change 100755 => 100644 application/libraries/issues/resolvers/CORE_ZGV_0003.php
 mode change 100755 => 100644 application/libraries/issues/resolvers/CORE_ZGV_0004.php
 mode change 100755 => 100644 application/libraries/issues/resolvers/CORE_ZGV_0005.php
 mode change 100755 => 100644 application/logs/index.html
 mode change 100755 => 100644 application/models/CL/Messages_model.php
 mode change 100755 => 100644 application/models/accounting/Aufteilung_model.php
 mode change 100755 => 100644 application/models/accounting/Bestelldetail_model.php
 mode change 100755 => 100644 application/models/accounting/Bestelldetailtag_model.php
 mode change 100755 => 100644 application/models/accounting/Bestellstatus_model.php
 mode change 100755 => 100644 application/models/accounting/Bestellung_model.php
 mode change 100755 => 100644 application/models/accounting/Bestellungtag_model.php
 mode change 100755 => 100644 application/models/accounting/Buchung_model.php
 mode change 100755 => 100644 application/models/accounting/Buchungstyp_model.php
 mode change 100755 => 100644 application/models/accounting/Budget_model.php
 mode change 100755 => 100644 application/models/accounting/Konto_model.php
 mode change 100755 => 100644 application/models/accounting/Kostenstelle_model.php
 mode change 100755 => 100644 application/models/accounting/Rechnung_model.php
 mode change 100755 => 100644 application/models/accounting/Rechnungsbetrag_model.php
 mode change 100755 => 100644 application/models/accounting/Rechnungstyp_model.php
 mode change 100755 => 100644 application/models/accounting/Vertrag_model.php
 mode change 100755 => 100644 application/models/accounting/Vertragsstatus_model.php
 mode change 100755 => 100644 application/models/accounting/Vertragstyp_model.php
 mode change 100755 => 100644 application/models/accounting/Vertragvertragsstatus_model.php
 mode change 100755 => 100644 application/models/accounting/Zahlungstyp_model.php
 mode change 100755 => 100644 application/models/codex/Abschluss_model.php
 mode change 100755 => 100644 application/models/codex/Akadgrad_model.php
 mode change 100755 => 100644 application/models/codex/Archiv_model.php
 mode change 100755 => 100644 application/models/codex/Aufenthaltfoerderung_model.php
 mode change 100755 => 100644 application/models/codex/Aufmerksamdurch_model.php
 mode change 100755 => 100644 application/models/codex/Ausbildung_model.php
 mode change 100755 => 100644 application/models/codex/Berufstaetigkeit_model.php
 mode change 100755 => 100644 application/models/codex/Beschaeftigungsausmass_model.php
 mode change 100755 => 100644 application/models/codex/Besqual_model.php
 mode change 100755 => 100644 application/models/codex/Bisfunktion_model.php
 mode change 100755 => 100644 application/models/codex/Bisio_model.php
 mode change 100755 => 100644 application/models/codex/Bisioaufenthaltfoerderung_model.php
 mode change 100755 => 100644 application/models/codex/Bisiozweck_model.php
 mode change 100755 => 100644 application/models/codex/Bisorgform_model.php
 mode change 100755 => 100644 application/models/codex/Bisverwendung_model.php
 mode change 100755 => 100644 application/models/codex/Bundesland_model.php
 mode change 100755 => 100644 application/models/codex/Entwicklungsteam_model.php
 mode change 100755 => 100644 application/models/codex/Gemeinde_model.php
 mode change 100755 => 100644 application/models/codex/Gsprogramm_model.php
 mode change 100755 => 100644 application/models/codex/Hauptberuf_model.php
 mode change 100755 => 100644 application/models/codex/Lehrform_model.php
 mode change 100755 => 100644 application/models/codex/Lgartcode_model.php
 mode change 100755 => 100644 application/models/codex/Mobilitaet_model.php
 mode change 100755 => 100644 application/models/codex/Mobilitaetsprogramm_model.php
 mode change 100755 => 100644 application/models/codex/Nation_model.php
 mode change 100755 => 100644 application/models/codex/Note_model.php
 mode change 100755 => 100644 application/models/codex/Oehbeitrag_model.php
 mode change 100755 => 100644 application/models/codex/Orgform_model.php
 mode change 100755 => 100644 application/models/codex/Uhstat1daten_model.php
 mode change 100755 => 100644 application/models/codex/Verwendung_model.php
 mode change 100755 => 100644 application/models/codex/Zgv_model.php
 mode change 100755 => 100644 application/models/codex/Zgvdoktor_model.php
 mode change 100755 => 100644 application/models/codex/Zgvgruppe_model.php
 mode change 100755 => 100644 application/models/codex/Zgvmaster_model.php
 mode change 100755 => 100644 application/models/codex/Zweck_model.php
 mode change 100755 => 100644 application/models/content/Ampel_model.php
 mode change 100755 => 100644 application/models/content/Content_model.php
 mode change 100755 => 100644 application/models/content/Contentchild_model.php
 mode change 100755 => 100644 application/models/content/Contentgruppe_model.php
 mode change 100755 => 100644 application/models/content/Contentlog_model.php
 mode change 100755 => 100644 application/models/content/Contentsprache_model.php
 mode change 100755 => 100644 application/models/content/DmsFS_model.php
 mode change 100755 => 100644 application/models/content/DmsVersion_model.php
 mode change 100755 => 100644 application/models/content/Dms_model.php
 mode change 100755 => 100644 application/models/content/Infoscreen_model.php
 mode change 100755 => 100644 application/models/content/News_model.php
 mode change 100755 => 100644 application/models/content/TempFS_model.php
 mode change 100755 => 100644 application/models/content/Template_model.php
 mode change 100755 => 100644 application/models/content/Veranstaltung_model.php
 mode change 100755 => 100644 application/models/content/Veranstaltungskategorie_model.php
 mode change 100755 => 100644 application/models/crm/Akte_model.php
 mode change 100755 => 100644 application/models/crm/Aufnahmeschluessel_model.php
 mode change 100755 => 100644 application/models/crm/Bewerbungstermine_model.php
 mode change 100755 => 100644 application/models/crm/Buchungstyp_model.php
 mode change 100755 => 100644 application/models/crm/Dokument_model.php
 mode change 100755 => 100644 application/models/crm/Dokumentprestudent_model.php
 mode change 100755 => 100644 application/models/crm/Dokumentstudiengang_model.php
 mode change 100755 => 100644 application/models/crm/Konto_model.php
 mode change 100755 => 100644 application/models/crm/Preincoming_model.php
 mode change 100755 => 100644 application/models/crm/Preinteressent_model.php
 mode change 100755 => 100644 application/models/crm/Preinteressentstudiengang_model.php
 mode change 100755 => 100644 application/models/crm/Preoutgoing_model.php
 mode change 100755 => 100644 application/models/crm/Prestudent_model.php
 mode change 100755 => 100644 application/models/crm/Prestudentstatus_model.php
 mode change 100755 => 100644 application/models/crm/Reihungstest_model.php
 mode change 100755 => 100644 application/models/crm/RtPerson_model.php
 mode change 100755 => 100644 application/models/crm/RtStudienplan_model.php
 mode change 100755 => 100644 application/models/crm/RueckstellungStatus_model.php
 mode change 100755 => 100644 application/models/crm/Rueckstellung_model.php
 mode change 100755 => 100644 application/models/crm/Status_model.php
 mode change 100755 => 100644 application/models/crm/Statusgrund_model.php
 mode change 100755 => 100644 application/models/crm/Student_model.php
 mode change 100755 => 100644 application/models/crm/ZGVPruefungStatus_model.php
 mode change 100755 => 100644 application/models/crm/ZGVPruefung_model.php
 mode change 100755 => 100644 application/models/dashboard/Dashboard_Override_model.php
 mode change 100755 => 100644 application/models/dashboard/Dashboard_Preset_model.php
 mode change 100755 => 100644 application/models/dashboard/Dashboard_Widget_model.php
 mode change 100755 => 100644 application/models/dashboard/Dashboard_model.php
 mode change 100755 => 100644 application/models/dashboard/Widget_model.php
 mode change 100755 => 100644 application/models/education/Abgabe_model.php
 mode change 100755 => 100644 application/models/education/Abschlussbeurteilung_model.php
 mode change 100755 => 100644 application/models/education/Abschlusspruefung_model.php
 mode change 100755 => 100644 application/models/education/Anrechnung_model.php
 mode change 100755 => 100644 application/models/education/Anrechnungbegruendung_model.php
 mode change 100755 => 100644 application/models/education/Anrechnungstatus_model.php
 mode change 100755 => 100644 application/models/education/Anrechnungszeitraum_model.php
 mode change 100755 => 100644 application/models/education/Anwesenheit_model.php
 mode change 100755 => 100644 application/models/education/Beispiel_model.php
 mode change 100755 => 100644 application/models/education/Betreuerart_model.php
 mode change 100755 => 100644 application/models/education/Feedback_model.php
 mode change 100755 => 100644 application/models/education/LeNotenschluessel_model.php
 mode change 100755 => 100644 application/models/education/LePruefung_model.php
 mode change 100755 => 100644 application/models/education/Legesamtnote_model.php
 mode change 100755 => 100644 application/models/education/Lehreinheit_model.php
 mode change 100755 => 100644 application/models/education/Lehreinheitgruppe_model.php
 mode change 100755 => 100644 application/models/education/Lehreinheitmitarbeiter_model.php
 mode change 100755 => 100644 application/models/education/Lehrfach_model.php
 mode change 100755 => 100644 application/models/education/Lehrfunktion_model.php
 mode change 100755 => 100644 application/models/education/Lehrtyp_model.php
 mode change 100755 => 100644 application/models/education/Lehrveranstaltung_model.php
 mode change 100755 => 100644 application/models/education/Lvangebot_model.php
 mode change 100755 => 100644 application/models/education/Lvgesamtnote_model.php
 mode change 100755 => 100644 application/models/education/Lvinfo_model.php
 mode change 100755 => 100644 application/models/education/Lvregel_model.php
 mode change 100755 => 100644 application/models/education/Lvregeltyp_model.php
 mode change 100755 => 100644 application/models/education/Notenschluessel_model.php
 mode change 100755 => 100644 application/models/education/Notenschluesselaufteilung_model.php
 mode change 100755 => 100644 application/models/education/Notenschluesseluebung_model.php
 mode change 100755 => 100644 application/models/education/Notenschluesselzuordnung_model.php
 mode change 100755 => 100644 application/models/education/Paabgabe_model.php
 mode change 100755 => 100644 application/models/education/Paabgabetyp_model.php
 mode change 100755 => 100644 application/models/education/Projektarbeit_model.php
 mode change 100755 => 100644 application/models/education/Projektbetreuer_model.php
 mode change 100755 => 100644 application/models/education/Projekttyp_model.php
 mode change 100755 => 100644 application/models/education/Pruefung_model.php
 mode change 100755 => 100644 application/models/education/Pruefungsanmeldung_model.php
 mode change 100755 => 100644 application/models/education/Pruefungsfenster_model.php
 mode change 100755 => 100644 application/models/education/Pruefungsstatus_model.php
 mode change 100755 => 100644 application/models/education/Pruefungstermin_model.php
 mode change 100755 => 100644 application/models/education/Pruefungstyp_model.php
 mode change 100755 => 100644 application/models/education/Studentbeispiel_model.php
 mode change 100755 => 100644 application/models/education/Studentlehrverband_model.php
 mode change 100755 => 100644 application/models/education/Studentuebung_model.php
 mode change 100755 => 100644 application/models/education/Studierendenantrag_model.php
 mode change 100755 => 100644 application/models/education/Studierendenantraglehrveranstaltung_model.php
 mode change 100755 => 100644 application/models/education/Studierendenantragstatus_model.php
 mode change 100755 => 100644 application/models/education/Uebung_model.php
 mode change 100755 => 100644 application/models/education/Zeugnis_model.php
 mode change 100755 => 100644 application/models/education/Zeugnisnote_model.php
 mode change 100755 => 100644 application/models/extensions/.placeholder
 mode change 100755 => 100644 application/models/index.html
 mode change 100755 => 100644 application/models/organisation/Erhalter_model.php
 mode change 100755 => 100644 application/models/organisation/Fachbereich_model.php
 mode change 100755 => 100644 application/models/organisation/Ferien_model.php
 mode change 100755 => 100644 application/models/organisation/Geschaeftsjahr_model.php
 mode change 100755 => 100644 application/models/organisation/Gruppe_model.php
 mode change 100755 => 100644 application/models/organisation/Lehrverband_model.php
 mode change 100755 => 100644 application/models/organisation/Organisationseinheit_model.php
 mode change 100755 => 100644 application/models/organisation/Organisationseinheittyp_model.php
 mode change 100755 => 100644 application/models/organisation/Semesterwochen_model.php
 mode change 100755 => 100644 application/models/organisation/Service_model.php
 mode change 100755 => 100644 application/models/organisation/Standort_model.php
 mode change 100755 => 100644 application/models/organisation/Statistik_model.php
 mode change 100755 => 100644 application/models/organisation/Studiengang_model.php
 mode change 100755 => 100644 application/models/organisation/Studiengangstyp_model.php
 mode change 100755 => 100644 application/models/organisation/Studienjahr_model.php
 mode change 100755 => 100644 application/models/organisation/Studienordnung_model.php
 mode change 100755 => 100644 application/models/organisation/Studienordnungstatus_model.php
 mode change 100755 => 100644 application/models/organisation/Studienplan_model.php
 mode change 100755 => 100644 application/models/organisation/Studienplatz_model.php
 mode change 100755 => 100644 application/models/organisation/Studiensemester_model.php
 mode change 100755 => 100644 application/models/person/Adresse_model.php
 mode change 100755 => 100644 application/models/person/Adressentyp_model.php
 mode change 100755 => 100644 application/models/person/Bankverbindung_model.php
 mode change 100755 => 100644 application/models/person/Benutzer_model.php
 mode change 100755 => 100644 application/models/person/Benutzerfunktion_model.php
 mode change 100755 => 100644 application/models/person/Benutzergruppe_model.php
 mode change 100755 => 100644 application/models/person/Fotostatus_model.php
 mode change 100755 => 100644 application/models/person/Fotostatusperson_model.php
 mode change 100755 => 100644 application/models/person/Freebusy_model.php
 mode change 100755 => 100644 application/models/person/Freebusytyp_model.php
 mode change 100755 => 100644 application/models/person/Geschlecht_model.php
 mode change 100755 => 100644 application/models/person/Kontakt_model.php
 mode change 100755 => 100644 application/models/person/Kontaktmedium_model.php
 mode change 100755 => 100644 application/models/person/Kontakttyp_model.php
 mode change 100755 => 100644 application/models/person/Notiz_model.php
 mode change 100755 => 100644 application/models/person/Notizzuordnung_model.php
 mode change 100755 => 100644 application/models/person/Person_model.php
 mode change 100755 => 100644 application/models/person/Profil_update_model.php
 mode change 100755 => 100644 application/models/project/Aktivitaet_model.php
 mode change 100755 => 100644 application/models/project/Aufwandstyp_model.php
 mode change 100755 => 100644 application/models/project/Projekt_model.php
 mode change 100755 => 100644 application/models/project/Projekt_ressource_model.php
 mode change 100755 => 100644 application/models/project/Projektphase_model.php
 mode change 100755 => 100644 application/models/project/Projekttask_model.php
 mode change 100755 => 100644 application/models/project/Ressource_model.php
 mode change 100755 => 100644 application/models/project/Scrumsprint_model.php
 mode change 100755 => 100644 application/models/ressource/Betriebsmittel_model.php
 mode change 100755 => 100644 application/models/ressource/Betriebsmittelperson_model.php
 mode change 100755 => 100644 application/models/ressource/Betriebsmittelstatus_model.php
 mode change 100755 => 100644 application/models/ressource/Betriebsmitteltyp_model.php
 mode change 100755 => 100644 application/models/ressource/Coodle_model.php
 mode change 100755 => 100644 application/models/ressource/Erreichbarkeit_model.php
 mode change 100755 => 100644 application/models/ressource/Firma_model.php
 mode change 100755 => 100644 application/models/ressource/Firmatag_model.php
 mode change 100755 => 100644 application/models/ressource/Firmentyp_model.php
 mode change 100755 => 100644 application/models/ressource/Funktion_model.php
 mode change 100755 => 100644 application/models/ressource/Lehrmittel_model.php
 mode change 100755 => 100644 application/models/ressource/Mitarbeiter_model.php
 mode change 100755 => 100644 application/models/ressource/Ort_model.php
 mode change 100755 => 100644 application/models/ressource/Ortraumtyp_model.php
 mode change 100755 => 100644 application/models/ressource/Personfunktionstandort_model.php
 mode change 100755 => 100644 application/models/ressource/Raumtyp_model.php
 mode change 100755 => 100644 application/models/ressource/Reservierung_model.php
 mode change 100755 => 100644 application/models/ressource/Stunde_model.php
 mode change 100755 => 100644 application/models/ressource/Stundenplan_model.php
 mode change 100755 => 100644 application/models/ressource/Stundenplandev_model.php
 mode change 100755 => 100644 application/models/ressource/Zeitaufzeichnung_model.php
 mode change 100755 => 100644 application/models/ressource/Zeitsperre_model.php
 mode change 100755 => 100644 application/models/ressource/Zeitsperretyp_model.php
 mode change 100755 => 100644 application/models/ressource/Zeitwunsch_gueltigkeit_model.php
 mode change 100755 => 100644 application/models/ressource/Zeitwunsch_model.php
 mode change 100755 => 100644 application/models/system/Appdaten_model.php
 mode change 100755 => 100644 application/models/system/Attachment_model.php
 mode change 100755 => 100644 application/models/system/Benutzerrolle_model.php
 mode change 100755 => 100644 application/models/system/Berechtigung_model.php
 mode change 100755 => 100644 application/models/system/Cronjob_model.php
 mode change 100755 => 100644 application/models/system/Dokument_model.php
 mode change 100755 => 100644 application/models/system/Extensions_model.php
 mode change 100755 => 100644 application/models/system/Fehler_model.php
 mode change 100755 => 100644 application/models/system/Fehlerkonfiguration_model.php
 mode change 100755 => 100644 application/models/system/Fehlerkonfigurationstyp_model.php
 mode change 100755 => 100644 application/models/system/Fehlerzustaendigkeiten_model.php
 mode change 100755 => 100644 application/models/system/Filter_model.php
 mode change 100755 => 100644 application/models/system/Filters_model.php
 mode change 100755 => 100644 application/models/system/Issue_model.php
 mode change 100755 => 100644 application/models/system/JobStatuses_model.php
 mode change 100755 => 100644 application/models/system/JobTriggers_model.php
 mode change 100755 => 100644 application/models/system/JobTypes_model.php
 mode change 100755 => 100644 application/models/system/JobsQueue_model.php
 mode change 100755 => 100644 application/models/system/Log_model.php
 mode change 100755 => 100644 application/models/system/MessageToken_model.php
 mode change 100755 => 100644 application/models/system/Message_model.php
 mode change 100755 => 100644 application/models/system/MsgStatus_model.php
 mode change 100755 => 100644 application/models/system/PersonLock_model.php
 mode change 100755 => 100644 application/models/system/PersonLog_model.php
 mode change 100755 => 100644 application/models/system/Phrase_model.php
 mode change 100755 => 100644 application/models/system/Phrasentext_model.php
 mode change 100755 => 100644 application/models/system/Recipient_model.php
 mode change 100755 => 100644 application/models/system/Rolle_model.php
 mode change 100755 => 100644 application/models/system/Rolleberechtigung_model.php
 mode change 100755 => 100644 application/models/system/Server_model.php
 mode change 100755 => 100644 application/models/system/Sprache_model.php
 mode change 100755 => 100644 application/models/system/Tag_model.php
 mode change 100755 => 100644 application/models/system/UDF_model.php
 mode change 100755 => 100644 application/models/system/Variable_model.php
 mode change 100755 => 100644 application/models/system/Variablenname_model.php
 mode change 100755 => 100644 application/models/system/Vorlage_model.php
 mode change 100755 => 100644 application/models/system/Vorlagedokument_model.php
 mode change 100755 => 100644 application/models/system/Vorlagestudiengang_model.php
 mode change 100755 => 100644 application/models/system/Webservicelog_model.php
 mode change 100755 => 100644 application/models/system/Webservicerecht_model.php
 mode change 100755 => 100644 application/models/system/Webservicetyp_model.php
 mode change 100755 => 100644 application/models/testtool/Ablauf_model.php
 mode change 100755 => 100644 application/models/testtool/Antwort_model.php
 mode change 100755 => 100644 application/models/testtool/Frage_model.php
 mode change 100755 => 100644 application/models/testtool/Gebiet_model.php
 mode change 100755 => 100644 application/models/testtool/Kategorie_model.php
 mode change 100755 => 100644 application/models/testtool/Kriterien_model.php
 mode change 100755 => 100644 application/models/testtool/Pruefling_model.php
 mode change 100755 => 100644 application/models/testtool/Vorschlag_model.php
 mode change 100755 => 100644 application/third_party/index.html
 mode change 100755 => 100644 application/tmp/.placeholder
 mode change 100755 => 100644 application/views/Cis/Cms/News/Xml/Address/Detailed.php
 mode change 100755 => 100644 application/views/Cis/Cms/News/Xml/Address/Short.php
 mode change 100755 => 100644 application/views/Cis/Cms/News/Xml/NewsExtras.php
 mode change 100755 => 100644 application/views/Cis/Documents.php
 mode change 100755 => 100644 application/views/Cis/Login.php
 mode change 100755 => 100644 application/views/Cis/MyLv.php
 mode change 100755 => 100644 application/views/Cis/Profil.php
 mode change 100755 => 100644 application/views/Cis/ProfilUpdate.php
 mode change 100755 => 100644 application/views/Cis/Stundenplan.php
 mode change 100755 => 100644 application/views/CisHmvc/Cms/Content.php
 mode change 100755 => 100644 application/views/CisHmvc/Cms/Legacy.php
 mode change 100755 => 100644 application/views/CisHmvc/Dashboard.php
 mode change 100755 => 100644 application/views/CisHmvc/Error.php
 mode change 100755 => 100644 application/views/CisHtml/Cms/Content.php
 mode change 100755 => 100644 application/views/CisHtml/Dashboard.php
 mode change 100755 => 100644 application/views/CisHtml/Error.php
 mode change 100755 => 100644 application/views/CisVue/Cms/Content.php
 mode change 100755 => 100644 application/views/CisVue/Dashboard.php
 mode change 100755 => 100644 application/views/codex/oehbeitrag.php
 mode change 100755 => 100644 application/views/codex/uhstat1.php
 mode change 100755 => 100644 application/views/crm/statusEdit.php
 mode change 100755 => 100644 application/views/crm/statusGrundList.php
 mode change 100755 => 100644 application/views/crm/statusList.php
 mode change 100755 => 100644 application/views/crm/statusgrund.php
 mode change 100755 => 100644 application/views/crm/statusgrundEdit.php
 mode change 100755 => 100644 application/views/crm/statusgrundNew.php
 mode change 100755 => 100644 application/views/dashboard/dashboard_demo.php
 mode change 100755 => 100644 application/views/dashboard/dashboard_demo_admin.php
 mode change 100755 => 100644 application/views/errors/cli/error_404.php
 mode change 100755 => 100644 application/views/errors/cli/error_db.php
 mode change 100755 => 100644 application/views/errors/cli/error_exception.php
 mode change 100755 => 100644 application/views/errors/cli/error_general.php
 mode change 100755 => 100644 application/views/errors/cli/error_php.php
 mode change 100755 => 100644 application/views/errors/cli/index.html
 mode change 100755 => 100644 application/views/errors/html/error_404.php
 mode change 100755 => 100644 application/views/errors/html/error_db.php
 mode change 100755 => 100644 application/views/errors/html/error_exception.php
 mode change 100755 => 100644 application/views/errors/html/error_general.php
 mode change 100755 => 100644 application/views/errors/html/error_php.php
 mode change 100755 => 100644 application/views/errors/html/index.html
 mode change 100755 => 100644 application/views/errors/index.html
 mode change 100755 => 100644 application/views/extensions/.placeholder
 mode change 100755 => 100644 application/views/home.php
 mode change 100755 => 100644 application/views/index.html
 mode change 100755 => 100644 application/views/lehre/Antrag/Create.php
 mode change 100755 => 100644 application/views/lehre/Antrag/Leitung/List.php
 mode change 100755 => 100644 application/views/lehre/Antrag/Student/List.php
 mode change 100755 => 100644 application/views/lehre/Antrag/Wiederholung/Student.php
 mode change 100755 => 100644 application/views/lehre/Antrag/Wiederholung/getLvs.rdf.php
 mode change 100755 => 100644 application/views/lehre/Antrag/Wiederholung/moveLvs.rdf.php
 mode change 100755 => 100644 application/views/lehre/anrechnung/adminAnrechnung.php
 mode change 100755 => 100644 application/views/lehre/anrechnung/adminAnrechnungData.php
 mode change 100755 => 100644 application/views/lehre/anrechnung/approveAnrechnungDetail.php
 mode change 100755 => 100644 application/views/lehre/anrechnung/approveAnrechnungUebersicht.php
 mode change 100755 => 100644 application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
 mode change 100755 => 100644 application/views/lehre/anrechnung/createAnrechnung.php
 mode change 100755 => 100644 application/views/lehre/anrechnung/createAnrechnungData.php
 mode change 100755 => 100644 application/views/lehre/anrechnung/requestAnrechnung.php
 mode change 100755 => 100644 application/views/lehre/anrechnung/requestAnrechnungImportant.php
 mode change 100755 => 100644 application/views/lehre/anrechnung/reviewAnrechnungDetail.php
 mode change 100755 => 100644 application/views/lehre/anrechnung/reviewAnrechnungInfo.php
 mode change 100755 => 100644 application/views/lehre/anrechnung/reviewAnrechnungUebersicht.php
 mode change 100755 => 100644 application/views/lehre/anrechnung/reviewAnrechnungUebersichtData.php
 mode change 100755 => 100644 application/views/lehre/lehrauftrag/Dashboard.php
 mode change 100755 => 100644 application/views/lehre/lehrauftrag/LehrendeUebersicht.php
 mode change 100755 => 100644 application/views/lehre/lehrauftrag/acceptLehrauftrag.php
 mode change 100755 => 100644 application/views/lehre/lehrauftrag/acceptLehrauftragData.php
 mode change 100755 => 100644 application/views/lehre/lehrauftrag/acceptLehrauftragHelp.php
 mode change 100755 => 100644 application/views/lehre/lehrauftrag/approveLehrauftrag.php
 mode change 100755 => 100644 application/views/lehre/lehrauftrag/approveLehrauftragData.php
 mode change 100755 => 100644 application/views/lehre/lehrauftrag/approveLehrauftragHelp.php
 mode change 100755 => 100644 application/views/lehre/lehrauftrag/cancelledLehrauftragData.php
 mode change 100755 => 100644 application/views/lehre/lehrauftrag/orderLehrauftrag.php
 mode change 100755 => 100644 application/views/lehre/lehrauftrag/orderLehrauftragData.php
 mode change 100755 => 100644 application/views/lehre/lehrauftrag/orderLehrauftragHelp.php
 mode change 100755 => 100644 application/views/lehre/lvplanung/adminZeitverfuegbarkeit.php
 mode change 100755 => 100644 application/views/lehre/lvplanung/adminZeitverfuegbarkeitData.php
 mode change 100755 => 100644 application/views/lehre/pruefungsprotokoll.php
 mode change 100755 => 100644 application/views/lehre/pruefungsprotokollUebersicht.php
 mode change 100755 => 100644 application/views/lehre/pruefungsprotokollUebersichtData.php
 mode change 100755 => 100644 application/views/organisation/reihungstest/ReihungstestUebersichtData.php
 mode change 100755 => 100644 application/views/organisation/reihungstest/reihungstest.php
 mode change 100755 => 100644 application/views/organisation/studienjahr.php
 mode change 100755 => 100644 application/views/organisation/studienjahrEdit.php
 mode change 100755 => 100644 application/views/organisation/studienjahrForm.php
 mode change 100755 => 100644 application/views/organisation/studienjahrNew.php
 mode change 100755 => 100644 application/views/organisation/studiensemester.php
 mode change 100755 => 100644 application/views/organisation/studiensemesterEdit.php
 mode change 100755 => 100644 application/views/organisation/studiensemesterForm.php
 mode change 100755 => 100644 application/views/organisation/studiensemesterNew.php
 mode change 100755 => 100644 application/views/person/bpk/bpkData.php
 mode change 100755 => 100644 application/views/person/bpk/bpkDetails.php
 mode change 100755 => 100644 application/views/person/bpk/bpkwartung.php
 mode change 100755 => 100644 application/views/person/cli/view.php
 mode change 100755 => 100644 application/views/person/gradelist/course.php
 mode change 100755 => 100644 application/views/person/gradelist/gradelist.php
 mode change 100755 => 100644 application/views/person/gradelist/semester.php
 mode change 100755 => 100644 application/views/person/gruppenmanagement/benutzergruppe.php
 mode change 100755 => 100644 application/views/person/gruppenmanagement/gruppenmanagement.php
 mode change 100755 => 100644 application/views/person/gruppenmanagement/gruppenmanagementData.php
 mode change 100755 => 100644 application/views/person/index.php
 mode change 100755 => 100644 application/views/person/view.php
 mode change 100755 => 100644 application/views/system/aufnahme/prestudentMultiAssign.php
 mode change 100755 => 100644 application/views/system/extensions/manager.php
 mode change 100755 => 100644 application/views/system/fas_udf.php
 mode change 100755 => 100644 application/views/system/infocenter/absageModal.php
 mode change 100755 => 100644 application/views/system/infocenter/addNotiz.php
 mode change 100755 => 100644 application/views/system/infocenter/anmerkungenZurBewerbung.php
 mode change 100755 => 100644 application/views/system/infocenter/dokNachzureichend.php
 mode change 100755 => 100644 application/views/system/infocenter/dokpruefung.php
 mode change 100755 => 100644 application/views/system/infocenter/infocenter.php
 mode change 100755 => 100644 application/views/system/infocenter/infocenterAbgewiesen.php
 mode change 100755 => 100644 application/views/system/infocenter/infocenterAbgewiesenData.php
 mode change 100755 => 100644 application/views/system/infocenter/infocenterAufgenommen.php
 mode change 100755 => 100644 application/views/system/infocenter/infocenterAufgenommenData.php
 mode change 100755 => 100644 application/views/system/infocenter/infocenterData.php
 mode change 100755 => 100644 application/views/system/infocenter/infocenterDetails.php
 mode change 100755 => 100644 application/views/system/infocenter/infocenterFreigegeben.php
 mode change 100755 => 100644 application/views/system/infocenter/infocenterFreigegebenData.php
 mode change 100755 => 100644 application/views/system/infocenter/infocenterReihungstestAbsolviert.php
 mode change 100755 => 100644 application/views/system/infocenter/infocenterReihungstestAbsolviertData.php
 mode change 100755 => 100644 application/views/system/infocenter/infocenterZgvDetails.php
 mode change 100755 => 100644 application/views/system/infocenter/infocenterZgvUeberpruefung.php
 mode change 100755 => 100644 application/views/system/infocenter/infocenterZgvUeberpruefungData.php
 mode change 100755 => 100644 application/views/system/infocenter/logs.php
 mode change 100755 => 100644 application/views/system/infocenter/messageList.php
 mode change 100755 => 100644 application/views/system/infocenter/notizen.php
 mode change 100755 => 100644 application/views/system/infocenter/stammdaten.php
 mode change 100755 => 100644 application/views/system/infocenter/studiengangZgvInfo.php
 mode change 100755 => 100644 application/views/system/infocenter/zgvpruefungen.php
 mode change 100755 => 100644 application/views/system/issues/issues.php
 mode change 100755 => 100644 application/views/system/issues/issuesData.php
 mode change 100755 => 100644 application/views/system/issues/issuesKonfiguration.php
 mode change 100755 => 100644 application/views/system/issues/issuesKonfigurationData.php
 mode change 100755 => 100644 application/views/system/issues/issuesZustaendigkeiten.php
 mode change 100755 => 100644 application/views/system/issues/issuesZustaendigkeitenData.php
 mode change 100755 => 100644 application/views/system/issues/plausichecks.php
 mode change 100755 => 100644 application/views/system/jq/jobsQueueViewer.php
 mode change 100755 => 100644 application/views/system/jq/jobsQueueViewerData.php
 mode change 100755 => 100644 application/views/system/login/usernamePassword.php
 mode change 100755 => 100644 application/views/system/logs/logsViewer.php
 mode change 100755 => 100644 application/views/system/logs/testSearch.php
 mode change 100755 => 100644 application/views/system/messages/FAShtmlWriteTemplate.php
 mode change 100755 => 100644 application/views/system/messages/ajaxRead.php
 mode change 100755 => 100644 application/views/system/messages/ajaxWrite.php
 mode change 100755 => 100644 application/views/system/messages/ajaxWriteReply.php
 mode change 100755 => 100644 application/views/system/messages/htmlMessageSentError.php
 mode change 100755 => 100644 application/views/system/messages/htmlMessageSentSuccess.php
 mode change 100755 => 100644 application/views/system/messages/htmlRead.php
 mode change 100755 => 100644 application/views/system/messages/htmlWriteReply.php
 mode change 100755 => 100644 application/views/system/messages/htmlWriteTemplate.php
 mode change 100755 => 100644 application/views/system/phrases/phraseinhaltEdit.php
 mode change 100755 => 100644 application/views/system/phrases/phrases.php
 mode change 100755 => 100644 application/views/system/phrases/phrasesEdit.php
 mode change 100755 => 100644 application/views/system/phrases/phrasesList.php
 mode change 100755 => 100644 application/views/system/phrases/phrasesinhaltList.php
 mode change 100755 => 100644 application/views/system/vorlage/templateLinkDocuments.php
 mode change 100755 => 100644 application/views/system/vorlage/templates.php
 mode change 100755 => 100644 application/views/system/vorlage/templatesEdit.php
 mode change 100755 => 100644 application/views/system/vorlage/templatesList.php
 mode change 100755 => 100644 application/views/system/vorlage/templatetextEdit.php
 mode change 100755 => 100644 application/views/system/vorlage/templatetextList.php
 mode change 100755 => 100644 application/views/system/vorlage/templatetextPreview.php
 mode change 100755 => 100644 application/views/templates/CISHMVC-Footer.php
 mode change 100755 => 100644 application/views/templates/CISHMVC-Header.php
 mode change 100755 => 100644 application/views/templates/CISHMVC-Menu/Entry.php
 mode change 100755 => 100644 application/views/templates/CISHTML-Footer.php
 mode change 100755 => 100644 application/views/templates/CISHTML-Header.php
 mode change 100755 => 100644 application/views/templates/CISHTML-Menu/Entry.php
 mode change 100755 => 100644 application/views/templates/CISHTML-Menu/EntryBase.php
 mode change 100755 => 100644 application/views/templates/CISHTML-Menu/EntryInclude.php
 mode change 100755 => 100644 application/views/templates/CISVUE-Footer.php
 mode change 100755 => 100644 application/views/templates/CISVUE-Header.php
 mode change 100755 => 100644 application/views/templates/FHC-Common.php
 mode change 100755 => 100644 application/views/templates/FHC-Footer.php
 mode change 100755 => 100644 application/views/templates/FHC-Header.php
 mode change 100755 => 100644 application/views/templates/footer.php
 mode change 100755 => 100644 application/views/templates/header.php
 mode change 100755 => 100644 application/views/templates/mailHTML.php
 mode change 100755 => 100644 application/views/templates/mailTXT.php
 mode change 100755 => 100644 application/views/templates/mailtemplates/interessentFreigabe.php
 mode change 100755 => 100644 application/views/templates/vilesci.php
 mode change 100755 => 100644 application/views/test/Admin.php
 mode change 100755 => 100644 application/views/test/Test.php
 mode change 100755 => 100644 application/views/widgets/checkbox.php
 mode change 100755 => 100644 application/views/widgets/dropdown.php
 mode change 100755 => 100644 application/views/widgets/filter/filter.php
 mode change 100755 => 100644 application/views/widgets/filter/filterOptions.php
 mode change 100755 => 100644 application/views/widgets/filter/pivotUIDataset.php
 mode change 100755 => 100644 application/views/widgets/filter/saveFilter.php
 mode change 100755 => 100644 application/views/widgets/filter/selectFields.php
 mode change 100755 => 100644 application/views/widgets/filter/selectFilters.php
 mode change 100755 => 100644 application/views/widgets/filter/tableDataset.php
 mode change 100755 => 100644 application/views/widgets/filter/tabulatorDataset.php
 mode change 100755 => 100644 application/views/widgets/jsoneditor.php
 mode change 100755 => 100644 application/views/widgets/jsonforms.php
 mode change 100755 => 100644 application/views/widgets/mimetype.php
 mode change 100755 => 100644 application/views/widgets/navigation.php
 mode change 100755 => 100644 application/views/widgets/navigationHeader.php
 mode change 100755 => 100644 application/views/widgets/navigationMenu.php
 mode change 100755 => 100644 application/views/widgets/phpjsonform.php
 mode change 100755 => 100644 application/views/widgets/table/pivotUIDataset.php
 mode change 100755 => 100644 application/views/widgets/table/table.php
 mode change 100755 => 100644 application/views/widgets/table/tableDataset.php
 mode change 100755 => 100644 application/views/widgets/table/tableHelpsite.php
 mode change 100755 => 100644 application/views/widgets/table/tabulatorDataset.php
 mode change 100755 => 100644 application/views/widgets/textarea.php
 mode change 100755 => 100644 application/views/widgets/textfield.php
 mode change 100755 => 100644 application/views/widgets/tinymce.php
 mode change 100755 => 100644 application/widgets/Aufnahmegruppe_widget.php
 mode change 100755 => 100644 application/widgets/Ausbildungssemester_widget.php
 mode change 100755 => 100644 application/widgets/Dropdown_widget.php
 mode change 100755 => 100644 application/widgets/FilterWidget.php
 mode change 100755 => 100644 application/widgets/MultipleDropdown_widget.php
 mode change 100755 => 100644 application/widgets/Nation_widget.php
 mode change 100755 => 100644 application/widgets/NavigationHeaderWidget.php
 mode change 100755 => 100644 application/widgets/NavigationMenuWidget.php
 mode change 100755 => 100644 application/widgets/NavigationWidget.php
 mode change 100755 => 100644 application/widgets/Organisationseinheit_widget.php
 mode change 100755 => 100644 application/widgets/Orgform_widget.php
 mode change 100755 => 100644 application/widgets/Reihungstest_widget.php
 mode change 100755 => 100644 application/widgets/Sprache_widget.php
 mode change 100755 => 100644 application/widgets/Statusgrund_widget.php
 mode change 100755 => 100644 application/widgets/Studiengang_widget.php
 mode change 100755 => 100644 application/widgets/Studiensemester_widget.php
 mode change 100755 => 100644 application/widgets/Stufe_widget.php
 mode change 100755 => 100644 application/widgets/TableWidget.php
 mode change 100755 => 100644 application/widgets/Vorlage_widget.php
 mode change 100755 => 100644 application/widgets/Zgv_widget.php
 mode change 100755 => 100644 application/widgets/Zgvmaster_widget.php
 mode change 100755 => 100644 application/widgets/extensions/.placeholder
 mode change 100755 => 100644 application/widgets/html/CheckboxWidget.php
 mode change 100755 => 100644 application/widgets/html/DropdownWidget.php
 mode change 100755 => 100644 application/widgets/html/HTMLWidget.php
 mode change 100755 => 100644 application/widgets/html/TextareaWidget.php
 mode change 100755 => 100644 application/widgets/html/TextfieldWidget.php
 mode change 100755 => 100644 application/widgets/jsoneditor_widget.php
 mode change 100755 => 100644 application/widgets/jsonforms_widget.php
 mode change 100755 => 100644 application/widgets/mimetype_widget.php
 mode change 100755 => 100644 application/widgets/phpjsonform_widget.php
 mode change 100755 => 100644 application/widgets/tinymce_widget.php
 mode change 100755 => 100644 application/widgets/udf/CheckboxWidgetUDF.php
 mode change 100755 => 100644 application/widgets/udf/DropdownWidgetUDF.php
 mode change 100755 => 100644 application/widgets/udf/TextareaWidgetUDF.php
 mode change 100755 => 100644 application/widgets/udf/TextfieldWidgetUDF.php
 mode change 100755 => 100644 application/widgets/udf/UDFWidget.php
 mode change 100755 => 100644 cis.php
 mode change 100755 => 100644 cis/ampel.php
 mode change 100755 => 100644 cis/cisdocs/index.html
 mode change 100755 => 100644 cis/cisdocs/muster_semesterplan.doc
 mode change 100755 => 100644 cis/cisdocs/muster_semesterplan_index.html
 mode change 100755 => 100644 cis/cisdocs/vorlage_studienbrief.dot
 mode change 100755 => 100644 cis/index.html
 mode change 100755 => 100644 cis/index.php
 mode change 100755 => 100644 cis/index_login.php
 mode change 100755 => 100644 cis/infoterminal/feed.png
 mode change 100755 => 100644 cis/infoterminal/go-bottom.png
 mode change 100755 => 100644 cis/infoterminal/go-top.png
 mode change 100755 => 100644 cis/infoterminal/index.php
 mode change 100755 => 100644 cis/infoterminal/informationsbildschirm.php
 mode change 100755 => 100644 cis/infoterminal/infoterm.css
 mode change 100755 => 100644 cis/infoterminal/keyboard.php
 mode change 100755 => 100644 cis/infoterminal/lvplan.php
 mode change 100755 => 100644 cis/infoterminal/system-users_in.png
 mode change 100755 => 100644 cis/infoterminal/system-users_out.png
 mode change 100755 => 100644 cis/infoterminal/tw_lageplan.jpg
 mode change 100755 => 100644 cis/infoterminal/tw_logo_01.jpg
 mode change 100755 => 100644 cis/infoterminal/twplan.gif
 mode change 100755 => 100644 cis/menu.php
 mode change 100755 => 100644 cis/private/bildupload.php
 mode change 100755 => 100644 cis/private/coodle/coodle_autocomplete.php
 mode change 100755 => 100644 cis/private/coodle/coodle_events.php
 mode change 100755 => 100644 cis/private/coodle/coodle_worker.php
 mode change 100755 => 100644 cis/private/coodle/index.html
 mode change 100755 => 100644 cis/private/coodle/stammdaten.php
 mode change 100755 => 100644 cis/private/coodle/termin.php
 mode change 100755 => 100644 cis/private/coodle/uebersicht.php
 mode change 100755 => 100644 cis/private/crop.php
 mode change 100755 => 100644 cis/private/freifaecher/anmeldung.php
 mode change 100755 => 100644 cis/private/freifaecher/anmeldungsuebersicht.php
 mode change 100755 => 100644 cis/private/freifaecher/index.html
 mode change 100755 => 100644 cis/private/index.html
 mode change 100755 => 100644 cis/private/info/ersthelfer.php
 mode change 100755 => 100644 cis/private/info/handbuecher/Projektarbeitsabgabe_FHTW_Anleitung_A.pdf
 mode change 100755 => 100644 cis/private/info/handbuecher/Projektarbeitsabgabe_FHTW_Anleitung_L.pdf
 mode change 100755 => 100644 cis/private/info/handbuecher/Publikationsdatenbank_FHTW_Handbuch.pdf
 mode change 100755 => 100644 cis/private/info/handbuecher/abgabetool_lektoren.pdf
 mode change 100755 => 100644 cis/private/info/handbuecher/abgabetool_studenten.pdf
 mode change 100755 => 100644 cis/private/info/handbuecher/index.php
 mode change 100755 => 100644 cis/private/info/index.html
 mode change 100755 => 100644 cis/private/info/partnerhochschulen.php
 mode change 100755 => 100644 cis/private/info/service_uebersicht.php
 mode change 100755 => 100644 cis/private/info/telefonverzeichnis.php
 mode change 100755 => 100644 cis/private/jahresplan/index.html
 mode change 100755 => 100644 cis/private/jahresplan/index.php
 mode change 100755 => 100644 cis/private/jahresplan/jahresplan_bilder.php
 mode change 100755 => 100644 cis/private/jahresplan/jahresplan_detail.php
 mode change 100755 => 100644 cis/private/jahresplan/jahresplan_funktionen.inc.php
 mode change 100755 => 100644 cis/private/jahresplan/jahresplan_kategorie.php
 mode change 100755 => 100644 cis/private/jahresplan/jahresplan_reservierung.php
 mode change 100755 => 100644 cis/private/jahresplan/jahresplan_veranstaltung.php
 mode change 100755 => 100644 cis/private/lehre/abgabe_lektor.php
 mode change 100755 => 100644 cis/private/lehre/abgabe_lektor_details.php
 mode change 100755 => 100644 cis/private/lehre/abgabe_lektor_frameset.html
 mode change 100755 => 100644 cis/private/lehre/abgabe_lektor_multitermin.php
 mode change 100755 => 100644 cis/private/lehre/abgabe_lektor_terminuebersicht.php
 mode change 100755 => 100644 cis/private/lehre/abgabe_lektor_zusatz.php
 mode change 100755 => 100644 cis/private/lehre/abgabe_student.php
 mode change 100755 => 100644 cis/private/lehre/abgabe_student_details.php
 mode change 100755 => 100644 cis/private/lehre/abgabe_student_file.php
 mode change 100755 => 100644 cis/private/lehre/abgabe_student_frameset.php
 mode change 100755 => 100644 cis/private/lehre/abmeldung.php
 mode change 100755 => 100644 cis/private/lehre/anwesenheitsliste.pdf.php
 mode change 100755 => 100644 cis/private/lehre/anwesenheitsliste.php
 mode change 100755 => 100644 cis/private/lehre/benotungstool/lvgesamtnote_worker.php
 mode change 100755 => 100644 cis/private/lehre/benotungstool/lvgesamtnoteeintragen.php
 mode change 100755 => 100644 cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php
 mode change 100755 => 100644 cis/private/lehre/benotungstool/nachpruefungeintragen.php
 mode change 100755 => 100644 cis/private/lehre/benotungstool/notenschluessel.php
 mode change 100755 => 100644 cis/private/lehre/covidstatusliste.php
 mode change 100755 => 100644 cis/private/lehre/feedback.php
 mode change 100755 => 100644 cis/private/lehre/fotoliste.pdf.php
 mode change 100755 => 100644 cis/private/lehre/index.html
 mode change 100755 => 100644 cis/private/lehre/lector_choice.php
 mode change 100755 => 100644 cis/private/lehre/lesson.php
 mode change 100755 => 100644 cis/private/lehre/notenliste.php
 mode change 100755 => 100644 cis/private/lehre/notenliste.xls.php
 mode change 100755 => 100644 cis/private/lehre/pruefung/index.php
 mode change 100755 => 100644 cis/private/lehre/pruefung/lektor_autocomplete.php
 mode change 100755 => 100644 cis/private/lehre/pruefung/pruefung.js.php
 mode change 100755 => 100644 cis/private/lehre/pruefung/pruefungsanmeldung.json.php
 mode change 100755 => 100644 cis/private/lehre/pruefung/pruefungsanmeldung.php
 mode change 100755 => 100644 cis/private/lehre/pruefung/pruefungsanmeldungen_liste.pdf.php
 mode change 100755 => 100644 cis/private/lehre/pruefung/pruefungsanmeldungen_liste.php
 mode change 100755 => 100644 cis/private/lehre/pruefung/pruefungsanmeldungen_liste_ohne_namen.php
 mode change 100755 => 100644 cis/private/lehre/pruefung/pruefungsanmeldungen_verwalten.php
 mode change 100755 => 100644 cis/private/lehre/pruefung/pruefungsbewertung.js.php
 mode change 100755 => 100644 cis/private/lehre/pruefung/pruefungsbewertung.json.php
 mode change 100755 => 100644 cis/private/lehre/pruefung/pruefungsbewertung.php
 mode change 100755 => 100644 cis/private/lehre/pruefung/pruefungsfenster_anlegen.php
 mode change 100755 => 100644 cis/private/lehre/pruefung/pruefungstermin.json.php
 mode change 100755 => 100644 cis/private/lehre/pruefung/pruefungstermin_aendern.php
 mode change 100755 => 100644 cis/private/lehre/pruefung/pruefungstermin_festlegen.php
 mode change 100755 => 100644 cis/private/lehre/pruefung/pruefungstermin_loeschen.php
 mode change 100755 => 100644 cis/private/lehre/semdownhlp.php
 mode change 100755 => 100644 cis/private/lehre/semupload.php
 mode change 100755 => 100644 cis/private/lehre/softgrid.php
 mode change 100755 => 100644 cis/private/lehre/upload.php
 mode change 100755 => 100644 cis/private/lvplan/belegt.php
 mode change 100755 => 100644 cis/private/lvplan/index.html
 mode change 100755 => 100644 cis/private/lvplan/index.php
 mode change 100755 => 100644 cis/private/lvplan/index_out.html
 mode change 100755 => 100644 cis/private/lvplan/lvplan_autocomplete.php
 mode change 100755 => 100644 cis/private/lvplan/raumsuche.php
 mode change 100755 => 100644 cis/private/lvplan/stpl_detail.php
 mode change 100755 => 100644 cis/private/lvplan/stpl_kalender.php
 mode change 100755 => 100644 cis/private/lvplan/stpl_reserve_list.php
 mode change 100755 => 100644 cis/private/lvplan/stpl_week.php
 mode change 100755 => 100644 cis/private/lvplan/stpl_week_anzahl_studenten.php
 mode change 100755 => 100644 cis/private/lvplan/verband_uebersicht.php
 mode change 100755 => 100644 cis/private/mailverteiler.php
 mode change 100755 => 100644 cis/private/open_grp.php
 mode change 100755 => 100644 cis/private/outgoing/akte.php
 mode change 100755 => 100644 cis/private/outgoing/akteupload.php
 mode change 100755 => 100644 cis/private/outgoing/index.html
 mode change 100755 => 100644 cis/private/outgoing/outgoing.php
 mode change 100755 => 100644 cis/private/outgoing/outgoing_autocomplete.php
 mode change 100755 => 100644 cis/private/outgoing/registration.php
 mode change 100755 => 100644 cis/private/pdfExport.php
 mode change 100755 => 100644 cis/private/pers_in_grp.php
 mode change 100755 => 100644 cis/private/profile/anwesenheit.php
 mode change 100755 => 100644 cis/private/profile/anwesenheit_lektor.php
 mode change 100755 => 100644 cis/private/profile/change_password.php
 mode change 100755 => 100644 cis/private/profile/dokumente.php
 mode change 100755 => 100644 cis/private/profile/freebusy.php
 mode change 100755 => 100644 cis/private/profile/index.html
 mode change 100755 => 100644 cis/private/profile/index.php
 mode change 100755 => 100644 cis/private/profile/lva_liste.php
 mode change 100755 => 100644 cis/private/profile/mitarbeiter_buchung.php
 mode change 100755 => 100644 cis/private/profile/studienplan.php
 mode change 100755 => 100644 cis/private/profile/urlaubsfreigabe.php
 mode change 100755 => 100644 cis/private/profile/urlaubstool.php
 mode change 100755 => 100644 cis/private/profile/urlaubstool_autocomplete.php
 mode change 100755 => 100644 cis/private/profile/zahlungen.php
 mode change 100755 => 100644 cis/private/profile/zahlungen_details.php
 mode change 100755 => 100644 cis/private/profile/zeitsperre.php
 mode change 100755 => 100644 cis/private/profile/zeitsperre_days.php
 mode change 100755 => 100644 cis/private/profile/zeitsperre_export.php
 mode change 100755 => 100644 cis/private/profile/zeitsperre_resturlaub.php
 mode change 100755 => 100644 cis/private/profile/zeitwunsch.php
 mode change 100755 => 100644 cis/private/profile/zeitwunsch_help.php
 mode change 100755 => 100644 cis/private/stud_in_grp.php
 mode change 100755 => 100644 cis/private/tools/ampelleiteruebersicht.php
 mode change 100755 => 100644 cis/private/tools/ampelverwaltung.php
 mode change 100755 => 100644 cis/private/tools/index.html
 mode change 100755 => 100644 cis/private/tools/notebook_registration.php
 mode change 100755 => 100644 cis/private/tools/projektabgabe.php
 mode change 100755 => 100644 cis/private/tools/projektabgabe_autocomplete.php
 mode change 100755 => 100644 cis/private/tools/suche.php
 mode change 100755 => 100644 cis/private/tools/zeitaufzeichnung.php
 mode change 100755 => 100644 cis/private/tools/zeitaufzeichnung_autocomplete.php
 mode change 100755 => 100644 cis/private/tools/zeitaufzeichnung_bisverwendung.php
 mode change 100755 => 100644 cis/private/tools/zeitaufzeichnung_projektliste.php
 mode change 100755 => 100644 cis/private/tools/zeitaufzeichnung_projektphasen.php
 mode change 100755 => 100644 cis/private/tools/zeitaufzeichnung_zeitsperren.php
 mode change 100755 => 100644 cis/public/accountactivation.php
 mode change 100755 => 100644 cis/public/bild.php
 mode change 100755 => 100644 cis/public/bildupload.php
 mode change 100755 => 100644 cis/public/coodle.php
 mode change 100755 => 100644 cis/public/freebusy.php
 mode change 100755 => 100644 cis/public/freebusy_coodle.php
 mode change 100755 => 100644 cis/public/freebusy_lvplan.php
 mode change 100755 => 100644 cis/public/freebusy_sogo.php
 mode change 100755 => 100644 cis/public/freebusy_zeitsperren.php
 mode change 100755 => 100644 cis/public/ical_coodle.php
 mode change 100755 => 100644 cis/public/incoming/akte.php
 mode change 100755 => 100644 cis/public/incoming/akteupload.php
 mode change 100755 => 100644 cis/public/incoming/auth.php
 mode change 100755 => 100644 cis/public/incoming/incoming.php
 mode change 100755 => 100644 cis/public/incoming/index.php
 mode change 100755 => 100644 cis/public/incoming/logout.php
 mode change 100755 => 100644 cis/public/incoming/lvinfo.php
 mode change 100755 => 100644 cis/public/incoming/registration.php
 mode change 100755 => 100644 cis/public/index.html
 mode change 100755 => 100644 cis/public/prestudententool/auth.php
 mode change 100755 => 100644 cis/public/prestudententool/index.php
 mode change 100755 => 100644 cis/public/prestudententool/logout.php
 mode change 100755 => 100644 cis/public/prestudententool/prestudent.php
 mode change 100755 => 100644 cis/public/testtool_test/MathML_Beispiel.jpg
 mode change 100755 => 100644 cis/public/testtool_test/audio_testfile.mp3
 mode change 100755 => 100644 cis/public/testtool_test/testseite.php
 mode change 100755 => 100644 cis/testtool/admin/Testtool.pdf
 mode change 100755 => 100644 cis/testtool/admin/add_gebiet.php
 mode change 100755 => 100644 cis/testtool/admin/auswertung.php
 mode change 100755 => 100644 cis/testtool/admin/auswertung_detail.php
 mode change 100755 => 100644 cis/testtool/admin/auswertung_detail_frage.php
 mode change 100755 => 100644 cis/testtool/admin/auswertung_detail_prestudent.php
 mode change 100755 => 100644 cis/testtool/admin/copy_gebiet.php
 mode change 100755 => 100644 cis/testtool/admin/edit_ablauf.php
 mode change 100755 => 100644 cis/testtool/admin/edit_gebiet.php
 mode change 100755 => 100644 cis/testtool/admin/gebieteAnheangen.php
 mode change 100755 => 100644 cis/testtool/admin/index.php
 mode change 100755 => 100644 cis/testtool/admin/uebersichtFragen.php
 mode change 100755 => 100644 cis/testtool/admin/uebersichtGebiete.php
 mode change 100755 => 100644 cis/testtool/audio-player/audio-player-noswfobject.js
 mode change 100755 => 100644 cis/testtool/audio-player/audio-player-uncompressed.js
 mode change 100755 => 100644 cis/testtool/audio-player/audio-player.js
 mode change 100755 => 100644 cis/testtool/audio-player/license.txt
 mode change 100755 => 100644 cis/testtool/audio-player/player.swf
 mode change 100755 => 100644 cis/testtool/bild.php
 mode change 100755 => 100644 cis/testtool/ctop.xsl
 mode change 100755 => 100644 cis/testtool/frage.php
 mode change 100755 => 100644 cis/testtool/gebietfertig.php
 mode change 100755 => 100644 cis/testtool/index.html
 mode change 100755 => 100644 cis/testtool/index.php
 mode change 100755 => 100644 cis/testtool/login.php
 mode change 100755 => 100644 cis/testtool/logout.html
 mode change 100755 => 100644 cis/testtool/mathml.xsl
 mode change 100755 => 100644 cis/testtool/menu.php
 mode change 100755 => 100644 cis/testtool/pmathml.xsl
 mode change 100755 => 100644 cis/testtool/prueflinggesperrt.php
 mode change 100755 => 100644 cis/testtool/sound.php
 mode change 100755 => 100644 cis/testtool/test/MathML_Beispiel.jpg
 mode change 100755 => 100644 cis/testtool/test/audio_testfile.mp3
 mode change 100755 => 100644 cis/testtool/test/testseite.php
 mode change 100755 => 100644 cis/testtool/topbar.html
 mode change 100755 => 100644 cis/testtool/topbar.php
 mode change 100755 => 100644 cms/admin.php
 mode change 100755 => 100644 cms/admin_dms.php
 mode change 100755 => 100644 cms/content.php
 mode change 100755 => 100644 cms/content_uebersicht.php
 mode change 100755 => 100644 cms/dms.php
 mode change 100755 => 100644 cms/image.php
 mode change 100755 => 100644 cms/index.html
 mode change 100755 => 100644 cms/menu.inc.php
 mode change 100755 => 100644 cms/menu/menu_addon.class.php
 mode change 100755 => 100644 cms/menu/menu_addon_freifaecher.inc.php
 mode change 100755 => 100644 cms/menu/menu_addon_lehrveranstaltungen.inc.php
 mode change 100755 => 100644 cms/menu/menu_addon_lehrveranstaltungen_studienplan.inc.php
 mode change 100755 => 100644 cms/menu/menu_addon_meinelehrfaecher.inc.php
 mode change 100755 => 100644 cms/menu/menu_addon_meinelv.inc.php
 mode change 100755 => 100644 cms/menu/menu_addon_spacer.inc.php
 mode change 100755 => 100644 cms/menu/menu_addon_test.inc.php
 mode change 100755 => 100644 cms/menu/menu_addon_urlaub.inc.php
 mode change 100755 => 100644 cms/menu/menu_addon_zeitsperren.inc.php
 mode change 100755 => 100644 cms/news.php
 mode change 100755 => 100644 cms/newsverwaltung.php
 mode change 100755 => 100644 cms/tinymce_dms.php
 mode change 100755 => 100644 composer.json
 mode change 100755 => 100644 composer.lock
 mode change 100755 => 100644 config/.gitignore
 mode change 100755 => 100644 config/cis.config-default.inc.php
 mode change 100755 => 100644 config/global.config-default.inc.php
 mode change 100755 => 100644 config/system.config-default.inc.php
 mode change 100755 => 100644 config/vilesci.config-default.inc.php
 mode change 100755 => 100644 config/wawi.config-default.inc.php
 mode change 100755 => 100644 content/DragAndDrop.js
 mode change 100755 => 100644 content/about.xul.php
 mode change 100755 => 100644 content/adressedialog.js.php
 mode change 100755 => 100644 content/adressedialog.xul.php
 mode change 100755 => 100644 content/akte.php
 mode change 100755 => 100644 content/akteupload.php
 mode change 100755 => 100644 content/anwesenheit.js.php
 mode change 100755 => 100644 content/anwesenheit.xul.php
 mode change 100755 => 100644 content/bankverbindungdialog.js.php
 mode change 100755 => 100644 content/bankverbindungdialog.xul.php
 mode change 100755 => 100644 content/betriebsmitteloverlay.js.php
 mode change 100755 => 100644 content/betriebsmitteloverlay.xul.php
 mode change 100755 => 100644 content/bild.php
 mode change 100755 => 100644 content/bildupload.php
 mode change 100755 => 100644 content/bindings.css
 mode change 100755 => 100644 content/bindings.xml.php
 mode change 100755 => 100644 content/datepicker/calendar.png
 mode change 100755 => 100644 content/datepicker/date.png
 mode change 100755 => 100644 content/datepicker/datepicker.css
 mode change 100755 => 100644 content/datepicker/datepicker.xml
 mode change 100755 => 100644 content/datepicker/navigation.png
 mode change 100755 => 100644 content/dokumentenakt.pdf.php
 mode change 100755 => 100644 content/dragboard.js.php
 mode change 100755 => 100644 content/fas.xul.php
 mode change 100755 => 100644 content/fasDBDML.php
 mode change 100755 => 100644 content/fasoverlay.js.php
 mode change 100755 => 100644 content/fasoverlay.xul.php
 mode change 100755 => 100644 content/functions.js.php
 mode change 100755 => 100644 content/funktionen.js.php
 mode change 100755 => 100644 content/funktionen.xul.php
 mode change 100755 => 100644 content/kontakt.js.php
 mode change 100755 => 100644 content/kontakt.xul.php
 mode change 100755 => 100644 content/kontaktdialog.js.php
 mode change 100755 => 100644 content/kontaktdialog.xul.php
 mode change 100755 => 100644 content/lvplanung/lehrveranstaltungDBDML.php
 mode change 100755 => 100644 content/lvplanung/lehrveranstaltungdetailoverlay.xul.php
 mode change 100755 => 100644 content/lvplanung/lehrveranstaltungnotenoverlay.xul.php
 mode change 100755 => 100644 content/lvplanung/lehrveranstaltungoverlay.js.php
 mode change 100755 => 100644 content/lvplanung/lehrveranstaltungoverlay.xul.php
 mode change 100755 => 100644 content/lvplanung/ressourcedialog.js.php
 mode change 100755 => 100644 content/lvplanung/ressourcedialog.xul.php
 mode change 100755 => 100644 content/lvplanung/stpl-details-dialog.js.php
 mode change 100755 => 100644 content/lvplanung/stpl-details-dialog.xul.php
 mode change 100755 => 100644 content/lvplanung/stpl-details-overlay.xul.php
 mode change 100755 => 100644 content/lvplanung/stpl-semester-overlay.js.php
 mode change 100755 => 100644 content/lvplanung/stpl-semester-overlay.xul.php
 mode change 100755 => 100644 content/lvplanung/stpl-week-overlay.js.php
 mode change 100755 => 100644 content/lvplanung/stpl-week-overlay.xul.php
 mode change 100755 => 100644 content/lvplanung/timetable-week.xul.php
 mode change 100755 => 100644 content/messages.js.php
 mode change 100755 => 100644 content/messages.xul.php
 mode change 100755 => 100644 content/mitarbeiter/lehrtaetigkeit.pdf.php
 mode change 100755 => 100644 content/mitarbeiter/mitarbeiterDBDML.php
 mode change 100755 => 100644 content/mitarbeiter/mitarbeiterbuchung.js.php
 mode change 100755 => 100644 content/mitarbeiter/mitarbeiterbuchungoverlay.xul.php
 mode change 100755 => 100644 content/mitarbeiter/mitarbeiterdetailoverlay.xul.php
 mode change 100755 => 100644 content/mitarbeiter/mitarbeiterfunktionoverlay.xul.php
 mode change 100755 => 100644 content/mitarbeiter/mitarbeiteroverlay.js.php
 mode change 100755 => 100644 content/mitarbeiter/mitarbeiteroverlay.xul.php
 mode change 100755 => 100644 content/mitarbeiter/mitarbeitervertrag.js.php
 mode change 100755 => 100644 content/mitarbeiter/mitarbeitervertragneudialog.js.php
 mode change 100755 => 100644 content/mitarbeiter/mitarbeitervertragneudialog.xul.php
 mode change 100755 => 100644 content/mitarbeiter/mitarbeitervertragoverlay.xul.php
 mode change 100755 => 100644 content/mitarbeiter/mitarbeiterverwendungdialog.js.php
 mode change 100755 => 100644 content/mitarbeiter/mitarbeiterverwendungdialog.xul.php
 mode change 100755 => 100644 content/notiz.xml.php
 mode change 100755 => 100644 content/notizdialog.js.php
 mode change 100755 => 100644 content/notizdialog.xul.php
 mode change 100755 => 100644 content/notizdokdownload.php
 mode change 100755 => 100644 content/notizdokupload.php
 mode change 100755 => 100644 content/pdfExport.php
 mode change 100755 => 100644 content/phpRequest.js.php
 mode change 100755 => 100644 content/planner.js.php
 mode change 100755 => 100644 content/planner.overlay.js.php
 mode change 100755 => 100644 content/planner.overlay.xul.php
 mode change 100755 => 100644 content/planner.xul.php
 mode change 100755 => 100644 content/projekt/GanttChart.svg
 mode change 100755 => 100644 content/projekt/bestellung.overlay.js.php
 mode change 100755 => 100644 content/projekt/bestellung.overlay.xul.php
 mode change 100755 => 100644 content/projekt/gantt.css
 mode change 100755 => 100644 content/projekt/gantt.overlay.js.php
 mode change 100755 => 100644 content/projekt/gantt.overlay.xul.php
 mode change 100755 => 100644 content/projekt/gantt.svg.css
 mode change 100755 => 100644 content/projekt/gantt.svg.php
 mode change 100755 => 100644 content/projekt/gantt.svg.xbl
 mode change 100755 => 100644 content/projekt/mantisdetail.overlay.xul.php
 mode change 100755 => 100644 content/projekt/parsedown.php
 mode change 100755 => 100644 content/projekt/projekt.overlay.js.php
 mode change 100755 => 100644 content/projekt/projekt.overlay.xul.php
 mode change 100755 => 100644 content/projekt/projekt_ressource.window.js.php
 mode change 100755 => 100644 content/projekt/projekt_ressource.window.xul.php
 mode change 100755 => 100644 content/projekt/projektdetail.overlay.xul.php
 mode change 100755 => 100644 content/projekt/projektdokument.overlay.js.php
 mode change 100755 => 100644 content/projekt/projektdokument.overlay.xul.php
 mode change 100755 => 100644 content/projekt/projektdokument.window.js.php
 mode change 100755 => 100644 content/projekt/projektdokument.window.xul.php
 mode change 100755 => 100644 content/projekt/projektphase.overlay.js.php
 mode change 100755 => 100644 content/projekt/projektphase.overlay.xul.php
 mode change 100755 => 100644 content/projekt/projektphasedetail.overlay.xul.php
 mode change 100755 => 100644 content/projekt/projekttask.overlay.js.php
 mode change 100755 => 100644 content/projekt/projekttask.overlay.xul.php
 mode change 100755 => 100644 content/projekt/projekttaskdetail.overlay.xul.php
 mode change 100755 => 100644 content/projekt/ressource.js.php
 mode change 100755 => 100644 content/projekt/ressource.overlay.js.php
 mode change 100755 => 100644 content/projekt/ressource.overlay.xul.php
 mode change 100755 => 100644 content/projekt/ressource.window.xul.php
 mode change 100755 => 100644 content/projekt/ressource.xml.php
 mode change 100755 => 100644 content/projekt/ressourcenauslastung.php
 mode change 100755 => 100644 content/projektbeschreibung.php
 mode change 100755 => 100644 content/statistik/StudierendeZGV.php
 mode change 100755 => 100644 content/statistik/abgaengerstatistik.php
 mode change 100755 => 100644 content/statistik/abschlusspruefungexport.xls.php
 mode change 100755 => 100644 content/statistik/absolventen.xls.php
 mode change 100755 => 100644 content/statistik/absolventenstatistik.php
 mode change 100755 => 100644 content/statistik/absolventenzahlen.php
 mode change 100755 => 100644 content/statistik/alvsstatistik.php
 mode change 100755 => 100644 content/statistik/bama_stromanalyse.php
 mode change 100755 => 100644 content/statistik/bama_studentenstrom.svg.php
 mode change 100755 => 100644 content/statistik/bewerberstatistik.php
 mode change 100755 => 100644 content/statistik/bewerberstatistik.svg.php
 mode change 100755 => 100644 content/statistik/dokumente.xls.php
 mode change 100755 => 100644 content/statistik/dropout.php
 mode change 100755 => 100644 content/statistik/dropoutZGV.php
 mode change 100755 => 100644 content/statistik/lehrauftragsliste_gst.xls.php
 mode change 100755 => 100644 content/statistik/lehrauftragsliste_mail.xls.php
 mode change 100755 => 100644 content/statistik/lvplanung.php
 mode change 100755 => 100644 content/statistik/lvplanung.xls.php
 mode change 100755 => 100644 content/statistik/mitarbeiterexport.xls.php
 mode change 100755 => 100644 content/statistik/mitarbeiterstatistik.php
 mode change 100755 => 100644 content/statistik/notenspiegel.php
 mode change 100755 => 100644 content/statistik/notenspiegel_erweitert.php
 mode change 100755 => 100644 content/statistik/oeh_beitraege.xls.php
 mode change 100755 => 100644 content/statistik/projektarbeitexport.xls.php
 mode change 100755 => 100644 content/statistik/studentenexportextended.xls.php
 mode change 100755 => 100644 content/statistik/studentenprosemester.php
 mode change 100755 => 100644 content/statistik/studentenstatistik.php
 mode change 100755 => 100644 content/statistik/studentenstatistik_lehrgaenge.php
 mode change 100755 => 100644 content/statistik/termine.xls.php
 mode change 100755 => 100644 content/statistik/vertragsuebersicht.xls.php
 mode change 100755 => 100644 content/student/aufnahmetermine.js.php
 mode change 100755 => 100644 content/student/aufnahmetermine.xul.php
 mode change 100755 => 100644 content/student/interessentdokumentedialog.js.php
 mode change 100755 => 100644 content/student/interessentdokumentedialog.xul.php
 mode change 100755 => 100644 content/student/interessentdokumenteoverlay.js.php
 mode change 100755 => 100644 content/student/interessentdokumenteoverlay.xul.php
 mode change 100755 => 100644 content/student/interessentoverlay.js.php
 mode change 100755 => 100644 content/student/studentDBDML.php
 mode change 100755 => 100644 content/student/studentabschlusspruefung.js.php
 mode change 100755 => 100644 content/student/studentabschlusspruefungoverlay.xul.php
 mode change 100755 => 100644 content/student/studentanrechnungenoverlay.xul.php
 mode change 100755 => 100644 content/student/studentdetailoverlay.xul.php
 mode change 100755 => 100644 content/student/studentenoverlay.xul.php
 mode change 100755 => 100644 content/student/studentgruppenoverlay.js.php
 mode change 100755 => 100644 content/student/studentgruppenoverlay.xul.php
 mode change 100755 => 100644 content/student/studentiooverlay.xul.php
 mode change 100755 => 100644 content/student/studentkontoneudialog.js.php
 mode change 100755 => 100644 content/student/studentkontoneudialog.xul.php
 mode change 100755 => 100644 content/student/studentkontooverlay.xul.php
 mode change 100755 => 100644 content/student/studentmobilitaetoverlay.js.php
 mode change 100755 => 100644 content/student/studentmobilitaetoverlay.xul.php
 mode change 100755 => 100644 content/student/studentnotenoverlay.xul.php
 mode change 100755 => 100644 content/student/studentoverlay.js.php
 mode change 100755 => 100644 content/student/studentprojektarbeit.js.php
 mode change 100755 => 100644 content/student/studentprojektarbeitoverlay.xul.php
 mode change 100755 => 100644 content/student/studentpruefungoverlay.xul.php
 mode change 100755 => 100644 content/student/studentrolledialog.js.php
 mode change 100755 => 100644 content/student/studentrolledialog.xul.php
 mode change 100755 => 100644 content/student/studentzeugnisoverlay.xul.php
 mode change 100755 => 100644 content/studenten.js
 mode change 100755 => 100644 content/tempus.js.php
 mode change 100755 => 100644 content/tempus.xul.php
 mode change 100755 => 100644 content/tempusDBDML.php
 mode change 100755 => 100644 content/tempusoverlay.js.php
 mode change 100755 => 100644 content/tempusoverlay.xul.php
 mode change 100755 => 100644 content/termine.js.php
 mode change 100755 => 100644 content/termine.xul.php
 mode change 100755 => 100644 content/udf.js.php
 mode change 100755 => 100644 content/udf.xul.php
 mode change 100755 => 100644 content/zutrittskarte.php
 mode change 100755 => 100644 favicon.ico
 mode change 100755 => 100644 include/DifferenceEngine/DifferenceEngine.php
 mode change 100755 => 100644 include/Excel/BIFFwriter.php
 mode change 100755 => 100644 include/Excel/File.php
 mode change 100755 => 100644 include/Excel/Format.php
 mode change 100755 => 100644 include/Excel/OLE.php
 mode change 100755 => 100644 include/Excel/PEAR.php
 mode change 100755 => 100644 include/Excel/PPS.php
 mode change 100755 => 100644 include/Excel/Parser.php
 mode change 100755 => 100644 include/Excel/Root.php
 mode change 100755 => 100644 include/Excel/Validator.php
 mode change 100755 => 100644 include/Excel/Workbook.php
 mode change 100755 => 100644 include/Excel/Worksheet.php
 mode change 100755 => 100644 include/Excel/Writer.php
 mode change 100755 => 100644 include/Excel/excel.php
 mode change 100755 => 100644 include/File/CSV.php
 mode change 100755 => 100644 include/File/Find.php
 mode change 100755 => 100644 include/File/Match.php
 mode change 100755 => 100644 include/File/Passwd.php
 mode change 100755 => 100644 include/File/SearchReplace.php
 mode change 100755 => 100644 include/File/Util.php
 mode change 100755 => 100644 include/Parser/Parsedown.php
 mode change 100755 => 100644 include/ablauf.class.php
 mode change 100755 => 100644 include/abschlusspruefung.class.php
 mode change 100755 => 100644 include/abschlusspruefung_antritt.class.php
 mode change 100755 => 100644 include/addon.class.php
 mode change 100755 => 100644 include/adresse.class.php
 mode change 100755 => 100644 include/adressentyp.class.php
 mode change 100755 => 100644 include/akadgrad.class.php
 mode change 100755 => 100644 include/akte.class.php
 mode change 100755 => 100644 include/ampel.class.php
 mode change 100755 => 100644 include/anrechnung.class.php
 mode change 100755 => 100644 include/antwort.class.php
 mode change 100755 => 100644 include/anwesenheit.class.php
 mode change 100755 => 100644 include/appdaten.class.php
 mode change 100755 => 100644 include/aufmerksamdurch.class.php
 mode change 100755 => 100644 include/auth_demo.class.php
 mode change 100755 => 100644 include/auth_mixed.class.php
 mode change 100755 => 100644 include/auth_session.class.php
 mode change 100755 => 100644 include/authentication.class.php
 mode change 100755 => 100644 include/bankverbindung.class.php
 mode change 100755 => 100644 include/basis.class.php
 mode change 100755 => 100644 include/basis_db.class.php
 mode change 100755 => 100644 include/beispiel.class.php
 mode change 100755 => 100644 include/benutzer.class.php
 mode change 100755 => 100644 include/benutzerberechtigung.class.php
 mode change 100755 => 100644 include/benutzerfunktion.class.php
 mode change 100755 => 100644 include/benutzergruppe.class.php
 mode change 100755 => 100644 include/benutzerlvstudiensemester.class.php
 mode change 100755 => 100644 include/berechtigung.class.php
 mode change 100755 => 100644 include/betriebsmittel.class.php
 mode change 100755 => 100644 include/betriebsmittel_betriebsmittelstatus.class.php
 mode change 100755 => 100644 include/betriebsmittelperson.class.php
 mode change 100755 => 100644 include/betriebsmittelstatus.class.php
 mode change 100755 => 100644 include/betriebsmitteltyp.class.php
 mode change 100755 => 100644 include/bewerbungstermin.class.php
 mode change 100755 => 100644 include/bisarchiv.class.php
 mode change 100755 => 100644 include/bisberufstaetigkeit.class.php
 mode change 100755 => 100644 include/bisfunktion.class.php
 mode change 100755 => 100644 include/bisio.class.php
 mode change 100755 => 100644 include/bisorgform.class.php
 mode change 100755 => 100644 include/bisverwendung.class.php
 mode change 100755 => 100644 include/buchung.class.php
 mode change 100755 => 100644 include/content.class.php
 mode change 100755 => 100644 include/coodle.class.php
 mode change 100755 => 100644 include/covid/covidhelper.class.php
 mode change 100755 => 100644 include/cronjob.class.php
 mode change 100755 => 100644 include/css/images/ui-bg_diagonals-thick_18_b81900_40x40.png
 mode change 100755 => 100644 include/css/images/ui-bg_diagonals-thick_20_666666_40x40.png
 mode change 100755 => 100644 include/css/images/ui-bg_flat_10_000000_40x100.png
 mode change 100755 => 100644 include/css/images/ui-bg_glass_100_f6f6f6_1x400.png
 mode change 100755 => 100644 include/css/images/ui-bg_glass_100_fdf5ce_1x400.png
 mode change 100755 => 100644 include/css/images/ui-bg_glass_65_ffffff_1x400.png
 mode change 100755 => 100644 include/css/images/ui-bg_gloss-wave_35_f6a828_500x100.png
 mode change 100755 => 100644 include/css/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
 mode change 100755 => 100644 include/css/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
 mode change 100755 => 100644 include/css/images/ui-icons_222222_256x240.png
 mode change 100755 => 100644 include/css/images/ui-icons_228ef1_256x240.png
 mode change 100755 => 100644 include/css/images/ui-icons_ef8c08_256x240.png
 mode change 100755 => 100644 include/css/images/ui-icons_ffd27a_256x240.png
 mode change 100755 => 100644 include/css/images/ui-icons_ffffff_256x240.png
 mode change 100755 => 100644 include/datum.class.php
 mode change 100755 => 100644 include/dms.class.php
 mode change 100755 => 100644 include/dokument.class.php
 mode change 100755 => 100644 include/dokument_export.class.php
 mode change 100755 => 100644 include/dvb.class.php
 mode change 100755 => 100644 include/ean13.function.php
 mode change 100755 => 100644 include/entwicklungsteam.class.php
 mode change 100755 => 100644 include/erhalter.class.php
 mode change 100755 => 100644 include/errorhandler.class.php
 mode change 100755 => 100644 include/ezcomponents/Base/CREDITS
 mode change 100755 => 100644 include/ezcomponents/Base/ChangeLog
 mode change 100755 => 100644 include/ezcomponents/Base/DESCRIPTION
 mode change 100755 => 100644 include/ezcomponents/Base/design/class_diagram.png
 mode change 100755 => 100644 include/ezcomponents/Base/design/design.txt
 mode change 100755 => 100644 include/ezcomponents/Base/docs/repos/Me/myclass1.php
 mode change 100755 => 100644 include/ezcomponents/Base/docs/repos/Me/myclass2.php
 mode change 100755 => 100644 include/ezcomponents/Base/docs/repos/You/yourclass1.php
 mode change 100755 => 100644 include/ezcomponents/Base/docs/repos/You/yourclass2.php
 mode change 100755 => 100644 include/ezcomponents/Base/docs/repos/autoloads/my_autoload.php
 mode change 100755 => 100644 include/ezcomponents/Base/docs/repos/autoloads/your_autoload.php
 mode change 100755 => 100644 include/ezcomponents/Base/docs/tutorial.txt
 mode change 100755 => 100644 include/ezcomponents/Base/docs/tutorial_autoload.php
 mode change 100755 => 100644 include/ezcomponents/Base/docs/tutorial_example_01.php
 mode change 100755 => 100644 include/ezcomponents/Base/docs/tutorial_example_02.php
 mode change 100755 => 100644 include/ezcomponents/Base/docs/tutorial_example_03.php
 mode change 100755 => 100644 include/ezcomponents/Base/docs/tutorial_lazy_initialization.php
 mode change 100755 => 100644 include/ezcomponents/Base/review-1.5.txt
 mode change 100755 => 100644 include/ezcomponents/Base/src/base.php
 mode change 100755 => 100644 include/ezcomponents/Base/src/exceptions/autoload.php
 mode change 100755 => 100644 include/ezcomponents/Base/src/exceptions/double_class_repository_prefix.php
 mode change 100755 => 100644 include/ezcomponents/Base/src/exceptions/exception.php
 mode change 100755 => 100644 include/ezcomponents/Base/src/exceptions/extension_not_found.php
 mode change 100755 => 100644 include/ezcomponents/Base/src/exceptions/file_exception.php
 mode change 100755 => 100644 include/ezcomponents/Base/src/exceptions/file_io.php
 mode change 100755 => 100644 include/ezcomponents/Base/src/exceptions/file_not_found.php
 mode change 100755 => 100644 include/ezcomponents/Base/src/exceptions/file_permission.php
 mode change 100755 => 100644 include/ezcomponents/Base/src/exceptions/init_callback_configured.php
 mode change 100755 => 100644 include/ezcomponents/Base/src/exceptions/invalid_callback_class.php
 mode change 100755 => 100644 include/ezcomponents/Base/src/exceptions/invalid_parent_class.php
 mode change 100755 => 100644 include/ezcomponents/Base/src/exceptions/property_not_found.php
 mode change 100755 => 100644 include/ezcomponents/Base/src/exceptions/property_permission.php
 mode change 100755 => 100644 include/ezcomponents/Base/src/exceptions/setting_not_found.php
 mode change 100755 => 100644 include/ezcomponents/Base/src/exceptions/setting_value.php
 mode change 100755 => 100644 include/ezcomponents/Base/src/exceptions/value.php
 mode change 100755 => 100644 include/ezcomponents/Base/src/exceptions/whatever.php
 mode change 100755 => 100644 include/ezcomponents/Base/src/ezc_bootstrap.php
 mode change 100755 => 100644 include/ezcomponents/Base/src/features.php
 mode change 100755 => 100644 include/ezcomponents/Base/src/file.php
 mode change 100755 => 100644 include/ezcomponents/Base/src/init.php
 mode change 100755 => 100644 include/ezcomponents/Base/src/interfaces/configuration_initializer.php
 mode change 100755 => 100644 include/ezcomponents/Base/src/interfaces/persistable.php
 mode change 100755 => 100644 include/ezcomponents/Base/src/options.php
 mode change 100755 => 100644 include/ezcomponents/Base/src/options/autoload.php
 mode change 100755 => 100644 include/ezcomponents/Base/src/struct.php
 mode change 100755 => 100644 include/ezcomponents/Base/src/structs/repository_directory.php
 mode change 100755 => 100644 include/ezcomponents/Base/tests/base_init_test.php
 mode change 100755 => 100644 include/ezcomponents/Base/tests/base_options_test.php
 mode change 100755 => 100644 include/ezcomponents/Base/tests/base_test.php
 mode change 100755 => 100644 include/ezcomponents/Base/tests/extra_repository/Translation/test.php
 mode change 100755 => 100644 include/ezcomponents/Base/tests/extra_repository/autoload/translation_autoload.php
 mode change 100755 => 100644 include/ezcomponents/Base/tests/features_test.php
 mode change 100755 => 100644 include/ezcomponents/Base/tests/file_calculate_relative_path_test.php
 mode change 100755 => 100644 include/ezcomponents/Base/tests/file_copy_recursive_test.php
 mode change 100755 => 100644 include/ezcomponents/Base/tests/file_find_recursive_test.php
 mode change 100755 => 100644 include/ezcomponents/Base/tests/file_is_absolute_path.php
 mode change 100755 => 100644 include/ezcomponents/Base/tests/file_remove_recursive_test.php
 mode change 100755 => 100644 include/ezcomponents/Base/tests/init/base_init_callback.php
 mode change 100755 => 100644 include/ezcomponents/Base/tests/init/base_init_class.php
 mode change 100755 => 100644 include/ezcomponents/Base/tests/struct_test.php
 mode change 100755 => 100644 include/ezcomponents/Base/tests/suite.php
 mode change 100755 => 100644 include/ezcomponents/Base/tests/test_options.php
 mode change 100755 => 100644 include/ezcomponents/Base/tests/test_repository/TestClasses/base_test_class.php
 mode change 100755 => 100644 include/ezcomponents/Base/tests/test_repository/TestClasses/base_test_class_number_two.php
 mode change 100755 => 100644 include/ezcomponents/Base/tests/test_repository/TestClasses/base_test_long_class.php
 mode change 100755 => 100644 include/ezcomponents/Base/tests/test_repository/autoload_files/basetest_autoload.php
 mode change 100755 => 100644 include/ezcomponents/Base/tests/test_repository/autoload_files/basetest_long_autoload.php
 mode change 100755 => 100644 include/ezcomponents/Base/tests/test_repository/autoload_files/object_autoload.php
 mode change 100755 => 100644 include/ezcomponents/Base/tests/test_repository/object/object.php
 mode change 100755 => 100644 include/ezcomponents/ChangeLog
 mode change 100755 => 100644 include/ezcomponents/Graph/CREDITS
 mode change 100755 => 100644 include/ezcomponents/Graph/ChangeLog
 mode change 100755 => 100644 include/ezcomponents/Graph/DESCRIPTION
 mode change 100755 => 100644 include/ezcomponents/Graph/design/class_diagram.png
 mode change 100755 => 100644 include/ezcomponents/Graph/design/design.txt
 mode change 100755 => 100644 include/ezcomponents/Graph/design/enhancements/interactive_data_points.txt
 mode change 100755 => 100644 include/ezcomponents/Graph/design/enhancements/multiple_axis.txt
 mode change 100755 => 100644 include/ezcomponents/Graph/design/requirements.txt
 mode change 100755 => 100644 include/ezcomponents/Graph/design/requirements/interactive_data_points.txt
 mode change 100755 => 100644 include/ezcomponents/Graph/design/requirements/multiple_axis.txt
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/examples/ez_green.php
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/examples/ez_red.php
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/examples/forum_evolution.php
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/examples/forum_month.php
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/examples/forum_weekly.php
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/examples/forum_year.php
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/examples/php_magazine.php
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/examples/wikipedia.php
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/img/tutorial_axis_datetime.svg.png
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/img/tutorial_axis_labeled.svg.png
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/img/tutorial_axis_numeric.svg.png
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/img/tutorial_bar_chart.svg.png
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/img/tutorial_bar_chart_3d.svg.png
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/img/tutorial_bar_chart_options.svg.png
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/img/tutorial_bar_line_chart.svg.png
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/img/tutorial_bar_options.svg.png
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/img/tutorial_chart_background.svg.png
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/img/tutorial_chart_legend.svg.png
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/img/tutorial_chart_title.svg.png
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/img/tutorial_complex_radar_chart.svg.png
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/img/tutorial_custom_odometer_chart.svg.png
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/img/tutorial_custom_palette.svg.png
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/img/tutorial_dataset_average.svg.png
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/img/tutorial_dataset_numeric.svg.png
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/img/tutorial_driver_flash.swf
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/img/tutorial_driver_gd.jpg
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/img/tutorial_driver_svg.svg.png
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/img/tutorial_legend_options.svg.png
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/img/tutorial_line_chart.svg.png
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/img/tutorial_line_chart_3d.svg.png
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/img/tutorial_line_chart_additional_axis.svg.png
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/img/tutorial_line_chart_markers.svg.png
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/img/tutorial_modified_palette.svg.png
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/img/tutorial_odometer_chart.svg.png
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/img/tutorial_pie_chart_3d.svg.png
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/img/tutorial_pie_chart_options.svg.png
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/img/tutorial_pie_chart_pimped.svg.png
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/img/tutorial_pie_options.svg.png
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/img/tutorial_radar_chart.svg.png
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/img/tutorial_reference_gd.html
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/img/tutorial_reference_gd.png
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/img/tutorial_reference_svg.svg
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/img/tutorial_renderer_3d.svg.png
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/img/tutorial_rotated_labels.svg.png
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/img/tutorial_simple_pie.svg.png
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/img/tutorial_stacked_bar_chart.svg.png
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/img/tutorial_user_palette.svg.png
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/tutorial.txt
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/tutorial/ez.png
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/tutorial/template.svg
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/tutorial/tutorial_autoload.php
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/tutorial/tutorial_axis_datetime.php
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/tutorial/tutorial_axis_labeled.php
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/tutorial/tutorial_axis_numeric.php
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/tutorial/tutorial_bar_chart.php
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/tutorial/tutorial_bar_chart_3d.php
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/tutorial/tutorial_bar_chart_options.php
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/tutorial/tutorial_bar_line_chart.php
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/tutorial/tutorial_bar_options.php
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/tutorial/tutorial_chart_background.php
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/tutorial/tutorial_chart_legend.php
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/tutorial/tutorial_chart_title.php
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/tutorial/tutorial_complex_radar_chart.php
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/tutorial/tutorial_custom_odometer_chart.php
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/tutorial/tutorial_custom_palette.php
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/tutorial/tutorial_custom_palette_palette.php
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/tutorial/tutorial_dataset_average.php
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/tutorial/tutorial_dataset_numeric.php
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/tutorial/tutorial_driver_cairo.php
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/tutorial/tutorial_driver_flash.php
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/tutorial/tutorial_driver_gd.php
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/tutorial/tutorial_driver_svg.php
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/tutorial/tutorial_font.fdb
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/tutorial/tutorial_font.pfb
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/tutorial/tutorial_font.ttf
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/tutorial/tutorial_legend_options.php
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/tutorial/tutorial_line_chart.php
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/tutorial/tutorial_line_chart_3d.php
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/tutorial/tutorial_line_chart_additional_axis.php
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/tutorial/tutorial_line_chart_markers.php
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/tutorial/tutorial_modified_palette.php
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/tutorial/tutorial_odometer_chart.php
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/tutorial/tutorial_output.php
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/tutorial/tutorial_pie_chart_3d.php
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/tutorial/tutorial_pie_chart_options.php
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/tutorial/tutorial_pie_chart_pimped.php
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/tutorial/tutorial_pie_options.php
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/tutorial/tutorial_radar_chart.php
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/tutorial/tutorial_reference_gd.php
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/tutorial/tutorial_reference_svg.php
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/tutorial/tutorial_renderer_3d.php
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/tutorial/tutorial_rotated_labels.php
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/tutorial/tutorial_simple_pie.php
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/tutorial/tutorial_stacked_bar_chart.php
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/tutorial/tutorial_user_palette.php
 mode change 100755 => 100644 include/ezcomponents/Graph/docs/tutorial/tutorial_wikipedia_data.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/axis/container.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/axis/date.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/axis/labeled.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/axis/logarithmic.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/axis/numeric.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/charts/bar.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/charts/line.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/charts/odometer.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/charts/pie.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/charts/radar.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/colors/color.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/colors/linear_gradient.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/colors/radial_gradient.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/data_container/base.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/data_container/single.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/datasets/array.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/datasets/average.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/datasets/base.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/datasets/numeric.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/datasets/property/axis.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/datasets/property/boolean.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/datasets/property/color.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/datasets/property/integer.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/datasets/property/string.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/driver/cairo.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/driver/flash.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/driver/gd.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/driver/svg.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/driver/svg_font.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/driver/verbose.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/element/axis.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/element/background.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/element/legend.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/element/text.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/exceptions/date_parsing.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/exceptions/exception.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/exceptions/flash_bitmap_type.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/exceptions/font_rendering.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/exceptions/font_type.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/exceptions/incompatible_driver.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/exceptions/invalid_assignement.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/exceptions/invalid_data.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/exceptions/invalid_data_source.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/exceptions/invalid_dimensions.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/exceptions/invalid_display_type.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/exceptions/invalid_id.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/exceptions/invalid_image_file.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/exceptions/invalid_keys.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/exceptions/no_data.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/exceptions/no_such_data.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/exceptions/no_such_dataset.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/exceptions/no_such_element.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/exceptions/not_rendered.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/exceptions/out_of_boundings.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/exceptions/out_of_logarithmical_boundings.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/exceptions/reducement_failed.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/exceptions/too_many_datasets.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/exceptions/unknown_color_definition.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/exceptions/unregular_steps.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/exceptions/unsupported_image_type.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/graph.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/interfaces/axis_label_renderer.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/interfaces/chart.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/interfaces/dataset_property.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/interfaces/driver.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/interfaces/element.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/interfaces/odometer_renderer.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/interfaces/palette.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/interfaces/radar_renderer.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/interfaces/renderer.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/interfaces/stacked_bar_renderer.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/math/boundings.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/math/matrix.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/math/polynom.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/math/rotation.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/math/transformation.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/math/translation.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/math/vector.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/options/cairo_driver.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/options/chart.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/options/driver.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/options/flash_driver.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/options/font.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/options/gd_driver.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/options/line_chart.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/options/odometer_chart.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/options/pie_chart.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/options/radar_chart.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/options/renderer.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/options/renderer_2d.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/options/renderer_3d.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/options/svg_driver.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/palette/black.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/palette/ez.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/palette/ez_blue.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/palette/ez_green.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/palette/ez_red.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/palette/tango.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/renderer/2d.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/renderer/3d.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/renderer/axis_label_boxed.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/renderer/axis_label_centered.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/renderer/axis_label_exact.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/renderer/axis_label_none.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/renderer/axis_label_radar.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/renderer/axis_label_rotated.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/structs/context.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/structs/coordinate.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/structs/step.php
 mode change 100755 => 100644 include/ezcomponents/Graph/src/tools.php
 mode change 100755 => 100644 include/ezcomponents/GraphDatabaseTiein/CREDITS
 mode change 100755 => 100644 include/ezcomponents/GraphDatabaseTiein/ChangeLog
 mode change 100755 => 100644 include/ezcomponents/GraphDatabaseTiein/DEPS
 mode change 100755 => 100644 include/ezcomponents/GraphDatabaseTiein/DESCRIPTION
 mode change 100755 => 100644 include/ezcomponents/GraphDatabaseTiein/TODO
 mode change 100755 => 100644 include/ezcomponents/GraphDatabaseTiein/design/class_diagram.png
 mode change 100755 => 100644 include/ezcomponents/GraphDatabaseTiein/design/design.txt
 mode change 100755 => 100644 include/ezcomponents/GraphDatabaseTiein/docs/img/tutorial_multiple.svg.png
 mode change 100755 => 100644 include/ezcomponents/GraphDatabaseTiein/docs/img/tutorial_simple.svg.png
 mode change 100755 => 100644 include/ezcomponents/GraphDatabaseTiein/docs/img/tutorial_single.svg.png
 mode change 100755 => 100644 include/ezcomponents/GraphDatabaseTiein/docs/tutorial.txt
 mode change 100755 => 100644 include/ezcomponents/GraphDatabaseTiein/docs/tutorial/tutorial_autoload.php
 mode change 100755 => 100644 include/ezcomponents/GraphDatabaseTiein/docs/tutorial/tutorial_insert_data.php
 mode change 100755 => 100644 include/ezcomponents/GraphDatabaseTiein/docs/tutorial/tutorial_multiple.php
 mode change 100755 => 100644 include/ezcomponents/GraphDatabaseTiein/docs/tutorial/tutorial_simple.php
 mode change 100755 => 100644 include/ezcomponents/GraphDatabaseTiein/docs/tutorial/tutorial_single.php
 mode change 100755 => 100644 include/ezcomponents/GraphDatabaseTiein/src/dataset.php
 mode change 100755 => 100644 include/ezcomponents/GraphDatabaseTiein/src/exceptions/exception.php
 mode change 100755 => 100644 include/ezcomponents/GraphDatabaseTiein/src/exceptions/missing_column.php
 mode change 100755 => 100644 include/ezcomponents/GraphDatabaseTiein/src/exceptions/statement_not_executed.php
 mode change 100755 => 100644 include/ezcomponents/GraphDatabaseTiein/src/exceptions/too_many_columns.php
 mode change 100755 => 100644 include/ezcomponents/GraphDatabaseTiein/tests/dataset_pdo_test.php
 mode change 100755 => 100644 include/ezcomponents/GraphDatabaseTiein/tests/suite.php
 mode change 100755 => 100644 include/ezcomponents/ImageAnalysis/CREDITS
 mode change 100755 => 100644 include/ezcomponents/ImageAnalysis/ChangeLog
 mode change 100755 => 100644 include/ezcomponents/ImageAnalysis/DESCRIPTION
 mode change 100755 => 100644 include/ezcomponents/ImageAnalysis/design/class_diagram.png
 mode change 100755 => 100644 include/ezcomponents/ImageAnalysis/design/imageanalysis.png
 mode change 100755 => 100644 include/ezcomponents/ImageAnalysis/design/imageanalysis.xml
 mode change 100755 => 100644 include/ezcomponents/ImageAnalysis/docs/example.php
 mode change 100755 => 100644 include/ezcomponents/ImageAnalysis/docs/img/imageanalysis_example_01.jpg
 mode change 100755 => 100644 include/ezcomponents/ImageAnalysis/docs/img/imageanalysis_example_02.jpg
 mode change 100755 => 100644 include/ezcomponents/ImageAnalysis/docs/img/imageanalysis_example_03.jpg
 mode change 100755 => 100644 include/ezcomponents/ImageAnalysis/docs/toby.jpg
 mode change 100755 => 100644 include/ezcomponents/ImageAnalysis/docs/tutorial.txt
 mode change 100755 => 100644 include/ezcomponents/ImageAnalysis/docs/tutorial_autoload.php
 mode change 100755 => 100644 include/ezcomponents/ImageAnalysis/docs/tutorial_example_01.php
 mode change 100755 => 100644 include/ezcomponents/ImageAnalysis/docs/tutorial_example_02.php
 mode change 100755 => 100644 include/ezcomponents/ImageAnalysis/docs/tutorial_example_03.php
 mode change 100755 => 100644 include/ezcomponents/ImageAnalysis/src/analyzer.php
 mode change 100755 => 100644 include/ezcomponents/ImageAnalysis/src/exceptions/exception.php
 mode change 100755 => 100644 include/ezcomponents/ImageAnalysis/src/exceptions/file_not_processable.php
 mode change 100755 => 100644 include/ezcomponents/ImageAnalysis/src/exceptions/invalid_handler.php
 mode change 100755 => 100644 include/ezcomponents/ImageAnalysis/src/handlers/imagemagick.php
 mode change 100755 => 100644 include/ezcomponents/ImageAnalysis/src/handlers/php.php
 mode change 100755 => 100644 include/ezcomponents/ImageAnalysis/src/interfaces/handler.php
 mode change 100755 => 100644 include/ezcomponents/ImageAnalysis/src/structs/analyzer_data.php
 mode change 100755 => 100644 include/ezcomponents/ImageAnalysis/tests/analyzer_test.php
 mode change 100755 => 100644 include/ezcomponents/ImageAnalysis/tests/data/gif_animated.gif
 mode change 100755 => 100644 include/ezcomponents/ImageAnalysis/tests/data/gif_nonanimated.gif
 mode change 100755 => 100644 include/ezcomponents/ImageAnalysis/tests/data/jpeg_exif.jpg
 mode change 100755 => 100644 include/ezcomponents/ImageAnalysis/tests/data/jpeg_noexif.jpg
 mode change 100755 => 100644 include/ezcomponents/ImageAnalysis/tests/data/png_nonanimated.png
 mode change 100755 => 100644 include/ezcomponents/ImageAnalysis/tests/data/svg.svg
 mode change 100755 => 100644 include/ezcomponents/ImageAnalysis/tests/data/tiff_exif.tiff
 mode change 100755 => 100644 include/ezcomponents/ImageAnalysis/tests/data/tiff_noexif.tiff
 mode change 100755 => 100644 include/ezcomponents/ImageAnalysis/tests/suite.php
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/CREDITS
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/ChangeLog
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/DEPS
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/DESCRIPTION
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/TODO
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/design/class_diagram.png
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/design/design.htm
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/design/design.txt
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/design/image.png
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/design/image.xml
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/design/image_exceptions.png
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/design/image_filters.png
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/docs/example_general.php
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/docs/example_singleton.php
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/docs/img/imageconversion_example_01_after.jpg
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/docs/img/imageconversion_example_01_before.bmp
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/docs/img/imageconversion_example_02_after.jpg
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/docs/img/imageconversion_example_02_before.jpg
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/docs/img/imageconversion_example_03_after.jpg
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/docs/img/imageconversion_example_03_before.jpg
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/docs/img/imageconversion_example_04_after.jpg
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/docs/img/imageconversion_example_04_before.jpg
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/docs/img/imageconversion_example_05_after.jpg
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/docs/img/imageconversion_example_05_before.jpg
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/docs/img/watermark.png
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/docs/jpeg.jpg
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/docs/tutorial.txt
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/docs/tutorial_autoload.php
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/docs/tutorial_example_01_simpleconvert.php
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/docs/tutorial_example_02_simpletrans.php
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/docs/tutorial_example_03_complextrans.php
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/docs/tutorial_example_04_watermark.php
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/docs/tutorial_example_05_thumbnail.php
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/review-1.3.4.txt
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/src/converter.php
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/src/exceptions/exception.php
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/src/exceptions/file_name_invalid.php
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/src/exceptions/file_not_processable.php
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/src/exceptions/filter_failed.php
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/src/exceptions/filter_not_available.php
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/src/exceptions/handler_not_available.php
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/src/exceptions/handler_settings_invalid.php
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/src/exceptions/invalid_filter_parameter.php
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/src/exceptions/invalid_reference.php
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/src/exceptions/mime_type_unsupported.php
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/src/exceptions/missing_filter_parameter.php
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/src/exceptions/transformation.php
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/src/exceptions/transformation_already_exists.php
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/src/exceptions/transformation_not_available.php
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/src/handlers/gd.php
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/src/handlers/gd_base.php
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/src/handlers/imagemagick.php
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/src/handlers/imagemagick_base.php
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/src/interfaces/colorspace.php
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/src/interfaces/effect.php
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/src/interfaces/geometry.php
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/src/interfaces/handler.php
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/src/interfaces/methodcall_handler.php
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/src/interfaces/thumbnail.php
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/src/interfaces/watermark.php
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/src/options/save_options.php
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/src/structs/converter_settings.php
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/src/structs/filter.php
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/src/structs/handler_settings.php
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/src/transformation.php
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/converter_test.php
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionConverterTest_testApplyFilterSuccessColorspace
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionConverterTest_testApplyFilterSuccessColorspaceDefinedHandler
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionConverterTest_testApplyFilterSuccessScale
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testColorspaceGrey
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testColorspaceMonochrome
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testColorspaceSepia
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCropNegativeOffset_1
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCropNegativeOffset_2
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCropNegativeOffset_3
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCropThumbnailHorizontal
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCropThumbnailVertical
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCropTransparent
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCrop_0_Offset
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCrop_1
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCrop_2
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCrop_3
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCrop_4
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testFillThumbnailHorizontal
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testFillThumbnailTooLargeColorArray
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testFillThumbnailVertical
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testScaleTransparent
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testWatermarkAbsoluteNoScale
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testWatermarkAbsoluteScale
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testWatermarkPercentNoScale
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testWatermarkPercentScale
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testBorder_2
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testBorder_5
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testColorspaceGrey
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testColorspaceMonochrome
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testColorspaceSepia
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCropNegativeOffset_1
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCropNegativeOffset_2
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCropNegativeOffset_3
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCropThumbnailHorizontal
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCropThumbnailVertical
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCrop_0_Offset
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCrop_1
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCrop_2
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCrop_3
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testFillThumbnailHorizontal
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testFillThumbnailTooLargeColorArray
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testFillThumbnailVertical
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testNoiseGaussian
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testNoiseImpulse
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testNoiseLaplacian
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testNoiseMultiplicative
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testNoisePoisson
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testNoiseUniform
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScale
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleDown_do
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleDown_dont
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleExact_1
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleExact_2
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleExact_3
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleHeightDown_1
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleHeightDown_2
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleHeightUp_1
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleHeightUp_2
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScalePercent_1
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScalePercent_2
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleUp_do
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleUp_dont
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleWidthBoth
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleWidthDown_1
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleWidthDown_2
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleWidthUp_1
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleWidthUp_2
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testSwirl_10
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testSwirl_100
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testSwirl_50
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testWatermarkAbsoluteNoScale
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testWatermarkAbsoluteScale
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testWatermarkPercentNoScale
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testWatermarkPercentScale
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerGdTest_testApplyFilterMultiple
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerGdTest_testApplyFilterSingle
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerGdTest_testConvertTransparentNonTransparent
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerGdTest_testSaveNewfileConvert
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerGdTest_testSaveNewfileNoconvert
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerGdTest_testSaveOldfileNoconvert
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerShellTest_testApplyFilterMultiple
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerShellTest_testApplyFilterSingle
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerShellTest_testConvertTransparentNonTransparent
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerTest_testSaveIllegalFileNameFailure
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerTest_testSaveNewfileConvert
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerTest_testSaveNewfileNoconvert
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerTest_testSaveOldfileNoconvert
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testMultiTransformjpeg
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testMultiTransformpng
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessGifAnimated
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessGif_1
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessGif_2
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessGif_3
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessJpeg_1
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessJpeg_2
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessJpeg_3
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessPng_1
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessPng_2
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessPng_3
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessPng_4
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformationChangingHandlersForFilters
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/gif_animated.gif
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/gif_nonanimated.gif
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/jpeg.jpg
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/png.png
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/png_transparent.png
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/text.txt
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/watermark.png
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/data/xpm.xpm
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/filtersgd_test.php
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/filtersshell_test.php
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/handler_test.php
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/handlergd_test.php
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/handlershell_test.php
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/save_options_test.php
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/suite.php
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/test_case.php
 mode change 100755 => 100644 include/ezcomponents/ImageConversion/tests/transformation_test.php
 mode change 100755 => 100644 include/ezcomponents/LICENSE
 mode change 100755 => 100644 include/ezcomponents/autoload/archive_autoload.php
 mode change 100755 => 100644 include/ezcomponents/autoload/authentication_autoload.php
 mode change 100755 => 100644 include/ezcomponents/autoload/authentication_database_autoload.php
 mode change 100755 => 100644 include/ezcomponents/autoload/authentication_openid_autoload.php
 mode change 100755 => 100644 include/ezcomponents/autoload/base_autoload.php
 mode change 100755 => 100644 include/ezcomponents/autoload/cache_autoload.php
 mode change 100755 => 100644 include/ezcomponents/autoload/configuration_autoload.php
 mode change 100755 => 100644 include/ezcomponents/autoload/console_autoload.php
 mode change 100755 => 100644 include/ezcomponents/autoload/db_autoload.php
 mode change 100755 => 100644 include/ezcomponents/autoload/db_schema_autoload.php
 mode change 100755 => 100644 include/ezcomponents/autoload/debug_autoload.php
 mode change 100755 => 100644 include/ezcomponents/autoload/document_autoload.php
 mode change 100755 => 100644 include/ezcomponents/autoload/execution_autoload.php
 mode change 100755 => 100644 include/ezcomponents/autoload/feed_autoload.php
 mode change 100755 => 100644 include/ezcomponents/autoload/file_autoload.php
 mode change 100755 => 100644 include/ezcomponents/autoload/graph_autoload.php
 mode change 100755 => 100644 include/ezcomponents/autoload/graph_database_autoload.php
 mode change 100755 => 100644 include/ezcomponents/autoload/image_analyzer_autoload.php
 mode change 100755 => 100644 include/ezcomponents/autoload/image_autoload.php
 mode change 100755 => 100644 include/ezcomponents/autoload/input_autoload.php
 mode change 100755 => 100644 include/ezcomponents/autoload/log_autoload.php
 mode change 100755 => 100644 include/ezcomponents/autoload/log_database_autoload.php
 mode change 100755 => 100644 include/ezcomponents/autoload/mail_autoload.php
 mode change 100755 => 100644 include/ezcomponents/autoload/persistent_autoload.php
 mode change 100755 => 100644 include/ezcomponents/autoload/persistent_object_autoload.php
 mode change 100755 => 100644 include/ezcomponents/autoload/php_generator_autoload.php
 mode change 100755 => 100644 include/ezcomponents/autoload/query_autoload.php
 mode change 100755 => 100644 include/ezcomponents/autoload/search_autoload.php
 mode change 100755 => 100644 include/ezcomponents/autoload/signal_autoload.php
 mode change 100755 => 100644 include/ezcomponents/autoload/system_autoload.php
 mode change 100755 => 100644 include/ezcomponents/autoload/template_autoload.php
 mode change 100755 => 100644 include/ezcomponents/autoload/template_translation_autoload.php
 mode change 100755 => 100644 include/ezcomponents/autoload/translation_autoload.php
 mode change 100755 => 100644 include/ezcomponents/autoload/translation_cache_autoload.php
 mode change 100755 => 100644 include/ezcomponents/autoload/tree_autoload.php
 mode change 100755 => 100644 include/ezcomponents/autoload/tree_db_autoload.php
 mode change 100755 => 100644 include/ezcomponents/autoload/tree_persistent_autoload.php
 mode change 100755 => 100644 include/ezcomponents/autoload/url_autoload.php
 mode change 100755 => 100644 include/ezcomponents/autoload/webdav_autoload.php
 mode change 100755 => 100644 include/ezcomponents/autoload/workflow_autoload.php
 mode change 100755 => 100644 include/ezcomponents/autoload/workflow_database_autoload.php
 mode change 100755 => 100644 include/ezcomponents/autoload/workflow_event_autoload.php
 mode change 100755 => 100644 include/ezcomponents/autoload/workflow_signal_autoload.php
 mode change 100755 => 100644 include/ezcomponents/descriptions.txt
 mode change 100755 => 100644 include/fachbereich.class.php
 mode change 100755 => 100644 include/feedback.class.php
 mode change 100755 => 100644 include/ferien.class.php
 mode change 100755 => 100644 include/filter.class.php
 mode change 100755 => 100644 include/firma.class.php
 mode change 100755 => 100644 include/fonts/glyphicons-halflings-regular.eot
 mode change 100755 => 100644 include/fonts/glyphicons-halflings-regular.svg
 mode change 100755 => 100644 include/fonts/glyphicons-halflings-regular.ttf
 mode change 100755 => 100644 include/fonts/glyphicons-halflings-regular.woff
 mode change 100755 => 100644 include/fotostatus.class.php
 mode change 100755 => 100644 include/frage.class.php
 mode change 100755 => 100644 include/freebusy.class.php
 mode change 100755 => 100644 include/functions.inc.php
 mode change 100755 => 100644 include/funktion.class.php
 mode change 100755 => 100644 include/gantt.class.php
 mode change 100755 => 100644 include/gebiet.class.php
 mode change 100755 => 100644 include/gemeinde.class.php
 mode change 100755 => 100644 include/geschaeftsjahr.class.php
 mode change 100755 => 100644 include/geschlecht.class.php
 mode change 100755 => 100644 include/globals.inc.php
 mode change 100755 => 100644 include/gruppe.class.php
 mode change 100755 => 100644 include/gruppemanager.class.php
 mode change 100755 => 100644 include/gsprogramm.class.php
 mode change 100755 => 100644 include/ical.class.php
 mode change 100755 => 100644 include/index.html
 mode change 100755 => 100644 include/infoscreen.class.php
 mode change 100755 => 100644 include/jahresplan.class.php
 mode change 100755 => 100644 include/js/JSONeditor/JSONeditor.html
 mode change 100755 => 100644 include/js/JSONeditor/JSONeditor.js
 mode change 100755 => 100644 include/js/JSONeditor/treeBuilderImages/Thumbs.db
 mode change 100755 => 100644 include/js/JSONeditor/treeBuilderImages/doc.gif
 mode change 100755 => 100644 include/js/JSONeditor/treeBuilderImages/docNode.gif
 mode change 100755 => 100644 include/js/JSONeditor/treeBuilderImages/docNodeLast.gif
 mode change 100755 => 100644 include/js/JSONeditor/treeBuilderImages/docNodeLastFirst.gif
 mode change 100755 => 100644 include/js/JSONeditor/treeBuilderImages/folder.gif
 mode change 100755 => 100644 include/js/JSONeditor/treeBuilderImages/folderNode.gif
 mode change 100755 => 100644 include/js/JSONeditor/treeBuilderImages/folderNodeFirst.gif
 mode change 100755 => 100644 include/js/JSONeditor/treeBuilderImages/folderNodeLast.gif
 mode change 100755 => 100644 include/js/JSONeditor/treeBuilderImages/folderNodeLastFirst.gif
 mode change 100755 => 100644 include/js/JSONeditor/treeBuilderImages/folderNodeOpen.gif
 mode change 100755 => 100644 include/js/JSONeditor/treeBuilderImages/folderNodeOpenFirst.gif
 mode change 100755 => 100644 include/js/JSONeditor/treeBuilderImages/folderNodeOpenLast.gif
 mode change 100755 => 100644 include/js/JSONeditor/treeBuilderImages/folderNodeOpenLastFirst.gif
 mode change 100755 => 100644 include/js/JSONeditor/treeBuilderImages/folderOpen.gif
 mode change 100755 => 100644 include/js/JSONeditor/treeBuilderImages/vertLine.gif
 mode change 100755 => 100644 include/js/colorpicker.js
 mode change 100755 => 100644 include/js/cropper.js
 mode change 100755 => 100644 include/js/croppie.js
 mode change 100755 => 100644 include/js/datecheck.js
 mode change 100755 => 100644 include/js/fullcalendar/fullcalendar.css
 mode change 100755 => 100644 include/js/fullcalendar/fullcalendar.js
 mode change 100755 => 100644 include/js/fullcalendar/fullcalendar.min.js
 mode change 100755 => 100644 include/js/fullcalendar/fullcalendar.print.css
 mode change 100755 => 100644 include/js/fullcalendar/gcal.js
 mode change 100755 => 100644 include/js/jqSOAPClient.js
 mode change 100755 => 100644 include/js/jqXMLUtils.js
 mode change 100755 => 100644 include/js/jquery.contextmenu.r2.js
 mode change 100755 => 100644 include/js/jquery.js
 mode change 100755 => 100644 include/js/jquery.ui.datepicker.translation.js
 mode change 100755 => 100644 include/js/jstree/README.txt
 mode change 100755 => 100644 include/js/jstree/_docs/!style.css
 mode change 100755 => 100644 include/js/jstree/_docs/_drive.png
 mode change 100755 => 100644 include/js/jstree/_docs/_html_data.html
 mode change 100755 => 100644 include/js/jstree/_docs/_json_data.json
 mode change 100755 => 100644 include/js/jstree/_docs/_search_data.json
 mode change 100755 => 100644 include/js/jstree/_docs/_search_result.json
 mode change 100755 => 100644 include/js/jstree/_docs/_xml_flat.xml
 mode change 100755 => 100644 include/js/jstree/_docs/_xml_nest.xml
 mode change 100755 => 100644 include/js/jstree/_docs/checkbox.html
 mode change 100755 => 100644 include/js/jstree/_docs/contextmenu.html
 mode change 100755 => 100644 include/js/jstree/_docs/cookies.html
 mode change 100755 => 100644 include/js/jstree/_docs/core.html
 mode change 100755 => 100644 include/js/jstree/_docs/crrm.html
 mode change 100755 => 100644 include/js/jstree/_docs/dnd.html
 mode change 100755 => 100644 include/js/jstree/_docs/hotkeys.html
 mode change 100755 => 100644 include/js/jstree/_docs/html_data.html
 mode change 100755 => 100644 include/js/jstree/_docs/index.html
 mode change 100755 => 100644 include/js/jstree/_docs/json_data.html
 mode change 100755 => 100644 include/js/jstree/_docs/languages.html
 mode change 100755 => 100644 include/js/jstree/_docs/logo.png
 mode change 100755 => 100644 include/js/jstree/_docs/search.html
 mode change 100755 => 100644 include/js/jstree/_docs/sort.html
 mode change 100755 => 100644 include/js/jstree/_docs/syntax/!script.js
 mode change 100755 => 100644 include/js/jstree/_docs/syntax/!style.css
 mode change 100755 => 100644 include/js/jstree/_docs/syntax/clipboard.swf
 mode change 100755 => 100644 include/js/jstree/_docs/syntax/help.png
 mode change 100755 => 100644 include/js/jstree/_docs/syntax/magnifier.png
 mode change 100755 => 100644 include/js/jstree/_docs/syntax/page_white_code.png
 mode change 100755 => 100644 include/js/jstree/_docs/syntax/page_white_copy.png
 mode change 100755 => 100644 include/js/jstree/_docs/syntax/printer.png
 mode change 100755 => 100644 include/js/jstree/_docs/syntax/wrapping.png
 mode change 100755 => 100644 include/js/jstree/_docs/themeroller.html
 mode change 100755 => 100644 include/js/jstree/_docs/themes.html
 mode change 100755 => 100644 include/js/jstree/_docs/types.html
 mode change 100755 => 100644 include/js/jstree/_docs/ui.html
 mode change 100755 => 100644 include/js/jstree/_docs/unique.html
 mode change 100755 => 100644 include/js/jstree/_docs/xml_data.html
 mode change 100755 => 100644 include/js/jstree/_lib/jquery.cookie.js
 mode change 100755 => 100644 include/js/jstree/_lib/jquery.hotkeys.js
 mode change 100755 => 100644 include/js/jstree/_lib/jquery.js
 mode change 100755 => 100644 include/js/jstree/icons/lehrveranstaltung.png
 mode change 100755 => 100644 include/js/jstree/icons/modul.png
 mode change 100755 => 100644 include/js/jstree/jquery.jstree.js
 mode change 100755 => 100644 include/js/jstree/themes/apple/bg.jpg
 mode change 100755 => 100644 include/js/jstree/themes/apple/d.png
 mode change 100755 => 100644 include/js/jstree/themes/apple/dot_for_ie.gif
 mode change 100755 => 100644 include/js/jstree/themes/apple/style.css
 mode change 100755 => 100644 include/js/jstree/themes/apple/throbber.gif
 mode change 100755 => 100644 include/js/jstree/themes/classic/d.gif
 mode change 100755 => 100644 include/js/jstree/themes/classic/d.png
 mode change 100755 => 100644 include/js/jstree/themes/classic/dot_for_ie.gif
 mode change 100755 => 100644 include/js/jstree/themes/classic/style.css
 mode change 100755 => 100644 include/js/jstree/themes/classic/throbber.gif
 mode change 100755 => 100644 include/js/jstree/themes/default-rtl/d.gif
 mode change 100755 => 100644 include/js/jstree/themes/default-rtl/d.png
 mode change 100755 => 100644 include/js/jstree/themes/default-rtl/dots.gif
 mode change 100755 => 100644 include/js/jstree/themes/default-rtl/style.css
 mode change 100755 => 100644 include/js/jstree/themes/default-rtl/throbber.gif
 mode change 100755 => 100644 include/js/jstree/themes/default/d.gif
 mode change 100755 => 100644 include/js/jstree/themes/default/d.png
 mode change 100755 => 100644 include/js/jstree/themes/default/style.css
 mode change 100755 => 100644 include/js/jstree/themes/default/throbber.gif
 mode change 100755 => 100644 include/js/mailcheck.js
 mode change 100755 => 100644 include/js/tablesort/icons/01_ascending.gif
 mode change 100755 => 100644 include/js/tablesort/icons/01_descending.gif
 mode change 100755 => 100644 include/js/tablesort/icons/01_unsorted.gif
 mode change 100755 => 100644 include/js/tablesort/table.css
 mode change 100755 => 100644 include/js/tablesort/table.js
 mode change 100755 => 100644 include/js/treeGrid/.gitignore
 mode change 100755 => 100644 include/js/treeGrid/CHANGELOG.txt
 mode change 100755 => 100644 include/js/treeGrid/LICENSE
 mode change 100755 => 100644 include/js/treeGrid/README.md
 mode change 100755 => 100644 include/js/treeGrid/css/jquery.treegrid.css
 mode change 100755 => 100644 include/js/treeGrid/examples/bootstrap-2.3.2/css/bootstrap-responsive.css
 mode change 100755 => 100644 include/js/treeGrid/examples/bootstrap-2.3.2/css/bootstrap-responsive.min.css
 mode change 100755 => 100644 include/js/treeGrid/examples/bootstrap-2.3.2/css/bootstrap.css
 mode change 100755 => 100644 include/js/treeGrid/examples/bootstrap-2.3.2/css/bootstrap.min.css
 mode change 100755 => 100644 include/js/treeGrid/examples/bootstrap-2.3.2/img/glyphicons-halflings-white.png
 mode change 100755 => 100644 include/js/treeGrid/examples/bootstrap-2.3.2/img/glyphicons-halflings.png
 mode change 100755 => 100644 include/js/treeGrid/examples/bootstrap-2.3.2/js/bootstrap.js
 mode change 100755 => 100644 include/js/treeGrid/examples/bootstrap-2.3.2/js/bootstrap.min.js
 mode change 100755 => 100644 include/js/treeGrid/examples/bootstrap-3.0.0/css/bootstrap-theme.css
 mode change 100755 => 100644 include/js/treeGrid/examples/bootstrap-3.0.0/css/bootstrap-theme.min.css
 mode change 100755 => 100644 include/js/treeGrid/examples/bootstrap-3.0.0/css/bootstrap.css
 mode change 100755 => 100644 include/js/treeGrid/examples/bootstrap-3.0.0/css/bootstrap.min.css
 mode change 100755 => 100644 include/js/treeGrid/examples/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.eot
 mode change 100755 => 100644 include/js/treeGrid/examples/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.svg
 mode change 100755 => 100644 include/js/treeGrid/examples/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.ttf
 mode change 100755 => 100644 include/js/treeGrid/examples/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.woff
 mode change 100755 => 100644 include/js/treeGrid/examples/bootstrap-3.0.0/js/bootstrap.js
 mode change 100755 => 100644 include/js/treeGrid/examples/bootstrap-3.0.0/js/bootstrap.min.js
 mode change 100755 => 100644 include/js/treeGrid/examples/example-basic.html
 mode change 100755 => 100644 include/js/treeGrid/examples/example-bootstrap-2.html
 mode change 100755 => 100644 include/js/treeGrid/examples/example-bootstrap-3.html
 mode change 100755 => 100644 include/js/treeGrid/examples/example-column.html
 mode change 100755 => 100644 include/js/treeGrid/examples/example-save-state.html
 mode change 100755 => 100644 include/js/treeGrid/img/collapse.png
 mode change 100755 => 100644 include/js/treeGrid/img/expand.png
 mode change 100755 => 100644 include/js/treeGrid/img/file.png
 mode change 100755 => 100644 include/js/treeGrid/img/folder.png
 mode change 100755 => 100644 include/js/treeGrid/index.html
 mode change 100755 => 100644 include/js/treeGrid/js/jquery-1.10.2.js
 mode change 100755 => 100644 include/js/treeGrid/js/jquery.cookie.js
 mode change 100755 => 100644 include/js/treeGrid/js/jquery.treegrid.bootstrap2.js
 mode change 100755 => 100644 include/js/treeGrid/js/jquery.treegrid.bootstrap3.js
 mode change 100755 => 100644 include/js/treeGrid/js/jquery.treegrid.js
 mode change 100755 => 100644 include/js/treeGrid/jstreegrid.js
 mode change 100755 => 100644 include/js/treeGrid/params.json
 mode change 100755 => 100644 include/js/treeGrid/styles.css
 mode change 100755 => 100644 include/js/treeGrid/test.html
 mode change 100755 => 100644 include/js/treeGrid/tests/qunit-1.12.0.css
 mode change 100755 => 100644 include/js/treeGrid/tests/qunit-1.12.0.js
 mode change 100755 => 100644 include/js/treeGrid/tests/tests.js
 mode change 100755 => 100644 include/js/treeGrid/treegrid.jquery.json
 mode change 100755 => 100644 include/kontakt.class.php
 mode change 100755 => 100644 include/konto.class.php
 mode change 100755 => 100644 include/legesamtnote.class.php
 mode change 100755 => 100644 include/lehre_tools.class.php
 mode change 100755 => 100644 include/lehreinheit.class.php
 mode change 100755 => 100644 include/lehreinheitgruppe.class.php
 mode change 100755 => 100644 include/lehreinheitmitarbeiter.class.php
 mode change 100755 => 100644 include/lehrelisthelper.class.php
 mode change 100755 => 100644 include/lehrfach.class.php
 mode change 100755 => 100644 include/lehrform.class.php
 mode change 100755 => 100644 include/lehrfunktion.class.php
 mode change 100755 => 100644 include/lehrmodus.class.php
 mode change 100755 => 100644 include/lehrstunde.class.php
 mode change 100755 => 100644 include/lehrtyp.class.php
 mode change 100755 => 100644 include/lehrveranstaltung.class.php
 mode change 100755 => 100644 include/lehrverband.class.php
 mode change 100755 => 100644 include/log.class.php
 mode change 100755 => 100644 include/lvangebot.class.php
 mode change 100755 => 100644 include/lvgesamtnote.class.php
 mode change 100755 => 100644 include/lvinfo.class.php
 mode change 100755 => 100644 include/lvregel.class.php
 mode change 100755 => 100644 include/mail.class.php
 mode change 100755 => 100644 include/mantis.class.php
 mode change 100755 => 100644 include/meta/angular-tablesorter.php
 mode change 100755 => 100644 include/meta/angular.php
 mode change 100755 => 100644 include/meta/easyui.php
 mode change 100755 => 100644 include/meta/jquery-tablesorter.php
 mode change 100755 => 100644 include/meta/jquery.php
 mode change 100755 => 100644 include/meta/js_utils.php
 mode change 100755 => 100644 include/meta/jsoneditor.php
 mode change 100755 => 100644 include/meta/php_utils.php
 mode change 100755 => 100644 include/mitarbeiter.class.php
 mode change 100755 => 100644 include/mobilitaet.class.php
 mode change 100755 => 100644 include/mobilitaetsprogramm.class.php
 mode change 100755 => 100644 include/nation.class.php
 mode change 100755 => 100644 include/nationengruppe.class.php
 mode change 100755 => 100644 include/news.class.php
 mode change 100755 => 100644 include/note.class.php
 mode change 100755 => 100644 include/notenschluessel.class.php
 mode change 100755 => 100644 include/notiz.class.php
 mode change 100755 => 100644 include/organisationseinheit.class.php
 mode change 100755 => 100644 include/organisationsform.class.php
 mode change 100755 => 100644 include/ort.class.php
 mode change 100755 => 100644 include/ortraumtyp.class.php
 mode change 100755 => 100644 include/pdf.class.php
 mode change 100755 => 100644 include/pdf.inc.php
 mode change 100755 => 100644 include/pdf/FAQ.htm
 mode change 100755 => 100644 include/pdf/doc/acceptpagebreak.htm
 mode change 100755 => 100644 include/pdf/doc/addfont.htm
 mode change 100755 => 100644 include/pdf/doc/addlink.htm
 mode change 100755 => 100644 include/pdf/doc/addpage.htm
 mode change 100755 => 100644 include/pdf/doc/aliasnbpages.htm
 mode change 100755 => 100644 include/pdf/doc/cell.htm
 mode change 100755 => 100644 include/pdf/doc/close.htm
 mode change 100755 => 100644 include/pdf/doc/error.htm
 mode change 100755 => 100644 include/pdf/doc/footer.htm
 mode change 100755 => 100644 include/pdf/doc/fpdf.htm
 mode change 100755 => 100644 include/pdf/doc/getstringwidth.htm
 mode change 100755 => 100644 include/pdf/doc/getx.htm
 mode change 100755 => 100644 include/pdf/doc/gety.htm
 mode change 100755 => 100644 include/pdf/doc/header.htm
 mode change 100755 => 100644 include/pdf/doc/image.htm
 mode change 100755 => 100644 include/pdf/doc/index.htm
 mode change 100755 => 100644 include/pdf/doc/line.htm
 mode change 100755 => 100644 include/pdf/doc/link.htm
 mode change 100755 => 100644 include/pdf/doc/ln.htm
 mode change 100755 => 100644 include/pdf/doc/multicell.htm
 mode change 100755 => 100644 include/pdf/doc/open.htm
 mode change 100755 => 100644 include/pdf/doc/output.htm
 mode change 100755 => 100644 include/pdf/doc/pageno.htm
 mode change 100755 => 100644 include/pdf/doc/rect.htm
 mode change 100755 => 100644 include/pdf/doc/setauthor.htm
 mode change 100755 => 100644 include/pdf/doc/setautopagebreak.htm
 mode change 100755 => 100644 include/pdf/doc/setcompression.htm
 mode change 100755 => 100644 include/pdf/doc/setcreator.htm
 mode change 100755 => 100644 include/pdf/doc/setdisplaymode.htm
 mode change 100755 => 100644 include/pdf/doc/setdrawcolor.htm
 mode change 100755 => 100644 include/pdf/doc/setfillcolor.htm
 mode change 100755 => 100644 include/pdf/doc/setfont.htm
 mode change 100755 => 100644 include/pdf/doc/setfontsize.htm
 mode change 100755 => 100644 include/pdf/doc/setkeywords.htm
 mode change 100755 => 100644 include/pdf/doc/setleftmargin.htm
 mode change 100755 => 100644 include/pdf/doc/setlinewidth.htm
 mode change 100755 => 100644 include/pdf/doc/setlink.htm
 mode change 100755 => 100644 include/pdf/doc/setmargins.htm
 mode change 100755 => 100644 include/pdf/doc/setrightmargin.htm
 mode change 100755 => 100644 include/pdf/doc/setsubject.htm
 mode change 100755 => 100644 include/pdf/doc/settextcolor.htm
 mode change 100755 => 100644 include/pdf/doc/settitle.htm
 mode change 100755 => 100644 include/pdf/doc/settopmargin.htm
 mode change 100755 => 100644 include/pdf/doc/setx.htm
 mode change 100755 => 100644 include/pdf/doc/setxy.htm
 mode change 100755 => 100644 include/pdf/doc/sety.htm
 mode change 100755 => 100644 include/pdf/doc/text.htm
 mode change 100755 => 100644 include/pdf/doc/write.htm
 mode change 100755 => 100644 include/pdf/font/courier.php
 mode change 100755 => 100644 include/pdf/font/helvetica.php
 mode change 100755 => 100644 include/pdf/font/helveticab.php
 mode change 100755 => 100644 include/pdf/font/helveticabi.php
 mode change 100755 => 100644 include/pdf/font/helveticai.php
 mode change 100755 => 100644 include/pdf/font/makefont/cp1250.map
 mode change 100755 => 100644 include/pdf/font/makefont/cp1251.map
 mode change 100755 => 100644 include/pdf/font/makefont/cp1252.map
 mode change 100755 => 100644 include/pdf/font/makefont/cp1253.map
 mode change 100755 => 100644 include/pdf/font/makefont/cp1254.map
 mode change 100755 => 100644 include/pdf/font/makefont/cp1255.map
 mode change 100755 => 100644 include/pdf/font/makefont/cp1257.map
 mode change 100755 => 100644 include/pdf/font/makefont/cp1258.map
 mode change 100755 => 100644 include/pdf/font/makefont/cp874.map
 mode change 100755 => 100644 include/pdf/font/makefont/iso-8859-1.map
 mode change 100755 => 100644 include/pdf/font/makefont/iso-8859-11.map
 mode change 100755 => 100644 include/pdf/font/makefont/iso-8859-15.map
 mode change 100755 => 100644 include/pdf/font/makefont/iso-8859-16.map
 mode change 100755 => 100644 include/pdf/font/makefont/iso-8859-2.map
 mode change 100755 => 100644 include/pdf/font/makefont/iso-8859-4.map
 mode change 100755 => 100644 include/pdf/font/makefont/iso-8859-5.map
 mode change 100755 => 100644 include/pdf/font/makefont/iso-8859-7.map
 mode change 100755 => 100644 include/pdf/font/makefont/iso-8859-9.map
 mode change 100755 => 100644 include/pdf/font/makefont/koi8-r.map
 mode change 100755 => 100644 include/pdf/font/makefont/koi8-u.map
 mode change 100755 => 100644 include/pdf/font/makefont/makefont.php
 mode change 100755 => 100644 include/pdf/font/symbol.php
 mode change 100755 => 100644 include/pdf/font/times.php
 mode change 100755 => 100644 include/pdf/font/timesb.php
 mode change 100755 => 100644 include/pdf/font/timesbi.php
 mode change 100755 => 100644 include/pdf/font/timesi.php
 mode change 100755 => 100644 include/pdf/font/zapfdingbats.php
 mode change 100755 => 100644 include/pdf/fpdf.css
 mode change 100755 => 100644 include/pdf/fpdf.php
 mode change 100755 => 100644 include/pdf/histo.htm
 mode change 100755 => 100644 include/pdf/install.txt
 mode change 100755 => 100644 include/person.class.php
 mode change 100755 => 100644 include/personlog.class.php
 mode change 100755 => 100644 include/pgsql.class.php
 mode change 100755 => 100644 include/phrasen.class.php
 mode change 100755 => 100644 include/preincoming.class.php
 mode change 100755 => 100644 include/preinteressent.class.php
 mode change 100755 => 100644 include/preoutgoing.class.php
 mode change 100755 => 100644 include/prestudent.class.php
 mode change 100755 => 100644 include/process.class.php
 mode change 100755 => 100644 include/projekt.class.php
 mode change 100755 => 100644 include/projektarbeit.class.php
 mode change 100755 => 100644 include/projektbenutzer.class.php
 mode change 100755 => 100644 include/projektbetreuer.class.php
 mode change 100755 => 100644 include/projektphase.class.php
 mode change 100755 => 100644 include/projekttask.class.php
 mode change 100755 => 100644 include/pruefling.class.php
 mode change 100755 => 100644 include/pruefung.class.php
 mode change 100755 => 100644 include/pruefungCis.class.php
 mode change 100755 => 100644 include/pruefungsanmeldung.class.php
 mode change 100755 => 100644 include/pruefungsfenster.class.php
 mode change 100755 => 100644 include/pruefungstermin.class.php
 mode change 100755 => 100644 include/raumtyp.class.php
 mode change 100755 => 100644 include/rdf.class.php
 mode change 100755 => 100644 include/reihungstest.class.php
 mode change 100755 => 100644 include/reservierung.class.php
 mode change 100755 => 100644 include/ressource.class.php
 mode change 100755 => 100644 include/rueckstellung.class.php
 mode change 100755 => 100644 include/sabredav/ChangeLog
 mode change 100755 => 100644 include/sabredav/LICENSE
 mode change 100755 => 100644 include/sabredav/README.md
 mode change 100755 => 100644 include/sabredav/bin/build.php
 mode change 100755 => 100644 include/sabredav/bin/googlecode_upload.py
 mode change 100755 => 100644 include/sabredav/bin/migrateto17.php
 mode change 100755 => 100644 include/sabredav/bin/naturalselection.py
 mode change 100755 => 100644 include/sabredav/bin/sabredav
 mode change 100755 => 100644 include/sabredav/bin/sabredav.php
 mode change 100755 => 100644 include/sabredav/bin/vobjectvalidate.php
 mode change 100755 => 100644 include/sabredav/composer.json
 mode change 100755 => 100644 include/sabredav/composer.lock
 mode change 100755 => 100644 include/sabredav/examples/addressbookserver.php
 mode change 100755 => 100644 include/sabredav/examples/basicauth.php
 mode change 100755 => 100644 include/sabredav/examples/calendarserver.php
 mode change 100755 => 100644 include/sabredav/examples/digestauth.php
 mode change 100755 => 100644 include/sabredav/examples/fileserver.php
 mode change 100755 => 100644 include/sabredav/examples/groupwareserver.php
 mode change 100755 => 100644 include/sabredav/examples/simplefsserver.php
 mode change 100755 => 100644 include/sabredav/examples/sql/mysql.addressbook.sql
 mode change 100755 => 100644 include/sabredav/examples/sql/mysql.calendars.sql
 mode change 100755 => 100644 include/sabredav/examples/sql/mysql.locks.sql
 mode change 100755 => 100644 include/sabredav/examples/sql/mysql.principals.sql
 mode change 100755 => 100644 include/sabredav/examples/sql/mysql.users.sql
 mode change 100755 => 100644 include/sabredav/examples/sql/pgsql.addressbook.sql
 mode change 100755 => 100644 include/sabredav/examples/sql/pgsql.calendars.sql
 mode change 100755 => 100644 include/sabredav/examples/sql/pgsql.locks.sql
 mode change 100755 => 100644 include/sabredav/examples/sql/pgsql.principals.sql
 mode change 100755 => 100644 include/sabredav/examples/sql/pgsql.users.sql
 mode change 100755 => 100644 include/sabredav/examples/sql/sqlite.addressbooks.sql
 mode change 100755 => 100644 include/sabredav/examples/sql/sqlite.calendars.sql
 mode change 100755 => 100644 include/sabredav/examples/sql/sqlite.locks.sql
 mode change 100755 => 100644 include/sabredav/examples/sql/sqlite.principals.sql
 mode change 100755 => 100644 include/sabredav/examples/sql/sqlite.users.sql
 mode change 100755 => 100644 include/sabredav/examples/webserver/apache2_htaccess.conf
 mode change 100755 => 100644 include/sabredav/examples/webserver/apache2_vhost.conf
 mode change 100755 => 100644 include/sabredav/examples/webserver/apache2_vhost_cgi.conf
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CalDAV/Backend/AbstractBackend.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CalDAV/Backend/BackendInterface.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CalDAV/Backend/NotificationSupport.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CalDAV/Backend/PDO.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CalDAV/Backend/SharingSupport.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CalDAV/Calendar.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CalDAV/CalendarObject.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CalDAV/CalendarQueryParser.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CalDAV/CalendarQueryValidator.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CalDAV/CalendarRootNode.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CalDAV/Exception/InvalidComponentType.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CalDAV/ICSExportPlugin.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CalDAV/ICalendar.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CalDAV/ICalendarObject.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CalDAV/IShareableCalendar.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CalDAV/ISharedCalendar.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CalDAV/Notifications/Collection.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CalDAV/Notifications/ICollection.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CalDAV/Notifications/INode.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CalDAV/Notifications/INotificationType.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CalDAV/Notifications/Node.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CalDAV/Notifications/Notification/Invite.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CalDAV/Notifications/Notification/InviteReply.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CalDAV/Notifications/Notification/SystemStatus.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CalDAV/Plugin.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CalDAV/Principal/Collection.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CalDAV/Principal/IProxyRead.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CalDAV/Principal/IProxyWrite.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CalDAV/Principal/ProxyRead.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CalDAV/Principal/ProxyWrite.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CalDAV/Principal/User.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CalDAV/Property/AllowedSharingModes.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CalDAV/Property/Invite.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CalDAV/Property/ScheduleCalendarTransp.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CalDAV/Property/SupportedCalendarData.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CalDAV/Property/SupportedCollationSet.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CalDAV/Schedule/IMip.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CalDAV/Schedule/IOutbox.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CalDAV/Schedule/Outbox.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CalDAV/ShareableCalendar.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CalDAV/SharedCalendar.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CalDAV/SharingPlugin.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CalDAV/UserCalendars.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CalDAV/Version.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CardDAV/AddressBook.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CardDAV/AddressBookQueryParser.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CardDAV/AddressBookRoot.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CardDAV/Backend/AbstractBackend.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CardDAV/Backend/BackendInterface.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CardDAV/Backend/PDO.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CardDAV/Card.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CardDAV/IAddressBook.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CardDAV/ICard.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CardDAV/IDirectory.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CardDAV/Plugin.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CardDAV/Property/SupportedAddressData.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CardDAV/UserAddressBooks.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CardDAV/VCFExportPlugin.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/CardDAV/Version.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Auth/Backend/AbstractBasic.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Auth/Backend/AbstractDigest.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Auth/Backend/Apache.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Auth/Backend/BackendInterface.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Auth/Backend/File.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Auth/Backend/PDO.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Auth/Plugin.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Browser/GuessContentType.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Browser/MapGetToPropFind.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Browser/Plugin.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Browser/assets/favicon.ico
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Browser/assets/icons/addressbook.png
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Browser/assets/icons/calendar.png
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Browser/assets/icons/card.png
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Browser/assets/icons/collection.png
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Browser/assets/icons/file.png
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Browser/assets/icons/parent.png
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Browser/assets/icons/principal.png
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Client.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Collection.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Exception.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Exception/BadRequest.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Exception/Conflict.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Exception/ConflictingLock.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Exception/FileNotFound.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Exception/Forbidden.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Exception/InsufficientStorage.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Exception/InvalidResourceType.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Exception/LengthRequired.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Exception/Locked.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Exception/MethodNotAllowed.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Exception/NotAuthenticated.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Exception/NotFound.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Exception/NotImplemented.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Exception/PaymentRequired.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Exception/PreconditionFailed.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Exception/ReportNotSupported.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Exception/ServiceUnavailable.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Exception/UnsupportedMediaType.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/FS/Directory.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/FS/File.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/FS/Node.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/FSExt/Directory.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/FSExt/File.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/FSExt/Node.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/File.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/ICollection.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/IExtendedCollection.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/IFile.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/INode.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/IProperties.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/IQuota.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Locks/Backend/AbstractBackend.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Locks/Backend/BackendInterface.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Locks/Backend/FS.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Locks/Backend/File.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Locks/Backend/PDO.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Locks/LockInfo.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Locks/Plugin.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Mount/Plugin.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Node.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/ObjectTree.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/PartialUpdate/IFile.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/PartialUpdate/IPatchSupport.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/PartialUpdate/Plugin.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Property.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Property/GetLastModified.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Property/Href.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Property/HrefList.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Property/IHref.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Property/LockDiscovery.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Property/ResourceType.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Property/Response.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Property/ResponseList.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Property/SupportedLock.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Property/SupportedReportSet.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/PropertyInterface.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Server.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/ServerPlugin.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/SimpleCollection.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/SimpleFile.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/StringUtil.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/TemporaryFileFilterPlugin.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Tree.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Tree/Filesystem.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/URLUtil.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/UUIDUtil.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/Version.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAV/XMLUtil.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAVACL/AbstractPrincipalCollection.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAVACL/Exception/AceConflict.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAVACL/Exception/NeedPrivileges.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAVACL/Exception/NoAbstract.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAVACL/Exception/NotRecognizedPrincipal.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAVACL/Exception/NotSupportedPrivilege.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAVACL/IACL.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAVACL/IPrincipal.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAVACL/IPrincipalCollection.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAVACL/Plugin.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAVACL/Principal.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAVACL/PrincipalBackend/AbstractBackend.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAVACL/PrincipalBackend/BackendInterface.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAVACL/PrincipalBackend/PDO.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAVACL/PrincipalCollection.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAVACL/Property/Acl.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAVACL/Property/AclRestrictions.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAVACL/Property/CurrentUserPrivilegeSet.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAVACL/Property/Principal.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAVACL/Property/SupportedPrivilegeSet.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/DAVACL/Version.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/HTTP/AWSAuth.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/HTTP/AbstractAuth.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/HTTP/BasicAuth.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/HTTP/DigestAuth.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/HTTP/Request.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/HTTP/Response.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/HTTP/Util.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/HTTP/Version.php
 mode change 100755 => 100644 include/sabredav/lib/Sabre/autoload.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CalDAV/Backend/AbstractPDOTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CalDAV/Backend/AbstractTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CalDAV/Backend/Mock.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CalDAV/Backend/PDOMySQLTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CalDAV/Backend/PDOSqliteTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CalDAV/CalendarObjectTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CalDAV/CalendarQueryParserTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CalDAV/CalendarQueryVAlarmTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CalDAV/CalendarQueryValidatorTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CalDAV/CalendarTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDbyDayTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CalDAV/ExpandEventsDoubleEventsTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CalDAV/FreeBusyReportTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CalDAV/FreeBusyRequestTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CalDAV/GetEventsByTimerangeTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CalDAV/ICSExportPluginTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CalDAV/Issue166Test.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CalDAV/Issue172Test.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CalDAV/Issue203Test.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CalDAV/Issue205Test.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CalDAV/Issue211Test.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CalDAV/Issue220Test.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CalDAV/Issue228Test.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CalDAV/Notifications/CollectionTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CalDAV/Notifications/NodeTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CalDAV/Notifications/Notification/InviteReplyTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CalDAV/Notifications/Notification/InviteTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CalDAV/Notifications/Notification/SystemStatusTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CalDAV/OutboxPostTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CalDAV/PluginTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CalDAV/Principal/CollectionTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CalDAV/Principal/ProxyReadTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CalDAV/Principal/ProxyWriteTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CalDAV/Principal/UserTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CalDAV/Property/AllowedSharingModesTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CalDAV/Property/InviteTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CalDAV/Property/ScheduleCalendarTranspTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CalDAV/Property/SupportedCalendarComponentSetTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CalDAV/Property/SupportedCalendarDataTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CalDAV/Property/SupportedCollationSetTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CalDAV/Schedule/IMip/Mock.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CalDAV/Schedule/OutboxTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CalDAV/ShareableCalendarTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CalDAV/SharedCalendarTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CalDAV/SharingPluginTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CalDAV/TestUtil.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CalDAV/UserCalendarsSharedCalendarsTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CalDAV/UserCalendarsTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CalDAV/ValidateICalTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CalDAV/VersionTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CardDAV/AbstractPluginTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CardDAV/AddressBookQueryParserTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CardDAV/AddressBookQueryTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CardDAV/AddressBookRootTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CardDAV/AddressBookTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CardDAV/Backend/AbstractPDOTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CardDAV/Backend/Mock.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CardDAV/Backend/PDOMySQLTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CardDAV/Backend/PDOSqliteTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CardDAV/CardTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CardDAV/IDirectoryTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CardDAV/MultiGetTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CardDAV/PluginTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CardDAV/Property/SupportedAddressDataTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CardDAV/SogoStripContentTypeTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CardDAV/TestUtil.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CardDAV/UserAddressBooksTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CardDAV/VCFExportTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CardDAV/ValidateFilterTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CardDAV/ValidateVCardTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/CardDAV/VersionTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/AbstractServer.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/Auth/Backend/AbstractBasicTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/Auth/Backend/AbstractDigestTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/Auth/Backend/AbstractPDOTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/Auth/Backend/ApacheTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/Auth/Backend/FileTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/Auth/Backend/Mock.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/Auth/Backend/PDOMySQLTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/Auth/Backend/PDOSqliteTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/Auth/PluginTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/BasicNodeTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/Browser/GuessContentTypeTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/Browser/MapGetToPropFindTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/Browser/PluginTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/ClientMock.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/ClientTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/Exception/LockedTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/Exception/PaymentRequiredTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/ExceptionTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/FSExt/FileTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/FSExt/NodeTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/FSExt/ServerTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/HTTPPreferParsingTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/HttpDeleteTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/HttpPutTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/Issue33Test.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/Locks/Backend/AbstractTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/Locks/Backend/FSTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/Locks/Backend/FileTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/Locks/Backend/PDOMySQLTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/Locks/Backend/PDOTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/Locks/GetIfConditionsTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/Locks/MSWordTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/Locks/PluginTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/Mock/Collection.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/Mock/File.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/Mount/PluginTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/ObjectTreeTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/PartialUpdate/FileMock.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/PartialUpdate/PluginTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/PartialUpdate/SpecificationTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/Property/GetLastModifiedTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/Property/HrefListTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/Property/HrefTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/Property/ResourceTypeTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/Property/ResponseListTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/Property/ResponseTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/Property/SupportedReportSetTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/ServerCopyMoveTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/ServerEventsTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/ServerMKCOLTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/ServerPluginTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/ServerPreconditionTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/ServerPropsTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/ServerRangeTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/ServerSimpleTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/ServerUpdatePropertiesTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/SimpleFileTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/StringUtilTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/TemporaryFileFilterTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/TestPlugin.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/Tree/FilesystemTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/TreeTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/URLUtilTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/UUIDUtilTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAV/XMLUtilTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAVACL/ACLMethodTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAVACL/AllowAccessTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAVACL/BlockAccessTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAVACL/Exception/AceConflictTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAVACL/Exception/NeedPrivilegesExceptionTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAVACL/Exception/NoAbstractTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAVACL/Exception/NotRecognizedPrincipalTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAVACL/Exception/NotSupportedPrivilegeTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAVACL/ExpandPropertiesTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAVACL/MockACLNode.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAVACL/MockPrincipal.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAVACL/PluginAdminTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAVACL/PluginPropertiesTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAVACL/PluginUpdatePropertiesTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAVACL/PrincipalBackend/AbstractPDOTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAVACL/PrincipalBackend/Mock.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAVACL/PrincipalBackend/PDOMySQLTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAVACL/PrincipalBackend/PDOSqliteTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAVACL/PrincipalCollectionTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAVACL/PrincipalPropertySearchTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAVACL/PrincipalSearchPropertySetTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAVACL/PrincipalTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAVACL/Property/ACLRestrictionsTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAVACL/Property/ACLTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAVACL/Property/CurrentUserPrivilegeSetTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAVACL/Property/PrincipalTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAVACL/Property/SupportedPrivilegeSetTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAVACL/SimplePluginTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAVACL/VersionTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/DAVServerTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/HTTP/AWSAuthTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/HTTP/BasicAuthTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/HTTP/DigestAuthTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/HTTP/RequestTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/HTTP/ResponseMock.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/HTTP/ResponseTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/HTTP/UtilTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/HTTP/VersionTest.php
 mode change 100755 => 100644 include/sabredav/tests/Sabre/TestUtil.php
 mode change 100755 => 100644 include/sabredav/tests/bootstrap.php
 mode change 100755 => 100644 include/sabredav/tests/composer.vobject3.json
 mode change 100755 => 100644 include/sabredav/tests/phpunit.xml
 mode change 100755 => 100644 include/sabredav/vendor/autoload.php
 mode change 100755 => 100644 include/sabredav/vendor/composer/ClassLoader.php
 mode change 100755 => 100644 include/sabredav/vendor/composer/autoload_classmap.php
 mode change 100755 => 100644 include/sabredav/vendor/composer/autoload_namespaces.php
 mode change 100755 => 100644 include/sabredav/vendor/composer/autoload_psr4.php
 mode change 100755 => 100644 include/sabredav/vendor/composer/autoload_real.php
 mode change 100755 => 100644 include/sabredav/vendor/composer/installed.json
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/.gitignore
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/.travis.yml
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/ChangeLog
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/LICENSE
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/README.md
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/bin/bench.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/bin/generateicalendardata.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/bin/vobjectvalidate.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/composer.json
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VAlarm.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VCalendar.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VCard.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VEvent.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VFreeBusy.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VJournal.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VTodo.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/DateTimeParser.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Document.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/ElementList.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/FreeBusyGenerator.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Node.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Parameter.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/ParseException.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Property.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Property/Compound.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Property/DateTime.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Property/MultiDateTime.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Reader.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/RecurrenceIterator.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Splitter/ICalendar.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Splitter/SplitterInterface.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Splitter/VCard.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/StringUtil.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/TimeZoneUtil.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Version.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/includes.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VAlarmTest.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VCalendarTest.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VCardTest.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VEventTest.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VFreeBusyTest.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VJournalTest.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VTodoTest.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/ComponentTest.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/DateTimeParserTest.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/DocumentTest.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/ElementListTest.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/EmClientTest.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/FreeBusyGeneratorTest.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Issue153Test.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Issue154Test.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Issue48Test.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Issue50Test.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/ParameterTest.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Property/CompoundTest.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Property/DateTimeTest.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Property/MultiDateTimeTest.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/PropertyTest.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/ReaderTest.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorFifthTuesdayProblemTest.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorIncorrectExpandTest.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorInfiniteLoopProblemTest.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorMinusOneProblemTest.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorMissingOverriddenTest.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorTest.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/SlashRTest.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Splitter/ICalendarTest.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Splitter/VCardTest.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/StringUtilTest.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/TimeZoneUtilTest.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/VersionTest.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/issue153.vcf
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/tests/bootstrap.php
 mode change 100755 => 100644 include/sabredav/vendor/sabre/vobject/tests/phpunit.xml
 mode change 100755 => 100644 include/sancho.inc.php
 mode change 100755 => 100644 include/schluesseltyp.class.php
 mode change 100755 => 100644 include/securimage/AHGBold.ttf
 mode change 100755 => 100644 include/securimage/LICENSE.txt
 mode change 100755 => 100644 include/securimage/README.FONT.txt
 mode change 100755 => 100644 include/securimage/README.txt
 mode change 100755 => 100644 include/securimage/WavFile.php
 mode change 100755 => 100644 include/securimage/audio/en/0.wav
 mode change 100755 => 100644 include/securimage/audio/en/1.wav
 mode change 100755 => 100644 include/securimage/audio/en/10.wav
 mode change 100755 => 100644 include/securimage/audio/en/11.wav
 mode change 100755 => 100644 include/securimage/audio/en/12.wav
 mode change 100755 => 100644 include/securimage/audio/en/13.wav
 mode change 100755 => 100644 include/securimage/audio/en/14.wav
 mode change 100755 => 100644 include/securimage/audio/en/15.wav
 mode change 100755 => 100644 include/securimage/audio/en/16.wav
 mode change 100755 => 100644 include/securimage/audio/en/17.wav
 mode change 100755 => 100644 include/securimage/audio/en/18.wav
 mode change 100755 => 100644 include/securimage/audio/en/19.wav
 mode change 100755 => 100644 include/securimage/audio/en/2.wav
 mode change 100755 => 100644 include/securimage/audio/en/20.wav
 mode change 100755 => 100644 include/securimage/audio/en/3.wav
 mode change 100755 => 100644 include/securimage/audio/en/4.wav
 mode change 100755 => 100644 include/securimage/audio/en/5.wav
 mode change 100755 => 100644 include/securimage/audio/en/6.wav
 mode change 100755 => 100644 include/securimage/audio/en/7.wav
 mode change 100755 => 100644 include/securimage/audio/en/8.wav
 mode change 100755 => 100644 include/securimage/audio/en/9.wav
 mode change 100755 => 100644 include/securimage/audio/en/A.wav
 mode change 100755 => 100644 include/securimage/audio/en/B.wav
 mode change 100755 => 100644 include/securimage/audio/en/C.wav
 mode change 100755 => 100644 include/securimage/audio/en/D.wav
 mode change 100755 => 100644 include/securimage/audio/en/E.wav
 mode change 100755 => 100644 include/securimage/audio/en/F.wav
 mode change 100755 => 100644 include/securimage/audio/en/G.wav
 mode change 100755 => 100644 include/securimage/audio/en/H.wav
 mode change 100755 => 100644 include/securimage/audio/en/I.wav
 mode change 100755 => 100644 include/securimage/audio/en/J.wav
 mode change 100755 => 100644 include/securimage/audio/en/K.wav
 mode change 100755 => 100644 include/securimage/audio/en/L.wav
 mode change 100755 => 100644 include/securimage/audio/en/M.wav
 mode change 100755 => 100644 include/securimage/audio/en/MINUS.wav
 mode change 100755 => 100644 include/securimage/audio/en/N.wav
 mode change 100755 => 100644 include/securimage/audio/en/O.wav
 mode change 100755 => 100644 include/securimage/audio/en/P.wav
 mode change 100755 => 100644 include/securimage/audio/en/PLUS.wav
 mode change 100755 => 100644 include/securimage/audio/en/Q.wav
 mode change 100755 => 100644 include/securimage/audio/en/R.wav
 mode change 100755 => 100644 include/securimage/audio/en/S.wav
 mode change 100755 => 100644 include/securimage/audio/en/T.wav
 mode change 100755 => 100644 include/securimage/audio/en/TIMES.wav
 mode change 100755 => 100644 include/securimage/audio/en/U.wav
 mode change 100755 => 100644 include/securimage/audio/en/V.wav
 mode change 100755 => 100644 include/securimage/audio/en/W.wav
 mode change 100755 => 100644 include/securimage/audio/en/X.wav
 mode change 100755 => 100644 include/securimage/audio/en/Y.wav
 mode change 100755 => 100644 include/securimage/audio/en/Z.wav
 mode change 100755 => 100644 include/securimage/audio/en/error.wav
 mode change 100755 => 100644 include/securimage/audio/noise/check-point-1.wav
 mode change 100755 => 100644 include/securimage/audio/noise/crowd-talking-1.wav
 mode change 100755 => 100644 include/securimage/audio/noise/crowd-talking-6.wav
 mode change 100755 => 100644 include/securimage/audio/noise/crowd-talking-7.wav
 mode change 100755 => 100644 include/securimage/audio/noise/kids-playing-1.wav
 mode change 100755 => 100644 include/securimage/backgrounds/bg3.jpg
 mode change 100755 => 100644 include/securimage/backgrounds/bg4.jpg
 mode change 100755 => 100644 include/securimage/backgrounds/bg5.jpg
 mode change 100755 => 100644 include/securimage/backgrounds/bg6.png
 mode change 100755 => 100644 include/securimage/captcha.html
 mode change 100755 => 100644 include/securimage/database/.htaccess
 mode change 100755 => 100644 include/securimage/database/index.html
 mode change 100755 => 100644 include/securimage/database/securimage.sq3
 mode change 100755 => 100644 include/securimage/images/audio_icon.png
 mode change 100755 => 100644 include/securimage/images/refresh.png
 mode change 100755 => 100644 include/securimage/securimage.php
 mode change 100755 => 100644 include/securimage/securimage_play.php
 mode change 100755 => 100644 include/securimage/securimage_play.swf
 mode change 100755 => 100644 include/securimage/securimage_show.php
 mode change 100755 => 100644 include/securimage/words/words.txt
 mode change 100755 => 100644 include/service.class.php
 mode change 100755 => 100644 include/sprache.class.php
 mode change 100755 => 100644 include/standort.class.php
 mode change 100755 => 100644 include/statistik.class.php
 mode change 100755 => 100644 include/statusgrund.class.php
 mode change 100755 => 100644 include/student.class.php
 mode change 100755 => 100644 include/studentnote.class.php
 mode change 100755 => 100644 include/studiengang.class.php
 mode change 100755 => 100644 include/studienjahr.class.php
 mode change 100755 => 100644 include/studienordnung.class.php
 mode change 100755 => 100644 include/studienplan.class.php
 mode change 100755 => 100644 include/studienplatz.class.php
 mode change 100755 => 100644 include/studiensemester.class.php
 mode change 100755 => 100644 include/studierendenantrag.class.php
 mode change 100755 => 100644 include/stunde.class.php
 mode change 100755 => 100644 include/stundenplan.class.php
 mode change 100755 => 100644 include/tags.class.php
 mode change 100755 => 100644 include/template.class.php
 mode change 100755 => 100644 include/tiny_mce/langs/de.js
 mode change 100755 => 100644 include/tiny_mce/langs/en.js
 mode change 100755 => 100644 include/tiny_mce/license.txt
 mode change 100755 => 100644 include/tiny_mce/plugins/advhr/css/advhr.css
 mode change 100755 => 100644 include/tiny_mce/plugins/advhr/editor_plugin.js
 mode change 100755 => 100644 include/tiny_mce/plugins/advhr/editor_plugin_src.js
 mode change 100755 => 100644 include/tiny_mce/plugins/advhr/js/rule.js
 mode change 100755 => 100644 include/tiny_mce/plugins/advhr/langs/de_dlg.js
 mode change 100755 => 100644 include/tiny_mce/plugins/advhr/langs/en_dlg.js
 mode change 100755 => 100644 include/tiny_mce/plugins/advhr/rule.htm
 mode change 100755 => 100644 include/tiny_mce/plugins/advimage/css/advimage.css
 mode change 100755 => 100644 include/tiny_mce/plugins/advimage/editor_plugin.js
 mode change 100755 => 100644 include/tiny_mce/plugins/advimage/editor_plugin_src.js
 mode change 100755 => 100644 include/tiny_mce/plugins/advimage/image.htm
 mode change 100755 => 100644 include/tiny_mce/plugins/advimage/img/sample.gif
 mode change 100755 => 100644 include/tiny_mce/plugins/advimage/js/image.js
 mode change 100755 => 100644 include/tiny_mce/plugins/advimage/langs/de_dlg.js
 mode change 100755 => 100644 include/tiny_mce/plugins/advimage/langs/en_dlg.js
 mode change 100755 => 100644 include/tiny_mce/plugins/advlink/css/advlink.css
 mode change 100755 => 100644 include/tiny_mce/plugins/advlink/editor_plugin.js
 mode change 100755 => 100644 include/tiny_mce/plugins/advlink/editor_plugin_src.js
 mode change 100755 => 100644 include/tiny_mce/plugins/advlink/js/advlink.js
 mode change 100755 => 100644 include/tiny_mce/plugins/advlink/langs/de_dlg.js
 mode change 100755 => 100644 include/tiny_mce/plugins/advlink/langs/en_dlg.js
 mode change 100755 => 100644 include/tiny_mce/plugins/advlink/link.htm
 mode change 100755 => 100644 include/tiny_mce/plugins/advlist/editor_plugin.js
 mode change 100755 => 100644 include/tiny_mce/plugins/advlist/editor_plugin_src.js
 mode change 100755 => 100644 include/tiny_mce/plugins/autoresize/editor_plugin.js
 mode change 100755 => 100644 include/tiny_mce/plugins/autoresize/editor_plugin_src.js
 mode change 100755 => 100644 include/tiny_mce/plugins/autosave/editor_plugin.js
 mode change 100755 => 100644 include/tiny_mce/plugins/autosave/editor_plugin_src.js
 mode change 100755 => 100644 include/tiny_mce/plugins/autosave/langs/en.js
 mode change 100755 => 100644 include/tiny_mce/plugins/bbcode/editor_plugin.js
 mode change 100755 => 100644 include/tiny_mce/plugins/bbcode/editor_plugin_src.js
 mode change 100755 => 100644 include/tiny_mce/plugins/contextmenu/editor_plugin.js
 mode change 100755 => 100644 include/tiny_mce/plugins/contextmenu/editor_plugin_src.js
 mode change 100755 => 100644 include/tiny_mce/plugins/directionality/editor_plugin.js
 mode change 100755 => 100644 include/tiny_mce/plugins/directionality/editor_plugin_src.js
 mode change 100755 => 100644 include/tiny_mce/plugins/emotions/editor_plugin.js
 mode change 100755 => 100644 include/tiny_mce/plugins/emotions/editor_plugin_src.js
 mode change 100755 => 100644 include/tiny_mce/plugins/emotions/emotions.htm
 mode change 100755 => 100644 include/tiny_mce/plugins/emotions/img/smiley-cool.gif
 mode change 100755 => 100644 include/tiny_mce/plugins/emotions/img/smiley-cry.gif
 mode change 100755 => 100644 include/tiny_mce/plugins/emotions/img/smiley-embarassed.gif
 mode change 100755 => 100644 include/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif
 mode change 100755 => 100644 include/tiny_mce/plugins/emotions/img/smiley-frown.gif
 mode change 100755 => 100644 include/tiny_mce/plugins/emotions/img/smiley-innocent.gif
 mode change 100755 => 100644 include/tiny_mce/plugins/emotions/img/smiley-kiss.gif
 mode change 100755 => 100644 include/tiny_mce/plugins/emotions/img/smiley-laughing.gif
 mode change 100755 => 100644 include/tiny_mce/plugins/emotions/img/smiley-money-mouth.gif
 mode change 100755 => 100644 include/tiny_mce/plugins/emotions/img/smiley-sealed.gif
 mode change 100755 => 100644 include/tiny_mce/plugins/emotions/img/smiley-smile.gif
 mode change 100755 => 100644 include/tiny_mce/plugins/emotions/img/smiley-surprised.gif
 mode change 100755 => 100644 include/tiny_mce/plugins/emotions/img/smiley-tongue-out.gif
 mode change 100755 => 100644 include/tiny_mce/plugins/emotions/img/smiley-undecided.gif
 mode change 100755 => 100644 include/tiny_mce/plugins/emotions/img/smiley-wink.gif
 mode change 100755 => 100644 include/tiny_mce/plugins/emotions/img/smiley-yell.gif
 mode change 100755 => 100644 include/tiny_mce/plugins/emotions/js/emotions.js
 mode change 100755 => 100644 include/tiny_mce/plugins/emotions/langs/de_dlg.js
 mode change 100755 => 100644 include/tiny_mce/plugins/emotions/langs/en_dlg.js
 mode change 100755 => 100644 include/tiny_mce/plugins/example/dialog.htm
 mode change 100755 => 100644 include/tiny_mce/plugins/example/editor_plugin.js
 mode change 100755 => 100644 include/tiny_mce/plugins/example/editor_plugin_src.js
 mode change 100755 => 100644 include/tiny_mce/plugins/example/img/example.gif
 mode change 100755 => 100644 include/tiny_mce/plugins/example/js/dialog.js
 mode change 100755 => 100644 include/tiny_mce/plugins/example/langs/en.js
 mode change 100755 => 100644 include/tiny_mce/plugins/example/langs/en_dlg.js
 mode change 100755 => 100644 include/tiny_mce/plugins/fullpage/css/fullpage.css
 mode change 100755 => 100644 include/tiny_mce/plugins/fullpage/editor_plugin.js
 mode change 100755 => 100644 include/tiny_mce/plugins/fullpage/editor_plugin_src.js
 mode change 100755 => 100644 include/tiny_mce/plugins/fullpage/fullpage.htm
 mode change 100755 => 100644 include/tiny_mce/plugins/fullpage/js/fullpage.js
 mode change 100755 => 100644 include/tiny_mce/plugins/fullpage/langs/de_dlg.js
 mode change 100755 => 100644 include/tiny_mce/plugins/fullpage/langs/en_dlg.js
 mode change 100755 => 100644 include/tiny_mce/plugins/fullscreen/editor_plugin.js
 mode change 100755 => 100644 include/tiny_mce/plugins/fullscreen/editor_plugin_src.js
 mode change 100755 => 100644 include/tiny_mce/plugins/fullscreen/fullscreen.htm
 mode change 100755 => 100644 include/tiny_mce/plugins/iespell/editor_plugin.js
 mode change 100755 => 100644 include/tiny_mce/plugins/iespell/editor_plugin_src.js
 mode change 100755 => 100644 include/tiny_mce/plugins/inlinepopups/editor_plugin.js
 mode change 100755 => 100644 include/tiny_mce/plugins/inlinepopups/editor_plugin_src.js
 mode change 100755 => 100644 include/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif
 mode change 100755 => 100644 include/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/button.gif
 mode change 100755 => 100644 include/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif
 mode change 100755 => 100644 include/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif
 mode change 100755 => 100644 include/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif
 mode change 100755 => 100644 include/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif
 mode change 100755 => 100644 include/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif
 mode change 100755 => 100644 include/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.css
 mode change 100755 => 100644 include/tiny_mce/plugins/inlinepopups/template.htm
 mode change 100755 => 100644 include/tiny_mce/plugins/insertdatetime/editor_plugin.js
 mode change 100755 => 100644 include/tiny_mce/plugins/insertdatetime/editor_plugin_src.js
 mode change 100755 => 100644 include/tiny_mce/plugins/layer/editor_plugin.js
 mode change 100755 => 100644 include/tiny_mce/plugins/layer/editor_plugin_src.js
 mode change 100755 => 100644 include/tiny_mce/plugins/legacyoutput/editor_plugin.js
 mode change 100755 => 100644 include/tiny_mce/plugins/legacyoutput/editor_plugin_src.js
 mode change 100755 => 100644 include/tiny_mce/plugins/media/css/media.css
 mode change 100755 => 100644 include/tiny_mce/plugins/media/editor_plugin.js
 mode change 100755 => 100644 include/tiny_mce/plugins/media/editor_plugin_src.js
 mode change 100755 => 100644 include/tiny_mce/plugins/media/js/embed.js
 mode change 100755 => 100644 include/tiny_mce/plugins/media/js/media.js
 mode change 100755 => 100644 include/tiny_mce/plugins/media/langs/de_dlg.js
 mode change 100755 => 100644 include/tiny_mce/plugins/media/langs/en_dlg.js
 mode change 100755 => 100644 include/tiny_mce/plugins/media/media.htm
 mode change 100755 => 100644 include/tiny_mce/plugins/media/moxieplayer.swf
 mode change 100755 => 100644 include/tiny_mce/plugins/nonbreaking/editor_plugin.js
 mode change 100755 => 100644 include/tiny_mce/plugins/nonbreaking/editor_plugin_src.js
 mode change 100755 => 100644 include/tiny_mce/plugins/noneditable/editor_plugin.js
 mode change 100755 => 100644 include/tiny_mce/plugins/noneditable/editor_plugin_src.js
 mode change 100755 => 100644 include/tiny_mce/plugins/pagebreak/editor_plugin.js
 mode change 100755 => 100644 include/tiny_mce/plugins/pagebreak/editor_plugin_src.js
 mode change 100755 => 100644 include/tiny_mce/plugins/paste/editor_plugin.js
 mode change 100755 => 100644 include/tiny_mce/plugins/paste/editor_plugin_src.js
 mode change 100755 => 100644 include/tiny_mce/plugins/paste/js/pastetext.js
 mode change 100755 => 100644 include/tiny_mce/plugins/paste/js/pasteword.js
 mode change 100755 => 100644 include/tiny_mce/plugins/paste/langs/de_dlg.js
 mode change 100755 => 100644 include/tiny_mce/plugins/paste/langs/en_dlg.js
 mode change 100755 => 100644 include/tiny_mce/plugins/paste/pastetext.htm
 mode change 100755 => 100644 include/tiny_mce/plugins/paste/pasteword.htm
 mode change 100755 => 100644 include/tiny_mce/plugins/preview/editor_plugin.js
 mode change 100755 => 100644 include/tiny_mce/plugins/preview/editor_plugin_src.js
 mode change 100755 => 100644 include/tiny_mce/plugins/preview/example.html
 mode change 100755 => 100644 include/tiny_mce/plugins/preview/jscripts/embed.js
 mode change 100755 => 100644 include/tiny_mce/plugins/preview/preview.html
 mode change 100755 => 100644 include/tiny_mce/plugins/print/editor_plugin.js
 mode change 100755 => 100644 include/tiny_mce/plugins/print/editor_plugin_src.js
 mode change 100755 => 100644 include/tiny_mce/plugins/save/editor_plugin.js
 mode change 100755 => 100644 include/tiny_mce/plugins/save/editor_plugin_src.js
 mode change 100755 => 100644 include/tiny_mce/plugins/searchreplace/css/searchreplace.css
 mode change 100755 => 100644 include/tiny_mce/plugins/searchreplace/editor_plugin.js
 mode change 100755 => 100644 include/tiny_mce/plugins/searchreplace/editor_plugin_src.js
 mode change 100755 => 100644 include/tiny_mce/plugins/searchreplace/js/searchreplace.js
 mode change 100755 => 100644 include/tiny_mce/plugins/searchreplace/langs/de_dlg.js
 mode change 100755 => 100644 include/tiny_mce/plugins/searchreplace/langs/en_dlg.js
 mode change 100755 => 100644 include/tiny_mce/plugins/searchreplace/searchreplace.htm
 mode change 100755 => 100644 include/tiny_mce/plugins/spellchecker/css/content.css
 mode change 100755 => 100644 include/tiny_mce/plugins/spellchecker/editor_plugin.js
 mode change 100755 => 100644 include/tiny_mce/plugins/spellchecker/editor_plugin_src.js
 mode change 100755 => 100644 include/tiny_mce/plugins/spellchecker/img/wline.gif
 mode change 100755 => 100644 include/tiny_mce/plugins/style/css/props.css
 mode change 100755 => 100644 include/tiny_mce/plugins/style/editor_plugin.js
 mode change 100755 => 100644 include/tiny_mce/plugins/style/editor_plugin_src.js
 mode change 100755 => 100644 include/tiny_mce/plugins/style/js/props.js
 mode change 100755 => 100644 include/tiny_mce/plugins/style/langs/de_dlg.js
 mode change 100755 => 100644 include/tiny_mce/plugins/style/langs/en_dlg.js
 mode change 100755 => 100644 include/tiny_mce/plugins/style/props.htm
 mode change 100755 => 100644 include/tiny_mce/plugins/tabfocus/editor_plugin.js
 mode change 100755 => 100644 include/tiny_mce/plugins/tabfocus/editor_plugin_src.js
 mode change 100755 => 100644 include/tiny_mce/plugins/table/cell.htm
 mode change 100755 => 100644 include/tiny_mce/plugins/table/css/cell.css
 mode change 100755 => 100644 include/tiny_mce/plugins/table/css/row.css
 mode change 100755 => 100644 include/tiny_mce/plugins/table/css/table.css
 mode change 100755 => 100644 include/tiny_mce/plugins/table/editor_plugin.js
 mode change 100755 => 100644 include/tiny_mce/plugins/table/editor_plugin_src.js
 mode change 100755 => 100644 include/tiny_mce/plugins/table/js/cell.js
 mode change 100755 => 100644 include/tiny_mce/plugins/table/js/merge_cells.js
 mode change 100755 => 100644 include/tiny_mce/plugins/table/js/row.js
 mode change 100755 => 100644 include/tiny_mce/plugins/table/js/table.js
 mode change 100755 => 100644 include/tiny_mce/plugins/table/langs/de_dlg.js
 mode change 100755 => 100644 include/tiny_mce/plugins/table/langs/en_dlg.js
 mode change 100755 => 100644 include/tiny_mce/plugins/table/merge_cells.htm
 mode change 100755 => 100644 include/tiny_mce/plugins/table/row.htm
 mode change 100755 => 100644 include/tiny_mce/plugins/table/table.htm
 mode change 100755 => 100644 include/tiny_mce/plugins/template/blank.htm
 mode change 100755 => 100644 include/tiny_mce/plugins/template/css/template.css
 mode change 100755 => 100644 include/tiny_mce/plugins/template/editor_plugin.js
 mode change 100755 => 100644 include/tiny_mce/plugins/template/editor_plugin_src.js
 mode change 100755 => 100644 include/tiny_mce/plugins/template/js/template.js
 mode change 100755 => 100644 include/tiny_mce/plugins/template/langs/de_dlg.js
 mode change 100755 => 100644 include/tiny_mce/plugins/template/langs/en_dlg.js
 mode change 100755 => 100644 include/tiny_mce/plugins/template/template.htm
 mode change 100755 => 100644 include/tiny_mce/plugins/visualchars/editor_plugin.js
 mode change 100755 => 100644 include/tiny_mce/plugins/visualchars/editor_plugin_src.js
 mode change 100755 => 100644 include/tiny_mce/plugins/wordc/langs/de_dlg.js
 mode change 100755 => 100644 include/tiny_mce/plugins/wordc/langs/en_dlg.js
 mode change 100755 => 100644 include/tiny_mce/plugins/wordcount/editor_plugin.js
 mode change 100755 => 100644 include/tiny_mce/plugins/wordcount/editor_plugin_src.js
 mode change 100755 => 100644 include/tiny_mce/plugins/xhtmlxtras/abbr.htm
 mode change 100755 => 100644 include/tiny_mce/plugins/xhtmlxtras/acronym.htm
 mode change 100755 => 100644 include/tiny_mce/plugins/xhtmlxtras/attributes.htm
 mode change 100755 => 100644 include/tiny_mce/plugins/xhtmlxtras/cite.htm
 mode change 100755 => 100644 include/tiny_mce/plugins/xhtmlxtras/css/attributes.css
 mode change 100755 => 100644 include/tiny_mce/plugins/xhtmlxtras/css/popup.css
 mode change 100755 => 100644 include/tiny_mce/plugins/xhtmlxtras/del.htm
 mode change 100755 => 100644 include/tiny_mce/plugins/xhtmlxtras/editor_plugin.js
 mode change 100755 => 100644 include/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js
 mode change 100755 => 100644 include/tiny_mce/plugins/xhtmlxtras/ins.htm
 mode change 100755 => 100644 include/tiny_mce/plugins/xhtmlxtras/js/abbr.js
 mode change 100755 => 100644 include/tiny_mce/plugins/xhtmlxtras/js/acronym.js
 mode change 100755 => 100644 include/tiny_mce/plugins/xhtmlxtras/js/attributes.js
 mode change 100755 => 100644 include/tiny_mce/plugins/xhtmlxtras/js/cite.js
 mode change 100755 => 100644 include/tiny_mce/plugins/xhtmlxtras/js/del.js
 mode change 100755 => 100644 include/tiny_mce/plugins/xhtmlxtras/js/element_common.js
 mode change 100755 => 100644 include/tiny_mce/plugins/xhtmlxtras/js/ins.js
 mode change 100755 => 100644 include/tiny_mce/plugins/xhtmlxtras/langs/de_dlg.js
 mode change 100755 => 100644 include/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js
 mode change 100755 => 100644 include/tiny_mce/themes/advanced/about.htm
 mode change 100755 => 100644 include/tiny_mce/themes/advanced/anchor.htm
 mode change 100755 => 100644 include/tiny_mce/themes/advanced/charmap.htm
 mode change 100755 => 100644 include/tiny_mce/themes/advanced/color_picker.htm
 mode change 100755 => 100644 include/tiny_mce/themes/advanced/editor_template.js
 mode change 100755 => 100644 include/tiny_mce/themes/advanced/editor_template_src.js
 mode change 100755 => 100644 include/tiny_mce/themes/advanced/image.htm
 mode change 100755 => 100644 include/tiny_mce/themes/advanced/img/colorpicker.jpg
 mode change 100755 => 100644 include/tiny_mce/themes/advanced/img/flash.gif
 mode change 100755 => 100644 include/tiny_mce/themes/advanced/img/icons.gif
 mode change 100755 => 100644 include/tiny_mce/themes/advanced/img/iframe.gif
 mode change 100755 => 100644 include/tiny_mce/themes/advanced/img/pagebreak.gif
 mode change 100755 => 100644 include/tiny_mce/themes/advanced/img/quicktime.gif
 mode change 100755 => 100644 include/tiny_mce/themes/advanced/img/realmedia.gif
 mode change 100755 => 100644 include/tiny_mce/themes/advanced/img/shockwave.gif
 mode change 100755 => 100644 include/tiny_mce/themes/advanced/img/trans.gif
 mode change 100755 => 100644 include/tiny_mce/themes/advanced/img/video.gif
 mode change 100755 => 100644 include/tiny_mce/themes/advanced/img/windowsmedia.gif
 mode change 100755 => 100644 include/tiny_mce/themes/advanced/js/about.js
 mode change 100755 => 100644 include/tiny_mce/themes/advanced/js/anchor.js
 mode change 100755 => 100644 include/tiny_mce/themes/advanced/js/charmap.js
 mode change 100755 => 100644 include/tiny_mce/themes/advanced/js/color_picker.js
 mode change 100755 => 100644 include/tiny_mce/themes/advanced/js/image.js
 mode change 100755 => 100644 include/tiny_mce/themes/advanced/js/link.js
 mode change 100755 => 100644 include/tiny_mce/themes/advanced/js/source_editor.js
 mode change 100755 => 100644 include/tiny_mce/themes/advanced/langs/de.js
 mode change 100755 => 100644 include/tiny_mce/themes/advanced/langs/de_dlg.js
 mode change 100755 => 100644 include/tiny_mce/themes/advanced/langs/en.js
 mode change 100755 => 100644 include/tiny_mce/themes/advanced/langs/en_dlg.js
 mode change 100755 => 100644 include/tiny_mce/themes/advanced/link.htm
 mode change 100755 => 100644 include/tiny_mce/themes/advanced/shortcuts.htm
 mode change 100755 => 100644 include/tiny_mce/themes/advanced/skins/default/content.css
 mode change 100755 => 100644 include/tiny_mce/themes/advanced/skins/default/dialog.css
 mode change 100755 => 100644 include/tiny_mce/themes/advanced/skins/default/img/buttons.png
 mode change 100755 => 100644 include/tiny_mce/themes/advanced/skins/default/img/items.gif
 mode change 100755 => 100644 include/tiny_mce/themes/advanced/skins/default/img/menu_arrow.gif
 mode change 100755 => 100644 include/tiny_mce/themes/advanced/skins/default/img/menu_check.gif
 mode change 100755 => 100644 include/tiny_mce/themes/advanced/skins/default/img/progress.gif
 mode change 100755 => 100644 include/tiny_mce/themes/advanced/skins/default/img/tabs.gif
 mode change 100755 => 100644 include/tiny_mce/themes/advanced/skins/default/ui.css
 mode change 100755 => 100644 include/tiny_mce/themes/advanced/skins/highcontrast/content.css
 mode change 100755 => 100644 include/tiny_mce/themes/advanced/skins/highcontrast/dialog.css
 mode change 100755 => 100644 include/tiny_mce/themes/advanced/skins/highcontrast/ui.css
 mode change 100755 => 100644 include/tiny_mce/themes/advanced/skins/o2k7/content.css
 mode change 100755 => 100644 include/tiny_mce/themes/advanced/skins/o2k7/dialog.css
 mode change 100755 => 100644 include/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png
 mode change 100755 => 100644 include/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_black.png
 mode change 100755 => 100644 include/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_silver.png
 mode change 100755 => 100644 include/tiny_mce/themes/advanced/skins/o2k7/ui.css
 mode change 100755 => 100644 include/tiny_mce/themes/advanced/skins/o2k7/ui_black.css
 mode change 100755 => 100644 include/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css
 mode change 100755 => 100644 include/tiny_mce/themes/advanced/source_editor.htm
 mode change 100755 => 100644 include/tiny_mce/themes/simple/editor_template.js
 mode change 100755 => 100644 include/tiny_mce/themes/simple/editor_template_src.js
 mode change 100755 => 100644 include/tiny_mce/themes/simple/img/icons.gif
 mode change 100755 => 100644 include/tiny_mce/themes/simple/langs/de.js
 mode change 100755 => 100644 include/tiny_mce/themes/simple/langs/en.js
 mode change 100755 => 100644 include/tiny_mce/themes/simple/skins/default/content.css
 mode change 100755 => 100644 include/tiny_mce/themes/simple/skins/default/ui.css
 mode change 100755 => 100644 include/tiny_mce/themes/simple/skins/o2k7/content.css
 mode change 100755 => 100644 include/tiny_mce/themes/simple/skins/o2k7/img/button_bg.png
 mode change 100755 => 100644 include/tiny_mce/themes/simple/skins/o2k7/ui.css
 mode change 100755 => 100644 include/tiny_mce/tiny_mce.js
 mode change 100755 => 100644 include/tiny_mce/tiny_mce_popup.js
 mode change 100755 => 100644 include/tiny_mce/tiny_mce_src.js
 mode change 100755 => 100644 include/tiny_mce/utils/editable_selects.js
 mode change 100755 => 100644 include/tiny_mce/utils/form_utils.js
 mode change 100755 => 100644 include/tiny_mce/utils/mctabs.js
 mode change 100755 => 100644 include/tiny_mce/utils/validate.js
 mode change 100755 => 100644 include/tw/abgabe_lektor_benotung.php
 mode change 100755 => 100644 include/tw/cis_menu_lv.inc.php
 mode change 100755 => 100644 include/tw/fas_zusatzmenues.inc.php
 mode change 100755 => 100644 include/tw/fas_zusatzmenues.js.php
 mode change 100755 => 100644 include/tw/generateZahlungsreferenz.inc.php
 mode change 100755 => 100644 include/tw/generatematrikelnr.inc.php
 mode change 100755 => 100644 include/tw/generateuid.inc.php
 mode change 100755 => 100644 include/tw/index.html
 mode change 100755 => 100644 include/tw/passwort.inc.php
 mode change 100755 => 100644 include/tw/serviceterminal.inc.php
 mode change 100755 => 100644 include/tw/vilesci_menu_main.inc.php
 mode change 100755 => 100644 include/tw/wawi_menu_main.inc.php
 mode change 100755 => 100644 include/udf.class.php
 mode change 100755 => 100644 include/uebung.class.php
 mode change 100755 => 100644 include/variable.class.php
 mode change 100755 => 100644 include/vendor_custom/angular-tablesorter/tablesort.css
 mode change 100755 => 100644 include/vendor_custom/easyui/easyui.css
 mode change 100755 => 100644 include/vendor_custom/easyui/icon.css
 mode change 100755 => 100644 include/vendor_custom/jquery-tablesorter/tablesort.css
 mode change 100755 => 100644 include/vertrag.class.php
 mode change 100755 => 100644 include/vorlage.class.php
 mode change 100755 => 100644 include/vorschlag.class.php
 mode change 100755 => 100644 include/wawi_aufteilung.class.php
 mode change 100755 => 100644 include/wawi_bestelldetail.class.php
 mode change 100755 => 100644 include/wawi_bestellstatus.class.php
 mode change 100755 => 100644 include/wawi_bestellung.class.php
 mode change 100755 => 100644 include/wawi_konto.class.php
 mode change 100755 => 100644 include/wawi_kostenstelle.class.php
 mode change 100755 => 100644 include/wawi_rechnung.class.php
 mode change 100755 => 100644 include/wawi_zahlungstyp.class.php
 mode change 100755 => 100644 include/webservicelog.class.php
 mode change 100755 => 100644 include/webservicerecht.class.php
 mode change 100755 => 100644 include/wochenplan.class.php
 mode change 100755 => 100644 include/xmlrpcutils/utils.php
 mode change 100755 => 100644 include/xsdformprinter/config.inc.php
 mode change 100755 => 100644 include/xsdformprinter/examples/shiporder.xml
 mode change 100755 => 100644 include/xsdformprinter/examples/shiporder1.xsd
 mode change 100755 => 100644 include/xsdformprinter/examples/shiporder2.xsd
 mode change 100755 => 100644 include/xsdformprinter/style.css
 mode change 100755 => 100644 include/xsdformprinter/types.php
 mode change 100755 => 100644 include/xsdformprinter/xfp.php
 mode change 100755 => 100644 include/xsdformprinter/xsdformprinter.php
 mode change 100755 => 100644 include/zeitaufzeichnung.class.php
 mode change 100755 => 100644 include/zeitaufzeichnung_gd.class.php
 mode change 100755 => 100644 include/zeitaufzeichnung_import.class.php
 mode change 100755 => 100644 include/zeitaufzeichnung_import_csv.class.php
 mode change 100755 => 100644 include/zeitaufzeichnung_import_post.class.php
 mode change 100755 => 100644 include/zeitsperre.class.php
 mode change 100755 => 100644 include/zeitwunsch.class.php
 mode change 100755 => 100644 include/zeitwunsch_gueltigkeit.class.php
 mode change 100755 => 100644 include/zeugnisnote.class.php
 mode change 100755 => 100644 include/zgv.class.php
 mode change 100755 => 100644 include/zweck.class.php
 mode change 100755 => 100644 index.ci.php
 mode change 100755 => 100644 index.cis.html
 mode change 100755 => 100644 index.vilesci.php
 mode change 100755 => 100644 locale/contents.rdf
 mode change 100755 => 100644 locale/de-AT/abgabetool.php
 mode change 100755 => 100644 locale/de-AT/anwesenheitsliste.php
 mode change 100755 => 100644 locale/de-AT/benotungstool.php
 mode change 100755 => 100644 locale/de-AT/buchungen.php
 mode change 100755 => 100644 locale/de-AT/contents.rdf
 mode change 100755 => 100644 locale/de-AT/coodle.php
 mode change 100755 => 100644 locale/de-AT/courseInformation.php
 mode change 100755 => 100644 locale/de-AT/dms_link.php
 mode change 100755 => 100644 locale/de-AT/errors.php
 mode change 100755 => 100644 locale/de-AT/eventkalender.php
 mode change 100755 => 100644 locale/de-AT/fas.dtd
 mode change 100755 => 100644 locale/de-AT/feedback.php
 mode change 100755 => 100644 locale/de-AT/freebusy.php
 mode change 100755 => 100644 locale/de-AT/freifach.php
 mode change 100755 => 100644 locale/de-AT/gesamtnote.php
 mode change 100755 => 100644 locale/de-AT/global.php
 mode change 100755 => 100644 locale/de-AT/incoming.php
 mode change 100755 => 100644 locale/de-AT/ktu.php
 mode change 100755 => 100644 locale/de-AT/lehre.php
 mode change 100755 => 100644 locale/de-AT/lehrveranstaltung.php
 mode change 100755 => 100644 locale/de-AT/lvaliste.php
 mode change 100755 => 100644 locale/de-AT/lvinfo.php
 mode change 100755 => 100644 locale/de-AT/lvplan.php
 mode change 100755 => 100644 locale/de-AT/mail.php
 mode change 100755 => 100644 locale/de-AT/mailverteiler.php
 mode change 100755 => 100644 locale/de-AT/menu.php
 mode change 100755 => 100644 locale/de-AT/news.php
 mode change 100755 => 100644 locale/de-AT/notebookregister.php
 mode change 100755 => 100644 locale/de-AT/notfallbestimmungen.php
 mode change 100755 => 100644 locale/de-AT/passwort.php
 mode change 100755 => 100644 locale/de-AT/personensuche.php
 mode change 100755 => 100644 locale/de-AT/planner.dtd
 mode change 100755 => 100644 locale/de-AT/profil.php
 mode change 100755 => 100644 locale/de-AT/pruefung.php
 mode change 100755 => 100644 locale/de-AT/reihungstest.php
 mode change 100755 => 100644 locale/de-AT/semesterplan.php
 mode change 100755 => 100644 locale/de-AT/services.php
 mode change 100755 => 100644 locale/de-AT/studienplan.php
 mode change 100755 => 100644 locale/de-AT/studierendenantrag.php
 mode change 100755 => 100644 locale/de-AT/telefonverzeichnis.php
 mode change 100755 => 100644 locale/de-AT/tempus.dtd
 mode change 100755 => 100644 locale/de-AT/testtool.php
 mode change 100755 => 100644 locale/de-AT/tools.php
 mode change 100755 => 100644 locale/de-AT/upload.php
 mode change 100755 => 100644 locale/de-AT/urlaubstool.php
 mode change 100755 => 100644 locale/de-AT/zeitaufzeichnung.php
 mode change 100755 => 100644 locale/de-AT/zeitsperre.php
 mode change 100755 => 100644 locale/de-AT/zeitwunsch.php
 mode change 100755 => 100644 locale/de-SFU/contents.rdf
 mode change 100755 => 100644 locale/de-SFU/fas.dtd
 mode change 100755 => 100644 locale/de-SFU/planner.dtd
 mode change 100755 => 100644 locale/de-SFU/tempus.dtd
 mode change 100755 => 100644 locale/en-US/abgabetool.php
 mode change 100755 => 100644 locale/en-US/anwesenheitsliste.php
 mode change 100755 => 100644 locale/en-US/benotungstool.php
 mode change 100755 => 100644 locale/en-US/contents.rdf
 mode change 100755 => 100644 locale/en-US/coodle.php
 mode change 100755 => 100644 locale/en-US/courseInformation.php
 mode change 100755 => 100644 locale/en-US/dms_link.php
 mode change 100755 => 100644 locale/en-US/errors.php
 mode change 100755 => 100644 locale/en-US/eventkalender.php
 mode change 100755 => 100644 locale/en-US/feedback.php
 mode change 100755 => 100644 locale/en-US/freebusy.php
 mode change 100755 => 100644 locale/en-US/freifach.php
 mode change 100755 => 100644 locale/en-US/gesamtnote.php
 mode change 100755 => 100644 locale/en-US/global.php
 mode change 100755 => 100644 locale/en-US/incoming.php
 mode change 100755 => 100644 locale/en-US/lehre.php
 mode change 100755 => 100644 locale/en-US/lvaliste.php
 mode change 100755 => 100644 locale/en-US/lvinfo.php
 mode change 100755 => 100644 locale/en-US/lvplan.php
 mode change 100755 => 100644 locale/en-US/mail.php
 mode change 100755 => 100644 locale/en-US/mailverteiler.php
 mode change 100755 => 100644 locale/en-US/menu.php
 mode change 100755 => 100644 locale/en-US/news.php
 mode change 100755 => 100644 locale/en-US/notebookregister.php
 mode change 100755 => 100644 locale/en-US/notfallbestimmungen.php
 mode change 100755 => 100644 locale/en-US/passwort.php
 mode change 100755 => 100644 locale/en-US/personensuche.php
 mode change 100755 => 100644 locale/en-US/profil.php
 mode change 100755 => 100644 locale/en-US/pruefung.php
 mode change 100755 => 100644 locale/en-US/reihungstest.php
 mode change 100755 => 100644 locale/en-US/semesterplan.php
 mode change 100755 => 100644 locale/en-US/services.php
 mode change 100755 => 100644 locale/en-US/studierendenantrag.php
 mode change 100755 => 100644 locale/en-US/telefonverzeichnis.php
 mode change 100755 => 100644 locale/en-US/tempus.dtd
 mode change 100755 => 100644 locale/en-US/testtool.php
 mode change 100755 => 100644 locale/en-US/tools.php
 mode change 100755 => 100644 locale/en-US/upload.php
 mode change 100755 => 100644 locale/en-US/urlaubstool.php
 mode change 100755 => 100644 locale/en-US/zeitaufzeichnung.php
 mode change 100755 => 100644 locale/en-US/zeitsperre.php
 mode change 100755 => 100644 locale/en-US/zeitwunsch.php
 mode change 100755 => 100644 locale/it-IT/abgabetool.php
 mode change 100755 => 100644 locale/it-IT/anwesenheitsliste.php
 mode change 100755 => 100644 locale/it-IT/benotungstool.php
 mode change 100755 => 100644 locale/it-IT/buchungen.php
 mode change 100755 => 100644 locale/it-IT/coodle.php
 mode change 100755 => 100644 locale/it-IT/courseInformation.php
 mode change 100755 => 100644 locale/it-IT/dms_link.php
 mode change 100755 => 100644 locale/it-IT/errors.php
 mode change 100755 => 100644 locale/it-IT/eventkalender.php
 mode change 100755 => 100644 locale/it-IT/feedback.php
 mode change 100755 => 100644 locale/it-IT/freebusy.php
 mode change 100755 => 100644 locale/it-IT/freifach.php
 mode change 100755 => 100644 locale/it-IT/gesamtnote.php
 mode change 100755 => 100644 locale/it-IT/global.php
 mode change 100755 => 100644 locale/it-IT/incoming.php
 mode change 100755 => 100644 locale/it-IT/lehre.php
 mode change 100755 => 100644 locale/it-IT/lvaliste.php
 mode change 100755 => 100644 locale/it-IT/lvinfo.php
 mode change 100755 => 100644 locale/it-IT/lvplan.php
 mode change 100755 => 100644 locale/it-IT/mail.php
 mode change 100755 => 100644 locale/it-IT/mailverteiler.php
 mode change 100755 => 100644 locale/it-IT/menu.php
 mode change 100755 => 100644 locale/it-IT/news.php
 mode change 100755 => 100644 locale/it-IT/notebookregister.php
 mode change 100755 => 100644 locale/it-IT/notfallbestimmungen.php
 mode change 100755 => 100644 locale/it-IT/passwort.php
 mode change 100755 => 100644 locale/it-IT/personensuche.php
 mode change 100755 => 100644 locale/it-IT/profil.php
 mode change 100755 => 100644 locale/it-IT/pruefung.php
 mode change 100755 => 100644 locale/it-IT/semesterplan.php
 mode change 100755 => 100644 locale/it-IT/services.php
 mode change 100755 => 100644 locale/it-IT/studienplan.php
 mode change 100755 => 100644 locale/it-IT/telefonverzeichnis.php
 mode change 100755 => 100644 locale/it-IT/testtool.php
 mode change 100755 => 100644 locale/it-IT/tools.php
 mode change 100755 => 100644 locale/it-IT/upload.php
 mode change 100755 => 100644 locale/it-IT/urlaubstool.php
 mode change 100755 => 100644 locale/it-IT/zeitaufzeichnung.php
 mode change 100755 => 100644 locale/it-IT/zeitsperre.php
 mode change 100755 => 100644 locale/it-IT/zeitwunsch.php
 mode change 100755 => 100644 public/css/AjaxLib.css
 mode change 100755 => 100644 public/css/Cis4/Cis.css
 mode change 100755 => 100644 public/css/Cis4/Cms.css
 mode change 100755 => 100644 public/css/Cis4/Legacy.css
 mode change 100755 => 100644 public/css/DialogLib.css
 mode change 100755 => 100644 public/css/Fhc.css
 mode change 100755 => 100644 public/css/FilterWidget.css
 mode change 100755 => 100644 public/css/Login.css
 mode change 100755 => 100644 public/css/NavigationWidget.css
 mode change 100755 => 100644 public/css/Tabulator.css
 mode change 100755 => 100644 public/css/Tabulator5.css
 mode change 100755 => 100644 public/css/TinyMCE5.css
 mode change 100755 => 100644 public/css/Widgets.css
 mode change 100755 => 100644 public/css/cis4.css
 mode change 100755 => 100644 public/css/cis_bs5.css
 mode change 100755 => 100644 public/css/codex/oehbeitrag.css
 mode change 100755 => 100644 public/css/codex/uhstat1.css
 mode change 100755 => 100644 public/css/components/FilterComponent.css
 mode change 100755 => 100644 public/css/components/FormUnderline.css
 mode change 100755 => 100644 public/css/components/NavigationComponent.css
 mode change 100755 => 100644 public/css/components/Profil.css
 mode change 100755 => 100644 public/css/components/calendar.css
 mode change 100755 => 100644 public/css/components/dashboard.css
 mode change 100755 => 100644 public/css/components/searchbar/searchbar.css
 mode change 100755 => 100644 public/css/components/verticalsplit.css
 mode change 100755 => 100644 public/css/fhcomplete.css
 mode change 100755 => 100644 public/css/infocenter/infocenterDetails.css
 mode change 100755 => 100644 public/css/infocenter/infocenterPersonDataset.css
 mode change 100755 => 100644 public/css/issues/issuesDataset.css
 mode change 100755 => 100644 public/css/issues/issuesKonfiguration.css
 mode change 100755 => 100644 public/css/issues/issuesZustaendigkeiten.css
 mode change 100755 => 100644 public/css/lehre/anrechnung.css
 mode change 100755 => 100644 public/css/lehre/pruefungsprotokoll.css
 mode change 100755 => 100644 public/css/messaging/message.css
 mode change 100755 => 100644 public/css/sbadmin2/admintemplate.css
 mode change 100755 => 100644 public/css/sbadmin2/admintemplate_contentonly.css
 mode change 100755 => 100644 public/css/sbadmin2/tablesort_bootstrap.css
 mode change 100755 => 100644 public/css/tools/auswertung_fhtw.css
 mode change 100755 => 100644 public/css/tools/gradelist.css
 mode change 100755 => 100644 public/extensions/.placeholder
 mode change 100755 => 100644 public/images/icons/fa-user-check.png
 mode change 100755 => 100644 public/images/icons/fa-user-clock.png
 mode change 100755 => 100644 public/images/icons/fa-user-cog.png
 mode change 100755 => 100644 public/images/icons/fa-user-edit.png
 mode change 100755 => 100644 public/images/icons/fa-user-graduate.png
 mode change 100755 => 100644 public/images/icons/fa-user-lock.png
 mode change 100755 => 100644 public/images/icons/fa-user-minus.png
 mode change 100755 => 100644 public/images/icons/fa-user-ninja.png
 mode change 100755 => 100644 public/images/icons/fa-user-tag.png
 mode change 100755 => 100644 public/images/icons/fa-user-times.png
 mode change 100755 => 100644 public/images/icons/fa-users-cog.png
 mode change 100755 => 100644 public/images/loader.gif
 mode change 100755 => 100644 public/images/logo-300x160.png
 mode change 100755 => 100644 public/js/AjaxLib.js
 mode change 100755 => 100644 public/js/DialogLib.js
 mode change 100755 => 100644 public/js/FilterWidget.js
 mode change 100755 => 100644 public/js/Login.js
 mode change 100755 => 100644 public/js/NavigationWidget.js
 mode change 100755 => 100644 public/js/PhrasesLib.js
 mode change 100755 => 100644 public/js/RESTClient.js
 mode change 100755 => 100644 public/js/TableWidget.js
 mode change 100755 => 100644 public/js/UDFWidget.js
 mode change 100755 => 100644 public/js/api/profil.js
 mode change 100755 => 100644 public/js/apps/Cis.js
 mode change 100755 => 100644 public/js/apps/Cis/Cms.js
 mode change 100755 => 100644 public/js/apps/Cis/Documents.js
 mode change 100755 => 100644 public/js/apps/Cis/MyLv/Student.js
 mode change 100755 => 100644 public/js/apps/Cis/Profil.js
 mode change 100755 => 100644 public/js/apps/Cis/ProfilUpdateRequests.js
 mode change 100755 => 100644 public/js/apps/Cis/Stundenplan.js
 mode change 100755 => 100644 public/js/apps/Dashboard.js
 mode change 100755 => 100644 public/js/apps/Dashboard/Admin.js
 mode change 100755 => 100644 public/js/apps/Dashboard/Fhc.js
 mode change 100755 => 100644 public/js/apps/DashboardAdmin.js
 mode change 100755 => 100644 public/js/apps/LogsViewer/LogsViewer.js
 mode change 100755 => 100644 public/js/apps/LogsViewer/TabulatorSetup.js
 mode change 100755 => 100644 public/js/apps/TestSearch.js
 mode change 100755 => 100644 public/js/apps/api/dummyapi.php
 mode change 100755 => 100644 public/js/apps/api/fhcapifactory.js
 mode change 100755 => 100644 public/js/apps/api/search.js
 mode change 100755 => 100644 public/js/apps/lehre/Antrag.js
 mode change 100755 => 100644 public/js/apps/lehre/Antrag/Leitung.js
 mode change 100755 => 100644 public/js/apps/lehre/Antrag/Lvzuweisung.js
 mode change 100755 => 100644 public/js/apps/lehre/Antrag/Student.js
 mode change 100755 => 100644 public/js/bootstrapper.js
 mode change 100755 => 100644 public/js/codex/oehbeitrag.js
 mode change 100755 => 100644 public/js/codex/uhstat1.js
 mode change 100755 => 100644 public/js/components/Base/Modal.js
 mode change 100755 => 100644 public/js/components/Base/Offcanvas.js
 mode change 100755 => 100644 public/js/components/Bootstrap/Alert.js
 mode change 100755 => 100644 public/js/components/Bootstrap/Confirm.js
 mode change 100755 => 100644 public/js/components/Bootstrap/Modal.js
 mode change 100755 => 100644 public/js/components/Bootstrap/Prompt.js
 mode change 100755 => 100644 public/js/components/Calendar/Abstract.js
 mode change 100755 => 100644 public/js/components/Calendar/Calendar.js
 mode change 100755 => 100644 public/js/components/Calendar/Header.js
 mode change 100755 => 100644 public/js/components/Calendar/Minimized.js
 mode change 100755 => 100644 public/js/components/Calendar/Month.js
 mode change 100755 => 100644 public/js/components/Calendar/Month/Page.js
 mode change 100755 => 100644 public/js/components/Calendar/Months.js
 mode change 100755 => 100644 public/js/components/Calendar/Pane.js
 mode change 100755 => 100644 public/js/components/Calendar/Week.js
 mode change 100755 => 100644 public/js/components/Calendar/Week/Page.js
 mode change 100755 => 100644 public/js/components/Calendar/Weeks.js
 mode change 100755 => 100644 public/js/components/Calendar/Years.js
 mode change 100755 => 100644 public/js/components/Calendar/Years/Page.js
 mode change 100755 => 100644 public/js/components/Cis/Menu.js
 mode change 100755 => 100644 public/js/components/Cis/Menu/Entry.js
 mode change 100755 => 100644 public/js/components/Cis/Mylv/Semester.js
 mode change 100755 => 100644 public/js/components/Cis/Mylv/Semester/Studiengang.js
 mode change 100755 => 100644 public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
 mode change 100755 => 100644 public/js/components/Cis/Mylv/Semester/Studiengang/Lv/Info.js
 mode change 100755 => 100644 public/js/components/Cis/Mylv/Semester/Studiengang/Lv/Pruefungen.js
 mode change 100755 => 100644 public/js/components/Cis/Mylv/Student.js
 mode change 100755 => 100644 public/js/components/Cis/Profil/MitarbeiterProfil.js
 mode change 100755 => 100644 public/js/components/Cis/Profil/MitarbeiterViewProfil.js
 mode change 100755 => 100644 public/js/components/Cis/Profil/ProfilComponents/Adresse.js
 mode change 100755 => 100644 public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
 mode change 100755 => 100644 public/js/components/Cis/Profil/ProfilComponents/FhAusweisStatus.js
 mode change 100755 => 100644 public/js/components/Cis/Profil/ProfilComponents/Kontakt.js
 mode change 100755 => 100644 public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js
 mode change 100755 => 100644 public/js/components/Cis/Profil/ProfilComponents/ProfilEmails.js
 mode change 100755 => 100644 public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
 mode change 100755 => 100644 public/js/components/Cis/Profil/ProfilComponents/QuickLinks.js
 mode change 100755 => 100644 public/js/components/Cis/Profil/ProfilComponents/RoleInformation.js
 mode change 100755 => 100644 public/js/components/Cis/Profil/ProfilModal/EditProfil.js
 mode change 100755 => 100644 public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js
 mode change 100755 => 100644 public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditKontakt.js
 mode change 100755 => 100644 public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/Status.js
 mode change 100755 => 100644 public/js/components/Cis/Profil/ProfilModal/EditProfilSelect.js
 mode change 100755 => 100644 public/js/components/Cis/Profil/StudentProfil.js
 mode change 100755 => 100644 public/js/components/Cis/Profil/StudentViewProfil.js
 mode change 100755 => 100644 public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
 mode change 100755 => 100644 public/js/components/Dashboard/Admin.js
 mode change 100755 => 100644 public/js/components/Dashboard/Admin/Edit.js
 mode change 100755 => 100644 public/js/components/Dashboard/Admin/Presets.js
 mode change 100755 => 100644 public/js/components/Dashboard/Admin/Widgets.js
 mode change 100755 => 100644 public/js/components/Dashboard/Dashboard.js
 mode change 100755 => 100644 public/js/components/Dashboard/Item.js
 mode change 100755 => 100644 public/js/components/Dashboard/Section.js
 mode change 100755 => 100644 public/js/components/Dashboard/Widget/Picker.js
 mode change 100755 => 100644 public/js/components/DashboardWidget/Abstract.js
 mode change 100755 => 100644 public/js/components/DashboardWidget/Ampel.js
 mode change 100755 => 100644 public/js/components/DashboardWidget/Default.js
 mode change 100755 => 100644 public/js/components/DashboardWidget/News.js
 mode change 100755 => 100644 public/js/components/DashboardWidget/Stundenplan.js
 mode change 100755 => 100644 public/js/components/DashboardWidget/Url.js
 mode change 100755 => 100644 public/js/components/Drop/Grid.js
 mode change 100755 => 100644 public/js/components/Drop/Grid/Item.js
 mode change 100755 => 100644 public/js/components/Fetch.js
 mode change 100755 => 100644 public/js/components/Form/Form.js
 mode change 100755 => 100644 public/js/components/Form/Input.js
 mode change 100755 => 100644 public/js/components/Form/Upload/Dms.js
 mode change 100755 => 100644 public/js/components/Form/Upload/Image.js
 mode change 100755 => 100644 public/js/components/Form/Validation.js
 mode change 100755 => 100644 public/js/components/Loader.js
 mode change 100755 => 100644 public/js/components/Studierendenantrag/Antrag.js
 mode change 100755 => 100644 public/js/components/Studierendenantrag/Form/Abmeldung.js
 mode change 100755 => 100644 public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
 mode change 100755 => 100644 public/js/components/Studierendenantrag/Form/Unterbrechung.js
 mode change 100755 => 100644 public/js/components/Studierendenantrag/Form/Wiederholung.js
 mode change 100755 => 100644 public/js/components/Studierendenantrag/Infoblock.js
 mode change 100755 => 100644 public/js/components/Studierendenantrag/Leitung.js
 mode change 100755 => 100644 public/js/components/Studierendenantrag/Leitung/Actions.js
 mode change 100755 => 100644 public/js/components/Studierendenantrag/Leitung/Actions/Columns.js
 mode change 100755 => 100644 public/js/components/Studierendenantrag/Leitung/Actions/New.js
 mode change 100755 => 100644 public/js/components/Studierendenantrag/Leitung/GrundPopup.js
 mode change 100755 => 100644 public/js/components/Studierendenantrag/Leitung/Header.js
 mode change 100755 => 100644 public/js/components/Studierendenantrag/Leitung/LvPopup.js
 mode change 100755 => 100644 public/js/components/Studierendenantrag/Leitung/Table.js
 mode change 100755 => 100644 public/js/components/Studierendenantrag/Lvzuweisung.js
 mode change 100755 => 100644 public/js/components/Studierendenantrag/Status.js
 mode change 100755 => 100644 public/js/components/filter/API.js
 mode change 100755 => 100644 public/js/components/filter/Filter.js
 mode change 100755 => 100644 public/js/components/filter/Filter/Columns.js
 mode change 100755 => 100644 public/js/components/filter/Filter/Config.js
 mode change 100755 => 100644 public/js/components/filter/Table/Download.js
 mode change 100755 => 100644 public/js/components/navigation/API.js
 mode change 100755 => 100644 public/js/components/navigation/Navigation.js
 mode change 100755 => 100644 public/js/components/searchbar/action.js
 mode change 100755 => 100644 public/js/components/searchbar/actions.js
 mode change 100755 => 100644 public/js/components/searchbar/employee.js
 mode change 100755 => 100644 public/js/components/searchbar/organisationunit.js
 mode change 100755 => 100644 public/js/components/searchbar/person.js
 mode change 100755 => 100644 public/js/components/searchbar/raum.js
 mode change 100755 => 100644 public/js/components/searchbar/searchbar.js
 mode change 100755 => 100644 public/js/components/verticalsplit/verticalsplit.js
 mode change 100755 => 100644 public/js/components/vueDatepicker.js.php
 mode change 100755 => 100644 public/js/composables/CalendarDate.js
 mode change 100755 => 100644 public/js/composables/Dashboard/CachedWidgetLoader.js
 mode change 100755 => 100644 public/js/composables/GridLogic.js
 mode change 100755 => 100644 public/js/composables/ObjectUtils.js
 mode change 100755 => 100644 public/js/infocenter/docUeberpruefung.js
 mode change 100755 => 100644 public/js/infocenter/infocenterDetails.js
 mode change 100755 => 100644 public/js/infocenter/infocenterPersonDataset.js
 mode change 100755 => 100644 public/js/infocenter/messageList.js
 mode change 100755 => 100644 public/js/infocenter/rueckstellung.js
 mode change 100755 => 100644 public/js/infocenter/stammdaten.js
 mode change 100755 => 100644 public/js/infocenter/zgvUeberpruefung.js
 mode change 100755 => 100644 public/js/issues/issuesDataset.js
 mode change 100755 => 100644 public/js/issues/issuesKonfiguration.js
 mode change 100755 => 100644 public/js/issues/issuesZustaendigkeiten.js
 mode change 100755 => 100644 public/js/issues/plausichecks.js
 mode change 100755 => 100644 public/js/lehre/anrechnung/adminAnrechnung.js
 mode change 100755 => 100644 public/js/lehre/anrechnung/approveAnrechnungDetail.js
 mode change 100755 => 100644 public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
 mode change 100755 => 100644 public/js/lehre/anrechnung/createAnrechnung.js
 mode change 100755 => 100644 public/js/lehre/anrechnung/requestAnrechnung.js
 mode change 100755 => 100644 public/js/lehre/anrechnung/reviewAnrechnungDetail.js
 mode change 100755 => 100644 public/js/lehre/anrechnung/reviewAnrechnungUebersicht.js
 mode change 100755 => 100644 public/js/lehre/lehrauftrag/acceptLehrauftrag.js
 mode change 100755 => 100644 public/js/lehre/lehrauftrag/approveLehrauftrag.js
 mode change 100755 => 100644 public/js/lehre/lehrauftrag/orderLehrauftrag.js
 mode change 100755 => 100644 public/js/lehre/lvplanung/zverfueg.js
 mode change 100755 => 100644 public/js/lehre/pruefungsprotokoll.js
 mode change 100755 => 100644 public/js/messaging/fasMessageWrite.js
 mode change 100755 => 100644 public/js/messaging/messageWrite.js
 mode change 100755 => 100644 public/js/messaging/messageWriteReply.js
 mode change 100755 => 100644 public/js/messaging/read.js
 mode change 100755 => 100644 public/js/messaging/write.js
 mode change 100755 => 100644 public/js/messaging/writeReply.js
 mode change 100755 => 100644 public/js/mixins/Phrasen.js
 mode change 100755 => 100644 public/js/person/benutzergruppe.js
 mode change 100755 => 100644 public/js/pivottable/pivot.de.js
 mode change 100755 => 100644 public/js/plugin/Phrasen.js
 mode change 100755 => 100644 public/js/tablesort/tablesort.js
 mode change 100755 => 100644 public/js/tabulator/filters/Dates.js
 mode change 100755 => 100644 public/media/.placeholder
 mode change 100755 => 100644 rdf/AntragAbmeldung.xml.php
 mode change 100755 => 100644 rdf/AntragAbmeldungStgl.xml.php
 mode change 100755 => 100644 rdf/AntragUnterbrechung.xml.php
 mode change 100755 => 100644 rdf/PHPRequest.txt
 mode change 100755 => 100644 rdf/abschlussbeurteilung.rdf.php
 mode change 100755 => 100644 rdf/abschlusspruefung.rdf.php
 mode change 100755 => 100644 rdf/abschlusspruefung_antritt.rdf.php
 mode change 100755 => 100644 rdf/accountinfoblatt.xml.php
 mode change 100755 => 100644 rdf/adresse.rdf.php
 mode change 100755 => 100644 rdf/adressentyp.rdf.php
 mode change 100755 => 100644 rdf/akadgrad.rdf.php
 mode change 100755 => 100644 rdf/akte.rdf.php
 mode change 100755 => 100644 rdf/anrechnung.rdf.php
 mode change 100755 => 100644 rdf/anrechnungbegruendung.rdf.php
 mode change 100755 => 100644 rdf/anwesenheit.rdf.php
 mode change 100755 => 100644 rdf/anwesenheitsliste.xml.php
 mode change 100755 => 100644 rdf/anzahlAnwesenheitenStudenplan.rdf.php
 mode change 100755 => 100644 rdf/aufenthaltfoerderung.rdf.php
 mode change 100755 => 100644 rdf/aufmerksamdurch.rdf.php
 mode change 100755 => 100644 rdf/aufnahmeschluessel.rdf.php
 mode change 100755 => 100644 rdf/aufnahmetermine.rdf.php
 mode change 100755 => 100644 rdf/aufwandstyp.rdf.php
 mode change 100755 => 100644 rdf/ausbildung.rdf.php
 mode change 100755 => 100644 rdf/ausbildungsvertrag.xml.php
 mode change 100755 => 100644 rdf/bankverbindung.rdf.php
 mode change 100755 => 100644 rdf/benutzer.rdf.php
 mode change 100755 => 100644 rdf/benutzerfunktion.rdf.php
 mode change 100755 => 100644 rdf/berufstaetigkeit.rdf.php
 mode change 100755 => 100644 rdf/beschaeftigungsart1.rdf.php
 mode change 100755 => 100644 rdf/beschaeftigungsart2.rdf.php
 mode change 100755 => 100644 rdf/beschaeftigungsausmass.rdf.php
 mode change 100755 => 100644 rdf/besonderequalifikation.rdf.php
 mode change 100755 => 100644 rdf/bestelldetail.rdf.php
 mode change 100755 => 100644 rdf/bestellung.rdf.php
 mode change 100755 => 100644 rdf/betreuerart.rdf.php
 mode change 100755 => 100644 rdf/betriebsmittel.rdf.php
 mode change 100755 => 100644 rdf/betriebsmittelperson.rdf.php
 mode change 100755 => 100644 rdf/betriebsmitteltyp.rdf.php
 mode change 100755 => 100644 rdf/bisfunktion.rdf.php
 mode change 100755 => 100644 rdf/bisio.rdf.php
 mode change 100755 => 100644 rdf/bisstandort.rdf.php
 mode change 100755 => 100644 rdf/bisverwendung.rdf.php
 mode change 100755 => 100644 rdf/buchungstyp.rdf.php
 mode change 100755 => 100644 rdf/diplomasupplement.xml.php
 mode change 100755 => 100644 rdf/dms.rdf.php
 mode change 100755 => 100644 rdf/dokument.rdf.php
 mode change 100755 => 100644 rdf/dokumentprestudent.rdf.php
 mode change 100755 => 100644 rdf/dokumenttyp.rdf.php
 mode change 100755 => 100644 rdf/entwicklungsteam.rdf.php
 mode change 100755 => 100644 rdf/erfolgsnachweis.rdf.php
 mode change 100755 => 100644 rdf/fachbereich.rdf.php
 mode change 100755 => 100644 rdf/fachbereich_menue.rdf.php
 mode change 100755 => 100644 rdf/firma.rdf.php
 mode change 100755 => 100644 rdf/funktion.rdf.php
 mode change 100755 => 100644 rdf/gemeinde.rdf.php
 mode change 100755 => 100644 rdf/geschlecht.rdf.php
 mode change 100755 => 100644 rdf/gruppen.rdf.php
 mode change 100755 => 100644 rdf/gsprogramm.rdf.php
 mode change 100755 => 100644 rdf/gsstudientyp.rdf.php
 mode change 100755 => 100644 rdf/hauptberuf.rdf.php
 mode change 100755 => 100644 rdf/index.html
 mode change 100755 => 100644 rdf/kontakt.rdf.php
 mode change 100755 => 100644 rdf/kontakttyp.rdf.php
 mode change 100755 => 100644 rdf/konto.rdf.php
 mode change 100755 => 100644 rdf/ktu_abschlusszeugnis.rdf.php
 mode change 100755 => 100644 rdf/ktu_honorarvertrag.xml.php
 mode change 100755 => 100644 rdf/ktu_lvinfo.xml.php
 mode change 100755 => 100644 rdf/learningagreement.rdf.php
 mode change 100755 => 100644 rdf/learningagreement_outgoing.rdf.php
 mode change 100755 => 100644 rdf/lehrauftrag.xml.php
 mode change 100755 => 100644 rdf/lehrauftrag_annehmen.xml.php
 mode change 100755 => 100644 rdf/lehreinheit-lvplan.rdf.php
 mode change 100755 => 100644 rdf/lehreinheit.rdf.php
 mode change 100755 => 100644 rdf/lehreinheit_direkt.rdf.php
 mode change 100755 => 100644 rdf/lehreinheitgruppe.rdf.php
 mode change 100755 => 100644 rdf/lehreinheitmitarbeiter.rdf.php
 mode change 100755 => 100644 rdf/lehrfach.rdf.php
 mode change 100755 => 100644 rdf/lehrform.rdf.php
 mode change 100755 => 100644 rdf/lehrfunktion.rdf.php
 mode change 100755 => 100644 rdf/lehrstunde.rdf.php
 mode change 100755 => 100644 rdf/lehrveranstaltung.rdf.php
 mode change 100755 => 100644 rdf/lehrveranstaltung_einheiten.rdf.php
 mode change 100755 => 100644 rdf/lehrveranstaltung_studienplan.rdf.php
 mode change 100755 => 100644 rdf/lehrveranstaltungszeugnis.rdf.php
 mode change 100755 => 100644 rdf/lehrveranstaltungszeugnis_ktu.rdf.php
 mode change 100755 => 100644 rdf/lehrverbandsgruppe.rdf.php
 mode change 100755 => 100644 rdf/lektoren.rdf.php
 mode change 100755 => 100644 rdf/lvangebot.rdf.php
 mode change 100755 => 100644 rdf/lvgesamtnote.rdf.php
 mode change 100755 => 100644 rdf/lvinfo.rdf.php
 mode change 100755 => 100644 rdf/mantis.rdf.php
 mode change 100755 => 100644 rdf/mantis_categories.rdf.php
 mode change 100755 => 100644 rdf/mantis_projects.rdf.php
 mode change 100755 => 100644 rdf/messages.rdf.php
 mode change 100755 => 100644 rdf/mitarbeiter.rdf.php
 mode change 100755 => 100644 rdf/mobilitaet.rdf.php
 mode change 100755 => 100644 rdf/mobilitaetsprogramm.rdf.php
 mode change 100755 => 100644 rdf/mobilitaetstyp.rdf.php
 mode change 100755 => 100644 rdf/nation.rdf.php
 mode change 100755 => 100644 rdf/note.rdf.php
 mode change 100755 => 100644 rdf/notiz.rdf.php
 mode change 100755 => 100644 rdf/organisationseinheit.rdf.php
 mode change 100755 => 100644 rdf/organisationseinheit_menue.rdf.php
 mode change 100755 => 100644 rdf/ort.rdf.php
 mode change 100755 => 100644 rdf/orte.rdf.php
 mode change 100755 => 100644 rdf/person.rdf.php
 mode change 100755 => 100644 rdf/personal.rdf.php
 mode change 100755 => 100644 rdf/prestudent.rdf.php
 mode change 100755 => 100644 rdf/prestudenthistorie.rdf.php
 mode change 100755 => 100644 rdf/prestudentrolle.rdf.php
 mode change 100755 => 100644 rdf/projekt.rdf.php
 mode change 100755 => 100644 rdf/projektarbeit.rdf.php
 mode change 100755 => 100644 rdf/projektbeschreibung.rdf.php
 mode change 100755 => 100644 rdf/projektbetreuer.rdf.php
 mode change 100755 => 100644 rdf/projektphase.rdf.php
 mode change 100755 => 100644 rdf/projekttask.rdf.php
 mode change 100755 => 100644 rdf/projekttyp.rdf.php
 mode change 100755 => 100644 rdf/pruefung.rdf.php
 mode change 100755 => 100644 rdf/pruefungstyp.rdf.php
 mode change 100755 => 100644 rdf/raumtyp.rdf.php
 mode change 100755 => 100644 rdf/reihungstest.rdf.php
 mode change 100755 => 100644 rdf/ressource.rdf.php
 mode change 100755 => 100644 rdf/sammelzeugnis.rdf.php
 mode change 100755 => 100644 rdf/sprache.rdf.php
 mode change 100755 => 100644 rdf/standort.rdf.php
 mode change 100755 => 100644 rdf/status.rdf.php
 mode change 100755 => 100644 rdf/statusbericht.rdf.php
 mode change 100755 => 100644 rdf/statusgrund.rdf.php
 mode change 100755 => 100644 rdf/student.rdf.php
 mode change 100755 => 100644 rdf/studienblatt.xml.php
 mode change 100755 => 100644 rdf/studienerfolg.rdf.php
 mode change 100755 => 100644 rdf/studiengang.rdf.php
 mode change 100755 => 100644 rdf/studienordnung.rdf.php
 mode change 100755 => 100644 rdf/studienplan.rdf.php
 mode change 100755 => 100644 rdf/studiensemester.rdf.php
 mode change 100755 => 100644 rdf/stundenplan_betriebsmittel.rdf.php
 mode change 100755 => 100644 rdf/termine.rdf.php
 mode change 100755 => 100644 rdf/undo.rdf.php
 mode change 100755 => 100644 rdf/vertrag.rdf.php
 mode change 100755 => 100644 rdf/vertragdetails.rdf.php
 mode change 100755 => 100644 rdf/vertragsstatus.rdf.php
 mode change 100755 => 100644 rdf/vertragstyp.rdf.php
 mode change 100755 => 100644 rdf/verwendung.rdf.php
 mode change 100755 => 100644 rdf/vorlage.rdf.php
 mode change 100755 => 100644 rdf/wawi_buchung.rdf.php
 mode change 100755 => 100644 rdf/wawi_buchungstyp.rdf.php
 mode change 100755 => 100644 rdf/wawi_konto.rdf.php
 mode change 100755 => 100644 rdf/wawi_kostenstelle.rdf.php
 mode change 100755 => 100644 rdf/zertifikat.rdf.php
 mode change 100755 => 100644 rdf/zeugnis.rdf.php
 mode change 100755 => 100644 rdf/zeugnisnote.rdf.php
 mode change 100755 => 100644 rdf/zgv.rdf.php
 mode change 100755 => 100644 rdf/zgvdoktor.rdf.php
 mode change 100755 => 100644 rdf/zgvmaster.rdf.php
 mode change 100755 => 100644 rdf/zweck.rdf.php
 mode change 100755 => 100644 skin/cis.css
 mode change 100755 => 100644 skin/colorpicker.css
 mode change 100755 => 100644 skin/croppie.css
 mode change 100755 => 100644 skin/fas.css
 mode change 100755 => 100644 skin/fhcomplete.css
 mode change 100755 => 100644 skin/fhcomplete_website.css
 mode change 100755 => 100644 skin/flexcrollstyles.css
 mode change 100755 => 100644 skin/images/CIS.ico
 mode change 100755 => 100644 skin/images/Calculator.png
 mode change 100755 => 100644 skin/images/Chart.svg
 mode change 100755 => 100644 skin/images/DeleteIcon.png
 mode change 100755 => 100644 skin/images/ExcelIcon.png
 mode change 100755 => 100644 skin/images/FAS.ico
 mode change 100755 => 100644 skin/images/Filter.svg
 mode change 100755 => 100644 skin/images/Graphs_clip_art.svg
 mode change 100755 => 100644 skin/images/NeuDokument.png
 mode change 100755 => 100644 skin/images/Report.svg
 mode change 100755 => 100644 skin/images/Statistik.svg
 mode change 100755 => 100644 skin/images/TWLogo_klein.gif
 mode change 100755 => 100644 skin/images/TWLogo_klein.jpg
 mode change 100755 => 100644 skin/images/Tempus.ico
 mode change 100755 => 100644 skin/images/Vilesci.ico
 mode change 100755 => 100644 skin/images/Wawi.ico
 mode change 100755 => 100644 skin/images/addKonto.png
 mode change 100755 => 100644 skin/images/ampel_gelb.png
 mode change 100755 => 100644 skin/images/ampel_gruen.png
 mode change 100755 => 100644 skin/images/ampel_rot.png
 mode change 100755 => 100644 skin/images/anmelden.png
 mode change 100755 => 100644 skin/images/application_form_delete.png
 mode change 100755 => 100644 skin/images/application_form_edit.png
 mode change 100755 => 100644 skin/images/application_go.png
 mode change 100755 => 100644 skin/images/application_home.png
 mode change 100755 => 100644 skin/images/arbeitspaket.png
 mode change 100755 => 100644 skin/images/arrow-next.png
 mode change 100755 => 100644 skin/images/arrow-previous.png
 mode change 100755 => 100644 skin/images/arrow-single-down-green.png
 mode change 100755 => 100644 skin/images/arrow-single-up-green.png
 mode change 100755 => 100644 skin/images/arrow_down.png
 mode change 100755 => 100644 skin/images/asc.gif
 mode change 100755 => 100644 skin/images/bg.gif
 mode change 100755 => 100644 skin/images/bg_.gif
 mode change 100755 => 100644 skin/images/bg_sort.gif
 mode change 100755 => 100644 skin/images/blank.gif
 mode change 100755 => 100644 skin/images/bold.png
 mode change 100755 => 100644 skin/images/bullet_arrow_down.png
 mode change 100755 => 100644 skin/images/bullet_arrow_right.png
 mode change 100755 => 100644 skin/images/bullet_go.png
 mode change 100755 => 100644 skin/images/bullet_green.png
 mode change 100755 => 100644 skin/images/bullet_red.png
 mode change 100755 => 100644 skin/images/button_admin.png
 mode change 100755 => 100644 skin/images/button_download.png
 mode change 100755 => 100644 skin/images/button_endnote.png
 mode change 100755 => 100644 skin/images/button_esnack.png
 mode change 100755 => 100644 skin/images/button_feedback.png
 mode change 100755 => 100644 skin/images/button_kreuzerltool.png
 mode change 100755 => 100644 skin/images/button_listen.png
 mode change 100755 => 100644 skin/images/button_lvinfo.png
 mode change 100755 => 100644 skin/images/button_lvplan.png
 mode change 100755 => 100644 skin/images/button_mail.gif
 mode change 100755 => 100644 skin/images/button_moodle.png
 mode change 100755 => 100644 skin/images/button_newsgroups.png
 mode change 100755 => 100644 skin/images/button_opus.png
 mode change 100755 => 100644 skin/images/button_pinboard.png
 mode change 100755 => 100644 skin/images/button_semplan.png
 mode change 100755 => 100644 skin/images/button_studiupload.png
 mode change 100755 => 100644 skin/images/cbox-check.gif
 mode change 100755 => 100644 skin/images/changed.png
 mode change 100755 => 100644 skin/images/check_black.png
 mode change 100755 => 100644 skin/images/checkbox_toggle.png
 mode change 100755 => 100644 skin/images/checkbox_uncheck.png
 mode change 100755 => 100644 skin/images/cis_logo.png
 mode change 100755 => 100644 skin/images/cis_logo_400px.png
 mode change 100755 => 100644 skin/images/cis_logo_weiss.png
 mode change 100755 => 100644 skin/images/clock_down.png
 mode change 100755 => 100644 skin/images/clock_up.png
 mode change 100755 => 100644 skin/images/colorpicker/blank.gif
 mode change 100755 => 100644 skin/images/colorpicker/colorpicker_background.png
 mode change 100755 => 100644 skin/images/colorpicker/colorpicker_hex.png
 mode change 100755 => 100644 skin/images/colorpicker/colorpicker_hsb_b.png
 mode change 100755 => 100644 skin/images/colorpicker/colorpicker_hsb_h.png
 mode change 100755 => 100644 skin/images/colorpicker/colorpicker_hsb_s.png
 mode change 100755 => 100644 skin/images/colorpicker/colorpicker_indic.gif
 mode change 100755 => 100644 skin/images/colorpicker/colorpicker_overlay.png
 mode change 100755 => 100644 skin/images/colorpicker/colorpicker_rgb_b.png
 mode change 100755 => 100644 skin/images/colorpicker/colorpicker_rgb_g.png
 mode change 100755 => 100644 skin/images/colorpicker/colorpicker_rgb_r.png
 mode change 100755 => 100644 skin/images/colorpicker/colorpicker_select.gif
 mode change 100755 => 100644 skin/images/colorpicker/colorpicker_submit.png
 mode change 100755 => 100644 skin/images/colorpicker/custom_background.png
 mode change 100755 => 100644 skin/images/colorpicker/custom_hex.png
 mode change 100755 => 100644 skin/images/colorpicker/custom_hsb_b.png
 mode change 100755 => 100644 skin/images/colorpicker/custom_hsb_h.png
 mode change 100755 => 100644 skin/images/colorpicker/custom_hsb_s.png
 mode change 100755 => 100644 skin/images/colorpicker/custom_indic.gif
 mode change 100755 => 100644 skin/images/colorpicker/custom_rgb_b.png
 mode change 100755 => 100644 skin/images/colorpicker/custom_rgb_g.png
 mode change 100755 => 100644 skin/images/colorpicker/custom_rgb_r.png
 mode change 100755 => 100644 skin/images/colorpicker/custom_submit.png
 mode change 100755 => 100644 skin/images/colorpicker/select.png
 mode change 100755 => 100644 skin/images/colorpicker/select2.png
 mode change 100755 => 100644 skin/images/colorpicker/slider.png
 mode change 100755 => 100644 skin/images/copy.png
 mode change 100755 => 100644 skin/images/cross.png
 mode change 100755 => 100644 skin/images/csv.ico
 mode change 100755 => 100644 skin/images/csv.png
 mode change 100755 => 100644 skin/images/csv_light.png
 mode change 100755 => 100644 skin/images/date_add.png
 mode change 100755 => 100644 skin/images/date_delete.png
 mode change 100755 => 100644 skin/images/date_edit.png
 mode change 100755 => 100644 skin/images/date_go.png
 mode change 100755 => 100644 skin/images/date_go_grau.png
 mode change 100755 => 100644 skin/images/date_magnify.png
 mode change 100755 => 100644 skin/images/delete.gif
 mode change 100755 => 100644 skin/images/delete.png
 mode change 100755 => 100644 skin/images/delete_round.png
 mode change 100755 => 100644 skin/images/delete_x.png
 mode change 100755 => 100644 skin/images/delete_x_grau.png
 mode change 100755 => 100644 skin/images/desc.gif
 mode change 100755 => 100644 skin/images/doc_icon.png
 mode change 100755 => 100644 skin/images/doppelampel_gelb.gif
 mode change 100755 => 100644 skin/images/doppelampel_grau.gif
 mode change 100755 => 100644 skin/images/doppelampel_rot.gif
 mode change 100755 => 100644 skin/images/doppelampel_rot_gelb.gif
 mode change 100755 => 100644 skin/images/down.png
 mode change 100755 => 100644 skin/images/down_lvplan.png
 mode change 100755 => 100644 skin/images/drucken.png
 mode change 100755 => 100644 skin/images/edit-paste.png
 mode change 100755 => 100644 skin/images/edit.png
 mode change 100755 => 100644 skin/images/edit_grau.png
 mode change 100755 => 100644 skin/images/edit_wawi.gif
 mode change 100755 => 100644 skin/images/email.png
 mode change 100755 => 100644 skin/images/entitlement-pot.png
 mode change 100755 => 100644 skin/images/entry.gif
 mode change 100755 => 100644 skin/images/eps-logo_full.gif
 mode change 100755 => 100644 skin/images/excel.gif
 mode change 100755 => 100644 skin/images/exclamation.png
 mode change 100755 => 100644 skin/images/eye.png
 mode change 100755 => 100644 skin/images/false.png
 mode change 100755 => 100644 skin/images/fh-complete_weiss.png
 mode change 100755 => 100644 skin/images/fh_complete_logo.png
 mode change 100755 => 100644 skin/images/fh_complete_logo_400x61.png
 mode change 100755 => 100644 skin/images/fh_logo.png
 mode change 100755 => 100644 skin/images/fh_technikum_wien_illustration_klein.png
 mode change 100755 => 100644 skin/images/fhcomplete.png
 mode change 100755 => 100644 skin/images/fhtw_logo.png
 mode change 100755 => 100644 skin/images/file.gif
 mode change 100755 => 100644 skin/images/flag-green.png
 mode change 100755 => 100644 skin/images/flag-red.png
 mode change 100755 => 100644 skin/images/flag-yellow.png
 mode change 100755 => 100644 skin/images/folder.gif
 mode change 100755 => 100644 skin/images/folderup.gif
 mode change 100755 => 100644 skin/images/green_point.gif
 mode change 100755 => 100644 skin/images/group.png
 mode change 100755 => 100644 skin/images/haken.gif
 mode change 100755 => 100644 skin/images/header_line.gif
 mode change 100755 => 100644 skin/images/header_testtool.png
 mode change 100755 => 100644 skin/images/help.png
 mode change 100755 => 100644 skin/images/html.png
 mode change 100755 => 100644 skin/images/html_light.png
 mode change 100755 => 100644 skin/images/ical1.0.png
 mode change 100755 => 100644 skin/images/ical1.0_light.png
 mode change 100755 => 100644 skin/images/ical2.0.png
 mode change 100755 => 100644 skin/images/ical2.0_light.png
 mode change 100755 => 100644 skin/images/img_icon.png
 mode change 100755 => 100644 skin/images/index.php
 mode change 100755 => 100644 skin/images/indicator.gif
 mode change 100755 => 100644 skin/images/info.png
 mode change 100755 => 100644 skin/images/information.png
 mode change 100755 => 100644 skin/images/invisible.png
 mode change 100755 => 100644 skin/images/italic.png
 mode change 100755 => 100644 skin/images/ja.png
 mode change 100755 => 100644 skin/images/justifycenter.png
 mode change 100755 => 100644 skin/images/justifyleft.png
 mode change 100755 => 100644 skin/images/justifyright.png
 mode change 100755 => 100644 skin/images/left.gif
 mode change 100755 => 100644 skin/images/left.png
 mode change 100755 => 100644 skin/images/left_lvplan.png
 mode change 100755 => 100644 skin/images/lehrtyp_.png
 mode change 100755 => 100644 skin/images/lehrtyp_2.png
 mode change 100755 => 100644 skin/images/lehrtyp_lf.png
 mode change 100755 => 100644 skin/images/lehrtyp_lv.png
 mode change 100755 => 100644 skin/images/lehrtyp_modul.png
 mode change 100755 => 100644 skin/images/list-add.png
 mode change 100755 => 100644 skin/images/liste.gif
 mode change 100755 => 100644 skin/images/lock.png
 mode change 100755 => 100644 skin/images/login.gif
 mode change 100755 => 100644 skin/images/logo.jpg
 mode change 100755 => 100644 skin/images/logo.png
 mode change 100755 => 100644 skin/images/logo_gmbh.jpg
 mode change 100755 => 100644 skin/images/lv.png
 mode change 100755 => 100644 skin/images/lvaMulti.png
 mode change 100755 => 100644 skin/images/lvaMultiDel.png
 mode change 100755 => 100644 skin/images/lvaSingle.png
 mode change 100755 => 100644 skin/images/lvaSingleDel.png
 mode change 100755 => 100644 skin/images/lvplan.png
 mode change 100755 => 100644 skin/images/map.png
 mode change 100755 => 100644 skin/images/markdown_button.png
 mode change 100755 => 100644 skin/images/menu_item.gif
 mode change 100755 => 100644 skin/images/menue.png
 mode change 100755 => 100644 skin/images/menue_hover.png
 mode change 100755 => 100644 skin/images/merge.png
 mode change 100755 => 100644 skin/images/milestone.png
 mode change 100755 => 100644 skin/images/modul.png
 mode change 100755 => 100644 skin/images/moreleft.png
 mode change 100755 => 100644 skin/images/moreleft_lvplan.png
 mode change 100755 => 100644 skin/images/moremoreleft.png
 mode change 100755 => 100644 skin/images/moremoreright.png
 mode change 100755 => 100644 skin/images/moreright.png
 mode change 100755 => 100644 skin/images/moreright_lvplan.png
 mode change 100755 => 100644 skin/images/nachgereicht.png
 mode change 100755 => 100644 skin/images/not-available.png
 mode change 100755 => 100644 skin/images/offen.png
 mode change 100755 => 100644 skin/images/ok.png
 mode change 100755 => 100644 skin/images/open.gif
 mode change 100755 => 100644 skin/images/openoffice0.jpg
 mode change 100755 => 100644 skin/images/organisationseinheit.png
 mode change 100755 => 100644 skin/images/outlook.ico
 mode change 100755 => 100644 skin/images/outlook.png
 mode change 100755 => 100644 skin/images/outlook_light.png
 mode change 100755 => 100644 skin/images/p.gif
 mode change 100755 => 100644 skin/images/page_go.png
 mode change 100755 => 100644 skin/images/page_green.png
 mode change 100755 => 100644 skin/images/pdf.ico
 mode change 100755 => 100644 skin/images/pdf_icon.png
 mode change 100755 => 100644 skin/images/pdfpic.gif
 mode change 100755 => 100644 skin/images/pencil.png
 mode change 100755 => 100644 skin/images/person.gif
 mode change 100755 => 100644 skin/images/photoupload.png
 mode change 100755 => 100644 skin/images/planner.ico
 mode change 100755 => 100644 skin/images/planner.png
 mode change 100755 => 100644 skin/images/planner_logo.png
 mode change 100755 => 100644 skin/images/planner_logo_weiss.png
 mode change 100755 => 100644 skin/images/plus.png
 mode change 100755 => 100644 skin/images/ppt_icon.png
 mode change 100755 => 100644 skin/images/preferences-system.png
 mode change 100755 => 100644 skin/images/printer.png
 mode change 100755 => 100644 skin/images/profilbild_dummy.jpg
 mode change 100755 => 100644 skin/images/projekt.png
 mode change 100755 => 100644 skin/images/projektphase.png
 mode change 100755 => 100644 skin/images/question.png
 mode change 100755 => 100644 skin/images/red_point.gif
 mode change 100755 => 100644 skin/images/refresh.png
 mode change 100755 => 100644 skin/images/repeat.png
 mode change 100755 => 100644 skin/images/right.gif
 mode change 100755 => 100644 skin/images/right.png
 mode change 100755 => 100644 skin/images/right_lvplan.png
 mode change 100755 => 100644 skin/images/round.png
 mode change 100755 => 100644 skin/images/sancho/sancho_footer.jpg
 mode change 100755 => 100644 skin/images/sancho/sancho_footer_DEFAULT.jpg
 mode change 100755 => 100644 skin/images/sancho/sancho_footer_DEFAULT_bw.jpg
 mode change 100755 => 100644 skin/images/sancho/sancho_footer_min_bw.jpg
 mode change 100755 => 100644 skin/images/sancho/sancho_footer_min_bw.xcf
 mode change 100755 => 100644 skin/images/sancho/sancho_header_DEFAULT.jpg
 mode change 100755 => 100644 skin/images/sancho/sancho_header_DEFAULT_bw.jpg
 mode change 100755 => 100644 skin/images/sancho/sancho_header_TEMPLATE.xcf
 mode change 100755 => 100644 skin/images/sancho/sancho_header_ampel_overdue.jpg
 mode change 100755 => 100644 skin/images/sancho/sancho_header_confirm_timesheet.jpg
 mode change 100755 => 100644 skin/images/sancho/sancho_header_du_hast_neue_nachrichten.jpg
 mode change 100755 => 100644 skin/images/sancho/sancho_header_du_hast_verpflichtende_ampeln.jpg
 mode change 100755 => 100644 skin/images/sancho/sancho_header_min_bw.jpg
 mode change 100755 => 100644 skin/images/sancho/sancho_header_neue_nachrichten_in_ampelsystem.jpg
 mode change 100755 => 100644 skin/images/sancho/sancho_roboter.jpg
 mode change 100755 => 100644 skin/images/sancho/sancho_roboter_freigestellt.png
 mode change 100755 => 100644 skin/images/sancho_round_right_blue.png
 mode change 100755 => 100644 skin/images/sancho_round_right_grey.png
 mode change 100755 => 100644 skin/images/sancho_round_right_red.png
 mode change 100755 => 100644 skin/images/scrollbar_left_right.png
 mode change 100755 => 100644 skin/images/scrollbar_up_down.png
 mode change 100755 => 100644 skin/images/scrollbase_bottom.png
 mode change 100755 => 100644 skin/images/scrollbase_left.png
 mode change 100755 => 100644 skin/images/scrollbase_right.png
 mode change 100755 => 100644 skin/images/scrollbase_top.png
 mode change 100755 => 100644 skin/images/search.png
 mode change 100755 => 100644 skin/images/seperator.gif
 mode change 100755 => 100644 skin/images/service.png
 mode change 100755 => 100644 skin/images/spinner.gif
 mode change 100755 => 100644 skin/images/split-arrows.png
 mode change 100755 => 100644 skin/images/square_blue.png
 mode change 100755 => 100644 skin/images/statistic.png
 mode change 100755 => 100644 skin/images/sticky.png
 mode change 100755 => 100644 skin/images/system-index-search.png
 mode change 100755 => 100644 skin/images/tempus_logo.png
 mode change 100755 => 100644 skin/images/tempus_logo_weiss.png
 mode change 100755 => 100644 skin/images/testtool_button.png
 mode change 100755 => 100644 skin/images/testtool_button_hover.png
 mode change 100755 => 100644 skin/images/testtool_buttonleft.png
 mode change 100755 => 100644 skin/images/testtool_buttonright.png
 mode change 100755 => 100644 skin/images/text-x-generic_with_pencil.png
 mode change 100755 => 100644 skin/images/tick.png
 mode change 100755 => 100644 skin/images/timetable.png
 mode change 100755 => 100644 skin/images/transmit.png
 mode change 100755 => 100644 skin/images/tree-diagramm.png
 mode change 100755 => 100644 skin/images/true.png
 mode change 100755 => 100644 skin/images/tw_logo_02.jpg
 mode change 100755 => 100644 skin/images/ui-bg_diagonals-thick_18_b81900_40x40.png
 mode change 100755 => 100644 skin/images/ui-bg_diagonals-thick_20_666666_40x40.png
 mode change 100755 => 100644 skin/images/ui-bg_flat_0_aaaaaa_40x100.png
 mode change 100755 => 100644 skin/images/ui-bg_flat_10_000000_40x100.png
 mode change 100755 => 100644 skin/images/ui-bg_flat_75_ffffff_40x100.png
 mode change 100755 => 100644 skin/images/ui-bg_glass_100_f6f6f6_1x400.png
 mode change 100755 => 100644 skin/images/ui-bg_glass_100_fdf5ce_1x400.png
 mode change 100755 => 100644 skin/images/ui-bg_glass_55_fbf9ee_1x400.png
 mode change 100755 => 100644 skin/images/ui-bg_glass_65_ffffff_1x400.png
 mode change 100755 => 100644 skin/images/ui-bg_glass_75_dadada_1x400.png
 mode change 100755 => 100644 skin/images/ui-bg_glass_75_e6e6e6_1x400.png
 mode change 100755 => 100644 skin/images/ui-bg_glass_95_fef1ec_1x400.png
 mode change 100755 => 100644 skin/images/ui-bg_gloss-wave_35_f6a828_500x100.png
 mode change 100755 => 100644 skin/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
 mode change 100755 => 100644 skin/images/ui-bg_highlight-soft_75_cccccc_1x100.png
 mode change 100755 => 100644 skin/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
 mode change 100755 => 100644 skin/images/ui-icons_222222_256x240.png
 mode change 100755 => 100644 skin/images/ui-icons_228ef1_256x240.png
 mode change 100755 => 100644 skin/images/ui-icons_2e83ff_256x240.png
 mode change 100755 => 100644 skin/images/ui-icons_454545_256x240.png
 mode change 100755 => 100644 skin/images/ui-icons_888888_256x240.png
 mode change 100755 => 100644 skin/images/ui-icons_cd0a0a_256x240.png
 mode change 100755 => 100644 skin/images/ui-icons_ef8c08_256x240.png
 mode change 100755 => 100644 skin/images/ui-icons_ffd27a_256x240.png
 mode change 100755 => 100644 skin/images/ui-icons_ffffff_256x240.png
 mode change 100755 => 100644 skin/images/underline.png
 mode change 100755 => 100644 skin/images/up.png
 mode change 100755 => 100644 skin/images/upload.png
 mode change 100755 => 100644 skin/images/user_down.png
 mode change 100755 => 100644 skin/images/user_up.png
 mode change 100755 => 100644 skin/images/verplant_false.png
 mode change 100755 => 100644 skin/images/verplant_true.png
 mode change 100755 => 100644 skin/images/vilesci_addons.png
 mode change 100755 => 100644 skin/images/vilesci_admin.png
 mode change 100755 => 100644 skin/images/vilesci_farbverlauf.png
 mode change 100755 => 100644 skin/images/vilesci_farbverlauf_top.png
 mode change 100755 => 100644 skin/images/vilesci_inventar.png
 mode change 100755 => 100644 skin/images/vilesci_lehre.png
 mode change 100755 => 100644 skin/images/vilesci_logo.png
 mode change 100755 => 100644 skin/images/vilesci_logo_weiss.png
 mode change 100755 => 100644 skin/images/vilesci_lvplan.png
 mode change 100755 => 100644 skin/images/vilesci_personen.png
 mode change 100755 => 100644 skin/images/vilesci_stammdaten.png
 mode change 100755 => 100644 skin/images/vilesci_statistik.png
 mode change 100755 => 100644 skin/images/vilesci_wartung.png
 mode change 100755 => 100644 skin/images/wawi_logo.png
 mode change 100755 => 100644 skin/images/wawi_logo_sz.png
 mode change 100755 => 100644 skin/images/wawi_logo_weiss.png
 mode change 100755 => 100644 skin/images/x-office-presentation.svg
 mode change 100755 => 100644 skin/images/x-office-spreadsheet.svg
 mode change 100755 => 100644 skin/images/xls.png
 mode change 100755 => 100644 skin/images/xls_icon.png
 mode change 100755 => 100644 skin/images/xls_light.png
 mode change 100755 => 100644 skin/images/zip_icon.png
 mode change 100755 => 100644 skin/infoscreen.css
 mode change 100755 => 100644 skin/jquery-ui-1.9.2.custom.min.css
 mode change 100755 => 100644 skin/jquery.css
 mode change 100755 => 100644 skin/planner.css
 mode change 100755 => 100644 skin/print.css
 mode change 100755 => 100644 skin/simplecropper.css
 mode change 100755 => 100644 skin/sounds/inventar_error.ogg
 mode change 100755 => 100644 skin/sounds/testtool_demo.mp3
 mode change 100755 => 100644 skin/sounds/testtool_demo.ogg
 mode change 100755 => 100644 skin/style.css.php
 mode change 100755 => 100644 skin/styles/default/cis_logo_text_400x78.png
 mode change 100755 => 100644 skin/styles/default/header.png
 mode change 100755 => 100644 skin/styles/default/logo_250x130.png
 mode change 100755 => 100644 skin/styles/example.css
 mode change 100755 => 100644 skin/styles/example/description.txt
 mode change 100755 => 100644 skin/styles/example/line.jpg
 mode change 100755 => 100644 skin/styles/example/logo.jpg
 mode change 100755 => 100644 skin/styles/example/pixel.jpg
 mode change 100755 => 100644 skin/styles/example/screenshot.jpg
 mode change 100755 => 100644 skin/styles/fhb/description.txt
 mode change 100755 => 100644 skin/styles/fhb/logo.png
 mode change 100755 => 100644 skin/styles/fhb/logo_klein.jpg
 mode change 100755 => 100644 skin/styles/jquery.css
 mode change 100755 => 100644 skin/styles/mobile.css
 mode change 100755 => 100644 skin/styles/mobile/TWLogo_klein.jpg
 mode change 100755 => 100644 skin/styles/mobile/description.txt
 mode change 100755 => 100644 skin/styles/mobile/header_line.jpg
 mode change 100755 => 100644 skin/styles/mobile/screenshot.jpg
 mode change 100755 => 100644 skin/styles/stp.css
 mode change 100755 => 100644 skin/styles/stp/BannerLogo.jpg
 mode change 100755 => 100644 skin/styles/stp/KTULogo.jpg
 mode change 100755 => 100644 skin/styles/stp/KTULogo.png
 mode change 100755 => 100644 skin/styles/stp/abschlusspraesentation.jpg
 mode change 100755 => 100644 skin/styles/stp/absolventen.jpg
 mode change 100755 => 100644 skin/styles/stp/international_week.jpg
 mode change 100755 => 100644 skin/styles/stp/logo.jpg
 mode change 100755 => 100644 skin/styles/stp/logo.png
 mode change 100755 => 100644 skin/styles/stp/pitching.jpg
 mode change 100755 => 100644 skin/styles/stp/projektidee.jpg
 mode change 100755 => 100644 skin/styles/tinymce.css
 mode change 100755 => 100644 skin/styles/tw.css
 mode change 100755 => 100644 skin/styles/tw/TWLogo_klein.jpg
 mode change 100755 => 100644 skin/styles/tw/academy.jpg
 mode change 100755 => 100644 skin/styles/tw/cis_logo_text_400x78.png
 mode change 100755 => 100644 skin/styles/tw/description.txt
 mode change 100755 => 100644 skin/styles/tw/header.png
 mode change 100755 => 100644 skin/styles/tw/header_line.jpg
 mode change 100755 => 100644 skin/styles/tw/lageplan.jpg
 mode change 100755 => 100644 skin/styles/tw/logo.jpg
 mode change 100755 => 100644 skin/styles/tw/logo.png
 mode change 100755 => 100644 skin/styles/tw/logo_200x400.png
 mode change 100755 => 100644 skin/styles/tw/logo_250x130.png
 mode change 100755 => 100644 skin/styles/tw/logo_50x25.png
 mode change 100755 => 100644 skin/styles/tw/logo_academy.png
 mode change 100755 => 100644 skin/styles/tw/logo_klein.png
 mode change 100755 => 100644 skin/styles/tw/logo_ws_50x25.png
 mode change 100755 => 100644 skin/styles/tw/screenshot.jpg
 mode change 100755 => 100644 skin/styles/twgreen.css
 mode change 100755 => 100644 skin/styles/twgreen/description.txt
 mode change 100755 => 100644 skin/styles/twgreen/menu.jpg
 mode change 100755 => 100644 skin/styles/twgreen/screenshot.jpg
 mode change 100755 => 100644 skin/styles/twgreen/tw_gr_header.jpg
 mode change 100755 => 100644 skin/styles/twgreen/tw_gr_logo.jpg
 mode change 100755 => 100644 skin/tablesort.css
 mode change 100755 => 100644 skin/tempus.css
 mode change 100755 => 100644 skin/vilesci.css
 mode change 100755 => 100644 skin/wawi.css
 mode change 100755 => 100644 skin/widgets.css
 mode change 100755 => 100644 soap/datenverbund_client.php
 mode change 100755 => 100644 soap/fhcomplete.php
 mode change 100755 => 100644 soap/index.html
 mode change 100755 => 100644 soap/kartenverlaengerung.soap.php
 mode change 100755 => 100644 soap/kartenverlaengerung.test.php
 mode change 100755 => 100644 soap/kartenverlaengerung.wsdl.php
 mode change 100755 => 100644 soap/lehrveranstaltung.json.php
 mode change 100755 => 100644 soap/lehrveranstaltung.soap.php
 mode change 100755 => 100644 soap/lehrveranstaltung.wsdl.php
 mode change 100755 => 100644 soap/lvplan.soap.php
 mode change 100755 => 100644 soap/lvplan.wsdl.php
 mode change 100755 => 100644 soap/mitarbeiter.soap.php
 mode change 100755 => 100644 soap/mitarbeiter.wsdl.php
 mode change 100755 => 100644 soap/notiz.soap.php
 mode change 100755 => 100644 soap/notiz.wsdl.php
 mode change 100755 => 100644 soap/ort.soap.php
 mode change 100755 => 100644 soap/ort.wsdl.php
 mode change 100755 => 100644 soap/person.soap.php
 mode change 100755 => 100644 soap/person.wsdl.php
 mode change 100755 => 100644 soap/projekt.soap.php
 mode change 100755 => 100644 soap/projekt.wsdl.php
 mode change 100755 => 100644 soap/projekt_jquery_client.php
 mode change 100755 => 100644 soap/projektphase.soap.php
 mode change 100755 => 100644 soap/projektphase.wsdl.php
 mode change 100755 => 100644 soap/projekttask.soap.php
 mode change 100755 => 100644 soap/projekttask.wsdl.php
 mode change 100755 => 100644 soap/ressource.soap.php
 mode change 100755 => 100644 soap/ressource.wsdl.php
 mode change 100755 => 100644 soap/ressource_projekt.soap.php
 mode change 100755 => 100644 soap/ressource_projekt.wsdl.php
 mode change 100755 => 100644 soap/semesterticket.soap.php
 mode change 100755 => 100644 soap/semesterticket.wsdl.php
 mode change 100755 => 100644 soap/semesterticket_client.php
 mode change 100755 => 100644 soap/soap_test_lv.php
 mode change 100755 => 100644 soap/soap_test_lvplan.php
 mode change 100755 => 100644 soap/soap_test_mitarbeiter.php
 mode change 100755 => 100644 soap/soap_test_ort.php
 mode change 100755 => 100644 soap/soap_test_person.php
 mode change 100755 => 100644 soap/soap_test_student.php
 mode change 100755 => 100644 soap/stip.class.php
 mode change 100755 => 100644 soap/stip.soap.php
 mode change 100755 => 100644 soap/stip.wsdl.php
 mode change 100755 => 100644 soap/stip_client.php
 mode change 100755 => 100644 soap/stip_client_error.php
 mode change 100755 => 100644 soap/student.soap.php
 mode change 100755 => 100644 soap/student.wsdl.php
 mode change 100755 => 100644 soap/studienordnung.json.php
 mode change 100755 => 100644 soap/studienplan.json.php
 mode change 100755 => 100644 soap/test.soap.php
 mode change 100755 => 100644 soap/test.wsdl.php
 mode change 100755 => 100644 soap/test_client.php
 mode change 100755 => 100644 system/.htaccess_exmpl
 mode change 100755 => 100644 system/FH-Complete.txp
 mode change 100755 => 100644 system/FHComplete-3.3.sql
 mode change 100755 => 100644 system/FHCompleteTDM3PG83.xsl
 mode change 100755 => 100644 system/UnitTests/AppdatenTest.php
 mode change 100755 => 100644 system/UnitTests/FunctionsTest.php
 mode change 100755 => 100644 system/UnitTests/Studienordnung2Test.php
 mode change 100755 => 100644 system/UnitTests/StudienordnungTest.php
 mode change 100755 => 100644 system/UnitTests/StudienplanTest.php
 mode change 100755 => 100644 system/UnitTests/StudienplatzTest.php
 mode change 100755 => 100644 system/UnitTests/addons/studienplatzverwaltung/AqaClientTest.php
 mode change 100755 => 100644 system/UnitTests/addons/studienplatzverwaltung/AqaFoebisPersonTest.php
 mode change 100755 => 100644 system/UnitTests/addons/studienplatzverwaltung/AqaFoebisStgTest.php
 mode change 100755 => 100644 system/UnitTests/addons/studienplatzverwaltung/FunctionsTest.php
 mode change 100755 => 100644 system/UnitTests/addons/studienplatzverwaltung/StudienplatzverwaltungAPITest.php
 mode change 100755 => 100644 system/UnitTests/addons/studienplatzverwaltung/testfile.xml
 mode change 100755 => 100644 system/UnitTests/ut_studienordnung.php
 mode change 100755 => 100644 system/ampel_erinnerungsmail.php
 mode change 100755 => 100644 system/checkStudenten.php
 mode change 100755 => 100644 system/check_neue_lektoren.php
 mode change 100755 => 100644 system/check_studentlehrverband.php
 mode change 100755 => 100644 system/checkroles.php
 mode change 100755 => 100644 system/checksystem.php
 mode change 100755 => 100644 system/dbupdate_3.0.php
 mode change 100755 => 100644 system/dbupdate_3.1.php
 mode change 100755 => 100644 system/dbupdate_3.2.php
 mode change 100755 => 100644 system/dbupdate_3.2/migrate_reihungstest.php
 mode change 100755 => 100644 system/dbupdate_3.3.php
 mode change 100755 => 100644 system/dbupdate_3.4.php
 mode change 100755 => 100644 system/dbupdate_3.4/10001_tempus_mitarbeiter_kurzbz_bei_reservierungen_anzeigen.php
 mode change 100755 => 100644 system/dbupdate_3.4/17512_fehlercode_constraints.php
 mode change 100755 => 100644 system/dbupdate_3.4/19154_beurteilungsformulare_pruefungssenat.php
 mode change 100755 => 100644 system/dbupdate_3.4/24682_reihungstest_zugangscode_fuer_login.php
 mode change 100755 => 100644 system/dbupdate_3.4/24913_tabelle_raumtyp_neues_attribut_aktiv.php
 mode change 100755 => 100644 system/dbupdate_3.4/25003_notenimport_nachpruefung.php
 mode change 100755 => 100644 system/dbupdate_3.4/25999_C4_Menu.php
 mode change 100755 => 100644 system/dbupdate_3.4/25999_C4_ma0594.php
 mode change 100755 => 100644 system/dbupdate_3.4/25999_cis4_cms.php
 mode change 100755 => 100644 system/dbupdate_3.4/26173_index_webservicelog.php
 mode change 100755 => 100644 system/dbupdate_3.4/27107_vilesci_erfassung_abwesenheiten_reinigung.php
 mode change 100755 => 100644 system/dbupdate_3.4/27351_digitalisierung_formulare.php
 mode change 100755 => 100644 system/dbupdate_3.4/27388_anrechnungen_zeitfenster_pflegen.php
 mode change 100755 => 100644 system/dbupdate_3.4/27949_infocenter_zurueckstellen_mit_grund.php
 mode change 100755 => 100644 system/dbupdate_3.4/28089_plausichecks_in_extension_hinzufuegen.php
 mode change 100755 => 100644 system/dbupdate_3.4/29133_einzelne_studiengaenge_aus_issuechecks_ausnehmen.php
 mode change 100755 => 100644 system/dbupdate_3.4/29529_infocenter_anpassungen.php
 mode change 100755 => 100644 system/dbupdate_3.4/29835_uhstat1_erfassung_der_uhstat1_daten_ueber_das_bewerbungstool.php
 mode change 100755 => 100644 system/dbupdate_3.4/30181_tabelle_anrechnung_neue_attribute_fuer_begruendung.php
 mode change 100755 => 100644 system/dbupdate_3.4/30537_anmerkung_in_tbl_rolleberechtigung.php
 mode change 100755 => 100644 system/dbupdate_3.4/33714_erhoehter_studienbeitrag_fuer_drittsaatenangehoerig.php
 mode change 100755 => 100644 system/dbupdate_3.4/dbupdate_dashboard.php
 mode change 100755 => 100644 system/dbupdate_3.4/example.php
 mode change 100755 => 100644 system/environment.php
 mode change 100755 => 100644 system/erinnerungsmail_coodle.php
 mode change 100755 => 100644 system/erinnerungsmail_sek_lehrauftrag.php
 mode change 100755 => 100644 system/erinnerungsmail_sek_preinteressent.php
 mode change 100755 => 100644 system/fehlerupdate.php
 mode change 100755 => 100644 system/filtersupdate.php
 mode change 100755 => 100644 system/generate_missing_sto.php
 mode change 100755 => 100644 system/generatestudienordnung.php
 mode change 100755 => 100644 system/konsistenzpruefung.php
 mode change 100755 => 100644 system/matrikelnummer_clearing_download.php
 mode change 100755 => 100644 system/matrikelnummer_clearing_import.php
 mode change 100755 => 100644 system/phpinfo.php
 mode change 100755 => 100644 system/prestudentstatus_studienplan_id.php
 mode change 100755 => 100644 system/pruefung_bestaetigen.php
 mode change 100755 => 100644 system/services/systemd/phantomjs@.service
 mode change 100755 => 100644 system/services/systemd/unoconv@.service
 mode change 100755 => 100644 system/services/upstart/unoconv.conf
 mode change 100755 => 100644 system/sync/sync_stpldev_stpl.php
 mode change 100755 => 100644 system/system_check_sql.php
 mode change 100755 => 100644 system/templates/contentmittitel.xsd
 mode change 100755 => 100644 system/templates/contentmittitel_filterwidget_xslt_xhtml.xslt
 mode change 100755 => 100644 system/templates/contentmittitel_xslt_xhtml.xslt
 mode change 100755 => 100644 system/templates/contentohnetitel.xsd
 mode change 100755 => 100644 system/templates/contentohnetitel_xslt_xhtml.xslt
 mode change 100755 => 100644 system/templates/include.xsd
 mode change 100755 => 100644 system/templates/include_xslt_xhtml.xslt
 mode change 100755 => 100644 system/templates/news.xsd
 mode change 100755 => 100644 system/templates/news_infoscreen.xsd
 mode change 100755 => 100644 system/templates/news_infoscreen_xslt_xhtml.xslt
 mode change 100755 => 100644 system/templates/news_xslt_xhtml.xslt
 mode change 100755 => 100644 system/templates/redirect.xsd
 mode change 100755 => 100644 system/templates/redirect_xslt_xhtml.xslt
 mode change 100755 => 100644 system/vorlage_zip/AccountInfo.odt
 mode change 100755 => 100644 system/vorlage_zip/AntragAbmeldung.odt
 mode change 100755 => 100644 system/vorlage_zip/AntragAbmeldungStgl.odt
 mode change 100755 => 100644 system/vorlage_zip/AntragUnterbrechung.odt
 mode change 100755 => 100644 system/vorlage_zip/AnwListBarcode.odt
 mode change 100755 => 100644 system/vorlage_zip/Anwesenheitslist.odt
 mode change 100755 => 100644 system/vorlage_zip/AusbVerEng.odt
 mode change 100755 => 100644 system/vorlage_zip/Ausbildungsver.odt
 mode change 100755 => 100644 system/vorlage_zip/Bakkurkunde.odt
 mode change 100755 => 100644 system/vorlage_zip/BakkurkundeEng.odt
 mode change 100755 => 100644 system/vorlage_zip/Bakkzeugnis.odt
 mode change 100755 => 100644 system/vorlage_zip/BakkzeugnisEng.odt
 mode change 100755 => 100644 system/vorlage_zip/Bescheid.odt
 mode change 100755 => 100644 system/vorlage_zip/BescheidEng.odt
 mode change 100755 => 100644 system/vorlage_zip/Bestellung.odt
 mode change 100755 => 100644 system/vorlage_zip/Bewerberakt.odt
 mode change 100755 => 100644 system/vorlage_zip/DiplSupplement.odt
 mode change 100755 => 100644 system/vorlage_zip/DiplSupplementDebug.odt
 mode change 100755 => 100644 system/vorlage_zip/Diplomurkunde.odt
 mode change 100755 => 100644 system/vorlage_zip/DiplomurkundeEng.odt
 mode change 100755 => 100644 system/vorlage_zip/Diplomzeugnis.odt
 mode change 100755 => 100644 system/vorlage_zip/DiplomzeugnisEng.odt
 mode change 100755 => 100644 system/vorlage_zip/Erfolgsnachweis.odt
 mode change 100755 => 100644 system/vorlage_zip/FHB_Ausbildungsver.odt
 mode change 100755 => 100644 system/vorlage_zip/FHB_PrProtBA.odt
 mode change 100755 => 100644 system/vorlage_zip/FHB_PrProtMA.odt
 mode change 100755 => 100644 system/vorlage_zip/Inskription.odt
 mode change 100755 => 100644 system/vorlage_zip/InskriptionEng.odt
 mode change 100755 => 100644 system/vorlage_zip/KTU_Studienblatt.odt
 mode change 100755 => 100644 system/vorlage_zip/LVZeugnis.odt
 mode change 100755 => 100644 system/vorlage_zip/LVZeugnisEng.odt
 mode change 100755 => 100644 system/vorlage_zip/Lehrauftrag.odt
 mode change 100755 => 100644 system/vorlage_zip/Lehrtaetigkeit.odt
 mode change 100755 => 100644 system/vorlage_zip/PrProtBA.odt
 mode change 100755 => 100644 system/vorlage_zip/PrProtBAEng.odt
 mode change 100755 => 100644 system/vorlage_zip/PrProtMA.odt
 mode change 100755 => 100644 system/vorlage_zip/PrProtMAEng.odt
 mode change 100755 => 100644 system/vorlage_zip/PrProtMAEng_alt.odt
 mode change 100755 => 100644 system/vorlage_zip/PrProtMA_alt.odt
 mode change 100755 => 100644 system/vorlage_zip/Projektbeschr.odt
 mode change 100755 => 100644 system/vorlage_zip/Studienblatt.odt
 mode change 100755 => 100644 system/vorlage_zip/StudienblattEng.odt
 mode change 100755 => 100644 system/vorlage_zip/Studienerfolg.odt
 mode change 100755 => 100644 system/vorlage_zip/StudienerfolgEng.odt
 mode change 100755 => 100644 system/vorlage_zip/Studienordnung.odt
 mode change 100755 => 100644 system/vorlage_zip/Uebernahme.odt
 mode change 100755 => 100644 system/vorlage_zip/Zahlung.odt
 mode change 100755 => 100644 system/vorlage_zip/Zertifikat.odt
 mode change 100755 => 100644 system/vorlage_zip/Zertifikat_ktu.odt
 mode change 100755 => 100644 system/vorlage_zip/Zeugnis.odt
 mode change 100755 => 100644 system/vorlage_zip/ZeugnisEng.odt
 mode change 100755 => 100644 system/vorlage_zip/ZeugnisEngNeu.odt
 mode change 100755 => 100644 system/vorlage_zip/ZeugnisNeu.odt
 mode change 100755 => 100644 system/vorlage_zip/Zutrittskarte.odt
 mode change 100755 => 100644 system/vorlage_zip/fotoliste.odt
 mode change 100755 => 100644 system/vorlage_zip/statusbericht.ods
 mode change 100755 => 100644 system/xsl/AntragAbmeldung.xsl
 mode change 100755 => 100644 system/xsl/AntragAbmeldungStgl.xsl
 mode change 100755 => 100644 system/xsl/AntragUnterbrechung.xsl
 mode change 100755 => 100644 system/xsl/AnwListBarcode.xsl
 mode change 100755 => 100644 system/xsl/Anwesenheitsliste.xsl
 mode change 100755 => 100644 system/xsl/AusbVerEngHead_0.xsl
 mode change 100755 => 100644 system/xsl/AusbVerEng_0.xsl
 mode change 100755 => 100644 system/xsl/AusbildStatus_0.xsl
 mode change 100755 => 100644 system/xsl/Ausbildungsver_0.xsl
 mode change 100755 => 100644 system/xsl/Bewerberakt.xsl
 mode change 100755 => 100644 system/xsl/LehrveranstaltungszeugnisEng_0.xsl
 mode change 100755 => 100644 system/xsl/Lehrveranstaltungszeugnis_0.xsl
 mode change 100755 => 100644 system/xsl/Lehrveranstaltungszeugnis_Eng_9005.xsl
 mode change 100755 => 100644 system/xsl/PrProtBAEng_0.xsl
 mode change 100755 => 100644 system/xsl/PrProtBA_0.xsl
 mode change 100755 => 100644 system/xsl/PrProtMAEng_0.xsl
 mode change 100755 => 100644 system/xsl/PrProtMA_0.xsl
 mode change 100755 => 100644 system/xsl/Projektbeschr_0.xsl
 mode change 100755 => 100644 system/xsl/StudienblattEng_0.xsl
 mode change 100755 => 100644 system/xsl/Studienblatt_0.xsl
 mode change 100755 => 100644 system/xsl/Studienordnung_0.xsl
 mode change 100755 => 100644 system/xsl/Studienordnung_style_0.xml
 mode change 100755 => 100644 system/xsl/ZertifikatFreifaecher_0.xsl
 mode change 100755 => 100644 system/xsl/ZeugnisEng_0.xsl
 mode change 100755 => 100644 system/xsl/ZeugnisEng_Lehrgaenge.xsl
 mode change 100755 => 100644 system/xsl/Zeugnis_0.xsl
 mode change 100755 => 100644 system/xsl/Zeugnis_Lehrgaenge.xsl
 mode change 100755 => 100644 system/xsl/Zeugnis_style_0.xsl
 mode change 100755 => 100644 system/xsl/Zutrittskarte.xsl
 mode change 100755 => 100644 system/xsl/accountinfoblatt_0.xsl
 mode change 100755 => 100644 system/xsl/bachelorurkundeEng_0.xsl
 mode change 100755 => 100644 system/xsl/bachelorurkunde_0.xsl
 mode change 100755 => 100644 system/xsl/bakkzeugnisEng_0.xsl
 mode change 100755 => 100644 system/xsl/bakkzeugnis_0.xsl
 mode change 100755 => 100644 system/xsl/bescheid_0.xsl
 mode change 100755 => 100644 system/xsl/bescheid_style_0.xsl
 mode change 100755 => 100644 system/xsl/diplomaSuppDebug.xsl
 mode change 100755 => 100644 system/xsl/diplomaSupp_0.xsl
 mode change 100755 => 100644 system/xsl/diplomaSupp_style_0.xsl
 mode change 100755 => 100644 system/xsl/diplomurkundeEng_0.xsl
 mode change 100755 => 100644 system/xsl/diplomurkunde_0.xsl
 mode change 100755 => 100644 system/xsl/diplomzeugnisEng_0.xsl
 mode change 100755 => 100644 system/xsl/diplomzeugnis_0.xsl
 mode change 100755 => 100644 system/xsl/fotoliste_0.xsl
 mode change 100755 => 100644 system/xsl/inskription_0.xsl
 mode change 100755 => 100644 system/xsl/inskription_eng_0.xsl
 mode change 100755 => 100644 system/xsl/lehrauftrag_0.xsl
 mode change 100755 => 100644 system/xsl/lehrauftrag_style_0.xsl
 mode change 100755 => 100644 system/xsl/lehrtaetigkeit_0.xsl
 mode change 100755 => 100644 system/xsl/prprotokollbakk_0.xsl
 mode change 100755 => 100644 system/xsl/statusbericht.xsl
 mode change 100755 => 100644 system/xsl/studienerfolgEng_0.xsl
 mode change 100755 => 100644 system/xsl/studienerfolgEng_Lehrgaenge.xsl
 mode change 100755 => 100644 system/xsl/studienerfolg_0.xsl
 mode change 100755 => 100644 system/xsl/studienerfolg_Lehrgaenge.xsl
 mode change 100755 => 100644 system/xsl/uebernahmebestaetigung_0.xsl
 mode change 100755 => 100644 system/xsl/zahlung_0.xsl
 mode change 100755 => 100644 system/xsl/zahlung_style_0.xsl
 mode change 100755 => 100644 tests/codesniffer/FHComplete/Sniffs/Classes/FHCPropertyDeclarationSniff.php
 mode change 100755 => 100644 tests/codesniffer/FHComplete/Sniffs/Classes/FHCValidClassNameSniff.php
 mode change 100755 => 100644 tests/codesniffer/FHComplete/Sniffs/ControlStructures/FHCControlSignatureSniff.php
 mode change 100755 => 100644 tests/codesniffer/FHComplete/Sniffs/Methods/FHCMethodDeclarationSniff.php
 mode change 100755 => 100644 tests/codesniffer/FHComplete/ruleset.xml
 mode change 100755 => 100644 tests/phpmd/rulesets-dev-only.xml
 mode change 100755 => 100644 tests/phpmd/rulesets.xml
 mode change 100755 => 100644 version.php
 mode change 100755 => 100644 vilesci/admin/XPI/FASoProduktiv/FASonline.xpi
 mode change 100755 => 100644 vilesci/admin/XPI/FASoProduktiv/chrome/content/contents.rdf
 mode change 100755 => 100644 vilesci/admin/XPI/FASoProduktiv/chrome/content/fasonline.xul
 mode change 100755 => 100644 vilesci/admin/XPI/FASoProduktiv/chrome/fasonline.jar
 mode change 100755 => 100644 vilesci/admin/XPI/FASoProduktiv/install.js
 mode change 100755 => 100644 vilesci/admin/XPI/FASoProduktiv/install.rdf
 mode change 100755 => 100644 vilesci/admin/XPI/FASoProduktivSeamonkey2.0/FASonline.xpi
 mode change 100755 => 100644 vilesci/admin/XPI/FASoProduktivSeamonkey2.0/chrome.manifest
 mode change 100755 => 100644 vilesci/admin/XPI/FASoProduktivSeamonkey2.0/chrome/content/contents.rdf
 mode change 100755 => 100644 vilesci/admin/XPI/FASoProduktivSeamonkey2.0/chrome/content/fasonline.xul
 mode change 100755 => 100644 vilesci/admin/XPI/FASoProduktivSeamonkey2.0/chrome/fasonline.jar
 mode change 100755 => 100644 vilesci/admin/XPI/FASoProduktivSeamonkey2.0/chrome/skin/fasonline.png
 mode change 100755 => 100644 vilesci/admin/XPI/FASoProduktivSeamonkey2.0/install.rdf
 mode change 100755 => 100644 vilesci/admin/XPI/FASoStPoelten/FASonline.xpi
 mode change 100755 => 100644 vilesci/admin/XPI/FASoStPoelten/chrome/content/contents.rdf
 mode change 100755 => 100644 vilesci/admin/XPI/FASoStPoelten/chrome/content/fasonline.xul
 mode change 100755 => 100644 vilesci/admin/XPI/FASoStPoelten/chrome/fasonline.jar
 mode change 100755 => 100644 vilesci/admin/XPI/FASoStPoelten/install.js
 mode change 100755 => 100644 vilesci/admin/XPI/FASoStPoelten/install.rdf
 mode change 100755 => 100644 vilesci/admin/XPI/FASoStPoeltenDEV/FASoStPoelten2.xpi
 mode change 100755 => 100644 vilesci/admin/XPI/FASoStPoeltenDEV/chrome/content/contents.rdf
 mode change 100755 => 100644 vilesci/admin/XPI/FASoStPoeltenDEV/chrome/content/fasonline2.xul
 mode change 100755 => 100644 vilesci/admin/XPI/FASoStPoeltenDEV/chrome/fasonline2.jar
 mode change 100755 => 100644 vilesci/admin/XPI/FASoStPoeltenDEV/install.js
 mode change 100755 => 100644 vilesci/admin/XPI/FASoStPoeltenDEV/install.rdf
 mode change 100755 => 100644 vilesci/admin/XPI/FHCFas/FHCFas.xpi
 mode change 100755 => 100644 vilesci/admin/XPI/FHCFas/chrome/content/contents.rdf
 mode change 100755 => 100644 vilesci/admin/XPI/FHCFas/chrome/content/fhcfas.xul
 mode change 100755 => 100644 vilesci/admin/XPI/FHCFas/chrome/fhcfas.jar
 mode change 100755 => 100644 vilesci/admin/XPI/FHCFas/install.js
 mode change 100755 => 100644 vilesci/admin/XPI/FHCFas/install.rdf
 mode change 100755 => 100644 vilesci/admin/XPI/FHCTempus/FHCTempus.xpi
 mode change 100755 => 100644 vilesci/admin/XPI/FHCTempus/chrome/content/contents.rdf
 mode change 100755 => 100644 vilesci/admin/XPI/FHCTempus/chrome/content/fhctempus.xul
 mode change 100755 => 100644 vilesci/admin/XPI/FHCTempus/chrome/fhctempus.jar
 mode change 100755 => 100644 vilesci/admin/XPI/FHCTempus/install.js
 mode change 100755 => 100644 vilesci/admin/XPI/FHCTempus/install.rdf
 mode change 100755 => 100644 vilesci/admin/XPI/PlannerProduktiv/Planner.xpi
 mode change 100755 => 100644 vilesci/admin/XPI/PlannerProduktiv/chrome/content/contents.rdf
 mode change 100755 => 100644 vilesci/admin/XPI/PlannerProduktiv/chrome/content/planner.xul
 mode change 100755 => 100644 vilesci/admin/XPI/PlannerProduktiv/chrome/planner.jar
 mode change 100755 => 100644 vilesci/admin/XPI/PlannerProduktiv/install.js
 mode change 100755 => 100644 vilesci/admin/XPI/PlannerProduktiv/install.rdf
 mode change 100755 => 100644 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome.manifest
 mode change 100755 => 100644 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/appchoose.xul
 mode change 100755 => 100644 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/contents.rdf
 mode change 100755 => 100644 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/fas.xul
 mode change 100755 => 100644 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/fhcomplete.js
 mode change 100755 => 100644 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/fhcomplete.xul
 mode change 100755 => 100644 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/options.xul
 mode change 100755 => 100644 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/planner.xul
 mode change 100755 => 100644 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/statusbaroverlay.xul
 mode change 100755 => 100644 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/tempus.xul
 mode change 100755 => 100644 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/fhcomplete.jar
 mode change 100755 => 100644 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/fasonline.png
 mode change 100755 => 100644 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/fasonline15.png
 mode change 100755 => 100644 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/fasonline32.png
 mode change 100755 => 100644 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/fhcomplete.ico
 mode change 100755 => 100644 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/fhcomplete.png
 mode change 100755 => 100644 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/planner.png
 mode change 100755 => 100644 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/planner15.png
 mode change 100755 => 100644 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/planner32.png
 mode change 100755 => 100644 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/settings.png
 mode change 100755 => 100644 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/tempus.png
 mode change 100755 => 100644 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/tempus15.png
 mode change 100755 => 100644 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/tempus32.png
 mode change 100755 => 100644 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/defaults/preferences/defaults.js
 mode change 100755 => 100644 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/fhcomplete.xpi
 mode change 100755 => 100644 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/install.rdf
 mode change 100755 => 100644 vilesci/admin/XPI/Seamonkey2.11/fhcomplete/make.sh
 mode change 100755 => 100644 vilesci/admin/XPI/TempusStPoelten/Tempus.xpi
 mode change 100755 => 100644 vilesci/admin/XPI/TempusStPoelten/chrome/content/contents.rdf
 mode change 100755 => 100644 vilesci/admin/XPI/TempusStPoelten/chrome/content/tempus.xul
 mode change 100755 => 100644 vilesci/admin/XPI/TempusStPoelten/chrome/tempus.jar
 mode change 100755 => 100644 vilesci/admin/XPI/TempusStPoelten/install.js
 mode change 100755 => 100644 vilesci/admin/XPI/TempusStPoelten/install.rdf
 mode change 100755 => 100644 vilesci/admin/XPI/TempusStPoeltenDEV/TempusStPoelten2.xpi
 mode change 100755 => 100644 vilesci/admin/XPI/TempusStPoeltenDEV/chrome/content/contents.rdf
 mode change 100755 => 100644 vilesci/admin/XPI/TempusStPoeltenDEV/chrome/content/tempus2.xul
 mode change 100755 => 100644 vilesci/admin/XPI/TempusStPoeltenDEV/chrome/tempus2.jar
 mode change 100755 => 100644 vilesci/admin/XPI/TempusStPoeltenDEV/install.js
 mode change 100755 => 100644 vilesci/admin/XPI/TempusStPoeltenDEV/install.rdf
 mode change 100755 => 100644 vilesci/admin/XPI/TempusStPoeltenExtern/TempusStPoeltenExtern.xpi
 mode change 100755 => 100644 vilesci/admin/XPI/TempusStPoeltenExtern/TempusStPoeltenExtern81.xpi
 mode change 100755 => 100644 vilesci/admin/XPI/TempusStPoeltenExtern/chrome/content/contents.rdf
 mode change 100755 => 100644 vilesci/admin/XPI/TempusStPoeltenExtern/chrome/content/tempusextern81.xul
 mode change 100755 => 100644 vilesci/admin/XPI/TempusStPoeltenExtern/chrome/tempusextern.jar
 mode change 100755 => 100644 vilesci/admin/XPI/TempusStPoeltenExtern/chrome/tempusextern81.jar
 mode change 100755 => 100644 vilesci/admin/XPI/TempusStPoeltenExtern/install.js
 mode change 100755 => 100644 vilesci/admin/XPI/TempusStPoeltenExtern/install.rdf
 mode change 100755 => 100644 vilesci/admin/XPI/TempusTWProduktiv/Tempusdev.xpi
 mode change 100755 => 100644 vilesci/admin/XPI/TempusTWProduktiv/chrome/content/contents.rdf
 mode change 100755 => 100644 vilesci/admin/XPI/TempusTWProduktiv/chrome/content/tempusdev.xul
 mode change 100755 => 100644 vilesci/admin/XPI/TempusTWProduktiv/chrome/tempusdev.jar
 mode change 100755 => 100644 vilesci/admin/XPI/TempusTWProduktiv/install.js
 mode change 100755 => 100644 vilesci/admin/XPI/TempusTWProduktiv/install.rdf
 mode change 100755 => 100644 vilesci/admin/XPI/orbit-1.8f5-MiK.xpi
 mode change 100755 => 100644 vilesci/bis/archiv.php
 mode change 100755 => 100644 vilesci/bis/bisdaten/.gitignore
 mode change 100755 => 100644 vilesci/bis/checkfunktion.php
 mode change 100755 => 100644 vilesci/bis/checkverwendung.php
 mode change 100755 => 100644 vilesci/bis/lehrgangsmeldung.php
 mode change 100755 => 100644 vilesci/bis/personal_generateverwendung.php
 mode change 100755 => 100644 vilesci/bis/personal_lektorenohnelehrauftrag.php
 mode change 100755 => 100644 vilesci/bis/personalimport.php
 mode change 100755 => 100644 vilesci/bis/personalmeldung.php
 mode change 100755 => 100644 vilesci/bis/personalmeldung_uebersicht.php
 mode change 100755 => 100644 vilesci/bis/studentenmeldung.php
 mode change 100755 => 100644 vilesci/cronjobs/bpk.php
 mode change 100755 => 100644 vilesci/cronjobs/cronjob.php
 mode change 100755 => 100644 vilesci/cronjobs/jobwatcher.php
 mode change 100755 => 100644 vilesci/cronjobs/lvplanwartung.php
 mode change 100755 => 100644 vilesci/cronjobs/matrikelnummern.php
 mode change 100755 => 100644 vilesci/cronjobs/testjob.php
 mode change 100755 => 100644 vilesci/fhausweis/bildpruefung.php
 mode change 100755 => 100644 vilesci/fhausweis/bildzuschnitt.php
 mode change 100755 => 100644 vilesci/fhausweis/imageupload.php
 mode change 100755 => 100644 vilesci/fhausweis/kartenausgabe.php
 mode change 100755 => 100644 vilesci/fhausweis/kartenkorrektur.php
 mode change 100755 => 100644 vilesci/fhausweis/kartenruecknahme.php
 mode change 100755 => 100644 vilesci/fhausweis/kartentausch.php
 mode change 100755 => 100644 vilesci/fhausweis/kartenverwaltung.php
 mode change 100755 => 100644 vilesci/fhausweis/kartezuweisen.php
 mode change 100755 => 100644 vilesci/fhausweis/search.php
 mode change 100755 => 100644 vilesci/fhausweis/verlaengerung.php
 mode change 100755 => 100644 vilesci/index.php
 mode change 100755 => 100644 vilesci/inventar/etiketten.php
 mode change 100755 => 100644 vilesci/inventar/inventar.php
 mode change 100755 => 100644 vilesci/inventar/inventar_afa.php
 mode change 100755 => 100644 vilesci/inventar/inventar_autocomplete.php
 mode change 100755 => 100644 vilesci/inventar/inventar_inventur.php
 mode change 100755 => 100644 vilesci/inventar/inventar_pflege.php
 mode change 100755 => 100644 vilesci/inventar/inventarliste.php
 mode change 100755 => 100644 vilesci/inventar/konto_detail.php
 mode change 100755 => 100644 vilesci/inventar/kostenstelle_detail.php
 mode change 100755 => 100644 vilesci/inventar/studiengang_detail.php
 mode change 100755 => 100644 vilesci/left.php
 mode change 100755 => 100644 vilesci/lehre/abgabe_assistenz.php
 mode change 100755 => 100644 vilesci/lehre/abgabe_assistenz_details.php
 mode change 100755 => 100644 vilesci/lehre/abgabe_assistenz_frameset.php
 mode change 100755 => 100644 vilesci/lehre/abgabe_assistenz_multitermin.php
 mode change 100755 => 100644 vilesci/lehre/abgabe_assistenz_zusatz.php
 mode change 100755 => 100644 vilesci/lehre/check/index.html
 mode change 100755 => 100644 vilesci/lehre/check/res_check.php
 mode change 100755 => 100644 vilesci/lehre/check/stdplan_check.php
 mode change 100755 => 100644 vilesci/lehre/check/ueberbuchung.php
 mode change 100755 => 100644 vilesci/lehre/check/verplanungsuebersicht.php
 mode change 100755 => 100644 vilesci/lehre/einheit_autocomplete.php
 mode change 100755 => 100644 vilesci/lehre/einheit_det.php
 mode change 100755 => 100644 vilesci/lehre/einheit_menu.php
 mode change 100755 => 100644 vilesci/lehre/ferienverwaltung.php
 mode change 100755 => 100644 vilesci/lehre/freifach.php
 mode change 100755 => 100644 vilesci/lehre/freifach_lektoren.php
 mode change 100755 => 100644 vilesci/lehre/freifach_studentenvorrueckung.php
 mode change 100755 => 100644 vilesci/lehre/incoming_delete.php
 mode change 100755 => 100644 vilesci/lehre/index.html
 mode change 100755 => 100644 vilesci/lehre/lehreinheiten_vorrueckung.php
 mode change 100755 => 100644 vilesci/lehre/lehrveranstaltung.php
 mode change 100755 => 100644 vilesci/lehre/lehrveranstaltung_details.php
 mode change 100755 => 100644 vilesci/lehre/lehrveranstaltung_frameset.html
 mode change 100755 => 100644 vilesci/lehre/lehrveranstaltung_kompatibel.php
 mode change 100755 => 100644 vilesci/lehre/lehrveranstaltung_lvangebot.php
 mode change 100755 => 100644 vilesci/lehre/lv_merge.php
 mode change 100755 => 100644 vilesci/lehre/lvangebot_autocomplete.php
 mode change 100755 => 100644 vilesci/lehre/lvplan_custom_sync.php
 mode change 100755 => 100644 vilesci/lehre/lvplanwartung.php
 mode change 100755 => 100644 vilesci/lehre/projektarbeitsbenotung.php
 mode change 100755 => 100644 vilesci/lehre/raumauslastung.php
 mode change 100755 => 100644 vilesci/lehre/raummitteilung.php
 mode change 100755 => 100644 vilesci/lehre/reservierung_autocomplete.php
 mode change 100755 => 100644 vilesci/lehre/reservierung_insert.php
 mode change 100755 => 100644 vilesci/lehre/saveStudienordnung.php
 mode change 100755 => 100644 vilesci/lehre/stpl_benutzer_kollision.php
 mode change 100755 => 100644 vilesci/lehre/stpl_benutzer_kollision_details.php
 mode change 100755 => 100644 vilesci/lehre/stpl_benutzer_kollision_frameset.html
 mode change 100755 => 100644 vilesci/lehre/studienordnung.inc.php
 mode change 100755 => 100644 vilesci/lehre/studienordnung.js
 mode change 100755 => 100644 vilesci/lehre/studienordnung.php
 mode change 100755 => 100644 vilesci/lehre/studienordnung_autocomplete.php
 mode change 100755 => 100644 vilesci/lehre/studienordnung_lvregel.js
 mode change 100755 => 100644 vilesci/lehre/studienplan_gueltigkeit.php
 mode change 100755 => 100644 vilesci/lehre/studienplan_vorrueckung.php
 mode change 100755 => 100644 vilesci/lehre/studienplan_zuteilung.php
 mode change 100755 => 100644 vilesci/lehre/zeitwuensche.php
 mode change 100755 => 100644 vilesci/main.php
 mode change 100755 => 100644 vilesci/personen/akteupdate.php
 mode change 100755 => 100644 vilesci/personen/aliquote_reduktion.json.php
 mode change 100755 => 100644 vilesci/personen/aliquote_reduktion.php
 mode change 100755 => 100644 vilesci/personen/anwesenheit.php
 mode change 100755 => 100644 vilesci/personen/anwesenheitslisten_barcode.php
 mode change 100755 => 100644 vilesci/personen/aufbaukurscheckliste.php
 mode change 100755 => 100644 vilesci/personen/funktion.php
 mode change 100755 => 100644 vilesci/personen/funktion_det.php
 mode change 100755 => 100644 vilesci/personen/import/interessentenimport.php
 mode change 100755 => 100644 vilesci/personen/import/mitarbeiterimport.php
 mode change 100755 => 100644 vilesci/personen/incoming_detail.php
 mode change 100755 => 100644 vilesci/personen/incoming_frameset.php
 mode change 100755 => 100644 vilesci/personen/incoming_lehrveranstaltungen.php
 mode change 100755 => 100644 vilesci/personen/incoming_uebersicht.php
 mode change 100755 => 100644 vilesci/personen/index.html
 mode change 100755 => 100644 vilesci/personen/institutsliste.php
 mode change 100755 => 100644 vilesci/personen/kontaktdaten_edit.php
 mode change 100755 => 100644 vilesci/personen/lehrveranstaltungen_json.php
 mode change 100755 => 100644 vilesci/personen/leistungsstipendium.php
 mode change 100755 => 100644 vilesci/personen/lektor_uebersicht.php
 mode change 100755 => 100644 vilesci/personen/outgoing_detail.php
 mode change 100755 => 100644 vilesci/personen/outgoing_frameset.php
 mode change 100755 => 100644 vilesci/personen/outgoing_uebersicht.php
 mode change 100755 => 100644 vilesci/personen/personen_anlegen.php
 mode change 100755 => 100644 vilesci/personen/personen_details.php
 mode change 100755 => 100644 vilesci/personen/personendetails.php
 mode change 100755 => 100644 vilesci/personen/preinteressent_anlegen.php
 mode change 100755 => 100644 vilesci/personen/preinteressent_detail.php
 mode change 100755 => 100644 vilesci/personen/preinteressent_frameset.html
 mode change 100755 => 100644 vilesci/personen/preinteressent_uebernahme.php
 mode change 100755 => 100644 vilesci/personen/preinteressent_uebersicht.php
 mode change 100755 => 100644 vilesci/personen/student_edit.php
 mode change 100755 => 100644 vilesci/personen/student_vorrueckung.php
 mode change 100755 => 100644 vilesci/personen/suche.php
 mode change 100755 => 100644 vilesci/personen/uniflow.csv.php
 mode change 100755 => 100644 vilesci/personen/urlaubsverwaltung.php
 mode change 100755 => 100644 vilesci/personen/wiederholer.php
 mode change 100755 => 100644 vilesci/personen/zeitwunsch.php
 mode change 100755 => 100644 vilesci/stammdaten/ampel_details.php
 mode change 100755 => 100644 vilesci/stammdaten/ampel_frameset.html
 mode change 100755 => 100644 vilesci/stammdaten/ampel_uebersicht.php
 mode change 100755 => 100644 vilesci/stammdaten/auswertung_fhtw.php
 mode change 100755 => 100644 vilesci/stammdaten/benutzerberechtigung_autocomplete.php
 mode change 100755 => 100644 vilesci/stammdaten/benutzerberechtigung_detailliste.php
 mode change 100755 => 100644 vilesci/stammdaten/benutzerberechtigung_details.php
 mode change 100755 => 100644 vilesci/stammdaten/benutzerberechtigung_frameset.html
 mode change 100755 => 100644 vilesci/stammdaten/benutzerberechtigung_uebersicht.php
 mode change 100755 => 100644 vilesci/stammdaten/berechtigungen.php
 mode change 100755 => 100644 vilesci/stammdaten/berechtigungrolle.php
 mode change 100755 => 100644 vilesci/stammdaten/betriebsmittel_details.php
 mode change 100755 => 100644 vilesci/stammdaten/betriebsmittel_frameset.php
 mode change 100755 => 100644 vilesci/stammdaten/betriebsmittel_uebersicht.php
 mode change 100755 => 100644 vilesci/stammdaten/buchung_typ.php
 mode change 100755 => 100644 vilesci/stammdaten/cronjobverwaltung.php
 mode change 100755 => 100644 vilesci/stammdaten/dokumentvorlagen_verwaltung.php
 mode change 100755 => 100644 vilesci/stammdaten/firma_details.php
 mode change 100755 => 100644 vilesci/stammdaten/firma_detailwork.php
 mode change 100755 => 100644 vilesci/stammdaten/firma_frameset.html
 mode change 100755 => 100644 vilesci/stammdaten/firma_uebersicht.php
 mode change 100755 => 100644 vilesci/stammdaten/firma_zusammen_details.php
 mode change 100755 => 100644 vilesci/stammdaten/firma_zusammen_uebersicht.php
 mode change 100755 => 100644 vilesci/stammdaten/gsprogramm.php
 mode change 100755 => 100644 vilesci/stammdaten/imexport/dabis.php
 mode change 100755 => 100644 vilesci/stammdaten/imexport/index.html
 mode change 100755 => 100644 vilesci/stammdaten/imexport/zutrittskarten/export.php
 mode change 100755 => 100644 vilesci/stammdaten/imexport/zutrittskarten/generatefromsipass.php
 mode change 100755 => 100644 vilesci/stammdaten/imexport/zutrittskarten/generatefromsipass_predelete.php
 mode change 100755 => 100644 vilesci/stammdaten/imexport/zutrittskarten/import.php
 mode change 100755 => 100644 vilesci/stammdaten/imexport/zutrittskarten/index.html
 mode change 100755 => 100644 vilesci/stammdaten/infoscreen_details.php
 mode change 100755 => 100644 vilesci/stammdaten/infoscreen_frameset.html
 mode change 100755 => 100644 vilesci/stammdaten/infoscreen_preview.php
 mode change 100755 => 100644 vilesci/stammdaten/infoscreen_uebersicht.php
 mode change 100755 => 100644 vilesci/stammdaten/lvbgruppenverwaltung.js
 mode change 100755 => 100644 vilesci/stammdaten/lvbgruppenverwaltung.php
 mode change 100755 => 100644 vilesci/stammdaten/lvbgruppenverwaltungDetail.php
 mode change 100755 => 100644 vilesci/stammdaten/lvbgruppenverwaltungTree.php
 mode change 100755 => 100644 vilesci/stammdaten/organisationseinheiten.php
 mode change 100755 => 100644 vilesci/stammdaten/personen_wartung.php
 mode change 100755 => 100644 vilesci/stammdaten/raum_details.php
 mode change 100755 => 100644 vilesci/stammdaten/raum_frameset.html
 mode change 100755 => 100644 vilesci/stammdaten/raum_uebersicht.php
 mode change 100755 => 100644 vilesci/stammdaten/reihungstest_administration.php
 mode change 100755 => 100644 vilesci/stammdaten/reihungstest_zusammenlegung.php
 mode change 100755 => 100644 vilesci/stammdaten/reihungstestverwaltung.php
 mode change 100755 => 100644 vilesci/stammdaten/reihungstestverwaltung_autocomplete.php
 mode change 100755 => 100644 vilesci/stammdaten/service_details.php
 mode change 100755 => 100644 vilesci/stammdaten/service_frameset.html
 mode change 100755 => 100644 vilesci/stammdaten/service_uebersicht.php
 mode change 100755 => 100644 vilesci/stammdaten/set_gemeinde.php
 mode change 100755 => 100644 vilesci/stammdaten/stammdaten_autocomplete.php
 mode change 100755 => 100644 vilesci/stammdaten/statistik_details.php
 mode change 100755 => 100644 vilesci/stammdaten/statistik_frameset.html
 mode change 100755 => 100644 vilesci/stammdaten/statistik_uebersicht.php
 mode change 100755 => 100644 vilesci/stammdaten/studiengang_details.js
 mode change 100755 => 100644 vilesci/stammdaten/studiengang_details.php
 mode change 100755 => 100644 vilesci/stammdaten/studiengang_dokumente.php
 mode change 100755 => 100644 vilesci/stammdaten/studiengang_edit.php
 mode change 100755 => 100644 vilesci/stammdaten/studiengang_frameset.html
 mode change 100755 => 100644 vilesci/stammdaten/studiengang_uebersicht.php
 mode change 100755 => 100644 vilesci/stammdaten/studiensemester.php
 mode change 100755 => 100644 vilesci/stammdaten/variablen_details.php
 mode change 100755 => 100644 vilesci/stammdaten/variablen_frameset.html
 mode change 100755 => 100644 vilesci/stammdaten/variablen_uebersicht.php
 mode change 100755 => 100644 vilesci/stammdaten/vertrag_typ.php
 mode change 100755 => 100644 vilesci/statistik/filter_details.php
 mode change 100755 => 100644 vilesci/statistik/filter_frameset.html
 mode change 100755 => 100644 vilesci/statistik/filter_overview.php
 mode change 100755 => 100644 vilesci/statistik/filter_vorschau.php
 mode change 100755 => 100644 vilesci/statistik/incoming.php
 mode change 100755 => 100644 vilesci/statistik/oehwaehlerverzeichnis.php
 mode change 100755 => 100644 vilesci/statistik/outgoing.php
 mode change 100755 => 100644 vilesci/statistik/statistik.php
 mode change 100755 => 100644 vilesci/statistik/statistik_frameset.php
 mode change 100755 => 100644 vilesci/statistik/statistik_sql.php
 mode change 100755 => 100644 vilesci/statistik/studenten_historie.php
 mode change 100755 => 100644 vilesci/statistik/studierendenliste_oeh.php
 mode change 100755 => 100644 vilesci/top.php
 mode change 100755 => 100644 wawi/auswertungen/aufteilung.php
 mode change 100755 => 100644 wawi/auswertungen/konto.php
 mode change 100755 => 100644 wawi/auswertungen/kostenstelle.php
 mode change 100755 => 100644 wawi/auswertungen/wawi_tags.php
 mode change 100755 => 100644 wawi/auth.php
 mode change 100755 => 100644 wawi/berechtigung.php
 mode change 100755 => 100644 wawi/bestellung.php
 mode change 100755 => 100644 wawi/budget.php
 mode change 100755 => 100644 wawi/check_bestellung.php
 mode change 100755 => 100644 wawi/firma.php
 mode change 100755 => 100644 wawi/home.php
 mode change 100755 => 100644 wawi/index.php
 mode change 100755 => 100644 wawi/kontouebersicht.php
 mode change 100755 => 100644 wawi/kostenstellenuebersicht.php
 mode change 100755 => 100644 wawi/login.php
 mode change 100755 => 100644 wawi/logout.php
 mode change 100755 => 100644 wawi/menu.php
 mode change 100755 => 100644 wawi/mwst.html
 mode change 100755 => 100644 wawi/pdfExport.txt
 mode change 100755 => 100644 wawi/rechnung.php
 mode change 100755 => 100644 wawi/wawi_autocomplete.php
 mode change 100755 => 100644 webdav/Caldav_Backend.php
 mode change 100755 => 100644 webdav/Principal.php
 mode change 100755 => 100644 webdav/auth.class.php
 mode change 100755 => 100644 webdav/google.txt
 mode change 100755 => 100644 webdav/lvplan.php

diff --git a/.gitignore b/.gitignore
old mode 100755
new mode 100644
diff --git a/CHANGELOG.md b/CHANGELOG.md
old mode 100755
new mode 100644
diff --git a/FHC-vendor/angular-tablesort/.gitignore b/FHC-vendor/angular-tablesort/.gitignore
old mode 100755
new mode 100644
diff --git a/FHC-vendor/angular-tablesort/LICENSE b/FHC-vendor/angular-tablesort/LICENSE
old mode 100755
new mode 100644
diff --git a/FHC-vendor/angular-tablesort/README.md b/FHC-vendor/angular-tablesort/README.md
old mode 100755
new mode 100644
diff --git a/FHC-vendor/angular-tablesort/bower.json b/FHC-vendor/angular-tablesort/bower.json
old mode 100755
new mode 100644
diff --git a/FHC-vendor/angular-tablesort/example.html b/FHC-vendor/angular-tablesort/example.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/angular-tablesort/index.js b/FHC-vendor/angular-tablesort/index.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/angular-tablesort/js/angular-tablesort.js b/FHC-vendor/angular-tablesort/js/angular-tablesort.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/angular-tablesort/package.json b/FHC-vendor/angular-tablesort/package.json
old mode 100755
new mode 100644
diff --git a/FHC-vendor/angular-tablesort/tablesort.css b/FHC-vendor/angular-tablesort/tablesort.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/changelog.txt b/FHC-vendor/easyui/changelog.txt
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/easyloader.js b/FHC-vendor/easyui/easyloader.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/jquery.easyui.min.js b/FHC-vendor/easyui/jquery.easyui.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/jquery.easyui.mobile.js b/FHC-vendor/easyui/jquery.easyui.mobile.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/jquery.min.js b/FHC-vendor/easyui/jquery.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/license_freeware.txt b/FHC-vendor/easyui/license_freeware.txt
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/locale/easyui-lang-af.js b/FHC-vendor/easyui/locale/easyui-lang-af.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/locale/easyui-lang-am.js b/FHC-vendor/easyui/locale/easyui-lang-am.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/locale/easyui-lang-ar.js b/FHC-vendor/easyui/locale/easyui-lang-ar.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/locale/easyui-lang-bg.js b/FHC-vendor/easyui/locale/easyui-lang-bg.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/locale/easyui-lang-ca.js b/FHC-vendor/easyui/locale/easyui-lang-ca.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/locale/easyui-lang-cs.js b/FHC-vendor/easyui/locale/easyui-lang-cs.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/locale/easyui-lang-cz.js b/FHC-vendor/easyui/locale/easyui-lang-cz.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/locale/easyui-lang-da.js b/FHC-vendor/easyui/locale/easyui-lang-da.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/locale/easyui-lang-de.js b/FHC-vendor/easyui/locale/easyui-lang-de.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/locale/easyui-lang-el.js b/FHC-vendor/easyui/locale/easyui-lang-el.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/locale/easyui-lang-en.js b/FHC-vendor/easyui/locale/easyui-lang-en.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/locale/easyui-lang-es.js b/FHC-vendor/easyui/locale/easyui-lang-es.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/locale/easyui-lang-fr.js b/FHC-vendor/easyui/locale/easyui-lang-fr.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/locale/easyui-lang-it.js b/FHC-vendor/easyui/locale/easyui-lang-it.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/locale/easyui-lang-jp.js b/FHC-vendor/easyui/locale/easyui-lang-jp.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/locale/easyui-lang-nl.js b/FHC-vendor/easyui/locale/easyui-lang-nl.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/locale/easyui-lang-pl.js b/FHC-vendor/easyui/locale/easyui-lang-pl.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/locale/easyui-lang-pt_BR.js b/FHC-vendor/easyui/locale/easyui-lang-pt_BR.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/locale/easyui-lang-ru.js b/FHC-vendor/easyui/locale/easyui-lang-ru.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/locale/easyui-lang-sv_SE.js b/FHC-vendor/easyui/locale/easyui-lang-sv_SE.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/locale/easyui-lang-tr.js b/FHC-vendor/easyui/locale/easyui-lang-tr.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/locale/easyui-lang-zh_CN.js b/FHC-vendor/easyui/locale/easyui-lang-zh_CN.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/locale/easyui-lang-zh_TW.js b/FHC-vendor/easyui/locale/easyui-lang-zh_TW.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/plugins/jquery.accordion.js b/FHC-vendor/easyui/plugins/jquery.accordion.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/plugins/jquery.calendar.js b/FHC-vendor/easyui/plugins/jquery.calendar.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/plugins/jquery.combo.js b/FHC-vendor/easyui/plugins/jquery.combo.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/plugins/jquery.combobox.js b/FHC-vendor/easyui/plugins/jquery.combobox.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/plugins/jquery.combogrid.js b/FHC-vendor/easyui/plugins/jquery.combogrid.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/plugins/jquery.combotree.js b/FHC-vendor/easyui/plugins/jquery.combotree.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/plugins/jquery.datagrid.js b/FHC-vendor/easyui/plugins/jquery.datagrid.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/plugins/jquery.datalist.js b/FHC-vendor/easyui/plugins/jquery.datalist.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/plugins/jquery.datebox.js b/FHC-vendor/easyui/plugins/jquery.datebox.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/plugins/jquery.datetimebox.js b/FHC-vendor/easyui/plugins/jquery.datetimebox.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/plugins/jquery.datetimespinner.js b/FHC-vendor/easyui/plugins/jquery.datetimespinner.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/plugins/jquery.dialog.js b/FHC-vendor/easyui/plugins/jquery.dialog.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/plugins/jquery.draggable.js b/FHC-vendor/easyui/plugins/jquery.draggable.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/plugins/jquery.droppable.js b/FHC-vendor/easyui/plugins/jquery.droppable.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/plugins/jquery.filebox.js b/FHC-vendor/easyui/plugins/jquery.filebox.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/plugins/jquery.form.js b/FHC-vendor/easyui/plugins/jquery.form.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/plugins/jquery.layout.js b/FHC-vendor/easyui/plugins/jquery.layout.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/plugins/jquery.linkbutton.js b/FHC-vendor/easyui/plugins/jquery.linkbutton.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/plugins/jquery.menu.js b/FHC-vendor/easyui/plugins/jquery.menu.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/plugins/jquery.menubutton.js b/FHC-vendor/easyui/plugins/jquery.menubutton.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/plugins/jquery.messager.js b/FHC-vendor/easyui/plugins/jquery.messager.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/plugins/jquery.mobile.js b/FHC-vendor/easyui/plugins/jquery.mobile.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/plugins/jquery.numberbox.js b/FHC-vendor/easyui/plugins/jquery.numberbox.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/plugins/jquery.numberspinner.js b/FHC-vendor/easyui/plugins/jquery.numberspinner.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/plugins/jquery.pagination.js b/FHC-vendor/easyui/plugins/jquery.pagination.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/plugins/jquery.panel.js b/FHC-vendor/easyui/plugins/jquery.panel.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/plugins/jquery.parser.js b/FHC-vendor/easyui/plugins/jquery.parser.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/plugins/jquery.progressbar.js b/FHC-vendor/easyui/plugins/jquery.progressbar.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/plugins/jquery.propertygrid.js b/FHC-vendor/easyui/plugins/jquery.propertygrid.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/plugins/jquery.resizable.js b/FHC-vendor/easyui/plugins/jquery.resizable.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/plugins/jquery.searchbox.js b/FHC-vendor/easyui/plugins/jquery.searchbox.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/plugins/jquery.slider.js b/FHC-vendor/easyui/plugins/jquery.slider.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/plugins/jquery.spinner.js b/FHC-vendor/easyui/plugins/jquery.spinner.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/plugins/jquery.splitbutton.js b/FHC-vendor/easyui/plugins/jquery.splitbutton.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/plugins/jquery.switchbutton.js b/FHC-vendor/easyui/plugins/jquery.switchbutton.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/plugins/jquery.tabs.js b/FHC-vendor/easyui/plugins/jquery.tabs.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/plugins/jquery.textbox.js b/FHC-vendor/easyui/plugins/jquery.textbox.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/plugins/jquery.timespinner.js b/FHC-vendor/easyui/plugins/jquery.timespinner.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/plugins/jquery.tooltip.js b/FHC-vendor/easyui/plugins/jquery.tooltip.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/plugins/jquery.tree.js b/FHC-vendor/easyui/plugins/jquery.tree.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/plugins/jquery.treegrid.js b/FHC-vendor/easyui/plugins/jquery.treegrid.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/plugins/jquery.validatebox.js b/FHC-vendor/easyui/plugins/jquery.validatebox.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/plugins/jquery.window.js b/FHC-vendor/easyui/plugins/jquery.window.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/readme.txt b/FHC-vendor/easyui/readme.txt
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/src/easyloader.js b/FHC-vendor/easyui/src/easyloader.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/src/jquery.accordion.js b/FHC-vendor/easyui/src/jquery.accordion.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/src/jquery.calendar.js b/FHC-vendor/easyui/src/jquery.calendar.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/src/jquery.combobox.js b/FHC-vendor/easyui/src/jquery.combobox.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/src/jquery.datebox.js b/FHC-vendor/easyui/src/jquery.datebox.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/src/jquery.draggable.js b/FHC-vendor/easyui/src/jquery.draggable.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/src/jquery.droppable.js b/FHC-vendor/easyui/src/jquery.droppable.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/src/jquery.form.js b/FHC-vendor/easyui/src/jquery.form.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/src/jquery.linkbutton.js b/FHC-vendor/easyui/src/jquery.linkbutton.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/src/jquery.menu.js b/FHC-vendor/easyui/src/jquery.menu.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/src/jquery.parser.js b/FHC-vendor/easyui/src/jquery.parser.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/src/jquery.progressbar.js b/FHC-vendor/easyui/src/jquery.progressbar.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/src/jquery.propertygrid.js b/FHC-vendor/easyui/src/jquery.propertygrid.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/src/jquery.resizable.js b/FHC-vendor/easyui/src/jquery.resizable.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/src/jquery.slider.js b/FHC-vendor/easyui/src/jquery.slider.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/src/jquery.tabs.js b/FHC-vendor/easyui/src/jquery.tabs.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/src/jquery.window.js b/FHC-vendor/easyui/src/jquery.window.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/black/accordion.css b/FHC-vendor/easyui/themes/black/accordion.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/black/calendar.css b/FHC-vendor/easyui/themes/black/calendar.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/black/combo.css b/FHC-vendor/easyui/themes/black/combo.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/black/combobox.css b/FHC-vendor/easyui/themes/black/combobox.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/black/datagrid.css b/FHC-vendor/easyui/themes/black/datagrid.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/black/datalist.css b/FHC-vendor/easyui/themes/black/datalist.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/black/datebox.css b/FHC-vendor/easyui/themes/black/datebox.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/black/dialog.css b/FHC-vendor/easyui/themes/black/dialog.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/black/easyui.css b/FHC-vendor/easyui/themes/black/easyui.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/black/filebox.css b/FHC-vendor/easyui/themes/black/filebox.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/black/images/accordion_arrows.png b/FHC-vendor/easyui/themes/black/images/accordion_arrows.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/black/images/blank.gif b/FHC-vendor/easyui/themes/black/images/blank.gif
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/black/images/calendar_arrows.png b/FHC-vendor/easyui/themes/black/images/calendar_arrows.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/black/images/combo_arrow.png b/FHC-vendor/easyui/themes/black/images/combo_arrow.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/black/images/datagrid_icons.png b/FHC-vendor/easyui/themes/black/images/datagrid_icons.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/black/images/datebox_arrow.png b/FHC-vendor/easyui/themes/black/images/datebox_arrow.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/black/images/layout_arrows.png b/FHC-vendor/easyui/themes/black/images/layout_arrows.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/black/images/linkbutton_bg.png b/FHC-vendor/easyui/themes/black/images/linkbutton_bg.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/black/images/loading.gif b/FHC-vendor/easyui/themes/black/images/loading.gif
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/black/images/menu_arrows.png b/FHC-vendor/easyui/themes/black/images/menu_arrows.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/black/images/messager_icons.png b/FHC-vendor/easyui/themes/black/images/messager_icons.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/black/images/pagination_icons.png b/FHC-vendor/easyui/themes/black/images/pagination_icons.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/black/images/panel_tools.png b/FHC-vendor/easyui/themes/black/images/panel_tools.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/black/images/searchbox_button.png b/FHC-vendor/easyui/themes/black/images/searchbox_button.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/black/images/slider_handle.png b/FHC-vendor/easyui/themes/black/images/slider_handle.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/black/images/spinner_arrows.png b/FHC-vendor/easyui/themes/black/images/spinner_arrows.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/black/images/tabs_icons.png b/FHC-vendor/easyui/themes/black/images/tabs_icons.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/black/images/tree_icons.png b/FHC-vendor/easyui/themes/black/images/tree_icons.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/black/images/validatebox_warning.png b/FHC-vendor/easyui/themes/black/images/validatebox_warning.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/black/layout.css b/FHC-vendor/easyui/themes/black/layout.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/black/linkbutton.css b/FHC-vendor/easyui/themes/black/linkbutton.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/black/menu.css b/FHC-vendor/easyui/themes/black/menu.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/black/menubutton.css b/FHC-vendor/easyui/themes/black/menubutton.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/black/messager.css b/FHC-vendor/easyui/themes/black/messager.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/black/numberbox.css b/FHC-vendor/easyui/themes/black/numberbox.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/black/pagination.css b/FHC-vendor/easyui/themes/black/pagination.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/black/panel.css b/FHC-vendor/easyui/themes/black/panel.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/black/progressbar.css b/FHC-vendor/easyui/themes/black/progressbar.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/black/propertygrid.css b/FHC-vendor/easyui/themes/black/propertygrid.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/black/searchbox.css b/FHC-vendor/easyui/themes/black/searchbox.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/black/slider.css b/FHC-vendor/easyui/themes/black/slider.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/black/spinner.css b/FHC-vendor/easyui/themes/black/spinner.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/black/splitbutton.css b/FHC-vendor/easyui/themes/black/splitbutton.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/black/switchbutton.css b/FHC-vendor/easyui/themes/black/switchbutton.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/black/tabs.css b/FHC-vendor/easyui/themes/black/tabs.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/black/textbox.css b/FHC-vendor/easyui/themes/black/textbox.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/black/tooltip.css b/FHC-vendor/easyui/themes/black/tooltip.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/black/tree.css b/FHC-vendor/easyui/themes/black/tree.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/black/validatebox.css b/FHC-vendor/easyui/themes/black/validatebox.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/black/window.css b/FHC-vendor/easyui/themes/black/window.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/bootstrap/accordion.css b/FHC-vendor/easyui/themes/bootstrap/accordion.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/bootstrap/calendar.css b/FHC-vendor/easyui/themes/bootstrap/calendar.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/bootstrap/combo.css b/FHC-vendor/easyui/themes/bootstrap/combo.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/bootstrap/combobox.css b/FHC-vendor/easyui/themes/bootstrap/combobox.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/bootstrap/datagrid.css b/FHC-vendor/easyui/themes/bootstrap/datagrid.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/bootstrap/datebox.css b/FHC-vendor/easyui/themes/bootstrap/datebox.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/bootstrap/dialog.css b/FHC-vendor/easyui/themes/bootstrap/dialog.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/bootstrap/easyui.css b/FHC-vendor/easyui/themes/bootstrap/easyui.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/bootstrap/filebox.css b/FHC-vendor/easyui/themes/bootstrap/filebox.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/bootstrap/images/accordion_arrows.png b/FHC-vendor/easyui/themes/bootstrap/images/accordion_arrows.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/bootstrap/images/blank.gif b/FHC-vendor/easyui/themes/bootstrap/images/blank.gif
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/bootstrap/images/calendar_arrows.png b/FHC-vendor/easyui/themes/bootstrap/images/calendar_arrows.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/bootstrap/images/combo_arrow.png b/FHC-vendor/easyui/themes/bootstrap/images/combo_arrow.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/bootstrap/images/datagrid_icons.png b/FHC-vendor/easyui/themes/bootstrap/images/datagrid_icons.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/bootstrap/images/datebox_arrow.png b/FHC-vendor/easyui/themes/bootstrap/images/datebox_arrow.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/bootstrap/images/layout_arrows.png b/FHC-vendor/easyui/themes/bootstrap/images/layout_arrows.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/bootstrap/images/linkbutton_bg.png b/FHC-vendor/easyui/themes/bootstrap/images/linkbutton_bg.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/bootstrap/images/loading.gif b/FHC-vendor/easyui/themes/bootstrap/images/loading.gif
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/bootstrap/images/menu_arrows.png b/FHC-vendor/easyui/themes/bootstrap/images/menu_arrows.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/bootstrap/images/messager_icons.png b/FHC-vendor/easyui/themes/bootstrap/images/messager_icons.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/bootstrap/images/pagination_icons.png b/FHC-vendor/easyui/themes/bootstrap/images/pagination_icons.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/bootstrap/images/panel_tools.png b/FHC-vendor/easyui/themes/bootstrap/images/panel_tools.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/bootstrap/images/searchbox_button.png b/FHC-vendor/easyui/themes/bootstrap/images/searchbox_button.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/bootstrap/images/slider_handle.png b/FHC-vendor/easyui/themes/bootstrap/images/slider_handle.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/bootstrap/images/spinner_arrows.png b/FHC-vendor/easyui/themes/bootstrap/images/spinner_arrows.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/bootstrap/images/tabs_icons.png b/FHC-vendor/easyui/themes/bootstrap/images/tabs_icons.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/bootstrap/images/tree_icons.png b/FHC-vendor/easyui/themes/bootstrap/images/tree_icons.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/bootstrap/images/validatebox_warning.png b/FHC-vendor/easyui/themes/bootstrap/images/validatebox_warning.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/bootstrap/layout.css b/FHC-vendor/easyui/themes/bootstrap/layout.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/bootstrap/linkbutton.css b/FHC-vendor/easyui/themes/bootstrap/linkbutton.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/bootstrap/menu.css b/FHC-vendor/easyui/themes/bootstrap/menu.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/bootstrap/menubutton.css b/FHC-vendor/easyui/themes/bootstrap/menubutton.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/bootstrap/messager.css b/FHC-vendor/easyui/themes/bootstrap/messager.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/bootstrap/numberbox.css b/FHC-vendor/easyui/themes/bootstrap/numberbox.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/bootstrap/pagination.css b/FHC-vendor/easyui/themes/bootstrap/pagination.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/bootstrap/panel.css b/FHC-vendor/easyui/themes/bootstrap/panel.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/bootstrap/progressbar.css b/FHC-vendor/easyui/themes/bootstrap/progressbar.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/bootstrap/propertygrid.css b/FHC-vendor/easyui/themes/bootstrap/propertygrid.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/bootstrap/searchbox.css b/FHC-vendor/easyui/themes/bootstrap/searchbox.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/bootstrap/slider.css b/FHC-vendor/easyui/themes/bootstrap/slider.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/bootstrap/spinner.css b/FHC-vendor/easyui/themes/bootstrap/spinner.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/bootstrap/splitbutton.css b/FHC-vendor/easyui/themes/bootstrap/splitbutton.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/bootstrap/switchbutton.css b/FHC-vendor/easyui/themes/bootstrap/switchbutton.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/bootstrap/tabs.css b/FHC-vendor/easyui/themes/bootstrap/tabs.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/bootstrap/textbox.css b/FHC-vendor/easyui/themes/bootstrap/textbox.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/bootstrap/tooltip.css b/FHC-vendor/easyui/themes/bootstrap/tooltip.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/bootstrap/tree.css b/FHC-vendor/easyui/themes/bootstrap/tree.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/bootstrap/validatebox.css b/FHC-vendor/easyui/themes/bootstrap/validatebox.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/bootstrap/window.css b/FHC-vendor/easyui/themes/bootstrap/window.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/color.css b/FHC-vendor/easyui/themes/color.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/default/accordion.css b/FHC-vendor/easyui/themes/default/accordion.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/default/calendar.css b/FHC-vendor/easyui/themes/default/calendar.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/default/combo.css b/FHC-vendor/easyui/themes/default/combo.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/default/combobox.css b/FHC-vendor/easyui/themes/default/combobox.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/default/datagrid.css b/FHC-vendor/easyui/themes/default/datagrid.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/default/datalist.css b/FHC-vendor/easyui/themes/default/datalist.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/default/datebox.css b/FHC-vendor/easyui/themes/default/datebox.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/default/dialog.css b/FHC-vendor/easyui/themes/default/dialog.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/default/easyui.css b/FHC-vendor/easyui/themes/default/easyui.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/default/filebox.css b/FHC-vendor/easyui/themes/default/filebox.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/default/images/accordion_arrows.png b/FHC-vendor/easyui/themes/default/images/accordion_arrows.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/default/images/blank.gif b/FHC-vendor/easyui/themes/default/images/blank.gif
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/default/images/calendar_arrows.png b/FHC-vendor/easyui/themes/default/images/calendar_arrows.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/default/images/combo_arrow.png b/FHC-vendor/easyui/themes/default/images/combo_arrow.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/default/images/datagrid_icons.png b/FHC-vendor/easyui/themes/default/images/datagrid_icons.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/default/images/datebox_arrow.png b/FHC-vendor/easyui/themes/default/images/datebox_arrow.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/default/images/layout_arrows.png b/FHC-vendor/easyui/themes/default/images/layout_arrows.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/default/images/linkbutton_bg.png b/FHC-vendor/easyui/themes/default/images/linkbutton_bg.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/default/images/loading.gif b/FHC-vendor/easyui/themes/default/images/loading.gif
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/default/images/menu_arrows.png b/FHC-vendor/easyui/themes/default/images/menu_arrows.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/default/images/messager_icons.png b/FHC-vendor/easyui/themes/default/images/messager_icons.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/default/images/pagination_icons.png b/FHC-vendor/easyui/themes/default/images/pagination_icons.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/default/images/panel_tools.png b/FHC-vendor/easyui/themes/default/images/panel_tools.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/default/images/searchbox_button.png b/FHC-vendor/easyui/themes/default/images/searchbox_button.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/default/images/slider_handle.png b/FHC-vendor/easyui/themes/default/images/slider_handle.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/default/images/spinner_arrows.png b/FHC-vendor/easyui/themes/default/images/spinner_arrows.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/default/images/tabs_icons.png b/FHC-vendor/easyui/themes/default/images/tabs_icons.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/default/images/tree_icons.png b/FHC-vendor/easyui/themes/default/images/tree_icons.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/default/images/validatebox_warning.png b/FHC-vendor/easyui/themes/default/images/validatebox_warning.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/default/layout.css b/FHC-vendor/easyui/themes/default/layout.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/default/linkbutton.css b/FHC-vendor/easyui/themes/default/linkbutton.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/default/menu.css b/FHC-vendor/easyui/themes/default/menu.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/default/menubutton.css b/FHC-vendor/easyui/themes/default/menubutton.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/default/messager.css b/FHC-vendor/easyui/themes/default/messager.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/default/numberbox.css b/FHC-vendor/easyui/themes/default/numberbox.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/default/pagination.css b/FHC-vendor/easyui/themes/default/pagination.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/default/panel.css b/FHC-vendor/easyui/themes/default/panel.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/default/progressbar.css b/FHC-vendor/easyui/themes/default/progressbar.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/default/propertygrid.css b/FHC-vendor/easyui/themes/default/propertygrid.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/default/searchbox.css b/FHC-vendor/easyui/themes/default/searchbox.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/default/slider.css b/FHC-vendor/easyui/themes/default/slider.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/default/spinner.css b/FHC-vendor/easyui/themes/default/spinner.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/default/splitbutton.css b/FHC-vendor/easyui/themes/default/splitbutton.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/default/switchbutton.css b/FHC-vendor/easyui/themes/default/switchbutton.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/default/tabs.css b/FHC-vendor/easyui/themes/default/tabs.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/default/textbox.css b/FHC-vendor/easyui/themes/default/textbox.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/default/tooltip.css b/FHC-vendor/easyui/themes/default/tooltip.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/default/tree.css b/FHC-vendor/easyui/themes/default/tree.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/default/validatebox.css b/FHC-vendor/easyui/themes/default/validatebox.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/default/window.css b/FHC-vendor/easyui/themes/default/window.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/gray/accordion.css b/FHC-vendor/easyui/themes/gray/accordion.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/gray/calendar.css b/FHC-vendor/easyui/themes/gray/calendar.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/gray/combo.css b/FHC-vendor/easyui/themes/gray/combo.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/gray/combobox.css b/FHC-vendor/easyui/themes/gray/combobox.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/gray/datagrid.css b/FHC-vendor/easyui/themes/gray/datagrid.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/gray/datalist.css b/FHC-vendor/easyui/themes/gray/datalist.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/gray/datebox.css b/FHC-vendor/easyui/themes/gray/datebox.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/gray/dialog.css b/FHC-vendor/easyui/themes/gray/dialog.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/gray/easyui.css b/FHC-vendor/easyui/themes/gray/easyui.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/gray/filebox.css b/FHC-vendor/easyui/themes/gray/filebox.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/gray/images/accordion_arrows.png b/FHC-vendor/easyui/themes/gray/images/accordion_arrows.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/gray/images/blank.gif b/FHC-vendor/easyui/themes/gray/images/blank.gif
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/gray/images/calendar_arrows.png b/FHC-vendor/easyui/themes/gray/images/calendar_arrows.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/gray/images/combo_arrow.png b/FHC-vendor/easyui/themes/gray/images/combo_arrow.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/gray/images/datagrid_icons.png b/FHC-vendor/easyui/themes/gray/images/datagrid_icons.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/gray/images/datebox_arrow.png b/FHC-vendor/easyui/themes/gray/images/datebox_arrow.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/gray/images/layout_arrows.png b/FHC-vendor/easyui/themes/gray/images/layout_arrows.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/gray/images/linkbutton_bg.png b/FHC-vendor/easyui/themes/gray/images/linkbutton_bg.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/gray/images/loading.gif b/FHC-vendor/easyui/themes/gray/images/loading.gif
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/gray/images/menu_arrows.png b/FHC-vendor/easyui/themes/gray/images/menu_arrows.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/gray/images/messager_icons.png b/FHC-vendor/easyui/themes/gray/images/messager_icons.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/gray/images/pagination_icons.png b/FHC-vendor/easyui/themes/gray/images/pagination_icons.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/gray/images/panel_tools.png b/FHC-vendor/easyui/themes/gray/images/panel_tools.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/gray/images/searchbox_button.png b/FHC-vendor/easyui/themes/gray/images/searchbox_button.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/gray/images/slider_handle.png b/FHC-vendor/easyui/themes/gray/images/slider_handle.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/gray/images/spinner_arrows.png b/FHC-vendor/easyui/themes/gray/images/spinner_arrows.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/gray/images/tabs_icons.png b/FHC-vendor/easyui/themes/gray/images/tabs_icons.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/gray/images/tree_icons.png b/FHC-vendor/easyui/themes/gray/images/tree_icons.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/gray/images/validatebox_warning.png b/FHC-vendor/easyui/themes/gray/images/validatebox_warning.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/gray/layout.css b/FHC-vendor/easyui/themes/gray/layout.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/gray/linkbutton.css b/FHC-vendor/easyui/themes/gray/linkbutton.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/gray/menu.css b/FHC-vendor/easyui/themes/gray/menu.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/gray/menubutton.css b/FHC-vendor/easyui/themes/gray/menubutton.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/gray/messager.css b/FHC-vendor/easyui/themes/gray/messager.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/gray/numberbox.css b/FHC-vendor/easyui/themes/gray/numberbox.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/gray/pagination.css b/FHC-vendor/easyui/themes/gray/pagination.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/gray/panel.css b/FHC-vendor/easyui/themes/gray/panel.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/gray/progressbar.css b/FHC-vendor/easyui/themes/gray/progressbar.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/gray/propertygrid.css b/FHC-vendor/easyui/themes/gray/propertygrid.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/gray/searchbox.css b/FHC-vendor/easyui/themes/gray/searchbox.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/gray/slider.css b/FHC-vendor/easyui/themes/gray/slider.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/gray/spinner.css b/FHC-vendor/easyui/themes/gray/spinner.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/gray/splitbutton.css b/FHC-vendor/easyui/themes/gray/splitbutton.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/gray/switchbutton.css b/FHC-vendor/easyui/themes/gray/switchbutton.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/gray/tabs.css b/FHC-vendor/easyui/themes/gray/tabs.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/gray/textbox.css b/FHC-vendor/easyui/themes/gray/textbox.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/gray/tooltip.css b/FHC-vendor/easyui/themes/gray/tooltip.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/gray/tree.css b/FHC-vendor/easyui/themes/gray/tree.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/gray/validatebox.css b/FHC-vendor/easyui/themes/gray/validatebox.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/gray/window.css b/FHC-vendor/easyui/themes/gray/window.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/icon.css b/FHC-vendor/easyui/themes/icon.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/icons/back.png b/FHC-vendor/easyui/themes/icons/back.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/icons/blank.gif b/FHC-vendor/easyui/themes/icons/blank.gif
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/icons/cancel.png b/FHC-vendor/easyui/themes/icons/cancel.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/icons/clear.png b/FHC-vendor/easyui/themes/icons/clear.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/icons/cut.png b/FHC-vendor/easyui/themes/icons/cut.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/icons/edit_add.png b/FHC-vendor/easyui/themes/icons/edit_add.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/icons/edit_remove.png b/FHC-vendor/easyui/themes/icons/edit_remove.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/icons/filesave.png b/FHC-vendor/easyui/themes/icons/filesave.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/icons/filter.png b/FHC-vendor/easyui/themes/icons/filter.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/icons/help.png b/FHC-vendor/easyui/themes/icons/help.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/icons/large_chart.png b/FHC-vendor/easyui/themes/icons/large_chart.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/icons/large_clipart.png b/FHC-vendor/easyui/themes/icons/large_clipart.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/icons/large_picture.png b/FHC-vendor/easyui/themes/icons/large_picture.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/icons/large_shapes.png b/FHC-vendor/easyui/themes/icons/large_shapes.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/icons/large_smartart.png b/FHC-vendor/easyui/themes/icons/large_smartart.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/icons/lock.png b/FHC-vendor/easyui/themes/icons/lock.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/icons/man.png b/FHC-vendor/easyui/themes/icons/man.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/icons/mini_add.png b/FHC-vendor/easyui/themes/icons/mini_add.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/icons/mini_edit.png b/FHC-vendor/easyui/themes/icons/mini_edit.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/icons/mini_refresh.png b/FHC-vendor/easyui/themes/icons/mini_refresh.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/icons/more.png b/FHC-vendor/easyui/themes/icons/more.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/icons/no.png b/FHC-vendor/easyui/themes/icons/no.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/icons/ok.png b/FHC-vendor/easyui/themes/icons/ok.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/icons/pencil.png b/FHC-vendor/easyui/themes/icons/pencil.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/icons/print.png b/FHC-vendor/easyui/themes/icons/print.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/icons/redo.png b/FHC-vendor/easyui/themes/icons/redo.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/icons/reload.png b/FHC-vendor/easyui/themes/icons/reload.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/icons/search.png b/FHC-vendor/easyui/themes/icons/search.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/icons/sum.png b/FHC-vendor/easyui/themes/icons/sum.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/icons/tip.png b/FHC-vendor/easyui/themes/icons/tip.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/icons/undo.png b/FHC-vendor/easyui/themes/icons/undo.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/metro/accordion.css b/FHC-vendor/easyui/themes/metro/accordion.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/metro/calendar.css b/FHC-vendor/easyui/themes/metro/calendar.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/metro/combo.css b/FHC-vendor/easyui/themes/metro/combo.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/metro/combobox.css b/FHC-vendor/easyui/themes/metro/combobox.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/metro/datagrid.css b/FHC-vendor/easyui/themes/metro/datagrid.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/metro/datalist.css b/FHC-vendor/easyui/themes/metro/datalist.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/metro/datebox.css b/FHC-vendor/easyui/themes/metro/datebox.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/metro/dialog.css b/FHC-vendor/easyui/themes/metro/dialog.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/metro/easyui.css b/FHC-vendor/easyui/themes/metro/easyui.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/metro/filebox.css b/FHC-vendor/easyui/themes/metro/filebox.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/metro/images/accordion_arrows.png b/FHC-vendor/easyui/themes/metro/images/accordion_arrows.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/metro/images/blank.gif b/FHC-vendor/easyui/themes/metro/images/blank.gif
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/metro/images/calendar_arrows.png b/FHC-vendor/easyui/themes/metro/images/calendar_arrows.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/metro/images/combo_arrow.png b/FHC-vendor/easyui/themes/metro/images/combo_arrow.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/metro/images/datagrid_icons.png b/FHC-vendor/easyui/themes/metro/images/datagrid_icons.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/metro/images/datebox_arrow.png b/FHC-vendor/easyui/themes/metro/images/datebox_arrow.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/metro/images/layout_arrows.png b/FHC-vendor/easyui/themes/metro/images/layout_arrows.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/metro/images/linkbutton_bg.png b/FHC-vendor/easyui/themes/metro/images/linkbutton_bg.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/metro/images/loading.gif b/FHC-vendor/easyui/themes/metro/images/loading.gif
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/metro/images/menu_arrows.png b/FHC-vendor/easyui/themes/metro/images/menu_arrows.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/metro/images/messager_icons.png b/FHC-vendor/easyui/themes/metro/images/messager_icons.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/metro/images/pagination_icons.png b/FHC-vendor/easyui/themes/metro/images/pagination_icons.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/metro/images/panel_tools.png b/FHC-vendor/easyui/themes/metro/images/panel_tools.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/metro/images/searchbox_button.png b/FHC-vendor/easyui/themes/metro/images/searchbox_button.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/metro/images/slider_handle.png b/FHC-vendor/easyui/themes/metro/images/slider_handle.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/metro/images/spinner_arrows.png b/FHC-vendor/easyui/themes/metro/images/spinner_arrows.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/metro/images/tabs_icons.png b/FHC-vendor/easyui/themes/metro/images/tabs_icons.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/metro/images/tree_icons.png b/FHC-vendor/easyui/themes/metro/images/tree_icons.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/metro/images/validatebox_warning.png b/FHC-vendor/easyui/themes/metro/images/validatebox_warning.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/metro/layout.css b/FHC-vendor/easyui/themes/metro/layout.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/metro/linkbutton.css b/FHC-vendor/easyui/themes/metro/linkbutton.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/metro/menu.css b/FHC-vendor/easyui/themes/metro/menu.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/metro/menubutton.css b/FHC-vendor/easyui/themes/metro/menubutton.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/metro/messager.css b/FHC-vendor/easyui/themes/metro/messager.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/metro/numberbox.css b/FHC-vendor/easyui/themes/metro/numberbox.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/metro/pagination.css b/FHC-vendor/easyui/themes/metro/pagination.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/metro/panel.css b/FHC-vendor/easyui/themes/metro/panel.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/metro/progressbar.css b/FHC-vendor/easyui/themes/metro/progressbar.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/metro/propertygrid.css b/FHC-vendor/easyui/themes/metro/propertygrid.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/metro/searchbox.css b/FHC-vendor/easyui/themes/metro/searchbox.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/metro/slider.css b/FHC-vendor/easyui/themes/metro/slider.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/metro/spinner.css b/FHC-vendor/easyui/themes/metro/spinner.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/metro/splitbutton.css b/FHC-vendor/easyui/themes/metro/splitbutton.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/metro/switchbutton.css b/FHC-vendor/easyui/themes/metro/switchbutton.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/metro/tabs.css b/FHC-vendor/easyui/themes/metro/tabs.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/metro/textbox.css b/FHC-vendor/easyui/themes/metro/textbox.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/metro/tooltip.css b/FHC-vendor/easyui/themes/metro/tooltip.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/metro/tree.css b/FHC-vendor/easyui/themes/metro/tree.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/metro/validatebox.css b/FHC-vendor/easyui/themes/metro/validatebox.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/metro/window.css b/FHC-vendor/easyui/themes/metro/window.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/mobile.css b/FHC-vendor/easyui/themes/mobile.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/easyui/themes/vilesci b/FHC-vendor/easyui/themes/vilesci
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/.gitattributes b/FHC-vendor/jquery-tablesorter/.gitattributes
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/.gitignore b/FHC-vendor/jquery-tablesorter/.gitignore
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/.jscsrc b/FHC-vendor/jquery-tablesorter/.jscsrc
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/CONTRIBUTING.md b/FHC-vendor/jquery-tablesorter/CONTRIBUTING.md
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/Gruntfile.js b/FHC-vendor/jquery-tablesorter/Gruntfile.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/README.md b/FHC-vendor/jquery-tablesorter/README.md
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/addons/pager/icons/first.png b/FHC-vendor/jquery-tablesorter/addons/pager/icons/first.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/addons/pager/icons/last.png b/FHC-vendor/jquery-tablesorter/addons/pager/icons/last.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/addons/pager/icons/loading.gif b/FHC-vendor/jquery-tablesorter/addons/pager/icons/loading.gif
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/addons/pager/icons/next.png b/FHC-vendor/jquery-tablesorter/addons/pager/icons/next.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/addons/pager/icons/prev.png b/FHC-vendor/jquery-tablesorter/addons/pager/icons/prev.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/addons/pager/jquery.tablesorter.pager.css b/FHC-vendor/jquery-tablesorter/addons/pager/jquery.tablesorter.pager.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/addons/pager/jquery.tablesorter.pager.js b/FHC-vendor/jquery-tablesorter/addons/pager/jquery.tablesorter.pager.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/beta-testing/example-pager-custom-controls.html b/FHC-vendor/jquery-tablesorter/beta-testing/example-pager-custom-controls.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/beta-testing/example-widget-column-reorder.html b/FHC-vendor/jquery-tablesorter/beta-testing/example-widget-column-reorder.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/beta-testing/pager-custom-controls.js b/FHC-vendor/jquery-tablesorter/beta-testing/pager-custom-controls.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/beta-testing/widget-reorder.js b/FHC-vendor/jquery-tablesorter/beta-testing/widget-reorder.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/bower.json b/FHC-vendor/jquery-tablesorter/bower.json
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/changelog.txt b/FHC-vendor/jquery-tablesorter/changelog.txt
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/css/bootstrap.less b/FHC-vendor/jquery-tablesorter/css/bootstrap.less
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/css/dragtable.mod.css b/FHC-vendor/jquery-tablesorter/css/dragtable.mod.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/css/filter.formatter.css b/FHC-vendor/jquery-tablesorter/css/filter.formatter.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/css/images/black-asc.gif b/FHC-vendor/jquery-tablesorter/css/images/black-asc.gif
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/css/images/black-desc.gif b/FHC-vendor/jquery-tablesorter/css/images/black-desc.gif
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/css/images/black-unsorted.gif b/FHC-vendor/jquery-tablesorter/css/images/black-unsorted.gif
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/css/images/bootstrap-black-unsorted.png b/FHC-vendor/jquery-tablesorter/css/images/bootstrap-black-unsorted.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/css/images/bootstrap-white-unsorted.png b/FHC-vendor/jquery-tablesorter/css/images/bootstrap-white-unsorted.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/css/images/dragtable-handle.png b/FHC-vendor/jquery-tablesorter/css/images/dragtable-handle.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/css/images/dragtable-handle.svg b/FHC-vendor/jquery-tablesorter/css/images/dragtable-handle.svg
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/css/images/dropbox-asc-hovered.png b/FHC-vendor/jquery-tablesorter/css/images/dropbox-asc-hovered.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/css/images/dropbox-asc.png b/FHC-vendor/jquery-tablesorter/css/images/dropbox-asc.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/css/images/dropbox-desc-hovered.png b/FHC-vendor/jquery-tablesorter/css/images/dropbox-desc-hovered.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/css/images/dropbox-desc.png b/FHC-vendor/jquery-tablesorter/css/images/dropbox-desc.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/css/images/green-asc.gif b/FHC-vendor/jquery-tablesorter/css/images/green-asc.gif
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/css/images/green-desc.gif b/FHC-vendor/jquery-tablesorter/css/images/green-desc.gif
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/css/images/green-header.gif b/FHC-vendor/jquery-tablesorter/css/images/green-header.gif
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/css/images/green-unsorted.gif b/FHC-vendor/jquery-tablesorter/css/images/green-unsorted.gif
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/css/images/ice-asc.gif b/FHC-vendor/jquery-tablesorter/css/images/ice-asc.gif
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/css/images/ice-desc.gif b/FHC-vendor/jquery-tablesorter/css/images/ice-desc.gif
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/css/images/ice-unsorted.gif b/FHC-vendor/jquery-tablesorter/css/images/ice-unsorted.gif
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/css/images/metro-black-asc.png b/FHC-vendor/jquery-tablesorter/css/images/metro-black-asc.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/css/images/metro-black-desc.png b/FHC-vendor/jquery-tablesorter/css/images/metro-black-desc.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/css/images/metro-loading.gif b/FHC-vendor/jquery-tablesorter/css/images/metro-loading.gif
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/css/images/metro-unsorted.png b/FHC-vendor/jquery-tablesorter/css/images/metro-unsorted.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/css/images/metro-white-asc.png b/FHC-vendor/jquery-tablesorter/css/images/metro-white-asc.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/css/images/metro-white-desc.png b/FHC-vendor/jquery-tablesorter/css/images/metro-white-desc.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/css/images/white-asc.gif b/FHC-vendor/jquery-tablesorter/css/images/white-asc.gif
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/css/images/white-desc.gif b/FHC-vendor/jquery-tablesorter/css/images/white-desc.gif
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/css/images/white-unsorted.gif b/FHC-vendor/jquery-tablesorter/css/images/white-unsorted.gif
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/css/metro.less b/FHC-vendor/jquery-tablesorter/css/metro.less
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/css/psd/green-asc.psd b/FHC-vendor/jquery-tablesorter/css/psd/green-asc.psd
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/css/psd/green-desc.psd b/FHC-vendor/jquery-tablesorter/css/psd/green-desc.psd
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/css/psd/green-unsorted.psd b/FHC-vendor/jquery-tablesorter/css/psd/green-unsorted.psd
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/css/psd/metro-style.psd b/FHC-vendor/jquery-tablesorter/css/psd/metro-style.psd
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/css/theme.black-ice.css b/FHC-vendor/jquery-tablesorter/css/theme.black-ice.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/css/theme.blue.css b/FHC-vendor/jquery-tablesorter/css/theme.blue.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/css/theme.bootstrap.css b/FHC-vendor/jquery-tablesorter/css/theme.bootstrap.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/css/theme.bootstrap_2.css b/FHC-vendor/jquery-tablesorter/css/theme.bootstrap_2.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/css/theme.dark.css b/FHC-vendor/jquery-tablesorter/css/theme.dark.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/css/theme.default.css b/FHC-vendor/jquery-tablesorter/css/theme.default.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/css/theme.dropbox.css b/FHC-vendor/jquery-tablesorter/css/theme.dropbox.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/css/theme.green.css b/FHC-vendor/jquery-tablesorter/css/theme.green.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/css/theme.grey.css b/FHC-vendor/jquery-tablesorter/css/theme.grey.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/css/theme.ice.css b/FHC-vendor/jquery-tablesorter/css/theme.ice.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/css/theme.jui.css b/FHC-vendor/jquery-tablesorter/css/theme.jui.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/css/theme.less b/FHC-vendor/jquery-tablesorter/css/theme.less
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/css/theme.metro-dark.css b/FHC-vendor/jquery-tablesorter/css/theme.metro-dark.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/dragtable.mod.min.css b/FHC-vendor/jquery-tablesorter/dist/css/dragtable.mod.min.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/filter.formatter.min.css b/FHC-vendor/jquery-tablesorter/dist/css/filter.formatter.min.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/black-asc.gif b/FHC-vendor/jquery-tablesorter/dist/css/images/black-asc.gif
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/black-desc.gif b/FHC-vendor/jquery-tablesorter/dist/css/images/black-desc.gif
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/black-unsorted.gif b/FHC-vendor/jquery-tablesorter/dist/css/images/black-unsorted.gif
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/bootstrap-black-unsorted.png b/FHC-vendor/jquery-tablesorter/dist/css/images/bootstrap-black-unsorted.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/bootstrap-white-unsorted.png b/FHC-vendor/jquery-tablesorter/dist/css/images/bootstrap-white-unsorted.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/dragtable-handle.png b/FHC-vendor/jquery-tablesorter/dist/css/images/dragtable-handle.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/dragtable-handle.svg b/FHC-vendor/jquery-tablesorter/dist/css/images/dragtable-handle.svg
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/dropbox-asc-hovered.png b/FHC-vendor/jquery-tablesorter/dist/css/images/dropbox-asc-hovered.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/dropbox-asc.png b/FHC-vendor/jquery-tablesorter/dist/css/images/dropbox-asc.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/dropbox-desc-hovered.png b/FHC-vendor/jquery-tablesorter/dist/css/images/dropbox-desc-hovered.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/dropbox-desc.png b/FHC-vendor/jquery-tablesorter/dist/css/images/dropbox-desc.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/first.png b/FHC-vendor/jquery-tablesorter/dist/css/images/first.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/green-asc.gif b/FHC-vendor/jquery-tablesorter/dist/css/images/green-asc.gif
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/green-desc.gif b/FHC-vendor/jquery-tablesorter/dist/css/images/green-desc.gif
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/green-header.gif b/FHC-vendor/jquery-tablesorter/dist/css/images/green-header.gif
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/green-unsorted.gif b/FHC-vendor/jquery-tablesorter/dist/css/images/green-unsorted.gif
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/ice-asc.gif b/FHC-vendor/jquery-tablesorter/dist/css/images/ice-asc.gif
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/ice-desc.gif b/FHC-vendor/jquery-tablesorter/dist/css/images/ice-desc.gif
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/ice-unsorted.gif b/FHC-vendor/jquery-tablesorter/dist/css/images/ice-unsorted.gif
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/last.png b/FHC-vendor/jquery-tablesorter/dist/css/images/last.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/loading.gif b/FHC-vendor/jquery-tablesorter/dist/css/images/loading.gif
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/metro-black-asc.png b/FHC-vendor/jquery-tablesorter/dist/css/images/metro-black-asc.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/metro-black-desc.png b/FHC-vendor/jquery-tablesorter/dist/css/images/metro-black-desc.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/metro-loading.gif b/FHC-vendor/jquery-tablesorter/dist/css/images/metro-loading.gif
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/metro-unsorted.png b/FHC-vendor/jquery-tablesorter/dist/css/images/metro-unsorted.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/metro-white-asc.png b/FHC-vendor/jquery-tablesorter/dist/css/images/metro-white-asc.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/metro-white-desc.png b/FHC-vendor/jquery-tablesorter/dist/css/images/metro-white-desc.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/next.png b/FHC-vendor/jquery-tablesorter/dist/css/images/next.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/prev.png b/FHC-vendor/jquery-tablesorter/dist/css/images/prev.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/white-asc.gif b/FHC-vendor/jquery-tablesorter/dist/css/images/white-asc.gif
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/white-desc.gif b/FHC-vendor/jquery-tablesorter/dist/css/images/white-desc.gif
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/images/white-unsorted.gif b/FHC-vendor/jquery-tablesorter/dist/css/images/white-unsorted.gif
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/jquery.tablesorter.pager.min.css b/FHC-vendor/jquery-tablesorter/dist/css/jquery.tablesorter.pager.min.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/less/bootstrap.less b/FHC-vendor/jquery-tablesorter/dist/css/less/bootstrap.less
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/less/metro.less b/FHC-vendor/jquery-tablesorter/dist/css/less/metro.less
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/less/theme.less b/FHC-vendor/jquery-tablesorter/dist/css/less/theme.less
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/theme.blackice.min.css b/FHC-vendor/jquery-tablesorter/dist/css/theme.blackice.min.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/theme.blue.min.css b/FHC-vendor/jquery-tablesorter/dist/css/theme.blue.min.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/theme.bootstrap.min.css b/FHC-vendor/jquery-tablesorter/dist/css/theme.bootstrap.min.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/theme.bootstrap_2.min.css b/FHC-vendor/jquery-tablesorter/dist/css/theme.bootstrap_2.min.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/theme.dark.min.css b/FHC-vendor/jquery-tablesorter/dist/css/theme.dark.min.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/theme.default.min.css b/FHC-vendor/jquery-tablesorter/dist/css/theme.default.min.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/theme.dropbox.min.css b/FHC-vendor/jquery-tablesorter/dist/css/theme.dropbox.min.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/theme.green.min.css b/FHC-vendor/jquery-tablesorter/dist/css/theme.green.min.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/theme.grey.min.css b/FHC-vendor/jquery-tablesorter/dist/css/theme.grey.min.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/theme.ice.min.css b/FHC-vendor/jquery-tablesorter/dist/css/theme.ice.min.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/theme.jui.min.css b/FHC-vendor/jquery-tablesorter/dist/css/theme.jui.min.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/css/theme.metro-dark.min.css b/FHC-vendor/jquery-tablesorter/dist/css/theme.metro-dark.min.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/extras/jquery.dragtable.mod.min.js b/FHC-vendor/jquery-tablesorter/dist/js/extras/jquery.dragtable.mod.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/extras/jquery.metadata.min.js b/FHC-vendor/jquery-tablesorter/dist/js/extras/jquery.metadata.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/extras/jquery.tablesorter.pager.min.js b/FHC-vendor/jquery-tablesorter/dist/js/extras/jquery.tablesorter.pager.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/extras/semver-mod.min.js b/FHC-vendor/jquery-tablesorter/dist/js/extras/semver-mod.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.combined.js b/FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.combined.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.combined.min.js b/FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.combined.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.js b/FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.min.js b/FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.widgets.js b/FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.widgets.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.widgets.min.js b/FHC-vendor/jquery-tablesorter/dist/js/jquery.tablesorter.widgets.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-extract.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-extract.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-iso8601.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-iso8601.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-month.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-month.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-range.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-range.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-two-digit-year.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-two-digit-year.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-weekday.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date-weekday.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-date.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-duration.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-duration.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-feet-inch-fraction.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-feet-inch-fraction.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-file-type.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-file-type.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-globalize.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-globalize.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-ignore-articles.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-ignore-articles.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-image.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-image.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-input-select.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-input-select.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-metric.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-metric.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-named-numbers.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-named-numbers.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-network.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-network.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-roman.min.js b/FHC-vendor/jquery-tablesorter/dist/js/parsers/parser-roman.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-alignChar.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-alignChar.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-build-table.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-build-table.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-chart.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-chart.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-columnSelector.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-columnSelector.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-columns.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-columns.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-cssStickyHeaders.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-cssStickyHeaders.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-editable.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-editable.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-filter-formatter-html5.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-filter-formatter-html5.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-filter-formatter-jui.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-filter-formatter-jui.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-filter-formatter-select2.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-filter-formatter-select2.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-filter-type-insideRange.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-filter-type-insideRange.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-filter.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-filter.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-formatter.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-formatter.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-grouping.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-grouping.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-headerTitles.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-headerTitles.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-lazyload.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-lazyload.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-math.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-math.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-output.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-output.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-pager.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-pager.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-print.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-print.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-reflow.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-reflow.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-repeatheaders.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-repeatheaders.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-resizable.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-resizable.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-saveSort.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-saveSort.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-scroller.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-scroller.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-sort2Hash.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-sort2Hash.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-sortTbodies.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-sortTbodies.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-staticRow.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-staticRow.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-stickyHeaders.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-stickyHeaders.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-storage.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-storage.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-toggle.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-toggle.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-uitheme.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-uitheme.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-view.min.js b/FHC-vendor/jquery-tablesorter/dist/js/widgets/widget-view.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/assets/City0.json b/FHC-vendor/jquery-tablesorter/docs/assets/City0.json
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/assets/City1.json b/FHC-vendor/jquery-tablesorter/docs/assets/City1.json
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/assets/City2.json b/FHC-vendor/jquery-tablesorter/docs/assets/City2.json
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/assets/City3.json b/FHC-vendor/jquery-tablesorter/docs/assets/City3.json
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/assets/ajax-content.html b/FHC-vendor/jquery-tablesorter/docs/assets/ajax-content.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/assets/build.json b/FHC-vendor/jquery-tablesorter/docs/assets/build.json
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/assets/build.txt b/FHC-vendor/jquery-tablesorter/docs/assets/build.txt
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/assets/theme_switcher.json b/FHC-vendor/jquery-tablesorter/docs/assets/theme_switcher.json
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/bootstrap-v2.min.css b/FHC-vendor/jquery-tablesorter/docs/css/bootstrap-v2.min.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/bootstrap.min.css b/FHC-vendor/jquery-tablesorter/docs/css/bootstrap.min.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/images/glyphicons-halflings-white.png b/FHC-vendor/jquery-tablesorter/docs/css/images/glyphicons-halflings-white.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/images/glyphicons-halflings.png b/FHC-vendor/jquery-tablesorter/docs/css/images/glyphicons-halflings.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png b/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_flat_15_cd0a0a_40x100.png b/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_flat_15_cd0a0a_40x100.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_glass_100_e4f1fb_1x400.png b/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_glass_100_e4f1fb_1x400.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_glass_50_3baae3_1x400.png b/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_glass_50_3baae3_1x400.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_glass_80_d7ebf9_1x400.png b/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_glass_80_d7ebf9_1x400.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png b/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_highlight-hard_70_000000_1x100.png b/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_highlight-hard_70_000000_1x100.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_highlight-soft_100_deedf7_1x100.png b/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_highlight-soft_100_deedf7_1x100.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_highlight-soft_25_ffef8f_1x100.png b/FHC-vendor/jquery-tablesorter/docs/css/images/ui-bg_highlight-soft_25_ffef8f_1x100.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/images/ui-icons_2694e8_256x240.png b/FHC-vendor/jquery-tablesorter/docs/css/images/ui-icons_2694e8_256x240.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/images/ui-icons_2e83ff_256x240.png b/FHC-vendor/jquery-tablesorter/docs/css/images/ui-icons_2e83ff_256x240.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/images/ui-icons_3d80b3_256x240.png b/FHC-vendor/jquery-tablesorter/docs/css/images/ui-icons_3d80b3_256x240.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/images/ui-icons_72a7cf_256x240.png b/FHC-vendor/jquery-tablesorter/docs/css/images/ui-icons_72a7cf_256x240.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/images/ui-icons_ffffff_256x240.png b/FHC-vendor/jquery-tablesorter/docs/css/images/ui-icons_ffffff_256x240.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/jq.css b/FHC-vendor/jquery-tablesorter/docs/css/jq.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/jquery-ui.min.css b/FHC-vendor/jquery-tablesorter/docs/css/jquery-ui.min.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/magnific-popup.css b/FHC-vendor/jquery-tablesorter/docs/css/magnific-popup.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/menu.css b/FHC-vendor/jquery-tablesorter/docs/css/menu.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/prettify.css b/FHC-vendor/jquery-tablesorter/docs/css/prettify.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/rangeslider.css b/FHC-vendor/jquery-tablesorter/docs/css/rangeslider.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/select2-3.4.6.min.css b/FHC-vendor/jquery-tablesorter/docs/css/select2-3.4.6.min.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/select2-spinner.gif b/FHC-vendor/jquery-tablesorter/docs/css/select2-spinner.gif
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/select2.png b/FHC-vendor/jquery-tablesorter/docs/css/select2.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/select2x2.png b/FHC-vendor/jquery-tablesorter/docs/css/select2x2.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/css/tipsy.css b/FHC-vendor/jquery-tablesorter/docs/css/tipsy.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-add-rows.html b/FHC-vendor/jquery-tablesorter/docs/example-add-rows.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-ajax.html b/FHC-vendor/jquery-tablesorter/docs/example-ajax.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-apply-widget.html b/FHC-vendor/jquery-tablesorter/docs/example-apply-widget.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-child-rows-filtered.html b/FHC-vendor/jquery-tablesorter/docs/example-child-rows-filtered.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-child-rows.html b/FHC-vendor/jquery-tablesorter/docs/example-child-rows.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-css-highlighting.html b/FHC-vendor/jquery-tablesorter/docs/example-css-highlighting.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-dragtable.html b/FHC-vendor/jquery-tablesorter/docs/example-dragtable.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-empty-table.html b/FHC-vendor/jquery-tablesorter/docs/example-empty-table.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-extending-defaults.html b/FHC-vendor/jquery-tablesorter/docs/example-extending-defaults.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-extractors-parsers.html b/FHC-vendor/jquery-tablesorter/docs/example-extractors-parsers.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-header-column-span.html b/FHC-vendor/jquery-tablesorter/docs/example-header-column-span.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-locale-sort.html b/FHC-vendor/jquery-tablesorter/docs/example-locale-sort.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-meta-headers.html b/FHC-vendor/jquery-tablesorter/docs/example-meta-headers.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-meta-parsers.html b/FHC-vendor/jquery-tablesorter/docs/example-meta-parsers.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-meta-sort-list.html b/FHC-vendor/jquery-tablesorter/docs/example-meta-sort-list.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-method-sortreset.html b/FHC-vendor/jquery-tablesorter/docs/example-method-sortreset.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-multiple-tbodies.html b/FHC-vendor/jquery-tablesorter/docs/example-multiple-tbodies.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-option-custom-sort.html b/FHC-vendor/jquery-tablesorter/docs/example-option-custom-sort.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-option-date-format.html b/FHC-vendor/jquery-tablesorter/docs/example-option-date-format.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-option-debug.html b/FHC-vendor/jquery-tablesorter/docs/example-option-debug.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-option-delay-init.html b/FHC-vendor/jquery-tablesorter/docs/example-option-delay-init.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-option-digits.html b/FHC-vendor/jquery-tablesorter/docs/example-option-digits.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-option-render-header.html b/FHC-vendor/jquery-tablesorter/docs/example-option-render-header.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-option-render-template.html b/FHC-vendor/jquery-tablesorter/docs/example-option-render-template.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-option-selectorsort.html b/FHC-vendor/jquery-tablesorter/docs/example-option-selectorsort.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-option-show-processing.html b/FHC-vendor/jquery-tablesorter/docs/example-option-show-processing.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-option-sort-append.html b/FHC-vendor/jquery-tablesorter/docs/example-option-sort-append.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-option-sort-empty.html b/FHC-vendor/jquery-tablesorter/docs/example-option-sort-empty.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-option-sort-force.html b/FHC-vendor/jquery-tablesorter/docs/example-option-sort-force.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-option-sort-key.html b/FHC-vendor/jquery-tablesorter/docs/example-option-sort-key.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-option-sort-list.html b/FHC-vendor/jquery-tablesorter/docs/example-option-sort-list.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-option-sort-order.html b/FHC-vendor/jquery-tablesorter/docs/example-option-sort-order.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-option-sortreset-sortrestart.html b/FHC-vendor/jquery-tablesorter/docs/example-option-sortreset-sortrestart.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-option-text-extraction.html b/FHC-vendor/jquery-tablesorter/docs/example-option-text-extraction.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-option-textsorter-semver.html b/FHC-vendor/jquery-tablesorter/docs/example-option-textsorter-semver.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-option-theme-metro-style.html b/FHC-vendor/jquery-tablesorter/docs/example-option-theme-metro-style.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-options-headers-digits-strings.html b/FHC-vendor/jquery-tablesorter/docs/example-options-headers-digits-strings.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-options-headers-locked.html b/FHC-vendor/jquery-tablesorter/docs/example-options-headers-locked.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-options-headers-order.html b/FHC-vendor/jquery-tablesorter/docs/example-options-headers-order.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-options-headers-parser.html b/FHC-vendor/jquery-tablesorter/docs/example-options-headers-parser.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-options-headers.html b/FHC-vendor/jquery-tablesorter/docs/example-options-headers.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-pager-ajax.html b/FHC-vendor/jquery-tablesorter/docs/example-pager-ajax.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-pager-filtered.html b/FHC-vendor/jquery-tablesorter/docs/example-pager-filtered.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-pager.html b/FHC-vendor/jquery-tablesorter/docs/example-pager.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-parsers-advanced.html b/FHC-vendor/jquery-tablesorter/docs/example-parsers-advanced.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-parsers-class-name.html b/FHC-vendor/jquery-tablesorter/docs/example-parsers-class-name.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-parsers-date-range.html b/FHC-vendor/jquery-tablesorter/docs/example-parsers-date-range.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-parsers-dates.html b/FHC-vendor/jquery-tablesorter/docs/example-parsers-dates.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-parsers-duration.html b/FHC-vendor/jquery-tablesorter/docs/example-parsers-duration.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-parsers-feet-inch-fraction.html b/FHC-vendor/jquery-tablesorter/docs/example-parsers-feet-inch-fraction.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-parsers-file-type.html b/FHC-vendor/jquery-tablesorter/docs/example-parsers-file-type.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-parsers-globalize.html b/FHC-vendor/jquery-tablesorter/docs/example-parsers-globalize.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-parsers-ignore-articles.html b/FHC-vendor/jquery-tablesorter/docs/example-parsers-ignore-articles.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-parsers-ip-address.html b/FHC-vendor/jquery-tablesorter/docs/example-parsers-ip-address.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-parsers-jquery-data.html b/FHC-vendor/jquery-tablesorter/docs/example-parsers-jquery-data.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-parsers-metric.html b/FHC-vendor/jquery-tablesorter/docs/example-parsers-metric.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-parsers-named-numbers.html b/FHC-vendor/jquery-tablesorter/docs/example-parsers-named-numbers.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-parsers-roman.html b/FHC-vendor/jquery-tablesorter/docs/example-parsers-roman.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-parsers.html b/FHC-vendor/jquery-tablesorter/docs/example-parsers.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-trigger-sort.html b/FHC-vendor/jquery-tablesorter/docs/example-trigger-sort.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-triggers.html b/FHC-vendor/jquery-tablesorter/docs/example-triggers.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-update-all.html b/FHC-vendor/jquery-tablesorter/docs/example-update-all.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-update-cell.html b/FHC-vendor/jquery-tablesorter/docs/example-update-cell.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-align-character.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-align-character.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-bootstrap-theme-v2.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-bootstrap-theme-v2.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-bootstrap-theme.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-bootstrap-theme.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-build-table.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-build-table.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-chart.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-chart.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-column-selector.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-column-selector.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-columns.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-columns.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-css-sticky-header.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-css-sticky-header.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-editable.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-editable.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-any-match.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-any-match.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-childrows.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-childrows.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-custom-search.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-custom-search.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-custom-search2.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-custom-search2.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-custom.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-custom.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-external-inputs.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-external-inputs.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-formatter-1.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-formatter-1.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-formatter-2.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-formatter-2.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-formatter-select2.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-formatter-select2.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-selectmenu.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-filter-selectmenu.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-filter.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-filter.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-formatter.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-formatter.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-grouping-filter-childrows.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-grouping-filter-childrows.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-grouping.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-grouping.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-header-titles.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-header-titles.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-lazyload.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-lazyload.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-math.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-math.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-output.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-output.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-pager-ajax.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-pager-ajax.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-pager.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-pager.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-print.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-print.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-reflow.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-reflow.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-reflow1.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-reflow1.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-reflow2.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-reflow2.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-reflow3.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-reflow3.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-resizable.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-resizable.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-savesort.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-savesort.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-scroller.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-scroller.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-sort-tbodies.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-sort-tbodies.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-sort-to-hash.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-sort-to-hash.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-static-row.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-static-row.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-sticky-header.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-sticky-header.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-toggle-tablesorter.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-toggle-tablesorter.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-ui-theme.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-ui-theme.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-view.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-view.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widget-zebra.html b/FHC-vendor/jquery-tablesorter/docs/example-widget-zebra.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/example-widgets.html b/FHC-vendor/jquery-tablesorter/docs/example-widgets.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/fonts/glyphicons-halflings-regular.eot b/FHC-vendor/jquery-tablesorter/docs/fonts/glyphicons-halflings-regular.eot
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/fonts/glyphicons-halflings-regular.svg b/FHC-vendor/jquery-tablesorter/docs/fonts/glyphicons-halflings-regular.svg
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/fonts/glyphicons-halflings-regular.ttf b/FHC-vendor/jquery-tablesorter/docs/fonts/glyphicons-halflings-regular.ttf
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/fonts/glyphicons-halflings-regular.woff b/FHC-vendor/jquery-tablesorter/docs/fonts/glyphicons-halflings-regular.woff
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/fonts/glyphicons-halflings-regular.woff2 b/FHC-vendor/jquery-tablesorter/docs/fonts/glyphicons-halflings-regular.woff2
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/img/external.png b/FHC-vendor/jquery-tablesorter/docs/img/external.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/img/grid-default-thumb.png b/FHC-vendor/jquery-tablesorter/docs/img/grid-default-thumb.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/img/link.png b/FHC-vendor/jquery-tablesorter/docs/img/link.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/img/new-product-banner.png b/FHC-vendor/jquery-tablesorter/docs/img/new-product-banner.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/img/sale-banner.png b/FHC-vendor/jquery-tablesorter/docs/img/sale-banner.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/img/screens-blue.png b/FHC-vendor/jquery-tablesorter/docs/img/screens-blue.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/img/screens.png b/FHC-vendor/jquery-tablesorter/docs/img/screens.png
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/index.html b/FHC-vendor/jquery-tablesorter/docs/index.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/js/bootstrap.min.js b/FHC-vendor/jquery-tablesorter/docs/js/bootstrap.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/js/chili/jquery.chili-2.2.js b/FHC-vendor/jquery-tablesorter/docs/js/chili/jquery.chili-2.2.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/js/chili/recipes.js b/FHC-vendor/jquery-tablesorter/docs/js/chili/recipes.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/js/demo-build-table.js b/FHC-vendor/jquery-tablesorter/docs/js/demo-build-table.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/js/docs.js b/FHC-vendor/jquery-tablesorter/docs/js/docs.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/js/jquery-1.2.6.min.js b/FHC-vendor/jquery-tablesorter/docs/js/jquery-1.2.6.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/js/jquery-1.4.4.min.js b/FHC-vendor/jquery-tablesorter/docs/js/jquery-1.4.4.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/js/jquery-latest.min.js b/FHC-vendor/jquery-tablesorter/docs/js/jquery-latest.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/js/jquery-ui.min.js b/FHC-vendor/jquery-tablesorter/docs/js/jquery-ui.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/js/jquery.jui_theme_switch.min.js b/FHC-vendor/jquery-tablesorter/docs/js/jquery.jui_theme_switch.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/js/jquery.magnific-popup.min.js b/FHC-vendor/jquery-tablesorter/docs/js/jquery.magnific-popup.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/js/jquery.tipsy.min.js b/FHC-vendor/jquery-tablesorter/docs/js/jquery.tipsy.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/js/prettify.js b/FHC-vendor/jquery-tablesorter/docs/js/prettify.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/js/rangeslider.min.js b/FHC-vendor/jquery-tablesorter/docs/js/rangeslider.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/js/search-ie.js b/FHC-vendor/jquery-tablesorter/docs/js/search-ie.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/js/search.js b/FHC-vendor/jquery-tablesorter/docs/js/search.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/js/select2-3.4.6.min.js b/FHC-vendor/jquery-tablesorter/docs/js/select2-3.4.6.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/js/sugar.min.js b/FHC-vendor/jquery-tablesorter/docs/js/sugar.min.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/docs/themes.html b/FHC-vendor/jquery-tablesorter/docs/themes.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/example.json b/FHC-vendor/jquery-tablesorter/example.json
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/index.html b/FHC-vendor/jquery-tablesorter/index.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/extras/jquery.dragtable.mod.js b/FHC-vendor/jquery-tablesorter/js/extras/jquery.dragtable.mod.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/extras/jquery.metadata.js b/FHC-vendor/jquery-tablesorter/js/extras/jquery.metadata.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/extras/semver-mod.js b/FHC-vendor/jquery-tablesorter/js/extras/semver-mod.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/extras/semver.js b/FHC-vendor/jquery-tablesorter/js/extras/semver.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/jquery.tablesorter.combined.js b/FHC-vendor/jquery-tablesorter/js/jquery.tablesorter.combined.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/jquery.tablesorter.js b/FHC-vendor/jquery-tablesorter/js/jquery.tablesorter.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/jquery.tablesorter.widgets.js b/FHC-vendor/jquery-tablesorter/js/jquery.tablesorter.widgets.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/parsers/parser-date-extract.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-date-extract.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/parsers/parser-date-iso8601.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-date-iso8601.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/parsers/parser-date-month.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-date-month.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/parsers/parser-date-range.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-date-range.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/parsers/parser-date-two-digit-year.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-date-two-digit-year.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/parsers/parser-date-weekday.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-date-weekday.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/parsers/parser-date.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-date.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/parsers/parser-duration.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-duration.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/parsers/parser-feet-inch-fraction.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-feet-inch-fraction.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/parsers/parser-file-type.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-file-type.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/parsers/parser-globalize.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-globalize.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/parsers/parser-ignore-articles.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-ignore-articles.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/parsers/parser-image.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-image.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/parsers/parser-input-select.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-input-select.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/parsers/parser-metric.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-metric.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/parsers/parser-named-numbers.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-named-numbers.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/parsers/parser-network.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-network.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/parsers/parser-roman.js b/FHC-vendor/jquery-tablesorter/js/parsers/parser-roman.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-alignChar.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-alignChar.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-build-table.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-build-table.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-chart.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-chart.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-columnSelector.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-columnSelector.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-columns.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-columns.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-cssStickyHeaders.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-cssStickyHeaders.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-editable.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-editable.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-filter-formatter-html5.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-filter-formatter-html5.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-filter-formatter-jui.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-filter-formatter-jui.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-filter-formatter-select2.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-filter-formatter-select2.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-filter-type-insideRange.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-filter-type-insideRange.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-filter.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-filter.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-formatter.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-formatter.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-grouping.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-grouping.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-headerTitles.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-headerTitles.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-lazyload.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-lazyload.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-math.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-math.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-output.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-output.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-pager.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-pager.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-print.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-print.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-reflow.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-reflow.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-repeatheaders.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-repeatheaders.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-resizable.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-resizable.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-saveSort.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-saveSort.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-scroller.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-scroller.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-sort2Hash.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-sort2Hash.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-sortTbodies.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-sortTbodies.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-staticRow.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-staticRow.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-stickyHeaders.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-stickyHeaders.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-storage.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-storage.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-toggle.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-toggle.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-uitheme.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-uitheme.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/js/widgets/widget-view.js b/FHC-vendor/jquery-tablesorter/js/widgets/widget-view.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/package.json b/FHC-vendor/jquery-tablesorter/package.json
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/tablesorter.jquery.json b/FHC-vendor/jquery-tablesorter/tablesorter.jquery.json
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/test.html b/FHC-vendor/jquery-tablesorter/test.html
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/testing/qunit-1.20.0.css b/FHC-vendor/jquery-tablesorter/testing/qunit-1.20.0.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/testing/qunit-1.20.0.js b/FHC-vendor/jquery-tablesorter/testing/qunit-1.20.0.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/testing/testing-ipv6.js b/FHC-vendor/jquery-tablesorter/testing/testing-ipv6.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/testing/testing-widgets.js b/FHC-vendor/jquery-tablesorter/testing/testing-widgets.js
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/testing/testing.css b/FHC-vendor/jquery-tablesorter/testing/testing.css
old mode 100755
new mode 100644
diff --git a/FHC-vendor/jquery-tablesorter/testing/testing.js b/FHC-vendor/jquery-tablesorter/testing/testing.js
old mode 100755
new mode 100644
diff --git a/LICENSE b/LICENSE
old mode 100755
new mode 100644
diff --git a/README.md b/README.md
old mode 100755
new mode 100644
diff --git a/addons/.gitignore b/addons/.gitignore
old mode 100755
new mode 100644
diff --git a/addons/CodingGuidelines.txt b/addons/CodingGuidelines.txt
old mode 100755
new mode 100644
diff --git a/addons/index.html b/addons/index.html
old mode 100755
new mode 100644
diff --git a/application/cache/index.html b/application/cache/index.html
old mode 100755
new mode 100644
diff --git a/application/components/extensions/.placeholder b/application/components/extensions/.placeholder
old mode 100755
new mode 100644
diff --git a/application/components/filters/LogsViewer.php b/application/components/filters/LogsViewer.php
old mode 100755
new mode 100644
diff --git a/application/config/anrechnung.php b/application/config/anrechnung.php
old mode 100755
new mode 100644
diff --git a/application/config/auth.php b/application/config/auth.php
old mode 100755
new mode 100644
diff --git a/application/config/autoload.php b/application/config/autoload.php
old mode 100755
new mode 100644
diff --git a/application/config/config.php b/application/config/config.php
old mode 100755
new mode 100644
diff --git a/application/config/constants.php b/application/config/constants.php
old mode 100755
new mode 100644
diff --git a/application/config/core_includes.php b/application/config/core_includes.php
old mode 100755
new mode 100644
diff --git a/application/config/database.php b/application/config/database.php
old mode 100755
new mode 100644
diff --git a/application/config/doctypes.php b/application/config/doctypes.php
old mode 100755
new mode 100644
diff --git a/application/config/extensions/.placeholder b/application/config/extensions/.placeholder
old mode 100755
new mode 100644
diff --git a/application/config/foreign_chars.php b/application/config/foreign_chars.php
old mode 100755
new mode 100644
diff --git a/application/config/hooks.php b/application/config/hooks.php
old mode 100755
new mode 100644
diff --git a/application/config/index.html b/application/config/index.html
old mode 100755
new mode 100644
diff --git a/application/config/infocenter.php b/application/config/infocenter.php
old mode 100755
new mode 100644
diff --git a/application/config/jqm.php b/application/config/jqm.php
old mode 100755
new mode 100644
diff --git a/application/config/ldap.php b/application/config/ldap.php
old mode 100755
new mode 100644
diff --git a/application/config/mail.php b/application/config/mail.php
old mode 100755
new mode 100644
diff --git a/application/config/memcached.php b/application/config/memcached.php
old mode 100755
new mode 100644
diff --git a/application/config/message.php b/application/config/message.php
old mode 100755
new mode 100644
diff --git a/application/config/migration.php b/application/config/migration.php
old mode 100755
new mode 100644
diff --git a/application/config/mimes.php b/application/config/mimes.php
old mode 100755
new mode 100644
diff --git a/application/config/navigation.php b/application/config/navigation.php
old mode 100755
new mode 100644
diff --git a/application/config/permission.php b/application/config/permission.php
old mode 100755
new mode 100644
diff --git a/application/config/profiler.php b/application/config/profiler.php
old mode 100755
new mode 100644
diff --git a/application/config/rest.php b/application/config/rest.php
old mode 100755
new mode 100644
diff --git a/application/config/routes.php b/application/config/routes.php
old mode 100755
new mode 100644
diff --git a/application/config/studierendenantrag.php b/application/config/studierendenantrag.php
old mode 100755
new mode 100644
diff --git a/application/config/udfmasterschema.json b/application/config/udfmasterschema.json
old mode 100755
new mode 100644
diff --git a/application/config/user_agents.php b/application/config/user_agents.php
old mode 100755
new mode 100644
diff --git a/application/controllers/Cis/Auth.php b/application/controllers/Cis/Auth.php
old mode 100755
new mode 100644
diff --git a/application/controllers/Cis/Documents.php b/application/controllers/Cis/Documents.php
old mode 100755
new mode 100644
diff --git a/application/controllers/Cis/MyLv.php b/application/controllers/Cis/MyLv.php
old mode 100755
new mode 100644
diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
old mode 100755
new mode 100644
diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
old mode 100755
new mode 100644
diff --git a/application/controllers/Cis/Pub.php b/application/controllers/Cis/Pub.php
old mode 100755
new mode 100644
diff --git a/application/controllers/Cis/Stundenplan.php b/application/controllers/Cis/Stundenplan.php
old mode 100755
new mode 100644
diff --git a/application/controllers/Cis4.php b/application/controllers/Cis4.php
old mode 100755
new mode 100644
diff --git a/application/controllers/CisHmvc.php b/application/controllers/CisHmvc.php
old mode 100755
new mode 100644
diff --git a/application/controllers/CisHmvc/Cms.php b/application/controllers/CisHmvc/Cms.php
old mode 100755
new mode 100644
diff --git a/application/controllers/CisHmvc/Dashboard.php b/application/controllers/CisHmvc/Dashboard.php
old mode 100755
new mode 100644
diff --git a/application/controllers/CisHtml/Cms.php b/application/controllers/CisHtml/Cms.php
old mode 100755
new mode 100644
diff --git a/application/controllers/CisHtml/Dashboard.php b/application/controllers/CisHtml/Dashboard.php
old mode 100755
new mode 100644
diff --git a/application/controllers/CisVue/Cms.php b/application/controllers/CisVue/Cms.php
old mode 100755
new mode 100644
diff --git a/application/controllers/CisVue/Dashboard.php b/application/controllers/CisVue/Dashboard.php
old mode 100755
new mode 100644
diff --git a/application/controllers/Test.php b/application/controllers/Test.php
old mode 100755
new mode 100644
diff --git a/application/controllers/Vilesci.php b/application/controllers/Vilesci.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/frontend/v1/studstatus/Unterbrechung.php b/application/controllers/api/frontend/v1/studstatus/Unterbrechung.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/index.html b/application/controllers/api/index.html
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/CheckUserAuth.php b/application/controllers/api/v1/CheckUserAuth.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/Test.php b/application/controllers/api/v1/Test.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/accounting/Aufteilung.php b/application/controllers/api/v1/accounting/Aufteilung.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/accounting/Bestelldetail.php b/application/controllers/api/v1/accounting/Bestelldetail.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/accounting/Bestelldetailtag.php b/application/controllers/api/v1/accounting/Bestelldetailtag.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/accounting/Bestellstatus.php b/application/controllers/api/v1/accounting/Bestellstatus.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/accounting/Bestellung.php b/application/controllers/api/v1/accounting/Bestellung.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/accounting/Bestellungtag.php b/application/controllers/api/v1/accounting/Bestellungtag.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/accounting/Buchung.php b/application/controllers/api/v1/accounting/Buchung.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/accounting/Buchungstyp.php b/application/controllers/api/v1/accounting/Buchungstyp.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/accounting/Budget.php b/application/controllers/api/v1/accounting/Budget.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/accounting/Konto.php b/application/controllers/api/v1/accounting/Konto.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/accounting/Kostenstelle.php b/application/controllers/api/v1/accounting/Kostenstelle.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/accounting/Rechnung.php b/application/controllers/api/v1/accounting/Rechnung.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/accounting/Rechnungsbetrag.php b/application/controllers/api/v1/accounting/Rechnungsbetrag.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/accounting/Rechnungstyp.php b/application/controllers/api/v1/accounting/Rechnungstyp.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/accounting/Vertrag.php b/application/controllers/api/v1/accounting/Vertrag.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/accounting/Vertragsstatus.php b/application/controllers/api/v1/accounting/Vertragsstatus.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/accounting/Vertragstyp.php b/application/controllers/api/v1/accounting/Vertragstyp.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/accounting/Zahlungstyp.php b/application/controllers/api/v1/accounting/Zahlungstyp.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/codex/Akadgrad.php b/application/controllers/api/v1/codex/Akadgrad.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/codex/Archiv.php b/application/controllers/api/v1/codex/Archiv.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/codex/Aufmerksamdurch.php b/application/controllers/api/v1/codex/Aufmerksamdurch.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/codex/Ausbildung.php b/application/controllers/api/v1/codex/Ausbildung.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/codex/Berufstaetigkeit.php b/application/controllers/api/v1/codex/Berufstaetigkeit.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/codex/Beschaeftigungsausmass.php b/application/controllers/api/v1/codex/Beschaeftigungsausmass.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/codex/Besqual.php b/application/controllers/api/v1/codex/Besqual.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/codex/Bisfunktion.php b/application/controllers/api/v1/codex/Bisfunktion.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/codex/Bisio.php b/application/controllers/api/v1/codex/Bisio.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/codex/Bisorgform.php b/application/controllers/api/v1/codex/Bisorgform.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/codex/Bisverwendung.php b/application/controllers/api/v1/codex/Bisverwendung.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/codex/Bundesland.php b/application/controllers/api/v1/codex/Bundesland.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/codex/Entwicklungsteam.php b/application/controllers/api/v1/codex/Entwicklungsteam.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/codex/Gemeinde.php b/application/controllers/api/v1/codex/Gemeinde.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/codex/Hauptberuf.php b/application/controllers/api/v1/codex/Hauptberuf.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/codex/Lehrform.php b/application/controllers/api/v1/codex/Lehrform.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/codex/Lgartcode.php b/application/controllers/api/v1/codex/Lgartcode.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/codex/Mobilitaetsprogramm.php b/application/controllers/api/v1/codex/Mobilitaetsprogramm.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/codex/Nation.php b/application/controllers/api/v1/codex/Nation.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/codex/Note.php b/application/controllers/api/v1/codex/Note.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/codex/Orgform.php b/application/controllers/api/v1/codex/Orgform.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/codex/Verwendung.php b/application/controllers/api/v1/codex/Verwendung.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/codex/Zgv.php b/application/controllers/api/v1/codex/Zgv.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/codex/Zgvdoktor.php b/application/controllers/api/v1/codex/Zgvdoktor.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/codex/Zgvgruppe.php b/application/controllers/api/v1/codex/Zgvgruppe.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/codex/Zgvmaster.php b/application/controllers/api/v1/codex/Zgvmaster.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/codex/Zweck.php b/application/controllers/api/v1/codex/Zweck.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/content/Ampel.php b/application/controllers/api/v1/content/Ampel.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/content/Content.php b/application/controllers/api/v1/content/Content.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/content/Contentchild.php b/application/controllers/api/v1/content/Contentchild.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/content/Contentgruppe.php b/application/controllers/api/v1/content/Contentgruppe.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/content/Contentlog.php b/application/controllers/api/v1/content/Contentlog.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/content/Contentsprache.php b/application/controllers/api/v1/content/Contentsprache.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/content/Dms.php b/application/controllers/api/v1/content/Dms.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/content/Infoscreen.php b/application/controllers/api/v1/content/Infoscreen.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/content/News.php b/application/controllers/api/v1/content/News.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/content/Template.php b/application/controllers/api/v1/content/Template.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/content/Veranstaltung.php b/application/controllers/api/v1/content/Veranstaltung.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/content/Veranstaltungskategorie.php b/application/controllers/api/v1/content/Veranstaltungskategorie.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/crm/Akte.php b/application/controllers/api/v1/crm/Akte.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/crm/Aufnahmeschluessel.php b/application/controllers/api/v1/crm/Aufnahmeschluessel.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/crm/Aufnahmetermin.php b/application/controllers/api/v1/crm/Aufnahmetermin.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/crm/Aufnahmetermintyp.php b/application/controllers/api/v1/crm/Aufnahmetermintyp.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/crm/Bewerbungstermine.php b/application/controllers/api/v1/crm/Bewerbungstermine.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/crm/Buchungstyp.php b/application/controllers/api/v1/crm/Buchungstyp.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/crm/Dokument.php b/application/controllers/api/v1/crm/Dokument.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/crm/Dokumentprestudent.php b/application/controllers/api/v1/crm/Dokumentprestudent.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/crm/Dokumentstudiengang.php b/application/controllers/api/v1/crm/Dokumentstudiengang.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/crm/Konto.php b/application/controllers/api/v1/crm/Konto.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/crm/Preincoming.php b/application/controllers/api/v1/crm/Preincoming.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/crm/Preinteressent.php b/application/controllers/api/v1/crm/Preinteressent.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/crm/Preinteressentstudiengang.php b/application/controllers/api/v1/crm/Preinteressentstudiengang.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/crm/Preoutgoing.php b/application/controllers/api/v1/crm/Preoutgoing.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/crm/Prestudent.php b/application/controllers/api/v1/crm/Prestudent.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/crm/Prestudentstatus.php b/application/controllers/api/v1/crm/Prestudentstatus.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/crm/Reihungstest.php b/application/controllers/api/v1/crm/Reihungstest.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/crm/RtPerson.php b/application/controllers/api/v1/crm/RtPerson.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/crm/Status.php b/application/controllers/api/v1/crm/Status.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/crm/Statusgrund.php b/application/controllers/api/v1/crm/Statusgrund.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/crm/Student.php b/application/controllers/api/v1/crm/Student.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/education/Abgabe.php b/application/controllers/api/v1/education/Abgabe.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/education/Abschlussbeurteilung.php b/application/controllers/api/v1/education/Abschlussbeurteilung.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/education/Abschlusspruefung.php b/application/controllers/api/v1/education/Abschlusspruefung.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/education/Anrechnung.php b/application/controllers/api/v1/education/Anrechnung.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/education/Anwesenheit.php b/application/controllers/api/v1/education/Anwesenheit.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/education/Beispiel.php b/application/controllers/api/v1/education/Beispiel.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/education/Betreuerart.php b/application/controllers/api/v1/education/Betreuerart.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/education/Feedback.php b/application/controllers/api/v1/education/Feedback.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/education/Legesamtnote.php b/application/controllers/api/v1/education/Legesamtnote.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/education/Lehreinheit.php b/application/controllers/api/v1/education/Lehreinheit.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/education/Lehreinheitgruppe.php b/application/controllers/api/v1/education/Lehreinheitgruppe.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/education/Lehreinheitmitarbeiter.php b/application/controllers/api/v1/education/Lehreinheitmitarbeiter.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/education/Lehrfach.php b/application/controllers/api/v1/education/Lehrfach.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/education/Lehrfunktion.php b/application/controllers/api/v1/education/Lehrfunktion.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/education/Lehrtyp.php b/application/controllers/api/v1/education/Lehrtyp.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/education/Lehrveranstaltung.php b/application/controllers/api/v1/education/Lehrveranstaltung.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/education/Lenotenschluessel.php b/application/controllers/api/v1/education/Lenotenschluessel.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/education/Lepruefung.php b/application/controllers/api/v1/education/Lepruefung.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/education/Lvangebot.php b/application/controllers/api/v1/education/Lvangebot.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/education/Lvgesamtnote.php b/application/controllers/api/v1/education/Lvgesamtnote.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/education/Lvinfo.php b/application/controllers/api/v1/education/Lvinfo.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/education/Lvregel.php b/application/controllers/api/v1/education/Lvregel.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/education/Lvregeltyp.php b/application/controllers/api/v1/education/Lvregeltyp.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/education/Notenschluessel.php b/application/controllers/api/v1/education/Notenschluessel.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/education/Notenschluesselaufteilung.php b/application/controllers/api/v1/education/Notenschluesselaufteilung.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/education/Notenschluesseluebung.php b/application/controllers/api/v1/education/Notenschluesseluebung.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/education/Notenschluesselzuordnung.php b/application/controllers/api/v1/education/Notenschluesselzuordnung.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/education/Paabgabe.php b/application/controllers/api/v1/education/Paabgabe.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/education/Paabgabetyp.php b/application/controllers/api/v1/education/Paabgabetyp.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/education/Projektarbeit.php b/application/controllers/api/v1/education/Projektarbeit.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/education/Projektbetreuer.php b/application/controllers/api/v1/education/Projektbetreuer.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/education/Projekttyp.php b/application/controllers/api/v1/education/Projekttyp.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/education/Pruefung.php b/application/controllers/api/v1/education/Pruefung.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/education/Pruefungsanmeldung.php b/application/controllers/api/v1/education/Pruefungsanmeldung.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/education/Pruefungsfenster.php b/application/controllers/api/v1/education/Pruefungsfenster.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/education/Pruefungsstatus.php b/application/controllers/api/v1/education/Pruefungsstatus.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/education/Pruefungstermin.php b/application/controllers/api/v1/education/Pruefungstermin.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/education/Pruefungstyp.php b/application/controllers/api/v1/education/Pruefungstyp.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/education/Studentbeispiel.php b/application/controllers/api/v1/education/Studentbeispiel.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/education/Studentlehrverband.php b/application/controllers/api/v1/education/Studentlehrverband.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/education/Studentuebung.php b/application/controllers/api/v1/education/Studentuebung.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/education/Uebung.php b/application/controllers/api/v1/education/Uebung.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/education/Zeugnis.php b/application/controllers/api/v1/education/Zeugnis.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/education/Zeugnisnote.php b/application/controllers/api/v1/education/Zeugnisnote.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/organisation/Erhalter.php b/application/controllers/api/v1/organisation/Erhalter.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/organisation/Fachbereich2.php b/application/controllers/api/v1/organisation/Fachbereich2.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/organisation/Ferien.php b/application/controllers/api/v1/organisation/Ferien.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/organisation/Geschaeftsjahr2.php b/application/controllers/api/v1/organisation/Geschaeftsjahr2.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/organisation/Gruppe.php b/application/controllers/api/v1/organisation/Gruppe.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/organisation/Lehrverband.php b/application/controllers/api/v1/organisation/Lehrverband.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/organisation/Organisationseinheit2.php b/application/controllers/api/v1/organisation/Organisationseinheit2.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/organisation/Organisationseinheittyp.php b/application/controllers/api/v1/organisation/Organisationseinheittyp.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/organisation/Semesterwochen.php b/application/controllers/api/v1/organisation/Semesterwochen.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/organisation/Service.php b/application/controllers/api/v1/organisation/Service.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/organisation/Standort.php b/application/controllers/api/v1/organisation/Standort.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/organisation/Statistik.php b/application/controllers/api/v1/organisation/Statistik.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/organisation/Studiengang2.php b/application/controllers/api/v1/organisation/Studiengang2.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/organisation/Studiengangstyp.php b/application/controllers/api/v1/organisation/Studiengangstyp.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/organisation/Studienjahr.php b/application/controllers/api/v1/organisation/Studienjahr.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/organisation/Studienordnung.php b/application/controllers/api/v1/organisation/Studienordnung.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/organisation/Studienordnungstatus.php b/application/controllers/api/v1/organisation/Studienordnungstatus.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/organisation/Studienplan.php b/application/controllers/api/v1/organisation/Studienplan.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/organisation/Studienplatz.php b/application/controllers/api/v1/organisation/Studienplatz.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/organisation/Studiensemester.php b/application/controllers/api/v1/organisation/Studiensemester.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/person/Adresse.php b/application/controllers/api/v1/person/Adresse.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/person/Bankverbindung.php b/application/controllers/api/v1/person/Bankverbindung.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/person/Benutzer.php b/application/controllers/api/v1/person/Benutzer.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/person/Benutzerfunktion.php b/application/controllers/api/v1/person/Benutzerfunktion.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/person/Benutzergruppe.php b/application/controllers/api/v1/person/Benutzergruppe.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/person/Fotostatus.php b/application/controllers/api/v1/person/Fotostatus.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/person/Freebusy.php b/application/controllers/api/v1/person/Freebusy.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/person/Freebusytyp.php b/application/controllers/api/v1/person/Freebusytyp.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/person/Kontakt.php b/application/controllers/api/v1/person/Kontakt.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/person/Kontaktmedium.php b/application/controllers/api/v1/person/Kontaktmedium.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/person/Kontakttyp.php b/application/controllers/api/v1/person/Kontakttyp.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/person/Notiz.php b/application/controllers/api/v1/person/Notiz.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/person/Notizzuordnung.php b/application/controllers/api/v1/person/Notizzuordnung.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/person/Person.php b/application/controllers/api/v1/person/Person.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/project/Aktivitaet.php b/application/controllers/api/v1/project/Aktivitaet.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/project/Aufwandstyp.php b/application/controllers/api/v1/project/Aufwandstyp.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/project/Projekt.php b/application/controllers/api/v1/project/Projekt.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/project/Projekt_ressource.php b/application/controllers/api/v1/project/Projekt_ressource.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/project/Projektphase.php b/application/controllers/api/v1/project/Projektphase.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/project/Projekttask.php b/application/controllers/api/v1/project/Projekttask.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/project/Ressource.php b/application/controllers/api/v1/project/Ressource.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/project/Scrumsprint.php b/application/controllers/api/v1/project/Scrumsprint.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/ressource/Betriebsmittel.php b/application/controllers/api/v1/ressource/Betriebsmittel.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/ressource/Betriebsmittelperson2.php b/application/controllers/api/v1/ressource/Betriebsmittelperson2.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/ressource/Betriebsmittelstatus.php b/application/controllers/api/v1/ressource/Betriebsmittelstatus.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/ressource/Betriebsmitteltyp.php b/application/controllers/api/v1/ressource/Betriebsmitteltyp.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/ressource/Coodle.php b/application/controllers/api/v1/ressource/Coodle.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/ressource/Erreichbarkeit.php b/application/controllers/api/v1/ressource/Erreichbarkeit.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/ressource/Firma.php b/application/controllers/api/v1/ressource/Firma.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/ressource/Firmatag.php b/application/controllers/api/v1/ressource/Firmatag.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/ressource/Firmentyp.php b/application/controllers/api/v1/ressource/Firmentyp.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/ressource/Funktion.php b/application/controllers/api/v1/ressource/Funktion.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/ressource/Lehrmittel.php b/application/controllers/api/v1/ressource/Lehrmittel.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/ressource/Mitarbeiter.php b/application/controllers/api/v1/ressource/Mitarbeiter.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/ressource/Ort.php b/application/controllers/api/v1/ressource/Ort.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/ressource/Ortraumtyp.php b/application/controllers/api/v1/ressource/Ortraumtyp.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/ressource/Personfunktionstandort.php b/application/controllers/api/v1/ressource/Personfunktionstandort.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/ressource/Raumtyp.php b/application/controllers/api/v1/ressource/Raumtyp.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/ressource/Reservierung.php b/application/controllers/api/v1/ressource/Reservierung.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/ressource/Stunde.php b/application/controllers/api/v1/ressource/Stunde.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/ressource/Stundenplan.php b/application/controllers/api/v1/ressource/Stundenplan.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/ressource/Stundenplandev.php b/application/controllers/api/v1/ressource/Stundenplandev.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/ressource/Zeitaufzeichnung.php b/application/controllers/api/v1/ressource/Zeitaufzeichnung.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/ressource/Zeitfenster.php b/application/controllers/api/v1/ressource/Zeitfenster.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/ressource/Zeitsperre.php b/application/controllers/api/v1/ressource/Zeitsperre.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/ressource/Zeitsperretyp.php b/application/controllers/api/v1/ressource/Zeitsperretyp.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/ressource/Zeitwunsch.php b/application/controllers/api/v1/ressource/Zeitwunsch.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/system/Appdaten.php b/application/controllers/api/v1/system/Appdaten.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/system/Benutzerrolle.php b/application/controllers/api/v1/system/Benutzerrolle.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/system/Berechtigung.php b/application/controllers/api/v1/system/Berechtigung.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/system/Cronjob.php b/application/controllers/api/v1/system/Cronjob.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/system/Filter.php b/application/controllers/api/v1/system/Filter.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/system/Log.php b/application/controllers/api/v1/system/Log.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/system/Message.php b/application/controllers/api/v1/system/Message.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/system/Phrase.php b/application/controllers/api/v1/system/Phrase.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/system/Rolle.php b/application/controllers/api/v1/system/Rolle.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/system/Rolleberechtigung.php b/application/controllers/api/v1/system/Rolleberechtigung.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/system/Server.php b/application/controllers/api/v1/system/Server.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/system/Sprache2.php b/application/controllers/api/v1/system/Sprache2.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/system/Tag.php b/application/controllers/api/v1/system/Tag.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/system/UDF.php b/application/controllers/api/v1/system/UDF.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/system/Variable.php b/application/controllers/api/v1/system/Variable.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/system/Vorlage.php b/application/controllers/api/v1/system/Vorlage.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/system/Vorlagestudiengang.php b/application/controllers/api/v1/system/Vorlagestudiengang.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/system/Webservicelog.php b/application/controllers/api/v1/system/Webservicelog.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/system/Webservicerecht.php b/application/controllers/api/v1/system/Webservicerecht.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/system/Webservicetyp.php b/application/controllers/api/v1/system/Webservicetyp.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/testtool/Ablauf.php b/application/controllers/api/v1/testtool/Ablauf.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/testtool/Antwort.php b/application/controllers/api/v1/testtool/Antwort.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/testtool/Frage.php b/application/controllers/api/v1/testtool/Frage.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/testtool/Gebiet.php b/application/controllers/api/v1/testtool/Gebiet.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/testtool/Kategorie.php b/application/controllers/api/v1/testtool/Kategorie.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/testtool/Kriterien.php b/application/controllers/api/v1/testtool/Kriterien.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/testtool/Pruefling.php b/application/controllers/api/v1/testtool/Pruefling.php
old mode 100755
new mode 100644
diff --git a/application/controllers/api/v1/testtool/Vorschlag.php b/application/controllers/api/v1/testtool/Vorschlag.php
old mode 100755
new mode 100644
diff --git a/application/controllers/codex/Oehbeitrag.php b/application/controllers/codex/Oehbeitrag.php
old mode 100755
new mode 100644
diff --git a/application/controllers/codex/UHSTAT1.php b/application/controllers/codex/UHSTAT1.php
old mode 100755
new mode 100644
diff --git a/application/controllers/components/Antrag/Abmeldung.php b/application/controllers/components/Antrag/Abmeldung.php
old mode 100755
new mode 100644
diff --git a/application/controllers/components/Antrag/Leitung.php b/application/controllers/components/Antrag/Leitung.php
old mode 100755
new mode 100644
diff --git a/application/controllers/components/Antrag/Wiederholung.php b/application/controllers/components/Antrag/Wiederholung.php
old mode 100755
new mode 100644
diff --git a/application/controllers/components/Cis/Mylv.php b/application/controllers/components/Cis/Mylv.php
old mode 100755
new mode 100644
diff --git a/application/controllers/components/Cis/Stundenplan.php b/application/controllers/components/Cis/Stundenplan.php
old mode 100755
new mode 100644
diff --git a/application/controllers/components/CisVue.php b/application/controllers/components/CisVue.php
old mode 100755
new mode 100644
diff --git a/application/controllers/components/Filter.php b/application/controllers/components/Filter.php
old mode 100755
new mode 100644
diff --git a/application/controllers/components/Phrasen.php b/application/controllers/components/Phrasen.php
old mode 100755
new mode 100644
diff --git a/application/controllers/components/SearchBar.php b/application/controllers/components/SearchBar.php
old mode 100755
new mode 100644
diff --git a/application/controllers/crm/Statusgrund.php b/application/controllers/crm/Statusgrund.php
old mode 100755
new mode 100644
diff --git a/application/controllers/dashboard/Api.php b/application/controllers/dashboard/Api.php
old mode 100755
new mode 100644
diff --git a/application/controllers/dashboard/Config.php b/application/controllers/dashboard/Config.php
old mode 100755
new mode 100644
diff --git a/application/controllers/dashboard/Dashboard.php b/application/controllers/dashboard/Dashboard.php
old mode 100755
new mode 100644
diff --git a/application/controllers/dashboard/DashboardDemo.php b/application/controllers/dashboard/DashboardDemo.php
old mode 100755
new mode 100644
diff --git a/application/controllers/dashboard/Widget.php b/application/controllers/dashboard/Widget.php
old mode 100755
new mode 100644
diff --git a/application/controllers/extensions/.placeholder b/application/controllers/extensions/.placeholder
old mode 100755
new mode 100644
diff --git a/application/controllers/index.html b/application/controllers/index.html
old mode 100755
new mode 100644
diff --git a/application/controllers/jobs/AmpelMail.php b/application/controllers/jobs/AmpelMail.php
old mode 100755
new mode 100644
diff --git a/application/controllers/jobs/AnrechnungJob.php b/application/controllers/jobs/AnrechnungJob.php
old mode 100755
new mode 100644
diff --git a/application/controllers/jobs/AntragJob.php b/application/controllers/jobs/AntragJob.php
old mode 100755
new mode 100644
diff --git a/application/controllers/jobs/LVPlanJob.php b/application/controllers/jobs/LVPlanJob.php
old mode 100755
new mode 100644
diff --git a/application/controllers/jobs/LehrauftragJob.php b/application/controllers/jobs/LehrauftragJob.php
old mode 100755
new mode 100644
diff --git a/application/controllers/jobs/MailJob.php b/application/controllers/jobs/MailJob.php
old mode 100755
new mode 100644
diff --git a/application/controllers/jobs/OneTimeMessages.php b/application/controllers/jobs/OneTimeMessages.php
old mode 100755
new mode 100644
diff --git a/application/controllers/jobs/PlausiIssueProducer.php b/application/controllers/jobs/PlausiIssueProducer.php
old mode 100755
new mode 100644
diff --git a/application/controllers/jobs/Prestudentstatus.php b/application/controllers/jobs/Prestudentstatus.php
old mode 100755
new mode 100644
diff --git a/application/controllers/jobs/ReihungstestJob.php b/application/controllers/jobs/ReihungstestJob.php
old mode 100755
new mode 100644
diff --git a/application/controllers/lehre/Antrag/Attachment.php b/application/controllers/lehre/Antrag/Attachment.php
old mode 100755
new mode 100644
diff --git a/application/controllers/lehre/Antrag/Wiederholung.php b/application/controllers/lehre/Antrag/Wiederholung.php
old mode 100755
new mode 100644
diff --git a/application/controllers/lehre/Pruefungsprotokoll.php b/application/controllers/lehre/Pruefungsprotokoll.php
old mode 100755
new mode 100644
diff --git a/application/controllers/lehre/Studierendenantrag.php b/application/controllers/lehre/Studierendenantrag.php
old mode 100755
new mode 100644
diff --git a/application/controllers/lehre/anrechnung/AdminAnrechnung.php b/application/controllers/lehre/anrechnung/AdminAnrechnung.php
old mode 100755
new mode 100644
diff --git a/application/controllers/lehre/anrechnung/ApproveAnrechnungDetail.php b/application/controllers/lehre/anrechnung/ApproveAnrechnungDetail.php
old mode 100755
new mode 100644
diff --git a/application/controllers/lehre/anrechnung/ApproveAnrechnungUebersicht.php b/application/controllers/lehre/anrechnung/ApproveAnrechnungUebersicht.php
old mode 100755
new mode 100644
diff --git a/application/controllers/lehre/anrechnung/CreateAnrechnung.php b/application/controllers/lehre/anrechnung/CreateAnrechnung.php
old mode 100755
new mode 100644
diff --git a/application/controllers/lehre/anrechnung/RequestAnrechnung.php b/application/controllers/lehre/anrechnung/RequestAnrechnung.php
old mode 100755
new mode 100644
diff --git a/application/controllers/lehre/anrechnung/ReviewAnrechnungDetail.php b/application/controllers/lehre/anrechnung/ReviewAnrechnungDetail.php
old mode 100755
new mode 100644
diff --git a/application/controllers/lehre/anrechnung/ReviewAnrechnungUebersicht.php b/application/controllers/lehre/anrechnung/ReviewAnrechnungUebersicht.php
old mode 100755
new mode 100644
diff --git a/application/controllers/lehre/lehrauftrag/Lehrauftrag.php b/application/controllers/lehre/lehrauftrag/Lehrauftrag.php
old mode 100755
new mode 100644
diff --git a/application/controllers/lehre/lehrauftrag/LehrauftragAkzeptieren.php b/application/controllers/lehre/lehrauftrag/LehrauftragAkzeptieren.php
old mode 100755
new mode 100644
diff --git a/application/controllers/lehre/lehrauftrag/LehrauftragErteilen.php b/application/controllers/lehre/lehrauftrag/LehrauftragErteilen.php
old mode 100755
new mode 100644
diff --git a/application/controllers/lehre/lvplanung/AdminZeitverfuegbarkeit.php b/application/controllers/lehre/lvplanung/AdminZeitverfuegbarkeit.php
old mode 100755
new mode 100644
diff --git a/application/controllers/organisation/Reihungstest.php b/application/controllers/organisation/Reihungstest.php
old mode 100755
new mode 100644
diff --git a/application/controllers/organisation/Studienjahr.php b/application/controllers/organisation/Studienjahr.php
old mode 100755
new mode 100644
diff --git a/application/controllers/organisation/Studiensemester.php b/application/controllers/organisation/Studiensemester.php
old mode 100755
new mode 100644
diff --git a/application/controllers/person/BPKWartung.php b/application/controllers/person/BPKWartung.php
old mode 100755
new mode 100644
diff --git a/application/controllers/person/Gradelist.php b/application/controllers/person/Gradelist.php
old mode 100755
new mode 100644
diff --git a/application/controllers/person/Gruppenmanagement.php b/application/controllers/person/Gruppenmanagement.php
old mode 100755
new mode 100644
diff --git a/application/controllers/system/FAS_UDF.php b/application/controllers/system/FAS_UDF.php
old mode 100755
new mode 100644
diff --git a/application/controllers/system/Login.php b/application/controllers/system/Login.php
old mode 100755
new mode 100644
diff --git a/application/controllers/system/Logout.php b/application/controllers/system/Logout.php
old mode 100755
new mode 100644
diff --git a/application/controllers/system/LogsViewer.php b/application/controllers/system/LogsViewer.php
old mode 100755
new mode 100644
diff --git a/application/controllers/system/Navigation.php b/application/controllers/system/Navigation.php
old mode 100755
new mode 100644
diff --git a/application/controllers/system/Phrases.php b/application/controllers/system/Phrases.php
old mode 100755
new mode 100644
diff --git a/application/controllers/system/TestSearch.php b/application/controllers/system/TestSearch.php
old mode 100755
new mode 100644
diff --git a/application/controllers/system/Variables.php b/application/controllers/system/Variables.php
old mode 100755
new mode 100644
diff --git a/application/controllers/system/Vorlage.php b/application/controllers/system/Vorlage.php
old mode 100755
new mode 100644
diff --git a/application/controllers/system/aufnahme/PrestudentMultiAssign.php b/application/controllers/system/aufnahme/PrestudentMultiAssign.php
old mode 100755
new mode 100644
diff --git a/application/controllers/system/extensions/CLI_Manager.php b/application/controllers/system/extensions/CLI_Manager.php
old mode 100755
new mode 100644
diff --git a/application/controllers/system/extensions/Manager.php b/application/controllers/system/extensions/Manager.php
old mode 100755
new mode 100644
diff --git a/application/controllers/system/infocenter/InfoCenter.php b/application/controllers/system/infocenter/InfoCenter.php
old mode 100755
new mode 100644
diff --git a/application/controllers/system/infocenter/Rueckstellung.php b/application/controllers/system/infocenter/Rueckstellung.php
old mode 100755
new mode 100644
diff --git a/application/controllers/system/infocenter/ZGVUeberpruefung.php b/application/controllers/system/infocenter/ZGVUeberpruefung.php
old mode 100755
new mode 100644
diff --git a/application/controllers/system/issues/Issues.php b/application/controllers/system/issues/Issues.php
old mode 100755
new mode 100644
diff --git a/application/controllers/system/issues/IssuesKonfiguration.php b/application/controllers/system/issues/IssuesKonfiguration.php
old mode 100755
new mode 100644
diff --git a/application/controllers/system/issues/IssuesZustaendigkeiten.php b/application/controllers/system/issues/IssuesZustaendigkeiten.php
old mode 100755
new mode 100644
diff --git a/application/controllers/system/issues/Plausichecks.php b/application/controllers/system/issues/Plausichecks.php
old mode 100755
new mode 100644
diff --git a/application/controllers/system/jq/JobsQueueManager.php b/application/controllers/system/jq/JobsQueueManager.php
old mode 100755
new mode 100644
diff --git a/application/controllers/system/jq/JobsQueueViewer.php b/application/controllers/system/jq/JobsQueueViewer.php
old mode 100755
new mode 100644
diff --git a/application/controllers/system/messages/FASMessages.php b/application/controllers/system/messages/FASMessages.php
old mode 100755
new mode 100644
diff --git a/application/controllers/system/messages/MessageClient.php b/application/controllers/system/messages/MessageClient.php
old mode 100755
new mode 100644
diff --git a/application/controllers/system/messages/Messages.php b/application/controllers/system/messages/Messages.php
old mode 100755
new mode 100644
diff --git a/application/controllers/system/messages/ViewMessage.php b/application/controllers/system/messages/ViewMessage.php
old mode 100755
new mode 100644
diff --git a/application/controllers/widgets/Filters.php b/application/controllers/widgets/Filters.php
old mode 100755
new mode 100644
diff --git a/application/controllers/widgets/Language.php b/application/controllers/widgets/Language.php
old mode 100755
new mode 100644
diff --git a/application/controllers/widgets/Tables.php b/application/controllers/widgets/Tables.php
old mode 100755
new mode 100644
diff --git a/application/controllers/widgets/UDF.php b/application/controllers/widgets/UDF.php
old mode 100755
new mode 100644
diff --git a/application/core/API_Controller.php b/application/core/API_Controller.php
old mode 100755
new mode 100644
diff --git a/application/core/Auth_Controller.php b/application/core/Auth_Controller.php
old mode 100755
new mode 100644
diff --git a/application/core/CLI_Controller.php b/application/core/CLI_Controller.php
old mode 100755
new mode 100644
diff --git a/application/core/DB_Model.php b/application/core/DB_Model.php
old mode 100755
new mode 100644
diff --git a/application/core/FHC_Controller.php b/application/core/FHC_Controller.php
old mode 100755
new mode 100644
diff --git a/application/core/FS_Model.php b/application/core/FS_Model.php
old mode 100755
new mode 100644
diff --git a/application/core/IIssueResolvedChecker.php b/application/core/IIssueResolvedChecker.php
old mode 100755
new mode 100644
diff --git a/application/core/JOB_Controller.php b/application/core/JOB_Controller.php
old mode 100755
new mode 100644
diff --git a/application/core/JQW_Controller.php b/application/core/JQW_Controller.php
old mode 100755
new mode 100644
diff --git a/application/core/PlausiIssueProducer_Controller.php b/application/core/PlausiIssueProducer_Controller.php
old mode 100755
new mode 100644
diff --git a/application/core/RESTFul_Controller.php b/application/core/RESTFul_Controller.php
old mode 100755
new mode 100644
diff --git a/application/core/index.html b/application/core/index.html
old mode 100755
new mode 100644
diff --git a/application/extensions/.placeholder b/application/extensions/.placeholder
old mode 100755
new mode 100644
diff --git a/application/helpers/extensions/.placeholder b/application/helpers/extensions/.placeholder
old mode 100755
new mode 100644
diff --git a/application/helpers/hlp_authentication_helper.php b/application/helpers/hlp_authentication_helper.php
old mode 100755
new mode 100644
diff --git a/application/helpers/hlp_common_helper.php b/application/helpers/hlp_common_helper.php
old mode 100755
new mode 100644
diff --git a/application/helpers/hlp_header_helper.php b/application/helpers/hlp_header_helper.php
old mode 100755
new mode 100644
diff --git a/application/helpers/hlp_language_helper.php b/application/helpers/hlp_language_helper.php
old mode 100755
new mode 100644
diff --git a/application/helpers/hlp_return_object_helper.php b/application/helpers/hlp_return_object_helper.php
old mode 100755
new mode 100644
diff --git a/application/helpers/hlp_sancho_helper.php b/application/helpers/hlp_sancho_helper.php
old mode 100755
new mode 100644
diff --git a/application/helpers/hlp_session_helper.php b/application/helpers/hlp_session_helper.php
old mode 100755
new mode 100644
diff --git a/application/helpers/index.html b/application/helpers/index.html
old mode 100755
new mode 100644
diff --git a/application/hooks/extensions/.placeholder b/application/hooks/extensions/.placeholder
old mode 100755
new mode 100644
diff --git a/application/hooks/index.html b/application/hooks/index.html
old mode 100755
new mode 100644
diff --git a/application/index.html b/application/index.html
old mode 100755
new mode 100644
diff --git a/application/language/index.html b/application/language/index.html
old mode 100755
new mode 100644
diff --git a/application/libraries/AkteLib.php b/application/libraries/AkteLib.php
old mode 100755
new mode 100644
diff --git a/application/libraries/AnrechnungLib.php b/application/libraries/AnrechnungLib.php
old mode 100755
new mode 100644
diff --git a/application/libraries/AntragLib.php b/application/libraries/AntragLib.php
old mode 100755
new mode 100644
diff --git a/application/libraries/AuthLDAPLib.php b/application/libraries/AuthLDAPLib.php
old mode 100755
new mode 100644
diff --git a/application/libraries/AuthLib.php b/application/libraries/AuthLib.php
old mode 100755
new mode 100644
diff --git a/application/libraries/CisHmvc/Loader.php b/application/libraries/CisHmvc/Loader.php
old mode 100755
new mode 100644
diff --git a/application/libraries/CmsLib.php b/application/libraries/CmsLib.php
old mode 100755
new mode 100644
diff --git a/application/libraries/CryptLib.php b/application/libraries/CryptLib.php
old mode 100755
new mode 100644
diff --git a/application/libraries/DmsLib.php b/application/libraries/DmsLib.php
old mode 100755
new mode 100644
diff --git a/application/libraries/DocsboxLib.php b/application/libraries/DocsboxLib.php
old mode 100755
new mode 100644
diff --git a/application/libraries/DocumentLib.php b/application/libraries/DocumentLib.php
old mode 100755
new mode 100644
diff --git a/application/libraries/EPrintfLib.php b/application/libraries/EPrintfLib.php
old mode 100755
new mode 100644
diff --git a/application/libraries/ExtensionsLib.php b/application/libraries/ExtensionsLib.php
old mode 100755
new mode 100644
diff --git a/application/libraries/FilterCmptLib.php b/application/libraries/FilterCmptLib.php
old mode 100755
new mode 100644
diff --git a/application/libraries/FilterWidgetLib.php b/application/libraries/FilterWidgetLib.php
old mode 100755
new mode 100644
diff --git a/application/libraries/IssuesLib.php b/application/libraries/IssuesLib.php
old mode 100755
new mode 100644
diff --git a/application/libraries/JobsQueueLib.php b/application/libraries/JobsQueueLib.php
old mode 100755
new mode 100644
diff --git a/application/libraries/LogLib.php b/application/libraries/LogLib.php
old mode 100755
new mode 100644
diff --git a/application/libraries/MailLib.php b/application/libraries/MailLib.php
old mode 100755
new mode 100644
diff --git a/application/libraries/MessageLib.php b/application/libraries/MessageLib.php
old mode 100755
new mode 100644
diff --git a/application/libraries/NavigationLib.php b/application/libraries/NavigationLib.php
old mode 100755
new mode 100644
diff --git a/application/libraries/OrganisationseinheitLib.php b/application/libraries/OrganisationseinheitLib.php
old mode 100755
new mode 100644
diff --git a/application/libraries/PermissionLib.php b/application/libraries/PermissionLib.php
old mode 100755
new mode 100644
diff --git a/application/libraries/PersonLogLib.php b/application/libraries/PersonLogLib.php
old mode 100755
new mode 100644
diff --git a/application/libraries/PhrasesLib.php b/application/libraries/PhrasesLib.php
old mode 100755
new mode 100644
diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php
old mode 100755
new mode 100644
diff --git a/application/libraries/ReihungstestLib.php b/application/libraries/ReihungstestLib.php
old mode 100755
new mode 100644
diff --git a/application/libraries/SearchBarLib.php b/application/libraries/SearchBarLib.php
old mode 100755
new mode 100644
diff --git a/application/libraries/SignatureLib.php b/application/libraries/SignatureLib.php
old mode 100755
new mode 100644
diff --git a/application/libraries/StudienplanLib.php b/application/libraries/StudienplanLib.php
old mode 100755
new mode 100644
diff --git a/application/libraries/TableWidgetLib.php b/application/libraries/TableWidgetLib.php
old mode 100755
new mode 100644
diff --git a/application/libraries/UDFLib.php b/application/libraries/UDFLib.php
old mode 100755
new mode 100644
diff --git a/application/libraries/VariableLib.php b/application/libraries/VariableLib.php
old mode 100755
new mode 100644
diff --git a/application/libraries/VorlageLib.php b/application/libraries/VorlageLib.php
old mode 100755
new mode 100644
diff --git a/application/libraries/WidgetLib.php b/application/libraries/WidgetLib.php
old mode 100755
new mode 100644
diff --git a/application/libraries/dashboard/DashboardLib.php b/application/libraries/dashboard/DashboardLib.php
old mode 100755
new mode 100644
diff --git a/application/libraries/extensions/.placeholder b/application/libraries/extensions/.placeholder
old mode 100755
new mode 100644
diff --git a/application/libraries/index.html b/application/libraries/index.html
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/PlausicheckDefinitionLib.php b/application/libraries/issues/PlausicheckDefinitionLib.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/PlausicheckProducerLib.php b/application/libraries/issues/PlausicheckProducerLib.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/plausichecks/AbbrecherAktiv.php b/application/libraries/issues/plausichecks/AbbrecherAktiv.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/plausichecks/AbschlussstatusFehlt.php b/application/libraries/issues/plausichecks/AbschlussstatusFehlt.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/plausichecks/AktSemesterNull.php b/application/libraries/issues/plausichecks/AktSemesterNull.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/plausichecks/AktiverStudentOhneStatus.php b/application/libraries/issues/plausichecks/AktiverStudentOhneStatus.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/plausichecks/AktiverStudentstatusOhneKontobuchung.php b/application/libraries/issues/plausichecks/AktiverStudentstatusOhneKontobuchung.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/plausichecks/AusbildungssemPrestudentUngleichAusbildungssemStatus.php b/application/libraries/issues/plausichecks/AusbildungssemPrestudentUngleichAusbildungssemStatus.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/plausichecks/BewerberNichtZumRtAngetreten.php b/application/libraries/issues/plausichecks/BewerberNichtZumRtAngetreten.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/plausichecks/DatumAbschlusspruefungFehlt.php b/application/libraries/issues/plausichecks/DatumAbschlusspruefungFehlt.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/plausichecks/DatumSponsionFehlt.php b/application/libraries/issues/plausichecks/DatumSponsionFehlt.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/plausichecks/DatumStudiensemesterFalscheReihenfolge.php b/application/libraries/issues/plausichecks/DatumStudiensemesterFalscheReihenfolge.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/plausichecks/FalscheAnzahlAbschlusspruefungen.php b/application/libraries/issues/plausichecks/FalscheAnzahlAbschlusspruefungen.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/plausichecks/FalscheAnzahlHeimatadressen.php b/application/libraries/issues/plausichecks/FalscheAnzahlHeimatadressen.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/plausichecks/FalscheAnzahlZustelladressen.php b/application/libraries/issues/plausichecks/FalscheAnzahlZustelladressen.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/plausichecks/GbDatumWeitZurueck.php b/application/libraries/issues/plausichecks/GbDatumWeitZurueck.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/plausichecks/InaktiverStudentAktiverStatus.php b/application/libraries/issues/plausichecks/InaktiverStudentAktiverStatus.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/plausichecks/IncomingHeimatNationOesterreich.php b/application/libraries/issues/plausichecks/IncomingHeimatNationOesterreich.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/plausichecks/IncomingOhneIoDatensatz.php b/application/libraries/issues/plausichecks/IncomingOhneIoDatensatz.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/plausichecks/IncomingOrGsFoerderrelevant.php b/application/libraries/issues/plausichecks/IncomingOrGsFoerderrelevant.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/plausichecks/InskriptionVorLetzerBismeldung.php b/application/libraries/issues/plausichecks/InskriptionVorLetzerBismeldung.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/plausichecks/NationNichtOesterreichAberGemeinde.php b/application/libraries/issues/plausichecks/NationNichtOesterreichAberGemeinde.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/plausichecks/OrgformStgUngleichOrgformPrestudent.php b/application/libraries/issues/plausichecks/OrgformStgUngleichOrgformPrestudent.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/plausichecks/PlausiChecker.php b/application/libraries/issues/plausichecks/PlausiChecker.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/plausichecks/PrestudentMischformOhneOrgform.php b/application/libraries/issues/plausichecks/PrestudentMischformOhneOrgform.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/plausichecks/StgPrestudentUngleichStgStudent.php b/application/libraries/issues/plausichecks/StgPrestudentUngleichStgStudent.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/plausichecks/StgPrestudentUngleichStgStudienplan.php b/application/libraries/issues/plausichecks/StgPrestudentUngleichStgStudienplan.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/plausichecks/StudentstatusNachAbbrecher.php b/application/libraries/issues/plausichecks/StudentstatusNachAbbrecher.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/plausichecks/StudienplanUngueltig.php b/application/libraries/issues/plausichecks/StudienplanUngueltig.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/resolvers/CORE_INOUT_0001.php b/application/libraries/issues/resolvers/CORE_INOUT_0001.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/resolvers/CORE_INOUT_0002.php b/application/libraries/issues/resolvers/CORE_INOUT_0002.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/resolvers/CORE_INOUT_0003.php b/application/libraries/issues/resolvers/CORE_INOUT_0003.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/resolvers/CORE_INOUT_0004.php b/application/libraries/issues/resolvers/CORE_INOUT_0004.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/resolvers/CORE_INOUT_0005.php b/application/libraries/issues/resolvers/CORE_INOUT_0005.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/resolvers/CORE_INOUT_0006.php b/application/libraries/issues/resolvers/CORE_INOUT_0006.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/resolvers/CORE_INOUT_0007.php b/application/libraries/issues/resolvers/CORE_INOUT_0007.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/resolvers/CORE_INOUT_0008.php b/application/libraries/issues/resolvers/CORE_INOUT_0008.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/resolvers/CORE_INOUT_0009.php b/application/libraries/issues/resolvers/CORE_INOUT_0009.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/resolvers/CORE_PERSON_0001.php b/application/libraries/issues/resolvers/CORE_PERSON_0001.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/resolvers/CORE_PERSON_0002.php b/application/libraries/issues/resolvers/CORE_PERSON_0002.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/resolvers/CORE_PERSON_0003.php b/application/libraries/issues/resolvers/CORE_PERSON_0003.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/resolvers/CORE_PERSON_0004.php b/application/libraries/issues/resolvers/CORE_PERSON_0004.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/resolvers/CORE_STG_0001.php b/application/libraries/issues/resolvers/CORE_STG_0001.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/resolvers/CORE_STG_0002.php b/application/libraries/issues/resolvers/CORE_STG_0002.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/resolvers/CORE_STG_0003.php b/application/libraries/issues/resolvers/CORE_STG_0003.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/resolvers/CORE_STG_0004.php b/application/libraries/issues/resolvers/CORE_STG_0004.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0001.php b/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0001.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0002.php b/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0002.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0003.php b/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0003.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0004.php b/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0004.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0005.php b/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0005.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0006.php b/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0006.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0007.php b/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0007.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0008.php b/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0008.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0009.php b/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0009.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0010.php b/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0010.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0011.php b/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0011.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0012.php b/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0012.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0013.php b/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0013.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0014.php b/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0014.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0015.php b/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0015.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/resolvers/CORE_ZGV_0001.php b/application/libraries/issues/resolvers/CORE_ZGV_0001.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/resolvers/CORE_ZGV_0002.php b/application/libraries/issues/resolvers/CORE_ZGV_0002.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/resolvers/CORE_ZGV_0003.php b/application/libraries/issues/resolvers/CORE_ZGV_0003.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/resolvers/CORE_ZGV_0004.php b/application/libraries/issues/resolvers/CORE_ZGV_0004.php
old mode 100755
new mode 100644
diff --git a/application/libraries/issues/resolvers/CORE_ZGV_0005.php b/application/libraries/issues/resolvers/CORE_ZGV_0005.php
old mode 100755
new mode 100644
diff --git a/application/logs/index.html b/application/logs/index.html
old mode 100755
new mode 100644
diff --git a/application/models/CL/Messages_model.php b/application/models/CL/Messages_model.php
old mode 100755
new mode 100644
diff --git a/application/models/accounting/Aufteilung_model.php b/application/models/accounting/Aufteilung_model.php
old mode 100755
new mode 100644
diff --git a/application/models/accounting/Bestelldetail_model.php b/application/models/accounting/Bestelldetail_model.php
old mode 100755
new mode 100644
diff --git a/application/models/accounting/Bestelldetailtag_model.php b/application/models/accounting/Bestelldetailtag_model.php
old mode 100755
new mode 100644
diff --git a/application/models/accounting/Bestellstatus_model.php b/application/models/accounting/Bestellstatus_model.php
old mode 100755
new mode 100644
diff --git a/application/models/accounting/Bestellung_model.php b/application/models/accounting/Bestellung_model.php
old mode 100755
new mode 100644
diff --git a/application/models/accounting/Bestellungtag_model.php b/application/models/accounting/Bestellungtag_model.php
old mode 100755
new mode 100644
diff --git a/application/models/accounting/Buchung_model.php b/application/models/accounting/Buchung_model.php
old mode 100755
new mode 100644
diff --git a/application/models/accounting/Buchungstyp_model.php b/application/models/accounting/Buchungstyp_model.php
old mode 100755
new mode 100644
diff --git a/application/models/accounting/Budget_model.php b/application/models/accounting/Budget_model.php
old mode 100755
new mode 100644
diff --git a/application/models/accounting/Konto_model.php b/application/models/accounting/Konto_model.php
old mode 100755
new mode 100644
diff --git a/application/models/accounting/Kostenstelle_model.php b/application/models/accounting/Kostenstelle_model.php
old mode 100755
new mode 100644
diff --git a/application/models/accounting/Rechnung_model.php b/application/models/accounting/Rechnung_model.php
old mode 100755
new mode 100644
diff --git a/application/models/accounting/Rechnungsbetrag_model.php b/application/models/accounting/Rechnungsbetrag_model.php
old mode 100755
new mode 100644
diff --git a/application/models/accounting/Rechnungstyp_model.php b/application/models/accounting/Rechnungstyp_model.php
old mode 100755
new mode 100644
diff --git a/application/models/accounting/Vertrag_model.php b/application/models/accounting/Vertrag_model.php
old mode 100755
new mode 100644
diff --git a/application/models/accounting/Vertragsstatus_model.php b/application/models/accounting/Vertragsstatus_model.php
old mode 100755
new mode 100644
diff --git a/application/models/accounting/Vertragstyp_model.php b/application/models/accounting/Vertragstyp_model.php
old mode 100755
new mode 100644
diff --git a/application/models/accounting/Vertragvertragsstatus_model.php b/application/models/accounting/Vertragvertragsstatus_model.php
old mode 100755
new mode 100644
diff --git a/application/models/accounting/Zahlungstyp_model.php b/application/models/accounting/Zahlungstyp_model.php
old mode 100755
new mode 100644
diff --git a/application/models/codex/Abschluss_model.php b/application/models/codex/Abschluss_model.php
old mode 100755
new mode 100644
diff --git a/application/models/codex/Akadgrad_model.php b/application/models/codex/Akadgrad_model.php
old mode 100755
new mode 100644
diff --git a/application/models/codex/Archiv_model.php b/application/models/codex/Archiv_model.php
old mode 100755
new mode 100644
diff --git a/application/models/codex/Aufenthaltfoerderung_model.php b/application/models/codex/Aufenthaltfoerderung_model.php
old mode 100755
new mode 100644
diff --git a/application/models/codex/Aufmerksamdurch_model.php b/application/models/codex/Aufmerksamdurch_model.php
old mode 100755
new mode 100644
diff --git a/application/models/codex/Ausbildung_model.php b/application/models/codex/Ausbildung_model.php
old mode 100755
new mode 100644
diff --git a/application/models/codex/Berufstaetigkeit_model.php b/application/models/codex/Berufstaetigkeit_model.php
old mode 100755
new mode 100644
diff --git a/application/models/codex/Beschaeftigungsausmass_model.php b/application/models/codex/Beschaeftigungsausmass_model.php
old mode 100755
new mode 100644
diff --git a/application/models/codex/Besqual_model.php b/application/models/codex/Besqual_model.php
old mode 100755
new mode 100644
diff --git a/application/models/codex/Bisfunktion_model.php b/application/models/codex/Bisfunktion_model.php
old mode 100755
new mode 100644
diff --git a/application/models/codex/Bisio_model.php b/application/models/codex/Bisio_model.php
old mode 100755
new mode 100644
diff --git a/application/models/codex/Bisioaufenthaltfoerderung_model.php b/application/models/codex/Bisioaufenthaltfoerderung_model.php
old mode 100755
new mode 100644
diff --git a/application/models/codex/Bisiozweck_model.php b/application/models/codex/Bisiozweck_model.php
old mode 100755
new mode 100644
diff --git a/application/models/codex/Bisorgform_model.php b/application/models/codex/Bisorgform_model.php
old mode 100755
new mode 100644
diff --git a/application/models/codex/Bisverwendung_model.php b/application/models/codex/Bisverwendung_model.php
old mode 100755
new mode 100644
diff --git a/application/models/codex/Bundesland_model.php b/application/models/codex/Bundesland_model.php
old mode 100755
new mode 100644
diff --git a/application/models/codex/Entwicklungsteam_model.php b/application/models/codex/Entwicklungsteam_model.php
old mode 100755
new mode 100644
diff --git a/application/models/codex/Gemeinde_model.php b/application/models/codex/Gemeinde_model.php
old mode 100755
new mode 100644
diff --git a/application/models/codex/Gsprogramm_model.php b/application/models/codex/Gsprogramm_model.php
old mode 100755
new mode 100644
diff --git a/application/models/codex/Hauptberuf_model.php b/application/models/codex/Hauptberuf_model.php
old mode 100755
new mode 100644
diff --git a/application/models/codex/Lehrform_model.php b/application/models/codex/Lehrform_model.php
old mode 100755
new mode 100644
diff --git a/application/models/codex/Lgartcode_model.php b/application/models/codex/Lgartcode_model.php
old mode 100755
new mode 100644
diff --git a/application/models/codex/Mobilitaet_model.php b/application/models/codex/Mobilitaet_model.php
old mode 100755
new mode 100644
diff --git a/application/models/codex/Mobilitaetsprogramm_model.php b/application/models/codex/Mobilitaetsprogramm_model.php
old mode 100755
new mode 100644
diff --git a/application/models/codex/Nation_model.php b/application/models/codex/Nation_model.php
old mode 100755
new mode 100644
diff --git a/application/models/codex/Note_model.php b/application/models/codex/Note_model.php
old mode 100755
new mode 100644
diff --git a/application/models/codex/Oehbeitrag_model.php b/application/models/codex/Oehbeitrag_model.php
old mode 100755
new mode 100644
diff --git a/application/models/codex/Orgform_model.php b/application/models/codex/Orgform_model.php
old mode 100755
new mode 100644
diff --git a/application/models/codex/Uhstat1daten_model.php b/application/models/codex/Uhstat1daten_model.php
old mode 100755
new mode 100644
diff --git a/application/models/codex/Verwendung_model.php b/application/models/codex/Verwendung_model.php
old mode 100755
new mode 100644
diff --git a/application/models/codex/Zgv_model.php b/application/models/codex/Zgv_model.php
old mode 100755
new mode 100644
diff --git a/application/models/codex/Zgvdoktor_model.php b/application/models/codex/Zgvdoktor_model.php
old mode 100755
new mode 100644
diff --git a/application/models/codex/Zgvgruppe_model.php b/application/models/codex/Zgvgruppe_model.php
old mode 100755
new mode 100644
diff --git a/application/models/codex/Zgvmaster_model.php b/application/models/codex/Zgvmaster_model.php
old mode 100755
new mode 100644
diff --git a/application/models/codex/Zweck_model.php b/application/models/codex/Zweck_model.php
old mode 100755
new mode 100644
diff --git a/application/models/content/Ampel_model.php b/application/models/content/Ampel_model.php
old mode 100755
new mode 100644
diff --git a/application/models/content/Content_model.php b/application/models/content/Content_model.php
old mode 100755
new mode 100644
diff --git a/application/models/content/Contentchild_model.php b/application/models/content/Contentchild_model.php
old mode 100755
new mode 100644
diff --git a/application/models/content/Contentgruppe_model.php b/application/models/content/Contentgruppe_model.php
old mode 100755
new mode 100644
diff --git a/application/models/content/Contentlog_model.php b/application/models/content/Contentlog_model.php
old mode 100755
new mode 100644
diff --git a/application/models/content/Contentsprache_model.php b/application/models/content/Contentsprache_model.php
old mode 100755
new mode 100644
diff --git a/application/models/content/DmsFS_model.php b/application/models/content/DmsFS_model.php
old mode 100755
new mode 100644
diff --git a/application/models/content/DmsVersion_model.php b/application/models/content/DmsVersion_model.php
old mode 100755
new mode 100644
diff --git a/application/models/content/Dms_model.php b/application/models/content/Dms_model.php
old mode 100755
new mode 100644
diff --git a/application/models/content/Infoscreen_model.php b/application/models/content/Infoscreen_model.php
old mode 100755
new mode 100644
diff --git a/application/models/content/News_model.php b/application/models/content/News_model.php
old mode 100755
new mode 100644
diff --git a/application/models/content/TempFS_model.php b/application/models/content/TempFS_model.php
old mode 100755
new mode 100644
diff --git a/application/models/content/Template_model.php b/application/models/content/Template_model.php
old mode 100755
new mode 100644
diff --git a/application/models/content/Veranstaltung_model.php b/application/models/content/Veranstaltung_model.php
old mode 100755
new mode 100644
diff --git a/application/models/content/Veranstaltungskategorie_model.php b/application/models/content/Veranstaltungskategorie_model.php
old mode 100755
new mode 100644
diff --git a/application/models/crm/Akte_model.php b/application/models/crm/Akte_model.php
old mode 100755
new mode 100644
diff --git a/application/models/crm/Aufnahmeschluessel_model.php b/application/models/crm/Aufnahmeschluessel_model.php
old mode 100755
new mode 100644
diff --git a/application/models/crm/Bewerbungstermine_model.php b/application/models/crm/Bewerbungstermine_model.php
old mode 100755
new mode 100644
diff --git a/application/models/crm/Buchungstyp_model.php b/application/models/crm/Buchungstyp_model.php
old mode 100755
new mode 100644
diff --git a/application/models/crm/Dokument_model.php b/application/models/crm/Dokument_model.php
old mode 100755
new mode 100644
diff --git a/application/models/crm/Dokumentprestudent_model.php b/application/models/crm/Dokumentprestudent_model.php
old mode 100755
new mode 100644
diff --git a/application/models/crm/Dokumentstudiengang_model.php b/application/models/crm/Dokumentstudiengang_model.php
old mode 100755
new mode 100644
diff --git a/application/models/crm/Konto_model.php b/application/models/crm/Konto_model.php
old mode 100755
new mode 100644
diff --git a/application/models/crm/Preincoming_model.php b/application/models/crm/Preincoming_model.php
old mode 100755
new mode 100644
diff --git a/application/models/crm/Preinteressent_model.php b/application/models/crm/Preinteressent_model.php
old mode 100755
new mode 100644
diff --git a/application/models/crm/Preinteressentstudiengang_model.php b/application/models/crm/Preinteressentstudiengang_model.php
old mode 100755
new mode 100644
diff --git a/application/models/crm/Preoutgoing_model.php b/application/models/crm/Preoutgoing_model.php
old mode 100755
new mode 100644
diff --git a/application/models/crm/Prestudent_model.php b/application/models/crm/Prestudent_model.php
old mode 100755
new mode 100644
diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php
old mode 100755
new mode 100644
diff --git a/application/models/crm/Reihungstest_model.php b/application/models/crm/Reihungstest_model.php
old mode 100755
new mode 100644
diff --git a/application/models/crm/RtPerson_model.php b/application/models/crm/RtPerson_model.php
old mode 100755
new mode 100644
diff --git a/application/models/crm/RtStudienplan_model.php b/application/models/crm/RtStudienplan_model.php
old mode 100755
new mode 100644
diff --git a/application/models/crm/RueckstellungStatus_model.php b/application/models/crm/RueckstellungStatus_model.php
old mode 100755
new mode 100644
diff --git a/application/models/crm/Rueckstellung_model.php b/application/models/crm/Rueckstellung_model.php
old mode 100755
new mode 100644
diff --git a/application/models/crm/Status_model.php b/application/models/crm/Status_model.php
old mode 100755
new mode 100644
diff --git a/application/models/crm/Statusgrund_model.php b/application/models/crm/Statusgrund_model.php
old mode 100755
new mode 100644
diff --git a/application/models/crm/Student_model.php b/application/models/crm/Student_model.php
old mode 100755
new mode 100644
diff --git a/application/models/crm/ZGVPruefungStatus_model.php b/application/models/crm/ZGVPruefungStatus_model.php
old mode 100755
new mode 100644
diff --git a/application/models/crm/ZGVPruefung_model.php b/application/models/crm/ZGVPruefung_model.php
old mode 100755
new mode 100644
diff --git a/application/models/dashboard/Dashboard_Override_model.php b/application/models/dashboard/Dashboard_Override_model.php
old mode 100755
new mode 100644
diff --git a/application/models/dashboard/Dashboard_Preset_model.php b/application/models/dashboard/Dashboard_Preset_model.php
old mode 100755
new mode 100644
diff --git a/application/models/dashboard/Dashboard_Widget_model.php b/application/models/dashboard/Dashboard_Widget_model.php
old mode 100755
new mode 100644
diff --git a/application/models/dashboard/Dashboard_model.php b/application/models/dashboard/Dashboard_model.php
old mode 100755
new mode 100644
diff --git a/application/models/dashboard/Widget_model.php b/application/models/dashboard/Widget_model.php
old mode 100755
new mode 100644
diff --git a/application/models/education/Abgabe_model.php b/application/models/education/Abgabe_model.php
old mode 100755
new mode 100644
diff --git a/application/models/education/Abschlussbeurteilung_model.php b/application/models/education/Abschlussbeurteilung_model.php
old mode 100755
new mode 100644
diff --git a/application/models/education/Abschlusspruefung_model.php b/application/models/education/Abschlusspruefung_model.php
old mode 100755
new mode 100644
diff --git a/application/models/education/Anrechnung_model.php b/application/models/education/Anrechnung_model.php
old mode 100755
new mode 100644
diff --git a/application/models/education/Anrechnungbegruendung_model.php b/application/models/education/Anrechnungbegruendung_model.php
old mode 100755
new mode 100644
diff --git a/application/models/education/Anrechnungstatus_model.php b/application/models/education/Anrechnungstatus_model.php
old mode 100755
new mode 100644
diff --git a/application/models/education/Anrechnungszeitraum_model.php b/application/models/education/Anrechnungszeitraum_model.php
old mode 100755
new mode 100644
diff --git a/application/models/education/Anwesenheit_model.php b/application/models/education/Anwesenheit_model.php
old mode 100755
new mode 100644
diff --git a/application/models/education/Beispiel_model.php b/application/models/education/Beispiel_model.php
old mode 100755
new mode 100644
diff --git a/application/models/education/Betreuerart_model.php b/application/models/education/Betreuerart_model.php
old mode 100755
new mode 100644
diff --git a/application/models/education/Feedback_model.php b/application/models/education/Feedback_model.php
old mode 100755
new mode 100644
diff --git a/application/models/education/LeNotenschluessel_model.php b/application/models/education/LeNotenschluessel_model.php
old mode 100755
new mode 100644
diff --git a/application/models/education/LePruefung_model.php b/application/models/education/LePruefung_model.php
old mode 100755
new mode 100644
diff --git a/application/models/education/Legesamtnote_model.php b/application/models/education/Legesamtnote_model.php
old mode 100755
new mode 100644
diff --git a/application/models/education/Lehreinheit_model.php b/application/models/education/Lehreinheit_model.php
old mode 100755
new mode 100644
diff --git a/application/models/education/Lehreinheitgruppe_model.php b/application/models/education/Lehreinheitgruppe_model.php
old mode 100755
new mode 100644
diff --git a/application/models/education/Lehreinheitmitarbeiter_model.php b/application/models/education/Lehreinheitmitarbeiter_model.php
old mode 100755
new mode 100644
diff --git a/application/models/education/Lehrfach_model.php b/application/models/education/Lehrfach_model.php
old mode 100755
new mode 100644
diff --git a/application/models/education/Lehrfunktion_model.php b/application/models/education/Lehrfunktion_model.php
old mode 100755
new mode 100644
diff --git a/application/models/education/Lehrtyp_model.php b/application/models/education/Lehrtyp_model.php
old mode 100755
new mode 100644
diff --git a/application/models/education/Lehrveranstaltung_model.php b/application/models/education/Lehrveranstaltung_model.php
old mode 100755
new mode 100644
diff --git a/application/models/education/Lvangebot_model.php b/application/models/education/Lvangebot_model.php
old mode 100755
new mode 100644
diff --git a/application/models/education/Lvgesamtnote_model.php b/application/models/education/Lvgesamtnote_model.php
old mode 100755
new mode 100644
diff --git a/application/models/education/Lvinfo_model.php b/application/models/education/Lvinfo_model.php
old mode 100755
new mode 100644
diff --git a/application/models/education/Lvregel_model.php b/application/models/education/Lvregel_model.php
old mode 100755
new mode 100644
diff --git a/application/models/education/Lvregeltyp_model.php b/application/models/education/Lvregeltyp_model.php
old mode 100755
new mode 100644
diff --git a/application/models/education/Notenschluessel_model.php b/application/models/education/Notenschluessel_model.php
old mode 100755
new mode 100644
diff --git a/application/models/education/Notenschluesselaufteilung_model.php b/application/models/education/Notenschluesselaufteilung_model.php
old mode 100755
new mode 100644
diff --git a/application/models/education/Notenschluesseluebung_model.php b/application/models/education/Notenschluesseluebung_model.php
old mode 100755
new mode 100644
diff --git a/application/models/education/Notenschluesselzuordnung_model.php b/application/models/education/Notenschluesselzuordnung_model.php
old mode 100755
new mode 100644
diff --git a/application/models/education/Paabgabe_model.php b/application/models/education/Paabgabe_model.php
old mode 100755
new mode 100644
diff --git a/application/models/education/Paabgabetyp_model.php b/application/models/education/Paabgabetyp_model.php
old mode 100755
new mode 100644
diff --git a/application/models/education/Projektarbeit_model.php b/application/models/education/Projektarbeit_model.php
old mode 100755
new mode 100644
diff --git a/application/models/education/Projektbetreuer_model.php b/application/models/education/Projektbetreuer_model.php
old mode 100755
new mode 100644
diff --git a/application/models/education/Projekttyp_model.php b/application/models/education/Projekttyp_model.php
old mode 100755
new mode 100644
diff --git a/application/models/education/Pruefung_model.php b/application/models/education/Pruefung_model.php
old mode 100755
new mode 100644
diff --git a/application/models/education/Pruefungsanmeldung_model.php b/application/models/education/Pruefungsanmeldung_model.php
old mode 100755
new mode 100644
diff --git a/application/models/education/Pruefungsfenster_model.php b/application/models/education/Pruefungsfenster_model.php
old mode 100755
new mode 100644
diff --git a/application/models/education/Pruefungsstatus_model.php b/application/models/education/Pruefungsstatus_model.php
old mode 100755
new mode 100644
diff --git a/application/models/education/Pruefungstermin_model.php b/application/models/education/Pruefungstermin_model.php
old mode 100755
new mode 100644
diff --git a/application/models/education/Pruefungstyp_model.php b/application/models/education/Pruefungstyp_model.php
old mode 100755
new mode 100644
diff --git a/application/models/education/Studentbeispiel_model.php b/application/models/education/Studentbeispiel_model.php
old mode 100755
new mode 100644
diff --git a/application/models/education/Studentlehrverband_model.php b/application/models/education/Studentlehrverband_model.php
old mode 100755
new mode 100644
diff --git a/application/models/education/Studentuebung_model.php b/application/models/education/Studentuebung_model.php
old mode 100755
new mode 100644
diff --git a/application/models/education/Studierendenantrag_model.php b/application/models/education/Studierendenantrag_model.php
old mode 100755
new mode 100644
diff --git a/application/models/education/Studierendenantraglehrveranstaltung_model.php b/application/models/education/Studierendenantraglehrveranstaltung_model.php
old mode 100755
new mode 100644
diff --git a/application/models/education/Studierendenantragstatus_model.php b/application/models/education/Studierendenantragstatus_model.php
old mode 100755
new mode 100644
diff --git a/application/models/education/Uebung_model.php b/application/models/education/Uebung_model.php
old mode 100755
new mode 100644
diff --git a/application/models/education/Zeugnis_model.php b/application/models/education/Zeugnis_model.php
old mode 100755
new mode 100644
diff --git a/application/models/education/Zeugnisnote_model.php b/application/models/education/Zeugnisnote_model.php
old mode 100755
new mode 100644
diff --git a/application/models/extensions/.placeholder b/application/models/extensions/.placeholder
old mode 100755
new mode 100644
diff --git a/application/models/index.html b/application/models/index.html
old mode 100755
new mode 100644
diff --git a/application/models/organisation/Erhalter_model.php b/application/models/organisation/Erhalter_model.php
old mode 100755
new mode 100644
diff --git a/application/models/organisation/Fachbereich_model.php b/application/models/organisation/Fachbereich_model.php
old mode 100755
new mode 100644
diff --git a/application/models/organisation/Ferien_model.php b/application/models/organisation/Ferien_model.php
old mode 100755
new mode 100644
diff --git a/application/models/organisation/Geschaeftsjahr_model.php b/application/models/organisation/Geschaeftsjahr_model.php
old mode 100755
new mode 100644
diff --git a/application/models/organisation/Gruppe_model.php b/application/models/organisation/Gruppe_model.php
old mode 100755
new mode 100644
diff --git a/application/models/organisation/Lehrverband_model.php b/application/models/organisation/Lehrverband_model.php
old mode 100755
new mode 100644
diff --git a/application/models/organisation/Organisationseinheit_model.php b/application/models/organisation/Organisationseinheit_model.php
old mode 100755
new mode 100644
diff --git a/application/models/organisation/Organisationseinheittyp_model.php b/application/models/organisation/Organisationseinheittyp_model.php
old mode 100755
new mode 100644
diff --git a/application/models/organisation/Semesterwochen_model.php b/application/models/organisation/Semesterwochen_model.php
old mode 100755
new mode 100644
diff --git a/application/models/organisation/Service_model.php b/application/models/organisation/Service_model.php
old mode 100755
new mode 100644
diff --git a/application/models/organisation/Standort_model.php b/application/models/organisation/Standort_model.php
old mode 100755
new mode 100644
diff --git a/application/models/organisation/Statistik_model.php b/application/models/organisation/Statistik_model.php
old mode 100755
new mode 100644
diff --git a/application/models/organisation/Studiengang_model.php b/application/models/organisation/Studiengang_model.php
old mode 100755
new mode 100644
diff --git a/application/models/organisation/Studiengangstyp_model.php b/application/models/organisation/Studiengangstyp_model.php
old mode 100755
new mode 100644
diff --git a/application/models/organisation/Studienjahr_model.php b/application/models/organisation/Studienjahr_model.php
old mode 100755
new mode 100644
diff --git a/application/models/organisation/Studienordnung_model.php b/application/models/organisation/Studienordnung_model.php
old mode 100755
new mode 100644
diff --git a/application/models/organisation/Studienordnungstatus_model.php b/application/models/organisation/Studienordnungstatus_model.php
old mode 100755
new mode 100644
diff --git a/application/models/organisation/Studienplan_model.php b/application/models/organisation/Studienplan_model.php
old mode 100755
new mode 100644
diff --git a/application/models/organisation/Studienplatz_model.php b/application/models/organisation/Studienplatz_model.php
old mode 100755
new mode 100644
diff --git a/application/models/organisation/Studiensemester_model.php b/application/models/organisation/Studiensemester_model.php
old mode 100755
new mode 100644
diff --git a/application/models/person/Adresse_model.php b/application/models/person/Adresse_model.php
old mode 100755
new mode 100644
diff --git a/application/models/person/Adressentyp_model.php b/application/models/person/Adressentyp_model.php
old mode 100755
new mode 100644
diff --git a/application/models/person/Bankverbindung_model.php b/application/models/person/Bankverbindung_model.php
old mode 100755
new mode 100644
diff --git a/application/models/person/Benutzer_model.php b/application/models/person/Benutzer_model.php
old mode 100755
new mode 100644
diff --git a/application/models/person/Benutzerfunktion_model.php b/application/models/person/Benutzerfunktion_model.php
old mode 100755
new mode 100644
diff --git a/application/models/person/Benutzergruppe_model.php b/application/models/person/Benutzergruppe_model.php
old mode 100755
new mode 100644
diff --git a/application/models/person/Fotostatus_model.php b/application/models/person/Fotostatus_model.php
old mode 100755
new mode 100644
diff --git a/application/models/person/Fotostatusperson_model.php b/application/models/person/Fotostatusperson_model.php
old mode 100755
new mode 100644
diff --git a/application/models/person/Freebusy_model.php b/application/models/person/Freebusy_model.php
old mode 100755
new mode 100644
diff --git a/application/models/person/Freebusytyp_model.php b/application/models/person/Freebusytyp_model.php
old mode 100755
new mode 100644
diff --git a/application/models/person/Geschlecht_model.php b/application/models/person/Geschlecht_model.php
old mode 100755
new mode 100644
diff --git a/application/models/person/Kontakt_model.php b/application/models/person/Kontakt_model.php
old mode 100755
new mode 100644
diff --git a/application/models/person/Kontaktmedium_model.php b/application/models/person/Kontaktmedium_model.php
old mode 100755
new mode 100644
diff --git a/application/models/person/Kontakttyp_model.php b/application/models/person/Kontakttyp_model.php
old mode 100755
new mode 100644
diff --git a/application/models/person/Notiz_model.php b/application/models/person/Notiz_model.php
old mode 100755
new mode 100644
diff --git a/application/models/person/Notizzuordnung_model.php b/application/models/person/Notizzuordnung_model.php
old mode 100755
new mode 100644
diff --git a/application/models/person/Person_model.php b/application/models/person/Person_model.php
old mode 100755
new mode 100644
diff --git a/application/models/person/Profil_update_model.php b/application/models/person/Profil_update_model.php
old mode 100755
new mode 100644
diff --git a/application/models/project/Aktivitaet_model.php b/application/models/project/Aktivitaet_model.php
old mode 100755
new mode 100644
diff --git a/application/models/project/Aufwandstyp_model.php b/application/models/project/Aufwandstyp_model.php
old mode 100755
new mode 100644
diff --git a/application/models/project/Projekt_model.php b/application/models/project/Projekt_model.php
old mode 100755
new mode 100644
diff --git a/application/models/project/Projekt_ressource_model.php b/application/models/project/Projekt_ressource_model.php
old mode 100755
new mode 100644
diff --git a/application/models/project/Projektphase_model.php b/application/models/project/Projektphase_model.php
old mode 100755
new mode 100644
diff --git a/application/models/project/Projekttask_model.php b/application/models/project/Projekttask_model.php
old mode 100755
new mode 100644
diff --git a/application/models/project/Ressource_model.php b/application/models/project/Ressource_model.php
old mode 100755
new mode 100644
diff --git a/application/models/project/Scrumsprint_model.php b/application/models/project/Scrumsprint_model.php
old mode 100755
new mode 100644
diff --git a/application/models/ressource/Betriebsmittel_model.php b/application/models/ressource/Betriebsmittel_model.php
old mode 100755
new mode 100644
diff --git a/application/models/ressource/Betriebsmittelperson_model.php b/application/models/ressource/Betriebsmittelperson_model.php
old mode 100755
new mode 100644
diff --git a/application/models/ressource/Betriebsmittelstatus_model.php b/application/models/ressource/Betriebsmittelstatus_model.php
old mode 100755
new mode 100644
diff --git a/application/models/ressource/Betriebsmitteltyp_model.php b/application/models/ressource/Betriebsmitteltyp_model.php
old mode 100755
new mode 100644
diff --git a/application/models/ressource/Coodle_model.php b/application/models/ressource/Coodle_model.php
old mode 100755
new mode 100644
diff --git a/application/models/ressource/Erreichbarkeit_model.php b/application/models/ressource/Erreichbarkeit_model.php
old mode 100755
new mode 100644
diff --git a/application/models/ressource/Firma_model.php b/application/models/ressource/Firma_model.php
old mode 100755
new mode 100644
diff --git a/application/models/ressource/Firmatag_model.php b/application/models/ressource/Firmatag_model.php
old mode 100755
new mode 100644
diff --git a/application/models/ressource/Firmentyp_model.php b/application/models/ressource/Firmentyp_model.php
old mode 100755
new mode 100644
diff --git a/application/models/ressource/Funktion_model.php b/application/models/ressource/Funktion_model.php
old mode 100755
new mode 100644
diff --git a/application/models/ressource/Lehrmittel_model.php b/application/models/ressource/Lehrmittel_model.php
old mode 100755
new mode 100644
diff --git a/application/models/ressource/Mitarbeiter_model.php b/application/models/ressource/Mitarbeiter_model.php
old mode 100755
new mode 100644
diff --git a/application/models/ressource/Ort_model.php b/application/models/ressource/Ort_model.php
old mode 100755
new mode 100644
diff --git a/application/models/ressource/Ortraumtyp_model.php b/application/models/ressource/Ortraumtyp_model.php
old mode 100755
new mode 100644
diff --git a/application/models/ressource/Personfunktionstandort_model.php b/application/models/ressource/Personfunktionstandort_model.php
old mode 100755
new mode 100644
diff --git a/application/models/ressource/Raumtyp_model.php b/application/models/ressource/Raumtyp_model.php
old mode 100755
new mode 100644
diff --git a/application/models/ressource/Reservierung_model.php b/application/models/ressource/Reservierung_model.php
old mode 100755
new mode 100644
diff --git a/application/models/ressource/Stunde_model.php b/application/models/ressource/Stunde_model.php
old mode 100755
new mode 100644
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
old mode 100755
new mode 100644
diff --git a/application/models/ressource/Stundenplandev_model.php b/application/models/ressource/Stundenplandev_model.php
old mode 100755
new mode 100644
diff --git a/application/models/ressource/Zeitaufzeichnung_model.php b/application/models/ressource/Zeitaufzeichnung_model.php
old mode 100755
new mode 100644
diff --git a/application/models/ressource/Zeitsperre_model.php b/application/models/ressource/Zeitsperre_model.php
old mode 100755
new mode 100644
diff --git a/application/models/ressource/Zeitsperretyp_model.php b/application/models/ressource/Zeitsperretyp_model.php
old mode 100755
new mode 100644
diff --git a/application/models/ressource/Zeitwunsch_gueltigkeit_model.php b/application/models/ressource/Zeitwunsch_gueltigkeit_model.php
old mode 100755
new mode 100644
diff --git a/application/models/ressource/Zeitwunsch_model.php b/application/models/ressource/Zeitwunsch_model.php
old mode 100755
new mode 100644
diff --git a/application/models/system/Appdaten_model.php b/application/models/system/Appdaten_model.php
old mode 100755
new mode 100644
diff --git a/application/models/system/Attachment_model.php b/application/models/system/Attachment_model.php
old mode 100755
new mode 100644
diff --git a/application/models/system/Benutzerrolle_model.php b/application/models/system/Benutzerrolle_model.php
old mode 100755
new mode 100644
diff --git a/application/models/system/Berechtigung_model.php b/application/models/system/Berechtigung_model.php
old mode 100755
new mode 100644
diff --git a/application/models/system/Cronjob_model.php b/application/models/system/Cronjob_model.php
old mode 100755
new mode 100644
diff --git a/application/models/system/Dokument_model.php b/application/models/system/Dokument_model.php
old mode 100755
new mode 100644
diff --git a/application/models/system/Extensions_model.php b/application/models/system/Extensions_model.php
old mode 100755
new mode 100644
diff --git a/application/models/system/Fehler_model.php b/application/models/system/Fehler_model.php
old mode 100755
new mode 100644
diff --git a/application/models/system/Fehlerkonfiguration_model.php b/application/models/system/Fehlerkonfiguration_model.php
old mode 100755
new mode 100644
diff --git a/application/models/system/Fehlerkonfigurationstyp_model.php b/application/models/system/Fehlerkonfigurationstyp_model.php
old mode 100755
new mode 100644
diff --git a/application/models/system/Fehlerzustaendigkeiten_model.php b/application/models/system/Fehlerzustaendigkeiten_model.php
old mode 100755
new mode 100644
diff --git a/application/models/system/Filter_model.php b/application/models/system/Filter_model.php
old mode 100755
new mode 100644
diff --git a/application/models/system/Filters_model.php b/application/models/system/Filters_model.php
old mode 100755
new mode 100644
diff --git a/application/models/system/Issue_model.php b/application/models/system/Issue_model.php
old mode 100755
new mode 100644
diff --git a/application/models/system/JobStatuses_model.php b/application/models/system/JobStatuses_model.php
old mode 100755
new mode 100644
diff --git a/application/models/system/JobTriggers_model.php b/application/models/system/JobTriggers_model.php
old mode 100755
new mode 100644
diff --git a/application/models/system/JobTypes_model.php b/application/models/system/JobTypes_model.php
old mode 100755
new mode 100644
diff --git a/application/models/system/JobsQueue_model.php b/application/models/system/JobsQueue_model.php
old mode 100755
new mode 100644
diff --git a/application/models/system/Log_model.php b/application/models/system/Log_model.php
old mode 100755
new mode 100644
diff --git a/application/models/system/MessageToken_model.php b/application/models/system/MessageToken_model.php
old mode 100755
new mode 100644
diff --git a/application/models/system/Message_model.php b/application/models/system/Message_model.php
old mode 100755
new mode 100644
diff --git a/application/models/system/MsgStatus_model.php b/application/models/system/MsgStatus_model.php
old mode 100755
new mode 100644
diff --git a/application/models/system/PersonLock_model.php b/application/models/system/PersonLock_model.php
old mode 100755
new mode 100644
diff --git a/application/models/system/PersonLog_model.php b/application/models/system/PersonLog_model.php
old mode 100755
new mode 100644
diff --git a/application/models/system/Phrase_model.php b/application/models/system/Phrase_model.php
old mode 100755
new mode 100644
diff --git a/application/models/system/Phrasentext_model.php b/application/models/system/Phrasentext_model.php
old mode 100755
new mode 100644
diff --git a/application/models/system/Recipient_model.php b/application/models/system/Recipient_model.php
old mode 100755
new mode 100644
diff --git a/application/models/system/Rolle_model.php b/application/models/system/Rolle_model.php
old mode 100755
new mode 100644
diff --git a/application/models/system/Rolleberechtigung_model.php b/application/models/system/Rolleberechtigung_model.php
old mode 100755
new mode 100644
diff --git a/application/models/system/Server_model.php b/application/models/system/Server_model.php
old mode 100755
new mode 100644
diff --git a/application/models/system/Sprache_model.php b/application/models/system/Sprache_model.php
old mode 100755
new mode 100644
diff --git a/application/models/system/Tag_model.php b/application/models/system/Tag_model.php
old mode 100755
new mode 100644
diff --git a/application/models/system/UDF_model.php b/application/models/system/UDF_model.php
old mode 100755
new mode 100644
diff --git a/application/models/system/Variable_model.php b/application/models/system/Variable_model.php
old mode 100755
new mode 100644
diff --git a/application/models/system/Variablenname_model.php b/application/models/system/Variablenname_model.php
old mode 100755
new mode 100644
diff --git a/application/models/system/Vorlage_model.php b/application/models/system/Vorlage_model.php
old mode 100755
new mode 100644
diff --git a/application/models/system/Vorlagedokument_model.php b/application/models/system/Vorlagedokument_model.php
old mode 100755
new mode 100644
diff --git a/application/models/system/Vorlagestudiengang_model.php b/application/models/system/Vorlagestudiengang_model.php
old mode 100755
new mode 100644
diff --git a/application/models/system/Webservicelog_model.php b/application/models/system/Webservicelog_model.php
old mode 100755
new mode 100644
diff --git a/application/models/system/Webservicerecht_model.php b/application/models/system/Webservicerecht_model.php
old mode 100755
new mode 100644
diff --git a/application/models/system/Webservicetyp_model.php b/application/models/system/Webservicetyp_model.php
old mode 100755
new mode 100644
diff --git a/application/models/testtool/Ablauf_model.php b/application/models/testtool/Ablauf_model.php
old mode 100755
new mode 100644
diff --git a/application/models/testtool/Antwort_model.php b/application/models/testtool/Antwort_model.php
old mode 100755
new mode 100644
diff --git a/application/models/testtool/Frage_model.php b/application/models/testtool/Frage_model.php
old mode 100755
new mode 100644
diff --git a/application/models/testtool/Gebiet_model.php b/application/models/testtool/Gebiet_model.php
old mode 100755
new mode 100644
diff --git a/application/models/testtool/Kategorie_model.php b/application/models/testtool/Kategorie_model.php
old mode 100755
new mode 100644
diff --git a/application/models/testtool/Kriterien_model.php b/application/models/testtool/Kriterien_model.php
old mode 100755
new mode 100644
diff --git a/application/models/testtool/Pruefling_model.php b/application/models/testtool/Pruefling_model.php
old mode 100755
new mode 100644
diff --git a/application/models/testtool/Vorschlag_model.php b/application/models/testtool/Vorschlag_model.php
old mode 100755
new mode 100644
diff --git a/application/third_party/index.html b/application/third_party/index.html
old mode 100755
new mode 100644
diff --git a/application/tmp/.placeholder b/application/tmp/.placeholder
old mode 100755
new mode 100644
diff --git a/application/views/Cis/Cms/News/Xml/Address/Detailed.php b/application/views/Cis/Cms/News/Xml/Address/Detailed.php
old mode 100755
new mode 100644
diff --git a/application/views/Cis/Cms/News/Xml/Address/Short.php b/application/views/Cis/Cms/News/Xml/Address/Short.php
old mode 100755
new mode 100644
diff --git a/application/views/Cis/Cms/News/Xml/NewsExtras.php b/application/views/Cis/Cms/News/Xml/NewsExtras.php
old mode 100755
new mode 100644
diff --git a/application/views/Cis/Documents.php b/application/views/Cis/Documents.php
old mode 100755
new mode 100644
diff --git a/application/views/Cis/Login.php b/application/views/Cis/Login.php
old mode 100755
new mode 100644
diff --git a/application/views/Cis/MyLv.php b/application/views/Cis/MyLv.php
old mode 100755
new mode 100644
diff --git a/application/views/Cis/Profil.php b/application/views/Cis/Profil.php
old mode 100755
new mode 100644
diff --git a/application/views/Cis/ProfilUpdate.php b/application/views/Cis/ProfilUpdate.php
old mode 100755
new mode 100644
diff --git a/application/views/Cis/Stundenplan.php b/application/views/Cis/Stundenplan.php
old mode 100755
new mode 100644
diff --git a/application/views/CisHmvc/Cms/Content.php b/application/views/CisHmvc/Cms/Content.php
old mode 100755
new mode 100644
diff --git a/application/views/CisHmvc/Cms/Legacy.php b/application/views/CisHmvc/Cms/Legacy.php
old mode 100755
new mode 100644
diff --git a/application/views/CisHmvc/Dashboard.php b/application/views/CisHmvc/Dashboard.php
old mode 100755
new mode 100644
diff --git a/application/views/CisHmvc/Error.php b/application/views/CisHmvc/Error.php
old mode 100755
new mode 100644
diff --git a/application/views/CisHtml/Cms/Content.php b/application/views/CisHtml/Cms/Content.php
old mode 100755
new mode 100644
diff --git a/application/views/CisHtml/Dashboard.php b/application/views/CisHtml/Dashboard.php
old mode 100755
new mode 100644
diff --git a/application/views/CisHtml/Error.php b/application/views/CisHtml/Error.php
old mode 100755
new mode 100644
diff --git a/application/views/CisVue/Cms/Content.php b/application/views/CisVue/Cms/Content.php
old mode 100755
new mode 100644
diff --git a/application/views/CisVue/Dashboard.php b/application/views/CisVue/Dashboard.php
old mode 100755
new mode 100644
diff --git a/application/views/codex/oehbeitrag.php b/application/views/codex/oehbeitrag.php
old mode 100755
new mode 100644
diff --git a/application/views/codex/uhstat1.php b/application/views/codex/uhstat1.php
old mode 100755
new mode 100644
diff --git a/application/views/crm/statusEdit.php b/application/views/crm/statusEdit.php
old mode 100755
new mode 100644
diff --git a/application/views/crm/statusGrundList.php b/application/views/crm/statusGrundList.php
old mode 100755
new mode 100644
diff --git a/application/views/crm/statusList.php b/application/views/crm/statusList.php
old mode 100755
new mode 100644
diff --git a/application/views/crm/statusgrund.php b/application/views/crm/statusgrund.php
old mode 100755
new mode 100644
diff --git a/application/views/crm/statusgrundEdit.php b/application/views/crm/statusgrundEdit.php
old mode 100755
new mode 100644
diff --git a/application/views/crm/statusgrundNew.php b/application/views/crm/statusgrundNew.php
old mode 100755
new mode 100644
diff --git a/application/views/dashboard/dashboard_demo.php b/application/views/dashboard/dashboard_demo.php
old mode 100755
new mode 100644
diff --git a/application/views/dashboard/dashboard_demo_admin.php b/application/views/dashboard/dashboard_demo_admin.php
old mode 100755
new mode 100644
diff --git a/application/views/errors/cli/error_404.php b/application/views/errors/cli/error_404.php
old mode 100755
new mode 100644
diff --git a/application/views/errors/cli/error_db.php b/application/views/errors/cli/error_db.php
old mode 100755
new mode 100644
diff --git a/application/views/errors/cli/error_exception.php b/application/views/errors/cli/error_exception.php
old mode 100755
new mode 100644
diff --git a/application/views/errors/cli/error_general.php b/application/views/errors/cli/error_general.php
old mode 100755
new mode 100644
diff --git a/application/views/errors/cli/error_php.php b/application/views/errors/cli/error_php.php
old mode 100755
new mode 100644
diff --git a/application/views/errors/cli/index.html b/application/views/errors/cli/index.html
old mode 100755
new mode 100644
diff --git a/application/views/errors/html/error_404.php b/application/views/errors/html/error_404.php
old mode 100755
new mode 100644
diff --git a/application/views/errors/html/error_db.php b/application/views/errors/html/error_db.php
old mode 100755
new mode 100644
diff --git a/application/views/errors/html/error_exception.php b/application/views/errors/html/error_exception.php
old mode 100755
new mode 100644
diff --git a/application/views/errors/html/error_general.php b/application/views/errors/html/error_general.php
old mode 100755
new mode 100644
diff --git a/application/views/errors/html/error_php.php b/application/views/errors/html/error_php.php
old mode 100755
new mode 100644
diff --git a/application/views/errors/html/index.html b/application/views/errors/html/index.html
old mode 100755
new mode 100644
diff --git a/application/views/errors/index.html b/application/views/errors/index.html
old mode 100755
new mode 100644
diff --git a/application/views/extensions/.placeholder b/application/views/extensions/.placeholder
old mode 100755
new mode 100644
diff --git a/application/views/home.php b/application/views/home.php
old mode 100755
new mode 100644
diff --git a/application/views/index.html b/application/views/index.html
old mode 100755
new mode 100644
diff --git a/application/views/lehre/Antrag/Create.php b/application/views/lehre/Antrag/Create.php
old mode 100755
new mode 100644
diff --git a/application/views/lehre/Antrag/Leitung/List.php b/application/views/lehre/Antrag/Leitung/List.php
old mode 100755
new mode 100644
diff --git a/application/views/lehre/Antrag/Student/List.php b/application/views/lehre/Antrag/Student/List.php
old mode 100755
new mode 100644
diff --git a/application/views/lehre/Antrag/Wiederholung/Student.php b/application/views/lehre/Antrag/Wiederholung/Student.php
old mode 100755
new mode 100644
diff --git a/application/views/lehre/Antrag/Wiederholung/getLvs.rdf.php b/application/views/lehre/Antrag/Wiederholung/getLvs.rdf.php
old mode 100755
new mode 100644
diff --git a/application/views/lehre/Antrag/Wiederholung/moveLvs.rdf.php b/application/views/lehre/Antrag/Wiederholung/moveLvs.rdf.php
old mode 100755
new mode 100644
diff --git a/application/views/lehre/anrechnung/adminAnrechnung.php b/application/views/lehre/anrechnung/adminAnrechnung.php
old mode 100755
new mode 100644
diff --git a/application/views/lehre/anrechnung/adminAnrechnungData.php b/application/views/lehre/anrechnung/adminAnrechnungData.php
old mode 100755
new mode 100644
diff --git a/application/views/lehre/anrechnung/approveAnrechnungDetail.php b/application/views/lehre/anrechnung/approveAnrechnungDetail.php
old mode 100755
new mode 100644
diff --git a/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php b/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php
old mode 100755
new mode 100644
diff --git a/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php b/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
old mode 100755
new mode 100644
diff --git a/application/views/lehre/anrechnung/createAnrechnung.php b/application/views/lehre/anrechnung/createAnrechnung.php
old mode 100755
new mode 100644
diff --git a/application/views/lehre/anrechnung/createAnrechnungData.php b/application/views/lehre/anrechnung/createAnrechnungData.php
old mode 100755
new mode 100644
diff --git a/application/views/lehre/anrechnung/requestAnrechnung.php b/application/views/lehre/anrechnung/requestAnrechnung.php
old mode 100755
new mode 100644
diff --git a/application/views/lehre/anrechnung/requestAnrechnungImportant.php b/application/views/lehre/anrechnung/requestAnrechnungImportant.php
old mode 100755
new mode 100644
diff --git a/application/views/lehre/anrechnung/reviewAnrechnungDetail.php b/application/views/lehre/anrechnung/reviewAnrechnungDetail.php
old mode 100755
new mode 100644
diff --git a/application/views/lehre/anrechnung/reviewAnrechnungInfo.php b/application/views/lehre/anrechnung/reviewAnrechnungInfo.php
old mode 100755
new mode 100644
diff --git a/application/views/lehre/anrechnung/reviewAnrechnungUebersicht.php b/application/views/lehre/anrechnung/reviewAnrechnungUebersicht.php
old mode 100755
new mode 100644
diff --git a/application/views/lehre/anrechnung/reviewAnrechnungUebersichtData.php b/application/views/lehre/anrechnung/reviewAnrechnungUebersichtData.php
old mode 100755
new mode 100644
diff --git a/application/views/lehre/lehrauftrag/Dashboard.php b/application/views/lehre/lehrauftrag/Dashboard.php
old mode 100755
new mode 100644
diff --git a/application/views/lehre/lehrauftrag/LehrendeUebersicht.php b/application/views/lehre/lehrauftrag/LehrendeUebersicht.php
old mode 100755
new mode 100644
diff --git a/application/views/lehre/lehrauftrag/acceptLehrauftrag.php b/application/views/lehre/lehrauftrag/acceptLehrauftrag.php
old mode 100755
new mode 100644
diff --git a/application/views/lehre/lehrauftrag/acceptLehrauftragData.php b/application/views/lehre/lehrauftrag/acceptLehrauftragData.php
old mode 100755
new mode 100644
diff --git a/application/views/lehre/lehrauftrag/acceptLehrauftragHelp.php b/application/views/lehre/lehrauftrag/acceptLehrauftragHelp.php
old mode 100755
new mode 100644
diff --git a/application/views/lehre/lehrauftrag/approveLehrauftrag.php b/application/views/lehre/lehrauftrag/approveLehrauftrag.php
old mode 100755
new mode 100644
diff --git a/application/views/lehre/lehrauftrag/approveLehrauftragData.php b/application/views/lehre/lehrauftrag/approveLehrauftragData.php
old mode 100755
new mode 100644
diff --git a/application/views/lehre/lehrauftrag/approveLehrauftragHelp.php b/application/views/lehre/lehrauftrag/approveLehrauftragHelp.php
old mode 100755
new mode 100644
diff --git a/application/views/lehre/lehrauftrag/cancelledLehrauftragData.php b/application/views/lehre/lehrauftrag/cancelledLehrauftragData.php
old mode 100755
new mode 100644
diff --git a/application/views/lehre/lehrauftrag/orderLehrauftrag.php b/application/views/lehre/lehrauftrag/orderLehrauftrag.php
old mode 100755
new mode 100644
diff --git a/application/views/lehre/lehrauftrag/orderLehrauftragData.php b/application/views/lehre/lehrauftrag/orderLehrauftragData.php
old mode 100755
new mode 100644
diff --git a/application/views/lehre/lehrauftrag/orderLehrauftragHelp.php b/application/views/lehre/lehrauftrag/orderLehrauftragHelp.php
old mode 100755
new mode 100644
diff --git a/application/views/lehre/lvplanung/adminZeitverfuegbarkeit.php b/application/views/lehre/lvplanung/adminZeitverfuegbarkeit.php
old mode 100755
new mode 100644
diff --git a/application/views/lehre/lvplanung/adminZeitverfuegbarkeitData.php b/application/views/lehre/lvplanung/adminZeitverfuegbarkeitData.php
old mode 100755
new mode 100644
diff --git a/application/views/lehre/pruefungsprotokoll.php b/application/views/lehre/pruefungsprotokoll.php
old mode 100755
new mode 100644
diff --git a/application/views/lehre/pruefungsprotokollUebersicht.php b/application/views/lehre/pruefungsprotokollUebersicht.php
old mode 100755
new mode 100644
diff --git a/application/views/lehre/pruefungsprotokollUebersichtData.php b/application/views/lehre/pruefungsprotokollUebersichtData.php
old mode 100755
new mode 100644
diff --git a/application/views/organisation/reihungstest/ReihungstestUebersichtData.php b/application/views/organisation/reihungstest/ReihungstestUebersichtData.php
old mode 100755
new mode 100644
diff --git a/application/views/organisation/reihungstest/reihungstest.php b/application/views/organisation/reihungstest/reihungstest.php
old mode 100755
new mode 100644
diff --git a/application/views/organisation/studienjahr.php b/application/views/organisation/studienjahr.php
old mode 100755
new mode 100644
diff --git a/application/views/organisation/studienjahrEdit.php b/application/views/organisation/studienjahrEdit.php
old mode 100755
new mode 100644
diff --git a/application/views/organisation/studienjahrForm.php b/application/views/organisation/studienjahrForm.php
old mode 100755
new mode 100644
diff --git a/application/views/organisation/studienjahrNew.php b/application/views/organisation/studienjahrNew.php
old mode 100755
new mode 100644
diff --git a/application/views/organisation/studiensemester.php b/application/views/organisation/studiensemester.php
old mode 100755
new mode 100644
diff --git a/application/views/organisation/studiensemesterEdit.php b/application/views/organisation/studiensemesterEdit.php
old mode 100755
new mode 100644
diff --git a/application/views/organisation/studiensemesterForm.php b/application/views/organisation/studiensemesterForm.php
old mode 100755
new mode 100644
diff --git a/application/views/organisation/studiensemesterNew.php b/application/views/organisation/studiensemesterNew.php
old mode 100755
new mode 100644
diff --git a/application/views/person/bpk/bpkData.php b/application/views/person/bpk/bpkData.php
old mode 100755
new mode 100644
diff --git a/application/views/person/bpk/bpkDetails.php b/application/views/person/bpk/bpkDetails.php
old mode 100755
new mode 100644
diff --git a/application/views/person/bpk/bpkwartung.php b/application/views/person/bpk/bpkwartung.php
old mode 100755
new mode 100644
diff --git a/application/views/person/cli/view.php b/application/views/person/cli/view.php
old mode 100755
new mode 100644
diff --git a/application/views/person/gradelist/course.php b/application/views/person/gradelist/course.php
old mode 100755
new mode 100644
diff --git a/application/views/person/gradelist/gradelist.php b/application/views/person/gradelist/gradelist.php
old mode 100755
new mode 100644
diff --git a/application/views/person/gradelist/semester.php b/application/views/person/gradelist/semester.php
old mode 100755
new mode 100644
diff --git a/application/views/person/gruppenmanagement/benutzergruppe.php b/application/views/person/gruppenmanagement/benutzergruppe.php
old mode 100755
new mode 100644
diff --git a/application/views/person/gruppenmanagement/gruppenmanagement.php b/application/views/person/gruppenmanagement/gruppenmanagement.php
old mode 100755
new mode 100644
diff --git a/application/views/person/gruppenmanagement/gruppenmanagementData.php b/application/views/person/gruppenmanagement/gruppenmanagementData.php
old mode 100755
new mode 100644
diff --git a/application/views/person/index.php b/application/views/person/index.php
old mode 100755
new mode 100644
diff --git a/application/views/person/view.php b/application/views/person/view.php
old mode 100755
new mode 100644
diff --git a/application/views/system/aufnahme/prestudentMultiAssign.php b/application/views/system/aufnahme/prestudentMultiAssign.php
old mode 100755
new mode 100644
diff --git a/application/views/system/extensions/manager.php b/application/views/system/extensions/manager.php
old mode 100755
new mode 100644
diff --git a/application/views/system/fas_udf.php b/application/views/system/fas_udf.php
old mode 100755
new mode 100644
diff --git a/application/views/system/infocenter/absageModal.php b/application/views/system/infocenter/absageModal.php
old mode 100755
new mode 100644
diff --git a/application/views/system/infocenter/addNotiz.php b/application/views/system/infocenter/addNotiz.php
old mode 100755
new mode 100644
diff --git a/application/views/system/infocenter/anmerkungenZurBewerbung.php b/application/views/system/infocenter/anmerkungenZurBewerbung.php
old mode 100755
new mode 100644
diff --git a/application/views/system/infocenter/dokNachzureichend.php b/application/views/system/infocenter/dokNachzureichend.php
old mode 100755
new mode 100644
diff --git a/application/views/system/infocenter/dokpruefung.php b/application/views/system/infocenter/dokpruefung.php
old mode 100755
new mode 100644
diff --git a/application/views/system/infocenter/infocenter.php b/application/views/system/infocenter/infocenter.php
old mode 100755
new mode 100644
diff --git a/application/views/system/infocenter/infocenterAbgewiesen.php b/application/views/system/infocenter/infocenterAbgewiesen.php
old mode 100755
new mode 100644
diff --git a/application/views/system/infocenter/infocenterAbgewiesenData.php b/application/views/system/infocenter/infocenterAbgewiesenData.php
old mode 100755
new mode 100644
diff --git a/application/views/system/infocenter/infocenterAufgenommen.php b/application/views/system/infocenter/infocenterAufgenommen.php
old mode 100755
new mode 100644
diff --git a/application/views/system/infocenter/infocenterAufgenommenData.php b/application/views/system/infocenter/infocenterAufgenommenData.php
old mode 100755
new mode 100644
diff --git a/application/views/system/infocenter/infocenterData.php b/application/views/system/infocenter/infocenterData.php
old mode 100755
new mode 100644
diff --git a/application/views/system/infocenter/infocenterDetails.php b/application/views/system/infocenter/infocenterDetails.php
old mode 100755
new mode 100644
diff --git a/application/views/system/infocenter/infocenterFreigegeben.php b/application/views/system/infocenter/infocenterFreigegeben.php
old mode 100755
new mode 100644
diff --git a/application/views/system/infocenter/infocenterFreigegebenData.php b/application/views/system/infocenter/infocenterFreigegebenData.php
old mode 100755
new mode 100644
diff --git a/application/views/system/infocenter/infocenterReihungstestAbsolviert.php b/application/views/system/infocenter/infocenterReihungstestAbsolviert.php
old mode 100755
new mode 100644
diff --git a/application/views/system/infocenter/infocenterReihungstestAbsolviertData.php b/application/views/system/infocenter/infocenterReihungstestAbsolviertData.php
old mode 100755
new mode 100644
diff --git a/application/views/system/infocenter/infocenterZgvDetails.php b/application/views/system/infocenter/infocenterZgvDetails.php
old mode 100755
new mode 100644
diff --git a/application/views/system/infocenter/infocenterZgvUeberpruefung.php b/application/views/system/infocenter/infocenterZgvUeberpruefung.php
old mode 100755
new mode 100644
diff --git a/application/views/system/infocenter/infocenterZgvUeberpruefungData.php b/application/views/system/infocenter/infocenterZgvUeberpruefungData.php
old mode 100755
new mode 100644
diff --git a/application/views/system/infocenter/logs.php b/application/views/system/infocenter/logs.php
old mode 100755
new mode 100644
diff --git a/application/views/system/infocenter/messageList.php b/application/views/system/infocenter/messageList.php
old mode 100755
new mode 100644
diff --git a/application/views/system/infocenter/notizen.php b/application/views/system/infocenter/notizen.php
old mode 100755
new mode 100644
diff --git a/application/views/system/infocenter/stammdaten.php b/application/views/system/infocenter/stammdaten.php
old mode 100755
new mode 100644
diff --git a/application/views/system/infocenter/studiengangZgvInfo.php b/application/views/system/infocenter/studiengangZgvInfo.php
old mode 100755
new mode 100644
diff --git a/application/views/system/infocenter/zgvpruefungen.php b/application/views/system/infocenter/zgvpruefungen.php
old mode 100755
new mode 100644
diff --git a/application/views/system/issues/issues.php b/application/views/system/issues/issues.php
old mode 100755
new mode 100644
diff --git a/application/views/system/issues/issuesData.php b/application/views/system/issues/issuesData.php
old mode 100755
new mode 100644
diff --git a/application/views/system/issues/issuesKonfiguration.php b/application/views/system/issues/issuesKonfiguration.php
old mode 100755
new mode 100644
diff --git a/application/views/system/issues/issuesKonfigurationData.php b/application/views/system/issues/issuesKonfigurationData.php
old mode 100755
new mode 100644
diff --git a/application/views/system/issues/issuesZustaendigkeiten.php b/application/views/system/issues/issuesZustaendigkeiten.php
old mode 100755
new mode 100644
diff --git a/application/views/system/issues/issuesZustaendigkeitenData.php b/application/views/system/issues/issuesZustaendigkeitenData.php
old mode 100755
new mode 100644
diff --git a/application/views/system/issues/plausichecks.php b/application/views/system/issues/plausichecks.php
old mode 100755
new mode 100644
diff --git a/application/views/system/jq/jobsQueueViewer.php b/application/views/system/jq/jobsQueueViewer.php
old mode 100755
new mode 100644
diff --git a/application/views/system/jq/jobsQueueViewerData.php b/application/views/system/jq/jobsQueueViewerData.php
old mode 100755
new mode 100644
diff --git a/application/views/system/login/usernamePassword.php b/application/views/system/login/usernamePassword.php
old mode 100755
new mode 100644
diff --git a/application/views/system/logs/logsViewer.php b/application/views/system/logs/logsViewer.php
old mode 100755
new mode 100644
diff --git a/application/views/system/logs/testSearch.php b/application/views/system/logs/testSearch.php
old mode 100755
new mode 100644
diff --git a/application/views/system/messages/FAShtmlWriteTemplate.php b/application/views/system/messages/FAShtmlWriteTemplate.php
old mode 100755
new mode 100644
diff --git a/application/views/system/messages/ajaxRead.php b/application/views/system/messages/ajaxRead.php
old mode 100755
new mode 100644
diff --git a/application/views/system/messages/ajaxWrite.php b/application/views/system/messages/ajaxWrite.php
old mode 100755
new mode 100644
diff --git a/application/views/system/messages/ajaxWriteReply.php b/application/views/system/messages/ajaxWriteReply.php
old mode 100755
new mode 100644
diff --git a/application/views/system/messages/htmlMessageSentError.php b/application/views/system/messages/htmlMessageSentError.php
old mode 100755
new mode 100644
diff --git a/application/views/system/messages/htmlMessageSentSuccess.php b/application/views/system/messages/htmlMessageSentSuccess.php
old mode 100755
new mode 100644
diff --git a/application/views/system/messages/htmlRead.php b/application/views/system/messages/htmlRead.php
old mode 100755
new mode 100644
diff --git a/application/views/system/messages/htmlWriteReply.php b/application/views/system/messages/htmlWriteReply.php
old mode 100755
new mode 100644
diff --git a/application/views/system/messages/htmlWriteTemplate.php b/application/views/system/messages/htmlWriteTemplate.php
old mode 100755
new mode 100644
diff --git a/application/views/system/phrases/phraseinhaltEdit.php b/application/views/system/phrases/phraseinhaltEdit.php
old mode 100755
new mode 100644
diff --git a/application/views/system/phrases/phrases.php b/application/views/system/phrases/phrases.php
old mode 100755
new mode 100644
diff --git a/application/views/system/phrases/phrasesEdit.php b/application/views/system/phrases/phrasesEdit.php
old mode 100755
new mode 100644
diff --git a/application/views/system/phrases/phrasesList.php b/application/views/system/phrases/phrasesList.php
old mode 100755
new mode 100644
diff --git a/application/views/system/phrases/phrasesinhaltList.php b/application/views/system/phrases/phrasesinhaltList.php
old mode 100755
new mode 100644
diff --git a/application/views/system/vorlage/templateLinkDocuments.php b/application/views/system/vorlage/templateLinkDocuments.php
old mode 100755
new mode 100644
diff --git a/application/views/system/vorlage/templates.php b/application/views/system/vorlage/templates.php
old mode 100755
new mode 100644
diff --git a/application/views/system/vorlage/templatesEdit.php b/application/views/system/vorlage/templatesEdit.php
old mode 100755
new mode 100644
diff --git a/application/views/system/vorlage/templatesList.php b/application/views/system/vorlage/templatesList.php
old mode 100755
new mode 100644
diff --git a/application/views/system/vorlage/templatetextEdit.php b/application/views/system/vorlage/templatetextEdit.php
old mode 100755
new mode 100644
diff --git a/application/views/system/vorlage/templatetextList.php b/application/views/system/vorlage/templatetextList.php
old mode 100755
new mode 100644
diff --git a/application/views/system/vorlage/templatetextPreview.php b/application/views/system/vorlage/templatetextPreview.php
old mode 100755
new mode 100644
diff --git a/application/views/templates/CISHMVC-Footer.php b/application/views/templates/CISHMVC-Footer.php
old mode 100755
new mode 100644
diff --git a/application/views/templates/CISHMVC-Header.php b/application/views/templates/CISHMVC-Header.php
old mode 100755
new mode 100644
diff --git a/application/views/templates/CISHMVC-Menu/Entry.php b/application/views/templates/CISHMVC-Menu/Entry.php
old mode 100755
new mode 100644
diff --git a/application/views/templates/CISHTML-Footer.php b/application/views/templates/CISHTML-Footer.php
old mode 100755
new mode 100644
diff --git a/application/views/templates/CISHTML-Header.php b/application/views/templates/CISHTML-Header.php
old mode 100755
new mode 100644
diff --git a/application/views/templates/CISHTML-Menu/Entry.php b/application/views/templates/CISHTML-Menu/Entry.php
old mode 100755
new mode 100644
diff --git a/application/views/templates/CISHTML-Menu/EntryBase.php b/application/views/templates/CISHTML-Menu/EntryBase.php
old mode 100755
new mode 100644
diff --git a/application/views/templates/CISHTML-Menu/EntryInclude.php b/application/views/templates/CISHTML-Menu/EntryInclude.php
old mode 100755
new mode 100644
diff --git a/application/views/templates/CISVUE-Footer.php b/application/views/templates/CISVUE-Footer.php
old mode 100755
new mode 100644
diff --git a/application/views/templates/CISVUE-Header.php b/application/views/templates/CISVUE-Header.php
old mode 100755
new mode 100644
diff --git a/application/views/templates/FHC-Common.php b/application/views/templates/FHC-Common.php
old mode 100755
new mode 100644
diff --git a/application/views/templates/FHC-Footer.php b/application/views/templates/FHC-Footer.php
old mode 100755
new mode 100644
diff --git a/application/views/templates/FHC-Header.php b/application/views/templates/FHC-Header.php
old mode 100755
new mode 100644
diff --git a/application/views/templates/footer.php b/application/views/templates/footer.php
old mode 100755
new mode 100644
diff --git a/application/views/templates/header.php b/application/views/templates/header.php
old mode 100755
new mode 100644
diff --git a/application/views/templates/mailHTML.php b/application/views/templates/mailHTML.php
old mode 100755
new mode 100644
diff --git a/application/views/templates/mailTXT.php b/application/views/templates/mailTXT.php
old mode 100755
new mode 100644
diff --git a/application/views/templates/mailtemplates/interessentFreigabe.php b/application/views/templates/mailtemplates/interessentFreigabe.php
old mode 100755
new mode 100644
diff --git a/application/views/templates/vilesci.php b/application/views/templates/vilesci.php
old mode 100755
new mode 100644
diff --git a/application/views/test/Admin.php b/application/views/test/Admin.php
old mode 100755
new mode 100644
diff --git a/application/views/test/Test.php b/application/views/test/Test.php
old mode 100755
new mode 100644
diff --git a/application/views/widgets/checkbox.php b/application/views/widgets/checkbox.php
old mode 100755
new mode 100644
diff --git a/application/views/widgets/dropdown.php b/application/views/widgets/dropdown.php
old mode 100755
new mode 100644
diff --git a/application/views/widgets/filter/filter.php b/application/views/widgets/filter/filter.php
old mode 100755
new mode 100644
diff --git a/application/views/widgets/filter/filterOptions.php b/application/views/widgets/filter/filterOptions.php
old mode 100755
new mode 100644
diff --git a/application/views/widgets/filter/pivotUIDataset.php b/application/views/widgets/filter/pivotUIDataset.php
old mode 100755
new mode 100644
diff --git a/application/views/widgets/filter/saveFilter.php b/application/views/widgets/filter/saveFilter.php
old mode 100755
new mode 100644
diff --git a/application/views/widgets/filter/selectFields.php b/application/views/widgets/filter/selectFields.php
old mode 100755
new mode 100644
diff --git a/application/views/widgets/filter/selectFilters.php b/application/views/widgets/filter/selectFilters.php
old mode 100755
new mode 100644
diff --git a/application/views/widgets/filter/tableDataset.php b/application/views/widgets/filter/tableDataset.php
old mode 100755
new mode 100644
diff --git a/application/views/widgets/filter/tabulatorDataset.php b/application/views/widgets/filter/tabulatorDataset.php
old mode 100755
new mode 100644
diff --git a/application/views/widgets/jsoneditor.php b/application/views/widgets/jsoneditor.php
old mode 100755
new mode 100644
diff --git a/application/views/widgets/jsonforms.php b/application/views/widgets/jsonforms.php
old mode 100755
new mode 100644
diff --git a/application/views/widgets/mimetype.php b/application/views/widgets/mimetype.php
old mode 100755
new mode 100644
diff --git a/application/views/widgets/navigation.php b/application/views/widgets/navigation.php
old mode 100755
new mode 100644
diff --git a/application/views/widgets/navigationHeader.php b/application/views/widgets/navigationHeader.php
old mode 100755
new mode 100644
diff --git a/application/views/widgets/navigationMenu.php b/application/views/widgets/navigationMenu.php
old mode 100755
new mode 100644
diff --git a/application/views/widgets/phpjsonform.php b/application/views/widgets/phpjsonform.php
old mode 100755
new mode 100644
diff --git a/application/views/widgets/table/pivotUIDataset.php b/application/views/widgets/table/pivotUIDataset.php
old mode 100755
new mode 100644
diff --git a/application/views/widgets/table/table.php b/application/views/widgets/table/table.php
old mode 100755
new mode 100644
diff --git a/application/views/widgets/table/tableDataset.php b/application/views/widgets/table/tableDataset.php
old mode 100755
new mode 100644
diff --git a/application/views/widgets/table/tableHelpsite.php b/application/views/widgets/table/tableHelpsite.php
old mode 100755
new mode 100644
diff --git a/application/views/widgets/table/tabulatorDataset.php b/application/views/widgets/table/tabulatorDataset.php
old mode 100755
new mode 100644
diff --git a/application/views/widgets/textarea.php b/application/views/widgets/textarea.php
old mode 100755
new mode 100644
diff --git a/application/views/widgets/textfield.php b/application/views/widgets/textfield.php
old mode 100755
new mode 100644
diff --git a/application/views/widgets/tinymce.php b/application/views/widgets/tinymce.php
old mode 100755
new mode 100644
diff --git a/application/widgets/Aufnahmegruppe_widget.php b/application/widgets/Aufnahmegruppe_widget.php
old mode 100755
new mode 100644
diff --git a/application/widgets/Ausbildungssemester_widget.php b/application/widgets/Ausbildungssemester_widget.php
old mode 100755
new mode 100644
diff --git a/application/widgets/Dropdown_widget.php b/application/widgets/Dropdown_widget.php
old mode 100755
new mode 100644
diff --git a/application/widgets/FilterWidget.php b/application/widgets/FilterWidget.php
old mode 100755
new mode 100644
diff --git a/application/widgets/MultipleDropdown_widget.php b/application/widgets/MultipleDropdown_widget.php
old mode 100755
new mode 100644
diff --git a/application/widgets/Nation_widget.php b/application/widgets/Nation_widget.php
old mode 100755
new mode 100644
diff --git a/application/widgets/NavigationHeaderWidget.php b/application/widgets/NavigationHeaderWidget.php
old mode 100755
new mode 100644
diff --git a/application/widgets/NavigationMenuWidget.php b/application/widgets/NavigationMenuWidget.php
old mode 100755
new mode 100644
diff --git a/application/widgets/NavigationWidget.php b/application/widgets/NavigationWidget.php
old mode 100755
new mode 100644
diff --git a/application/widgets/Organisationseinheit_widget.php b/application/widgets/Organisationseinheit_widget.php
old mode 100755
new mode 100644
diff --git a/application/widgets/Orgform_widget.php b/application/widgets/Orgform_widget.php
old mode 100755
new mode 100644
diff --git a/application/widgets/Reihungstest_widget.php b/application/widgets/Reihungstest_widget.php
old mode 100755
new mode 100644
diff --git a/application/widgets/Sprache_widget.php b/application/widgets/Sprache_widget.php
old mode 100755
new mode 100644
diff --git a/application/widgets/Statusgrund_widget.php b/application/widgets/Statusgrund_widget.php
old mode 100755
new mode 100644
diff --git a/application/widgets/Studiengang_widget.php b/application/widgets/Studiengang_widget.php
old mode 100755
new mode 100644
diff --git a/application/widgets/Studiensemester_widget.php b/application/widgets/Studiensemester_widget.php
old mode 100755
new mode 100644
diff --git a/application/widgets/Stufe_widget.php b/application/widgets/Stufe_widget.php
old mode 100755
new mode 100644
diff --git a/application/widgets/TableWidget.php b/application/widgets/TableWidget.php
old mode 100755
new mode 100644
diff --git a/application/widgets/Vorlage_widget.php b/application/widgets/Vorlage_widget.php
old mode 100755
new mode 100644
diff --git a/application/widgets/Zgv_widget.php b/application/widgets/Zgv_widget.php
old mode 100755
new mode 100644
diff --git a/application/widgets/Zgvmaster_widget.php b/application/widgets/Zgvmaster_widget.php
old mode 100755
new mode 100644
diff --git a/application/widgets/extensions/.placeholder b/application/widgets/extensions/.placeholder
old mode 100755
new mode 100644
diff --git a/application/widgets/html/CheckboxWidget.php b/application/widgets/html/CheckboxWidget.php
old mode 100755
new mode 100644
diff --git a/application/widgets/html/DropdownWidget.php b/application/widgets/html/DropdownWidget.php
old mode 100755
new mode 100644
diff --git a/application/widgets/html/HTMLWidget.php b/application/widgets/html/HTMLWidget.php
old mode 100755
new mode 100644
diff --git a/application/widgets/html/TextareaWidget.php b/application/widgets/html/TextareaWidget.php
old mode 100755
new mode 100644
diff --git a/application/widgets/html/TextfieldWidget.php b/application/widgets/html/TextfieldWidget.php
old mode 100755
new mode 100644
diff --git a/application/widgets/jsoneditor_widget.php b/application/widgets/jsoneditor_widget.php
old mode 100755
new mode 100644
diff --git a/application/widgets/jsonforms_widget.php b/application/widgets/jsonforms_widget.php
old mode 100755
new mode 100644
diff --git a/application/widgets/mimetype_widget.php b/application/widgets/mimetype_widget.php
old mode 100755
new mode 100644
diff --git a/application/widgets/phpjsonform_widget.php b/application/widgets/phpjsonform_widget.php
old mode 100755
new mode 100644
diff --git a/application/widgets/tinymce_widget.php b/application/widgets/tinymce_widget.php
old mode 100755
new mode 100644
diff --git a/application/widgets/udf/CheckboxWidgetUDF.php b/application/widgets/udf/CheckboxWidgetUDF.php
old mode 100755
new mode 100644
diff --git a/application/widgets/udf/DropdownWidgetUDF.php b/application/widgets/udf/DropdownWidgetUDF.php
old mode 100755
new mode 100644
diff --git a/application/widgets/udf/TextareaWidgetUDF.php b/application/widgets/udf/TextareaWidgetUDF.php
old mode 100755
new mode 100644
diff --git a/application/widgets/udf/TextfieldWidgetUDF.php b/application/widgets/udf/TextfieldWidgetUDF.php
old mode 100755
new mode 100644
diff --git a/application/widgets/udf/UDFWidget.php b/application/widgets/udf/UDFWidget.php
old mode 100755
new mode 100644
diff --git a/cis.php b/cis.php
old mode 100755
new mode 100644
diff --git a/cis/ampel.php b/cis/ampel.php
old mode 100755
new mode 100644
diff --git a/cis/cisdocs/index.html b/cis/cisdocs/index.html
old mode 100755
new mode 100644
diff --git a/cis/cisdocs/muster_semesterplan.doc b/cis/cisdocs/muster_semesterplan.doc
old mode 100755
new mode 100644
diff --git a/cis/cisdocs/muster_semesterplan_index.html b/cis/cisdocs/muster_semesterplan_index.html
old mode 100755
new mode 100644
diff --git a/cis/cisdocs/vorlage_studienbrief.dot b/cis/cisdocs/vorlage_studienbrief.dot
old mode 100755
new mode 100644
diff --git a/cis/index.html b/cis/index.html
old mode 100755
new mode 100644
diff --git a/cis/index.php b/cis/index.php
old mode 100755
new mode 100644
diff --git a/cis/index_login.php b/cis/index_login.php
old mode 100755
new mode 100644
diff --git a/cis/infoterminal/feed.png b/cis/infoterminal/feed.png
old mode 100755
new mode 100644
diff --git a/cis/infoterminal/go-bottom.png b/cis/infoterminal/go-bottom.png
old mode 100755
new mode 100644
diff --git a/cis/infoterminal/go-top.png b/cis/infoterminal/go-top.png
old mode 100755
new mode 100644
diff --git a/cis/infoterminal/index.php b/cis/infoterminal/index.php
old mode 100755
new mode 100644
diff --git a/cis/infoterminal/informationsbildschirm.php b/cis/infoterminal/informationsbildschirm.php
old mode 100755
new mode 100644
diff --git a/cis/infoterminal/infoterm.css b/cis/infoterminal/infoterm.css
old mode 100755
new mode 100644
diff --git a/cis/infoterminal/keyboard.php b/cis/infoterminal/keyboard.php
old mode 100755
new mode 100644
diff --git a/cis/infoterminal/lvplan.php b/cis/infoterminal/lvplan.php
old mode 100755
new mode 100644
diff --git a/cis/infoterminal/system-users_in.png b/cis/infoterminal/system-users_in.png
old mode 100755
new mode 100644
diff --git a/cis/infoterminal/system-users_out.png b/cis/infoterminal/system-users_out.png
old mode 100755
new mode 100644
diff --git a/cis/infoterminal/tw_lageplan.jpg b/cis/infoterminal/tw_lageplan.jpg
old mode 100755
new mode 100644
diff --git a/cis/infoterminal/tw_logo_01.jpg b/cis/infoterminal/tw_logo_01.jpg
old mode 100755
new mode 100644
diff --git a/cis/infoterminal/twplan.gif b/cis/infoterminal/twplan.gif
old mode 100755
new mode 100644
diff --git a/cis/menu.php b/cis/menu.php
old mode 100755
new mode 100644
diff --git a/cis/private/bildupload.php b/cis/private/bildupload.php
old mode 100755
new mode 100644
diff --git a/cis/private/coodle/coodle_autocomplete.php b/cis/private/coodle/coodle_autocomplete.php
old mode 100755
new mode 100644
diff --git a/cis/private/coodle/coodle_events.php b/cis/private/coodle/coodle_events.php
old mode 100755
new mode 100644
diff --git a/cis/private/coodle/coodle_worker.php b/cis/private/coodle/coodle_worker.php
old mode 100755
new mode 100644
diff --git a/cis/private/coodle/index.html b/cis/private/coodle/index.html
old mode 100755
new mode 100644
diff --git a/cis/private/coodle/stammdaten.php b/cis/private/coodle/stammdaten.php
old mode 100755
new mode 100644
diff --git a/cis/private/coodle/termin.php b/cis/private/coodle/termin.php
old mode 100755
new mode 100644
diff --git a/cis/private/coodle/uebersicht.php b/cis/private/coodle/uebersicht.php
old mode 100755
new mode 100644
diff --git a/cis/private/crop.php b/cis/private/crop.php
old mode 100755
new mode 100644
diff --git a/cis/private/freifaecher/anmeldung.php b/cis/private/freifaecher/anmeldung.php
old mode 100755
new mode 100644
diff --git a/cis/private/freifaecher/anmeldungsuebersicht.php b/cis/private/freifaecher/anmeldungsuebersicht.php
old mode 100755
new mode 100644
diff --git a/cis/private/freifaecher/index.html b/cis/private/freifaecher/index.html
old mode 100755
new mode 100644
diff --git a/cis/private/index.html b/cis/private/index.html
old mode 100755
new mode 100644
diff --git a/cis/private/info/ersthelfer.php b/cis/private/info/ersthelfer.php
old mode 100755
new mode 100644
diff --git a/cis/private/info/handbuecher/Projektarbeitsabgabe_FHTW_Anleitung_A.pdf b/cis/private/info/handbuecher/Projektarbeitsabgabe_FHTW_Anleitung_A.pdf
old mode 100755
new mode 100644
diff --git a/cis/private/info/handbuecher/Projektarbeitsabgabe_FHTW_Anleitung_L.pdf b/cis/private/info/handbuecher/Projektarbeitsabgabe_FHTW_Anleitung_L.pdf
old mode 100755
new mode 100644
diff --git a/cis/private/info/handbuecher/Publikationsdatenbank_FHTW_Handbuch.pdf b/cis/private/info/handbuecher/Publikationsdatenbank_FHTW_Handbuch.pdf
old mode 100755
new mode 100644
diff --git a/cis/private/info/handbuecher/abgabetool_lektoren.pdf b/cis/private/info/handbuecher/abgabetool_lektoren.pdf
old mode 100755
new mode 100644
diff --git a/cis/private/info/handbuecher/abgabetool_studenten.pdf b/cis/private/info/handbuecher/abgabetool_studenten.pdf
old mode 100755
new mode 100644
diff --git a/cis/private/info/handbuecher/index.php b/cis/private/info/handbuecher/index.php
old mode 100755
new mode 100644
diff --git a/cis/private/info/index.html b/cis/private/info/index.html
old mode 100755
new mode 100644
diff --git a/cis/private/info/partnerhochschulen.php b/cis/private/info/partnerhochschulen.php
old mode 100755
new mode 100644
diff --git a/cis/private/info/service_uebersicht.php b/cis/private/info/service_uebersicht.php
old mode 100755
new mode 100644
diff --git a/cis/private/info/telefonverzeichnis.php b/cis/private/info/telefonverzeichnis.php
old mode 100755
new mode 100644
diff --git a/cis/private/jahresplan/index.html b/cis/private/jahresplan/index.html
old mode 100755
new mode 100644
diff --git a/cis/private/jahresplan/index.php b/cis/private/jahresplan/index.php
old mode 100755
new mode 100644
diff --git a/cis/private/jahresplan/jahresplan_bilder.php b/cis/private/jahresplan/jahresplan_bilder.php
old mode 100755
new mode 100644
diff --git a/cis/private/jahresplan/jahresplan_detail.php b/cis/private/jahresplan/jahresplan_detail.php
old mode 100755
new mode 100644
diff --git a/cis/private/jahresplan/jahresplan_funktionen.inc.php b/cis/private/jahresplan/jahresplan_funktionen.inc.php
old mode 100755
new mode 100644
diff --git a/cis/private/jahresplan/jahresplan_kategorie.php b/cis/private/jahresplan/jahresplan_kategorie.php
old mode 100755
new mode 100644
diff --git a/cis/private/jahresplan/jahresplan_reservierung.php b/cis/private/jahresplan/jahresplan_reservierung.php
old mode 100755
new mode 100644
diff --git a/cis/private/jahresplan/jahresplan_veranstaltung.php b/cis/private/jahresplan/jahresplan_veranstaltung.php
old mode 100755
new mode 100644
diff --git a/cis/private/lehre/abgabe_lektor.php b/cis/private/lehre/abgabe_lektor.php
old mode 100755
new mode 100644
diff --git a/cis/private/lehre/abgabe_lektor_details.php b/cis/private/lehre/abgabe_lektor_details.php
old mode 100755
new mode 100644
diff --git a/cis/private/lehre/abgabe_lektor_frameset.html b/cis/private/lehre/abgabe_lektor_frameset.html
old mode 100755
new mode 100644
diff --git a/cis/private/lehre/abgabe_lektor_multitermin.php b/cis/private/lehre/abgabe_lektor_multitermin.php
old mode 100755
new mode 100644
diff --git a/cis/private/lehre/abgabe_lektor_terminuebersicht.php b/cis/private/lehre/abgabe_lektor_terminuebersicht.php
old mode 100755
new mode 100644
diff --git a/cis/private/lehre/abgabe_lektor_zusatz.php b/cis/private/lehre/abgabe_lektor_zusatz.php
old mode 100755
new mode 100644
diff --git a/cis/private/lehre/abgabe_student.php b/cis/private/lehre/abgabe_student.php
old mode 100755
new mode 100644
diff --git a/cis/private/lehre/abgabe_student_details.php b/cis/private/lehre/abgabe_student_details.php
old mode 100755
new mode 100644
diff --git a/cis/private/lehre/abgabe_student_file.php b/cis/private/lehre/abgabe_student_file.php
old mode 100755
new mode 100644
diff --git a/cis/private/lehre/abgabe_student_frameset.php b/cis/private/lehre/abgabe_student_frameset.php
old mode 100755
new mode 100644
diff --git a/cis/private/lehre/abmeldung.php b/cis/private/lehre/abmeldung.php
old mode 100755
new mode 100644
diff --git a/cis/private/lehre/anwesenheitsliste.pdf.php b/cis/private/lehre/anwesenheitsliste.pdf.php
old mode 100755
new mode 100644
diff --git a/cis/private/lehre/anwesenheitsliste.php b/cis/private/lehre/anwesenheitsliste.php
old mode 100755
new mode 100644
diff --git a/cis/private/lehre/benotungstool/lvgesamtnote_worker.php b/cis/private/lehre/benotungstool/lvgesamtnote_worker.php
old mode 100755
new mode 100644
diff --git a/cis/private/lehre/benotungstool/lvgesamtnoteeintragen.php b/cis/private/lehre/benotungstool/lvgesamtnoteeintragen.php
old mode 100755
new mode 100644
diff --git a/cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php b/cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php
old mode 100755
new mode 100644
diff --git a/cis/private/lehre/benotungstool/nachpruefungeintragen.php b/cis/private/lehre/benotungstool/nachpruefungeintragen.php
old mode 100755
new mode 100644
diff --git a/cis/private/lehre/benotungstool/notenschluessel.php b/cis/private/lehre/benotungstool/notenschluessel.php
old mode 100755
new mode 100644
diff --git a/cis/private/lehre/covidstatusliste.php b/cis/private/lehre/covidstatusliste.php
old mode 100755
new mode 100644
diff --git a/cis/private/lehre/feedback.php b/cis/private/lehre/feedback.php
old mode 100755
new mode 100644
diff --git a/cis/private/lehre/fotoliste.pdf.php b/cis/private/lehre/fotoliste.pdf.php
old mode 100755
new mode 100644
diff --git a/cis/private/lehre/index.html b/cis/private/lehre/index.html
old mode 100755
new mode 100644
diff --git a/cis/private/lehre/lector_choice.php b/cis/private/lehre/lector_choice.php
old mode 100755
new mode 100644
diff --git a/cis/private/lehre/lesson.php b/cis/private/lehre/lesson.php
old mode 100755
new mode 100644
diff --git a/cis/private/lehre/notenliste.php b/cis/private/lehre/notenliste.php
old mode 100755
new mode 100644
diff --git a/cis/private/lehre/notenliste.xls.php b/cis/private/lehre/notenliste.xls.php
old mode 100755
new mode 100644
diff --git a/cis/private/lehre/pruefung/index.php b/cis/private/lehre/pruefung/index.php
old mode 100755
new mode 100644
diff --git a/cis/private/lehre/pruefung/lektor_autocomplete.php b/cis/private/lehre/pruefung/lektor_autocomplete.php
old mode 100755
new mode 100644
diff --git a/cis/private/lehre/pruefung/pruefung.js.php b/cis/private/lehre/pruefung/pruefung.js.php
old mode 100755
new mode 100644
diff --git a/cis/private/lehre/pruefung/pruefungsanmeldung.json.php b/cis/private/lehre/pruefung/pruefungsanmeldung.json.php
old mode 100755
new mode 100644
diff --git a/cis/private/lehre/pruefung/pruefungsanmeldung.php b/cis/private/lehre/pruefung/pruefungsanmeldung.php
old mode 100755
new mode 100644
diff --git a/cis/private/lehre/pruefung/pruefungsanmeldungen_liste.pdf.php b/cis/private/lehre/pruefung/pruefungsanmeldungen_liste.pdf.php
old mode 100755
new mode 100644
diff --git a/cis/private/lehre/pruefung/pruefungsanmeldungen_liste.php b/cis/private/lehre/pruefung/pruefungsanmeldungen_liste.php
old mode 100755
new mode 100644
diff --git a/cis/private/lehre/pruefung/pruefungsanmeldungen_liste_ohne_namen.php b/cis/private/lehre/pruefung/pruefungsanmeldungen_liste_ohne_namen.php
old mode 100755
new mode 100644
diff --git a/cis/private/lehre/pruefung/pruefungsanmeldungen_verwalten.php b/cis/private/lehre/pruefung/pruefungsanmeldungen_verwalten.php
old mode 100755
new mode 100644
diff --git a/cis/private/lehre/pruefung/pruefungsbewertung.js.php b/cis/private/lehre/pruefung/pruefungsbewertung.js.php
old mode 100755
new mode 100644
diff --git a/cis/private/lehre/pruefung/pruefungsbewertung.json.php b/cis/private/lehre/pruefung/pruefungsbewertung.json.php
old mode 100755
new mode 100644
diff --git a/cis/private/lehre/pruefung/pruefungsbewertung.php b/cis/private/lehre/pruefung/pruefungsbewertung.php
old mode 100755
new mode 100644
diff --git a/cis/private/lehre/pruefung/pruefungsfenster_anlegen.php b/cis/private/lehre/pruefung/pruefungsfenster_anlegen.php
old mode 100755
new mode 100644
diff --git a/cis/private/lehre/pruefung/pruefungstermin.json.php b/cis/private/lehre/pruefung/pruefungstermin.json.php
old mode 100755
new mode 100644
diff --git a/cis/private/lehre/pruefung/pruefungstermin_aendern.php b/cis/private/lehre/pruefung/pruefungstermin_aendern.php
old mode 100755
new mode 100644
diff --git a/cis/private/lehre/pruefung/pruefungstermin_festlegen.php b/cis/private/lehre/pruefung/pruefungstermin_festlegen.php
old mode 100755
new mode 100644
diff --git a/cis/private/lehre/pruefung/pruefungstermin_loeschen.php b/cis/private/lehre/pruefung/pruefungstermin_loeschen.php
old mode 100755
new mode 100644
diff --git a/cis/private/lehre/semdownhlp.php b/cis/private/lehre/semdownhlp.php
old mode 100755
new mode 100644
diff --git a/cis/private/lehre/semupload.php b/cis/private/lehre/semupload.php
old mode 100755
new mode 100644
diff --git a/cis/private/lehre/softgrid.php b/cis/private/lehre/softgrid.php
old mode 100755
new mode 100644
diff --git a/cis/private/lehre/upload.php b/cis/private/lehre/upload.php
old mode 100755
new mode 100644
diff --git a/cis/private/lvplan/belegt.php b/cis/private/lvplan/belegt.php
old mode 100755
new mode 100644
diff --git a/cis/private/lvplan/index.html b/cis/private/lvplan/index.html
old mode 100755
new mode 100644
diff --git a/cis/private/lvplan/index.php b/cis/private/lvplan/index.php
old mode 100755
new mode 100644
diff --git a/cis/private/lvplan/index_out.html b/cis/private/lvplan/index_out.html
old mode 100755
new mode 100644
diff --git a/cis/private/lvplan/lvplan_autocomplete.php b/cis/private/lvplan/lvplan_autocomplete.php
old mode 100755
new mode 100644
diff --git a/cis/private/lvplan/raumsuche.php b/cis/private/lvplan/raumsuche.php
old mode 100755
new mode 100644
diff --git a/cis/private/lvplan/stpl_detail.php b/cis/private/lvplan/stpl_detail.php
old mode 100755
new mode 100644
diff --git a/cis/private/lvplan/stpl_kalender.php b/cis/private/lvplan/stpl_kalender.php
old mode 100755
new mode 100644
diff --git a/cis/private/lvplan/stpl_reserve_list.php b/cis/private/lvplan/stpl_reserve_list.php
old mode 100755
new mode 100644
diff --git a/cis/private/lvplan/stpl_week.php b/cis/private/lvplan/stpl_week.php
old mode 100755
new mode 100644
diff --git a/cis/private/lvplan/stpl_week_anzahl_studenten.php b/cis/private/lvplan/stpl_week_anzahl_studenten.php
old mode 100755
new mode 100644
diff --git a/cis/private/lvplan/verband_uebersicht.php b/cis/private/lvplan/verband_uebersicht.php
old mode 100755
new mode 100644
diff --git a/cis/private/mailverteiler.php b/cis/private/mailverteiler.php
old mode 100755
new mode 100644
diff --git a/cis/private/open_grp.php b/cis/private/open_grp.php
old mode 100755
new mode 100644
diff --git a/cis/private/outgoing/akte.php b/cis/private/outgoing/akte.php
old mode 100755
new mode 100644
diff --git a/cis/private/outgoing/akteupload.php b/cis/private/outgoing/akteupload.php
old mode 100755
new mode 100644
diff --git a/cis/private/outgoing/index.html b/cis/private/outgoing/index.html
old mode 100755
new mode 100644
diff --git a/cis/private/outgoing/outgoing.php b/cis/private/outgoing/outgoing.php
old mode 100755
new mode 100644
diff --git a/cis/private/outgoing/outgoing_autocomplete.php b/cis/private/outgoing/outgoing_autocomplete.php
old mode 100755
new mode 100644
diff --git a/cis/private/outgoing/registration.php b/cis/private/outgoing/registration.php
old mode 100755
new mode 100644
diff --git a/cis/private/pdfExport.php b/cis/private/pdfExport.php
old mode 100755
new mode 100644
diff --git a/cis/private/pers_in_grp.php b/cis/private/pers_in_grp.php
old mode 100755
new mode 100644
diff --git a/cis/private/profile/anwesenheit.php b/cis/private/profile/anwesenheit.php
old mode 100755
new mode 100644
diff --git a/cis/private/profile/anwesenheit_lektor.php b/cis/private/profile/anwesenheit_lektor.php
old mode 100755
new mode 100644
diff --git a/cis/private/profile/change_password.php b/cis/private/profile/change_password.php
old mode 100755
new mode 100644
diff --git a/cis/private/profile/dokumente.php b/cis/private/profile/dokumente.php
old mode 100755
new mode 100644
diff --git a/cis/private/profile/freebusy.php b/cis/private/profile/freebusy.php
old mode 100755
new mode 100644
diff --git a/cis/private/profile/index.html b/cis/private/profile/index.html
old mode 100755
new mode 100644
diff --git a/cis/private/profile/index.php b/cis/private/profile/index.php
old mode 100755
new mode 100644
diff --git a/cis/private/profile/lva_liste.php b/cis/private/profile/lva_liste.php
old mode 100755
new mode 100644
diff --git a/cis/private/profile/mitarbeiter_buchung.php b/cis/private/profile/mitarbeiter_buchung.php
old mode 100755
new mode 100644
diff --git a/cis/private/profile/studienplan.php b/cis/private/profile/studienplan.php
old mode 100755
new mode 100644
diff --git a/cis/private/profile/urlaubsfreigabe.php b/cis/private/profile/urlaubsfreigabe.php
old mode 100755
new mode 100644
diff --git a/cis/private/profile/urlaubstool.php b/cis/private/profile/urlaubstool.php
old mode 100755
new mode 100644
diff --git a/cis/private/profile/urlaubstool_autocomplete.php b/cis/private/profile/urlaubstool_autocomplete.php
old mode 100755
new mode 100644
diff --git a/cis/private/profile/zahlungen.php b/cis/private/profile/zahlungen.php
old mode 100755
new mode 100644
diff --git a/cis/private/profile/zahlungen_details.php b/cis/private/profile/zahlungen_details.php
old mode 100755
new mode 100644
diff --git a/cis/private/profile/zeitsperre.php b/cis/private/profile/zeitsperre.php
old mode 100755
new mode 100644
diff --git a/cis/private/profile/zeitsperre_days.php b/cis/private/profile/zeitsperre_days.php
old mode 100755
new mode 100644
diff --git a/cis/private/profile/zeitsperre_export.php b/cis/private/profile/zeitsperre_export.php
old mode 100755
new mode 100644
diff --git a/cis/private/profile/zeitsperre_resturlaub.php b/cis/private/profile/zeitsperre_resturlaub.php
old mode 100755
new mode 100644
diff --git a/cis/private/profile/zeitwunsch.php b/cis/private/profile/zeitwunsch.php
old mode 100755
new mode 100644
diff --git a/cis/private/profile/zeitwunsch_help.php b/cis/private/profile/zeitwunsch_help.php
old mode 100755
new mode 100644
diff --git a/cis/private/stud_in_grp.php b/cis/private/stud_in_grp.php
old mode 100755
new mode 100644
diff --git a/cis/private/tools/ampelleiteruebersicht.php b/cis/private/tools/ampelleiteruebersicht.php
old mode 100755
new mode 100644
diff --git a/cis/private/tools/ampelverwaltung.php b/cis/private/tools/ampelverwaltung.php
old mode 100755
new mode 100644
diff --git a/cis/private/tools/index.html b/cis/private/tools/index.html
old mode 100755
new mode 100644
diff --git a/cis/private/tools/notebook_registration.php b/cis/private/tools/notebook_registration.php
old mode 100755
new mode 100644
diff --git a/cis/private/tools/projektabgabe.php b/cis/private/tools/projektabgabe.php
old mode 100755
new mode 100644
diff --git a/cis/private/tools/projektabgabe_autocomplete.php b/cis/private/tools/projektabgabe_autocomplete.php
old mode 100755
new mode 100644
diff --git a/cis/private/tools/suche.php b/cis/private/tools/suche.php
old mode 100755
new mode 100644
diff --git a/cis/private/tools/zeitaufzeichnung.php b/cis/private/tools/zeitaufzeichnung.php
old mode 100755
new mode 100644
diff --git a/cis/private/tools/zeitaufzeichnung_autocomplete.php b/cis/private/tools/zeitaufzeichnung_autocomplete.php
old mode 100755
new mode 100644
diff --git a/cis/private/tools/zeitaufzeichnung_bisverwendung.php b/cis/private/tools/zeitaufzeichnung_bisverwendung.php
old mode 100755
new mode 100644
diff --git a/cis/private/tools/zeitaufzeichnung_projektliste.php b/cis/private/tools/zeitaufzeichnung_projektliste.php
old mode 100755
new mode 100644
diff --git a/cis/private/tools/zeitaufzeichnung_projektphasen.php b/cis/private/tools/zeitaufzeichnung_projektphasen.php
old mode 100755
new mode 100644
diff --git a/cis/private/tools/zeitaufzeichnung_zeitsperren.php b/cis/private/tools/zeitaufzeichnung_zeitsperren.php
old mode 100755
new mode 100644
diff --git a/cis/public/accountactivation.php b/cis/public/accountactivation.php
old mode 100755
new mode 100644
diff --git a/cis/public/bild.php b/cis/public/bild.php
old mode 100755
new mode 100644
diff --git a/cis/public/bildupload.php b/cis/public/bildupload.php
old mode 100755
new mode 100644
diff --git a/cis/public/coodle.php b/cis/public/coodle.php
old mode 100755
new mode 100644
diff --git a/cis/public/freebusy.php b/cis/public/freebusy.php
old mode 100755
new mode 100644
diff --git a/cis/public/freebusy_coodle.php b/cis/public/freebusy_coodle.php
old mode 100755
new mode 100644
diff --git a/cis/public/freebusy_lvplan.php b/cis/public/freebusy_lvplan.php
old mode 100755
new mode 100644
diff --git a/cis/public/freebusy_sogo.php b/cis/public/freebusy_sogo.php
old mode 100755
new mode 100644
diff --git a/cis/public/freebusy_zeitsperren.php b/cis/public/freebusy_zeitsperren.php
old mode 100755
new mode 100644
diff --git a/cis/public/ical_coodle.php b/cis/public/ical_coodle.php
old mode 100755
new mode 100644
diff --git a/cis/public/incoming/akte.php b/cis/public/incoming/akte.php
old mode 100755
new mode 100644
diff --git a/cis/public/incoming/akteupload.php b/cis/public/incoming/akteupload.php
old mode 100755
new mode 100644
diff --git a/cis/public/incoming/auth.php b/cis/public/incoming/auth.php
old mode 100755
new mode 100644
diff --git a/cis/public/incoming/incoming.php b/cis/public/incoming/incoming.php
old mode 100755
new mode 100644
diff --git a/cis/public/incoming/index.php b/cis/public/incoming/index.php
old mode 100755
new mode 100644
diff --git a/cis/public/incoming/logout.php b/cis/public/incoming/logout.php
old mode 100755
new mode 100644
diff --git a/cis/public/incoming/lvinfo.php b/cis/public/incoming/lvinfo.php
old mode 100755
new mode 100644
diff --git a/cis/public/incoming/registration.php b/cis/public/incoming/registration.php
old mode 100755
new mode 100644
diff --git a/cis/public/index.html b/cis/public/index.html
old mode 100755
new mode 100644
diff --git a/cis/public/prestudententool/auth.php b/cis/public/prestudententool/auth.php
old mode 100755
new mode 100644
diff --git a/cis/public/prestudententool/index.php b/cis/public/prestudententool/index.php
old mode 100755
new mode 100644
diff --git a/cis/public/prestudententool/logout.php b/cis/public/prestudententool/logout.php
old mode 100755
new mode 100644
diff --git a/cis/public/prestudententool/prestudent.php b/cis/public/prestudententool/prestudent.php
old mode 100755
new mode 100644
diff --git a/cis/public/testtool_test/MathML_Beispiel.jpg b/cis/public/testtool_test/MathML_Beispiel.jpg
old mode 100755
new mode 100644
diff --git a/cis/public/testtool_test/audio_testfile.mp3 b/cis/public/testtool_test/audio_testfile.mp3
old mode 100755
new mode 100644
diff --git a/cis/public/testtool_test/testseite.php b/cis/public/testtool_test/testseite.php
old mode 100755
new mode 100644
diff --git a/cis/testtool/admin/Testtool.pdf b/cis/testtool/admin/Testtool.pdf
old mode 100755
new mode 100644
diff --git a/cis/testtool/admin/add_gebiet.php b/cis/testtool/admin/add_gebiet.php
old mode 100755
new mode 100644
diff --git a/cis/testtool/admin/auswertung.php b/cis/testtool/admin/auswertung.php
old mode 100755
new mode 100644
diff --git a/cis/testtool/admin/auswertung_detail.php b/cis/testtool/admin/auswertung_detail.php
old mode 100755
new mode 100644
diff --git a/cis/testtool/admin/auswertung_detail_frage.php b/cis/testtool/admin/auswertung_detail_frage.php
old mode 100755
new mode 100644
diff --git a/cis/testtool/admin/auswertung_detail_prestudent.php b/cis/testtool/admin/auswertung_detail_prestudent.php
old mode 100755
new mode 100644
diff --git a/cis/testtool/admin/copy_gebiet.php b/cis/testtool/admin/copy_gebiet.php
old mode 100755
new mode 100644
diff --git a/cis/testtool/admin/edit_ablauf.php b/cis/testtool/admin/edit_ablauf.php
old mode 100755
new mode 100644
diff --git a/cis/testtool/admin/edit_gebiet.php b/cis/testtool/admin/edit_gebiet.php
old mode 100755
new mode 100644
diff --git a/cis/testtool/admin/gebieteAnheangen.php b/cis/testtool/admin/gebieteAnheangen.php
old mode 100755
new mode 100644
diff --git a/cis/testtool/admin/index.php b/cis/testtool/admin/index.php
old mode 100755
new mode 100644
diff --git a/cis/testtool/admin/uebersichtFragen.php b/cis/testtool/admin/uebersichtFragen.php
old mode 100755
new mode 100644
diff --git a/cis/testtool/admin/uebersichtGebiete.php b/cis/testtool/admin/uebersichtGebiete.php
old mode 100755
new mode 100644
diff --git a/cis/testtool/audio-player/audio-player-noswfobject.js b/cis/testtool/audio-player/audio-player-noswfobject.js
old mode 100755
new mode 100644
diff --git a/cis/testtool/audio-player/audio-player-uncompressed.js b/cis/testtool/audio-player/audio-player-uncompressed.js
old mode 100755
new mode 100644
diff --git a/cis/testtool/audio-player/audio-player.js b/cis/testtool/audio-player/audio-player.js
old mode 100755
new mode 100644
diff --git a/cis/testtool/audio-player/license.txt b/cis/testtool/audio-player/license.txt
old mode 100755
new mode 100644
diff --git a/cis/testtool/audio-player/player.swf b/cis/testtool/audio-player/player.swf
old mode 100755
new mode 100644
diff --git a/cis/testtool/bild.php b/cis/testtool/bild.php
old mode 100755
new mode 100644
diff --git a/cis/testtool/ctop.xsl b/cis/testtool/ctop.xsl
old mode 100755
new mode 100644
diff --git a/cis/testtool/frage.php b/cis/testtool/frage.php
old mode 100755
new mode 100644
diff --git a/cis/testtool/gebietfertig.php b/cis/testtool/gebietfertig.php
old mode 100755
new mode 100644
diff --git a/cis/testtool/index.html b/cis/testtool/index.html
old mode 100755
new mode 100644
diff --git a/cis/testtool/index.php b/cis/testtool/index.php
old mode 100755
new mode 100644
diff --git a/cis/testtool/login.php b/cis/testtool/login.php
old mode 100755
new mode 100644
diff --git a/cis/testtool/logout.html b/cis/testtool/logout.html
old mode 100755
new mode 100644
diff --git a/cis/testtool/mathml.xsl b/cis/testtool/mathml.xsl
old mode 100755
new mode 100644
diff --git a/cis/testtool/menu.php b/cis/testtool/menu.php
old mode 100755
new mode 100644
diff --git a/cis/testtool/pmathml.xsl b/cis/testtool/pmathml.xsl
old mode 100755
new mode 100644
diff --git a/cis/testtool/prueflinggesperrt.php b/cis/testtool/prueflinggesperrt.php
old mode 100755
new mode 100644
diff --git a/cis/testtool/sound.php b/cis/testtool/sound.php
old mode 100755
new mode 100644
diff --git a/cis/testtool/test/MathML_Beispiel.jpg b/cis/testtool/test/MathML_Beispiel.jpg
old mode 100755
new mode 100644
diff --git a/cis/testtool/test/audio_testfile.mp3 b/cis/testtool/test/audio_testfile.mp3
old mode 100755
new mode 100644
diff --git a/cis/testtool/test/testseite.php b/cis/testtool/test/testseite.php
old mode 100755
new mode 100644
diff --git a/cis/testtool/topbar.html b/cis/testtool/topbar.html
old mode 100755
new mode 100644
diff --git a/cis/testtool/topbar.php b/cis/testtool/topbar.php
old mode 100755
new mode 100644
diff --git a/cms/admin.php b/cms/admin.php
old mode 100755
new mode 100644
diff --git a/cms/admin_dms.php b/cms/admin_dms.php
old mode 100755
new mode 100644
diff --git a/cms/content.php b/cms/content.php
old mode 100755
new mode 100644
diff --git a/cms/content_uebersicht.php b/cms/content_uebersicht.php
old mode 100755
new mode 100644
diff --git a/cms/dms.php b/cms/dms.php
old mode 100755
new mode 100644
diff --git a/cms/image.php b/cms/image.php
old mode 100755
new mode 100644
diff --git a/cms/index.html b/cms/index.html
old mode 100755
new mode 100644
diff --git a/cms/menu.inc.php b/cms/menu.inc.php
old mode 100755
new mode 100644
diff --git a/cms/menu/menu_addon.class.php b/cms/menu/menu_addon.class.php
old mode 100755
new mode 100644
diff --git a/cms/menu/menu_addon_freifaecher.inc.php b/cms/menu/menu_addon_freifaecher.inc.php
old mode 100755
new mode 100644
diff --git a/cms/menu/menu_addon_lehrveranstaltungen.inc.php b/cms/menu/menu_addon_lehrveranstaltungen.inc.php
old mode 100755
new mode 100644
diff --git a/cms/menu/menu_addon_lehrveranstaltungen_studienplan.inc.php b/cms/menu/menu_addon_lehrveranstaltungen_studienplan.inc.php
old mode 100755
new mode 100644
diff --git a/cms/menu/menu_addon_meinelehrfaecher.inc.php b/cms/menu/menu_addon_meinelehrfaecher.inc.php
old mode 100755
new mode 100644
diff --git a/cms/menu/menu_addon_meinelv.inc.php b/cms/menu/menu_addon_meinelv.inc.php
old mode 100755
new mode 100644
diff --git a/cms/menu/menu_addon_spacer.inc.php b/cms/menu/menu_addon_spacer.inc.php
old mode 100755
new mode 100644
diff --git a/cms/menu/menu_addon_test.inc.php b/cms/menu/menu_addon_test.inc.php
old mode 100755
new mode 100644
diff --git a/cms/menu/menu_addon_urlaub.inc.php b/cms/menu/menu_addon_urlaub.inc.php
old mode 100755
new mode 100644
diff --git a/cms/menu/menu_addon_zeitsperren.inc.php b/cms/menu/menu_addon_zeitsperren.inc.php
old mode 100755
new mode 100644
diff --git a/cms/news.php b/cms/news.php
old mode 100755
new mode 100644
diff --git a/cms/newsverwaltung.php b/cms/newsverwaltung.php
old mode 100755
new mode 100644
diff --git a/cms/tinymce_dms.php b/cms/tinymce_dms.php
old mode 100755
new mode 100644
diff --git a/composer.json b/composer.json
old mode 100755
new mode 100644
diff --git a/composer.lock b/composer.lock
old mode 100755
new mode 100644
diff --git a/config/.gitignore b/config/.gitignore
old mode 100755
new mode 100644
diff --git a/config/cis.config-default.inc.php b/config/cis.config-default.inc.php
old mode 100755
new mode 100644
diff --git a/config/global.config-default.inc.php b/config/global.config-default.inc.php
old mode 100755
new mode 100644
diff --git a/config/system.config-default.inc.php b/config/system.config-default.inc.php
old mode 100755
new mode 100644
diff --git a/config/vilesci.config-default.inc.php b/config/vilesci.config-default.inc.php
old mode 100755
new mode 100644
diff --git a/config/wawi.config-default.inc.php b/config/wawi.config-default.inc.php
old mode 100755
new mode 100644
diff --git a/content/DragAndDrop.js b/content/DragAndDrop.js
old mode 100755
new mode 100644
diff --git a/content/about.xul.php b/content/about.xul.php
old mode 100755
new mode 100644
diff --git a/content/adressedialog.js.php b/content/adressedialog.js.php
old mode 100755
new mode 100644
diff --git a/content/adressedialog.xul.php b/content/adressedialog.xul.php
old mode 100755
new mode 100644
diff --git a/content/akte.php b/content/akte.php
old mode 100755
new mode 100644
diff --git a/content/akteupload.php b/content/akteupload.php
old mode 100755
new mode 100644
diff --git a/content/anwesenheit.js.php b/content/anwesenheit.js.php
old mode 100755
new mode 100644
diff --git a/content/anwesenheit.xul.php b/content/anwesenheit.xul.php
old mode 100755
new mode 100644
diff --git a/content/bankverbindungdialog.js.php b/content/bankverbindungdialog.js.php
old mode 100755
new mode 100644
diff --git a/content/bankverbindungdialog.xul.php b/content/bankverbindungdialog.xul.php
old mode 100755
new mode 100644
diff --git a/content/betriebsmitteloverlay.js.php b/content/betriebsmitteloverlay.js.php
old mode 100755
new mode 100644
diff --git a/content/betriebsmitteloverlay.xul.php b/content/betriebsmitteloverlay.xul.php
old mode 100755
new mode 100644
diff --git a/content/bild.php b/content/bild.php
old mode 100755
new mode 100644
diff --git a/content/bildupload.php b/content/bildupload.php
old mode 100755
new mode 100644
diff --git a/content/bindings.css b/content/bindings.css
old mode 100755
new mode 100644
diff --git a/content/bindings.xml.php b/content/bindings.xml.php
old mode 100755
new mode 100644
diff --git a/content/datepicker/calendar.png b/content/datepicker/calendar.png
old mode 100755
new mode 100644
diff --git a/content/datepicker/date.png b/content/datepicker/date.png
old mode 100755
new mode 100644
diff --git a/content/datepicker/datepicker.css b/content/datepicker/datepicker.css
old mode 100755
new mode 100644
diff --git a/content/datepicker/datepicker.xml b/content/datepicker/datepicker.xml
old mode 100755
new mode 100644
diff --git a/content/datepicker/navigation.png b/content/datepicker/navigation.png
old mode 100755
new mode 100644
diff --git a/content/dokumentenakt.pdf.php b/content/dokumentenakt.pdf.php
old mode 100755
new mode 100644
diff --git a/content/dragboard.js.php b/content/dragboard.js.php
old mode 100755
new mode 100644
diff --git a/content/fas.xul.php b/content/fas.xul.php
old mode 100755
new mode 100644
diff --git a/content/fasDBDML.php b/content/fasDBDML.php
old mode 100755
new mode 100644
diff --git a/content/fasoverlay.js.php b/content/fasoverlay.js.php
old mode 100755
new mode 100644
diff --git a/content/fasoverlay.xul.php b/content/fasoverlay.xul.php
old mode 100755
new mode 100644
diff --git a/content/functions.js.php b/content/functions.js.php
old mode 100755
new mode 100644
diff --git a/content/funktionen.js.php b/content/funktionen.js.php
old mode 100755
new mode 100644
diff --git a/content/funktionen.xul.php b/content/funktionen.xul.php
old mode 100755
new mode 100644
diff --git a/content/kontakt.js.php b/content/kontakt.js.php
old mode 100755
new mode 100644
diff --git a/content/kontakt.xul.php b/content/kontakt.xul.php
old mode 100755
new mode 100644
diff --git a/content/kontaktdialog.js.php b/content/kontaktdialog.js.php
old mode 100755
new mode 100644
diff --git a/content/kontaktdialog.xul.php b/content/kontaktdialog.xul.php
old mode 100755
new mode 100644
diff --git a/content/lvplanung/lehrveranstaltungDBDML.php b/content/lvplanung/lehrveranstaltungDBDML.php
old mode 100755
new mode 100644
diff --git a/content/lvplanung/lehrveranstaltungdetailoverlay.xul.php b/content/lvplanung/lehrveranstaltungdetailoverlay.xul.php
old mode 100755
new mode 100644
diff --git a/content/lvplanung/lehrveranstaltungnotenoverlay.xul.php b/content/lvplanung/lehrveranstaltungnotenoverlay.xul.php
old mode 100755
new mode 100644
diff --git a/content/lvplanung/lehrveranstaltungoverlay.js.php b/content/lvplanung/lehrveranstaltungoverlay.js.php
old mode 100755
new mode 100644
diff --git a/content/lvplanung/lehrveranstaltungoverlay.xul.php b/content/lvplanung/lehrveranstaltungoverlay.xul.php
old mode 100755
new mode 100644
diff --git a/content/lvplanung/ressourcedialog.js.php b/content/lvplanung/ressourcedialog.js.php
old mode 100755
new mode 100644
diff --git a/content/lvplanung/ressourcedialog.xul.php b/content/lvplanung/ressourcedialog.xul.php
old mode 100755
new mode 100644
diff --git a/content/lvplanung/stpl-details-dialog.js.php b/content/lvplanung/stpl-details-dialog.js.php
old mode 100755
new mode 100644
diff --git a/content/lvplanung/stpl-details-dialog.xul.php b/content/lvplanung/stpl-details-dialog.xul.php
old mode 100755
new mode 100644
diff --git a/content/lvplanung/stpl-details-overlay.xul.php b/content/lvplanung/stpl-details-overlay.xul.php
old mode 100755
new mode 100644
diff --git a/content/lvplanung/stpl-semester-overlay.js.php b/content/lvplanung/stpl-semester-overlay.js.php
old mode 100755
new mode 100644
diff --git a/content/lvplanung/stpl-semester-overlay.xul.php b/content/lvplanung/stpl-semester-overlay.xul.php
old mode 100755
new mode 100644
diff --git a/content/lvplanung/stpl-week-overlay.js.php b/content/lvplanung/stpl-week-overlay.js.php
old mode 100755
new mode 100644
diff --git a/content/lvplanung/stpl-week-overlay.xul.php b/content/lvplanung/stpl-week-overlay.xul.php
old mode 100755
new mode 100644
diff --git a/content/lvplanung/timetable-week.xul.php b/content/lvplanung/timetable-week.xul.php
old mode 100755
new mode 100644
diff --git a/content/messages.js.php b/content/messages.js.php
old mode 100755
new mode 100644
diff --git a/content/messages.xul.php b/content/messages.xul.php
old mode 100755
new mode 100644
diff --git a/content/mitarbeiter/lehrtaetigkeit.pdf.php b/content/mitarbeiter/lehrtaetigkeit.pdf.php
old mode 100755
new mode 100644
diff --git a/content/mitarbeiter/mitarbeiterDBDML.php b/content/mitarbeiter/mitarbeiterDBDML.php
old mode 100755
new mode 100644
diff --git a/content/mitarbeiter/mitarbeiterbuchung.js.php b/content/mitarbeiter/mitarbeiterbuchung.js.php
old mode 100755
new mode 100644
diff --git a/content/mitarbeiter/mitarbeiterbuchungoverlay.xul.php b/content/mitarbeiter/mitarbeiterbuchungoverlay.xul.php
old mode 100755
new mode 100644
diff --git a/content/mitarbeiter/mitarbeiterdetailoverlay.xul.php b/content/mitarbeiter/mitarbeiterdetailoverlay.xul.php
old mode 100755
new mode 100644
diff --git a/content/mitarbeiter/mitarbeiterfunktionoverlay.xul.php b/content/mitarbeiter/mitarbeiterfunktionoverlay.xul.php
old mode 100755
new mode 100644
diff --git a/content/mitarbeiter/mitarbeiteroverlay.js.php b/content/mitarbeiter/mitarbeiteroverlay.js.php
old mode 100755
new mode 100644
diff --git a/content/mitarbeiter/mitarbeiteroverlay.xul.php b/content/mitarbeiter/mitarbeiteroverlay.xul.php
old mode 100755
new mode 100644
diff --git a/content/mitarbeiter/mitarbeitervertrag.js.php b/content/mitarbeiter/mitarbeitervertrag.js.php
old mode 100755
new mode 100644
diff --git a/content/mitarbeiter/mitarbeitervertragneudialog.js.php b/content/mitarbeiter/mitarbeitervertragneudialog.js.php
old mode 100755
new mode 100644
diff --git a/content/mitarbeiter/mitarbeitervertragneudialog.xul.php b/content/mitarbeiter/mitarbeitervertragneudialog.xul.php
old mode 100755
new mode 100644
diff --git a/content/mitarbeiter/mitarbeitervertragoverlay.xul.php b/content/mitarbeiter/mitarbeitervertragoverlay.xul.php
old mode 100755
new mode 100644
diff --git a/content/mitarbeiter/mitarbeiterverwendungdialog.js.php b/content/mitarbeiter/mitarbeiterverwendungdialog.js.php
old mode 100755
new mode 100644
diff --git a/content/mitarbeiter/mitarbeiterverwendungdialog.xul.php b/content/mitarbeiter/mitarbeiterverwendungdialog.xul.php
old mode 100755
new mode 100644
diff --git a/content/notiz.xml.php b/content/notiz.xml.php
old mode 100755
new mode 100644
diff --git a/content/notizdialog.js.php b/content/notizdialog.js.php
old mode 100755
new mode 100644
diff --git a/content/notizdialog.xul.php b/content/notizdialog.xul.php
old mode 100755
new mode 100644
diff --git a/content/notizdokdownload.php b/content/notizdokdownload.php
old mode 100755
new mode 100644
diff --git a/content/notizdokupload.php b/content/notizdokupload.php
old mode 100755
new mode 100644
diff --git a/content/pdfExport.php b/content/pdfExport.php
old mode 100755
new mode 100644
diff --git a/content/phpRequest.js.php b/content/phpRequest.js.php
old mode 100755
new mode 100644
diff --git a/content/planner.js.php b/content/planner.js.php
old mode 100755
new mode 100644
diff --git a/content/planner.overlay.js.php b/content/planner.overlay.js.php
old mode 100755
new mode 100644
diff --git a/content/planner.overlay.xul.php b/content/planner.overlay.xul.php
old mode 100755
new mode 100644
diff --git a/content/planner.xul.php b/content/planner.xul.php
old mode 100755
new mode 100644
diff --git a/content/projekt/GanttChart.svg b/content/projekt/GanttChart.svg
old mode 100755
new mode 100644
diff --git a/content/projekt/bestellung.overlay.js.php b/content/projekt/bestellung.overlay.js.php
old mode 100755
new mode 100644
diff --git a/content/projekt/bestellung.overlay.xul.php b/content/projekt/bestellung.overlay.xul.php
old mode 100755
new mode 100644
diff --git a/content/projekt/gantt.css b/content/projekt/gantt.css
old mode 100755
new mode 100644
diff --git a/content/projekt/gantt.overlay.js.php b/content/projekt/gantt.overlay.js.php
old mode 100755
new mode 100644
diff --git a/content/projekt/gantt.overlay.xul.php b/content/projekt/gantt.overlay.xul.php
old mode 100755
new mode 100644
diff --git a/content/projekt/gantt.svg.css b/content/projekt/gantt.svg.css
old mode 100755
new mode 100644
diff --git a/content/projekt/gantt.svg.php b/content/projekt/gantt.svg.php
old mode 100755
new mode 100644
diff --git a/content/projekt/gantt.svg.xbl b/content/projekt/gantt.svg.xbl
old mode 100755
new mode 100644
diff --git a/content/projekt/mantisdetail.overlay.xul.php b/content/projekt/mantisdetail.overlay.xul.php
old mode 100755
new mode 100644
diff --git a/content/projekt/parsedown.php b/content/projekt/parsedown.php
old mode 100755
new mode 100644
diff --git a/content/projekt/projekt.overlay.js.php b/content/projekt/projekt.overlay.js.php
old mode 100755
new mode 100644
diff --git a/content/projekt/projekt.overlay.xul.php b/content/projekt/projekt.overlay.xul.php
old mode 100755
new mode 100644
diff --git a/content/projekt/projekt_ressource.window.js.php b/content/projekt/projekt_ressource.window.js.php
old mode 100755
new mode 100644
diff --git a/content/projekt/projekt_ressource.window.xul.php b/content/projekt/projekt_ressource.window.xul.php
old mode 100755
new mode 100644
diff --git a/content/projekt/projektdetail.overlay.xul.php b/content/projekt/projektdetail.overlay.xul.php
old mode 100755
new mode 100644
diff --git a/content/projekt/projektdokument.overlay.js.php b/content/projekt/projektdokument.overlay.js.php
old mode 100755
new mode 100644
diff --git a/content/projekt/projektdokument.overlay.xul.php b/content/projekt/projektdokument.overlay.xul.php
old mode 100755
new mode 100644
diff --git a/content/projekt/projektdokument.window.js.php b/content/projekt/projektdokument.window.js.php
old mode 100755
new mode 100644
diff --git a/content/projekt/projektdokument.window.xul.php b/content/projekt/projektdokument.window.xul.php
old mode 100755
new mode 100644
diff --git a/content/projekt/projektphase.overlay.js.php b/content/projekt/projektphase.overlay.js.php
old mode 100755
new mode 100644
diff --git a/content/projekt/projektphase.overlay.xul.php b/content/projekt/projektphase.overlay.xul.php
old mode 100755
new mode 100644
diff --git a/content/projekt/projektphasedetail.overlay.xul.php b/content/projekt/projektphasedetail.overlay.xul.php
old mode 100755
new mode 100644
diff --git a/content/projekt/projekttask.overlay.js.php b/content/projekt/projekttask.overlay.js.php
old mode 100755
new mode 100644
diff --git a/content/projekt/projekttask.overlay.xul.php b/content/projekt/projekttask.overlay.xul.php
old mode 100755
new mode 100644
diff --git a/content/projekt/projekttaskdetail.overlay.xul.php b/content/projekt/projekttaskdetail.overlay.xul.php
old mode 100755
new mode 100644
diff --git a/content/projekt/ressource.js.php b/content/projekt/ressource.js.php
old mode 100755
new mode 100644
diff --git a/content/projekt/ressource.overlay.js.php b/content/projekt/ressource.overlay.js.php
old mode 100755
new mode 100644
diff --git a/content/projekt/ressource.overlay.xul.php b/content/projekt/ressource.overlay.xul.php
old mode 100755
new mode 100644
diff --git a/content/projekt/ressource.window.xul.php b/content/projekt/ressource.window.xul.php
old mode 100755
new mode 100644
diff --git a/content/projekt/ressource.xml.php b/content/projekt/ressource.xml.php
old mode 100755
new mode 100644
diff --git a/content/projekt/ressourcenauslastung.php b/content/projekt/ressourcenauslastung.php
old mode 100755
new mode 100644
diff --git a/content/projektbeschreibung.php b/content/projektbeschreibung.php
old mode 100755
new mode 100644
diff --git a/content/statistik/StudierendeZGV.php b/content/statistik/StudierendeZGV.php
old mode 100755
new mode 100644
diff --git a/content/statistik/abgaengerstatistik.php b/content/statistik/abgaengerstatistik.php
old mode 100755
new mode 100644
diff --git a/content/statistik/abschlusspruefungexport.xls.php b/content/statistik/abschlusspruefungexport.xls.php
old mode 100755
new mode 100644
diff --git a/content/statistik/absolventen.xls.php b/content/statistik/absolventen.xls.php
old mode 100755
new mode 100644
diff --git a/content/statistik/absolventenstatistik.php b/content/statistik/absolventenstatistik.php
old mode 100755
new mode 100644
diff --git a/content/statistik/absolventenzahlen.php b/content/statistik/absolventenzahlen.php
old mode 100755
new mode 100644
diff --git a/content/statistik/alvsstatistik.php b/content/statistik/alvsstatistik.php
old mode 100755
new mode 100644
diff --git a/content/statistik/bama_stromanalyse.php b/content/statistik/bama_stromanalyse.php
old mode 100755
new mode 100644
diff --git a/content/statistik/bama_studentenstrom.svg.php b/content/statistik/bama_studentenstrom.svg.php
old mode 100755
new mode 100644
diff --git a/content/statistik/bewerberstatistik.php b/content/statistik/bewerberstatistik.php
old mode 100755
new mode 100644
diff --git a/content/statistik/bewerberstatistik.svg.php b/content/statistik/bewerberstatistik.svg.php
old mode 100755
new mode 100644
diff --git a/content/statistik/dokumente.xls.php b/content/statistik/dokumente.xls.php
old mode 100755
new mode 100644
diff --git a/content/statistik/dropout.php b/content/statistik/dropout.php
old mode 100755
new mode 100644
diff --git a/content/statistik/dropoutZGV.php b/content/statistik/dropoutZGV.php
old mode 100755
new mode 100644
diff --git a/content/statistik/lehrauftragsliste_gst.xls.php b/content/statistik/lehrauftragsliste_gst.xls.php
old mode 100755
new mode 100644
diff --git a/content/statistik/lehrauftragsliste_mail.xls.php b/content/statistik/lehrauftragsliste_mail.xls.php
old mode 100755
new mode 100644
diff --git a/content/statistik/lvplanung.php b/content/statistik/lvplanung.php
old mode 100755
new mode 100644
diff --git a/content/statistik/lvplanung.xls.php b/content/statistik/lvplanung.xls.php
old mode 100755
new mode 100644
diff --git a/content/statistik/mitarbeiterexport.xls.php b/content/statistik/mitarbeiterexport.xls.php
old mode 100755
new mode 100644
diff --git a/content/statistik/mitarbeiterstatistik.php b/content/statistik/mitarbeiterstatistik.php
old mode 100755
new mode 100644
diff --git a/content/statistik/notenspiegel.php b/content/statistik/notenspiegel.php
old mode 100755
new mode 100644
diff --git a/content/statistik/notenspiegel_erweitert.php b/content/statistik/notenspiegel_erweitert.php
old mode 100755
new mode 100644
diff --git a/content/statistik/oeh_beitraege.xls.php b/content/statistik/oeh_beitraege.xls.php
old mode 100755
new mode 100644
diff --git a/content/statistik/projektarbeitexport.xls.php b/content/statistik/projektarbeitexport.xls.php
old mode 100755
new mode 100644
diff --git a/content/statistik/studentenexportextended.xls.php b/content/statistik/studentenexportextended.xls.php
old mode 100755
new mode 100644
diff --git a/content/statistik/studentenprosemester.php b/content/statistik/studentenprosemester.php
old mode 100755
new mode 100644
diff --git a/content/statistik/studentenstatistik.php b/content/statistik/studentenstatistik.php
old mode 100755
new mode 100644
diff --git a/content/statistik/studentenstatistik_lehrgaenge.php b/content/statistik/studentenstatistik_lehrgaenge.php
old mode 100755
new mode 100644
diff --git a/content/statistik/termine.xls.php b/content/statistik/termine.xls.php
old mode 100755
new mode 100644
diff --git a/content/statistik/vertragsuebersicht.xls.php b/content/statistik/vertragsuebersicht.xls.php
old mode 100755
new mode 100644
diff --git a/content/student/aufnahmetermine.js.php b/content/student/aufnahmetermine.js.php
old mode 100755
new mode 100644
diff --git a/content/student/aufnahmetermine.xul.php b/content/student/aufnahmetermine.xul.php
old mode 100755
new mode 100644
diff --git a/content/student/interessentdokumentedialog.js.php b/content/student/interessentdokumentedialog.js.php
old mode 100755
new mode 100644
diff --git a/content/student/interessentdokumentedialog.xul.php b/content/student/interessentdokumentedialog.xul.php
old mode 100755
new mode 100644
diff --git a/content/student/interessentdokumenteoverlay.js.php b/content/student/interessentdokumenteoverlay.js.php
old mode 100755
new mode 100644
diff --git a/content/student/interessentdokumenteoverlay.xul.php b/content/student/interessentdokumenteoverlay.xul.php
old mode 100755
new mode 100644
diff --git a/content/student/interessentoverlay.js.php b/content/student/interessentoverlay.js.php
old mode 100755
new mode 100644
diff --git a/content/student/studentDBDML.php b/content/student/studentDBDML.php
old mode 100755
new mode 100644
diff --git a/content/student/studentabschlusspruefung.js.php b/content/student/studentabschlusspruefung.js.php
old mode 100755
new mode 100644
diff --git a/content/student/studentabschlusspruefungoverlay.xul.php b/content/student/studentabschlusspruefungoverlay.xul.php
old mode 100755
new mode 100644
diff --git a/content/student/studentanrechnungenoverlay.xul.php b/content/student/studentanrechnungenoverlay.xul.php
old mode 100755
new mode 100644
diff --git a/content/student/studentdetailoverlay.xul.php b/content/student/studentdetailoverlay.xul.php
old mode 100755
new mode 100644
diff --git a/content/student/studentenoverlay.xul.php b/content/student/studentenoverlay.xul.php
old mode 100755
new mode 100644
diff --git a/content/student/studentgruppenoverlay.js.php b/content/student/studentgruppenoverlay.js.php
old mode 100755
new mode 100644
diff --git a/content/student/studentgruppenoverlay.xul.php b/content/student/studentgruppenoverlay.xul.php
old mode 100755
new mode 100644
diff --git a/content/student/studentiooverlay.xul.php b/content/student/studentiooverlay.xul.php
old mode 100755
new mode 100644
diff --git a/content/student/studentkontoneudialog.js.php b/content/student/studentkontoneudialog.js.php
old mode 100755
new mode 100644
diff --git a/content/student/studentkontoneudialog.xul.php b/content/student/studentkontoneudialog.xul.php
old mode 100755
new mode 100644
diff --git a/content/student/studentkontooverlay.xul.php b/content/student/studentkontooverlay.xul.php
old mode 100755
new mode 100644
diff --git a/content/student/studentmobilitaetoverlay.js.php b/content/student/studentmobilitaetoverlay.js.php
old mode 100755
new mode 100644
diff --git a/content/student/studentmobilitaetoverlay.xul.php b/content/student/studentmobilitaetoverlay.xul.php
old mode 100755
new mode 100644
diff --git a/content/student/studentnotenoverlay.xul.php b/content/student/studentnotenoverlay.xul.php
old mode 100755
new mode 100644
diff --git a/content/student/studentoverlay.js.php b/content/student/studentoverlay.js.php
old mode 100755
new mode 100644
diff --git a/content/student/studentprojektarbeit.js.php b/content/student/studentprojektarbeit.js.php
old mode 100755
new mode 100644
diff --git a/content/student/studentprojektarbeitoverlay.xul.php b/content/student/studentprojektarbeitoverlay.xul.php
old mode 100755
new mode 100644
diff --git a/content/student/studentpruefungoverlay.xul.php b/content/student/studentpruefungoverlay.xul.php
old mode 100755
new mode 100644
diff --git a/content/student/studentrolledialog.js.php b/content/student/studentrolledialog.js.php
old mode 100755
new mode 100644
diff --git a/content/student/studentrolledialog.xul.php b/content/student/studentrolledialog.xul.php
old mode 100755
new mode 100644
diff --git a/content/student/studentzeugnisoverlay.xul.php b/content/student/studentzeugnisoverlay.xul.php
old mode 100755
new mode 100644
diff --git a/content/studenten.js b/content/studenten.js
old mode 100755
new mode 100644
diff --git a/content/tempus.js.php b/content/tempus.js.php
old mode 100755
new mode 100644
diff --git a/content/tempus.xul.php b/content/tempus.xul.php
old mode 100755
new mode 100644
diff --git a/content/tempusDBDML.php b/content/tempusDBDML.php
old mode 100755
new mode 100644
diff --git a/content/tempusoverlay.js.php b/content/tempusoverlay.js.php
old mode 100755
new mode 100644
diff --git a/content/tempusoverlay.xul.php b/content/tempusoverlay.xul.php
old mode 100755
new mode 100644
diff --git a/content/termine.js.php b/content/termine.js.php
old mode 100755
new mode 100644
diff --git a/content/termine.xul.php b/content/termine.xul.php
old mode 100755
new mode 100644
diff --git a/content/udf.js.php b/content/udf.js.php
old mode 100755
new mode 100644
diff --git a/content/udf.xul.php b/content/udf.xul.php
old mode 100755
new mode 100644
diff --git a/content/zutrittskarte.php b/content/zutrittskarte.php
old mode 100755
new mode 100644
diff --git a/favicon.ico b/favicon.ico
old mode 100755
new mode 100644
diff --git a/include/DifferenceEngine/DifferenceEngine.php b/include/DifferenceEngine/DifferenceEngine.php
old mode 100755
new mode 100644
diff --git a/include/Excel/BIFFwriter.php b/include/Excel/BIFFwriter.php
old mode 100755
new mode 100644
diff --git a/include/Excel/File.php b/include/Excel/File.php
old mode 100755
new mode 100644
diff --git a/include/Excel/Format.php b/include/Excel/Format.php
old mode 100755
new mode 100644
diff --git a/include/Excel/OLE.php b/include/Excel/OLE.php
old mode 100755
new mode 100644
diff --git a/include/Excel/PEAR.php b/include/Excel/PEAR.php
old mode 100755
new mode 100644
diff --git a/include/Excel/PPS.php b/include/Excel/PPS.php
old mode 100755
new mode 100644
diff --git a/include/Excel/Parser.php b/include/Excel/Parser.php
old mode 100755
new mode 100644
diff --git a/include/Excel/Root.php b/include/Excel/Root.php
old mode 100755
new mode 100644
diff --git a/include/Excel/Validator.php b/include/Excel/Validator.php
old mode 100755
new mode 100644
diff --git a/include/Excel/Workbook.php b/include/Excel/Workbook.php
old mode 100755
new mode 100644
diff --git a/include/Excel/Worksheet.php b/include/Excel/Worksheet.php
old mode 100755
new mode 100644
diff --git a/include/Excel/Writer.php b/include/Excel/Writer.php
old mode 100755
new mode 100644
diff --git a/include/Excel/excel.php b/include/Excel/excel.php
old mode 100755
new mode 100644
diff --git a/include/File/CSV.php b/include/File/CSV.php
old mode 100755
new mode 100644
diff --git a/include/File/Find.php b/include/File/Find.php
old mode 100755
new mode 100644
diff --git a/include/File/Match.php b/include/File/Match.php
old mode 100755
new mode 100644
diff --git a/include/File/Passwd.php b/include/File/Passwd.php
old mode 100755
new mode 100644
diff --git a/include/File/SearchReplace.php b/include/File/SearchReplace.php
old mode 100755
new mode 100644
diff --git a/include/File/Util.php b/include/File/Util.php
old mode 100755
new mode 100644
diff --git a/include/Parser/Parsedown.php b/include/Parser/Parsedown.php
old mode 100755
new mode 100644
diff --git a/include/ablauf.class.php b/include/ablauf.class.php
old mode 100755
new mode 100644
diff --git a/include/abschlusspruefung.class.php b/include/abschlusspruefung.class.php
old mode 100755
new mode 100644
diff --git a/include/abschlusspruefung_antritt.class.php b/include/abschlusspruefung_antritt.class.php
old mode 100755
new mode 100644
diff --git a/include/addon.class.php b/include/addon.class.php
old mode 100755
new mode 100644
diff --git a/include/adresse.class.php b/include/adresse.class.php
old mode 100755
new mode 100644
diff --git a/include/adressentyp.class.php b/include/adressentyp.class.php
old mode 100755
new mode 100644
diff --git a/include/akadgrad.class.php b/include/akadgrad.class.php
old mode 100755
new mode 100644
diff --git a/include/akte.class.php b/include/akte.class.php
old mode 100755
new mode 100644
diff --git a/include/ampel.class.php b/include/ampel.class.php
old mode 100755
new mode 100644
diff --git a/include/anrechnung.class.php b/include/anrechnung.class.php
old mode 100755
new mode 100644
diff --git a/include/antwort.class.php b/include/antwort.class.php
old mode 100755
new mode 100644
diff --git a/include/anwesenheit.class.php b/include/anwesenheit.class.php
old mode 100755
new mode 100644
diff --git a/include/appdaten.class.php b/include/appdaten.class.php
old mode 100755
new mode 100644
diff --git a/include/aufmerksamdurch.class.php b/include/aufmerksamdurch.class.php
old mode 100755
new mode 100644
diff --git a/include/auth_demo.class.php b/include/auth_demo.class.php
old mode 100755
new mode 100644
diff --git a/include/auth_mixed.class.php b/include/auth_mixed.class.php
old mode 100755
new mode 100644
diff --git a/include/auth_session.class.php b/include/auth_session.class.php
old mode 100755
new mode 100644
diff --git a/include/authentication.class.php b/include/authentication.class.php
old mode 100755
new mode 100644
diff --git a/include/bankverbindung.class.php b/include/bankverbindung.class.php
old mode 100755
new mode 100644
diff --git a/include/basis.class.php b/include/basis.class.php
old mode 100755
new mode 100644
diff --git a/include/basis_db.class.php b/include/basis_db.class.php
old mode 100755
new mode 100644
diff --git a/include/beispiel.class.php b/include/beispiel.class.php
old mode 100755
new mode 100644
diff --git a/include/benutzer.class.php b/include/benutzer.class.php
old mode 100755
new mode 100644
diff --git a/include/benutzerberechtigung.class.php b/include/benutzerberechtigung.class.php
old mode 100755
new mode 100644
diff --git a/include/benutzerfunktion.class.php b/include/benutzerfunktion.class.php
old mode 100755
new mode 100644
diff --git a/include/benutzergruppe.class.php b/include/benutzergruppe.class.php
old mode 100755
new mode 100644
diff --git a/include/benutzerlvstudiensemester.class.php b/include/benutzerlvstudiensemester.class.php
old mode 100755
new mode 100644
diff --git a/include/berechtigung.class.php b/include/berechtigung.class.php
old mode 100755
new mode 100644
diff --git a/include/betriebsmittel.class.php b/include/betriebsmittel.class.php
old mode 100755
new mode 100644
diff --git a/include/betriebsmittel_betriebsmittelstatus.class.php b/include/betriebsmittel_betriebsmittelstatus.class.php
old mode 100755
new mode 100644
diff --git a/include/betriebsmittelperson.class.php b/include/betriebsmittelperson.class.php
old mode 100755
new mode 100644
diff --git a/include/betriebsmittelstatus.class.php b/include/betriebsmittelstatus.class.php
old mode 100755
new mode 100644
diff --git a/include/betriebsmitteltyp.class.php b/include/betriebsmitteltyp.class.php
old mode 100755
new mode 100644
diff --git a/include/bewerbungstermin.class.php b/include/bewerbungstermin.class.php
old mode 100755
new mode 100644
diff --git a/include/bisarchiv.class.php b/include/bisarchiv.class.php
old mode 100755
new mode 100644
diff --git a/include/bisberufstaetigkeit.class.php b/include/bisberufstaetigkeit.class.php
old mode 100755
new mode 100644
diff --git a/include/bisfunktion.class.php b/include/bisfunktion.class.php
old mode 100755
new mode 100644
diff --git a/include/bisio.class.php b/include/bisio.class.php
old mode 100755
new mode 100644
diff --git a/include/bisorgform.class.php b/include/bisorgform.class.php
old mode 100755
new mode 100644
diff --git a/include/bisverwendung.class.php b/include/bisverwendung.class.php
old mode 100755
new mode 100644
diff --git a/include/buchung.class.php b/include/buchung.class.php
old mode 100755
new mode 100644
diff --git a/include/content.class.php b/include/content.class.php
old mode 100755
new mode 100644
diff --git a/include/coodle.class.php b/include/coodle.class.php
old mode 100755
new mode 100644
diff --git a/include/covid/covidhelper.class.php b/include/covid/covidhelper.class.php
old mode 100755
new mode 100644
diff --git a/include/cronjob.class.php b/include/cronjob.class.php
old mode 100755
new mode 100644
diff --git a/include/css/images/ui-bg_diagonals-thick_18_b81900_40x40.png b/include/css/images/ui-bg_diagonals-thick_18_b81900_40x40.png
old mode 100755
new mode 100644
diff --git a/include/css/images/ui-bg_diagonals-thick_20_666666_40x40.png b/include/css/images/ui-bg_diagonals-thick_20_666666_40x40.png
old mode 100755
new mode 100644
diff --git a/include/css/images/ui-bg_flat_10_000000_40x100.png b/include/css/images/ui-bg_flat_10_000000_40x100.png
old mode 100755
new mode 100644
diff --git a/include/css/images/ui-bg_glass_100_f6f6f6_1x400.png b/include/css/images/ui-bg_glass_100_f6f6f6_1x400.png
old mode 100755
new mode 100644
diff --git a/include/css/images/ui-bg_glass_100_fdf5ce_1x400.png b/include/css/images/ui-bg_glass_100_fdf5ce_1x400.png
old mode 100755
new mode 100644
diff --git a/include/css/images/ui-bg_glass_65_ffffff_1x400.png b/include/css/images/ui-bg_glass_65_ffffff_1x400.png
old mode 100755
new mode 100644
diff --git a/include/css/images/ui-bg_gloss-wave_35_f6a828_500x100.png b/include/css/images/ui-bg_gloss-wave_35_f6a828_500x100.png
old mode 100755
new mode 100644
diff --git a/include/css/images/ui-bg_highlight-soft_100_eeeeee_1x100.png b/include/css/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
old mode 100755
new mode 100644
diff --git a/include/css/images/ui-bg_highlight-soft_75_ffe45c_1x100.png b/include/css/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
old mode 100755
new mode 100644
diff --git a/include/css/images/ui-icons_222222_256x240.png b/include/css/images/ui-icons_222222_256x240.png
old mode 100755
new mode 100644
diff --git a/include/css/images/ui-icons_228ef1_256x240.png b/include/css/images/ui-icons_228ef1_256x240.png
old mode 100755
new mode 100644
diff --git a/include/css/images/ui-icons_ef8c08_256x240.png b/include/css/images/ui-icons_ef8c08_256x240.png
old mode 100755
new mode 100644
diff --git a/include/css/images/ui-icons_ffd27a_256x240.png b/include/css/images/ui-icons_ffd27a_256x240.png
old mode 100755
new mode 100644
diff --git a/include/css/images/ui-icons_ffffff_256x240.png b/include/css/images/ui-icons_ffffff_256x240.png
old mode 100755
new mode 100644
diff --git a/include/datum.class.php b/include/datum.class.php
old mode 100755
new mode 100644
diff --git a/include/dms.class.php b/include/dms.class.php
old mode 100755
new mode 100644
diff --git a/include/dokument.class.php b/include/dokument.class.php
old mode 100755
new mode 100644
diff --git a/include/dokument_export.class.php b/include/dokument_export.class.php
old mode 100755
new mode 100644
diff --git a/include/dvb.class.php b/include/dvb.class.php
old mode 100755
new mode 100644
diff --git a/include/ean13.function.php b/include/ean13.function.php
old mode 100755
new mode 100644
diff --git a/include/entwicklungsteam.class.php b/include/entwicklungsteam.class.php
old mode 100755
new mode 100644
diff --git a/include/erhalter.class.php b/include/erhalter.class.php
old mode 100755
new mode 100644
diff --git a/include/errorhandler.class.php b/include/errorhandler.class.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/CREDITS b/include/ezcomponents/Base/CREDITS
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/ChangeLog b/include/ezcomponents/Base/ChangeLog
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/DESCRIPTION b/include/ezcomponents/Base/DESCRIPTION
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/design/class_diagram.png b/include/ezcomponents/Base/design/class_diagram.png
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/design/design.txt b/include/ezcomponents/Base/design/design.txt
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/docs/repos/Me/myclass1.php b/include/ezcomponents/Base/docs/repos/Me/myclass1.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/docs/repos/Me/myclass2.php b/include/ezcomponents/Base/docs/repos/Me/myclass2.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/docs/repos/You/yourclass1.php b/include/ezcomponents/Base/docs/repos/You/yourclass1.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/docs/repos/You/yourclass2.php b/include/ezcomponents/Base/docs/repos/You/yourclass2.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/docs/repos/autoloads/my_autoload.php b/include/ezcomponents/Base/docs/repos/autoloads/my_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/docs/repos/autoloads/your_autoload.php b/include/ezcomponents/Base/docs/repos/autoloads/your_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/docs/tutorial.txt b/include/ezcomponents/Base/docs/tutorial.txt
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/docs/tutorial_autoload.php b/include/ezcomponents/Base/docs/tutorial_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/docs/tutorial_example_01.php b/include/ezcomponents/Base/docs/tutorial_example_01.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/docs/tutorial_example_02.php b/include/ezcomponents/Base/docs/tutorial_example_02.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/docs/tutorial_example_03.php b/include/ezcomponents/Base/docs/tutorial_example_03.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/docs/tutorial_lazy_initialization.php b/include/ezcomponents/Base/docs/tutorial_lazy_initialization.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/review-1.5.txt b/include/ezcomponents/Base/review-1.5.txt
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/src/base.php b/include/ezcomponents/Base/src/base.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/src/exceptions/autoload.php b/include/ezcomponents/Base/src/exceptions/autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/src/exceptions/double_class_repository_prefix.php b/include/ezcomponents/Base/src/exceptions/double_class_repository_prefix.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/src/exceptions/exception.php b/include/ezcomponents/Base/src/exceptions/exception.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/src/exceptions/extension_not_found.php b/include/ezcomponents/Base/src/exceptions/extension_not_found.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/src/exceptions/file_exception.php b/include/ezcomponents/Base/src/exceptions/file_exception.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/src/exceptions/file_io.php b/include/ezcomponents/Base/src/exceptions/file_io.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/src/exceptions/file_not_found.php b/include/ezcomponents/Base/src/exceptions/file_not_found.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/src/exceptions/file_permission.php b/include/ezcomponents/Base/src/exceptions/file_permission.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/src/exceptions/init_callback_configured.php b/include/ezcomponents/Base/src/exceptions/init_callback_configured.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/src/exceptions/invalid_callback_class.php b/include/ezcomponents/Base/src/exceptions/invalid_callback_class.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/src/exceptions/invalid_parent_class.php b/include/ezcomponents/Base/src/exceptions/invalid_parent_class.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/src/exceptions/property_not_found.php b/include/ezcomponents/Base/src/exceptions/property_not_found.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/src/exceptions/property_permission.php b/include/ezcomponents/Base/src/exceptions/property_permission.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/src/exceptions/setting_not_found.php b/include/ezcomponents/Base/src/exceptions/setting_not_found.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/src/exceptions/setting_value.php b/include/ezcomponents/Base/src/exceptions/setting_value.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/src/exceptions/value.php b/include/ezcomponents/Base/src/exceptions/value.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/src/exceptions/whatever.php b/include/ezcomponents/Base/src/exceptions/whatever.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/src/ezc_bootstrap.php b/include/ezcomponents/Base/src/ezc_bootstrap.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/src/features.php b/include/ezcomponents/Base/src/features.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/src/file.php b/include/ezcomponents/Base/src/file.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/src/init.php b/include/ezcomponents/Base/src/init.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/src/interfaces/configuration_initializer.php b/include/ezcomponents/Base/src/interfaces/configuration_initializer.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/src/interfaces/persistable.php b/include/ezcomponents/Base/src/interfaces/persistable.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/src/options.php b/include/ezcomponents/Base/src/options.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/src/options/autoload.php b/include/ezcomponents/Base/src/options/autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/src/struct.php b/include/ezcomponents/Base/src/struct.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/src/structs/repository_directory.php b/include/ezcomponents/Base/src/structs/repository_directory.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/tests/base_init_test.php b/include/ezcomponents/Base/tests/base_init_test.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/tests/base_options_test.php b/include/ezcomponents/Base/tests/base_options_test.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/tests/base_test.php b/include/ezcomponents/Base/tests/base_test.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/tests/extra_repository/Translation/test.php b/include/ezcomponents/Base/tests/extra_repository/Translation/test.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/tests/extra_repository/autoload/translation_autoload.php b/include/ezcomponents/Base/tests/extra_repository/autoload/translation_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/tests/features_test.php b/include/ezcomponents/Base/tests/features_test.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/tests/file_calculate_relative_path_test.php b/include/ezcomponents/Base/tests/file_calculate_relative_path_test.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/tests/file_copy_recursive_test.php b/include/ezcomponents/Base/tests/file_copy_recursive_test.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/tests/file_find_recursive_test.php b/include/ezcomponents/Base/tests/file_find_recursive_test.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/tests/file_is_absolute_path.php b/include/ezcomponents/Base/tests/file_is_absolute_path.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/tests/file_remove_recursive_test.php b/include/ezcomponents/Base/tests/file_remove_recursive_test.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/tests/init/base_init_callback.php b/include/ezcomponents/Base/tests/init/base_init_callback.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/tests/init/base_init_class.php b/include/ezcomponents/Base/tests/init/base_init_class.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/tests/struct_test.php b/include/ezcomponents/Base/tests/struct_test.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/tests/suite.php b/include/ezcomponents/Base/tests/suite.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/tests/test_options.php b/include/ezcomponents/Base/tests/test_options.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/tests/test_repository/TestClasses/base_test_class.php b/include/ezcomponents/Base/tests/test_repository/TestClasses/base_test_class.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/tests/test_repository/TestClasses/base_test_class_number_two.php b/include/ezcomponents/Base/tests/test_repository/TestClasses/base_test_class_number_two.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/tests/test_repository/TestClasses/base_test_long_class.php b/include/ezcomponents/Base/tests/test_repository/TestClasses/base_test_long_class.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/tests/test_repository/autoload_files/basetest_autoload.php b/include/ezcomponents/Base/tests/test_repository/autoload_files/basetest_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/tests/test_repository/autoload_files/basetest_long_autoload.php b/include/ezcomponents/Base/tests/test_repository/autoload_files/basetest_long_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/tests/test_repository/autoload_files/object_autoload.php b/include/ezcomponents/Base/tests/test_repository/autoload_files/object_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Base/tests/test_repository/object/object.php b/include/ezcomponents/Base/tests/test_repository/object/object.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ChangeLog b/include/ezcomponents/ChangeLog
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/CREDITS b/include/ezcomponents/Graph/CREDITS
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/ChangeLog b/include/ezcomponents/Graph/ChangeLog
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/DESCRIPTION b/include/ezcomponents/Graph/DESCRIPTION
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/design/class_diagram.png b/include/ezcomponents/Graph/design/class_diagram.png
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/design/design.txt b/include/ezcomponents/Graph/design/design.txt
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/design/enhancements/interactive_data_points.txt b/include/ezcomponents/Graph/design/enhancements/interactive_data_points.txt
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/design/enhancements/multiple_axis.txt b/include/ezcomponents/Graph/design/enhancements/multiple_axis.txt
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/design/requirements.txt b/include/ezcomponents/Graph/design/requirements.txt
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/design/requirements/interactive_data_points.txt b/include/ezcomponents/Graph/design/requirements/interactive_data_points.txt
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/design/requirements/multiple_axis.txt b/include/ezcomponents/Graph/design/requirements/multiple_axis.txt
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/examples/ez_green.php b/include/ezcomponents/Graph/docs/examples/ez_green.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/examples/ez_red.php b/include/ezcomponents/Graph/docs/examples/ez_red.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/examples/forum_evolution.php b/include/ezcomponents/Graph/docs/examples/forum_evolution.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/examples/forum_month.php b/include/ezcomponents/Graph/docs/examples/forum_month.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/examples/forum_weekly.php b/include/ezcomponents/Graph/docs/examples/forum_weekly.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/examples/forum_year.php b/include/ezcomponents/Graph/docs/examples/forum_year.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/examples/php_magazine.php b/include/ezcomponents/Graph/docs/examples/php_magazine.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/examples/wikipedia.php b/include/ezcomponents/Graph/docs/examples/wikipedia.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_axis_datetime.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_axis_datetime.svg.png
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_axis_labeled.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_axis_labeled.svg.png
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_axis_numeric.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_axis_numeric.svg.png
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_bar_chart.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_bar_chart.svg.png
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_bar_chart_3d.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_bar_chart_3d.svg.png
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_bar_chart_options.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_bar_chart_options.svg.png
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_bar_line_chart.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_bar_line_chart.svg.png
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_bar_options.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_bar_options.svg.png
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_chart_background.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_chart_background.svg.png
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_chart_legend.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_chart_legend.svg.png
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_chart_title.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_chart_title.svg.png
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_complex_radar_chart.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_complex_radar_chart.svg.png
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_custom_odometer_chart.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_custom_odometer_chart.svg.png
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_custom_palette.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_custom_palette.svg.png
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_dataset_average.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_dataset_average.svg.png
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_dataset_numeric.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_dataset_numeric.svg.png
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_driver_flash.swf b/include/ezcomponents/Graph/docs/img/tutorial_driver_flash.swf
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_driver_gd.jpg b/include/ezcomponents/Graph/docs/img/tutorial_driver_gd.jpg
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_driver_svg.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_driver_svg.svg.png
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_legend_options.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_legend_options.svg.png
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_line_chart.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_line_chart.svg.png
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_line_chart_3d.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_line_chart_3d.svg.png
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_line_chart_additional_axis.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_line_chart_additional_axis.svg.png
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_line_chart_markers.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_line_chart_markers.svg.png
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_modified_palette.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_modified_palette.svg.png
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_odometer_chart.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_odometer_chart.svg.png
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_pie_chart_3d.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_pie_chart_3d.svg.png
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_pie_chart_options.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_pie_chart_options.svg.png
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_pie_chart_pimped.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_pie_chart_pimped.svg.png
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_pie_options.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_pie_options.svg.png
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_radar_chart.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_radar_chart.svg.png
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_reference_gd.html b/include/ezcomponents/Graph/docs/img/tutorial_reference_gd.html
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_reference_gd.png b/include/ezcomponents/Graph/docs/img/tutorial_reference_gd.png
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_reference_svg.svg b/include/ezcomponents/Graph/docs/img/tutorial_reference_svg.svg
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_renderer_3d.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_renderer_3d.svg.png
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_rotated_labels.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_rotated_labels.svg.png
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_simple_pie.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_simple_pie.svg.png
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_stacked_bar_chart.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_stacked_bar_chart.svg.png
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/img/tutorial_user_palette.svg.png b/include/ezcomponents/Graph/docs/img/tutorial_user_palette.svg.png
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/tutorial.txt b/include/ezcomponents/Graph/docs/tutorial.txt
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/tutorial/ez.png b/include/ezcomponents/Graph/docs/tutorial/ez.png
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/tutorial/template.svg b/include/ezcomponents/Graph/docs/tutorial/template.svg
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_autoload.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_axis_datetime.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_axis_datetime.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_axis_labeled.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_axis_labeled.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_axis_numeric.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_axis_numeric.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_bar_chart.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_bar_chart.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_bar_chart_3d.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_bar_chart_3d.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_bar_chart_options.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_bar_chart_options.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_bar_line_chart.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_bar_line_chart.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_bar_options.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_bar_options.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_chart_background.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_chart_background.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_chart_legend.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_chart_legend.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_chart_title.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_chart_title.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_complex_radar_chart.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_complex_radar_chart.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_custom_odometer_chart.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_custom_odometer_chart.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_custom_palette.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_custom_palette.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_custom_palette_palette.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_custom_palette_palette.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_dataset_average.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_dataset_average.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_dataset_numeric.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_dataset_numeric.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_driver_cairo.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_driver_cairo.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_driver_flash.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_driver_flash.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_driver_gd.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_driver_gd.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_driver_svg.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_driver_svg.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_font.fdb b/include/ezcomponents/Graph/docs/tutorial/tutorial_font.fdb
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_font.pfb b/include/ezcomponents/Graph/docs/tutorial/tutorial_font.pfb
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_font.ttf b/include/ezcomponents/Graph/docs/tutorial/tutorial_font.ttf
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_legend_options.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_legend_options.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_line_chart.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_line_chart.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_line_chart_3d.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_line_chart_3d.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_line_chart_additional_axis.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_line_chart_additional_axis.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_line_chart_markers.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_line_chart_markers.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_modified_palette.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_modified_palette.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_odometer_chart.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_odometer_chart.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_output.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_output.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_pie_chart_3d.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_pie_chart_3d.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_pie_chart_options.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_pie_chart_options.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_pie_chart_pimped.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_pie_chart_pimped.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_pie_options.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_pie_options.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_radar_chart.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_radar_chart.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_reference_gd.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_reference_gd.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_reference_svg.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_reference_svg.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_renderer_3d.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_renderer_3d.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_rotated_labels.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_rotated_labels.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_simple_pie.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_simple_pie.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_stacked_bar_chart.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_stacked_bar_chart.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_user_palette.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_user_palette.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/docs/tutorial/tutorial_wikipedia_data.php b/include/ezcomponents/Graph/docs/tutorial/tutorial_wikipedia_data.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/axis/container.php b/include/ezcomponents/Graph/src/axis/container.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/axis/date.php b/include/ezcomponents/Graph/src/axis/date.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/axis/labeled.php b/include/ezcomponents/Graph/src/axis/labeled.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/axis/logarithmic.php b/include/ezcomponents/Graph/src/axis/logarithmic.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/axis/numeric.php b/include/ezcomponents/Graph/src/axis/numeric.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/charts/bar.php b/include/ezcomponents/Graph/src/charts/bar.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/charts/line.php b/include/ezcomponents/Graph/src/charts/line.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/charts/odometer.php b/include/ezcomponents/Graph/src/charts/odometer.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/charts/pie.php b/include/ezcomponents/Graph/src/charts/pie.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/charts/radar.php b/include/ezcomponents/Graph/src/charts/radar.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/colors/color.php b/include/ezcomponents/Graph/src/colors/color.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/colors/linear_gradient.php b/include/ezcomponents/Graph/src/colors/linear_gradient.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/colors/radial_gradient.php b/include/ezcomponents/Graph/src/colors/radial_gradient.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/data_container/base.php b/include/ezcomponents/Graph/src/data_container/base.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/data_container/single.php b/include/ezcomponents/Graph/src/data_container/single.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/datasets/array.php b/include/ezcomponents/Graph/src/datasets/array.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/datasets/average.php b/include/ezcomponents/Graph/src/datasets/average.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/datasets/base.php b/include/ezcomponents/Graph/src/datasets/base.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/datasets/numeric.php b/include/ezcomponents/Graph/src/datasets/numeric.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/datasets/property/axis.php b/include/ezcomponents/Graph/src/datasets/property/axis.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/datasets/property/boolean.php b/include/ezcomponents/Graph/src/datasets/property/boolean.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/datasets/property/color.php b/include/ezcomponents/Graph/src/datasets/property/color.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/datasets/property/integer.php b/include/ezcomponents/Graph/src/datasets/property/integer.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/datasets/property/string.php b/include/ezcomponents/Graph/src/datasets/property/string.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/driver/cairo.php b/include/ezcomponents/Graph/src/driver/cairo.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/driver/flash.php b/include/ezcomponents/Graph/src/driver/flash.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/driver/gd.php b/include/ezcomponents/Graph/src/driver/gd.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/driver/svg.php b/include/ezcomponents/Graph/src/driver/svg.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/driver/svg_font.php b/include/ezcomponents/Graph/src/driver/svg_font.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/driver/verbose.php b/include/ezcomponents/Graph/src/driver/verbose.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/element/axis.php b/include/ezcomponents/Graph/src/element/axis.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/element/background.php b/include/ezcomponents/Graph/src/element/background.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/element/legend.php b/include/ezcomponents/Graph/src/element/legend.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/element/text.php b/include/ezcomponents/Graph/src/element/text.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/exceptions/date_parsing.php b/include/ezcomponents/Graph/src/exceptions/date_parsing.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/exceptions/exception.php b/include/ezcomponents/Graph/src/exceptions/exception.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/exceptions/flash_bitmap_type.php b/include/ezcomponents/Graph/src/exceptions/flash_bitmap_type.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/exceptions/font_rendering.php b/include/ezcomponents/Graph/src/exceptions/font_rendering.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/exceptions/font_type.php b/include/ezcomponents/Graph/src/exceptions/font_type.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/exceptions/incompatible_driver.php b/include/ezcomponents/Graph/src/exceptions/incompatible_driver.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/exceptions/invalid_assignement.php b/include/ezcomponents/Graph/src/exceptions/invalid_assignement.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/exceptions/invalid_data.php b/include/ezcomponents/Graph/src/exceptions/invalid_data.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/exceptions/invalid_data_source.php b/include/ezcomponents/Graph/src/exceptions/invalid_data_source.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/exceptions/invalid_dimensions.php b/include/ezcomponents/Graph/src/exceptions/invalid_dimensions.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/exceptions/invalid_display_type.php b/include/ezcomponents/Graph/src/exceptions/invalid_display_type.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/exceptions/invalid_id.php b/include/ezcomponents/Graph/src/exceptions/invalid_id.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/exceptions/invalid_image_file.php b/include/ezcomponents/Graph/src/exceptions/invalid_image_file.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/exceptions/invalid_keys.php b/include/ezcomponents/Graph/src/exceptions/invalid_keys.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/exceptions/no_data.php b/include/ezcomponents/Graph/src/exceptions/no_data.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/exceptions/no_such_data.php b/include/ezcomponents/Graph/src/exceptions/no_such_data.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/exceptions/no_such_dataset.php b/include/ezcomponents/Graph/src/exceptions/no_such_dataset.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/exceptions/no_such_element.php b/include/ezcomponents/Graph/src/exceptions/no_such_element.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/exceptions/not_rendered.php b/include/ezcomponents/Graph/src/exceptions/not_rendered.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/exceptions/out_of_boundings.php b/include/ezcomponents/Graph/src/exceptions/out_of_boundings.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/exceptions/out_of_logarithmical_boundings.php b/include/ezcomponents/Graph/src/exceptions/out_of_logarithmical_boundings.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/exceptions/reducement_failed.php b/include/ezcomponents/Graph/src/exceptions/reducement_failed.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/exceptions/too_many_datasets.php b/include/ezcomponents/Graph/src/exceptions/too_many_datasets.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/exceptions/unknown_color_definition.php b/include/ezcomponents/Graph/src/exceptions/unknown_color_definition.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/exceptions/unregular_steps.php b/include/ezcomponents/Graph/src/exceptions/unregular_steps.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/exceptions/unsupported_image_type.php b/include/ezcomponents/Graph/src/exceptions/unsupported_image_type.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/graph.php b/include/ezcomponents/Graph/src/graph.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/interfaces/axis_label_renderer.php b/include/ezcomponents/Graph/src/interfaces/axis_label_renderer.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/interfaces/chart.php b/include/ezcomponents/Graph/src/interfaces/chart.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/interfaces/dataset_property.php b/include/ezcomponents/Graph/src/interfaces/dataset_property.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/interfaces/driver.php b/include/ezcomponents/Graph/src/interfaces/driver.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/interfaces/element.php b/include/ezcomponents/Graph/src/interfaces/element.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/interfaces/odometer_renderer.php b/include/ezcomponents/Graph/src/interfaces/odometer_renderer.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/interfaces/palette.php b/include/ezcomponents/Graph/src/interfaces/palette.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/interfaces/radar_renderer.php b/include/ezcomponents/Graph/src/interfaces/radar_renderer.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/interfaces/renderer.php b/include/ezcomponents/Graph/src/interfaces/renderer.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/interfaces/stacked_bar_renderer.php b/include/ezcomponents/Graph/src/interfaces/stacked_bar_renderer.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/math/boundings.php b/include/ezcomponents/Graph/src/math/boundings.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/math/matrix.php b/include/ezcomponents/Graph/src/math/matrix.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/math/polynom.php b/include/ezcomponents/Graph/src/math/polynom.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/math/rotation.php b/include/ezcomponents/Graph/src/math/rotation.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/math/transformation.php b/include/ezcomponents/Graph/src/math/transformation.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/math/translation.php b/include/ezcomponents/Graph/src/math/translation.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/math/vector.php b/include/ezcomponents/Graph/src/math/vector.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/options/cairo_driver.php b/include/ezcomponents/Graph/src/options/cairo_driver.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/options/chart.php b/include/ezcomponents/Graph/src/options/chart.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/options/driver.php b/include/ezcomponents/Graph/src/options/driver.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/options/flash_driver.php b/include/ezcomponents/Graph/src/options/flash_driver.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/options/font.php b/include/ezcomponents/Graph/src/options/font.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/options/gd_driver.php b/include/ezcomponents/Graph/src/options/gd_driver.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/options/line_chart.php b/include/ezcomponents/Graph/src/options/line_chart.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/options/odometer_chart.php b/include/ezcomponents/Graph/src/options/odometer_chart.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/options/pie_chart.php b/include/ezcomponents/Graph/src/options/pie_chart.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/options/radar_chart.php b/include/ezcomponents/Graph/src/options/radar_chart.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/options/renderer.php b/include/ezcomponents/Graph/src/options/renderer.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/options/renderer_2d.php b/include/ezcomponents/Graph/src/options/renderer_2d.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/options/renderer_3d.php b/include/ezcomponents/Graph/src/options/renderer_3d.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/options/svg_driver.php b/include/ezcomponents/Graph/src/options/svg_driver.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/palette/black.php b/include/ezcomponents/Graph/src/palette/black.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/palette/ez.php b/include/ezcomponents/Graph/src/palette/ez.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/palette/ez_blue.php b/include/ezcomponents/Graph/src/palette/ez_blue.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/palette/ez_green.php b/include/ezcomponents/Graph/src/palette/ez_green.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/palette/ez_red.php b/include/ezcomponents/Graph/src/palette/ez_red.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/palette/tango.php b/include/ezcomponents/Graph/src/palette/tango.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/renderer/2d.php b/include/ezcomponents/Graph/src/renderer/2d.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/renderer/3d.php b/include/ezcomponents/Graph/src/renderer/3d.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/renderer/axis_label_boxed.php b/include/ezcomponents/Graph/src/renderer/axis_label_boxed.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/renderer/axis_label_centered.php b/include/ezcomponents/Graph/src/renderer/axis_label_centered.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/renderer/axis_label_exact.php b/include/ezcomponents/Graph/src/renderer/axis_label_exact.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/renderer/axis_label_none.php b/include/ezcomponents/Graph/src/renderer/axis_label_none.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/renderer/axis_label_radar.php b/include/ezcomponents/Graph/src/renderer/axis_label_radar.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/renderer/axis_label_rotated.php b/include/ezcomponents/Graph/src/renderer/axis_label_rotated.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/structs/context.php b/include/ezcomponents/Graph/src/structs/context.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/structs/coordinate.php b/include/ezcomponents/Graph/src/structs/coordinate.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/structs/step.php b/include/ezcomponents/Graph/src/structs/step.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/Graph/src/tools.php b/include/ezcomponents/Graph/src/tools.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/GraphDatabaseTiein/CREDITS b/include/ezcomponents/GraphDatabaseTiein/CREDITS
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/GraphDatabaseTiein/ChangeLog b/include/ezcomponents/GraphDatabaseTiein/ChangeLog
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/GraphDatabaseTiein/DEPS b/include/ezcomponents/GraphDatabaseTiein/DEPS
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/GraphDatabaseTiein/DESCRIPTION b/include/ezcomponents/GraphDatabaseTiein/DESCRIPTION
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/GraphDatabaseTiein/TODO b/include/ezcomponents/GraphDatabaseTiein/TODO
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/GraphDatabaseTiein/design/class_diagram.png b/include/ezcomponents/GraphDatabaseTiein/design/class_diagram.png
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/GraphDatabaseTiein/design/design.txt b/include/ezcomponents/GraphDatabaseTiein/design/design.txt
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/GraphDatabaseTiein/docs/img/tutorial_multiple.svg.png b/include/ezcomponents/GraphDatabaseTiein/docs/img/tutorial_multiple.svg.png
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/GraphDatabaseTiein/docs/img/tutorial_simple.svg.png b/include/ezcomponents/GraphDatabaseTiein/docs/img/tutorial_simple.svg.png
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/GraphDatabaseTiein/docs/img/tutorial_single.svg.png b/include/ezcomponents/GraphDatabaseTiein/docs/img/tutorial_single.svg.png
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/GraphDatabaseTiein/docs/tutorial.txt b/include/ezcomponents/GraphDatabaseTiein/docs/tutorial.txt
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/GraphDatabaseTiein/docs/tutorial/tutorial_autoload.php b/include/ezcomponents/GraphDatabaseTiein/docs/tutorial/tutorial_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/GraphDatabaseTiein/docs/tutorial/tutorial_insert_data.php b/include/ezcomponents/GraphDatabaseTiein/docs/tutorial/tutorial_insert_data.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/GraphDatabaseTiein/docs/tutorial/tutorial_multiple.php b/include/ezcomponents/GraphDatabaseTiein/docs/tutorial/tutorial_multiple.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/GraphDatabaseTiein/docs/tutorial/tutorial_simple.php b/include/ezcomponents/GraphDatabaseTiein/docs/tutorial/tutorial_simple.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/GraphDatabaseTiein/docs/tutorial/tutorial_single.php b/include/ezcomponents/GraphDatabaseTiein/docs/tutorial/tutorial_single.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/GraphDatabaseTiein/src/dataset.php b/include/ezcomponents/GraphDatabaseTiein/src/dataset.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/GraphDatabaseTiein/src/exceptions/exception.php b/include/ezcomponents/GraphDatabaseTiein/src/exceptions/exception.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/GraphDatabaseTiein/src/exceptions/missing_column.php b/include/ezcomponents/GraphDatabaseTiein/src/exceptions/missing_column.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/GraphDatabaseTiein/src/exceptions/statement_not_executed.php b/include/ezcomponents/GraphDatabaseTiein/src/exceptions/statement_not_executed.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/GraphDatabaseTiein/src/exceptions/too_many_columns.php b/include/ezcomponents/GraphDatabaseTiein/src/exceptions/too_many_columns.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/GraphDatabaseTiein/tests/dataset_pdo_test.php b/include/ezcomponents/GraphDatabaseTiein/tests/dataset_pdo_test.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/GraphDatabaseTiein/tests/suite.php b/include/ezcomponents/GraphDatabaseTiein/tests/suite.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageAnalysis/CREDITS b/include/ezcomponents/ImageAnalysis/CREDITS
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageAnalysis/ChangeLog b/include/ezcomponents/ImageAnalysis/ChangeLog
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageAnalysis/DESCRIPTION b/include/ezcomponents/ImageAnalysis/DESCRIPTION
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageAnalysis/design/class_diagram.png b/include/ezcomponents/ImageAnalysis/design/class_diagram.png
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageAnalysis/design/imageanalysis.png b/include/ezcomponents/ImageAnalysis/design/imageanalysis.png
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageAnalysis/design/imageanalysis.xml b/include/ezcomponents/ImageAnalysis/design/imageanalysis.xml
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageAnalysis/docs/example.php b/include/ezcomponents/ImageAnalysis/docs/example.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageAnalysis/docs/img/imageanalysis_example_01.jpg b/include/ezcomponents/ImageAnalysis/docs/img/imageanalysis_example_01.jpg
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageAnalysis/docs/img/imageanalysis_example_02.jpg b/include/ezcomponents/ImageAnalysis/docs/img/imageanalysis_example_02.jpg
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageAnalysis/docs/img/imageanalysis_example_03.jpg b/include/ezcomponents/ImageAnalysis/docs/img/imageanalysis_example_03.jpg
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageAnalysis/docs/toby.jpg b/include/ezcomponents/ImageAnalysis/docs/toby.jpg
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageAnalysis/docs/tutorial.txt b/include/ezcomponents/ImageAnalysis/docs/tutorial.txt
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageAnalysis/docs/tutorial_autoload.php b/include/ezcomponents/ImageAnalysis/docs/tutorial_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageAnalysis/docs/tutorial_example_01.php b/include/ezcomponents/ImageAnalysis/docs/tutorial_example_01.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageAnalysis/docs/tutorial_example_02.php b/include/ezcomponents/ImageAnalysis/docs/tutorial_example_02.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageAnalysis/docs/tutorial_example_03.php b/include/ezcomponents/ImageAnalysis/docs/tutorial_example_03.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageAnalysis/src/analyzer.php b/include/ezcomponents/ImageAnalysis/src/analyzer.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageAnalysis/src/exceptions/exception.php b/include/ezcomponents/ImageAnalysis/src/exceptions/exception.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageAnalysis/src/exceptions/file_not_processable.php b/include/ezcomponents/ImageAnalysis/src/exceptions/file_not_processable.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageAnalysis/src/exceptions/invalid_handler.php b/include/ezcomponents/ImageAnalysis/src/exceptions/invalid_handler.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageAnalysis/src/handlers/imagemagick.php b/include/ezcomponents/ImageAnalysis/src/handlers/imagemagick.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageAnalysis/src/handlers/php.php b/include/ezcomponents/ImageAnalysis/src/handlers/php.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageAnalysis/src/interfaces/handler.php b/include/ezcomponents/ImageAnalysis/src/interfaces/handler.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageAnalysis/src/structs/analyzer_data.php b/include/ezcomponents/ImageAnalysis/src/structs/analyzer_data.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageAnalysis/tests/analyzer_test.php b/include/ezcomponents/ImageAnalysis/tests/analyzer_test.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageAnalysis/tests/data/gif_animated.gif b/include/ezcomponents/ImageAnalysis/tests/data/gif_animated.gif
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageAnalysis/tests/data/gif_nonanimated.gif b/include/ezcomponents/ImageAnalysis/tests/data/gif_nonanimated.gif
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageAnalysis/tests/data/jpeg_exif.jpg b/include/ezcomponents/ImageAnalysis/tests/data/jpeg_exif.jpg
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageAnalysis/tests/data/jpeg_noexif.jpg b/include/ezcomponents/ImageAnalysis/tests/data/jpeg_noexif.jpg
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageAnalysis/tests/data/png_nonanimated.png b/include/ezcomponents/ImageAnalysis/tests/data/png_nonanimated.png
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageAnalysis/tests/data/svg.svg b/include/ezcomponents/ImageAnalysis/tests/data/svg.svg
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageAnalysis/tests/data/tiff_exif.tiff b/include/ezcomponents/ImageAnalysis/tests/data/tiff_exif.tiff
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageAnalysis/tests/data/tiff_noexif.tiff b/include/ezcomponents/ImageAnalysis/tests/data/tiff_noexif.tiff
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageAnalysis/tests/suite.php b/include/ezcomponents/ImageAnalysis/tests/suite.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/CREDITS b/include/ezcomponents/ImageConversion/CREDITS
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/ChangeLog b/include/ezcomponents/ImageConversion/ChangeLog
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/DEPS b/include/ezcomponents/ImageConversion/DEPS
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/DESCRIPTION b/include/ezcomponents/ImageConversion/DESCRIPTION
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/TODO b/include/ezcomponents/ImageConversion/TODO
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/design/class_diagram.png b/include/ezcomponents/ImageConversion/design/class_diagram.png
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/design/design.htm b/include/ezcomponents/ImageConversion/design/design.htm
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/design/design.txt b/include/ezcomponents/ImageConversion/design/design.txt
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/design/image.png b/include/ezcomponents/ImageConversion/design/image.png
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/design/image.xml b/include/ezcomponents/ImageConversion/design/image.xml
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/design/image_exceptions.png b/include/ezcomponents/ImageConversion/design/image_exceptions.png
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/design/image_filters.png b/include/ezcomponents/ImageConversion/design/image_filters.png
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/docs/example_general.php b/include/ezcomponents/ImageConversion/docs/example_general.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/docs/example_singleton.php b/include/ezcomponents/ImageConversion/docs/example_singleton.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/docs/img/imageconversion_example_01_after.jpg b/include/ezcomponents/ImageConversion/docs/img/imageconversion_example_01_after.jpg
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/docs/img/imageconversion_example_01_before.bmp b/include/ezcomponents/ImageConversion/docs/img/imageconversion_example_01_before.bmp
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/docs/img/imageconversion_example_02_after.jpg b/include/ezcomponents/ImageConversion/docs/img/imageconversion_example_02_after.jpg
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/docs/img/imageconversion_example_02_before.jpg b/include/ezcomponents/ImageConversion/docs/img/imageconversion_example_02_before.jpg
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/docs/img/imageconversion_example_03_after.jpg b/include/ezcomponents/ImageConversion/docs/img/imageconversion_example_03_after.jpg
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/docs/img/imageconversion_example_03_before.jpg b/include/ezcomponents/ImageConversion/docs/img/imageconversion_example_03_before.jpg
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/docs/img/imageconversion_example_04_after.jpg b/include/ezcomponents/ImageConversion/docs/img/imageconversion_example_04_after.jpg
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/docs/img/imageconversion_example_04_before.jpg b/include/ezcomponents/ImageConversion/docs/img/imageconversion_example_04_before.jpg
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/docs/img/imageconversion_example_05_after.jpg b/include/ezcomponents/ImageConversion/docs/img/imageconversion_example_05_after.jpg
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/docs/img/imageconversion_example_05_before.jpg b/include/ezcomponents/ImageConversion/docs/img/imageconversion_example_05_before.jpg
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/docs/img/watermark.png b/include/ezcomponents/ImageConversion/docs/img/watermark.png
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/docs/jpeg.jpg b/include/ezcomponents/ImageConversion/docs/jpeg.jpg
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/docs/tutorial.txt b/include/ezcomponents/ImageConversion/docs/tutorial.txt
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/docs/tutorial_autoload.php b/include/ezcomponents/ImageConversion/docs/tutorial_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/docs/tutorial_example_01_simpleconvert.php b/include/ezcomponents/ImageConversion/docs/tutorial_example_01_simpleconvert.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/docs/tutorial_example_02_simpletrans.php b/include/ezcomponents/ImageConversion/docs/tutorial_example_02_simpletrans.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/docs/tutorial_example_03_complextrans.php b/include/ezcomponents/ImageConversion/docs/tutorial_example_03_complextrans.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/docs/tutorial_example_04_watermark.php b/include/ezcomponents/ImageConversion/docs/tutorial_example_04_watermark.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/docs/tutorial_example_05_thumbnail.php b/include/ezcomponents/ImageConversion/docs/tutorial_example_05_thumbnail.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/review-1.3.4.txt b/include/ezcomponents/ImageConversion/review-1.3.4.txt
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/src/converter.php b/include/ezcomponents/ImageConversion/src/converter.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/src/exceptions/exception.php b/include/ezcomponents/ImageConversion/src/exceptions/exception.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/src/exceptions/file_name_invalid.php b/include/ezcomponents/ImageConversion/src/exceptions/file_name_invalid.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/src/exceptions/file_not_processable.php b/include/ezcomponents/ImageConversion/src/exceptions/file_not_processable.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/src/exceptions/filter_failed.php b/include/ezcomponents/ImageConversion/src/exceptions/filter_failed.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/src/exceptions/filter_not_available.php b/include/ezcomponents/ImageConversion/src/exceptions/filter_not_available.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/src/exceptions/handler_not_available.php b/include/ezcomponents/ImageConversion/src/exceptions/handler_not_available.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/src/exceptions/handler_settings_invalid.php b/include/ezcomponents/ImageConversion/src/exceptions/handler_settings_invalid.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/src/exceptions/invalid_filter_parameter.php b/include/ezcomponents/ImageConversion/src/exceptions/invalid_filter_parameter.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/src/exceptions/invalid_reference.php b/include/ezcomponents/ImageConversion/src/exceptions/invalid_reference.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/src/exceptions/mime_type_unsupported.php b/include/ezcomponents/ImageConversion/src/exceptions/mime_type_unsupported.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/src/exceptions/missing_filter_parameter.php b/include/ezcomponents/ImageConversion/src/exceptions/missing_filter_parameter.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/src/exceptions/transformation.php b/include/ezcomponents/ImageConversion/src/exceptions/transformation.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/src/exceptions/transformation_already_exists.php b/include/ezcomponents/ImageConversion/src/exceptions/transformation_already_exists.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/src/exceptions/transformation_not_available.php b/include/ezcomponents/ImageConversion/src/exceptions/transformation_not_available.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/src/handlers/gd.php b/include/ezcomponents/ImageConversion/src/handlers/gd.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/src/handlers/gd_base.php b/include/ezcomponents/ImageConversion/src/handlers/gd_base.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/src/handlers/imagemagick.php b/include/ezcomponents/ImageConversion/src/handlers/imagemagick.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/src/handlers/imagemagick_base.php b/include/ezcomponents/ImageConversion/src/handlers/imagemagick_base.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/src/interfaces/colorspace.php b/include/ezcomponents/ImageConversion/src/interfaces/colorspace.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/src/interfaces/effect.php b/include/ezcomponents/ImageConversion/src/interfaces/effect.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/src/interfaces/geometry.php b/include/ezcomponents/ImageConversion/src/interfaces/geometry.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/src/interfaces/handler.php b/include/ezcomponents/ImageConversion/src/interfaces/handler.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/src/interfaces/methodcall_handler.php b/include/ezcomponents/ImageConversion/src/interfaces/methodcall_handler.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/src/interfaces/thumbnail.php b/include/ezcomponents/ImageConversion/src/interfaces/thumbnail.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/src/interfaces/watermark.php b/include/ezcomponents/ImageConversion/src/interfaces/watermark.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/src/options/save_options.php b/include/ezcomponents/ImageConversion/src/options/save_options.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/src/structs/converter_settings.php b/include/ezcomponents/ImageConversion/src/structs/converter_settings.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/src/structs/filter.php b/include/ezcomponents/ImageConversion/src/structs/filter.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/src/structs/handler_settings.php b/include/ezcomponents/ImageConversion/src/structs/handler_settings.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/src/transformation.php b/include/ezcomponents/ImageConversion/src/transformation.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/converter_test.php b/include/ezcomponents/ImageConversion/tests/converter_test.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionConverterTest_testApplyFilterSuccessColorspace b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionConverterTest_testApplyFilterSuccessColorspace
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionConverterTest_testApplyFilterSuccessColorspaceDefinedHandler b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionConverterTest_testApplyFilterSuccessColorspaceDefinedHandler
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionConverterTest_testApplyFilterSuccessScale b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionConverterTest_testApplyFilterSuccessScale
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testColorspaceGrey b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testColorspaceGrey
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testColorspaceMonochrome b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testColorspaceMonochrome
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testColorspaceSepia b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testColorspaceSepia
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCropNegativeOffset_1 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCropNegativeOffset_1
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCropNegativeOffset_2 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCropNegativeOffset_2
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCropNegativeOffset_3 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCropNegativeOffset_3
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCropThumbnailHorizontal b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCropThumbnailHorizontal
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCropThumbnailVertical b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCropThumbnailVertical
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCropTransparent b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCropTransparent
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCrop_0_Offset b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCrop_0_Offset
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCrop_1 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCrop_1
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCrop_2 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCrop_2
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCrop_3 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCrop_3
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCrop_4 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testCrop_4
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testFillThumbnailHorizontal b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testFillThumbnailHorizontal
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testFillThumbnailTooLargeColorArray b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testFillThumbnailTooLargeColorArray
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testFillThumbnailVertical b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testFillThumbnailVertical
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testScaleTransparent b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testScaleTransparent
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testWatermarkAbsoluteNoScale b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testWatermarkAbsoluteNoScale
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testWatermarkAbsoluteScale b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testWatermarkAbsoluteScale
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testWatermarkPercentNoScale b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testWatermarkPercentNoScale
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testWatermarkPercentScale b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersGdTest_testWatermarkPercentScale
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testBorder_2 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testBorder_2
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testBorder_5 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testBorder_5
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testColorspaceGrey b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testColorspaceGrey
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testColorspaceMonochrome b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testColorspaceMonochrome
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testColorspaceSepia b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testColorspaceSepia
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCropNegativeOffset_1 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCropNegativeOffset_1
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCropNegativeOffset_2 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCropNegativeOffset_2
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCropNegativeOffset_3 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCropNegativeOffset_3
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCropThumbnailHorizontal b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCropThumbnailHorizontal
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCropThumbnailVertical b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCropThumbnailVertical
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCrop_0_Offset b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCrop_0_Offset
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCrop_1 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCrop_1
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCrop_2 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCrop_2
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCrop_3 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testCrop_3
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testFillThumbnailHorizontal b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testFillThumbnailHorizontal
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testFillThumbnailTooLargeColorArray b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testFillThumbnailTooLargeColorArray
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testFillThumbnailVertical b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testFillThumbnailVertical
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testNoiseGaussian b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testNoiseGaussian
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testNoiseImpulse b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testNoiseImpulse
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testNoiseLaplacian b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testNoiseLaplacian
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testNoiseMultiplicative b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testNoiseMultiplicative
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testNoisePoisson b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testNoisePoisson
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testNoiseUniform b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testNoiseUniform
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScale b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScale
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleDown_do b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleDown_do
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleDown_dont b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleDown_dont
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleExact_1 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleExact_1
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleExact_2 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleExact_2
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleExact_3 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleExact_3
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleHeightDown_1 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleHeightDown_1
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleHeightDown_2 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleHeightDown_2
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleHeightUp_1 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleHeightUp_1
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleHeightUp_2 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleHeightUp_2
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScalePercent_1 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScalePercent_1
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScalePercent_2 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScalePercent_2
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleUp_do b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleUp_do
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleUp_dont b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleUp_dont
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleWidthBoth b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleWidthBoth
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleWidthDown_1 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleWidthDown_1
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleWidthDown_2 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleWidthDown_2
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleWidthUp_1 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleWidthUp_1
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleWidthUp_2 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testScaleWidthUp_2
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testSwirl_10 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testSwirl_10
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testSwirl_100 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testSwirl_100
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testSwirl_50 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testSwirl_50
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testWatermarkAbsoluteNoScale b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testWatermarkAbsoluteNoScale
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testWatermarkAbsoluteScale b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testWatermarkAbsoluteScale
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testWatermarkPercentNoScale b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testWatermarkPercentNoScale
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testWatermarkPercentScale b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionFiltersShellTest_testWatermarkPercentScale
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerGdTest_testApplyFilterMultiple b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerGdTest_testApplyFilterMultiple
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerGdTest_testApplyFilterSingle b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerGdTest_testApplyFilterSingle
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerGdTest_testConvertTransparentNonTransparent b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerGdTest_testConvertTransparentNonTransparent
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerGdTest_testSaveNewfileConvert b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerGdTest_testSaveNewfileConvert
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerGdTest_testSaveNewfileNoconvert b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerGdTest_testSaveNewfileNoconvert
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerGdTest_testSaveOldfileNoconvert b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerGdTest_testSaveOldfileNoconvert
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerShellTest_testApplyFilterMultiple b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerShellTest_testApplyFilterMultiple
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerShellTest_testApplyFilterSingle b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerShellTest_testApplyFilterSingle
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerShellTest_testConvertTransparentNonTransparent b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerShellTest_testConvertTransparentNonTransparent
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerTest_testSaveIllegalFileNameFailure b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerTest_testSaveIllegalFileNameFailure
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerTest_testSaveNewfileConvert b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerTest_testSaveNewfileConvert
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerTest_testSaveNewfileNoconvert b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerTest_testSaveNewfileNoconvert
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerTest_testSaveOldfileNoconvert b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionHandlerTest_testSaveOldfileNoconvert
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testMultiTransformjpeg b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testMultiTransformjpeg
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testMultiTransformpng b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testMultiTransformpng
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessGifAnimated b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessGifAnimated
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessGif_1 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessGif_1
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessGif_2 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessGif_2
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessGif_3 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessGif_3
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessJpeg_1 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessJpeg_1
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessJpeg_2 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessJpeg_2
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessJpeg_3 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessJpeg_3
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessPng_1 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessPng_1
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessPng_2 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessPng_2
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessPng_3 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessPng_3
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessPng_4 b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformSuccessPng_4
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformationChangingHandlersForFilters b/include/ezcomponents/ImageConversion/tests/data/compare/ezcImageConversionTransformationTest_testTransformationChangingHandlersForFilters
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/gif_animated.gif b/include/ezcomponents/ImageConversion/tests/data/gif_animated.gif
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/gif_nonanimated.gif b/include/ezcomponents/ImageConversion/tests/data/gif_nonanimated.gif
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/jpeg.jpg b/include/ezcomponents/ImageConversion/tests/data/jpeg.jpg
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/png.png b/include/ezcomponents/ImageConversion/tests/data/png.png
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/png_transparent.png b/include/ezcomponents/ImageConversion/tests/data/png_transparent.png
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/text.txt b/include/ezcomponents/ImageConversion/tests/data/text.txt
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/watermark.png b/include/ezcomponents/ImageConversion/tests/data/watermark.png
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/data/xpm.xpm b/include/ezcomponents/ImageConversion/tests/data/xpm.xpm
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/filtersgd_test.php b/include/ezcomponents/ImageConversion/tests/filtersgd_test.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/filtersshell_test.php b/include/ezcomponents/ImageConversion/tests/filtersshell_test.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/handler_test.php b/include/ezcomponents/ImageConversion/tests/handler_test.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/handlergd_test.php b/include/ezcomponents/ImageConversion/tests/handlergd_test.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/handlershell_test.php b/include/ezcomponents/ImageConversion/tests/handlershell_test.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/save_options_test.php b/include/ezcomponents/ImageConversion/tests/save_options_test.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/suite.php b/include/ezcomponents/ImageConversion/tests/suite.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/test_case.php b/include/ezcomponents/ImageConversion/tests/test_case.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/ImageConversion/tests/transformation_test.php b/include/ezcomponents/ImageConversion/tests/transformation_test.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/LICENSE b/include/ezcomponents/LICENSE
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/autoload/archive_autoload.php b/include/ezcomponents/autoload/archive_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/autoload/authentication_autoload.php b/include/ezcomponents/autoload/authentication_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/autoload/authentication_database_autoload.php b/include/ezcomponents/autoload/authentication_database_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/autoload/authentication_openid_autoload.php b/include/ezcomponents/autoload/authentication_openid_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/autoload/base_autoload.php b/include/ezcomponents/autoload/base_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/autoload/cache_autoload.php b/include/ezcomponents/autoload/cache_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/autoload/configuration_autoload.php b/include/ezcomponents/autoload/configuration_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/autoload/console_autoload.php b/include/ezcomponents/autoload/console_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/autoload/db_autoload.php b/include/ezcomponents/autoload/db_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/autoload/db_schema_autoload.php b/include/ezcomponents/autoload/db_schema_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/autoload/debug_autoload.php b/include/ezcomponents/autoload/debug_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/autoload/document_autoload.php b/include/ezcomponents/autoload/document_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/autoload/execution_autoload.php b/include/ezcomponents/autoload/execution_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/autoload/feed_autoload.php b/include/ezcomponents/autoload/feed_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/autoload/file_autoload.php b/include/ezcomponents/autoload/file_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/autoload/graph_autoload.php b/include/ezcomponents/autoload/graph_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/autoload/graph_database_autoload.php b/include/ezcomponents/autoload/graph_database_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/autoload/image_analyzer_autoload.php b/include/ezcomponents/autoload/image_analyzer_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/autoload/image_autoload.php b/include/ezcomponents/autoload/image_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/autoload/input_autoload.php b/include/ezcomponents/autoload/input_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/autoload/log_autoload.php b/include/ezcomponents/autoload/log_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/autoload/log_database_autoload.php b/include/ezcomponents/autoload/log_database_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/autoload/mail_autoload.php b/include/ezcomponents/autoload/mail_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/autoload/persistent_autoload.php b/include/ezcomponents/autoload/persistent_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/autoload/persistent_object_autoload.php b/include/ezcomponents/autoload/persistent_object_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/autoload/php_generator_autoload.php b/include/ezcomponents/autoload/php_generator_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/autoload/query_autoload.php b/include/ezcomponents/autoload/query_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/autoload/search_autoload.php b/include/ezcomponents/autoload/search_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/autoload/signal_autoload.php b/include/ezcomponents/autoload/signal_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/autoload/system_autoload.php b/include/ezcomponents/autoload/system_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/autoload/template_autoload.php b/include/ezcomponents/autoload/template_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/autoload/template_translation_autoload.php b/include/ezcomponents/autoload/template_translation_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/autoload/translation_autoload.php b/include/ezcomponents/autoload/translation_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/autoload/translation_cache_autoload.php b/include/ezcomponents/autoload/translation_cache_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/autoload/tree_autoload.php b/include/ezcomponents/autoload/tree_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/autoload/tree_db_autoload.php b/include/ezcomponents/autoload/tree_db_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/autoload/tree_persistent_autoload.php b/include/ezcomponents/autoload/tree_persistent_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/autoload/url_autoload.php b/include/ezcomponents/autoload/url_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/autoload/webdav_autoload.php b/include/ezcomponents/autoload/webdav_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/autoload/workflow_autoload.php b/include/ezcomponents/autoload/workflow_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/autoload/workflow_database_autoload.php b/include/ezcomponents/autoload/workflow_database_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/autoload/workflow_event_autoload.php b/include/ezcomponents/autoload/workflow_event_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/autoload/workflow_signal_autoload.php b/include/ezcomponents/autoload/workflow_signal_autoload.php
old mode 100755
new mode 100644
diff --git a/include/ezcomponents/descriptions.txt b/include/ezcomponents/descriptions.txt
old mode 100755
new mode 100644
diff --git a/include/fachbereich.class.php b/include/fachbereich.class.php
old mode 100755
new mode 100644
diff --git a/include/feedback.class.php b/include/feedback.class.php
old mode 100755
new mode 100644
diff --git a/include/ferien.class.php b/include/ferien.class.php
old mode 100755
new mode 100644
diff --git a/include/filter.class.php b/include/filter.class.php
old mode 100755
new mode 100644
diff --git a/include/firma.class.php b/include/firma.class.php
old mode 100755
new mode 100644
diff --git a/include/fonts/glyphicons-halflings-regular.eot b/include/fonts/glyphicons-halflings-regular.eot
old mode 100755
new mode 100644
diff --git a/include/fonts/glyphicons-halflings-regular.svg b/include/fonts/glyphicons-halflings-regular.svg
old mode 100755
new mode 100644
diff --git a/include/fonts/glyphicons-halflings-regular.ttf b/include/fonts/glyphicons-halflings-regular.ttf
old mode 100755
new mode 100644
diff --git a/include/fonts/glyphicons-halflings-regular.woff b/include/fonts/glyphicons-halflings-regular.woff
old mode 100755
new mode 100644
diff --git a/include/fotostatus.class.php b/include/fotostatus.class.php
old mode 100755
new mode 100644
diff --git a/include/frage.class.php b/include/frage.class.php
old mode 100755
new mode 100644
diff --git a/include/freebusy.class.php b/include/freebusy.class.php
old mode 100755
new mode 100644
diff --git a/include/functions.inc.php b/include/functions.inc.php
old mode 100755
new mode 100644
diff --git a/include/funktion.class.php b/include/funktion.class.php
old mode 100755
new mode 100644
diff --git a/include/gantt.class.php b/include/gantt.class.php
old mode 100755
new mode 100644
diff --git a/include/gebiet.class.php b/include/gebiet.class.php
old mode 100755
new mode 100644
diff --git a/include/gemeinde.class.php b/include/gemeinde.class.php
old mode 100755
new mode 100644
diff --git a/include/geschaeftsjahr.class.php b/include/geschaeftsjahr.class.php
old mode 100755
new mode 100644
diff --git a/include/geschlecht.class.php b/include/geschlecht.class.php
old mode 100755
new mode 100644
diff --git a/include/globals.inc.php b/include/globals.inc.php
old mode 100755
new mode 100644
diff --git a/include/gruppe.class.php b/include/gruppe.class.php
old mode 100755
new mode 100644
diff --git a/include/gruppemanager.class.php b/include/gruppemanager.class.php
old mode 100755
new mode 100644
diff --git a/include/gsprogramm.class.php b/include/gsprogramm.class.php
old mode 100755
new mode 100644
diff --git a/include/ical.class.php b/include/ical.class.php
old mode 100755
new mode 100644
diff --git a/include/index.html b/include/index.html
old mode 100755
new mode 100644
diff --git a/include/infoscreen.class.php b/include/infoscreen.class.php
old mode 100755
new mode 100644
diff --git a/include/jahresplan.class.php b/include/jahresplan.class.php
old mode 100755
new mode 100644
diff --git a/include/js/JSONeditor/JSONeditor.html b/include/js/JSONeditor/JSONeditor.html
old mode 100755
new mode 100644
diff --git a/include/js/JSONeditor/JSONeditor.js b/include/js/JSONeditor/JSONeditor.js
old mode 100755
new mode 100644
diff --git a/include/js/JSONeditor/treeBuilderImages/Thumbs.db b/include/js/JSONeditor/treeBuilderImages/Thumbs.db
old mode 100755
new mode 100644
diff --git a/include/js/JSONeditor/treeBuilderImages/doc.gif b/include/js/JSONeditor/treeBuilderImages/doc.gif
old mode 100755
new mode 100644
diff --git a/include/js/JSONeditor/treeBuilderImages/docNode.gif b/include/js/JSONeditor/treeBuilderImages/docNode.gif
old mode 100755
new mode 100644
diff --git a/include/js/JSONeditor/treeBuilderImages/docNodeLast.gif b/include/js/JSONeditor/treeBuilderImages/docNodeLast.gif
old mode 100755
new mode 100644
diff --git a/include/js/JSONeditor/treeBuilderImages/docNodeLastFirst.gif b/include/js/JSONeditor/treeBuilderImages/docNodeLastFirst.gif
old mode 100755
new mode 100644
diff --git a/include/js/JSONeditor/treeBuilderImages/folder.gif b/include/js/JSONeditor/treeBuilderImages/folder.gif
old mode 100755
new mode 100644
diff --git a/include/js/JSONeditor/treeBuilderImages/folderNode.gif b/include/js/JSONeditor/treeBuilderImages/folderNode.gif
old mode 100755
new mode 100644
diff --git a/include/js/JSONeditor/treeBuilderImages/folderNodeFirst.gif b/include/js/JSONeditor/treeBuilderImages/folderNodeFirst.gif
old mode 100755
new mode 100644
diff --git a/include/js/JSONeditor/treeBuilderImages/folderNodeLast.gif b/include/js/JSONeditor/treeBuilderImages/folderNodeLast.gif
old mode 100755
new mode 100644
diff --git a/include/js/JSONeditor/treeBuilderImages/folderNodeLastFirst.gif b/include/js/JSONeditor/treeBuilderImages/folderNodeLastFirst.gif
old mode 100755
new mode 100644
diff --git a/include/js/JSONeditor/treeBuilderImages/folderNodeOpen.gif b/include/js/JSONeditor/treeBuilderImages/folderNodeOpen.gif
old mode 100755
new mode 100644
diff --git a/include/js/JSONeditor/treeBuilderImages/folderNodeOpenFirst.gif b/include/js/JSONeditor/treeBuilderImages/folderNodeOpenFirst.gif
old mode 100755
new mode 100644
diff --git a/include/js/JSONeditor/treeBuilderImages/folderNodeOpenLast.gif b/include/js/JSONeditor/treeBuilderImages/folderNodeOpenLast.gif
old mode 100755
new mode 100644
diff --git a/include/js/JSONeditor/treeBuilderImages/folderNodeOpenLastFirst.gif b/include/js/JSONeditor/treeBuilderImages/folderNodeOpenLastFirst.gif
old mode 100755
new mode 100644
diff --git a/include/js/JSONeditor/treeBuilderImages/folderOpen.gif b/include/js/JSONeditor/treeBuilderImages/folderOpen.gif
old mode 100755
new mode 100644
diff --git a/include/js/JSONeditor/treeBuilderImages/vertLine.gif b/include/js/JSONeditor/treeBuilderImages/vertLine.gif
old mode 100755
new mode 100644
diff --git a/include/js/colorpicker.js b/include/js/colorpicker.js
old mode 100755
new mode 100644
diff --git a/include/js/cropper.js b/include/js/cropper.js
old mode 100755
new mode 100644
diff --git a/include/js/croppie.js b/include/js/croppie.js
old mode 100755
new mode 100644
diff --git a/include/js/datecheck.js b/include/js/datecheck.js
old mode 100755
new mode 100644
diff --git a/include/js/fullcalendar/fullcalendar.css b/include/js/fullcalendar/fullcalendar.css
old mode 100755
new mode 100644
diff --git a/include/js/fullcalendar/fullcalendar.js b/include/js/fullcalendar/fullcalendar.js
old mode 100755
new mode 100644
diff --git a/include/js/fullcalendar/fullcalendar.min.js b/include/js/fullcalendar/fullcalendar.min.js
old mode 100755
new mode 100644
diff --git a/include/js/fullcalendar/fullcalendar.print.css b/include/js/fullcalendar/fullcalendar.print.css
old mode 100755
new mode 100644
diff --git a/include/js/fullcalendar/gcal.js b/include/js/fullcalendar/gcal.js
old mode 100755
new mode 100644
diff --git a/include/js/jqSOAPClient.js b/include/js/jqSOAPClient.js
old mode 100755
new mode 100644
diff --git a/include/js/jqXMLUtils.js b/include/js/jqXMLUtils.js
old mode 100755
new mode 100644
diff --git a/include/js/jquery.contextmenu.r2.js b/include/js/jquery.contextmenu.r2.js
old mode 100755
new mode 100644
diff --git a/include/js/jquery.js b/include/js/jquery.js
old mode 100755
new mode 100644
diff --git a/include/js/jquery.ui.datepicker.translation.js b/include/js/jquery.ui.datepicker.translation.js
old mode 100755
new mode 100644
diff --git a/include/js/jstree/README.txt b/include/js/jstree/README.txt
old mode 100755
new mode 100644
diff --git a/include/js/jstree/_docs/!style.css b/include/js/jstree/_docs/!style.css
old mode 100755
new mode 100644
diff --git a/include/js/jstree/_docs/_drive.png b/include/js/jstree/_docs/_drive.png
old mode 100755
new mode 100644
diff --git a/include/js/jstree/_docs/_html_data.html b/include/js/jstree/_docs/_html_data.html
old mode 100755
new mode 100644
diff --git a/include/js/jstree/_docs/_json_data.json b/include/js/jstree/_docs/_json_data.json
old mode 100755
new mode 100644
diff --git a/include/js/jstree/_docs/_search_data.json b/include/js/jstree/_docs/_search_data.json
old mode 100755
new mode 100644
diff --git a/include/js/jstree/_docs/_search_result.json b/include/js/jstree/_docs/_search_result.json
old mode 100755
new mode 100644
diff --git a/include/js/jstree/_docs/_xml_flat.xml b/include/js/jstree/_docs/_xml_flat.xml
old mode 100755
new mode 100644
diff --git a/include/js/jstree/_docs/_xml_nest.xml b/include/js/jstree/_docs/_xml_nest.xml
old mode 100755
new mode 100644
diff --git a/include/js/jstree/_docs/checkbox.html b/include/js/jstree/_docs/checkbox.html
old mode 100755
new mode 100644
diff --git a/include/js/jstree/_docs/contextmenu.html b/include/js/jstree/_docs/contextmenu.html
old mode 100755
new mode 100644
diff --git a/include/js/jstree/_docs/cookies.html b/include/js/jstree/_docs/cookies.html
old mode 100755
new mode 100644
diff --git a/include/js/jstree/_docs/core.html b/include/js/jstree/_docs/core.html
old mode 100755
new mode 100644
diff --git a/include/js/jstree/_docs/crrm.html b/include/js/jstree/_docs/crrm.html
old mode 100755
new mode 100644
diff --git a/include/js/jstree/_docs/dnd.html b/include/js/jstree/_docs/dnd.html
old mode 100755
new mode 100644
diff --git a/include/js/jstree/_docs/hotkeys.html b/include/js/jstree/_docs/hotkeys.html
old mode 100755
new mode 100644
diff --git a/include/js/jstree/_docs/html_data.html b/include/js/jstree/_docs/html_data.html
old mode 100755
new mode 100644
diff --git a/include/js/jstree/_docs/index.html b/include/js/jstree/_docs/index.html
old mode 100755
new mode 100644
diff --git a/include/js/jstree/_docs/json_data.html b/include/js/jstree/_docs/json_data.html
old mode 100755
new mode 100644
diff --git a/include/js/jstree/_docs/languages.html b/include/js/jstree/_docs/languages.html
old mode 100755
new mode 100644
diff --git a/include/js/jstree/_docs/logo.png b/include/js/jstree/_docs/logo.png
old mode 100755
new mode 100644
diff --git a/include/js/jstree/_docs/search.html b/include/js/jstree/_docs/search.html
old mode 100755
new mode 100644
diff --git a/include/js/jstree/_docs/sort.html b/include/js/jstree/_docs/sort.html
old mode 100755
new mode 100644
diff --git a/include/js/jstree/_docs/syntax/!script.js b/include/js/jstree/_docs/syntax/!script.js
old mode 100755
new mode 100644
diff --git a/include/js/jstree/_docs/syntax/!style.css b/include/js/jstree/_docs/syntax/!style.css
old mode 100755
new mode 100644
diff --git a/include/js/jstree/_docs/syntax/clipboard.swf b/include/js/jstree/_docs/syntax/clipboard.swf
old mode 100755
new mode 100644
diff --git a/include/js/jstree/_docs/syntax/help.png b/include/js/jstree/_docs/syntax/help.png
old mode 100755
new mode 100644
diff --git a/include/js/jstree/_docs/syntax/magnifier.png b/include/js/jstree/_docs/syntax/magnifier.png
old mode 100755
new mode 100644
diff --git a/include/js/jstree/_docs/syntax/page_white_code.png b/include/js/jstree/_docs/syntax/page_white_code.png
old mode 100755
new mode 100644
diff --git a/include/js/jstree/_docs/syntax/page_white_copy.png b/include/js/jstree/_docs/syntax/page_white_copy.png
old mode 100755
new mode 100644
diff --git a/include/js/jstree/_docs/syntax/printer.png b/include/js/jstree/_docs/syntax/printer.png
old mode 100755
new mode 100644
diff --git a/include/js/jstree/_docs/syntax/wrapping.png b/include/js/jstree/_docs/syntax/wrapping.png
old mode 100755
new mode 100644
diff --git a/include/js/jstree/_docs/themeroller.html b/include/js/jstree/_docs/themeroller.html
old mode 100755
new mode 100644
diff --git a/include/js/jstree/_docs/themes.html b/include/js/jstree/_docs/themes.html
old mode 100755
new mode 100644
diff --git a/include/js/jstree/_docs/types.html b/include/js/jstree/_docs/types.html
old mode 100755
new mode 100644
diff --git a/include/js/jstree/_docs/ui.html b/include/js/jstree/_docs/ui.html
old mode 100755
new mode 100644
diff --git a/include/js/jstree/_docs/unique.html b/include/js/jstree/_docs/unique.html
old mode 100755
new mode 100644
diff --git a/include/js/jstree/_docs/xml_data.html b/include/js/jstree/_docs/xml_data.html
old mode 100755
new mode 100644
diff --git a/include/js/jstree/_lib/jquery.cookie.js b/include/js/jstree/_lib/jquery.cookie.js
old mode 100755
new mode 100644
diff --git a/include/js/jstree/_lib/jquery.hotkeys.js b/include/js/jstree/_lib/jquery.hotkeys.js
old mode 100755
new mode 100644
diff --git a/include/js/jstree/_lib/jquery.js b/include/js/jstree/_lib/jquery.js
old mode 100755
new mode 100644
diff --git a/include/js/jstree/icons/lehrveranstaltung.png b/include/js/jstree/icons/lehrveranstaltung.png
old mode 100755
new mode 100644
diff --git a/include/js/jstree/icons/modul.png b/include/js/jstree/icons/modul.png
old mode 100755
new mode 100644
diff --git a/include/js/jstree/jquery.jstree.js b/include/js/jstree/jquery.jstree.js
old mode 100755
new mode 100644
diff --git a/include/js/jstree/themes/apple/bg.jpg b/include/js/jstree/themes/apple/bg.jpg
old mode 100755
new mode 100644
diff --git a/include/js/jstree/themes/apple/d.png b/include/js/jstree/themes/apple/d.png
old mode 100755
new mode 100644
diff --git a/include/js/jstree/themes/apple/dot_for_ie.gif b/include/js/jstree/themes/apple/dot_for_ie.gif
old mode 100755
new mode 100644
diff --git a/include/js/jstree/themes/apple/style.css b/include/js/jstree/themes/apple/style.css
old mode 100755
new mode 100644
diff --git a/include/js/jstree/themes/apple/throbber.gif b/include/js/jstree/themes/apple/throbber.gif
old mode 100755
new mode 100644
diff --git a/include/js/jstree/themes/classic/d.gif b/include/js/jstree/themes/classic/d.gif
old mode 100755
new mode 100644
diff --git a/include/js/jstree/themes/classic/d.png b/include/js/jstree/themes/classic/d.png
old mode 100755
new mode 100644
diff --git a/include/js/jstree/themes/classic/dot_for_ie.gif b/include/js/jstree/themes/classic/dot_for_ie.gif
old mode 100755
new mode 100644
diff --git a/include/js/jstree/themes/classic/style.css b/include/js/jstree/themes/classic/style.css
old mode 100755
new mode 100644
diff --git a/include/js/jstree/themes/classic/throbber.gif b/include/js/jstree/themes/classic/throbber.gif
old mode 100755
new mode 100644
diff --git a/include/js/jstree/themes/default-rtl/d.gif b/include/js/jstree/themes/default-rtl/d.gif
old mode 100755
new mode 100644
diff --git a/include/js/jstree/themes/default-rtl/d.png b/include/js/jstree/themes/default-rtl/d.png
old mode 100755
new mode 100644
diff --git a/include/js/jstree/themes/default-rtl/dots.gif b/include/js/jstree/themes/default-rtl/dots.gif
old mode 100755
new mode 100644
diff --git a/include/js/jstree/themes/default-rtl/style.css b/include/js/jstree/themes/default-rtl/style.css
old mode 100755
new mode 100644
diff --git a/include/js/jstree/themes/default-rtl/throbber.gif b/include/js/jstree/themes/default-rtl/throbber.gif
old mode 100755
new mode 100644
diff --git a/include/js/jstree/themes/default/d.gif b/include/js/jstree/themes/default/d.gif
old mode 100755
new mode 100644
diff --git a/include/js/jstree/themes/default/d.png b/include/js/jstree/themes/default/d.png
old mode 100755
new mode 100644
diff --git a/include/js/jstree/themes/default/style.css b/include/js/jstree/themes/default/style.css
old mode 100755
new mode 100644
diff --git a/include/js/jstree/themes/default/throbber.gif b/include/js/jstree/themes/default/throbber.gif
old mode 100755
new mode 100644
diff --git a/include/js/mailcheck.js b/include/js/mailcheck.js
old mode 100755
new mode 100644
diff --git a/include/js/tablesort/icons/01_ascending.gif b/include/js/tablesort/icons/01_ascending.gif
old mode 100755
new mode 100644
diff --git a/include/js/tablesort/icons/01_descending.gif b/include/js/tablesort/icons/01_descending.gif
old mode 100755
new mode 100644
diff --git a/include/js/tablesort/icons/01_unsorted.gif b/include/js/tablesort/icons/01_unsorted.gif
old mode 100755
new mode 100644
diff --git a/include/js/tablesort/table.css b/include/js/tablesort/table.css
old mode 100755
new mode 100644
diff --git a/include/js/tablesort/table.js b/include/js/tablesort/table.js
old mode 100755
new mode 100644
diff --git a/include/js/treeGrid/.gitignore b/include/js/treeGrid/.gitignore
old mode 100755
new mode 100644
diff --git a/include/js/treeGrid/CHANGELOG.txt b/include/js/treeGrid/CHANGELOG.txt
old mode 100755
new mode 100644
diff --git a/include/js/treeGrid/LICENSE b/include/js/treeGrid/LICENSE
old mode 100755
new mode 100644
diff --git a/include/js/treeGrid/README.md b/include/js/treeGrid/README.md
old mode 100755
new mode 100644
diff --git a/include/js/treeGrid/css/jquery.treegrid.css b/include/js/treeGrid/css/jquery.treegrid.css
old mode 100755
new mode 100644
diff --git a/include/js/treeGrid/examples/bootstrap-2.3.2/css/bootstrap-responsive.css b/include/js/treeGrid/examples/bootstrap-2.3.2/css/bootstrap-responsive.css
old mode 100755
new mode 100644
diff --git a/include/js/treeGrid/examples/bootstrap-2.3.2/css/bootstrap-responsive.min.css b/include/js/treeGrid/examples/bootstrap-2.3.2/css/bootstrap-responsive.min.css
old mode 100755
new mode 100644
diff --git a/include/js/treeGrid/examples/bootstrap-2.3.2/css/bootstrap.css b/include/js/treeGrid/examples/bootstrap-2.3.2/css/bootstrap.css
old mode 100755
new mode 100644
diff --git a/include/js/treeGrid/examples/bootstrap-2.3.2/css/bootstrap.min.css b/include/js/treeGrid/examples/bootstrap-2.3.2/css/bootstrap.min.css
old mode 100755
new mode 100644
diff --git a/include/js/treeGrid/examples/bootstrap-2.3.2/img/glyphicons-halflings-white.png b/include/js/treeGrid/examples/bootstrap-2.3.2/img/glyphicons-halflings-white.png
old mode 100755
new mode 100644
diff --git a/include/js/treeGrid/examples/bootstrap-2.3.2/img/glyphicons-halflings.png b/include/js/treeGrid/examples/bootstrap-2.3.2/img/glyphicons-halflings.png
old mode 100755
new mode 100644
diff --git a/include/js/treeGrid/examples/bootstrap-2.3.2/js/bootstrap.js b/include/js/treeGrid/examples/bootstrap-2.3.2/js/bootstrap.js
old mode 100755
new mode 100644
diff --git a/include/js/treeGrid/examples/bootstrap-2.3.2/js/bootstrap.min.js b/include/js/treeGrid/examples/bootstrap-2.3.2/js/bootstrap.min.js
old mode 100755
new mode 100644
diff --git a/include/js/treeGrid/examples/bootstrap-3.0.0/css/bootstrap-theme.css b/include/js/treeGrid/examples/bootstrap-3.0.0/css/bootstrap-theme.css
old mode 100755
new mode 100644
diff --git a/include/js/treeGrid/examples/bootstrap-3.0.0/css/bootstrap-theme.min.css b/include/js/treeGrid/examples/bootstrap-3.0.0/css/bootstrap-theme.min.css
old mode 100755
new mode 100644
diff --git a/include/js/treeGrid/examples/bootstrap-3.0.0/css/bootstrap.css b/include/js/treeGrid/examples/bootstrap-3.0.0/css/bootstrap.css
old mode 100755
new mode 100644
diff --git a/include/js/treeGrid/examples/bootstrap-3.0.0/css/bootstrap.min.css b/include/js/treeGrid/examples/bootstrap-3.0.0/css/bootstrap.min.css
old mode 100755
new mode 100644
diff --git a/include/js/treeGrid/examples/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.eot b/include/js/treeGrid/examples/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.eot
old mode 100755
new mode 100644
diff --git a/include/js/treeGrid/examples/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.svg b/include/js/treeGrid/examples/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.svg
old mode 100755
new mode 100644
diff --git a/include/js/treeGrid/examples/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.ttf b/include/js/treeGrid/examples/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.ttf
old mode 100755
new mode 100644
diff --git a/include/js/treeGrid/examples/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.woff b/include/js/treeGrid/examples/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.woff
old mode 100755
new mode 100644
diff --git a/include/js/treeGrid/examples/bootstrap-3.0.0/js/bootstrap.js b/include/js/treeGrid/examples/bootstrap-3.0.0/js/bootstrap.js
old mode 100755
new mode 100644
diff --git a/include/js/treeGrid/examples/bootstrap-3.0.0/js/bootstrap.min.js b/include/js/treeGrid/examples/bootstrap-3.0.0/js/bootstrap.min.js
old mode 100755
new mode 100644
diff --git a/include/js/treeGrid/examples/example-basic.html b/include/js/treeGrid/examples/example-basic.html
old mode 100755
new mode 100644
diff --git a/include/js/treeGrid/examples/example-bootstrap-2.html b/include/js/treeGrid/examples/example-bootstrap-2.html
old mode 100755
new mode 100644
diff --git a/include/js/treeGrid/examples/example-bootstrap-3.html b/include/js/treeGrid/examples/example-bootstrap-3.html
old mode 100755
new mode 100644
diff --git a/include/js/treeGrid/examples/example-column.html b/include/js/treeGrid/examples/example-column.html
old mode 100755
new mode 100644
diff --git a/include/js/treeGrid/examples/example-save-state.html b/include/js/treeGrid/examples/example-save-state.html
old mode 100755
new mode 100644
diff --git a/include/js/treeGrid/img/collapse.png b/include/js/treeGrid/img/collapse.png
old mode 100755
new mode 100644
diff --git a/include/js/treeGrid/img/expand.png b/include/js/treeGrid/img/expand.png
old mode 100755
new mode 100644
diff --git a/include/js/treeGrid/img/file.png b/include/js/treeGrid/img/file.png
old mode 100755
new mode 100644
diff --git a/include/js/treeGrid/img/folder.png b/include/js/treeGrid/img/folder.png
old mode 100755
new mode 100644
diff --git a/include/js/treeGrid/index.html b/include/js/treeGrid/index.html
old mode 100755
new mode 100644
diff --git a/include/js/treeGrid/js/jquery-1.10.2.js b/include/js/treeGrid/js/jquery-1.10.2.js
old mode 100755
new mode 100644
diff --git a/include/js/treeGrid/js/jquery.cookie.js b/include/js/treeGrid/js/jquery.cookie.js
old mode 100755
new mode 100644
diff --git a/include/js/treeGrid/js/jquery.treegrid.bootstrap2.js b/include/js/treeGrid/js/jquery.treegrid.bootstrap2.js
old mode 100755
new mode 100644
diff --git a/include/js/treeGrid/js/jquery.treegrid.bootstrap3.js b/include/js/treeGrid/js/jquery.treegrid.bootstrap3.js
old mode 100755
new mode 100644
diff --git a/include/js/treeGrid/js/jquery.treegrid.js b/include/js/treeGrid/js/jquery.treegrid.js
old mode 100755
new mode 100644
diff --git a/include/js/treeGrid/jstreegrid.js b/include/js/treeGrid/jstreegrid.js
old mode 100755
new mode 100644
diff --git a/include/js/treeGrid/params.json b/include/js/treeGrid/params.json
old mode 100755
new mode 100644
diff --git a/include/js/treeGrid/styles.css b/include/js/treeGrid/styles.css
old mode 100755
new mode 100644
diff --git a/include/js/treeGrid/test.html b/include/js/treeGrid/test.html
old mode 100755
new mode 100644
diff --git a/include/js/treeGrid/tests/qunit-1.12.0.css b/include/js/treeGrid/tests/qunit-1.12.0.css
old mode 100755
new mode 100644
diff --git a/include/js/treeGrid/tests/qunit-1.12.0.js b/include/js/treeGrid/tests/qunit-1.12.0.js
old mode 100755
new mode 100644
diff --git a/include/js/treeGrid/tests/tests.js b/include/js/treeGrid/tests/tests.js
old mode 100755
new mode 100644
diff --git a/include/js/treeGrid/treegrid.jquery.json b/include/js/treeGrid/treegrid.jquery.json
old mode 100755
new mode 100644
diff --git a/include/kontakt.class.php b/include/kontakt.class.php
old mode 100755
new mode 100644
diff --git a/include/konto.class.php b/include/konto.class.php
old mode 100755
new mode 100644
diff --git a/include/legesamtnote.class.php b/include/legesamtnote.class.php
old mode 100755
new mode 100644
diff --git a/include/lehre_tools.class.php b/include/lehre_tools.class.php
old mode 100755
new mode 100644
diff --git a/include/lehreinheit.class.php b/include/lehreinheit.class.php
old mode 100755
new mode 100644
diff --git a/include/lehreinheitgruppe.class.php b/include/lehreinheitgruppe.class.php
old mode 100755
new mode 100644
diff --git a/include/lehreinheitmitarbeiter.class.php b/include/lehreinheitmitarbeiter.class.php
old mode 100755
new mode 100644
diff --git a/include/lehrelisthelper.class.php b/include/lehrelisthelper.class.php
old mode 100755
new mode 100644
diff --git a/include/lehrfach.class.php b/include/lehrfach.class.php
old mode 100755
new mode 100644
diff --git a/include/lehrform.class.php b/include/lehrform.class.php
old mode 100755
new mode 100644
diff --git a/include/lehrfunktion.class.php b/include/lehrfunktion.class.php
old mode 100755
new mode 100644
diff --git a/include/lehrmodus.class.php b/include/lehrmodus.class.php
old mode 100755
new mode 100644
diff --git a/include/lehrstunde.class.php b/include/lehrstunde.class.php
old mode 100755
new mode 100644
diff --git a/include/lehrtyp.class.php b/include/lehrtyp.class.php
old mode 100755
new mode 100644
diff --git a/include/lehrveranstaltung.class.php b/include/lehrveranstaltung.class.php
old mode 100755
new mode 100644
diff --git a/include/lehrverband.class.php b/include/lehrverband.class.php
old mode 100755
new mode 100644
diff --git a/include/log.class.php b/include/log.class.php
old mode 100755
new mode 100644
diff --git a/include/lvangebot.class.php b/include/lvangebot.class.php
old mode 100755
new mode 100644
diff --git a/include/lvgesamtnote.class.php b/include/lvgesamtnote.class.php
old mode 100755
new mode 100644
diff --git a/include/lvinfo.class.php b/include/lvinfo.class.php
old mode 100755
new mode 100644
diff --git a/include/lvregel.class.php b/include/lvregel.class.php
old mode 100755
new mode 100644
diff --git a/include/mail.class.php b/include/mail.class.php
old mode 100755
new mode 100644
diff --git a/include/mantis.class.php b/include/mantis.class.php
old mode 100755
new mode 100644
diff --git a/include/meta/angular-tablesorter.php b/include/meta/angular-tablesorter.php
old mode 100755
new mode 100644
diff --git a/include/meta/angular.php b/include/meta/angular.php
old mode 100755
new mode 100644
diff --git a/include/meta/easyui.php b/include/meta/easyui.php
old mode 100755
new mode 100644
diff --git a/include/meta/jquery-tablesorter.php b/include/meta/jquery-tablesorter.php
old mode 100755
new mode 100644
diff --git a/include/meta/jquery.php b/include/meta/jquery.php
old mode 100755
new mode 100644
diff --git a/include/meta/js_utils.php b/include/meta/js_utils.php
old mode 100755
new mode 100644
diff --git a/include/meta/jsoneditor.php b/include/meta/jsoneditor.php
old mode 100755
new mode 100644
diff --git a/include/meta/php_utils.php b/include/meta/php_utils.php
old mode 100755
new mode 100644
diff --git a/include/mitarbeiter.class.php b/include/mitarbeiter.class.php
old mode 100755
new mode 100644
diff --git a/include/mobilitaet.class.php b/include/mobilitaet.class.php
old mode 100755
new mode 100644
diff --git a/include/mobilitaetsprogramm.class.php b/include/mobilitaetsprogramm.class.php
old mode 100755
new mode 100644
diff --git a/include/nation.class.php b/include/nation.class.php
old mode 100755
new mode 100644
diff --git a/include/nationengruppe.class.php b/include/nationengruppe.class.php
old mode 100755
new mode 100644
diff --git a/include/news.class.php b/include/news.class.php
old mode 100755
new mode 100644
diff --git a/include/note.class.php b/include/note.class.php
old mode 100755
new mode 100644
diff --git a/include/notenschluessel.class.php b/include/notenschluessel.class.php
old mode 100755
new mode 100644
diff --git a/include/notiz.class.php b/include/notiz.class.php
old mode 100755
new mode 100644
diff --git a/include/organisationseinheit.class.php b/include/organisationseinheit.class.php
old mode 100755
new mode 100644
diff --git a/include/organisationsform.class.php b/include/organisationsform.class.php
old mode 100755
new mode 100644
diff --git a/include/ort.class.php b/include/ort.class.php
old mode 100755
new mode 100644
diff --git a/include/ortraumtyp.class.php b/include/ortraumtyp.class.php
old mode 100755
new mode 100644
diff --git a/include/pdf.class.php b/include/pdf.class.php
old mode 100755
new mode 100644
diff --git a/include/pdf.inc.php b/include/pdf.inc.php
old mode 100755
new mode 100644
diff --git a/include/pdf/FAQ.htm b/include/pdf/FAQ.htm
old mode 100755
new mode 100644
diff --git a/include/pdf/doc/acceptpagebreak.htm b/include/pdf/doc/acceptpagebreak.htm
old mode 100755
new mode 100644
diff --git a/include/pdf/doc/addfont.htm b/include/pdf/doc/addfont.htm
old mode 100755
new mode 100644
diff --git a/include/pdf/doc/addlink.htm b/include/pdf/doc/addlink.htm
old mode 100755
new mode 100644
diff --git a/include/pdf/doc/addpage.htm b/include/pdf/doc/addpage.htm
old mode 100755
new mode 100644
diff --git a/include/pdf/doc/aliasnbpages.htm b/include/pdf/doc/aliasnbpages.htm
old mode 100755
new mode 100644
diff --git a/include/pdf/doc/cell.htm b/include/pdf/doc/cell.htm
old mode 100755
new mode 100644
diff --git a/include/pdf/doc/close.htm b/include/pdf/doc/close.htm
old mode 100755
new mode 100644
diff --git a/include/pdf/doc/error.htm b/include/pdf/doc/error.htm
old mode 100755
new mode 100644
diff --git a/include/pdf/doc/footer.htm b/include/pdf/doc/footer.htm
old mode 100755
new mode 100644
diff --git a/include/pdf/doc/fpdf.htm b/include/pdf/doc/fpdf.htm
old mode 100755
new mode 100644
diff --git a/include/pdf/doc/getstringwidth.htm b/include/pdf/doc/getstringwidth.htm
old mode 100755
new mode 100644
diff --git a/include/pdf/doc/getx.htm b/include/pdf/doc/getx.htm
old mode 100755
new mode 100644
diff --git a/include/pdf/doc/gety.htm b/include/pdf/doc/gety.htm
old mode 100755
new mode 100644
diff --git a/include/pdf/doc/header.htm b/include/pdf/doc/header.htm
old mode 100755
new mode 100644
diff --git a/include/pdf/doc/image.htm b/include/pdf/doc/image.htm
old mode 100755
new mode 100644
diff --git a/include/pdf/doc/index.htm b/include/pdf/doc/index.htm
old mode 100755
new mode 100644
diff --git a/include/pdf/doc/line.htm b/include/pdf/doc/line.htm
old mode 100755
new mode 100644
diff --git a/include/pdf/doc/link.htm b/include/pdf/doc/link.htm
old mode 100755
new mode 100644
diff --git a/include/pdf/doc/ln.htm b/include/pdf/doc/ln.htm
old mode 100755
new mode 100644
diff --git a/include/pdf/doc/multicell.htm b/include/pdf/doc/multicell.htm
old mode 100755
new mode 100644
diff --git a/include/pdf/doc/open.htm b/include/pdf/doc/open.htm
old mode 100755
new mode 100644
diff --git a/include/pdf/doc/output.htm b/include/pdf/doc/output.htm
old mode 100755
new mode 100644
diff --git a/include/pdf/doc/pageno.htm b/include/pdf/doc/pageno.htm
old mode 100755
new mode 100644
diff --git a/include/pdf/doc/rect.htm b/include/pdf/doc/rect.htm
old mode 100755
new mode 100644
diff --git a/include/pdf/doc/setauthor.htm b/include/pdf/doc/setauthor.htm
old mode 100755
new mode 100644
diff --git a/include/pdf/doc/setautopagebreak.htm b/include/pdf/doc/setautopagebreak.htm
old mode 100755
new mode 100644
diff --git a/include/pdf/doc/setcompression.htm b/include/pdf/doc/setcompression.htm
old mode 100755
new mode 100644
diff --git a/include/pdf/doc/setcreator.htm b/include/pdf/doc/setcreator.htm
old mode 100755
new mode 100644
diff --git a/include/pdf/doc/setdisplaymode.htm b/include/pdf/doc/setdisplaymode.htm
old mode 100755
new mode 100644
diff --git a/include/pdf/doc/setdrawcolor.htm b/include/pdf/doc/setdrawcolor.htm
old mode 100755
new mode 100644
diff --git a/include/pdf/doc/setfillcolor.htm b/include/pdf/doc/setfillcolor.htm
old mode 100755
new mode 100644
diff --git a/include/pdf/doc/setfont.htm b/include/pdf/doc/setfont.htm
old mode 100755
new mode 100644
diff --git a/include/pdf/doc/setfontsize.htm b/include/pdf/doc/setfontsize.htm
old mode 100755
new mode 100644
diff --git a/include/pdf/doc/setkeywords.htm b/include/pdf/doc/setkeywords.htm
old mode 100755
new mode 100644
diff --git a/include/pdf/doc/setleftmargin.htm b/include/pdf/doc/setleftmargin.htm
old mode 100755
new mode 100644
diff --git a/include/pdf/doc/setlinewidth.htm b/include/pdf/doc/setlinewidth.htm
old mode 100755
new mode 100644
diff --git a/include/pdf/doc/setlink.htm b/include/pdf/doc/setlink.htm
old mode 100755
new mode 100644
diff --git a/include/pdf/doc/setmargins.htm b/include/pdf/doc/setmargins.htm
old mode 100755
new mode 100644
diff --git a/include/pdf/doc/setrightmargin.htm b/include/pdf/doc/setrightmargin.htm
old mode 100755
new mode 100644
diff --git a/include/pdf/doc/setsubject.htm b/include/pdf/doc/setsubject.htm
old mode 100755
new mode 100644
diff --git a/include/pdf/doc/settextcolor.htm b/include/pdf/doc/settextcolor.htm
old mode 100755
new mode 100644
diff --git a/include/pdf/doc/settitle.htm b/include/pdf/doc/settitle.htm
old mode 100755
new mode 100644
diff --git a/include/pdf/doc/settopmargin.htm b/include/pdf/doc/settopmargin.htm
old mode 100755
new mode 100644
diff --git a/include/pdf/doc/setx.htm b/include/pdf/doc/setx.htm
old mode 100755
new mode 100644
diff --git a/include/pdf/doc/setxy.htm b/include/pdf/doc/setxy.htm
old mode 100755
new mode 100644
diff --git a/include/pdf/doc/sety.htm b/include/pdf/doc/sety.htm
old mode 100755
new mode 100644
diff --git a/include/pdf/doc/text.htm b/include/pdf/doc/text.htm
old mode 100755
new mode 100644
diff --git a/include/pdf/doc/write.htm b/include/pdf/doc/write.htm
old mode 100755
new mode 100644
diff --git a/include/pdf/font/courier.php b/include/pdf/font/courier.php
old mode 100755
new mode 100644
diff --git a/include/pdf/font/helvetica.php b/include/pdf/font/helvetica.php
old mode 100755
new mode 100644
diff --git a/include/pdf/font/helveticab.php b/include/pdf/font/helveticab.php
old mode 100755
new mode 100644
diff --git a/include/pdf/font/helveticabi.php b/include/pdf/font/helveticabi.php
old mode 100755
new mode 100644
diff --git a/include/pdf/font/helveticai.php b/include/pdf/font/helveticai.php
old mode 100755
new mode 100644
diff --git a/include/pdf/font/makefont/cp1250.map b/include/pdf/font/makefont/cp1250.map
old mode 100755
new mode 100644
diff --git a/include/pdf/font/makefont/cp1251.map b/include/pdf/font/makefont/cp1251.map
old mode 100755
new mode 100644
diff --git a/include/pdf/font/makefont/cp1252.map b/include/pdf/font/makefont/cp1252.map
old mode 100755
new mode 100644
diff --git a/include/pdf/font/makefont/cp1253.map b/include/pdf/font/makefont/cp1253.map
old mode 100755
new mode 100644
diff --git a/include/pdf/font/makefont/cp1254.map b/include/pdf/font/makefont/cp1254.map
old mode 100755
new mode 100644
diff --git a/include/pdf/font/makefont/cp1255.map b/include/pdf/font/makefont/cp1255.map
old mode 100755
new mode 100644
diff --git a/include/pdf/font/makefont/cp1257.map b/include/pdf/font/makefont/cp1257.map
old mode 100755
new mode 100644
diff --git a/include/pdf/font/makefont/cp1258.map b/include/pdf/font/makefont/cp1258.map
old mode 100755
new mode 100644
diff --git a/include/pdf/font/makefont/cp874.map b/include/pdf/font/makefont/cp874.map
old mode 100755
new mode 100644
diff --git a/include/pdf/font/makefont/iso-8859-1.map b/include/pdf/font/makefont/iso-8859-1.map
old mode 100755
new mode 100644
diff --git a/include/pdf/font/makefont/iso-8859-11.map b/include/pdf/font/makefont/iso-8859-11.map
old mode 100755
new mode 100644
diff --git a/include/pdf/font/makefont/iso-8859-15.map b/include/pdf/font/makefont/iso-8859-15.map
old mode 100755
new mode 100644
diff --git a/include/pdf/font/makefont/iso-8859-16.map b/include/pdf/font/makefont/iso-8859-16.map
old mode 100755
new mode 100644
diff --git a/include/pdf/font/makefont/iso-8859-2.map b/include/pdf/font/makefont/iso-8859-2.map
old mode 100755
new mode 100644
diff --git a/include/pdf/font/makefont/iso-8859-4.map b/include/pdf/font/makefont/iso-8859-4.map
old mode 100755
new mode 100644
diff --git a/include/pdf/font/makefont/iso-8859-5.map b/include/pdf/font/makefont/iso-8859-5.map
old mode 100755
new mode 100644
diff --git a/include/pdf/font/makefont/iso-8859-7.map b/include/pdf/font/makefont/iso-8859-7.map
old mode 100755
new mode 100644
diff --git a/include/pdf/font/makefont/iso-8859-9.map b/include/pdf/font/makefont/iso-8859-9.map
old mode 100755
new mode 100644
diff --git a/include/pdf/font/makefont/koi8-r.map b/include/pdf/font/makefont/koi8-r.map
old mode 100755
new mode 100644
diff --git a/include/pdf/font/makefont/koi8-u.map b/include/pdf/font/makefont/koi8-u.map
old mode 100755
new mode 100644
diff --git a/include/pdf/font/makefont/makefont.php b/include/pdf/font/makefont/makefont.php
old mode 100755
new mode 100644
diff --git a/include/pdf/font/symbol.php b/include/pdf/font/symbol.php
old mode 100755
new mode 100644
diff --git a/include/pdf/font/times.php b/include/pdf/font/times.php
old mode 100755
new mode 100644
diff --git a/include/pdf/font/timesb.php b/include/pdf/font/timesb.php
old mode 100755
new mode 100644
diff --git a/include/pdf/font/timesbi.php b/include/pdf/font/timesbi.php
old mode 100755
new mode 100644
diff --git a/include/pdf/font/timesi.php b/include/pdf/font/timesi.php
old mode 100755
new mode 100644
diff --git a/include/pdf/font/zapfdingbats.php b/include/pdf/font/zapfdingbats.php
old mode 100755
new mode 100644
diff --git a/include/pdf/fpdf.css b/include/pdf/fpdf.css
old mode 100755
new mode 100644
diff --git a/include/pdf/fpdf.php b/include/pdf/fpdf.php
old mode 100755
new mode 100644
diff --git a/include/pdf/histo.htm b/include/pdf/histo.htm
old mode 100755
new mode 100644
diff --git a/include/pdf/install.txt b/include/pdf/install.txt
old mode 100755
new mode 100644
diff --git a/include/person.class.php b/include/person.class.php
old mode 100755
new mode 100644
diff --git a/include/personlog.class.php b/include/personlog.class.php
old mode 100755
new mode 100644
diff --git a/include/pgsql.class.php b/include/pgsql.class.php
old mode 100755
new mode 100644
diff --git a/include/phrasen.class.php b/include/phrasen.class.php
old mode 100755
new mode 100644
diff --git a/include/preincoming.class.php b/include/preincoming.class.php
old mode 100755
new mode 100644
diff --git a/include/preinteressent.class.php b/include/preinteressent.class.php
old mode 100755
new mode 100644
diff --git a/include/preoutgoing.class.php b/include/preoutgoing.class.php
old mode 100755
new mode 100644
diff --git a/include/prestudent.class.php b/include/prestudent.class.php
old mode 100755
new mode 100644
diff --git a/include/process.class.php b/include/process.class.php
old mode 100755
new mode 100644
diff --git a/include/projekt.class.php b/include/projekt.class.php
old mode 100755
new mode 100644
diff --git a/include/projektarbeit.class.php b/include/projektarbeit.class.php
old mode 100755
new mode 100644
diff --git a/include/projektbenutzer.class.php b/include/projektbenutzer.class.php
old mode 100755
new mode 100644
diff --git a/include/projektbetreuer.class.php b/include/projektbetreuer.class.php
old mode 100755
new mode 100644
diff --git a/include/projektphase.class.php b/include/projektphase.class.php
old mode 100755
new mode 100644
diff --git a/include/projekttask.class.php b/include/projekttask.class.php
old mode 100755
new mode 100644
diff --git a/include/pruefling.class.php b/include/pruefling.class.php
old mode 100755
new mode 100644
diff --git a/include/pruefung.class.php b/include/pruefung.class.php
old mode 100755
new mode 100644
diff --git a/include/pruefungCis.class.php b/include/pruefungCis.class.php
old mode 100755
new mode 100644
diff --git a/include/pruefungsanmeldung.class.php b/include/pruefungsanmeldung.class.php
old mode 100755
new mode 100644
diff --git a/include/pruefungsfenster.class.php b/include/pruefungsfenster.class.php
old mode 100755
new mode 100644
diff --git a/include/pruefungstermin.class.php b/include/pruefungstermin.class.php
old mode 100755
new mode 100644
diff --git a/include/raumtyp.class.php b/include/raumtyp.class.php
old mode 100755
new mode 100644
diff --git a/include/rdf.class.php b/include/rdf.class.php
old mode 100755
new mode 100644
diff --git a/include/reihungstest.class.php b/include/reihungstest.class.php
old mode 100755
new mode 100644
diff --git a/include/reservierung.class.php b/include/reservierung.class.php
old mode 100755
new mode 100644
diff --git a/include/ressource.class.php b/include/ressource.class.php
old mode 100755
new mode 100644
diff --git a/include/rueckstellung.class.php b/include/rueckstellung.class.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/ChangeLog b/include/sabredav/ChangeLog
old mode 100755
new mode 100644
diff --git a/include/sabredav/LICENSE b/include/sabredav/LICENSE
old mode 100755
new mode 100644
diff --git a/include/sabredav/README.md b/include/sabredav/README.md
old mode 100755
new mode 100644
diff --git a/include/sabredav/bin/build.php b/include/sabredav/bin/build.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/bin/googlecode_upload.py b/include/sabredav/bin/googlecode_upload.py
old mode 100755
new mode 100644
diff --git a/include/sabredav/bin/migrateto17.php b/include/sabredav/bin/migrateto17.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/bin/naturalselection.py b/include/sabredav/bin/naturalselection.py
old mode 100755
new mode 100644
diff --git a/include/sabredav/bin/sabredav b/include/sabredav/bin/sabredav
old mode 100755
new mode 100644
diff --git a/include/sabredav/bin/sabredav.php b/include/sabredav/bin/sabredav.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/bin/vobjectvalidate.php b/include/sabredav/bin/vobjectvalidate.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/composer.json b/include/sabredav/composer.json
old mode 100755
new mode 100644
diff --git a/include/sabredav/composer.lock b/include/sabredav/composer.lock
old mode 100755
new mode 100644
diff --git a/include/sabredav/examples/addressbookserver.php b/include/sabredav/examples/addressbookserver.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/examples/basicauth.php b/include/sabredav/examples/basicauth.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/examples/calendarserver.php b/include/sabredav/examples/calendarserver.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/examples/digestauth.php b/include/sabredav/examples/digestauth.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/examples/fileserver.php b/include/sabredav/examples/fileserver.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/examples/groupwareserver.php b/include/sabredav/examples/groupwareserver.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/examples/simplefsserver.php b/include/sabredav/examples/simplefsserver.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/examples/sql/mysql.addressbook.sql b/include/sabredav/examples/sql/mysql.addressbook.sql
old mode 100755
new mode 100644
diff --git a/include/sabredav/examples/sql/mysql.calendars.sql b/include/sabredav/examples/sql/mysql.calendars.sql
old mode 100755
new mode 100644
diff --git a/include/sabredav/examples/sql/mysql.locks.sql b/include/sabredav/examples/sql/mysql.locks.sql
old mode 100755
new mode 100644
diff --git a/include/sabredav/examples/sql/mysql.principals.sql b/include/sabredav/examples/sql/mysql.principals.sql
old mode 100755
new mode 100644
diff --git a/include/sabredav/examples/sql/mysql.users.sql b/include/sabredav/examples/sql/mysql.users.sql
old mode 100755
new mode 100644
diff --git a/include/sabredav/examples/sql/pgsql.addressbook.sql b/include/sabredav/examples/sql/pgsql.addressbook.sql
old mode 100755
new mode 100644
diff --git a/include/sabredav/examples/sql/pgsql.calendars.sql b/include/sabredav/examples/sql/pgsql.calendars.sql
old mode 100755
new mode 100644
diff --git a/include/sabredav/examples/sql/pgsql.locks.sql b/include/sabredav/examples/sql/pgsql.locks.sql
old mode 100755
new mode 100644
diff --git a/include/sabredav/examples/sql/pgsql.principals.sql b/include/sabredav/examples/sql/pgsql.principals.sql
old mode 100755
new mode 100644
diff --git a/include/sabredav/examples/sql/pgsql.users.sql b/include/sabredav/examples/sql/pgsql.users.sql
old mode 100755
new mode 100644
diff --git a/include/sabredav/examples/sql/sqlite.addressbooks.sql b/include/sabredav/examples/sql/sqlite.addressbooks.sql
old mode 100755
new mode 100644
diff --git a/include/sabredav/examples/sql/sqlite.calendars.sql b/include/sabredav/examples/sql/sqlite.calendars.sql
old mode 100755
new mode 100644
diff --git a/include/sabredav/examples/sql/sqlite.locks.sql b/include/sabredav/examples/sql/sqlite.locks.sql
old mode 100755
new mode 100644
diff --git a/include/sabredav/examples/sql/sqlite.principals.sql b/include/sabredav/examples/sql/sqlite.principals.sql
old mode 100755
new mode 100644
diff --git a/include/sabredav/examples/sql/sqlite.users.sql b/include/sabredav/examples/sql/sqlite.users.sql
old mode 100755
new mode 100644
diff --git a/include/sabredav/examples/webserver/apache2_htaccess.conf b/include/sabredav/examples/webserver/apache2_htaccess.conf
old mode 100755
new mode 100644
diff --git a/include/sabredav/examples/webserver/apache2_vhost.conf b/include/sabredav/examples/webserver/apache2_vhost.conf
old mode 100755
new mode 100644
diff --git a/include/sabredav/examples/webserver/apache2_vhost_cgi.conf b/include/sabredav/examples/webserver/apache2_vhost_cgi.conf
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CalDAV/Backend/AbstractBackend.php b/include/sabredav/lib/Sabre/CalDAV/Backend/AbstractBackend.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CalDAV/Backend/BackendInterface.php b/include/sabredav/lib/Sabre/CalDAV/Backend/BackendInterface.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CalDAV/Backend/NotificationSupport.php b/include/sabredav/lib/Sabre/CalDAV/Backend/NotificationSupport.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CalDAV/Backend/PDO.php b/include/sabredav/lib/Sabre/CalDAV/Backend/PDO.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CalDAV/Backend/SharingSupport.php b/include/sabredav/lib/Sabre/CalDAV/Backend/SharingSupport.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CalDAV/Calendar.php b/include/sabredav/lib/Sabre/CalDAV/Calendar.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CalDAV/CalendarObject.php b/include/sabredav/lib/Sabre/CalDAV/CalendarObject.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CalDAV/CalendarQueryParser.php b/include/sabredav/lib/Sabre/CalDAV/CalendarQueryParser.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CalDAV/CalendarQueryValidator.php b/include/sabredav/lib/Sabre/CalDAV/CalendarQueryValidator.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CalDAV/CalendarRootNode.php b/include/sabredav/lib/Sabre/CalDAV/CalendarRootNode.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CalDAV/Exception/InvalidComponentType.php b/include/sabredav/lib/Sabre/CalDAV/Exception/InvalidComponentType.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CalDAV/ICSExportPlugin.php b/include/sabredav/lib/Sabre/CalDAV/ICSExportPlugin.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CalDAV/ICalendar.php b/include/sabredav/lib/Sabre/CalDAV/ICalendar.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CalDAV/ICalendarObject.php b/include/sabredav/lib/Sabre/CalDAV/ICalendarObject.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CalDAV/IShareableCalendar.php b/include/sabredav/lib/Sabre/CalDAV/IShareableCalendar.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CalDAV/ISharedCalendar.php b/include/sabredav/lib/Sabre/CalDAV/ISharedCalendar.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CalDAV/Notifications/Collection.php b/include/sabredav/lib/Sabre/CalDAV/Notifications/Collection.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CalDAV/Notifications/ICollection.php b/include/sabredav/lib/Sabre/CalDAV/Notifications/ICollection.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CalDAV/Notifications/INode.php b/include/sabredav/lib/Sabre/CalDAV/Notifications/INode.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CalDAV/Notifications/INotificationType.php b/include/sabredav/lib/Sabre/CalDAV/Notifications/INotificationType.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CalDAV/Notifications/Node.php b/include/sabredav/lib/Sabre/CalDAV/Notifications/Node.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CalDAV/Notifications/Notification/Invite.php b/include/sabredav/lib/Sabre/CalDAV/Notifications/Notification/Invite.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CalDAV/Notifications/Notification/InviteReply.php b/include/sabredav/lib/Sabre/CalDAV/Notifications/Notification/InviteReply.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CalDAV/Notifications/Notification/SystemStatus.php b/include/sabredav/lib/Sabre/CalDAV/Notifications/Notification/SystemStatus.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CalDAV/Plugin.php b/include/sabredav/lib/Sabre/CalDAV/Plugin.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CalDAV/Principal/Collection.php b/include/sabredav/lib/Sabre/CalDAV/Principal/Collection.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CalDAV/Principal/IProxyRead.php b/include/sabredav/lib/Sabre/CalDAV/Principal/IProxyRead.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CalDAV/Principal/IProxyWrite.php b/include/sabredav/lib/Sabre/CalDAV/Principal/IProxyWrite.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CalDAV/Principal/ProxyRead.php b/include/sabredav/lib/Sabre/CalDAV/Principal/ProxyRead.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CalDAV/Principal/ProxyWrite.php b/include/sabredav/lib/Sabre/CalDAV/Principal/ProxyWrite.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CalDAV/Principal/User.php b/include/sabredav/lib/Sabre/CalDAV/Principal/User.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CalDAV/Property/AllowedSharingModes.php b/include/sabredav/lib/Sabre/CalDAV/Property/AllowedSharingModes.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CalDAV/Property/Invite.php b/include/sabredav/lib/Sabre/CalDAV/Property/Invite.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CalDAV/Property/ScheduleCalendarTransp.php b/include/sabredav/lib/Sabre/CalDAV/Property/ScheduleCalendarTransp.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php b/include/sabredav/lib/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CalDAV/Property/SupportedCalendarData.php b/include/sabredav/lib/Sabre/CalDAV/Property/SupportedCalendarData.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CalDAV/Property/SupportedCollationSet.php b/include/sabredav/lib/Sabre/CalDAV/Property/SupportedCollationSet.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CalDAV/Schedule/IMip.php b/include/sabredav/lib/Sabre/CalDAV/Schedule/IMip.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CalDAV/Schedule/IOutbox.php b/include/sabredav/lib/Sabre/CalDAV/Schedule/IOutbox.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CalDAV/Schedule/Outbox.php b/include/sabredav/lib/Sabre/CalDAV/Schedule/Outbox.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CalDAV/ShareableCalendar.php b/include/sabredav/lib/Sabre/CalDAV/ShareableCalendar.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CalDAV/SharedCalendar.php b/include/sabredav/lib/Sabre/CalDAV/SharedCalendar.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CalDAV/SharingPlugin.php b/include/sabredav/lib/Sabre/CalDAV/SharingPlugin.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CalDAV/UserCalendars.php b/include/sabredav/lib/Sabre/CalDAV/UserCalendars.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CalDAV/Version.php b/include/sabredav/lib/Sabre/CalDAV/Version.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CardDAV/AddressBook.php b/include/sabredav/lib/Sabre/CardDAV/AddressBook.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CardDAV/AddressBookQueryParser.php b/include/sabredav/lib/Sabre/CardDAV/AddressBookQueryParser.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CardDAV/AddressBookRoot.php b/include/sabredav/lib/Sabre/CardDAV/AddressBookRoot.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CardDAV/Backend/AbstractBackend.php b/include/sabredav/lib/Sabre/CardDAV/Backend/AbstractBackend.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CardDAV/Backend/BackendInterface.php b/include/sabredav/lib/Sabre/CardDAV/Backend/BackendInterface.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CardDAV/Backend/PDO.php b/include/sabredav/lib/Sabre/CardDAV/Backend/PDO.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CardDAV/Card.php b/include/sabredav/lib/Sabre/CardDAV/Card.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CardDAV/IAddressBook.php b/include/sabredav/lib/Sabre/CardDAV/IAddressBook.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CardDAV/ICard.php b/include/sabredav/lib/Sabre/CardDAV/ICard.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CardDAV/IDirectory.php b/include/sabredav/lib/Sabre/CardDAV/IDirectory.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CardDAV/Plugin.php b/include/sabredav/lib/Sabre/CardDAV/Plugin.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CardDAV/Property/SupportedAddressData.php b/include/sabredav/lib/Sabre/CardDAV/Property/SupportedAddressData.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CardDAV/UserAddressBooks.php b/include/sabredav/lib/Sabre/CardDAV/UserAddressBooks.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CardDAV/VCFExportPlugin.php b/include/sabredav/lib/Sabre/CardDAV/VCFExportPlugin.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/CardDAV/Version.php b/include/sabredav/lib/Sabre/CardDAV/Version.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Auth/Backend/AbstractBasic.php b/include/sabredav/lib/Sabre/DAV/Auth/Backend/AbstractBasic.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Auth/Backend/AbstractDigest.php b/include/sabredav/lib/Sabre/DAV/Auth/Backend/AbstractDigest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Auth/Backend/Apache.php b/include/sabredav/lib/Sabre/DAV/Auth/Backend/Apache.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Auth/Backend/BackendInterface.php b/include/sabredav/lib/Sabre/DAV/Auth/Backend/BackendInterface.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Auth/Backend/File.php b/include/sabredav/lib/Sabre/DAV/Auth/Backend/File.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Auth/Backend/PDO.php b/include/sabredav/lib/Sabre/DAV/Auth/Backend/PDO.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Auth/Plugin.php b/include/sabredav/lib/Sabre/DAV/Auth/Plugin.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Browser/GuessContentType.php b/include/sabredav/lib/Sabre/DAV/Browser/GuessContentType.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Browser/MapGetToPropFind.php b/include/sabredav/lib/Sabre/DAV/Browser/MapGetToPropFind.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Browser/Plugin.php b/include/sabredav/lib/Sabre/DAV/Browser/Plugin.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Browser/assets/favicon.ico b/include/sabredav/lib/Sabre/DAV/Browser/assets/favicon.ico
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Browser/assets/icons/addressbook.png b/include/sabredav/lib/Sabre/DAV/Browser/assets/icons/addressbook.png
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Browser/assets/icons/calendar.png b/include/sabredav/lib/Sabre/DAV/Browser/assets/icons/calendar.png
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Browser/assets/icons/card.png b/include/sabredav/lib/Sabre/DAV/Browser/assets/icons/card.png
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Browser/assets/icons/collection.png b/include/sabredav/lib/Sabre/DAV/Browser/assets/icons/collection.png
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Browser/assets/icons/file.png b/include/sabredav/lib/Sabre/DAV/Browser/assets/icons/file.png
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Browser/assets/icons/parent.png b/include/sabredav/lib/Sabre/DAV/Browser/assets/icons/parent.png
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Browser/assets/icons/principal.png b/include/sabredav/lib/Sabre/DAV/Browser/assets/icons/principal.png
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Client.php b/include/sabredav/lib/Sabre/DAV/Client.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Collection.php b/include/sabredav/lib/Sabre/DAV/Collection.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Exception.php b/include/sabredav/lib/Sabre/DAV/Exception.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Exception/BadRequest.php b/include/sabredav/lib/Sabre/DAV/Exception/BadRequest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Exception/Conflict.php b/include/sabredav/lib/Sabre/DAV/Exception/Conflict.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Exception/ConflictingLock.php b/include/sabredav/lib/Sabre/DAV/Exception/ConflictingLock.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Exception/FileNotFound.php b/include/sabredav/lib/Sabre/DAV/Exception/FileNotFound.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Exception/Forbidden.php b/include/sabredav/lib/Sabre/DAV/Exception/Forbidden.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Exception/InsufficientStorage.php b/include/sabredav/lib/Sabre/DAV/Exception/InsufficientStorage.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Exception/InvalidResourceType.php b/include/sabredav/lib/Sabre/DAV/Exception/InvalidResourceType.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Exception/LengthRequired.php b/include/sabredav/lib/Sabre/DAV/Exception/LengthRequired.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php b/include/sabredav/lib/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Exception/Locked.php b/include/sabredav/lib/Sabre/DAV/Exception/Locked.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Exception/MethodNotAllowed.php b/include/sabredav/lib/Sabre/DAV/Exception/MethodNotAllowed.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Exception/NotAuthenticated.php b/include/sabredav/lib/Sabre/DAV/Exception/NotAuthenticated.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Exception/NotFound.php b/include/sabredav/lib/Sabre/DAV/Exception/NotFound.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Exception/NotImplemented.php b/include/sabredav/lib/Sabre/DAV/Exception/NotImplemented.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Exception/PaymentRequired.php b/include/sabredav/lib/Sabre/DAV/Exception/PaymentRequired.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Exception/PreconditionFailed.php b/include/sabredav/lib/Sabre/DAV/Exception/PreconditionFailed.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Exception/ReportNotSupported.php b/include/sabredav/lib/Sabre/DAV/Exception/ReportNotSupported.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php b/include/sabredav/lib/Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Exception/ServiceUnavailable.php b/include/sabredav/lib/Sabre/DAV/Exception/ServiceUnavailable.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Exception/UnsupportedMediaType.php b/include/sabredav/lib/Sabre/DAV/Exception/UnsupportedMediaType.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/FS/Directory.php b/include/sabredav/lib/Sabre/DAV/FS/Directory.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/FS/File.php b/include/sabredav/lib/Sabre/DAV/FS/File.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/FS/Node.php b/include/sabredav/lib/Sabre/DAV/FS/Node.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/FSExt/Directory.php b/include/sabredav/lib/Sabre/DAV/FSExt/Directory.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/FSExt/File.php b/include/sabredav/lib/Sabre/DAV/FSExt/File.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/FSExt/Node.php b/include/sabredav/lib/Sabre/DAV/FSExt/Node.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/File.php b/include/sabredav/lib/Sabre/DAV/File.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/ICollection.php b/include/sabredav/lib/Sabre/DAV/ICollection.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/IExtendedCollection.php b/include/sabredav/lib/Sabre/DAV/IExtendedCollection.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/IFile.php b/include/sabredav/lib/Sabre/DAV/IFile.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/INode.php b/include/sabredav/lib/Sabre/DAV/INode.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/IProperties.php b/include/sabredav/lib/Sabre/DAV/IProperties.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/IQuota.php b/include/sabredav/lib/Sabre/DAV/IQuota.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Locks/Backend/AbstractBackend.php b/include/sabredav/lib/Sabre/DAV/Locks/Backend/AbstractBackend.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Locks/Backend/BackendInterface.php b/include/sabredav/lib/Sabre/DAV/Locks/Backend/BackendInterface.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Locks/Backend/FS.php b/include/sabredav/lib/Sabre/DAV/Locks/Backend/FS.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Locks/Backend/File.php b/include/sabredav/lib/Sabre/DAV/Locks/Backend/File.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Locks/Backend/PDO.php b/include/sabredav/lib/Sabre/DAV/Locks/Backend/PDO.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Locks/LockInfo.php b/include/sabredav/lib/Sabre/DAV/Locks/LockInfo.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Locks/Plugin.php b/include/sabredav/lib/Sabre/DAV/Locks/Plugin.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Mount/Plugin.php b/include/sabredav/lib/Sabre/DAV/Mount/Plugin.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Node.php b/include/sabredav/lib/Sabre/DAV/Node.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/ObjectTree.php b/include/sabredav/lib/Sabre/DAV/ObjectTree.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/PartialUpdate/IFile.php b/include/sabredav/lib/Sabre/DAV/PartialUpdate/IFile.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/PartialUpdate/IPatchSupport.php b/include/sabredav/lib/Sabre/DAV/PartialUpdate/IPatchSupport.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/PartialUpdate/Plugin.php b/include/sabredav/lib/Sabre/DAV/PartialUpdate/Plugin.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Property.php b/include/sabredav/lib/Sabre/DAV/Property.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Property/GetLastModified.php b/include/sabredav/lib/Sabre/DAV/Property/GetLastModified.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Property/Href.php b/include/sabredav/lib/Sabre/DAV/Property/Href.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Property/HrefList.php b/include/sabredav/lib/Sabre/DAV/Property/HrefList.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Property/IHref.php b/include/sabredav/lib/Sabre/DAV/Property/IHref.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Property/LockDiscovery.php b/include/sabredav/lib/Sabre/DAV/Property/LockDiscovery.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Property/ResourceType.php b/include/sabredav/lib/Sabre/DAV/Property/ResourceType.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Property/Response.php b/include/sabredav/lib/Sabre/DAV/Property/Response.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Property/ResponseList.php b/include/sabredav/lib/Sabre/DAV/Property/ResponseList.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Property/SupportedLock.php b/include/sabredav/lib/Sabre/DAV/Property/SupportedLock.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Property/SupportedReportSet.php b/include/sabredav/lib/Sabre/DAV/Property/SupportedReportSet.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/PropertyInterface.php b/include/sabredav/lib/Sabre/DAV/PropertyInterface.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Server.php b/include/sabredav/lib/Sabre/DAV/Server.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/ServerPlugin.php b/include/sabredav/lib/Sabre/DAV/ServerPlugin.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/SimpleCollection.php b/include/sabredav/lib/Sabre/DAV/SimpleCollection.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/SimpleFile.php b/include/sabredav/lib/Sabre/DAV/SimpleFile.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/StringUtil.php b/include/sabredav/lib/Sabre/DAV/StringUtil.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/TemporaryFileFilterPlugin.php b/include/sabredav/lib/Sabre/DAV/TemporaryFileFilterPlugin.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Tree.php b/include/sabredav/lib/Sabre/DAV/Tree.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Tree/Filesystem.php b/include/sabredav/lib/Sabre/DAV/Tree/Filesystem.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/URLUtil.php b/include/sabredav/lib/Sabre/DAV/URLUtil.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/UUIDUtil.php b/include/sabredav/lib/Sabre/DAV/UUIDUtil.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/Version.php b/include/sabredav/lib/Sabre/DAV/Version.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAV/XMLUtil.php b/include/sabredav/lib/Sabre/DAV/XMLUtil.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAVACL/AbstractPrincipalCollection.php b/include/sabredav/lib/Sabre/DAVACL/AbstractPrincipalCollection.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAVACL/Exception/AceConflict.php b/include/sabredav/lib/Sabre/DAVACL/Exception/AceConflict.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAVACL/Exception/NeedPrivileges.php b/include/sabredav/lib/Sabre/DAVACL/Exception/NeedPrivileges.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAVACL/Exception/NoAbstract.php b/include/sabredav/lib/Sabre/DAVACL/Exception/NoAbstract.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAVACL/Exception/NotRecognizedPrincipal.php b/include/sabredav/lib/Sabre/DAVACL/Exception/NotRecognizedPrincipal.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAVACL/Exception/NotSupportedPrivilege.php b/include/sabredav/lib/Sabre/DAVACL/Exception/NotSupportedPrivilege.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAVACL/IACL.php b/include/sabredav/lib/Sabre/DAVACL/IACL.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAVACL/IPrincipal.php b/include/sabredav/lib/Sabre/DAVACL/IPrincipal.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAVACL/IPrincipalCollection.php b/include/sabredav/lib/Sabre/DAVACL/IPrincipalCollection.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAVACL/Plugin.php b/include/sabredav/lib/Sabre/DAVACL/Plugin.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAVACL/Principal.php b/include/sabredav/lib/Sabre/DAVACL/Principal.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAVACL/PrincipalBackend/AbstractBackend.php b/include/sabredav/lib/Sabre/DAVACL/PrincipalBackend/AbstractBackend.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAVACL/PrincipalBackend/BackendInterface.php b/include/sabredav/lib/Sabre/DAVACL/PrincipalBackend/BackendInterface.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAVACL/PrincipalBackend/PDO.php b/include/sabredav/lib/Sabre/DAVACL/PrincipalBackend/PDO.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAVACL/PrincipalCollection.php b/include/sabredav/lib/Sabre/DAVACL/PrincipalCollection.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAVACL/Property/Acl.php b/include/sabredav/lib/Sabre/DAVACL/Property/Acl.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAVACL/Property/AclRestrictions.php b/include/sabredav/lib/Sabre/DAVACL/Property/AclRestrictions.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAVACL/Property/CurrentUserPrivilegeSet.php b/include/sabredav/lib/Sabre/DAVACL/Property/CurrentUserPrivilegeSet.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAVACL/Property/Principal.php b/include/sabredav/lib/Sabre/DAVACL/Property/Principal.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAVACL/Property/SupportedPrivilegeSet.php b/include/sabredav/lib/Sabre/DAVACL/Property/SupportedPrivilegeSet.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/DAVACL/Version.php b/include/sabredav/lib/Sabre/DAVACL/Version.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/HTTP/AWSAuth.php b/include/sabredav/lib/Sabre/HTTP/AWSAuth.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/HTTP/AbstractAuth.php b/include/sabredav/lib/Sabre/HTTP/AbstractAuth.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/HTTP/BasicAuth.php b/include/sabredav/lib/Sabre/HTTP/BasicAuth.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/HTTP/DigestAuth.php b/include/sabredav/lib/Sabre/HTTP/DigestAuth.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/HTTP/Request.php b/include/sabredav/lib/Sabre/HTTP/Request.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/HTTP/Response.php b/include/sabredav/lib/Sabre/HTTP/Response.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/HTTP/Util.php b/include/sabredav/lib/Sabre/HTTP/Util.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/HTTP/Version.php b/include/sabredav/lib/Sabre/HTTP/Version.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/lib/Sabre/autoload.php b/include/sabredav/lib/Sabre/autoload.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CalDAV/Backend/AbstractPDOTest.php b/include/sabredav/tests/Sabre/CalDAV/Backend/AbstractPDOTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CalDAV/Backend/AbstractTest.php b/include/sabredav/tests/Sabre/CalDAV/Backend/AbstractTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CalDAV/Backend/Mock.php b/include/sabredav/tests/Sabre/CalDAV/Backend/Mock.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CalDAV/Backend/PDOMySQLTest.php b/include/sabredav/tests/Sabre/CalDAV/Backend/PDOMySQLTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CalDAV/Backend/PDOSqliteTest.php b/include/sabredav/tests/Sabre/CalDAV/Backend/PDOSqliteTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CalDAV/CalendarObjectTest.php b/include/sabredav/tests/Sabre/CalDAV/CalendarObjectTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CalDAV/CalendarQueryParserTest.php b/include/sabredav/tests/Sabre/CalDAV/CalendarQueryParserTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CalDAV/CalendarQueryVAlarmTest.php b/include/sabredav/tests/Sabre/CalDAV/CalendarQueryVAlarmTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CalDAV/CalendarQueryValidatorTest.php b/include/sabredav/tests/Sabre/CalDAV/CalendarQueryValidatorTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CalDAV/CalendarTest.php b/include/sabredav/tests/Sabre/CalDAV/CalendarTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDTest.php b/include/sabredav/tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDbyDayTest.php b/include/sabredav/tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDbyDayTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CalDAV/ExpandEventsDoubleEventsTest.php b/include/sabredav/tests/Sabre/CalDAV/ExpandEventsDoubleEventsTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CalDAV/FreeBusyReportTest.php b/include/sabredav/tests/Sabre/CalDAV/FreeBusyReportTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CalDAV/FreeBusyRequestTest.php b/include/sabredav/tests/Sabre/CalDAV/FreeBusyRequestTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CalDAV/GetEventsByTimerangeTest.php b/include/sabredav/tests/Sabre/CalDAV/GetEventsByTimerangeTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CalDAV/ICSExportPluginTest.php b/include/sabredav/tests/Sabre/CalDAV/ICSExportPluginTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CalDAV/Issue166Test.php b/include/sabredav/tests/Sabre/CalDAV/Issue166Test.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CalDAV/Issue172Test.php b/include/sabredav/tests/Sabre/CalDAV/Issue172Test.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CalDAV/Issue203Test.php b/include/sabredav/tests/Sabre/CalDAV/Issue203Test.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CalDAV/Issue205Test.php b/include/sabredav/tests/Sabre/CalDAV/Issue205Test.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CalDAV/Issue211Test.php b/include/sabredav/tests/Sabre/CalDAV/Issue211Test.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CalDAV/Issue220Test.php b/include/sabredav/tests/Sabre/CalDAV/Issue220Test.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CalDAV/Issue228Test.php b/include/sabredav/tests/Sabre/CalDAV/Issue228Test.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CalDAV/Notifications/CollectionTest.php b/include/sabredav/tests/Sabre/CalDAV/Notifications/CollectionTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CalDAV/Notifications/NodeTest.php b/include/sabredav/tests/Sabre/CalDAV/Notifications/NodeTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CalDAV/Notifications/Notification/InviteReplyTest.php b/include/sabredav/tests/Sabre/CalDAV/Notifications/Notification/InviteReplyTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CalDAV/Notifications/Notification/InviteTest.php b/include/sabredav/tests/Sabre/CalDAV/Notifications/Notification/InviteTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CalDAV/Notifications/Notification/SystemStatusTest.php b/include/sabredav/tests/Sabre/CalDAV/Notifications/Notification/SystemStatusTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CalDAV/OutboxPostTest.php b/include/sabredav/tests/Sabre/CalDAV/OutboxPostTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CalDAV/PluginTest.php b/include/sabredav/tests/Sabre/CalDAV/PluginTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CalDAV/Principal/CollectionTest.php b/include/sabredav/tests/Sabre/CalDAV/Principal/CollectionTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CalDAV/Principal/ProxyReadTest.php b/include/sabredav/tests/Sabre/CalDAV/Principal/ProxyReadTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CalDAV/Principal/ProxyWriteTest.php b/include/sabredav/tests/Sabre/CalDAV/Principal/ProxyWriteTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CalDAV/Principal/UserTest.php b/include/sabredav/tests/Sabre/CalDAV/Principal/UserTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CalDAV/Property/AllowedSharingModesTest.php b/include/sabredav/tests/Sabre/CalDAV/Property/AllowedSharingModesTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CalDAV/Property/InviteTest.php b/include/sabredav/tests/Sabre/CalDAV/Property/InviteTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CalDAV/Property/ScheduleCalendarTranspTest.php b/include/sabredav/tests/Sabre/CalDAV/Property/ScheduleCalendarTranspTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CalDAV/Property/SupportedCalendarComponentSetTest.php b/include/sabredav/tests/Sabre/CalDAV/Property/SupportedCalendarComponentSetTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CalDAV/Property/SupportedCalendarDataTest.php b/include/sabredav/tests/Sabre/CalDAV/Property/SupportedCalendarDataTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CalDAV/Property/SupportedCollationSetTest.php b/include/sabredav/tests/Sabre/CalDAV/Property/SupportedCollationSetTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CalDAV/Schedule/IMip/Mock.php b/include/sabredav/tests/Sabre/CalDAV/Schedule/IMip/Mock.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CalDAV/Schedule/OutboxTest.php b/include/sabredav/tests/Sabre/CalDAV/Schedule/OutboxTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CalDAV/ShareableCalendarTest.php b/include/sabredav/tests/Sabre/CalDAV/ShareableCalendarTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CalDAV/SharedCalendarTest.php b/include/sabredav/tests/Sabre/CalDAV/SharedCalendarTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CalDAV/SharingPluginTest.php b/include/sabredav/tests/Sabre/CalDAV/SharingPluginTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CalDAV/TestUtil.php b/include/sabredav/tests/Sabre/CalDAV/TestUtil.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CalDAV/UserCalendarsSharedCalendarsTest.php b/include/sabredav/tests/Sabre/CalDAV/UserCalendarsSharedCalendarsTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CalDAV/UserCalendarsTest.php b/include/sabredav/tests/Sabre/CalDAV/UserCalendarsTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CalDAV/ValidateICalTest.php b/include/sabredav/tests/Sabre/CalDAV/ValidateICalTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CalDAV/VersionTest.php b/include/sabredav/tests/Sabre/CalDAV/VersionTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CardDAV/AbstractPluginTest.php b/include/sabredav/tests/Sabre/CardDAV/AbstractPluginTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CardDAV/AddressBookQueryParserTest.php b/include/sabredav/tests/Sabre/CardDAV/AddressBookQueryParserTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CardDAV/AddressBookQueryTest.php b/include/sabredav/tests/Sabre/CardDAV/AddressBookQueryTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CardDAV/AddressBookRootTest.php b/include/sabredav/tests/Sabre/CardDAV/AddressBookRootTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CardDAV/AddressBookTest.php b/include/sabredav/tests/Sabre/CardDAV/AddressBookTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CardDAV/Backend/AbstractPDOTest.php b/include/sabredav/tests/Sabre/CardDAV/Backend/AbstractPDOTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CardDAV/Backend/Mock.php b/include/sabredav/tests/Sabre/CardDAV/Backend/Mock.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CardDAV/Backend/PDOMySQLTest.php b/include/sabredav/tests/Sabre/CardDAV/Backend/PDOMySQLTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CardDAV/Backend/PDOSqliteTest.php b/include/sabredav/tests/Sabre/CardDAV/Backend/PDOSqliteTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CardDAV/CardTest.php b/include/sabredav/tests/Sabre/CardDAV/CardTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CardDAV/IDirectoryTest.php b/include/sabredav/tests/Sabre/CardDAV/IDirectoryTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CardDAV/MultiGetTest.php b/include/sabredav/tests/Sabre/CardDAV/MultiGetTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CardDAV/PluginTest.php b/include/sabredav/tests/Sabre/CardDAV/PluginTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CardDAV/Property/SupportedAddressDataTest.php b/include/sabredav/tests/Sabre/CardDAV/Property/SupportedAddressDataTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CardDAV/SogoStripContentTypeTest.php b/include/sabredav/tests/Sabre/CardDAV/SogoStripContentTypeTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CardDAV/TestUtil.php b/include/sabredav/tests/Sabre/CardDAV/TestUtil.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CardDAV/UserAddressBooksTest.php b/include/sabredav/tests/Sabre/CardDAV/UserAddressBooksTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CardDAV/VCFExportTest.php b/include/sabredav/tests/Sabre/CardDAV/VCFExportTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CardDAV/ValidateFilterTest.php b/include/sabredav/tests/Sabre/CardDAV/ValidateFilterTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CardDAV/ValidateVCardTest.php b/include/sabredav/tests/Sabre/CardDAV/ValidateVCardTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/CardDAV/VersionTest.php b/include/sabredav/tests/Sabre/CardDAV/VersionTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/AbstractServer.php b/include/sabredav/tests/Sabre/DAV/AbstractServer.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/Auth/Backend/AbstractBasicTest.php b/include/sabredav/tests/Sabre/DAV/Auth/Backend/AbstractBasicTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/Auth/Backend/AbstractDigestTest.php b/include/sabredav/tests/Sabre/DAV/Auth/Backend/AbstractDigestTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/Auth/Backend/AbstractPDOTest.php b/include/sabredav/tests/Sabre/DAV/Auth/Backend/AbstractPDOTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/Auth/Backend/ApacheTest.php b/include/sabredav/tests/Sabre/DAV/Auth/Backend/ApacheTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/Auth/Backend/FileTest.php b/include/sabredav/tests/Sabre/DAV/Auth/Backend/FileTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/Auth/Backend/Mock.php b/include/sabredav/tests/Sabre/DAV/Auth/Backend/Mock.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/Auth/Backend/PDOMySQLTest.php b/include/sabredav/tests/Sabre/DAV/Auth/Backend/PDOMySQLTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/Auth/Backend/PDOSqliteTest.php b/include/sabredav/tests/Sabre/DAV/Auth/Backend/PDOSqliteTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/Auth/PluginTest.php b/include/sabredav/tests/Sabre/DAV/Auth/PluginTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/BasicNodeTest.php b/include/sabredav/tests/Sabre/DAV/BasicNodeTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/Browser/GuessContentTypeTest.php b/include/sabredav/tests/Sabre/DAV/Browser/GuessContentTypeTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/Browser/MapGetToPropFindTest.php b/include/sabredav/tests/Sabre/DAV/Browser/MapGetToPropFindTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/Browser/PluginTest.php b/include/sabredav/tests/Sabre/DAV/Browser/PluginTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/ClientMock.php b/include/sabredav/tests/Sabre/DAV/ClientMock.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/ClientTest.php b/include/sabredav/tests/Sabre/DAV/ClientTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/Exception/LockedTest.php b/include/sabredav/tests/Sabre/DAV/Exception/LockedTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/Exception/PaymentRequiredTest.php b/include/sabredav/tests/Sabre/DAV/Exception/PaymentRequiredTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/ExceptionTest.php b/include/sabredav/tests/Sabre/DAV/ExceptionTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/FSExt/FileTest.php b/include/sabredav/tests/Sabre/DAV/FSExt/FileTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/FSExt/NodeTest.php b/include/sabredav/tests/Sabre/DAV/FSExt/NodeTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/FSExt/ServerTest.php b/include/sabredav/tests/Sabre/DAV/FSExt/ServerTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/HTTPPreferParsingTest.php b/include/sabredav/tests/Sabre/DAV/HTTPPreferParsingTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/HttpDeleteTest.php b/include/sabredav/tests/Sabre/DAV/HttpDeleteTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/HttpPutTest.php b/include/sabredav/tests/Sabre/DAV/HttpPutTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/Issue33Test.php b/include/sabredav/tests/Sabre/DAV/Issue33Test.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/Locks/Backend/AbstractTest.php b/include/sabredav/tests/Sabre/DAV/Locks/Backend/AbstractTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/Locks/Backend/FSTest.php b/include/sabredav/tests/Sabre/DAV/Locks/Backend/FSTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/Locks/Backend/FileTest.php b/include/sabredav/tests/Sabre/DAV/Locks/Backend/FileTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/Locks/Backend/PDOMySQLTest.php b/include/sabredav/tests/Sabre/DAV/Locks/Backend/PDOMySQLTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/Locks/Backend/PDOTest.php b/include/sabredav/tests/Sabre/DAV/Locks/Backend/PDOTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/Locks/GetIfConditionsTest.php b/include/sabredav/tests/Sabre/DAV/Locks/GetIfConditionsTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/Locks/MSWordTest.php b/include/sabredav/tests/Sabre/DAV/Locks/MSWordTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/Locks/PluginTest.php b/include/sabredav/tests/Sabre/DAV/Locks/PluginTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/Mock/Collection.php b/include/sabredav/tests/Sabre/DAV/Mock/Collection.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/Mock/File.php b/include/sabredav/tests/Sabre/DAV/Mock/File.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/Mount/PluginTest.php b/include/sabredav/tests/Sabre/DAV/Mount/PluginTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/ObjectTreeTest.php b/include/sabredav/tests/Sabre/DAV/ObjectTreeTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/PartialUpdate/FileMock.php b/include/sabredav/tests/Sabre/DAV/PartialUpdate/FileMock.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/PartialUpdate/PluginTest.php b/include/sabredav/tests/Sabre/DAV/PartialUpdate/PluginTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/PartialUpdate/SpecificationTest.php b/include/sabredav/tests/Sabre/DAV/PartialUpdate/SpecificationTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/Property/GetLastModifiedTest.php b/include/sabredav/tests/Sabre/DAV/Property/GetLastModifiedTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/Property/HrefListTest.php b/include/sabredav/tests/Sabre/DAV/Property/HrefListTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/Property/HrefTest.php b/include/sabredav/tests/Sabre/DAV/Property/HrefTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/Property/ResourceTypeTest.php b/include/sabredav/tests/Sabre/DAV/Property/ResourceTypeTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/Property/ResponseListTest.php b/include/sabredav/tests/Sabre/DAV/Property/ResponseListTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/Property/ResponseTest.php b/include/sabredav/tests/Sabre/DAV/Property/ResponseTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/Property/SupportedReportSetTest.php b/include/sabredav/tests/Sabre/DAV/Property/SupportedReportSetTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/ServerCopyMoveTest.php b/include/sabredav/tests/Sabre/DAV/ServerCopyMoveTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/ServerEventsTest.php b/include/sabredav/tests/Sabre/DAV/ServerEventsTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/ServerMKCOLTest.php b/include/sabredav/tests/Sabre/DAV/ServerMKCOLTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/ServerPluginTest.php b/include/sabredav/tests/Sabre/DAV/ServerPluginTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/ServerPreconditionTest.php b/include/sabredav/tests/Sabre/DAV/ServerPreconditionTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/ServerPropsTest.php b/include/sabredav/tests/Sabre/DAV/ServerPropsTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/ServerRangeTest.php b/include/sabredav/tests/Sabre/DAV/ServerRangeTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/ServerSimpleTest.php b/include/sabredav/tests/Sabre/DAV/ServerSimpleTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/ServerUpdatePropertiesTest.php b/include/sabredav/tests/Sabre/DAV/ServerUpdatePropertiesTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/SimpleFileTest.php b/include/sabredav/tests/Sabre/DAV/SimpleFileTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/StringUtilTest.php b/include/sabredav/tests/Sabre/DAV/StringUtilTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/TemporaryFileFilterTest.php b/include/sabredav/tests/Sabre/DAV/TemporaryFileFilterTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/TestPlugin.php b/include/sabredav/tests/Sabre/DAV/TestPlugin.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/Tree/FilesystemTest.php b/include/sabredav/tests/Sabre/DAV/Tree/FilesystemTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/TreeTest.php b/include/sabredav/tests/Sabre/DAV/TreeTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/URLUtilTest.php b/include/sabredav/tests/Sabre/DAV/URLUtilTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/UUIDUtilTest.php b/include/sabredav/tests/Sabre/DAV/UUIDUtilTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAV/XMLUtilTest.php b/include/sabredav/tests/Sabre/DAV/XMLUtilTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAVACL/ACLMethodTest.php b/include/sabredav/tests/Sabre/DAVACL/ACLMethodTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAVACL/AllowAccessTest.php b/include/sabredav/tests/Sabre/DAVACL/AllowAccessTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAVACL/BlockAccessTest.php b/include/sabredav/tests/Sabre/DAVACL/BlockAccessTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAVACL/Exception/AceConflictTest.php b/include/sabredav/tests/Sabre/DAVACL/Exception/AceConflictTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAVACL/Exception/NeedPrivilegesExceptionTest.php b/include/sabredav/tests/Sabre/DAVACL/Exception/NeedPrivilegesExceptionTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAVACL/Exception/NoAbstractTest.php b/include/sabredav/tests/Sabre/DAVACL/Exception/NoAbstractTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAVACL/Exception/NotRecognizedPrincipalTest.php b/include/sabredav/tests/Sabre/DAVACL/Exception/NotRecognizedPrincipalTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAVACL/Exception/NotSupportedPrivilegeTest.php b/include/sabredav/tests/Sabre/DAVACL/Exception/NotSupportedPrivilegeTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAVACL/ExpandPropertiesTest.php b/include/sabredav/tests/Sabre/DAVACL/ExpandPropertiesTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAVACL/MockACLNode.php b/include/sabredav/tests/Sabre/DAVACL/MockACLNode.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAVACL/MockPrincipal.php b/include/sabredav/tests/Sabre/DAVACL/MockPrincipal.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAVACL/PluginAdminTest.php b/include/sabredav/tests/Sabre/DAVACL/PluginAdminTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAVACL/PluginPropertiesTest.php b/include/sabredav/tests/Sabre/DAVACL/PluginPropertiesTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAVACL/PluginUpdatePropertiesTest.php b/include/sabredav/tests/Sabre/DAVACL/PluginUpdatePropertiesTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAVACL/PrincipalBackend/AbstractPDOTest.php b/include/sabredav/tests/Sabre/DAVACL/PrincipalBackend/AbstractPDOTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAVACL/PrincipalBackend/Mock.php b/include/sabredav/tests/Sabre/DAVACL/PrincipalBackend/Mock.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAVACL/PrincipalBackend/PDOMySQLTest.php b/include/sabredav/tests/Sabre/DAVACL/PrincipalBackend/PDOMySQLTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAVACL/PrincipalBackend/PDOSqliteTest.php b/include/sabredav/tests/Sabre/DAVACL/PrincipalBackend/PDOSqliteTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAVACL/PrincipalCollectionTest.php b/include/sabredav/tests/Sabre/DAVACL/PrincipalCollectionTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAVACL/PrincipalPropertySearchTest.php b/include/sabredav/tests/Sabre/DAVACL/PrincipalPropertySearchTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAVACL/PrincipalSearchPropertySetTest.php b/include/sabredav/tests/Sabre/DAVACL/PrincipalSearchPropertySetTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAVACL/PrincipalTest.php b/include/sabredav/tests/Sabre/DAVACL/PrincipalTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAVACL/Property/ACLRestrictionsTest.php b/include/sabredav/tests/Sabre/DAVACL/Property/ACLRestrictionsTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAVACL/Property/ACLTest.php b/include/sabredav/tests/Sabre/DAVACL/Property/ACLTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAVACL/Property/CurrentUserPrivilegeSetTest.php b/include/sabredav/tests/Sabre/DAVACL/Property/CurrentUserPrivilegeSetTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAVACL/Property/PrincipalTest.php b/include/sabredav/tests/Sabre/DAVACL/Property/PrincipalTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAVACL/Property/SupportedPrivilegeSetTest.php b/include/sabredav/tests/Sabre/DAVACL/Property/SupportedPrivilegeSetTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAVACL/SimplePluginTest.php b/include/sabredav/tests/Sabre/DAVACL/SimplePluginTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAVACL/VersionTest.php b/include/sabredav/tests/Sabre/DAVACL/VersionTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/DAVServerTest.php b/include/sabredav/tests/Sabre/DAVServerTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/HTTP/AWSAuthTest.php b/include/sabredav/tests/Sabre/HTTP/AWSAuthTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/HTTP/BasicAuthTest.php b/include/sabredav/tests/Sabre/HTTP/BasicAuthTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/HTTP/DigestAuthTest.php b/include/sabredav/tests/Sabre/HTTP/DigestAuthTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/HTTP/RequestTest.php b/include/sabredav/tests/Sabre/HTTP/RequestTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/HTTP/ResponseMock.php b/include/sabredav/tests/Sabre/HTTP/ResponseMock.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/HTTP/ResponseTest.php b/include/sabredav/tests/Sabre/HTTP/ResponseTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/HTTP/UtilTest.php b/include/sabredav/tests/Sabre/HTTP/UtilTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/HTTP/VersionTest.php b/include/sabredav/tests/Sabre/HTTP/VersionTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/Sabre/TestUtil.php b/include/sabredav/tests/Sabre/TestUtil.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/bootstrap.php b/include/sabredav/tests/bootstrap.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/composer.vobject3.json b/include/sabredav/tests/composer.vobject3.json
old mode 100755
new mode 100644
diff --git a/include/sabredav/tests/phpunit.xml b/include/sabredav/tests/phpunit.xml
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/autoload.php b/include/sabredav/vendor/autoload.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/composer/ClassLoader.php b/include/sabredav/vendor/composer/ClassLoader.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/composer/autoload_classmap.php b/include/sabredav/vendor/composer/autoload_classmap.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/composer/autoload_namespaces.php b/include/sabredav/vendor/composer/autoload_namespaces.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/composer/autoload_psr4.php b/include/sabredav/vendor/composer/autoload_psr4.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/composer/autoload_real.php b/include/sabredav/vendor/composer/autoload_real.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/composer/installed.json b/include/sabredav/vendor/composer/installed.json
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/.gitignore b/include/sabredav/vendor/sabre/vobject/.gitignore
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/.travis.yml b/include/sabredav/vendor/sabre/vobject/.travis.yml
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/ChangeLog b/include/sabredav/vendor/sabre/vobject/ChangeLog
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/LICENSE b/include/sabredav/vendor/sabre/vobject/LICENSE
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/README.md b/include/sabredav/vendor/sabre/vobject/README.md
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/bin/bench.php b/include/sabredav/vendor/sabre/vobject/bin/bench.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/bin/generateicalendardata.php b/include/sabredav/vendor/sabre/vobject/bin/generateicalendardata.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/bin/vobjectvalidate.php b/include/sabredav/vendor/sabre/vobject/bin/vobjectvalidate.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/composer.json b/include/sabredav/vendor/sabre/vobject/composer.json
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VAlarm.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VAlarm.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VCalendar.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VCalendar.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VCard.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VCard.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VEvent.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VEvent.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VFreeBusy.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VFreeBusy.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VJournal.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VJournal.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VTodo.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VTodo.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/DateTimeParser.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/DateTimeParser.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Document.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Document.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/ElementList.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/ElementList.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/FreeBusyGenerator.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/FreeBusyGenerator.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Node.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Node.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Parameter.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Parameter.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/ParseException.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/ParseException.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Property.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Property.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Property/Compound.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Property/Compound.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Property/DateTime.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Property/DateTime.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Property/MultiDateTime.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Property/MultiDateTime.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Reader.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Reader.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/RecurrenceIterator.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/RecurrenceIterator.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Splitter/ICalendar.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Splitter/ICalendar.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Splitter/SplitterInterface.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Splitter/SplitterInterface.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Splitter/VCard.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Splitter/VCard.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/StringUtil.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/StringUtil.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/TimeZoneUtil.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/TimeZoneUtil.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Version.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Version.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/includes.php b/include/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/includes.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VAlarmTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VAlarmTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VCalendarTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VCalendarTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VCardTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VCardTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VEventTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VEventTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VFreeBusyTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VFreeBusyTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VJournalTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VJournalTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VTodoTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VTodoTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/ComponentTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/ComponentTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/DateTimeParserTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/DateTimeParserTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/DocumentTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/DocumentTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/ElementListTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/ElementListTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/EmClientTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/EmClientTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/FreeBusyGeneratorTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/FreeBusyGeneratorTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Issue153Test.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Issue153Test.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Issue154Test.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Issue154Test.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Issue48Test.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Issue48Test.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Issue50Test.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Issue50Test.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/ParameterTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/ParameterTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Property/CompoundTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Property/CompoundTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Property/DateTimeTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Property/DateTimeTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Property/MultiDateTimeTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Property/MultiDateTimeTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/PropertyTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/PropertyTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/ReaderTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/ReaderTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorFifthTuesdayProblemTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorFifthTuesdayProblemTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorIncorrectExpandTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorIncorrectExpandTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorInfiniteLoopProblemTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorInfiniteLoopProblemTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorMinusOneProblemTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorMinusOneProblemTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorMissingOverriddenTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorMissingOverriddenTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/SlashRTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/SlashRTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Splitter/ICalendarTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Splitter/ICalendarTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Splitter/VCardTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Splitter/VCardTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/StringUtilTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/StringUtilTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/TimeZoneUtilTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/TimeZoneUtilTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/VersionTest.php b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/VersionTest.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/issue153.vcf b/include/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/issue153.vcf
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/tests/bootstrap.php b/include/sabredav/vendor/sabre/vobject/tests/bootstrap.php
old mode 100755
new mode 100644
diff --git a/include/sabredav/vendor/sabre/vobject/tests/phpunit.xml b/include/sabredav/vendor/sabre/vobject/tests/phpunit.xml
old mode 100755
new mode 100644
diff --git a/include/sancho.inc.php b/include/sancho.inc.php
old mode 100755
new mode 100644
diff --git a/include/schluesseltyp.class.php b/include/schluesseltyp.class.php
old mode 100755
new mode 100644
diff --git a/include/securimage/AHGBold.ttf b/include/securimage/AHGBold.ttf
old mode 100755
new mode 100644
diff --git a/include/securimage/LICENSE.txt b/include/securimage/LICENSE.txt
old mode 100755
new mode 100644
diff --git a/include/securimage/README.FONT.txt b/include/securimage/README.FONT.txt
old mode 100755
new mode 100644
diff --git a/include/securimage/README.txt b/include/securimage/README.txt
old mode 100755
new mode 100644
diff --git a/include/securimage/WavFile.php b/include/securimage/WavFile.php
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/en/0.wav b/include/securimage/audio/en/0.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/en/1.wav b/include/securimage/audio/en/1.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/en/10.wav b/include/securimage/audio/en/10.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/en/11.wav b/include/securimage/audio/en/11.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/en/12.wav b/include/securimage/audio/en/12.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/en/13.wav b/include/securimage/audio/en/13.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/en/14.wav b/include/securimage/audio/en/14.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/en/15.wav b/include/securimage/audio/en/15.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/en/16.wav b/include/securimage/audio/en/16.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/en/17.wav b/include/securimage/audio/en/17.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/en/18.wav b/include/securimage/audio/en/18.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/en/19.wav b/include/securimage/audio/en/19.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/en/2.wav b/include/securimage/audio/en/2.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/en/20.wav b/include/securimage/audio/en/20.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/en/3.wav b/include/securimage/audio/en/3.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/en/4.wav b/include/securimage/audio/en/4.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/en/5.wav b/include/securimage/audio/en/5.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/en/6.wav b/include/securimage/audio/en/6.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/en/7.wav b/include/securimage/audio/en/7.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/en/8.wav b/include/securimage/audio/en/8.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/en/9.wav b/include/securimage/audio/en/9.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/en/A.wav b/include/securimage/audio/en/A.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/en/B.wav b/include/securimage/audio/en/B.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/en/C.wav b/include/securimage/audio/en/C.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/en/D.wav b/include/securimage/audio/en/D.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/en/E.wav b/include/securimage/audio/en/E.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/en/F.wav b/include/securimage/audio/en/F.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/en/G.wav b/include/securimage/audio/en/G.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/en/H.wav b/include/securimage/audio/en/H.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/en/I.wav b/include/securimage/audio/en/I.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/en/J.wav b/include/securimage/audio/en/J.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/en/K.wav b/include/securimage/audio/en/K.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/en/L.wav b/include/securimage/audio/en/L.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/en/M.wav b/include/securimage/audio/en/M.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/en/MINUS.wav b/include/securimage/audio/en/MINUS.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/en/N.wav b/include/securimage/audio/en/N.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/en/O.wav b/include/securimage/audio/en/O.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/en/P.wav b/include/securimage/audio/en/P.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/en/PLUS.wav b/include/securimage/audio/en/PLUS.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/en/Q.wav b/include/securimage/audio/en/Q.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/en/R.wav b/include/securimage/audio/en/R.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/en/S.wav b/include/securimage/audio/en/S.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/en/T.wav b/include/securimage/audio/en/T.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/en/TIMES.wav b/include/securimage/audio/en/TIMES.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/en/U.wav b/include/securimage/audio/en/U.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/en/V.wav b/include/securimage/audio/en/V.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/en/W.wav b/include/securimage/audio/en/W.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/en/X.wav b/include/securimage/audio/en/X.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/en/Y.wav b/include/securimage/audio/en/Y.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/en/Z.wav b/include/securimage/audio/en/Z.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/en/error.wav b/include/securimage/audio/en/error.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/noise/check-point-1.wav b/include/securimage/audio/noise/check-point-1.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/noise/crowd-talking-1.wav b/include/securimage/audio/noise/crowd-talking-1.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/noise/crowd-talking-6.wav b/include/securimage/audio/noise/crowd-talking-6.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/noise/crowd-talking-7.wav b/include/securimage/audio/noise/crowd-talking-7.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/audio/noise/kids-playing-1.wav b/include/securimage/audio/noise/kids-playing-1.wav
old mode 100755
new mode 100644
diff --git a/include/securimage/backgrounds/bg3.jpg b/include/securimage/backgrounds/bg3.jpg
old mode 100755
new mode 100644
diff --git a/include/securimage/backgrounds/bg4.jpg b/include/securimage/backgrounds/bg4.jpg
old mode 100755
new mode 100644
diff --git a/include/securimage/backgrounds/bg5.jpg b/include/securimage/backgrounds/bg5.jpg
old mode 100755
new mode 100644
diff --git a/include/securimage/backgrounds/bg6.png b/include/securimage/backgrounds/bg6.png
old mode 100755
new mode 100644
diff --git a/include/securimage/captcha.html b/include/securimage/captcha.html
old mode 100755
new mode 100644
diff --git a/include/securimage/database/.htaccess b/include/securimage/database/.htaccess
old mode 100755
new mode 100644
diff --git a/include/securimage/database/index.html b/include/securimage/database/index.html
old mode 100755
new mode 100644
diff --git a/include/securimage/database/securimage.sq3 b/include/securimage/database/securimage.sq3
old mode 100755
new mode 100644
diff --git a/include/securimage/images/audio_icon.png b/include/securimage/images/audio_icon.png
old mode 100755
new mode 100644
diff --git a/include/securimage/images/refresh.png b/include/securimage/images/refresh.png
old mode 100755
new mode 100644
diff --git a/include/securimage/securimage.php b/include/securimage/securimage.php
old mode 100755
new mode 100644
diff --git a/include/securimage/securimage_play.php b/include/securimage/securimage_play.php
old mode 100755
new mode 100644
diff --git a/include/securimage/securimage_play.swf b/include/securimage/securimage_play.swf
old mode 100755
new mode 100644
diff --git a/include/securimage/securimage_show.php b/include/securimage/securimage_show.php
old mode 100755
new mode 100644
diff --git a/include/securimage/words/words.txt b/include/securimage/words/words.txt
old mode 100755
new mode 100644
diff --git a/include/service.class.php b/include/service.class.php
old mode 100755
new mode 100644
diff --git a/include/sprache.class.php b/include/sprache.class.php
old mode 100755
new mode 100644
diff --git a/include/standort.class.php b/include/standort.class.php
old mode 100755
new mode 100644
diff --git a/include/statistik.class.php b/include/statistik.class.php
old mode 100755
new mode 100644
diff --git a/include/statusgrund.class.php b/include/statusgrund.class.php
old mode 100755
new mode 100644
diff --git a/include/student.class.php b/include/student.class.php
old mode 100755
new mode 100644
diff --git a/include/studentnote.class.php b/include/studentnote.class.php
old mode 100755
new mode 100644
diff --git a/include/studiengang.class.php b/include/studiengang.class.php
old mode 100755
new mode 100644
diff --git a/include/studienjahr.class.php b/include/studienjahr.class.php
old mode 100755
new mode 100644
diff --git a/include/studienordnung.class.php b/include/studienordnung.class.php
old mode 100755
new mode 100644
diff --git a/include/studienplan.class.php b/include/studienplan.class.php
old mode 100755
new mode 100644
diff --git a/include/studienplatz.class.php b/include/studienplatz.class.php
old mode 100755
new mode 100644
diff --git a/include/studiensemester.class.php b/include/studiensemester.class.php
old mode 100755
new mode 100644
diff --git a/include/studierendenantrag.class.php b/include/studierendenantrag.class.php
old mode 100755
new mode 100644
diff --git a/include/stunde.class.php b/include/stunde.class.php
old mode 100755
new mode 100644
diff --git a/include/stundenplan.class.php b/include/stundenplan.class.php
old mode 100755
new mode 100644
diff --git a/include/tags.class.php b/include/tags.class.php
old mode 100755
new mode 100644
diff --git a/include/template.class.php b/include/template.class.php
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/langs/de.js b/include/tiny_mce/langs/de.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/langs/en.js b/include/tiny_mce/langs/en.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/license.txt b/include/tiny_mce/license.txt
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/advhr/css/advhr.css b/include/tiny_mce/plugins/advhr/css/advhr.css
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/advhr/editor_plugin.js b/include/tiny_mce/plugins/advhr/editor_plugin.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/advhr/editor_plugin_src.js b/include/tiny_mce/plugins/advhr/editor_plugin_src.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/advhr/js/rule.js b/include/tiny_mce/plugins/advhr/js/rule.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/advhr/langs/de_dlg.js b/include/tiny_mce/plugins/advhr/langs/de_dlg.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/advhr/langs/en_dlg.js b/include/tiny_mce/plugins/advhr/langs/en_dlg.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/advhr/rule.htm b/include/tiny_mce/plugins/advhr/rule.htm
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/advimage/css/advimage.css b/include/tiny_mce/plugins/advimage/css/advimage.css
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/advimage/editor_plugin.js b/include/tiny_mce/plugins/advimage/editor_plugin.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/advimage/editor_plugin_src.js b/include/tiny_mce/plugins/advimage/editor_plugin_src.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/advimage/image.htm b/include/tiny_mce/plugins/advimage/image.htm
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/advimage/img/sample.gif b/include/tiny_mce/plugins/advimage/img/sample.gif
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/advimage/js/image.js b/include/tiny_mce/plugins/advimage/js/image.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/advimage/langs/de_dlg.js b/include/tiny_mce/plugins/advimage/langs/de_dlg.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/advimage/langs/en_dlg.js b/include/tiny_mce/plugins/advimage/langs/en_dlg.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/advlink/css/advlink.css b/include/tiny_mce/plugins/advlink/css/advlink.css
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/advlink/editor_plugin.js b/include/tiny_mce/plugins/advlink/editor_plugin.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/advlink/editor_plugin_src.js b/include/tiny_mce/plugins/advlink/editor_plugin_src.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/advlink/js/advlink.js b/include/tiny_mce/plugins/advlink/js/advlink.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/advlink/langs/de_dlg.js b/include/tiny_mce/plugins/advlink/langs/de_dlg.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/advlink/langs/en_dlg.js b/include/tiny_mce/plugins/advlink/langs/en_dlg.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/advlink/link.htm b/include/tiny_mce/plugins/advlink/link.htm
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/advlist/editor_plugin.js b/include/tiny_mce/plugins/advlist/editor_plugin.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/advlist/editor_plugin_src.js b/include/tiny_mce/plugins/advlist/editor_plugin_src.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/autoresize/editor_plugin.js b/include/tiny_mce/plugins/autoresize/editor_plugin.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/autoresize/editor_plugin_src.js b/include/tiny_mce/plugins/autoresize/editor_plugin_src.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/autosave/editor_plugin.js b/include/tiny_mce/plugins/autosave/editor_plugin.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/autosave/editor_plugin_src.js b/include/tiny_mce/plugins/autosave/editor_plugin_src.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/autosave/langs/en.js b/include/tiny_mce/plugins/autosave/langs/en.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/bbcode/editor_plugin.js b/include/tiny_mce/plugins/bbcode/editor_plugin.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/bbcode/editor_plugin_src.js b/include/tiny_mce/plugins/bbcode/editor_plugin_src.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/contextmenu/editor_plugin.js b/include/tiny_mce/plugins/contextmenu/editor_plugin.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/contextmenu/editor_plugin_src.js b/include/tiny_mce/plugins/contextmenu/editor_plugin_src.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/directionality/editor_plugin.js b/include/tiny_mce/plugins/directionality/editor_plugin.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/directionality/editor_plugin_src.js b/include/tiny_mce/plugins/directionality/editor_plugin_src.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/emotions/editor_plugin.js b/include/tiny_mce/plugins/emotions/editor_plugin.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/emotions/editor_plugin_src.js b/include/tiny_mce/plugins/emotions/editor_plugin_src.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/emotions/emotions.htm b/include/tiny_mce/plugins/emotions/emotions.htm
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/emotions/img/smiley-cool.gif b/include/tiny_mce/plugins/emotions/img/smiley-cool.gif
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/emotions/img/smiley-cry.gif b/include/tiny_mce/plugins/emotions/img/smiley-cry.gif
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/emotions/img/smiley-embarassed.gif b/include/tiny_mce/plugins/emotions/img/smiley-embarassed.gif
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif b/include/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/emotions/img/smiley-frown.gif b/include/tiny_mce/plugins/emotions/img/smiley-frown.gif
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/emotions/img/smiley-innocent.gif b/include/tiny_mce/plugins/emotions/img/smiley-innocent.gif
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/emotions/img/smiley-kiss.gif b/include/tiny_mce/plugins/emotions/img/smiley-kiss.gif
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/emotions/img/smiley-laughing.gif b/include/tiny_mce/plugins/emotions/img/smiley-laughing.gif
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/emotions/img/smiley-money-mouth.gif b/include/tiny_mce/plugins/emotions/img/smiley-money-mouth.gif
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/emotions/img/smiley-sealed.gif b/include/tiny_mce/plugins/emotions/img/smiley-sealed.gif
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/emotions/img/smiley-smile.gif b/include/tiny_mce/plugins/emotions/img/smiley-smile.gif
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/emotions/img/smiley-surprised.gif b/include/tiny_mce/plugins/emotions/img/smiley-surprised.gif
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/emotions/img/smiley-tongue-out.gif b/include/tiny_mce/plugins/emotions/img/smiley-tongue-out.gif
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/emotions/img/smiley-undecided.gif b/include/tiny_mce/plugins/emotions/img/smiley-undecided.gif
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/emotions/img/smiley-wink.gif b/include/tiny_mce/plugins/emotions/img/smiley-wink.gif
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/emotions/img/smiley-yell.gif b/include/tiny_mce/plugins/emotions/img/smiley-yell.gif
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/emotions/js/emotions.js b/include/tiny_mce/plugins/emotions/js/emotions.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/emotions/langs/de_dlg.js b/include/tiny_mce/plugins/emotions/langs/de_dlg.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/emotions/langs/en_dlg.js b/include/tiny_mce/plugins/emotions/langs/en_dlg.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/example/dialog.htm b/include/tiny_mce/plugins/example/dialog.htm
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/example/editor_plugin.js b/include/tiny_mce/plugins/example/editor_plugin.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/example/editor_plugin_src.js b/include/tiny_mce/plugins/example/editor_plugin_src.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/example/img/example.gif b/include/tiny_mce/plugins/example/img/example.gif
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/example/js/dialog.js b/include/tiny_mce/plugins/example/js/dialog.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/example/langs/en.js b/include/tiny_mce/plugins/example/langs/en.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/example/langs/en_dlg.js b/include/tiny_mce/plugins/example/langs/en_dlg.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/fullpage/css/fullpage.css b/include/tiny_mce/plugins/fullpage/css/fullpage.css
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/fullpage/editor_plugin.js b/include/tiny_mce/plugins/fullpage/editor_plugin.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/fullpage/editor_plugin_src.js b/include/tiny_mce/plugins/fullpage/editor_plugin_src.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/fullpage/fullpage.htm b/include/tiny_mce/plugins/fullpage/fullpage.htm
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/fullpage/js/fullpage.js b/include/tiny_mce/plugins/fullpage/js/fullpage.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/fullpage/langs/de_dlg.js b/include/tiny_mce/plugins/fullpage/langs/de_dlg.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/fullpage/langs/en_dlg.js b/include/tiny_mce/plugins/fullpage/langs/en_dlg.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/fullscreen/editor_plugin.js b/include/tiny_mce/plugins/fullscreen/editor_plugin.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/fullscreen/editor_plugin_src.js b/include/tiny_mce/plugins/fullscreen/editor_plugin_src.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/fullscreen/fullscreen.htm b/include/tiny_mce/plugins/fullscreen/fullscreen.htm
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/iespell/editor_plugin.js b/include/tiny_mce/plugins/iespell/editor_plugin.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/iespell/editor_plugin_src.js b/include/tiny_mce/plugins/iespell/editor_plugin_src.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/inlinepopups/editor_plugin.js b/include/tiny_mce/plugins/inlinepopups/editor_plugin.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/inlinepopups/editor_plugin_src.js b/include/tiny_mce/plugins/inlinepopups/editor_plugin_src.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif b/include/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/button.gif b/include/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/button.gif
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif b/include/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif b/include/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif b/include/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif b/include/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif b/include/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.css b/include/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.css
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/inlinepopups/template.htm b/include/tiny_mce/plugins/inlinepopups/template.htm
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/insertdatetime/editor_plugin.js b/include/tiny_mce/plugins/insertdatetime/editor_plugin.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/insertdatetime/editor_plugin_src.js b/include/tiny_mce/plugins/insertdatetime/editor_plugin_src.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/layer/editor_plugin.js b/include/tiny_mce/plugins/layer/editor_plugin.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/layer/editor_plugin_src.js b/include/tiny_mce/plugins/layer/editor_plugin_src.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/legacyoutput/editor_plugin.js b/include/tiny_mce/plugins/legacyoutput/editor_plugin.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/legacyoutput/editor_plugin_src.js b/include/tiny_mce/plugins/legacyoutput/editor_plugin_src.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/media/css/media.css b/include/tiny_mce/plugins/media/css/media.css
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/media/editor_plugin.js b/include/tiny_mce/plugins/media/editor_plugin.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/media/editor_plugin_src.js b/include/tiny_mce/plugins/media/editor_plugin_src.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/media/js/embed.js b/include/tiny_mce/plugins/media/js/embed.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/media/js/media.js b/include/tiny_mce/plugins/media/js/media.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/media/langs/de_dlg.js b/include/tiny_mce/plugins/media/langs/de_dlg.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/media/langs/en_dlg.js b/include/tiny_mce/plugins/media/langs/en_dlg.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/media/media.htm b/include/tiny_mce/plugins/media/media.htm
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/media/moxieplayer.swf b/include/tiny_mce/plugins/media/moxieplayer.swf
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/nonbreaking/editor_plugin.js b/include/tiny_mce/plugins/nonbreaking/editor_plugin.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/nonbreaking/editor_plugin_src.js b/include/tiny_mce/plugins/nonbreaking/editor_plugin_src.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/noneditable/editor_plugin.js b/include/tiny_mce/plugins/noneditable/editor_plugin.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/noneditable/editor_plugin_src.js b/include/tiny_mce/plugins/noneditable/editor_plugin_src.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/pagebreak/editor_plugin.js b/include/tiny_mce/plugins/pagebreak/editor_plugin.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/pagebreak/editor_plugin_src.js b/include/tiny_mce/plugins/pagebreak/editor_plugin_src.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/paste/editor_plugin.js b/include/tiny_mce/plugins/paste/editor_plugin.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/paste/editor_plugin_src.js b/include/tiny_mce/plugins/paste/editor_plugin_src.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/paste/js/pastetext.js b/include/tiny_mce/plugins/paste/js/pastetext.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/paste/js/pasteword.js b/include/tiny_mce/plugins/paste/js/pasteword.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/paste/langs/de_dlg.js b/include/tiny_mce/plugins/paste/langs/de_dlg.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/paste/langs/en_dlg.js b/include/tiny_mce/plugins/paste/langs/en_dlg.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/paste/pastetext.htm b/include/tiny_mce/plugins/paste/pastetext.htm
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/paste/pasteword.htm b/include/tiny_mce/plugins/paste/pasteword.htm
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/preview/editor_plugin.js b/include/tiny_mce/plugins/preview/editor_plugin.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/preview/editor_plugin_src.js b/include/tiny_mce/plugins/preview/editor_plugin_src.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/preview/example.html b/include/tiny_mce/plugins/preview/example.html
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/preview/jscripts/embed.js b/include/tiny_mce/plugins/preview/jscripts/embed.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/preview/preview.html b/include/tiny_mce/plugins/preview/preview.html
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/print/editor_plugin.js b/include/tiny_mce/plugins/print/editor_plugin.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/print/editor_plugin_src.js b/include/tiny_mce/plugins/print/editor_plugin_src.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/save/editor_plugin.js b/include/tiny_mce/plugins/save/editor_plugin.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/save/editor_plugin_src.js b/include/tiny_mce/plugins/save/editor_plugin_src.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/searchreplace/css/searchreplace.css b/include/tiny_mce/plugins/searchreplace/css/searchreplace.css
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/searchreplace/editor_plugin.js b/include/tiny_mce/plugins/searchreplace/editor_plugin.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/searchreplace/editor_plugin_src.js b/include/tiny_mce/plugins/searchreplace/editor_plugin_src.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/searchreplace/js/searchreplace.js b/include/tiny_mce/plugins/searchreplace/js/searchreplace.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/searchreplace/langs/de_dlg.js b/include/tiny_mce/plugins/searchreplace/langs/de_dlg.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/searchreplace/langs/en_dlg.js b/include/tiny_mce/plugins/searchreplace/langs/en_dlg.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/searchreplace/searchreplace.htm b/include/tiny_mce/plugins/searchreplace/searchreplace.htm
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/spellchecker/css/content.css b/include/tiny_mce/plugins/spellchecker/css/content.css
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/spellchecker/editor_plugin.js b/include/tiny_mce/plugins/spellchecker/editor_plugin.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/spellchecker/editor_plugin_src.js b/include/tiny_mce/plugins/spellchecker/editor_plugin_src.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/spellchecker/img/wline.gif b/include/tiny_mce/plugins/spellchecker/img/wline.gif
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/style/css/props.css b/include/tiny_mce/plugins/style/css/props.css
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/style/editor_plugin.js b/include/tiny_mce/plugins/style/editor_plugin.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/style/editor_plugin_src.js b/include/tiny_mce/plugins/style/editor_plugin_src.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/style/js/props.js b/include/tiny_mce/plugins/style/js/props.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/style/langs/de_dlg.js b/include/tiny_mce/plugins/style/langs/de_dlg.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/style/langs/en_dlg.js b/include/tiny_mce/plugins/style/langs/en_dlg.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/style/props.htm b/include/tiny_mce/plugins/style/props.htm
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/tabfocus/editor_plugin.js b/include/tiny_mce/plugins/tabfocus/editor_plugin.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/tabfocus/editor_plugin_src.js b/include/tiny_mce/plugins/tabfocus/editor_plugin_src.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/table/cell.htm b/include/tiny_mce/plugins/table/cell.htm
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/table/css/cell.css b/include/tiny_mce/plugins/table/css/cell.css
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/table/css/row.css b/include/tiny_mce/plugins/table/css/row.css
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/table/css/table.css b/include/tiny_mce/plugins/table/css/table.css
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/table/editor_plugin.js b/include/tiny_mce/plugins/table/editor_plugin.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/table/editor_plugin_src.js b/include/tiny_mce/plugins/table/editor_plugin_src.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/table/js/cell.js b/include/tiny_mce/plugins/table/js/cell.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/table/js/merge_cells.js b/include/tiny_mce/plugins/table/js/merge_cells.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/table/js/row.js b/include/tiny_mce/plugins/table/js/row.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/table/js/table.js b/include/tiny_mce/plugins/table/js/table.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/table/langs/de_dlg.js b/include/tiny_mce/plugins/table/langs/de_dlg.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/table/langs/en_dlg.js b/include/tiny_mce/plugins/table/langs/en_dlg.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/table/merge_cells.htm b/include/tiny_mce/plugins/table/merge_cells.htm
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/table/row.htm b/include/tiny_mce/plugins/table/row.htm
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/table/table.htm b/include/tiny_mce/plugins/table/table.htm
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/template/blank.htm b/include/tiny_mce/plugins/template/blank.htm
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/template/css/template.css b/include/tiny_mce/plugins/template/css/template.css
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/template/editor_plugin.js b/include/tiny_mce/plugins/template/editor_plugin.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/template/editor_plugin_src.js b/include/tiny_mce/plugins/template/editor_plugin_src.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/template/js/template.js b/include/tiny_mce/plugins/template/js/template.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/template/langs/de_dlg.js b/include/tiny_mce/plugins/template/langs/de_dlg.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/template/langs/en_dlg.js b/include/tiny_mce/plugins/template/langs/en_dlg.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/template/template.htm b/include/tiny_mce/plugins/template/template.htm
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/visualchars/editor_plugin.js b/include/tiny_mce/plugins/visualchars/editor_plugin.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/visualchars/editor_plugin_src.js b/include/tiny_mce/plugins/visualchars/editor_plugin_src.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/wordc/langs/de_dlg.js b/include/tiny_mce/plugins/wordc/langs/de_dlg.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/wordc/langs/en_dlg.js b/include/tiny_mce/plugins/wordc/langs/en_dlg.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/wordcount/editor_plugin.js b/include/tiny_mce/plugins/wordcount/editor_plugin.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/wordcount/editor_plugin_src.js b/include/tiny_mce/plugins/wordcount/editor_plugin_src.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/xhtmlxtras/abbr.htm b/include/tiny_mce/plugins/xhtmlxtras/abbr.htm
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/xhtmlxtras/acronym.htm b/include/tiny_mce/plugins/xhtmlxtras/acronym.htm
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/xhtmlxtras/attributes.htm b/include/tiny_mce/plugins/xhtmlxtras/attributes.htm
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/xhtmlxtras/cite.htm b/include/tiny_mce/plugins/xhtmlxtras/cite.htm
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/xhtmlxtras/css/attributes.css b/include/tiny_mce/plugins/xhtmlxtras/css/attributes.css
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/xhtmlxtras/css/popup.css b/include/tiny_mce/plugins/xhtmlxtras/css/popup.css
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/xhtmlxtras/del.htm b/include/tiny_mce/plugins/xhtmlxtras/del.htm
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/xhtmlxtras/editor_plugin.js b/include/tiny_mce/plugins/xhtmlxtras/editor_plugin.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js b/include/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/xhtmlxtras/ins.htm b/include/tiny_mce/plugins/xhtmlxtras/ins.htm
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/xhtmlxtras/js/abbr.js b/include/tiny_mce/plugins/xhtmlxtras/js/abbr.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/xhtmlxtras/js/acronym.js b/include/tiny_mce/plugins/xhtmlxtras/js/acronym.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/xhtmlxtras/js/attributes.js b/include/tiny_mce/plugins/xhtmlxtras/js/attributes.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/xhtmlxtras/js/cite.js b/include/tiny_mce/plugins/xhtmlxtras/js/cite.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/xhtmlxtras/js/del.js b/include/tiny_mce/plugins/xhtmlxtras/js/del.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/xhtmlxtras/js/element_common.js b/include/tiny_mce/plugins/xhtmlxtras/js/element_common.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/xhtmlxtras/js/ins.js b/include/tiny_mce/plugins/xhtmlxtras/js/ins.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/xhtmlxtras/langs/de_dlg.js b/include/tiny_mce/plugins/xhtmlxtras/langs/de_dlg.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js b/include/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/advanced/about.htm b/include/tiny_mce/themes/advanced/about.htm
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/advanced/anchor.htm b/include/tiny_mce/themes/advanced/anchor.htm
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/advanced/charmap.htm b/include/tiny_mce/themes/advanced/charmap.htm
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/advanced/color_picker.htm b/include/tiny_mce/themes/advanced/color_picker.htm
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/advanced/editor_template.js b/include/tiny_mce/themes/advanced/editor_template.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/advanced/editor_template_src.js b/include/tiny_mce/themes/advanced/editor_template_src.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/advanced/image.htm b/include/tiny_mce/themes/advanced/image.htm
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/advanced/img/colorpicker.jpg b/include/tiny_mce/themes/advanced/img/colorpicker.jpg
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/advanced/img/flash.gif b/include/tiny_mce/themes/advanced/img/flash.gif
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/advanced/img/icons.gif b/include/tiny_mce/themes/advanced/img/icons.gif
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/advanced/img/iframe.gif b/include/tiny_mce/themes/advanced/img/iframe.gif
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/advanced/img/pagebreak.gif b/include/tiny_mce/themes/advanced/img/pagebreak.gif
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/advanced/img/quicktime.gif b/include/tiny_mce/themes/advanced/img/quicktime.gif
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/advanced/img/realmedia.gif b/include/tiny_mce/themes/advanced/img/realmedia.gif
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/advanced/img/shockwave.gif b/include/tiny_mce/themes/advanced/img/shockwave.gif
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/advanced/img/trans.gif b/include/tiny_mce/themes/advanced/img/trans.gif
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/advanced/img/video.gif b/include/tiny_mce/themes/advanced/img/video.gif
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/advanced/img/windowsmedia.gif b/include/tiny_mce/themes/advanced/img/windowsmedia.gif
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/advanced/js/about.js b/include/tiny_mce/themes/advanced/js/about.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/advanced/js/anchor.js b/include/tiny_mce/themes/advanced/js/anchor.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/advanced/js/charmap.js b/include/tiny_mce/themes/advanced/js/charmap.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/advanced/js/color_picker.js b/include/tiny_mce/themes/advanced/js/color_picker.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/advanced/js/image.js b/include/tiny_mce/themes/advanced/js/image.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/advanced/js/link.js b/include/tiny_mce/themes/advanced/js/link.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/advanced/js/source_editor.js b/include/tiny_mce/themes/advanced/js/source_editor.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/advanced/langs/de.js b/include/tiny_mce/themes/advanced/langs/de.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/advanced/langs/de_dlg.js b/include/tiny_mce/themes/advanced/langs/de_dlg.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/advanced/langs/en.js b/include/tiny_mce/themes/advanced/langs/en.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/advanced/langs/en_dlg.js b/include/tiny_mce/themes/advanced/langs/en_dlg.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/advanced/link.htm b/include/tiny_mce/themes/advanced/link.htm
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/advanced/shortcuts.htm b/include/tiny_mce/themes/advanced/shortcuts.htm
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/advanced/skins/default/content.css b/include/tiny_mce/themes/advanced/skins/default/content.css
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/advanced/skins/default/dialog.css b/include/tiny_mce/themes/advanced/skins/default/dialog.css
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/advanced/skins/default/img/buttons.png b/include/tiny_mce/themes/advanced/skins/default/img/buttons.png
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/advanced/skins/default/img/items.gif b/include/tiny_mce/themes/advanced/skins/default/img/items.gif
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/advanced/skins/default/img/menu_arrow.gif b/include/tiny_mce/themes/advanced/skins/default/img/menu_arrow.gif
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/advanced/skins/default/img/menu_check.gif b/include/tiny_mce/themes/advanced/skins/default/img/menu_check.gif
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/advanced/skins/default/img/progress.gif b/include/tiny_mce/themes/advanced/skins/default/img/progress.gif
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/advanced/skins/default/img/tabs.gif b/include/tiny_mce/themes/advanced/skins/default/img/tabs.gif
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/advanced/skins/default/ui.css b/include/tiny_mce/themes/advanced/skins/default/ui.css
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/advanced/skins/highcontrast/content.css b/include/tiny_mce/themes/advanced/skins/highcontrast/content.css
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/advanced/skins/highcontrast/dialog.css b/include/tiny_mce/themes/advanced/skins/highcontrast/dialog.css
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/advanced/skins/highcontrast/ui.css b/include/tiny_mce/themes/advanced/skins/highcontrast/ui.css
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/advanced/skins/o2k7/content.css b/include/tiny_mce/themes/advanced/skins/o2k7/content.css
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/advanced/skins/o2k7/dialog.css b/include/tiny_mce/themes/advanced/skins/o2k7/dialog.css
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png b/include/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_black.png b/include/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_black.png
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_silver.png b/include/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_silver.png
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/advanced/skins/o2k7/ui.css b/include/tiny_mce/themes/advanced/skins/o2k7/ui.css
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/advanced/skins/o2k7/ui_black.css b/include/tiny_mce/themes/advanced/skins/o2k7/ui_black.css
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css b/include/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/advanced/source_editor.htm b/include/tiny_mce/themes/advanced/source_editor.htm
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/simple/editor_template.js b/include/tiny_mce/themes/simple/editor_template.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/simple/editor_template_src.js b/include/tiny_mce/themes/simple/editor_template_src.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/simple/img/icons.gif b/include/tiny_mce/themes/simple/img/icons.gif
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/simple/langs/de.js b/include/tiny_mce/themes/simple/langs/de.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/simple/langs/en.js b/include/tiny_mce/themes/simple/langs/en.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/simple/skins/default/content.css b/include/tiny_mce/themes/simple/skins/default/content.css
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/simple/skins/default/ui.css b/include/tiny_mce/themes/simple/skins/default/ui.css
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/simple/skins/o2k7/content.css b/include/tiny_mce/themes/simple/skins/o2k7/content.css
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/simple/skins/o2k7/img/button_bg.png b/include/tiny_mce/themes/simple/skins/o2k7/img/button_bg.png
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/themes/simple/skins/o2k7/ui.css b/include/tiny_mce/themes/simple/skins/o2k7/ui.css
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/tiny_mce.js b/include/tiny_mce/tiny_mce.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/tiny_mce_popup.js b/include/tiny_mce/tiny_mce_popup.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/tiny_mce_src.js b/include/tiny_mce/tiny_mce_src.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/utils/editable_selects.js b/include/tiny_mce/utils/editable_selects.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/utils/form_utils.js b/include/tiny_mce/utils/form_utils.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/utils/mctabs.js b/include/tiny_mce/utils/mctabs.js
old mode 100755
new mode 100644
diff --git a/include/tiny_mce/utils/validate.js b/include/tiny_mce/utils/validate.js
old mode 100755
new mode 100644
diff --git a/include/tw/abgabe_lektor_benotung.php b/include/tw/abgabe_lektor_benotung.php
old mode 100755
new mode 100644
diff --git a/include/tw/cis_menu_lv.inc.php b/include/tw/cis_menu_lv.inc.php
old mode 100755
new mode 100644
diff --git a/include/tw/fas_zusatzmenues.inc.php b/include/tw/fas_zusatzmenues.inc.php
old mode 100755
new mode 100644
diff --git a/include/tw/fas_zusatzmenues.js.php b/include/tw/fas_zusatzmenues.js.php
old mode 100755
new mode 100644
diff --git a/include/tw/generateZahlungsreferenz.inc.php b/include/tw/generateZahlungsreferenz.inc.php
old mode 100755
new mode 100644
diff --git a/include/tw/generatematrikelnr.inc.php b/include/tw/generatematrikelnr.inc.php
old mode 100755
new mode 100644
diff --git a/include/tw/generateuid.inc.php b/include/tw/generateuid.inc.php
old mode 100755
new mode 100644
diff --git a/include/tw/index.html b/include/tw/index.html
old mode 100755
new mode 100644
diff --git a/include/tw/passwort.inc.php b/include/tw/passwort.inc.php
old mode 100755
new mode 100644
diff --git a/include/tw/serviceterminal.inc.php b/include/tw/serviceterminal.inc.php
old mode 100755
new mode 100644
diff --git a/include/tw/vilesci_menu_main.inc.php b/include/tw/vilesci_menu_main.inc.php
old mode 100755
new mode 100644
diff --git a/include/tw/wawi_menu_main.inc.php b/include/tw/wawi_menu_main.inc.php
old mode 100755
new mode 100644
diff --git a/include/udf.class.php b/include/udf.class.php
old mode 100755
new mode 100644
diff --git a/include/uebung.class.php b/include/uebung.class.php
old mode 100755
new mode 100644
diff --git a/include/variable.class.php b/include/variable.class.php
old mode 100755
new mode 100644
diff --git a/include/vendor_custom/angular-tablesorter/tablesort.css b/include/vendor_custom/angular-tablesorter/tablesort.css
old mode 100755
new mode 100644
diff --git a/include/vendor_custom/easyui/easyui.css b/include/vendor_custom/easyui/easyui.css
old mode 100755
new mode 100644
diff --git a/include/vendor_custom/easyui/icon.css b/include/vendor_custom/easyui/icon.css
old mode 100755
new mode 100644
diff --git a/include/vendor_custom/jquery-tablesorter/tablesort.css b/include/vendor_custom/jquery-tablesorter/tablesort.css
old mode 100755
new mode 100644
diff --git a/include/vertrag.class.php b/include/vertrag.class.php
old mode 100755
new mode 100644
diff --git a/include/vorlage.class.php b/include/vorlage.class.php
old mode 100755
new mode 100644
diff --git a/include/vorschlag.class.php b/include/vorschlag.class.php
old mode 100755
new mode 100644
diff --git a/include/wawi_aufteilung.class.php b/include/wawi_aufteilung.class.php
old mode 100755
new mode 100644
diff --git a/include/wawi_bestelldetail.class.php b/include/wawi_bestelldetail.class.php
old mode 100755
new mode 100644
diff --git a/include/wawi_bestellstatus.class.php b/include/wawi_bestellstatus.class.php
old mode 100755
new mode 100644
diff --git a/include/wawi_bestellung.class.php b/include/wawi_bestellung.class.php
old mode 100755
new mode 100644
diff --git a/include/wawi_konto.class.php b/include/wawi_konto.class.php
old mode 100755
new mode 100644
diff --git a/include/wawi_kostenstelle.class.php b/include/wawi_kostenstelle.class.php
old mode 100755
new mode 100644
diff --git a/include/wawi_rechnung.class.php b/include/wawi_rechnung.class.php
old mode 100755
new mode 100644
diff --git a/include/wawi_zahlungstyp.class.php b/include/wawi_zahlungstyp.class.php
old mode 100755
new mode 100644
diff --git a/include/webservicelog.class.php b/include/webservicelog.class.php
old mode 100755
new mode 100644
diff --git a/include/webservicerecht.class.php b/include/webservicerecht.class.php
old mode 100755
new mode 100644
diff --git a/include/wochenplan.class.php b/include/wochenplan.class.php
old mode 100755
new mode 100644
diff --git a/include/xmlrpcutils/utils.php b/include/xmlrpcutils/utils.php
old mode 100755
new mode 100644
diff --git a/include/xsdformprinter/config.inc.php b/include/xsdformprinter/config.inc.php
old mode 100755
new mode 100644
diff --git a/include/xsdformprinter/examples/shiporder.xml b/include/xsdformprinter/examples/shiporder.xml
old mode 100755
new mode 100644
diff --git a/include/xsdformprinter/examples/shiporder1.xsd b/include/xsdformprinter/examples/shiporder1.xsd
old mode 100755
new mode 100644
diff --git a/include/xsdformprinter/examples/shiporder2.xsd b/include/xsdformprinter/examples/shiporder2.xsd
old mode 100755
new mode 100644
diff --git a/include/xsdformprinter/style.css b/include/xsdformprinter/style.css
old mode 100755
new mode 100644
diff --git a/include/xsdformprinter/types.php b/include/xsdformprinter/types.php
old mode 100755
new mode 100644
diff --git a/include/xsdformprinter/xfp.php b/include/xsdformprinter/xfp.php
old mode 100755
new mode 100644
diff --git a/include/xsdformprinter/xsdformprinter.php b/include/xsdformprinter/xsdformprinter.php
old mode 100755
new mode 100644
diff --git a/include/zeitaufzeichnung.class.php b/include/zeitaufzeichnung.class.php
old mode 100755
new mode 100644
diff --git a/include/zeitaufzeichnung_gd.class.php b/include/zeitaufzeichnung_gd.class.php
old mode 100755
new mode 100644
diff --git a/include/zeitaufzeichnung_import.class.php b/include/zeitaufzeichnung_import.class.php
old mode 100755
new mode 100644
diff --git a/include/zeitaufzeichnung_import_csv.class.php b/include/zeitaufzeichnung_import_csv.class.php
old mode 100755
new mode 100644
diff --git a/include/zeitaufzeichnung_import_post.class.php b/include/zeitaufzeichnung_import_post.class.php
old mode 100755
new mode 100644
diff --git a/include/zeitsperre.class.php b/include/zeitsperre.class.php
old mode 100755
new mode 100644
diff --git a/include/zeitwunsch.class.php b/include/zeitwunsch.class.php
old mode 100755
new mode 100644
diff --git a/include/zeitwunsch_gueltigkeit.class.php b/include/zeitwunsch_gueltigkeit.class.php
old mode 100755
new mode 100644
diff --git a/include/zeugnisnote.class.php b/include/zeugnisnote.class.php
old mode 100755
new mode 100644
diff --git a/include/zgv.class.php b/include/zgv.class.php
old mode 100755
new mode 100644
diff --git a/include/zweck.class.php b/include/zweck.class.php
old mode 100755
new mode 100644
diff --git a/index.ci.php b/index.ci.php
old mode 100755
new mode 100644
diff --git a/index.cis.html b/index.cis.html
old mode 100755
new mode 100644
diff --git a/index.vilesci.php b/index.vilesci.php
old mode 100755
new mode 100644
diff --git a/locale/contents.rdf b/locale/contents.rdf
old mode 100755
new mode 100644
diff --git a/locale/de-AT/abgabetool.php b/locale/de-AT/abgabetool.php
old mode 100755
new mode 100644
diff --git a/locale/de-AT/anwesenheitsliste.php b/locale/de-AT/anwesenheitsliste.php
old mode 100755
new mode 100644
diff --git a/locale/de-AT/benotungstool.php b/locale/de-AT/benotungstool.php
old mode 100755
new mode 100644
diff --git a/locale/de-AT/buchungen.php b/locale/de-AT/buchungen.php
old mode 100755
new mode 100644
diff --git a/locale/de-AT/contents.rdf b/locale/de-AT/contents.rdf
old mode 100755
new mode 100644
diff --git a/locale/de-AT/coodle.php b/locale/de-AT/coodle.php
old mode 100755
new mode 100644
diff --git a/locale/de-AT/courseInformation.php b/locale/de-AT/courseInformation.php
old mode 100755
new mode 100644
diff --git a/locale/de-AT/dms_link.php b/locale/de-AT/dms_link.php
old mode 100755
new mode 100644
diff --git a/locale/de-AT/errors.php b/locale/de-AT/errors.php
old mode 100755
new mode 100644
diff --git a/locale/de-AT/eventkalender.php b/locale/de-AT/eventkalender.php
old mode 100755
new mode 100644
diff --git a/locale/de-AT/fas.dtd b/locale/de-AT/fas.dtd
old mode 100755
new mode 100644
diff --git a/locale/de-AT/feedback.php b/locale/de-AT/feedback.php
old mode 100755
new mode 100644
diff --git a/locale/de-AT/freebusy.php b/locale/de-AT/freebusy.php
old mode 100755
new mode 100644
diff --git a/locale/de-AT/freifach.php b/locale/de-AT/freifach.php
old mode 100755
new mode 100644
diff --git a/locale/de-AT/gesamtnote.php b/locale/de-AT/gesamtnote.php
old mode 100755
new mode 100644
diff --git a/locale/de-AT/global.php b/locale/de-AT/global.php
old mode 100755
new mode 100644
diff --git a/locale/de-AT/incoming.php b/locale/de-AT/incoming.php
old mode 100755
new mode 100644
diff --git a/locale/de-AT/ktu.php b/locale/de-AT/ktu.php
old mode 100755
new mode 100644
diff --git a/locale/de-AT/lehre.php b/locale/de-AT/lehre.php
old mode 100755
new mode 100644
diff --git a/locale/de-AT/lehrveranstaltung.php b/locale/de-AT/lehrveranstaltung.php
old mode 100755
new mode 100644
diff --git a/locale/de-AT/lvaliste.php b/locale/de-AT/lvaliste.php
old mode 100755
new mode 100644
diff --git a/locale/de-AT/lvinfo.php b/locale/de-AT/lvinfo.php
old mode 100755
new mode 100644
diff --git a/locale/de-AT/lvplan.php b/locale/de-AT/lvplan.php
old mode 100755
new mode 100644
diff --git a/locale/de-AT/mail.php b/locale/de-AT/mail.php
old mode 100755
new mode 100644
diff --git a/locale/de-AT/mailverteiler.php b/locale/de-AT/mailverteiler.php
old mode 100755
new mode 100644
diff --git a/locale/de-AT/menu.php b/locale/de-AT/menu.php
old mode 100755
new mode 100644
diff --git a/locale/de-AT/news.php b/locale/de-AT/news.php
old mode 100755
new mode 100644
diff --git a/locale/de-AT/notebookregister.php b/locale/de-AT/notebookregister.php
old mode 100755
new mode 100644
diff --git a/locale/de-AT/notfallbestimmungen.php b/locale/de-AT/notfallbestimmungen.php
old mode 100755
new mode 100644
diff --git a/locale/de-AT/passwort.php b/locale/de-AT/passwort.php
old mode 100755
new mode 100644
diff --git a/locale/de-AT/personensuche.php b/locale/de-AT/personensuche.php
old mode 100755
new mode 100644
diff --git a/locale/de-AT/planner.dtd b/locale/de-AT/planner.dtd
old mode 100755
new mode 100644
diff --git a/locale/de-AT/profil.php b/locale/de-AT/profil.php
old mode 100755
new mode 100644
diff --git a/locale/de-AT/pruefung.php b/locale/de-AT/pruefung.php
old mode 100755
new mode 100644
diff --git a/locale/de-AT/reihungstest.php b/locale/de-AT/reihungstest.php
old mode 100755
new mode 100644
diff --git a/locale/de-AT/semesterplan.php b/locale/de-AT/semesterplan.php
old mode 100755
new mode 100644
diff --git a/locale/de-AT/services.php b/locale/de-AT/services.php
old mode 100755
new mode 100644
diff --git a/locale/de-AT/studienplan.php b/locale/de-AT/studienplan.php
old mode 100755
new mode 100644
diff --git a/locale/de-AT/studierendenantrag.php b/locale/de-AT/studierendenantrag.php
old mode 100755
new mode 100644
diff --git a/locale/de-AT/telefonverzeichnis.php b/locale/de-AT/telefonverzeichnis.php
old mode 100755
new mode 100644
diff --git a/locale/de-AT/tempus.dtd b/locale/de-AT/tempus.dtd
old mode 100755
new mode 100644
diff --git a/locale/de-AT/testtool.php b/locale/de-AT/testtool.php
old mode 100755
new mode 100644
diff --git a/locale/de-AT/tools.php b/locale/de-AT/tools.php
old mode 100755
new mode 100644
diff --git a/locale/de-AT/upload.php b/locale/de-AT/upload.php
old mode 100755
new mode 100644
diff --git a/locale/de-AT/urlaubstool.php b/locale/de-AT/urlaubstool.php
old mode 100755
new mode 100644
diff --git a/locale/de-AT/zeitaufzeichnung.php b/locale/de-AT/zeitaufzeichnung.php
old mode 100755
new mode 100644
diff --git a/locale/de-AT/zeitsperre.php b/locale/de-AT/zeitsperre.php
old mode 100755
new mode 100644
diff --git a/locale/de-AT/zeitwunsch.php b/locale/de-AT/zeitwunsch.php
old mode 100755
new mode 100644
diff --git a/locale/de-SFU/contents.rdf b/locale/de-SFU/contents.rdf
old mode 100755
new mode 100644
diff --git a/locale/de-SFU/fas.dtd b/locale/de-SFU/fas.dtd
old mode 100755
new mode 100644
diff --git a/locale/de-SFU/planner.dtd b/locale/de-SFU/planner.dtd
old mode 100755
new mode 100644
diff --git a/locale/de-SFU/tempus.dtd b/locale/de-SFU/tempus.dtd
old mode 100755
new mode 100644
diff --git a/locale/en-US/abgabetool.php b/locale/en-US/abgabetool.php
old mode 100755
new mode 100644
diff --git a/locale/en-US/anwesenheitsliste.php b/locale/en-US/anwesenheitsliste.php
old mode 100755
new mode 100644
diff --git a/locale/en-US/benotungstool.php b/locale/en-US/benotungstool.php
old mode 100755
new mode 100644
diff --git a/locale/en-US/contents.rdf b/locale/en-US/contents.rdf
old mode 100755
new mode 100644
diff --git a/locale/en-US/coodle.php b/locale/en-US/coodle.php
old mode 100755
new mode 100644
diff --git a/locale/en-US/courseInformation.php b/locale/en-US/courseInformation.php
old mode 100755
new mode 100644
diff --git a/locale/en-US/dms_link.php b/locale/en-US/dms_link.php
old mode 100755
new mode 100644
diff --git a/locale/en-US/errors.php b/locale/en-US/errors.php
old mode 100755
new mode 100644
diff --git a/locale/en-US/eventkalender.php b/locale/en-US/eventkalender.php
old mode 100755
new mode 100644
diff --git a/locale/en-US/feedback.php b/locale/en-US/feedback.php
old mode 100755
new mode 100644
diff --git a/locale/en-US/freebusy.php b/locale/en-US/freebusy.php
old mode 100755
new mode 100644
diff --git a/locale/en-US/freifach.php b/locale/en-US/freifach.php
old mode 100755
new mode 100644
diff --git a/locale/en-US/gesamtnote.php b/locale/en-US/gesamtnote.php
old mode 100755
new mode 100644
diff --git a/locale/en-US/global.php b/locale/en-US/global.php
old mode 100755
new mode 100644
diff --git a/locale/en-US/incoming.php b/locale/en-US/incoming.php
old mode 100755
new mode 100644
diff --git a/locale/en-US/lehre.php b/locale/en-US/lehre.php
old mode 100755
new mode 100644
diff --git a/locale/en-US/lvaliste.php b/locale/en-US/lvaliste.php
old mode 100755
new mode 100644
diff --git a/locale/en-US/lvinfo.php b/locale/en-US/lvinfo.php
old mode 100755
new mode 100644
diff --git a/locale/en-US/lvplan.php b/locale/en-US/lvplan.php
old mode 100755
new mode 100644
diff --git a/locale/en-US/mail.php b/locale/en-US/mail.php
old mode 100755
new mode 100644
diff --git a/locale/en-US/mailverteiler.php b/locale/en-US/mailverteiler.php
old mode 100755
new mode 100644
diff --git a/locale/en-US/menu.php b/locale/en-US/menu.php
old mode 100755
new mode 100644
diff --git a/locale/en-US/news.php b/locale/en-US/news.php
old mode 100755
new mode 100644
diff --git a/locale/en-US/notebookregister.php b/locale/en-US/notebookregister.php
old mode 100755
new mode 100644
diff --git a/locale/en-US/notfallbestimmungen.php b/locale/en-US/notfallbestimmungen.php
old mode 100755
new mode 100644
diff --git a/locale/en-US/passwort.php b/locale/en-US/passwort.php
old mode 100755
new mode 100644
diff --git a/locale/en-US/personensuche.php b/locale/en-US/personensuche.php
old mode 100755
new mode 100644
diff --git a/locale/en-US/profil.php b/locale/en-US/profil.php
old mode 100755
new mode 100644
diff --git a/locale/en-US/pruefung.php b/locale/en-US/pruefung.php
old mode 100755
new mode 100644
diff --git a/locale/en-US/reihungstest.php b/locale/en-US/reihungstest.php
old mode 100755
new mode 100644
diff --git a/locale/en-US/semesterplan.php b/locale/en-US/semesterplan.php
old mode 100755
new mode 100644
diff --git a/locale/en-US/services.php b/locale/en-US/services.php
old mode 100755
new mode 100644
diff --git a/locale/en-US/studierendenantrag.php b/locale/en-US/studierendenantrag.php
old mode 100755
new mode 100644
diff --git a/locale/en-US/telefonverzeichnis.php b/locale/en-US/telefonverzeichnis.php
old mode 100755
new mode 100644
diff --git a/locale/en-US/tempus.dtd b/locale/en-US/tempus.dtd
old mode 100755
new mode 100644
diff --git a/locale/en-US/testtool.php b/locale/en-US/testtool.php
old mode 100755
new mode 100644
diff --git a/locale/en-US/tools.php b/locale/en-US/tools.php
old mode 100755
new mode 100644
diff --git a/locale/en-US/upload.php b/locale/en-US/upload.php
old mode 100755
new mode 100644
diff --git a/locale/en-US/urlaubstool.php b/locale/en-US/urlaubstool.php
old mode 100755
new mode 100644
diff --git a/locale/en-US/zeitaufzeichnung.php b/locale/en-US/zeitaufzeichnung.php
old mode 100755
new mode 100644
diff --git a/locale/en-US/zeitsperre.php b/locale/en-US/zeitsperre.php
old mode 100755
new mode 100644
diff --git a/locale/en-US/zeitwunsch.php b/locale/en-US/zeitwunsch.php
old mode 100755
new mode 100644
diff --git a/locale/it-IT/abgabetool.php b/locale/it-IT/abgabetool.php
old mode 100755
new mode 100644
diff --git a/locale/it-IT/anwesenheitsliste.php b/locale/it-IT/anwesenheitsliste.php
old mode 100755
new mode 100644
diff --git a/locale/it-IT/benotungstool.php b/locale/it-IT/benotungstool.php
old mode 100755
new mode 100644
diff --git a/locale/it-IT/buchungen.php b/locale/it-IT/buchungen.php
old mode 100755
new mode 100644
diff --git a/locale/it-IT/coodle.php b/locale/it-IT/coodle.php
old mode 100755
new mode 100644
diff --git a/locale/it-IT/courseInformation.php b/locale/it-IT/courseInformation.php
old mode 100755
new mode 100644
diff --git a/locale/it-IT/dms_link.php b/locale/it-IT/dms_link.php
old mode 100755
new mode 100644
diff --git a/locale/it-IT/errors.php b/locale/it-IT/errors.php
old mode 100755
new mode 100644
diff --git a/locale/it-IT/eventkalender.php b/locale/it-IT/eventkalender.php
old mode 100755
new mode 100644
diff --git a/locale/it-IT/feedback.php b/locale/it-IT/feedback.php
old mode 100755
new mode 100644
diff --git a/locale/it-IT/freebusy.php b/locale/it-IT/freebusy.php
old mode 100755
new mode 100644
diff --git a/locale/it-IT/freifach.php b/locale/it-IT/freifach.php
old mode 100755
new mode 100644
diff --git a/locale/it-IT/gesamtnote.php b/locale/it-IT/gesamtnote.php
old mode 100755
new mode 100644
diff --git a/locale/it-IT/global.php b/locale/it-IT/global.php
old mode 100755
new mode 100644
diff --git a/locale/it-IT/incoming.php b/locale/it-IT/incoming.php
old mode 100755
new mode 100644
diff --git a/locale/it-IT/lehre.php b/locale/it-IT/lehre.php
old mode 100755
new mode 100644
diff --git a/locale/it-IT/lvaliste.php b/locale/it-IT/lvaliste.php
old mode 100755
new mode 100644
diff --git a/locale/it-IT/lvinfo.php b/locale/it-IT/lvinfo.php
old mode 100755
new mode 100644
diff --git a/locale/it-IT/lvplan.php b/locale/it-IT/lvplan.php
old mode 100755
new mode 100644
diff --git a/locale/it-IT/mail.php b/locale/it-IT/mail.php
old mode 100755
new mode 100644
diff --git a/locale/it-IT/mailverteiler.php b/locale/it-IT/mailverteiler.php
old mode 100755
new mode 100644
diff --git a/locale/it-IT/menu.php b/locale/it-IT/menu.php
old mode 100755
new mode 100644
diff --git a/locale/it-IT/news.php b/locale/it-IT/news.php
old mode 100755
new mode 100644
diff --git a/locale/it-IT/notebookregister.php b/locale/it-IT/notebookregister.php
old mode 100755
new mode 100644
diff --git a/locale/it-IT/notfallbestimmungen.php b/locale/it-IT/notfallbestimmungen.php
old mode 100755
new mode 100644
diff --git a/locale/it-IT/passwort.php b/locale/it-IT/passwort.php
old mode 100755
new mode 100644
diff --git a/locale/it-IT/personensuche.php b/locale/it-IT/personensuche.php
old mode 100755
new mode 100644
diff --git a/locale/it-IT/profil.php b/locale/it-IT/profil.php
old mode 100755
new mode 100644
diff --git a/locale/it-IT/pruefung.php b/locale/it-IT/pruefung.php
old mode 100755
new mode 100644
diff --git a/locale/it-IT/semesterplan.php b/locale/it-IT/semesterplan.php
old mode 100755
new mode 100644
diff --git a/locale/it-IT/services.php b/locale/it-IT/services.php
old mode 100755
new mode 100644
diff --git a/locale/it-IT/studienplan.php b/locale/it-IT/studienplan.php
old mode 100755
new mode 100644
diff --git a/locale/it-IT/telefonverzeichnis.php b/locale/it-IT/telefonverzeichnis.php
old mode 100755
new mode 100644
diff --git a/locale/it-IT/testtool.php b/locale/it-IT/testtool.php
old mode 100755
new mode 100644
diff --git a/locale/it-IT/tools.php b/locale/it-IT/tools.php
old mode 100755
new mode 100644
diff --git a/locale/it-IT/upload.php b/locale/it-IT/upload.php
old mode 100755
new mode 100644
diff --git a/locale/it-IT/urlaubstool.php b/locale/it-IT/urlaubstool.php
old mode 100755
new mode 100644
diff --git a/locale/it-IT/zeitaufzeichnung.php b/locale/it-IT/zeitaufzeichnung.php
old mode 100755
new mode 100644
diff --git a/locale/it-IT/zeitsperre.php b/locale/it-IT/zeitsperre.php
old mode 100755
new mode 100644
diff --git a/locale/it-IT/zeitwunsch.php b/locale/it-IT/zeitwunsch.php
old mode 100755
new mode 100644
diff --git a/public/css/AjaxLib.css b/public/css/AjaxLib.css
old mode 100755
new mode 100644
diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
old mode 100755
new mode 100644
diff --git a/public/css/Cis4/Cms.css b/public/css/Cis4/Cms.css
old mode 100755
new mode 100644
diff --git a/public/css/Cis4/Legacy.css b/public/css/Cis4/Legacy.css
old mode 100755
new mode 100644
diff --git a/public/css/DialogLib.css b/public/css/DialogLib.css
old mode 100755
new mode 100644
diff --git a/public/css/Fhc.css b/public/css/Fhc.css
old mode 100755
new mode 100644
diff --git a/public/css/FilterWidget.css b/public/css/FilterWidget.css
old mode 100755
new mode 100644
diff --git a/public/css/Login.css b/public/css/Login.css
old mode 100755
new mode 100644
diff --git a/public/css/NavigationWidget.css b/public/css/NavigationWidget.css
old mode 100755
new mode 100644
diff --git a/public/css/Tabulator.css b/public/css/Tabulator.css
old mode 100755
new mode 100644
diff --git a/public/css/Tabulator5.css b/public/css/Tabulator5.css
old mode 100755
new mode 100644
diff --git a/public/css/TinyMCE5.css b/public/css/TinyMCE5.css
old mode 100755
new mode 100644
diff --git a/public/css/Widgets.css b/public/css/Widgets.css
old mode 100755
new mode 100644
diff --git a/public/css/cis4.css b/public/css/cis4.css
old mode 100755
new mode 100644
diff --git a/public/css/cis_bs5.css b/public/css/cis_bs5.css
old mode 100755
new mode 100644
diff --git a/public/css/codex/oehbeitrag.css b/public/css/codex/oehbeitrag.css
old mode 100755
new mode 100644
diff --git a/public/css/codex/uhstat1.css b/public/css/codex/uhstat1.css
old mode 100755
new mode 100644
diff --git a/public/css/components/FilterComponent.css b/public/css/components/FilterComponent.css
old mode 100755
new mode 100644
diff --git a/public/css/components/FormUnderline.css b/public/css/components/FormUnderline.css
old mode 100755
new mode 100644
diff --git a/public/css/components/NavigationComponent.css b/public/css/components/NavigationComponent.css
old mode 100755
new mode 100644
diff --git a/public/css/components/Profil.css b/public/css/components/Profil.css
old mode 100755
new mode 100644
diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
old mode 100755
new mode 100644
diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
old mode 100755
new mode 100644
diff --git a/public/css/components/searchbar/searchbar.css b/public/css/components/searchbar/searchbar.css
old mode 100755
new mode 100644
diff --git a/public/css/components/verticalsplit.css b/public/css/components/verticalsplit.css
old mode 100755
new mode 100644
diff --git a/public/css/fhcomplete.css b/public/css/fhcomplete.css
old mode 100755
new mode 100644
diff --git a/public/css/infocenter/infocenterDetails.css b/public/css/infocenter/infocenterDetails.css
old mode 100755
new mode 100644
diff --git a/public/css/infocenter/infocenterPersonDataset.css b/public/css/infocenter/infocenterPersonDataset.css
old mode 100755
new mode 100644
diff --git a/public/css/issues/issuesDataset.css b/public/css/issues/issuesDataset.css
old mode 100755
new mode 100644
diff --git a/public/css/issues/issuesKonfiguration.css b/public/css/issues/issuesKonfiguration.css
old mode 100755
new mode 100644
diff --git a/public/css/issues/issuesZustaendigkeiten.css b/public/css/issues/issuesZustaendigkeiten.css
old mode 100755
new mode 100644
diff --git a/public/css/lehre/anrechnung.css b/public/css/lehre/anrechnung.css
old mode 100755
new mode 100644
diff --git a/public/css/lehre/pruefungsprotokoll.css b/public/css/lehre/pruefungsprotokoll.css
old mode 100755
new mode 100644
diff --git a/public/css/messaging/message.css b/public/css/messaging/message.css
old mode 100755
new mode 100644
diff --git a/public/css/sbadmin2/admintemplate.css b/public/css/sbadmin2/admintemplate.css
old mode 100755
new mode 100644
diff --git a/public/css/sbadmin2/admintemplate_contentonly.css b/public/css/sbadmin2/admintemplate_contentonly.css
old mode 100755
new mode 100644
diff --git a/public/css/sbadmin2/tablesort_bootstrap.css b/public/css/sbadmin2/tablesort_bootstrap.css
old mode 100755
new mode 100644
diff --git a/public/css/tools/auswertung_fhtw.css b/public/css/tools/auswertung_fhtw.css
old mode 100755
new mode 100644
diff --git a/public/css/tools/gradelist.css b/public/css/tools/gradelist.css
old mode 100755
new mode 100644
diff --git a/public/extensions/.placeholder b/public/extensions/.placeholder
old mode 100755
new mode 100644
diff --git a/public/images/icons/fa-user-check.png b/public/images/icons/fa-user-check.png
old mode 100755
new mode 100644
diff --git a/public/images/icons/fa-user-clock.png b/public/images/icons/fa-user-clock.png
old mode 100755
new mode 100644
diff --git a/public/images/icons/fa-user-cog.png b/public/images/icons/fa-user-cog.png
old mode 100755
new mode 100644
diff --git a/public/images/icons/fa-user-edit.png b/public/images/icons/fa-user-edit.png
old mode 100755
new mode 100644
diff --git a/public/images/icons/fa-user-graduate.png b/public/images/icons/fa-user-graduate.png
old mode 100755
new mode 100644
diff --git a/public/images/icons/fa-user-lock.png b/public/images/icons/fa-user-lock.png
old mode 100755
new mode 100644
diff --git a/public/images/icons/fa-user-minus.png b/public/images/icons/fa-user-minus.png
old mode 100755
new mode 100644
diff --git a/public/images/icons/fa-user-ninja.png b/public/images/icons/fa-user-ninja.png
old mode 100755
new mode 100644
diff --git a/public/images/icons/fa-user-tag.png b/public/images/icons/fa-user-tag.png
old mode 100755
new mode 100644
diff --git a/public/images/icons/fa-user-times.png b/public/images/icons/fa-user-times.png
old mode 100755
new mode 100644
diff --git a/public/images/icons/fa-users-cog.png b/public/images/icons/fa-users-cog.png
old mode 100755
new mode 100644
diff --git a/public/images/loader.gif b/public/images/loader.gif
old mode 100755
new mode 100644
diff --git a/public/images/logo-300x160.png b/public/images/logo-300x160.png
old mode 100755
new mode 100644
diff --git a/public/js/AjaxLib.js b/public/js/AjaxLib.js
old mode 100755
new mode 100644
diff --git a/public/js/DialogLib.js b/public/js/DialogLib.js
old mode 100755
new mode 100644
diff --git a/public/js/FilterWidget.js b/public/js/FilterWidget.js
old mode 100755
new mode 100644
diff --git a/public/js/Login.js b/public/js/Login.js
old mode 100755
new mode 100644
diff --git a/public/js/NavigationWidget.js b/public/js/NavigationWidget.js
old mode 100755
new mode 100644
diff --git a/public/js/PhrasesLib.js b/public/js/PhrasesLib.js
old mode 100755
new mode 100644
diff --git a/public/js/RESTClient.js b/public/js/RESTClient.js
old mode 100755
new mode 100644
diff --git a/public/js/TableWidget.js b/public/js/TableWidget.js
old mode 100755
new mode 100644
diff --git a/public/js/UDFWidget.js b/public/js/UDFWidget.js
old mode 100755
new mode 100644
diff --git a/public/js/api/profil.js b/public/js/api/profil.js
old mode 100755
new mode 100644
diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js
old mode 100755
new mode 100644
diff --git a/public/js/apps/Cis/Cms.js b/public/js/apps/Cis/Cms.js
old mode 100755
new mode 100644
diff --git a/public/js/apps/Cis/Documents.js b/public/js/apps/Cis/Documents.js
old mode 100755
new mode 100644
diff --git a/public/js/apps/Cis/MyLv/Student.js b/public/js/apps/Cis/MyLv/Student.js
old mode 100755
new mode 100644
diff --git a/public/js/apps/Cis/Profil.js b/public/js/apps/Cis/Profil.js
old mode 100755
new mode 100644
diff --git a/public/js/apps/Cis/ProfilUpdateRequests.js b/public/js/apps/Cis/ProfilUpdateRequests.js
old mode 100755
new mode 100644
diff --git a/public/js/apps/Cis/Stundenplan.js b/public/js/apps/Cis/Stundenplan.js
old mode 100755
new mode 100644
diff --git a/public/js/apps/Dashboard.js b/public/js/apps/Dashboard.js
old mode 100755
new mode 100644
diff --git a/public/js/apps/Dashboard/Admin.js b/public/js/apps/Dashboard/Admin.js
old mode 100755
new mode 100644
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
old mode 100755
new mode 100644
diff --git a/public/js/apps/DashboardAdmin.js b/public/js/apps/DashboardAdmin.js
old mode 100755
new mode 100644
diff --git a/public/js/apps/LogsViewer/LogsViewer.js b/public/js/apps/LogsViewer/LogsViewer.js
old mode 100755
new mode 100644
diff --git a/public/js/apps/LogsViewer/TabulatorSetup.js b/public/js/apps/LogsViewer/TabulatorSetup.js
old mode 100755
new mode 100644
diff --git a/public/js/apps/TestSearch.js b/public/js/apps/TestSearch.js
old mode 100755
new mode 100644
diff --git a/public/js/apps/api/dummyapi.php b/public/js/apps/api/dummyapi.php
old mode 100755
new mode 100644
diff --git a/public/js/apps/api/fhcapifactory.js b/public/js/apps/api/fhcapifactory.js
old mode 100755
new mode 100644
diff --git a/public/js/apps/api/search.js b/public/js/apps/api/search.js
old mode 100755
new mode 100644
diff --git a/public/js/apps/lehre/Antrag.js b/public/js/apps/lehre/Antrag.js
old mode 100755
new mode 100644
diff --git a/public/js/apps/lehre/Antrag/Leitung.js b/public/js/apps/lehre/Antrag/Leitung.js
old mode 100755
new mode 100644
diff --git a/public/js/apps/lehre/Antrag/Lvzuweisung.js b/public/js/apps/lehre/Antrag/Lvzuweisung.js
old mode 100755
new mode 100644
diff --git a/public/js/apps/lehre/Antrag/Student.js b/public/js/apps/lehre/Antrag/Student.js
old mode 100755
new mode 100644
diff --git a/public/js/bootstrapper.js b/public/js/bootstrapper.js
old mode 100755
new mode 100644
diff --git a/public/js/codex/oehbeitrag.js b/public/js/codex/oehbeitrag.js
old mode 100755
new mode 100644
diff --git a/public/js/codex/uhstat1.js b/public/js/codex/uhstat1.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Base/Modal.js b/public/js/components/Base/Modal.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Base/Offcanvas.js b/public/js/components/Base/Offcanvas.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Bootstrap/Alert.js b/public/js/components/Bootstrap/Alert.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Bootstrap/Confirm.js b/public/js/components/Bootstrap/Confirm.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Bootstrap/Modal.js b/public/js/components/Bootstrap/Modal.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Bootstrap/Prompt.js b/public/js/components/Bootstrap/Prompt.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Calendar/Abstract.js b/public/js/components/Calendar/Abstract.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Calendar/Calendar.js b/public/js/components/Calendar/Calendar.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Calendar/Header.js b/public/js/components/Calendar/Header.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Calendar/Minimized.js b/public/js/components/Calendar/Minimized.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Calendar/Month.js b/public/js/components/Calendar/Month.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Calendar/Month/Page.js b/public/js/components/Calendar/Month/Page.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Calendar/Months.js b/public/js/components/Calendar/Months.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Calendar/Pane.js b/public/js/components/Calendar/Pane.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Calendar/Week.js b/public/js/components/Calendar/Week.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Calendar/Weeks.js b/public/js/components/Calendar/Weeks.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Calendar/Years.js b/public/js/components/Calendar/Years.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Calendar/Years/Page.js b/public/js/components/Calendar/Years/Page.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Cis/Menu/Entry.js b/public/js/components/Cis/Menu/Entry.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Cis/Mylv/Semester.js b/public/js/components/Cis/Mylv/Semester.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang.js b/public/js/components/Cis/Mylv/Semester/Studiengang.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv/Info.js b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv/Info.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv/Pruefungen.js b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv/Pruefungen.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Cis/Mylv/Student.js b/public/js/components/Cis/Mylv/Student.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Cis/Profil/ProfilComponents/Adresse.js b/public/js/components/Cis/Profil/ProfilComponents/Adresse.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Cis/Profil/ProfilComponents/FhAusweisStatus.js b/public/js/components/Cis/Profil/ProfilComponents/FhAusweisStatus.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Cis/Profil/ProfilComponents/Kontakt.js b/public/js/components/Cis/Profil/ProfilComponents/Kontakt.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js b/public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Cis/Profil/ProfilComponents/ProfilEmails.js b/public/js/components/Cis/Profil/ProfilComponents/ProfilEmails.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Cis/Profil/ProfilComponents/QuickLinks.js b/public/js/components/Cis/Profil/ProfilComponents/QuickLinks.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Cis/Profil/ProfilComponents/RoleInformation.js b/public/js/components/Cis/Profil/ProfilComponents/RoleInformation.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfil.js b/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditKontakt.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditKontakt.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/Status.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/Status.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfilSelect.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilSelect.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Cis/Profil/StudentViewProfil.js b/public/js/components/Cis/Profil/StudentViewProfil.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Dashboard/Admin.js b/public/js/components/Dashboard/Admin.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Dashboard/Admin/Edit.js b/public/js/components/Dashboard/Admin/Edit.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Dashboard/Admin/Presets.js b/public/js/components/Dashboard/Admin/Presets.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Dashboard/Admin/Widgets.js b/public/js/components/Dashboard/Admin/Widgets.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Dashboard/Widget/Picker.js b/public/js/components/Dashboard/Widget/Picker.js
old mode 100755
new mode 100644
diff --git a/public/js/components/DashboardWidget/Abstract.js b/public/js/components/DashboardWidget/Abstract.js
old mode 100755
new mode 100644
diff --git a/public/js/components/DashboardWidget/Ampel.js b/public/js/components/DashboardWidget/Ampel.js
old mode 100755
new mode 100644
diff --git a/public/js/components/DashboardWidget/Default.js b/public/js/components/DashboardWidget/Default.js
old mode 100755
new mode 100644
diff --git a/public/js/components/DashboardWidget/News.js b/public/js/components/DashboardWidget/News.js
old mode 100755
new mode 100644
diff --git a/public/js/components/DashboardWidget/Stundenplan.js b/public/js/components/DashboardWidget/Stundenplan.js
old mode 100755
new mode 100644
diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Drop/Grid/Item.js b/public/js/components/Drop/Grid/Item.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Fetch.js b/public/js/components/Fetch.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Form/Form.js b/public/js/components/Form/Form.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Form/Input.js b/public/js/components/Form/Input.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Form/Upload/Dms.js b/public/js/components/Form/Upload/Dms.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Form/Upload/Image.js b/public/js/components/Form/Upload/Image.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Form/Validation.js b/public/js/components/Form/Validation.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Loader.js b/public/js/components/Loader.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Studierendenantrag/Antrag.js b/public/js/components/Studierendenantrag/Antrag.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Studierendenantrag/Form/Abmeldung.js b/public/js/components/Studierendenantrag/Form/Abmeldung.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js b/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Studierendenantrag/Form/Unterbrechung.js b/public/js/components/Studierendenantrag/Form/Unterbrechung.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Studierendenantrag/Form/Wiederholung.js b/public/js/components/Studierendenantrag/Form/Wiederholung.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Studierendenantrag/Infoblock.js b/public/js/components/Studierendenantrag/Infoblock.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Studierendenantrag/Leitung.js b/public/js/components/Studierendenantrag/Leitung.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Studierendenantrag/Leitung/Actions.js b/public/js/components/Studierendenantrag/Leitung/Actions.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Studierendenantrag/Leitung/Actions/Columns.js b/public/js/components/Studierendenantrag/Leitung/Actions/Columns.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Studierendenantrag/Leitung/Actions/New.js b/public/js/components/Studierendenantrag/Leitung/Actions/New.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Studierendenantrag/Leitung/GrundPopup.js b/public/js/components/Studierendenantrag/Leitung/GrundPopup.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Studierendenantrag/Leitung/Header.js b/public/js/components/Studierendenantrag/Leitung/Header.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Studierendenantrag/Leitung/LvPopup.js b/public/js/components/Studierendenantrag/Leitung/LvPopup.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Studierendenantrag/Leitung/Table.js b/public/js/components/Studierendenantrag/Leitung/Table.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Studierendenantrag/Lvzuweisung.js b/public/js/components/Studierendenantrag/Lvzuweisung.js
old mode 100755
new mode 100644
diff --git a/public/js/components/Studierendenantrag/Status.js b/public/js/components/Studierendenantrag/Status.js
old mode 100755
new mode 100644
diff --git a/public/js/components/filter/API.js b/public/js/components/filter/API.js
old mode 100755
new mode 100644
diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
old mode 100755
new mode 100644
diff --git a/public/js/components/filter/Filter/Columns.js b/public/js/components/filter/Filter/Columns.js
old mode 100755
new mode 100644
diff --git a/public/js/components/filter/Filter/Config.js b/public/js/components/filter/Filter/Config.js
old mode 100755
new mode 100644
diff --git a/public/js/components/filter/Table/Download.js b/public/js/components/filter/Table/Download.js
old mode 100755
new mode 100644
diff --git a/public/js/components/navigation/API.js b/public/js/components/navigation/API.js
old mode 100755
new mode 100644
diff --git a/public/js/components/navigation/Navigation.js b/public/js/components/navigation/Navigation.js
old mode 100755
new mode 100644
diff --git a/public/js/components/searchbar/action.js b/public/js/components/searchbar/action.js
old mode 100755
new mode 100644
diff --git a/public/js/components/searchbar/actions.js b/public/js/components/searchbar/actions.js
old mode 100755
new mode 100644
diff --git a/public/js/components/searchbar/employee.js b/public/js/components/searchbar/employee.js
old mode 100755
new mode 100644
diff --git a/public/js/components/searchbar/organisationunit.js b/public/js/components/searchbar/organisationunit.js
old mode 100755
new mode 100644
diff --git a/public/js/components/searchbar/person.js b/public/js/components/searchbar/person.js
old mode 100755
new mode 100644
diff --git a/public/js/components/searchbar/raum.js b/public/js/components/searchbar/raum.js
old mode 100755
new mode 100644
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
old mode 100755
new mode 100644
diff --git a/public/js/components/verticalsplit/verticalsplit.js b/public/js/components/verticalsplit/verticalsplit.js
old mode 100755
new mode 100644
diff --git a/public/js/components/vueDatepicker.js.php b/public/js/components/vueDatepicker.js.php
old mode 100755
new mode 100644
diff --git a/public/js/composables/CalendarDate.js b/public/js/composables/CalendarDate.js
old mode 100755
new mode 100644
diff --git a/public/js/composables/Dashboard/CachedWidgetLoader.js b/public/js/composables/Dashboard/CachedWidgetLoader.js
old mode 100755
new mode 100644
diff --git a/public/js/composables/GridLogic.js b/public/js/composables/GridLogic.js
old mode 100755
new mode 100644
diff --git a/public/js/composables/ObjectUtils.js b/public/js/composables/ObjectUtils.js
old mode 100755
new mode 100644
diff --git a/public/js/infocenter/docUeberpruefung.js b/public/js/infocenter/docUeberpruefung.js
old mode 100755
new mode 100644
diff --git a/public/js/infocenter/infocenterDetails.js b/public/js/infocenter/infocenterDetails.js
old mode 100755
new mode 100644
diff --git a/public/js/infocenter/infocenterPersonDataset.js b/public/js/infocenter/infocenterPersonDataset.js
old mode 100755
new mode 100644
diff --git a/public/js/infocenter/messageList.js b/public/js/infocenter/messageList.js
old mode 100755
new mode 100644
diff --git a/public/js/infocenter/rueckstellung.js b/public/js/infocenter/rueckstellung.js
old mode 100755
new mode 100644
diff --git a/public/js/infocenter/stammdaten.js b/public/js/infocenter/stammdaten.js
old mode 100755
new mode 100644
diff --git a/public/js/infocenter/zgvUeberpruefung.js b/public/js/infocenter/zgvUeberpruefung.js
old mode 100755
new mode 100644
diff --git a/public/js/issues/issuesDataset.js b/public/js/issues/issuesDataset.js
old mode 100755
new mode 100644
diff --git a/public/js/issues/issuesKonfiguration.js b/public/js/issues/issuesKonfiguration.js
old mode 100755
new mode 100644
diff --git a/public/js/issues/issuesZustaendigkeiten.js b/public/js/issues/issuesZustaendigkeiten.js
old mode 100755
new mode 100644
diff --git a/public/js/issues/plausichecks.js b/public/js/issues/plausichecks.js
old mode 100755
new mode 100644
diff --git a/public/js/lehre/anrechnung/adminAnrechnung.js b/public/js/lehre/anrechnung/adminAnrechnung.js
old mode 100755
new mode 100644
diff --git a/public/js/lehre/anrechnung/approveAnrechnungDetail.js b/public/js/lehre/anrechnung/approveAnrechnungDetail.js
old mode 100755
new mode 100644
diff --git a/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js b/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
old mode 100755
new mode 100644
diff --git a/public/js/lehre/anrechnung/createAnrechnung.js b/public/js/lehre/anrechnung/createAnrechnung.js
old mode 100755
new mode 100644
diff --git a/public/js/lehre/anrechnung/requestAnrechnung.js b/public/js/lehre/anrechnung/requestAnrechnung.js
old mode 100755
new mode 100644
diff --git a/public/js/lehre/anrechnung/reviewAnrechnungDetail.js b/public/js/lehre/anrechnung/reviewAnrechnungDetail.js
old mode 100755
new mode 100644
diff --git a/public/js/lehre/anrechnung/reviewAnrechnungUebersicht.js b/public/js/lehre/anrechnung/reviewAnrechnungUebersicht.js
old mode 100755
new mode 100644
diff --git a/public/js/lehre/lehrauftrag/acceptLehrauftrag.js b/public/js/lehre/lehrauftrag/acceptLehrauftrag.js
old mode 100755
new mode 100644
diff --git a/public/js/lehre/lehrauftrag/approveLehrauftrag.js b/public/js/lehre/lehrauftrag/approveLehrauftrag.js
old mode 100755
new mode 100644
diff --git a/public/js/lehre/lehrauftrag/orderLehrauftrag.js b/public/js/lehre/lehrauftrag/orderLehrauftrag.js
old mode 100755
new mode 100644
diff --git a/public/js/lehre/lvplanung/zverfueg.js b/public/js/lehre/lvplanung/zverfueg.js
old mode 100755
new mode 100644
diff --git a/public/js/lehre/pruefungsprotokoll.js b/public/js/lehre/pruefungsprotokoll.js
old mode 100755
new mode 100644
diff --git a/public/js/messaging/fasMessageWrite.js b/public/js/messaging/fasMessageWrite.js
old mode 100755
new mode 100644
diff --git a/public/js/messaging/messageWrite.js b/public/js/messaging/messageWrite.js
old mode 100755
new mode 100644
diff --git a/public/js/messaging/messageWriteReply.js b/public/js/messaging/messageWriteReply.js
old mode 100755
new mode 100644
diff --git a/public/js/messaging/read.js b/public/js/messaging/read.js
old mode 100755
new mode 100644
diff --git a/public/js/messaging/write.js b/public/js/messaging/write.js
old mode 100755
new mode 100644
diff --git a/public/js/messaging/writeReply.js b/public/js/messaging/writeReply.js
old mode 100755
new mode 100644
diff --git a/public/js/mixins/Phrasen.js b/public/js/mixins/Phrasen.js
old mode 100755
new mode 100644
diff --git a/public/js/person/benutzergruppe.js b/public/js/person/benutzergruppe.js
old mode 100755
new mode 100644
diff --git a/public/js/pivottable/pivot.de.js b/public/js/pivottable/pivot.de.js
old mode 100755
new mode 100644
diff --git a/public/js/plugin/Phrasen.js b/public/js/plugin/Phrasen.js
old mode 100755
new mode 100644
diff --git a/public/js/tablesort/tablesort.js b/public/js/tablesort/tablesort.js
old mode 100755
new mode 100644
diff --git a/public/js/tabulator/filters/Dates.js b/public/js/tabulator/filters/Dates.js
old mode 100755
new mode 100644
diff --git a/public/media/.placeholder b/public/media/.placeholder
old mode 100755
new mode 100644
diff --git a/rdf/AntragAbmeldung.xml.php b/rdf/AntragAbmeldung.xml.php
old mode 100755
new mode 100644
diff --git a/rdf/AntragAbmeldungStgl.xml.php b/rdf/AntragAbmeldungStgl.xml.php
old mode 100755
new mode 100644
diff --git a/rdf/AntragUnterbrechung.xml.php b/rdf/AntragUnterbrechung.xml.php
old mode 100755
new mode 100644
diff --git a/rdf/PHPRequest.txt b/rdf/PHPRequest.txt
old mode 100755
new mode 100644
diff --git a/rdf/abschlussbeurteilung.rdf.php b/rdf/abschlussbeurteilung.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/abschlusspruefung.rdf.php b/rdf/abschlusspruefung.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/abschlusspruefung_antritt.rdf.php b/rdf/abschlusspruefung_antritt.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/accountinfoblatt.xml.php b/rdf/accountinfoblatt.xml.php
old mode 100755
new mode 100644
diff --git a/rdf/adresse.rdf.php b/rdf/adresse.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/adressentyp.rdf.php b/rdf/adressentyp.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/akadgrad.rdf.php b/rdf/akadgrad.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/akte.rdf.php b/rdf/akte.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/anrechnung.rdf.php b/rdf/anrechnung.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/anrechnungbegruendung.rdf.php b/rdf/anrechnungbegruendung.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/anwesenheit.rdf.php b/rdf/anwesenheit.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/anwesenheitsliste.xml.php b/rdf/anwesenheitsliste.xml.php
old mode 100755
new mode 100644
diff --git a/rdf/anzahlAnwesenheitenStudenplan.rdf.php b/rdf/anzahlAnwesenheitenStudenplan.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/aufenthaltfoerderung.rdf.php b/rdf/aufenthaltfoerderung.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/aufmerksamdurch.rdf.php b/rdf/aufmerksamdurch.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/aufnahmeschluessel.rdf.php b/rdf/aufnahmeschluessel.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/aufnahmetermine.rdf.php b/rdf/aufnahmetermine.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/aufwandstyp.rdf.php b/rdf/aufwandstyp.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/ausbildung.rdf.php b/rdf/ausbildung.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/ausbildungsvertrag.xml.php b/rdf/ausbildungsvertrag.xml.php
old mode 100755
new mode 100644
diff --git a/rdf/bankverbindung.rdf.php b/rdf/bankverbindung.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/benutzer.rdf.php b/rdf/benutzer.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/benutzerfunktion.rdf.php b/rdf/benutzerfunktion.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/berufstaetigkeit.rdf.php b/rdf/berufstaetigkeit.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/beschaeftigungsart1.rdf.php b/rdf/beschaeftigungsart1.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/beschaeftigungsart2.rdf.php b/rdf/beschaeftigungsart2.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/beschaeftigungsausmass.rdf.php b/rdf/beschaeftigungsausmass.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/besonderequalifikation.rdf.php b/rdf/besonderequalifikation.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/bestelldetail.rdf.php b/rdf/bestelldetail.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/bestellung.rdf.php b/rdf/bestellung.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/betreuerart.rdf.php b/rdf/betreuerart.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/betriebsmittel.rdf.php b/rdf/betriebsmittel.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/betriebsmittelperson.rdf.php b/rdf/betriebsmittelperson.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/betriebsmitteltyp.rdf.php b/rdf/betriebsmitteltyp.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/bisfunktion.rdf.php b/rdf/bisfunktion.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/bisio.rdf.php b/rdf/bisio.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/bisstandort.rdf.php b/rdf/bisstandort.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/bisverwendung.rdf.php b/rdf/bisverwendung.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/buchungstyp.rdf.php b/rdf/buchungstyp.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/diplomasupplement.xml.php b/rdf/diplomasupplement.xml.php
old mode 100755
new mode 100644
diff --git a/rdf/dms.rdf.php b/rdf/dms.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/dokument.rdf.php b/rdf/dokument.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/dokumentprestudent.rdf.php b/rdf/dokumentprestudent.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/dokumenttyp.rdf.php b/rdf/dokumenttyp.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/entwicklungsteam.rdf.php b/rdf/entwicklungsteam.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/erfolgsnachweis.rdf.php b/rdf/erfolgsnachweis.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/fachbereich.rdf.php b/rdf/fachbereich.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/fachbereich_menue.rdf.php b/rdf/fachbereich_menue.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/firma.rdf.php b/rdf/firma.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/funktion.rdf.php b/rdf/funktion.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/gemeinde.rdf.php b/rdf/gemeinde.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/geschlecht.rdf.php b/rdf/geschlecht.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/gruppen.rdf.php b/rdf/gruppen.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/gsprogramm.rdf.php b/rdf/gsprogramm.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/gsstudientyp.rdf.php b/rdf/gsstudientyp.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/hauptberuf.rdf.php b/rdf/hauptberuf.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/index.html b/rdf/index.html
old mode 100755
new mode 100644
diff --git a/rdf/kontakt.rdf.php b/rdf/kontakt.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/kontakttyp.rdf.php b/rdf/kontakttyp.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/konto.rdf.php b/rdf/konto.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/ktu_abschlusszeugnis.rdf.php b/rdf/ktu_abschlusszeugnis.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/ktu_honorarvertrag.xml.php b/rdf/ktu_honorarvertrag.xml.php
old mode 100755
new mode 100644
diff --git a/rdf/ktu_lvinfo.xml.php b/rdf/ktu_lvinfo.xml.php
old mode 100755
new mode 100644
diff --git a/rdf/learningagreement.rdf.php b/rdf/learningagreement.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/learningagreement_outgoing.rdf.php b/rdf/learningagreement_outgoing.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/lehrauftrag.xml.php b/rdf/lehrauftrag.xml.php
old mode 100755
new mode 100644
diff --git a/rdf/lehrauftrag_annehmen.xml.php b/rdf/lehrauftrag_annehmen.xml.php
old mode 100755
new mode 100644
diff --git a/rdf/lehreinheit-lvplan.rdf.php b/rdf/lehreinheit-lvplan.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/lehreinheit.rdf.php b/rdf/lehreinheit.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/lehreinheit_direkt.rdf.php b/rdf/lehreinheit_direkt.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/lehreinheitgruppe.rdf.php b/rdf/lehreinheitgruppe.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/lehreinheitmitarbeiter.rdf.php b/rdf/lehreinheitmitarbeiter.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/lehrfach.rdf.php b/rdf/lehrfach.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/lehrform.rdf.php b/rdf/lehrform.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/lehrfunktion.rdf.php b/rdf/lehrfunktion.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/lehrstunde.rdf.php b/rdf/lehrstunde.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/lehrveranstaltung.rdf.php b/rdf/lehrveranstaltung.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/lehrveranstaltung_einheiten.rdf.php b/rdf/lehrveranstaltung_einheiten.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/lehrveranstaltung_studienplan.rdf.php b/rdf/lehrveranstaltung_studienplan.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/lehrveranstaltungszeugnis.rdf.php b/rdf/lehrveranstaltungszeugnis.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/lehrveranstaltungszeugnis_ktu.rdf.php b/rdf/lehrveranstaltungszeugnis_ktu.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/lehrverbandsgruppe.rdf.php b/rdf/lehrverbandsgruppe.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/lektoren.rdf.php b/rdf/lektoren.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/lvangebot.rdf.php b/rdf/lvangebot.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/lvgesamtnote.rdf.php b/rdf/lvgesamtnote.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/lvinfo.rdf.php b/rdf/lvinfo.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/mantis.rdf.php b/rdf/mantis.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/mantis_categories.rdf.php b/rdf/mantis_categories.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/mantis_projects.rdf.php b/rdf/mantis_projects.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/messages.rdf.php b/rdf/messages.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/mitarbeiter.rdf.php b/rdf/mitarbeiter.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/mobilitaet.rdf.php b/rdf/mobilitaet.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/mobilitaetsprogramm.rdf.php b/rdf/mobilitaetsprogramm.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/mobilitaetstyp.rdf.php b/rdf/mobilitaetstyp.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/nation.rdf.php b/rdf/nation.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/note.rdf.php b/rdf/note.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/notiz.rdf.php b/rdf/notiz.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/organisationseinheit.rdf.php b/rdf/organisationseinheit.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/organisationseinheit_menue.rdf.php b/rdf/organisationseinheit_menue.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/ort.rdf.php b/rdf/ort.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/orte.rdf.php b/rdf/orte.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/person.rdf.php b/rdf/person.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/personal.rdf.php b/rdf/personal.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/prestudent.rdf.php b/rdf/prestudent.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/prestudenthistorie.rdf.php b/rdf/prestudenthistorie.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/prestudentrolle.rdf.php b/rdf/prestudentrolle.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/projekt.rdf.php b/rdf/projekt.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/projektarbeit.rdf.php b/rdf/projektarbeit.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/projektbeschreibung.rdf.php b/rdf/projektbeschreibung.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/projektbetreuer.rdf.php b/rdf/projektbetreuer.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/projektphase.rdf.php b/rdf/projektphase.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/projekttask.rdf.php b/rdf/projekttask.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/projekttyp.rdf.php b/rdf/projekttyp.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/pruefung.rdf.php b/rdf/pruefung.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/pruefungstyp.rdf.php b/rdf/pruefungstyp.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/raumtyp.rdf.php b/rdf/raumtyp.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/reihungstest.rdf.php b/rdf/reihungstest.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/ressource.rdf.php b/rdf/ressource.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/sammelzeugnis.rdf.php b/rdf/sammelzeugnis.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/sprache.rdf.php b/rdf/sprache.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/standort.rdf.php b/rdf/standort.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/status.rdf.php b/rdf/status.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/statusbericht.rdf.php b/rdf/statusbericht.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/statusgrund.rdf.php b/rdf/statusgrund.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/student.rdf.php b/rdf/student.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/studienblatt.xml.php b/rdf/studienblatt.xml.php
old mode 100755
new mode 100644
diff --git a/rdf/studienerfolg.rdf.php b/rdf/studienerfolg.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/studiengang.rdf.php b/rdf/studiengang.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/studienordnung.rdf.php b/rdf/studienordnung.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/studienplan.rdf.php b/rdf/studienplan.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/studiensemester.rdf.php b/rdf/studiensemester.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/stundenplan_betriebsmittel.rdf.php b/rdf/stundenplan_betriebsmittel.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/termine.rdf.php b/rdf/termine.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/undo.rdf.php b/rdf/undo.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/vertrag.rdf.php b/rdf/vertrag.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/vertragdetails.rdf.php b/rdf/vertragdetails.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/vertragsstatus.rdf.php b/rdf/vertragsstatus.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/vertragstyp.rdf.php b/rdf/vertragstyp.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/verwendung.rdf.php b/rdf/verwendung.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/vorlage.rdf.php b/rdf/vorlage.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/wawi_buchung.rdf.php b/rdf/wawi_buchung.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/wawi_buchungstyp.rdf.php b/rdf/wawi_buchungstyp.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/wawi_konto.rdf.php b/rdf/wawi_konto.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/wawi_kostenstelle.rdf.php b/rdf/wawi_kostenstelle.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/zertifikat.rdf.php b/rdf/zertifikat.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/zeugnis.rdf.php b/rdf/zeugnis.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/zeugnisnote.rdf.php b/rdf/zeugnisnote.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/zgv.rdf.php b/rdf/zgv.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/zgvdoktor.rdf.php b/rdf/zgvdoktor.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/zgvmaster.rdf.php b/rdf/zgvmaster.rdf.php
old mode 100755
new mode 100644
diff --git a/rdf/zweck.rdf.php b/rdf/zweck.rdf.php
old mode 100755
new mode 100644
diff --git a/skin/cis.css b/skin/cis.css
old mode 100755
new mode 100644
diff --git a/skin/colorpicker.css b/skin/colorpicker.css
old mode 100755
new mode 100644
diff --git a/skin/croppie.css b/skin/croppie.css
old mode 100755
new mode 100644
diff --git a/skin/fas.css b/skin/fas.css
old mode 100755
new mode 100644
diff --git a/skin/fhcomplete.css b/skin/fhcomplete.css
old mode 100755
new mode 100644
diff --git a/skin/fhcomplete_website.css b/skin/fhcomplete_website.css
old mode 100755
new mode 100644
diff --git a/skin/flexcrollstyles.css b/skin/flexcrollstyles.css
old mode 100755
new mode 100644
diff --git a/skin/images/CIS.ico b/skin/images/CIS.ico
old mode 100755
new mode 100644
diff --git a/skin/images/Calculator.png b/skin/images/Calculator.png
old mode 100755
new mode 100644
diff --git a/skin/images/Chart.svg b/skin/images/Chart.svg
old mode 100755
new mode 100644
diff --git a/skin/images/DeleteIcon.png b/skin/images/DeleteIcon.png
old mode 100755
new mode 100644
diff --git a/skin/images/ExcelIcon.png b/skin/images/ExcelIcon.png
old mode 100755
new mode 100644
diff --git a/skin/images/FAS.ico b/skin/images/FAS.ico
old mode 100755
new mode 100644
diff --git a/skin/images/Filter.svg b/skin/images/Filter.svg
old mode 100755
new mode 100644
diff --git a/skin/images/Graphs_clip_art.svg b/skin/images/Graphs_clip_art.svg
old mode 100755
new mode 100644
diff --git a/skin/images/NeuDokument.png b/skin/images/NeuDokument.png
old mode 100755
new mode 100644
diff --git a/skin/images/Report.svg b/skin/images/Report.svg
old mode 100755
new mode 100644
diff --git a/skin/images/Statistik.svg b/skin/images/Statistik.svg
old mode 100755
new mode 100644
diff --git a/skin/images/TWLogo_klein.gif b/skin/images/TWLogo_klein.gif
old mode 100755
new mode 100644
diff --git a/skin/images/TWLogo_klein.jpg b/skin/images/TWLogo_klein.jpg
old mode 100755
new mode 100644
diff --git a/skin/images/Tempus.ico b/skin/images/Tempus.ico
old mode 100755
new mode 100644
diff --git a/skin/images/Vilesci.ico b/skin/images/Vilesci.ico
old mode 100755
new mode 100644
diff --git a/skin/images/Wawi.ico b/skin/images/Wawi.ico
old mode 100755
new mode 100644
diff --git a/skin/images/addKonto.png b/skin/images/addKonto.png
old mode 100755
new mode 100644
diff --git a/skin/images/ampel_gelb.png b/skin/images/ampel_gelb.png
old mode 100755
new mode 100644
diff --git a/skin/images/ampel_gruen.png b/skin/images/ampel_gruen.png
old mode 100755
new mode 100644
diff --git a/skin/images/ampel_rot.png b/skin/images/ampel_rot.png
old mode 100755
new mode 100644
diff --git a/skin/images/anmelden.png b/skin/images/anmelden.png
old mode 100755
new mode 100644
diff --git a/skin/images/application_form_delete.png b/skin/images/application_form_delete.png
old mode 100755
new mode 100644
diff --git a/skin/images/application_form_edit.png b/skin/images/application_form_edit.png
old mode 100755
new mode 100644
diff --git a/skin/images/application_go.png b/skin/images/application_go.png
old mode 100755
new mode 100644
diff --git a/skin/images/application_home.png b/skin/images/application_home.png
old mode 100755
new mode 100644
diff --git a/skin/images/arbeitspaket.png b/skin/images/arbeitspaket.png
old mode 100755
new mode 100644
diff --git a/skin/images/arrow-next.png b/skin/images/arrow-next.png
old mode 100755
new mode 100644
diff --git a/skin/images/arrow-previous.png b/skin/images/arrow-previous.png
old mode 100755
new mode 100644
diff --git a/skin/images/arrow-single-down-green.png b/skin/images/arrow-single-down-green.png
old mode 100755
new mode 100644
diff --git a/skin/images/arrow-single-up-green.png b/skin/images/arrow-single-up-green.png
old mode 100755
new mode 100644
diff --git a/skin/images/arrow_down.png b/skin/images/arrow_down.png
old mode 100755
new mode 100644
diff --git a/skin/images/asc.gif b/skin/images/asc.gif
old mode 100755
new mode 100644
diff --git a/skin/images/bg.gif b/skin/images/bg.gif
old mode 100755
new mode 100644
diff --git a/skin/images/bg_.gif b/skin/images/bg_.gif
old mode 100755
new mode 100644
diff --git a/skin/images/bg_sort.gif b/skin/images/bg_sort.gif
old mode 100755
new mode 100644
diff --git a/skin/images/blank.gif b/skin/images/blank.gif
old mode 100755
new mode 100644
diff --git a/skin/images/bold.png b/skin/images/bold.png
old mode 100755
new mode 100644
diff --git a/skin/images/bullet_arrow_down.png b/skin/images/bullet_arrow_down.png
old mode 100755
new mode 100644
diff --git a/skin/images/bullet_arrow_right.png b/skin/images/bullet_arrow_right.png
old mode 100755
new mode 100644
diff --git a/skin/images/bullet_go.png b/skin/images/bullet_go.png
old mode 100755
new mode 100644
diff --git a/skin/images/bullet_green.png b/skin/images/bullet_green.png
old mode 100755
new mode 100644
diff --git a/skin/images/bullet_red.png b/skin/images/bullet_red.png
old mode 100755
new mode 100644
diff --git a/skin/images/button_admin.png b/skin/images/button_admin.png
old mode 100755
new mode 100644
diff --git a/skin/images/button_download.png b/skin/images/button_download.png
old mode 100755
new mode 100644
diff --git a/skin/images/button_endnote.png b/skin/images/button_endnote.png
old mode 100755
new mode 100644
diff --git a/skin/images/button_esnack.png b/skin/images/button_esnack.png
old mode 100755
new mode 100644
diff --git a/skin/images/button_feedback.png b/skin/images/button_feedback.png
old mode 100755
new mode 100644
diff --git a/skin/images/button_kreuzerltool.png b/skin/images/button_kreuzerltool.png
old mode 100755
new mode 100644
diff --git a/skin/images/button_listen.png b/skin/images/button_listen.png
old mode 100755
new mode 100644
diff --git a/skin/images/button_lvinfo.png b/skin/images/button_lvinfo.png
old mode 100755
new mode 100644
diff --git a/skin/images/button_lvplan.png b/skin/images/button_lvplan.png
old mode 100755
new mode 100644
diff --git a/skin/images/button_mail.gif b/skin/images/button_mail.gif
old mode 100755
new mode 100644
diff --git a/skin/images/button_moodle.png b/skin/images/button_moodle.png
old mode 100755
new mode 100644
diff --git a/skin/images/button_newsgroups.png b/skin/images/button_newsgroups.png
old mode 100755
new mode 100644
diff --git a/skin/images/button_opus.png b/skin/images/button_opus.png
old mode 100755
new mode 100644
diff --git a/skin/images/button_pinboard.png b/skin/images/button_pinboard.png
old mode 100755
new mode 100644
diff --git a/skin/images/button_semplan.png b/skin/images/button_semplan.png
old mode 100755
new mode 100644
diff --git a/skin/images/button_studiupload.png b/skin/images/button_studiupload.png
old mode 100755
new mode 100644
diff --git a/skin/images/cbox-check.gif b/skin/images/cbox-check.gif
old mode 100755
new mode 100644
diff --git a/skin/images/changed.png b/skin/images/changed.png
old mode 100755
new mode 100644
diff --git a/skin/images/check_black.png b/skin/images/check_black.png
old mode 100755
new mode 100644
diff --git a/skin/images/checkbox_toggle.png b/skin/images/checkbox_toggle.png
old mode 100755
new mode 100644
diff --git a/skin/images/checkbox_uncheck.png b/skin/images/checkbox_uncheck.png
old mode 100755
new mode 100644
diff --git a/skin/images/cis_logo.png b/skin/images/cis_logo.png
old mode 100755
new mode 100644
diff --git a/skin/images/cis_logo_400px.png b/skin/images/cis_logo_400px.png
old mode 100755
new mode 100644
diff --git a/skin/images/cis_logo_weiss.png b/skin/images/cis_logo_weiss.png
old mode 100755
new mode 100644
diff --git a/skin/images/clock_down.png b/skin/images/clock_down.png
old mode 100755
new mode 100644
diff --git a/skin/images/clock_up.png b/skin/images/clock_up.png
old mode 100755
new mode 100644
diff --git a/skin/images/colorpicker/blank.gif b/skin/images/colorpicker/blank.gif
old mode 100755
new mode 100644
diff --git a/skin/images/colorpicker/colorpicker_background.png b/skin/images/colorpicker/colorpicker_background.png
old mode 100755
new mode 100644
diff --git a/skin/images/colorpicker/colorpicker_hex.png b/skin/images/colorpicker/colorpicker_hex.png
old mode 100755
new mode 100644
diff --git a/skin/images/colorpicker/colorpicker_hsb_b.png b/skin/images/colorpicker/colorpicker_hsb_b.png
old mode 100755
new mode 100644
diff --git a/skin/images/colorpicker/colorpicker_hsb_h.png b/skin/images/colorpicker/colorpicker_hsb_h.png
old mode 100755
new mode 100644
diff --git a/skin/images/colorpicker/colorpicker_hsb_s.png b/skin/images/colorpicker/colorpicker_hsb_s.png
old mode 100755
new mode 100644
diff --git a/skin/images/colorpicker/colorpicker_indic.gif b/skin/images/colorpicker/colorpicker_indic.gif
old mode 100755
new mode 100644
diff --git a/skin/images/colorpicker/colorpicker_overlay.png b/skin/images/colorpicker/colorpicker_overlay.png
old mode 100755
new mode 100644
diff --git a/skin/images/colorpicker/colorpicker_rgb_b.png b/skin/images/colorpicker/colorpicker_rgb_b.png
old mode 100755
new mode 100644
diff --git a/skin/images/colorpicker/colorpicker_rgb_g.png b/skin/images/colorpicker/colorpicker_rgb_g.png
old mode 100755
new mode 100644
diff --git a/skin/images/colorpicker/colorpicker_rgb_r.png b/skin/images/colorpicker/colorpicker_rgb_r.png
old mode 100755
new mode 100644
diff --git a/skin/images/colorpicker/colorpicker_select.gif b/skin/images/colorpicker/colorpicker_select.gif
old mode 100755
new mode 100644
diff --git a/skin/images/colorpicker/colorpicker_submit.png b/skin/images/colorpicker/colorpicker_submit.png
old mode 100755
new mode 100644
diff --git a/skin/images/colorpicker/custom_background.png b/skin/images/colorpicker/custom_background.png
old mode 100755
new mode 100644
diff --git a/skin/images/colorpicker/custom_hex.png b/skin/images/colorpicker/custom_hex.png
old mode 100755
new mode 100644
diff --git a/skin/images/colorpicker/custom_hsb_b.png b/skin/images/colorpicker/custom_hsb_b.png
old mode 100755
new mode 100644
diff --git a/skin/images/colorpicker/custom_hsb_h.png b/skin/images/colorpicker/custom_hsb_h.png
old mode 100755
new mode 100644
diff --git a/skin/images/colorpicker/custom_hsb_s.png b/skin/images/colorpicker/custom_hsb_s.png
old mode 100755
new mode 100644
diff --git a/skin/images/colorpicker/custom_indic.gif b/skin/images/colorpicker/custom_indic.gif
old mode 100755
new mode 100644
diff --git a/skin/images/colorpicker/custom_rgb_b.png b/skin/images/colorpicker/custom_rgb_b.png
old mode 100755
new mode 100644
diff --git a/skin/images/colorpicker/custom_rgb_g.png b/skin/images/colorpicker/custom_rgb_g.png
old mode 100755
new mode 100644
diff --git a/skin/images/colorpicker/custom_rgb_r.png b/skin/images/colorpicker/custom_rgb_r.png
old mode 100755
new mode 100644
diff --git a/skin/images/colorpicker/custom_submit.png b/skin/images/colorpicker/custom_submit.png
old mode 100755
new mode 100644
diff --git a/skin/images/colorpicker/select.png b/skin/images/colorpicker/select.png
old mode 100755
new mode 100644
diff --git a/skin/images/colorpicker/select2.png b/skin/images/colorpicker/select2.png
old mode 100755
new mode 100644
diff --git a/skin/images/colorpicker/slider.png b/skin/images/colorpicker/slider.png
old mode 100755
new mode 100644
diff --git a/skin/images/copy.png b/skin/images/copy.png
old mode 100755
new mode 100644
diff --git a/skin/images/cross.png b/skin/images/cross.png
old mode 100755
new mode 100644
diff --git a/skin/images/csv.ico b/skin/images/csv.ico
old mode 100755
new mode 100644
diff --git a/skin/images/csv.png b/skin/images/csv.png
old mode 100755
new mode 100644
diff --git a/skin/images/csv_light.png b/skin/images/csv_light.png
old mode 100755
new mode 100644
diff --git a/skin/images/date_add.png b/skin/images/date_add.png
old mode 100755
new mode 100644
diff --git a/skin/images/date_delete.png b/skin/images/date_delete.png
old mode 100755
new mode 100644
diff --git a/skin/images/date_edit.png b/skin/images/date_edit.png
old mode 100755
new mode 100644
diff --git a/skin/images/date_go.png b/skin/images/date_go.png
old mode 100755
new mode 100644
diff --git a/skin/images/date_go_grau.png b/skin/images/date_go_grau.png
old mode 100755
new mode 100644
diff --git a/skin/images/date_magnify.png b/skin/images/date_magnify.png
old mode 100755
new mode 100644
diff --git a/skin/images/delete.gif b/skin/images/delete.gif
old mode 100755
new mode 100644
diff --git a/skin/images/delete.png b/skin/images/delete.png
old mode 100755
new mode 100644
diff --git a/skin/images/delete_round.png b/skin/images/delete_round.png
old mode 100755
new mode 100644
diff --git a/skin/images/delete_x.png b/skin/images/delete_x.png
old mode 100755
new mode 100644
diff --git a/skin/images/delete_x_grau.png b/skin/images/delete_x_grau.png
old mode 100755
new mode 100644
diff --git a/skin/images/desc.gif b/skin/images/desc.gif
old mode 100755
new mode 100644
diff --git a/skin/images/doc_icon.png b/skin/images/doc_icon.png
old mode 100755
new mode 100644
diff --git a/skin/images/doppelampel_gelb.gif b/skin/images/doppelampel_gelb.gif
old mode 100755
new mode 100644
diff --git a/skin/images/doppelampel_grau.gif b/skin/images/doppelampel_grau.gif
old mode 100755
new mode 100644
diff --git a/skin/images/doppelampel_rot.gif b/skin/images/doppelampel_rot.gif
old mode 100755
new mode 100644
diff --git a/skin/images/doppelampel_rot_gelb.gif b/skin/images/doppelampel_rot_gelb.gif
old mode 100755
new mode 100644
diff --git a/skin/images/down.png b/skin/images/down.png
old mode 100755
new mode 100644
diff --git a/skin/images/down_lvplan.png b/skin/images/down_lvplan.png
old mode 100755
new mode 100644
diff --git a/skin/images/drucken.png b/skin/images/drucken.png
old mode 100755
new mode 100644
diff --git a/skin/images/edit-paste.png b/skin/images/edit-paste.png
old mode 100755
new mode 100644
diff --git a/skin/images/edit.png b/skin/images/edit.png
old mode 100755
new mode 100644
diff --git a/skin/images/edit_grau.png b/skin/images/edit_grau.png
old mode 100755
new mode 100644
diff --git a/skin/images/edit_wawi.gif b/skin/images/edit_wawi.gif
old mode 100755
new mode 100644
diff --git a/skin/images/email.png b/skin/images/email.png
old mode 100755
new mode 100644
diff --git a/skin/images/entitlement-pot.png b/skin/images/entitlement-pot.png
old mode 100755
new mode 100644
diff --git a/skin/images/entry.gif b/skin/images/entry.gif
old mode 100755
new mode 100644
diff --git a/skin/images/eps-logo_full.gif b/skin/images/eps-logo_full.gif
old mode 100755
new mode 100644
diff --git a/skin/images/excel.gif b/skin/images/excel.gif
old mode 100755
new mode 100644
diff --git a/skin/images/exclamation.png b/skin/images/exclamation.png
old mode 100755
new mode 100644
diff --git a/skin/images/eye.png b/skin/images/eye.png
old mode 100755
new mode 100644
diff --git a/skin/images/false.png b/skin/images/false.png
old mode 100755
new mode 100644
diff --git a/skin/images/fh-complete_weiss.png b/skin/images/fh-complete_weiss.png
old mode 100755
new mode 100644
diff --git a/skin/images/fh_complete_logo.png b/skin/images/fh_complete_logo.png
old mode 100755
new mode 100644
diff --git a/skin/images/fh_complete_logo_400x61.png b/skin/images/fh_complete_logo_400x61.png
old mode 100755
new mode 100644
diff --git a/skin/images/fh_logo.png b/skin/images/fh_logo.png
old mode 100755
new mode 100644
diff --git a/skin/images/fh_technikum_wien_illustration_klein.png b/skin/images/fh_technikum_wien_illustration_klein.png
old mode 100755
new mode 100644
diff --git a/skin/images/fhcomplete.png b/skin/images/fhcomplete.png
old mode 100755
new mode 100644
diff --git a/skin/images/fhtw_logo.png b/skin/images/fhtw_logo.png
old mode 100755
new mode 100644
diff --git a/skin/images/file.gif b/skin/images/file.gif
old mode 100755
new mode 100644
diff --git a/skin/images/flag-green.png b/skin/images/flag-green.png
old mode 100755
new mode 100644
diff --git a/skin/images/flag-red.png b/skin/images/flag-red.png
old mode 100755
new mode 100644
diff --git a/skin/images/flag-yellow.png b/skin/images/flag-yellow.png
old mode 100755
new mode 100644
diff --git a/skin/images/folder.gif b/skin/images/folder.gif
old mode 100755
new mode 100644
diff --git a/skin/images/folderup.gif b/skin/images/folderup.gif
old mode 100755
new mode 100644
diff --git a/skin/images/green_point.gif b/skin/images/green_point.gif
old mode 100755
new mode 100644
diff --git a/skin/images/group.png b/skin/images/group.png
old mode 100755
new mode 100644
diff --git a/skin/images/haken.gif b/skin/images/haken.gif
old mode 100755
new mode 100644
diff --git a/skin/images/header_line.gif b/skin/images/header_line.gif
old mode 100755
new mode 100644
diff --git a/skin/images/header_testtool.png b/skin/images/header_testtool.png
old mode 100755
new mode 100644
diff --git a/skin/images/help.png b/skin/images/help.png
old mode 100755
new mode 100644
diff --git a/skin/images/html.png b/skin/images/html.png
old mode 100755
new mode 100644
diff --git a/skin/images/html_light.png b/skin/images/html_light.png
old mode 100755
new mode 100644
diff --git a/skin/images/ical1.0.png b/skin/images/ical1.0.png
old mode 100755
new mode 100644
diff --git a/skin/images/ical1.0_light.png b/skin/images/ical1.0_light.png
old mode 100755
new mode 100644
diff --git a/skin/images/ical2.0.png b/skin/images/ical2.0.png
old mode 100755
new mode 100644
diff --git a/skin/images/ical2.0_light.png b/skin/images/ical2.0_light.png
old mode 100755
new mode 100644
diff --git a/skin/images/img_icon.png b/skin/images/img_icon.png
old mode 100755
new mode 100644
diff --git a/skin/images/index.php b/skin/images/index.php
old mode 100755
new mode 100644
diff --git a/skin/images/indicator.gif b/skin/images/indicator.gif
old mode 100755
new mode 100644
diff --git a/skin/images/info.png b/skin/images/info.png
old mode 100755
new mode 100644
diff --git a/skin/images/information.png b/skin/images/information.png
old mode 100755
new mode 100644
diff --git a/skin/images/invisible.png b/skin/images/invisible.png
old mode 100755
new mode 100644
diff --git a/skin/images/italic.png b/skin/images/italic.png
old mode 100755
new mode 100644
diff --git a/skin/images/ja.png b/skin/images/ja.png
old mode 100755
new mode 100644
diff --git a/skin/images/justifycenter.png b/skin/images/justifycenter.png
old mode 100755
new mode 100644
diff --git a/skin/images/justifyleft.png b/skin/images/justifyleft.png
old mode 100755
new mode 100644
diff --git a/skin/images/justifyright.png b/skin/images/justifyright.png
old mode 100755
new mode 100644
diff --git a/skin/images/left.gif b/skin/images/left.gif
old mode 100755
new mode 100644
diff --git a/skin/images/left.png b/skin/images/left.png
old mode 100755
new mode 100644
diff --git a/skin/images/left_lvplan.png b/skin/images/left_lvplan.png
old mode 100755
new mode 100644
diff --git a/skin/images/lehrtyp_.png b/skin/images/lehrtyp_.png
old mode 100755
new mode 100644
diff --git a/skin/images/lehrtyp_2.png b/skin/images/lehrtyp_2.png
old mode 100755
new mode 100644
diff --git a/skin/images/lehrtyp_lf.png b/skin/images/lehrtyp_lf.png
old mode 100755
new mode 100644
diff --git a/skin/images/lehrtyp_lv.png b/skin/images/lehrtyp_lv.png
old mode 100755
new mode 100644
diff --git a/skin/images/lehrtyp_modul.png b/skin/images/lehrtyp_modul.png
old mode 100755
new mode 100644
diff --git a/skin/images/list-add.png b/skin/images/list-add.png
old mode 100755
new mode 100644
diff --git a/skin/images/liste.gif b/skin/images/liste.gif
old mode 100755
new mode 100644
diff --git a/skin/images/lock.png b/skin/images/lock.png
old mode 100755
new mode 100644
diff --git a/skin/images/login.gif b/skin/images/login.gif
old mode 100755
new mode 100644
diff --git a/skin/images/logo.jpg b/skin/images/logo.jpg
old mode 100755
new mode 100644
diff --git a/skin/images/logo.png b/skin/images/logo.png
old mode 100755
new mode 100644
diff --git a/skin/images/logo_gmbh.jpg b/skin/images/logo_gmbh.jpg
old mode 100755
new mode 100644
diff --git a/skin/images/lv.png b/skin/images/lv.png
old mode 100755
new mode 100644
diff --git a/skin/images/lvaMulti.png b/skin/images/lvaMulti.png
old mode 100755
new mode 100644
diff --git a/skin/images/lvaMultiDel.png b/skin/images/lvaMultiDel.png
old mode 100755
new mode 100644
diff --git a/skin/images/lvaSingle.png b/skin/images/lvaSingle.png
old mode 100755
new mode 100644
diff --git a/skin/images/lvaSingleDel.png b/skin/images/lvaSingleDel.png
old mode 100755
new mode 100644
diff --git a/skin/images/lvplan.png b/skin/images/lvplan.png
old mode 100755
new mode 100644
diff --git a/skin/images/map.png b/skin/images/map.png
old mode 100755
new mode 100644
diff --git a/skin/images/markdown_button.png b/skin/images/markdown_button.png
old mode 100755
new mode 100644
diff --git a/skin/images/menu_item.gif b/skin/images/menu_item.gif
old mode 100755
new mode 100644
diff --git a/skin/images/menue.png b/skin/images/menue.png
old mode 100755
new mode 100644
diff --git a/skin/images/menue_hover.png b/skin/images/menue_hover.png
old mode 100755
new mode 100644
diff --git a/skin/images/merge.png b/skin/images/merge.png
old mode 100755
new mode 100644
diff --git a/skin/images/milestone.png b/skin/images/milestone.png
old mode 100755
new mode 100644
diff --git a/skin/images/modul.png b/skin/images/modul.png
old mode 100755
new mode 100644
diff --git a/skin/images/moreleft.png b/skin/images/moreleft.png
old mode 100755
new mode 100644
diff --git a/skin/images/moreleft_lvplan.png b/skin/images/moreleft_lvplan.png
old mode 100755
new mode 100644
diff --git a/skin/images/moremoreleft.png b/skin/images/moremoreleft.png
old mode 100755
new mode 100644
diff --git a/skin/images/moremoreright.png b/skin/images/moremoreright.png
old mode 100755
new mode 100644
diff --git a/skin/images/moreright.png b/skin/images/moreright.png
old mode 100755
new mode 100644
diff --git a/skin/images/moreright_lvplan.png b/skin/images/moreright_lvplan.png
old mode 100755
new mode 100644
diff --git a/skin/images/nachgereicht.png b/skin/images/nachgereicht.png
old mode 100755
new mode 100644
diff --git a/skin/images/not-available.png b/skin/images/not-available.png
old mode 100755
new mode 100644
diff --git a/skin/images/offen.png b/skin/images/offen.png
old mode 100755
new mode 100644
diff --git a/skin/images/ok.png b/skin/images/ok.png
old mode 100755
new mode 100644
diff --git a/skin/images/open.gif b/skin/images/open.gif
old mode 100755
new mode 100644
diff --git a/skin/images/openoffice0.jpg b/skin/images/openoffice0.jpg
old mode 100755
new mode 100644
diff --git a/skin/images/organisationseinheit.png b/skin/images/organisationseinheit.png
old mode 100755
new mode 100644
diff --git a/skin/images/outlook.ico b/skin/images/outlook.ico
old mode 100755
new mode 100644
diff --git a/skin/images/outlook.png b/skin/images/outlook.png
old mode 100755
new mode 100644
diff --git a/skin/images/outlook_light.png b/skin/images/outlook_light.png
old mode 100755
new mode 100644
diff --git a/skin/images/p.gif b/skin/images/p.gif
old mode 100755
new mode 100644
diff --git a/skin/images/page_go.png b/skin/images/page_go.png
old mode 100755
new mode 100644
diff --git a/skin/images/page_green.png b/skin/images/page_green.png
old mode 100755
new mode 100644
diff --git a/skin/images/pdf.ico b/skin/images/pdf.ico
old mode 100755
new mode 100644
diff --git a/skin/images/pdf_icon.png b/skin/images/pdf_icon.png
old mode 100755
new mode 100644
diff --git a/skin/images/pdfpic.gif b/skin/images/pdfpic.gif
old mode 100755
new mode 100644
diff --git a/skin/images/pencil.png b/skin/images/pencil.png
old mode 100755
new mode 100644
diff --git a/skin/images/person.gif b/skin/images/person.gif
old mode 100755
new mode 100644
diff --git a/skin/images/photoupload.png b/skin/images/photoupload.png
old mode 100755
new mode 100644
diff --git a/skin/images/planner.ico b/skin/images/planner.ico
old mode 100755
new mode 100644
diff --git a/skin/images/planner.png b/skin/images/planner.png
old mode 100755
new mode 100644
diff --git a/skin/images/planner_logo.png b/skin/images/planner_logo.png
old mode 100755
new mode 100644
diff --git a/skin/images/planner_logo_weiss.png b/skin/images/planner_logo_weiss.png
old mode 100755
new mode 100644
diff --git a/skin/images/plus.png b/skin/images/plus.png
old mode 100755
new mode 100644
diff --git a/skin/images/ppt_icon.png b/skin/images/ppt_icon.png
old mode 100755
new mode 100644
diff --git a/skin/images/preferences-system.png b/skin/images/preferences-system.png
old mode 100755
new mode 100644
diff --git a/skin/images/printer.png b/skin/images/printer.png
old mode 100755
new mode 100644
diff --git a/skin/images/profilbild_dummy.jpg b/skin/images/profilbild_dummy.jpg
old mode 100755
new mode 100644
diff --git a/skin/images/projekt.png b/skin/images/projekt.png
old mode 100755
new mode 100644
diff --git a/skin/images/projektphase.png b/skin/images/projektphase.png
old mode 100755
new mode 100644
diff --git a/skin/images/question.png b/skin/images/question.png
old mode 100755
new mode 100644
diff --git a/skin/images/red_point.gif b/skin/images/red_point.gif
old mode 100755
new mode 100644
diff --git a/skin/images/refresh.png b/skin/images/refresh.png
old mode 100755
new mode 100644
diff --git a/skin/images/repeat.png b/skin/images/repeat.png
old mode 100755
new mode 100644
diff --git a/skin/images/right.gif b/skin/images/right.gif
old mode 100755
new mode 100644
diff --git a/skin/images/right.png b/skin/images/right.png
old mode 100755
new mode 100644
diff --git a/skin/images/right_lvplan.png b/skin/images/right_lvplan.png
old mode 100755
new mode 100644
diff --git a/skin/images/round.png b/skin/images/round.png
old mode 100755
new mode 100644
diff --git a/skin/images/sancho/sancho_footer.jpg b/skin/images/sancho/sancho_footer.jpg
old mode 100755
new mode 100644
diff --git a/skin/images/sancho/sancho_footer_DEFAULT.jpg b/skin/images/sancho/sancho_footer_DEFAULT.jpg
old mode 100755
new mode 100644
diff --git a/skin/images/sancho/sancho_footer_DEFAULT_bw.jpg b/skin/images/sancho/sancho_footer_DEFAULT_bw.jpg
old mode 100755
new mode 100644
diff --git a/skin/images/sancho/sancho_footer_min_bw.jpg b/skin/images/sancho/sancho_footer_min_bw.jpg
old mode 100755
new mode 100644
diff --git a/skin/images/sancho/sancho_footer_min_bw.xcf b/skin/images/sancho/sancho_footer_min_bw.xcf
old mode 100755
new mode 100644
diff --git a/skin/images/sancho/sancho_header_DEFAULT.jpg b/skin/images/sancho/sancho_header_DEFAULT.jpg
old mode 100755
new mode 100644
diff --git a/skin/images/sancho/sancho_header_DEFAULT_bw.jpg b/skin/images/sancho/sancho_header_DEFAULT_bw.jpg
old mode 100755
new mode 100644
diff --git a/skin/images/sancho/sancho_header_TEMPLATE.xcf b/skin/images/sancho/sancho_header_TEMPLATE.xcf
old mode 100755
new mode 100644
diff --git a/skin/images/sancho/sancho_header_ampel_overdue.jpg b/skin/images/sancho/sancho_header_ampel_overdue.jpg
old mode 100755
new mode 100644
diff --git a/skin/images/sancho/sancho_header_confirm_timesheet.jpg b/skin/images/sancho/sancho_header_confirm_timesheet.jpg
old mode 100755
new mode 100644
diff --git a/skin/images/sancho/sancho_header_du_hast_neue_nachrichten.jpg b/skin/images/sancho/sancho_header_du_hast_neue_nachrichten.jpg
old mode 100755
new mode 100644
diff --git a/skin/images/sancho/sancho_header_du_hast_verpflichtende_ampeln.jpg b/skin/images/sancho/sancho_header_du_hast_verpflichtende_ampeln.jpg
old mode 100755
new mode 100644
diff --git a/skin/images/sancho/sancho_header_min_bw.jpg b/skin/images/sancho/sancho_header_min_bw.jpg
old mode 100755
new mode 100644
diff --git a/skin/images/sancho/sancho_header_neue_nachrichten_in_ampelsystem.jpg b/skin/images/sancho/sancho_header_neue_nachrichten_in_ampelsystem.jpg
old mode 100755
new mode 100644
diff --git a/skin/images/sancho/sancho_roboter.jpg b/skin/images/sancho/sancho_roboter.jpg
old mode 100755
new mode 100644
diff --git a/skin/images/sancho/sancho_roboter_freigestellt.png b/skin/images/sancho/sancho_roboter_freigestellt.png
old mode 100755
new mode 100644
diff --git a/skin/images/sancho_round_right_blue.png b/skin/images/sancho_round_right_blue.png
old mode 100755
new mode 100644
diff --git a/skin/images/sancho_round_right_grey.png b/skin/images/sancho_round_right_grey.png
old mode 100755
new mode 100644
diff --git a/skin/images/sancho_round_right_red.png b/skin/images/sancho_round_right_red.png
old mode 100755
new mode 100644
diff --git a/skin/images/scrollbar_left_right.png b/skin/images/scrollbar_left_right.png
old mode 100755
new mode 100644
diff --git a/skin/images/scrollbar_up_down.png b/skin/images/scrollbar_up_down.png
old mode 100755
new mode 100644
diff --git a/skin/images/scrollbase_bottom.png b/skin/images/scrollbase_bottom.png
old mode 100755
new mode 100644
diff --git a/skin/images/scrollbase_left.png b/skin/images/scrollbase_left.png
old mode 100755
new mode 100644
diff --git a/skin/images/scrollbase_right.png b/skin/images/scrollbase_right.png
old mode 100755
new mode 100644
diff --git a/skin/images/scrollbase_top.png b/skin/images/scrollbase_top.png
old mode 100755
new mode 100644
diff --git a/skin/images/search.png b/skin/images/search.png
old mode 100755
new mode 100644
diff --git a/skin/images/seperator.gif b/skin/images/seperator.gif
old mode 100755
new mode 100644
diff --git a/skin/images/service.png b/skin/images/service.png
old mode 100755
new mode 100644
diff --git a/skin/images/spinner.gif b/skin/images/spinner.gif
old mode 100755
new mode 100644
diff --git a/skin/images/split-arrows.png b/skin/images/split-arrows.png
old mode 100755
new mode 100644
diff --git a/skin/images/square_blue.png b/skin/images/square_blue.png
old mode 100755
new mode 100644
diff --git a/skin/images/statistic.png b/skin/images/statistic.png
old mode 100755
new mode 100644
diff --git a/skin/images/sticky.png b/skin/images/sticky.png
old mode 100755
new mode 100644
diff --git a/skin/images/system-index-search.png b/skin/images/system-index-search.png
old mode 100755
new mode 100644
diff --git a/skin/images/tempus_logo.png b/skin/images/tempus_logo.png
old mode 100755
new mode 100644
diff --git a/skin/images/tempus_logo_weiss.png b/skin/images/tempus_logo_weiss.png
old mode 100755
new mode 100644
diff --git a/skin/images/testtool_button.png b/skin/images/testtool_button.png
old mode 100755
new mode 100644
diff --git a/skin/images/testtool_button_hover.png b/skin/images/testtool_button_hover.png
old mode 100755
new mode 100644
diff --git a/skin/images/testtool_buttonleft.png b/skin/images/testtool_buttonleft.png
old mode 100755
new mode 100644
diff --git a/skin/images/testtool_buttonright.png b/skin/images/testtool_buttonright.png
old mode 100755
new mode 100644
diff --git a/skin/images/text-x-generic_with_pencil.png b/skin/images/text-x-generic_with_pencil.png
old mode 100755
new mode 100644
diff --git a/skin/images/tick.png b/skin/images/tick.png
old mode 100755
new mode 100644
diff --git a/skin/images/timetable.png b/skin/images/timetable.png
old mode 100755
new mode 100644
diff --git a/skin/images/transmit.png b/skin/images/transmit.png
old mode 100755
new mode 100644
diff --git a/skin/images/tree-diagramm.png b/skin/images/tree-diagramm.png
old mode 100755
new mode 100644
diff --git a/skin/images/true.png b/skin/images/true.png
old mode 100755
new mode 100644
diff --git a/skin/images/tw_logo_02.jpg b/skin/images/tw_logo_02.jpg
old mode 100755
new mode 100644
diff --git a/skin/images/ui-bg_diagonals-thick_18_b81900_40x40.png b/skin/images/ui-bg_diagonals-thick_18_b81900_40x40.png
old mode 100755
new mode 100644
diff --git a/skin/images/ui-bg_diagonals-thick_20_666666_40x40.png b/skin/images/ui-bg_diagonals-thick_20_666666_40x40.png
old mode 100755
new mode 100644
diff --git a/skin/images/ui-bg_flat_0_aaaaaa_40x100.png b/skin/images/ui-bg_flat_0_aaaaaa_40x100.png
old mode 100755
new mode 100644
diff --git a/skin/images/ui-bg_flat_10_000000_40x100.png b/skin/images/ui-bg_flat_10_000000_40x100.png
old mode 100755
new mode 100644
diff --git a/skin/images/ui-bg_flat_75_ffffff_40x100.png b/skin/images/ui-bg_flat_75_ffffff_40x100.png
old mode 100755
new mode 100644
diff --git a/skin/images/ui-bg_glass_100_f6f6f6_1x400.png b/skin/images/ui-bg_glass_100_f6f6f6_1x400.png
old mode 100755
new mode 100644
diff --git a/skin/images/ui-bg_glass_100_fdf5ce_1x400.png b/skin/images/ui-bg_glass_100_fdf5ce_1x400.png
old mode 100755
new mode 100644
diff --git a/skin/images/ui-bg_glass_55_fbf9ee_1x400.png b/skin/images/ui-bg_glass_55_fbf9ee_1x400.png
old mode 100755
new mode 100644
diff --git a/skin/images/ui-bg_glass_65_ffffff_1x400.png b/skin/images/ui-bg_glass_65_ffffff_1x400.png
old mode 100755
new mode 100644
diff --git a/skin/images/ui-bg_glass_75_dadada_1x400.png b/skin/images/ui-bg_glass_75_dadada_1x400.png
old mode 100755
new mode 100644
diff --git a/skin/images/ui-bg_glass_75_e6e6e6_1x400.png b/skin/images/ui-bg_glass_75_e6e6e6_1x400.png
old mode 100755
new mode 100644
diff --git a/skin/images/ui-bg_glass_95_fef1ec_1x400.png b/skin/images/ui-bg_glass_95_fef1ec_1x400.png
old mode 100755
new mode 100644
diff --git a/skin/images/ui-bg_gloss-wave_35_f6a828_500x100.png b/skin/images/ui-bg_gloss-wave_35_f6a828_500x100.png
old mode 100755
new mode 100644
diff --git a/skin/images/ui-bg_highlight-soft_100_eeeeee_1x100.png b/skin/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
old mode 100755
new mode 100644
diff --git a/skin/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/skin/images/ui-bg_highlight-soft_75_cccccc_1x100.png
old mode 100755
new mode 100644
diff --git a/skin/images/ui-bg_highlight-soft_75_ffe45c_1x100.png b/skin/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
old mode 100755
new mode 100644
diff --git a/skin/images/ui-icons_222222_256x240.png b/skin/images/ui-icons_222222_256x240.png
old mode 100755
new mode 100644
diff --git a/skin/images/ui-icons_228ef1_256x240.png b/skin/images/ui-icons_228ef1_256x240.png
old mode 100755
new mode 100644
diff --git a/skin/images/ui-icons_2e83ff_256x240.png b/skin/images/ui-icons_2e83ff_256x240.png
old mode 100755
new mode 100644
diff --git a/skin/images/ui-icons_454545_256x240.png b/skin/images/ui-icons_454545_256x240.png
old mode 100755
new mode 100644
diff --git a/skin/images/ui-icons_888888_256x240.png b/skin/images/ui-icons_888888_256x240.png
old mode 100755
new mode 100644
diff --git a/skin/images/ui-icons_cd0a0a_256x240.png b/skin/images/ui-icons_cd0a0a_256x240.png
old mode 100755
new mode 100644
diff --git a/skin/images/ui-icons_ef8c08_256x240.png b/skin/images/ui-icons_ef8c08_256x240.png
old mode 100755
new mode 100644
diff --git a/skin/images/ui-icons_ffd27a_256x240.png b/skin/images/ui-icons_ffd27a_256x240.png
old mode 100755
new mode 100644
diff --git a/skin/images/ui-icons_ffffff_256x240.png b/skin/images/ui-icons_ffffff_256x240.png
old mode 100755
new mode 100644
diff --git a/skin/images/underline.png b/skin/images/underline.png
old mode 100755
new mode 100644
diff --git a/skin/images/up.png b/skin/images/up.png
old mode 100755
new mode 100644
diff --git a/skin/images/upload.png b/skin/images/upload.png
old mode 100755
new mode 100644
diff --git a/skin/images/user_down.png b/skin/images/user_down.png
old mode 100755
new mode 100644
diff --git a/skin/images/user_up.png b/skin/images/user_up.png
old mode 100755
new mode 100644
diff --git a/skin/images/verplant_false.png b/skin/images/verplant_false.png
old mode 100755
new mode 100644
diff --git a/skin/images/verplant_true.png b/skin/images/verplant_true.png
old mode 100755
new mode 100644
diff --git a/skin/images/vilesci_addons.png b/skin/images/vilesci_addons.png
old mode 100755
new mode 100644
diff --git a/skin/images/vilesci_admin.png b/skin/images/vilesci_admin.png
old mode 100755
new mode 100644
diff --git a/skin/images/vilesci_farbverlauf.png b/skin/images/vilesci_farbverlauf.png
old mode 100755
new mode 100644
diff --git a/skin/images/vilesci_farbverlauf_top.png b/skin/images/vilesci_farbverlauf_top.png
old mode 100755
new mode 100644
diff --git a/skin/images/vilesci_inventar.png b/skin/images/vilesci_inventar.png
old mode 100755
new mode 100644
diff --git a/skin/images/vilesci_lehre.png b/skin/images/vilesci_lehre.png
old mode 100755
new mode 100644
diff --git a/skin/images/vilesci_logo.png b/skin/images/vilesci_logo.png
old mode 100755
new mode 100644
diff --git a/skin/images/vilesci_logo_weiss.png b/skin/images/vilesci_logo_weiss.png
old mode 100755
new mode 100644
diff --git a/skin/images/vilesci_lvplan.png b/skin/images/vilesci_lvplan.png
old mode 100755
new mode 100644
diff --git a/skin/images/vilesci_personen.png b/skin/images/vilesci_personen.png
old mode 100755
new mode 100644
diff --git a/skin/images/vilesci_stammdaten.png b/skin/images/vilesci_stammdaten.png
old mode 100755
new mode 100644
diff --git a/skin/images/vilesci_statistik.png b/skin/images/vilesci_statistik.png
old mode 100755
new mode 100644
diff --git a/skin/images/vilesci_wartung.png b/skin/images/vilesci_wartung.png
old mode 100755
new mode 100644
diff --git a/skin/images/wawi_logo.png b/skin/images/wawi_logo.png
old mode 100755
new mode 100644
diff --git a/skin/images/wawi_logo_sz.png b/skin/images/wawi_logo_sz.png
old mode 100755
new mode 100644
diff --git a/skin/images/wawi_logo_weiss.png b/skin/images/wawi_logo_weiss.png
old mode 100755
new mode 100644
diff --git a/skin/images/x-office-presentation.svg b/skin/images/x-office-presentation.svg
old mode 100755
new mode 100644
diff --git a/skin/images/x-office-spreadsheet.svg b/skin/images/x-office-spreadsheet.svg
old mode 100755
new mode 100644
diff --git a/skin/images/xls.png b/skin/images/xls.png
old mode 100755
new mode 100644
diff --git a/skin/images/xls_icon.png b/skin/images/xls_icon.png
old mode 100755
new mode 100644
diff --git a/skin/images/xls_light.png b/skin/images/xls_light.png
old mode 100755
new mode 100644
diff --git a/skin/images/zip_icon.png b/skin/images/zip_icon.png
old mode 100755
new mode 100644
diff --git a/skin/infoscreen.css b/skin/infoscreen.css
old mode 100755
new mode 100644
diff --git a/skin/jquery-ui-1.9.2.custom.min.css b/skin/jquery-ui-1.9.2.custom.min.css
old mode 100755
new mode 100644
diff --git a/skin/jquery.css b/skin/jquery.css
old mode 100755
new mode 100644
diff --git a/skin/planner.css b/skin/planner.css
old mode 100755
new mode 100644
diff --git a/skin/print.css b/skin/print.css
old mode 100755
new mode 100644
diff --git a/skin/simplecropper.css b/skin/simplecropper.css
old mode 100755
new mode 100644
diff --git a/skin/sounds/inventar_error.ogg b/skin/sounds/inventar_error.ogg
old mode 100755
new mode 100644
diff --git a/skin/sounds/testtool_demo.mp3 b/skin/sounds/testtool_demo.mp3
old mode 100755
new mode 100644
diff --git a/skin/sounds/testtool_demo.ogg b/skin/sounds/testtool_demo.ogg
old mode 100755
new mode 100644
diff --git a/skin/style.css.php b/skin/style.css.php
old mode 100755
new mode 100644
diff --git a/skin/styles/default/cis_logo_text_400x78.png b/skin/styles/default/cis_logo_text_400x78.png
old mode 100755
new mode 100644
diff --git a/skin/styles/default/header.png b/skin/styles/default/header.png
old mode 100755
new mode 100644
diff --git a/skin/styles/default/logo_250x130.png b/skin/styles/default/logo_250x130.png
old mode 100755
new mode 100644
diff --git a/skin/styles/example.css b/skin/styles/example.css
old mode 100755
new mode 100644
diff --git a/skin/styles/example/description.txt b/skin/styles/example/description.txt
old mode 100755
new mode 100644
diff --git a/skin/styles/example/line.jpg b/skin/styles/example/line.jpg
old mode 100755
new mode 100644
diff --git a/skin/styles/example/logo.jpg b/skin/styles/example/logo.jpg
old mode 100755
new mode 100644
diff --git a/skin/styles/example/pixel.jpg b/skin/styles/example/pixel.jpg
old mode 100755
new mode 100644
diff --git a/skin/styles/example/screenshot.jpg b/skin/styles/example/screenshot.jpg
old mode 100755
new mode 100644
diff --git a/skin/styles/fhb/description.txt b/skin/styles/fhb/description.txt
old mode 100755
new mode 100644
diff --git a/skin/styles/fhb/logo.png b/skin/styles/fhb/logo.png
old mode 100755
new mode 100644
diff --git a/skin/styles/fhb/logo_klein.jpg b/skin/styles/fhb/logo_klein.jpg
old mode 100755
new mode 100644
diff --git a/skin/styles/jquery.css b/skin/styles/jquery.css
old mode 100755
new mode 100644
diff --git a/skin/styles/mobile.css b/skin/styles/mobile.css
old mode 100755
new mode 100644
diff --git a/skin/styles/mobile/TWLogo_klein.jpg b/skin/styles/mobile/TWLogo_klein.jpg
old mode 100755
new mode 100644
diff --git a/skin/styles/mobile/description.txt b/skin/styles/mobile/description.txt
old mode 100755
new mode 100644
diff --git a/skin/styles/mobile/header_line.jpg b/skin/styles/mobile/header_line.jpg
old mode 100755
new mode 100644
diff --git a/skin/styles/mobile/screenshot.jpg b/skin/styles/mobile/screenshot.jpg
old mode 100755
new mode 100644
diff --git a/skin/styles/stp.css b/skin/styles/stp.css
old mode 100755
new mode 100644
diff --git a/skin/styles/stp/BannerLogo.jpg b/skin/styles/stp/BannerLogo.jpg
old mode 100755
new mode 100644
diff --git a/skin/styles/stp/KTULogo.jpg b/skin/styles/stp/KTULogo.jpg
old mode 100755
new mode 100644
diff --git a/skin/styles/stp/KTULogo.png b/skin/styles/stp/KTULogo.png
old mode 100755
new mode 100644
diff --git a/skin/styles/stp/abschlusspraesentation.jpg b/skin/styles/stp/abschlusspraesentation.jpg
old mode 100755
new mode 100644
diff --git a/skin/styles/stp/absolventen.jpg b/skin/styles/stp/absolventen.jpg
old mode 100755
new mode 100644
diff --git a/skin/styles/stp/international_week.jpg b/skin/styles/stp/international_week.jpg
old mode 100755
new mode 100644
diff --git a/skin/styles/stp/logo.jpg b/skin/styles/stp/logo.jpg
old mode 100755
new mode 100644
diff --git a/skin/styles/stp/logo.png b/skin/styles/stp/logo.png
old mode 100755
new mode 100644
diff --git a/skin/styles/stp/pitching.jpg b/skin/styles/stp/pitching.jpg
old mode 100755
new mode 100644
diff --git a/skin/styles/stp/projektidee.jpg b/skin/styles/stp/projektidee.jpg
old mode 100755
new mode 100644
diff --git a/skin/styles/tinymce.css b/skin/styles/tinymce.css
old mode 100755
new mode 100644
diff --git a/skin/styles/tw.css b/skin/styles/tw.css
old mode 100755
new mode 100644
diff --git a/skin/styles/tw/TWLogo_klein.jpg b/skin/styles/tw/TWLogo_klein.jpg
old mode 100755
new mode 100644
diff --git a/skin/styles/tw/academy.jpg b/skin/styles/tw/academy.jpg
old mode 100755
new mode 100644
diff --git a/skin/styles/tw/cis_logo_text_400x78.png b/skin/styles/tw/cis_logo_text_400x78.png
old mode 100755
new mode 100644
diff --git a/skin/styles/tw/description.txt b/skin/styles/tw/description.txt
old mode 100755
new mode 100644
diff --git a/skin/styles/tw/header.png b/skin/styles/tw/header.png
old mode 100755
new mode 100644
diff --git a/skin/styles/tw/header_line.jpg b/skin/styles/tw/header_line.jpg
old mode 100755
new mode 100644
diff --git a/skin/styles/tw/lageplan.jpg b/skin/styles/tw/lageplan.jpg
old mode 100755
new mode 100644
diff --git a/skin/styles/tw/logo.jpg b/skin/styles/tw/logo.jpg
old mode 100755
new mode 100644
diff --git a/skin/styles/tw/logo.png b/skin/styles/tw/logo.png
old mode 100755
new mode 100644
diff --git a/skin/styles/tw/logo_200x400.png b/skin/styles/tw/logo_200x400.png
old mode 100755
new mode 100644
diff --git a/skin/styles/tw/logo_250x130.png b/skin/styles/tw/logo_250x130.png
old mode 100755
new mode 100644
diff --git a/skin/styles/tw/logo_50x25.png b/skin/styles/tw/logo_50x25.png
old mode 100755
new mode 100644
diff --git a/skin/styles/tw/logo_academy.png b/skin/styles/tw/logo_academy.png
old mode 100755
new mode 100644
diff --git a/skin/styles/tw/logo_klein.png b/skin/styles/tw/logo_klein.png
old mode 100755
new mode 100644
diff --git a/skin/styles/tw/logo_ws_50x25.png b/skin/styles/tw/logo_ws_50x25.png
old mode 100755
new mode 100644
diff --git a/skin/styles/tw/screenshot.jpg b/skin/styles/tw/screenshot.jpg
old mode 100755
new mode 100644
diff --git a/skin/styles/twgreen.css b/skin/styles/twgreen.css
old mode 100755
new mode 100644
diff --git a/skin/styles/twgreen/description.txt b/skin/styles/twgreen/description.txt
old mode 100755
new mode 100644
diff --git a/skin/styles/twgreen/menu.jpg b/skin/styles/twgreen/menu.jpg
old mode 100755
new mode 100644
diff --git a/skin/styles/twgreen/screenshot.jpg b/skin/styles/twgreen/screenshot.jpg
old mode 100755
new mode 100644
diff --git a/skin/styles/twgreen/tw_gr_header.jpg b/skin/styles/twgreen/tw_gr_header.jpg
old mode 100755
new mode 100644
diff --git a/skin/styles/twgreen/tw_gr_logo.jpg b/skin/styles/twgreen/tw_gr_logo.jpg
old mode 100755
new mode 100644
diff --git a/skin/tablesort.css b/skin/tablesort.css
old mode 100755
new mode 100644
diff --git a/skin/tempus.css b/skin/tempus.css
old mode 100755
new mode 100644
diff --git a/skin/vilesci.css b/skin/vilesci.css
old mode 100755
new mode 100644
diff --git a/skin/wawi.css b/skin/wawi.css
old mode 100755
new mode 100644
diff --git a/skin/widgets.css b/skin/widgets.css
old mode 100755
new mode 100644
diff --git a/soap/datenverbund_client.php b/soap/datenverbund_client.php
old mode 100755
new mode 100644
diff --git a/soap/fhcomplete.php b/soap/fhcomplete.php
old mode 100755
new mode 100644
diff --git a/soap/index.html b/soap/index.html
old mode 100755
new mode 100644
diff --git a/soap/kartenverlaengerung.soap.php b/soap/kartenverlaengerung.soap.php
old mode 100755
new mode 100644
diff --git a/soap/kartenverlaengerung.test.php b/soap/kartenverlaengerung.test.php
old mode 100755
new mode 100644
diff --git a/soap/kartenverlaengerung.wsdl.php b/soap/kartenverlaengerung.wsdl.php
old mode 100755
new mode 100644
diff --git a/soap/lehrveranstaltung.json.php b/soap/lehrveranstaltung.json.php
old mode 100755
new mode 100644
diff --git a/soap/lehrveranstaltung.soap.php b/soap/lehrveranstaltung.soap.php
old mode 100755
new mode 100644
diff --git a/soap/lehrveranstaltung.wsdl.php b/soap/lehrveranstaltung.wsdl.php
old mode 100755
new mode 100644
diff --git a/soap/lvplan.soap.php b/soap/lvplan.soap.php
old mode 100755
new mode 100644
diff --git a/soap/lvplan.wsdl.php b/soap/lvplan.wsdl.php
old mode 100755
new mode 100644
diff --git a/soap/mitarbeiter.soap.php b/soap/mitarbeiter.soap.php
old mode 100755
new mode 100644
diff --git a/soap/mitarbeiter.wsdl.php b/soap/mitarbeiter.wsdl.php
old mode 100755
new mode 100644
diff --git a/soap/notiz.soap.php b/soap/notiz.soap.php
old mode 100755
new mode 100644
diff --git a/soap/notiz.wsdl.php b/soap/notiz.wsdl.php
old mode 100755
new mode 100644
diff --git a/soap/ort.soap.php b/soap/ort.soap.php
old mode 100755
new mode 100644
diff --git a/soap/ort.wsdl.php b/soap/ort.wsdl.php
old mode 100755
new mode 100644
diff --git a/soap/person.soap.php b/soap/person.soap.php
old mode 100755
new mode 100644
diff --git a/soap/person.wsdl.php b/soap/person.wsdl.php
old mode 100755
new mode 100644
diff --git a/soap/projekt.soap.php b/soap/projekt.soap.php
old mode 100755
new mode 100644
diff --git a/soap/projekt.wsdl.php b/soap/projekt.wsdl.php
old mode 100755
new mode 100644
diff --git a/soap/projekt_jquery_client.php b/soap/projekt_jquery_client.php
old mode 100755
new mode 100644
diff --git a/soap/projektphase.soap.php b/soap/projektphase.soap.php
old mode 100755
new mode 100644
diff --git a/soap/projektphase.wsdl.php b/soap/projektphase.wsdl.php
old mode 100755
new mode 100644
diff --git a/soap/projekttask.soap.php b/soap/projekttask.soap.php
old mode 100755
new mode 100644
diff --git a/soap/projekttask.wsdl.php b/soap/projekttask.wsdl.php
old mode 100755
new mode 100644
diff --git a/soap/ressource.soap.php b/soap/ressource.soap.php
old mode 100755
new mode 100644
diff --git a/soap/ressource.wsdl.php b/soap/ressource.wsdl.php
old mode 100755
new mode 100644
diff --git a/soap/ressource_projekt.soap.php b/soap/ressource_projekt.soap.php
old mode 100755
new mode 100644
diff --git a/soap/ressource_projekt.wsdl.php b/soap/ressource_projekt.wsdl.php
old mode 100755
new mode 100644
diff --git a/soap/semesterticket.soap.php b/soap/semesterticket.soap.php
old mode 100755
new mode 100644
diff --git a/soap/semesterticket.wsdl.php b/soap/semesterticket.wsdl.php
old mode 100755
new mode 100644
diff --git a/soap/semesterticket_client.php b/soap/semesterticket_client.php
old mode 100755
new mode 100644
diff --git a/soap/soap_test_lv.php b/soap/soap_test_lv.php
old mode 100755
new mode 100644
diff --git a/soap/soap_test_lvplan.php b/soap/soap_test_lvplan.php
old mode 100755
new mode 100644
diff --git a/soap/soap_test_mitarbeiter.php b/soap/soap_test_mitarbeiter.php
old mode 100755
new mode 100644
diff --git a/soap/soap_test_ort.php b/soap/soap_test_ort.php
old mode 100755
new mode 100644
diff --git a/soap/soap_test_person.php b/soap/soap_test_person.php
old mode 100755
new mode 100644
diff --git a/soap/soap_test_student.php b/soap/soap_test_student.php
old mode 100755
new mode 100644
diff --git a/soap/stip.class.php b/soap/stip.class.php
old mode 100755
new mode 100644
diff --git a/soap/stip.soap.php b/soap/stip.soap.php
old mode 100755
new mode 100644
diff --git a/soap/stip.wsdl.php b/soap/stip.wsdl.php
old mode 100755
new mode 100644
diff --git a/soap/stip_client.php b/soap/stip_client.php
old mode 100755
new mode 100644
diff --git a/soap/stip_client_error.php b/soap/stip_client_error.php
old mode 100755
new mode 100644
diff --git a/soap/student.soap.php b/soap/student.soap.php
old mode 100755
new mode 100644
diff --git a/soap/student.wsdl.php b/soap/student.wsdl.php
old mode 100755
new mode 100644
diff --git a/soap/studienordnung.json.php b/soap/studienordnung.json.php
old mode 100755
new mode 100644
diff --git a/soap/studienplan.json.php b/soap/studienplan.json.php
old mode 100755
new mode 100644
diff --git a/soap/test.soap.php b/soap/test.soap.php
old mode 100755
new mode 100644
diff --git a/soap/test.wsdl.php b/soap/test.wsdl.php
old mode 100755
new mode 100644
diff --git a/soap/test_client.php b/soap/test_client.php
old mode 100755
new mode 100644
diff --git a/system/.htaccess_exmpl b/system/.htaccess_exmpl
old mode 100755
new mode 100644
diff --git a/system/FH-Complete.txp b/system/FH-Complete.txp
old mode 100755
new mode 100644
diff --git a/system/FHComplete-3.3.sql b/system/FHComplete-3.3.sql
old mode 100755
new mode 100644
diff --git a/system/FHCompleteTDM3PG83.xsl b/system/FHCompleteTDM3PG83.xsl
old mode 100755
new mode 100644
diff --git a/system/UnitTests/AppdatenTest.php b/system/UnitTests/AppdatenTest.php
old mode 100755
new mode 100644
diff --git a/system/UnitTests/FunctionsTest.php b/system/UnitTests/FunctionsTest.php
old mode 100755
new mode 100644
diff --git a/system/UnitTests/Studienordnung2Test.php b/system/UnitTests/Studienordnung2Test.php
old mode 100755
new mode 100644
diff --git a/system/UnitTests/StudienordnungTest.php b/system/UnitTests/StudienordnungTest.php
old mode 100755
new mode 100644
diff --git a/system/UnitTests/StudienplanTest.php b/system/UnitTests/StudienplanTest.php
old mode 100755
new mode 100644
diff --git a/system/UnitTests/StudienplatzTest.php b/system/UnitTests/StudienplatzTest.php
old mode 100755
new mode 100644
diff --git a/system/UnitTests/addons/studienplatzverwaltung/AqaClientTest.php b/system/UnitTests/addons/studienplatzverwaltung/AqaClientTest.php
old mode 100755
new mode 100644
diff --git a/system/UnitTests/addons/studienplatzverwaltung/AqaFoebisPersonTest.php b/system/UnitTests/addons/studienplatzverwaltung/AqaFoebisPersonTest.php
old mode 100755
new mode 100644
diff --git a/system/UnitTests/addons/studienplatzverwaltung/AqaFoebisStgTest.php b/system/UnitTests/addons/studienplatzverwaltung/AqaFoebisStgTest.php
old mode 100755
new mode 100644
diff --git a/system/UnitTests/addons/studienplatzverwaltung/FunctionsTest.php b/system/UnitTests/addons/studienplatzverwaltung/FunctionsTest.php
old mode 100755
new mode 100644
diff --git a/system/UnitTests/addons/studienplatzverwaltung/StudienplatzverwaltungAPITest.php b/system/UnitTests/addons/studienplatzverwaltung/StudienplatzverwaltungAPITest.php
old mode 100755
new mode 100644
diff --git a/system/UnitTests/addons/studienplatzverwaltung/testfile.xml b/system/UnitTests/addons/studienplatzverwaltung/testfile.xml
old mode 100755
new mode 100644
diff --git a/system/UnitTests/ut_studienordnung.php b/system/UnitTests/ut_studienordnung.php
old mode 100755
new mode 100644
diff --git a/system/ampel_erinnerungsmail.php b/system/ampel_erinnerungsmail.php
old mode 100755
new mode 100644
diff --git a/system/checkStudenten.php b/system/checkStudenten.php
old mode 100755
new mode 100644
diff --git a/system/check_neue_lektoren.php b/system/check_neue_lektoren.php
old mode 100755
new mode 100644
diff --git a/system/check_studentlehrverband.php b/system/check_studentlehrverband.php
old mode 100755
new mode 100644
diff --git a/system/checkroles.php b/system/checkroles.php
old mode 100755
new mode 100644
diff --git a/system/checksystem.php b/system/checksystem.php
old mode 100755
new mode 100644
diff --git a/system/dbupdate_3.0.php b/system/dbupdate_3.0.php
old mode 100755
new mode 100644
diff --git a/system/dbupdate_3.1.php b/system/dbupdate_3.1.php
old mode 100755
new mode 100644
diff --git a/system/dbupdate_3.2.php b/system/dbupdate_3.2.php
old mode 100755
new mode 100644
diff --git a/system/dbupdate_3.2/migrate_reihungstest.php b/system/dbupdate_3.2/migrate_reihungstest.php
old mode 100755
new mode 100644
diff --git a/system/dbupdate_3.3.php b/system/dbupdate_3.3.php
old mode 100755
new mode 100644
diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
old mode 100755
new mode 100644
diff --git a/system/dbupdate_3.4/10001_tempus_mitarbeiter_kurzbz_bei_reservierungen_anzeigen.php b/system/dbupdate_3.4/10001_tempus_mitarbeiter_kurzbz_bei_reservierungen_anzeigen.php
old mode 100755
new mode 100644
diff --git a/system/dbupdate_3.4/17512_fehlercode_constraints.php b/system/dbupdate_3.4/17512_fehlercode_constraints.php
old mode 100755
new mode 100644
diff --git a/system/dbupdate_3.4/19154_beurteilungsformulare_pruefungssenat.php b/system/dbupdate_3.4/19154_beurteilungsformulare_pruefungssenat.php
old mode 100755
new mode 100644
diff --git a/system/dbupdate_3.4/24682_reihungstest_zugangscode_fuer_login.php b/system/dbupdate_3.4/24682_reihungstest_zugangscode_fuer_login.php
old mode 100755
new mode 100644
diff --git a/system/dbupdate_3.4/24913_tabelle_raumtyp_neues_attribut_aktiv.php b/system/dbupdate_3.4/24913_tabelle_raumtyp_neues_attribut_aktiv.php
old mode 100755
new mode 100644
diff --git a/system/dbupdate_3.4/25003_notenimport_nachpruefung.php b/system/dbupdate_3.4/25003_notenimport_nachpruefung.php
old mode 100755
new mode 100644
diff --git a/system/dbupdate_3.4/25999_C4_Menu.php b/system/dbupdate_3.4/25999_C4_Menu.php
old mode 100755
new mode 100644
diff --git a/system/dbupdate_3.4/25999_C4_ma0594.php b/system/dbupdate_3.4/25999_C4_ma0594.php
old mode 100755
new mode 100644
diff --git a/system/dbupdate_3.4/25999_cis4_cms.php b/system/dbupdate_3.4/25999_cis4_cms.php
old mode 100755
new mode 100644
diff --git a/system/dbupdate_3.4/26173_index_webservicelog.php b/system/dbupdate_3.4/26173_index_webservicelog.php
old mode 100755
new mode 100644
diff --git a/system/dbupdate_3.4/27107_vilesci_erfassung_abwesenheiten_reinigung.php b/system/dbupdate_3.4/27107_vilesci_erfassung_abwesenheiten_reinigung.php
old mode 100755
new mode 100644
diff --git a/system/dbupdate_3.4/27351_digitalisierung_formulare.php b/system/dbupdate_3.4/27351_digitalisierung_formulare.php
old mode 100755
new mode 100644
diff --git a/system/dbupdate_3.4/27388_anrechnungen_zeitfenster_pflegen.php b/system/dbupdate_3.4/27388_anrechnungen_zeitfenster_pflegen.php
old mode 100755
new mode 100644
diff --git a/system/dbupdate_3.4/27949_infocenter_zurueckstellen_mit_grund.php b/system/dbupdate_3.4/27949_infocenter_zurueckstellen_mit_grund.php
old mode 100755
new mode 100644
diff --git a/system/dbupdate_3.4/28089_plausichecks_in_extension_hinzufuegen.php b/system/dbupdate_3.4/28089_plausichecks_in_extension_hinzufuegen.php
old mode 100755
new mode 100644
diff --git a/system/dbupdate_3.4/29133_einzelne_studiengaenge_aus_issuechecks_ausnehmen.php b/system/dbupdate_3.4/29133_einzelne_studiengaenge_aus_issuechecks_ausnehmen.php
old mode 100755
new mode 100644
diff --git a/system/dbupdate_3.4/29529_infocenter_anpassungen.php b/system/dbupdate_3.4/29529_infocenter_anpassungen.php
old mode 100755
new mode 100644
diff --git a/system/dbupdate_3.4/29835_uhstat1_erfassung_der_uhstat1_daten_ueber_das_bewerbungstool.php b/system/dbupdate_3.4/29835_uhstat1_erfassung_der_uhstat1_daten_ueber_das_bewerbungstool.php
old mode 100755
new mode 100644
diff --git a/system/dbupdate_3.4/30181_tabelle_anrechnung_neue_attribute_fuer_begruendung.php b/system/dbupdate_3.4/30181_tabelle_anrechnung_neue_attribute_fuer_begruendung.php
old mode 100755
new mode 100644
diff --git a/system/dbupdate_3.4/30537_anmerkung_in_tbl_rolleberechtigung.php b/system/dbupdate_3.4/30537_anmerkung_in_tbl_rolleberechtigung.php
old mode 100755
new mode 100644
diff --git a/system/dbupdate_3.4/33714_erhoehter_studienbeitrag_fuer_drittsaatenangehoerig.php b/system/dbupdate_3.4/33714_erhoehter_studienbeitrag_fuer_drittsaatenangehoerig.php
old mode 100755
new mode 100644
diff --git a/system/dbupdate_3.4/dbupdate_dashboard.php b/system/dbupdate_3.4/dbupdate_dashboard.php
old mode 100755
new mode 100644
diff --git a/system/dbupdate_3.4/example.php b/system/dbupdate_3.4/example.php
old mode 100755
new mode 100644
diff --git a/system/environment.php b/system/environment.php
old mode 100755
new mode 100644
diff --git a/system/erinnerungsmail_coodle.php b/system/erinnerungsmail_coodle.php
old mode 100755
new mode 100644
diff --git a/system/erinnerungsmail_sek_lehrauftrag.php b/system/erinnerungsmail_sek_lehrauftrag.php
old mode 100755
new mode 100644
diff --git a/system/erinnerungsmail_sek_preinteressent.php b/system/erinnerungsmail_sek_preinteressent.php
old mode 100755
new mode 100644
diff --git a/system/fehlerupdate.php b/system/fehlerupdate.php
old mode 100755
new mode 100644
diff --git a/system/filtersupdate.php b/system/filtersupdate.php
old mode 100755
new mode 100644
diff --git a/system/generate_missing_sto.php b/system/generate_missing_sto.php
old mode 100755
new mode 100644
diff --git a/system/generatestudienordnung.php b/system/generatestudienordnung.php
old mode 100755
new mode 100644
diff --git a/system/konsistenzpruefung.php b/system/konsistenzpruefung.php
old mode 100755
new mode 100644
diff --git a/system/matrikelnummer_clearing_download.php b/system/matrikelnummer_clearing_download.php
old mode 100755
new mode 100644
diff --git a/system/matrikelnummer_clearing_import.php b/system/matrikelnummer_clearing_import.php
old mode 100755
new mode 100644
diff --git a/system/phpinfo.php b/system/phpinfo.php
old mode 100755
new mode 100644
diff --git a/system/prestudentstatus_studienplan_id.php b/system/prestudentstatus_studienplan_id.php
old mode 100755
new mode 100644
diff --git a/system/pruefung_bestaetigen.php b/system/pruefung_bestaetigen.php
old mode 100755
new mode 100644
diff --git a/system/services/systemd/phantomjs@.service b/system/services/systemd/phantomjs@.service
old mode 100755
new mode 100644
diff --git a/system/services/systemd/unoconv@.service b/system/services/systemd/unoconv@.service
old mode 100755
new mode 100644
diff --git a/system/services/upstart/unoconv.conf b/system/services/upstart/unoconv.conf
old mode 100755
new mode 100644
diff --git a/system/sync/sync_stpldev_stpl.php b/system/sync/sync_stpldev_stpl.php
old mode 100755
new mode 100644
diff --git a/system/system_check_sql.php b/system/system_check_sql.php
old mode 100755
new mode 100644
diff --git a/system/templates/contentmittitel.xsd b/system/templates/contentmittitel.xsd
old mode 100755
new mode 100644
diff --git a/system/templates/contentmittitel_filterwidget_xslt_xhtml.xslt b/system/templates/contentmittitel_filterwidget_xslt_xhtml.xslt
old mode 100755
new mode 100644
diff --git a/system/templates/contentmittitel_xslt_xhtml.xslt b/system/templates/contentmittitel_xslt_xhtml.xslt
old mode 100755
new mode 100644
diff --git a/system/templates/contentohnetitel.xsd b/system/templates/contentohnetitel.xsd
old mode 100755
new mode 100644
diff --git a/system/templates/contentohnetitel_xslt_xhtml.xslt b/system/templates/contentohnetitel_xslt_xhtml.xslt
old mode 100755
new mode 100644
diff --git a/system/templates/include.xsd b/system/templates/include.xsd
old mode 100755
new mode 100644
diff --git a/system/templates/include_xslt_xhtml.xslt b/system/templates/include_xslt_xhtml.xslt
old mode 100755
new mode 100644
diff --git a/system/templates/news.xsd b/system/templates/news.xsd
old mode 100755
new mode 100644
diff --git a/system/templates/news_infoscreen.xsd b/system/templates/news_infoscreen.xsd
old mode 100755
new mode 100644
diff --git a/system/templates/news_infoscreen_xslt_xhtml.xslt b/system/templates/news_infoscreen_xslt_xhtml.xslt
old mode 100755
new mode 100644
diff --git a/system/templates/news_xslt_xhtml.xslt b/system/templates/news_xslt_xhtml.xslt
old mode 100755
new mode 100644
diff --git a/system/templates/redirect.xsd b/system/templates/redirect.xsd
old mode 100755
new mode 100644
diff --git a/system/templates/redirect_xslt_xhtml.xslt b/system/templates/redirect_xslt_xhtml.xslt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/AccountInfo.odt b/system/vorlage_zip/AccountInfo.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/AntragAbmeldung.odt b/system/vorlage_zip/AntragAbmeldung.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/AntragAbmeldungStgl.odt b/system/vorlage_zip/AntragAbmeldungStgl.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/AntragUnterbrechung.odt b/system/vorlage_zip/AntragUnterbrechung.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/AnwListBarcode.odt b/system/vorlage_zip/AnwListBarcode.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/Anwesenheitslist.odt b/system/vorlage_zip/Anwesenheitslist.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/AusbVerEng.odt b/system/vorlage_zip/AusbVerEng.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/Ausbildungsver.odt b/system/vorlage_zip/Ausbildungsver.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/Bakkurkunde.odt b/system/vorlage_zip/Bakkurkunde.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/BakkurkundeEng.odt b/system/vorlage_zip/BakkurkundeEng.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/Bakkzeugnis.odt b/system/vorlage_zip/Bakkzeugnis.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/BakkzeugnisEng.odt b/system/vorlage_zip/BakkzeugnisEng.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/Bescheid.odt b/system/vorlage_zip/Bescheid.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/BescheidEng.odt b/system/vorlage_zip/BescheidEng.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/Bestellung.odt b/system/vorlage_zip/Bestellung.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/Bewerberakt.odt b/system/vorlage_zip/Bewerberakt.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/DiplSupplement.odt b/system/vorlage_zip/DiplSupplement.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/DiplSupplementDebug.odt b/system/vorlage_zip/DiplSupplementDebug.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/Diplomurkunde.odt b/system/vorlage_zip/Diplomurkunde.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/DiplomurkundeEng.odt b/system/vorlage_zip/DiplomurkundeEng.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/Diplomzeugnis.odt b/system/vorlage_zip/Diplomzeugnis.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/DiplomzeugnisEng.odt b/system/vorlage_zip/DiplomzeugnisEng.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/Erfolgsnachweis.odt b/system/vorlage_zip/Erfolgsnachweis.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/FHB_Ausbildungsver.odt b/system/vorlage_zip/FHB_Ausbildungsver.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/FHB_PrProtBA.odt b/system/vorlage_zip/FHB_PrProtBA.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/FHB_PrProtMA.odt b/system/vorlage_zip/FHB_PrProtMA.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/Inskription.odt b/system/vorlage_zip/Inskription.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/InskriptionEng.odt b/system/vorlage_zip/InskriptionEng.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/KTU_Studienblatt.odt b/system/vorlage_zip/KTU_Studienblatt.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/LVZeugnis.odt b/system/vorlage_zip/LVZeugnis.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/LVZeugnisEng.odt b/system/vorlage_zip/LVZeugnisEng.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/Lehrauftrag.odt b/system/vorlage_zip/Lehrauftrag.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/Lehrtaetigkeit.odt b/system/vorlage_zip/Lehrtaetigkeit.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/PrProtBA.odt b/system/vorlage_zip/PrProtBA.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/PrProtBAEng.odt b/system/vorlage_zip/PrProtBAEng.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/PrProtMA.odt b/system/vorlage_zip/PrProtMA.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/PrProtMAEng.odt b/system/vorlage_zip/PrProtMAEng.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/PrProtMAEng_alt.odt b/system/vorlage_zip/PrProtMAEng_alt.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/PrProtMA_alt.odt b/system/vorlage_zip/PrProtMA_alt.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/Projektbeschr.odt b/system/vorlage_zip/Projektbeschr.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/Studienblatt.odt b/system/vorlage_zip/Studienblatt.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/StudienblattEng.odt b/system/vorlage_zip/StudienblattEng.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/Studienerfolg.odt b/system/vorlage_zip/Studienerfolg.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/StudienerfolgEng.odt b/system/vorlage_zip/StudienerfolgEng.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/Studienordnung.odt b/system/vorlage_zip/Studienordnung.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/Uebernahme.odt b/system/vorlage_zip/Uebernahme.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/Zahlung.odt b/system/vorlage_zip/Zahlung.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/Zertifikat.odt b/system/vorlage_zip/Zertifikat.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/Zertifikat_ktu.odt b/system/vorlage_zip/Zertifikat_ktu.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/Zeugnis.odt b/system/vorlage_zip/Zeugnis.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/ZeugnisEng.odt b/system/vorlage_zip/ZeugnisEng.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/ZeugnisEngNeu.odt b/system/vorlage_zip/ZeugnisEngNeu.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/ZeugnisNeu.odt b/system/vorlage_zip/ZeugnisNeu.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/Zutrittskarte.odt b/system/vorlage_zip/Zutrittskarte.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/fotoliste.odt b/system/vorlage_zip/fotoliste.odt
old mode 100755
new mode 100644
diff --git a/system/vorlage_zip/statusbericht.ods b/system/vorlage_zip/statusbericht.ods
old mode 100755
new mode 100644
diff --git a/system/xsl/AntragAbmeldung.xsl b/system/xsl/AntragAbmeldung.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/AntragAbmeldungStgl.xsl b/system/xsl/AntragAbmeldungStgl.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/AntragUnterbrechung.xsl b/system/xsl/AntragUnterbrechung.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/AnwListBarcode.xsl b/system/xsl/AnwListBarcode.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/Anwesenheitsliste.xsl b/system/xsl/Anwesenheitsliste.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/AusbVerEngHead_0.xsl b/system/xsl/AusbVerEngHead_0.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/AusbVerEng_0.xsl b/system/xsl/AusbVerEng_0.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/AusbildStatus_0.xsl b/system/xsl/AusbildStatus_0.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/Ausbildungsver_0.xsl b/system/xsl/Ausbildungsver_0.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/Bewerberakt.xsl b/system/xsl/Bewerberakt.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/LehrveranstaltungszeugnisEng_0.xsl b/system/xsl/LehrveranstaltungszeugnisEng_0.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/Lehrveranstaltungszeugnis_0.xsl b/system/xsl/Lehrveranstaltungszeugnis_0.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/Lehrveranstaltungszeugnis_Eng_9005.xsl b/system/xsl/Lehrveranstaltungszeugnis_Eng_9005.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/PrProtBAEng_0.xsl b/system/xsl/PrProtBAEng_0.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/PrProtBA_0.xsl b/system/xsl/PrProtBA_0.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/PrProtMAEng_0.xsl b/system/xsl/PrProtMAEng_0.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/PrProtMA_0.xsl b/system/xsl/PrProtMA_0.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/Projektbeschr_0.xsl b/system/xsl/Projektbeschr_0.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/StudienblattEng_0.xsl b/system/xsl/StudienblattEng_0.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/Studienblatt_0.xsl b/system/xsl/Studienblatt_0.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/Studienordnung_0.xsl b/system/xsl/Studienordnung_0.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/Studienordnung_style_0.xml b/system/xsl/Studienordnung_style_0.xml
old mode 100755
new mode 100644
diff --git a/system/xsl/ZertifikatFreifaecher_0.xsl b/system/xsl/ZertifikatFreifaecher_0.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/ZeugnisEng_0.xsl b/system/xsl/ZeugnisEng_0.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/ZeugnisEng_Lehrgaenge.xsl b/system/xsl/ZeugnisEng_Lehrgaenge.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/Zeugnis_0.xsl b/system/xsl/Zeugnis_0.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/Zeugnis_Lehrgaenge.xsl b/system/xsl/Zeugnis_Lehrgaenge.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/Zeugnis_style_0.xsl b/system/xsl/Zeugnis_style_0.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/Zutrittskarte.xsl b/system/xsl/Zutrittskarte.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/accountinfoblatt_0.xsl b/system/xsl/accountinfoblatt_0.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/bachelorurkundeEng_0.xsl b/system/xsl/bachelorurkundeEng_0.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/bachelorurkunde_0.xsl b/system/xsl/bachelorurkunde_0.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/bakkzeugnisEng_0.xsl b/system/xsl/bakkzeugnisEng_0.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/bakkzeugnis_0.xsl b/system/xsl/bakkzeugnis_0.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/bescheid_0.xsl b/system/xsl/bescheid_0.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/bescheid_style_0.xsl b/system/xsl/bescheid_style_0.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/diplomaSuppDebug.xsl b/system/xsl/diplomaSuppDebug.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/diplomaSupp_0.xsl b/system/xsl/diplomaSupp_0.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/diplomaSupp_style_0.xsl b/system/xsl/diplomaSupp_style_0.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/diplomurkundeEng_0.xsl b/system/xsl/diplomurkundeEng_0.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/diplomurkunde_0.xsl b/system/xsl/diplomurkunde_0.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/diplomzeugnisEng_0.xsl b/system/xsl/diplomzeugnisEng_0.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/diplomzeugnis_0.xsl b/system/xsl/diplomzeugnis_0.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/fotoliste_0.xsl b/system/xsl/fotoliste_0.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/inskription_0.xsl b/system/xsl/inskription_0.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/inskription_eng_0.xsl b/system/xsl/inskription_eng_0.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/lehrauftrag_0.xsl b/system/xsl/lehrauftrag_0.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/lehrauftrag_style_0.xsl b/system/xsl/lehrauftrag_style_0.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/lehrtaetigkeit_0.xsl b/system/xsl/lehrtaetigkeit_0.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/prprotokollbakk_0.xsl b/system/xsl/prprotokollbakk_0.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/statusbericht.xsl b/system/xsl/statusbericht.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/studienerfolgEng_0.xsl b/system/xsl/studienerfolgEng_0.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/studienerfolgEng_Lehrgaenge.xsl b/system/xsl/studienerfolgEng_Lehrgaenge.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/studienerfolg_0.xsl b/system/xsl/studienerfolg_0.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/studienerfolg_Lehrgaenge.xsl b/system/xsl/studienerfolg_Lehrgaenge.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/uebernahmebestaetigung_0.xsl b/system/xsl/uebernahmebestaetigung_0.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/zahlung_0.xsl b/system/xsl/zahlung_0.xsl
old mode 100755
new mode 100644
diff --git a/system/xsl/zahlung_style_0.xsl b/system/xsl/zahlung_style_0.xsl
old mode 100755
new mode 100644
diff --git a/tests/codesniffer/FHComplete/Sniffs/Classes/FHCPropertyDeclarationSniff.php b/tests/codesniffer/FHComplete/Sniffs/Classes/FHCPropertyDeclarationSniff.php
old mode 100755
new mode 100644
diff --git a/tests/codesniffer/FHComplete/Sniffs/Classes/FHCValidClassNameSniff.php b/tests/codesniffer/FHComplete/Sniffs/Classes/FHCValidClassNameSniff.php
old mode 100755
new mode 100644
diff --git a/tests/codesniffer/FHComplete/Sniffs/ControlStructures/FHCControlSignatureSniff.php b/tests/codesniffer/FHComplete/Sniffs/ControlStructures/FHCControlSignatureSniff.php
old mode 100755
new mode 100644
diff --git a/tests/codesniffer/FHComplete/Sniffs/Methods/FHCMethodDeclarationSniff.php b/tests/codesniffer/FHComplete/Sniffs/Methods/FHCMethodDeclarationSniff.php
old mode 100755
new mode 100644
diff --git a/tests/codesniffer/FHComplete/ruleset.xml b/tests/codesniffer/FHComplete/ruleset.xml
old mode 100755
new mode 100644
diff --git a/tests/phpmd/rulesets-dev-only.xml b/tests/phpmd/rulesets-dev-only.xml
old mode 100755
new mode 100644
diff --git a/tests/phpmd/rulesets.xml b/tests/phpmd/rulesets.xml
old mode 100755
new mode 100644
diff --git a/version.php b/version.php
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/FASoProduktiv/FASonline.xpi b/vilesci/admin/XPI/FASoProduktiv/FASonline.xpi
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/FASoProduktiv/chrome/content/contents.rdf b/vilesci/admin/XPI/FASoProduktiv/chrome/content/contents.rdf
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/FASoProduktiv/chrome/content/fasonline.xul b/vilesci/admin/XPI/FASoProduktiv/chrome/content/fasonline.xul
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/FASoProduktiv/chrome/fasonline.jar b/vilesci/admin/XPI/FASoProduktiv/chrome/fasonline.jar
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/FASoProduktiv/install.js b/vilesci/admin/XPI/FASoProduktiv/install.js
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/FASoProduktiv/install.rdf b/vilesci/admin/XPI/FASoProduktiv/install.rdf
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/FASoProduktivSeamonkey2.0/FASonline.xpi b/vilesci/admin/XPI/FASoProduktivSeamonkey2.0/FASonline.xpi
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/FASoProduktivSeamonkey2.0/chrome.manifest b/vilesci/admin/XPI/FASoProduktivSeamonkey2.0/chrome.manifest
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/FASoProduktivSeamonkey2.0/chrome/content/contents.rdf b/vilesci/admin/XPI/FASoProduktivSeamonkey2.0/chrome/content/contents.rdf
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/FASoProduktivSeamonkey2.0/chrome/content/fasonline.xul b/vilesci/admin/XPI/FASoProduktivSeamonkey2.0/chrome/content/fasonline.xul
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/FASoProduktivSeamonkey2.0/chrome/fasonline.jar b/vilesci/admin/XPI/FASoProduktivSeamonkey2.0/chrome/fasonline.jar
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/FASoProduktivSeamonkey2.0/chrome/skin/fasonline.png b/vilesci/admin/XPI/FASoProduktivSeamonkey2.0/chrome/skin/fasonline.png
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/FASoProduktivSeamonkey2.0/install.rdf b/vilesci/admin/XPI/FASoProduktivSeamonkey2.0/install.rdf
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/FASoStPoelten/FASonline.xpi b/vilesci/admin/XPI/FASoStPoelten/FASonline.xpi
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/FASoStPoelten/chrome/content/contents.rdf b/vilesci/admin/XPI/FASoStPoelten/chrome/content/contents.rdf
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/FASoStPoelten/chrome/content/fasonline.xul b/vilesci/admin/XPI/FASoStPoelten/chrome/content/fasonline.xul
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/FASoStPoelten/chrome/fasonline.jar b/vilesci/admin/XPI/FASoStPoelten/chrome/fasonline.jar
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/FASoStPoelten/install.js b/vilesci/admin/XPI/FASoStPoelten/install.js
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/FASoStPoelten/install.rdf b/vilesci/admin/XPI/FASoStPoelten/install.rdf
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/FASoStPoeltenDEV/FASoStPoelten2.xpi b/vilesci/admin/XPI/FASoStPoeltenDEV/FASoStPoelten2.xpi
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/FASoStPoeltenDEV/chrome/content/contents.rdf b/vilesci/admin/XPI/FASoStPoeltenDEV/chrome/content/contents.rdf
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/FASoStPoeltenDEV/chrome/content/fasonline2.xul b/vilesci/admin/XPI/FASoStPoeltenDEV/chrome/content/fasonline2.xul
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/FASoStPoeltenDEV/chrome/fasonline2.jar b/vilesci/admin/XPI/FASoStPoeltenDEV/chrome/fasonline2.jar
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/FASoStPoeltenDEV/install.js b/vilesci/admin/XPI/FASoStPoeltenDEV/install.js
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/FASoStPoeltenDEV/install.rdf b/vilesci/admin/XPI/FASoStPoeltenDEV/install.rdf
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/FHCFas/FHCFas.xpi b/vilesci/admin/XPI/FHCFas/FHCFas.xpi
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/FHCFas/chrome/content/contents.rdf b/vilesci/admin/XPI/FHCFas/chrome/content/contents.rdf
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/FHCFas/chrome/content/fhcfas.xul b/vilesci/admin/XPI/FHCFas/chrome/content/fhcfas.xul
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/FHCFas/chrome/fhcfas.jar b/vilesci/admin/XPI/FHCFas/chrome/fhcfas.jar
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/FHCFas/install.js b/vilesci/admin/XPI/FHCFas/install.js
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/FHCFas/install.rdf b/vilesci/admin/XPI/FHCFas/install.rdf
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/FHCTempus/FHCTempus.xpi b/vilesci/admin/XPI/FHCTempus/FHCTempus.xpi
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/FHCTempus/chrome/content/contents.rdf b/vilesci/admin/XPI/FHCTempus/chrome/content/contents.rdf
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/FHCTempus/chrome/content/fhctempus.xul b/vilesci/admin/XPI/FHCTempus/chrome/content/fhctempus.xul
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/FHCTempus/chrome/fhctempus.jar b/vilesci/admin/XPI/FHCTempus/chrome/fhctempus.jar
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/FHCTempus/install.js b/vilesci/admin/XPI/FHCTempus/install.js
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/FHCTempus/install.rdf b/vilesci/admin/XPI/FHCTempus/install.rdf
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/PlannerProduktiv/Planner.xpi b/vilesci/admin/XPI/PlannerProduktiv/Planner.xpi
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/PlannerProduktiv/chrome/content/contents.rdf b/vilesci/admin/XPI/PlannerProduktiv/chrome/content/contents.rdf
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/PlannerProduktiv/chrome/content/planner.xul b/vilesci/admin/XPI/PlannerProduktiv/chrome/content/planner.xul
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/PlannerProduktiv/chrome/planner.jar b/vilesci/admin/XPI/PlannerProduktiv/chrome/planner.jar
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/PlannerProduktiv/install.js b/vilesci/admin/XPI/PlannerProduktiv/install.js
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/PlannerProduktiv/install.rdf b/vilesci/admin/XPI/PlannerProduktiv/install.rdf
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome.manifest b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome.manifest
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/appchoose.xul b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/appchoose.xul
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/contents.rdf b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/contents.rdf
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/fas.xul b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/fas.xul
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/fhcomplete.js b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/fhcomplete.js
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/fhcomplete.xul b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/fhcomplete.xul
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/options.xul b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/options.xul
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/planner.xul b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/planner.xul
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/statusbaroverlay.xul b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/statusbaroverlay.xul
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/tempus.xul b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/content/tempus.xul
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/fhcomplete.jar b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/fhcomplete.jar
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/fasonline.png b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/fasonline.png
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/fasonline15.png b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/fasonline15.png
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/fasonline32.png b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/fasonline32.png
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/fhcomplete.ico b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/fhcomplete.ico
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/fhcomplete.png b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/fhcomplete.png
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/planner.png b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/planner.png
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/planner15.png b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/planner15.png
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/planner32.png b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/planner32.png
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/settings.png b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/settings.png
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/tempus.png b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/tempus.png
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/tempus15.png b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/tempus15.png
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/tempus32.png b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/chrome/skin/tempus32.png
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/defaults/preferences/defaults.js b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/defaults/preferences/defaults.js
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/fhcomplete.xpi b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/fhcomplete.xpi
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/install.rdf b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/install.rdf
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/make.sh b/vilesci/admin/XPI/Seamonkey2.11/fhcomplete/make.sh
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/TempusStPoelten/Tempus.xpi b/vilesci/admin/XPI/TempusStPoelten/Tempus.xpi
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/TempusStPoelten/chrome/content/contents.rdf b/vilesci/admin/XPI/TempusStPoelten/chrome/content/contents.rdf
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/TempusStPoelten/chrome/content/tempus.xul b/vilesci/admin/XPI/TempusStPoelten/chrome/content/tempus.xul
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/TempusStPoelten/chrome/tempus.jar b/vilesci/admin/XPI/TempusStPoelten/chrome/tempus.jar
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/TempusStPoelten/install.js b/vilesci/admin/XPI/TempusStPoelten/install.js
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/TempusStPoelten/install.rdf b/vilesci/admin/XPI/TempusStPoelten/install.rdf
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/TempusStPoeltenDEV/TempusStPoelten2.xpi b/vilesci/admin/XPI/TempusStPoeltenDEV/TempusStPoelten2.xpi
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/TempusStPoeltenDEV/chrome/content/contents.rdf b/vilesci/admin/XPI/TempusStPoeltenDEV/chrome/content/contents.rdf
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/TempusStPoeltenDEV/chrome/content/tempus2.xul b/vilesci/admin/XPI/TempusStPoeltenDEV/chrome/content/tempus2.xul
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/TempusStPoeltenDEV/chrome/tempus2.jar b/vilesci/admin/XPI/TempusStPoeltenDEV/chrome/tempus2.jar
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/TempusStPoeltenDEV/install.js b/vilesci/admin/XPI/TempusStPoeltenDEV/install.js
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/TempusStPoeltenDEV/install.rdf b/vilesci/admin/XPI/TempusStPoeltenDEV/install.rdf
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/TempusStPoeltenExtern/TempusStPoeltenExtern.xpi b/vilesci/admin/XPI/TempusStPoeltenExtern/TempusStPoeltenExtern.xpi
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/TempusStPoeltenExtern/TempusStPoeltenExtern81.xpi b/vilesci/admin/XPI/TempusStPoeltenExtern/TempusStPoeltenExtern81.xpi
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/TempusStPoeltenExtern/chrome/content/contents.rdf b/vilesci/admin/XPI/TempusStPoeltenExtern/chrome/content/contents.rdf
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/TempusStPoeltenExtern/chrome/content/tempusextern81.xul b/vilesci/admin/XPI/TempusStPoeltenExtern/chrome/content/tempusextern81.xul
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/TempusStPoeltenExtern/chrome/tempusextern.jar b/vilesci/admin/XPI/TempusStPoeltenExtern/chrome/tempusextern.jar
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/TempusStPoeltenExtern/chrome/tempusextern81.jar b/vilesci/admin/XPI/TempusStPoeltenExtern/chrome/tempusextern81.jar
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/TempusStPoeltenExtern/install.js b/vilesci/admin/XPI/TempusStPoeltenExtern/install.js
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/TempusStPoeltenExtern/install.rdf b/vilesci/admin/XPI/TempusStPoeltenExtern/install.rdf
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/TempusTWProduktiv/Tempusdev.xpi b/vilesci/admin/XPI/TempusTWProduktiv/Tempusdev.xpi
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/TempusTWProduktiv/chrome/content/contents.rdf b/vilesci/admin/XPI/TempusTWProduktiv/chrome/content/contents.rdf
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/TempusTWProduktiv/chrome/content/tempusdev.xul b/vilesci/admin/XPI/TempusTWProduktiv/chrome/content/tempusdev.xul
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/TempusTWProduktiv/chrome/tempusdev.jar b/vilesci/admin/XPI/TempusTWProduktiv/chrome/tempusdev.jar
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/TempusTWProduktiv/install.js b/vilesci/admin/XPI/TempusTWProduktiv/install.js
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/TempusTWProduktiv/install.rdf b/vilesci/admin/XPI/TempusTWProduktiv/install.rdf
old mode 100755
new mode 100644
diff --git a/vilesci/admin/XPI/orbit-1.8f5-MiK.xpi b/vilesci/admin/XPI/orbit-1.8f5-MiK.xpi
old mode 100755
new mode 100644
diff --git a/vilesci/bis/archiv.php b/vilesci/bis/archiv.php
old mode 100755
new mode 100644
diff --git a/vilesci/bis/bisdaten/.gitignore b/vilesci/bis/bisdaten/.gitignore
old mode 100755
new mode 100644
diff --git a/vilesci/bis/checkfunktion.php b/vilesci/bis/checkfunktion.php
old mode 100755
new mode 100644
diff --git a/vilesci/bis/checkverwendung.php b/vilesci/bis/checkverwendung.php
old mode 100755
new mode 100644
diff --git a/vilesci/bis/lehrgangsmeldung.php b/vilesci/bis/lehrgangsmeldung.php
old mode 100755
new mode 100644
diff --git a/vilesci/bis/personal_generateverwendung.php b/vilesci/bis/personal_generateverwendung.php
old mode 100755
new mode 100644
diff --git a/vilesci/bis/personal_lektorenohnelehrauftrag.php b/vilesci/bis/personal_lektorenohnelehrauftrag.php
old mode 100755
new mode 100644
diff --git a/vilesci/bis/personalimport.php b/vilesci/bis/personalimport.php
old mode 100755
new mode 100644
diff --git a/vilesci/bis/personalmeldung.php b/vilesci/bis/personalmeldung.php
old mode 100755
new mode 100644
diff --git a/vilesci/bis/personalmeldung_uebersicht.php b/vilesci/bis/personalmeldung_uebersicht.php
old mode 100755
new mode 100644
diff --git a/vilesci/bis/studentenmeldung.php b/vilesci/bis/studentenmeldung.php
old mode 100755
new mode 100644
diff --git a/vilesci/cronjobs/bpk.php b/vilesci/cronjobs/bpk.php
old mode 100755
new mode 100644
diff --git a/vilesci/cronjobs/cronjob.php b/vilesci/cronjobs/cronjob.php
old mode 100755
new mode 100644
diff --git a/vilesci/cronjobs/jobwatcher.php b/vilesci/cronjobs/jobwatcher.php
old mode 100755
new mode 100644
diff --git a/vilesci/cronjobs/lvplanwartung.php b/vilesci/cronjobs/lvplanwartung.php
old mode 100755
new mode 100644
diff --git a/vilesci/cronjobs/matrikelnummern.php b/vilesci/cronjobs/matrikelnummern.php
old mode 100755
new mode 100644
diff --git a/vilesci/cronjobs/testjob.php b/vilesci/cronjobs/testjob.php
old mode 100755
new mode 100644
diff --git a/vilesci/fhausweis/bildpruefung.php b/vilesci/fhausweis/bildpruefung.php
old mode 100755
new mode 100644
diff --git a/vilesci/fhausweis/bildzuschnitt.php b/vilesci/fhausweis/bildzuschnitt.php
old mode 100755
new mode 100644
diff --git a/vilesci/fhausweis/imageupload.php b/vilesci/fhausweis/imageupload.php
old mode 100755
new mode 100644
diff --git a/vilesci/fhausweis/kartenausgabe.php b/vilesci/fhausweis/kartenausgabe.php
old mode 100755
new mode 100644
diff --git a/vilesci/fhausweis/kartenkorrektur.php b/vilesci/fhausweis/kartenkorrektur.php
old mode 100755
new mode 100644
diff --git a/vilesci/fhausweis/kartenruecknahme.php b/vilesci/fhausweis/kartenruecknahme.php
old mode 100755
new mode 100644
diff --git a/vilesci/fhausweis/kartentausch.php b/vilesci/fhausweis/kartentausch.php
old mode 100755
new mode 100644
diff --git a/vilesci/fhausweis/kartenverwaltung.php b/vilesci/fhausweis/kartenverwaltung.php
old mode 100755
new mode 100644
diff --git a/vilesci/fhausweis/kartezuweisen.php b/vilesci/fhausweis/kartezuweisen.php
old mode 100755
new mode 100644
diff --git a/vilesci/fhausweis/search.php b/vilesci/fhausweis/search.php
old mode 100755
new mode 100644
diff --git a/vilesci/fhausweis/verlaengerung.php b/vilesci/fhausweis/verlaengerung.php
old mode 100755
new mode 100644
diff --git a/vilesci/index.php b/vilesci/index.php
old mode 100755
new mode 100644
diff --git a/vilesci/inventar/etiketten.php b/vilesci/inventar/etiketten.php
old mode 100755
new mode 100644
diff --git a/vilesci/inventar/inventar.php b/vilesci/inventar/inventar.php
old mode 100755
new mode 100644
diff --git a/vilesci/inventar/inventar_afa.php b/vilesci/inventar/inventar_afa.php
old mode 100755
new mode 100644
diff --git a/vilesci/inventar/inventar_autocomplete.php b/vilesci/inventar/inventar_autocomplete.php
old mode 100755
new mode 100644
diff --git a/vilesci/inventar/inventar_inventur.php b/vilesci/inventar/inventar_inventur.php
old mode 100755
new mode 100644
diff --git a/vilesci/inventar/inventar_pflege.php b/vilesci/inventar/inventar_pflege.php
old mode 100755
new mode 100644
diff --git a/vilesci/inventar/inventarliste.php b/vilesci/inventar/inventarliste.php
old mode 100755
new mode 100644
diff --git a/vilesci/inventar/konto_detail.php b/vilesci/inventar/konto_detail.php
old mode 100755
new mode 100644
diff --git a/vilesci/inventar/kostenstelle_detail.php b/vilesci/inventar/kostenstelle_detail.php
old mode 100755
new mode 100644
diff --git a/vilesci/inventar/studiengang_detail.php b/vilesci/inventar/studiengang_detail.php
old mode 100755
new mode 100644
diff --git a/vilesci/left.php b/vilesci/left.php
old mode 100755
new mode 100644
diff --git a/vilesci/lehre/abgabe_assistenz.php b/vilesci/lehre/abgabe_assistenz.php
old mode 100755
new mode 100644
diff --git a/vilesci/lehre/abgabe_assistenz_details.php b/vilesci/lehre/abgabe_assistenz_details.php
old mode 100755
new mode 100644
diff --git a/vilesci/lehre/abgabe_assistenz_frameset.php b/vilesci/lehre/abgabe_assistenz_frameset.php
old mode 100755
new mode 100644
diff --git a/vilesci/lehre/abgabe_assistenz_multitermin.php b/vilesci/lehre/abgabe_assistenz_multitermin.php
old mode 100755
new mode 100644
diff --git a/vilesci/lehre/abgabe_assistenz_zusatz.php b/vilesci/lehre/abgabe_assistenz_zusatz.php
old mode 100755
new mode 100644
diff --git a/vilesci/lehre/check/index.html b/vilesci/lehre/check/index.html
old mode 100755
new mode 100644
diff --git a/vilesci/lehre/check/res_check.php b/vilesci/lehre/check/res_check.php
old mode 100755
new mode 100644
diff --git a/vilesci/lehre/check/stdplan_check.php b/vilesci/lehre/check/stdplan_check.php
old mode 100755
new mode 100644
diff --git a/vilesci/lehre/check/ueberbuchung.php b/vilesci/lehre/check/ueberbuchung.php
old mode 100755
new mode 100644
diff --git a/vilesci/lehre/check/verplanungsuebersicht.php b/vilesci/lehre/check/verplanungsuebersicht.php
old mode 100755
new mode 100644
diff --git a/vilesci/lehre/einheit_autocomplete.php b/vilesci/lehre/einheit_autocomplete.php
old mode 100755
new mode 100644
diff --git a/vilesci/lehre/einheit_det.php b/vilesci/lehre/einheit_det.php
old mode 100755
new mode 100644
diff --git a/vilesci/lehre/einheit_menu.php b/vilesci/lehre/einheit_menu.php
old mode 100755
new mode 100644
diff --git a/vilesci/lehre/ferienverwaltung.php b/vilesci/lehre/ferienverwaltung.php
old mode 100755
new mode 100644
diff --git a/vilesci/lehre/freifach.php b/vilesci/lehre/freifach.php
old mode 100755
new mode 100644
diff --git a/vilesci/lehre/freifach_lektoren.php b/vilesci/lehre/freifach_lektoren.php
old mode 100755
new mode 100644
diff --git a/vilesci/lehre/freifach_studentenvorrueckung.php b/vilesci/lehre/freifach_studentenvorrueckung.php
old mode 100755
new mode 100644
diff --git a/vilesci/lehre/incoming_delete.php b/vilesci/lehre/incoming_delete.php
old mode 100755
new mode 100644
diff --git a/vilesci/lehre/index.html b/vilesci/lehre/index.html
old mode 100755
new mode 100644
diff --git a/vilesci/lehre/lehreinheiten_vorrueckung.php b/vilesci/lehre/lehreinheiten_vorrueckung.php
old mode 100755
new mode 100644
diff --git a/vilesci/lehre/lehrveranstaltung.php b/vilesci/lehre/lehrveranstaltung.php
old mode 100755
new mode 100644
diff --git a/vilesci/lehre/lehrveranstaltung_details.php b/vilesci/lehre/lehrveranstaltung_details.php
old mode 100755
new mode 100644
diff --git a/vilesci/lehre/lehrveranstaltung_frameset.html b/vilesci/lehre/lehrveranstaltung_frameset.html
old mode 100755
new mode 100644
diff --git a/vilesci/lehre/lehrveranstaltung_kompatibel.php b/vilesci/lehre/lehrveranstaltung_kompatibel.php
old mode 100755
new mode 100644
diff --git a/vilesci/lehre/lehrveranstaltung_lvangebot.php b/vilesci/lehre/lehrveranstaltung_lvangebot.php
old mode 100755
new mode 100644
diff --git a/vilesci/lehre/lv_merge.php b/vilesci/lehre/lv_merge.php
old mode 100755
new mode 100644
diff --git a/vilesci/lehre/lvangebot_autocomplete.php b/vilesci/lehre/lvangebot_autocomplete.php
old mode 100755
new mode 100644
diff --git a/vilesci/lehre/lvplan_custom_sync.php b/vilesci/lehre/lvplan_custom_sync.php
old mode 100755
new mode 100644
diff --git a/vilesci/lehre/lvplanwartung.php b/vilesci/lehre/lvplanwartung.php
old mode 100755
new mode 100644
diff --git a/vilesci/lehre/projektarbeitsbenotung.php b/vilesci/lehre/projektarbeitsbenotung.php
old mode 100755
new mode 100644
diff --git a/vilesci/lehre/raumauslastung.php b/vilesci/lehre/raumauslastung.php
old mode 100755
new mode 100644
diff --git a/vilesci/lehre/raummitteilung.php b/vilesci/lehre/raummitteilung.php
old mode 100755
new mode 100644
diff --git a/vilesci/lehre/reservierung_autocomplete.php b/vilesci/lehre/reservierung_autocomplete.php
old mode 100755
new mode 100644
diff --git a/vilesci/lehre/reservierung_insert.php b/vilesci/lehre/reservierung_insert.php
old mode 100755
new mode 100644
diff --git a/vilesci/lehre/saveStudienordnung.php b/vilesci/lehre/saveStudienordnung.php
old mode 100755
new mode 100644
diff --git a/vilesci/lehre/stpl_benutzer_kollision.php b/vilesci/lehre/stpl_benutzer_kollision.php
old mode 100755
new mode 100644
diff --git a/vilesci/lehre/stpl_benutzer_kollision_details.php b/vilesci/lehre/stpl_benutzer_kollision_details.php
old mode 100755
new mode 100644
diff --git a/vilesci/lehre/stpl_benutzer_kollision_frameset.html b/vilesci/lehre/stpl_benutzer_kollision_frameset.html
old mode 100755
new mode 100644
diff --git a/vilesci/lehre/studienordnung.inc.php b/vilesci/lehre/studienordnung.inc.php
old mode 100755
new mode 100644
diff --git a/vilesci/lehre/studienordnung.js b/vilesci/lehre/studienordnung.js
old mode 100755
new mode 100644
diff --git a/vilesci/lehre/studienordnung.php b/vilesci/lehre/studienordnung.php
old mode 100755
new mode 100644
diff --git a/vilesci/lehre/studienordnung_autocomplete.php b/vilesci/lehre/studienordnung_autocomplete.php
old mode 100755
new mode 100644
diff --git a/vilesci/lehre/studienordnung_lvregel.js b/vilesci/lehre/studienordnung_lvregel.js
old mode 100755
new mode 100644
diff --git a/vilesci/lehre/studienplan_gueltigkeit.php b/vilesci/lehre/studienplan_gueltigkeit.php
old mode 100755
new mode 100644
diff --git a/vilesci/lehre/studienplan_vorrueckung.php b/vilesci/lehre/studienplan_vorrueckung.php
old mode 100755
new mode 100644
diff --git a/vilesci/lehre/studienplan_zuteilung.php b/vilesci/lehre/studienplan_zuteilung.php
old mode 100755
new mode 100644
diff --git a/vilesci/lehre/zeitwuensche.php b/vilesci/lehre/zeitwuensche.php
old mode 100755
new mode 100644
diff --git a/vilesci/main.php b/vilesci/main.php
old mode 100755
new mode 100644
diff --git a/vilesci/personen/akteupdate.php b/vilesci/personen/akteupdate.php
old mode 100755
new mode 100644
diff --git a/vilesci/personen/aliquote_reduktion.json.php b/vilesci/personen/aliquote_reduktion.json.php
old mode 100755
new mode 100644
diff --git a/vilesci/personen/aliquote_reduktion.php b/vilesci/personen/aliquote_reduktion.php
old mode 100755
new mode 100644
diff --git a/vilesci/personen/anwesenheit.php b/vilesci/personen/anwesenheit.php
old mode 100755
new mode 100644
diff --git a/vilesci/personen/anwesenheitslisten_barcode.php b/vilesci/personen/anwesenheitslisten_barcode.php
old mode 100755
new mode 100644
diff --git a/vilesci/personen/aufbaukurscheckliste.php b/vilesci/personen/aufbaukurscheckliste.php
old mode 100755
new mode 100644
diff --git a/vilesci/personen/funktion.php b/vilesci/personen/funktion.php
old mode 100755
new mode 100644
diff --git a/vilesci/personen/funktion_det.php b/vilesci/personen/funktion_det.php
old mode 100755
new mode 100644
diff --git a/vilesci/personen/import/interessentenimport.php b/vilesci/personen/import/interessentenimport.php
old mode 100755
new mode 100644
diff --git a/vilesci/personen/import/mitarbeiterimport.php b/vilesci/personen/import/mitarbeiterimport.php
old mode 100755
new mode 100644
diff --git a/vilesci/personen/incoming_detail.php b/vilesci/personen/incoming_detail.php
old mode 100755
new mode 100644
diff --git a/vilesci/personen/incoming_frameset.php b/vilesci/personen/incoming_frameset.php
old mode 100755
new mode 100644
diff --git a/vilesci/personen/incoming_lehrveranstaltungen.php b/vilesci/personen/incoming_lehrveranstaltungen.php
old mode 100755
new mode 100644
diff --git a/vilesci/personen/incoming_uebersicht.php b/vilesci/personen/incoming_uebersicht.php
old mode 100755
new mode 100644
diff --git a/vilesci/personen/index.html b/vilesci/personen/index.html
old mode 100755
new mode 100644
diff --git a/vilesci/personen/institutsliste.php b/vilesci/personen/institutsliste.php
old mode 100755
new mode 100644
diff --git a/vilesci/personen/kontaktdaten_edit.php b/vilesci/personen/kontaktdaten_edit.php
old mode 100755
new mode 100644
diff --git a/vilesci/personen/lehrveranstaltungen_json.php b/vilesci/personen/lehrveranstaltungen_json.php
old mode 100755
new mode 100644
diff --git a/vilesci/personen/leistungsstipendium.php b/vilesci/personen/leistungsstipendium.php
old mode 100755
new mode 100644
diff --git a/vilesci/personen/lektor_uebersicht.php b/vilesci/personen/lektor_uebersicht.php
old mode 100755
new mode 100644
diff --git a/vilesci/personen/outgoing_detail.php b/vilesci/personen/outgoing_detail.php
old mode 100755
new mode 100644
diff --git a/vilesci/personen/outgoing_frameset.php b/vilesci/personen/outgoing_frameset.php
old mode 100755
new mode 100644
diff --git a/vilesci/personen/outgoing_uebersicht.php b/vilesci/personen/outgoing_uebersicht.php
old mode 100755
new mode 100644
diff --git a/vilesci/personen/personen_anlegen.php b/vilesci/personen/personen_anlegen.php
old mode 100755
new mode 100644
diff --git a/vilesci/personen/personen_details.php b/vilesci/personen/personen_details.php
old mode 100755
new mode 100644
diff --git a/vilesci/personen/personendetails.php b/vilesci/personen/personendetails.php
old mode 100755
new mode 100644
diff --git a/vilesci/personen/preinteressent_anlegen.php b/vilesci/personen/preinteressent_anlegen.php
old mode 100755
new mode 100644
diff --git a/vilesci/personen/preinteressent_detail.php b/vilesci/personen/preinteressent_detail.php
old mode 100755
new mode 100644
diff --git a/vilesci/personen/preinteressent_frameset.html b/vilesci/personen/preinteressent_frameset.html
old mode 100755
new mode 100644
diff --git a/vilesci/personen/preinteressent_uebernahme.php b/vilesci/personen/preinteressent_uebernahme.php
old mode 100755
new mode 100644
diff --git a/vilesci/personen/preinteressent_uebersicht.php b/vilesci/personen/preinteressent_uebersicht.php
old mode 100755
new mode 100644
diff --git a/vilesci/personen/student_edit.php b/vilesci/personen/student_edit.php
old mode 100755
new mode 100644
diff --git a/vilesci/personen/student_vorrueckung.php b/vilesci/personen/student_vorrueckung.php
old mode 100755
new mode 100644
diff --git a/vilesci/personen/suche.php b/vilesci/personen/suche.php
old mode 100755
new mode 100644
diff --git a/vilesci/personen/uniflow.csv.php b/vilesci/personen/uniflow.csv.php
old mode 100755
new mode 100644
diff --git a/vilesci/personen/urlaubsverwaltung.php b/vilesci/personen/urlaubsverwaltung.php
old mode 100755
new mode 100644
diff --git a/vilesci/personen/wiederholer.php b/vilesci/personen/wiederholer.php
old mode 100755
new mode 100644
diff --git a/vilesci/personen/zeitwunsch.php b/vilesci/personen/zeitwunsch.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/ampel_details.php b/vilesci/stammdaten/ampel_details.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/ampel_frameset.html b/vilesci/stammdaten/ampel_frameset.html
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/ampel_uebersicht.php b/vilesci/stammdaten/ampel_uebersicht.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/auswertung_fhtw.php b/vilesci/stammdaten/auswertung_fhtw.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/benutzerberechtigung_autocomplete.php b/vilesci/stammdaten/benutzerberechtigung_autocomplete.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/benutzerberechtigung_detailliste.php b/vilesci/stammdaten/benutzerberechtigung_detailliste.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/benutzerberechtigung_details.php b/vilesci/stammdaten/benutzerberechtigung_details.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/benutzerberechtigung_frameset.html b/vilesci/stammdaten/benutzerberechtigung_frameset.html
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/benutzerberechtigung_uebersicht.php b/vilesci/stammdaten/benutzerberechtigung_uebersicht.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/berechtigungen.php b/vilesci/stammdaten/berechtigungen.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/berechtigungrolle.php b/vilesci/stammdaten/berechtigungrolle.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/betriebsmittel_details.php b/vilesci/stammdaten/betriebsmittel_details.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/betriebsmittel_frameset.php b/vilesci/stammdaten/betriebsmittel_frameset.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/betriebsmittel_uebersicht.php b/vilesci/stammdaten/betriebsmittel_uebersicht.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/buchung_typ.php b/vilesci/stammdaten/buchung_typ.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/cronjobverwaltung.php b/vilesci/stammdaten/cronjobverwaltung.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/dokumentvorlagen_verwaltung.php b/vilesci/stammdaten/dokumentvorlagen_verwaltung.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/firma_details.php b/vilesci/stammdaten/firma_details.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/firma_detailwork.php b/vilesci/stammdaten/firma_detailwork.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/firma_frameset.html b/vilesci/stammdaten/firma_frameset.html
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/firma_uebersicht.php b/vilesci/stammdaten/firma_uebersicht.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/firma_zusammen_details.php b/vilesci/stammdaten/firma_zusammen_details.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/firma_zusammen_uebersicht.php b/vilesci/stammdaten/firma_zusammen_uebersicht.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/gsprogramm.php b/vilesci/stammdaten/gsprogramm.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/imexport/dabis.php b/vilesci/stammdaten/imexport/dabis.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/imexport/index.html b/vilesci/stammdaten/imexport/index.html
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/imexport/zutrittskarten/export.php b/vilesci/stammdaten/imexport/zutrittskarten/export.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/imexport/zutrittskarten/generatefromsipass.php b/vilesci/stammdaten/imexport/zutrittskarten/generatefromsipass.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/imexport/zutrittskarten/generatefromsipass_predelete.php b/vilesci/stammdaten/imexport/zutrittskarten/generatefromsipass_predelete.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/imexport/zutrittskarten/import.php b/vilesci/stammdaten/imexport/zutrittskarten/import.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/imexport/zutrittskarten/index.html b/vilesci/stammdaten/imexport/zutrittskarten/index.html
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/infoscreen_details.php b/vilesci/stammdaten/infoscreen_details.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/infoscreen_frameset.html b/vilesci/stammdaten/infoscreen_frameset.html
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/infoscreen_preview.php b/vilesci/stammdaten/infoscreen_preview.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/infoscreen_uebersicht.php b/vilesci/stammdaten/infoscreen_uebersicht.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/lvbgruppenverwaltung.js b/vilesci/stammdaten/lvbgruppenverwaltung.js
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/lvbgruppenverwaltung.php b/vilesci/stammdaten/lvbgruppenverwaltung.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/lvbgruppenverwaltungDetail.php b/vilesci/stammdaten/lvbgruppenverwaltungDetail.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/lvbgruppenverwaltungTree.php b/vilesci/stammdaten/lvbgruppenverwaltungTree.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/organisationseinheiten.php b/vilesci/stammdaten/organisationseinheiten.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/personen_wartung.php b/vilesci/stammdaten/personen_wartung.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/raum_details.php b/vilesci/stammdaten/raum_details.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/raum_frameset.html b/vilesci/stammdaten/raum_frameset.html
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/raum_uebersicht.php b/vilesci/stammdaten/raum_uebersicht.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/reihungstest_administration.php b/vilesci/stammdaten/reihungstest_administration.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/reihungstest_zusammenlegung.php b/vilesci/stammdaten/reihungstest_zusammenlegung.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/reihungstestverwaltung.php b/vilesci/stammdaten/reihungstestverwaltung.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/reihungstestverwaltung_autocomplete.php b/vilesci/stammdaten/reihungstestverwaltung_autocomplete.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/service_details.php b/vilesci/stammdaten/service_details.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/service_frameset.html b/vilesci/stammdaten/service_frameset.html
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/service_uebersicht.php b/vilesci/stammdaten/service_uebersicht.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/set_gemeinde.php b/vilesci/stammdaten/set_gemeinde.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/stammdaten_autocomplete.php b/vilesci/stammdaten/stammdaten_autocomplete.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/statistik_details.php b/vilesci/stammdaten/statistik_details.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/statistik_frameset.html b/vilesci/stammdaten/statistik_frameset.html
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/statistik_uebersicht.php b/vilesci/stammdaten/statistik_uebersicht.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/studiengang_details.js b/vilesci/stammdaten/studiengang_details.js
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/studiengang_details.php b/vilesci/stammdaten/studiengang_details.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/studiengang_dokumente.php b/vilesci/stammdaten/studiengang_dokumente.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/studiengang_edit.php b/vilesci/stammdaten/studiengang_edit.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/studiengang_frameset.html b/vilesci/stammdaten/studiengang_frameset.html
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/studiengang_uebersicht.php b/vilesci/stammdaten/studiengang_uebersicht.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/studiensemester.php b/vilesci/stammdaten/studiensemester.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/variablen_details.php b/vilesci/stammdaten/variablen_details.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/variablen_frameset.html b/vilesci/stammdaten/variablen_frameset.html
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/variablen_uebersicht.php b/vilesci/stammdaten/variablen_uebersicht.php
old mode 100755
new mode 100644
diff --git a/vilesci/stammdaten/vertrag_typ.php b/vilesci/stammdaten/vertrag_typ.php
old mode 100755
new mode 100644
diff --git a/vilesci/statistik/filter_details.php b/vilesci/statistik/filter_details.php
old mode 100755
new mode 100644
diff --git a/vilesci/statistik/filter_frameset.html b/vilesci/statistik/filter_frameset.html
old mode 100755
new mode 100644
diff --git a/vilesci/statistik/filter_overview.php b/vilesci/statistik/filter_overview.php
old mode 100755
new mode 100644
diff --git a/vilesci/statistik/filter_vorschau.php b/vilesci/statistik/filter_vorschau.php
old mode 100755
new mode 100644
diff --git a/vilesci/statistik/incoming.php b/vilesci/statistik/incoming.php
old mode 100755
new mode 100644
diff --git a/vilesci/statistik/oehwaehlerverzeichnis.php b/vilesci/statistik/oehwaehlerverzeichnis.php
old mode 100755
new mode 100644
diff --git a/vilesci/statistik/outgoing.php b/vilesci/statistik/outgoing.php
old mode 100755
new mode 100644
diff --git a/vilesci/statistik/statistik.php b/vilesci/statistik/statistik.php
old mode 100755
new mode 100644
diff --git a/vilesci/statistik/statistik_frameset.php b/vilesci/statistik/statistik_frameset.php
old mode 100755
new mode 100644
diff --git a/vilesci/statistik/statistik_sql.php b/vilesci/statistik/statistik_sql.php
old mode 100755
new mode 100644
diff --git a/vilesci/statistik/studenten_historie.php b/vilesci/statistik/studenten_historie.php
old mode 100755
new mode 100644
diff --git a/vilesci/statistik/studierendenliste_oeh.php b/vilesci/statistik/studierendenliste_oeh.php
old mode 100755
new mode 100644
diff --git a/vilesci/top.php b/vilesci/top.php
old mode 100755
new mode 100644
diff --git a/wawi/auswertungen/aufteilung.php b/wawi/auswertungen/aufteilung.php
old mode 100755
new mode 100644
diff --git a/wawi/auswertungen/konto.php b/wawi/auswertungen/konto.php
old mode 100755
new mode 100644
diff --git a/wawi/auswertungen/kostenstelle.php b/wawi/auswertungen/kostenstelle.php
old mode 100755
new mode 100644
diff --git a/wawi/auswertungen/wawi_tags.php b/wawi/auswertungen/wawi_tags.php
old mode 100755
new mode 100644
diff --git a/wawi/auth.php b/wawi/auth.php
old mode 100755
new mode 100644
diff --git a/wawi/berechtigung.php b/wawi/berechtigung.php
old mode 100755
new mode 100644
diff --git a/wawi/bestellung.php b/wawi/bestellung.php
old mode 100755
new mode 100644
diff --git a/wawi/budget.php b/wawi/budget.php
old mode 100755
new mode 100644
diff --git a/wawi/check_bestellung.php b/wawi/check_bestellung.php
old mode 100755
new mode 100644
diff --git a/wawi/firma.php b/wawi/firma.php
old mode 100755
new mode 100644
diff --git a/wawi/home.php b/wawi/home.php
old mode 100755
new mode 100644
diff --git a/wawi/index.php b/wawi/index.php
old mode 100755
new mode 100644
diff --git a/wawi/kontouebersicht.php b/wawi/kontouebersicht.php
old mode 100755
new mode 100644
diff --git a/wawi/kostenstellenuebersicht.php b/wawi/kostenstellenuebersicht.php
old mode 100755
new mode 100644
diff --git a/wawi/login.php b/wawi/login.php
old mode 100755
new mode 100644
diff --git a/wawi/logout.php b/wawi/logout.php
old mode 100755
new mode 100644
diff --git a/wawi/menu.php b/wawi/menu.php
old mode 100755
new mode 100644
diff --git a/wawi/mwst.html b/wawi/mwst.html
old mode 100755
new mode 100644
diff --git a/wawi/pdfExport.txt b/wawi/pdfExport.txt
old mode 100755
new mode 100644
diff --git a/wawi/rechnung.php b/wawi/rechnung.php
old mode 100755
new mode 100644
diff --git a/wawi/wawi_autocomplete.php b/wawi/wawi_autocomplete.php
old mode 100755
new mode 100644
diff --git a/webdav/Caldav_Backend.php b/webdav/Caldav_Backend.php
old mode 100755
new mode 100644
diff --git a/webdav/Principal.php b/webdav/Principal.php
old mode 100755
new mode 100644
diff --git a/webdav/auth.class.php b/webdav/auth.class.php
old mode 100755
new mode 100644
diff --git a/webdav/google.txt b/webdav/google.txt
old mode 100755
new mode 100644
diff --git a/webdav/lvplan.php b/webdav/lvplan.php
old mode 100755
new mode 100644

From c80e943b3bff524420942396b4f7172d5d3ed538 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 17 Oct 2024 15:55:05 +0200
Subject: [PATCH 1310/1461] readd erroneously deleted folder addons/template
 commited as 56080f6681c83915d6746a5d06c8c8085f3d8239

---
 addons/template/cis/index.html                |   0
 addons/template/cis/init.js.php               |  44 ++++++++
 addons/template/cis/vorlage_profil_array.php  |  55 ++++++++++
 addons/template/content/index.html            |   0
 addons/template/content/init.js.php           |  90 ++++++++++++++++
 addons/template/dbcheck.php                   | 101 ++++++++++++++++++
 addons/template/index.html                    |   0
 addons/template/install.php                   |  66 ++++++++++++
 addons/template/locale/README.txt             |   6 ++
 addons/template/locale/index.html             |   0
 addons/template/soap/index.html               |   0
 addons/template/system/index.html             |   0
 addons/template/system/vorlage_zip/README.txt |   2 +
 addons/template/version.php                   |  29 +++++
 addons/template/vilesci/index.php             |  44 ++++++++
 addons/template/vilesci/init.js.php           |  44 ++++++++
 addons/template/vilesci/menu.inc.php          |  44 ++++++++
 .../vilesci/vorlage_generateuid.inc.php       |  69 ++++++++++++
 .../template/vilesci/vorlage_passwort.inc.php |  39 +++++++
 .../vilesci/vorlage_serviceterminal.inc.php   |  72 +++++++++++++
 addons/template/xml/index.html                |   0
 21 files changed, 705 insertions(+)
 create mode 100644 addons/template/cis/index.html
 create mode 100644 addons/template/cis/init.js.php
 create mode 100644 addons/template/cis/vorlage_profil_array.php
 create mode 100644 addons/template/content/index.html
 create mode 100644 addons/template/content/init.js.php
 create mode 100644 addons/template/dbcheck.php
 create mode 100644 addons/template/index.html
 create mode 100644 addons/template/install.php
 create mode 100644 addons/template/locale/README.txt
 create mode 100644 addons/template/locale/index.html
 create mode 100644 addons/template/soap/index.html
 create mode 100644 addons/template/system/index.html
 create mode 100644 addons/template/system/vorlage_zip/README.txt
 create mode 100644 addons/template/version.php
 create mode 100644 addons/template/vilesci/index.php
 create mode 100644 addons/template/vilesci/init.js.php
 create mode 100644 addons/template/vilesci/menu.inc.php
 create mode 100644 addons/template/vilesci/vorlage_generateuid.inc.php
 create mode 100644 addons/template/vilesci/vorlage_passwort.inc.php
 create mode 100644 addons/template/vilesci/vorlage_serviceterminal.inc.php
 create mode 100644 addons/template/xml/index.html

diff --git a/addons/template/cis/index.html b/addons/template/cis/index.html
new file mode 100644
index 000000000..e69de29bb
diff --git a/addons/template/cis/init.js.php b/addons/template/cis/init.js.php
new file mode 100644
index 000000000..174f620ed
--- /dev/null
+++ b/addons/template/cis/init.js.php
@@ -0,0 +1,44 @@
+<?php
+/* Copyright (C) 2015 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 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors: Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at>
+ */
+/**
+ * Initialisierung des Addons
+ */
+?>
+if(typeof addon =='undefined')
+	var addon=Array();
+
+addon.push( 
+{
+	init: function(page, params) 
+	{
+		// Diese Funktion wird nach dem Laden der Seite im CIS aufgerufen
+
+		/*
+		switch(page)
+		{
+			case 'cis/private/tools/zeitaufzeichnung.php':
+				break;
+
+			default:
+				break;
+		}
+		*/
+	}
+});
diff --git a/addons/template/cis/vorlage_profil_array.php b/addons/template/cis/vorlage_profil_array.php
new file mode 100644
index 000000000..3b4a04a65
--- /dev/null
+++ b/addons/template/cis/vorlage_profil_array.php
@@ -0,0 +1,55 @@
+<?php
+/* Copyright (C) 2014 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 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors: Andreas Österreicher <andreas.oesterreicher@technikum-wien.at>
+ */
+/**
+ * Diese Datei fügt zusätzliche Links im CIS Profil ein
+ * Dazu muss die Datei umbenannt werden in profil_array.php
+ *
+ * Dazu wird ein Array aufgebaut welches die Links enthaelt.
+ * 
+ * $menu = array('MeinLink'=>array('name'=>'Name des Links','link'=>'../path/to/file.php','target'='content'));
+ */
+
+
+// Unterschiedliche Links für Studierende und Mitarbeiter
+if($type=='student')
+{
+	if(!$ansicht)
+		$menu['Notenliste']=array('name'=>$p->t('profil/leistungsbeurteilung'), 'link'=>'../lehre/notenliste.php', 'target'=>'content');
+	$menu['LVPlan']=array('name'=>$p->t('profil/lvplanVon').' '.$user->nachname, 'link'=>'../lvplan/stpl_week.php?pers_uid='.$user->uid.'&type=student', 'target'=>'content');	
+}
+else
+{
+	if(!$ansicht)
+	{
+		$menu['Zeitwunsch']=array('name'=>$p->t('profil/zeitwuensche'), 'link'=>'zeitwunsch.php?uid='.$user->uid, 'target'=>'content');
+		$menu['Lehrveranstaltungen']=array('name'=>$p->t('lvaliste/lehrveranstaltungen'), 'link'=>'lva_liste.php?uid='.$user->uid, 'target'=>'content');
+	}
+
+	if(check_lektor(get_uid()))
+	{
+		$menu['Zeitsperren']=array('name'=>$p->t('profil/zeitsperrenVon').' '.$user->nachname, 'link'=>'zeitsperre_days.php?days=30&lektor='.$user->uid, 'target'=>'content');
+	}
+
+	if($uid!=get_uid())
+	{
+		$menu['LVPlan']=array('name'=>$p->t('profil/lvplanVon').' '.$user->nachname, 'link'=>'../lvplan/stpl_week.php?pers_uid='.$user->uid.'&type=lektor', 'target'=>'content');
+	}
+}
+?>
diff --git a/addons/template/content/index.html b/addons/template/content/index.html
new file mode 100644
index 000000000..e69de29bb
diff --git a/addons/template/content/init.js.php b/addons/template/content/init.js.php
new file mode 100644
index 000000000..4209c2f12
--- /dev/null
+++ b/addons/template/content/init.js.php
@@ -0,0 +1,90 @@
+<?php
+/* Copyright (C) 2013 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 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors: Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at>
+ */
+/**
+ * Initialisierung des Addons
+ */
+?>
+addon.push( 
+{
+	init: function() 
+	{
+		// Diese Funktion wird nach dem Laden des FAS aufgerufen
+
+		/*
+
+		// Hinzufuegen eines zusaetzlichen Tabs bei Mitarbeitern mit einem Label darin
+		var tabitem = document.createElement("tab");
+		tabitem.setAttribute("id","addon-template-tab");
+		tabitem.setAttribute("label","Template");
+
+		var mitarbeitertabs = document.getElementById("mitarbeiter-tabs");
+		mitarbeitertabs.appendChild(tabitem);
+
+		var tabpanelitem = document.createElement("vbox");
+		tabpanelitem.setAttribute("id","addon-template-tabpannel-vbox");
+		var label = document.createElement("label");
+		label.setAttribute("value","Template");
+		tabpanelitem.appendChild(label);
+
+		var mitarbeitertabpanels=document.getElementById("mitarbeiter-tabpanels-main");
+		mitarbeitertabpanels.appendChild(tabpanelitem);
+
+		// zusaetzliche Funktion beim klicken des Suchen Button bei Mitarbeitern hinzufuegen
+		searchbutton = document.getElementById("mitarbeiter-toolbar-button-search");
+		searchbutton.addEventListener("command",AddonTemplateMitarbeiterSearch, true);
+
+		// Menuepunkt hinzufuegen
+		statistikmenue = document.getElementById("menu-statistic-popup");
+
+		var menuentry = document.createElement("menuitem");
+		menuentry.setAttribute("id","addons-template-mymenuentry");
+		menuentry.setAttribute("label","Addon Template Menu Entry");
+		menuentry.addEventListener("command",AddonTemplateMenuEntry, true);
+	
+		statistikmenue.appendChild(menuentry);
+		
+		*/
+	},
+	selectMitarbeiter: function(person_id, mitarbeiter_uid)
+	{
+	},
+	selectStudent: function(person_id, prestudent_id, student_uid)
+	{
+	},
+	selectVerband: function(item)
+	{
+	},
+	selectInstitut: function(institut)
+	{
+	},
+	selectLektor: function(lektor)
+	{
+	}
+});
+
+function AddonTemplateMitarbeiterSearch()
+{
+	alert("AddonTemplateSearchButtonClicked");
+}
+
+function AddonTemplateMenuEntry()
+{
+	alert("AddonTemplateMenuEntry clicked");
+}
diff --git a/addons/template/dbcheck.php b/addons/template/dbcheck.php
new file mode 100644
index 000000000..a5f9e8b30
--- /dev/null
+++ b/addons/template/dbcheck.php
@@ -0,0 +1,101 @@
+<?php
+/* Copyright (C) 2013 FH 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.
+ *
+ */
+/**
+ * FH-Complete Addon Template Datenbank Check
+ *
+ * Prueft und aktualisiert die Datenbank
+ */
+require_once('../../config/system.config.inc.php');
+require_once('../../include/basis_db.class.php');
+require_once('../../include/functions.inc.php');
+require_once('../../include/benutzerberechtigung.class.php');
+
+// Datenbank Verbindung
+$db = new basis_db();
+
+echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../skin/fhcomplete.css" type="text/css">
+	<link rel="stylesheet" href="../../skin/vilesci.css" type="text/css">
+	<title>Addon Datenbank Check</title>
+</head>
+<body>
+<h1>Addon Datenbank Check</h1>';
+
+$uid = get_uid();
+$rechte = new benutzerberechtigung();
+$rechte->getBerechtigungen($uid);
+
+if(!$rechte->isBerechtigt('basis/addon', null, 'suid'))
+{
+	exit('Sie haben keine Berechtigung für die Verwaltung von Addons');
+}
+
+echo '<h2>Aktualisierung der Datenbank</h2>';
+
+// Code fuer die Datenbankanpassungen
+
+/*
+if(!$result = @$db->db_query("SELECT 1 FROM addon.tbl_template_items"))
+{
+
+	$qry = 'CREATE TABLE addon.tbl_template_items
+			(
+				template_items_kurzbz varchar(32),
+				bezeichnung varchar(256)
+			);';
+
+	if(!$db->db_query($qry))
+		echo '<strong>addon.tbl_template_items: '.$db->db_last_error().'</strong><br>';
+	else
+		echo ' addon.tbl_template_items: Tabelle addon.template_items hinzugefuegt!<br>';
+
+}
+*/
+
+echo '<br>Aktualisierung abgeschlossen<br><br>';
+echo '<h2>Gegenprüfung</h2>';
+
+
+// Liste der verwendeten Tabellen / Spalten des Addons
+$tabellen=array(
+	"addon.tbl_template_items"  => array("template_items_kurzbz","bezeichnung"),
+);
+
+
+$tabs=array_keys($tabellen);
+$i=0;
+foreach ($tabellen AS $attribute)
+{
+	$sql_attr='';
+	foreach($attribute AS $attr)
+		$sql_attr.=$attr.',';
+	$sql_attr=substr($sql_attr, 0, -1);
+
+	if (!@$db->db_query('SELECT '.$sql_attr.' FROM '.$tabs[$i].' LIMIT 1;'))
+		echo '<BR><strong>'.$tabs[$i].': '.$db->db_last_error().' </strong><BR>';
+	else
+		echo $tabs[$i].': OK - ';
+	flush();
+	$i++;
+}
+?>
diff --git a/addons/template/index.html b/addons/template/index.html
new file mode 100644
index 000000000..e69de29bb
diff --git a/addons/template/install.php b/addons/template/install.php
new file mode 100644
index 000000000..d9644bd3e
--- /dev/null
+++ b/addons/template/install.php
@@ -0,0 +1,66 @@
+<?php
+/* Copyright (C) 2013 FH 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.
+ *
+ */
+/**
+ * FH-Complete Addon Template Installation
+ *
+ * Installationsscript zur Erstinitialisierung des Addons
+ */
+require_once('version.php');
+require_once('../../version.php');
+require_once('../../config/system.config.inc.php');
+require_once('../../include/functions.inc.php');
+require_once('../../include/benutzerberechtigung.class.php');
+
+echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../skin/fhcomplete.css" type="text/css">
+	<link rel="stylesheet" href="../../skin/vilesci.css" type="text/css">
+	<title>Addon Installation</title>
+</head>
+<body>
+<h1>Addon Installation</h1>';
+
+$uid = get_uid();
+$rechte = new benutzerberechtigung();
+$rechte->getBerechtigungen($uid);
+
+if(!$rechte->isBerechtigt('basis/addon', null, 'suid'))
+{
+	exit('Sie haben keine Berechtigung für die Verwaltung von Addons');
+}
+
+if($fhcomplete_version>=$fhcomplete_target_version)
+{
+	echo 'Installiere Addon <span class="marked">'.$addon_name.'</span> Version <span class="marked">'.$addon_version.'</span><br><br>';
+
+	/**
+	 * Fuegen Sie hier Ihre Installationsroutine hinzu
+	 */
+
+ 	echo '<a href="dbcheck.php">&gt;&gt; weiter zur Aktualisierung der Datenbank</a>';
+}
+else
+{
+	echo 'Dieses Addon funktioniert erst mit FHComplete Version '.$fhcomplete_target_version;
+	echo 'Installation abgebrochen';
+}
+?>
diff --git a/addons/template/locale/README.txt b/addons/template/locale/README.txt
new file mode 100644
index 000000000..fcf4930cd
--- /dev/null
+++ b/addons/template/locale/README.txt
@@ -0,0 +1,6 @@
+In diesem Ordner können Locale-Dateien abgelegt werden.
+Diese überschreiben globale Locales die unter /locale/ abgelegt sind.
+
+In den Dateien müssen nicht alle Phrasen vorhanden sein. Es genügt, wenn nur die Phrasen vorhanden sind die überschrieben werden sollen. Alle anderen Phrasen werden aus dem Standard-Ordner übernommen.
+
+Die Datei mit der Phrase muss jedoch den selben Namen haben wie die Ursprungsdatei in der die Phrase enthalten ist.
diff --git a/addons/template/locale/index.html b/addons/template/locale/index.html
new file mode 100644
index 000000000..e69de29bb
diff --git a/addons/template/soap/index.html b/addons/template/soap/index.html
new file mode 100644
index 000000000..e69de29bb
diff --git a/addons/template/system/index.html b/addons/template/system/index.html
new file mode 100644
index 000000000..e69de29bb
diff --git a/addons/template/system/vorlage_zip/README.txt b/addons/template/system/vorlage_zip/README.txt
new file mode 100644
index 000000000..33c9e2414
--- /dev/null
+++ b/addons/template/system/vorlage_zip/README.txt
@@ -0,0 +1,2 @@
+In diesem Ordner können modifizierte ODT Vorlagen für die Dokumentenerstellung abgelegt werden. 
+Vorlagen die in diesem Ordner abgelegt werden, werden bevorzugt gegenüber jenen die unter /system/vorlage_zip abgelegt sind.
diff --git a/addons/template/version.php b/addons/template/version.php
new file mode 100644
index 000000000..447a26c2a
--- /dev/null
+++ b/addons/template/version.php
@@ -0,0 +1,29 @@
+<?php
+/* Copyright (C) 2013 FH 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.
+ *
+ */
+
+// Name des Addons
+$addon_name = 'Template';
+
+// Versionsnummer des Addons
+$addon_version = '0.01';
+
+// FH-Complete Min-Version
+$fhcomplete_target_version = '2.2';
+
+?>
diff --git a/addons/template/vilesci/index.php b/addons/template/vilesci/index.php
new file mode 100644
index 000000000..6ed5cbfba
--- /dev/null
+++ b/addons/template/vilesci/index.php
@@ -0,0 +1,44 @@
+<?php
+/* Copyright (C) 2013 FH 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('../../../config/vilesci.config.inc.php');
+require_once('../../../include/functions.inc.php');
+require_once('../../../include/benutzerberechtigung.class.php');
+
+echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../skin/fhcomplete.css" type="text/css">
+	<link rel="stylesheet" href="../../../skin/vilesci.css" type="text/css">
+	<title>Template</title>
+</head>
+<body>
+<h1>Template</h1>';
+
+$uid = get_uid();
+$rechte = new benutzerberechtigung();
+$rechte->getBerechtigungen($uid);
+
+if(!$rechte->isBerechtigt('basis/addon'))
+{
+	die('Sie haben keine Berechtigung fuer diese Seite');
+}
+echo 'Template Addon Vilesci Integration';
+?>
diff --git a/addons/template/vilesci/init.js.php b/addons/template/vilesci/init.js.php
new file mode 100644
index 000000000..5ac9310ca
--- /dev/null
+++ b/addons/template/vilesci/init.js.php
@@ -0,0 +1,44 @@
+<?php
+/* Copyright (C) 2015 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 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors: Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at>
+ */
+/**
+ * Initialisierung des Addons
+ */
+?>
+if(typeof addon =='undefined')
+	var addon=Array();
+
+addon.push(
+{
+	init: function(page, params)
+	{
+		// Diese Funktion wird nach dem Laden der Seite im Vilesci aufgerufen
+
+		/*
+		switch(page)
+		{
+			case 'vilesci/lehre/lehrveranstaltung.php':
+				break;
+
+			default:
+				break;
+		}
+		*/
+	}
+});
diff --git a/addons/template/vilesci/menu.inc.php b/addons/template/vilesci/menu.inc.php
new file mode 100644
index 000000000..77e9c8ec3
--- /dev/null
+++ b/addons/template/vilesci/menu.inc.php
@@ -0,0 +1,44 @@
+<?php
+/* Copyright (C) 2017 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 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors: Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at>,
+ */
+/**
+ * Hier koennen neue Menuepunkte im Vilesci definiert werden
+ */
+
+// Hauptmenuepunkt hinzufuegen
+$menu_addon = array
+(
+	'Template'=>array
+	(
+		'name'=>'Template', 'opener'=>'true', 'hide'=>'true', 'permissions'=>array('basis/addon'), 'image'=>'../../skin/images/vilesci_addons.png',
+		'link'=>'left.php?categorie=Template', 'target'=>'nav',
+		'TemplateEntry1'=>array('name'=>'Template Entry1', 'link'=>'../addons/template/vilesci/index.php', 'target'=>'main'),
+		'TemplateEntry2'=>array('name'=>'Template Entry2', 'link'=>'../addons/template/vilesci/index.php', 'target'=>'main')
+	)
+);
+$menu = array_merge($menu,$menu_addon);
+
+// Submenuepunkt hinzufuegen unter dem Hauptmenue Punkt "Admin"
+$menu_addon = array
+(
+	'TemplateSubmenu'=>array('name'=>'Template', 'link'=>'../addons/template/vilesci/index.php', 'target'=>'main','permissions'=>array('basis/addon')),
+
+);
+$menu['Admin'] = array_merge($menu['Admin'],$menu_addon);
+?>
diff --git a/addons/template/vilesci/vorlage_generateuid.inc.php b/addons/template/vilesci/vorlage_generateuid.inc.php
new file mode 100644
index 000000000..ebe2be3e2
--- /dev/null
+++ b/addons/template/vilesci/vorlage_generateuid.inc.php
@@ -0,0 +1,69 @@
+<?php
+/* Copyright (C) 2014 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 2 of the
+* License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+*
+* Authors: Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at> and
+*/
+/**
+ * Benutzerdefinierte Funktion zur Generierung der UIDs
+ * Zur Aktivierung muss die Datei in generateuid.inc.php umbenannt werden
+ */
+
+/**
+ * Generiert die UID für Studierende
+ *
+ * @param $stgkzl Studiengangskuerzel
+ * @param $jahr Studienjahr (zB 2014)
+ * @param $stgtyp Studiengangstyp einstellige Ziffer
+ * @param $matrikelnummer Personenkennzeichen des Studierenden
+ */
+function generateUID($stgkzl, $jahr, $stgtyp, $matrikelnummer)
+{
+	return $matrikelnummer;
+}
+
+/**
+ * Gerneriert die Mitarbeiter UID
+ * Format v.nachname max 20 Zeichen
+ * Im Fall von Doppelnamen wird vor dem Bindestrich abgeschnitten
+ *
+ * @param $vorname Vorname
+ * @param $nachname Nachname
+ * @param $lektor Boolean true wenn Lektor sonst false
+ */
+function generateMitarbeiterUID($vorname, $nachname, $lektor, $fixangestellt=true)
+{
+	$bn = new benutzer();
+	$uid='';
+
+	// Wenn ein Bindestrich vorhanden ist (Doppelname), dort abschneiden
+	if(mb_strpos($nachname,'-')!==false)
+		$nachname = mb_substr($nachname, 0, mb_strpos($nachname,'-'));
+	// Nachname wird so lange verkuerzt bis eine eindeutige UID entsteht die noch nicht vergeben ist
+	for($nn=18;$nn!=0;$nn--)
+	{
+		$uid = mb_substr($vorname,0,1);
+		$uid .= mb_substr($nachname,0,$nn);
+
+		$uid = mb_str_replace(' ','',$uid);
+		$uid = mb_str_replace('-','',$uid);
+
+		$uid = mb_strtolower($uid);
+		if(!$bn->uid_exists($uid))
+			return $uid;
+	}
+	return false;
+}
diff --git a/addons/template/vilesci/vorlage_passwort.inc.php b/addons/template/vilesci/vorlage_passwort.inc.php
new file mode 100644
index 000000000..0d922f6bc
--- /dev/null
+++ b/addons/template/vilesci/vorlage_passwort.inc.php
@@ -0,0 +1,39 @@
+<?php
+/* Copyright (C) 2014 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 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors: Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at>
+ */
+/*
+ * Diese Datei überschreibt die Default-Funktionen zur Passwort Änderung
+ * Zur Aktivierung muss die Datei in passwort.inc.php umbenannt werden
+ * 
+ * Ansonsten wird die Default Funktionalität unter /include/tw/passwort.inc.php verwendet
+ */
+
+/**
+ * Aendert das Passwort 
+ * @param $passwort_alt Altes (aktuelles) Passwort
+ * @param $passwort_neu neues Passwort
+ * @param $uid - UID/Benutzername des Users
+ * @return true wenn erfolgreich - Fehlermeldung im Fehlerfall
+ */
+function change_password($passwort_alt, $passwort_neu, $uid)
+{
+	return 'Passwort Änderung fehlgeschlagen.';
+}
+
+?>
diff --git a/addons/template/vilesci/vorlage_serviceterminal.inc.php b/addons/template/vilesci/vorlage_serviceterminal.inc.php
new file mode 100644
index 000000000..25debceea
--- /dev/null
+++ b/addons/template/vilesci/vorlage_serviceterminal.inc.php
@@ -0,0 +1,72 @@
+<?php
+/* Copyright (C) 2014 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 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors: Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at>
+ */
+
+// Raumtyp der per Default am Infoterminal angezeigt wird
+$ServiceTerminalDefaultRaumtyp='EDV';
+
+// Liste der Raumtypen die am Infoterminal angezeigt werden
+$ServiceTerminalRaumtypen=array(
+			array("type"=>"EDV","beschreibung"=>"&nbsp;Freie&nbsp;<br>&nbsp;PC R&auml;ume&nbsp;","img"=>""),
+			array("type"=>"HS","beschreibung"=>"&nbsp;Freie&nbsp;<br>&nbsp;H&ouml;rs&auml;le&nbsp;","img"=>""),
+			array("type"=>"SEM","beschreibung"=>"&nbsp;Freie&nbsp;<br>&nbsp;Seminarr&auml;ume&nbsp;","img"=>""),
+			array("type"=>"Lab","beschreibung"=>"&nbsp;Freie&nbsp;<br>&nbsp;Laborr&auml;ume&nbsp;","img"=>""),
+			);		
+
+/**
+ * Prueft ob die Karte verlaengert werden darf
+ * @param $uid
+ * @return Array mit boolean und Errormsg
+ */
+function ServiceTerminalCheckVerlaengerung($uid)
+{
+	if(!check_lektor($uid))	
+    {
+
+		$konto = new konto(); 
+		if($aktSemester= $konto->getLastStudienbeitrag($uid))
+	    {
+			return array(true,'Studienbeitrag für Semester '.$aktSemester.' bezahlt');
+		}
+		else
+		{
+			return array(false,'Verlängerung der Karte ist derzeit nicht möglich da der Studienbeitrag noch nicht bezahlt wurde');
+		}
+	}
+	else
+		return array(false,'Für Mitarbeiter ist eine Kartenverlängerung nicht möglich');
+}
+
+/**
+ * Liefert den Text der auf die Karte gedruckt werden soll oder einer Errormsg
+ * @param $uid UID des Users
+ * @return array mit Datum/Drucktext und errorMessage
+ */ 
+function ServiceTerminalGetDrucktext($uid)
+{
+	// hole Semester des letzten eingezahlten Studienbeitrages
+	$konto = new konto(); 
+	if(!$aktSemester= $konto->getLastStudienbeitrag($uid))
+	{
+	    return array('datum'=>'', 'errorMessage'=>'Fehler beim Auslesen des Studienganges. Bitte wenden Sie sich an den Service Desk.');  
+	}  
+	
+	return array('datum'=>'Gueltig fuer/valid for '.$aktSemester, 'errorMessage'=>'');  
+}
+?>
diff --git a/addons/template/xml/index.html b/addons/template/xml/index.html
new file mode 100644
index 000000000..e69de29bb

From 755e8dd222741d191028235b8ba069ff399883f2 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 17 Oct 2024 16:37:27 +0200
Subject: [PATCH 1311/1461] add provide to vuejs plugins FhcAlert, FhcApi and
 Phrasen so they are also useable with inject in composition api

---
 public/js/plugin/FhcAlert.js | 1 +
 public/js/plugin/FhcApi.js   | 2 +-
 public/js/plugin/Phrasen.js  | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/public/js/plugin/FhcAlert.js b/public/js/plugin/FhcAlert.js
index 01fa12d82..b079bf98e 100644
--- a/public/js/plugin/FhcAlert.js
+++ b/public/js/plugin/FhcAlert.js
@@ -394,5 +394,6 @@ export default {
 			}
 		};
 		app.config.globalProperties.$fhcAlert = $fhcAlert;
+                app.provide('$fhcAlert', app.config.globalProperties.$fhcAlert);
 	}
 }
diff --git a/public/js/plugin/FhcApi.js b/public/js/plugin/FhcApi.js
index 7be1a5b9f..88d2ac919 100644
--- a/public/js/plugin/FhcApi.js
+++ b/public/js/plugin/FhcApi.js
@@ -316,6 +316,6 @@ export default {
 		const mergedFhcApiFactory = options?.factory ? {...FhcApiFactory, ...options.factory} : FhcApiFactory;
 
 		app.config.globalProperties.$fhcApi.factory = new FhcApiFactoryWrapper(mergedFhcApiFactory);
-
+                app.provide('$fhcApi', app.config.globalProperties.$fhcApi);
 	}
 };
\ No newline at end of file
diff --git a/public/js/plugin/Phrasen.js b/public/js/plugin/Phrasen.js
index 277402639..5d861fce5 100644
--- a/public/js/plugin/Phrasen.js
+++ b/public/js/plugin/Phrasen.js
@@ -69,5 +69,6 @@ export default {
 			loadCategory: cat => phrasen.loadCategory.call(app, cat),
 			t_ref: phrasen.t_ref
 		};
+                app.provide('$p', app.config.globalProperties.$p);
 	}
 }

From 236c4bbdfca7adb19a4567e7f4d02bc825cd60cc Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 18 Oct 2024 11:18:36 +0200
Subject: [PATCH 1312/1461] adds placeholders to the empty dashboard fields,
 that can be used to add new widgets to the dashboard

---
 public/css/components/dashboard.css       | 13 +++-
 public/js/components/Dashboard/Item.js    |  2 +-
 public/js/components/Dashboard/Section.js | 78 ++++++++++++++++++++---
 public/js/components/Drop/Grid.js         | 49 +++++++++-----
 4 files changed, 116 insertions(+), 26 deletions(-)

diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
index d2635d4e9..bf06001a2 100755
--- a/public/css/components/dashboard.css
+++ b/public/css/components/dashboard.css
@@ -4,13 +4,24 @@
 .empty-tile-hover {
 	height: 100%;
 	width: 100%;
-	background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="-500 -500 1448 1512"><path fill="lightgray" d="M64 32C28.7 32 0 60.7 0 96V416c0 35.3 28.7 64 64 64H384c35.3 0 64-28.7 64-64V96c0-35.3-28.7-64-64-64H64zM200 344V280H136c-13.3 0-24-10.7-24-24s10.7-24 24-24h64V168c0-13.3 10.7-24 24-24s24 10.7 24 24v64h64c13.3 0 24 10.7 24 24s-10.7 24-24 24H248v64c0 13.3-10.7 24-24 24s-24-10.7-24-24z"/></svg>');
+	background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="-500 -500 1448 1512"><path fill="rgb(211, 211, 211,0.35)" d="M64 32C28.7 32 0 60.7 0 96V416c0 35.3 28.7 64 64 64H384c35.3 0 64-28.7 64-64V96c0-35.3-28.7-64-64-64H64zM200 344V280H136c-13.3 0-24-10.7-24-24s10.7-24 24-24h64V168c0-13.3 10.7-24 24-24s24 10.7 24 24v64h64c13.3 0 24 10.7 24 24s-10.7 24-24 24H248v64c0 13.3-10.7 24-24 24s-24-10.7-24-24z"/></svg>');
 	background-repeat: no-repeat;
 	background-position: center;
 	background-size: cover;
 	cursor:pointer;
 }
 
+.empty-tile-hover:hover {
+		background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="-500 -500 1448 1512"><path fill="rgb(211, 211, 211)" d="M64 32C28.7 32 0 60.7 0 96V416c0 35.3 28.7 64 64 64H384c35.3 0 64-28.7 64-64V96c0-35.3-28.7-64-64-64H64zM200 344V280H136c-13.3 0-24-10.7-24-24s10.7-24 24-24h64V168c0-13.3 10.7-24 24-24s24 10.7 24 24v64h64c13.3 0 24 10.7 24 24s-10.7 24-24 24H248v64c0 13.3-10.7 24-24 24s-24-10.7-24-24z"/></svg>');
+}
+
+/*.empty-tile-background {
+	background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="-500 -500 1448 1512"><path fill="rgb(211, 211, 211, 0.35)" d="M64 32C28.7 32 0 60.7 0 96V416c0 35.3 28.7 64 64 64H384c35.3 0 64-28.7 64-64V96c0-35.3-28.7-64-64-64H64zM200 344V280H136c-13.3 0-24-10.7-24-24s10.7-24 24-24h64V168c0-13.3 10.7-24 24-24s24 10.7 24 24v64h64c13.3 0 24 10.7 24 24s-10.7 24-24 24H248v64c0 13.3-10.7 24-24 24s-24-10.7-24-24z"/></svg>');
+	background-repeat: repeat;
+	background-size: var(--fhc-dg-col-width);
+	cursor: pointer;
+}*/
+
 .alert-danger .form-check-input:checked {
 	border-color: #842029;
 	background-color: #842029;
diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index d3212c72e..31b8a5085 100755
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -86,7 +86,7 @@ export default {
 		config() {
 			this.arguments = { ...this.widget.arguments, ...this.config };
 			this.tmpConfig = { ...this.arguments };
-			this.$refs.config.hide();
+			this.$refs.config && this.$refs.config.hide();
 			this.isLoading = false;
 		},
 	},
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 4aa7c823f..6c7445b9f 100755
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -26,15 +26,65 @@ export default {
 	data() {
 		return {
 			gridWidth: 1,
+			gridHeight: null,
 			editMode: this.adminMode
 		}
 	},
 	computed: {
 		items() {
 			return this.widgets.map(item => {
-				return {...item, ...(item.place[this.gridWidth] || {h: 1, w:1, x:0, y:0})};
+				return { ...item, ...(item.place[this.gridWidth] || {h: 1, w:1, x:0, y:0})};
 			});
-		}
+		},
+		items_hashmap() {
+			let items = {};
+			this.items.forEach(item => {
+				items[`x${item.x}y${item.y}`] = item;
+			});
+			return items
+		},
+		items_placeholders(){
+			let placeholders = [];
+			let col_max = this.gridWidth;
+			// OLD way of calculating the max rows
+			//let max_row = Math.max(...this.items.map(item => item.y)) + 1;
+			//let max_row_max_height = Math.max(...this.items.filter(item => item.y == (max_row - 1)).map(item => item.h));
+			//max_row + max_row_max_height - 1;
+			let rows_max = this.gridHeight;
+
+			// occupied hashmap to keep track of the occupied cells
+			let occupied = {};
+
+			for (let y = 0; y < rows_max; y++) {
+				for (let x = 0; x < col_max; x++) {
+					// skip current position if it was registered as occupied
+					if (Object.keys(occupied).length && occupied[`x${x}y${y}`]) {
+						continue;
+					}
+					let current_item = this.items_hashmap[`x${x}y${y}`];
+					if (current_item) {
+						//calculate the occupied cells from the width and the height from the items 
+						let width = current_item.w;
+						let height = current_item.h;
+						let max_x = x + width - 1;
+						let max_y = y + height - 1;
+						if(x != max_x || y != max_y){
+							for (let occupied_y = y; occupied_y <= max_y; occupied_y++) {
+								for (let occupied_x = x; occupied_x <= max_x; occupied_x++) {
+									if (occupied_x != x || occupied_y != y) {
+										occupied[`x${occupied_x}y${occupied_y}`]=true;
+									}
+								}
+							}
+						}
+					}
+					else {
+						placeholders.push({ x: x, y: y, w: 1, h: 1, placeholder: true });
+					}
+				}
+			}
+			return placeholders;
+		},
 	},
 	methods: {
 		checkResizeLimit(item, w, h) {
@@ -80,7 +130,9 @@ export default {
 		updatePositions(updated) {
 			let result = {};
 			updated.forEach(update => {
+				
 				let item = {...update.item};
+				if (!item.placeholder) {
 				if (!item.place[this.gridWidth])
 					item.place[this.gridWidth] = {x: 0, y: 0, w: 1, h: 1};
 				delete item.x;
@@ -97,7 +149,9 @@ export default {
 					item.place[this.gridWidth].h = update.h;
 
 				result[item.id] = item;
+				}
 			});
+			
 			this.updatePreset(result);
 		},
 		updatePreset(update) {
@@ -121,9 +175,10 @@ export default {
 			<span class="col">{{name}}</span>
 			<button class="col-auto btn" @click.prevent="editMode = !editMode"><i class="fa-solid fa-gear"></i></button>
 		</h3>
-		<drop-grid v-model:cols="gridWidth" :items="items" :active="editMode" :resize-limit="checkResizeLimit" :margin-for-extra-row=".01" @rearrange-items="updatePositions">
-			<template v-slot="item">
-				<dashboard-item
+		<drop-grid v-model:cols="gridWidth" :items="items" :placeholders="items_placeholders" :active="editMode" :resize-limit="checkResizeLimit" :margin-for-extra-row=".01" @rearrange-items="updatePositions" @gridHeight="gridHeight=$event" >
+			<template #default="item" #default>
+				
+				<dashboard-item v-if="!item.placeholder"
 					:id="item.widget"
 					:width="item.w"
 					:height="item.h"
@@ -135,10 +190,17 @@ export default {
 					@change="saveConfig($event, item)"
 					@remove="removeWidget(item, $event)">
 				</dashboard-item>
+				<div v-else class="empty-tile-hover" @click="$emit('widgetAdd', name, { widget: 1, config: {}, place: {[gridWidth]: {x:item.x,y:item.y,w:1,h:1}}, custom: 1 })"></div>
+				
 			</template>
-			<template #empty-tile-hover="{x,y}">
-				<div class="empty-tile-hover" @click="$emit('widgetAdd', name, { widget: 1, config: {}, place: {[gridWidth]: {x,y,w:1,h:1}}, custom: 1 })"></div>
-			</template>
+			
 		</drop-grid>
 	</div>`
 }
+
+/*
+OLD VERSION - ON HOVER
+<template #empty-tile-hover="{x,y}">
+	<div class="empty-tile-hover" @click="$emit('widgetAdd', name, { widget: 1, config: {}, place: {[gridWidth]: {x,y,w:1,h:1}}, custom: 1 })"></div>
+</template>
+*/
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 62e4c15ea..a55498eb8 100755
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -24,11 +24,16 @@ export default {
 		marginForExtraRow: {
 			type: Number,
 			default: 0
+		},
+		placeholders: {
+			type: Array,
+			default: () => []
 		}
 	},
 	emits: [
 		"rearrangeItems",
-		"newItem"
+		"newItem",
+		"gridHeight"
 	],
 	data() {
 		return {
@@ -108,6 +113,9 @@ export default {
 				};
 			});
 		},
+		placedItems_withPlaceholders(){
+			return [...this.placedItems,...this.placeholders];
+		},
 		showEmptyTileHover() {
 			if (!this.active || !this.grid || this.mode != MODE_IDLE || this.x < 0 || this.y < 0 || this.x >= this.cols || this.y >= this.rows)
 				return false;
@@ -122,6 +130,9 @@ export default {
 		cols() {
 			this.dragCancel();
 		},
+	    rows(value){
+			this.$emit('gridHeight',value);
+		}, 
 		indexedItems: {
 			handler(value) {
 				this.dragCancel();
@@ -333,6 +344,7 @@ export default {
 	<div
 		ref="container"
 		class="drop-grid position-relative h-0"
+		:class="{'empty-tile-background':active}"
 		:style="gridStyle"
 		@touchmove="dragOver"
 		@touchend="dragCancel"
@@ -341,7 +353,7 @@ export default {
 		@mousemove="updateCursor"
 		@mouseleave="mouseLeave">
 		<grid-item
-			v-for="item in placedItems"
+			v-for="item in (mode == 0 && active? placedItems_withPlaceholders : placedItems)"
 			:key="item.id"
 			:item="item"
 			@start-move="startMove"
@@ -357,21 +369,26 @@ export default {
 				height: 'calc(' + item.h + ' * var(--fhc-dg-row-height))'
 			}">
 			<template v-slot="item">
-				<slot v-bind="item.data"></slot>
+				<slot v-bind="item.data" v-bind="item" :x="item.x" :y="item.y" ></slot>
 			</template>
 		</grid-item>
-		<div
-			v-if="showEmptyTileHover"
-			class="position-absolute d-flex justify-content-center align-items-center"
-			:style="{
-				cursor: 'pointer',
-				top: 'calc(' + y + ' * var(--fhc-dg-row-height))',
-				left: 'calc(' + x + ' * var(--fhc-dg-col-width))',
-				width: 'var(--fhc-dg-col-width)',
-				height: 'var(--fhc-dg-row-height)'
-			}"
-			@click="emptyTileClicked">
-			<slot v-bind="{x,y}" name="empty-tile-hover"></slot>
-		</div>
+		
 	</div>`
 }
+
+/*
+OLD VERSION - ON HOVER
+<div
+	v-if="showEmptyTileHover"
+	class="position-absolute d-flex justify-content-center align-items-center"
+	:style="{
+		cursor: 'pointer',
+		top: 'calc(' + y + ' * var(--fhc-dg-row-height))',
+		left: 'calc(' + x + ' * var(--fhc-dg-col-width))',
+		width: 'var(--fhc-dg-col-width)',
+		height: 'var(--fhc-dg-row-height)'
+	}"
+	@click="emptyTileClicked">
+	<slot :x="x" :y="y" name="empty-tile-hover"></slot>
+</div>
+*/
\ No newline at end of file

From 59df85b05e9ebd2d67d9a453784c11ec4265d222 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 18 Oct 2024 11:55:20 +0200
Subject: [PATCH 1313/1461] adds Zeugnisse und Documents unter dem Mein Studium
 Menu Punkt

---
 system/dbupdate_3.4/25999_C4_Menu.php | 58 +++++++++++++++++++++------
 1 file changed, 46 insertions(+), 12 deletions(-)

diff --git a/system/dbupdate_3.4/25999_C4_Menu.php b/system/dbupdate_3.4/25999_C4_Menu.php
index c645fafa1..55b7d8185 100755
--- a/system/dbupdate_3.4/25999_C4_Menu.php
+++ b/system/dbupdate_3.4/25999_C4_Menu.php
@@ -126,6 +126,15 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					'redirect','etw',NOW(),null,null,null,TRUE,FALSE,'DASHBOARD'
 				);
 
+				-- BESTÄTIGUNGEN_ZEUGNISSE
+
+				INSERT INTO campus.tbl_content 
+				(template_kurzbz, oe_kurzbz, insertamum, insertvon, updateamum, updatevon, aktiv, menu_open, beschreibung)
+				VALUES  
+				(
+					'redirect','etw',NOW(),null,null,null,TRUE,FALSE,'BESTÄTIGUNGEN_ZEUGNISSE'
+				);
+
 				-- ##################################### CONTENTSPRACHE
 
 				-- CIS4_ROOT
@@ -206,7 +215,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					-- queries the content_id for the DOKUMENTE
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'DOKUMENTE'),
 					1,TRUE,
-					'<content><url><![CDATA[../cis.php/Cis/Documents]]></url><target><![CDATA[]]></target></content>',
+					'<content><url><![CDATA[#Dokumente]]></url><target><![CDATA[_self]]></target></content>',
 					null,null,null,null,NOW(),null,'Dokumente',null
 				);
 
@@ -295,9 +304,23 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					null,null,null,null,NOW(),null,'Dashboard',null
 				);
 
+				-- BESTÄTIGUNGEN_ZEUGNISSE
+				
+				INSERT INTO campus.tbl_contentsprache 
+				(sprache, content_id, version, sichtbar, content, reviewvon, reviewamum, updateamum, updatevon, insertamum, insertvon, titel, gesperrt_uid)
+				VALUES  
+				(
+					'German',
+					-- queries the content_id for the BESTÄTIGUNGEN_ZEUGNISSE
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'BESTÄTIGUNGEN_ZEUGNISSE'),
+					1,TRUE,
+					'<content><url><![CDATA[../cis.php/Cis/Documents]]></url><target><![CDATA[]]></target></content>',
+					null,null,null,null,NOW(),null,'Bestätigungen / Zeugnisse',null
+				);
+
 				-- ##################################### CONTENTCHILD
 
-				-- CIS4_ROOT childs
+				###### CIS4_ROOT childs
 
 				INSERT INTO campus.tbl_contentchild
 				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
@@ -385,7 +408,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					10568, NOW(), null, null, null, 8
 				);
 
-				-- Mein Studium childs
+				###### Mein Studium childs
 
 				INSERT INTO campus.tbl_contentchild
 				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
@@ -420,6 +443,17 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					NOW(), null, null, null, 3
 				);
 
+				INSERT INTO campus.tbl_contentchild
+				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
+				VALUES
+				(
+					-- queries the content_id for the MEIN_STUDIUM
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'MEIN_STUDIUM'),
+					-- queries the content_id for the BESTÄTIGUNGEN_ZEUGNISSE
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'BESTÄTIGUNGEN_ZEUGNISSE'),
+					NOW(), null, null, null, 4
+				);
+				
 				INSERT INTO campus.tbl_contentchild
 				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
 				VALUES
@@ -427,10 +461,10 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					-- queries the content_id for the MEIN_STUDIUM
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'MEIN_STUDIUM'),
 					-- 10795 is the content_id for Studierendenstatus
-					10795, NOW(), null, null, null, 4
+					10795, NOW(), null, null, null, 5
 				);
 
-				-- VPN_STUDIERENDE childs
+				###### VPN_STUDIERENDE childs
 
 				INSERT INTO campus.tbl_contentchild
 				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
@@ -452,7 +486,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					10884, NOW(), null, null, null, 2
 				);
 
-				-- Profil childs
+				###### Profil childs
 
 				INSERT INTO campus.tbl_contentchild
 				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
@@ -464,7 +498,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					7358, NOW(), null, null, null, 1
 				);
 
-				-- News childs
+				###### News childs
 
 				INSERT INTO campus.tbl_contentchild
 				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
@@ -476,7 +510,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					6748, NOW(), null, null, null, 1
 				);
 
-				-- Dokumente childs
+				###### Dokumente childs
 
 				INSERT INTO campus.tbl_contentchild
 				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
@@ -530,7 +564,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					NOW(), null, null, null, 5
 				);
 
-				-- Studienbetrieb childs
+				###### Studienbetrieb childs
 
 				INSERT INTO campus.tbl_contentchild
 				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
@@ -692,7 +726,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					7261, NOW(), null, null, null, 16
 				);
 
-				-- Vorlagen childs
+				###### Vorlagen childs
 
 				INSERT INTO campus.tbl_contentchild
 				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
@@ -704,7 +738,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					7243, NOW(), null, null, null, 1
 				);
 
-				-- TLC childs
+				###### TLC childs
 
 				INSERT INTO campus.tbl_contentchild
 				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
@@ -718,7 +752,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 				";
 
 
-			// Execute query and ROLLBACK on error or COMMIT
+			// Execute query, COMMIT on success and ROLLBACK on error
 
 			if (!$db->db_query($qry)) 
 			{

From 8ba370d3a79328c6d19697258a2e6cfe5a7d3677 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 18 Oct 2024 11:58:14 +0200
Subject: [PATCH 1314/1461] makes the active menu punkt bold instead of
 underlined

---
 public/js/components/Cis/Menu/Entry.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Cis/Menu/Entry.js b/public/js/components/Cis/Menu/Entry.js
index aafe19521..e6950fbad 100755
--- a/public/js/components/Cis/Menu/Entry.js
+++ b/public/js/components/Cis/Menu/Entry.js
@@ -205,7 +205,7 @@ export default {
                     :class="{
                         'btn btn-default rounded-0 text-start': true,
                         ['btn-level-' + level]: true,
-						'text-decoration-underline':active
+						'fw-bold':active
                     }">
                     {{ entry.titel }}
                 </a>
@@ -228,7 +228,7 @@ export default {
             :class="{
                 'btn btn-default rounded-0 w-100 text-start': true,
                 ['btn-level-' + level]: true,
-				'text-decoration-underline':active
+				'fw-bold':active
             }">
             {{ entry.titel }}
         </a>

From 501784aba1eed510f94b78e8046407d14309d1e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Fri, 18 Oct 2024 14:24:16 +0200
Subject: [PATCH 1315/1461] =?UTF-8?q?Zus=C3=A4tzliche=20Reihungsteststufen?=
 =?UTF-8?q?=20hinzugef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vilesci/stammdaten/reihungstestverwaltung.php | 74 ++++++++++---------
 1 file changed, 38 insertions(+), 36 deletions(-)

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

From 7ce426abc294efc4ba1092272918b2fcfeedc77c Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Fri, 18 Oct 2024 15:14:13 +0200
Subject: [PATCH 1316/1461] tooltip css fix; added missing phrase;

---
 system/phrasesupdate.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index b260d728c..61f1c5f83 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -28198,6 +28198,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'allowedEntschuldigungFileTypes',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Erlaubte Dateitypen sind .pdf, .png und .jpg.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Allowed file types are .pdf, .png und .jpg.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	//
 	// DIGITALE ANWESENHEITEN PHRASEN END
 	//

From 0775fae67de7179007cdf5fc4f4f484a8ab177c1 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 18 Oct 2024 16:49:52 +0200
Subject: [PATCH 1317/1461] remove unnecessary comment

---
 application/config/Events.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/application/config/Events.php b/application/config/Events.php
index 14eb30d3e..191a1eb98 100644
--- a/application/config/Events.php
+++ b/application/config/Events.php
@@ -3,8 +3,6 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 use CI3_Events as Events;
 
-// build the menu for fhc 
-
 /**
  * NOTE(chris): example:
 	Events::on('stv_conf_student', function (&$res) {

From cf77a60b352dde6771c4354f09208049e4fb72da Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 18 Oct 2024 16:57:03 +0200
Subject: [PATCH 1318/1461] remove application/controllers/components/Antrag/*
 since not present in master any more

---
 .../components/Antrag/Abmeldung.php           | 218 ----------
 .../controllers/components/Antrag/Leitung.php | 389 ------------------
 .../components/Antrag/Wiederholung.php        | 371 -----------------
 3 files changed, 978 deletions(-)
 delete mode 100644 application/controllers/components/Antrag/Abmeldung.php
 delete mode 100644 application/controllers/components/Antrag/Leitung.php
 delete mode 100644 application/controllers/components/Antrag/Wiederholung.php

diff --git a/application/controllers/components/Antrag/Abmeldung.php b/application/controllers/components/Antrag/Abmeldung.php
deleted file mode 100644
index f30de6803..000000000
--- a/application/controllers/components/Antrag/Abmeldung.php
+++ /dev/null
@@ -1,218 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use \Studierendenantrag_model as Studierendenantrag_model;
-
-/**
- *
- */
-class Abmeldung extends FHC_Controller
-{
-
-	/**
-	 * Calls the parent's constructor and loads the FilterCmptLib
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-
-		// Libraries
-		$this->load->library('AuthLib');
-		$this->load->library('AntragLib');
-
-		// Load language phrases
-		$this->loadPhrases([
-			'studierendenantrag'
-		]);
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * Retrieves data of the current studiengang for the current user
-	 */
-
-	public function getDetailsForNewAntrag($prestudent_id)
-	{
-		if (!$this->antraglib->isEntitledToCreateAntragFor($prestudent_id, true)) {
-			$this->output->set_status_header(403);
-			return $this->outputJsonError('Forbidden');
-		}
-		$result = $this->antraglib->getPrestudentAbmeldeBerechtigt($prestudent_id);
-		if (isError($result)) {
-			$this->output->set_status_header(500);
-			return $this->outputJsonError(getError($result));
-		}
-		$result = $result->retval;
-		if (!$result) {
-			$this->output->set_status_header(403);
-			return $this->outputJsonError($this->p->t('studierendenantrag', 'error_no_student'));
-		}
-		elseif ($result == -3)
-		{
-			$this->output->set_status_header(403);
-			return $this->outputJsonError($this->p->t('studierendenantrag', 'error_stg_blacklist'));
-		}
-		elseif ($result == -1)
-		{
-			$result = $this->antraglib->getDetailsForLastAntrag(
-                $prestudent_id,
-                [
-                    Studierendenantrag_model::TYP_ABMELDUNG,
-                    Studierendenantrag_model::TYP_ABMELDUNG_STGL
-                ]
-            );
-			if (isError($result)) {
-				return $this->outputJsonError(getError($result));
-			}
-
-			$data = getData($result);
-			
-			$data->canCancel = (
-				$data->status == Studierendenantragstatus_model::STATUS_CREATED &&
-				$this->antraglib->isEntitledToCancelAntrag($data->studierendenantrag_id)
-			);
-
-			return $this->outputJsonSuccess($data);
-		}
-
-		$result = $this->antraglib->getDetailsForNewAntrag($prestudent_id);
-		if (isError($result)) {
-			return $this->outputJsonError(getError($result));
-		}
-
-		$this->outputJsonSuccess(getData($result));
-	}
-
-	public function getDetailsForAntrag($studierendenantrag_id)
-	{
-		if (!$this->antraglib->isEntitledToShowAntrag($studierendenantrag_id))	return show_404();
-
-		$result = $this->antraglib->getDetailsForAntrag($studierendenantrag_id);
-		if (isError($result)) {
-			return $this->outputJsonError(getError($result));
-		}
-
-		$data = getData($result);
-
-		if ($data->typ !== Studierendenantrag_model::TYP_ABMELDUNG_STGL && $data->typ !== Studierendenantrag_model::TYP_ABMELDUNG)
-			return show_404();
-
-		$data->canCancel = (
-			$data->status == Studierendenantragstatus_model::STATUS_CREATED &&
-			$this->antraglib->isEntitledToCancelAntrag($data->studierendenantrag_id)
-		);
-
-		$this->outputJsonSuccess($data);
-	}
-
-	public function createAntrag()
-	{
-		$this->load->library('form_validation');
-
-		$_POST = json_decode($this->input->raw_input_stream, true);
-
-		$this->form_validation->set_rules('studiensemester', 'Studiensemester', 'required');
-		$this->form_validation->set_rules('prestudent_id', 'Prestudent ID', 'required');
-		$this->form_validation->set_rules('grund', 'Grund', 'required');
-
-		if ($this->form_validation->run() == false)
-		{
-			return $this->outputJsonError($this->form_validation->error_array());
-		}
-
-		$grund = $this->input->post('grund');
-		$studiensemester = $this->input->post('studiensemester');
-		$prestudent_id = $this->input->post('prestudent_id');
-
-		$result = $this->antraglib->getPrestudentAbmeldeBerechtigt($prestudent_id);
-		if (isError($result)) {
-			return $this->outputJsonError(['db' => getError($result)]);
-		}
-		$result = $result->retval;
-		if (!$result)
-		{
-			return $this->outputJsonError(['db' => $this->p->t('studierendenantrag', 'error_no_student')]);
-		}
-		elseif ($result == -3)
-		{
-			return $this->outputJsonError(['db' => $this->p->t('studierendenantrag', 'error_stg_blacklist')]);
-		}
-		elseif ($result < 0)
-		{
-			return $this->outputJsonError(['db' => $this->p->t('studierendenantrag', 'error_antrag_exists')]);
-		}
-
-		$result = $this->antraglib->createAbmeldung($prestudent_id, $studiensemester, getAuthUID(), $grund);
-		if (isError($result))
-		{
-			return $this->outputJsonError(['db' => getError($result)]);
-		}
-
-		$result = $this->antraglib->getDetailsForAntrag(getData($result));
-		if (!hasData($result))
-		return $this->outputJsonSuccess(true);
-
-		$data = getData($result);
-		$data->canCancel = (boolean)$this->antraglib->isEntitledToCancelAntrag($data->studierendenantrag_id);
-
-		$this->outputJsonSuccess($data);
-	}
-
-	public function cancelAntrag()
-	{
-		$this->load->library('form_validation');
-
-		$_POST = json_decode($this->input->raw_input_stream, true);
-
-		$this->form_validation->set_rules('antrag_id', 'Antrag ID', 'required');
-
-		if ($this->form_validation->run() == false)
-		{
-			return $this->outputJsonError($this->form_validation->error_array());
-		}
-
-		$antrag_id = $this->input->post('antrag_id');
-		if(!$this->antraglib->isEntitledToCancelAntrag($antrag_id))
-		{
-			$this->output->set_status_header(403);
-
-			return $this->outputJsonError('Forbidden');
-		}
-
-		$result = $this->antraglib->cancelAntrag($antrag_id, getAuthUID());
-		if(isError($result))
-		{
-			return $this->outputJsonError(['db' => getError($result)]);
-		}
-
-		$result = $this->antraglib->getDetailsForAntrag($antrag_id);
-
-		if (!hasData($result))
-			return $this->outputJsonSuccess($antrag_id);
-		$this->outputJsonSuccess(getData($result));
-	}
-
-	public function getStudiengaengeAssistenz()
-	{
-		$this->load->library('PermissionLib');
-
-		$_POST = json_decode($this->input->raw_input_stream, true);
-		$query = $this->input->post('query');
-
-		$studiengaenge = $this->permissionlib->getSTG_isEntitledFor('student/studierendenantrag');
-
-		$result = $this->antraglib->getAktivePrestudentenInStgs($studiengaenge, $query);
-		if (isError($result)) {
-			return $this->outputJsonError(getError($result));
-		}
-		$result = getData($result);
-		if (!$result) {
-			return $this->outputJsonSuccess([]);
-		}
-
-		return $this->outputJsonSuccess($result);
-	}
-}
diff --git a/application/controllers/components/Antrag/Leitung.php b/application/controllers/components/Antrag/Leitung.php
deleted file mode 100644
index 8d333d5b8..000000000
--- a/application/controllers/components/Antrag/Leitung.php
+++ /dev/null
@@ -1,389 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use \stdClass as stdClass;
-
-/**
- *
- */
-class Leitung extends FHC_Controller
-{
-
-	/**
-	 * Calls the parent's constructor and loads the FilterCmptLib
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-
-		// Libraries
-		$this->load->library('AuthLib');
-		$this->load->library('AntragLib');
-
-		// Load language phrases
-		$this->loadPhrases([
-			'studierendenantrag'
-		]);
-	}
-
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	public function getActiveStgs()
-	{
-		$studiengaenge = $this->permissionlib->getSTG_isEntitledFor('student/antragfreigabe') ?: [];
-		$studiengaenge = array_merge($studiengaenge, $this->permissionlib->getSTG_isEntitledFor('student/studierendenantrag') ?: []);
-		
-		$result = $this->StudierendenantragModel->loadStgsWithAntraege($studiengaenge);
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-		}
-		$this->outputJson($result);
-	}
-
-	public function getAntraege($studiengang = null, $extra = null)
-	{
-		if ($studiengang && $studiengang == 'todo') {
-			$studiengang = $extra;
-			$extra = true;
-		} else {
-			$extra = false;
-		}
-
-		if ($studiengang) {
-			$studiengaenge = [$studiengang];
-		} else {
-			$studiengaenge =$this->permissionlib->getSTG_isEntitledFor('student/antragfreigabe');
-			if(!is_array($studiengaenge))
-				$studiengaenge = [];
-
-
-			$stgsNeuanlage = $this->permissionlib->getSTG_isEntitledFor('student/studierendenantrag');
-			if(!is_array($stgsNeuanlage))
-				$stgsNeuanlage = [];
-
-			$studiengaenge = array_unique(array_merge($studiengaenge, $stgsNeuanlage));
-		}
-
-
-		$antraege = [];
-		if ($studiengaenge) {
-			$result = $extra
-				? $this->StudierendenantragModel->loadActiveForStudiengaenge($studiengaenge)
-				: $this->StudierendenantragModel->loadForStudiengaenge($studiengaenge);
-			if (isError($result)) {
-				$this->output->set_status_header(500);
-				return $this->outputJson('Internal Server Error');
-			}
-			if(hasData($result))
-			{
-			    $antraege = getData($result);
-			}
-		}
-
-		$this->outputJson($antraege);
-	}
-
-	public function reopenAntrag()
-	{
-		$this->load->library('form_validation');
-
-		$_POST = json_decode($this->input->raw_input_stream, true);
-
-		$this->form_validation->set_rules(
-			'studierendenantrag_id',
-			'Studierenden Antrag',
-			'required|callback_isEntitledToReopenAntrag',
-			[
-				'isEntitledToReopenAntrag' => $this->p->t('studierendenantrag', 'error_no_right')
-			]
-		);
-
-		if ($this->form_validation->run() == false)
-		{
-			return $this->outputJsonError($this->form_validation->error_array());
-		}
-
-		$studierendenantrag_id = $this->input->post('studierendenantrag_id');
-
-		$result = $this->antraglib->reopenWiederholung($studierendenantrag_id, getAuthUID());
-
-		if (isError($result))
-			return $this->outputJsonError(['studierendenantrag_id' => getError($result)]);
-
-		$this->outputJsonSuccess($studierendenantrag_id);
-	}
-
-	public function objectAntrag()
-	{
-		$this->load->library('form_validation');
-
-		$_POST = json_decode($this->input->raw_input_stream, true);
-
-		$this->form_validation->set_rules(
-			'studierendenantrag_id',
-			'Studierenden Antrag',
-			'required|callback_isEntitledToObjectAntrag|callback_canBeObjected',
-			[
-				'isEntitledToObjectAntrag' => $this->p->t('studierendenantrag', 'error_no_right'),
-				'canBeObjected' => $this->p->t('studierendenantrag', 'error_no_objection')
-			]
-		);
-
-		if ($this->form_validation->run() == false)
-		{
-			return $this->outputJsonError($this->form_validation->error_array());
-		}
-
-		$studierendenantrag_id = $this->input->post('studierendenantrag_id');
-
-		$result = $this->antraglib->objectAbmeldung($studierendenantrag_id, getAuthUID());
-
-		if (isError($result))
-			return $this->outputJsonError(['studierendenantrag_id' => getError($result)]);
-
-		$this->outputJsonSuccess($studierendenantrag_id);
-	}
-
-	public function objectionDeny()
-	{
-		$this->load->library('form_validation');
-
-		$_POST = json_decode($this->input->raw_input_stream, true);
-
-		$this->form_validation->set_rules(
-			'studierendenantrag_id',
-			'Studierenden Antrag',
-			'required|callback_isEntitledToObjectAntrag|callback_isObjected',
-			[
-				'isEntitledToObjectAntrag' => $this->p->t('studierendenantrag', 'error_no_right'),
-				'isObjected' => $this->p->t('studierendenantrag', 'error_not_objected')
-			]
-		);
-
-		if ($this->form_validation->run() == false)
-		{
-			return $this->outputJsonError($this->form_validation->error_array());
-		}
-
-		$studierendenantrag_id = $this->input->post('studierendenantrag_id');
-		$grund = $this->input->post('grund');
-
-		$result = $this->antraglib->denyObjectionAbmeldung($studierendenantrag_id, getAuthUID(), $grund);
-
-		if (isError($result))
-			return $this->outputJsonError(['studierendenantrag_id' => getError($result)]);
-
-		$this->outputJsonSuccess($studierendenantrag_id);
-	}
-
-	public function objectionApprove()
-	{
-		$this->load->library('form_validation');
-
-		$_POST = json_decode($this->input->raw_input_stream, true);
-
-		$this->form_validation->set_rules(
-			'studierendenantrag_id',
-			'Studierenden Antrag',
-			'required|callback_isEntitledToObjectAntrag|callback_isObjected',
-			[
-				'isEntitledToObjectAntrag' => $this->p->t('studierendenantrag', 'error_no_right'),
-				'isObjected' => $this->p->t('studierendenantrag', 'error_not_objected')
-			]
-		);
-
-		if ($this->form_validation->run() == false)
-		{
-			return $this->outputJsonError($this->form_validation->error_array());
-		}
-
-		$studierendenantrag_id = $this->input->post('studierendenantrag_id');
-
-		$result = $this->antraglib->cancelAntrag($studierendenantrag_id, getAuthUID());
-
-		if (isError($result))
-			return $this->outputJsonError(['studierendenantrag_id' => getError($result)]);
-
-		$this->outputJsonSuccess($studierendenantrag_id);
-	}
-
-	public function isEntitledToReopenAntrag($studierendenantrag_id)
-	{
-		return $this->antraglib->isEntitledToReopenAntrag($studierendenantrag_id);
-	}
-
-	public function isEntitledToObjectAntrag($studierendenantrag_id)
-	{
-		return $this->antraglib->isEntitledToObjectAntrag($studierendenantrag_id);
-	}
-
-	public function isEntitledToRejectAntrag($studierendenantrag_id)
-	{
-		return $this->antraglib->isEntitledToRejectAntrag($studierendenantrag_id);
-	}
-
-	public function canBeObjected($studierendenantrag_id)
-	{
-		return $this->antraglib->hasType($studierendenantrag_id, Studierendenantrag_model::TYP_ABMELDUNG_STGL);
-	}
-
-	public function isObjected($studierendenantrag_id)
-	{
-		return $this->antraglib->hasStatus($studierendenantrag_id, Studierendenantragstatus_model::STATUS_OBJECTED);
-	}
-
-
-	public function approveAbmeldung()
-	{
-		$this->load->library('form_validation');
-
-		$_POST = json_decode($this->input->raw_input_stream, true);
-
-		$this->form_validation->set_rules(
-			'studierendenantrag_id',
-			'Studierenden Antrag',
-			'required|callback_isEntitledToApproveAntrag',
-			[
-				'isEntitledToApproveAntrag' => $this->p->t('studierendenantrag', 'error_no_right')
-			]
-		);
-
-		if ($this->form_validation->run() == false)
-		{
-			return $this->outputJsonError($this->form_validation->error_array());
-		}
-
-		$studierendenantrag_id = $this->input->post('studierendenantrag_id');
-
-		$result = $this->antraglib->approveAbmeldung([$studierendenantrag_id], getAuthUID());
-		if (isError($result))
-		{
-			return $this->outputJsonError(['db' => getError($result)]);
-		}
-
-		return $this->outputJsonSuccess($studierendenantrag_id);
-	}
-
-	public function approveAbmeldungStgl()
-	{
-		return $this->approveAbmeldung();
-	}
-
-	public function approveUnterbrechung()
-	{
-		$this->load->library('form_validation');
-
-		$_POST = json_decode($this->input->raw_input_stream, true);
-
-		$this->form_validation->set_rules(
-			'studierendenantrag_id',
-			'Studierenden Antrag',
-			'required|callback_isEntitledToApproveAntrag',
-			[
-				'isEntitledToApproveAntrag' => $this->p->t('studierendenantrag', 'error_no_right')
-			]
-		);
-
-		if ($this->form_validation->run() == false)
-		{
-			return $this->outputJsonError($this->form_validation->error_array());
-		}
-
-		$studierendenantrag_id = $this->input->post('studierendenantrag_id');
-
-		$result = $this->antraglib->approveUnterbrechung([$studierendenantrag_id], getAuthUID());
-		if (isError($result))
-		{
-			return $this->outputJsonError(['db' => getError($result)]);
-		}
-
-		return $this->outputJsonSuccess($studierendenantrag_id);
-	}
-
-	public function rejectUnterbrechung()
-	{
-		$this->load->library('form_validation');
-
-		$_POST = json_decode($this->input->raw_input_stream, true);
-
-		$this->form_validation->set_rules(
-			'studierendenantrag_id',
-			'Studierenden Antrag',
-			'required|callback_isEntitledToRejectAntrag',
-			[
-				'isEntitledToRejectAntrag' => $this->p->t('studierendenantrag', 'error_no_right')
-			]
-		);
-		$this->form_validation->set_rules('grund', 'Grund', 'required');
-
-		if ($this->form_validation->run() == false)
-		{
-			return $this->outputJsonError($this->form_validation->error_array());
-		}
-
-		$studierendenantrag_id = $this->input->post('studierendenantrag_id');
-		$grund = $this->input->post('grund');
-
-		$result = $this->antraglib->rejectUnterbrechung([$studierendenantrag_id], getAuthUID(), $grund);
-		if (isError($result))
-		{
-			return $this->outputJsonError(['db' => getError($result)]);
-		}
-
-		return $this->outputJsonSuccess($studierendenantrag_id);
-	}
-
-	public function approveWiederholung()
-	{
-		$this->load->library('form_validation');
-
-		$_POST = json_decode($this->input->raw_input_stream, true);
-
-		$this->form_validation->set_rules(
-			'studierendenantrag_id',
-			'Studierenden Antrag',
-			'required|callback_isEntitledToApproveAntrag',
-			[
-				'isEntitledToApproveAntrag' => $this->p->t('studierendenantrag', 'error_no_right')
-			]
-		);
-
-		if ($this->form_validation->run() == false)
-		{
-			return $this->outputJsonError($this->form_validation->error_array());
-		}
-
-		$studierendenantrag_id = $this->input->post('studierendenantrag_id');
-
-		$result = $this->antraglib->approveWiederholung($studierendenantrag_id, getAuthUID());
-		if (isError($result))
-		{
-			return $this->outputJsonError(['db' => getError($result)]);
-		}
-
-		return $this->outputJsonSuccess($studierendenantrag_id);
-	}
-
-	public function isEntitledToApproveAntrag($studierendenantrag_id)
-	{
-		return $this->antraglib->isEntitledToApproveAntrag($studierendenantrag_id);
-	}
-
-	public function getHistory($studierendenantrag_id)
-	{
-		if (!$this->antraglib->isEntitledToSeeHistoryForAntrag($studierendenantrag_id)) {
-			$this->output->set_status_header(403);
-			return $this->outputJson('Forbidden');
-		}
-
-		$result = $this->antraglib->getAntragHistory($studierendenantrag_id);
-		if (isError($result)) {
-			return $this->outputJsonError(getError($result));
-		}
-
-		$this->outputJsonSuccess(getData($result) ?: []);
-	}
-}
diff --git a/application/controllers/components/Antrag/Wiederholung.php b/application/controllers/components/Antrag/Wiederholung.php
deleted file mode 100644
index 418d05f45..000000000
--- a/application/controllers/components/Antrag/Wiederholung.php
+++ /dev/null
@@ -1,371 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use \REST_Controller as REST_Controller;
-
-/**
- *
- */
-class Wiederholung extends FHC_Controller
-{
-
-	/**
-	 * Calls the parent's constructor and loads the FilterCmptLib
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-
-		// Configs
-		$this->load->config('studierendenantrag');
-
-		// Libraries
-		$this->load->library('AuthLib');
-		$this->load->library('PermissionLib');
-		$this->load->library('AntragLib');
-
-		$requiredPermissions = [
-			'saveLvs' => ['student/studierendenantrag:w'],
-			'getLvsAsRdf' => ['student/studierendenantrag:r', 'student/noten:r'],
-			'moveLvsToZeugnis' => ['student/studierendenantrag:w', 'student/noten:w']
-		];
-
-		if (isset($requiredPermissions[$this->router->method])) {
-			if (!$this->permissionlib->isEntitled($requiredPermissions, $this->router->method)) {
-				$this->output->set_status_header(REST_Controller::HTTP_FORBIDDEN);
-				$this->outputJson('Forbidden');
-				exit;
-			}
-		}
-
-		// Load language phrases
-		$this->loadPhrases([
-			'global',
-			'studierendenantrag'
-		]);
-	}
-
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * Retrieves data of the current studiengang for the current user
-	 */
-
-	public function getDetailsForNewAntrag($prestudent_id)
-	{
-		if (!$this->antraglib->isEntitledToCreateAntragFor($prestudent_id, false)) {
-			$this->output->set_status_header(REST_Controller::HTTP_FORBIDDEN);
-			return $this->outputJsonError('Forbidden');
-		}
-		$result = $this->antraglib->getPrestudentWiederholungsBerechtigt($prestudent_id);
-		if (isError($result)) {
-			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
-			return $this->outputJsonError(getError($result));
-		}
-		$result = $result->retval;
-		if (!$result) {
-			$this->output->set_status_header(REST_Controller::HTTP_FORBIDDEN);
-			return $this->outputJsonError($this->p->t('studierendenantrag', 'error_no_student_no_failed_exam'));
-		}
-		elseif ($result == -1)
-		{
-			$result = $this->antraglib->getDetailsForLastAntrag($prestudent_id, Studierendenantrag_model::TYP_WIEDERHOLUNG);
-			if (isError($result)) {
-				return $this->outputJsonError(getError($result));
-			}
-			$data = getData($result);
-
-			$result = $this->antraglib->getFailedExamForPrestudent($prestudent_id, $data->datum, $data->studiensemester_kurzbz);
-			// NOTE(chris): error handling for this function should already happenden in antraglib->getPrestudentWiederholungsBerechtigt()
-			$pruefungsdata = current(getData($result));
-
-			$data->studiensemester_kurzbz = $pruefungsdata->studiensemester_kurzbz;
-			$data->lvbezeichnung = $pruefungsdata->lvbezeichnung;
-			$data->pruefungsdatum = $pruefungsdata->datum;
-
-			return $this->outputJsonSuccess($data);
-		}
-		elseif ($result == -2)
-		{
-			$result = $this->antraglib->getDetailsForLastAntrag($prestudent_id);
-			if (isError($result)) {
-				return $this->outputJsonError(getError($result));
-			}
-
-			$result = getData($result);
-			$this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST);
-			return $this->outputJsonError($this->p->t('studierendenantrag', 'error_antrag_pending', [
-                'typ' => $this->p->t('studierendenantrag', 'antrag_typ_' . $result->typ)
-            ]));
-		}
-		elseif ($result == -3)
-		{
-			$this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST);
-			return $this->outputJsonError($this->p->t('studierendenantrag', 'error_stg_blacklist'));
-		}
-
-		$result = $this->antraglib->getDetailsForNewAntrag($prestudent_id);
-		if (isError($result)) {
-			return $this->outputJsonError(getError($result));
-		}
-
-		$data = getData($result);
-
-		$result = $this->antraglib->getFailedExamForPrestudent($prestudent_id);
-		// NOTE(chris): error handling for this function should already happenden in antraglib->getPrestudentWiederholungsBerechtigt()
-		$pruefungsdata = current(getData($result));
-
-		$data->studiensemester_kurzbz = $pruefungsdata->studiensemester_kurzbz;
-		$data->lvbezeichnung = $pruefungsdata->lvbezeichnung;
-		$data->pruefungsdatum = $pruefungsdata->datum;
-
-		$this->outputJsonSuccess($data);
-	}
-
-	public function createAntrag()
-	{
-		$this->createAntragWithStatus(true);
-	}
-
-	public function cancelAntrag()
-	{
-		$this->createAntragWithStatus(false);
-	}
-
-	protected function createAntragWithStatus($repeat)
-	{
-		$this->load->library('form_validation');
-
-		$_POST = json_decode($this->input->raw_input_stream, true);
-
-		$this->form_validation->set_rules('prestudent_id', 'Prestudent ID', 'required');
-		$this->form_validation->set_rules('studiensemester', 'Studiensemester', 'required');
-
-		if ($this->form_validation->run() == false)
-		{
-			return $this->outputJsonError($this->form_validation->error_array());
-		}
-
-		$prestudent_id = $this->input->post('prestudent_id');
-		$studiensemester = $this->input->post('studiensemester');
-
-		$result = $this->antraglib->getPrestudentWiederholungsBerechtigt($prestudent_id);
-		if (isError($result)) {
-			return $this->outputJsonError(['db' => getError($result)]);
-		}
-		$result = $result->retval;
-		if (!$result)
-		{
-			return $this->outputJsonError(['db' => $this->p->t('studierendenantrag', 'error_no_student')]);
-		}
-		elseif ($result == -2)
-		{
-			return $this->outputJsonError(['db' => $this->p->t('studierendenantrag', 'error_antrag_exists')]);
-		}
-		elseif ($result == -3)
-		{
-			return $this->outputJsonError(['db' => $this->p->t('studierendenantrag', 'error_stg_blacklist')]);
-		}
-
-		$result = $this->antraglib->createWiederholung($prestudent_id, $studiensemester, getAuthUID(), $repeat);
-		if(isError($result))
-		{
-			return $this->outputJsonError(['db' => getError($result)]);
-		}
-
-		$antragId = getData($result);
-		$result = $this->antraglib->getDetailsForAntrag($antragId);
-
-		if(!hasData($result))
-			return $this->outputJsonSuccess(true);
-
-		$data = getData($result);
-
-		$result = $this->antraglib->getFailedExamForPrestudent($prestudent_id);
-		// NOTE(chris): error handling for this function should already happenden in antraglib->getPrestudentWiederholungsBerechtigt()
-		$pruefungsdata = current(getData($result));
-
-		$data->studiensemester_kurzbz = $pruefungsdata->studiensemester_kurzbz;
-		$data->lvbezeichnung = $pruefungsdata->lvbezeichnung;
-		$data->pruefungsdatum = $pruefungsdata->datum;
-
-		$this->outputJsonSuccess($data);
-	}
-
-
-	public function getLvs($antrag_id)
-	{
-		$result = $this->antraglib->getLvsForAntrag($antrag_id);
-		if (isError($result)) {
-			$error = getError($result);
-			if ($error == 'Forbidden')
-				$this->output->set_status_header(REST_Controller::HTTP_FORBIDDEN);
-			return $this->outputJsonError(getError($result));
-		}
-		$lvs = getData($result);
-
-		$this->outputJsonSuccess($lvs);
-	}
-
-	public function saveLvs()
-	{
-		$result = $this->getPostJSON();
-		$antragsLvs = array_merge($result->forbiddenLvs, $result->mandatoryLvs);
-
-		$insert = array_map(function ($lv) {
-			return [
-				'studierendenantrag_id' => $lv->studierendenantrag_id,
-				'lehrveranstaltung_id' => $lv->lehrveranstaltung_id,
-				'note' => $lv->zugelassen
-                    ? ($lv->zugelassen == 1 ? 0 : $this->config->item('wiederholung_note_angerechnet'))
-                    : $this->config->item('wiederholung_note_nicht_zugelassen'),
-				'anmerkung' => $lv->anmerkung,
-				'insertvon' => getAuthUID(),
-				'studiensemester_kurzbz' => $lv->studiensemester_kurzbz
-			];
-		}, $antragsLvs);
-
-		$antrag_ids = array_unique(array_map(function ($lv) {
-			return $lv['studierendenantrag_id'];
-		}, $insert));
-
-		foreach ($antrag_ids as $antrag_id) {
-			$result = $this->StudierendenantragModel->loadIdAndStatusWhere([
-				'studierendenantrag_id' => $antrag_id
-			]);
-			if (isError($result))
-				return $this->outputJsonError(getError($result));
-			if (!hasData($result))
-				return $this->outputJsonError($this->p->t('studierendenantrag', 'error_no_antrag_found', ['id' => $antrag_id]));
-			$antrag = current(getData($result));
-			if ($antrag->status != Studierendenantragstatus_model::STATUS_CREATED && $antrag->status != Studierendenantragstatus_model::STATUS_LVSASSIGNED)
-				return $this->outputJsonError($this->p->t('studierendenantrag', 'error_antrag_locked'));
-		}
-
-		if(!$antragsLvs)
-			return $this->outputJsonError($this->p->t('studierendenantrag', 'error_no_lv'));
-
-		$result = $this->antraglib->saveLvs($insert);
-
-		if (isError($result))
-			return $this->outputJsonError(getError($result));
-
-		$this->outputJsonSuccess(getData($result));
-	}
-
-	public function getLvsAsRdf($prestudent_id)
-	{
-		// header für no cache
-		$this->output->set_header("Cache-Control: no-cache");
-		$this->output->set_header("Cache-Control: post-check=0, pre-check=0", false);
-		$this->output->set_header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-		$this->output->set_header("Pragma: no-cache");
-		$this->output->set_header("Content-type: application/xhtml+xml");
-
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-		$sem_akt = $this->variablelib->getVar('semester_aktuell');
-
-
-		$result = $this->antraglib->getLvsForPrestudent($prestudent_id, $sem_akt);
-		if (isError($result)) {
-			return $this->outputJsonError(getError($result));
-		}
-
-		$lvs = getData($result) ?: [];
-		$rdf_url = 'http://www.technikum-wien.at/antragnote';
-
-		$this->load->view('lehre/Antrag/Wiederholung/getLvs.rdf.php', [
-			'url' => $rdf_url,
-			'lvs' => $lvs
-		]);
-	}
-
-	public function moveLvsToZeugnis()
-	{
-		$anzahl = $this->input->post('anzahl');
-		$student_uid = $this->input->post('student_uid');
-		$this->load->model('education/Studierendenantraglehrveranstaltung_model', 'StudierendenantraglehrveranstaltungModel');
-		$this->load->model('education/Zeugnisnote_model', 'ZeugnisnoteModel');
-
-		$errormsg = array();
-
-		for($i=0; $i<$anzahl; $i++)
-		{
-			$id = $this->input->post('studierendenantrag_lehrveranstaltung_id_' . $i);
-			$result =$this->StudierendenantraglehrveranstaltungModel->load($id);
-			if(isError($result))
-			{
-				$errormsg[] = getError($result);
-			}
-			elseif(!hasData($result))
-			{
-				$errormsg[] = $this->p->t('studierendenantrag', 'error_no_lv_in_application');
-			}
-			else
-			{
-				$antragLv = getData($result)[0];
-				$result= $this->ZeugnisnoteModel->load([
-					'lehrveranstaltung_id'=> $antragLv->lehrveranstaltung_id,
-					'student_uid'=> $student_uid,
-					'studiensemester_kurzbz' => $antragLv->studiensemester_kurzbz
-				]);
-				if(isError($result))
-				{
-					$errormsg[] = getError($result);
-				}
-				else
-				{
-					if (hasData($result))
-					{
-						$result = $this->ZeugnisnoteModel->update(
-							[
-								'lehrveranstaltung_id'=> $antragLv->lehrveranstaltung_id,
-								'student_uid'=> $student_uid,
-								'studiensemester_kurzbz' => $antragLv->studiensemester_kurzbz
-							],
-							[
-								'note'=> $antragLv->note,
-								'uebernahmedatum' => date('c'),
-								'benotungsdatum' => $antragLv->insertamum,
-								'updateamum' => date('c'),
-								'bemerkung'=>$antragLv->anmerkung,
-								'updatevon'=>getAuthUID()
-							]
-						);
-					}
-					else
-					{
-						$result = $this->ZeugnisnoteModel->insert([
-							'lehrveranstaltung_id'=> $antragLv->lehrveranstaltung_id,
-							'student_uid'=> $student_uid,
-							'studiensemester_kurzbz' => $antragLv->studiensemester_kurzbz,
-							'note'=> $antragLv->note,
-							'uebernahmedatum' => date('c'),
-							'benotungsdatum' => $antragLv->insertamum,
-							'insertamum' => date('c'),
-							'bemerkung'=>$antragLv->anmerkung,
-							'insertvon'=>getAuthUID()
-						]);
-					}
-					if(isError($result))
-					{
-						$errormsg[] = getError($result);
-					}
-				}
-			}
-		}
-
-		if($errormsg)
-			$return = false;
-		else
-			$return = true;
-
-		$this->load->view('lehre/Antrag/Wiederholung/moveLvs.rdf.php', [
-			'return' => $return,
-			'errormsg' => $errormsg
-		]);
-	}
-}

From 289c99a5a1d0abdd28dafbf4c01f71fbb64e4d78 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 18 Oct 2024 17:03:40 +0200
Subject: [PATCH 1319/1461] fix another 2 file permissions erroneously commited
 as a21a292da65580dc641de9d73451ddbc8be3f4df

---
 .../images/colorpicker/custom_submit - original.png | Bin
 .../sancho/sancho_header_TEMPLATE - Kopie.xcf       | Bin
 2 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 skin/images/colorpicker/custom_submit - original.png
 mode change 100755 => 100644 skin/images/sancho/sancho_header_TEMPLATE - Kopie.xcf

diff --git a/skin/images/colorpicker/custom_submit - original.png b/skin/images/colorpicker/custom_submit - original.png
old mode 100755
new mode 100644
diff --git a/skin/images/sancho/sancho_header_TEMPLATE - Kopie.xcf b/skin/images/sancho/sancho_header_TEMPLATE - Kopie.xcf
old mode 100755
new mode 100644

From 9cd59a1250c18ceb3051e9a54c06352b81835361 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 18 Oct 2024 17:16:12 +0200
Subject: [PATCH 1320/1461] add header version switch depending on CIS4 defined

---
 .../views/lehre/Antrag/Student/List.php       | 30 ++++++++++++++-----
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/application/views/lehre/Antrag/Student/List.php b/application/views/lehre/Antrag/Student/List.php
index c2e3060d1..6d769dafe 100644
--- a/application/views/lehre/Antrag/Student/List.php
+++ b/application/views/lehre/Antrag/Student/List.php
@@ -17,10 +17,17 @@ $sitesettings = array(
 	)
 );
 
-$this->load->view(
-	'templates/CISVUE-Header',
-	$sitesettings
-);
+if(defined('CIS4')){
+	$this->load->view(
+		'templates/CISVUE-Header',
+		$sitesettings
+	);
+}else{
+	$this->load->view(
+		'templates/FHC-Header',
+		$sitesettings
+	);
+}
 ?>
 
 <div id="wrapper">
@@ -221,7 +228,14 @@ $this->load->view(
 </div>
 
 <?php
-$this->load->view(
-	'templates/CISVUE-Footer',
-	$sitesettings
-);
+if (defined('CIS4')) {
+	$this->load->view(
+		'templates/CISVUE-Footer',
+		$sitesettings
+	);
+} else {
+	$this->load->view(
+		'templates/FHC-Footer',
+		$sitesettings
+	);
+}

From 690080035a5ea814b29fccc4d3b312e82230faeb Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 21 Oct 2024 13:05:47 +0200
Subject: [PATCH 1321/1461] fix umlauts in variable name

---
 application/controllers/Cis4.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/controllers/Cis4.php b/application/controllers/Cis4.php
index ad4b2dbf9..e2b49c388 100644
--- a/application/controllers/Cis4.php
+++ b/application/controllers/Cis4.php
@@ -28,12 +28,12 @@ class Cis4 extends FHC_Controller
 	public function index()
 	{
 		$this->load->model('person/Person_model','PersonModel');
-		$begrüsung = $this->PersonModel->getFirstName(getAuthUID());
-		if(isError($begrüsung))
+		$begruesung = $this->PersonModel->getFirstName(getAuthUID());
+		if(isError($begruesung))
 		{
 			show_error("name couldn't be loaded for username ".getAuthUID());
 		}
-		$begrüsung = getData($begrüsung);
-		$this->load->view('CisVue/Dashboard.php',["name"=> $begrüsung]);
+		$begruesung = getData($begruesung);
+		$this->load->view('CisVue/Dashboard.php',["name"=> $begruesung]);
 	}
 }

From 728e2f9b3a872edb5f5f71189bc8e1b249d364bb Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 21 Oct 2024 13:48:32 +0200
Subject: [PATCH 1322/1461] fix getStundenplanQuery query building if benutzer
 gruppen are empty;

---
 application/models/ressource/Stundenplan_model.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index e29030279..77b1619dc 100644
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -203,7 +203,7 @@ class Stundenplan_model extends DB_Model
 
 		if(count($gruppen) != 0 || count($studentlehrverbaende) != 0)
 		{
-			$query .= "AND ( ";
+			$query .= " AND ( ";
 		}
 
 		if(count($gruppen) != 0)
@@ -211,8 +211,13 @@ class Stundenplan_model extends DB_Model
 			$query .="sp.gruppe_kurzbz IN (".implode(',',$gruppen).")";
 		}
 		
-		foreach($studentlehrverbaende as $lehrverband){
-			$query .= "OR (sp.studiengang_kz = ".$this->escape($lehrverband->studiengang_kz)." AND sp.semester = ".$this->escape($lehrverband->semester)." AND sp.verband = ".$this->escape($lehrverband->verband)." AND sp.gruppe = ".$this->escape($lehrverband->gruppe).")"; 
+		foreach($studentlehrverbaende as $key=>$lehrverband){
+			// only append OR if not first entry or previous condition was added
+			if(($key == 0 && count($gruppen) != 0) || ($key > 0))
+			{
+				$query .= " OR ";
+			}
+			$query .= "(sp.studiengang_kz = ".$this->escape($lehrverband->studiengang_kz)." AND sp.semester = ".$this->escape($lehrverband->semester)." AND sp.verband = ".$this->escape($lehrverband->verband)." AND sp.gruppe = ".$this->escape($lehrverband->gruppe).")";
 		}
 		
 		if(count($gruppen) != 0 || count($studentlehrverbaende) != 0)
@@ -262,4 +267,4 @@ class Stundenplan_model extends DB_Model
 		return $this->execQuery($query, [$uid, $uid]);
 	}
 
-}
+}
\ No newline at end of file

From f3851da10d90c6775e20bf8bea9acdf0a00ecc3f Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 21 Oct 2024 16:02:54 +0200
Subject: [PATCH 1323/1461] add bootstrap class to only show fh logo in header
 on medium and greater displays; adjusted nav-user-btn css under mobile
 breakpoint to just take space of contained img and let searchbar flex growth
 apply to leftover width;

---
 application/views/templates/CISHMVC-Header.php | 5 +++--
 application/views/templates/CISHTML-Header.php | 4 ++--
 public/css/Cis4/Cis.css                        | 8 ++++----
 public/js/components/Cis/Menu.js               | 4 ++--
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/application/views/templates/CISHMVC-Header.php b/application/views/templates/CISHMVC-Header.php
index cb454d77e..f45fb47a4 100644
--- a/application/views/templates/CISHMVC-Header.php
+++ b/application/views/templates/CISHMVC-Header.php
@@ -16,7 +16,8 @@ if (!isset($menu)) {
 	<button id="nav-main-btn" class="navbar-toggler" type="button" data-bs-toggle="offcanvas" data-bs-target="#nav-main" aria-controls="nav-main" aria-expanded="false" aria-label="Toggle navigation">
 		<span class="navbar-toggler-icon"></span>
 	</button>
-	<a id="nav-logo" href="<?= site_url(''); ?>">
+
+	<a id="nav-logo" class="d-none d-md-block" href="<?= site_url(''); ?>">
 		<img src="<?= base_url('/public/images/logo-300x160.png'); ?>" alt="Logo">
 	</a>
 	<nav id="nav-main" class="offcanvas offcanvas-start bg-dark" tabindex="-1" aria-labelledby="nav-main-btn" data-bs-backdrop="false">
@@ -53,4 +54,4 @@ if (!isset($menu)) {
 	</nav>
 </header>
 
-<main id="cis-main" class="flex-grow-1 overflow-scroll p-4">
+<main id="cis-main" class="flex-grow-1 overflow-scroll p-4">
\ No newline at end of file
diff --git a/application/views/templates/CISHTML-Header.php b/application/views/templates/CISHTML-Header.php
index c3790cc95..eba22fc8f 100644
--- a/application/views/templates/CISHTML-Header.php
+++ b/application/views/templates/CISHTML-Header.php
@@ -32,7 +32,7 @@ if (!isset($menu)) {
 		<span class="navbar-toggler-icon"></span>
 	</button>
 	<fhc-searchbar id="nav-search" class=" fhc-searchbar w-100" @updatesearchtypes="updatesearchtypes" :selectedtypes="selectedtypes" :searchoptions="searchbaroptions" :searchfunction="searchfunction"></fhc-searchbar>	
-	<a id="nav-logo" href="<?= site_url(''); ?>">
+	<a id="nav-logo" class="d-none d-md-block" href="<?= site_url(''); ?>">
 		<img src="<?= base_url('/public/images/logo-300x160.png'); ?>" alt="Logo">
 	</a>
 	<nav id="nav-main" class="offcanvas offcanvas-start bg-dark" tabindex="-1" aria-labelledby="nav-main-btn" data-bs-backdrop="false">
@@ -64,4 +64,4 @@ if (!isset($menu)) {
 	</nav>
 </header>
 
-<main id="cis-main" class="flex-grow-1 overflow-scroll">
+<main id="cis-main" class="flex-grow-1 overflow-scroll">
\ No newline at end of file
diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index 87ab72d37..60a3baccd 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -352,12 +352,12 @@ html {
     position: relative;
   }
   #nav-user-btn {
-    width: 100%;
+
   }
   #nav-user-btn img {
     object-fit: cover;
-    height: 1.5rem;
-    width: 1.5rem;
+    height: 2rem;
+    width: 2rem;
   }
   #nav-user-menu {
     position: relative !important;
@@ -407,4 +407,4 @@ html {
   font-family: var(--fa-style-family, "Font Awesome 6 Free");
   font-weight: var(--fa-style, 900);
   margin-inline-start: 0.5rem;
-}
+}
\ No newline at end of file
diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js
index 8ef389c49..c226eba6a 100644
--- a/public/js/components/Cis/Menu.js
+++ b/public/js/components/Cis/Menu.js
@@ -74,7 +74,7 @@ export default {
         <span class="navbar-toggler-icon"></span>
     </button>
 	<fhc-searchbar id="nav-search" class="fhc-searchbar w-100" :searchoptions="searchbaroptions" :searchfunction="searchfunction" :selectedtypes="selectedtypes"></fhc-searchbar>
-    <a id="nav-logo" :href="rootUrl">
+    <a id="nav-logo" class="d-none d-md-block" :href="rootUrl">
         <img :src="logoUrl" alt="Logo">
     </a>
 	<button id="nav-user-btn" class="btn btn-link rounded-0" type="button" data-bs-toggle="collapse" data-bs-target="#nav-user-menu" aria-expanded="false" aria-controls="nav-user-menu">
@@ -102,4 +102,4 @@ export default {
 			</div>
 		</div>
     </nav>`
-};
+};
\ No newline at end of file

From fa0fe2a952ea99a6937b5b8781dac7d0a9ce59fe Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 22 Oct 2024 16:49:56 +0200
Subject: [PATCH 1324/1461] hide unruly option in AbmeldungStg for the moment

---
 .../js/components/Studierendenantrag/Form/AbmeldungStgl.js  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js b/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
index c804b20d1..450769362 100644
--- a/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
+++ b/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
@@ -189,8 +189,10 @@ export default {
 							</option>					
 							<option value="textLong_MissingZgv">{{$p.t('studierendenantrag', 'dropdown_MissingZgv')}}
 							</option>	
+<!--
 							<option value="textLong_unruly">{{$p.t('studierendenantrag', 'dropdown_unruly')}}
-							</option>						
+							</option>
+-->
 						</select>	
 					</div>
 					<form-input
@@ -257,4 +259,4 @@ export default {
 			</template>
 		</core-fetch-cmpt>
 	</div>`
-}
\ No newline at end of file
+}

From f59bdf812a11b76ba1b4a78e9a1285ddfeba21de Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 22 Oct 2024 17:18:02 +0200
Subject: [PATCH 1325/1461] add phrase mark_person_as_unruly

---
 system/phrasesupdate.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 90a14938f..d9a72eaac 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -23831,6 +23831,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'mark_person_as_unruly',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Person ist unruly.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Person is unruly.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'notiz',

From 4789bfab42d92c254a691f8a0854e6232bd54ed8 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 24 Oct 2024 07:57:54 +0200
Subject: [PATCH 1326/1461] add columns gehaltsbestandteil_von and
 gehaltsbestandteil_bis to hr.tbl_gehaltshistorie

---
 system/dbupdate_3.4/28260_vertraege.php | 36 +++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

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

From 2edfd1febcdf75a5550ad3b3a082dad25bdd027a Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 24 Oct 2024 11:03:28 +0200
Subject: [PATCH 1327/1461] Unterbrecher in serie problematik

---
 application/libraries/PrestudentLib.php | 31 ++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

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

From 9eb91574c36f53157313720a10df517b3b75f61b Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 24 Oct 2024 11:08:22 +0200
Subject: [PATCH 1328/1461] semester

---
 application/libraries/PrestudentLib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php
index 67d9b3450..ef5e2e3a9 100644
--- a/application/libraries/PrestudentLib.php
+++ b/application/libraries/PrestudentLib.php
@@ -281,7 +281,7 @@ class PrestudentLib
 					'prestudent_id' => $prestudent_id,
 					'status_kurzbz' => Prestudentstatus_model::STATUS_UNTERBRECHER,
 					'studiensemester_kurzbz' => $studiensemester_kurzbz,
-					'ausbildungssemester' => $semester
+					'ausbildungssemester' => current($result)->ausbildungssemester
 				], [
 					'updatevon' => $insertvon,
 					'updateamum' => date('c'),

From 32137479e9d58a293a77d387f55c95454c4c5d27 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 24 Oct 2024 15:07:08 +0200
Subject: [PATCH 1329/1461] activate email to assistenz on upload; redraw table
 in case of tabulator scroll bug; navigation.php $root var for Cis4
 preperation

---
 application/config/navigation.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/application/config/navigation.php b/application/config/navigation.php
index d57cd697a..2327513ad 100644
--- a/application/config/navigation.php
+++ b/application/config/navigation.php
@@ -1,6 +1,12 @@
 <?php
 // Header menu
 
+if(defined('CIS4') && CIS4) {
+	$root = APP_ROOT;
+} else {
+	$root = CIS_ROOT;
+}
+
 $config['navigation_header'] = array(
 	'*' => array(
 		'fhcomplete' => array(
@@ -50,7 +56,7 @@ $config['navigation_header'] = array(
 			'requiredPermissions' => 'basis/vilesci:r',
 			'children' => array(
 				'cis' => array(
-					'link' => CIS_ROOT,
+					'link' => $root,
 					'icon' => '',
 					'description' => 'CIS',
 					'sort' => 10
@@ -223,7 +229,7 @@ $config['navigation_menu']['organisation/Reihungstest/index'] = array(
 		'target' => '_blank'
 	),
 	'auswertung' => array(
-		'link' => CIS_ROOT.'/cis/testtool/admin/auswertung.php',
+		'link' => $root.'/cis/testtool/admin/auswertung.php',
 		'description' => 'Auswertung',
 		'icon' => 'list-alt',
 		'sort' => 1,
@@ -319,5 +325,4 @@ $config['navigation_menu']['system/issues/Issues/*'] = array(
 		'target' => '_blank',
 		'requiredPermissions' => array('admin:rw')
 	),
-);
-
+);
\ No newline at end of file

From e387671e09cf9899ca5092ceec77f7012ec810ed Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 24 Oct 2024 17:46:42 +0200
Subject: [PATCH 1330/1461] added set language feature; phrasen plugin with
 optional reload if non responsive phrasen are used; stundenplan header mode &
 buttons reworked

---
 application/config/navigation.php             |  13 ++++---
 application/controllers/Cis4.php              |   3 +-
 application/controllers/CisVue/Dashboard.php  |  13 +++++--
 .../controllers/api/frontend/v1/Phrasen.php   |  21 +++++++++--
 application/libraries/PhrasesLib.php          |  14 +++++++-
 application/views/templates/CISVUE-Header.php |   6 ++--
 public/css/Cis4/Cis.css                       |  33 +++++++++++++++++-
 public/images/icons/at.png                    | Bin 0 -> 1948 bytes
 public/images/icons/uk.png                    | Bin 0 -> 8723 bytes
 public/js/api/phrasen.js                      |   6 +++-
 public/js/apps/Cis.js                         |  10 ++++--
 public/js/apps/Cis/Cms.js                     |   4 +--
 public/js/apps/Cis/Documents.js               |  10 +++---
 public/js/apps/Cis/MyLv/Student.js            |   2 +-
 public/js/apps/Cis/Stundenplan.js             |   2 +-
 public/js/apps/Dashboard.js                   |   9 +++--
 public/js/apps/lehre/Antrag.js                |   4 +--
 public/js/components/Calendar/Header.js       |  30 ++++++++++------
 public/js/components/Cis/Menu.js              |  10 ++++++
 public/js/plugin/Phrasen.js                   |  18 ++++++++--
 20 files changed, 166 insertions(+), 42 deletions(-)
 create mode 100644 public/images/icons/at.png
 create mode 100644 public/images/icons/uk.png

diff --git a/application/config/navigation.php b/application/config/navigation.php
index d57cd697a..2327513ad 100644
--- a/application/config/navigation.php
+++ b/application/config/navigation.php
@@ -1,6 +1,12 @@
 <?php
 // Header menu
 
+if(defined('CIS4') && CIS4) {
+	$root = APP_ROOT;
+} else {
+	$root = CIS_ROOT;
+}
+
 $config['navigation_header'] = array(
 	'*' => array(
 		'fhcomplete' => array(
@@ -50,7 +56,7 @@ $config['navigation_header'] = array(
 			'requiredPermissions' => 'basis/vilesci:r',
 			'children' => array(
 				'cis' => array(
-					'link' => CIS_ROOT,
+					'link' => $root,
 					'icon' => '',
 					'description' => 'CIS',
 					'sort' => 10
@@ -223,7 +229,7 @@ $config['navigation_menu']['organisation/Reihungstest/index'] = array(
 		'target' => '_blank'
 	),
 	'auswertung' => array(
-		'link' => CIS_ROOT.'/cis/testtool/admin/auswertung.php',
+		'link' => $root.'/cis/testtool/admin/auswertung.php',
 		'description' => 'Auswertung',
 		'icon' => 'list-alt',
 		'sort' => 1,
@@ -319,5 +325,4 @@ $config['navigation_menu']['system/issues/Issues/*'] = array(
 		'target' => '_blank',
 		'requiredPermissions' => array('admin:rw')
 	),
-);
-
+);
\ No newline at end of file
diff --git a/application/controllers/Cis4.php b/application/controllers/Cis4.php
index e2b49c388..5b3f67403 100644
--- a/application/controllers/Cis4.php
+++ b/application/controllers/Cis4.php
@@ -34,6 +34,7 @@ class Cis4 extends FHC_Controller
 			show_error("name couldn't be loaded for username ".getAuthUID());
 		}
 		$begruesung = getData($begruesung);
+
 		$this->load->view('CisVue/Dashboard.php',["name"=> $begruesung]);
 	}
-}
+}
\ No newline at end of file
diff --git a/application/controllers/CisVue/Dashboard.php b/application/controllers/CisVue/Dashboard.php
index ec58c6735..94af6531b 100644
--- a/application/controllers/CisVue/Dashboard.php
+++ b/application/controllers/CisVue/Dashboard.php
@@ -27,6 +27,15 @@ class Dashboard extends Auth_Controller
 	 */
 	public function index()
 	{
-		$this->load->view('CisVue/Dashboard.php');
+
+		$this->load->model('person/Person_model','PersonModel');
+		$begruesung = $this->PersonModel->getFirstName(getAuthUID());
+		if(isError($begruesung))
+		{
+			show_error("name couldn't be loaded for username ".getAuthUID());
+		}
+		$begruesung = getData($begruesung);
+		$this->load->view('CisVue/Dashboard.php',["name"=> $begruesung]);
+
 	}
-}
+}
\ No newline at end of file
diff --git a/application/controllers/api/frontend/v1/Phrasen.php b/application/controllers/api/frontend/v1/Phrasen.php
index 472308d2b..317f515e0 100644
--- a/application/controllers/api/frontend/v1/Phrasen.php
+++ b/application/controllers/api/frontend/v1/Phrasen.php
@@ -28,8 +28,11 @@ class Phrasen extends FHCAPI_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'loadModule' => self::PERM_ANONYMOUS
+			'loadModule' => self::PERM_ANONYMOUS,
+			'setLanguage' => self::PERM_ANONYMOUS
 		]);
+
+		$this->load->helper('hlp_language');
 	}
 	
 	//------------------------------------------------------------------------------------------------------------------
@@ -43,4 +46,18 @@ class Phrasen extends FHCAPI_Controller
 		$this->load->library('PhrasesLib', [$module], 'pj');
 		$this->terminateWithSuccess(json_decode($this->pj->getJSON()));
 	}
-}
+
+	public function setLanguage()
+	{
+		$postParams = $this->getPostJSON();
+		$language = $postParams->language;
+		$categories = $postParams->categories;
+
+		setUserLanguage($language);
+
+		$this->load->library('PhrasesLib', array($categories, $language), 'p');
+
+		$phrases = $this->p->setPhrases($categories, $language);
+		$this->terminateWithSuccess($phrases);
+	}
+}
\ No newline at end of file
diff --git a/application/libraries/PhrasesLib.php b/application/libraries/PhrasesLib.php
index dec3d54c0..ecd8094d6 100644
--- a/application/libraries/PhrasesLib.php
+++ b/application/libraries/PhrasesLib.php
@@ -200,6 +200,17 @@ class PhrasesLib
 		return '<< PHRASE '.$phrase.' >>';
 	}
 
+	/**
+	 * Workaround to reload the phrases array on an already constructed library.
+	 * @parameters -> look for _setPhrases docs
+	 */
+	public function setPhrases($categories, $language)
+	{
+		if (count($categories) > 0) $this->_setPhrases($categories, $language);
+
+		return $this->_phrases;
+	}
+
 	// -----------------------------------------------------------------------------------------------------------------
 	// Private methods
 
@@ -319,6 +330,7 @@ class PhrasesLib
 		{
 			$this->_phrases = $phrases->retval;
 		}
+
 	}
 
 	/**
@@ -329,4 +341,4 @@ class PhrasesLib
 	{
 		return json_encode($this->_phrases);
 	}
-}
+}
\ No newline at end of file
diff --git a/application/views/templates/CISVUE-Header.php b/application/views/templates/CISVUE-Header.php
index 692d73b86..732800cea 100644
--- a/application/views/templates/CISVUE-Header.php
+++ b/application/views/templates/CISVUE-Header.php
@@ -36,11 +36,13 @@ if (!isset($menu)) {
 		logo-url="<?= base_url('/public/images/logo-300x160.png'); ?>" 
 		avatar-url="<?= site_url('Cis/Pub/bild/person/' . getAuthPersonId()); ?>" 
 		logout-url="<?= site_url('Cis/Auth/logout'); ?>"
-		:selectedtypes="selectedtypes" 
+		at-flag-url="<?= base_url('/public/images/icons/at.png'); ?>"
+		uk-flag-url="<?= base_url('/public/images/icons/uk.png'); ?>"
+		:selectedtypes="selectedtypes"
 		:searchbaroptions="searchbaroptions" 
 		:searchfunction="searchfunction"
 		:menu="<?= htmlspecialchars(json_encode(array_values($menu)), ENT_QUOTES, 'UTF-8') ?>"
 		></cis-menu>
 </header>
 
-<main id="cis-main" class="flex-grow-1 overflow-scroll p-4">
+<main id="cis-main" class="flex-grow-1 p-4">
\ No newline at end of file
diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index 60a3baccd..81e35e63e 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -218,12 +218,27 @@ html {
 	max-height: calc(100vh - var(--fhc-cis-header-height));
 }
 
+#nav-user-menu img {
+  object-fit: cover;
+  height: calc( 3 * var(--fhc-cis-header-py));
+}
+
+#fhc-languages {
+  display: flex;
+  text-align: center;
+}
+
+#fhc-languages .btn {
+  flex: 1;
+  display: flex;
+}
+
 /* desktop */
 @media (min-width: 992px) {
   body {
     display: flex;
     padding-top: var(--fhc-cis-header-height);
-    width: 100vw;
+    width: 99vw;
     /* overflow: visible !important; */
   }
   #cis-header {
@@ -310,6 +325,22 @@ html {
     min-width: var(--fhc-cis-menu-width);
     background-color: var(--fhc-cis-menu-lvl-2-bg);
   }
+
+  #nav-user-menu img {
+    object-fit: cover;
+    height: calc( 3 * var(--fhc-cis-header-py));
+  }
+
+  #fhc-languages {
+    display: flex;
+    text-align: center;
+  }
+
+  #fhc-languages .btn {
+    flex: 1;
+    display: flex;
+  }
+
   #nav-main-menu {
     height: 100%;
     background-color: var(--fhc-cis-menu-bg);
diff --git a/public/images/icons/at.png b/public/images/icons/at.png
new file mode 100644
index 0000000000000000000000000000000000000000..5fb12554a0a80ea82a926dc755ead777bcaf6a16
GIT binary patch
literal 1948
zcmeAS@N?(olHy`uVBq!ia0y~yU;;9k7&zE~)R&4Yzkn2Hfk$L90|Vb-5N14{zaj-F
zC|TkfQ4*Y=R#Ki=l*&+EUaps!mtCBkSdglhUz9%kosAR&1G}cDi(^Q|oVPbO`Z7B*
zxLk}*x&CO*jotu@NwOA9>?$v`9(3G2koV#K>V!l3XSXo|jU5s||JdVSAGcPqFc@6l
zkvl#4D+fcuy6sn)85(}FFfg!iGB9umF)#?IFfb^1FfcewU|?ua0Q$`l7_v>H3Wi8H
zJpTT<ZjBrx!x__Wwc^0oe9SZ&i^C%|zxeX~Pvl-kh8a0`ww>Mx%Ei;UM|0*dDxsEt
k{`$8XSSSw}5b;XhW{XHy=iW2Gl7@l7)78&qol`;+07L`VCIA2c

literal 0
HcmV?d00001

diff --git a/public/images/icons/uk.png b/public/images/icons/uk.png
new file mode 100644
index 0000000000000000000000000000000000000000..2357ad975e73ccab2c4770339ccafe5bf3fb8d29
GIT binary patch
literal 8723
zcmeHtXHb*fx9<Z;ixer+At)#)XoxiFh+RZbP*9|csPrx^0Ytz?tf12MRcVTXA|grP
zPYE3b=`GTGCj=76-A}?h_k6ft@0>X^Co>Fr7AvdowSQ}cdlu(T@*|`W5Crj`K6UH@
z1hIp+><|wZ__cid&pP<U>vQU|KLiO>z&~sx@2qQpC>e0vCcx7BdO)y~pDPp`9DMMm
zm%G1<laK2`Z$G!>S$!!8l7~(oJ7RS^Wu`AI#m+TiZebwp?5wp(r0DJ)+s<bl*uCe)
zr9VYB@6tH@jBnt7%OylwnVHjaGBRWLlfS*A+?K!p;?6hD`(iIH<St*dIL2{4`y%gm
z#jBityM{5TI#}{0Vc~-7qal<M`~c(L5GIlL8us#(dZ7Za?tjE9QZ~RVHLUBt0*ZRa
zn}U-q#7{psJ+i5!mB1j2BlW}EN<I$N5yU2EdOMm*<|^M(uDqIBu}-^9QSrkE$xcVK
zM$Zk0&Lq!<-kPf?Zq_*cut)m6)Qp&37fjKjrM<E|>0KLCQ{<Vtl3qMXZW=rs?lb?G
z!=<gu8>i5WIa;(7>RFK(MO|*hRgt{I54U^XYADJiebT4R9}a9X?6PMp-1IL1iW;us
z)q30=h&~}H-^ghm`GWh*k~@+94n`_XI!+7;?GjXvj;+@Zh4u#8H4obFh~MHuzb`LZ
zOmFlHRv#sXd8w}97<EBDC^Lyxaewoaox%2ti-(sks=HV@e3&+6kCc5V*LF|cK~r7K
zZgKHt*kGQA_h!%RWvSd|YO77);!o!u-0Xw+c-eDOh4VD@Uu>yDV#@m1LMKkH$xjGR
zF>S4`boDmUAZ#R|9&~KhEf=7;q20R&15cXa?usL2lkgkAUZO(+64kln9E99Q?WI%_
z!u&nfyFK;j!5hsRlTj~ymOlPoqXZAlww_D4ywr5RmUgbz&k4UgxS>=T=#PuH#T4lF
zV;ftj3kp;91V!k|_;}Z|p+WWQBo%@B)qdS#Uw;o9AJ04*b<EkPFV+sz=ryOw=hZ6{
zW*6a^$5?3{Jc$jt=+Retpyw{7B^UQnY@lR3t9UR^yb5DUdLE$zeXY!!a2dK^XfMhz
zoU>lSuL<&1zIXS!zZ0dmr@e{s$7_JD5ERJm=$3nl^pIGhf2nsK^@x{~rki?rs5oMX
zh*UqS%wv4XbsOfmC_y+=9ul>_PPVRmoPR=@2WrlrF3XQMFk<f<$u>Cxb$0zOR3gQl
zOP3|#vwFc_g!*th5bR|MQ4U4gj9owk-<&{MQ%p4U)#4%taraaEj}|*3wX#CV*2fZ6
z#1QPitO9xH_fIYHI9dZHjZ>-Y#NCSqpQ(~SZ{Q^okQg2e1??5xmT_WIhPv~~21}aN
zWf8y_Y6z8pPg$8+!Vjw~8CJ%v;OWdyj(HDYVBN1jK!)EOG<_C0C8%LAukuEiB~d=k
ziyS;w)hIx}pEV4P3nSPc*A;RQBi?K10j4WBDCoE{PZ`fwG<a$WhSJQylf_pZ@U+en
zKn?+>XE(}5rt)&K-PVd4`1L0U3IOkSQ2FgP<k+U~TkObqu?<sUP1A##fe$z0IJRLF
z+L1%mCp@~ZQUd>J<LC6IU(sJlD;$c~Ccd9mk@}K)v>X?)^4ErVS()dnX+Ar#Q5&n&
zZcnZ43|f8a;r9GiZ|C>}+s$3=goVoZ^Ka`2DZ{#}2Omw0r4H0s`22onawNkbRF-NG
zIN5uhuokR~o*f=Yh!C?EiBNaYR}rA~ayxHmGPH~2!mPTI67K>F3EMC?AL>xvp*P&q
z6K-1D3BMKSW{3-sx0@f{KN!RLh1zZFQm6DOo)9Ko6b{1uZTGzCTgERAmzGk0=iXW(
zzQO_9Wbj-(eKV(X%r+f2B2GUYaDBS1aQpPmOnKvPy!4jwWJArp%|<8+VFQ`AG>ZI^
zJjX6!P-JAk-mmW5@&;9vQ`j$s_VS=?pZVdXOuavVL!yemOy{0{BaPT3E08MbmVycQ
zT#`Eip+-$lXKaJf3Ypsf4uw-s=+V}FCH&#Q_g*2D1gveI;n<tbP3nF9xaV2w*8|S#
zk1cnOeL_`L{_uX#^wQ2qE2RIv^Waxr-%1kWu#_x9i>ib`a7O9Qi_nGFE|ax~nx>o=
z;~2pK@6U$zqfpDas-k&HnerBa>_m+qP$&{D=Io+~_GcD5vZSIMq<(G(r1l80Oh*G=
z&Zq+5X{ROGdR#L$tk~jnT1>RDB#5mjKVb5`xr-_3*LHT|u~-RE$<x6m$~NXEN94tU
zpbB1a2sVAoOv*z+9cJ^;TO>|{BT|IBAk5SzaS$-=V<(!7(VOBn)d^t(uT@b8nG)4R
zfo&JKFvph<Tq)49XZ%H0ze++SxYldC>KtQgAg}Szg==?Ecj{`L`{DbUhOAy*twQ3j
zU%%?p5`_*lS=1+w$x*BA(4#I%q;b93x}X!;>+8-H-uOe+jachxMm<WIcI)Y7dS@*4
z!Bk>Z2evq8+H~TTO0%K<xzs}Qq7H0$cZx^89k;qQs)5qofx0T^cA!|PXX<<3RKjby
zq!hHCKv!^h5wmMf8PZ>M&adU4@EAy&NjdZguDppma|vjF%)2qSIkk==59xRn!h(&=
zO8;@+E;C%^=tqvr0ug_CPgZRw5achRs5kgZ#~-V@J)d;TBxi~A%LEf?`OY)XLgc<I
zU(psV{o9PuNl4NBGF{Jh#%FoD*0*(yDBMv>iwBp%9cgXSdi|$_5mJhn^rw={C*GSI
zadHx^pGp+pV>jw9^n>0g!e;mlW7|N)T$WiCH;R{@y()C)&d>FnCnC&Tbe|+Aod5@O
zchK!^pY=#Giw)lc=<7~vgm*3*ll%+hxXpv_85@B@$y#oDAI{#1laa`6!i33$P^9Y!
z&#!5DNXDBF&~3t}a|KE3jg7Vwa%{sRLdGlq^&<3WrYfZI(&1ZBJ$-?s9yJhSq`PM?
zeoodPteU8F7o&YQ`X&!&RLKtNo(mU1p=2@}%vq4{?X%GEh=8#ss6}P<c@^iHXXlh(
z#)Ep502Oo*G%N{<fo!Iu6zCHkpm1_TsXNibC!wDTqGyjP+Z<pS^8=Kv73h1ryXJ~5
z)c7;yA19Zgo*=j}#}%1<wftC2^gDlUc~meIY7U~&23mVTgJGuQZcxucKv5v5=bF`D
zN-@#dz|6nG)OY8<gFdVZn(9gAm$4R~gZ0^K>J=ixfucW}^F7b7jNg`cSx87I^<3p?
zQbYXO2RRw;IrW1*Iye+Yu^ls9h+b1+wAb`l2npGa%E<OKVcldFUneC-?5m{*tRzxv
zl92bCu~YXt4S%%~HG^xRntJGz_j1;`(lzbX2dl(|j83;Rgyv@hLCq~Tt5FP*WI~W_
zk@}goiOS+<7?r&a%Ovz<#zsBi^|jd$kE2)DN8$!!^{kgMa7PyrLR@!+hFzh5_JH2U
z8#T~$=~JH+^5?=|Y6Fq6JjU?5*bR+$yE|h`$5sjldqpU?FOuGt2MCn*my7pQ-puvy
z>1tB8bfb6L1a{Y=-TN=2Lk7ZeHlZ_#>3IpOc7=+V#Zx-XqWqDie32RnX&VhgZJ-8*
zUWwhTh<11BBN=tnxY320w_%=*rnbHWZ-u14^HoMCBOjReQhoCJz79F6L_h&}AL4@V
z-+kOwa0t)6_ZAr_39(frOs{vYs#{l)?|)d7xllCG>Rk1Th>Rny9zchB5cE{=8fu3n
zIwIUc!pZ50RU+oz6BAur#`augH8N@u9#?PI9r0aPp)^v)uJZvTF+~t_AH(i1G9v75
z-8C`^cXk5p0Qzq#5t)i!lS^K1DI+_EyZ){#o-cW~Fkff4>hnSpvNI{yh>5-_0fk6H
z6$&7T*---rj4sQH+ke;CoXT8jrUkx`hJ;MYpT|TixWJ+2djv{O3?K+AzpWGqB(ptE
zVzWpoLp>^j>7g*abq7Kq6{df71LfQ;M%{V-0o$)VqVQRG$)tzDbSXg3Wzvr-7rQaN
z^9M)dMi@9e2e^%6EY$X7l4m7h^N8~ErpL(EHlEzZNfv5CndE~^a`O)AyIu3rue${!
z55niCTo#bOML?iegZtjxg^R`QcuWHN@hy-=esp$-Nq$rm7Y%fJN<+XFQ1Ti<&@moP
z%UkZsH=yCRL^h_zB&)YfjZeg4namO_=8134Oh0c}GMR^A=A+~!^IWFnCt@)$vzZKw
zdF>lBSgkjlm5aSvDb%TCxqC^?X);O#kI*82zQ|EN2%JuKV*kw*D1Hax{hvw;HEoWJ
zO%7vnQhZtd*cBrfQQgzf5N)V}vQ{Cc&nj_jpGAPnX8fF%>d>SP1U%rO*SSK|u@-7i
zxMHLCNkS`9ECbpcq3I|KwMTmaRRUU(fGm}kN$Dxd^V0jG9KK0FoIISZLWtQKD2oDw
z@7X<{tH|NV161;GVw<3>S(e7!gB*?$pj>!3`6KrWuuPs*hfWwPzdZHe=n;+#UD)8*
zvV23n$Zde{D_T?oszb6&SaE?AcZ;6=V3wJ|X3@W;<p75~8nmYayg;HKS7aHAKgt0w
z3B3a5+z17MT@GSpO!E%g<5$3|SU3mXTa1MgkO7eR_9l?{I2fW&j3I&T^7HO{IWpp6
zq9-)=0QHOfk>Jj)dcN@1d0jDT;4?2>su5BKv3SA-r-;Dz_*q$gS~uvoPSEpH$}dl(
z!j9MjN36{~`RMo6p#89W{4jMdOf~fcfCEsE!MrAby3XPiWKvHkzdR=kQ%jgscH$sk
z<b7ep-U|yBzo0DG?Y3uS-s6BMf_Q(v4JI~i5vhEUuXg~>FEFtTCO$3m9tK1q!1)3Y
zm4iVrCQpM1vsoN9DG#U<*os<y8c4k)q`6o0>_3%&aeRg)5+%ry!3Og1TnHfrfv~a@
zLxrg$u8>ANa9<7%<tQlI+&xha-T_VY<l|h%72w9S95l=CR9Y{Hm=CG!R_ds%Kr(0&
z`0$V-^}3?9$6dai>1lE<N)H=@V%Z*hLwsIcQqqR2&0jWVxeHRy7ZEmAAKe>E6H2WW
zssHz0-ROC{Fm!So=11VAe0xvG_%vT6B3xSjs}+H}8Zvg3grHw0U>WiCF&hLO0GkKn
z?f;)iD<raGR|oX<g%LJGBelx67|YI<;i}ILMT#AQpp3hG5OiY~2LxTIf&Q2D|B6Ir
z(_~vNcRhjUMlR_?<35`38BPC{{}iCuuGGu^_r)%Y(NHg*6v6*!wMG2w!(aj>Qo`uH
zPMEt-V~GvpyF<L^s(}sV-L+Qia3*@8)F{3w#@E#WQSlkG5^EDQ!FaGBsCs~Qp`eQ%
z&Eed>=2ktt@&3A=%M_)Y+Izt0QO}&+vl+g+-}fxNWK?OpU*8)2iuT<+&0THl@WbKZ
z<P;e4PxE>8iAfWET=Iz5j(A}GE_Nk7J3i1LiJqV{c8c_`59~his4ld9sCD#O#70i?
zk5H%f4rC|6V3x4x;4){9(H;D)RFHNtvFYo+FN2LAs+{JqwhwC$U-Dk7oh&9JlPddg
zUNu2ncvt9}n$uZ_(xG4q&M2&6yK_r%skc1->qw%Wb0a5KwrAG<0&w)Vq><L%l!(x?
z>xD)SoBrW7&}oHg^q>+geLOl5v%G{Jnsj&enORRu>2kkQ=&&QVNk=_FpT^(S)L9at
zM)2to@vY?-ta@e+woC$eCrI&6$3$ha{TFk1(0i%lc^0_W(Ed}5)E$BqvGt;1x{{ur
zbZ~fxZJly%p)WcAX^=E900^uR8V{Y!+_^AZm3}X~1FPvwqok$vsq|o1_I%lFZhj!X
z(Vy?C=dv+6v+&&^Oyl6si6@<31Lb>k0NzksoK$#URpr)@px|bvO1tn>^7eGC&Fb&w
z>eyVOF#1;mwuV%?-uZGdGx#I}g}hX^1}+G0<Bp>Pc%`BUdLjDnsI94v(a&>AT6D?+
zI;j7LZ`t|6LfNHGOWVP>4k5~)Hb+I!YU3aO@#2dV3SHO~8GO?!kT9^(HsR`U=Fpuf
z?do;nhDqMf>B)Gr<a$Di>bhXM?6ZUGLlUbc1F9>!eBk0T?ih6UepH(jp?jh)0-N3O
z#MG@}+-9SC;DN(>y}xrECd^fD?33%1bN@Hfp`x&~rXa2f0Js$Ab3fRF5m5pf5s2i;
zbUXv*Of(dG3S2$#ng@{o1vTqx5JH&RW_2&hL5RyZkclz)GaXkX!Ocyd%m&LJ9*&Gq
zjto;KiZ9`d9NPtC=P-q|$!@{CHWz3*8eDcc0F608R#+z35k_2!W1Ck6S3}M%vULob
z1#SzD+3<52^U!bQ4l-5Z|5f<|V3BQ@l|K*4yhpk}ez`tGd5QNX^ki}w8!%xKuuA8O
z-oGsMMN!nBwsJUA@7v0T3+>|7+5VK;phPx{xh*Z7wjW{i6*_sGtbJHwVdS`q^X5vu
zbJwDokdW_4SDZ8?sp-09DCLAZxcT$bLU&U8*2=n>K(>$8K0V(70QzeU7$N~^vgA&O
zZ$B#>JCQrBQvykExx*A|jgy1f4*$z`a~Wo{M6nY;w0l1wu63LoT=do#OHLmX+{q!I
zzxUtJFH6D5YUR&V+1vzw4~4n{BSwj>kWOgag74()JU9XJ`C9y2X?)^d$&}v33?7Uy
zSx8&Katgk2v+pxA69NF~7FIU*<c3{?=RPNZJt<q^Ijr%G8J-+xI5#kyR$zi$=UeKq
zQC1^Ny(kXy4}f=gIMW?Qm|{SL;H|@`onGk{gX1bQIKlY^FfOswM8Ife@eoAGlSZ7Q
z4O+YSBwP3t$3!<@tc4ByP{Ik<AAsFe2F3IJots}&?nWypiqh|%;Rm?SpiOgL<v&o3
z${0kgTfJ00vuY?So)X}AHuYEfOo}~#Hejt%!;C;5m_hj>OZ@~Qr^FB93dMRw!px>|
ztEHGrDPjNFL<a>pfGzcDfSQtzmS12R|5}(8128WHjyEiz=N@ra)e;l)%_cN~@1Fde
zrZAFueanU!5^EGV?D=>fzwq(pF7(*1eO*nnOup@$VTR1aRkCt(h|Bocu@54?EogP-
z3BPlF_$R*C9SlI-!U&27GmW*Zbh+|JenM|VES$`LwNEtfm3?gV95Lu-_|MEtM+!4K
zTCDWFFo26`MNw4dl?Mw1vcj5E2k$MxI?CtvQ$Y|evu|q5aOK{DPbk<fm1myTW!l!x
zvMq;s{5^R&x0@bf(kU$Zer6GZCDy9PvHy!FODEN!l9Eiap2JV<!wGRj`&|p4)mTmV
zgNpOgx}Xkq`Qc#*d@kMn6f@uKL??A<F=uGYu6c0;Y?lEq{X{iXliS2050+lGCgt(U
zYAh+H6@Wa;k&!EnAj}Qlajv6|>WkrN=>$p3&0A3xJ~25`h*=n$!*Dc_?Xk5b=z+_p
z-wyTV>lrKCsDmt}Gb>baz8)5JljXSQc1|pu6wN*J^>u)py+!8b)bp)-bccmc-9Y^>
zv+V#C^bt%^sn|_QL3xLa&c_dNql#cc1rq{jfm=r~^p>A;=Vg3opn}&p0?dtI%?FN&
zbu!$oKBv8wKxjDwBU^6Rvgp!qivo18D-31Q-M9F+=sOVYeoQ);KbgmEo-fnUtW94u
zuMHG4m@`$H-~~qK6Ch+#3enCK4#rH@qzh^(G{;uiW)0K`m<6@<ftg%oOJF@^2~L0A
z*1+@x4WGOFLV((Kw7d>JPGIuW0B3|Raxf-Z^WtBN&xb(Lz#N4F;}MF(aU9f`Rh7l(
zWtQBeIJgn0g~Qq|DBDc3EUPEMmPzP<v|rpMs_F{6v4c7Sf(h0m3Zi)*4jnB|+cKe_
zX+jGqQLEFLj^<nA)Esl34&mXP%I?T?Y-cI6mV-@@M**=b`$Zcl!Ig=&v+*xTM9uaF
z{8zB1OI>hr8SMRDW%yuo-`<oEKk)s+anttdDI<Et;ibi@etOid%ip}*|LfZBJY_`j
zxArY7c=zU9H`7sFx3uXNu-9Cb_VlUrRs3Gc<{vkg5%1DHm{M}J$Cx4#vYopkliTm(
zm8ZLA*O*76tvk~tm8u^i!}r1KYui3XnTYfdz<wlNamI%dq{I^%l2Mhew0+LII$cTR
zeF9Dag*o|fjS{%9JfU>*15pR3TcT@<Ou!G&%5N`UbgRZQ{M;5h%(Wmcxv)dPGmT4|
z?MSVnS>)2Bi%Ye3enPf&xIEDFXWdgzH7L;Nab2ol-lGn?^#<80ZflL9gh6}mruYi+
zt2>f6M{+vn_44=A{0byi(t}CQzn7{ozs(xAGku2lVw`ed=2me0Zh1L#iK)Hec=4@C
z`JK^H<-v8FmbR#j%tK!70jX5)ez{de1ZP|Xx1-NgQKwHE|Cd4650xc?*!Ljt5$bN0
z&+8AyOMb`h>Pg0~BCA~n7#oKf$i&-A+@a3k<}DtS##No4vlC6~TR!E{)&9_XAEx#u
ziG=D43e2O|+!f-Uwg#!tE_QW4i>JhP9v(AW7+S^Z7I{c)rlvTtD$^*#0~FdBA%wt9
zR!Om4gsbUEO!Qq=-5@Oj0fW>zWooHV20XwcEtE{kUrT{iN4*|s)L^k<48Dn(%D$mY
zO<@%kx5iy?fGDDf&G0RmX5cFqhp<|~yV05jKP^5NPAaVmtjG61SrWoG4p&4jE;<>n
zjJ%C=pS+AT=q1v}EnPlGfo1IOb)3G&UhKF5nxaX%u6LBo{q_9N(Q<dMN7-1s{Q7K2
z#<b~~DYs0=@F~6D1C`oX<nQgjr28!9OXgI)|C|&g4nMT6D!WPS>cz?Rm+l!Lu_YZL
zb6W^xI&NsV0MnrTN0e=l-;fX{8fm=J>&uWbI{$g_1l_mHbwPv<<$PSobZo@Fahw66
z5X`Wbl18Kjh4ZB>N`K?$bYIf@^-Ap=5a(i2ek*$u8t1|cFx~(@Fp{@fOn^{u+yGtr
z$Nnx@Q#a6*24Aj7V?AEZuzX=+3A+)rJ0==$1#e&2K5sWEr=I~}zzCv%)q{DnG+>2}
z?h<Wy>jt_7ciAbhGpXBDQJUwF-;?S1MtuoiP$n1|o+gXv-z6$jpb9e?=K~*JQ|&Uz
zkN0?jJ`6oSqI@{uG;Dq3{v8N0?KciPfz*qNqN?+u6*LE4I+SGy7I6F_u!&jHnPmT+
zUQnnI)w9n~B7Fmwj-W%Q&M6mLRb*U;Ahzf5{{p-<5QqezRy@M@vT8(uWIbQxEn$SA
z%XbE@o`+t##_>x9#9#Z06v8kVT2`J9yFD^`c&sjr6Bsi|NQ{lv<AXm=DxC}SZJaR&
z3bJB~?nZA2;kVP_iDaQ1Wgwx_;nf%<0P$HTo0M<Xil@==_xuOe9Un@)m>H<TuK!6y
z1NB{hai6;N|HgAH>R*VI*_$v!G}?V>G;{+^LaHluxOY_k=PF9y*MrfYAHMMCs6XDY
zadjxJgY?rdcy2W0gG_j{lRC*;l@@y8HhgHxq;b+K6@rW*m3o30^gra4mBJ7#xip%v
TgmUtMO+J16+_6t4j?w=IGt&Wn

literal 0
HcmV?d00001

diff --git a/public/js/api/phrasen.js b/public/js/api/phrasen.js
index 896641bcf..c5994ea9b 100644
--- a/public/js/api/phrasen.js
+++ b/public/js/api/phrasen.js
@@ -18,5 +18,9 @@
 export default {
 	loadCategory(category) {
 		return this.$fhcApi.get('/api/frontend/v1/phrasen/loadModule/' + category);
+	},
+	setLanguage(categories,language) {
+		const payload = {categories, language}
+		return this.$fhcApi.post('/api/frontend/v1/phrasen/setLanguage', payload);
 	}
-};
+};
\ No newline at end of file
diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js
index b626df690..4e67a28cb 100644
--- a/public/js/apps/Cis.js
+++ b/public/js/apps/Cis.js
@@ -1,10 +1,11 @@
 import FhcSearchbar from "../components/searchbar/searchbar.js";
 import CisMenu from "../components/Cis/Menu.js";
-
+import FhcApi from '../plugin/FhcApi.js';
+import Phrasen from '../plugin/Phrasen.js';
 import fhcapifactory from "./api/fhcapifactory.js";
 Vue.$fhcapi = fhcapifactory;
 
-Vue.createApp({
+const app = Vue.createApp({
     components: {
         FhcSearchbar,
         CisMenu
@@ -90,4 +91,7 @@ Vue.createApp({
             
         },
     }
-}).mount('#cis-header');
\ No newline at end of file
+});
+app.use(FhcApi);
+app.use(Phrasen);
+app.mount('#cis-header');
\ No newline at end of file
diff --git a/public/js/apps/Cis/Cms.js b/public/js/apps/Cis/Cms.js
index a2f9691b3..e812c354f 100644
--- a/public/js/apps/Cis/Cms.js
+++ b/public/js/apps/Cis/Cms.js
@@ -35,6 +35,6 @@ const app = Vue.createApp({
   },
 });
 app.use(primevue.config.default, { zIndex: { overlay: 9999 } });
-app.use(Phrasen);
+app.use(Phrasen, {reload: true});
 app.mount("#cms");
-//#cms [data-confirm], #cms [data-href]
+//#cms [data-confirm], #cms [data-href]
\ No newline at end of file
diff --git a/public/js/apps/Cis/Documents.js b/public/js/apps/Cis/Documents.js
index d484c06db..e5d1e8fad 100644
--- a/public/js/apps/Cis/Documents.js
+++ b/public/js/apps/Cis/Documents.js
@@ -1,12 +1,13 @@
-import Phrasen from '../../mixins/Phrasen.js';
+// import Phrasen from '../../mixins/Phrasen.js';
+import Phrasen from '../../plugin/Phrasen.js';
 //import {TabulatorFull as Tabulator} from '../../../../vendor/olifolkerd/tabulator5/dist/js/tabulator_esm.min.js';
 //import CssLib from '../../helpers/CssLib.js';
 //CssLib.import('../../vendor/olifolkerd/tabulator5/dist/css/tabulator_bootstrap5.min.css');
 
 const app = Vue.createApp({
-	mixins: [
-		Phrasen
-	],
+	// mixins: [
+	// 	Phrasen
+	// ],
 	data() {
 		return {
 			inscriptiontable: null,
@@ -90,4 +91,5 @@ const app = Vue.createApp({
 		});
 	}
 });
+app.use(Phrasen, {reload: true});
 app.mount('#content');
\ No newline at end of file
diff --git a/public/js/apps/Cis/MyLv/Student.js b/public/js/apps/Cis/MyLv/Student.js
index ded0178fb..e0a13a728 100644
--- a/public/js/apps/Cis/MyLv/Student.js
+++ b/public/js/apps/Cis/MyLv/Student.js
@@ -5,4 +5,4 @@ Vue.createApp({
 	components: {
 		MylvStudent
 	}
-}).use(Phrasen).mount('#content');
\ No newline at end of file
+}).use(Phrasen, {reload: true}).mount('#content');
\ No newline at end of file
diff --git a/public/js/apps/Cis/Stundenplan.js b/public/js/apps/Cis/Stundenplan.js
index 807f192d7..9ab22affa 100644
--- a/public/js/apps/Cis/Stundenplan.js
+++ b/public/js/apps/Cis/Stundenplan.js
@@ -109,5 +109,5 @@ const app = Vue.createApp({
 	`
 });
 app.config.unwrapInjectedRef = true;
-app.use(Phrasen);
+app.use(Phrasen, {reload: true});
 app.mount('#content');
\ No newline at end of file
diff --git a/public/js/apps/Dashboard.js b/public/js/apps/Dashboard.js
index e56425a6d..039e7b901 100644
--- a/public/js/apps/Dashboard.js
+++ b/public/js/apps/Dashboard.js
@@ -1,7 +1,9 @@
 import {CoreNavigationCmpt} from '../components/navigation/Navigation.js';
 import CoreDashboard from '../components/Dashboard/Dashboard.js';
+import FhcApi from '../../plugin/FhcApi.js';
+import Phrasen from '../../plugin/Phrasen.js';
 
-Vue.createApp({
+const app = Vue.createApp({
   data: () => ({
       appSideMenuEntries: {}
     }),
@@ -9,4 +11,7 @@ Vue.createApp({
     CoreNavigationCmpt,
     CoreDashboard
   }
-}).mount('#main');
+})
+app.use(FhcApi);
+app.use(Phrasen);
+app.mount('#main');
\ No newline at end of file
diff --git a/public/js/apps/lehre/Antrag.js b/public/js/apps/lehre/Antrag.js
index d0c8ab89a..179e810cc 100644
--- a/public/js/apps/lehre/Antrag.js
+++ b/public/js/apps/lehre/Antrag.js
@@ -20,5 +20,5 @@ const app = Vue.createApp({
 	}
 });
 app
-	.use(Phrasen)
-	.mount('#wrapper');
+	.use(Phrasen, {reload: true})
+	.mount('#wrapper');
\ No newline at end of file
diff --git a/public/js/components/Calendar/Header.js b/public/js/components/Calendar/Header.js
index 663833aef..60c724162 100644
--- a/public/js/components/Calendar/Header.js
+++ b/public/js/components/Calendar/Header.js
@@ -5,7 +5,6 @@ export default {
 			modes:{
 				week:"Woche", 
 				month:"Monat", 
-				years:"Jahre",
 			},
 		}
 	},
@@ -44,9 +43,23 @@ export default {
 	},
 	template: `
 	<div class="calendar-header card-header w-100" :class="classHeader">
+
+		<div class="row justify-content-end" style="position: absolute; width: 98%; pointer-events: none;">
+			<div class="col-auto" style="pointer-events: all;">
+				<div role="group" aria-label="Kalender Modus">
+					<button type="button" :class="{'active':mode_kurzbz == mode}" style="margin-right: 4px;" @click.prevent="$emit('updateMode',mode_kurzbz)" class="btn btn-outline-secondary" v-for="(mode_bezeichnung,mode_kurzbz) in modes">
+						<i v-if="mode_kurzbz == 'week'" class="fa fa-calendar-week"></i>
+						<i v-else-if="mode_kurzbz == 'month'" class="fa fa-calendar-days"></i>
+					</button>
+				</div>
+			</div>
+		</div>
+
 		<div class="row">
-			<button class="btn btn-outline-secondary border-0 col-auto" :class="{'btn-sm':!this.size}" @click="$emit('prev')"><i class="fa fa-chevron-left"></i></button>
-			<div class="col text-center">
+			<div class="col-5 d-flex justify-content-end">
+				<button class="btn btn-outline-secondary border-0" :class="{'btn-sm':!this.size}" @click="$emit('prev')"><i class="fa fa-chevron-left"></i></button>
+			</div>
+			<div class="justify-content-center text-center col-2">
 				<div class="d-flex justify-content-center align-items-center">
 					<button class="btn btn-link link-secondary text-decoration-none" :class="{'btn-sm': !this.size}" @click="$emit('click')">
 						{{ title }}
@@ -54,14 +67,9 @@ export default {
 					</button>
 				</div>
 			</div>
-			<button class="col-auto btn btn-outline-secondary border-0" :class="{'btn-sm': !this.size}" @click="$emit('next')"><i class="fa fa-chevron-right"></i></button>
-		</div>
-		<div class="row justify-content-center">
-			<div class="col-auto">
-				<div class="btn-group" role="group" aria-label="Kalender Modus">
-					<button type="button" :class="{'active':mode_kurzbz == mode}" @click.prevent="$emit('updateMode',mode_kurzbz)" class="btn btn-outline-secondary" v-for="(mode_bezeichnung,mode_kurzbz) in modes">{{mode_bezeichnung}}</button>
-				</div>
+			<div class="col-5 d-flex justify-content-start">
+				<button class="btn btn-outline-secondary border-0" :class="{'btn-sm': !this.size}" @click="$emit('next')"><i class="fa fa-chevron-right"></i></button>
 			</div>
 		</div>
 	</div>`
-}
+}
\ No newline at end of file
diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js
index c226eba6a..a5d68bfbe 100644
--- a/public/js/components/Cis/Menu.js
+++ b/public/js/components/Cis/Menu.js
@@ -12,6 +12,8 @@ export default {
         logoUrl: String,
         avatarUrl: String,
         logoutUrl: String,
+		atFlagUrl: String,
+		ukFlagUrl: String,
 		selectedtypes: Array,
         searchbaroptions: Object,
         searchfunction: Function
@@ -60,10 +62,14 @@ export default {
 
 		setActiveEntry(content_id){
 			this.activeEntry = content_id;
+		},
+		handleChangeLanguage(lang) {
+			this.$p.setLanguage(lang, this.$fhcApi)
 		}
 	},
 	mounted(){
 		this.entries = this.menu;
+		this.$p.loadCategory(['ui', 'global'])
 	},
     template: /*html*/`
 	<!--<p>CISVUE HEADER</p>
@@ -83,6 +89,10 @@ export default {
 	<ul id="nav-user-menu" class="collapse list-unstyled" aria-labelledby="nav-user-btn">
 		<li><a class="btn btn-level-2 rounded-0 d-block" href="#" id="menu-profil">Profil</a></li>
 		<li><a class="btn btn-level-2 rounded-0 d-block" href="#">Ampeln</a></li>
+		<li class="fhc-languages" style="text-align: center;">
+			<a class="btn btn-level-2 rounded-0" href="#" @click="handleChangeLanguage('German')"><img :src="atFlagUrl"/></a>
+			<a class="btn btn-level-2 rounded-0" href="#" @click="handleChangeLanguage('English')"><img :src="ukFlagUrl"/></a>
+		</li>
 		<li><hr class="dropdown-divider"></li>
 		<li><a class="btn btn-level-2 rounded-0 d-block" :href="logoutUrl">Logout</a></li>
 	</ul>
diff --git a/public/js/plugin/Phrasen.js b/public/js/plugin/Phrasen.js
index 5d861fce5..3539b9f6e 100644
--- a/public/js/plugin/Phrasen.js
+++ b/public/js/plugin/Phrasen.js
@@ -2,6 +2,7 @@ import FhcApi from './FhcApi.js';
 
 const categories = Vue.reactive({});
 const loadingModules = {};
+let reload = false;
 
 function extractCategory(obj, category) {
 	return obj.filter(e => e.category == category).reduce((res, elem) => {
@@ -19,8 +20,19 @@ function getValueForLoadedPhrase(category, phrase, params) {
 	return result;
 }
 
-
 const phrasen = {
+	setLanguage(language, api) {
+		const catArray = Object.keys(categories)
+		return api.factory.phrasen.setLanguage(catArray, language).then(res => {
+			if(reload) window.location.reload()
+
+			res.data.forEach(row => {
+				categories[row.category][row.phrase] = row.text
+			})
+
+			return res
+		})
+	},
 	loadCategory(category) {
 		if (Array.isArray(category))
 			return Promise.all(category.map(this.config.globalProperties
@@ -63,12 +75,14 @@ const phrasen = {
 
 export default {
 	install(app, options) {
+		reload = options?.reload ?? reload
 		app.use(FhcApi, options?.fhcApi || undefined);
 		app.config.globalProperties.$p = {
 			t: phrasen.t,
 			loadCategory: cat => phrasen.loadCategory.call(app, cat),
+			setLanguage: phrasen.setLanguage,
 			t_ref: phrasen.t_ref
 		};
                 app.provide('$p', app.config.globalProperties.$p);
 	}
-}
+}
\ No newline at end of file

From 74cf0ad173bc7c6228f7454bf1ae329d6bae4987 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Fri, 25 Oct 2024 15:58:37 +0200
Subject: [PATCH 1331/1461] use vue header & tooltip translations

---
 system/phrasesupdate.php | 156 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 156 insertions(+)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 0f37857d4..15fc4fe45 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -28218,6 +28218,162 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'tooltipStudentEntschuldigung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Sie können eine Entschuldigung für einen Zeitraum von bis zu {0} Tagen in die Vergangenheit und bis zum Ende des aktuellen Semesters hochladen. Die erlaubten Dateitypen für das Dokument sind .pdf, .png und .jpg.
+
+				Sobald Sie eine Entschuldigung hochladen wird die zugehörige Studiengangsassistenz informiert und Ihr Anliegen überprüft. Solange Ihre Entschuldigung noch keinen akzeptierten oder abgelehnten Status erhalten hat, steht es Ihnen frei diese inklusive Datei zu löschen. Sobald sie entweder akzeptiert oder abgelehnt wurde können Sie den Eintrag nichtmehr löschen.
+
+				Bei einer akzeptierten Entschuldigung werden sämtliche digitalen Anwesenheiten in diesem Zeitraum als positiv gewertet. Eine abgelehnte Entschuldigung hat keine Auswirkungen auf ihre Anwesenheitsquote.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'You can upload an excuse for a period of up to {0} days in the past and up to the end of the current semester. The permitted file types for the document are .pdf, .png and .jpg.
+
+				As soon as you upload an excuse, the relevant study program assistant will be informed and your request will be reviewed. As long as your excuse has not yet received an accepted or rejected status, you are free to delete this file including it. Once it has either been accepted or rejected, you can no longer delete the entry.
+
+				If an excuse is accepted, all digital attendance during this period is counted as positive. A rejected excuse has no effect on your attendance rate.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'tooltipStudentAnwesenheit',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Hier sehen Sie sämtliche digitale Anwesenheiten zugeordnet nach Lehrveranstaltung. Sie können eine positive Anwesenheit erreichen, indem Sie den während einer laufenden Anwesenheitskontrolle gültigen Zugangscode eintragen. Sie können hierfür den angezeigten QR Code scannen, welcher Sie entsprechend weiterleitet oder Sie können den Code manuell eingeben.
+
+				Sollte es Ihnen technisch nicht möglich sein einen Zugangscode einzugeben, können Sie die unterrichtende Person bitten Ihre digitale Anwesenheit zu setzen.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Here you can see all digital attendances assigned to the course. You can achieve positive attendance by entering the access code that is valid during an ongoing attendance check. You can do this by scanning the QR code displayed, which will redirect you accordingly, or you can enter the code manually.
+
+				If it is not technically possible for you to enter an access code, you can ask the person teaching you to set your digital attendance.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'tooltipStudentAssistenz',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Im Entschuldigungsmanagement können Sie als Studiengangsassistenz beziehungsweise als Administrator die von Studenten hochgeladenen Entschuldigungsdokumente überprüfen und den Status entsprechend vergeben.
+				
+				Bitte beachten Sie dass nur Entschuldigungen INNERHALB des angegebenen Zeitraumes angezeigt werden. Sollten Sie nach einer lang wirken Entschuldigung suchen, müssen Sie die Zeitspanne entsprechend weit setzen.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'In the excuse management, you as a course assistant or administrator can check the excuse documents uploaded by students and assign the status accordingly.
+
+				Please note that only excuses WITHIN the specified time period are displayed. If you are looking for a long-lasting excuse, you must set the time period accordingly.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'tooltipLektorDeleteKontrolle',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Sollten Sie eine Anwesenheitskontrolle fälschlicherweise gestartet haben, können Sie diese löschen wenn sie nicht älter als {0} Tage ist. Dabei werden sämtliche mit dieser Kontrolle verknüpfte Anwesenheitseinträge Ihrer Studenten ebenfalls gelöscht und Ihre Anwesenheitsquoten neu berechnet.
+
+				Sollten Sie eine Kontrolle, welche älter als {0} Tage ist, löschen wollen, wenden Sie sich an einen Administrator.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'If you have started an attendance check by mistake, you can delete it if it is not older than {0} days. All attendance entries of your students linked to this check will also be deleted and your attendance rates will be recalculated.
+
+				If you want to delete a check that is older than {0} days, contact an administrator.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'tooltipLektorStartKontrolle',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Um eine Anwesenheitskontrolle für Ihre ausgewählte Unterrichtsgruppe durchzuführen, wählen Sie bitte einen Termin aus dem Stundenplan aus oder geben händisch die gewünschte Gültigkeitkeitsdauer der Kontrolle an.
+				
+				Die Gültigkeitsdauer bestimmt die Gewichtung der Anwesenheit in Relation zum Gesamtausmaß, sie können diese aber nach eigenem Ermessen anpassen und müssen sich nicht streng an die Termine im Stundenplan halten.
+				
+				Sie können pro Datum und Unterrichtsgruppe eine Anwesenheitskontrolle pro Tag eröffnen, welche jedoch beliebig oft aufgerufen und von Studenten eingecheckt werden kann. Es gelten dabei ihre zuletzt eingetragenen Zeiten. Ein Student muss nur einmal am Tag pro Gruppe einchecken um als anwesend registriert zu sein, egal wie oft Sie die Kontrolle starten.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'To carry out an attendance check for your selected class group, please select a date from the timetable or manually enter the desired validity period of the check.
+
+				The validity period determines the weighting of attendance in relation to the overall extent, but you can adjust this at your own discretion and do not have to stick strictly to the dates in the timetable.
+
+				You can open one attendance check per day for each date and class group, which can be called up and checked in by students as often as you like. The times they last entered apply. A student only has to check in once a day per group to be registered as present, regardless of how often you start the check.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'tooltipStudentByLva',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'In dieser Detailansicht können Sie einzelne Anwesenheiten eines Studenten bearbeiten, falls ein anwesender Student aus technischen Gründen den Zugangscode nicht eingeben kann. Ebenso steht es Ihnen frei Studenten auszutragen, welche nicht anwesend sind aber den Zugangscode mit Hilfe von anwesenden Studenten erhalten haben.
+				
+				Falls eine Anwesenheit durch eine akzeptierte Entschuldigung entstanden ist, können Sie den Status nicht verändern.
+				
+				Es steht Ihnen frei die Anwesenheitseinträge mit Notiztexten zu versehen, welche dem Studenten nicht zugänglich sind.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'In this detailed view, you can edit individual attendances of a student if a student who is present cannot enter the access code for technical reasons. You are also free to remove students who are not present but have received the access code with the help of students who are present.
+
+				If an attendance was made due to an accepted excuse, you cannot change the status.
+
+				You are free to add notes to the attendance entries that are not accessible to the student.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	//
 	// DIGITALE ANWESENHEITEN PHRASEN END
 	//

From 6fc5714fdff2ccda27be42d0af23c12236564ac8 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Fri, 25 Oct 2024 16:34:57 +0200
Subject: [PATCH 1332/1461] removed language flags; anw phrasen added; added
 names to apps for easier devtools debugging;

---
 public/images/icons/at.png                    |  Bin 1948 -> 0 bytes
 public/images/icons/uk.png                    |  Bin 8723 -> 0 bytes
 public/js/apps/Cis.js                         |    1 +
 public/js/apps/Cis/Cms.js                     |    1 +
 public/js/apps/Cis/Documents.js               |    1 +
 public/js/apps/Cis/MyLv/Student.js            |    1 +
 public/js/apps/Cis/Profil.js                  |    3 +-
 public/js/apps/Cis/ProfilUpdateRequests.js    |    3 +-
 public/js/apps/Cis/RoomInformation.js         |    2 +-
 public/js/apps/Cis/Stundenplan.js             |    1 +
 public/js/apps/Dashboard.js                   |    1 +
 public/js/apps/Dashboard/Admin.js             |    3 +-
 public/js/apps/Dashboard/Fhc.js               |    3 +-
 public/js/apps/DashboardAdmin.js              |    3 +-
 public/js/apps/TestSearch.js                  |    3 +-
 public/js/apps/lehre/Antrag.js                |    1 +
 public/js/apps/lehre/Antrag/Leitung.js        |    3 +-
 public/js/apps/lehre/Antrag/Lvzuweisung.js    |    3 +-
 public/js/apps/lehre/Antrag/Student.js        |    3 +-
 public/js/apps/lehre/lvplanung/LvTemplates.js |    1 +
 public/js/components/Cis/Menu.js              |    6 +-
 public/js/components/Cis/Mylv/LvModal.js      |    8 +-
 .../Cis/Mylv/Semester/Studiengang/Lv.js       |    4 +-
 public/js/plugin/FhcAlert.js                  |    3 +-
 system/phrasesupdate.php                      | 2288 ++++++++++++++++-
 25 files changed, 2323 insertions(+), 23 deletions(-)
 delete mode 100644 public/images/icons/at.png
 delete mode 100644 public/images/icons/uk.png

diff --git a/public/images/icons/at.png b/public/images/icons/at.png
deleted file mode 100644
index 5fb12554a0a80ea82a926dc755ead777bcaf6a16..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1948
zcmeAS@N?(olHy`uVBq!ia0y~yU;;9k7&zE~)R&4Yzkn2Hfk$L90|Vb-5N14{zaj-F
zC|TkfQ4*Y=R#Ki=l*&+EUaps!mtCBkSdglhUz9%kosAR&1G}cDi(^Q|oVPbO`Z7B*
zxLk}*x&CO*jotu@NwOA9>?$v`9(3G2koV#K>V!l3XSXo|jU5s||JdVSAGcPqFc@6l
zkvl#4D+fcuy6sn)85(}FFfg!iGB9umF)#?IFfb^1FfcewU|?ua0Q$`l7_v>H3Wi8H
zJpTT<ZjBrx!x__Wwc^0oe9SZ&i^C%|zxeX~Pvl-kh8a0`ww>Mx%Ei;UM|0*dDxsEt
k{`$8XSSSw}5b;XhW{XHy=iW2Gl7@l7)78&qol`;+07L`VCIA2c

diff --git a/public/images/icons/uk.png b/public/images/icons/uk.png
deleted file mode 100644
index 2357ad975e73ccab2c4770339ccafe5bf3fb8d29..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8723
zcmeHtXHb*fx9<Z;ixer+At)#)XoxiFh+RZbP*9|csPrx^0Ytz?tf12MRcVTXA|grP
zPYE3b=`GTGCj=76-A}?h_k6ft@0>X^Co>Fr7AvdowSQ}cdlu(T@*|`W5Crj`K6UH@
z1hIp+><|wZ__cid&pP<U>vQU|KLiO>z&~sx@2qQpC>e0vCcx7BdO)y~pDPp`9DMMm
zm%G1<laK2`Z$G!>S$!!8l7~(oJ7RS^Wu`AI#m+TiZebwp?5wp(r0DJ)+s<bl*uCe)
zr9VYB@6tH@jBnt7%OylwnVHjaGBRWLlfS*A+?K!p;?6hD`(iIH<St*dIL2{4`y%gm
z#jBityM{5TI#}{0Vc~-7qal<M`~c(L5GIlL8us#(dZ7Za?tjE9QZ~RVHLUBt0*ZRa
zn}U-q#7{psJ+i5!mB1j2BlW}EN<I$N5yU2EdOMm*<|^M(uDqIBu}-^9QSrkE$xcVK
zM$Zk0&Lq!<-kPf?Zq_*cut)m6)Qp&37fjKjrM<E|>0KLCQ{<Vtl3qMXZW=rs?lb?G
z!=<gu8>i5WIa;(7>RFK(MO|*hRgt{I54U^XYADJiebT4R9}a9X?6PMp-1IL1iW;us
z)q30=h&~}H-^ghm`GWh*k~@+94n`_XI!+7;?GjXvj;+@Zh4u#8H4obFh~MHuzb`LZ
zOmFlHRv#sXd8w}97<EBDC^Lyxaewoaox%2ti-(sks=HV@e3&+6kCc5V*LF|cK~r7K
zZgKHt*kGQA_h!%RWvSd|YO77);!o!u-0Xw+c-eDOh4VD@Uu>yDV#@m1LMKkH$xjGR
zF>S4`boDmUAZ#R|9&~KhEf=7;q20R&15cXa?usL2lkgkAUZO(+64kln9E99Q?WI%_
z!u&nfyFK;j!5hsRlTj~ymOlPoqXZAlww_D4ywr5RmUgbz&k4UgxS>=T=#PuH#T4lF
zV;ftj3kp;91V!k|_;}Z|p+WWQBo%@B)qdS#Uw;o9AJ04*b<EkPFV+sz=ryOw=hZ6{
zW*6a^$5?3{Jc$jt=+Retpyw{7B^UQnY@lR3t9UR^yb5DUdLE$zeXY!!a2dK^XfMhz
zoU>lSuL<&1zIXS!zZ0dmr@e{s$7_JD5ERJm=$3nl^pIGhf2nsK^@x{~rki?rs5oMX
zh*UqS%wv4XbsOfmC_y+=9ul>_PPVRmoPR=@2WrlrF3XQMFk<f<$u>Cxb$0zOR3gQl
zOP3|#vwFc_g!*th5bR|MQ4U4gj9owk-<&{MQ%p4U)#4%taraaEj}|*3wX#CV*2fZ6
z#1QPitO9xH_fIYHI9dZHjZ>-Y#NCSqpQ(~SZ{Q^okQg2e1??5xmT_WIhPv~~21}aN
zWf8y_Y6z8pPg$8+!Vjw~8CJ%v;OWdyj(HDYVBN1jK!)EOG<_C0C8%LAukuEiB~d=k
ziyS;w)hIx}pEV4P3nSPc*A;RQBi?K10j4WBDCoE{PZ`fwG<a$WhSJQylf_pZ@U+en
zKn?+>XE(}5rt)&K-PVd4`1L0U3IOkSQ2FgP<k+U~TkObqu?<sUP1A##fe$z0IJRLF
z+L1%mCp@~ZQUd>J<LC6IU(sJlD;$c~Ccd9mk@}K)v>X?)^4ErVS()dnX+Ar#Q5&n&
zZcnZ43|f8a;r9GiZ|C>}+s$3=goVoZ^Ka`2DZ{#}2Omw0r4H0s`22onawNkbRF-NG
zIN5uhuokR~o*f=Yh!C?EiBNaYR}rA~ayxHmGPH~2!mPTI67K>F3EMC?AL>xvp*P&q
z6K-1D3BMKSW{3-sx0@f{KN!RLh1zZFQm6DOo)9Ko6b{1uZTGzCTgERAmzGk0=iXW(
zzQO_9Wbj-(eKV(X%r+f2B2GUYaDBS1aQpPmOnKvPy!4jwWJArp%|<8+VFQ`AG>ZI^
zJjX6!P-JAk-mmW5@&;9vQ`j$s_VS=?pZVdXOuavVL!yemOy{0{BaPT3E08MbmVycQ
zT#`Eip+-$lXKaJf3Ypsf4uw-s=+V}FCH&#Q_g*2D1gveI;n<tbP3nF9xaV2w*8|S#
zk1cnOeL_`L{_uX#^wQ2qE2RIv^Waxr-%1kWu#_x9i>ib`a7O9Qi_nGFE|ax~nx>o=
z;~2pK@6U$zqfpDas-k&HnerBa>_m+qP$&{D=Io+~_GcD5vZSIMq<(G(r1l80Oh*G=
z&Zq+5X{ROGdR#L$tk~jnT1>RDB#5mjKVb5`xr-_3*LHT|u~-RE$<x6m$~NXEN94tU
zpbB1a2sVAoOv*z+9cJ^;TO>|{BT|IBAk5SzaS$-=V<(!7(VOBn)d^t(uT@b8nG)4R
zfo&JKFvph<Tq)49XZ%H0ze++SxYldC>KtQgAg}Szg==?Ecj{`L`{DbUhOAy*twQ3j
zU%%?p5`_*lS=1+w$x*BA(4#I%q;b93x}X!;>+8-H-uOe+jachxMm<WIcI)Y7dS@*4
z!Bk>Z2evq8+H~TTO0%K<xzs}Qq7H0$cZx^89k;qQs)5qofx0T^cA!|PXX<<3RKjby
zq!hHCKv!^h5wmMf8PZ>M&adU4@EAy&NjdZguDppma|vjF%)2qSIkk==59xRn!h(&=
zO8;@+E;C%^=tqvr0ug_CPgZRw5achRs5kgZ#~-V@J)d;TBxi~A%LEf?`OY)XLgc<I
zU(psV{o9PuNl4NBGF{Jh#%FoD*0*(yDBMv>iwBp%9cgXSdi|$_5mJhn^rw={C*GSI
zadHx^pGp+pV>jw9^n>0g!e;mlW7|N)T$WiCH;R{@y()C)&d>FnCnC&Tbe|+Aod5@O
zchK!^pY=#Giw)lc=<7~vgm*3*ll%+hxXpv_85@B@$y#oDAI{#1laa`6!i33$P^9Y!
z&#!5DNXDBF&~3t}a|KE3jg7Vwa%{sRLdGlq^&<3WrYfZI(&1ZBJ$-?s9yJhSq`PM?
zeoodPteU8F7o&YQ`X&!&RLKtNo(mU1p=2@}%vq4{?X%GEh=8#ss6}P<c@^iHXXlh(
z#)Ep502Oo*G%N{<fo!Iu6zCHkpm1_TsXNibC!wDTqGyjP+Z<pS^8=Kv73h1ryXJ~5
z)c7;yA19Zgo*=j}#}%1<wftC2^gDlUc~meIY7U~&23mVTgJGuQZcxucKv5v5=bF`D
zN-@#dz|6nG)OY8<gFdVZn(9gAm$4R~gZ0^K>J=ixfucW}^F7b7jNg`cSx87I^<3p?
zQbYXO2RRw;IrW1*Iye+Yu^ls9h+b1+wAb`l2npGa%E<OKVcldFUneC-?5m{*tRzxv
zl92bCu~YXt4S%%~HG^xRntJGz_j1;`(lzbX2dl(|j83;Rgyv@hLCq~Tt5FP*WI~W_
zk@}goiOS+<7?r&a%Ovz<#zsBi^|jd$kE2)DN8$!!^{kgMa7PyrLR@!+hFzh5_JH2U
z8#T~$=~JH+^5?=|Y6Fq6JjU?5*bR+$yE|h`$5sjldqpU?FOuGt2MCn*my7pQ-puvy
z>1tB8bfb6L1a{Y=-TN=2Lk7ZeHlZ_#>3IpOc7=+V#Zx-XqWqDie32RnX&VhgZJ-8*
zUWwhTh<11BBN=tnxY320w_%=*rnbHWZ-u14^HoMCBOjReQhoCJz79F6L_h&}AL4@V
z-+kOwa0t)6_ZAr_39(frOs{vYs#{l)?|)d7xllCG>Rk1Th>Rny9zchB5cE{=8fu3n
zIwIUc!pZ50RU+oz6BAur#`augH8N@u9#?PI9r0aPp)^v)uJZvTF+~t_AH(i1G9v75
z-8C`^cXk5p0Qzq#5t)i!lS^K1DI+_EyZ){#o-cW~Fkff4>hnSpvNI{yh>5-_0fk6H
z6$&7T*---rj4sQH+ke;CoXT8jrUkx`hJ;MYpT|TixWJ+2djv{O3?K+AzpWGqB(ptE
zVzWpoLp>^j>7g*abq7Kq6{df71LfQ;M%{V-0o$)VqVQRG$)tzDbSXg3Wzvr-7rQaN
z^9M)dMi@9e2e^%6EY$X7l4m7h^N8~ErpL(EHlEzZNfv5CndE~^a`O)AyIu3rue${!
z55niCTo#bOML?iegZtjxg^R`QcuWHN@hy-=esp$-Nq$rm7Y%fJN<+XFQ1Ti<&@moP
z%UkZsH=yCRL^h_zB&)YfjZeg4namO_=8134Oh0c}GMR^A=A+~!^IWFnCt@)$vzZKw
zdF>lBSgkjlm5aSvDb%TCxqC^?X);O#kI*82zQ|EN2%JuKV*kw*D1Hax{hvw;HEoWJ
zO%7vnQhZtd*cBrfQQgzf5N)V}vQ{Cc&nj_jpGAPnX8fF%>d>SP1U%rO*SSK|u@-7i
zxMHLCNkS`9ECbpcq3I|KwMTmaRRUU(fGm}kN$Dxd^V0jG9KK0FoIISZLWtQKD2oDw
z@7X<{tH|NV161;GVw<3>S(e7!gB*?$pj>!3`6KrWuuPs*hfWwPzdZHe=n;+#UD)8*
zvV23n$Zde{D_T?oszb6&SaE?AcZ;6=V3wJ|X3@W;<p75~8nmYayg;HKS7aHAKgt0w
z3B3a5+z17MT@GSpO!E%g<5$3|SU3mXTa1MgkO7eR_9l?{I2fW&j3I&T^7HO{IWpp6
zq9-)=0QHOfk>Jj)dcN@1d0jDT;4?2>su5BKv3SA-r-;Dz_*q$gS~uvoPSEpH$}dl(
z!j9MjN36{~`RMo6p#89W{4jMdOf~fcfCEsE!MrAby3XPiWKvHkzdR=kQ%jgscH$sk
z<b7ep-U|yBzo0DG?Y3uS-s6BMf_Q(v4JI~i5vhEUuXg~>FEFtTCO$3m9tK1q!1)3Y
zm4iVrCQpM1vsoN9DG#U<*os<y8c4k)q`6o0>_3%&aeRg)5+%ry!3Og1TnHfrfv~a@
zLxrg$u8>ANa9<7%<tQlI+&xha-T_VY<l|h%72w9S95l=CR9Y{Hm=CG!R_ds%Kr(0&
z`0$V-^}3?9$6dai>1lE<N)H=@V%Z*hLwsIcQqqR2&0jWVxeHRy7ZEmAAKe>E6H2WW
zssHz0-ROC{Fm!So=11VAe0xvG_%vT6B3xSjs}+H}8Zvg3grHw0U>WiCF&hLO0GkKn
z?f;)iD<raGR|oX<g%LJGBelx67|YI<;i}ILMT#AQpp3hG5OiY~2LxTIf&Q2D|B6Ir
z(_~vNcRhjUMlR_?<35`38BPC{{}iCuuGGu^_r)%Y(NHg*6v6*!wMG2w!(aj>Qo`uH
zPMEt-V~GvpyF<L^s(}sV-L+Qia3*@8)F{3w#@E#WQSlkG5^EDQ!FaGBsCs~Qp`eQ%
z&Eed>=2ktt@&3A=%M_)Y+Izt0QO}&+vl+g+-}fxNWK?OpU*8)2iuT<+&0THl@WbKZ
z<P;e4PxE>8iAfWET=Iz5j(A}GE_Nk7J3i1LiJqV{c8c_`59~his4ld9sCD#O#70i?
zk5H%f4rC|6V3x4x;4){9(H;D)RFHNtvFYo+FN2LAs+{JqwhwC$U-Dk7oh&9JlPddg
zUNu2ncvt9}n$uZ_(xG4q&M2&6yK_r%skc1->qw%Wb0a5KwrAG<0&w)Vq><L%l!(x?
z>xD)SoBrW7&}oHg^q>+geLOl5v%G{Jnsj&enORRu>2kkQ=&&QVNk=_FpT^(S)L9at
zM)2to@vY?-ta@e+woC$eCrI&6$3$ha{TFk1(0i%lc^0_W(Ed}5)E$BqvGt;1x{{ur
zbZ~fxZJly%p)WcAX^=E900^uR8V{Y!+_^AZm3}X~1FPvwqok$vsq|o1_I%lFZhj!X
z(Vy?C=dv+6v+&&^Oyl6si6@<31Lb>k0NzksoK$#URpr)@px|bvO1tn>^7eGC&Fb&w
z>eyVOF#1;mwuV%?-uZGdGx#I}g}hX^1}+G0<Bp>Pc%`BUdLjDnsI94v(a&>AT6D?+
zI;j7LZ`t|6LfNHGOWVP>4k5~)Hb+I!YU3aO@#2dV3SHO~8GO?!kT9^(HsR`U=Fpuf
z?do;nhDqMf>B)Gr<a$Di>bhXM?6ZUGLlUbc1F9>!eBk0T?ih6UepH(jp?jh)0-N3O
z#MG@}+-9SC;DN(>y}xrECd^fD?33%1bN@Hfp`x&~rXa2f0Js$Ab3fRF5m5pf5s2i;
zbUXv*Of(dG3S2$#ng@{o1vTqx5JH&RW_2&hL5RyZkclz)GaXkX!Ocyd%m&LJ9*&Gq
zjto;KiZ9`d9NPtC=P-q|$!@{CHWz3*8eDcc0F608R#+z35k_2!W1Ck6S3}M%vULob
z1#SzD+3<52^U!bQ4l-5Z|5f<|V3BQ@l|K*4yhpk}ez`tGd5QNX^ki}w8!%xKuuA8O
z-oGsMMN!nBwsJUA@7v0T3+>|7+5VK;phPx{xh*Z7wjW{i6*_sGtbJHwVdS`q^X5vu
zbJwDokdW_4SDZ8?sp-09DCLAZxcT$bLU&U8*2=n>K(>$8K0V(70QzeU7$N~^vgA&O
zZ$B#>JCQrBQvykExx*A|jgy1f4*$z`a~Wo{M6nY;w0l1wu63LoT=do#OHLmX+{q!I
zzxUtJFH6D5YUR&V+1vzw4~4n{BSwj>kWOgag74()JU9XJ`C9y2X?)^d$&}v33?7Uy
zSx8&Katgk2v+pxA69NF~7FIU*<c3{?=RPNZJt<q^Ijr%G8J-+xI5#kyR$zi$=UeKq
zQC1^Ny(kXy4}f=gIMW?Qm|{SL;H|@`onGk{gX1bQIKlY^FfOswM8Ife@eoAGlSZ7Q
z4O+YSBwP3t$3!<@tc4ByP{Ik<AAsFe2F3IJots}&?nWypiqh|%;Rm?SpiOgL<v&o3
z${0kgTfJ00vuY?So)X}AHuYEfOo}~#Hejt%!;C;5m_hj>OZ@~Qr^FB93dMRw!px>|
ztEHGrDPjNFL<a>pfGzcDfSQtzmS12R|5}(8128WHjyEiz=N@ra)e;l)%_cN~@1Fde
zrZAFueanU!5^EGV?D=>fzwq(pF7(*1eO*nnOup@$VTR1aRkCt(h|Bocu@54?EogP-
z3BPlF_$R*C9SlI-!U&27GmW*Zbh+|JenM|VES$`LwNEtfm3?gV95Lu-_|MEtM+!4K
zTCDWFFo26`MNw4dl?Mw1vcj5E2k$MxI?CtvQ$Y|evu|q5aOK{DPbk<fm1myTW!l!x
zvMq;s{5^R&x0@bf(kU$Zer6GZCDy9PvHy!FODEN!l9Eiap2JV<!wGRj`&|p4)mTmV
zgNpOgx}Xkq`Qc#*d@kMn6f@uKL??A<F=uGYu6c0;Y?lEq{X{iXliS2050+lGCgt(U
zYAh+H6@Wa;k&!EnAj}Qlajv6|>WkrN=>$p3&0A3xJ~25`h*=n$!*Dc_?Xk5b=z+_p
z-wyTV>lrKCsDmt}Gb>baz8)5JljXSQc1|pu6wN*J^>u)py+!8b)bp)-bccmc-9Y^>
zv+V#C^bt%^sn|_QL3xLa&c_dNql#cc1rq{jfm=r~^p>A;=Vg3opn}&p0?dtI%?FN&
zbu!$oKBv8wKxjDwBU^6Rvgp!qivo18D-31Q-M9F+=sOVYeoQ);KbgmEo-fnUtW94u
zuMHG4m@`$H-~~qK6Ch+#3enCK4#rH@qzh^(G{;uiW)0K`m<6@<ftg%oOJF@^2~L0A
z*1+@x4WGOFLV((Kw7d>JPGIuW0B3|Raxf-Z^WtBN&xb(Lz#N4F;}MF(aU9f`Rh7l(
zWtQBeIJgn0g~Qq|DBDc3EUPEMmPzP<v|rpMs_F{6v4c7Sf(h0m3Zi)*4jnB|+cKe_
zX+jGqQLEFLj^<nA)Esl34&mXP%I?T?Y-cI6mV-@@M**=b`$Zcl!Ig=&v+*xTM9uaF
z{8zB1OI>hr8SMRDW%yuo-`<oEKk)s+anttdDI<Et;ibi@etOid%ip}*|LfZBJY_`j
zxArY7c=zU9H`7sFx3uXNu-9Cb_VlUrRs3Gc<{vkg5%1DHm{M}J$Cx4#vYopkliTm(
zm8ZLA*O*76tvk~tm8u^i!}r1KYui3XnTYfdz<wlNamI%dq{I^%l2Mhew0+LII$cTR
zeF9Dag*o|fjS{%9JfU>*15pR3TcT@<Ou!G&%5N`UbgRZQ{M;5h%(Wmcxv)dPGmT4|
z?MSVnS>)2Bi%Ye3enPf&xIEDFXWdgzH7L;Nab2ol-lGn?^#<80ZflL9gh6}mruYi+
zt2>f6M{+vn_44=A{0byi(t}CQzn7{ozs(xAGku2lVw`ed=2me0Zh1L#iK)Hec=4@C
z`JK^H<-v8FmbR#j%tK!70jX5)ez{de1ZP|Xx1-NgQKwHE|Cd4650xc?*!Ljt5$bN0
z&+8AyOMb`h>Pg0~BCA~n7#oKf$i&-A+@a3k<}DtS##No4vlC6~TR!E{)&9_XAEx#u
ziG=D43e2O|+!f-Uwg#!tE_QW4i>JhP9v(AW7+S^Z7I{c)rlvTtD$^*#0~FdBA%wt9
zR!Om4gsbUEO!Qq=-5@Oj0fW>zWooHV20XwcEtE{kUrT{iN4*|s)L^k<48Dn(%D$mY
zO<@%kx5iy?fGDDf&G0RmX5cFqhp<|~yV05jKP^5NPAaVmtjG61SrWoG4p&4jE;<>n
zjJ%C=pS+AT=q1v}EnPlGfo1IOb)3G&UhKF5nxaX%u6LBo{q_9N(Q<dMN7-1s{Q7K2
z#<b~~DYs0=@F~6D1C`oX<nQgjr28!9OXgI)|C|&g4nMT6D!WPS>cz?Rm+l!Lu_YZL
zb6W^xI&NsV0MnrTN0e=l-;fX{8fm=J>&uWbI{$g_1l_mHbwPv<<$PSobZo@Fahw66
z5X`Wbl18Kjh4ZB>N`K?$bYIf@^-Ap=5a(i2ek*$u8t1|cFx~(@Fp{@fOn^{u+yGtr
z$Nnx@Q#a6*24Aj7V?AEZuzX=+3A+)rJ0==$1#e&2K5sWEr=I~}zzCv%)q{DnG+>2}
z?h<Wy>jt_7ciAbhGpXBDQJUwF-;?S1MtuoiP$n1|o+gXv-z6$jpb9e?=K~*JQ|&Uz
zkN0?jJ`6oSqI@{uG;Dq3{v8N0?KciPfz*qNqN?+u6*LE4I+SGy7I6F_u!&jHnPmT+
zUQnnI)w9n~B7Fmwj-W%Q&M6mLRb*U;Ahzf5{{p-<5QqezRy@M@vT8(uWIbQxEn$SA
z%XbE@o`+t##_>x9#9#Z06v8kVT2`J9yFD^`c&sjr6Bsi|NQ{lv<AXm=DxC}SZJaR&
z3bJB~?nZA2;kVP_iDaQ1Wgwx_;nf%<0P$HTo0M<Xil@==_xuOe9Un@)m>H<TuK!6y
z1NB{hai6;N|HgAH>R*VI*_$v!G}?V>G;{+^LaHluxOY_k=PF9y*MrfYAHMMCs6XDY
zadjxJgY?rdcy2W0gG_j{lRC*;l@@y8HhgHxq;b+K6@rW*m3o30^gra4mBJ7#xip%v
TgmUtMO+J16+_6t4j?w=IGt&Wn

diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js
index 4e67a28cb..b52c49c82 100644
--- a/public/js/apps/Cis.js
+++ b/public/js/apps/Cis.js
@@ -6,6 +6,7 @@ import fhcapifactory from "./api/fhcapifactory.js";
 Vue.$fhcapi = fhcapifactory;
 
 const app = Vue.createApp({
+    name: 'CisApp',
     components: {
         FhcSearchbar,
         CisMenu
diff --git a/public/js/apps/Cis/Cms.js b/public/js/apps/Cis/Cms.js
index e812c354f..b0a5ccd3c 100644
--- a/public/js/apps/Cis/Cms.js
+++ b/public/js/apps/Cis/Cms.js
@@ -6,6 +6,7 @@ import Phrasen from "../../plugin/Phrasen.js";
 
 
 const app = Vue.createApp({
+  name: 'CmsApp',
   components: {
     CmsNews,
     CmsContent,
diff --git a/public/js/apps/Cis/Documents.js b/public/js/apps/Cis/Documents.js
index e5d1e8fad..c54c67232 100644
--- a/public/js/apps/Cis/Documents.js
+++ b/public/js/apps/Cis/Documents.js
@@ -5,6 +5,7 @@ import Phrasen from '../../plugin/Phrasen.js';
 //CssLib.import('../../vendor/olifolkerd/tabulator5/dist/css/tabulator_bootstrap5.min.css');
 
 const app = Vue.createApp({
+	name: 'DocumentsApp',
 	// mixins: [
 	// 	Phrasen
 	// ],
diff --git a/public/js/apps/Cis/MyLv/Student.js b/public/js/apps/Cis/MyLv/Student.js
index e0a13a728..095a3f780 100644
--- a/public/js/apps/Cis/MyLv/Student.js
+++ b/public/js/apps/Cis/MyLv/Student.js
@@ -2,6 +2,7 @@ import MylvStudent from "../../../components/Cis/Mylv/Student.js";
 import Phrasen from "../../../plugin/Phrasen.js";
 
 Vue.createApp({
+	name: 'MyLvStudentApp',
 	components: {
 		MylvStudent
 	}
diff --git a/public/js/apps/Cis/Profil.js b/public/js/apps/Cis/Profil.js
index 7a084744a..b19c448ae 100644
--- a/public/js/apps/Cis/Profil.js
+++ b/public/js/apps/Cis/Profil.js
@@ -34,6 +34,7 @@ Vue.$collapseFormatter = function (data) {
 };
 
 const profilApp = Vue.createApp({
+  name: 'ProfilApp',
   components: {
     StudentProfil,
     MitarbeiterProfil,
@@ -403,4 +404,4 @@ const profilApp = Vue.createApp({
 profilApp
   .use(primevue.config.default, { zIndex: { overlay: 9999 } })
   .use(Phrasen)
-  .mount("#content");
+  .mount("#content");
\ No newline at end of file
diff --git a/public/js/apps/Cis/ProfilUpdateRequests.js b/public/js/apps/Cis/ProfilUpdateRequests.js
index b2c761b6e..c007cca5b 100644
--- a/public/js/apps/Cis/ProfilUpdateRequests.js
+++ b/public/js/apps/Cis/ProfilUpdateRequests.js
@@ -2,6 +2,7 @@ import ProfilUpdateView from "../../components/Cis/ProfilUpdate/ProfilUpdateView
 import Phrasen from "../../plugin/Phrasen.js";
 
 const app = Vue.createApp({
+  name: 'ProfilUpdateRequestsApp',
   components: {
     ["profil-update-view"]: ProfilUpdateView,
   },
@@ -29,4 +30,4 @@ const app = Vue.createApp({
       });
   },
 });
-app.use(Phrasen).mount("#content");
+app.use(Phrasen).mount("#content");
\ No newline at end of file
diff --git a/public/js/apps/Cis/RoomInformation.js b/public/js/apps/Cis/RoomInformation.js
index f11326c11..21256ecca 100644
--- a/public/js/apps/Cis/RoomInformation.js
+++ b/public/js/apps/Cis/RoomInformation.js
@@ -2,7 +2,7 @@ import Phrasen from "../../plugin/Phrasen.js";
 import RoomInformation from "../../components/Cis/Mylv/RoomInformation.js";
 
 const app = Vue.createApp({
-    
+	name: 'RoomInformationApp',
 	components: {
         RoomInformation
 	},
diff --git a/public/js/apps/Cis/Stundenplan.js b/public/js/apps/Cis/Stundenplan.js
index 9ab22affa..cdbdd394d 100644
--- a/public/js/apps/Cis/Stundenplan.js
+++ b/public/js/apps/Cis/Stundenplan.js
@@ -4,6 +4,7 @@ import CalendarDate from "../../composables/CalendarDate.js";
 import LvModal from "../../components/Cis/Mylv/LvModal.js";
 
 const app = Vue.createApp({
+	name: 'StundenplanApp',
 	data() {
 		return {
 			stunden: [],
diff --git a/public/js/apps/Dashboard.js b/public/js/apps/Dashboard.js
index 039e7b901..9f42092f4 100644
--- a/public/js/apps/Dashboard.js
+++ b/public/js/apps/Dashboard.js
@@ -4,6 +4,7 @@ import FhcApi from '../../plugin/FhcApi.js';
 import Phrasen from '../../plugin/Phrasen.js';
 
 const app = Vue.createApp({
+  name: 'DashboardApp',
   data: () => ({
       appSideMenuEntries: {}
     }),
diff --git a/public/js/apps/Dashboard/Admin.js b/public/js/apps/Dashboard/Admin.js
index e0b21cfb5..9d64998a8 100644
--- a/public/js/apps/Dashboard/Admin.js
+++ b/public/js/apps/Dashboard/Admin.js
@@ -4,6 +4,7 @@ import FhcApi from '../../plugin/FhcApi.js';
 import Phrasen from '../../plugin/Phrasen.js';
 
 const app = Vue.createApp({
+  name: 'AdminApp',
   data: () => ({
       appSideMenuEntries: {}
     }),
@@ -15,4 +16,4 @@ const app = Vue.createApp({
 app.config.unwrapInjectedRef = true;
 app.use(FhcApi);
 app.use(Phrasen);
-app.mount('#main');
+app.mount('#main');
\ No newline at end of file
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index 8dd8fe44b..fb338c1ae 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -3,6 +3,7 @@ import FhcApi from '../../plugin/FhcApi.js';
 import Phrasen from '../../plugin/Phrasen.js';
 
 const app = Vue.createApp({
+  name: 'FhcApp',
   data: () => ({
       appSideMenuEntries: {}
     }),
@@ -13,4 +14,4 @@ const app = Vue.createApp({
 app.config.unwrapInjectedRef = true;
 app.use(FhcApi);
 app.use(Phrasen);
-app.mount('#content');
+app.mount('#content');
\ No newline at end of file
diff --git a/public/js/apps/DashboardAdmin.js b/public/js/apps/DashboardAdmin.js
index fed16f577..1f3e831c8 100644
--- a/public/js/apps/DashboardAdmin.js
+++ b/public/js/apps/DashboardAdmin.js
@@ -2,6 +2,7 @@ import {CoreNavigationCmpt} from '../components/navigation/Navigation.js';
 import DashboardAdmin from '../components/Dashboard/Admin.js';
 
 Vue.createApp({
+  name: 'DashboardAdminApp',
   data: () => ({
       appSideMenuEntries: {}
     }),
@@ -11,4 +12,4 @@ Vue.createApp({
   },
   mounted() {
   }
-}).mount('#main');
+}).mount('#main');
\ No newline at end of file
diff --git a/public/js/apps/TestSearch.js b/public/js/apps/TestSearch.js
index 469aaeb09..f012d060f 100644
--- a/public/js/apps/TestSearch.js
+++ b/public/js/apps/TestSearch.js
@@ -5,6 +5,7 @@ import CoreSearchbar from "../components/searchbar/searchbar.js";
 import FhcApi from "../plugin/FhcApi.js";
 
 const app = Vue.createApp({
+	name: "TestSearchApp",
 	components: {
 		CoreNavigationCmpt,
 		CoreFilterCmpt,
@@ -192,4 +193,4 @@ const app = Vue.createApp({
 	}
 });
 app.use(FhcApi)
-app.mount('#main');
+app.mount('#main');
\ No newline at end of file
diff --git a/public/js/apps/lehre/Antrag.js b/public/js/apps/lehre/Antrag.js
index 179e810cc..c2d410e81 100644
--- a/public/js/apps/lehre/Antrag.js
+++ b/public/js/apps/lehre/Antrag.js
@@ -4,6 +4,7 @@ import StudierendenantragInfoblock from "../../components/Studierendenantrag/Inf
 import Phrasen from '../../plugin/Phrasen.js';
 
 const app = Vue.createApp({
+	name: 'AntragApp',
 	components: {
 		StudierendenantragAntrag,
 		StudierendenantragStatus,
diff --git a/public/js/apps/lehre/Antrag/Leitung.js b/public/js/apps/lehre/Antrag/Leitung.js
index 637ca3f61..22c3fa3f5 100644
--- a/public/js/apps/lehre/Antrag/Leitung.js
+++ b/public/js/apps/lehre/Antrag/Leitung.js
@@ -2,6 +2,7 @@ import StudierendenantragLeitung from '../../../components/Studierendenantrag/Le
 import Phrasen from '../../../plugin/Phrasen.js';
 
 const app = Vue.createApp({
+	name: 'LeitungApp',
 	components: {
 		StudierendenantragLeitung
 	}
@@ -9,4 +10,4 @@ const app = Vue.createApp({
 app
 	.use(Phrasen)
 	.use(primevue.config.default,{zIndex: {overlay: 9999}})
-	.mount('#wrapper');
+	.mount('#wrapper');
\ No newline at end of file
diff --git a/public/js/apps/lehre/Antrag/Lvzuweisung.js b/public/js/apps/lehre/Antrag/Lvzuweisung.js
index 78abec5cf..ecad05fa5 100644
--- a/public/js/apps/lehre/Antrag/Lvzuweisung.js
+++ b/public/js/apps/lehre/Antrag/Lvzuweisung.js
@@ -2,6 +2,7 @@ import LvZuweisung from '../../../components/Studierendenantrag/Lvzuweisung.js';
 import Phrasen from '../../../plugin/Phrasen.js';
 
 const app = Vue.createApp({
+	name: 'LvzuweisungApp',
 	components: {
 		LvZuweisung
 	},
@@ -13,4 +14,4 @@ const app = Vue.createApp({
 });
 app
 	.use(Phrasen)
-	.mount('#wrapper');
+	.mount('#wrapper');
\ No newline at end of file
diff --git a/public/js/apps/lehre/Antrag/Student.js b/public/js/apps/lehre/Antrag/Student.js
index 80cea89e9..1848daea4 100644
--- a/public/js/apps/lehre/Antrag/Student.js
+++ b/public/js/apps/lehre/Antrag/Student.js
@@ -2,10 +2,11 @@ import LvPopup from '../../../components/Studierendenantrag/Leitung/LvPopup.js';
 import Phrasen from '../../../plugin/Phrasen.js';
 
 const app = Vue.createApp({
+	name: 'StudentApp',
 	components: {
 		LvPopup
 	}
 });
 app
 	.use(Phrasen)
-	.mount('#wrapper');
+	.mount('#wrapper');
\ No newline at end of file
diff --git a/public/js/apps/lehre/lvplanung/LvTemplates.js b/public/js/apps/lehre/lvplanung/LvTemplates.js
index b6ad3ae81..5bb8694a0 100644
--- a/public/js/apps/lehre/lvplanung/LvTemplates.js
+++ b/public/js/apps/lehre/lvplanung/LvTemplates.js
@@ -23,6 +23,7 @@ import Phrasen from "../../../plugin/Phrasen.js";
 
 
 const lvTemplatesApp = Vue.createApp({
+	name: 'LvTemplatesApp',
 	components: {
 		CoreNavigationCmpt,
 		LvTemplateUebersicht
diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js
index a5d68bfbe..f34961676 100644
--- a/public/js/components/Cis/Menu.js
+++ b/public/js/components/Cis/Menu.js
@@ -12,8 +12,6 @@ export default {
         logoUrl: String,
         avatarUrl: String,
         logoutUrl: String,
-		atFlagUrl: String,
-		ukFlagUrl: String,
 		selectedtypes: Array,
         searchbaroptions: Object,
         searchfunction: Function
@@ -90,8 +88,8 @@ export default {
 		<li><a class="btn btn-level-2 rounded-0 d-block" href="#" id="menu-profil">Profil</a></li>
 		<li><a class="btn btn-level-2 rounded-0 d-block" href="#">Ampeln</a></li>
 		<li class="fhc-languages" style="text-align: center;">
-			<a class="btn btn-level-2 rounded-0" href="#" @click="handleChangeLanguage('German')"><img :src="atFlagUrl"/></a>
-			<a class="btn btn-level-2 rounded-0" href="#" @click="handleChangeLanguage('English')"><img :src="ukFlagUrl"/></a>
+			<a class="btn btn-level-2 rounded-0" href="#" @click="handleChangeLanguage('German')">Deutsch</a>
+			<a class="btn btn-level-2 rounded-0" href="#" @click="handleChangeLanguage('English')">English</a>
 		</li>
 		<li><hr class="dropdown-divider"></li>
 		<li><a class="btn btn-level-2 rounded-0 d-block" :href="logoutUrl">Logout</a></li>
diff --git a/public/js/components/Cis/Mylv/LvModal.js b/public/js/components/Cis/Mylv/LvModal.js
index 472a1e05c..6dbd91063 100644
--- a/public/js/components/Cis/Mylv/LvModal.js
+++ b/public/js/components/Cis/Mylv/LvModal.js
@@ -12,9 +12,9 @@ export default {
 	props: {
 		event:Object,
 		title:{
-		type:String,
-		default:"title"
-	},
+			type:String,
+			default:"title"
+		},
 	/*
 	* NOTE(chris):
 	* Hack to expose in "emits" declared events to $props which we use
@@ -148,4 +148,4 @@ export default {
 		</template>
 		<!-- end of optional footer --> 
 	</bs-modal>`,
-};
+};
\ No newline at end of file
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
index 40526162b..8b39ff456 100644
--- a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
@@ -53,7 +53,9 @@ export default {
 		openLvOption(menuItem){
 			if (menuItem.id == "core_menu_mailanstudierende"){
 				window.location.href = menuItem.c4_link;
-			}else{
+			} else if (menuItem.id == "core_menu_digitale_anwesenheitslisten") {
+				window.location.href = menuItem.c4_link;
+			} else{
 				this.preselectedMenuItem = menuItem;
 				Vue.nextTick(() => {
 					this.$refs.lvUebersicht.show();
diff --git a/public/js/plugin/FhcAlert.js b/public/js/plugin/FhcAlert.js
index b079bf98e..a2d9e3ceb 100644
--- a/public/js/plugin/FhcAlert.js
+++ b/public/js/plugin/FhcAlert.js
@@ -102,6 +102,7 @@ import {CoreRESTClient} from '../RESTClient.js';
 const helperAppContainer = document.createElement('div');
 
 const helperApp = Vue.createApp({
+	name: "FhcAlertApp",
 	components: {
 		PvToast,
 		PvConfirm
@@ -396,4 +397,4 @@ export default {
 		app.config.globalProperties.$fhcAlert = $fhcAlert;
                 app.provide('$fhcAlert', app.config.globalProperties.$fhcAlert);
 	}
-}
+}
\ No newline at end of file
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 4fb6b194e..44a2d7542 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -28941,6 +28941,2288 @@ array(
 			)
 		)
 	),
+	//
+	// DIGITALE ANWESENHEITEN PHRASEN BEGIN
+	//
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'anwesend',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'anwesend',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'attending',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'abwesend',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'abwesend',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'absent',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'entschuldigt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'entschuldigt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'excused',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'entschuldigungAbgelehnt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Entschuldigung abgelehnt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'excuse note declined',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'abgelehnt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Abgelehnt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'declined',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'entschuldigungAkzeptiert',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Entschuldigung akzeptiert',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'excuse note accepted',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'akzeptiert',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Akzeptiert',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'accepted',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'entschuldigungOffen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Entschuldigung offen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'excuse note status open',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'hochgeladen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Hochgeladen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'uploaded',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'anwesenheiten',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anwesenheiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Attendances',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'entschuldigungen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Entschuldigungen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Excuse Notes',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'codeEingeben',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Code eingeben',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Enter Code',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'codeSenden',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Code senden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Send Code',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'anwesenheitenverwaltung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anwesenheitenverwaltung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Attendance Management',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'bitteZugangscodeEingeben',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bitte Zugangscode eingeben.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Please enter an access code.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'code',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zugangscode',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Access code',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'eintragErfolgreich',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Eintrag erfolgreich!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Entry successful!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'wurdeRegistriert',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'wurde registriert',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'has been registered.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'neueAnwKontrolle',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Neue Anwesenheitskontrolle starten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Start a new attendance check',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'endAnwKontrolle',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anwesenheitskontrolle beenden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'end attendance check',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'entschuldigungsmanagement',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Entschuldigungsmanagement',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Excuse note management',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'digitalesAnwManagement',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Digitales Anwesenheitsmanagement',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Digital attendance management',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'entschuldigungAutoEmailBetreff',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Entschuldigung zur Befreiung der Anwesenheitspflicht: Neues Dokument wurde hochgeladen.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Excuse note for digital attendances - a new document has been uploaded.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'entschuldigungAkzeptieren',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Entschuldigung akzeptieren',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Accept excuse note',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'entschuldigungAblehnen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Entschuldigung ablehnen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Decline excuse note',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'entschuldigungLöschen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Entschuldigung löschen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Delete excuse note',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'entschuldigungHochladen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Entschuldigung hochladen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Upload excuse note',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'entschuldigungLöschenErfolg',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Entschuldigung erfolgreich gelöscht!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Successfully deleted excuse note',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'foto',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Foto',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Picture',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'summe',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Summe',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Sum',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorStartAnwKontrolle',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler beim dem Versuch eine neue Anwesenheitskontrolle zu starten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error when trying to start a new attendance check',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorAnwStartAndEndSet',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Beginn und Ende der Anwesenheitskontrolle müssen gesetzt sein!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The start and end of the attendance check must be set!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'anwKontrolleBeendet',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anwesenheitskontrolle erfolgreich beendet',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Attendance check successfully finished',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorDeleteQRCode',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler bei dem Versuch den QR Code zu löschen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Something went wrong with deleting the QR Code',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'deleteAnwKontrolleConfirmation',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anwesenheitskontrolle erfolgreich gelöscht',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Attendance check successfully deleted',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'deleteAnwKontrolle',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anwesenheitskontrolle löschen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Delete attendance check',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'noAnwKontrolleFoundToDelete',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Keine Anwesenheitskontrolle gefunden zu löschen!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No attendance check found to delete!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorDeletingAnwKontrolle',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler beim Löschen der Anwesenheitskontrolle!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error deleting an attendance check!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorValidateTimes',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Das Enddatum muss nach dem Startdatum liegen.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The end date must be after the start date.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'zugangscode',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zugangscode',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Access code',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'anwUserDeleteSuccess',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anwesenheitseinträge erfolgreich gelöscht.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Attendances deleted successfully',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorAnwUserDelete',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler bei dem Versuch Anwesenheitseinträge zu löschen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error deleting Attendances',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'anwUserUpdateSuccess',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anwesenheitseinträge erfolgreich aktualisiert.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Attendances updated successfully.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorAnwUserUpdate',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler bei dem Versuch Anwesenheitseinträge zu aktualisieren.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error updating Attendances',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorLoadingAnwesenheiten',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler bei dem Versuch Anwesenheitsdaten zu laden.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error loading attendancy data.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'warningEnterVonZeit',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bitte von Zeit eingeben',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Please enter a from time',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'warningEnterBisZeit',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bitte bis Zeit eingeben',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Please enter a by time',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'warningChooseFile',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bitte Datei auswählen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Please choose a file',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'entschuldigungUploaded',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Entschuldigung hochgeladen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Excuse note uploaded',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorEntschuldigungUpload',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler bei dem Versuch eine Entschuldigung hochzuladen!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error uploading an excuse note!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'addEntschuldigung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Entschuldigung hinzufügen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Add excuse note',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'noDataAvailable',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Keine Daten verfügbar',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No data available',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'noExistingKontrolleFound',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Keine Anwesenheitskontrolle gefunden.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No existing attendance check found.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorDegeneratingQRCode',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler beim degenerieren des QRCode',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error degenerating QRCode',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorSavingNewQRCode',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler beim anlegen eines neuen QRCode',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error saving a new QRCode',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorDeleteKontrolleKeineLEAnDatum',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Keine Anwesenheitskontrolle gefunden für LV-Teil {le_id} am {day}.{month}.{year}.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No attendance check found for teaching unit {le_id} on {day}.{month}.{year}.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorDeleteUserAnwEntriesAnDatum',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler beim Löschen der User Anwesenheiten für LV-Teil {le_id} am {day}.{month}.{year}.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error deleting User Anwesenheiten for teaching unit {le_id} on {day}.{month}.{year}.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorDeleteKontrolleEntryAnDatum',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler beim Löschen der Anwesenheitskontrolle für LV-Teil {le_id} am {day}.{month}.{year}.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error deleting attendance check for teaching unit {le_id} on {day}.{month}.{year}.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'successDeleteKontrolleEntryAnDatum',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Löschen der Anwesenheitskontrolle für LV-Teil {le_id} am {day}.{month}.{year} erfolgreich.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Success deleting attendance check for teaching unit {le_id} on {day}.{month}.{year}.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'wrongParameters',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Falsche Parameterübergabe',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Wrong parameters tranferred',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'missingParameters',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Unvollständige Parameterübergabe',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Parameters are missing',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorInvalidCode',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ungültiger Zugangscode eingegeben.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Wrong access code entered.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorCodeLinkedToInvalidKontrolle',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zugangscode hat eine fehlerhafte Anwesenheitskontrolle hinterlegt.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Access code is linked to an invalid attendance check.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorCodeLinkedToInvalidLE',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zugangscode hat einen fehlerhaften LV-Teil hinterlegt.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Access code is linked to an invalid teaching unit.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorLEhasNoStudentsAttending',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'LV-Teil des Zugangscodes hat keine Teilnehmer hinterlegt.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Teaching unit linked to access code has no participants.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorNotParticipantOfLE',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Sie sind nicht als Teilnehmer des LV-Teil eingetragen.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'You are not registered as a participant in the teaching unit.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorNoUserEntriesForAttendanceCheckFound',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Keine Anwesenheitseinträge gefunden für den LV-Teil an diesem Datum.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No attendance entries found for the teaching unit on this date.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorUpdateUserEntry',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Eintrag der Anwesenheit fehlgeschlagen, bitte wenden Sie sich an den Unterrichtenden.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Attendance entry failed, please contact the instructor.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorPersonStudentIDMismatch',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehlerhafte Verbindung von Person und Student ID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Person und Student ID Mismatch.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'successDeleteEnschuldigung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Entschuldigung erfolgreich gelöscht.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Successfully deleted excuse note.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorCalculatingAnwQuota',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler bei der Berechnung der Anwesenheitenquote.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error calculating attendancy quota.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorDeleteSingleAnwUserEntry',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler bei dem Versuch den Anwesenheitseintrag zu löschen.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error trying to delete the attendancy entry.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorDeleteMultipleAnwUserEntry',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler bei dem Versuch die Anwesenheitseinträge zu löschen.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error trying to delete the attendancy entries.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorNoSTGassigned',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Keine Studiengänge zugewiesen.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No study programs assigned.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'anteilAnw',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anteil',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Percentage',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorUpdateEntschuldigung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler bei dem Versuch Entschuldigungsstatus zu verändern.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error when trying to change excuse note status.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'successUpdateEntschuldigung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Entschuldigungsstatus erfolgreich aktualisiert.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Excuse note status successfully updated.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'lehreinheitConfig',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'LV-Teil auswählen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Configurate teaching unit',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'keineAnwkontrolleMöglichWeilLEFehlt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Keine Anwesenheitskontrolle möglich weil ihnen im System keine LV-Teile für diese Lehrveranstaltung zugewiesen sind.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No attendance check possible because no teaching units are assigned to you in the system for this course.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'anwByLva',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anwesenheiten für {lva}',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Attendancies for {lva}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'anwByStg',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anwesenheiten für {stg}',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Attendancies for {stg}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'anwByLe',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anwesenheiten für {le}',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Attendancies for {le}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'leLaden',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'LV-Teil laden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Load teaching unit',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorCodeSentInTimeOutsideKontrolle',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Der Zugangscode wurde außerhalb der Kontrollzeiten gesendet.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The access code has been sent outside the time of the attendance check.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorNoRightsToChangeData',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehlende Berechtigung um den Datenstand zu verändern.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Missing authorization rights to change data.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorCodeTooOld',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Der Zugangscode ist zeitlich abgelaufen.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The access code has expired.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'studentConfig',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Studenten auswählen.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Configure student profile.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'studentLaden',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Student laden.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Load Student.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'students',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Studenten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Students',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'termineLautStundenplan',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Termine laut Stundenplan',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Lessons as per Timetable',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'entschuldigungNotizAblehnen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Entschuldigung Ablehnen Begründung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Excuse note rejection reason',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'reject',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ablehnen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Reject',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'begruendungAnw',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Begründung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Reason',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'noStudentsFound',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Keine zugeteilten Studenten gefunden!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No assigned students found!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'kontrolldatum',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kontrolldatum',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Attendance Check Date',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'showAllKontrollen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Alle Kontrollen anzeigen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Show All Attendance Checks',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'deletableKontrollen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Löschbare Anwesenheitskontrollen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Deletable Attendance Checks',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'anwInfoKeineKontrollenGefunden',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Keine Kontrollen zum LV-Teil gefunden!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No digital attendance checks found for teaching unit!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'digiAnw',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Digitale Anwesenheiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Digital Attendances',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'anwNotizUpdated',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Notiz wurde erfolgreich bearbeitet.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Note has been edited sucessfully',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorInvalidFiletype',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ungültiges Dateiformat!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Invalid Filetype!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'anwCountTermin',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anwesend am gewählten Termin',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Attending at date',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'minuten',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Minuten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'minutes',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'einheiten',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Einheiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'units',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'prestudentID',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Prestudent ID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Prestudent ID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'allowedEntschuldigungFileTypes',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Erlaubte Dateitypen sind .pdf, .png und .jpg.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Allowed file types are .pdf, .png und .jpg.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'tooltipStudentEntschuldigung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Sie können eine Entschuldigung für einen Zeitraum von bis zu {0} Tagen in die Vergangenheit und bis zum Ende des aktuellen Semesters hochladen. Die erlaubten Dateitypen für das Dokument sind .pdf, .png und .jpg.
+
+				Sobald Sie eine Entschuldigung hochladen wird die zugehörige Studiengangsassistenz informiert und Ihr Anliegen überprüft. Solange Ihre Entschuldigung noch keinen akzeptierten oder abgelehnten Status erhalten hat, steht es Ihnen frei diese inklusive Datei zu löschen. Sobald sie entweder akzeptiert oder abgelehnt wurde können Sie den Eintrag nichtmehr löschen.
+
+				Bei einer akzeptierten Entschuldigung werden sämtliche digitalen Anwesenheiten in diesem Zeitraum als positiv gewertet. Eine abgelehnte Entschuldigung hat keine Auswirkungen auf ihre Anwesenheitsquote.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'You can upload an excuse for a period of up to {0} days in the past and up to the end of the current semester. The permitted file types for the document are .pdf, .png and .jpg.
+
+				As soon as you upload an excuse, the relevant study program assistant will be informed and your request will be reviewed. As long as your excuse has not yet received an accepted or rejected status, you are free to delete this file including it. Once it has either been accepted or rejected, you can no longer delete the entry.
+
+				If an excuse is accepted, all digital attendance during this period is counted as positive. A rejected excuse has no effect on your attendance rate.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'tooltipStudentAnwesenheit',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Hier sehen Sie sämtliche digitale Anwesenheiten zugeordnet nach Lehrveranstaltung. Sie können eine positive Anwesenheit erreichen, indem Sie den während einer laufenden Anwesenheitskontrolle gültigen Zugangscode eintragen. Sie können hierfür den angezeigten QR Code scannen, welcher Sie entsprechend weiterleitet oder Sie können den Code manuell eingeben.
+
+				Sollte es Ihnen technisch nicht möglich sein einen Zugangscode einzugeben, können Sie die unterrichtende Person bitten Ihre digitale Anwesenheit zu setzen.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Here you can see all digital attendances assigned to the course. You can achieve positive attendance by entering the access code that is valid during an ongoing attendance check. You can do this by scanning the QR code displayed, which will redirect you accordingly, or you can enter the code manually.
+
+				If it is not technically possible for you to enter an access code, you can ask the person teaching you to set your digital attendance.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'tooltipStudentAssistenz',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Im Entschuldigungsmanagement können Sie als Studiengangsassistenz beziehungsweise als Administrator die von Studenten hochgeladenen Entschuldigungsdokumente überprüfen und den Status entsprechend vergeben.
+				
+				Bitte beachten Sie dass nur Entschuldigungen INNERHALB des angegebenen Zeitraumes angezeigt werden. Sollten Sie nach einer lang wirken Entschuldigung suchen, müssen Sie die Zeitspanne entsprechend weit setzen.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'In the excuse management, you as a course assistant or administrator can check the excuse documents uploaded by students and assign the status accordingly.
+
+				Please note that only excuses WITHIN the specified time period are displayed. If you are looking for a long-lasting excuse, you must set the time period accordingly.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'tooltipLektorDeleteKontrolle',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Sollten Sie eine Anwesenheitskontrolle fälschlicherweise gestartet haben, können Sie diese löschen wenn sie nicht älter als {0} Tage ist. Dabei werden sämtliche mit dieser Kontrolle verknüpfte Anwesenheitseinträge Ihrer Studenten ebenfalls gelöscht und Ihre Anwesenheitsquoten neu berechnet.
+
+				Sollten Sie eine Kontrolle, welche älter als {0} Tage ist, löschen wollen, wenden Sie sich an einen Administrator.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'If you have started an attendance check by mistake, you can delete it if it is not older than {0} days. All attendance entries of your students linked to this check will also be deleted and your attendance rates will be recalculated.
+
+				If you want to delete a check that is older than {0} days, contact an administrator.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'tooltipLektorStartKontrolle',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Um eine Anwesenheitskontrolle für Ihre ausgewählte Unterrichtsgruppe durchzuführen, wählen Sie bitte einen Termin aus dem Stundenplan aus oder geben händisch die gewünschte Gültigkeitkeitsdauer der Kontrolle an.
+				
+				Die Gültigkeitsdauer bestimmt die Gewichtung der Anwesenheit in Relation zum Gesamtausmaß, sie können diese aber nach eigenem Ermessen anpassen und müssen sich nicht streng an die Termine im Stundenplan halten.
+				
+				Sie können pro Datum und Unterrichtsgruppe eine Anwesenheitskontrolle pro Tag eröffnen, welche jedoch beliebig oft aufgerufen und von Studenten eingecheckt werden kann. Es gelten dabei ihre zuletzt eingetragenen Zeiten. Ein Student muss nur einmal am Tag pro Gruppe einchecken um als anwesend registriert zu sein, egal wie oft Sie die Kontrolle starten.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'To carry out an attendance check for your selected class group, please select a date from the timetable or manually enter the desired validity period of the check.
+
+				The validity period determines the weighting of attendance in relation to the overall extent, but you can adjust this at your own discretion and do not have to stick strictly to the dates in the timetable.
+
+				You can open one attendance check per day for each date and class group, which can be called up and checked in by students as often as you like. The times they last entered apply. A student only has to check in once a day per group to be registered as present, regardless of how often you start the check.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'tooltipStudentByLva',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'In dieser Detailansicht können Sie einzelne Anwesenheiten eines Studenten bearbeiten, falls ein anwesender Student aus technischen Gründen den Zugangscode nicht eingeben kann. Ebenso steht es Ihnen frei Studenten auszutragen, welche nicht anwesend sind aber den Zugangscode mit Hilfe von anwesenden Studenten erhalten haben.
+				
+				Falls eine Anwesenheit durch eine akzeptierte Entschuldigung entstanden ist, können Sie den Status nicht verändern.
+				
+				Es steht Ihnen frei die Anwesenheitseinträge mit Notiztexten zu versehen, welche dem Studenten nicht zugänglich sind.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'In this detailed view, you can edit individual attendances of a student if a student who is present cannot enter the access code for technical reasons. You are also free to remove students who are not present but have received the access code with the help of students who are present.
+
+				If an attendance was made due to an accepted excuse, you cannot change the status.
+
+				You are free to add notes to the attendance entries that are not accessible to the student.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	//
+	// DIGITALE ANWESENHEITEN PHRASEN END
+	//
 	// BOOKMARK PHRASEN ----------------------------------------------------------------------
 	array(
 		'app' => 'core',
@@ -33991,7 +36273,7 @@ array(
 				'insertvon' => 'system'
 			)
 		)
-	)
+	),
 	// AMPELN PHRASEN -----------------------------------------------------------------------------
 	array(
 		'app' => 'core',
@@ -34253,7 +36535,7 @@ array(
 				'insertvon' => 'system'
 			)
 		)
-	),
+	)
 );
 
 
@@ -34377,4 +36659,4 @@ foreach ($phrases as $phrase)
 }
 
 if(!$new)
-	echo '<b>Keine neuen Phrasen</b><br>';
+	echo '<b>Keine neuen Phrasen</b><br>';
\ No newline at end of file

From 46c4a3040885856ea0d190a94b6102752b03e62a Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 28 Oct 2024 11:36:49 +0100
Subject: [PATCH 1333/1461] css fix & header file import remove

---
 application/views/templates/CISVUE-Header.php | 2 --
 public/css/Cis4/Cis.css                       | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/application/views/templates/CISVUE-Header.php b/application/views/templates/CISVUE-Header.php
index 732800cea..6ee344391 100644
--- a/application/views/templates/CISVUE-Header.php
+++ b/application/views/templates/CISVUE-Header.php
@@ -36,8 +36,6 @@ if (!isset($menu)) {
 		logo-url="<?= base_url('/public/images/logo-300x160.png'); ?>" 
 		avatar-url="<?= site_url('Cis/Pub/bild/person/' . getAuthPersonId()); ?>" 
 		logout-url="<?= site_url('Cis/Auth/logout'); ?>"
-		at-flag-url="<?= base_url('/public/images/icons/at.png'); ?>"
-		uk-flag-url="<?= base_url('/public/images/icons/uk.png'); ?>"
 		:selectedtypes="selectedtypes"
 		:searchbaroptions="searchbaroptions" 
 		:searchfunction="searchfunction"
diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index 81e35e63e..ed14222fe 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -238,7 +238,7 @@ html {
   body {
     display: flex;
     padding-top: var(--fhc-cis-header-height);
-    width: 99vw;
+    width: calc(100vw - var(--scrollbar-width, 0px));
     /* overflow: visible !important; */
   }
   #cis-header {

From b801401d2b89629ff10cf05da32a63a0e845007f Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 28 Oct 2024 13:25:41 +0100
Subject: [PATCH 1334/1461] only shows the Week modus of the calendar if it is
 not a widget and opens the MyLV links as new tabs instead of showing them in
 the modal

---
 public/js/components/Calendar/Header.js                | 10 ++++++----
 .../js/components/Cis/Mylv/Semester/Studiengang/Lv.js  |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/public/js/components/Calendar/Header.js b/public/js/components/Calendar/Header.js
index 60c724162..57e9024e1 100644
--- a/public/js/components/Calendar/Header.js
+++ b/public/js/components/Calendar/Header.js
@@ -14,6 +14,8 @@ export default {
 		'classHeader',
 		'mode',
 		'updateMode',
+		'noWeekView',
+		'noMonthView',
 	],
 	props: {
 		title: String
@@ -44,12 +46,12 @@ export default {
 	template: `
 	<div class="calendar-header card-header w-100" :class="classHeader">
 
-		<div class="row justify-content-end" style="position: absolute; width: 98%; pointer-events: none;">
+		<div v-if="!noWeekView && !noMonthView" class="row justify-content-end" style="position: absolute; width: 98%; pointer-events: none;">
 			<div class="col-auto" style="pointer-events: all;">
-				<div role="group" aria-label="Kalender Modus">
+				<div  role="group" aria-label="Kalender Modus">
 					<button type="button" :class="{'active':mode_kurzbz == mode}" style="margin-right: 4px;" @click.prevent="$emit('updateMode',mode_kurzbz)" class="btn btn-outline-secondary" v-for="(mode_bezeichnung,mode_kurzbz) in modes">
-						<i v-if="mode_kurzbz == 'week'" class="fa fa-calendar-week"></i>
-						<i v-else-if="mode_kurzbz == 'month'" class="fa fa-calendar-days"></i>
+						<i v-if="!noWeekView && mode_kurzbz == 'week'" class="fa fa-calendar-week"></i>
+						<i v-else-if="!noMonthView && mode_kurzbz == 'month'" class="fa fa-calendar-days"></i>
 					</button>
 				</div>
 			</div>
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
index 40526162b..98e3dd873 100644
--- a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
@@ -118,7 +118,7 @@ export default {
 		<div class="card-body " :style="bodyStyle">
 			<ul class="list-group border-top-0 border-bottom-0 rounded-0">
 				<template v-if="menu">
-					<li type="button" v-for="menuItem in menu" @click="openLvOption(menuItem)" class="list-group-item border-0">{{menuItem.name}}</li>
+					<li type="button" v-for="menuItem in menu" class="list-group-item border-0"><a :target="menuItem.c4_target" :href="menuItem.c4_link ? menuItem.c4_link : null">{{menuItem.name}}</a></li>
 				</template>
 				<template v-else>
 					<li class="text-center" class="list-group-item"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></li>

From fbf041726938ffa5d2f0e6084b75e14d9612f3d2 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 28 Oct 2024 14:15:45 +0100
Subject: [PATCH 1335/1461] only adds the Events file from addons which are
 actually active and refactors the Lv Information into its own component

---
 application/controllers/Cis/MyLv.php          |  8 +-
 application/core/CI3_Events.php               | 11 ++-
 application/views/Cis/LvInfo.php              | 15 ++++
 public/js/apps/Cis/LvInfo.js                  |  8 ++
 .../Cis/Mylv/Semester/Studiengang/Lv/Info.js  | 85 ++++++-------------
 5 files changed, 66 insertions(+), 61 deletions(-)
 create mode 100644 application/views/Cis/LvInfo.php
 create mode 100644 public/js/apps/Cis/LvInfo.js

diff --git a/application/controllers/Cis/MyLv.php b/application/controllers/Cis/MyLv.php
index f815f26f8..9514d5b6b 100644
--- a/application/controllers/Cis/MyLv.php
+++ b/application/controllers/Cis/MyLv.php
@@ -13,7 +13,8 @@ class MyLv extends Auth_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'index' => ['student/anrechnung_beantragen:r','user:r'] // TODO(chris): permissions?
+			'index' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
+			'Info' => ['student/anrechnung_beantragen:r','user:r'] // TODO(chris): permissions?
 		]);
 	}
 
@@ -27,4 +28,9 @@ class MyLv extends Auth_Controller
 	{
 		$this->load->view('Cis/MyLv');
 	}
+
+	public function Info($studien_semester,$lvid)
+	{
+		$this->load->view('Cis/LvInfo',['lvid'=> $lvid, 'studien_semester' => $studien_semester]);
+	}
 }
diff --git a/application/core/CI3_Events.php b/application/core/CI3_Events.php
index 7e7e471b1..37f6c3f21 100644
--- a/application/core/CI3_Events.php
+++ b/application/core/CI3_Events.php
@@ -47,10 +47,19 @@ class CI3_Events
  */
 require_once(APPPATH.'config/Events.php');
 
+$active_addons_array = explode(";", ACTIVE_ADDONS);
+
 foreach (scandir(APPPATH.'config/extensions') as $dir)
 	if ($dir[0] != '.' && file_exists(APPPATH.'config/extensions/'.$dir.'/Events.php'))
 		require_once APPPATH.'config/extensions/'.$dir.'/Events.php';
 
 foreach (scandir(FHCPATH.'addons') as $dir)
 	if ($dir[0] != '.' && file_exists(FHCPATH.'addons/'.$dir.'/Events.php'))
-		require_once FHCPATH.'addons/'.$dir.'/Events.php';
+	{
+		// only includes the Events of the addon if the addon is one of the active addons in the cis config
+		if(in_array($dir,$active_addons_array))
+		{
+			require_once FHCPATH . 'addons/' . $dir . '/Events.php';
+		}
+	}
+		
diff --git a/application/views/Cis/LvInfo.php b/application/views/Cis/LvInfo.php
new file mode 100644
index 000000000..49a7b7a85
--- /dev/null
+++ b/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); ?>
diff --git a/public/js/apps/Cis/LvInfo.js b/public/js/apps/Cis/LvInfo.js
new file mode 100644
index 000000000..3ec63414c
--- /dev/null
+++ b/public/js/apps/Cis/LvInfo.js
@@ -0,0 +1,8 @@
+import Info from "../../components/Cis/Mylv/Semester/Studiengang/Lv/Info.js";
+import Phrasen from "../../plugin/Phrasen.js";
+
+Vue.createApp({
+	components: {
+		Info
+	}
+}).use(Phrasen, { reload: true }).mount('#content');
\ No newline at end of file
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv/Info.js b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv/Info.js
index 5d4b628a7..9676cf3cf 100644
--- a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv/Info.js
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv/Info.js
@@ -1,19 +1,10 @@
-import BsModal from '../../../../../Bootstrap/Modal.js';
-import Phrasen from '../../../../../../mixins/Phrasen.js';
-import LvMenu from '../../../LvMenu.js';
+
 
 const infos = {};
 
 export default {
-	components: {
-		BsModal,
-		LvMenu
-	},
-	mixins: [
-		BsModal,
-		Phrasen
-	],
 	props: {
+
 		lehrveranstaltung_id: Number,
 		bezeichnung: String,
 		studiengang_kuerzel: String,
@@ -38,8 +29,6 @@ export default {
 	data: () => ({
 		result: true,
 		info: null,
-		isMenuSelected: false,
-		menu: [],
 	}),
 	computed: {
 		lektorNames() {
@@ -80,58 +69,40 @@ export default {
 			}).catch(() => this.info = {});
 		}
 	},
-	methods:{
-		onModelHide() {
-			this.isMenuSelected = false;
-		},
-		onModalShow() {
-			this.$fhcApi.factory.addons.getLvMenu(this.lehrveranstaltung_id, this.studien_semester)
-			.then(res => {
-				this.menu = res.data;
-			})
-			.catch((error) => this.$fhcAlert.handleSystemError);
-		}
-	},
-	mounted() {
-		this.modal = this.$refs.modalContainer.modal;
-	},
-	popup(options) {
-		return BsModal.popup.bind(this)(null, options);
-	},
 	template: /*html*/`
-	<bs-modal ref="modalContainer" @hideBsModal="onModelHide" @showBsModal="onModalShow" class="bootstrap-alert" v-bind="$props" body-class="" :dialogClass="{'modal-lg': !isMenuSelected, 'modal-fullscreen':isMenuSelected}">
-		<template v-slot:title>
-			{{p.t('lvinfo/lehrveranstaltungsinformationen')}}
-		</template>
-		<template v-slot:default>
-			<template v-if="!isMenuSelected">
+
+			<!-- debugging print
+			<p>{{JSON.stringify(info,null,2)}}</p>
+			-->
+			<h1>{{$p.t('lvinfo/lehrveranstaltungsinformationen')}}</h1>
+			<hr>
 				<div v-if="!info" class="text-center">
 					<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
 				</div>
 				<table v-else class="table table-hover mb-4">
 					<tbody>
 						<tr>
-							<th>{{p.t('lehre/lehrveranstaltung')}}</th>
+							<th>{{$p.t('lehre/lehrveranstaltung')}}</th>
 							<td>{{bezeichnung}}</td>
 						</tr>
 						<tr>
-							<th>{{p.t('lehre/studiengang')}}</th>
+							<th>{{$p.t('lehre/studiengang')}}</th>
 							<td>{{studiengang_kuerzel}}</td>
 						</tr>
 						<tr>
-							<th>{{p.t('lehre/semester')}}</th>
+							<th>{{$p.t('lehre/semester')}}</th>
 							<td>{{semester}}</td>
 						</tr>
 						<tr>
-							<th>{{p.t('lehre/studiensemester')}}</th>
+							<th>{{$p.t('lehre/studiensemester')}}</th>
 							<td>{{studien_semester}}</td>
 						</tr>
 						<tr>
-							<th>{{p.t('lehre/organisationsform')}}</th>
+							<th>{{$p.t('lehre/organisationsform')}}</th>
 							<td>{{orgform_kurzbz}}</td>
 						</tr>
 						<tr>
-							<th>{{p.t('lehre/lehrbeauftragter')}}</th>
+							<th>{{$p.t('lehre/lehrbeauftragter')}}</th>
 							<td>
 								<ul v-if="lektorNames.length" class="list-unstyled mb-0">
 									<li v-for="name in lektorNames" :key="name">
@@ -140,12 +111,12 @@ export default {
 									</li>
 								</ul>
 								<template v-else>
-									{{p.t('lehre/keinLektorZugeordnet')}}
+									{{$p.t('lehre/keinLektorZugeordnet')}}
 								</template>
 							</td>
 						</tr>
 						<tr v-if="lvLeitung">
-							<th>{{p.t('lehre/lvleitung')}}</th>
+							<th>{{$p.t('lehre/lvleitung')}}</th>
 							<td>
 								<ul class="list-unstyled mb-0">
 									<li v-for="name in lvLeitung" :key="name">
@@ -156,37 +127,36 @@ export default {
 							</td>
 						</tr>
 						<tr>
-							<th>{{p.t('global/sprache')}}</th>
+							<th>{{$p.t('global/sprache')}}</th>
 							<td>{{sprache}}</td>
 						</tr>
 						<tr>
-							<th>{{p.t('lehre/ects')}}</th>
+							<th>{{$p.t('lehre/ects')}}</th>
 							<td>{{ects}}</td>
 						</tr>
 						<tr>
-							<th>{{p.t('lehre/incomingplaetze')}}</th>
+							<th>{{$p.t('lehre/incomingplaetze')}}</th>
 							<td>{{incoming}}</td>
 						</tr>
 						<tr>
-							<th>{{p.t('lehre/organisationseinheit')}}</th>
+							<th>{{$p.t('lehre/organisationseinheit')}}</th>
 							<td>
 								{{oe}} <br>
 								(
-								<i>{{p.t('global/leitung')}}: </i>{{oeLeitung.join(', ')}}
+								<i>{{$p.t('global/leitung')}}: </i>{{oeLeitung.join(', ')}}
 								<template v-if="koordinator">
-									<i>{{p.t('global/koordination')}}: </i>{{koordinator.join(', ')}}
+									<i>{{$p.t('global/koordination')}}: </i>{{koordinator.join(', ')}}
 								</template>
 								)
 							</td>
 						</tr>
 					</tbody>
 				</table>
-			</template>
-			<lv-menu v-model:isMenuSelected="isMenuSelected" :menu="menu"></lv-menu>
-			<template v-if="!isMenuSelected">
+	
+			
 				<div v-if="info && info.lvinfo">
 					<div v-if="Object.keys(info.lvinfo).length > 1" class="text-end">
-						<div class="btn-group" role="group" :title="p.t('global/verfuegbareSprachen')" :aria-label="p.t('global/verfuegbareSprachen')">
+						<div class="btn-group" role="group" :title="$p.t('global/verfuegbareSprachen')" :aria-label="$p.t('global/verfuegbareSprachen')">
 							<template v-for="lang in info.sprachen" :key="lang.index">
 								<button v-if="info.lvinfo[lang.sprache]" type="button" class="btn btn-outline-primary" :class="lang.sprache == currentLang ? 'active' : ''" @click.prevent="info.lastLang = lang.sprache">{{lang.bezeichnung[lang.index-1]}}</button>
 							</template>
@@ -202,8 +172,5 @@ export default {
 							{{i.body}}
 						</p>
 					</template>
-				</div>
-			</template>
-		</template>
-	</bs-modal>`
+				</div>`
 }

From 5f078a76c6ec6678a95742cb6745ac92d698cc58 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 28 Oct 2024 14:54:26 +0100
Subject: [PATCH 1336/1461] renders the right header (cis or fhtw)
 conditionally based on the CIS4 constant

---
 .../controllers/api/frontend/v1/LvMenu.php    |   3 +
 .../lehre/anrechnung/adminAnrechnung.php      |  26 ++-
 .../anrechnung/approveAnrechnungDetail.php    | 136 +++++++------
 .../approveAnrechnungUebersicht.php           | 188 ++++++++++--------
 .../lehre/anrechnung/createAnrechnung.php     |  89 ++++++---
 .../lehre/anrechnung/requestAnrechnung.php    | 129 +++++++-----
 .../anrechnung/reviewAnrechnungDetail.php     | 120 ++++++-----
 .../anrechnung/reviewAnrechnungUebersicht.php | 174 +++++++++-------
 .../Cis/Mylv/Semester/Studiengang/Lv.js       |  11 +-
 9 files changed, 525 insertions(+), 351 deletions(-)

diff --git a/application/controllers/api/frontend/v1/LvMenu.php b/application/controllers/api/frontend/v1/LvMenu.php
index 182168873..21170a494 100644
--- a/application/controllers/api/frontend/v1/LvMenu.php
+++ b/application/controllers/api/frontend/v1/LvMenu.php
@@ -468,6 +468,7 @@ class LvMenu extends FHCAPI_Controller
 				'position'=>'100',
 				'name'=>$p->t('lehre/mail'),
 				'c4_icon'=>base_url('skin/images/button_feedback.png'),
+				'c4_icon2' => 'fa-regular fa-envelope',
 				'c4_link'=>$mailto,
 				'c4_linkList'=>$c4_linkList,
 				'link_onclick'=>$link_onclick
@@ -533,6 +534,7 @@ class LvMenu extends FHCAPI_Controller
 				'position'=>'128',
 				'name'=>$p->t('lehre/anrechnung'),
 				'c4_icon'=>base_url('skin/images/button_listen.png'),
+				'c4_icon2' => 'fa-regular fa-folder-open',
 				'c4_link' => base_url('index.ci.php/lehre/anrechnung/RequestAnrechnung?studiensemester='.urlencode($angezeigtes_stsem).'&lv_id='.urlencode($lvid))
 			);
 		}
@@ -549,6 +551,7 @@ class LvMenu extends FHCAPI_Controller
 			'position'=>'128',
 			'name'=>$p->t('lehre/anrechnungen'),
 			'c4_icon'=> base_url('skin/images/button_listen.png'),
+			'c4_icon2' => 'fa-regular fa-folder-open',
 			'c4_link' => base_url('index.ci.php/lehre/anrechnung/ReviewAnrechnungUebersicht?studiensemester='.urlencode($angezeigtes_stsem))
 		);
 		}
diff --git a/application/views/lehre/anrechnung/adminAnrechnung.php b/application/views/lehre/anrechnung/adminAnrechnung.php
index cb9a55c18..7674a6b31 100644
--- a/application/views/lehre/anrechnung/adminAnrechnung.php
+++ b/application/views/lehre/anrechnung/adminAnrechnung.php
@@ -52,7 +52,17 @@ $includesArray = array(
     )
 );
 
-$this->load->view('templates/FHC-Header', $includesArray);
+if (defined("CIS4")) {
+	$this->load->view(
+		'templates/CISVUE-Header',
+		$includesArray
+	);
+} else {
+	$this->load->view(
+		'templates/FHC-Header',
+		$includesArray
+	);
+}
 ?>
 
 <div id="wrapper">
@@ -133,5 +143,17 @@ $this->load->view('templates/FHC-Header', $includesArray);
     </div>
 </div>
 
-<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
+<?php
+if (defined("CIS4")) {
+	$this->load->view(
+		'templates/CISVUE-Footer',
+		$includesArray
+	);
+} else {
+	$this->load->view(
+		'templates/FHC-Footer',
+		$includesArray
+	);
+}
+?>
 
diff --git a/application/views/lehre/anrechnung/approveAnrechnungDetail.php b/application/views/lehre/anrechnung/approveAnrechnungDetail.php
index c96631781..e310d36d7 100644
--- a/application/views/lehre/anrechnung/approveAnrechnungDetail.php
+++ b/application/views/lehre/anrechnung/approveAnrechnungDetail.php
@@ -1,65 +1,75 @@
 <?php
 $this->load->config('anrechnung');
-$this->load->view(
-	'templates/FHC-Header',
-	array(
-		'title' => $this->p->t('anrechnung', 'anrechnungenGenehmigen'),
-		'jquery3' => true,
-		'jqueryui1' => true,
-		'bootstrap3' => true,
-		'fontawesome4' => true,
-		'ajaxlib' => true,
-		'dialoglib' => true,
-		'phrases' => array(
-			'global' => array(
-				'anerkennungNachgewiesenerKenntnisse',
-				'antragStellen',
-                'begruendung'
-			),
-			'ui' => array(
-				'hilfeZuDieserSeite',
-				'hochladen',
-				'nichtSelektierbarAufgrundVon',
-				'nichtSelektierbarAufgrundVon',
-				'systemfehler',
-				'bitteMindEinenAntragWaehlen',
-				'bitteBegruendungAngeben',
-                'bitteBegruendungVervollstaendigen',
-				'empfehlungWurdeAngefordert',
-				'anrechnungenWurdenGenehmigt',
-				'anrechnungenWurdenAbgelehnt',
-                'nurLeseberechtigung'
-			),
-			'person' => array(
-				'student',
-				'personenkennzeichen'
-			),
-			'lehre' => array(
-				'studiensemester',
-				'studiengang',
-				'lehrveranstaltung',
-				'ects',
-				'lektor',
-			),
-            'anrechnung' => array(
-                'genehmigungAblehnungWirklichZuruecknehmen',
-                'empfehlungsanforderungWirklichZuruecknehmen',
-                'erfolgreichZurueckgenommen',
-                'empfehlungPositivConfirmed',
-                'empfehlungNegativConfirmed',
-                'anrechnungEctsTooltipTextBeiUeberschreitung'
-            )
-		),
-		'customCSSs' => array(
-			'public/css/Tabulator.css'
-		),
-		'customJSs' => array(
-			'public/js/bootstrapper.js',
-			'public/js/lehre/anrechnung/approveAnrechnungDetail.js'
 
+$includesArray = array(
+	'title' => $this->p->t('anrechnung', 'anrechnungenGenehmigen'),
+	'jquery3' => true,
+	'jqueryui1' => true,
+	'bootstrap3' => true,
+	'fontawesome4' => true,
+	'ajaxlib' => true,
+	'dialoglib' => true,
+	'phrases' => array(
+		'global' => array(
+			'anerkennungNachgewiesenerKenntnisse',
+			'antragStellen',
+			'begruendung'
+		),
+		'ui' => array(
+			'hilfeZuDieserSeite',
+			'hochladen',
+			'nichtSelektierbarAufgrundVon',
+			'nichtSelektierbarAufgrundVon',
+			'systemfehler',
+			'bitteMindEinenAntragWaehlen',
+			'bitteBegruendungAngeben',
+			'bitteBegruendungVervollstaendigen',
+			'empfehlungWurdeAngefordert',
+			'anrechnungenWurdenGenehmigt',
+			'anrechnungenWurdenAbgelehnt',
+			'nurLeseberechtigung'
+		),
+		'person' => array(
+			'student',
+			'personenkennzeichen'
+		),
+		'lehre' => array(
+			'studiensemester',
+			'studiengang',
+			'lehrveranstaltung',
+			'ects',
+			'lektor',
+		),
+		'anrechnung' => array(
+			'genehmigungAblehnungWirklichZuruecknehmen',
+			'empfehlungsanforderungWirklichZuruecknehmen',
+			'erfolgreichZurueckgenommen',
+			'empfehlungPositivConfirmed',
+			'empfehlungNegativConfirmed',
+			'anrechnungEctsTooltipTextBeiUeberschreitung'
 		)
+	),
+	'customCSSs' => array(
+		'public/css/Tabulator.css'
+	),
+	'customJSs' => array(
+		'public/js/bootstrapper.js',
+		'public/js/lehre/anrechnung/approveAnrechnungDetail.js'
+
 	)
 );
+
+if (defined("CIS4")) {
+	$this->load->view(
+		'templates/CISVUE-Header',
+		$includesArray
+	);
+} else {
+	$this->load->view(
+		'templates/FHC-Header',
+		$includesArray
+	);
+}
 ?>
 
 <div id="page-wrapper">
@@ -443,4 +453,16 @@ $this->load->view(
     </div><!--end container-fluid-->
 </div><!--end page-wrapper-->
 
-<?php $this->load->view('templates/FHC-Footer'); ?>
+<?php
+if (defined("CIS4")) {
+	$this->load->view(
+		'templates/CISVUE-Footer',
+		$includesArray
+	);
+} else {
+	$this->load->view(
+		'templates/FHC-Footer',
+		$includesArray
+	);
+}
+?>
diff --git a/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php b/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php
index 988d6c227..584a805cf 100644
--- a/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php
+++ b/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php
@@ -1,90 +1,100 @@
 <?php
-$this->load->view(
-	'templates/FHC-Header',
-	array(
-		'title' => $this->p->t('anrechnung', 'anrechnungenGenehmigen'),
-		'jquery3' => true,
-		'jqueryui1' => true,
-		'bootstrap3' => true,
-		'fontawesome4' => true,
-		'tabulator4' => true,
-		'ajaxlib' => true,
-		'dialoglib' => true,
-		'tablewidget' => true,
-		'phrases' => array(
-			'global' => array(
-				'begruendung',
-                'zgv'
-			),
-			'anrechnung' => array(
-				'nachweisdokumente',
-				'empfehlung',
-				'empfehlungsanfrageAn',
-				'empfehlungsanfrageAm',
-				'confirmTextAntragHatBereitsEmpfehlung',
-				'herkunft'
-			),
-			'ui' => array(
-				'anzeigen',
-				'alleAnzeigen',
-				'hilfeZuDieserSeite',
-				'hochladen',
-				'spaltenEinstellen',
-				'hilfeZuDieserSeite',
-				'alleAuswaehlen',
-				'alleAbwaehlen',
-				'ausgewaehlteZeilen',
-				'hilfe',
-				'tabelleneinstellungen',
-				'keineDatenVorhanden',
-				'spaltenEinstellen',
-				'ja',
-				'nein',
-				'nichtSelektierbarAufgrundVon',
-				'nichtSelektierbarAufgrundVon',
-				'systemfehler',
-				'bitteMindEinenAntragWaehlen',
-				'bitteBegruendungAngeben',
-				'empfehlungWurdeAngefordert',
-				'empfehlungWurdeAngefordertAusnahmeWoKeineLektoren',
-				'anrechnungenWurdenGenehmigt',
-				'anrechnungenWurdenAbgelehnt',
-                'nurLeseberechtigung'
-			),
-			'person' => array(
-				'student',
-				'personenkennzeichen',
-				'vorname',
-				'nachname'
-			),
-			'lehre' => array(
-				'studiensemester',
-				'studiengang',
-				'lehrveranstaltung',
-				'ects',
-				'lektor',
-			),
-			'table' => array(
-				'spaltenEinAusblenden',
-				'spaltenEinAusblendenMitKlickOeffnen',
-				'spaltenEinAusblendenAufEinstellungenKlicken',
-				'spaltenEinAusblendenMitKlickAktivieren',
-				'spaltenEinAusblendenMitKlickSchliessen',
-				'spaltenbreiteVeraendern',
-				'spaltenbreiteVeraendernText',
-				'spaltenbreiteVeraendernInfotext',
-				'zeilenAuswaehlen',
-				'zeilenAuswaehlenEinzeln',
-				'zeilenAuswaehlenBereich',
-				'zeilenAuswaehlenAlle'
-			)
+
+$includesArray = array(
+	'title' => $this->p->t('anrechnung', 'anrechnungenGenehmigen'),
+	'jquery3' => true,
+	'jqueryui1' => true,
+	'bootstrap3' => true,
+	'fontawesome4' => true,
+	'tabulator4' => true,
+	'ajaxlib' => true,
+	'dialoglib' => true,
+	'tablewidget' => true,
+	'phrases' => array(
+		'global' => array(
+			'begruendung',
+			'zgv'
 		),
-		'customJSs' => array(
-			'public/js/bootstrapper.js',
-			'public/js/lehre/anrechnung/approveAnrechnungUebersicht.js'
+		'anrechnung' => array(
+			'nachweisdokumente',
+			'empfehlung',
+			'empfehlungsanfrageAn',
+			'empfehlungsanfrageAm',
+			'confirmTextAntragHatBereitsEmpfehlung',
+			'herkunft'
+		),
+		'ui' => array(
+			'anzeigen',
+			'alleAnzeigen',
+			'hilfeZuDieserSeite',
+			'hochladen',
+			'spaltenEinstellen',
+			'hilfeZuDieserSeite',
+			'alleAuswaehlen',
+			'alleAbwaehlen',
+			'ausgewaehlteZeilen',
+			'hilfe',
+			'tabelleneinstellungen',
+			'keineDatenVorhanden',
+			'spaltenEinstellen',
+			'ja',
+			'nein',
+			'nichtSelektierbarAufgrundVon',
+			'nichtSelektierbarAufgrundVon',
+			'systemfehler',
+			'bitteMindEinenAntragWaehlen',
+			'bitteBegruendungAngeben',
+			'empfehlungWurdeAngefordert',
+			'empfehlungWurdeAngefordertAusnahmeWoKeineLektoren',
+			'anrechnungenWurdenGenehmigt',
+			'anrechnungenWurdenAbgelehnt',
+			'nurLeseberechtigung'
+		),
+		'person' => array(
+			'student',
+			'personenkennzeichen',
+			'vorname',
+			'nachname'
+		),
+		'lehre' => array(
+			'studiensemester',
+			'studiengang',
+			'lehrveranstaltung',
+			'ects',
+			'lektor',
+		),
+		'table' => array(
+			'spaltenEinAusblenden',
+			'spaltenEinAusblendenMitKlickOeffnen',
+			'spaltenEinAusblendenAufEinstellungenKlicken',
+			'spaltenEinAusblendenMitKlickAktivieren',
+			'spaltenEinAusblendenMitKlickSchliessen',
+			'spaltenbreiteVeraendern',
+			'spaltenbreiteVeraendernText',
+			'spaltenbreiteVeraendernInfotext',
+			'zeilenAuswaehlen',
+			'zeilenAuswaehlenEinzeln',
+			'zeilenAuswaehlenBereich',
+			'zeilenAuswaehlenAlle'
 		)
+	),
+	'customJSs' => array(
+		'public/js/bootstrapper.js',
+		'public/js/lehre/anrechnung/approveAnrechnungUebersicht.js'
 	)
 );
+
+if (defined("CIS4")) {
+	$this->load->view(
+		'templates/CISVUE-Header',
+		$includesArray
+	);
+} else {
+	$this->load->view(
+		'templates/FHC-Header',
+		$includesArray
+	);
+}
 ?>
 
 <div id="page-wrapper">
@@ -250,4 +260,16 @@ $this->load->view(
     </div>
 </div>
 
-<?php $this->load->view('templates/FHC-Footer'); ?>
+<?php
+if (defined("CIS4")) {
+	$this->load->view(
+		'templates/CISVUE-Footer',
+		$includesArray
+	);
+} else {
+	$this->load->view(
+		'templates/FHC-Footer',
+		$includesArray
+	);
+}
+?>
diff --git a/application/views/lehre/anrechnung/createAnrechnung.php b/application/views/lehre/anrechnung/createAnrechnung.php
index e3cc9cad1..262a9e565 100644
--- a/application/views/lehre/anrechnung/createAnrechnung.php
+++ b/application/views/lehre/anrechnung/createAnrechnung.php
@@ -1,41 +1,51 @@
 <?php
-$this->load->view(
-	'templates/FHC-Header',
-	array(
-		'title' => $this->p->t('anrechnung', 'neueAnrechnung'),
-		'jquery3' => true,
-		'jqueryui1' => true,
-		'bootstrap3' => true,
-		'fontawesome4' => true,
-		'ajaxlib' => true,
-		'dialoglib' => true,
-		'tabulator4' => true,
-		'tablewidget' => true,
-		'phrases' => array(
-			'global' => array(
-				'anerkennungNachgewiesenerKenntnisse',
-				'antragWurdeGestellt',
-				'antragBereitsGestellt',
-				'antragBearbeiten'
-			),
-			'ui' => array(
-				'hochladen'
-			),
-			'lehre' => array(
-				'studiensemester',
-				'studiengang',
-				'lehrveranstaltung'
-			)
+
+$includesArray =array(
+	'title' => $this->p->t('anrechnung', 'neueAnrechnung'),
+	'jquery3' => true,
+	'jqueryui1' => true,
+	'bootstrap3' => true,
+	'fontawesome4' => true,
+	'ajaxlib' => true,
+	'dialoglib' => true,
+	'tabulator4' => true,
+	'tablewidget' => true,
+	'phrases' => array(
+		'global' => array(
+			'anerkennungNachgewiesenerKenntnisse',
+			'antragWurdeGestellt',
+			'antragBereitsGestellt',
+			'antragBearbeiten'
 		),
-		'customJSs' => array(
-			'public/js/bootstrapper.js',
-			'public/js/lehre/anrechnung/createAnrechnung.js'
+		'ui' => array(
+			'hochladen'
 		),
-		'customCSSs' => array(
-				'public/css/lehre/anrechnung.css'
+		'lehre' => array(
+			'studiensemester',
+			'studiengang',
+			'lehrveranstaltung'
 		)
+	),
+	'customJSs' => array(
+		'public/js/bootstrapper.js',
+		'public/js/lehre/anrechnung/createAnrechnung.js'
+	),
+	'customCSSs' => array(
+			'public/css/lehre/anrechnung.css'
 	)
 );
+
+if (defined("CIS4")) {
+	$this->load->view(
+		'templates/CISVUE-Header',
+		$includesArray
+	);
+} else {
+	$this->load->view(
+		'templates/FHC-Header',
+		$includesArray
+	);
+}
 ?>
 
 <div id="page-wrapper">
@@ -170,4 +180,17 @@ $this->load->view(
 </div>
 </div>
 
-<?php $this->load->view('templates/FHC-Footer'); ?>
+<?php
+
+if (defined("CIS4")) {
+	$this->load->view(
+		'templates/CISVUE-Footer',
+		$includesArray
+	);
+} else {
+	$this->load->view(
+		'templates/FHC-Footer',
+		$includesArray
+	);
+}
+?>
diff --git a/application/views/lehre/anrechnung/requestAnrechnung.php b/application/views/lehre/anrechnung/requestAnrechnung.php
index bb3c48235..c7254985c 100644
--- a/application/views/lehre/anrechnung/requestAnrechnung.php
+++ b/application/views/lehre/anrechnung/requestAnrechnung.php
@@ -5,59 +5,74 @@ const CHAR_LENGTH500 = 500;
 const CHAR_LENGTH1000 = 1000;
 
 $this->load->config('anrechnung');
-$this->load->view(
-	'templates/FHC-Header',
-	array(
-		'title' => $this->p->t('anrechnung', 'antragStellen'),
-		'jquery3' => true,
-		'jqueryui1' => true,
-		'bootstrap3' => true,
-		'fontawesome4' => true,
-		'ajaxlib' => true,
-		'dialoglib' => true,
-		'phrases' => array(
-			'global' => array(
-				'anerkennungNachgewiesenerKenntnisse',
-				'antragStellen',
-                'antragWurdeGestellt',
-                'antragBereitsGestellt',
-				'bearbeitungGesperrt'
-			),
-			'ui' => array(
-				'hilfeZuDieserSeite',
-				'hochladen',
-                'inBearbeitung',
-                'neu',
-				'maxZeichen',
-                'errorBestaetigungFehlt',
-				'systemfehler',
-                'errorDokumentZuGross'
-			),
-			'anrechnung' => array(
-				'deadlineUeberschritten',
-				'benotungDerLV',
-                'anrechnungEctsTextBeiUeberschreitung',
-                'anrechnungEctsTooltipTextBeiUeberschreitung'
-			),
-			'person' => array(
-				'student',
-				'personenkennzeichen'
-			),
-			'lehre' => array(
-				'studiensemester',
-				'studiengang',
-				'lehrveranstaltung',
-				'ects',
-				'lektor',
-			)
-		),
-		'customJSs' => array(
-			'public/js/bootstrapper.js',
-			'public/js/lehre/anrechnung/requestAnrechnung.js'
 
+$includesArray = array(
+	'title' => $this->p->t('anrechnung', 'antragStellen'),
+	'jquery3' => true,
+	'jqueryui1' => true,
+	'bootstrap3' => true,
+	'fontawesome4' => true,
+	'ajaxlib' => true,
+	'dialoglib' => true,
+	'phrases' => array(
+		'global' => array(
+			'anerkennungNachgewiesenerKenntnisse',
+			'antragStellen',
+			'antragWurdeGestellt',
+			'antragBereitsGestellt',
+			'bearbeitungGesperrt'
+		),
+		'ui' => array(
+			'hilfeZuDieserSeite',
+			'hochladen',
+			'inBearbeitung',
+			'neu',
+			'maxZeichen',
+			'errorBestaetigungFehlt',
+			'systemfehler',
+			'errorDokumentZuGross'
+		),
+		'anrechnung' => array(
+			'deadlineUeberschritten',
+			'benotungDerLV',
+			'anrechnungEctsTextBeiUeberschreitung',
+			'anrechnungEctsTooltipTextBeiUeberschreitung'
+		),
+		'person' => array(
+			'student',
+			'personenkennzeichen'
+		),
+		'lehre' => array(
+			'studiensemester',
+			'studiengang',
+			'lehrveranstaltung',
+			'ects',
+			'lektor',
 		)
+	),
+	'customJSs' => array(
+		'public/js/bootstrapper.js',
+		'public/js/lehre/anrechnung/requestAnrechnung.js'
+
 	)
 );
+
+if(defined("CIS4"))
+{
+	$this->load->view(
+		'templates/CISVUE-Header',
+		$includesArray
+	);
+}
+else
+{
+	$this->load->view(
+		'templates/FHC-Header',
+		$includesArray
+	);
+}
+
+
 ?>
 
 <style>
@@ -341,4 +356,18 @@ $this->load->view(
     </div>
 </div>
 
-<?php $this->load->view('templates/FHC-Footer'); ?>
+<?php
+
+
+if (defined("CIS4")) {
+	$this->load->view(
+		'templates/CISVUE-Footer',
+		$includesArray
+	);
+} else {
+	$this->load->view(
+		'templates/FHC-Footer', 
+		$includesArray
+	);
+}
+ ?>
diff --git a/application/views/lehre/anrechnung/reviewAnrechnungDetail.php b/application/views/lehre/anrechnung/reviewAnrechnungDetail.php
index 98fee67a3..ab7c6e710 100644
--- a/application/views/lehre/anrechnung/reviewAnrechnungDetail.php
+++ b/application/views/lehre/anrechnung/reviewAnrechnungDetail.php
@@ -1,57 +1,67 @@
 <?php
 $this->load->config('anrechnung');
-$this->load->view(
-	'templates/FHC-Header',
-	array(
-		'title' => $this->p->t('anrechnung', 'anrechnungenPruefen'),
-		'jquery3' => true,
-		'jqueryui1' => true,
-		'bootstrap3' => true,
-		'fontawesome4' => true,
-		'ajaxlib' => true,
-		'dialoglib' => true,
-		'phrases' => array(
-			'global' => array(
-				'anerkennungNachgewiesenerKenntnisse',
-				'antragStellen'
-			),
-			'ui' => array(
-				'hilfeZuDieserSeite',
-				'hochladen',
-				'nichtSelektierbarAufgrundVon',
-				'systemfehler',
-				'bitteMindEinenAntragWaehlen',
-				'bitteBegruendungAngeben',
-                'bitteBegruendungVervollstaendigen',
-				'anrechnungenWurdenEmpfohlen',
-				'anrechnungenWurdenNichtEmpfohlen'
-			),
-			'person' => array(
-				'student',
-				'personenkennzeichen'
-			),
-			'lehre' => array(
-				'studiensemester',
-				'studiengang',
-				'lehrveranstaltung',
-				'ects',
-				'lektor',
-			),
-            'anrechnung' => array(
-                'empfehlungPositivConfirmed',
-                'empfehlungNegativConfirmed'
-            )
-		),
-		'customCSSs' => array(
-			'public/css/Tabulator.css'
-		),
-		'customJSs' => array(
-			'public/js/bootstrapper.js',
-			'public/js/lehre/anrechnung/reviewAnrechnungDetail.js'
 
+$includesArray = array(
+	'title' => $this->p->t('anrechnung', 'anrechnungenPruefen'),
+	'jquery3' => true,
+	'jqueryui1' => true,
+	'bootstrap3' => true,
+	'fontawesome4' => true,
+	'ajaxlib' => true,
+	'dialoglib' => true,
+	'phrases' => array(
+		'global' => array(
+			'anerkennungNachgewiesenerKenntnisse',
+			'antragStellen'
+		),
+		'ui' => array(
+			'hilfeZuDieserSeite',
+			'hochladen',
+			'nichtSelektierbarAufgrundVon',
+			'systemfehler',
+			'bitteMindEinenAntragWaehlen',
+			'bitteBegruendungAngeben',
+			'bitteBegruendungVervollstaendigen',
+			'anrechnungenWurdenEmpfohlen',
+			'anrechnungenWurdenNichtEmpfohlen'
+		),
+		'person' => array(
+			'student',
+			'personenkennzeichen'
+		),
+		'lehre' => array(
+			'studiensemester',
+			'studiengang',
+			'lehrveranstaltung',
+			'ects',
+			'lektor',
+		),
+		'anrechnung' => array(
+			'empfehlungPositivConfirmed',
+			'empfehlungNegativConfirmed'
 		)
+	),
+	'customCSSs' => array(
+		'public/css/Tabulator.css'
+	),
+	'customJSs' => array(
+		'public/js/bootstrapper.js',
+		'public/js/lehre/anrechnung/reviewAnrechnungDetail.js'
+
 	)
 );
+
+if (defined("CIS4")) {
+	$this->load->view(
+		'templates/CISVUE-Header',
+		$includesArray
+	);
+} else {
+	$this->load->view(
+		'templates/FHC-Header',
+		$includesArray
+	);
+}
 ?>
 
 <div id="page-wrapper">
@@ -332,4 +342,16 @@ $this->load->view(
     </div>
 </div>
 
-<?php $this->load->view('templates/FHC-Footer'); ?>
+<?php
+if (defined("CIS4")) {
+	$this->load->view(
+		'templates/CISVUE-Footer',
+		$includesArray
+	);
+} else {
+	$this->load->view(
+		'templates/FHC-Footer',
+		$includesArray
+	);
+}
+?>
diff --git a/application/views/lehre/anrechnung/reviewAnrechnungUebersicht.php b/application/views/lehre/anrechnung/reviewAnrechnungUebersicht.php
index 7485a1812..d7f669675 100644
--- a/application/views/lehre/anrechnung/reviewAnrechnungUebersicht.php
+++ b/application/views/lehre/anrechnung/reviewAnrechnungUebersicht.php
@@ -1,83 +1,93 @@
 <?php
-$this->load->view(
-	'templates/FHC-Header',
-	array(
-		'title' => $this->p->t('anrechnung', 'anrechnungenPruefen'),
-		'jquery3' => true,
-		'jqueryui1' => true,
-		'bootstrap3' => true,
-		'fontawesome4' => true,
-		'tabulator4' => true,
-		'ajaxlib' => true,
-		'dialoglib' => true,
-		'tablewidget' => true,
-		'phrases' => array(
-			'global' => array(
-				'begruendung',
-				'zgv'
-			),
-			'anrechnung' => array(
-				'nachweisdokumente',
-				'empfehlung',
-				'herkunft'
-			),
-			'ui' => array(
-				'anzeigen',
-				'alleAnzeigen',
-				'hilfeZuDieserSeite',
-				'hochladen',
-				'spaltenEinstellen',
-				'hilfeZuDieserSeite',
-				'alleAuswaehlen',
-				'alleAbwaehlen',
-				'ausgewaehlteZeilen',
-				'hilfe',
-				'tabelleneinstellungen',
-				'keineDatenVorhanden',
-				'spaltenEinstellen',
-				'ja',
-				'nein',
-				'nichtSelektierbarAufgrundVon',
-				'systemfehler',
-				'bitteMindEinenAntragWaehlen',
-				'bitteBegruendungAngeben',
-				'anrechnungenWurdenEmpfohlen',
-				'anrechnungenWurdenNichtEmpfohlen'
-			),
-			'person' => array(
-				'student',
-				'personenkennzeichen',
-				'vorname',
-				'nachname'
-			),
-			'lehre' => array(
-				'studiensemester',
-				'studiengang',
-				'lehrveranstaltung',
-				'ects',
-				'lektor',
-			),
-			'table' => array(
-				'spaltenEinAusblenden',
-				'spaltenEinAusblendenMitKlickOeffnen',
-				'spaltenEinAusblendenAufEinstellungenKlicken',
-				'spaltenEinAusblendenMitKlickAktivieren',
-				'spaltenEinAusblendenMitKlickSchliessen',
-				'spaltenbreiteVeraendern',
-				'spaltenbreiteVeraendernText',
-				'spaltenbreiteVeraendernInfotext',
-				'zeilenAuswaehlen',
-				'zeilenAuswaehlenEinzeln',
-				'zeilenAuswaehlenBereich',
-				'zeilenAuswaehlenAlle'
-			)
+
+$includesArray = array(
+	'title' => $this->p->t('anrechnung', 'anrechnungenPruefen'),
+	'jquery3' => true,
+	'jqueryui1' => true,
+	'bootstrap3' => true,
+	'fontawesome4' => true,
+	'tabulator4' => true,
+	'ajaxlib' => true,
+	'dialoglib' => true,
+	'tablewidget' => true,
+	'phrases' => array(
+		'global' => array(
+			'begruendung',
+			'zgv'
 		),
-		'customJSs' => array(
-			'public/js/bootstrapper.js',
-			'public/js/lehre/anrechnung/reviewAnrechnungUebersicht.js'
+		'anrechnung' => array(
+			'nachweisdokumente',
+			'empfehlung',
+			'herkunft'
+		),
+		'ui' => array(
+			'anzeigen',
+			'alleAnzeigen',
+			'hilfeZuDieserSeite',
+			'hochladen',
+			'spaltenEinstellen',
+			'hilfeZuDieserSeite',
+			'alleAuswaehlen',
+			'alleAbwaehlen',
+			'ausgewaehlteZeilen',
+			'hilfe',
+			'tabelleneinstellungen',
+			'keineDatenVorhanden',
+			'spaltenEinstellen',
+			'ja',
+			'nein',
+			'nichtSelektierbarAufgrundVon',
+			'systemfehler',
+			'bitteMindEinenAntragWaehlen',
+			'bitteBegruendungAngeben',
+			'anrechnungenWurdenEmpfohlen',
+			'anrechnungenWurdenNichtEmpfohlen'
+		),
+		'person' => array(
+			'student',
+			'personenkennzeichen',
+			'vorname',
+			'nachname'
+		),
+		'lehre' => array(
+			'studiensemester',
+			'studiengang',
+			'lehrveranstaltung',
+			'ects',
+			'lektor',
+		),
+		'table' => array(
+			'spaltenEinAusblenden',
+			'spaltenEinAusblendenMitKlickOeffnen',
+			'spaltenEinAusblendenAufEinstellungenKlicken',
+			'spaltenEinAusblendenMitKlickAktivieren',
+			'spaltenEinAusblendenMitKlickSchliessen',
+			'spaltenbreiteVeraendern',
+			'spaltenbreiteVeraendernText',
+			'spaltenbreiteVeraendernInfotext',
+			'zeilenAuswaehlen',
+			'zeilenAuswaehlenEinzeln',
+			'zeilenAuswaehlenBereich',
+			'zeilenAuswaehlenAlle'
 		)
+	),
+	'customJSs' => array(
+		'public/js/bootstrapper.js',
+		'public/js/lehre/anrechnung/reviewAnrechnungUebersicht.js'
 	)
 );
+
+if (defined("CIS4")) {
+	$this->load->view(
+		'templates/CISVUE-Header',
+		$includesArray
+	);
+} else {
+	$this->load->view(
+		'templates/FHC-Header',
+		$includesArray
+	);
+}
 ?>
 
 <div id="page-wrapper">
@@ -232,5 +242,17 @@ $this->load->view(
     </div>
 </div>
 
-<?php $this->load->view('templates/FHC-Footer'); ?>
+<?php
+if (defined("CIS4")) {
+	$this->load->view(
+		'templates/CISVUE-Footer',
+		$includesArray
+	);
+} else {
+	$this->load->view(
+		'templates/FHC-Footer',
+		$includesArray
+	);
+}
+?>
 
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
index b8dc9e1d8..9cf73b55d 100644
--- a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
@@ -120,7 +120,16 @@ export default {
 		<div class="card-body " :style="bodyStyle">
 			<ul class="list-group border-top-0 border-bottom-0 rounded-0">
 				<template v-if="menu">
-					<li type="button" v-for="menuItem in menu" class="list-group-item border-0"><a :target="menuItem.c4_target" :href="menuItem.c4_link ? menuItem.c4_link : null">{{menuItem.name}}</a></li>
+					<li type="button" v-for="menuItem in menu" class="list-group-item border-0 ">
+						<div class="d-flex flex-row">
+							<div class="mx-4">
+								<i :class="menuItem.c4_icon2 ? menuItem.c4_icon2 : 'fa-solid fa-pen-to-square'"></i>
+							</div>
+							<a class="text-decoration-none" :class="{'link-secondary':!menuItem.c4_link, 'link-dark':menuItem.c4_link}" :target="menuItem.c4_target" :href="menuItem.c4_link ? menuItem.c4_link : null">
+							{{menuItem.name}}
+							</a>
+						</div>
+					</li>
 				</template>
 				<template v-else>
 					<li class="text-center" class="list-group-item"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></li>

From b9ccafe9db3119cf5a180f4033a859cfb04edf37 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 28 Oct 2024 15:57:33 +0100
Subject: [PATCH 1337/1461] uses the cis.php file for the anrechnungen url

---
 application/controllers/api/frontend/v1/LvMenu.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/controllers/api/frontend/v1/LvMenu.php b/application/controllers/api/frontend/v1/LvMenu.php
index 21170a494..2a1f08772 100644
--- a/application/controllers/api/frontend/v1/LvMenu.php
+++ b/application/controllers/api/frontend/v1/LvMenu.php
@@ -535,7 +535,7 @@ class LvMenu extends FHCAPI_Controller
 				'name'=>$p->t('lehre/anrechnung'),
 				'c4_icon'=>base_url('skin/images/button_listen.png'),
 				'c4_icon2' => 'fa-regular fa-folder-open',
-				'c4_link' => base_url('index.ci.php/lehre/anrechnung/RequestAnrechnung?studiensemester='.urlencode($angezeigtes_stsem).'&lv_id='.urlencode($lvid))
+				'c4_link' => base_url('cis.php/lehre/anrechnung/RequestAnrechnung?studiensemester='.urlencode($angezeigtes_stsem).'&lv_id='.urlencode($lvid))
 			);
 		}
 	}
@@ -552,7 +552,7 @@ class LvMenu extends FHCAPI_Controller
 			'name'=>$p->t('lehre/anrechnungen'),
 			'c4_icon'=> base_url('skin/images/button_listen.png'),
 			'c4_icon2' => 'fa-regular fa-folder-open',
-			'c4_link' => base_url('index.ci.php/lehre/anrechnung/ReviewAnrechnungUebersicht?studiensemester='.urlencode($angezeigtes_stsem))
+			'c4_link' => base_url('cis.php/lehre/anrechnung/ReviewAnrechnungUebersicht?studiensemester='.urlencode($angezeigtes_stsem))
 		);
 		}
 	}

From 1e55b13546826db2b12da607977b0fa00d112bb5 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 28 Oct 2024 15:58:20 +0100
Subject: [PATCH 1338/1461] force use of insertamum column from antrag table

---
 application/models/education/Studierendenantrag_model.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/application/models/education/Studierendenantrag_model.php b/application/models/education/Studierendenantrag_model.php
index 80804f49a..677d01f04 100644
--- a/application/models/education/Studierendenantrag_model.php
+++ b/application/models/education/Studierendenantrag_model.php
@@ -151,6 +151,7 @@ class Studierendenantrag_model extends DB_Model
 		$this->addSelect('s.insertvon status_insertvon');
 		$this->addSelect('t.bezeichnung[(' . $lang . ')] statustyp');
 		$this->addSelect('p.unruly AS unruly');
+		$this->addSelect($this->dbTable . '.insertamum AS insertamum');
 
 		$this->addJoin(
 			'campus.tbl_studierendenantrag_status s',
@@ -489,4 +490,4 @@ class Studierendenantrag_model extends DB_Model
 		
 		return hasData($this->load());
 	}
-}
\ No newline at end of file
+}

From ae80c3415d60f7529bd9da7702a66b92563ae7d4 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 29 Oct 2024 10:37:00 +0100
Subject: [PATCH 1339/1461] betraege im Gehaltsbestandteil als string mit . als
 komma konvertieren, um zu verhindern, dass locale spezifische Betraege in der
 verschluesselten DB Spalte gespeichert werden

---
 .../libraries/vertragsbestandteil/Gehaltsbestandteil.php  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/application/libraries/vertragsbestandteil/Gehaltsbestandteil.php b/application/libraries/vertragsbestandteil/Gehaltsbestandteil.php
index 22f8ee2ae..95bbdd908 100644
--- a/application/libraries/vertragsbestandteil/Gehaltsbestandteil.php
+++ b/application/libraries/vertragsbestandteil/Gehaltsbestandteil.php
@@ -201,6 +201,10 @@ class Gehaltsbestandteil extends AbstractBestandteil implements \JsonSerializabl
 
 	public function setGrundbetrag($grundbetrag)
 	{
+		if(is_float($grundbetrag))
+		{
+		    $grundbetrag = number_format($grundbetrag, 2, '.', '');
+		}
 		$this->markDirty('grundbetrag', $this->grundbetrag, $grundbetrag);
 		$this->grundbetrag = $grundbetrag;
 		return $this;
@@ -208,6 +212,10 @@ class Gehaltsbestandteil extends AbstractBestandteil implements \JsonSerializabl
 
 	public function setBetrag_valorisiert($betrag_valorisiert)
 	{
+		if(is_float($betrag_valorisiert))
+		{
+		    $betrag_valorisiert = number_format($betrag_valorisiert, 2, '.', '');
+		}
 		$this->markDirty('betrag_valorisiert', $this->betrag_valorisiert, $betrag_valorisiert);
 		$this->betrag_valorisiert = $betrag_valorisiert;
 		return $this;

From ff367339ea553822265fb903616c6c0d9b388da7 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 29 Oct 2024 14:31:20 +0100
Subject: [PATCH 1340/1461] makes MyLv more responsive

---
 .../controllers/api/frontend/v1/Lehre.php     | 13 +++++
 .../education/Lehrveranstaltung_model.php     |  7 ++-
 application/views/Cis/MyLv.php                |  3 +-
 public/css/components/MyLv.css                |  4 ++
 public/js/api/lehre.js                        |  6 +++
 .../Cis/Mylv/Semester/Studiengang.js          |  2 +-
 .../Cis/Mylv/Semester/Studiengang/Lv.js       |  8 ++--
 .../Cis/Mylv/Semester/Studiengang/Lv/Info.js  | 47 ++++++++++---------
 8 files changed, 62 insertions(+), 28 deletions(-)
 create mode 100644 public/css/components/MyLv.css

diff --git a/application/controllers/api/frontend/v1/Lehre.php b/application/controllers/api/frontend/v1/Lehre.php
index a36b673b4..c25dc1986 100644
--- a/application/controllers/api/frontend/v1/Lehre.php
+++ b/application/controllers/api/frontend/v1/Lehre.php
@@ -29,6 +29,7 @@ class Lehre extends FHCAPI_Controller
 	{
 		parent::__construct([
 			'lvStudentenMail' => self::PERM_LOGGED,
+			'LV' => self::PERM_LOGGED,
 		]);
 
 		
@@ -65,6 +66,18 @@ class Lehre extends FHCAPI_Controller
         $this->terminateWithSuccess($studentenMails);
 	}
 
+	public function LV($studiensemester_kurzbz, $lehrveranstaltung_id)
+	{
+		$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+
+		$result = $this->LehrveranstaltungModel->getLvsByStudentWithGrades(getAuthUID(), $studiensemester_kurzbz, getUserLanguage(), $lehrveranstaltung_id);
+
+		$result = current($this->getDataOrTerminateWithError($result));
+		
+		$this->terminateWithSuccess($result);
+	}
+	
+
 	
 
 	
diff --git a/application/models/education/Lehrveranstaltung_model.php b/application/models/education/Lehrveranstaltung_model.php
index f5bda513b..f2f762b7f 100644
--- a/application/models/education/Lehrveranstaltung_model.php
+++ b/application/models/education/Lehrveranstaltung_model.php
@@ -550,10 +550,11 @@ class Lehrveranstaltung_model extends DB_Model
 	 * @param string		$student_uid
 	 * @param string		$studiensemester_kurzbz
 	 * @param string|null	$sprache
+	 * @param number|null	$lvid - returns only information about that single lv if the parameter is set
 	 * 
 	 * @return stdClass
 	 */
-	public function getLvsByStudentWithGrades($student_uid, $studiensemester_kurzbz, $sprache = null)
+	public function getLvsByStudentWithGrades($student_uid, $studiensemester_kurzbz, $sprache = null, $lvid=null)
 	{
 		if ($sprache) {
 			$sprache_qry = $this->db->compile_binds('SELECT index FROM public.tbl_sprache WHERE sprache = ?', [$sprache]);
@@ -615,6 +616,10 @@ class Lehrveranstaltung_model extends DB_Model
 		$this->addJoin('campus.vw_student_lehrveranstaltung v', 'lehrveranstaltung_id');
 		$this->addJoin('public.tbl_studiengang sg', $this->dbTable . '.studiengang_kz = sg.studiengang_kz');
 		$this->db->where("v.lehreverzeichnis<>''");
+		if(isset($lvid))
+		{
+			$this->db->where("v.lehrveranstaltung_id", $lvid);	
+		}
 
 		$this->addJoin('campus.tbl_lvgesamtnote gn', 'gn.lehrveranstaltung_id=v.lehrveranstaltung_id AND gn.student_uid=v.uid AND gn.studiensemester_kurzbz=v.studiensemester_kurzbz', 'LEFT');
 		$this->addJoin('lehre.tbl_note gnn', 'gn.note=gnn.note', 'LEFT');
diff --git a/application/views/Cis/MyLv.php b/application/views/Cis/MyLv.php
index b4159402d..347a66cb7 100644
--- a/application/views/Cis/MyLv.php
+++ b/application/views/Cis/MyLv.php
@@ -1,7 +1,8 @@
 <?php
 $includesArray = array(
 	'title' => 'MyLv',
-	'customJSModules' => ['public/js/apps/Cis/MyLv/Student.js']
+	'customJSModules' => ['public/js/apps/Cis/MyLv/Student.js'],
+	'customCSSs' => ['public/css/components/MyLv.css']
 );
 
 $this->load->view('templates/CISVUE-Header', $includesArray);
diff --git a/public/css/components/MyLv.css b/public/css/components/MyLv.css
new file mode 100644
index 000000000..a3a3dd23f
--- /dev/null
+++ b/public/css/components/MyLv.css
@@ -0,0 +1,4 @@
+.unavailable, .unavailable:hover{
+	color: #565e647f !important;
+	cursor: default;
+}
\ No newline at end of file
diff --git a/public/js/api/lehre.js b/public/js/api/lehre.js
index d3117948e..743439722 100644
--- a/public/js/api/lehre.js
+++ b/public/js/api/lehre.js
@@ -7,4 +7,10 @@ export default {
               { lehreinheit_id: lehreinheit_id }
           );
       },
+	getLvInfo(studiensemester_kurzbz, lehrveranstaltung_id) {
+		return this.$fhcApi.get(
+			`/api/frontend/v1/Lehre/LV/${studiensemester_kurzbz}/${lehrveranstaltung_id}`
+			, {}
+		);
+	},
   }
\ No newline at end of file
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang.js b/public/js/components/Cis/Mylv/Semester/Studiengang.js
index 56605d308..1c4510112 100644
--- a/public/js/components/Cis/Mylv/Semester/Studiengang.js
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang.js
@@ -36,7 +36,7 @@ export default {
 				<small>{{semester}}.{{p.t('lehre/semester')}}</small>
 			</h4>
 			<div class="row">
-				<div v-for="lv in lehrveranstaltungen" :key="lv.lehrveranstaltung_id" class="col-sm-4 col-md-3 mb-3">
+				<div v-for="lv in lehrveranstaltungen" :key="lv.lehrveranstaltung_id" class="col-12 col-md-6 col-xl-4 col-xxl-3 mb-3">
 					<mylv-semester-studiengang-lv v-bind="lv" class="text-center h-100"></mylv-semester-studiengang-lv>
 				</div>
 			</div>
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
index 9cf73b55d..337742797 100644
--- a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
@@ -120,12 +120,12 @@ export default {
 		<div class="card-body " :style="bodyStyle">
 			<ul class="list-group border-top-0 border-bottom-0 rounded-0">
 				<template v-if="menu">
-					<li type="button" v-for="menuItem in menu" class="list-group-item border-0 ">
-						<div class="d-flex flex-row">
+					<li :type="menuItem.c4_link ? 'button' : null" v-for="menuItem in menu" class="list-group-item border-0 ">
+						<div class="d-flex flex-row" >
 							<div class="mx-4">
-								<i :class="menuItem.c4_icon2 ? menuItem.c4_icon2 : 'fa-solid fa-pen-to-square'"></i>
+								<i :class="[menuItem.c4_icon2 ? menuItem.c4_icon2 : 'fa-solid fa-pen-to-square', !menuItem.c4_link ? 'unavailable' : null ]"></i>
 							</div>
-							<a class="text-decoration-none" :class="{'link-secondary':!menuItem.c4_link, 'link-dark':menuItem.c4_link}" :target="menuItem.c4_target" :href="menuItem.c4_link ? menuItem.c4_link : null">
+							<a class="text-decoration-none text-truncate" :class="{'link-dark':menuItem.c4_link, 'unavailable':!menuItem.c4_link}" :target="menuItem.c4_target" :href="menuItem.c4_link ? menuItem.c4_link : null">
 							{{menuItem.name}}
 							</a>
 						</div>
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv/Info.js b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv/Info.js
index 9676cf3cf..4d505a998 100644
--- a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv/Info.js
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv/Info.js
@@ -3,30 +3,18 @@
 const infos = {};
 
 export default {
-	props: {
-
-		lehrveranstaltung_id: Number,
-		bezeichnung: String,
-		studiengang_kuerzel: String,
-		semester: Number,
+	props:{
 		studien_semester: String,
-		orgform_kurzbz: String,
-		sprache: String,
-		ects: Number,
-		incoming: Number,
-		/*
-		 * NOTE(chris): 
-		 * Hack to expose in "emits" declared events to $props which we use 
-		 * in the v-bind directive to forward all events.
-		 * @see: https://github.com/vuejs/core/issues/3432
-		*/
-		onHideBsModal: Function,
-		onHiddenBsModal: Function,
-		onHidePreventedBsModal: Function,
-		onShowBsModal: Function,
-		onShownBsModal: Function
+		lehrveranstaltung_id: Number,
 	},
 	data: () => ({
+		bezeichnung: null,
+		studiengang_kuerzel: null,
+		semester: null,
+		orgform_kurzbz: null,
+		sprache: null,
+		ects: null,
+		incoming: null,
 		result: true,
 		info: null,
 	}),
@@ -61,10 +49,27 @@ export default {
 		}
 	},
 	created() {
+		this.$fhcApi.factory.lehre.getLvInfo(this.studien_semester, this.lehrveranstaltung_id)
+		.then(
+			res => res.data
+		).then(data =>{
+			Object.assign(this, 
+				{
+					bezeichnung : data.bezeichnung,
+					studiengang_kuerzel: data.studiengang_kuerzel,
+					semester: data.semester,
+					orgform_kurzbz: data.orgform_kurzbz,
+					sprache: data.sprache,
+					ects: data.ects,
+					incoming: data.incoming ?? '-',
+				});
+		})
+
 		if (infos[this.lehrveranstaltung_id]) {
 			this.info = infos[this.lehrveranstaltung_id];
 		} else {
 			axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/Cis/Mylv/Info/' + this.studien_semester + '/' + this.lehrveranstaltung_id).then(res => {
+				
 				this.info = infos[this.lehrveranstaltung_id] = res.data.retval || [];
 			}).catch(() => this.info = {});
 		}

From ec9e73180df11034cba58c2abe23bb90df6c4d75 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 29 Oct 2024 15:13:00 +0100
Subject: [PATCH 1341/1461] primevue custom tooltip directive zIndex config
 retrieval fix; studentByLva tabulator height calc abort if no dataTable
 rendered; phrases fix;

---
 system/phrasesupdate.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 15fc4fe45..196f654ec 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -28273,7 +28273,7 @@ array(
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
-		'phrase' => 'tooltipStudentAssistenz',
+		'phrase' => 'tooltipAssistenz',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(

From 587a193a6b91d39ca58b47b11f21228490f48eee Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 29 Oct 2024 15:18:53 +0100
Subject: [PATCH 1342/1461] refactors the LvMenu Modal

---
 public/css/components/dashboard.css           |  4 --
 public/js/components/Cis/Mylv/LvMenu.js       | 50 +++----------------
 public/js/components/Cis/Mylv/LvModal.js      | 12 ++---
 .../Cis/Mylv/Semester/Studiengang/Lv.js       |  9 +++-
 4 files changed, 17 insertions(+), 58 deletions(-)

diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
index bf06001a2..0266b04d8 100644
--- a/public/css/components/dashboard.css
+++ b/public/css/components/dashboard.css
@@ -47,9 +47,5 @@
 	cursor: move;
 }
 
-.underline_hover:hover{
-	color:var(--bs-primary);
-	text-decoration: underline;
-}
 
 
diff --git a/public/js/components/Cis/Mylv/LvMenu.js b/public/js/components/Cis/Mylv/LvMenu.js
index bbffe7ad4..b4cd72959 100644
--- a/public/js/components/Cis/Mylv/LvMenu.js
+++ b/public/js/components/Cis/Mylv/LvMenu.js
@@ -1,25 +1,16 @@
 
 export default {
 	props:{
-		isMenuSelected:{
-			type:Boolean,
-			default:false,
-		},
 		menu:{
 			type:Array,
 			default:null,
 		},
-		preselectedMenu: {
-			type: Object,
-			default: null,
-		},
 	},
 	data(){
 		return{
-			selectedMenu:null,
+			
 		}
 	},
-	emits:["update:isMenuSelected"],
 	methods:{
 		selectMenu: function (menuItem, index = null) {
 
@@ -40,45 +31,16 @@ export default {
 
 			
 		},
-		back: function(){
-			if(this.preselectedMenu){
-				this.$emit('hideModal');
-			}else{
-				this.$emit('update:isMenuSelected', false);
-			}
-		},
-	},
-	watch:{
-		'preselectedMenu': function (newValue) {
-			if (newValue) {
-				this.selectedMenu = newValue;
-				this.$emit("update:isMenuSelected", true);
-			}
-		},
-		isMenuSelected: function (newValue) {
-			// if no Menu point has been selected, show all Menu options
-			if (!newValue) {
-				this.selectedMenu = null;
-			}
-		}
 	},
 	template:/*html*/`
-	<div v-if="selectedMenu" class="d-flex flex-column h-100">
-		<div class="d-flex mb-2">
-			<button v-if="selectedMenu" @click="back" class="btn btn-secondary me-2"><i class="fa fa-chevron-left"></i> Back</button>
-			<h2>{{selectedMenu.name}}</h2>
-		</div>
-		<iframe class="h-100 w-100" :src="selectedMenu.c4_link" :title="selectedMenu.name"></iframe>
-	</div>
-	<div v-else-if="!menu">No Menu available</div>
+	<div v-if="!menu">No Menu available</div>
 	<div v-else class="container">
 		<div class="row">
-			<div style="min-height:150px" :title="menuItem.name" role="button" @click="selectMenu(menuItem)" class="col-12 col-lg-6 col-xl-4 border border-1 d-flex flex-column align-items-center justify-content-center p-1 text-center" v-for="(menuItem, index) in menu" :key="index">
+			<a style="min-height:150px" :title="menuItem.name" role="button" :href="menuItem.c4_link" class="g-2 col-12 col-lg-6 col-xl-4 border border-1 d-flex flex-column align-items-center justify-content-center p-1 text-center text-decoration-none link-dark" v-for="(menuItem, index) in menu" :key="index">
 				<img :src="menuItem.c4_icon" :alt="menuItem.name" ></img>
-				<span @click="selectMenu(menuItem)" class="underline_hover mt-2">{{menuItem.name}}</span>
-				<span v-for="([text,link],index) in menuItem.c4_linkList" @click.stop="selectMenu(menuItem,index)"  :class="{'underline_hover':menuItem.c4_linkList[index][1] != '#'}" class="mt-1" :index="index">{{text}}</span>
-
-			</div>
+				<span @click="selectMenu(menuItem)" class=" mt-2">{{menuItem.name}}</span>
+				<span v-for="([text,link],index) in menuItem.c4_linkList" @click.stop="selectMenu(menuItem,index)"   class="mt-1" :index="index">{{text}}</span>
+			</a>
 		</div>
 	</div>
 	`
diff --git a/public/js/components/Cis/Mylv/LvModal.js b/public/js/components/Cis/Mylv/LvModal.js
index 6dbd91063..809e8a57d 100644
--- a/public/js/components/Cis/Mylv/LvModal.js
+++ b/public/js/components/Cis/Mylv/LvModal.js
@@ -32,7 +32,6 @@ export default {
 			menu: [],
 			result: false,
 			info: null,
-			isMenuSelected:false,
 		};
 	},
 	computed: {
@@ -67,9 +66,6 @@ export default {
 				)
 			}
 		},
-		onModalHide:function(){
-			this.isMenuSelected = false;
-		}
 	},
 	mounted() {
 		this.modal = this.$refs.modalContainer.modal;
@@ -78,13 +74,13 @@ export default {
 		return BsModal.popup.bind(this)(null, options);
 	},
 	template: /*html*/ `
-	<bs-modal ref="modalContainer" @showBsModal="onModalShow" @hideBsModal="onModalHide" v-bind="$props" :bodyClass="''" :dialogClass="{'modal-lg': !isMenuSelected, 'modal-fullscreen':isMenuSelected}" class="bootstrap-alert" backdrop="false" >
+	<bs-modal ref="modalContainer" @showBsModal="onModalShow" @hideBsModal="onModalHide" v-bind="$props" :bodyClass="''" dialogClass='modal-lg' class="bootstrap-alert" backdrop="false" >
 		<template v-slot:title>
 			<template v-if="event.titel">{{ event.titel + ' - ' + event.lehrfach_bez + ' [' + event.ort_kurzbz+']'}}</template>
 			<template v-else>{{ event.lehrfach_bez + ' [' + event.ort_kurzbz+']'}}</template>
 		</template>
 		<template v-slot:default>
-			<template v-if="!isMenuSelected">
+			
 				<h3>{{$p.t('lvinfo','lehrveranstaltungsinformationen')}}</h3>
 				<table class="table table-hover mb-4">
 					<tbody>
@@ -139,8 +135,8 @@ export default {
 					</tbody>
 				</table>
 				<h3>Lehrveranstaltungs Menu</h3>
-			</template>
-			<lv-menu v-model:isMenuSelected="isMenuSelected" :menu="menu"></lv-menu>
+			
+			<lv-menu :menu="menu"></lv-menu>
 		</template>
 		<!-- optional footer -->
 		<template  v-slot:footer >
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
index 337742797..fca5b045a 100644
--- a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
@@ -103,7 +103,10 @@ export default {
 			.then(res => {
 				this.menu = res.data;
 			})
-			.catch((error) => this.$fhcAlert.handleSystemError);
+			.catch((error) => {
+				this.$fhcAlert.handleSystemError(error);
+				this.menu = [];
+			});
 	},
 	template: /*html*/`<div class="mylv-semester-studiengang-lv card">
 		<lv-uebersicht ref="lvUebersicht" :preselectedMenu="preselectedMenuItem" :event="{
@@ -142,11 +145,13 @@ export default {
 					<i class="fa fa-check text-success" v-if="positiv"></i>
 					{{ grade || p.t('lehre/noGrades') }}
 				</a>
+				<!--
+				Not used anymore because the lehrveranstaltungs informationen is available as a menu point in the lehrveranstaltungs optionen
 				<div v-if="lvinfo" class="col text-end">
 					<a class="card-link" href="#" @click.prevent="openInfos">
 						<i class="fa fa-info-circle" aria-hidden="true"></i>
 					</a>
-				</div>
+				</div>-->
 			</div>
 		</div>
 	</div>`

From bdfea1763db04f7ba937008315cdbf0ccc6d06d9 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 29 Oct 2024 15:38:10 +0100
Subject: [PATCH 1343/1461] adds gaps to the LvMenu

---
 public/js/components/Cis/Mylv/LvMenu.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/public/js/components/Cis/Mylv/LvMenu.js b/public/js/components/Cis/Mylv/LvMenu.js
index b4cd72959..868aa6c9e 100644
--- a/public/js/components/Cis/Mylv/LvMenu.js
+++ b/public/js/components/Cis/Mylv/LvMenu.js
@@ -35,12 +35,14 @@ export default {
 	template:/*html*/`
 	<div v-if="!menu">No Menu available</div>
 	<div v-else class="container">
-		<div class="row">
-			<a style="min-height:150px" :title="menuItem.name" role="button" :href="menuItem.c4_link" class="g-2 col-12 col-lg-6 col-xl-4 border border-1 d-flex flex-column align-items-center justify-content-center p-1 text-center text-decoration-none link-dark" v-for="(menuItem, index) in menu" :key="index">
-				<img :src="menuItem.c4_icon" :alt="menuItem.name" ></img>
-				<span @click="selectMenu(menuItem)" class=" mt-2">{{menuItem.name}}</span>
-				<span v-for="([text,link],index) in menuItem.c4_linkList" @click.stop="selectMenu(menuItem,index)"   class="mt-1" :index="index">{{text}}</span>
-			</a>
+		<div class="row g-2">
+			<div style="min-height:150px" class="col-12 col-lg-6 col-xl-4" v-for="(menuItem, index) in menu" :key="index">
+				<a :title="menuItem.name" role="button" :href="menuItem.c4_link" class="border border-1 d-flex flex-column align-items-center justify-content-center text-center text-decoration-none link-dark h-100">
+					<img :src="menuItem.c4_icon" :alt="menuItem.name" ></img>
+					<span @click="selectMenu(menuItem)" class=" mt-2">{{menuItem.name}}</span>
+					<span v-for="([text,link],index) in menuItem.c4_linkList" @click.stop="selectMenu(menuItem,index)"   class="mt-1" :index="index">{{text}}</span>
+				</a>
+			</div>
 		</div>
 	</div>
 	`

From 6b991c514e3ba36886ef5185c1b3ede49cd9e725 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 29 Oct 2024 15:49:56 +0100
Subject: [PATCH 1344/1461] refactors the room actions in the searchbar

---
 public/js/apps/Cis.js                       | 10 +---------
 public/js/components/searchbar/searchbar.js |  1 -
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js
index b52c49c82..e044c8ae4 100644
--- a/public/js/apps/Cis.js
+++ b/public/js/apps/Cis.js
@@ -45,7 +45,7 @@ const app = Vue.createApp({
                         },
                         childactions: [
                             {
-                                label: "Rauminformation",
+								label: "Raumübersicht",
                                 icon: "fas fa-info-circle",
                                 type: "link",
                                 action: function(data) {
@@ -60,14 +60,6 @@ const app = Vue.createApp({
                                     return data.booklink;
                                 }
                             },
-                            {
-                                label: "Raumübersicht",
-                                icon: "fas fa-bookmark",
-                                type: "link",
-                                action: function(data) {
-                                    return data.roomoverview;
-                                }
-                            }
                         ]
                     },
                     organisationunit: {
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 50e09eeb2..b0f9dffc6 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -108,7 +108,6 @@ export default {
                 childactions:child,
                 defaultaction:this.searchoptions.actions.raum.defaultaction
             }
-            
             return computedActions;
             
             

From 9b4fb2ac2c277a0151fcb4696dd7e07b089e3b17 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Tue, 29 Oct 2024 16:28:17 +0100
Subject: [PATCH 1345/1461] bpk job: enabled getting vBPKs with new API version
 0.8

---
 config/vilesci.config-default.inc.php |   2 +
 include/dvb.class.php                 |  95 +++++++---
 include/kennzeichen.class.php         | 261 ++++++++++++++++++++++++++
 include/person.class.php              |   6 +-
 vilesci/cronjobs/bpk.php              |  92 ++++++++-
 5 files changed, 427 insertions(+), 29 deletions(-)
 create mode 100644 include/kennzeichen.class.php

diff --git a/config/vilesci.config-default.inc.php b/config/vilesci.config-default.inc.php
index a372bc9da..09f33ee31 100644
--- a/config/vilesci.config-default.inc.php
+++ b/config/vilesci.config-default.inc.php
@@ -266,6 +266,8 @@ define('BIS_FUNKTIONSCODE_6_ARR', array(
 
 // bPk Abfrage
 define('BPK_FUER_ALLE_BENUTZER_ABFRAGEN', false);
+// bPk Typen in Form 'BEREICH' => 'kennzeichenTyp'
+define('VBPK_TYPES', array('AS' => 'vbpkAs', 'BF' => 'vbpkBf', 'ZP-TD' => 'vbpkTd'));
 
 // Docsbox configs
 define('DOCSBOX_SERVER', 'http://docconverter.technikum-wien.at/');
diff --git a/include/dvb.class.php b/include/dvb.class.php
index fbeb79afc..90eb8d306 100644
--- a/include/dvb.class.php
+++ b/include/dvb.class.php
@@ -29,6 +29,7 @@ require_once(dirname(__FILE__).'/studiensemester.class.php');
 require_once(dirname(__FILE__).'/adresse.class.php');
 require_once(dirname(__FILE__).'/webservicelog.class.php');
 require_once(dirname(__FILE__).'/prestudent.class.php');
+require_once(dirname(__FILE__).'/kennzeichen.class.php');
 require_once(dirname(__FILE__).'/errorhandler.class.php');
 
 class dvb extends basis_db
@@ -42,6 +43,7 @@ class dvb extends basis_db
 	const DVB_URL_WEBSERVICE_RESERVIERUNG = DVB_PORTAL.'/rws/0.6/matrikelreservierung.xml';
 	const DVB_URL_WEBSERVICE_MELDUNG = DVB_PORTAL.'/rws/0.6/matrikelmeldung.xml';
 	const DVB_URL_WEBSERVICE_BPK = DVB_PORTAL.'/rws/0.6/pruefebpk.xml';
+	const DVB_URL_WEBSERVICE_BPK_ALL = DVB_PORTAL.'/rws/0.8/pruefebpk.xml';
 
 	public $authentication;
 	private $username;
@@ -1149,15 +1151,29 @@ class dvb extends basis_db
 	 */
 	public function getBPK($person_id)
 	{
+		$vbpkTypes = defined('VBPK_TYPES') && is_array(VBPK_TYPES) ? VBPK_TYPES : null;
+
 		$person = new person();
 		if ($person->load($person_id))
 		{
 			if ($person->bpk != '')
 			{
-				// BPK exisitert bereits
 				$retval = new stdClass();
 				$retval->bpk = $person->bpk;
-				return ErrorHandler::success($retval);
+
+				// BPK existiert bereits
+				if (!isset($vbpkTypes)) return ErrorHandler::success($retval);
+
+				$kennzeichen = new kennzeichen();
+
+				if ($kennzeichen->load_pers($person_id, $vbpkTypes))
+				{
+					if (array_unique(array_column($kennzeichen->result, 'kennzeichentyp_kurzbz')) == array_values($vbpkTypes))
+					{
+						// BPKs exisiteren bereits
+						return ErrorHandler::success($retval);
+					}
+				}
 			}
 
 			if ($person->gebdatum == '')
@@ -1178,7 +1194,8 @@ class dvb extends basis_db
 				return ErrorHandler::error($errormsg);
 			}
 
-			$geburtsdatum = str_replace("-", "", $person->gebdatum);
+			//$geburtsdatum = str_replace("-", "", $person->gebdatum);
+			$geburtsdatum = $person->gebdatum;
 			$vorname = $person->vorname;
 			$nachname = $person->nachname;
 			$geschlecht = mb_strtoupper($person->geschlecht);
@@ -1258,6 +1275,8 @@ class dvb extends basis_db
 	 */
 	public function pruefeBPK($geburtsdatum, $vorname, $nachname, $geschlecht, $plz = null, $strasse = null)
 	{
+		$vbpkTypes = defined('VBPK_TYPES') && is_array(VBPK_TYPES) ? VBPK_TYPES : null;
+
 		if ($this->tokenIsExpired())
 		{
 			$result = $this->authenticate();
@@ -1271,7 +1290,7 @@ class dvb extends basis_db
 
 		$uuid = $this->getUUID();
 
-		$url = self::DVB_URL_WEBSERVICE_BPK;
+		$url = self::DVB_URL_WEBSERVICE_BPK_ALL;
 		$url .= '?geburtsdatum='.curl_escape($curl, $geburtsdatum);
 		$url .= '&vorname='.curl_escape($curl, $vorname);
 		$url .= '&nachname='.curl_escape($curl, $nachname);
@@ -1311,24 +1330,15 @@ class dvb extends basis_db
 		if ($curl_info['http_code'] == '200')
 		{
 			/* Example Response:
-			 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-			 <simpleBpkResponse xmlns="http://www.brz.gv.at/datenverbund-unis">
-			 	<bpk>12345ABCDEFGHXXXXXXX=</bpk>
-				<personInfo>
-				<person>
-					<vorname>Hans</vorname>
-					<nachname>Huber</nachname>
-					<geschlecht>M</geschlecht>
-					<gebdat>1990-01-01</gebdat>
-				</person>
-				<adresse>
-					<staat></staat>
-					<plz>1100</plz>
-					<ort></ort>
-					<strasse></strasse>
-				</adresse>
-				</personInfo>
-			</simpleBpkResponse>
+			<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+				<bpkResponse xmlns="http://www.brz.gv.at/datenverbund-unis">
+					<uuid>5cc93441-a46a-4f97-a5e3-e64891b39f10</uuid>
+					<bpk>12345ABCDEFG</bpk>
+					<vbpk bereich="AS" vkz="BBA-STA">12345ABCDEFG</vbpk>
+					<vbpk bereich="BF" vkz="BMBWF">12345ABCDEFG</vbpk>
+					<vbpk bereich="ZP-TD" vkz="BMF">12345ABCDEFG</vbpk>
+					<geprueft>true</geprueft>
+				</bpkResponse>
 
 			Example Error:
 			<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
@@ -1369,10 +1379,30 @@ class dvb extends basis_db
 			}
 
 			$domnodes_bpk = $dom->getElementsByTagNameNS($namespace, 'bpk');
+
 			if ($domnodes_bpk->length > 0)
 			{
 				$retval = new stdClass();
 				$retval->bpk = $domnodes_bpk->item(0)->textContent;
+
+				// vbpks auslesen
+				$domnodes_vbpks = $dom->getElementsByTagNameNS($namespace, 'vbpk');
+
+				$retval->vbpks = array();
+				if ($domnodes_vbpks->length > 0)
+				{
+					foreach ($domnodes_vbpks as $domnode_vbpk)
+					{
+						foreach ($domnode_vbpk->attributes as $attribute)
+						{
+							if ($attribute->nodeName == 'bereich' && isset($vbpkTypes[$attribute->nodeValue]))
+							{
+								$retval->vbpks[$vbpkTypes[$attribute->nodeValue]] = $domnode_vbpk->nodeValue;
+							}
+						}
+					}
+				}
+
 				return ErrorHandler::success($retval);
 			}
 			else
@@ -1385,6 +1415,27 @@ class dvb extends basis_db
 					$retval->multiple = true;
 					return ErrorHandler::error(null, $retval);
 				}
+				else
+				{
+					$errorTexts = array();
+					$domnodes_fehler = $dom->getElementsByTagNameNS($namespace, 'fehlerliste');
+
+					if ($domnodes_fehler->length > 0)
+					{
+						foreach ($domnodes_fehler as $domnode_fehler)
+						{
+							if ($domnode_fehler->childNodes->length > 0)
+							{
+								foreach ($domnode_fehler->childNodes as $childNode)
+								{
+									$errorTexts[] = $childNode->nodeValue;
+								}
+							}
+						}
+						$this->errormsg = count($errorTexts) > 0 ? implode('; ', $errorTexts) : null;
+						return ErrorHandler::error(null);
+					}
+				}
 			}
 			return ErrorHandler::error();
 		}
diff --git a/include/kennzeichen.class.php b/include/kennzeichen.class.php
new file mode 100644
index 000000000..c21c5eee0
--- /dev/null
+++ b/include/kennzeichen.class.php
@@ -0,0 +1,261 @@
+<?php
+/* Copyright (C) 2006 Technikum-Wien
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors: Alexei Karpenko <karpenko@technikum-wien.at>,
+ */
+/**
+ * Klasse kennzeichen
+ */
+require_once(dirname(__FILE__).'/basis_db.class.php');
+
+class kennzeichen extends basis_db
+{
+	public $new;       // boolean
+	public $result = array(); // adresse Objekt
+
+	//Tabellenspalten
+	public $kennzeichen_id;	// integer
+	public $person_id;	// integer
+
+	public $kennzeichentyp_kurzbz;	// string
+	public $inhalt;	// string
+	public $aktiv;	// boolean
+	public $insertamum;	// timestamp
+	public $insertvon;	// string
+	public $updateamum;	// timestamp
+	public $updatevon;	// string
+
+	/**
+	 * Konstruktor
+	 * @param $kennzeichen_id ID des Kennzeichens das geladen werden soll (Default=null)
+	 */
+	public function __construct($kennzeichen_id=null)
+	{
+		parent::__construct();
+		$this->new = true;
+
+		if(!is_null($kennzeichen_id))
+			$this->load($kennzeichen_id);
+	}
+
+	/**
+	 * Laedt ein Kennzeichen mit der ID $kennzeichen_id
+	 * @param  $kennzeichen_id ID des zu ladenden Kennzeichens
+	 * @return true wenn ok, false im Fehlerfall
+	 */
+	public function load($kennzeichen_id)
+	{
+		if (!is_numeric($kennzeichen_id))
+		{
+			$this->errormsg = 'Kennzeichen Id ist ungueltig';
+			return false;
+		}
+
+		$qry = "SELECT
+					*
+				FROM
+					public.tbl_kennzeichen
+				WHERE
+					kennzeichen_id = " . $this->db_add_param($kennzeichen_id, FHC_INTEGER) . ";";
+
+		if ($this->db_query($qry))
+		{
+			if ($row = $this->db_fetch_object())
+			{
+				$this->kennzeichen_id = $row->kennzeichen_id;
+				$this->person_id = $row->person_id;
+				$this->kennzeichentyp_kurzbz = $row->kennzeichentyp_kurzbz;
+				$this->inhalt = $row->inhalt;
+				$this->aktiv = $this->db_parse_bool($row->aktiv);
+				$this->updateamum = $row->updateamum;
+				$this->updatevon = $row->updatevon;
+				$this->insertamum = $row->insertamum;
+				$this->insertvon = $row->insertvon;
+				return true;
+			}
+			else
+			{
+				$this->errormsg = 'Datensatz wurde nicht gefunden';
+				return false;
+			}
+		}
+		else
+		{
+			$this->errormsg = 'Fehler beim Laden der Daten';
+			return false;
+		}
+	}
+
+	/**
+	 * Prueft die Kennzeichen auf Gueltigkeit
+	 * @return true wenn ok, false im Fehlerfall
+	 */
+	public function validate()
+	{
+		//Gesamtlaenge pruefen
+		if(mb_strlen($this->kennzeichentyp_kurzbz)>32)
+		{
+			$this->errormsg = 'Kennzeichentyp darf nicht länger als 32 Zeichen sein';
+			return false;
+		}
+		$this->errormsg = '';
+		return true;
+	}
+
+	/**
+	 * Speichert den aktuellen Datensatz in die Datenbank
+	 * Wenn $neu auf true gesetzt ist wird ein neuer Datensatz angelegt
+	 * andernfalls wird der Datensatz mit der ID in $kennzeichen_id aktualisiert
+	 * @return true wenn ok, false im Fehlerfall
+	 */
+	public function save($new = null)
+	{
+		if(!is_null($new))
+			$this->new = $new;
+
+		//Variablen pruefen
+		if(!$this->validate())
+			return false;
+
+		if($this->new)
+		{
+			//Neuen Datensatz einfuegen
+			$qry='BEGIN;INSERT INTO public.tbl_kennzeichen (person_id, kennzeichentyp_kurzbz, inhalt, aktiv, insertamum, insertvon) VALUES('.
+				$this->db_add_param($this->person_id, FHC_INTEGER).', '.
+				$this->db_add_param($this->kennzeichentyp_kurzbz).', '.
+				$this->db_add_param($this->inhalt).', '.
+				$this->db_add_param($this->aktiv, FHC_BOOLEAN).', now(), '.
+				$this->db_add_param($this->insertvon).');';
+		}
+		else
+		{
+			//Updaten des bestehenden Datensatzes
+
+			//Pruefen ob kennzeichen_id eine gueltige Zahl ist
+			if(!is_numeric($this->kennzeichen_id))
+			{
+				$this->errormsg = 'kennzeichen_id muss eine gueltige Zahl sein';
+				return false;
+			}
+
+			$qry='UPDATE public.tbl_kennzeichen SET '.
+				'person_id='.$this->db_add_param($this->person_id,FHC_INTEGER).', '.
+				'kennzeichentyp_kurzbz='.$this->db_add_param($this->kennzeichentyp_kurzbz).', '.
+				'aktiv='.$this->db_add_param($this->aktiv, FHC_BOOLEAN).', '.
+				'updateamum= now(), '.
+				'updatevon='.$this->db_add_param($this->updatevon).' '.
+				'WHERE kennzeichen_id='.$this->db_add_param($this->kennzeichen_id, FHC_INTEGER).';';
+		}
+
+		if($this->db_query($qry))
+		{
+			//Sequence auslesen um die eingefuegte ID zu ermitteln
+			if($this->new)
+			{
+				$qry = "SELECT currval('public.tbl_kennzeichen_id_seq') as id;";
+
+				if($this->db_query($qry))
+				{
+					if($row = $this->db_fetch_object())
+					{
+						$this->kennzeichen_id = $row->id;
+						$this->db_query('COMMIT;');
+						return true;
+					}
+					else
+					{
+						$this->errormsg = 'Fehler beim Auslesen er Sequence';
+						$this->db_query('ROLLBACK;');
+						return false;
+					}
+				}
+				else
+				{
+					$this->errormsg = 'Fehler beim Auslesen der Sequence';
+					$this->db_query('ROLLBACK;');
+					return false;
+				}
+			}
+			return true;
+		}
+		else
+		{
+			$this->errormsg = 'Fehler beim Speichern der Daten';
+			return false;
+		}
+	}
+
+	/**
+	 * Laedt Kennzeichen einer Person
+	 * @param person_id
+	 * @param kennzeichentyp_kurzbz_arr filtern nach Kennzeichentyp
+	 * @return boolean
+	 */
+	public function load_pers($person_id, $kennzeichentyp_kurzbz_arr)
+	{
+		if(!is_numeric($person_id))
+		{
+			$this->errormsg = 'Person_id ist ungueltig';
+			return false;
+		}
+		if(!is_array($kennzeichentyp_kurzbz_arr))
+		{
+			$this->errormsg = 'Kennzeichen sind ungueltig';
+			return false;
+		}
+
+		$qry = "
+			SELECT
+				kz.kennzeichen_id, kz.person_id, kz.kennzeichentyp_kurzbz, inhalt, aktiv, updateamum, updatevon, insertamum, insertvon
+			FROM
+				public.tbl_kennzeichen kz
+			WHERE
+				person_id=".$this->db_add_param($person_id, FHC_INTEGER)."
+				AND aktiv = TRUE
+				AND kennzeichentyp_kurzbz IN (".$this->implode4SQL($kennzeichentyp_kurzbz_arr).")
+			ORDER BY
+				kz.kennzeichentyp_kurzbz, kz.kennzeichen_id;";
+
+		if($this->db_query($qry))
+		{
+			while($row = $this->db_fetch_object())
+			{
+				$obj = new kennzeichen();
+
+				$obj->kennzeichen_id = $row->kennzeichen_id;
+				$obj->person_id = $row->person_id;
+				$obj->kennzeichentyp_kurzbz = $row->kennzeichentyp_kurzbz;
+				$obj->inhalt = $row->inhalt;
+				$obj->aktiv = $this->db_parse_bool($row->aktiv);
+				$obj->updateamum = $row->updateamum;
+				$obj->updatevon = $row->updatevon;
+				$obj->insertamum = $row->insertamum;
+				$obj->insertvon = $row->insertvon;
+
+				$this->result[] = $obj;
+			}
+
+			return true;
+		}
+		else
+		{
+			$this->errormsg = 'Fehler beim Laden der Daten';
+			return false;
+		}
+	}
+}
+?>
diff --git a/include/person.class.php b/include/person.class.php
index 95230ef3e..924c15ab6 100644
--- a/include/person.class.php
+++ b/include/person.class.php
@@ -97,10 +97,10 @@ class person extends basis_db
 							familienstand, anzahlkinder, aktiv, insertamum, insertvon, updateamum, updatevon, ext_id,
 							geschlecht, staatsbuergerschaft, geburtsnation, kurzbeschreibung, zugangscode, foto_sperre,
 							matr_nr, bpk, wahlname";
-			if ($hasUDF = $udf->personHasUDF())
-				$qry .= ", udf_values ";
+			if ($hasUDF = $udf->personHasUDF() && false)
+				$qry .= ", udf_values";
 
-			$qry .= "FROM public.tbl_person
+			$qry .= " FROM public.tbl_person
 					 WHERE person_id = " . $this->db_add_param($personId, FHC_INTEGER);
 
 			if (!$this->db_query($qry))
diff --git a/vilesci/cronjobs/bpk.php b/vilesci/cronjobs/bpk.php
index 3a7ac4395..75af4f9f8 100644
--- a/vilesci/cronjobs/bpk.php
+++ b/vilesci/cronjobs/bpk.php
@@ -27,6 +27,7 @@ require_once(dirname(__FILE__).'/../../include/basis_db.class.php');
 require_once(dirname(__FILE__).'/../../include/dvb.class.php');
 require_once(dirname(__FILE__).'/../../include/benutzerberechtigung.class.php');
 require_once(dirname(__FILE__).'/../../include/datum.class.php');
+require_once(dirname(__FILE__).'/../../include/kennzeichen.class.php');
 require_once(dirname(__FILE__).'/../../include/errorhandler.class.php');
 
 if (!$db = new basis_db())
@@ -34,6 +35,7 @@ if (!$db = new basis_db())
 
 $limit = '';
 $debug = false;
+$vbpkTypes = defined('VBPK_TYPES') && is_array(VBPK_TYPES) ? VBPK_TYPES : null;
 
 // Wenn das Script nicht ueber Commandline gestartet wird, muss eine
 // Authentifizierung stattfinden
@@ -85,8 +87,27 @@ if (defined('BPK_FUER_ALLE_BENUTZER_ABFRAGEN') && BPK_FUER_ALLE_BENUTZER_ABFRAGE
 		JOIN public.tbl_benutzer USING(person_id)
 	WHERE
 		public.tbl_benutzer.aktiv = true
-		AND tbl_person.bpk is null
-		AND gebdatum is not null";
+		AND
+		(
+			tbl_person.bpk is null";
+
+	// checken, ob vBpks fehlen
+	if (isset($vbpkTypes))
+	{
+		$qry .=
+		" OR (
+				SELECT
+					COUNT(DISTINCT kennzeichentyp_kurzbz)
+				FROM
+					public.tbl_kennzeichen
+				WHERE
+					person_id = tbl_person.person_id
+					AND kennzeichentyp_kurzbz IN (".$db->implode4SQL($vbpkTypes).")
+			) < ".$db->db_add_param(count($vbpkTypes), FHC_INTEGER);
+	}
+
+	$qry .=
+		") AND gebdatum is not null";
 }
 else
 {
@@ -100,8 +121,27 @@ else
 	WHERE
 		public.tbl_benutzer.aktiv = true
 		AND tbl_person.matr_nr is not null
-		AND tbl_person.bpk is null
-		AND studiengang_kz<10000
+		AND
+		(
+			tbl_person.bpk is null";
+
+	// checken, ob vBpks fehlen
+	if (isset($vbpkTypes))
+	{
+		$qry .=
+		" OR (
+				SELECT
+					COUNT(DISTINCT kennzeichentyp_kurzbz)
+				FROM
+					public.tbl_kennzeichen
+				WHERE
+					person_id = tbl_person.person_id
+					AND kennzeichentyp_kurzbz IN (".$db->implode4SQL($vbpkTypes).")
+			) < ".$db->db_add_param(count($vbpkTypes), FHC_INTEGER);
+	}
+
+	$qry .=
+	") AND studiengang_kz<10000
 		AND EXISTS(SELECT 1 FROM public.tbl_prestudent WHERE person_id=tbl_person.person_id AND bismelden=true)
 		AND gebdatum is not null";
 }
@@ -135,6 +175,50 @@ if ($result = $db->db_query($qry))
 						echo ' OK';
 					else
 						echo ' Failed: '.$person->errormsg;
+
+					$vbpkErrors = array();
+
+					// alle existierenden vBpks einer Person holen
+					$kennzeichenTypes = new kennzeichen();
+					if ($kennzeichenTypes->load_pers($row->person_id, $vbpkTypes))
+					{
+						$existingVbpks = $kennzeichenTypes->result;
+
+						foreach ($data->retval->vbpks as $vbpkType => $vbpkValue)
+						{
+							$new = true;
+							foreach ($existingVbpks as $existingVbpk)
+							{
+								// nicht speichern, wenn vBpk bereits vorhanden
+								if ($existingVbpk->kennzeichentyp_kurzbz == $vbpkType)
+								{
+									$new = false;
+									break;
+								}
+							}
+
+							if (!$new) continue;
+
+							// neue vBpk speichern
+							$kennzeichen = new kennzeichen();
+
+							$kennzeichen->person_id = $row->person_id;
+							$kennzeichen->kennzeichentyp_kurzbz = $vbpkType;
+							$kennzeichen->inhalt = $vbpkValue;
+							$kennzeichen->aktiv = true;
+							$kennzeichen->insertvon = 'bpkJob';
+
+							if (!$kennzeichen->save())
+							{
+								$vbpkErrors[] = 'Failed to save vBpk '.$vbpkType.':'.$kennzeichen->errormsg;
+							}
+						}
+					}
+
+					if (count($vbpkErrors) > 0)
+					{
+						echo implode('; ', $vbpkErrors);
+					}
 				}
 			}
 			else

From 837cc191bf15620546902508279c0688b88c114a Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 30 Oct 2024 10:49:27 +0100
Subject: [PATCH 1346/1461] adds another link regex for the link string
 '../cms/content?content_id=...' and adds the library content to the CIS4 Menu
 content

---
 public/js/components/Cis/Menu/Entry.js | 20 +++++++++++++-------
 system/dbupdate_3.4/25999_C4_Menu.php  | 26 +++++++++++++++++++-------
 2 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/public/js/components/Cis/Menu/Entry.js b/public/js/components/Cis/Menu/Entry.js
index e6950fbad..c29fbb9ac 100644
--- a/public/js/components/Cis/Menu/Entry.js
+++ b/public/js/components/Cis/Menu/Entry.js
@@ -28,12 +28,12 @@ export default {
 		activeContent: function(newValue){
 			if(newValue == this.entry.content_id){
 				// wenn der Menupunkt nicht bereits offen ist
-				if(!this.entry.menu_open){
+				if (!this.entry.menu_open){
 					this.entry.menu_open = true;
 				}
 				
 			}else{
-				if (this.searchRecursiveChild(this.entry, newValue)) {
+				if (this.searchRecursiveChild(this.entry, 'content_id',newValue)) {
 					this.entry.menu_open = true;
 				} else {
 					this.entry.menu_open = false;
@@ -85,6 +85,12 @@ export default {
 					let news_regex = new RegExp("^\.\./cms/news\.php");
 					url = url.replace(news_regex, FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/CisVue/Cms/news');
 				}
+				else if (url.includes("../cms/content.php?")) {
+					let content_regex = new RegExp("^\.\./cms/content.php\\?content_id=([0-9]+)");
+					let content_regex_result = content_regex.exec(url);
+					// content_regex_result[1] will be the first matched group
+					return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/CisVue/Cms/content/' + content_regex_result[1];
+				}
 				else if(url.includes("../index.ci.php")){
 					let index_regex = new RegExp("^\.\./index\.ci\.php");
 					url = url.replace(index_regex, FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router);
@@ -149,19 +155,20 @@ export default {
 			// or if the url equals the link of a menu 
 			// then set the menu active 
 			if (url_hash == this.entry.titel || url.href == this.link) {
-				this.setActiveEntry(this.entry.content_id);
+					this.setActiveEntry(this.entry.content_id);
 			}
 		},
-		searchRecursiveChild(entry,child_content_id){
+		// searches the childs of an entry recursively based on the value of a property
+		searchRecursiveChild(entry,property,value){
 			if (typeof entry.childs == 'object' && !Array.isArray(entry.childs) && Object.entries(entry.childs).length > 0){
 				entry.childs = Object.values(entry.childs);
 			}
 			for (let child of entry.childs) {
-				if (child.content_id == child_content_id) {
+				if (child[property] == value) {
 					return true;
 				}
 				if ((child.childs instanceof Array && child.childs.length > 0) || Object.values(child.childs).length > 0) {
-					if (this.searchRecursiveChild(child, child_content_id)){
+					if (this.searchRecursiveChild(child, property, value)){
 						return true;
 					}
 				}
@@ -175,7 +182,6 @@ export default {
 			}
 			else
 			{
-				console.log("entered here to make the content active")
 				this.setActiveEntry(this.entry.content_id);
 			}
         }
diff --git a/system/dbupdate_3.4/25999_C4_Menu.php b/system/dbupdate_3.4/25999_C4_Menu.php
index 55b7d8185..990f6828c 100644
--- a/system/dbupdate_3.4/25999_C4_Menu.php
+++ b/system/dbupdate_3.4/25999_C4_Menu.php
@@ -1,5 +1,7 @@
 <?php
 
+// this file can be efficiently searched by searching for the symbol '~' which is attached to each heading of (content, contentsprache, contentchilds)
+
 $TLC_content_latest_version = '<content><titel><![CDATA[Das Teaching & Learning Center - Viele Aufgaben, viele Köpfe, viel Expertise]]></titel><inhalt><![CDATA[<table style="width: 80%;" cellspacing="0" cellpadding="0" border="0"><tbody><tr><td class="cmscontent " rowspan="3" valign="top"><table id="t1" style="width: 100%;" border="0" align="left"><tbody><tr><td><h2><strong style="font-size: small;">Erreichbarkeit Student-Support:&nbsp;</strong></h2><p><span style="font-size: small;">F&uuml;r Studierende:&nbsp;</span><br /><span style="font-size: small;">E:&nbsp;<a href="mailto:studentsupport@technikum-wien.at">studentsupport@technikum-wien.at<br /></a></span><span style="font-size: small;">WhatsApp: <a href="https://wa.me/message/5MDJTULYMUU7G1" target="_blank">+43 664 889 60 947</a></span><br /><span style="font-size: small;">R: B2.07<br /><br />F&uuml;r Lehrende:<br /><span>E:&nbsp;</span><a href="mailto:teachingsupport@technikum-wien.at">teachingsupport@technikum-wien.at<br /></a><span>R: A0.05<br /><br />Pre-Student:<br />E:&nbsp;</span><a href="mailto:prestudent@technikum-wien.at" rel="noopener noreferrer" class="op-uc-link">prestudent@technikum-wien.at<br /></a>R: B1.14</span></p></td><td><p><strong><span style="font-size: small;">Erreichbarkeit Moodle-Support:&nbsp; &nbsp;&nbsp;</span></strong></p><p><span style="font-size: small;"><strong>Di - Mi&nbsp; &nbsp; &nbsp; &nbsp;10:00 - 15:00&nbsp; &nbsp;<br />Do&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;12:00 - 16:00<br /></strong><br /></span></p><p style="text-align: left;"><span style="font-size: small; text-align: center;"><br />T:&nbsp;+43 1 333 40 77 - 233<br />E:&nbsp;<a href="mailto:moodle@technikum-wien.at">moodle@technikum-wien.at<br /></a>R: A0.05<br /><br /><br /><a href="https://moodle.technikum-wien.at/course/view.php?id=13353">Moodlekurs Study@FHTW&nbsp;</a><br /><a href="https://moodle.technikum-wien.at/course/view.php?id=16619&amp;section=3">Moodlekurs FHTW-Infobase Lehrende</a></span></p></td><td><p><img src="dms.php?id=247112" width="250" height="295" /></p></td></tr><tr><td><br /><br /></td><td align="left" valign="top"><span style="font-size: small;"><br /></span></td><td align="left" valign="top"><strong><span style="font-size: small;">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;E:&nbsp;</span></strong><a href="mailto:tlc@technikum-wien.at"><strong><span style="font-size: small;">tlc@technikum-wien.at</span></strong><br /></a></td></tr></tbody></table><br /><br /><table class="tablesorter tablesorter_col_0 tablesorter_sort_0" id="t1" style="width: 100%;" border="0" align="left"><thead><tr><th>Leitung</th><th>Arbeitsbereich</th><th>Kontakt</th></tr></thead><tbody><tr><td style="width: 180px;">Lingo, Sylvia</td><td style="width: 320px;">Leitung.</td><td>T. +43 1 3334077 - 4752<br />M. <a href="mailto:sylvia.lingo@technikum-wien.at">sylvia.lingo@technikum-wien.at</a><br />R. B1.13</td></tr></tbody></table><br /><br /><table class="tablesorter tablesorter_col_0 tablesorter_sort_0" id="t1" style="width: 100%;" border="0" align="left"><thead><tr><th><b>Student Support<br /></b><b><a href="mailto:studentsupport@technikum-wien.at" title="mailto:studentsupport@technikum-wien.at">studentsupport@technikum-wien.at</a><a href="mailto:tereza.obrucova@technikum-wien.at">&nbsp;</a></b></th><th>Arbeitsbereich</th><th>Kontakt</th></tr></thead><tbody><tr><td style="width: 180px;"><span>Czedron, Nina</span></td><td style="width: 320px;"><span>Administration, interne Kommunikation, Personal, Bestellwesen.</span></td><td><span>T. +43 1 333 40 77 - 4137</span><br /><span>M.&nbsp;</span><a href="mailto:nina.czedron@technikum-wien.at">nina.czedron@technikum-wien.at</a><br /><span>R. B1.13</span></td></tr><tr><td style="width: 180px;"><span>Lang, Julia Maria</span></td><td style="width: 320px;">Pre-Student-Support (<a href="mailto:prestudent@technikum-wien.at" rel="noopener noreferrer" class="op-uc-link">prestudent@technikum-wien.at</a>):<span><br />Qualifikationskurse, Warm- Up Kurse, FiT- Vorqualifizierungen, Erg&auml;nzungspr&uuml;fungen.</span></td><td>T.&nbsp;+43 1 333 40 77 - 5532<br />M.&nbsp;<span><a href="mailto:julia_maria.lang@technikum-wien.at" title="mailto:julia_maria.lang@technikum-wien.at">julia_maria.lang@technikum-wien.at<br /></a></span>R.&nbsp;B1.14</td></tr><tr><td style="width: 180px;"></td><td style="width: 320px;"><p class="op-uc-p"><span>Schreibwerkstatt</span></p></td><td><span>T.&nbsp;</span><br /><span>M.</span><a href="mailto:nefise.top@technikum-wien.at"><br /></a><span>R.</span></td></tr><tr><td style="width: 180px;"><span><span>M&uuml;hlbacher, Stefan<br /></span></span></td><td style="width: 320px;">Pre-Student-Support (<a href="mailto:prestudent@technikum-wien.at" rel="noopener noreferrer" class="op-uc-link">prestudent@technikum-wien.at</a>):<span><br />Qualifikationskurse, Warm-Up Kurse, FiT-Vorqualifizierungen, Erg&auml;nzungspr&uuml;fungen.</span></td><td><span>T.&nbsp;+43 1 333 40 77 - 3610</span><br /><span>M.&nbsp;</span><a href="mailto:stefan.muehlbacher@technikum-wien.at">stefan.muehlbacher@technikum-wien.at</a><a href="mailto:nefise.top@technikum-wien.at"><br /></a><span>R. B1.14</span></td></tr><tr><td style="width: 180px;"><span><span><span><span><span><span>Obručov&aacute;, Tereza</span></span><br /></span></span></span></span></td><td style="width: 320px;">Lernberatung, Short Tracks,&nbsp;Planung Welcome Days.</td><td><span><span>T.&nbsp;0664-8205594</span><br /><span>M.&nbsp;</span><a href="mailto:tereza.obrucova@technikum-wien.at">tereza.obrucova@technikum-wien.at<br /></a><span>R. B2.07</span></span></td></tr><tr><td style="width: 180px;">Wicker, Larissa</td><td style="width: 320px;">Studierenden-Support,&nbsp;Pre-Student-Support, Betreuung der Jahrgangsvertreter*innen.</td><td>T. 0664-88348182<br />M. <a href="mailto:larissa.wicker@technikum-wien.at">larissa.wicker@technikum-wien.at</a><br />R. B2.07</td></tr></tbody></table><br /><br /><table class="tablesorter tablesorter_col_0 tablesorter_sort_0" id="t1" style="width: 100%;" border="0" align="left"><thead><tr><th><b>Teaching support<br /></b><b><span><a href="mailto:teachingsupport@technikum-wien.at" title="mailto:teachingsupport@technikum-wien.at">teachingsupport@technikum-wien.at</a></span></b><span>&nbsp;</span></th><th>Arbeitsbereich</th><th>Kontakt</th></tr></thead><tbody><tr><td style="width: 180px;"><span>Kert&eacute;sz, D&oacute;ra</span></td><td style="width: 320px;">Medien- und hochschuldidaktische Beratung Ansprechpartnerin:&nbsp;Internes Weiterbildungsangebot f&uuml;r Lehrende&nbsp;(Didaktik).</td><td>T. +43 1 333 40 77 - <span>6715</span><br />M. <a class="Item" href="mailto:dora.kertesz@technikum-wien.at">dora.kertesz@technikum-wien.at</a><a href="mailto:ingrid.preusche@technikum-wien.at"></a><br />R. A0.05</td></tr><tr><td style="width: 180px;">Lanickova, Katerina<br /><em>In Karenz</em></td><td style="width: 320px;">Medien- und hochschuldidaktische Beratung Ansprechpartnerin:&nbsp;Beratungsangebot f&uuml;r Lehrende&nbsp;(Didaktik).</td><td>T. 43 1 333 40 77 - 5406<br />M. <a href="mailto:katerina.lanickova@technikum-wien.at">katerina.lanickova@technikum-wien.at</a><br />R. A0.05</td></tr><tr><td style="width: 180px;">L&uuml;nenborg, Yasmin Ruth<br /><em>In Karenz</em></td><td style="width: 320px;">Medien- und hochschuldidaktische Beratung Ansprechpartnerin:&nbsp;LV-Entwicklung&nbsp;(kollegiale Reflexionsgespr&auml;che).</td><td>T. +43 1 3334077 - 8394<br />M.&nbsp;<a class="Item" href="mailto:yasmin_ruth.luenenborg@technikum-wien.at">yasmin_ruth.luenenborg@technikum-wien.at</a><br />R. A0.05</td></tr><tr><td style="width: 180px;"><span>Schnabel,&nbsp;<span>Lukas</span></span></td><td style="width: 320px;">Medien- und hochschuldidaktische Beratung Ansprechpartnerin:&nbsp;LV-Entwicklung&nbsp;(kollegiale Reflexionsgespr&auml;che).</td><td>T. <span>+43 664 820 54 76</span><br />M.&nbsp;<a href="mailto:lukas.schnabel@technikum-wien.at">lukas.schnabel@technikum-wien.at</a><a class="Item" href="mailto:lukas.schnabel@technikum-wien.at"></a><br />R. A0.05</td></tr><tr><td style="width: 180px;"><span>Grabher, Linus</span></td><td style="width: 320px;"><span>Teaching Support,&nbsp;Pre-Student-Support.</span></td><td>M. <a href="mailto:linus.grabher@technikum-wien.at">linus.grabher@technikum-wien.at<br /></a>R. A0.05</td></tr></tbody></table><br /><br /><table class="tablesorter tablesorter_col_0 tablesorter_sort_0" id="t1" style="width: 100%;" border="0" align="left"><thead><tr><th>eLearning Tools | Moodle<br /><b><a href="mailto:moodle@technikum-wien.at">moodle@technikum-wien.at</a></b></th><th>Arbeitsbereich</th><th>Kontakt</th></tr></thead><tbody><tr><td style="width: 180px;">Perkovic, Patrick</td><td style="width: 320px;">Lehrenden- und Studierenden-Support eLearning Tools | Moodle.</td><td>T.&nbsp;+43 1 333 40 77 - 2209<br />M.&nbsp;<a href="mailto:patrick.perkovic@technikum-wien.at">patrick.perkovic@technikum-wien.at</a><br />R<a class="Item" href="mailto:patrick.perkovic@technikum-wien.at"></a>. A0.05</td></tr><tr><td style="width: 180px;">Kovacevic, Selma</td><td style="width: 320px;">Lehrenden- und Studierenden-Support eLearning Tools | Moodle.</td><td>T. +43 1 333 40 77 - 7236<br />M. <a href="mailto:selma.kovacevic@technikum-wien.at">selma.kovacevic@technikum-wien.at</a><br />R. A0.05</td></tr><tr><td style="width: 180px;"><span>Bogosavljevic,&nbsp;<span>Nikola</span></span></td><td style="width: 320px;"><span>Leitung.<br /><br /></span>Lehrenden- und Studierenden-Support eLearning Tools | Moodle.</td><td>T.&nbsp;+43 1 333 40 77 - 3443<br />M.&nbsp;<a class="Item" href="mailto:nikola.bogosavljevic@technikum-wien.at">nikola.bogosavljevic@technikum-wien.at</a><br />R. A0.05</td></tr></tbody></table><br /><br /><table class="tablesorter tablesorter_col_0 tablesorter_sort_0" id="t1" style="width: 100%;" border="0" align="left"><thead><tr><th><b>Bibliothek<br /></b><b><a href="mailto:bibliothek@technikum-wien.at">bibliothek@technikum-wien.at</a></b>&nbsp;</th><th>Arbeitsbereich</th><th>Kontakt</th></tr></thead><tbody><tr><td style="width: 180px;"><span>Astf&auml;ller, Alexia</span></td><td style="width: 320px;"><p class="op-uc-p"><span>Bestellung Print- und e-Medien, Info-Theke, Medien-Erschlie&szlig;ung, Publikationsdatenbank, Projekte.</span></p></td><td>T: +43 1 333 40 77-5428<br />E:<span>&nbsp;</span><span><a href="mailto:alexia.astfaeller@technikum-wien.at">alexia.astfaeller@technikum-wien.at<br /></a></span>R: A4.09</td></tr><tr><td style="width: 180px;"><span>Baier, Margit</span></td><td style="width: 320px;"><p>Leitung.</p><p>e-Ressourcen-Pakete, Open Access, Projekte, Planung und Koordination.</p></td><td>T: +43 1 333 40 77-3390<br />E:&nbsp;<span><a href="mailto:margit.baier@technikum-wien.at">margit.baier@technikum-wien.at</a><br /></span>R: A4.09</td></tr><tr><td style="width: 180px;"><span>Metz, Sonja<br /><br /></span></td><td style="width: 320px;"><p>Bestellung Print- und e-Medien, Info-Theke, Medien-Erschlie&szlig;ung, Hochschulschriften-Datenbank.</p></td><td>T: <span>+43 1 333 40 77 - 4365</span><br />E:&nbsp;<a class="Item" href="mailto:sonja.metz@technikum-wien.at">sonja.metz@technikum-wien.at</a><a href="mailto:alexia.astfaeller@technikum-wien.at"><br /></a>R: A4.09</td></tr><tr><td style="width: 180px;"><span>Deimbacher-Sand, Maya</span></td><td style="width: 320px;">Bestellung Print- und e-Medien, Info-Theke, Medien-Erschlie&szlig;ung / Field of work: Ordering Print and e-Media, Information Desk, Media Indexing.<p></p></td><td>T: +43 1 333 40 77-4088 <br />E: <a href="mailto:maya.deimbacher-sand@technikum-wien.at">maya.deimbacher-sand@technikum-wien.at</a> <br />R: A4.09</td></tr></tbody></table></td></tr></tbody></table><p></p><h2 style="text-align: left;"><strong>Erreichbarkeit Bibliothek:&nbsp;</strong></h2><p style="text-align: left;"><span style="font-size: small;">E:&nbsp;<a href="mailto:bibliothek@technikum-wien.at">bibliothek@technikum-wien.at</a>&nbsp; &nbsp;<span style="white-space: pre;"> </span></span></p><p style="text-align: left;"><span style="font-size: small;">R: A4.09</span></p><h2 style="text-align: left;">&Ouml;ffnungszeiten:</h2><table rules="rows" cellspacing="0" cellpadding="2" border="0" align="center" style="float: left;"><tbody><tr><td><span style="font-size: small;">Montag:</span></td><td><span style="font-size: small;">13:00 Uhr - 18:00 Uhr</span></td></tr><tr><td><span style="font-size: small;">Dienstag:</span></td><td><span style="font-size: small;">10:00 Uhr - 19:00 Uhr</span></td></tr><tr><td><span style="font-size: small;">Mittwoch:</span></td><td><span style="font-size: small;">10:00 Uhr - 18:00 Uhr</span></td></tr><tr><td><span style="font-size: small;">Donnerstag:</span></td><td><span style="font-size: small;">10:00 Uhr - 18:00 Uhr</span></td></tr><tr><td><span style="font-size: small;">Freitag:</span></td><td><span style="font-size: small;">13:00 Uhr - 18:00 Uhr</span></td></tr></tbody></table><br /><br /><br /><br /><br /><br /><br /><br /><span style="font-size: small;"><br />Mehr Informationen zur Bibliothek unter:&nbsp;<a href="content.php?content_id=6794">https://cis.technikum-wien.at/cms/content.php?content_id=6794</a> und im Moodle-Kurs&nbsp;<a href="https://moodle.technikum-wien.at/course/view.php?id=20218">https://moodle.technikum-wien.at/course/view.php?id=20218</a></span><br /><div><span style="box-sizing: border-box; font-weight: bolder;"><br /></span></div><div><span style="box-sizing: border-box; font-weight: bolder;"><br /></span></div>]]></inhalt></content>';
 
 if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibung='CIS4_ROOT'")) {
@@ -16,7 +18,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 			$qry =
 				"
 
-				-- ##################################### CONTENT
+				-- ~##################################### CONTENT
 
 				-- CIS4_ROOT
 
@@ -135,7 +137,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					'redirect','etw',NOW(),null,null,null,TRUE,FALSE,'BESTÄTIGUNGEN_ZEUGNISSE'
 				);
 
-				-- ##################################### CONTENTSPRACHE
+				-- ~##################################### CONTENTSPRACHE
 
 				-- CIS4_ROOT
 
@@ -318,7 +320,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					null,null,null,null,NOW(),null,'Bestätigungen / Zeugnisse',null
 				);
 
-				-- ##################################### CONTENTCHILD
+				-- ~##################################### CONTENTCHILD
 
 				###### CIS4_ROOT childs
 
@@ -366,6 +368,16 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					NOW(), null, null, null, 4
 				);
 
+				INSERT INTO campus.tbl_contentchild
+				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
+				VALUES
+				(
+					-- queries the content_id for the CIS4_ROOT
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'CIS4_ROOT'),
+					-- 6791 is the content_id for Bibliothek
+					6791, NOW(), null, null, null, 5
+				);
+
 				INSERT INTO campus.tbl_contentchild
 				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
 				VALUES
@@ -374,7 +386,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'CIS4_ROOT'),
 					-- queries the content_id for the DOKUMENTE
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'DOKUMENTE'),
-					NOW(), null, null, null, 5
+					NOW(), null, null, null, 6
 				);
 
 				INSERT INTO campus.tbl_contentchild
@@ -385,7 +397,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'CIS4_ROOT'),
 					-- queries the content_id for the TLC
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'TLC'),
-					NOW(), null, null, null, 6
+					NOW(), null, null, null, 7
 				);
 
 				INSERT INTO campus.tbl_contentchild
@@ -395,7 +407,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					-- queries the content_id for the CIS4_ROOT
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'CIS4_ROOT'),
 					-- 10487 is the content_id for Modul International Skills
-					10487, NOW(), null, null, null, 7
+					10487, NOW(), null, null, null, 8
 				);
 
 				INSERT INTO campus.tbl_contentchild
@@ -405,7 +417,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					-- queries the content_id for the CIS4_ROOT
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'CIS4_ROOT'),
 					-- 10568 is the content_id for Zahlungen
-					10568, NOW(), null, null, null, 8
+					10568, NOW(), null, null, null, 9
 				);
 
 				###### Mein Studium childs

From c5b81c22f95215848757af6c6936f32015091d08 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 30 Oct 2024 11:31:39 +0100
Subject: [PATCH 1347/1461] adds the target for the lv menu in the studenplan
 modal and also replaces the tablesorter tables with tabulator5 in other
 content views

---
 application/views/CisVue/Cms/Content.php      |  9 ++----
 public/js/components/Cis/Cms/Content.js       |  5 +---
 .../Cis/Cms/Content_types/General.js          | 16 +++++++++++
 .../Cms/Content_types/Raum_contentmittitel.js | 28 +++++++++----------
 public/js/components/Cis/Mylv/LvMenu.js       |  2 +-
 5 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/application/views/CisVue/Cms/Content.php b/application/views/CisVue/Cms/Content.php
index 2a623568d..f957bb7f9 100644
--- a/application/views/CisVue/Cms/Content.php
+++ b/application/views/CisVue/Cms/Content.php
@@ -8,13 +8,8 @@ $includesArray = array(
 	]
 );
 
-if(isset($template_kurzbz)){
-	switch($template_kurzbz){
-		case 'raum_contentmittitel': 
-			$includesArray['tabulator5'] = true; 
-			break;
-	}
-}
+// adds the tabulator5 dependency for all templates to replace the tablesorter
+$includesArray['tabulator5'] = true; 
 
 if(defined('CIS4')){
 	$this->load->view('templates/CISVUE-Header', $includesArray);
diff --git a/public/js/components/Cis/Cms/Content.js b/public/js/components/Cis/Cms/Content.js
index 53689f162..914b35106 100644
--- a/public/js/components/Cis/Cms/Content.js
+++ b/public/js/components/Cis/Cms/Content.js
@@ -30,13 +30,11 @@ export default {
   data() {
     return {
       content: null,
-      
     };
   },
   computed:{
     computeContentType: function(){
       switch(this.content_type){
-        
         case "raum_contentmittitel":
           return "raum_contentmittitel";
         default:
@@ -51,12 +49,11 @@ export default {
     });
   },
   mounted(){
-    
+	
   },
   template: /*html*/ `
     <!-- div that contains the content -->
     <component :is="computeContentType" v-if="content" :content="content" />
     <p v-else>No content is available to display</p>
-
     `,
 };
diff --git a/public/js/components/Cis/Cms/Content_types/General.js b/public/js/components/Cis/Cms/Content_types/General.js
index 4071d356a..985e9c556 100644
--- a/public/js/components/Cis/Cms/Content_types/General.js
+++ b/public/js/components/Cis/Cms/Content_types/General.js
@@ -7,6 +7,22 @@ export default {
       },
     },
     mounted(){
+
+		// replaces the tablesorter with the tabulator
+		let tables = document.getElementsByClassName("tablesorter");
+
+		for (let table of tables) {
+			new Tabulator(table, {
+				layout: "fitDataStretch",
+
+				columnDefaults: {
+					formatter: "html",
+					resizable: false,
+					minWidth: "100px",
+				}
+			})
+		}
+
         document.querySelectorAll("#cms [data-confirm]").forEach((el) => {
             el.addEventListener("click", (evt) => {
               evt.preventDefault();
diff --git a/public/js/components/Cis/Cms/Content_types/Raum_contentmittitel.js b/public/js/components/Cis/Cms/Content_types/Raum_contentmittitel.js
index 934b921c0..948fca79f 100644
--- a/public/js/components/Cis/Cms/Content_types/Raum_contentmittitel.js
+++ b/public/js/components/Cis/Cms/Content_types/Raum_contentmittitel.js
@@ -7,22 +7,20 @@ export default {
       },
     },
     mounted(){
-        let tables = document.getElementsByClassName("tablesorter");
-        
-        for(let table of tables){
-            new Tabulator(table, {
-                layout:"fitDataStretch",
-               
-                columnDefaults:{
-                    formatter:"html",
-                    resizable:false,
-                    minWidth: "100px",
-                }
-            })
+		// replaces the tablesorter with the tabulator
+		let tables = document.getElementsByClassName("tablesorter");
 
-            table.classList.add("mx-auto");
-            table.style.width="30em"; 
-        }
+		for (let table of tables) {
+			new Tabulator(table, {
+				layout: "fitDataStretch",
+
+				columnDefaults: {
+					formatter: "html",
+					resizable: false,
+					minWidth: "100px",
+				}
+			})
+		}
     },
     template: /*html*/ `
       <!-- div that contains the content -->
diff --git a/public/js/components/Cis/Mylv/LvMenu.js b/public/js/components/Cis/Mylv/LvMenu.js
index 868aa6c9e..d5e091f31 100644
--- a/public/js/components/Cis/Mylv/LvMenu.js
+++ b/public/js/components/Cis/Mylv/LvMenu.js
@@ -37,7 +37,7 @@ export default {
 	<div v-else class="container">
 		<div class="row g-2">
 			<div style="min-height:150px" class="col-12 col-lg-6 col-xl-4" v-for="(menuItem, index) in menu" :key="index">
-				<a :title="menuItem.name" role="button" :href="menuItem.c4_link" class="border border-1 d-flex flex-column align-items-center justify-content-center text-center text-decoration-none link-dark h-100">
+				<a :title="menuItem.name" :target="menuItem.c4_target ?? null" role="button" :href="menuItem.c4_link" class="border border-1 d-flex flex-column align-items-center justify-content-center text-center text-decoration-none link-dark h-100">
 					<img :src="menuItem.c4_icon" :alt="menuItem.name" ></img>
 					<span @click="selectMenu(menuItem)" class=" mt-2">{{menuItem.name}}</span>
 					<span v-for="([text,link],index) in menuItem.c4_linkList" @click.stop="selectMenu(menuItem,index)"   class="mt-1" :index="index">{{text}}</span>

From f820a0148ae5455ded72a150c0f0899a88376c83 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 31 Oct 2024 14:22:46 +0100
Subject: [PATCH 1348/1461] adapts the LV view to incorporate a dropdown if a
 lehrveranstaltung has multiple moodle links

---
 public/css/components/MyLv.css                           | 4 ++++
 public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/public/css/components/MyLv.css b/public/css/components/MyLv.css
index a3a3dd23f..eea5a5eea 100644
--- a/public/css/components/MyLv.css
+++ b/public/css/components/MyLv.css
@@ -1,4 +1,8 @@
 .unavailable, .unavailable:hover{
 	color: #565e647f !important;
 	cursor: default;
+}
+
+.mylv_dropdown{
+	margin-left: -5px !important;
 }
\ No newline at end of file
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
index fca5b045a..4c17b1a1f 100644
--- a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
@@ -128,9 +128,12 @@ export default {
 							<div class="mx-4">
 								<i :class="[menuItem.c4_icon2 ? menuItem.c4_icon2 : 'fa-solid fa-pen-to-square', !menuItem.c4_link ? 'unavailable' : null ]"></i>
 							</div>
-							<a class="text-decoration-none text-truncate" :class="{'link-dark':menuItem.c4_link, 'unavailable':!menuItem.c4_link}" :target="menuItem.c4_target" :href="menuItem.c4_link ? menuItem.c4_link : null">
+							<a class="text-decoration-none text-truncate" :id="'moodle_links_'+lehrveranstaltung_id" :data-bs-toggle="menuItem.c4_moodle_links?.length ? 'dropdown' : null" :class="{'link-dark':menuItem.c4_link, 'unavailable':!menuItem.c4_link, 'dropdown-toggle':menuItem.c4_moodle_links?.length }" :target="menuItem.c4_target" :href="menuItem.c4_link ? !menuItem.c4_moodle_links?.length && menuItem.c4_link : null">
 							{{menuItem.name}}
 							</a>
+							<ul v-if="menuItem.c4_moodle_links?.length" class="dropdown-menu p-0 mylv_dropdown" :aria-labelledby="'moodle_links_'+lehrveranstaltung_id">
+								<li v-for="item in menuItem.c4_moodle_links"><a class="dropdown-item border-bottom" :href="item.url">{{item.lehrform_kurzbz}}</a></li>
+							</ul>
 						</div>
 					</li>
 				</template>

From ad068ffe5ff9cd802392150033cc56bb83514400 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 4 Nov 2024 09:07:35 +0100
Subject: [PATCH 1349/1461] different property name for the different moodle
 courses names

---
 public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
index 4c17b1a1f..ddbc259ea 100644
--- a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
@@ -132,7 +132,7 @@ export default {
 							{{menuItem.name}}
 							</a>
 							<ul v-if="menuItem.c4_moodle_links?.length" class="dropdown-menu p-0 mylv_dropdown" :aria-labelledby="'moodle_links_'+lehrveranstaltung_id">
-								<li v-for="item in menuItem.c4_moodle_links"><a class="dropdown-item border-bottom" :href="item.url">{{item.lehrform_kurzbz}}</a></li>
+								<li v-for="item in menuItem.c4_moodle_links"><a class="dropdown-item border-bottom" :href="item.url">{{item.lehrform}}</a></li>
 							</ul>
 						</div>
 					</li>

From 9e45394deb554c8216cf5c159af885bcf1637709 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 4 Nov 2024 12:09:12 +0100
Subject: [PATCH 1350/1461] fix(Cis MyLv): uses the moodle course bezeichnung
 for multiple moodle links

---
 public/css/components/MyLv.css                         |  4 ----
 .../js/components/Cis/Mylv/Semester/Studiengang/Lv.js  | 10 +++++-----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/public/css/components/MyLv.css b/public/css/components/MyLv.css
index eea5a5eea..2ce544582 100644
--- a/public/css/components/MyLv.css
+++ b/public/css/components/MyLv.css
@@ -2,7 +2,3 @@
 	color: #565e647f !important;
 	cursor: default;
 }
-
-.mylv_dropdown{
-	margin-left: -5px !important;
-}
\ No newline at end of file
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
index ddbc259ea..cf8b3fed6 100644
--- a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
@@ -123,18 +123,18 @@ export default {
 		<div class="card-body " :style="bodyStyle">
 			<ul class="list-group border-top-0 border-bottom-0 rounded-0">
 				<template v-if="menu">
-					<li :type="menuItem.c4_link ? 'button' : null" v-for="menuItem in menu" class="list-group-item border-0 ">
-						<div class="d-flex flex-row" >
+					<li :type="menuItem.c4_link ? 'button' : null" v-for="menuItem in menu" class="list-group-item border-0 " >
+						<div class="d-flex flex-row"  :data-bs-toggle="menuItem.c4_moodle_links?.length ? 'dropdown' : null">
 							<div class="mx-4">
 								<i :class="[menuItem.c4_icon2 ? menuItem.c4_icon2 : 'fa-solid fa-pen-to-square', !menuItem.c4_link ? 'unavailable' : null ]"></i>
 							</div>
-							<a class="text-decoration-none text-truncate" :id="'moodle_links_'+lehrveranstaltung_id" :data-bs-toggle="menuItem.c4_moodle_links?.length ? 'dropdown' : null" :class="{'link-dark':menuItem.c4_link, 'unavailable':!menuItem.c4_link, 'dropdown-toggle':menuItem.c4_moodle_links?.length }" :target="menuItem.c4_target" :href="menuItem.c4_link ? !menuItem.c4_moodle_links?.length && menuItem.c4_link : null">
+							<a class="text-decoration-none text-truncate" :id="'moodle_links_'+lehrveranstaltung_id"  :class="{'link-dark':menuItem.c4_link, 'unavailable':!menuItem.c4_link, 'dropdown-toggle':menuItem.c4_moodle_links?.length }" :target="menuItem.c4_target" :href="menuItem.c4_link ? !menuItem.c4_moodle_links?.length && menuItem.c4_link : null">
 							{{menuItem.name}}
 							</a>
-							<ul v-if="menuItem.c4_moodle_links?.length" class="dropdown-menu p-0 mylv_dropdown" :aria-labelledby="'moodle_links_'+lehrveranstaltung_id">
+							</div>
+							<ul v-if="menuItem.c4_moodle_links?.length" class="dropdown-menu p-0" :aria-labelledby="'moodle_links_'+lehrveranstaltung_id">
 								<li v-for="item in menuItem.c4_moodle_links"><a class="dropdown-item border-bottom" :href="item.url">{{item.lehrform}}</a></li>
 							</ul>
-						</div>
 					</li>
 				</template>
 				<template v-else>

From 86ee48888a89fdb7072053bba933672dc52cc938 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 4 Nov 2024 12:04:14 +0100
Subject: [PATCH 1351/1461] fix(Cis Menu): adds Zahlungen to Mein Studium

---
 system/dbupdate_3.4/25999_C4_Menu.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/system/dbupdate_3.4/25999_C4_Menu.php b/system/dbupdate_3.4/25999_C4_Menu.php
index 990f6828c..caa337aea 100644
--- a/system/dbupdate_3.4/25999_C4_Menu.php
+++ b/system/dbupdate_3.4/25999_C4_Menu.php
@@ -410,16 +410,6 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					10487, NOW(), null, null, null, 8
 				);
 
-				INSERT INTO campus.tbl_contentchild
-				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
-				VALUES
-				(
-					-- queries the content_id for the CIS4_ROOT
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'CIS4_ROOT'),
-					-- 10568 is the content_id for Zahlungen
-					10568, NOW(), null, null, null, 9
-				);
-
 				###### Mein Studium childs
 
 				INSERT INTO campus.tbl_contentchild
@@ -465,6 +455,16 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'BESTÄTIGUNGEN_ZEUGNISSE'),
 					NOW(), null, null, null, 4
 				);
+
+				INSERT INTO campus.tbl_contentchild
+				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
+				VALUES
+				(
+					-- queries the content_id for the MEIN_STUDIUM
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'MEIN_STUDIUM'),
+					-- 10568 is the content_id for Zahlungen
+					10568, NOW(), null, null, null, 5
+				);
 				
 				INSERT INTO campus.tbl_contentchild
 				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
@@ -473,7 +473,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					-- queries the content_id for the MEIN_STUDIUM
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'MEIN_STUDIUM'),
 					-- 10795 is the content_id for Studierendenstatus
-					10795, NOW(), null, null, null, 5
+					10795, NOW(), null, null, null, 6
 				);
 
 				###### VPN_STUDIERENDE childs

From eafbdcfffe577e4505f04b2f82e5321bd2ea03b8 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 4 Nov 2024 13:39:13 +0100
Subject: [PATCH 1352/1461] refactor(Cis Menu): changes method name and checks
 if the CIS4_MENU_ENTRY constant is defined

---
 application/controllers/components/CisVue.php |  3 ++-
 application/models/content/Content_model.php  | 12 +++++++++++-
 application/views/templates/CISVUE-Header.php |  2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/application/controllers/components/CisVue.php b/application/controllers/components/CisVue.php
index 537537f08..b5433ebfe 100644
--- a/application/controllers/components/CisVue.php
+++ b/application/controllers/components/CisVue.php
@@ -31,7 +31,8 @@ class CisVue extends FHC_Controller
 	public function Menu()
 	{
 		$this->load->model('content/Content_model', 'ContentModel');
-		$result = $this->ContentModel->getMenu(defined('CIS4_MENU_ENTRY') ? CIS4_MENU_ENTRY : null, get_uid());
+		$menu_contentID = $this->ContentModel->getMenuContentID();
+		$result = $this->ContentModel->getMenu($menu_contentID, get_uid());
 		$menu = getData($result) ?? (object)['childs' => []];
 
 		$this->outputJsonSuccess($menu);
diff --git a/application/models/content/Content_model.php b/application/models/content/Content_model.php
index 9f0a3634e..278022b59 100644
--- a/application/models/content/Content_model.php
+++ b/application/models/content/Content_model.php
@@ -71,13 +71,23 @@ class Content_model extends DB_Model
 	 *
 	 * @return integer|null			content_id of the Cis4_Root Menu
 	 */
-	public function getCIS4_ContentID(){
+	public function getMenuContentID(){
+		// early return if the CIS4_MENU_ENTRY constant is defined  
+		if(defined('CIS4_MENU_ENTRY'))
+		{
+			return CIS4_MENU_ENTRY;
+		}
+		
+		// load the CIS4 Menu content_id from the database using the column 'beschreibugn' of the campus.tbl_content table
 		$CIS4_ROOT_CONTENT = $this->loadWhere(["beschreibung"=>"CIS4_ROOT"]);
+		
 		if(isError($CIS4_ROOT_CONTENT))
 		{
 			return null;
 		}
+
 		$CIS4_ROOT_CONTENT = getData($CIS4_ROOT_CONTENT);
+		
 		if(count($CIS4_ROOT_CONTENT) > 0)
 		{
 			return current($CIS4_ROOT_CONTENT)->content_id ?? null;
diff --git a/application/views/templates/CISVUE-Header.php b/application/views/templates/CISVUE-Header.php
index 6ee344391..70f9a173f 100644
--- a/application/views/templates/CISVUE-Header.php
+++ b/application/views/templates/CISVUE-Header.php
@@ -19,7 +19,7 @@ $this->load->view('templates/FHC-Header', $includesArray);
 if (!isset($menu)) {
 	$ci =& get_instance(); // get CI instance
 	$ci->load->model('content/Content_model', 'ContentModel');
-	$cis4_content_id = $ci->ContentModel->getCIS4_ContentID();
+	$cis4_content_id = $ci->ContentModel->getMenuContentID();
 	$result = $ci->ContentModel->getMenu($cis4_content_id, get_uid());
 	$menu = getData($result)->childs ?? [];
 }

From 50a67a8e889ce15d988ddf2bc33e812c5039e744 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 4 Nov 2024 14:37:09 +0100
Subject: [PATCH 1353/1461] feature(Dashboard Bookmark): checks whether the
 link is a valid URL, displays fhcAlert otherwise

---
 public/js/components/DashboardWidget/Url.js | 15 ++++++++++++++-
 system/phrasesupdate.php                    | 20 ++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index b87ef4235..8dabf7b4c 100644
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -5,6 +5,7 @@ export default {
   data: () => ({
     title_input: "",
     url_input: "",
+	invalidURL: false,
   }),
   mixins: [AbstractWidget],
   computed: {
@@ -35,6 +36,15 @@ export default {
       if ((await this.$fhcAlert.confirmDelete()) === false) return;
     },
     addLink() {
+	  // reset is-invalid css on url input field
+	  this.invalidURL = false;
+
+	  if(!URL.canParse(this.url_input)) 
+	  {
+		this.$fhcAlert.alertError(this.$p.t("bookmark", "invalidUrl"));
+		this.invalidURL = true;
+		return;
+	  }
       this.$fhcApi.factory.bookmark
         .insert({
           tag: this.config.tag,
@@ -83,7 +93,10 @@ export default {
                 <header><b>{{$p.t('bookmark','newLink')}}</b></header><br>
                 <div>
                     <input class="form-control form-control-sm" placeholder="Titel" type="text" v-model="title_input" name="title" maxlength="50" required>
-                    <input class="form-control form-control-sm mt-2" type="url" placeholder="URL" v-model="url_input" name="url" required>
+					<input required id="bookmark_link" class="form-control form-control-sm mt-2" :class="{'is-invalid':invalidURL}" type="url" placeholder="URL" v-model="url_input" name="url">
+				    <div class="invalid-feedback">
+					{{$p.t("bookmark", "invalidUrl")}}.
+					</div>
                     <button class="btn btn-outline-secondary btn-sm w-100 mt-2" @click="addLink" type="button">{{$p.t('bookmark','saveLink')}}</button>
                 </div>
             </div>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index e5275d513..22f7491df 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -31484,6 +31484,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'bookmark',
+		'phrase' => 'invalidUrl',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ungültiger Link',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Invalid link',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'global',

From c31cef349c8d3d76b4ddfe66f72d32ccfcbf5baf Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 4 Nov 2024 15:35:35 +0100
Subject: [PATCH 1354/1461] add phrases from legacy code for news extra aside
 content

---
 system/phrasesupdate.php | 122 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 122 insertions(+)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 2cad827f9..8ddc16bfa 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -36695,7 +36695,129 @@ array(
 				'insertvon' => 'system'
 			)
 		)
+	),
+// CIS4 phrases from legacy code begin
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'studiengangsleitung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Studiengangsleitung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Program Director',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'stellvertreter',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Stellvertretung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Deputy Program Director',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'sekretariat',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Sekretariat',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Administrative Assistant',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'hochschulvertretung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Hochschulvertretung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'UAS Representative',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'studentenvertreter',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Studienvertretung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Degree Program Representative',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'allgemeinerdownload',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Allgemeiner Download',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Global Download',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
 	)
+// CIS4 phrases from legacy code end
 );
 
 

From 20715d6ef55dbbc2c14e74b3ff76606a4ad20bd4 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 4 Nov 2024 15:36:46 +0100
Subject: [PATCH 1355/1461] add permission basis/cis

---
 system/dbupdate_3.4.php                     |  1 +
 system/dbupdate_3.4/25999_C4_permission.php | 42 +++++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 system/dbupdate_3.4/25999_C4_permission.php

diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index b0e6d64fa..aab8d1134 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -66,6 +66,7 @@ require_once('dbupdate_3.4/44031_stv_favorites.php');
 require_once('dbupdate_3.4/40896_kennzeichnung_unruly_person.php');
 require_once('dbupdate_3.4/39911_tabulator_in_contentmittitel.php');
 require_once('dbupdate_3.4/25999_C4_Menu.php');
+require_once('dbupdate_3.4/25999_C4_permission.php');
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
diff --git a/system/dbupdate_3.4/25999_C4_permission.php b/system/dbupdate_3.4/25999_C4_permission.php
new file mode 100644
index 000000000..7da1a18cc
--- /dev/null
+++ b/system/dbupdate_3.4/25999_C4_permission.php
@@ -0,0 +1,42 @@
+<?php
+/* Copyright (C) 2017 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 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors: Harald Bamberger <harald.bamberger@technikum-wien.at>,
+ *
+ * Beschreibung:
+ * Dashboard DB Aenderungen
+ */
+if (! defined('DB_NAME')) exit('No direct script access allowed');
+
+// Add permission: basis/cis
+if($result = @$db->db_query("SELECT 1 FROM system.tbl_berechtigung WHERE berechtigung_kurzbz = 'basis/cis';"))
+{
+    if($db->db_num_rows($result) == 0)
+    {
+        $qry = "INSERT INTO system.tbl_berechtigung(berechtigung_kurzbz, beschreibung) VALUES('basis/cis', 'CIS Grundrecht ab CIS 4.0');";
+
+        if(!$db->db_query($qry))
+        {
+            echo '<strong>system.tbl_berechtigung '.$db->db_last_error().'</strong><br>';
+        }
+        else
+        {
+            echo 'system.tbl_berechtigung: Added permission "basis/cis"<br>';
+        }
+    }
+}
+

From a65e94bc8a491b0ffee5602a866ff51ecb853211 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 4 Nov 2024 15:38:04 +0100
Subject: [PATCH 1356/1461] fix phrases variable name because of switch from
 mixin to plugin

---
 public/js/apps/Cis/Documents.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/public/js/apps/Cis/Documents.js b/public/js/apps/Cis/Documents.js
index c54c67232..da84d0640 100644
--- a/public/js/apps/Cis/Documents.js
+++ b/public/js/apps/Cis/Documents.js
@@ -33,11 +33,11 @@ const app = Vue.createApp({
 		inscriptiontableEmpty() {
 			// NOTE(chris): empty result on filter
 			if (this.inscriptiontableFilters.Stsem)
-				return this.p.t('tools', 'studienbeitragFuerSSNochNichtBezahlt', {stsem: this.inscriptiontableFilters.Stsem});
+				return this.$p.t('tools', 'studienbeitragFuerSSNochNichtBezahlt', {stsem: this.inscriptiontableFilters.Stsem});
 			if (this.inscriptiontableFilters.Stg)
-				return this.p.t('tools', 'studienbeitragFuerStgNochNichtBezahlt', {stsem: this.inscriptiontableFilters.Stg});
+				return this.$p.t('tools', 'studienbeitragFuerStgNochNichtBezahlt', {stsem: this.inscriptiontableFilters.Stg});
 			
-			return this.p.t('tools', 'studienbeitragNochNichtBezahlt');
+			return this.$p.t('tools', 'studienbeitragNochNichtBezahlt');
 		},
 		studienerfolgsbestaetigungtableFilter() {
 			const filter = [];
@@ -62,14 +62,14 @@ const app = Vue.createApp({
 	mounted() {
 		this.inscriptiontable = new Tabulator(this.$refs.inscriptiontable, {
 			layout: 'fitDataStretch',
-			placeholder: this.p.t('tools', 'studienbeitragNochNichtBezahlt')
+			placeholder: this.$p.t('tools', 'studienbeitragNochNichtBezahlt')
 		});
 		this.studienerfolgsbestaetigungtable = new Tabulator(this.$refs.studienerfolgsbestaetigungtable, {
 			layout: 'fitDataStretch'
 		});
 		this.abschlussdokumentetable = new Tabulator(this.$refs.abschlussdokumentetable, {
 			layout: 'fitDataStretch',
-			placeholder: this.p.t('tools', 'nochKeineAbschlussdokumenteVorhanden')
+			placeholder: this.$p.t('tools', 'nochKeineAbschlussdokumenteVorhanden')
 		});
 
 		// NOTE(chris): empty result on filter
@@ -93,4 +93,4 @@ const app = Vue.createApp({
 	}
 });
 app.use(Phrasen, {reload: true});
-app.mount('#content');
\ No newline at end of file
+app.mount('#content');

From 50880c696bdd56d3b4f4760e70c0056fe2ee9c64 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 4 Nov 2024 15:41:02 +0100
Subject: [PATCH 1357/1461] use getAuthUID function instead of get_uid, use new
 permission basis/cis and switch to Auth_Controller where possible

---
 application/controllers/Cis/Documents.php     |  4 ++--
 application/controllers/Cis/MyLv.php          |  4 ++--
 application/controllers/Cis/Profil.php        | 20 +++++++++----------
 application/controllers/Cis/ProfilUpdate.php  | 18 ++++++++---------
 application/controllers/Cis/Pub.php           | 12 +++++------
 application/controllers/Cis/Stundenplan.php   |  2 +-
 application/controllers/Cis4.php              | 12 +++++------
 application/controllers/CisHmvc.php           | 12 ++++++-----
 application/controllers/CisHmvc/Dashboard.php |  2 +-
 application/controllers/CisHtml/Cms.php       | 11 ++++++----
 application/controllers/CisHtml/Dashboard.php |  2 +-
 application/controllers/CisVue/Cms.php        | 14 +++++++++----
 application/controllers/CisVue/Dashboard.php  |  2 +-
 .../controllers/api/frontend/v1/Cms.php       |  2 ++
 .../controllers/api/frontend/v1/LvMenu.php    |  2 +-
 .../controllers/components/Cis/Mylv.php       |  8 ++++----
 .../components/Cis/Stundenplan.php            | 12 +++++------
 application/controllers/components/CisVue.php | 15 +++++---------
 .../controllers/dashboard/DashboardDemo.php   |  2 +-
 .../views/templates/CISHTML-Header.php        |  2 +-
 application/views/templates/CISVUE-Header.php |  2 +-
 21 files changed, 84 insertions(+), 76 deletions(-)

diff --git a/application/controllers/Cis/Documents.php b/application/controllers/Cis/Documents.php
index 31f441634..6e007c1f9 100644
--- a/application/controllers/Cis/Documents.php
+++ b/application/controllers/Cis/Documents.php
@@ -15,9 +15,9 @@ class Documents extends Auth_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'index' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
+			'index' => [self::PERM_LOGGED],
 			'student' => ['admin:r'],
-			'download' => ['student/anrechnung_beantragen:r','user:r'] // TODO(chris): permissions?
+			'download' => [self::PERM_LOGGED]
 		]);
 
 		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
diff --git a/application/controllers/Cis/MyLv.php b/application/controllers/Cis/MyLv.php
index 9514d5b6b..08bf843b5 100644
--- a/application/controllers/Cis/MyLv.php
+++ b/application/controllers/Cis/MyLv.php
@@ -13,8 +13,8 @@ class MyLv extends Auth_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'index' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
-			'Info' => ['student/anrechnung_beantragen:r','user:r'] // TODO(chris): permissions?
+			'index' => ['basis/cis:r'],
+			'Info' => [self::PERM_LOGGED]
 		]);
 	}
 
diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index 1141808fe..e991d1976 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -13,16 +13,16 @@ class Profil extends Auth_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'index' => ['student/anrechnung_beantragen:r', 'user:r'],
-			'foto_sperre_function' => ['student/anrechnung_beantragen:r', 'user:r'],
-			'getView' => ['student/anrechnung_beantragen:r', 'user:r'],
-			'View' => ['student/anrechnung_beantragen:r', 'user:r'],
-			'isMitarbeiter' => ['student/anrechnung_beantragen:r', 'user:r'],
-			'isStudent' => ['student/anrechnung_beantragen:r', 'user:r'],
-			'getZustellAdresse' => ['student/anrechnung_beantragen:r', 'user:r'],
-			'getZustellKontakt' => ['student/anrechnung_beantragen:r', 'user:r'],
-			'getAllNationen' => ['student/anrechnung_beantragen:r', 'user:r'],
-			'getGemeinden' => ['student/anrechnung_beantragen:r', 'user:r'],
+			'index' => ['basis/cis:r'],
+			'foto_sperre_function' => ['basis/cis:r'],
+			'getView' => ['basis/cis:r'],
+			'View' => ['basis/cis:r'],
+			'isMitarbeiter' => ['basis/cis:r'],
+			'isStudent' => ['basis/cis:r'],
+			'getZustellAdresse' => ['basis/cis:r'],
+			'getZustellKontakt' => ['basis/cis:r'],
+			'getAllNationen' => ['basis/cis:r'],
+			'getGemeinden' => ['basis/cis:r'],
 
 		]);
 
diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
index ef767a625..423b0c9c3 100644
--- a/application/controllers/Cis/ProfilUpdate.php
+++ b/application/controllers/Cis/ProfilUpdate.php
@@ -24,16 +24,16 @@ class ProfilUpdate extends Auth_Controller
 			'getProfilUpdateWithPermission' => ['student/stammdaten:r', 'mitarbeiter/stammdaten:r'],
 			'acceptProfilRequest' => ['student/stammdaten:rw', 'mitarbeiter/stammdaten:rw'],
 			'denyProfilRequest' => ['student/stammdaten:rw', 'mitarbeiter/stammdaten:rw'],
-			'show' => ['student/anrechnung_beantragen:r', 'user:r'],
+			'show' => ['basis/cis:r'],
 
-			'insertProfilRequest' => ['student/anrechnung_beantragen:r', 'user:r'],
-			'updateProfilRequest' => ['student/anrechnung_beantragen:r', 'user:r'],
-			'deleteProfilRequest' => ['student/anrechnung_beantragen:r', 'user:r'],
-			'selectProfilRequest' => ['student/anrechnung_beantragen:r', 'user:r'],
-			'insertFile' => ['student/anrechnung_beantragen:r', 'user:r'],
-			'getProfilRequestFiles' => ['student/anrechnung_beantragen:r', 'user:r'],
-			'getStatus' => ['student/anrechnung_beantragen:r', 'user:r'],
-			'getTopic' => ['student/anrechnung_beantragen:r', 'user:r'],
+			'insertProfilRequest' => ['basis/cis:rw'],
+			'updateProfilRequest' => ['basis/cis:rw'],
+			'deleteProfilRequest' => ['basis/cis:rw'],
+			'selectProfilRequest' => ['basis/cis:r'],
+			'insertFile' => ['basis/cis:rw'],
+			'getProfilRequestFiles' => ['basis/cis:r'],
+			'getStatus' => ['basis/cis:r'],
+			'getTopic' => ['basis/cis:r'],
 		]);
 
 
diff --git a/application/controllers/Cis/Pub.php b/application/controllers/Cis/Pub.php
index 099d093f7..bebc844ab 100644
--- a/application/controllers/Cis/Pub.php
+++ b/application/controllers/Cis/Pub.php
@@ -5,18 +5,18 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 /**
  *
  */
-class Pub extends FHC_Controller
+class Pub extends Auth_Controller
 {
 	/**
 	 * Constructor
 	 */
 	public function __construct()
 	{
-		parent::__construct();
-
-		// Load Libraries
-		$this->load->library('AuthLib');
-		$this->load->library('PermissionLib');
+		parent::__construct(
+		    array(
+			'bild' => ['basis/cis:r']
+		    )
+		);
 	}
 
 	// -----------------------------------------------------------------------------------------------------------------
diff --git a/application/controllers/Cis/Stundenplan.php b/application/controllers/Cis/Stundenplan.php
index 80fb2130a..3e4e1a070 100644
--- a/application/controllers/Cis/Stundenplan.php
+++ b/application/controllers/Cis/Stundenplan.php
@@ -13,7 +13,7 @@ class Stundenplan extends Auth_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'index' => ['student/anrechnung_beantragen:r','user:r'] // TODO(chris): permissions?
+			'index' => ['basis/cis:r']
 		]);
 	}
 
diff --git a/application/controllers/Cis4.php b/application/controllers/Cis4.php
index 5b3f67403..f82168f83 100644
--- a/application/controllers/Cis4.php
+++ b/application/controllers/Cis4.php
@@ -5,18 +5,18 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 /**
  *
  */
-class Cis4 extends FHC_Controller
+class Cis4 extends Auth_Controller
 {
 	/**
 	 * Constructor
 	 */
 	public function __construct()
 	{
-		parent::__construct();
-
-		// Loads Libraries
-		$this->load->library('AuthLib');
-		$this->load->library('PermissionLib');
+		parent::__construct(
+		    array(
+			'index' => 'basis/cis:r'
+		    )
+		);
 	}
 
 	// -----------------------------------------------------------------------------------------------------------------
diff --git a/application/controllers/CisHmvc.php b/application/controllers/CisHmvc.php
index 640f7f640..ce2664823 100644
--- a/application/controllers/CisHmvc.php
+++ b/application/controllers/CisHmvc.php
@@ -7,16 +7,18 @@ use \DOMDocument as DOMDocument;
 /**
  *
  */
-class CisHmvc extends FHC_Controller
+class CisHmvc extends Auth_Controller
 {
 	/**
 	 * Constructor
 	 */
 	public function __construct()
 	{
-		parent::__construct();
-		$this->load->library('AuthLib');
-		$this->load->library('PermissionLib');
+		parent::__construct(
+		    array(
+			'index' => 'basis/cis:r'
+		    )
+		);
 
 		$this->load->model('content/Content_model', 'ContentModel');
 	}
@@ -43,7 +45,7 @@ class CisHmvc extends FHC_Controller
 		$path = explode('/', uri_string());
 		array_shift($path); // NOTE(chris): remove cis4/
 		
-		$menu = $this->ContentModel->getMenu(6739, get_uid());
+		$menu = $this->ContentModel->getMenu(6739, getAuthUID());
 		if (isError($menu)) {
 			// TODO(chris): Error Handling
 			return $this->load->view('CisHmvc/Error', ['error' => getError($menu)]);
diff --git a/application/controllers/CisHmvc/Dashboard.php b/application/controllers/CisHmvc/Dashboard.php
index 2d95fb652..229fc7b85 100644
--- a/application/controllers/CisHmvc/Dashboard.php
+++ b/application/controllers/CisHmvc/Dashboard.php
@@ -14,7 +14,7 @@ class Dashboard extends Auth_Controller
 	{
 		parent::__construct(
 			array(
-				'index' => 'user:r'
+				'index' => 'dashboard/benutzer:r'
 			)
 		);
 	}
diff --git a/application/controllers/CisHtml/Cms.php b/application/controllers/CisHtml/Cms.php
index c2feccd59..c128ec81b 100644
--- a/application/controllers/CisHtml/Cms.php
+++ b/application/controllers/CisHtml/Cms.php
@@ -6,7 +6,7 @@ if (!defined('BASEPATH'))
 /**
  *
  */
-class Cms extends FHC_Controller
+class Cms extends Auth_Controller
 {
 	/**
 	 * Constructor
@@ -14,11 +14,14 @@ class Cms extends FHC_Controller
 
 	public function __construct()
 	{
-		parent::__construct();
+		parent::__construct(
+		    array(
+			'content' => 'basis/cis:r',
+			'news' => 'basis/cis:r',
+		    )
+		);
 
 		// Loads Libraries
-		$this->load->library('AuthLib');
-		$this->load->library('PermissionLib');
 		$this->load->library('CmsLib');
 
 		// Loads phrases system
diff --git a/application/controllers/CisHtml/Dashboard.php b/application/controllers/CisHtml/Dashboard.php
index e4d422788..bce24e9b8 100644
--- a/application/controllers/CisHtml/Dashboard.php
+++ b/application/controllers/CisHtml/Dashboard.php
@@ -14,7 +14,7 @@ class Dashboard extends Auth_Controller
 	{
 		parent::__construct(
 			array(
-				'index' => 'user:r'
+				'index' => 'dashboard/benutzer:r'
 			)
 		);
 
diff --git a/application/controllers/CisVue/Cms.php b/application/controllers/CisVue/Cms.php
index d1ab3c23b..d1fe5468e 100644
--- a/application/controllers/CisVue/Cms.php
+++ b/application/controllers/CisVue/Cms.php
@@ -6,18 +6,24 @@ if (!defined('BASEPATH'))
 /**
  *
  */
-class Cms extends FHC_Controller
+class Cms extends Auth_Controller
 {
 	/**
 	 * Constructor
 	 */
 	public function __construct()
 	{
-		parent::__construct();
+		parent::__construct(
+		    array(
+			'content' => 'basis/cis:r',
+			'getNews' => 'basis/cis:r',
+			'getNewsRowCount' => 'basis/cis:r',
+			'getRoomInformation' => 'basis/cis:r',
+			'news' => 'basis/cis:r'
+		    )
+		);
 
 		// Loads Libraries
-		$this->load->library('AuthLib');
-		$this->load->library('PermissionLib');
 		$this->load->library('CmsLib');
 
 		// Loads phrases system
diff --git a/application/controllers/CisVue/Dashboard.php b/application/controllers/CisVue/Dashboard.php
index 94af6531b..5a0996a96 100644
--- a/application/controllers/CisVue/Dashboard.php
+++ b/application/controllers/CisVue/Dashboard.php
@@ -14,7 +14,7 @@ class Dashboard extends Auth_Controller
 	{
 		parent::__construct(
 			array(
-				'index' => 'user:r'
+				'index' => 'dashboard/benutzer:r'
 			)
 		);
 	}
diff --git a/application/controllers/api/frontend/v1/Cms.php b/application/controllers/api/frontend/v1/Cms.php
index 51acf5067..16142532b 100644
--- a/application/controllers/api/frontend/v1/Cms.php
+++ b/application/controllers/api/frontend/v1/Cms.php
@@ -179,6 +179,8 @@ class Cms extends FHCAPI_Controller
 
 		$news = $this->getDataOrTerminateWithError($news);
 
+		$this->addMeta('test', $this->p->t('global', 'studiengangsleitung'));
+		$this->addMeta('phrases', json_decode($this->p->getJson()));
 		$this->terminateWithSuccess($news);
 
 	}
diff --git a/application/controllers/api/frontend/v1/LvMenu.php b/application/controllers/api/frontend/v1/LvMenu.php
index 2a1f08772..f9a8d0568 100644
--- a/application/controllers/api/frontend/v1/LvMenu.php
+++ b/application/controllers/api/frontend/v1/LvMenu.php
@@ -84,7 +84,7 @@ class LvMenu extends FHCAPI_Controller
 		die($p->t('global/fehlerBeimOeffnenDerDatenbankverbindung'));
 
 		// get the user
-		if (!$user=get_uid())
+		if (!$user=getAuthUID())
 			die($p->t('global/nichtAngemeldet'));
 
 		// check if is_lector
diff --git a/application/controllers/components/Cis/Mylv.php b/application/controllers/components/Cis/Mylv.php
index a8baee753..1fdb7e2a1 100644
--- a/application/controllers/components/Cis/Mylv.php
+++ b/application/controllers/components/Cis/Mylv.php
@@ -31,7 +31,7 @@ class Mylv extends Auth_Controller
 	{
 		$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
 
-		$result = $this->LehrveranstaltungModel->getLvsByStudentWithGrades(get_uid());
+		$result = $this->LehrveranstaltungModel->getLvsByStudentWithGrades(getAuthUID());
 
 		if (isError($result))
 			return $this->outputJsonError(getError($result));
@@ -45,7 +45,7 @@ class Mylv extends Auth_Controller
 	{
 		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
 
-		$result = $this->StudiensemesterModel->getWhereStudentHasLvs(get_uid());
+		$result = $this->StudiensemesterModel->getWhereStudentHasLvs(getAuthUID());
 
 		if (isError($result))
 			return $this->outputJsonError(getError($result));
@@ -59,7 +59,7 @@ class Mylv extends Auth_Controller
 	{
 		$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
 
-		$result = $this->LehrveranstaltungModel->getLvsByStudentWithGrades(get_uid(), $studiensemester_kurzbz, getUserLanguage());
+		$result = $this->LehrveranstaltungModel->getLvsByStudentWithGrades(getAuthUID(), $studiensemester_kurzbz, getUserLanguage());
 
 		if (isError($result))
 			return $this->outputJsonError(getError($result));
@@ -202,7 +202,7 @@ class Mylv extends Auth_Controller
 	{
 		$this->load->model('education/Pruefung_model', 'PruefungModel');
 
-		$result = $this->PruefungModel->getByStudentAndLv(get_uid(), $lehrveranstaltung_id, getUserLanguage());
+		$result = $this->PruefungModel->getByStudentAndLv(getAuthUID(), $lehrveranstaltung_id, getUserLanguage());
 
 		if (isError($result))
 			return $this->outputJsonError(getError($result));
diff --git a/application/controllers/components/Cis/Stundenplan.php b/application/controllers/components/Cis/Stundenplan.php
index a88d061cb..a9f35c651 100644
--- a/application/controllers/components/Cis/Stundenplan.php
+++ b/application/controllers/components/Cis/Stundenplan.php
@@ -14,9 +14,9 @@ class Stundenplan extends Auth_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'index' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
-			'Reservierungen' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
-			'Stunden' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
+			'index' => ['basis/cis'],
+			'Reservierungen' => ['basis/cis'],
+			'Stunden' => ['basis/cis'],
 		]);
 	}
 
@@ -29,12 +29,12 @@ class Stundenplan extends Auth_Controller
 	{
 		$this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
 
-		/* $result = $this->StundenplanModel->loadForUid(get_uid());
+		/* $result = $this->StundenplanModel->loadForUid(getAuthUID());
 
 		if (isError($result))
 			return $this->outputJsonError(getError($result));
  		*/
-		$res = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getStundenplanQuery(get_uid())); 
+		$res = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getStundenplanQuery(getAuthUID())); 
 		
 		$res = getData($res);
 		
@@ -47,7 +47,7 @@ class Stundenplan extends Auth_Controller
 	{
 		$this->load->model('ressource/Reservierung_model', 'ReservierungModel');
 
-		$result = $this->ReservierungModel->loadForUid(get_uid());
+		$result = $this->ReservierungModel->loadForUid(getAuthUID());
 
 		if (isError($result))
 			return $this->outputJsonError(getError($result));
diff --git a/application/controllers/components/CisVue.php b/application/controllers/components/CisVue.php
index 537537f08..143875c39 100644
--- a/application/controllers/components/CisVue.php
+++ b/application/controllers/components/CisVue.php
@@ -5,7 +5,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 /**
  *
  */
-class CisVue extends FHC_Controller
+class CisVue extends Auth_Controller
 {
 
 	/**
@@ -13,14 +13,9 @@ class CisVue extends FHC_Controller
 	 */
 	public function __construct()
 	{
-		parent::__construct();
-
-		// Loads authentication library and starts authentication
-		$this->load->library('AuthLib');
-		$this->load->library('PermissionLib');
-
-		if (!isLogged())
-			show_404();
+		parent::__construct([
+			'Menu' => [self::PERM_LOGGED]
+		]);
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
@@ -31,7 +26,7 @@ class CisVue extends FHC_Controller
 	public function Menu()
 	{
 		$this->load->model('content/Content_model', 'ContentModel');
-		$result = $this->ContentModel->getMenu(defined('CIS4_MENU_ENTRY') ? CIS4_MENU_ENTRY : null, get_uid());
+		$result = $this->ContentModel->getMenu(defined('CIS4_MENU_ENTRY') ? CIS4_MENU_ENTRY : null, getAuthUID());
 		$menu = getData($result) ?? (object)['childs' => []];
 
 		$this->outputJsonSuccess($menu);
diff --git a/application/controllers/dashboard/DashboardDemo.php b/application/controllers/dashboard/DashboardDemo.php
index 90eb017b8..35d530384 100644
--- a/application/controllers/dashboard/DashboardDemo.php
+++ b/application/controllers/dashboard/DashboardDemo.php
@@ -16,7 +16,7 @@ class DashboardDemo extends Auth_Controller
         // Set required permissions
         parent::__construct(
             array(
-                'index' => 'user:r',
+                'index' => 'dashboard/benutzer:r',
                 'admin' => 'dashboard/admin:rw'
             )
         );
diff --git a/application/views/templates/CISHTML-Header.php b/application/views/templates/CISHTML-Header.php
index eba22fc8f..8e69c0366 100644
--- a/application/views/templates/CISHTML-Header.php
+++ b/application/views/templates/CISHTML-Header.php
@@ -18,7 +18,7 @@ $this->load->view('templates/FHC-Header', $includesArray);
 if (!isset($menu)) {
 	$ci =& get_instance(); // get CI instance
 	$ci->load->model('content/Content_model', 'ContentModel');
-	$result = $ci->ContentModel->getMenu(null, get_uid());
+	$result = $ci->ContentModel->getMenu(null, getAuthUID());
 	$menu = getData($result) ?? (object)['childs' => []];
 }
 ?>
diff --git a/application/views/templates/CISVUE-Header.php b/application/views/templates/CISVUE-Header.php
index 6ee344391..c9385d478 100644
--- a/application/views/templates/CISVUE-Header.php
+++ b/application/views/templates/CISVUE-Header.php
@@ -20,7 +20,7 @@ if (!isset($menu)) {
 	$ci =& get_instance(); // get CI instance
 	$ci->load->model('content/Content_model', 'ContentModel');
 	$cis4_content_id = $ci->ContentModel->getCIS4_ContentID();
-	$result = $ci->ContentModel->getMenu($cis4_content_id, get_uid());
+	$result = $ci->ContentModel->getMenu($cis4_content_id, getAuthUID());
 	$menu = getData($result)->childs ?? [];
 }
 ?>

From 835adca419efaf79b311c6d2a730859745c87161 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Mon, 4 Nov 2024 15:42:47 +0100
Subject: [PATCH 1358/1461] Debugging option entfernt

---
 include/person.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/person.class.php b/include/person.class.php
index 924c15ab6..f8103dd65 100644
--- a/include/person.class.php
+++ b/include/person.class.php
@@ -97,7 +97,7 @@ class person extends basis_db
 							familienstand, anzahlkinder, aktiv, insertamum, insertvon, updateamum, updatevon, ext_id,
 							geschlecht, staatsbuergerschaft, geburtsnation, kurzbeschreibung, zugangscode, foto_sperre,
 							matr_nr, bpk, wahlname";
-			if ($hasUDF = $udf->personHasUDF() && false)
+			if ($hasUDF = $udf->personHasUDF())
 				$qry .= ", udf_values";
 
 			$qry .= " FROM public.tbl_person

From 37dffbba19b9a105806c775e0042e10698a93fb6 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 5 Nov 2024 11:32:02 +0100
Subject: [PATCH 1359/1461] fix(Dashboard widget Url): adds validation method
 for both input fields and fixes confirm delete dialog

---
 public/js/components/DashboardWidget/Url.js   | 84 +++++++++++++------
 system/dbupdate_3.4.php                       |  2 +-
 ... => 41134_C4_bookmark_dashboardWidget.php} | 39 +++++++--
 system/phrasesupdate.php                      | 20 +++++
 4 files changed, 109 insertions(+), 36 deletions(-)
 rename system/dbupdate_3.4/{41134_bookmark_dashboardWidget.php => 41134_C4_bookmark_dashboardWidget.php} (64%)

diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index 8dabf7b4c..c3ad0c810 100644
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -5,7 +5,10 @@ export default {
   data: () => ({
     title_input: "",
     url_input: "",
-	invalidURL: false,
+	validation:{
+		invalidURL: false,
+		invalidTitel:false,
+	}
   }),
   mixins: [AbstractWidget],
   computed: {
@@ -23,28 +26,37 @@ export default {
     },
   },
   methods: {
+	isValidationSuccessfull(){
+	  // validate the input fields
+	  if (this.title_input.length === 0) {
+	    this.$fhcAlert.alertError(this.$p.t("bookmark", "invalidTitel"));
+		this.validation.invalidTitel = true;
+	  }
+	  if (!URL.canParse(this.url_input)) {
+		this.$fhcAlert.alertError(this.$p.t("bookmark", "invalidUrl"));
+		this.validation.invalidURL = true;
+	  }
+
+	  return !Object.values(this.validation).some(value => value === true);
+	},
     async fetchBookmarks() {
       await this.$fhcApi.factory.bookmark
         .getBookmarks()
         .then((res) => res.data)
         .then((result) => {
-          this.shared = result;
-        })
+		  this.shared = result;
+		})
         .catch(this.$fhcAlert.handleSystemError);
     },
-    async confirmDelete() {
-      if ((await this.$fhcAlert.confirmDelete()) === false) return;
-    },
     addLink() {
 	  // reset is-invalid css on url input field
-	  this.invalidURL = false;
-
-	  if(!URL.canParse(this.url_input)) 
-	  {
-		this.$fhcAlert.alertError(this.$p.t("bookmark", "invalidUrl"));
-		this.invalidURL = true;
-		return;
+	  for(let key of Object.keys(this.validation)){
+		this.validation[key] = false;
 	  }
+	  
+	  // early return if validation failed
+	  if (!this.isValidationSuccessfull()) return;
+	  
       this.$fhcApi.factory.bookmark
         .insert({
           tag: this.config.tag,
@@ -54,28 +66,30 @@ export default {
         .then((res) => res.data)
         .then((result) => {
           this.$fhcAlert.alertInfo(this.$p.t("bookmark", "bookmarkAdded"));
+		  // refetch the bookmarks to see the updates
+		  this.fetchBookmarks();
         })
         .catch(this.$fhcAlert.handleSystemError);
 
       // reset the values for the title and url inputs
       this.title_input = "";
       this.url_input = "";
-
-      // refetch the bookmarks to see the updates
-      this.fetchBookmarks();
     },
     async removeLink(bookmark_id) {
-      await this.confirmDelete();
-      this.$fhcApi.factory.bookmark
+	  let isConfirmed = await this.$fhcAlert.confirmDelete();
+	 
+	  // early return if the confirm dialog was not confirmed
+	  if(!isConfirmed) return;
+      
+	  this.$fhcApi.factory.bookmark
         .delete(bookmark_id)
         .then((res) => res.data)
         .then((result) => {
           this.$fhcAlert.alertInfo(this.$p.t("bookmark", "bookmarkDeleted"));
+		  // refetch the bookmarks to see the updates
+		  this.fetchBookmarks();
         })
         .catch(this.$fhcAlert.handleSystemError);
-
-      // refetch the bookmarks to see the updates
-      this.fetchBookmarks();
     },
   },
   async mounted() {
@@ -92,11 +106,22 @@ export default {
 
                 <header><b>{{$p.t('bookmark','newLink')}}</b></header><br>
                 <div>
-                    <input class="form-control form-control-sm" placeholder="Titel" type="text" v-model="title_input" name="title" maxlength="50" required>
-					<input required id="bookmark_link" class="form-control form-control-sm mt-2" :class="{'is-invalid':invalidURL}" type="url" placeholder="URL" v-model="url_input" name="url">
-				    <div class="invalid-feedback">
-					{{$p.t("bookmark", "invalidUrl")}}.
+  					<div class="form-group">
+						<input maxlength="255" required class="form-control form-control-sm" :class="{'is-invalid':validation.invalidTitel}" placeholder="Titel" type="text" v-model="title_input" name="title" >
+						<!-- validation html for titel -->
+						<div class="invalid-feedback">
+						{{$p.t("bookmark", "invalidTitel")}}.
+						</div>
 					</div>
+
+					<div class="form-group">
+						<input required id="bookmark_link" class="form-control form-control-sm mt-2" :class="{'is-invalid':validation.invalidURL}" type="url" placeholder="URL" v-model="url_input" name="url">
+						<!-- validation html for url -->
+						<div class="invalid-feedback">
+						{{$p.t("bookmark", "invalidUrl")}}.
+						</div>
+					</div>
+
                     <button class="btn btn-outline-secondary btn-sm w-100 mt-2" @click="addLink" type="button">{{$p.t('bookmark','saveLink')}}</button>
                 </div>
             </div>
@@ -107,8 +132,13 @@ export default {
                 <header><b>{{ tagName }}</b></header>
                 <template v-if="!emptyBookmarks">
                   <div v-for="link in shared" :key="link.id" class="d-flex mt-2">
-                      <a target="_blank" :href="link.url"><i class="fa fa-solid fa-arrow-up-right-from-square"></i> {{ link.title }}</a>
-                      <a class="ms-auto" href="#" @click.prevent="removeLink(link.bookmark_id)" v-show="configMode"><i class="fa fa-regular fa-trash-can"></i></a>
+                      <a target="_blank" :href="link.url">
+					  	<i class="fa fa-solid fa-arrow-up-right-from-square"></i>
+						{{ link.title }}
+					  </a>
+                      <a class="ms-auto" href="#" @click.prevent="removeLink(link.bookmark_id)" v-show="configMode">
+					    <i class="fa fa-regular fa-trash-can" style="color: #e01b24;"></i>
+					  </a>
                   </div>
                 </template>
                 <div v-else class="d-flex mt-2">
diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index aab8d1134..2f4f38608 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -59,7 +59,7 @@ require_once('dbupdate_3.4/25999_cis4_cms.php');
 require_once('dbupdate_3.4/36530_bis_internationsalisierung_codextabelle_neuerungen.php');
 require_once('dbupdate_3.4/34543_ux_template.php');
 require_once('dbupdate_3.4/17513_Entwicklungsteam.php');
-require_once('dbupdate_3.4/41134_bookmark_dashboardWidget.php');
+require_once('dbupdate_3.4/41134_C4_bookmark_dashboardWidget.php');
 require_once('dbupdate_3.4/28575_softwarebereitstellung.php');
 require_once('dbupdate_3.4/41150_oe-pfad_db_view.php');
 require_once('dbupdate_3.4/44031_stv_favorites.php');
diff --git a/system/dbupdate_3.4/41134_bookmark_dashboardWidget.php b/system/dbupdate_3.4/41134_C4_bookmark_dashboardWidget.php
similarity index 64%
rename from system/dbupdate_3.4/41134_bookmark_dashboardWidget.php
rename to system/dbupdate_3.4/41134_C4_bookmark_dashboardWidget.php
index ebcdeba91..c54b4c2ca 100644
--- a/system/dbupdate_3.4/41134_bookmark_dashboardWidget.php
+++ b/system/dbupdate_3.4/41134_C4_bookmark_dashboardWidget.php
@@ -2,8 +2,11 @@
 
 if (!$result = @$db->db_query("SELECT to_regclass('dashboard.tbl_bookmark')")) 
 {
-    $qry = "BEGIN TRANSACTION;
-
+	if (!$db->db_query("BEGIN;")) 
+	{
+		echo '<strong>wasnt able to start transaction for 41134_C4_bookmark_dashboardWidget: ' . $db->db_last_error() . '</strong><br>';
+	}
+    $qry = "
             CREATE TABLE IF NOT EXISTS dashboard.tbl_bookmark(
                 bookmark_id BIGINT PRIMARY KEY,
                 uid VARCHAR(255) NOT NULL,
@@ -33,12 +36,32 @@ if (!$result = @$db->db_query("SELECT to_regclass('dashboard.tbl_bookmark')"))
             GRANT SELECT, INSERT, UPDATE, DELETE ON dashboard.tbl_bookmark TO web; 
             GRANT SELECT, UPDATE ON dashboard.tbl_bookmark_sequence TO vilesci;
             GRANT SELECT, UPDATE ON dashboard.tbl_bookmark_sequence TO web;
-
-            COMMIT TRANSACTION;";
+			";
 
     if (!$db->db_query($qry))
-            echo '<strong>error occurred during tbl_bookmark creation: ' . $db->db_last_error() . '</strong><br>';
-        else
-            echo '<br>dashboard.tbl_bookmark and dashboard.tbl_bookmark_sequence was created';
-
+	{
+		// Rollback
+		if (!$db->db_query("ROLLBACK;")) 
+		{
+			echo '<strong>wasnt able to rollback: ' . $db->db_last_error() . '</strong><br>';
+		} 
+		else 
+		{
+			echo '<strong>ROLLED BACK 41134_C4_bookmark_dashboardWidget</strong><br>';
+		}
+		echo '<strong>error occurred during tbl_bookmark creation: ' . $db->db_last_error() . '</strong><br>';
+	}
+    else
+	{
+		// Commit
+		if (!$db->db_query("COMMIT;")) 
+		{
+			echo '<strong>wasnt able to commit: ' . $db->db_last_error() . '</strong><br>';
+		} 
+		else 
+		{
+			echo '<strong>COMMITED 41134_C4_bookmark_dashboardWidget</strong><br>';
+		}
+		echo '<br>dashboard.tbl_bookmark and dashboard.tbl_bookmark_sequence was created';
+	}
 }
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index d90cd362a..9fcc8f489 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -31524,6 +31524,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'bookmark',
+		'phrase' => 'invalidTitel',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ungültiger Titel',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Invalid title',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'global',

From 7653bc3e290f67e6b0e2c48ae41c16231848216d Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 5 Nov 2024 12:03:44 +0100
Subject: [PATCH 1360/1461] fix(Menu User Dropdown): rearranges html elements
 to make dropdown scroll

---
 public/css/Cis4/Cis.css          | 11 ++++++++---
 public/js/components/Cis/Menu.js | 30 +++++++++++++++++-------------
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index ed14222fe..a91d64f19 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -305,10 +305,12 @@ html {
     right: calc(var(--fhc-cis-header-height) + 2 * var(--fhc-cis-header-px) - 2 * var(--fhc-cis-header-py));
     width: auto !important;
   }
+  #nav-user {
+	position: fixed;
+	top: 0;
+	right: 0;
+  }
   #nav-user-btn {
-    position: fixed;
-    top: 0;
-    right: 0;
     border-width: 0;
     padding: var(--fhc-cis-header-py) var(--fhc-cis-header-px);
     background-color: var(--fhc-cis-primary);
@@ -381,6 +383,9 @@ html {
   }
   #nav-search {
     position: relative;
+  }
+  #nav-user{
+
   }
   #nav-user-btn {
 
diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js
index f34961676..58b981c81 100644
--- a/public/js/components/Cis/Menu.js
+++ b/public/js/components/Cis/Menu.js
@@ -43,6 +43,9 @@ export default {
 
 			return null;
 		},
+		site_url(){
+			return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
+		}
 	},
 	methods:{
 		makeParentContentActive(content_id, collection=this.entries, parent=null){
@@ -81,19 +84,20 @@ export default {
     <a id="nav-logo" class="d-none d-md-block" :href="rootUrl">
         <img :src="logoUrl" alt="Logo">
     </a>
-	<button id="nav-user-btn" class="btn btn-link rounded-0" type="button" data-bs-toggle="collapse" data-bs-target="#nav-user-menu" aria-expanded="false" aria-controls="nav-user-menu">
-		<img :src="avatarUrl" class="avatar rounded-circle"/>
-	</button>
-	<ul id="nav-user-menu" class="collapse list-unstyled" aria-labelledby="nav-user-btn">
-		<li><a class="btn btn-level-2 rounded-0 d-block" href="#" id="menu-profil">Profil</a></li>
-		<li><a class="btn btn-level-2 rounded-0 d-block" href="#">Ampeln</a></li>
-		<li class="fhc-languages" style="text-align: center;">
-			<a class="btn btn-level-2 rounded-0" href="#" @click="handleChangeLanguage('German')">Deutsch</a>
-			<a class="btn btn-level-2 rounded-0" href="#" @click="handleChangeLanguage('English')">English</a>
-		</li>
-		<li><hr class="dropdown-divider"></li>
-		<li><a class="btn btn-level-2 rounded-0 d-block" :href="logoutUrl">Logout</a></li>
-	</ul>
+	<div id="nav-user">
+		<button id="nav-user-btn" class="btn btn-link rounded-0" type="button" data-bs-toggle="collapse" data-bs-target="#nav-user-menu" aria-expanded="false" aria-controls="nav-user-menu">
+			<img :src="avatarUrl" class="avatar rounded-circle"/>
+		</button>
+		<ul id="nav-user-menu" class="collapse list-unstyled" aria-labelledby="nav-user-btn">
+			<li><a class="btn btn-level-2 rounded-0 d-block" :href="site_url + '/Cis/Profil'" id="menu-profil">Profil</a></li>
+			<li class="fhc-languages" style="text-align: center;">
+				<a class="btn btn-level-2 rounded-0" href="#" @click="handleChangeLanguage('German')">Deutsch</a>
+				<a class="btn btn-level-2 rounded-0" href="#" @click="handleChangeLanguage('English')">English</a>
+			</li>
+			<li><hr class="dropdown-divider"></li>
+			<li><a class="btn btn-level-2 rounded-0 d-block" :href="logoutUrl">Logout</a></li>
+		</ul>
+	</div>
     <nav id="nav-main" class="offcanvas offcanvas-start bg-dark" tabindex="-1" aria-labelledby="nav-main-btn" data-bs-backdrop="false">
 		<div id="nav-main-sticky">
 			<div id="nav-main-toggle" class="position-static d-none d-lg-block bg-dark">

From 8316290b316fca3c1dc8bba6a7d95d113c4838fb Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 5 Nov 2024 15:54:26 +0100
Subject: [PATCH 1361/1461] fix(Cis Navbar Collapsibles): closes other
 colapsibles when opening another

---
 public/js/components/Cis/Menu.js              | 18 +++++++++++--
 .../ProfilComponents/ProfilInformation.js     |  2 +-
 public/js/components/searchbar/searchbar.js   | 26 ++++++++++++-------
 3 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js
index 58b981c81..62305cd9a 100644
--- a/public/js/components/Cis/Menu.js
+++ b/public/js/components/Cis/Menu.js
@@ -22,6 +22,7 @@ export default {
 			activeEntry:null,
 			url:null,
 			urlMatchRankings:[],
+			navUserDropdown:null,
         };
     },
 	provide(){
@@ -48,6 +49,16 @@ export default {
 		}
 	},
 	methods:{
+		toggleCollapsibles(target){
+			switch(target){
+				case 'settings':
+					this.navUserDropdown?.hide();
+					break;
+				case 'navUserDropdown':
+					this.$refs.searchbar?.settingsDropdown?.hide();
+					break;
+			}
+		},
 		makeParentContentActive(content_id, collection=this.entries, parent=null){
 			for(let entry of collection){
 				if(entry.content_id == content_id){
@@ -71,6 +82,9 @@ export default {
 	mounted(){
 		this.entries = this.menu;
 		this.$p.loadCategory(['ui', 'global'])
+		this.navUserDropdown = new bootstrap.Collapse(this.$refs.navUserDropdown,{
+			toggle: false
+		});
 	},
     template: /*html*/`
 	<!--<p>CISVUE HEADER</p>
@@ -80,7 +94,7 @@ export default {
 	<button id="nav-main-btn" class="navbar-toggler" type="button" data-bs-toggle="offcanvas" data-bs-target="#nav-main" aria-controls="nav-main" aria-expanded="false" aria-label="Toggle navigation">
         <span class="navbar-toggler-icon"></span>
     </button>
-	<fhc-searchbar id="nav-search" class="fhc-searchbar w-100" :searchoptions="searchbaroptions" :searchfunction="searchfunction" :selectedtypes="selectedtypes"></fhc-searchbar>
+	<fhc-searchbar @showSettings="toggleCollapsibles" ref="searchbar" id="nav-search" class="fhc-searchbar w-100" :searchoptions="searchbaroptions" :searchfunction="searchfunction" :selectedtypes="selectedtypes"></fhc-searchbar>
     <a id="nav-logo" class="d-none d-md-block" :href="rootUrl">
         <img :src="logoUrl" alt="Logo">
     </a>
@@ -88,7 +102,7 @@ export default {
 		<button id="nav-user-btn" class="btn btn-link rounded-0" type="button" data-bs-toggle="collapse" data-bs-target="#nav-user-menu" aria-expanded="false" aria-controls="nav-user-menu">
 			<img :src="avatarUrl" class="avatar rounded-circle"/>
 		</button>
-		<ul id="nav-user-menu" class="collapse list-unstyled" aria-labelledby="nav-user-btn">
+		<ul ref="navUserDropdown" @[\`show.bs.collapse\`]="toggleCollapsibles('navUserDropdown')" id="nav-user-menu" class="collapse list-unstyled" aria-labelledby="nav-user-btn">
 			<li><a class="btn btn-level-2 rounded-0 d-block" :href="site_url + '/Cis/Profil'" id="menu-profil">Profil</a></li>
 			<li class="fhc-languages" style="text-align: center;">
 				<a class="btn btn-level-2 rounded-0" href="#" @click="handleChangeLanguage('German')">Deutsch</a>
diff --git a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
index 78e198170..f37c38be4 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
@@ -73,7 +73,7 @@ export default {
 <div class="col-12 col-sm-6 mb-2">
 <div class="row justify-content-center">
       <div class="col-auto " style="position:relative">
-        <img class=" img-thumbnail " style=" max-height:150px; "  :src="get_image_base64_src"></img>
+        <img class=" img-thumbnail " style=" max-height:150px; "  :src="get_image_base64_src">
         <!-- LOCKING IMAGE FUNCTIONALITY -->
         
         
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index b0f9dffc6..a828b2cfd 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -7,7 +7,7 @@ import prestudent from "./prestudent.js";
 
 export default {
     props: [ "searchoptions", "searchfunction","selectedtypes" ],
-    
+    emits: ['showSettings'],
     data: function() {
       return {
         searchtimer: null,
@@ -21,6 +21,7 @@ export default {
         showresult: false,  
         searching: false,
         error: null,
+		settingsDropdown:null,
       };
     },
     components: {
@@ -32,18 +33,18 @@ export default {
       prestudent: prestudent
     },
     template: /*html*/`
-          <form ref="searchform" class="d-flex me-3" action="javascript:void(0);" 
+          <form ref="searchform" class="d-flex me-3" action="javascript:void(0);"
             @focusin="this.searchfocusin" @focusout="this.searchfocusout">
-           
+
             <div class="h-100 input-group me-2 bg-white">
-           
-                <input ref="searchbox" @keyup="this.search" @focus="this.showsearchresult" 
-                    v-model="this.searchsettings.searchstr" class="form-control" 
+
+                <input ref="searchbox" @keyup="this.search" @focus="this.showsearchresult"
+                    v-model="this.searchsettings.searchstr" class="form-control"
                     type="search" :placeholder="'Search: '+ searchsettings.types.join(' / ')" aria-label="Search">
                 <button data-bs-toggle="collapse" data-bs-target="#searchSettings" aria-expanded="false" aria-controls="searchSettings" ref="settingsbutton"  class="btn btn-outline-secondary" type="button" id="search-filter"><i class="fas fa-cog"></i></button>
-            </div>            
-        
-            <div v-show="this.showresult" ref="result" 
+            </div>
+
+            <div v-show="this.showresult" ref="result"
                  class="searchbar_results" tabindex="-1">
               <div v-if="this.searching">
                 <i class="fas fa-spinner fa-spin fa-2x"></i>
@@ -61,7 +62,7 @@ export default {
               </template>
             </div>
 
-            <div id="searchSettings"  ref="settings" 
+            <div id="searchSettings"  ref="settings"  @[\`show.bs.collapse\`]="$emit('showSettings','settings')"
                  class="top-100 end-0 searchbar_settings text-white collapse" tabindex="-1">
               <div class="d-flex flex-column m-3" v-if="this.searchoptions.types.length > 0">
               <span class="fw-light mb-2">Suche filtern nach:</span>  
@@ -85,6 +86,11 @@ export default {
         this.updateSearchOptions();
         
     },
+	mounted(){
+		this.settingsDropdown = new bootstrap.Collapse(this.$refs.settings, {
+			toggle: false
+		});
+	},
     methods: {
         getActionsForRoom: function(res){
             res.booklink= FHC_JS_DATA_STORAGE_OBJECT.app_root +

From 39cedfe6a0b963e3781e9d8d01a4a9ef4799af5a Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 5 Nov 2024 16:48:30 +0100
Subject: [PATCH 1362/1461] remove controllers, views and libraries for CisHmvc
 since not used

---
 application/controllers/CisHmvc.php           | 319 -------------
 application/controllers/CisHmvc/Cms.php       | 115 -----
 application/controllers/CisHmvc/Dashboard.php |  32 --
 application/libraries/CisHmvc/Loader.php      | 420 ------------------
 application/views/CisHmvc/Cms/Content.php     |  31 --
 application/views/CisHmvc/Cms/Legacy.php      |  23 -
 application/views/CisHmvc/Dashboard.php       |  21 -
 application/views/CisHmvc/Error.php           |  18 -
 .../views/templates/CISHMVC-Footer.php        |   1 -
 .../views/templates/CISHMVC-Header.php        |  57 ---
 .../views/templates/CISHMVC-Menu/Entry.php    |  57 ---
 11 files changed, 1094 deletions(-)
 delete mode 100644 application/controllers/CisHmvc.php
 delete mode 100644 application/controllers/CisHmvc/Cms.php
 delete mode 100644 application/controllers/CisHmvc/Dashboard.php
 delete mode 100644 application/libraries/CisHmvc/Loader.php
 delete mode 100644 application/views/CisHmvc/Cms/Content.php
 delete mode 100644 application/views/CisHmvc/Cms/Legacy.php
 delete mode 100644 application/views/CisHmvc/Dashboard.php
 delete mode 100644 application/views/CisHmvc/Error.php
 delete mode 100644 application/views/templates/CISHMVC-Footer.php
 delete mode 100644 application/views/templates/CISHMVC-Header.php
 delete mode 100644 application/views/templates/CISHMVC-Menu/Entry.php

diff --git a/application/controllers/CisHmvc.php b/application/controllers/CisHmvc.php
deleted file mode 100644
index ce2664823..000000000
--- a/application/controllers/CisHmvc.php
+++ /dev/null
@@ -1,319 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use \DOMDocument as DOMDocument;
-
-/**
- *
- */
-class CisHmvc extends Auth_Controller
-{
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct(
-		    array(
-			'index' => 'basis/cis:r'
-		    )
-		);
-
-		$this->load->model('content/Content_model', 'ContentModel');
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * @param string $method
-	 *
-	 * @return void
-	 */
-	public function _remap($method)
-	{
-		$this->index();
-	}
-
-	/**
-	 * @return void
-	 */
-	public function index()
-	{
-		// TODO(chris): CI can't handle empty ("//") parameters
-		$path = explode('/', uri_string());
-		array_shift($path); // NOTE(chris): remove cis4/
-		
-		$menu = $this->ContentModel->getMenu(6739, getAuthUID());
-		if (isError($menu)) {
-			// TODO(chris): Error Handling
-			return $this->load->view('CisHmvc/Error', ['error' => getError($menu)]);
-		}
-		$menu = getData($menu) ?? (object)['childs' => []];
-
-		$menu = $this->convertMenu($menu->childs, $path, APP_ROOT . 'index.ci.php/CisHmvc');
-		$current = ['childs' => $menu];
-		$params = $path;
-		
-		foreach ($path as $key) {
-			if (!isset($current['childs'][$key])) {
-				if ($current['childs'] == $menu)
-					$current = null;
-				break;
-			}
-			$current = $current['childs'][$key];
-			array_shift($params);
-		}
-		if (!$current) {
-			return $this->notfound();
-		}
-		if (!$path)
-		{
-			$controller = 'CisHmvc/Dashboard';
-			$action = 'index';
-		}
-		else
-		{
-			switch ($current['orig']->template_kurzbz) {
-				case 'redirect':
-					list ($url, $target) = $this->getRedirectUrlAndTarget($current['orig']->content);
-					if (substr($url, 0, 1) == '#')
-					{
-						$controller = 'CisHmvc';
-						$action = 'notfound';
-						break;
-					}
-					if ($target)
-					{
-						$controller = 'CisHmvc';
-						$action = 'redirect';
-						array_unshift($params, $url);
-						break;
-					}
-					if (preg_match('/^(\.\.\/|\.\/)*index\.ci\.php\/(.*)$/', $url, $matches))
-					{
-						list ($controller, $action, $p) = $this->getControllerMethodAndParamsFromUrl($matches[2]);
-						if (!$controller)
-						{
-							$controller = 'CisHmvc';
-							$action = 'notfound';
-						}
-						else
-						{
-							while (count($p))
-								array_unshift($params, array_pop($p));
-						}
-						break;
-					}
-					if (preg_match('/^(\.\.\/|\.\/)*cms\/news\.php(.*)$/', $url, $matches))
-					{
-						$controller = 'CisHmvc/Cms';
-						$action = 'news';
-						$p = parse_url($url . '?infoscreen=0', PHP_URL_QUERY);
-						if ($p)
-						{
-							parse_str($p, $p);
-							$params += array_values(array_merge([
-								'infoscreen' => false,
-								'studiengang_kz' => null,
-								'semester' => null,
-								'mischen' => true,
-								'titel' => '',
-								'edit' => false,
-								'sichtbar' => true
-							], $p));
-						}
-						break;
-					}
-					if (preg_match('/^(\.\.\/|\.\/)*(addons|cms|cis)\/(.*)$/', $url, $matches))
-					{
-						$controller = 'CisHmvc/Cms';
-						$action = 'legacy';
-						array_unshift($params, $matches[2] . "/" . $matches[3]);
-						break;
-					}
-					
-					$controller = 'CisHmvc/cms';
-					$action = 'debug';
-					array_unshift($params, $current['orig']);
-					break;
-				case 'contentohnetitel':
-				case 'contentmittitel':
-					$controller = 'CisHmvc/Cms';
-					$action = 'content';
-					array_unshift($params, $current['orig']->content_id);
-					break;
-				default:
-					$controller = 'CisHmvc/Cms';
-					$action = 'debug';
-					array_unshift($params, $current['orig']);
-					break;
-			}
-		}
-
-		$className = ucfirst(basename($controller));
-		$path = APPPATH . 'controllers/' . dirname($controller) . '/' . $className . '.php';
-
-		#var_dump(is_loaded());
-		require_once $path;
-		foreach (is_loaded() as $k => $v)
-			if (!in_array($k, ['benchmark','hooks','config','log','utf8','uri','router','output','security','input','lang','loader']))
-				unset(is_loaded()[$k]);
-		
-		$this->router->directory = dirname($controller) . '/';
-		$this->router->class = $className;
-		$this->router->method = $action;
-
-		#var_dump($this->router->method);
-		$controller = new $className();
-		// NOTE(chris): this is needed because we loaded it in this controller and it can't be loaded twice
-		$controller->ContentModel = $this->ContentModel;
-
-		$this->load->library('CisHmvc/Loader', [$menu, $this->load], 'Cis4Loader');
-		$controller->load = $controller->Cis4Loader;
-		call_user_func_array(array(&$controller, $action), $params);
-	}
-
-	/**
-	 * @return void
-	 */
-	public function notfound()
-	{
-		set_status_header(404);
-		$this->load->view('CisHmvc/Error', ['error' => '404: Site Not Found']);
-	}
-
-	/**
-	 * @param uri_string	$url
-	 *
-	 * @return void
-	 */
-	public function redirect($url)
-	{
-		redirect($url);
-	}
-
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Protected methods (move to lib?)
-
-	protected function getControllerMethodAndParamsFromUrl($url)
-	{
-		$segments = explode('/', $url);
-		$path = '';
-		while ($possibleController = array_shift($segments)) {
-			if (file_exists(APPPATH . 'controllers/' . $path . ucfirst($possibleController) . '.php'))
-				return [$path . $possibleController, array_shift($segments) ?: 'index', $segments];
-			$path .= $possibleController . '/';
-		}
-		return [null, null, null];
-	}
-
-	protected function getRedirectUrlAndTarget($content)
-	{
-		if (!$content)
-			return ['#', ''];
-
-		$url = '';
-		$target = '';
-
-		$xml = new DOMDocument();
-		$xml->loadXML($content);
-		if ($xml->getElementsByTagName('url')->item(0))
-			$url = $xml->getElementsByTagName('url')->item(0)->nodeValue;
-		// TODO(chris): get params
-		/*if (strpos($url, '$') !== FALSE)
-			var_dump($url);*/
-		if (isset($params) && is_array($params))
-			foreach ($params as $key => $value)
-				$url = str_replace('$' . $key, addslashes($value), $url);
-		if ($xml->getElementsByTagName('target')->item(0))
-			$target = $xml->getElementsByTagName('target')->item(0)->nodeValue;
-
-		if (!$url)
-			$url = '#';
-
-		if (substr($url, 0, 1) == '#')
-			$target = '';
-		
-		if ($target == 'content' || $target == '_self')
-			$target = '';
-
-		return [$url, $target];
-	}
-
-	protected function convertMenu($items, $path, $path_prefix)
-	{
-		$menu = [];
-		$current_path = array_shift($path);
-		foreach ($items as $item)
-		{
-			$entry = [];
-			$entry['template_kurzbz'] = 'cis';
-			$entry['content_id'] = $item->content_id;
-			$entry['titel'] = $item->titel;
-
-			$slug = $this->createSlug($item->titel);
-
-			$entry['active'] = ($slug == $current_path);
-			$entry['menu_open'] = $entry['active'];
-			$entry['url'] = $path_prefix . '/' . $slug;
-			$entry['target'] = '';
-
-			$entry['childs'] = $this->convertMenu($item->childs, $path, $entry['url']);
-			
-			if ($entry['active'])
-				$entry['orig'] = $item;
-
-			// TODO(chris): rewrite external and hash urls
-			if ($item->template_kurzbz == 'redirect')
-			{
-				list ($url, $target) = $this->getRedirectUrlAndTarget($item->content);
-				
-				if (substr($url, 0, 1) == '#')
-				{
-					$entry['url'] = $url;
-				}
-				elseif ($target)
-				{
-					$entry['url'] = $url;
-					$entry['target'] = $target;
-				}
-				/*elseif (substr($url, 0, 7) != '../cis/' && substr($url, 0, 7) != '../cms/' && substr($url, 0, 10) != '../addons/' && substr($url, 0, 16) != '../index.ci.php/' && substr($url, 0, 1) != '?')
-				{
-					var_dump($entry['url']);
-				}*/
-			}
-
-			$menu[$slug] = $entry;
-		}
-		return $menu;
-	}
-
-	/**
-	 * Function used to create a slug associated to an "ugly" string.
-	 *
-	 * @param string $text the string to transform.
-	 *
-	 * @return string the resulting slug.
-	 */
-	protected function createSlug($text)
-	{
-		$table = [
-			'Š'=>'S', 'š'=>'s', 'Đ'=>'Dj', 'đ'=>'dj', 'Ž'=>'Z', 'ž'=>'z', 'Č'=>'C', 'č'=>'c', 'Ć'=>'C', 'ć'=>'c',
-			'À'=>'A', 'Á'=>'A', 'Â'=>'A', 'Ã'=>'A', 'Ä'=>'Ae', 'Å'=>'A', 'Æ'=>'A', 'Ç'=>'C', 'È'=>'E', 'É'=>'E',
-			'Ê'=>'E', 'Ë'=>'E', 'Ì'=>'I', 'Í'=>'I', 'Î'=>'I', 'Ï'=>'I', 'Ñ'=>'N', 'Ò'=>'O', 'Ó'=>'O', 'Ô'=>'O',
-			'Õ'=>'O', 'Ö'=>'Oe', 'Ø'=>'O', 'Ù'=>'U', 'Ú'=>'U', 'Û'=>'U', 'Ü'=>'Ue', 'Ý'=>'Y', 'Þ'=>'B', 'ß'=>'Ss',
-			'à'=>'a', 'á'=>'a', 'â'=>'a', 'ã'=>'a', 'ä'=>'ae', 'å'=>'a', 'æ'=>'a', 'ç'=>'c', 'è'=>'e', 'é'=>'e',
-			'ê'=>'e', 'ë'=>'e', 'ì'=>'i', 'í'=>'i', 'î'=>'i', 'ï'=>'i', 'ð'=>'o', 'ñ'=>'n', 'ò'=>'o', 'ó'=>'o',
-			'ô'=>'o', 'õ'=>'o', 'ö'=>'oe', 'ø'=>'o', 'ù'=>'u', 'ú'=>'u', 'û'=>'u', 'ü'=>'ue', /*'ý'=>'y', duplicate? => see quality check*/'ý'=>'y', 'þ'=>'b',
-			'ÿ'=>'y', 'Ŕ'=>'R', 'ŕ'=>'r', '/' => '-', ' ' => '-'
-		];
-		$text = preg_replace(['/\s{2,}/', '/[\t\n]/'], ' ', $text);
-		$text = preg_replace('~[^\pL\d]+~u', '-', $text);
-		$text = strtr($text, $table);
-		$text = preg_replace('~^[^a-z]~i', '', $text);
-		return strtolower($text);
-	}
-}
diff --git a/application/controllers/CisHmvc/Cms.php b/application/controllers/CisHmvc/Cms.php
deleted file mode 100644
index 06cdb53bc..000000000
--- a/application/controllers/CisHmvc/Cms.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-
-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
-
-/**
- *
- */
-class Cms extends Auth_Controller
-{
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct(
-			array(
-				'debug' => 'user:r',
-				'legacy' => 'user:r',
-				'content' => 'user:r',
-				'news' => 'user:r'
-			)
-		);
-
-		// Loads WidgetLib
-		$this->load->library('CmsLib');
-		#$this->load->library('WidgetLib');
-
-		// Loads phrases system
-		$this->loadPhrases([
-			'global'
-		]);
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * @param stdClass	$content
-	 *
-	 * @return void
-	 */
-	public function debug($content)
-	{
-		$msg = $content->template_kurzbz . ' not yet implemented';
-		if ($content->template_kurzbz == 'redirect') {
-			$msg .= '<pre class="card p-1 mt-3">' . htmlentities($content->content) . '</pre>';
-		}
-		$this->load->view('CisHmvc/Error', ['error' => $msg]);
-	}
-
-	/**
-	 * @param string	$url
-	 *
-	 * @return void
-	 */
-	public function legacy($url)
-	{
-		$this->load->view('CisHmvc/Cms/Legacy', ['url' => $url]);
-	}
-
-	/**
-	 * @param int		$content_id
-	 * @param int		$version
-	 * @param string	$sprache
-	 * @param boolean	$sichtbar
-	 *
-	 * @return void
-	 */
-	public function content($content_id, $version = null, $sprache = null, $sichtbar = true)
-	{
-		// return early if the content_id for the content is missing
-		if(!isset($content_id))
-			$this->terminateWithError("content_id is missing");
-
-		$content = $this->ContentModel->load($content_id);		
-		if (isError($content))
-			$this->terminateWithError(getError($content));	
-
-		$content = getData($content);
-		if(NULL === $content)
-			$this->terminateWithError("Content not found");
-
-		$content = current($content);
-
-		$this->load->view('CisVue/Cms/Content', ['content_id' => $content_id, 'template_kurzbz'=>$content->template_kurzbz , 'version' => $version, 'sprache' => $sprache, 'sichtbar' => $sichtbar]);
-	}
-
-	/**
-	 * @param boolean			$infoscreen
-	 * @param string | null		$studiengang_kz
-	 * @param int | null		$semester
-	 * @param boolean			$mischen
-	 * @param string			$titel
-	 * @param boolean			$edit
-	 * @param boolean			$sichtbar
-	 *
-	 * @return void
-	 */
-	/**
-	 * @param boolean			$infoscreen
-	 * @param string | null		$studiengang_kz
-	 * @param int | null		$semester
-	 * @param boolean			$mischen
-	 * @param string			$titel
-	 * @param boolean			$edit
-	 * @param boolean			$sichtbar
-	 *
-	 * @return void
-	 */
-	public function news($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
-	{
-		$this->load->view('CisHmvc/Cms/Content', ['infoscreen' => $infoscreen, 'studiengang_kz' => $studiengang_kz, 'semester' => $semester, 'mischen' => $mischen, 'titel' => $titel, 'edit' => $edit, 'sichtbar' => $sichtbar, "template_kurzbz"=>"news"]);
-	}
-}
diff --git a/application/controllers/CisHmvc/Dashboard.php b/application/controllers/CisHmvc/Dashboard.php
deleted file mode 100644
index 229fc7b85..000000000
--- a/application/controllers/CisHmvc/Dashboard.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- *
- */
-class Dashboard extends Auth_Controller
-{
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct(
-			array(
-				'index' => 'dashboard/benutzer:r'
-			)
-		);
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * @return void
-	 */
-	public function index()
-	{
-		$this->load->view('CisHmvc/Dashboard.php');
-	}
-}
diff --git a/application/libraries/CisHmvc/Loader.php b/application/libraries/CisHmvc/Loader.php
deleted file mode 100644
index 9bb93a7b2..000000000
--- a/application/libraries/CisHmvc/Loader.php
+++ /dev/null
@@ -1,420 +0,0 @@
-<?php
-defined('BASEPATH') || exit('No direct script access allowed');
-/**
- * Description of Cis4Loader
- *
- * @author chris
- */
-class Loader extends CI_Loader
-{
-
-	const OVERWRITE_PARAMS = [
-		'vue3' => true,
-		'bootstrap5' => true,
-		'bootstrap3' => false,
-		'fontawesome6' => true,
-		'fontawesome4' => false,
-		'axios027' => true,
-		'customJSModules' => [
-			'public/js/apps/Cis.js'
-		],
-		'customCSSs' => [
-			'public/css/Cis4/Cis.css'
-		]
-	];
-	protected $coreOptions = null;
-	protected $loader = null;
-
-	public function __construct($params)
-	{
-		$this->loader = $params[1];
-		$this->coreOptions = ['menu' => $params[0]];
-	}
-
-	/**
-	 * View Loader
-	 *
-	 * Loads "view" files.
-	 *
-	 * @param	string	$view	View name
-	 * @param	array	$vars	An associative array of data
-	 *				to be extracted for use in the view
-	 * @param	bool	$return	Whether to return the view output
-	 *				or leave it to the Output class
-	 * @return	object|string
-	 */
-	public function view($view, $vars = array(), $return = FALSE)
-	{
-		if ($view == 'templates/FHC-Header' || $view == 'templates/FHC-Footer')
-		{
-			$overwrittenParams = array_merge($vars, self::OVERWRITE_PARAMS);
-			foreach (['customJSModules', 'customCSSs'] as $key)
-				if (isset($vars[$key]))
-					$overwrittenParams[$key] = array_merge(self::OVERWRITE_PARAMS[$key], $vars[$key]);
-
-			if ($view == 'templates/FHC-Header')
-			{
-				$view1 = $view;
-				$param1 = $overwrittenParams;
-				$view2 = 'templates/CISHMVC-Header';
-				$param2 = $this->coreOptions;
-			}
-			else
-			{
-				$view1 = 'templates/CISHMVC-Footer';
-				$param1 = $this->coreOptions;
-				$view2 = $view;
-				$param2 = $overwrittenParams;
-			}
-
-			if ($return)
-				return $this->loader->view($view1, $param1, $return) . $this->loader->view($view2, $param2, $return);
-
-			$this->loader->view($view1, $param1, $return);
-			$this->loader->view($view2, $param2, $return);
-		}
-		else
-		{
-			return $this->loader->view($view, $vars, $return);
-		}
-	}
-	
-	/**
-	 * Initializer
-	 *
-	 * @todo	Figure out a way to move this to the constructor
-	 *		without breaking *package_path*() methods.
-	 * @uses	CI_Loader::_ci_autoloader()
-	 * @used-by	CI_Controller::__construct()
-	 * @return	void
-	 */
-	public function initialize()
-	{
-		$this->loader->initialize();
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Is Loaded
-	 *
-	 * A utility method to test if a class is in the self::$_ci_classes array.
-	 *
-	 * @used-by	Mainly used by Form Helper function _get_validation_object().
-	 *
-	 * @param 	string		$class	Class name to check for
-	 * @return 	string|bool	Class object name if loaded or FALSE
-	 */
-	public function is_loaded($class)
-	{
-		return $this->loader->is_loaded($class);
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Library Loader
-	 *
-	 * Loads and instantiates libraries.
-	 * Designed to be called from application controllers.
-	 *
-	 * @param	mixed	$library	Library name
-	 * @param	array	$params		Optional parameters to pass to the library class constructor
-	 * @param	string	$object_name	An optional object name to assign to
-	 * @return	object
-	 */
-	public function library($library, $params = NULL, $object_name = NULL)
-	{
-		$this->loader->library($library, $params, $object_name);
-		return $this;
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Model Loader
-	 *
-	 * Loads and instantiates models.
-	 *
-	 * @param	mixed	$model		Model name
-	 * @param	string	$name		An optional object name to assign to
-	 * @param	bool	$db_conn	An optional database connection configuration to initialize
-	 * @return	object
-	 */
-	public function model($model, $name = '', $db_conn = FALSE)
-	{
-		$this->loader->model($model, $name, $db_conn);
-		return $this;
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Database Loader
-	 *
-	 * @param	mixed	$params		Database configuration options
-	 * @param	bool	$return 	Whether to return the database object
-	 * @param	bool	$query_builder	Whether to enable Query Builder
-	 *					(overrides the configuration setting)
-	 *
-	 * @return	object|bool	Database object if $return is set to TRUE,
-	 *					FALSE on failure, CI_Loader instance in any other case
-	 */
-	public function database($params = '', $return = FALSE, $query_builder = NULL)
-	{
-		$res = $this->loader->database($params, $return, $query_builder);
-		return $res == $this->loader ? $this : $res;
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Load the Database Utilities Class
-	 *
-	 * @param	object	$db	Database object
-	 * @param	bool	$return	Whether to return the DB Utilities class object or not
-	 * @return	object
-	 */
-	public function dbutil($db = NULL, $return = FALSE)
-	{
-		$res = $this->loader->dbutil($db, $return);
-		return $res === $this->loader ? $this : $res;
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Load the Database Forge Class
-	 *
-	 * @param	object	$db	Database object
-	 * @param	bool	$return	Whether to return the DB Forge class object or not
-	 * @return	object
-	 */
-	public function dbforge($db = NULL, $return = FALSE)
-	{
-		$res = $this->loader->dbforge($db, $return);
-		return $res === $this->loader ? $this : $res;
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Generic File Loader
-	 *
-	 * @param	string	$path	File path
-	 * @param	bool	$return	Whether to return the file output
-	 * @return	object|string
-	 */
-	public function file($path, $return = FALSE)
-	{
-		$res = $this->loader->file($path, $return);
-		return $res === $this->loader ? $this : $res;
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Set Variables
-	 *
-	 * Once variables are set they become available within
-	 * the controller class and its "view" files.
-	 *
-	 * @param	array|object|string	$vars
-	 *					An associative array or object containing values
-	 *					to be set, or a value's name if string
-	 * @param 	string	$val	Value to set, only used if $vars is a string
-	 * @return	object
-	 */
-	public function vars($vars, $val = '')
-	{
-		$res = $this->loader->vars($vars, $val);
-		return $res === $this->loader ? $this : $res;
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Clear Cached Variables
-	 *
-	 * Clears the cached variables.
-	 *
-	 * @return	CI_Loader
-	 */
-	public function clear_vars()
-	{
-		$this->loader->clear_vars();
-		return $this;
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Get Variable
-	 *
-	 * Check if a variable is set and retrieve it.
-	 *
-	 * @param	string	$key	Variable name
-	 * @return	mixed	The variable or NULL if not found
-	 */
-	public function get_var($key)
-	{
-		return $this->loader->get_var($key);
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Get Variables
-	 *
-	 * Retrieves all loaded variables.
-	 *
-	 * @return	array
-	 */
-	public function get_vars()
-	{
-		return $this->loader->get_vars();
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Helper Loader
-	 *
-	 * @param	string|string[]	$helpers	Helper name(s)
-	 * @return	object
-	 */
-	public function helper($helpers = array())
-	{
-		$this->loader->helper($helpers);
-		return $this;
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Load Helpers
-	 *
-	 * An alias for the helper() method in case the developer has
-	 * written the plural form of it.
-	 *
-	 * @uses	CI_Loader::helper()
-	 * @param	string|string[]	$helpers	Helper name(s)
-	 * @return	object
-	 */
-	public function helpers($helpers = array())
-	{
-		return $this->helper($helpers);
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Language Loader
-	 *
-	 * Loads language files.
-	 *
-	 * @param	string|string[]	$files	List of language file names to load
-	 * @param	string		Language name
-	 * @return	object
-	 */
-	public function language($files, $lang = '')
-	{
-		$this->loader->language($files, $lang);
-		return $this;
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Config Loader
-	 *
-	 * Loads a config file (an alias for CI_Config::load()).
-	 *
-	 * @uses	CI_Config::load()
-	 * @param	string	$file			Configuration file name
-	 * @param	bool	$use_sections		Whether configuration values should be loaded into their own section
-	 * @param	bool	$fail_gracefully	Whether to just return FALSE or display an error message
-	 * @return	bool	TRUE if the file was loaded correctly or FALSE on failure
-	 */
-	public function config($file, $use_sections = FALSE, $fail_gracefully = FALSE)
-	{
-		return $this->loader->config($file, $use_sections, $fail_gracefully);
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Driver Loader
-	 *
-	 * Loads a driver library.
-	 *
-	 * @param	string|string[]	$library	Driver name(s)
-	 * @param	array		$params		Optional parameters to pass to the driver
-	 * @param	string		$object_name	An optional object name to assign to
-	 *
-	 * @return	object|bool	Object or FALSE on failure if $library is a string
-	 *				and $object_name is set. CI_Loader instance otherwise.
-	 */
-	public function driver($library, $params = NULL, $object_name = NULL)
-	{
-		$res = $this->loader->driver($library, $params, $object_name);
-		return $res === $this->loader ? $this : $res;
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Add Package Path
-	 *
-	 * Prepends a parent path to the library, model, helper and config
-	 * path arrays.
-	 *
-	 * @see	CI_Loader::$_ci_library_paths
-	 * @see	CI_Loader::$_ci_model_paths
-	 * @see CI_Loader::$_ci_helper_paths
-	 * @see CI_Config::$_config_paths
-	 *
-	 * @param	string	$path		Path to add
-	 * @param 	bool	$view_cascade	(default: TRUE)
-	 * @return	object
-	 */
-	public function add_package_path($path, $view_cascade = TRUE)
-	{
-		$this->loader->add_package_path($path, $view_cascade);
-		return $this;
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Get Package Paths
-	 *
-	 * Return a list of all package paths.
-	 *
-	 * @param	bool	$include_base	Whether to include BASEPATH (default: FALSE)
-	 * @return	array
-	 */
-	public function get_package_paths($include_base = FALSE)
-	{
-		return $this->loader->get_package_paths($include_base);
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Remove Package Path
-	 *
-	 * Remove a path from the library, model, helper and/or config
-	 * path arrays if it exists. If no path is provided, the most recently
-	 * added path will be removed removed.
-	 *
-	 * @param	string	$path	Path to remove
-	 * @return	object
-	 */
-	public function remove_package_path($path = '')
-	{
-		$this->remove_package_path($path);
-		return $this;
-	}
-
-}
diff --git a/application/views/CisHmvc/Cms/Content.php b/application/views/CisHmvc/Cms/Content.php
deleted file mode 100644
index c0aa69bec..000000000
--- a/application/views/CisHmvc/Cms/Content.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-$includesArray = array(
-	'customJSModules' => ['public/js/apps/Cis/Cms.js'],
-	'primevue3'=>true,
-	'customCSSs' => [
-		'public/css/Cis4/Cms.css',
-		#'skin/style.css.php'
-	]
-);
-if(isset($template_kurzbz)){
-	switch($template_kurzbz){
-		case 'raum_contentmittitel': 
-			$includesArray['tabulator5'] = true; 
-			break;
-	}
-}
-
-
-$this->load->view('templates/CISVUE-Header', $includesArray);
-?>
-
-
-<h2 ><?php echo isset($content_id)? "Content" : "News" ?></h2>
-<hr/>
-<div id="cms">
-<?php echo (isset($content_id) ? '<cms-content :content_id="'.$content_id.'" :version="'.$version.'" :sprache="'.$sprache.'" :sichtbar="'.$sichtbar.'" />' : '<cms-news/>'); ?>
-	
-</div>
-
-<?php $this->load->view('templates/CISVUE-Footer', $includesArray); ?>
-
diff --git a/application/views/CisHmvc/Cms/Legacy.php b/application/views/CisHmvc/Cms/Legacy.php
deleted file mode 100644
index 3013cded8..000000000
--- a/application/views/CisHmvc/Cms/Legacy.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-$includesArray = array(
-	'title' => 'FH-Complete',
-	'customCSSs' => [
-		'public/css/Cis4/Legacy.css'
-	]
-);
-
-$this->load->view('templates/FHC-Header', $includesArray);
-?>
-
-<script type="text/javascript">
-	function resizeIframe(obj) {
-		// NOTE(chris): this only works on sites on the same domain which is always the case in this template
-		obj.style.height = (obj.contentWindow.document.scrollingElement.scrollHeight) + 'px';
-		// TODO(chris): add trigger on window.resize
-	}
-</script>
-
-<iframe src="<?= base_url($url); ?>" onload="resizeIframe(this)"></iframe>
-
-<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
-
diff --git a/application/views/CisHmvc/Dashboard.php b/application/views/CisHmvc/Dashboard.php
deleted file mode 100644
index 6e044c548..000000000
--- a/application/views/CisHmvc/Dashboard.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-	$includesArray = array(
-		'title' => 'FH-Complete',
-		'tabulator5'=>true,
-		'customJSModules' => ['public/js/apps/Dashboard/Fhc.js'],
-		'customCSSs' => [
-			'public/css/components/dashboard.css'
-		],
-	);
-
-	$this->load->view('templates/CISVUE-Header', $includesArray);
-?>
-
-<div id="content">
-	<h2>Dashboard</h2>
-	<hr>
-	<fhc-dashboard dashboard="CIS"/>
-</div>
-
-<?php $this->load->view('templates/CISVUE-Footer', $includesArray); ?>
-
diff --git a/application/views/CisHmvc/Error.php b/application/views/CisHmvc/Error.php
deleted file mode 100644
index 7b6a6beb2..000000000
--- a/application/views/CisHmvc/Error.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-	$includesArray = array(
-		'title' => 'FH-Complete',
-		'bootstrap5' => true,
-		'fontawesome6' => true,
-	);
-
-	$this->load->view('templates/FHC-Header', $includesArray);
-?>
-
-	<div id="wrapper">
-		<div class="alert alert-primary" role="alert">
-			<?= $error; ?>
-		</div>
-	</div>
-
-<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
-
diff --git a/application/views/templates/CISHMVC-Footer.php b/application/views/templates/CISHMVC-Footer.php
deleted file mode 100644
index 0f4bf453e..000000000
--- a/application/views/templates/CISHMVC-Footer.php
+++ /dev/null
@@ -1 +0,0 @@
-</main>
diff --git a/application/views/templates/CISHMVC-Header.php b/application/views/templates/CISHMVC-Header.php
deleted file mode 100644
index f45fb47a4..000000000
--- a/application/views/templates/CISHMVC-Header.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-if (!isset($menu)) {
-	$menu = [];
-	if (property_exists($this->router, 'menu') && $this->router->menu && property_exists($this->router->menu, 'children')) {
-		$menu = $this->router->menu->children;
-	}
-}
-?>
-
-<script type="text/javascript">
-	if (window.self !== window.top)
-		document.body.classList.add("in-frame");
-</script>
-
-<header id="cis-header" class="navbar-dark">
-	<button id="nav-main-btn" class="navbar-toggler" type="button" data-bs-toggle="offcanvas" data-bs-target="#nav-main" aria-controls="nav-main" aria-expanded="false" aria-label="Toggle navigation">
-		<span class="navbar-toggler-icon"></span>
-	</button>
-
-	<a id="nav-logo" class="d-none d-md-block" href="<?= site_url(''); ?>">
-		<img src="<?= base_url('/public/images/logo-300x160.png'); ?>" alt="Logo">
-	</a>
-	<nav id="nav-main" class="offcanvas offcanvas-start bg-dark" tabindex="-1" aria-labelledby="nav-main-btn" data-bs-backdrop="false">
-		<?php if ($menu) { ?>
-			<div id="nav-main-toggle" class="position-static d-none d-lg-block bg-dark">
-				<button type="button" class="btn bg-dark text-light rounded-0 p-1 d-flex align-items-center" data-bs-toggle="collapse" data-bs-target="#nav-main-menu" aria-expanded="true" aria-controls="nav-main-menu">
-					<i class="fa fa-arrow-circle-left"></i>
-				</button>
-			</div>
-		<?php } ?>
-		<div class="offcanvas-body p-0">
-			<fhc-searchbar id="nav-search" class="fhc-searchbar w-100" :searchoptions="searchbaroptions" :searchfunction="searchfunction"></fhc-searchbar>
-			<button id="nav-user-btn" class="btn btn-link rounded-0" type="button" data-bs-toggle="collapse" data-bs-target="#nav-user-menu" aria-expanded="false" aria-controls="nav-user-menu">
-				<img src="<?= site_url('Cis/Pub/bild/person/' . getAuthPersonId()); ?>" class="avatar rounded-circle"/>
-			</button>
-			<ul id="nav-user-menu" class="collapse list-unstyled" aria-labelledby="nav-user-btn">
-				<li><a class="btn btn-level-2 rounded-0 d-block" href="#" id="menu-profil">Profil</a></li>
-				<li><a class="btn btn-level-2 rounded-0 d-block" href="#">Ampeln</a></li>
-				<li><hr class="dropdown-divider"></li>
-				<li><a class="btn btn-level-2 rounded-0 d-block" href="<?= site_url('Cis/Auth/logout'); ?>">Logout</a></li>
-			</ul>
-			<?php if ($menu) { ?>
-				<div id="nav-main-menu" class="collapse collapse-horizontal show">
-					<div>
-						<?php
-						foreach ($menu as $entry) {
-							$this->load->view('templates/CISHMVC-Menu/Entry', ['entry' => $entry, 'menu_id' => 'menu']);
-						}
-						?>
-					</div>
-				</div>
-			<?php } ?>
-		</div>
-	</nav>
-</header>
-
-<main id="cis-main" class="flex-grow-1 overflow-scroll p-4">
\ No newline at end of file
diff --git a/application/views/templates/CISHMVC-Menu/Entry.php b/application/views/templates/CISHMVC-Menu/Entry.php
deleted file mode 100644
index 4604d4267..000000000
--- a/application/views/templates/CISHMVC-Menu/Entry.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-if (is_array($entry) && isset($entry['content_id']))
-	$entry = (object)$entry;
-
-if (!isset($content_id))
-	$content_id = $entry->content_id;
-
-if (!isset($path))
-	$path = '';
-
-$menu_id .= '-' . $content_id;
-
-// TODO(chris): remove! DEBUG
-#$entry->menu_open = false;
-
-if (property_exists($entry, 'path')) {
-	$lang = getUserLanguage();
-	$link = $path . '/' . $entry->path[$lang];
-	$active = in_array($content_id, $this->router->breadcrumb);
-	$menu_open = $active ? true : (property_exists($entry, 'menu_open') ? $entry->menu_open : false);
-	$target = '';
-	$title = htmlspecialchars($entry->sprache[$lang]->titel);
-} else {
-	$link = $entry->url;
-	$active = false;
-	$menu_open = $entry->menu_open;
-	$target = $entry->target;
-	$title = htmlspecialchars($entry->titel);
-	$entry->children = $entry->childs;
-}
-
-?>
-<?php if ($entry->children) { ?>
-	<?php if (substr($link, 0, 1) == '#') { ?>
-		<a href="#<?= $menu_id; ?>" data-bs-toggle="collapse" aria-expanded="<?= $menu_open ? 'true' : 'false'; ?>" class="btn btn-default rounded-0 w-100 text-start dropdown-toggle btn-level-<?= substr_count($menu_id, '-'); ?><?= $menu_open ? '' : ' collapsed'; ?><?= $active ? ' active' : ''; ?>">
-			<span><?= $title; ?></span>
-		</a>
-	<?php } else { ?>
-		<div class="btn-group w-100">
-			<a<?= $link ? ' href="' . $link . '"' : ''; ?><?= $target ? ' target="' . $target . '"' : ''; ?> class="btn btn-default rounded-0 text-start btn-level-<?= substr_count($menu_id, '-'); ?><?= $active ? ' active' : ''; ?>">
-				<?= $title; ?>
-			</a>
-			<a href="#<?= $menu_id; ?>" data-bs-toggle="collapse" aria-expanded="<?= $menu_open ? 'true' : 'false'; ?>"class="btn btn-default rounded-0 dropdown-toggle dropdown-toggle-split flex-grow-0<?= $menu_open ? '' : ' collapsed'; ?><?= $active ? ' active' : ''; ?>" >
-				<span class="visually-hidden">Toggle Dropdown</span>
-			</a>
-		</div>
-	<?php } ?>
-	<ul id="<?= $menu_id; ?>" class="nav w-100 collapse<?= $menu_open ? ' show' : ''; ?>">
-		<?php foreach ($entry->children as $id => $child)
-			$this->load->view('templates/CISHMVC-Menu/Entry', ['content_id' => $id, 'entry' => $child, 'menu_id' => $menu_id, 'path' => $path]);
-		?>
-	</ul>
-<?php } else { ?>
-	<a<?= $link ? ' href="' . $link . '"' : ''; ?><?= $target ? ' target="' . $target . '"' : ''; ?> class="btn btn-default rounded-0 w-100 text-start btn-level-<?= substr_count($menu_id, '-'); ?><?= $active ? ' active' : ''; ?>">
-		<?= $title; ?>
-	</a>
-<?php } ?>

From 2b516d40c96b9b7ee7fc31ae94c5ad45ef6f8a2a Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 5 Nov 2024 17:46:42 +0100
Subject: [PATCH 1363/1461] remove controllers, views and libraries for CisHtml
 since not used

---
 application/config/routes.php                 |  1 -
 application/controllers/CisHtml/Cms.php       | 80 -------------------
 application/controllers/CisHtml/Dashboard.php | 33 --------
 application/views/Cis/ProfilUpdate.php        | 49 ++++++++++--
 application/views/CisHtml/Cms/Content.php     | 34 --------
 application/views/CisHtml/Dashboard.php       | 21 -----
 application/views/CisHtml/Error.php           | 18 -----
 .../views/templates/CISHTML-Footer.php        | 19 -----
 .../views/templates/CISHTML-Header.php        | 67 ----------------
 .../views/templates/CISHTML-Menu/Entry.php    | 47 -----------
 .../templates/CISHTML-Menu/EntryBase.php      | 39 ---------
 .../templates/CISHTML-Menu/EntryInclude.php   |  4 -
 12 files changed, 41 insertions(+), 371 deletions(-)
 delete mode 100644 application/controllers/CisHtml/Cms.php
 delete mode 100644 application/controllers/CisHtml/Dashboard.php
 delete mode 100644 application/views/CisHtml/Cms/Content.php
 delete mode 100644 application/views/CisHtml/Dashboard.php
 delete mode 100644 application/views/CisHtml/Error.php
 delete mode 100644 application/views/templates/CISHTML-Footer.php
 delete mode 100644 application/views/templates/CISHTML-Header.php
 delete mode 100644 application/views/templates/CISHTML-Menu/Entry.php
 delete mode 100644 application/views/templates/CISHTML-Menu/EntryBase.php
 delete mode 100644 application/views/templates/CISHTML-Menu/EntryInclude.php

diff --git a/application/config/routes.php b/application/config/routes.php
index f872dc145..bb3337b23 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -61,7 +61,6 @@ $route['api/v1/organisation/[O|o]rganisationseinheit/(:any)'] = 'api/v1/organisa
 $route['api/v1/ressource/[B|b]etriebsmittelperson/(:any)'] = 'api/v1/ressource/betriebsmittelperson2/$1';
 $route['api/v1/system/[S|s]prache/(:any)'] = 'api/v1/system/sprache2/$1';
 
-$route['CisHtml'] = 'CisHtml/dashboard';
 $route['CisVue'] = 'CisVue/dashboard';
 
 // load routes from extensions
diff --git a/application/controllers/CisHtml/Cms.php b/application/controllers/CisHtml/Cms.php
deleted file mode 100644
index c128ec81b..000000000
--- a/application/controllers/CisHtml/Cms.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-
-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
-
-/**
- *
- */
-class Cms extends Auth_Controller
-{
-	/**
-	 * Constructor
-	 */
-
-	public function __construct()
-	{
-		parent::__construct(
-		    array(
-			'content' => 'basis/cis:r',
-			'news' => 'basis/cis:r',
-		    )
-		);
-
-		// Loads Libraries
-		$this->load->library('CmsLib');
-
-		// Loads phrases system
-		$this->loadPhrases([
-			'global'
-		]);
-
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * @param int		$content_id
-	 * @param int		$version
-	 * @param string	$sprache
-	 * @param boolean	$sichtbar
-	 *
-	 * @return void
-	 */
-	public function content($content_id, $version = null, $sprache = null, $sichtbar = true)
-	{
-		// return early if the content_id for the content is missing
-		if(!isset($content_id))
-			$this->terminateWithError("content_id is missing");
-
-		$content = $this->ContentModel->load($content_id);		
-		if (isError($content))
-			$this->terminateWithError(getError($content));	
-
-		$content = getData($content);
-		if(NULL === $content)
-			$this->terminateWithError("Content not found");
-
-		$content = current($content);
-
-		$this->load->view('CisHtml/Cms/Content', ['content_id' => $content_id, 'template_kurzbz'=>$content->template_kurzbz , 'version' => $version, 'sprache' => $sprache, 'sichtbar' => $sichtbar]);
-	}
-
-	/**
-	 * @param boolean			$infoscreen
-	 * @param string | null		$studiengang_kz
-	 * @param int | null		$semester
-	 * @param boolean			$mischen
-	 * @param string			$titel
-	 * @param boolean			$edit
-	 * @param boolean			$sichtbar
-	 *
-	 * @return void
-	 */
-	public function news($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
-	{
-		$this->load->view('CisHtml/Cms/Content', ['infoscreen' => $infoscreen, 'studiengang_kz' => $studiengang_kz, 'semester' => $semester, 'mischen' => $mischen, 'titel' => $titel, 'edit' => $edit, 'sichtbar' => $sichtbar, "template_kurzbz"=>"news"]);
-	}
-
-}
diff --git a/application/controllers/CisHtml/Dashboard.php b/application/controllers/CisHtml/Dashboard.php
deleted file mode 100644
index bce24e9b8..000000000
--- a/application/controllers/CisHtml/Dashboard.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- *
- */
-class Dashboard extends Auth_Controller
-{
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct(
-			array(
-				'index' => 'dashboard/benutzer:r'
-			)
-		);
-
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * @return void
-	 */
-	public function index()
-	{	
-		$this->load->view('CisHtml/Dashboard.php');
-	}
-}
diff --git a/application/views/Cis/ProfilUpdate.php b/application/views/Cis/ProfilUpdate.php
index ff303b159..e797d436f 100644
--- a/application/views/Cis/ProfilUpdate.php
+++ b/application/views/Cis/ProfilUpdate.php
@@ -1,16 +1,49 @@
 <?php 
-$includesArray = ['title'=> 'Profil Änderungen',
-                  'customJSModules'=> ['public/js/apps/Cis/ProfilUpdateRequests.js'],
-                  'tabulator5'=> true,
-                  'customCSSs'=>['public/css/components/FilterComponent.css','public/css/components/FormUnderline.css'],
-                 ];
+$includesArray = array(
+    'title' => 'Profil Änderungen',
+    'vue3' => true,
+    'bootstrap5' => true,
+    'fontawesome6'=> true,
+    'axios027' => true,
+    'tabulator5' => true,
+    'customJSModules' => array(
+	'public/js/apps/Cis/ProfilUpdateRequests.js'
+    ),
+    'customCSSs' => array(
+	'public/css/components/FilterComponent.css','public/css/components/FormUnderline.css'
+    )
+);
 
-$this->load->view('templates/CISHTML-Header',$includesArray);
+if(defined("CIS4"))
+{
+	$this->load->view(
+		'templates/CISVUE-Header',
+		$includesArray
+	);
+}
+else
+{
+	$this->load->view(
+		'templates/FHC-Header',
+		$includesArray
+	);
+}
 ?>
 
-
 <div id="content">
 <profil-update-view id="<?php echo isset($profil_update_id)?$profil_update_id:null ?>"></profil-update-view>
 </div>
 
-<?php $this->load->view('templates/CISHTML-Footer',$includesArray); ?>
\ No newline at end of file
+<?php
+if (defined("CIS4")) {
+	$this->load->view(
+		'templates/CISVUE-Footer',
+		$includesArray
+	);
+} else {
+	$this->load->view(
+		'templates/FHC-Footer', 
+		$includesArray
+	);
+}
+?>
\ No newline at end of file
diff --git a/application/views/CisHtml/Cms/Content.php b/application/views/CisHtml/Cms/Content.php
deleted file mode 100644
index b22a212dc..000000000
--- a/application/views/CisHtml/Cms/Content.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-$includesArray = array(
-	'customJSModules' => ['public/js/apps/Cis/Cms.js'],
-	'primevue3'=>true,
-	'customCSSs' => [
-		'public/css/Cis4/Cms.css',
-		#'skin/style.css.php'
-	]
-);
-
-if(isset($template_kurzbz)){
-	switch($template_kurzbz){
-		case 'raum_contentmittitel': 
-			$includesArray['tabulator5'] = true; 
-			break;
-	}
-}
-
-$this->load->view('templates/CISHTML-Header', $includesArray);
-?>
-
-<?php if(!isset($content_id)) {
-	echo "
-	<h2>News</h2>
-	<hr/>";
-}?>
-
-<div id="cms">
-<?php echo (isset($content_id) ? '<cms-content :content_id="'.$content_id.'" :version="'.$version.'" :sprache="'.$sprache.'" :sichtbar="'.$sichtbar.'" />' : '<cms-news/>'); ?>
-	
-</div>
-
-<?php $this->load->view('templates/CISHTML-Footer', $includesArray); ?>
-
diff --git a/application/views/CisHtml/Dashboard.php b/application/views/CisHtml/Dashboard.php
deleted file mode 100644
index 1eddba454..000000000
--- a/application/views/CisHtml/Dashboard.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-$includesArray = array(
-	'title' => 'Dashboard',
-	'tabulator5'=>true,
-	'customJSModules' => ['public/js/apps/Dashboard/Fhc.js'],
-	'customCSSs' => [
-		'public/css/components/dashboard.css'
-	],
-);
-
-$this->load->view('templates/CISHTML-Header', $includesArray);
-?>
-
-<div id="content">
-	<h2>Dashboard</h2>
-	<hr>
-	<fhc-dashboard dashboard="CIS"/>
-</div>
-
-<?php $this->load->view('templates/CISHTML-Footer', $includesArray); ?>
-
diff --git a/application/views/CisHtml/Error.php b/application/views/CisHtml/Error.php
deleted file mode 100644
index 7b6a6beb2..000000000
--- a/application/views/CisHtml/Error.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-	$includesArray = array(
-		'title' => 'FH-Complete',
-		'bootstrap5' => true,
-		'fontawesome6' => true,
-	);
-
-	$this->load->view('templates/FHC-Header', $includesArray);
-?>
-
-	<div id="wrapper">
-		<div class="alert alert-primary" role="alert">
-			<?= $error; ?>
-		</div>
-	</div>
-
-<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
-
diff --git a/application/views/templates/CISHTML-Footer.php b/application/views/templates/CISHTML-Footer.php
deleted file mode 100644
index d7c1de24c..000000000
--- a/application/views/templates/CISHTML-Footer.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-$includesArray = array(
-	'title' => $title ?? 'FH-Complete',
-	'vue3' => true,
-	'bootstrap5' => true,
-	'fontawesome6' => true,
-	'axios027' => true,
-	'customJSModules' => array_merge([
-		'public/js/apps/Cis.js'
-	], $customJSModules ?? []),
-	'customCSSs' => array_merge([
-		'public/css/Cis4/Cis.css'
-	], $customCSSs ?? [])
-);
-?>
-
-</main>
-
-<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
diff --git a/application/views/templates/CISHTML-Header.php b/application/views/templates/CISHTML-Header.php
deleted file mode 100644
index 8e69c0366..000000000
--- a/application/views/templates/CISHTML-Header.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-$includesArray = array(
-	'title' => $title ?? 'FH-Complete',
-	'vue3' => true,
-	'bootstrap5' => true,
-	'fontawesome6' => true,
-	'axios027' => true,
-	'customJSModules' => array_merge([
-		'public/js/apps/Cis.js'
-	], $customJSModules ?? []),
-	'customCSSs' => array_merge([
-		'public/css/Cis4/Cis.css'
-	], $customCSSs ?? [])
-);
-
-$this->load->view('templates/FHC-Header', $includesArray);
-
-if (!isset($menu)) {
-	$ci =& get_instance(); // get CI instance
-	$ci->load->model('content/Content_model', 'ContentModel');
-	$result = $ci->ContentModel->getMenu(null, getAuthUID());
-	$menu = getData($result) ?? (object)['childs' => []];
-}
-?>
-
-<script type="text/javascript">
-	if (window.self !== window.top)
-		document.body.classList.add("in-frame");
-</script>
-<header id="cis-header" class="navbar-dark">
-	<button id="nav-main-btn" class="navbar-toggler" type="button" data-bs-toggle="offcanvas" data-bs-target="#nav-main" aria-controls="nav-main" aria-expanded="false" aria-label="Toggle navigation">
-		<span class="navbar-toggler-icon"></span>
-	</button>
-	<fhc-searchbar id="nav-search" class=" fhc-searchbar w-100" @updatesearchtypes="updatesearchtypes" :selectedtypes="selectedtypes" :searchoptions="searchbaroptions" :searchfunction="searchfunction"></fhc-searchbar>	
-	<a id="nav-logo" class="d-none d-md-block" href="<?= site_url(''); ?>">
-		<img src="<?= base_url('/public/images/logo-300x160.png'); ?>" alt="Logo">
-	</a>
-	<nav id="nav-main" class="offcanvas offcanvas-start bg-dark" tabindex="-1" aria-labelledby="nav-main-btn" data-bs-backdrop="false">
-	<ul id="nav-user-menu" class="collapse list-unstyled" aria-labelledby="nav-user-btn">
-					<li><a class="btn btn-level-2 rounded-0 d-block" href="<?= site_url('Cis/Profil'); ?>" id="menu-profil">Profil</a></li>
-					<li><a class="btn btn-level-2 rounded-0 d-block" href="#">Ampeln</a></li>
-					<li><hr class="dropdown-divider"></li>
-					<li><a class="btn btn-level-2 rounded-0 d-block" href="<?= site_url('Cis/Auth/logout'); ?>">Logout</a></li>
-	</ul>	
-	<div id="nav-main-sticky">
-			<div id="nav-main-toggle" class="position-static d-none d-lg-flex bg-dark">
-				<button type="button" class="btn bg-dark text-light rounded-0 p-1 d-flex align-items-center" data-bs-toggle="collapse" data-bs-target="#nav-main-menu" aria-expanded="true" aria-controls="nav-main-menu">
-					<i class="fa fa-arrow-circle-left"></i>
-				</button>
-			</div>
-			<div class="offcanvas-body p-0">
-				<button id="nav-user-btn" class="btn btn-link rounded-0" type="button" data-bs-toggle="collapse" data-bs-target="#nav-user-menu" aria-expanded="false" aria-controls="nav-user-menu">
-					<img src="<?= site_url('Cis/Pub/bild/person/' . getAuthPersonId()); ?>" class="avatar rounded-circle"/>
-				</button>
-				<div id="nav-main-menu" class="collapse collapse-horizontal show">
-					<div>
-					<?php foreach($menu->childs as $entry)
-						$this->load->view('templates/CISHTML-Menu/Entry', ['entry' => $entry, 'menu_id' => 'menu']);
-					?>
-					</div>
-				</div>
-			</div>
-		</div>
-	</nav>
-</header>
-
-<main id="cis-main" class="flex-grow-1 overflow-scroll">
\ No newline at end of file
diff --git a/application/views/templates/CISHTML-Menu/Entry.php b/application/views/templates/CISHTML-Menu/Entry.php
deleted file mode 100644
index 522d8008d..000000000
--- a/application/views/templates/CISHTML-Menu/Entry.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-if (is_array($entry) && isset($entry['content_id']))
-	$entry = (object)$entry;
-$menu_id .= '-' . $entry->content_id;
-
-switch ($entry->template_kurzbz) {
-	case 'redirect':
-		$url = '';
-		$target = '';
-		$xml = new DOMDocument();
-		if($entry->content != '')
-		{
-			$xml->loadXML($entry->content);
-			if ($xml->getElementsByTagName('url')->item(0))
-				$url = $xml->getElementsByTagName('url')->item(0)->nodeValue;
-			// TODO(chris): get params
-			if (isset($params) && is_array($params))
-				foreach ($params as $key => $value)
-					$url = str_replace('$' . $key, addslashes($value), $url);
-			if ($xml->getElementsByTagName('target')->item(0))
-				$target = $xml->getElementsByTagName('target')->item(0)->nodeValue;
-
-			if (strpos($url, '../cms/news.php') === 0)
-				$url = site_url('/CisHtml/Cms/news' . substr($url, 15));
-			if (strpos($url, '../index.ci.php') === 0)
-				$url = site_url() . str_replace("../index.ci.php","",$url);
-			if (strpos($url, '../') === 0)
-				$url = APP_ROOT . substr($url, 3);
-		}
-		if ($target == 'content')
-			$target = '';
-
-		$this->load->view('templates/CISHTML-Menu/EntryBase', ['entry' => $entry, 'menu_id' => $menu_id, 'link' => $url, 'target' => $target]);
-		break;
-	case 'include':
-		$this->load->view('templates/CISHTML-Menu/EntryInclude', ['entry' => $entry, 'menu_id' => $menu_id]);
-		break;
-	default:
-		$this->load->view('templates/CISHTML-Menu/EntryBase', [
-			'entry' => $entry,
-			'menu_id' => $menu_id,
-			'link' => site_url('/CisHtml/Cms/content/' . $entry->content_id),
-			'target' => ''
-		]);
-		break;
-}
-?>
diff --git a/application/views/templates/CISHTML-Menu/EntryBase.php b/application/views/templates/CISHTML-Menu/EntryBase.php
deleted file mode 100644
index de6dcaf95..000000000
--- a/application/views/templates/CISHTML-Menu/EntryBase.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php if ($entry->childs) { ?>
-	<?php if (substr($link, 0, 1) == '#') { ?>
-		<a 
-			href="#<?= $menu_id; ?>" 
-			data-bs-toggle="collapse" 
-			aria-expanded="<?= $entry->menu_open ? 'true' : 'false'; ?>" 
-			class="btn btn-default rounded-0 w-100 text-start dropdown-toggle btn-level-<?= substr_count($menu_id, '-'); ?><?= $entry->menu_open ? '' : ' collapsed'; ?>">
-			<span><?= htmlspecialchars($entry->titel); ?></span>
-		</a>
-	<?php } else { ?>
-		<div class="btn-group w-100">
-			<a 
-				class="btn btn-default rounded-0 text-start btn-level-<?= substr_count($menu_id, '-'); ?>"
-				<?= $link ? ' href="' . $link . '"' : ''; ?>
-				<?= $target ? ' target="' . $target . '"' : ''; ?>>
-				<?= htmlspecialchars($entry->titel); ?>
-			</a>
-			<a 
-				href="#<?= $menu_id; ?>" 
-				data-bs-toggle="collapse" 
-				aria-expanded="<?= $entry->menu_open ? 'true' : 'false'; ?>"
-				class="btn btn-default rounded-0 dropdown-toggle dropdown-toggle-split flex-grow-0<?= $entry->menu_open ? '' : ' collapsed'; ?>">
-				<span class="visually-hidden">Toggle Dropdown</span>
-			</a>
-		</div>
-	<?php } ?>
-	<ul id="<?= $menu_id; ?>" class="nav w-100 collapse<?= $entry->menu_open ? ' show' : ''; ?>">
-		<?php foreach ($entry->childs as $child)
-			$this->load->view('templates/CISHTML-Menu/Entry', ['entry' => $child, 'menu_id' => $menu_id]);
-		?>
-	</ul>
-<?php } else { ?>
-	<a 
-		class="btn btn-default rounded-0 w-100 text-start btn-level-<?= substr_count($menu_id, '-'); ?>"
-		<?= $link ? ' href="' . $link . '"' : ''; ?>
-		<?= $target ? ' target="' . $target . '"' : ''; ?>>
-		<?= htmlspecialchars($entry->titel); ?>
-	</a>
-<?php } ?>
diff --git a/application/views/templates/CISHTML-Menu/EntryInclude.php b/application/views/templates/CISHTML-Menu/EntryInclude.php
deleted file mode 100644
index 0fd9f7b16..000000000
--- a/application/views/templates/CISHTML-Menu/EntryInclude.php
+++ /dev/null
@@ -1,4 +0,0 @@
-
-<div>
-	INCLUDE
-</div>

From 4f2992fbe25e849fba4cbd27ec3b7969623cf31f Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 7 Nov 2024 10:21:39 +0100
Subject: [PATCH 1364/1461] fix(Cis profil menu): fixes the layout of the
 collapsible in the mobile view

---
 public/css/Cis4/Cis.css          | 8 +++-----
 public/js/components/Cis/Menu.js | 8 ++++----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index a91d64f19..2609b0091 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -322,8 +322,6 @@ html {
   }
   #nav-user-menu {
     position: absolute;
-    top: var(--fhc-cis-header-height);
-    right: 0;
     min-width: var(--fhc-cis-menu-width);
     background-color: var(--fhc-cis-menu-lvl-2-bg);
   }
@@ -385,7 +383,7 @@ html {
     position: relative;
   }
   #nav-user{
-
+	position: relative;
   }
   #nav-user-btn {
 
@@ -396,8 +394,8 @@ html {
     width: 2rem;
   }
   #nav-user-menu {
-    position: relative !important;
-    transform: none !important;
+    position: absolute;
+	background-color: var(--fhc-cis-menu-lvl-2-bg);
   }
   #nav-main-menu {
     display: block;
diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js
index 62305cd9a..d07c50e95 100644
--- a/public/js/components/Cis/Menu.js
+++ b/public/js/components/Cis/Menu.js
@@ -102,13 +102,13 @@ export default {
 		<button id="nav-user-btn" class="btn btn-link rounded-0" type="button" data-bs-toggle="collapse" data-bs-target="#nav-user-menu" aria-expanded="false" aria-controls="nav-user-menu">
 			<img :src="avatarUrl" class="avatar rounded-circle"/>
 		</button>
-		<ul ref="navUserDropdown" @[\`show.bs.collapse\`]="toggleCollapsibles('navUserDropdown')" id="nav-user-menu" class="collapse list-unstyled" aria-labelledby="nav-user-btn">
-			<li><a class="btn btn-level-2 rounded-0 d-block" :href="site_url + '/Cis/Profil'" id="menu-profil">Profil</a></li>
-			<li class="fhc-languages" style="text-align: center;">
+		<ul ref="navUserDropdown" @[\`show.bs.collapse\`]="toggleCollapsibles('navUserDropdown')" id="nav-user-menu" class="top-100 end-0 collapse list-unstyled" aria-labelledby="nav-user-btn">
+			<li class="btn-level-2"><a class="btn btn-level-2 rounded-0 d-block" :href="site_url + '/Cis/Profil'" id="menu-profil">Profil</a></li>
+			<li class="fhc-languages btn-level-2" style="text-align: center;">
 				<a class="btn btn-level-2 rounded-0" href="#" @click="handleChangeLanguage('German')">Deutsch</a>
 				<a class="btn btn-level-2 rounded-0" href="#" @click="handleChangeLanguage('English')">English</a>
 			</li>
-			<li><hr class="dropdown-divider"></li>
+			<li class="btn-level-2"><hr class="dropdown-divider p-0 "></li>
 			<li><a class="btn btn-level-2 rounded-0 d-block" :href="logoutUrl">Logout</a></li>
 		</ul>
 	</div>

From f68d18f0a8c9c8b0cd29bfddc9b01191037fc80b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Thu, 7 Nov 2024 10:25:42 +0100
Subject: [PATCH 1365/1461] Stundenplan Bugfix to also load Entries of Semester
 and Verband

---
 .../api/frontend/v1/Stundenplan.php           |  59 +++++----
 .../models/ressource/Stundenplan_model.php    | 115 +++++++++---------
 2 files changed, 89 insertions(+), 85 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 11e2e03e4..daef2ab1a 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -26,7 +26,7 @@ class Stundenplan extends FHCAPI_Controller
 	 */
 	public function __construct()
 	{
-	
+
 		parent::__construct([
 			'getRoomplan' => self::PERM_LOGGED,
             'Stunden' => self::PERM_LOGGED,
@@ -59,7 +59,7 @@ class Stundenplan extends FHCAPI_Controller
     /**
      * fetches Stunden layout from database
      * @access public
-     * 
+     *
      */
     public function Stunden()
 	{
@@ -75,7 +75,7 @@ class Stundenplan extends FHCAPI_Controller
     /**
      * fetches room events from a certain date
      * @access public
-     * 
+     *
      */
 	public function getRoomplan()
 	{
@@ -85,27 +85,27 @@ class Stundenplan extends FHCAPI_Controller
         $this->form_validation->set_rules('ort_kurzbz',"Ort","required");
         $this->form_validation->set_rules('start_date',"start_date","required");
         $this->form_validation->set_rules('end_date',"end_date","required");
-        if($this->form_validation->run() === FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array()); 
-        
+        if($this->form_validation->run() === FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
+
         // storing the get parameter in local variables
         $ort_kurzbz = $this->input->get('ort_kurzbz', TRUE);
         $start_date = $this->input->get('start_date', TRUE);
         $end_date = $this->input->get('end_date', TRUE);
 
-		$roomplan_data = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getRoomQuery($ort_kurzbz, $start_date, $end_date));  
-		
+		$roomplan_data = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getRoomQuery($ort_kurzbz, $start_date, $end_date));
+
         $roomplan_data = $this->getDataOrTerminateWithError($roomplan_data);
 
 		$this->expand_object_information($roomplan_data);
 
 		$this->terminateWithSuccess($roomplan_data);
-		
+
 	}
 
 	/**
 	 * fetches stundenplan events from a UID and start/end date
 	 * @access public
-	 * 
+	 *
 	 */
 	public function getStundenplan(){
 
@@ -123,7 +123,7 @@ class Stundenplan extends FHCAPI_Controller
 		// storing the get parameter in local variables
 		$start_date = $this->input->get('start_date', TRUE);
 		$end_date = $this->input->get('end_date', TRUE);
-		
+
 		$student_uid = getAuthUID();
 		// check if authUID is mitarbeiter
 		$this->load->model('ressource/Mitarbeiter_model','MitarbeiterModel');
@@ -145,7 +145,7 @@ class Stundenplan extends FHCAPI_Controller
 			$lvplan_load_ueber_semesterhaelfte = false;
 
 		$this->load->model('organisation/Studiensemester_model','StudiensemesterModel');
-		$aktuelle_studiensemester = $this->StudiensemesterModel->getAkt();
+		$aktuelle_studiensemester = $this->StudiensemesterModel->getNearest();
 		$aktuelle_studiensemester = $this->getDataOrTerminateWithError($aktuelle_studiensemester);
 		if (count($aktuelle_studiensemester) == 0) {
 			$this->terminateWithError("No aktuelles semester");
@@ -153,7 +153,7 @@ class Stundenplan extends FHCAPI_Controller
 		$aktuelle_studiensemester = current($aktuelle_studiensemester)->studiensemester_kurzbz;
 		if($lvplan_load_ueber_semesterhaelfte)
 		{
-			$next_studiensemester = $this->StudiensemesterModel->getNext();
+			$next_studiensemester = $this->StudiensemesterModel->getNextFrom($aktuelle_studiensemester);
 			$next_studiensemester = $this->getDataOrTerminateWithError($next_studiensemester);
 			if(count($next_studiensemester) == 0)
 			{
@@ -180,7 +180,7 @@ class Stundenplan extends FHCAPI_Controller
 		// getting the gruppen_kurzbz of the student in the different studiensemester
 		$this->load->model('person/Benutzergruppe_model','BenutzergruppeModel');
 		$benutzer_gruppen = null;
-		if ($lvplan_load_ueber_semesterhaelfte) 
+		if ($lvplan_load_ueber_semesterhaelfte)
 		{
 			$benutzer_gruppen = $this->BenutzergruppeModel->execReadOnlyQuery("
 			SELECT * FROM tbl_benutzergruppe where uid = ? AND studiensemester_kurzbz IN ?",[$student_uid, [$aktuelle_studiensemester, $next_studiensemester, $previous_studiensemester]]);
@@ -198,7 +198,7 @@ class Stundenplan extends FHCAPI_Controller
 		// getting the student_lehrverbaende of the student in the different studiensemester
 		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
 		$student_lehrverbaende = null;
-		if ($lvplan_load_ueber_semesterhaelfte) 
+		if ($lvplan_load_ueber_semesterhaelfte)
 		{
 			$student_lehrverbaende = $this->BenutzergruppeModel->execReadOnlyQuery("
 			SELECT * FROM tbl_studentlehrverband where student_uid = ? AND studiensemester_kurzbz IN ?", [$student_uid, [$aktuelle_studiensemester,$next_studiensemester, $previous_studiensemester]]);
@@ -214,8 +214,8 @@ class Stundenplan extends FHCAPI_Controller
 					return $result;
 				},
 				$student_lehrverbaende);
-		} 
-		else 
+		}
+		else
 		{
 			$student_lehrverbaende = $this->BenutzergruppeModel->execReadOnlyQuery("
 			SELECT * FROM tbl_studentlehrverband where student_uid = ? AND studiensemester_kurzbz IN ?", [$student_uid, [$aktuelle_studiensemester,$nearest_studiensemester]]);
@@ -233,11 +233,11 @@ class Stundenplan extends FHCAPI_Controller
 			);
 		}
 
-		$stundenplan_data = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getStundenplanQuery($start_date, $end_date, $benutzer_gruppen, $student_lehrverbaende)); 
+		$stundenplan_data = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getStundenplanQuery($start_date, $end_date, $benutzer_gruppen, $student_lehrverbaende));
 		$stundenplan_data = $this->getDataOrTerminateWithError($stundenplan_data) ?? [];
 
 		$this->expand_object_information($stundenplan_data);
-		
+
 		$this->terminateWithSuccess($stundenplan_data);
 	}
 
@@ -263,7 +263,7 @@ class Stundenplan extends FHCAPI_Controller
 		$this->expand_object_information($reservierungen);
 
 		$this->terminateWithSuccess($reservierungen);
-        
+
 	}
 
 	public function getLehreinheitStudiensemester($lehreinheit_id){
@@ -271,26 +271,26 @@ class Stundenplan extends FHCAPI_Controller
 		$this->LehreinheitModel->addSelect(["studiensemester_kurzbz"]);
 		$result = $this->LehreinheitModel->load($lehreinheit_id);
 		$result = current($this->getDataOrTerminateWithError($result))->studiensemester_kurzbz;
-		$this->terminateWithSuccess($result);	
+		$this->terminateWithSuccess($result);
 	}
 
 	private function expand_object_information($data){
-		
-		foreach ($data as $item) 
+
+		foreach ($data as $item)
 		{
 
 			$lektor_obj_array = array();
 			$gruppe_obj_array = array();
 
 			// load lektor object
-			foreach ($item->lektor as $lv_lektor) 
+			foreach ($item->lektor as $lv_lektor)
 			{
 				$this->StundenplanModel->addLimit(1);
 				$lektor_object = $this->StundenplanModel->execReadOnlyQuery("
-				SELECT mitarbeiter_uid, vorname, nachname, kurzbz 
-				FROM public.tbl_mitarbeiter 
+				SELECT mitarbeiter_uid, vorname, nachname, kurzbz
+				FROM public.tbl_mitarbeiter
 				JOIN public.tbl_benutzer benutzer ON benutzer.uid = mitarbeiter_uid
-				JOIN public.tbl_person person ON person.person_id = benutzer.person_id 
+				JOIN public.tbl_person person ON person.person_id = benutzer.person_id
 				WHERE kurzbz = ?", [$lv_lektor]);
 				if (isError($lektor_object)) {
 					$this->show_error(getError($lektor_object));
@@ -301,12 +301,12 @@ class Stundenplan extends FHCAPI_Controller
 					$this->terminateWithError("No lektor object");
 				}
 				$lektor_object = current($lektor_object);
-				// only provide needed information of the mitarbeiter object 
+				// only provide needed information of the mitarbeiter object
 				$lektor_obj_array[] = $lektor_object;
 			}
 
 			// load gruppe object
-			foreach ($item->gruppe as $lv_gruppe) 
+			foreach ($item->gruppe as $lv_gruppe)
 			{
 				$lv_gruppe = strtr($lv_gruppe, ['(' => '', ')' => '', '"' => '']);
 				$lv_gruppe_array = explode(",", $lv_gruppe);
@@ -328,7 +328,6 @@ class Stundenplan extends FHCAPI_Controller
 		}
 	}
 
-    
+
 
 }
-
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 77b1619dc..d8821ed43 100644
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -15,17 +15,17 @@ class Stundenplan_model extends DB_Model
 	/**
 	 * @param string $ort_kurzbz
 	 * @param string $date
-	 * 
+	 *
 	 * @return stdClass
 	 */
 	public function getRoomDataOnInterval($ort_kurzbz,$start_date,$end_date){
 
 
-	
+
 		/*$raum_stundenplan= $this->execReadOnlyQuery("
 		-- merging all reservierungs information with the stundenplan information but with different types
 		SELECT 'stundenplan_eintrag' as eintrags_type, CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) AS stg, CONCAT(lehrfach,'-',lehrform) AS lv_info, ort_kurzbz, studiengang_kz, uid, stunde, datum, titel, semester, verband, gruppe, gruppe_kurzbz, stg_kurzbz, * FROM lehre.vw_stundenplan sp
-		WHERE ort_kurzbz = ? AND datum >= ? AND datum <= ? 
+		WHERE ort_kurzbz = ? AND datum >= ? AND datum <= ?
 		UNION ALL
 		SELECT 'reservierungs_eintrag' as eintrags_type, NULL, NULL, ort_kurzbz, studiengang_kz, uid, stunde, datum, titel, semester, verband, gruppe, gruppe_kurzbz, stg_kurzbz, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL FROM lehre.vw_reservierung res
 		WHERE ort_kurzbz = ? AND datum >= ? AND datum <= ?
@@ -35,8 +35,8 @@ class Stundenplan_model extends DB_Model
 
 		$raum_stundenplan= $this->execReadOnlyQuery("
 		SELECT CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) AS stg, CONCAT(lehrfach,'-',lehrform) AS lv_info, * FROM lehre.vw_stundenplan sp
-		WHERE ort_kurzbz = ? AND datum >= ? AND datum <= ? 
-		", [$ort_kurzbz, $start_date, $end_date]); 
+		WHERE ort_kurzbz = ? AND datum >= ? AND datum <= ?
+		", [$ort_kurzbz, $start_date, $end_date]);
 
 		return $raum_stundenplan;
 	}
@@ -45,90 +45,90 @@ class Stundenplan_model extends DB_Model
 	 * @param string $ort_kurzbz The room to query the planning for
 	 * @param string $start_date The start date of the query interval
 	 * @param string $end_date The end date of the query interval
-	 * 
+	 *
 	 * @return stdClass
 	 */
 	public function groupedCalendarEvents($ort_kurzbz,$start_date,$end_date){
 
 
 		$gruppierteEvents= $this->execReadOnlyQuery("
-		SELECT 
-		
+		SELECT
+
 			'reservierung' as type,
 			NULL as unr,datum, stunde,
-			titel AS topic, 
+			titel AS topic,
 			beschreibung as beschreibung,
 			string_agg(DISTINCT gruppe, '/') as gruppe,
 			string_agg(DISTINCT lektor, '/') as lektor,
 			res.ort_kurzbz,res.studiengang_kz,  res.titel, res.beschreibung,NULL as lehreinheit_id,NULL as lehrfach_id,NULL as anmerkung, NULL as fix,NULL as lehrveranstaltung_id,NULL as stg_kurzbzlang,NULL as stg_bezeichnung,NULL as stg_typ, NULL as fachbereich_kurzbz,NULL as lehrfach,NULL as lehrfach_bez,NULL as farbe,NULL as lehrform, NULL as anmerkung_lehreinheit
-		
-		FROM 
-		
+
+		FROM
+
 		(
-			SELECT 
-			NULL as unr,datum, stunde, 
-			CASE 
-				WHEN gruppe_kurzbz IS NOT NULL THEN gruppe_kurzbz 
-				ELSE CONCAT(UPPER(studg.typ),UPPER(res.stg_kurzbz),'-',COALESCE(CAST(res.semester AS varchar),'/'),COALESCE(CAST(res.verband AS varchar),'/'))  
+			SELECT
+			NULL as unr,datum, stunde,
+			CASE
+				WHEN gruppe_kurzbz IS NOT NULL THEN gruppe_kurzbz
+				ELSE CONCAT(UPPER(studg.typ),UPPER(res.stg_kurzbz),'-',COALESCE(CAST(res.semester AS varchar),'/'),COALESCE(CAST(res.verband AS varchar),'/'))
 			END as gruppe,
 			CASE
 				WHEN mit.kurzbz IS NOT NULL THEN mit.kurzbz
 				ELSE uid
-			END as lektor, 
-			res.ort_kurzbz,res.studiengang_kz,  res.titel, res.beschreibung,NULL as lehreinheit_id,NULL as lehrfach_id,NULL as anmerkung, NULL as fix,NULL as lehrveranstaltung_id,NULL as stg_kurzbzlang,NULL as stg_bezeichnung,NULL as stg_typ, NULL as fachbereich_kurzbz,NULL as lehrfach,NULL as lehrfach_bez,NULL as farbe,NULL as lehrform, NULL as anmerkung_lehreinheit 
+			END as lektor,
+			res.ort_kurzbz,res.studiengang_kz,  res.titel, res.beschreibung,NULL as lehreinheit_id,NULL as lehrfach_id,NULL as anmerkung, NULL as fix,NULL as lehrveranstaltung_id,NULL as stg_kurzbzlang,NULL as stg_bezeichnung,NULL as stg_typ, NULL as fachbereich_kurzbz,NULL as lehrfach,NULL as lehrfach_bez,NULL as farbe,NULL as lehrform, NULL as anmerkung_lehreinheit
 			FROM lehre.vw_reservierung res
 
 			LEFT JOIN public.tbl_mitarbeiter mit ON mit.mitarbeiter_uid=uid
 			JOIN public.tbl_studiengang studg ON studg.studiengang_kz=res.studiengang_kz
 
-			WHERE 
-				res.ort_kurzbz = ? 
-				AND res.datum >= ? 
+			WHERE
+				res.ort_kurzbz = ?
+				AND res.datum >= ?
 				AND res.datum <= ?
 		) as res
-	
+
 		GROUP BY res.ort_kurzbz,res.studiengang_kz, res.datum, res.stunde, res.titel, res.beschreibung
 
 		UNION ALL
-		
-		SELECT 
-			
+
+		SELECT
+
 		'stundenplan' as type,
 		unr,datum, stunde,
 		CONCAT(lehrfach,'-',lehrform) as topic,
 		'' as beschreibung,
 		string_agg(DISTINCT gruppe, '/') as gruppe,
-		string_agg(DISTINCT lektor, '/') as lektor,  
-		ort_kurzbz, studiengang_kz, titel,'' as beschreibung,lehreinheit_id,lehrfach_id,anmerkung,fix,lehrveranstaltung_id,stg_kurzbzlang,stg_bezeichnung,stg_typ,fachbereich_kurzbz,lehrfach,lehrfach_bez,farbe,lehrform,anmerkung_lehreinheit 
+		string_agg(DISTINCT lektor, '/') as lektor,
+		ort_kurzbz, studiengang_kz, titel,'' as beschreibung,lehreinheit_id,lehrfach_id,anmerkung,fix,lehrveranstaltung_id,stg_kurzbzlang,stg_bezeichnung,stg_typ,fachbereich_kurzbz,lehrfach,lehrfach_bez,farbe,lehrform,anmerkung_lehreinheit
 
 		FROM
 		(
 			SELECT
  			unr,datum, stunde,
 			CASE
-				WHEN gruppe_kurzbz IS NOT NULL THEN gruppe_kurzbz 
-				ELSE CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) 
+				WHEN gruppe_kurzbz IS NOT NULL THEN gruppe_kurzbz
+				ELSE CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/'))
 			END as gruppe,
 			CASE
 				WHEN sp.mitarbeiter_kurzbz IS NOT NULL THEN sp.mitarbeiter_kurzbz
 				ELSE lektor
 			END as lektor,
-			ort_kurzbz, studiengang_kz, titel,'' as beschreibung,lehreinheit_id,lehrfach_id,anmerkung,fix,lehrveranstaltung_id,stg_kurzbzlang,stg_bezeichnung,stg_typ,fachbereich_kurzbz,lehrfach,lehrfach_bez,farbe,lehrform,anmerkung_lehreinheit 
+			ort_kurzbz, studiengang_kz, titel,'' as beschreibung,lehreinheit_id,lehrfach_id,anmerkung,fix,lehrveranstaltung_id,stg_kurzbzlang,stg_bezeichnung,stg_typ,fachbereich_kurzbz,lehrfach,lehrfach_bez,farbe,lehrform,anmerkung_lehreinheit
 
 			FROM lehre.vw_stundenplan sp
 
-			WHERE ort_kurzbz = ? 
-			AND datum >= ? 
+			WHERE ort_kurzbz = ?
+			AND datum >= ?
 			AND datum <= ?
 
 		) as sp
 
-		GROUP BY 
+		GROUP BY
 
 			ort_kurzbz,unr, datum, stunde, lehreinheit_id, lehrfach_id,studiengang_kz,titel,anmerkung,fix,lehrveranstaltung_id,stg_kurzbzlang,stg_bezeichnung,stg_typ,fachbereich_kurzbz,lehrfach,lehrfach_bez,farbe,lehrform,anmerkung_lehreinheit
 
 		ORDER BY datum, stunde
-		", [$ort_kurzbz, $start_date, $end_date, $ort_kurzbz, $start_date, $end_date]); 
+		", [$ort_kurzbz, $start_date, $end_date, $ort_kurzbz, $start_date, $end_date]);
 
 		return $gruppierteEvents;
 	}
@@ -137,20 +137,20 @@ class Stundenplan_model extends DB_Model
 	/**
 	 * function that takes a query that fetches lehre.vw_stundenplan rows and groups them so that they can be displayed in a calendar
 	 * @param string $stundenplanViewQuery the subquery used to group the result
-	 * 
+	 *
 	 * @return stdClass
 	 */
 	public function stundenplanGruppierung($stundenplanViewQuery)
 	{
 		$query_result = $this->execReadOnlyQuery("
-		SELECT 
-		'lehreinheit' as type, beginn, ende, datum,	
+		SELECT
+		'lehreinheit' as type, beginn, ende, datum,
 		CONCAT(lehrfach,'-',lehrform) as topic,
 		array_agg(DISTINCT lektor) as lektor,
 		array_agg(DISTINCT (gruppe,verband,semester,studiengang_kz,gruppen_kuerzel)) as gruppe,
 		string_agg(DISTINCT ort_kurzbz, '/') as ort_kurzbz,
 		array_agg(DISTINCT lehreinheit_id) as lehreinheit_id,
-		
+
 		titel, lehrfach, lehrform, lehrfach_bez, organisationseinheit, farbe, lehrveranstaltung_id
 
 		FROM
@@ -161,10 +161,10 @@ class Stundenplan_model extends DB_Model
 				ELSE lektor
 			END as lektor,
 			CASE
-				WHEN gruppe_kurzbz IS NOT NULL THEN gruppe_kurzbz 
-				ELSE CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) 
+				WHEN gruppe_kurzbz IS NOT NULL THEN gruppe_kurzbz
+				ELSE CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/'))
 			END as gruppen_kuerzel,
-			(SELECT bezeichnung 
+			(SELECT bezeichnung
 			FROM public.tbl_organisationseinheit
 			WHERE oe_kurzbz IN(
 				SELECT oe_kurzbz
@@ -175,7 +175,7 @@ class Stundenplan_model extends DB_Model
 
 			FROM (".$stundenplanViewQuery.") sp
 			JOIN lehre.tbl_stunde ON lehre.tbl_stunde.stunde = sp.stunde
-			
+
 		) as subquery
 
 		GROUP BY unr, datum, beginn, ende, ort_kurzbz, titel, lehrform, lehrfach, lehrfach_bez, organisationseinheit, farbe, lehrveranstaltung_id
@@ -189,16 +189,16 @@ class Stundenplan_model extends DB_Model
 	/**
 	 * NO STANDALONE FUNCTION - Generates a SQL query string to fetch 'stundenplan' events for a specific student within the current semester.
 	 * @param string $uid the user id that is used to fetch the stundenplan rows from the lehre.vw_stundenplan table
-	 * 
+	 *
 	 * @return string
 	 */
 	public function getStundenplanQuery($start_date, $end_date,$gruppen,$studentlehrverbaende){
 
-		$query =  
+		$query =
 		"select sp.*
 		from lehre.vw_stundenplan sp
 		WHERE
-		sp.datum >= ".$this->escape($start_date)." 
+		sp.datum >= ".$this->escape($start_date)."
 		AND sp.datum <= ".$this->escape($end_date);
 
 		if(count($gruppen) != 0 || count($studentlehrverbaende) != 0)
@@ -210,16 +210,21 @@ class Stundenplan_model extends DB_Model
 		{
 			$query .="sp.gruppe_kurzbz IN (".implode(',',$gruppen).")";
 		}
-		
+
 		foreach($studentlehrverbaende as $key=>$lehrverband){
 			// only append OR if not first entry or previous condition was added
 			if(($key == 0 && count($gruppen) != 0) || ($key > 0))
 			{
 				$query .= " OR ";
 			}
+			// Eintraege fuer die spezifische Gruppe
 			$query .= "(sp.studiengang_kz = ".$this->escape($lehrverband->studiengang_kz)." AND sp.semester = ".$this->escape($lehrverband->semester)." AND sp.verband = ".$this->escape($lehrverband->verband)." AND sp.gruppe = ".$this->escape($lehrverband->gruppe).")";
+			// Eintraege fuer den ganzen Verband
+			$query .= "OR (sp.studiengang_kz = ".$this->escape($lehrverband->studiengang_kz)." AND sp.semester = ".$this->escape($lehrverband->semester)." AND sp.verband = ".$this->escape($lehrverband->verband)." AND (sp.gruppe is null OR sp.gruppe=''))";
+			// Eintraege fuer das ganze Semester
+			$query .= "OR (sp.studiengang_kz = ".$this->escape($lehrverband->studiengang_kz)." AND sp.semester = ".$this->escape($lehrverband->semester)." AND (sp.verband is null OR sp.verband='')) AND gruppe_kurzbz is null";
 		}
-		
+
 		if(count($gruppen) != 0 || count($studentlehrverbaende) != 0)
 		{
 			$query .= ")";
@@ -230,10 +235,10 @@ class Stundenplan_model extends DB_Model
 
 	/**
 	 * NO STANDALONE FUNCTION - Generates a SQL query string to fetch 'stundenplan' events for a specific room within a date range.
-	 * @param string $ort_kurzbz the ort from which we want to query the stundenplan events 
+	 * @param string $ort_kurzbz the ort from which we want to query the stundenplan events
 	 * @param string $start_date (inclusive) the minimum date that an event should have to be fetched
 	 * @param string $end_date (inclusive) the maximum date that an event should not extend to be fetched
-	 * 
+	 *
 	 * @return string
 	 */
 	public function getRoomQuery($ort_kurzbz, $start_date, $end_date)
@@ -241,14 +246,14 @@ class Stundenplan_model extends DB_Model
 		return
 			"select sp.*
 			FROM lehre.vw_stundenplan sp
-			WHERE ort_kurzbz = ".$this->escape($ort_kurzbz)." 
-			AND datum >= ".$this->escape($start_date)." 
+			WHERE ort_kurzbz = ".$this->escape($ort_kurzbz)."
+			AND datum >= ".$this->escape($start_date)."
 			AND datum <= ".$this->escape($end_date);
 	}
 
 	/**
 	 * @param string $uid
-	 * 
+	 *
 	 * @return stdClass
 	 */
 	public function loadForUid($uid)
@@ -261,10 +266,10 @@ class Stundenplan_model extends DB_Model
 		$this->db->join('lehre.tbl_lehreinheit le', 'le.lehreinheit_id=sp.lehreinheit_id', 'LEFT');
 		$this->db->or_where('ss1.studiensemester_kurzbz IS NOT NULL', null, false);
 		$this->db->or_where('ss2.studiensemester_kurzbz IS NOT NULL', null, false);
-		
+
 		$query = $this->db->get_compiled_select('lehre.vw_stundenplan sp');
 
 		return $this->execQuery($query, [$uid, $uid]);
 	}
 
-}
\ No newline at end of file
+}

From b65d17e7ae35c9465e44b5cae23e37442f097648 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 7 Nov 2024 13:14:40 +0100
Subject: [PATCH 1366/1461] refactor(LvModal): uses the right format for the
 date and adds padding to date numbers which are single digits

---
 public/js/components/Cis/Mylv/LvModal.js | 25 ++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/public/js/components/Cis/Mylv/LvModal.js b/public/js/components/Cis/Mylv/LvModal.js
index 809e8a57d..573472910 100644
--- a/public/js/components/Cis/Mylv/LvModal.js
+++ b/public/js/components/Cis/Mylv/LvModal.js
@@ -47,11 +47,28 @@ export default {
 			if (!this.event.end instanceof Date) {
 				return this.event.end;
 			}
-			return this.event.end.getHours() + ":" + this.event.end.getMinutes();
+			return this.event.end.getHours() + ":" + 
+			// returns the string '00' if the function getMinutes returns 0
+			(this.event.end.getMinutes() || typeof this.event.end.getMinutes() === 'number' && this.event.end.getMinutes().toString() + '0');
 		}
 	},
 	methods:{
-		onModalShow: function(){
+		add_padding_to_date_number: function(number)
+		{
+			return number.toString().length == 1 ? '0' + number.toString() : number.toString();
+		},
+		format_date: function(d)
+		{
+			let date = new Date(d);
+			// if the date is an invalid string then creating a date from the string will fail and N/A is returned
+			if (isNaN(date.valueOf()))
+			{
+				return 'N/A';
+			}
+			return `${this.add_padding_to_date_number(date.getDate())}.${this.add_padding_to_date_number(date.getMonth() + 1)}.${this.add_padding_to_date_number(date.getFullYear())}`;
+		},
+		onModalShow: function()
+		{
 			if (this.event.type == 'lehreinheit') {
 				this.$fhcApi.factory.stundenplan.getLehreinheitStudiensemester(this.event.lehreinheit_id[0]).then(
 					res=>res.data
@@ -80,7 +97,7 @@ export default {
 			<template v-else>{{ event.lehrfach_bez + ' [' + event.ort_kurzbz+']'}}</template>
 		</template>
 		<template v-slot:default>
-			
+
 				<h3>{{$p.t('lvinfo','lehrveranstaltungsinformationen')}}</h3>
 				<table class="table table-hover mb-4">
 					<tbody>
@@ -90,7 +107,7 @@ export default {
 								$p.t('global','datum')+':'
 								:''
 							}}</th>
-							<td>{{event.datum}}</td>
+							<td>{{format_date(event.datum)}}</td>
 						</tr>
 						<tr>
 							<th>{{

From da70c77a2b3e1580b8a19b342785fafdc45d72f8 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 7 Nov 2024 14:42:04 +0100
Subject: [PATCH 1367/1461] feature(DateHelpers.js): creates a js helper file
 to create, handle and manipulate js dates

---
 public/js/components/Cis/Mylv/LvModal.js | 23 ++++-----
 public/js/helpers/DateHelpers.js         | 61 ++++++++++++++++++++++++
 2 files changed, 69 insertions(+), 15 deletions(-)
 create mode 100644 public/js/helpers/DateHelpers.js

diff --git a/public/js/components/Cis/Mylv/LvModal.js b/public/js/components/Cis/Mylv/LvModal.js
index 573472910..84eedbf92 100644
--- a/public/js/components/Cis/Mylv/LvModal.js
+++ b/public/js/components/Cis/Mylv/LvModal.js
@@ -1,6 +1,7 @@
 import BsModal from "../../Bootstrap/Modal.js";
 import Alert from "../../Bootstrap/Alert.js";
 import LvMenu from "./LvMenu.js"
+import { numberPadding,formatDate } from "../../../helpers/DateHelpers.js"
 
 export default {
 	components: {
@@ -40,32 +41,24 @@ export default {
 			if (!this.event.start instanceof Date){
 				return this.event.start;
 			}
-			return this.event.start.getHours() + ":" + this.event.start.getMinutes();
+			return numberPadding(this.event.start.getHours()) + ":" + numberPadding(this.event.start.getMinutes());
 		},
 		end_time: function(){
 			if (!this.event.end) return 'N/A';
 			if (!this.event.end instanceof Date) {
 				return this.event.end;
 			}
-			return this.event.end.getHours() + ":" + 
-			// returns the string '00' if the function getMinutes returns 0
-			(this.event.end.getMinutes() || typeof this.event.end.getMinutes() === 'number' && this.event.end.getMinutes().toString() + '0');
+			return numberPadding(this.event.end.getHours()) + ":" + numberPadding(this.event.end.getMinutes());
 		}
 	},
 	methods:{
-		add_padding_to_date_number: function(number)
+		mehtodNumberPadding: function(number)
 		{
-			return number.toString().length == 1 ? '0' + number.toString() : number.toString();
+			return numberPadding(number);
 		},
-		format_date: function(d)
+		methodFormatDate: function(d)
 		{
-			let date = new Date(d);
-			// if the date is an invalid string then creating a date from the string will fail and N/A is returned
-			if (isNaN(date.valueOf()))
-			{
-				return 'N/A';
-			}
-			return `${this.add_padding_to_date_number(date.getDate())}.${this.add_padding_to_date_number(date.getMonth() + 1)}.${this.add_padding_to_date_number(date.getFullYear())}`;
+			return formatDate(d);
 		},
 		onModalShow: function()
 		{
@@ -107,7 +100,7 @@ export default {
 								$p.t('global','datum')+':'
 								:''
 							}}</th>
-							<td>{{format_date(event.datum)}}</td>
+							<td>{{methodFormatDate(event.datum)}}</td>
 						</tr>
 						<tr>
 							<th>{{
diff --git a/public/js/helpers/DateHelpers.js b/public/js/helpers/DateHelpers.js
new file mode 100644
index 000000000..9f0dc7dec
--- /dev/null
+++ b/public/js/helpers/DateHelpers.js
@@ -0,0 +1,61 @@
+
+// HELPER FILE -- that contains multiple functions which create, handle and manipulate js dates
+
+// custom Error class for DateHelpers.js misuse
+class DateHelperError extends Error {
+	constructor(message) {
+		super(message);
+		this.name = "DateHelperError";
+	}
+}
+
+/**
+ * adds padding to a number 
+ *
+ * @param {number|string} number - the number on which padding should be added.
+ * @returns {string} number with padding.
+ */
+export function numberPadding(number) {
+	if(typeof number !== "string" && typeof number !== "number")
+	{
+		throw new TypeError("function numberPadding in file DateHelpers.js is only usable with strings or numbers");
+	}
+	if(number.toString().length > 2) 
+	{
+		throw new DateHelperError("The number on which the padding should be added should not be longer than to 2 characters, please refere to the function numberPadding in the helper file DateHelpers.js");
+	}
+	return number.toString().length == 1 ? '0' + number.toString() : number.toString();
+}
+
+/**
+ * formats date to dd.mm.yyyy
+ *
+ * @param {string|Date} d - the date that should be formatted.
+ * @returns {string} formatted date string.
+ */
+export function formatDate(d) {
+	// parameter is of type Date
+	if(d instanceof Date)
+	{
+		if (isNaN(date.valueOf())) {
+			return 'N/A';
+		}
+		// if the date is an invalid string then creating a date from the string will fail and N/A is returned
+		return `${numberPadding(d.getDate())}.${numberPadding(d.getMonth() + 1)}.${d.getFullYear()}`;
+	}
+	// parameter is of type string
+	else if (typeof d === "string")
+	{
+		let date = new Date(d);
+		// if the date is an invalid string then creating a date from the string will fail and N/A is returned
+		if (isNaN(date.valueOf())) {
+			return 'N/A';
+		}
+		return `${numberPadding(date.getDate())}.${numberPadding(date.getMonth() + 1)}.${date.getFullYear()}`;
+	}
+	// parameter is not of type string or Date and an exception is thrown
+	else
+	{
+		throw new TypeError("The parameter provided for this function is not a string or a Date object, please refere to the function formatDate in the DateHelpers.js file");
+	}
+}

From f4176b86ee9beb39da3cbb4d1b0576a86576ec69 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 7 Nov 2024 14:43:52 +0100
Subject: [PATCH 1368/1461] refactor(js helpers): moves ObjectUtils from
 composables to the js helpers folder and changes its import statements

---
 public/js/components/Dashboard/Admin/Presets.js   | 2 +-
 public/js/components/Dashboard/Dashboard.js       | 2 +-
 public/js/{composables => helpers}/ObjectUtils.js | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename public/js/{composables => helpers}/ObjectUtils.js (100%)

diff --git a/public/js/components/Dashboard/Admin/Presets.js b/public/js/components/Dashboard/Admin/Presets.js
index 8b7e7d8b9..fa8f65970 100644
--- a/public/js/components/Dashboard/Admin/Presets.js
+++ b/public/js/components/Dashboard/Admin/Presets.js
@@ -1,6 +1,6 @@
 import DashboardSection from "../Section.js";
 import DashboardWidgetPicker from "../Widget/Picker.js";
-import ObjectUtils from "../../../composables/ObjectUtils.js";
+import ObjectUtils from "../../../helpers/ObjectUtils.js";
 
 export default {
 	components: {
diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js
index bc7199af0..3a3f3626a 100644
--- a/public/js/components/Dashboard/Dashboard.js
+++ b/public/js/components/Dashboard/Dashboard.js
@@ -1,6 +1,6 @@
 import DashboardSection from "./Section.js";
 import DashboardWidgetPicker from "./Widget/Picker.js";
-import ObjectUtils from "../../composables/ObjectUtils.js";
+import ObjectUtils from "../../helpers/ObjectUtils.js";
 
 export default {
 	components: {
diff --git a/public/js/composables/ObjectUtils.js b/public/js/helpers/ObjectUtils.js
similarity index 100%
rename from public/js/composables/ObjectUtils.js
rename to public/js/helpers/ObjectUtils.js

From 1691c75a84e90ec061b552b3b862504f4dda7a23 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 7 Nov 2024 19:18:08 +0100
Subject: [PATCH 1369/1461] replace dependencies on legacy code with ci model
 functions

---
 .../controllers/api/frontend/v1/LvMenu.php    | 566 +++++-------------
 application/libraries/PermissionLib.php       |  27 +
 .../models/accounting/Vertrag_model.php       |  85 +++
 .../models/education/Lehreinheit_model.php    |  88 +++
 .../education/Lehrveranstaltung_model.php     |  43 ++
 .../models/education/Lvangebot_model.php      |  35 ++
 .../models/person/Benutzergruppe_model.php    |  21 +
 .../models/ressource/Lehretools_model.php     |  62 ++
 application/models/system/Variable_model.php  |   9 +
 9 files changed, 524 insertions(+), 412 deletions(-)
 create mode 100644 application/models/ressource/Lehretools_model.php

diff --git a/application/controllers/api/frontend/v1/LvMenu.php b/application/controllers/api/frontend/v1/LvMenu.php
index f9a8d0568..45741b567 100644
--- a/application/controllers/api/frontend/v1/LvMenu.php
+++ b/application/controllers/api/frontend/v1/LvMenu.php
@@ -39,6 +39,18 @@ class LvMenu extends FHCAPI_Controller
 			'getLvMenu' => self::PERM_LOGGED
 		]);
 
+		$this->load->model("ressource/Mitarbeiter_model");
+		$this->load->model("education/Lehreinheit_model");
+		$this->load->model("education/Lehrveranstaltung_model");
+		$this->load->model("organisation/Studiengang_model");
+		$this->load->model("accounting/Vertrag_model");
+		$this->load->model("system/Variable_model");
+		$this->load->model("person/Benutzergruppe_model");
+		$this->load->model("education/Lvangebot_model");
+		$this->load->model("ressource/Lehretools_model");
+
+		$this->load->library("PermissionLib", null, 'PermissionLib');
+
 		$this->load->library("PhrasesLib");
 		$this->loadPhrases(array('global'));
 	}
@@ -58,57 +70,36 @@ class LvMenu extends FHCAPI_Controller
 
 		// FH-Core Variables 
 		// ##########################################################################################
-
-		require_once(FHCPATH.'config/cis.config.inc.php');
-		require_once(FHCPATH.'include/lehrveranstaltung.class.php');
-		require_once(FHCPATH.'include/studiensemester.class.php');
-		require_once(FHCPATH.'include/lehreinheit.class.php');
-		require_once(FHCPATH.'include/vertrag.class.php');
-		require_once(FHCPATH.'include/functions.inc.php');
-		require_once(FHCPATH.'include/benutzerberechtigung.class.php');
-		require_once(FHCPATH.'include/studiengang.class.php');
 		require_once(FHCPATH.'include/phrasen.class.php');
-		require_once(FHCPATH.'include/lvangebot.class.php');
-		require_once(FHCPATH.'include/lehre_tools.class.php');
-		// data gets not returned
-		//require_once(FHCPATH.'addons/moodle/lib/LogicCourses.php');
-		//require_once(FHCPATH.'addons/moodle/lib/Database.php');
 
 		// get the sprache
-		$sprache = getSprache();
+		$sprache = getUserLanguage();
 		$p = new phrasen($sprache);
 		//$p = $this->$p;
 
-		// get the db
-		if (!$db = new basis_db())
-		die($p->t('global/fehlerBeimOeffnenDerDatenbankverbindung'));
-
 		// get the user
 		if (!$user=getAuthUID())
-			die($p->t('global/nichtAngemeldet'));
+		    $this->terminateWithError($p->t('global/nichtAngemeldet'));
 
 		// check if is_lector
-		if(check_lektor($user))
-			$is_lector=true;
-		else
-			$is_lector=false;
+		$is_lector = false;
+		$mares = $this->Mitarbeiter_model->isMitarbeiter($user);
+		if(hasData($mares))
+		{
+		    $is_lector = getData($mares);
+		}
 
 		// definition of user_is_allowed_to_upload
 		$user_is_allowed_to_upload=false;
-
-		// rechte des users
-		$rechte = new benutzerberechtigung();
-		$rechte->getBerechtigungen($user);
-
 		$angezeigtes_stsem = $studiensemester_kurzbz;
 
-		// load lehreinheit
-		$lehreinheit = new lehreinheit($lvid);
-
 		// load lehrveranstaltung
-		$lv_obj = new lehrveranstaltung();
-		$lv_obj->load($lvid);
-		$lv=$lv_obj;
+		$lvres = $this->Lehrveranstaltung_model->load($lvid);
+		if(!hasData($lvres)) 
+		{
+		    $this->terminateWithError('LV ' . $lvid . ' not found.');
+		}
+		$lv = (getData($lvres))[0];
 
 		// define studiengang_kz / semester / lehrverzeichnis
 		$studiengang_kz = $lv->studiengang_kz;
@@ -116,31 +107,28 @@ class LvMenu extends FHCAPI_Controller
 		$short = $lv->lehreverzeichnis;
 
 		// load studiengang
-		$stg_obj = new studiengang();
-		$stg_obj->load($lv->studiengang_kz);
-		$kurzbz = $stg_obj->kuerzel;
+		$stgres = $this->Studiengang_model->load($lv->studiengang_kz);
+		if(!hasData($stgres))
+		{
+		    $this->terminateWithError('Stg ' . $lv->studiengang_kz . ' nof found.');
+		}
+		$stg = (getData($stgres))[0];
+		$kurzbz = strtoupper($stg->typ . $stg->kurzbz);
 
 		$short_name = $lv->bezeichnung;
 		$short_short_name = $lv->lehreverzeichnis;
 
-		// create documents directory
-		$dir_name=DOC_ROOT.'/documents';
-		if(!is_dir($dir_name))
-		{
-			exec('mkdir -m 755 '.escapeshellarg($dir_name));
-			exec('sudo chown www-data:teacher '.escapeshellarg($dir_name));
-		}
-
 		// angemeldet
 		$angemeldet = true;
 		if(defined('CIS_LEHRVERANSTALTUNG_WENNANGEMELDET_DETAILS_ANZEIGEN') && CIS_LEHRVERANSTALTUNG_WENNANGEMELDET_DETAILS_ANZEIGEN && !$is_lector)
 		{
 			$angemeldet = false;
 
-			$lehrveranstaltung_obj = new lehrveranstaltung();
-			$result = $lehrveranstaltung_obj->getLehreinheitenOfLv($lvid, $user, $angezeigtes_stsem);
+			$lesres = $this->Lehreinheit_model->getLehreinheitenForStudentAndStudienSemester(
+			    $lvid, $user, $angezeigtes_stsem
+			);
 
-			if(count($result)>0)
+			if(hasData($lesres) && count(getData($lesres)) > 0)
 				$angemeldet = true;
 		}
 
@@ -153,72 +141,66 @@ class LvMenu extends FHCAPI_Controller
 			// wird zusätzlich das Lehrfach der Lehreinheit angezeigt.
 			if($is_lector )
 			{
-				$result = $lehreinheit->lehrfach_id_mitarbeiter($angezeigtes_stsem,$user,$lvid);
+				$result = $this->Lehreinheit_model->getLehrfachIdMitarbeiter($angezeigtes_stsem,$user,$lvid);
 			}
 			else
 			{
-				$result = $lehreinheit->lehrfach_id_studierender($angezeigtes_stsem,$user,$lvid);
-				
+				$result = $this->Lehreinheit_model->getLehrfachIdStudierender($angezeigtes_stsem,$user,$lvid);
 			}
 
 			// Wenn die LV mehrere verschiedenen Lehrfaecher hat, und der User zu mehreren davon zugeteilt ist
 			// wird das Lehrfach nicht angezeigt damit es nicht zu verwirrungen kommt.
-			if(count($result)==1 && $row = $result[0])
-			{   
-				$lehrfach_id=$row->lehrfach_id;
+			if( ($lehrfaecher = getData($result)) && count($lehrfaecher)==1 && ($lehrfach = $lehrfaecher[0]))
+			{
+				$lehrfach_id=$lehrfach->lehrfach_id;
 			}
 		}
 
 		// lektor der lv
 		$lektor_der_lv=false;
-		
-		$db_result = $lehreinheit->lehreinheitInfo($lvid,$angezeigtes_stsem,$lehrfach_id);
 
-		$num_rows_result = count($db_result);
+		$leinfores = $this->Lehreinheit_model->getLehreinheitInfo($lvid,$angezeigtes_stsem,$lehrfach_id);
+		$db_result = hasData($leinfores) ? getData($leinfores) : array();
 
-		if($num_rows_result > 0)
+		foreach($db_result as $row_lector)
 		{
-			
-			foreach($db_result as $row_lector)
+
+			// Lektor wird erst angezeigt wenn der Auftrag erteilt wurde
+			if (defined('CIS_LV_LEKTORINNENZUTEILUNG_VERTRAGSPRUEFUNG_VON')
+				&& CIS_LV_LEKTORINNENZUTEILUNG_VERTRAGSPRUEFUNG_VON != '')
 			{
-				
-				// Lektor wird erst angezeigt wenn der Auftrag erteilt wurde
-				if (defined('CIS_LV_LEKTORINNENZUTEILUNG_VERTRAGSPRUEFUNG_VON')
-					&& CIS_LV_LEKTORINNENZUTEILUNG_VERTRAGSPRUEFUNG_VON != '')
+				if (!$this->Vertrag_model->isVertragErteiltLV($lvid, $angezeigtes_stsem, $row_lector->uid))
 				{
-					$vertrag = new vertrag();
-					if (!$vertrag->isVertragErteiltLV($lvid, $angezeigtes_stsem, $row_lector->uid))
-					{
-						continue;
-					}
+					continue;
 				}
-
-			
-				if($user==$row_lector->uid)
-				{
-					$lektor_der_lv=true;
-					$user_is_allowed_to_upload=true;
-				}
-
-				// style of the link
-				if($row_lector->lvleiter=='t')
-					$style='style="font-weight: bold"';
-				else
-					$style='';
-
 			}
+
+
+			if($user == $row_lector->uid)
+			{
+				$lektor_der_lv=true;
+				$user_is_allowed_to_upload=true;
+			}
+
+			// style of the link
+			if($row_lector->lvleiter === true)
+				$style='style="font-weight: bold"';
+			else
+				$style='';
+
 		}
 
 		//Berechtigungen auf Fachbereichsebene
 		$lehrfach_oe_kurzbz_arr = array();
-		if($result = $lv_obj->getBerechtigungenAufFachberechsebene($lvid,$angezeigtes_stsem))
+		$fbres = $this->Lehrveranstaltung_model->getBerechtigungenAufFachberechsebene($lvid, $angezeigtes_stsem);
+		$fbs = (hasData($fbres)) ? getData($fbres) : array();
+		foreach($fbs as $row)
 		{
-			foreach($result as $row)
+			$lehrfach_oe_kurzbz_arr[] = $row->oe_kurzbz;
+			if($this->PermissionLib->isBerechtigt('lehre', null, $row->oe_kurzbz) 
+			    || $this->PermissionLib->isBerechtigt('assistenz', null, $stg->oe_kurzbz))
 			{
-				$lehrfach_oe_kurzbz_arr[]=$row->oe_kurzbz;
-				if($rechte->isBerechtigt('lehre',$row->oe_kurzbz) || $rechte->isBerechtigt('assistenz',$stg_obj->oe_kurzbz)){
-					$user_is_allowed_to_upload=true;
-				}
+				$user_is_allowed_to_upload=true;
 			}
 		}
 
@@ -230,21 +212,21 @@ class LvMenu extends FHCAPI_Controller
 		//todo: digitale anwesenheiten sollte ein Events.php im config/ folder beinhalten
 		//$this->fhc_menu_digitale_anwesenheiten($menu, $angemeldet, $studiengang_kz, $semester, $lvid, $angezeigtes_stsem, $p);
 
-		$this->fhc_menu_lvinfo($menu, $lvid, $studiengang_kz, $lektor_der_lv, $is_lector, $rechte, $lehrfach_oe_kurzbz_arr, $p);
+		$this->fhc_menu_lvinfo($menu, $lvid, $studiengang_kz, $lektor_der_lv, $is_lector, $lehrfach_oe_kurzbz_arr, $p);
 		
 		$this->fhc_menu_feedback($menu, $angemeldet, $lvid, $p);
 		
-		$this->fhc_menu_gesamtnote($menu, $angemeldet, $lvid, $lv_obj, $is_lector, $angezeigtes_stsem, $p);
+		$this->fhc_menu_gesamtnote($menu, $angemeldet, $lvid, $lv, $is_lector, $angezeigtes_stsem, $p);
 		
-		$this->fhc_menu_emailStudierende($menu, $angemeldet, $lehreinheit->lehreinheit_id, $p);
+		$this->fhc_menu_emailStudierende($menu, $user, $angemeldet, $lvid, $angezeigtes_stsem, $p);
 		
 		$this->fhc_menu_abmeldung($menu, $user, $is_lector, $lvid, $angezeigtes_stsem, $p);
 		
 		$this->fhc_menu_lehretools($menu, $lvid, $angezeigtes_stsem, $sprache);
 		
-		$this->fhc_menu_anrechnungStudent($menu, $rechte, $lvid, $angezeigtes_stsem, $p);
+		$this->fhc_menu_anrechnungStudent($menu, $lvid, $angezeigtes_stsem, $p);
 		
-		$this->fhc_menu_anrechnungLector($menu, $rechte, $angezeigtes_stsem, $p);
+		$this->fhc_menu_anrechnungLector($menu, $angezeigtes_stsem, $p);
 		
 		// LEGACY FH-CORE MENU POINTS
 		//$this->fhc_menu_notenliste($menu, $angemeldet, $is_lector, $lvid, $studiengang_kz, $angezeigtes_stsem, $kurzbz, $semester, $short_short_name, $p);
@@ -256,29 +238,29 @@ class LvMenu extends FHCAPI_Controller
 
 		// Addons Menu Logic
 		// ##########################################################################################		
-        
+
 		$params = [
 			'sprache'=>$sprache,
 			'p'=>$p,
 			'ci_p'=> $this->p,
-			'db'=>$db,
+			//'db'=>$db,
 			'user'=>$user,
 			'is_lector'=>$is_lector,
 			'user_is_allowed_to_upload'=>$user_is_allowed_to_upload,
-			'rechte'=>$rechte,
+			//'rechte'=>$rechte,
 			'angezeigtes_stsem'=>$angezeigtes_stsem,
-			'lehreinheit'=>$lehreinheit,
-			'lv_obj'=>$lv_obj,
+			//'lehreinheit'=>$lehreinheit,
+			'lv_obj'=>$lv,
 			'lv'=>$lv,
 			'lvid'=>$lvid,
 			'studiengang_kz'=>$studiengang_kz,
 			'semester'=>$semester,
 			'short'=>$short,
-			'stg_obj'=>$stg_obj,
+			'stg_obj'=>$stg,
 			'kurzbz'=>$kurzbz,
 			'short_name'=>$short_name,
 			'short_short_name'=>$short_short_name,
-			'dir_name'=>$dir_name,
+			//'dir_name'=>$dir_name,
 			'angemeldet'=>$angemeldet,
 			'lehrfach_id'=>$lehrfach_id,
 			'lektor_der_lv'=>$lektor_der_lv,
@@ -311,10 +293,6 @@ class LvMenu extends FHCAPI_Controller
 
 		array_multisort($pos, SORT_ASC, SORT_NUMERIC, $menu);
 
-		// DEBUGGING
-		$this->addMeta("is_lector",$is_lector);
-		$this->addMeta("lektor_der_lv",$lektor_der_lv);
-
 		// HTTP response
 		// ##########################################################################################
 		
@@ -340,7 +318,7 @@ class LvMenu extends FHCAPI_Controller
 		}
 	}
 
-	private function fhc_menu_lvinfo(&$menu, $lvid, $studiengang_kz, $lektor_der_lv, $is_lector, $rechte, $lehrfach_oe_kurzbz_arr, $p){
+	private function fhc_menu_lvinfo(&$menu, $lvid, $studiengang_kz, $lektor_der_lv, $is_lector, $lehrfach_oe_kurzbz_arr, $p){
 		
 		// LVINFO
 		if(!defined('CIS_LEHRVERANSTALTUNG_LVINFO_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_LVINFO_ANZEIGEN)
@@ -351,8 +329,8 @@ class LvMenu extends FHCAPI_Controller
 			// Oder Berechtigung zum Bearbeiten eingetragen ist
 			if((!defined('CIS_LEHRVERANSTALTUNG_LVINFO_LEKTOR_EDIT') && $lektor_der_lv)
 			|| (defined('CIS_LEHRVERANSTALTUNG_LVINFO_LEKTOR_EDIT') && CIS_LEHRVERANSTALTUNG_LVINFO_LEKTOR_EDIT==true && $lektor_der_lv)
-			|| $rechte->isBerechtigt('lehre/lvinfo',$studiengang_kz)
-			|| $rechte->isBerechtigtMultipleOe('lehre/lvinfo', $lehrfach_oe_kurzbz_arr)
+			|| $this->PermissionLib->isBerechtigt('lehre/lvinfo',$studiengang_kz)
+			|| $this->PermissionLib->isBerechtigtMultipleOe('lehre/lvinfo', $lehrfach_oe_kurzbz_arr)
 			)
 			{
 				$c4_linkList[]= [$p->t('lehre/lvInfoBearbeiten'), 'ects/index.php?lvid='.$lvid];
@@ -424,43 +402,62 @@ class LvMenu extends FHCAPI_Controller
 
 	
 
-	private function fhc_menu_emailStudierende(&$menu, $angemeldet, $lehreinheit_id,$p){
+	private function fhc_menu_emailStudierende(&$menu, $user, $angemeldet, $lvid, $angezeigtes_stsem, $p){
 		// Email an Studierende
 		if((!defined('CIS_LEHRVERANSTALTUNG_MAILSTUDIERENDE_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_MAILSTUDIERENDE_ANZEIGEN) && $angemeldet)
 		{
 			$mailto='mailto:';
 			$c4_linkList=array();
 			
-			// load the Lehreinheit model and get the student mails
-			$this->load->model('education/Lehreinheit_model','LehreinheitModel');
-			$studentMails = $this->LehreinheitModel->getStudentenMail($lehreinheit_id);
+			$studentMailsRes = $this->Lehrveranstaltung_model->getStudentEMail($lvid, $angezeigtes_stsem);
 			
 			// get the data of the database result and map the array of objects to their object property
-			$studentMails = $this->getDataOrTerminateWithError($studentMails, 'No student mails found');
+			$studentMails = $this->getDataOrTerminateWithError($studentMailsRes, 'No student mails found');
 			
-			// emails used to create the mailto link
-			$mailtoMails = array();
-			$noMails = array();
-			$noMailLink = FALSE;
 
-			foreach($studentMails as $mail){
-				
-				if($mail->mail == 'nomail'){
-					$noMails[]=$mail->gruppe_kurzbz;
-					$noMailLink= TRUE;
-				}else{
-					$mailtoMails[]=$mail->mail;
+			$nomail='';
+			$variablesres = $this->Variable_model->getVariables($user);
+			$variables = (hasData($variablesres)) ? getData($variablesres) : array();
+
+			foreach ($studentMails as $row)
+			{
+				if($row->gruppe_kurzbz != '')
+				{
+					$bngrp_uids = $this->Benutzergrupp_model->getUids($row->gruppe_kurzbz, $angezeigtes_stsem);
+					if(count($bngrp_uids) > 0)
+					{
+						if(!$row->mailgrp)
+						{
+							$nomail = $row->gruppe_kurzbz . ' ';
+						}
+						else
+						{
+							$mailto .= mb_strtolower($row->gruppe_kurzbz . '@' 
+								. DOMAIN . $variables['emailadressentrennzeichen']);
+						}
+					}
+				}
+				else
+				{
+					$mailto .= mb_strtolower($row->stg_typ . $row->stg_kurzbz 
+						. $row->semester . trim($row->verband) . trim($row->gruppe) 
+						. '@' . DOMAIN . $variables['emailadressentrennzeichen']);
 				}
 			}
 
-			if($noMailLink){
-				$c4_linkList[]=[$p->t('lehre/keinMailverteiler',array(implode(" ",$noMails))), '#'];
-				$link_onclick='alert(\''.$p->t('lehre/keinMailverteiler',array(implode(" ",$noMails))).'\');';
-			}else{
-				$link_onclick='';
+			if($nomail != '') 
+			{
+				$c4_linkList[] = array(
+					$p->t('lehre/keinMailverteiler', array($nomail)), 
+					'#'
+				);
+				$link_onclick = 'alert(\''.$p->t('lehre/keinMailverteiler', array($nomail)) . '\');';
+			}
+			else
+			{
+				$link_onclick = '';
 			}
 			
-			$mailto .= implode(',',$mailtoMails);
 			
 			$menu[]=array
 			(
@@ -483,9 +480,8 @@ class LvMenu extends FHCAPI_Controller
 		{
 			if(!$is_lector)
 			{
-				$lvangebot = new lvangebot();
-				$gruppen = $lvangebot->AbmeldungMoeglich($lvid, $angezeigtes_stsem, $user);
-				if(count($gruppen)>0)
+				$gruppen = $this->Lvangebot_model->AbmeldungMoeglich($lvid, $angezeigtes_stsem, $user);
+				if(count($gruppen) > 0)
 				{
 					$menu[]=array
 					(
@@ -503,304 +499,50 @@ class LvMenu extends FHCAPI_Controller
 
 	private function fhc_menu_lehretools(&$menu, $lvid, $angezeigtes_stsem, $sprache){
 		//Anzeigen von zusaetzlichen Lehre-Tools
-		$lehretools = new lehre_tools();
-		if($lehretools->getTools($lvid, $angezeigtes_stsem))
+		$lehretools = $this->Lehretools_model->getTools($lvid, $angezeigtes_stsem, $sprache);
+		foreach($lehretools as $row)
 		{
-			if(count($lehretools->result)>0)
-			{
-				foreach($lehretools->result as $row)
-				{
-					$menu[]=array
-					(
-						'id'=>'core_menu_lehretools_'.$row->lehre_tools_id,
-						'position'=>'1000',
-						'name'=>$row->bezeichnung[$sprache],
-						'c4_icon'=>base_url('cms/dms.php?id='.$row->logo_dms_id),
-						'c4_link'=>$row->basis_url,
-					);
-				}
-			}
+			$menu[] = array(
+				'id' => 'core_menu_lehretools_' . $row->lehre_tools_id,
+				'position' => '1000',
+				'name' => $row->bezeichnung,
+				'c4_icon' => base_url('cms/dms.php?id='.$row->logo_dms_id),
+				'c4_link' => $row->basis_url,
+			);
 		}
 	}
 
-	private function fhc_menu_anrechnungStudent(&$menu, $rechte, $lvid, $angezeigtes_stsem, $p){
+    private function fhc_menu_anrechnungStudent(&$menu, $lvid, $angezeigtes_stsem, $p){
 		// Anerkennung nachgewiesener Kenntnisse (Anrechnung) - Anzeige fuer Studenten
 		if((!defined('CIS_LEHRVERANSTALTUNG_ANRECHNUNG_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_ANRECHNUNG_ANZEIGEN)
-        && $rechte->isBerechtigt('student/anrechnung_beantragen'))
+			&& $this->PermissionLib->isBerechtigt('student/anrechnung_beantragen'))
 		{
 			$menu[]=array
 			(
-				'id'=>'core_menu_anerkennungNachgewiesenerKenntnisse',
-				'position'=>'128',
-				'name'=>$p->t('lehre/anrechnung'),
-				'c4_icon'=>base_url('skin/images/button_listen.png'),
+				'id' => 'core_menu_anerkennungNachgewiesenerKenntnisse',
+				'position' => '128',
+				'name' => $p->t('lehre/anrechnung'),
+				'c4_icon' => base_url('skin/images/button_listen.png'),
 				'c4_icon2' => 'fa-regular fa-folder-open',
 				'c4_link' => base_url('cis.php/lehre/anrechnung/RequestAnrechnung?studiensemester='.urlencode($angezeigtes_stsem).'&lv_id='.urlencode($lvid))
 			);
 		}
-	}
+    }
 
-	private function fhc_menu_anrechnungLector(&$menu, $rechte, $angezeigtes_stsem, $p){
+    private function fhc_menu_anrechnungLector(&$menu, $angezeigtes_stsem, $p){
 		// Anerkennung nachgewiesener Kenntnisse (Anrechnung) - Anzeige fuer LektorInnen
 		if((!defined('CIS_LEHRVERANSTALTUNG_ANRECHNUNG_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_ANRECHNUNG_ANZEIGEN)
-		&& $rechte->isBerechtigt('lehre/anrechnung_empfehlen'))
+			&& $this->PermissionLib->isBerechtigt('lehre/anrechnung_empfehlen'))
 		{
-		$menu[]=array
-		(
-			'id'=>'core_menu_anerkennungNachgewiesenerKenntnisse_empfehlen',
-			'position'=>'128',
-			'name'=>$p->t('lehre/anrechnungen'),
-			'c4_icon'=> base_url('skin/images/button_listen.png'),
-			'c4_icon2' => 'fa-regular fa-folder-open',
-			'c4_link' => base_url('cis.php/lehre/anrechnung/ReviewAnrechnungUebersicht?studiensemester='.urlencode($angezeigtes_stsem))
-		);
-		}
-	}
-
-// OLD PINBOARD MENU POINT *********************************************************************************************************************************************
-/*
-private function  fhc_menu_pinboard(&$menu, $angemeldet, $is_lector, $studiengang_kz, $semester, $p){
-		// Pinboard
-		if((!defined('CIS_LEHRVERANSTALTUNG_PINBOARD_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_PINBOARD_ANZEIGEN) && $angemeldet)
-		{
-			$text='';
-			if($is_lector)
-				$text.= "<a href='../../../cms/newsverwaltung.php?studiengang_kz=$studiengang_kz&semester=$semester' class='Item'>".$p->t('profil/adminstration')."</a>";
-			
-			// this is the new cis4 version
 			$menu[]=array
 			(
-				'id'=>'core_menu_pinboard',
-				'position'=>'110',
-				'name'=>$p->t('lehre/pinboard'),
-				'c4_icon'=>base_url('skin/images/button_pinboard.png'),
-				'c4_link'=>base_url('CisVue/Cms/news'),
-				'text'=>$text
-			);
-
-			
-		}
-	}
-*/
-
-// LEGACY MENU POINTS THAT USED OWN DIRECTORIES *************************************************************************************************************************
-/* 	
-	private function fhc_menu_semesterplan(&$menu, $angemeldet, $user_is_allowed_to_upload, $rechte, $lvid, $studiengang_kz, $kurzbz, $semester, $short_short_name, $p){
-		
-		// Semesterplan
-		if((!defined('CIS_LEHRVERANSTALTUNG_SEMESTERPLAN_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_SEMESTERPLAN_ANZEIGEN) && $angemeldet)
-		{
-			$dir_name = $this->ensureDirectoryExists($kurzbz, $semester, $short_short_name, 'semesterplan','teacher');
-			
-			$dir_empty = $this->isDirectoryEmpty($dir_name);
-
-			if($dir_empty == false)
-			{
-				$link = $dir_name.'/';
-			}
-			else
-				$link = '';
-
-			$text='';
-			if((!defined('CIS_LEHRVERANSTALTUNG_SEMESTERPLAN_LEKTOR_EDIT') && $user_is_allowed_to_upload)
-			|| (defined('CIS_LEHRVERANSTALTUNG_SEMESTERPLAN_LEKTOR_EDIT') && CIS_LEHRVERANSTALTUNG_SEMESTERPLAN_LEKTOR_EDIT==true && $user_is_allowed_to_upload)
-			|| $rechte->isBerechtigt('admin',$studiengang_kz) || $rechte->isBerechtigt('lehre',$studiengang_kz))
-			{
-				$text.= '<a class="Item" href="#" onClick="javascript:window.open(\'semupload.php?lvid='.$lvid.'\',\'_blank\',\'width=400,height=300,location=no,menubar=no,status=no,toolbar=no\');return false;">';
-				$text.= $p->t('lehre/semesterplanUpload')."</a>";
-
-				$text.= '&nbsp;&nbsp;&nbsp;<a class="Item" href="semdownhlp.php" >';
-				$text.= $p->t('lehre/semesterplanVorlage');
-				$text.= ' [html]';
-				$text.= '</a>';
-				$text.= '&nbsp;<a class="Item" href="semdownhlp.php?format=doc" >';
-				$text.= '[doc]';
-				$text.= '</a>';
-				$text.= '&nbsp;<a href="#" onClick="showSemPlanHelp()";>('.$p->t('lehre/semesterplanVorlageHilfe').')</a>';
-			}
-
-			$menu[]=array
-			(
-				'id'=>'core_menu_semesterplan',
-				'position'=>'20',
-				'name'=>$p->t('lehre/semesterplan'),
-				'icon'=>'../../../skin/images/button_semplan.png',
-				'link'=>$link,
-				'c4_icon'=> base_url('skin/images/button_semplan.png'),
-				'c4_link'=> $link,
-				'link_target'=>'_blank',
-				'text'=>$text
-			);
-		}
-	} 
-	
-	private function fhc_menu_stundenupload(&$menu, $angemeldet, $lvid, $is_lector, $studiengang_kz, $kurzbz, $semester, $short, $short_short_name, $p){
-		// Studentenupload
-		if((!defined('CIS_LEHRVERANSTALTUNG_STUDENTENUPLOAD_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_STUDENTENUPLOAD_ANZEIGEN) && $angemeldet)
-		{
-			$link='';
-			$link_target='';
-
-			$dir_name = $this->ensureDirectoryExists($kurzbz, $semester, $short_short_name, 'upload','student');
-			$dir_empty = $this->isDirectoryEmpty($dir_name);
-
-			if(isset($dir_empty) && $dir_empty == false)
-			{
-				if($is_lector == true)
-				{
-					$link='lector_choice.php?lvid='.urlencode($lvid);
-					$link_target='_blank';
-				}
-				else
-				{
-					$link='upload.php?course_id='.urlencode($studiengang_kz).'&term_id='.urlencode($semester).'&short='.urlencode($short);
-					$link_target='_blank';
-				}
-			}
-			else
-			{
-				if($is_lector == true)
-				{
-					$link='';
-				}
-				else
-				{
-					$link='upload.php?course_id='.urlencode($studiengang_kz).'&term_id='.urlencode($semester).'&short='.urlencode($short);
-					$link_target='_blank';
-				}
-			}
-			$menu[]=array
-			(
-				'id'=>'core_menu_studentenupload',
-				'position'=>'90',
-				'name'=>$p->t('lehre/studentenAbgabe'),
-				'c4_icon'=>'skin/images/button_studiupload.png',
-				'c4_link'=>$link,
-				'link_target'=>$link_target
-			);
-		}
-	}
-	
-	private function fhc_menu_download(&$menu, $angemeldet, $user_is_allowed_to_upload, $rechte, $semester, $kurzbz, $studiengang_kz, $short_short_name, $short, $p){
-		
-		if((!defined('CIS_LEHRVERANSTALTUNG_DOWNLOAD_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_DOWNLOAD_ANZEIGEN) && $angemeldet)
-		{
-			$dir_name = $this->ensureDirectoryExists($kurzbz, $semester, $short_short_name, 'download','teacher');
-			$dir_empty = $this->isDirectoryEmpty($dir_name);
-
-			$text = '';
-			if($dir_empty == false)
-			{
-				$link = $dir_name.'/';
-			}
-			else
-				$link = '';
-
-			//Wenn user eine Lehrfachzuteilung fuer dieses Lehrfach hat wird
-			//Ein Link zum Upload angezeigt und ein Link um das Download-Verzeichnis
-			//als Zip Archiv herunterzuladen
-			if($user_is_allowed_to_upload || $rechte->isBerechtigt('admin',$studiengang_kz) || $rechte->isBerechtigt('lehre',$studiengang_kz))// || $rechte->isBerechtigt('lehre',null,null,$fachbereich_id))
-			{
-				$text.= mb_strtolower("$kurzbz/$semester/$short/download");
-				$text.=  '<br>';
-				$text.=  "<a class='Item' target='_blank' href='upload.php?course_id=$studiengang_kz&term_id=$semester&short=$short'>".$p->t('lehre/upload')."</a>";
-				$text.=  '&nbsp;&nbsp;&nbsp;';
-			}
-
-			$menu[]=array
-			(
-				'id'=>'core_menu_download',
-				'position'=>'30',
-				'name'=>$p->t('lehre/download'),
-				'icon'=>'../../../skin/images/button_download.png',
-				'link'=>$link,
-				'c4_icon'=> base_url('skin/images/button_download.png'),
-				'c4_link'=>$link,
-				'text'=>$text
-			);
-		}
-	}
-
-	private function fhc_menu_notenliste(&$menu, $angemeldet, $is_lector, $lvid, $studiengang_kz, $angezeigtes_stsem, $kurzbz, $semester, $short_short_name, $p){
-		// Anwesenheits und Notenlisten
-		if(CIS_LEHRVERANSTALTUNG_LEISTUNGSUEBERSICHT_ANZEIGEN || $is_lector)
-		{
-			$link='';
-			$name='';
-			if($is_lector)
-			{
-				$name = $p->t('lehre/anwesenheitsUndNotenlisten');
-				$link= "anwesenheitsliste.php?stg_kz=$studiengang_kz&sem=$semester&lvid=$lvid&stsem=$angezeigtes_stsem";
-			}
-
-			$text='';
-			if(CIS_LEHRVERANSTALTUNG_LEISTUNGSUEBERSICHT_ANZEIGEN && ($angemeldet || $is_lector))
-			{
-				$dir_name = $this->ensureDirectoryExists($kurzbz, $semester, $short_short_name, 'leistung','teacher');
-				$dir_empty = $this->isDirectoryEmpty($dir_name);
-
-				if($dir_empty == false)
-				{
-					
-					if($is_lector)
-					{
-						$text.= '<a href="'.$dir_name.'" target="_blank">';
-						$text.= '<strong>'.$p->t('lehre/leistungsuebersicht').'</strong>';
-						$text.= '</a>';
-					}
-					else
-					{
-						$name = $p->t('lehre/leistungsuebersicht');
-						$link = $dir_name;
-					}
-				}
-				else
-				{
-					if($is_lector)
-					{
-						$text.= '<strong>'.$p->t('lehre/leistungsuebersicht').'</strong>';
-					}
-					else
-					{
-						$name = $p->t('lehre/leistungsuebersicht');
-						$link = '';
-					}
-				}
-			}
-
-			$menu[]=array
-			(
-				'id'=>'core_menu_anwesenheitslisten',
-				'position'=>'40',
-				'name'=>$name,
-				'icon'=>'../../../skin/images/button_listen.png',
-				'link'=>$link,
+				'id' => 'core_menu_anerkennungNachgewiesenerKenntnisse_empfehlen',
+				'position' => '128',
+				'name' => $p->t('lehre/anrechnungen'),
 				'c4_icon'=> base_url('skin/images/button_listen.png'),
-				'c4_link'=>$link,
-				'text'=>$text
+				'c4_icon2' => 'fa-regular fa-folder-open',
+				'c4_link' => base_url('cis.php/lehre/anrechnung/ReviewAnrechnungUebersicht?studiensemester='.urlencode($angezeigtes_stsem))
 			);
 		}
-	}
-
-	private function ensureDirectoryExists($kurzbz, $semester, $short_short_name, $type, $role){
-		$dir_name = DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name).'/'.$type;
-
-		if (!is_dir($dir_name)) {
-			exec('mkdir -m 775 -p '.escapeshellarg($dir_name));
-			exec('sudo chown www-data:teacher '.escapeshellarg(DOC_ROOT.'/documents/'.mb_strtolower($kurzbz)));
-			exec('sudo chown www-data:teacher '.escapeshellarg(DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester));
-			exec('sudo chown www-data:teacher '.escapeshellarg(DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name)));
-			exec('sudo chown www-data:'.$role.' '.escapeshellarg($dir_name));
-		}
-
-		return $dir_name;
-	}
-
-	private function isDirectoryEmpty($dir){
-		return count(scandir($dir)) == 2 ? true : false;
-	}
-
-	*/
-
-
+    }
 }
\ No newline at end of file
diff --git a/application/libraries/PermissionLib.php b/application/libraries/PermissionLib.php
index 857defbf7..c6e693666 100644
--- a/application/libraries/PermissionLib.php
+++ b/application/libraries/PermissionLib.php
@@ -95,6 +95,33 @@ class PermissionLib
 		return $isBerechtigt;
 	}
 
+	/**
+	 * Prueft ob die Berechtigung zumindest fuer eine der angegebenen OE vorhanden ist.
+	 * @param $berechtigung_kurzbz
+	 * @param $oe_kurzbz
+	 * @param $art
+	 * @param $kostenstelle_id
+	 * @return boolean
+	 */
+	public function isBerechtigtMultipleOe($berechtigung_kurzbz, $oe_kurzbz, $art=null, $kostenstelle_id=null)
+	{
+		$results = array();
+
+		foreach($oe_kurzbz as $value)
+		{
+			$results[] = $this->isBerechtigt($berechtigung_kurzbz, $value, $art, $kostenstelle_id);
+		}
+
+		if(!in_array(true, $results))
+		{
+			return false;
+		}
+		else
+		{
+			return true;
+		}
+	}
+
 	/**
 	 * Checks if the caller is allowed to access to this content with the given permissions
 	 * - if it's called from command line than it's trusted
diff --git a/application/models/accounting/Vertrag_model.php b/application/models/accounting/Vertrag_model.php
index 8725cd98d..abc2114a6 100644
--- a/application/models/accounting/Vertrag_model.php
+++ b/application/models/accounting/Vertrag_model.php
@@ -299,6 +299,91 @@ class Vertrag_model extends DB_Model
         }
     }
 
+    /**
+     * Prueft ob ein Mitarbeiter einen erteilten Vertrag zu einer Lehrveranstaltung besitzt.
+     * @param $lehrveranstaltung_id ID der Lehrveranstaltung
+     * @param $studiensemester_kurzbz Studiensemester das geprueft wird
+     * @param $mitarbeiter_uid UID des Mitarbeiters
+     */
+    public function isVertragErteiltLV($lehrveranstaltung_id, $studiensemester_kurzbz, $mitarbeiter_uid)
+    {
+	    if (defined('CIS_LV_LEKTORINNENZUTEILUNG_VERTRAGSPRUEFUNG_VON')
+	     && CIS_LV_LEKTORINNENZUTEILUNG_VERTRAGSPRUEFUNG_VON != '')
+	    {
+		    // Liegt das Studiensemester vor dem Pruefdatum, wird die LV immer als Erteilt angezeigt
+		    $stsemquery = "
+			    SELECT
+				    tbl_studiensemester.start
+			    FROM
+				    public.tbl_studiensemester
+			    WHERE
+				    studiensemester_kurzbz = " . $this->escape($studiensemester_kurzbz)."
+				    AND tbl_studiensemester.start < (
+					    SELECT 
+						start
+					    FROM 
+						public.tbl_studiensemester stsem 
+					    WHERE
+						stsem.studiensemester_kurzbz = " . $this->escape(CIS_LV_LEKTORINNENZUTEILUNG_VERTRAGSPRUEFUNG_VON)."
+					    )";
+
+		    if ($stsemresult = $this->execReadOnlyQuery($stsemquery))
+		    {
+			    $stsemdata = getData($stsemresult);
+			    if ($stsemdata && count($stsemdata) > 0)
+			    {
+				    // Wenn das Studiensemester vor dem Pruefdatum liegt, gilt der Vertrag immer als erteilt.
+				    return true;
+			    }
+		    }
+		    else
+		    {
+			    return false;
+		    }
+	    }
+
+	    $query = "
+		    SELECT
+			    1
+		    FROM
+			    lehre.tbl_lehreinheitmitarbeiter
+			    JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
+			    JOIN lehre.tbl_vertrag USING(vertrag_id)
+			    JOIN lehre.tbl_vertrag_vertragsstatus USING(vertrag_id)
+		    WHERE
+			    tbl_lehreinheitmitarbeiter.mitarbeiter_uid = " . $this->escape($mitarbeiter_uid) . "
+			    AND tbl_lehreinheit.studiensemester_kurzbz = " . $this->escape($studiensemester_kurzbz) . "
+			    AND tbl_lehreinheit.lehrveranstaltung_id = " . $this->escape(intval($lehrveranstaltung_id)) . "
+			    AND tbl_vertrag_vertragsstatus.vertragsstatus_kurzbz='erteilt'
+			    AND NOT EXISTS(
+				    SELECT 
+					1 
+				    FROM 
+					lehre.tbl_vertrag_vertragsstatus vstatus
+				    WHERE 
+					vstatus.vertrag_id = tbl_vertrag.vertrag_id
+					AND vstatus.vertragsstatus_kurzbz = 'storno'
+			    )
+	    ";
+
+	    if ($result = $this->execReadOnlyQuery($query))
+	    {
+		    $data = getData($result);
+		    if ($data && count($data) > 0)
+		    {
+			    return true;
+		    }
+		    else
+		    {
+			    return false;
+		    }
+	    }
+	    else
+	    {
+		    return false;
+	    }
+    }
+
     // -----------------------------------------------------------------------------------------------------------------
     // Private methods
 
diff --git a/application/models/education/Lehreinheit_model.php b/application/models/education/Lehreinheit_model.php
index 869f0a19c..afad6870b 100644
--- a/application/models/education/Lehreinheit_model.php
+++ b/application/models/education/Lehreinheit_model.php
@@ -156,4 +156,92 @@ class Lehreinheit_model extends DB_Model
 		) AS subquery
 		",[DOMAIN,DOMAIN,$lehreinheit_id,$lehreinheit_id ]);
 	}
+
+    public function getLehreinheitenForStudentAndStudienSemester($lehrveranstaltung_id, $student_uid, $studiensemester_kurzbz)
+    {
+	$query = <<<EOSQL
+	    SELECT
+	      le.* 
+	    FROM 
+	      lehre.tbl_lehreinheit le 
+	    JOIN 
+	      campus.vw_student_lehrveranstaltung vslv USING(lehreinheit_id)
+	    WHERE 
+	      vslv.lehrveranstaltung_id = {$this->escape($lehrveranstaltung_id)} AND 
+	      vslv.uid = {$this->escape($student_uid)} AND 
+	      vslv.studiensemester_kurzbz = {$this->escape($studiensemester_kurzbz)}
+EOSQL;
+
+	$res = $this->execReadOnlyQuery($query);
+	return $res;
+    }
+    
+    public function getLehrfachIdMitarbeiter($angezeigtes_stsem,$user,$lvid)
+    {
+	$query = "
+	    SELECT
+		distinct lehrfach_id
+            FROM
+                lehre.tbl_lehreinheit
+                JOIN lehre.tbl_lehreinheitmitarbeiter USING(lehreinheit_id)
+            WHERE
+                studiensemester_kurzbz=" . $this->escape($angezeigtes_stsem) . "
+                AND mitarbeiter_uid=" . $this->escape($user)."
+                AND lehrveranstaltung_id=" . $this->escape(intval($lvid));
+	
+	$res = $this->execReadOnlyQuery($query);
+	return $res;
+    }
+    
+    public function getLehrfachIdStudierender($angezeigtes_stsem,$user,$lvid)
+    {
+	$query = "
+	    SELECT 
+		distinct lehrfach_id
+            FROM
+                campus.vw_student_lehrveranstaltung
+            WHERE
+                lehrveranstaltung_id=" . $this->escape(intval($lvid))."
+                AND studiensemester_kurzbz=" . $this->escape($angezeigtes_stsem)."
+                AND uid=" . $this->escape($user);
+	
+	$res = $this->execReadOnlyQuery($query);
+	return $res;
+    }
+    
+    public function getLehreinheitInfo($lvid, $angezeigtes_stsem, $lehrfach_id)
+    {
+	$query = "
+	    SELECT 
+		* 
+	    FROM (
+		SELECT 
+		    distinct on(uid) vorname, nachname, tbl_benutzer.uid as uid,
+		    CASE 
+			WHEN lehrfunktion_kurzbz='LV-Leitung' THEN true 
+			ELSE false 
+		    END as lvleiter
+		FROM 
+		    lehre.tbl_lehreinheit, lehre.tbl_lehreinheitmitarbeiter, 
+		    public.tbl_benutzer, public.tbl_person
+		WHERE
+		    tbl_lehreinheit.lehreinheit_id = tbl_lehreinheitmitarbeiter.lehreinheit_id
+		    AND tbl_lehreinheitmitarbeiter.mitarbeiter_uid = tbl_benutzer.uid
+		    AND tbl_person.person_id = tbl_benutzer.person_id 
+		    AND lehrveranstaltung_id = " . $this->escape(intval($lvid)) . " 
+		    AND tbl_lehreinheitmitarbeiter.mitarbeiter_uid NOT like '_Dummy%' 
+		    AND tbl_benutzer.aktiv = true 
+		    AND tbl_person.aktiv = true 
+		    AND studiensemester_kurzbz = " . $this->escape($angezeigtes_stsem);
+
+	if($lehrfach_id != '')
+	{
+	    $query .= " AND tbl_lehreinheit.lehrfach_id = " . $this->escape(intval($lehrfach_id));
+	}
+	
+	$query .= " ORDER BY uid, lvleiter desc) as a ORDER BY lvleiter desc, nachname, vorname";
+	
+	$res = $this->execReadOnlyQuery($query);
+	return $res;
+    }
 }
diff --git a/application/models/education/Lehrveranstaltung_model.php b/application/models/education/Lehrveranstaltung_model.php
index f2f762b7f..3f02f5ce7 100644
--- a/application/models/education/Lehrveranstaltung_model.php
+++ b/application/models/education/Lehrveranstaltung_model.php
@@ -969,4 +969,47 @@ class Lehrveranstaltung_model extends DB_Model
     	$this->addJoin('public.tbl_studiengang stg', 'studiengang_kz');
     	return $this->load($lehrveranstaltung_id);
     }
+    
+    //Berechtigungen auf Fachbereichsebene
+    public function getBerechtigungenAufFachberechsebene($lvid, $angezeigtes_stsem)
+    {
+	    $query = "
+		SELECT
+		    DISTINCT lehrfach.oe_kurzbz
+		FROM
+		    lehre.tbl_lehrveranstaltung
+		JOIN 
+		    lehre.tbl_lehreinheit USING(lehrveranstaltung_id)
+		JOIN 
+		    lehre.tbl_lehrveranstaltung as lehrfach ON(tbl_lehreinheit.lehrfach_id=lehrfach.lehrveranstaltung_id)
+		WHERE 
+		    tbl_lehrveranstaltung.lehrveranstaltung_id = " . $this->escape(intval($lvid));
+
+	    if(isset($angezeigtes_stsem) && $angezeigtes_stsem != ''){
+		$query .= " AND studiensemester_kurzbz = " . $this->escape($angezeigtes_stsem);
+	    }
+
+	    $res = $this->execReadOnlyQuery($query);
+	    return $res;
+    }
+    
+    public function getStudentEMail($lvid, $angezeigtes_stsem)
+    {
+		$query = "
+			SELECT
+				DISTINCT vw_lehreinheit.stg_kurzbz, vw_lehreinheit.stg_typ, 
+				vw_lehreinheit.semester, COALESCE(vw_lehreinheit.verband,'') as verband, 
+				COALESCE(vw_lehreinheit.gruppe,'') as gruppe, 
+				vw_lehreinheit.gruppe_kurzbz, tbl_gruppe.mailgrp
+			FROM
+				campus.vw_lehreinheit
+			LEFT JOIN 
+				public.tbl_gruppe USING(gruppe_kurzbz)
+			WHERE
+				lehrveranstaltung_id = " . $this->escape(intval($lvid)) . "
+				AND studiensemester_kurzbz = " . $this->escape($angezeigtes_stsem);
+
+		$res = $this->execReadOnlyQuery($query);
+		return $res;
+    }
 }
diff --git a/application/models/education/Lvangebot_model.php b/application/models/education/Lvangebot_model.php
index e16b726dd..8d5096fb0 100644
--- a/application/models/education/Lvangebot_model.php
+++ b/application/models/education/Lvangebot_model.php
@@ -11,4 +11,39 @@ class Lvangebot_model extends DB_Model
 		$this->dbTable = 'lehre.tbl_lvangebot';
 		$this->pk = 'lvangebot_id';
 	}
+	
+/**
+	 * Prueft ob eine Abmeldung von einer Lehrveranstaltung moeglich ist
+	 * und liefert die Gruppen von denen sich abgemeldet werden kann
+	 * @param $lehrveranstaltung_id
+	 * @param $studiensemester_kurzbz
+	 * @param $uid
+	 * @return $gruppen Array mit den Gruppen
+	 */
+	public function AbmeldungMoeglich($lehrveranstaltung_id, $studiensemester_kurzbz, $uid)
+	{
+		$query = "SELECT 
+					gruppe_kurzbz
+				FROM 
+					lehre.tbl_lvangebot
+					JOIN public.tbl_benutzergruppe USING(studiensemester_kurzbz, gruppe_kurzbz)
+				WHERE
+					tbl_lvangebot.studiensemester_kurzbz = " . $this->escape($studiensemester_kurzbz)."
+					AND tbl_benutzergruppe.uid = " . $this->escape($uid)."
+					AND (tbl_lvangebot.lehrveranstaltung_id = " . $this->escape(intval($lehrveranstaltung_id))."
+						OR tbl_lvangebot.lehrveranstaltung_id IN(SELECT lehrveranstaltung_id_kompatibel 
+							FROM lehre.tbl_lehrveranstaltung_kompatibel 
+							WHERE lehrveranstaltung_id = " . $this->escape(intval($lehrveranstaltung_id))."
+							)
+						)";
+		$res = $this->execReadOnlyQuery($query);
+		$rows = (hasData($res)) ? getData($res) : array();
+
+		$gruppen=array();
+		foreach($rows as $row)
+		{
+			$gruppen[] = $row->gruppe_kurzbz;
+		}
+		return $gruppen;
+	}
 }
diff --git a/application/models/person/Benutzergruppe_model.php b/application/models/person/Benutzergruppe_model.php
index e569094c4..fba797641 100644
--- a/application/models/person/Benutzergruppe_model.php
+++ b/application/models/person/Benutzergruppe_model.php
@@ -12,4 +12,25 @@ class Benutzergruppe_model extends DB_Model
 		$this->pk = array('gruppe_kurzbz', 'uid');
 		$this->hasSequence = false;
 	}
+	
+	/**
+	 * Laedt die User in einer Benutzergruppe
+	 * @param gruppe_kurzbz, stsem
+	 * @return array
+	 */
+	public function getUids($gruppe_kurzbz, $stsem)
+	{
+		$query = "
+			SELECT 
+				uid 
+			FROM 
+				public.tbl_benutzergruppe 
+			WHERE 
+				gruppe_kurzbz = " . $this->escape($gruppe_kurzbz) . " 
+				AND studiensemester_kurzbz = " . $this->escape($stsem);
+		
+		$res = $this->execReadOnlyQuery($query);
+		$uids = (hasData($res)) ? getData($res) : array();
+		return $uids;
+	}
 }
diff --git a/application/models/ressource/Lehretools_model.php b/application/models/ressource/Lehretools_model.php
new file mode 100644
index 000000000..69d9f6555
--- /dev/null
+++ b/application/models/ressource/Lehretools_model.php
@@ -0,0 +1,62 @@
+<?php
+class Lehretools_model extends DB_Model
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'campus.tbl_lehre_tools';
+		$this->pk = 'lehre_tools_id';
+	}
+	
+	/**
+	 * 
+	 * Laedt die Tools zu einer Lehrveranstaltung
+	 * @param $lehrveranstaltung_id
+	 * @param $studiensemester_kurzbz
+	 */
+	public function getTools($lehrveranstaltung_id, $studiensemester_kurzbz, $sprache)
+	{
+		$query = "SELECT 
+					lehre_tools_id,
+					bezeichnung[(SELECT index FROM public.tbl_sprache WHERE sprache = " . $this->escape($sprache) . ")] AS bezeichnung,
+					kurzbz,
+					basis_url,
+					logo_dms_id
+				FROM 
+					campus.tbl_lehre_tools
+					JOIN campus.tbl_lehre_tools_organisationseinheit USING(lehre_tools_id)
+				WHERE
+					campus.tbl_lehre_tools_organisationseinheit.aktiv AND
+					(
+						oe_kurzbz IN(		
+							SELECT 
+								tbl_studiengang.oe_kurzbz
+							FROM
+								lehre.tbl_lehrveranstaltung
+								JOIN public.tbl_studiengang USING(studiengang_kz)
+							WHERE
+								tbl_lehrveranstaltung.lehrveranstaltung_id = " . $this->escape(intval($lehrveranstaltung_id)) . "
+							)
+						OR
+						oe_kurzbz IN( 
+							SELECT 
+								lehrfach.oe_kurzbz
+							FROM
+								lehre.tbl_lehreinheit
+								JOIN lehre.tbl_lehrveranstaltung as lehrfach ON(lehrfach_id=lehrfach.lehrveranstaltung_id)
+							WHERE
+								tbl_lehreinheit.studiensemester_kurzbz = " . $this->escape($studiensemester_kurzbz) . "
+								AND tbl_lehreinheit.lehrveranstaltung_id = " . $this->escape(intval($lehrveranstaltung_id)) . "
+							)
+					)
+					ORDER BY lehre_tools_id";
+			
+		$toolsres = $this->execReadOnlyQuery($query);
+		$tools = (hasData($toolsres)) ? getData($toolsres) : array();
+		
+		return $tools;
+	}
+}
\ No newline at end of file
diff --git a/application/models/system/Variable_model.php b/application/models/system/Variable_model.php
index 875fc8876..bfa1dcd98 100644
--- a/application/models/system/Variable_model.php
+++ b/application/models/system/Variable_model.php
@@ -66,6 +66,15 @@ class Variable_model extends DB_Model
 					}
 				}
 			}
+
+			if (!isset($vardata['emailadressentrennzeichen']))
+			{
+				$vardata['emailadressentrennzeichen'] = 
+					(defined('DEFAULT_EMAILADRESSENTRENNZEICHEN'))
+					? DEFAULT_EMAILADRESSENTRENNZEICHEN
+					: ',';
+			}
+
 			$result = success($vardata);
 		}
 

From b9690988e5e454424ef9d2c407c5973b7f1cb5c0 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 8 Nov 2024 10:53:02 +0100
Subject: [PATCH 1370/1461] refactor(Stundenplan): uses named slots for
 week-view template

---
 public/js/apps/Cis/Stundenplan.js           | 14 ++++++++------
 public/js/components/Calendar/Calendar.js   |  8 +++++---
 public/js/components/Calendar/Month/Page.js |  6 +++---
 public/js/components/Calendar/Week.js       |  8 +++++---
 public/js/components/Calendar/Week/Page.js  |  4 ++--
 5 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/public/js/apps/Cis/Stundenplan.js b/public/js/apps/Cis/Stundenplan.js
index cdbdd394d..cbca415e0 100644
--- a/public/js/apps/Cis/Stundenplan.js
+++ b/public/js/apps/Cis/Stundenplan.js
@@ -100,12 +100,14 @@ const app = Vue.createApp({
 	<h2>Stundenplan</h2>
 	<hr>
 	<lv-modal v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ref="lvmodal"  />
-	<fhc-calendar @change:range="updateRange" v-slot="{event, day}" :events="events" initial-mode="week" show-weeks>
-		<div @click="showModal(event?.orig)" type="button" class="d-flex flex-column align-items-center justify-content-evenly h-100">
-			<span>{{event?.orig.topic}}</span>
-			<span v-for="lektor in event?.orig.lektor">{{lektor.kurzbz}}</span>
-			<span>{{event?.orig.ort_kurzbz}}</span>
-		</div>	
+	<fhc-calendar @change:range="updateRange" :events="events" initial-mode="week" show-weeks >
+		<template #weekPage="{event,day}">
+			<div @click="showModal(event?.orig)" type="button" class="d-flex flex-column align-items-center justify-content-evenly h-100">
+				<span>{{event?.orig.topic}}</span>
+				<span v-for="lektor in event?.orig.lektor">{{lektor.kurzbz}}</span>
+				<span>{{event?.orig.ort_kurzbz}}</span>
+			</div>
+		</template>
 	</fhc-calendar>
 	`
 });
diff --git a/public/js/components/Calendar/Calendar.js b/public/js/components/Calendar/Calendar.js
index ff6afe4b2..a38f630be 100644
--- a/public/js/components/Calendar/Calendar.js
+++ b/public/js/components/Calendar/Calendar.js
@@ -104,6 +104,7 @@ export default {
 	},
 	methods: {
 		handleInput(day) {
+			console.log(day[0], "first",day[1],"second")
 			this.$emit(day[0], day[1]);
 		}
 	},
@@ -137,9 +138,10 @@ export default {
 	},
 	template: /*html*/`
 	<div ref="container" class="fhc-calendar card" :class="sizeClass">
-		<component v-slot="{event,day}" :is="'calendar-' + mode" @updateMode="mode = $event" @change:range="$emit('change:range',$event)" @input="handleInput" >
-			<!--Week Page layout-->
-			<slot :event="event" :day="day"></slot>
+		<component :is="'calendar-' + mode" @updateMode="mode = $event" @change:range="$emit('change:range',$event)" @input="handleInput" >
+			<template #weekPage="{event,day}">
+				<slot name="weekPage" :event="event" :day="day"></slot>
+			</template>
 		</component>
 	</div>`
 }
diff --git a/public/js/components/Calendar/Month/Page.js b/public/js/components/Calendar/Month/Page.js
index 1a6fadbb9..59bd6ea5a 100644
--- a/public/js/components/Calendar/Month/Page.js
+++ b/public/js/components/Calendar/Month/Page.js
@@ -69,11 +69,11 @@ export default {
 			return this.noWeekView ? day == this.highlightedDay : week.no == this.highlightedWeek;
 		},
 		clickEvent(day,week) {
-			if(this.noWeekView){
-				this.selectDay(day);
-			}else{
+			if(!this.noWeekView)
+			{
 				this.changeToWeek(week);
 			}
+			this.selectDay(day);
 		}
 	},
 	template: `
diff --git a/public/js/components/Calendar/Week.js b/public/js/components/Calendar/Week.js
index f00625a25..d7a280231 100644
--- a/public/js/components/Calendar/Week.js
+++ b/public/js/components/Calendar/Week.js
@@ -38,12 +38,14 @@ export default {
 	created() {
 		this.emitRangeChanged();
 	},
-	template: `
+	template: /*html*/`
 	<div class="fhc-calendar-week">
 		<calendar-header :title="title" @prev="prev" @next="next" @updateMode="$emit('updateMode', $event)" @click="$emit('updateMode', 'weeks')"/>
 		<calendar-pane ref="pane" v-slot="slot" @slid="paneChanged">
-			<calendar-week-page v-slot="{event,day}" :year="focusDate.y" :week="focusDate.w+slot.offset" @updateMode="$emit('updateMode', $event)" @page:back="prev" @page:forward="next" @input="selectEvent" >
-				<slot :event="event" :day="day" ></slot>
+			<calendar-week-page :year="focusDate.y" :week="focusDate.w+slot.offset" @updateMode="$emit('updateMode', $event)" @page:back="prev" @page:forward="next" @input="selectEvent" >
+				<template #weekPage="{event,day}">
+					<slot name="weekPage" :event="event" :day="day" ></slot>
+				</template>
 			</calendar-week-page>
 		</calendar-pane>
 	</div>`
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index 2a3fa1bf3..1692c457b 100644
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -145,8 +145,8 @@ export default {
 						<div v-for="hour in hours" style="min-height:100px" :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
 					</div>
 					<div v-for="day in eventsPerDayAndHour" :key="day" class=" day border-start" :style="{'grid-template-columns': 'repeat(' + day.lanes + ', 1fr)', 'grid-template-rows': 'repeat(' + (hours.length * 60 / smallestTimeFrame) + ', 1fr)'}">
-						<div :style="{'background-color':event.orig.color}" class="mx-2 border border-dark border-2 small rounded overflow-hidden "  @click.prevent="$emit('input', event.orig)" :style="{'z-index':1,'grid-column-start': 1+(event.lane-1)*day.lanes/event.maxLane, 'grid-column-end': 1+event.lane*day.lanes/event.maxLane, 'grid-row-start': dateToMinutesOfDay(event.start), 'grid-row-end': dateToMinutesOfDay(event.end) ,'--test': dateToMinutesOfDay(event.end)}" v-for="event in day.events" :key="event">	
-							<slot :event="event" :day="day">
+						<div  :style="{'background-color':event.orig.color}" class="mx-2 border border-dark border-2 small rounded overflow-hidden "  @click.prevent="$emit('input', event.orig)" :style="{'z-index':1,'grid-column-start': 1+(event.lane-1)*day.lanes/event.maxLane, 'grid-column-end': 1+event.lane*day.lanes/event.maxLane, 'grid-row-start': dateToMinutesOfDay(event.start), 'grid-row-end': dateToMinutesOfDay(event.end) ,'--test': dateToMinutesOfDay(event.end)}" v-for="event in day.events" :key="event">	
+							<slot  name="weekPage" :event="event" :day="day">
 								<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
 							</slot>
 						</div>

From f304e79ee05636651fa5eecda72dabd75d6ee913 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 8 Nov 2024 15:18:10 +0100
Subject: [PATCH 1371/1461] feature(Stundenplan): adds Tagesansicht for the
 Stundenplan

---
 .../controllers/api/frontend/v1/LvMenu.php    |   2 +-
 public/js/apps/Cis/Stundenplan.js             |  32 +++-
 public/js/components/Calendar/Calendar.js     |   6 +-
 public/js/components/Calendar/Day.js          |  52 ++++++
 public/js/components/Calendar/Day/Page.js     | 154 ++++++++++++++++++
 public/js/components/Calendar/Header.js       |   4 +-
 public/js/components/Calendar/Month/Page.js   |   7 +-
 7 files changed, 244 insertions(+), 13 deletions(-)
 create mode 100644 public/js/components/Calendar/Day.js
 create mode 100644 public/js/components/Calendar/Day/Page.js

diff --git a/application/controllers/api/frontend/v1/LvMenu.php b/application/controllers/api/frontend/v1/LvMenu.php
index 45741b567..6f4f5ad97 100644
--- a/application/controllers/api/frontend/v1/LvMenu.php
+++ b/application/controllers/api/frontend/v1/LvMenu.php
@@ -423,7 +423,7 @@ class LvMenu extends FHCAPI_Controller
 			{
 				if($row->gruppe_kurzbz != '')
 				{
-					$bngrp_uids = $this->Benutzergrupp_model->getUids($row->gruppe_kurzbz, $angezeigtes_stsem);
+					$bngrp_uids = $this->Benutzergruppe_model->getUids($row->gruppe_kurzbz, $angezeigtes_stsem);
 					if(count($bngrp_uids) > 0)
 					{
 						if(!$row->mailgrp)
diff --git a/public/js/apps/Cis/Stundenplan.js b/public/js/apps/Cis/Stundenplan.js
index cbca415e0..cb019952c 100644
--- a/public/js/apps/Cis/Stundenplan.js
+++ b/public/js/apps/Cis/Stundenplan.js
@@ -11,6 +11,8 @@ const app = Vue.createApp({
 			events: null,
 			calendarDate: new CalendarDate(new Date()),
 			currentlySelectedEvent: null,
+			currentDay: new Date(),
+			minimized: false,
 		}
 	},
 	components: {
@@ -32,17 +34,23 @@ const app = Vue.createApp({
 		},
 	},
 	methods:{
-
+		selectDay: function(day){
+			this.currentDay = day;
+		},
 		showModal: function(event){
 			this.currentlySelectedEvent = event;
 			Vue.nextTick(() => {
 				this.$refs.lvmodal.show();
 			});
 		},
-		updateRange: function (data) {
-			let tmp_date = new CalendarDate(data.start);
+		updateRange: function ({start,end}) {
+
+			let checkDate = (date) => {
+				return date.m != this.calendarDate.m || date.y != this.calendarDate.y;
+			}
+
 			// only load month data if the month or year has changed
-			if(tmp_date.m != this.calendarDate.m || tmp_date.y != this.calendarDate.y){
+			if (checkDate(new CalendarDate(start)) && checkDate(new CalendarDate(end))){
 				// reset the events before querying the new events to activate the loading spinner
 				this.events = null;
 				this.calendarDate = tmp_date;
@@ -51,15 +59,12 @@ const app = Vue.createApp({
 				});
 			}
 		},
-
 		calendarDateToString: function (calendarDate) {
-
 			return calendarDate instanceof CalendarDate ?
 				[calendarDate.y, calendarDate.m + 1, calendarDate.d].join('-') :
 				null;
 
 		},
-
 		loadEvents: function(){
 			Promise.allSettled([
 				this.$fhcApi.factory.stundenplan.getStundenplan(this.monthFirstDay, this.monthLastDay),
@@ -96,11 +101,12 @@ const app = Vue.createApp({
 	created(){
 		this.loadEvents();
 	},
+	//TODO: Stundenplan phrase
 	template:/*html*/`
 	<h2>Stundenplan</h2>
 	<hr>
-	<lv-modal v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ref="lvmodal"  />
-	<fhc-calendar @change:range="updateRange" :events="events" initial-mode="week" show-weeks >
+	<lv-modal v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ref="lvmodal" />
+	<fhc-calendar :initial-date="currentDay" @change:range="updateRange" :events="events" initial-mode="week" show-weeks @select:day="selectDay" v-model:minimized="minimized">
 		<template #weekPage="{event,day}">
 			<div @click="showModal(event?.orig)" type="button" class="d-flex flex-column align-items-center justify-content-evenly h-100">
 				<span>{{event?.orig.topic}}</span>
@@ -108,6 +114,14 @@ const app = Vue.createApp({
 				<span>{{event?.orig.ort_kurzbz}}</span>
 			</div>
 		</template>
+		<template #dayPage="{event,day}">
+			<div @click="showModal(event?.orig)" type="button" class="d-flex flex-column align-items-center justify-content-evenly h-100">
+				<span>{{event?.orig.topic}}</span>
+				<span v-for="lektor in event?.orig.lektor">{{lektor.kurzbz}}</span>
+				<span>{{event?.orig.ort_kurzbz}}</span>
+			</div>
+		</template>
+		<template
 	</fhc-calendar>
 	`
 });
diff --git a/public/js/components/Calendar/Calendar.js b/public/js/components/Calendar/Calendar.js
index a38f630be..dd12456ca 100644
--- a/public/js/components/Calendar/Calendar.js
+++ b/public/js/components/Calendar/Calendar.js
@@ -3,6 +3,7 @@ import CalendarMonths from './Months.js';
 import CalendarYears from './Years.js';
 import CalendarWeek from './Week.js';
 import CalendarWeeks from './Weeks.js';
+import CalendarDay from './Day.js';
 import CalendarMinimized from './Minimized.js';
 import CalendarDate from '../../composables/CalendarDate.js';
 
@@ -16,6 +17,7 @@ export default {
 		CalendarYears,
 		CalendarWeek,
 		CalendarWeeks,
+		CalendarDay,
 		CalendarMinimized,
 	},
 	provide() {
@@ -104,7 +106,6 @@ export default {
 	},
 	methods: {
 		handleInput(day) {
-			console.log(day[0], "first",day[1],"second")
 			this.$emit(day[0], day[1]);
 		}
 	},
@@ -142,6 +143,9 @@ export default {
 			<template #weekPage="{event,day}">
 				<slot name="weekPage" :event="event" :day="day"></slot>
 			</template>
+			<template #dayPage="{event,day}">
+				<slot name="dayPage" :event="event" :day="day"></slot>
+			</template>
 		</component>
 	</div>`
 }
diff --git a/public/js/components/Calendar/Day.js b/public/js/components/Calendar/Day.js
new file mode 100644
index 000000000..dc9795850
--- /dev/null
+++ b/public/js/components/Calendar/Day.js
@@ -0,0 +1,52 @@
+import CalendarAbstract from './Abstract.js';
+import CalendarPane from './Pane.js';
+import CalendarDayPage from './Day/Page.js';
+import CalendarDate from '../../composables/CalendarDate.js';
+
+export default {
+	mixins: [
+		CalendarAbstract
+	],
+	components: {
+		CalendarDayPage,
+		CalendarPane
+	},
+	computed: {
+		title() {
+			return this.focusDate.format({ year: 'numeric' }) + ' KW ' + this.focusDate.w;
+		}
+	},
+	methods: {
+		paneChanged(dir) {
+			let previousDate = new CalendarDate(this.focusDate);
+			this.focusDate.d += dir;
+			this.emitRangeChanged(previousDate);
+		},
+		emitRangeChanged(previousDate) {
+			this.$emit('change:range', { start: previousDate, end:this.focusDate });
+		},
+		prev() {
+			this.$refs.pane.prev();
+		},
+		next() {
+			this.$refs.pane.next();
+		},
+		selectEvent(event) {
+			this.$emit('input', ['select:event', event]);
+		}
+	},
+	created() {
+		this.emitRangeChanged();
+	},
+	template: /*html*/`
+	<div class="fhc-calendar-day">
+		<calendar-header :title="title" @prev="prev" @next="next" @updateMode="$emit('updateMode', $event)" @click="$emit('updateMode', 'week')"/>
+		<calendar-pane ref="pane" v-slot="slot" @slid="paneChanged">
+			<calendar-day-page :year="focusDate.y" :week="focusDate.w+slot.offset" @updateMode="$emit('updateMode', $event)" @page:back="prev" @page:forward="next" @input="selectEvent" >
+				<template #dayPage="{event,day}">
+					<slot name="dayPage" :event="event" :day="day" ></slot>
+				</template>
+			</calendar-day-page>
+		</calendar-pane>
+	</div>`
+}
diff --git a/public/js/components/Calendar/Day/Page.js b/public/js/components/Calendar/Day/Page.js
new file mode 100644
index 000000000..0da529b98
--- /dev/null
+++ b/public/js/components/Calendar/Day/Page.js
@@ -0,0 +1,154 @@
+import CalendarDate from '../../../composables/CalendarDate.js';
+
+function ggt(m, n) { return n == 0 ? m : ggt(n, m % n); }
+function kgv(m, n) { return (m * n) / ggt(m, n); }
+
+export default {
+	data() {
+		return {
+			hourPosition: null,
+			hourPositionTime: null,
+		}
+	},
+	inject: [
+		'date',
+		'focusDate',
+		'size',
+		'events',
+		'noMonthView'
+	],
+	props: {
+		year: Number,
+		week: Number
+	},
+	emits: [
+		'updateMode',
+		'page:back',
+		'page:forward',
+		'input'
+	],
+	computed: {
+		hours() {
+			// returns an array with elements starting at 7 and ending at 24
+			return [...Array(24).keys()].filter(hour => hour >= 7 && hour <= 24);
+		},
+		days() {
+			let startDay = this.focusDate;
+			let result = [];
+				result.push(new Date(startDay.y, startDay.m, startDay.d));
+			return result;
+		},
+		eventsPerDayAndHour() {
+			const res = {};
+			this.days.forEach(day => {
+				let key = day.toDateString();
+
+				let nextDay = new Date(day);
+				nextDay.setDate(nextDay.getDate() + 1);
+				nextDay.setMilliseconds(nextDay.getMilliseconds() - 1);
+				let d = { events: [], lanes: 1 };
+				if (this.events[key]) {
+					this.events[key].forEach(evt => {
+						let event = {
+							orig: evt, lane: 1, maxLane: 1, start: evt.start < day ? day : evt.start, end: evt.end > nextDay ? nextDay : evt.end, shared: [], setSharedMaxRecursive(doneItems) {
+								this.maxLane = Math.max(doneItems[0].maxLane, this.maxLane);
+								doneItems.push(this);
+								this.shared.filter(other => !doneItems.includes(other)).forEach(i => i.setSharedMaxRecursive(doneItems));
+							}
+						};
+						event.shared = d.events.filter(other => other.start < event.end && other.end > event.start);
+						event.shared.forEach(other => other.shared.push(event));
+						let occupiedLanes = event.shared.map(other => other.lane);
+						while (occupiedLanes.includes(event.lane))
+							event.lane++;
+						event.maxLane = Math.max(...[event.lane], ...occupiedLanes);
+						if (event.maxLane > 1) {
+							event.setSharedMaxRecursive([event]);
+						}
+						d.events.push(event);
+					});
+					d.lanes = d.events.map(e => e.maxLane).reduce((res, i) => kgv(res, i), 1);
+				}
+				res[key] = d;
+			});
+			return res;
+		},
+		smallestTimeFrame() {
+			return [30, 15, 10, 5][this.size];
+		}
+	},
+	methods: {
+		calcHourPosition(event) {
+			let top = this.$refs.eventcontainer.getBoundingClientRect().top;
+			let position = event.clientY - top;
+			this.hourPosition = position;
+			// position percentage of total height
+			let timePercentage = (position / this.$refs.eventcontainer.offsetHeight) * 100;
+			// minute percentage of total minutes
+			let result = (this.hours.length * 60) * (timePercentage / 100);
+			// calculate time in float
+			let currentMinutes = ((result + (this.hours[0] * 60)) / 60);
+			// get hour part of time
+			let currentHour = Math.floor(currentMinutes);
+			// get float part of time
+			let minutePercentage = currentMinutes % currentHour;
+			// calculate minutes from float part of time
+			let minute = Math.round(60 * minutePercentage);
+			// in case the rounding made the minutes 60, increase the hour and reset the minutes
+			if (minute == 60) {
+				currentHour++;
+				minute = 0;
+			}
+			// add padding to minutes that consist of only one digit
+			minute.toString().length == 1 ? minute = "0" + minute : minute;
+			this.hourPositionTime = currentHour + ":" + minute;
+		},
+		getAbsolutePositionForHour(hour) {
+			// used for the absolute positioning of the gutters of hours
+			return (100 / this.hours.length) * (hour - (24 - this.hours.length)) + '%';
+		},
+		changeToMonth(day) {
+			if (!this.noMonthView) {
+				this.date.set(day);
+				this.focusDate.set(day);
+				this.$emit('updateMode', 'month');
+			}
+		},
+		dateToMinutesOfDay(day) {
+			return Math.floor(((day.getHours() - 7) * 60 + day.getMinutes()) / this.smallestTimeFrame) + 1;
+		}
+	},
+	mounted() {
+		setTimeout(() => this.$refs.eventcontainer.scrollTop = this.$refs.eventcontainer.scrollHeight / 3 + 1, 0);
+	},
+	template: /*html*/`
+	<div class="fhc-calendar-week-page">
+		<div class="d-flex flex-column">
+			<div class="fhc-calendar-week-page-header d-grid border-2 border-bottom text-center" :style="{'z-index':4,'grid-template-columns': 'repeat(' + days.length + ', 1fr)', 'grid-template-rows':1}" style="position:sticky; top:0; " >
+				<div type="button" v-for="day in days" :key="day" class="flex-grow-1" :title="day.toLocaleString(undefined, {dateStyle:'short'})" @click.prevent="changeToMonth(day)">
+					<div class="fw-bold">{{day.toLocaleString(undefined, {weekday: size < 2 ? 'narrow' : (size < 3 ? 'short' : 'long')})}}</div>
+					<a href="#" class="small text-secondary text-decoration-none" >{{day.toLocaleString(undefined, [{day:'numeric',month:'numeric'},{day:'numeric',month:'numeric'},{day:'numeric',month:'numeric'},{dateStyle:'short'}][this.size])}}</a>
+				</div>
+			</div>
+			<div ref="eventcontainer" class="position-relative flex-grow-1" @mousemove="calcHourPosition" @mouseleave="" >
+				<div v-for="hour in hours" :key="hour"  class="position-absolute border-top" style="pointer-events: none;" :style="{top:getAbsolutePositionForHour(hour),left:0,right:0,'z-index':0}"></div>
+				<div v-if="hourPosition" class="position-absolute border-top small"  style="pointer-events: none; padding-left:3.5rem; margin-top:-1px;z-index:2;border-color:#00649C !important" :style="{top:hourPosition+'px',left:0,right:0}">
+					<span class="border border-top-0 px-2 bg-white">{{hourPositionTime}}</span>
+				</div>
+				<div class="events">
+					<div class="hours">
+						<div v-for="hour in hours" style="min-height:100px" :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
+					</div>
+					<div v-for="day in eventsPerDayAndHour" :key="day" class=" day border-start" :style="{'grid-template-columns': 'repeat(' + day.lanes + ', 1fr)', 'grid-template-rows': 'repeat(' + (hours.length * 60 / smallestTimeFrame) + ', 1fr)'}">
+						<div  :style="{'background-color':event.orig.color}" class="mx-2 border border-dark border-2 small rounded overflow-hidden "  @click.prevent="$emit('input', event.orig)" :style="{'z-index':1,'grid-column-start': 1+(event.lane-1)*day.lanes/event.maxLane, 'grid-column-end': 1+event.lane*day.lanes/event.maxLane, 'grid-row-start': dateToMinutesOfDay(event.start), 'grid-row-end': dateToMinutesOfDay(event.end) ,'--test': dateToMinutesOfDay(event.end)}" v-for="event in day.events" :key="event">	
+							<slot  name="dayPage" :event="event" :day="day">
+								<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
+							</slot>
+						</div>
+						
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>`
+}
diff --git a/public/js/components/Calendar/Header.js b/public/js/components/Calendar/Header.js
index 57e9024e1..aece861b4 100644
--- a/public/js/components/Calendar/Header.js
+++ b/public/js/components/Calendar/Header.js
@@ -4,7 +4,8 @@ export default {
 			selected: this.mode,
 			modes:{
 				week:"Woche", 
-				month:"Monat", 
+				month:"Monat",
+				day: "Tag", 
 			},
 		}
 	},
@@ -52,6 +53,7 @@ export default {
 					<button type="button" :class="{'active':mode_kurzbz == mode}" style="margin-right: 4px;" @click.prevent="$emit('updateMode',mode_kurzbz)" class="btn btn-outline-secondary" v-for="(mode_bezeichnung,mode_kurzbz) in modes">
 						<i v-if="!noWeekView && mode_kurzbz == 'week'" class="fa fa-calendar-week"></i>
 						<i v-else-if="!noMonthView && mode_kurzbz == 'month'" class="fa fa-calendar-days"></i>
+						<i v-else-if="mode_kurzbz == 'day'" class="fa-solid fa-sun"></i>
 					</button>
 				</div>
 			</div>
diff --git a/public/js/components/Calendar/Month/Page.js b/public/js/components/Calendar/Month/Page.js
index 59bd6ea5a..d65c358b0 100644
--- a/public/js/components/Calendar/Month/Page.js
+++ b/public/js/components/Calendar/Month/Page.js
@@ -61,6 +61,10 @@ export default {
 				this.$emit('updateMode', 'week');
 			}
 		},
+		changeToDay(day) {
+			this.focusDate.set(day);
+			this.$emit('updateMode', 'day');			
+		},
 		highlight(week, day){
 			this.highlightedWeek = week.no; 
 			this.highlightedDay = day;
@@ -71,7 +75,8 @@ export default {
 		clickEvent(day,week) {
 			if(!this.noWeekView)
 			{
-				this.changeToWeek(week);
+				//this.changeToWeek(week);
+				this.changeToDay(day);
 			}
 			this.selectDay(day);
 		}

From ca7ded38d25703e2a1fcb49c68b7078589fa4a66 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 8 Nov 2024 16:08:08 +0100
Subject: [PATCH 1372/1461] refactor(Stundenplan indicator): uses a 5 minute
 interval for the Stundenplan indicator

---
 public/js/components/Calendar/Day/Page.js  | 22 ++++++++++++++---
 public/js/components/Calendar/Week/Page.js | 28 ++++++++++++++++------
 2 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/public/js/components/Calendar/Day/Page.js b/public/js/components/Calendar/Day/Page.js
index 0da529b98..c66dcf33a 100644
--- a/public/js/components/Calendar/Day/Page.js
+++ b/public/js/components/Calendar/Day/Page.js
@@ -79,11 +79,11 @@ export default {
 	},
 	methods: {
 		calcHourPosition(event) {
+			let height = this.$refs.eventcontainer.getBoundingClientRect().height;
 			let top = this.$refs.eventcontainer.getBoundingClientRect().top;
 			let position = event.clientY - top;
-			this.hourPosition = position;
 			// position percentage of total height
-			let timePercentage = (position / this.$refs.eventcontainer.offsetHeight) * 100;
+			let timePercentage = (position / height) * 100;
 			// minute percentage of total minutes
 			let result = (this.hours.length * 60) * (timePercentage / 100);
 			// calculate time in float
@@ -94,11 +94,27 @@ export default {
 			let minutePercentage = currentMinutes % currentHour;
 			// calculate minutes from float part of time
 			let minute = Math.round(60 * minutePercentage);
+			// convert minutes to 5 minute interval
+			if (minute % 5 != 0) 
+			{
+				minute = Math.round(minute / 5) * 5;
+			}
 			// in case the rounding made the minutes 60, increase the hour and reset the minutes
-			if (minute == 60) {
+			if (minute == 60) 
+			{
 				currentHour++;
 				minute = 0;
 			}
+			
+			// ## after rounding the time to the nearest 5 Minute interval, we have to convert the time back to the relative position
+			// convert current time in minutes
+			currentMinutes = currentHour * 60 + minute;
+			// calculate the minutes percentage of the total minutes 
+			timePercentage = ((currentMinutes - ( this.hours[0] * 60 ) ) / ( this.hours.length * 60 ) ) * 100;
+			// calculate the relative position of the time percentage
+			position = height * (timePercentage / 100);
+			this.hourPosition = position;
+			
 			// add padding to minutes that consist of only one digit
 			minute.toString().length == 1 ? minute = "0" + minute : minute;
 			this.hourPositionTime = currentHour + ":" + minute;
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index 1692c457b..75b7bed4d 100644
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -82,30 +82,44 @@ export default {
 		}
 	},
 	methods: {
-		calcHourPosition(event){
+		calcHourPosition(event) {
+			let height = this.$refs.eventcontainer.getBoundingClientRect().height;
 			let top = this.$refs.eventcontainer.getBoundingClientRect().top;
 			let position = event.clientY - top;
-			this.hourPosition = position;
 			// position percentage of total height
-			let timePercentage = (position / this.$refs.eventcontainer.offsetHeight) * 100;
+			let timePercentage = (position / height) * 100;
 			// minute percentage of total minutes
-			let result = (this.hours.length * 60) * (timePercentage/100);
+			let result = (this.hours.length * 60) * (timePercentage / 100);
 			// calculate time in float
-			let currentMinutes = ((result+(this.hours[0]*60))/60);
+			let currentMinutes = ((result + (this.hours[0] * 60)) / 60);
 			// get hour part of time
 			let currentHour = Math.floor(currentMinutes);
 			// get float part of time
 			let minutePercentage = currentMinutes % currentHour;
 			// calculate minutes from float part of time
 			let minute = Math.round(60 * minutePercentage);
+			// convert minutes to 5 minute interval
+			if (minute % 5 != 0) {
+				minute = Math.round(minute / 5) * 5;
+			}
 			// in case the rounding made the minutes 60, increase the hour and reset the minutes
-			if(minute == 60){
+			if (minute == 60) {
 				currentHour++;
 				minute = 0;
 			}
+
+			// ## after rounding the time to the nearest 5 Minute interval, we have to convert the time back to the relative position
+			// convert current time in minutes
+			currentMinutes = currentHour * 60 + minute;
+			// calculate the minutes percentage of the total minutes 
+			timePercentage = ((currentMinutes - (this.hours[0] * 60)) / (this.hours.length * 60)) * 100;
+			// calculate the relative position of the time percentage
+			position = height * (timePercentage / 100);
+			this.hourPosition = position;
+
 			// add padding to minutes that consist of only one digit
 			minute.toString().length == 1 ? minute = "0" + minute : minute;
-			this.hourPositionTime = currentHour + ":" + minute; 
+			this.hourPositionTime = currentHour + ":" + minute;
 		},
 		getAbsolutePositionForHour(hour){
 			// used for the absolute positioning of the gutters of hours

From 96335a79798a81b199146c9461aa6a47eb8b0bf2 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 11 Nov 2024 09:56:43 +0100
Subject: [PATCH 1373/1461] moved email template to fhtw addon; einheiten
 column visibility default false since pausen are not represented; backend
 code cleanup; phrase fix;

---
 application/libraries/FilterCmptLib.php |  7 ++-
 system/checksystem.php                  | 24 +++++-----
 system/phrasesupdate.php                | 62 ++++++++++++++++++++++++-
 3 files changed, 76 insertions(+), 17 deletions(-)

diff --git a/application/libraries/FilterCmptLib.php b/application/libraries/FilterCmptLib.php
index cd934d1ae..c1a2b47cb 100644
--- a/application/libraries/FilterCmptLib.php
+++ b/application/libraries/FilterCmptLib.php
@@ -177,7 +177,7 @@ class FilterCmptLib
 		$session = $this->getSession();
 
 		// If session is NOT empty -> a filter was already loaded
-		if (false && $session != null)
+		if ($session != null)
 		{
 			// Retrieve the filterId stored in the session
 			$sessionFilterId = $this->_getSessionElement(FilterCmptLib::FILTER_ID);
@@ -221,7 +221,7 @@ class FilterCmptLib
 		}
 
 		// If the session is empty -> first time that this filter is loaded
-		if (true || $session == null)
+		if ($session == null)
 		{
 			// Load filter definition data from DB
 			$definition = $this->_loadDefinition(
@@ -1173,5 +1173,4 @@ class FilterCmptLib
 
 		return $filterName;
 	}
-}
-
+}
\ No newline at end of file
diff --git a/system/checksystem.php b/system/checksystem.php
index 2439e3c3b..4af8bc56d 100644
--- a/system/checksystem.php
+++ b/system/checksystem.php
@@ -37,17 +37,17 @@ echo '<html>
 </head>
 <body>';
 
-//if (php_sapi_name() != 'cli')
-//{
-//	$uid = get_uid();
-//	$rechte = new benutzerberechtigung();
-//	$rechte->getBerechtigungen($uid);
-//
-//	if(!$rechte->isBerechtigt('admin'))
-//	{
-//		exit('Sie haben keine Berechtigung');
-//	}
-//}
+if (php_sapi_name() != 'cli')
+{
+	$uid = get_uid();
+	$rechte = new benutzerberechtigung();
+	$rechte->getBerechtigungen($uid);
+
+	if(!$rechte->isBerechtigt('admin'))
+	{
+		exit('Sie haben keine Berechtigung');
+	}
+}
 
 echo '<H1>Systemcheck!</H1>';
 echo '<H2>DB-Updates!</H2>';
@@ -374,4 +374,4 @@ if($neue==false)
 	echo '<br>Keine neuen Webservicerechte';
 
 echo '</body></html>';
-?>
+?>
\ No newline at end of file
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 196f654ec..6dda8a8e9 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -28218,6 +28218,66 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'notAuthorizedForLva',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Keine Berechtigung für die Lehrveranstaltung.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No Authorization for that Course.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'notAuthorizedForLe',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Keine Berechtigung für die Lehreinheit.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No Authorization for that Teaching Unit.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'noAuthorization',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Keine Berechtigung.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No Authorization.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
@@ -28280,7 +28340,7 @@ array(
 				'sprache' => 'German',
 				'text' => 'Im Entschuldigungsmanagement können Sie als Studiengangsassistenz beziehungsweise als Administrator die von Studenten hochgeladenen Entschuldigungsdokumente überprüfen und den Status entsprechend vergeben.
 				
-				Bitte beachten Sie dass nur Entschuldigungen INNERHALB des angegebenen Zeitraumes angezeigt werden. Sollten Sie nach einer lang wirken Entschuldigung suchen, müssen Sie die Zeitspanne entsprechend weit setzen.',
+				Bitte beachten Sie dass nur Entschuldigungen INNERHALB des angegebenen Zeitraumes angezeigt werden. Sollten Sie nach einer lang wirkenden Entschuldigung suchen, müssen Sie die Zeitspanne entsprechend weit setzen.',
 				'description' => '',
 				'insertvon' => 'system'
 			),

From 0e49dfaba01d41beb978286d84bad6f15b2a7c9a Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 11 Nov 2024 10:40:58 +0100
Subject: [PATCH 1374/1461] refactor(Calendar day view): changes the classes
 for fhc-calendar-day-page so that the width is divided in calendar and
 content

---
 public/css/components/calendar.css        | 28 ++++++++++++
 public/js/components/Calendar/Day/Page.js | 56 +++++++++++++----------
 2 files changed, 61 insertions(+), 23 deletions(-)

diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index 7cb105b85..2806ec60f 100644
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -63,6 +63,34 @@
   display: grid;
 }
 
+.fhc-calendar-day-page {
+  /*aspect-ratio: 7/6;*/
+  min-height: 0;
+}
+.fhc-calendar-day-page > div {
+  /*transform: translate(-0.75em, -0.75em);*/
+  /*width: calc(100% + 1.5em);*/
+  height: calc(100% + 1.5em);
+}
+.fhc-calendar-day-page .flex-column > div {
+  padding-left: 3em;
+}
+.fhc-calendar-day-page .flex-column {
+	border-right: 1px solid #dee2e6;
+}
+.fhc-calendar-day-page .events {
+  display: grid;
+  grid-template-columns: 3em 1fr;
+  margin-left: -3em;
+  /*min-height: 266.6666666667%;*/
+}
+.fhc-calendar-day-page .events .day {
+  gap: 1px;
+}
+.fhc-calendar-day-page .events .hours, .fhc-calendar-day-page .events .day {
+  display: grid;
+}
+
 .fhc-calendar-lg .fhc-calendar-month-page-day,
 .fhc-calendar-lg .fhc-calendar-month-page-weekday,
 .fhc-calendar-md .fhc-calendar-month-page-day,
diff --git a/public/js/components/Calendar/Day/Page.js b/public/js/components/Calendar/Day/Page.js
index c66dcf33a..7ff94b5e5 100644
--- a/public/js/components/Calendar/Day/Page.js
+++ b/public/js/components/Calendar/Day/Page.js
@@ -138,33 +138,43 @@ export default {
 		setTimeout(() => this.$refs.eventcontainer.scrollTop = this.$refs.eventcontainer.scrollHeight / 3 + 1, 0);
 	},
 	template: /*html*/`
-	<div class="fhc-calendar-week-page">
-		<div class="d-flex flex-column">
-			<div class="fhc-calendar-week-page-header d-grid border-2 border-bottom text-center" :style="{'z-index':4,'grid-template-columns': 'repeat(' + days.length + ', 1fr)', 'grid-template-rows':1}" style="position:sticky; top:0; " >
-				<div type="button" v-for="day in days" :key="day" class="flex-grow-1" :title="day.toLocaleString(undefined, {dateStyle:'short'})" @click.prevent="changeToMonth(day)">
-					<div class="fw-bold">{{day.toLocaleString(undefined, {weekday: size < 2 ? 'narrow' : (size < 3 ? 'short' : 'long')})}}</div>
-					<a href="#" class="small text-secondary text-decoration-none" >{{day.toLocaleString(undefined, [{day:'numeric',month:'numeric'},{day:'numeric',month:'numeric'},{day:'numeric',month:'numeric'},{dateStyle:'short'}][this.size])}}</a>
+	<div class="fhc-calendar-day-page ">
+		<div class="row">
+			<div class="col-6">
+				<div class="d-flex flex-column">
+				<div class="fhc-calendar-week-page-header d-grid border-2 border-bottom text-center" :style="{'z-index':4,'grid-template-columns': 'repeat(' + days.length + ', 1fr)', 'grid-template-rows':1}" style="position:sticky; top:0; " >
+					<div type="button" v-for="day in days" :key="day" class="flex-grow-1" :title="day.toLocaleString(undefined, {dateStyle:'short'})" @click.prevent="changeToMonth(day)">
+						<div class="fw-bold">{{day.toLocaleString(undefined, {weekday: size < 2 ? 'narrow' : (size < 3 ? 'short' : 'long')})}}</div>
+						<a href="#" class="small text-secondary text-decoration-none" >{{day.toLocaleString(undefined, [{day:'numeric',month:'numeric'},{day:'numeric',month:'numeric'},{day:'numeric',month:'numeric'},{dateStyle:'short'}][this.size])}}</a>
+					</div>
+				</div>
+				<div ref="eventcontainer" class="position-relative flex-grow-1" @mousemove="calcHourPosition" @mouseleave="" >
+					<div v-for="hour in hours" :key="hour"  class="position-absolute border-top" style="pointer-events: none;" :style="{top:getAbsolutePositionForHour(hour),left:0,right:0,'z-index':0}"></div>
+					<div v-if="hourPosition" class="position-absolute border-top small"  style="pointer-events: none; padding-left:3.5rem; margin-top:-1px;z-index:2;border-color:#00649C !important" :style="{top:hourPosition+'px',left:0,right:0}">
+						<span class="border border-top-0 px-2 bg-white">{{hourPositionTime}}</span>
+					</div>
+					<div class="events">
+						<div class="hours">
+							<div v-for="hour in hours" style="min-height:100px" :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
+						</div>
+						<div v-for="day in eventsPerDayAndHour" :key="day" class=" day border-start" :style="{'grid-template-columns': '1 1fr', 'grid-template-rows': 'repeat(' + (hours.length * 60 / smallestTimeFrame) + ', 1fr)'}">
+							<div  :style="{'background-color':event.orig.color}" class="mx-2 border border-dark border-2 small rounded overflow-hidden "  @click.prevent="$emit('input', event.orig)" :style="{'z-index':1,'grid-column-start': 1+(event.lane-1)*day.lanes/event.maxLane, 'grid-column-end': 1+event.lane*day.lanes/event.maxLane, 'grid-row-start': dateToMinutesOfDay(event.start), 'grid-row-end': dateToMinutesOfDay(event.end) ,'--test': dateToMinutesOfDay(event.end)}" v-for="event in day.events" :key="event">
+								<slot  name="dayPage" :event="event" :day="day">
+									<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
+								</slot>
+							</div>
+
+						</div>
+					</div>
 				</div>
 			</div>
-			<div ref="eventcontainer" class="position-relative flex-grow-1" @mousemove="calcHourPosition" @mouseleave="" >
-				<div v-for="hour in hours" :key="hour"  class="position-absolute border-top" style="pointer-events: none;" :style="{top:getAbsolutePositionForHour(hour),left:0,right:0,'z-index':0}"></div>
-				<div v-if="hourPosition" class="position-absolute border-top small"  style="pointer-events: none; padding-left:3.5rem; margin-top:-1px;z-index:2;border-color:#00649C !important" :style="{top:hourPosition+'px',left:0,right:0}">
-					<span class="border border-top-0 px-2 bg-white">{{hourPositionTime}}</span>
-				</div>
-				<div class="events">
-					<div class="hours">
-						<div v-for="hour in hours" style="min-height:100px" :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
-					</div>
-					<div v-for="day in eventsPerDayAndHour" :key="day" class=" day border-start" :style="{'grid-template-columns': 'repeat(' + day.lanes + ', 1fr)', 'grid-template-rows': 'repeat(' + (hours.length * 60 / smallestTimeFrame) + ', 1fr)'}">
-						<div  :style="{'background-color':event.orig.color}" class="mx-2 border border-dark border-2 small rounded overflow-hidden "  @click.prevent="$emit('input', event.orig)" :style="{'z-index':1,'grid-column-start': 1+(event.lane-1)*day.lanes/event.maxLane, 'grid-column-end': 1+event.lane*day.lanes/event.maxLane, 'grid-row-start': dateToMinutesOfDay(event.start), 'grid-row-end': dateToMinutesOfDay(event.end) ,'--test': dateToMinutesOfDay(event.end)}" v-for="event in day.events" :key="event">	
-							<slot  name="dayPage" :event="event" :day="day">
-								<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
-							</slot>
-						</div>
-						
-					</div>
+			</div>
+			<div class="col-6">
+				<div class="bg-secondary h-100 d-flex justify-content-center align-items-center">
+					<p class="text-white fs-1" >other content goes in here</p>
 				</div>
 			</div>
 		</div>
+		
 	</div>`
 }

From b7e89ab55795b57a799baa4072f139df1cd730ab Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 11 Nov 2024 11:27:23 +0100
Subject: [PATCH 1375/1461] fix(Stundenplan hour lines): fixes the hour lines
 from disapearing on smaller viewports by using a box-shadow instead

---
 public/css/components/calendar.css         | 5 +++++
 public/js/components/Calendar/Day/Page.js  | 6 +++---
 public/js/components/Calendar/Week/Page.js | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index 2806ec60f..93c351120 100644
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -63,6 +63,11 @@
   display: grid;
 }
 
+/* grid hour lines of the Stundenplan use box-shadow instead of border because box-shadow renders consistently on different viewports*/
+.box-shadow-border-top{
+	box-shadow: 0 0 0 1px #dee2e6 !important;
+}
+
 .fhc-calendar-day-page {
   /*aspect-ratio: 7/6;*/
   min-height: 0;
diff --git a/public/js/components/Calendar/Day/Page.js b/public/js/components/Calendar/Day/Page.js
index 7ff94b5e5..877ab9873 100644
--- a/public/js/components/Calendar/Day/Page.js
+++ b/public/js/components/Calendar/Day/Page.js
@@ -140,7 +140,7 @@ export default {
 	template: /*html*/`
 	<div class="fhc-calendar-day-page ">
 		<div class="row">
-			<div class="col-6">
+			<div class="col-12 col-xl-6">
 				<div class="d-flex flex-column">
 				<div class="fhc-calendar-week-page-header d-grid border-2 border-bottom text-center" :style="{'z-index':4,'grid-template-columns': 'repeat(' + days.length + ', 1fr)', 'grid-template-rows':1}" style="position:sticky; top:0; " >
 					<div type="button" v-for="day in days" :key="day" class="flex-grow-1" :title="day.toLocaleString(undefined, {dateStyle:'short'})" @click.prevent="changeToMonth(day)">
@@ -149,7 +149,7 @@ export default {
 					</div>
 				</div>
 				<div ref="eventcontainer" class="position-relative flex-grow-1" @mousemove="calcHourPosition" @mouseleave="" >
-					<div v-for="hour in hours" :key="hour"  class="position-absolute border-top" style="pointer-events: none;" :style="{top:getAbsolutePositionForHour(hour),left:0,right:0,'z-index':0}"></div>
+					<div v-for="hour in hours" :key="hour"  class="position-absolute box-shadow-border-top" style="pointer-events: none;" :style="{top:getAbsolutePositionForHour(hour),left:0,right:0,'z-index':0}"></div>
 					<div v-if="hourPosition" class="position-absolute border-top small"  style="pointer-events: none; padding-left:3.5rem; margin-top:-1px;z-index:2;border-color:#00649C !important" :style="{top:hourPosition+'px',left:0,right:0}">
 						<span class="border border-top-0 px-2 bg-white">{{hourPositionTime}}</span>
 					</div>
@@ -169,7 +169,7 @@ export default {
 				</div>
 			</div>
 			</div>
-			<div class="col-6">
+			<div class="d-none d-xl-block col-xl-6">
 				<div class="bg-secondary h-100 d-flex justify-content-center align-items-center">
 					<p class="text-white fs-1" >other content goes in here</p>
 				</div>
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index 75b7bed4d..2eba70699 100644
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -150,7 +150,7 @@ export default {
 				</div>
 			</div>
 			<div ref="eventcontainer" class="position-relative flex-grow-1" @mousemove="calcHourPosition" @mouseleave="" >
-				<div v-for="hour in hours" :key="hour"  class="position-absolute border-top" style="pointer-events: none;" :style="{top:getAbsolutePositionForHour(hour),left:0,right:0,'z-index':0}"></div>
+				<div v-for="hour in hours" :key="hour"  class="position-absolute box-shadow-border-top" style="pointer-events: none;" :style="{top:getAbsolutePositionForHour(hour),left:0,right:0,'z-index':0}"></div>
 				<div v-if="hourPosition" class="position-absolute border-top small"  style="pointer-events: none; padding-left:3.5rem; margin-top:-1px;z-index:2;border-color:#00649C !important" :style="{top:hourPosition+'px',left:0,right:0}">
 					<span class="border border-top-0 px-2 bg-white">{{hourPositionTime}}</span>
 				</div>

From bd54399cfd545564653a7e3a992b230675ddf23c Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 11 Nov 2024 14:11:01 +0100
Subject: [PATCH 1376/1461] fix(Calendar Header): adds responsiveness to the
 calendar header and the view button group next to the header

---
 public/css/components/calendar.css      |  2 +-
 public/js/components/Calendar/Header.js | 55 +++++++++++++------------
 2 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index 93c351120..157836afc 100644
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -77,7 +77,7 @@
   /*width: calc(100% + 1.5em);*/
   height: calc(100% + 1.5em);
 }
-.fhc-calendar-day-page .flex-column > div {
+.fhc-calendar-day-page .flex-column > .flex-grow-1 {
   padding-left: 3em;
 }
 .fhc-calendar-day-page .flex-column {
diff --git a/public/js/components/Calendar/Header.js b/public/js/components/Calendar/Header.js
index aece861b4..07fc58ceb 100644
--- a/public/js/components/Calendar/Header.js
+++ b/public/js/components/Calendar/Header.js
@@ -7,6 +7,7 @@ export default {
 				month:"Monat",
 				day: "Tag", 
 			},
+			headerPadding:null,
 		}
 	},
 	inject: [
@@ -44,36 +45,38 @@ export default {
 			return c;
 		}
 	},
-	template: `
+	template: /*html*/`
 	<div class="calendar-header card-header w-100" :class="classHeader">
-
-		<div v-if="!noWeekView && !noMonthView" class="row justify-content-end" style="position: absolute; width: 98%; pointer-events: none;">
-			<div class="col-auto" style="pointer-events: all;">
-				<div  role="group" aria-label="Kalender Modus">
-					<button type="button" :class="{'active':mode_kurzbz == mode}" style="margin-right: 4px;" @click.prevent="$emit('updateMode',mode_kurzbz)" class="btn btn-outline-secondary" v-for="(mode_bezeichnung,mode_kurzbz) in modes">
-						<i v-if="!noWeekView && mode_kurzbz == 'week'" class="fa fa-calendar-week"></i>
-						<i v-else-if="!noMonthView && mode_kurzbz == 'month'" class="fa fa-calendar-days"></i>
-						<i v-else-if="mode_kurzbz == 'day'" class="fa-solid fa-sun"></i>
-					</button>
+		<div class="row align-items-center ">
+			<div class="col offset-0 offset-md-3" :style="{'padding-left':headerPadding}">
+				<div class="row align-items-center justify-content-center">
+					<div class="col-auto ">
+						<button class="btn btn-outline-secondary border-0" :class="{'btn-sm':!this.size}" @click="$emit('prev')"><i class="fa fa-chevron-left"></i></button>
+					</div>
+					<div class="justify-content-center text-center col-auto">
+						<div class="d-flex justify-content-center align-items-center">
+							<button class="btn btn-link link-secondary text-decoration-none" :class="{'btn-sm': !this.size}" @click="$emit('click')">
+								{{ title }}
+								<i v-if="eventsAreNull" class="fa fa-spinner fa-pulse"></i>
+							</button>
+						</div>
+					</div>
+					<div class="col-auto ">
+						<button class="btn btn-outline-secondary border-0" :class="{'btn-sm': !this.size}" @click="$emit('next')"><i class="fa fa-chevron-right"></i></button>
+					</div>
 				</div>
-			</div>
-		</div>
-
-		<div class="row">
-			<div class="col-5 d-flex justify-content-end">
-				<button class="btn btn-outline-secondary border-0" :class="{'btn-sm':!this.size}" @click="$emit('prev')"><i class="fa fa-chevron-left"></i></button>
-			</div>
-			<div class="justify-content-center text-center col-2">
-				<div class="d-flex justify-content-center align-items-center">
-					<button class="btn btn-link link-secondary text-decoration-none" :class="{'btn-sm': !this.size}" @click="$emit('click')">
-						{{ title }}
-						<i v-if="eventsAreNull" class="fa fa-spinner fa-pulse"></i>
-					</button>
+			</div>	
+			<div ref="viewButtons" v-if="!noWeekView && !noMonthView" class=" col-12 col-md-3 d-flex justify-content-center justify-content-md-end align-items-center" style="pointer-events: none;">
+				<div  style="pointer-events: all;">
+					<div  role="group" aria-label="Kalender Modus">
+						<button type="button" :class="{'active':mode_kurzbz == mode}" style="margin-right: 4px;" @click.prevent="$emit('updateMode',mode_kurzbz)" class="btn btn-outline-secondary" v-for="(mode_bezeichnung,mode_kurzbz) in modes">
+							<i v-if="!noWeekView && mode_kurzbz == 'week'" class="fa fa-calendar-week"></i>
+							<i v-else-if="!noMonthView && mode_kurzbz == 'month'" class="fa fa-calendar-days"></i>
+							<i v-else-if="mode_kurzbz == 'day'" class="fa-solid fa-sun"></i>
+						</button>
+					</div>
 				</div>
 			</div>
-			<div class="col-5 d-flex justify-content-start">
-				<button class="btn btn-outline-secondary border-0" :class="{'btn-sm': !this.size}" @click="$emit('next')"><i class="fa fa-chevron-right"></i></button>
-			</div>
 		</div>
 	</div>`
 }
\ No newline at end of file

From bd1ce9fa630630d57b2ed25b58adacc3f14a69ed Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 11 Nov 2024 14:27:12 +0100
Subject: [PATCH 1377/1461] refactor(Calendar Header): refactors view buttons
 in the calendar header

---
 public/js/components/Calendar/Header.js | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/public/js/components/Calendar/Header.js b/public/js/components/Calendar/Header.js
index 07fc58ceb..8cb047919 100644
--- a/public/js/components/Calendar/Header.js
+++ b/public/js/components/Calendar/Header.js
@@ -3,9 +3,9 @@ export default {
 		return{
 			selected: this.mode,
 			modes:{
-				week:"Woche", 
-				month:"Monat",
-				day: "Tag", 
+				week: { mode_bezeichnung: "Woche", icon: "fa-calendar-week", condition: !this.noWeekView }, 
+				month: { mode_bezeichnung: "Monat", icon: "fa-calendar-days", condition: !this.noMonthView }, 
+				day: { mode_bezeichnung: "Tag", icon: "fa-sun" , condition:true}, 
 			},
 			headerPadding:null,
 		}
@@ -65,14 +65,12 @@ export default {
 						<button class="btn btn-outline-secondary border-0" :class="{'btn-sm': !this.size}" @click="$emit('next')"><i class="fa fa-chevron-right"></i></button>
 					</div>
 				</div>
-			</div>	
+			</div>
 			<div ref="viewButtons" v-if="!noWeekView && !noMonthView" class=" col-12 col-md-3 d-flex justify-content-center justify-content-md-end align-items-center" style="pointer-events: none;">
 				<div  style="pointer-events: all;">
 					<div  role="group" aria-label="Kalender Modus">
-						<button type="button" :class="{'active':mode_kurzbz == mode}" style="margin-right: 4px;" @click.prevent="$emit('updateMode',mode_kurzbz)" class="btn btn-outline-secondary" v-for="(mode_bezeichnung,mode_kurzbz) in modes">
-							<i v-if="!noWeekView && mode_kurzbz == 'week'" class="fa fa-calendar-week"></i>
-							<i v-else-if="!noMonthView && mode_kurzbz == 'month'" class="fa fa-calendar-days"></i>
-							<i v-else-if="mode_kurzbz == 'day'" class="fa-solid fa-sun"></i>
+						<button type="button" :class="{'active':mode_kurzbz === mode}" style="margin-right: 4px;" @click.prevent="$emit('updateMode',mode_kurzbz)" class="btn btn-outline-secondary" v-for="({mode_bezeichnung,icon,condition},mode_kurzbz) in modes">
+							<i v-if="condition" class="fa" :class="icon" ></i>
 						</button>
 					</div>
 				</div>

From 094a3ed56a585f85e3c488bf0513090d6cd3c88b Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 11 Nov 2024 15:46:09 +0100
Subject: [PATCH 1378/1461] feature(Calendar): scrolls to the first event of
 the day if the prop scrollTime is passed to Calendar component

---
 public/js/apps/Cis/Stundenplan.js          | 20 ++++++++++++++++++--
 public/js/components/Calendar/Calendar.js  | 17 ++++++++++++++++-
 public/js/components/Calendar/Day/Page.js  |  2 +-
 public/js/components/Calendar/Week/Page.js |  7 ++++---
 4 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/public/js/apps/Cis/Stundenplan.js b/public/js/apps/Cis/Stundenplan.js
index cb019952c..6835dc3a3 100644
--- a/public/js/apps/Cis/Stundenplan.js
+++ b/public/js/apps/Cis/Stundenplan.js
@@ -32,6 +32,17 @@ const app = Vue.createApp({
 		monthLastDay: function () {
 			return this.calendarDateToString(this.calendarDate.cdLastDayOfCalendarMonth);
 		},
+		// returns the hour of the earliest event 
+		eventsBeginnTime: function(){
+			if(this.events && Array.isArray(this.events) && this.events.length > 0)
+			{
+				return parseInt(this.events.sort((a, b) => parseInt(a.beginn) - parseInt(b.beginn))[0].beginn);
+			}
+			else
+			{
+				return null;
+			}
+		},
 	},
 	methods:{
 		selectDay: function(day){
@@ -98,15 +109,20 @@ const app = Vue.createApp({
 			});
 		},
 	},
-	created(){
+	created()
+	{
 		this.loadEvents();
+	},
+	mounted()
+	{
+		
 	},
 	//TODO: Stundenplan phrase
 	template:/*html*/`
 	<h2>Stundenplan</h2>
 	<hr>
 	<lv-modal v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ref="lvmodal" />
-	<fhc-calendar :initial-date="currentDay" @change:range="updateRange" :events="events" initial-mode="week" show-weeks @select:day="selectDay" v-model:minimized="minimized">
+	<fhc-calendar :scrollTime="eventsBeginnTime" :initial-date="currentDay" @change:range="updateRange" :events="events" initial-mode="week" show-weeks @select:day="selectDay" v-model:minimized="minimized">
 		<template #weekPage="{event,day}">
 			<div @click="showModal(event?.orig)" type="button" class="d-flex flex-column align-items-center justify-content-evenly h-100">
 				<span>{{event?.orig.topic}}</span>
diff --git a/public/js/components/Calendar/Calendar.js b/public/js/components/Calendar/Calendar.js
index dd12456ca..73ad54730 100644
--- a/public/js/components/Calendar/Calendar.js
+++ b/public/js/components/Calendar/Calendar.js
@@ -55,7 +55,22 @@ export default {
 		},
 		minimized: Boolean,
 		noWeekView: Boolean,
-		noMonthView: Boolean
+		noMonthView: Boolean,
+		scrollTime: Number,
+	},
+	watch:{
+		scrollTime(newScrollTime){
+			let previousScrollAnchor = document.getElementById('scroll' + (newScrollTime-1) + this.focusDate.w)			// scroll the Stundenplan to the closest event
+			let scrollAnchor = document.getElementById('scroll' + newScrollTime+this.focusDate.w);
+			if (previousScrollAnchor)
+			{
+				previousScrollAnchor.scrollIntoView();
+			}else{
+				if (scrollAnchor) {
+					scrollAnchor.scrollIntoView();
+				}
+			}
+		}
 	},
 	emits: [
 		'select:day',
diff --git a/public/js/components/Calendar/Day/Page.js b/public/js/components/Calendar/Day/Page.js
index 877ab9873..e02cffa3f 100644
--- a/public/js/components/Calendar/Day/Page.js
+++ b/public/js/components/Calendar/Day/Page.js
@@ -149,7 +149,7 @@ export default {
 					</div>
 				</div>
 				<div ref="eventcontainer" class="position-relative flex-grow-1" @mousemove="calcHourPosition" @mouseleave="" >
-					<div v-for="hour in hours" :key="hour"  class="position-absolute box-shadow-border-top" style="pointer-events: none;" :style="{top:getAbsolutePositionForHour(hour),left:0,right:0,'z-index':0}"></div>
+					<div :id="'scroll'+hour+week" v-for="hour in hours" :key="hour"  class="position-absolute box-shadow-border-top" style="pointer-events: none;" :style="{top:getAbsolutePositionForHour(hour),left:0,right:0,'z-index':0}"></div>
 					<div v-if="hourPosition" class="position-absolute border-top small"  style="pointer-events: none; padding-left:3.5rem; margin-top:-1px;z-index:2;border-color:#00649C !important" :style="{top:hourPosition+'px',left:0,right:0}">
 						<span class="border border-top-0 px-2 bg-white">{{hourPositionTime}}</span>
 					</div>
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index 2eba70699..001bbfe33 100644
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -137,11 +137,12 @@ export default {
 		}
 	},
 	mounted() {
+
 		setTimeout(() => this.$refs.eventcontainer.scrollTop = this.$refs.eventcontainer.scrollHeight / 3 + 1, 0);
 	},
-	template: `
+	template: /*html*/`
 	<div class="fhc-calendar-week-page">
-	
+
 		<div class="d-flex flex-column">
 			<div class="fhc-calendar-week-page-header d-grid border-2 border-bottom text-center" :style="{'z-index':4,'grid-template-columns': 'repeat(' + days.length + ', 1fr)', 'grid-template-rows':1}" style="position:sticky; top:0; " >
 				<div type="button" v-for="day in days" :key="day" class="flex-grow-1" :title="day.toLocaleString(undefined, {dateStyle:'short'})" @click.prevent="changeToMonth(day)">
@@ -150,7 +151,7 @@ export default {
 				</div>
 			</div>
 			<div ref="eventcontainer" class="position-relative flex-grow-1" @mousemove="calcHourPosition" @mouseleave="" >
-				<div v-for="hour in hours" :key="hour"  class="position-absolute box-shadow-border-top" style="pointer-events: none;" :style="{top:getAbsolutePositionForHour(hour),left:0,right:0,'z-index':0}"></div>
+				<div :id="'scroll'+hour+week" v-for="hour in hours" :key="hour"  class="position-absolute box-shadow-border-top" style="pointer-events: none;" :style="{top:getAbsolutePositionForHour(hour),left:0,right:0,'z-index':0}"></div>
 				<div v-if="hourPosition" class="position-absolute border-top small"  style="pointer-events: none; padding-left:3.5rem; margin-top:-1px;z-index:2;border-color:#00649C !important" :style="{top:hourPosition+'px',left:0,right:0}">
 					<span class="border border-top-0 px-2 bg-white">{{hourPositionTime}}</span>
 				</div>

From 85bec1e0e3c5f829a6e961e86b0e228c8da0416a Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 11 Nov 2024 15:49:03 +0100
Subject: [PATCH 1379/1461] section spacing; dashboard widgets section
 backgrounds; set scrollbar width css variable via new helper in FhcApp
 (Dashboard); WIP stundenplan alle Termine einer LV -> c4 link in bfi addon
 adapted;

---
 public/css/Cis4/Cis.css                   |  2 +-
 public/js/apps/Dashboard/Fhc.js           |  4 ++++
 public/js/components/Dashboard/Section.js | 17 +++++++++----
 public/js/components/Drop/Grid.js         | 16 +++++++++----
 public/js/helpers/CssVarCalcHelpers.js    | 29 +++++++++++++++++++++++
 5 files changed, 58 insertions(+), 10 deletions(-)
 create mode 100644 public/js/helpers/CssVarCalcHelpers.js

diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index 2609b0091..5c98ccb1d 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -238,7 +238,7 @@ html {
   body {
     display: flex;
     padding-top: var(--fhc-cis-header-height);
-    width: calc(100vw - var(--scrollbar-width, 0px));
+    width: calc(100svw - var(--scrollbar-width, 0px));
     /* overflow: visible !important; */
   }
   #cis-header {
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index fb338c1ae..b060e1b59 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -1,6 +1,7 @@
 import FhcDashboard from '../../components/Dashboard/Dashboard.js';
 import FhcApi from '../../plugin/FhcApi.js';
 import Phrasen from '../../plugin/Phrasen.js';
+import { setScrollbarWidth } from "../../helpers/CssVarCalcHelpers";
 
 const app = Vue.createApp({
   name: 'FhcApp',
@@ -11,6 +12,9 @@ const app = Vue.createApp({
     FhcDashboard
   }
 });
+
+setScrollbarWidth();
+
 app.config.unwrapInjectedRef = true;
 app.use(FhcApi);
 app.use(Phrasen);
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 6c7445b9f..ac11ddd2f 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -31,6 +31,13 @@ export default {
 		}
 	},
 	computed: {
+		getSectionStyle() {
+
+			const bgString = `background: 
+			  linear-gradient(0deg, rgba(128, 128, 128, 0.05) 0%, rgba(128, 128, 128, 0.1) 50%, rgba(128, 128, 128, 0.05) 100%)`
+
+			return 'margin-bottom: 8px;' + bgString;
+		},
 		items() {
 			return this.widgets.map(item => {
 				return { ...item, ...(item.place[this.gridWidth] || {h: 1, w:1, x:0, y:0})};
@@ -170,10 +177,10 @@ export default {
 		});
 	},
 	template: `
-	<div class="dashboard-section" ref="container">
-		<h3 class="d-flex">
-			<span class="col">{{name}}</span>
-			<button class="col-auto btn" @click.prevent="editMode = !editMode"><i class="fa-solid fa-gear"></i></button>
+	<div class="dashboard-section" ref="container" :style="getSectionStyle">
+		<h3>
+			<span >{{$p.t('ui/section' + name)}}</span>
+			<button style="margin-left: 8px;" class="btn" @click="editMode = !editMode"><i class="fa-solid fa-gear"></i></button>
 		</h3>
 		<drop-grid v-model:cols="gridWidth" :items="items" :placeholders="items_placeholders" :active="editMode" :resize-limit="checkResizeLimit" :margin-for-extra-row=".01" @rearrange-items="updatePositions" @gridHeight="gridHeight=$event" >
 			<template #default="item" #default>
@@ -203,4 +210,4 @@ OLD VERSION - ON HOVER
 <template #empty-tile-hover="{x,y}">
 	<div class="empty-tile-hover" @click="$emit('widgetAdd', name, { widget: 1, config: {}, place: {[gridWidth]: {x,y,w:1,h:1}}, custom: 1 })"></div>
 </template>
-*/
+*/
\ No newline at end of file
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index a55498eb8..a592c0020 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -61,6 +61,8 @@ export default {
 			return {
 				'--fhc-dg-row-height': 100/(this.rows + addH) + '%',
 				'--fhc-dg-col-width': 100/this.cols + '%',
+				'--fhc-dg-item-padding-horizontal': '0.5%',
+				'--fhc-dg-item-padding-top': '0.5%',
 				'padding-bottom': 100 * (this.rows + addH)/this.cols + '%'
 			}
 		},
@@ -130,9 +132,12 @@ export default {
 		cols() {
 			this.dragCancel();
 		},
-	    rows(value){
-			this.$emit('gridHeight',value);
-		}, 
+	    rows: {
+			handler(value) {
+				this.$emit('gridHeight', value);
+			},
+			immediate: true
+		},
 		indexedItems: {
 			handler(value) {
 				this.dragCancel();
@@ -366,7 +371,10 @@ export default {
 				top: 'calc(' + item.y + ' * var(--fhc-dg-row-height))',
 				left: 'calc(' + item.x + ' * var(--fhc-dg-col-width))',
 				width: 'calc(' + item.w + ' * var(--fhc-dg-col-width))',
-				height: 'calc(' + item.h + ' * var(--fhc-dg-row-height))'
+				height: 'calc(' + item.h + ' * var(--fhc-dg-row-height))',
+				paddingTop: 'var(--fhc-dg-item-padding-top)',
+				paddingLeft: 'var(--fhc-dg-item-padding-horizontal)',
+				paddingRight: 'var(--fhc-dg-item-padding-horizontal)'
 			}">
 			<template v-slot="item">
 				<slot v-bind="item.data" v-bind="item" :x="item.x" :y="item.y" ></slot>
diff --git a/public/js/helpers/CssVarCalcHelpers.js b/public/js/helpers/CssVarCalcHelpers.js
new file mode 100644
index 000000000..4cfdb6840
--- /dev/null
+++ b/public/js/helpers/CssVarCalcHelpers.js
@@ -0,0 +1,29 @@
+// Create a temporary div element, set styles to ensure it's scrollable and off-screen, get scrollbar width from that
+function getScrollbarWidth() {
+	const div = document.createElement('div');
+
+	div.style.position = 'absolute';
+	div.style.top = '-9999px';
+	div.style.width = '100px';
+	div.style.height = '100px';
+	div.style.overflow = 'scroll';
+
+	document.body.appendChild(div);
+	const scrollbarWidth = div.offsetWidth - div.clientWidth;
+	document.body.removeChild(div);
+
+	return scrollbarWidth;
+}
+
+// Detect the browser and set a CSS variable for the scrollbar width since chrome scrollbars mess with 100vw/vh css
+export function setScrollbarWidth() {
+	const isChromium = /Chrome/.test(navigator.userAgent);
+	const isFirefox = /Firefox/.test(navigator.userAgent);
+
+	if (isChromium) {
+		const width = getScrollbarWidth() + 'px';
+		document.body.style.setProperty('--scrollbar-width', width); // Set the value for Chrome
+	} else if (isFirefox) {
+		document.body.style.setProperty('--scrollbar-width', '0px'); // Set the value for Firefox or adjust as needed
+	}
+}
\ No newline at end of file

From 35691b39c40ab527b52d01134171f0fcf18c892e Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 11 Nov 2024 16:15:14 +0100
Subject: [PATCH 1380/1461] fix(Calendar scroll): fixes the scroll feature for
 the Calendar

---
 public/js/apps/Cis/Stundenplan.js         | 16 +++--------
 public/js/components/Calendar/Calendar.js | 33 ++++++++++++++++++++---
 2 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/public/js/apps/Cis/Stundenplan.js b/public/js/apps/Cis/Stundenplan.js
index 6835dc3a3..1248f18e0 100644
--- a/public/js/apps/Cis/Stundenplan.js
+++ b/public/js/apps/Cis/Stundenplan.js
@@ -32,17 +32,7 @@ const app = Vue.createApp({
 		monthLastDay: function () {
 			return this.calendarDateToString(this.calendarDate.cdLastDayOfCalendarMonth);
 		},
-		// returns the hour of the earliest event 
-		eventsBeginnTime: function(){
-			if(this.events && Array.isArray(this.events) && this.events.length > 0)
-			{
-				return parseInt(this.events.sort((a, b) => parseInt(a.beginn) - parseInt(b.beginn))[0].beginn);
-			}
-			else
-			{
-				return null;
-			}
-		},
+		
 	},
 	methods:{
 		selectDay: function(day){
@@ -64,7 +54,7 @@ const app = Vue.createApp({
 			if (checkDate(new CalendarDate(start)) && checkDate(new CalendarDate(end))){
 				// reset the events before querying the new events to activate the loading spinner
 				this.events = null;
-				this.calendarDate = tmp_date;
+				this.calendarDate = new CalendarDate(end);
 				Vue.nextTick(() => {
 					this.loadEvents();
 				});
@@ -122,7 +112,7 @@ const app = Vue.createApp({
 	<h2>Stundenplan</h2>
 	<hr>
 	<lv-modal v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ref="lvmodal" />
-	<fhc-calendar :scrollTime="eventsBeginnTime" :initial-date="currentDay" @change:range="updateRange" :events="events" initial-mode="week" show-weeks @select:day="selectDay" v-model:minimized="minimized">
+	<fhc-calendar :initial-date="currentDay" @change:range="updateRange" :events="events" initial-mode="week" show-weeks @select:day="selectDay" v-model:minimized="minimized">
 		<template #weekPage="{event,day}">
 			<div @click="showModal(event?.orig)" type="button" class="d-flex flex-column align-items-center justify-content-evenly h-100">
 				<span>{{event?.orig.topic}}</span>
diff --git a/public/js/components/Calendar/Calendar.js b/public/js/components/Calendar/Calendar.js
index 73ad54730..ab1d5067e 100644
--- a/public/js/components/Calendar/Calendar.js
+++ b/public/js/components/Calendar/Calendar.js
@@ -56,20 +56,22 @@ export default {
 		minimized: Boolean,
 		noWeekView: Boolean,
 		noMonthView: Boolean,
-		scrollTime: Number,
 	},
 	watch:{
+		// scroll to the first event if the html element was found
 		scrollTime(newScrollTime){
 			let previousScrollAnchor = document.getElementById('scroll' + (newScrollTime-1) + this.focusDate.w)			// scroll the Stundenplan to the closest event
 			let scrollAnchor = document.getElementById('scroll' + newScrollTime+this.focusDate.w);
 			if (previousScrollAnchor)
 			{
-				previousScrollAnchor.scrollIntoView();
+				previousScrollAnchor.scrollIntoView({ behavior: 'smooth', block: 'start' });
 			}else{
 				if (scrollAnchor) {
-					scrollAnchor.scrollIntoView();
+					scrollAnchor.scrollIntoView({ behavior: 'smooth', block: 'start' });
 				}
 			}
+
+			
 		}
 	},
 	emits: [
@@ -117,7 +119,29 @@ export default {
 				}
 				return result;
 			}, {});
-		}
+		},
+		// returns the hour of the earliest event 
+		scrollTime: function () {
+			if (this.events && Array.isArray(this.events) && this.events.length > 0) {
+				let filteredEvents = this.events.filter(event => {
+					let eventDate = new CalendarDate(new Date(event.datum));
+					return this.focusDate.w == eventDate.w;
+				})
+				// return the first beginning time of the filtered events
+				if(filteredEvents.length > 0)
+				{
+					return parseInt(filteredEvents.sort((a, b) => parseInt(a.beginn) - parseInt(b.beginn))[0].beginn);
+				}
+				// if there is not filtered event that matches the current week
+				else 
+				{
+					return null;
+				}
+			}
+			else {
+				return null;
+			}
+		},
 	},
 	methods: {
 		handleInput(day) {
@@ -151,6 +175,7 @@ export default {
 				}
 			}).observe(this.$refs.container);
 		}
+
 	},
 	template: /*html*/`
 	<div ref="container" class="fhc-calendar card" :class="sizeClass">

From 6cf7a8e35e53b76988c6122170e0584bec5ebbbc Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 12 Nov 2024 09:48:03 +0100
Subject: [PATCH 1381/1461] fix(Calendar scroll): extends the id of the scroll
 anchor to include hour/day/week and changes the logic to search for the
 anchor depend on the week or day view

---
 public/js/components/Calendar/Calendar.js  | 30 +++++++++++++++-------
 public/js/components/Calendar/Day/Page.js  |  2 +-
 public/js/components/Calendar/Week/Page.js |  2 +-
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/public/js/components/Calendar/Calendar.js b/public/js/components/Calendar/Calendar.js
index ab1d5067e..0d29c3eb7 100644
--- a/public/js/components/Calendar/Calendar.js
+++ b/public/js/components/Calendar/Calendar.js
@@ -59,19 +59,23 @@ export default {
 	},
 	watch:{
 		// scroll to the first event if the html element was found
-		scrollTime(newScrollTime){
-			let previousScrollAnchor = document.getElementById('scroll' + (newScrollTime-1) + this.focusDate.w)			// scroll the Stundenplan to the closest event
-			let scrollAnchor = document.getElementById('scroll' + newScrollTime+this.focusDate.w);
+		async scrollTime(newScrollTime){
+			// scroll the Stundenplan to the closest event
+			await Vue.nextTick();
+			let previousScrollAnchor = document.getElementById('scroll' + (newScrollTime-1) + this.focusDate.d + this.focusDate.w)			
+			let scrollAnchor = document.getElementById('scroll' + newScrollTime+this.focusDate.d+this.focusDate.w);
+
 			if (previousScrollAnchor)
 			{
 				previousScrollAnchor.scrollIntoView({ behavior: 'smooth', block: 'start' });
-			}else{
-				if (scrollAnchor) {
+			}
+			else
+			{
+				if (scrollAnchor) 
+				{
 					scrollAnchor.scrollIntoView({ behavior: 'smooth', block: 'start' });
 				}
 			}
-
-			
 		}
 	},
 	emits: [
@@ -120,12 +124,20 @@ export default {
 				return result;
 			}, {});
 		},
-		// returns the hour of the earliest event 
+		// returns the hour of the earliest event, used to scroll to the events in the calendar (week / day view)
 		scrollTime: function () {
 			if (this.events && Array.isArray(this.events) && this.events.length > 0) {
 				let filteredEvents = this.events.filter(event => {
+					// week view filters the elements only for the same week
 					let eventDate = new CalendarDate(new Date(event.datum));
-					return this.focusDate.w == eventDate.w;
+					if(this.mode == 'week'){
+						return this.focusDate.w == eventDate.w;
+					}
+					// day view filters the elements for the same day and the same week
+					else if(this.mode == 'day'){
+						
+						return this.focusDate.d == eventDate.d && this.focusDate.w == eventDate.w;
+					}
 				})
 				// return the first beginning time of the filtered events
 				if(filteredEvents.length > 0)
diff --git a/public/js/components/Calendar/Day/Page.js b/public/js/components/Calendar/Day/Page.js
index e02cffa3f..b9f0e34a8 100644
--- a/public/js/components/Calendar/Day/Page.js
+++ b/public/js/components/Calendar/Day/Page.js
@@ -149,7 +149,7 @@ export default {
 					</div>
 				</div>
 				<div ref="eventcontainer" class="position-relative flex-grow-1" @mousemove="calcHourPosition" @mouseleave="" >
-					<div :id="'scroll'+hour+week" v-for="hour in hours" :key="hour"  class="position-absolute box-shadow-border-top" style="pointer-events: none;" :style="{top:getAbsolutePositionForHour(hour),left:0,right:0,'z-index':0}"></div>
+					<div :id="'scroll'+hour+focusDate.d+week" v-for="hour in hours" :key="hour"  class="position-absolute box-shadow-border-top" style="pointer-events: none;" :style="{top:getAbsolutePositionForHour(hour),left:0,right:0,'z-index':0}"></div>
 					<div v-if="hourPosition" class="position-absolute border-top small"  style="pointer-events: none; padding-left:3.5rem; margin-top:-1px;z-index:2;border-color:#00649C !important" :style="{top:hourPosition+'px',left:0,right:0}">
 						<span class="border border-top-0 px-2 bg-white">{{hourPositionTime}}</span>
 					</div>
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index 001bbfe33..868e8ea85 100644
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -151,7 +151,7 @@ export default {
 				</div>
 			</div>
 			<div ref="eventcontainer" class="position-relative flex-grow-1" @mousemove="calcHourPosition" @mouseleave="" >
-				<div :id="'scroll'+hour+week" v-for="hour in hours" :key="hour"  class="position-absolute box-shadow-border-top" style="pointer-events: none;" :style="{top:getAbsolutePositionForHour(hour),left:0,right:0,'z-index':0}"></div>
+				<div :id="'scroll'+hour+focusDate.d+week" v-for="hour in hours" :key="hour"  class="position-absolute box-shadow-border-top" style="pointer-events: none;" :style="{top:getAbsolutePositionForHour(hour),left:0,right:0,'z-index':0}"></div>
 				<div v-if="hourPosition" class="position-absolute border-top small"  style="pointer-events: none; padding-left:3.5rem; margin-top:-1px;z-index:2;border-color:#00649C !important" :style="{top:hourPosition+'px',left:0,right:0}">
 					<span class="border border-top-0 px-2 bg-white">{{hourPositionTime}}</span>
 				</div>

From 3046c29ae2f9d44e45a98350fc8b1f1a54cef0e0 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 12 Nov 2024 09:57:10 +0100
Subject: [PATCH 1382/1461] fix(Calendar): does not display events on the
 calendar when sliding the carusel to avoid showing overlapping events

---
 public/js/components/Calendar/Day/Page.js  |  6 +++++-
 public/js/components/Calendar/Pane.js      | 14 ++++++++++++--
 public/js/components/Calendar/Week/Page.js |  6 +++++-
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/public/js/components/Calendar/Day/Page.js b/public/js/components/Calendar/Day/Page.js
index b9f0e34a8..105e5c834 100644
--- a/public/js/components/Calendar/Day/Page.js
+++ b/public/js/components/Calendar/Day/Page.js
@@ -15,7 +15,8 @@ export default {
 		'focusDate',
 		'size',
 		'events',
-		'noMonthView'
+		'noMonthView',
+		'isSliding'
 	],
 	props: {
 		year: Number,
@@ -39,6 +40,9 @@ export default {
 			return result;
 		},
 		eventsPerDayAndHour() {
+			// return early if the calendar pane is sliding
+			if (this.isSliding) return {};
+
 			const res = {};
 			this.days.forEach(day => {
 				let key = day.toDateString();
diff --git a/public/js/components/Calendar/Pane.js b/public/js/components/Calendar/Pane.js
index 8ff9b6259..f5574b728 100644
--- a/public/js/components/Calendar/Pane.js
+++ b/public/js/components/Calendar/Pane.js
@@ -6,7 +6,13 @@ export default {
 		return {
 			carousel: null,
 			queue: 0,
-			offset: 0
+			offset: 0,
+			slideAnimation:false,
+		}
+	},
+	provide() {
+		return {
+			isSliding: Vue.computed(() => this.slideAnimation),
 		}
 	},
 	computed: {
@@ -34,6 +40,10 @@ export default {
 				else
 					this.carousel.prev();
 			}
+			this.slideAnimation = false;
+		},
+		slide(evt) {
+			this.slideAnimation = true;
 		}
 	},
 	mounted() {
@@ -45,7 +55,7 @@ export default {
 		}
 	},
 	template: `
-	<div ref="carousel" class="calendar-pane carousel slide" @[\`slid.bs.carousel\`]="slid" :data-queue="queue">
+	<div ref="carousel" class="calendar-pane carousel slide" @[\`slide.bs.carousel\`]="slide" @[\`slid.bs.carousel\`]="slid" :data-queue="queue">
 		<!--height calc function just for user testing purpose (has to be fixed)-->
 		<div class="carousel-inner " style="height:calc(100vh - 220px); overflow:scroll">
 			<div v-for="i in [...Array(3).keys()]" :key="i" class="carousel-item">
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index 868e8ea85..c0fc7df61 100644
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -15,7 +15,8 @@ export default {
 		'focusDate',
 		'size',
 		'events',
-		'noMonthView'
+		'noMonthView',
+		'isSliding'
 	],
 	props: {
 		year: Number,
@@ -45,6 +46,9 @@ export default {
 
 		},
 		eventsPerDayAndHour() {
+			// return early if the calendar pane is sliding
+			if (this.isSliding) return {};
+			
 			const res = {};
 			this.days.forEach(day => {
 				let key = day.toDateString();

From c691d155c908cc5a66df1249b95c67523a1d84c0 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 12 Nov 2024 11:05:13 +0100
Subject: [PATCH 1383/1461] remove dependecy to legacy phrases from LvMenu
 controller, add legacy phrases needed in LvMenu controller

---
 .../controllers/api/frontend/v1/LvMenu.php    |  78 +++----
 system/phrasesupdate.php                      | 200 ++++++++++++++++++
 2 files changed, 231 insertions(+), 47 deletions(-)

diff --git a/application/controllers/api/frontend/v1/LvMenu.php b/application/controllers/api/frontend/v1/LvMenu.php
index 6f4f5ad97..ece08e2a9 100644
--- a/application/controllers/api/frontend/v1/LvMenu.php
+++ b/application/controllers/api/frontend/v1/LvMenu.php
@@ -52,7 +52,7 @@ class LvMenu extends FHCAPI_Controller
 		$this->load->library("PermissionLib", null, 'PermissionLib');
 
 		$this->load->library("PhrasesLib");
-		$this->loadPhrases(array('global'));
+		$this->loadPhrases(array('global', 'lehre'));
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
@@ -68,18 +68,12 @@ class LvMenu extends FHCAPI_Controller
 		if(!isset($lvid) || !isset($studiensemester_kurzbz))
 			$this->terminateWithError('Missing parameters', self::ERROR_TYPE_GENERAL);
 
-		// FH-Core Variables 
-		// ##########################################################################################
-		require_once(FHCPATH.'include/phrasen.class.php');
-
 		// get the sprache
 		$sprache = getUserLanguage();
-		$p = new phrasen($sprache);
-		//$p = $this->$p;
 
 		// get the user
 		if (!$user=getAuthUID())
-		    $this->terminateWithError($p->t('global/nichtAngemeldet'));
+		    $this->terminateWithError($this->p->t('global', 'nichtAngemeldet'));
 
 		// check if is_lector
 		$is_lector = false;
@@ -209,39 +203,29 @@ class LvMenu extends FHCAPI_Controller
 
 		$menu = array();
 
-		//todo: digitale anwesenheiten sollte ein Events.php im config/ folder beinhalten
-		//$this->fhc_menu_digitale_anwesenheiten($menu, $angemeldet, $studiengang_kz, $semester, $lvid, $angezeigtes_stsem, $p);
-
-		$this->fhc_menu_lvinfo($menu, $lvid, $studiengang_kz, $lektor_der_lv, $is_lector, $lehrfach_oe_kurzbz_arr, $p);
+		$this->fhc_menu_lvinfo($menu, $lvid, $studiengang_kz, $lektor_der_lv, $is_lector, $lehrfach_oe_kurzbz_arr);
 		
-		$this->fhc_menu_feedback($menu, $angemeldet, $lvid, $p);
+		$this->fhc_menu_feedback($menu, $angemeldet, $lvid);
 		
-		$this->fhc_menu_gesamtnote($menu, $angemeldet, $lvid, $lv, $is_lector, $angezeigtes_stsem, $p);
+		$this->fhc_menu_gesamtnote($menu, $angemeldet, $lvid, $lv, $is_lector, $angezeigtes_stsem);
 		
-		$this->fhc_menu_emailStudierende($menu, $user, $angemeldet, $lvid, $angezeigtes_stsem, $p);
+		$this->fhc_menu_emailStudierende($menu, $user, $angemeldet, $lvid, $angezeigtes_stsem);
 		
-		$this->fhc_menu_abmeldung($menu, $user, $is_lector, $lvid, $angezeigtes_stsem, $p);
+		$this->fhc_menu_abmeldung($menu, $user, $is_lector, $lvid, $angezeigtes_stsem);
 		
 		$this->fhc_menu_lehretools($menu, $lvid, $angezeigtes_stsem, $sprache);
 		
-		$this->fhc_menu_anrechnungStudent($menu, $lvid, $angezeigtes_stsem, $p);
+		$this->fhc_menu_anrechnungStudent($menu, $lvid, $angezeigtes_stsem);
 		
-		$this->fhc_menu_anrechnungLector($menu, $angezeigtes_stsem, $p);
+		$this->fhc_menu_anrechnungLector($menu, $angezeigtes_stsem);
 		
-		// LEGACY FH-CORE MENU POINTS
-		//$this->fhc_menu_notenliste($menu, $angemeldet, $is_lector, $lvid, $studiengang_kz, $angezeigtes_stsem, $kurzbz, $semester, $short_short_name, $p);
-		//$this->fhc_menu_download($menu, $angemeldet, $user_is_allowed_to_upload, $rechte, $semester, $kurzbz, $studiengang_kz, $short_short_name, $short, $p);
-		//$this->fhc_menu_semesterplan($menu, $angemeldet, $user_is_allowed_to_upload, $rechte, $lvid, $studiengang_kz, $kurzbz, $semester, $short_short_name, $p);
-		//$this->fhc_menu_stundenupload($menu, $angemeldet, $lvid, $is_lector, $studiengang_kz, $kurzbz, $semester, $short, $short_short_name, $p);
-		//$this->fhc_menu_pinboard($menu, $angemeldet, $is_lector, $studiengang_kz, $semester, $p);
-
 
 		// Addons Menu Logic
 		// ##########################################################################################		
 
 		$params = [
 			'sprache'=>$sprache,
-			'p'=>$p,
+			//'p'=>$p,
 			'ci_p'=> $this->p,
 			//'db'=>$db,
 			'user'=>$user,
@@ -301,7 +285,7 @@ class LvMenu extends FHCAPI_Controller
 	}
 
 
-	private function fhc_menu_digitale_anwesenheiten(&$menu, $angemeldet, $studiengang_kz, $semester, $lvid, $angezeigtes_stsem, $p){
+	private function fhc_menu_digitale_anwesenheiten(&$menu, $angemeldet, $studiengang_kz, $semester, $lvid, $angezeigtes_stsem){
 		
 		// DIGITALE ANWESENHEITEN
 		if (CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN && $angemeldet) {
@@ -310,7 +294,7 @@ class LvMenu extends FHCAPI_Controller
 			(
 				'id' => 'core_menu_digitale_anwesenheitslisten',
 				'position' => '50',
-				'name' => $p->t('lehre/digiAnw'),
+				'name' => $this->p->t('lehre', 'digiAnw'),
 				'c4_icon' => base_url('skin/images/button_kreuzerltool.png'),
 				'c4_link' => base_url("index.ci.php/extensions/FHC-Core-Anwesenheiten/?stg_kz=$studiengang_kz&sem=$semester&lvid=$lvid&sem_kurzbz=$angezeigtes_stsem&nav=false"),
 				'c4_linkList' => []
@@ -318,7 +302,7 @@ class LvMenu extends FHCAPI_Controller
 		}
 	}
 
-	private function fhc_menu_lvinfo(&$menu, $lvid, $studiengang_kz, $lektor_der_lv, $is_lector, $lehrfach_oe_kurzbz_arr, $p){
+	private function fhc_menu_lvinfo(&$menu, $lvid, $studiengang_kz, $lektor_der_lv, $is_lector, $lehrfach_oe_kurzbz_arr){
 		
 		// LVINFO
 		if(!defined('CIS_LEHRVERANSTALTUNG_LVINFO_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_LVINFO_ANZEIGEN)
@@ -333,7 +317,7 @@ class LvMenu extends FHCAPI_Controller
 			|| $this->PermissionLib->isBerechtigtMultipleOe('lehre/lvinfo', $lehrfach_oe_kurzbz_arr)
 			)
 			{
-				$c4_linkList[]= [$p->t('lehre/lvInfoBearbeiten'), 'ects/index.php?lvid='.$lvid];
+				$c4_linkList[]= [$this->p->t('lehre', 'lvInfoBearbeiten'), 'ects/index.php?lvid='.$lvid];
 			}
 			elseif ($is_lector)
 			{
@@ -344,7 +328,7 @@ class LvMenu extends FHCAPI_Controller
 			(
 				'id'=>'core_menu_lvinfo',
 				'position'=>'10',
-				'name'=>$p->t('lehre/lehrveranstaltungsinformation'),
+				'name'=>$this->p->t('lehre', 'lehrveranstaltungsinformation'),
 				'icon'=>'../../../skin/images/button_lvinfo.png',
 				'link'=>'',
 				'c4_icon'=> base_url('skin/images/button_lvinfo.png'),
@@ -354,7 +338,7 @@ class LvMenu extends FHCAPI_Controller
 		}
 	}
 
-	private function fhc_menu_feedback(&$menu, $angemeldet, $lvid, $p){
+	private function fhc_menu_feedback(&$menu, $angemeldet, $lvid){
 		//FEEDBACK
 		if((!defined('CIS_LEHRVERANSTALTUNG_FEEDBACK_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_FEEDBACK_ANZEIGEN) && $angemeldet)
 		{
@@ -362,14 +346,14 @@ class LvMenu extends FHCAPI_Controller
 			(
 				'id'=>'core_menu_feedback',
 				'position'=>'60',
-				'name'=>$p->t('lehre/feedback'),
+				'name'=>$this->p->t('lehre', 'feedback'),
 				'c4_icon'=> base_url('skin/images/button_feedback.png'),
 				'c4_link'=> base_url('feedback.php?lvid='.$lvid),
 			);
 		}
 	}
 
-	private function fhc_menu_gesamtnote(&$menu, $angemeldet, $lvid, $lv_obj, $is_lector, $angezeigtes_stsem, $p){
+	private function fhc_menu_gesamtnote(&$menu, $angemeldet, $lvid, $lv_obj, $is_lector, $angezeigtes_stsem){
 		//Gesamtnote
 		if($is_lector && ((!defined('CIS_LEHRVERANSTALTUNG_GESAMTNOTE_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_GESAMTNOTE_ANZEIGEN) && $angemeldet))
 		{
@@ -379,7 +363,7 @@ class LvMenu extends FHCAPI_Controller
 				(
 					'id'=>'core_menu_gesamtnote',
 					'position'=>'80',
-					'name'=>$p->t('lehre/gesamtnote'),
+					'name'=>$this->p->t('lehre', 'gesamtnote'),
 					'c4_icon'=> base_url('skin/images/button_endnote.png'),
 					'c4_link'=> base_url('cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php?lvid='.urlencode($lvid).'&stsem='.urlencode($angezeigtes_stsem))
 					//'c4_link'=> base_url('benotungstool/lvgesamtnoteverwalten.php?lvid='.urlencode($lvid).'&stsem='.urlencode($angezeigtes_stsem))
@@ -391,10 +375,10 @@ class LvMenu extends FHCAPI_Controller
 				(
 					'id'=>'core_menu_gesamtnote',
 					'position'=>'80',
-					'name'=>$p->t('lehre/gesamtnote'),
+					'name'=>$this->p->t('lehre', 'gesamtnote'),
 					'c4_icon'=>base_url('skin/images/button_endnote.png'),
 					'c4_link'=>'#',
-					'c4_linkList'=>[[$p->t('lehre/noteneingabedeaktiviert'),'#']],
+					'c4_linkList'=>[[$this->p->t('lehre', 'noteneingabedeaktiviert'),'#']],
 				);
 			}
 		}
@@ -402,7 +386,7 @@ class LvMenu extends FHCAPI_Controller
 
 	
 
-	private function fhc_menu_emailStudierende(&$menu, $user, $angemeldet, $lvid, $angezeigtes_stsem, $p){
+	private function fhc_menu_emailStudierende(&$menu, $user, $angemeldet, $lvid, $angezeigtes_stsem){
 		// Email an Studierende
 		if((!defined('CIS_LEHRVERANSTALTUNG_MAILSTUDIERENDE_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_MAILSTUDIERENDE_ANZEIGEN) && $angemeldet)
 		{
@@ -448,10 +432,10 @@ class LvMenu extends FHCAPI_Controller
 			if($nomail != '') 
 			{
 				$c4_linkList[] = array(
-					$p->t('lehre/keinMailverteiler', array($nomail)), 
+					$this->p->t('lehre', 'keinMailverteiler', array('nomail' => $nomail)), 
 					'#'
 				);
-				$link_onclick = 'alert(\''.$p->t('lehre/keinMailverteiler', array($nomail)) . '\');';
+				$link_onclick = 'alert(\''.$this->p->t('lehre', 'keinMailverteiler', array('nomail' => $nomail)) . '\');';
 			}
 			else
 			{
@@ -463,7 +447,7 @@ class LvMenu extends FHCAPI_Controller
 			(
 				'id'=>'core_menu_mailanstudierende',
 				'position'=>'100',
-				'name'=>$p->t('lehre/mail'),
+				'name'=>$this->p->t('lehre', 'mail'),
 				'c4_icon'=>base_url('skin/images/button_feedback.png'),
 				'c4_icon2' => 'fa-regular fa-envelope',
 				'c4_link'=>$mailto,
@@ -475,7 +459,7 @@ class LvMenu extends FHCAPI_Controller
 
 	
 
-	private function fhc_menu_abmeldung(&$menu, $user, $is_lector, $lvid, $angezeigtes_stsem, $p){
+	private function fhc_menu_abmeldung(&$menu, $user, $is_lector, $lvid, $angezeigtes_stsem){
 		if(!defined('CIS_LEHRVERANSTALTUNG_ABMELDUNG_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_ABMELDUNG_ANZEIGEN)
 		{
 			if(!$is_lector)
@@ -487,7 +471,7 @@ class LvMenu extends FHCAPI_Controller
 					(
 						'id'=>'core_menu_abmeldung',
 						'position'=>'120',
-						'name'=>$p->t('lehre/abmelden'),
+						'name'=>$this->p->t('lehre', 'abmelden'),
 						'c4_icon'=>base_url('skin/images/button_studiupload.png'),
 						'c4_link'=>base_url('abmeldung.php?lvid='.urlencode($lvid).'&stsem='.urlencode($angezeigtes_stsem)),
 					);
@@ -512,7 +496,7 @@ class LvMenu extends FHCAPI_Controller
 		}
 	}
 
-    private function fhc_menu_anrechnungStudent(&$menu, $lvid, $angezeigtes_stsem, $p){
+    private function fhc_menu_anrechnungStudent(&$menu, $lvid, $angezeigtes_stsem){
 		// Anerkennung nachgewiesener Kenntnisse (Anrechnung) - Anzeige fuer Studenten
 		if((!defined('CIS_LEHRVERANSTALTUNG_ANRECHNUNG_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_ANRECHNUNG_ANZEIGEN)
 			&& $this->PermissionLib->isBerechtigt('student/anrechnung_beantragen'))
@@ -521,7 +505,7 @@ class LvMenu extends FHCAPI_Controller
 			(
 				'id' => 'core_menu_anerkennungNachgewiesenerKenntnisse',
 				'position' => '128',
-				'name' => $p->t('lehre/anrechnung'),
+				'name' => $this->p->t('lehre', 'anrechnung'),
 				'c4_icon' => base_url('skin/images/button_listen.png'),
 				'c4_icon2' => 'fa-regular fa-folder-open',
 				'c4_link' => base_url('cis.php/lehre/anrechnung/RequestAnrechnung?studiensemester='.urlencode($angezeigtes_stsem).'&lv_id='.urlencode($lvid))
@@ -529,7 +513,7 @@ class LvMenu extends FHCAPI_Controller
 		}
     }
 
-    private function fhc_menu_anrechnungLector(&$menu, $angezeigtes_stsem, $p){
+    private function fhc_menu_anrechnungLector(&$menu, $angezeigtes_stsem){
 		// Anerkennung nachgewiesener Kenntnisse (Anrechnung) - Anzeige fuer LektorInnen
 		if((!defined('CIS_LEHRVERANSTALTUNG_ANRECHNUNG_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_ANRECHNUNG_ANZEIGEN)
 			&& $this->PermissionLib->isBerechtigt('lehre/anrechnung_empfehlen'))
@@ -538,7 +522,7 @@ class LvMenu extends FHCAPI_Controller
 			(
 				'id' => 'core_menu_anerkennungNachgewiesenerKenntnisse_empfehlen',
 				'position' => '128',
-				'name' => $p->t('lehre/anrechnungen'),
+				'name' => $this->p->t('lehre', 'anrechnungen'),
 				'c4_icon'=> base_url('skin/images/button_listen.png'),
 				'c4_icon2' => 'fa-regular fa-folder-open',
 				'c4_link' => base_url('cis.php/lehre/anrechnung/ReviewAnrechnungUebersicht?studiensemester='.urlencode($angezeigtes_stsem))
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 9fcc8f489..0221cf7c8 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -36856,6 +36856,206 @@ array(
 				'insertvon' => 'system'
 			)
 		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'nichtAngemeldet',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Sie sind nicht angemeldet. Es wurde keine Benutzer UID gefunden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'You are not logged in. No UID found',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'lvInfoBearbeiten',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bearbeiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Edit',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'lehrveranstaltungsinformation',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Lehrveranstaltungsinformation',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Course Information',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'gesamtnote',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gesamtnote',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Final Grade',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'noteneingabedeaktiviert',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Noteneingabe deaktiviert',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Grading disabled',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'keinMailverteiler',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Für die Gruppe(n) {nomail} existiert kein Verteiler! Die Studierenden in diesen Gruppen bekommen kein Mail.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'There is no e-mail distribution list for the group(s) {nomail}! The students in these groups will not receive an e-mail.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'mail',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'E-Mail an Studierende',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'E-Mail to students',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'abmelden',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Abmelden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Unsubscribe',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'anrechnung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anrechnung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Exemption',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'anrechnungen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anrechnungen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Exemptions',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
 	)
 // CIS4 phrases from legacy code end
 );

From c244b3ad1bec1568e00be4656085067a0a700ac6 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 12 Nov 2024 12:55:14 +0100
Subject: [PATCH 1384/1461] fix(Stundenplan): template error

---
 public/js/apps/Cis/Stundenplan.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/public/js/apps/Cis/Stundenplan.js b/public/js/apps/Cis/Stundenplan.js
index 1248f18e0..933bd39f7 100644
--- a/public/js/apps/Cis/Stundenplan.js
+++ b/public/js/apps/Cis/Stundenplan.js
@@ -127,7 +127,6 @@ const app = Vue.createApp({
 				<span>{{event?.orig.ort_kurzbz}}</span>
 			</div>
 		</template>
-		<template
 	</fhc-calendar>
 	`
 });

From b0cd599999933c430c18c64be36747f3b0df8608 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 13 Nov 2024 10:41:50 +0100
Subject: [PATCH 1385/1461] WIP stundenplan widget tagesansicht

---
 application/config/routes.php                 |  4 +-
 public/js/apps/Cis/Stundenplan.js             |  5 ++
 .../components/DashboardWidget/Stundenplan.js | 70 ++++++++++++++-----
 3 files changed, 61 insertions(+), 18 deletions(-)

diff --git a/application/config/routes.php b/application/config/routes.php
index bb3337b23..b07497ae7 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -62,6 +62,7 @@ $route['api/v1/ressource/[B|b]etriebsmittelperson/(:any)'] = 'api/v1/ressource/b
 $route['api/v1/system/[S|s]prache/(:any)'] = 'api/v1/system/sprache2/$1';
 
 $route['CisVue'] = 'CisVue/dashboard';
+$route['Cis/Stundenplan/(:any)'] = 'Cis/Stundenplan';
 
 // load routes from extensions
 $subdir = 'application/config/extensions';
@@ -83,5 +84,4 @@ if ($dirlist)
 			}
 		}
 	}
-}
-
+}
\ No newline at end of file
diff --git a/public/js/apps/Cis/Stundenplan.js b/public/js/apps/Cis/Stundenplan.js
index cb019952c..2bc3c7d00 100644
--- a/public/js/apps/Cis/Stundenplan.js
+++ b/public/js/apps/Cis/Stundenplan.js
@@ -8,6 +8,7 @@ const app = Vue.createApp({
 	data() {
 		return {
 			stunden: [],
+			lv_id: null,
 			events: null,
 			calendarDate: new CalendarDate(new Date()),
 			currentlySelectedEvent: null,
@@ -34,6 +35,9 @@ const app = Vue.createApp({
 		},
 	},
 	methods:{
+		getLvID: function () {
+			this.lv_id = window.location.pathname
+		},
 		selectDay: function(day){
 			this.currentDay = day;
 		},
@@ -99,6 +103,7 @@ const app = Vue.createApp({
 		},
 	},
 	created(){
+		this.getLvID()
 		this.loadEvents();
 	},
 	//TODO: Stundenplan phrase
diff --git a/public/js/components/DashboardWidget/Stundenplan.js b/public/js/components/DashboardWidget/Stundenplan.js
index 0afdc3845..f8ab1e51d 100644
--- a/public/js/components/DashboardWidget/Stundenplan.js
+++ b/public/js/components/DashboardWidget/Stundenplan.js
@@ -21,7 +21,7 @@ export default {
 			stunden: [],
 			minimized: true,
 			events: null,
-			currentDay: new Date(),
+			currentDay: this.getCurrentDate(),
 			calendarDate: new CalendarDate(new Date()),
 			roomInfoContentID: null,
 			ort_kurzbz: null,
@@ -29,23 +29,51 @@ export default {
 		}
 	},
 	computed: {
-		
+		nextEventsGrouped() {
+			// groups all events of all days until end of week together
+			return new Map((this.events || []).filter(evt => evt.end < this.endOfWeek && evt.start >= this.currentDay).reduce((acc, cur) => {
+				const date = new CalendarDate(new Date(cur.datum))
+				const arr = acc.find(el => el[0].compare(date))
+				if(arr) {
+					arr[1].push(cur)
+				} else {
+					acc.push([date, [cur]])
+				}
+				return acc
+			}, []))
+		},
 		currentEvents() {
-			return (this.events || []).filter(evt => evt.end < this.dayAfterCurrentDay && evt.start >= this.currentDay);
+			return (this.events || []).filter(evt => evt.end < this.dayAfterCurrentDay && evt.start >= this.currentDay)//.sort((e1, e2) => e1.beginn > e2.beginn);
 		},
 		dayAfterCurrentDay() {
 			let currentDay = new Date(this.currentDay);
 			currentDay.setDate(currentDay.getDate() + 1);
 			return currentDay;
 		},
+		endOfWeek() {
+			let endOfWeek = new Date(this.currentDay); //
+			endOfWeek.setDate(this.currentDay.getDate() + (7 - this.currentDay.getDay()));
+			endOfWeek.setHours(23, 59, 59, 999);
+			return endOfWeek;
+		},
 		monthFirstDay: function () {
 			return this.calendarDateToString(this.calendarDate.cdFirstDayOfCalendarMonth);
 		},
 		monthLastDay: function () {
 			return this.calendarDateToString(this.calendarDate.cdLastDayOfCalendarMonth);
-		},
+		}
 	},
 	methods: {
+		getEventStyle: function(evt) {
+			const styles = {'background-color': evt.color};
+			if(evt.start.getTime() < Date.now()) styles.opacity = 0.5;
+			return styles;
+		},
+		getCurrentDate: function() {
+			const today = new Date()
+			today.setHours(0,0,0)
+			return today
+		},
 		calendarDateToString: function (calendarDate) {
 
 			return calendarDate instanceof CalendarDate ?
@@ -127,6 +155,10 @@ export default {
 				this.events = promise_events;
 			});
 		},
+
+		setCalendarMaximized() {
+			this.minimized = false
+		}
 	
 
 	},
@@ -160,23 +192,29 @@ export default {
 	<div class="dashboard-widget-stundenplan d-flex flex-column h-100">
 		<lv-modal v-if="selectedEvent" ref="lvmodal" :event="selectedEvent"  />
 		<content-modal :contentID="roomInfoContentID" :ort_kurzbz="" dialogClass="modal-lg" ref="contentModal"/>
-		<fhc-calendar @change:range="updateRange" :initial-date="currentDay" class="border-0" class-header="p-0" @select:day="selectDay" v-model:minimized="minimized" :events="events" no-week-view :show-weeks="false" />
+		<fhc-calendar ref="calendar" @change:range="updateRange" :initial-date="currentDay" class="border-0" class-header="p-0" @select:day="selectDay" v-model:minimized="minimized" :events="events" no-week-view :show-weeks="false" />
 		<div v-show="minimized" class="flex-grow-1 overflow-scroll">
 			<div v-if="events === null" class="d-flex h-100 justify-content-center align-items-center">
 				<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
 			</div>
-			<div v-else-if="currentEvents.length" class="list-group list-group-flush">
-				<div role="button" @click="showLvUebersicht(evt)" class="" v-for="evt in currentEvents" :key="evt.id" class="list-group-item small" :style="{'background-color':evt.color}">
-					<b>{{evt.topic}}</b>
-					<br>
-					<small class="d-flex w-100 justify-content-between">
-						<!-- event modifier stop to prevent opening the modal for the lv Uebersicht when clicking on the ort_kurzbz -->
-						<span @click.stop="showRoomInfoModal(evt.ort_kurzbz)" style="text-decoration:underline" type="button">{{evt.ort_kurzbz}}</span>
-						<span>{{evt.start.toLocaleTimeString(undefined, {hour:'numeric',minute:'numeric'})}}-{{evt.end.toLocaleTimeString(undefined, {hour:'numeric',minute:'numeric'})}}</span>
-					</small>
-				</div>
+			<div v-if="nextEventsGrouped.size" class="list-group list-group-flush">
+				<template v-for="([key, value], index) in nextEventsGrouped" :key="index" style="margin-top: 8px;">
+					<div v-if="index > 0" class="card-header d-grid p-0">
+						<button class="btn btn-link link-secondary text-decoration-none" @click="setCalendarMaximized">{{ key.format({dateStyle: "full"})}}</button>
+					</div>
+					<div role="button" @click="showLvUebersicht(evt)" v-for="evt in value" :key="evt.id" class="list-group-item small" :style="getEventStyle(evt)">
+						<b>{{evt.topic}}</b>
+						<br>
+						<small class="d-flex w-100 justify-content-between">
+							<!-- event modifier stop to prevent opening the modal for the lv Uebersicht when clicking on the ort_kurzbz -->
+							<span @click.stop="showRoomInfoModal(evt.ort_kurzbz)" style="text-decoration:underline" type="button">{{evt.ort_kurzbz}}</span>
+							<span>{{evt.start.toLocaleTimeString(undefined, {hour:'numeric',minute:'numeric'})}}-{{evt.end.toLocaleTimeString(undefined, {hour:'numeric',minute:'numeric'})}}</span>
+						</small>
+					</div>
+				</template>
 			</div>
-			<div v-else class="d-flex h-100 justify-content-center align-items-center fst-italic text-center">
+		
+			<div v-else-if class="d-flex h-100 justify-content-center align-items-center fst-italic text-center">
 				{{ p.t('lehre/noLvFound') }}
 			</div>
 		</div>

From 59f8f91af9cf7b700da98638b8ed68213f8145bf Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 13 Nov 2024 11:00:08 +0100
Subject: [PATCH 1386/1461] feature(Calendar Tagesansicht): Calender wird
 ausgegraut wenn keine LVs an diesen Tag vorhanden sind

---
 public/css/components/calendar.css            | 15 +++++
 public/js/components/Calendar/Calendar.js     | 55 +++++++++++++------
 public/js/components/Calendar/Day/Page.js     | 33 +++++++----
 public/js/components/Calendar/Minimized.js    |  3 +-
 public/js/components/Calendar/Pane.js         | 12 +++-
 .../components/DashboardWidget/Stundenplan.js | 42 +++++++-------
 6 files changed, 110 insertions(+), 50 deletions(-)

diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index 157836afc..720b79156 100644
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -68,6 +68,21 @@
 	box-shadow: 0 0 0 1px #dee2e6 !important;
 }
 
+.fhc-calendar-no-events-overlay{
+	position: relative;
+}
+
+.fhc-calendar-no-events-overlay::before {
+	content: "";
+	position: absolute;
+	top: 0;
+	left: 0;
+	margin:auto;
+	width: 100%;
+	height: 100%;
+	background-image: linear-gradient(120deg, white, gray );
+	opacity: .7;
+}
 .fhc-calendar-day-page {
   /*aspect-ratio: 7/6;*/
   min-height: 0;
diff --git a/public/js/components/Calendar/Calendar.js b/public/js/components/Calendar/Calendar.js
index 0d29c3eb7..761df49db 100644
--- a/public/js/components/Calendar/Calendar.js
+++ b/public/js/components/Calendar/Calendar.js
@@ -26,6 +26,7 @@ export default {
 			focusDate: this.focusDate,
 			size: Vue.computed({ get: () => this.size, set: v => this.size = v }),
 			events: Vue.computed(() => this.eventsPerDay),
+			filteredEvents: Vue.computed(() => this.filteredEvents),
 			minimized: Vue.computed({ get: () => this.minimized, set: v => this.$emit('update:minimized', v) }),
 			showWeeks: this.showWeeks,
 			noMonthView: this.noMonthView,
@@ -126,31 +127,46 @@ export default {
 		},
 		// returns the hour of the earliest event, used to scroll to the events in the calendar (week / day view)
 		scrollTime: function () {
-			if (this.events && Array.isArray(this.events) && this.events.length > 0) {
-				let filteredEvents = this.events.filter(event => {
-					// week view filters the elements only for the same week
-					let eventDate = new CalendarDate(new Date(event.datum));
-					if(this.mode == 'week'){
-						return this.focusDate.w == eventDate.w;
-					}
-					// day view filters the elements for the same day and the same week
-					else if(this.mode == 'day'){
-						
-						return this.focusDate.d == eventDate.d && this.focusDate.w == eventDate.w;
-					}
-				})
 				// return the first beginning time of the filtered events
-				if(filteredEvents.length > 0)
+				if(this.filteredEvents && Array.isArray(this.filteredEvents) && this.filteredEvents.length > 0)
 				{
-					return parseInt(filteredEvents.sort((a, b) => parseInt(a.beginn) - parseInt(b.beginn))[0].beginn);
+					return parseInt(this.filteredEvents.sort((a, b) => parseInt(a.beginn) - parseInt(b.beginn))[0].beginn);
 				}
-				// if there is not filtered event that matches the current week
+				// there is no event that matches the current view mode constraints
 				else 
 				{
 					return null;
 				}
+			},
+		// filters the events based on the current calendar view mode
+		// week view - filter events based on their week
+		// day view - filter events based on their day and week
+		// month view - does not filter the events
+		filteredEvents: function(){
+			if (this.events && Array.isArray(this.events) && this.events.length > 0) {
+				let filteredEvents = this.events.filter(event => {
+					let eventDate = new CalendarDate(new Date(event.datum));
+					if (this.mode == 'week') 
+					{
+						// week view filters the elements only for the same week
+						return this.focusDate.w == eventDate.w;
+					}
+					else if (this.mode == 'day') 
+					{
+						// day view filters the elements for the same day and the same week
+						return this.focusDate.d == eventDate.d && this.focusDate.w == eventDate.w;
+					}
+					else
+					{
+						// returns all the events, does not filter the events
+						return true;
+					}
+				})
+
+				return filteredEvents;
 			}
-			else {
+			else
+			{
 				return null;
 			}
 		},
@@ -190,7 +206,7 @@ export default {
 
 	},
 	template: /*html*/`
-	<div ref="container" class="fhc-calendar card" :class="sizeClass">
+	<div ref="container" class="fhc-calendar card h-100" :class="sizeClass">
 		<component :is="'calendar-' + mode" @updateMode="mode = $event" @change:range="$emit('change:range',$event)" @input="handleInput" >
 			<template #weekPage="{event,day}">
 				<slot name="weekPage" :event="event" :day="day"></slot>
@@ -198,6 +214,9 @@ export default {
 			<template #dayPage="{event,day}">
 				<slot name="dayPage" :event="event" :day="day"></slot>
 			</template>
+			<template #minimizedPage="{event,day}">
+				<slot name="minimizedPage" :event="event" :day="day"></slot>
+			</template>
 		</component>
 	</div>`
 }
diff --git a/public/js/components/Calendar/Day/Page.js b/public/js/components/Calendar/Day/Page.js
index 105e5c834..b14025e5b 100644
--- a/public/js/components/Calendar/Day/Page.js
+++ b/public/js/components/Calendar/Day/Page.js
@@ -16,7 +16,10 @@ export default {
 		'size',
 		'events',
 		'noMonthView',
-		'isSliding'
+		'filteredEvents',
+		'isSliding',
+		'calendarScrollTop',
+		'calendarClientHeight',
 	],
 	props: {
 		year: Number,
@@ -29,6 +32,9 @@ export default {
 		'input'
 	],
 	computed: {
+		noEventsTextPosition(){
+				return this.calendarScrollTop + 100; 
+		},
 		hours() {
 			// returns an array with elements starting at 7 and ending at 24
 			return [...Array(24).keys()].filter(hour => hour >= 7 && hour <= 24);
@@ -79,7 +85,7 @@ export default {
 		},
 		smallestTimeFrame() {
 			return [30, 15, 10, 5][this.size];
-		}
+		},
 	},
 	methods: {
 		calcHourPosition(event) {
@@ -157,19 +163,24 @@ export default {
 					<div v-if="hourPosition" class="position-absolute border-top small"  style="pointer-events: none; padding-left:3.5rem; margin-top:-1px;z-index:2;border-color:#00649C !important" :style="{top:hourPosition+'px',left:0,right:0}">
 						<span class="border border-top-0 px-2 bg-white">{{hourPositionTime}}</span>
 					</div>
-					<div class="events">
-						<div class="hours">
-							<div v-for="hour in hours" style="min-height:100px" :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
-						</div>
-						<div v-for="day in eventsPerDayAndHour" :key="day" class=" day border-start" :style="{'grid-template-columns': '1 1fr', 'grid-template-rows': 'repeat(' + (hours.length * 60 / smallestTimeFrame) + ', 1fr)'}">
-							<div  :style="{'background-color':event.orig.color}" class="mx-2 border border-dark border-2 small rounded overflow-hidden "  @click.prevent="$emit('input', event.orig)" :style="{'z-index':1,'grid-column-start': 1+(event.lane-1)*day.lanes/event.maxLane, 'grid-column-end': 1+event.lane*day.lanes/event.maxLane, 'grid-row-start': dateToMinutesOfDay(event.start), 'grid-row-end': dateToMinutesOfDay(event.end) ,'--test': dateToMinutesOfDay(event.end)}" v-for="event in day.events" :key="event">
-								<slot  name="dayPage" :event="event" :day="day">
-									<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
-								</slot>
+					<div>
+						<h1 v-if="filteredEvents.length==0" class="m-0 text-secondary" ref="noEventsText" :style="{'top':noEventsTextPosition+'px'}" style="position:absolute; left:0;  text-align:center; width: 100%; z-index:1">Keine Lehrveranstaltungen</h1>
+						<div class="events" :class="{'fhc-calendar-no-events-overlay':filteredEvents.length==0}">
+							
+							<div class="hours">
+								<div v-for="hour in hours" style="min-height:100px" :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
 							</div>
+							<div v-for="day in eventsPerDayAndHour" :key="day" class=" day border-start" :style="{'grid-template-columns': '1 1fr', 'grid-template-rows': 'repeat(' + (hours.length * 60 / smallestTimeFrame) + ', 1fr)'}">
+								<div  :style="{'background-color':event.orig.color}" class="mx-2 border border-dark border-2 small rounded overflow-hidden "  @click.prevent="$emit('input', event.orig)" :style="{'z-index':1,'grid-column-start': 1+(event.lane-1)*day.lanes/event.maxLane, 'grid-column-end': 1+event.lane*day.lanes/event.maxLane, 'grid-row-start': dateToMinutesOfDay(event.start), 'grid-row-end': dateToMinutesOfDay(event.end) ,'--test': dateToMinutesOfDay(event.end)}" v-for="event in day.events" :key="event">
+									<slot  name="dayPage" :event="event" :day="day">
+										<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
+									</slot>
+								</div>
 
+							</div>
 						</div>
 					</div>
+					
 				</div>
 			</div>
 			</div>
diff --git a/public/js/components/Calendar/Minimized.js b/public/js/components/Calendar/Minimized.js
index d92d2ffbc..71d45f6ba 100644
--- a/public/js/components/Calendar/Minimized.js
+++ b/public/js/components/Calendar/Minimized.js
@@ -22,9 +22,10 @@ export default {
 		}
 	},
 	template: `
-	<div class="fhc-calendar-minimized">
+	<div class="fhc-calendar-minimized h-100 d-flex flex-column">
 		<div class="card-header d-grid" :class="classHeader">
 			<button class="btn btn-link link-secondary text-decoration-none" @click="maximize">{{ date.format({dateStyle: ['long','full','full','full'][this.size]}) }}</button>
 		</div>
+		<slot name="minimizedPage"></slot>
 	</div>`
 }
diff --git a/public/js/components/Calendar/Pane.js b/public/js/components/Calendar/Pane.js
index f5574b728..616785b35 100644
--- a/public/js/components/Calendar/Pane.js
+++ b/public/js/components/Calendar/Pane.js
@@ -8,11 +8,15 @@ export default {
 			queue: 0,
 			offset: 0,
 			slideAnimation:false,
+			scrollTop:null,
+			clientHeight:null,
 		}
 	},
 	provide() {
 		return {
 			isSliding: Vue.computed(() => this.slideAnimation),
+			calendarScrollTop: Vue.computed(() =>this.scrollTop),
+			calendarClientHeight: Vue.computed(() => this.clientHeight),
 		}
 	},
 	computed: {
@@ -21,6 +25,10 @@ export default {
 		}
 	},
 	methods: {
+		scrollCalendar(event){
+			this.scrollTop = this.$refs.calendarContainer.scrollTop;
+			this.clientHeight = this.$refs.calendarContainer.clientHeight;
+		},
 		prev() {
 			if (!this.queue--)
 				this.carousel.prev();
@@ -53,11 +61,13 @@ export default {
 				interval: false
 			});
 		}
+		this.scrollTop = this.$refs.calendarContainer.scrollTop;
+		this.clientHeight = this.$refs.calendarContainer.clientHeight;
 	},
 	template: `
 	<div ref="carousel" class="calendar-pane carousel slide" @[\`slide.bs.carousel\`]="slide" @[\`slid.bs.carousel\`]="slid" :data-queue="queue">
 		<!--height calc function just for user testing purpose (has to be fixed)-->
-		<div class="carousel-inner " style="height:calc(100vh - 220px); overflow:scroll">
+		<div @scroll="scrollCalendar" ref="calendarContainer" class="carousel-inner " style="height:calc(100vh - 220px); overflow:scroll">
 			<div v-for="i in [...Array(3).keys()]" :key="i" class="carousel-item">
 				<slot :index="i" :offset="offsets[i]" />
 			</div>
diff --git a/public/js/components/DashboardWidget/Stundenplan.js b/public/js/components/DashboardWidget/Stundenplan.js
index 0afdc3845..e39e2d808 100644
--- a/public/js/components/DashboardWidget/Stundenplan.js
+++ b/public/js/components/DashboardWidget/Stundenplan.js
@@ -160,25 +160,29 @@ export default {
 	<div class="dashboard-widget-stundenplan d-flex flex-column h-100">
 		<lv-modal v-if="selectedEvent" ref="lvmodal" :event="selectedEvent"  />
 		<content-modal :contentID="roomInfoContentID" :ort_kurzbz="" dialogClass="modal-lg" ref="contentModal"/>
-		<fhc-calendar @change:range="updateRange" :initial-date="currentDay" class="border-0" class-header="p-0" @select:day="selectDay" v-model:minimized="minimized" :events="events" no-week-view :show-weeks="false" />
-		<div v-show="minimized" class="flex-grow-1 overflow-scroll">
-			<div v-if="events === null" class="d-flex h-100 justify-content-center align-items-center">
-				<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
-			</div>
-			<div v-else-if="currentEvents.length" class="list-group list-group-flush">
-				<div role="button" @click="showLvUebersicht(evt)" class="" v-for="evt in currentEvents" :key="evt.id" class="list-group-item small" :style="{'background-color':evt.color}">
-					<b>{{evt.topic}}</b>
-					<br>
-					<small class="d-flex w-100 justify-content-between">
-						<!-- event modifier stop to prevent opening the modal for the lv Uebersicht when clicking on the ort_kurzbz -->
-						<span @click.stop="showRoomInfoModal(evt.ort_kurzbz)" style="text-decoration:underline" type="button">{{evt.ort_kurzbz}}</span>
-						<span>{{evt.start.toLocaleTimeString(undefined, {hour:'numeric',minute:'numeric'})}}-{{evt.end.toLocaleTimeString(undefined, {hour:'numeric',minute:'numeric'})}}</span>
-					</small>
+		<fhc-calendar @change:range="updateRange" :initial-date="currentDay" class="border-0" class-header="p-0" @select:day="selectDay" v-model:minimized="minimized" :events="events" no-week-view :show-weeks="false" >
+			<template #minimizedPage >
+				<div class="flex-grow-1 overflow-scroll">
+					<div v-if="events === null" class="d-flex h-100 justify-content-center align-items-center">
+						<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
+					</div>
+					<div v-else-if="currentEvents.length" class="list-group list-group-flush">
+						<div role="button" @click="showLvUebersicht(evt)" class="" v-for="evt in currentEvents" :key="evt.id" class="list-group-item small" :style="{'background-color':evt.color}">
+							<b>{{evt.topic}}</b>
+							<br>
+							<small class="d-flex w-100 justify-content-between">
+								<!-- event modifier stop to prevent opening the modal for the lv Uebersicht when clicking on the ort_kurzbz -->
+								<span @click.stop="showRoomInfoModal(evt.ort_kurzbz)" style="text-decoration:underline" type="button">{{evt.ort_kurzbz}}</span>
+								<span>{{evt.start.toLocaleTimeString(undefined, {hour:'numeric',minute:'numeric'})}}-{{evt.end.toLocaleTimeString(undefined, {hour:'numeric',minute:'numeric'})}}</span>
+							</small>
+						</div>
+					</div>
+					<div v-else class="d-flex h-100 justify-content-center align-items-center fst-italic text-center">
+						{{ p.t('lehre/noLvFound') }}
+					</div>
 				</div>
-			</div>
-			<div v-else class="d-flex h-100 justify-content-center align-items-center fst-italic text-center">
-				{{ p.t('lehre/noLvFound') }}
-			</div>
-		</div>
+			</template>
+		</fhc-calendar>
+		
 	</div>`
 }
\ No newline at end of file

From a94d8d8fa5888b674710d842179ac4d76fb2cc48 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 13 Nov 2024 13:57:37 +0100
Subject: [PATCH 1387/1461] calendar minimized only using slot; showing whole
 week in stundeplan widget tagesansicht grouped by day; everything in past has
 0.5 opacity

---
 public/js/components/Calendar/Minimized.js    |  3 -
 .../components/DashboardWidget/Stundenplan.js | 60 +++++--------------
 public/js/composables/CalendarDate.js         | 10 ++++
 3 files changed, 26 insertions(+), 47 deletions(-)

diff --git a/public/js/components/Calendar/Minimized.js b/public/js/components/Calendar/Minimized.js
index 71d45f6ba..fc0f96785 100644
--- a/public/js/components/Calendar/Minimized.js
+++ b/public/js/components/Calendar/Minimized.js
@@ -23,9 +23,6 @@ export default {
 	},
 	template: `
 	<div class="fhc-calendar-minimized h-100 d-flex flex-column">
-		<div class="card-header d-grid" :class="classHeader">
-			<button class="btn btn-link link-secondary text-decoration-none" @click="maximize">{{ date.format({dateStyle: ['long','full','full','full'][this.size]}) }}</button>
-		</div>
 		<slot name="minimizedPage"></slot>
 	</div>`
 }
diff --git a/public/js/components/DashboardWidget/Stundenplan.js b/public/js/components/DashboardWidget/Stundenplan.js
index e68fcdebd..dbf485a7b 100644
--- a/public/js/components/DashboardWidget/Stundenplan.js
+++ b/public/js/components/DashboardWidget/Stundenplan.js
@@ -29,18 +29,18 @@ export default {
 		}
 	},
 	computed: {
-		nextEventsGrouped() {
+		allEventsGrouped() {
 			// groups all events of all days until end of week together
-			return new Map((this.events || []).filter(evt => evt.end < this.endOfWeek && evt.start >= this.currentDay).reduce((acc, cur) => {
+			const currentCalendarDate = new CalendarDate(this.currentDay)
+			const mapArr = currentCalendarDate.wholeWorkWeek.map((d) => [new CalendarDate(d), []])
+
+			return new Map((this.events || []).filter(evt => evt.end < currentCalendarDate.lastDayOfWeek && evt.start >= currentCalendarDate.firstDayOfWeek).reduce((acc, cur) => {
 				const date = new CalendarDate(new Date(cur.datum))
 				const arr = acc.find(el => el[0].compare(date))
-				if(arr) {
-					arr[1].push(cur)
-				} else {
-					acc.push([date, [cur]])
-				}
+				arr[1].push(cur)
+				
 				return acc
-			}, []))
+			}, mapArr))
 		},
 		currentEvents() {
 			return (this.events || []).filter(evt => evt.end < this.dayAfterCurrentDay && evt.start >= this.currentDay);
@@ -50,12 +50,6 @@ export default {
 			currentDay.setDate(currentDay.getDate() + 1);
 			return currentDay;
 		},
-		endOfWeek() {
-			let endOfWeek = new Date(this.currentDay); //
-			endOfWeek.setDate(this.currentDay.getDate() + (7 - this.currentDay.getDay()));
-			endOfWeek.setHours(23, 59, 59, 999);
-			return endOfWeek;
-		},
 		monthFirstDay: function () {
 			return this.calendarDateToString(this.calendarDate.cdFirstDayOfCalendarMonth);
 		},
@@ -67,6 +61,7 @@ export default {
 		getEventStyle: function(evt) {
 			const styles = {'background-color': evt.color};
 			if(evt.start.getTime() < Date.now()) styles.opacity = 0.5;
+
 			return styles;
 		},
 		getCurrentDate: function() {
@@ -194,12 +189,15 @@ export default {
 		<content-modal :contentID="roomInfoContentID" :ort_kurzbz="" dialogClass="modal-lg" ref="contentModal"/>
 		<fhc-calendar @change:range="updateRange" :initial-date="currentDay" class="border-0" class-header="p-0" @select:day="selectDay" v-model:minimized="minimized" :events="events" no-week-view :show-weeks="false" >
 			<template #minimizedPage >
-				<div class="flex-grow-1 overflow-scroll">
+				<div class="flex-grow-1" style="overflow-y: scroll; overflow-x: hidden">
 					<div v-if="events === null" class="d-flex h-100 justify-content-center align-items-center">
 						<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
 					</div>
-					<div v-else-if="currentEvents.length" class="list-group list-group-flush">
-						<div role="button" @click="showLvUebersicht(evt)" class="" v-for="evt in currentEvents" :key="evt.id" class="list-group-item small" :style="{'background-color':evt.color}">
+					<template ref="allWeek" v-else-if="allEventsGrouped.size" v-for="([key, value], index) in allEventsGrouped" :key="index" style="margin-top: 8px;">
+						<div class="card-header d-grid p-0">
+							<button class="btn btn-link link-secondary text-decoration-none" @click="setCalendarMaximized">{{ key.format({dateStyle: "full"})}}</button>
+						</div>
+						<div role="button" @click="showLvUebersicht(evt)" v-for="evt in value" :key="evt.id" class="list-group-item small" :style="getEventStyle(evt)">
 							<b>{{evt.topic}}</b>
 							<br>
 							<small class="d-flex w-100 justify-content-between">
@@ -208,39 +206,13 @@ export default {
 								<span>{{evt.start.toLocaleTimeString(undefined, {hour:'numeric',minute:'numeric'})}}-{{evt.end.toLocaleTimeString(undefined, {hour:'numeric',minute:'numeric'})}}</span>
 							</small>
 						</div>
-					</div>
+					</template>
 					<div v-else class="d-flex h-100 justify-content-center align-items-center fst-italic text-center">
 						{{ p.t('lehre/noLvFound') }}
 					</div>
 				</div>
 			</template>
 		</fhc-calendar>
-		
-		<fhc-calendar ref="calendar" @change:range="updateRange" :initial-date="currentDay" class="border-0" class-header="p-0" @select:day="selectDay" v-model:minimized="minimized" :events="events" no-week-view :show-weeks="false" />
-		<div v-show="minimized" class="flex-grow-1 overflow-scroll">
-			<div v-if="events === null" class="d-flex h-100 justify-content-center align-items-center">
-				<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
-			</div>
-			<div v-if="nextEventsGrouped.size" class="list-group list-group-flush">
-				<template v-for="([key, value], index) in nextEventsGrouped" :key="index" style="margin-top: 8px;">
-					<div v-if="index > 0" class="card-header d-grid p-0">
-						<button class="btn btn-link link-secondary text-decoration-none" @click="setCalendarMaximized">{{ key.format({dateStyle: "full"})}}</button>
-					</div>
-					<div role="button" @click="showLvUebersicht(evt)" v-for="evt in value" :key="evt.id" class="list-group-item small" :style="getEventStyle(evt)">
-						<b>{{evt.topic}}</b>
-						<br>
-						<small class="d-flex w-100 justify-content-between">
-							<!-- event modifier stop to prevent opening the modal for the lv Uebersicht when clicking on the ort_kurzbz -->
-							<span @click.stop="showRoomInfoModal(evt.ort_kurzbz)" style="text-decoration:underline" type="button">{{evt.ort_kurzbz}}</span>
-							<span>{{evt.start.toLocaleTimeString(undefined, {hour:'numeric',minute:'numeric'})}}-{{evt.end.toLocaleTimeString(undefined, {hour:'numeric',minute:'numeric'})}}</span>
-						</small>
-					</div>
-				</template>
-			</div>
-		
-			<div v-else-if class="d-flex h-100 justify-content-center align-items-center fst-italic text-center">
-				{{ p.t('lehre/noLvFound') }}
-			</div>
 		</div>
 	</div>`
 }
\ No newline at end of file
diff --git a/public/js/composables/CalendarDate.js b/public/js/composables/CalendarDate.js
index 1b311739c..09bae1f21 100644
--- a/public/js/composables/CalendarDate.js
+++ b/public/js/composables/CalendarDate.js
@@ -68,6 +68,16 @@ class CalendarDate {
 		lastDayOfWeek.setDate(this.d -(lastDayOfWeek.getDay()+7-this.weekStart)%7 +6);
 		return lastDayOfWeek;
 	}
+	get wholeWorkWeek() {
+		const days = []
+		const date = new Date(this.y, this.m, this.d);
+		for(let i = 0; i < 5; i++) {
+			days[i] = new Date(this.y, this.m, this.d)
+			days[i].setDate(this.d -(date.getDay()+7-this.weekStart)%7 + i)
+		}
+		console.log('wholeWorkWeek', days)
+		return days
+	}
 	get cdLastDayOfWeek() {
 		return new CalendarDate(this.lastDayOfWeek);
 	}

From 6613b0ea4032c08ac024c69a110d52ded3c837df Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 13 Nov 2024 14:08:58 +0100
Subject: [PATCH 1388/1461] remove console.log

---
 public/js/composables/CalendarDate.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/public/js/composables/CalendarDate.js b/public/js/composables/CalendarDate.js
index 09bae1f21..95560fbfd 100644
--- a/public/js/composables/CalendarDate.js
+++ b/public/js/composables/CalendarDate.js
@@ -75,7 +75,6 @@ class CalendarDate {
 			days[i] = new Date(this.y, this.m, this.d)
 			days[i].setDate(this.d -(date.getDay()+7-this.weekStart)%7 + i)
 		}
-		console.log('wholeWorkWeek', days)
 		return days
 	}
 	get cdLastDayOfWeek() {

From 5d524c5fda1467a0f2c5962845ca2182d8f47dab Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 13 Nov 2024 14:14:11 +0100
Subject: [PATCH 1389/1461] fix dashboard alert css by adding primevue3 in
 $includeArray in Dashboard view file

---
 application/views/CisVue/Dashboard.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/views/CisVue/Dashboard.php b/application/views/CisVue/Dashboard.php
index cf97eacab..4b10d94cc 100644
--- a/application/views/CisVue/Dashboard.php
+++ b/application/views/CisVue/Dashboard.php
@@ -2,6 +2,7 @@
 $includesArray = array(
 	'title' => 'Dashboard',
 	'tabulator5'=>true,
+	'primevue3' => true,
 	'customJSModules' => ['public/js/apps/Dashboard/Fhc.js'],
 	'customCSSs' => [
 		'public/css/components/dashboard.css'

From e3cbbfa365d23e6206395e1bdc3c10bbbfbb56d6 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 13 Nov 2024 14:52:46 +0100
Subject: [PATCH 1390/1461] feature(Calendar Tagesansicht): LvInfo und LvMenu
 wird neben der Tagesansicht angezeigt wenn man eine Lv auswaehlt

---
 public/js/apps/Cis/Stundenplan.js         | 17 +++-
 public/js/components/Calendar/Day/Page.js | 45 +++++++++--
 public/js/components/Cis/Mylv/LvInfo.js   | 96 +++++++++++++++++++++++
 public/js/components/Cis/Mylv/LvMenu.js   | 20 +++--
 public/js/components/Cis/Mylv/LvModal.js  | 86 +-------------------
 5 files changed, 162 insertions(+), 102 deletions(-)
 create mode 100644 public/js/components/Cis/Mylv/LvInfo.js

diff --git a/public/js/apps/Cis/Stundenplan.js b/public/js/apps/Cis/Stundenplan.js
index 933bd39f7..edbb21cdf 100644
--- a/public/js/apps/Cis/Stundenplan.js
+++ b/public/js/apps/Cis/Stundenplan.js
@@ -121,10 +121,19 @@ const app = Vue.createApp({
 			</div>
 		</template>
 		<template #dayPage="{event,day}">
-			<div @click="showModal(event?.orig)" type="button" class="d-flex flex-column align-items-center justify-content-evenly h-100">
-				<span>{{event?.orig.topic}}</span>
-				<span v-for="lektor in event?.orig.lektor">{{lektor.kurzbz}}</span>
-				<span>{{event?.orig.ort_kurzbz}}</span>
+			<div type="button" class="row">
+				<div class="col">
+					<p>Lehrveranstaltung:</p>
+					<p>{{event?.orig.topic}}</p>
+				</div>
+				<div class="col">
+					<p>Lektor:</p>
+					<p v-for="lektor in event?.orig.lektor">{{lektor.kurzbz}}</p>
+				</div>
+				<div class="col">
+					<p>Ort: </p>
+					<p>{{event?.orig.ort_kurzbz}}</p>
+				</div>
 			</div>
 		</template>
 	</fhc-calendar>
diff --git a/public/js/components/Calendar/Day/Page.js b/public/js/components/Calendar/Day/Page.js
index b14025e5b..3b0465a96 100644
--- a/public/js/components/Calendar/Day/Page.js
+++ b/public/js/components/Calendar/Day/Page.js
@@ -1,13 +1,21 @@
 import CalendarDate from '../../../composables/CalendarDate.js';
+import LvMenu from "../../../components/Cis/Mylv/LvMenu.js"
+import LvInfo from "../../../components/Cis/Mylv/LvInfo.js"
 
 function ggt(m, n) { return n == 0 ? m : ggt(n, m % n); }
 function kgv(m, n) { return (m * n) / ggt(m, n); }
 
 export default {
+	components:{
+		LvMenu,
+		LvInfo,
+	},
 	data() {
 		return {
 			hourPosition: null,
 			hourPositionTime: null,
+			lvMenu:null,
+			selectedEvent: null,
 		}
 	},
 	inject: [
@@ -88,6 +96,24 @@ export default {
 		},
 	},
 	methods: {
+		eventClick(evt) {
+			let event = evt.orig;
+			this.selectedEvent = event;
+			if (event.type == 'lehreinheit') {
+				this.$fhcApi.factory.stundenplan.getLehreinheitStudiensemester(event.lehreinheit_id[0]).then(
+					res => res.data
+				).then(
+					studiensemester_kurzbz => {
+						this.$fhcApi.factory.addons.getLvMenu(event.lehrveranstaltung_id, studiensemester_kurzbz).then(res => {
+							if (res.data) {
+								this.lvMenu = res.data;
+							}
+						});
+					}
+				)
+			}
+			this.$emit('input', event);
+		},
 		calcHourPosition(event) {
 			let height = this.$refs.eventcontainer.getBoundingClientRect().height;
 			let top = this.$refs.eventcontainer.getBoundingClientRect().top;
@@ -149,8 +175,8 @@ export default {
 	},
 	template: /*html*/`
 	<div class="fhc-calendar-day-page ">
-		<div class="row">
-			<div class="col-12 col-xl-6">
+		<div class="row m-0">
+			<div class="col-12 col-xl-6 p-0">
 				<div class="d-flex flex-column">
 				<div class="fhc-calendar-week-page-header d-grid border-2 border-bottom text-center" :style="{'z-index':4,'grid-template-columns': 'repeat(' + days.length + ', 1fr)', 'grid-template-rows':1}" style="position:sticky; top:0; " >
 					<div type="button" v-for="day in days" :key="day" class="flex-grow-1" :title="day.toLocaleString(undefined, {dateStyle:'short'})" @click.prevent="changeToMonth(day)">
@@ -166,12 +192,12 @@ export default {
 					<div>
 						<h1 v-if="filteredEvents.length==0" class="m-0 text-secondary" ref="noEventsText" :style="{'top':noEventsTextPosition+'px'}" style="position:absolute; left:0;  text-align:center; width: 100%; z-index:1">Keine Lehrveranstaltungen</h1>
 						<div class="events" :class="{'fhc-calendar-no-events-overlay':filteredEvents.length==0}">
-							
+
 							<div class="hours">
 								<div v-for="hour in hours" style="min-height:100px" :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
 							</div>
 							<div v-for="day in eventsPerDayAndHour" :key="day" class=" day border-start" :style="{'grid-template-columns': '1 1fr', 'grid-template-rows': 'repeat(' + (hours.length * 60 / smallestTimeFrame) + ', 1fr)'}">
-								<div  :style="{'background-color':event.orig.color}" class="mx-2 border border-dark border-2 small rounded overflow-hidden "  @click.prevent="$emit('input', event.orig)" :style="{'z-index':1,'grid-column-start': 1+(event.lane-1)*day.lanes/event.maxLane, 'grid-column-end': 1+event.lane*day.lanes/event.maxLane, 'grid-row-start': dateToMinutesOfDay(event.start), 'grid-row-end': dateToMinutesOfDay(event.end) ,'--test': dateToMinutesOfDay(event.end)}" v-for="event in day.events" :key="event">
+								<div  :style="{'background-color':event.orig.color}" class="mx-2 border border-dark border-2 small rounded overflow-hidden "  @click.prevent="eventClick(event)" :style="{'z-index':1,'grid-column-start': 1+(event.lane-1)*day.lanes/event.maxLane, 'grid-column-end': 1+event.lane*day.lanes/event.maxLane, 'grid-row-start': dateToMinutesOfDay(event.start), 'grid-row-end': dateToMinutesOfDay(event.end) ,'--test': dateToMinutesOfDay(event.end)}" v-for="event in day.events" :key="event">
 									<slot  name="dayPage" :event="event" :day="day">
 										<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
 									</slot>
@@ -180,13 +206,16 @@ export default {
 							</div>
 						</div>
 					</div>
-					
+
 				</div>
 			</div>
 			</div>
-			<div class="d-none d-xl-block col-xl-6">
-				<div class="bg-secondary h-100 d-flex justify-content-center align-items-center">
-					<p class="text-white fs-1" >other content goes in here</p>
+			<div class="d-none d-xl-block col-xl-6 p-0">
+				<div style="position:sticky; top:100px; " class="d-flex justify-content-center align-items-center flex-column">
+					<div class="w-100">
+						<lv-info v-if="selectedEvent && lvMenu" :titel="$p.t('lvinfo','lehrveranstaltungsinformationen')" :event="selectedEvent" />
+					</div>
+					<lv-menu  v-show="lvMenu" :titel="'Lehrveranstaltungs Menu'" :menu="lvMenu" />
 				</div>
 			</div>
 		</div>
diff --git a/public/js/components/Cis/Mylv/LvInfo.js b/public/js/components/Cis/Mylv/LvInfo.js
new file mode 100644
index 000000000..829850cbc
--- /dev/null
+++ b/public/js/components/Cis/Mylv/LvInfo.js
@@ -0,0 +1,96 @@
+import { numberPadding, formatDate } from "../../../helpers/DateHelpers.js"
+
+
+export default {
+	props: {
+		event: Object,
+		titel: String,
+	},
+	data() {
+		return {
+
+		}
+	},
+	computed: {
+		start_time: function () {
+			if (!this.event.start) return 'N/A';
+			if (!this.event.start instanceof Date) {
+				return this.event.start;
+			}
+			return numberPadding(this.event.start.getHours()) + ":" + numberPadding(this.event.start.getMinutes());
+		},
+		end_time: function () {
+			if (!this.event.end) return 'N/A';
+			if (!this.event.end instanceof Date) {
+				return this.event.end;
+			}
+			return numberPadding(this.event.end.getHours()) + ":" + numberPadding(this.event.end.getMinutes());
+		}
+	},
+	methods: {
+		mehtodNumberPadding: function (number) {
+			return numberPadding(number);
+		},
+		methodFormatDate: function (d) {
+			return formatDate(d);
+		},
+	},
+	template:/*html*/`
+	<div>
+	<h3 v-if="titel">{{titel}}</h3>
+		<table class="table table-hover mb-4">
+			<tbody>
+				<tr>
+					<th>{{
+						$p.t('global','datum')?
+						$p.t('global','datum')+':'
+						:''
+					}}</th>
+					<td>{{methodFormatDate(event.datum)}}</td>
+				</tr>
+				<tr>
+					<th>{{
+						$p.t('global','raum')?
+						$p.t('global','raum')+':'
+						:''
+					}}</th>
+					<td>{{event.ort_kurzbz}}</td>
+				</tr>
+				<tr>
+					<th>{{
+						$p.t('lehre','lehrveranstaltung')?
+						$p.t('lehre','lehrveranstaltung')+':'
+						:''
+					}}</th>
+					<td>{{'('+event.lehrform+') ' + event.lehrfach_bez}}</td>
+				</tr>
+				<tr>
+					<th>{{
+						$p.t('lehre','lektor')?
+						$p.t('lehre','lektor')+':'
+						:''
+					}}</th>
+					<td>{{event.lektor.map(lektor=>lektor.kurzbz).join("/")}}</td>
+				</tr>
+				<tr>
+					<th>{{
+						$p.t('ui','zeitraum')?
+						$p.t('ui','zeitraum')+':'
+						:''
+					}}</th>
+					<td>{{start_time + ' - ' + end_time}}</td>
+				</tr>
+				<tr>
+					<th>{{
+						$p.t('lehre','organisationseinheit')?
+						$p.t('lehre','organisationseinheit')+':'
+						:''
+					}}</th>
+					<td>{{event.organisationseinheit}}</td>
+				</tr>
+			</tbody>
+		</table>
+		</div>
+	`
+}
+
diff --git a/public/js/components/Cis/Mylv/LvMenu.js b/public/js/components/Cis/Mylv/LvMenu.js
index d5e091f31..0bbad589f 100644
--- a/public/js/components/Cis/Mylv/LvMenu.js
+++ b/public/js/components/Cis/Mylv/LvMenu.js
@@ -5,6 +5,7 @@ export default {
 			type:Array,
 			default:null,
 		},
+		titel:String,
 	},
 	data(){
 		return{
@@ -34,14 +35,17 @@ export default {
 	},
 	template:/*html*/`
 	<div v-if="!menu">No Menu available</div>
-	<div v-else class="container">
-		<div class="row g-2">
-			<div style="min-height:150px" class="col-12 col-lg-6 col-xl-4" v-for="(menuItem, index) in menu" :key="index">
-				<a :title="menuItem.name" :target="menuItem.c4_target ?? null" role="button" :href="menuItem.c4_link" class="border border-1 d-flex flex-column align-items-center justify-content-center text-center text-decoration-none link-dark h-100">
-					<img :src="menuItem.c4_icon" :alt="menuItem.name" ></img>
-					<span @click="selectMenu(menuItem)" class=" mt-2">{{menuItem.name}}</span>
-					<span v-for="([text,link],index) in menuItem.c4_linkList" @click.stop="selectMenu(menuItem,index)"   class="mt-1" :index="index">{{text}}</span>
-				</a>
+	<div v-else >
+		<h3 v-if="titel">{{titel}}</h3>
+		<div class="container">
+			<div class="row g-2">
+				<div style="min-height:150px" class="col-12 col-lg-6 col-xl-4" v-for="(menuItem, index) in menu" :key="index">
+					<a :title="menuItem.name" :target="menuItem.c4_target ?? null" role="button" :href="menuItem.c4_link" class="border border-1 d-flex flex-column align-items-center justify-content-center text-center text-decoration-none link-dark h-100">
+						<img :src="menuItem.c4_icon" :alt="menuItem.name" ></img>
+						<span @click="selectMenu(menuItem)" class=" mt-2">{{menuItem.name}}</span>
+						<span v-for="([text,link],index) in menuItem.c4_linkList" @click.stop="selectMenu(menuItem,index)"   class="mt-1" :index="index">{{text}}</span>
+					</a>
+				</div>
 			</div>
 		</div>
 	</div>
diff --git a/public/js/components/Cis/Mylv/LvModal.js b/public/js/components/Cis/Mylv/LvModal.js
index 84eedbf92..fcffdeb5c 100644
--- a/public/js/components/Cis/Mylv/LvModal.js
+++ b/public/js/components/Cis/Mylv/LvModal.js
@@ -1,13 +1,14 @@
 import BsModal from "../../Bootstrap/Modal.js";
 import Alert from "../../Bootstrap/Alert.js";
 import LvMenu from "./LvMenu.js"
-import { numberPadding,formatDate } from "../../../helpers/DateHelpers.js"
+import LvInfo from "./LvInfo.js"
 
 export default {
 	components: {
 		BsModal,
 		Alert,
 		LvMenu,
+		LvInfo,
 	},
 	mixins: [BsModal],
 	props: {
@@ -35,31 +36,7 @@ export default {
 			info: null,
 		};
 	},
-	computed: {
-		start_time: function(){
-			if(!this.event.start) return 'N/A';
-			if (!this.event.start instanceof Date){
-				return this.event.start;
-			}
-			return numberPadding(this.event.start.getHours()) + ":" + numberPadding(this.event.start.getMinutes());
-		},
-		end_time: function(){
-			if (!this.event.end) return 'N/A';
-			if (!this.event.end instanceof Date) {
-				return this.event.end;
-			}
-			return numberPadding(this.event.end.getHours()) + ":" + numberPadding(this.event.end.getMinutes());
-		}
-	},
 	methods:{
-		mehtodNumberPadding: function(number)
-		{
-			return numberPadding(number);
-		},
-		methodFormatDate: function(d)
-		{
-			return formatDate(d);
-		},
 		onModalShow: function()
 		{
 			if (this.event.type == 'lehreinheit') {
@@ -90,63 +67,8 @@ export default {
 			<template v-else>{{ event.lehrfach_bez + ' [' + event.ort_kurzbz+']'}}</template>
 		</template>
 		<template v-slot:default>
-
-				<h3>{{$p.t('lvinfo','lehrveranstaltungsinformationen')}}</h3>
-				<table class="table table-hover mb-4">
-					<tbody>
-						<tr>
-							<th>{{
-								$p.t('global','datum')?
-								$p.t('global','datum')+':'
-								:''
-							}}</th>
-							<td>{{methodFormatDate(event.datum)}}</td>
-						</tr>
-						<tr>
-							<th>{{
-								$p.t('global','raum')?
-								$p.t('global','raum')+':'
-								:''
-							}}</th>
-							<td>{{event.ort_kurzbz}}</td>
-						</tr>
-						<tr>
-							<th>{{
-								$p.t('lehre','lehrveranstaltung')?
-								$p.t('lehre','lehrveranstaltung')+':'
-								:''
-							}}</th>
-							<td>{{'('+event.lehrform+') ' + event.lehrfach_bez}}</td>
-						</tr>
-						<tr>
-							<th>{{
-								$p.t('lehre','lektor')?
-								$p.t('lehre','lektor')+':'
-								:''
-							}}</th>
-							<td>{{event.lektor.map(lektor=>lektor.kurzbz).join("/")}}</td>
-						</tr>
-						<tr>
-							<th>{{
-								$p.t('ui','zeitraum')?
-								$p.t('ui','zeitraum')+':'
-								:''
-							}}</th>
-							<td>{{start_time + ' - ' + end_time}}</td>
-						</tr>
-						<tr>
-							<th>{{
-								$p.t('lehre','organisationseinheit')?
-								$p.t('lehre','organisationseinheit')+':'
-								:''
-							}}</th>
-							<td>{{event.organisationseinheit}}</td>
-						</tr>
-					</tbody>
-				</table>
-				<h3>Lehrveranstaltungs Menu</h3>
-			
-			<lv-menu :menu="menu"></lv-menu>
+			<lv-info :titel="$p.t('lvinfo','lehrveranstaltungsinformationen')" :event="event"></lv-info>
+			<lv-menu :titel="'Lehrveranstaltungs Menu'" :menu="menu"></lv-menu>
 		</template>
 		<!-- optional footer -->
 		<template  v-slot:footer >

From 2fd39a9d189f62957717376bd78dad868f5525a3 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 13 Nov 2024 15:19:42 +0100
Subject: [PATCH 1391/1461] defined active color variable for lvl 2 buttons and
 use in css class fhc-active for language Buttons. It is yet another shade of
 grey.

---
 public/css/Cis4/Cis.css               |  5 ++++
 public/js/components/Cis/Menu.js      | 37 ++++++++++++++++++++++++---
 public/js/composables/CalendarDate.js |  1 -
 3 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index 5c98ccb1d..d7512f3a1 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -19,6 +19,7 @@ html {
   --fhc-cis-menu-lvl-2-color: #fff;
   --fhc-cis-menu-lvl-2-bg-hover: #2c3136;
   --fhc-cis-menu-lvl-2-color-hover: #fff;
+  --fhc-cis-menu-lvl-2-color-active: #292b2a;
   --fhc-cis-menu-lvl-3-bg: #72777A;
   --fhc-cis-menu-lvl-3-color: #fff;
   --fhc-cis-menu-lvl-3-bg-hover: #616568;
@@ -233,6 +234,10 @@ html {
   display: flex;
 }
 
+.fhc-active {
+  background-color: var(--fhc-cis-menu-lvl-2-color-active) !important;
+}
+
 /* desktop */
 @media (min-width: 992px) {
   body {
diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js
index d07c50e95..b3547e30a 100644
--- a/public/js/components/Cis/Menu.js
+++ b/public/js/components/Cis/Menu.js
@@ -48,7 +48,25 @@ export default {
 			return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
 		}
 	},
-	methods:{
+	methods: {
+		getLanguageButtonClass(lang) {
+			let classString = 'btn btn-level-2 rounded-0'
+			const langCookie = (function(lang) {
+				const cookieString = document.cookie;
+				const cookies = cookieString.split('; ');
+
+				for (let cookie of cookies) {
+					const [key, value] = cookie.split('=');
+					if (key === lang) {
+						return decodeURIComponent(value);
+					}
+				}
+
+				return null; // Return null if the cookie is not found
+			})('sprache');
+			if(langCookie === lang) classString += ' fhc-active';
+			return classString
+		},
 		toggleCollapsibles(target){
 			switch(target){
 				case 'settings':
@@ -77,6 +95,17 @@ export default {
 		},
 		handleChangeLanguage(lang) {
 			this.$p.setLanguage(lang, this.$fhcApi)
+			const gerButton = this.$refs.ger
+			const engButton = this.$refs.eng
+			
+			if(lang === 'German') {
+				gerButton.classList.add('fhc-active')
+				engButton.classList.remove('fhc-active')
+			} else if(lang === 'English') {
+				engButton.classList.add('fhc-active')
+				gerButton.classList.remove('fhc-active')
+			}
+			
 		}
 	},
 	mounted(){
@@ -105,8 +134,10 @@ export default {
 		<ul ref="navUserDropdown" @[\`show.bs.collapse\`]="toggleCollapsibles('navUserDropdown')" id="nav-user-menu" class="top-100 end-0 collapse list-unstyled" aria-labelledby="nav-user-btn">
 			<li class="btn-level-2"><a class="btn btn-level-2 rounded-0 d-block" :href="site_url + '/Cis/Profil'" id="menu-profil">Profil</a></li>
 			<li class="fhc-languages btn-level-2" style="text-align: center;">
-				<a class="btn btn-level-2 rounded-0" href="#" @click="handleChangeLanguage('German')">Deutsch</a>
-				<a class="btn btn-level-2 rounded-0" href="#" @click="handleChangeLanguage('English')">English</a>
+				<div class="btn-group">
+					<a :class="getLanguageButtonClass('German')" ref="ger" href="#" @click="handleChangeLanguage('German')">Deutsch</a>
+					<a :class="getLanguageButtonClass('English')" ref="eng" href="#" @click="handleChangeLanguage('English')">English</a>
+				</div>
 			</li>
 			<li class="btn-level-2"><hr class="dropdown-divider p-0 "></li>
 			<li><a class="btn btn-level-2 rounded-0 d-block" :href="logoutUrl">Logout</a></li>
diff --git a/public/js/composables/CalendarDate.js b/public/js/composables/CalendarDate.js
index 09bae1f21..95560fbfd 100644
--- a/public/js/composables/CalendarDate.js
+++ b/public/js/composables/CalendarDate.js
@@ -75,7 +75,6 @@ class CalendarDate {
 			days[i] = new Date(this.y, this.m, this.d)
 			days[i].setDate(this.d -(date.getDay()+7-this.weekStart)%7 + i)
 		}
-		console.log('wholeWorkWeek', days)
 		return days
 	}
 	get cdLastDayOfWeek() {

From 9042f9b83bc323d873c3eda2617d0b68fc56d4ac Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 13 Nov 2024 17:27:50 +0100
Subject: [PATCH 1392/1461] change fh logo visibility breakpoint class md ->
 sm; editable flag in profile based on looking at own profile or being an
 admin; scrollbar calc in profil app;

---
 application/controllers/api/frontend/v1/Profil.php       | 7 ++++++-
 public/js/apps/Cis/Profil.js                             | 3 ++-
 public/js/components/Cis/Menu.js                         | 2 +-
 public/js/components/Cis/Profil/MitarbeiterProfil.js     | 5 ++++-
 public/js/components/Cis/Profil/MitarbeiterViewProfil.js | 6 +++++-
 .../Cis/Profil/ProfilComponents/ProfilInformation.js     | 8 ++++++--
 public/js/components/Cis/Profil/StudentProfil.js         | 9 ++++++---
 public/js/components/Cis/Profil/StudentViewProfil.js     | 5 ++++-
 8 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Profil.php b/application/controllers/api/frontend/v1/Profil.php
index 63e86d1b2..a82b3ddfc 100644
--- a/application/controllers/api/frontend/v1/Profil.php
+++ b/application/controllers/api/frontend/v1/Profil.php
@@ -34,7 +34,8 @@ class Profil extends FHCAPI_Controller
 			'isMitarbeiter' => self::PERM_LOGGED,
 			
 		]);
-
+		
+		$this->load->library('PermissionLib');
 
 		$this->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
 		$this->load->model('crm/Student_model', 'StudentModel');
@@ -69,6 +70,7 @@ class Profil extends FHCAPI_Controller
 	public function getView($uid)
 	{
 		$res = new stdClass();
+		$editAllowed = getAuthUID() == $uid || $this->permissionlib->isBerechtigt('admin');
 
 		// if parsing the URL did not found a UID then the UID of the logged in user is used
 		if ($uid == "Profil" || $uid == $this->uid) {
@@ -86,6 +88,8 @@ class Profil extends FHCAPI_Controller
 				$res->data = $this->studentProfil();
 				$res->data->pid = $this->pid;
 			}
+
+			$editAllowed = true;
 		}
 		// UID is availabe when accessing Profil/View/:uid
 		else {
@@ -112,6 +116,7 @@ class Profil extends FHCAPI_Controller
 				$res->data = $this->viewStudentProfil($uid);
 			}
 		}
+		$res->data->editAllowed = $editAllowed;
 		$this->terminateWithSuccess($res);
 	}
 
diff --git a/public/js/apps/Cis/Profil.js b/public/js/apps/Cis/Profil.js
index b19c448ae..592c27a37 100644
--- a/public/js/apps/Cis/Profil.js
+++ b/public/js/apps/Cis/Profil.js
@@ -4,6 +4,7 @@ import ViewStudentProfil from "../../components/Cis/Profil/StudentViewProfil.js"
 import ViewMitarbeiterProfil from "../../components/Cis/Profil/MitarbeiterViewProfil.js";
 import Loading from "../../components/Loader.js";
 import Phrasen from "../../plugin/Phrasen.js";
+import { setScrollbarWidth } from "../../helpers/CssVarCalcHelpers";
 
 
 Vue.$collapseFormatter = function (data) {
@@ -400,7 +401,7 @@ const profilApp = Vue.createApp({
 	
 	</div>`,
 });
-
+setScrollbarWidth()
 profilApp
   .use(primevue.config.default, { zIndex: { overlay: 9999 } })
   .use(Phrasen)
diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js
index b3547e30a..35fe847a3 100644
--- a/public/js/components/Cis/Menu.js
+++ b/public/js/components/Cis/Menu.js
@@ -124,7 +124,7 @@ export default {
         <span class="navbar-toggler-icon"></span>
     </button>
 	<fhc-searchbar @showSettings="toggleCollapsibles" ref="searchbar" id="nav-search" class="fhc-searchbar w-100" :searchoptions="searchbaroptions" :searchfunction="searchfunction" :selectedtypes="selectedtypes"></fhc-searchbar>
-    <a id="nav-logo" class="d-none d-md-block" :href="rootUrl">
+    <a id="nav-logo" class="d-none d-sm-block" :href="rootUrl">
         <img :src="logoUrl" alt="Logo">
     </a>
 	<div id="nav-user">
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index ed577442c..f95ab28d8 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -195,6 +195,9 @@ export default {
   },
 
   computed: {
+    editable() {
+      return this.data?.editAllowed ?? false;
+    },
     filteredEditData() {
       return this.editDataFilter
         ? this.editData.data[this.editDataFilter]
@@ -299,7 +302,7 @@ export default {
                      <div class="col">
                      
                      <!-- PROFIL INFORMATION -->
-                     <profil-information @showEditProfilModal="showEditProfilModal" :title="$p.t('profil','mitarbeiterIn')" :data="profilInformation"></profil-information>
+                     <profil-information @showEditProfilModal="showEditProfilModal" :title="$p.t('profil','mitarbeiterIn')" :data="profilInformation" :editable="editable"></profil-information>
 
 
 		                 </div>
diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
index 4d41b21c5..696480d77 100644
--- a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
@@ -93,6 +93,10 @@ export default {
   },
 
   computed: {
+    editable() {
+      return this.data?.editAllowed ?? false;
+    },
+    
     personEmails() {
       return this.data?.emails ? this.data.emails : [];
     },
@@ -161,7 +165,7 @@ export default {
                      <div class="col">
                      
                         <!-- Profil Informationen -->
-                        <profil-information :title="$p.t('profil','mitarbeiterIn')" :data="profilInformation"></profil-information>
+                        <profil-information :title="$p.t('profil','mitarbeiterIn')" :data="profilInformation" :editable="editable"></profil-information>
                      
 		                </div>
                     </div>
diff --git a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
index f37c38be4..46b0b2eda 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
@@ -6,6 +6,10 @@ export default {
     data: {
       type: Object,
     },
+    editable: {
+      type: Boolean,
+      default: false
+    }
   },
   data() {
     return {
@@ -56,7 +60,7 @@ export default {
     <div class="card h-100">
     <div class="card-header">
       <div class="row">
-        <div @click="$emit('showEditProfilModal','Personen_Informationen')" class="col-auto" type="button">
+        <div v-if="editable" @click="$emit('showEditProfilModal','Personen_Informationen')" class="col-auto" type="button">
           <i class="fa fa-edit"></i>
         </div>
         <div class="col">
@@ -77,7 +81,7 @@ export default {
         <!-- LOCKING IMAGE FUNCTIONALITY -->
         
         
-        <div role="button" @click.prevent="sperre_foto_function" class="image-lock" >
+        <div v-if="editable" role="button" @click.prevent="sperre_foto_function" class="image-lock" >
         <i :class="{'fa':true, ...(FotoSperre?{'fa-lock':true}:{'fa-lock-open':true})} " ></i>
         </div>
 
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index 66d33efca..40ee7985f 100644
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -139,6 +139,10 @@ export default {
   },
 
   computed: {
+    editable() {
+      return this.data?.editAllowed ?? false;
+    },
+    
     filteredEditData() {
       return this.editDataFilter
         ? this.editData.data[this.editDataFilter]
@@ -204,8 +208,7 @@ export default {
               </div>
 
               <!-- Bearbeiten Button -->
-  
-              <div class="row ">
+              <div v-if="editable" class="row ">
               <div class="col mb-3">
               
               <button @click="showEditProfilModal" type="button" class="text-start  w-100 btn btn-outline-secondary" >
@@ -248,7 +251,7 @@ export default {
                     <div class="col">
                     
                     <!-- PROFIL INFORMATION -->
-                    <profil-information @showEditProfilModal="showEditProfilModal" :title="$p.t('profil','studentIn')" :data="profilInformation"></profil-information>
+                    <profil-information @showEditProfilModal="showEditProfilModal" :title="$p.t('profil','studentIn')" :data="profilInformation" :editable="editable"></profil-information>
 
 
                     </div>
diff --git a/public/js/components/Cis/Profil/StudentViewProfil.js b/public/js/components/Cis/Profil/StudentViewProfil.js
index 4fb0a76ca..d372bf6d4 100644
--- a/public/js/components/Cis/Profil/StudentViewProfil.js
+++ b/public/js/components/Cis/Profil/StudentViewProfil.js
@@ -20,6 +20,9 @@ export default {
   methods: {},
 
   computed: {
+    editable() {
+      return this.data?.editAllowed ?? false;
+    },
     profilInformation() {
       if (!this.data) {
         return {};
@@ -89,7 +92,7 @@ export default {
                      <div class="row mb-4">
                      <div class="col">
                      
-                        <profil-information :data="profilInformation" :title="$p.t('profil','studentIn')"></profil-information>
+                        <profil-information :data="profilInformation" :title="$p.t('profil','studentIn')" :editable="editable"></profil-information>
                      
 		                </div>
                     </div>

From a682d6e5ae5dfb4199bdcef14163460767f65ddc Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 13 Nov 2024 18:14:58 +0100
Subject: [PATCH 1393/1461] overflow-y scroll changed to overflow-y auto ->
 avoid unnecessary scrollbars

---
 public/css/components/dashboard/news.css            | 6 ++----
 public/js/components/DashboardWidget/News.js        | 6 +++---
 public/js/components/DashboardWidget/Stundenplan.js | 2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/public/css/components/dashboard/news.css b/public/css/components/dashboard/news.css
index 013401bc8..bb3bd0d62 100644
--- a/public/css/components/dashboard/news.css
+++ b/public/css/components/dashboard/news.css
@@ -18,7 +18,5 @@
 }
 
 .widgets-news .card-body{
-
-    /*max-height: calc(var(--news-widget-height)*var(--fhc-dg-row-height));  */
-    overflow:scroll;
-} 
\ No newline at end of file
+    overflow: hidden;
+}
\ No newline at end of file
diff --git a/public/js/components/DashboardWidget/News.js b/public/js/components/DashboardWidget/News.js
index 1196a04b0..d0645c95a 100644
--- a/public/js/components/DashboardWidget/News.js
+++ b/public/js/components/DashboardWidget/News.js
@@ -61,7 +61,7 @@ export default {
       this.$refs.newsModal.show();
     },
   },
-  template: /*html*/ `<div class="widgets-news w-100 h-100">
+  template: /*html*/ `<div class="widgets-news h-100">
   
       <div class="d-flex flex-column h-100 ">
       <div class="d-flex">
@@ -69,10 +69,10 @@ export default {
         <a :href="allNewsURI()" class="ms-auto mb-2">
           <i class="fa fa-arrow-up-right-from-square me-1"></i>{{$p.t('news','allNews')}}</a>
       </div>
-      <div class="h-100 overflow-scroll" v-if="width == 1">
+      <div class="h-100" style="overflow-y: auto" v-if="width == 1">
         <div  v-for="news in newsList" :key="news.id" class="mt-2">
           <div  class="card">
-            <div class=" card-body">
+            <div class="card-body">
               <a :href="contentURI(news.content_id)" class="stretched-link" >{{ news.content_obj.betreff?news.content_obj.betreff:getDate(news.insertamum) }}</a><br>
               <span class="small text-muted">{{ formatDateTime(news.insertamum) }}</span>
             </div>
diff --git a/public/js/components/DashboardWidget/Stundenplan.js b/public/js/components/DashboardWidget/Stundenplan.js
index dbf485a7b..2e2fc26f4 100644
--- a/public/js/components/DashboardWidget/Stundenplan.js
+++ b/public/js/components/DashboardWidget/Stundenplan.js
@@ -189,7 +189,7 @@ export default {
 		<content-modal :contentID="roomInfoContentID" :ort_kurzbz="" dialogClass="modal-lg" ref="contentModal"/>
 		<fhc-calendar @change:range="updateRange" :initial-date="currentDay" class="border-0" class-header="p-0" @select:day="selectDay" v-model:minimized="minimized" :events="events" no-week-view :show-weeks="false" >
 			<template #minimizedPage >
-				<div class="flex-grow-1" style="overflow-y: scroll; overflow-x: hidden">
+				<div class="flex-grow-1" style="overflow-y: auto; overflow-x: hidden">
 					<div v-if="events === null" class="d-flex h-100 justify-content-center align-items-center">
 						<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
 					</div>

From 160294bea490c42250cc7d06282125e13e545467 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 13 Nov 2024 18:39:19 +0100
Subject: [PATCH 1394/1461] removed grey section background and added fading
 thing seperator line for every section after the first

---
 public/css/Cis4/Cis.css                     | 16 ++++++++++++++++
 public/js/components/Dashboard/Dashboard.js |  5 +++--
 public/js/components/Dashboard/Section.js   | 10 ++++------
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index d7512f3a1..e9343497c 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -238,6 +238,22 @@ html {
   background-color: var(--fhc-cis-menu-lvl-2-color-active) !important;
 }
 
+.fhc-seperator {
+  position: relative;
+}
+
+.fhc-seperator::before {
+  content: '';
+  position: absolute;
+  top: 0;
+  left: 0;
+  margin-left: 12.5%;
+  width: 75%; /* Full width of the parent element */
+  height: 1px; /* Height of the border */
+  background: linear-gradient(to right, #ffffff, var(--fhc-cis-primary), #ffffff);
+  opacity: 0.8; /* Adjust opacity for a subtle fade effect */
+}
+
 /* desktop */
 @media (min-width: 992px) {
   body {
diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js
index 3a3f3626a..8bf1b9051 100644
--- a/public/js/components/Dashboard/Dashboard.js
+++ b/public/js/components/Dashboard/Dashboard.js
@@ -140,8 +140,9 @@ export default {
 			}
 		}).catch(err => console.error('ERROR:', err));
 	},
-	template: `<div class="core-dashboard">
-		<dashboard-section v-for="section in sections" :key="section.name" :name="section.name" :widgets="section.widgets" @widgetAdd="widgetAdd" @widgetUpdate="widgetUpdate" @widgetRemove="widgetRemove"></dashboard-section>
+	template: `
+	<div class="core-dashboard">
+		<dashboard-section v-for="(section, index) in sections" :key="section.name" :seperator="index" :name="section.name" :widgets="section.widgets" @widgetAdd="widgetAdd" @widgetUpdate="widgetUpdate" @widgetRemove="widgetRemove"></dashboard-section>
 		<dashboard-widget-picker ref="widgetpicker" :widgets="widgets"></dashboard-widget-picker>
 	</div>`
 }
\ No newline at end of file
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index ac11ddd2f..c6769a373 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -16,7 +16,8 @@ export default {
 	},
 	props: [
 		"name",
-		"widgets"
+		"widgets",
+		"seperator"
 	],
 	emits: [
 		"widgetAdd",
@@ -32,11 +33,7 @@ export default {
 	},
 	computed: {
 		getSectionStyle() {
-
-			const bgString = `background: 
-			  linear-gradient(0deg, rgba(128, 128, 128, 0.05) 0%, rgba(128, 128, 128, 0.1) 50%, rgba(128, 128, 128, 0.05) 100%)`
-
-			return 'margin-bottom: 8px;' + bgString;
+			return 'margin-bottom: 8px;';
 		},
 		items() {
 			return this.widgets.map(item => {
@@ -177,6 +174,7 @@ export default {
 		});
 	},
 	template: `
+	<div v-if="seperator" class="fhc-seperator"/>
 	<div class="dashboard-section" ref="container" :style="getSectionStyle">
 		<h3>
 			<span >{{$p.t('ui/section' + name)}}</span>

From f159d6e2a7b0698f59531aee8a3f3c5eeda406c1 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 14 Nov 2024 11:07:58 +0100
Subject: [PATCH 1395/1461] fix(Grid CSS): remove unused css rules and css
 classes

---
 public/css/components/dashboard.css | 7 -------
 public/js/components/Drop/Grid.js   | 1 -
 2 files changed, 8 deletions(-)

diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
index 0266b04d8..e742f7fa4 100644
--- a/public/css/components/dashboard.css
+++ b/public/css/components/dashboard.css
@@ -15,13 +15,6 @@
 		background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="-500 -500 1448 1512"><path fill="rgb(211, 211, 211)" d="M64 32C28.7 32 0 60.7 0 96V416c0 35.3 28.7 64 64 64H384c35.3 0 64-28.7 64-64V96c0-35.3-28.7-64-64-64H64zM200 344V280H136c-13.3 0-24-10.7-24-24s10.7-24 24-24h64V168c0-13.3 10.7-24 24-24s24 10.7 24 24v64h64c13.3 0 24 10.7 24 24s-10.7 24-24 24H248v64c0 13.3-10.7 24-24 24s-24-10.7-24-24z"/></svg>');
 }
 
-/*.empty-tile-background {
-	background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="-500 -500 1448 1512"><path fill="rgb(211, 211, 211, 0.35)" d="M64 32C28.7 32 0 60.7 0 96V416c0 35.3 28.7 64 64 64H384c35.3 0 64-28.7 64-64V96c0-35.3-28.7-64-64-64H64zM200 344V280H136c-13.3 0-24-10.7-24-24s10.7-24 24-24h64V168c0-13.3 10.7-24 24-24s24 10.7 24 24v64h64c13.3 0 24 10.7 24 24s-10.7 24-24 24H248v64c0 13.3-10.7 24-24 24s-24-10.7-24-24z"/></svg>');
-	background-repeat: repeat;
-	background-size: var(--fhc-dg-col-width);
-	cursor: pointer;
-}*/
-
 .alert-danger .form-check-input:checked {
 	border-color: #842029;
 	background-color: #842029;
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index a592c0020..e3dbe6351 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -349,7 +349,6 @@ export default {
 	<div
 		ref="container"
 		class="drop-grid position-relative h-0"
-		:class="{'empty-tile-background':active}"
 		:style="gridStyle"
 		@touchmove="dragOver"
 		@touchend="dragCancel"

From 681fb18222486e1d1b9fb439d1a6166f7df44b43 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 14 Nov 2024 11:15:02 +0100
Subject: [PATCH 1396/1461] fix(Stundenplan): readds the loadEvents and deletes
 the template error

---
 public/js/apps/Cis/Stundenplan.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/apps/Cis/Stundenplan.js b/public/js/apps/Cis/Stundenplan.js
index 5a24ed2a8..f5a988319 100644
--- a/public/js/apps/Cis/Stundenplan.js
+++ b/public/js/apps/Cis/Stundenplan.js
@@ -105,6 +105,7 @@ const app = Vue.createApp({
 	},
 	created()
 	{
+		this.loadEvents();
 		this.getLvID()
 	},
 	//TODO: Stundenplan phrase
@@ -136,7 +137,6 @@ const app = Vue.createApp({
 				</div>
 			</div>
 		</template>
-		<template
 	</fhc-calendar>
 	`
 });

From 8da27a5c77da18c6db7e3dbb72830b487ae32dca Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 14 Nov 2024 13:12:56 +0100
Subject: [PATCH 1397/1461] stpl widget shows selected day + next 7 days

---
 public/js/components/Cis/Menu.js                    |  2 +-
 public/js/components/DashboardWidget/Stundenplan.js |  9 +++++----
 public/js/composables/CalendarDate.js               | 12 ++++++++++++
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js
index 35fe847a3..8bb49a9bd 100644
--- a/public/js/components/Cis/Menu.js
+++ b/public/js/components/Cis/Menu.js
@@ -124,7 +124,7 @@ export default {
         <span class="navbar-toggler-icon"></span>
     </button>
 	<fhc-searchbar @showSettings="toggleCollapsibles" ref="searchbar" id="nav-search" class="fhc-searchbar w-100" :searchoptions="searchbaroptions" :searchfunction="searchfunction" :selectedtypes="selectedtypes"></fhc-searchbar>
-    <a id="nav-logo" class="d-none d-sm-block" :href="rootUrl">
+    <a id="nav-logo" class="d-none d-lg-block" :href="rootUrl">
         <img :src="logoUrl" alt="Logo">
     </a>
 	<div id="nav-user">
diff --git a/public/js/components/DashboardWidget/Stundenplan.js b/public/js/components/DashboardWidget/Stundenplan.js
index 2e2fc26f4..50e15572a 100644
--- a/public/js/components/DashboardWidget/Stundenplan.js
+++ b/public/js/components/DashboardWidget/Stundenplan.js
@@ -30,13 +30,14 @@ export default {
 	},
 	computed: {
 		allEventsGrouped() {
-			// groups all events of all days until end of week together
+			// groups all events of the next 7 days together
 			const currentCalendarDate = new CalendarDate(this.currentDay)
-			const mapArr = currentCalendarDate.wholeWorkWeek.map((d) => [new CalendarDate(d), []])
+			const mapArr = currentCalendarDate.nextSevenDays.map((d) => [new CalendarDate(d), []])
 
-			return new Map((this.events || []).filter(evt => evt.end < currentCalendarDate.lastDayOfWeek && evt.start >= currentCalendarDate.firstDayOfWeek).reduce((acc, cur) => {
+			return new Map((this.events || []).filter(evt => evt.start >= this.currentDay).reduce((acc, cur) => {
 				const date = new CalendarDate(new Date(cur.datum))
 				const arr = acc.find(el => el[0].compare(date))
+				if(!arr) return acc
 				arr[1].push(cur)
 				
 				return acc
@@ -54,7 +55,7 @@ export default {
 			return this.calendarDateToString(this.calendarDate.cdFirstDayOfCalendarMonth);
 		},
 		monthLastDay: function () {
-			return this.calendarDateToString(this.calendarDate.cdLastDayOfCalendarMonth);
+			return this.calendarDateToString(this.calendarDate.cdLastDayOfNextCalendarMonth);
 		},
 	},
 	methods: {
diff --git a/public/js/composables/CalendarDate.js b/public/js/composables/CalendarDate.js
index 95560fbfd..19d53fe5e 100644
--- a/public/js/composables/CalendarDate.js
+++ b/public/js/composables/CalendarDate.js
@@ -96,6 +96,18 @@ class CalendarDate {
 		let lastDayOfMonth = new Date(this.y, this.m+1, 0);
 		return new CalendarDate(lastDayOfMonth.getFullYear(), lastDayOfMonth.getMonth(), lastDayOfMonth.getDate()+6-(lastDayOfMonth.getDay() + 7 - this.weekStart)%7);
 	}
+	get cdLastDayOfNextCalendarMonth() {
+		let lastDayOfMonth = new Date(this.y, this.m+1, 0);
+		return new CalendarDate(lastDayOfMonth.getFullYear(), lastDayOfMonth.getMonth() + 1, lastDayOfMonth.getDate()+6-(lastDayOfMonth.getDay() + 7 - this.weekStart)%7);
+	}
+	get nextSevenDays() {
+		const days = []
+		
+		for(let i = 0; i < 7; i++) {
+			days[i] = new Date(this.y, this.m, this.d + i)
+		}
+		return days
+	}
 	get numWeeks() {
 		return (new CalendarDate(this.y+1,0,this.weekStart == 1 ? -3 : 0)).w;
 	}

From ebedb30c29f214e5358c8660ce2ab01ecf8e130d Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 14 Nov 2024 14:40:18 +0100
Subject: [PATCH 1398/1461] refactor(Stundenplan Tagesansicht):dynamically
 loads the lvMenu of the first Lv of the day and hightlights the selected LV
 of the day

---
 public/css/components/calendar.css        |   5 +
 public/js/apps/Cis/Stundenplan.js         |  14 +-
 public/js/components/Calendar/Day/Page.js | 151 +++++++++++++---------
 public/js/components/Cis/Mylv/LvInfo.js   |   4 -
 public/js/components/Cis/Mylv/LvMenu.js   |  16 +--
 public/js/components/Cis/Mylv/LvModal.js  |   6 +-
 6 files changed, 114 insertions(+), 82 deletions(-)

diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index 720b79156..b3559df23 100644
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -219,3 +219,8 @@
 .fhc-calendar-xs .fhc-calendar-month-page-day .events span {
   overflow: hidden;
 }
+
+.selectedEvent {
+	background-color: #00649c !important;
+	color: white;
+}
\ No newline at end of file
diff --git a/public/js/apps/Cis/Stundenplan.js b/public/js/apps/Cis/Stundenplan.js
index f5a988319..c2cfe87db 100644
--- a/public/js/apps/Cis/Stundenplan.js
+++ b/public/js/apps/Cis/Stundenplan.js
@@ -122,18 +122,18 @@ const app = Vue.createApp({
 			</div>
 		</template>
 		<template #dayPage="{event,day}">
-			<div type="button" class="row">
-				<div class="col">
+			<div type="button" class="row h-100 justify-content-center align-items-center text-center">
+				<div class="col ">
 					<p>Lehrveranstaltung:</p>
-					<p>{{event?.orig.topic}}</p>
+					<p class="m-0">{{event?.orig.topic}}</p>
 				</div>
-				<div class="col">
+				<div class="col ">
 					<p>Lektor:</p>
-					<p v-for="lektor in event?.orig.lektor">{{lektor.kurzbz}}</p>
+					<p class="m-0" v-for="lektor in event?.orig.lektor">{{lektor.kurzbz}}</p>
 				</div>
-				<div class="col">
+				<div class="col ">
 					<p>Ort: </p>
-					<p>{{event?.orig.ort_kurzbz}}</p>
+					<p class="m-0">{{event?.orig.ort_kurzbz}}</p>
 				</div>
 			</div>
 		</template>
diff --git a/public/js/components/Calendar/Day/Page.js b/public/js/components/Calendar/Day/Page.js
index 3b0465a96..eef260216 100644
--- a/public/js/components/Calendar/Day/Page.js
+++ b/public/js/components/Calendar/Day/Page.js
@@ -39,56 +39,87 @@ export default {
 		'page:forward',
 		'input'
 	],
+	watch:{
+		eventsPerDayAndHour:{
+			handler(newEvents) {
+				if (newEvents[this.day.toDateString()]?.events.length > 0) {
+					let events = newEvents[this.day.toDateString()]?.events;
+					if (Array.isArray(events) && events.length > 0) {
+						this.selectedEvent = events[0].orig;
+					}
+				} else {
+					this.selectedEvent = null;
+				}
+			},
+			immediate: true
+		},
+		selectedEvent:{
+			handler(event) {
+				this.lvMenu = null;
+				if (event && event.type == 'lehreinheit') {
+					this.$fhcApi.factory.stundenplan.getLehreinheitStudiensemester(event.lehreinheit_id[0]).then(
+						res => res.data
+					).then(
+						studiensemester_kurzbz => {
+							this.$fhcApi.factory.addons.getLvMenu(event.lehrveranstaltung_id, studiensemester_kurzbz).then(res => {
+								if (res.data) {
+									this.lvMenu = res.data;
+								}
+							});
+						}
+					)
+				}
+			},
+			immediate:true,
+		}
+	},
 	computed: {
-		noEventsTextPosition(){
-				return this.calendarScrollTop + 100; 
+		noEventsCondition(){
+			return !this.isSliding && this.filteredEvents.length === 0;
 		},
 		hours() {
 			// returns an array with elements starting at 7 and ending at 24
 			return [...Array(24).keys()].filter(hour => hour >= 7 && hour <= 24);
 		},
-		days() {
-			let startDay = this.focusDate;
-			let result = [];
-				result.push(new Date(startDay.y, startDay.m, startDay.d));
-			return result;
+		day() {
+			return new Date(this.focusDate.y, this.focusDate.m, this.focusDate.d);
 		},
 		eventsPerDayAndHour() {
 			// return early if the calendar pane is sliding
 			if (this.isSliding) return {};
 
 			const res = {};
-			this.days.forEach(day => {
-				let key = day.toDateString();
+			
+			let key = this.day.toDateString();
 
-				let nextDay = new Date(day);
-				nextDay.setDate(nextDay.getDate() + 1);
-				nextDay.setMilliseconds(nextDay.getMilliseconds() - 1);
-				let d = { events: [], lanes: 1 };
-				if (this.events[key]) {
-					this.events[key].forEach(evt => {
-						let event = {
-							orig: evt, lane: 1, maxLane: 1, start: evt.start < day ? day : evt.start, end: evt.end > nextDay ? nextDay : evt.end, shared: [], setSharedMaxRecursive(doneItems) {
-								this.maxLane = Math.max(doneItems[0].maxLane, this.maxLane);
-								doneItems.push(this);
-								this.shared.filter(other => !doneItems.includes(other)).forEach(i => i.setSharedMaxRecursive(doneItems));
-							}
-						};
-						event.shared = d.events.filter(other => other.start < event.end && other.end > event.start);
-						event.shared.forEach(other => other.shared.push(event));
-						let occupiedLanes = event.shared.map(other => other.lane);
-						while (occupiedLanes.includes(event.lane))
-							event.lane++;
-						event.maxLane = Math.max(...[event.lane], ...occupiedLanes);
-						if (event.maxLane > 1) {
-							event.setSharedMaxRecursive([event]);
+			let nextDay = new Date(this.day);
+			nextDay.setDate(nextDay.getDate() + 1);
+			nextDay.setMilliseconds(nextDay.getMilliseconds() - 1);
+			let d = { events: [], lanes: 1 };
+			if (this.events[key]) {
+				this.events[key].forEach(evt => {
+					let event = {
+						orig: evt, lane: 1, maxLane: 1, start: evt.start < this.day ? this.day : evt.start, end: evt.end > nextDay ? nextDay : evt.end, shared: [], setSharedMaxRecursive(doneItems) {
+							this.maxLane = Math.max(doneItems[0].maxLane, this.maxLane);
+							doneItems.push(this);
+							this.shared.filter(other => !doneItems.includes(other)).forEach(i => i.setSharedMaxRecursive(doneItems));
 						}
-						d.events.push(event);
-					});
-					d.lanes = d.events.map(e => e.maxLane).reduce((res, i) => kgv(res, i), 1);
-				}
-				res[key] = d;
-			});
+					};
+					event.shared = d.events.filter(other => other.start < event.end && other.end > event.start);
+					event.shared.forEach(other => other.shared.push(event));
+					let occupiedLanes = event.shared.map(other => other.lane);
+					while (occupiedLanes.includes(event.lane))
+						event.lane++;
+					event.maxLane = Math.max(...[event.lane], ...occupiedLanes);
+					if (event.maxLane > 1) {
+						event.setSharedMaxRecursive([event]);
+					}
+					d.events.push(event);
+				});
+				d.lanes = d.events.map(e => e.maxLane).reduce((res, i) => kgv(res, i), 1);
+			}
+			res[key] = d;
+			
 			return res;
 		},
 		smallestTimeFrame() {
@@ -99,19 +130,6 @@ export default {
 		eventClick(evt) {
 			let event = evt.orig;
 			this.selectedEvent = event;
-			if (event.type == 'lehreinheit') {
-				this.$fhcApi.factory.stundenplan.getLehreinheitStudiensemester(event.lehreinheit_id[0]).then(
-					res => res.data
-				).then(
-					studiensemester_kurzbz => {
-						this.$fhcApi.factory.addons.getLvMenu(event.lehrveranstaltung_id, studiensemester_kurzbz).then(res => {
-							if (res.data) {
-								this.lvMenu = res.data;
-							}
-						});
-					}
-				)
-			}
 			this.$emit('input', event);
 		},
 		calcHourPosition(event) {
@@ -170,16 +188,13 @@ export default {
 			return Math.floor(((day.getHours() - 7) * 60 + day.getMinutes()) / this.smallestTimeFrame) + 1;
 		}
 	},
-	mounted() {
-		setTimeout(() => this.$refs.eventcontainer.scrollTop = this.$refs.eventcontainer.scrollHeight / 3 + 1, 0);
-	},
 	template: /*html*/`
 	<div class="fhc-calendar-day-page ">
 		<div class="row m-0">
 			<div class="col-12 col-xl-6 p-0">
 				<div class="d-flex flex-column">
-				<div class="fhc-calendar-week-page-header d-grid border-2 border-bottom text-center" :style="{'z-index':4,'grid-template-columns': 'repeat(' + days.length + ', 1fr)', 'grid-template-rows':1}" style="position:sticky; top:0; " >
-					<div type="button" v-for="day in days" :key="day" class="flex-grow-1" :title="day.toLocaleString(undefined, {dateStyle:'short'})" @click.prevent="changeToMonth(day)">
+				<div class="fhc-calendar-week-page-header d-grid border-2 border-bottom text-center" :style="{'z-index':4,'grid-template-columns': 'repeat(' + day.length + ', 1fr)', 'grid-template-rows':1}" style="position:sticky; top:0; " >
+					<div type="button" class="flex-grow-1" :title="day.toLocaleString(undefined, {dateStyle:'short'})" @click.prevent="changeToMonth(day)">
 						<div class="fw-bold">{{day.toLocaleString(undefined, {weekday: size < 2 ? 'narrow' : (size < 3 ? 'short' : 'long')})}}</div>
 						<a href="#" class="small text-secondary text-decoration-none" >{{day.toLocaleString(undefined, [{day:'numeric',month:'numeric'},{day:'numeric',month:'numeric'},{day:'numeric',month:'numeric'},{dateStyle:'short'}][this.size])}}</a>
 					</div>
@@ -190,14 +205,14 @@ export default {
 						<span class="border border-top-0 px-2 bg-white">{{hourPositionTime}}</span>
 					</div>
 					<div>
-						<h1 v-if="filteredEvents.length==0" class="m-0 text-secondary" ref="noEventsText" :style="{'top':noEventsTextPosition+'px'}" style="position:absolute; left:0;  text-align:center; width: 100%; z-index:1">Keine Lehrveranstaltungen</h1>
-						<div class="events" :class="{'fhc-calendar-no-events-overlay':filteredEvents.length==0}">
+						<h1 v-if="noEventsCondition" class="m-0 text-secondary" ref="noEventsText" :style="{'top':(calendarScrollTop + 100)+'px'}" style="position:absolute; left:0;  text-align:center; width: 100%; z-index:1">Keine Lehrveranstaltungen</h1>
+						<div class="events" :class="{'fhc-calendar-no-events-overlay':noEventsCondition}">
 
 							<div class="hours">
 								<div v-for="hour in hours" style="min-height:100px" :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
 							</div>
 							<div v-for="day in eventsPerDayAndHour" :key="day" class=" day border-start" :style="{'grid-template-columns': '1 1fr', 'grid-template-rows': 'repeat(' + (hours.length * 60 / smallestTimeFrame) + ', 1fr)'}">
-								<div  :style="{'background-color':event.orig.color}" class="mx-2 border border-dark border-2 small rounded overflow-hidden "  @click.prevent="eventClick(event)" :style="{'z-index':1,'grid-column-start': 1+(event.lane-1)*day.lanes/event.maxLane, 'grid-column-end': 1+event.lane*day.lanes/event.maxLane, 'grid-row-start': dateToMinutesOfDay(event.start), 'grid-row-end': dateToMinutesOfDay(event.end) ,'--test': dateToMinutesOfDay(event.end)}" v-for="event in day.events" :key="event">
+								<div  :style="{'background-color':event.orig.color}" :class="{'selectedEvent':event.orig == selectedEvent}" class="mx-2 border border-dark border-2 small rounded overflow-hidden "  @click.prevent="eventClick(event)" :style="{'z-index':1,'grid-column-start': 1+(event.lane-1)*day.lanes/event.maxLane, 'grid-column-end': 1+event.lane*day.lanes/event.maxLane, 'grid-row-start': dateToMinutesOfDay(event.start), 'grid-row-end': dateToMinutesOfDay(event.end) ,'--test': dateToMinutesOfDay(event.end)}" v-for="event in day.events" :key="event">
 									<slot  name="dayPage" :event="event" :day="day">
 										<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
 									</slot>
@@ -211,11 +226,25 @@ export default {
 			</div>
 			</div>
 			<div class="d-none d-xl-block col-xl-6 p-0">
-				<div style="position:sticky; top:100px; " class="d-flex justify-content-center align-items-center flex-column">
-					<div class="w-100">
-						<lv-info v-if="selectedEvent && lvMenu" :titel="$p.t('lvinfo','lehrveranstaltungsinformationen')" :event="selectedEvent" />
+				<div class="p-5	 sticky-top d-flex justify-content-center align-items-center flex-column">
+					<div style="max-height: calc(-300px + 100vh); overflow-y:auto;">
+						<template v-if="selectedEvent && lvMenu">
+							<h3 >{{$p.t('lvinfo','lehrveranstaltungsinformationen')}}</h3>
+							<div class="w-100">
+								<lv-info  :event="selectedEvent" />
+							</div>
+							<h3 >Lehrveranstaltungs Menu</h3>
+							<lv-menu :containerStyles="['p-0']" :rowStyles="['m-0']" v-show="lvMenu" :menu="lvMenu" />
+						</template>
+						<template v-else-if="noEventsCondition">
+							<h3>Keine Lehrveranstaltungen</h3>
+						</template>
+						<template v-else>
+							<div class="d-flex h-100 justify-content-center align-items-center">
+								<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
+							</div>
+						</template>
 					</div>
-					<lv-menu  v-show="lvMenu" :titel="'Lehrveranstaltungs Menu'" :menu="lvMenu" />
 				</div>
 			</div>
 		</div>
diff --git a/public/js/components/Cis/Mylv/LvInfo.js b/public/js/components/Cis/Mylv/LvInfo.js
index 829850cbc..b7f3a7214 100644
--- a/public/js/components/Cis/Mylv/LvInfo.js
+++ b/public/js/components/Cis/Mylv/LvInfo.js
@@ -4,7 +4,6 @@ import { numberPadding, formatDate } from "../../../helpers/DateHelpers.js"
 export default {
 	props: {
 		event: Object,
-		titel: String,
 	},
 	data() {
 		return {
@@ -36,8 +35,6 @@ export default {
 		},
 	},
 	template:/*html*/`
-	<div>
-	<h3 v-if="titel">{{titel}}</h3>
 		<table class="table table-hover mb-4">
 			<tbody>
 				<tr>
@@ -90,7 +87,6 @@ export default {
 				</tr>
 			</tbody>
 		</table>
-		</div>
 	`
 }
 
diff --git a/public/js/components/Cis/Mylv/LvMenu.js b/public/js/components/Cis/Mylv/LvMenu.js
index 0bbad589f..2315eaf1f 100644
--- a/public/js/components/Cis/Mylv/LvMenu.js
+++ b/public/js/components/Cis/Mylv/LvMenu.js
@@ -5,7 +5,8 @@ export default {
 			type:Array,
 			default:null,
 		},
-		titel:String,
+		containerStyles: Array,
+		rowStyles: Array,
 	},
 	data(){
 		return{
@@ -36,14 +37,13 @@ export default {
 	template:/*html*/`
 	<div v-if="!menu">No Menu available</div>
 	<div v-else >
-		<h3 v-if="titel">{{titel}}</h3>
-		<div class="container">
-			<div class="row g-2">
-				<div style="min-height:150px" class="col-12 col-lg-6 col-xl-4" v-for="(menuItem, index) in menu" :key="index">
-					<a :title="menuItem.name" :target="menuItem.c4_target ?? null" role="button" :href="menuItem.c4_link" class="border border-1 d-flex flex-column align-items-center justify-content-center text-center text-decoration-none link-dark h-100">
+		<div class="container" :class="containerStyles">
+			<div class="row g-2 justify-content-center" :class="rowStyles">
+				<div style="min-height:150px; min-width:150px;" class="col-12 col-lg-6 col-xl-4" v-for="(menuItem, index) in menu" :key="index">
+					<a :title="menuItem.name" :target="menuItem.c4_target ?? null" role="button" :href="menuItem.c4_link" class="p-2 w-100 text-wrap border border-1 d-flex flex-column align-items-center justify-content-center text-center text-decoration-none link-dark h-100">
 						<img :src="menuItem.c4_icon" :alt="menuItem.name" ></img>
-						<span @click="selectMenu(menuItem)" class=" mt-2">{{menuItem.name}}</span>
-						<span v-for="([text,link],index) in menuItem.c4_linkList" @click.stop="selectMenu(menuItem,index)"   class="mt-1" :index="index">{{text}}</span>
+						<p @click="selectMenu(menuItem)" class="w-100 mt-2">{{menuItem.name}}</p>
+						<p v-for="([text,link],index) in menuItem.c4_linkList" @click.stop="selectMenu(menuItem,index)" class="mt-1 w-100" :index="index">{{text}}</p>
 					</a>
 				</div>
 			</div>
diff --git a/public/js/components/Cis/Mylv/LvModal.js b/public/js/components/Cis/Mylv/LvModal.js
index fcffdeb5c..718231968 100644
--- a/public/js/components/Cis/Mylv/LvModal.js
+++ b/public/js/components/Cis/Mylv/LvModal.js
@@ -67,8 +67,10 @@ export default {
 			<template v-else>{{ event.lehrfach_bez + ' [' + event.ort_kurzbz+']'}}</template>
 		</template>
 		<template v-slot:default>
-			<lv-info :titel="$p.t('lvinfo','lehrveranstaltungsinformationen')" :event="event"></lv-info>
-			<lv-menu :titel="'Lehrveranstaltungs Menu'" :menu="menu"></lv-menu>
+			<h3 >{{$p.t('lvinfo','lehrveranstaltungsinformationen')}}</h3>
+			<lv-info :event="event"></lv-info>
+			<h3 >Lehrveranstaltungs Menu</h3>
+			<lv-menu :menu="menu"></lv-menu>
 		</template>
 		<!-- optional footer -->
 		<template  v-slot:footer >

From 6b828179b06f00ddb676382370936d7e2fb5bab0 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 14 Nov 2024 16:13:11 +0100
Subject: [PATCH 1399/1461] revert lehrveranstaltung.class.php
 lehreinheit.class.php to current master since additional functions were
 ported to codeigniter models and are no longer used

---
 include/lehreinheit.class.php       | 96 -----------------------------
 include/lehrveranstaltung.class.php | 31 ----------
 2 files changed, 127 deletions(-)

diff --git a/include/lehreinheit.class.php b/include/lehreinheit.class.php
index 1b7ed10e4..6bf1f7282 100644
--- a/include/lehreinheit.class.php
+++ b/include/lehreinheit.class.php
@@ -1122,100 +1122,4 @@ class lehreinheit extends basis_db
 
 		return $ret;
 	}
-
-
-public function lehreinheitInfo($lvid,$angezeigtes_stsem,$lehrfach_id)
-{
-	$qry = "SELECT * FROM (SELECT distinct on(uid) vorname, nachname, tbl_benutzer.uid as uid,
-	CASE WHEN lehrfunktion_kurzbz='LV-Leitung' THEN true ELSE false END as lvleiter
-	FROM lehre.tbl_lehreinheit, lehre.tbl_lehreinheitmitarbeiter, public.tbl_benutzer, public.tbl_person
-	WHERE
-	tbl_lehreinheit.lehreinheit_id=tbl_lehreinheitmitarbeiter.lehreinheit_id AND
-	tbl_lehreinheitmitarbeiter.mitarbeiter_uid=tbl_benutzer.uid AND
-	tbl_person.person_id=tbl_benutzer.person_id AND
-	lehrveranstaltung_id=".$this->db_add_param($lvid, FHC_INTEGER)." AND
-	tbl_lehreinheitmitarbeiter.mitarbeiter_uid NOT like '_Dummy%' AND
-	tbl_benutzer.aktiv=true AND tbl_person.aktiv=true AND
-	studiensemester_kurzbz=".$this->db_add_param($angezeigtes_stsem);
-
-	if($lehrfach_id!='')
-	$qry.=" AND tbl_lehreinheit.lehrfach_id=".$this->db_add_param($lehrfach_id);
-
-	$qry.=" ORDER BY uid, lvleiter desc) as a ORDER BY lvleiter desc, nachname, vorname";
-
-	$result = $this->db_query($qry);
-	if (!$result)
-	{
-		$this->errormsg=$this->db_last_error().$qry;
-		return false;
-	}
-	$ret = array();
-
-	while($row = $this->db_fetch_object($result))
-	{
-		$ret[] = $row;
-	}
-
-	return $ret;
 }
-
-public function lehrfach_id_mitarbeiter($angezeigtes_stsem,$user,$lvid)
-{
-	$qry = "SELECT
-            distinct lehrfach_id
-            FROM
-                lehre.tbl_lehreinheit
-                JOIN lehre.tbl_lehreinheitmitarbeiter USING(lehreinheit_id)
-            WHERE
-                studiensemester_kurzbz=".$this->db_add_param($angezeigtes_stsem)."
-                AND mitarbeiter_uid=".$this->db_add_param($user)."
-                AND lehrveranstaltung_id=".$this->db_add_param($lvid, FHC_INTEGER);
-
-	
-	$result = $this->db_query($qry);
-	if (!$result)
-	{
-		$this->errormsg=$this->db_last_error().$qry;
-		return false;
-	}
-	$ret = array();
-
-	while($row = $this->db_fetch_object($result))
-	{
-		$ret[] = $row;
-	}
-
-	return $ret;
-}
-
-public function lehrfach_id_studierender($lvid,$angezeigtes_stsem,$user)
-{
-	$qry = "SELECT distinct lehrfach_id
-            FROM
-                campus.vw_student_lehrveranstaltung
-            WHERE
-                lehrveranstaltung_id=".$this->db_add_param($lvid, FHC_INTEGER)."
-                AND studiensemester_kurzbz=".$this->db_add_param($angezeigtes_stsem)."
-                AND uid=".$this->db_add_param($user);
-	
-	$result = $this->db_query($qry);
-	if (!$result)
-	{
-		$this->errormsg=$this->db_last_error().$qry;
-		return false;
-	}
-	$ret = array();
-
-	while($row = $this->db_fetch_object($result))
-	{
-		$ret[] = $row;
-	}
-
-	return $ret;
-}
-
-
-}
-
-
-
diff --git a/include/lehrveranstaltung.class.php b/include/lehrveranstaltung.class.php
index b2a3bc481..48edd9d0a 100644
--- a/include/lehrveranstaltung.class.php
+++ b/include/lehrveranstaltung.class.php
@@ -2861,36 +2861,5 @@ class lehrveranstaltung extends basis_db
 			return false;
 		}
 	}
-//Berechtigungen auf Fachbereichsebene
-public function getBerechtigungenAufFachberechsebene($lvid,$angezeigtes_stsem)
-{
-	$qry = "SELECT
-	distinct lehrfach.oe_kurzbz
-	FROM
-	lehre.tbl_lehrveranstaltung
-	JOIN lehre.tbl_lehreinheit USING(lehrveranstaltung_id)
-	JOIN lehre.tbl_lehrveranstaltung as lehrfach ON(tbl_lehreinheit.lehrfach_id=lehrfach.lehrveranstaltung_id)
-	WHERE tbl_lehrveranstaltung.lehrveranstaltung_id=".$this->db_add_param($lvid, FHC_INTEGER);
-
-	if(isset($angezeigtes_stsem) && $angezeigtes_stsem!=''){
-		$qry .= " AND studiensemester_kurzbz=".$this->db_add_param($angezeigtes_stsem);
-	}
-
-	$lehrveranstaltungen = [];
-	if($result = $this->db_query($qry))
-	{
-		while($row = $this->db_fetch_object($result))
-		{
-			$lehrveranstaltungen[] = $row;
-		}
-		return $lehrveranstaltungen;
-	}
-	else
-	{
-		$this->errormsg = 'Fehler beim Laden der Daten';
-		return false;
-	}
-}
-	
 }
 ?>

From ef219369759ad206822639a98362a191e00d075c Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 15 Nov 2024 09:52:40 +0100
Subject: [PATCH 1400/1461] fix(Calendar scroll):ensures the calendar scroll
 watcher always triggers by also passing the current focusDate of the Calendar

---
 public/js/components/Calendar/Calendar.js | 37 ++++++++++++-----------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/public/js/components/Calendar/Calendar.js b/public/js/components/Calendar/Calendar.js
index 761df49db..ac0e34efa 100644
--- a/public/js/components/Calendar/Calendar.js
+++ b/public/js/components/Calendar/Calendar.js
@@ -60,23 +60,22 @@ export default {
 	},
 	watch:{
 		// scroll to the first event if the html element was found
-		async scrollTime(newScrollTime){
+		scrollTime({focusDate,scrollTime}){
+			// return early if the scrollTime is not set
+			if(!scrollTime) return;
 			// scroll the Stundenplan to the closest event
-			await Vue.nextTick();
-			let previousScrollAnchor = document.getElementById('scroll' + (newScrollTime-1) + this.focusDate.d + this.focusDate.w)			
-			let scrollAnchor = document.getElementById('scroll' + newScrollTime+this.focusDate.d+this.focusDate.w);
-
-			if (previousScrollAnchor)
-			{
-				previousScrollAnchor.scrollIntoView({ behavior: 'smooth', block: 'start' });
-			}
-			else
-			{
-				if (scrollAnchor) 
-				{
-					scrollAnchor.scrollIntoView({ behavior: 'smooth', block: 'start' });
+			Vue.nextTick(()=>{
+				let previousScrollAnchor = document.getElementById('scroll' + (scrollTime - 1) + this.focusDate.d + this.focusDate.w)
+				let scrollAnchor = document.getElementById('scroll' + scrollTime + this.focusDate.d + this.focusDate.w);
+				if (previousScrollAnchor) {
+					previousScrollAnchor.scrollIntoView({ behavior: 'smooth', block: 'start' });
 				}
-			}
+				else {
+					if (scrollAnchor) {
+						scrollAnchor.scrollIntoView({ behavior: 'smooth', block: 'start' });
+					}
+				}
+			});
 		}
 	},
 	emits: [
@@ -126,16 +125,18 @@ export default {
 			}, {});
 		},
 		// returns the hour of the earliest event, used to scroll to the events in the calendar (week / day view)
-		scrollTime: function () {
+		scrollTime() {
 				// return the first beginning time of the filtered events
 				if(this.filteredEvents && Array.isArray(this.filteredEvents) && this.filteredEvents.length > 0)
 				{
-					return parseInt(this.filteredEvents.sort((a, b) => parseInt(a.beginn) - parseInt(b.beginn))[0].beginn);
+					let scrollTime = parseInt(this.filteredEvents.sort((a, b) => parseInt(a.beginn) - parseInt(b.beginn))[0].beginn);
+					// to ensure that the scrollTime watcher triggers even if the scrollTime doesn't change, it returns both the scrollTime and the focusDate
+					return { focusDate: this.focusDate, scrollTime };
 				}
 				// there is no event that matches the current view mode constraints
 				else 
 				{
-					return null;
+					return { focusDate: this.focusDate, scrollTime: null };
 				}
 			},
 		// filters the events based on the current calendar view mode

From 45fca04029752b37128e40233e162db5d8cf73fa Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 15 Nov 2024 11:18:15 +0100
Subject: [PATCH 1401/1461] feature(Calendar Tagesansicht):based on the window
 with decides wether to display the lvMenu in a Modal or next to the calendar

---
 public/css/components/calendar.css        |  4 ++++
 public/js/apps/Cis/Stundenplan.js         | 17 ++++++++++++++++-
 public/js/components/Calendar/Day/Page.js |  2 +-
 public/js/components/Calendar/Pane.js     |  2 +-
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index b3559df23..d7053d5e2 100644
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -1,3 +1,7 @@
+:root{
+	--fhc-calendar-pane-height: calc(100vh - 220px);
+}
+
 .fhc-calendar-week-page-header {
   background-color: #e9ecef;
 }
diff --git a/public/js/apps/Cis/Stundenplan.js b/public/js/apps/Cis/Stundenplan.js
index c2cfe87db..ca464a4be 100644
--- a/public/js/apps/Cis/Stundenplan.js
+++ b/public/js/apps/Cis/Stundenplan.js
@@ -36,12 +36,20 @@ const app = Vue.createApp({
 		
 	},
 	methods:{
+		setWindowWidth: function () {
+			this.windowWidth = window.innerWidth;
+		},
 		getLvID: function () {
 			this.lv_id = window.location.pathname
 		},
 		selectDay: function(day){
 			this.currentDay = day;
 		},
+		showDayModal: function (event) {
+			// only show the modal if the window width is smaller than 1200px
+			if(this.windowWidth >= 1200) return;
+			this.showModal(event);
+		},
 		showModal: function(event){
 			this.currentlySelectedEvent = event;
 			Vue.nextTick(() => {
@@ -108,6 +116,13 @@ const app = Vue.createApp({
 		this.loadEvents();
 		this.getLvID()
 	},
+	mounted(){
+		this.windowWidth = window.innerWidth;
+		window.addEventListener('resize', this.setWindowWidth);
+	},
+	beforeUnmount(){
+		window.removeEventListener('resize', this.setWindowWidth);
+	},
 	//TODO: Stundenplan phrase
 	template:/*html*/`
 	<h2>Stundenplan</h2>
@@ -122,7 +137,7 @@ const app = Vue.createApp({
 			</div>
 		</template>
 		<template #dayPage="{event,day}">
-			<div type="button" class="row h-100 justify-content-center align-items-center text-center">
+			<div @click="showDayModal(event?.orig)" type="button" class="row h-100 justify-content-center align-items-center text-center">
 				<div class="col ">
 					<p>Lehrveranstaltung:</p>
 					<p class="m-0">{{event?.orig.topic}}</p>
diff --git a/public/js/components/Calendar/Day/Page.js b/public/js/components/Calendar/Day/Page.js
index eef260216..1374a2bd9 100644
--- a/public/js/components/Calendar/Day/Page.js
+++ b/public/js/components/Calendar/Day/Page.js
@@ -227,7 +227,7 @@ export default {
 			</div>
 			<div class="d-none d-xl-block col-xl-6 p-0">
 				<div class="p-5	 sticky-top d-flex justify-content-center align-items-center flex-column">
-					<div style="max-height: calc(-300px + 100vh); overflow-y:auto;">
+					<div style="max-height: calc(var(--fhc-calendar-pane-height) - 100px); overflow-y:auto;">
 						<template v-if="selectedEvent && lvMenu">
 							<h3 >{{$p.t('lvinfo','lehrveranstaltungsinformationen')}}</h3>
 							<div class="w-100">
diff --git a/public/js/components/Calendar/Pane.js b/public/js/components/Calendar/Pane.js
index 616785b35..a8ff5e30e 100644
--- a/public/js/components/Calendar/Pane.js
+++ b/public/js/components/Calendar/Pane.js
@@ -67,7 +67,7 @@ export default {
 	template: `
 	<div ref="carousel" class="calendar-pane carousel slide" @[\`slide.bs.carousel\`]="slide" @[\`slid.bs.carousel\`]="slid" :data-queue="queue">
 		<!--height calc function just for user testing purpose (has to be fixed)-->
-		<div @scroll="scrollCalendar" ref="calendarContainer" class="carousel-inner " style="height:calc(100vh - 220px); overflow:scroll">
+		<div @scroll="scrollCalendar" ref="calendarContainer" class="carousel-inner " style="height:var(--fhc-calendar-pane-height); overflow:scroll">
 			<div v-for="i in [...Array(3).keys()]" :key="i" class="carousel-item">
 				<slot :index="i" :offset="offsets[i]" />
 			</div>

From 65d0e89f06a26d882ff8194b84623b762927d7fa Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 15 Nov 2024 11:48:55 +0100
Subject: [PATCH 1402/1461] refactor(Stundenplan events css): moves the class
 definitions of the events to the slot templates and adds little animations

---
 public/css/Cis4/Cis.css                    | 12 ++++++++++++
 public/js/apps/Cis/Stundenplan.js          |  4 ++--
 public/js/components/Calendar/Day/Page.js  |  2 +-
 public/js/components/Calendar/Week/Page.js |  2 +-
 public/js/components/Cis/Mylv/LvMenu.js    |  2 +-
 5 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index e9343497c..bace22f52 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -462,4 +462,16 @@ html {
   font-family: var(--fa-style-family, "Font Awesome 6 Free");
   font-weight: var(--fa-style, 900);
   margin-inline-start: 0.5rem;
+}
+
+.fhc-entry:hover{
+	background-color:#00649c !important;
+	color:white !important;
+	border: none !important;
+}
+
+.fhc-entry {
+	transition-property: background,color;
+	transition-duration: 0.3s,0.2s;
+	transition-timing-function: ease-out,ease-out;
 }
\ No newline at end of file
diff --git a/public/js/apps/Cis/Stundenplan.js b/public/js/apps/Cis/Stundenplan.js
index ca464a4be..4c575031a 100644
--- a/public/js/apps/Cis/Stundenplan.js
+++ b/public/js/apps/Cis/Stundenplan.js
@@ -130,14 +130,14 @@ const app = Vue.createApp({
 	<lv-modal v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ref="lvmodal" />
 	<fhc-calendar :initial-date="currentDay" @change:range="updateRange" :events="events" initial-mode="week" show-weeks @select:day="selectDay" v-model:minimized="minimized">
 		<template #weekPage="{event,day}">
-			<div @click="showModal(event?.orig)" type="button" class="d-flex flex-column align-items-center justify-content-evenly h-100">
+			<div @click="showModal(event?.orig)" type="button" class="fhc-entry border border-secondary border d-flex flex-column align-items-center justify-content-evenly h-100">
 				<span>{{event?.orig.topic}}</span>
 				<span v-for="lektor in event?.orig.lektor">{{lektor.kurzbz}}</span>
 				<span>{{event?.orig.ort_kurzbz}}</span>
 			</div>
 		</template>
 		<template #dayPage="{event,day}">
-			<div @click="showDayModal(event?.orig)" type="button" class="row h-100 justify-content-center align-items-center text-center">
+			<div @click="showDayModal(event?.orig)" type="button" class="border border-secondary border row h-100 justify-content-center align-items-center text-center">
 				<div class="col ">
 					<p>Lehrveranstaltung:</p>
 					<p class="m-0">{{event?.orig.topic}}</p>
diff --git a/public/js/components/Calendar/Day/Page.js b/public/js/components/Calendar/Day/Page.js
index 1374a2bd9..09e201751 100644
--- a/public/js/components/Calendar/Day/Page.js
+++ b/public/js/components/Calendar/Day/Page.js
@@ -212,7 +212,7 @@ export default {
 								<div v-for="hour in hours" style="min-height:100px" :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
 							</div>
 							<div v-for="day in eventsPerDayAndHour" :key="day" class=" day border-start" :style="{'grid-template-columns': '1 1fr', 'grid-template-rows': 'repeat(' + (hours.length * 60 / smallestTimeFrame) + ', 1fr)'}">
-								<div  :style="{'background-color':event.orig.color}" :class="{'selectedEvent':event.orig == selectedEvent}" class="mx-2 border border-dark border-2 small rounded overflow-hidden "  @click.prevent="eventClick(event)" :style="{'z-index':1,'grid-column-start': 1+(event.lane-1)*day.lanes/event.maxLane, 'grid-column-end': 1+event.lane*day.lanes/event.maxLane, 'grid-row-start': dateToMinutesOfDay(event.start), 'grid-row-end': dateToMinutesOfDay(event.end) ,'--test': dateToMinutesOfDay(event.end)}" v-for="event in day.events" :key="event">
+								<div  :style="{'background-color':event.orig.color}" :class="{'selectedEvent':event.orig == selectedEvent}" class="mx-2 small rounded overflow-hidden "  @click.prevent="eventClick(event)" :style="{'z-index':1,'grid-column-start': 1+(event.lane-1)*day.lanes/event.maxLane, 'grid-column-end': 1+event.lane*day.lanes/event.maxLane, 'grid-row-start': dateToMinutesOfDay(event.start), 'grid-row-end': dateToMinutesOfDay(event.end) ,'--test': dateToMinutesOfDay(event.end)}" v-for="event in day.events" :key="event">
 									<slot  name="dayPage" :event="event" :day="day">
 										<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
 									</slot>
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index c0fc7df61..656cf9341 100644
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -164,7 +164,7 @@ export default {
 						<div v-for="hour in hours" style="min-height:100px" :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
 					</div>
 					<div v-for="day in eventsPerDayAndHour" :key="day" class=" day border-start" :style="{'grid-template-columns': 'repeat(' + day.lanes + ', 1fr)', 'grid-template-rows': 'repeat(' + (hours.length * 60 / smallestTimeFrame) + ', 1fr)'}">
-						<div  :style="{'background-color':event.orig.color}" class="mx-2 border border-dark border-2 small rounded overflow-hidden "  @click.prevent="$emit('input', event.orig)" :style="{'z-index':1,'grid-column-start': 1+(event.lane-1)*day.lanes/event.maxLane, 'grid-column-end': 1+event.lane*day.lanes/event.maxLane, 'grid-row-start': dateToMinutesOfDay(event.start), 'grid-row-end': dateToMinutesOfDay(event.end) ,'--test': dateToMinutesOfDay(event.end)}" v-for="event in day.events" :key="event">	
+						<div  :style="{'background-color':event.orig.color}" class="mx-2 small rounded overflow-hidden "  @click.prevent="$emit('input', event.orig)" :style="{'z-index':1,'grid-column-start': 1+(event.lane-1)*day.lanes/event.maxLane, 'grid-column-end': 1+event.lane*day.lanes/event.maxLane, 'grid-row-start': dateToMinutesOfDay(event.start), 'grid-row-end': dateToMinutesOfDay(event.end) ,'--test': dateToMinutesOfDay(event.end)}" v-for="event in day.events" :key="event">	
 							<slot  name="weekPage" :event="event" :day="day">
 								<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
 							</slot>
diff --git a/public/js/components/Cis/Mylv/LvMenu.js b/public/js/components/Cis/Mylv/LvMenu.js
index 2315eaf1f..d2a7a8e7c 100644
--- a/public/js/components/Cis/Mylv/LvMenu.js
+++ b/public/js/components/Cis/Mylv/LvMenu.js
@@ -40,7 +40,7 @@ export default {
 		<div class="container" :class="containerStyles">
 			<div class="row g-2 justify-content-center" :class="rowStyles">
 				<div style="min-height:150px; min-width:150px;" class="col-12 col-lg-6 col-xl-4" v-for="(menuItem, index) in menu" :key="index">
-					<a :title="menuItem.name" :target="menuItem.c4_target ?? null" role="button" :href="menuItem.c4_link" class="p-2 w-100 text-wrap border border-1 d-flex flex-column align-items-center justify-content-center text-center text-decoration-none link-dark h-100">
+					<a :title="menuItem.name" :target="menuItem.c4_target ?? null" role="button" :href="menuItem.c4_link" class="fhc-entry p-2 w-100 text-wrap border border-1 rounded-3 d-flex flex-column align-items-center justify-content-center text-center text-decoration-none link-dark h-100">
 						<img :src="menuItem.c4_icon" :alt="menuItem.name" ></img>
 						<p @click="selectMenu(menuItem)" class="w-100 mt-2">{{menuItem.name}}</p>
 						<p v-for="([text,link],index) in menuItem.c4_linkList" @click.stop="selectMenu(menuItem,index)" class="mt-1 w-100" :index="index">{{text}}</p>

From fdcef8bdab5744e249c48767c5db25ba9ee4f69d Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 15 Nov 2024 12:52:24 +0100
Subject: [PATCH 1403/1461] feature(Calendar): keeps track of the selected
 Event in a shared state and highlights the selected Event over different
 calendar views

---
 public/js/apps/Cis/Stundenplan.js           |  9 +++++++--
 public/js/components/Calendar/Calendar.js   | 12 +++++++++---
 public/js/components/Calendar/Day/Page.js   | 14 ++++++--------
 public/js/components/Calendar/Month.js      |  6 +++++-
 public/js/components/Calendar/Month/Page.js | 13 ++++++++-----
 public/js/components/Calendar/Week.js       |  4 ++--
 public/js/components/Calendar/Week/Page.js  | 14 ++++++++++----
 7 files changed, 47 insertions(+), 25 deletions(-)

diff --git a/public/js/apps/Cis/Stundenplan.js b/public/js/apps/Cis/Stundenplan.js
index 4c575031a..1d37e4d91 100644
--- a/public/js/apps/Cis/Stundenplan.js
+++ b/public/js/apps/Cis/Stundenplan.js
@@ -129,8 +129,13 @@ const app = Vue.createApp({
 	<hr>
 	<lv-modal v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ref="lvmodal" />
 	<fhc-calendar :initial-date="currentDay" @change:range="updateRange" :events="events" initial-mode="week" show-weeks @select:day="selectDay" v-model:minimized="minimized">
-		<template #weekPage="{event,day}">
-			<div @click="showModal(event?.orig)" type="button" class="fhc-entry border border-secondary border d-flex flex-column align-items-center justify-content-evenly h-100">
+		<template #monthPage="{event,day,isSelected}">
+			<span class="fhc-entry" :class="{'selectedEvent':isSelected}" style="color:white" :style="{'background-color': event.color}">
+				{{event.topic}}
+			</span>
+		</template>
+		<template #weekPage="{event,day,isSelected}">
+			<div @click="showModal(event?.orig)" type="button" :class="{'selectedEvent':isSelected}" class="fhc-entry border border-secondary border d-flex flex-column align-items-center justify-content-evenly h-100">
 				<span>{{event?.orig.topic}}</span>
 				<span v-for="lektor in event?.orig.lektor">{{lektor.kurzbz}}</span>
 				<span>{{event?.orig.ort_kurzbz}}</span>
diff --git a/public/js/components/Calendar/Calendar.js b/public/js/components/Calendar/Calendar.js
index ac0e34efa..1981ec54a 100644
--- a/public/js/components/Calendar/Calendar.js
+++ b/public/js/components/Calendar/Calendar.js
@@ -34,6 +34,8 @@ export default {
 			eventsAreNull: Vue.computed(() => this.events === null),
 			classHeader: this.classHeader,
 			mode: Vue.computed(()=>this.mode),
+			selectedEvent: Vue.computed(() => this.selectedEvent),
+			setSelectedEvent: (event)=>{this.selectedEvent = event;},
 		};
 	},
 	props: {
@@ -91,7 +93,8 @@ export default {
 			currMode: null,
 			date: new CalendarDate(),
 			focusDate: new CalendarDate(),
-			size: 0
+			size: 0,
+			selectedEvent:null,
 		}
 	},
 	computed: {
@@ -209,8 +212,11 @@ export default {
 	template: /*html*/`
 	<div ref="container" class="fhc-calendar card h-100" :class="sizeClass">
 		<component :is="'calendar-' + mode" @updateMode="mode = $event" @change:range="$emit('change:range',$event)" @input="handleInput" >
-			<template #weekPage="{event,day}">
-				<slot name="weekPage" :event="event" :day="day"></slot>
+			<template #monthPage="{event,day,isSelected}">
+				<slot name="monthPage" :event="event" :day="day" :isSelected="isSelected"></slot>
+			</template>
+			<template #weekPage="{event,day,isSelected}">
+				<slot name="weekPage" :event="event" :day="day" :isSelected="isSelected"></slot>
 			</template>
 			<template #dayPage="{event,day}">
 				<slot name="dayPage" :event="event" :day="day"></slot>
diff --git a/public/js/components/Calendar/Day/Page.js b/public/js/components/Calendar/Day/Page.js
index 09e201751..b579b1b9e 100644
--- a/public/js/components/Calendar/Day/Page.js
+++ b/public/js/components/Calendar/Day/Page.js
@@ -15,7 +15,6 @@ export default {
 			hourPosition: null,
 			hourPositionTime: null,
 			lvMenu:null,
-			selectedEvent: null,
 		}
 	},
 	inject: [
@@ -28,6 +27,8 @@ export default {
 		'isSliding',
 		'calendarScrollTop',
 		'calendarClientHeight',
+		'setSelectedEvent',
+		'selectedEvent',
 	],
 	props: {
 		year: Number,
@@ -42,13 +43,12 @@ export default {
 	watch:{
 		eventsPerDayAndHour:{
 			handler(newEvents) {
-				if (newEvents[this.day.toDateString()]?.events.length > 0) {
+				// if no event is selected, select the first event of the day
+				if (this.selectedEvent == null && newEvents[this.day.toDateString()]?.events.length > 0) {
 					let events = newEvents[this.day.toDateString()]?.events;
 					if (Array.isArray(events) && events.length > 0) {
-						this.selectedEvent = events[0].orig;
+						this.setSelectedEvent(events[0].orig);
 					}
-				} else {
-					this.selectedEvent = null;
 				}
 			},
 			immediate: true
@@ -129,7 +129,7 @@ export default {
 	methods: {
 		eventClick(evt) {
 			let event = evt.orig;
-			this.selectedEvent = event;
+			this.setSelectedEvent(event);
 			this.$emit('input', event);
 		},
 		calcHourPosition(event) {
@@ -217,11 +217,9 @@ export default {
 										<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
 									</slot>
 								</div>
-
 							</div>
 						</div>
 					</div>
-
 				</div>
 			</div>
 			</div>
diff --git a/public/js/components/Calendar/Month.js b/public/js/components/Calendar/Month.js
index 9d612eeaf..70d457bb7 100644
--- a/public/js/components/Calendar/Month.js
+++ b/public/js/components/Calendar/Month.js
@@ -63,7 +63,11 @@ export default {
 	<div class="fhc-calendar-month">
 		<calendar-header :title="title" @prev="prev" @next="next" @updateMode="$emit('updateMode', $event)" @click="$emit('updateMode', 'months')" />
 		<calendar-pane ref="pane" v-slot="slot" @slid="paneChanged">
-			<calendar-month-page :year="focusDate.y" :month="focusDate.m+slot.offset" @updateMode="$emit('updateMode', $event)" @page:back="prev" @page:forward="next" @input="selectDay" />
+			<calendar-month-page :year="focusDate.y" :month="focusDate.m+slot.offset" @updateMode="$emit('updateMode', $event)" @page:back="prev" @page:forward="next" @input="selectDay" >
+				<template #monthPage="{event,day,isSelected}">
+					<slot name="monthPage" :event="event" :day="day" :isSelected="isSelected"></slot>
+				</template>
+			</calendar-month-page>
 		</calendar-pane>
 	</div>`
 }
diff --git a/public/js/components/Calendar/Month/Page.js b/public/js/components/Calendar/Month/Page.js
index d65c358b0..e919f177b 100644
--- a/public/js/components/Calendar/Month/Page.js
+++ b/public/js/components/Calendar/Month/Page.js
@@ -14,6 +14,8 @@ export default {
 		'events',
 		'showWeeks',
 		'noWeekView',
+		'selectedEvent',
+		'setSelectedEvent',
 	],
 	props: {
 		year: Number,
@@ -75,13 +77,12 @@ export default {
 		clickEvent(day,week) {
 			if(!this.noWeekView)
 			{
-				//this.changeToWeek(week);
 				this.changeToDay(day);
 			}
 			this.selectDay(day);
 		}
 	},
-	template: `
+	template: /*html*/`
 	<div class="fhc-calendar-month-page" :class="{'show-weeks': showWeeks}">
 		<div v-if="showWeeks" class=" bg-light fw-bold border-top border-bottom text-center"></div>
 		<div v-for="day in weeks[0].days" :key="day" class="bg-light fw-bold border-top border-bottom text-center">
@@ -92,9 +93,11 @@ export default {
 			<a href="#" @click.prevent="clickEvent(day,week)" @mouseover="highlight(week,day)" @mouseleave="highlightedWeek = null; highlightedDay = null" v-for="day in week.days" :key="day" :class="{'fhc-calendar-month-page-day-highlight': isHighlighted(week, day)}" class="fhc-calendar-month-page-day text-decoration-none overflow-hidden" :class="{active:date.compare(day),'opacity-50':day.getMonth() != month}" >
 				<span class="no">{{day.getDate()}}</span>
 				<span v-if="events[day.toDateString()] && events[day.toDateString()].length" class="events">
-					<span v-for="event in events[day.toDateString()]" :key="event.id" style="color:white" :style="{'background-color': event.color}">
-						{{event.topic}}
-					</span>
+					<div @click="setSelectedEvent(event);" v-for="event in events[day.toDateString()]" :key="event.id" >
+						<slot  name="monthPage" :event="event" :day="day" :isSelected="event == selectedEvent">
+							<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
+						</slot>
+					</div>
 				</span>
 			</a>
 		</template>
diff --git a/public/js/components/Calendar/Week.js b/public/js/components/Calendar/Week.js
index d7a280231..9de82ba79 100644
--- a/public/js/components/Calendar/Week.js
+++ b/public/js/components/Calendar/Week.js
@@ -43,8 +43,8 @@ export default {
 		<calendar-header :title="title" @prev="prev" @next="next" @updateMode="$emit('updateMode', $event)" @click="$emit('updateMode', 'weeks')"/>
 		<calendar-pane ref="pane" v-slot="slot" @slid="paneChanged">
 			<calendar-week-page :year="focusDate.y" :week="focusDate.w+slot.offset" @updateMode="$emit('updateMode', $event)" @page:back="prev" @page:forward="next" @input="selectEvent" >
-				<template #weekPage="{event,day}">
-					<slot name="weekPage" :event="event" :day="day" ></slot>
+				<template #weekPage="{event,day,isSelected}">
+					<slot name="weekPage" :event="event" :day="day" :isSelected="isSelected"></slot>
 				</template>
 			</calendar-week-page>
 		</calendar-pane>
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index 656cf9341..d9cfb0984 100644
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -16,7 +16,9 @@ export default {
 		'size',
 		'events',
 		'noMonthView',
-		'isSliding'
+		'isSliding',
+		'selectedEvent',
+		'setSelectedEvent'
 	],
 	props: {
 		year: Number,
@@ -26,7 +28,7 @@ export default {
 		'updateMode',
 		'page:back',
 		'page:forward',
-		'input'
+		'input',
 	],
 	computed: {
 		hours(){
@@ -138,6 +140,10 @@ export default {
 		},
 		dateToMinutesOfDay(day) {
 			return Math.floor(((day.getHours()-7) * 60 + day.getMinutes()) / this.smallestTimeFrame) + 1;
+		},
+		weekPageClick(event) {
+			this.setSelectedEvent(event);
+			$emit('input', event)
 		}
 	},
 	mounted() {
@@ -164,8 +170,8 @@ export default {
 						<div v-for="hour in hours" style="min-height:100px" :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
 					</div>
 					<div v-for="day in eventsPerDayAndHour" :key="day" class=" day border-start" :style="{'grid-template-columns': 'repeat(' + day.lanes + ', 1fr)', 'grid-template-rows': 'repeat(' + (hours.length * 60 / smallestTimeFrame) + ', 1fr)'}">
-						<div  :style="{'background-color':event.orig.color}" class="mx-2 small rounded overflow-hidden "  @click.prevent="$emit('input', event.orig)" :style="{'z-index':1,'grid-column-start': 1+(event.lane-1)*day.lanes/event.maxLane, 'grid-column-end': 1+event.lane*day.lanes/event.maxLane, 'grid-row-start': dateToMinutesOfDay(event.start), 'grid-row-end': dateToMinutesOfDay(event.end) ,'--test': dateToMinutesOfDay(event.end)}" v-for="event in day.events" :key="event">	
-							<slot  name="weekPage" :event="event" :day="day">
+						<div  :style="{'background-color':event.orig.color}" class="mx-2 small rounded overflow-hidden "  @click.prevent="weekPageClick(event.orig)" :style="{'z-index':1,'grid-column-start': 1+(event.lane-1)*day.lanes/event.maxLane, 'grid-column-end': 1+event.lane*day.lanes/event.maxLane, 'grid-row-start': dateToMinutesOfDay(event.start), 'grid-row-end': dateToMinutesOfDay(event.end) ,'--test': dateToMinutesOfDay(event.end)}" v-for="event in day.events" :key="event">
+							<slot  name="weekPage" :event="event" :day="day" :isSelected="event.orig == selectedEvent" >
 								<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
 							</slot>
 						</div>

From d9f33a279d7f0034e578b109fc46be35fc9c0b34 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Fri, 15 Nov 2024 14:02:05 +0100
Subject: [PATCH 1404/1461] apply html sanitization on legacy cms tables
 intended to be rendered with tabulator 5; clears nested tables, reformats
 rext nodes and unordered lists to fit into tabulator cells;

---
 .../Cis/Cms/Content_types/General.js          | 50 +++++++++++++++++--
 1 file changed, 47 insertions(+), 3 deletions(-)

diff --git a/public/js/components/Cis/Cms/Content_types/General.js b/public/js/components/Cis/Cms/Content_types/General.js
index 985e9c556..31c214368 100644
--- a/public/js/components/Cis/Cms/Content_types/General.js
+++ b/public/js/components/Cis/Cms/Content_types/General.js
@@ -6,19 +6,63 @@ export default {
           required:true,
       },
     },
+	methods: {
+		sanitizeLegacyTables(table) {
+			
+			// find nested tables and replace with p element
+			const tt = table.querySelectorAll('table')
+			tt.forEach(t => {
+				const textContent = t.textContent.trim();
+				const pElement = document.createElement('p');
+				pElement.textContent = textContent;
+				t.parentNode.replaceChild(pElement, t);
+			})
+
+			// find unordered lists, traverse li childs and replace with p element -> more readable than 1 p tag for ul
+			const ul = table.querySelectorAll('ul')
+			ul.forEach(u => {
+				Array.from(u.children).forEach(li => {
+					const p = document.createElement('p');
+					p.textContent = li.textContent
+					u.parentNode.appendChild(p)
+				})
+				u.parentNode.removeChild(u)
+				
+			})
+			
+			// find bare text nodes and put into p element
+			const td = Array.from(table.querySelectorAll('td')).filter(el => el.scrollWidth > 200)
+			td.forEach(element => {
+				if (element.firstChild?.nodeType === Node.TEXT_NODE && element.firstChild.length > 10) {
+					const div = document.createElement('p');
+					div.appendChild(element.firstChild)
+					element.appendChild(div);
+				}
+			});
+
+			// let p elements wrap on overflow
+			const p = table.querySelectorAll('p')
+			p.forEach(p => {
+				p.style.setProperty('word-wrap', 'break-word');
+				p.style.setProperty('white-space', 'normal');
+			})
+		}
+	},
     mounted(){
 
 		// replaces the tablesorter with the tabulator
 		let tables = document.getElementsByClassName("tablesorter");
-
+		
 		for (let table of tables) {
+			this.sanitizeLegacyTables(table)
 			new Tabulator(table, {
-				layout: "fitDataStretch",
+				layout: "fitDataFill",
 
 				columnDefaults: {
 					formatter: "html",
-					resizable: false,
+					resizable: true,
 					minWidth: "100px",
+					maxWidth: "400px"
 				}
 			})
 		}

From 87657a18f15f87da8d15764cd4d16a294663cd3f Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Fri, 15 Nov 2024 14:10:47 +0100
Subject: [PATCH 1405/1461] apply max width only to sanitized p blocks, not
 column default

---
 public/js/components/Cis/Cms/Content_types/General.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Cis/Cms/Content_types/General.js b/public/js/components/Cis/Cms/Content_types/General.js
index 31c214368..8c1ab5cf3 100644
--- a/public/js/components/Cis/Cms/Content_types/General.js
+++ b/public/js/components/Cis/Cms/Content_types/General.js
@@ -45,6 +45,7 @@ export default {
 			p.forEach(p => {
 				p.style.setProperty('word-wrap', 'break-word');
 				p.style.setProperty('white-space', 'normal');
+				p.style.setProperty('max-width', '400px');
 			})
 		}
 	},
@@ -61,8 +62,7 @@ export default {
 				columnDefaults: {
 					formatter: "html",
 					resizable: true,
-					minWidth: "100px",
-					maxWidth: "400px"
+					minWidth: "100px"
 				}
 			})
 		}

From daf432fe8d1f23da6fb56b297b659c571c616077 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 15 Nov 2024 15:14:15 +0100
Subject: [PATCH 1406/1461] port changes made for BS3 => BS5 to version of
 current master to get rid of many whitespace and code formating changes and
 only have functional changes

---
 public/js/TableWidget.js | 1831 +++++++++++++++++++-------------------
 1 file changed, 918 insertions(+), 913 deletions(-)

diff --git a/public/js/TableWidget.js b/public/js/TableWidget.js
index 4d9d66574..7cf778669 100644
--- a/public/js/TableWidget.js
+++ b/public/js/TableWidget.js
@@ -14,755 +14,764 @@ const DATASET_REP_TABULATOR = "tabulator";
  * FHC_TableWidget this object is used to render the GUI of a table widget and to operate with it
  */
 var FHC_TableWidget = {
-  //------------------------------------------------------------------------------------------------------------------
-  // Properties
-
-  _datasetRepresentation: null, // contains the current data representation
-
-  _bootstrapVersion: 3,
-  //------------------------------------------------------------------------------------------------------------------
-  // Public methods
-
-  /**
-   * To display the TableWidget using the loaded data prenset in the session
-   */
-  display: function () {
-    FHC_TableWidget._getTables(FHC_TableWidget._renderTableWidget);
-  },
-
-  /**
-   * Alias call to method display only to inprove the readability of the code
-   */
-  refresh: function () {
-    FHC_TableWidget.display();
-  },
-
-  //------------------------------------------------------------------------------------------------------------------
-  // Private methods
-
-  /**
-   * To retrive the page where the TableWidget is used, using the FHC_JS_DATA_STORAGE_OBJECT
-   */
-  _getTableUniqueIdPrefix: function () {
-    return (
-      FHC_JS_DATA_STORAGE_OBJECT.called_path +
-      "/" +
-      FHC_JS_DATA_STORAGE_OBJECT.called_method
-    );
-  },
-
-  /**
-   * Utility method that checks if data contains an error and print that to the console
-   * otherwise the TableWidget GUI is refreshed
-   */
-  _failOrRefresh: function (data, textStatus, jqXHR) {
-    if (FHC_AjaxClient.isError(data)) {
-      console.log(FHC_AjaxClient.getError(data));
-    } else {
-      FHC_TableWidget.refresh();
-    }
-  },
-
-  /**
-   * Utility method that checks if data contains an error and print that to the console
-   * otherwise the page is reloaded
-   */
-  _failOrReload: function (data, textStatus, jqXHR) {
-    if (FHC_AjaxClient.isError(data)) {
-      console.log(FHC_AjaxClient.getError(data));
-    } else {
-      location.reload();
-    }
-  },
-
-  /**
-   * To reset the Table Widget GUI
-   */
-  _resetGUI: function (tableWidgetDiv) {
-    // If the choosen dataset representation is tablesorter
-    if (FHC_TableWidget._datasetRepresentation == DATASET_REP_TABLESORTER) {
-      tableWidgetDiv.find("#tableWidgetTableDataset > thead > tr").html("");
-      tableWidgetDiv.find("#tableWidgetTableDataset > tbody").html("");
-    }
-
-    // If the choosen dataset representation is pivotUI
-    if (FHC_TableWidget._datasetRepresentation == DATASET_REP_PIVOTUI) {
-      tableWidgetDiv.find("#tableWidgetPivotUI").html("");
-    }
-
-    // If the choosen dataset representation is tabulator
-    if (FHC_TableWidget._datasetRepresentation == DATASET_REP_TABULATOR) {
-      tableWidgetDiv.find("#tableWidgetTabulator").html("");
-    }
-  },
-
-  /**
-   * To get via Ajax all the data related to the TableWidget present in the given page
-   * If the parameter renderFunction is a valid function, is called on success
-   */
-  _getTables: function (renderFunction) {
-    var tableWidgetUniqueIdArray =
-      FHC_TableWidget._getTableWidgetUniqueIdArray();
-
-    for (
-      var tableWidgetsCounter = 0;
-      tableWidgetsCounter < tableWidgetUniqueIdArray.length;
-      tableWidgetsCounter++
-    ) {
-      FHC_AjaxClient.ajaxCallGet(
-        "widgets/Tables/getTable",
-        {
-          tableUniqueId:
-            FHC_TableWidget._getTableUniqueIdPrefix() +
-            "/" +
-            tableWidgetUniqueIdArray[tableWidgetsCounter],
-        },
-        {
-          successCallback: function (data, textStatus, jqXHR) {
-            if (FHC_AjaxClient.hasData(data)) {
-              if (typeof renderFunction == "function") {
-                renderFunction(FHC_AjaxClient.getData(data));
-              }
-            } else {
-              console.log(FHC_AjaxClient.getError(data));
-            }
-          },
-        }
-      );
-    }
-  },
-
-  /**
-   * This method calls all the other methods needed to rendere the GUI for a TableWidget
-   * The parameter data contains all the data about the TableWidget and it is given as parameter
-   * to all the methods that here are called
-   * NOTE: think very carefully before changing the order of the calls
-   */
-  _renderTableWidget: function (data) {
-    FHC_TableWidget._setDatasetRepresentation(data); // set what type of dataset representation was choosen
-
-    FHC_TableWidget._setBootstrapVersion(data); // set the bootstrap version used for the tableWidget
-
-    var tableWidgetDiv = $('div[tableUniqueId="' + data.tableUniqueId + '"]');
-
-    FHC_TableWidget._turnOffEvents(tableWidgetDiv); // turns all the events off
-
-    FHC_TableWidget._resetGUI(tableWidgetDiv); // Reset the entire GUI
-
-    FHC_TableWidget._renderDataset(tableWidgetDiv, data);
-
-    FHC_TableWidget._turnOnEvents(tableWidgetDiv); // turns all the events off
-
-    FHC_TableWidget._onTableBuilt(tableWidgetDiv, data);
-  },
-
-  _onTableBuilt: function (tableWidgetDiv, data) {
-    var options = FHC_TableWidget._getRepresentationOptions(data);
-
-    tableWidgetDiv
-      .find("#tableWidgetTabulator")
-      .tabulator("on", "tableBuilt", () => {
-        if (
-          typeof options.tableWidgetHeader == "undefined" ||
-          (typeof options.tableWidgetHeader != "undefined" &&
-            options.tableWidgetHeader != false)
-        ) {
-          // renders the table headers
-          var tabulatorHeaderCollapseHTML =
-            _renderTabulatorHeaderCollapseHTML(tableWidgetDiv);
-          tableWidgetDiv
-            .find("#tableWidgetHeader")
-            .after(tabulatorHeaderCollapseHTML);
-        }
-
-        // makes the table headers toggle visibility when clicking on them
-        tableWidgetDiv.find(".btn-select-col").on("click", function () {
-          var selected = this.value;
-
-          tableWidgetDiv
-            .find("#tableWidgetTabulator")
-            .tabulator("toggleColumn", selected);
-
-          // toggle class to color button as selected / deselected
-          $(this).toggleClass("btn-select-col-selected").blur(); // blur removes automatic focus
-        });
-      });
-  },
-
-  /**
-   * Turns all the events off
-   * NOTE: must be aligned to _turnOnEvents
-   */
-  _turnOffEvents: function (tableWidgetDiv) {
-    // If the choosen dataset representation is tablesorter
-    if (FHC_TableWidget._datasetRepresentation == DATASET_REP_TABLESORTER) {
-      FHC_TableWidget._disableTablesorter(tableWidgetDiv); // disable the tablesorter
-    }
-  },
-
-  /**
-   * Turns all the events on
-   * NOTE: must be aligned to _turnOffEvents
-   */
-  _turnOnEvents: function (tableWidgetDiv) {
-    var tableUniqueId = tableWidgetDiv.attr("tableUniqueId");
-
-    // If the choosen dataset representation is tablesorter
-    if (FHC_TableWidget._datasetRepresentation == DATASET_REP_TABLESORTER) {
-      FHC_TableWidget._enableTableSorter(tableWidgetDiv); // enable the tablesorter
-    }
-
-    // If the choosen dataset representation is tabulator
-    if (FHC_TableWidget._datasetRepresentation == DATASET_REP_TABULATOR) {
-      // ---------------------------------------------------------------------------------------------------------
-      // Add events to the elements
-      // ---------------------------------------------------------------------------------------------------------
-
-      // Click-Event to download csv
-      tableWidgetDiv.find("#download-csv").on("click", function () {
-        // BOM for correct UTF-8 char output
-        tableWidgetDiv
-          .find("#tableWidgetTabulator")
-          .tabulator("download", "csv", "data.csv", { bom: true });
-      });
-
-      // Click-Event to toggle the collapsable help panel
-      tableWidgetDiv.find("#help").on("click", function () {
-        // Hide the collapsable settings panel, if it actually shown
-        $("#tabulatorSettings-" + tableUniqueId).collapse("hide");
-
-        // Toggle the collapsable help panel
-        $("#tabulatorHelp-" + tableUniqueId).collapse("toggle");
-      });
-
-      // Click-Event to toggle the collapsable settings panel
-      tableWidgetDiv.find("#settings").on("click", function () {
-        // Hide the collapsable help panel, if it actually shown
-        $("#tabulatorHelp-" + tableUniqueId).collapse("hide");
-
-        // Toggle the collapsable settings panel
-        $("#tabulatorSettings-" + tableUniqueId).collapse("toggle");
-      });
-
-      /* Beautify button group behaviour
-       * Let buttons stay active even until they are clicked again to close the collapsable help- oder setting panels
-       * Also remove the disturbing button focus behaviour
-       */
-      $(".btn-group > .btn").click(function () {
-        if ($(this).hasClass("active")) {
-          $(this).removeClass("active").css("outline", "none");
-        } else {
-          $(this)
-            .addClass("active")
-            .css("outline", "none")
-            .siblings()
-            .removeClass("active");
-        }
-      });
-
-      /**
-       * Click-Event to select all rows
-       * Default is ALL rows. This can be modified via hook tableWidgetHook_selectAllButton.
-       */
-      if (typeof tableWidgetHook_selectAllButton == "function") {
-        tableWidgetDiv.find("#select-all").on("click", function () {
-          tableWidgetHook_selectAllButton(tableWidgetDiv);
-        });
-      } else {
-        tableWidgetDiv.find("#select-all").on("click", function () {
-          tableWidgetDiv
-            .find("#tableWidgetTabulator")
-            .tabulator("selectRow", true);
-        });
-      }
-
-      // Click-Event to deselect all rows
-      tableWidgetDiv.find("#deselect-all").on("click", function () {
-        tableWidgetDiv.find("#tableWidgetTabulator").tabulator("deselectRow");
-      });
-
-      // Click-Event to toggle column-picker columns
-      //! this event was moved to the _onTableBuilt function
-    }
-  },
-
-  _renderDataset: function (tableWidgetDiv, data) {
-    // If the choosen dataset representation is tablesorter then...
-    if (FHC_TableWidget._datasetRepresentation == DATASET_REP_TABLESORTER) {
-      FHC_TableWidget._renderDatasetTablesorter(tableWidgetDiv, data); // ...render the tablesorter GUI
-    }
-
-    // If the choosen dataset representation is pivotUI then...
-    if (FHC_TableWidget._datasetRepresentation == DATASET_REP_PIVOTUI) {
-      FHC_TableWidget._renderDatasetPivotUI(tableWidgetDiv, data); // ...render the pivotUI GUI
-    }
-
-    // If the choosen dataset representation is tabulator then...
-    if (FHC_TableWidget._datasetRepresentation == DATASET_REP_TABULATOR) {
-      FHC_TableWidget._renderDatasetTabulator(tableWidgetDiv, data); // ...render the tabulator GUI
-    }
-  },
-
-  /**
-   * Renders the tablesorter for the TableWidget
-   * The data to be displayed are retrived from the parameter data
-   */
-  _renderDatasetTablesorter: function (tableWidgetDiv, data) {
-    if (
-      data.hasOwnProperty("checkboxes") &&
-      data.checkboxes != null &&
-      data.checkboxes.trim() != ""
-    ) {
-      tableWidgetDiv
-        .find("#tableWidgetTableDataset > thead > tr")
-        .append("<th data-filter='false' title='Select'>Select</th>");
-    }
-
-    var arrayFieldsToDisplay = FHC_TableWidget._getFieldsToDisplay(data);
-
-    for (var i = 0; i < arrayFieldsToDisplay.length; i++) {
-      var columnName = arrayFieldsToDisplay[i];
-
-      tableWidgetDiv
-        .find("#tableWidgetTableDataset > thead > tr")
-        .append("<th title='" + columnName + "'>" + columnName + "</th>");
-    }
-
-    if (
-      data.hasOwnProperty("additionalColumns") &&
-      $.isArray(data.additionalColumns)
-    ) {
-      for (var i = 0; i < data.additionalColumns.length; i++) {
-        var columnName = data.additionalColumns[i];
-
-        tableWidgetDiv
-          .find("#tableWidgetTableDataset > thead > tr")
-          .append("<th title='" + columnName + "'>" + columnName + "</th>");
-      }
-    }
-
-    if (arrayFieldsToDisplay.length > 0) {
-      if (data.hasOwnProperty("dataset") && $.isArray(data.dataset)) {
-        if (data.checkboxes != null && data.checkboxes != "") {
-          // select checkbox range with shift key
-          if (
-            typeof tableWidgetDiv.find("#tableWidgetTableDataset")
-              .checkboxes === "function"
-          )
-            tableWidgetDiv
-              .find("#tableWidgetTableDataset")
-              .checkboxes("range", true);
-        }
-        if (data.dataset.length == 0) {
-          // Display placeholder if Table is empty
-          var numColumns = arrayFieldsToDisplay.length;
-          if (
-            data.hasOwnProperty("additionalColumns") &&
-            $.isArray(data.additionalColumns)
-          ) {
-            numColumns += data.additionalColumns.length;
-          }
-          var strHtml = '<tr><td align="center" colspan="' + numColumns + '">';
-          strHtml += FHC_PhrasesLib.t("ui", "keineDatenVorhanden");
-          strHtml += "</td></tr>";
-          tableWidgetDiv
-            .find("#tableWidgetTableDataset > tbody")
-            .append(strHtml);
-        } else {
-          for (var i = 0; i < data.dataset.length; i++) {
-            var record = data.dataset[i];
-
-            if ($.isEmptyObject(record)) {
-              continue;
-            }
-
-            var strHtml = "<tr class='" + record.MARK_ROW_CLASS + "'>";
-
-            if (data.checkboxes != null && data.checkboxes != "") {
-              strHtml += "<td>";
-              strHtml +=
-                "<input type='checkbox' name='" +
-                data.checkboxes +
-                "[]' value='" +
-                record[data.checkboxes] +
-                "'>";
-              strHtml += "</td>";
-            }
-
-            $.each(arrayFieldsToDisplay, function (i, fieldToDisplay) {
-              if (record.hasOwnProperty(data.fields[i])) {
-                strHtml += "<td>" + record[data.fields[i]] + "</td>";
-              }
-            });
-
-            if (
-              data.additionalColumns != null &&
-              $.isArray(data.additionalColumns)
-            ) {
-              $.each(data.additionalColumns, function (i, additionalColumn) {
-                if (record.hasOwnProperty(additionalColumn)) {
-                  strHtml += "<td>" + record[additionalColumn] + "</td>";
-                }
-              });
-            }
-
-            strHtml += "</tr>";
-
-            tableWidgetDiv
-              .find("#tableWidgetTableDataset > tbody")
-              .append(strHtml);
-          }
-        }
-      }
-    }
-  },
-
-  /**
-   * Enable the tablesorter libs to render the dataset table with sorting features
-   */
-  _enableTableSorter: function (tableWidgetDiv) {
-    var tableWidgetTablesorter = tableWidgetDiv.find(
-      "#tableWidgetTableDataset"
-    );
-
-    // Checks if the table contains data (rows)
-    if (
-      tableWidgetTablesorter.find("tbody:empty").length == 0 &&
-      tableWidgetTablesorter.find("tr:empty").length == 0 &&
-      tableWidgetTablesorter.hasClass("table-condensed")
-    ) {
-      tableWidgetTablesorter.tablesorter({
-        dateFormat: "ddmmyyyy",
-        widgets: ["zebra", "filter"],
-        widgetOptions: {
-          filter_saveFilters: true,
-        },
-      });
-
-      $.tablesorter.updateAll(tableWidgetTablesorter[0].config, true, null);
-    }
-  },
-
-  /**
-   * Disable the tablesorter
-   */
-  _disableTablesorter: function (tableWidgetDiv) {
-    tableWidgetDiv.find("#tableWidgetTableDataset").trigger("disable");
-  },
-
-  /**
-   * Renders the pivotUI for the TableWidget
-   * The data to be displayed are retrived from the parameter data
-   */
-  _renderDatasetPivotUI: function (tableWidgetDiv, data) {
-    // Checks if options were given and returns them
-    var options = FHC_TableWidget._getRepresentationOptions(data);
-
-    // Manipulation for the representation!
-    var arrayFieldsToDisplay = FHC_TableWidget._getFieldsToDisplay(data);
-
-    // If there are fields to be displayed...
-    if (arrayFieldsToDisplay.length > 0) {
-      // ...if there are data to be displayed...
-      if (data.hasOwnProperty("dataset") && $.isArray(data.dataset)) {
-        // Build the array of objects used by pivotUI and store it in pivotUIData
-        var pivotUIData = [];
-
-        // Loops through data
-        for (var i = 0; i < data.dataset.length; i++) {
-          var record = data.dataset[i]; // Single record
-          var tmpObj = {}; // New object that represents a record
-
-          // Loops through columns of a record
-          $.each(arrayFieldsToDisplay, function (i, fieldToDisplay) {
-            if (record.hasOwnProperty(data.fields[i])) {
-              tmpObj[fieldToDisplay] = record[data.fields[i]]; // Add data with the column alias
-            }
-          });
-
-          // If additional columns are present...
-          if (
-            data.additionalColumns != null &&
-            $.isArray(data.additionalColumns)
-          ) {
-            // ...loops through them
-            $.each(data.additionalColumns, function (i, additionalColumn) {
-              if (record.hasOwnProperty(additionalColumn)) {
-                tmpObj[additionalColumn] = record[additionalColumn]; // Add the additional column
-              }
-            });
-          }
-
-          pivotUIData.push(tmpObj); // Add tmpObj to pivotUIData
-        }
-
-        // Renders the pivotUI
-        tableWidgetDiv
-          .find("#tableWidgetPivotUI")
-          .pivotUI(pivotUIData, options);
-      }
-    }
-  },
-
-  /**
-   * Retrives the fields to be displayed from the data parameter, if aliases are present then they are used
-   */
-  _getFieldsToDisplay: function (data) {
-    var arrayFieldsToDisplay = [];
-
-    if (data.hasOwnProperty("fields") && $.isArray(data.fields)) {
-      if (
-        data.hasOwnProperty("columnsAliases") &&
-        $.isArray(data.columnsAliases)
-      ) {
-        for (var sfc = 0; sfc < data.fields.length; sfc++) {
-          for (var fc = 0; fc < data.fields.length; fc++) {
-            if (data.fields[sfc] == data.fields[fc]) {
-              arrayFieldsToDisplay[sfc] = data.columnsAliases[fc];
-            }
-          }
-        }
-      } else {
-        arrayFieldsToDisplay = data.fields;
-      }
-    }
-
-    return arrayFieldsToDisplay;
-  },
-
-  /**
-   * Renders the tabulator for the TableWidget
-   * The data to be displayed are retrived from the parameter data
-   */
-  _renderDatasetTabulator: function (tableWidgetDiv, data) {
-    // Checks if options were given and returns them
-    var options = FHC_TableWidget._getRepresentationOptions(data);
-    // Checks if record fields definitions were given and returns them
-    var recordFieldsDefinitions =
-      FHC_TableWidget._getRepresentationFieldsDefinitions(data);
-
-    // Manipulation for the representation!
-    var arrayTabulatorColumns = FHC_TableWidget._getTabulatorColumns(
-      data,
-      recordFieldsDefinitions
-    );
-
-    if (arrayTabulatorColumns.length > 0) {
-      // ...if there are data to be displayed...
-      if (data.hasOwnProperty("dataset") && $.isArray(data.dataset)) {
-        if (options == null) options = {};
-        options.columnDefaults={
-            ...(options.columnDefaults||{}),  
-            headerTooltip:
-              typeof options.columnDefaults?.tooltipsHeader == "undefined"
-                ? true
-                : options.columnDefaults?.tooltipsHeader,
-          };
-        
-        
-        options.columns = arrayTabulatorColumns;
-        options.data = data.dataset;
-        options.persistence =
-          typeof options.persistence == "undefined"
-            ? true
-            : options.persistence; // enables persistence (default store in localStorage if available, else in cookie)
-        options.persistenceID =
-          typeof options.persistenceID == "undefined"
-            ? data.tableUniqueId
-            : options.persistenceID; // persistenceID to store persistence data seperately for multiple tables
-        options.movableColumns =
-          typeof options.movableColumns == "undefined"
-            ? true
-            : options.movableColumns; // allows changing column order
-
-        options.placeholder = _func_placeholder(); // display text when table is empty
-
-        // Renders the tabulator
-        tableWidgetDiv.find("#tableWidgetTabulator").tabulator(options);
-
-        //! callbacks that need to be attached after the table has built in tabulator version 5+
-        tableWidgetDiv
-          .find("#tableWidgetTabulator")
-          .tabulator("on", "rowSelectionChanged", _func_rowSelectionChanged);
-        tableWidgetDiv
-          .find("#tableWidgetTabulator")
-          .tabulator(
-            "on",
-            "columnVisibilityChanged",
-            _func_columnVisibilityChanged
-          );
-      }
-    }
-
-    // -------------------------------------------------------------------------------------------------------------
-    // Render TableWidget Header and -Footer
-    // -------------------------------------------------------------------------------------------------------------
-
-    // Render tableWidgetHeader
-
-    if (
-      typeof options.tableWidgetHeader == "undefined" ||
-      (typeof options.tableWidgetHeader != "undefined" &&
-        options.tableWidgetHeader != false)
-    ) {
-      var tabulatorHeaderHTML = _renderTabulatorHeaderHTML(tableWidgetDiv);
-      tableWidgetDiv.find("#tableWidgetHeader").append(tabulatorHeaderHTML);
-    }
-
-    /**
-     * 	tableWidgetFooter is NOT rendered by default.
-     * 	tableWidgetFooter is rendered, if tableWidgetFooter is set in tabulators datasetRepOptions.
-     *	Setup options like this:
-     *  tableWidgetFooter: {
-     *  	selectButtons: true  // tableWidgetFooter properties are checked in _renderTabulatorFooterHTML function
-     *  }
-     */
-    if (
-      typeof options.tableWidgetFooter != "undefined" &&
-      options.tableWidgetFooter != null
-    ) {
-      var tabulatorFooterHTML = _renderTabulatorFooterHTML(
-        options.tableWidgetFooter
-      );
-      tableWidgetDiv.find("#tableWidgetFooter").append(tabulatorFooterHTML);
-    }
-  },
-
-  /**
-   * Retrives the fields to be displayed from the data parameter, if aliases are present then they are used
-   */
-  _getTabulatorColumns: function (data, recordFieldsDefinitions) {
-    var fieldsToDisplayTabulator = [];
-
-    if (data.hasOwnProperty("fields") && $.isArray(data.fields)) {
-      for (var sfc = 0; sfc < data.fields.length; sfc++) {
-        for (var fc = 0; fc < data.fields.length; fc++) {
-          if (data.fields[sfc] == data.fields[fc]) {
-            // Build the array of objects (columns) used by tabulator and store it in tabulatorColumns
-            var tmpColumnObj = {}; // New object that represents a column
-
-            // If was given a definition for this field then use it!
-            if (
-              recordFieldsDefinitions != null &&
-              recordFieldsDefinitions.hasOwnProperty(data.fields[sfc])
-            ) {
-              tmpColumnObj = recordFieldsDefinitions[data.fields[sfc]];
-            }
-
-            tmpColumnObj.field = data.fields[sfc]; // Field name to be linked with dataset field name
-
-            // If there is an alias for this field use it to give a title to this field (header)
-            if (
-              data.hasOwnProperty("columnsAliases") &&
-              $.isArray(data.columnsAliases)
-            ) {
-              tmpColumnObj.title = data.columnsAliases[fc];
-            } // otherwise use the field name itself
-            else {
-              tmpColumnObj.title = data.fields[sfc];
-            }
-
-            fieldsToDisplayTabulator.push(tmpColumnObj); // Add tmpColumnObj to tabulatorColumns
-          }
-        }
-      }
-    }
-
-    // If additional columns are present...
-    if (
-      data.hasOwnProperty("additionalColumns") &&
-      data.additionalColumns != null &&
-      $.isArray(data.additionalColumns)
-    ) {
-      // ...loops through them
-      $.each(data.additionalColumns, function (i, additionalColumn) {
-        var tmpColumnObj = {}; // New object that represents a column
-
-        // If was given a definition for this field then use it!
-        if (
-          recordFieldsDefinitions != null &&
-          recordFieldsDefinitions.hasOwnProperty(additionalColumn)
-        ) {
-          tmpColumnObj = recordFieldsDefinitions[additionalColumn];
-        }
-
-        tmpColumnObj.title = additionalColumn; // Give a title to this field (header)
-        tmpColumnObj.field = additionalColumn; // Field name to be linked with dataset field name
-
-        fieldsToDisplayTabulator.push(tmpColumnObj); // Add tmpColumnObj to tabulatorColumns
-      });
-    }
-
-    return fieldsToDisplayTabulator;
-  },
-
-  /**
-   * Gets options for the representation
-   */
-  _getRepresentationOptions: function (data) {
-    var options = {}; // eventually contains options fot the representation
-
-    // Checks if options were given
-    if (
-      data.hasOwnProperty("datasetRepresentationOptions") &&
-      data.datasetRepresentationOptions != ""
-    ) {
-      var tmpOptions = eval("(" + data.datasetRepresentationOptions + ")"); // and converts them from string to javascript code
-
-      // If it is an object then can be used
-      if (typeof tmpOptions == "object") {
-        options = tmpOptions;
-      }
-    }
-
-    return options;
-  },
-
-  /**
-   * Gets record fields definitions to represent the dataset
-   */
-  _getRepresentationFieldsDefinitions: function (data) {
-    var fieldsDefinitions = {}; // eventually contains record fields definitions
-    // Checks if record fields definitions was given as parameter
-    if (
-      data.hasOwnProperty("datasetRepresentationFieldsDefinitions") &&
-      data.datasetRepresentationFieldsDefinitions != ""
-    ) {
-      var tmpFDefs = eval(
-        "(" + data.datasetRepresentationFieldsDefinitions + ")"
-      ); // and converts them from string to javascript code
-
-      // If it is an object then can be used
-      if (typeof tmpFDefs == "object") {
-        fieldsDefinitions = tmpFDefs;
-      }
-    }
-
-    return fieldsDefinitions;
-  },
-
-  /**
-   * Set what type of dataset representation was choosen
-   */
-  _setDatasetRepresentation: function (data) {
-    if (data.hasOwnProperty("datasetRepresentation")) {
-      FHC_TableWidget._datasetRepresentation = data.datasetRepresentation;
-    }
-  },
-
-  _setBootstrapVersion: function (data) {
-    _bootstrapVersion = data.bootstrapVersion;
-  },
-
-  _getTableWidgetUniqueIdArray: function () {
-    var tableWidgetUniqueIdArray = [];
-
-    $("div[id*='divTableWidgetDataset']").each(function (i, e) {
-      tableWidgetUniqueIdArray.push(e.attributes["tableUniqueId"].nodeValue);
-    });
-
-    return tableWidgetUniqueIdArray;
-  },
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Properties
+
+	_datasetRepresentation: null, // contains the current data representation
+
+	_bootstrapVersion: 3,
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * To display the TableWidget using the loaded data prenset in the session
+	 */
+	display: function() {
+
+		FHC_TableWidget._getTables(FHC_TableWidget._renderTableWidget);
+	},
+
+	/**
+	 * Alias call to method display only to inprove the readability of the code
+	 */
+	refresh: function() {
+
+		FHC_TableWidget.display();
+	},
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Private methods
+
+	/**
+	 * To retrive the page where the TableWidget is used, using the FHC_JS_DATA_STORAGE_OBJECT
+	 */
+	_getTableUniqueIdPrefix: function() {
+
+		return FHC_JS_DATA_STORAGE_OBJECT.called_path + "/" + FHC_JS_DATA_STORAGE_OBJECT.called_method;
+	},
+
+	/**
+	 * Utility method that checks if data contains an error and print that to the console
+	 * otherwise the TableWidget GUI is refreshed
+	 */
+	_failOrRefresh: function(data, textStatus, jqXHR) {
+
+		if (FHC_AjaxClient.isError(data))
+		{
+			console.log(FHC_AjaxClient.getError(data));
+		}
+		else
+		{
+			FHC_TableWidget.refresh();
+		}
+	},
+
+	/**
+	 * Utility method that checks if data contains an error and print that to the console
+	 * otherwise the page is reloaded
+	 */
+	_failOrReload: function(data, textStatus, jqXHR) {
+
+		if (FHC_AjaxClient.isError(data))
+		{
+			console.log(FHC_AjaxClient.getError(data));
+		}
+		else
+		{
+			location.reload();
+		}
+	},
+
+	/**
+	 * To reset the Table Widget GUI
+	 */
+	_resetGUI: function(tableWidgetDiv) {
+
+		// If the choosen dataset representation is tablesorter
+		if (FHC_TableWidget._datasetRepresentation == DATASET_REP_TABLESORTER)
+		{
+			tableWidgetDiv.find("#tableWidgetTableDataset > thead > tr").html("");
+			tableWidgetDiv.find("#tableWidgetTableDataset > tbody").html("");
+		}
+
+		// If the choosen dataset representation is pivotUI
+		if (FHC_TableWidget._datasetRepresentation == DATASET_REP_PIVOTUI)
+		{
+			tableWidgetDiv.find("#tableWidgetPivotUI").html("");
+		}
+
+		// If the choosen dataset representation is tabulator
+		if (FHC_TableWidget._datasetRepresentation == DATASET_REP_TABULATOR)
+		{
+			tableWidgetDiv.find("#tableWidgetTabulator").html("");
+		}
+	},
+
+	/**
+	 * To get via Ajax all the data related to the TableWidget present in the given page
+	 * If the parameter renderFunction is a valid function, is called on success
+	 */
+	_getTables: function(renderFunction) {
+
+		var tableWidgetUniqueIdArray = FHC_TableWidget._getTableWidgetUniqueIdArray();
+
+		for (var tableWidgetsCounter = 0; tableWidgetsCounter < tableWidgetUniqueIdArray.length; tableWidgetsCounter++)
+		{
+			FHC_AjaxClient.ajaxCallGet(
+				"widgets/Tables/getTable",
+				{
+					tableUniqueId: FHC_TableWidget._getTableUniqueIdPrefix() + "/" + tableWidgetUniqueIdArray[tableWidgetsCounter]
+				},
+				{
+					successCallback: function(data, textStatus, jqXHR) {
+
+						if (FHC_AjaxClient.hasData(data))
+						{
+							if (typeof renderFunction == "function")
+							{
+								renderFunction(FHC_AjaxClient.getData(data));
+							}
+						}
+						else
+						{
+							console.log(FHC_AjaxClient.getError(data));
+						}
+					}
+				}
+			);
+		}
+	},
+
+	/**
+	 * This method calls all the other methods needed to rendere the GUI for a TableWidget
+	 * The parameter data contains all the data about the TableWidget and it is given as parameter
+	 * to all the methods that here are called
+	 * NOTE: think very carefully before changing the order of the calls
+	 */
+	_renderTableWidget: function(data) {
+
+		FHC_TableWidget._setDatasetRepresentation(data); // set what type of dataset representation was choosen
+
+		FHC_TableWidget._setBootstrapVersion(data); // set the bootstrap version used for the tableWidget
+
+		var tableWidgetDiv = $('div[tableUniqueId="' + data.tableUniqueId + '"]');
+
+		FHC_TableWidget._turnOffEvents(tableWidgetDiv); // turns all the events off
+
+		FHC_TableWidget._resetGUI(tableWidgetDiv); // Reset the entire GUI
+
+		FHC_TableWidget._renderDataset(tableWidgetDiv, data);
+
+		FHC_TableWidget._turnOnEvents(tableWidgetDiv); // turns all the events off
+
+		FHC_TableWidget._onTableBuilt(tableWidgetDiv, data);
+	},
+
+	_onTableBuilt: function (tableWidgetDiv, data) {
+		var options = FHC_TableWidget._getRepresentationOptions(data);
+
+		tableWidgetDiv
+			.find("#tableWidgetTabulator")
+			.tabulator("on", "tableBuilt", () => {
+			if (
+				typeof options.tableWidgetHeader == "undefined" ||
+				(typeof options.tableWidgetHeader != "undefined" &&
+				options.tableWidgetHeader != false)
+			) {
+				// renders the table headers
+				var tabulatorHeaderCollapseHTML =
+					_renderTabulatorHeaderCollapseHTML(tableWidgetDiv);
+				tableWidgetDiv
+					.find("#tableWidgetHeader")
+					.after(tabulatorHeaderCollapseHTML);
+			}
+
+			// makes the table headers toggle visibility when clicking on them
+			tableWidgetDiv.find(".btn-select-col").on("click", function () {
+				var selected = this.value;
+
+				tableWidgetDiv
+					.find("#tableWidgetTabulator")
+					.tabulator("toggleColumn", selected);
+
+				// toggle class to color button as selected / deselected
+				$(this).toggleClass("btn-select-col-selected").blur(); // blur removes automatic focus
+			});
+		});
+	},
+
+	/**
+	 * Turns all the events off
+	 * NOTE: must be aligned to _turnOnEvents
+	 */
+	_turnOffEvents: function(tableWidgetDiv) {
+
+		// If the choosen dataset representation is tablesorter
+		if (FHC_TableWidget._datasetRepresentation == DATASET_REP_TABLESORTER)
+		{
+			FHC_TableWidget._disableTablesorter(tableWidgetDiv); // disable the tablesorter
+		}
+	},
+
+	/**
+	 * Turns all the events on
+	 * NOTE: must be aligned to _turnOffEvents
+	 */
+	_turnOnEvents: function(tableWidgetDiv) {
+
+		var tableUniqueId = tableWidgetDiv.attr('tableUniqueId');
+
+		// If the choosen dataset representation is tablesorter
+		if (FHC_TableWidget._datasetRepresentation == DATASET_REP_TABLESORTER)
+		{
+			FHC_TableWidget._enableTableSorter(tableWidgetDiv); // enable the tablesorter
+		}
+
+		// If the choosen dataset representation is tabulator
+		if (FHC_TableWidget._datasetRepresentation == DATASET_REP_TABULATOR)
+		{
+			// ---------------------------------------------------------------------------------------------------------
+			// Add events to the elements
+			// ---------------------------------------------------------------------------------------------------------
+
+			// Click-Event to download csv
+			tableWidgetDiv.find('#download-csv').on('click', function()
+			{
+				// BOM for correct UTF-8 char output
+				tableWidgetDiv.find("#tableWidgetTabulator").tabulator("download", "csv", "data.csv", {bom:true});
+			})
+
+			// Click-Event to toggle the collapsable help panel
+			tableWidgetDiv.find('#help').on('click', function()
+			{
+				// Hide the collapsable settings panel, if it actually shown
+				$('#tabulatorSettings-' + tableUniqueId).collapse('hide');
+
+				// Toggle the collapsable help panel
+				$('#tabulatorHelp-' + tableUniqueId).collapse('toggle');
+			})
+
+			// Click-Event to toggle the collapsable settings panel
+			tableWidgetDiv.find('#settings').on('click', function()
+			{
+				// Hide the collapsable help panel, if it actually shown
+				$('#tabulatorHelp-' + tableUniqueId).collapse('hide');
+
+				// Toggle the collapsable settings panel
+				$('#tabulatorSettings-' + tableUniqueId).collapse('toggle');
+			})
+
+			/* Beautify button group behaviour
+			 * Let buttons stay active even until they are clicked again to close the collapsable help- oder setting panels
+			 * Also remove the disturbing button focus behaviour
+			 */
+			$(".btn-group > .btn").click(function(){
+				if ($(this).hasClass("active"))
+				{
+					$(this).removeClass('active').css('outline', 'none');
+				}
+				else
+				{
+					$(this).addClass("active").css('outline', 'none').siblings().removeClass("active");
+				}
+			});
+
+			/**
+			 * Click-Event to select all rows
+			 * Default is ALL rows. This can be modified via hook tableWidgetHook_selectAllButton.
+ 			 */
+			if (typeof tableWidgetHook_selectAllButton == 'function')
+			{
+				tableWidgetDiv.find('#select-all').on('click', function() {
+					tableWidgetHook_selectAllButton(tableWidgetDiv);
+				});
+			}
+			else
+			{
+				tableWidgetDiv.find('#select-all').on('click', function() {
+					tableWidgetDiv.find("#tableWidgetTabulator").tabulator('selectRow', true);
+				});
+			}
+
+			// Click-Event to deselect all rows
+			tableWidgetDiv.find('#deselect-all').on('click', function()
+			{
+				tableWidgetDiv.find("#tableWidgetTabulator").tabulator('deselectRow');
+			})
+
+			// Click-Event to toggle column-picker columns
+			//! this event was moved to the _onTableBuilt function
+		}
+	},
+
+	_renderDataset: function(tableWidgetDiv, data) {
+
+		// If the choosen dataset representation is tablesorter then...
+		if (FHC_TableWidget._datasetRepresentation == DATASET_REP_TABLESORTER)
+		{
+			FHC_TableWidget._renderDatasetTablesorter(tableWidgetDiv, data); // ...render the tablesorter GUI
+		}
+
+		// If the choosen dataset representation is pivotUI then...
+		if (FHC_TableWidget._datasetRepresentation == DATASET_REP_PIVOTUI)
+		{
+			FHC_TableWidget._renderDatasetPivotUI(tableWidgetDiv, data); // ...render the pivotUI GUI
+		}
+
+		// If the choosen dataset representation is tabulator then...
+		if (FHC_TableWidget._datasetRepresentation == DATASET_REP_TABULATOR)
+		{
+			FHC_TableWidget._renderDatasetTabulator(tableWidgetDiv, data); // ...render the tabulator GUI
+		}
+	},
+
+	/**
+	 * Renders the tablesorter for the TableWidget
+	 * The data to be displayed are retrived from the parameter data
+	 */
+	_renderDatasetTablesorter: function(tableWidgetDiv, data) {
+
+		if (data.hasOwnProperty("checkboxes") && data.checkboxes != null && data.checkboxes.trim() != "")
+		{
+			tableWidgetDiv.find("#tableWidgetTableDataset > thead > tr").append("<th data-filter='false' title='Select'>Select</th>");
+		}
+
+		var arrayFieldsToDisplay = FHC_TableWidget._getFieldsToDisplay(data);
+
+		for (var i = 0; i < arrayFieldsToDisplay.length; i++)
+		{
+			var columnName = arrayFieldsToDisplay[i];
+
+			tableWidgetDiv.find("#tableWidgetTableDataset > thead > tr").append("<th title='" + columnName + "'>" + columnName + "</th>");
+		}
+
+		if (data.hasOwnProperty("additionalColumns") && $.isArray(data.additionalColumns))
+		{
+			for (var i = 0; i < data.additionalColumns.length; i++)
+			{
+				var columnName = data.additionalColumns[i];
+
+				tableWidgetDiv.find("#tableWidgetTableDataset > thead > tr").append("<th title='" + columnName + "'>" + columnName + "</th>");
+			}
+		}
+
+		if (arrayFieldsToDisplay.length > 0)
+		{
+			if (data.hasOwnProperty("dataset") && $.isArray(data.dataset))
+			{
+				if (data.checkboxes != null && data.checkboxes != "")
+				{
+					// select checkbox range with shift key
+					if (typeof tableWidgetDiv.find("#tableWidgetTableDataset").checkboxes === 'function')
+						tableWidgetDiv.find("#tableWidgetTableDataset").checkboxes("range", true);
+				}
+				if (data.dataset.length == 0)
+				{
+					// Display placeholder if Table is empty
+					var numColumns = arrayFieldsToDisplay.length;
+					if (data.hasOwnProperty("additionalColumns") && $.isArray(data.additionalColumns))
+					{
+						numColumns += data.additionalColumns.length;
+					}
+					var strHtml = '<tr><td align="center" colspan="'+numColumns+'">';
+					strHtml += FHC_PhrasesLib.t('ui', 'keineDatenVorhanden');
+					strHtml += '</td></tr>';
+					tableWidgetDiv.find("#tableWidgetTableDataset > tbody").append(strHtml);
+				}
+				else
+				{
+					for (var i = 0; i < data.dataset.length; i++)
+					{
+						var record = data.dataset[i];
+
+						if ($.isEmptyObject(record))
+						{
+							continue;
+						}
+
+						var strHtml = "<tr class='" + record.MARK_ROW_CLASS + "'>";
+
+						if (data.checkboxes != null && data.checkboxes != "")
+						{
+							strHtml += "<td>";
+							strHtml += "<input type='checkbox' name='" + data.checkboxes + "[]' value='" + record[data.checkboxes] + "'>";
+							strHtml += "</td>";
+						}
+
+						$.each(arrayFieldsToDisplay, function(i, fieldToDisplay) {
+
+							if (record.hasOwnProperty(data.fields[i]))
+							{
+								strHtml += "<td>" + record[data.fields[i]] + "</td>";
+							}
+						});
+
+						if (data.additionalColumns != null && $.isArray(data.additionalColumns))
+						{
+							$.each(data.additionalColumns, function(i, additionalColumn) {
+
+								if (record.hasOwnProperty(additionalColumn))
+								{
+									strHtml += "<td>" + record[additionalColumn] + "</td>";
+								}
+							});
+						}
+
+						strHtml += "</tr>";
+
+						tableWidgetDiv.find("#tableWidgetTableDataset > tbody").append(strHtml);
+					}
+				}
+			}
+		}
+	},
+
+	/**
+	 * Enable the tablesorter libs to render the dataset table with sorting features
+	 */
+	_enableTableSorter: function(tableWidgetDiv) {
+
+		var tableWidgetTablesorter = tableWidgetDiv.find("#tableWidgetTableDataset");
+
+		// Checks if the table contains data (rows)
+		if (tableWidgetTablesorter.find("tbody:empty").length == 0
+			&& tableWidgetTablesorter.find("tr:empty").length == 0
+			&& tableWidgetTablesorter.hasClass("table-condensed"))
+		{
+			tableWidgetTablesorter.tablesorter({
+				dateFormat: "ddmmyyyy",
+				widgets: ["zebra", "filter"],
+				widgetOptions: {
+					filter_saveFilters : true
+				}
+			});
+
+			$.tablesorter.updateAll(tableWidgetTablesorter[0].config, true, null);
+		}
+	},
+
+	/**
+	 * Disable the tablesorter
+	 */
+	_disableTablesorter: function(tableWidgetDiv) {
+
+		tableWidgetDiv.find("#tableWidgetTableDataset").trigger("disable");
+	},
+
+	/**
+	 * Renders the pivotUI for the TableWidget
+	 * The data to be displayed are retrived from the parameter data
+	 */
+	_renderDatasetPivotUI: function(tableWidgetDiv, data) {
+
+		// Checks if options were given and returns them
+		var options = FHC_TableWidget._getRepresentationOptions(data);
+
+		// Manipulation for the representation!
+		var arrayFieldsToDisplay = FHC_TableWidget._getFieldsToDisplay(data);
+
+		// If there are fields to be displayed...
+		if (arrayFieldsToDisplay.length > 0)
+		{
+			// ...if there are data to be displayed...
+			if (data.hasOwnProperty("dataset") && $.isArray(data.dataset))
+			{
+				// Build the array of objects used by pivotUI and store it in pivotUIData
+				var pivotUIData = [];
+
+				// Loops through data
+				for (var i = 0; i < data.dataset.length; i++)
+				{
+					var record = data.dataset[i]; // Single record
+					var tmpObj = {}; // New object that represents a record
+
+					// Loops through columns of a record
+					$.each(arrayFieldsToDisplay, function(i, fieldToDisplay) {
+
+						if (record.hasOwnProperty(data.fields[i]))
+						{
+							tmpObj[fieldToDisplay] = record[data.fields[i]]; // Add data with the column alias
+						}
+					});
+
+					// If additional columns are present...
+					if (data.additionalColumns != null && $.isArray(data.additionalColumns))
+					{
+						// ...loops through them
+						$.each(data.additionalColumns, function(i, additionalColumn) {
+
+							if (record.hasOwnProperty(additionalColumn))
+							{
+								tmpObj[additionalColumn] = record[additionalColumn]; // Add the additional column
+							}
+						});
+					}
+
+					pivotUIData.push(tmpObj); // Add tmpObj to pivotUIData
+				}
+
+				// Renders the pivotUI
+				tableWidgetDiv.find("#tableWidgetPivotUI").pivotUI(
+		            pivotUIData,
+					options
+		        );
+			}
+		}
+	},
+
+	/**
+	 * Retrives the fields to be displayed from the data parameter, if aliases are present then they are used
+	 */
+	_getFieldsToDisplay: function(data) {
+
+		var arrayFieldsToDisplay = [];
+
+		if (data.hasOwnProperty("fields") && $.isArray(data.fields))
+		{
+			if (data.hasOwnProperty("columnsAliases") && $.isArray(data.columnsAliases))
+			{
+				for (var sfc = 0; sfc < data.fields.length; sfc++)
+				{
+					for (var fc = 0; fc < data.fields.length; fc++)
+					{
+						if (data.fields[sfc] == data.fields[fc])
+						{
+							arrayFieldsToDisplay[sfc] = data.columnsAliases[fc];
+						}
+					}
+				}
+			}
+			else
+			{
+				arrayFieldsToDisplay = data.fields;
+			}
+		}
+
+		return arrayFieldsToDisplay;
+	},
+
+	/**
+	 * Renders the tabulator for the TableWidget
+	 * The data to be displayed are retrived from the parameter data
+	 */
+	_renderDatasetTabulator: function(tableWidgetDiv, data) {
+
+		// Checks if options were given and returns them
+		var options = FHC_TableWidget._getRepresentationOptions(data);
+		// Checks if record fields definitions were given and returns them
+		var recordFieldsDefinitions = FHC_TableWidget._getRepresentationFieldsDefinitions(data);
+
+		// Manipulation for the representation!
+		var arrayTabulatorColumns = FHC_TableWidget._getTabulatorColumns(data, recordFieldsDefinitions);
+
+		if (arrayTabulatorColumns.length > 0)
+		{
+			// ...if there are data to be displayed...
+			if (data.hasOwnProperty("dataset") && $.isArray(data.dataset))
+			{
+				if (options == null) options = {};
+				options.columnDefaults={
+						...(options.columnDefaults||{}),
+						headerTooltip:
+							typeof options.columnDefaults?.tooltipsHeader == "undefined"
+								? true
+								: options.columnDefaults?.tooltipsHeader,
+				};
+
+
+				options.columns = arrayTabulatorColumns;
+				options.data = data.dataset;
+				options.persistence = (typeof options.persistence == 'undefined') ? true : options.persistence;			// enables persistence (default store in localStorage if available, else in cookie)
+				options.persistenceID = (typeof options.persistenceID == 'undefined') ?  data.tableUniqueId : options.persistenceID;  // persistenceID to store persistence data seperately for multiple tables
+				options.movableColumns = (typeof options.movableColumns == 'undefined') ? true : options.movableColumns;				// allows changing column order
+				options.tooltipsHeader = (typeof options.tooltipsHeader == 'undefined') ? true : options.tooltipsHeader;					// set header tooltip with column title
+				options.placeholder = _func_placeholder();	// display text when table is empty
+
+				// Renders the tabulator
+				tableWidgetDiv.find("#tableWidgetTabulator").tabulator(options);
+
+				//! callbacks that need to be attached after the table has built in tabulator version 5+
+				tableWidgetDiv
+					.find("#tableWidgetTabulator")
+					.tabulator("on", "rowSelectionChanged", _func_rowSelectionChanged);
+				tableWidgetDiv
+					.find("#tableWidgetTabulator")
+					.tabulator(
+						"on",
+						"columnVisibilityChanged",
+						_func_columnVisibilityChanged
+				);
+			}
+		}
+
+		// -------------------------------------------------------------------------------------------------------------
+		// Render TableWidget Header and -Footer
+		// -------------------------------------------------------------------------------------------------------------
+
+		// Render tableWidgetHeader
+		if (typeof options.tableWidgetHeader == 'undefined' ||
+			(typeof options.tableWidgetHeader != 'undefined' && options.tableWidgetHeader != false))
+		{
+			var tabulatorHeaderHTML = _renderTabulatorHeaderHTML(tableWidgetDiv);
+			tableWidgetDiv.find('#tableWidgetHeader').append(tabulatorHeaderHTML);
+
+			// Render the collapsable div triggered by button in tableWidgetHeader
+			var tabulatorHeaderCollapseHTML = _renderTabulatorHeaderCollapseHTML(tableWidgetDiv);
+			tableWidgetDiv.find('#tableWidgetHeader').after(tabulatorHeaderCollapseHTML);
+		}
+
+		/**
+		 * 	tableWidgetFooter is NOT rendered by default.
+		 * 	tableWidgetFooter is rendered, if tableWidgetFooter is set in tabulators datasetRepOptions.
+		 *	Setup options like this:
+		 *  tableWidgetFooter: {
+		 *  	selectButtons: true  // tableWidgetFooter properties are checked in _renderTabulatorFooterHTML function
+		 *  }
+ 		 */
+		if (typeof options.tableWidgetFooter != 'undefined' && options.tableWidgetFooter != null)
+		{
+			var tabulatorFooterHTML = _renderTabulatorFooterHTML(options.tableWidgetFooter);
+			tableWidgetDiv.find('#tableWidgetFooter').append(tabulatorFooterHTML);
+		}
+	},
+
+	/**
+	 * Retrives the fields to be displayed from the data parameter, if aliases are present then they are used
+	 */
+	_getTabulatorColumns: function(data, recordFieldsDefinitions) {
+
+		var fieldsToDisplayTabulator = [];
+
+		if (data.hasOwnProperty("fields") && $.isArray(data.fields))
+		{
+			for (var sfc = 0; sfc < data.fields.length; sfc++)
+			{
+				for (var fc = 0; fc < data.fields.length; fc++)
+				{
+					if (data.fields[sfc] == data.fields[fc])
+					{
+						// Build the array of objects (columns) used by tabulator and store it in tabulatorColumns
+						var tmpColumnObj = {}; // New object that represents a column
+
+						// If was given a definition for this field then use it!
+						if (recordFieldsDefinitions != null && recordFieldsDefinitions.hasOwnProperty(data.fields[sfc]))
+						{
+							tmpColumnObj = recordFieldsDefinitions[data.fields[sfc]];
+						}
+
+						tmpColumnObj.field = data.fields[sfc]; // Field name to be linked with dataset field name
+
+						// If there is an alias for this field use it to give a title to this field (header)
+						if (data.hasOwnProperty("columnsAliases") && $.isArray(data.columnsAliases))
+						{
+							tmpColumnObj.title = data.columnsAliases[fc];
+						}
+						else // otherwise use the field name itself
+						{
+							tmpColumnObj.title = data.fields[sfc];
+						}
+
+						fieldsToDisplayTabulator.push(tmpColumnObj); // Add tmpColumnObj to tabulatorColumns
+					}
+				}
+			}
+		}
+
+		// If additional columns are present...
+		if (data.hasOwnProperty("additionalColumns") && data.additionalColumns != null && $.isArray(data.additionalColumns))
+		{
+			// ...loops through them
+			$.each(data.additionalColumns, function(i, additionalColumn) {
+
+				var tmpColumnObj = {}; // New object that represents a column
+
+				// If was given a definition for this field then use it!
+				if (recordFieldsDefinitions != null && recordFieldsDefinitions.hasOwnProperty(additionalColumn))
+				{
+					tmpColumnObj = recordFieldsDefinitions[additionalColumn];
+				}
+
+				tmpColumnObj.title = additionalColumn; // Give a title to this field (header)
+				tmpColumnObj.field = additionalColumn; // Field name to be linked with dataset field name
+
+				fieldsToDisplayTabulator.push(tmpColumnObj); // Add tmpColumnObj to tabulatorColumns
+			});
+		}
+
+		return fieldsToDisplayTabulator;
+	},
+
+	/**
+	 * Gets options for the representation
+	 */
+	_getRepresentationOptions: function(data) {
+
+		var options = {}; // eventually contains options fot the representation
+
+		// Checks if options were given
+		if (data.hasOwnProperty("datasetRepresentationOptions") && data.datasetRepresentationOptions != "")
+		{
+			var tmpOptions = eval("(" + data.datasetRepresentationOptions + ")"); // and converts them from string to javascript code
+
+			// If it is an object then can be used
+			if (typeof tmpOptions == "object")
+			{
+				options = tmpOptions;
+			}
+		}
+
+		return options;
+	},
+
+	/**
+	 * Gets record fields definitions to represent the dataset
+	 */
+	_getRepresentationFieldsDefinitions: function(data) {
+
+		var fieldsDefinitions = {}; // eventually contains record fields definitions
+
+		// Checks if record fields definitions was given as parameter
+		if (data.hasOwnProperty("datasetRepresentationFieldsDefinitions") && data.datasetRepresentationFieldsDefinitions != "")
+		{
+			var tmpFDefs = eval("(" + data.datasetRepresentationFieldsDefinitions + ")"); // and converts them from string to javascript code
+
+			// If it is an object then can be used
+			if (typeof tmpFDefs == "object")
+			{
+				fieldsDefinitions = tmpFDefs;
+			}
+		}
+
+		return fieldsDefinitions;
+	},
+
+	/**
+	 * Set what type of dataset representation was choosen
+	 */
+	_setDatasetRepresentation: function(data) {
+
+		if (data.hasOwnProperty("datasetRepresentation"))
+		{
+			FHC_TableWidget._datasetRepresentation = data.datasetRepresentation;
+		}
+	},
+
+	_setBootstrapVersion: function (data) {
+		_bootstrapVersion = data.bootstrapVersion;
+	},
+
+	_getTableWidgetUniqueIdArray: function() {
+
+		var tableWidgetUniqueIdArray = [];
+
+		$("div[id*='divTableWidgetDataset']").each(function(i, e) {
+
+			tableWidgetUniqueIdArray.push(e.attributes["tableUniqueId"].nodeValue);
+		});
+
+		return tableWidgetUniqueIdArray;
+	}
 };
 
 //**********************************************************************************************************************
@@ -772,202 +781,198 @@ var FHC_TableWidget = {
  * Processed when row selection changed.
  * Displays number of selected rows on row selection change.
  */
-function _func_rowSelectionChanged(data, rows) {
-  $("#number-selected").html(
-    "Ausgewählte Zeilen: <strong>" + rows.length + "</strong>"
-  );
+function _func_rowSelectionChanged (data, rows){
+
+	$('#number-selected').html("Ausgewählte Zeilen: <strong>" + rows.length + "</strong>");
 }
 
 /* Processed when columns visibility changed (e.g. using the column picker).
  * Redraws the table to expand columns to table width.
  */
-function _func_columnVisibilityChanged(column, visible) {
-  var table = column.getTable();
+function _func_columnVisibilityChanged(column, visible){
 
-  table.redraw();
+	var table = column.getTable();
+
+	table.redraw();
 }
 
 /*
  * Displays text when table is empty
  */
-function _func_placeholder() {
-  return "<h4>" + FHC_PhrasesLib.t("ui", "keineDatenVorhanden") + "</h4>";
+function _func_placeholder(){
+	return '<h4>' + FHC_PhrasesLib.t('ui', 'keineDatenVorhanden') + '</h4>';
 }
 
 // Returns TableWidget Header HTML (download-, setting button...)
-function _renderTabulatorHeaderHTML(tableWidgetDiv) {
-  var tableUniqueId = tableWidgetDiv.attr("tableUniqueId");
+function _renderTabulatorHeaderHTML(tableWidgetDiv){
 
-  var tabulatorHeaderHTML = "";
-  tabulatorHeaderHTML += `<div  ${
-    _bootstrapVersion == 3 ? 'class="btn-toolbar pull-right" style="margin-bottom:0.5rem;"' : 'class="btn-toolbar d-flex justify-content-end mb-2"'
-  }" role="toolbar">
-		<div class="btn-group" role="group">
-			<!-- CSV Download button -->
-			<button id="download-csv" class="btn ${
-        _bootstrapVersion == 3 ? "btn-default" : "btn-outline-secondary"
-      }" type="button" 
-			data-toggle="tooltip" data-placement="left" title="Download CSV">
-				<small>
-					CSV&nbsp;&nbsp;
-				</small>
-				<i class="fa fa-arrow-down"></i>
-			</button>
-			<!-- Hilfe Button -->
-			<button id="help" class="btn ${
-        _bootstrapVersion == 3 ? "btn-default" : "btn-outline-secondary"
-      }" type="button"
-			data-toggle="collapse tooltip" data-target="tabulatorHelp-${tableUniqueId}" data-placement="left" 
-			title="${FHC_PhrasesLib.t("ui", "hilfe")}">
-				<i class="fa fa-question"></i>
-			</button>
-			<!-- Settings Button -->
-			<button id="settings" class="btn ${
-        _bootstrapVersion == 3 ? "btn-default" : "btn-outline-secondary"
-      }" type="button" 
-			data-toggle="collapse tooltip" data-target="tabulatorSettings-${tableUniqueId}" data-placement="left"
-			title="${FHC_PhrasesLib.t("ui", "tabelleneinstellungen")}" 
-			aria-expanded="false" aria-controls="tabulatorSettings-${tableUniqueId}">
-				<i class="fa fa-cog"></i>
-			</button>
-		</div>
-	</div>
-	`;
+	var tableUniqueId = tableWidgetDiv.attr('tableUniqueId');
 
-  return tabulatorHeaderHTML;
+	var outerdivattr = 'class="btn-toolbar d-flex justify-content-end mb-2"';
+	var buttonclass = 'btn-outline-secondary';
+	if(_bootstrapVersion == 3) {
+		outerdivattr = 'class="btn-toolbar pull-right" style="margin-bottom:0.5rem;"';
+		buttonclass = 'btn-default';
+	}
+
+	var tabulatorHeaderHTML = '';
+	tabulatorHeaderHTML += '<div ' + outerdivattr + ' role="toolbar">';
+	tabulatorHeaderHTML += '<div class="btn-group" role="group">';
+	tabulatorHeaderHTML += '' +
+		'<button id="download-csv" class="btn ' + buttonclass + '" type="button" ' +
+		'data-toggle="tooltip" data-placement="left" title="Download CSV">' +
+		'<small>CSV&nbsp;&nbsp;</small><i class="fa fa-arrow-down"></i>' +
+		'</button>';
+	tabulatorHeaderHTML += '' +
+		'<button id="help" class="btn ' + buttonclass + '" type="button" ' +
+		'data-toggle="collapse tooltip" data-target="tabulatorHelp-'+ tableUniqueId + '" data-placement="left" ' +
+		'title="' + FHC_PhrasesLib.t("ui", "hilfe") + '"><i class="fa fa-question"></i>' +
+		'</button>';
+	tabulatorHeaderHTML += '' +
+		'<button id="settings" class="btn ' + buttonclass + '" type="button" ' +
+		'data-toggle="collapse tooltip" data-target="tabulatorSettings-'+ tableUniqueId + '" data-placement="left" ' +
+		'title="' + FHC_PhrasesLib.t("ui", "tabelleneinstellungen") + '" ' +
+		'aria-expanded="false" aria-controls="tabulatorSettings-'+ tableUniqueId + '">' +
+		'<i class="fa fa-cog"></i>' +
+		'</button>';
+	tabulatorHeaderHTML += '</div>';
+	tabulatorHeaderHTML += '</div>';
+	tabulatorHeaderHTML += '<br><br><br>';
+
+	return tabulatorHeaderHTML;
 }
 
 // Returns collapsable HTML element for TableWidget header buttons
-function _renderTabulatorHeaderCollapseHTML(
-  tableWidgetDiv,
-  arrayTabulatorColumns
-) {
-  var tableUniqueId = tableWidgetDiv.attr("tableUniqueId");
+function _renderTabulatorHeaderCollapseHTML(tableWidgetDiv){
 
-  var tabulatorHeaderCollapseHTML = "";
+	var tableUniqueId = tableWidgetDiv.attr('tableUniqueId');
 
-  // CollapseHTML 'Settings'
-  if (_bootstrapVersion == 3) {
-    tabulatorHeaderCollapseHTML += `
-	<div class="row ">
-		<div class="col-lg-12 collapse" id="tabulatorSettings-${tableUniqueId}">
-			<div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
-				<div class="panel panel-default">
-					<div class="panel-heading" role="tab" id="headingOne">
-						<h5 class="panel-title">
-							<a role="button" data-toggle="collapse" data-parent="#accordion" 
-							href="#selectColumns-${tableUniqueId}" 
-							aria-expanded="false" aria-controls="selectColumns">
-							${FHC_PhrasesLib.t("ui", "spaltenEinstellen")} 
-							</a>
-						</h5>
-					</div>
-					<div id="selectColumns-${tableUniqueId}" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
-						<div class="panel-body">
-							<div class="btn-group" role="group">`;
-  } else {
-    tabulatorHeaderCollapseHTML += `<div class="row ">
-			<div class="col-12 mb-2 collapse" id="tabulatorSettings-${tableUniqueId}">
-				<div class="accordion" id="accordion" role="tablist" aria-multiselectable="true">
-					<div class="accordion-item">
-						<h5  class=" accordion-header" role="tab" id="headingOne">		
-							<a role="button"  class="accordion-item-dark text-dark accordion-button" data-bs-toggle="collapse" data-bs-parent="#accordion" 
-							href="#selectColumns-${tableUniqueId}" 
-							aria-expanded="false" aria-controls="selectColumns">
-							${FHC_PhrasesLib.t("ui", "spaltenEinstellen")}
-							</a>
-						</h5>
-						<div id="selectColumns-${tableUniqueId}" class="accordion-collapse collapse" role="tabpanel" aria-labelledby="headingOne" data-bs-parent="#accordion">
-							<div class=" accordion-body ">
-								<div class="d-flex flex-row flex-wrap btn-group" role="group">`;
-  }
-  // Create column picker (Spalten einstellen)
-  tableWidgetDiv
-    .find("#tableWidgetTabulator")
-    .tabulator("getColumns")
-    .forEach(function (column) {
-      var field = column.getField();
-      var title = column.getDefinition().title;
-      var btn_select_col_selected = column.isVisible()
-        ? "btn-select-col-selected"
-        : "";
+	var tabulatorHeaderCollapseHTML = '';
 
-      // If certain columns should be excluded from the column picker (define them in a blacklist array)
-      if (
-        typeof tableWidgetBlacklistArray_columnUnselectable != "undefined" &&
-        Array.isArray(tableWidgetBlacklistArray_columnUnselectable) &&
-        tableWidgetBlacklistArray_columnUnselectable.length
-      ) {
-        if (
-          $.inArray(field, tableWidgetBlacklistArray_columnUnselectable) < 0
-        ) {
-          tabulatorHeaderCollapseHTML += `<button type="button" style="flex:0 0 auto " class="btn ${
-            _bootstrapVersion == 3
-              ? "btn-default"
-              : "btn-outline-secondary flex-shrink-1"
-          } btn-sm btn-select-col ${btn_select_col_selected} " aria-pressed="true" id="btn-${field}" value="${field}">${title}</button>`;
-        }
-      }
-      // Else provide all tabulator fields as pickable columns
-      else {
-        tabulatorHeaderCollapseHTML += `<button type="button" style="flex:0 0 auto " class="btn ${
-          _bootstrapVersion == 3
-            ? "btn-default"
-            : "btn-outline-secondary flex-shrink-1"
-        } btn-sm btn-select-col ${btn_select_col_selected} " aria-pressed="true" id="btn-${field}" value="${field}">${title}</button>`;
-      }
-    });
+	var colclass = 'col-12 mb-2 collapse';
+	var accordionclass = 'accordion';
+	var accordionitemclass = 'accordion-item';
+	var accordionheaderclass = 'accordion-header';
+	var accordionh5class = '';
+	var accordiondataattr = 'data-bs-toggle="collapse" data-bs-parent="#accordion"';
+	var accordioncollapseclass = 'accordion-collapse';
+	var accordionbodyclass = 'accordion-body';
+	var btngrpclass = 'd-flex flex-row flex-wrap btn-group';
+	var buttonstyle = 'flex:0 0 auto';
+	var buttonclass = 'btn-outline-secondary flex-shrink-1';
+	if(_bootstrapVersion == 3) {
+		colclass = 'col-lg-12 collapse';
+		accordionclass = 'panel-group';
+		accordionitemclass = 'panel panel-default';
+		accordionheaderclass = 'panel-heading';
+		accordionh5class = 'panel-title';
+		accordiondataattr = 'data-toggle="collapse" data-parent="#accordion"';
+		accordioncollapseclass = 'panel-collapse';
+		accordionbodyclass = 'panel-body';
+		btngrpclass = 'btn-group';
+		buttonstyle = '';
+		buttonclass = 'btn-default';
+	}
 
-  tabulatorHeaderCollapseHTML += "</div>"; // end btn-group
-  tabulatorHeaderCollapseHTML += "</div>"; // end panel-body / accordion-body
-  tabulatorHeaderCollapseHTML += "</div>"; // end panel-collapse / accordion-collapse
-  tabulatorHeaderCollapseHTML += "</div>"; // end panel / accordion-item
-  tabulatorHeaderCollapseHTML += "</div>"; // end panel-group / accordion
-  tabulatorHeaderCollapseHTML += " </div>"; // end col
-  tabulatorHeaderCollapseHTML += " </div>"; // end row
+	// CollapseHTML 'Settings'
+	tabulatorHeaderCollapseHTML += '<div class="row">';
+	tabulatorHeaderCollapseHTML += '<div class="' + colclass + '" id="tabulatorSettings-'+ tableUniqueId + '">';
+	tabulatorHeaderCollapseHTML += '<div class="' + accordionclass + '" id="accordion" role="tablist" aria-multiselectable="true">';
 
-  return tabulatorHeaderCollapseHTML;
+	tabulatorHeaderCollapseHTML += '<div class="' + accordionitemclass + '">';
+	tabulatorHeaderCollapseHTML += '<div class="' + accordionheaderclass + '" role="tab" id="headingOne">';
+	tabulatorHeaderCollapseHTML += '<h5 class="' + accordionh5class + '">';
+	tabulatorHeaderCollapseHTML += '' +
+		'<a role="button" ' + accordiondataattr + ' ' +
+		'href="#selectColumns-' + tableUniqueId + '" ' +
+		'aria-expanded="false" aria-controls="selectColumns">' +
+		FHC_PhrasesLib.t("ui", "spaltenEinstellen") +
+		'</a>';
+	tabulatorHeaderCollapseHTML += '</h5>';
+	tabulatorHeaderCollapseHTML += '</div>'; // end panel-heading / accordion-header
+	tabulatorHeaderCollapseHTML += '<div id="selectColumns-' + tableUniqueId + '" class="' + accordioncollapseclass + ' collapse" ' +
+		'role="tabpanel" aria-labelledby="headingOne">';
+	tabulatorHeaderCollapseHTML += '<div class="' + accordionbodyclass + '">';
+	tabulatorHeaderCollapseHTML += '<div class="' + btngrpclass + '" role="group">';
+
+	// Create column picker (Spalten einstellen)
+	tableWidgetDiv.find('#tableWidgetTabulator').tabulator('getColumns').forEach(function(column)
+	{
+		var field = column.getField();
+		var title = column.getDefinition().title;
+		var btn_select_col_selected = column.isVisible() ? 'btn-select-col-selected' : '';
+
+		// If certain columns should be excluded from the column picker (define them in a blacklist array)
+		if (typeof tableWidgetBlacklistArray_columnUnselectable != 'undefined' &&
+			Array.isArray(tableWidgetBlacklistArray_columnUnselectable) &&
+			tableWidgetBlacklistArray_columnUnselectable.length)
+		{
+			if ($.inArray(field, tableWidgetBlacklistArray_columnUnselectable) < 0)
+			{
+				tabulatorHeaderCollapseHTML += '<button type="button" style="' + buttonstyle + '" class="btn ' + buttonclass + ' btn-sm btn-select-col ' + btn_select_col_selected +'" aria-pressed="true" id="btn-' + field + '" value="' + field + '">' + title + '</button>';
+			}
+		}
+		// Else provide all tabulator fields as pickable columns
+		else
+		{
+			tabulatorHeaderCollapseHTML += '<button type="button" style="' + buttonstyle + '" class="btn ' + buttonclass + ' btn-sm btn-select-col ' + btn_select_col_selected +'" aria-pressed="true" id="btn-' + field + '" value="' + field + '">' + title + '</button>';
+		}
+	});
+
+	tabulatorHeaderCollapseHTML += '</div>'; // end btn-group
+	tabulatorHeaderCollapseHTML += '</div>'; // end panel-body / accordion-body
+	tabulatorHeaderCollapseHTML += '</div>'; // end panel-collapse / accordion-collapse
+	tabulatorHeaderCollapseHTML += '</div>'; // end panel / accordion-item
+
+	tabulatorHeaderCollapseHTML += '</div>'; // end panel-group / accordion
+	tabulatorHeaderCollapseHTML += ' </div>'; // end col
+	tabulatorHeaderCollapseHTML += ' </div>'; // end row
+
+	return tabulatorHeaderCollapseHTML;
 }
 
 // Returns TableWidget Footer HTML (de-/select buttons,...)
-function _renderTabulatorFooterHTML(tableWidgetFooterOptions) {
-  var tabulatorFooterHTML = "";
+function _renderTabulatorFooterHTML(tableWidgetFooterOptions){
 
-  // If property selectButtons is true, render 'Alle auswaehlen / Alle abwaehlen' buttons
-  if (
-    typeof tableWidgetFooterOptions.selectButtons != "undefined" &&
-    tableWidgetFooterOptions.selectButtons == true
-  ) {
-    tabulatorFooterHTML += `<div ${_bootstrapVersion==3?'style="margin-top:1.5rem;" class="btn-toolbar"': 'class="btn-toolbar mt-4"'}  role="toolbar">
-			<div class="btn-group" role="group">
-				<button id="select-all" class="btn ${
-          _bootstrapVersion == 3
-            ? "btn-default pull-left"
-            : "btn-outline-secondary float-start"
-        } " type="button">
-			 		${FHC_PhrasesLib.t("ui", "alleAuswaehlen")}
-				</button>
-				<button id="deselect-all" class="btn ${
-          _bootstrapVersion == 3
-            ? "btn-default pull-left"
-            : "btn-outline-secondary float-start"
-        } " type="button">
-					${FHC_PhrasesLib.t("ui", "alleAbwaehlen")}
-				</button>
-				<span id="number-selected" style="margin-left: 20px; line-height: 2; font-weight: normal">
-					${FHC_PhrasesLib.t("ui", "ausgewaehlteZeilen")} : <strong>0</strong>
-				</span>
-			</div>
-		</div>
-		</br></br>`;
-  }
+	var tabulatorFooterHTML = '';
 
-  return tabulatorFooterHTML;
+	var outerdivattr = 'class="btn-toolbar mt-4"';
+	var buttonclass = 'btn-outline-secondary float-start';
+	if(_bootstrapVersion == 3) {
+		outerdivattr = 'style="margin-top:1.5rem;" class="btn-toolbar"';
+		buttonclass = 'btn-default pull-left';
+	}
+
+	// If property selectButtons is true, render 'Alle auswaehlen / Alle abwaehlen' buttons
+	if (typeof tableWidgetFooterOptions.selectButtons != 'undefined' && tableWidgetFooterOptions.selectButtons == true)
+	{
+		tabulatorFooterHTML += '<div ' + outerdivattr + ' role="toolbar">';
+		tabulatorFooterHTML += '<div class="btn-group" role="group">';
+		tabulatorFooterHTML += '' +
+			'<button id="select-all" class="' + buttonclass + '" type="button">'
+			+ FHC_PhrasesLib.t("ui", "alleAuswaehlen") + '' +
+			'</button>';
+		tabulatorFooterHTML += '' +
+			'<button id="deselect-all" class="' + buttonclass + '" type="button">'
+			+ FHC_PhrasesLib.t("ui", "alleAbwaehlen") + '' +
+			'</button>';
+		tabulatorFooterHTML += '' +
+			'<span id="number-selected" style="margin-left: 20px; line-height: 2; font-weight: normal">'
+			+ FHC_PhrasesLib.t("ui", "ausgewaehlteZeilen") + ': <strong>0</strong>' +
+			'</span>';
+		tabulatorFooterHTML += '</div>';
+		tabulatorFooterHTML += '</div>';
+		tabulatorFooterHTML += '</br></br>';
+	}
+
+	return tabulatorFooterHTML;
 }
 
 /**
  * When JQuery is up
  */
-$(document).ready(function () {
-  FHC_TableWidget.display();
+$(document).ready(function() {
+
+	FHC_TableWidget.display();
+
 });

From 488847984eed33abd77ca2e09529f3aacfc019f8 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 15 Nov 2024 15:19:09 +0100
Subject: [PATCH 1407/1461] change property downloadTitle to titleDownload for
 Tabulator 5, call tabulator redraw at the end of tableInit callback to ensure
 renderStart callbacks are run

---
 public/js/lehre/lehrauftrag/acceptLehrauftrag.js  |  3 ++-
 public/js/lehre/lehrauftrag/approveLehrauftrag.js |  3 ++-
 public/js/lehre/lehrauftrag/orderLehrauftrag.js   | 10 +++++-----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/public/js/lehre/lehrauftrag/acceptLehrauftrag.js b/public/js/lehre/lehrauftrag/acceptLehrauftrag.js
index b1142ff34..af523fd9f 100644
--- a/public/js/lehre/lehrauftrag/acceptLehrauftrag.js
+++ b/public/js/lehre/lehrauftrag/acceptLehrauftrag.js
@@ -172,7 +172,7 @@ function func_tableBuilt(table) {
       field: "status",
       width: 40,
       hozAlign: "center",
-      downloadTitle: "Status",
+      titleDownload: "Status",
       formatter: status_formatter,
       tooltip: status_tooltip,
     },
@@ -477,6 +477,7 @@ $(function () {
       default:
         break;
     }
+    tabulatorInstance.redraw(true);
   });
 
   var canPromise = !!window.Promise;
diff --git a/public/js/lehre/lehrauftrag/approveLehrauftrag.js b/public/js/lehre/lehrauftrag/approveLehrauftrag.js
index 3d8993fc3..4edd749f9 100644
--- a/public/js/lehre/lehrauftrag/approveLehrauftrag.js
+++ b/public/js/lehre/lehrauftrag/approveLehrauftrag.js
@@ -216,7 +216,7 @@ function func_tableBuilt(table) {
       field: "status",
       width: 40,
       hozAlign: "center",
-      downloadTitle: "Status",
+      titleDownload: "Status",
       formatter: status_formatter,
       tooltip: status_tooltip,
     },
@@ -488,6 +488,7 @@ $(function () {
     $("#tableWidgetTabulator").tabulator("on", "rowUpdated", (row) =>
       func_rowUpdated(row)
     );
+    $("#tableWidgetTabulator").tabulator("redraw", true);
   });
 
   // Redraw table on resize to fit tabulators height to windows height
diff --git a/public/js/lehre/lehrauftrag/orderLehrauftrag.js b/public/js/lehre/lehrauftrag/orderLehrauftrag.js
index 847a863f8..f4bf912c7 100644
--- a/public/js/lehre/lehrauftrag/orderLehrauftrag.js
+++ b/public/js/lehre/lehrauftrag/orderLehrauftrag.js
@@ -245,7 +245,7 @@ function func_tableBuilt(table) {
       field: "status",
       width: 40,
       hozAlign: "center",
-      downloadTitle: "Status",
+      titleDownload: "Status",
       formatter: status_formatter,
       tooltip: status_tooltip,
     },
@@ -548,10 +548,10 @@ $(function () {
       func_renderStarted(tabulatorInstance);
     });
 
-    // event dataLoaded needs to be attached as a callback to the tableBuilt event in tabulator5
-    $("#tableWidgetTabulator").tabulator("on", "dataLoaded", (data) => {
-      func_dataLoaded(data, tabulatorInstance);
-    });
+    // set initial filter
+    func_dataLoaded(null, tabulatorInstance);
+
+    $("#tableWidgetTabulator").tabulator("redraw", true);
   });
 
   // Redraw table on resize to fit tabulators height to windows height

From 16cba022e29422816138040c2d305367f9298f8f Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 15 Nov 2024 15:21:46 +0100
Subject: [PATCH 1408/1461] add css class to be able to reset tabulator
 fontsize to 14px for vilesci pages, set active and focus class for filter
 buttons to new combined button, add css rules to make tooltips on cells in
 unselectable rows work again

---
 .../lehre/lehrauftrag/orderLehrauftrag.php      |  8 +++++---
 public/css/Tabulator5.css                       | 17 +++++++++++++++++
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/application/views/lehre/lehrauftrag/orderLehrauftrag.php b/application/views/lehre/lehrauftrag/orderLehrauftrag.php
index 04f7391ce..6806aa401 100644
--- a/application/views/lehre/lehrauftrag/orderLehrauftrag.php
+++ b/application/views/lehre/lehrauftrag/orderLehrauftrag.php
@@ -178,7 +178,9 @@ $this->load->view(
         </div>
 
 		<!-- tabulator data table -->
+		<div class="tabulator-initialfontsize">
 		<?php $this->load->view('lehre/lehrauftrag/orderLehrauftragData.php'); ?>
+		</div>
 
 		<!-- filter buttons & bestell-button -->
         <div class="row">
@@ -187,14 +189,14 @@ $this->load->view(
                 <div class="btn-toolbar" role="toolbar">
                     <div class="btn-group" role="group">
                         <button id="show-all" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'alleAnzeigen'); ?>"><i class='fa fa-users'></i></button>
-                        <button id="show-newAndChanged" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'neuUndGeaenderteAnzeigen'); ?>"><i style="margin-right:10px" class='fa fa-user-plus'></i><i style="margin-right:10px" class="fa fa-ellipsis-vertical"></i>&nbsp;<i class='fa fa-user-pen'></i></button>
+                        <button id="show-newAndChanged" class="btn btn-default btn-lehrauftrag active focus" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'neuUndGeaenderteAnzeigen'); ?>"><i style="margin-right:10px" class='fa fa-user-plus'></i><i style="margin-right:10px" class="fa fa-ellipsis-vertical"></i>&nbsp;<i class='fa fa-user-pen'></i></button>
                     </div>
                     <div class="btn-group" role="group" style="margin-left: 20px;">
-                        <button id="show-new" class="btn btn-default btn-lehrauftrag active focus" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurNeueAnzeigen'); ?>"><i class='fa fa-user-plus'></i></button>
+                        <button id="show-new" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurNeueAnzeigen'); ?>"><i class='fa fa-user-plus'></i></button>
                         <button id="show-ordered" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurBestellteAnzeigen'); ?>"><i class='fa fa-user-tag'></i></button>
                         <button id="show-approved" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurErteilteAnzeigen'); ?>"><i class='fa fa-user-check'></i></button>
                         <button id="show-accepted" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurAngenommeneAnzeigen'); ?>"><i class='fa-regular fa-handshake'></i></button>
-                        <button id="show-changed" class="btn btn-default btn-lehrauftrag active focus" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurGeaenderteAnzeigen'); ?>"><i class='fa fa-user-pen'></i></button></button>
+                        <button id="show-changed" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurGeaenderteAnzeigen'); ?>"><i class='fa fa-user-pen'></i></button></button>
                     </div>
                     <div class="btn-group" role="group" style="margin-left: 20px;">
                         <button id="show-dummies" class="btn btn-default btn-lehrauftrag" type="button" data-toggle="tooltip" data-placement="left" title="<?php echo $this->p->t('ui', 'nurDummiesAnzeigen'); ?>"><i class='fa fa-user-secret'></i></button>
diff --git a/public/css/Tabulator5.css b/public/css/Tabulator5.css
index 9438a59bf..aafdb996b 100644
--- a/public/css/Tabulator5.css
+++ b/public/css/Tabulator5.css
@@ -108,6 +108,23 @@
 	font-size: 1rem;
 }
 
+.tabulator-initialfontsize .tabulator {
+	font-size: 14px;
+}
+
+.tabulator-row.tabulator-unselectable .tabulator-cell {
+	pointer-events: all;
+}
+
+.tabulator-tooltip {
+	color: #fff;
+	background-color: #000;
+}
+
+.tabulator-row.tabulator-unselectable:not(.tabulator-calcs) {
+	color: #777 !important;
+}
+
 .tabulator-cell .btn {
 	padding: 0 .7rem;
 	min-height: 25px;

From 78f216f9adfa3c2e4f17469933fe1b1926ca4dcd Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 15 Nov 2024 15:55:42 +0100
Subject: [PATCH 1409/1461] fix syntax error

---
 application/views/lehre/anrechnung/reviewAnrechnungDetail.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/lehre/anrechnung/reviewAnrechnungDetail.php b/application/views/lehre/anrechnung/reviewAnrechnungDetail.php
index 97ff297ca..53f1ee34e 100644
--- a/application/views/lehre/anrechnung/reviewAnrechnungDetail.php
+++ b/application/views/lehre/anrechnung/reviewAnrechnungDetail.php
@@ -49,7 +49,7 @@ $includesArray = array(
 		'customJSs' => array(
 			'public/js/bootstrapper.js',
 			'public/js/lehre/anrechnung/reviewAnrechnungDetail.js'
-
+		)
 	)
 );
 

From 1e5d7e01af366e4f9ff0a4449a17e306d2f63bb2 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 15 Nov 2024 15:57:00 +0100
Subject: [PATCH 1410/1461] reset font-size for tabulator on vilesci page

---
 application/views/lehre/lehrauftrag/approveLehrauftrag.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/lehre/lehrauftrag/approveLehrauftrag.php b/application/views/lehre/lehrauftrag/approveLehrauftrag.php
index 2ffe549e5..a598be015 100644
--- a/application/views/lehre/lehrauftrag/approveLehrauftrag.php
+++ b/application/views/lehre/lehrauftrag/approveLehrauftrag.php
@@ -176,7 +176,7 @@ $this->load->view(
 
 		<!-- tabulator data table -->
         <div class="row">
-            <div class="col-lg-12">
+            <div class="col-lg-12 tabulator-initialfontsize">
                 <?php $this->load->view('lehre/lehrauftrag/approveLehrauftragData.php'); ?>
             </div>
         </div>

From 1b8980a0e2df433dc1253715096538df77479922 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 15 Nov 2024 15:58:26 +0100
Subject: [PATCH 1411/1461] add css classe with bs3 legacy colors for
 bg-success and bg-warning and use them in acceptLehrauftrag cis page

---
 public/css/cis_bs5.css                           | 9 +++++++++
 public/js/lehre/lehrauftrag/acceptLehrauftrag.js | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/public/css/cis_bs5.css b/public/css/cis_bs5.css
index 91c5aea9d..2d562b39e 100644
--- a/public/css/cis_bs5.css
+++ b/public/css/cis_bs5.css
@@ -142,3 +142,12 @@ h6, .h6 {
 .fhc-container .tabulator .tabulator-cell {
 	border-right: 1px solid #dee2e6;
 }
+
+/* lehrauftrag begin */
+.bg-success-bs3 {
+	background-color: #dff0d8 !important;
+}
+.bg-warning-bs3 {
+	background-color: #fcf8e3 !important;
+}
+/* lehrauftrag end */
\ No newline at end of file
diff --git a/public/js/lehre/lehrauftrag/acceptLehrauftrag.js b/public/js/lehre/lehrauftrag/acceptLehrauftrag.js
index af523fd9f..82a46ded0 100644
--- a/public/js/lehre/lehrauftrag/acceptLehrauftrag.js
+++ b/public/js/lehre/lehrauftrag/acceptLehrauftrag.js
@@ -129,11 +129,11 @@ function func_rowFormatter(row) {
       (bestellt != null && betrag != vertrag_betrag) ||
       (bestellt != null && stunden != vertrag_stunden)
     ) {
-      cell.getElement().classList.add("bg-warning"); // geaenderte
+      cell.getElement().classList.add("bg-warning-bs3"); // geaenderte
     } else if (bestellt != null && erteilt != null && akzeptiert == null) {
       return; // bestellte + erteilte
     } else if (bestellt != null && erteilt != null && akzeptiert != null) {
-      cell.getElement().classList.add("bg-success"); // akzeptierte
+      cell.getElement().classList.add("bg-success-bs3"); // akzeptierte
     }
   });
 }

From 96ec9aa8aaf1850f6bf027095c6edba7a876a105 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 18 Nov 2024 09:32:49 +0100
Subject: [PATCH 1412/1461] fix(Calender Style): changes the hover style for
 fhc-entries to have a brighter color than the selectedEvent itself

---
 public/css/Cis4/Cis.css | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index bace22f52..c48beed4d 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -465,9 +465,8 @@ html {
 }
 
 .fhc-entry:hover{
-	background-color:#00649c !important;
+	background-color:#0088d6 !important;
 	color:white !important;
-	border: none !important;
 }
 
 .fhc-entry {

From 2b98a35f59f236ec9ee5c872b2bd2a695ba3978d Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 18 Nov 2024 10:20:13 +0100
Subject: [PATCH 1413/1461] bs5 accordion-button class added

---
 public/js/TableWidget.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/TableWidget.js b/public/js/TableWidget.js
index 7cf778669..9b1c92eb5 100644
--- a/public/js/TableWidget.js
+++ b/public/js/TableWidget.js
@@ -854,7 +854,7 @@ function _renderTabulatorHeaderCollapseHTML(tableWidgetDiv){
 	var accordionitemclass = 'accordion-item';
 	var accordionheaderclass = 'accordion-header';
 	var accordionh5class = '';
-	var accordiondataattr = 'data-bs-toggle="collapse" data-bs-parent="#accordion"';
+	var accordiondataattr = 'class="accordion-button" data-bs-toggle="collapse" data-bs-parent="#accordion"';
 	var accordioncollapseclass = 'accordion-collapse';
 	var accordionbodyclass = 'accordion-body';
 	var btngrpclass = 'd-flex flex-row flex-wrap btn-group';

From 545a9c31e47d54208fea53051b625a0f855a84dd Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 18 Nov 2024 10:29:28 +0100
Subject: [PATCH 1414/1461] tablewidget footer buttons add missing btn css
 class

---
 public/js/TableWidget.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/TableWidget.js b/public/js/TableWidget.js
index 9b1c92eb5..ec93422fc 100644
--- a/public/js/TableWidget.js
+++ b/public/js/TableWidget.js
@@ -937,10 +937,10 @@ function _renderTabulatorFooterHTML(tableWidgetFooterOptions){
 	var tabulatorFooterHTML = '';
 
 	var outerdivattr = 'class="btn-toolbar mt-4"';
-	var buttonclass = 'btn-outline-secondary float-start';
+	var buttonclass = 'btn btn-outline-secondary float-start';
 	if(_bootstrapVersion == 3) {
 		outerdivattr = 'style="margin-top:1.5rem;" class="btn-toolbar"';
-		buttonclass = 'btn-default pull-left';
+		buttonclass = 'btn btn-default pull-left';
 	}
 
 	// If property selectButtons is true, render 'Alle auswaehlen / Alle abwaehlen' buttons

From 65c9d5a84c4fdd568a8d2bacc8194369ed0dd8cf Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 18 Nov 2024 10:47:08 +0100
Subject: [PATCH 1415/1461] adminZeitverfuegbarkeiten reset tabulator fontsize

---
 .../lehre/lvplanung/adminZeitverfuegbarkeitData.php    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/application/views/lehre/lvplanung/adminZeitverfuegbarkeitData.php b/application/views/lehre/lvplanung/adminZeitverfuegbarkeitData.php
index 131a8574e..3bc1f4b64 100644
--- a/application/views/lehre/lvplanung/adminZeitverfuegbarkeitData.php
+++ b/application/views/lehre/lvplanung/adminZeitverfuegbarkeitData.php
@@ -63,7 +63,9 @@ $filterWidgetArray = array(
         bezeichnung: {visible: true, headerFilter:"input"}
     }', // col properties
 );
-
-echo $this->widgetlib->widget('TableWidget', $filterWidgetArray);
-
-?>
\ No newline at end of file
+?>
+<div class="tabulator-initialfontsize">
+<?php
+	echo $this->widgetlib->widget('TableWidget', $filterWidgetArray);
+?>
+</div>

From e04464160029e437f446173283bf8987d34603ea Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 18 Nov 2024 11:50:51 +0100
Subject: [PATCH 1416/1461] use deleteRow instead of getRow and delete to avoid
 console log error

---
 public/js/lehre/lvplanung/zverfueg.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/lehre/lvplanung/zverfueg.js b/public/js/lehre/lvplanung/zverfueg.js
index 60f5044c1..fc565a9c0 100644
--- a/public/js/lehre/lvplanung/zverfueg.js
+++ b/public/js/lehre/lvplanung/zverfueg.js
@@ -113,8 +113,8 @@ $(function(){
                     if (FHC_AjaxClient.hasData(data)) {
 
                         // Delete row
-                        let row = $('#tableWidgetTabulator').tabulator('getRow', zeitsperre_id);
-                        row.delete(zeitsperre_id);
+						$('#tableWidgetTabulator').tabulator('deleteRow', zeitsperre_id);
+						
 
                         // Reset form
                         Zverfueg.resetFormFields();

From 5596c12af9c55489b80d1e6726d455e92dd9795f Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 18 Nov 2024 11:53:17 +0100
Subject: [PATCH 1417/1461] use deleteRow instead of getRow and delete to avoid
 console log error

---
 public/js/lehre/anrechnung/adminAnrechnung.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/public/js/lehre/anrechnung/adminAnrechnung.js b/public/js/lehre/anrechnung/adminAnrechnung.js
index 0b38478e9..8ab34416e 100644
--- a/public/js/lehre/anrechnung/adminAnrechnung.js
+++ b/public/js/lehre/anrechnung/adminAnrechnung.js
@@ -258,10 +258,9 @@ var adminAnrechnung = {
 
           if (FHC_AjaxClient.hasData(data)) {
             let row = $("#tableWidgetTabulator").tabulator(
-              "getRow",
+              "deleteRow",
               anrechnungszeitraum_id
             );
-            row.delete(anrechnungszeitraum_id);
 
             // Success message
             FHC_DialogLib.alertSuccess(FHC_PhrasesLib.t("ui", "geloescht"));

From ad31e732120878cfb0d18b2a7db6233be6ed29f2 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 18 Nov 2024 11:59:40 +0100
Subject: [PATCH 1418/1461] reset Tabulator fontsize, combine page headings

---
 application/views/lehre/anrechnung/adminAnrechnung.php    | 7 +++----
 .../views/lehre/anrechnung/adminAnrechnungData.php        | 8 ++++++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/application/views/lehre/anrechnung/adminAnrechnung.php b/application/views/lehre/anrechnung/adminAnrechnung.php
index adef52d64..df36b3598 100644
--- a/application/views/lehre/anrechnung/adminAnrechnung.php
+++ b/application/views/lehre/anrechnung/adminAnrechnung.php
@@ -76,12 +76,11 @@ if (defined("CIS4")) {
 
             <!--Titel-->
             <div class="page-header">
-                <h3><?php echo $this->p->t('anrechnung', 'anrechnungenVerwalten'); ?></h3>
+                <h3><?php echo $this->p->t('anrechnung', 'anrechnungenVerwalten') 
+					. ' - ' . $this->p->t('anrechnung', 'anrechnungszeitraumFestlegen'); ?>
+				</h3>
             </div><br>
 
-            <!--Untertitel-->
-            <h4><?php echo $this->p->t('anrechnung', 'anrechnungszeitraumFestlegen'); ?></h4><br>
-
             <div class="row">
                 <div class="col-xs-4">
                     <button class="btn btn-primary azrOpenModal" data-toggle="modal" data-target="#azrModal">
diff --git a/application/views/lehre/anrechnung/adminAnrechnungData.php b/application/views/lehre/anrechnung/adminAnrechnungData.php
index e39e4086d..9f0cd5733 100644
--- a/application/views/lehre/anrechnung/adminAnrechnungData.php
+++ b/application/views/lehre/anrechnung/adminAnrechnungData.php
@@ -43,5 +43,9 @@ $filterWidgetArray = array(
 		insertvon:              {visible: false, headerFilter:"input"}
 	 }'
 );
-
-echo $this->widgetlib->widget('TableWidget', $filterWidgetArray);
\ No newline at end of file
+?>
+<div class="tabulator-initialfontsize">
+<?php
+	echo $this->widgetlib->widget('TableWidget', $filterWidgetArray);
+?>
+</div>
\ No newline at end of file

From b6a5e9b845281797abebbf2dab74e10c14410fb9 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 18 Nov 2024 16:09:16 +0100
Subject: [PATCH 1419/1461] load stsemArray from Prestudentstati for select
 options;

---
 application/controllers/Cis/Documents.php |  6 ++++++
 application/views/Cis/Documents.php       |  1 -
 public/js/apps/Cis/Documents.js           | 11 ++++-------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/application/controllers/Cis/Documents.php b/application/controllers/Cis/Documents.php
index 6e007c1f9..c5a6684d3 100644
--- a/application/controllers/Cis/Documents.php
+++ b/application/controllers/Cis/Documents.php
@@ -71,11 +71,16 @@ class Documents extends Auth_Controller
 			]);
 
 		$stgs = [];
+		$stsemArray = [];
 		$buchungstypen = implode('\',\'', defined("CIS_DOKUMENTE_STUDIENBEITRAG_TYPEN") ? unserialize(CIS_DOKUMENTE_STUDIENBEITRAG_TYPEN) : []);
 		$person_ids = [];
 		foreach ($stati as $status) {
 			$person_ids[] = $status->person_id;
 
+			if(!in_array($status->studiensemester_kurzbz, $stsemArray)) {
+				$stsemArray[] = $status->studiensemester_kurzbz;
+			}
+			
 			if (!isset($stgs[$status->studiengang_kz])) {
 				$stg = $this->StudiengangModel->load($status->studiengang_kz);
 				if (isError($stg))
@@ -122,6 +127,7 @@ class Documents extends Auth_Controller
 
 		
 		$this->load->view('Cis/Documents', [
+			'stsemArray' => $stsemArray,
 			'stgs' => $stgs,
 			'uid' => $uid,
 			'studienbuchblatt' => defined('CIS_DOKUMENTE_STUDIENBUCHLBATT_DRUCKEN') && CIS_DOKUMENTE_STUDIENBUCHLBATT_DRUCKEN,
diff --git a/application/views/Cis/Documents.php b/application/views/Cis/Documents.php
index 2d61a849d..f34ce3fc1 100644
--- a/application/views/Cis/Documents.php
+++ b/application/views/Cis/Documents.php
@@ -104,7 +104,6 @@ $this->load->view('templates/CISVUE-Header', $includesArray);
 						<?php } ?>
 						<div class="col-auto">
 							<select class="form-select" @input="changeFilter('studienerfolgsbestaetigungtable', 'Stsem', $event)">
-								<option value="">Alle</option>
 								<option value="<?= $this->p->t('tools', 'alleStudiensemester'); ?>"><?= $this->p->t('tools', 'alleStudiensemester'); ?></option>
 								<?php foreach ($stsemArray as $sem) { ?>
 									<option value="<?= $sem; ?>">
diff --git a/public/js/apps/Cis/Documents.js b/public/js/apps/Cis/Documents.js
index da84d0640..7b5332bf9 100644
--- a/public/js/apps/Cis/Documents.js
+++ b/public/js/apps/Cis/Documents.js
@@ -1,14 +1,8 @@
-// import Phrasen from '../../mixins/Phrasen.js';
 import Phrasen from '../../plugin/Phrasen.js';
-//import {TabulatorFull as Tabulator} from '../../../../vendor/olifolkerd/tabulator5/dist/js/tabulator_esm.min.js';
-//import CssLib from '../../helpers/CssLib.js';
-//CssLib.import('../../vendor/olifolkerd/tabulator5/dist/css/tabulator_bootstrap5.min.css');
+import {setScrollbarWidth} from "../../helpers/CssVarCalcHelpers";
 
 const app = Vue.createApp({
 	name: 'DocumentsApp',
-	// mixins: [
-	// 	Phrasen
-	// ],
 	data() {
 		return {
 			inscriptiontable: null,
@@ -92,5 +86,8 @@ const app = Vue.createApp({
 		});
 	}
 });
+
+setScrollbarWidth();
+
 app.use(Phrasen, {reload: true});
 app.mount('#content');

From 4aed321b5e589decb442a4fac0898c035040dc2a Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 19 Nov 2024 10:11:49 +0100
Subject: [PATCH 1420/1461] refactor(Calendar Tagesansicht): changes how the
 logic for opening a modal or showing the lvMenu next to the calendar is
 handled

---
 public/css/Cis4/Cis.css                     |  2 +-
 public/js/apps/Cis/Stundenplan.js           | 21 +-----
 public/js/components/Calendar/Day.js        |  2 +-
 public/js/components/Calendar/Day/Page.js   | 84 +++++++++++++++------
 public/js/components/Calendar/Month/Page.js |  7 +-
 public/js/components/Calendar/Pane.js       | 19 ++++-
 public/js/components/Calendar/Week/Page.js  |  7 +-
 7 files changed, 91 insertions(+), 51 deletions(-)

diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index c48beed4d..380951b21 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -175,7 +175,7 @@ html {
 }
 #cis-header .btn.dropdown-toggle:after,
 #cis-nav .btn.dropdown-toggle:after {
-  transition: all 0.2s ease-in-out;
+  transition: transform 0.2s ease-in-out;
 }
 #cis-header .btn.dropdown-toggle.collapsed:after,
 #cis-nav .btn.dropdown-toggle.collapsed:after {
diff --git a/public/js/apps/Cis/Stundenplan.js b/public/js/apps/Cis/Stundenplan.js
index 1d37e4d91..d29ba946e 100644
--- a/public/js/apps/Cis/Stundenplan.js
+++ b/public/js/apps/Cis/Stundenplan.js
@@ -3,6 +3,7 @@ import Phrasen from "../../plugin/Phrasen.js";
 import CalendarDate from "../../composables/CalendarDate.js";
 import LvModal from "../../components/Cis/Mylv/LvModal.js";
 
+
 const app = Vue.createApp({
 	name: 'StundenplanApp',
 	data() {
@@ -17,8 +18,7 @@ const app = Vue.createApp({
 		}
 	},
 	components: {
-		FhcCalendar,
-		LvModal
+		FhcCalendar, LvModal
 	},
 	computed:{
 		weekFirstDay: function () {
@@ -36,20 +36,12 @@ const app = Vue.createApp({
 		
 	},
 	methods:{
-		setWindowWidth: function () {
-			this.windowWidth = window.innerWidth;
-		},
 		getLvID: function () {
 			this.lv_id = window.location.pathname
 		},
 		selectDay: function(day){
 			this.currentDay = day;
 		},
-		showDayModal: function (event) {
-			// only show the modal if the window width is smaller than 1200px
-			if(this.windowWidth >= 1200) return;
-			this.showModal(event);
-		},
 		showModal: function(event){
 			this.currentlySelectedEvent = event;
 			Vue.nextTick(() => {
@@ -116,13 +108,6 @@ const app = Vue.createApp({
 		this.loadEvents();
 		this.getLvID()
 	},
-	mounted(){
-		this.windowWidth = window.innerWidth;
-		window.addEventListener('resize', this.setWindowWidth);
-	},
-	beforeUnmount(){
-		window.removeEventListener('resize', this.setWindowWidth);
-	},
 	//TODO: Stundenplan phrase
 	template:/*html*/`
 	<h2>Stundenplan</h2>
@@ -142,7 +127,7 @@ const app = Vue.createApp({
 			</div>
 		</template>
 		<template #dayPage="{event,day}">
-			<div @click="showDayModal(event?.orig)" type="button" class="border border-secondary border row h-100 justify-content-center align-items-center text-center">
+			<div type="button" class="fhc-entry border border-secondary border row h-100 justify-content-center align-items-center text-center">
 				<div class="col ">
 					<p>Lehrveranstaltung:</p>
 					<p class="m-0">{{event?.orig.topic}}</p>
diff --git a/public/js/components/Calendar/Day.js b/public/js/components/Calendar/Day.js
index dc9795850..3fdcfdb4e 100644
--- a/public/js/components/Calendar/Day.js
+++ b/public/js/components/Calendar/Day.js
@@ -42,7 +42,7 @@ export default {
 	<div class="fhc-calendar-day">
 		<calendar-header :title="title" @prev="prev" @next="next" @updateMode="$emit('updateMode', $event)" @click="$emit('updateMode', 'week')"/>
 		<calendar-pane ref="pane" v-slot="slot" @slid="paneChanged">
-			<calendar-day-page :year="focusDate.y" :week="focusDate.w+slot.offset" @updateMode="$emit('updateMode', $event)" @page:back="prev" @page:forward="next" @input="selectEvent" >
+			<calendar-day-page :active="slot.active" :year="focusDate.y" :week="focusDate.w+slot.offset" @updateMode="$emit('updateMode', $event)" @page:back="prev" @page:forward="next" @input="selectEvent" >
 				<template #dayPage="{event,day}">
 					<slot name="dayPage" :event="event" :day="day" ></slot>
 				</template>
diff --git a/public/js/components/Calendar/Day/Page.js b/public/js/components/Calendar/Day/Page.js
index b579b1b9e..e7927e896 100644
--- a/public/js/components/Calendar/Day/Page.js
+++ b/public/js/components/Calendar/Day/Page.js
@@ -1,6 +1,7 @@
 import CalendarDate from '../../../composables/CalendarDate.js';
 import LvMenu from "../../../components/Cis/Mylv/LvMenu.js"
 import LvInfo from "../../../components/Cis/Mylv/LvInfo.js"
+import LvModal from "../../../components/Cis/Mylv/LvModal.js";
 
 function ggt(m, n) { return n == 0 ? m : ggt(n, m % n); }
 function kgv(m, n) { return (m * n) / ggt(m, n); }
@@ -9,6 +10,7 @@ export default {
 	components:{
 		LvMenu,
 		LvInfo,
+		LvModal,
 	},
 	data() {
 		return {
@@ -32,7 +34,8 @@ export default {
 	],
 	props: {
 		year: Number,
-		week: Number
+		week: Number,
+		active: Boolean,
 	},
 	emits: [
 		'updateMode',
@@ -41,6 +44,18 @@ export default {
 		'input'
 	],
 	watch:{
+		//TODO: on first render non of the day-page components are active and the watcher on selectedEvent does not fetch the lvMenu
+		//TODO: workaround is to watch the active state and refetch in case the lvMenu is empty
+		active:{
+			handler(value){
+				if(value){
+					if(!this.lvMenu){
+						this.fetchLvMenu(this.selectedEvent);
+					}
+				}
+			},
+			immediate:true,
+		},
 		eventsPerDayAndHour:{
 			handler(newEvents) {
 				// if no event is selected, select the first event of the day
@@ -55,27 +70,20 @@ export default {
 		},
 		selectedEvent:{
 			handler(event) {
-				this.lvMenu = null;
-				if (event && event.type == 'lehreinheit') {
-					this.$fhcApi.factory.stundenplan.getLehreinheitStudiensemester(event.lehreinheit_id[0]).then(
-						res => res.data
-					).then(
-						studiensemester_kurzbz => {
-							this.$fhcApi.factory.addons.getLvMenu(event.lehrveranstaltung_id, studiensemester_kurzbz).then(res => {
-								if (res.data) {
-									this.lvMenu = res.data;
-								}
-							});
-						}
-					)
+				// return early if the day-page component is not the active carousel item
+				if(!this.active)
+				{
+					return;
 				}
+				this.lvMenu = null;
+				this.fetchLvMenu(event);
 			},
 			immediate:true,
 		}
 	},
 	computed: {
 		noEventsCondition(){
-			return !this.isSliding && this.filteredEvents.length === 0;
+			return !this.isSliding && this.filteredEvents?.length === 0;
 		},
 		hours() {
 			// returns an array with elements starting at 7 and ending at 24
@@ -127,6 +135,28 @@ export default {
 		},
 	},
 	methods: {
+		fetchLvMenu(event){
+			if (event && event.type == 'lehreinheit') {
+				this.$fhcApi.factory.stundenplan.getLehreinheitStudiensemester(event.lehreinheit_id[0]).then(
+					res => res.data
+				).then(
+					studiensemester_kurzbz => {
+						this.$fhcApi.factory.addons.getLvMenu(event.lehrveranstaltung_id, studiensemester_kurzbz).then(res => {
+							if (res.data) {
+								this.lvMenu = res.data;
+							}
+						});
+					}
+				)
+			}
+		},
+		showModal: function (evt) {
+			let event = evt.orig;
+			this.setSelectedEvent(event);
+			Vue.nextTick(() => {
+				this.$refs.lvmodal.show();
+			});
+		},
 		eventClick(evt) {
 			let event = evt.orig;
 			this.setSelectedEvent(event);
@@ -190,6 +220,8 @@ export default {
 	},
 	template: /*html*/`
 	<div class="fhc-calendar-day-page ">
+	<!-- lvModal for mobile view -->
+	<lv-modal v-if="selectedEvent" :event="selectedEvent" ref="lvmodal" />
 		<div class="row m-0">
 			<div class="col-12 col-xl-6 p-0">
 				<div class="d-flex flex-column">
@@ -212,10 +244,20 @@ export default {
 								<div v-for="hour in hours" style="min-height:100px" :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
 							</div>
 							<div v-for="day in eventsPerDayAndHour" :key="day" class=" day border-start" :style="{'grid-template-columns': '1 1fr', 'grid-template-rows': 'repeat(' + (hours.length * 60 / smallestTimeFrame) + ', 1fr)'}">
-								<div  :style="{'background-color':event.orig.color}" :class="{'selectedEvent':event.orig == selectedEvent}" class="mx-2 small rounded overflow-hidden "  @click.prevent="eventClick(event)" :style="{'z-index':1,'grid-column-start': 1+(event.lane-1)*day.lanes/event.maxLane, 'grid-column-end': 1+event.lane*day.lanes/event.maxLane, 'grid-row-start': dateToMinutesOfDay(event.start), 'grid-row-end': dateToMinutesOfDay(event.end) ,'--test': dateToMinutesOfDay(event.end)}" v-for="event in day.events" :key="event">
-									<slot  name="dayPage" :event="event" :day="day">
-										<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
-									</slot>
+								<div  :style="{'background-color':event.orig.color}" :class="{'selectedEvent':event.orig == selectedEvent}" class="mx-2 small rounded overflow-hidden " :style="{'z-index':1,'grid-column-start': 1+(event.lane-1)*day.lanes/event.maxLane, 'grid-column-end': 1+event.lane*day.lanes/event.maxLane, 'grid-row-start': dateToMinutesOfDay(event.start), 'grid-row-end': dateToMinutesOfDay(event.end) ,'--test': dateToMinutesOfDay(event.end)}" v-for="event in day.events" :key="event">
+									<!-- desktop version opens the lvMenu next to the calendar -->
+									<div class="d-none d-xl-block h-100 "  @click.prevent="eventClick(event)">
+										<slot  name="dayPage" :event="event" :day="day">
+											<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
+										</slot>
+									</div>
+									<!-- mobile version opens the lvModal in a modal -->
+									<div class="d-block d-xl-none h-100" @click.prevent="showModal(event)">
+										<slot  name="dayPage" :event="event" :day="day">
+											<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
+										</slot>
+									</div>
+
 								</div>
 							</div>
 						</div>
@@ -225,7 +267,7 @@ export default {
 			</div>
 			<div class="d-none d-xl-block col-xl-6 p-0">
 				<div class="p-5	 sticky-top d-flex justify-content-center align-items-center flex-column">
-					<div style="max-height: calc(var(--fhc-calendar-pane-height) - 100px); overflow-y:auto;">
+					<div style="max-height: calc(var(--fhc-calendar-pane-height) - 100px); overflow-y:auto;" class="w-100">
 						<template v-if="selectedEvent && lvMenu">
 							<h3 >{{$p.t('lvinfo','lehrveranstaltungsinformationen')}}</h3>
 							<div class="w-100">
@@ -238,7 +280,7 @@ export default {
 							<h3>Keine Lehrveranstaltungen</h3>
 						</template>
 						<template v-else>
-							<div class="d-flex h-100 justify-content-center align-items-center">
+							<div style="height: calc(var(--fhc-calendar-pane-height) - 100px);" class="d-flex w-100 justify-content-center align-items-center">
 								<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
 							</div>
 						</template>
diff --git a/public/js/components/Calendar/Month/Page.js b/public/js/components/Calendar/Month/Page.js
index e919f177b..cae15b0d4 100644
--- a/public/js/components/Calendar/Month/Page.js
+++ b/public/js/components/Calendar/Month/Page.js
@@ -63,10 +63,6 @@ export default {
 				this.$emit('updateMode', 'week');
 			}
 		},
-		changeToDay(day) {
-			this.focusDate.set(day);
-			this.$emit('updateMode', 'day');			
-		},
 		highlight(week, day){
 			this.highlightedWeek = week.no; 
 			this.highlightedDay = day;
@@ -77,7 +73,8 @@ export default {
 		clickEvent(day,week) {
 			if(!this.noWeekView)
 			{
-				this.changeToDay(day);
+				this.focusDate.set(day);
+				this.$emit('updateMode', 'day');
 			}
 			this.selectDay(day);
 		}
diff --git a/public/js/components/Calendar/Pane.js b/public/js/components/Calendar/Pane.js
index a8ff5e30e..65eb807d5 100644
--- a/public/js/components/Calendar/Pane.js
+++ b/public/js/components/Calendar/Pane.js
@@ -10,6 +10,7 @@ export default {
 			slideAnimation:false,
 			scrollTop:null,
 			clientHeight:null,
+			carouselItems:null,
 		}
 	},
 	provide() {
@@ -22,7 +23,19 @@ export default {
 	computed: {
 		offsets() {
 			return [...Array(3).keys()].map(i => (3+i-this.offset)%3-1);
+		},
+		activeCarouselItemIndex() {
+			if (Array.isArray(this.carouselItems) && this.carouselItems.length > 0) {
+				for(let index=0; index < this.carouselItems.length; index++){
+					if (this.carouselItems[index] == true){
+						return index;
+					}
+				}
+
+			}
+			return -1;
 		}
+		
 	},
 	methods: {
 		scrollCalendar(event){
@@ -48,6 +61,7 @@ export default {
 				else
 					this.carousel.prev();
 			}
+			this.carouselItems = this.$refs.carouselItems.map((item) => { return item.classList.contains('active') });
 			this.slideAnimation = false;
 		},
 		slide(evt) {
@@ -61,6 +75,7 @@ export default {
 				interval: false
 			});
 		}
+		this.carouselItems = this.$refs.carouselItems.map((item)=>{return item.classList.contains('active')});
 		this.scrollTop = this.$refs.calendarContainer.scrollTop;
 		this.clientHeight = this.$refs.calendarContainer.clientHeight;
 	},
@@ -68,8 +83,8 @@ export default {
 	<div ref="carousel" class="calendar-pane carousel slide" @[\`slide.bs.carousel\`]="slide" @[\`slid.bs.carousel\`]="slid" :data-queue="queue">
 		<!--height calc function just for user testing purpose (has to be fixed)-->
 		<div @scroll="scrollCalendar" ref="calendarContainer" class="carousel-inner " style="height:var(--fhc-calendar-pane-height); overflow:scroll">
-			<div v-for="i in [...Array(3).keys()]" :key="i" class="carousel-item">
-				<slot :index="i" :offset="offsets[i]" />
+			<div ref="carouselItems" v-for="i in [...Array(3).keys()]" :key="i" class="carousel-item">
+				<slot :active="i == activeCarouselItemIndex" :index="i" :offset="offsets[i]" />
 			</div>
 		</div>
 	</div>`
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index d9cfb0984..2288984f2 100644
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -141,9 +141,10 @@ export default {
 		dateToMinutesOfDay(day) {
 			return Math.floor(((day.getHours()-7) * 60 + day.getMinutes()) / this.smallestTimeFrame) + 1;
 		},
-		weekPageClick(event) {
+		weekPageClick(event, day) {
 			this.setSelectedEvent(event);
-			$emit('input', event)
+			this.focusDate.set(new CalendarDate(new Date(event.datum)));
+			this.$emit('input', event)
 		}
 	},
 	mounted() {
@@ -170,7 +171,7 @@ export default {
 						<div v-for="hour in hours" style="min-height:100px" :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
 					</div>
 					<div v-for="day in eventsPerDayAndHour" :key="day" class=" day border-start" :style="{'grid-template-columns': 'repeat(' + day.lanes + ', 1fr)', 'grid-template-rows': 'repeat(' + (hours.length * 60 / smallestTimeFrame) + ', 1fr)'}">
-						<div  :style="{'background-color':event.orig.color}" class="mx-2 small rounded overflow-hidden "  @click.prevent="weekPageClick(event.orig)" :style="{'z-index':1,'grid-column-start': 1+(event.lane-1)*day.lanes/event.maxLane, 'grid-column-end': 1+event.lane*day.lanes/event.maxLane, 'grid-row-start': dateToMinutesOfDay(event.start), 'grid-row-end': dateToMinutesOfDay(event.end) ,'--test': dateToMinutesOfDay(event.end)}" v-for="event in day.events" :key="event">
+						<div  :style="{'background-color':event.orig.color}" class="mx-2 small rounded overflow-hidden "  @click.prevent="weekPageClick(event.orig, day)" :style="{'z-index':1,'grid-column-start': 1+(event.lane-1)*day.lanes/event.maxLane, 'grid-column-end': 1+event.lane*day.lanes/event.maxLane, 'grid-row-start': dateToMinutesOfDay(event.start), 'grid-row-end': dateToMinutesOfDay(event.end) ,'--test': dateToMinutesOfDay(event.end)}" v-for="event in day.events" :key="event">
 							<slot  name="weekPage" :event="event" :day="day" :isSelected="event.orig == selectedEvent" >
 								<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
 							</slot>

From d6bdad27b2a61d3d48d90f3571de6ca8e6c289ea Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 19 Nov 2024 10:17:10 +0100
Subject: [PATCH 1421/1461] move room specific stuff to searchconfig, add
 renderif method to be able to render actions conditionally via config, remove
 additional prop selectedtypes

---
 application/views/templates/CISVUE-Header.php |  1 -
 public/js/apps/Cis.js                         | 49 ++++++++++-------
 public/js/components/Cis/Menu.js              |  2 +-
 public/js/components/searchbar/action.js      | 22 ++++++--
 public/js/components/searchbar/actions.js     | 13 ++++-
 public/js/components/searchbar/raum.js        |  9 ---
 public/js/components/searchbar/searchbar.js   | 55 ++++++-------------
 7 files changed, 74 insertions(+), 77 deletions(-)

diff --git a/application/views/templates/CISVUE-Header.php b/application/views/templates/CISVUE-Header.php
index 855d10b37..9b2b27ebf 100644
--- a/application/views/templates/CISVUE-Header.php
+++ b/application/views/templates/CISVUE-Header.php
@@ -36,7 +36,6 @@ if (!isset($menu)) {
 		logo-url="<?= base_url('/public/images/logo-300x160.png'); ?>" 
 		avatar-url="<?= site_url('Cis/Pub/bild/person/' . getAuthPersonId()); ?>" 
 		logout-url="<?= site_url('Cis/Auth/logout'); ?>"
-		:selectedtypes="selectedtypes"
 		:searchbaroptions="searchbaroptions" 
 		:searchfunction="searchfunction"
 		:menu="<?= htmlspecialchars(json_encode(array_values($menu)), ENT_QUOTES, 'UTF-8') ?>"
diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js
index e044c8ae4..fbb83ab57 100644
--- a/public/js/apps/Cis.js
+++ b/public/js/apps/Cis.js
@@ -13,12 +13,8 @@ const app = Vue.createApp({
     },
     data: function() {
         return {
-            selectedtypes:[
-                "mitarbeiter",
-                "raum",
-                "organisationunit"
-            ],
             searchbaroptions: {
+				cssclass: "",
                 types: [
                     "mitarbeiter",
                     "raum",
@@ -38,26 +34,41 @@ const app = Vue.createApp({
                     },
                     raum: {
                         defaultaction: {
-                            type: "function",
+                            type: "link",
                             action: function(data) { 
-                                alert('raum defaultaction ' + JSON.stringify(data));
+								const link= FHC_JS_DATA_STORAGE_OBJECT.app_root +
+									FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+									'/CisVue/Cms/content/' + data.content_id;
+								return link;
                             }
                         },
                         childactions: [
                             {
-								label: "Raumübersicht",
-                                icon: "fas fa-info-circle",
-                                type: "link",
-                                action: function(data) {
-                                    return data.infolink;
-                                }
-                            },
-                            {
-                                label: "Raumreservierung",
+                                label: "LV-Plan",
                                 icon: "fas fa-bookmark",
                                 type: "link",
                                 action: function(data) {
-                                    return data.booklink;
+									const link = FHC_JS_DATA_STORAGE_OBJECT.app_root +
+										FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+										'/CisVue/Cms/getRoomInformation/' + data.ort_kurzbz;
+									return link;
+                                }
+                            },
+                            {
+                                label: "Rauminformation",
+                                icon: "fas fa-info-circle",
+                                type: "link",
+                                renderif: function(data) {
+									if(data.content_id === "N/A"){
+										return false;
+									}
+									return true;
+                                },
+                                action: function(data) {
+									const link= FHC_JS_DATA_STORAGE_OBJECT.app_root +
+										FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+										'/CisVue/Cms/content/' + data.content_id;
+									return link;
                                 }
                             },
                         ]
@@ -79,10 +90,6 @@ const app = Vue.createApp({
         searchfunction: function(searchsettings) {
             return Vue.$fhcapi.Search.search(searchsettings);
         },
-        updatesearchtypes: function(newValues){
-           this.selectedtypes= newValues;
-            
-        },
     }
 });
 app.use(FhcApi);
diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js
index 8bb49a9bd..632967085 100644
--- a/public/js/components/Cis/Menu.js
+++ b/public/js/components/Cis/Menu.js
@@ -123,7 +123,7 @@ export default {
 	<button id="nav-main-btn" class="navbar-toggler" type="button" data-bs-toggle="offcanvas" data-bs-target="#nav-main" aria-controls="nav-main" aria-expanded="false" aria-label="Toggle navigation">
         <span class="navbar-toggler-icon"></span>
     </button>
-	<fhc-searchbar @showSettings="toggleCollapsibles" ref="searchbar" id="nav-search" class="fhc-searchbar w-100" :searchoptions="searchbaroptions" :searchfunction="searchfunction" :selectedtypes="selectedtypes"></fhc-searchbar>
+	<fhc-searchbar @showSettings="toggleCollapsibles" ref="searchbar" id="nav-search" class="fhc-searchbar w-100" :searchoptions="searchbaroptions" :searchfunction="searchfunction"></fhc-searchbar>
     <a id="nav-logo" class="d-none d-lg-block" :href="rootUrl">
         <img :src="logoUrl" alt="Logo">
     </a>
diff --git a/public/js/components/searchbar/action.js b/public/js/components/searchbar/action.js
index 699d5f8c7..f4745a08e 100644
--- a/public/js/components/searchbar/action.js
+++ b/public/js/components/searchbar/action.js
@@ -13,10 +13,15 @@ export default {
     },
     emits: [ 'actionexecuted' ],
     template: `
-            <a :class="this.cssclass" :href="this.getactionhref()" 
-               @click="(this.action.type === 'function') ? this.execaction() : null">
-              <slot>Action</slot>
-            </a>
+		<template v-if="this.renderif()">
+			<a :class="this.cssclass" :href="this.getactionhref()"
+				@click="(this.action.type === 'function') ? this.execaction() : null">
+				<slot>Action</slot>
+			</a>
+		</template>
+		<template v-else>
+			<slot>Action</slot>
+		</template>
     `,
     methods: {
         getactionhref: function() {
@@ -26,6 +31,13 @@ export default {
         execaction: function() { 
             this.action.action(this.res);
             this.$emit('actionexecuted');
-        }
+        },
+		renderif: function() {
+			if(this.action?.renderif === undefined) {
+				return true;
+			}
+
+			return this.action.renderif(this.res);
+		}
     }
 };
\ No newline at end of file
diff --git a/public/js/components/searchbar/actions.js b/public/js/components/searchbar/actions.js
index ff9e25e12..0fd164cea 100644
--- a/public/js/components/searchbar/actions.js
+++ b/public/js/components/searchbar/actions.js
@@ -8,12 +8,14 @@ export default {
     emits: [ 'actionexecuted' ],
     template: `
         <ul class="searchbar_actions" v-if="this.actions.length > 0">
-          <li v-for="(action, index) in this.actions" :key="action.label">            
+		<template v-for="(action, index) in this.actions" :key="action.label">
+          <li v-if="this.renderif(action)">
             <action :res="this.res" :action="action" :cssclass="'btn btn-primary btn-sm'" @actionexecuted="$emit('actionexecuted')">
                 <i v-if="this.hasicon(index)" :class="this.geticonclass(index)"></i>
                 <span class="p-2">{{ action.label }}</span>
             </action>
           </li>
+		</template>
         </ul>
         <div class="mb-3" v-else=""></div>
     `,
@@ -23,6 +25,13 @@ export default {
         },
         geticonclass: function(index) {            
             return this.actions[index].icon;
-        }
+        },
+		renderif: function(action) {
+			if(action?.renderif === undefined) {
+				return true;
+			}
+
+			return action.renderif(this.res);
+		}
     }
 };
\ No newline at end of file
diff --git a/public/js/components/searchbar/raum.js b/public/js/components/searchbar/raum.js
index a1fc300fb..a0e0e464d 100644
--- a/public/js/components/searchbar/raum.js
+++ b/public/js/components/searchbar/raum.js
@@ -7,15 +7,6 @@ export default {
         action: action, 
         actions: actions
     },
-    created(){
-      //! this should be the default action for a raum
-      this.actions.defaultaction = {
-        type: "link",
-        action: function(data) { 
-            return FHC_JS_DATA_STORAGE_OBJECT.app_root+'cms/content.php?content_id='+data.content_id;
-        }
-      }; 
-    },
     emits: [ 'actionexecuted' ],
     template: /*html*/`
         <div class="searchbar_result searchbar_raum">
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index a828b2cfd..de408fa77 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -6,7 +6,7 @@ import student from "./student.js";
 import prestudent from "./prestudent.js";
 
 export default {
-    props: [ "searchoptions", "searchfunction","selectedtypes" ],
+    props: [ "searchoptions", "searchfunction" ],
     emits: ['showSettings'],
     data: function() {
       return {
@@ -33,7 +33,7 @@ export default {
       prestudent: prestudent
     },
     template: /*html*/`
-          <form ref="searchform" class="d-flex me-3" action="javascript:void(0);"
+          <form ref="searchform" class="d-flex me-3" :class="searchoptions.cssclass" action="javascript:void(0);"
             @focusin="this.searchfocusin" @focusout="this.searchfocusout">
 
             <div class="h-100 input-group me-2 bg-white">
@@ -55,9 +55,9 @@ export default {
                 <person v-if="res.type === 'person'" :res="res" :actions="this.searchoptions.actions.person" @actionexecuted="this.hideresult"></person>
                 <student v-else-if="res.type === 'student'" :res="res" :actions="this.searchoptions.actions.student" @actionexecuted="this.hideresult"></student>
                 <prestudent v-else-if="res.type === 'prestudent'" :res="res" :actions="this.searchoptions.actions.prestudent" @actionexecuted="this.hideresult"></prestudent>
-                <employee v-else-if="res.type === 'mitarbeiter'" :res="res" :actions="this.searchoptions.actions.employee" @actionexecuted="this.hideresult"></employee>
+                <employee v-else-if="res.type === 'mitarbeiter' || res.type === 'mitarbeiter_ohne_zuordnung'" :res="res" :actions="this.searchoptions.actions.employee" @actionexecuted="this.hideresult"></employee>
                 <organisationunit v-else-if="res.type === 'organisationunit'" :res="res" :actions="this.searchoptions.actions.organisationunit" @actionexecuted="this.hideresult"></organisationunit>
-                <raum v-else-if="res.type === 'raum'" :res="res" :actions="getActionsForRoom(res)" @actionexecuted="this.hideresult"></raum>
+                <raum v-else-if="res.type === 'raum'" :res="res" :actions="this.searchoptions.actions.raum" @actionexecuted="this.hideresult"></raum>
                 <div v-else="">Unbekannter Ergebnistyp: '{{ res.type }}'.</div>
               </template>
             </div>
@@ -78,7 +78,7 @@ export default {
           </form>
     `,
     watch:{
-        'searchsettings.types'(newValue){
+        'searchsettings.types': function (newValue){
             this.search();
         },
     },
@@ -92,36 +92,10 @@ export default {
 		});
 	},
     methods: {
-        getActionsForRoom: function(res){
-            res.booklink= FHC_JS_DATA_STORAGE_OBJECT.app_root +
-            FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-            `/CisVue/Cms/getRoomInformation/${res.ort_kurzbz}`; 
-
-            if(res.content_id !=="N/A"){
-                res.infolink= FHC_JS_DATA_STORAGE_OBJECT.app_root +
-                FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-                `/CisVue/Cms/content/${res.content_id}`;
-            }
-
-            let child = this.searchoptions.actions.raum.childactions.filter((child)=>{
-                if(child.label =="Rauminformation" && res.content_id =="N/A"){
-                    return false;
-                }
-                return true;
-            });
-
-            let computedActions = {
-                childactions:child,
-                defaultaction:this.searchoptions.actions.raum.defaultaction
-            }
-            return computedActions;
-            
-            
-        },
         updateSearchOptions: function() {
             this.searchsettings.types = [];
-            for( const idx in this.selectedtypes ) {
-                this.searchsettings.types.push(this.selectedtypes[idx]);
+            for( const idx in this.searchoptions.types ) {
+                this.searchsettings.types.push(this.searchoptions.types[idx]);
             }
         },
         calcSearchResultExtent: function() {
@@ -135,7 +109,7 @@ export default {
             if( this.searchtimer !== null ) {
                 clearTimeout(this.searchtimer);
             }
-            if( this.searchsettings.searchstr.length >= 3 ) {
+            if( this.searchsettings.searchstr.length >= 2 ) {
                 this.calcSearchResultExtent();
                 this.searchtimer = setTimeout(
                     this.callsearchapi,
@@ -145,11 +119,16 @@ export default {
                 this.showresult = false;
             }
         },
-        callsearchapi: function() {            
+        callsearchapi: function() {
             this.error = null;
-            this.searchresult.splice(0,this.searchresult.length);
+            this.searchresult.splice(0, this.searchresult.length);
             this.searching = true;
-            this.showsearchresult();            
+            this.showsearchresult();
+			if(this.searchsettings.types.length === 0) {
+				this.error = 'Kein Ergebnistyp ausgewählt. Bitte mindestens einen Ergebnistyp auswählen.';
+				this.searching = false;
+				return;
+			}
             this.searchfunction(this.searchsettings)
             .then(response=>{
                 if( response.data?.error === 1 ) {
@@ -177,7 +156,7 @@ export default {
             window.removeEventListener('resize', this.calcSearchResultExtent);
         },
         showsearchresult: function() {
-            if( this.searchsettings.searchstr.length >= 3 ) {
+            if( this.searchsettings.searchstr.length >= 2 ) {
                 this.showresult = true;
                 window.addEventListener('resize', this.calcSearchResultExtent);
             }

From 46ef02b54d1fbeb4206c9c5cd15cb292a6376dbd Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 19 Nov 2024 10:33:39 +0100
Subject: [PATCH 1422/1461] deactivate drag mode when widget config modal is
 opened

---
 public/js/components/Dashboard/Item.js    | 12 ++++++++++--
 public/js/components/Dashboard/Section.js | 13 +++++++++++--
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index 31b8a5085..deb55ed2b 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -19,7 +19,9 @@ export default {
 		"change",
 		"remove",
 		"dragstart",
-		"resizestart"
+		"resizestart",
+		"configOpened",
+		"configClosed"
 	],
 	props: [
 		"id",
@@ -41,6 +43,12 @@ export default {
 		},
 	},
 	methods: {
+		handleShowBsModal() {
+			this.$emit('configOpened')
+		},
+		handleHideBsModal() {
+			this.$emit('configClosed')
+		},
 		mouseDown(e) {
 			this.target = e.target;
 		},
@@ -120,7 +128,7 @@ export default {
 		<component :is="component" v-model:shared-data="sharedData" :config="arguments" :width="width" :height="height" @setConfig="setConfig" @change="changeConfigManually"></component>
 		</div>
 		<div v-else class="card-body overflow-hidden text-center d-flex flex-column justify-content-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></div>
-		<bs-modal v-if="hasConfig" ref="config">
+		<bs-modal v-if="hasConfig" ref="config" @hideBsModal="handleHideBsModal" @showBsModal="handleShowBsModal">
 			<template v-slot:title>
 				{{ widget ? 'Config for ' + widget.setup.name : '' }}
 			</template>
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index c6769a373..3fbc40af6 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -26,6 +26,7 @@ export default {
 	],
 	data() {
 		return {
+			configOpened: false,
 			gridWidth: 1,
 			gridHeight: null,
 			editMode: this.adminMode
@@ -91,6 +92,12 @@ export default {
 		},
 	},
 	methods: {
+		handleConfigOpened() {
+			this.configOpened = true
+		},
+		handleConfigClosed() {
+			this.configOpened = false
+		},
 		checkResizeLimit(item, w, h) {
 			// NOTE(chris): widgets needs to be loaded for this to work
 			let widget = CachedWidgetLoader.getWidget(item.widget);
@@ -180,7 +187,7 @@ export default {
 			<span >{{$p.t('ui/section' + name)}}</span>
 			<button style="margin-left: 8px;" class="btn" @click="editMode = !editMode"><i class="fa-solid fa-gear"></i></button>
 		</h3>
-		<drop-grid v-model:cols="gridWidth" :items="items" :placeholders="items_placeholders" :active="editMode" :resize-limit="checkResizeLimit" :margin-for-extra-row=".01" @rearrange-items="updatePositions" @gridHeight="gridHeight=$event" >
+		<drop-grid v-model:cols="gridWidth" :items="items" :placeholders="items_placeholders" :active="editMode && !configOpened" :resize-limit="checkResizeLimit" :margin-for-extra-row=".01" @rearrange-items="updatePositions" @gridHeight="gridHeight=$event" >
 			<template #default="item" #default>
 				
 				<dashboard-item v-if="!item.placeholder"
@@ -193,7 +200,9 @@ export default {
 					:hidden="item.hidden"
 					:editMode="editMode"
 					@change="saveConfig($event, item)"
-					@remove="removeWidget(item, $event)">
+					@remove="removeWidget(item, $event)"
+					@config-opened="handleConfigOpened"
+					@config-closed="handleConfigClosed">
 				</dashboard-item>
 				<div v-else class="empty-tile-hover" @click="$emit('widgetAdd', name, { widget: 1, config: {}, place: {[gridWidth]: {x:item.x,y:item.y,w:1,h:1}}, custom: 1 })"></div>
 				

From 5d5b2e5bc4b36519426f1ee10309fa760d3a7922 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 19 Nov 2024 11:35:20 +0100
Subject: [PATCH 1423/1461] fix(FHCAPI_Controller): adjusts the php doc types
 of parameters

---
 application/core/FHCAPI_Controller.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/core/FHCAPI_Controller.php b/application/core/FHCAPI_Controller.php
index c843e2de6..c1e57a0f2 100644
--- a/application/core/FHCAPI_Controller.php
+++ b/application/core/FHCAPI_Controller.php
@@ -197,7 +197,7 @@ class FHCAPI_Controller extends Auth_Controller
 	}
 
 	/**
-	 * @param array					$error
+	 * @param string|array|object					$error
 	 * @param string				$type (optional)
 	 * @param integer				$status (optional)
 	 * @return void
@@ -213,7 +213,7 @@ class FHCAPI_Controller extends Auth_Controller
 	/**
 	 * @param stdclass				$result
 	 * @param string				$errortype
-	 * @return void
+	 * @return mixed
 	 */
 	protected function getDataOrTerminateWithError($result, $errortype = self::ERROR_TYPE_GENERAL)
 	{

From 3cb9e5b4f8231514daf5b15a28687c65c694753e Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 19 Nov 2024 12:38:32 +0100
Subject: [PATCH 1424/1461] stpl widget title & show no LVA found on empty
 days; limit news widget content img max-width by css class;

---
 public/css/components/dashboard/news.css      |  5 +++++
 public/js/components/DashboardWidget/News.js  |  8 +++-----
 .../components/DashboardWidget/Stundenplan.js |  7 ++++++-
 system/phrasesupdate.php                      | 20 +++++++++++++++++++
 4 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/public/css/components/dashboard/news.css b/public/css/components/dashboard/news.css
index bb3bd0d62..366542969 100644
--- a/public/css/components/dashboard/news.css
+++ b/public/css/components/dashboard/news.css
@@ -17,6 +17,11 @@
     height: 100%;
 }
 
+.widgets-news img
+{
+    max-width: 100%;
+}
+
 .widgets-news .card-body{
     overflow: hidden;
 }
\ No newline at end of file
diff --git a/public/js/components/DashboardWidget/News.js b/public/js/components/DashboardWidget/News.js
index d0645c95a..58d6f7193 100644
--- a/public/js/components/DashboardWidget/News.js
+++ b/public/js/components/DashboardWidget/News.js
@@ -87,12 +87,10 @@ export default {
             
           </div>
  		</div>
-       <div v-else class="h-100" :class="'row row-cols-' + width">
+      <div v-else class="h-100" :class="'row row-cols-' + width">
         <div class="h-100" v-for="news in newsList" :key="news.id">
-            
-              <div class="news-content h-100" :style="'--news-widget-height: '+height" ref="htmlContent" v-html="news.content_obj.content"></div>
-            
-          </div>
+          <div class="news-content h-100" :style="'--news-widget-height: '+height" ref="htmlContent" v-html="news.content_obj.content"></div>
+        </div>
       </div>
 </div>
 </div>`,
diff --git a/public/js/components/DashboardWidget/Stundenplan.js b/public/js/components/DashboardWidget/Stundenplan.js
index 50e15572a..cedbbbf4c 100644
--- a/public/js/components/DashboardWidget/Stundenplan.js
+++ b/public/js/components/DashboardWidget/Stundenplan.js
@@ -34,6 +34,7 @@ export default {
 			const currentCalendarDate = new CalendarDate(this.currentDay)
 			const mapArr = currentCalendarDate.nextSevenDays.map((d) => [new CalendarDate(d), []])
 
+			// return map of key => calendar date of next 7 days & values the respective events on that date
 			return new Map((this.events || []).filter(evt => evt.start >= this.currentDay).reduce((acc, cur) => {
 				const date = new CalendarDate(new Date(cur.datum))
 				const arr = acc.find(el => el[0].compare(date))
@@ -188,6 +189,7 @@ export default {
 	<div class="dashboard-widget-stundenplan d-flex flex-column h-100">
 		<lv-modal v-if="selectedEvent" ref="lvmodal" :event="selectedEvent"  />
 		<content-modal :contentID="roomInfoContentID" :ort_kurzbz="" dialogClass="modal-lg" ref="contentModal"/>
+		<header><b>{{ $p.t('lehre/stundenplan') }}</b></header>
 		<fhc-calendar @change:range="updateRange" :initial-date="currentDay" class="border-0" class-header="p-0" @select:day="selectDay" v-model:minimized="minimized" :events="events" no-week-view :show-weeks="false" >
 			<template #minimizedPage >
 				<div class="flex-grow-1" style="overflow-y: auto; overflow-x: hidden">
@@ -201,12 +203,15 @@ export default {
 						<div role="button" @click="showLvUebersicht(evt)" v-for="evt in value" :key="evt.id" class="list-group-item small" :style="getEventStyle(evt)">
 							<b>{{evt.topic}}</b>
 							<br>
-							<small class="d-flex w-100 justify-content-between">
+							<small v-if="evt.ort_kurzbz" class="d-flex w-100 justify-content-between">
 								<!-- event modifier stop to prevent opening the modal for the lv Uebersicht when clicking on the ort_kurzbz -->
 								<span @click.stop="showRoomInfoModal(evt.ort_kurzbz)" style="text-decoration:underline" type="button">{{evt.ort_kurzbz}}</span>
 								<span>{{evt.start.toLocaleTimeString(undefined, {hour:'numeric',minute:'numeric'})}}-{{evt.end.toLocaleTimeString(undefined, {hour:'numeric',minute:'numeric'})}}</span>
 							</small>
 						</div>
+						<div v-if="!value.length" class="list-group-item small text-center">
+							{{ p.t('lehre/noLvFound') }}
+						</div>
 					</template>
 					<div v-else class="d-flex h-100 justify-content-center align-items-center fst-italic text-center">
 						{{ p.t('lehre/noLvFound') }}
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 5d08f0e96..8e66bd17e 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -37116,6 +37116,26 @@ array(
 				'insertvon' => 'system'
 			)
 		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'stundenplan',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Stundenplan',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Timetable',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
 	)
 // CIS4 phrases from legacy code end
 );

From 8d01995722a94358aababf971ca99361a820ac31 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 19 Nov 2024 12:51:12 +0100
Subject: [PATCH 1425/1461] refactor(Studenplan Query):queries all
 studiensemester from start_date to end_date and matches the gruppen and
 studentlehrverbaende to the associated studiensemester in the query

---
 .../api/frontend/v1/Stundenplan.php           | 187 ++++++++++++------
 .../organisation/Studiensemester_model.php    |  15 ++
 .../models/ressource/Stundenplan_model.php    |  78 +++++---
 3 files changed, 195 insertions(+), 85 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index daef2ab1a..373e5a9f9 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -107,10 +107,13 @@ class Stundenplan extends FHCAPI_Controller
 	 * @access public
 	 *
 	 */
+	//TODO: getStundenplan fuer Mitarbeiter anpassen
 	public function getStundenplan(){
 
-		// Query fuer Studenten MVP
-		//TODO: getStundenplan fuer Mitarbeiter anpassen
+		$this->load->model('ressource/Mitarbeiter_model','MitarbeiterModel');
+		$this->load->model('organisation/Studiensemester_model','StudiensemesterModel');
+		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
+		$this->load->model('person/Benutzergruppe_model','BenutzergruppeModel');
 
 		// form validation
 		$this->load->library('form_validation');
@@ -124,9 +127,9 @@ class Stundenplan extends FHCAPI_Controller
 		$start_date = $this->input->get('start_date', TRUE);
 		$end_date = $this->input->get('end_date', TRUE);
 
-		$student_uid = getAuthUID();
+ 		$student_uid = getAuthUID();
+
 		// check if authUID is mitarbeiter
-		$this->load->model('ressource/Mitarbeiter_model','MitarbeiterModel');
 		$is_mitarbeiter = getData($this->MitarbeiterModel->isMitarbeiter($student_uid));
 		if($is_mitarbeiter)
 		{
@@ -137,73 +140,95 @@ class Stundenplan extends FHCAPI_Controller
 			$this->terminateWithError("No UID");
 		}
 
-		//semester des Studenten ermitteln
-		$lvplan_load_ueber_semesterhaelfte = false;
-		if (defined('LVPLAN_LOAD_UEBER_SEMESTERHAELFTE') && LVPLAN_LOAD_UEBER_SEMESTERHAELFTE === true)
-			$lvplan_load_ueber_semesterhaelfte = true;
-		else
-			$lvplan_load_ueber_semesterhaelfte = false;
+		// gets all studiensemester from the student from start_date to end_date
+		$semester_range = $this->StudiensemesterModel->getByDate($start_date,$end_date);
+		$semester_range = array_map( 
+			function($sem)
+			{
+				return $sem->studiensemester_kurzbz;
+			},
+			$this->getDataOrTerminateWithError($semester_range)
+		);
 
-		$this->load->model('organisation/Studiensemester_model','StudiensemesterModel');
-		$aktuelle_studiensemester = $this->StudiensemesterModel->getNearest();
-		$aktuelle_studiensemester = $this->getDataOrTerminateWithError($aktuelle_studiensemester);
-		if (count($aktuelle_studiensemester) == 0) {
-			$this->terminateWithError("No aktuelles semester");
-		}
-		$aktuelle_studiensemester = current($aktuelle_studiensemester)->studiensemester_kurzbz;
-		if($lvplan_load_ueber_semesterhaelfte)
+		// if no studiensemester is found for the given timespan, get the nearest studiensemester
+		if(count($semester_range) == 0)
 		{
-			$next_studiensemester = $this->StudiensemesterModel->getNextFrom($aktuelle_studiensemester);
+			$aktuelle_studiensemester = $this->StudiensemesterModel->getNearest();
+			$aktuelle_studiensemester = $this->getDataOrTerminateWithError($aktuelle_studiensemester);
+			if (count($aktuelle_studiensemester) == 0) {
+				$this->terminateWithError("No aktuelles semester");
+			}
+			$aktuelle_studiensemester = current($aktuelle_studiensemester)->studiensemester_kurzbz;
+			// push aktuelles semester in active semester array
+			array_push($semester_range, $aktuelle_studiensemester);
+
+		}
+
+		
+		$this->sortStudienSemester($semester_range);
+
+		//semester des Studenten ermitteln
+		if (defined('LVPLAN_LOAD_UEBER_SEMESTERHAELFTE') && LVPLAN_LOAD_UEBER_SEMESTERHAELFTE === true)
+		{
+			// get next studiensemester
+			$next_studiensemester = $this->StudiensemesterModel->getNextFrom($semester_range[(count($semester_range)-1)]);
 			$next_studiensemester = $this->getDataOrTerminateWithError($next_studiensemester);
 			if(count($next_studiensemester) == 0)
 			{
 				$this->terminateWithError("No next semester");
 			}
 			$next_studiensemester = current($next_studiensemester)->studiensemester_kurzbz;
-			$previous_studiensemester = $this->StudiensemesterModel->getPreviousFrom($aktuelle_studiensemester);
+			//push next semester in active semester array
+			array_push($semester_range, $next_studiensemester);
+			$this->sortStudienSemester($semester_range);
+			
+			// get previous studiensemester
+			$previous_studiensemester = $this->StudiensemesterModel->getPreviousFrom($semester_range[0]);
 			$previous_studiensemester = $this->getDataOrTerminateWithError($previous_studiensemester);
 			if (count($previous_studiensemester) == 0) {
 				$this->terminateWithError("No previous semester");
 			}
 			$previous_studiensemester = current($previous_studiensemester)->studiensemester_kurzbz;
-		}
+			// push previous semester in active semester array
+			array_push($semester_range, $previous_studiensemester);
+			$this->sortStudienSemester($semester_range);
+		}	
 		else
 		{
-			$nearest_studiensemester = $this->StudiensemesterModel->getNearestFrom($aktuelle_studiensemester);
+			$nearest_studiensemester = $this->StudiensemesterModel->getNearestFrom($semester_range[(count($semester_range)-1)]);
 			$nearest_studiensemester = $this->getDataOrTerminateWithError($nearest_studiensemester);
 			if (count($nearest_studiensemester) == 0) {
 				$this->terminateWithError("No nearest semester");
 			}
 			$nearest_studiensemester = current($nearest_studiensemester)->studiensemester_kurzbz;
+			// push nearest semester in active semester array
+			array_push($semester_range, $nearest_studiensemester);
+			$this->sortStudienSemester($semester_range);
+
 		}
 
+
 		// getting the gruppen_kurzbz of the student in the different studiensemester
-		$this->load->model('person/Benutzergruppe_model','BenutzergruppeModel');
-		$benutzer_gruppen = null;
-		if ($lvplan_load_ueber_semesterhaelfte)
+		$benutzer_gruppen = [];
+		
+		foreach($semester_range as $semester)
 		{
-			$benutzer_gruppen = $this->BenutzergruppeModel->execReadOnlyQuery("
-			SELECT * FROM tbl_benutzergruppe where uid = ? AND studiensemester_kurzbz IN ?",[$student_uid, [$aktuelle_studiensemester, $next_studiensemester, $previous_studiensemester]]);
-			$benutzer_gruppen = $this->getDataOrTerminateWithError($benutzer_gruppen);
-			$benutzer_gruppen = array_map(function($item){ return "'".$item->gruppe_kurzbz. "'";}, $benutzer_gruppen);
-		}
-		else
-		{
-			$benutzer_gruppen = $this->BenutzergruppeModel->execReadOnlyQuery("
-			SELECT * FROM tbl_benutzergruppe where uid = ? AND studiensemester_kurzbz IN ?", [$student_uid, [$aktuelle_studiensemester,$nearest_studiensemester]]);
-			$benutzer_gruppen = $this->getDataOrTerminateWithError($benutzer_gruppen);
-			$benutzer_gruppen = array_map(function ($item) { return "'".$item->gruppe_kurzbz. "'";}, $benutzer_gruppen);
+			// for each active semester query the benutzer_gruppen associated to the semester
+			$benutzer_query = $this->BenutzergruppeModel->execReadOnlyQuery("
+			SELECT * FROM tbl_benutzergruppe where uid = ? AND studiensemester_kurzbz = ?",[$student_uid, $semester]);
+			$benutzer_query_result = $this->getDataOrTerminateWithError($benutzer_query);
+			$benutzer_gruppen[$semester] = array_map(function($item){ return "'".$item->gruppe_kurzbz. "'";}, $benutzer_query_result);
 		}
 
-		// getting the student_lehrverbaende of the student in the different studiensemester
-		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
-		$student_lehrverbaende = null;
-		if ($lvplan_load_ueber_semesterhaelfte)
+		$student_lehrverband = [];
+		
+		foreach($semester_range as $semester)
 		{
-			$student_lehrverbaende = $this->BenutzergruppeModel->execReadOnlyQuery("
-			SELECT * FROM tbl_studentlehrverband where student_uid = ? AND studiensemester_kurzbz IN ?", [$student_uid, [$aktuelle_studiensemester,$next_studiensemester, $previous_studiensemester]]);
-			$student_lehrverbaende = $this->getDataOrTerminateWithError($student_lehrverbaende);
-			$student_lehrverbaende = array_map(
+			// for each active semester query the student_lehrverband associated to the semester
+			$lehrverband_query = $this->BenutzergruppeModel->execReadOnlyQuery("
+			SELECT * FROM tbl_studentlehrverband where student_uid = ? AND studiensemester_kurzbz = ?", [$student_uid, $semester]);
+			$lehrverband_query_result = $this->getDataOrTerminateWithError($lehrverband_query);
+			$student_lehrverband[$semester] = array_map(
 				function ($item)
 				{
 					$result = new stdClass();
@@ -213,27 +238,19 @@ class Stundenplan extends FHCAPI_Controller
 					$result->gruppe = $item->gruppe;
 					return $result;
 				},
-				$student_lehrverbaende);
-		}
-		else
-		{
-			$student_lehrverbaende = $this->BenutzergruppeModel->execReadOnlyQuery("
-			SELECT * FROM tbl_studentlehrverband where student_uid = ? AND studiensemester_kurzbz IN ?", [$student_uid, [$aktuelle_studiensemester,$nearest_studiensemester]]);
-			$student_lehrverbaende = $this->getDataOrTerminateWithError($student_lehrverbaende);
-			$student_lehrverbaende = array_map(
-				function ($item) {
-					$result = new stdClass();
-					$result->studiengang_kz = $item->studiengang_kz;
-					$result->semester = $item->semester;
-					$result->verband = $item->verband;
-					$result->gruppe = $item->gruppe;
-					return $result;
-				},
-				$student_lehrverbaende
-			);
+				$lehrverband_query_result);
+
 		}
 
-		$stundenplan_data = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getStundenplanQuery($start_date, $end_date, $benutzer_gruppen, $student_lehrverbaende));
+		$studienSemesterDateRanges=[]; 
+		foreach($semester_range as $semester){
+			$semester_start_ende = $this->StudiensemesterModel->getStartEndeFromStudiensemester($semester);
+			$semester_start_ende = current($this->getDataOrTerminateWithError($semester_start_ende)); 
+			$studienSemesterDateRanges[$semester] = $semester_start_ende; 
+		}
+		$semester_range = $studienSemesterDateRanges;
+
+		$stundenplan_data = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getStundenplanQuery($start_date, $end_date, $semester_range, $benutzer_gruppen, $student_lehrverband));
 		$stundenplan_data = $this->getDataOrTerminateWithError($stundenplan_data) ?? [];
 
 		$this->expand_object_information($stundenplan_data);
@@ -274,6 +291,8 @@ class Stundenplan extends FHCAPI_Controller
 		$this->terminateWithSuccess($result);
 	}
 
+	// ################# Private Functions
+
 	private function expand_object_information($data){
 
 		foreach ($data as $item)
@@ -328,6 +347,48 @@ class Stundenplan extends FHCAPI_Controller
 		}
 	}
 
+	// function used to sort an array of studiensemester strings
+	private function sortStudienSemester(&$semester_range){
+		usort(
+			$semester_range,
+			function($first,$second)
+			{
+				$sem_first = null;
+				$year_first = null;
+				$match_first = null;
 
+				$sem_second = null;
+				$year_second = null;
+				$match_second = null;
+
+				preg_match('/([WS]+)([0-9]+)/',$first,$match_first);
+				preg_match('/([WS]+)([0-9]+)/',$second,$match_second);
+				
+				$sem_first = $match_first[1];
+				$year_first = intval($match_first[2]);
+
+				$sem_second = $match_second[1];
+				$year_second = intval($match_second[2]);
+
+				if($year_first < $year_second)
+				{
+					return -1;
+				}
+				else if($year_first > $year_second)
+				{
+					return 1;
+				}
+				else if($year_first == $year_second && $sem_first > $sem_second)
+				{
+					return 1;
+				}
+				else if($year_first == $year_second && $sem_first < $sem_second)
+				{
+					return -1;
+				}
+				return 0;
+			} 
+		);
+	}
 
 }
diff --git a/application/models/organisation/Studiensemester_model.php b/application/models/organisation/Studiensemester_model.php
index 0f8c3c620..291a010f9 100644
--- a/application/models/organisation/Studiensemester_model.php
+++ b/application/models/organisation/Studiensemester_model.php
@@ -272,4 +272,19 @@ class Studiensemester_model extends DB_Model
 		if (is_numeric($studienjahrNumber) && mb_substr($studiensemester_kurzbz, 0, 2) == 'SS') (int)$studienjahrNumber -= 1;
 		return $studienjahrNumber;
 	}
+
+	/**
+	 * Holt Start und Ende des Studiensemester_kurzbz
+	 * @param studiensemester_kurzbz
+	 * @return stdClass
+	 */
+	public function getStartEndeFromStudiensemester($studiensemester_kurzbz)
+	{
+		return $this->execReadOnlyQuery("
+		SELECT
+		start, ende
+		FROM public.tbl_studiensemester
+		WHERE studiensemester_kurzbz = ?",[$studiensemester_kurzbz]);
+
+	}
 }
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index d8821ed43..92d03b701 100644
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -192,43 +192,77 @@ class Stundenplan_model extends DB_Model
 	 *
 	 * @return string
 	 */
-	public function getStundenplanQuery($start_date, $end_date,$gruppen,$studentlehrverbaende){
-
+	public function getStundenplanQuery($start_date, $end_date,$semester,$gruppen,$studentlehrverbaende){
+		
+		// helper function to check if either $gruppen or $studentlehrverbaende are empty for each semester
+		$emptyCheck = function($toBeCheckedArray) use ($semester){
+			$result = true;
+			$sem = array_keys($semester);
+			foreach($sem as $s){
+				if(count($toBeCheckedArray[$s]) > 0){
+					$result = false;
+					break;
+				}
+			}
+			return $result;
+		};
+		
 		$query =
 		"select sp.*
 		from lehre.vw_stundenplan sp
 		WHERE
 		sp.datum >= ".$this->escape($start_date)."
 		AND sp.datum <= ".$this->escape($end_date);
-
-		if(count($gruppen) != 0 || count($studentlehrverbaende) != 0)
+		
+		// adds the AND sql chain only if both $gruppen and $studentlehrverbaende are not empty
+		if(!$emptyCheck($gruppen) || !$emptyCheck($studentlehrverbaende))
 		{
 			$query .= " AND ( ";
-		}
-
-		if(count($gruppen) != 0)
+		} 
+		
+		foreach($semester as $sem => $date_range)
 		{
-			$query .="sp.gruppe_kurzbz IN (".implode(',',$gruppen).")";
-		}
-
-		foreach($studentlehrverbaende as $key=>$lehrverband){
-			// only append OR if not first entry or previous condition was added
-			if(($key == 0 && count($gruppen) != 0) || ($key > 0))
+			if(count($gruppen[$sem]) > 0)
 			{
-				$query .= " OR ";
+				// converts the array of gruppen strings into a sql IN (_,_,_) chain
+				$query .="(sp.gruppe_kurzbz IN (" .implode(',',$gruppen[$sem]).") AND sp.datum BETWEEN ".$this->escape($date_range->start)." AND ".$this->escape($date_range->ende)." )";
+				
+				// adds the OR sql chain only if the $studentlehrverbaende array is not empty 
+				// DOES not include the sql OR if the $studentlehrverbaende are empty and it is the last gruppen element in the iteration 
+				if(key($semester) != $sem || !$emptyCheck($studentlehrverbaende))
+				{
+					$query .="OR";
+				}
+			}
+		}
+		
+		foreach($semester as $sem=>$date_range)
+		{
+
+			if(count($studentlehrverbaende[$sem]) > 0)
+			{
+				foreach($studentlehrverbaende[$sem] as $key=>$lehrverband)
+				{
+					// adds the OR sql chain only if its not the first element in the first semester of the $studentlehrverbaende array
+					if($lehrverband != $studentlehrverbaende[array_keys($semester)[0]][0])
+					{
+						$query .="OR";
+					}
+					$query .= "((sp.studiengang_kz = ".$this->escape($lehrverband->studiengang_kz)." AND sp.semester = ".$this->escape($lehrverband->semester)." AND sp.verband = ".$this->escape($lehrverband->verband)." AND sp.gruppe = ".$this->escape($lehrverband->gruppe)." AND sp.datum BETWEEN ".$this->escape($date_range->start)." AND ".$this->escape($date_range->ende).")";
+					// Eintraege fuer den ganzen Verband
+					$query .= "OR (sp.studiengang_kz = ".$this->escape($lehrverband->studiengang_kz)." AND sp.semester = ".$this->escape($lehrverband->semester)." AND sp.verband = ".$this->escape($lehrverband->verband)." AND (sp.gruppe is null OR sp.gruppe='') AND sp.datum BETWEEN ".$this->escape($date_range->start)." AND ".$this->escape($date_range->ende).")";
+					// Eintraege fuer das ganze Semester
+					$query .= "OR (sp.studiengang_kz = ".$this->escape($lehrverband->studiengang_kz)." AND sp.semester = ".$this->escape($lehrverband->semester)." AND (sp.verband is null OR sp.verband='') AND sp.datum BETWEEN ".$this->escape($date_range->start)." AND ".$this->escape($date_range->ende).") AND gruppe_kurzbz is null)";
+				}
+				
 			}
-			// Eintraege fuer die spezifische Gruppe
-			$query .= "(sp.studiengang_kz = ".$this->escape($lehrverband->studiengang_kz)." AND sp.semester = ".$this->escape($lehrverband->semester)." AND sp.verband = ".$this->escape($lehrverband->verband)." AND sp.gruppe = ".$this->escape($lehrverband->gruppe).")";
-			// Eintraege fuer den ganzen Verband
-			$query .= "OR (sp.studiengang_kz = ".$this->escape($lehrverband->studiengang_kz)." AND sp.semester = ".$this->escape($lehrverband->semester)." AND sp.verband = ".$this->escape($lehrverband->verband)." AND (sp.gruppe is null OR sp.gruppe=''))";
-			// Eintraege fuer das ganze Semester
-			$query .= "OR (sp.studiengang_kz = ".$this->escape($lehrverband->studiengang_kz)." AND sp.semester = ".$this->escape($lehrverband->semester)." AND (sp.verband is null OR sp.verband='')) AND gruppe_kurzbz is null";
 		}
 
-		if(count($gruppen) != 0 || count($studentlehrverbaende) != 0)
+		// closes the AND sql chain only if it was opened previously
+		if(!$emptyCheck($gruppen) || !$emptyCheck($studentlehrverbaende))
 		{
 			$query .= ")";
-		}
+		} 
 
 		return $query;
 	}

From f82c6694757ff71c30aabecc9f76e074538375b2 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 19 Nov 2024 13:35:06 +0100
Subject: [PATCH 1426/1461] provide/inject editModeIsActive from section.js ->
 currently used in bookmark widget to move redundant config modal into actual
 widget when said mode is on;

---
 public/js/components/Dashboard/Section.js   | 12 +++-
 public/js/components/DashboardWidget/Url.js | 62 +++++++++++----------
 2 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 3fbc40af6..10c2f8f4a 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -32,7 +32,17 @@ export default {
 			editMode: this.adminMode
 		}
 	},
+	provide() {
+		return {
+			editModeIsActive: Vue.computed(() =>
+				this.editModeIsActive
+			),		
+		}
+	},
 	computed: {
+		editModeIsActive() {
+			return this.editMode && !this.configOpened	
+		},
 		getSectionStyle() {
 			return 'margin-bottom: 8px;';
 		},
@@ -187,7 +197,7 @@ export default {
 			<span >{{$p.t('ui/section' + name)}}</span>
 			<button style="margin-left: 8px;" class="btn" @click="editMode = !editMode"><i class="fa-solid fa-gear"></i></button>
 		</h3>
-		<drop-grid v-model:cols="gridWidth" :items="items" :placeholders="items_placeholders" :active="editMode && !configOpened" :resize-limit="checkResizeLimit" :margin-for-extra-row=".01" @rearrange-items="updatePositions" @gridHeight="gridHeight=$event" >
+		<drop-grid v-model:cols="gridWidth" :items="items" :placeholders="items_placeholders" :active="editModeIsActive" :resize-limit="checkResizeLimit" :margin-for-extra-row=".01" @rearrange-items="updatePositions" @gridHeight="gridHeight=$event" >
 			<template #default="item" #default>
 				
 				<dashboard-item v-if="!item.placeholder"
diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index c3ad0c810..5cd4ba6a4 100644
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -1,7 +1,14 @@
 import AbstractWidget from './Abstract';
 
 export default {
-  name: "WidgetsUrl",
+	name: "WidgetsUrl", 
+	mixins: [AbstractWidget],
+	inject: {
+		editModeIsActive: {
+			type: Boolean,
+			default: false
+		}
+	},
   data: () => ({
     title_input: "",
     url_input: "",
@@ -10,7 +17,7 @@ export default {
 		invalidTitel:false,
 	}
   }),
-  mixins: [AbstractWidget],
+  
   computed: {
     tagName() {
       return this.config.tag !== undefined && this.config.tag.length > 0
@@ -97,16 +104,31 @@ export default {
   },
   created()
   {
-	  this.$emit('setConfig', true);
+	  // 
+	  // this.$emit('setConfig', true); -> use this to enable widget config mode if needed
   },
   template: /*html*/ `
     <div class="widgets-url w-100 h-100">
-        <div v-if="configMode">
-            <div class="mb-3">
-
-                <header><b>{{$p.t('bookmark','newLink')}}</b></header><br>
-                <div>
-  					<div class="form-group">
+        <div class="d-flex flex-column justify-content-between">
+        <!-- todo: widgetTag ?? -->
+            <template v-if="shared">
+                <header><b>{{ tagName }}</b></header>
+                <template v-if="!emptyBookmarks">
+                  <div v-for="link in shared" :key="link.id" class="d-flex mt-2">
+                      <a target="_blank" :href="link.url">
+					  	<i class="fa fa-solid fa-arrow-up-right-from-square"></i>
+						{{ link.title }}
+					  </a>
+                      <a class="ms-auto" href="#" @click.prevent="removeLink(link.bookmark_id)" v-show="configMode || editModeIsActive">
+					    <i class="fa fa-regular fa-trash-can" style="color: #e01b24;"></i>
+					  </a>
+                  </div>
+                </template>
+                <div v-else class="d-flex mt-2">
+                    <span>{{$p.t('bookmark','emptyBookmarks')}}</span>
+                </div>
+                <div v-if="editModeIsActive " class="mt-2">
+                	<div class="form-group">
 						<input maxlength="255" required class="form-control form-control-sm" :class="{'is-invalid':validation.invalidTitel}" placeholder="Titel" type="text" v-model="title_input" name="title" >
 						<!-- validation html for titel -->
 						<div class="invalid-feedback">
@@ -123,27 +145,7 @@ export default {
 					</div>
 
                     <button class="btn btn-outline-secondary btn-sm w-100 mt-2" @click="addLink" type="button">{{$p.t('bookmark','saveLink')}}</button>
-                </div>
-            </div>
-        </div>
-        <div class="d-flex flex-column justify-content-between">
-        <!-- todo: widgetTag ?? -->
-            <template v-if="shared">
-                <header><b>{{ tagName }}</b></header>
-                <template v-if="!emptyBookmarks">
-                  <div v-for="link in shared" :key="link.id" class="d-flex mt-2">
-                      <a target="_blank" :href="link.url">
-					  	<i class="fa fa-solid fa-arrow-up-right-from-square"></i>
-						{{ link.title }}
-					  </a>
-                      <a class="ms-auto" href="#" @click.prevent="removeLink(link.bookmark_id)" v-show="configMode">
-					    <i class="fa fa-regular fa-trash-can" style="color: #e01b24;"></i>
-					  </a>
-                  </div>
-                </template>
-                <div v-else class="d-flex mt-2">
-                    <span>{{$p.t('bookmark','emptyBookmarks')}}</span>
-                </div>
+				</div>
             </template>
             <template v-else>
                 <p v-for="i in 4" class="placeholder-glow">

From 4e4e8a0a5ca468a1d32608fb79bee4e0c61b903f Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 19 Nov 2024 16:16:46 +0100
Subject: [PATCH 1427/1461] improve responsive layout of search results

---
 public/css/Cis4/Cis.css                       | 41 +++++++++++
 public/css/components/searchbar/searchbar.css |  9 ++-
 public/js/apps/Cis.js                         | 12 +++-
 public/js/components/searchbar/employee.js    | 16 ++---
 .../components/searchbar/organisationunit.js  | 21 +++---
 public/js/components/searchbar/person.js      |  4 +-
 public/js/components/searchbar/prestudent.js  | 20 +++---
 public/js/components/searchbar/raum.js        | 16 ++---
 public/js/components/searchbar/searchbar.js   | 71 +++++++++++++------
 9 files changed, 144 insertions(+), 66 deletions(-)

diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index 380951b21..9306481b5 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -473,4 +473,45 @@ html {
 	transition-property: background,color;
 	transition-duration: 0.3s,0.2s;
 	transition-timing-function: ease-out,ease-out;
+}
+@media screen and ( max-width: 767px ) {
+	#nav-search  {
+		position: static;
+	}
+
+	#nav-search .searchbar_results {
+		top: 100%;
+		width: 98vw !important;
+		left: 1vw !important;
+		right: 1vw !important;
+	}
+}
+
+@media screen and ( max-width: 576px ) {
+	.searchbar_icon img {
+		max-width: 65px !important;
+	}
+
+	.searchbar_icon i {
+		font-size: 3em !important;
+	}
+
+	.searchbar_grid {
+		grid-template-columns: [icon] 75px [data] auto;
+	}
+
+	.searchbar_table,
+	.searchbar_tablerow,
+	.searchbar_tablecell {
+		display: block;
+	}
+
+	.searchbar_tablecell.searchbar_label {
+		font-weight: bold;
+	}
+
+	.searchbar_tablecell.searchbar_value {
+		padding-left: 2.5rem;
+		overflow-wrap: break-word;
+	}
 }
\ No newline at end of file
diff --git a/public/css/components/searchbar/searchbar.css b/public/css/components/searchbar/searchbar.css
index 5b718a90e..c272da310 100644
--- a/public/css/components/searchbar/searchbar.css
+++ b/public/css/components/searchbar/searchbar.css
@@ -21,14 +21,17 @@
     z-index: 9998; 
     background-color: #fff; 
     border: 1px solid lightgrey;
-    padding: 1rem;
-    overflow-y: auto;
+    padding: .5rem;
     top: 100%;
     width: 100%;
     left: 0;
     right: 0;
 }
 
+.searchbar_results_scroller {
+    overflow-y: auto;
+}
+
 .searchbar_result {
     border-bottom: 1px solid lightgrey;
     margin-bottom: 1rem;
@@ -104,4 +107,4 @@
     -webkit-user-select: none; /* Safari */
     -moz-user-select: none; /* Firefox */
     -ms-user-select: none; /* IE/Edge */
-  }
\ No newline at end of file
+  }
diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js
index fbb83ab57..92c1b9ec7 100644
--- a/public/js/apps/Cis.js
+++ b/public/js/apps/Cis.js
@@ -15,6 +15,7 @@ const app = Vue.createApp({
         return {
             searchbaroptions: {
 				cssclass: "",
+				calcheightonly: true,
                 types: [
                     "mitarbeiter",
                     "raum",
@@ -75,9 +76,16 @@ const app = Vue.createApp({
                     },
                     organisationunit: {
                         defaultaction: {
-                            type: "function",
+                            type: "link",
+							renderif: function(data) {
+								if(data.mailgroup) {
+									return true;
+								}
+								return false;
+							},
                             action: function(data) {
-                                alert('organisationunit defaultaction ' + JSON.stringify(data));
+                                const link = 'mailto:' + data.mailgroup;
+								return link;
                             }
                         },
                         childactions: []
diff --git a/public/js/components/searchbar/employee.js b/public/js/components/searchbar/employee.js
index afb947874..f1e6a67f6 100644
--- a/public/js/components/searchbar/employee.js
+++ b/public/js/components/searchbar/employee.js
@@ -30,8 +30,8 @@ export default {
                 <div class="searchbar_table">
 
                   <div class="searchbar_tablerow">
-                    <div class="searchbar_tablecell">Standard-Kostenstelle</div>
-                    <div class="searchbar_tablecell">
+                    <div class="searchbar_tablecell searchbar_label">Standard-Kostenstelle</div>
+                    <div class="searchbar_tablecell searchbar_value">
                         <ul class="searchbar_inline_ul" v-if="res.standardkostenstelle.length > 0">
                           <li v-for="(stdkst, idx) in res.standardkostenstelle" :key="idx">{{ stdkst }}</li>
                         </ul>
@@ -40,8 +40,8 @@ export default {
                   </div>
 
                   <div class="searchbar_tablerow">
-                    <div class="searchbar_tablecell">Organisations-Einheit</div>
-                    <div class="searchbar_tablecell">
+                    <div class="searchbar_tablecell searchbar_label">Organisations-Einheit</div>
+                    <div class="searchbar_tablecell searchbar_value">
                         <ul class="searchbar_inline_ul" v-if="res.organisationunit_name.length > 0">
                           <li v-for="(oe, idx) in res.organisationunit_name" :key="idx">{{ oe }}</li>
                         </ul>
@@ -50,8 +50,8 @@ export default {
                   </div>
         
                   <div class="searchbar_tablerow">
-                    <div class="searchbar_tablecell">EMail</div>
-                    <div class="searchbar_tablecell">
+                    <div class="searchbar_tablecell searchbar_label">EMail</div>
+                    <div class="searchbar_tablecell searchbar_value">
                         <a :href="this.mailtourl">
                           {{ res.email }}
                         </a>
@@ -59,8 +59,8 @@ export default {
                   </div>
         
                   <div class="searchbar_tablerow">
-                    <div class="searchbar_tablecell">Telefon</div>
-                    <div class="searchbar_tablecell">
+                    <div class="searchbar_tablecell searchbar_label">Telefon</div>
+                    <div class="searchbar_tablecell searchbar_value">
                         <a :href="this.telurl">
                           {{ res.phone }}
                         </a>
diff --git a/public/js/components/searchbar/organisationunit.js b/public/js/components/searchbar/organisationunit.js
index e7b5861e8..09e2822a3 100644
--- a/public/js/components/searchbar/organisationunit.js
+++ b/public/js/components/searchbar/organisationunit.js
@@ -28,24 +28,25 @@ export default {
                 <div class="searchbar_table">
         
                   <div class="searchbar_tablerow">
-                    <div class="searchbar_tablecell">übergeordnete OrgEinheit</div>
-                    <div class="searchbar_tablecell">
+                    <div class="searchbar_tablecell searchbar_label">übergeordnete OrgEinheit</div>
+                    <div class="searchbar_tablecell searchbar_value">
                           {{ res.parentoe_name }}
                     </div>
                   </div>
         
                   <div class="searchbar_tablerow">
-                    <div class="searchbar_tablecell">Gruppen-EMail</div>
-                    <div class="searchbar_tablecell">
-                        <a :href="this.mailtourl">
+                    <div class="searchbar_tablecell searchbar_label">Gruppen-EMail</div>
+                    <div class="searchbar_tablecell searchbar_value">
+                        <a :href="this.mailtourl" v-if="res.mailgroup">
                           {{ res.mailgroup }}
                         </a>
+                        <span v-else>-</span>
                     </div>
                   </div>
         
                   <div class="searchbar_tablerow">
-                    <div class="searchbar_tablecell">Leiter</div>
-                    <div class="searchbar_tablecell">
+                    <div class="searchbar_tablecell searchbar_label">Leiter</div>
+                    <div class="searchbar_tablecell searchbar_value">
                         <ul class="searchbar_inline_ul" v-if="res.leaders.length > 0">
                           <li v-for="(leader, idx) in res.leaders" :key="idx">{{ leader.name }}</li>
                         </ul>
@@ -54,8 +55,8 @@ export default {
                   </div>        
         
                   <div class="searchbar_tablerow">
-                    <div class="searchbar_tablecell">Mitarbeiter-Anzahl</div>
-                    <div class="searchbar_tablecell">
+                    <div class="searchbar_tablecell searchbar_label">Mitarbeiter-Anzahl</div>
+                    <div class="searchbar_tablecell searchbar_value">
                         {{ res.number_of_people }}
                     </div>
                   </div>
@@ -64,7 +65,7 @@ export default {
         
                 <actions :res="this.res" :actions="this.actions.childactions" @actionexecuted="$emit('actionexecuted')"></actions>
         
-              </div>        
+              </div>
           </div>
           
         </div>
diff --git a/public/js/components/searchbar/person.js b/public/js/components/searchbar/person.js
index 4f267cbd4..eeb476149 100644
--- a/public/js/components/searchbar/person.js
+++ b/public/js/components/searchbar/person.js
@@ -29,8 +29,8 @@ export default {
         
                 <div class="searchbar_table">
                   <div class="searchbar_tablerow">
-                    <div class="searchbar_tablecell">EMail</div>
-                    <div class="searchbar_tablecell">
+                    <div class="searchbar_tablecell searchbar_label">EMail</div>
+                    <div class="searchbar_tablecell searchbar_value">
                         <a :href="this.mailtourl">
                           {{ res.mail }}
                         </a>
diff --git a/public/js/components/searchbar/prestudent.js b/public/js/components/searchbar/prestudent.js
index 0f7429075..99837fe4b 100644
--- a/public/js/components/searchbar/prestudent.js
+++ b/public/js/components/searchbar/prestudent.js
@@ -31,36 +31,36 @@ export default {
 					<div class="searchbar_table">
 		
 						<div class="searchbar_tablerow">
-							<div class="searchbar_tablecell">Prestudent_id</div>
-							<div class="searchbar_tablecell">
+							<div class="searchbar_tablecell searchbar_label">Prestudent_id</div>
+							<div class="searchbar_tablecell searchbar_value">
 								{{ res.prestudent_id }}
 							</div>
 						</div>
 		
 						<div class="searchbar_tablerow">
-							<div class="searchbar_tablecell">Student_uid</div>
-							<div class="searchbar_tablecell">
+							<div class="searchbar_tablecell searchbar_label">Student_uid</div>
+							<div class="searchbar_tablecell searchbar_value">
 								{{ res.uid }}
 							</div>
 						</div>
 		
 						<div class="searchbar_tablerow">
-							<div class="searchbar_tablecell">Person_id</div>
-							<div class="searchbar_tablecell">
+							<div class="searchbar_tablecell searchbar_label">Person_id</div>
+							<div class="searchbar_tablecell searchbar_value">
 								{{ res.person_id }}
 							</div>
 						</div>
 		
 						<div class="searchbar_tablerow">
-							<div class="searchbar_tablecell">Studiengang</div>
-							<div class="searchbar_tablecell">
+							<div class="searchbar_tablecell searchbar_label">Studiengang</div>
+							<div class="searchbar_tablecell searchbar_value">
 								{{ res.bezeichnung }}
 							</div>
 						</div>
 		
 						<div class="searchbar_tablerow">
-							<div class="searchbar_tablecell">EMail</div>
-							<div class="searchbar_tablecell">
+							<div class="searchbar_tablecell searchbar_label">EMail</div>
+							<div class="searchbar_tablecell searchbar_value">
 								<a :href="this.mailtourl">
 									{{ res.email }}
 								</a>
diff --git a/public/js/components/searchbar/raum.js b/public/js/components/searchbar/raum.js
index a0e0e464d..4a55b417a 100644
--- a/public/js/components/searchbar/raum.js
+++ b/public/js/components/searchbar/raum.js
@@ -25,20 +25,20 @@ export default {
         
               <div class="searchbar_table">
                 <div class="searchbar_tablerow">
-                  <div class="searchbar_tablecell">Standort</div>
-                  <div class="searchbar_tablecell">{{ res.standort }}</div>
+                  <div class="searchbar_tablecell searchbar_label">Standort</div>
+                  <div class="searchbar_tablecell searchbar_value">{{ res.standort }}</div>
                 </div>
                 <div class="searchbar_tablerow">
-                  <div class="searchbar_tablecell">Sitzplätze</div>
-                  <div class="searchbar_tablecell">{{ res.sitzplaetze }}</div>
+                  <div class="searchbar_tablecell searchbar_label">Sitzplätze</div>
+                  <div class="searchbar_tablecell searchbar_value">{{ res.sitzplaetze }}</div>
                 </div>
                 <div class="searchbar_tablerow">
-                  <div class="searchbar_tablecell">Gebäude</div>
-                  <div class="searchbar_tablecell">{{ res.building }}</div>
+                  <div class="searchbar_tablecell searchbar_label">Gebäude</div>
+                  <div class="searchbar_tablecell searchbar_value">{{ res.building }}</div>
                 </div>
                 <div class="searchbar_tablerow">
-                  <div class="searchbar_tablecell">Zusatz Informationen</div>
-                  <div class="searchbar_tablecell"><div v-html="res.austattung.replace('<br />','')"></div></div>
+                  <div class="searchbar_tablecell searchbar_label">Zusatz Informationen</div>
+                  <div class="searchbar_tablecell searchbar_value"><div v-html="res.austattung.replace('<br />','')"></div></div>
                 </div>
               </div>
         
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index de408fa77..a1e0af854 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -36,30 +36,33 @@ export default {
           <form ref="searchform" class="d-flex me-3" :class="searchoptions.cssclass" action="javascript:void(0);"
             @focusin="this.searchfocusin" @focusout="this.searchfocusout">
 
-            <div class="h-100 input-group me-2 bg-white">
-
-                <input ref="searchbox" @keyup="this.search" @focus="this.showsearchresult"
+            <div ref="searchbox" class="h-100 input-group me-2 bg-white">
+                <input @keyup="this.search" @focus="this.showsearchresult"
                     v-model="this.searchsettings.searchstr" class="form-control"
                     type="search" :placeholder="'Search: '+ searchsettings.types.join(' / ')" aria-label="Search">
                 <button data-bs-toggle="collapse" data-bs-target="#searchSettings" aria-expanded="false" aria-controls="searchSettings" ref="settingsbutton"  class="btn btn-outline-secondary" type="button" id="search-filter"><i class="fas fa-cog"></i></button>
             </div>
 
-            <div v-show="this.showresult" ref="result"
+            <div v-show="this.showresult"
                  class="searchbar_results" tabindex="-1">
-              <div v-if="this.searching">
-                <i class="fas fa-spinner fa-spin fa-2x"></i>
-              </div>
-              <div v-else-if="this.error !== null">{{ this.error }}</div>
-              <div v-else-if="searchresult.length < 1">Es wurden keine Ergebnisse gefunden.</div>
-              <template v-else="" v-for="res in searchresult">
-                <person v-if="res.type === 'person'" :res="res" :actions="this.searchoptions.actions.person" @actionexecuted="this.hideresult"></person>
-                <student v-else-if="res.type === 'student'" :res="res" :actions="this.searchoptions.actions.student" @actionexecuted="this.hideresult"></student>
-                <prestudent v-else-if="res.type === 'prestudent'" :res="res" :actions="this.searchoptions.actions.prestudent" @actionexecuted="this.hideresult"></prestudent>
-                <employee v-else-if="res.type === 'mitarbeiter' || res.type === 'mitarbeiter_ohne_zuordnung'" :res="res" :actions="this.searchoptions.actions.employee" @actionexecuted="this.hideresult"></employee>
-                <organisationunit v-else-if="res.type === 'organisationunit'" :res="res" :actions="this.searchoptions.actions.organisationunit" @actionexecuted="this.hideresult"></organisationunit>
-                <raum v-else-if="res.type === 'raum'" :res="res" :actions="this.searchoptions.actions.raum" @actionexecuted="this.hideresult"></raum>
-                <div v-else="">Unbekannter Ergebnistyp: '{{ res.type }}'.</div>
-              </template>
+              <div class="searchbar_results_scroller" ref="result">
+                <div class="searchbar_results_wrapper" ref="results">
+                  <div v-if="this.searching">
+                    <i class="fas fa-spinner fa-spin fa-2x"></i>
+                  </div>
+                  <div v-else-if="this.error !== null">{{ this.error }}</div>
+                  <div v-else-if="searchresult.length < 1">Es wurden keine Ergebnisse gefunden.</div>
+                  <template v-else="" v-for="res in searchresult">
+                    <person v-if="res.type === 'person'" :res="res" :actions="this.searchoptions.actions.person" @actionexecuted="this.hideresult"></person>
+                    <student v-else-if="res.type === 'student'" :res="res" :actions="this.searchoptions.actions.student" @actionexecuted="this.hideresult"></student>
+                    <prestudent v-else-if="res.type === 'prestudent'" :res="res" :actions="this.searchoptions.actions.prestudent" @actionexecuted="this.hideresult"></prestudent>
+                    <employee v-else-if="res.type === 'mitarbeiter' || res.type === 'mitarbeiter_ohne_zuordnung'" :res="res" :actions="this.searchoptions.actions.employee" @actionexecuted="this.hideresult"></employee>
+                    <organisationunit v-else-if="res.type === 'organisationunit'" :res="res" :actions="this.searchoptions.actions.organisationunit" @actionexecuted="this.hideresult"></organisationunit>
+                    <raum v-else-if="res.type === 'raum'" :res="res" :actions="this.searchoptions.actions.raum" @actionexecuted="this.hideresult"></raum>
+                    <div v-else="">Unbekannter Ergebnistyp: '{{ res.type }}'.</div>
+                  </template>
+                </div>
+              </duv>
             </div>
 
             <div id="searchSettings"  ref="settings"  @[\`show.bs.collapse\`]="$emit('showSettings','settings')"
@@ -91,6 +94,13 @@ export default {
 			toggle: false
 		});
 	},
+	updated() {
+		if(this.showresult) {
+			Vue.nextTick(() => {
+				this.calcSearchResultHeight();
+			});
+		}
+	},
     methods: {
         updateSearchOptions: function() {
             this.searchsettings.types = [];
@@ -98,12 +108,26 @@ export default {
                 this.searchsettings.types.push(this.searchoptions.types[idx]);
             }
         },
+		calcSearchResultHeight: function() {
+			const rect = this.$refs.results.getBoundingClientRect();
+			if( rect.height > 0 && rect.height < (window.innerHeight * 0.8) ) {
+				this.$refs.result.style.height = Math.ceil(rect.height) + 'px';
+			} else {
+				this.$refs.result.style.height = Math.floor(window.innerHeight * 0.8) + 'px';
+			}
+		},
         calcSearchResultExtent: function() {
-            var rect = this.$refs.searchbox.getBoundingClientRect();
-            this.$refs.result.style.top = Math.floor(rect.bottom + 3) + 'px';
-            this.$refs.result.style.right = Math.floor(window.innerWidth - rect.right) + 'px';
-            this.$refs.result.style.width = Math.floor(window.innerWidth * 0.75) + 'px';
-            this.$refs.result.style.height = Math.floor(window.innerHeight * 0.75) + 'px';
+			if(!this.showresult) {
+				return;
+			}
+			if(this.searchoptions?.calcheightonly === undefined 
+				|| this.searchoptions.calcheightonly === false) {
+				var rect = this.$refs.searchbox.getBoundingClientRect();
+				this.$refs.result.style.top = Math.floor(rect.bottom + 3) + 'px';
+				this.$refs.result.style.right = Math.floor(rect.right) + 'px';
+				this.$refs.result.style.width = Math.floor(rect.width) + 'px';
+			}
+            this.calcSearchResultHeight();
         },
         search: function() {
             if( this.searchtimer !== null ) {
@@ -159,6 +183,7 @@ export default {
             if( this.searchsettings.searchstr.length >= 2 ) {
                 this.showresult = true;
                 window.addEventListener('resize', this.calcSearchResultExtent);
+				this.calcSearchResultExtent();
             }
         },
         searchfocusin: function(e) {

From c32046002d1d6c58c02ccfc5fb167de97cc81f1b Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 19 Nov 2024 16:24:36 +0100
Subject: [PATCH 1428/1461] add buffer to height calculation

---
 public/js/components/searchbar/searchbar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index a1e0af854..caaccff4a 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -111,7 +111,7 @@ export default {
 		calcSearchResultHeight: function() {
 			const rect = this.$refs.results.getBoundingClientRect();
 			if( rect.height > 0 && rect.height < (window.innerHeight * 0.8) ) {
-				this.$refs.result.style.height = Math.ceil(rect.height) + 'px';
+				this.$refs.result.style.height = Math.ceil(rect.height + 16) + 'px';
 			} else {
 				this.$refs.result.style.height = Math.floor(window.innerHeight * 0.8) + 'px';
 			}

From d8af18673c341890163c9da7a35ef1c3e6f4bbd9 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 19 Nov 2024 17:07:05 +0100
Subject: [PATCH 1429/1461] always show card header of widgets as in editMode
 but enable certain tools only when actually in editMode. editMode is active
 for dashboard not for section; less paddings overall in dashboard; deleted
 Section headers and put cog besides personal greeting; reformatted name var
 for greeting into generic viewData property;

---
 application/controllers/Cis4.php              |  5 +++-
 application/controllers/CisVue/Dashboard.php  |  6 +++-
 application/views/CisVue/Dashboard.php        |  4 +--
 public/js/components/Calendar/Header.js       |  2 +-
 public/js/components/Dashboard/Dashboard.js   | 22 ++++++++++++---
 public/js/components/Dashboard/Item.js        | 14 +++++-----
 public/js/components/Dashboard/Section.js     | 15 ++++------
 public/js/components/DashboardWidget/Ampel.js |  2 +-
 public/js/components/DashboardWidget/News.js  | 28 ++++++++-----------
 .../components/DashboardWidget/Stundenplan.js |  1 -
 public/js/components/DashboardWidget/Url.js   |  3 +-
 public/js/components/Drop/Grid.js             |  2 +-
 system/phrasesupdate.php                      | 20 +++++++++++++
 13 files changed, 77 insertions(+), 47 deletions(-)

diff --git a/application/controllers/Cis4.php b/application/controllers/Cis4.php
index f82168f83..84aedc5f2 100644
--- a/application/controllers/Cis4.php
+++ b/application/controllers/Cis4.php
@@ -34,7 +34,10 @@ class Cis4 extends Auth_Controller
 			show_error("name couldn't be loaded for username ".getAuthUID());
 		}
 		$begruesung = getData($begruesung);
+		$viewData = array(
+			'name' => $begruesung
+		);
 
-		$this->load->view('CisVue/Dashboard.php',["name"=> $begruesung]);
+		$this->load->view('CisVue/Dashboard.php',['viewData' => $viewData]);
 	}
 }
\ No newline at end of file
diff --git a/application/controllers/CisVue/Dashboard.php b/application/controllers/CisVue/Dashboard.php
index 5a0996a96..5cb0d1a9e 100644
--- a/application/controllers/CisVue/Dashboard.php
+++ b/application/controllers/CisVue/Dashboard.php
@@ -35,7 +35,11 @@ class Dashboard extends Auth_Controller
 			show_error("name couldn't be loaded for username ".getAuthUID());
 		}
 		$begruesung = getData($begruesung);
-		$this->load->view('CisVue/Dashboard.php',["name"=> $begruesung]);
+		$viewData = array(
+			'name' => $begruesung
+		);
+		
+		$this->load->view('CisVue/Dashboard.php', ['viewData' => $viewData]);
 
 	}
 }
\ No newline at end of file
diff --git a/application/views/CisVue/Dashboard.php b/application/views/CisVue/Dashboard.php
index 4b10d94cc..2f241af87 100644
--- a/application/views/CisVue/Dashboard.php
+++ b/application/views/CisVue/Dashboard.php
@@ -13,9 +13,7 @@ $this->load->view('templates/CISVUE-Header', $includesArray);
 ?>
 
 <div id="content">
-	<h2>Hallo <?= $name?>!</h2>
-	<hr>
-	<fhc-dashboard dashboard="CIS"/>
+	<fhc-dashboard dashboard="CIS" view-data-string='<?php echo json_encode($viewData) ?>' />
 </div>
 
 <?php $this->load->view('templates/CISVUE-Footer', $includesArray); ?>
diff --git a/public/js/components/Calendar/Header.js b/public/js/components/Calendar/Header.js
index 8cb047919..a62d68f5c 100644
--- a/public/js/components/Calendar/Header.js
+++ b/public/js/components/Calendar/Header.js
@@ -48,7 +48,7 @@ export default {
 	template: /*html*/`
 	<div class="calendar-header card-header w-100" :class="classHeader">
 		<div class="row align-items-center ">
-			<div class="col offset-0 offset-md-3" :style="{'padding-left':headerPadding}">
+			<div class="col offset-0" :style="{'padding-left':headerPadding}">
 				<div class="row align-items-center justify-content-center">
 					<div class="col-auto ">
 						<button class="btn btn-outline-secondary border-0" :class="{'btn-sm':!this.size}" @click="$emit('prev')"><i class="fa fa-chevron-left"></i></button>
diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js
index 8bf1b9051..d96b20e16 100644
--- a/public/js/components/Dashboard/Dashboard.js
+++ b/public/js/components/Dashboard/Dashboard.js
@@ -9,11 +9,21 @@ export default {
 	},
 	props: [
 		"dashboard",
+		"viewDataString"
 	],
-	data: () => ({
-		sections: [],
-		widgets: null
-	}),
+	data() {
+		return {
+			sections: [],
+			widgets: null,
+			viewData: JSON.parse(this.viewDataString),
+			editMode: false
+		}
+	},
+	provide() {
+		return {
+			editMode: Vue.computed(()=>this.editMode),
+		}
+	},
 	computed: {
 		apiurl() {
 			return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/dashboard';
@@ -142,6 +152,10 @@ export default {
 	},
 	template: `
 	<div class="core-dashboard">
+		<h3>
+			{{ $p.t('global/personalGreeting', [ viewData?.name ]) }}
+			<button style="margin-left: 8px;" class="btn" @click="editMode = !editMode"><i class="fa-solid fa-gear"></i></button>
+		</h3>
 		<dashboard-section v-for="(section, index) in sections" :key="section.name" :seperator="index" :name="section.name" :widgets="section.widgets" @widgetAdd="widgetAdd" @widgetUpdate="widgetUpdate" @widgetRemove="widgetRemove"></dashboard-section>
 		<dashboard-widget-picker ref="widgetpicker" :widgets="widgets"></dashboard-widget-picker>
 	</div>`
diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index deb55ed2b..05f381b43 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -113,19 +113,19 @@ export default {
 		</div>
 	</div>
 	<div v-else-if="!hidden || editMode" class="dashboard-item card overflow-hidden h-100" :class="arguments && arguments.className ? arguments.className : ''">
-		<div v-if="editMode && widget" class="card-header d-flex ps-0 pe-2">
-			<span drag-action="move" class="col-auto mx-2 px-2 cursor-move"><i class="fa-solid fa-grip-vertical"></i></span>
-			<span class="col">{{ widget.setup.name }}</span>
+		<div v-if="widget" class="card-header d-flex ps-0 pe-2">
+			<span v-if="editMode" drag-action="move" class="col-auto mx-2 px-2 cursor-move"><i class="fa-solid fa-grip-vertical"></i></span>
+			<span class="col mx-2 px-2">{{ widget.setup.name }}</span>
 			<a v-if="hasConfig" class="col-auto px-1" href="#" @click.prevent="openConfig"><i class="fa-solid fa-gear"></i></a>
-			<a v-if="custom" class="col-auto px-1" href="#" @click.prevent="$emit('remove')">
+			<a v-if="custom && editMode" class="col-auto px-1" href="#" @click.prevent="$emit('remove')">
 				<i class="fa-solid fa-trash"></i>
 			</a>
-			<div v-else class="col-auto px-1 form-switch">
+			<div v-else-if="editMode" class="col-auto px-1 form-switch">
 				<input class="form-check-input ms-0" type="checkbox" role="switch" id="flexSwitchCheckChecked" :checked="!hidden" @input="$emit('remove', hidden)">
 			</div>
 		</div>
-		<div v-if="ready" class="card-body overflow-hidden">
-		<component :is="component" v-model:shared-data="sharedData" :config="arguments" :width="width" :height="height" @setConfig="setConfig" @change="changeConfigManually"></component>
+		<div v-if="ready" class="card-body overflow-hidden" style="padding: 0px;">
+			<component :is="component" v-model:shared-data="sharedData" :config="arguments" :width="width" :height="height" @setConfig="setConfig" @change="changeConfigManually"></component>
 		</div>
 		<div v-else class="card-body overflow-hidden text-center d-flex flex-column justify-content-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></div>
 		<bs-modal v-if="hasConfig" ref="config" @hideBsModal="handleHideBsModal" @showBsModal="handleShowBsModal">
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 10c2f8f4a..d4ecf9244 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -12,12 +12,15 @@ export default {
 		adminMode: {
 			type: Boolean,
 			default: false
+		},
+		editMode: {
+			type: Boolean,
+			default: false
 		}
 	},
 	props: [
 		"name",
-		"widgets",
-		"seperator"
+		"widgets"
 	],
 	emits: [
 		"widgetAdd",
@@ -29,7 +32,6 @@ export default {
 			configOpened: false,
 			gridWidth: 1,
 			gridHeight: null,
-			editMode: this.adminMode
 		}
 	},
 	provide() {
@@ -41,7 +43,7 @@ export default {
 	},
 	computed: {
 		editModeIsActive() {
-			return this.editMode && !this.configOpened	
+			return (this.editMode || this.adminMode) && !this.configOpened	
 		},
 		getSectionStyle() {
 			return 'margin-bottom: 8px;';
@@ -191,12 +193,7 @@ export default {
 		});
 	},
 	template: `
-	<div v-if="seperator" class="fhc-seperator"/>
 	<div class="dashboard-section" ref="container" :style="getSectionStyle">
-		<h3>
-			<span >{{$p.t('ui/section' + name)}}</span>
-			<button style="margin-left: 8px;" class="btn" @click="editMode = !editMode"><i class="fa-solid fa-gear"></i></button>
-		</h3>
 		<drop-grid v-model:cols="gridWidth" :items="items" :placeholders="items_placeholders" :active="editModeIsActive" :resize-limit="checkResizeLimit" :margin-for-extra-row=".01" @rearrange-items="updatePositions" @gridHeight="gridHeight=$event" >
 			<template #default="item" #default>
 				
diff --git a/public/js/components/DashboardWidget/Ampel.js b/public/js/components/DashboardWidget/Ampel.js
index d7cc60850..4cb49ce94 100644
--- a/public/js/components/DashboardWidget/Ampel.js
+++ b/public/js/components/DashboardWidget/Ampel.js
@@ -121,7 +121,7 @@ export default {
 		}
 	},
 	template: /*html*/`
-	<div class="widgets-ampel w-100 h-100">
+	<div class="widgets-ampel w-100 h-100" style="padding: 1rem 1rem;">
 		<div  v-if="!configMode">
 			<div v-if="activeAmpeln" class="d-flex flex-column justify-content-between">
 				<div class="d-flex">
diff --git a/public/js/components/DashboardWidget/News.js b/public/js/components/DashboardWidget/News.js
index 58d6f7193..cf32f8328 100644
--- a/public/js/components/DashboardWidget/News.js
+++ b/public/js/components/DashboardWidget/News.js
@@ -11,6 +11,9 @@ export default {
   }),
   mixins: [AbstractWidget],
   computed: {
+    getNewsWidgetStyle() {
+      return this.width == 1 ? "padding: 1rem 1rem;" : "padding: 0px;"
+    },
     newsList() {
       //Return news amount depending on widget width and size
       let quantity = this.width;
@@ -61,33 +64,26 @@ export default {
       this.$refs.newsModal.show();
     },
   },
-  template: /*html*/ `<div class="widgets-news h-100">
+  template: /*html*/ `<div class="widgets-news h-100" :style="getNewsWidgetStyle">
   
       <div class="d-flex flex-column h-100 ">
       <div class="d-flex">
-        <header><b>{{$p.t('news','topNews')}}</b></header>
         <a :href="allNewsURI()" class="ms-auto mb-2">
           <i class="fa fa-arrow-up-right-from-square me-1"></i>{{$p.t('news','allNews')}}</a>
       </div>
       <div class="h-100" style="overflow-y: auto" v-if="width == 1">
-        <div  v-for="news in newsList" :key="news.id" class="mt-2">
-          <div  class="card">
-            <div class="card-body">
-              <a :href="contentURI(news.content_id)" class="stretched-link" >{{ news.content_obj.betreff?news.content_obj.betreff:getDate(news.insertamum) }}</a><br>
-              <span class="small text-muted">{{ formatDateTime(news.insertamum) }}</span>
-            </div>
-          </div>
+        <div  v-for="(news, index) in newsList" :key="news.id" class="mt-2">
+          <div v-if="index > 0 " class="fhc-seperator"></div>
+          <a :href="contentURI(news.content_id)" >{{ news.content_obj.betreff?news.content_obj.betreff:getDate(news.insertamum) }}</a><br>
+          <span class="small text-muted">{{ formatDateTime(news.insertamum) }}</span>
         </div>
       </div>
       <div v-else-if="width > 1 && height === 1" class="h-100" :class="'row row-cols-' + width">
         <div class="h-100" v-for="news in newsList" :key="news.id">
-            
-              <div class="news-content h-100" :style="'--news-widget-height: '+height" ref="htmlContent" v-html="news.content_obj.content"></div>
-                   
-            
-          </div>
- 		</div>
-      <div v-else class="h-100" :class="'row row-cols-' + width">
+          <div class="news-content h-100" :style="'--news-widget-height: '+height" ref="htmlContent" v-html="news.content_obj.content"></div>
+        </div>
+ 	  </div>
+      <div v-else class="h-100" :class="'row row-cols-' + width + ' gx-2'">
         <div class="h-100" v-for="news in newsList" :key="news.id">
           <div class="news-content h-100" :style="'--news-widget-height: '+height" ref="htmlContent" v-html="news.content_obj.content"></div>
         </div>
diff --git a/public/js/components/DashboardWidget/Stundenplan.js b/public/js/components/DashboardWidget/Stundenplan.js
index cedbbbf4c..425f7d663 100644
--- a/public/js/components/DashboardWidget/Stundenplan.js
+++ b/public/js/components/DashboardWidget/Stundenplan.js
@@ -189,7 +189,6 @@ export default {
 	<div class="dashboard-widget-stundenplan d-flex flex-column h-100">
 		<lv-modal v-if="selectedEvent" ref="lvmodal" :event="selectedEvent"  />
 		<content-modal :contentID="roomInfoContentID" :ort_kurzbz="" dialogClass="modal-lg" ref="contentModal"/>
-		<header><b>{{ $p.t('lehre/stundenplan') }}</b></header>
 		<fhc-calendar @change:range="updateRange" :initial-date="currentDay" class="border-0" class-header="p-0" @select:day="selectDay" v-model:minimized="minimized" :events="events" no-week-view :show-weeks="false" >
 			<template #minimizedPage >
 				<div class="flex-grow-1" style="overflow-y: auto; overflow-x: hidden">
diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index 5cd4ba6a4..2ab3c9fe4 100644
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -108,11 +108,10 @@ export default {
 	  // this.$emit('setConfig', true); -> use this to enable widget config mode if needed
   },
   template: /*html*/ `
-    <div class="widgets-url w-100 h-100">
+    <div class="widgets-url w-100 h-100" style="padding: 1rem 1rem;">
         <div class="d-flex flex-column justify-content-between">
         <!-- todo: widgetTag ?? -->
             <template v-if="shared">
-                <header><b>{{ tagName }}</b></header>
                 <template v-if="!emptyBookmarks">
                   <div v-for="link in shared" :key="link.id" class="d-flex mt-2">
                       <a target="_blank" :href="link.url">
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index e3dbe6351..06e8f535e 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -61,7 +61,7 @@ export default {
 			return {
 				'--fhc-dg-row-height': 100/(this.rows + addH) + '%',
 				'--fhc-dg-col-width': 100/this.cols + '%',
-				'--fhc-dg-item-padding-horizontal': '0.5%',
+				'--fhc-dg-item-padding-horizontal': '0.25%',
 				'--fhc-dg-item-padding-top': '0.5%',
 				'padding-bottom': 100 * (this.rows + addH)/this.cols + '%'
 			}
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 8e66bd17e..ade9a2593 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -37136,6 +37136,26 @@ array(
 				'insertvon' => 'system'
 			)
 		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'personalGreeting',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "{0}'s persönliches Dashboard",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "{0}'s personal Dashboard",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
 	)
 // CIS4 phrases from legacy code end
 );

From 5e9e08d65e0826ab37df3fa3c5535fac83817a40 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 19 Nov 2024 17:08:39 +0100
Subject: [PATCH 1430/1461] calendar scrollbar css fix;

---
 public/css/components/calendar.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index d7053d5e2..26d616616 100644
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -134,7 +134,7 @@
 .fhc-calendar-lg .fhc-calendar-month-page-day .events,
 .fhc-calendar-md .fhc-calendar-month-page-day .events {
   display: block;
-  overflow: scroll;
+  overflow: auto;
   font-size: 0.7em;
 }
 .fhc-calendar-lg .fhc-calendar-month-page-day .events span,

From 05c52e41eb1e344b5d4e8cda87c5485a43c2f2e8 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 19 Nov 2024 17:33:57 +0100
Subject: [PATCH 1431/1461] search only for active orgunits and rooms, also
 search room description

---
 application/libraries/SearchBarLib.php | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/application/libraries/SearchBarLib.php b/application/libraries/SearchBarLib.php
index 60f22f51a..573bd7451 100644
--- a/application/libraries/SearchBarLib.php
+++ b/application/libraries/SearchBarLib.php
@@ -178,6 +178,7 @@ class SearchBarLib
 
 	protected function buildSearchClause(DB_Model $dbModel, array $columns, $searchstr)
 	{
+		$searchstr = preg_replace('/[[:punct:]]/', ' ', $searchstr);
 		$document			 = implode(' || \' \' || ', $columns);
 		$query				 = '\'' . implode(':* & ', explode(' ', trim($searchstr))) . ':*\'';
 		$reversequery		 = '\'*:' . implode(' & *:', explode(' ', trim($searchstr))) . '\'';
@@ -297,13 +298,15 @@ EOSC;
 				   AND (datum_bis IS NULL OR datum_bis >= NOW())
 				   AND b.aktiv = TRUE
 			) bfLeader ON(bfLeader.oe_kurzbz = o.oe_kurzbz)
-			 WHERE ' .
+			 WHERE 
+				o.aktiv = true
+				AND (' .
 			$this->buildSearchClause(
 				$dbModel, 
 				array('o.oe_kurzbz', 'o.bezeichnung', 'ot.bezeichnung'), 
 				$searchstr
 			) .
-			'
+			') 
 		      GROUP BY type, o.oe_kurzbz, o.bezeichnung, ot.bezeichnung, oParent.oe_kurzbz, oParent.bezeichnung, otParent.bezeichnung
 		');
 
@@ -507,8 +510,17 @@ EOSC;
 					FROM public.tbl_standort
 					LEFT JOIN public.tbl_adresse USING(adresse_id)
 				) standort USING(standort_id)
-			 WHERE LOWER(ort.ort_kurzbz) like LOWER(\'%'. $searchstr . '%\') ' 
-			
+			 WHERE 
+				ort.aktiv = true 
+				AND 
+				ort.lehre = true
+				AND (' .
+					$this->buildSearchClause(
+						$dbModel, 
+						array('ort.ort_kurzbz', 'ort.bezeichnung'), 
+						$searchstr
+					) . 
+			')' 
 		);
 
 		// If something has been found

From a2bdca5551685926cdf6123d6c47f3999dc05c92 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 19 Nov 2024 17:44:44 +0100
Subject: [PATCH 1432/1461] fix typo

---
 public/js/components/searchbar/searchbar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index caaccff4a..1e290cf69 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -62,7 +62,7 @@ export default {
                     <div v-else="">Unbekannter Ergebnistyp: '{{ res.type }}'.</div>
                   </template>
                 </div>
-              </duv>
+              </div>
             </div>
 
             <div id="searchSettings"  ref="settings"  @[\`show.bs.collapse\`]="$emit('showSettings','settings')"

From 2c98438096f00b1375879b2a9097d7f815ef1027 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 19 Nov 2024 17:46:11 +0100
Subject: [PATCH 1433/1461] add cis4link to widget setup; show link icon in
 dashboard item header; remove links from widget contents;

---
 public/js/components/Dashboard/Item.js       | 7 +++++++
 public/js/components/DashboardWidget/News.js | 4 ----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index 05f381b43..8546490e0 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -43,6 +43,10 @@ export default {
 		},
 	},
 	methods: {
+		getWidgetC4Link(widget) {
+			return (FHC_JS_DATA_STORAGE_OBJECT.app_root +
+				FHC_JS_DATA_STORAGE_OBJECT.ci_router + widget.setup.cis4link)
+		},
 		handleShowBsModal() {
 			this.$emit('configOpened')
 		},
@@ -116,6 +120,9 @@ export default {
 		<div v-if="widget" class="card-header d-flex ps-0 pe-2">
 			<span v-if="editMode" drag-action="move" class="col-auto mx-2 px-2 cursor-move"><i class="fa-solid fa-grip-vertical"></i></span>
 			<span class="col mx-2 px-2">{{ widget.setup.name }}</span>
+			<a v-if="widget.setup.cis4link" :href="getWidgetC4Link(widget)" class="ms-auto mb-2">
+          		<i class="fa fa-arrow-up-right-from-square me-1"></i>
+          	</a>
 			<a v-if="hasConfig" class="col-auto px-1" href="#" @click.prevent="openConfig"><i class="fa-solid fa-gear"></i></a>
 			<a v-if="custom && editMode" class="col-auto px-1" href="#" @click.prevent="$emit('remove')">
 				<i class="fa-solid fa-trash"></i>
diff --git a/public/js/components/DashboardWidget/News.js b/public/js/components/DashboardWidget/News.js
index cf32f8328..f7acb504b 100644
--- a/public/js/components/DashboardWidget/News.js
+++ b/public/js/components/DashboardWidget/News.js
@@ -67,10 +67,6 @@ export default {
   template: /*html*/ `<div class="widgets-news h-100" :style="getNewsWidgetStyle">
   
       <div class="d-flex flex-column h-100 ">
-      <div class="d-flex">
-        <a :href="allNewsURI()" class="ms-auto mb-2">
-          <i class="fa fa-arrow-up-right-from-square me-1"></i>{{$p.t('news','allNews')}}</a>
-      </div>
       <div class="h-100" style="overflow-y: auto" v-if="width == 1">
         <div  v-for="(news, index) in newsList" :key="news.id" class="mt-2">
           <div v-if="index > 0 " class="fhc-seperator"></div>

From 9420e22b2a8e7067c5015d839435e883a4c5d0e8 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 19 Nov 2024 18:13:15 +0100
Subject: [PATCH 1434/1461] optimise scrolling behavior of search results and
 responsive layout of search results

---
 public/css/Cis4/Cis.css                       | 2 +-
 public/css/components/searchbar/searchbar.css | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index 9306481b5..2f495cc41 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -512,6 +512,6 @@ html {
 
 	.searchbar_tablecell.searchbar_value {
 		padding-left: 2.5rem;
-		overflow-wrap: break-word;
+		overflow-wrap: anywhere;
 	}
 }
\ No newline at end of file
diff --git a/public/css/components/searchbar/searchbar.css b/public/css/components/searchbar/searchbar.css
index c272da310..a4476e7c5 100644
--- a/public/css/components/searchbar/searchbar.css
+++ b/public/css/components/searchbar/searchbar.css
@@ -30,6 +30,7 @@
 
 .searchbar_results_scroller {
     overflow-y: auto;
+	overscroll-behavior: none;
 }
 
 .searchbar_result {

From f6319aa8456ecb92b887c030d33b548f1601fa13 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 20 Nov 2024 09:29:43 +0100
Subject: [PATCH 1435/1461] add new searchoptions to display search results
 correct again

---
 public/css/Studentenverwaltung.css              | 2 +-
 public/js/components/Stv/Studentenverwaltung.js | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/public/css/Studentenverwaltung.css b/public/css/Studentenverwaltung.css
index efa4dbb1a..f179c3667 100644
--- a/public/css/Studentenverwaltung.css
+++ b/public/css/Studentenverwaltung.css
@@ -1,5 +1,5 @@
 @import './Fhc.css';
-@import './components/searchbar.css';
+@import './components/searchbar/searchbar.css';
 @import './components/verticalsplit.css';
 @import './components/FilterComponent.css';
 @import './components/Tabs.css';
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index e2ca8e349..7f663c159 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -67,6 +67,8 @@ export default {
 		return {
 			selected: [],
 			searchbaroptions: {
+				cssclass: "position-relative",
+				calcheightonly: true,
 				types: [
 					"student",
 					"prestudent"

From 3896aa73ea5929efd2ea540c8ed7efb795c8cbdb Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 20 Nov 2024 10:35:51 +0100
Subject: [PATCH 1436/1461] fix(Raum_information Calendar): passt die
 RaumInformations Seite auf die Aenderungen des Calenders an

---
 public/js/apps/Cis/Stundenplan.js             |   3 +-
 .../js/components/Cis/Mylv/RoomInformation.js | 122 ++++++++++++------
 2 files changed, 83 insertions(+), 42 deletions(-)

diff --git a/public/js/apps/Cis/Stundenplan.js b/public/js/apps/Cis/Stundenplan.js
index d29ba946e..acc41baad 100644
--- a/public/js/apps/Cis/Stundenplan.js
+++ b/public/js/apps/Cis/Stundenplan.js
@@ -8,7 +8,6 @@ const app = Vue.createApp({
 	name: 'StundenplanApp',
 	data() {
 		return {
-			stunden: [],
 			lv_id: null,
 			events: null,
 			calendarDate: new CalendarDate(new Date()),
@@ -106,7 +105,7 @@ const app = Vue.createApp({
 	created()
 	{
 		this.loadEvents();
-		this.getLvID()
+		this.getLvID();
 	},
 	//TODO: Stundenplan phrase
 	template:/*html*/`
diff --git a/public/js/components/Cis/Mylv/RoomInformation.js b/public/js/components/Cis/Mylv/RoomInformation.js
index 236b84efd..7a199c6cf 100644
--- a/public/js/components/Cis/Mylv/RoomInformation.js
+++ b/public/js/components/Cis/Mylv/RoomInformation.js
@@ -14,9 +14,11 @@ export default{
 	},
 	data() {
 		return {
-			stunden: [],
 			events: null,
-            calendarWeek: new CalendarDate(new Date()),
+			calendarDate: new CalendarDate(new Date()),
+			currentlySelectedEvent: null,
+			currentDay: new Date(),
+			minimized: false,
             
         }
 	},
@@ -24,38 +26,62 @@ export default{
         currentDate: function(){
             return new Date(this.calendarWeek.y, this.calendarWeek.m, this.calendarWeek.d);
         },
-        weekFirstDay: function(){
-            return this.calendarDateToString(this.calendarWeek.cdFirstDayOfWeek);
-        },
-        weekLastDay: function(){
-            return this.calendarDateToString(this.calendarWeek.cdLastDayOfWeek);
-        },
+		weekFirstDay: function () {
+			return this.calendarDateToString(this.calendarDate.cdFirstDayOfWeek);
+		},
+		weekLastDay: function () {
+			return this.calendarDateToString(this.calendarDate.cdLastDayOfWeek);
+		},
+		monthFirstDay: function () {
+			return this.calendarDateToString(this.calendarDate.cdFirstDayOfCalendarMonth);
+		},
+		monthLastDay: function () {
+			return this.calendarDateToString(this.calendarDate.cdLastDayOfCalendarMonth);
+		},
     },
     methods:{
-		updateRange: function(data){
-			this.calendarWeek = new CalendarDate(data.start);
+		getLvID: function () {
+			this.lv_id = window.location.pathname
+		},
+		selectDay: function (day) {
+			this.currentDay = day;
+		},
+		showModal: function (event) {
+			this.currentlySelectedEvent = event;
 			Vue.nextTick(() => {
-				this.loadEvents();
+				this.$refs.lvmodal.show();
 			});
 		},
+		updateRange: function ({ start, end }) {
 
-        // returns the string YYYY-MM-DD if param is instance of CalendarDate and null otherwise
-        calendarDateToString: function(calendarDate){
-            
-            return calendarDate instanceof CalendarDate? 
-            [calendarDate.y, calendarDate.m+1, calendarDate.d].join('-'):
-            null; 
-            
-        },
+			let checkDate = (date) => {
+				return date.m != this.calendarDate.m || date.y != this.calendarDate.y;
+			}
 
+			// only load month data if the month or year has changed
+			if (checkDate(new CalendarDate(start)) && checkDate(new CalendarDate(end))) {
+				// reset the events before querying the new events to activate the loading spinner
+				this.events = null;
+				this.calendarDate = new CalendarDate(end);
+				Vue.nextTick(() => {
+					this.loadEvents();
+				});
+			}
+		},
+		calendarDateToString: function (calendarDate) {
+			return calendarDate instanceof CalendarDate ?
+				[calendarDate.y, calendarDate.m + 1, calendarDate.d].join('-') :
+				null;
+
+		},
 		loadEvents: function(){
 
 			// bundles the room_events and the reservierungen together into the this.events array
 			Promise.allSettled([
-				this.$fhcApi.factory.stundenplan.getRoomInfo(this.ort_kurzbz, this.weekFirstDay, this.weekLastDay),
-				this.$fhcApi.factory.stundenplan.getOrtReservierungen(this.ort_kurzbz, this.weekFirstDay, this.weekLastDay)
+				this.$fhcApi.factory.stundenplan.getRoomInfo(this.ort_kurzbz, this.monthFirstDay, this.monthLastDay),
+				this.$fhcApi.factory.stundenplan.getOrtReservierungen(this.ort_kurzbz, this.monthFirstDay, this.monthLastDay)
 			]).then((result) => {
-				let events = [];
+				let promise_events = [];
 				result.forEach((promise_result) => {
 					if(promise_result.status === 'fulfilled' && promise_result.value.meta.status === "success"){
 						
@@ -75,30 +101,46 @@ export default{
 								
 							});
 						}
-						events = events.concat(data);
+						promise_events = promise_events.concat(data);
 					}
 				})
-				this.events = events;
+				this.events = promise_events;
 			})
 		},
-		
     },
+	created() {
+		this.loadEvents();
+	},
     template: /*html*/`
-    <div>
-		<fhc-calendar @change:range="updateRange" v-slot="{event,day}" :initialDate="currentDate" :events="events" initial-mode="week" show-weeks>
-            <a class="text-decoration-none text-dark" href="#" :title="event.orig.title + ' - ' + event.orig.lehrfach_bez + ' [' + event.orig.ort_kurzbz+']'"   >
-                <div type="button" class="d-flex flex-column align-items-center justify-content-evenly h-100" >
-
-                        <!-- render content for stundenplan -->
-                        <span >{{event.orig.topic}}</span>
-                        <span v-for="gruppe in event.orig.gruppe" >{{gruppe.kuerzel}} </span>
-                        <span v-for="lektor in event.orig.lektor" >{{lektor.kurzbz}}</span>
-                        <!-- add the beschreibung if the event is a reservierung
-                        <span v-if="event.orig.type === 'reservierung'">{{event.orig.beschreibung}}</span>-->
-                        
-                </div>
-            </a>
+		<fhc-calendar :initial-date="currentDay" @change:range="updateRange" :events="events" initial-mode="week" show-weeks @select:day="selectDay" v-model:minimized="minimized">
+            <template #monthPage="{event,day,isSelected}">
+				<span class="fhc-entry" :class="{'selectedEvent':isSelected}" style="color:white" :style="{'background-color': event.color}">
+					{{event.topic}}
+				</span>
+			</template>
+			<template #weekPage="{event,day,isSelected}">
+				<div @click="showModal(event?.orig)" type="button" :class="{'selectedEvent':isSelected}" class="fhc-entry border border-secondary border d-flex flex-column align-items-center justify-content-evenly h-100">
+					<span>{{event?.orig.topic}}</span>
+					<span v-for="lektor in event?.orig.lektor">{{lektor.kurzbz}}</span>
+					<span>{{event?.orig.ort_kurzbz}}</span>
+				</div>
+			</template>
+			<template #dayPage="{event,day}">
+				<div type="button" class="fhc-entry border border-secondary border row h-100 justify-content-center align-items-center text-center">
+					<div class="col ">
+						<p>Lehrveranstaltung:</p>
+						<p class="m-0">{{event?.orig.topic}}</p>
+					</div>
+					<div class="col ">
+						<p>Lektor:</p>
+						<p class="m-0" v-for="lektor in event?.orig.lektor">{{lektor.kurzbz}}</p>
+					</div>
+					<div class="col ">
+						<p>Ort: </p>
+						<p class="m-0">{{event?.orig.ort_kurzbz}}</p>
+					</div>
+				</div>
+			</template>
         </fhc-calendar>
-    </div>
     `,
 };
\ No newline at end of file

From a5dd639404b637ced33842cd98e131b9241df476 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 20 Nov 2024 11:14:55 +0100
Subject: [PATCH 1437/1461] stundenplan header offset class conditionally
 depending on fhc-calendar widget property

---
 public/js/components/Calendar/Calendar.js           | 5 +++++
 public/js/components/Calendar/Header.js             | 6 +++++-
 public/js/components/DashboardWidget/Stundenplan.js | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Calendar/Calendar.js b/public/js/components/Calendar/Calendar.js
index 1981ec54a..ca0f95b58 100644
--- a/public/js/components/Calendar/Calendar.js
+++ b/public/js/components/Calendar/Calendar.js
@@ -36,6 +36,7 @@ export default {
 			mode: Vue.computed(()=>this.mode),
 			selectedEvent: Vue.computed(() => this.selectedEvent),
 			setSelectedEvent: (event)=>{this.selectedEvent = event;},
+			widget: this.widget
 		};
 	},
 	props: {
@@ -59,6 +60,10 @@ export default {
 		minimized: Boolean,
 		noWeekView: Boolean,
 		noMonthView: Boolean,
+		widget: {
+			type: Boolean,
+			default: false
+		}
 	},
 	watch:{
 		// scroll to the first event if the html element was found
diff --git a/public/js/components/Calendar/Header.js b/public/js/components/Calendar/Header.js
index a62d68f5c..d51faf5f8 100644
--- a/public/js/components/Calendar/Header.js
+++ b/public/js/components/Calendar/Header.js
@@ -18,6 +18,7 @@ export default {
 		'updateMode',
 		'noWeekView',
 		'noMonthView',
+		'widget'
 	],
 	props: {
 		title: String
@@ -29,6 +30,9 @@ export default {
 		'click'
 	],
 	computed: {
+		getHeaderOffsetClass() {
+			return 'col offset-0' + (this.widget ? '' : ' offset-md-3')
+		},
 		myClassHeader() {
 			// TODO(chris): + {'btn-sm': !this.size}
 			let c = this.classHeader;
@@ -48,7 +52,7 @@ export default {
 	template: /*html*/`
 	<div class="calendar-header card-header w-100" :class="classHeader">
 		<div class="row align-items-center ">
-			<div class="col offset-0" :style="{'padding-left':headerPadding}">
+			<div :class="getHeaderOffsetClass" :style="{'padding-left':headerPadding}">
 				<div class="row align-items-center justify-content-center">
 					<div class="col-auto ">
 						<button class="btn btn-outline-secondary border-0" :class="{'btn-sm':!this.size}" @click="$emit('prev')"><i class="fa fa-chevron-left"></i></button>
diff --git a/public/js/components/DashboardWidget/Stundenplan.js b/public/js/components/DashboardWidget/Stundenplan.js
index 425f7d663..71ce60ebf 100644
--- a/public/js/components/DashboardWidget/Stundenplan.js
+++ b/public/js/components/DashboardWidget/Stundenplan.js
@@ -189,7 +189,7 @@ export default {
 	<div class="dashboard-widget-stundenplan d-flex flex-column h-100">
 		<lv-modal v-if="selectedEvent" ref="lvmodal" :event="selectedEvent"  />
 		<content-modal :contentID="roomInfoContentID" :ort_kurzbz="" dialogClass="modal-lg" ref="contentModal"/>
-		<fhc-calendar @change:range="updateRange" :initial-date="currentDay" class="border-0" class-header="p-0" @select:day="selectDay" v-model:minimized="minimized" :events="events" no-week-view :show-weeks="false" >
+		<fhc-calendar @change:range="updateRange" :initial-date="currentDay" class="border-0" class-header="p-0" @select:day="selectDay" widget="true" v-model:minimized="minimized" :events="events" no-week-view :show-weeks="false" >
 			<template #minimizedPage >
 				<div class="flex-grow-1" style="overflow-y: auto; overflow-x: hidden">
 					<div v-if="events === null" class="d-flex h-100 justify-content-center align-items-center">

From 155e8da35a71eca96f541430c3deb8a8c9c06e9d Mon Sep 17 00:00:00 2001
From: kindlm <kindlm@technikum-wien.at>
Date: Wed, 20 Nov 2024 16:00:57 +0100
Subject: [PATCH 1438/1461] =?UTF-8?q?Ampel=20=C3=9Cbersicht=20tablesorter?=
 =?UTF-8?q?=20with=20filter=20+=20date-sort=20bugfix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vilesci/stammdaten/ampel_uebersicht.php | 46 ++++++++++++++++++-------
 1 file changed, 34 insertions(+), 12 deletions(-)

diff --git a/vilesci/stammdaten/ampel_uebersicht.php b/vilesci/stammdaten/ampel_uebersicht.php
index 1b85a4bbd..6304486fb 100644
--- a/vilesci/stammdaten/ampel_uebersicht.php
+++ b/vilesci/stammdaten/ampel_uebersicht.php
@@ -38,23 +38,45 @@ echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 	<title>Ampel</title>
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 	
-	<link rel="stylesheet" href="../../skin/tablesort.css" type="text/css"/>
+
 	<link rel="stylesheet" href="../../skin/fhcomplete.css" type="text/css">
 	<link rel="stylesheet" href="../../skin/vilesci.css" type="text/css">
-	<link rel="stylesheet" type="text/css" href="../../skin/jquery-ui-1.9.2.custom.min.css">
-<script type="text/javascript" src="../../vendor/jquery/jquery1/jquery-1.12.4.min.js"></script>
-<script type="text/javascript" src="../../vendor/christianbach/tablesorter/jquery.tablesorter.min.js"></script>
-<script type="text/javascript" src="../../vendor/components/jqueryui/jquery-ui.min.js"></script>
-<script type="text/javascript" src="../../include/js/jquery.ui.datepicker.translation.js"></script>
-<script type="text/javascript" src="../../vendor/jquery/sizzle/sizzle.js"></script> 
+	<link rel="stylesheet" type="text/css" href="../../skin/jquery-ui-1.9.2.custom.min.css">
+
+<script type="text/javascript" src="../../vendor/jquery/sizzle/sizzle.js"></script>';
+
+
+	include('../../include/meta/jquery.php');
+	include('../../include/meta/jquery-tablesorter.php');
+
+echo '	
 	<script type="text/javascript">
-	
+		$.tablesorter.addParser({
+					id: "customDate",
+					is: function(s) {
+						//return false;
+						//use the above line if you don\'t want table sorter to auto detected this parser
+						// match dd.mm.yyyy e.g. 01.01.2001 as regex
+						//return /\d{1,4}-\d{1,2}-\d{1,2} \d{1,2}:\d{1,2} .*/.test(s);
+						return /\d{1,2}.\d{1,2}.\d{1,4}.*/.test(s);
+					},
+					// replace regex-wildcards and return new date
+					format: function(s) {
+						s = s.replace(/\-/g," ");
+						s = s.replace(/:/g," ");
+						s = s.replace(/\./g," ");
+						s = s.split(" ");
+						return $.tablesorter.formatFloat(new Date(s[2], s[1]-1, s[0]).getTime());
+					},
+					type: "numeric"
+				});
 		$(document).ready(function() 
 			{ 
 			    $("#myTable").tablesorter(
 				{
-					sortList: [[2,0]],
-					widgets: [\'zebra\']
+					sortList: [[2,1]],
+					widgets: [\'zebra\',\'filter\'],
+					headers: { 2: { sorter: "customDate"}}
 				}); 
 			} 
 		);
@@ -107,8 +129,8 @@ echo '<table class="tablesorter" id="myTable">
 foreach($ampel->result as $row)
 {
 	echo '<tr>';
-	echo '<td><a href="ampel_details.php?action=update&ampel_id=',$row->ampel_id,' " target="detail_ampel">',$row->ampel_id,'</a></td>';
-	echo '<td>',$row->kurzbz,'</td>';
+	echo '<td>',$row->ampel_id,'</td>';
+	echo '<td><a href="ampel_details.php?action=update&ampel_id=',$row->ampel_id,' " target="detail_ampel">',$row->kurzbz,'</a></td>';
 	echo '<td>',$datum_obj->formatDatum($row->deadline,'d.m.Y'),'</td>';
 	echo '<td>',$row->vorlaufzeit,'</td>';
 	echo '<td>',$row->verfallszeit,'</td>';

From 763d038b4ca769c26f47561f87dd9ba4447ab803 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 21 Nov 2024 12:19:22 +0100
Subject: [PATCH 1439/1461] fix(api/v1/Stundenplan/getStundenplan): fetches
 groups and studentlehrverbaende based on the date interval of the current and
 previous semesters

---
 .../api/frontend/v1/Stundenplan.php           | 385 +++++++++++++-----
 .../models/ressource/Stundenplan_model.php    |  37 +-
 2 files changed, 298 insertions(+), 124 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 373e5a9f9..116854930 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -127,129 +127,30 @@ class Stundenplan extends FHCAPI_Controller
 		$start_date = $this->input->get('start_date', TRUE);
 		$end_date = $this->input->get('end_date', TRUE);
 
- 		$student_uid = getAuthUID();
-
-		// check if authUID is mitarbeiter
-		$is_mitarbeiter = getData($this->MitarbeiterModel->isMitarbeiter($student_uid));
-		if($is_mitarbeiter)
-		{
-			$this->terminateWithError("Not possible to look at the Student Calendar as a Mitarbeiter");
-		}
+		$student_uid = getAuthUID();
 		if(is_null($student_uid))
 		{
 			$this->terminateWithError("No UID");
 		}
 
-		// gets all studiensemester from the student from start_date to end_date
-		$semester_range = $this->StudiensemesterModel->getByDate($start_date,$end_date);
-		$semester_range = array_map( 
-			function($sem)
-			{
-				return $sem->studiensemester_kurzbz;
-			},
-			$this->getDataOrTerminateWithError($semester_range)
-		);
-
-		// if no studiensemester is found for the given timespan, get the nearest studiensemester
-		if(count($semester_range) == 0)
+		$is_mitarbeiter = getData($this->MitarbeiterModel->isMitarbeiter($student_uid));
+		if($is_mitarbeiter)
 		{
-			$aktuelle_studiensemester = $this->StudiensemesterModel->getNearest();
-			$aktuelle_studiensemester = $this->getDataOrTerminateWithError($aktuelle_studiensemester);
-			if (count($aktuelle_studiensemester) == 0) {
-				$this->terminateWithError("No aktuelles semester");
-			}
-			$aktuelle_studiensemester = current($aktuelle_studiensemester)->studiensemester_kurzbz;
-			// push aktuelles semester in active semester array
-			array_push($semester_range, $aktuelle_studiensemester);
-
+			$this->terminateWithError("Not possible to look at the Student Calendar as a Mitarbeiter");
 		}
-
 		
+		$semester_range = $this->studienSemesterErmitteln($start_date,$end_date);
+
 		$this->sortStudienSemester($semester_range);
 
-		//semester des Studenten ermitteln
-		if (defined('LVPLAN_LOAD_UEBER_SEMESTERHAELFTE') && LVPLAN_LOAD_UEBER_SEMESTERHAELFTE === true)
-		{
-			// get next studiensemester
-			$next_studiensemester = $this->StudiensemesterModel->getNextFrom($semester_range[(count($semester_range)-1)]);
-			$next_studiensemester = $this->getDataOrTerminateWithError($next_studiensemester);
-			if(count($next_studiensemester) == 0)
-			{
-				$this->terminateWithError("No next semester");
-			}
-			$next_studiensemester = current($next_studiensemester)->studiensemester_kurzbz;
-			//push next semester in active semester array
-			array_push($semester_range, $next_studiensemester);
-			$this->sortStudienSemester($semester_range);
-			
-			// get previous studiensemester
-			$previous_studiensemester = $this->StudiensemesterModel->getPreviousFrom($semester_range[0]);
-			$previous_studiensemester = $this->getDataOrTerminateWithError($previous_studiensemester);
-			if (count($previous_studiensemester) == 0) {
-				$this->terminateWithError("No previous semester");
-			}
-			$previous_studiensemester = current($previous_studiensemester)->studiensemester_kurzbz;
-			// push previous semester in active semester array
-			array_push($semester_range, $previous_studiensemester);
-			$this->sortStudienSemester($semester_range);
-		}	
-		else
-		{
-			$nearest_studiensemester = $this->StudiensemesterModel->getNearestFrom($semester_range[(count($semester_range)-1)]);
-			$nearest_studiensemester = $this->getDataOrTerminateWithError($nearest_studiensemester);
-			if (count($nearest_studiensemester) == 0) {
-				$this->terminateWithError("No nearest semester");
-			}
-			$nearest_studiensemester = current($nearest_studiensemester)->studiensemester_kurzbz;
-			// push nearest semester in active semester array
-			array_push($semester_range, $nearest_studiensemester);
-			$this->sortStudienSemester($semester_range);
-
-		}
-
-
+		$this->applyLoadUeberSemesterHaelfte($semester_range);
+		
 		// getting the gruppen_kurzbz of the student in the different studiensemester
-		$benutzer_gruppen = [];
+		$benutzer_gruppen = $this->fetchBenutzerGruppenFromStudiensemester($semester_range);
 		
-		foreach($semester_range as $semester)
-		{
-			// for each active semester query the benutzer_gruppen associated to the semester
-			$benutzer_query = $this->BenutzergruppeModel->execReadOnlyQuery("
-			SELECT * FROM tbl_benutzergruppe where uid = ? AND studiensemester_kurzbz = ?",[$student_uid, $semester]);
-			$benutzer_query_result = $this->getDataOrTerminateWithError($benutzer_query);
-			$benutzer_gruppen[$semester] = array_map(function($item){ return "'".$item->gruppe_kurzbz. "'";}, $benutzer_query_result);
-		}
-
-		$student_lehrverband = [];
+		// getting the student_lehrverbaende of the student in the different studiensemester
+		$student_lehrverband = $this->fetchStudentlehrverbandFromStudiensemester($semester_range);
 		
-		foreach($semester_range as $semester)
-		{
-			// for each active semester query the student_lehrverband associated to the semester
-			$lehrverband_query = $this->BenutzergruppeModel->execReadOnlyQuery("
-			SELECT * FROM tbl_studentlehrverband where student_uid = ? AND studiensemester_kurzbz = ?", [$student_uid, $semester]);
-			$lehrverband_query_result = $this->getDataOrTerminateWithError($lehrverband_query);
-			$student_lehrverband[$semester] = array_map(
-				function ($item)
-				{
-					$result = new stdClass();
-					$result->studiengang_kz = $item->studiengang_kz;
-					$result->semester = $item->semester;
-					$result->verband = $item->verband;
-					$result->gruppe = $item->gruppe;
-					return $result;
-				},
-				$lehrverband_query_result);
-
-		}
-
-		$studienSemesterDateRanges=[]; 
-		foreach($semester_range as $semester){
-			$semester_start_ende = $this->StudiensemesterModel->getStartEndeFromStudiensemester($semester);
-			$semester_start_ende = current($this->getDataOrTerminateWithError($semester_start_ende)); 
-			$studienSemesterDateRanges[$semester] = $semester_start_ende; 
-		}
-		$semester_range = $studienSemesterDateRanges;
-
 		$stundenplan_data = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getStundenplanQuery($start_date, $end_date, $semester_range, $benutzer_gruppen, $student_lehrverband));
 		$stundenplan_data = $this->getDataOrTerminateWithError($stundenplan_data) ?? [];
 
@@ -391,4 +292,268 @@ class Stundenplan extends FHCAPI_Controller
 		);
 	}
 
+	
+
+	private function fetchBenutzerGruppenFromStudiensemester($semester_range){
+		$student_uid = getAuthUID();
+		$benutzer_gruppen = [];
+		// for each studiensemester fetch the benutzer gruppen and add them to an associate $bentuzer_gruppen array
+		/*
+		[
+			['WS2023'] => [['gruppe1_SS2023','gruppe2_SS2023'],['gruppe1_WS2023','gruppe2_WS2023']],
+			['SS2024'] => [['gruppe1_WS2023','gruppe2_WS2023'],['gruppe1_SS2024','gruppe2_SS2024']],
+			['WS2024'] => [['gruppe1_SS2024','gruppe2_SS2024'],['gruppe1_WS2024','gruppe2_WS2024']],
+		]
+		*/ 
+		foreach($semester_range as $semester_key => $semester_array)
+		{
+			$benutzer_gruppen[$semester_key] = [];
+			// each semester could have ajoint semesters that need to be checked
+			foreach($semester_array as $semester=>$semester_date_range)
+			{
+				// for each active semester query the benutzer_gruppen associated to the semester
+				$benutzer_query = $this->BenutzergruppeModel->execReadOnlyQuery("
+				SELECT * FROM tbl_benutzergruppe where uid = ? AND studiensemester_kurzbz = ?",[$student_uid, $semester]);
+				$benutzer_query_result = $this->getDataOrTerminateWithError($benutzer_query);
+				array_push(
+					$benutzer_gruppen[$semester_key],
+					 array_map(
+						function($item)
+						{
+							return "'".$item->gruppe_kurzbz. "'";
+						},
+						$benutzer_query_result
+					)
+				);
+			}
+		}
+		
+		// merge the gruppen of each studiensemester together for the original studiensemester
+		/*
+		[
+			['WS2023'] => ['gruppe1_SS2023','gruppe2_SS2023','gruppe1_WS2023','gruppe2_WS2023'],
+			['SS2024'] => ['gruppe1_WS2023','gruppe2_WS2023','gruppe1_SS2024','gruppe2_SS2024'],
+			['WS2024'] => ['gruppe1_SS2024','gruppe2_SS2024','gruppe1_WS2024','gruppe2_WS2024'],
+		]
+		*/ 
+		$benutzer_gruppen = array_map(
+			function($gruppe)
+			{
+				$merged_gruppe = [];
+				foreach($gruppe as $gruppen_array)
+				{
+					$merged_gruppe = array_merge($merged_gruppe, $gruppen_array);
+				}
+				return $merged_gruppe;
+			},
+			$benutzer_gruppen
+		);
+
+		return $benutzer_gruppen;
+	}
+
+	private function fetchStudentlehrverbandFromStudiensemester($semester_range){
+		$student_uid = getAuthUID();
+		$student_lehrverband = [];
+		// for each studiensemester fetch the studentlehrverbaende and add them to an associate $student_lehrverband array
+		/*
+		[
+			['WS2023'] => [ [ ['stg_kz'=>298,'semester'=>1,'verband'=>"A",'gruppe'=>""] ] ],
+			['SS2024'] => [ [ ['stg_kz'=>298,'semester'=>1,'verband'=>"A",'gruppe'=>""] ], [ ['stg_kz'=>298,'semester'=>2,'verband'=>"A",'gruppe'=>""] ] ],
+			['WS2024'] => [ [ ['stg_kz'=>298,'semester'=>2,'verband'=>"A",'gruppe'=>""] ], [ ['stg_kz'=>298,'semester'=>3,'verband'=>"A",'gruppe'=>""] ] ],
+		]
+		*/ 
+		foreach($semester_range as $semester_key => $semester_array)
+		{
+			$student_lehrverband[$semester_key] = [];
+			foreach($semester_array as $semester=>$semester_date_range)
+			{
+				// for each active semester query the student_lehrverband associated to the semester
+				$lehrverband_query = $this->BenutzergruppeModel->execReadOnlyQuery("
+				SELECT * FROM tbl_studentlehrverband where student_uid = ? AND studiensemester_kurzbz = ?", [$student_uid, $semester]);
+				$lehrverband_query_result = $this->getDataOrTerminateWithError($lehrverband_query);
+				array_push($student_lehrverband[$semester_key], array_map(
+					function ($item)
+					{
+						$result = new stdClass();
+						$result->studiengang_kz = $item->studiengang_kz;
+						$result->semester = $item->semester;
+						$result->verband = $item->verband;
+						$result->gruppe = $item->gruppe;
+						return $result;
+					},
+					$lehrverband_query_result)); 
+			}
+		}
+
+		// merge the studentlehrverband of each studiensemester together for the original studiensemester
+		/*
+		[
+			['WS2023'] => [ ['stg_kz'=>298,'semester'=>1,'verband'=>"A",'gruppe'=>""] ],
+			['SS2024'] => [ ['stg_kz'=>298,'semester'=>1,'verband'=>"A",'gruppe'=>""], ['stg_kz'=>298,'semester'=>2,'verband'=>"A",'gruppe'=>""] ],
+			['WS2024'] => [ ['stg_kz'=>298,'semester'=>2,'verband'=>"A",'gruppe'=>""], ['stg_kz'=>298,'semester'=>3,'verband'=>"A",'gruppe'=>""] ],
+		]
+		*/
+		$student_lehrverband = array_map(
+			function($studentlehrverband)
+			{	
+				$merged_studentlehrverband = [];
+				foreach($studentlehrverband as $studentlehrverband_array)
+				{
+					$merged_studentlehrverband = array_merge($merged_studentlehrverband, $studentlehrverband_array);
+				}
+				return $merged_studentlehrverband;
+			},
+			$student_lehrverband
+		);
+
+		return $student_lehrverband;
+	}
+
+	private function applyLoadUeberSemesterHaelfte(&$semester_range){
+		/*
+		@var($semester_collection)
+		convert the array of studiensemester into an associative array with the studiensemester as the key 
+		and the values of each key are the studiensemester needed for the query associated to that studiensemester
+		example:
+
+		#INPUT:
+		['WS2023','SS2024','WS2024']
+		#OUTPUT:
+		[
+			'WS2023' => ['SS2023','WS2023']
+			'SS2024' => ['WS2023','SS2024']
+			'WS2024' => ['SS2024','WS2024']
+		]
+		*/
+		$semester_collection = [];
+		foreach($semester_range as $studiensemester)
+		{
+			$previous_studiensemester = $this->StudiensemesterModel->getPreviousFrom($studiensemester);
+			$previous_studiensemester = $this->getDataOrTerminateWithError($previous_studiensemester);
+			if (count($previous_studiensemester) == 0) {
+				$this->terminateWithError("No previous semester");
+			}
+			$previous_studiensemester = current($previous_studiensemester)->studiensemester_kurzbz;
+			$semester_collection[$studiensemester] = [$previous_studiensemester, $studiensemester];
+		}
+
+		/*
+		@var($studienSemesterDateRanges)
+		fetches for each studiensemester the start and end date, (SS) summer studiensemester are extended by 1 month to cover the summerbreak
+		based on the LVPLAN_LOAD_UEBER_SEMESTERHAELFTE constant it will load both the semester and the previous semester with the full date range 
+		or the semester with the full date range and the previous semester with the half date range:
+
+		#INPUT:
+		[
+			'WS2023' => ['SS2023','WS2023']
+			'SS2024' => ['WS2023','SS2024']
+			'WS2024' => ['SS2024','WS2024']
+		]
+		#OUTPUT: depends whether LVPLAN_LOAD_UEBER_SEMESTERHAELFTE is true or false
+		~ if LVPLAN_LOAD_UEBER_SEMESTERHAELFTE == true
+		[
+			"SS2024": [
+				"WS2023": [
+					"start"=> "2024-02-03",
+					"ende"=> "2024-08-31"
+				],
+				"SS2024": [
+					"start"=> "2024-02-03",
+					"ende"=> "2024-08-31"
+				]
+			]
+		]
+		~ if LVPLAN_LOAD_UEBER_SEMESTERHAELFTE == false
+		[
+			"SS2024": [
+				"WS2023": [
+					"start"=> "2024-02-03",
+					"ende"=> "2024-05-17"
+				],
+				"SS2024": [
+					"start"=> "2024-02-03",
+					"ende"=> "2024-08-31"
+				]
+			]
+		]
+		*/
+		$studienSemesterDateRanges=[]; 
+		foreach($semester_collection as $semester_original => $semester_adjoint)
+		{
+			$semester_start_ende = $this->StudiensemesterModel->getStartEndeFromStudiensemester($semester_original);
+			$semester_start_ende = current($this->getDataOrTerminateWithError($semester_start_ende)); 
+				
+			// initialize empty arrays to add key value pairs
+			$studienSemesterDateRanges[$semester_original] = [];
+
+			// check if the studiensemester is a summer semester and add 1 month to bridge the school summer break
+			$match = null;
+			preg_match("/^(SS)([0-9]+)/",$semester_original,$match);
+			if(count($match) >0)
+			{
+				$one_month = new DateInterval('P1M');
+				$one_day = DateInterval::createFromDateString('1 days');
+				$summer_studiensemester_end_date = DateTime::createFromFormat('Y-m-d',$semester_start_ende->ende);
+				$summer_studiensemester_end_date->add($one_month);
+				$summer_studiensemester_end_date->sub($one_day);
+				$semester_start_ende->ende = date_format($summer_studiensemester_end_date,'Y-m-d');
+			}
+			if (defined('LVPLAN_LOAD_UEBER_SEMESTERHAELFTE') && LVPLAN_LOAD_UEBER_SEMESTERHAELFTE === true)
+			{
+				foreach($semester_adjoint as $adjoint)
+				{
+					$studienSemesterDateRanges[$semester_original][$adjoint]=$semester_start_ende;
+				}
+			}
+			else
+			{
+				//TODO: half of a DateInterval might not be correctly calculated
+				// calculate the half of the studiensemester
+				$studiensemester_start_date = DateTime::createFromFormat('Y-m-d',$semester_start_ende->start);
+				$studiensemester_end_date = DateTime::createFromFormat('Y-m-d',$semester_start_ende->ende);
+				$studiensemester_time_difference = $studiensemester_start_date->diff($studiensemester_end_date);
+				$half_dateNumber = ceil($studiensemester_time_difference->d/2)+ceil(($studiensemester_time_difference->m*30)/2);
+				$half_dateInterval = new DateInterval('P'.strval($half_dateNumber) .'D');
+				$studiensemester_half = date_format($studiensemester_start_date->add($half_dateInterval),'Y-m-d');
+				
+				$first_half = new stdClass();
+				$first_half->start = $semester_start_ende->start;
+				$first_half->ende = $studiensemester_half;
+
+				$studienSemesterDateRanges[$semester_original][$semester_adjoint[0]] = $first_half;
+				$studienSemesterDateRanges[$semester_original][$semester_adjoint[1]] = $semester_start_ende;
+			}
+			$semester_range = $studienSemesterDateRanges;
+		}
+	}
+
+	private function studienSemesterErmitteln($start_date,$end_date){
+		
+		// gets all studiensemester from the student from start_date to end_date
+		$semester_range = $this->StudiensemesterModel->getByDate($start_date,$end_date);
+		$semester_range = array_map( 
+			function($sem)
+			{
+				return $sem->studiensemester_kurzbz;
+			},
+			$this->getDataOrTerminateWithError($semester_range)
+		);
+
+		// if no studiensemester is found for the given timespan, get the nearest studiensemester
+		if(count($semester_range) == 0)
+		{
+			$aktuelle_studiensemester = $this->StudiensemesterModel->getNearest();
+			$aktuelle_studiensemester = $this->getDataOrTerminateWithError($aktuelle_studiensemester);
+			if (count($aktuelle_studiensemester) == 0) {
+				$this->terminateWithError("No aktuelles semester");
+			}
+			$aktuelle_studiensemester = current($aktuelle_studiensemester)->studiensemester_kurzbz;
+			// push aktuelles semester in active semester array
+			array_push($semester_range, $aktuelle_studiensemester);
+
+		}
+		return $semester_range;
+	}
+
 }
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 92d03b701..01d8dd792 100644
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -220,12 +220,18 @@ class Stundenplan_model extends DB_Model
 			$query .= " AND ( ";
 		} 
 		
-		foreach($semester as $sem => $date_range)
+		foreach($semester as $sem => $semester_date_range)
 		{
-			if(count($gruppen[$sem]) > 0)
+			
+			foreach($semester_date_range as $sem_date => $sem_date_range)
 			{
+				// if there are not groups for the semester skip the iteration step
+				if(!array_key_exists($sem_date,$gruppen) || count($gruppen[$sem_date]) == 0)
+				{
+					continue;
+				}
 				// converts the array of gruppen strings into a sql IN (_,_,_) chain
-				$query .="(sp.gruppe_kurzbz IN (" .implode(',',$gruppen[$sem]).") AND sp.datum BETWEEN ".$this->escape($date_range->start)." AND ".$this->escape($date_range->ende)." )";
+				$query .="(sp.gruppe_kurzbz IN (" .implode(',',$gruppen[$sem_date]).") AND sp.datum BETWEEN ".$this->escape($sem_date_range->start)." AND ".$this->escape($sem_date_range->ende)." )";
 				
 				// adds the OR sql chain only if the $studentlehrverbaende array is not empty 
 				// DOES not include the sql OR if the $studentlehrverbaende are empty and it is the last gruppen element in the iteration 
@@ -233,29 +239,32 @@ class Stundenplan_model extends DB_Model
 				{
 					$query .="OR";
 				}
+				
 			}
-		}
+		} 
 		
-		foreach($semester as $sem=>$date_range)
+		foreach($semester as $sem=>$semester_date_range)
 		{
-
-			if(count($studentlehrverbaende[$sem]) > 0)
+			foreach($semester_date_range as $sem_date => $sem_date_range)
 			{
-				foreach($studentlehrverbaende[$sem] as $key=>$lehrverband)
+				if(!array_key_exists($sem_date,$studentlehrverbaende) || count($studentlehrverbaende[$sem_date]) == 0)
+				{
+					continue;
+				}
+				foreach($studentlehrverbaende[$sem_date] as $key=>$lehrverband)
 				{
 					// adds the OR sql chain only if its not the first element in the first semester of the $studentlehrverbaende array
-					if($lehrverband != $studentlehrverbaende[array_keys($semester)[0]][0])
+					if($sem != array_keys($semester)[0] || $key != array_keys($semester)[0])
 					{
 						$query .="OR";
 					}
-					$query .= "((sp.studiengang_kz = ".$this->escape($lehrverband->studiengang_kz)." AND sp.semester = ".$this->escape($lehrverband->semester)." AND sp.verband = ".$this->escape($lehrverband->verband)." AND sp.gruppe = ".$this->escape($lehrverband->gruppe)." AND sp.datum BETWEEN ".$this->escape($date_range->start)." AND ".$this->escape($date_range->ende).")";
+					$query .= "((sp.studiengang_kz = ".$this->escape($lehrverband->studiengang_kz)." AND sp.semester = ".$this->escape($lehrverband->semester)." AND sp.verband = ".$this->escape($lehrverband->verband)." AND sp.gruppe = ".$this->escape($lehrverband->gruppe)." AND sp.datum BETWEEN ".$this->escape($sem_date_range->start)." AND ".$this->escape($sem_date_range->ende).")";
 					// Eintraege fuer den ganzen Verband
-					$query .= "OR (sp.studiengang_kz = ".$this->escape($lehrverband->studiengang_kz)." AND sp.semester = ".$this->escape($lehrverband->semester)." AND sp.verband = ".$this->escape($lehrverband->verband)." AND (sp.gruppe is null OR sp.gruppe='') AND sp.datum BETWEEN ".$this->escape($date_range->start)." AND ".$this->escape($date_range->ende).")";
+					$query .= "OR (sp.studiengang_kz = ".$this->escape($lehrverband->studiengang_kz)." AND sp.semester = ".$this->escape($lehrverband->semester)." AND sp.verband = ".$this->escape($lehrverband->verband)." AND (sp.gruppe is null OR sp.gruppe='') AND sp.datum BETWEEN ".$this->escape($sem_date_range->start)." AND ".$this->escape($sem_date_range->ende).")";
 					// Eintraege fuer das ganze Semester
-					$query .= "OR (sp.studiengang_kz = ".$this->escape($lehrverband->studiengang_kz)." AND sp.semester = ".$this->escape($lehrverband->semester)." AND (sp.verband is null OR sp.verband='') AND sp.datum BETWEEN ".$this->escape($date_range->start)." AND ".$this->escape($date_range->ende).") AND gruppe_kurzbz is null)";
+					$query .= "OR (sp.studiengang_kz = ".$this->escape($lehrverband->studiengang_kz)." AND sp.semester = ".$this->escape($lehrverband->semester)." AND (sp.verband is null OR sp.verband='') AND sp.datum BETWEEN ".$this->escape($sem_date_range->start)." AND ".$this->escape($sem_date_range->ende).") AND gruppe_kurzbz is null)";
 				}
-				
-			}
+			}	
 		}
 
 		// closes the AND sql chain only if it was opened previously

From 933ca20e6588277356db4e8c63fb198489c35315 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 21 Nov 2024 13:27:39 +0100
Subject: [PATCH 1440/1461] tabulator in cms content -> sanitize table header
 contructs breaking tabulator;

---
 public/js/apps/Cis/Cms.js                     |  5 ++-
 .../Cis/Cms/Content_types/General.js          | 34 +++++++++++++------
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/public/js/apps/Cis/Cms.js b/public/js/apps/Cis/Cms.js
index b0a5ccd3c..d654395fd 100644
--- a/public/js/apps/Cis/Cms.js
+++ b/public/js/apps/Cis/Cms.js
@@ -1,8 +1,8 @@
 import BsConfirm from "../../components/Bootstrap/Confirm.js";
-//import Pagination from "../../components/Pagination/Pagination.js";
 import CmsNews from "../../components/Cis/Cms/News.js";
 import CmsContent from "../../components/Cis/Cms/Content.js";
 import Phrasen from "../../plugin/Phrasen.js";
+import {setScrollbarWidth} from "../../helpers/CssVarCalcHelpers";
 
 
 const app = Vue.createApp({
@@ -35,6 +35,9 @@ const app = Vue.createApp({
     });
   },
 });
+
+setScrollbarWidth();
+
 app.use(primevue.config.default, { zIndex: { overlay: 9999 } });
 app.use(Phrasen, {reload: true});
 app.mount("#cms");
diff --git a/public/js/components/Cis/Cms/Content_types/General.js b/public/js/components/Cis/Cms/Content_types/General.js
index 8c1ab5cf3..0c938943a 100644
--- a/public/js/components/Cis/Cms/Content_types/General.js
+++ b/public/js/components/Cis/Cms/Content_types/General.js
@@ -29,17 +29,26 @@ export default {
 				u.parentNode.removeChild(u)
 				
 			})
-			
+
 			// find bare text nodes and put into p element
-			const td = Array.from(table.querySelectorAll('td')).filter(el => el.scrollWidth > 200)
+			const td = Array.from(table.querySelectorAll('td')).filter(el => el.scrollWidth > 100)
 			td.forEach(element => {
 				if (element.firstChild?.nodeType === Node.TEXT_NODE && element.firstChild.length > 10) {
-					const div = document.createElement('p');
-					div.appendChild(element.firstChild)
-					element.appendChild(div);
+					const p = document.createElement('p');
+					p.appendChild(element.firstChild)
+					element.appendChild(p);
 				}
 			});
 
+			// flatten nested th elements
+			const ths = Array.from(table.querySelectorAll('th'))
+			ths.forEach(th => {
+
+				if(th.children.length > 1) {
+					th.innerHTML = Array.from(th.childNodes).find(cn => cn.textContent).textContent
+				}
+			})
+
 			// let p elements wrap on overflow
 			const p = table.querySelectorAll('p')
 			p.forEach(p => {
@@ -50,13 +59,14 @@ export default {
 		}
 	},
     mounted(){
-
 		// replaces the tablesorter with the tabulator
-		let tables = document.getElementsByClassName("tablesorter");
-		
-		for (let table of tables) {
+		let tables = Array.from(document.getElementsByClassName("tablesorter"));
+
+		tables.forEach((table, index) =>  {
 			this.sanitizeLegacyTables(table)
+			
 			new Tabulator(table, {
+				index: index,
 				layout: "fitDataFill",
 
 				columnDefaults: {
@@ -65,7 +75,7 @@ export default {
 					minWidth: "100px"
 				}
 			})
-		}
+		})
 
         document.querySelectorAll("#cms [data-confirm]").forEach((el) => {
             el.addEventListener("click", (evt) => {
@@ -91,7 +101,9 @@ export default {
     },
     template: /*html*/ `
       <!-- div that contains the content -->
-      <div v-html="content" v-if="content" ></div>
+      <div v-if="content" class="container" style="max-width: 100%;"><div class="row"><div class="col">
+      	<div v-html="content"  ></div>
+      </div></div></div>
       <p v-else>Content was not found</p>
       `,
   };

From 8eb7d18ff98c322d44fd42dae90416d7733f1aa7 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 21 Nov 2024 14:04:35 +0100
Subject: [PATCH 1441/1461] remove C4 Menu from checksystem

---
 system/dbupdate_3.4.php               |   1 -
 system/dbupdate_3.4/25999_C4_Menu.php | 802 --------------------------
 2 files changed, 803 deletions(-)
 delete mode 100644 system/dbupdate_3.4/25999_C4_Menu.php

diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index 2f4f38608..a4ef7d44f 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -65,7 +65,6 @@ require_once('dbupdate_3.4/41150_oe-pfad_db_view.php');
 require_once('dbupdate_3.4/44031_stv_favorites.php');
 require_once('dbupdate_3.4/40896_kennzeichnung_unruly_person.php');
 require_once('dbupdate_3.4/39911_tabulator_in_contentmittitel.php');
-require_once('dbupdate_3.4/25999_C4_Menu.php');
 require_once('dbupdate_3.4/25999_C4_permission.php');
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
diff --git a/system/dbupdate_3.4/25999_C4_Menu.php b/system/dbupdate_3.4/25999_C4_Menu.php
deleted file mode 100644
index caa337aea..000000000
--- a/system/dbupdate_3.4/25999_C4_Menu.php
+++ /dev/null
@@ -1,802 +0,0 @@
-<?php
-
-// this file can be efficiently searched by searching for the symbol '~' which is attached to each heading of (content, contentsprache, contentchilds)
-
-$TLC_content_latest_version = '<content><titel><![CDATA[Das Teaching & Learning Center - Viele Aufgaben, viele Köpfe, viel Expertise]]></titel><inhalt><![CDATA[<table style="width: 80%;" cellspacing="0" cellpadding="0" border="0"><tbody><tr><td class="cmscontent " rowspan="3" valign="top"><table id="t1" style="width: 100%;" border="0" align="left"><tbody><tr><td><h2><strong style="font-size: small;">Erreichbarkeit Student-Support:&nbsp;</strong></h2><p><span style="font-size: small;">F&uuml;r Studierende:&nbsp;</span><br /><span style="font-size: small;">E:&nbsp;<a href="mailto:studentsupport@technikum-wien.at">studentsupport@technikum-wien.at<br /></a></span><span style="font-size: small;">WhatsApp: <a href="https://wa.me/message/5MDJTULYMUU7G1" target="_blank">+43 664 889 60 947</a></span><br /><span style="font-size: small;">R: B2.07<br /><br />F&uuml;r Lehrende:<br /><span>E:&nbsp;</span><a href="mailto:teachingsupport@technikum-wien.at">teachingsupport@technikum-wien.at<br /></a><span>R: A0.05<br /><br />Pre-Student:<br />E:&nbsp;</span><a href="mailto:prestudent@technikum-wien.at" rel="noopener noreferrer" class="op-uc-link">prestudent@technikum-wien.at<br /></a>R: B1.14</span></p></td><td><p><strong><span style="font-size: small;">Erreichbarkeit Moodle-Support:&nbsp; &nbsp;&nbsp;</span></strong></p><p><span style="font-size: small;"><strong>Di - Mi&nbsp; &nbsp; &nbsp; &nbsp;10:00 - 15:00&nbsp; &nbsp;<br />Do&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;12:00 - 16:00<br /></strong><br /></span></p><p style="text-align: left;"><span style="font-size: small; text-align: center;"><br />T:&nbsp;+43 1 333 40 77 - 233<br />E:&nbsp;<a href="mailto:moodle@technikum-wien.at">moodle@technikum-wien.at<br /></a>R: A0.05<br /><br /><br /><a href="https://moodle.technikum-wien.at/course/view.php?id=13353">Moodlekurs Study@FHTW&nbsp;</a><br /><a href="https://moodle.technikum-wien.at/course/view.php?id=16619&amp;section=3">Moodlekurs FHTW-Infobase Lehrende</a></span></p></td><td><p><img src="dms.php?id=247112" width="250" height="295" /></p></td></tr><tr><td><br /><br /></td><td align="left" valign="top"><span style="font-size: small;"><br /></span></td><td align="left" valign="top"><strong><span style="font-size: small;">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;E:&nbsp;</span></strong><a href="mailto:tlc@technikum-wien.at"><strong><span style="font-size: small;">tlc@technikum-wien.at</span></strong><br /></a></td></tr></tbody></table><br /><br /><table class="tablesorter tablesorter_col_0 tablesorter_sort_0" id="t1" style="width: 100%;" border="0" align="left"><thead><tr><th>Leitung</th><th>Arbeitsbereich</th><th>Kontakt</th></tr></thead><tbody><tr><td style="width: 180px;">Lingo, Sylvia</td><td style="width: 320px;">Leitung.</td><td>T. +43 1 3334077 - 4752<br />M. <a href="mailto:sylvia.lingo@technikum-wien.at">sylvia.lingo@technikum-wien.at</a><br />R. B1.13</td></tr></tbody></table><br /><br /><table class="tablesorter tablesorter_col_0 tablesorter_sort_0" id="t1" style="width: 100%;" border="0" align="left"><thead><tr><th><b>Student Support<br /></b><b><a href="mailto:studentsupport@technikum-wien.at" title="mailto:studentsupport@technikum-wien.at">studentsupport@technikum-wien.at</a><a href="mailto:tereza.obrucova@technikum-wien.at">&nbsp;</a></b></th><th>Arbeitsbereich</th><th>Kontakt</th></tr></thead><tbody><tr><td style="width: 180px;"><span>Czedron, Nina</span></td><td style="width: 320px;"><span>Administration, interne Kommunikation, Personal, Bestellwesen.</span></td><td><span>T. +43 1 333 40 77 - 4137</span><br /><span>M.&nbsp;</span><a href="mailto:nina.czedron@technikum-wien.at">nina.czedron@technikum-wien.at</a><br /><span>R. B1.13</span></td></tr><tr><td style="width: 180px;"><span>Lang, Julia Maria</span></td><td style="width: 320px;">Pre-Student-Support (<a href="mailto:prestudent@technikum-wien.at" rel="noopener noreferrer" class="op-uc-link">prestudent@technikum-wien.at</a>):<span><br />Qualifikationskurse, Warm- Up Kurse, FiT- Vorqualifizierungen, Erg&auml;nzungspr&uuml;fungen.</span></td><td>T.&nbsp;+43 1 333 40 77 - 5532<br />M.&nbsp;<span><a href="mailto:julia_maria.lang@technikum-wien.at" title="mailto:julia_maria.lang@technikum-wien.at">julia_maria.lang@technikum-wien.at<br /></a></span>R.&nbsp;B1.14</td></tr><tr><td style="width: 180px;"></td><td style="width: 320px;"><p class="op-uc-p"><span>Schreibwerkstatt</span></p></td><td><span>T.&nbsp;</span><br /><span>M.</span><a href="mailto:nefise.top@technikum-wien.at"><br /></a><span>R.</span></td></tr><tr><td style="width: 180px;"><span><span>M&uuml;hlbacher, Stefan<br /></span></span></td><td style="width: 320px;">Pre-Student-Support (<a href="mailto:prestudent@technikum-wien.at" rel="noopener noreferrer" class="op-uc-link">prestudent@technikum-wien.at</a>):<span><br />Qualifikationskurse, Warm-Up Kurse, FiT-Vorqualifizierungen, Erg&auml;nzungspr&uuml;fungen.</span></td><td><span>T.&nbsp;+43 1 333 40 77 - 3610</span><br /><span>M.&nbsp;</span><a href="mailto:stefan.muehlbacher@technikum-wien.at">stefan.muehlbacher@technikum-wien.at</a><a href="mailto:nefise.top@technikum-wien.at"><br /></a><span>R. B1.14</span></td></tr><tr><td style="width: 180px;"><span><span><span><span><span><span>Obručov&aacute;, Tereza</span></span><br /></span></span></span></span></td><td style="width: 320px;">Lernberatung, Short Tracks,&nbsp;Planung Welcome Days.</td><td><span><span>T.&nbsp;0664-8205594</span><br /><span>M.&nbsp;</span><a href="mailto:tereza.obrucova@technikum-wien.at">tereza.obrucova@technikum-wien.at<br /></a><span>R. B2.07</span></span></td></tr><tr><td style="width: 180px;">Wicker, Larissa</td><td style="width: 320px;">Studierenden-Support,&nbsp;Pre-Student-Support, Betreuung der Jahrgangsvertreter*innen.</td><td>T. 0664-88348182<br />M. <a href="mailto:larissa.wicker@technikum-wien.at">larissa.wicker@technikum-wien.at</a><br />R. B2.07</td></tr></tbody></table><br /><br /><table class="tablesorter tablesorter_col_0 tablesorter_sort_0" id="t1" style="width: 100%;" border="0" align="left"><thead><tr><th><b>Teaching support<br /></b><b><span><a href="mailto:teachingsupport@technikum-wien.at" title="mailto:teachingsupport@technikum-wien.at">teachingsupport@technikum-wien.at</a></span></b><span>&nbsp;</span></th><th>Arbeitsbereich</th><th>Kontakt</th></tr></thead><tbody><tr><td style="width: 180px;"><span>Kert&eacute;sz, D&oacute;ra</span></td><td style="width: 320px;">Medien- und hochschuldidaktische Beratung Ansprechpartnerin:&nbsp;Internes Weiterbildungsangebot f&uuml;r Lehrende&nbsp;(Didaktik).</td><td>T. +43 1 333 40 77 - <span>6715</span><br />M. <a class="Item" href="mailto:dora.kertesz@technikum-wien.at">dora.kertesz@technikum-wien.at</a><a href="mailto:ingrid.preusche@technikum-wien.at"></a><br />R. A0.05</td></tr><tr><td style="width: 180px;">Lanickova, Katerina<br /><em>In Karenz</em></td><td style="width: 320px;">Medien- und hochschuldidaktische Beratung Ansprechpartnerin:&nbsp;Beratungsangebot f&uuml;r Lehrende&nbsp;(Didaktik).</td><td>T. 43 1 333 40 77 - 5406<br />M. <a href="mailto:katerina.lanickova@technikum-wien.at">katerina.lanickova@technikum-wien.at</a><br />R. A0.05</td></tr><tr><td style="width: 180px;">L&uuml;nenborg, Yasmin Ruth<br /><em>In Karenz</em></td><td style="width: 320px;">Medien- und hochschuldidaktische Beratung Ansprechpartnerin:&nbsp;LV-Entwicklung&nbsp;(kollegiale Reflexionsgespr&auml;che).</td><td>T. +43 1 3334077 - 8394<br />M.&nbsp;<a class="Item" href="mailto:yasmin_ruth.luenenborg@technikum-wien.at">yasmin_ruth.luenenborg@technikum-wien.at</a><br />R. A0.05</td></tr><tr><td style="width: 180px;"><span>Schnabel,&nbsp;<span>Lukas</span></span></td><td style="width: 320px;">Medien- und hochschuldidaktische Beratung Ansprechpartnerin:&nbsp;LV-Entwicklung&nbsp;(kollegiale Reflexionsgespr&auml;che).</td><td>T. <span>+43 664 820 54 76</span><br />M.&nbsp;<a href="mailto:lukas.schnabel@technikum-wien.at">lukas.schnabel@technikum-wien.at</a><a class="Item" href="mailto:lukas.schnabel@technikum-wien.at"></a><br />R. A0.05</td></tr><tr><td style="width: 180px;"><span>Grabher, Linus</span></td><td style="width: 320px;"><span>Teaching Support,&nbsp;Pre-Student-Support.</span></td><td>M. <a href="mailto:linus.grabher@technikum-wien.at">linus.grabher@technikum-wien.at<br /></a>R. A0.05</td></tr></tbody></table><br /><br /><table class="tablesorter tablesorter_col_0 tablesorter_sort_0" id="t1" style="width: 100%;" border="0" align="left"><thead><tr><th>eLearning Tools | Moodle<br /><b><a href="mailto:moodle@technikum-wien.at">moodle@technikum-wien.at</a></b></th><th>Arbeitsbereich</th><th>Kontakt</th></tr></thead><tbody><tr><td style="width: 180px;">Perkovic, Patrick</td><td style="width: 320px;">Lehrenden- und Studierenden-Support eLearning Tools | Moodle.</td><td>T.&nbsp;+43 1 333 40 77 - 2209<br />M.&nbsp;<a href="mailto:patrick.perkovic@technikum-wien.at">patrick.perkovic@technikum-wien.at</a><br />R<a class="Item" href="mailto:patrick.perkovic@technikum-wien.at"></a>. A0.05</td></tr><tr><td style="width: 180px;">Kovacevic, Selma</td><td style="width: 320px;">Lehrenden- und Studierenden-Support eLearning Tools | Moodle.</td><td>T. +43 1 333 40 77 - 7236<br />M. <a href="mailto:selma.kovacevic@technikum-wien.at">selma.kovacevic@technikum-wien.at</a><br />R. A0.05</td></tr><tr><td style="width: 180px;"><span>Bogosavljevic,&nbsp;<span>Nikola</span></span></td><td style="width: 320px;"><span>Leitung.<br /><br /></span>Lehrenden- und Studierenden-Support eLearning Tools | Moodle.</td><td>T.&nbsp;+43 1 333 40 77 - 3443<br />M.&nbsp;<a class="Item" href="mailto:nikola.bogosavljevic@technikum-wien.at">nikola.bogosavljevic@technikum-wien.at</a><br />R. A0.05</td></tr></tbody></table><br /><br /><table class="tablesorter tablesorter_col_0 tablesorter_sort_0" id="t1" style="width: 100%;" border="0" align="left"><thead><tr><th><b>Bibliothek<br /></b><b><a href="mailto:bibliothek@technikum-wien.at">bibliothek@technikum-wien.at</a></b>&nbsp;</th><th>Arbeitsbereich</th><th>Kontakt</th></tr></thead><tbody><tr><td style="width: 180px;"><span>Astf&auml;ller, Alexia</span></td><td style="width: 320px;"><p class="op-uc-p"><span>Bestellung Print- und e-Medien, Info-Theke, Medien-Erschlie&szlig;ung, Publikationsdatenbank, Projekte.</span></p></td><td>T: +43 1 333 40 77-5428<br />E:<span>&nbsp;</span><span><a href="mailto:alexia.astfaeller@technikum-wien.at">alexia.astfaeller@technikum-wien.at<br /></a></span>R: A4.09</td></tr><tr><td style="width: 180px;"><span>Baier, Margit</span></td><td style="width: 320px;"><p>Leitung.</p><p>e-Ressourcen-Pakete, Open Access, Projekte, Planung und Koordination.</p></td><td>T: +43 1 333 40 77-3390<br />E:&nbsp;<span><a href="mailto:margit.baier@technikum-wien.at">margit.baier@technikum-wien.at</a><br /></span>R: A4.09</td></tr><tr><td style="width: 180px;"><span>Metz, Sonja<br /><br /></span></td><td style="width: 320px;"><p>Bestellung Print- und e-Medien, Info-Theke, Medien-Erschlie&szlig;ung, Hochschulschriften-Datenbank.</p></td><td>T: <span>+43 1 333 40 77 - 4365</span><br />E:&nbsp;<a class="Item" href="mailto:sonja.metz@technikum-wien.at">sonja.metz@technikum-wien.at</a><a href="mailto:alexia.astfaeller@technikum-wien.at"><br /></a>R: A4.09</td></tr><tr><td style="width: 180px;"><span>Deimbacher-Sand, Maya</span></td><td style="width: 320px;">Bestellung Print- und e-Medien, Info-Theke, Medien-Erschlie&szlig;ung / Field of work: Ordering Print and e-Media, Information Desk, Media Indexing.<p></p></td><td>T: +43 1 333 40 77-4088 <br />E: <a href="mailto:maya.deimbacher-sand@technikum-wien.at">maya.deimbacher-sand@technikum-wien.at</a> <br />R: A4.09</td></tr></tbody></table></td></tr></tbody></table><p></p><h2 style="text-align: left;"><strong>Erreichbarkeit Bibliothek:&nbsp;</strong></h2><p style="text-align: left;"><span style="font-size: small;">E:&nbsp;<a href="mailto:bibliothek@technikum-wien.at">bibliothek@technikum-wien.at</a>&nbsp; &nbsp;<span style="white-space: pre;"> </span></span></p><p style="text-align: left;"><span style="font-size: small;">R: A4.09</span></p><h2 style="text-align: left;">&Ouml;ffnungszeiten:</h2><table rules="rows" cellspacing="0" cellpadding="2" border="0" align="center" style="float: left;"><tbody><tr><td><span style="font-size: small;">Montag:</span></td><td><span style="font-size: small;">13:00 Uhr - 18:00 Uhr</span></td></tr><tr><td><span style="font-size: small;">Dienstag:</span></td><td><span style="font-size: small;">10:00 Uhr - 19:00 Uhr</span></td></tr><tr><td><span style="font-size: small;">Mittwoch:</span></td><td><span style="font-size: small;">10:00 Uhr - 18:00 Uhr</span></td></tr><tr><td><span style="font-size: small;">Donnerstag:</span></td><td><span style="font-size: small;">10:00 Uhr - 18:00 Uhr</span></td></tr><tr><td><span style="font-size: small;">Freitag:</span></td><td><span style="font-size: small;">13:00 Uhr - 18:00 Uhr</span></td></tr></tbody></table><br /><br /><br /><br /><br /><br /><br /><br /><span style="font-size: small;"><br />Mehr Informationen zur Bibliothek unter:&nbsp;<a href="content.php?content_id=6794">https://cis.technikum-wien.at/cms/content.php?content_id=6794</a> und im Moodle-Kurs&nbsp;<a href="https://moodle.technikum-wien.at/course/view.php?id=20218">https://moodle.technikum-wien.at/course/view.php?id=20218</a></span><br /><div><span style="box-sizing: border-box; font-weight: bolder;"><br /></span></div><div><span style="box-sizing: border-box; font-weight: bolder;"><br /></span></div>]]></inhalt></content>';
-
-if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibung='CIS4_ROOT'")) {
-
-    if ($db->db_num_rows($result) == 0) {
-
-		if (!$db->db_query("BEGIN;")) 
-		{
-			echo '<strong>wasnt able to start transaction for CIS4_ROOT_MENU: ' . $db->db_last_error() . '</strong><br>';
-		}
-		else
-		{
-
-			$qry =
-				"
-
-				-- ~##################################### CONTENT
-
-				-- CIS4_ROOT
-
-				INSERT INTO campus.tbl_content 
-				(template_kurzbz, oe_kurzbz, insertamum, insertvon, updateamum, updatevon, aktiv, menu_open, beschreibung)
-				VALUES  
-				(
-					'contentmittitel','etw',NOW(),null,null,null,TRUE,FALSE,'CIS4_ROOT'
-				);
-
-				-- MEIN_STUDIUM
-
-				INSERT INTO campus.tbl_content 
-				(template_kurzbz, oe_kurzbz, insertamum, insertvon, updateamum, updatevon, aktiv, menu_open, beschreibung)
-				VALUES  
-				(
-					'redirect','etw',NOW(),null,null,null,TRUE,FALSE,'MEIN_STUDIUM'
-				);
-
-				-- VPN_STUDIERENDE
-
-				INSERT INTO campus.tbl_content 
-				(template_kurzbz, oe_kurzbz, insertamum, insertvon, updateamum, updatevon, aktiv, menu_open, beschreibung)
-				VALUES  
-				(
-					'redirect','etw',NOW(),null,null,null,TRUE,FALSE,'VPN_STUDIERENDE'
-				);
-
-				-- PROFIL
-
-				INSERT INTO campus.tbl_content 
-				(template_kurzbz, oe_kurzbz, insertamum, insertvon, updateamum, updatevon, aktiv, menu_open, beschreibung)
-				VALUES  
-				(
-					'redirect','etw',NOW(),null,null,null,TRUE,FALSE,'PROFIL'
-				);
-
-				-- NEWS
-
-				INSERT INTO campus.tbl_content 
-				(template_kurzbz, oe_kurzbz, insertamum, insertvon, updateamum, updatevon, aktiv, menu_open, beschreibung)
-				VALUES  
-				(
-					'redirect','etw',NOW(),null,null,null,TRUE,FALSE,'NEWS'
-				);
-
-				-- DOKUMENTE
-
-				INSERT INTO campus.tbl_content 
-				(template_kurzbz, oe_kurzbz, insertamum, insertvon, updateamum, updatevon, aktiv, menu_open, beschreibung)
-				VALUES  
-				(
-					'redirect','etw',NOW(),null,null,null,TRUE,FALSE,'DOKUMENTE'
-				);
-
-				-- STUDIENBETRIEB
-
-				INSERT INTO campus.tbl_content 
-				(template_kurzbz, oe_kurzbz, insertamum, insertvon, updateamum, updatevon, aktiv, menu_open, beschreibung)
-				VALUES  
-				(
-					'redirect','etw',NOW(),null,null,null,TRUE,FALSE,'STUDIENBETRIEB'
-				);
-
-				-- VORLAGEN
-
-				INSERT INTO campus.tbl_content 
-				(template_kurzbz, oe_kurzbz, insertamum, insertvon, updateamum, updatevon, aktiv, menu_open, beschreibung)
-				VALUES  
-				(
-					'redirect','Unternehmenskommunikation',NOW(),null,null,null,TRUE,FALSE,'VORLAGEN'
-				);
-
-				-- TLC
-
-				INSERT INTO campus.tbl_content 
-				(template_kurzbz, oe_kurzbz, insertamum, insertvon, updateamum, updatevon, aktiv, menu_open, beschreibung)
-				VALUES  
-				(
-					'contentmittitel','tlc',NOW(),null,null,null,TRUE,FALSE,'TLC'
-				);
-
-				-- STUNDENPLAN
-
-				INSERT INTO campus.tbl_content 
-				(template_kurzbz, oe_kurzbz, insertamum, insertvon, updateamum, updatevon, aktiv, menu_open, beschreibung)
-				VALUES  
-				(
-					'redirect','etw',NOW(),null,null,null,TRUE,FALSE,'STUNDENPLAN'
-				);
-
-				-- MYLV
-
-				INSERT INTO campus.tbl_content 
-				(template_kurzbz, oe_kurzbz, insertamum, insertvon, updateamum, updatevon, aktiv, menu_open, beschreibung)
-				VALUES  
-				(
-					'redirect','etw',NOW(),null,null,null,TRUE,FALSE,'MYLV'
-				);
-
-				-- DASHBOARD
-
-				INSERT INTO campus.tbl_content 
-				(template_kurzbz, oe_kurzbz, insertamum, insertvon, updateamum, updatevon, aktiv, menu_open, beschreibung)
-				VALUES  
-				(
-					'redirect','etw',NOW(),null,null,null,TRUE,FALSE,'DASHBOARD'
-				);
-
-				-- BESTÄTIGUNGEN_ZEUGNISSE
-
-				INSERT INTO campus.tbl_content 
-				(template_kurzbz, oe_kurzbz, insertamum, insertvon, updateamum, updatevon, aktiv, menu_open, beschreibung)
-				VALUES  
-				(
-					'redirect','etw',NOW(),null,null,null,TRUE,FALSE,'BESTÄTIGUNGEN_ZEUGNISSE'
-				);
-
-				-- ~##################################### CONTENTSPRACHE
-
-				-- CIS4_ROOT
-
-				INSERT INTO campus.tbl_contentsprache 
-				(sprache, content_id, version, sichtbar, content, reviewvon, reviewamum, updateamum, updatevon, insertamum, insertvon, titel, gesperrt_uid)
-				VALUES  
-				(
-					'German',
-					-- queries the content_id for the CIS4_ROOT
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'CIS4_ROOT'),
-					1,TRUE,'<content></content>',null,null,null,null,NOW(),null,'Cis40',null
-				);
-
-				-- MEIN_STUDIUM
-
-				INSERT INTO campus.tbl_contentsprache 
-				(sprache, content_id, version, sichtbar, content, reviewvon, reviewamum, updateamum, updatevon, insertamum, insertvon, titel, gesperrt_uid)
-				VALUES  
-				(
-					'German',
-					-- queries the content_id for the MEIN_STUDIUM
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'MEIN_STUDIUM'),
-					1,TRUE,
-					'<content><url><![CDATA[#Mein Studium]]></url><target><![CDATA[_self]]></target></content>',
-					null,null,null,null,NOW(),null,'Mein Studium',null
-				);
-
-				-- VPN_STUDIERENDE
-
-				INSERT INTO campus.tbl_contentsprache 
-				(sprache, content_id, version, sichtbar, content, reviewvon, reviewamum, updateamum, updatevon, insertamum, insertvon, titel, gesperrt_uid)
-				VALUES  
-				(
-					'German',
-					-- queries the content_id for the VPN_STUDIERENDE
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'VPN_STUDIERENDE'),
-					1,TRUE,
-					'<content><url><![CDATA[#VPN]]></url><target><![CDATA[_self]]></target></content>',
-					null,null,null,null,NOW(),null,'VPN Neu - Zugang für Student*innen',null
-				);
-
-				-- PROFIL
-
-				INSERT INTO campus.tbl_contentsprache 
-				(sprache, content_id, version, sichtbar, content, reviewvon, reviewamum, updateamum, updatevon, insertamum, insertvon, titel, gesperrt_uid)
-				VALUES  
-				(
-					'German',
-					-- queries the content_id for the PROFIL
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'PROFIL'),
-					1,TRUE,
-					'<content><url><![CDATA[../cis.php/Cis/Profil]]></url><target><![CDATA[]]></target></content>',
-					null,null,null,null,NOW(),null,'Profil',null
-				);
-
-				-- NEWS
-
-				INSERT INTO campus.tbl_contentsprache 
-				(sprache, content_id, version, sichtbar, content, reviewvon, reviewamum, updateamum, updatevon, insertamum, insertvon, titel, gesperrt_uid)
-				VALUES  
-				(
-					'German',
-					-- queries the content_id for the NEWS
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'NEWS'),
-					1,TRUE,
-					'<content><url><![CDATA[../cms/news.php]]></url><target><![CDATA[content]]></target></content>',
-					null,null,null,null,NOW(),null,'News',null
-				);
-
-				-- DOKUMENTE
-
-				INSERT INTO campus.tbl_contentsprache 
-				(sprache, content_id, version, sichtbar, content, reviewvon, reviewamum, updateamum, updatevon, insertamum, insertvon, titel, gesperrt_uid)
-				VALUES  
-				(
-					'German',
-					-- queries the content_id for the DOKUMENTE
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'DOKUMENTE'),
-					1,TRUE,
-					'<content><url><![CDATA[#Dokumente]]></url><target><![CDATA[_self]]></target></content>',
-					null,null,null,null,NOW(),null,'Dokumente',null
-				);
-
-				-- STUDIENBETRIEB
-
-				INSERT INTO campus.tbl_contentsprache 
-				(sprache, content_id, version, sichtbar, content, reviewvon, reviewamum, updateamum, updatevon, insertamum, insertvon, titel, gesperrt_uid)
-				VALUES  
-				(
-					'German',
-					-- queries the content_id for the STUDIENBETRIEB
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUDIENBETRIEB'),
-					1,TRUE,
-					'<content><url><![CDATA[#Studienbetrieb]]></url><target><![CDATA[_self]]></target></content>',
-					null,null,null,null,NOW(),null,'Studienbetrieb',null
-				);
-
-				-- VORLAGEN
-
-				INSERT INTO campus.tbl_contentsprache 
-				(sprache, content_id, version, sichtbar, content, reviewvon, reviewamum, updateamum, updatevon, insertamum, insertvon, titel, gesperrt_uid)
-				VALUES  
-				(
-					'German',
-					-- queries the content_id for the VORLAGEN
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'VORLAGEN'),
-					1,TRUE,
-					'<content><url><![CDATA[#Vorlagen]]></url><target><![CDATA[_self]]></target></content>',
-					null,null,null,null,NOW(),null,'Vorlagen',null
-				);
-
-				-- TLC
-
-				INSERT INTO campus.tbl_contentsprache 
-				(sprache, content_id, version, sichtbar, content, reviewvon, reviewamum, updateamum, updatevon, insertamum, insertvon, titel, gesperrt_uid)
-				VALUES  
-				(
-					'German',
-					-- queries the content_id for the TLC
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'TLC'),
-					1,TRUE,
-					-- queries the content of the latest german TLC version
-					(SELECT content FROM campus.tbl_contentsprache WHERE sprache ='German' AND titel='TLC' AND version = ( SELECT MAX(version) FROM campus.tbl_contentsprache WHERE sprache ='German' AND titel='TLC') ),
-					null,null,null,null,NOW(),null,'TLC',null
-				);
-
-				-- STUNDENPLAN
-				
-				INSERT INTO campus.tbl_contentsprache 
-				(sprache, content_id, version, sichtbar, content, reviewvon, reviewamum, updateamum, updatevon, insertamum, insertvon, titel, gesperrt_uid)
-				VALUES  
-				(
-					'German',
-					-- queries the content_id for the STUNDENPLAN
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUNDENPLAN'),
-					1,TRUE,
-					'<content><url><![CDATA[../cis.php/Cis/Stundenplan]]></url><target><![CDATA[]]></target></content>',
-					null,null,null,null,NOW(),null,'Stundenplan',null
-				);
-
-				-- MYLV
-				
-				INSERT INTO campus.tbl_contentsprache 
-				(sprache, content_id, version, sichtbar, content, reviewvon, reviewamum, updateamum, updatevon, insertamum, insertvon, titel, gesperrt_uid)
-				VALUES  
-				(
-					'German',
-					-- queries the content_id for the MYLV
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'MYLV'),
-					1,TRUE,
-					'<content><url><![CDATA[../cis.php/Cis/MyLv]]></url><target><![CDATA[]]></target></content>',
-					null,null,null,null,NOW(),null,'MyLv',null
-				);
-
-				-- DASHBOARD
-				
-				INSERT INTO campus.tbl_contentsprache 
-				(sprache, content_id, version, sichtbar, content, reviewvon, reviewamum, updateamum, updatevon, insertamum, insertvon, titel, gesperrt_uid)
-				VALUES  
-				(
-					'German',
-					-- queries the content_id for the DASHBOARD
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'DASHBOARD'),
-					1,TRUE,
-					'<content><url><![CDATA[../cis.php/Cis4]]></url><target><![CDATA[]]></target></content>',
-					null,null,null,null,NOW(),null,'Dashboard',null
-				);
-
-				-- BESTÄTIGUNGEN_ZEUGNISSE
-				
-				INSERT INTO campus.tbl_contentsprache 
-				(sprache, content_id, version, sichtbar, content, reviewvon, reviewamum, updateamum, updatevon, insertamum, insertvon, titel, gesperrt_uid)
-				VALUES  
-				(
-					'German',
-					-- queries the content_id for the BESTÄTIGUNGEN_ZEUGNISSE
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'BESTÄTIGUNGEN_ZEUGNISSE'),
-					1,TRUE,
-					'<content><url><![CDATA[../cis.php/Cis/Documents]]></url><target><![CDATA[]]></target></content>',
-					null,null,null,null,NOW(),null,'Bestätigungen / Zeugnisse',null
-				);
-
-				-- ~##################################### CONTENTCHILD
-
-				###### CIS4_ROOT childs
-
-				INSERT INTO campus.tbl_contentchild
-				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
-				VALUES
-				(
-					-- queries the content_id for the CIS4_ROOT
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'CIS4_ROOT'),
-					-- queries the content_id for the DASHBOARD
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'DASHBOARD'),
-					NOW(), null, null, null, 1
-				);
-
-				INSERT INTO campus.tbl_contentchild
-				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
-				VALUES
-				(
-					-- queries the content_id for the CIS4_ROOT
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'CIS4_ROOT'),
-					-- queries the content_id for the MEIN_STUDIUM
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'MEIN_STUDIUM'),
-					NOW(), null, null, null, 2
-				);
-
-				INSERT INTO campus.tbl_contentchild
-				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
-				VALUES
-				(
-					-- queries the content_id for the CIS4_ROOT
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'CIS4_ROOT'),
-					-- queries the content_id for the VPN_STUDIERENDE
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'VPN_STUDIERENDE'),
-					NOW(), null, null, null, 3
-				);
-
-				INSERT INTO campus.tbl_contentchild
-				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
-				VALUES
-				(
-					-- queries the content_id for the CIS4_ROOT
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'CIS4_ROOT'),
-					-- queries the content_id for the NEWS
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'NEWS'),
-					NOW(), null, null, null, 4
-				);
-
-				INSERT INTO campus.tbl_contentchild
-				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
-				VALUES
-				(
-					-- queries the content_id for the CIS4_ROOT
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'CIS4_ROOT'),
-					-- 6791 is the content_id for Bibliothek
-					6791, NOW(), null, null, null, 5
-				);
-
-				INSERT INTO campus.tbl_contentchild
-				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
-				VALUES
-				(
-					-- queries the content_id for the CIS4_ROOT
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'CIS4_ROOT'),
-					-- queries the content_id for the DOKUMENTE
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'DOKUMENTE'),
-					NOW(), null, null, null, 6
-				);
-
-				INSERT INTO campus.tbl_contentchild
-				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
-				VALUES
-				(
-					-- queries the content_id for the CIS4_ROOT
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'CIS4_ROOT'),
-					-- queries the content_id for the TLC
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'TLC'),
-					NOW(), null, null, null, 7
-				);
-
-				INSERT INTO campus.tbl_contentchild
-				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
-				VALUES
-				(
-					-- queries the content_id for the CIS4_ROOT
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'CIS4_ROOT'),
-					-- 10487 is the content_id for Modul International Skills
-					10487, NOW(), null, null, null, 8
-				);
-
-				###### Mein Studium childs
-
-				INSERT INTO campus.tbl_contentchild
-				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
-				VALUES
-				(
-					-- queries the content_id for the MEIN_STUDIUM
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'MEIN_STUDIUM'),
-					-- queries the content_id for the STUNDENPLAN
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUNDENPLAN'),
-					NOW(), null, null, null, 1
-				);
-
-				INSERT INTO campus.tbl_contentchild
-				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
-				VALUES
-				(
-					-- queries the content_id for the MEIN_STUDIUM
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'MEIN_STUDIUM'),
-					-- queries the content_id for the MYLV
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'MYLV'),
-					NOW(), null, null, null, 2
-				);
-
-				INSERT INTO campus.tbl_contentchild
-				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
-				VALUES
-				(
-					-- queries the content_id for the MEIN_STUDIUM
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'MEIN_STUDIUM'),
-					-- queries the content_id for the PROFIL
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'PROFIL'),
-					NOW(), null, null, null, 3
-				);
-
-				INSERT INTO campus.tbl_contentchild
-				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
-				VALUES
-				(
-					-- queries the content_id for the MEIN_STUDIUM
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'MEIN_STUDIUM'),
-					-- queries the content_id for the BESTÄTIGUNGEN_ZEUGNISSE
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'BESTÄTIGUNGEN_ZEUGNISSE'),
-					NOW(), null, null, null, 4
-				);
-
-				INSERT INTO campus.tbl_contentchild
-				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
-				VALUES
-				(
-					-- queries the content_id for the MEIN_STUDIUM
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'MEIN_STUDIUM'),
-					-- 10568 is the content_id for Zahlungen
-					10568, NOW(), null, null, null, 5
-				);
-				
-				INSERT INTO campus.tbl_contentchild
-				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
-				VALUES
-				(
-					-- queries the content_id for the MEIN_STUDIUM
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'MEIN_STUDIUM'),
-					-- 10795 is the content_id for Studierendenstatus
-					10795, NOW(), null, null, null, 6
-				);
-
-				###### VPN_STUDIERENDE childs
-
-				INSERT INTO campus.tbl_contentchild
-				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
-				VALUES
-				(
-					-- queries the content_id for the MEIN_STUDIUM
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'VPN_STUDIERENDE'),
-					-- 10883 is the content_id for VPN Windows für Student*innen
-					10883, NOW(), null, null, null, 1
-				);
-
-				INSERT INTO campus.tbl_contentchild
-				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
-				VALUES
-				(
-					-- queries the content_id for the MEIN_STUDIUM
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'VPN_STUDIERENDE'),
-					-- 10884 is the content_id for VPN Linux für Student*innen
-					10884, NOW(), null, null, null, 2
-				);
-
-				###### Profil childs
-
-				INSERT INTO campus.tbl_contentchild
-				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
-				VALUES
-				(
-					-- queries the content_id for the PROFIL
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'PROFIL'),
-					-- 7358 is the content_id for password_aendern
-					7358, NOW(), null, null, null, 1
-				);
-
-				###### News childs
-
-				INSERT INTO campus.tbl_contentchild
-				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
-				VALUES
-				(
-					-- queries the content_id for the NEWS
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'NEWS'),
-					-- 6748 is the content_id for Newsletter FHTW
-					6748, NOW(), null, null, null, 1
-				);
-
-				###### Dokumente childs
-
-				INSERT INTO campus.tbl_contentchild
-				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
-				VALUES
-				(
-					-- queries the content_id for the DOKUMENTE
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'DOKUMENTE'),
-					-- 10246 is the content_id for Allg. FHTW-Glossar
-					10246, NOW(), null, null, null, 1
-				);
-
-				INSERT INTO campus.tbl_contentchild
-				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
-				VALUES
-				(
-					-- queries the content_id for the DOKUMENTE
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'DOKUMENTE'),
-					-- 10339 is the content_id for Hausordnung
-					10339, NOW(), null, null, null, 2
-				);
-
-				INSERT INTO campus.tbl_contentchild
-				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
-				VALUES
-				(
-					-- queries the content_id for the DOKUMENTE
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'DOKUMENTE'),
-					-- 6830 is the content_id for Satzung
-					6830, NOW(), null, null, null, 3
-				);
-
-				INSERT INTO campus.tbl_contentchild
-				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
-				VALUES
-				(
-					-- queries the content_id for the DOKUMENTE
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'DOKUMENTE'),
-					-- queries the content_id for the STUDIENBETRIEB
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUDIENBETRIEB'),
-					NOW(), null, null, null, 4
-				);
-
-				INSERT INTO campus.tbl_contentchild
-				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
-				VALUES
-				(
-					-- queries the content_id for the DOKUMENTE
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'DOKUMENTE'),
-					-- queries the content_id for the VORLAGEN
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'VORLAGEN'),
-					NOW(), null, null, null, 5
-				);
-
-				###### Studienbetrieb childs
-
-				INSERT INTO campus.tbl_contentchild
-				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
-				VALUES
-				(
-					-- queries the content_id for the STUDIENBETRIEB
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUDIENBETRIEB'),
-					-- 7251 is the content_id for Administration
-					7251, NOW(), null, null, null, 1
-				);
-
-				INSERT INTO campus.tbl_contentchild
-				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
-				VALUES
-				(
-					-- queries the content_id for the STUDIENBETRIEB
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUDIENBETRIEB'),
-					-- 7252 is the content_id for Außerordentliche Studierende
-					7252, NOW(), null, null, null, 2
-				);
-
-				INSERT INTO campus.tbl_contentchild
-				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
-				VALUES
-				(
-					-- queries the content_id for the STUDIENBETRIEB
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUDIENBETRIEB'),
-					-- 7253 is the content_id for Berufspraktikum
-					7253, NOW(), null, null, null, 3
-				);
-
-				INSERT INTO campus.tbl_contentchild
-				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
-				VALUES
-				(
-					-- queries the content_id for the STUDIENBETRIEB
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUDIENBETRIEB'),
-					-- 7254 is the content_id for CRM @ FHTW
-					7254, NOW(), null, null, null, 4
-				);
-
-				INSERT INTO campus.tbl_contentchild
-				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
-				VALUES
-				(
-					-- queries the content_id for the STUDIENBETRIEB
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUDIENBETRIEB'),
-					-- 9328 is the content_id for Datenschutz
-					9328, NOW(), null, null, null, 5
-				);
-
-				INSERT INTO campus.tbl_contentchild
-				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
-				VALUES
-				(
-					-- queries the content_id for the STUDIENBETRIEB
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUDIENBETRIEB'),
-					-- 10139 is the content_id for Einteilung Studienjahr
-					10139, NOW(), null, null, null, 6
-				);
-
-				INSERT INTO campus.tbl_contentchild
-				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
-				VALUES
-				(
-					-- queries the content_id for the STUDIENBETRIEB
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUDIENBETRIEB'),
-					-- 7255 is the content_id for Formulare
-					7255, NOW(), null, null, null, 7
-				);
-
-				INSERT INTO campus.tbl_contentchild
-				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
-				VALUES
-				(
-					-- queries the content_id for the STUDIENBETRIEB
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUDIENBETRIEB'),
-					-- 10841 is the content_id for Formulare
-					10841, NOW(), null, null, null, 8
-				);
-
-				INSERT INTO campus.tbl_contentchild
-				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
-				VALUES
-				(
-					-- queries the content_id for the STUDIENBETRIEB
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUDIENBETRIEB'),
-					-- 7256 is the content_id for Internationale BewerberInnen
-					7256, NOW(), null, null, null, 9
-				);
-
-				INSERT INTO campus.tbl_contentchild
-				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
-				VALUES
-				(
-					-- queries the content_id for the STUDIENBETRIEB
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUDIENBETRIEB'),
-					-- 7257 is the content_id for Leistungsstipendium
-					7257, NOW(), null, null, null, 10
-				);
-
-				INSERT INTO campus.tbl_contentchild
-				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
-				VALUES
-				(
-					-- queries the content_id for the STUDIENBETRIEB
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUDIENBETRIEB'),
-					-- 7258 is the content_id for ÖH-Studierendenvertretung
-					7258, NOW(), null, null, null, 11
-				);
-
-				INSERT INTO campus.tbl_contentchild
-				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
-				VALUES
-				(
-					-- queries the content_id for the STUDIENBETRIEB
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUDIENBETRIEB'),
-					-- 8416 is the content_id for ÖH-Studierendenvertretung
-					8416, NOW(), null, null, null, 12
-				);
-
-				INSERT INTO campus.tbl_contentchild
-				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
-				VALUES
-				(
-					-- queries the content_id for the STUDIENBETRIEB
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUDIENBETRIEB'),
-					-- 7259 is the content_id for Prüfungen/Lehre
-					7259, NOW(), null, null, null, 13
-				);
-
-				INSERT INTO campus.tbl_contentchild
-				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
-				VALUES
-				(
-					-- queries the content_id for the STUDIENBETRIEB
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUDIENBETRIEB'),
-					-- 10748 is the content_id for Studienbeitrag & ÖH-Beitrag
-					10748, NOW(), null, null, null, 14
-				);
-
-				INSERT INTO campus.tbl_contentchild
-				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
-				VALUES
-				(
-					-- queries the content_id for the STUDIENBETRIEB
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUDIENBETRIEB'),
-					-- 7260 is the content_id for Studieren, Wohnen & Finanzen
-					7260, NOW(), null, null, null, 15
-				);
-
-				INSERT INTO campus.tbl_contentchild
-				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
-				VALUES
-				(
-					-- queries the content_id for the STUDIENBETRIEB
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'STUDIENBETRIEB'),
-					-- 7261 is the content_id for Wissenschaftliches Arbeiten 
-					7261, NOW(), null, null, null, 16
-				);
-
-				###### Vorlagen childs
-
-				INSERT INTO campus.tbl_contentchild
-				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
-				VALUES
-				(
-					-- queries the content_id for the VORLAGEN
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'VORLAGEN'),
-					-- 7243 is the content_id for FHTW Corporate Identity & Design
-					7243, NOW(), null, null, null, 1
-				);
-
-				###### TLC childs
-
-				INSERT INTO campus.tbl_contentchild
-				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
-				VALUES
-				(
-					-- queries the content_id for the TLC
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'TLC'),
-					-- 9248 is the content_id for Service für Studierende
-					9248, NOW(), null, null, null, 1
-				);
-				";
-
-
-			// Execute query, COMMIT on success and ROLLBACK on error
-
-			if (!$db->db_query($qry)) 
-			{
-				echo '<strong>Menu content: ' . $db->db_last_error() . '</strong><br>';
-
-				// Rollback
-				if (!$db->db_query("ROLLBACK;")) 
-				{
-					echo '<strong>wasnt able to rollback: ' . $db->db_last_error() . '</strong><br>';
-				} 
-				else 
-				{
-					echo '<strong>ROLLED BACK CIS4_ROOT_MENU</strong><br>';
-				}
-			} 
-			else 
-			{
-				// Commit
-				if (!$db->db_query("COMMIT;")) 
-				{
-					echo '<strong>wasnt able to commit: ' . $db->db_last_error() . '</strong><br>';
-				} 
-				else 
-				{
-					echo '<strong>COMMITED CIS4_ROOT_MENU</strong><br>';
-				}
-
-				echo '<br>Menu content created';
-			}
-
-		}
-	}
-}
-
-

From cdc9e08cd029e08e3ecd5f1892fbe9047839ecb3 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 21 Nov 2024 15:14:13 +0100
Subject: [PATCH 1442/1461] cleanup C4 dbupdates

---
 system/dbupdate_3.4.php                       |  2 +-
 ...5999_C4_ma0594.php => 25999_C4_profil.php} |  0
 .../41134_C4_bookmark_dashboardWidget.php     | 79 ++++++-------------
 3 files changed, 25 insertions(+), 56 deletions(-)
 rename system/dbupdate_3.4/{25999_C4_ma0594.php => 25999_C4_profil.php} (100%)

diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index a4ef7d44f..d23a35c91 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -54,7 +54,7 @@ require_once('dbupdate_3.4/37107_fristenmanagement.php');
 require_once('dbupdate_3.4/33003_bis_meldung_personal.php');
 require_once('dbupdate_3.4/36275_zeitaufzeichnung_karenz.php');
 require_once('dbupdate_3.4/21620_neues_feld_zum_erfassen_des_ESI.php');
-require_once('dbupdate_3.4/25999_C4_ma0594.php');
+require_once('dbupdate_3.4/25999_C4_profil.php');
 require_once('dbupdate_3.4/25999_cis4_cms.php');
 require_once('dbupdate_3.4/36530_bis_internationsalisierung_codextabelle_neuerungen.php');
 require_once('dbupdate_3.4/34543_ux_template.php');
diff --git a/system/dbupdate_3.4/25999_C4_ma0594.php b/system/dbupdate_3.4/25999_C4_profil.php
similarity index 100%
rename from system/dbupdate_3.4/25999_C4_ma0594.php
rename to system/dbupdate_3.4/25999_C4_profil.php
diff --git a/system/dbupdate_3.4/41134_C4_bookmark_dashboardWidget.php b/system/dbupdate_3.4/41134_C4_bookmark_dashboardWidget.php
index c54b4c2ca..5528473bb 100644
--- a/system/dbupdate_3.4/41134_C4_bookmark_dashboardWidget.php
+++ b/system/dbupdate_3.4/41134_C4_bookmark_dashboardWidget.php
@@ -1,67 +1,36 @@
 <?php
-
-if (!$result = @$db->db_query("SELECT to_regclass('dashboard.tbl_bookmark')")) 
+if ($result = @$db->db_query("SELECT * FROM information_schema.tables WHERE table_name='tbl_bookmark' AND table_schema='dashboard'")) 
 {
-	if (!$db->db_query("BEGIN;")) 
+	if($db->db_num_rows($result) == 0)
 	{
-		echo '<strong>wasnt able to start transaction for 41134_C4_bookmark_dashboardWidget: ' . $db->db_last_error() . '</strong><br>';
-	}
-    $qry = "
-            CREATE TABLE IF NOT EXISTS dashboard.tbl_bookmark(
-                bookmark_id BIGINT PRIMARY KEY,
-                uid VARCHAR(255) NOT NULL,
-                url VARCHAR(511) NOT NULL,
-                title VARCHAR(255) NOT NULL,
-                tag VARCHAR(255) NULL,
-                insertamum TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
-                insertvon VARCHAR(255) NULL REFERENCES public.tbl_benutzer(uid),
-                updateamum TIMESTAMP NULL,
-                updatevon VARCHAR(255) NULL REFERENCES public.tbl_benutzer(uid)
-            );
+		$qry = "
+				CREATE TABLE IF NOT EXISTS dashboard.tbl_bookmark(
+					bookmark_id BIGSERIAL PRIMARY KEY,
+					uid VARCHAR(255) NOT NULL,
+					url VARCHAR(511) NOT NULL,
+					title VARCHAR(255) NOT NULL,
+					tag VARCHAR(255) NULL,
+					insertamum TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
+					insertvon VARCHAR(255) NULL REFERENCES public.tbl_benutzer(uid),
+					updateamum TIMESTAMP NULL,
+					updatevon VARCHAR(255) NULL REFERENCES public.tbl_benutzer(uid)
+				);
 
-            ALTER TABLE dashboard.tbl_bookmark ADD CONSTRAINT tbl_bookmark_fk FOREIGN KEY(uid) REFERENCES public.tbl_benutzer(uid);
+				ALTER TABLE dashboard.tbl_bookmark ADD CONSTRAINT tbl_bookmark_fk FOREIGN KEY(uid) REFERENCES public.tbl_benutzer(uid);
 
-            CREATE SEQUENCE IF NOT EXISTS dashboard.tbl_bookmark_sequence 
-            AS BIGINT
-            INCREMENT BY 1
-            NO MINVALUE
-            NO MAXVALUE
-            START WITH 1
-            CACHE 1
-            OWNED BY dashboard.tbl_bookmark.bookmark_id;
+				GRANT SELECT, INSERT, UPDATE, DELETE ON dashboard.tbl_bookmark TO vilesci;
+				GRANT SELECT, INSERT, UPDATE, DELETE ON dashboard.tbl_bookmark TO web; 
+				GRANT SELECT, UPDATE ON dashboard.tbl_bookmark_bookmark_id_seq TO vilesci;
+				GRANT SELECT, UPDATE ON dashboard.tbl_bookmark_bookmark_id_seq TO web;
+				";
 
-            ALTER TABLE dashboard.tbl_bookmark ALTER COLUMN bookmark_id SET DEFAULT nextval('dashboard.tbl_bookmark_sequence ');
-
-            GRANT SELECT, INSERT, UPDATE, DELETE ON dashboard.tbl_bookmark TO vilesci;
-            GRANT SELECT, INSERT, UPDATE, DELETE ON dashboard.tbl_bookmark TO web; 
-            GRANT SELECT, UPDATE ON dashboard.tbl_bookmark_sequence TO vilesci;
-            GRANT SELECT, UPDATE ON dashboard.tbl_bookmark_sequence TO web;
-			";
-
-    if (!$db->db_query($qry))
-	{
-		// Rollback
-		if (!$db->db_query("ROLLBACK;")) 
+		if (!$db->db_query($qry))
 		{
-			echo '<strong>wasnt able to rollback: ' . $db->db_last_error() . '</strong><br>';
-		} 
-		else 
-		{
-			echo '<strong>ROLLED BACK 41134_C4_bookmark_dashboardWidget</strong><br>';
+			echo '<strong>error occurred during tbl_bookmark creation: ' . $db->db_last_error() . '</strong><br>';
 		}
-		echo '<strong>error occurred during tbl_bookmark creation: ' . $db->db_last_error() . '</strong><br>';
-	}
-    else
-	{
-		// Commit
-		if (!$db->db_query("COMMIT;")) 
+		else
 		{
-			echo '<strong>wasnt able to commit: ' . $db->db_last_error() . '</strong><br>';
-		} 
-		else 
-		{
-			echo '<strong>COMMITED 41134_C4_bookmark_dashboardWidget</strong><br>';
+			echo '<br>dashboard.tbl_bookmark successfully created';
 		}
-		echo '<br>dashboard.tbl_bookmark and dashboard.tbl_bookmark_sequence was created';
 	}
 }

From d400f34e0f6a5e0622410e0205300e752dad99ae Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 21 Nov 2024 15:21:33 +0100
Subject: [PATCH 1443/1461] missing phrasen

---
 application/views/Cis/MyLv.php           |  2 --
 public/js/apps/Cis/LvInfo.js             |  9 +++++++--
 public/js/apps/Cis/MyLv/Student.js       |  9 +++++++--
 public/js/apps/Cis/RoomInformation.js    |  4 ++++
 public/js/apps/Cis/Stundenplan.js        |  3 +--
 public/js/components/Cis/Mylv/Student.js |  5 ++++-
 system/phrasesupdate.php                 | 20 ++++++++++++++++++++
 7 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/application/views/Cis/MyLv.php b/application/views/Cis/MyLv.php
index 347a66cb7..d8d5026a1 100644
--- a/application/views/Cis/MyLv.php
+++ b/application/views/Cis/MyLv.php
@@ -9,8 +9,6 @@ $this->load->view('templates/CISVUE-Header', $includesArray);
 ?>
 
 <div id="content">
-	<h2>MyLv</h2>
-	<hr>
 	<mylv-student></mylv-student>
 </div>
 
diff --git a/public/js/apps/Cis/LvInfo.js b/public/js/apps/Cis/LvInfo.js
index 3ec63414c..1764cf097 100644
--- a/public/js/apps/Cis/LvInfo.js
+++ b/public/js/apps/Cis/LvInfo.js
@@ -1,8 +1,13 @@
 import Info from "../../components/Cis/Mylv/Semester/Studiengang/Lv/Info.js";
 import Phrasen from "../../plugin/Phrasen.js";
+import {setScrollbarWidth} from "../../helpers/CssVarCalcHelpers";
 
-Vue.createApp({
+const app = Vue.createApp({
 	components: {
 		Info
 	}
-}).use(Phrasen, { reload: true }).mount('#content');
\ No newline at end of file
+})
+
+setScrollbarWidth();
+
+app.use(Phrasen, { reload: true }).mount('#content');
\ No newline at end of file
diff --git a/public/js/apps/Cis/MyLv/Student.js b/public/js/apps/Cis/MyLv/Student.js
index 095a3f780..4d7049096 100644
--- a/public/js/apps/Cis/MyLv/Student.js
+++ b/public/js/apps/Cis/MyLv/Student.js
@@ -1,9 +1,14 @@
 import MylvStudent from "../../../components/Cis/Mylv/Student.js";
 import Phrasen from "../../../plugin/Phrasen.js";
+import {setScrollbarWidth} from "../../../helpers/CssVarCalcHelpers";
 
-Vue.createApp({
+const app = Vue.createApp({
 	name: 'MyLvStudentApp',
 	components: {
 		MylvStudent
 	}
-}).use(Phrasen, {reload: true}).mount('#content');
\ No newline at end of file
+})
+
+setScrollbarWidth();
+
+app.use(Phrasen, {reload: true}).mount('#content');
\ No newline at end of file
diff --git a/public/js/apps/Cis/RoomInformation.js b/public/js/apps/Cis/RoomInformation.js
index 21256ecca..8f9ad2583 100644
--- a/public/js/apps/Cis/RoomInformation.js
+++ b/public/js/apps/Cis/RoomInformation.js
@@ -1,5 +1,6 @@
 import Phrasen from "../../plugin/Phrasen.js";
 import RoomInformation from "../../components/Cis/Mylv/RoomInformation.js";
+import {setScrollbarWidth} from "../../helpers/CssVarCalcHelpers";
 
 const app = Vue.createApp({
 	name: 'RoomInformationApp',
@@ -11,6 +12,9 @@ const app = Vue.createApp({
 		}
 	}
 });
+
+setScrollbarWidth();
+
 app.config.unwrapInjectedRef = true;
 app.use(Phrasen);
 app.mount('#content');
\ No newline at end of file
diff --git a/public/js/apps/Cis/Stundenplan.js b/public/js/apps/Cis/Stundenplan.js
index acc41baad..7405bf98d 100644
--- a/public/js/apps/Cis/Stundenplan.js
+++ b/public/js/apps/Cis/Stundenplan.js
@@ -107,9 +107,8 @@ const app = Vue.createApp({
 		this.loadEvents();
 		this.getLvID();
 	},
-	//TODO: Stundenplan phrase
 	template:/*html*/`
-	<h2>Stundenplan</h2>
+	<h2>{{$p.t('lehre/stundenplan')}}</h2>
 	<hr>
 	<lv-modal v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ref="lvmodal" />
 	<fhc-calendar :initial-date="currentDay" @change:range="updateRange" :events="events" initial-mode="week" show-weeks @select:day="selectDay" v-model:minimized="minimized">
diff --git a/public/js/components/Cis/Mylv/Student.js b/public/js/components/Cis/Mylv/Student.js
index ffe5c05cf..068f0f84d 100644
--- a/public/js/components/Cis/Mylv/Student.js
+++ b/public/js/components/Cis/Mylv/Student.js
@@ -90,10 +90,13 @@ export default {
 		});
 	},
 	template: `
+
+	<h2>{{p.t('lehre/myLV')}}</h2>
+	<hr>
 	<div class="mylv-student" v-if="ready">
 		<div v-if="currentSemester" class="row justify-content-center mb-3">
 			<div class="col-auto d-none">
-				<label class="col-form-label">{{p.t('lehre/studiensemester')}}</label>
+				<label class="col-form-label">{{$p.t('lehre/studiensemester')}}</label>
 			</div>
 			<div class="col-auto">
 				<div class="input-group">
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index ade9a2593..c5ec942e2 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -37156,6 +37156,26 @@ array(
 				'insertvon' => 'system'
 			)
 		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'myLV',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Meine Lehrveranstaltungen",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "My Courses",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
 	)
 // CIS4 phrases from legacy code end
 );

From 61728f3044c59c5c6f0661081b8b678ce28e1554 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 21 Nov 2024 15:43:35 +0100
Subject: [PATCH 1444/1461] dashboard & widgets: template cleanup; property
 definiton cleanup; delete unwrapInjectedRef -> resolved since vue3.3;

---
 public/js/apps/Cis/RoomInformation.js               | 1 -
 public/js/apps/Cis/Stundenplan.js                   | 1 -
 public/js/apps/Dashboard/Admin.js                   | 1 -
 public/js/apps/Dashboard/Fhc.js                     | 1 -
 public/js/components/Calendar/Minimized.js          | 1 -
 public/js/components/Cis/Cms/ContentModal.js        | 8 +++-----
 public/js/components/Cis/Menu/Entry.js              | 2 +-
 public/js/components/Dashboard/Section.js           | 2 +-
 public/js/components/DashboardWidget/Stundenplan.js | 8 ++++----
 public/js/components/Drop/Grid.js                   | 2 +-
 public/js/plugin/Phrasen.js                         | 2 +-
 11 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/public/js/apps/Cis/RoomInformation.js b/public/js/apps/Cis/RoomInformation.js
index 8f9ad2583..51b63030d 100644
--- a/public/js/apps/Cis/RoomInformation.js
+++ b/public/js/apps/Cis/RoomInformation.js
@@ -15,6 +15,5 @@ const app = Vue.createApp({
 
 setScrollbarWidth();
 
-app.config.unwrapInjectedRef = true;
 app.use(Phrasen);
 app.mount('#content');
\ No newline at end of file
diff --git a/public/js/apps/Cis/Stundenplan.js b/public/js/apps/Cis/Stundenplan.js
index 7405bf98d..441d83f35 100644
--- a/public/js/apps/Cis/Stundenplan.js
+++ b/public/js/apps/Cis/Stundenplan.js
@@ -143,6 +143,5 @@ const app = Vue.createApp({
 	</fhc-calendar>
 	`
 });
-app.config.unwrapInjectedRef = true;
 app.use(Phrasen, {reload: true});
 app.mount('#content');
\ No newline at end of file
diff --git a/public/js/apps/Dashboard/Admin.js b/public/js/apps/Dashboard/Admin.js
index 9d64998a8..0470f82a7 100644
--- a/public/js/apps/Dashboard/Admin.js
+++ b/public/js/apps/Dashboard/Admin.js
@@ -13,7 +13,6 @@ const app = Vue.createApp({
     DashboardAdmin
   }
 });
-app.config.unwrapInjectedRef = true;
 app.use(FhcApi);
 app.use(Phrasen);
 app.mount('#main');
\ No newline at end of file
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index b060e1b59..d096d4cde 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -15,7 +15,6 @@ const app = Vue.createApp({
 
 setScrollbarWidth();
 
-app.config.unwrapInjectedRef = true;
 app.use(FhcApi);
 app.use(Phrasen);
 app.mount('#content');
\ No newline at end of file
diff --git a/public/js/components/Calendar/Minimized.js b/public/js/components/Calendar/Minimized.js
index fc0f96785..ace5dce48 100644
--- a/public/js/components/Calendar/Minimized.js
+++ b/public/js/components/Calendar/Minimized.js
@@ -17,7 +17,6 @@ export default {
 	},
 	methods: {
 		maximize() {
-			// NOTE(chris): set "app.config.unwrapInjectedRef = true" for this to work
 			this.minimized = false;
 		}
 	},
diff --git a/public/js/components/Cis/Cms/ContentModal.js b/public/js/components/Cis/Cms/ContentModal.js
index 7a8d9beb8..b1b46530f 100644
--- a/public/js/components/Cis/Cms/ContentModal.js
+++ b/public/js/components/Cis/Cms/ContentModal.js
@@ -13,12 +13,10 @@ export default {
     },
     props:{
         contentID:{
-            type: Number,
-            required: true,
+            type: Number
         },
         ort_kurzbz:{
-            type: String,
-            required: true,
+            type: String
         }
     },
     data(){
@@ -51,7 +49,7 @@ export default {
     },
     
     template:/*html*/`
-    <bs-modal @hideBsModal="modalHidden" dialogClass="modal-xl" @showBsModal="modalShown" ref="modalContainer" dialogClass="modal-lg">
+    <bs-modal @hideBsModal="modalHidden" dialogClass="modal-xl" @showBsModal="modalShown" ref="modalContainer">
         <template #title>
             <span v-if="ort_kurzbz">{{ort_kurzbz}}</span>
             <span v-else>Raum Informationen</span>
diff --git a/public/js/components/Cis/Menu/Entry.js b/public/js/components/Cis/Menu/Entry.js
index c29fbb9ac..3176fe178 100644
--- a/public/js/components/Cis/Menu/Entry.js
+++ b/public/js/components/Cis/Menu/Entry.js
@@ -6,7 +6,7 @@ export default {
             type: Number,
             default: 1
         },
-		activeContent: String,
+		activeContent: [String, Number],
 		highestMatchingUrlCount: Number,
     },
     data: () => {
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index d4ecf9244..91c978a63 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -195,7 +195,7 @@ export default {
 	template: `
 	<div class="dashboard-section" ref="container" :style="getSectionStyle">
 		<drop-grid v-model:cols="gridWidth" :items="items" :placeholders="items_placeholders" :active="editModeIsActive" :resize-limit="checkResizeLimit" :margin-for-extra-row=".01" @rearrange-items="updatePositions" @gridHeight="gridHeight=$event" >
-			<template #default="item" #default>
+			<template #default="item">
 				
 				<dashboard-item v-if="!item.placeholder"
 					:id="item.widget"
diff --git a/public/js/components/DashboardWidget/Stundenplan.js b/public/js/components/DashboardWidget/Stundenplan.js
index 71ce60ebf..f7cc1b8ca 100644
--- a/public/js/components/DashboardWidget/Stundenplan.js
+++ b/public/js/components/DashboardWidget/Stundenplan.js
@@ -188,8 +188,8 @@ export default {
 	template: /*html*/`
 	<div class="dashboard-widget-stundenplan d-flex flex-column h-100">
 		<lv-modal v-if="selectedEvent" ref="lvmodal" :event="selectedEvent"  />
-		<content-modal :contentID="roomInfoContentID" :ort_kurzbz="" dialogClass="modal-lg" ref="contentModal"/>
-		<fhc-calendar @change:range="updateRange" :initial-date="currentDay" class="border-0" class-header="p-0" @select:day="selectDay" widget="true" v-model:minimized="minimized" :events="events" no-week-view :show-weeks="false" >
+		<content-modal :contentID="roomInfoContentID" dialogClass="modal-lg" ref="contentModal"/>
+		<fhc-calendar @change:range="updateRange" :initial-date="currentDay" class="border-0" class-header="p-0" @select:day="selectDay" :widget="true" v-model:minimized="minimized" :events="events" no-week-view :show-weeks="false" >
 			<template #minimizedPage >
 				<div class="flex-grow-1" style="overflow-y: auto; overflow-x: hidden">
 					<div v-if="events === null" class="d-flex h-100 justify-content-center align-items-center">
@@ -218,6 +218,6 @@ export default {
 				</div>
 			</template>
 		</fhc-calendar>
-		</div>
-	</div>`
+	</div>
+`
 }
\ No newline at end of file
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 06e8f535e..1cbe9c3d1 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -376,7 +376,7 @@ export default {
 				paddingRight: 'var(--fhc-dg-item-padding-horizontal)'
 			}">
 			<template v-slot="item">
-				<slot v-bind="item.data" v-bind="item" :x="item.x" :y="item.y" ></slot>
+				<slot v-bind="item.data" :x="item.x" :y="item.y" ></slot>
 			</template>
 		</grid-item>
 		
diff --git a/public/js/plugin/Phrasen.js b/public/js/plugin/Phrasen.js
index 3539b9f6e..2cfcebb15 100644
--- a/public/js/plugin/Phrasen.js
+++ b/public/js/plugin/Phrasen.js
@@ -83,6 +83,6 @@ export default {
 			setLanguage: phrasen.setLanguage,
 			t_ref: phrasen.t_ref
 		};
-                app.provide('$p', app.config.globalProperties.$p);
+		app.provide('$p', app.config.globalProperties.$p);
 	}
 }
\ No newline at end of file

From fc5ea9f4dbbc2db73337460b9bd7a293a5ce4b8c Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 21 Nov 2024 15:59:42 +0100
Subject: [PATCH 1445/1461] remove unused xmlns:fo add xsl:output method html

---
 system/dbupdate_3.4/25999_cis4_cms.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/system/dbupdate_3.4/25999_cis4_cms.php b/system/dbupdate_3.4/25999_cis4_cms.php
index 3118f1c85..9bebad2e9 100644
--- a/system/dbupdate_3.4/25999_cis4_cms.php
+++ b/system/dbupdate_3.4/25999_cis4_cms.php
@@ -13,8 +13,8 @@ if (!$result = @$db->db_query("SELECT xslt_xhtml_c4 FROM campus.tbl_template LIM
 
 	$xml01 = <<<EOXML01
 <xsl:stylesheet version="1.0"
-    xmlns:fo="http://www.w3.org/1999/XSL/Format"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+    <xsl:output method="html"/>
     <xsl:template match="content">
 	<h1>
 	    <xsl:value-of select="titel" />
@@ -27,8 +27,8 @@ EOXML01;
 	$xml02 = <<<EOXML02
 
 <xsl:stylesheet version="1.0"
-	xmlns:fo="http://www.w3.org/1999/XSL/Format"
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+	<xsl:output method="html"/>
 	<xsl:template match="content">
 		<xsl:value-of select="inhalt" disable-output-escaping="yes" />
 	</xsl:template>
@@ -39,8 +39,8 @@ EOXML02;
 	$xml03 = <<<EOXML03
 
 	<xsl:stylesheet version="1.0"
-	xmlns:fo="http://www.w3.org/1999/XSL/Format"
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+	<xsl:output method="html"/>
 	<xsl:template match="content">
 		<script type="text/javascript">
 		window.location.href=''<xsl:value-of select="url" />'';
@@ -57,8 +57,8 @@ EOXML03;
 	$xml04 = <<<EOXML04
 
 <xsl:stylesheet version="1.0"
-	xmlns:fo="http://www.w3.org/1999/XSL/Format"
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+	<xsl:output method="html"/>
 	<xsl:template match="content">
 		<div class="alert alert-danger" role="alert">Diese Seite sollte nicht direkt aufgerufen werden!</div>
 	</xsl:template>
@@ -71,6 +71,7 @@ EOXML04;
 <xsl:stylesheet version="1.0"
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 	<xsl:output encoding="UTF-8" omit-xml-declaration="yes" indent="yes"/>
+	<xsl:output method="html"/>
 	<xsl:template match="/">
 		<h1>News</h1>
 		<div class="row">

From 1a6b30588d5efa2bd2d1a318bb4216dc6703fbd6 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 21 Nov 2024 16:11:02 +0100
Subject: [PATCH 1446/1461] MyLvApp & Components template & property definition
 cleanup

---
 public/js/components/Calendar/Header.js                  | 1 -
 public/js/components/Cis/Mylv/LvMenu.js                  | 7 ++++---
 public/js/components/Cis/Mylv/Semester.js                | 2 +-
 public/js/components/Cis/Mylv/Semester/Studiengang.js    | 2 +-
 public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/public/js/components/Calendar/Header.js b/public/js/components/Calendar/Header.js
index d51faf5f8..45b0b2bb9 100644
--- a/public/js/components/Calendar/Header.js
+++ b/public/js/components/Calendar/Header.js
@@ -15,7 +15,6 @@ export default {
 		'size',
 		'classHeader',
 		'mode',
-		'updateMode',
 		'noWeekView',
 		'noMonthView',
 		'widget'
diff --git a/public/js/components/Cis/Mylv/LvMenu.js b/public/js/components/Cis/Mylv/LvMenu.js
index d2a7a8e7c..7d4b7ef48 100644
--- a/public/js/components/Cis/Mylv/LvMenu.js
+++ b/public/js/components/Cis/Mylv/LvMenu.js
@@ -36,12 +36,13 @@ export default {
 	},
 	template:/*html*/`
 	<div v-if="!menu">No Menu available</div>
-	<div v-else >
+	<div v-else>
 		<div class="container" :class="containerStyles">
 			<div class="row g-2 justify-content-center" :class="rowStyles">
 				<div style="min-height:150px; min-width:150px;" class="col-12 col-lg-6 col-xl-4" v-for="(menuItem, index) in menu" :key="index">
-					<a :title="menuItem.name" :target="menuItem.c4_target ?? null" role="button" :href="menuItem.c4_link" class="fhc-entry p-2 w-100 text-wrap border border-1 rounded-3 d-flex flex-column align-items-center justify-content-center text-center text-decoration-none link-dark h-100">
-						<img :src="menuItem.c4_icon" :alt="menuItem.name" ></img>
+					<a :title="menuItem.name" :target="menuItem.c4_target ?? null" role="button" :href="menuItem.c4_link"
+					 class="fhc-entry p-2 w-100 text-wrap border border-1 rounded-3 d-flex flex-column align-items-center justify-content-center text-center text-decoration-none link-dark h-100">
+						<img :src="menuItem.c4_icon" :alt="menuItem.name" />
 						<p @click="selectMenu(menuItem)" class="w-100 mt-2">{{menuItem.name}}</p>
 						<p v-for="([text,link],index) in menuItem.c4_linkList" @click.stop="selectMenu(menuItem,index)" class="mt-1 w-100" :index="index">{{text}}</p>
 					</a>
diff --git a/public/js/components/Cis/Mylv/Semester.js b/public/js/components/Cis/Mylv/Semester.js
index 4fa472c1d..b6ac3563a 100644
--- a/public/js/components/Cis/Mylv/Semester.js
+++ b/public/js/components/Cis/Mylv/Semester.js
@@ -10,7 +10,7 @@ export default {
 		}
 	},
 	props: {
-		semester: String,
+		semester: [String, Number],
 		lvs: Array
 	},
 	computed: {
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang.js b/public/js/components/Cis/Mylv/Semester/Studiengang.js
index 1c4510112..123986d56 100644
--- a/public/js/components/Cis/Mylv/Semester/Studiengang.js
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang.js
@@ -11,7 +11,7 @@ export default {
 	props: {
 		bezeichnung: String,
 		kuerzel: String,
-		semester: Number,
+		semester: [String,Number],
 		lvs: Array
 	},
 	computed: {
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
index cf8b3fed6..565c2a6a7 100644
--- a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
@@ -23,10 +23,10 @@ export default {
 		lvnote: String,
 		znote: String,
 		studiengang_kuerzel: String,
-		semester: String,
+		semester: [String, Number],
 		orgform_kurzbz: String,
 		sprache: String,
-		ects: Number,
+		ects: String,
 		incoming: Number,
 		positiv: Boolean
 	},
@@ -138,7 +138,7 @@ export default {
 					</li>
 				</template>
 				<template v-else>
-					<li class="text-center" class="list-group-item"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></li>
+					<li class="text-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></li>
 				</template>
 			</ul>
 		</div>

From 16cfb0a3eb1b58bd06ee4d7a38d2ef7e747bb6ae Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 21 Nov 2024 17:32:34 +0100
Subject: [PATCH 1447/1461] template cleanup profil

---
 .../Cis/Profil/ProfilComponents/Adresse.js    |  75 +-
 .../ProfilComponents/FetchProfilUpdates.js    | 359 ++++-----
 .../ProfilComponents/FhAusweisStatus.js       |  24 +-
 .../Cis/Profil/ProfilComponents/Kontakt.js    |  40 +-
 .../Profil/ProfilComponents/Mailverteiler.js  |  25 +-
 .../Profil/ProfilComponents/ProfilEmails.js   |  88 +-
 .../ProfilComponents/ProfilInformation.js     | 245 +++---
 .../Cis/Profil/ProfilComponents/QuickLinks.js | 109 ++-
 .../ProfilComponents/RoleInformation.js       |  76 +-
 .../Cis/Profil/ProfilModal/EditProfil.js      | 375 +++++----
 .../Profil/ProfilModal/EditProfilSelect.js    | 296 +++----
 .../js/components/Cis/Profil/StudentProfil.js | 755 ++++++++----------
 12 files changed, 1122 insertions(+), 1345 deletions(-)

diff --git a/public/js/components/Cis/Profil/ProfilComponents/Adresse.js b/public/js/components/Cis/Profil/ProfilComponents/Adresse.js
index 8da928d32..5d7406bbd 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/Adresse.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/Adresse.js
@@ -17,61 +17,50 @@ export default {
     
     <div class="gy-2 row justify-content-center align-items-center">
     
-    <!-- column 1 in the address row -->
-    
+        <!-- column 1 in the address row -->
         <div class="col-1 text-center">
-         
-          <i class="fa fa-location-dot fa-lg" style="color:#00649C "></i>
-        
+            <i class="fa fa-location-dot fa-lg" style="color:#00649C "></i>
         </div>
+        
         <div  class="col-11 col-sm-8 col-xl-11 col-xxl-8 order-1">
-
-        <div class="form-underline ">
-        <div class="form-underline-titel">{{$p.t('person','strasse')}}</div>
-        <span class="form-underline-content">{{data.strasse}} </span>
-        </div>
-
-
-        </div>
-        
-    <!-- column 2 in the address row -->
-        
-      
-        
-        <div  class="offset-1 offset-sm-0 offset-xl-1 offset-xxl-0 order-2 order-sm-4 order-xl-2 order-xxl-4 col-11 col-sm-5  col-xl-11 col-xxl-5  ">
-            
-
             <div class="form-underline ">
-            <div class="form-underline-titel">{{$p.t('global','typ')}}</div>
-            <span class="form-underline-content">{{data.typ}} </span>
-            </div>
-
-        </div>
-        <div  class="offset-1 order-3 order-sm-3 col-11 col-sm-6  col-xl-7 col-xxl-6 ">
-            
-            <div class="form-underline ">
-            <div class="form-underline-titel">{{$p.t('person','ort')}}</div>
-            <span class="form-underline-content">{{data.ort}} </span>
+                <div class="form-underline-titel">{{$p.t('person','strasse')}}</div>
+                <span class="form-underline-content">{{data.strasse}} </span>
             </div>
         </div>
-        <div  class=" offset-1 offset-sm-0 order-4 order-sm-2 order-xl-4 order-xxl-2 col-11 col-sm-3 col-xl-4 col-xxl-3 ">
+        
+        <!-- column 2 in the address row -->
+        <div class="offset-1 offset-sm-0 offset-xl-1 offset-xxl-0 order-2 order-sm-4 order-xl-2 order-xxl-4 col-11 col-sm-5 col-xl-11 col-xxl-5">
             <div class="form-underline ">
-            <div class="form-underline-titel">{{$p.t('person','plz')}}</div>
-            <span class="form-underline-content">{{data.plz}} </span>
+                <div class="form-underline-titel">{{$p.t('global','typ')}}</div>
+                <span class="form-underline-content">{{data.typ}} </span>
+            </div>
+        </div>
+        
+        <div class="offset-1 order-3 order-sm-3 col-11 col-sm-6  col-xl-7 col-xxl-6">     
+            <div class="form-underline ">
+                <div class="form-underline-titel">{{$p.t('person','ort')}}</div>
+                <span class="form-underline-content">{{data.ort}} </span>
+            </div>
+        </div>
+        <div  class=" offset-1 offset-sm-0 order-4 order-sm-2 order-xl-4 order-xxl-2 col-11 col-sm-3 col-xl-4 col-xxl-3">
+            <div class="form-underline">
+                <div class="form-underline-titel">{{$p.t('person','plz')}}</div>
+                <span class="form-underline-content">{{data.plz}} </span>
             </div>
         </div>
 
         <div v-if="withZustelladresse" class="order-5 offset-1 col-11">
-        <div class="form-underline ">
-        <div class="form-underline-titel">{{$p.t('person','zustelladresse')}}</div>
-            <div class="ms-2 form-check ">
-                <input class="form-check-input" type="checkbox"  @click.prevent :checked="data.zustelladresse"  >
-               
+            <div class="form-underline">
+                <div class="form-underline-titel">{{$p.t('person','zustelladresse')}}</div>
+                    <div class="ms-2 form-check ">
+                        <input class="form-check-input" type="checkbox"  @click.prevent :checked="data.zustelladresse"  >
+                       
+                    </div>
+        
+                </div>
             </div>
-
-        </div>
         </div>
     </div>
-    `
-
+`
 };
\ No newline at end of file
diff --git a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
index 11c5960e4..4c7411cdf 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
@@ -1,212 +1,197 @@
 import EditProfil from "../ProfilModal/EditProfil.js";
 //? EditProfil is the modal used to edit the profil updates
 export default {
-  components: { EditProfil },
-  props: {
-    data: {
-      type: Object,
-    },
-  },
+	components: {EditProfil},
+	props: {
+		data: {
+			type: Object,
+		},
+	},
 
-  inject: [
-    "getZustellkontakteCount",
-    "getZustelladressenCount",
-    "profilUpdateStates",
-    "profilUpdateTopic",
-  ],
+	inject: [
+		"getZustellkontakteCount",
+		"getZustelladressenCount",
+		"profilUpdateStates",
+		"profilUpdateTopic",
+	],
 
-  emits: ["fetchUpdates"],
+	emits: ["fetchUpdates"],
 
-  data() {
-    return {
-      showUpdateModal: false,
-      content: null,
-      editProfilTitle: this.$p.t("profil", "profilBearbeiten"),
-    };
-  },
+	data() {
+		return {
+			showUpdateModal: false,
+			content: null,
+			editProfilTitle: this.$p.t("profil", "profilBearbeiten"),
+		};
+	},
 
-  methods: {
-    hideEditProfilModal: function () {
-      //? checks the editModal component property result, if the user made a successful request or not
-      if (this.$refs.updateEditModal.result) {
-        this.$emit("fetchUpdates");
-      } else {
-        // when modal was closed without submitting request
-      }
-      this.showUpdateModal = false;
-    },
+	methods: {
+		hideEditProfilModal: function () {
+			//? checks the editModal component property result, if the user made a successful request or not
+			if (this.$refs.updateEditModal.result) {
+				this.$emit("fetchUpdates");
+			} else {
+				// when modal was closed without submitting request
+			}
+			this.showUpdateModal = false;
+		},
 
-    async showEditProfilModal(updateRequest) {
+		async showEditProfilModal(updateRequest) {
 
-      let view = this.getView(updateRequest.topic, updateRequest.status);
-  
-      let data = null;
-      let content = null;
-      let files = null;
-      let withFiles = false;
+			let view = this.getView(updateRequest.topic, updateRequest.status);
 
-      if (view === "TextInputDokument") {
-        data = {
-          titel: updateRequest.topic,
-          value: updateRequest.requested_change.value,
-        };
-        
-        const filesFromDatabase =
-          await this.$fhcApi.factory.profilUpdate.getProfilRequestFiles(
-            updateRequest.profil_update_id
-          ).then((res) => {
-            return res.data;
-          });
+			let data = null;
+			let content = null;
+			let files = null;
+			let withFiles = false;
 
-        files = filesFromDatabase;
-        if (files) {
-          withFiles = true;
-        }
-      } else {
-        data = updateRequest.requested_change;
-      }
+			if (view === "TextInputDokument") {
+				data = {
+					titel: updateRequest.topic,
+					value: updateRequest.requested_change.value,
+				};
 
-      content = {
-        updateID: updateRequest.profil_update_id,
-        view: view,
-        data: data,
-        withFiles: withFiles,
-        topic: updateRequest.topic,
-        files: files,
-      };
+				const filesFromDatabase =
+					await this.$fhcApi.factory.profilUpdate.getProfilRequestFiles(
+						updateRequest.profil_update_id
+					).then((res) => {
+						return res.data;
+					});
 
-      if (view === "EditAdresse") {
-        
-        const isMitarbeiter = await this.$fhcApi.factory.profil.isMitarbeiter(updateRequest.uid).then((res)=>res.data);
+				files = filesFromDatabase;
+				if (files) {
+					withFiles = true;
+				}
+			} else {
+				data = updateRequest.requested_change;
+			}
 
-        if (isMitarbeiter) {
-          content["isMitarbeiter"] = isMitarbeiter;
-        }
-      }
+			content = {
+				updateID: updateRequest.profil_update_id,
+				view: view,
+				data: data,
+				withFiles: withFiles,
+				topic: updateRequest.topic,
+				files: files,
+			};
 
-      //? adds the status information if the profil update request was rejected or accepted
-      if (updateRequest.status !== this.profilUpdateStates["Pending"]) {
-        content["status"] = updateRequest.status;
-        content["status_message"] = updateRequest.status_message;
-        content["status_timestamp"] = updateRequest.status_timestamp;
-      }
+			if (view === "EditAdresse") {
 
-      //? update data of the reactive content
-      this.content = content;
-      this.editProfilTitle = updateRequest.topic;
+				const isMitarbeiter = await this.$fhcApi.factory.profil.isMitarbeiter(updateRequest.uid).then((res) => res.data);
 
-      //? only show the popup if also the right content is available
-      if (content) {
-        this.showUpdateModal = true;
-        // after a state change, wait for the DOM updates to complete
-        Vue.nextTick(() => {
-          this.$refs.updateEditModal.show();
-        });
-      }
-    },
+				if (isMitarbeiter) {
+					content["isMitarbeiter"] = isMitarbeiter;
+				}
+			}
 
-    deleteRequest: function (item) {
-      this.$fhcApi.factory.profilUpdate.deleteProfilRequest(item.profil_update_id).then(
-        (res) => {
-          if (res.data.error) {
-            //? open alert
-            console.error("error happened",res.data);
-          } else {
-            this.$emit("fetchUpdates");
-          }
-        }
-      );
-    },
-    
-    getView: function (topic, status) {
-      if (!(status === this.profilUpdateStates["Pending"])) {
-        return "Status";
-      }
+			//? adds the status information if the profil update request was rejected or accepted
+			if (updateRequest.status !== this.profilUpdateStates["Pending"]) {
+				content["status"] = updateRequest.status;
+				content["status_message"] = updateRequest.status_message;
+				content["status_timestamp"] = updateRequest.status_timestamp;
+			}
 
-      switch (topic) {
-        case this.profilUpdateTopic["Private Kontakte"]:
-          return "EditKontakt";
-        case this.profilUpdateTopic["Add Kontakt"]:
-          return "EditKontakt";
-        case this.profilUpdateTopic["Delete Kontakt"]:
-          return "Kontakt";
-        case this.profilUpdateTopic["Private Adressen"]:
-          return "EditAdresse";
-        case this.profilUpdateTopic["Add Adresse"]:
-          return "EditAdresse";
-        case this.profilUpdateTopic["Delete Adresse"]:
-          return "Adresse";
-        default:
-          return "TextInputDokument";
-      }
-    },
+			//? update data of the reactive content
+			this.content = content;
+			this.editProfilTitle = updateRequest.topic;
 
-  },
-  created() {
-  },
+			//? only show the popup if also the right content is available
+			if (content) {
+				this.showUpdateModal = true;
+				// after a state change, wait for the DOM updates to complete
+				Vue.nextTick(() => {
+					this.$refs.updateEditModal.show();
+				});
+			}
+		},
 
-  computed: {},
+		deleteRequest: function (item) {
+			this.$fhcApi.factory.profilUpdate.deleteProfilRequest(item.profil_update_id).then(
+				(res) => {
+					if (res.data.error) {
+						//? open alert
+						console.error("error happened", res.data);
+					} else {
+						this.$emit("fetchUpdates");
+					}
+				}
+			);
+		},
 
-  template: /*html*/ `
-    <div  class="card " >
-    
+		getView: function (topic, status) {
+			if (!(status === this.profilUpdateStates["Pending"])) {
+				return "Status";
+			}
+
+			switch (topic) {
+				case this.profilUpdateTopic["Private Kontakte"]:
+					return "EditKontakt";
+				case this.profilUpdateTopic["Add Kontakt"]:
+					return "EditKontakt";
+				case this.profilUpdateTopic["Delete Kontakt"]:
+					return "Kontakt";
+				case this.profilUpdateTopic["Private Adressen"]:
+					return "EditAdresse";
+				case this.profilUpdateTopic["Add Adresse"]:
+					return "EditAdresse";
+				case this.profilUpdateTopic["Delete Adresse"]:
+					return "Adresse";
+				default:
+					return "TextInputDokument";
+			}
+		},
+
+	},
+	created() {
+	},
+
+	computed: {},
+
+	template: /*html*/ `
+<div class="card">
     <edit-profil v-if="showUpdateModal" ref="updateEditModal" @hideBsModal="hideEditProfilModal" :value="content" :title="editProfilTitle"></edit-profil>
-                      <div class="card-header">
-                      {{$p.t('profilUpdate','profilUpdates')}}
-                      </div>
-                      <div class="card-body" >
-    <div class="table-responsive text-nowrap">
-        <table class="m-0  table  table-hover align-middle">
-            <thead >
-                <tr >
-                <th scope="col">{{$p.t('profilUpdate','topic')}}</th>
-                <th scope="col">{{$p.t('global','status')}}</th>
-                <th scope="col">{{$p.t('global','datum')}}</th>
-                <th class="text-center" scope="col">{{$p.t('ui','aktion')}}</th>
-                </tr>
-            </thead>
-            <tbody>
-                <tr v-for="item in data" :style="item.status==profilUpdateStates['Accepted']?'background-color:lightgreen':item.status===profilUpdateStates['Rejected']?'background-color:lightcoral':''">
-                <td class="align-middle text-wrap ">{{item.topic}}</td>
-                <td class="align-middle " >{{item.status}}</td>
-                <td class="align-middle">{{item.status_timestamp?item.status_timestamp:item.insertamum}}</td>
-                
-                <template v-if="item.status === profilUpdateStates['Pending']">
-                <td>
-                
-                <div class="d-flex flex-row justify-content-evenly">
-                <template v-if="item.topic.toLowerCase().includes('delete')">
-                <div  class="align-middle text-center"><i role="button" @click="showEditProfilModal(item)" class="fa fa-eye"></i></div>
-                </template>
-
-                <template v-else >
-                <div class="align-middle text-center" ><i style="color:#00639c" @click="showEditProfilModal(item)" role="button" class="fa fa-edit"></i></div>
-                </template>
-                
-                <div class="align-middle text-center"><i style="color:red" role="button" @click="deleteRequest(item)" class="fa fa-trash"></i></div>
-                </div>
-
-                </td>
-                </template>
-
-                <template v-else>
-                
-                <td  class="align-middle text-center">
-                <div class="d-flex flex-row justify-content-evenly">
-                <i  role="button" @click="showEditProfilModal(item)" class="fa fa-eye"></i>
-                </div>
-                </td>
-                
-                </template>
-                
-                
-                </tr>
-            </tbody>
-        </table>
+    <div class="card-header">{{$p.t('profilUpdate','profilUpdates')}}</div>
+    <div class="card-body">
+        <div class="table-responsive text-nowrap">
+            <table class="m-0  table  table-hover align-middle">
+                <thead>
+                    <tr>
+                        <th scope="col">{{$p.t('profilUpdate','topic')}}</th>
+                        <th scope="col">{{$p.t('global','status')}}</th>
+                        <th scope="col">{{$p.t('global','datum')}}</th>
+                        <th class="text-center" scope="col">{{$p.t('ui','aktion')}}</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr v-for="item in data" :style="item.status==profilUpdateStates['Accepted']?'background-color:lightgreen':item.status===profilUpdateStates['Rejected']?'background-color:lightcoral':''">
+                        <td class="align-middle text-wrap ">{{item.topic}}</td>
+                        <td class="align-middle " >{{item.status}}</td>
+                        <td class="align-middle">{{item.status_timestamp?item.status_timestamp:item.insertamum}}</td>
+                        <template v-if="item.status === profilUpdateStates['Pending']">
+                            <td>
+                                <div class="d-flex flex-row justify-content-evenly">
+                                    <template v-if="item.topic.toLowerCase().includes('delete')">
+                                        <div  class="align-middle text-center"><i role="button" @click="showEditProfilModal(item)" class="fa fa-eye"></i></div>
+                                    </template>
+                                    <template v-else >
+                                        <div class="align-middle text-center" ><i style="color:#00639c" @click="showEditProfilModal(item)" role="button" class="fa fa-edit"></i></div>
+                                    </template>
+                                    <div class="align-middle text-center"><i style="color:red" role="button" @click="deleteRequest(item)" class="fa fa-trash"></i></div>
+                                </div>
+                            </td>
+                        </template>          
+                        <template v-else>
+                            <td class="align-middle text-center">
+                                <div class="d-flex flex-row justify-content-evenly">
+                                    <i role="button" @click="showEditProfilModal(item)" class="fa fa-eye"></i>
+                                </div>
+                            </td>
+                        </template>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
     </div>
-    </div>
-    </div>
-
-    
-    `,
+</div>
+`,
 };
diff --git a/public/js/components/Cis/Profil/ProfilComponents/FhAusweisStatus.js b/public/js/components/Cis/Profil/ProfilComponents/FhAusweisStatus.js
index d59bcbce3..21e05e525 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/FhAusweisStatus.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/FhAusweisStatus.js
@@ -1,20 +1,16 @@
 export default {
-    props:{
-        data:{
-            type:String,
-            
-        }
-    },
-    data(){
-        return {
-         
-        }
-    },mounted(){
-    },
-    template: /*html*/`
+	props: {
+		data: {
+			type: String,
+		}
+	},
+	data() {
+		return {}
+	},
+	template: /*html*/`
     <div class="card">
         <div class="card-body">
-        <span  >{{$p.t('profil','fhAusweisStatus',[data])}}</span>
+            <span  >{{$p.t('profil','fhAusweisStatus',[data])}}</span>
         </div>
     </div>`,
 }
\ No newline at end of file
diff --git a/public/js/components/Cis/Profil/ProfilComponents/Kontakt.js b/public/js/components/Cis/Profil/ProfilComponents/Kontakt.js
index 7b5c25a0c..ffb46e1a2 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/Kontakt.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/Kontakt.js
@@ -13,38 +13,26 @@ export default{
     }, 
     template:/*html*/`
     <div class="gy-2 row align-items-center justify-content-center">
-    <div class="col-1 text-center" >
-    
-    <i class="fa-solid " :class="{...(data.kontakt.includes('@')?{'fa-envelope':true}:{'fa-phone':true})}" style="color:rgb(0, 100, 156)"></i>
-    </div>
-    <div  :class="{...(data.anmerkung? {'col-11':true, 'col-md-6':true, 'col-xl-11':true, 'col-xxl-6':true} : {'col-10':true, 'col-xl-9':true, 'col-xxl-10':true})}">
-        
-        <!-- rendering KONTAKT emails -->
-   
-        <div  class="form-underline ">
-        <div class="form-underline-titel">{{data.kontakttyp}}</div>
-        <a v-if="data.kontakt.includes('@')" role="link" :aria-disabled="view?true:false" :href="!view?('mailto:'+data.kontakt):null" class="form-underline-content">{{data.kontakt}} </a>
-        <a v-else role="link" :aria-disabled="view?true:false" :href="!view?('tel:'+data.kontakt):null" class="form-underline-content">{{data.kontakt}} </a>
+        <div class="col-1 text-center" >
+            <i class="fa-solid " :class="{...(data.kontakt.includes('@')?{'fa-envelope':true}:{'fa-phone':true})}" style="color:rgb(0, 100, 156)"></i>
+        </div>
+    <div :class="{...(data.anmerkung? {'col-11':true, 'col-md-6':true, 'col-xl-11':true, 'col-xxl-6':true} : {'col-10':true, 'col-xl-9':true, 'col-xxl-10':true})}">
+        <!-- rendering KONTAKT emails -->
+        <div  class="form-underline ">
+            <div class="form-underline-titel">{{data.kontakttyp}}</div>
+            <a v-if="data.kontakt.includes('@')" role="link" :aria-disabled="view?true:false" :href="!view?('mailto:'+data.kontakt):null" class="form-underline-content">{{data.kontakt}} </a>
+            <a v-else role="link" :aria-disabled="view?true:false" :href="!view?('tel:'+data.kontakt):null" class="form-underline-content">{{data.kontakt}} </a>
         </div>
-          
     </div>
     <div v-if="data?.anmerkung" class="offset-1 offset-md-0 offset-xl-1 offset-xxl-0 order-2 order-sm-1 col-10  col-md-4   col-xl-9 col-xxl-4   ">
-        
-    <div  class="form-underline ">
-    <div class="form-underline-titel">{{$p.t('global','anmerkung')}}</div>
-    <span  class="form-underline-content">{{data.anmerkung}} </span>
-    </div>
-
-  
+        <div  class="form-underline ">
+            <div class="form-underline-titel">{{$p.t('global','anmerkung')}}</div>
+            <span  class="form-underline-content">{{data.anmerkung}} </span>
+        </div>
     </div>
     <div class="text-center col-1 col-sm-1 order-2  order-lg-1 col-xl-2 col-xxl-1 allign-middle">
         <i v-if="data.zustellung" class="fa-solid fa-check"></i>
         <i v-else="data.zustellung" class="fa-solid fa-xmark"></i>
     </div>
-    
-    
-</div>
-  </div>
-    
-    `,
+`,
 };
\ No newline at end of file
diff --git a/public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js b/public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js
index 37b8fc1a5..5f2221b22 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js
@@ -11,30 +11,23 @@ export default {
     },
     template: /*html*/`
     <div class="card">
-   
         <div class="card-header">
-        {{title}}
+            {{title}}
         </div>
         <div class="card-body">
-        
-        <h6 class="card-title">{{$p.t('profil','mailverteilerMitglied')}}</h6>
+            <h6 class="card-title">{{$p.t('profil','mailverteilerMitglied')}}</h6>
         <div  class="card-text row text-break mb-2" v-for="verteiler in data">
             <div class="col-12 ">
-            <div class="row">  
-                <div class="col-1 ">
-                
-                <i class="fa-solid fa-envelope" style="color: #00649C;"></i>
-                
+                <div class="row">  
+                    <div class="col-1 ">
+                        <i class="fa-solid fa-envelope" style="color: #00649C;"></i>
+                    </div>
+                    <div class="col">
+                        <a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a>
+                    </div>
                 </div>
-                <div class="col">
-                <a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a>
-                </div>
-            </div>
-            
             </div> 
             <div class="col-11 offset-1 ">{{verteiler.beschreibung}}</div>
         </div>
-
-        </div>
     </div>`,
 };
diff --git a/public/js/components/Cis/Profil/ProfilComponents/ProfilEmails.js b/public/js/components/Cis/Profil/ProfilComponents/ProfilEmails.js
index 4040be37b..43ef807ba 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/ProfilEmails.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/ProfilEmails.js
@@ -1,62 +1,38 @@
 export default {
-  data() {
-    return {};
-  },
-  props: {
-    title: {
-      type: String,
-      required: true,
-    },
-    data: {
-      type: Array,
-    },
-  },
-  template: /*html*/ `
-    <div class="card ">
+	data() {
+		return {};
+	},
+	props: {
+		title: {
+			type: String,
+			required: true,
+		},
+		data: {
+			type: Array,
+		},
+	},
+	template: /*html*/ `
+<div class="card ">
     <div class="card-header">
-    {{title}}
+        {{title}}
     </div>
-   
     <div class="card-body">
-
-      <!-- HIER SIND DIE EMAILS -->
-  
-      <div  class="gy-3 row justify-content-center ">
-      <div v-for="email in data" class="col-12 ">
-  
-            <div class="row align-items-center">
-            
-      <div class="col-1 text-center">
-
-      <i class="fa-solid fa-envelope" style="color:rgb(0, 100, 156)"></i>
-
-      </div>
-
-      
-      <div class="col-11">
-
-      <div class="form-underline">
-      <div class="form-underline-titel">{{email.type}}</div>
-      <a :href="'mailto:'+email.email" class="form-underline-content">{{email.email}} </a>
-      </div>
-      
-      
-      </div>
-      </div>
-      </div>
-          </div>
-
-    
-    
-     
-
-
-
-
-    
-   
-
-
+        <!-- HIER SIND DIE EMAILS -->
+        <div  class="gy-3 row justify-content-center ">
+            <div v-for="email in data" class="col-12 ">
+                <div class="row align-items-center">
+                    <div class="col-1 text-center">
+                        <i class="fa-solid fa-envelope" style="color:rgb(0, 100, 156)"></i>
+                    </div>
+                    <div class="col-11">
+                        <div class="form-underline">
+                            <div class="form-underline-titel">{{email.type}}</div>
+                            <a :href="'mailto:'+email.email" class="form-underline-content">{{email.email}} </a>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
     </div>
-    </div>`,
+</div>`,
 };
diff --git a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
index 46b0b2eda..24458ed93 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
@@ -1,150 +1,115 @@
 export default {
-  props: {
-    title: {
-      type: String,
-    },
-    data: {
-      type: Object,
-    },
-    editable: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {
-      FotoSperre: this.data.foto_sperre,
-    };
-  },
-  emits: ["showEditProfilModal"],
+	props: {
+		title: {
+			type: String,
+		},
+		data: {
+			type: Object,
+		},
+		editable: {
+			type: Boolean,
+			default: false
+		}
+	},
+	data() {
+		return {
+			FotoSperre: this.data.foto_sperre,
+		};
+	},
+	emits: ["showEditProfilModal"],
 
-  methods: {
-    sperre_foto_function() {
-      //TODO: refactor
-      if (!this.data) {
-        return;
-      }
-      this.$fhcApi.factory.profil.fotoSperre(!this.FotoSperre).then(res =>{
-        this.FotoSperre = res.data.foto_sperre;
-      })
-    },
-  },
-  computed: {
-    get_image_base64_src: function () {
-      if (!this.data.foto) {
-        return "";
-      }
-      return "data:image/jpeg;base64," + this.data.foto;
-    },
-    name: function () {
-      return { vorname: this.data.Vorname, nachname: this.data.Nachname };
-    },
-    profilInfo: function () {
-      let res = {};
-      let notIncludedProperties = [
-        "Vorname",
-        "Nachname",
-        "foto_sperre",
-        "foto",
-      ];
-      Object.keys(this.data).forEach((key) => {
-        if (!notIncludedProperties.includes(key)) {
-          res[key] = this.data[key];
-        }
-      });
-      return res;
-    },
-  },
-  template: /*html*/ `
-    
-    <div class="card h-100">
+	methods: {
+		sperre_foto_function() {
+			//TODO: refactor
+			if (!this.data) {
+				return;
+			}
+			this.$fhcApi.factory.profil.fotoSperre(!this.FotoSperre).then(res => {
+				this.FotoSperre = res.data.foto_sperre;
+			})
+		},
+	},
+	computed: {
+		get_image_base64_src: function () {
+			if (!this.data.foto) {
+				return "";
+			}
+			return "data:image/jpeg;base64," + this.data.foto;
+		},
+		name: function () {
+			return {vorname: this.data.Vorname, nachname: this.data.Nachname};
+		},
+		profilInfo: function () {
+			let res = {};
+			let notIncludedProperties = [
+				"Vorname",
+				"Nachname",
+				"foto_sperre",
+				"foto",
+			];
+			Object.keys(this.data).forEach((key) => {
+				if (!notIncludedProperties.includes(key)) {
+					res[key] = this.data[key];
+				}
+			});
+			return res;
+		},
+	},
+	template: /*html*/ `
+
+<div class="card h-100">
     <div class="card-header">
-      <div class="row">
-        <div v-if="editable" @click="$emit('showEditProfilModal','Personen_Informationen')" class="col-auto" type="button">
-          <i class="fa fa-edit"></i>
+        <div class="row">
+            <div v-if="editable" @click="$emit('showEditProfilModal','Personen_Informationen')" class="col-auto" type="button">
+                <i class="fa fa-edit"></i>
+            </div>
+            <div class="col">
+                <span>{{title}}</span>
+            </div>
         </div>
-        <div class="col">
-          <span>{{title}}</span>
-        </div>
-      </div>
     </div>
     <div class="card-body">
-    
-<div  class="gy-3 row justify-content-center align-items-center">
-
-<!-- SQUEEZING THE IMAGE INSIDE THE FIRST INFORMATION COLUMN -->
-<!-- START OF THE FIRST ROW WITH THE PROFIL IMAGE -->
-<div class="col-12 col-sm-6 mb-2">
-<div class="row justify-content-center">
-      <div class="col-auto " style="position:relative">
-        <img class=" img-thumbnail " style=" max-height:150px; "  :src="get_image_base64_src">
-        <!-- LOCKING IMAGE FUNCTIONALITY -->
-        
-        
-        <div v-if="editable" role="button" @click.prevent="sperre_foto_function" class="image-lock" >
-        <i :class="{'fa':true, ...(FotoSperre?{'fa-lock':true}:{'fa-lock-open':true})} " ></i>
+        <div  class="gy-3 row justify-content-center align-items-center">
+            <!-- SQUEEZING THE IMAGE INSIDE THE FIRST INFORMATION COLUMN -->
+            <!-- START OF THE FIRST ROW WITH THE PROFIL IMAGE -->
+            <div class="col-12 col-sm-6 mb-2">
+                <div class="row justify-content-center">
+                    <div class="col-auto " style="position:relative">
+                        <img class=" img-thumbnail " style=" max-height:150px; "  :src="get_image_base64_src">
+                        <!-- LOCKING IMAGE FUNCTIONALITY -->
+                        <div v-if="editable" role="button" @click.prevent="sperre_foto_function" class="image-lock">
+                            <i :class="{'fa':true, ...(FotoSperre?{'fa-lock':true}:{'fa-lock-open':true})} "></i>
+                        </div>
+                    </div>
+                </div>
+            <!-- END OF THE ROW WITH THE IMAGE -->
+            </div>
+            <!-- END OF SQUEEZE -->
+            <!-- COLUMNS WITH MULTIPLE ROWS NEXT TO PROFIL PICTURE -->
+            <div class="col-12 col-sm-6">
+                <div class="row gy-4">
+                    <div class="col-12">
+                        <div class="form-underline ">
+                            <div class="form-underline-titel">{{$p.t('profilUpdate','vorname')}}</div>
+                            <span class="form-underline-content">{{name.vorname}} </span>
+                        </div>
+                    </div>
+                    <div class="col-12">
+                        <div class="form-underline ">
+                            <div class="form-underline-titel">{{$p.t('profilUpdate','nachname')}}</div>
+                            <span class="form-underline-content">{{name.nachname}} </span>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div v-for="(wert,bez) in profilInfo" class="col-md-6 col-sm-12">
+                <div class="form-underline">
+                    <div class="form-underline-titel">{{$p.t('profil',bez)}}</div>
+                    <span class="form-underline-content">{{wert?wert:'-'}} </span>
+                </div>
+            </div>
         </div>
-
-
-      </div>
     </div>
-  <!-- END OF THE ROW WITH THE IMAGE -->
-  </div>
-<!-- END OF SQUEEZE -->
-
-
-
-<!-- COLUMNS WITH MULTIPLE ROWS NEXT TO PROFIL PICTURE -->
-<div class="col-12 col-sm-6">
-<div class="row gy-4">
-<div class="col-12">
-
-      
-<div class="form-underline ">
-<div class="form-underline-titel">{{$p.t('profilUpdate','vorname')}}</div>
-<span class="form-underline-content">{{name.vorname}} </span>
 </div>
-
-
-
-</div>
-<div class="col-12">
-
-<div class="form-underline ">
-<div class="form-underline-titel">{{$p.t('profilUpdate','nachname')}}</div>
-<span class="form-underline-content">{{name.nachname}} </span>
-</div>
-
-</div>
-</div>
-
-
-</div>
-
-
-
-
-
-
-
-
-<div v-for="(wert,bez) in profilInfo" class="col-md-6 col-sm-12 ">
-
-
-<div class="form-underline ">
-<div class="form-underline-titel">{{$p.t('profil',bez)}}</div>
-<span class="form-underline-content">{{wert?wert:'-'}} </span>
-</div>
-
-
-
-</div>
-
-
-    </div>
-
-
-    
-    </div>
-  </div>`,
+`,
 };
diff --git a/public/js/components/Cis/Profil/ProfilComponents/QuickLinks.js b/public/js/components/Cis/Profil/ProfilComponents/QuickLinks.js
index bad40b2fe..3f8b7d77c 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/QuickLinks.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/QuickLinks.js
@@ -1,66 +1,53 @@
 export default {
-  //TODO: To be implemented
-  props: {
-    data: {
-      type: String,
-    },
-    title: {
-      type: String,
-      required: true,
-    },
-    mobile: {
-      type: Boolean,
-      default: false,
-    },
-  },
-  methods: {
-    hideCollapse: function () {
-      this.collapseOpen = false;
-    },
-    showCollapse: function () {
-      this.collapseOpen = true;
-    },
-  },
-  data() {
-    return {
-      collapseOpen: false,
-    };
-  },
-  template: /*html*/ `
-    <div class="card">
+	//TODO: To be implemented
+	props: {
+		data: {
+			type: String,
+		},
+		title: {
+			type: String,
+			required: true,
+		},
+		mobile: {
+			type: Boolean,
+			default: false,
+		},
+	},
+	methods: {
+		hideCollapse: function () {
+			this.collapseOpen = false;
+		},
+		showCollapse: function () {
+			this.collapseOpen = true;
+		},
+	},
+	data() {
+		return {
+			collapseOpen: false,
+		};
+	},
+	template: /*html*/ `
+<div class="card">
     <template v-if="mobile">
-    
-               <button class="btn btn-outline-primary"  data-bs-toggle="collapse"  data-bs-target="#quickLinks" :aria-expanded="collapseOpen" aria-controls="quickLinks" >
-               {{title}}
-               <i class="fa " :class="collapseOpen?'fa-chevron-up':'fa-chevron-down'"></i> 
-               </button>
-    
-                <div @[\`show.bs.collapse\`]="collapseOpen=true;" @[\`hide.bs.collapse\`]="collapseOpen=false;" class="mt-1 collapse" id="quickLinks">
-                  
-                  <div class="list-group">
-                   
-                    <a href="#" class="list-group-item list-group-item-action">{{$p.t('profil','zeitwuensche')}}</a>
-                    <a href="#" class="list-group-item list-group-item-action">{{$p.t('profil','lehrveranstaltungen')}}</a>
-                    <a href="#" class="list-group-item list-group-item-action ">{{$p.t('profil','zeitsperren')}}</a>
-                  </div>
-                  </div>
-                
+        <button class="btn btn-outline-primary"  data-bs-toggle="collapse"  data-bs-target="#quickLinks" :aria-expanded="collapseOpen" aria-controls="quickLinks" >
+            {{title}}
+            <i class="fa " :class="collapseOpen?'fa-chevron-up':'fa-chevron-down'"></i> 
+        </button>
+        <div @[\`show.bs.collapse\`]="collapseOpen=true;" @[\`hide.bs.collapse\`]="collapseOpen=false;" class="mt-1 collapse" id="quickLinks">
+            <div class="list-group">
+                <a href="#" class="list-group-item list-group-item-action">{{$p.t('profil','zeitwuensche')}}</a>
+                <a href="#" class="list-group-item list-group-item-action">{{$p.t('profil','lehrveranstaltungen')}}</a>
+                <a href="#" class="list-group-item list-group-item-action ">{{$p.t('profil','zeitsperren')}}</a>
+            </div>
+        </div>
     </template>
     <template v-else>
-    
-   
-    <div class="card-header">
-    {{title}}
-    </div>
-    <div class="card-body">
-    
-     
-      <a style="text-decoration:none" class="my-1 d-block" href="#">{{$p.t('profil','zeitwuensche')}}</a>
-      <a style="text-decoration:none" class="my-1 d-block" href="#">{{$p.t('profil','lehrveranstaltungen')}}</a>
-      <a style="text-decoration:none" class="my-1 d-block" href="#">{{$p.t('profil','zeitsperren')}}</a>
-
-    </div>
-  
-  </template>
-  </div>`,
+        <div class="card-header">{{title}}</div>
+        <div class="card-body">
+            <a style="text-decoration:none" class="my-1 d-block" href="#">{{$p.t('profil','zeitwuensche')}}</a>
+            <a style="text-decoration:none" class="my-1 d-block" href="#">{{$p.t('profil','lehrveranstaltungen')}}</a>
+            <a style="text-decoration:none" class="my-1 d-block" href="#">{{$p.t('profil','zeitsperren')}}</a>
+        </div>
+    </template>
+</div>`,
 };
diff --git a/public/js/components/Cis/Profil/ProfilComponents/RoleInformation.js b/public/js/components/Cis/Profil/ProfilComponents/RoleInformation.js
index 26fb06876..57986c1a7 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/RoleInformation.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/RoleInformation.js
@@ -1,49 +1,37 @@
 export default {
-    data(){
-        return {
-
-        }
-    },
-    props:{
-        data:{
-            type:Object,
-        },
-        title:{
-            type:String,
-        }
-    },
-    computed:{
+	data() {
+		return {}
+	},
+	props: {
+		data: {
+			type: Object,
+		},
+		title: {
+			type: String,
+		}
+	},
+	computed: {},
+	created() {
+		//TODO: check if data.Telefon is a valid telefon number to call before using it as a tel: link
+	},
+	template: `
+    <div class="card">     
+        <div class="card-header">{{title}}</div>
+        <div class="card-body">
+            <div class="gy-3 row">
+            <div v-for="(wert,bez) in data" class="col-md-6 col-sm-12 ">
+                
+                <div class="form-underline">
+                    <div class="form-underline-titel">{{bez }}</div>
         
-    },
-    created(){
-        //TODO: check if data.Telefon is a valid telefon number to call before using it as a tel: link
-    },
-    template:`
-    <div class="card">
-                 
-    <div class="card-header">
-	{{title}}
+                    <!-- print Telefon link -->
+                    <a  v-if="bez=='Telefon'" :href="data.Telefon?'tel:'+data.Telefon:null" :class="{'form-underline-content':true,'text-decoration-none':!data.Telefon,'text-body':!data.Telefon}">{{wert?wert:'-'}}</a>
+                    
+                    <!-- else print information -->
+                    <span v-else class="form-underline-content">{{wert?wert:'-'}}</span>
+                </div>
+            </div>
+        </div>
     </div>
-    <div class="card-body">
-        <div class="gy-3 row">
-        <div v-for="(wert,bez) in data" class="col-md-6 col-sm-12 ">
-          
-           <div class="form-underline">
-           <div class="form-underline-titel">{{bez }}</div>
-
-           <!-- print Telefon link -->
-           <a  v-if="bez=='Telefon'" :href="data.Telefon?'tel:'+data.Telefon:null" :class="{'form-underline-content':true,'text-decoration-none':!data.Telefon,'text-body':!data.Telefon}">{{wert?wert:'-'}}</a>
-           
-           <!-- else print information -->
-           <span v-else class="form-underline-content">{{wert?wert:'-'}}</span>
-           </div>
-           
-        </div>
-
-       
-        </div>
-    
-</div>
-
 </div>`
 };
\ No newline at end of file
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfil.js b/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
index b244091bb..9e5228a0d 100644
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
@@ -4,204 +4,201 @@ import EditProfilSelect from "./EditProfilSelect.js";
 import Loader from "../../../Loader.js";
 
 export default {
-  components: {
-    BsModal,
-    Alert,
-    EditProfilSelect,
-    Loader,
-  },
-  mixins: [BsModal],
-  props: {
-    value: Object,
-    title: String,
-    zustelladressenCount: Function,
-    zustellkontakteCount: Function,
-    /*
-     * NOTE(chris):
-     * Hack to expose in "emits" declared events to $props which we use
-     * in the v-bind directive to forward all events.
-     * @see: https://github.com/vuejs/core/issues/3432
-     */
-    onHideBsModal: Function,
-    onHiddenBsModal: Function,
-    onHidePreventedBsModal: Function,
-    onShowBsModal: Function,
-    onShownBsModal: Function,
-  },
-
-  data() {
-    return {
-      topic: null,
-      profilUpdate: null,
-      editData: this.value,
-      fileID: null,
-      breadcrumb: null,
-      loading: false,
-      result: false,
-      info: null,
-    };
-  },
-  inject: ["setLoading"],
-  provide() {
-    return {
-      updateFileID: this.updateFileIDFunction,
-    };
-  },
-
-  methods: {
-	updateFileIDFunction: function (newFileID) {
-      this.fileID = newFileID;
-    },
-
-	handleFailedError: function (err) {
-		console.error(err);
-		this.loading = false;
-		this.setLoading(false);
-		this.result = false;
-		this.hide();
+	components: {
+		BsModal,
+		Alert,
+		EditProfilSelect,
+		Loader,
+	},
+	mixins: [BsModal],
+	props: {
+		value: Object,
+		title: String,
+		zustelladressenCount: Function,
+		zustellkontakteCount: Function,
+		/*
+		 * NOTE(chris):
+		 * Hack to expose in "emits" declared events to $props which we use
+		 * in the v-bind directive to forward all events.
+		 * @see: https://github.com/vuejs/core/issues/3432
+		 */
+		onHideBsModal: Function,
+		onHiddenBsModal: Function,
+		onHidePreventedBsModal: Function,
+		onShowBsModal: Function,
+		onShownBsModal: Function,
 	},
 
-    async submitProfilChange() {
+	data() {
+		return {
+			topic: null,
+			profilUpdate: null,
+			editData: this.value,
+			fileID: null,
+			breadcrumb: null,
+			loading: false,
+			result: false,
+			info: null,
+		};
+	},
+	inject: ["setLoading"],
+	provide() {
+		return {
+			updateFileID: this.updateFileIDFunction,
+		};
+	},
 
-      //? check if data is valid before making a request
-	  if (this.topic && this.profilUpdate) {
-        //? if profil update contains any attachment
-        if (this.fileID) {
-          const fileData = await this.uploadFiles(this.fileID);
+	methods: {
+		updateFileIDFunction: function (newFileID) {
+			this.fileID = newFileID;
+		},
 
-          this.fileID = fileData ? fileData : null;
-        }
+		handleFailedError: function (err) {
+			console.error(err);
+			this.loading = false;
+			this.setLoading(false);
+			this.result = false;
+			this.hide();
+		},
 
-        //? inserts new row in public.tbl_cis_profil_update
-        //* calls the update api call if an update field is present in the data that was passed to the modal
-        const handleApiResponse = (res) => {
-          //? toggles the loading to false and closes the loading modal
-          if (res.data.error) {
-            this.result = false;
-            Alert.popup(
-              "Ein Fehler ist aufgetreten: " + JSON.stringify(res.data.retval)
-            );
-          } else {
-            this.result = true;
-            Alert.popup(
-              "Ihre Anfrage wurde erfolgreich gesendet. Bitte warten Sie, während sich das Team um Ihre Anfrage kümmert."
-            );
-          }
-        };
+		async submitProfilChange() {
 
-        //* v-show on EditProfil modal binded to this.loading
-        //? hides the EditProfil modal and shows the loading modal by calling a callback that was passed as prop from the parent component
-        this.loading = true;
-        this.setLoading(true);
+			//? check if data is valid before making a request
+			if (this.topic && this.profilUpdate) {
+				//? if profil update contains any attachment
+				if (this.fileID) {
+					const fileData = await this.uploadFiles(this.fileID);
 
-		//? if an updateID is present, updateProfilRequest is called, else insertProfilRequest is called
-        this.editData.updateID? 
-			this.$fhcApi.factory.profilUpdate.updateProfilRequest(
-              this.topic,
-              this.profilUpdate,
-              this.editData.updateID,
-              this.fileID ? this.fileID[0] : null
-            )
-			.then((res) => {
-			handleApiResponse(res);
-			})
-			.catch((err) => this.$fhcAlert.handleSystemError)
-			.finally(()=>{
-				this.loading = false;
-				this.setLoading(false);
-				this.hide();
-			})
-			: 
-			this.$fhcApi.factory.profilUpdate.insertProfilRequest(
-              this.topic,
-              this.profilUpdate,
-              this.fileID ? this.fileID[0] : null
-            )
-			.then((res) => {
-			handleApiResponse(res);
-			})
-			.catch((err) => this.$fhcAlert.handleSystemError)
-			.finally(() => {
-				this.loading = false;
-				this.setLoading(false);
-				this.hide();
-			});
-      }
-    },
+					this.fileID = fileData ? fileData : null;
+				}
 
-    uploadFiles: async function (files) {
-      if (files[0].type !== "application/x.fhc-dms+json") {
-        let formData = new FormData();
-        formData.append("files[]", files[0]);
-        const result = this.editData.updateID
-          ? //? updating old attachment by replacing
-            //* second parameter of api request insertFile checks if the file has to be replaced or not
-            await this.$fhcApi.factory.profilUpdate.insertFile(
-              formData,
-              this.editData.updateID
-            ).then((res) => {
-              return res.data?.map((file) => file.dms_id);
-            })
-          : //? fresh insert of new attachment
-            await this.$fhcApi.factory.profilUpdate.insertFile(formData).then((res) => {
-              return res.data?.map((file) => file.dms_id);
-            });
-        return result;
-      } else {
-        //? attachment hasn't been replaced
-        return false;
-      }
-    },
-  },
-  computed: {
-	showFooter: function () {
-		switch(this.value.view){
-			case 'Status': return false;
-			case 'Kontakt':return false;
-			case 'Adresse':return false;
-			default: return true;
-		}	
-    },
-  },
-  created() {
-    if (this.editData.topic) {
-      //? if the topic was passed through the prop add it to the component
-      this.topic = this.editData.topic;
-    }
-  },
-  mounted() {
-    this.modal = this.$refs.modalContainer.modal;
-  },
-  popup(options) {
-    BsModal.popup.bind(this);
-    return BsModal.popup(null, options);
-  },
-  template: /*html*/ `
-  <bs-modal v-show="!loading" ref="modalContainer" v-bind="$props" body-class="" dialog-class="modal-lg" class="bootstrap-alert" backdrop="false" >
+				//? inserts new row in public.tbl_cis_profil_update
+				//* calls the update api call if an update field is present in the data that was passed to the modal
+				const handleApiResponse = (res) => {
+					//? toggles the loading to false and closes the loading modal
+					if (res.data.error) {
+						this.result = false;
+						Alert.popup(
+							"Ein Fehler ist aufgetreten: " + JSON.stringify(res.data.retval)
+						);
+					} else {
+						this.result = true;
+						Alert.popup(
+							"Ihre Anfrage wurde erfolgreich gesendet. Bitte warten Sie, während sich das Team um Ihre Anfrage kümmert."
+						);
+					}
+				};
 
-  <template v-if="title" v-slot:title>
-      {{title }}
-    </template>
-    <template v-slot:default>
-    <div >
-    
-    <nav aria-label="breadcrumb" class="ps-2  ">
-      <ol class="breadcrumb ">
-        <li class="breadcrumb-item"  v-for="element in breadcrumb">{{element}}</li>
-      </ol>
-    </nav>
+				//* v-show on EditProfil modal binded to this.loading
+				//? hides the EditProfil modal and shows the loading modal by calling a callback that was passed as prop from the parent component
+				this.loading = true;
+				this.setLoading(true);
 
-    <edit-profil-select @submit="submitProfilChange" v-model:breadcrumb="breadcrumb" v-model:topic="topic" v-model:profilUpdate="profilUpdate" ariaLabel="select" :list="editData"></edit-profil-select>
-    </div>
+				//? if an updateID is present, updateProfilRequest is called, else insertProfilRequest is called
+				this.editData.updateID ?
+					this.$fhcApi.factory.profilUpdate.updateProfilRequest(
+						this.topic,
+						this.profilUpdate,
+						this.editData.updateID,
+						this.fileID ? this.fileID[0] : null
+					)
+						.then((res) => {
+							handleApiResponse(res);
+						})
+						.catch((err) => this.$fhcAlert.handleSystemError)
+						.finally(() => {
+							this.loading = false;
+							this.setLoading(false);
+							this.hide();
+						})
+					:
+					this.$fhcApi.factory.profilUpdate.insertProfilRequest(
+						this.topic,
+						this.profilUpdate,
+						this.fileID ? this.fileID[0] : null
+					)
+						.then((res) => {
+							handleApiResponse(res);
+						})
+						.catch((err) => this.$fhcAlert.handleSystemError)
+						.finally(() => {
+							this.loading = false;
+							this.setLoading(false);
+							this.hide();
+						});
+			}
+		},
 
-    </template>
-    <!-- optional footer -->
-    <template v-slot:footer v-if="showFooter">
-    <loader  ref="loaderRef" :timeout="0"></loader>
-        
-    <button class="btn btn-outline-danger " @click="hide">{{$p.t('ui','cancel')}}</button>    
-      <button :disabled="!profilUpdate"  @click="submitProfilChange" role="button" class="btn btn-primary">{{$p.t('ui','senden')}}</button>
-    </template>
-    <!-- end of optional footer --> 
-  </bs-modal>`,
+		uploadFiles: async function (files) {
+			if (files[0].type !== "application/x.fhc-dms+json") {
+				let formData = new FormData();
+				formData.append("files[]", files[0]);
+				const result = this.editData.updateID
+					? //? updating old attachment by replacing
+					  //* second parameter of api request insertFile checks if the file has to be replaced or not
+					await this.$fhcApi.factory.profilUpdate.insertFile(
+						formData,
+						this.editData.updateID
+					).then((res) => {
+						return res.data?.map((file) => file.dms_id);
+					})
+					: //? fresh insert of new attachment
+					await this.$fhcApi.factory.profilUpdate.insertFile(formData).then((res) => {
+						return res.data?.map((file) => file.dms_id);
+					});
+				return result;
+			} else {
+				//? attachment hasn't been replaced
+				return false;
+			}
+		},
+	},
+	computed: {
+		showFooter: function () {
+			switch (this.value.view) {
+				case 'Status':
+					return false;
+				case 'Kontakt':
+					return false;
+				case 'Adresse':
+					return false;
+				default:
+					return true;
+			}
+		},
+	},
+	created() {
+		if (this.editData.topic) {
+			//? if the topic was passed through the prop add it to the component
+			this.topic = this.editData.topic;
+		}
+	},
+	mounted() {
+		this.modal = this.$refs.modalContainer.modal;
+	},
+	popup(options) {
+		BsModal.popup.bind(this);
+		return BsModal.popup(null, options);
+	},
+	template: /*html*/ `
+<bs-modal v-show="!loading" ref="modalContainer" v-bind="$props" body-class="" dialog-class="modal-lg" class="bootstrap-alert" backdrop="false" >
+	<template v-if="title" v-slot:title>{{title }}</template>
+	<template v-slot:default>
+		<div >
+			<nav aria-label="breadcrumb" class="ps-2  ">
+				<ol class="breadcrumb ">
+					<li class="breadcrumb-item"  v-for="element in breadcrumb">{{element}}</li>
+				</ol>
+			</nav>
+			<edit-profil-select @submit="submitProfilChange" v-model:breadcrumb="breadcrumb" v-model:topic="topic" v-model:profilUpdate="profilUpdate" ariaLabel="select" :list="editData"></edit-profil-select>
+		</div>
+	</template>
+	<!-- optional footer -->
+	<template v-slot:footer v-if="showFooter">
+		<loader  ref="loaderRef" :timeout="0"></loader>
+		<button class="btn btn-outline-danger " @click="hide">{{$p.t('ui','cancel')}}</button>    
+		<button :disabled="!profilUpdate"  @click="submitProfilChange" role="button" class="btn btn-primary">{{$p.t('ui','senden')}}</button>
+	</template>
+  <!-- end of optional footer --> 
+</bs-modal>`,
 };
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfilSelect.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilSelect.js
index 7b87bad85..99d04d8f6 100644
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfilSelect.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfilSelect.js
@@ -6,164 +6,164 @@ import Status from "./EditProfilComponents/Status.js";
 import TextInputDokument from "./EditProfilComponents/TextInputDokument.js";
 
 export default {
-  components: {
-    Kontakt,
-    EditKontakt,
-    Adresse,
-    EditAdresse,
-    Status,
-    TextInputDokument,
-  },
-  inject: ["profilUpdateTopic"],
-  props: {
-    list: Object,
+	components: {
+		Kontakt,
+		EditKontakt,
+		Adresse,
+		EditAdresse,
+		Status,
+		TextInputDokument,
+	},
+	inject: ["profilUpdateTopic"],
+	props: {
+		list: Object,
 
-    //? Prop used to determine how many options the select should initially show
-    size: {
-      type: Number,
-      default: null,
-    },
-    //? Content for the aria label of the select
-    ariaLabel: {
-      type: String,
-      required: true,
-    },
-    profilUpdate: String,
-    topic: String,
-    breadcrumb: String,
-  },
-  emits: {
-    //? update:modelValue event is needed to notify the v-model when the value has changed
-    ["update:profilUpdate"]: null,
-    ["update:topic"]: null,
-    ["update:breadcrumb"]: null,
-    submit: null,
-    select: null,
-  },
-  data() {
-    return {
-      view: null,
-      data: null,
-      breadcrumbItems: [],
-      modal_topic: this.topic,
-      properties: null,
-    };
-  },
+		//? Prop used to determine how many options the select should initially show
+		size: {
+			type: Number,
+			default: null,
+		},
+		//? Content for the aria label of the select
+		ariaLabel: {
+			type: String,
+			required: true,
+		},
+		profilUpdate: String,
+		topic: String,
+		breadcrumb: String,
+	},
+	emits: {
+		//? update:modelValue event is needed to notify the v-model when the value has changed
+		["update:profilUpdate"]: null,
+		["update:topic"]: null,
+		["update:breadcrumb"]: null,
+		submit: null,
+		select: null,
+	},
+	data() {
+		return {
+			view: null,
+			data: null,
+			breadcrumbItems: [],
+			modal_topic: this.topic,
+			properties: null,
+		};
+	},
 
-  methods: {
-    addItem: function () {
-      this.view =
-        this.modal_topic == this.profilUpdateTopic["Private Kontakte"]
-          ? "EditKontakt"
-          : "EditAdresse";
-		  
-      //? updates the topic when a Kontakt or an Address should be added
-		this.modal_topic =
-			this.modal_topic == this.profilUpdateTopic["Private Kontakte"]
-          ? this.profilUpdateTopic["Add Kontakt"]
-          : this.profilUpdateTopic["Add Adresse"];
-	  this.$emit("update:topic", this.modal_topic);
-	  this.breadcrumbItems.push(this.modal_topic);
-      this.$emit("update:breadcrumb", this.breadcrumbItems);
+	methods: {
+		addItem: function () {
+			this.view =
+				this.modal_topic == this.profilUpdateTopic["Private Kontakte"]
+					? "EditKontakt"
+					: "EditAdresse";
 
-      this.data =
-        this.view == "EditAdresse"
-          ? {
-              //? add flag
-              add: true,
-              adresse_id: null,
-              strasse: null,
-              typ: null,
-              plz: null,
-              ort: null,
-              zustelladresse: false,
-            }
-          : {
-              //? add flag
-              add: true,
-              kontakt_id: null,
-              kontakttyp: null,
-              kontakt: null,
-              anmerkung: null,
-              zustellung: false,
-            };
-    },
+			//? updates the topic when a Kontakt or an Address should be added
+			this.modal_topic =
+				this.modal_topic == this.profilUpdateTopic["Private Kontakte"]
+					? this.profilUpdateTopic["Add Kontakt"]
+					: this.profilUpdateTopic["Add Adresse"];
+			this.$emit("update:topic", this.modal_topic);
+			this.breadcrumbItems.push(this.modal_topic);
+			this.$emit("update:breadcrumb", this.breadcrumbItems);
 
-    deleteItem: function (item) {
-      //? delete flag
-      item.data.delete = true;
-      this.$emit("update:profilUpdate", item.data);
-      //? updates the topic when a Kontakt or an Address should be deleted
-	  
-	  this.modal_topic = this.modal_topic == this.profilUpdateTopic["Private Adressen"]
-        ? this.profilUpdateTopic["Delete Adresse"]
-        : this.profilUpdateTopic["Delete Kontakt"];
-	  this.$emit("update:topic", this.modal_topic);
-      this.$emit("submit");
-    },
+			this.data =
+				this.view == "EditAdresse"
+					? {
+						//? add flag
+						add: true,
+						adresse_id: null,
+						strasse: null,
+						typ: null,
+						plz: null,
+						ort: null,
+						zustelladresse: false,
+					}
+					: {
+						//? add flag
+						add: true,
+						kontakt_id: null,
+						kontakttyp: null,
+						kontakt: null,
+						anmerkung: null,
+						zustellung: false,
+					};
+		},
 
-    profilUpdateEmit: function (event) {
-      //? passes the updated profil information to the parent component
-      this.$emit("update:profilUpdate", event);
-    },
+		deleteItem: function (item) {
+			//? delete flag
+			item.data.delete = true;
+			this.$emit("update:profilUpdate", item.data);
+			//? updates the topic when a Kontakt or an Address should be deleted
 
-    updateOptions: function (event, item) {
-	  this.properties = item;
-      this.data = item.data;
-      this.view = item.view;
-      if (item.title) {
-        //? emits the selected topic to the parent component
-        this.modal_topic = item.topic;
-		this.$emit("update:topic", this.modal_topic);
+			this.modal_topic = this.modal_topic == this.profilUpdateTopic["Private Adressen"]
+				? this.profilUpdateTopic["Delete Adresse"]
+				: this.profilUpdateTopic["Delete Kontakt"];
+			this.$emit("update:topic", this.modal_topic);
+			this.$emit("submit");
+		},
 
-        //? emits the new item for the breadcrumb in the parent component
-        this.breadcrumbItems.push(item.title);
-      } else {
-        if (item.data.kontakttyp) {
-          this.breadcrumbItems.push(item.data.kontakttyp);
-          this.breadcrumbItems.push(item.data.kontakt);
-        } else if (item.data.strasse) {
-          this.breadcrumbItems.push(item.data.strasse);
-        }
-      }
-      this.$emit("update:breadcrumb", this.breadcrumbItems);
-    },
-  },
-  computed: {},
-  created() {
-    //? JSON parse and stringify are used to deep clone the objects
-    this.properties = { ...this.list };
-    this.data = this.list.data
-      ? JSON.parse(JSON.stringify(this.list.data))
-      : null;
-    this.view = this.list.view
-      ? JSON.parse(JSON.stringify(this.list.view))
-      : null;
-  },
-  mounted() {},
+		profilUpdateEmit: function (event) {
+			//? passes the updated profil information to the parent component
+			this.$emit("update:profilUpdate", event);
+		},
 
-  template: /*html*/ `
+		updateOptions: function (event, item) {
+			this.properties = item;
+			this.data = item.data;
+			this.view = item.view;
+			if (item.title) {
+				//? emits the selected topic to the parent component
+				this.modal_topic = item.topic;
+				this.$emit("update:topic", this.modal_topic);
+
+				//? emits the new item for the breadcrumb in the parent component
+				this.breadcrumbItems.push(item.title);
+			} else {
+				if (item.data.kontakttyp) {
+					this.breadcrumbItems.push(item.data.kontakttyp);
+					this.breadcrumbItems.push(item.data.kontakt);
+				} else if (item.data.strasse) {
+					this.breadcrumbItems.push(item.data.strasse);
+				}
+			}
+			this.$emit("update:breadcrumb", this.breadcrumbItems);
+		},
+	},
+	computed: {},
+	created() {
+		//? JSON parse and stringify are used to deep clone the objects
+		this.properties = {...this.list};
+		this.data = this.list.data
+			? JSON.parse(JSON.stringify(this.list.data))
+			: null;
+		this.view = this.list.view
+			? JSON.parse(JSON.stringify(this.list.view))
+			: null;
+	},
+	mounted() {
+	},
+
+	template: /*html*/ `
     <template v-if="!view">
-      <div  class="list-group">
-        <template v-for="item in data">
-          <div class="d-flex flex-row align-items-center">
-            <button style="position:relative" type="button" class=" list-group-item list-group-item-action" @click="updateOptions($event,item)" >
-              <!-- render title of options -->
-              <p v-if="item.title" class="my-1"   >{{item.title}}</p>
-              <!-- else render list view of items -->
-              <div v-else class="my-2 me-4" >
-                <component :is="item.listview" v-bind="item"></component>
-              </div>
-            </button>
-            <button v-if="item.listview" @click="deleteItem(item)" type="button" class="mx-3 btn btn-danger btn-circle"><i class="fa fa-trash"></i>
-          </div>
-        </template>
-      </div>
-      <div v-if="Array.isArray(data)" class="mt-4 d-flex justify-content-center">
-        <button @click="addItem" type="button" class="btn btn-primary btn-circle"><i class="fa fa-plus"></i>
-      </div>
+        <div  class="list-group">
+            <template v-for="item in data">
+                <div class="d-flex flex-row align-items-center">
+                    <button style="position:relative" type="button" class=" list-group-item list-group-item-action" @click="updateOptions($event,item)" >
+                        <!-- render title of options -->
+                        <p v-if="item.title" class="my-1"   >{{item.title}}</p>
+                        <!-- else render list view of items -->
+                        <div v-else class="my-2 me-4" >
+                            <component :is="item.listview" v-bind="item"></component>
+                        </div>
+                    </button>
+                    <button v-if="item.listview" @click="deleteItem(item)" type="button" class="mx-3 btn btn-danger btn-circle"><i class="fa fa-trash"></i>
+                </div>
+            </template>
+        </div>
+        <div v-if="Array.isArray(data)" class="mt-4 d-flex justify-content-center">
+          <button @click="addItem" type="button" class="btn btn-primary btn-circle"><i class="fa fa-plus"></i>
+        </div>
     </template>
-    
     <template v-else>
       <component @profilUpdate="profilUpdateEmit" :is="view" v-bind="properties" :data="data" ></component>
     </template>
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index 40ee7985f..0304330b9 100644
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -1,4 +1,4 @@
-import { CoreFilterCmpt } from "../../../components/filter/Filter.js";
+import {CoreFilterCmpt} from "../../../components/filter/Filter.js";
 import Mailverteiler from "./ProfilComponents/Mailverteiler.js";
 import AusweisStatus from "./ProfilComponents/FhAusweisStatus.js";
 import QuickLinks from "./ProfilComponents/QuickLinks.js";
@@ -11,439 +11,352 @@ import FetchProfilUpdates from "./ProfilComponents/FetchProfilUpdates.js";
 import EditProfil from "./ProfilModal/EditProfil.js";
 
 export default {
-  components: {
-    CoreFilterCmpt,
-    Mailverteiler,
-    AusweisStatus,
-    QuickLinks,
-    Adresse,
-    Kontakt,
-    ProfilEmails,
-    RoleInformation,
-    ProfilInformation,
-    FetchProfilUpdates,
-    EditProfil,
-  },
-  inject: ["sortProfilUpdates", "collapseFunction"],
-  data() {
-    return {
-      showModal: false,
-      collapseIconBetriebsmittel: true,
-      editDataFilter: null,
+	components: {
+		CoreFilterCmpt,
+		Mailverteiler,
+		AusweisStatus,
+		QuickLinks,
+		Adresse,
+		Kontakt,
+		ProfilEmails,
+		RoleInformation,
+		ProfilInformation,
+		FetchProfilUpdates,
+		EditProfil,
+	},
+	inject: ["sortProfilUpdates", "collapseFunction"],
+	data() {
+		return {
+			showModal: false,
+			collapseIconBetriebsmittel: true,
+			editDataFilter: null,
 
-      // tabulator options
-      zutrittsgruppen_table_options: {
-        height: 200,
-        layout: "fitColumns",
-        data: [{ bezeichnung: "" }],
-        columns: [{ title: "Zutritt", field: "bezeichnung" }],
-      },
-      betriebsmittel_table_options: {
-        height: 300,
-        layout: "fitColumns",
-        responsiveLayout: "collapse",
-        responsiveLayoutCollapseUseFormatters: false,
-        responsiveLayoutCollapseFormatter: Vue.$collapseFormatter,
-        data: [{ betriebsmittel: "", Nummer: "", Ausgegeben_am: "" }],
-        columns: [
-          {
-            title:
-              "<i id='collapseIconBetriebsmittel' role='button' class='fa-solid fa-angle-down  '></i>",
-            field: "collapse",
-            headerSort: false,
-            headerFilter: false,
-            formatter: "responsiveCollapse",
-            maxWidth: 40,
-            headerClick: this.collapseFunction,
-          },
-          {
-            title: "Betriebsmittel",
-            field: "betriebsmittel",
-            headerFilter: true,
-            minWidth: 200,
-          },
-          {
-            title: "Nummer",
-            field: "Nummer",
-            headerFilter: true,
-            resizable: true,
-            minWidth: 200,
-          },
-          {
-            title: "Ausgegeben_am",
-            field: "Ausgegeben_am",
-            headerFilter: true,
-            minWidth: 200,
-          },
-        ],
-      },
-    };
-  },
+			// tabulator options
+			zutrittsgruppen_table_options: {
+				height: 200,
+				layout: "fitColumns",
+				data: [{bezeichnung: ""}],
+				columns: [{title: "Zutritt", field: "bezeichnung"}],
+			},
+			betriebsmittel_table_options: {
+				height: 300,
+				layout: "fitColumns",
+				responsiveLayout: "collapse",
+				responsiveLayoutCollapseUseFormatters: false,
+				responsiveLayoutCollapseFormatter: Vue.$collapseFormatter,
+				data: [{betriebsmittel: "", Nummer: "", Ausgegeben_am: ""}],
+				columns: [
+					{
+						title:
+							"<i id='collapseIconBetriebsmittel' role='button' class='fa-solid fa-angle-down  '></i>",
+						field: "collapse",
+						headerSort: false,
+						headerFilter: false,
+						formatter: "responsiveCollapse",
+						maxWidth: 40,
+						headerClick: this.collapseFunction,
+					},
+					{
+						title: "Betriebsmittel",
+						field: "betriebsmittel",
+						headerFilter: true,
+						minWidth: 200,
+					},
+					{
+						title: "Nummer",
+						field: "Nummer",
+						headerFilter: true,
+						resizable: true,
+						minWidth: 200,
+					},
+					{
+						title: "Ausgegeben_am",
+						field: "Ausgegeben_am",
+						headerFilter: true,
+						minWidth: 200,
+					},
+				],
+			},
+		};
+	},
 
-  props: {
-    data: Object,
-    editData: Object,
-  },
-  methods: {
-    
-    betriebsmittelTableBuilt: function () {
-      this.$refs.betriebsmittelTable.tabulator.setData(this.data.mittel);
-    },
-    zutrittsgruppenTableBuilt: function () {
-      this.$refs.zutrittsgruppenTable.tabulator.setData(
-        this.data.zuttritsgruppen
-      );
-    },
-    fetchProfilUpdates: function () {
-      this.$fhcApi.factory.profilUpdate.selectProfilRequest().then((res) => {
-        if (!res.error && res) {
-          this.data.profilUpdates = res.data?.length
-            ? res.data.sort(this.sortProfilUpdates)
-            : null;
-        }
-      });
-    },
+	props: {
+		data: Object,
+		editData: Object,
+	},
+	methods: {
 
-    hideEditProfilModal: function () {
-      //? checks the editModal component property result, if the user made a successful request or not
-      if (this.$refs.editModal.result) {
-        this.$fhcApi.factory.profilUpdate.selectProfilRequest()
-          .then((request) => {
-            if (!request.error && res) {
-              this.data.profilUpdates = request.data;
-              this.data.profilUpdates.sort(this.sortProfilUpdates);
-            } else {
-              console.error("Error when fetching profile updates: " + res.data);
-            }
-          })
-          .catch((err) => {
-            console.error(err);
-          });
-      } else {
-        // when modal was closed without submitting request
-      }
-      this.showModal = false;
-      this.editDataFilter = null;
-    },
+		betriebsmittelTableBuilt: function () {
+			this.$refs.betriebsmittelTable.tabulator.setData(this.data.mittel);
+		},
+		zutrittsgruppenTableBuilt: function () {
+			this.$refs.zutrittsgruppenTable.tabulator.setData(
+				this.data.zuttritsgruppen
+			);
+		},
+		fetchProfilUpdates: function () {
+			this.$fhcApi.factory.profilUpdate.selectProfilRequest().then((res) => {
+				if (!res.error && res) {
+					this.data.profilUpdates = res.data?.length
+						? res.data.sort(this.sortProfilUpdates)
+						: null;
+				}
+			});
+		},
 
-    showEditProfilModal(view) {
-      if (view) {
-        this.editDataFilter = view;
-      }
-      this.showModal = true;
-      // after a state change, wait for the DOM updates to complete
-      Vue.nextTick(() => {
-        this.$refs.editModal.show();
-      });
-    },
-  },
+		hideEditProfilModal: function () {
+			//? checks the editModal component property result, if the user made a successful request or not
+			if (this.$refs.editModal.result) {
+				this.$fhcApi.factory.profilUpdate.selectProfilRequest()
+					.then((request) => {
+						if (!request.error && res) {
+							this.data.profilUpdates = request.data;
+							this.data.profilUpdates.sort(this.sortProfilUpdates);
+						} else {
+							console.error("Error when fetching profile updates: " + res.data);
+						}
+					})
+					.catch((err) => {
+						console.error(err);
+					});
+			} else {
+				// when modal was closed without submitting request
+			}
+			this.showModal = false;
+			this.editDataFilter = null;
+		},
 
-  computed: {
-    editable() {
-      return this.data?.editAllowed ?? false;
-    },
-    
-    filteredEditData() {
-      return this.editDataFilter
-        ? this.editData.data[this.editDataFilter]
-        : this.editData;
-    },
+		showEditProfilModal(view) {
+			if (view) {
+				this.editDataFilter = view;
+			}
+			this.showModal = true;
+			// after a state change, wait for the DOM updates to complete
+			Vue.nextTick(() => {
+				this.$refs.editModal.show();
+			});
+		},
+	},
 
-    profilInformation() {
-      if (!this.data) {
-        return {};
-      }
+	computed: {
+		editable() {
+			return this.data?.editAllowed ?? false;
+		},
 
-      return {
-        Vorname: this.data.vorname,
-        Nachname: this.data.nachname,
-        Username: this.data.username,
-        Anrede: this.data.anrede,
-        Titel: this.data.titel,
-        Postnomen: this.data.postnomen,
-        foto_sperre: this.data.foto_sperre,
-        foto: this.data.foto,
-      };
-    },
+		filteredEditData() {
+			return this.editDataFilter
+				? this.editData.data[this.editDataFilter]
+				: this.editData;
+		},
 
-    roleInformation() {
-      if (!this.data) {
-        return {};
-      }
+		profilInformation() {
+			if (!this.data) {
+				return {};
+			}
 
-      return {
-        Geburtsdatum: this.data.gebdatum,
-        Geburtsort: this.data.gebort,
-        Personenkennzeichen: this.data.personenkennzeichen,
-        Studiengang: this.data.studiengang,
-        Semester: this.data.semester,
-        Verband: this.data.verband,
-        Gruppe: this.data.gruppe.trim(),
-      };
-    },
-  },
+			return {
+				Vorname: this.data.vorname,
+				Nachname: this.data.nachname,
+				Username: this.data.username,
+				Anrede: this.data.anrede,
+				Titel: this.data.titel,
+				Postnomen: this.data.postnomen,
+				foto_sperre: this.data.foto_sperre,
+				foto: this.data.foto,
+			};
+		},
 
-  created() {
-    //? sorts the profil Updates: pending -> accepted -> rejected
-    this.data.profilUpdates?.sort(this.sortProfilUpdates);
-    
-  },
+		roleInformation() {
+			if (!this.data) {
+				return {};
+			}
 
-  
-
-  template: /*html*/ `
-
-  <div class="container-fluid text-break fhc-form"  >
-  <edit-profil v-if="showModal" ref="editModal" @hideBsModal="hideEditProfilModal" :value="JSON.parse(JSON.stringify(filteredEditData))" :title="$p.t('profil','profilBearbeiten')" ></edit-profil>
+			return {
+				Geburtsdatum: this.data.gebdatum,
+				Geburtsort: this.data.gebort,
+				Personenkennzeichen: this.data.personenkennzeichen,
+				Studiengang: this.data.studiengang,
+				Semester: this.data.semester,
+				Verband: this.data.verband,
+				Gruppe: this.data.gruppe.trim(),
+			};
+		},
+	},
+	created() {
+		//? sorts the profil Updates: pending -> accepted -> rejected
+		this.data.profilUpdates?.sort(this.sortProfilUpdates);
+	},
+	template: /*html*/ `
+<div class="container-fluid text-break fhc-form">
+    <edit-profil v-if="showModal" ref="editModal" @hideBsModal="hideEditProfilModal" 
+    :value="JSON.parse(JSON.stringify(filteredEditData))" :title="$p.t('profil','profilBearbeiten')"></edit-profil>
     <!-- ROW --> 
-          <div class="row">
-          <!-- HIDDEN QUICK LINKS -->
-              <div  class="d-md-none col-12 ">
-             
-              <div class="row py-2">
+    <div class="row">
+        <!-- HIDDEN QUICK LINKS -->
+        <div  class="d-md-none col-12 ">
+            <div class="row py-2">
                 <div class="col">
-                
-                <quick-links :title="$p.t('profil','quickLinks')" :mobile="true"></quick-links>
+                    <quick-links :title="$p.t('profil','quickLinks')" :mobile="true"></quick-links>
                 </div>
-              </div>
-
-              <!-- Bearbeiten Button -->
-              <div v-if="editable" class="row ">
-              <div class="col mb-3">
-              
-              <button @click="showEditProfilModal" type="button" class="text-start  w-100 btn btn-outline-secondary" >
-                <div class="row">
-                  <div class="col-2">
-                    <i class="fa fa-edit"></i>
-                  </div>
-                  <div class="col-10">{{$p.t('ui','bearbeiten')}}</div>
-                </div>
-              </button>
-              </div>
-              </div>
-
-              <div v-if="data.profilUpdates" class="row mb-3">
-                <div class="col">
-                  <!-- MOBILE PROFIL UPDATES -->  
-                  <fetch-profil-updates v-if="data.profilUpdates && data.profilUpdates.length" @fetchUpdates="fetchProfilUpdates"  :data="data.profilUpdates"></fetch-profil-updates>
-                </div>
-              </div>
-
-              </div>
-              <!-- END OF HIDDEN QUCK LINKS -->
-
-
+            </div>
             
-
-
-              <!-- MAIN PANNEL -->
-              <div class="col-sm-12 col-md-8 col-xxl-9 ">
-                <!-- ROW WITH PROFIL IMAGE AND INFORMATION -->
-               
-              
-
-                    <!-- INFORMATION CONTENT START -->
-                    <!-- ROW WITH THE PROFIL INFORMATION --> 
-                    <div class="row mb-4 ">
-
-                    <div  class="col-lg-12 col-xl-6 ">
-                    <div class="row mb-4">
-                    <div class="col">
-                    
-                    <!-- PROFIL INFORMATION -->
-                    <profil-information @showEditProfilModal="showEditProfilModal" :title="$p.t('profil','studentIn')" :data="profilInformation" :editable="editable"></profil-information>
-
-
-                    </div>
-                   </div>
-                    <div class="row mb-4">
-                    
-
-                    <div  class=" col-lg-12">
-       
-                   <!-- STUDENT INFO -->
-                   <role-information :title="$p.t('profil','studentInformation')" :data="roleInformation"></role-information>
-
-
-                    </div> 
-                     </div>
-
-
-                     <!-- START OF SECOND PROFIL  INFORMATION COLUMN -->
-                    
-                   
-                   </div>
-
-                    <div  class="col-xl-6 col-lg-12 ">
-                    <div class="row mb-4">
-                    <div class="col">
-                    <!-- EMAILS -->
-                    <profil-emails :title="this.$p.t('person','email')" :data="data.emails" ></profil-emails>
-                    </div>
-                    </div>
-
-                  
-
-                    <div class="row mb-4 ">
-                      <div class="col">
-                        
-                      <!-- PRIVATE KONTAKTE-->
-                      
-                      <div class="card">
-                          <div class="card-header">
-                          <div class="row">
-                              <div @click="showEditProfilModal('Private_Kontakte')" class="col-auto" type="button">
-                                <i class="fa fa-edit"></i>
-                              </div>
-                              <div class="col">
-                                <span>{{$p.t('profil','privateKontakte')}}</span>
-                              </div>
-                            </div>
-                            
-                          </div>
-                          <div class="card-body ">
-                            
-                            <div  class="gy-3  row ">
-                            <div v-for="element in data.kontakte" class="col-12">
-                            
-                            <Kontakt :data="element"></Kontakt>
-                            
-                            </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-
-                    <div class="row mb-4">
-                    <div class="col">
-                  
-                    <!-- PRIVATE ADRESSEN-->
-
-                    <div class="card">
-                        <div class="card-header">
-                        <div class="row">
-                              <div @click="showEditProfilModal('Private_Adressen')" class="col-auto" type="button">
-                                <i class="fa fa-edit"></i>
-                              </div>
-                              <div class="col">
-                                <span>{{$p.t('profil','privateAdressen')}}</span>
-                              </div>
-                            </div>
-                        </div>
-                          <div class="card-body">
-                          
-                            <div class="gy-3 row ">
-                              <div v-for="element in data.adressen" class="col-12">
-                              <Adresse :data="element"></Adresse>
-                               
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-
-
-                    </div>
-
-
-                </div  >
-
-                <!-- SECOND ROW UNDER THE PROFIL IMAGE AND INFORMATION WITH THE TABLES -->
-                <div class="row">
-
-                  <div class="col-12 mb-4" >
-                    <core-filter-cmpt @tableBuilt="betriebsmittelTableBuilt" :title="$p.t('profil','entlehnteBetriebsmittel')"  ref="betriebsmittelTable" :tabulator-options="betriebsmittel_table_options" tableOnly :sideMenu="false" />
-                  </div> 
-
-                  <div class="col-12 mb-4" >
-                    <core-filter-cmpt @tableBuilt="zutrittsgruppenTableBuilt" :title="$p.t('profil','zutrittsGruppen')" ref="zutrittsgruppenTable" :tabulator-options="zutrittsgruppen_table_options"  tableOnly :sideMenu="false" noColumnFilter />
-            
-                  </div>
-
-                </div>
-
-              <!-- END OF MAIN CONTENT COL -->
-              </div>
-
-              <!-- START OF SIDE PANEL -->
-              <div  class="col-md-4 col-xxl-3 col-sm-12 text-break" >
-
-              
-                <div  class="row d-none d-md-block mb-3">
-                  <div class="col">
-                 
-                  <!-- QUICK LINKS -->     
-                   <quick-links :title="$p.t('profil','quickLinks')"></quick-links>
-                      
-                  
-                  </div>
-                </div>
-
-                <!-- Bearbeiten Button -->
-  
-                <div class="row d-none d-md-block">
-                <div class="col mb-3">
-                <button @click="()=>showEditProfilModal()" type="button" class="text-start  w-100 btn btn-outline-secondary" >
-                  <div class="row">
-                    <div class="col-2">
-                      <i class="fa fa-edit"></i>
-                    </div>
-                    <div class="col-10">{{$p.t('ui','bearbeiten')}}</div>
-                  </div>
-                </button>
-                </div>
-                </div>
-
-                <div v-if="data.profilUpdates" class="row d-none d-md-block mb-3">
-                <div class="col mb-3">
-                    <!-- PROFIL UPDATES -->
-                    <fetch-profil-updates v-if="data.profilUpdates && data.profilUpdates.length" @fetchUpdates="fetchProfilUpdates"  :data="data.profilUpdates"></fetch-profil-updates>
-                </div>    
-                </div>
-
-                
-
-                <div class="row mb-3" >
-                
-                
-                <div class="col-12">
-             
-             
-                
-                <ausweis-status :data="data.zutrittsdatum"></ausweis-status>
-      
-         
-                </div>
-                
-                </div>
-
-
-                <!-- START OF THE SECOND ROW IN THE SIDE PANEL -->
-                <div  class="row">
-                
-                  <div class="col">
-                
-
-                  
-                  <!-- HIER SIND DIE MAILVERTEILER -->
-                   <mailverteiler :title="$p.t('profil','mailverteiler')" :data="data?.mailverteiler"></mailverteiler>
-
-                  </div>
-
-                <!-- END OF THE SECOND ROW IN THE SIDE PANEL -->
-                </div>
-
-                <!-- END OF SIDE PANEL -->
-              </div>
-
-          <!-- END OF CONTAINER ROW-->
-          
-      </div>
-      
-      <!-- END OF CONTAINER -->
-  </div>
-            
-    `,
+			<!-- Bearbeiten Button -->
+			<div v-if="editable" class="row ">
+				<div class="col mb-3">
+					<button @click="showEditProfilModal" type="button" class="text-start  w-100 btn btn-outline-secondary" >
+						<div class="row">
+							<div class="col-2">
+								<i class="fa fa-edit"></i>
+							</div>
+							<div class="col-10">{{$p.t('ui','bearbeiten')}}</div>
+						</div>
+					</button>
+				</div>
+			</div>
+				<div v-if="data.profilUpdates" class="row mb-3">
+					<div class="col">
+						<!-- MOBILE PROFIL UPDATES -->  
+						<fetch-profil-updates v-if="data.profilUpdates && data.profilUpdates.length" @fetchUpdates="fetchProfilUpdates"  :data="data.profilUpdates"></fetch-profil-updates>
+					</div>
+				</div>
+			</div>
+			<!-- END OF HIDDEN QUCK LINKS -->
+			
+			<!-- MAIN PANNEL -->
+			<div class="col-sm-12 col-md-8 col-xxl-9 ">
+				<!-- ROW WITH PROFIL IMAGE AND INFORMATION -->
+				<!-- INFORMATION CONTENT START -->
+				<!-- ROW WITH THE PROFIL INFORMATION --> 
+				<div class="row mb-4 ">
+					<div  class="col-lg-12 col-xl-6 ">
+						<div class="row mb-4">
+							<div class="col">
+								<!-- PROFIL INFORMATION -->
+								<profil-information @showEditProfilModal="showEditProfilModal" :title="$p.t('profil','studentIn')" :data="profilInformation" :editable="editable"></profil-information>
+							</div>
+						</div>
+						<div class="row mb-4">
+							<div  class=" col-lg-12">
+								<!-- STUDENT INFO -->
+								<role-information :title="$p.t('profil','studentInformation')" :data="roleInformation"></role-information>
+							</div> 
+						</div>
+					<!-- START OF SECOND PROFIL  INFORMATION COLUMN -->
+					</div>
+					<div  class="col-xl-6 col-lg-12 ">
+						<div class="row mb-4">
+							<div class="col">
+								<!-- EMAILS -->
+								<profil-emails :title="this.$p.t('person','email')" :data="data.emails" ></profil-emails>
+							</div>
+						</div>
+						<div class="row mb-4 ">
+							<div class="col">
+								<!-- PRIVATE KONTAKTE-->
+								<div class="card">
+									<div class="card-header">
+										<div class="row">
+											<div @click="showEditProfilModal('Private_Kontakte')" class="col-auto" type="button">
+												<i class="fa fa-edit"></i>
+											</div>
+										<div class="col">
+											<span>{{$p.t('profil','privateKontakte')}}</span>
+										</div>
+									</div>
+								</div>
+								<div class="card-body ">
+									<div class="gy-3 row">
+										<div v-for="element in data.kontakte" class="col-12">
+											<Kontakt :data="element"></Kontakt>
+										</div>
+									</div>
+								</div>
+							</div>
+						</div>
+					</div>
+			
+					<div class="row mb-4">
+						<div class="col">
+							<!-- PRIVATE ADRESSEN-->
+							<div class="card">
+								<div class="card-header">
+									<div class="row">
+										<div @click="showEditProfilModal('Private_Adressen')" class="col-auto" type="button">
+											<i class="fa fa-edit"></i>
+										</div>
+										<div class="col">
+											<span>{{$p.t('profil','privateAdressen')}}</span>
+										</div>
+									</div>
+								</div>
+								<div class="card-body">
+									<div class="gy-3 row ">
+										<div v-for="element in data.adressen" class="col-12">
+											<Adresse :data="element"></Adresse> 
+										</div>
+									</div>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div  >
+			<!-- SECOND ROW UNDER THE PROFIL IMAGE AND INFORMATION WITH THE TABLES -->
+			<div class="row">
+				<div class="col-12 mb-4" >
+					<core-filter-cmpt @tableBuilt="betriebsmittelTableBuilt" :title="$p.t('profil','entlehnteBetriebsmittel')"  ref="betriebsmittelTable" :tabulator-options="betriebsmittel_table_options" tableOnly :sideMenu="false" />
+				</div> 
+				<div class="col-12 mb-4" >
+					<core-filter-cmpt @tableBuilt="zutrittsgruppenTableBuilt" :title="$p.t('profil','zutrittsGruppen')" ref="zutrittsgruppenTable" :tabulator-options="zutrittsgruppen_table_options"  tableOnly :sideMenu="false" noColumnFilter />
+				</div>
+			</div>
+		<!-- END OF MAIN CONTENT COL -->
+		</div>
+		<!-- START OF SIDE PANEL -->
+		<div  class="col-md-4 col-xxl-3 col-sm-12 text-break" >
+			<div  class="row d-none d-md-block mb-3">
+				<div class="col">
+					<!-- QUICK LINKS -->     
+					<quick-links :title="$p.t('profil','quickLinks')"></quick-links>
+				</div>
+			</div>
+			<!-- Bearbeiten Button -->
+			<div class="row d-none d-md-block">
+				<div class="col mb-3">
+					<button @click="()=>showEditProfilModal()" type="button" class="text-start  w-100 btn btn-outline-secondary" >
+						<div class="row">
+							<div class="col-2">
+								<i class="fa fa-edit"></i>
+							</div>
+							<div class="col-10">{{$p.t('ui','bearbeiten')}}</div>
+						</div>
+					</button>
+				</div>
+			</div>
+			<div v-if="data.profilUpdates" class="row d-none d-md-block mb-3">
+				<div class="col mb-3">
+					<!-- PROFIL UPDATES -->
+					<fetch-profil-updates v-if="data.profilUpdates && data.profilUpdates.length" @fetchUpdates="fetchProfilUpdates"  :data="data.profilUpdates"></fetch-profil-updates>
+				</div>
+			</div>
+			<div class="row mb-3" >
+				<div class="col-12">
+					<ausweis-status :data="data.zutrittsdatum"></ausweis-status>
+				</div>
+			</div>
+			<!-- START OF THE SECOND ROW IN THE SIDE PANEL -->
+			<div  class="row">
+				<div class="col">
+					<!-- HIER SIND DIE MAILVERTEILER -->
+					<mailverteiler :title="$p.t('profil','mailverteiler')" :data="data?.mailverteiler"></mailverteiler>
+				</div>
+            <!-- END OF THE SECOND ROW IN THE SIDE PANEL -->
+            </div>
+        <!-- END OF SIDE PANEL -->
+        </div>
+    <!-- END OF CONTAINER ROW-->
+    </div> 
+<!-- END OF CONTAINER -->
+</div>
+`,
 };

From fa3d36e99e0e3283e216f6e1cf6e27425321b943 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Fri, 22 Nov 2024 08:46:42 +0100
Subject: [PATCH 1448/1461] Added check if Constant
 CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN is available at all

---
 include/tw/cis_menu_lv.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/tw/cis_menu_lv.inc.php b/include/tw/cis_menu_lv.inc.php
index 6906bcc0f..1d66fa1a6 100644
--- a/include/tw/cis_menu_lv.inc.php
+++ b/include/tw/cis_menu_lv.inc.php
@@ -241,7 +241,7 @@ function checkZeilenUmbruch()
 	}
 
 	// Digitale Anwesenheiten
-	if(CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN && $angemeldet
+	if(defined('CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN') && CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN && $angemeldet
 			&& ($rechte->isBerechtigt('extension/anw_ent_admin')
 				|| $rechte->isBerechtigt('extension/anwesenheit_lektor')
 				|| $rechte->isBerechtigt('extension/anwesenheit_student')
@@ -608,4 +608,4 @@ function isDirectoryEmpty($DOC_ROOT, $kurzbz, $semester, $short_short_name, $typ
 }
   ?>
 	</tr>
-</table>
\ No newline at end of file
+</table>

From 4bd4301873373f65c8ffbd525ec709c67d954caa Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Fri, 22 Nov 2024 10:15:31 +0100
Subject: [PATCH 1449/1461] more template cleanup profil

---
 public/js/apps/Cis/Profil.js                  | 705 +++++++++---------
 .../Cis/Profil/ProfilComponents/Adresse.js    |   7 +-
 .../Cis/Profil/ProfilComponents/Kontakt.js    |  31 +-
 .../Profil/ProfilComponents/Mailverteiler.js  |  23 +-
 .../ProfilComponents/ProfilInformation.js     |   2 +-
 .../ProfilComponents/RoleInformation.js       |  30 +-
 .../Cis/Profil/ProfilModal/EditProfil.js      |  12 +-
 7 files changed, 402 insertions(+), 408 deletions(-)

diff --git a/public/js/apps/Cis/Profil.js b/public/js/apps/Cis/Profil.js
index 592c27a37..8618892d9 100644
--- a/public/js/apps/Cis/Profil.js
+++ b/public/js/apps/Cis/Profil.js
@@ -4,405 +4,400 @@ import ViewStudentProfil from "../../components/Cis/Profil/StudentViewProfil.js"
 import ViewMitarbeiterProfil from "../../components/Cis/Profil/MitarbeiterViewProfil.js";
 import Loading from "../../components/Loader.js";
 import Phrasen from "../../plugin/Phrasen.js";
-import { setScrollbarWidth } from "../../helpers/CssVarCalcHelpers";
+import {setScrollbarWidth} from "../../helpers/CssVarCalcHelpers";
 
 
 Vue.$collapseFormatter = function (data) {
-  //data - an array of objects containing the column title and value for each cell
-  var container = document.createElement("div");
-  container.classList.add("tabulator-collapsed-row");
-  container.classList.add("text-break");
+	//data - an array of objects containing the column title and value for each cell
+	var container = document.createElement("div");
+	container.classList.add("tabulator-collapsed-row");
+	container.classList.add("text-break");
 
-  var list = document.createElement("div");
-  list.classList.add("row");
+	var list = document.createElement("div");
+	list.classList.add("row");
 
-  container.appendChild(list);
+	container.appendChild(list);
 
-  data.forEach(function (col) {
-    let item = document.createElement("div");
-    item.classList.add("col-6");
-    let item2 = document.createElement("div");
-    item2.classList.add("col-6");
+	data.forEach(function (col) {
+		let item = document.createElement("div");
+		item.classList.add("col-6");
+		let item2 = document.createElement("div");
+		item2.classList.add("col-6");
 
-    item.innerHTML = "<strong>" + col.title + "</strong>";
-    item2.innerHTML = col.value ? col.value : "-";
+		item.innerHTML = "<strong>" + col.title + "</strong>";
+		item2.innerHTML = col.value ? col.value : "-";
 
-    list.appendChild(item);
-    list.appendChild(item2);
-  });
+		list.appendChild(item);
+		list.appendChild(item2);
+	});
 
-  return Object.keys(data).length ? container : "";
+	return Object.keys(data).length ? container : "";
 };
 
 const profilApp = Vue.createApp({
-  name: 'ProfilApp',
-  components: {
-    StudentProfil,
-    MitarbeiterProfil,
-    ViewStudentProfil,
-    ViewMitarbeiterProfil,
-    Loading,
-  },
+	name: 'ProfilApp',
+	components: {
+		StudentProfil,
+		MitarbeiterProfil,
+		ViewStudentProfil,
+		ViewMitarbeiterProfil,
+		Loading,
+	},
 
-  data() {
-    return {
-      //? loading property is used for showing/hiding the loading modal
-      loading: false,
-      profilUpdateStates: null,
-      profilUpdateTopic: null,
-      view: null,
-      data: null,
-      // notfound is null by default, but contains an UID if no user exists with that UID
-      notFoundUID: null,
-    };
-  },
+	data() {
+		return {
+			//? loading property is used for showing/hiding the loading modal
+			loading: false,
+			profilUpdateStates: null,
+			profilUpdateTopic: null,
+			view: null,
+			data: null,
+			// notfound is null by default, but contains an UID if no user exists with that UID
+			notFoundUID: null,
+		};
+	},
 
-  //? use function syntax for provide so that we can access `this`
-  provide() {
-    return {
-      profilUpdateStates: Vue.computed(() =>
-        this.profilUpdateStates ? this.profilUpdateStates : false
-      ),
-      profilUpdateTopic: Vue.computed(() =>
-        this.profilUpdateTopic ? this.profilUpdateTopic : false
-      ),
-      setLoading: (newValue) => {
-        this.loading = newValue;
-      },
-      getZustellkontakteCount: this.zustellKontakteCount,
-      getZustelladressenCount: this.zustellAdressenCount,
-      collapseFunction: (e, column) => {
-        //* check if property doesn't exist already and add it to the reactive this properties
-        if (this[e.target.id] === undefined) {
-          this[e.target.id] = true;
-        }
-        this[e.target.id] = !this[e.target.id];
+	//? use function syntax for provide so that we can access `this`
+	provide() {
+		return {
+			profilUpdateStates: Vue.computed(() =>
+				this.profilUpdateStates ? this.profilUpdateStates : false
+			),
+			profilUpdateTopic: Vue.computed(() =>
+				this.profilUpdateTopic ? this.profilUpdateTopic : false
+			),
+			setLoading: (newValue) => {
+				this.loading = newValue;
+			},
+			getZustellkontakteCount: this.zustellKontakteCount,
+			getZustelladressenCount: this.zustellAdressenCount,
+			collapseFunction: (e, column) => {
+				//* check if property doesn't exist already and add it to the reactive this properties
+				if (this[e.target.id] === undefined) {
+					this[e.target.id] = true;
+				}
+				this[e.target.id] = !this[e.target.id];
 
-        //* gets all event icons of the different rows to use the onClick event later
-        let allClickableIcons = column._column.cells.map((row) => {
-          return row.element.children[0];
-        });
+				//* gets all event icons of the different rows to use the onClick event later
+				let allClickableIcons = column._column.cells.map((row) => {
+					return row.element.children[0];
+				});
 
-        //* changes the icon that shows or hides all the collapsed columns
-        //* if the replace function does not find the class to replace, it just simply returns false
-        if (this[e.target.id]) {
-          e.target.classList.replace("fa-angle-up", "fa-angle-down");
-        } else {
-          e.target.classList.replace("fa-angle-down", "fa-angle-up");
-        }
+				//* changes the icon that shows or hides all the collapsed columns
+				//* if the replace function does not find the class to replace, it just simply returns false
+				if (this[e.target.id]) {
+					e.target.classList.replace("fa-angle-up", "fa-angle-down");
+				} else {
+					e.target.classList.replace("fa-angle-down", "fa-angle-up");
+				}
 
-        //* changes the icon for every collapsed column to open or closed
-        if (this[e.target.id]) {
-          allClickableIcons
-            .filter((column) => {
-              return !column.classList.contains("open");
-            })
-            .forEach((col) => {
-              col.click();
-            });
-        } else {
-          allClickableIcons
-            .filter((column) => {
-              return column.classList.contains("open");
-            })
-            .forEach((col) => {
-              col.click();
-            });
-        }
-      },
-      sortProfilUpdates: (ele1, ele2) => {
-        let result = 0;
-        if (ele1.status === "pending") {
-          result = -1;
-        } else if (ele1.status === "accepted") {
-          result = ele2.status === "rejected" ? -1 : 1;
-        } else {
-          result = 1;
-        }
-        //? if they have the same status the insert date is used for ordering
-        if (ele1.status === ele2.status) {
-          result =
-            new Date(ele2.insertamum.split(".").reverse().join("-")) -
-            new Date(ele1.insertamum.split(".").reverse().join("-"));
-        }
-        return result;
-      },
-    };
-  },
+				//* changes the icon for every collapsed column to open or closed
+				if (this[e.target.id]) {
+					allClickableIcons
+						.filter((column) => {
+							return !column.classList.contains("open");
+						})
+						.forEach((col) => {
+							col.click();
+						});
+				} else {
+					allClickableIcons
+						.filter((column) => {
+							return column.classList.contains("open");
+						})
+						.forEach((col) => {
+							col.click();
+						});
+				}
+			},
+			sortProfilUpdates: (ele1, ele2) => {
+				let result = 0;
+				if (ele1.status === "pending") {
+					result = -1;
+				} else if (ele1.status === "accepted") {
+					result = ele2.status === "rejected" ? -1 : 1;
+				} else {
+					result = 1;
+				}
+				//? if they have the same status the insert date is used for ordering
+				if (ele1.status === ele2.status) {
+					result =
+						new Date(ele2.insertamum.split(".").reverse().join("-")) -
+						new Date(ele1.insertamum.split(".").reverse().join("-"));
+				}
+				return result;
+			},
+		};
+	},
 
-  methods: {
-    zustellAdressenCount() {
-      if (!this.data || !this.data.adressen) {
-        return null;
-      }
+	methods: {
+		zustellAdressenCount() {
+			if (!this.data || !this.data.adressen) {
+				return null;
+			}
 
-      let adressenArray = [];
-      if (this.data.profilUpdates?.length) {
-        adressenArray = adressenArray.concat(
-          this.data.profilUpdates
-            .filter((update) => {
-              return update.requested_change.zustelladresse;
-            })
-            .map((adresse) => {
-              return adresse.requested_change.adresse_id;
-            })
-        );
-      }
+			let adressenArray = [];
+			if (this.data.profilUpdates?.length) {
+				adressenArray = adressenArray.concat(
+					this.data.profilUpdates
+						.filter((update) => {
+							return update.requested_change.zustelladresse;
+						})
+						.map((adresse) => {
+							return adresse.requested_change.adresse_id;
+						})
+				);
+			}
 
-      if (
-        !this.data.profilUpdates?.length ||
-        !this.data.adressen
-          .filter((adresse) => adresse.zustelladresse)
-          .every((adresse) =>
-            this.data.profilUpdates.some(
-              (update) =>
-                update.requested_change.adresse_id == adresse.adresse_id
-            )
-          )
-      ) {
-        adressenArray = adressenArray.concat(
-          this.data.adressen
-            .filter((adresse) => {
-              return adresse.zustelladresse;
-            })
-            .map((adr) => {
-              return adr.adresse_id;
-            })
-        );
-      }
+			if (
+				!this.data.profilUpdates?.length ||
+				!this.data.adressen
+					.filter((adresse) => adresse.zustelladresse)
+					.every((adresse) =>
+						this.data.profilUpdates.some(
+							(update) =>
+								update.requested_change.adresse_id == adresse.adresse_id
+						)
+					)
+			) {
+				adressenArray = adressenArray.concat(
+					this.data.adressen
+						.filter((adresse) => {
+							return adresse.zustelladresse;
+						})
+						.map((adr) => {
+							return adr.adresse_id;
+						})
+				);
+			}
 
-      return [...new Set(adressenArray)];
+			return [...new Set(adressenArray)];
 
-      // OLD version
-      // return this.data.adressen.filter(adresse => {
-      // 	return adresse.zustelladresse;
-      // }).map(adr => {
+			// OLD version
+			// return this.data.adressen.filter(adresse => {
+			// 	return adresse.zustelladresse;
+			// }).map(adr => {
 
-      // 	return adr.adresse_id;
-      // });
-    },
+			// 	return adr.adresse_id;
+			// });
+		},
 
-    zustellKontakteCount() {
-      if (!this.data || !this.data.kontakte) {
-        return null;
-      }
+		zustellKontakteCount() {
+			if (!this.data || !this.data.kontakte) {
+				return null;
+			}
 
-      //TODO: not sure if how it is implemented is the best way
-      let kontakteArray = [];
+			//TODO: not sure if how it is implemented is the best way
+			let kontakteArray = [];
 
-      if (this.data.profilUpdates?.length) {
-        kontakteArray = kontakteArray.concat(
-          this.data.profilUpdates
-            .filter((update) => {
-              return update.requested_change.zustellung;
-            })
-            .map((kontant) => {
-              return kontant.requested_change.kontakt_id;
-            })
-        );
-      }
+			if (this.data.profilUpdates?.length) {
+				kontakteArray = kontakteArray.concat(
+					this.data.profilUpdates
+						.filter((update) => {
+							return update.requested_change.zustellung;
+						})
+						.map((kontant) => {
+							return kontant.requested_change.kontakt_id;
+						})
+				);
+			}
 
-      if (
-        !this.data.profilUpdates?.length ||
-        !this.data.kontakte
-          .filter((kontakt) => kontakt.zustellung)
-          .every((kontakt) =>
-            this.data.profilUpdates.some(
-              (update) =>
-                update.requested_change.kontakt_id == kontakt.kontakt_id
-            )
-          )
-      ) {
-        kontakteArray = kontakteArray.concat(
-          this.data.kontakte
-            .filter((kontakt) => {
-              return kontakt.zustellung;
-            })
-            .map((kon) => {
-              return kon.kontakt_id;
-            })
-        );
-      }
+			if (
+				!this.data.profilUpdates?.length ||
+				!this.data.kontakte
+					.filter((kontakt) => kontakt.zustellung)
+					.every((kontakt) =>
+						this.data.profilUpdates.some(
+							(update) =>
+								update.requested_change.kontakt_id == kontakt.kontakt_id
+						)
+					)
+			) {
+				kontakteArray = kontakteArray.concat(
+					this.data.kontakte
+						.filter((kontakt) => {
+							return kontakt.zustellung;
+						})
+						.map((kon) => {
+							return kon.kontakt_id;
+						})
+				);
+			}
 
-      return [...new Set(kontakteArray)];
+			return [...new Set(kontakteArray)];
 
-      // OLD version
-      // return this.data.kontakte.filter(kontakt => {
-      // 	return kontakt.zustellung;
-      // }).map(kon =>{
-      // 	return kon.kontakt_id;
-      // });
-    },
-  },
+			// OLD version
+			// return this.data.kontakte.filter(kontakt => {
+			// 	return kontakt.zustellung;
+			// }).map(kon =>{
+			// 	return kon.kontakt_id;
+			// });
+		},
+	},
 
-  computed: {
-    filteredEditData() {
-      if (!this.data) {
-        return;
-      }
+	computed: {
+		filteredEditData() {
+			if (!this.data) {
+				return;
+			}
 
-      return {
-        view: null,
-        data: {
-          Personen_Informationen: {
-            title: this.$p.t("profil", "personenInformationen"),
-            topic: "Personen_informationen",
-            view: null,
-            data: {
-              vorname: {
-                title: this.$p.t("person", "vorname"),
-                topic: this.profilUpdateTopic?.["Vorname"],
-                view: "TextInputDokument",
-                withFiles: true,
-                data: {
-                  titel: "vorname",
-                  value: this.data.vorname,
-                },
-              },
-              nachname: {
-                title: this.$p.t("person", "nachname"),
-                topic: this.profilUpdateTopic?.["Nachname"],
-                view: "TextInputDokument",
-                withFiles: true,
-                data: {
-                  titel: "nachname",
-                  value: this.data.nachname,
-                },
-              },
-              titel: {
-                title: this.$p.t("global", "titel"),
-                topic: this.profilUpdateTopic?.["Titel"],
-                view: "TextInputDokument",
-                withFiles: true,
-                data: {
-                  titel: "titel",
-                  value: this.data.titel,
-                },
-              },
-              postnomen: {
-                title: this.$p.t("profil", "postnomen"),
-                topic: this.profilUpdateTopic?.["Postnomen"],
-                view: "TextInputDokument",
-                withFiles: true,
-                data: {
-                  titel: "postnomen",
-                  value: this.data.postnomen,
-                },
-              },
-            },
-          },
-          Private_Kontakte: {
-            title: this.$p.t("profil", "privateKontakte"),
-            topic: this.profilUpdateTopic?.["Private Kontakte"],
-            data: this.data.kontakte
-              ?.filter((item) => {
-                // excludes all contacts that are already used in pending profil update requests
-                return !this.data.profilUpdates?.some(
-                  (update) =>
-                    update.status === this.profilUpdateStates["Pending"] &&
-                    update.requested_change?.kontakt_id === item.kontakt_id
-                );
-              })
-              .map((kontakt) => {
-                return {
-                  listview: "Kontakt",
-                  view: "EditKontakt",
-                  data: kontakt,
-                };
-              }),
-          },
-          Private_Adressen: {
-            title: this.$p.t("profil", "privateAdressen"),
-            topic: this.profilUpdateTopic?.["Private Adressen"],
-            data: this.data.adressen
-              ?.filter((item) => {
-                return !this.data.profilUpdates?.some((update) => {
-                  return (
-                    update.status === this.profilUpdateStates["Pending"] &&
-                    update.requested_change?.adresse_id == item.adresse_id
-                  );
-                });
-              })
-              .map((adresse) => {
-                return {
-                  listview: "Adresse",
-                  view: "EditAdresse",
-                  data: adresse,
-                };
-              }),
-          },
-          //  Password_Change : {
-          // 	title:"Passwort Ändern",
-          // 	view:"ChangePassword",
-          // 	data:{
-          // 	  test:"testvalue",
-          // 	  }
-          // 	},
-        },
-      };
-    },
-  },
+			return {
+				view: null,
+				data: {
+					Personen_Informationen: {
+						title: this.$p.t("profil", "personenInformationen"),
+						topic: "Personen_informationen",
+						view: null,
+						data: {
+							vorname: {
+								title: this.$p.t("person", "vorname"),
+								topic: this.profilUpdateTopic?.["Vorname"],
+								view: "TextInputDokument",
+								withFiles: true,
+								data: {
+									titel: "vorname",
+									value: this.data.vorname,
+								},
+							},
+							nachname: {
+								title: this.$p.t("person", "nachname"),
+								topic: this.profilUpdateTopic?.["Nachname"],
+								view: "TextInputDokument",
+								withFiles: true,
+								data: {
+									titel: "nachname",
+									value: this.data.nachname,
+								},
+							},
+							titel: {
+								title: this.$p.t("global", "titel"),
+								topic: this.profilUpdateTopic?.["Titel"],
+								view: "TextInputDokument",
+								withFiles: true,
+								data: {
+									titel: "titel",
+									value: this.data.titel,
+								},
+							},
+							postnomen: {
+								title: this.$p.t("profil", "postnomen"),
+								topic: this.profilUpdateTopic?.["Postnomen"],
+								view: "TextInputDokument",
+								withFiles: true,
+								data: {
+									titel: "postnomen",
+									value: this.data.postnomen,
+								},
+							},
+						},
+					},
+					Private_Kontakte: {
+						title: this.$p.t("profil", "privateKontakte"),
+						topic: this.profilUpdateTopic?.["Private Kontakte"],
+						data: this.data.kontakte
+							?.filter((item) => {
+								// excludes all contacts that are already used in pending profil update requests
+								return !this.data.profilUpdates?.some(
+									(update) =>
+										update.status === this.profilUpdateStates["Pending"] &&
+										update.requested_change?.kontakt_id === item.kontakt_id
+								);
+							})
+							.map((kontakt) => {
+								return {
+									listview: "Kontakt",
+									view: "EditKontakt",
+									data: kontakt,
+								};
+							}),
+					},
+					Private_Adressen: {
+						title: this.$p.t("profil", "privateAdressen"),
+						topic: this.profilUpdateTopic?.["Private Adressen"],
+						data: this.data.adressen
+							?.filter((item) => {
+								return !this.data.profilUpdates?.some((update) => {
+									return (
+										update.status === this.profilUpdateStates["Pending"] &&
+										update.requested_change?.adresse_id == item.adresse_id
+									);
+								});
+							})
+							.map((adresse) => {
+								return {
+									listview: "Adresse",
+									view: "EditAdresse",
+									data: adresse,
+								};
+							}),
+					},
+					//  Password_Change : {
+					// 	title:"Passwort Ändern",
+					// 	view:"ChangePassword",
+					// 	data:{
+					// 	  test:"testvalue",
+					// 	  }
+					// 	},
+				},
+			};
+		},
+	},
 
-  watch: {
-    loading: function (newValue, oldValue) {
-      if (newValue) {
-        this.$refs.loadingModalRef.show();
-      } else {
-        this.$refs.loadingModalRef.hide();
-      }
-    },
-  },
+	watch: {
+		loading: function (newValue, oldValue) {
+			if (newValue) {
+				this.$refs.loadingModalRef.show();
+			} else {
+				this.$refs.loadingModalRef.hide();
+			}
+		},
+	},
 
-  async created() {
-    // fetch profilUpdateStates to provide them to children components
+	async created() {
+		// fetch profilUpdateStates to provide them to children components
 
-    await this.$fhcApi.factory.profilUpdate.getStatus()
-      .then((response) => {
-        this.profilUpdateStates = response.data;
-      })
-      .catch((error) => {
-        console.error(error);
-      });
+		await this.$fhcApi.factory.profilUpdate.getStatus()
+			.then((response) => {
+				this.profilUpdateStates = response.data;
+			})
+			.catch((error) => {
+				console.error(error);
+			});
 
-    this.$fhcApi.factory.profilUpdate.getTopic()
-      .then((response) => {
-        this.profilUpdateTopic = response.data;
-      })
-      .catch((error) => {
-        console.error(error);
-      });
+		this.$fhcApi.factory.profilUpdate.getTopic()
+			.then((response) => {
+				this.profilUpdateTopic = response.data;
+			})
+			.catch((error) => {
+				console.error(error);
+			});
 
-    //? uid contains the last part of the uri
-    let uid = location.pathname.split("/").pop();
+		//? uid contains the last part of the uri
+		let uid = location.pathname.split("/").pop();
 
-    this.$fhcApi.factory.profil.getView(uid).then((res) => {
-      if (!res.data) {
-        this.notFoundUID = uid;
-      } else {
-        this.view = res.data?.view;
-        this.data = res.data?.data;
-      }
-    });
-  },
+		this.$fhcApi.factory.profil.getView(uid).then((res) => {
+			if (!res.data) {
+				this.notFoundUID = uid;
+			} else {
+				this.view = res.data?.view;
+				this.data = res.data?.data;
+			}
+		});
+	},
 
-  template: `
+	template: `
 	<div>
-	
 		<div v-if="notFoundUID">
-		
 			<h3>Es wurde keine Person mit der UID {{this.notFoundUID}} gefunden</h3>
-
 		</div>
 		<div v-else>
-		<loading ref="loadingModalRef" :timeout="0"></loading>
-		<component  :is="view" :data="data" :editData="filteredEditData" ></component>
+            <loading ref="loadingModalRef" :timeout="0"></loading>
+            <component  :is="view" :data="data" :editData="filteredEditData" ></component>
 		</div>
-		
-	
 	</div>`,
 });
-setScrollbarWidth()
+setScrollbarWidth();
 profilApp
-  .use(primevue.config.default, { zIndex: { overlay: 9999 } })
-  .use(Phrasen)
-  .mount("#content");
\ No newline at end of file
+	.use(primevue.config.default, {zIndex: {overlay: 9999}})
+	.use(Phrasen)
+	.mount("#content");
\ No newline at end of file
diff --git a/public/js/components/Cis/Profil/ProfilComponents/Adresse.js b/public/js/components/Cis/Profil/ProfilComponents/Adresse.js
index 5d7406bbd..996cdfb87 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/Adresse.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/Adresse.js
@@ -53,11 +53,8 @@ export default {
         <div v-if="withZustelladresse" class="order-5 offset-1 col-11">
             <div class="form-underline">
                 <div class="form-underline-titel">{{$p.t('person','zustelladresse')}}</div>
-                    <div class="ms-2 form-check ">
-                        <input class="form-check-input" type="checkbox"  @click.prevent :checked="data.zustelladresse"  >
-                       
-                    </div>
-        
+                <div class="ms-2 form-check ">
+                    <input class="form-check-input" type="checkbox"  @click.prevent :checked="data.zustelladresse"  >
                 </div>
             </div>
         </div>
diff --git a/public/js/components/Cis/Profil/ProfilComponents/Kontakt.js b/public/js/components/Cis/Profil/ProfilComponents/Kontakt.js
index ffb46e1a2..488d0b2b3 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/Kontakt.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/Kontakt.js
@@ -16,23 +16,24 @@ export default{
         <div class="col-1 text-center" >
             <i class="fa-solid " :class="{...(data.kontakt.includes('@')?{'fa-envelope':true}:{'fa-phone':true})}" style="color:rgb(0, 100, 156)"></i>
         </div>
-    <div :class="{...(data.anmerkung? {'col-11':true, 'col-md-6':true, 'col-xl-11':true, 'col-xxl-6':true} : {'col-10':true, 'col-xl-9':true, 'col-xxl-10':true})}">
-        <!-- rendering KONTAKT emails -->
-        <div  class="form-underline ">
-            <div class="form-underline-titel">{{data.kontakttyp}}</div>
-            <a v-if="data.kontakt.includes('@')" role="link" :aria-disabled="view?true:false" :href="!view?('mailto:'+data.kontakt):null" class="form-underline-content">{{data.kontakt}} </a>
-            <a v-else role="link" :aria-disabled="view?true:false" :href="!view?('tel:'+data.kontakt):null" class="form-underline-content">{{data.kontakt}} </a>
+        <div :class="{...(data.anmerkung? {'col-11':true, 'col-md-6':true, 'col-xl-11':true, 'col-xxl-6':true} : {'col-10':true, 'col-xl-9':true, 'col-xxl-10':true})}">
+            <!-- rendering KONTAKT emails -->
+            <div  class="form-underline ">
+                <div class="form-underline-titel">{{data.kontakttyp}}</div>
+                <a v-if="data.kontakt.includes('@')" role="link" :aria-disabled="view?true:false" :href="!view?('mailto:'+data.kontakt):null" class="form-underline-content">{{data.kontakt}} </a>
+                <a v-else role="link" :aria-disabled="view?true:false" :href="!view?('tel:'+data.kontakt):null" class="form-underline-content">{{data.kontakt}} </a>
+            </div>
         </div>
-    </div>
-    <div v-if="data?.anmerkung" class="offset-1 offset-md-0 offset-xl-1 offset-xxl-0 order-2 order-sm-1 col-10  col-md-4   col-xl-9 col-xxl-4   ">
-        <div  class="form-underline ">
-            <div class="form-underline-titel">{{$p.t('global','anmerkung')}}</div>
-            <span  class="form-underline-content">{{data.anmerkung}} </span>
+        <div v-if="data?.anmerkung" class="offset-1 offset-md-0 offset-xl-1 offset-xxl-0 order-2 order-sm-1 col-10  col-md-4   col-xl-9 col-xxl-4   ">
+            <div  class="form-underline ">
+                <div class="form-underline-titel">{{$p.t('global','anmerkung')}}</div>
+                <span  class="form-underline-content">{{data.anmerkung}} </span>
+            </div>
+        </div>
+        <div class="text-center col-1 col-sm-1 order-2  order-lg-1 col-xl-2 col-xxl-1 allign-middle">
+            <i v-if="data.zustellung" class="fa-solid fa-check"></i>
+            <i v-else="data.zustellung" class="fa-solid fa-xmark"></i>
         </div>
-    </div>
-    <div class="text-center col-1 col-sm-1 order-2  order-lg-1 col-xl-2 col-xxl-1 allign-middle">
-        <i v-if="data.zustellung" class="fa-solid fa-check"></i>
-        <i v-else="data.zustellung" class="fa-solid fa-xmark"></i>
     </div>
 `,
 };
\ No newline at end of file
diff --git a/public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js b/public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js
index 5f2221b22..82b0aad57 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js
@@ -16,18 +16,19 @@ export default {
         </div>
         <div class="card-body">
             <h6 class="card-title">{{$p.t('profil','mailverteilerMitglied')}}</h6>
-        <div  class="card-text row text-break mb-2" v-for="verteiler in data">
-            <div class="col-12 ">
-                <div class="row">  
-                    <div class="col-1 ">
-                        <i class="fa-solid fa-envelope" style="color: #00649C;"></i>
+            <div class="card-text row text-break mb-2" v-for="verteiler in data">
+                <div class="col-12 ">
+                    <div class="row">  
+                        <div class="col-1 ">
+                            <i class="fa-solid fa-envelope" style="color: #00649C;"></i>
+                        </div>
+                        <div class="col">
+                            <a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a>
+                        </div>
                     </div>
-                    <div class="col">
-                        <a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a>
-                    </div>
-                </div>
-            </div> 
-            <div class="col-11 offset-1 ">{{verteiler.beschreibung}}</div>
+                </div> 
+                <div class="col-11 offset-1 ">{{verteiler.beschreibung}}</div>
+            </div>
         </div>
     </div>`,
 };
diff --git a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
index 24458ed93..e42229576 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
@@ -75,7 +75,7 @@ export default {
             <div class="col-12 col-sm-6 mb-2">
                 <div class="row justify-content-center">
                     <div class="col-auto " style="position:relative">
-                        <img class=" img-thumbnail " style=" max-height:150px; "  :src="get_image_base64_src">
+                        <img class=" img-thumbnail " style=" max-height:150px; "  :src="get_image_base64_src"/>
                         <!-- LOCKING IMAGE FUNCTIONALITY -->
                         <div v-if="editable" role="button" @click.prevent="sperre_foto_function" class="image-lock">
                             <i :class="{'fa':true, ...(FotoSperre?{'fa-lock':true}:{'fa-lock-open':true})} "></i>
diff --git a/public/js/components/Cis/Profil/ProfilComponents/RoleInformation.js b/public/js/components/Cis/Profil/ProfilComponents/RoleInformation.js
index 57986c1a7..9fb0b4976 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/RoleInformation.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/RoleInformation.js
@@ -19,19 +19,19 @@ export default {
         <div class="card-header">{{title}}</div>
         <div class="card-body">
             <div class="gy-3 row">
-            <div v-for="(wert,bez) in data" class="col-md-6 col-sm-12 ">
-                
-                <div class="form-underline">
-                    <div class="form-underline-titel">{{bez }}</div>
-        
-                    <!-- print Telefon link -->
-                    <a  v-if="bez=='Telefon'" :href="data.Telefon?'tel:'+data.Telefon:null" :class="{'form-underline-content':true,'text-decoration-none':!data.Telefon,'text-body':!data.Telefon}">{{wert?wert:'-'}}</a>
-                    
-                    <!-- else print information -->
-                    <span v-else class="form-underline-content">{{wert?wert:'-'}}</span>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>`
+				<div v-for="(wert,bez) in data" class="col-md-6 col-sm-12 ">
+					
+					<div class="form-underline">
+						<div class="form-underline-titel">{{bez }}</div>
+			
+						<!-- print Telefon link -->
+						<a  v-if="bez=='Telefon'" :href="data.Telefon?'tel:'+data.Telefon:null" :class="{'form-underline-content':true,'text-decoration-none':!data.Telefon,'text-body':!data.Telefon}">{{wert?wert:'-'}}</a>
+						
+						<!-- else print information -->
+						<span v-else class="form-underline-content">{{wert?wert:'-'}}</span>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>`
 };
\ No newline at end of file
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfil.js b/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
index 9e5228a0d..ba5702bc9 100644
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
@@ -181,13 +181,13 @@ export default {
 		return BsModal.popup(null, options);
 	},
 	template: /*html*/ `
-<bs-modal v-show="!loading" ref="modalContainer" v-bind="$props" body-class="" dialog-class="modal-lg" class="bootstrap-alert" backdrop="false" >
-	<template v-if="title" v-slot:title>{{title }}</template>
+<bs-modal v-show="!loading" ref="modalContainer" v-bind="$props" body-class="" dialog-class="modal-lg" class="bootstrap-alert" backdrop="false">
+	<template v-if="title" v-slot:title>{{title}}</template>
 	<template v-slot:default>
-		<div >
-			<nav aria-label="breadcrumb" class="ps-2  ">
-				<ol class="breadcrumb ">
-					<li class="breadcrumb-item"  v-for="element in breadcrumb">{{element}}</li>
+		<div>
+			<nav aria-label="breadcrumb" class="ps-2">
+				<ol class="breadcrumb">
+					<li class="breadcrumb-item" v-for="element in breadcrumb">{{element}}</li>
 				</ol>
 			</nav>
 			<edit-profil-select @submit="submitProfilChange" v-model:breadcrumb="breadcrumb" v-model:topic="topic" v-model:profilUpdate="profilUpdate" ariaLabel="select" :list="editData"></edit-profil-select>

From 20abd6aa050ca1c5b67b297996db48e3e2490940 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 22 Nov 2024 10:25:02 +0100
Subject: [PATCH 1450/1461] fix(LvMenu): makes non available menu punkte
 disabled and non interactable

---
 public/css/Cis4/Cis.css                       | 13 +++++++++++++
 public/js/components/Cis/Mylv/LvMenu.js       | 19 +++++++++++++++++--
 .../Cis/Mylv/Semester/Studiengang/Lv.js       | 11 ++++++++++-
 3 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index 2f495cc41..2762e2235 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -464,6 +464,19 @@ html {
   margin-inline-start: 0.5rem;
 }
 
+[disabled="true"].fhc-entry {
+	pointer-events: none;
+	cursor: default;
+	background-color: #dadada !important;
+	color: black !important;
+	-webkit-touch-callout: none; /* iOS Safari */
+	-webkit-user-select: none;/* Safari */
+	-khtml-user-select: none;/* Konqueror HTML */
+	-moz-user-select: none;/* Old versions of Firefox */
+	-ms-user-select: none;/* Internet Explorer/Edge */
+	user-select: none;
+}
+
 .fhc-entry:hover{
 	background-color:#0088d6 !important;
 	color:white !important;
diff --git a/public/js/components/Cis/Mylv/LvMenu.js b/public/js/components/Cis/Mylv/LvMenu.js
index 7d4b7ef48..1a6e2ac32 100644
--- a/public/js/components/Cis/Mylv/LvMenu.js
+++ b/public/js/components/Cis/Mylv/LvMenu.js
@@ -33,6 +33,17 @@ export default {
 
 			
 		},
+		c4_link(menuItem) {
+			if (!menuItem) return null;
+			if (Array.isArray(menuItem.c4_moodle_links) && menuItem.c4_moodle_links.length) 
+			{
+				return '#';
+			}
+			else
+			{
+				return menuItem.c4_link ?? null;
+			}
+		},
 	},
 	template:/*html*/`
 	<div v-if="!menu">No Menu available</div>
@@ -40,12 +51,16 @@ export default {
 		<div class="container" :class="containerStyles">
 			<div class="row g-2 justify-content-center" :class="rowStyles">
 				<div style="min-height:150px; min-width:150px;" class="col-12 col-lg-6 col-xl-4" v-for="(menuItem, index) in menu" :key="index">
-					<a :title="menuItem.name" :target="menuItem.c4_target ?? null" role="button" :href="menuItem.c4_link"
-					 class="fhc-entry p-2 w-100 text-wrap border border-1 rounded-3 d-flex flex-column align-items-center justify-content-center text-center text-decoration-none link-dark h-100">
+					<a :id="menuItem.name" :class="{'dropdown-toggle':menuItem.c4_moodle_links?.length }" :target="menuItem.c4_target ?? null" role="button" :href="c4_link(menuItem)"
+					:disabled="!c4_link(menuItem)?true:null"
+					class="fhc-entry p-2 w-100 text-wrap border border-1 rounded-3 d-flex flex-column align-items-center justify-content-center text-center text-decoration-none link-dark h-100">
 						<img :src="menuItem.c4_icon" :alt="menuItem.name" />
 						<p @click="selectMenu(menuItem)" class="w-100 mt-2">{{menuItem.name}}</p>
 						<p v-for="([text,link],index) in menuItem.c4_linkList" @click.stop="selectMenu(menuItem,index)" class="mt-1 w-100" :index="index">{{text}}</p>
 					</a>
+					<ul v-if="menuItem.c4_moodle_links?.length" class="dropdown-menu p-0" :aria-labelledby="menuItem.name">
+						<li v-for="item in menuItem.c4_moodle_links"><a class="dropdown-item border-bottom" :href="item.url">{{item.lehrform}}</a></li>
+					</ul>
 				</div>
 			</div>
 		</div>
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
index 565c2a6a7..dcc18bbb0 100644
--- a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
@@ -50,6 +50,15 @@ export default {
 		}
 	},
 	methods: {
+		c4_link(menuItem) {
+			if (!menuItem) return null;
+			if (Array.isArray(menuItem.c4_moodle_links) && menuItem.c4_moodle_links.length) {
+				return '#';
+			}
+			else {
+				return menuItem.c4_link ?? null;
+			}
+		},
 		openLvOption(menuItem){
 			if (menuItem.id == "core_menu_mailanstudierende"){
 				window.location.href = menuItem.c4_link;
@@ -128,7 +137,7 @@ export default {
 							<div class="mx-4">
 								<i :class="[menuItem.c4_icon2 ? menuItem.c4_icon2 : 'fa-solid fa-pen-to-square', !menuItem.c4_link ? 'unavailable' : null ]"></i>
 							</div>
-							<a class="text-decoration-none text-truncate" :id="'moodle_links_'+lehrveranstaltung_id"  :class="{'link-dark':menuItem.c4_link, 'unavailable':!menuItem.c4_link, 'dropdown-toggle':menuItem.c4_moodle_links?.length }" :target="menuItem.c4_target" :href="menuItem.c4_link ? !menuItem.c4_moodle_links?.length && menuItem.c4_link : null">
+							<a class="text-decoration-none text-truncate" :id="'moodle_links_'+lehrveranstaltung_id"  :class="{'link-dark':menuItem.c4_link, 'unavailable':!menuItem.c4_link, 'dropdown-toggle':menuItem.c4_moodle_links?.length }" :target="menuItem.c4_target" :href="c4_link(menuItem) ? c4_link(menuItem) : null">
 							{{menuItem.name}}
 							</a>
 							</div>

From f4d16af68e69eb7ef1f12b072ea63bb028b21b97 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Fri, 22 Nov 2024 10:26:47 +0100
Subject: [PATCH 1451/1461] change eye watering cms css from green background &
 white font to white background and black font - as it should be

---
 public/css/Cis4/Cms.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/css/Cis4/Cms.css b/public/css/Cis4/Cms.css
index 6091ee720..13b90aac5 100644
--- a/public/css/Cis4/Cms.css
+++ b/public/css/Cis4/Cms.css
@@ -619,8 +619,8 @@
 	font-weight:normal;
 }
 #cms h1 td {
-	color: #ffffff;
-	background-color: #009e84;
+	color: #0a0a0a;
+	background-color: #FFFFFF;
 }
 #cms h2 {
 	margin: 0px;

From ecab3ea4d97024fd6c895fc20214d3c0373e1c0c Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Fri, 22 Nov 2024 11:43:05 +0100
Subject: [PATCH 1452/1461] remove hardcoded h1 tag, keep the title h1 tag;
 more cleanup;

---
 .../js/components/Dashboard/Admin/Widgets.js  |   3 +-
 .../js/components/DashboardWidget/Default.js  |   4 +-
 public/js/components/DashboardWidget/News.js  | 157 ++++++-------
 public/js/components/DashboardWidget/Url.js   | 210 +++++++++---------
 system/dbupdate_3.4/25999_cis4_cms.php        |   1 -
 5 files changed, 187 insertions(+), 188 deletions(-)

diff --git a/public/js/components/Dashboard/Admin/Widgets.js b/public/js/components/Dashboard/Admin/Widgets.js
index 34b7b482c..645d3f8cc 100644
--- a/public/js/components/Dashboard/Admin/Widgets.js
+++ b/public/js/components/Dashboard/Admin/Widgets.js
@@ -36,7 +36,8 @@ export default {
 			}
 		).catch(err => console.error('ERROR:', err));
 	},
-	template: `<div class="dashboard-admin-widgets">
+	template: `
+	<div class="dashboard-admin-widgets">
 		<div v-for="widget in widgets" :key="widget.widget_id" class="form-check form-switch">
 			<input class="form-check-input" type="checkbox" role="switch" :id="'dashboard-admin-widgets-' + widget.widget_id" v-model="widget.allowed" @input.prevent="sendChange(widget.widget_id)">
 			<label class="form-check-label" :for="'dashboard-admin-widgets-' + widget.widget_id">{{(widget.setup && widget.setup.name) || widget.widget_kurzbz}}</label>
diff --git a/public/js/components/DashboardWidget/Default.js b/public/js/components/DashboardWidget/Default.js
index 859528ca5..5351d66ef 100644
--- a/public/js/components/DashboardWidget/Default.js
+++ b/public/js/components/DashboardWidget/Default.js
@@ -1,5 +1,4 @@
 import AbstractWidget from './Abstract';
-
 export default {
 	mixins: [
 		AbstractWidget
@@ -12,7 +11,8 @@ export default {
 	created() {
 		this.$emit('setConfig', false)
 	},
-	template: `<div :class="css">
+	template: `
+	<div :class="css">
 	    <h5 class="card-title">{{ config.title }}</h5>
 	    <p class="card-text">{{ config.msg }}</p>
 	</div>`
diff --git a/public/js/components/DashboardWidget/News.js b/public/js/components/DashboardWidget/News.js
index f7acb504b..2946e24b1 100644
--- a/public/js/components/DashboardWidget/News.js
+++ b/public/js/components/DashboardWidget/News.js
@@ -1,89 +1,90 @@
 import AbstractWidget from './Abstract';
 import BsModal from '../Bootstrap/Modal';
+
 const MAX_LOADED_NEWS = 10;
 
 export default {
-  name: "WidgetsNews",
-  components: { BsModal },
-  data: () => ({
-    allNewsList: [],
-    singleNews: {},
-  }),
-  mixins: [AbstractWidget],
-  computed: {
-    getNewsWidgetStyle() {
-      return this.width == 1 ? "padding: 1rem 1rem;" : "padding: 0px;"
-    },
-    newsList() {
-      //Return news amount depending on widget width and size
-      let quantity = this.width;
+	name: "WidgetsNews",
+	components: {BsModal},
+	data: () => ({
+		allNewsList: [],
+		singleNews: {},
+	}),
+	mixins: [AbstractWidget],
+	computed: {
+		getNewsWidgetStyle() {
+			return this.width == 1 ? "padding: 1rem 1rem;" : "padding: 0px;"
+		},
+		newsList() {
+			//Return news amount depending on widget width and size
+			let quantity = this.width;
 
-      if (this.width === 1) {
-        quantity = this.height === 1 ? 4 : 10;
-      }
+			if (this.width === 1) {
+				quantity = this.height === 1 ? 4 : 10;
+			}
 
-      return this.allNewsList.slice(0, quantity);
-    },
-    placeHolderImgURL: function () {
-      return (
-        FHC_JS_DATA_STORAGE_OBJECT.app_root +
-        "skin/images/fh_technikum_wien_illustration_klein.png"
-      );
-    },
-  },
-  created() {
-    this.$fhcApi.factory.cms
-      .news(MAX_LOADED_NEWS)
-      .then((res) => {
-        this.allNewsList = res.data;
-      })
-      .catch((err) => {
-        console.error("ERROR: ", err.response.data);
-      });
+			return this.allNewsList.slice(0, quantity);
+		},
+		placeHolderImgURL: function () {
+			return (
+				FHC_JS_DATA_STORAGE_OBJECT.app_root +
+				"skin/images/fh_technikum_wien_illustration_klein.png"
+			);
+		},
+	},
+	created() {
+		this.$fhcApi.factory.cms
+			.news(MAX_LOADED_NEWS)
+			.then((res) => {
+				this.allNewsList = res.data;
+			})
+			.catch((err) => {
+				console.error("ERROR: ", err.response.data);
+			});
 
-    this.$emit("setConfig", false);
-  },
-  methods: {
-    contentURI: function (content_id) {
-      return (
-        FHC_JS_DATA_STORAGE_OBJECT.app_root +
-        FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-        "/CisVue/Cms/content/" +
-        content_id
-      );
-    },
-    allNewsURI: function () {
-      return (
-        FHC_JS_DATA_STORAGE_OBJECT.app_root +
-        FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-        "/CisVue/Cms/news"
-      );
-    },
-    setSingleNews(singleNews) {
-      this.singleNews = singleNews;
-      this.$refs.newsModal.show();
-    },
-  },
-  template: /*html*/ `<div class="widgets-news h-100" :style="getNewsWidgetStyle">
-  
-      <div class="d-flex flex-column h-100 ">
-      <div class="h-100" style="overflow-y: auto" v-if="width == 1">
-        <div  v-for="(news, index) in newsList" :key="news.id" class="mt-2">
-          <div v-if="index > 0 " class="fhc-seperator"></div>
-          <a :href="contentURI(news.content_id)" >{{ news.content_obj.betreff?news.content_obj.betreff:getDate(news.insertamum) }}</a><br>
-          <span class="small text-muted">{{ formatDateTime(news.insertamum) }}</span>
+		this.$emit("setConfig", false);
+	},
+	methods: {
+		contentURI: function (content_id) {
+			return (
+				FHC_JS_DATA_STORAGE_OBJECT.app_root +
+				FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+				"/CisVue/Cms/content/" +
+				content_id
+			);
+		},
+		allNewsURI: function () {
+			return (
+				FHC_JS_DATA_STORAGE_OBJECT.app_root +
+				FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+				"/CisVue/Cms/news"
+			);
+		},
+		setSingleNews(singleNews) {
+			this.singleNews = singleNews;
+			this.$refs.newsModal.show();
+		},
+	},
+	template: /*html*/ `
+<div class="widgets-news h-100" :style="getNewsWidgetStyle">
+    <div class="d-flex flex-column h-100 ">
+        <div class="h-100" style="overflow-y: auto" v-if="width == 1">
+            <div  v-for="(news, index) in newsList" :key="news.id" class="mt-2">
+                <div v-if="index > 0 " class="fhc-seperator"></div>
+                    <a :href="contentURI(news.content_id)" >{{ news.content_obj.betreff?news.content_obj.betreff:getDate(news.insertamum) }}</a><br>
+                    <span class="small text-muted">{{ formatDateTime(news.insertamum) }}</span>
+                </div>
+            </div>
+            <div v-else-if="width > 1 && height === 1" class="h-100" :class="'row row-cols-' + width">
+                <div class="h-100" v-for="news in newsList" :key="news.id">
+                    <div class="news-content h-100" :style="'--news-widget-height: '+height" ref="htmlContent" v-html="news.content_obj.content"></div>
+                </div>
+            </div>
+            <div v-else class="h-100" :class="'row row-cols-' + width + ' gx-2'">
+                <div class="h-100" v-for="news in newsList" :key="news.id">
+                <div class="news-content h-100" :style="'--news-widget-height: '+height" ref="htmlContent" v-html="news.content_obj.content"></div>
+            </div>
         </div>
-      </div>
-      <div v-else-if="width > 1 && height === 1" class="h-100" :class="'row row-cols-' + width">
-        <div class="h-100" v-for="news in newsList" :key="news.id">
-          <div class="news-content h-100" :style="'--news-widget-height: '+height" ref="htmlContent" v-html="news.content_obj.content"></div>
-        </div>
- 	  </div>
-      <div v-else class="h-100" :class="'row row-cols-' + width + ' gx-2'">
-        <div class="h-100" v-for="news in newsList" :key="news.id">
-          <div class="news-content h-100" :style="'--news-widget-height: '+height" ref="htmlContent" v-html="news.content_obj.content"></div>
-        </div>
-      </div>
-</div>
+    </div>
 </div>`,
 };
diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index 2ab3c9fe4..aee73752f 100644
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -1,7 +1,7 @@
 import AbstractWidget from './Abstract';
 
 export default {
-	name: "WidgetsUrl", 
+	name: "WidgetsUrl",
 	mixins: [AbstractWidget],
 	inject: {
 		editModeIsActive: {
@@ -9,119 +9,117 @@ export default {
 			default: false
 		}
 	},
-  data: () => ({
-    title_input: "",
-    url_input: "",
-	validation:{
-		invalidURL: false,
-		invalidTitel:false,
-	}
-  }),
-  
-  computed: {
-    tagName() {
-      return this.config.tag !== undefined && this.config.tag.length > 0
-        ? this.config.tag
-        : this.$p.t("bookmark", "myBookmarks");
-    },
-    emptyBookmarks() {
-      if (this.shared instanceof Array && this.shared.length == 0) return true;
+	data: () => ({
+		title_input: "",
+		url_input: "",
+		validation: {
+			invalidURL: false,
+			invalidTitel: false,
+		}
+	}),
 
-      if (!this.shared) return true;
+	computed: {
+		tagName() {
+			return this.config.tag !== undefined && this.config.tag.length > 0
+				? this.config.tag
+				: this.$p.t("bookmark", "myBookmarks");
+		},
+		emptyBookmarks() {
+			if (this.shared instanceof Array && this.shared.length == 0) return true;
 
-      return false;
-    },
-  },
-  methods: {
-	isValidationSuccessfull(){
-	  // validate the input fields
-	  if (this.title_input.length === 0) {
-	    this.$fhcAlert.alertError(this.$p.t("bookmark", "invalidTitel"));
-		this.validation.invalidTitel = true;
-	  }
-	  if (!URL.canParse(this.url_input)) {
-		this.$fhcAlert.alertError(this.$p.t("bookmark", "invalidUrl"));
-		this.validation.invalidURL = true;
-	  }
+			if (!this.shared) return true;
 
-	  return !Object.values(this.validation).some(value => value === true);
+			return false;
+		},
 	},
-    async fetchBookmarks() {
-      await this.$fhcApi.factory.bookmark
-        .getBookmarks()
-        .then((res) => res.data)
-        .then((result) => {
-		  this.shared = result;
-		})
-        .catch(this.$fhcAlert.handleSystemError);
-    },
-    addLink() {
-	  // reset is-invalid css on url input field
-	  for(let key of Object.keys(this.validation)){
-		this.validation[key] = false;
-	  }
-	  
-	  // early return if validation failed
-	  if (!this.isValidationSuccessfull()) return;
-	  
-      this.$fhcApi.factory.bookmark
-        .insert({
-          tag: this.config.tag,
-          title: this.title_input,
-          url: this.url_input,
-        })
-        .then((res) => res.data)
-        .then((result) => {
-          this.$fhcAlert.alertInfo(this.$p.t("bookmark", "bookmarkAdded"));
-		  // refetch the bookmarks to see the updates
-		  this.fetchBookmarks();
-        })
-        .catch(this.$fhcAlert.handleSystemError);
+	methods: {
+		isValidationSuccessfull() {
+			// validate the input fields
+			if (this.title_input.length === 0) {
+				this.$fhcAlert.alertError(this.$p.t("bookmark", "invalidTitel"));
+				this.validation.invalidTitel = true;
+			}
+			if (!URL.canParse(this.url_input)) {
+				this.$fhcAlert.alertError(this.$p.t("bookmark", "invalidUrl"));
+				this.validation.invalidURL = true;
+			}
 
-      // reset the values for the title and url inputs
-      this.title_input = "";
-      this.url_input = "";
-    },
-    async removeLink(bookmark_id) {
-	  let isConfirmed = await this.$fhcAlert.confirmDelete();
-	 
-	  // early return if the confirm dialog was not confirmed
-	  if(!isConfirmed) return;
-      
-	  this.$fhcApi.factory.bookmark
-        .delete(bookmark_id)
-        .then((res) => res.data)
-        .then((result) => {
-          this.$fhcAlert.alertInfo(this.$p.t("bookmark", "bookmarkDeleted"));
-		  // refetch the bookmarks to see the updates
-		  this.fetchBookmarks();
-        })
-        .catch(this.$fhcAlert.handleSystemError);
-    },
-  },
-  async mounted() {
-    await this.fetchBookmarks();
-  },
-  created()
-  {
-	  // 
-	  // this.$emit('setConfig', true); -> use this to enable widget config mode if needed
-  },
-  template: /*html*/ `
+			return !Object.values(this.validation).some(value => value === true);
+		},
+		async fetchBookmarks() {
+			await this.$fhcApi.factory.bookmark
+				.getBookmarks()
+				.then((res) => res.data)
+				.then((result) => {
+					this.shared = result;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		addLink() {
+			// reset is-invalid css on url input field
+			for (let key of Object.keys(this.validation)) {
+				this.validation[key] = false;
+			}
+
+			// early return if validation failed
+			if (!this.isValidationSuccessfull()) return;
+
+			this.$fhcApi.factory.bookmark
+				.insert({
+					tag: this.config.tag,
+					title: this.title_input,
+					url: this.url_input,
+				})
+				.then((res) => res.data)
+				.then((result) => {
+					this.$fhcAlert.alertInfo(this.$p.t("bookmark", "bookmarkAdded"));
+					// refetch the bookmarks to see the updates
+					this.fetchBookmarks();
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+
+			// reset the values for the title and url inputs
+			this.title_input = "";
+			this.url_input = "";
+		},
+		async removeLink(bookmark_id) {
+			let isConfirmed = await this.$fhcAlert.confirmDelete();
+
+			// early return if the confirm dialog was not confirmed
+			if (!isConfirmed) return;
+
+			this.$fhcApi.factory.bookmark
+				.delete(bookmark_id)
+				.then((res) => res.data)
+				.then((result) => {
+					this.$fhcAlert.alertInfo(this.$p.t("bookmark", "bookmarkDeleted"));
+					// refetch the bookmarks to see the updates
+					this.fetchBookmarks();
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+	},
+	async mounted() {
+		await this.fetchBookmarks();
+	},
+	created() {
+		// 
+		// this.$emit('setConfig', true); -> use this to enable widget config mode if needed
+	},
+	template: /*html*/ `
     <div class="widgets-url w-100 h-100" style="padding: 1rem 1rem;">
         <div class="d-flex flex-column justify-content-between">
         <!-- todo: widgetTag ?? -->
             <template v-if="shared">
                 <template v-if="!emptyBookmarks">
-                  <div v-for="link in shared" :key="link.id" class="d-flex mt-2">
-                      <a target="_blank" :href="link.url">
-					  	<i class="fa fa-solid fa-arrow-up-right-from-square"></i>
-						{{ link.title }}
-					  </a>
-                      <a class="ms-auto" href="#" @click.prevent="removeLink(link.bookmark_id)" v-show="configMode || editModeIsActive">
-					    <i class="fa fa-regular fa-trash-can" style="color: #e01b24;"></i>
-					  </a>
-                  </div>
+					<div v-for="link in shared" :key="link.id" class="d-flex mt-2">
+						<a target="_blank" :href="link.url">
+							<i class="fa fa-solid fa-arrow-up-right-from-square"></i>{{ link.title }}
+						</a>
+						<a class="ms-auto" href="#" @click.prevent="removeLink(link.bookmark_id)" v-show="configMode || editModeIsActive">
+							<i class="fa fa-regular fa-trash-can" style="color: #e01b24;"></i>
+						</a>
+					</div>
                 </template>
                 <div v-else class="d-flex mt-2">
                     <span>{{$p.t('bookmark','emptyBookmarks')}}</span>
@@ -131,7 +129,7 @@ export default {
 						<input maxlength="255" required class="form-control form-control-sm" :class="{'is-invalid':validation.invalidTitel}" placeholder="Titel" type="text" v-model="title_input" name="title" >
 						<!-- validation html for titel -->
 						<div class="invalid-feedback">
-						{{$p.t("bookmark", "invalidTitel")}}.
+							{{$p.t("bookmark", "invalidTitel")}}.
 						</div>
 					</div>
 
@@ -139,7 +137,7 @@ export default {
 						<input required id="bookmark_link" class="form-control form-control-sm mt-2" :class="{'is-invalid':validation.invalidURL}" type="url" placeholder="URL" v-model="url_input" name="url">
 						<!-- validation html for url -->
 						<div class="invalid-feedback">
-						{{$p.t("bookmark", "invalidUrl")}}.
+							{{$p.t("bookmark", "invalidUrl")}}.
 						</div>
 					</div>
 
diff --git a/system/dbupdate_3.4/25999_cis4_cms.php b/system/dbupdate_3.4/25999_cis4_cms.php
index 9bebad2e9..c455e8121 100644
--- a/system/dbupdate_3.4/25999_cis4_cms.php
+++ b/system/dbupdate_3.4/25999_cis4_cms.php
@@ -73,7 +73,6 @@ EOXML04;
 	<xsl:output encoding="UTF-8" omit-xml-declaration="yes" indent="yes"/>
 	<xsl:output method="html"/>
 	<xsl:template match="/">
-		<h1>News</h1>
 		<div class="row">
 			<xsl:choose>
 				<xsl:when test="content/stg_extras">

From 8e51071997f30f39b46a2fda390600f4108e95dc Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 22 Nov 2024 14:50:16 +0100
Subject: [PATCH 1453/1461] readd v-bind item removing it breaks dashboard
 customize view instead of plus signs a ghost widget is shown

---
 public/js/components/Drop/Grid.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 1cbe9c3d1..06e8f535e 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -376,7 +376,7 @@ export default {
 				paddingRight: 'var(--fhc-dg-item-padding-horizontal)'
 			}">
 			<template v-slot="item">
-				<slot v-bind="item.data" :x="item.x" :y="item.y" ></slot>
+				<slot v-bind="item.data" v-bind="item" :x="item.x" :y="item.y" ></slot>
 			</template>
 		</grid-item>
 		

From 1297a8a23a351598baf3b74f056d2a67f38c71c3 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 22 Nov 2024 15:02:42 +0100
Subject: [PATCH 1454/1461] reafactor(Calendar/Day/Page.js): refactors styles
 of elements for easier readability

---
 public/js/components/Calendar/Day/Page.js | 66 ++++++++++++++++++++---
 1 file changed, 59 insertions(+), 7 deletions(-)

diff --git a/public/js/components/Calendar/Day/Page.js b/public/js/components/Calendar/Day/Page.js
index e7927e896..c8fb9aae7 100644
--- a/public/js/components/Calendar/Day/Page.js
+++ b/public/js/components/Calendar/Day/Page.js
@@ -82,6 +82,34 @@ export default {
 		}
 	},
 	computed: {
+		dayGridStyle(){
+			return {
+				'grid-template-columns': '1 1fr',
+				'grid-template-rows': 'repeat(' + (this.hours.length * 60 / this.smallestTimeFrame) + ', 1fr)',
+			}
+		},
+		noLvStyle(){
+			return {
+				top: (this.calendarScrollTop + 100) + 'px',
+				position: 'absolute',
+				left: 0,
+				'text-align': 'center',
+				width: '100%',
+				'z-index': 1,
+			}
+		},
+		indicatorStyle(){
+			return {
+				'pointer-events': 'none',
+				'padding-left': '3.5rem',
+				'margin-top': '-1px',
+				'z-index': 2,
+				'border-color':'#00649C!important',
+				top: this.hourPosition + 'px',
+				left: 0,
+				right: 0,
+			}    
+		},
 		noEventsCondition(){
 			return !this.isSliding && this.filteredEvents?.length === 0;
 		},
@@ -150,6 +178,19 @@ export default {
 				)
 			}
 		},
+		hourGridIdentifier(hour) {
+			// this is the id attribute that is responsible to scroll the calender to the first event
+			return 'scroll' + hour + this.focusDate.d + this.week;
+		},
+		hourGridStyle(hour){
+			return {
+				'pointer-events': 'none',
+				top: this.getAbsolutePositionForHour(hour),
+				left: 0,
+				right: 0,
+				'z-index': 0,
+			}  
+		},
 		showModal: function (evt) {
 			let event = evt.orig;
 			this.setSelectedEvent(event);
@@ -216,6 +257,17 @@ export default {
 		},
 		dateToMinutesOfDay(day) {
 			return Math.floor(((day.getHours() - 7) * 60 + day.getMinutes()) / this.smallestTimeFrame) + 1;
+		},
+		eventGridStyle(day,event){
+			return { 
+				'z-index': 1,
+			 	'grid-column-start': 1 + (event.lane - 1) * day.lanes / event.maxLane,
+				'grid-column-end': 1 + event.lane * day.lanes / event.maxLane,
+				'grid-row-start': this.dateToMinutesOfDay(event.start),
+				'grid-row-end': this.dateToMinutesOfDay(event.end),
+				'background-color': event.orig.color,
+				'--test': this.dateToMinutesOfDay(event.end),
+			}
 		}
 	},
 	template: /*html*/`
@@ -232,19 +284,19 @@ export default {
 					</div>
 				</div>
 				<div ref="eventcontainer" class="position-relative flex-grow-1" @mousemove="calcHourPosition" @mouseleave="" >
-					<div :id="'scroll'+hour+focusDate.d+week" v-for="hour in hours" :key="hour"  class="position-absolute box-shadow-border-top" style="pointer-events: none;" :style="{top:getAbsolutePositionForHour(hour),left:0,right:0,'z-index':0}"></div>
-					<div v-if="hourPosition" class="position-absolute border-top small"  style="pointer-events: none; padding-left:3.5rem; margin-top:-1px;z-index:2;border-color:#00649C !important" :style="{top:hourPosition+'px',left:0,right:0}">
+					<div :id="hourGridIdentifier(hour)" v-for="hour in hours" :key="hour"  class="position-absolute box-shadow-border-top" :style="hourGridStyle(hour)"></div>
+					<div v-if="hourPosition" class="position-absolute border-top small"  :style="indicatorStyle">
 						<span class="border border-top-0 px-2 bg-white">{{hourPositionTime}}</span>
 					</div>
 					<div>
-						<h1 v-if="noEventsCondition" class="m-0 text-secondary" ref="noEventsText" :style="{'top':(calendarScrollTop + 100)+'px'}" style="position:absolute; left:0;  text-align:center; width: 100%; z-index:1">Keine Lehrveranstaltungen</h1>
-						<div class="events" :class="{'fhc-calendar-no-events-overlay':noEventsCondition}">
+						<h1 v-if="noEventsCondition" class="m-0 text-secondary" ref="noEventsText" :style="noLvStyle">Keine Lehrveranstaltungen</h1>
+						<div :class="{'fhc-calendar-no-events-overlay':noEventsCondition, 'events':true}">
 
 							<div class="hours">
 								<div v-for="hour in hours" style="min-height:100px" :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
 							</div>
-							<div v-for="day in eventsPerDayAndHour" :key="day" class=" day border-start" :style="{'grid-template-columns': '1 1fr', 'grid-template-rows': 'repeat(' + (hours.length * 60 / smallestTimeFrame) + ', 1fr)'}">
-								<div  :style="{'background-color':event.orig.color}" :class="{'selectedEvent':event.orig == selectedEvent}" class="mx-2 small rounded overflow-hidden " :style="{'z-index':1,'grid-column-start': 1+(event.lane-1)*day.lanes/event.maxLane, 'grid-column-end': 1+event.lane*day.lanes/event.maxLane, 'grid-row-start': dateToMinutesOfDay(event.start), 'grid-row-end': dateToMinutesOfDay(event.end) ,'--test': dateToMinutesOfDay(event.end)}" v-for="event in day.events" :key="event">
+							<div v-for="day in eventsPerDayAndHour" :key="day" class=" day border-start" :style="dayGridStyle">
+								<div v-for="event in day.events" :key="event" :style="eventGridStyle(day,event)" :class="{'selectedEvent':event.orig == selectedEvent}" class="mx-2 small rounded overflow-hidden " >
 									<!-- desktop version opens the lvMenu next to the calendar -->
 									<div class="d-none d-xl-block h-100 "  @click.prevent="eventClick(event)">
 										<slot  name="dayPage" :event="event" :day="day">
@@ -280,7 +332,7 @@ export default {
 							<h3>Keine Lehrveranstaltungen</h3>
 						</template>
 						<template v-else>
-							<div style="height: calc(var(--fhc-calendar-pane-height) - 100px);" class="d-flex w-100 justify-content-center align-items-center">
+							<div class="p-4 d-flex w-100 justify-content-center align-items-center">
 								<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
 							</div>
 						</template>

From 6f1e61fa00ff5aa93419579dfb29e22c0976b776 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 22 Nov 2024 15:16:27 +0100
Subject: [PATCH 1455/1461] move contentid of cis4 menu root to ci config,
 remove unused controller components CisVue, modify CISVUE-Header to use
 config for cis4 menu root content id

---
 application/config/cis.php                    |  7 ++++
 application/controllers/components/CisVue.php | 36 -------------------
 application/views/templates/CISVUE-Header.php |  3 +-
 3 files changed, 9 insertions(+), 37 deletions(-)
 create mode 100644 application/config/cis.php
 delete mode 100644 application/controllers/components/CisVue.php

diff --git a/application/config/cis.php b/application/config/cis.php
new file mode 100644
index 000000000..028e9899a
--- /dev/null
+++ b/application/config/cis.php
@@ -0,0 +1,7 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+
+// CMS Content Id for CIS4 Menu Root
+$config['cis_menu_root_content_id'] = 11066;
diff --git a/application/controllers/components/CisVue.php b/application/controllers/components/CisVue.php
deleted file mode 100644
index 106c6058a..000000000
--- a/application/controllers/components/CisVue.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- *
- */
-class CisVue extends Auth_Controller
-{
-
-	/**
-	 * Object initialization
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'Menu' => [self::PERM_LOGGED]
-		]);
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 */
-	public function Menu()
-	{
-		$this->load->model('content/Content_model', 'ContentModel');
-		$menu_contentID = $this->ContentModel->getMenuContentID();
-		$result = $this->ContentModel->getMenu($menu_contentID, getAuthUID());
-		$menu = getData($result) ?? (object)['childs' => []];
-
-		$this->outputJsonSuccess($menu);
-	}
-
-}
diff --git a/application/views/templates/CISVUE-Header.php b/application/views/templates/CISVUE-Header.php
index 9b2b27ebf..119b9e5ee 100644
--- a/application/views/templates/CISVUE-Header.php
+++ b/application/views/templates/CISVUE-Header.php
@@ -19,7 +19,8 @@ $this->load->view('templates/FHC-Header', $includesArray);
 if (!isset($menu)) {
 	$ci =& get_instance(); // get CI instance
 	$ci->load->model('content/Content_model', 'ContentModel');
-	$cis4_content_id = $ci->ContentModel->getMenuContentID();
+	$ci->load->config('cis');
+	$cis4_content_id = $ci->config->item('cis_menu_root_content_id');
 	$result = $ci->ContentModel->getMenu($cis4_content_id, getAuthUID());
 	$menu = getData($result)->childs ?? [];
 }

From df0ed6715cbf0e41955e9c21445623862f9ff9bd Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 25 Nov 2024 11:31:13 +0100
Subject: [PATCH 1456/1461] add renderif to default room action if no content
 id is defined

---
 public/js/apps/Cis.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js
index 92c1b9ec7..09ee21397 100644
--- a/public/js/apps/Cis.js
+++ b/public/js/apps/Cis.js
@@ -36,6 +36,12 @@ const app = Vue.createApp({
                     raum: {
                         defaultaction: {
                             type: "link",
+							renderif: function(data) {
+								if(data.content_id === "N/A"){
+									return false;
+								}
+								return true;
+							},
                             action: function(data) { 
 								const link= FHC_JS_DATA_STORAGE_OBJECT.app_root +
 									FHC_JS_DATA_STORAGE_OBJECT.ci_router +

From 2ed24ca60f9eb98deed2a0b99568b98d5b3df17b Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 25 Nov 2024 13:48:33 +0100
Subject: [PATCH 1457/1461] remove unneeded controllers, views and vuejs apps

---
 application/controllers/Test.php              |  16 --
 .../VertragsbestandteilTest.php               | 114 ----------
 application/controllers/system/TestSearch.php |  44 ----
 application/controllers/system/TestVBform.php |  32 ---
 application/views/system/logs/testSearch.php  |  59 ------
 application/views/system/logs/testVBform.php  |  16 --
 application/views/test/Admin.php              |  33 ---
 application/views/test/Test.php               |  33 ---
 public/js/apps/TestSearch.js                  | 196 ------------------
 9 files changed, 543 deletions(-)
 delete mode 100644 application/controllers/Test.php
 delete mode 100644 application/controllers/jobs/vertragsbestandteil_test/VertragsbestandteilTest.php
 delete mode 100644 application/controllers/system/TestSearch.php
 delete mode 100644 application/controllers/system/TestVBform.php
 delete mode 100644 application/views/system/logs/testSearch.php
 delete mode 100644 application/views/system/logs/testVBform.php
 delete mode 100644 application/views/test/Admin.php
 delete mode 100644 application/views/test/Test.php
 delete mode 100644 public/js/apps/TestSearch.js

diff --git a/application/controllers/Test.php b/application/controllers/Test.php
deleted file mode 100644
index 2a7aa4e4e..000000000
--- a/application/controllers/Test.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
- 
-if ( !defined("PHPUNIT_TEST") ) {
-    show_404();
-}
- 
-class Test extends CI_Controller
-{
-    public function index()
-    {
-        // Yep... This is all we need.
-        ini_set('error_reporting', E_ALL); // or error_reporting(E_ALL);
-        ini_set('display_errors', '1');
-        ini_set('display_startup_errors', '1');
-    }
-}
diff --git a/application/controllers/jobs/vertragsbestandteil_test/VertragsbestandteilTest.php b/application/controllers/jobs/vertragsbestandteil_test/VertragsbestandteilTest.php
deleted file mode 100644
index d22ddb85f..000000000
--- a/application/controllers/jobs/vertragsbestandteil_test/VertragsbestandteilTest.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-if (!defined("BASEPATH")) exit("No direct script access allowed");
-
-use vertragsbestandteil\VertragsbestandteilFactory;
-
-/**
- * Description of VertragsbestandteilTest
- *
- * @author bambi
- */
-class VertragsbestandteilTest extends JOB_Controller
-{
-
-	public function __construct()
-	{
-		parent::__construct();
-
-		$this->load->library('vertragsbestandteil/VertragsbestandteilLib', 
-			null, 'VertragsbestandteilLib');
-		$this->load->library('vertragsbestandteil/GehaltsbestandteilLib', 
-			null, 'GehaltsbestandteilLib');
-	}
-	
-	public function testFetch() 
-	{
-		$dienstverhaeltnis_id = 1;
-		$stichtag = null;
-		
-		foreach($this->VertragsbestandteilLib->fetchVertragsbestandteile(
-			$dienstverhaeltnis_id, $stichtag) as $vertragsbestandteil) 
-		{
-			//print_r($vertragsbestandteil);
-			echo $vertragsbestandteil . "\n";
-		}
-	}
-	
-	public function testUpdate() 
-	{
-		$now = new DateTime();
-		
-		$data = new stdClass();
-		$data->vertragsbestandteil_id = 32;
-		$data->von = '2022-12-05';
-		
-		$data->wochenstunden = 45.0;
-		$data->vertragsbestandteiltyp_kurzbz = VertragsbestandteilFactory::VERTRAGSBESTANDTEIL_STUNDEN;
-		
-		$vb = VertragsbestandteilFactory::getVertragsbestandteil($data);
-		
-		try
-		{
-			$this->VertragsbestandteilLib->storeVertragsbestandteil($vb);
-			echo "Update successful.\n";
-		}
-		catch( Exception $ex ) 
-		{
-			echo "Update failed.\n";
-		}
-	}
-
-	
-	public function testInsert()
-	{
-		$now = new DateTime();
-		
-		$data = new stdClass();
-		$data->dienstverhaeltnis_id = 1;
-		$data->von = '2022-12-01';
-		$data->insertamum = $now->format(DateTime::ATOM);
-		$data->insertvon = 'ma0080';
-		$data->vertragsbestandteiltyp_kurzbz = VertragsbestandteilFactory::VERTRAGSBESTANDTEIL_FUNKTION;
-		
-		$data->benutzerfunktion_id = 112667;
-		$data->anmerkung = 'test funkton';
-		$data->kuendigungsrelevant = false;
-		
-		$vb = VertragsbestandteilFactory::getVertragsbestandteil($data);
-		
-		try
-		{
-			$this->VertragsbestandteilLib->storeVertragsbestandteil($vb);
-			echo "Insert successful.\n";
-		}
-		catch( Exception $ex ) 
-		{
-			echo "Insert failed.\n";
-		}
-	}
-	
-	public function testGehaltsbestandteilInsert() 
-	{
-		$data = new stdClass();
-		$data->gehaltsbestandteil_id = 2;
-		/*
-		$data->dienstverhaeltnis_id = 39;
-		$data->vertragsbestandteil_id = 123;
-		$data->gehaltstyp_kurzbz = 'zulage';
-		$data->von = '2023-04-01';
-		$data->bis = '2023-08-31';
-		$data->anmerkung = 'test anmerkung';
-		$data->grundbetrag = 100;
-		$data->betrag_valorisiert = 100;
-		$data->valorisierung = true;
-		*/
-		$data->auszahlungen = 12;
-		
-		$gb = new \vertragsbestandteil\Gehaltsbestandteil();
-		$gb->hydrateByStdClass($data);
-		
-		print_r($gb->toStdClass());
-		
-		$this->GehaltsbestandteilLib->storeGehaltsbestandteil($gb);
-	}
-}
diff --git a/application/controllers/system/TestSearch.php b/application/controllers/system/TestSearch.php
deleted file mode 100644
index 1f5c66a1d..000000000
--- a/application/controllers/system/TestSearch.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * Test Search Vue Component
- */
-class TestSearch extends Auth_Controller
-{
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct(
-			array(
-				'index' => 'system/developer:r'
-			)
-		);
-
-		// Loads WidgetLib
-		$this->load->library('WidgetLib');
-
-		// Loads phrases system
-		$this->loadPhrases(
-			array(
-				'global',
-				'ui',
-				'filter'
-			)
-		);
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * Everything has a beginning
-	 */
-	public function index()
-	{
-		$this->load->view('system/logs/testSearch.php');
-	}
-}
diff --git a/application/controllers/system/TestVBform.php b/application/controllers/system/TestVBform.php
deleted file mode 100644
index 9923bf05b..000000000
--- a/application/controllers/system/TestVBform.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * Test VBform Vue Component
- */
-class TestVBform extends Auth_Controller
-{
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct(
-			array(
-				'index' => 'system/developer:r'
-			)
-		);
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * Everything has a beginning
-	 */
-	public function index()
-	{
-		$this->load->view('system/logs/testVBform.php');
-	}
-}
diff --git a/application/views/system/logs/testSearch.php b/application/views/system/logs/testSearch.php
deleted file mode 100644
index 861adc53d..000000000
--- a/application/views/system/logs/testSearch.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-	$includesArray = array(
-		'title' => 'Test Search',
-		'bootstrap5' => true,
-		'fontawesome6' => true,
-		'tabulator5' => true,
-		'primevue3' => true,
-		'axios027' => true,
-		'vue3' => true,
-		'filtercomponent' => true,
-		'navigationcomponent' => true,
-		'phrases' => array(
-			'global' => array('mailAnXversandt'),
-			'ui' => array('bitteEintragWaehlen')
-		),
-		'customCSSs' => array(
-			'public/css/components/verticalsplit.css',
-			'public/css/components/searchbar/searchbar.css',
-			'public/css/components/primevue.css',
-		),
-		'customJSModules' => array('public/js/apps/TestSearch.js')
-	);
-
-	$this->load->view('templates/FHC-Header', $includesArray);
-?>
-
-	<div id="main">
-
-		<!-- Navigation component -->
-		<core-navigation-cmpt :add-side-menu-entries="appSideMenuEntries"></core-navigation-cmpt>
-
-		<div id="content">
-			<div class="row">
-				<div class="col-lg-12">
-					<h3 class="page-header">
-						Test Search
-					</h3>
-				</div>
-			</div>
-			<div>
-
-				<core-searchbar :searchoptions="searchbaroptions" :searchfunction="searchfunction"></core-searchbar>
-				
-				<core-verticalsplit>
-					<template #top>
-						<core-searchbar :searchoptions="searchbaroptions" :searchfunction="searchfunctiondummy"></core-searchbar>
-					</template>
-					<template #bottom>
-						<!-- Filter component -->
-						<core-filter-cmpt filter-type="LogsViewer" @nw-new-entry="newSideMenuEntryHandler"></core-filter-cmpt>
-					</template>
-				</core-verticalsplit>				
-
-			</div>
-		</div>
-	</div>
-
-<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
-
diff --git a/application/views/system/logs/testVBform.php b/application/views/system/logs/testVBform.php
deleted file mode 100644
index 566abb1cb..000000000
--- a/application/views/system/logs/testVBform.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-	$includesArray = array(
-		'title' => 'Test VBform',
-		'bootstrap5' => true,
-		'fontawesome6' => true,
-		'vue3' => true,
-		'customJSModules' => array('public/js/apps/vbform/vbform.js')
-	);
-
-	$this->load->view('templates/FHC-Header', $includesArray);
-?>
-
-	<div id="main"></div>
-
-<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
-
diff --git a/application/views/test/Admin.php b/application/views/test/Admin.php
deleted file mode 100644
index c5fa8b64c..000000000
--- a/application/views/test/Admin.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-$this->load->view(
-	'templates/FHC-Header',
-	array(
-		'title' => 'FH-Complete',
-		'bootstrap5' => true,
-		'fontawesome6' => true,
-		'axios027' => true,
-		'restclient' => true,
-		'vue3' => true,
-		'customJSModules' => ['public/js/apps/Test.js'],
-		'customCSSs' => [
-			'public/css/components/dashboard.css'
-		],
-		'navigationcomponent' => true
-	)
-);
-?>
-
-	<div id="main">
-		<core-navigation-cmpt :add-side-menu-entries="appSideMenuEntries"></core-navigation-cmpt>
-
-		<div id="content">
-			<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
-				<h1 class="h2">Dashboard</h1>
-			</div>
-
-			<dashboard-admin/>
-
-		</div>
-	</div>
-
-<?php $this->load->view('templates/FHC-Footer'); ?>
diff --git a/application/views/test/Test.php b/application/views/test/Test.php
deleted file mode 100644
index 328b45fba..000000000
--- a/application/views/test/Test.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-$this->load->view(
-	'templates/FHC-Header',
-	array(
-		'title' => 'FH-Complete',
-		'bootstrap5' => true,
-		'fontawesome6' => true,
-		'axios027' => true,
-		'restclient' => true,
-		'vue3' => true,
-		'customJSModules' => ['public/js/apps/Test.js'],
-		'customCSSs' => [
-			'public/css/components/dashboard.css'
-		],
-		'navigationcomponent' => true
-	)
-);
-?>
-
-	<div id="main">
-		<core-navigation-cmpt :add-side-menu-entries="appSideMenuEntries"></core-navigation-cmpt>
-
-		<div id="content">
-			<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
-				<h1 class="h2">Dashboard</h1>
-			</div>
-
-			<core-dashboard dashboard="<?= $dashboard; ?>"/>
-
-		</div>
-	</div>
-
-<?php $this->load->view('templates/FHC-Footer'); ?>
diff --git a/public/js/apps/TestSearch.js b/public/js/apps/TestSearch.js
deleted file mode 100644
index f012d060f..000000000
--- a/public/js/apps/TestSearch.js
+++ /dev/null
@@ -1,196 +0,0 @@
-import {CoreFilterCmpt} from '../components/filter/Filter.js';
-import {CoreNavigationCmpt} from '../components/navigation/Navigation.js';
-import CoreVerticalsplit from "../components/verticalsplit/verticalsplit.js";
-import CoreSearchbar from "../components/searchbar/searchbar.js";
-import FhcApi from "../plugin/FhcApi.js";
-
-const app = Vue.createApp({
-	name: "TestSearchApp",
-	components: {
-		CoreNavigationCmpt,
-		CoreFilterCmpt,
-		CoreVerticalsplit,
-		CoreSearchbar
-	},
-	data() {
-		return {
-			title: "Test Search",
-			appSideMenuEntries: {},
-			searchbaroptions: {
-				types: [
-					"person",
-					"raum",
-					"mitarbeiter",
-					"student",
-					"prestudent",
-					"document",
-					"cms",
-					"organisationunit"
-					],
-				actions: {
-					person: {
-						defaultaction: {
-							type: "link",
-							action(data) { 
-											//alert('person defaultaction ' + JSON.stringify(data)); 
-											//window.location.href = data.profil;
-								return data.profil;
-							}
-						},
-						childactions: [
-						{
-							label: "testchildaction1",
-							icon: "fas fa-check-circle",
-							type: "function",
-							action(data) { 
-								alert('person testchildaction 01 ' + JSON.stringify(data)); 
-							}
-						},
-						{
-							label: "testchildaction2",
-							icon: "fas fa-file-csv",
-							type: "function",
-							action(data) { 
-								alert('person testchildaction 02 ' + JSON.stringify(data)); 
-							}
-						}
-						]
-					},
-					raum: {
-						defaultaction: {
-							type: "function",
-							action(data) { 
-								alert('raum defaultaction ' + JSON.stringify(data)); 
-							}
-						},
-						childactions: [                      
-						{
-							label: "Rauminformation",
-							icon: "fas fa-info-circle",
-							type: "link",
-							action(data) { 
-								return data.infolink;
-							}
-						},
-						{
-							label: "Raumreservierung",
-							icon: "fas fa-bookmark",
-							type: "link",
-							action(data) { 
-								return data.booklink;
-							}
-						}
-						]
-					},
-					employee: {
-						defaultaction: {
-							type: "function",
-							action(data) { 
-								alert('employee defaultaction ' + JSON.stringify(data)); 
-							}
-						},
-						childactions: [
-						{
-							label: "testchildaction1",
-							icon: "fas fa-address-book",
-							type: "function",
-							action(data) { 
-								alert('employee testchildaction 01 ' + JSON.stringify(data)); 
-							}
-						},
-						{
-							label: "testchildaction2",
-							icon: "fas fa-user-slash",
-							type: "function",
-							action(data) { 
-								alert('employee testchildaction 02 ' + JSON.stringify(data)); 
-							}
-						},
-						{
-							label: "testchildaction3",
-							icon: "fas fa-bell",
-							type: "function",
-							action(data) { 
-								alert('employee testchildaction 03 ' + JSON.stringify(data)); 
-							}
-						},
-						{
-							label: "testchildaction4",
-							icon: "fas fa-calculator",
-							type: "function",
-							action(data) { 
-								alert('employee testchildaction 04 ' + JSON.stringify(data)); 
-							}
-						}
-						]
-					},
-					organisationunit: {
-						defaultaction: {
-							type: "function",
-							action(data) { 
-								alert('organisationunit defaultaction ' + JSON.stringify(data)); 
-							}
-						},
-						childactions: []
-					}
-				}
-			},
-			searchbaroptions2: {
-				types: [
-					"raum",
-					"organisationunit"
-					],
-				actions: {
-					raum: {
-						defaultaction: {
-							type: "function",
-							action(data) { 
-								alert('raum defaultaction ' + JSON.stringify(data)); 
-							}
-						},
-						childactions: [                      
-						{
-							label: "Rauminformation",
-							icon: "fas fa-info-circle",
-							type: "link",
-							action(data) { 
-								return data.infolink;
-							}
-						},
-						{
-							label: "Raumreservierung",
-							icon: "fas fa-bookmark",
-							type: "link",
-							action(data) { 
-								return data.booklink;
-							}
-						}
-						]
-					},              
-					organisationunit: {
-						defaultaction: {
-							type: "function",
-							action(data) { 
-								alert('organisationunit defaultaction ' + JSON.stringify(data)); 
-							}
-						},
-						childactions: []
-					}
-				}
-			}
-		};
-	},
-	methods: {
-		newSideMenuEntryHandler(payload) {
-			this.appSideMenuEntries = payload;
-		},
-		searchfunction(searchsettings) {
-			return this.$fhcApi.factory.search.search(searchsettings);  
-		},
-		searchfunctiondummy(searchsettings) {
-			return this.$fhcApi.factory.search.searchdummy(searchsettings);  
-		}
-	}
-});
-app.use(FhcApi)
-app.mount('#main');
\ No newline at end of file

From f90f5154a0b03797ea056a709d37f2a4f958727e Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 25 Nov 2024 13:57:25 +0100
Subject: [PATCH 1458/1461] remove searchdummy function and dummyapi

---
 public/js/api/search.js         |  6 +-----
 public/js/apps/api/dummyapi.php | 13 -------------
 public/js/apps/api/search.js    |  7 +------
 3 files changed, 2 insertions(+), 24 deletions(-)
 delete mode 100644 public/js/apps/api/dummyapi.php

diff --git a/public/js/api/search.js b/public/js/api/search.js
index 4655d8fa8..f01551af2 100644
--- a/public/js/api/search.js
+++ b/public/js/api/search.js
@@ -19,9 +19,5 @@ export default {
 	search(searchsettings) {
 		const url = '/api/frontend/v1/searchbar/search';
 		return this.$fhcApi.post(url, searchsettings);
-	},
-	searchdummy(searchsettings) {
-		const url = 'public/js/apps/api/dummyapi.php/Search';
-		return this.$fhcApi.post(url, searchsettings);
 	}
-};
\ No newline at end of file
+};
diff --git a/public/js/apps/api/dummyapi.php b/public/js/apps/api/dummyapi.php
deleted file mode 100644
index 515e72bcf..000000000
--- a/public/js/apps/api/dummyapi.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-function getUser(){
-    echo "test";
-}
-
-class Dummy extends Auth_Controller
-{
-
-
-}
-
-?>
\ No newline at end of file
diff --git a/public/js/apps/api/search.js b/public/js/apps/api/search.js
index eddd3fe5b..9dd26531c 100644
--- a/public/js/apps/api/search.js
+++ b/public/js/apps/api/search.js
@@ -4,10 +4,5 @@ export default {
                 + FHC_JS_DATA_STORAGE_OBJECT.ci_router
                 + '/components/SearchBar/search';
       return axios.post(url, searchsettings);
-  },
-  searchdummy: function(searchsettings) {
-      const url = FHC_JS_DATA_STORAGE_OBJECT.app_root 
-                + 'public/js/apps/api/dummyapi.php/Search';
-      return axios.post(url, searchsettings);
   }
-};
\ No newline at end of file
+};

From 0bec551174dce3916690f1ca7793b9ef6f6bfc3b Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 25 Nov 2024 14:23:06 +0100
Subject: [PATCH 1459/1461] lowercase search in searchfunction fhcapifactory
 path

---
 public/js/apps/Cis.js               | 4 ++--
 public/js/apps/api/fhcapifactory.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js
index 09ee21397..c9d322e07 100644
--- a/public/js/apps/Cis.js
+++ b/public/js/apps/Cis.js
@@ -102,10 +102,10 @@ const app = Vue.createApp({
     },
     methods: {
         searchfunction: function(searchsettings) {
-            return Vue.$fhcapi.Search.search(searchsettings);
+            return Vue.$fhcapi.search.search(searchsettings);
         },
     }
 });
 app.use(FhcApi);
 app.use(Phrasen);
-app.mount('#cis-header');
\ No newline at end of file
+app.mount('#cis-header');
diff --git a/public/js/apps/api/fhcapifactory.js b/public/js/apps/api/fhcapifactory.js
index 4b35b807a..fb652fb84 100644
--- a/public/js/apps/api/fhcapifactory.js
+++ b/public/js/apps/api/fhcapifactory.js
@@ -1,5 +1,5 @@
 import Search from "./search.js";
 
 export default {
-    "Search": Search,
+    "search": Search,
 };

From 766bec887afe251a70b0ef860d9d6d08262457c0 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 25 Nov 2024 16:29:41 +0100
Subject: [PATCH 1460/1461] check if constant
 CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN is defined

---
 application/controllers/api/frontend/v1/LvMenu.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/controllers/api/frontend/v1/LvMenu.php b/application/controllers/api/frontend/v1/LvMenu.php
index ece08e2a9..777d49b0c 100644
--- a/application/controllers/api/frontend/v1/LvMenu.php
+++ b/application/controllers/api/frontend/v1/LvMenu.php
@@ -288,7 +288,7 @@ class LvMenu extends FHCAPI_Controller
 	private function fhc_menu_digitale_anwesenheiten(&$menu, $angemeldet, $studiengang_kz, $semester, $lvid, $angezeigtes_stsem){
 		
 		// DIGITALE ANWESENHEITEN
-		if (CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN && $angemeldet) {
+		if (defined('CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN') && CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN && $angemeldet) {
 
 			$menu[] = array
 			(

From c32f65bc1ec6754cd5621ccf909adb353b3cb9cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Tue, 26 Nov 2024 12:49:21 +0100
Subject: [PATCH 1461/1461] Reihungstestangetreten Check aus
 BIS-Bewerbermeldung entfernt

---
 vilesci/bis/studentenmeldung.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/vilesci/bis/studentenmeldung.php b/vilesci/bis/studentenmeldung.php
index 701218569..8754cb444 100644
--- a/vilesci/bis/studentenmeldung.php
+++ b/vilesci/bis/studentenmeldung.php
@@ -1952,7 +1952,6 @@ function GenerateXMLBewerberBlock($studiengang_kz, $orgformcode=null)
 			AND tbl_prestudent.studiengang_kz=".$db->db_add_param($studiengang_kz)."
 			AND (tbl_prestudentstatus.datum<=".$db->db_add_param($bisdatum).")
 			AND status_kurzbz='Bewerber'
-			AND reihungstestangetreten
 			";
 
 		if(!is_null($orgformcode))